This commit was manufactured by cvs2svn to create tagbefore_proactor

'before_proactor'.

2546 files changed, 253593 insertions, 394092 deletions

diff --git a/ACE-INSTALL.html b/ACE-INSTALL.html
index 2f0caa9de23..55dd132f844 100644
--- a/ACE-INSTALL.html
+++ b/ACE-INSTALL.html
@@ -1,9 +1,9 @@
+<HTML>
 <!-- $Id$ -->
 
-<HTML>
 <HEAD>
-  <TITLE>Building and Installing ACE and Its Network Services</TITLE>
-  <link rev=made href="mailto:schmidt@cs.wustl.edu">
+<TITLE>Building and Installing ACE and Its Network Services</TITLE>
+<link rev=made href="mailto:schmidt@cs.wustl.edu">
 </HEAD>
 
 <BODY text = "#000000"
@@ -25,9 +25,7 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE.FAQ.html">FAQ</A> before
 building and installing ACE.  In addition, you might want to check out
 our <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-development4.ps.gz">development
-process</A>, as well.  And as you start working with ACE, you might
-want to consult the <a href="docs/ACE-FMM.html">ACE Frequently Made
-Mistakes page</a>.<P>
+process</A>, as well.<P>
 
 <H4>Document Index</H4>
 
@@ -251,19 +249,13 @@ make: *** [libACE.so] Error 8
       HREF="http://www.cs.wustl.edu/~cleeland/ace/">Linux</A> on both Intel
       and Alpha platforms.  If you use a RedHat 5.x distribution, it's best
       to use RedHat 5.1 or later.  ACE works without any modifications on
-      RedHat 5.1, 5.2, and 6.0, and on Debian 2.1 on both Intel and Alpha;
-      use the <code>include/makeinclude/platform_linux_lxpthreads.GNU</code>
-      and <code>ace/config-linux-lxpthreads.h</code> platform/config
+      RedHat 5.1 and 5.2 on both Intel and Alpha; use the
+      <code>include/makeinclude/platform_linux_lxpthreads.GNU</code>
+      and <code>ace/config_linux_lxpthreads.h</code> platform/config
       files.<p>
-
-      The glibc 2.0 dynamic loader isn't thread safe. If you want to use the
-      Invocation API you'll have to set <code>LD_BIND_NOW=true</code>. If you
-      want to use <code>dlopen</code>, you should use <code>RTLD_NOW</code>.
-      The dynamic loader in glibc 2.1 is thread safe.<p>
-
-      The ACE <code>Tokens_Test</code> hangs with egcs 1.1b on   Linux.  It
-      runs properly when built with egcs 1.0.2, egcs 1.0.3 and egcs 1.1.1.
-      All other ACE tests run properly with these egcs versions.<p>
+                                                                                     The ACE <code>Tokens_Test</code> hangs with egcs 1.1b on
+      Linux.  It runs properly when built with egcs 1.0.2 and egcs
+      1.0.3.  All other ACE tests run properly with both egcs versions.<p>
 
       <strong>NOTE:</strong> The TAO NameService uses IP multicasting
       by default, though it is not required.  IP multicast on Linux
@@ -294,11 +286,10 @@ make: *** [libACE.so] Error 8
       are necessary with Alpha CPUs and with some older kernels.  egcs 1.0.1
       can also be used, but it may need patches, described there, as well.<p>
 
-      <strong>NOTE:</strong> Be careful when installing egcs on RedHat
-      systems.  If you don't remove your old gcc and libg++ RPMs, it's best
-      to install egcs in a different directory than <code>/usr</code>, such as
-      <code>/usr/local</code>, and set your <code>PATH</code> and
-      <code>LD_LIBRARY_PATH</code> accordingly.<p>
+      <strong>NOTE:</strong> Be careful when installing egcs.  If
+      you don't remove your old gcc and libg++ RPMs, it's best to
+      install egcs in a different directory than /usr, such as /usr/local,
+      and set your PATH and LD_LIBRARY_PATH accordingly.<p>
 
       Some of the ACE tests fail on older, pre-glibc2 Linux platforms,
       such as RedHat 4.2.  The problems are with threads and thread-specific
@@ -525,8 +516,8 @@ If you use the GNU GCC g++ compiler please note the following:
   <li>If you have problems building shared libraries with egcs 1.1 or 1.1.1
       on SunOS 2.5 or 2.5.1 that look like this:
       <pre>
-        /usr/ccs/lib/libgen.a(reg_compile.o): In function `_get_vars_storage':
-        reg_compile.o(.text+0x30): relocation truncated to fit: R_SPARC_GOT13 free
+	/usr/ccs/lib/libgen.a(reg_compile.o): In function `_get_vars_storage':
+	reg_compile.o(.text+0x30): relocation truncated to fit: R_SPARC_GOT13 free
       </pre>
       the suggested workaround is to comment out the <code>ACE_HAS_REGEX</code>
       <code>#define</code> in <code>ace/config-sunos5.5.h</code>.
@@ -667,23 +658,11 @@ If you use the GNU GCC g++ compiler please note the following:
       <code>$ACE_ROOT/include/makeinclude/platform_macros.GNU</code>.<p>
 
   <li>egcs may have trouble linking some executables, such as the ACE
-      IOStream_Test, if its static libraries are used.  Though
-      <a href="mailto:trose@bridgewatersys.com">Tim Rose</a> reports
-      that egcs 1.1.1 static libraries work just fine on Solaris 2.6
-      with  patches: 105181-12, 105568-13, 105210-19, 105591-05, 105395-04,
-      and 105490-07.<p>
-
-      If you need or want to use egcs' shared libraries, build it
-      with the <code>--enable-shared</code> egcs config option.  The
-      <code>--enable-shared</code> option is <strong>not</strong> an
-      egcs run-time option.  Build egcs in a way similar to the
-      following example:
-      <pre><code>
-         $ ./configure --enable-shared
-         $ make bootstrap
-      </code></pre>
-      Be sure to set your <code>LD_LIBRARY_PATH</code> environment
-      variable, if necessary, to pick up those shared libraries.<p>
+      IOStream_Test, if its static libraries are used.  It's best to build
+      egcs with the <code>--enable-shared</code> egcs config option,
+      so that it provides shared libraries.  Be sure to set your
+      <code>LD_LIBRARY_PATH</code> environment variable, if necessary,
+      to pick up those shared libraries.<p>
 
   <li>On DEC Alpha, egcs through version 1.03a, at least, may fail
       to build ACE if debugging (-g) is enabled.  The fix is to
@@ -790,14 +769,6 @@ need to do:<P>
 <P><HR><P>
 <H4><A NAME="win32">Building and Installing ACE on Win32</A></H4>
 
-First, if you are upgrading from an older release, clean up everything
-and rebuild from scratch to ensure that everything is rebuilt correctly.
-You might have to manually go through the ACE directories and delete
-all *.obj, *.dll, *.lib, *.ilk, *.pdb, *.idb, *.ncb, *.opt, and *.exp
-files in order to start over from scratch (the Clean command in MSVC
-may not do this).
-<P>
-
 ACE contains project files for Microsoft Visual C++ 4.x (*.mdp) and
 5.0 with Service Pack 3, and 6.0 (*.dsw), as well as Borland C++ 5.x
 (ace.ide).  <P>
@@ -832,12 +803,12 @@ Thank you to <A HREF="mailto:ben@jetpen.com">Ben Eng</A> for the pointer to
 the STL fixes.
 
 <OL>
-  <LI>Uncompress the ACE distribution into a directory, where it will create a
-      ACE_wrappers directory containing the distribution.  The ACE_wrappers
-      directory will be referred to as ACE_ROOT in the following steps -- so
-      ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the
-      root directory.<BR>
-      <BR>
+  <LI>Uncompress the ACE distribution into a directory, where it will create a 
+      ACE_wrappers directory containing the distribution.  The ACE_wrappers 
+	  directory will be referred to as ACE_ROOT in the following steps -- so 
+	  ACE_ROOT\ace would be C:\ACE_wrappers\ace if you uncompressed into the 
+	  root directory.  <BR>
+	  <BR>
   <LI>Create a file called <code>config.h</code> in the ACE_ROOT\ace
       directory that contains: <BR>
       <BR>
@@ -904,20 +875,13 @@ the STL fixes.
       before the #include statement in ACE_ROOT\ace\config.h.
       Optionally but highly recommended, you can also add the line <BR>
       <BR>
-      <CODE>#define ACE_NO_INLINE</CODE><BR>
+      <CODE>#define __ACE_INLINE__ 0</CODE><BR>
       <BR>
       before the #include statement in ACE_ROOT\ace\config.h to disable
       inline function and reduce the size of static libraries (and your
       executables.)  Notice that you need to use DLL version of
       run-time libraries even you are using ACE as a static library.
       That's the default behavior.<BR><BR>
-
-  <li><a href="http://www.panix.com/~hoggardb/index.shtml">Barry
-      Hoggard</a> maintains a <a
-      href="http://www.panix.com/~hoggardb/corba/">CORBA Page</a>
-      which contains very helpful information on setting MSVC project
-      settings.  You'll need to filter out stuff related to TAO if you
-      only use ACE.<br><br>
 </Ol>
 
 <B>ACE TESTS</B><P>
@@ -925,10 +889,9 @@ the STL fixes.
 The tests are located in ACE_ROOT\tests.  There are two corresponding
 project files in that directory also (tests.mdp and tests.dsp).<P>
 
-Once you build all the tests (Batch Build works well for this), you
-can run the batch file <a
-href="tests/run_tests.bat"><code>run_tests.bat</code></a> in the
-<code>tests</code> directory to try all the tests.<p>
+Once you build all the tests (Batch Build works well for this) you can
+run the batch file run_tests.bat in that directory to try all the
+tests.<P>
 
 <B> BUILDING ACE ON A WIN32 MACHINE THAT LACKS A NETWORK CARD </B><P>
 
@@ -1139,30 +1102,6 @@ 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>
-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>static_libs_only=1</code> to either
-your <code>ACE_wrappers/include/makeinclude/platform_macros.GNU</code>
-or your <code>make</code> invocation.  Then, be sure to load
-the ACE (and any other) shared library before loading your
-executable(s).<p>
-
-A shared library for VxWorks uses the same code as for a static
-(non-shared) library.  However, calls to static constructors/
-destructors are added.  The code in the shared library <strong>must</strong>
-be reentrant if you shared it between programs (tasks).  The
-ACE library meets this requirement.<p>
-
-Shared libraries reduce build time, executable size, and load
-time of the executable.  But, you must manually load the shared
-library before loading your executable(s) with a command such as:
-<pre><code>
--&gt; ld &lt; libACE.so
-</code></pre>
-Shared libraries can be unloaded the same way an executable
-(module) is unloaded.<p>
-
 <h5><a name="VxWorks/NT">Building ACE on Tornado/NT hosts for VxWorks targets</a>.</h5>
 The following, very useful information was contributed by
 <a href="http://people.qualcomm.com/cryan">Chris Ryan</a>
@@ -1171,33 +1110,38 @@ Please submit corrections, additions, or clarifications to the
 the <a href="mailto:ace-users@cs.wustl.edu">ACE mailing list</a>.<p>
 
 A few additional Windows Notes, from Paul von Behren:<p>
-<ul>
-  <li>Cygnus has created a Win32 API which is compatible with a
+<UL>
+  <LI>Cygnus has created a Win32 API which is compatible with a
       ``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>
       WindRiver provides a subset of these tools - including make
       and gcc cross-compilers.<p>
-  <li>To set up the command-prompt build environemnt, run
+  <LI>To set up the command-prompt build environemnt, run
       <code>Tornado\host\x86-win32\bin\TorVars.bat</code>.  This is done
       implicitly within the Tornado IDE.<p>
-  <li>To run <code>ace_ld</code>, you still need perl installed -
+  <LI>To run <code>ace_ld</code>, you still need perl installed -
       see <A href="http://www.activestate.com/software/default.htm">
       http://www.activestate.com/software/default.htm</A> for Windows
       perl.<p>
-  <li>But make does work in "leaf" directories (those with no
-      subdirectories).  You can make the <code>ACE_ROOT\ace directory</code>
+  <LI>There's a bug in the windows port of Make (or at least an
+      incompatability) related to ACE Make's directory-spanning
+      logic (<code>ACE_ROOT\include\makeinclude\rules.nested.GNU</code>
+      (the error message says something about "dir unexpected").<p>
+  <LI>But make does work in "leaf" directories (those with no
+      subdirectries).  You can make the <code>ACE_ROOT\ace directory</code>
       creating the library libACE.a.  If perl is available, make also works
-      in the ACE_ROOT\tests directory.<p>
-  <li>The Tornado IDE will use a standard Makefile for project
+      in the ACE_ROOT\tests directory (ignore the final error
+      attempting to run /bin/true).<p>
+  <LI>The Tornado IDE will use a standard Makefile for project
       builds, but does not have a GUI interface for managing the
       Makefile.  By default, it will use rules from Makefile in the current
       directory and you can configure it to add certain Makefile
       targets to the project.  If you have <code>ACE_ROOT</code> defined
       before starting Tornado, you can specify an ACE Makefile as a Tornado
       target and Tornado will then call make from the menu.<p>
-</ul>
+</UL>
 
 And Chris Ryan's instructions for building for VxWorks targets
 on Windows NT hosts:
diff --git a/ACE.ifnames b/ACE.ifnames
index c05943099da..36ee955ee00 100644
--- a/ACE.ifnames
+++ b/ACE.ifnames
@@ -6,8 +6,6 @@ ACE_ACTIVE_MAP_MANAGER_H
 ACE_ACTIVE_MAP_MANAGER_T_C
 ACE_ACTIVE_MAP_MANAGER_T_H
 ACE_ADDR_H
-ACE_AIX_MINOR_VERS
-ACE_ANY_EXCEPTION
 ACE_APPLICATION_PREALLOCATED_ARRAY_DECLARATIONS
 ACE_APPLICATION_PREALLOCATED_ARRAY_DEFINITIONS
 ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS
@@ -17,17 +15,23 @@ ACE_APPLICATION_PREALLOCATED_OBJECT_DELETIONS
 ACE_ARGUMENT_VECTOR_H
 ACE_ARG_SHIFTER_H
 ACE_ARRAY_H
-ACE_ASSERT
 ACE_ASYNCH_ACCEPTOR_C
 ACE_ASYNCH_ACCEPTOR_H
 ACE_ASYNCH_IO_H
-ACE_ASYNCH_IO_IMPL_H
 ACE_AUTO_PTR_C
 ACE_AUTO_PTR_H
 ACE_BASIC_TYPES_H
 ACE_BIG_ENDIAN
 ACE_BUILD_DLL
 ACE_BUILD_SVC_DLL
+ACE_CACHE_HASH_T_CPP
+ACE_CACHE_HASH_T_H
+ACE_CACHE_HEAP_T_CPP
+ACE_CACHE_HEAP_T_H
+ACE_CACHE_MANAGER_H
+ACE_CACHE_MANAGER_T_CPP
+ACE_CACHE_MANAGER_T_H
+ACE_CACHE_OBJECT_H
 ACE_CAST_CONST
 ACE_CC_BETA_VERSION
 ACE_CC_MAJOR_VERSION
@@ -41,7 +45,6 @@ ACE_CONFIG_H
 ACE_CONFIG_IRIX6X_COMMON_H
 ACE_CONFIG_IRIX6X_H
 ACE_CONFIG_IRIX6X_NTHR_H
-ACE_CONFIG_MINIMAL_H
 ACE_CONFIG_MIT_PTHREAD_H
 ACE_CONFIG_ORBIX_H
 ACE_CONFIG_SCO_5_0_0_H
@@ -53,13 +56,11 @@ ACE_CONTAINERS_T_C
 ACE_CONTAINERS_T_H
 ACE_CORBA_HANDLER_H
 ACE_CORBA_HAS_EXCEPTIONS
-ACE_CORBA_MACROS_H
 ACE_CORBA_REF_C
 ACE_CORBA_REF_H
 ACE_CTIME_R_RETURNS_INT
 ACE_CYGWIN32_COMMON_H
 ACE_DATE_TIME_H
-ACE_DEBUG
 ACE_DEFAULT_ARGV_BUFSIZ
 ACE_DEFAULT_BACKING_STORE
 ACE_DEFAULT_BASE_ADDR
@@ -156,7 +157,6 @@ ACE_ENABLE_SWAP_ON_WRITE
 ACE_ENABLE_TIMEPROBES
 ACE_ENV_VALUE_T_C
 ACE_ENV_VALUE_T_H
-ACE_ERROR
 ACE_EVENT_HANDLER_H
 ACE_EVENT_HANDLER_T_H
 ACE_FIFO_H
@@ -169,7 +169,6 @@ ACE_FILE_ADDR_H
 ACE_FILE_CONNECTOR_H
 ACE_FILE_H
 ACE_FILE_IO_H
-ACE_FINI_HOOK
 ACE_FREE_LIST_C
 ACE_FREE_LIST_H
 ACE_FUNCTOR_C
@@ -181,6 +180,8 @@ ACE_FUTURE_H
 ACE_GET_OPT_H
 ACE_GNUG_COMMON_H
 ACE_HANDLE_SET_H
+ACE_HASH_BUCKET_T_CPP
+ACE_HASH_BUCKET_T_H
 ACE_HASH_MAP_MANAGER_H
 ACE_HASH_MAP_MANAGER_T_CPP
 ACE_HASH_MAP_MANAGER_T_H
@@ -202,6 +203,7 @@ ACE_HAS_BROKEN_BITSHIFT
 ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS
 ACE_HAS_BROKEN_CONVERSIONS
 ACE_HAS_BROKEN_CTIME
+ACE_HAS_BROKEN_ENUMS
 ACE_HAS_BROKEN_HPUX_TEMPLATES
 ACE_HAS_BROKEN_IF_HEADER
 ACE_HAS_BROKEN_MMAP_H
@@ -258,7 +260,6 @@ ACE_HAS_LONG_MAP_FAILED
 ACE_HAS_LYNXOS_SIGNALS
 ACE_HAS_MALLOC_STATS
 ACE_HAS_MFC
-ACE_HAS_MINIMAL_ACE_OS
 ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
 ACE_HAS_MOSTLY_UNICODE_APIS
 ACE_HAS_MSG
@@ -299,7 +300,6 @@ ACE_HAS_PURIFY
 ACE_HAS_P_READ_WRITE
 ACE_HAS_READV_TIMEDWAIT
 ACE_HAS_READ_TIMEDWAIT
-ACE_HAS_RECURSIVE_MUTEXES
 ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 ACE_HAS_RECVFROM_TIMEDWAIT
 ACE_HAS_RECVMSG_TIMEDWAIT
@@ -430,8 +430,6 @@ ACE_IPC_SAP_H
 ACE_KCC_COMMON_H
 ACE_LACKS_ACCESS
 ACE_LACKS_ACE_IOSTREAM
-ACE_LACKS_ACE_OTHER
-ACE_LACKS_ASSERT_MACRO
 ACE_LACKS_AUTO_MMAP_REPLACEMENT
 ACE_LACKS_BSEARCH
 ACE_LACKS_CMSG_DATA_MACRO
@@ -463,6 +461,7 @@ ACE_LACKS_LSTAT
 ACE_LACKS_MADVISE
 ACE_LACKS_MALLOC_H
 ACE_LACKS_MEMORY_H
+ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE
 ACE_LACKS_MKFIFO
 ACE_LACKS_MKTEMP
 ACE_LACKS_MMAP
@@ -490,7 +489,6 @@ ACE_LACKS_READDIR_R
 ACE_LACKS_READLINK
 ACE_LACKS_READV
 ACE_LACKS_RECVMSG
-ACE_LACKS_RENAME
 ACE_LACKS_REWINDDIR
 ACE_LACKS_RLIMIT
 ACE_LACKS_RLIMIT_PROTOTYPE
@@ -538,7 +536,6 @@ ACE_LACKS_UNBUFFERED_STREAMBUF
 ACE_LACKS_UNISTD_H
 ACE_LACKS_UNIX_DOMAIN_SOCKETS
 ACE_LACKS_UNIX_SIGNALS
-ACE_LACKS_UNLINK
 ACE_LACKS_UTSNAME_T
 ACE_LACKS_U_LONGLONG_T
 ACE_LACKS_WCHAR_T
@@ -565,7 +562,6 @@ ACE_LOG_MSG_H
 ACE_LOG_PRIORITY_H
 ACE_LOG_RECORD_H
 ACE_MAIN
-ACE_MAIN_OBJECT_MANAGER
 ACE_MALLOC_ALIGN
 ACE_MALLOC_BASE_H
 ACE_MALLOC_C
@@ -638,14 +634,8 @@ ACE_PIPE_H
 ACE_PLATFORM
 ACE_PLATFORM_EXE_SUFFIX
 ACE_POLL_IS_BROKEN
-ACE_POSIX_AIOCB_PROACTOR
-ACE_POSIX_ASYNCH_IO_H
-ACE_POSIX_PROACTOR_H
-ACE_POSIX_SIG_PROACTOR
-ACE_PRINT_EXCEPTION
 ACE_PRIORITY_REACTOR_H
 ACE_PROACTOR_H
-ACE_PROACTOR_IMPL_H
 ACE_PROCESS_H
 ACE_PROCESS_MANAGER_H
 ACE_PROC_PRI_FIFO_DEF
@@ -656,9 +646,6 @@ ACE_PROTOENT_DATA_SIZE
 ACE_PSOS
 ACE_PSOSIM
 ACE_PSOS_CANT_USE_SYS_TYPES
-ACE_PSOS_DIAB_MIPS
-ACE_PSOS_HAS_C_LIBRARY
-ACE_PSOS_HAS_TIME
 ACE_PSOS_LACKS_ARGC_ARGV
 ACE_PSOS_LACKS_PHILE
 ACE_PSOS_LACKS_PREPC
@@ -666,7 +653,6 @@ ACE_PSOS_PROVIDES_ERROR_SYMBOLS_TM
 ACE_PSOS_SNARFS_HEADER_INFO
 ACE_PSOS_TBD
 ACE_PSOS_TM
-ACE_PSOS_USES_DIAB_SYS_CALLS
 ACE_RB_TREE_C
 ACE_RB_TREE_H
 ACE_RCSID
@@ -833,10 +819,8 @@ ACE_USE_THREAD_MANAGER_ADAPTER
 ACE_USE_TP_REACTOR_FOR_REACTOR_IMPL
 ACE_WFMO_REACTOR_H
 ACE_WIN32
-ACE_WIN32_ASYNCH_IO_H
 ACE_WIN32_BORLAND_H
 ACE_WIN32_COMMON_H
-ACE_WIN32_PROACTOR_H
 ACE_WSOCK_VERSION
 ACE_WTHREADS
 ACE_XTREACTOR_H
@@ -941,7 +925,6 @@ MS_SYNC
 M_UNIX
 NOMINMAX
 NONNATIVE_LONGDOUBLE
-NSIG
 OPEN_EXISTING
 O_NONBLOCK
 PIPE_BUF
@@ -1010,7 +993,6 @@ SO_REUSEPORT
 STRICT
 TCGETA
 TCGETS
-TCP_NODELAY
 TCSETA
 TCSETS
 TLS_MINIMUM_AVAILABLE
@@ -1051,7 +1033,6 @@ _COMPILER_VERSION
 _CRAYMPP
 _CRAYT3E
 _DEBUG
-_DLL
 _GNU_SOURCE
 _HPUX_SOURCE
 _INC_WINDOWS
diff --git a/ASNMP/ChangeLog b/ASNMP/ChangeLog
index 7cc2b42080b..1644575faa8 100644
--- a/ASNMP/ChangeLog
+++ b/ASNMP/ChangeLog
@@ -1,9 +1,3 @@
-Thu Apr 29 06:46:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Makefile: changed SRC to PSRC (for make depend).
-          Thanks to Sandeep Goyal <sagoyal@hss.hns.com> for reporting
-          that the Makefile was broken.
-
 Mon Dec 28 22:03:57 1998  David L. Levine  <levine@cs.wustl.edu>
 
         * agent/main.cpp: added #include "ace/inc_user_config.h", for
diff --git a/ASNMP/asnmp/ChangeLog b/ASNMP/asnmp/ChangeLog
index af4c2469745..7eaaf7140ab 100644
--- a/ASNMP/asnmp/ChangeLog
+++ b/ASNMP/asnmp/ChangeLog
@@ -1,20 +1,3 @@
-Tue Mar 16 16:28:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * address.cpp, address.h, asn1.cpp, asn1.h, counter.cpp, ctr64.cpp,
-          gauge.cpp, integer.cpp, octet.cpp, oid.cpp, pdu.cpp, sagent.cpp,
-          snmp.cpp, target.cpp, timetick.cpp, transaction.cpp, vb.cpp,
-          wpdu.cpp:
-          replaced TRUE with 1, and FALSE and NULL with 0.  Thanks to
-          Achint Sandhu <sandhu@nortelnetworks.com> for reporting that
-          TRUE and FALSE weren't define on his Linux platform.
-
-        * wpdu.cpp (set_trap_info): wrapped condition with () to
-          avoid g++ warning about using result of an assignment as
-          the condition.
-
-        * ctr64.cpp: made MAX64 unsigned, to avoid warning about it
-          being to big to be signed.
-
 Wed Jul 15 20:27:23 1998  Mike MacFaden  <mrm@tango.cs.wustl.edu>
     * asn1.cpp - Hien Nguyen <hnguyen@apexgrp.com> fixed these bugs:
 
@@ -34,12 +17,12 @@ Wed Jul 15 20:27:23 1998  Mike MacFaden  <mrm@tango.cs.wustl.edu>
     perform a memcpy to copy the OID.  The allocated memory is freed in
     cmu_snmp::free_pdu() as currently implemented.
 
-    3.  The V1 trap agent-addr field is currently initialized to "0.0.0.0".
+    3.  The V1 trap agent-addr field is currently initialized to "0.0.0.0". 
     I changed wpdu::set_trap_info to initialize it to the local host IP
     Address.
 
     4.  I noticed that the memory allocation for OID in asn1.cpp using
-    ACE_NEW consistently use (OID length * size(oid)) as the size.
+    ACE_NEW consistently use (OID length * size(oid)) as the size. 
     Shouldn't it be simply OID length ?  Since there are numerous instances
     of this usage in asn1.cpp, I have not fixed those.  If you can double
     check and fix these, I appreciate it.
@@ -47,115 +30,115 @@ Wed Jul 15 20:27:23 1998  Mike MacFaden  <mrm@tango.cs.wustl.edu>
 
 Wed Aug 20 15:11:23 1997  Mike MacFaden  <mrm@tango.cs.wustl.edu>
 
-        * rebuilt Makefile using g++dep
-
-        *  pdu.h pdu.cpp initialization errors fixed
-
+	* rebuilt Makefile using g++dep
+	
+	*  pdu.h pdu.cpp initialization errors fixed
+	
         * address.h address.cpp IpAddress::to_octet() added
-
+	
 Fri Aug  1 19:23:52 1997  Mike MacFaden  (mrm@mrm-ss20)
 
       * NOTES: This first version only tested on Solaris 2.5
 
-      * review classes for thread safety. Current thread design only
+      * review classes for thread safety. Current thread design only 
         allows for one thread to safely access any ASNMP object created.
 
       * run purify test of get routine no -memory leaks.
 
       * verify both shared archive/static archive types work with
-        example programs
+ 	example programs
 
       * << Globals Changes >>
 
-        * tested only archiver library version
+        * tested only archiver library version 
 
-        * reformat code to use one brace style.
+	* reformat code to use one brace style. 
 
-        * changed all manifest constants defined as _XX to XX_ to stay out
-        of compiler namespace
+      	* changed all manifest constants defined as _XX to XX_ to stay out
+ 	of compiler namespace
 
-        * change all OS calls to use ACE_OS:: portability layer, #include
-        <ace/OS.h>
+      	* change all OS calls to use ACE_OS:: portability layer, #include
+ 	<ace/OS.h>
 
-        * reformat code to use one consistent brace layout and redo
-        header using ACE
+	* reformat code to use one consistent brace layout and redo
+        header using ACE 
 
-        * remove semicolons on member functions foo{}; - not necessary
+	* remove semicolons on member functions foo{}; - not necessary 
 
-        * make get() methods const member functions
+	* make get() methods const member functions
 
-        * removed unnecessary casts that looked like this: and revamped
-          all memory allocations via ACE_NEW macro
+	* removed unnecessary casts that looked like this: and revamped
+ 	  all memory allocations via ACE_NEW macro
 
-          new_oid = (SmiLPUINT32) new unsigned long [ smival.value.oid.len
+	  new_oid = (SmiLPUINT32) new unsigned long [ smival.value.oid.len
 
-          To
+	  To
 
-          ACE_NEW(new_oid, SmiUINT32[ smival.value.oid.len])
+	  ACE_NEW(new_oid, SmiUINT32[ smival.value.oid.len])
 
-        * Collapsed default constructors with constructors to constructors
-          with default arguments.
+	* Collapsed default constructors with constructors to constructors
+ 	  with default arguments.
 
-        * removed unused #include <iostream.h>
+	* removed unused #include <iostream.h> 
 
-        * Added ACE_TRACE() to classes
+	* Added ACE_TRACE() to classes
 
-        * change get_printable() to to_string() - there will be more java
-          programmers in the future so this should be the first step...
+	* change get_printable() to to_string() - there will be more java
+ 	  programmers in the future so this should be the first step...
 
-        * removed ASYNC interface till it can be rebuilt using ACE patterns
-
-        * Attempt to make interface more type strict but leaving generic
-          interfaces as escape hatch. Example: CTarget becomes UdpTarget
-          for UDP/IP based agents.
+	* removed ASYNC interface till it can be rebuilt using ACE patterns
 
+	* Attempt to make interface more type strict but leaving generic
+ 	  interfaces as escape hatch. Example: CTarget becomes UdpTarget
+ 	  for UDP/IP based agents.
+ 
       * << Class Specific Changes >>
 
         * Oid class:
-          - remove char * routines, simplify class
-          - added suboid method and removed get_printable() overloads
-
-        * CTarget class:
-          - renamed to UdpTarget. Stay out of Microsoft Namespace per MSJ
-          Article by Allen Hollub.
+	  - remove char * routines, simplify class
+	  - added suboid method and removed get_printable() overloads
 
-        * Varbind class:
-          - remove generic set_value for char,int, etc. Too easy to get
-          this wrong. Allow just types defined.
-          - added overload for equality operator (==)
-          - added new constructor to allow setting full vb state oid,value, exception
-          - add to_string()
+	* CTarget class:
+	  - renamed to UdpTarget. Stay out of Microsoft Namespace per MSJ
+	  Article by Allen Hollub. 
 
-        * Address class:
-          - change manifest constants to enums for address lengths, add IP V6 lens
+	* Varbind class:
+	  - remove generic set_value for char,int, etc. Too easy to get
+	  this wrong. Allow just types defined. 
+	  - added overload for equality operator (==)
+	  - added new constructor to allow setting full vb state oid,value, exception  
+	  - add to_string()
 
-          - add a netbios name class, still pretty worthless since I don't have spec
-            in front of me yet...
+	* Address class:
+	  - change manifest constants to enums for address lengths, add IP V6 lens
 
-          - rewrite resolver calls to be thread safe and cleaner by moving to two
-            class (static) member functions:
+	  - add a netbios name class, still pretty worthless since I don't have spec
+	    in front of me yet...
 
-            // thread safe routine to lookup ip address given hostname
-            // return <> 0 on error
-            static int resolve_to_addr(const char *hostname, in_addr& quad_addr);
+	  - rewrite resolver calls to be thread safe and cleaner by moving to two
+	    class (static) member functions:
 
-            // thread safe routine to lookup name given ip address
-            // return <> 0 on error
-            static int resolve_to_hostname(const in_addr& quad_addr, char *hostname)
+	    // thread safe routine to lookup ip address given hostname
+	    // return <> 0 on error
+	    static int resolve_to_addr(const char *hostname, in_addr& quad_addr);
 
-        * added some interrogation routines to class IpAddress:
-          is_loopback() const;
+	    // thread safe routine to lookup name given ip address
+	    // return <> 0 on error
+	    static int resolve_to_hostname(const in_addr& quad_addr, char *hostname)
 
-        * Ctr64 class:
-          - added constructor using long long datatype (needs to be made
-          portable to NT
+	* added some interrogation routines to class IpAddress:
+	  is_loopback() const;
 
-        * Pdu class: add to_string()
+	* Ctr64 class:
+	  - added constructor using long long datatype (needs to be made
+	  portable to NT
 
-        * Classes added wpdu class:
-          - a new adpater class between CMU and HP pdu, varbind data structures
+	* Pdu class: add to_string()
 
-        * transaction class:
-          - implement get/getnext timeout and retry logic using ACE
-          Reactor class, ACE_Time_Value
+	* Classes added wpdu class:
+	  - a new adpater class between CMU and HP pdu, varbind data structures
 
+	* transaction class:
+	  - implement get/getnext timeout and retry logic using ACE
+	  Reactor class, ACE_Time_Value
+ 
diff --git a/ASNMP/asnmp/address.cpp b/ASNMP/asnmp/address.cpp
index 230788e9f67..5296f86ef21 100644
--- a/ASNMP/asnmp/address.cpp
+++ b/ASNMP/asnmp/address.cpp
@@ -25,15 +25,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
   =====================================================================*/
 
 #include "asnmp/address.h"
@@ -45,7 +45,7 @@ ACE_RCSID(asnmp, address, "$Id$")
 //=================================================================
 
 // allow destruction of derived classes
-Address::~Address()
+Address::~Address() 
 {
 }
 
@@ -53,8 +53,8 @@ Address::~Address()
 //-----------------------------------------------------------------
 // is the address object valid?
 int Address::valid() const
-{
-  return valid_flag;
+{ 
+  return valid_flag; 
 }
 
 //------------[ Address::trim_white_space( char * ptr) ]------------
@@ -76,11 +76,11 @@ void Address::trim_white_space( char * ptr)
 //TM: this is not used nor needed, remove?
 //-----[ element access ]----------------------------------------------
 unsigned char& Address::operator[]( const int position)
-{
+{ 
   if ( position < MAX_ADDR_SZ)
     return  address_buffer[ position];
   else
-    return address_buffer[0];
+    return address_buffer[0]; 
 }
 
 
@@ -89,9 +89,9 @@ unsigned char& Address::operator[]( const int position)
 int operator==( const Address &lhs, const Address &rhs)
 {
   if ( strcmp( (const char*) lhs, (const char*)rhs)==0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //-----------------------------------------------------------------------
@@ -107,27 +107,27 @@ int operator!=( const Address &lhs, const Address &rhs)
 int operator>( const Address &lhs, const Address &rhs)
 {
   if ( strcmp( (const char*) lhs, (const char*)rhs)>0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 // overloaded >= operator, is a1 > a2
 int operator>=( const Address &lhs,const Address &rhs)
 {
   if (( lhs > rhs) || ( lhs == rhs))
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 // overloaded < operator, is a1 <= a2
 int operator<=( const Address &lhs,const Address &rhs)
 {
   if (( lhs < rhs) || ( lhs == rhs))
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 
 }
 
@@ -137,9 +137,9 @@ int operator<=( const Address &lhs,const Address &rhs)
 int operator<( const Address &lhs, const Address &rhs)
 {
   if ( strcmp( (const char*) lhs, (const char*)rhs)<0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //------------------------------------------------------------------
@@ -147,11 +147,11 @@ int operator<( const Address &lhs, const Address &rhs)
 int operator==( const Address &lhs,const char *rhs)
 {
   if (!rhs && !lhs.valid())
-    return 1;
+    return TRUE;
   if (strcmp( (const char *) lhs, rhs)== 0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //------------------------------------------------------------------
@@ -166,11 +166,11 @@ int operator!=( const Address &lhs,const char *rhs)
 int operator>( const Address &lhs,const char *rhs)
 {
   if (!rhs)
-    return lhs.valid();  // if lhs valid then > 0, else invalid !> 0
+    return lhs.valid();  // if lhs valid then > NULL, else invalid !> NULL
   if (strcmp( (const char *) lhs, rhs)> 0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //------------------------------------------------------------------
@@ -178,11 +178,11 @@ int operator>( const Address &lhs,const char *rhs)
 int operator>=( const Address &lhs,const char *rhs)
 {
   if (!rhs)
-    return 1; // always >= 0
+    return TRUE; // always >= NULL
   if (strcmp( (const char *) lhs, rhs)>= 0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //-----------------------------------------------------------------
@@ -190,11 +190,11 @@ int operator>=( const Address &lhs,const char *rhs)
 int operator<( const Address &lhs,const char *rhs)
 {
   if (!rhs)
-    return 0; // always >= 0
+    return FALSE; // always >= NULL
   if (strcmp( (const char *) lhs, rhs)< 0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 //-----------------------------------------------------------------
@@ -202,11 +202,11 @@ int operator<( const Address &lhs,const char *rhs)
 int operator<=( const Address &lhs,const char *rhs)
 {
   if (!rhs)
-    return !lhs.valid(); // invalid == 0, else valid > 0
+    return !lhs.valid(); // invalid == NULL, else valid > NULL
   if (strcmp( (const char *) lhs, rhs)<= 0)
-    return 1;
+    return TRUE;
   else
-    return 0;
+    return FALSE;
 }
 
 
@@ -216,8 +216,8 @@ int operator<=( const Address &lhs,const char *rhs)
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 IpAddress::get_syntax()
-{
-  return sNMP_SYNTAX_IPADDR;
+{ 
+  return sNMP_SYNTAX_IPADDR; 
 }
 
 //-----[ IP Address copy constructor ]---------------------------------
@@ -229,8 +229,8 @@ IpAddress::IpAddress(const IpAddress &ipaddr)
   smival.value.string.ptr = address_buffer;
 
   iv_friendly_name_[0] = 0;
-  iv_friendly_name_status_ = 0;
-  valid_flag = ipaddr.valid_flag;
+  iv_friendly_name_status_ = 0;  
+  valid_flag = ipaddr.valid_flag; 
   if (valid_flag) {
     ACE_OS::memcpy(address_buffer, ipaddr.address_buffer,IPV4LEN);
     ACE_OS::strcpy( iv_friendly_name_, ipaddr.iv_friendly_name_);
@@ -242,7 +242,7 @@ IpAddress::IpAddress(const IpAddress &ipaddr)
 
 //-------[ default construct, an IP address with a string ]---------------------
 IpAddress::IpAddress( const char *inaddr): Address()
-{
+{ 
   // always initialize what type this object is
   smival.syntax = sNMP_SYNTAX_IPADDR;
   smival.value.string.len = IPV4LEN;
@@ -250,15 +250,15 @@ IpAddress::IpAddress( const char *inaddr): Address()
 
   if (ACE_OS::strlen(inaddr) == 0) {
 
-    valid_flag = 0;
-    iv_friendly_name_[0] = 0;
-    iv_friendly_name_status_ = 0;
+    valid_flag = FALSE; 
+    iv_friendly_name_[0] = 0; 
+    iv_friendly_name_status_ = 0; 
     IpAddress::format_output();
     return;
   }
 
   // parse_address initializes valid, address_buffer & iv_friendly_name_
-  valid_flag = parse_address(inaddr);
+  valid_flag = parse_address(inaddr); 
   IpAddress::format_output();
 }
 
@@ -271,7 +271,7 @@ IpAddress::IpAddress( const GenAddress &genaddr)
   smival.value.string.len = IPV4LEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = 0;
+  valid_flag = FALSE;
   iv_friendly_name_[0] = 0;
   iv_friendly_name_status_ = 0;
   // allow use of an ip or udp genaddress
@@ -282,16 +282,16 @@ IpAddress::IpAddress( const GenAddress &genaddr)
       IpAddress temp_ip( (const char *) genaddr);
       *this = temp_ip;
     }
-  }
+  } 
   else
     if (genaddr.get_type() == type_udp) {
       valid_flag = genaddr.valid();
       if ( valid_flag) {
-        // copy in the IP address data
-        UdpAddress temp_udp( (const char *) genaddr);
-        *this = temp_udp;
+	// copy in the IP address data
+	UdpAddress temp_udp( (const char *) genaddr);
+	*this = temp_udp;
       }
-    }
+    } 
   IpAddress::format_output();
 }
 
@@ -306,7 +306,7 @@ int IpAddress::is_loopback() const
  if (valid()) {
    return (*(u_long *)&address_buffer == INADDR_LOOPBACK);
  }
-  return 0;
+  return FALSE; 
 }
 
 int IpAddress::is_multicast() const
@@ -314,29 +314,29 @@ int IpAddress::is_multicast() const
  if (valid()) {
    return (IN_MULTICAST(*(u_long *)&address_buffer));
  }
-  return 0;
+  return FALSE; 
 }
 
 // Private addressess not are not assignable in the Internet, they are
 // defined in RFC 1597 as: 10, 172.16, and 192.168.0
-// Some companies use them internally and apply NAT to allow translation
-// instead of paying for ip networks.
+// Some companies use them internally and apply NAT to allow translation 
+// instead of paying for ip networks. 
 // Cisco IOS devices can provide NAT aka Network Address Translation
-// but don't expect SNMP based networks to handle cross-NAT address spaces.
+// but don't expect SNMP based networks to handle cross-NAT address spaces. 
 // assumes storage in network byte order  mrm@cisco.com 7/28/97
 
 int IpAddress::is_private() const
 {
  if (valid()) {
    if (address_buffer[0] == 10)
-     return 1;
+     return TRUE;
    if (address_buffer[0] == 172 && address_buffer[1] == 16)
-     return 1;
+     return TRUE;
    if (address_buffer[0] == 192 && address_buffer[1] == 168  &&
       address_buffer[2] == 0)
-     return 1;
+     return TRUE;
  }
-  return 0;
+  return FALSE; 
 }
 
 
@@ -345,14 +345,14 @@ void IpAddress::to_octet(OctetStr& octet) const
 {
    octet.set_data( smival.value.string.ptr, smival.value.string.len);
 }
-
+ 
 
 int IpAddress::is_broadcast() const
 {
  if (valid()) {
    return ( (*(u_long *)&address_buffer) & INADDR_BROADCAST);
  }
-  return 0;
+  return FALSE; 
 }
 
 //-----[ IP Address general = operator ]-------------------------------
@@ -362,22 +362,22 @@ SnmpSyntax& IpAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
     return *this;
 
-  valid_flag = 0;       // will get set 1 if really valid
-  iv_friendly_name_[0]=0;
+  valid_flag = 0;	// will get set TRUE if really valid
+  iv_friendly_name_[0]=0;  
 
   if (val.valid()) {
     switch (val.get_syntax()) {
     case sNMP_SYNTAX_IPADDR:
     case sNMP_SYNTAX_OCTETS:
       if (((IpAddress &)val).smival.value.string.len ==IPV4LEN) {
-        ACE_OS::memcpy(address_buffer,
-                       ((IpAddress &)val).smival.value.string.ptr,IPV4LEN);
-        valid_flag = 1;
+	ACE_OS::memcpy(address_buffer, 
+		       ((IpAddress &)val).smival.value.string.ptr,IPV4LEN);
+	valid_flag = 1;
       }
       break;
 
       // NOTE: as a value add, other types could have "logical"
-      // mappings, i.e. integer32 and unsigned32
+      // mappings, i.e. integer32 and unsigned32 
     }
   }
   IpAddress::format_output();
@@ -391,8 +391,8 @@ IpAddress& IpAddress::operator=( const IpAddress &ipaddress)
   if ( this == &ipaddress )
     return *this;
 
-  valid_flag = ipaddress.valid_flag;
-  iv_friendly_name_[0]=0;
+  valid_flag = ipaddress.valid_flag; 
+  iv_friendly_name_[0]=0;  
 
   if (valid_flag) {
     ACE_OS::memcpy(address_buffer, ipaddress.address_buffer, IPV4LEN);
@@ -404,18 +404,18 @@ IpAddress& IpAddress::operator=( const IpAddress &ipaddress)
 
 
 //--------[ create a new instance of this Value ]-----------------------
-SnmpSyntax *IpAddress::clone() const
-{
-  return (SnmpSyntax *) new IpAddress(*this);
+SnmpSyntax *IpAddress::clone() const 
+{ 
+  return (SnmpSyntax *) new IpAddress(*this); 
 }
 
 //-------[ return the Fully Qualified Domain Name ]----------------------
 char *IpAddress::resolve_hostname(int &status)
-{
+{  
   if ((iv_friendly_name_[0] == 0) && valid_flag)
     addr_to_friendly();
   status = iv_friendly_name_status_;
-  return iv_friendly_name_;
+  return iv_friendly_name_; 
 }
 
 // parse a dotted string
@@ -424,19 +424,19 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr)
   char *ip_token;
   int token_count=0;
   unsigned int value;
-  int error_status = 0;
+  int error_status = FALSE;
   char temp[MAXHOSTNAMELEN +1];  // temp buffer for destruction
   int z,w;
 
   // check len, an ip can never be bigger than 15
   // 123456789012345
   // XXX.XXX.XXX.XXX
-  if ( !inaddr || (ACE_OS::strlen( inaddr) > 30))
-    return 0;
+  if ( !inaddr || (ACE_OS::strlen( inaddr) > 30)) 
+    return FALSE;
   ACE_OS::strcpy( temp, inaddr);
   trim_white_space( temp);
-  if ( ACE_OS::strlen( temp) > 15)
-    return 0;
+  if ( ACE_OS::strlen( temp) > 15) 
+    return FALSE;
 
   // must only have three dots
   // strtok will not catch this !
@@ -447,42 +447,42 @@ int IpAddress::parse_dotted_ipstring( const char *inaddr)
     ptr++;
   }
   if ( dot_count != 3)
-    return 0;
+    return FALSE;
 
   // look for dot token separator
   ip_token = strtok( (char *) temp,".");
 
   // while more tokens..
-  while ( ip_token != 0) {
+  while ( ip_token != NULL) {
     // verify that the token is all numerics
     w = ACE_OS::strlen( ip_token);
-    if (w>3)
-      return 0;
+    if (w>3) 
+      return FALSE;
     for (z=0;z<w;z++)
       if (( ip_token[z] < '0') || ( ip_token[z] > '9'))
-        return 0;
+	return FALSE;
 
-    value = ( unsigned int) strtod(ip_token,0);
+    value = ( unsigned int) strtod(ip_token,NULL);
     if (( value > 0)&& ( value <=255))
       address_buffer[token_count] = (unsigned char) value;
     else
       if ( strcmp(ip_token,"0")==0)
-        address_buffer[token_count]= (unsigned char) 0;
+	address_buffer[token_count]= (unsigned char) 0;
       else
-        error_status = 1;
+	error_status = TRUE;
     token_count++;
-    ip_token = strtok( 0, ".");
+    ip_token = strtok( NULL, ".");
   }
 
   // gota be four in len
   if ( token_count != 4)
-    return 0;
+    return FALSE;
 
   // any parsing errors?
   if ( error_status)
-    return 0;
+    return FALSE;
 
-  return 1;
+  return TRUE;
 }
 
 //-----[ IP Address parse Address ]---------------------------------
@@ -505,29 +505,29 @@ int IpAddress::parse_address( const char *inaddr)
 
     // since this is a valid dotted string
     // don't do any DNS (Performance!)
-    return 1;
+    return TRUE;
   }
   else {
     int rc;
     if ((rc = resolve_to_address(inaddr, ipAddr)) == 0) {
 
-        // now lets check out the dotted string
-        ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN);
+	// now lets check out the dotted string
+	ACE_OS::strncpy( ds, ACE_OS::inet_ntoa(ipAddr), MAXHOSTNAMELEN);
 
-        if ( !parse_dotted_ipstring( ds))
-          return 0;
+	if ( !parse_dotted_ipstring( ds))
+	  return FALSE;
 
-        // save the friendly name
-        ACE_OS::strcpy( iv_friendly_name_, inaddr);
-        return 1;
+	// save the friendly name
+	ACE_OS::strcpy( iv_friendly_name_, inaddr);
+	return TRUE;
 
-    }    // end if lookup result
+    }	 // end if lookup result
     else {
       iv_friendly_name_status_ = rc;
-      return 0;
+      return FALSE;
     }
   }  // end else not a dotted string
-  return 1;
+  return TRUE;
 }
 
 // using the currently defined address, do a DNS
@@ -561,22 +561,22 @@ int IpAddress::resolve_to_hostname(const in_addr& quad_addr, char *hostname)
   ACE_OS::memset(&buffer, 0, sizeof(ACE_HOSTENT_DATA));
 
   // reverse lookup (requires in-addr.arpa to be setup in DNS
-  if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN,
+  if (ACE_OS::gethostbyaddr_r((const char *)&quad_addr.s_addr, IPV4LEN, 
                           AF_INET, &lookupResult, buffer, &loc_errno)) {
 
     // verify right type of record
-    if (lookupResult.h_addrtype == AF_INET &&
-        lookupResult.h_length == IPV4LEN) {
-      ACE_OS::strcpy( hostname, lookupResult.h_name);
+    if (lookupResult.h_addrtype == AF_INET && 
+	lookupResult.h_length == IPV4LEN) {
+      ACE_OS::strcpy( hostname, lookupResult.h_name); 
       // setup multiple entries
       return 0;
     }
     else {
-      ACE_ASSERT(0);            // todo add trace and debug and dump
-      return -1;                // wrong resource record type
+      ACE_ASSERT(0);		// todo add trace and debug and dump
+      return -1;		// wrong resource record type
     }
   }
-
+    
   return loc_errno;
 }
 
@@ -589,11 +589,11 @@ int IpAddress::resolve_to_address(const char *hostname, in_addr& quad_addr)
    ACE_OS::memset(&lookupResult, 0, sizeof(struct hostent));
    int loc_errno = 0;
    if (ACE_OS::gethostbyname_r( hostname, &lookupResult, buffer, &loc_errno)) {
-     if (lookupResult.h_length == sizeof(in_addr) &&
-         lookupResult.h_addrtype == AF_INET) {
+     if (lookupResult.h_length == sizeof(in_addr) && 
+	 lookupResult.h_addrtype == AF_INET) {
         ACE_OS::memcpy((void *) &quad_addr,
                        (void *) lookupResult.h_addr_list[0], sizeof(in_addr));
-        return 0;
+        return 0; 
      }
     else
        return -1;  // wrong address size
@@ -619,22 +619,22 @@ void IpAddress::format_output()
   // if valid format else null it
   if ( valid_flag)
     ACE_OS::sprintf( (char *) output_buffer,"%d.%d.%d.%d",address_buffer[0],
-             address_buffer[1], address_buffer[2], address_buffer[3]);
+	     address_buffer[1], address_buffer[2], address_buffer[3]);
   else
     output_buffer[0] = 0;
 }
 
 //------[ return the type ]----------------------------------
-addr_type IpAddress::get_type() const
-{
-  return type_ip;
+addr_type IpAddress::get_type()	const
+{ 
+  return type_ip; 
 }
 
 //-----------------------------------------------------------------
 // logically and two IPaddresses and
 // return the new one
 void IpAddress::mask( const IpAddress& ipaddr)
-{
+{ 
   if ( this->valid() && ipaddr.valid())  {
      this->address_buffer[0] = this->address_buffer[0] & ipaddr.address_buffer[0];
      this->address_buffer[1] = this->address_buffer[1] & ipaddr.address_buffer[1];
@@ -642,7 +642,7 @@ void IpAddress::mask( const IpAddress& ipaddr)
      this->address_buffer[3] = this->address_buffer[3] & ipaddr.address_buffer[3];
      format_output();
   }
-
+ 
 }
 
 //=======================================================================
@@ -650,7 +650,7 @@ void IpAddress::mask( const IpAddress& ipaddr)
 //=======================================================================
 
 
-Address_Iter::Address_Iter(const char *hostname): valid_(0), count_(0),
+Address_Iter::Address_Iter(const char *hostname): valid_(FALSE), count_(0), 
   entry_(0)
 {
    ACE_OS::memset(&buffer_, 0, sizeof(ACE_HOSTENT_DATA));
@@ -658,20 +658,20 @@ Address_Iter::Address_Iter(const char *hostname): valid_(0), count_(0),
    if (ACE_OS::inet_addr(hostname) == -1)
      valid_ = query_dns(hostname);
    else {
-     ACE_ASSERT(0);             // don't support dot-quad lookup yet
+     ACE_ASSERT(0);		// don't support dot-quad lookup yet
    }
 
    // count number of hostnames
    int n;
    char **pc;
-   for (n = 0, pc = lookupResult_.h_addr_list; *pc != 0; ++n, ++pc);
-   count_ = n;          // plus first one
+   for (n = 0, pc = lookupResult_.h_addr_list; *pc != NULL; ++n, ++pc);
+   count_ = n;		// plus first one 
    entry_ = lookupResult_.h_addr_list;
 }
 
 int Address_Iter::valid() const
 {
-  return (valid_ == 1);
+  return (valid_ == TRUE);
 }
 
 int Address_Iter::how_many_addresses()
@@ -687,7 +687,7 @@ int Address_Iter::next(IpAddress& addr)
 
   IpAddress tmp(*entry_++); // return data
   addr = tmp;
-  if (*entry_ == 0)
+  if (*entry_ == NULL)
     return 1;
   return 0;
 }
@@ -696,11 +696,11 @@ int Address_Iter::next(IpAddress& addr)
 int Address_Iter::query_dns(const char *hostname)
 {
   int loc_errno = 0;
-  if (ACE_OS::gethostbyname_r( hostname, &lookupResult_, buffer_,
-                                &loc_errno)) {
-    if (lookupResult_.h_length == sizeof(IPV4LEN) &&
-        lookupResult_.h_addrtype == AF_INET) {
-      return 0;
+  if (ACE_OS::gethostbyname_r( hostname, &lookupResult_, buffer_, 
+				&loc_errno)) {
+    if (lookupResult_.h_length == sizeof(IPV4LEN) && 
+	lookupResult_.h_addrtype == AF_INET) {
+      return 0; 
     }
     else
       return -1;  // wrong address size
@@ -714,8 +714,8 @@ int Address_Iter::query_dns(const char *hostname)
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 UdpAddress::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 //-----------------[ construct an Udp address with another Udp address ]---
@@ -750,7 +750,7 @@ UdpAddress::UdpAddress( const char *inaddr):IpAddress()
   smival.value.string.len = UDPIPV4LEN;
   smival.value.string.ptr = address_buffer;
 
-   valid_flag = parse_address( (char *)inaddr);
+   valid_flag = parse_address( (char *)inaddr); 
    format_output();
 }
 
@@ -763,7 +763,7 @@ UdpAddress::UdpAddress( const GenAddress &genaddr):IpAddress()
   smival.value.string.ptr = address_buffer;
 
   unsigned int port = 0;
-  valid_flag = 0;
+  valid_flag = FALSE;
 
   // allow use of an ip or udp genaddress
   if (genaddr.get_type() == type_udp)
@@ -821,27 +821,27 @@ SnmpSyntax& UdpAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  valid_flag=0;         // will get set 1 if really valid
+  valid_flag=0;		// will get set TRUE if really valid
   if (val.valid()){
     switch (val.get_syntax()){
-    case sNMP_SYNTAX_IPADDR:
+    case sNMP_SYNTAX_IPADDR: 
     {
       UdpAddress temp_udp(val.to_string());
-      *this = temp_udp; // valid_flag is set by the udp assignment
+      *this = temp_udp;	// valid_flag is set by the udp assignment
     }
     break;
 
     case sNMP_SYNTAX_OCTETS:
       if (((UdpAddress &)val).smival.value.string.len == UDPIPV4LEN){
          ACE_OS::memcpy(address_buffer,
-                 ((UdpAddress &)val).smival.value.string.ptr, UDPIPV4LEN);
+		 ((UdpAddress &)val).smival.value.string.ptr, UDPIPV4LEN);
          iv_friendly_name_[0] = 0;
          valid_flag = 1;
       }
     break;
 
     // NOTE: as a value add, other types could have "logical"
-    // mappings, i.e. integer32 and unsigned32
+    // mappings, i.e. integer32 and unsigned32 
     }
   }
   format_output();
@@ -856,7 +856,7 @@ UdpAddress& UdpAddress::operator=( const UdpAddress &udpaddr)
       return *this;
 
   (IpAddress &)*this = udpaddr; // use ancestor assignment for ipaddr value
-  set_port(udpaddr.get_port()); // copy to port value
+  set_port(udpaddr.get_port());	// copy to port value
   format_output();
   return *this;
 }
@@ -871,19 +871,19 @@ int UdpAddress::parse_address( const char *inaddr)
   if (inaddr && (ACE_OS::strlen( inaddr)< MAXHOSTNAMELEN +1))
     ACE_OS::strcpy( buffer, inaddr);
   else {
-    valid_flag = 0;
-    return 0;
+    valid_flag = FALSE;
+    return FALSE;
   }
   // look for port info @ the end of the string
   // port can be delineated by a ':' or a '/'
-  // if neither are present then just treat it
+  // if neither are present then just treat it 
   // like a normal IpAddress
   char *tmp;
   tmp = ACE_OS::strstr( buffer,":");
-  if (tmp==0)
+  if (tmp==NULL) 
     tmp = ACE_OS::strstr(buffer,"/");
 
-  if ( tmp != 0) {
+  if ( tmp != NULL) {
     *tmp=0;   // null terminator
     tmp++;
     port = ACE_OS::atoi( tmp);
@@ -895,14 +895,14 @@ int UdpAddress::parse_address( const char *inaddr)
 
 
 //----------[ create a new instance of this Value ]------------------------
-SnmpSyntax *UdpAddress::clone() const
-{
-  return (SnmpSyntax *) new UdpAddress(*this);
+SnmpSyntax *UdpAddress::clone() const 
+{ 
+  return (SnmpSyntax *) new UdpAddress(*this); 
 }
 
 //--------[ set the port number ]---------------------------------------
 void UdpAddress::set_port( const unsigned short p)
-{
+{ 
   unsigned short port_nbo = htons(p);
   ACE_OS::memcpy(&address_buffer[IPV4LEN], &port_nbo, 2);
   format_output();
@@ -910,20 +910,20 @@ void UdpAddress::set_port( const unsigned short p)
 
 //---------[ get the port number ]--------------------------------------
 unsigned short UdpAddress::get_port() const
-{
+{ 
   if (valid_flag) {
     unsigned short port_nbo;
     ACE_OS::memcpy(&port_nbo, &address_buffer[IPV4LEN], 2);
-    return ntohs(port_nbo);
+    return ntohs(port_nbo); 
   }
   else
-    return 0;                   // don't use uninitialized memory
+    return 0;			// don't use uninitialized memory
 }
 
 //------[ return the type ]--------------------------------------------
 addr_type UdpAddress::get_type() const
-{
-  return type_udp;
+{ 
+  return type_udp; 
 }
 
 //----[ UDP address char * cast ]--------------------------------------
@@ -946,8 +946,8 @@ void UdpAddress::format_output()
   // if valid format else null it
   if ( valid_flag)
     ACE_OS::sprintf( (char *) output_buffer,"%s:%d",
-                    IpAddress::to_string(),
-                    get_port() );
+		    IpAddress::to_string(), 
+		    get_port() );
   else
     output_buffer[0] = 0;
 }
@@ -963,7 +963,7 @@ void NetbiosAddress::format_output()
     ACE_OS::memcpy(output_buffer, address_buffer, NETBIOSLEN);
   else
     output_buffer[0] = 0;
-}
+} 
 
 void NetbiosAddress::InitNBAddr(const char *inaddr)
 {
@@ -972,8 +972,8 @@ void NetbiosAddress::InitNBAddr(const char *inaddr)
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = NETBIOSLEN;
     smival.value.string.ptr = address_buffer;
-
-    valid_flag=0;
+ 
+    valid_flag=FALSE;
     NetbiosAddress::format_output();
     return;
   }
@@ -982,7 +982,7 @@ void NetbiosAddress::InitNBAddr(const char *inaddr)
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = IPXLEN;
   smival.value.string.ptr = address_buffer;
-
+ 
   valid_flag = parse_address( (char *) inaddr);
   NetbiosAddress::format_output();
 }
@@ -1001,26 +1001,26 @@ NetbiosAddress::NetbiosAddress( const char *inaddr,  nb_service svc)
 }
 
 // TODO: go back over ms/ibm specs and verify this
-// 16 chars, 15 can be any character, 16th is service number between 0 and 20
-// names beginning with IBM are reserved, and hence invalid
+// 16 chars, 15 can be any character, 16th is service number between 0 and 20 
+// names beginning with IBM are reserved, and hence invalid 
 // and doubt IBM would use this class anyway
 int NetbiosAddress::parse_address(const char *address)
 {
   if (ACE_OS::strlen(address) > NETBIOSLEN)
-      return 0; // invalid
+      return FALSE; // invalid
 
   if (ACE_OS::strncmp(address, "IBM", 3) == 0)
-     return 0;   // invalid
+     return FALSE;   // invalid 
 
   // addresses are free form but this  check may need to be expose to user
   //
   //if (address[15] < nb_workstation || address[15] > nb_server)
-  //   return 0; //invalid service type
+  //   return FALSE; //invalid service type
 
   ACE_OS::memset(address_buffer, 0, NETBIOSLEN);
   ACE_OS::memcpy(address_buffer, address, NETBIOSLEN);
 
-  return 1; // valid
+  return TRUE; // valid
 }
 
 NetbiosAddress::NetbiosAddress( const NetbiosAddress& nbaddr)
@@ -1029,21 +1029,21 @@ NetbiosAddress::NetbiosAddress( const NetbiosAddress& nbaddr)
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = NETBIOSLEN;
   smival.value.string.ptr = address_buffer;
-
+ 
   valid_flag = nbaddr.valid_flag;
   if (valid_flag)
      ACE_OS::memcpy(address_buffer, nbaddr.address_buffer, NETBIOSLEN);
   NetbiosAddress::format_output();
 }
-
+ 
 NetbiosAddress::NetbiosAddress( const GenAddress& genaddr)
 {
   // always initialize SMI info
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = NETBIOSLEN;
   smival.value.string.ptr = address_buffer;
-
-  valid_flag = 0;
+ 
+  valid_flag = FALSE;
   // allow use of an ipx or ipxsock address
   if ( (genaddr.get_type() == type_nb) ) {
     valid_flag = genaddr.valid();
@@ -1055,11 +1055,11 @@ NetbiosAddress::NetbiosAddress( const GenAddress& genaddr)
   }
   NetbiosAddress::format_output();
 }
-
+ 
 NetbiosAddress::~NetbiosAddress()
 {
 }
-
+ 
 char *NetbiosAddress::to_string()
 {
   return (char *)output_buffer;
@@ -1069,18 +1069,18 @@ void NetbiosAddress::to_octet(OctetStr& octet) const
 {
    octet.set_data( smival.value.string.ptr, smival.value.string.len);
 }
-
+ 
 NetbiosAddress& NetbiosAddress::operator=( const NetbiosAddress &val)
 {
  // protect against assignment from itself
   if ( this == &val )
       return *this;
-
-  valid_flag = 0;         // will set to 1 if really valid
+ 
+  valid_flag = 0;         // will set to TRUE if really valid
   if (val.valid()) {
     switch (((NetbiosAddress *) &val)->get_syntax()) {
     case sNMP_SYNTAX_OCTETS:
-        ACE_OS::memcpy(address_buffer,
+        ACE_OS::memcpy(address_buffer, 
                ((NetbiosAddress &)val).smival.value.string.ptr, NETBIOSLEN);
         valid_flag = 1;
     break;
@@ -1089,7 +1089,7 @@ NetbiosAddress& NetbiosAddress::operator=( const NetbiosAddress &val)
   NetbiosAddress::format_output();
   return *this;
 }
-
+ 
 nb_service NetbiosAddress::get_service_type() const
 {
   return (nb_service) address_buffer[15];
@@ -1100,24 +1100,24 @@ void NetbiosAddress::set_service_type(nb_service nbservice)
   address_buffer[15] = nbservice;
   NetbiosAddress::format_output();
 }
-
+ 
 NetbiosAddress::operator const char *() const
 {
   return (char *)output_buffer;
 }
-
+ 
 SnmpSyntax& NetbiosAddress::operator=( SnmpSyntax &val)
 {
   // protect against assignment from itself
   if ( this == &val )
       return *this;
-
-  valid_flag = 0;         // will set to 1 if really valid
+ 
+  valid_flag = 0;         // will set to TRUE if really valid
   if (val.valid()) {
     switch (val.get_syntax()) {
     case sNMP_SYNTAX_OCTETS:
       if (((NetbiosAddress &)val).smival.value.string.len == NETBIOSLEN) {
-        ACE_OS::memcpy(address_buffer,
+        ACE_OS::memcpy(address_buffer, 
              ((NetbiosAddress &)val).smival.value.string.ptr, NETBIOSLEN);
         valid_flag=1;
       }
@@ -1132,15 +1132,15 @@ SnmpSyntax *NetbiosAddress::clone() const
 {
   return (SnmpSyntax *) new NetbiosAddress(*this);
 }
-
+ 
 SmiUINT32 NetbiosAddress::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 addr_type NetbiosAddress::get_type() const
-{
-  return type_nb;
+{ 
+  return type_nb; 
 }
 
 //=======================================================================
@@ -1149,22 +1149,22 @@ addr_type NetbiosAddress::get_type() const
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 IpxAddress::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 
 //----------[ default constructor with a string arg ]---------------------------
 IpxAddress::IpxAddress( const char  *inaddr):Address( )
-{
+{ 
   if (ACE_OS::strlen(inaddr) == 0) {
     // always initialize SMI info
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = IPXLEN;
     smival.value.string.ptr = address_buffer;
-
+   
     separator = '\0';
-    valid_flag=0;
+    valid_flag=FALSE;
     IpxAddress::format_output();
     return;
   }
@@ -1174,7 +1174,7 @@ IpxAddress::IpxAddress( const char  *inaddr):Address( )
   smival.value.string.ptr = address_buffer;
 
   separator = '\0';
-  valid_flag = parse_address( (char *) inaddr);
+  valid_flag = parse_address( (char *) inaddr); 
   IpxAddress::format_output();
 }
 
@@ -1203,7 +1203,7 @@ IpxAddress::IpxAddress( const GenAddress &genaddr)
   smival.value.string.len = IPXLEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = 0;
+  valid_flag = FALSE;
   // allow use of an ipx or ipxsock address
   if ( (genaddr.get_type() == type_ipx) ) {
     valid_flag = genaddr.valid();
@@ -1217,9 +1217,9 @@ IpxAddress::IpxAddress( const GenAddress &genaddr)
     if ( (genaddr.get_type() == type_ipxsock) ) {
       valid_flag = genaddr.valid();
       if ( valid_flag) {
-        // copy in the Ipx address data
-        IpxSockAddress temp_ipxsock( (const char *) genaddr);
-        *this = temp_ipxsock;
+	// copy in the Ipx address data
+	IpxSockAddress temp_ipxsock( (const char *) genaddr);
+	*this = temp_ipxsock;
       }
     }
   IpxAddress::format_output();
@@ -1239,13 +1239,13 @@ SnmpSyntax& IpxAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  valid_flag=0;         // will set to 1 if really valid
+  valid_flag=0;      	// will set to TRUE if really valid
   if (val.valid()){
     switch (val.get_syntax()){
-    case sNMP_SYNTAX_OCTETS:
+    case sNMP_SYNTAX_OCTETS: 
       if (((IpxAddress &)val).smival.value.string.len == IPXLEN){
-        ACE_OS::memcpy(address_buffer, ((IpxAddress &)val).smival.value.string.ptr, IPXLEN);
-        valid_flag=1;
+	ACE_OS::memcpy(address_buffer, ((IpxAddress &)val).smival.value.string.ptr, IPXLEN);
+	valid_flag=1;
       }
     break;
     }
@@ -1261,7 +1261,7 @@ IpxAddress& IpxAddress::operator=( const IpxAddress &ipxaddress)
   if ( this == &ipxaddress )
       return *this;
 
-  valid_flag = ipxaddress.valid_flag;
+  valid_flag = ipxaddress.valid_flag; 
   if (valid_flag)
     ACE_OS::memcpy(address_buffer, ipxaddress.address_buffer, IPXLEN);
   IpxAddress::format_output();
@@ -1270,14 +1270,14 @@ IpxAddress& IpxAddress::operator=( const IpxAddress &ipxaddress)
 
 
 // create a new instance of this Value
-SnmpSyntax *IpxAddress::clone() const
-{
-  return (SnmpSyntax *) new IpxAddress(*this);
+SnmpSyntax *IpxAddress::clone() const 
+{ 
+  return (SnmpSyntax *) new IpxAddress(*this); 
 }
 
 //-----[ IPX Address parse Address ]-----------------------------------
 // Convert a string to a ten byte ipx address
-// On success sets validity  1 or 0
+// On success sets validity  TRUE or FALSE
 //
 //     IPX address format
 //
@@ -1296,7 +1296,7 @@ SnmpSyntax *IpxAddress::clone() const
 //
 //
 // Input formats recognized
-//
+// 
 //  XXXXXXXX.XXXXXXXXXXXX
 //  XXXXXXXX:XXXXXXXXXXXX
 //  XXXXXXXX-XXXXXXXXXXXX
@@ -1312,7 +1312,7 @@ int IpxAddress::parse_address( const char *inaddr)
 
 
   // save the orginal source
-  if (!inaddr || (ACE_OS::strlen( inaddr) >(sizeof(temp)-1))) return 0;
+  if (!inaddr || (ACE_OS::strlen( inaddr) >(sizeof(temp)-1))) return FALSE;
   ACE_OS::strcpy( temp, inaddr);
   trim_white_space( temp);
   tmplen = ACE_OS::strlen(temp);
@@ -1323,8 +1323,8 @@ int IpxAddress::parse_address( const char *inaddr)
   //
   // XXXXXXXX-XXXXXX-XXXXXX 22 len
   // need at least 21 chars and no more than 22
-  if ( (tmplen <21) || (tmplen >22))
-    return 0;
+  if ( (tmplen <21) || (tmplen >22)) 
+    return FALSE;
 
   // convert the string to all lower case
   // this allows hex values to be in upper or lower
@@ -1342,11 +1342,11 @@ int IpxAddress::parse_address( const char *inaddr)
 
   // no dot or colon separator check
   separator = temp[8];
-  if (( separator != ':') &&
-      ( separator != '.') &&
-      ( separator != '-') &&
+  if (( separator != ':') && 
+      ( separator != '.') && 
+      ( separator != '-') && 
       ( separator != ' '))
-    return 0;
+    return FALSE;
 
   // separate the strings
   str1 = ( unsigned char *) temp;
@@ -1356,31 +1356,31 @@ int IpxAddress::parse_address( const char *inaddr)
   str1= ( unsigned char *) temp;
 
   // check len of the network portion
-  if ( ACE_OS::strlen((char *) str1) != 8)
-     return 0;
+  if ( ACE_OS::strlen((char *) str1) != 8) 
+     return FALSE;
 
   // check len of mac portion
-  if ( ACE_OS::strlen( (char *) str2) != 12)
-    return 0;
+  if ( ACE_OS::strlen( (char *) str2) != 12) 
+    return FALSE;
 
   // ok we like then lens, make sure that all chars are 0-f
   // check out the net id
   tmp = str1;
   while( *tmp != 0)
     if (((*tmp >= '0') && (*tmp <= '9'))||   // good 0-9
-        ((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
+	((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
       tmp++;
     else
-      return 0;
+      return FALSE;
 
   // check out the MAC address
   tmp = str2;
   while( *tmp != 0)
     if (((*tmp >= '0') && (*tmp <= '9'))||   // good 0-9
-        ((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
+	((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
       tmp++;
     else
-      return 0;
+      return FALSE;
 
   // convert to target string
   tmp = str1;
@@ -1416,7 +1416,7 @@ int IpxAddress::parse_address( const char *inaddr)
   address_buffer[8] = (str2[8]*16)  + str2[9];
   address_buffer[9] = (str2[10]*16) + str2[11];
 
-  return 1;
+  return TRUE;
 }
 
 //----[ IPX address char * cast ]--------------------------------------
@@ -1437,12 +1437,12 @@ void IpxAddress::format_output()
 {
   if ( valid_flag)
     ACE_OS::sprintf((char *) output_buffer,
-            "%02x%02x%02x%02x%c%02x%02x%02x%02x%02x%02x",
-            address_buffer[0],address_buffer[1],
-            address_buffer[2],address_buffer[3],'-',
-            address_buffer[4],address_buffer[5],
-            address_buffer[6],address_buffer[7],
-            address_buffer[8],address_buffer[9]);
+	    "%02x%02x%02x%02x%c%02x%02x%02x%02x%02x%02x",
+	    address_buffer[0],address_buffer[1],
+	    address_buffer[2],address_buffer[3],'-',
+	    address_buffer[4],address_buffer[5],
+	    address_buffer[6],address_buffer[7],
+	    address_buffer[8],address_buffer[9]);
   else
     output_buffer[0] = 0;
 }
@@ -1454,27 +1454,27 @@ int IpxAddress::get_hostid( MacAddress& mac)
    if ( valid_flag)
    {
        char buffer[18];
-       ACE_OS::sprintf( buffer,"%02x:%02x:%02x:%02x:%02x:%02x",
-                address_buffer[4],
+       ACE_OS::sprintf( buffer,"%02x:%02x:%02x:%02x:%02x:%02x", 
+		address_buffer[4],
                 address_buffer[5], address_buffer[6], address_buffer[7],
                 address_buffer[8], address_buffer[9]);
        MacAddress temp( buffer);
        // mac = (SnmpSyntax&) temp;
        mac = temp;
        if ( mac.valid())
-          return 1;
+          return TRUE;
        else
-          return 0;
+          return FALSE;
    }
    else
-      return 0;
+      return FALSE;
 }
 
 
 //------[ return the type ]----------------------------------
 addr_type IpxAddress::get_type() const
-{
-  return type_ipx;
+{ 
+  return type_ipx; 
 }
 
 void IpxAddress::to_octet(OctetStr& octet) const
@@ -1489,8 +1489,8 @@ void IpxAddress::to_octet(OctetStr& octet) const
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 IpxSockAddress::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 //-----------[ construct an IpxSockAddress with another IpxSockAddress]----
@@ -1515,7 +1515,7 @@ IpxSockAddress::IpxSockAddress( const char *inaddr):IpxAddress()
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = IPXSOCKLEN;
     smival.value.string.ptr = address_buffer;
-
+ 
     set_socket(0);
     format_output();
     return;
@@ -1526,7 +1526,7 @@ IpxSockAddress::IpxSockAddress( const char *inaddr):IpxAddress()
   smival.value.string.len = IPXSOCKLEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = parse_address( (char *) inaddr);
+  valid_flag = parse_address( (char *) inaddr); 
   format_output();
 }
 
@@ -1539,7 +1539,7 @@ IpxSockAddress::IpxSockAddress( const GenAddress &genaddr):IpxAddress()
   smival.value.string.len = IPXSOCKLEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = 0;
+  valid_flag = FALSE;
   unsigned short socketid = 0;
   // allow use of an ipx or ipxsock address
   if ( (genaddr.get_type() == type_ipx) )
@@ -1594,23 +1594,23 @@ SnmpSyntax& IpxSockAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  valid_flag=0;         // will set to 1 if really valid
+  valid_flag=0;      	// will set to TRUE if really valid
   if (val.valid()){
     switch (val.get_syntax()){
-    case sNMP_SYNTAX_OCTETS:
+    case sNMP_SYNTAX_OCTETS: 
       {
         // See if it is of the Ipx address family
         // This handles IpxSockAddress == IpxAddress
         IpxSockAddress temp_ipx(val.to_string());
         if (temp_ipx.valid()){
-          *this = temp_ipx;             // ipxsock = ipxsock
+          *this = temp_ipx;		// ipxsock = ipxsock
         }
         // See if it is an OctetStr of appropriate length
         else if (((IpxSockAddress &)val).smival.value.string.len == IPXSOCKLEN){
-          ACE_OS::memcpy(address_buffer,
-                 ((IpxSockAddress &)val).smival.value.string.ptr,
-                 IPXSOCKLEN);
-          valid_flag=1;
+	  ACE_OS::memcpy(address_buffer, 
+		 ((IpxSockAddress &)val).smival.value.string.ptr, 
+		 IPXSOCKLEN);
+	  valid_flag=1;
         }
       }
       break;
@@ -1627,17 +1627,17 @@ IpxSockAddress& IpxSockAddress::operator=( const IpxSockAddress &ipxaddr)
   if ( this == &ipxaddr )
       return *this;
 
-  (IpxAddress&)*this = ipxaddr;         // use ancestor assignment for ipx addr
-  set_socket(ipxaddr.get_socket());     // copy socket value
+  (IpxAddress&)*this = ipxaddr; 	// use ancestor assignment for ipx addr
+  set_socket(ipxaddr.get_socket());	// copy socket value
   format_output();
   return *this;
 }
 
 
 //----------[ create a new instance of this Value ]------------------------
-SnmpSyntax *IpxSockAddress::clone() const
-{
-  return (SnmpSyntax *) new IpxSockAddress(*this);
+SnmpSyntax *IpxSockAddress::clone() const 
+{ 
+  return (SnmpSyntax *) new IpxSockAddress(*this); 
 }
 
 //----[ IPXSock address char * cast ]--------------------------------------
@@ -1659,7 +1659,7 @@ void IpxSockAddress::format_output()
 
   if ( valid_flag)
     ACE_OS::sprintf((char *) output_buffer,"%s/%d",
-            IpxAddress::to_string(), get_socket());
+	    IpxAddress::to_string(), get_socket());
   else
     output_buffer[0] = 0;
 }
@@ -1674,17 +1674,17 @@ int IpxSockAddress::parse_address( const char *inaddr)
      ACE_OS::strcpy( buffer, inaddr);
    else
    {
-     valid_flag = 0;
-     return 0;
+     valid_flag = FALSE;
+     return FALSE;
    }
    // look for port info @ the end of the string
    // port can be delineated by a ':' or a '/'
-   // if neither are present then just treat it
+   // if neither are present then just treat it 
    // like a normal IpAddress
    char *tmp;
    tmp = ACE_OS::strstr( buffer,"/");
 
-   if (tmp != 0)
+   if (tmp != NULL)
    {
      *tmp=0;   // null terminator
      tmp++;
@@ -1698,19 +1698,19 @@ int IpxSockAddress::parse_address( const char *inaddr)
 
 //-------------[ set the socket number ]----------------------------------
 void IpxSockAddress::set_socket( const unsigned short s)
-{
+{ 
   unsigned short sock_nbo = htons(s);
   ACE_OS::memcpy(&address_buffer[IPXLEN], &sock_nbo, 2);
 }
 
 //--------------[ get the socket number ]---------------------------------
 unsigned short IpxSockAddress::get_socket() const
-{
+{ 
   if (valid_flag)
   {
     unsigned short sock_nbo;
     ACE_OS::memcpy(&sock_nbo, &address_buffer[IPXLEN], 2);
-    return ntohs(sock_nbo);
+    return ntohs(sock_nbo); 
   }
   else
     return 0; // don't use uninitialized memory
@@ -1719,7 +1719,7 @@ unsigned short IpxSockAddress::get_socket() const
 //------[ return the type ]----------------------------------------------
 addr_type IpxSockAddress::get_type() const
 {
-  return type_ipxsock;
+  return type_ipxsock; 
 }
 
 
@@ -1729,8 +1729,8 @@ addr_type IpxSockAddress::get_type() const
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 MacAddress::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 //-----[ MAC Address copy constructor ]---------------------------------
@@ -1749,14 +1749,14 @@ MacAddress::MacAddress(const MacAddress &macaddr)
 
 //---------[ constructor with a string argument ]-------------------------
 MacAddress::MacAddress( const char  *inaddr):Address( )
-{
+{ 
   if (ACE_OS::strlen(inaddr) == 0) {
      // always initialize SMI info
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = MACLEN;
     smival.value.string.ptr = address_buffer;
-
-    valid_flag=0;
+ 
+    valid_flag=FALSE;
     format_output();
     return;
   }
@@ -1766,7 +1766,7 @@ MacAddress::MacAddress( const char  *inaddr):Address( )
   smival.value.string.len = MACLEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = parse_address( (char *) inaddr);
+  valid_flag = parse_address( (char *) inaddr); 
   format_output();
 }
 
@@ -1778,7 +1778,7 @@ MacAddress::MacAddress( const GenAddress &genaddr)
   smival.value.string.len = MACLEN;
   smival.value.string.ptr = address_buffer;
 
-  valid_flag = 0;
+  valid_flag = FALSE;
   // allow use of mac address
   if (genaddr.get_type() == type_mac)
   {
@@ -1800,8 +1800,8 @@ MacAddress::~MacAddress()
 
 //---------[ MacAddress clone ]-------------------------------------------
 SnmpSyntax *MacAddress::clone() const
-{
-  return (SnmpSyntax *) new MacAddress(*this);
+{ 
+  return (SnmpSyntax *) new MacAddress(*this); 
 }
 
 //------[ assignment to another ipaddress object overloaded ]--------------
@@ -1811,7 +1811,7 @@ MacAddress& MacAddress::operator=( const MacAddress &macaddress)
   if ( this == &macaddress )
       return *this;
 
-  valid_flag = macaddress.valid_flag;
+  valid_flag = macaddress.valid_flag; 
   if (valid_flag)
     ACE_OS::memcpy(address_buffer, macaddress.address_buffer, MACLEN);
   format_output();
@@ -1827,14 +1827,14 @@ SnmpSyntax& MacAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  valid_flag=0;         // will set to 1 if really valid
+  valid_flag=0;      	// will set to TRUE if really valid
   if (val.valid()){
     switch (val.get_syntax()){
     case sNMP_SYNTAX_OCTETS:
       if (((MacAddress &)val).smival.value.string.len == MACLEN){
-        ACE_OS::memcpy(address_buffer,
-        ((MacAddress &)val).smival.value.string.ptr, MACLEN);
-        valid_flag=1;
+	ACE_OS::memcpy(address_buffer, 
+	((MacAddress &)val).smival.value.string.ptr, MACLEN);
+	valid_flag=1;
       }
     break;
     }
@@ -1845,7 +1845,7 @@ SnmpSyntax& MacAddress::operator=( SnmpSyntax &val)
 
 //-----[ MAC Address parse Address ]--------------------------------------
 // Convert a string to a six byte MAC address
-// On success sets validity 1 or 0
+// On success sets validity TRUE or FALSE
 //
 //     MAC address format
 //
@@ -1867,18 +1867,18 @@ int MacAddress::parse_address( const char *inaddr)
 
 
   // save the orginal source
-  if ( !inaddr || (ACE_OS::strlen( inaddr) > 30)) return 0;
+  if ( !inaddr || (ACE_OS::strlen( inaddr) > 30)) return FALSE;
   ACE_OS::strcpy( temp, inaddr);
   trim_white_space( temp);
 
   // bad total length check
-  if ( ACE_OS::strlen(temp) != 17)
-     return 0;
+  if ( ACE_OS::strlen(temp) != 17)  
+     return FALSE;
 
   // check for colons
   if ((temp[2] != ':')||(temp[5] != ':')||(temp[8]!=':')||(temp[11]!=':')
          ||(temp[14] !=':'))
-     return 0;
+     return FALSE;
 
   // strip off the colons
   tmp = ( unsigned char *) temp;
@@ -1893,20 +1893,20 @@ int MacAddress::parse_address( const char *inaddr)
      tmp++;
   }
   temp[i] = 0;
-
+  
   // convert to lower
   for(z=0;z<ACE_OS::strlen(temp);z++)
      temp[z] = tolower( temp[z]);
 
-
+  
   // check out the MAC address
   tmp = ( unsigned char *) temp;
   while( *tmp != 0)
     if (((*tmp >= '0') && (*tmp <= '9'))||   // good 0-9
-        ((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
+	((*tmp >= 'a') && (*tmp <= 'f')))    // or a-f
       tmp++;
     else
-      return 0;
+      return FALSE;
 
   // convert to target string
   tmp = (unsigned char *) temp;
@@ -1926,7 +1926,7 @@ int MacAddress::parse_address( const char *inaddr)
   address_buffer[4] =  (temp[8]*16) + temp[9];
   address_buffer[5] =  (temp[10]*16) + temp[11];
 
-  return 1;
+  return TRUE;
 }
 
 //----[ MAC address char * cast ]--------------------------------------
@@ -1945,16 +1945,16 @@ void MacAddress::format_output()
 {
   if ( valid_flag)
     sprintf(output_buffer,"%02x:%02x:%02x:%02x:%02x:%02x",address_buffer[0],
-            address_buffer[1],address_buffer[2],address_buffer[3],
-            address_buffer[4],address_buffer[5]);
+	    address_buffer[1],address_buffer[2],address_buffer[3],
+	    address_buffer[4],address_buffer[5]);
   else
     output_buffer[0] = 0;
 }
 
 //------[ return the type ]----------------------------------
 addr_type MacAddress::get_type() const
-{
-  return type_mac;
+{ 
+  return type_mac; 
 }
 
 
@@ -1976,7 +1976,7 @@ void MacAddress::to_octet(OctetStr& octet) const
 
 //-----------[ get the syntax]----------------------------------------------
 SmiUINT32 GenAddress::get_syntax()
-{
+{ 
    if (address != 0)
        return address->get_syntax();
 
@@ -1993,11 +1993,11 @@ void GenAddress::init_smi()
 //-----------[ constructor with a string argument ]----------------------
 GenAddress::GenAddress( const char  *addr): address(0)
 {
-  valid_flag = 0;
+  valid_flag = FALSE;
   // initialize SMI info
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   init_smi();
 
@@ -2009,15 +2009,15 @@ GenAddress::GenAddress( const char  *addr): address(0)
   parse_address(addr);
 
   // Copy real address smival info into GenAddr smival
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   if ( valid_flag ) {
       smival.syntax = ((GenAddress *)address)->smival.syntax;
-      smival.value.string.len =
-          ((GenAddress *)address)->smival.value.string.len;
-      ACE_OS::memcpy(smival.value.string.ptr,
+      smival.value.string.len = 
+	  ((GenAddress *)address)->smival.value.string.len;
+      ACE_OS::memcpy(smival.value.string.ptr, 
           ((GenAddress *)address)->smival.value.string.ptr,
           (size_t)smival.value.string.len);
   }
@@ -2026,7 +2026,7 @@ GenAddress::GenAddress( const char  *addr): address(0)
 //-----------[ constructor with an Address argument ]--------------------
 GenAddress::GenAddress( const Address &addr): address(0)
 {
-  valid_flag = 0;
+  valid_flag = FALSE;
 
   // initialize SMI info
   // BOK: this is generally not used for GenAddress,
@@ -2038,21 +2038,21 @@ GenAddress::GenAddress( const Address &addr): address(0)
     format_output();
     return;
   }
-
+  
   address = (Address*)addr.clone();
   if (address)
     valid_flag = address->valid();
-
+  
   // Copy real address smival info into GenAddr smival
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   if ( valid_flag ) {
       smival.syntax = address->get_syntax();
-      smival.value.string.len =
-          ((GenAddress *)address)->smival.value.string.len;
-      ACE_OS::memcpy(smival.value.string.ptr,
+      smival.value.string.len = 
+	  ((GenAddress *)address)->smival.value.string.len;
+      ACE_OS::memcpy(smival.value.string.ptr, 
           ((GenAddress *)address)->smival.value.string.ptr,
           (size_t)smival.value.string.len);
   }
@@ -2063,7 +2063,7 @@ GenAddress::GenAddress( const Address &addr): address(0)
 //-----------------[ constructor with another GenAddress object ]-------------
 GenAddress::GenAddress( const GenAddress &addr): address(0)
 {
-  valid_flag = 0;
+  valid_flag = FALSE;
 
   // initialize SMI info
   // BOK: this is generally not used for GenAddress,
@@ -2076,21 +2076,21 @@ GenAddress::GenAddress( const GenAddress &addr): address(0)
     format_output();
     return;
   }
-
+  
   address = (Address *)addr.address->clone();
   if (address)
     valid_flag = address->valid();
-
+  
   // Copy real address smival info into GenAddr smival
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   if ( valid_flag ) {
       smival.syntax = ((GenAddress *)address)->smival.syntax;
-      smival.value.string.len =
-          ((GenAddress *)address)->smival.value.string.len;
-      ACE_OS::memcpy(smival.value.string.ptr,
+      smival.value.string.len = 
+	  ((GenAddress *)address)->smival.value.string.len;
+      ACE_OS::memcpy(smival.value.string.ptr, 
           ((GenAddress *)address)->smival.value.string.ptr,
           (size_t)smival.value.string.len);
   }
@@ -2099,16 +2099,16 @@ GenAddress::GenAddress( const GenAddress &addr): address(0)
 }
 
 //----------[ destructor ] ------------------------------------------------
-GenAddress::~GenAddress()
+GenAddress::~GenAddress() 
 {
   if ( address != 0)
     delete address;
 }
 
 //----------[ create a new instance of this Value ]------------------------
-SnmpSyntax *GenAddress::clone() const
-{
-  return (SnmpSyntax *) new GenAddress(*this);
+SnmpSyntax *GenAddress::clone() const 
+{ 
+  return (SnmpSyntax *) new GenAddress(*this); 
 }
 
 //------[ assignment GenAddress = GenAddress ]-----------------------------
@@ -2118,7 +2118,7 @@ GenAddress& GenAddress::operator=( const GenAddress &addr)
   if ( this == &addr )
       return *this;
 
-  valid_flag = 0;
+  valid_flag = FALSE;
   if (address) {
     delete address;
     address = 0;
@@ -2129,17 +2129,17 @@ GenAddress& GenAddress::operator=( const GenAddress &addr)
 
   if (address)
     valid_flag = address->valid();
-
+  
   // Copy real address smival info into GenAddr smival
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   if ( valid_flag ) {
       smival.syntax = ((GenAddress *)address)->smival.syntax;
-      smival.value.string.len =
-          ((GenAddress *)address)->smival.value.string.len;
-      ACE_OS::memcpy(smival.value.string.ptr,
+      smival.value.string.len = 
+	  ((GenAddress *)address)->smival.value.string.len;
+      ACE_OS::memcpy(smival.value.string.ptr, 
           ((GenAddress *)address)->smival.value.string.ptr,
           (size_t)smival.value.string.len);
   }
@@ -2156,7 +2156,7 @@ SnmpSyntax& GenAddress::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  valid_flag = 0;               // will get set to 1 if really valid
+  valid_flag = FALSE;		// will get set to TRUE if really valid
   if ( address != 0) {
     delete address;
     address = 0;
@@ -2165,26 +2165,26 @@ SnmpSyntax& GenAddress::operator=( SnmpSyntax &val)
   if (val.valid())  {
     switch ( val.get_syntax() ) {
       //-----[ ip address case ]-------------
-      // BOK: this case shouldn't be needed since there is an explicit
-      // GenAddr=Address assignment that will override this assignment.
+      // BOK: this case shouldn't be needed since there is an explicit 
+      // GenAddr=Address assignment that will override this assignment. 
       // Left here for posterity.
     case sNMP_SYNTAX_IPADDR:
     {
       address = (Address *)val.clone();
       if (address)
-        valid_flag = address->valid();
+	valid_flag = address->valid();
     }
     break;
 
       //-----[ udp address case ]------------
       //-----[ ipx address case ]------------
       //-----[ mac address case ]------------
-      // BOK:  This is here only to support GenAddr = primitive OctetStr.
-      // The explicit GenAddr=Address assignment will handle the cases
-      // GenAddr = [UdpAdd|IpxAddr|IpxSock|MacAddr|DecNetAddr|NetbiosAddr|AppleTlk].
-      // Note, using the heuristic of octet str len to determine type of
+      // BOK:  This is here only to support GenAddr = primitive OctetStr. 
+      // The explicit GenAddr=Address assignment will handle the cases 
+      // GenAddr = [UdpAdd|IpxAddr|IpxSock|MacAddr|DecNetAddr|NetbiosAddr|AppleTlk].  
+      // Note, using the heuristic of octet str len to determine type of 
       // address to create is not accurate when address lengths are equal
-      // (e.g., UDPIPV4LEN == MACLEN).  It gets worse if we add AppleTalk or
+      // (e.g., UDPIPV4LEN == MACLEN).  It gets worse if we add AppleTalk or 
       // OSI which use variable length addresses! assume AppleTalk as used in IOS Mibs
       // is defined in CISCO-TC.my as fixed length of 3 octets
 
@@ -2194,33 +2194,33 @@ SnmpSyntax& GenAddress::operator=( SnmpSyntax &val)
       val_len = ((GenAddress &)val).smival.value.string.len;
 
       if (val_len == UDPIPV4LEN) {
-        ACE_NEW_RETURN(address,  UdpAddress, *this);
+	ACE_NEW_RETURN(address,  UdpAddress, *this);
       }
       else if (val_len ==IPV4LEN) {
-        ACE_NEW_RETURN(address, IpAddress, *this);
+	ACE_NEW_RETURN(address, IpAddress, *this);
       }
       else if (val_len == IPXLEN) {
-        ACE_NEW_RETURN(address, IpxAddress, *this);
+	ACE_NEW_RETURN(address, IpxAddress, *this);
       }
       else if (val_len == IPXSOCKLEN) {
-        ACE_NEW_RETURN(address, IpxSockAddress, *this);
+	ACE_NEW_RETURN(address, IpxSockAddress, *this);
       }
       else  if (val_len == MACLEN) {
-        ACE_NEW_RETURN(address, MacAddress, *this);
+	ACE_NEW_RETURN(address, MacAddress, *this);
       }
       else if (val_len == APPLETKLEN) {
-        ACE_NEW_RETURN(address, AppleTalkAddress, *this);
+	ACE_NEW_RETURN(address, AppleTalkAddress, *this);
       }
       else if (val_len == DECNETLEN) {
-        ACE_NEW_RETURN(address, DecNetAddress, *this);
+	ACE_NEW_RETURN(address, DecNetAddress, *this);
       }
       else if (val_len == NETBIOSLEN) {
-        ACE_NEW_RETURN(address, DecNetAddress, *this);
+	ACE_NEW_RETURN(address, DecNetAddress, *this);
       }
 
       if (address) {
-        *address = val;
-        valid_flag = address->valid();
+	*address = val;
+	valid_flag = address->valid();
       }
     }
     break;
@@ -2228,15 +2228,15 @@ SnmpSyntax& GenAddress::operator=( SnmpSyntax &val)
   }
 
   // Copy real address smival info into GenAddr smival
-  // BOK: smival is generally not used for GenAddress, but
+  // BOK: smival is generally not used for GenAddress, but 
   //      we need this to be a replica of the real address'
-  //      smival info so that <class>::operator=SnmpSyntax
+  //      smival info so that <class>::operator=SnmpSyntax 
   //      will work.
   if ( valid_flag ) {
       smival.syntax = ((GenAddress *)address)->smival.syntax;
-      smival.value.string.len =
-          ((GenAddress *)address)->smival.value.string.len;
-      ACE_OS::memcpy(smival.value.string.ptr,
+      smival.value.string.len = 
+	  ((GenAddress *)address)->smival.value.string.len;
+      ACE_OS::memcpy(smival.value.string.ptr, 
           ((GenAddress *)address)->smival.value.string.ptr,
           (size_t)smival.value.string.len);
   }
@@ -2265,9 +2265,9 @@ int GenAddress::parse_address( const char *addr)
     valid_flag = address->valid();
     if ( valid_flag && ((IpxSockAddress*)address)->get_socket()) {
        format_output();
-       return 1;   // ok its an ipxsock address
+       return TRUE;   // ok its an ipxsock address
     }
-        // otherwise delete it and try another
+	// otherwise delete it and try another
     delete address;
 
     // ipx address
@@ -2275,9 +2275,9 @@ int GenAddress::parse_address( const char *addr)
     valid_flag = address->valid();
     if ( valid_flag)  {
        format_output();
-       return 1;   // ok its an ipx address
+       return TRUE;   // ok its an ipx address
     }
-        // otherwise delete it and try another
+	// otherwise delete it and try another
     delete address;
 
 //TM: Must try the derived classes first...one pitfall of the
@@ -2290,7 +2290,7 @@ int GenAddress::parse_address( const char *addr)
     valid_flag = address->valid();
     if ( valid_flag && ((UdpAddress*)address)->get_port()) {
        format_output();
-       return 1;       // ok its a udp address
+       return TRUE;       // ok its a udp address
     }
 
     // otherwise delete it and try another
@@ -2299,12 +2299,12 @@ int GenAddress::parse_address( const char *addr)
     // ip address
     ACE_NEW_RETURN(address, IpAddress( addr), -1);
     valid_flag = address->valid();
-    if ( valid_flag)
+    if ( valid_flag) 
     {
        format_output();
-       return 1;       // ok its an ip address
+       return TRUE;       // ok its an ip address
     }
-        // otherwise delete it and try another
+	// otherwise delete it and try another
     delete address;
 
     // mac address
@@ -2312,59 +2312,59 @@ int GenAddress::parse_address( const char *addr)
     valid_flag = address->valid();
     if ( valid_flag) {
        format_output();
-       return 1;    // ok, its a mac
+       return TRUE;    // ok, its a mac
     }
 
     // guess by length of argument the type of address
     switch  (ACE_OS::strlen(addr)) {
     case NETBIOSLEN:
         ACE_NEW_RETURN(address, NetbiosAddress( addr), -1);
-        valid_flag = address->valid();
-        if ( valid_flag) {
-          format_output();
-          return 1;    // ok, its a mac
-        }
-        break;
+	valid_flag = address->valid();
+	if ( valid_flag) {
+	  format_output();
+	  return TRUE;    // ok, its a mac
+	}
+	break;
 
     case APPLETKLEN:
         ACE_NEW_RETURN(address, AppleTalkAddress( addr), -1);
-        valid_flag = address->valid();
-        if ( valid_flag) {
-          format_output();
-          return 1;    // ok, its a mac
-        }
-        break;
+	valid_flag = address->valid();
+	if ( valid_flag) {
+	  format_output();
+	  return TRUE;    // ok, its a mac
+	}
+	break;
 
     case DECNETLEN:
         ACE_NEW_RETURN(address, DecNetAddress( addr), -1);
-        valid_flag = address->valid();
-        if ( valid_flag) {
-          format_output();
-          return 1;    // ok, its a mac
-        }
-        break;
+	valid_flag = address->valid();
+	if ( valid_flag) {
+	  format_output();
+	  return TRUE;    // ok, its a mac
+	}
+	break;
 
     }
-        // otherwise its invalid
+	// otherwise its invalid
     delete address;
     address = 0;
     format_output();
-    return 0;
+    return FALSE;
 }
 
 GenAddress::operator const char *() const
 {
   if ( address != 0)
-    return (const char *)*address;      // pass thru
+    return (const char *)*address;	// pass thru
   else
     return (char *)output_buffer;
 }
 
 // to_string form of the contained address
-char * GenAddress::to_string()
+char * GenAddress::to_string() 
 {
   if ( address != 0)
-    return address->to_string();        // pass thru
+    return address->to_string();	// pass thru
   else
     return (char *)output_buffer;
 }
@@ -2377,7 +2377,7 @@ void GenAddress::format_output()
 
 //------[ return the type ]----------------------------------
 addr_type GenAddress::get_type() const
-{
+{ 
   if (!valid())
     return type_invalid;
   else
@@ -2388,7 +2388,7 @@ addr_type GenAddress::get_type() const
 void GenAddress::to_octet(OctetStr& octet) const
 {
   if (!valid())
-    return;
+    return; 
 
   address->to_octet(octet);
 }
@@ -2404,8 +2404,8 @@ DecNetAddress::DecNetAddress( const char *inaddr): Address()
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = DECNETLEN;
     smival.value.string.ptr = address_buffer;
-
-    valid_flag=0;
+ 
+    valid_flag=FALSE;
     DecNetAddress::format_output();
     return;
   }
@@ -2414,7 +2414,7 @@ DecNetAddress::DecNetAddress( const char *inaddr): Address()
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = DECNETLEN;
   smival.value.string.ptr = address_buffer;
-
+ 
   valid_flag = parse_address( (char *) inaddr);
   DecNetAddress::format_output();
 }
@@ -2428,8 +2428,8 @@ DecNetAddress::DecNetAddress( const GenAddress& genaddr)
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = DECNETLEN;
   smival.value.string.ptr = address_buffer;
-
-  valid_flag = 0;
+ 
+  valid_flag = FALSE;
   // allow use of an ipx or ipxsock address
   if ( (genaddr.get_type() == type_decnet) ) {
     valid_flag = genaddr.valid();
@@ -2445,12 +2445,12 @@ DecNetAddress::DecNetAddress( const GenAddress& genaddr)
 DecNetAddress::~DecNetAddress()
 {
 }
-
+ 
 char *DecNetAddress::to_string()
 {
   return (char *)output_buffer;
 }
-
+ 
 DecNetAddress& DecNetAddress::operator=( const DecNetAddress &decaddr)
 {
   // protect against assignment from itself
@@ -2462,7 +2462,7 @@ DecNetAddress& DecNetAddress::operator=( const DecNetAddress &decaddr)
   format_output();
   return *this;
 }
-
+ 
 void DecNetAddress::to_octet(OctetStr& octet) const
 {
    octet.set_data( smival.value.string.ptr, smival.value.string.len);
@@ -2483,9 +2483,9 @@ SnmpSyntax& DecNetAddress::operator=( SnmpSyntax &val)
   // protect against assignment from itself
   if ( this == &val )
     return *this;
-
-  valid_flag = 0;       // will get set 1 if really valid
-
+ 
+  valid_flag = 0;       // will get set TRUE if really valid
+ 
   if (val.valid()) {
       if (((DecNetAddress &)val).smival.value.string.len ==DECNETLEN) {
         ACE_OS::memcpy(address_buffer,
@@ -2503,8 +2503,8 @@ SnmpSyntax *DecNetAddress::clone() const
 }
 
 addr_type DecNetAddress::get_type() const
-{
-  return type_decnet;
+{ 
+  return type_decnet; 
 }
 
 void DecNetAddress::format_output()
@@ -2520,13 +2520,13 @@ void DecNetAddress::format_output()
 int DecNetAddress::parse_address( const char *address)
 {
  if (ACE_OS::strlen(address) > DECNETLEN)
-      return 0; // invalid
-
+      return FALSE; // invalid
+ 
   ACE_OS::memset(address_buffer, 0, DECNETLEN);
   ACE_OS::memcpy(address_buffer, address, DECNETLEN);
-
-  return 1; // valid
-}
+ 
+  return TRUE; // valid
+} 
 
 
 //------------------------------------------------------------------------
@@ -2540,8 +2540,8 @@ AppleTalkAddress::AppleTalkAddress( const char *inaddr): Address()
     smival.syntax = sNMP_SYNTAX_OCTETS;
     smival.value.string.len = APPLETKLEN;
     smival.value.string.ptr = address_buffer;
-
-    valid_flag=0;
+ 
+    valid_flag=FALSE;
     AppleTalkAddress::format_output();
     return;
   }
@@ -2550,7 +2550,7 @@ AppleTalkAddress::AppleTalkAddress( const char *inaddr): Address()
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = APPLETKLEN;
   smival.value.string.ptr = address_buffer;
-
+ 
   valid_flag = parse_address( (char *) inaddr);
   AppleTalkAddress::format_output();
 }
@@ -2563,8 +2563,8 @@ AppleTalkAddress::AppleTalkAddress( const GenAddress& genaddr)
   smival.syntax = sNMP_SYNTAX_OCTETS;
   smival.value.string.len = APPLETKLEN;
   smival.value.string.ptr = address_buffer;
-
-  valid_flag = 0;
+ 
+  valid_flag = FALSE;
   // allow use of an ipx or ipxsock address
   if ( (genaddr.get_type() == type_atk) ) {
     valid_flag = genaddr.valid();
@@ -2580,12 +2580,12 @@ AppleTalkAddress::AppleTalkAddress( const GenAddress& genaddr)
 AppleTalkAddress::~AppleTalkAddress()
 {
 }
-
+ 
 char *AppleTalkAddress::to_string()
 {
   return (char *)output_buffer;
 }
-
+ 
 AppleTalkAddress& AppleTalkAddress::operator=( const AppleTalkAddress &ataddr)
 {
   // protect against assignment from itself
@@ -2597,7 +2597,7 @@ AppleTalkAddress& AppleTalkAddress::operator=( const AppleTalkAddress &ataddr)
   format_output();
   return *this;
 }
-
+ 
 void AppleTalkAddress::to_octet(OctetStr& octet) const
 {
    octet.set_data( smival.value.string.ptr, smival.value.string.len);
@@ -2618,9 +2618,9 @@ SnmpSyntax& AppleTalkAddress::operator=( SnmpSyntax &val)
   // protect against assignment from itself
   if ( this == &val )
     return *this;
-
-  valid_flag = 0;       // will get set 1 if really valid
-
+ 
+  valid_flag = 0;       // will get set TRUE if really valid
+ 
   if (val.valid()) {
       if (((AppleTalkAddress &)val).smival.value.string.len ==APPLETKLEN) {
         ACE_OS::memcpy(address_buffer,
@@ -2638,8 +2638,8 @@ SnmpSyntax *AppleTalkAddress::clone() const
 }
 
 addr_type AppleTalkAddress::get_type() const
-{
-  return type_atk;
+{ 
+  return type_atk; 
 }
 
 void AppleTalkAddress::format_output()
@@ -2655,13 +2655,13 @@ void AppleTalkAddress::format_output()
 int AppleTalkAddress::parse_address( const char *address)
 {
  if (ACE_OS::strlen(address) > APPLETKLEN)
-      return 0; // invalid
-
+      return FALSE; // invalid
+ 
   ACE_OS::memset(address_buffer, 0, APPLETKLEN);
   ACE_OS::memcpy(address_buffer, address, APPLETKLEN);
-
-  return 1; // valid
-}
+ 
+  return TRUE; // valid
+} 
 
 char AppleTalkAddress::get_host_address() const
 {
@@ -2684,3 +2684,5 @@ void AppleTalkAddress::set_net_address(const short atknet)
 {
   ACE_OS::memcpy(address_buffer, &atknet, APPLETKLEN -1);
 }
+   
+
diff --git a/ASNMP/asnmp/address.h b/ASNMP/asnmp/address.h
index 5258304e109..a9250b8244d 100644
--- a/ASNMP/asnmp/address.h
+++ b/ASNMP/asnmp/address.h
@@ -177,7 +177,7 @@ public:
 
 protected:
   int valid_flag;
-  // state of constructed object (1/0)
+  // state of constructed object (TRUE/FALSE)
   unsigned char address_buffer[MAX_ADDR_SZ];
   // addr internal representation
 
diff --git a/ASNMP/asnmp/asn1.cpp b/ASNMP/asnmp/asn1.cpp
index 77dc9baa5ec..da2e936349b 100644
--- a/ASNMP/asnmp/asn1.cpp
+++ b/ASNMP/asnmp/asn1.cpp
@@ -33,13 +33,13 @@
 
    All Rights Reserved
 
-   Permission to use, copy, modify, and distribute this software and its
-   documentation for any purpose and without fee is hereby granted,
+   Permission to use, copy, modify, and distribute this software and its 
+   documentation for any purpose and without fee is hereby granted, 
    provided that the above copyright notice appear in all copies and that
-   both that copyright notice and this permission notice appear in
+   both that copyright notice and this permission notice appear in 
    supporting documentation, and that the name of CMU not be
    used in advertising or publicity pertaining to distribution of the
-   software without specific, written prior permission.
+   software without specific, written prior permission.  
 
    CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
    ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -63,39 +63,39 @@ ACE_RCSID(asnmp, asn1, "$Id$")
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
-u_char * asn1::parse_int( u_char *data,
-                              int *datalength,
-                              u_char *type,
-                              long int *intp,
-                              int intsize)
+u_char * asn1::parse_int( u_char *data, 
+			      int *datalength, 
+			      u_char *type, 
+			      long int *intp, 
+			      int intsize)
 {
   ACE_TRACE("asn1::parse_int");
   /*
    * ASN.1 integer ::= 0x02 asnlength byte {byte}*
    */
   u_char *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
   long   value = 0;
 
   if (intsize != sizeof (long)){
     ASNERROR("not long");
-    return 0;
+    return NULL;
   }
   *type = *bufp++;
   bufp =asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0){
+  if (bufp == NULL){
     ASNERROR("bad length");
-    return 0;
+    return NULL;
   }
   if ((int)(asn_length + (bufp - data)) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   if ((int)asn_length > intsize){
     ASNERROR("I don't support such large integers");
-    return 0;
+    return NULL;
   }
   *datalength -= (int)asn_length + (bufp - data);
   if (*bufp & 0x80)
@@ -115,44 +115,44 @@ u_char * asn1::parse_int( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
-u_char * asn1::parse_unsigned_int( u_char *data,
-                                       int *datalength,
-                                       u_char *type,
-                                       u_long *intp,
-                                       int      intsize)
+u_char * asn1::parse_unsigned_int( u_char *data,	
+				       int *datalength,
+				       u_char *type,
+				       u_long *intp,
+				       int	intsize)
 {
   ACE_TRACE("asn1::parse_unsigned_int");
   /*
    * ASN.1 integer ::= 0x02 asnlength byte {byte}*
    */
   u_char *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
   u_long value = 0;
 
   if (intsize != sizeof (long)){
     ASNERROR("not long");
-    return 0;
+    return NULL;
   }
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0){
+  if (bufp == NULL){
     ASNERROR("bad length");
-    return 0;
+    return NULL;
   }
   if ((int)(asn_length + (bufp - data)) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   if (((int)asn_length > (intsize + 1)) ||
       (((int)asn_length == intsize + 1) && *bufp != 0x00)){
     ASNERROR("I don't support such large integers");
-    return 0;
+    return NULL;
   }
   *datalength -= (int)asn_length + (bufp - data);
   if (*bufp & 0x80)
-    value = (u_long) -1;
+    value = (u_long) -1; 
   while(asn_length--)
     value = (value << 8) | *bufp++;
   *intp = value;
@@ -168,13 +168,13 @@ u_char * asn1::parse_unsigned_int( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_int( u_char *data,
-                              int *datalength,
-                              u_char type,
-                              long *intp,
-                              int intsize)
+			      int *datalength,
+			      u_char type,
+			      long *intp,
+			      int intsize)
 {
   ACE_TRACE("asn1::build_int");
   /*
@@ -185,7 +185,7 @@ u_char * asn1::build_int( u_char *data,
   u_long mask;
 
   if (intsize != sizeof (long))
-    return 0;
+    return NULL;
   integer = *intp;
   /*
    * Truncate "unnecessary" bytes off of the most significant end of this
@@ -196,15 +196,15 @@ u_char * asn1::build_int( u_char *data,
   mask = 0x1FF << ((8 * (sizeof(long) - 1)) - 1);
   /* mask is 0xFF800000 on a big-endian machine */
   while((((integer & mask) == 0) || ((integer & mask) == mask))
-        && intsize > 1){
+	&& intsize > 1){
     intsize--;
     integer <<= 8;
   }
   data = asn1::build_header(data, datalength, type, intsize);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < intsize)
-    return 0;
+    return NULL;
   *datalength -= intsize;
   mask = 0xFF << (8 * (sizeof(long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
@@ -224,13 +224,13 @@ u_char * asn1::build_int( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_unsigned_int( u_char *data,
-                                       int *datalength,
-                                       u_char type,
-                                       u_long *intp,
-                                       int intsize)
+				       int *datalength,
+				       u_char type,
+				       u_long *intp,
+				       int intsize)
 {
   ACE_TRACE("asn1::build_unsigned_int");
   /*
@@ -242,7 +242,7 @@ u_char * asn1::build_unsigned_int( u_char *data,
   int add_null_byte = 0;
 
   if (intsize != sizeof (long))
-    return 0;
+    return NULL;
   integer = *intp;
   mask = 0xFF << (8 * (sizeof(long) - 1));
   /* mask is 0xFF000000 on a big-endian machine */
@@ -263,10 +263,10 @@ u_char * asn1::build_unsigned_int( u_char *data,
     integer <<= 8;
   }
   data = asn1::build_header(data, datalength, type, intsize);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < intsize)
-    return 0;
+    return NULL;
   *datalength -= intsize;
   if (add_null_byte == 1){
     *data++ = '\0';
@@ -292,13 +292,13 @@ u_char * asn1::build_unsigned_int( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
-u_char * asn1::parse_string( u_char     *data,
-                                 int *datalength,
-                                 u_char *type,
-                                 u_char *string,
-                                 int *strlength)
+u_char * asn1::parse_string( u_char	*data,
+				 int *datalength,
+				 u_char *type,
+				 u_char *string,
+				 int *strlength)
 {
   ACE_TRACE("asn1::parse_string");
   /*
@@ -307,19 +307,19 @@ u_char * asn1::parse_string( u_char     *data,
    * cmpdstring ::= 0x24 asnlength string {string}*
    */
   u_char *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
 
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0)
-    return 0;
+  if (bufp == NULL)
+    return NULL;
   if ((int)(asn_length + (bufp - data)) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   if ((int)asn_length > *strlength){
     ASNERROR("I don't support such long strings");
-    return 0;
+    return NULL;
   }
   // fixed
   ACE_OS::memcpy((char *)string, (char *)bufp,  (int)asn_length);
@@ -337,13 +337,13 @@ u_char * asn1::parse_string( u_char     *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_string( u_char *data,
-                                 int *datalength,
-                                 u_char type,
-                                 u_char *string,
-                                 int strlength)
+				 int *datalength,
+				 u_char type,
+				 u_char *string,
+				 int strlength)
 {
   ACE_TRACE("asn1::build_string");
   /*
@@ -353,10 +353,10 @@ u_char * asn1::build_string( u_char *data,
    * This code will never send a compound string.
    */
   data = asn1::build_header(data, datalength, type, strlength);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < strlength)
-    return 0;
+    return NULL;
   // fixed
   ACE_OS::memcpy((u_char *)data,(u_char *)string, strlength);
   *datalength -= strlength;
@@ -371,30 +371,30 @@ u_char * asn1::build_string( u_char *data,
  *   in this object following the id and length.
  *
  *  Returns a pointer to the first byte of the contents of this object.
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::parse_header( u_char *data,
-                                int *datalength,
-                                u_char *type)
+				int *datalength,
+				u_char *type)
 {
   ACE_TRACE("asn1::parse_header");
   u_char *bufp = data;
   register int header_len;
-  u_long            asn_length;
+  u_long	    asn_length;
 
   /* this only works on data types < 30, i.e. no extension octets */
   if (IS_EXTENSION_ID(*bufp)){
     ASNERROR("can't process ID >= 30");
-    return 0;
+    return NULL;
   }
   *type = *bufp;
   bufp = asn1::parse_length(bufp + 1, &asn_length);
-  if (bufp == 0)
-    return 0;
+  if (bufp == NULL)
+    return NULL;
   header_len = bufp - data;
   if ((int)(header_len + asn_length) > *datalength){
     ASNERROR("asn length too long");
-    return 0;
+    return NULL;
   }
   *datalength = (int)asn_length;
   return bufp;
@@ -411,20 +411,20 @@ u_char *asn1::parse_header( u_char *data,
  *  The maximum length is 0xFFFF;
  *
  *  Returns a pointer to the first byte of the contents of this object.
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_header( u_char *data,
-                                 int *datalength,
-                                 u_char type,
-                                 int length)
+				 int *datalength,
+				 u_char type,
+				 int length)
 {
   ACE_TRACE("asn1::build_header");
   if (*datalength < 1)
-    return 0;
+    return NULL;
   *data++ = type;
   (*datalength)--;
   return asn1::build_length(data, datalength, length);
-
+  
 }
 
 /*
@@ -438,18 +438,18 @@ u_char * asn1::build_header( u_char *data,
  *  The maximum length is 0xFFFF;
  *
  *  Returns a pointer to the first byte of the contents of this object.
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_sequence( u_char *data,
-                                   int *datalength,
-                                   u_char type,
-                                   int length)
+				   int *datalength,
+				   u_char type,
+				   int length)
 {
   ACE_TRACE("asn1::build_sequence");
   *datalength -= 4;
   if (*datalength < 0){
-    *datalength += 4;   /* fix up before punting */
-    return 0;
+    *datalength += 4;	/* fix up before punting */
+    return NULL;
   }
   *data++ = type;
   *data++ = (u_char)(0x02 | ASN_LONG_LEN);
@@ -464,23 +464,23 @@ u_char * asn1::build_sequence( u_char *data,
  *
  *  Returns a pointer to the first byte after this length
  *  field (aka: the start of the data field).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::parse_length( u_char *data,
-                                 u_long  *length)
+				 u_long  *length)
 {
   ACE_TRACE("asn1::parse_length");
   u_char lengthbyte = *data;
 
   if (lengthbyte & ASN_LONG_LEN){
-    lengthbyte &= ~ASN_LONG_LEN;        /* turn MSb off */
+    lengthbyte &= ~ASN_LONG_LEN;	/* turn MSb off */
     if (lengthbyte == 0){
       ASNERROR("We don't support indefinite lengths");
-      return 0;
+      return NULL;
     }
     if (lengthbyte > sizeof(long)){
       ASNERROR("we can't support data lengths that long");
-      return 0;
+      return NULL;
     }
     // fixed
     ACE_OS::memcpy((char *)length, (char *)data + 1, (int)lengthbyte);
@@ -494,8 +494,8 @@ u_char * asn1::parse_length( u_char *data,
 };
 
 u_char *asn1::build_length( u_char *data,
-                                int *datalength,
-                                int length)
+				int *datalength,
+				int length)
 {
   ACE_TRACE("asn1::build_length");
   u_char    *start_data = data;
@@ -504,21 +504,21 @@ u_char *asn1::build_length( u_char *data,
   if (length < 0x80){
     if (*datalength < 1){
       ASNERROR("build_length");
-      return 0;
-    }
+      return NULL;
+    }	    
     *data++ = (u_char)length;
   } else if (length <= 0xFF){
     if (*datalength < 2){
       ASNERROR("build_length");
-      return 0;
-    }
+      return NULL;
+    }	    
     *data++ = (u_char)(0x01 | ASN_LONG_LEN);
     *data++ = (u_char)length;
   } else { /* 0xFF < length <= 0xFFFF */
     if (*datalength < 3){
       ASNERROR("build_length");
-      return 0;
-    }
+      return NULL;
+    }	    
     *data++ = (u_char)(0x02 | ASN_LONG_LEN);
     *data++ = (u_char)((length >> 8) & 0xFF);
     *data++ = (u_char)(length & 0xFF);
@@ -538,13 +538,13 @@ u_char *asn1::build_length( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::parse_objid( u_char *data,
-                               int *datalength,
-                               u_char *type,
-                               oid *objid,
-                               int *objidlength)
+			       int *datalength,
+			       u_char *type,
+			       oid *objid,
+			       int *objidlength)
 {
   ACE_TRACE("asn1::parse_objid");
   /*
@@ -557,15 +557,15 @@ u_char *asn1::parse_objid( u_char *data,
   oid *oidp = objid + 1;
   u_long subidentifier;
   long   length;
-  u_long            asn_length;
+  u_long	    asn_length;
 
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0)
-    return 0;
+  if (bufp == NULL)
+    return NULL;
   if ((int)asn_length + (bufp - data) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   *datalength -= (int)asn_length + (bufp - data);
 
@@ -574,16 +574,16 @@ u_char *asn1::parse_objid( u_char *data,
     objid[0] = objid[1] = 0;
 
   length = asn_length;
-  (*objidlength)--;     /* account for expansion of first byte */
+  (*objidlength)--;	/* account for expansion of first byte */
   while (length > 0 && (*objidlength)-- > 0){
     subidentifier = 0;
-    do {        /* shift and add in low order 7 bits */
+    do {	/* shift and add in low order 7 bits */
       subidentifier = (subidentifier << 7) + (*(u_char *)bufp & ~ASN_BIT8);
       length--;
-    } while (*(u_char *)bufp++ & ASN_BIT8);     /* last byte has high bit clear */
+    } while (*(u_char *)bufp++ & ASN_BIT8);	/* last byte has high bit clear */
     if (subidentifier > (u_long)MAX_SUBID){
       ASNERROR("subidentifier too long");
-      return 0;
+      return NULL;
     }
     *oidp++ = (oid)subidentifier;
   }
@@ -591,7 +591,7 @@ u_char *asn1::parse_objid( u_char *data,
   /*
    * The first two subidentifiers are encoded into the first component
    * with the value (X * 40) + Y, where:
-   *    X is the value of the first subidentifier.
+   *	X is the value of the first subidentifier.
    *  Y is the value of the second subidentifier.
    */
   subidentifier = (u_long)objid[1];
@@ -616,13 +616,13 @@ u_char *asn1::parse_objid( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::build_objid( u_char *data,
-                               int *datalength,
-                               u_char type,
-                               oid *objid,
-                               int objidlength)
+			       int *datalength,
+			       u_char type,
+			       oid *objid,
+			       int objidlength)
 {
   ACE_TRACE("asn1::build_objid");
   /*
@@ -656,28 +656,28 @@ u_char *asn1::build_objid( u_char *data,
       bits = 0;
       /* testmask *MUST* !!!! be of an u_type */
       for(testmask = 0x7F, testbits = 0; testmask != 0;
-          testmask <<= 7, testbits += 7){
-        if (subid & testmask){  /* if any bits set */
-          mask = testmask;
-          bits = testbits;
-        }
+	  testmask <<= 7, testbits += 7){
+	if (subid & testmask){	/* if any bits set */
+	  mask = testmask;
+	  bits = testbits;
+	}
       }
       /* mask can't be zero here */
       for(;mask != 0x7F; mask >>= 7, bits -= 7){
-        /* fix a mask that got truncated above */
-        if (mask == 0x1E00000)
-          mask = 0xFE00000;
-        *bp++ = (u_char)(((subid & mask) >> bits) | ASN_BIT8);
+	/* fix a mask that got truncated above */
+	if (mask == 0x1E00000)  
+	  mask = 0xFE00000;
+	*bp++ = (u_char)(((subid & mask) >> bits) | ASN_BIT8);
       }
       *bp++ = (u_char)(subid & mask);
     }
   }
   asnlength = bp - buf;
   data = asn1::build_header(data, datalength, type, asnlength);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < asnlength)
-    return 0;
+    return NULL;
   // fixed
   ACE_OS::memcpy((char *)data, (char *)buf,  asnlength);
   *datalength -= asnlength;
@@ -692,26 +692,26 @@ u_char *asn1::build_objid( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
-u_char *asn1::parse_null(u_char *data,
-                                int *datalength,
-                                u_char *type)
+u_char *asn1::parse_null(u_char *data, 
+				int *datalength, 
+				u_char *type)
 {
   ACE_TRACE("asn1::parse_null");
   /*
    * ASN.1 null ::= 0x05 0x00
    */
   u_char   *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
 
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0)
-    return 0;
+  if (bufp == NULL)
+    return NULL;
   if (asn_length != 0){
-    ASNERROR("Malformed 0");
-    return 0;
+    ASNERROR("Malformed NULL");
+    return NULL;
   }
   *datalength -= (bufp - data);
   return bufp + asn_length;
@@ -726,11 +726,11 @@ u_char *asn1::parse_null(u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::build_null( u_char *data,
-                              int *datalength,
-                              u_char type)
+			      int *datalength,
+			      u_char type)
 {
   ACE_TRACE("asn1::build_null");
   /*
@@ -749,40 +749,40 @@ u_char *asn1::build_null( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::parse_bitstring( u_char *data,
-                                   int *datalength,
-                                   u_char *type,
-                                   u_char *string,
-                                   int *strlength)
+				   int *datalength,
+				   u_char *type,
+				   u_char *string,
+				   int *strlength)
 {
   ACE_TRACE("asn1::parse_bitstring");
   /*
    * bitstring ::= 0x03 asnlength unused {byte}*
    */
   u_char *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
 
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0)
-    return 0;
+  if (bufp == NULL)
+    return NULL;
   if ((int)(asn_length + (bufp - data)) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   if ((int) asn_length > *strlength){
     ASNERROR("I don't support such long bitstrings");
-    return 0;
+    return NULL;
   }
   if (asn_length < 1){
     ASNERROR("Invalid bitstring");
-    return 0;
+    return NULL;
   }
   if (*bufp > 7){
     ASNERROR("Invalid bitstring");
-    return 0;
+    return NULL;
   }
   // fixed
   ACE_OS::memcpy((char *)string,(char *)bufp,  (int)asn_length);
@@ -801,13 +801,13 @@ u_char *asn1::parse_bitstring( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char *asn1::build_bitstring( u_char *data,
-                                   int *datalength,
-                                   u_char type,
-                                   u_char *string,
-                                   int strlength)
+				   int *datalength,
+				   u_char type,	
+				   u_char *string,
+				   int strlength)
 {
   ACE_TRACE("asn1::build_bitstring");
   /*
@@ -815,13 +815,13 @@ u_char *asn1::build_bitstring( u_char *data,
    */
   if (strlength < 1 || *string || *string > 7){
     ASNERROR("Building invalid bitstring");
-    return 0;
+    return NULL;
   }
   data = asn1::build_header(data, datalength, type, strlength);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < strlength)
-    return 0;
+    return NULL;
   // fixed
   ACE_OS::memcpy((char *)data,(char *)string, strlength);
   *datalength -= strlength;
@@ -838,46 +838,46 @@ u_char *asn1::build_bitstring( u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::parse_unsigned_int64(u_char *data,
-                                         int *datalength,
-                                         u_char *type,
-                                         struct counter64 *cp,
-                                         int countersize)
+					 int *datalength,
+					 u_char *type,
+					 struct counter64 *cp,
+					 int countersize)
 {
   ACE_TRACE("asn1::parse_unsigned_int64");
   /*
    * ASN.1 integer ::= 0x02 asnlength byte {byte}*
    */
   u_char *bufp = data;
-  u_long            asn_length;
+  u_long	    asn_length;
   u_long low = 0, high = 0;
   int intsize = 4;
-
+  
   if (countersize != sizeof(struct counter64)){
     ASNERROR("not right size");
-    return 0;
+    return NULL;
   }
   *type = *bufp++;
   bufp = asn1::parse_length(bufp, &asn_length);
-  if (bufp == 0){
+  if (bufp == NULL){
     ASNERROR("bad length");
-    return 0;
+    return NULL;
   }
   if ((int)(asn_length + (bufp - data)) > *datalength){
     ASNERROR("overflow of message");
-    return 0;
+    return NULL;
   }
   if (((int)asn_length > (intsize * 2 + 1)) ||
       (((int)asn_length == (intsize * 2) + 1) && *bufp != 0x00)){
     ASNERROR("I don't support such large integers");
-    return 0;
+    return NULL;
   }
   *datalength -= (int)asn_length + (bufp - data);
   if (*bufp & 0x80){
-    low = (u_long) -1; // integer is negative
-    high = (u_long) -1;
+    low = (u_long) -1; // integer is negative 
+    high = (u_long) -1; 
   }
   while(asn_length--){
     high = (high << 8) | ((low & 0xFF000000) >> 24);
@@ -897,13 +897,13 @@ u_char * asn1::parse_unsigned_int64(u_char *data,
  *
  *  Returns a pointer to the first byte past the end
  *   of this object (i.e. the start of the next object).
- *  Returns 0 on any error.
+ *  Returns NULL on any error.
  */
 u_char * asn1::build_unsigned_int64( u_char *data,
-                                         int *datalength,
-                                         u_char type,
-                                         struct counter64 *cp,
-                                         int countersize)
+					 int *datalength,
+					 u_char	type,
+					 struct counter64 *cp,
+					 int countersize)
 {
   ACE_TRACE("asn1::build_unsigned_int64");
   /*
@@ -916,7 +916,7 @@ u_char * asn1::build_unsigned_int64( u_char *data,
   int intsize;
 
   if (countersize != sizeof (struct counter64))
-    return 0;
+    return NULL;
   intsize = 8;
   low = cp->low;
   high = cp->high;
@@ -936,17 +936,17 @@ u_char * asn1::build_unsigned_int64( u_char *data,
   mask2 = 0x1FF << ((8 * (sizeof(long) - 1)) - 1);
   /* mask2 is 0xFF800000 on a big-endian machine */
   while((((high & mask2) == 0) || ((high & mask2) == mask2))
-        && intsize > 1){
+	&& intsize > 1){
     intsize--;
     high = (high << 8)
       | ((low & mask) >> (8 * (sizeof(long) - 1)));
     low <<= 8;
   }
   data = asn1::build_header(data, datalength, type, intsize);
-  if (data == 0)
-    return 0;
+  if (data == NULL)
+    return NULL;
   if (*datalength < intsize)
-    return 0;
+    return NULL;
   *datalength -= intsize;
   if (add_null_byte == 1){
     *data++ = '\0';
@@ -957,7 +957,7 @@ u_char * asn1::build_unsigned_int64( u_char *data,
     high = (high << 8)
       | ((low & mask) >> (8 * (sizeof(long) - 1)));
     low <<= 8;
-
+    
   }
   return data;
 }
@@ -969,14 +969,14 @@ struct snmp_pdu * cmu_snmp::pdu_create( int command)
   ACE_TRACE("cmu_snmp::snmp_pdu_create");
   struct snmp_pdu *pdu;
 
-  ACE_NEW_RETURN(pdu, snmp_pdu, 0);
+  ACE_NEW_RETURN(pdu, snmp_pdu, 0); 
   ACE_OS::memset((char *)pdu, 0,sizeof(struct snmp_pdu));
   pdu->command = command;
   pdu->errstat = 0;
   pdu->errindex = 0;
-  pdu->enterprise = 0;
+  pdu->enterprise = NULL;
   pdu->enterprise_length = 0;
-  pdu->variables = 0;
+  pdu->variables = NULL;
   return pdu;
 }
 
@@ -1009,21 +1009,21 @@ void cmu_snmp::free_pdu( struct snmp_pdu *pdu)
 
 
 // add a null var to a pdu
-void cmu_snmp::add_var(struct snmp_pdu *pdu,
-                  oid *name,
-                  int name_length,
-                  SmiVALUE *smival)
+void cmu_snmp::add_var(struct snmp_pdu *pdu, 
+		  oid *name, 
+		  int name_length,
+		  SmiVALUE *smival)
 {
   ACE_TRACE("cmu_snmp::add_var");
 
   struct variable_list *vars;
 
   // if we don't have a vb list ,create one
-  if (pdu->variables == 0) {
+  if (pdu->variables == NULL) {
     ACE_NEW(pdu->variables, variable_list);
     vars = pdu->variables;
   }
-  else
+  else 
     { // we have one, find the end
       for(vars = pdu->variables; vars->next_variable; vars = vars->next_variable);
       // create one
@@ -1033,7 +1033,7 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
     }
 
   // add the oid with no data
-  vars->next_variable = 0;
+  vars->next_variable = NULL;
 
   // hook in the Oid portion
   ACE_NEW(vars->name, oid[(name_length)]);
@@ -1051,9 +1051,9 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
     case sNMP_SYNTAX_NOSUCHINSTANCE:
     case sNMP_SYNTAX_ENDOFMIBVIEW:
       {
-        vars->type = (u_char) smival->syntax;
-        vars->val.string = 0;
-        vars->val_len = 0;
+	vars->type = (u_char) smival->syntax;
+	vars->val.string = NULL;
+	vars->val_len = 0;
       }
       break;
 
@@ -1062,68 +1062,68 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
     case sNMP_SYNTAX_OPAQUE:
     case sNMP_SYNTAX_IPADDR:
       {
-        vars->type = (u_char) smival->syntax;
-        ACE_NEW(vars->val.string,
+	vars->type = (u_char) smival->syntax;
+	ACE_NEW(vars->val.string, 
                 u_char[(unsigned)smival->value.string.len]);
-        vars->val_len = (int) smival->value.string.len;
-        ACE_OS::memcpy( (u_char *) vars->val.string,
-                       (u_char *) smival->value.string.ptr,
-                       (unsigned) smival->value.string.len);
+	vars->val_len = (int) smival->value.string.len;
+	ACE_OS::memcpy( (u_char *) vars->val.string,
+		       (u_char *) smival->value.string.ptr,
+		       (unsigned) smival->value.string.len);
       }
       break;
 
       // oid
     case sNMP_SYNTAX_OID:
       {
-        vars->type = (u_char) smival->syntax;
+	vars->type = (u_char) smival->syntax;
         vars->val_len = (int) smival->value.oid.len * sizeof(oid);
-        ACE_NEW(vars->val.objid, oid[(unsigned)vars->val_len]);
-        ACE_OS::memcpy((u_long *)vars->val.objid,
-                       (u_long *)smival->value.oid.ptr,
-                       (unsigned) vars->val_len);
+	ACE_NEW(vars->val.objid, oid[(unsigned)vars->val_len]);
+	ACE_OS::memcpy((u_long *)vars->val.objid,
+		       (u_long *)smival->value.oid.ptr,
+		       (unsigned) vars->val_len);
       }
       break;
 
 
-
+      
     case sNMP_SYNTAX_TIMETICKS:
     case sNMP_SYNTAX_CNTR32:
     case sNMP_SYNTAX_GAUGE32:
     case sNMP_SYNTAX_UINT32:
       {
-        long templong;
-        vars->type = (u_char) smival->syntax;
-        ACE_NEW(vars->val.integer, long);
-        vars->val_len = sizeof(long);
-        templong = (long) smival->value.uNumber;
-        ACE_OS::memcpy( (long*) vars->val.integer,
-                       (long*) &templong,
-                       sizeof(long));
+	long templong;
+	vars->type = (u_char) smival->syntax;
+	ACE_NEW(vars->val.integer, long);
+	vars->val_len = sizeof(long);
+	templong = (long) smival->value.uNumber;
+	ACE_OS::memcpy( (long*) vars->val.integer,
+		       (long*) &templong,
+		       sizeof(long));
       }
       break;
 
     case sNMP_SYNTAX_INT32:
       {
-        long templong;
-        vars->type = (u_char) smival->syntax;
-        ACE_NEW(vars->val.integer, long);
-        vars->val_len = sizeof(long);
-        templong = (long) smival->value.sNumber;
-        ACE_OS::memcpy( (long*) vars->val.integer,
-                       (long*) &templong,
-                       sizeof(long));
+	long templong;
+	vars->type = (u_char) smival->syntax;
+	ACE_NEW(vars->val.integer, long);
+	vars->val_len = sizeof(long);
+	templong = (long) smival->value.sNumber;
+	ACE_OS::memcpy( (long*) vars->val.integer,
+		       (long*) &templong,
+		       sizeof(long));
       }
       break;
 
       // 64 bit counter
     case sNMP_SYNTAX_CNTR64:
       {
-        vars->type = ( u_char) smival->syntax;
-        ACE_NEW(vars->val.counter64, counter64);
-        vars->val_len = sizeof(struct counter64);
-        ACE_OS::memcpy( (struct counter64*) vars->val.counter64,
-                       (SmiLPCNTR64) &(smival->value.hNumber),
-                       sizeof( SmiCNTR64));
+	vars->type = ( u_char) smival->syntax;
+	ACE_NEW(vars->val.counter64, counter64);
+	vars->val_len = sizeof(struct counter64);
+	ACE_OS::memcpy( (struct counter64*) vars->val.counter64,
+		       (SmiLPCNTR64) &(smival->value.hNumber),
+		       sizeof( SmiCNTR64));
       }
       break;
 
@@ -1134,11 +1134,11 @@ void cmu_snmp::add_var(struct snmp_pdu *pdu,
 // build the authentication
 // works for v1 or v2c
 u_char *cmu_snmp::auth_build( u_char *data,
-                               int *length,
-                               long int version,
-                               u_char *community,
-                               int community_len,
-                               int messagelen)
+			       int *length,
+			       long int version,
+			       u_char *community,
+			       int community_len,
+			       int messagelen)
 {
   ACE_TRACE("cmu_snmp::auth_build");
   u_char *params;
@@ -1147,32 +1147,32 @@ u_char *cmu_snmp::auth_build( u_char *data,
   params = community;
   plen = community_len;
 
-  data = asn1::build_sequence(data,
-                            length,
-                            (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR),
-                            messagelen + plen + 5);
-  if (data == 0){
+  data = asn1::build_sequence(data, 
+			    length, 
+			    (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), 
+			    messagelen + plen + 5);
+  if (data == NULL){
     ASNERROR("buildheader");
-    return 0;
-  }
-  data = asn1::build_int(data,
-                       length,
-                       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&version,
-                       sizeof(version));
-  if (data == 0){
+    return NULL;
+  }
+  data = asn1::build_int(data, 
+		       length,
+		       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&version, 
+		       sizeof(version));
+  if (data == NULL){
     ASNERROR("buildint");
-    return 0;
+    return NULL;
   }
 
-  data = asn1::build_string(data,
-                          length,
-                          (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR),
-                          params,
-                          plen );
-  if (data == 0){
+  data = asn1::build_string(data, 
+			  length,
+			  (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR), 
+			  params, 
+			  plen );
+  if (data == NULL){
     ASNERROR("buildstring");
-    return 0;
+    return NULL;
   }
 
   return (u_char *)data;
@@ -1180,11 +1180,11 @@ u_char *cmu_snmp::auth_build( u_char *data,
 
 
 // build a variable binding
-u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name,
-                                  int *var_name_len,
-                                  u_char var_val_type,
-                                  int var_val_len, u_char *var_val,
-                                  int *listlength)
+u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name, 
+				  int *var_name_len, 
+				  u_char var_val_type, 
+				  int var_val_len, u_char *var_val, 
+				  int *listlength)
 
 {
   ACE_TRACE("cmu_snmp::build_var_op");
@@ -1197,42 +1197,42 @@ u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name,
   data += 4;
   dummyLen -=4;
   if (dummyLen < 0)
-    return 0;
+    return NULL;
 
   headerLen = data - dataPtr;
   *listlength -= headerLen;
   data = asn1::build_objid( data, listlength,
-                 (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
-                         var_name, *var_name_len);
-  if (data == 0) {
+		 (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
+			 var_name, *var_name_len);
+  if (data == NULL) {
     ASNERROR("");
-    return 0;
+    return NULL;
   }
 
   // based on the type...
   switch(var_val_type) {
   case ASN_INTEGER:
-    data = asn1::build_int( data, listlength, var_val_type, (long *)var_val,
-                         var_val_len);
+    data = asn1::build_int( data, listlength, var_val_type, (long *)var_val, 
+			 var_val_len);
     break;
 
   case SMI_GAUGE:
   case SMI_COUNTER:
   case SMI_TIMETICKS:
   case SMI_UINTEGER:
-    data = asn1::build_unsigned_int( data,
-                                  listlength,
-                                  var_val_type,
-                                  (u_long *)var_val,
-                                  var_val_len);
+    data = asn1::build_unsigned_int( data, 
+				  listlength, 
+				  var_val_type,
+				  (u_long *)var_val, 
+				  var_val_len);
     break;
 
   case SMI_COUNTER64:
-    data = asn1::build_unsigned_int64(data,
-                                    listlength,
-                                    var_val_type,
-                                    (struct counter64 *)var_val,
-                                    var_val_len);
+    data = asn1::build_unsigned_int64(data, 
+				    listlength, 
+				    var_val_type,
+				    (struct counter64 *)var_val,
+				    var_val_len);
     break;
 
   case ASN_OCTET_STR:
@@ -1240,12 +1240,12 @@ u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name,
   case SMI_OPAQUE:
   case SMI_NSAP:
     data = asn1::build_string(data, listlength, var_val_type,
-                            var_val, var_val_len);
+			    var_val, var_val_len);
     break;
 
   case ASN_OBJECT_ID:
     data = asn1::build_objid(data, listlength, var_val_type,
-                           (oid *)var_val, var_val_len / sizeof(oid));
+			   (oid *)var_val, var_val_len / sizeof(oid));
     break;
 
   case ASN_NULL:
@@ -1254,7 +1254,7 @@ u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name,
 
   case ASN_BIT_STR:
     data = asn1::build_bitstring(data, listlength, var_val_type,
-                               var_val, var_val_len);
+			       var_val, var_val_len);
     break;
 
   case SNMP_NOSUCHOBJECT:
@@ -1265,25 +1265,25 @@ u_char * cmu_snmp::build_var_op(u_char *data, oid * var_name,
 
   default:
     ASNERROR("wrong type");
-    return 0;
+    return NULL;
   }
-  if (data == 0) {
+  if (data == NULL) {
     ASNERROR("");
-    return 0;
+    return NULL;
   }
   dummyLen = (data - dataPtr) - headerLen;
 
   asn1::build_sequence(dataPtr, &dummyLen,
-                     (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR),
-                     dummyLen);
+		     (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), 
+		     dummyLen);
   return data;
 }
 
 
 // serialize the pdu
-int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
-               int *out_length, long version,
-               u_char* community, int community_len)
+int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet, 
+	       int *out_length, long version,
+	       u_char* community, int community_len)
 {
   ACE_TRACE("cmu_snmp::build");
   u_char buf[SNMP_MSG_LENGTH];
@@ -1295,22 +1295,22 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
   length = *out_length;
   cp = packet;
   for(vp = pdu->variables; vp; vp = vp->next_variable) {
-    cp = cmu_snmp::build_var_op( cp, vp->name,
-                           &vp->name_length, vp->type,
-                           vp->val_len, (u_char *)vp->val.string,
-                           &length);
-    if (cp == 0)
+    cp = cmu_snmp::build_var_op( cp, vp->name, 
+			   &vp->name_length, vp->type, 
+			   vp->val_len, (u_char *)vp->val.string, 
+			   &length);
+    if (cp == NULL)
       return -1;
   }
   totallength = cp - packet;
 
   length = SNMP_MSG_LENGTH;
-
+  
   // encode the total len
-  cp = asn1::build_header( buf, &length,
-                        (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR),
-                        totallength);
-  if (cp == 0)
+  cp = asn1::build_header( buf, &length, 
+			(u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR), 
+			totallength);
+  if (cp == NULL)
     return -1;
   ACE_OS::memcpy( (char *)cp, (char *)packet,totallength);
   totallength += cp - buf;
@@ -1318,80 +1318,80 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
   length = *out_length;
   if (pdu->command != TRP_REQ_MSG) {
 
-    // request id
-    cp = asn1::build_int( packet,
-                       &length,
-               (u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->reqid,
-                       sizeof(pdu->reqid));
-    if (cp == 0)
+    // request id 
+    cp = asn1::build_int( packet, 
+		       &length,
+	       (u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->reqid, 
+		       sizeof(pdu->reqid));
+    if (cp == NULL)
       return -1;
 
-    // error status
-    cp = asn1::build_int(cp,
-                       &length,
-               (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->errstat, sizeof(pdu->errstat));
-    if (cp == 0)
+    // error status 
+    cp = asn1::build_int(cp, 
+		       &length,
+	       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->errstat, sizeof(pdu->errstat));
+    if (cp == NULL)
       return -1;
 
-    // error index
-    cp = asn1::build_int(cp,
-                       &length,
-               (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->errindex, sizeof(pdu->errindex));
-    if (cp == 0)
+    // error index 
+    cp = asn1::build_int(cp, 
+		       &length,
+	       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->errindex, sizeof(pdu->errindex));
+    if (cp == NULL)
       return -1;
-  }
-  else {        // this is a trap message
-
-    // enterprise
-    cp = asn1::build_objid( packet,
-                         &length,
-                 (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
-                         (oid *)pdu->enterprise,
-                         pdu->enterprise_length);
-    if (cp == 0)
+  } 
+  else {	// this is a trap message 
+
+    // enterprise 
+    cp = asn1::build_objid( packet, 
+			 &length,
+		 (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID),
+			 (oid *)pdu->enterprise, 
+			 pdu->enterprise_length);
+    if (cp == NULL)
       return -1;
 
-    // agent-addr
-    cp = asn1::build_string(cp,
-                            &length,
-                            // HDN Fixed to use correct tag
-                            (u_char)SMI_IPADDRESS,
-                            //(u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR),
-                          (u_char *)&pdu->agent_addr.sin_addr.s_addr,
-                          sizeof(pdu->agent_addr.sin_addr.s_addr));
-    if (cp == 0)
+    // agent-addr 
+    cp = asn1::build_string(cp, 
+			    &length,
+			    // HDN Fixed to use correct tag
+			    (u_char)SMI_IPADDRESS,
+			    //(u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OCTET_STR),
+			  (u_char *)&pdu->agent_addr.sin_addr.s_addr, 
+			  sizeof(pdu->agent_addr.sin_addr.s_addr));
+    if (cp == NULL)
       return -1;
 
-    // generic trap
-    cp = asn1::build_int(cp,
-                       &length,
-               (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->trap_type,
-                       sizeof(pdu->trap_type));
-    if (cp == 0)
+    // generic trap 
+    cp = asn1::build_int(cp, 
+		       &length,
+	       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->trap_type, 
+		       sizeof(pdu->trap_type));
+    if (cp == NULL)
       return -1;
 
-    // specific trap
-    cp = asn1::build_int( cp,
-                       &length,
-               (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->specific_type,
-                       sizeof(pdu->specific_type));
-    if (cp == 0)
+    // specific trap 
+    cp = asn1::build_int( cp, 
+		       &length,
+	       (u_char)(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->specific_type, 
+		       sizeof(pdu->specific_type));
+    if (cp == NULL)
       return -1;
 
-    // timestamp
-    cp = asn1::build_int(cp,
-                       &length,
-                         // HDN Fixed to use correct tag
-                         (u_char)SMI_TIMETICKS,
-                         //(u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
-                       (long *)&pdu->time,
-                       sizeof(pdu->time));
-    if (cp == 0)
+    // timestamp  
+    cp = asn1::build_int(cp, 
+		       &length,
+			 // HDN Fixed to use correct tag
+			 (u_char)SMI_TIMETICKS,
+			 //(u_char )(ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_INTEGER),
+		       (long *)&pdu->time, 
+		       sizeof(pdu->time));
+    if (cp == NULL)
       return -1;
   }
 
@@ -1402,11 +1402,11 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
   totallength += cp - packet;
 
   length = SNMP_MSG_LENGTH;
-  cp = asn1::build_header(buf,
-                        &length,
-                        (u_char)pdu->command,
-                        totallength);
-  if (cp == 0)
+  cp = asn1::build_header(buf, 
+			&length, 
+			(u_char)pdu->command, 
+			totallength);
+  if (cp == NULL)
     return -1;
   if (length < totallength)
     return -1;
@@ -1416,13 +1416,13 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
 
   length = *out_length;
 
-  cp = cmu_snmp::auth_build( packet,
-                       &length,
-                       version,
-                       community,
-                       community_len,
-                       totallength );
-  if (cp == 0)
+  cp = cmu_snmp::auth_build( packet, 
+		       &length, 
+		       version, 
+		       community,
+		       community_len,
+		       totallength );
+  if (cp == NULL)
     return -1;
   if ((*out_length - (cp - packet)) < totallength)
     return -1;
@@ -1437,81 +1437,81 @@ int cmu_snmp::build( struct snmp_pdu *pdu, u_char *packet,
 // parse the authentication header
 u_char *cmu_snmp::auth_parse(u_char *data,
                                int *length, u_char *sid,
-                               int *slen, long  *version)
+			       int *slen, long	*version)
 {
   ACE_TRACE("cmu_snmp::auth_parse");
   u_char type;
 
   // get the type
   data = asn1::parse_header( data, length, &type);
-  if (data == 0){
+  if (data == NULL){
     ASNERROR("bad header");
-    return 0;
+    return NULL;
   }
 
   if (type != (ASN_SEQUENCE | ASN_CONSTRUCTOR)) {
     ASNERROR("wrong auth header type");
-    return 0;
+    return NULL;
   }
 
   // get the version
   data = asn1::parse_int(data, length, &type, version, sizeof(*version));
-  if (data == 0) {
+  if (data == NULL) {
     ASNERROR("bad parse of version");
-    return 0;
+    return NULL;
   }
 
   // get the community name
   data = asn1::parse_string(data, length, &type, sid, slen);
-  if (data == 0) {
+  if (data == NULL) {
     ASNERROR("bad parse of community");
-    return 0;
+    return NULL;
   }
 
   return (u_char *)data;
 }
 
-/* u_char *data,  // IN - pointer to the start of object
-  oid       *var_name,      // OUT - object id of variable
-  int       *var_name_len,  // IN/OUT - length of variable name
-  u_char  *var_val_type, // OUT - type of variable
-                                 (int or octet string) (one byte)
-  int       *var_val_len,     // OUT - length of variable
+/* u_char *data,  // IN - pointer to the start of object 
+  oid	    *var_name,	    // OUT - object id of variable 
+  int	    *var_name_len,  // IN/OUT - length of variable name 
+  u_char  *var_val_type, // OUT - type of variable 
+                                 (int or octet string) (one byte) 
+  int	    *var_val_len,     // OUT - length of variable
   u_char  **var_val,  // OUT - pointer to ASN1 encoded value of variable
 */
 
 u_char *
-cmu_snmp::parse_var_op( u_char *data, oid *var_name,
-                       int *var_name_len,  u_char  *var_val_type,
-                       int *var_val_len, u_char  **var_val,
+cmu_snmp::parse_var_op( u_char *data, oid *var_name,	    
+                       int *var_name_len,  u_char  *var_val_type, 
+                       int *var_val_len, u_char  **var_val, 
                        int  *listlength)
 {
   ACE_TRACE("cmu_snmp::parse_var_op");
   u_char var_op_type;
-  int   var_op_len = *listlength;
+  int	var_op_len = *listlength;
   u_char *var_op_start = data;
 
   data = asn1::parse_header(data, &var_op_len, &var_op_type);
-  if (data == 0){
+  if (data == NULL){
     ASNERROR("");
-    return 0;
+    return NULL;
   }
   if (var_op_type != (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR))
-    return 0;
+    return NULL;
   data = asn1::parse_objid(data, &var_op_len, &var_op_type, var_name, var_name_len);
-  if (data == 0) {
+  if (data == NULL) {
     ASNERROR("");
-    return 0;
+    return NULL;
   }
   if (var_op_type != (u_char)
                      (ASN_UNIVERSAL | ASN_PRIMITIVE | ASN_OBJECT_ID))
-    return 0;
-  *var_val = data;      /* save pointer to this object */
+    return NULL;
+  *var_val = data;	/* save pointer to this object */
   /* find out what type of object this is */
   data = asn1::parse_header(data, &var_op_len, var_val_type);
-  if (data == 0) {
+  if (data == NULL) {
     ASNERROR("");
-    return 0;
+    return NULL;
   }
   *var_val_len = var_op_len;
   data += var_op_len;
@@ -1523,36 +1523,36 @@ cmu_snmp::parse_var_op( u_char *data, oid *var_name,
 
 // build a pdu from a data and length
 int cmu_snmp::parse( struct snmp_pdu *pdu,
-               u_char  *data,
-               u_char *community_name,
-               u_long &community_len,
-               snmp_version &spp_version,
-               int length)
+	       u_char  *data,
+	       u_char *community_name,
+	       u_long &community_len,
+	       snmp_version &spp_version,
+	       int length)
 {
   ACE_TRACE("cmu_snmp::parse");
   u_char  msg_type;
   u_char  type;
   u_char  *var_val;
   long    version;
-  int       len, four;
+  int	    len, four;
   u_char community[256];
   int community_length = 256;
   struct variable_list *vp = 0;
-  oid       objid[MAX_NAME_LEN], *op;
-
-  // authenticates message and returns length if valid
-  data = cmu_snmp::auth_parse(data,
-                         &length,
-                         community,
-                         &community_length,
-                         &version);
-  if (data == 0)
+  oid	    objid[MAX_NAME_LEN], *op;
+
+  // authenticates message and returns length if valid 
+  data = cmu_snmp::auth_parse(data, 
+			 &length, 
+			 community, 
+			 &community_length, 
+			 &version);
+  if (data == NULL)
     return -1;
 
   // copy the returned community name
-  ACE_OS::memcpy( (u_char *) community_name,
-                 (u_char *) community,
-                 community_length);
+  ACE_OS::memcpy( (u_char *) community_name, 
+		 (u_char *) community, 
+		 community_length);
   community_len = (long) community_length;
 
   if( version != SNMP_VERSION_1 && version != SNMP_VERSION_2C ) {
@@ -1562,109 +1562,109 @@ int cmu_snmp::parse( struct snmp_pdu *pdu,
 
   spp_version = (snmp_version) version;
 
-  data = asn1::parse_header(data,
-                          &length,
-                          &msg_type);
-  if (data == 0)
+  data = asn1::parse_header(data, 
+			  &length, 
+			  &msg_type);
+  if (data == NULL)
     return -1;
   pdu->command = msg_type;
 
   if (pdu->command != TRP_REQ_MSG){
     // get the rid
-    data = asn1::parse_int(data,
-                         &length, &type,
-                         (long *)&pdu->reqid,
-                         sizeof(pdu->reqid));
-    if (data == 0)
+    data = asn1::parse_int(data, 
+			 &length, &type, 
+			 (long *)&pdu->reqid, 
+			 sizeof(pdu->reqid));
+    if (data == NULL)
       return -1;
     // get the error status
-    data = asn1::parse_int(data,
-                         &length,
-                         &type,
-                         (long *)&pdu->errstat,
-                         sizeof(pdu->errstat));
-    if (data == 0)
+    data = asn1::parse_int(data, 
+			 &length, 
+			 &type, 
+			 (long *)&pdu->errstat, 
+			 sizeof(pdu->errstat));
+    if (data == NULL)
       return -1;
     // get the error index
-    data = asn1::parse_int(data,
-                         &length,
-                         &type,
-                         (long *)&pdu->errindex,
-                         sizeof(pdu->errindex));
-    if (data == 0)
+    data = asn1::parse_int(data, 
+			 &length, 
+			 &type, 
+			 (long *)&pdu->errindex, 
+			 sizeof(pdu->errindex));
+    if (data == NULL)
       return -1;
-  }
+  } 
   else {  // is a trap
 
     // get the enterprise
     pdu->enterprise_length = MAX_NAME_LEN;
-    data = asn1::parse_objid(data,
-                           &length,
-                           &type,
-                           objid,
-                           &pdu->enterprise_length);
-    if (data == 0)
+    data = asn1::parse_objid(data, 
+			   &length, 
+			   &type, 
+			   objid, 
+			   &pdu->enterprise_length);
+    if (data == NULL)
       return -1;
 
-    ACE_NEW_RETURN(pdu->enterprise,
+    ACE_NEW_RETURN(pdu->enterprise, 
                    oid[pdu->enterprise_length*sizeof(oid)],-1);
 
     // fixed
-    ACE_OS::memcpy((char *)pdu->enterprise,(char *)objid,
+    ACE_OS::memcpy((char *)pdu->enterprise,(char *)objid,  
                    pdu->enterprise_length * sizeof(oid));
 
     // get source address
     four = 4;
-    data = asn1::parse_string(data, &length, &type,
-                            (u_char *)&pdu->agent_addr.sin_addr.s_addr,
-                            &four);
-    if (data == 0)
+    data = asn1::parse_string(data, &length, &type, 
+                            (u_char *)&pdu->agent_addr.sin_addr.s_addr, 
+			    &four);
+    if (data == NULL)
       return -1;
 
     // get trap type
-    data = asn1::parse_int(data, &length, &type, (long *)&pdu->trap_type,
-                         sizeof(pdu->trap_type));
-    if (data == 0)
+    data = asn1::parse_int(data, &length, &type, (long *)&pdu->trap_type, 
+			 sizeof(pdu->trap_type));
+    if (data == NULL)
       return -1;
 
     // trap type
-    data = asn1::parse_int(data, &length, &type, (long *)&pdu->specific_type,
-                         sizeof(pdu->specific_type));
-    if (data == 0)
+    data = asn1::parse_int(data, &length, &type, (long *)&pdu->specific_type, 
+			 sizeof(pdu->specific_type));
+    if (data == NULL)
       return -1;
 
     // timestamp
-    data = asn1::parse_int(data, &length, &type, (long *)&pdu->time,
+    data = asn1::parse_int(data, &length, &type, (long *)&pdu->time, 
                             sizeof(pdu->time));
-    if (data == 0)
+    if (data == NULL)
       return -1;
   }
 
   // get the vb list
   data = asn1::parse_header(data, &length, &type);
-  if (data == 0)
+  if (data == NULL)
     return -1;
 
   if (type != (u_char)(ASN_SEQUENCE | ASN_CONSTRUCTOR))
     return -1;
 
   while((int)length > 0) {
-    if (pdu->variables == 0) {
+    if (pdu->variables == NULL) {
       ACE_NEW_RETURN(pdu->variables, variable_list, -1);
       vp = pdu->variables;
     } else {
       ACE_NEW_RETURN(vp->next_variable, variable_list, -1);
       vp = vp->next_variable;
     }
-    vp->next_variable = 0;
-    vp->val.string = 0;
-    vp->name = 0;
+    vp->next_variable = NULL;
+    vp->val.string = NULL;
+    vp->name = NULL;
     vp->name_length = MAX_NAME_LEN;
-    data = cmu_snmp::parse_var_op( data, objid,
-                             &vp->name_length, &vp->type,
-                             &vp->val_len, &var_val,
-                             (int *)&length);
-     if (data == 0)
+    data = cmu_snmp::parse_var_op( data, objid, 
+			     &vp->name_length, &vp->type, 
+			     &vp->val_len, &var_val, 
+			     (int *)&length);
+     if (data == NULL)
       return -1;
 
     ACE_NEW_RETURN(op, oid[(unsigned)vp->name_length * sizeof(oid)], -1);
@@ -1688,16 +1688,16 @@ int cmu_snmp::parse( struct snmp_pdu *pdu,
       ACE_NEW_RETURN(vp->val.counter64, counter64, -1);
       vp->val_len = sizeof(struct counter64);
       asn1::parse_unsigned_int64(var_val, &len, &vp->type,
-                               (struct counter64 *)vp->val.counter64,
-                               sizeof(*vp->val.counter64));
+			       (struct counter64 *)vp->val.counter64,
+			       sizeof(*vp->val.counter64));
       break;
-
+      
     case ASN_OCTET_STR:
     case SMI_IPADDRESS:
     case SMI_OPAQUE:
     case SMI_NSAP:
       ACE_NEW_RETURN(vp->val.string, u_char[(unsigned)vp->val_len + 1], -1);
-      asn1::parse_string(var_val, &len, &vp->type, vp->val.string,
+      asn1::parse_string(var_val, &len, &vp->type, vp->val.string, 
                          &vp->val_len);
       break;
 
@@ -1710,8 +1710,8 @@ int cmu_snmp::parse( struct snmp_pdu *pdu,
 
       // fixed
       ACE_OS::memcpy((char *)vp->val.objid,
-                     (char *)objid,
-                     vp->val_len * sizeof(oid));
+		     (char *)objid,
+		     vp->val_len * sizeof(oid));
       break;
 
     case SNMP_NOSUCHOBJECT:
@@ -1726,3 +1726,4 @@ int cmu_snmp::parse( struct snmp_pdu *pdu,
   }
   return 0;
 }
+
diff --git a/ASNMP/asnmp/asn1.h b/ASNMP/asnmp/asn1.h
index 82a81f4a561..dd84e8f5b00 100644
--- a/ASNMP/asnmp/asn1.h
+++ b/ASNMP/asnmp/asn1.h
@@ -141,7 +141,7 @@ struct snmp_pdu {
 
 // vb list
 struct variable_list {
-    struct variable_list *next_variable;    // 0 for last variable
+    struct variable_list *next_variable;    // NULL for last variable
     oid     *name;                          // Object identifier of variable
     int     name_length;                    // number of subid's in name
     unsigned char   type;                   // ASN type of variable
diff --git a/ASNMP/asnmp/counter.cpp b/ASNMP/asnmp/counter.cpp
index 04c50dd6475..363c4b632f7 100644
--- a/ASNMP/asnmp/counter.cpp
+++ b/ASNMP/asnmp/counter.cpp
@@ -18,17 +18,17 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+ 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
 #include "asnmp/counter.h"
@@ -37,13 +37,13 @@ ACE_RCSID(asnmp, counter, "$Id$")
 
 // constructor with a value
 Counter32::Counter32( const unsigned long i):SnmpUInt32(i)
-{
-  smival.syntax = sNMP_SYNTAX_CNTR32;
+{ 
+  smival.syntax = sNMP_SYNTAX_CNTR32; 
 }
 
 // copy constructor
 Counter32::Counter32( const Counter32 &c)
-{
+{ 
    this->smival.value.uNumber = c.smival.value.uNumber;
    smival.syntax = sNMP_SYNTAX_CNTR32;
    valid_flag = 1;
@@ -51,29 +51,29 @@ Counter32::Counter32( const Counter32 &c)
 
 // syntax type
 SmiUINT32 Counter32::get_syntax()
-{
-  return sNMP_SYNTAX_CNTR32;
+{ 
+  return sNMP_SYNTAX_CNTR32; 
 }
 
 // general assignment from any Value
 SnmpSyntax& Counter32::operator=( SnmpSyntax &in_val){
-  if ( this == &in_val )        // handle assignement from itself
+  if ( this == &in_val )	// handle assignement from itself
       return *this;
 
-  valid_flag = 0;               // will get set true if really valid
+  valid_flag = 0;		// will get set true if really valid
   if (in_val.valid())
-  {
+  {  
     switch (in_val.get_syntax())
     {
       case sNMP_SYNTAX_UINT32:
-   // case sNMP_SYNTAX_GAUGE32:         .. indistinquishable from UINT32
+   // case sNMP_SYNTAX_GAUGE32:    	.. indistinquishable from UINT32
       case sNMP_SYNTAX_CNTR32:
       case sNMP_SYNTAX_TIMETICKS:
-      case sNMP_SYNTAX_INT32:           // implied cast int -> uint
-          this->smival.value.uNumber =
-                ((Counter32 &)in_val).smival.value.uNumber;
-          valid_flag = 1;
-          break;
+      case sNMP_SYNTAX_INT32:		// implied cast int -> uint 
+	  this->smival.value.uNumber = 
+		((Counter32 &)in_val).smival.value.uNumber;  
+  	  valid_flag = 1;
+	  break;
     }
   }
   return *this;
@@ -81,26 +81,27 @@ SnmpSyntax& Counter32::operator=( SnmpSyntax &in_val){
 
 // overloaded assignment
 Counter32& Counter32::operator=( const unsigned long int i)
-{
-  this->smival.value.uNumber=i;
+{ 
+  this->smival.value.uNumber=i; 
   return *this;
 }
 
 // overloaded assignment
 Counter32& Counter32::operator=( const Counter32 &uli)
-{
+{ 
   this->smival.value.uNumber = uli.smival.value.uNumber;
   return *this;
 }
 
 // otherwise, behave like an unsigned long int
 Counter32::operator unsigned long()
-{
-  return this->smival.value.uNumber;
+{ 
+  return this->smival.value.uNumber; 
 }
 
 // clone
 SnmpSyntax * Counter32::clone() const
-{
-  return ( SnmpSyntax *) new Counter32(*this);
+{ 
+  return ( SnmpSyntax *) new Counter32(*this); 
 }
+
diff --git a/ASNMP/asnmp/ctr64.cpp b/ASNMP/asnmp/ctr64.cpp
index 264c97a3ac2..6106eb83bf8 100644
--- a/ASNMP/asnmp/ctr64.cpp
+++ b/ASNMP/asnmp/ctr64.cpp
@@ -18,32 +18,32 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+ 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
-=====================================================================*/
-
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
+=====================================================================*/ 
+ 
 #include "asnmp/ctr64.h"
 
 ACE_RCSID(asnmp, ctr64, "$Id$")
 
-#define MAX32 4294967295u
+#define MAX32 4294967295
 
 //-----------[ syntax type ]----------------------------------------------
 SmiUINT32 Counter64::get_syntax()
-{
-  return sNMP_SYNTAX_CNTR64;
+{ 
+  return sNMP_SYNTAX_CNTR64; 
 }
 
-//------------------[ constructor with values ]--------------------------
+//------------------[ constructor with values ]-------------------------- 
 Counter64::Counter64( unsigned long hiparm, unsigned long loparm)
 {
   smival.syntax = sNMP_SYNTAX_CNTR64;
@@ -51,7 +51,7 @@ Counter64::Counter64( unsigned long hiparm, unsigned long loparm)
   smival.value.hNumber.lopart = loparm;
 }
 
-//------------------[ constructor with low value only ]------------------
+//------------------[ constructor with low value only ]------------------ 
 Counter64::Counter64( unsigned long long llw )
 {
   smival.syntax = sNMP_SYNTAX_CNTR64;
@@ -59,7 +59,7 @@ Counter64::Counter64( unsigned long long llw )
   smival.value.hNumber.lopart = (unsigned long) llw & 0xffffffff;
 }
 
-//------------------[ copy constructor ]---------------------------------
+//------------------[ copy constructor ]--------------------------------- 
 Counter64::Counter64( const Counter64 &ctr64 )
 {
   smival.syntax = sNMP_SYNTAX_CNTR64;
@@ -67,41 +67,41 @@ Counter64::Counter64( const Counter64 &ctr64 )
   smival.value.hNumber.lopart = ctr64.low();
 }
 
-//------------------[ destructor ]---------------------------------
+//------------------[ destructor ]--------------------------------- 
 Counter64::~Counter64()
 {
 }
 
 
-//------------------[ Counter64::high() ]------------------------------
-// return the high part
+//------------------[ Counter64::high() ]------------------------------ 
+// return the high part   
 unsigned long Counter64::high() const
-{
-  return smival.value.hNumber.hipart;
+{ 
+  return smival.value.hNumber.hipart; 
 }
 
 
-//------------------[ Counter64::low() ]-------------------------------
-// return the low part
+//------------------[ Counter64::low() ]-------------------------------        
+// return the low part   
 unsigned long Counter64::low() const
-{
+{ 
   return smival.value.hNumber.lopart;
 }
 
-//------------------[ set_high( const unsigned long h) ]-----------
-// set the high part
+//------------------[ set_high( const unsigned long h) ]-----------        
+// set the high part   
 void Counter64::set_high( const unsigned long h)
-{
-  smival.value.hNumber.hipart = h;
+{ 
+  smival.value.hNumber.hipart = h; 
 }
-
-//------------------[ set_low( const unsigned long l) ]------------
-// set the low part
+   
+//------------------[ set_low( const unsigned long l) ]------------        
+// set the low part   
 void Counter64::set_low( const unsigned long l)
-{
-  smival.value.hNumber.lopart = l;
-}
-
+{ 
+  smival.value.hNumber.lopart = l; 
+} 
+        
 
 //-----------[ to_long_double( Counter64 c64) ]-----------------------------
 // convert a Counter 64 to a long double
@@ -114,7 +114,7 @@ long double Counter64::to_long_double()  const
 }
 
 
-//-----------[ ld_to_c64( long double ld) ]----------------------------
+//-----------[ ld_to_c64( long double ld) ]----------------------------      
 // convert a long double to a Counter64
 // semantics changed from prior version
 Counter64& Counter64::assign( long double ld)
@@ -132,28 +132,28 @@ SnmpSyntax& Counter64::operator=( SnmpSyntax &val)
   if ( this == &val )
       return *this;
 
-  smival.value.hNumber.lopart = 0;      // pessimsitic - assume no mapping
+  smival.value.hNumber.lopart = 0;	// pessimsitic - assume no mapping
   smival.value.hNumber.hipart = 0;
 
   // try to make assignment valid
   if (val.valid()){
     switch (val.get_syntax()){
       case sNMP_SYNTAX_CNTR64:
-        smival.value.hNumber.hipart =
-                ((Counter64 &)val).smival.value.hNumber.hipart;
-        smival.value.hNumber.lopart =
-                ((Counter64 &)val).smival.value.hNumber.lopart;
-        break;
+	smival.value.hNumber.hipart = 
+		((Counter64 &)val).smival.value.hNumber.hipart;
+	smival.value.hNumber.lopart = 
+		((Counter64 &)val).smival.value.hNumber.lopart;
+	break;
 
       case sNMP_SYNTAX_CNTR32:
       case sNMP_SYNTAX_TIMETICKS:
       case sNMP_SYNTAX_GAUGE32:
-   // case sNMP_SYNTAX_UINT32:          .. indistinguishable from GAUGE32
+   // case sNMP_SYNTAX_UINT32:		.. indistinguishable from GAUGE32
       case sNMP_SYNTAX_INT32:
-        // take advantage of union...
-        smival.value.hNumber.lopart = ((Counter64 &)val).smival.value.uNumber;
-        smival.value.hNumber.hipart = 0;
-        break;
+	// take advantage of union...
+	smival.value.hNumber.lopart = ((Counter64 &)val).smival.value.uNumber;
+	smival.value.hNumber.hipart = 0;
+	break;
     }
   }
   return *this;
@@ -166,7 +166,7 @@ Counter64& Counter64::operator=( const unsigned long long rhs)
    smival.value.hNumber.lopart = (unsigned long) rhs;
    return *this;
 }
-
+ 
 // overloaded assignment
 Counter64& Counter64::operator=( const Counter64 &rhs)
 {
@@ -174,27 +174,27 @@ Counter64& Counter64::operator=( const Counter64 &rhs)
    smival.value.hNumber.lopart = rhs.low();
    return *this;
 }
-
+ 
 // otherwise, behave like an unsigned long int
 Counter64::operator unsigned long long()
 {
-  unsigned long long val = smival.value.hNumber.hipart;
+  unsigned long long val = smival.value.hNumber.hipart; 
   val = val << 32; // shift right 4 bytes
   val |= smival.value.hNumber.lopart;
-  return val;
+  return val; 
 }
 
 //----------------[ Counter64::clone() ]-----------------------------------
 // create a new instance of this Value
-SnmpSyntax* Counter64::clone() const
-{
-  return ( SnmpSyntax *) new Counter64(*this);
+SnmpSyntax* Counter64::clone() const 
+{ 
+  return ( SnmpSyntax *) new Counter64(*this); 
 }
 
 //----------------[ Counter64::valid() ]-------------------------------------
 int Counter64::valid() const
-{
-  return 1;
+{ 
+  return 1; 
 }
 
 //----------[ return ASCII format ]-------------------------
@@ -203,9 +203,10 @@ int Counter64::valid() const
 char * Counter64::to_string()
 {
   if ( high() != 0 )
-    sprintf(output_buffer, "0x%X%08X",
-            (unsigned int)high(), (unsigned int)low());
+    sprintf(output_buffer, "0x%X%08X", 
+	    (unsigned int)high(), (unsigned int)low());
   else
     sprintf(output_buffer, "%d", (int) low());
   return output_buffer;
 }
+
diff --git a/ASNMP/asnmp/gauge.cpp b/ASNMP/asnmp/gauge.cpp
index aac715f2730..8f97556a660 100644
--- a/ASNMP/asnmp/gauge.cpp
+++ b/ASNMP/asnmp/gauge.cpp
@@ -19,26 +19,26 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+ 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
-#include "asnmp/gauge.h"          // header file for gauge class
+#include "asnmp/gauge.h"	  // header file for gauge class
 
 ACE_RCSID(asnmp, gauge, "$Id$")
 
 // constructor with a value
 Gauge32::Gauge32( const unsigned long i):SnmpUInt32(i)
-{
+{ 
   smival.syntax = sNMP_SYNTAX_GAUGE32;
 }
 
@@ -50,26 +50,26 @@ Gauge32::Gauge32 ( const Gauge32 &g)
 }
 
 // destructor
-Gauge32::~Gauge32()
+Gauge32::~Gauge32() 
 {
 }
 
 // syntax type
 SmiUINT32 Gauge32::get_syntax()
-{
-  return sNMP_SYNTAX_GAUGE32;
+{ 
+  return sNMP_SYNTAX_GAUGE32; 
 }
 
 // overloaded assignment
 Gauge32& Gauge32::operator=( const Gauge32 &uli)
-{
+{ 
   this->smival.value.uNumber = uli.smival.value.uNumber;
      return *this;
 }
 
 // overloaded assignment
 Gauge32& Gauge32::operator=( const unsigned long int i)
-{
+{ 
   smival.value.uNumber=i; return *this;
 }
 
@@ -78,23 +78,23 @@ Gauge32& Gauge32::operator=( const unsigned long int i)
 SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val)
 {
 
-  if ( this == &in_val )        // handle assignement from itself
+  if ( this == &in_val )	// handle assignement from itself
       return *this;
 
-  valid_flag = 0;               // will get set true if really valid
+  valid_flag = 0;		// will get set true if really valid
   if (in_val.valid())
-  {
+  {  
     switch (in_val.get_syntax())
     {
       case sNMP_SYNTAX_UINT32:
-      case sNMP_SYNTAX_GAUGE32:
+      case sNMP_SYNTAX_GAUGE32:  	
       case sNMP_SYNTAX_CNTR32:
       case sNMP_SYNTAX_TIMETICKS:
-      case sNMP_SYNTAX_INT32:           // implied cast int -> uint
-          this->smival.value.uNumber =
-                ((Gauge32 &)in_val).smival.value.uNumber;
-          valid_flag = 1;
-          break;
+      case sNMP_SYNTAX_INT32:		// implied cast int -> uint 
+	  this->smival.value.uNumber = 
+		((Gauge32 &)in_val).smival.value.uNumber;  
+  	  valid_flag = 1;
+	  break;
     }
   }
   return *this;
@@ -102,12 +102,13 @@ SnmpSyntax& Gauge32::operator=( SnmpSyntax &in_val)
 
 // otherwise, act as unsigned long
 Gauge32::operator unsigned long()
-{
-  return smival.value.uNumber;
+{ 
+  return smival.value.uNumber; 
 }
 
 // clone - create a new instance of this Value
-SnmpSyntax* Gauge32::clone() const
-{
-  return ( SnmpSyntax *) new Gauge32(*this);
+SnmpSyntax* Gauge32::clone() const 
+{ 
+  return ( SnmpSyntax *) new Gauge32(*this); 
 }
+
diff --git a/ASNMP/asnmp/integer.cpp b/ASNMP/asnmp/integer.cpp
index e0da5b6dfab..295046ab955 100644
--- a/ASNMP/asnmp/integer.cpp
+++ b/ASNMP/asnmp/integer.cpp
@@ -21,24 +21,24 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
-#include "asnmp/integer.h"        // header file for gauge class
+#include "asnmp/integer.h"        // header file for gauge class 
 
 ACE_RCSID(asnmp, integer, "$Id$")
 
 // constructor with value
 SnmpUInt32::SnmpUInt32 (const u_long i)
-{
+{ 
   smival.value.uNumber=i;
   smival.syntax = sNMP_SYNTAX_UINT32;
   valid_flag = 1;
@@ -46,83 +46,83 @@ SnmpUInt32::SnmpUInt32 (const u_long i)
 
 // copy constructor
 SnmpUInt32::SnmpUInt32( const SnmpUInt32 &c)
-{
+{ 
   smival.value.uNumber=c.smival.value.uNumber;
   smival.syntax = sNMP_SYNTAX_UINT32;
   valid_flag = 1;
 }
 
 // destructor (ensure that SnmpSyntax::~SnmpSyntax() is overridden)
-SnmpUInt32::~SnmpUInt32()
+SnmpUInt32::~SnmpUInt32() 
 {
 }
 
 // syntax type
 SmiUINT32 SnmpUInt32::get_syntax()
-{
- return sNMP_SYNTAX_UINT32;
+{ 
+ return sNMP_SYNTAX_UINT32; 
 }
 
-// object validity
+// object validity 
 int SnmpUInt32::valid( void) const
-{
- return valid_flag;
-}
-
-// overloaded assignment
-SnmpUInt32& SnmpUInt32::operator=( const unsigned long int i)
-{
-  smival.value.uNumber=i;
+{ 
+ return valid_flag; 
+}
+ 
+// overloaded assignment   
+SnmpUInt32& SnmpUInt32::operator=( const unsigned long int i) 
+{ 
+  smival.value.uNumber=i; 
   valid_flag = 1;
   return *this;
 }
-
+        
 // general assignment from any Value
 SnmpSyntax& SnmpUInt32::operator=( SnmpSyntax &in_val)
 {
-  if ( this == &in_val )        // handle assignement from itself
+  if ( this == &in_val )	// handle assignement from itself
       return *this;
 
-  valid_flag = 0;               // will get set true if really valid
+  valid_flag = 0;		// will get set true if really valid
   if (in_val.valid())
-  {
+  {  
     switch (in_val.get_syntax())
     {
       case sNMP_SYNTAX_UINT32:
-   // case sNMP_SYNTAX_GAUGE32:         .. indistinquishable from UINT32
+   // case sNMP_SYNTAX_GAUGE32:  	.. indistinquishable from UINT32
       case sNMP_SYNTAX_CNTR32:
       case sNMP_SYNTAX_TIMETICKS:
-      case sNMP_SYNTAX_INT32:           // implied cast int -> uint
-          this->smival.value.uNumber =
-              ((SnmpUInt32 &)in_val).smival.value.uNumber;
-          valid_flag = 1;
-          break;
+      case sNMP_SYNTAX_INT32:		// implied cast int -> uint 
+	  this->smival.value.uNumber = 
+	      ((SnmpUInt32 &)in_val).smival.value.uNumber;  
+  	  valid_flag = 1;
+	  break;
     }
   }
   return *this;
 }
 
-// overloaded assignment
-SnmpUInt32& SnmpUInt32::operator=( const SnmpUInt32 &uli)
-{
+// overloaded assignment   
+SnmpUInt32& SnmpUInt32::operator=( const SnmpUInt32 &uli) 
+{ 
   this->smival.value.uNumber = uli.smival.value.uNumber; return *this;
 }
 
 // otherwise, behave like an unsigned long int
 SnmpUInt32::operator unsigned long()
-{
-  return smival.value.uNumber;
+{ 
+  return smival.value.uNumber; 
 }
 
 // create a new instance of this Value
 SnmpSyntax* SnmpUInt32::clone() const
-{
-  return (SnmpSyntax *) new SnmpUInt32(*this);
+{ 
+  return (SnmpSyntax *) new SnmpUInt32(*this); 
 }
 
 // ASCII format return
-char * SnmpUInt32::to_string()
-{
+char * SnmpUInt32::to_string() 
+{ 
   sprintf(output_buffer, "%d", (int) (this->smival.value.uNumber));
      return output_buffer;
 }
@@ -132,51 +132,51 @@ char * SnmpUInt32::to_string()
 //  INT 32 Implementation
 //====================================================================
 
-// default constructor
-SnmpInt32::SnmpInt32 (const long i)
-{
+// default constructor 
+SnmpInt32::SnmpInt32 (const long i) 
+{ 
   smival.value.sNumber=i;
   smival.syntax = sNMP_SYNTAX_INT32;
   valid_flag = 1;
 }
 
 // constructor with value
-SnmpInt32::SnmpInt32 (const SnmpInt32 &c)
-{
+SnmpInt32::SnmpInt32 (const SnmpInt32 &c) 
+{ 
   smival.value.sNumber=c.smival.value.sNumber;
   smival.syntax = sNMP_SYNTAX_INT32;
   valid_flag = 1;
 }
 
-// destructor
-SnmpInt32::~SnmpInt32()
+// destructor 
+SnmpInt32::~SnmpInt32() 
 {
 }
 
 // syntax type
 SmiUINT32 SnmpInt32::get_syntax()
-{
- return sNMP_SYNTAX_INT32;
+{ 
+ return sNMP_SYNTAX_INT32; 
 }
 
-// object validity
+// object validity 
 int SnmpInt32::valid( void) const
-{
-  return valid_flag;
-}
-
-// overloaded assignment
-SnmpInt32& SnmpInt32::operator=( const long i)
-{
-  this->smival.value.sNumber = (unsigned long) i;
+{ 
+  return valid_flag; 
+}
+ 
+// overloaded assignment   
+SnmpInt32& SnmpInt32::operator=( const long i) 
+{ 
+  this->smival.value.sNumber = (unsigned long) i; 
   valid_flag = 1;
   return *this;
 }
-
-// overloaded assignment
-SnmpInt32& SnmpInt32::operator=( const SnmpInt32 &uli)
-{
-  this->smival.value.sNumber = uli.smival.value.sNumber;
+        
+// overloaded assignment   
+SnmpInt32& SnmpInt32::operator=( const SnmpInt32 &uli) 
+{ 
+  this->smival.value.sNumber = uli.smival.value.sNumber; 
   valid_flag = 1;
   return *this;
 }
@@ -184,23 +184,23 @@ SnmpInt32& SnmpInt32::operator=( const SnmpInt32 &uli)
 // general assignment from any Value
 SnmpSyntax& SnmpInt32::operator=( SnmpSyntax &in_val)
 {
-  if ( this == &in_val )        // handle assignement from itself
+  if ( this == &in_val )	// handle assignement from itself
       return *this;
 
-  valid_flag = 0;               // will get set true if really valid
+  valid_flag = 0;		// will get set true if really valid
   if (in_val.valid())
-  {
+  {  
     switch (in_val.get_syntax())
     {
       case sNMP_SYNTAX_INT32:
-      case sNMP_SYNTAX_UINT32:          // implied cast uint -> int
-   // case sNMP_SYNTAX_GAUGE32:         .. indistinquishable from UINT32
-      case sNMP_SYNTAX_CNTR32:          // implied cast uint -> int
-      case sNMP_SYNTAX_TIMETICKS:       // implied cast uint -> int
-          this->smival.value.sNumber =
-                ((SnmpInt32 &)in_val).smival.value.sNumber;
-          valid_flag = 1;
-          break;
+      case sNMP_SYNTAX_UINT32:		// implied cast uint -> int
+   // case sNMP_SYNTAX_GAUGE32:  	.. indistinquishable from UINT32
+      case sNMP_SYNTAX_CNTR32:		// implied cast uint -> int
+      case sNMP_SYNTAX_TIMETICKS:	// implied cast uint -> int
+	  this->smival.value.sNumber = 
+		((SnmpInt32 &)in_val).smival.value.sNumber;  
+  	  valid_flag = 1;
+	  break;
     }
   }
   return *this;
@@ -208,20 +208,21 @@ SnmpSyntax& SnmpInt32::operator=( SnmpSyntax &in_val)
 
 // otherwise, behave like a long int
 SnmpInt32::operator long()
-{
-  return (long) smival.value.sNumber;
+{ 
+  return (long) smival.value.sNumber; 
 }
 
 // clone - create a new instance of this Value
 SnmpSyntax* SnmpInt32::clone() const
-{
-  return ( SnmpSyntax *) new SnmpInt32(*this);
+{ 
+  return ( SnmpSyntax *) new SnmpInt32(*this); 
 }
 
 // ASCII format return
 
 char *SnmpInt32::to_string()
-{
+{ 
   sprintf(output_buffer, "%d", (int) (long) this->smival.value.sNumber);
   return output_buffer;
 }
+
diff --git a/ASNMP/asnmp/octet.cpp b/ASNMP/asnmp/octet.cpp
index 2a422a5fe88..b08bf5482f1 100644
--- a/ASNMP/asnmp/octet.cpp
+++ b/ASNMP/asnmp/octet.cpp
@@ -6,15 +6,15 @@
 //    asnmp
 //
 // = FILENAME
-//    octet.cpp
+//    octet.cpp 
 //
 // = DESCRIPTION
-//    Implements the SMI Octet datatype (RFC 1155)
+//    Implements the SMI Octet datatype (RFC 1155) 
 //    This class is fully contained and does not rely on or any other
-//    SNMP libraries. Ported to ACE by Michael MacFaden mrm@cisco.com
+//    SNMP libraries. Ported to ACE by Michael MacFaden mrm@cisco.com 
 //
 // = AUTHOR
-//   Peter E Mellquist
+//   Peter E Mellquist 
 //
 // ============================================================================
 /*===================================================================
@@ -22,15 +22,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
 #include "ace/OS.h"
@@ -40,8 +40,8 @@ ACE_RCSID(asnmp, octet, "$Id$")
 
 //============[ syntax type ]=========================================
 SmiUINT32 OctetStr::get_syntax()
-{
-  return sNMP_SYNTAX_OCTETS;
+{ 
+  return sNMP_SYNTAX_OCTETS; 
 }
 
 inline
@@ -52,18 +52,18 @@ void init_octet_smi(SmiVALUE& smi)
   smi.value.string.len = 0;
 }
 
-inline
+inline 
 void reset_octet_smi(SmiVALUE& smi)
 {
   delete [] smi.value.string.ptr;
-  smi.value.string.ptr = 0;
+  smi.value.string.ptr = NULL;
   smi.value.string.len = 0;
 }
 
-inline
+inline 
 int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag)
 {
-  valid_flag = 0;
+  valid_flag = FALSE;
 
   if (smi.value.string.ptr)
     delete [] smi.value.string.ptr;
@@ -71,20 +71,20 @@ int copy_octet_smi(SmiVALUE& smi, int size, const char *src, int& valid_flag)
   ACE_NEW_RETURN(smi.value.string.ptr, SmiBYTE[size], 1);
   ACE_OS::memcpy( smi.value.string.ptr, src, size);
   smi.value.string.len = size;
-  valid_flag = 1;
+  valid_flag = TRUE;
   return 0;
 }
 
 //============[ default constructor ]=========================
 OctetStr::OctetStr( const char  * string, long size):
-  output_buffer(0), validity(0)
+  output_buffer(NULL), validity(FALSE)
 {
 
   size_t z;
   init_octet_smi(smival);
 
   // check for null string
-  if ( !string)
+  if ( !string) 
     return;
 
   if (size == -1) // calc if no length given - assume c style string
@@ -100,13 +100,13 @@ void OctetStr::set_data( const SmiBYTE* string, long size)
 {
   size_t z;
 
-  // invalid args, set octetStr to not valid
+  // invalid args, set octetStr to not valid 
   if ( !string || !size) {
-    validity = 0;
+    validity = FALSE;
     return;
   }
 
-  // assume non-zero terminated string
+  // assume non-zero terminated string 
   if (size == -1) // calc if no length given - assume c style string
     size = z = ACE_OS::strlen( (char *)string);
 
@@ -121,8 +121,8 @@ void OctetStr::set_data( const SmiBYTE* string, long size)
 }
 
 //============[ constructor using another octet object ]==============
-OctetStr::OctetStr ( const OctetStr &octet):
-  output_buffer(0), validity(1)
+OctetStr::OctetStr ( const OctetStr &octet): 
+  output_buffer(NULL), validity(TRUE)
 {
   init_octet_smi(smival);
    // check for zero len case
@@ -131,13 +131,13 @@ OctetStr::OctetStr ( const OctetStr &octet):
    }
 
    // must be a valid object
-   if ( octet.validity == 0) {
-      validity = 0;
+   if ( octet.validity == FALSE) {
+      validity = FALSE;
       return;
    }
 
    // get the mem needed
-  copy_octet_smi(smival, octet.smival.value.string.len,
+  copy_octet_smi(smival, octet.smival.value.string.len, 
                   (const char *)octet.smival.value.string.ptr, validity);
 }
 
@@ -159,10 +159,10 @@ OctetStr& OctetStr::operator=( const char  *string)
    if ( smival.value.string.ptr ) {
      reset_octet_smi(smival);
    }
-
+   
    // if empty then we are done
    if (!string || !(nz = ACE_OS::strlen( string))) {
-     validity = 1;
+     validity = TRUE;
      return *this;
    }
 
@@ -189,41 +189,41 @@ OctetStr& OctetStr::operator=( const OctetStr &octet)
    }
 
    if (!octet.smival.value.string.len) {
-     validity = 1;
+     validity = TRUE;
      return *this;
    }
 
    // get some memory
-   copy_octet_smi(smival, octet.smival.value.string.len,
+   copy_octet_smi(smival, octet.smival.value.string.len, 
                  (const char*) octet.smival.value.string.ptr, validity);
-   return *this;                       // return self reference
+   return *this;		       // return self reference
 }
 
 //==============[ equivlence operator overloaded ]====================
 int operator==( const OctetStr &lhs, const OctetStr &rhs)
 {
-   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0)
-       return 1;
-   else
-       return 0;
+   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //==============[ not equivlence operator overloaded ]================
 int operator!=( const OctetStr &lhs, const OctetStr &rhs)
 {
-   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)!=0)
-       return 1;
-   else
-       return 0;
+   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)!=0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //==============[ less than < overloaded ]============================
 int operator<( const OctetStr &lhs, const OctetStr &rhs)
 {
-   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)<0)
-      return 1;
-   else
-      return 0;
+   if( lhs.left_comparison( rhs.smival.value.string.len, rhs)<0) 
+      return TRUE; 
+   else 
+      return FALSE;
 }
 
 //==============[ less than <= overloaded ]===========================
@@ -231,18 +231,18 @@ int operator<=( const OctetStr &lhs, const OctetStr &rhs)
 {
    if(( lhs.left_comparison( rhs.smival.value.string.len, rhs)<0) ||
       ( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0))
-      return 1;
+      return TRUE;
    else
-      return 0;
+      return FALSE;
 }
 
 //===============[ greater than > overloaded ]========================
 int operator>( const OctetStr &lhs, const OctetStr &rhs)
 {
-  if( lhs.left_comparison( rhs.smival.value.string.len, rhs)>0)
-      return 1;
-  else
-      return 0;
+  if( lhs.left_comparison( rhs.smival.value.string.len, rhs)>0) 
+      return TRUE; 
+  else 
+      return FALSE;
 }
 
 //===============[ greater than >= overloaded ]=======================
@@ -250,39 +250,39 @@ int operator>=( const OctetStr &lhs, const OctetStr &rhs)
 {
   if(( lhs.left_comparison( rhs.smival.value.string.len, rhs)>0) ||
      ( lhs.left_comparison( rhs.smival.value.string.len, rhs)==0))
-     return 1;
+     return TRUE;
   else
-     return 0;
+     return FALSE;
 }
 
 //===============[ equivlence operator overloaded ]===================
 int operator==( const OctetStr &lhs,const char  *rhs)
 {
    OctetStr to( rhs);
-   if( lhs.left_comparison( to.smival.value.string.len,to)==0)
-       return 1;
-   else
-       return 0;
+   if( lhs.left_comparison( to.smival.value.string.len,to)==0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //===============[ not equivlence operator overloaded ]===============
 int operator!=( const OctetStr &lhs,const char  *rhs)
 {
    OctetStr to( rhs);
-   if ( lhs.left_comparison( to.smival.value.string.len,to)!=0)
-       return 1;
-   else
-       return 0;
+   if ( lhs.left_comparison( to.smival.value.string.len,to)!=0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //===============[ less than < operator overloaded ]==================
 int operator<( const OctetStr &lhs,const char  *rhs)
 {
    OctetStr to( rhs);
-   if ( lhs.left_comparison( to.smival.value.string.len,to)<0)
-       return 1;
-   else
-       return 0;
+   if ( lhs.left_comparison( to.smival.value.string.len,to)<0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //===============[ less than <= operator overloaded ]=================
@@ -291,19 +291,19 @@ int operator<=( const OctetStr &lhs,char  *rhs)
    OctetStr to( rhs);
    if (( lhs.left_comparison( to.smival.value.string.len,to)<0) ||
        ( lhs.left_comparison( to.smival.value.string.len,to)==0))
-      return 1;
+      return TRUE;
    else
-      return 0;
+      return FALSE;
 }
 
 //===============[ greater than > operator overloaded ]===============
 int operator>( const OctetStr &lhs,const char  *rhs)
 {
    OctetStr to( rhs);
-   if ( lhs.left_comparison( to.smival.value.string.len,to)>0)
-       return 1;
-   else
-       return 0;
+   if ( lhs.left_comparison( to.smival.value.string.len,to)>0) 
+       return TRUE; 
+   else 
+       return FALSE;
 }
 
 //===============[ greater than >= operator overloaded ]==============
@@ -312,29 +312,29 @@ int operator>=( const OctetStr &lhs,const char  *rhs)
    OctetStr to( rhs);
    if (( lhs.left_comparison( to.smival.value.string.len,to)>0) ||
        ( lhs.left_comparison( to.smival.value.string.len,to)==0))
-      return 1;
+      return TRUE;
    else
-      return 0;
+      return FALSE;
 }
 
 //===============[ append operator, appends a string ]================
 OctetStr& OctetStr::operator+=( const char  *a)
 {
-  SmiBYTE  *tmp;         // temp pointer
+  SmiBYTE  *tmp;	 // temp pointer
   size_t slen,nlen;
 
   // get len of string
-  if ( !a || ((slen = ACE_OS::strlen( a)) == 0))
+  if ( !a || ((slen = ACE_OS::strlen( a)) == 0)) 
     return *this;
 
   // total len of octet
   nlen =  slen + (size_t) smival.value.string.len;
   ACE_NEW_RETURN(tmp, SmiBYTE [ nlen], *this);
-  ACE_OS::memcpy ( tmp, smival.value.string.ptr,
+  ACE_OS::memcpy ( tmp, smival.value.string.ptr, 
                    (size_t) smival.value.string.len);
   ACE_OS::memcpy( tmp + smival.value.string.len, a, (size_t) slen);
   // delete the original
-  if ( smival.value.string.ptr )
+  if ( smival.value.string.ptr ) 
      reset_octet_smi(smival);
   smival.value.string.ptr = tmp;
   smival.value.string.len = nlen;
@@ -344,10 +344,10 @@ OctetStr& OctetStr::operator+=( const char  *a)
 //================[ append one OctetStr to another ]==================
 OctetStr& OctetStr::operator+=( const OctetStr& octetstr)
 {
-  SmiBYTE  *tmp;         // temp pointer
+  SmiBYTE  *tmp;	 // temp pointer
   size_t slen,nlen;
 
-  if (!octetstr.validity ||
+  if (!octetstr.validity || 
       !(slen = (size_t)octetstr.length()))
     return *this;
 
@@ -355,9 +355,9 @@ OctetStr& OctetStr::operator+=( const OctetStr& octetstr)
   nlen =  slen + (size_t) smival.value.string.len;
   // get mem needed
   ACE_NEW_RETURN(tmp, SmiBYTE[ nlen], *this);
-  ACE_OS::memcpy ( tmp, smival.value.string.ptr,
+  ACE_OS::memcpy ( tmp, smival.value.string.ptr, 
                    (size_t) smival.value.string.len);
-  ACE_OS::memcpy( tmp + smival.value.string.len, octetstr.data(),
+  ACE_OS::memcpy( tmp + smival.value.string.len, octetstr.data(), 
                   (size_t) slen);
   if ( smival.value.string.ptr )
       reset_octet_smi(smival);
@@ -373,13 +373,13 @@ OctetStr& OctetStr::operator+=( const char c)
     // get the memory needed plus one extra byte
     ACE_NEW_RETURN(tmp, SmiBYTE[ smival.value.string.len + 1], *this);
     ACE_OS::memcpy ( tmp, smival.value.string.ptr,
-                (size_t) smival.value.string.len); // len of original
-    tmp[ smival.value.string.len ] = c;         // assign in byte
-    if ( smival.value.string.ptr )      // delete the original
+		(size_t) smival.value.string.len); // len of original
+    tmp[ smival.value.string.len ] = c; 	// assign in byte
+    if ( smival.value.string.ptr )	// delete the original
       reset_octet_smi(smival);
 
-    smival.value.string.ptr = tmp;      // point to one
-    smival.value.string.len++;          // up the len
+    smival.value.string.ptr = tmp;	// point to one
+    smival.value.string.len++;	   	// up the len
     return *this;
 }
 
@@ -387,55 +387,55 @@ OctetStr& OctetStr::operator+=( const char c)
 //================[ compare n elements of an Octet ]==================
 int OctetStr::left_comparison( const long n, const OctetStr &o) const
 {
-   long z, w;
+   long z, w;	
 
    // both are empty, they are equal
    if (( smival.value.string.len == 0) &&
-           ( o.smival.value.string.len == 0))
-           return 0;  // equal
-
+	   ( o.smival.value.string.len == 0))
+	   return 0;  // equal 
+   
    // self is empty and param has something
    if (( smival.value.string.len == 0) &&
-           ( o.smival.value.string.len >0) &&
-           (n>0))
-           return -1;
+	   ( o.smival.value.string.len >0) &&
+	   (n>0))
+	   return -1; 
 
    // self has something and param has nothing
    if (( smival.value.string.len > 0) &&
-           ( o.smival.value.string.len ==0) &&
-           (n>0))
-           return 1;
+	   ( o.smival.value.string.len ==0) &&
+	   (n>0)) 
+	   return 1; 
 
    // special case
    if (( smival.value.string.len == 0) &&
-           ( o.smival.value.string.len > 0) &&
-           ( n == 0))
-           return 0;
-
+	   ( o.smival.value.string.len > 0) &&
+	   ( n == 0))
+	   return 0;  
+   
    // pick the Min of n, this and the param len
    // this is the maximum # to iterate a search
    w = smival.value.string.len < o.smival.value.string.len
-           ? smival.value.string.len : o.smival.value.string.len;
+	   ? smival.value.string.len : o.smival.value.string.len;
    if (n<w) w=n;
 
    z = 0;
    while( z < w) {
-          if ( smival.value.string.ptr[z] < o.smival.value.string.ptr[z])
-            return -1;                          // less than
+	  if ( smival.value.string.ptr[z] < o.smival.value.string.ptr[z])
+	    return -1;				// less than
       if ( smival.value.string.ptr[z] > o.smival.value.string.ptr[z])
-            return 1;                           // greater than
+	    return 1;				// greater than
       z++;
    }
 
    if (( z == 0) &&
-           ( smival.value.string.len == 0) &&
-           ( o.smival.value.string.len > 0))
-           return -1;
+	   ( smival.value.string.len == 0) &&
+	   ( o.smival.value.string.len > 0))
+	   return -1;
 
    if (( z == 0) &&
-           ( o.smival.value.string.len == 0) &&
-           ( smival.value.string.len > 0))
-           return 1;
+	   ( o.smival.value.string.len == 0) &&
+	   ( smival.value.string.len > 0))
+	   return 1;
 
    return 0;
 }
@@ -448,7 +448,7 @@ size_t OctetStr::length() const
 
 //================[ operator[]: access as if array ]==================
 SmiBYTE& OctetStr::operator[]( int position)
-{
+{ 
     return  smival.value.string.ptr[position];
 }
 
@@ -465,9 +465,9 @@ int OctetStr::valid() const
 }
 
 //================[ clone() ]=========================================
-SnmpSyntax * OctetStr::clone() const
-{
-  OctetStr *tmp = new OctetStr(*this);
+SnmpSyntax * OctetStr::clone() const 
+{ 
+  OctetStr *tmp = new OctetStr(*this); 
   return ( SnmpSyntax *) tmp;
 }
 
@@ -475,18 +475,18 @@ SnmpSyntax * OctetStr::clone() const
 char  * OctetStr::to_string()
 {
   for ( unsigned long i=0; i < smival.value.string.len; i++) {
-    if (( smival.value.string.ptr[i] != '\r')&&
-                ( smival.value.string.ptr[i] != '\n')&&
-                (isprint((int) (smival.value.string.ptr[i]))==0))
+    if (( smival.value.string.ptr[i] != '\r')&& 
+		( smival.value.string.ptr[i] != '\n')&&
+		(isprint((int) (smival.value.string.ptr[i]))==0))
          return(to_string_hex());
   }
 
-  if ( output_buffer != 0)
-          delete [] output_buffer;
+  if ( output_buffer != NULL)
+	  delete [] output_buffer;
 
   ACE_NEW_RETURN(output_buffer, char[smival.value.string.len + 1], "");
   if (smival.value.string.len)
-    ACE_OS::memcpy(output_buffer, smival.value.string.ptr,
+    ACE_OS::memcpy(output_buffer, smival.value.string.ptr, 
                    (int) smival.value.string.len);
   output_buffer[smival.value.string.len] = '\0';
   return output_buffer;
@@ -501,7 +501,7 @@ SnmpSyntax& OctetStr::operator=( SnmpSyntax &val)
        return *this;
 
   // blow away the old value
-  validity=0;
+  validity=FALSE;
   if (smival.value.string.ptr) {
       reset_octet_smi(smival);
   }
@@ -510,9 +510,9 @@ SnmpSyntax& OctetStr::operator=( SnmpSyntax &val)
     switch (val.get_syntax()) {
       case sNMP_SYNTAX_OCTETS:
       case sNMP_SYNTAX_IPADDR:
-        set_data( ((OctetStr &)val).smival.value.string.ptr,
-                  ((OctetStr &)val).smival.value.string.len);
-        break;
+	set_data( ((OctetStr &)val).smival.value.string.ptr, 
+		  ((OctetStr &)val).smival.value.string.len);
+	break;
     }
   }
   return *this;
@@ -522,28 +522,28 @@ SnmpSyntax& OctetStr::operator=( SnmpSyntax &val)
 char *OctetStr::to_string_hex()
 {
   int cnt;
-  char char_buf[80];              // holds ASCII representation of data
-  char *buf_ptr;                  // pointer into ASCII listing
-  char *line_ptr;                 // pointer into Hex listing
+  char char_buf[80];              // holds ASCII representation of data 
+  char *buf_ptr;                  // pointer into ASCII listing	    
+  char *line_ptr;                 // pointer into Hex listing 
   int  storageNeeded;             // how much space do we need ?
   int  local_len = (int) smival.value.string.len;
   SmiBYTE *bytes = smival.value.string.ptr;
 
-
+  
   storageNeeded = (int) ((smival.value.string.len/16)+1) * 72 + 1;
 
-  if ( output_buffer != 0)
-          delete [] output_buffer;
+  if ( output_buffer != NULL)
+	  delete [] output_buffer;
 
   ACE_NEW_RETURN(output_buffer, char[storageNeeded], "");
-
+  
   line_ptr = output_buffer;
 
     /*----------------------------------------*/
     /* processing loop for entire data buffer */
     /*----------------------------------------*/
   while (local_len > 0) {
-    cnt      = 16;        /* print 16 bytes per line */
+    cnt	     = 16;	  /* print 16 bytes per line */
     buf_ptr  = char_buf;
     sprintf(line_ptr, "  ");
     line_ptr += 2;  /* indent */
@@ -556,9 +556,9 @@ char *OctetStr::to_string_hex()
 
       line_ptr +=3;   /* the display of a byte always 3 chars long */
       if (isprint(*bytes))
-        sprintf(buf_ptr, "%c", *bytes);
+	sprintf(buf_ptr, "%c", *bytes);
       else
-        sprintf(buf_ptr, ".");
+	sprintf(buf_ptr, ".");
       bytes++;
       buf_ptr++;
     }
@@ -566,7 +566,7 @@ char *OctetStr::to_string_hex()
 
        /*----------------------------------------------------------*/
        /* this is to make sure that the ASCII displays line up for */
-       /* incomplete lines of hex                                  */
+       /* incomplete lines of hex				   */
        /*----------------------------------------------------------*/
     while (cnt-- > 0) {
       sprintf(line_ptr,"   ");
diff --git a/ASNMP/asnmp/oid.cpp b/ASNMP/asnmp/oid.cpp
index d0bbcd3c4aa..b1b47ef3e70 100644
--- a/ASNMP/asnmp/oid.cpp
+++ b/ASNMP/asnmp/oid.cpp
@@ -22,15 +22,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS" without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS" without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
 //---------[ external C libaries used ]--------------------------------
@@ -40,14 +40,14 @@
 ACE_RCSID(asnmp, oid, "$Id$")
 
 enum Defs {SNMPBUFFSIZE=300,
-           SNMPCHARSIZE=15};          // max oid value (4294967295UL)
+	   SNMPCHARSIZE=15};          // max oid value (4294967295UL) 
 
 #define NO_MEM_STR "ERROR: Oid::to_string: memory allocation failure"
 
 //=============[Oid::get_syntax(void)]====================================
 SmiUINT32 Oid::get_syntax()
-{
-  return sNMP_SYNTAX_OID;
+{ 
+  return sNMP_SYNTAX_OID; 
 }
 
 
@@ -55,7 +55,7 @@ SmiUINT32 Oid::get_syntax()
 // constructor using a dotted string
 //
 // do a string to oid using the string passed in
-Oid::Oid( const char * dotted_oid_string, size_t size)
+Oid::Oid( const char * dotted_oid_string, size_t size) 
 {
   // can't init enum SmiValue so just memset it clean
   set_null();
@@ -73,11 +73,11 @@ Oid::Oid( const char * dotted_oid_string, size_t size)
 
   char *ptr = (char *)dotted_oid_string;;
   if (size < z) {
-    // create new buffer if needed
+    // create new buffer if needed 
     ACE_NEW(ptr, char [size]);
 
     // sz should be in StrToOid?
-    ACE_OS::memcpy( (void *)ptr, dotted_oid_string, size);
+    ACE_OS::memcpy( (void *)ptr, dotted_oid_string, size); 
   }
 
   size_t byte_counter;
@@ -95,15 +95,15 @@ Oid::Oid( const char * dotted_oid_string, size_t size)
 Oid::Oid ( const Oid &oid)
 {
   set_null();
-
+  
   // allocate some memory for the oid
   // in this case the size to allocate is the same
   // size as the source oid
   if (oid.smival.value.oid.len) {
     ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid.smival.value.oid.len]);
     size_t byte_counter;
-    OidCopy( (SmiLPOID) &(oid.smival.value.oid),(SmiLPOID)
-              &smival.value.oid, byte_counter);
+    OidCopy( (SmiLPOID) &(oid.smival.value.oid),(SmiLPOID) 
+	      &smival.value.oid, byte_counter);
   }
 }
 
@@ -118,7 +118,7 @@ Oid::Oid(const unsigned long *raw_oid, size_t oid_len)
 
   smival.syntax = sNMP_SYNTAX_OID;
   set_invalid();
-
+  
   if (raw_oid && oid_len > 0) {
     ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid_len]);
     smival.value.oid.len = oid_len;
@@ -179,20 +179,20 @@ Oid& Oid::operator=( const Oid &oid)
   set_invalid();
 
   // check for zero len on source
-  if ( oid.smival.value.oid.len == 0)
+  if ( oid.smival.value.oid.len == 0) 
      return *this;
 
-  init_value((const SmiLPOID) &(oid.smival.value.oid),
+  init_value((const SmiLPOID) &(oid.smival.value.oid), 
                  oid.smival.value.oid.len);
   return *this;
 }
 
-// assign this object the oid, set to invalid if copy fails
-void Oid::init_value(const SmiLPOID srcOid, size_t len)
+// assign this object the oid, set to invalid if copy fails 
+void Oid::init_value(const SmiLPOID srcOid, size_t len) 
 {
   // allocate some memory for the oid
   ACE_NEW(smival.value.oid.ptr, SmiUINT32[ len]);
-  size_t byte_counter;
+  size_t byte_counter; 
   OidCopy( srcOid, (SmiLPOID) &smival.value.oid, byte_counter);
 }
 
@@ -203,8 +203,8 @@ void Oid::init_value(const unsigned long *raw_oid, size_t oid_len)
 
   ACE_NEW(smival.value.oid.ptr, SmiUINT32[ oid_len]);
   ACE_OS::memcpy((SmiLPBYTE) smival.value.oid.ptr,
-                 (SmiLPBYTE) raw_oid,
-                 (size_t) (oid_len * sizeof(SmiUINT32)));
+		 (SmiLPBYTE) raw_oid,
+		 (size_t) (oid_len * sizeof(SmiUINT32)));
   smival.value.oid.len = oid_len;
 }
 
@@ -229,14 +229,14 @@ Oid& Oid::operator+=( const char *a)
   size_t sz = ACE_OS::strlen(a);
 
   if (valid()) {
-    n = (smival.value.oid.len *SNMPCHARSIZE) + smival.value.oid.len + 1 + sz;
+    n = (smival.value.oid.len *SNMPCHARSIZE) + smival.value.oid.len + 1 + sz; 
     char *ptr;
     ACE_NEW_RETURN(ptr, char[ n], *this);
     size_t byte_counter;
     if (OidToStr(&smival.value.oid, n,ptr, byte_counter) > 0) {
-        delete [] ptr;
-        set_invalid();
-        return *this;
+	delete [] ptr;
+	set_invalid();
+	return *this;
       }
 
    if (ACE_OS::strlen(ptr))
@@ -259,83 +259,83 @@ Oid& Oid::operator+=( const char *a)
       set_invalid();
     }
   }
-
+  
   return *this;
 }
 
 //=============[ int operator == oid,oid ]=================================
 // equivlence operator overloaded
 int operator==( const Oid &lhs, const Oid &rhs)
-{
+{   
   // ensure same len, then use left_comparison
-  if (rhs.length() != lhs.length())
+  if (rhs.length() != lhs.length()) 
     return 0;
-  if( lhs.left_comparison( rhs.length(), rhs) == 0)
-    return 1;
-  else
+  if( lhs.left_comparison( rhs.length(), rhs) == 0) 
+    return 1; 
+  else 
     return 0;
-}
+}      
 
-//==============[ operator!=( Oid &x,Oid &y) ]=============================
+//==============[ operator!=( Oid &x,Oid &y) ]============================= 
 //not equivlence operator overloaded
 int operator!=( const Oid &lhs,const Oid &rhs)
-{
+{   
   return (!(lhs == rhs));
-}
+}  
 
-//==============[ operator<( Oid &x,Oid &y) ]=============================
+//==============[ operator<( Oid &x,Oid &y) ]=============================  
 // less than < overloaded
 int operator<( const Oid &lhs,const Oid &rhs)
-{
+{   
   int result;
 
   // call left_comparison with the current
   // Oidx, Oidy and len of Oidx
-  if ((result = lhs.left_comparison( rhs.length(), rhs)) < 0)
-    return 1;
-  else if (result > 0)
+  if ((result = lhs.left_comparison( rhs.length(), rhs)) < 0) 
+    return 1; 
+  else if (result > 0) 
     return 0;
 
   else{
     // if here, equivalent substrings, call the shorter one <
-    if (lhs.length() < rhs.length())
+    if (lhs.length() < rhs.length()) 
       return 1;
-    else
+    else 
       return 0;
   }
-}
+} 
 
-//==============[ operator<=( Oid &x,Oid &y) ]=============================
+//==============[ operator<=( Oid &x,Oid &y) ]=============================  
 // less than <= overloaded
 int operator<=( const Oid &x,const Oid &y)
-{
-  if ( (x < y) || (x == y) )
+{   
+  if ( (x < y) || (x == y) ) 
     return 1;
-  else
+  else 
     return 0;
-}
+}    
 
-//==============[ operator>( Oid &x,Oid &y) ]=============================
+//==============[ operator>( Oid &x,Oid &y) ]=============================     
 // greater than > overloaded
 int operator>( const Oid &x,const Oid &y)
-{
+{   
   // just invert existing <=
-  if (!(x<=y))
+  if (!(x<=y)) 
     return 1;
-  else
+  else 
     return 0;
-}
+} 
 
-//==============[ operator>=( Oid &x,Oid &y) ]=============================
+//==============[ operator>=( Oid &x,Oid &y) ]=============================  
 // greater than >= overloaded
 int operator>=( const Oid &x,const Oid &y)
-{
+{   
   // just invert existing <
-  if (!(x<y))
+  if (!(x<y)) 
     return 1;
-  else
+  else  
     return 0;
-}
+}          
 
 //===============[Oid::oidval ]=============================================
 // return the WinSnmp oid part
@@ -384,16 +384,16 @@ void Oid::trim( const size_t n)
 // make this object invalid by resetting all values
 void Oid::set_invalid() {
   delete [] smival.value.oid.ptr;
-  smival.value.oid.ptr = 0;
+  smival.value.oid.ptr = NULL;
   smival.value.oid.len = 0;
-  delete [] iv_str;
+  delete [] iv_str; 
   iv_str = 0;
 }
 
 //===============[Oid::set_null() ]====================
 void Oid::set_null() {
   smival.syntax = sNMP_SYNTAX_OID;
-  smival.value.oid.ptr = 0;
+  smival.value.oid.ptr = NULL;
   smival.value.oid.len = 0;
   iv_str = 0;
 }
@@ -409,8 +409,8 @@ void Oid::set_null() {
 // delete allocated space
 Oid& Oid::operator+=( const unsigned long i)
 {
-  unsigned long n = (smival.value.oid.len * SNMPCHARSIZE)
-    + ( smival.value.oid.len -1) + 1 + 4;
+  unsigned long n = (smival.value.oid.len * SNMPCHARSIZE) 
+    + ( smival.value.oid.len -1) + 1 + 4;  
   char buffer[SNMPBUFFSIZE];
 
   // two cases: null oid, existing oid
@@ -422,9 +422,9 @@ Oid& Oid::operator+=( const unsigned long i)
     if (OidToStr(&smival.value.oid, n, ptr, byte_counter) < 0)  {
        set_invalid();
        delete [] ptr;
-       return *this;
+       return *this; 
     }
-
+	
     if (ACE_OS::strlen(ptr))
        ACE_OS::strcat(ptr,".");
 
@@ -440,9 +440,9 @@ Oid& Oid::operator+=( const unsigned long i)
     }
   }
   else {
-    init_value((const unsigned long *)&i, (size_t)1);
+    init_value((const unsigned long *)&i, (size_t)1); 
   }
-
+  
   return *this;
 }
 
@@ -462,12 +462,12 @@ Oid& Oid::operator+=( const Oid &o)
   if (o.smival.value.oid.len == 0)
     return *this;
 
-  ACE_NEW_RETURN(new_oid,
+  ACE_NEW_RETURN(new_oid, 
         SmiUINT32[ smival.value.oid.len + o.smival.value.oid.len], *this);
   if (smival.value.oid.ptr) {
     ACE_OS::memcpy((SmiLPBYTE) new_oid,
-                   (SmiLPBYTE) smival.value.oid.ptr,
-                   (size_t) (smival.value.oid.len*sizeof(SmiUINT32)));
+		   (SmiLPBYTE) smival.value.oid.ptr,
+		   (size_t) (smival.value.oid.len*sizeof(SmiUINT32)));
 
     delete [] smival.value.oid.ptr;
   }
@@ -476,8 +476,8 @@ Oid& Oid::operator+=( const Oid &o)
   smival.value.oid.ptr = new_oid;
 
   ACE_OS::memcpy((SmiLPBYTE) &new_oid[smival.value.oid.len],
-                 (SmiLPBYTE) o.smival.value.oid.ptr,
-                 (size_t) (o.smival.value.oid.len*sizeof(SmiUINT32)));
+		 (SmiLPBYTE) o.smival.value.oid.ptr,
+		 (size_t) (o.smival.value.oid.len*sizeof(SmiUINT32)));
 
   smival.value.oid.len += o.smival.value.oid.len;
   return *this;
@@ -494,11 +494,11 @@ char * Oid::to_string()
   // the worst case char len of an oid can be..
   // oid.len*3 + dots in between if each oid is XXXX
   // so.. size = (len*4) + (len-1) + 1 , extra for a null
-
+  
   n = (smival.value.oid.len *SNMPCHARSIZE) + ( smival.value.oid.len -1) + 1 ;
-  if (n == 0)
+  if (n == 0) 
     n = 1; // need at least 1 byte for a null string
-
+  
   // adjust the len of output array in case size was adjusted
   if ( iv_str != 0)
     delete [] iv_str;
@@ -509,7 +509,7 @@ char * Oid::to_string()
   size_t how_many;
   if ( valid() && iv_str != 0)
     if (OidToStr(&smival.value.oid,n,iv_str, how_many) < 0)
-      return "ERROR: Oid::OidToStr failed";
+      return "ERROR: Oid::OidToStr failed";   
   return iv_str;
 }
 
@@ -529,16 +529,16 @@ int Oid::suboid(Oid& new_oid, size_t start, size_t how_many)
   new_oid.set_invalid();
 
   size_t new_size = how_many - start;
-  if (new_size == 0)
+  if (new_size == 0) 
      new_size++;
-  new_oid.smival.value.oid.len = new_size;
+  new_oid.smival.value.oid.len = new_size; 
   ACE_NEW_RETURN(new_oid.smival.value.oid.ptr,
         SmiUINT32 [ new_oid.smival.value.oid.len], -1);
   // copy source to destination
   ACE_OS::memcpy( (SmiLPBYTE) new_oid.smival.value.oid.ptr,
                     (SmiLPBYTE) (smival.value.oid.ptr + start),
-                    new_size * sizeof(SmiLPBYTE));
-  return 0;
+                    new_size * sizeof(SmiLPBYTE)); 
+  return 0; 
 }
 
 
@@ -558,7 +558,7 @@ int Oid::StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many)
     }
   else {
      dstOid->len = 0;
-     dstOid->ptr = 0;
+     dstOid->ptr = NULL;
      return -1;
   }
 
@@ -567,7 +567,7 @@ int Oid::StrToOid( const char *string, SmiLPOID dstOid, size_t& how_many)
     // init the number for each token
     number = 0;
     // skip over the dot
-    if (*string=='.')
+    if (*string=='.') 
         string++;
 
             // grab a digit token and convert it to a long int
@@ -616,8 +616,8 @@ int Oid::OidCopy( SmiLPOID srcOid, SmiLPOID dstOid, size_t& how_many_bytes)
 
   // copy source to destination
   ACE_OS::memcpy((SmiLPBYTE) dstOid->ptr,
-                 (SmiLPBYTE) srcOid->ptr,
-                 (size_t) (srcOid->len * sizeof(SmiUINT32)));
+		 (SmiLPBYTE) srcOid->ptr,
+		 (size_t) (srcOid->len * sizeof(SmiUINT32)));
 
   //set the new len
   dstOid->len = srcOid->len;
@@ -629,22 +629,22 @@ int Oid::OidCopy( SmiLPOID srcOid, SmiLPOID dstOid, size_t& how_many_bytes)
 
 //===============[Oid::left_comparison( n, Oid) ]=================================
 // compare the n leftmost values of two oids ( left-to_right )
-//
+// 
 // self == Oid then return 0, they are equal
 // self < Oid then return -1, <
 // self > Oid then return 1,  >
 int Oid::left_comparison( const unsigned long n, const Oid &o) const
-{
+{             
   unsigned long z;
   unsigned long len = n;
   int reduced_len = 0;
-
+  
   // 1st case they both are null
-  if (( len==0)&&( this->smival.value.oid.len==0))
+  if (( len==0)&&( this->smival.value.oid.len==0)) 
     return 0;  // equal
-
+  
   // verify that n is valid, must be >= 0
-  if ( len <=0)
+  if ( len <=0) 
     return 1;                         // ! equal
 
   // only compare for the minimal length
@@ -656,16 +656,16 @@ int Oid::left_comparison( const unsigned long n, const Oid &o) const
     len = o.smival.value.oid.len;
     reduced_len = 1;
   }
-
+  
   z = 0;
   while(z < len) {
     if ( this->smival.value.oid.ptr[z] < o.smival.value.oid.ptr[z])
       return -1;                              // less than
     if ( this->smival.value.oid.ptr[z] > o.smival.value.oid.ptr[z])
       return 1;                               // greater than
-    z++;
-  }
-
+    z++;    
+  }      
+  
   // if we truncated the len then these may not be equal
   if (reduced_len) {
     if (this->smival.value.oid.len < o.smival.value.oid.len)
@@ -674,7 +674,7 @@ int Oid::left_comparison( const unsigned long n, const Oid &o) const
       return 1;
   }
   return 0;                                 // equal
-
+  
 }
 
 
@@ -686,7 +686,7 @@ int Oid::left_comparison( const unsigned long n, const Oid &o) const
 int Oid::right_comparison( const unsigned long n, const Oid &o) const
 {
    // oid to compare must have at least the same number
-   // of sub-ids to comparison else the argument Oid is
+   // of sub-ids to comparison else the argument Oid is 
    // less than THIS
    if ( o.length() < n)
       return -1;
@@ -708,7 +708,7 @@ int Oid::right_comparison( const unsigned long n, const Oid &o) const
 
    return 0;   // they are equal
 
-}
+} 
 
 
 //================[ Oid::valid() ]========================================
@@ -716,13 +716,13 @@ int Oid::right_comparison( const unsigned long n, const Oid &o) const
 // returns validity
 int Oid::valid() const
 {
-   return ( smival.value.oid.ptr ? 1 : 0 );
+   return ( smival.value.oid.ptr ? TRUE : FALSE );
 }
 
 //================[Oid::OidToStr ]=========================================
 // convert an oid to a string
 int Oid::OidToStr( SmiLPOID srcOid, unsigned long size,
-                  char *string, size_t& how_many_bytes)
+		  char *string, size_t& how_many_bytes)
 {
   unsigned long index = 0;
   unsigned totLen = 0;
@@ -739,7 +739,7 @@ int Oid::OidToStr( SmiLPOID srcOid, unsigned long size,
   for (index=0; index < srcOid->len; index++) {
 
     // convert data element to a string
-    if (ACE_OS::sprintf( szNumber,"%u", srcOid->ptr[index]) == -1)
+    if (ACE_OS::sprintf( szNumber,"%u", srcOid->ptr[index]) == -1) 
       return -1;
 
     // verify len is not over
@@ -758,7 +758,7 @@ int Oid::OidToStr( SmiLPOID srcOid, unsigned long size,
   }
 
   how_many_bytes = totLen + 1;
-  return 0;
+  return 0; 
 }
 
 
@@ -779,8 +779,8 @@ SnmpSyntax& Oid::operator=( SnmpSyntax &val)
   if (val.valid()) {
     switch (val.get_syntax()) {
     case sNMP_SYNTAX_OID:
-      set_data( ((Oid &)val).smival.value.oid.ptr,
-               (unsigned int)((Oid &)val).smival.value.oid.len);
+      set_data( ((Oid &)val).smival.value.oid.ptr, 
+	       (unsigned int)((Oid &)val).smival.value.oid.len);
       break;
     }
   }
@@ -795,6 +795,7 @@ unsigned long& Oid::operator[](size_t position)
 
 //================[ clone ]===========================================
 SnmpSyntax *Oid::clone() const
-{
-  return (SnmpSyntax *) new Oid(*this);
+{ 
+  return (SnmpSyntax *) new Oid(*this); 
 }
+
diff --git a/ASNMP/asnmp/pdu.cpp b/ASNMP/asnmp/pdu.cpp
index 6ac3acc04d5..a15ede7886e 100644
--- a/ASNMP/asnmp/pdu.cpp
+++ b/ASNMP/asnmp/pdu.cpp
@@ -21,15 +21,15 @@
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
 #include "asnmp/snmp.h"
@@ -38,47 +38,47 @@
 ACE_RCSID(asnmp, pdu, "$Id$")
 
 //=====================[ constructor no args ]=========================
-Pdu::Pdu( void): vb_count_(0), error_status_(0), error_index_(0),
-validity_(0), request_id_(0), pdu_type_(0), notify_timestamp_(0),
+Pdu::Pdu( void): vb_count_(0), error_status_(0), error_index_(0), 
+validity_(FALSE), request_id_(0), pdu_type_(0), notify_timestamp_(0), 
 output_(0)
 {
 }
 
 //=====================[ constructor with vbs_ and count ]==============
-Pdu::Pdu( Vb* pvbs, const int pvb_count): vb_count_(0), error_index_(0),
-validity_(0), request_id_(0), pdu_type_(0), notify_timestamp_(0),
+Pdu::Pdu( Vb* pvbs, const int pvb_count): vb_count_(0), error_index_(0), 
+validity_(FALSE), request_id_(0), pdu_type_(0), notify_timestamp_(0), 
 output_(0)
 {
    int z;  // looping variable
 
    // zero is ok
    if ( pvb_count == 0) {
-      validity_ = 1;
+      validity_ = TRUE;
       return;
    }
 
    // check for over then max
    if ( pvb_count > MAX_VBS) {
-       validity_ = 0;
+       validity_ = FALSE;
        return;
    }
 
    // loop through and assign internal vbs_
    for (z = 0;z < pvb_count; z++) {
-     validity_ = 0;
+     validity_ = FALSE;
      ACE_NEW(vbs_[z], Vb( pvbs[z]));
-     validity_ = 1;
+     validity_ = TRUE;
    }
 
    // assign the vb count
    vb_count_ = pvb_count;
 
-   validity_ = 1;
+   validity_ = TRUE;
 }
 
 //=====================[ constructor with another Pdu instance ]========
-Pdu::Pdu( const Pdu &pdu): vb_count_(0),
-error_index_(0), validity_(0), request_id_(0), pdu_type_(0),
+Pdu::Pdu( const Pdu &pdu): vb_count_(0), 
+error_index_(0), validity_(FALSE), request_id_(0), pdu_type_(0),
 notify_timestamp_(0), output_(0)
 {
    *this = pdu;
@@ -91,7 +91,7 @@ Pdu::~Pdu()
   delete_all_vbs();
   delete [] output_;
 }
-
+ 
 
 //=====================[ assignment to another Pdu object overloaded ]===
 Pdu& Pdu::operator=( const Pdu &pdu)
@@ -106,7 +106,7 @@ Pdu& Pdu::operator=( const Pdu &pdu)
    notify_id_ = pdu.notify_id_;
    notify_timestamp_ = pdu.notify_timestamp_;
    notify_enterprise_ = pdu.notify_enterprise_;
-   validity_ = 1;
+   validity_ = TRUE;
 
    // free up old vbs_
    for ( z = 0;z < vb_count_; z++)
@@ -120,9 +120,9 @@ Pdu& Pdu::operator=( const Pdu &pdu)
 
    // loop through and fill em up
    for (z = 0; z < pdu.vb_count_; z++) {
-     validity_ = 0;
+     validity_ = FALSE;
      ACE_NEW_RETURN(vbs_[z], Vb ( *(pdu.vbs_[z])), *this);
-     validity_ = 1;
+     validity_ = TRUE;
    }
 
    vb_count_ = pdu.vb_count_;
@@ -135,13 +135,13 @@ Pdu& Pdu::operator+=( Vb &vb)
 
   // do we have room?
   if ( vb_count_ + 1 > MAX_VBS)
-    return *this;
+    return *this;      
 
   // add the new one
-  validity_ = 0;
+  validity_ = FALSE;
   ACE_NEW_RETURN(vbs_[vb_count_], Vb (vb), *this);
   // set up validity_
-  validity_ = 1;
+  validity_ = TRUE;
 
   // up the vb count
   vb_count_++;
@@ -159,7 +159,7 @@ char * Pdu::to_string()
   unsigned size = HEADER_STR; // header takes up this much room
   int z;
 
-   for ( z = 0; z < vb_count_; z++)
+   for ( z = 0; z < vb_count_; z++) 
        size += ACE_OS::strlen(vbs_[z]->to_string());
 
   ACE_NEW_RETURN(output_, char[size], "");
@@ -177,7 +177,7 @@ char * Pdu::to_string()
 
   return output_;
 }
-
+ 
 
 //=====================[ extract Vbs from Pdu ]==========================
 // how do you know that the caler has enough memory???
@@ -186,14 +186,14 @@ char * Pdu::to_string()
 int Pdu::get_vblist( Vb* pvbs, const int pvb_count)
 {
    if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > vb_count_))
-      return 0;
+      return FALSE;
 
    // loop through all vbs_ and assign to params
    int z;
    for (z = 0; z < pvb_count; z++)
       pvbs[z] = *vbs_[z];
 
-   return 1;
+   return TRUE;
 
 }
 
@@ -203,7 +203,7 @@ int Pdu::set_vblist( Vb* pvbs, const int pvb_count)
 
    // if invalid then don't destroy
    if ((!pvbs) || ( pvb_count < 0) || ( pvb_count > MAX_VBS))
-     return 0;
+     return FALSE;
 
    // free up current vbs_
    int z;
@@ -212,31 +212,31 @@ int Pdu::set_vblist( Vb* pvbs, const int pvb_count)
    vb_count_ = 0;
 
    // check for zero case
-   if ( pvb_count == 0) {
-      validity_ = 1;
+   if ( pvb_count == 0) {  
+      validity_ = TRUE;
       error_status_ = 0;
       error_index_ = 0;
       request_id_ = 0;
-      return 0;
+      return FALSE;
    }
-
+     
 
    // loop through all vbs_ and reassign them
    for ( z = 0; z < pvb_count; z++) {
-     validity_ = 0;
-     ACE_NEW_RETURN(vbs_[z], Vb (pvbs[z]), 0);
-     validity_ = 1;
+     validity_ = FALSE;
+     ACE_NEW_RETURN(vbs_[z], Vb (pvbs[z]), FALSE);
+     validity_ = TRUE;
    }
-
+   
    vb_count_ = pvb_count;
 
    // clear error status and index since no longer valid
    // request id may still apply so don't reassign it
    error_status_ = 0;
    error_index_ = 0;
-   validity_ = 1;
+   validity_ = TRUE;
 
-   return 1;
+   return TRUE;
 }
 
 //===================[ get a particular vb ]=============================
@@ -245,17 +245,17 @@ int Pdu::set_vblist( Vb* pvbs, const int pvb_count)
 int Pdu::get_vb( Vb &vb, const int index) const
 {
    // can't have an index less than 0
-   if ( index < 0)
-     return 0;
+   if ( index < 0) 
+     return FALSE;
 
    // can't ask for something not there
    if ( index > (vb_count_ - 1))
-      return 0;
+      return FALSE;
 
    // asssign it
    vb = *vbs_[index];
 
-   return 1;
+   return TRUE;
 }
 
 //===================[ set a particular vb ]=============================
@@ -263,21 +263,21 @@ int Pdu::set_vb( Vb &vb, const int index)
 {
    // can't set a vb at index less than 0
    if ( index < 0)
-     return 0;
+     return FALSE;
 
    // can't ask for something not there
    if ( index > (vb_count_ - 1))
-      return 0;
+      return FALSE;
 
    // delete what is there
    delete vbs_[index];
 
    // assign it
-   validity_ = 0;
-   ACE_NEW_RETURN(vbs_[index], Vb (vb), 0);
-   validity_ = 1;
+   validity_ = FALSE;
+   ACE_NEW_RETURN(vbs_[index], Vb (vb), FALSE);
+   validity_ = TRUE;
 
-   return 1;
+   return TRUE;
 
 }
 
@@ -298,7 +298,7 @@ char *Pdu::agent_error_reason()
     int pdu_err = get_error_status();
     if (pdu_err == 0) // any real error?
         return "not in error state";
-
+    
     int n_vbs = get_vb_count();
     Vb bad;
     get_vb(bad, get_error_index() -1); // not zero based??
@@ -308,15 +308,15 @@ char *Pdu::agent_error_reason()
     const int HDR_SZ = 100;
 
     if (!output_) {
-      int size = ACE_OS::strlen(pmsg) + ACE_OS::strlen(id) +
+      int size = ACE_OS::strlen(pmsg) + ACE_OS::strlen(id) + 
            ACE_OS::strlen(val);
       ACE_NEW_RETURN(output_, char[size + HDR_SZ], "");
     }
 
-    ACE_OS::sprintf(output_,
+    ACE_OS::sprintf(output_, 
 "FAIL PDU REPORT: pdu id: %d vb cnt: %d vb idx: %d \n\
 msg: %s vb oid: %s value: %s",
-      get_request_id(), n_vbs, get_error_index(),  pmsg, id, val);
+      get_request_id(), n_vbs, get_error_index(),  pmsg, id, val); 
 
     return output_;
 }
@@ -372,7 +372,7 @@ void set_request_id( Pdu *pdu, const unsigned long rid)
 }
 
 //=====================[ returns validity_ of Pdu instance ]===============
-int Pdu::valid() const
+int Pdu::valid() const 
 {
    return validity_;
 }
@@ -397,7 +397,7 @@ int Pdu::trim(const int p)
 
    // verify that lp is legal
    if ( lp < 0 || lp > vb_count_)
-     return 0;
+     return FALSE;
 
    while ( lp != 0)   {
      if ( vb_count_ > 0) {
@@ -406,7 +406,7 @@ int Pdu::trim(const int p)
      }
      lp--;
    }
-   return 1;
+   return TRUE;
 }
 
 
@@ -416,17 +416,17 @@ int Pdu::delete_vb( const int p)
 {
    // position has to be in range
    if (( p < 0) || ( p > (vb_count_ - 1)))
-      return 0;
+      return FALSE;
 
    // safe to remove it
    delete vbs_[ p];
 
    for ( int z=p;z < (vb_count_-1);z++) {
       vbs_[z] = vbs_[z+1];
-   }
+   }  
    vb_count_--;
 
-   return 1;
+   return TRUE;
 }
 
 void Pdu::delete_all_vbs()
diff --git a/ASNMP/asnmp/sagent.cpp b/ASNMP/asnmp/sagent.cpp
index fc56a2c728f..489975afbc1 100644
--- a/ASNMP/asnmp/sagent.cpp
+++ b/ASNMP/asnmp/sagent.cpp
@@ -10,11 +10,11 @@
 //
 // = DESCRIPTION
 //   SNMP agent class definition. The sagent class provides an object oriented
-//   approach for creating SNMP Agents. The sagent class is an encapsulation
-//   of SNMP sessions, gets, sets, etc.
+//   approach for creating SNMP Agents. The sagent class is an encapsulation 
+//   of SNMP sessions, gets, sets, etc. 
 //
 // = AUTHOR
-//    Michael R. MacFaden
+//    Michael R. MacFaden 
 //
 // ============================================================================
 #include "ace/Reactor.h"
@@ -24,11 +24,11 @@
 #include "asnmp/vb.h"                 // snbmp++ vb class
 #include "asnmp/target.h"             // snmp++ target class
 #include "asnmp/pdu.h"                // snmp++ pdu class
-#include "asnmp/snmperrs.h"           // error macros and strings
+#include "asnmp/snmperrs.h"           // error macros and strings 
 #include "asnmp/address.h"            // snmp++ address class defs
-#include "asnmp/snmp.h"               // manager snmp interface
+#include "asnmp/snmp.h"               // manager snmp interface 
 #include "asnmp/sagent.h"             // agent interface
-#include "asnmp/transaction.h"        // convert from wire to API
+#include "asnmp/transaction.h"	      // convert from wire to API
 
 ACE_RCSID(asnmp, sagent, "$Id$")
 
@@ -95,3 +95,4 @@ int sagent::respond(Pdu& pdu,UdpTarget& tgt)
   tr.send();
   return 0;
 }
+
diff --git a/ASNMP/asnmp/snmp.cpp b/ASNMP/asnmp/snmp.cpp
index f14d07bcccb..c3184cb3aef 100644
--- a/ASNMP/asnmp/snmp.cpp
+++ b/ASNMP/asnmp/snmp.cpp
@@ -19,7 +19,7 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+ 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
   Permission to use, copy, modify, distribute and/or sell this software
   and/or its documentation is hereby granted without fee. User agrees
@@ -39,7 +39,7 @@
 #include "asnmp/snmp.h"    // class def for this module
 #include "asnmp/oid.h"     // class def for oids
 #include "asnmp/enttraps.h" // class def for well known trap oids
-#include "asnmp/vb.h"        // class def for vbs
+#include "asnmp/vb.h"	     // class def for vbs
 #include "asnmp/address.h" // class def for addresses
 #include "asnmp/wpdu.h"    // adapter to cmu_library / wire protocol
 #include "asnmp/transaction.h" // synchronous transaction processor
@@ -60,13 +60,13 @@ Snmp::Snmp(unsigned short port): result_(0), construct_status_(SNMP_CLASS_ERROR)
 
   ACE_INET_Addr addr(port); // any port,address is ok
   if (iv_snmp_session_.open(addr) < 0) {
-     last_transaction_status_ = errno; // open udp/ipv4 socket
+     last_transaction_status_ = errno; // open udp/ipv4 socket 
      ACE_DEBUG((LM_DEBUG, "Snmp::snmp::open port %d failed", port));
      return;
-  }
+  } 
 
-  // initial request id randomly generated then monotonically incremented
-  req_id_ = (unsigned) ACE_OS::time(0);
+  // initial request id randomly generated then monotonically incremented 
+  req_id_ = (unsigned) ACE_OS::time(NULL);  
 
   construct_status_ = SNMP_CLASS_SUCCESS;
   return;
@@ -86,15 +86,15 @@ int Snmp::valid() const
 // given error code, return string definition
 // class version
 // static
-char * Snmp::error_string(int last_transaction_status_)
+char * Snmp::error_string(int last_transaction_status_) 
 {
   ACE_TRACE("Snmp::error_string");
 
   return ((last_transaction_status_ < 0) ?
-           ((last_transaction_status_ < MAX_NEG_ERROR)?
-        nErrs[ abs(MAX_NEG_ERROR) + 1] : nErrs[abs(last_transaction_status_)]):
-            ((last_transaction_status_ > MAX_POS_ERROR)?
-        pErrs[MAX_POS_ERROR+1] : pErrs[last_transaction_status_]));
+           ((last_transaction_status_ < MAX_NEG_ERROR)? 
+	nErrs[ abs(MAX_NEG_ERROR) + 1] : nErrs[abs(last_transaction_status_)]):
+            ((last_transaction_status_ > MAX_POS_ERROR)? 
+	pErrs[MAX_POS_ERROR+1] : pErrs[last_transaction_status_]));
 }
 
 // instance version
@@ -109,8 +109,8 @@ void Snmp::check_default_port(UdpTarget& target, unsigned short port)
   target.get_address(tmp);
   if (tmp.get_port() == 0) {
     tmp.set_port(port);
-    target.set_address(tmp);
-  }
+    target.set_address(tmp); 
+  } 
 }
 
 int Snmp::run_transaction(Pdu& pdu, UdpTarget& target)
@@ -119,7 +119,7 @@ int Snmp::run_transaction(Pdu& pdu, UdpTarget& target)
 
   // 1. set unique id to match this packet on return
   size_t hold_req_id = req_id_++;
-  set_request_id(&pdu, hold_req_id);
+  set_request_id(&pdu, hold_req_id); 
 
   // 2. write request to agent
   transaction trans(pdu, target, iv_snmp_session_);
@@ -127,16 +127,16 @@ int Snmp::run_transaction(Pdu& pdu, UdpTarget& target)
   // this call blocks while it attempts to retrieve agent response
   while (!done) {
     if ((rc = trans.run()) < 0) {
-       last_transaction_status_ = rc;
+       last_transaction_status_ = rc;     
        return rc;
     }
     else {
-      trans.result(pdu);
+      trans.result(pdu);        
       // verify this is the pdu we are after
       if (pdu.get_request_id() == hold_req_id)
         done = 1 ;
     }
-  }
+  } 
   return 0;
 }
 
@@ -147,7 +147,7 @@ int Snmp::run_transaction(Pdu& pdu, UdpTarget& target, Snmp_Result * cb)
 
   // 1. set unique id to match this packet on return
   hold_req_id_ = req_id_++;
-  set_request_id(&pdu, hold_req_id_);
+  set_request_id(&pdu, hold_req_id_); 
   pdu_ = &pdu;
   result_ = cb;
 
@@ -158,39 +158,39 @@ int Snmp::run_transaction(Pdu& pdu, UdpTarget& target, Snmp_Result * cb)
 
 void Snmp::result(transaction *t, int rc)
 {
-    t->result(*pdu_);
+    t->result(*pdu_);        
     // verify this is the pdu we are after
     if (pdu_->get_request_id() == hold_req_id_)
     {
-        last_transaction_status_ = rc;
-        delete t;
-        result_->result(this, rc);
+	last_transaction_status_ = rc;
+	delete t;
+	result_->result(this, rc);
     }
     else
     {
-        rc = t->run(this);
-        if (rc < 0)
-        {
-            delete t;
-            result_->result(this, rc);
-        }
+	rc = t->run(this);
+	if (rc < 0)
+	{
+	    delete t;
+	    result_->result(this, rc);
+	}
     }
 }
 
 int Snmp::validate_args(const Pdu& pdu, const UdpTarget& target) const
 {
-  // 0. check object status
+  // 0. check object status 
   if (construct_status_ != SNMP_CLASS_SUCCESS)
      return construct_status_;
 
-  // 1. check args passed
+  // 1. check args passed 
   if ( !pdu.valid() || !target.valid() )
      return SNMP_INVALID_ARGS;
   return 0;
 }
 
 // SYNC API: write request to wire then wait for reply or timeout
-int Snmp::get( Pdu &pdu, UdpTarget &target, Snmp_Result * cb)
+int Snmp::get( Pdu &pdu, UdpTarget &target, Snmp_Result * cb)  
 {
    ACE_TRACE("Snmp::get");
   int rc;
@@ -235,7 +235,7 @@ int Snmp::trap( Pdu &pdu, UdpTarget &target)
      return rc;
 
   pdu.set_type( sNMP_PDU_V1TRAP);
-  check_default_port(target, DEF_TRAP_PORT);
+  check_default_port(target, DEF_TRAP_PORT); 
 
   // 2. write request to agent
   transaction trans(pdu, target, iv_snmp_session_);
@@ -247,3 +247,4 @@ int Snmp::trap( Pdu &pdu, UdpTarget &target)
 }
 
 Snmp_Result::~Snmp_Result() {}
+
diff --git a/ASNMP/asnmp/target.cpp b/ASNMP/asnmp/target.cpp
index c9e27865f31..1eac9d641e5 100644
--- a/ASNMP/asnmp/target.cpp
+++ b/ASNMP/asnmp/target.cpp
@@ -9,7 +9,7 @@
 //     target.cpp
 //
 // = DESCRIPTION
-// Target class defines target SNMP agents.
+// Target class defines target SNMP agents. 
 //
 // = AUTHOR
 //   Peter E Mellquist
@@ -18,17 +18,17 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+  
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
   =====================================================================*/
 
 #include "asnmp/target.h"
@@ -38,10 +38,10 @@ ACE_RCSID(asnmp, target, "$Id$")
 //----------------------------------------------------------------------
 //--------[ Class default values ]----------------------
 //----------------------------------------------------------------------
-u_long SnmpTarget::default_timeout_ = DEF_TIMEOUT;
-int SnmpTarget::default_retries_ = DEF_RETRIES;
+u_long SnmpTarget::default_timeout_ = DEF_TIMEOUT; 
+int SnmpTarget::default_retries_ = DEF_RETRIES; 
 u_long SnmpTarget::default_max_pdu_size_ = DEF_MAX_SNMP_PACKET;
-snmp_version SnmpTarget::default_version_ = version1;
+snmp_version SnmpTarget::default_version_ = version1; 
 
 OctetStr UdpTarget::default_rd_community_(READ_COMM_STR);
 OctetStr UdpTarget::default_wr_community_(WRITE_COMM_STR);
@@ -49,45 +49,45 @@ OctetStr UdpTarget::default_wr_community_(WRITE_COMM_STR);
 //----------------------------------------------------------------------
 //--------[ Abstract SnmpTarget Member Functions ]----------------------
 //----------------------------------------------------------------------
-SnmpTarget::SnmpTarget():
-  validity_(0), timeout_(default_timeout_), retries_(default_retries_),
+SnmpTarget::SnmpTarget(): 
+  validity_(FALSE), timeout_(default_timeout_), retries_(default_retries_), 
   max_pdu_size_(default_max_pdu_size_), version_(default_version_)
 {
 }
 
 // return validity of target
 int SnmpTarget::valid() const
-{
+{ 
   return validity_;
-}
+} 
 
 // allow destruction of derived classes
-SnmpTarget::~SnmpTarget()
+SnmpTarget::~SnmpTarget() 
 {
 }
 
-// set the timeout
+// set the timeout   
 void SnmpTarget::set_timeout( const u_long t)
-{
-  timeout_ = t;
+{ 
+  timeout_ = t; 
 }
 
-// change the default timeout
+// change the default timeout   
 void SnmpTarget::set_default_timeout( const u_long t)
-{
-  default_timeout_ = t;
+{  
+  default_timeout_ = t; 
 }
 
-// set the retry value
+// set the retry value       
 void SnmpTarget::set_retry( const int r)
-{
-  retries_ = r;
-}
+{ 
+  retries_ = r; 
+}   
 
-// change the default retries
+// change the default retries                             
 void SnmpTarget::set_default_retry( const int r)
-{
-  default_retries_ = r;
+{ 
+  default_retries_ = r; 
 }
 
 void SnmpTarget:: set_max_pdu_size(const u_long max_pdu_sz)
@@ -95,54 +95,54 @@ void SnmpTarget:: set_max_pdu_size(const u_long max_pdu_sz)
   max_pdu_size_ = max_pdu_sz;
 }
 
-
+ 
 void SnmpTarget::set_default_max_pdu_size(const u_long max_pdu_sz)
 {
   default_max_pdu_size_ = max_pdu_sz;
 }
 
 void SnmpTarget::set_version( const snmp_version v)
-{
-  version_ = v;
+{ 
+  version_ = v; 
 }
 
 void SnmpTarget::set_default_version( const snmp_version v)
-{
-  default_version_ = v;
+{ 
+  default_version_ = v; 
 }
 
 snmp_version SnmpTarget::get_version() const
-{
+{ 
   return version_;
 }
 
 snmp_version SnmpTarget::get_default_version() const
-{
+{ 
   return default_version_;
 }
 
 u_long SnmpTarget::get_max_pdu_size() const
-{
+{ 
   return max_pdu_size_;
 }
 
 // get the retry value
 int SnmpTarget::get_retry() const
-{
-  return retries_;
+{ 
+  return retries_; 
 }
 
 // get the retry value
 int SnmpTarget::get_default_retry() const
-{
-  return default_retries_;
+{ 
+  return default_retries_; 
 }
 
 // get the timeout
 u_long SnmpTarget::get_timeout() const
-{
-  return timeout_;
-}
+{ 
+  return timeout_; 
+}  
 
 SnmpTarget& SnmpTarget::operator=(const SnmpTarget& lhs)
 {
@@ -178,65 +178,65 @@ int operator==(const SnmpTarget& lhs, const SnmpTarget& rhs)
 }
 
 
-//----------------------------------------------------------------------
+//---------------------------------------------------------------------- 
 //--------[ IpTarget Member Functions ]----------------------------------
 //----------------------------------------------------------------------
 
 
-//---------[ UdpTarget::UdpTarget( void) ]----------------------------------
+//---------[ UdpTarget::UdpTarget( void) ]---------------------------------- 
 
 UdpTarget::UdpTarget()
 {
-  validity_ = 0;
+  validity_ = FALSE;
   read_community_ = default_rd_community_; // assign by init fails
   write_community_ = default_wr_community_;
-}
+} 
 
 UdpTarget::UdpTarget(const UdpAddress& udp) : udp_address_(udp)
 {
   if (udp_address_.valid())
-    validity_ = 1;
+    validity_ = TRUE;
   read_community_ = default_rd_community_;
   write_community_ = default_wr_community_;
 }
 
-// - copy constructor can be synthesised by compiler
+// - copy constructor can be synthesised by compiler 
 
 //-----------[ UdpTarget::~UdpTarget() ]--------------------------------
-UdpTarget::~UdpTarget()
+UdpTarget::~UdpTarget() 
 {
 }
 
 //-----------[ UdpTarget::clone() ]--------------------------------
 SnmpTarget * UdpTarget::clone() const
-{
-  return (SnmpTarget *) new UdpTarget(*this);
+{ 
+  return (SnmpTarget *) new UdpTarget(*this); 
 }
 
 
 void UdpTarget::set_default_read_community(const OctetStr& rd_community)
 {
-   default_rd_community_ = rd_community;
+   default_rd_community_ = rd_community; 
 }
-
+ 
 void UdpTarget::set_default_write_community(const OctetStr& wr_community)
 {
-   default_wr_community_ = wr_community;
+   default_wr_community_ = wr_community; 
 }
 
 
 // get the read community name as an u_char and len
 void UdpTarget::get_read_community( OctetStr& read_community_oct) const
-{
-  read_community_oct = read_community_;
-}
+{  
+  read_community_oct = read_community_; 
+}   
 
 //---------[ UdpTarget::set_getcommunity ]---------------------------------
 // set the read community name
 void UdpTarget::set_read_community( const OctetStr& new_read_community)
 {
   read_community_ = new_read_community;
-}
+} 
 
 //---------[ UdpTarget::get_writecommunity ]----------------------------
 // get the write community
@@ -245,35 +245,35 @@ void UdpTarget::get_write_community( OctetStr &write_community_oct) const
   write_community_oct = write_community_;
 }
 
-//-----------[ UdpTarget::set_writecommunity ]---------------------------
+//-----------[ UdpTarget::set_writecommunity ]--------------------------- 
 // set the write community
 void UdpTarget::set_write_community( const OctetStr& write_community_oct)
 {
   write_community_ = write_community_oct;
 }
 
-//------------[ Address& UdpTarget::get_address() ]---------------------
+//------------[ Address& UdpTarget::get_address() ]---------------------    
 // get the address
 void UdpTarget::get_address( UdpAddress &address) const
-{
+{  
   address = udp_address_;
   return;
 }
 
-//-------------[ UdpTarget::set_address ]--------------------------------
+//-------------[ UdpTarget::set_address ]--------------------------------    
 // set the address
 int UdpTarget::set_address( UdpAddress &udp_address)
-{
+{  
   udp_address_ = udp_address;
   if ( udp_address_.valid())
-    validity_ = 1;
+    validity_ = TRUE;
   else
-    validity_ = 0;
+    validity_ = FALSE;      
 
   return validity_;
-}
+}  
 
-// overloaded assignment
+// overloaded assignment    
 UdpTarget& UdpTarget::operator=( const UdpTarget& lhs)
 {
   if (this == &lhs)
@@ -288,14 +288,14 @@ UdpTarget& UdpTarget::operator=( const UdpTarget& lhs)
   validity_ = lhs.validity_;
 
   return *this;
-}
+} 
 
 char *UdpTarget::to_string()
 {
   sprintf(output_buffer_,"UdpTarget: [ valid: %d addr: %s rd: %s wr: %s \
-ver: %d, timeout: %d, retries: %d max_pdu_size: %d]",
-          valid(), udp_address_.to_string(), read_community_.to_string(),
-          write_community_.to_string(), version_, (int) timeout_,
+ver: %d, timeout: %d, retries: %d max_pdu_size: %d]",  
+	  valid(), udp_address_.to_string(), read_community_.to_string(),
+	  write_community_.to_string(), version_, (int) timeout_, 
           retries_, max_pdu_size_);
   return output_buffer_;
 }
@@ -303,13 +303,13 @@ ver: %d, timeout: %d, retries: %d max_pdu_size: %d]",
 //=============[ int operator == UdpTarget, UdpTarget ]===============
 // equivlence operator overloaded
 int operator==( const UdpTarget &lhs,const UdpTarget &rhs)
-{
+{   
   // need to compare all the members of a UdpTarget
   if ( lhs.read_community_ != rhs.read_community_)
     return 0;  // !=
 
   if ( lhs.write_community_ != rhs.write_community_)
-    return 0;  // !=
+    return 0;  // != 
 
   if ( lhs.udp_address_ != rhs.udp_address_)
     return 0;
@@ -321,4 +321,4 @@ int operator==( const UdpTarget &lhs,const UdpTarget &rhs)
     return 0;
 
   return 1;  // they are equal
-}
+}  
diff --git a/ASNMP/asnmp/timetick.cpp b/ASNMP/asnmp/timetick.cpp
index 06fd025797f..4855605b313 100644
--- a/ASNMP/asnmp/timetick.cpp
+++ b/ASNMP/asnmp/timetick.cpp
@@ -18,83 +18,83 @@
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
-
+ 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
-#include "asnmp/timetick.h"            // include header file for timetick class
+#include "asnmp/timetick.h"	       // include header file for timetick class
 
 ACE_RCSID(asnmp, timetick, "$Id$")
 
-// constructor with a value
+// constructor with a value   
 TimeTicks::TimeTicks( const unsigned long i):SnmpUInt32(i)
-{
+{  
   smival.syntax = sNMP_SYNTAX_TIMETICKS;
-}
-
+} 
+        
 // copy constructor
 TimeTicks::TimeTicks( const TimeTicks &t)
-{
+{ 
   smival.value.uNumber = t.smival.value.uNumber;
   smival.syntax = sNMP_SYNTAX_TIMETICKS;
 }
 
 // destructor
-TimeTicks::~TimeTicks()
+TimeTicks::~TimeTicks() 
 {
 }
 
 // syntax type
 SmiUINT32 TimeTicks::get_syntax()
-{
-  return sNMP_SYNTAX_TIMETICKS;
+{ 
+  return sNMP_SYNTAX_TIMETICKS; 
 }
 
 // create a new instance of this Value
-SnmpSyntax *TimeTicks::clone() const
-{
-  return (SnmpSyntax *) new TimeTicks(*this);
+SnmpSyntax *TimeTicks::clone() const 
+{ 
+  return (SnmpSyntax *) new TimeTicks(*this); 
 }
 
 // overloaded assignement from ulong
 TimeTicks& TimeTicks::operator=( const unsigned long int i)
-{
+{ 
   smival.value.uNumber =i; return *this;
 }
 
 // overloaded assignment from TimeTicks
 TimeTicks& TimeTicks::operator=( const TimeTicks &uli)
-{
+{ 
  this->smival.value.uNumber = uli.smival.value.uNumber; return *this;
 }
 
 // general assignment from any Value
 SnmpSyntax& TimeTicks::operator=( SnmpSyntax &in_val)
 {
-  if ( this == &in_val )        // handle assignement from itself
+  if ( this == &in_val )	// handle assignement from itself
       return *this;
 
-  valid_flag = 0;               // will get set true if really valid
-  if (in_val.valid()) {
+  valid_flag = 0;		// will get set true if really valid
+  if (in_val.valid()) {  
     switch (in_val.get_syntax()) {
       case sNMP_SYNTAX_UINT32:
-   // case sNMP_SYNTAX_GAUGE32:         .. indistinquishable from UINT32
+   // case sNMP_SYNTAX_GAUGE32:  	.. indistinquishable from UINT32
       case sNMP_SYNTAX_CNTR32:
       case sNMP_SYNTAX_TIMETICKS:
-      case sNMP_SYNTAX_INT32:           // implied cast int -> uint
-          this->smival.value.uNumber =
-                ((TimeTicks &)in_val).smival.value.uNumber;
-          valid_flag = 1;
-          break;
+      case sNMP_SYNTAX_INT32:		// implied cast int -> uint 
+	  this->smival.value.uNumber = 
+		((TimeTicks &)in_val).smival.value.uNumber;  
+  	  valid_flag = 1;
+	  break;
     }
   }
   return *this;
@@ -102,8 +102,8 @@ SnmpSyntax& TimeTicks::operator=( SnmpSyntax &in_val)
 
 // otherwise, behave like an unsigned long
 TimeTicks::operator unsigned long()
-{
-  return smival.value.uNumber;
+{ 
+  return smival.value.uNumber; 
 }
 
 
@@ -140,3 +140,4 @@ char * TimeTicks::to_string()
 
   return output_buffer;
 }
+
diff --git a/ASNMP/asnmp/transaction.cpp b/ASNMP/asnmp/transaction.cpp
index 4c22b0f51e4..57abe2f0faf 100644
--- a/ASNMP/asnmp/transaction.cpp
+++ b/ASNMP/asnmp/transaction.cpp
@@ -13,7 +13,7 @@
 //   transactions over UDP/IP networks
 //
 // = AUTHOR
-//   Michael R MacFaden  mrm@cisco.com - remove v2c, async, rework for ACE
+//   Michael R MacFaden  mrm@cisco.com - remove v2c, async, rework for ACE 
 // ============================================================================
 
 #include "ace/Reactor.h"
@@ -29,10 +29,10 @@ inline void reset_receive_buffer(iovec& io)
   io.iov_len = 0;
 }
 
-transaction::transaction(const Pdu& pdu, const UdpTarget& target,
-                         ACE_SOCK_Dgram& io):
+transaction::transaction(const Pdu& pdu, const UdpTarget& target, 
+			 ACE_SOCK_Dgram& io):
                          result_(0),
-                         wp_(pdu,target), params_(target), session_(io)
+			 wp_(pdu,target), params_(target), session_(io)
 {
   // last step, convert address (get ride of this once we have merged address
   UdpAddress udp;
@@ -54,25 +54,25 @@ transaction::~transaction()
 // implement state machine, send, wait (timeout/results) return
 int transaction::run()
 {
-  int rc, done = 0;
+  int rc, done = FALSE;
   int retry_counter = 0;
   ACE_Time_Value to(params_.get_timeout(), 0); // seconds
   ACE_Reactor reactor;
 
   // 1. register io port for read access
-  if (reactor.register_handler(session_.get_handle(), this,
-                               ACE_Event_Handler::READ_MASK) == -1)
+  if (reactor.register_handler(session_.get_handle(), this, 
+			       ACE_Event_Handler::READ_MASK) == -1)
     return SNMP_CLASS_INTERNAL_ERROR;
 
-  // register a time handler and a socket with this
-
+  // register a time handler and a socket with this 
+  
   while (!done) {
-
-    if ((rc = send()) < 0)      // send pkt to agent
-        return rc;
+   
+    if ((rc = send()) < 0)	// send pkt to agent
+	return rc;
     else {
       if (retry_counter++ > params_.get_retry())
-        return SNMP_CLASS_TIMEOUT;
+	return SNMP_CLASS_TIMEOUT;
     }
 
     // 2. wait for events (timeout, returned msg)
@@ -83,7 +83,7 @@ int transaction::run()
          to.set(params_.get_timeout(), 0);
       }
       else
-        return SNMP_CLASS_INTERNAL_ERROR;
+	return SNMP_CLASS_INTERNAL_ERROR;
     }
    }
   return SNMP_CLASS_INTERNAL_ERROR;
@@ -97,20 +97,20 @@ int transaction::run(transaction_result * r)
 
     // 1. register io port for read access
     ACE_Reactor * reactor = ACE_Reactor::instance();
-    if (reactor->register_handler(session_.get_handle(),
-                                  this,
-                                  READ_MASK) == -1)
-        return SNMP_CLASS_INTERNAL_ERROR;
+    if (reactor->register_handler(session_.get_handle(), 
+				  this, 
+				  READ_MASK) == -1)
+	return SNMP_CLASS_INTERNAL_ERROR;
 
     retry_counter_ = 0;
 
-    // register a time handler and a socket with this
+    // register a time handler and a socket with this 
     ACE_Time_Value to = params_.get_timeout();
     if (reactor->schedule_timer(this, 0, to, to) < 0)
-        return SNMP_CLASS_INTERNAL_ERROR;
+	return SNMP_CLASS_INTERNAL_ERROR;
 
-    if ((rc = send()) < 0)      // send pkt to agent
-        return rc;
+    if ((rc = send()) < 0)	// send pkt to agent
+	return rc;
     return 0;
 }
 
@@ -120,12 +120,12 @@ int transaction::handle_input (ACE_HANDLE)
   // OS allocates iovec_.iov_base ptr and len
   delete [] receive_iovec_.iov_base;
   reset_receive_buffer(receive_iovec_);
-  int rc = session_.recv(&receive_iovec_, receive_addr_, 0);
+  int rc = session_.recv(&receive_iovec_, receive_addr_, 0); 
   if (rc == -1) {
       delete [] receive_iovec_.iov_base;
       reset_receive_buffer(receive_iovec_);
       if (result_)
-          result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL);
+	  result_->result(this, SNMP_CLASS_RESOURCE_UNAVAIL);
       return SNMP_CLASS_RESOURCE_UNAVAIL;
   }
   if (result_)
@@ -137,14 +137,14 @@ int transaction::handle_input (ACE_HANDLE)
 }
 
 int transaction::handle_timeout(const ACE_Time_Value &,
-                                const void *)
+				const void *)
 {
     int rc;
-    if ((rc = send()) < 0)      // send pkt to agent
-        result_->result(this, 0);
+    if ((rc = send()) < 0)	// send pkt to agent
+	result_->result(this, 0);
     else
-        if (retry_counter_++ > params_.get_retry())
-            result_->result(this, SNMP_CLASS_TIMEOUT);
+	if (retry_counter_++ > params_.get_retry())
+	    result_->result(this, SNMP_CLASS_TIMEOUT);
 
     return 0;
 }
@@ -157,7 +157,7 @@ const ACE_INET_Addr& transaction::get_from_addr() const
 
 
 // return pdu to caller
-int transaction::result(Pdu& pdu, char *comm_str, ACE_INET_Addr *from)
+int transaction::result(Pdu& pdu, char *comm_str, ACE_INET_Addr *from) 
 {
   // TODO: check to see the sender matches the receiver address..
 
@@ -169,7 +169,7 @@ int transaction::result(Pdu& pdu, char *comm_str, ACE_INET_Addr *from)
    return -1;
 
  wpdu tmp(receive_iovec_);
-
+ 
  snmp_version ver;
 
  // return comm str and from address of incomming pdu if requested
@@ -177,7 +177,7 @@ int transaction::result(Pdu& pdu, char *comm_str, ACE_INET_Addr *from)
  if (comm_str)
    ACE_OS::strcpy(comm_str, (char *)tmp.get_community());
  if (from)
-  *from = receive_addr_;
+  *from = receive_addr_; 
  return rc;
 }
 
@@ -196,7 +196,7 @@ int transaction::send()
     return -1;
   }
   ssize_t rc = session_.send (io.iov_base, io.iov_len, addr_ , 0);
-  return rc;
+  return rc;                
 }
 
 transaction_result::~transaction_result() {}
diff --git a/ASNMP/asnmp/vb.cpp b/ASNMP/asnmp/vb.cpp
index ff9c22bb773..2a840e91015 100644
--- a/ASNMP/asnmp/vb.cpp
+++ b/ASNMP/asnmp/vb.cpp
@@ -17,27 +17,27 @@
 // set oid, value then call valid() to be sure object was constructed correctly.
 //
 // = AUTHOR
-//   Peter E Mellquist
-//   Michael R MacFaden  mrm@cisco.com - rework & ACE port
+//   Peter E Mellquist     
+//   Michael R MacFaden  mrm@cisco.com - rework & ACE port 
 // ============================================================================
 /*===================================================================
   Copyright (c) 1996
   Hewlett-Packard Company
 
   ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS.
-  Permission to use, copy, modify, distribute and/or sell this software
-  and/or its documentation is hereby granted without fee. User agrees
-  to display the above copyright notice and this license notice in all
-  copies of the software and any documentation of the software. User
-  agrees to assume all liability for the use of the software; Hewlett-Packard
-  makes no representations about the suitability of this software for any
-  purpose. It is provided "AS-IS without warranty of any kind,either express
-  or implied. User hereby grants a royalty-free license to any and all
-  derivatives based upon this software code base.
+  Permission to use, copy, modify, distribute and/or sell this software 
+  and/or its documentation is hereby granted without fee. User agrees 
+  to display the above copyright notice and this license notice in all 
+  copies of the software and any documentation of the software. User 
+  agrees to assume all liability for the use of the software; Hewlett-Packard 
+  makes no representations about the suitability of this software for any 
+  purpose. It is provided "AS-IS without warranty of any kind,either express 
+  or implied. User hereby grants a royalty-free license to any and all 
+  derivatives based upon this software code base. 
 =====================================================================*/
 
-#include "asnmp/oid.h"         // include oid class defs
-#include "asnmp/vb.h"                  // include vb class defs
+#include "asnmp/oid.h"	       // include oid class defs
+#include "asnmp/vb.h"		       // include vb class defs
 #include "asnmp/snmperrs.h"      // error codes
 
 ACE_RCSID(asnmp, vb, "$Id$")
@@ -45,32 +45,32 @@ ACE_RCSID(asnmp, vb, "$Id$")
 //---------------[ Vb::Vb( void) ]--------------------------------------
 // constructor with no arguments
 // makes an vb, unitialized
-Vb::Vb( void): output_(0), iv_vb_value_(0),
+Vb::Vb( void): output_(NULL), iv_vb_value_(NULL), 
     exception_status_(SNMP_CLASS_SUCCESS)
-{
+{ 
 }
 
 //---------------[ Vb::Vb( const Oid &oid) ]-----------------------------
 // constructor to initialize the oid
 // makes a vb with oid portion initialized
-Vb::Vb( const Oid &oid):  output_(0), iv_vb_oid_(oid), iv_vb_value_(0),
+Vb::Vb( const Oid &oid):  output_(NULL), iv_vb_oid_(oid), iv_vb_value_(NULL), 
  exception_status_(SNMP_CLASS_SUCCESS)
-{
+{ 
 }
 
 //---------------[ Vb::Vb( const Oid &oid, const SmiSyntax &val) ]-------
 Vb::Vb( const Oid &oid, const SnmpSyntax &val, const SmiUINT32 status):
-  output_(0), iv_vb_oid_(oid), iv_vb_value_(0), exception_status_(status)
-{
+  output_(NULL), iv_vb_oid_(oid), iv_vb_value_(NULL), exception_status_(status)
+{ 
   // iv_vb_value_ = recast_smi_object(val);  // allocate and construct object
   iv_vb_value_ = val.clone();
 }
 
 //---------------[ Vb::Vb( const Vb &vb) ]-----------------------------
 // copy constructor
-Vb::Vb( const Vb &vb): output_(0), iv_vb_value_(0)
-{
-   *this = vb;
+Vb::Vb( const Vb &vb): output_(NULL), iv_vb_value_(NULL)
+{  
+   *this = vb; 
 }
 
 //---------------[ Vb::~Vb() ]------------------------------------------
@@ -78,8 +78,8 @@ Vb::Vb( const Vb &vb): output_(0), iv_vb_value_(0)
 // if the vb has a oid or an octect string then
 // the associated memory needs to be freed
 Vb::~Vb()
-{
-  free_vb();
+{ 
+  free_vb(); 
   delete [] output_; // formatting buffer if it exists
 }
 
@@ -90,9 +90,9 @@ Vb::~Vb()
 int Vb::valid() const
 {
    if ( iv_vb_oid_.valid() && (iv_vb_value_ && iv_vb_value_->valid()) )
-     return 1;
+     return TRUE;
    else
-     return 0;
+     return FALSE;
 }
 
 
@@ -102,14 +102,14 @@ int Vb::valid() const
 // before assigning source
 Vb& Vb::operator=( const Vb &vb)
 {
-   free_vb();    // free up target to begin with
+   free_vb();	 // free up target to begin with
 
    //-----[ reassign the Oid portion 1st ]
    vb.get_oid( iv_vb_oid_);
 
    //-----[ next set the vb value portion ]
-   if (vb.iv_vb_value_ == 0) {
-     iv_vb_value_ = 0;
+   if (vb.iv_vb_value_ == NULL) {
+     iv_vb_value_ = NULL;
    }
    else {
      iv_vb_value_ = vb.iv_vb_value_->clone();
@@ -128,14 +128,14 @@ void Vb::set_null()
 //---------------[ Vb::set_oid( const Oid oid ) ]-----------------------
 // set value oid only with another oid
 void Vb::set_oid( const Oid& oid)
-{
+{ 
   iv_vb_oid_ = oid;
 }
 
 //---------------[ Vb::get_oid( Oid &oid) ]-----------------------------
 // get oid portion
 void Vb::get_oid( Oid &oid) const
-{
+{ 
   oid = iv_vb_oid_;
 }
 
@@ -149,7 +149,7 @@ void Vb::free_vb()
   if (iv_vb_value_)
     delete iv_vb_value_;
   exception_status_ = SNMP_CLASS_SUCCESS;
-  iv_vb_value_ = 0;
+  iv_vb_value_ = NULL;
 }
 
 void Vb::set_value( const SnmpInt32& i)
@@ -223,19 +223,19 @@ int Vb::get_value( SnmpUInt32 &u)
    if (iv_vb_value_ && iv_vb_value_->valid())
    {
        SmiUINT32 syntax = iv_vb_value_->get_syntax();
-       if (syntax == sNMP_SYNTAX_GAUGE32 ||
-           syntax == sNMP_SYNTAX_CNTR32 ||
-           syntax == sNMP_SYNTAX_TIMETICKS ||
-           syntax == sNMP_SYNTAX_UINT32)
+       if (syntax == sNMP_SYNTAX_GAUGE32 || 
+	   syntax == sNMP_SYNTAX_CNTR32 ||
+	   syntax == sNMP_SYNTAX_TIMETICKS || 
+	   syntax == sNMP_SYNTAX_UINT32) 
        {
-           u = *((SnmpUInt32 *) iv_vb_value_);
-           return SNMP_CLASS_SUCCESS;
+	   u = *((SnmpUInt32 *) iv_vb_value_);
+	   return SNMP_CLASS_SUCCESS;
        }
    }
    return SNMP_CLASS_INVALID;
 }
 
-/* return a uint or a gauge. this is casting, but no semantic difference
+/* return a uint or a gauge. this is casting, but no semantic difference 
  * at this level
  */
 int Vb::get_value( Gauge32 &g)
@@ -318,9 +318,9 @@ int Vb::get_value( SnmpSyntax &val)
   if (iv_vb_value_) {
     val = *iv_vb_value_;
     if (val.valid())
-        return SNMP_CLASS_SUCCESS;
+	return SNMP_CLASS_SUCCESS;
     else
-        return SNMP_CLASS_INVALID;
+	return SNMP_CLASS_INVALID;
   }
   else
   {
@@ -338,7 +338,7 @@ int Vb::get_value( SnmpSyntax &val)
 // the caller has a vb object and does not know what it is.
 // This would be useful in the implementation of a browser.
 SmiUINT32 Vb::get_syntax()
-{
+{ 
   if ( exception_status_ != SNMP_CLASS_SUCCESS)
     return exception_status_;
   else
@@ -356,20 +356,20 @@ char  *Vb::to_string_value()
 
 // return the printable oid
 char  *Vb::to_string_oid()
-{
-  return iv_vb_oid_.to_string();
+{ 
+  return iv_vb_oid_.to_string(); 
 }
 
 // generate string with name/ value format
 char  *Vb::to_string()
-{
+{ 
   int len = ACE_OS::strlen(iv_vb_oid_.to_string());
   char *ptr = "";
   if (iv_vb_value_)
-      ptr = iv_vb_value_->to_string();
+      ptr = iv_vb_value_->to_string(); 
   len += ACE_OS::strlen(ptr) + 3 + 1; // " / " + null
-  ACE_NEW_RETURN(output_, char[len], "");
-  ACE_OS::sprintf(output_, "%s / %s", iv_vb_oid_.to_string(), ptr);
+  ACE_NEW_RETURN(output_, char[len], ""); 
+  ACE_OS::sprintf(output_, "%s / %s", iv_vb_oid_.to_string(), ptr); 
   return output_;
 }
 
@@ -383,8 +383,8 @@ void set_exception_status( Vb *vb, const SmiUINT32 status)
 // hack, by side effect, compare based on string formatting output_
 int operator==( const Vb &lhs, const Vb &rhs)
 {
-  if ( lhs.iv_vb_oid_ != rhs.iv_vb_oid_)
-       return 0;
+  if ( lhs.iv_vb_oid_ != rhs.iv_vb_oid_) 
+       return FALSE;
 
   if (lhs.iv_vb_value_ != 0 && rhs.iv_vb_value_ != 0) {
      int val = strcmp(lhs.iv_vb_value_->to_string(),
@@ -392,5 +392,6 @@ int operator==( const Vb &lhs, const Vb &rhs)
      return !val;
    }
   else
-    return 0;
+    return FALSE;
 }
+
diff --git a/ASNMP/asnmp/wpdu.cpp b/ASNMP/asnmp/wpdu.cpp
index 973d8fe430f..71e7fc1da1d 100644
--- a/ASNMP/asnmp/wpdu.cpp
+++ b/ASNMP/asnmp/wpdu.cpp
@@ -25,7 +25,7 @@
 
 ACE_RCSID(asnmp, wpdu, "$Id$")
 
-#define MAX_COMM_STR_LEN 255
+#define MAX_COMM_STR_LEN 255 
 #define V1_COLD_START 0
 #define V1_WARM_START 1
 #define V1_LINK_DOWN 2
@@ -41,7 +41,7 @@ void reset_iov(iovec& iov)
   iov.iov_len = 0;
 }
 
-wpdu::wpdu(const Pdu& pdu, const UdpTarget& target):
+wpdu::wpdu(const Pdu& pdu, const UdpTarget& target): 
    valid_flag_(SNMP_CLASS_INVALID ), comm_len(MAX_COMM_STR_LEN)
 {
    reset_iov(iovec_);
@@ -63,14 +63,14 @@ wpdu::wpdu(const Pdu& pdu, const UdpTarget& target):
    raw_pdu->errindex= (unsigned long) pdu.get_error_index();
 
    switch (raw_pdu->command) {
-     case sNMP_PDU_GET:
+     case sNMP_PDU_GET:  
      case sNMP_PDU_GETNEXT:
        target.get_read_community(comm_str);
        break;
 
      case sNMP_PDU_SET:
        target.get_write_community(comm_str);
-       break;
+       break;      
 
      case sNMP_PDU_V1TRAP:
        target.get_read_community(comm_str);
@@ -96,11 +96,11 @@ wpdu::wpdu(const Pdu& pdu, const UdpTarget& target):
    ACE_NEW(iovec_.iov_base, char [iovec_.iov_len]);
 
    // create raw byte stream
-   status = cmu_snmp::build( raw_pdu,
-                            (unsigned char *)iovec_.iov_base,
-                            (int *) &iovec_.iov_len,
-                            target.get_version(),
-                            comm_str.data(), comm_str.length());
+   status = cmu_snmp::build( raw_pdu, 
+			    (unsigned char *)iovec_.iov_base, 
+			    (int *) &iovec_.iov_len,
+			    target.get_version(), 
+			    comm_str.data(), comm_str.length());
    if ( status != 0) {
      valid_flag_ = SNMP_ERROR_WRONG_ENCODING;
      cmu_snmp::free_pdu( raw_pdu);
@@ -124,8 +124,8 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
 
   raw_pdu->specific_type=0;
 
-  // TODO: object should emit numeric instead of this kind of mess...
-  if ( trapid == coldStart)
+  // TODO: object should emit numeric instead of this kind of mess... 
+  if ( trapid == coldStart) 
     raw_pdu->trap_type = V1_COLD_START;  // cold start
   else if ( trapid == warmStart)
     raw_pdu->trap_type = V1_WARM_START;  // warm start
@@ -163,13 +163,13 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
     // HDN - enterprise is a local object, cannot simply assign pointer
     //raw_pdu->enterprise = rawOid->ptr;
     raw_pdu->enterprise_length = (int) rawOid->len;
-    ACE_NEW_RETURN(raw_pdu->enterprise,
-                   oid[raw_pdu->enterprise_length],-1);
-    ACE_OS::memcpy((char *)raw_pdu->enterprise,(char *)rawOid->ptr,
-                   raw_pdu->enterprise_length * sizeof(oid));
+    ACE_NEW_RETURN(raw_pdu->enterprise, 
+		   oid[raw_pdu->enterprise_length],-1);
+    ACE_OS::memcpy((char *)raw_pdu->enterprise,(char *)rawOid->ptr,  
+		   raw_pdu->enterprise_length * sizeof(oid));
   }
-
-  TimeTicks timestamp;
+ 
+  TimeTicks timestamp; 
   pdu.get_notify_timestamp( timestamp);
   raw_pdu->time = ( unsigned long) timestamp;
 
@@ -177,7 +177,7 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
   char localHostName[MAXHOSTNAMELEN];
   if (ACE_OS::hostname(localHostName, sizeof(localHostName)) != -1) {
     struct hostent* hostInfo;
-    if ((hostInfo = ACE_OS::gethostbyname(localHostName))) {
+    if (hostInfo = ACE_OS::gethostbyname(localHostName)) {
       ACE_OS::memcpy(&(raw_pdu->agent_addr.sin_addr), hostInfo->h_addr, hostInfo->h_length);
     }
   }
@@ -185,26 +185,26 @@ int wpdu::set_trap_info(snmp_pdu *raw_pdu, const Pdu& pdu) const
   return 0;
 }
 
-wpdu::wpdu(const iovec& iov): valid_flag_(0),comm_len(MAX_COMM_STR_LEN)
+wpdu::wpdu(const iovec& iov): valid_flag_(FALSE),comm_len(MAX_COMM_STR_LEN)
 {
   community_name[0] = 0;
    reset_iov(iovec_);
-   version_ = version1;         // TODO: figure where this should come from
+   version_ = version1;		// TODO: figure where this should come from
    ACE_NEW(iovec_.iov_base, char[iov.iov_len]);
    if (!iovec_.iov_base) {
      valid_flag_ = SNMP_CLASS_RESOURCE_UNAVAIL;
      return;
    }
 
-   copy_iovec(iovec_, iov);
+   copy_iovec(iovec_, iov);     
    valid_flag_ = SNMP_CLASS_SUCCESS;
 }
 
-wpdu::wpdu(): valid_flag_(0), comm_len(MAX_COMM_STR_LEN)
+wpdu::wpdu(): valid_flag_(FALSE), comm_len(MAX_COMM_STR_LEN)
 {
   community_name[0] = 0;
    reset_iov(iovec_);
-   version_ = version1;         // TODO: figure where this should come from
+   version_ = version1;		// TODO: figure where this should come from
 }
 
 int wpdu::valid() const
@@ -223,7 +223,7 @@ int wpdu::load_vbs(snmp_pdu *raw_pdu, const Pdu& pdu)
    Oid tempoid;
    SmiLPOID smioid;
    SmiVALUE smival;
-
+ 
    vb_count = pdu.get_vb_count();
 
    for (int z = 0; z < vb_count; z++) {
@@ -234,7 +234,7 @@ int wpdu::load_vbs(snmp_pdu *raw_pdu, const Pdu& pdu)
       status = convert_vb_to_smival( tempvb, &smival );
       if ( status != SNMP_CLASS_SUCCESS)
          return status;
-
+ 
       // add the var to the raw pdu
       cmu_snmp::add_var(raw_pdu, smioid->ptr, (int) smioid->len, &smival);
       free_smival_descriptor( &smival);
@@ -244,7 +244,7 @@ int wpdu::load_vbs(snmp_pdu *raw_pdu, const Pdu& pdu)
 }
 
 // supports overlapped copies
-// static
+// static 
 void wpdu::copy_iovec(iovec& dest, const iovec& src)
 {
   if (&dest == &src)
@@ -259,10 +259,10 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
   smival->syntax = tempvb.get_syntax();
 
   switch ( smival->syntax ) {
-
+    
   case sNMP_SYNTAX_NULL:
     break;
-
+    
     // case sNMP_SYNTAX_INT32:
   case sNMP_SYNTAX_INT:
     {
@@ -271,7 +271,7 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
       smival->value.sNumber = tmp;
     }
     break;
-
+    
     //    case sNMP_SYNTAX_UINT32:
   case sNMP_SYNTAX_GAUGE32:
   case sNMP_SYNTAX_CNTR32:
@@ -282,7 +282,7 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
       smival->value.uNumber = tmp;
     }
     break;
-
+    
     // case Counter64
   case sNMP_SYNTAX_CNTR64:
     {
@@ -301,32 +301,32 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
       tempvb.get_value(tmpoid);
       SmiLPOID smi = tmpoid.oidval();
       smival->value.oid.len = tmpoid.length();
-      ACE_NEW_RETURN(smival->value.oid.ptr,
+      ACE_NEW_RETURN(smival->value.oid.ptr, 
                 SmiUINT32 [smival->value.oid.len], 1);
-      ACE_OS::memcpy(smival->value.oid.ptr, smi->ptr,
+      ACE_OS::memcpy(smival->value.oid.ptr, smi->ptr, 
                      smival->value.oid.len *sizeof(SmiUINT32));
     }
     break;
-
+    
   case sNMP_SYNTAX_BITS:
   case sNMP_SYNTAX_OCTETS:
   case sNMP_SYNTAX_IPADDR:
     {
       OctetStr os;
       tempvb.get_value(os);
-      smival->value.string.ptr = 0;
+      smival->value.string.ptr = NULL;
       smival->value.string.len = os.length();
       if ( smival->value.string.len > 0 ) {
-        ACE_NEW_RETURN(smival->value.string.ptr,
-                SmiBYTE [smival->value.string.len], 1);
-        if ( smival->value.string.ptr )  {
-          for (int i=0; i<(int) smival->value.string.len ; i++)
-            smival->value.string.ptr[i] = os[i];
-        }
-        else   {
-          smival->syntax = sNMP_SYNTAX_NULL;  // invalidate the smival
-          return SNMP_CLASS_RESOURCE_UNAVAIL;
-        }
+	ACE_NEW_RETURN(smival->value.string.ptr,  
+		SmiBYTE [smival->value.string.len], 1);
+	if ( smival->value.string.ptr )  {
+	  for (int i=0; i<(int) smival->value.string.len ; i++)
+	    smival->value.string.ptr[i] = os[i];
+	}
+	else   {
+	  smival->syntax = sNMP_SYNTAX_NULL;  // invalidate the smival
+	  return SNMP_CLASS_RESOURCE_UNAVAIL;
+	}
       }
     }
     break;
@@ -337,7 +337,7 @@ int wpdu::convert_vb_to_smival( Vb &tempvb, SmiVALUE *smival )
   } // switch
 
   return 0;
-}
+} 
 
 // free a SMI value
 void wpdu::free_smival_descriptor( SmiVALUE *smival )
@@ -349,7 +349,7 @@ void wpdu::free_smival_descriptor( SmiVALUE *smival )
   case sNMP_SYNTAX_BITS:                 // obsoleted in SNMPv2 Draft Std
     delete [] smival->value.string.ptr;
     break;
-
+    
   case sNMP_SYNTAX_OID:
     delete [] smival->value.oid.ptr;
     break;
@@ -369,7 +369,7 @@ const iovec& wpdu::get_buffer() const
 }
 
 // return a pdu from a buffer
-int wpdu::get_pdu(Pdu& pdu, snmp_version& version)
+int wpdu::get_pdu(Pdu& pdu, snmp_version& version) 
 {
   if (iovec_.iov_len == 0)
     return -1; // NO DATA
@@ -378,10 +378,10 @@ int wpdu::get_pdu(Pdu& pdu, snmp_version& version)
   raw_pdu = cmu_snmp::pdu_create(0);
   if (!raw_pdu) {
     return SNMP_CLASS_RESOURCE_UNAVAIL;
-  }
+  } 
 
   // max value a client can send us - TODO: replace this with an
-  // api to get actual string length
+  // api to get actual string length 
   int status = cmu_snmp::parse( raw_pdu, (unsigned char *)iovec_.iov_base,
                      community_name, comm_len,
                      version, iovec_.iov_len);
@@ -400,7 +400,7 @@ int wpdu::get_pdu(Pdu& pdu, snmp_version& version)
   }
 
   cmu_snmp::free_pdu(raw_pdu);
-  return 0;
+  return 0;  
 }
 
 int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
@@ -410,15 +410,15 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
    struct variable_list *vp;
 
    for(vp = raw_pdu->variables; vp; vp = vp->next_variable) {
-
+ 
     // extract the oid portion
     tempoid.set_data( (unsigned long *)vp->name,
                        ( unsigned int) vp->name_length);
     tempvb.set_oid( tempoid);
-
+ 
     // extract the value portion
     switch(vp->type) {
-
+ 
     // octet string
     case sNMP_SYNTAX_OCTETS:
      case sNMP_SYNTAX_OPAQUE:
@@ -428,7 +428,7 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
        tempvb.set_value( octets);
     }
     break;
-
+ 
     // object id
     case sNMP_SYNTAX_OID:
     {
@@ -437,7 +437,7 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
       tempvb.set_value( oid);
     }
      break;
-
+ 
     // timeticks
     case sNMP_SYNTAX_TIMETICKS:
     {
@@ -445,7 +445,7 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
        tempvb.set_value( timeticks);
     }
     break;
-
+ 
     // 32 bit counter
     case sNMP_SYNTAX_CNTR32:
     {
@@ -467,7 +467,7 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
        tempvb.set_value( ipaddress);
     }
     break;
-
+ 
     // 32 bit integer
     case sNMP_SYNTAX_INT:
     {
@@ -475,7 +475,7 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
       tempvb.set_value( int32);
     }
     break;
-
+ 
     // 32 bit unsigned integer
     case sNMP_SYNTAX_UINT32:
     {
@@ -483,27 +483,27 @@ int wpdu::restore_vbs(Pdu& pdu, const snmp_pdu *raw_pdu) const
       tempvb.set_value( uint32);
     }
      break;
-
+ 
     // v2 counter 64's
     case sNMP_SYNTAX_CNTR64:
      break;
-
+ 
     case sNMP_SYNTAX_NULL:
       tempvb.set_null();
     break;
-
+ 
     // v2 vb exceptions
     case sNMP_SYNTAX_NOSUCHOBJECT:
     case sNMP_SYNTAX_NOSUCHINSTANCE:
     case sNMP_SYNTAX_ENDOFMIBVIEW:
        set_exception_status( &tempvb, vp->type);
      break;
-
+ 
     default:
        tempvb.set_null();
-
+ 
     } // end switch
-
+ 
     // append the vb to the pdu
     pdu += tempvb;
   }
@@ -515,3 +515,4 @@ const unsigned char *wpdu::get_community() const
 {
   return community_name;
 }
+
diff --git a/ASNMP/tests/Makefile b/ASNMP/tests/Makefile
index cb166b88012..b22a123d6db 100644
--- a/ASNMP/tests/Makefile
+++ b/ASNMP/tests/Makefile
@@ -24,8 +24,10 @@ CCFLAGS = -I$(ACE_ROOT)/ASNMP/
 LSRC   = $(addsuffix .cpp,$(BIN))
 LDLIBS := -L$(ACE_ROOT)/ASNMP/asnmp -lasnmp $(LDLIBS:%=%$(VAR))
 
+BUILD = $(VBIN)
+
 # For make depend:
-PSRC = -I..
+SRC = -I..
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/PROBLEM-REPORT-FORM b/BUG-REPORT-FORM
index 1e30846a964..664a4668c13 100644
--- a/PROBLEM-REPORT-FORM
+++ b/BUG-REPORT-FORM
@@ -21,7 +21,7 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 4.6.40
+    ACE VERSION: 4.6.22
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/COPYING b/COPYING
index a8f89534e82..8fd8fd1df9f 100644
--- a/COPYING
+++ b/COPYING
@@ -1,90 +1,50 @@
+Copyright Information for ACE and TAO
 
-     _________________________________________________________________
-   
-  Copyright and Licensing Information for ACE(TM) and TAO(TM)
-  
-   [1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
-   his [4]research group at [5]Washington University, Copyright (c)
-   1993-1999, all rights reserved. Since ACE and TAO are [6]open source,
-   [7]free software, you are free to use, modify, and distribute the ACE
-   and TAO source code and object code produced from the source, as long
-   as you include this copyright statement along with code built using
-   ACE and TAO.
-   
-   In particular, you can use ACE and TAO in proprietary software and are
-   under no obligation to redistribute any of your source code that is
-   built using ACE and TAO. Note, however, that you may not do anything
-   to the ACE and TAO code, such as copyrighting it yourself or claiming
-   authorship of the ACE and TAO code, that will prevent ACE and TAO from
-   being distributed freely using an open source development model.
-   
-   ACE and TAO are provided as is with no warranties of any kind,
-   including the warranties of design, merchantibility and fitness for a
-   particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE and TAO are provided
-   with no support and without any obligation on the part of Washington
-   University, its employees, or students to assist in its use,
-   correction, modification, or enhancement. However, commercial support
-   for ACE and TAO are available from [8]Riverace and [9]OCI,
-   respectively. Moreover, both ACE and TAO are Y2K-compliant, as long as
-   the underlying OS platform is Y2K-compliant.
-   
-   Washington University, its employees, and students shall have no
-   liability with respect to the infringement of copyrights, trade
-   secrets or any patents by ACE and TAO or any part thereof. Moreover,
-   in no event will Washington University, its employees, or students be
-   liable for any lost revenue or profits or other special, indirect and
-   consequential damages.
-   
-   The [10]ACE and [11]TAO web sites are maintained by the [12]Center for
-   Distributed Object Computing of Washington University for the
-   development of open source software as part of the [13]open source
-   software community. By submitting comments, suggestions, code, code
-   snippets, techniques (including that of usage), and algorithms,
-   submitters acknowledge that they have the right to do so, that any
-   such submissions are given freely and unreservedly, and that they
-   waive any claims to copyright or ownership. In addition, submitters
-   acknowledge that any such submission might become part of the
-   copyright maintained on the overall body of code, which comprises the
-   [14]ACE and [15]TAO software. By making a submission, submitter agree
-   to these terms. Furthermore, submitters acknowledge that the
-   incorporation or modification of such submissions is entirely at the
-   discretion of the moderators of the open source ACE and TAO projects
-   or their designees.
-   
-   The names ACE
-   (TM), TAO(TM), and Washington University may not be used to endorse or
-   promote products or services derived from this source without express
-   written permission from Washington University. Further, products or
-   services derived from this source may not be called ACE(TM) or
-   TAO(TM), nor may the name Washington University appear in their names,
-   without express written permission from Washington University.
-   
-   If you have any suggestions, additions, comments, or questions, please
-   let [16]me know.
-   
-   [17]Douglas C. Schmidt
-     _________________________________________________________________
-   
-   Back to the [18]ACE home page.
+[1]ACE and [2]TAO are copyrighted by [3]Douglas C. Schmidt and his
+[4]research group at [5]Washington University, Copyright (c)
+1993-1999, all rights reserved. Since ACE is [6]freely available
+[7]open source software, you are free to do anything you like with the
+ACE and TAO source code and object code produced from the source, as
+long as you include this copyright statement along with code built
+using ACE and TAO.
+
+In particular, you can use ACE and TAO in commercial software and are
+under no obligation to redistribute any of your source code that is
+built using ACE and TAO. Please note, however, that you may not do
+anything to the ACE and TAO code that will prevent it from being
+distributed freely (such as copyrighting it yourself or claiming
+authorship of the ACE and TAO code).
+
+ACE and TAO are provided as is with no warranties of any kind
+including the warranties of design, merchantibility and fitness for a
+particular purpose, noninfringement, or arising from a course of
+dealing, usage or trade practice.
+
+ACE and TAO are provided with no support and without any obligation on
+the part of Washington University, its employees, or students to
+assist in its use, correction, modification or enhancement.
+
+Washington University, its employees, and students shall have no
+liability with respect to the infringement of copyrights, trade
+secrets or any patents by ACE and TAO or any part thereof.
+
+In no event will Washington University, its employees, or students be
+liable for any lost revenue or profits or other special, indirect and
+consequential damages.
+
+If you have any questions, please let me know.
+
+Douglas C. Schmidt
+schmidt@cs.wustl.edu
+_________________________________________________________________
 
 References
 
-   1. http://www.cs.wustl.edu/~schmidt/ACE.html
-   2. http://www.cs.wustl.edu/~schmidt/TAO.html
-   3. http://www.cs.wustl.edu/~schmidt/
-   4. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   5. http://www.wustl.edu/
-   6. http://www.opensource.org/
-   7. http://www.gnu.org/
-   8. http://www.riverace.com/
-   9. file://localhost/home/cs/faculty/schmidt/.www-docs/www.ociweb.com
-  10. http://www.cs.wustl.edu/~schmidt/ACE.html
-  11. http://www.cs.wustl.edu/~schmidt/TAO.html
-  12. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  13. http://www.opensource.org/
-  14. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  15. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  16. mailto:schmidt@cs.wustl.edu
-  17. http://www.cs.wustl.edu/~schmidt/
-  18. file://localhost/home/cs/faculty/schmidt/.www-docs/ACE.html
+1. http://www.cs.wustl.edu/~schmidt/ACE.html
+2. http://www.cs.wustl.edu/~schmidt/TAO.html
+3. http://www.cs.wustl.edu/~schmidt/
+4. http://www.cs.wustl.edu/~schmidt/ACE-members.html
+5. http://www.wustl.edu/
+6. http://www.forbes.com/forbes/98/0810/6209094a.htm
+7. http://www.opensource.org/
+
diff --git a/ChangeLog-96b b/ChangeLog-96b
index 5dd7b809a42..c2217f16f89 100644
--- a/ChangeLog-96b
+++ b/ChangeLog-96b
@@ -4959,6 +4959,7 @@ Thu Aug 15 21:04:35 1996  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
         * ace/Signal.cpp (ACE_Sig_Handlers): Moved the #endif /* HPUX */
           down to the end of the file so that it works correctly on HPUX.
           Thanks to Eric C. Newton <ecn@clark.net> for report this bug.
+          
 
         * ace/OS.i: Updated the behavior of thr_join() so that it will do
           a ::CloseHandle after getting the exit status.  Thanks to the
diff --git a/ChangeLog-99b b/ChangeLog-99b
index ef758e7cd65..fd87398b073 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,5519 +1,106 @@
-Sun May 23 11:33:07 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-	 Changes for the following enhancement in the Proactor
-	 implementation. 
-	 Enhanced the semantics of the <end_event_loop>, so that when it
-	 is called, it wakes up all the threads blocked on waiting for
-	 completions and end the event loop.
-
-	Thanks to  "Edwin D. Windes" <ewindes@usa.net> for reporting the issue.
-
-	* ace/Proactor.h: 
-	* ace/Proactor.cpp:
-	Added static helper methods and states to post the wakeup
-	completions to the CompletionPort.
-
-	* ace/Asynch_IO.h: 	  		
-	* ace/Asynch_IO.cpp:
-	Added a method <handle_wakeup> to the ACE_Handler.
-
-	* ace/Object_Manager.cpp   
-	* ace/Object_Manager.h
-
-	Added a new Thread_Mutex called <ACE_PROACTOR_EVENT_LOOP_LOCK> to
-	protect the thread count in the event loop.
-
-	* ace/POSIX_Asynch_IO.cpp  
-	* ace/POSIX_Proactor.cpp   
-	* ace/POSIX_Proactor.h     
-	* ace/Proactor.cpp         
-	* ace/Proactor.h           
-	* ace/Proactor_Impl.h  
-    	* ace/WIN32_Proactor.cpp
-	* ace/WIN32_Proactor.h
-		
-	Changes for posting wakeup completions.			
-
-	* examples/Reactor/Proactor/test_end_event_loop.cpp:
-	* examples/Reactor/Proactor/test_end_event_loop.dsp:
-	* examples/Reactor/Proactor/post_completions.dsp:
-	* examples/Reactor/Proactor/Makefile: 
-
-	Test file the <end_event_loop> enhancement.
-	
-Sat May 22 16:57:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* ace/FlReactor.cpp:
-	  Sun/CC doesn't like reinterpret cast when converting from an int 
-	  into an int; this is silly, but I cannot use static_cast because 
-	  on NT reinterpret_cast is the right thing.
-	  Use old-style casts for the moment.
-
-	* tests/FlReactor_Test.cpp:
-	  Minor cosmetic fixes.
-
-Sat May 22 16:36:14 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ACE version 4.6.40 released.
-
-Sat May 22 14:53:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Filecache.cpp: snagged another "template <>".
-          Thanks to Bala for reporting it.
-
-Sat May 22 07:30:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-chorus.h,ace/config-lynxos.h: added
-          ACE_HAS_NONCONST_SELECT_TIMEVAL.
-
-        * ace/Filecache.cpp: commented out "template<>" for
-          now.  Not all compilers can cope with it.
-
-Fri May 21 21:12:37 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Map_Manager.i (operator==): Since <map_man_> is a pointer
-          now, we must compare by value, rather than by address.
-
-Fri May 21 12:56:38 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: fixed to
-          build without threads:  #ifdef ACE_MT_SAFE is insufficient.
-          Must also check if it is 0.
-
-Fri May 21 12:45:32 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Map_Manager.i:
-          Fixed minor error in previous commit.  Thanks to Irfan for
-          helping out with this.
-
-Fri May 21 11:27:44 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Map_Manager.h (class ACE_Map_Iterator_Base): Changed the
-          ACE_Map_Manager reference to a pointer.  This way there is no
-          problem in reinitializing <map_man_>, and hence the compiler
-          will not have a problem in providing us a default assignment
-          operator.  Thanks to Knut Johannessen <knutj@funcom.com> for
-          pointing out this problem.
-
-        * ace/Process: A nifty ACE::fork was added several months ago
-          which offers the option to avoid zombies, but it is not used in
-          ACE_Process::spawn.
-
-          Mark L. Boriack <mboriack@sito.saic.com> provided patches which
-          adds an <avoid_zombies_> data member to ACE_Process_Options,
-          appropriate accessor functions, and changes the ACE_OS::fork
-          call to ACE::fork in ACE_Process::spawn, making use of the
-          option.  The default behavior is left unchanged, i.e., you get
-          zombies.  Thanks Mark.
-
-Fri May 21 10:34:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/gethrtime.cpp,Makefile (gethrtime on Green
-          Hills/VxWorks): reverted to building gethrtime.cpp with g++, because
-          the ghs assembly code didn't work properly.
-
-Fri May 21 10:10:13 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ACE-INSTALL.html: Updated information about building egcs' C++
-          shared libraries with an example, and emphasized the fact that
-          the `--enable-shared' configuration option is not an egcs
-          run-time option.  Thanks to Wallace Owen <owen@visicom.com> for
-          motivating this.
-
-Fri May 21 09:15:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h:
-          Added ACE_HAS_NONCONST_SELECT_TIMEVAL here too
-
-Fri May 21 07:53:58 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-vxworks5.x.h, config-osf1-4.0.h: Added
-          ACE_HAS_NONCONST_SELECT_TIMEVAL.
-
-Thu May 20 18:01:24 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Filecache.cpp: Added "template<>" to specializations.
-
-        * ace/OS.i (ACE_OS::select, ACE_OS::sleep): Removed implicit
-          dependency on binary object layout with regard to using an
-          ACE_Time_Value object as a struct timeval; use the timeval*
-          operator instead.  On platforms with ACE_HAS_NONCONST_SELECT_TIMEVAL
-          don't just cast away const-ness of the ACE_Time_Value - modification
-          of the timeval by select() is not consistent, and Linux is not the
-          only one that modifies it (Solaris 7 does also, as well as AIX and
-          possibly HP; Solaris 2.5/6 don't specify).  So, play it safe.
-          Inlining and optimization should prevent this from having any
-          affect on performance.
-
-        * ace/config-sunos5.5.h, config-hpux-10.x.h, config-aix-4.x.h:
-          Added #define ACE_HAS_NONCONST_SELECT_TIMEVAL.
-
-Thu May 20 17:47:35 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.h (ACE_DES_ARRAY_FREE_*): Added new macros to facilitate
-          proper destruction of arrays.
-
-        * ace/Containers_T.cpp (ACE_Array_Base): Changed ACE_Array_Base to
-          use the new ACE_DES_ARRAY_FREE_* macros in order to prevent the
-          memory leaks.
-
-Thu May 20 17:46:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp: Fixed Alpha configurations.  Thanks to
-          Christian Schuderer <Christian.Schuderer@erl9.siemens.de> for
-          reporting this.
-
-Thu May 20 15:35:23 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/TkReactor_Test.cpp:
-          It was not compiling if ACE_HAS_TK was not defined.
-
-Thu May 20 15:33:21 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_ghs.GNU:
-          added (and default to) LIBS for Green Hills 1.8.9.
-
-Thu May 20 14:34:59 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: with Green Hills only, added
-          ACE_LACKS_ACE_IOSTREAM.  ACE's IOStream_Test never halts
-          when built with Green Hills 1.8.9.
-
-Thu May 20 14:21:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i: (t_getname): fixed comment after #endif, to
-          agree with the #ifdef.
-
-Thu May 20 13:51:20 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-win32-common.h: I forgot to put '/**/' between
-          #include and <blah.h> which caused MSVC to generate warnings
-          when checking file dependencies.  Thanks to Christian Schuderer
-          <Christian.Schuderer@erl9.siemens.de> for reporting this.
-
-Thu May 20 13:52:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: build with threads if
-          _POSIX_C_SOURCE >= 199506L or #ifdef _POSIX_PTHREAD_SEMANTICS.
-          Added #define ACE_LACKS_RWLOCK_T if _POSIX_PTHREAD_SEMANTICS
-          is #defined (and therefore ACE_HAS_STHREADS is not #defined).
-          The rwlock functions are a Solaris threads interface, and
-          are not POSIX.
-
-        * include/makeinclude/platform_sunos5_ghs.GNU: default to
-          building without threads support, because Green Hills 1.8.9
-          is incompatible with the SunOS threads libraries.
-
-Thu May 20 12:12:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp},Sched_Params.cpp: with ACE_HAS_PRIOCNTL,
-          moved #include of sys/{rt,ts}priocntl.h from OS.cpp and
-          Sched_Params.cpp to OS.h, so that USYNC_THREAD and USYNC_PROCESS
-          #defines can be protected effectively.
-
-Thu May 20 11:19:45 1999  Joe Hoffert <joeh@cs.wustl.edu>
-
-        * ace/ATM_Addr.cpp: Added ACE_UNUSED_ARG for selector parameter
-          when appropriate.
-
-Thu May 20 09:57:57 1999  Bill Rizzi <rizzi@softserv.com>
-
-        * ace/Log_Msg.{h,cpp},examples/Log_Msg/test_log_msg.cpp
-          (priority_mask): added optional support for process priority
-          mask, in addition to the (now default) thread priority mask.
-
-Thu May 20 09:42:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h (fcntl): changed type of last argument from int to
-          long, to permit safer casting from pointer types.
-
-        * ace/OS.i (flock_*): use ACE_OS::fcntl instead of ::fcntl.
-
-        * ace/OS.cpp (ftruncate): use ACE_OS::fcntl instead of ::fcntl.
-
-        Thanks to Joe Golio <Joe.Golio@xylan.com> for reporting that
-        these functions weren't using ACE_OS::fcntl.
-
-Wed May 19 23:50:18 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * ace/TkReactor.{h,cpp}:
-        * ace/Makefile:
-          Added a new reactor implementation based on the Tcl/Tk Event
-          loop and event handling mechanism.
-
-        * ace/tests/TkReactor_Test.{cpp,tcl}:
-        * ace/tests/Makefile:
-          The Tk Reactor test and the tcl script for the GUI. This is
-          similar to the XtReactor_Test.
-
-        * ace/include/makeinclude/wrapper_macros.GNU:
-        * ace/include/makeinclude/platform_sunos5_sunc++.GNU
-          Added changes to Makefile flags for XtReactor.
-
-Wed May 19 21:56:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Message_Queue.h: fixed typo in comment: interrupt.
-
-Wed May 19 21:34:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_4.0.GNU:  removed these
-          warning suppressions:
-          174: expr_has_no_effect
-          610: nonoverriding_function_decl
-          They're certainly not needed with cxx 6.2-020, and
-          hopefully not needed with earlier versions.
-
-Wed May 19 10:52:15 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/DLL/test_dll.cpp (main): Fixed auto pointer use.  It
-          was causing "Temporary used for non-const reference" warnings.
-
-Wed May 19 10:04:54 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/SString.i:
-          Changed the default constructor to set rep_ to the
-          empty string instead of the null string. Thanks to
-          Knut Johannessen <knutj@funcom.com> for pointing
-          this out.
-
-Wed May 19 06:34:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-minimal.h: added #define ACE_USE_THREAD_MANAGER_ADAPTER,
-          so that ACE_Thread_Exit isn't needed in the ACE_OS layer.
-
-Tue May 18 22:03:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_4.0.GNU,platform_osf1_cxx.GNU:
-          removed suppression of warning 9 (nested comment not allowed) on
-          Digital Unix 5.0 and later.
-
-Tue May 18 15:01:39 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp: Added #include "ace/SString.h" to catch def for
-          ACE_Tokenizer in Winsock 1.1 mode.
-
-Tue May 18 13:30:55 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * include/makeinclude/rules.nested.GNU: FOR is not an excutable on
-          Win32, therefore, we must bring in the command processor in to
-          use FOR.  Thanks to David Hooker <DHooker@uniview.net> for
-          reporting the bug.
-
-Tue May 18 11:46:55 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/FILE_Connector.h: Changed the default perms from 0 to
-          ACE_DEFAULT_FILE_PERMS.
-
-Tue May 18 11:28:32 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: forced
-          ACE_TLI_Stream's recv method to call ACE_OS::t_rcv rather than
-          ACE_OS::read to be compatible with XTI.
-
-Tue May 18 11:00:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Task_T: Moved the ACE_Buffered_Task logic out of the Task
-          abstraction since it doesn't belong there.
-
-        * ace/Makefile: Regenerated the dependencies.
-
-        * ace/FlReactor.cpp: We should be including <FL/Fl.h> rather than
-          "FL/Fl.h".
-
-Tue May 18 10:42:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_4.0.GNU: removed
-          suppression of warning 1180, statement causes unreachable
-          return, because it's no longer necessary.
-
-Tue May 18 10:38:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp: replaced Hash_Map_Manager
-          with a simple array.  This avoids dynamic allocation in
-          the signal handler.  And, it avoids having to specialize
-          ACE_Hash<ACE_hthread_t> on platforms that have a pthread_t
-          struct.
-
-Tue May 18 09:33:46 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/FILE_IO: Added new sendv()/recvv() and sendv_n()/recvv_n()
-          methods to be consistent with SOCK_IO and SOCK_Stream.
-
-        * ace/SOCK_IO.cpp (recvv): Make sure to 0-out the iov_base so that
-          it's always ok to delete it, even if any of the internal
-          operations fail!
-
-Tue May 18 10:14:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Makefile:
-        * ace/FlReactor.h:
-        * ace/FlReactor.i:
-        * ace/FlReactor.cpp:
-        * include/makeinclude/platform_linux_lxpthread.GNU:
-        * include/makeinclude/wrapper_macros.GNU:
-        * tests/Makefile:
-        * tests/FlReactor_Test.cpp:
-          Added new reactor implementation based on the event loop of the
-          Fast-Light toolkit, similar to the XtReactor.
-          FLTK is a GUI toolkit that works on UNIX/X-Windows and on Win32,
-          it is integrated to OpenGL and is pure C++.
-          Check http://fltk.easysw.org for more details.
-
-Tue May 18 09:35:00 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.{h,cpp},Makefile:
-          removed Thread_Manager_Test.h.
-
-Mon May 17 22:39:06 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp: added a couple more
-          explicit template instantiations.  Thanks to Carlos
-          for reporting that they're needed on Irix.  And,
-          added an ACE_Hash<ACE_hthread_t> specialization to
-          keep DU cxx happy.
-
-Mon May 17 16:31:16 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Task_T.cpp,
-          ace/OS.h: Removed ACE_DEFAULT_WRITEV_MAX and replaced it
-          with IOV_MAX.
-
-Mon May 17 15:49:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * config-dgux-4.x-ghs.h,config-vxworks5.x.h,config-ghs-common.h:
-          factored ACE_LACKS_SIGNED_CHAR to config-ghs-common.h.
-
-        * config-dgux-4.x-ghs.h: removed ACE_LACKS_ACE_IOSTREAM.
-          It should work now, though we don't have that platform
-          to verify it.
-
-Mon May 17 15:08:45 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CORBA_macros.h:
-          Fixed implementation of the ACE_READ_GUARD_THROW_EX and
-          ACE_WRITE_GUARD_THROW_EX macros.
-
-Mon May 17 15:12:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * test/Thread_Manager_Test.cpp: use a hash map, instead of
-          TSS, to store each thread's indication of whether it has
-          been signalled.  That way, the signal handler doesn't have
-          to access TSS.  Increased the delay from 1 to 2 seconds after
-          the signal test, which also seems to help avoid thread lib
-          panics on Solaris.
-
-Mon May 17 14:02:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (handler): added comment saying that even
-          the ACE_OS::exit () call isn't safe.
-
-Mon May 17 10:31:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Repository.cpp (find_i): A missing pointer check was
-          causing the remove method to segfault.  Thanks to Tom Arbuckle
-          <arbuckle@uran.informatik.uni-bonn.de> for pointing this out.
-
-Mon May 17 10:21:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/TSS_Test.cpp: removed the signal handler.  It
-          wasn't used for the test, and contained an ACE_DEBUG.
-
-Mon May 17 10:12:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-chorus.h,config-dgux-4.x-ghs.h,config-sunos5.5.h,
-          config-vxworks5.x.h,config-ghs-common.h:
-          factored out Green Hill-specific #defines to config-ghs-common.h.
-
-Mon May 17 09:07:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (handler): commented out unused arg
-          "signum".
-
-Sun May 16 20:38:58 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CDR_Stream.{h,i} (current): Added this accesor function for
-          Flick IDL compiler.  Thanks to Tim Stack <stack@aros.net> for
-          recommending this.
-
-Sun May 16 20:08:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Thread_Manager_Test.cpp (handler,worker):
-          moved ACE_DEBUG out of signal handler.  It was
-          causing occasional lockups on SunOS.  Signal
-          handlers must never do anything that could cause
-          a lock to be acquired.
-
-        * tests/Conn_Test.cpp (handler): removed ACE_DEBUG.
-
-Sun May 16 20:04:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: moved #include of ace/Trace.h to before #include of
-          ace/OS.i.
-
-        * ace/OS.{i,cpp}: enabled ACE_TRACE for most functions (except
-          those that are used by ACE_TRACE).
-
-Sun May 16 19:54:10 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/config-sunos5.7.h: Comments
-        * ace/config-sunos5.6.h: Comments
-
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/POSIX_Proactor.h:
-        * ace/POSIX_Proactor.cpp: - Using ACE_dynamic_cast to get
-        <ACE_POSIX_Asynch_Result *> from <aiocb *> gives build errors on
-        egcs. <ACE_reinterpret_cast> is not the correct solution for
-        this. Solved this problem by having one more list of
-        <ACE_POSIX_Asynch_Result *> so that we dont have to do any
-        casting.
-        * ace/Proactor.cpp (ACE_Proactor): Indentation.
-        * examples/Reactor/Proactor/post_completions.cpp: Added template
-        pragma's.
-
-Sun May 16 18:35:59 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.39 released.
-
-Sun May 16 12:34:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Log_Msg.cpp (ACE_Log_Msg_Manager::lock_): changed
-          the lock type from ACE_Thread_Mutex to
-          ACE_Recursive_Thread_Mutex.  This allows ACE_Log_Msg's
-          methods to be called after calling ACE_Log_Msg::acquire (),
-          without deadlock.  Thanks to Bill Rizzi <rizzi@softserv.com>
-          for suggesting this.
-
-Sat May 15 08:30:43 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Containers.h: added #include of ace/Malloc_Base.h.
-          It's needed for the definition of ACE_Allocator when
-          instantiating container classes.
-
-Sat May 15 03:32:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CDR_Stream.h: Added #include of ace/SString.h.
-
-Fri May 14 23:05:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Log_Record.h: removed unnecessary #include of ace/SString.h.
-
-Fri May 14 21:11:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Task_T.h:
-        * ace/Task_T.cpp:
-          Fixed syntax errors in ACE_Buffered_Task
-
-Fri May 14 21:03:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * netsvcs/lib/Log_Message_Receiver.cpp:
-          Changed ACE_Guard instantiations with ACE_GUARD() macros to
-          avoid some warnings with egcs, similar to the problem that David
-          had with Message_Queue_T.cpp
-
-Fri May 14 19:31:04 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Message_Block.cpp (total_size):
-
-          Corrected warning caused by assignment to non-const from const.
-
-        * ace/Message_Queue_T.cpp (close):
-
-          Temporary variable wasn't declared.
-
-        * ace/Message_Queue_T.cpp (remove_messages):
-
-          Removed unused variable.
-
-Fri May 14 19:16:06 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Task_T.cpp (put, flush):
-
-          Corrected syntax errors where return type was placed before
-          template keyword.
-
-Fri May 14 16:46:42 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Task_T: Added a new class called ACE_Buffered_Task that
-          buffers up its ACE_Message_Blocks until (1) the buffer is full
-          or (2) a timeout elapses, at which point the buffers are written
-          out using some type of writev()-like mechanism.
-
-        * ace/OS.h: Added a new macro called ACE_DEFAULT_WRITEV_MAX, which
-          defaults to the maximum value that writev() can have.
-
-        * ace/Message_Block.cpp: Added a new method called total_size()
-          that returns the total number of bytes in a composite
-          Message_Block (i.e., a Message_Block that has a chain of
-          Message_Blocks).
-
-        * ace/Message_Queue_T.cpp: Reimplemented all the hand-coded loops
-          to use the new ACE_Message_Block::total_size() method.
-
-Fri May 14 16:17:27 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Synch.h (ACE_Null_Mutex>): Conditionally compiles ~ACE_Guard()
-          destructor.  Win32 needs this definition.
-
-Fri May 14 16:10:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Message_Queue_T.cpp: replaced raw ACE_Read_Guards
-          with ACE_READ_GUARD_RETURN macros.  That avoids a compiler
-          warning (egcs 1.1.1/SunOS 5.7) now that the ACE_Guard<Null_Mutex>
-          destructor has been removed.  Thanks to Irfan and Carlos
-          for suggesting this fix.
-
-Fri May 14 15:35:50 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/ACE.cpp (clr_flags and set_flags): We should use ioctl()
-          calls to implement on vxworks this rather than fcntl().  Thanks
-          to Joseph A. Condlin <jac@slpmbo.ed.ray.com> for reporting this.
-
-Fri May 14 13:15:02 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * examples/IPC_SAP/TLI_SAP/Makefile: Took out FORE specific
-          information. Somehow my local changes got checked in - this is
-          to undo that.
-
-Fri May 14 12:58:02 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * ace/ATM_Addr.h:
-        * ace/ATM_Addr.i:
-        * ace/ATM_Addr.cpp: Added accessor methods for the selector byte
-          of an ATM address.
-
-        * examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp:
-        * examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp: Modify example code
-          to have the user optionally specify the selector byte.
-
-Fri May 14 12:47:38 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Addr.cpp,ace/Synch_Options.cpp: added comments about
-          the static objects.
-
-Fri May 14 11:36:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/SString.h:
-        * ace/SString.i: Added new class to auto destroy dynamically
-          allocated strings, sort of a mixing between auto_ptr and
-          CString.  Auto_Ptr_Array was not useful because we need to free
-          using ACE_OS::free() (and in the future allocators).
-
-Fri May 14 10:37:49 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Fixed a deadlock in cond_timedwait()/cond_broadcast().
-          Thanks to Brian C. Olson <bolson@rtlogic.com> for reporting
-          this.
-
-        * ace/Synch.h (ACE_Null_Mutex>): Commented out the ~ACE_Guard()
-          destructor to prevent segfaults on certain versions of SunC++.
-          Thanks to Russ Noseworthy for reporting this bizarre bug!
-
-Fri May 14 09:51:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Message_Block.h:
-        * ace/Message_Block.cpp:
-          Modified default constructor and constructor taking a Data_Block
-          to also take an Allocator.
-
-Fri May 14 09:14:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_cxx.GNU:
-          added $(ACELIB) to SOFLAGS for DU 5.x.  It should
-          have been there all along.
-
-Thu May 13 17:27:14 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * netsvcs/servers/svc.conf:
-        * netsvcs/clients/Naming/Client/svc2.conf:
-        * netsvcs/clients/Naming/Client/svc2.conf: Removed relative paths
-          from all DLL's.  They were hard-coded which was not portable.
-          ACE should figure out the correct path automatically.
-
-        * netsvcs/lib/Name_Handler.cpp: Replaced several calls to
-          ACE_WString::rep with ACE_WString::fast_rep to avoid memory
-          leaks.  Thanks to Valery Arkhangorodsky
-          <valerya@servicesoft.com> for reporting this.
-
-        * ace/Registry.cpp (close): Only close <key_> when we do own a
-          key.
-
-        * netsvcs/lib/Name_Handler.cpp (resolve): The atype string needs
-          to be delete[]'ed once we are done with it.  Thanks to Valery
-          Arkhangorodsky <valerya@servicesoft.com> for pointing this out.
-
-Thu May 13 09:39:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Makefile: added Tokens_Test to BIN2 if Tokens component
-          is not configured in.  This ensures that Tokens_Test gets
-          cleaned up, even if the ace directory was realcleaned first
-          (and ACE_BUILD_COMPONENTS is therefore empty).
-
-Thu May 13 07:24:41 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/POSIX_Proactor.cpp (handle_events): replaced
-          incorrect dynamic_cast with a reinterpret cast.
-
-Wed May 12 17:42:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Message_Block.h:
-        * ace/Message_Block.cpp:
-          The message blocks can be obtained from an allocator now. Thanks
-          to John Aughey <Aughey@concentric.net> for this cool feature.
-
-Wed May 12 16:24:17 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/Proactor/Makefile:
-        * examples/Reactor/Proactor/test_proactor.cpp:
-        * ace/POSIX_Proactor.cpp:
-        * ace/POSIX_Proactor.h:
-        * ace/Proactor.cpp :
-        * ace/POSIX_Asynch_IO.cpp: Fixed the problem with terminating the
-          Timer thread. Also, fixed the places where conversion between
-          void * and ACE_POSIX_Asynch_Result. Used ACE_reinterpret_cast at
-          these places.
-
-Wed May 12 12:14:09 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * COPYING: Additional updates/clarifications suggested by Richard
-          Stallman.
-
-Wed May 12 00:25:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Thread_Manager.h (ACE_Thread_Manager): Added clarification
-          for the semantics differences among wait(), wait_grp() and
-          wait_task().
-
-Tue May 11 18:11:51 1999  James C. Hu <jxh@entera.com>
-
-        * ace/config-sunos5.7.h: SunOS 5.7 (aka Solaris 7) does not have a
-          limited select.
-
-Tue May 11 17:11:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (spawn_threads): changed some ACE_NEW
-          statements to ACE_NEW_RETURN.
-
-Tue May 11 15:43:30 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: added ACE_THR_PRI_OTHER_DEF for NT, because MT_Cubit
-          uses it.
-
-Tue May 11 14:45:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp: fixed use of status on platforms that lack
-          fork.
-
-Tue May 11 14:10:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-osf-4.0.h: added #define of
-          ACE_NEW_THROWS_EXCEPTIONS, if exception handling is enabled.
-
-        * tests/New_Fail_Test.cpp: removed workaround for DEC cxx, and
-          modified error message to mention ACE_NEW_THROWS_EXCEPTIONS.
-
-Tue May 11 12:02:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-win32-common.h: set __ACE_INLINE__ to 1 if not
-          #defined.  It's scary when I trip over syntax errors on Win32
-          :-)
-
-Tue May 11 10:00:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/OS.i: fixed name of unused argument for pSOS
-
-        * ace/RB_Tree.{cpp, h}: moved enumerated type from template to
-          non-templatized base class to make old g++ happy.
-
-Mon May 10 22:59:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/wrapper_macros.GNU: don't set VDIR to
-          .shobj/ for VxWorks, because it uses the same .o files for
-          static and shared libs.
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU: disable RTTI
-          for egcs, because the Tornado 1.0.x libs don't support it.  No
-          harm in disabling for old g++.
-
-Mon May 10 15:33:56 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/INET_Addr.cpp (string_to_addr): Fixed a mistake that
-          occurred when integrating Jerry D. De Master
-          <jdemaste@ipdinc.com> fix.  Thanks to Zoran and Jerry for
-          reporting this.
-
-Mon May 10 15:00:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ACE-INSTALL.html: Changed to use ACE_NO_INLINE to supress
-          inlining to match with the recent dsp file changes.  Added a
-          link to Barry Hoggard's CORBA page which contains ACE related
-          MSVC setting hints.
-
-        * ace/Select_Reactor_Base.cpp (unbind): We need to make sure the
-          reactor's suspend_set_ also gets cleaned up when unbinding a
-          handler.  Thanks to Casey Lucas <clucas@sabre.com> for pointing
-          this out.
-
-Mon May 10 17:08:29 1999  James C. Hu <jxh@entera.com>
-
-        * ace/ACE.cpp:
-        * ace/config-sunos5.6.h:
-        * ace/README: Added support to enter_recv_timedwait,
-          enter_send_timedwait, handle_timed_complete, and
-          handle_timed_accept to use poll() instead of select() if poll()
-          is available and select() is known to have problems.  Created
-          ACE_HAS_LIMITED_SELECT macro.  Certain versions of SunOS 5.6 do
-          not correctly select on file descriptors that are larger than
-          1023.
-
-Mon May 10 13:32:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (spawn_threads): wait a maximum of 200
-          seconds.  Carlos reported that the test sometimes hangs on Irix.
-
-Mon May 10 12:14:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.cpp: fixed a dangling pointer bug in
-          RB_Tree::delete_fixup.  Added pointer tests to all dereferences
-          in this piece of code.
-
-Mon May 10 11:35:18 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * COPYING: Made some updates suggested by Richard Stallman
-          <rms@gnu.org> of the Free Software Foundation
-          (http://www.fsf.org/).
-
-Mon May 10 11:01:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/New_Fail_Test.cpp: DEC cxx catches its default,
-          NoNamedException.  OK, I guess.
-
-        * tests/Upgradable_RW_Test.cpp: added -f option, which enables
-          FIFO thread scheduling.  Some platforms require superuser
-          privilege to use it.  Also, wait a maximum of 1 second per
-          iteration.  And, replaced some u_longs with u_ints.
-
-        * tests/Thread_Manager_Test.cpp (main): wait a maximum of 60
-          seconds, because the test sometimes hangs on SunOS 5.5.1 and
-          SunOS 5.7.
-
-Mon May 10 08:26:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/g++dep: added support for our Solaris 7 machines.
-
-Sun May  9 18:07:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * configure.in: Added support/tests for
-          ACE_LACKS_CHAR_RIGHT_SHIFTS and
-          ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS.
-
-        * ace/README: Fixed typo.  ACE_LACKS_LINEBUFFERED_STREAMBUF was
-          used twice.  Corrected the appropriate one to
-          ACE_LACKS_UNBUFFERED_STREAMBUF.
-
-Sun May 09 11:45:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.cpp added explicit scoping to RB_SearchResult
-          parameter in RB_Tree<...>::find_node ().
-
-Sun May 09 11:30:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/Makefile
-          examples/Connection/non_blocking/Makefile
-          examples/IPC_SAP/SPIPE_SAP/Makefile
-          examples/IPC_SAP/TLI_SAP/Makefile
-          examples/Reactor/Misc/Makefile
-          examples/Service_Configurator/IPC-tests/client/Makefile
-          examples/Service_Configurator/IPC-tests/server/Makefile
-          netsvcs/lib/Makefile
-          netsvcs/servers/Makefile
-          tests/Makefile: ran make depend after adding new RB_Tree
-          interface.
-
-Sat May 08 19:30:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.{cpp, h, i}
-          tests/RB_Tree_Test.cpp: finished implementing all methods for
-          the ACE_Hash_Map_Manager_Ex compliant interface, fixed a bug in
-          the internal tree search method (thanks to David Levine for
-          pointing this out), and added a new section to the test that
-          exercises the new bind and unbind methods.
-
-Sat May 08 17:09:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * apps/Gateway/Gateway/Event_Channel.cpp (bind_proxy,subscribe):
-          wrapped final return statement with ACE_NOTREACHED, to please DU
-          cxx 6.2.
-
-Sat May 08 08:49:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/CDR_Stream.h: only use unsigned long for Boolean with Green
-          Hills 1.8.8 on Chorus, not 1.8.9.
-
-        * ace/IOStream.h,README: added ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
-          and ACE_LACKS_CHAR_RIGHT_SHIFTS support.
-
-        * ace/config-chorus.h: added ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
-          #define for g++.
-
-        * ace/config-vxworks5.x.h: added ACE_LACKS_CHAR_RIGHT_SHIFTS
-          #define for Green Hills 1.8.9.
-
-Sat May 08 08:44:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.{cpp, h, i}
-          tests/RB_Tree_Test.cpp
-          apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp: Added more
-          implementation code and necessary template instantiations for
-          migration of RB_Tree class templates to conform to the
-          ACE_Hash_Map_Manager API.
-
-Sat May 08 03:59:52 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-win32-common.h: Re-ordered __ACE_INLINE__ macro check
-          and definition so users can turn of inlining correctly.
-          However, the right thing to do is to define ACE_NO_INLINE macro.
-
-        * ace/ace_{dll,lib}.dsp: Moved RB_Tree.cpp to template folder and
-          excluded it from being built.
-
-        * ace/ace_lib.dsp:
-        * performance-tests/Misc/basic_perf.dsp:
-        * performance-tests/Misc/context_switch_time.dsp:
-        * tests/version_tests/*.dsp: We should have used ACE_NO_INLINE
-          instead of defining __ACE_INLINE__=0 to supress the use of
-          inlining.  Thanks to Nick Sawadsky
-          <Nick_Sawadsky@BrooksSoftware.com> for reporting this.
-
-Fri May 07 23:05:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-vxworks5.x.h: added ACE_LACKS_LINEBUFFERED_STREAMBUF
-          for Green Hills 1.8.9.
-
-        * ace/README: added ACE_LACKS_LINEBUFFERED_STREAMBUF.
-
-Fri May  7 19:39:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Message_Block_T.i: Found little buf in
-          ACE_Locked_Data_Block<> default constructor.
-
-Fri May 07 16:54:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.{cpp, h, i}: Reorganized and optimized internal
-          methods, added read and write guards, implemented all public
-          find and unbind methods for the interface comparable to
-          ACE_Hash_Map_Manager_Ex.
-
-Fri May 07 14:40:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_cxx.GNU: added, to support
-          uniform use of cxx across different OS versions.
-
-        * ace/config-osf1-4.0.h: conditionally #define DIGITAL_UNIX, to
-          support definition in CFLAGS.
-
-        * ace/config-osf1.h: added, to support easy migration to DU 5.0.
-
-Fri May 07 11:00:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: OK on RedHat 6.0 Linux.
-
-Fri May 07 08:58:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,i}: added some QNX support.  In OS.i, this mostly
-          consisted of adding a !defined (ACE_LACKS_MUTEXATTR_PSHARED)
-          check to _POSIX_THREAD_PROCESS_SHARED.  Thanks to Alain Magloire
-          <alain@qnx.com> for providing this support.
-
-Thu May  6 21:48:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * configure.in:
-        * ace/OS.h:
-        * ace/README:
-        * ace/config-hpux11.h:
-        * ace/config-irix6.x-g++.h:
-        * ace/config-irix6.x-kcc.h:
-        * ace/config-irix6.x-sgic++.h:
-        * ace/config-linux-lxpthreads.h:
-        * ace/config-osf1-4.0.h:
-        * ace/config-sco-5.0.0-mit-pthread.h:
-        * ace/config-sunos5.5.h: Removed all references to
-          ACE_HAS_PTHREAD_SIGMASK.  This macro has been deprecated.
-
-Thu May  6 20:12:57 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * configure.in: Added tests/support for ACE_LACKS_PTHREAD_SIGMASK,
-          ACE_LACKS_TCP_NODELAY and ACE_LACKS_NULL_PTHREAD_STATUS.  Thanks
-          to David for providing a test for ACE_LACKS_NULL_PTHREAD_STATUS.
-
-Thu May 06 14:26:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/README,ace/Pipe.cpp (open): added support for
-          ACE_LACKS_TCP_NODELAY.  Thanks to Alain Magloire <alain@qnx.com>
-          for providing the patch.
-
-Thu May  6 14:23:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Synch_T.cpp: Removed ACE_ALLOC_HOOK_DEFINE macros for the
-          Guard<> objects, they don't need them (because they are
-          allocated on the stack) and the HOOK_DECLARE macros where not
-          used in the header file.
-
-        * bin/count_lines: Several new file types, fixed computations when
-          multiple modules are used.
-
-Thu May 06 12:28:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-FMM.html: replaced a > with &gt; and added RCS Id
-          string.
-
-        * ACE-INSTALL.html: added link to docs/ACE-FMM.html.
-
-Thu May 06 12:23:51 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.i (recvv, sendv): Added code to make these functions work
-          on Win32 w/ Winsock 1.1.
-
-Wed May 05 15:10:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: added ACE_U_ONE_SECOND_IN_*SECS.  They're typed and
-          unsigned.  The old ACE_ONE_SECOND_IN_*SECS macros are retained
-          for backward compatibility.
-
-Wed May  5 13:58:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i: Don't use poll() for the implementation of
-          ACE_OS::sleep(), it has bad resolution and it gives wrong
-          results on Linux.
-
-        * tests/High_Res_Timer_Test.cpp: Added new option to run several
-          iterations of each interval.
-
-Wed May 05 13:14:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp: Removed DllMain - Win32 does not have the gusto to
-          handle the initialization/finalization in this way. It causes
-          DLL dependency problems which result in early detachment of
-          winsock, and possible network data loss in some cases.
-
-        * ace/OS.cpp, Object_Manager.cpp: Clarified some comments
-          regarding multiple ACE_OS_Object_Manager and ACE_Object_Manager
-          objects in existence and how they're handled.
-
-        * tests/ACE_Init_Test.cpp: Always does ACE::init and ACE::fini
-          now.  This is one example of how to handle a non-console program
-          in Win32.
-
-Wed May 05 13:07:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/Makefile: replaced /bin/rm with $(RM) and removed clean
-          pseudotarget.
-
-Tue May 04 20:38:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * tests/RB_Tree_Test.cpp: Added missing explicit template
-          instantiations for ACE_RB_Tree_Iterator_Base.  Thanks to Carlos
-          O'Ryan for reporting this.
-
-        * include/makeinclude/platform_psos_diab_ppc.GNU: added -g flag
-          back into debug flags since it can easily be deactivated via
-          make debug=0.
-
-1999-05-04  Seth Widoff  <swidoff@cs.cmu.edu>
-
-        * ace/Containers_T.cpp (ACE_Array_Base<T>::max_size): When
-          resizing the array to be larger, the max_size method was copying
-          in the contents of the older, smaller array, but not
-          initializing the new elements.
-
-Tue May  4 17:37:30 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Web_Crawler/Options.cpp (parse_args): Change the
-          default options from "www.cs.wustl.edu" to "tao.cs.wustl.edu".
-
-Tue May 04 16:24:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.{cpp, h, i}: Added deprecation comments to methods
-          that are going to be replaced by the new Hash_Map_Manager
-          compliant interface.  Factored out iterator base class, added
-          reverse iterator.  Interim checkin since it all compiles and
-          RB_Tree_Test runs clean.
-
-Tue May 04 15:56:41 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp: Re-enabled DllMain (see Mon May 3 entry from Chris
-          Gill).
-
-        * ace/OS.cpp, Object_Manager.cpp: In ACE_OS_Object_Manager and
-          ACE_Object_Manager, differentiate between The singleton instance
-          and other instances when allocating and freeing per-process
-          information.
-
-        * tests/run_tests.bat: Added ACE_Init_Test.
-
-Mon May  3 18:04:32 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/Proactor/test_aiocb_ace.cpp: Added this
-          file. If this test is sucessful, ACE_POSIX_AIOCB_PROACTOR could
-          be defined for a platform.
-
-Mon May 03 09:35:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/RB_Tree.cpp: fixed bug in ACE_RB_Tree::RB_delete_fixup in
-          which a null pointer was dereferenced while trying to determine
-          the color of the node that was being pointed to.  Per the RB
-          Tree discussion in Cormen Lieserson and Rivest's "Introduction
-          to Algorithms", after which this implementation is modeled, a
-          nil node is implicity treated as having been colored BLACK.
-          Thanks to Long Hoang <LHoang@hwdcsaws.cahwnet.gov> for reporting
-          the problem and providing a test program that showed the bug.
-
-Mon May 03 15:53:15 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU,
-          tests/run_tests.vxworks,ACE-INSTALL.html: added support for
-          shared lib builds.  Thanks to Ramiro Penataro Blanco
-          <penataro@ll.iac.es> and James D. Rucker
-          <jdrucker@huey.jpl.nasa.gov> for figuring this out, and
-          providing detailed instructions for others to follow.
-
-Mon May 03 15:20:00 1999 Kirthika Parameswaran  <kirthika@bambuca.cs.wustl.edu>
-
-        * examples/Web_Crawler/main.cpp:
-        * examples/Web_Crawler/Web_Crawler.{h,cpp}:
-        * examples/Web_Crawler/Cached_Connect_Strategy_T.{h,i,cpp}:
-        * examples/Web_Crawler/Caching_Strategies_T.{h,i,cpp}:
-        * examples/Web_Crawler/Command_Processor.{h,cpp}:
-        * examples/Web_Crawler/HTTP_URL.{h,cpp}:
-        * examples/Web_Crawler/Iterators.{h,cpp}:
-        * examples/Web_Crawler/Mem_Map_Stream.{h,cpp}:
-        * examples/Web_Crawler/Optimal_Cache_Map_Manager_T.{h,i,cpp}:
-        * examples/Web_Crawler/Options.{h,cpp}:
-        * examples/Web_Crawler/URL.{h,cpp}:
-        * examples/Web_Crawler/URL_Addr.{h,cpp}:
-        * examples/Web_Crawler/URL_Status.{h,cpp}:
-        * examples/Web_Crawler/URL_visitor.{h,cpp}:
-        * examples/Web_Crawler/URL_Visitor_Factory.{h,cpp}:
-        * examples/Web_Crawler/Makefile
-        * examples/Web_Crawler/README
-
-         This example is a HTTP client which crawls over the link provided
-         and checks whether the links recusively are valid or not.
-         This example was used to test teh auto-purging feature where the
-         connections are removed from the connection cache when the process
-         runs out of file descriptors.
-
-Mon May 03 14:46:28 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/ACE_Init_Test.dsp: Fixed to build on all configurations (for
-          Intel anyway).
-
-Mon May 03 10:30:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.38 released.
-
-Mon May  3 09:56:06 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/INET_Addr.cpp (get_host_name): Make sure to check if
-          get_host_name() fails and do something useful in this case.
-          Thanks to Frank O'Dwyer <fod@brd.ie> for reporting this.
-
-Mon May 03 09:35:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/ACE.cpp: disabled BOOL APIENTRY DllMain(HANDLE hModule,
-          DWORD ul_reason_for_call, LPVOID lpReserved) by having it
-          just return TRUE.  This function is used only on NT.  This
-          is a temporary workaround for the problem of tao_idl
-          crashing on NT, and will be replaced ASAP with a more
-          complete fix to Object Manager initialization/cleanup at
-          DLL load/unload time on NT.  Thanks to David Levine for
-          suggesting this fix.
-
-Mon May 03 09:27:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: added guideline to put
-          spaces around comment delimiters.  Thanks to Chris
-          Gill for suggesting this.
-
-Sun May 02 14:36:43 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: Added ghs back to the list of compilers for which
-          ACE_NOTREACHED disappears.  It was causing warnings for
-          many ACE and TAO files.
-
-Sun May 02 08:21:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (pthread_sigmask): added ACE_UNUSED_ARGs to
-          NOTSUP case.
-
-        * ace/OS.i (pthread_sigmask),ace/config-chorus.h,ace/README:
-          added ACE_LACKS_PTHREAD_SIGMASK.
-
-Sat May 01 17:33:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp,Object_Manager.cpp: reverted this change because
-          it causes a seg fault on NT:
-
-        Thu Apr 29 13:41:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/{OS.cpp Object_Manager.cpp}: Fixed leaking ACE_Object_Manager
-          when config has #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0.
-
-Sat May 01 12:06:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ACE.cpp:
-        * ace/config-win32.h:  Reverted my previous change.  I didn't
-          notice David had already fixed it.  Thanks David.
-
-Sat May 01 01:48:29 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/ACE.cpp (DllMain): Only use DllMain to control
-          Object_Manager's lifecycle when
-          ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER is
-          defined and we are building ACE as a DLL.
-
-        * ace/config-win32.h: Defining
-          ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER =1, when
-          compiling DLL version of ACE will cause then ACE::init/fini be
-          called automatically for you in DllMain when ACE gets linked
-          in/unlinked.
-
-          Defining ACE_USES_DLL_TO_MANAGE_THE_LIFECYCLE_OF_OBJECT_MANAGER
-          =1 automatically define ACE_HAS_NONSTATIC_OBJECT_MANAGER to 1
-          and define ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER.
-
-Fri Apr 30 22:53:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: put Object_Manager back on the stack of main,
-          instead of using ACE::init () and ACE::fini ().  It
-          should be functionally equivalent, and then some:  if
-          the user's main () returns, the Object_Manager will get
-          properly destroyed if it's on the stack.  And, it's better
-          for subset support if we avoid class ACE calls from OS.h.
-
-        * include/makeinclude/rules.lib.GNU: cleaned up a bit.
-
-Fri Apr 30 17:42:11 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/OS.i (pthread_sigmask):
-        * ace/OS.h (ACE_OS): Added wrapper for <pthread_sigmask> to get
-        the Proactor code compile on LynxOS.
-
-        * ace/config-lynxos.h (ACE_HAS_AIO_CALLS):
-         Enabled ACE_HAS_AIO_CALLS for LynxOS. Also enabled
-         ACE_HAS_AIOCB_PROACTOR since LynxOS 3.0.0 has not got
-         <pthread_sigmask> yet, so signal proactor cannot work correctly.
-
-        * ace/POSIX_Proactor.cpp:
-        * examples/Reactor/Proactor/test_aiosig_ace.cpp
-        (setup_signal_delivery): Added ACE_OS:: scope to pthread_sigmask
-        so that it works (fails!!) correctly on LynxOS.
-
-        * examples/Reactor/Proactor/post_completions.cpp:
-        * examples/Reactor/Proactor/test_timeout.cpp: Added 'main'
-        function for platforms where only AIOCB_Proactor is enabled so
-        that the test prints out a message.
-
-        * examples/Reactor/Proactor/Makefile:
-
-Fri Apr 30 14:44:12 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ACE-INSTALL.html: Added a note about manually cleaning out the
-          ACE_wrappers directories on Win32, which could be required for a
-          true start from scratch build.  Thanks to David Hooker
-          <DHooker@uniview.net> for this insight.
-
-Fri Apr 30 14:06:41 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * COPYING: Updated the COPYING file to reflect the use new of
-          ACE(TM) and TAO(TM).
-
-Fri Apr 30 13:23:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * docs/tutorials/017/Barrier_i.cpp:
-        * docs/tutorials/018/token.cpp:  Added explicit template
-          instantiations.
-
-Fri Apr 30 12:11:36 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.i (gethostbyname2):
-
-          Added an IPv4-only implementation.  If ACE_HAS_IP6 is not defined,
-          the IPv4-only implementation will be used.
-
-Fri Apr 30 12:11:50 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Basic_Types_Test.cpp: Added checks for sizeof(long) ==
-          sizeof(void*) and sizeof(long) >= sizeof (a_function_pointer).
-          Certain code in ACE depends on the assumptions.
-
-Fri Apr 30 11:24:26 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/ACE_Init_Test.cpp: Added compile-time change to adapt to
-          build w/ static ACE lib and ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-        * tests/version_tests/ACE_Init_Test.dsp: Changes to build clean on
-          all configurations.
-
-Fri Apr 30 02:06:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Parse_Node.cpp (symbol): According to the new ANSI C++
-          specification, casting a void* pointer to a function pointer is
-          not allowed.  However, casting a void* pointer to an integer
-          type that is large enough to hold the pointer value is legal.  I
-          chose to cast the return value to long since it should be large
-          enough to hold the void* pointer's value on most platforms. I am
-          not sure if casting a long value to a function pointer is legal
-          or not (can't find a good explanation in spec) but it prevent
-          SunC++ 5.0 compilers from complaining about illegal pointer
-          conversion.
-
-        * ace/OS.h: Removed ACE_non_function_ptr_to_function_ptr_cast,
-          it is no longer needed.
-
-Fri Apr 30 00:36:23 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-
-        * ace/Get_Opt.cpp:
-        * ace/TLI_Acceptor.cpp:
-        * ace/TLI_Connector.cpp:
-
-          Cast away const from string literals using ACE_const_cast to make
-          Sun C++ 5.0 happier.
-
-Thu Apr 29 18:32:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.h: Removed ghs from the list of compilers for which
-          ACE_NOTREACHED disappears.  It was causing warnings for
-          TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp.
-
-Thu Apr 29 19:48:25 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.{h,i} (ACE_OS):
-
-          More IPv6 support.  Added support for the new IPv4/IPv6
-          inet_ntop() and inet_pton() calls.  If ACE_HAS_IP6 is not
-          defined, these calls will use IPv4 implementations (see
-          Stevens' book "UNIX Network Programming - Volume I") and
-          return an error if a family other than AF_INET is passed to
-          them.
-
-        * ace/OS.h:
-
-          Define INET_ADDRSTRLEN and INET6_ADDRSTRLEN if they don't
-          get defined after including <netinet/in.h>.
-
-Thu Apr 29 18:32:43 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/README:
-        * ace/OS.h (ACE_OS):
-        * ace/OS.i (gethostbyname2):
-
-          Added support for the gethostbyname2() system call.  It is only
-          enabled if ACE_HAS_IP6 is defined.  When I have time, I'll add
-          more IPv6 support.
-
-Thu Apr 29 15:30:04 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/INET_Addr.cpp (string_to_addr): Added support to check for
-          both "port numbers" and "port names".  Thanks to Jerry D. De
-          Master <jdemaste@ipdinc.com> for suggesting this.
-
-        * ace/Select_Reactor_T.h,
-          ace/Reactor.h,
-          ace/Select_Reactor_T.h,
-          ace/TP_Reactor.h (ACE_TP_Reactor): Updated the documentation to
-          clarify the purpose of the <restart> flag.  Thanks to Susan
-          Liebeskind <shl@cc.gatech.edu> for reporting this.
-
-Thu Apr 29 13:41:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/{OS.cpp Object_Manager.cpp}: Fixed leaking ACE_Object_Manager
-          when config has #define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0.  Now
-          both ACE_OS_Object_Manager and ACE_Object_Manager remember if they
-          were dynamically allocated whether the above #define is used or not
-          and correctly clean up and track the singleton properly.
-          Thanks to David and Irfan for identifying this and helping with the
-          solution.
-
-Wed Apr 28 20:21:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Synch_T.h (class ACE_Anti_*_Guard): I had accidentally
-          checked in the anti guard classes.  These are not needed since
-          we decided to stick with the reverse lock class rather than the
-          anti guard classes.
-
-Wed Apr 28 18:02:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h: Added a new macro called
-          ACE_non_function_ptr_to_function_ptr_cast to get around some
-          compiler constrain.  In face, ANSI C++ standard prevents casting
-          from a non-function pointer (e.g., void *) to a function
-          pointer.  Currently, only egcs check for this condition.
-
-        * ace/Parse_Node.cpp (symbol): Changed to use the new
-          ACE_non_function_ptr_to_function_ptr_cast.
-
-Wed Apr 28 16:53:16 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/Proactor/Aio_Platform_Test_C.cpp: Added this
-        file, a simple C version of the
-        $ACE_ROOT/tests/Aio_Platforms_Test.cpp. Useful for submitting bug
-        reports etc.
-
-        * ace/Proactor.cpp:
-        * ace/POSIX_Asynch_IO.cpp: Fixed old g++ warnings
-
-Wed Apr 28 15:39:14 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Parse_Node.cpp (symbol): Use reinterpret_cast to cast
-          dlsym's return value.
-
-Wed Apr 28 12:40:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Synch_T.{i,cpp} (~ACE_Reverse_Lock): uninlined destructor.
-          See docs/ACE-guidelines.html for an explanation of why a
-          class should have at least one non-inline, non-pure virtual
-          function if it has any virtual functions.  egcs 1.1.1b
-          needed this one.
-
-Wed Apr 28 09:02:26 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: It appears that SunC++ 5.0 wants
-          ACE_HAS_THR_C_DEST to be defined.
-
-        * ace/SString: Clarified the comments a bit to avoid confusion.
-          Also, moved the definition of ACE_SString to AFTER ACE_CString
-          and ACE_WString since they are more general.  Thanks to Kevin
-          Lyda <kevin.lyda@trintech.com> for reporting this.
-
-Tue Apr 27 20:59:52 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/clients/Naming: Moved the README file into the Client/
-          directory since that's what it described.
-
-        * netsvcs/clients/Naming/Client/Client_Test.cpp: Reformatted some
-          code to conform to ACE programming guidelines.
-
-        * ace/Naming_Context.cpp (parse_args): Oops, fixed a braino
-          related to strcmp().  Thanks to Valery Arkhangorodsky
-          <avalery@balisoft.com> for reporting this.
-
-Tue Apr 27 18:00:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.cpp (ACE_OS_CString, ACE_OS_WString): Fixed one-off error
-          in allocating new string's memory.
-
-Tue Apr 27 17:36:28 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * m4/threads.m4:
-
-          Restructured thread detection test so that it properly detects
-          threads on platforms that provide PTHREADS backward compatibility
-          macros, such as Digital Unix 4.0 and 5.0.
-
-Tue Apr 27 18:56:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/Containers_T.{cpp, h}
-          tests/OrdMultiSet_Test.cpp: added a workaround for a problem with
-          implicit template instantiation and a do-nothing destructor
-          definition.  Thanks to Sarmeesha Reddy <sreddy@tr.comm.mot.com> and
-          Steven Tine <stevent@tr.comm.mot.com> for reporting this.
-
-        * include/makeinclude/platform_psos_diab_ppc.GNU: changes to use
-          the board support package linker file. Thanks to Sarmeesha
-          Reddy <sreddy@tr.comm.mot.com> and Steven Tine
-          <stevent@tr.comm.mot.com> for contributing this change.
-
-Tue Apr 27 16:30:57 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/UNIX_Addr.h (ACE_UNIX_Addr):
-
-          Corrected typographical error in comment.
-
-Tue Apr 27 12:57:06 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-
-          Removed `tests/log/Makefile' from the list of files to
-          generate (i.e. removed from AC_OUTPUT macro call).
-
-        * tests/Makefile.am:
-
-          Corrected a typo.  I neglected to add "_SOURCES" to the end
-          of the Collection_Test source variable variable.  Also added
-          more missing tests to the list of test programs.  Commented out
-          Cache_Manager_Test.  It appears to need a header that doesn't
-          exist.
-
-        * ace/Makefile.am (pkginclude_HEADERS):
-
-          Removed `Timer_Queue.i' from the list of headers.
-
-        * bin/autogen:
-        * bin/bootstrap:
-
-          Renamed the `autogen' script to `bootstrap'.
-
-Tue Apr 27 11:54:53 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-
-          Temorarily removed my experimental C++ libtool support so that
-          I can get a semi-working test distribution out on the net.
-
-        * ltconfig:
-        * ltmain.sh:
-
-          Reverted to more stable version, i.e. w/o my C++ support.
-
-        * m4/threads.m4:
-
-          Added KAI C++ thread flag check.
-
-Tue Apr 27 11:45:40 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Collection_Test.cpp (main): Added some additional array
-          tests and fixed template instantiation errors.  Thanks to David
-          Levine for pointing them out.
-
-        * ace/OS.h (ACE_DES_FREE): Changed all the ACE_DES* macros to
-          check for zero pointers.  Thanks to Torsten Kuepper
-          <kuepper2@uni-wuppertal.de> for pointing this bug out.
-
-Tue Apr 27 11:08:35 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Basic_Types.h: Forced KAI compiler to use ACE_U_LongLong if
-          ACE_LACKS_LONGLONG_T is defined.
-
-        * ace/DLL.cpp:
-        * ace/Service_Config.i:
-        * ace/Service_Object.i:
-        * ace/INET_Addr.cpp: Some CE related changes.
-
-Tue Apr 27 00:03:16 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Collection_Test.cpp (main): Added test code for ACE_Array.
-
-Mon Apr 26 23:55:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Synch_T.h (class ACE_Reverse_Lock): Removed constructor that
-          created the lock.  There were two reasons for this: (a) it was
-          unrealistic that the reverse lock would own and create the
-          regular lock and (b) this constructor made it impossible that
-          ACE_Reverse_Lock can be used with ACE_Lock (the abstract
-          class).  Thanks to Carlos for pointing this out.
-
-Mon Apr 26 21:43:23 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Makefile.am (pkginclude_HEADERS, libACE_IPC_la_SOURCES):
-
-          Added ATM_Addr sources to these variables.
-
-        * ace/Makefile.am (EXTRA_libACE_la_SOURCES):
-
-          Accidentally removed this variable.  It is needed for
-          conditionally built sources, such as `gethrtime.cpp'.
-
-        * tests/Makefile.am:
-
-          Added newly added tests to the list of test programs to be built.
-          Changed "noinst_PROGRAMS" variable to "check_PROGRAMS" so that
-          tests only get built when a `make check' is issued by the user.
-
-Mon Apr 26 19:29:25 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tests/Reverse_Lock_Test.cpp (main):
-
-          ACE_START_TEST macro had "Thread_Mutex_Test" instead of
-          "Reverse_Lock_Test."
-
-Mon Apr 26 17:01:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp (DllMain): Re-enabled this for use on Win32.
-
-        * ace/OS.h (main): On non-pSoS, use ACE::init, ACE::fini rather than
-          creating object manager instances on the stack.  Allows a single
-          instance regardless of program type; especially helpful on Win32.
-
-        * ace/OS.cpp (ACE_OS_Object_Manager ctor):
-        * ace/Object_Manager.cpp (ACE_Object_Manager ctor):
-          Don't set instance_ if it was already set.  So if two
-          ACE_Object_Manager instances end up getting created, the first one
-          stays The Instance, and the second gets used privately by its
-          creator.  Previously, the original was forgotten.  Thanks to David
-          Levine for working out this and the above details with me to get the
-          Win32 crowd in business without platform-specific hacks.
-
-Mon Apr 26 16:43:32 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Asynch_IO_Impl.h (ACE_Asynch_[Read|Write]_File_Impl):
-          Declared the read/write pure virtual methods of
-          ACE_Asynch_[Read|Write]_Stream_Impl again in these class to
-          avoid KAI compiler's overwriting pure virtual function
-          warnings.
-
-Mon Apr 26 10:54:23 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/High_Res_Timer.h:
-          Moved the static method hrtime_to_tv to the public section. It
-          is useful outside this class.
-
-        * ace/Synch_T.cpp:
-          The default constructor for ACE_Reverse_Lock should not allocate
-          the locking mechanism, otherwise it cannot work with ACE_Lock.
-
-Mon Apr 26 07:30:51 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i (fstat): Changed to use CE's implementation and added
-          some features that're supported on other Win32 platforms.  The
-          original implementation for Win32 closed down the file handle
-          accidentally which is not a "Good Thing[TM]".  Thanks to Dominic
-          Williams <dom@connected-place.co.uk> for pointing this out.
-
-Sun Apr 25 21:35:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.{h,cpp},OS.{h,cpp},Object_Manager.{h,cpp} (init,fini):
-          moved init_fini_count_ from ACE Object_Managers to ACE, so that
-          it is only used via ACE::init () and ACE::fini ().  Thanks
-          to Steve Huston for pointing out that the old way didin't work
-          if an Object_Manager was created prior to starting main (),
-          and there were ACE::init ()/ACE::fini () calls in main ().
-
-Sun Apr 25 16:59:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_kcc.GNU: Fixed incorrect
-          compiler flags.
-
-        * ace/config-sunos5.7.h: Added definition of uint64_t on KAI.
-
-        * ace/config-kcc-common.h: Changed to use non-static object
-          manager.
-          Defined ACE_SIZEOF_LONGLONG.  KAI compiler has type long long.
-
-        * ace/OS.h: ACE_NOTREACHED should expand to nothing on KAI
-          compiler.
-
-        * ace/CDR_Stream.h (ACE_CDR): KAI compiler doesn't have
-          longlong_t.
-
-        * ace/Basic_Types.h: KAI compiler should define ACE_UINT64 as
-          unsigned long long.
-
-Sun Apr 25 14:52:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * COPYING,
-          TAO/COPYING: Updated the ACE+TAO COPYING information to
-          emphasize the relationship to open source.  Thanks to Malcolm
-          Spence <spence_m@ociweb.com> for suggesting the wording.
-
-Sat Apr 24 23:03:31 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ACE_wrappers/ace/POSIX_Asynch_IO.cpp
-        * ACE_wrappers/ace/POSIX_Asynch_IO.h
-        * ACE_wrappers/ace/POSIX_Proactor.cpp
-        * ACE_wrappers/ace/POSIX_Proactor.h
-        * ACE_wrappers/ace/Proactor.cpp
-        * ACE_wrappers/ace/Proactor.h
-        * ACE_wrappers/ace/Proactor_Impl.h
-
-        * ACE_wrappers/examples/Reactor/Proactor/Makefile
-        * ACE_wrappers/examples/Reactor/Proactor/README
-        * ACE_wrappers/examples/Reactor/Proactor/test_aiocb.cpp
-        * ACE_wrappers/examples/Reactor/Proactor/test_aiosig.cpp
-        * ACE_wrappers/examples/Reactor/Proactor/test_aiosig_ace.cpp
-        * ACE_wrappers/examples/Reactor/Proactor/test_proactor.cpp
-        * ACE_wrappers/examples/Reactor/Proactor/test_timeout.cpp
-
-        - Completed Multithreading of POSIX_SIG_Proactor.
-
-        - Introduced another constructor for ACE_POSIX_SIG_Proactor for taking
-          signal mask to be used with the Proactor.
-
-        - Thanks to Dave Butenhof <butenhof@zko.dec.com> for helping a lot to
-          understand the various things in the POSIX4 standard.
-
-        - Thanks to Dave suggestion of keeping null_handler for the sigaction
-          to real-time signals. With this and a couple of other correct POSIX
-          things SIG proactor is now working with in Solaris 2.7.
-
-        - Lynx OS doesnt support <pthread_sigmask>, so it couldnt be
-          multithreaded. Enabled AIOCB_Proactor for this platform.
-
-        - Added an example to make use of the real-time signal numbers for the
-           asynchronous I/O calls.
-
-        * examples/Reactor/Proactor/test_posix_sig_proactor.cpp: This
-          program demonstrates how to post fake completions to The
-          Proactor. It also shows the how to specify the particular
-          real-time signals to post completions.
-
-        * ace/config-lynxos.h: Enabled ACE_POSIX_AIOCB_PROACTOR for this
-          platform, since <pthread_sigmask> was not available. Without
-          <pthread_sigmask>, SIG_Proactor can not work correctly.
-
-        * ace/config-linux-lxpthreads.h: Removed ACE_HAS_AIO_CALLS. Even
-          simple aio calls test is hanging.
-
-Sat Apr 24 13:09:27 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Containers_T.h: Added allocator support to ACE_Array.
-          Thakns to Paul Francis <pfrancis@dkl.com> for contributing this.
-
-        * ace/Future.h (class ACE_Future): Make sure to mention that
-          get()'s ACE_Time_Value must be in absolute, not relative, time.
-          Thanks to Ian MacDonald <ianmacd@bg.com> for reporting this.
-
-Sat Apr 24 07:24:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Reverse_Lock_Test.cpp: removed ACE_Guard<ACE_SYNCH_MUTEX>
-          instantiation because it's in ace/Synch.cpp.
-
-        * ace/config-vxworks5.x.h: added ACE_THR_PRI_OTHER_DEF
-          #define, for use by MT_Cubit.
-
-        * ace/Object_Manager.cpp, OS.cpp (fini): unconditionally set
-          instance_ to 0 at the end.  This allows init () to
-          work properly if called after fini (), such as for
-          repeated test on VxWorks.  Thanks to Todd Mullanix
-          <Todd.Mullanix@sylantro.com> for reporting this.
-
-Fri Apr 23 17:53:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          for PPC860, changed -m=860 to -mcpu=860.  Thanks to
-          Todd Mullanix <Todd.Mullanix@sylantro.com> for reporting this.
-
-Fri Apr 23 15:48:31 1999  James Hu <jxh@entera.com>
-
-        * ace/OS.h:
-        * ace/OS.i:
-        * ace/README:
-        * ace/config-sunos5.5.h:  added support for the memchr
-          library call, and created ACE_HAS_MEMCHR macro.
-
-Fri Apr 23 10:48:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/New_Fail_Test.cpp (main): added uses of the
-          two static functions when they're not otherwise used,
-          to prevent g++ warnings.
-
-Fri Apr 23 09:11:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Reverse_Lock_Test.cpp:
-          Fixed template instantiation problems.
-
-Thu Apr 22 21:39:44 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tests/Makefile.am:
-
-          Added support to create the `tests/log' directory after
-          the tests have been built.
-
-        * tests/log/Makefile.am
-
-          The above change deprecates this Makefile.am file.  Thanks to
-          Nanbor for motivating this change.
-
-Thu Apr 22 20:50:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.i: Modified reset() to reset all the message
-          blocks, instead of just the first one as it had previously done.
-          Thanks to Jerry D. De Master <jdemaste@ipdinc.com> for pointing
-          out the problem and suggesting a fix.
-
-Thu Apr 22 19:40:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/OS.h: Adjust exception thrown at out-of-memory for HP-UX, aC++.
-
-        * ace/config-hpux-10.x-hpc++.h: Add ACE_NEW_THROWS_EXCEPTIONS.
-
-Thu Apr 22 19:30:01 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Synch_T.h (class ACE_Reverse_Lock): Added an interesting
-          adapter class that changes a lock into a reverse lock, i.e.,
-          acquire() on this class calls release() 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.
-
-        * tests/Reverse_Lock_Test.cpp: Test for the new ACE_Reverse_Lock
-          class.
-
-        * tests/Env_Value_Test.cpp (main): Fixed UNICODE string
-          concatenation problem.
-
-        * tests/version_tests: Added a bunch of missing project files.
-
-        * ace/ace_lib.dsp: Added missing files.
-
-Thu Apr 22 19:10:52 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ATM_Addr.cpp: Put in class's consts for non-FORE platforms.
-
-Thu Apr 22 17:05:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/auto_compile_win32.pl: Added version_tests.
-
-        * include/makeinclude/platform_sunos5_kcc.GNU: Makefile macros for
-          KAI C++ compiler.
-
-        * ace/config-sunos5.5.h: Added KAI C++ compiler support.
-
-        * docs/exceptions.html: Explicitly state that ACE try macros will
-          replace TAO try macros and advise users to take action if they
-          are still using TAO try macros.  Thanks to Don Busch
-          <busch_d@ociweb.com> for pointing this out.
-
-Thu Apr 22 15:07:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          added PPC860 support.  Thanks to Todd Mullanix
-          <Todd.Mullanix@sylantro.com> figuring out how to
-          support it, with help from Thomas Mehrkam <Thomas_Mehrkam@i-o.com>
-          and Hai Vu <Hai_Vu@Mitel.Com>.
-
-Thu Apr 22 13:26:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/XtReactor.cpp (remove_handler_i): In the registration phase,
-          we registered first with ACE_Select_Reactor and then with X.
-          Now we are now doing things in reverse order.  Thanks to JM
-          Strauss <jms97@club-internet.fr> for contributing these changes.
-
-Thu Apr 22 13:23:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * include/makeinclude/platform_psos_diab_ppc.GNU: commented out -g
-          switch which was triggering a bug in the Diab 4.2b compiler when
-          compiling in debug information.  This is supposed to be fixed in
-          the 4.3a release of the Diab compiler.  The ACE tests all compile
-          now for pSOS/PPC.  Thanks to Sarmeesha Reddy <sreddy@tr.comm.mot.com>
-          for reporting the bug to Diab and obtaining the workaround.
-
-Thu Apr 22 10:46:17 1999  Steve Huston  <shuston@riverace.com>
-
-        * apps/JAWS/server: Added $(ACELIB) to LDLIBS to build libJAWS on AIX
-          with xlC.
-
-        * tests/New_Fail_Test.cpp: Added __GNUG__ to the platforms which do not
-          actually perform the test; added some more explanation and a better
-          log message for when it doesn't actually run.
-
-Thu Apr 22 10:28:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-minimal.h: removed suppression of ACE_TSS_EMULATION
-          and enable of ACE_USE_THREAD_MANAGER_ADAPTER.  They're no
-          longer necessary with the clean OS.cpp.
-
-Thu Apr 22 08:52:48 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/New_Fail_Test.cpp: Fixed to compile clean without exceptions.
-
-        * tests/run_tests.{sh bat}: Added New_Fail_Test.
-
-Wed Apr 21 16:41:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (main): added 10 second
-          time limit to run_event_loop () call.  That prevents the
-          test from hanging forever if some of the connections
-          are lost.
-
-        * tests/Priority_Reactor_Test.cpp: default to 5 children
-          instead of 10 on LynxOS.  Beyond 8, the test seems to
-          take forever on LynxOS 3.0.0.
-
-        * tests/run_tests.sh: enabled Reactor_Performance_Test,
-          Priority_Reactor_Test, Time_Service_Test, and Tokens_Test
-          on LynxOS.
-
-Wed Apr 21 16:35:21 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/New_Fail_Test.cpp: Test to be sure that the ACE_NEW[_RETURN]
-          stuff works correctly when heap is exhausted.
-        * tests/Makefile: Added New_Fail_Test.
-        * tests/tests.dsw, New_Fail_Test.dsp: Add new test to MSVC.
-
-Wed Apr 21 15:35:44 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp: On Win32, with ACE_HAS_NONSTATIC_OBJECT_MANAGER, use
-          DllMain to do ACE::init() and ACE::fini().
-
-        * tests/ACE_Init_Test.dsp,
-        * tests/ACE_Init_Test.{cpp h},
-        * tests/ACE_Init_TestDlg.{cpp h},
-        * tests/ACE_Init_Test.(ico rc rc2 res},
-        * tests/ACE_Init_Test_(Resource StdAfx}.h: New test to be sure that
-          ACE DLL is initialized properly from an MFC app.
-
-        * tests/tests.dsw: Added ACE_Init_Test.dsp project.
-
-Wed Apr 21 14:59:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_OS_Object_Manager::fini): on LynxOS only,
-          disabled ACE_{recursive/thread}_mutex_destroy () calls, because
-          they failed on LynxOS in forked children.  The prevents
-          the failure message from being printed, with no apparent
-          ill effect.
-
-Wed Apr 21 10:06:11 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: Moved -lthread from
-          the all-Orbix section to the MT-Orbix section for LIBS.
-
-Wed Apr 21 09:25:16 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Upgradable_RW_Test.cpp (main): replaced ACE_SCHED_FIFO
-          with THR_SCHED_FIFO in activate call.  Thanks to Carlos for
-          finding this subtle error.
-
-Wed Apr 21 03:34:18 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.37 released.
-
-Tue Apr 20 22:55:18 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (thr_join): ifdef ACE_LACKS_PTHREAD_NULL_STATUS,
-          provide the address of a temporary variable for the status
-          argument of ::pthread_join (), if the caller passed 0.
-
-        * ace/config-lynxos.h,README: added ACE_LACKS_PTHREAD_NULL_STATUS.
-          LynxOS 3.0.0 fails ::pthread_join () calls with EFAULT
-          if the second (status) argument is 0.
-
-Tue Apr 20 21:53:32 1999  Joe Hoffert <joeh@cs.wustl.edu>
-
-        * examples/IPC_SAP/TLI_SAP/Makefile: Had inadvertently checked in
-          local changes. Now undoing these changes.
-
-Tue Apr 20 18:25:45 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/{SOCK,TLI,LSOCK,Asynch}_Acceptor.h: Replaced the use of the
-          hard-coded backlog value of 5 with ACE_DEFAULT_BACKLOG.  Thanks
-          to Irfan for motivating this.
-
-        * ace/OS.h: Added a new (overriddable) macro called
-          ACE_DEFAULT_BACKLOG that's used to control the default number of
-          connections that can be accepted by an OS.  The default value is
-          5.
-
-Tue Apr 20 18:22:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/Map_T.i
-          ace/config-psos-diab-mips.h
-          ace/config-psos-diab-ppc.h
-          ace/config-psos-diab.h
-          include/makeinclude/platform_psos_diab_ppc.GNU
-          tests/Handle_Set_Test.cpp
-          tests/Process_Strategy_Test.cpp: fixed the remaining tests
-          for which compiler bug workarounds were available for pSOS
-          PPC with the Diab 4.2b compiler.
-
-Tue Apr 20 16:41:39 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (num_tasks_in_group): Make sure we are
-          not searching for a null task.  Thanks to Umar Syyid
-          <usyyid@hns.com> for pointing this out.
-
-Tue Apr 20 15:10:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp: Changed the default number
-          of connections (<opt_nconnection>) from 20 to 5 for NT.  This
-          seems reasonable since the default backlog is 5.  Once we have
-          the ability to set the backlog from the ACE_Acceptor class, we
-          can increase this number.
-
-Tue Apr 20 13:55:34 1999  Joe Hoffert <joeh@cs.wustl.edu>
-
-        * ace/OS.i: Fixed ACE_OS::t_free to free memory if pointer is not
-          null.
-
-        * ace/TLI.h: Added default ACE_XTI_ATM_DEVICE.
-
-        * ace/TLI_Connector.cpp: Disabled non-blocking connects for XTI/ATM
-          since FORE's drivers have problems with this. Also, fixed t_alloc
-          memory leaks.
-
-        * ace/ATM_Addr.cpp: Added code formatting change.
-
-        * examples/IPC_SAP/TLI_SAP/CPP-ATM-{server,client}.cpp: Added
-          the use of ACE_XTI_ATM_DEVICE
-
-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++.  Thanks to Rene Matteau
-          <matteau@ca.ibm.com> for this.
-
-Mon Apr 19 23:50:25 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Time_Service_Test.cpp (main): Fixed error message.
-
-        * ace/Connector.cpp (handle_close): Removed unused argument
-          <mask>.
-
-Mon Apr 19 17:17:47 1999  Steve Huston  <shuston@riverace.com>
-
-        * docs/tutorials/tutorials.dsw: Fixed project file name for 019-021.
-
-Mon Apr 19 17:02:42 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Connector.cpp (handle_close): There is no need to call
-          cancel_timer() or remove_handler() from handle_close().  Removal
-          of all svc tuples from the <reactor> is done by <cleanup_AST>.
-
-Mon Apr 19 16:45:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp},Object_Manager.{h,cpp} (ACE_OS_Object_Manager,
-          ACE_Object_Manager: added static counter to match init ()/fini ()
-          calls.  Don't destroy Object_Managers until final fini () call.
-          Thanks to Ian MacDonald <ianmacd@bg.com> for tracking down
-          the problem with multiple DLLs in a process.  This change
-          delays destruction of the ACE_Object_Manager until the final
-          fini () call.
-
-Mon Apr 19 15:24:55 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/TLI_Stream.cpp (ACE_TLI_Stream): Make sure to set the value
-          of rwflag_ to 0 so that purify is happy.  Thanks to Joe Hoffert
-          for reporting this.
-
-Mon Apr 19 14:35:42 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/IPC_SAP/UPIPE_SAP/ex2.cpp (supplier):
-        * examples/IPC_SAP/UPIPE_SAP/ex3.cpp (consumer):
-
-          Avoided annoying g++ warning about <auto_ptr> by explicitly
-          making a temporary. Thanks to David for pointing this out.
-
-Sun Apr 18 21:52:43 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-linux-common.h: moved ACE_LACKS_MADVISE to
-          non-glibc section.  Thanks to JM Strauss <jms97@club-internet.fr>
-          for reporting that it wasn't on a Linux system with a
-          2.0.35 kernel.
-
-Sun Apr 18 16:36:30 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/config-linux-common.h (ACE_LACKS_MADVISE):
-
-          Re-enabled #define ACE_LACKS_MADVISE.  Linux doesn't appear
-          to have an madvise() system call.
-
-        * configure.in:
-        * tests/Makefile.am:
-
-          Added libtool support for modules (dlopened libraries).
-
-Sun Apr 18 08:48:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Auto_Ptr.i: reordered inline methods to avoid use before
-          definition.  Fixed a few ACE_TRACE comments.
-
-Sun Apr 18 00:26:28 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Notify_Performance_Test.cpp (main):
-        * tests/Reactor_Performance_Test.cpp (main):
-        * tests/Priority_Reactor_Test.cpp (main):
-
-          Avoided annoying g++ warning about <auto_ptr> by explicitly
-          making a temporary. Thanks to David for pointing this out.
-
-Sat Apr 17 18:52:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp (acquire): Changed use of auto_ptr.
-
-        * ace/Auto_Ptr.i (operator=): Changed <a> to <rhs>.  Thanks to
-          David Levine and Jean-Marc Strauss <strauss@club-internet.fr>
-          for reporting this.
-
-Sat Apr 17 08:34:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Naming/Makefile,performance-tests/Misc/Makefile,
-          tests/Makefile,all netsvcs Makefiles:
-          updated for proper support of ACE subsets, with BIN2/LIB2/SHLIB2.
-
-Fri Apr 16 22:14:36 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Auto_Ptr: Made several changes to bring the implementation
-          up to the specification:
-
-          - Made the constructors take non-const parameters.
-          - Made release() non-const.
-          - Added reset().
-
-          Thanks to Simeon Simeonov <simeons@allaire.com>, Rainer Blome
-          <blome@de.ibm.com>, Jody Hagins <jody@atdesk.com>, and John
-          Mulhern <John.Mulhern@lawson.com> for helping.
-
-        * tests/Reactor_Performance_Test.cpp: Updated to work with new
-          auto pointer implementation.
-
-Fri Apr 16 19:36:35 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>
-
-        * ace/Proactor.h (ACE_Proactor): Switched the order of TIMER_QUEUE
-        and delete_implementation in the constructor.
-
-        * examples/Reactor/Proactor/test_multiple_loops.cpp: Fixed to work
-        on the WIN32 correctly. This can work only on WIN32 (combining
-        Proactor with Reactor's event loop). So I have put a #if defined
-        around the file.
-
-Fri Apr 16 18:09:44 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Conn_Test.cpp (server): If we timeout on accept(), it is
-          not an error, and should not be reported as one. Thanks to
-          Thomas Mehrkam <Thomas_Mehrkam@i-o.com> for pointing this out.
-
-Fri Apr 16 13:08:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp},ACE.{h,cpp}: (read_n,send_n,write_n): moved
-          from ACE to ACE_OS, so that the uses in OS.cpp could be localized.
-          The ACE versions are now just wrappers over the ACE_OS
-          versions, for backward compatibility.  Thanks to
-          Erik Ivanenko <erik.ivanenko@utoronto.ca> for reporting
-          that OS.cpp used a couple of the ACE static member functions.
-
-Fri Apr 16 10:13:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.nested.GNU,ACE-INSTALL.html: added
-          support for recursive make invocations with Windows NT's shell.
-          Thanks to Dave Steele <Dave_Steele@Mitel.COM> for diagnosing the
-          problem, and Tres Seaver <tseaver@palladion.com> for providing
-          the wild NT FOR command.  Check it out, Darrell.
-
-Fri Apr 16 07:52:11 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * ace/High_Res_Timer.cpp: Fixed my previous fix with
-          calibrate being called on Windows NT when a high-res
-          timer of 1 Mhz was being found.  Calibrate should not
-          be called on NT now.  Thanks to Zoran Ivanovic
-          <zorani@pathcom.com> for noticing this.
-
-        * ace/Profile_Timer.cpp: Integrated the patch from Andy
-          Marchewka <AndyM@who.net> for returning rusage information
-          from elapsed_time.
-
-Thu Apr 15 16:50:21 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: updated discussion of "dir unexpected"
-          error when building for VxWorks on NT.  Thanks to
-          Dave Steele <Dave_Steele@Mitel.COM> for providing the
-          insight.
-
-Thu Apr 15 14:04:36 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.lib.GNU: don't call $(RANLIB)
-          if it is null.
-
-        * include/makeinclude/platform_vxworks5.x_{g++,ghs}.GNU: removed
-          RANLIB definition, so that it will be null.  This prevents
-          calling "true" on NT hosts.
-
-        Thanks to Thomas Mehrkam <Thomas_Mehrkam@i-o.com> for reporting
-        that his NT host doesn't have "true".
-
-Thu Apr 15 14:00:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/OS.{h, i}: simplified the conditional compilation logic
-          for a couple of the pSOS-specific ACE_OS methods, removed a
-          handful of marker comments, added a conditional compilation
-          branch for pid_t declaration.
-
-Wed Apr 14 22:40:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/run_tests.sh: call run_tests.check via sh, to support
-          platforms that don't have /bin/sh.  Thanks to Thomas Mehrkam
-          <Thomas_Mehrkam@i-o.com> for reporting that his NT host doesn't
-          have /bin/sh.
-
-Wed Apr 14 18:56:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/OS.{h, i}
-          ace/config-psos-diab-ppc.h
-          include/makeinclude/platform_psos_diab_ppc.GNU: changes to adapt
-          the pSOS Diab 68k/MIPS port to PPC.  Many thanks to Sarmeesha
-          Reddy <sreddy@tr.comm.mot.com> and Steven Tine
-          <stevent@tr.comm.mot.com> for contributing these changes.
-
-Wed Apr 14 17:06:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-vxworks5.x.h: added #define ACE_HAS_DLL 0.
-          Thanks to Thomas Mehrkam <Thomas_Mehrkam@i-o.com> for
-          reporting that it's necessary on NT hosts.
-
-Wed Apr 14 13:10:48 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/config-sunos5.7.h:
-                Enabled ACE_HAS_AIO_CALLS for Solaris
-                7. ACE_POSIX_AIOCB_PROACTOR works now on this.
-        * examples/Reactor/Proactor/test_aiocb.cpp: Updated comments.
-        * ace/config-sunos5.6.h: Removed the ACE_AIORETURN/ERROR macros.
-        * ace/Proactor.cpp (ACE_Proactor): Removed debug print statments.
-        * ace/config-lynxos.h: Removed the ACE_AIORETURN/ERROR macros.
-        * ace/POSIX_Proactor.cpp:
-        * ace/WIN32_Asynch_IO.h:
-        * ace/WIN32_Asynch_IO.cpp:
-        * ace/WIN32_Proactor.h:
-        * ace/WIN32_Proactor.cpp:
-        * ace/Proactor_Impl.h:
-        Completed committing changes related to the <signal_number>
-        additions done earlier.
-
-Wed Apr 14 09:07:38 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * ace/POSIX_Proactor.cpp:
-
-          Several methods were missing the "int signal_number" parameter
-          that was added as mentioned in the log entry below. In addition,
-          an undefined ACE_SIG_AIO flag was used. I found a log entry in
-          ChangeLog-98b which says that ACE_SIG_AIO is ACE_SIGRTMIN. So I
-          replaced the 5 occurrences of ACE_SIG_AIO with ACE_SIGRTMIN.
-
-Wed Apr 14 02:34:13 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        Added additional parameter <int signal_number> to all the Asynchronos
-        Operation method so that we can specify which real-time signal should
-        be used for each of  the Asynchronous Operation. This only makes sense
-        in the ACE_SIG_Proactor configuration.
-
-        * ace/Asynch_IO_Impl.h:
-        * ace/Asynch_IO.h:
-        * ace/Asynch_IO.cpp:
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/POSIX_Proactor.h:
-
-        - For each asynchronous call issued, the real-time signal is
-          registered with the Proactor so that it can wait for the completions
-          using that signal. Previously, the signal number for all the
-          operations was the same signal and it was hard coded.
-
-        - <register_aio_with_proactor> method which earlier existed only for
-          <AIOCB_Proactor> has been added to <SIG_Proactor>
-          also. <SIG_Proactor> just takes the <signal_number> from the result
-          object and registers the signal number. Registering involves,
-          masking the signal, setting the signal delivery for that RT signal
-          etc.
-
-        - Allowing to specify signal number for each operation can be useful,
-          since the order in which the completions are delivered from the
-          completion queue, is based on the signal numbers in addition to the
-          priority. Applications might want to leverage this.
-
-        * ace/OS.h:
-        OS.h has been defined with ACE_SIGRTMIN and ACE_SIGRTMAX, which are
-        defined to SIGRTMIN and SIGRTMAX respectively, for POSIX4
-        platforms. For others, they are 0.
-
-Tue Apr 13 15:29:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Object_Manager.cpp: moved ACE_Service_Config signal
-          handler allocation from constructor to init ().  Tidy,
-          tidy, tidy.
-
-Tue Apr 13 14:52:15 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * ace/ATM_Addr.cpp: Fixed g++ warnings of unused parameters.
-
-Tue Apr 13 14:47:18 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Basic_Types_Test.cpp (main): replaced call to sysconf ()
-          with ACE_OS::sysconf ().  Thanks to Erik Ivanenko
-          <erik.ivanenko@utoronto.ca> for noticing this.
-
-Tue Apr 13 14:17:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp: replaced use of ACE_TSS<T> with ACE_WIN32 or
-          ACE_HAS_TSS_EMULATION with native use of ACE_OS TSS, to remove
-          dependency on ace/Synch.h.  Also, changed ACE_OS::NULL_key to
-          be -1 instead of 0 with ACE_HAS_TSS_EMULATION.
-
-Tue Apr 13 09:05:25 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Sched_Params.i (ACE_Sched_Priority_Iterator): removed
-          ACE_TRACE's, because Sched_Param is in the ACE_OS (lowest)
-          component.  Thanks to Erik Ivanenko <erik.ivanenko@utoronto.ca>
-          for reporting this.
-
-Tue Apr 13 08:21:41 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU
-        * include/makeinclude/platform_sunos5_sunc++_orbix.GNU: Added a make
-          option, mt_orbix, to control whether the MT or non-MT variant of
-          Orbix is used.  Default is MT; to use non-MT, "make mt_orbix=0".
-
-        * ace/config-sunos5.x-sunc++-4.x-orbix.h: Include correct config-sunos5
-          file based on OS version at compile time.  Allow site config to
-          specify ACE_HAS_MT_ORBIX 0.
-
-Mon Apr 12 14:24:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU (realclean.local):
-          added BIN2, LIB2, SHLIB2, and SHLIBA2 to support
-          subsetting.  It allows realclean to remove old BIN,
-          LIB, SHLIB, and SHLIBA targets after remove the
-          ace_components information file.  Also, removed explicit
-          -f following $(RM).  -f should be included in the RM macro
-          if appropriate for the platform.
-
-Mon Apr 12 13:01:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/gethrtime.cpp (ACE_gethrtime),Makefile: added support for
-          rdtsc instruction with GHS on Intel targets.  Thanks to
-          Andy Alvarez <axab@eci-esyst.com> for providing the assembly
-          instructions to do this!
-
-Mon Apr 12 12:04:20 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * ace/Makefile,ATM_Addr.cpp:
-          Added ACE_ATM_Addr class back into Makefile since it's working
-          now. Fixed address initialization problem in ACE_ATM_Addr.
-          NOTE: This code currently only works with Solaris 2.5/2.6. Will
-          need to update the code for FORE's implementation on Solaris 2.7.
-          NOTE: To use FORE's XTI/ATM implementation the following #defines
-          need to be included (typically in ace/config.h):
-            #define ACE_HAS_FORE_ATM_XTI
-            #define ACE_HAS_TIUSER_H_BROKEN_EXTERN_C
-            #define ACE_TLI_TCP_DEVICE "/dev/xtisvc*" //(e.g., /dev/xtisvc0)
-          AND the following flags are needed to build the ace library
-          (typically in include/makeinclude/platform_macros.GNU):
-            CPPFLAGS += -I$(FORE_ROOT)/include
-
-Mon Apr 12 10:04:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU:
-          The default rule to compile .idl files is only enabled if
-          TAO_ROOT is not defined, otherwise we should use the rule in
-          $TAO_ROOT/rules.tao.GNU
-
-Mon Apr 12 00:18:23 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.36 released.
-
-Sun Apr 11 17:06:53 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (run_client): Fixed
-          the warnings on Linux (config-linux.h).
-
-Sun Apr 11 16:09:16 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp (run_client): Made
-          some fixes if ACE_MT_SAFE is false...  Thanks to Alex for
-          reporting these.
-
-Sun Apr 11 16:02:49 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (create_handler):
-          Fixed the warnings (control reaching end of block) and error (passing
-          u_long to close) which showed up on Linux(with config-linux.h)
-
-        * performance-tests/Misc/preempt.cpp,
-        * examples/Threads/task_five.cpp: Replaced ACE_MT_SYNCH by
-          ACE_SYNCH to get it compile on Linux.
-
-Sun Apr 11 14:38:22 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in: Added test for ACE_NEEDS_FUNC_DEFINITIONS.
-          Corrected bug in ACE_TEMPLATES_REQUIRE_SOURCE test.
-
-Sat Apr 10 14:02:11 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Malloc[_Base]: Added a new no-op constructor for
-          ACE_Allocator to hopefully work around a problem with DEC UNIX
-          C++.
-
-Fri Apr 09 10:08:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU:
-          enable -fno-implicit-templates for targets other than
-          Intel.  It appears to work for PPC targets, and is necessary
-          to avoid compiler warnings about different symbol sizes
-          in object files.  Thanks to Thomas Mehrkam <Thomas_Mehrkam@i-o.com>
-          for tracking down the source of the warnings, and verifying
-          that -fno-implicit-templates works for PPC targets.
-
-Fri Apr 09 08:14:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU: replaced "ln -s" with
-          $(LN_S), and set that to "ln -s" by default.  Thanks to
-          Rainer Blome <rainer_blome@de.ibm.com> for suggesting this.
-
-Fri Apr  9 00:38:03 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/SOCK_Acceptor.cpp (shared_accept): Make sure to disable
-          ACE_NONBLOCK on the newly accepted socket since otherwise
-          applications can have weird behavior.  Thanks to Margaret Reitz
-          <margaret@veritas.com> and Irfan for helping to track this down.
-
-Thu Apr 08 13:47:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * BUG-REPORT-FORM,PROBLEM-REPORT-FORM,
-          README,VERSION,Makefile,Makefile.am,bin/make_release,
-          docs/ACE-bug-process.html: moved BUG-REPORT-FORM
-          to PROBLEM-REPORT-FORM.  Thanks to Thomas Lockhart
-          <Thomas.G.Lockhart@jpl.nasa.gov> for suggesting this.
-
-        * docs/ACE-guidelines.html: added checklist for ACE/TAO changes,
-          including commit with a meaningful message, update a
-          ChangeLog, and ack and respond to the requestor.
-
-Thu Apr  8 13:18:22 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/SString.h: Updated the documentation to show that "Memory is
-        _not_ allocated/freed if <release> is 0".
-
-Wed Apr  7 20:24:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CORBA_macros.h (ACE_DECLARE_NEW_CORBA_ENV): Removed the
-          trailing semi-column.  Thanks to Marina for the reminder.
-
-Wed Apr  7 19:09:05 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Containers_T: Replaced all Foo &Foo::operator=() with void
-          Foo::operator=() to avoid nasty problems with propagation of
-          errors.  Thanks to Chris Schleicher <chrissch@cnd.hp.com> for
-          reporting this.
-
-Wed Apr 07 17:25:07 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * apps/Gateway/Gateway/connection_config: Changed the connection 1
-          and 2 to use localhost since it would probably be the most
-          common test case.
-
-        * apps/Gateway/README: Replaced all references of proxy_config
-          to connection_config.  Also change the example port number to
-          10011 and 10012 which are the default port number used by the
-          gatewayd.
-
-          Thanks to Sam Rhine <rmsolution20@earchlink.net> for reporting
-          this.
-
-Wed Apr  7 16:36:41 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ACE-INSTALL.html: Put a note in saying to rebuild all
-          when upgrading releases.
-
-Wed Apr 07 14:25:47 1999  Joe Hoffert  <joeh@cs.wustl.edu>
-
-        * ace/ATM_Addr.{h,cpp}: modified files to compile for
-          machines without FORE XTI/ATM support.
-
-        * examples/IPC_SAP/TLI_SAP/CPP-{server,client}.cpp:
-          modified files to take out XTI/ATM code.
-
-        * examples/IPC_SAP/TLI_SAP/Makefile,CPP-ATM-{server,client}.cpp:
-          added separate test files for XTI/ATM
-
-Wed Apr  7 14:20:59 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/Basic_Types.h:
-          Added a signed companion to David's
-          ACE_UINT64_LITERAL, to avoid MSVC warnings. If
-          the platform has no 8-byte integer, this is
-          useless, but we must keep all compilers happy.
-          Also modified ACE_INT64_MAX tp use this, and
-          added a signed companion to
-          ACE_UINT64_FORMAT_SPECIFIER.
-
-Wed Apr 07 13:57:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: updated egcs shared library discussion
-          with information from Tim Rose <trose@bridgewatersys.com>
-          that egcs 1.1.1 statics libs work fine on Solaris 2.6.
-
-Wed Apr 07 13:14:34 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Object.{h,i} (fini_called): Accessor to the
-          underlying fini_already_called_ flag.
-
-        * ace/Service_Repository.cpp (find_i): Disallowed returning a
-          service which fini() has been called upon.
-
-Wed Apr  7 11:30:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * bin/auto_compile:
-          Added more tests to the script.
-
-Wed Apr 07 09:54:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/rules.local.GNU: instead of trying to
-          overwrite an existing symlink with ln -f, remove it first.
-          Thanks to Keith Rohrer <KRohrer@hnv.com> for reporting that
-          Solaris' ln -f doesn't work.
-
-        * ace/config-vxworks_5.x.h: added ACE_HAS_RECURSIVE_MUTEXES.
-          Thanks to Tom Venturella <Thomas.Venturella@MW.Boeing.com>
-          for suggesting this, because the VxWorks semaphores that
-          ACE uses for mutexes are recursive.
-
-        * ace/Synch.i (set_thread_id): added ACE_UNUSED_ARG (t), with
-          ACE_HAS_RECURSIVE_MUTEXES.
-
-Wed Apr 07 09:37:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_osf1_4.0.GNU: disable warning
-          1016 when optimization is enabled.  That gets rid of the
-          "D:incint" warning about bzero in sys/select.h.
-
-        * docs/ACE-guidelines.html: always use $(RM) instead of rm or
-          rm -f in Makefiles.
-
-Wed Apr 07 02:42:50 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.35 released.
-
-Wed Apr 07 02:04:30 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.34 released.
-
-Tue Apr  6 21:09:32 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/ATM_Addr: Added the ATM_Addr.* files into the CVS
-          respository.  However, we're not going to enable this in the
-          Makefile or project files until they are tested.
-
-Tue Apr  6 20:48:16 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/Basic_Types.h:
-          Added max and min #defines for various ACE data types. Now,
-          when using the ACE or ACE_CDR data types, we need not
-          depend on the vagaries of limits.h and float.
-
-Tue Apr  6 20:39:01 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Log_Record.cpp (format_msg):
-        * ace/Log_Record.cpp (print):
-
-          Changed host_name[] to *host_name since null pointers were being
-          passed into the host_name array.  Strictly speaking, host_name
-          should thus be a pointer, not an array.  Also cleaned up
-          ternary operator in format_msg() by parenthesizing some
-          expressions.
-
-Tue Apr  6 20:19:23 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Makefile: Removed the ATM_Addr files until Joe can
-          get them checked in.
-
-Tue Apr 06 19:36:24 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Active_Map_Manager.h (ACE_Active_Map_Manager_Key): Added a
-          separate structure that holds the fields of the key.  This
-          separate structure makes it easier to manage copying the index
-          and the generation to and from the user buffer.
-
-Tue Apr  6 16:07:29 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Synch.cpp (get_thread_id): If we have recursive mutexes then
-          it's not possible to get the id of the thread that's currently
-          holding the mutex.  Thanks to David for reporting this.
-
-Tue Apr  6 15:50:14 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/exceptions.html:
-        Updated the documentation.
-
-Tue Apr  6 15:25:56 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/High_Res_Timer.{h,i,cpp}: On Win32, don't call calibrate if
-          we cannot get the scale factor.  Instead, just automatically
-          fall back on ACE_OS::gettimeofday ().
-
-          Also added another static variable to represent the conditions
-          where the global scale factor is not set yet or high resolution
-          timers are not supported.
-
-Tue Apr 06 15:14:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Basic_Types.h:  added ACE_UINT64_LITERAL for platforms
-          with ACE_LACKS_U_LONGLONG_T.
-
-        * tests/Basic_Types_Test.cpp:  added test of ACE_UINT64_LITERAL.
-
-Tue Apr 06 14:54:56 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Message_Queue_Test.cpp (performance_test):
-        * tests/Message_Queue_Notifications_Test.cpp (producer): Unicode
-          related change.
-
-        * ace/ace_ce_dll.dsp: Added Active_Map_Manager.cpp.
-
-        * ace/OS.h:
-        * ace/config-WinCE.h: CE now uses non-static object manager.
-
-        * WindozeCE/WindozeCE.h: Instantiate the non-static object manager
-          within the class.
-
-        * WindozeCE/WindozeCEDlg.cpp: We should register the bridge window
-          using its HANDLE so it would work no matter we build ACE with or
-          without MFC support.
-
-Tue Apr  6 14:17:06 1999  Joe Hoffert  <joeh@tango.cs.wustl.edu>
-
-        * ace/OS.h: Added support for the FORE ATM XTI interface.
-
-        * ace/TLI_{Acceptor,Connector}: Added support for the FORE ATM XTI
-          interface.
-
-        * ace/ATM_Addr: Added support for ATM address for the XTI ATM
-          driver.  Eventually, this class will be generalized to work on
-          WinSock 2 ATM support, as well.
-
-Tue Apr 06 13:56:18 1999  Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
-
-        * include/makeinclude/rules.local.GNU: added -f to ln -s commands,
-          to force overwrite of old symlink.  This eases moving of
-          installed ACE code trees.
-
-Tue Apr  6 00:17:59 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * ace/DLL {.h, .cpp} (set_handle): Added the set_handle () method
-          which allows the user to set the ACE_SHLIB_HANDLE for the DLL.
-          Thanks to Bob McWhirter for bringing up this point.
-
-Mon Apr  5 22:27:02 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/config-irix6.x-sgic++-nothreads.h: Added
-
-          #if !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS)
-          #define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-          #endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */
-
-          to fix a problem with SGI 6.5.  Thanks to Bob Laferrie
-          <laferrie@execpc.com> for reporting this.
-
-Mon Apr  5 19:42:11 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-        * m4/acinclude.m4:
-
-          Created the macro ACE_CHECK_FOR_CVS_DIR to prevent the configure
-          script from continuing the configuration if the current
-          configuration directory is in a CVS controlled directory.  The
-          idea is to prevent automatically generated files from being
-          checked into the repository.  This will prevent accidental
-          overwrites of ACE's current Makefiles by the automatically
-          generated ones, for example.
-
-          In addition, this should ease the transition from the current
-          Makefile scheme to the new Auto{conf,make}/libtool scheme since
-          the current Makefiles can remain under CVS control without
-          the generate Makefiles interfering with them.
-
-Mon Apr 05 17:02:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/High_Res_Timer.cpp (global_scale_factor ()): removed
-          comment that said we use BogoMIPS on Linux/Intel.  We
-          only use it on Linux/alpha.  Thanks to
-          Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov> for
-          reporting this.
-
-Mon Apr  5 15:54:57 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Profile_Timer.i: Removed ACE_OS::gettimeofday ()
-          calls from start and stop.
-
-Mon Apr 05 15:09:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: removed second #include of netdb.h.  Thanks to
-          John H Aughey <tmpsp499@cec.wustl.edu> for reporting this.
-
-Mon Apr 05 14:17:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Trace.cpp: removed unnecessary (and complicated)
-          #include of ace/ACE.h.
-
-Mon Apr  5 13:21:49 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/Proactor.cpp:
-        (svc):
-        * ace/POSIX_Proactor.cpp:
-        * ace/POSIX_Proactor.h:
-        * ace/Proactor.h:
-        * ace/Proactor_Impl.h:
-        * ace/WIN32_Proactor.cpp:
-        * ace/WIN32_Proactor.h:
-        * examples/Reactor/Proactor/test_timeout.cpp:
-        Completed Timers implementation for POSIX platforms. Timers
-        implementation is now common for POSIX and WIN32. Portable
-        ACE_Auto_Event is used in the auxillary thread to wait for the
-        Timer events.
-        The Timer's code in WIN32 has been removed and the common code exists
-        in Proactor.{h,cpp} only.
-        A new factory method called create_asynch_timer has been created to
-        create the Timer Result class. This is used internally by the Proactor
-        to post timer completions to the Proactor completion
-        queue. Application may want to use this directly to fake
-        completions.
-
-Mon Apr 05 12:05:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.*,Thread_Manager.{h,cpp}: moved flags members from
-          ACE_Thread_Descriptor to a new ACE_OS_Thread_Descriptor base
-          class, to remove dependency of OS.cpp on Thread_Manager.h.
-
-Sun Apr  4 18:19:05 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-
-          Changed ANSI C++ cast test to fail on warnings.  Currently,
-          only g++ and Sun C++ warning/error conversion is supported.
-
-          Moved the ACE_SET_COMPILER_FLAGS macro after the AC_ARG_ENABLE
-          and AC_ARG_WITH calls so that user settings can influence what
-          compiler flags get set.
-
-          Removed some M4 comments (`dnl') that were inside of the
-          template specialization test header block.  The test was failing
-          since `dnl' was being quoted by M4 and actually placed inside
-          the test program source during test source compilation.  Also
-          corrected a typo in the same test.
-
-          Changed test for ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION so
-          that it attempts to link instead of just compile.  Hopefully
-          this will make the test "tougher."
-
-        * m4/compiler.m4:
-
-          Added `-features=castop' compiler flag and completed support for
-          `-features=rtti' via `--enable-rtti'.  These flags only work for
-          Sun C++ 4.2.  Added support for the `-noex' Sun C++ compiler flag
-          when the user disables exception handling.
-
-        * m4/platform.m4: Minor comment updates.
-
-Sat Apr  3 19:41:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/TTY_IO.cpp (control): Disabled support for higher baudrate
-          for non-NT platforms.
-
-Sat Apr  3 19:37:07 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/TTY_IO.cpp (control): Added support for more modem speeds.
-          Thanks to Valery Arkhangorodsky <avalery@geocities.com> for
-          reporting this.
-
-Sat Apr  3 17:02:48 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/tutorials/*: Regenerated all the HTML to get the hyperlinks
-        into the various headers.  I'm sure somebody will let me know if I
-        munged it all.
-
-        * docs/tutorials/(019|020|021) : Finally made myself sit down and
-        add Kirthika's last abstracts.
-
-Sat Apr  3 15:27:07 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile.am
-        * ace/Makefile.am
-        * netsvcs/clients/Naming/Client/Makefile.am
-        * netsvcs/clients/Tokens/manual/Makefile.am
-        * netsvcs/lib/Makefile.am
-        * tests/Makefile.am
-
-          Added targets to clean up files and directories created during
-          compilation.  Automake will setup the `clean-local' targets to
-          run automatically whenever a `make clean' is done.
-
-Fri Apr 02 23:25:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/make_release: added TAO/tao/Version.h.  Thanks to
-          Nanbor for suggesting this.
-
-        * ace/OS.cpp: removed use of ACE_Array with WIN32 and
-          TSS_EMULATION.  In doing this, fixed an off-by-one error:
-          ACE_TSS_Cleanup::remove () would try to remove key value
-          "n" from an ACE_Array of size "n".
-
-Fri Apr  2 19:19:09 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * bin/autogen: Update NEWS file by copying VERSION.  Temporary
-          hack to make Automake happy when doing a `make dist'.
-
-Fri Apr  2 18:37:29 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in: Placed the asynchronous IO checks right after
-          the thread library checks.  This was done to make sure the
-          library with AIO support gets added to the link list before
-          the rest of the tests start, and to make sure that it doesn't
-          get added if AIO isn't supported or isn't working.
-
-        * Makefile.am (ACE_EXTRA_DIST): Changed directory names to use
-          `$(top_srcdir)' instead of the current directory `.'.  This
-          allows a distribution to be made from a directory other than
-          ACE's top level source directory.
-
-        * m4/compiler.m4: Explicitly add the `-xildoff' flag to Sun CC's
-          LDFLAGS.  This is just a precautionary measure.  It shouldn't
-          be needed.
-
-Fri Apr  2 12:41:09 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Containers_T.h (all of the classes listed below):
-        * ace/Containers_T.i (ACE_Array):
-        * ace/Containers_T.i (ACE_DLList):
-        * ace/Containers_T.cpp (ACE_Bounded_Stack):
-        * ace/Containers_T.cpp (ACE_Fixed_Stack):
-        * ace/Containers_T.cpp (ACE_Unbounded_Stack):
-        * ace/Containers_T.cpp (ACE_Unbounded_Queue):
-        * ace/Containers_T.cpp (ACE_Double_Linked_List):
-        * ace/Containers_T.cpp (ACE_Fixed_Set):
-        * ace/Containers_T.cpp (ACE_Bounded_Set):
-        * ace/Containers_T.cpp (ACE_Unbounded_Set):
-        * ace/Containers_T.cpp (ACE_Ordered_MultiSet):
-        * ace/Handle_Set.h (ACE_Handle_Set):
-        * ace/Handle_Set.i (ACE_Handle_Set):
-
-          Changed assignment operators (operator=) to return a reference
-          to `*this' so that assignments may be chained.
-
-Thu Apr  1 23:41:56 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.cpp:
-          Fixed write_array() to memcpy if doing a byte-swap
-          and size = 1. Previously, it was falling through
-          without writing anything. Thanks to Jerry De Master
-          <jdemaste@ipdinc.com> for pointing this out.
-
-Thu Apr 01 22:38:25 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.33 released.
-
-Thu Apr 01 21:09:00 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * Sequence.h (TAO_Base_Sequence): Made the copy constructor and
-          the assignment operator public since making them protected was
-          breaking some compilers.
-
-        * ace/Filecache.cpp (ACE_Filecache_Object): Fixed typo: <lock_>
-          should be <lock>.
-
-Thu Apr  1 19:41:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/IPC_SAP.h (ACE_IPC_SAP):
-        * ace/SOCK.h (ACE_SOCK):
-        * ace/SOCK_IO.h (ACE_SOCK_IO):
-        * ace/SV_Semaphore_Simple.h (ACE_SV_Semaphore_Simple):
-        * ace/Synch.h (ACE_Barrier):
-        * ace/Synch.h (ACE_Event):
-        * ace/Synch.h (ACE_Guard):
-        * ace/Synch.h (ACE_Null_Mutex):
-        * ace/Synch.h (ACE_RW_Mutex):
-        * ace/Synch.h (ACE_Semaphore):
-          Reverted the changes that made these base class destructors
-          virtual.  They don't need to be virtual for the way they are
-          being used.
-
-Thu Apr 01 19:01:20 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Containers.h (ACE_DLList_Node):
-        * ace/Containers_T.h (ACE_Double_Linked_List_Iterator):
-        * ace/Containers_T.h (ACE_Unbounded_Set_Iterator):
-        * ace/Event_Handler.h (ACE_Event_Handler):
-        * ace/Event_Handler.h (ACE_Notification_Buffer):
-        * ace/Filecache.h (ACE_Filecache_Handle):
-        * ace/Filecache.h (ACE_Filecache_Object):
-        * ace/Local_Tokens.h (ACE_TPQ_Iterator):
-        * ace/Local_Tokens.h (ACE_Token_Proxy):
-        * ace/Local_Tokens.h (ACE_Token_Proxy_Queue):
-        * ace/Malloc.h (ACE_Name_Node):
-        * ace/Malloc.h (ACE_Static_Allocator_Base):
-        * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool):
-        * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool_Options):
-        * ace/Memory_Pool.h (ACE_Shared_Memory_Pool):
-        * ace/Memory_Pool.h (ACE_Shared_Memory_Pool_Options):
-        * ace/OS.h (ACE_Countdown_Time):
-        * ace/OS.h (ACE_Thread_Adapter):
-        * ace/OS.h (ACE_Thread_Control):
-        * ace/OS.h (ACE_Thread_Exit):
-        * ace/Service_Object.h (ACE_Service_Type):
-        * ace/Signal.h (ACE_Sig_Adapter):
-        * ace/Synch.h (ACE_Adaptive_Lock):
-        * ace/Synch.h (ACE_TSS_Adapter):
-
-          In some cases, classes with pointers *can* use the default copy
-          constructor and the assignment operator.  A more careful
-          screening of the egcs -Weffc++ flag need to be done before a
-          copy constructor and assignment operator can be considered
-          harmful/dangerous.  For now, the changes Ossama made have been
-          reverted.
-
-        * ace/Filecache.cpp (ACE_Filecache_Object):
-        * ace/Signal.i (ACE_Sig_Action):
-        * ace/OS.i (ACE_Time_Value):
-
-          Removed default contruction of structs. Old g++ is broken.
-
-        * ace/Filecache.cpp (ACE_Filecache_Object): Fixed incorrect
-          initialization of <mmap_>.
-
-Thu Apr  1 16:22:18 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Containers_T.h (ACE_Unbounded_Set_Iterator):
-        * ace/Containers_T.cpp (ACE_Unbounded_Set_Iterator):
-          The signatures for the prefix and postfix operators were
-          switched.  Prefix operators take a void and return a
-          a reference and postfix operators take an int and returns a
-          copy.
-
-        * ace/Containers.h (ACE_DLList_Node):
-        * ace/Containers_T.h (ACE_Double_Linked_List_Iterator):
-        * ace/Containers_T.h (ACE_Unbounded_Set_Iterator):
-        * ace/Event_Handler.h (ACE_Event_Handler):
-        * ace/Event_Handler.h (ACE_Notification_Buffer):
-        * ace/Filecache.h (ACE_Filecache_Handle):
-        * ace/Filecache.h (ACE_Filecache_Object):
-        * ace/Local_Tokens.h (ACE_TPQ_Iterator):
-        * ace/Local_Tokens.h (ACE_Token_Proxy):
-        * ace/Local_Tokens.h (ACE_Token_Proxy_Queue):
-        * ace/Malloc.h (ACE_Name_Node):
-        * ace/Malloc.h (ACE_Static_Allocator_Base):
-        * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool):
-        * ace/Memory_Pool.h (ACE_MMAP_Memory_Pool_Options):
-        * ace/Memory_Pool.h (ACE_Shared_Memory_Pool):
-        * ace/Memory_Pool.h (ACE_Shared_Memory_Pool_Options):
-        * ace/OS.h (ACE_Countdown_Time):
-        * ace/OS.h (ACE_Thread_Adapter):
-        * ace/OS.h (ACE_Thread_Control):
-        * ace/OS.h (ACE_Thread_Exit):
-        * ace/Service_Object.h (ACE_Service_Type):
-        * ace/Signal.h (ACE_Sig_Adapter):
-        * ace/Synch.h (ACE_Adaptive_Lock):
-        * ace/Synch.h (ACE_TSS_Adapter):
-          Explicitly disallow use of implicitly generated copy
-          constructor and assignment operator to prevent inadvertent
-          memory leaks.
-
-        * ace/Filecache.cpp (ACE_Filecache_Object):
-        * ace/OS.i (ACE_Time_Value):
-        * ace/Signal.i (ACE_Sig_Action):
-        * ace/Signal.i (ACE_Sig_Guard):
-        * ace/Signal.i (ACE_Sig_Set):
-        * ace/Synch_T.i (ACE_Guard):
-          Added base member initializers for class members that weren't
-          initialized.  Better style and helps avoid some warnings.
-
-        * ace/IPC_SAP.h (ACE_IPC_SAP):
-        * ace/SOCK.h (ACE_SOCK):
-        * ace/SOCK_IO.h (ACE_SOCK_IO):
-        * ace/SV_Semaphore_Simple.h (ACE_SV_Semaphore_Simple):
-        * ace/Synch.h (ACE_Barrier):
-        * ace/Synch.h (ACE_Event):
-        * ace/Synch.h (ACE_Guard):
-        * ace/Synch.h (ACE_Null_Mutex):
-        * ace/Synch.h (ACE_RW_Mutex):
-        * ace/Synch.h (ACE_Semaphore):
-          Made base class destructor virtual to ensure that it gets
-          called by derived class destructor.
-
-Thu Apr  1 13:31:56 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.{i,cpp}:
-          Moved the destructors and a couple of short output CDR
-          functions from .cpp to .i.
-
-Thu Apr  1 03:30:19 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/tao_svcconf.pl: New perl script to help converting TAO's
-          svc.conf file to use static services.
-
-Wed Mar 31 14:30:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h: Fixed mis-matched #endif comments.  Thanks to Eric
-          Eide <eeide@cs.utah.edu> for pointing this out.
-
-Thu Mar 31 14:30:20  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * tests/Message_Block_Test.cpp: updated some printouts.
-
-Wed Mar 31 10:46:31 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Message_Block_T.h: Add template arg to operator = definition for
-          ACE_Locked_Data_Block<>.
-
-        * ace/config-aix-4.x.h: Don't set _BSD for AIX 4.2 (or 4.3). Setting
-          it works ok on AIX 4.2, but breaks TAO builds.  Not setting it has
-          caused no regressions on 4.2, and allows TAO to build more.
-
-Tue Mar 30 23:28:41 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Message_Block.cpp (init_i): This function was not releasing
-          the old data block (if <data_block_> was non-zero).  Fixed this
-          problem and avoided the memory leak.  Thanks to Sangwoo Jin
-          <swjinjin@sei.co.kr> for reporting this leak.
-
-          Also changed the constructors to set <data_block_> to zero.
-
-        * tests/Message_Queue_Test.cpp (receiver): Fixed hacked use of
-          init() to prevent memory leak.  The new init_i() fixes the leak.
-
-Tue Mar 30 23:24:02 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-        * m4/features.m4:
-        * m4/threads.m4:
-          Updated several library checks to use a single call of my
-          re/implementation of the new autoconf AC_SEARCH_LIBS test instead
-          of having several AC_CHECK_LIB calls in a row.  Nice!
-
-          The thread detection tests were overhauled.  They are now
-          simpler but retain the same functionality as the previous
-          tests.  They were greatly reduced in size so debugging, updating
-          and enhancing should be much easier now.
-
-        * m4/acinclude.m4:
-          Reimplemented Autoconf's AC_SEARCH_LIBS into ACE_SEARCH_LIBS.
-          The functionality is the same but the ACE reimplementation
-          actually works when C++ is the test language.  For some reason
-          Autoconf's test isn't being generated properly by GNU M4.
-
-Tue Mar 30 22:04:49 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-win32-common.h: Added definition of
-          ACE_DEFAULT_THREAD_PRIORITY as 0.  Thanks to John Morey
-          <jmorey@tbi.com> for reporting this.
-
-Tue Mar 30 21:31:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * Makefile (RELEASE_LIB_FILES): added bin/ and etc/.
-          Thanks to John Lindal <jafl@alice.wonderland.caltech.edu>
-          for reporting that the ACE library Makefile needs
-          bin/ace_components.
-
-Tue Mar 30 18:49:58 1999  Darrell Brunsch  <brunsch@cs.wustl.edu>
-
-        * bin/make_release: Added .ico to binary file types.
-
-Tue Mar 30 12:23:23 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.32 released.
-
-Tue Mar 30 11:03:31 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Synch.h (ACE_Adaptive_Lock): Clarified a comment about how
-          to define a constructor in a subclass that initializes the
-          lock_.  Thanks to Michael Kircher for reporting this.
-
-Tue Mar 30 10:37:43 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.i (getpwnam_r): Added patch contributed by Roland Gigler
-          <roland@mch.pn.siemens.de> for getpwnam_r on SCO UnixWare 7.
-
-Mon Mar 29 20:22:44 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-        * m4/features.m4:
-          Added new M4 macro include file, and moved asynchronous IO tests
-          to `m4/features.m4'.  The asynchronous IO tests were improved by
-          making them run-time tests.  Cross-compiled platforms will fall
-          back to a compile-time test.  Thanks to Alex for providing
-          run-time tests.  The tests are based on his AIO tests found in
-          the examples/Reactor/Proactor directory.
-
-Sun Mar 28 18:02:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-          Enabled the C++ libtool support mentioned below.  Removed all
-          references to CXXCPPFLAGS since the CPPFLAGS variable is used
-          by autoconf for both C and C++.
-
-        * ltconfig:
-          Added my experimental libtool C++ support.  The hacks I made
-          allow it to build C++ shared libraries.
-
-        * m4/acinclude.m4:
-        * m4/threads.m4:
-          Renamed some variables.  Namespace pollution was breaking most
-          of the tests.
-
-Sun Mar 28 12:20:44 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h:
-        * ace/CORBA_macros.h: Moved ACE_NEW_THROW* and ACE_GUARD_THROW*
-          macros from OS.h to CORBA_macros.h.  Also added
-          ACE_*GUARD_THROW_EX which has the new ACE try macros semantics.
-          CORBA_macros.h needs to include "OS.h" to source in the correct
-          platform configuration macros.
-
-Sun Mar 28 13:27:15 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/exceptions.html:
-        Added a new example
-
-Fri Mar 26 23:35:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-freebsd-pthread.h: Added ACE_NEEDS_SCHED_H.
-
-        * ace/config-irix6.x-g++.h:
-        * ace/config-irix6.x-kcc.h:
-        * ace/config-irix6.x-sgic++.h:
-        * ace/OS.h: Reverted changes about ACE_LASKS_SCHED_H.
-
-        * ace/config-dgux-4.x-ghs.h:
-        * ace/config-irix6.x-sgic++.h:
-        * ace/README:
-        * ace/OS.h: Renamed ACE_LACKS_SCHED_H with ACE_NEEDS_SCHED_H to
-          refect what it really means.  The original name was quite
-          confusing.
-
-Fri Mar 26 18:16:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/config-irix6.x-g++.h:
-        * ace/config-irix6.x-kcc.h:
-        * ace/config-irix6.x-sgic++.h:
-          There is no need to explicitly include <sched.h> or to define
-          ACE_LACKS_SCHED_H the file is present in IRIX 6.4.
-
-Fri Mar 26 17:57:25 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-freebsd-pthread.h: Defined cuserid as an extern "C"
-          function.
-
-        * ace/OS.h: <sched.h> should only be included when !defined
-          (ACE_LACKS_SCHED_H).
-
-          Thanks to Eric Eide <eeide@cs.utah.edu> for sending the patch.
-
-Fri Mar 26 17:12:21 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/Profile_Timer.{h,i,cpp}: On Win32 platforms that
-          support RUsage, Profile_Timer will use both that and
-          High Resolution Timers for measurements.  Depending
-          on the method, one or the other will be used.
-
-Fri Mar 26 17:02:00 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-          Improved ACE_HAS_USING_KEYWORD test so that it works for platforms
-          that support the `using' keyword but don't have the `std' namespace.
-
-          Updated ACE_HAS_TEMPLATE_SPECIALIZATION test so that it works for
-          compilers that require the "template<>" syntax for specialization.
-
-          Improved ACE_HAS_ONLY_SCHED_OTHER by checking for run time errors
-          when a thread scheduling policy other than SCHED_OTHER is set.
-          Thanks to David for suggesting this modification.
-
-        * m4/acinclude.m4:
-          Added support for converting warnings to errors for Sun C++.
-
-        * m4/threads.m4:
-          Added test to check if `-Kthread' compiler flag enables thread
-          support.  SCO UnixWare 7 uses this flag.
-
-Fri Mar 26 07:21:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (handle_input): wrapped
-          final return statement with ACE_NOTREACHED.
-
-Thu Mar 25 20:16:49 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * bin/make_release: I wasn't using $bin_files for the
-          ACE+TAO.zip creation, so now that is fixed.  Thanks to
-          Greg Ross <gwross@west.raytheon.com> for pointing this out.
-
-Thu Mar 25 16:31:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.h:
-          Added new macros for byte swapping, this are rather evil. They
-          add the correct padding to use a single long to represent a
-          short or char, but in such a way that the first bytes of the
-          long contain the required data.
-          Nobody should need that, but the IDL compiler does.
-
-Thu Mar 25 16:25:46 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in: Added test for ACE_HAS_BROKEN_MAP_FAILED.
-
-        * ace/OS.h: Added __USLC__ to list of macros in the conditional that
-          keeps the compiler from complaining about parameters which are not
-          used.  This is needed for the C++ compiler on SCO UnixWare 7.
-          Thanks to Roland for letting me know about this.
-
-Thu Mar 25 14:55:37 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Basic_Types_Test.cpp: print out ACE version
-          information even with ACE_HAS_MINIMAL_ACE_OS.
-
-Thu Mar 25 13:52:57 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tests/Reactor_Performance_Test.cpp (handle_input): This code
-          wasn't entirely correct.  Well actually, I think where was some
-          change in the semantics of Windows. Previously, once the handle
-          was close, it seems that the application still got notified if
-          there was data on the socket.  With WinNT SP4, it seems that
-          once the handle was closed, no additional FD_READs were issued
-          by the OS, even if data was available on the socket.
-
-          In ACE, both FD_READ and FD_CLOSE get mapped to handle_input().
-          The way to know when the connection was closed is to do a recv()
-          in handle_input() and check for a zero return. When told of new
-          data, the old code in handle_input() only did one recv() of
-          BUFSIZ bytes. If there was more than BUFSIZ bytes of data on the
-          socket, there would be some data left on the socket.  Hence,
-          when notified of FD_CLOSE, it did another recv() which
-          succeeded, and handle_input() never returned -1, making the test
-          hang.
-
-          The change made was to make handle_input() call recv() until
-          EWOULDBLOCK occurs (note that the socket is in non-blocking
-          mode).  Hence, when FD_CLOSE occurred, the socket did not have
-          any data left, recv() returned 0 and handle_input() returned -1,
-          which finally closed the test down correctly.
-
-Thu Mar 25 13:13:51 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile.am (ACE.ifnames):
-          Placed rule generation of ACE.ifnames within a MAINTAINER_MODE
-          automake conditional.  If a `--enable-maintainer-mode' option
-          isn't given on the configure script command line then don't
-          generate a new `ACE.ifnames' file.
-
-        * configure.in:
-          Added AM_MAINTAINER_MODE so that maintainer level Makefile
-          features are disabled by default.
-
-        * acconfig.h:
-        * ace/OS.h:
-        * ace/README:
-          Added ACE_HAS_BROKEN_MAP_FAILED macro for platforms that do not
-          cast MAP_FAILED to a (void *).  Defining this macro prevents
-          compilers on those platforms from complaining about assigning
-          an int to a (void *).  Thanks to Roland Gigler
-          <roland@mch.pn.siemens.de> for providing feedback about this.
-
-Thu Mar 25 11:30:44 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/exceptions.html:
-        Corrected a couple of links...
-
-Thu Mar 25 01:04:00 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/OS.h (ACE_OS): Added ACE_DEFAULT_TEMP_DIR_ENV to be "TEMP"
-        for WIN32 and "TMP" for Unix.
-
-Wed Mar 24 18:30:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp: Added a new
-          version of this program that fixes a number of bugs with the old
-          one.  Thanks to Hao Ruan <hruan@lucent.com> for these fixes.
-
-Wed Mar 24 15:31:27 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * High_Res_Timer.cpp:
-        * High_Res_Timer.h:
-        * OS.i:
-
-          Changed the implementation of the High Resolution Timer on
-          Win32 to use QueryPerformanceCounter instead of assembly code.
-          The docs also say that this is MP-safe.  Thanks to Gregory D.
-          Fee <gdf2@cec.wustl.edu> for suggesting this.
-
-        * Profile_Timer.cpp:
-        * Profile_Timer.h:
-        * Profile_Timer.i:
-
-          Now uses the High Res Timer on Win32 instead of rusage.
-
-Wed Mar 24 14:36:12 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_OS_PREALLOCATE_OBJECT): Initialized obj_p to zero
-          to make egcs happy.
-
-Wed Mar 24 13:23:36 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: removed note about building netsvcs before
-          running the one-button test on WIN32.  Thanks to Nanbor for
-          hacking run_tests.bat :-)
-
-Wed Mar 24 13:16:17 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/WFMO_Reactor.i (handler):
-        * ace/Select_Reactor_T.cpp (handler_i): Made sure we can safely
-          pass out the event handler before we do so.  Thanks to Michael
-          Preobrazhensky <mikep@xpedite.com> for reporting this.
-
-        * tests/run_tests.bat: Do not run Time_Service_Test if
-          netsvcs/servers/main.exe doesn't exist.  Thanks to
-          Jeffrey_Franks@i-o.com for reporting the problem and David for
-          suggesting the fix.
-
-Wed Mar 24 12:47:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE-INSTALL.html: added note to build netsvcs on Win32
-          before running run_tests.bat.  Thanks to Jeff Franks
-          <Jeffrey_Franks@i-o.com> for suggesting this.
-
-Wed Mar 24 06:53:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (thr_create): SunOS 5.7 allows thread priority of 0,
-          so we no longer need to work around that.
-
-Tue Mar 23 22:49:15 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in: Added a test for ACE_NEEDS_DEV_IO_CONVERSION.
-
-Tue Mar 23 22:29:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.7.h: undef ACE_HAS_ONLY_SCHED_OTHER, because
-          other scheduling policies are supported by SunOS 5.7.  Thanks
-          to Ossama and autoconf for noticing this.
-
-Tue Mar 23 20:42:44 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tests/Cache_Manager_Test.cpp (main): Added missing ACE_START_TEST
-          and ACE_END_TEST macros.
-
-        * m4/threads.m4: Modified UNIX International threads check to include
-          check for rwlock_destroy() in -lthread since thr_create() was
-          found without explicitly linking to -lthread on Solaris 2.5.1.
-          rwlock_destroy() should be found only by linking to -lthread which
-          will cause the configure script to add -lthread to the library link
-          list.
-
-Tue Mar 23 16:25:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-subsets.html: added FOR_TAO subset sizes.
-
-Tue Mar 23 15:15:20 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Map_Manager.{i,cpp} (ACE_Map_Iterator_Base::operator*):
-          Moved this function to .cpp file to avoid compilation problem on
-          SunOS 5.6 with SunCC 4.2.  Once we know a patch that will fix
-          the problem, we should move it back to .i file again.  Thanks to
-          James Megquier <jmegq@bbn.com> for reporting the problem.
-
-Tue Mar 23 14:56:58 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h:
-        * configure.in:
-        * ace/OS.h:
-        * ace/TLI.cpp:
-        * ace/config-osf1-4.0.h: Removed all references to
-          ACE_HAS_BROKEN_T_ERRNO and removed the definition of the _terrno()
-          function from TLI.cpp since it isn't a standard TLI function (at
-          least not the Steven's books that I've read).  This also fixes a
-          problem on Solaris that was causing an autoconfigured build of
-          TLI.cpp to fail.
-
-        * ace/Makefile.am: Make sure template source files get installed for
-          all cases.  Previously, they only got installed if the template
-          source is required by the compiler.  However, they are still needed
-          by compilers that don't explicitly require template sources to
-          be included in a file that references them.
-
-        * configure.in: Fixed the test for ACE_TEMPLATES_REQUIRE_SOURCE.
-          Thanks to Carlos for his help on this.  Removed the test for
-          ACE_HAS_BROKEN_T_ERRNO since it is no longer needed due to the
-          above change.
-
-        * README: Added Konstantinos Margaritis <kmargar@cc.uoa.gr> to the
-          ACE contributor list.
-
-Tue Mar 23 12:57:40 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp: Split off the logging to
-          an ostream from the logging for STDERR.  Thanks to Bill Rizzi
-          (rizzi@softserv.com) for pointing out this problem.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp: Changed the default from
-          ACE_STDOUT to ACE_STDERR to be consistent.  Thanks to Bill Rizzi
-          (rizzi@softserv.com) for pointing out the problem.
-
-Tue Mar 23 12:06:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h (ACE_THROW_SPEC): Added prgama to disable reporting
-          warning 4290 on MSVC.  MSVC "supports" the exception
-          specification but doesn't provide an implementation for it.
-          Instead, it warns you the specification is ignored.
-
-Mon Mar 22 21:34:06 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_sunos5_g++.GNU: use -m uname
-          option instead of -i, because GNU uname doesn't support -i.
-
-Mon Mar 22 18:59:55 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/NT_Service.cpp (state): Changed the (DWORD *, ACE_Time_Value *)
-          version to reliably return -1 on any error.  Thanks to Martin
-          Krumpolec <krumpo@pobox.sk> for keeping me honest here, and for
-          sending in better code.
-
-Mon Mar 22 14:16:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp} (cleanup_tss): added tss_close (), to enable
-          deleting the native key on program termination.  That's not
-          implemented yet, because it requires a separate
-          ACE_OS::thr_keyfree (ACE_OS_thread_key_t).
-
-        * ace/OS.cpp (fini), README, ace/config-linux-lxpthreads.h:
-          removed ACE_FINI_HOOK support.  It wasn't helping.
-
-Mon Mar 22 11:14:16 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile.am:
-        Various minor updates.
-
-        * configure.in:
-        * m4/platform.m4
-        Moved known platform specific macro checks from `configure.in'
-        to `platform.m4'.
-
-        * tests/Makefile.am:
-        Updated to build the DLL_Test shared library.  Support for the
-        test is still broken (my fault :).
-
-        * aclocal.m4:
-        * configure:
-        These are automatically generated so they shouldn't be under
-        CVS control.  I Removed them from the CVS repository.
-
-Mon Mar 22 09:42:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-subsets.html: added current status section.
-
-Mon Mar 22 01:04:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.cpp (free_all_keys_left): Changed to remove left-over
-          keys using TlsFree on Win32.  We can't use ACE_OS::thr_keyfree
-          here because it tries to update the TSS in_use_ information
-          which has already been deleted at this point.
-          (cleanup_tss): Uncommented free_all_keys_left.
-
-Sun Mar 21 21:26:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/make_release: fixed error status when building ACE+TAO.
-          Thanks to Doug for reporting this.
-
-Sun Mar 21 21:16:02 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.31 released.
-
-Sun Mar 21 20:45:57 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.30 released.
-
-Sun Mar 21 18:39:16 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ACE.ifnames:
-
-        Updated with new macro list.
-
-        * Makefile.am:
-
-        Added the m4 directory to the distribution list and made some
-        minor updates.
-
-        * ace/Makefile.am:
-        * m4/subsets.m4:
-
-        Subsetting updates/corrections.
-
-        * configure.in:
-
-        Added work around for buggy glibc2.1 when including both
-        <ucontext.h> and <sys/procfs.h>.  Added check for auto_ptr class
-        declaration since some platforms have <memory> but may not
-        declare the auto_ptr class.  Shortened some of the "checking"
-        messages.
-
-        * ace-config.1.in:  ace-config script man page template
-        * aceConf.sh.in:    ace-config "unknown" library script
-
-        Added these files to the CVS repository.
-
-        * config.guess:
-        * config.sub:
-        * ltconfig:
-        * ltmain.sh:
-
-        Updated these files to the ones in the latest libtool.
-
-        * libtool:
-
-        Removed this since it is automatically generated for each platform.
-        It shouldn't be under CVS control.
-
-Sun Mar 21 17:59:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.cpp:
-          Fixed a problem with ACE_OutputCDR::write_octet_array_mb, thanks
-          to Dave Meyer <dmeyer@std.saic.com> for isolating and reporting
-          this bug again [it was fixed in TAO and somehow it crept to the
-          ACE version of the CDR classes].
-
-Sun Mar 21 17:42:08 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record):
-          Use ACE_NTOHL macro instead of system ntohl() to get around bug
-          in egcs-2.91.6x.
-
-Sun Mar 21 16:07:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/config-g++-common.h (ACE_HAS_USING_KEYWORD):
-          Define ACE_HAS_USING_KEYWORD for egcs 1.1.x.
-
-Sun Mar 21 09:44:30 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Timeprobe_Test.cpp: don't test ACE_Singleton
-          creation during static construction if ACE_HAS_PURIFY
-          is enabled, because it notices the memory-in-use.
-
-        * examples/Naming/Makefile: changed SRC to PSRC.
-
-        * examples/Naming/Makefile,performance-tests/Misc/Makefile,
-          tests/Makefile:
-          Use ace_components instead of the current ACE_COMPONENTS
-          setting to determine what should be built.
-
-Sat Mar 20 19:10:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Connector.h:
-        * ace/Connector.cpp:
-        * ace/Strategies_T.h:
-        * ace/Strategies_T.cpp:
-          Added new methods to the ACE_Connector, ACE_Strategy_Connector,
-          ACE_Connect_Strategy and ACE_Cached_Connect_Strategy.
-          The motivation for this new method is a bit convoluted:
-            In TAO we store the Svc_Handler returned from connect() as a
-            hint for later Cached_Connector lookups.  But the location
-            where we store it could be shared between multiple threads.
-            To minimize the number of locks this hint is only modified and
-            examined by the Cached_Connector, while the lock in the
-            connection map is beign held.
-
-            The problem arises when the hint is returned: another thread
-            could try to use the same hint location, detect that the hint
-            is in use and replace it before the thread that just requested
-            the object has a chance to read the hint value.
-            The solution is to use two variables: one is the hint
-            location, carefully protected by the Cached_Connector lock,
-            the other is a variable in the thread stack, they return the
-            same thing, but the second variable is not affected by changes
-            done by other threads.
-
-            In short: we addeda connect() method that takes two arguments,
-            the first is just intented to update the cached connector
-            hint, the second is where the real connection gets returned.
-
-        * tests/Makefile:
-          David discovered that using SRC to list the sources does not
-          work under some platforms. But using PSRC does.
-
-Sat Mar 20 15:51:14 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-          Added tests for: ACE_HAS_BROKEN_NAMESPACES
-                           ACE_HAS_BROKEN_CONVERSIONS
-                           ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS
-                           ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP
-                           ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP
-                           ACE_HAS_PTHREAD_PROCESS_ENUM
-
-          Added some minor updates and corrections.
-
-Sat Mar 20 09:06:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Map_Manager_Test.cpp: changed index () to slot_index ()
-          and generation () to slot_generation (), to correspond to
-          Active_Map_Manager interface change.
-
-        * examples/ASX/Message_Queue/Makefile: changed LSRC to PSRC.
-
-        * ace/Object_Manager.{h,cpp}: removed complex support from
-          ACE_Object_Manager for cleanup of some ACE_Singleton locks
-          during static construction/destruction, only.  The affected
-          lock types are ACE_Thread_Mutex, ACE_Mutex, and
-          ACE_RW_Thread_Mutex.  ACE_Recursive_Thread_Mutex and
-          ACE_Null_Mutex will still be cleaned up if used to create
-          ACE_Singletons during static construction/destruction.  As
-          noted in ace/Singleton.h, those are the best type of locks
-          to use with ACE_Singleton, anyways.
-
-          This support was tricky to get right, and increased the size of
-          the Object_Manager object file by 46 to 59 percent.  Now, if
-          ACE_Singletons are created during static construction or
-          destruction, with either an ACE_Thread_Mutex, ACE_Mutex, or
-          ACE_RW_Thread_Mutex lock, those locks will be dynamically
-          allocated and leaked.
-
-Sat Mar 20 02:03:53 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acinclude.m4:
-
-          Split acinclude.m4 into several M4 macro files and moved those
-          files into the new `m4' subdirectory, includind acinclude.m4.
-
-        * m4/acinclude.m4:
-        * m4/compiler.m4:
-        * m4/subsets.m4:
-        * m4/threads.m4:
-
-          Added these M4 files.
-
-        * bin/autogen:
-
-          Script to regenerate auto{conf,make} and libtool related files.
-          Additional functionality may be added to this script in the
-          future.
-
-        * Makefile.am:
-        * ace/Makefile.am:
-        * apps/gperf/src/Makefile.am:
-        * apps/gperf/tests/Makefile.am:
-        * apps/gperf/Makefile.am:
-        * apps/Makefile.am:
-        * netsvcs/clients/Logger/Makefile.am:
-        * netsvcs/clients/Naming/Client/Makefile.am:
-        * netsvcs/clients/Naming/Dump_Restore/Makefile.am:
-        * netsvcs/clients/Naming/Makefile.am:
-        * netsvcs/clients/Tokens/collection/Makefile.am:
-        * netsvcs/clients/Tokens/deadlock/Makefile.am:
-        * netsvcs/clients/Tokens/invariant/Makefile.am:
-        * netsvcs/clients/Tokens/manual/Makefile.am:
-        * netsvcs/clients/Tokens/mutex/Makefile.am:
-        * netsvcs/clients/Tokens/rw_lock/Makefile.am:
-        * netsvcs/clients/Tokens/Makefile.am:
-        * netsvcs/clients/Makefile.am:
-        * netsvcs/lib/Makefile.am:
-        * netsvcs/servers/Makefile.am:
-        * netsvcs/Makefile.am:
-        * man/man3/Makefile.am:   ( NOT ADDED YET )
-        * man/Makefile.am:        ( NOT ADDED YET )
-        * tests/log/Makefile.am:
-        * tests/Makefile.am:
-
-        Added Automake makefile templates for ACE.
-
-        * configure.in:
-        * m4/subsets.m4:
-        * ace/Makefile.am:
-
-        Added support for David's ACE subsetting work.
-
-Fri Mar 19 23:36:37 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Active_Map_Manager.h (ACE_Active_Map_Manager_Key): Changed
-          method index() to slot_index() and generation() to
-          slot_generation().  These changes were motivated by the
-          OpenEdition platform/compiler, which defines a macro called
-          index().  Also, changed the type of <index_> and <generation_>
-          from u_long to ACE_UINT32 to get consistent size across
-          platforms.
-
-Fri Mar 19 22:50:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/ace_ld: inserted ^['"]? at beginning of patterns that check
-          for -l and -L, to make sure they're at the beginning of arguments.
-          Thanks to Henric Jungheim <junghelh@pe-nelson.com> for
-          suggesting this.
-
-        * tests/Makefile: removed SRC, because it caused link problems
-          on DU 4.0.
-
-Fri Mar 19 18:56:26 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Fixed several makefiles that did not have a SRC or LSRC variable
-          defined.
-
-        * Re-generated the dependencies for both ACE and TAO, this time on
-          a platform that includes the template code.
-
-        * include/makeinclude/rules.local.GNU:
-          Now we can run make depend inside a build directory.
-          Removed any $(ACE_ROOT)/ace/config*.h files from the dependency
-          list, those are not used.
-
-Fri Mar 19 18:05:27 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record):
-          Reverted change that was thought to work around egcs compiler bug.
-          The call to ntohl() within the templates still causes the compiler
-          to complain.
-
-Fri Mar 19 17:31:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.cpp:
-          Fixed silly error in the InputCDR constructor taking an
-          ACE_Message_Block.
-
-Fri Mar 19 15:41:30 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/config-win32-common.h: Added CE fix.
-
-Fri Mar 19 15:03:54 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-        * ace/CDR_Stream.cpp:
-          Changed CDR to ACE_CDR.
-          Fixed ACE_InputCDR constructor when receiving a linked list of
-          Message_Blocks.
-
-        * tests/CDR_Test.cpp:
-          Added a test for the constructor above.
-
-Fri Mar 19 10:29:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Singleton.cpp (instance): removed at_exit () calls
-          from both ACE_Singleton and ACE_TSS_Singleton, only
-          when the ACE_Object_Manager hasn't started or has already
-          shutdown.  In those cases, the singletons will leak.
-
-        * ace/Object_Manager.cpp (ACE_Object_Manager ctor),
-          ace/OS.cpp (ACE_OS_Object_Manager ctor): allow
-          newer instances to overwrite older ones, in case an application
-          #defines ACE_HAS_NONSTATIC_OBJECT_MANAGER and uses the
-          Object_Manager during construction of static objects.
-
-        * tests/Timeprobe_Test.cpp: added test of ACE_Singleton
-          creation during construction of static objects.  Timeprobes
-          can do that, when they're enabled.
-
-        * ace/OS.cpp (fini), README: added ACE_FINI_HOOK support.
-          Applications can #define ACE_FINI_HOOK to any executable code,
-          and it will be executed on program termination.
-
-        * ace/config-linux-lxpthreads.h: with ACE_HAS_TSS_EMULATION,
-          #define ACE_FINI_HOOK to insert a one-second sleep at
-          program termination.  It's necessary to avoid occasional
-          segfaults of unknown origin, but they appear to be in the
-          LinuxThreads library.
-
-        * bin/ace_components: added.  It is used to record/access
-          which components were built into the ACE library.  See next
-          entry for files that have been updated to use it.
-
-        * ace/Makefile,tests/Makefile,tests/run_tests.sh: use
-          ace_components to record which components are in the ACE library.
-          Suppress build/run of tests that use Token and Other.
-
-        * netsvcs/{clients,servers}/Makefile: use ace_components instead of
-          the current ACE_COMPONENTS setting to determine what should be built.
-
-Fri Mar 19 03:24:34 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Singleton.cpp (instance): Commented out the call to
-          ACE_Object_Manager::at_exit().  Currently, this is causing
-          multiple instances of ACE_Object_Manager to get created, and
-          hence causing all sorts of problems.
-
-        * ace/OS.cpp (cleanup_tss): Removed the call to
-          free_all_keys_left() (WIN32 only), because it causes
-          segmentation faults at shutdown.
-
-Fri Mar 19 00:15:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        The following changes are specific to WindowsCE.  They are
-        required to remove MFC dependency from CE port.  Thanks to Eric
-        Covington <eric@nowsol.com> for motivating this.
-
-        * ace/config-WinCE.h: We no longer enfoce the use of MFC with ACE
-          CE port anymore.
-
-        * ace/config-win32-common.h: When not using MFC, CE needs to
-          include <windows.h> and <wce.h> explicitly.
-
-        * ace/Log_Record.cpp (print):
-        * ace/OS.{h,cpp} (ACE_CE_Bridge): Changed to use HWND to record
-          target window handle instead of CWnd. Also, we stop passing
-          output string in a CString anymore.  The string is now created
-          using ACE_OS::strdup and must be released by the target window
-          using ACE_OS::free..  A small smart pointer class will be added
-          later.  Notice that if you used ACE CE port before, the wParam
-          can no longer be casted to a CString*, it should be casted to
-          LPTSTR now.
-
-        * WindozeCE/WindozeCEDlg.cpp: <wParam> should be casted to LPTSTR
-          and it should be freed using ACE_OS::free.
-
-        * ace/ace_ce_dll.dsp: CE programs (or DLL only?) not using MFC
-          must specify all libraries used by the program, even msvcrt.
-
-Thu Mar 18 22:21:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU: changed
-          ACE_QUOTE to '"', instead of "", on win32 hosts.   "" just
-          evaporates to nothing; we really need one double quote.
-          Thanks to Hans Rohnert for verifying this.
-
-Thu Mar 18 18:49:32 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * ace/SString.i (compare): fixed the function to work properly in
-        case strings have different lenghts.
-
-        * ace/SString.cpp: fixed code to gracefully handle failed memory
-        allocations.
-
-        * ace/SString.h: added comments about strings with release=0, not
-        necessarily being null terminated.
-
-Thu Mar 18 14:31:29 1999  Steve Huston  <shuston@riverace.com>
-
-        * tests/DLL_Test.cpp: Use the new DLL_Test.h file that contains the
-          class defs - needed for AIX xlC.  This should have been done
-          with the Mar 15 changes but slipped through the cracks.
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Added support for
-          building HP-UX 11 distributions with both 32 and 64 bits.
-
-        * docs/tutorials/006/client_handler.cpp (Client_Handler::open): Changed
-          arg name to void_acceptor to avoid redefining it inside the function.
-
-        * docs/tutorials/007/client_acceptor.cpp (Client_Acceptor(Thread_Pool&)
-          Fixed initialization of concurrency_.
-
-        * docs/tutorials/018/Test_T.cpp (open): Fix ACE_UNUSED_ARG(arg).
-
-        * ace/Message_Queue.h (ACE_Message_Queue_Base): Removed "= 0" from
-          ~ACE_Message_Queue_Base.  AIX xlC warns that pure virtual dtor
-          needs an out-of-line definition to be a base of another class.
-          There is already a definition for the dtor in Message_Queue.i.
-
-Thu Mar 18 14:30:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i (timezone): Removed the leading '::' to cope with VC
-          5.  Thanks to Lan Yaolong <lyaolong@cs.sunysb.edu> for reporting
-          this.
-
-Wed Mar 17 17:23:43 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * ace/OS.i (timezone): Added support for timezone () on CHORUS
-
-Wed Mar 17 14:06:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * acconfig.h: Some characters got removed so I put them back.
-
-Wed Mar 17 13:59:42 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-        * acconfig.h:
-          Added autoconf check for rename() system call.
-
-Wed Mar 17 07:55:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * include/makeinclude/platform_freebsd_pthread.GNU: Made some
-          adjustment for building ELF executables which are the default on
-          FreeBSD 3 and above.  I'll incoporate Russell's LinuxThread
-          change later.
-
-Wed Mar 17 13:36:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/make_release: return non-zero exit status on failure.
-
-Wed Mar 17 12:47:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Config.cpp (open_i): Also delete the parse buffer
-          before exiting the function for it is no longer needed.  We
-          still need to deallocate the buffer at close method to prevent
-          the case when uses manipulate Service_Config directly using
-          process_directives.
-
-Wed Mar 17 12:33:35 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/OS.i: Reenabed ACE_OS::rename() and we'll see which
-          platforms need to have ACE_LACKS_RENAME.  Thanks to Susan
-          Liebeskind <shl@cc.gatech.edu> for reporting this.
-
-Wed Mar 17 10:46:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Message_Block.i (space): Moved ACE_Message_Block::space()
-          after inline declarations of ACE_Message_Block::end() and
-          ACE_Message_Block::wr_ptr() to prevent "used before it was
-          declared inline" warnings on end() and wr_ptr().
-
-Wed Mar 17 10:24:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (argv_to_string): initialized temp to 0 to avoid warnings
-          from VxWorks g++.
-          ace/OS.i (strenvdup): initialized temp to 0 to avoid warnings from
-          VxWorks g++.  Thanks to Hans Rohnert for reporting these.
-
-        * include/makeinclude/platform_vxworks5.x_g++.GNU (RANLIB):
-          replaced /bin/true with @true, to avoid build warning on
-          NT hosts.  Thanks to Hans Rohnert for reporting this.
-
-Wed Mar 17 09:58:43 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Svc_Conf.l (yy_delete_parse_buffer): Added a check for NULL
-          to avoid freeing buffers multiple times.  Thanks to Tom Arbuckle
-          <arbuckle@uran.informatik.uni-bonn.de> for this fix and to
-          Nanbor for noticing the problem in the first place!
-
-Wed Mar 17 08:30:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.29 released.
-
-Wed Mar 17 03:12:43 1999  James C. Hu  <jxh@entera.com>
-
-        * ace/Message_Block.i: Changed the definition of space () to be
-          something more useful than it was.  Thanks to Bill Rizzi
-          (rizzi@softserv.com) for pointing out the problem.
-
-        * ace/Cache_*: Removed by popular decree.  Can be found in
-          JAWS/PROTOTYPE.
-
-Wed Mar 17 03:06:20 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Config.cpp (close): Re-enabled cleaning up the lex
-          buffer.
-
-        * ace/Svc_Conf_l.cpp (ace_yy_delete_parse_buffer): We should not
-          remove uninitialize buffer.
-
-Tue Mar 16 19:48:57 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Makefile and tests/Makefile: Reverted these files to the
-          pre-Cache_Manager state.  The Cache_Manager files don't compile
-          on g++ and vxworks and we need to make a release now.
-
-        * ace/Map_T.h (class ACE_Noop_Key_Generator): Added new class.
-          This class makes it easy to use the map adapters when you don't
-          care about generating new keys.
-
-Tue Mar 16 11:36:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/config-freebsd-pthread.h: FreeBSD 2.2 and above also support
-          threads, but siginfo_t is only supported on FreeBSD 3.0 and
-          above.  Thanks to Goldshtain Dmitry <goldshtain.dmitry@usa.net>
-          for pointing these out.
-
-Tue Mar 16 16:46:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Hash_Bucket_T.h: added class to friend
-          ACE_Hash_Bucket_DLCStack_Iterator declaration.
-
-Tue Mar 16 16:35:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: never use TRUE, true, FALSE, false, etc.
-
-Tue Mar 16 15:58:07 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Service_Config.cpp (close): Don't call the
-          ace_yy_delete_parse_buffer for now.  It is causing access
-          violation.
-
-Tue Mar 16 15:15:00 1999 Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/ACE.{cpp, i}
-          ace/OS.{cpp, h, i}
-          ace/FIFO.cpp
-          ace/Log_Record.cpp
-          ace/SOCK_Dgram_Mcast.cpp
-          ace/SPIPE_Connector.cpp
-          ace/TLI_Acceptor.cpp
-          ace/config-psos-diab-mips.h (new)
-          ace/config-psos-diab.h
-          ace/config-psos-tm.h
-          ace/streams.h: integrated pSOS/MIPS changes into ACE.  Thanks to
-          Jaepil Kim  (jpkim@lgsoft.com) for completing the ACE pSOS port
-          for the MIPS platform, and for sending these modifications.
-
-Tue Mar 16 14:25:03 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/ACE.cpp (get_ip_interfaces, count_interfaces, get_bcast_addr):
-          On AIX, use CSIOCGIFCONF instead of SIOCGIFCONF to retrieve
-          interface information.  Thanks to Eric Newton <ecn@smart.net> for
-          figuring this out.
-
-Tue Mar 16 12:20:53 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * ace/Service_Config.h (ACE_Service_Config):
-        Added documentation for the parse_args () method. This was in
-        request to Bill Rizzi <rizzi@softserv.com>.
-
-Tue Mar 16 10:57:46 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Svc_Conf.l: Added a new method ace_yy_delete_parse_buffer()
-          that frees up FLEX buffers when the program is done.  Thanks to
-          Tom Arbuckle <arbuckle@uran.informatik.uni-bonn.de> for
-          this fix.
-
-        * examples/ASX/Message_Queue/buffer_stream.cpp (main): Changed pm
-          to cm and vice versa to be consistent.  Thanks to Rainer Blome
-          <rainer_blome@de.ibm.com> for reporting this.
-
-Tue Mar 16 10:50:42 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix4_cset++.GNU: New file to cover
-          all AIX 4.x versions with the C Set++ (xlC) compiler.
-
-        * include/makeinclude/platform_aix.GNU, platform_aix4.2.GNU: These
-          files are deprecated; they simply include the new file above,
-          platform_aix4_cset++.GNU.
-
-Tue Mar 16 10:38:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Hash_Bucket_T.cpp:
-          Removed default parameter declaration from the constructor for
-          ACE_Hash_Bucket_Manager definition. Default parameter
-          declarations can only show up in the function declaration.
-
-Tue Mar 16 10:25:53 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.1.x.h, config-aix-4.2.x.h: These now simply
-          include config-aix-4.x.h.  All further changes for any AIX 4.x
-          version should go in config-aix-4.x.h.
-
-Tue Mar 16 08:12:54 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/Thread_Manager.cpp: In thread_within(ACE_thread_t), replaced use
-          of '==' with ACE_OS::thr_equal.  In hthread_within (ACE_hthread_t),
-          replaced use of '==' with ACE_OS::thr_cmp.  Thanks very much to
-          Peter Windle <peterw@ugsolutions.com> for pointing this out.
-
-        * README: Added Peter Windle to the list of distinguished contributors.
-
-Tue Mar 16 03:05:22 1999  James Hu <jxh@entera.com>
-
-        * ace/Cache_Hash_T.{cpp,h}:
-        * ace/Cache_Heap_T.{cpp,h}:
-        * ace/Cache_List_T.{cpp,h}:
-        * ace/Cache_Manager.{cpp,h}:
-        * ace/Cache_Manager_T.{cpp,h}:
-        * ace/Cache_Object.{cpp,h}:
-        * ace/Hash_Bucket_T.{cpp,h}:
-          Incorporated fixes from purify and benchmarking sessions at Entera.
-          Cosmetic changes coming soon (documentation strings and removal
-          of magic numbers).
-
-        * ace/Makefile: Added above files to Makefile.
-
-        * ace/OS.i: FreeBSD does not support the timezone() function as
-          documented by Vishal below.  Using Chris Gill's implementation
-          for LynxOS.
-
-        * tests/Makefile:
-        * tests/Cache_Manager_Test.cpp:  Added this test to illustrate
-          Cache_Manager.  Still needs changes to use ACE_DEBUG instead of
-          cerr.
-
-Mon Mar 15 19:05:22 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/config-aix-4.x.h: New config file that covers all of the AIX 4.x
-          versions with C Set++ (xlC) and g++.  Many thanks to Susan
-          Liebeskind <shl@cc.gatech.edu> for doing to port to AIX 4.3 and
-          testing, providing needed changes!
-
-        * ace/OS.i (wait): Fixed to handle ACE_HAS_UNION_WAIT case correctly,
-          without depending on AIX - thanks to Susan Liebeskind for this too!
-
-        * ace/ACE.cpp (fork, with zombie avoidance): Fixed to work right
-          with ACE_HAS_UNION_WAIT (ala AIX 4.2).
-
-        * include/makeinclude/rules.lib.GNU: New template instantiation
-          scheme for AIX with C Set++ (xlC); goes with...
-        * etc/xlc_dummy.cpp: New file, purpose of which is to help with AIX
-          xlC template instantiation.  This is the new, improved method from
-          IBM suport.  It still generates a zillion duplicate definition
-          warnings, but IBM doesn't have any better solution.
-
-        * include/makeinclude/platform_aix4.2.GNU: This will work with both
-          AIX 4.2 and 4.3 now.  I'll take care of the naming soon.
-
-        * tests/Map_Test.(cpp h): Moved template defs to new file, Map_Test.h
-          to satisfy AIX xlC.  Thanks to Susan for this too.
-
-        * tests/DLL_Test.(cpp h): Moved template defs to new file, DLL_Test.h
-          to satisfy AIX xlC.
-
-        * tests/Makefile, Makefile.DLL: Fixed to build libDLL_Test correctly
-          on AIX w/ xlC.
-
-        * tests/run_tests.sh: Sets LIBPATH correctly for AIX (4.2 at least).
-
-Mon Mar 15 00:26:31 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/ACE-netsvcs.html: Updated this to document the current
-          version.  Thanks to Bill Rizzi <rizzi@softserv.com> for
-          reporting this.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp: Make sure that debug
-          messages go to stderr and log messages go to stdout.  Thanks to
-          Bill Rizzi <rizzi@softserv.com> for reporting this.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (fini): Oops, fixed a
-          minor buglet with return values.  Thanks to David for reporting
-          this.
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (send): Added a check to
-          make sure we don't crash if the ostream is NULL.  Thanks to Bill
-          Rizzi <rizzi@softserv.com> for reporting this.
-
-Sun Mar 14 22:54:41 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * netsvcs/lib/Client_Logging_Handler.cpp (init): Added an
-          ACE_OS::unlink() to prevent STREAM pipes from getting confused
-          if this application doesn't shutdown gracefully.  Thanks to Bill
-          Rizzi <rizzi@softserv.com> for reporting this.
-
-Sun Mar 14 19:51:25 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in: Added real-time support library `-lrt' check to
-          asynchronous IO functions/libraries checks.
-
-          GNU glibc 2.1 adds support for the POSIX 1b real-time
-          specification in the library `librt'.  The POSIX asynchronous IO
-          functions may be found in that library.  Currently, `-lpthread'
-          must also be linked to in addition to `-lrt'.
-
-Sun Mar 14 17:20:09 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Log_Msg: Generalized the enable_debug_messages() and
-          disable_debug_messages() methods so they can be used to enable
-          or disable arbitrary priorities.  Thanks to Susan Liebeskind
-          <shl@janis.gtri.gatech.edu> for suggesting this.
-
-Sun Mar 14 14:46:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * ace/OS.i (tzset,timezone):  pSOS doesn't support these two
-          functions.
-
-        * ace/OS.{cpp, h}: added comments clarifying usage for
-          ACE_Time_Value::max_time, use of ACE_PSOS_TM in ACE_OS::signal ().
-
-Sun Mar 14 01:30:43 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i (tzset,timezone):  WinCE doesn't support these two
-          functions.
-
-Sat Mar 13 12:14:34 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Thread_Manager: Changed the following methods:
-
-          int task_list (..)
-          int thread_list (...)
-          int hthread_list (..)
-          int thread_grp_list (...)
-          int hthread_grp_list (...)
-
-          to return actual number of fetched values.
-
-        * ace/Thread_Manager: Added two new methods, task_all_list() and
-          thread_all_list(), which return lists of all the tasks and
-          threads in a Thread_Manager, respectively.  Thanks to Zoran
-          Ivanovic <zorani@pathcom.com> for contributing this.
-
-        * ace/Shared_Memory_{MM,SV}.h: Clarified the relationship of
-          these classes to the more powerful ACE_Malloc<> abstraction.
-          Thanks to Ti Z <tiz@cisco.com> for suggesting this.
-
-Sat Mar 13 13:27:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (timezone,tzset): not supported on VxWorks.
-
-        * include/makeinclude/ platform_osf1_4.0.GNU: added suppression
-          of msg 1180, statement causes unreachble return, with cxx 6.2
-          and later.  It doesn't like ACE_OSCALL_RETURN and
-          ACE_NOTSUP_RETURN, though it seems to be going overboard.
-          The warnings appeared with cxx 6.2-009.  If someone uses
-          6.2-007, they might have to manually remove the 1180 suppression.
-
-        * examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp (handle_events),
-          C-inserver.cpp (main),
-          netsvcs/lib/Server_Logging_Handler_T.cpp (handle_logging_record),
-          apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (svc):
-          replaced NOTREACHED comment with ACE_NOTREACHED macro.  DU cxx
-          started complaining about the unreached return statement.
-
-Sat Mar 13 16:16:13 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/tutorials/021: Added some comments to page04 about the
-          template parameters and the use of the ACE_LOCK parameter in
-          particular.  (Thanks to Bala for the suggestion.)
-
-Sat Mar 13 00:37:17 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.28 released.
-
-Fri Mar 12 20:17:47 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Select_Reactor_Base.cpp (handle_input):
-        * ace/WFMO_Reactor.cpp (handle_signal): Added support for
-          dispatching QOS_MASK and GROUP_QOS_MASK.
-
-Fri Mar 12 19:13:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Implemented ACE_OS::timezone() for LynxOS.
-
-Fri Mar 12 16:31:19 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ACE-INSTALL.html (Linux): added note about non-thread safe
-        glibc 2.0 dynamic loader.  The dynamic loader in glibc 2.1 is
-        thread safe.
-
-Fri Mar 12 13:44:54 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/DLL_Test.cpp (main): Fixed the errors on VxWorks and
-          LynxOS by shifting the START_TEST before the #ifdefs began.
-
-Fri Mar 12 12:53:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-sunos5.5.h: with CC 5.0, replaced ACE_LACKS_ACE_IOSTREAMS
-          with ACE_USES_OLD_IOSTREAMS.
-
-        * include/makeinclude/platform_sunos5.5_sunc++.GNU: with CC 5.0,
-          added -library=iostream,no%Cstd to CCFLAGS.
-
-        Thanks to Diethard Ohrt <Diethard.Ohrt@siemens.at> for the
-        above two updates to support CC 5.0.
-
-Fri Mar 12 12:09:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h: fixed comment after #endif to match its #ifdef.
-
-Fri Mar 12 11:46:55 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Added two new functions tzset () and timezone (). The former sets the
-        timezone information based on an environment variable TZ which is
-        set when the user logs on. (For St. Louis TZ=US/Central and
-        timezone = 360 minutes or 6 hrs. from GMT.). timezone () retrieves
-        the timezone value in seconds.
-
-        * ace/OS.h (ACE_OS): Added a wrapper for timezone () and tzset ().
-        * ace/OS.i (ACE_OS): Added Implementation for the above functions.
-
-        The timezone information is being used in the Time Service.
-
-Thu Mar 11 20:11:13 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Get_Opt.cpp (operator): Reverted the following change since
-          it will break documented behavior.  Thanks to Jon Biggar for
-          reporting this.
-
-        * ace/Get_Opt.cpp (operator): When the getopt encountered an
-          unknown option or an option with a missing required argument, it
-          returned '?' and continues to allow processing with the next
-          argument (no problem so far).  However, if it encountered an
-          argument that is not an option (i.e. no '-' in front) or if it
-          encounters a double dash (i.e. '--') it returns EOF which
-          disallows further processing.  Now, it returns a '?'  after
-          advancing optind to allow further processing.  Thanks to Mark
-          Laffoon <mark.laffoon@centraxcorp.com> for reporting this.
-
-Thu Mar 11 15:34:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/ACE.cpp: removed unnecessary #includes of ace/IPC_SAP.h,
-          ace/Process.h, and ace/SString.h.  Thanks to Elias Sreih
-          <sealstd1@nortelnetworks.com> and Liang Chen
-          <chenl@nortelnetworks.com> for suggesting this.
-
-        * ace/OS.cpp (ACE_OS::thr_setspecific): on ACE_WIN32 with
-          ACE_HAS_TSS_EMULATION, don't register the one native key
-          with ACE_TSS_Cleanup::instance ().  There's no need, because
-          it doesn't have a destructor.  And, it prevents startup
-          because the ACE_TSS_Cleanup structures haven't been set up
-          completely when it is called.  Thanks to Terry Rosenbaum
-          <Terry.Rosenbaum@Radiology.MSU.edu> for reporting this.
-
- Thu Mar 11 14:04:15 1999 David L. Levine <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_chorus_ghs.GNU: added protection
-          to not reset exceptions flag if it was defined.
-
-Thu Mar 11 12:53:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/Thread_Manager.i:
-          The method to return the number of threads was using thr_lists_
-          as a pointer, but it isn't.
-
-Thu Mar 11 10:12:51 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/Thread_Manager: Added a method to return the current number
-          of threads in the ACE_Thread_Manager.  Thanks to Zoran Ivanovic
-          <zorani@pathcom.com> for suggesting this.
-
-Thu Mar 11 10:27:51 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/DLL_Test.cpp (main): Allowed the main to be accessible on
-          all platforms by shifting the #ifdefs inside the main. The
-          problem arose due to the main being declared an undefined
-          reference on LynxOS.
-
-Wed Mar 10 13:31:37 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/config-linux-common.h:
-        Commented out ACE_HAS_DLFCN_H_BROKEN_EXTERN_C, ACE_LACKS_MSYNC and
-        ACE_LACKS_MADVISE.  They are no longer needed for recent revisions
-        of glibc 2.x.  Thanks to <nbecker@fred.net> for pointing this out.
-
-Wed Mar 10 11:05:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Thread.h,ace/Thread_Manager.h (exit): added comment
-          that exit () should not be called by main thread.
-
-        * ace/OS.h: added an ACE_OS_thread_key_t typedef on WIN32
-          with ACE_HAS_TSS_EMULATION.  Thanks to Terry Rosenbaum
-          <Terry.Rosenbaum@Radiology.MSU.edu> for reporting that
-          it was missing.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: disable msg 1136 with
-          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>
-
-        * ace/Basic_Types.h:
-          Fixed minor problem that would show up if sizeof(int)==2; thanks
-          to Cristian Ferretti <cfs@mat.puc.cl> for reporting this
-          problem.
-
-Wed Mar 10 10:13:52 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Message_Block.i (reference_count): Made sure the inline
-          function is defined before used.  Thanks to David for noticing
-          this.
-
-Wed Mar 10 08:52:59 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_chorus.GNU: fixed
-          exceptions=1 support.  Thanks to Wei Chiang for
-          reporting this.
-
-        * include/makeinclude/wrapper_macros.GNU: added exceptions=1
-          support for pre-2.8 g++.  It's not recommended, because pre-2.8
-          g++ doesn't support exceptions well.  It's provided for
-          completeness.
-
-        * include/makeinclude/platform_chorus.GNU: removed
-          exceptions=1 support, because now it's in wrapper_macros.GNU.
-
-Tue Mar 09 21:54:39 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * netsvcs/Makefile,netsvcs/clients/Makefile: updated
-          ACE_COMPONENTS check to allow everything to be built
-          in the default case, when ACE_COMPONENTS isn't set.
-          Thanks to Carlos for noticing this.
-
-        * netsvcs/Makefile,netsvcs/servers/Makefile: moved
-          netsvcs/server build suppression, when ACE_COMPONENTS
-          lacks Other, from netsvcs/Makefile to netsvcs/servers/Makefile.
-
-        * examples/Naming/Makefile: suppress build if ACE_COMPONENTS
-          is defined and doesn't contain Other.
-
-        * performance-tests/Misc/Makefile: don't build test_naming
-          if ACE_COMPONENTS is defined and doesn't contain Other.
-
-        * ace/Log_Record.i (length): cast the long argument to ACE_UINT32,
-          to avoid warning message if long is greater than 4 bytes.
-          Thanks to Hao Ruan <hruan@lucent.com> for reporting this.
-
-Tue Mar  9 20:56:35 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * include/makeinclude/rules.nested.GNU:
-          If the DIRS macro is not set we simply do not recurse.  Before
-          this change we got an error from the shell.
-
-        * bin/auto_compile:
-          If there are no errors then send a message when a warning was
-          detected during compilation.
-
-Tue Mar 09 15:15:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * bin/create_ace_build: check for ace/ and include/ directories
-          in top level directory, instead of ace/, examples/ and netsvcs/.
-          This allows use with trimmed-down workspaces.  Thanks to Jeff
-          for suggesting this.
-
-        * include/makeinclude/platform_chorus_ghs.GNU: added exceptions
-          make option support.  Thanks to Wei Chiang for reporting that
-          it wasn't supported.
-
-Tue Mar  9 12:59:09 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * docs/ACE-subsets.html: Updated the subsets to reflect what's
-          actually in the ACE Makefile.
-
-        * ace/Message_Block.h: Changed the private section in both
-          ACE_Message_Block and ACE_Data_Block to protected allowing
-          derived classes to access data members of the parent class;
-          Thanks to Alexander Davidovich <sasha@ms.com> for suggesting
-          this.
-
-        * ace/Message_Block: Added new reference counting accessor methods
-          to Message_Block and Data_Block.  Thanks to Alexander Davidovich
-          <sasha@ms.com> for suggesting this.
-
-Tue Mar 09 11:21:49 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Message_Block.h: For some reason, default ctor and operator=
-          must be declared private instead of protected if they are not to
-          be accessable.  Otherwise, VC complains.
-
-Tue Mar 09 01:06:44 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.27 released.
-
-Tue Mar 09 00:39:23 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.26 released.
-
-Mon Mar 08 23:23:35 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Thread_Manager.{h,cpp} (thread_within,hthread_within,
-          thread_grp_list,hthread_grp_list): Added new functions to
-          check if a thread is managed by the thread manager and collect
-          the thread ids/handles in a thread group.  Thanks to XuYifeng
-          <wj@puclic.hz.zj.cn> for motivating the addition.
-
-Mon Mar 08 22:23:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: added FOR_TAO short-cut to ACE_COMPONENTS.
-          If the ACE_COMPONENTS variable is set to FOR_TAO, then
-          only the components necessary to support TAO will be
-          built into libACE.
-
-        * netsvcs/clients/Makefile: suppress build if Other
-          ACE_COMPONENT isn't built.
-
-        * netsvcs/Makefile: suppress server build if Other and Token
-          ACE_COMPONENT aren't built.
-
-Mon Mar  8 17:35:04 1999  Gonzalo Diethelm  <gonzo@tango.cs.wustl.edu>
-
-        * ace/NT_Service.cpp:
-        * ace/NT_Service.h:
-          Now the handle_control method calls separate protected virtual
-          methods to do its work. That way, it is easier to override what
-          must be done on each case, just by overriding one of the new
-          methods.
-
-Mon Mar 08 15:41:08 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_hpux.GNU: Added -DACE_LACKS_PRAGMA_ONCE.
-          Thanks to Hao Ruan for reporting this.
-
-        * README: Added Hao Ruan to the list of contributors.
-
-Mon Mar 08 12:27:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Service_Config.cpp (handle_signal): added ACE_UNUSED_ARG (sig)
-          if ACE_NDEBUG is defined, to avoid compilation warning about
-          unused argument with debug=0.
-
-        * docs/ACE-subsets.html: added subset characterizations on
-          several platforms.
-
-        * include/makeinclude/platform_sunos5_ghs.GNU: fixed AR and
-          ARFLAGS to use CC to build static libs.  It looks like GreenHills
-          no longer supplies a separate archiver with 1.8.9.
-
-Mon Mar 08 11:58:03 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Task.cpp (activate): Made sure we don't mess with the passed
-          in grp_id if the task was not previously actived.  Thanks to
-          XuYifeng <wj@puclic.hz.zj.cn> for noticing this.
-
-Fri Mar 05 14:15:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_TSS_Cleanup (),free_all_keys_left ()):
-          with ACE_TSS_Emulation only, don't free the TSS key that
-          ACE_TSS_Cleanup uses internally for its in_use_ member.
-          The key doesn't get freed in ACE_OS::thr_key_detach (),
-          because that gets called during shutdown.  So,
-          free_all_keys_left () would attempt to free it.  But,
-          the dynamic memory associated with it had already been
-          deleted by ACE_TSS_Cleanup::exit ().  And, there
-          aren't any other resources associated with it.  So,
-          free_all_keys_left () can just skip over it.
-
-        * ace/OS.cpp (cleanup_tss): disabled call to
-          free_all_keys_left () with ACE_HAS_TSS_EMULATION, because
-          we can't safely access the TSS values that were created by
-          the main thread.  They were destroyed when the ACE_TSS_Cleanup
-          instance exit () function was called.  There don't seem to
-          be any leaks if free_all_keys_left () isn't called, anyways.
-
-Fri Mar  5 11:05:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * examples/Log_Msg/Log_Msg.dsw: Fixed the path to Callback.dsp.
-          Thanks to Zoran Ivanovic <zorani@pathcom.com> for reporting
-          this.
-
-        * performance-tests/Misc/Makefile: Removed test_guard from the
-          Makefile.  This test requires having
-          ACE_USES_OBSOLETE_GUARD_CLASSES defined in order to compare
-          ACE_Guard to ACE_Thread_Mutex_Guard (obsolete).
-
-        * ace/OS.h: Removed ACE_THREAD_GUARD*.
-
-        * ace/config-psos-{diab,tm}.h: Removed
-          ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE.  It is no longer
-          needed.
-
-        * ace/Synch_T.{h,i}: One would assume compilers are smart enough
-          to treat _all_ in-class functions as inline.  Not for template
-          member functions.  This is true at least for SunCC, egcs, gcc,
-          and MSVC.  These functions seems to impose extra overhead.
-          After removing the in-class definitions for ACE_Guard, the cost
-          of using ACE_Guard is now as good as using
-          ACE_Thread_Mutex_Guard (which, by the way, is depricated.)  So,
-          there's no need for a ACE_THREAD_MUTEX_GUARD class.  Afterall,
-          the "ACE Way[TM]" of defining inline functions is the "Right
-          Way[TM]".  The motto of the change is, always put inline
-          functions in .i files (even for template specialization)
-          otherwise, they'll become regular functions.  If you really need
-          to put function definitions within class definitions, mark
-          inline function explicitly.
-
-          Thanks to Andy Marchewka <AndyM@who.net> for noticing the
-          performance differences between ACE_Thread_Mutex_Guard and (old)
-          ACE_Guard.
-
-Fri Mar  5 11:06:12 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Svc_Conf.y: Always print out an error message when we
-          increment yyerror.  Thanks to Ulf Jaehrig <jaehrig@desys.com>
-          for reporting this.
-
-Thu Mar  4 12:26:47 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Message_Queue_Notifications_Test.cpp (svc): Made increment
-          of <role_> thread-safe.
-
-Thu Mar 04 07:00:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-aix-4.2.x.h: added ACE_LACKS_PRAGMA_ONCE
-          to xlC section.  Thanks to Rainer Blome <rainer_blome@de.ibm.com>
-          for reporting this.
-
-        * ace/config-osf1-4.0.h: added ACE_LACKS_PRAGMA_ONCE to
-          cxx section, with __DECCXX_VER < 60090010.  This should
-          help avoid compilation warnings from cxx 5.x.  Thanks
-          to Oliver M. Kellogg <Oliver.Kellogg@vs.dasa.de> for
-          reporting this.
-
-        * ACE-INSTALL.html: corrected name of ace/config-linux-lxpthreads.h.
-          Thanks to Barry Hoggard <hoggard@cfx.com> for reporting this.
-
-        * tests/Makefile,Makefile.DLL: instead of always running a
-          recursive make to build libDLL_Test.so, only do that if it
-          needs to be built.  And, added dependencies to Makefile.DLL.
-
-        * ace/Makefile: commented out use of TEMPLATE_FILES.  I don't
-          believe that it's needed.
-
-        * ace/CLASSIX/Makefile: removed unused TEMPLATE_FILES and
-          LSRC2 macros, and gethrtime build rule.
-
-        * docs/ACE-subsets.html: updated, and added documentation for
-          ACE_COMPONENTS and the ACE_OS adapation layer.
-
-Wed Mar  3 22:30:02 1999  James CE Johnson  <jcej@lads.com>
-
-        * ace/IOStream_T.{cpp|h|i}: Those last changes break (at least)
-          examples/IOStream/server.  I'm backing them out and restoring
-          the 4.6.25 versions of these files until Chris can get back to
-          me about what's going on.
-
-Wed Mar 03 21:49:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (socket_init,socket_fini): replaced use of
-          cerr with ACE_OS::fprintf.
-
-        * ace/OS.h: conditionally #include Object_Manager.h, only
-          if ACE_HAS_MINIMAL_ACE_OS is not defined.  Merged main ()
-          #defines for Unix/NT and WinCE, to ease maintenance.
-
-        * ace/config-minimal.h: removed undef of
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER, because OS.h now conditionally
-          #includes Object_Manager.h.  Added ACE_MAIN_OBJECT_MANAGER #define,
-          to only instantiate the ACE_OS_Object_Manager.
-
-        * ace/config-WinCE.h: added ACE_MAIN and ACE_MAIN_OBJECT_MANAGER
-          #defines, to support merging of the main () #defines in OS.h.
-
-        * ace/OS.{h,cpp}: added ACE_OS_Object_Manager::starting_up ()
-          and shutting_down ().  (ACE_TSS_Cleanup::remove): replaced
-          use of ACE_Object_Manager::shutting_down () with
-          ACE_OS_Object_Manager::shutting_down ().  Thanks to Irfan
-          for reporting that, otherwise, ace/Object_Manager.h had
-          to be #included by OS.cpp on NT, if ACE_NONSTATIC_OBJECT_MANAGER
-          wasn't #defined.
-
-        * tests/Basic_Types_Test.cpp: hacked a bit to support building,
-          and running, with ACE_HAS_MINIMAL_ACE_OS.  Don't look,
-          unless you want to forever ruin all of your good coding habits.
-
-Wed Mar 03 19:08:52 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Map_T.h (ACE_Map): Further degraded my code to make it
-          compile with lame compilers ;-) This time it was the lame pSOS
-          diab compiler that could not recongnize a typedef in the base
-          template class.
-
-Wed Mar 03 11:31:00 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/ACE-guidelines.html: added guideline to try to limit
-          the length of source code lines to less than 80 characters.
-          And, reverted to the previous version of the file.  The
-          last version was apparently committed by mistake.
-
-        * include/makeinclude/wrapper_macros.GNU (ACE_HAS_GNUG_PRE_2_8):
-          added support for eg++.  Assume that it's egcs, and therefore
-          ACE_HAS_GNUG_PRE_2_8 is set to 0.  Thanks to Russell L. Carter
-          <rcarter@consys.com> for supplying a patch.
-
-Wed Mar  3 09:35:20 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Memory_Pool.cpp (handle_signal): Added a check to see if the
-          current mapping is up to date so that faults caused by other
-          mappings will be passed on.  Thanks to
-          Joseph Weihs <joseph-w@Orbotech.COM> for reporting this and for
-          providing a fix.
-
-Wed Mar  3 05:48:24 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/ACE.cpp (fork): Added an extra pair of parens within the
-          WIFE*() macros to work around GCC bugs.  Thanks to Alexandre
-          Karev <Alexandre.Karev@cern.ch> and Andre Folkers
-          <folkers@informatik.mu-leubeck.de> for reporting this.
-
-Tue Mar  2 22:50:18 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Proactor.cpp:
-        Added forward declaration for ACE_Proactor_Impl. Using static cast
-        to down cast from <aiocb *> to
-        <ACE_POSIX_Asynch_Result *>. Thanks to John.Mulhern@lawson.com for
-        reporting the warnings in HP UX.
-
-Tue Mar 02 21:17:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp},Object_Manager.{h,cpp}: changed Object_Manager
-          state to be per-instance, instead of global.  This makes
-          it easier to enforce startup and shutdown ordering,
-          regardless of whether the Object_Managers are static,
-          created on the stack of main (), or dynamically allocated.
-
-        * ace/IOStream_T.h: fixed a couple more line breaks.
-
-        * Makefile: added support for suppressing man page regeneration
-          on make release command line.
-
-        * include/makeinclude/platform_osf1_4.0.GNU: added automated
-          support for warning 1136.  It's only supported by cxx 6.2.
-          Thanks to James CE Johnson <jcej@lads.com> for reporting
-          this, and to Andrew Hobson <ahobson@eng.mindspring.net> for
-          diagnosing the problem.
-
-        * ace/OS.i (thr_getspecific): added #else clause w/ACE_NOTSUP_RETURN
-          to support ACE_HAS_MINIMAL_ACE_OS.
-
-        * ace/config-minimal.h: added #undef of
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER, to avoid #include of
-          Object_Manager.h.  And, added #define ACE_USE_THREAD_MANAGER_ADAPTER
-          so that ACE_Thread_Adapter::invoke () won't use any
-          ACE_Thread_Exit functions.
-
-        * ace/OS.cpp (ACE_Thread_Adapter::invoke): removed
-          ACE_HAS_MINIMAL_ACE_OS conditional compilation, because
-          config-minimal.h now #defines ACE_USE_THREAD_MANAGER_ADAPTER.
-          And, added #else clauses to three TSS-related functions.
-
-Tue Mar 02 14:43:29 1999  Steve Huston  <shuston@riverace.com>
-
-       * ace/Map_T.(h i): Qualified types inherited from template base
-         classes; qualified with ACE_TYPENAME where needed.  Now aC++
-         is happy.
-
-       * ace/config-hpux-10.x-hpc++.h: Added ACE_HAS_TYPENAME_KEYWORD for
-         aC++.
-
-       * tests/DLL_Test.cpp: Enable on HP-UX.  Generalize the library
-         prefix/suffix with the platform definitions from OS.h.
-
-Tue Mar  2 12:41:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-       * ace/IOStream_T.{cpp, h}: Fixed some line breaks that were
-         inadvertently introduced when these files were last checked in.
-
-Tue Mar  2 10:54:16 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * Cache_{Hash,Heap}_T.{h,cpp}:
-        * Cache_Manager[_T].{h,cpp}:
-        * Cache_Object.cpp:
-        * Hash_Bucket_T.{h,cpp}: Fixed erroneous include directives.
-          Thanks to Christian.Destor@alcatel.fr for reporting this.
-
-Tue Mar  2 10:33:47 1999  James CE Johnson  <jcej@lads.com>
-
-        * ace/IOStream_T.{cpp|h|i}: Christopher Healey
-        <chealey@entera.com> noticed occasional core dumps from
-        ~ACE_IOStream on heavily loaded systems.  It turns out that
-        streambuf_ was being deleted out from under the object.  These
-        three files include his patches for this problem.
-
-Tue Mar  2 02:28:54 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CDR_Stream.h (do_byte_swap): This accessor function should
-          be public accessible.  Otherwise it's useless.  Reorder class
-          declaration so the protected members appear before private
-          members/functions.
-
-Mon Mar  1 23:26:41 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/DLL_Test.cpp (ACE_HAS_SVR4_DYNAMIC_LINKING):
-          Added this check to prevent this test from being run
-          separately.
-
-Mon Mar 01 17:02:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.25 released.
-
-Mon Mar 01 16:54:02 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp,Object_Manager.cpp: fixed ObjMan state logic to
-          ensure that the ACE_Object_Manager is fini'd before the
-          ACE_OS_Object_Manager, even when both are static objects.
-          Thanks to Carlos for reporting this problem.
-
-Mon Mar 01 14:05:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ACE version 4.6.24 released.
-
-Mon Mar 01 13:04:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.*,Object_Manager.{h,cpp},ACE.cpp: added class
-          ACE_OS_Object_Manager.  It manages the three preallocated
-          locks that ACE_OS uses.  Many thanks to Nanbor for
-          suggesting the scheme to avoid dependency on Synch_T.h
-          for the ACE_Guard instantiations:  OS.cpp now has a
-          couple of lightweight guards for its internal use.
-
-        * ace/ACE.{i,cpp},OS.*: moved ACE::strecpy () and
-          ACE::unique_name () from class ACE to ACE_OS.  That
-          allows ACE_OS to be self-contained.  The ACE versions
-          were left for backward compatibility; they now just
-          wrap the ACE_OS versions.
-
-          With these changes, a stand-alone ACE OS adaptation layer
-          can now be built.  The ace/config-minimal.h config file
-          should be included in ace/config.h if you want to build
-          the ACE OS adaptation layer.
-
-          Two deficiencies remain with the ACE OS adaptation layer:
-          the dependencies on ACE_Log_Msg have been conditionally
-          compiled out by config-minimal.h.  Similarly, there is
-          a conditional dependency of ACE_Thread_Adapter::invoke ()
-          on ACE_Thread_Exit.  It would probably be best to move
-          that to ACE Thread_Manager, if possible.
-
-        * ace/config-minimal.h: suppress ACE_HAS_TSS_EMUATION, because
-          it requires other ACE headers to be #included.
-
-        * ace/Synch.{i,cpp} (~ACE_Recursive_Thread_Mutex): added
-          a call to this->remove ().  Without it, the mutex wasn't
-          being destroyed.  Uninlined both the destructor to avoid
-          code bloat if there are multiple returns in a function
-          that instantiates an ACE_Recursive_Thread_Mutex locally.
-          And, uninlined the remove () function, to save code space,
-          because it's non-trivial and not expected to be time critical.
-
-Sun Feb 28 20:21:05 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/Makefile.DLL (realclean): Added the realclean target to
-          the makefile.
-
-        * tests/run_tests.sh (ace_version): Disabled DLL_Test for chorus,
-          LynxOS, Unicos platforms as they dont support shared libraries.
-
-Sun Feb 28 20:08:54 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/POSIX_Proactor.cpp:
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Asynch_IO.cpp:
-        Fixed to pass <ACE_POSIX_Asynch_Result *> wherever <aiocb *> is being
-        passed, since it is ok to pass the derived class pointer in place of
-        base class pointer.
-        Defined the fields <bytes_transferred_> and <error_> in
-        <ACE_POSIX_Asynch_Result> so that they can be used instead of
-        <AIO_SYSERROR> and <AIO_SYSRETURN>. Because <aiocb:;aio_return> and
-        <aiocb::aio_error> fields  are not supported on HP yet.
-
-Sun Feb 28 14:22:38 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * include/makeinclude/platform_linux_kcc.GNU: added
-          -D_GNU_SOURCE to CFLAGS, because it's needed with
-          glibc 2.1.  It can't go into the config file, because
-          it needs to be #defined before the #include of
-          features.h.  But, features.h #defines the glibc version.
-          Thanks to Ben Eng <bet@jetpen.com> for reporting this.
-
-        * ace/config-minimal.h: disable ACE_ASSERT, ACE_DEBUG, and ACE_ERROR.
-
-Sun Feb 28 12:57:53 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Thread_Manager.cpp (terminate): The condition for handling
-          joining thread was wrong.  Thanks to Terry Rosenbaum
-          <Terry.Rosenbaum@Radiology.MSU.edu> for reporting the bug.
-
-Sun Feb 28 08:37:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_Thread_Adapter::invoke): replaced call
-          to ACE_Thread::self () with call to ACE_OS::thr_self (),
-          so that we don't need to #include ace/Thread.h.  Thanks
-          to Russ Noseworthy for reporting this.
-
-Sat Feb 27 17:25:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: updated dependencies.  They didn't have
-          any .shobj dependencies, just .obj.
-
-        * tests/Makefile: ran make depend.  It didn't have any
-          dependencies.
-
-        * include/makeinclude/platform_linux_kcc.GNU: added note that
-          evaluation copies of KCC might come with libraries that were
-          built with exception handling support.  To use them, ACE must be
-          built with exception handling support
-          (exceptions=1).  Thanks to John Lindal <jafl@cco.caltech.edu>
-          for reporting this.
-
-          Also, added support for the exceptions make flag.
-
-Sat Feb 27 13:31:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Fixed the remaining problems with ACE_OSCALL_RETURN
-          macro usage for sem_wait(), sem_post(), and sem_trywait().
-          Thanks to David Levine for reporting this.
-
-        * ace/OS.h: Added a set of ACE_THREAD_GUARD macros that use
-          ACE_Thread_Mutex_Guard.  These seem to be faster on many
-          platforms than the ACE_Guard<ACE_Thread_Mutex>.  Thanks to
-          Andy Marchewka <AndyM@who.net> for reporting this.
-
-        * ace/Dump.cpp: Moved the explicit template instantiation of
-          ACE_Guard<ACE_Thread_Mutex> out of dump and put it into
-          Synch.cpp, where it's with the other instantiations.
-
-Fri Feb 26 23:58:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * ace/CDR_Stream.{h,i,cpp}:
-          Added some read- and write-pointer alignment
-          functions, as proposed by Carlos. Also deleted some
-          ACE_OutputCDR members that weren't being used.
-          Checked the build on NT and suncc. Must come up with
-          some kind of test for these new functions.
-
-Fri Feb 26 21:56:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: moved ACE_COMPONENTS to after include
-          of wrapper_macros.GNU, so that users can set it in
-          their platform_macros.GNU.  Also, added ACE_LACKS_ACE_OTHER
-          to CFLAGS if Other ACE_COMPONENT is not built.
-
-Fri Feb 26 17:48:32 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_hpux_aCC.GNU: Added OCFLAGS
-          value for optimize=1 builds; added support for distrib=1
-          builds to build for off-site distribution.
-
-Fri Feb 26 12:38:00 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp: added #include "ace/Thread_Manager.h" on
-          WIN32, for ACE_Thread_Descriptor declaration.  Thanks
-          to Barry Hoggard <hoggard@cfx.com> for reporting this.
-
-        * ace/Managed_Object.h: fixed comments in description.
-
-Fri Feb 26 11:56:08 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Log_Priority.h (ACE_Log_Priority): Removed all references to
-          ACE_HAS_BROKEN_ENUMS since it has been deprecated (see David's
-          ChangeLog entries from Feb 5).
-
-Fri Feb 26 11:09:47 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/OS.i (sema_destroy): ACE_OSCALL and ACE_OSCALL_RETURN macro
-          calls for sem_destroy, sem_unlink and sem_close had too few
-          arguments.  Added the missing arguments for the macros.
-
-Fri Feb 26 10:59:45 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/WFMO_Reactor/test_talker.cpp (main): Fixed to
-        use the new proactor interface.
-
-Thu Feb 25 22:17:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.cpp (spa, for VxWorks only): updated comment about
-          ::sp () default values, and added comments for each argument
-          to ::taskSpawn ().  Thanks to Tad Jarosinski <tadj@qualcomm.com>
-          for asking about spa ().
-
-Thu Feb 25 20:10:06 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * ace/Synch.h:
-        * ace/Synch.i:
-        * ace/Synch_T.h:
-
-        Added an ACE_Null_Semaphore class.  Thanks to Irfan for his guidance
-        on this.  Also fixed ACE_SYNCH_SEMAPHORE to be ACE_Null_Semaphore
-        when ACE is built without thread support.
-
-Thu Feb 25 18:37:27 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/WFMO_Reactor (cancel_wakeup and masks_ops): Fixed the
-          cancel_wakeup() method.  It was doing too much, i.e., if the
-          masks were reduced to null, it was removing the event handler
-          entry.  The new version behaves more like the Select Reactor in
-          that it simply plays with the masks without removing the event
-          handler.
-
-          Also, implemented the mask_ops() operation.
-
-          Thanks to Douglas C. Schmidt <schmidt@cs.wustl.edu> and Zoran
-          Ivanovic <zorani@pathcom.com> for helping in pinpointing the
-          problem.
-
-        * ace/Service_Config.cpp (fini_svcs and close): Since the reactor
-          and proactor singletons potentially call user code (in
-          handle_close()), we must shut them down *before* the log msg is
-          destroyed.  Therefore, moved the close_singletons() call from
-          close() to fini_svcs().
-
-        * ace/Select_Reactor_Base.cpp (bit_ops): Since we return the old
-          masks everytime, find the old reactor masks at the start of the
-          method.  This automatically does the work of the GET_MASK
-          operation.
-
-        * ace/Proactor.cpp: Added #include "ace/Object_Manager.h"
-
-        * examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp:
-          handle_close() was getting called twice; changed code to prevent
-          double deletion.
-
-        * examples/Reactor/WFMO_Reactor/test_handle_close.cpp: Added the
-          ability to cancel reads, change masks, and check for existing
-          reactor masks.
-
-Thu Feb 25 17:35:10 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * tests/DLL_Test.cpp:
-          Changed the OBJ_SUFFIX to ".so" as on Linux the .o file cannot
-          be a shared object. Also the OBJ_PREFIX is now "./lib" for
-          non-Win32 platforms.
-        * tests/Makefile:
-          Additional option DLL_TEST added so that a .so can be produced
-          for DLL_Test.
-        * tests/Makefile.DLL:
-          This is the makefile which produces libDLL_Test.so for DLL_Test.
-
-Wed Feb 24 23:47:22 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/Proactor/test_proactor.cpp:
-        * ace/WIN32_Asynch_IO.h:
-        * ace/Proactor.cpp:
-        * ace/WIN32_Proactor.cpp:
-        * ace/Proactor.h:
-        * ace/Proactor_Impl.h:
-        * ace/POSIX_Proactor.h:
-        Changed the return values of the <ACE_Proactor::handle_events> API to
-        return -1 on error, 0 on timeout, 1 on success. This has been done so
-        that it looks like the <ACE_Reactor::handle_events>. Previously
-        <ACE_Proactor::handle_events> was returning -1 on error, 0 on success
-        and 0 on timeout also.
-
-        Fixed the <ACE_POSIX_AIOCB_Proactor::handle_events> and
-        <ACE_POSIX_SIG_Proactor::handle_events> to do indefinite blocking when
-        ACE_INFINITE is passed. <sigwaitinfo> is used instead of
-        <sigtimedwait>.
-
-        Renamed the <ACE_AIO_Accept_Handler> class to more appropriate
-        <ACE_Notify_Pipe_Manager>.
-
-Wed Feb 24 22:08:50 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Fixed all the sem_* calls so that they no longer use
-          the ACE_ADAPT_RETVAL() macro, which was broken since these calls
-          all return -1 on failure.  Thanks to John E. Bossom
-          <John.Bossom@cognos.com> for reporting this.
-
-Wed Feb 24 17:40:49 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/tutorials/combine:
-        * docs/tutorials/colorize:
-          A few enhancements to make the colorization better.  Also, when
-          #include "ace/something.h" is seen by the colorizer, it will
-          create a link to ../../../ace/something.h.  That should give
-          direct links from the tutorial pages to the ACE headers.
-
-Wed Feb 24 16:56:51 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/tutorials/017/barrier2.cpp: Added this to show how you can
-          change the thread count while threads are still active.
-
-        * docs/tutorials/017/*.html: Regenerated due to the new file.
-
-        * docs/tutorials/018/*.html: Added Kirthika's abstract &
-          regenerated.
-
-        * docs/tutorials/018/token.cpp:  Typo in the comments...
-
-Wed Feb 24 14:57:10 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h (ASYS_ONLY_WIDE_STRING): New UNICODE macros to convert
-          char* to wchar* when UNICODE is defined but not on CE.
-
-        * ace/Service_Config.cpp (parse_args): Convert getopt.optarg using
-          ASYS_ONLY_WIDE_STRING.
-
-Wed Feb 24 13:54:15 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/config-minimal.h: changed #include protection to
-          ACE_CONFIG_MINIMAL_H, so that this config can be #included
-          by others.
-
-        * ace/OS.{h,cpp},Thread_Manager.h: moved ACE_Thread_Control and
-          ACE_Thread_Exit class definitions from Thread_Manager.h to OS.h,
-          so that Task.h no longer needs to be #included by OS.cpp.
-
-        * ace/OS.cpp: protected #include of Containers_T.h with
-          defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION).
-
-Wed Feb 24 05:30:59 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/Message_Queue_T.i (dequeue): Replaced the improper
-          self-recursive call to dequeue() with dequeue_head().  Thanks to
-          Marc Engel <engelm@tlse.sofreavia.fr> for reporting this.
-
-Tue Feb 23 20:58:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.i: Make sure to do the right thang if we're compiling the
-          ACE recursive thread mutexes on platforms that lack threading.
-
-        * ace/Service_Object: Added a new ACE_Service_Object constructor
-          that takes an ACE_Reactor * and passes this down to the
-          ACE_Event_Handler base class.
-
-        * ace/Event_Handler: Added a new ACE_Event_Handler constructor
-          that takes an ACE_Reactor * and an int priority that default to
-          the right values.
-
-Tue Feb 23 21:53:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.h,README: added ACE_HAS_MINIMAL_ACE_OS support.
-
-        * ace/config-minimal.h: added this config file.  It defines
-          ACE_HAS_MINIMAL_ACE_OS.  It is designed to build only
-          the minimal ACE_OS adaptation layer.
-
-Tue Feb 23 20:28:45 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * ace/SString.{h,i,cpp}: Added a private member <buf_len_> to the
-          ACE_CString class to keep track of the size of data buffer, and
-          avoid unnecessary memory reallocations.  Updated class methods
-          to use buf_len_.
-
-Tue Feb 23 19:54:55 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Asynch_IO.cpp:
-          Fixed the potential dominance warnings in POSIX
-          implementation. Updated the documentation.
-
-Tue Feb 23 18:11:11 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/DLL/DLL.dsw:
-          examples/DLL/Main.dsp:
-          examples/DLL/Newsweek.dsp:
-          examples/DLL/Today.dsp:
-          Added extra include and linker options to the projects.
-
-        * tests/DLL_Test:
-          Added OBJ_PREFIX to cater to the problem which arose due to the fact
-          that the .o is produced under the .obj directory on SunOS.
-
-        * tests/run_tests.sh:
-          tests/run_tests.bat:
-          Made an entry for DLL_Test.
-
-Tue Feb 23 16:54:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/OS.i (recursive_mutex_trylock and recursive_mutex_lock):
-          Removed the "abandoned" versions of these routines.  Abandoned
-          mutexes are only supported for process mutexes, but not for
-          thread mutexes.
-
-Tue Feb 23 15:50:40 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * ace/Proactor.cpp:
-        * ace/Proactor.h:
-        * ace/Proactor_Impl.h:
-        * ace/POSIX_Proactor.h:
-        * ace/POSIX_Proactor.cpp:
-        * ace/POSIX_Asynch_IO.h:
-        * ace/POSIX_Asynch_IO.cpp:
-        * ace/WIN32_Proactor.cpp:
-        Implemented <post_completion> for POSIX platforms. Thanks to Irfan
-        for the cool design. This API has been changed a little bit for
-        portability. <post_completion> API now exists at
-        <ACE_Asynch_Result_Impl> class. To post completions, users will have
-        to get hold of an <ACE_Asynch_Result_Impl> class (either get it from
-        the predefined factory methods at the Proactor or derive from
-        <ACE_WIN32_Asynch_Result> or <ACE_POSIX_Asynch_Result>, then call
-        <post_completion> on it passing in the <Proactor_Impl *> which can
-        be got through <implementation> method in the <ACE_Proactor>.
-        The need for RTTI has been avioded in this design.
-
-Tue Feb 23 15:19:33 1999  Steve Huston  <shuston@riverace.com>
-
-        * ace/NT_Service.(h cpp): Added two new methods:
-          state (DWORD *, ACE_Time_Value * = 0) as an alternate way to get the
-          service's state, with definite indication of error.  Also changed
-          comments on the other state() method to clarify the return value.
-          test_access (DWORD) tests caller's access to the service.
-          Thanks to Martin Krumpolec <krumpo@pobox.sk> for these ideas and
-          suggestions!
-
-Tue Feb 23 14:12:52 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * ace/Active_Map_Manager_T.h (npos): Added a new static member
-          function that returns a key that cannot be found in the map.
-          Thanks to Fernando D. Mato Mira <matomira@acm.org> for
-          suggesting this.
-
-Tue Feb 23 12:15:09 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/Svc_Conf.y:
-        * ace/Svc_Conf_y.cpp:
-        * ace/Parse_Node.cpp (symbol):
-        * ace/OS.cpp (fork_exec):
-        * ace/INET_Addr.cpp (ACE_INET_Addr): More Unicode fixes.
-
-Tue Feb 23 12:00:21 1999  Steve Huston  <shuston@riverace.com>
-
-        * examples/NT_Service/main.cpp: Allow -i option without a value, and
-          default to AUTO_START.  Also, added a README file to explain how to
-          use the program.  Thanks to Zoran Ivanovic <zorani@pathcom.com> for
-          the change and the README file!
-
-Mon Feb 22 22:03:47 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * bin/auto_compile_win32.pl: Perl script for compiling all the
-          million different config. combination on Win32.  Hey, it also
-          works on Alpha.  Thanks to Darrell Brunsch for testing it on
-          Alpha/NT.
-
-        * ace/ace_{dll,lib}.dsp: Fixed broken project settings.
-
-Mon Feb 22 21:56:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Sched_Params.cpp: removed #include of ACE.h because it's
-          not necessary.
-
-        * ace/Makefile: added ACE_COMPONENTS default definition.
-          Moved Sched_Params from THREADS_FILES to OS_FILES because
-          OS.cpp needs it.  It only contributes 172 bytes to libACE
-          on VxWorks and 248 on LynxOS.
-
-Sun Feb 21 18:52:17 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * ACE version 4.6.23 released.
-
-Sun Feb 21 08:46:09 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.i (recursive_mutex_{init,lock,trylock}: added some
-          ACE_UNUSED_ARGS.
-
-        * ace/OS.{i,cpp} (cond_*): uninlined the ACE_OS:cond_* function
-          versions with ACE_LACKS_COND_T.  Most are too big to be
-          good candidates for inlining.  And the others cause use-before-
-          definition problems in OS.i.
-
-Sun Feb 21 00:17:58 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * websvcs/lib/URL_Addr.i: Can now copy null Addrs.  Also added
-          hash function implementation.
-
-        * websvcs/lib URL_Addr.h: Added hash function.
-
-        * websvcs/lib/URL_Addr.cpp: Fixed a bug with
-          ACE_HTTP_Addr::create_relative_address and urls beginning with
-          "/".  It used to copy the first '/', which wasn't needed.
-
-Sat Feb 20 15:39:16 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/OS.{h,cpp},Object_Manager.{h,cpp}: changed ACE_OS::exit ()
-          to call an exit hook that is registered by the ACE_Object_Manager,
-          instead of directly calling ACE_Object_Manager::fini ().
-
-        * ace/OS.i (thr_self): moved definitions to before first use.
-
-Sat Feb 20 11:50:30 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.i (thr_equal): Moved the body of ACE_OS::thr_equal before
-          recursive_mutex methods to avoid "function redefined as inline"
-          problem.  Thanks to David Levine for reporting this.
-
-Sat Feb 20 09:05:20 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * ace/OS.cpp: Changed the ACE_static_cast() in ACE_OS_Wstring to
-          first use an ACE_const_cast().  Thanks to Andy Gokhale for
-          reporting this.
-
-Sat Feb 20 02:53:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.cpp (ACE_OS_WString): Need to add a statis cast when
-          converting from wchar to char to eliminate a warning from Win98.
-
-        * ace/config-win32-common.h: Do not check for library type on CE.
-
-        * ace/config-WinCE.h: Defined ACE_HAS_WINCE as 1.
-
-Fri Feb 19 22:54:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.h:
-          Fixed the return types for ACE_OS_WString and ACE_OS_CString
-          assignment operators, even though they are not defined they
-          should be declared to return something, otherwise egcs give us a
-          ton of warnings.
-
-Fri Feb 19 21:02:49 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/config-win32-common.h: #define'd ACE_HAS_RECURSIVE_MUTEXES
-          for Win32.
-
-        * ace/OS.cpp: Removed the SString.h dependency in OS.cpp!
-
-Fri Feb 19 21:44:31 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * ace/OS.i: Was using two many arguments to thread_mutex_lock ()
-          and ACE_OS::thread_mutex_trylock ().
-
-        * ace/Synch.i: Typo in comment
-
-Fri Feb 19 18:18:13 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.{h,i,cpp}: Added ACE_OS_WString and ACE_OS_CString which
-          should only be used within ACE_OS to perform conversion between
-          wchar strings and char string.
-          Changed the wide/multibyte conversion macros to use
-          ACE_OS_?String classes and removed dependencies to Auto_Ptr.h
-          and SString.h.
-
-        * ace/config-win32-common.h: Removed checked for (_DLL) if
-          ACE_HAS_DLL = 0.  Otherwise, the static build won't compile.
-
-        * ace/Token_Manager.cpp (release_token):
-        * ace/Service_Manager.cpp (list_services): Changed
-          ASYS_MULTIBYTE_STRING to ASYS_ONLY_MULTIBYTE_STRING.  Because
-          the new conversion classes have stronger type checking, these
-          errors weren't found until now.
-
-Fri Feb 19 17:01:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * ace/Makefile: moved ACE from OS_FILES to UTILS_FILES.
-
-Fri Feb 19 15:44:23 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS,
-          ace/Synch: Moved the implementation of the
-          ACE_Recursive_Thread_Mutex from the Synch.* files to
-          the OS.* files in order to reduce coupling in OS.* and
-          other parts of ACE.
-
-Fri Feb 19 12:36:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * ace/OS.i:
-          Fixed missing ACE_INLINE for ACE_OS::strenvdup()
-
-Fri Feb 19 11:35:57 1999  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_sunos5_sunc++.GNU: Added new option
-          "distrib".  If you do a "make distrib=1" the -R options won't be
-          given when linking, which produces dynamic load records requiring
-          objects/libraries in standard places, or use of LD_LIBRARY_PATH.
-          The default is distrib=0, which is the existing behavior.
-
-Fri Feb 19 11:22:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.cpp (open): Don't call CreateFileA with FILE_SHARE_DELETE
-          when compiled on Win95 because it doesn't support the flag.  The
-          implication of this change is that unlink before close will not
-          work on Win95.  So programs that are targeted to both NT and
-          Win95 cannot depend on it.  Thanks to Rod Joseph
-          <rodjoseph@adt.com> for reporting the bug.
-
-Thu Feb 18 21:10:45 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * ace/OS.cpp (string_to_argv): We no longer have to special case
-          for WinCE since this logic has been moved into
-          ACE_OS::strenvdup().
-
-        * ace/ACE.cpp: Implemented ACE::strenvdup() using
-          ACE_OS::strenvdup().
-
-        * ace/OS: Move the implementation of strenvdup() from ACE to
-          ACE_OS to remove another dependency from the OS wrappers.
-
-        * ace/ARGV.cpp: Rewrote the ACE_ARGV::string_to_argv() and
-          ACE_ARGV::argv_to_string() methods to use the new
-          ACE_OS::string_to_argv() and ACE_OS::argv_to_string().
-
-        * ace/OS.h: Added string_to_argv() and argv_to_string() methods to
-          ACE_OS to remove the dependency on ACE_ARGV.
-
-Thu Feb 18 19:21:03 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
-
-        * docs/tutorials/005/client_handler.cpp: Replaced the leading '_'
-        in the open() method so that we can cast _acceptor to acceptor.
-
-Thu Feb 18 14:12:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * netsvcs/clients/Naming/Client/svc.conf: Changed to start up
-          ACE_Naming_Context as dynamic service.  Thanks to Darren
-          Whobrey <whobrey@fecit.co.uk> for reporting this problem.
-
-        * ace/Name_Proxy.cpp (open): The timeout value was set upp
-          ACE_Time_Value::zero accidentally when we want blocking
-          connect.  Thanks to Darren Whobrey <whobrey@fecit.co.uk> for
-          reporting the bug.
-
-        * ace/CDR_Stream.{h,i} (ACE_InputCDR::do_byte_swap): Added
-          accessor function for Flick.
-
-        * ace/CORBA_macros.h (ACE_THROW_INT): This should return a new
-          instance of the exception.  Thanks to Andy for pointing this
-          out.
-
-Wed Feb 17 16:40:56 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/OS.h (ACE_NEW_THROW_EX): A new ACE_NEW_THROW macro which
-          makes ACE_NEW_THROW_EX behave like a exception-throwing
-          function.  I.e., you need to follow ACE_NEW_THOW_EX with
-          appropriate ACE_CHECK* macros.  The use of ACE_NEW_THROW,
-          ACE_NEW_THROW_RETURN, ACE_NEW_TRY_THROW are deprecated.
-
-        * docs/exceptions.html: Added documentation for
-          ACE_DECLARE_NEW_CORBA_ENV.
-
-        * ace/config-WinCE.h: Automatically define ACE_HAS_WINCE if it is
-          not already defined.
-
-        * ace/Synch.cpp: I had to shuffle the location of .i file around
-          to avoid a warning from SH compiler for CE.
-
-        * ace/config-win32-common.h: Disabled checking for DLL run-time,
-          WIN32, and multi-threaded run-time on Windows CE.
-
-        * ace/CORBA_macros.h (ACE_DECLARE_NEW_CORBA_ENV): Added this macro
-          for declaring a new CORBA_Environment called ACE_TRY_ENV.
-          ACE_TRY_NEW_ENV should now be avoided because it won't work if
-          multiple try blocks are needed in the top-most functions.
-          Instead, you can use the new macro to define the environment
-          variable and use ACE_TRY/ACE_TRY_EX as usually.  This is even
-          more intuitive than ACE_TRY_NEW_ENV. ;)  Thanks to Andy for
-          reporting the problem.
-
-Wed Feb 17 10:44:29 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * examples/Reactor/Proactor/test_proactor.dsp:
-        * examples/Reactor/Proactor/test_proactor.cpp:
-        * examples/Reactor/Proactor/Makefile:
-        rtagged these files with "new_proactor"
-
-Tue Feb 16 17:08:53 1999  Steve Huston  <shuston@riverace.com>
-
-        * examples/ASX/Event_Server/Transceiver: Moved Event_Transceiver
-          class definition to new file, transceiver.h, to build ok on AIX (P15)
-          and fixed core dump if ctor fails to connect.
-
-        * examples/Connection/misc: Moved some class definitions from
-          test_upipe.cpp to new file test_upipe.h to build ok on AIX (P17).
-          Same thing with Connection_Handler - new file Connection_Handler.h.
-
-        * examples/Connection/misc/Makefile: Clean out tempinc directory
-          between program compiles so AIX xlC doesn't freak out.
-
-Tue Feb 16 16:42:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * ace/CORBA_macros.h (ACE_PRINT_EXCEPTION): A new macro that deal
-          with printing out the exception for debugging.  Thanks to Lothar
-          Werzinger <lwerzinger@krones.de> for suggesting this.
-
-        * docs/exceptions.html: Added documentation for the new macro
-          ACE_PRINT_EXCEPTION.  Since there's no portable way to print out
-          the content of a CORBA_Exception, we use this macro to deal with
-          differences among various ORB implementations.  This macro is
-          user definable.
-
-        Thanks to Eric Covington <eric@nowsol.com> for figuring out the
-        following.
-
-        * ace/ace_ce_dll.dsp: Added Functor.cpp and Message_Queue.cpp.
-
-        * ace/High_Res_Timer.cpp (dump): Fixed Unicode problem.
-
-        * ace/OS.i (truncate): WinCE does not have char* version of
-          truncate.
-
-Tue Feb 16 00:39:35 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-        * ace/ace_dll.dsp:
-        * examples/Reactor/Proactor/test_proactor.dsp:
-        * examples/Reactor/Proactor/test_proactor.cpp:
-        Updated the files.
-        * ace/WIN32_Asynch_IO.h:
-        * ace/WIN32_Asynch_IO.cpp:
-        * ace/WIN32_Asynch_IO.i:
-        Added the files
-        * ace/ace_dll.dsp:
-        * ace/ace_lib.dsp:
-        Updated these files
-        * examples/Reactor/Proactor/Makefile:
-        New make file which also compiles the test_aiosig_ace.cpp
-        program.
-        * ace/POSIX_Asynch_IO.i:
-        Added the file.
-
-
-        rTagged the ACE_wrappers repository with <before_proactor>
-        After the following changes rtagged the repository with
-        <after_proactor>
-
-        * ace/
-                Proactor.h
-                Asynch_IO.cpp
-                Asynch_IO.h
-                Makefile
-                Proactor.cpp
-                Proactor.h
-                config-lynxos.h
-                config-sunos5.6.h
-                config-sunos5.7.h
-                POSIX_Asynch_IO.{h,CPP}
-                POSIX_Proactor.{h,cpp}
-                WIN32_Asynch_IO.{h,cpp}
-                Asynch_IO_Impl.{h,cpp,i}
-                Proactor_Impl.h
-        Applied Bridge pattern to the POSIX implementation of the Proactor
-        code. ACE_POSIX_AIOCB_Proactor works fine on Solaris
-        2.6. ACE_POSIX_SIG_Proactor works on LynxOS. Take a look at the tests
-        at the $(ACE_ROOT)/examples/Reactor/Proactor/ and the README.
-
-        * tests/
-                Aio_Platform_Test.cpp
-        *examples/Reactor/Proactor/:
-                test_proactor.cpp
-                test_aiocb.cpp
-                test_aiosig.cpp
-                test_aiosig_ace.cpp
-                README
-        Test files for testing out the platforms.
-
 Mon Feb 15 13:17:15 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * ACE version 4.6.22 released.
 
 Sun Feb 14 15:25:27 1999  Ossama Othman  <othman@cs.wustl.edu>
 
-        * ACE-configuration.txt:
-        * ACE.ifnames:
-        * acconfig.h:
-        * ace-config.in:
-        * ace-diff-config.in:
-        * acinclude.m4:
-        * aclocal.m4:
-        * config.guess:
-        * config.sub:
-        * configure:
-        * configure.in:
-        * install-sh:
-        * libtool:
-        * ltconfig:
-        * ltmain.sh:
-        * missing:
-        * mkinstalldirs:
-        * ace/config.h.in:
-
-        Started to introduce the work done by the ACE Configuration
-        Project into the official ACE distribution.
-
-        To help speed development, the work being done by the ACE
-        Configuration Project is being slowly introduced into the official
-        ACE distribution.  Some of the functionality in the work created by
-        the ACE Configuration Project has been removed so that ACE may be
-        built in the usual fashion.  Once the ACE Configuration Project
-        work stabilizes on more platforms that removed functionality may be
-        added to ACE.
-
-        Currently the configure script contains most of the tests that are
-        necessary to properly configure ACE on most platforms.  However,
-        there are still some autoconf tests that are missing.  As such, you
-        may encounter and most likely will have compilation problems.
-
-        The `configure' script that is currently being used has been
-        modified from the ACE Configuration Project's `configure' script to
-        prevent makefiles from being automatically generated since there are
-        still some issues that must be addressed before automatically
-        generated makefiles are incorporated into the official ACE
-        distribution.
+	* ACE-configuration.txt:
+	* ACE.ifnames:
+	* acconfig.h:
+	* ace-config.in:
+	* ace-diff-config.in:
+	* acinclude.m4:
+	* aclocal.m4:
+	* config.guess:
+	* config.sub:
+	* configure:
+	* configure.in:
+	* install-sh:
+	* libtool:
+	* ltconfig:
+	* ltmain.sh:
+	* missing:
+	* mkinstalldirs:
+	* ace/config.h.in:
+
+	Started to introduce the work done by the ACE Configuration
+	Project into the official ACE distribution.
+
+	To help speed development, the work being done by the ACE
+	Configuration Project is being slowly introduced into the official
+	ACE distribution.  Some of the functionality in the work created by
+	the ACE Configuration Project has been removed so that ACE may be
+	built in the usual fashion.  Once the ACE Configuration Project
+	work stabilizes on more platforms that removed functionality may be
+	added to ACE.
+
+	Currently the configure script contains most of the tests that are
+	necessary to properly configure ACE on most platforms.  However,
+	there are still some autoconf tests that are missing.  As such, you
+	may encounter and most likely will have compilation problems.
+
+	The `configure' script that is currently being used has been
+	modified from the ACE Configuration Project's `configure' script to
+	prevent makefiles from being automatically generated since there are
+	still some issues that must be addressed before automatically
+	generated makefiles are incorporated into the official ACE
+	distribution.
 
 Sun Feb 14 14:09:11 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
 
-        * docs/tutorials/015/server.cpp (main): Force the singleton to use
-        the Select Reactor instead of the OS-default.  This should fix the
-        problem this tutorial has on Win32 due to blocking vs non-blocking
-        socket configuration.
-
-        * docs/tutorials/015/Protocol_Task.h : Removed the ability to
-        activate this task.  The code is now a little simpler and less
-        likely to behave in unpredicatable ways.
+	* docs/tutorials/015/server.cpp (main): Force the singleton to use 
+	the Select Reactor instead of the OS-default.  This should fix the 
+	problem this tutorial has on Win32 due to blocking vs non-blocking 
+	socket configuration.
 
-        * docs/tutorials/015/* : A few typos fixed but mostly fallout from
-        removing the ability to activate the Protocol_Task.
+	* docs/tutorials/015/Protocol_Task.h : Removed the ability to
+	activate this task.  The code is now a little simpler and less
+	likely to behave in unpredicatable ways.
 
-        * docs/tutorials/016/page01.html : Added Kirthika's abstract.
+	* docs/tutorials/015/* : A few typos fixed but mostly fallout from 
+	removing the ability to activate the Protocol_Task.
 
-        * docs/tutorials/016/condition.cpp : Made max_threads_ a
-        non-static member variable that is set by open().
-
-        * docs/tutorials/017/page01.html : Added Kirthika's abstract.
+	* docs/tutorials/016/page01.html : Added Kirthika's abstract.
+	
+	* docs/tutorials/016/condition.cpp : Made max_threads_ a
+	non-static member variable that is set by open().
 
+	* docs/tutorials/017/page01.html : Added Kirthika's abstract.
+	
 Sun Feb 14 12:47:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * ace/CDR_Stream.h:
-        * ace/CDR_Stream.i:
-        * ace/CDR_Stream.cpp:
-          Minor cosmetic changes, mostly trailing spaces.
+	* ace/CDR_Stream.h: 
+	* ace/CDR_Stream.i: 
+	* ace/CDR_Stream.cpp: 
+	  Minor cosmetic changes, mostly trailing spaces.
 
 Sat Feb 13 22:06:17 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        The following changes are based on the patch Eric Covington
-        <eric@nowsol.com> submitted.  Thanks very much to Eric for
-        bringing ACE/CE up-to-date.
+	The following changes are based on the patch Eric Covington
+	<eric@nowsol.com> submitted.  Thanks very much to Eric for
+	bringing ACE/CE up-to-date.
 
-        * ace/ace_ce_dll.dsp: Updated.
+	* ace/ace_ce_dll.dsp: Updated.
 
-        * ace/OS.cpp: (open): CE doesn't support opening files with
-          attribute FILE_SHARE_DELETE.
+	* ace/OS.cpp: (open): CE doesn't support opening files with
+	  attribute FILE_SHARE_DELETE.
 
-        * ace/OS.i (abort): CE doesn't support abort.
+	* ace/OS.i (abort): CE doesn't support abort.
 
-        * ace/Stats.cpp (print_summary): CE doesn't support strerror.
+	* ace/Stats.cpp (print_summary): CE doesn't support strerror.
 
-        * ace/Stats.i (dump): Changed to use ACE_DEBUG.
+	* ace/Stats.i (dump): Changed to use ACE_DEBUG.
 
-        * tests/Thread_Manager_Test.cpp (main):
-        * ace/tests/SOCK_Connector_Test.cpp (find_another_host):
-        * ace/Log_Msg.cpp (log):
-        * ace/INET_Addr.cpp (addr_to_string): Fixed Unicode problems.
+	* tests/Thread_Manager_Test.cpp (main):
+	* ace/tests/SOCK_Connector_Test.cpp (find_another_host):
+	* ace/Log_Msg.cpp (log):
+	* ace/INET_Addr.cpp (addr_to_string): Fixed Unicode problems.
 
 Fri Feb 12 16:14:47 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * ace/Remote_Tokens.cpp: Replaced the typedef for
-          ACE_TSS_CONNECTION_MUTEX with #define ACE_TSS_CONNECTION_MUTEX.
-          Thanks to Arturo for reporting this.
+	* ace/Remote_Tokens.cpp: Replaced the typedef for
+ 	  ACE_TSS_CONNECTION_MUTEX with #define ACE_TSS_CONNECTION_MUTEX.
+  	  Thanks to Arturo for reporting this.
 
 Fri Feb 12 18:41:22 1999  Steve Huston  <shuston@riverace.com>
 
@@ -6491,7 +1078,7 @@ Sun Jan 24 14:23:07 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
         * ace/SString.cpp: The substring() method did not check for zero
           length.  Thanks to Mike Goldman for this fix.
 
-Sun Jan 24 02:08:57 1999  Carlos O'Ryan  <coryan@cs.wus...tl.edu>
+Sun Jan 24 02:08:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
         * websvcs/lib/URL_Addr.cpp:
         * websvcs/lib/URL_Addr.h:
@@ -6590,7 +1177,7 @@ Sat Jan 23 04:53:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
               manage the search structure but manages the two linked list
               on top of the array.  Thanks to Carlos for this cool idea.
 
-          (d) current_size() was broken.  This is fixed in the new code.
+          (d) current_sizewas broken.  This is fixed in the new code.
 
           (e) Inlined a bunch of small functions.
 
@@ -6867,7 +1454,7 @@ Mon Jan 18 23:07:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
           yet.  Apparently, fopen does not open file with
           FILE_SHARE_DELETE.
 
-Mon Jan 18 22:54:18 1999  Darrell Brunsch <brunsch@cs.w...ustl.edu>
+Mon Jan 18 22:54:18 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * ace/ace_dll.dsp:
         * ace/ace_lib.dsp:
@@ -6968,7 +1555,7 @@ Sun Jan 17 16:40:22 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
           message to indicate that C++ exception support isn't ENABLED on
           a platform, rather than saying that it's not supported at all...
 
-Sun Jan 17 15:16:35 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
+Sun Jan 17 15:35 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
         * ace/SString.cpp (operator<<): The operator<< used to print out
           ACE_WString caused an infinite loop on platform without UNICODE
@@ -7257,7 +1844,7 @@ Thu Jan 14 16:18:37 EST 1999  James CE Johnson  <jcej@lads.com>
 Thu Jan 14 11:46:25 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
 
         * ace/Synch_T.h: Pointed out that we can only parameterize
-          ACE_Condition<> with ACE_Thread_Mutex and ACE_...Null_Mutex.
+          ACE_Condition<> with ACE_Thread_Mutex and ACE_Null_Mutex.
           Thanks to Knut-Havard Aksnes <knut@orion.no> for reporting
           this.
 
@@ -7360,7 +1947,7 @@ Tue Jan 12 10:59:58 1999  David L. Levine  <levine@cs.wustl.edu>
           libedgenoe.a, so that a symlink in $(GHS_DIR) is no longer necessary.
           Thanks to Steve Kay for reporting this.
 
-        * ace/config-mklinux.h: removed ACE_HAS_SOCKLEN_T, added __USE_XOPEN.
+        * ace/config-mklinux.h: removed ACE_HAS_SOCKLEN_T, addedUSE_XOPEN.
           Thanks to Andreas Tobler <toa@pop.agri.ch> for these updates.
 
 Tue Jan 12 08:44:11 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
@@ -7642,7 +2229,7 @@ Tue Jan  5 00:59:04 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
           protect against race conditions if multiple threads call
           remove() simultaneously.  However, if this happens it's a sign
           that the application was designed incorrectly...  Thanks to Paul
-          Felix <pef@fluent.com> and Irfan for tracking this down....
+          Felix <pef@fluent.com> and Irfan for tracking this down.
 
         * ace/FILE: Added new methods, seek() and tell(), that are more
           intuitively named than the existing position() methods.  The
@@ -7694,4 +2281,132 @@ Sun Jan  3 14:39:49 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
         * ace/ACE: Added a simple dirname() wrapper method.
 
         * ace/SString: The set(const char *, size_t, int = 1) and
-          set(const c
+          set(const char *, size_t) methods were inherently ambiguous.
+          I've fixed this by changing removing the default parameters.
+          Thanks to Irfan for suggesting this fix.
+
+        * ace/Mem_Map.cpp: mmap() will fail if the length of the file
+          mapping is 0, which will be the case if we've just created the
+          file.  Therefore, don't even bother trying to mmap() in this
+          case and return a successful result.
+
+        * ace/FILE: Moved the get_remote_addr() and get_local_addr()
+          methods from the FILE_IO class to the FILE class since that's
+          more properly where they belong.  Also added a new remove()
+          method that unlinks the file.
+
+        * tests/Priority_Reactor_Test.cpp,
+          tests/Conn_Test.cpp,
+          tests/Notify_Performance_Test.cpp,
+          Priority_Reactor_Test.cpp,
+          Reactor_Performance_Test.cpp: Since the default is to skip argv0
+          there's no sense explicitly saying this in the constructor of
+          ACE_Get_Opt.
+
+        * ace/FILE_Connector.h: Updated the comments to reflect recent
+          changes.
+
+        * ace/FILE.h: Added a new get_info() method that takes a reference
+          to an ACE_FILE_Info rather than a pointer.  This is a cleaner
+          API, IMHO.
+
+        * ace/FILE_Connector.cpp (connect): When the <remote_sap> argument
+          is ACE_Addr::sap_any, then connect will select a temporary
+          filename using the new feature of ACE_FILE_Addr described below.
+
+        * ace/FILE_Addr.cpp (set): When the address is ACE_Addr::sap_any,
+          then we'll select a new temporary filename using the new
+          ACE_DEFAULT_TEMP_FILE macro and ACE_OS::mktemp().
+
+        * ace/OS.h: Added a new ACE_DEFAULT_TEMP_FILE macro that defaults
+          to "/tmp/ace-fileXXXX" and is used by the ACE_FILE_Connector
+          to create a temporary file when it's given an ACE_Addr::sap_any.
+
+        * ace/FILE_Addr.h: The <set> accessor should return an int to be
+          consistent.
+
+        * ace/OS.h: Added a new ACE_sap_any_cast macro, which makes it
+          much easier to cast the ACE_Addr::sap_any to the right subclass.
+
+        * tests/Reactor_Performance_Test.cpp,
+          tests/Reactor_Exceptions_Test.cpp,
+          tests/Process_Strategy_Test.cpp,
+          tests/Priority_Reactor_Test.cpp,
+          tests/IOStream_Test.cpp,
+          tests/Conn_Test.cpp: Replaced all the C-style casts for
+          ACE_Addr::sap_any with the new ACE_sap_any_cast macro.
+
+Sun Jan 03 21:48:37 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
+
+        * ace/Asynch_Acceptor.cpp: Since this is a template file, I
+          removed it from the ace library build on NT.
+
+        * ace/Asynch_Acceptor.cpp (open): Changed C-style cast to use the
+          new ACE_sap_any_cast macro from Dr. Schmidt.
+
+Sun Jan 03 09:12:23 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/config-sunos5.5.h: with GreenHills, added
+          ACE_LACKS_LINEBUFFERED_STREAMBUF and ACE_LACKS_SIGNED_CHAR.
+
+        * ace/Basic_Types.* (ACE_U_LongLong): unioned the data members
+          with a double, to ensure alignment on 8-byte boundaries.  It
+          could matter when an ACE_U_LongLong is used as a true 8-byte
+          quantity, such as in a call to Solaris ::gethrtime ().
+
+        * tests/Time_Value_Test.cpp: replaced remaining #ifdef
+          ACE_HAS_STHREADS with #ifdef sun.
+
+Sat Jan  2 23:48:44 1999  James CE Johnson  <jcej@chiroptera.tragus.org>
+
+        * docs/ACE-tutorials.html
+        * docs/tutorials/guide-tutorials.html
+        * docs/tutorials/new-tutorials.html
+        * docs/tutorials/online-tutorials.html
+        Converted some of the absolute URLs to relative.  I only have the
+        docs/tutorials tree here at home so I couldn't do any more than
+        these.
+
+        * docs/tutorials/021/*
+        New tutorial on ACE_Malloc<>.  I haven't begun the documentation
+        yet but wanted to get the code commited so it doesn't get lost.
+
+Sat Jan 02 08:34:27 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * examples/ASX/Event_Server/Event_Server/event_server.cpp
+          (handle_input),
+          examples/Reactor/Misc/test_early_timeouts.cpp (main):
+          added ACE_UNUSED_ARG (n), to avoid compile warning with ACE_NDEBUG.
+
+        * performance-tests/Misc/test_naming.cpp (find): moved function
+          call w/side effect out of ACE_ASSERT.  Thanks to DU 4.0 cxx
+          for noticiing it, with ACE_NDEBUG.
+
+Fri Jan 01 18:57:22 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * ace/Containers_T.i (ACE_Array,ACE_Array::operator=):
+          added missing ACE_INLINE's.
+
+        * ace/OS.{h,cpp} (ACE_TSS_Info::operator{==,!=}): added
+          constness.  It's necessary with the ACE_Array changes,
+          with ACE_HAS_TSS_EMULATION.
+
+Fri Jan  1 12:22:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+        * ace/Containers_T.h:
+        * ace/Containers_T.i:
+        * ace/Containers_T.cpp:
+        * bin/Array_Helper:
+        * bin/Array.pl:
+          Moved most of the implementation of ACE_Array into
+          ACE_Array_Base this class does not require == or != operators
+          defined for the template parameter.
+          I also added methods to access and manipulate the capacity of
+          the array (max_size) as opposed to always changing its size (the
+          portion actually used).
+
+        * ace/Object_Manager.cpp:
+        * ace/Template_Instantiations.cpp:
+        * ace/OS.cpp:
+        * apps/JAWS/clients/Caching/URL_Properties.cpp:
+          Fixed ACE_Array instantiations.
diff --git a/Makefile b/Makefile
index 2166e35493a..d650d8a8a19 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@
 
 #### The "release" and "releaseall" targets can be used to create
 #### the ACE and ACE+TAO kits.  By default, each creates a new beta
-#### release.  To create a new minor or major release, add REL=minor
-#### or REL=major, respectively, to the make invocation.
+#### release.  To create a new minor or major release, add "REL=minor"
+#### or "REL=major", respectively, to the make invocation.
 ####
 #### NOTE: the REL modifier applies to _both_ ACE and TAO in
 #### releaseall!
@@ -19,11 +19,7 @@
 ####   % make release
 ####
 #### To see what make release* would do without actually doing it, add
-#### CHECK=-n to the invocation.
-####
-#### By default, make release* will regenerate the contents of the man
-#### directory.  To suppress that, add GENERATE_MAN_PAGES= to your
-#### make release or make releaseall invocation.
+#### "CHECK=-n" to the invocation.
 
 #----------------------------------------------------------------------------
 #       Local macros
@@ -48,7 +44,7 @@ CLONE   = Makefile \
           include \
           netsvcs \
           performance-tests \
-          TAO \
+	  TAO \
           tests
 
 #----------------------------------------------------------------------------
@@ -72,67 +68,61 @@ clone:
                 (clone -s $(ACE_ROOT)/$$dir $$dir) \
         done
 
-CONTROLLED_FILES = \
-        ACE-INSTALL.html \
-        ACE-install.sh \
-        ASNMP \
-        BIBLIOGRAPHY \
-        COPYING \
-        ChangeLog \
-        ChangeLog-98a \
-        ChangeLog-98b \
-        ChangeLog-97b \
-        ChangeLog-97a \
-        ChangeLog-96b \
-        ChangeLog-96a \
-        ChangeLog-95 \
-        ChangeLog-94 \
-        ChangeLog-93 \
-        FAQ \
-        Makefile \
-        PROBLEM-REPORT-FORM \
-        README \
-        VERSION \
-        ace \
-        apps \
-        bin \
-        docs \
-        etc \
-        examples \
-        include \
-        netsvcs \
-        os-patches \
-        performance-tests \
-        tests \
-        WindozeCE
-
-RELEASE_FILES = \
-        $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
-        ACE_wrappers/ACE-INSTALL \
-        ACE_wrappers/man
-
-ALL_RELEASE_FILES = \
-        $(RELEASE_FILES) \
-        ACE_wrappers/TAO
+CONTROLLED_FILES = ACE-INSTALL.html \
+                ACE-install.sh \
+                ASNMP \
+                BIBLIOGRAPHY \
+		BUG-REPORT-FORM \
+                COPYING \
+                ChangeLog \
+		ChangeLog-98a \
+		ChangeLog-98b \
+		ChangeLog-97b \
+                ChangeLog-97a \
+                ChangeLog-96b \
+                ChangeLog-96a \
+                ChangeLog-95 \
+                ChangeLog-94 \
+                ChangeLog-93 \
+                FAQ \
+                Makefile \
+                README \
+                VERSION \
+                ace \
+                apps \
+                bin \
+		docs \
+                etc \
+                examples \
+                include \
+                netsvcs \
+                os-patches \
+                performance-tests \
+                tests \
+                WindozeCE
+
+RELEASE_FILES = $(addprefix ACE_wrappers/,$(CONTROLLED_FILES)) \
+                ACE_wrappers/ACE-INSTALL \
+                ACE_wrappers/man
+
+ALL_RELEASE_FILES = $(RELEASE_FILES) \
+                    ACE_wrappers/TAO
 
 RELEASE_LIB_FILES = \
-        ACE_wrappers/VERSION \
-        ACE_wrappers/ace \
-        ACE_wrappers/bin \
-        ACE_wrappers/etc \
-        ACE_wrappers/include \
-        ACE_wrappers/netsvcs \
-        ACE_wrappers/tests
+                ACE_wrappers/VERSION \
+                ACE_wrappers/ace \
+                ACE_wrappers/include \
+                ACE_wrappers/netsvcs \
+                ACE_wrappers/tests
 
 .PHONY: release releasetao releaseall
 
 REL = beta
 CHECK =
-GENERATE_MAN_PAGES = $(ACE_ROOT)/bin/generate_man_pages
 
 #### The release target creates the ACE (only) kit.
 release: ACE-INSTALL
-	@$(GENERATE_MAN_PAGES)
+	@$(ACE_ROOT)/bin/generate_man_pages
 	@$(ACE_ROOT)/bin/make_release $(CHECK) -k ace -t $(REL) \
            -c "$(CONTROLLED_FILES)" -r "$(RELEASE_FILES)" \
            -l "$(RELEASE_LIB_FILES)"
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index e45e5ea1dc6..00000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,134 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for the ACE toolkit libraries, tests, and
-##       applications
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 check-news
-
-bin_SCRIPTS = ace-config
-
-man_MANS = ace-config.1
-
-## Build the library directories first.
-## The docs directory is currently handled by the "dist-hook" makefile target.
-SUBDIRS = ace \
-          netsvcs \
-          tests \
-          apps \
-          man
-
-##SUBDIRS = \
-##          docs \
-##          apps \
-##          examples \
-##          performance-tests \
-##          bin \
-##          ASNMP \
-##          os-patches \
-##          etc \
-##          includes
-
-## For some reason, automake doesn't include acconfig.h in the distribution
-EXTRA_DIST = \
-        ACE-INSTALL.html \
-        ACE-install.sh \
-        ACE.DSW \
-        BIBLIOGRAPHY \
-        ChangeLog-93 \
-        ChangeLog-94 \
-        ChangeLog-95 \
-        ChangeLog-96a \
-        ChangeLog-96b \
-        ChangeLog-97a \
-        ChangeLog-97b \
-        ChangeLog-98a \
-        ChangeLog-98b \
-        FAQ \
-        PROBLEM-REPORT-FORM \
-        README.aceconf \
-        VERSION \
-        acconfig.h \
-        ace-config.in \
-        ace-config.1.in \
-        aceConf.sh.in \
-        ACE.ifnames \
-        ace-diff-config.in
-
-DISTCLEANFILES = ace-config aceConf.sh ace-config.1 ace-diff-config \
-                 ace-diff-config.results ace-diff-config.results.bak
-
-MAINTAINERCLEANFILES = ACE.ifnames
-
-## release:
-##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
-release:
-	$(MAKE) dist
-
-## Put `exec' in the name because this should be installed by
-## `install-exec', not `install-data'.
-confexecdir=$(libdir)
-confexec_DATA = aceConf.sh
-
-## We create aceConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-aceConf.sh: aceConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@ACE_LIBDIR\@,$(ACE_LIBDIR),g' \
-            -e 's,\@ACE_INCLUDEDIR\@,$(ACE_INCLUDEDIR),g' \
-            -e 's,\@ACE_LIBS\@,$(ACE_LIBS),g' \
-            -e 's,\@CXXFLAGS\@,$(CXXFLAGS),g' \
-              < $(srcdir)/aceConf.sh.in > aceConf.tmp \
-          && mv aceConf.tmp aceConf.sh
-
-ace-config.1: ace-config.1.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@libdir\@,$(libdir),g' \
-              < $(srcdir)/ace-config.1.in > ace-config.1.tmp \
-          && mv ace-config.1.tmp ace-config.1
-
-## The file containing the list of preprocessor conditional macros used by ACE
-noinst_DATA = ACE.ifnames
-
-ACE.ifnames: ChangeLog acconfig.h
-if MAINTAINER_MODE
-        rm -f $@
-	ifnames $(top_srcdir)/ace/*.{h,i,cpp} | sed -e 's/ .*//g' \
-           > $(top_srcdir)/$@
-else
-	touch $(top_srcdir)/$@
-endif
-
-## Directories to include in the distribution but which I am too lazy to
-## create Makefile.am files for.  A Makefile.am for these directories isn't
-## needed anyway.
-ACE_EXTRA_DIST = bin docs m4
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
-## Make sure config.h doesn't get into the distribution
-## since it may later intefere with the newly generated
-## config.h when doing VPATH builds.
-## We don't want it in the distribution, anyway, since
-## config.h is platform specific.
-dist-hook:
-	-rm -f $(distdir)/ace/config.h
-	(cd $(top_srcdir); tar cf - $(ACE_EXTRA_DIST)) | (cd $(distdir); \
-          tar xfBp -)
-	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
-          rm -rf $$p; \
-        done
diff --git a/README b/README
index 5ff97a09c55..0b57d3f3d57 100644
--- a/README
+++ b/README
@@ -208,7 +208,7 @@ that describe the ACE wrappers and the ADAPTIVE system in more detail.
 
 The current release has been tested extensively, but if you find any
 bugs, please report them to the ACE mailing list
-ace-users@cs.wustl.edu using the $ACE_ROOT/PROBLEM-REPORT-FORM.
+ace-users@cs.wustl.edu using the $ACE_ROOT/BUG-REPORT-FORM.
 Please use the same form to submit questions, comments, etc.
 To ensure that you see responses, please do one of the following:
 
@@ -246,7 +246,7 @@ Balachandran Natarajan <bala@cs.wustl.edu>
 Kirthika Parameswaran <kirthika@cs.wustl.edu>
 Carlos O'Ryan <coryan@cs.wustl.edu>
 Ossama Othman <ossama@cs.wustl.edu>
-Jeff Parsons <parsons@cs.wustl.edu>
+Jeff Parsons <jp4@cs.wustl.edu>
 Irfan Pyarali <irfan@cs.wustl.edu>
 Marina Spivak <marina@cs.wustl.edu>
 Nagarajan Surendran <naga@cs.wustl.edu>
@@ -335,7 +335,7 @@ Sandeep Joshi <sandeepj@emailbox.att.com>
 Bernd Hofner <hofner@pd.et-inf.uni-siegen.de>
 Craig Perras <craigp@wolfenet.com>
 Kirk Sinnard <kirk.sinnard@lawson.com>
-Matthew Newhook <matthew@ooc.com>
+Matthew Newhook <matthew@neweast.ca>
 Gerolf Wendland <wendland@hpp015.mch2.scn.de>
 Phil Mesnier <phil@envision.com>
 Ross Dargahi <rossd@krinfo.com>
@@ -646,7 +646,7 @@ Clinton Carr <ccarr@websocket.com>
 Peter Liqun Na <liqunna@cs.sunysb.edu>
 Frank Adcock <frank@bushlife.com.au>
 Xu Yifeng <xuyifeng@www.kali.com.cn>
-Valery Arkhangorodsky <valerya@servicesoft.com>
+Valery Arkhangorodsky <avalery@geocities.com>
 Alan Scheinine <scheinin@crs4.it>
 Andrew G. Harvey <agh@cisco.com>
 Dann Corbit <DCorbit@SolutionsIQ.com>
@@ -720,7 +720,7 @@ Greg Holtmeyer <gholtmeyer@mdc.com>
 Jody Hagins <jody@atdesk.com>
 Patrice Bensoussan <pbensoussan@amadeus.net>
 Keith Brown <kalbrown@ix.netcom.com>
-Barry Hoggard <hoggard@cfx.com>
+Barry Hoggard <hoggardb@panix.com>
 Peter J. Mason <peterm@fl.net.au>
 Jerry De Master <jdemaste@ipdinc.com>
 Greg Gallant <greg.gallant@jhuapl.edu>
@@ -740,6 +740,7 @@ Tommy Andreasen <tommy.andreasen@radiometer.dk>
 Slava Galperin <galperin@teknowledge.com>
 Jeff Olszewski <jolszewski@std.saic.com>
 Sudhanshu Garg <sg2@ladybug.cec.wustl.edu>
+Jerry D. De Master <jdemaster@ipdinc.com>
 Mike Preradovic <michael_preradovic@epicdata.com>
 Greg Harrison <harrisog@erinet.com>
 Sangwoo Jin <swjinjin@sei.co.kr>
@@ -750,102 +751,6 @@ Jacob Jones <Jacob.J.Jones@notesmta.gd-is.com>
 Phil Ruelle <Phil.Ruelle@adv.sonybpe.com>
 Sush Bankapura <Sush.Bankapura@sylantro.com>
 Eric Covington <eric@nowsol.com>
-Darren Whobrey <whobrey@fecit.co.uk>
-Mason Taube <taube@westcon.prc.com>
-Rod Joseph <rodjoseph@adt.com>
-Hans Horsmann <Hans.Horsmann@icn.siemens.de>
-Kevin Royalty <kroyalty@mdc.com>
-Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca>
-Mark Little <M.C.Little@ncl.ac.uk>
-Tim Stack <stack@cs.utah.edu>
-Marc Engel <engelm@tlse.sofreavia.fr>
-Uma Markandu <umam@nortelnetworks.com>
-Henrik Nordberg <hnordberg@lbl.gov>
-Tad Jarosinski <tadj@qualcomm.com>
-Andy Marchewka <AndyM@who.net>
-Neal Norwitz <nnorwitz@arinc.com>
-Frederic Maria <fmaria@lucent.com>
-David Hooker <DHooker@uniview.net>
-Christian.Destor <Christian.Destor@alcatel.fr>
-Andrew Hobson <ahobson@eng.mindspring.net>
-Andre Folkers <folkers@informatik.mu-leubeck.de>
-Torsten Kuepper <kuepper2@uni-wuppertal.de>
-Hao Ruan <hruan@lucent.com>
-Alexander Davidovich <sasha@ms.com>
-Cristian Ferretti <cfs@mat.puc.cl>
-N Becker <nbecker@fred.net>
-Yaolong Lan <lyaolong@cs.sunysb.edu>
-Elias Sreih <sealstd1@nortelnetworks.com>
-Liang Chen <chenl@nortelnetworks.com>
-Mark Laffoon <mark.laffoon@centraxcorp.com>
-Ti Z <tiz@cisco.com>
-Brian Dance <Brian_Dance@UECCS.co.uk>
-Alexey Gadzhiev <alg@null.ru>
-Francois Bernier <fbernier@gel.ulaval.ca>
-Bill Rizzi <rizzi@softserv.com>
-Peter Windle <peterw@ugsolutions.com>
-Andy Alvarez <axab@eci.esys.com>
-Jaepil Kim <jpkim@lgsoft.com>
-Goldshtain Dmitry <goldshtain.dmitry@usa.net>
-Carl Grinstead <grinstea@tsunami.com>
-Henric Jungheim <junghelh@pe-nelson.com>
-Konstantinos Margaritis <kmargar@cc.uoa.gr>
-Michael Preobrazhensky <mikep@xpedite.com>
-Gregory D. Fee <gdf2@cec.wustl.edu>
-Roland Gigler <roland@mch.pn.siemens.de>
-Frank Buschmann <Frank.Buschmann@mchp.siemens.de>
-Eric Eide <eeide@cs.utah.edu>
-Don Busch <busch_d@ociweb.com>
-Thomas Lockhart <Thomas.G.Lockhart@jpl.nasa.gov>
-David Hauck <davidh@realtimeint.com>
-Joe Hoffert  <joeh@tango.cs.wustl.edu>
-Keith Rohrer <KRohrer@hnv.com>
-Tim Rose <trose@bridgewatersys.com>
-Sam Rhine <rmsolution20@earchlink.net>
-Chris Schleicher <chrissch@cnd.hp.com>
-Margaret Reitz <margaret@veritas.com>
-Thomas Mehrkam <Thomas_Mehrkam@i-o.com>
-Erik Ivanenko <erik.ivanenko@utoronto.ca>
-Sarmeesha Reddy <sreddy@tr.comm.mot.com>
-Steven Tine <stevent@tr.comm.mot.com>
-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>
-Paul Francis <pfrancis@dkl.com>
-Kris Johnson <kjohnson@gardnersys.com>
-Dave Butenhof <butenhof@zko.dec.com>
-Dominic Williams <dom@connected-place.co.uk>
-Srikumar Kareti <skareti@htc.honeywell.com>
-Ian Pepper <ian@aptest.ie>
-Kevin Lyda <kevin.lyda@trintech.com>
-James D. Rucker <jdrucker@huey.jpl.nasa.gov>
-Brian Wallis <Brian.Wallis@sr.com.au>
-Sandeep Goyal <sagoyal@hss.hns.com>
-englishmalc@my-dejanew.com
-Frank O'Dwyer <fod@brd.ie>
-Long Hoang <LHoang@hwdcsaws.cahwnet.gov>
-Steven D. Chen <sdc2951@aw101.iasl.ca.boeing.com>
-Alain Magloire <alain@qnx.com>
-Jim Rogers <jrogers@viasoft.com>
-Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com>
-David Brownell <david-b@pacbell.net>
-Richard Stallman <rms@gnu.org>
-Casey Lucas <clucas@sabre.com>
-Brian C. Olson <bolson@rtlogic.com>
-Joseph A. Condlin <jac@slpmbo.ed.ray.com>
-Serge Du <du@lal.in2p3.fr>
-Mike Mazurek <mmazurek@std.saic.com>
-Joe Golio <Joe.Golio@xylan.com>
-Christian Schuderer <Christian.Schuderer@erl9.siemens.de>
-John R. Taylor <jrtaylor@george.lbl.gov>
-gwtovrea@west.raytheon.com
-Wallace Owen <owen@visicom.com>
-Vyacheslav A. Batenin <slavikb@iname.com>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson and is now at ObjectSpace.  Paul devised the recursive
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/PROBLEM-REPORT-FORM b/TAO/BUG-REPORT-FORM
index e0e04394847..af4cec967c1 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/BUG-REPORT-FORM
@@ -21,8 +21,8 @@
 To: ace-users@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 0.3.23
-    ACE VERSION: 4.6.40
+    TAO VERSION: 0.3.4
+    ACE VERSION: 4.6.22
 
     HOST MACHINE and OPERATING SYSTEM:
     TARGET MACHINE and OPERATING SYSTEM, if different from HOST:
diff --git a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
index 7eb4109f340..79d20c6f21f 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/marshalS.cpp
@@ -20,20 +20,20 @@ static const TAO_operation_db_entry Marshal_operations[] = {
 };
 
 TAO_Dynamic_Hash_OpTable tao_Marshal_optable(Marshal_operations, 10,
-					     // 9 + 1 operations on our
-					     // interface
+					     // 9 + 1 operations on our 
+					     // interface 
 					     20);
 // constructor
 _skel_Marshal::_skel_Marshal (const char *obj_name)
 {
   const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  STUB_Object *data;  // IIOP object
+  IIOP_Object *data;  // IIOP object 
   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
   this->optable_ = &tao_Marshal_optable;     // operation database
   CORBA_Long i;
 
   // setup an IIOP object
-  data = new STUB_Object (CORBA_string_dup (repoID));
+  data = new IIOP_Object (CORBA_string_dup (repoID));
   data->profile.iiop_version.major = IIOP::MY_MAJOR;
   data->profile.iiop_version.minor = IIOP::MY_MINOR;
   data->profile.host = ACE_OS::strdup(oa->get_addr().get_host_name());
@@ -49,8 +49,8 @@ _skel_Marshal::_skel_Marshal (const char *obj_name)
 }
 
 // skeletons
-void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req,
-					     CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
+					     CORBA_Object_ptr obj, 
 					     CORBA_Environment &env)
 {
 #if 0
@@ -85,50 +85,50 @@ void _skel_Marshal::_Marshal_test_short_skel(CORBA_ServerRequest &req,
   // byte_order, consume_buf = 0, instance of our marshal factory
 }
 
-void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req,
-					    CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
+					    CORBA_Object_ptr obj, 
 					    CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
-					     CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
+					     CORBA_Object_ptr obj, 
 					     CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req,
-					    CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
+					    CORBA_Object_ptr obj, 
 					    CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
+					      CORBA_Object_ptr obj, 
 					      CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
+					      CORBA_Object_ptr obj, 
 					      CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req,
-					     CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
+					     CORBA_Object_ptr obj, 
 					     CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req,
-					   CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
+					   CORBA_Object_ptr obj, 
 					   CORBA_Environment &env)
 {
 }
 
-void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void _skel_Marshal::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
 }
@@ -169,3 +169,4 @@ void _skel_Marshal::_Marshal_is_a_skel (
   req.result (any, env);
   dexc (env, "_is_a, result");
 }
+
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
index 62bd609f343..a48959e2200 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp
@@ -706,7 +706,7 @@ Tao_Marshal_Client_Proxy::dii_test_short (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item (0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_short",
 			arglist,
 			result,
@@ -758,7 +758,7 @@ Tao_Marshal_Client_Proxy::dii_test_long (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_long",
 			arglist,
 			result,
@@ -811,7 +811,7 @@ Tao_Marshal_Client_Proxy::dii_test_octet (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_octet",
 			arglist,
 			result,
@@ -864,7 +864,7 @@ Tao_Marshal_Client_Proxy::dii_test_char (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_char",
 			arglist,
 			result,
@@ -917,7 +917,7 @@ Tao_Marshal_Client_Proxy::dii_test_double (CORBA_Marshal_Proxy::OPTIONS &options
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_double",
 			arglist,
 			result,
@@ -974,7 +974,7 @@ Tao_Marshal_Client_Proxy::dii_test_struct (CORBA_Marshal_Proxy::OPTIONS &options
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_struct",
 			arglist,
 			result,
@@ -1032,7 +1032,7 @@ Tao_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_union",
 			arglist,
 			result,
@@ -1077,7 +1077,7 @@ Tao_Marshal_Client_Proxy::dii_test_union (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_union",
 			arglist,
 			result,
@@ -1143,7 +1143,7 @@ Tao_Marshal_Client_Proxy::dii_test_any (CORBA_Marshal_Proxy::OPTIONS &options,
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_any",
 			arglist,
 			result,
@@ -1247,7 +1247,7 @@ Tao_Marshal_Client_Proxy::dii_test_sequence (CORBA_Marshal_Proxy::OPTIONS &optio
   result = result_list->item(0);
 
   // create a request
-  ref_->_create_request(CORBA_Context::_nil (),
+  ref_->_create_request(//ctx,
 			"test_sequence",
 			arglist,
 			result,
diff --git a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
index cdf7e4541ee..60a6f42eac6 100644
--- a/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
+++ b/TAO/Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp
@@ -100,7 +100,7 @@ Marshal_SSI_Impl::test_any (const CORBA_Any &a1,
   a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
 }
 
-void
+void 
 Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 				 Marshal::AnySeq *& as2,
 			      CORBA_Environment &env)
@@ -109,7 +109,7 @@ Marshal_SSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 }
 
 #if 0
-void
+void 
 Marshal_SSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
 				  Marshal::Marshal_Recursive *&mr2,
 			      CORBA_Environment &env)
@@ -147,13 +147,13 @@ Marshal_DSI_Impl::Marshal_DSI_Impl (CORBA_ORB_ptr orb, const char *obj_name)
   // cleanly integrate ourselves with the dispatch mechanism of the OA.
 
   const CORBA_String repoID = "IDL:Marshal:1.0"; // repository ID
-  STUB_Object *data;  // IIOP object
+  IIOP_Object *data;  // IIOP object 
   CORBA_BOA_ptr oa = TAO_OA_PARAMS::instance()->oa(); // underlying BOA
   this->optable_ = &tao_Marshal_DSI_optable;     // operation database
   CORBA_Long i;
 
   // setup an IIOP object
-  data = new STUB_Object (CORBA_string_dup (repoID));
+  data = new IIOP_Object (CORBA_string_dup (repoID));
   data->profile.iiop_version.major = IIOP::MY_MAJOR;
   data->profile.iiop_version.minor = IIOP::MY_MINOR;
   data->profile.host = ACE_OS::strdup (oa->get_addr ().get_host_name ());
@@ -203,8 +203,8 @@ Marshal_DSI_Impl::invoke (CORBA_ServerRequest& req, CORBA_Environment &env)
 }
 
 // simulate the skeletons
-void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr		nvlist;
@@ -238,8 +238,8 @@ void Marshal_DSI_Impl::_Marshal_is_a_skel(CORBA_ServerRequest &req,
   dexc (env, "_is_a, result");
 }
 
-void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -271,8 +271,8 @@ void Marshal_DSI_Impl::_Marshal_test_short_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -304,8 +304,8 @@ void Marshal_DSI_Impl::_Marshal_test_long_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -337,8 +337,8 @@ void Marshal_DSI_Impl::_Marshal_test_octet_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req,
-					       CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req, 
+					       CORBA_Object_ptr obj, 
 					       CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -370,8 +370,8 @@ void Marshal_DSI_Impl::_Marshal_test_char_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -403,8 +403,8 @@ void Marshal_DSI_Impl::_Marshal_test_double_skel(CORBA_ServerRequest &req,
   req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -443,8 +443,8 @@ void Marshal_DSI_Impl::_Marshal_test_struct_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req,
-						CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req, 
+						CORBA_Object_ptr obj, 
 						CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -477,8 +477,8 @@ void Marshal_DSI_Impl::_Marshal_test_union_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req,
-					      CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req, 
+					      CORBA_Object_ptr obj, 
 					      CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -510,8 +510,8 @@ void Marshal_DSI_Impl::_Marshal_test_any_skel(CORBA_ServerRequest &req,
   //  req.result(any, env);
 }
 
-void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req,
-						   CORBA_Object_ptr obj,
+void Marshal_DSI_Impl::_Marshal_test_sequence_skel(CORBA_ServerRequest &req, 
+						   CORBA_Object_ptr obj, 
 						   CORBA_Environment &env)
 {
   CORBA_NVList_ptr        nvlist;
@@ -635,7 +635,7 @@ Marshal_DSI_Impl::test_any (const CORBA_Any &a1,
   a2 = new CORBA_Any (a1.type (), (void *)a1.value ()); // will do a deep copy
 }
 
-void
+void 
 Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 				 Marshal::AnySeq *& as2,
 				 CORBA_Environment &env)
@@ -644,10 +644,11 @@ Marshal_DSI_Impl::test_sequence (const Marshal::AnySeq& as1,
 }
 
 #if 0
-void
+void 
 Marshal_DSI_Impl::test_recursive (const Marshal::Marshal_Recursive &mr1,
 				  Marshal::Marshal_Recursive *&mr2,
 				  CORBA_Environment &env)
 {
 }
 #endif
+
diff --git a/TAO/COPYING b/TAO/COPYING
index a8f89534e82..022fb1a56f1 100644
--- a/TAO/COPYING
+++ b/TAO/COPYING
@@ -1,90 +1,40 @@
+COPYRIGHT INFORMATION FOR TAO
 
-     _________________________________________________________________
-   
-  Copyright and Licensing Information for ACE(TM) and TAO(TM)
-  
-   [1]ACE(TM) and [2]TAO(TM) are copyrighted by [3]Douglas C. Schmidt and
-   his [4]research group at [5]Washington University, Copyright (c)
-   1993-1999, all rights reserved. Since ACE and TAO are [6]open source,
-   [7]free software, you are free to use, modify, and distribute the ACE
-   and TAO source code and object code produced from the source, as long
-   as you include this copyright statement along with code built using
-   ACE and TAO.
-   
-   In particular, you can use ACE and TAO in proprietary software and are
-   under no obligation to redistribute any of your source code that is
-   built using ACE and TAO. Note, however, that you may not do anything
-   to the ACE and TAO code, such as copyrighting it yourself or claiming
-   authorship of the ACE and TAO code, that will prevent ACE and TAO from
-   being distributed freely using an open source development model.
-   
-   ACE and TAO are provided as is with no warranties of any kind,
-   including the warranties of design, merchantibility and fitness for a
-   particular purpose, noninfringement, or arising from a course of
-   dealing, usage or trade practice. Moreover, ACE and TAO are provided
-   with no support and without any obligation on the part of Washington
-   University, its employees, or students to assist in its use,
-   correction, modification, or enhancement. However, commercial support
-   for ACE and TAO are available from [8]Riverace and [9]OCI,
-   respectively. Moreover, both ACE and TAO are Y2K-compliant, as long as
-   the underlying OS platform is Y2K-compliant.
-   
-   Washington University, its employees, and students shall have no
-   liability with respect to the infringement of copyrights, trade
-   secrets or any patents by ACE and TAO or any part thereof. Moreover,
-   in no event will Washington University, its employees, or students be
-   liable for any lost revenue or profits or other special, indirect and
-   consequential damages.
-   
-   The [10]ACE and [11]TAO web sites are maintained by the [12]Center for
-   Distributed Object Computing of Washington University for the
-   development of open source software as part of the [13]open source
-   software community. By submitting comments, suggestions, code, code
-   snippets, techniques (including that of usage), and algorithms,
-   submitters acknowledge that they have the right to do so, that any
-   such submissions are given freely and unreservedly, and that they
-   waive any claims to copyright or ownership. In addition, submitters
-   acknowledge that any such submission might become part of the
-   copyright maintained on the overall body of code, which comprises the
-   [14]ACE and [15]TAO software. By making a submission, submitter agree
-   to these terms. Furthermore, submitters acknowledge that the
-   incorporation or modification of such submissions is entirely at the
-   discretion of the moderators of the open source ACE and TAO projects
-   or their designees.
-   
-   The names ACE
-   (TM), TAO(TM), and Washington University may not be used to endorse or
-   promote products or services derived from this source without express
-   written permission from Washington University. Further, products or
-   services derived from this source may not be called ACE(TM) or
-   TAO(TM), nor may the name Washington University appear in their names,
-   without express written permission from Washington University.
-   
-   If you have any suggestions, additions, comments, or questions, please
-   let [16]me know.
-   
-   [17]Douglas C. Schmidt
-     _________________________________________________________________
-   
-   Back to the [18]ACE home page.
+TAO is copyrighted by Douglas C. Schmidt and his research group at
+Washington University, Copyright (c) 1996-1999, all rights reserved.
+In addition, some portions of TAO (particularly the IIOP protocol
+engine) are copyrighted by SunSoft (see the ./IIOP/lib/COPYING.sun
+file for more details).  Likewise, TAO relies heavily on ACE, which is
+also copyrighted by Douglas C. Schmidt and his research group at
+Washington University (see the ../COPYING file for more details).
 
-References
+You are free to do anything you like with the Wash. U. portions of
+TAO's source code (and object code produced from the source).  For
+instance, you can include it in commercial software, as long as you
+include this copyright statement along with code built using TAO.
+
+You are under no obligation to freely redistribute any of your source
+code that is built using TAO.  Please note, however, that you may not
+do anything to the ACE code that will prevent it from being
+distributed freely (such as copyrighting it or claiming authorship).
+
+TAO is provided as is with no warranties of any kind including the
+warranties of design, merchantibility and fitness for a particular
+purpose, noninfringement, or arising from a course of dealing, usage
+or trade practice.
+
+TAO is provided with no support and without any obligation on the part
+of Washington University, its employees, or students to assist in its
+use, correction, modification or enhancement.
+
+Washington University, its employees, and students shall have no
+liability with respect to the infringement of copyrights, trade
+secrets or any patents by TAO or any part thereof.
+
+In no event will Washington University, its employees, or students be
+liable for any lost revenue or profits or other special, indirect and
+consequential damages.
+
+        Douglas C. Schmidt 
+        schmidt@cs.wustl.edu 
 
-   1. http://www.cs.wustl.edu/~schmidt/ACE.html
-   2. http://www.cs.wustl.edu/~schmidt/TAO.html
-   3. http://www.cs.wustl.edu/~schmidt/
-   4. http://www.cs.wustl.edu/~schmidt/ACE-members.html
-   5. http://www.wustl.edu/
-   6. http://www.opensource.org/
-   7. http://www.gnu.org/
-   8. http://www.riverace.com/
-   9. file://localhost/home/cs/faculty/schmidt/.www-docs/www.ociweb.com
-  10. http://www.cs.wustl.edu/~schmidt/ACE.html
-  11. http://www.cs.wustl.edu/~schmidt/TAO.html
-  12. http://www.cs.wustl.edu/~schmidt/doc-center.html
-  13. http://www.opensource.org/
-  14. http://www.cs.wustl.edu/~schmidt/ACE-obtain.html
-  15. http://www.cs.wustl.edu/~schmidt/TAO-obtain.html
-  16. mailto:schmidt@cs.wustl.edu
-  17. http://www.cs.wustl.edu/~schmidt/
-  18. file://localhost/home/cs/faculty/schmidt/.www-docs/ACE.html
diff --git a/TAO/COPYING.sun b/TAO/COPYING.sun
index b2a26fdafa4..7cd6795a942 100644
--- a/TAO/COPYING.sun
+++ b/TAO/COPYING.sun
@@ -20,7 +20,7 @@ include this license and copyright notice on all media and
 documentation and the software program in which this product is
 incorporated in whole or part.
 
-You may copy, modify, distribute, or sublicense the LICENSED PRODUCT
+You may copy, modify, distribute, or sublicense the LICENCED PRODUCT
 without charge as part of a product or software program developed by
 you, so long as you preserve the functionality of interoperating with
 the Object Management Group's "Internet Inter-ORB Protocol" version
diff --git a/TAO/ChangeLog-97 b/TAO/ChangeLog-97
index ca7d6f510cf..4c6b6143a1d 100644
--- a/TAO/ChangeLog-97
+++ b/TAO/ChangeLog-97
@@ -6669,6 +6669,4 @@ Wed Mar 19 10:25:21 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
 Thu Mar 13 14:06:28 1997  Chris Cleeland  <cleeland@cs.wustl.edu>
 
-        * ChangeLog: Added the ChangeLog.  We'd like to thank David
- 	  Brownell <david-b@pacbell.net>, the original author of SunSoft
- 	  IIOP, for helping to launch TAO off in the right direction!
+        * ChangeLog: Added the ChangeLog.
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index e7ec4551847..78c6bac15b0 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,9489 +1,22 @@
-Sun May 23 12:14:59 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-	* examples/Simple/time/Time.idl (Time): 
-
-	* examples/Simple/time/Time_Client_i.cpp (run): 
-	* examples/Simple/time/Time_i.cpp
-	* examples/Simple/time/Time_i.h
-	Factored out common code to the template server and client. The
-	template code will be checked in next.
-
-Sun May 23 10:06:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* orbsvcs/tests/Event/lib/README:
-	* orbsvcs/tests/Event/Basic/README:
-	* orbsvcs/tests/Event/Basic/run_test.pl:
-	* orbsvcs/tests/Event/Performance/README:
-	* orbsvcs/tests/Event/Performance/run_test.pl:
-	  Added some README files explaining the purpose of each test and
-	  how to run it. Also added some simple run_test scripts to
-	  execute the tests.
-
-Sat May 22 22:16:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-	  The busy_hwm should be set in the attributes now.
-
-Sat May 22 18:43:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs.dsw:
-	* orbsvcs/CosEvent_Service/CosEvent_Service.dsp:
-	* orbsvcs/CosEvent_Service/CosEvent_Service.dsw:
-	* orbsvcs/examples/CosEC/Factory/Makefile:
-	* orbsvcs/examples/CosEC/Factory/Factory.dsw:
-	* orbsvcs/examples/CosEC/Factory/FactoryClient.dsp:
-	* orbsvcs/examples/CosEC/Factory/FactoryServer.dsp:
-	* orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl:
-	* orbsvcs/orbsvcs/orbsvcs.dsp:
-	* orbsvcs/orbsvcs/orbsvcs_static.dsp:
-	* orbsvcs/tests/Event/Event.dsw:
-	* orbsvcs/tests/Event/Basic/Basic.dsw:
-	* orbsvcs/tests/Event/Basic/Observer.dsp:
-	* orbsvcs/tests/Event/Basic/Reconnect.dsp:
-	* orbsvcs/tests/Event/Basic/Schedule.dsp:
-	* orbsvcs/tests/Event/Basic/Shutdown.dsp:
-	* orbsvcs/tests/Event/Performance/Connect.dsp:
-	* orbsvcs/tests/Event/Performance/ECPerformance.dsw:
-	* orbsvcs/tests/Event/Performance/Throughput.dsp:
-	* orbsvcs/tests/Event/lib/ECTest.dsp:
-	  Added project files for several new tests and examples.
-
-Sat May 22 17:50:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i:
-	* orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-	* orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-	* orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-	* orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
-	  The EC attributes include parameters that control the level of
-	  concurrency in the proxy supplier sets.
-
-	* orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
-	* orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
-	* orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp:
-	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-	* orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
-	  Added reference counting: several threads could be pushing on
-	  one consumer proxy and another thread decides to disconnect from 
-	  it.  The corresponging supplier set must be deleted only once
-	  all the threads finish using it.
-	  In many cases the implementation is trivial because there is a
-	  clear owner (ex: the ConsumerAdmin), and in others the locking
-	  is shared with the consumer proxy (Per_Supplier).
-
-	* orbsvcs/orbsvcs/Event/EC_Gateway.h:
-	* orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-	  The gateway was not properly synchronized. The locking in the
-	  push() method is interesting: we don't hold the lock during the
-	  complete dispatch, instead we keep track of the number of
-	  threads pushing to the gateway.
-	  If we receive an update_consumer() call during a push we post
-	  the change until all the push() call finish. Only the last
-	  update_consumer() is kept because they overwrite each other.
-
-	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i:
-	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-	  We needed an unprotected accessor to the publications, to avoid
-	  dead-locks during connect_push_consumer call.
-	  Use the new reference counting on the EC_SupplierFiltering
-	  class.
-
-	* orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-	  We were holding locks during upcalls to the gateways and not
-	  setting the QoS parameters correctly.
-	  The update_consumer/update_supplier messages were backwards.
-
-	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-	  Fixed several race conditions related to connect/disconnect
-	  calls during pushes.
-
-	* orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp:
-	  Removed debug messages.
-
-	* orbsvcs/tests/Event/Basic/Observer.h:
-	* orbsvcs/tests/Event/Basic/Observer.cpp:
-	* orbsvcs/tests/Event/Basic/svc.conf:
-	  Fixed minor problems with the test itself.
-
-Sat May 22 17:10:11 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * TAO version 0.3.23 released.
-
-Sat May 22 14:07:57 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp} (TAO_Forward_FlowSpec_Entry): 
-	  Prefixed the enumerations with TAO_AV to avoid name
-	  clash. Thanks to David Levine for reporting this error.
-	
-Fri May 21 22:09:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-	* tao: Modified the following files to make minimum CORBA work
-	  again.
-
-          - Connect.cpp
-          - DomainC.cpp
-          - DomainS.cpp
-          - ORB_Core.cpp
-          - POA.cpp
-          - POAC.h
-          - POAManager.h
-          - POAManager.i
-          - POAS.cpp
-          - PolicyS.cpp
-          - Request.cpp
-          - WrongTransactionC.cpp
-          - WrongTransactionC.h
-          - corbafwd.h
-          - orbconf.h
-
-	* examples/Simple/Simple_util.cpp (test_for_ins): Removed
-	  unnecessary bank dependencies that Vishal had added to this
-	  generic code.
-
-	* tao/Connect.cpp (svc):
-	* tao/ORB_Core.cpp (inherit_from_parent_thread):
-
-	  Redid (with the help of Carlos) these methods in view of the new
-	  architecture.  ORB_Core is no longer TSS, only
-	  TAO_ORB_Core_TSS_Resources is.  This will fix a bug in all
-	  applications using the new architecture, TSS resources and
-	  thread per connection (like the ImplRepo).
-
-	* tao/Connect.cpp (handle_message): Changed the length of the INS
-	  lookup string from <TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE> to
-	  <request.object_key ().length ()>.  Since Vishal always tested
-	  with the "bank" string, he got lucky with this since
-	  <TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE> is 4 and strlen ("bank") is
-	  also 4.
-
-	  Thanks to Vyacheslav A. Batenin <slavikb@iname.com> for
-	  reporting this.
-
-Fri May 21 16:19:08 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-	* TAO/tests/Param_Test/param_test.idl:
-	* TAO/tests/Param_Test/complex_any.h:
-	* TAO/tests/Param_Test/complex_any.cpp:
-	* TAO/tests/Param_Test/options.h:
-	* TAO/tests/Param_Test/options.cpp:
-	* TAO/tests/Param_Test/driver.cpp:
-	* TAO/tests/Param_Test/param_test_i.h:
-	* TAO/tests/Param_Test/param_test_i.cpp:
-	* TAO/tests/Param_Test/tests.h:
-	* TAO/tests/Param_Test/client.dsp:
-	* TAO/tests/Param_Test/Makefile:
-	  Added new test. The data type is a complex Any, suggested
-	  by a real-world use case submitted by
-	  Frank Buschmann <Frank.Buschmann@mchp.siemens.de>. See
-	  comment in complex_any.cpp above reset_parameters for
-	  the Any structure.
-
-	* TAO/tests/Param_Test/any.cpp:
-	  Fixed some indentation and removed a memory leak related
-	  to gen_string.
-
-Fri May 21 12:27:16 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-	* orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-	* orbsvcs/orbsvcs/AV/sfp.cpp:
-	  Fixed g++ template errors and warnings. Thanks to David and Andy
-	  for reporting these errors.
-
-Fri May 21 09:20:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-	* tao/GIOP.cpp:
-	  Changed character literals in the GIOP magic number to numeric
-	  constants, otherwise it does not work in EBCDIC (or machines
-	  that are not ASCII for that matter).  Thanks to Jim Rogers
-	  <jrogers@viasoft.com> for pointing out this problem.
-
-	* orbsvcs/tests/Property/Makefile:
-	  Updated dependencies
-
-Fri May 21 09:31:32 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-	* orbsvcs/orbsvcs/Makefile: ran "make depend".
-
-Thu May 20 23:09:32 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-	* orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-	  Added error checks in the <create_factory> and
-	  <locate_naming_service> methods.
-
-Thu May 20 21:49:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * all run_test*pl scripts: moved comment line(s) from head
-          of file so that it is not interpreted as a csh file.  Thanks
-          to Gregory W Ross <gwross@notes.west.raytheon.com> for
-          reporting problems with the comment lines.
-
-Thu May 20 21:28:25 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-          Fixed a few MSVC warnings and prefixed the Direction enumeration
-          to DIR_ since IN,OUT and INOUT are MSVC keywords.
-
-Thu May 20 21:09:29 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DomainC.cpp:
-          Added #include "tao/POA_CORBA.h" so we can compile on
-          IBM OpenEdition. Thanks to Jim Rogers <jrogers@viasoft.com>
-          for pointing this out.
-
-Thu May 20 20:29:16 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB.i (orb_core): Added accessor.
-
-        * tao/POA.cpp (implementation): Removed extra semi-colon.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (invoke): Needed fixing
-          since the POA Current changed.
-
-Thu May 20 20:34:35 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-          Added sfp to Makefile and updated dependencies.
-
-Thu May 20 20:00:08 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/decode.cpp:
-          Added a typecode release call to TAO_Marshal_Any::decode()
-          to plug a memory leak occurring with inout Any parameters.
-
-Thu May 20 19:52:49 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-          Changed TAO_StreamEndPoint from a template to non-template and
-          added MSVC dominance warning disabling pragma and moved it from
-          AVStreams_i_T.{h,cpp} to these files. Also Added a flowspec
-          class to parse the flowSpec string into different components.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i_T.{h,cpp}:
-          Removed the AVStreams_i_T.{h,cpp} as they're no longer needed.
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.{h,cpp}:
-          Changed TAO_PropertySet from a template to non-template and
-          added MSVC dominance warning disabling pragma and moved it from
-          CosPropertyService_i_T.{h,cpp} to these files.
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.{h,cpp}:
-          Removed these files as they're no longer needed.
-
-	  The above fixes solves the template errors/warnings in orbsvcs seen on
-	  HP-UX,SunOS 5.6 and Digital Unix.
-	  Thanks to John R. Taylor
-	  <jrtaylor@george.lbl.gov>,gwtovrea@west.raytheon.com,
-	  Andy Gokhale<gokhale@cs.wustl.edu> and David
-	  Levine<levine@cs.wustl.edu> for reporting these errors.
-
-        * orbsvcs/orbsvcs/Makefile:
-          Updated dependencies.
-
-Thu May 20 18:46:44 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/Makefile:
-          updated dependencies.
-
-        * orbsvcs/orbsvcs/CosEC_Utility_Methods_T.{h,cpp}:
-          Removed this file. templates seem to be an overkill here.
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.h:
-          added TAO_ORBSVCS_Export.
-          added a #pragma for msvc warning 4250
-
-        * orbsvcs/orbsvcs/Makefile:
-          removed CosEC_Utility_Methods_T
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-          removed CosEC_Utility_Methods usage.
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.h
-          added a <locate_rtec> method.
-
-        * orbsvcs/CosEvent_Service/README
-          modified the README to reflect the change in parameter options.
-
-Thu May 20 17:39:50 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO/tao/TAO.dsp:
-        * TAO/TAO_IDL/tao_idl.dsp:
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Fixed Alpha configurations.  Thanks
-          to Christian Schuderer <Christian.Schuderer@erl9.siemens.de> for
-          reporting this.
-
-        * TAO/TAO_IDL/tao_idl_static.dsp: Removed definitions of
-          IDL_CFE_VERSION.
-
-Thu May 20 17:11:02 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode_Constants.cpp:
-          Added _tc_Pollable, _tc_DIIPollable, and
-          _tc_PollableSet to fini().
-
-Thu May 20 15:22:49 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/default_resource.cpp (get_reactor): The problem was that
-          when the reactor implementation was given to the reactor
-          interface class, it was not instructed to delete the
-          implementation.  Once this was fixed, the change below by Carlos
-          was not necessary.
-
-        * tao/POA_Current: Changed the POA Current from a TSS specific
-          object to a global object owned by the ORB.  Its state, however,
-          is still managed by a TSS object (this new object is called
-          TAO_POA_Current_Impl).  All the POA, Object_Adapter,
-          TSS_Resources, and Servant Base classes were changed to use this
-          new class.
-
-          Also, cleaned up the POA Current implementation class.  There
-          were many extra methods that not used in the new scheme.
-
-          Thanks to Jon Biggar <jon@biggar.org> for pointing out that the
-          original scheme was not compliant.
-
-        * examples/POA/DSI:
-
-          - Changed access to POA Current.  Previously, we use to ask the
-            ORB everytime.  Now we only ask once and keep it around as a
-            state variable.
-
-          - Added shutdown() method.
-
-          - Fixed exception handling.
-
-          - Added more debugging info to the server.
-
-Thu May 20 15:00:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Pluggable.h:
-        * tao/IIOP_Acceptor.h:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/default_resource.cpp:
-          Added a close() method to the TAO_Acceptor class to orderly
-          cleanup the resources on shutdown.
-
-Thu May 20 13:53:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Basic/Observer.h:
-        * orbsvcs/tests/Event/Basic/Observer.cpp:
-        * orbsvcs/tests/Event/Basic/observer.conf:
-        * orbsvcs/tests/Event/lib/Consumer.h:
-        * orbsvcs/tests/Event/lib/Consumer.cpp:
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/Driver.cpp:
-          New test for the observers and dynamic
-          connection/reconnections. It compiles, but needs more testing
-          and I cannot do that on Linux.
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-          Minor fixes to support configurations without an scheduling
-          service.
-
-Thu May 20 12:17:36 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.h:
-        * tao/Any.cpp:
-        * tao/GIOP_Server_Request.cpp:
-        * tao/NVList.cpp:
-          Changed the signature of
-
-            void _tao_replace (CORBA::TypeCode_ptr,
-                     const ACE_Message_Block *mb,
-                     CORBA::Boolean any_owns_data,
-                     CORBA::Environment &TAO_IN_ENV =
-                       CORBA::default_environment ());
-
-          to
-
-            void _tao_replace (CORBA::TypeCode_ptr,
-                     const ACE_Message_Block *mb,
-                     CORBA::Environment &TAO_IN_ENV =
-                       CORBA::default_environment ());
-
-          Also modified Any's copy contructor and assignment
-          operator to set any_own_data_ to 0. In all these cases,
-          the void* value_ is freed, but not set to anything.
-          Also changed the calls to _tao_replace() in the last
-          two files to reflect the new signature.
-
-
-Thu May 20 12:14:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          Added missing template instantiations.
-
-Thu May 20 11:06:25 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
-          Fixed a bug in parsing QOS parameters - thanks to Paul Calabrese
-          <calabrese_p@ociweb.com> for reporting this and providing a fix.
-        * orbsvcs/orbsvcs/CosEC_Utility_Methods_T.cpp:
-          removed an extra ";"
-
-Wed May 19 18:14:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp
-        * performance-tests/Cubit/TAO/IDL_Cubit/server.dsp: Fixed Release
-          configuations.
-
-Wed May 19 16:21:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/default_resource.cpp:
-          Fixed incorrect use of ACE_WIN32, ACE_HAS_FL and ACE_HAS_XT
-          macros, thanks to Jeff Parsons for reporting this.
-
-Wed May 19 15:54:53 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode_Constants.cpp:
-          Added some typecodes to fini() that I had forgotten to
-          add before.
-
-Wed May 19 15:25:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/corbafwd.i:
-        * tao/ORB.h:
-        * tao/ORB.i:
-        * tao/ORB.cpp:
-        * tao/CDR_Interpreter.cpp:
-        * tao/Managed_Types.cpp:
-        * tao/Managed_Types.h:
-        * tao/Managed_Types.i:
-        * tao/Marshal.i:
-        * tao/POA.cpp:
-        * tao/POA.h:
-        * tao/Request.cpp:
-        * tao/Typecode_Constants.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/Logger/Logging_Test_i.cpp:
-        * orbsvcs/tests/Logger/client_i.cpp:
-        * orbsvcs/tests/Property/client.cpp:
-        * orbsvcs/tests/Property/main.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * tests/Param_Test/options.cpp:
-          Added support for CORBA::WString_var and CORBA::WString_out,
-          also did a quick cleanup for the WString_Manager classes.
-          Thanks to Lothar Werzinger <lwerzinger@krones.de> for providing
-          this fixes.
-          Also removed all uses of string_copy which is a non-standard TAO
-          extension.
-
-        * docs/releasenotes/TODO.html:
-          More EC updates
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-          Added copy-on-read to avoid dead-locks during dispatch.
-
-Wed May 19 15:12:26 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-        * orbsvcs/CosEvent_Service/svc.conf:
-          Use the TAO_EC_Default_Factory for the Rtec Event Channel and
-          configure it using a svc.conf file.
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          Fixed more template instantiation problems.
-
-Wed May 19 13:07:06 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.cpp:
-          Fixed several syntax errors, at least it compiles now.
-
-Wed May 19 00:20:08 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent_Utilities.{h,cpp}:
-        * orbsvcs/orbsvcs/CosEC_Utility_Methods_T.{h,cpp}:
-          Added these files to provide utility base classes and
-          useful methods for implementing CosEC applications.
-
-        * orbsvcs/orbsvcs/Makefile:
-          added CosEvent_Utilities and CosEC_Utility_Methods_T
-          to the CosEvent section.
-
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i{h,cpp}:
-          Removed these files - All the functionality of this implementation
-          has been moved to the <CosEC_ServantBase> class defined in
-          orbsvcs/orbsvcs/CosEvent_Utilities.h
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
-          modified to use the <CosEC_ServantBase> class.
-
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
-          Added an extra debug message in the <create> method.
-
-        * orbsvcs/examples/CosEC/Factory/Makefile
-          removed FactoryCosEventChannel_i.
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.{h,cpp}:
-          All redone now to use the <CosEC_ServantBase> class.
-
-Tue May 18 22:19:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Resource_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/default_resource.h:
-        * tao/default_resource.i:
-        * tao/default_resource.cpp:
-        * docs/Options.html:
-          The default resource factory can select any of the "exotic" ACE
-          reactors (XtReactor, FlReactor, WFMO_Reactor, Msg_WFMO_Reactor)
-          as well as the regular Select reactor (with or without locking).
-          The old option (-ORBreactorlock) is obsolete and should be
-          removed after a couple of beta kits.
-
-        * tests/Makefile:
-        * tests/FL_Cube/Makefile:
-        * tests/FL_Cube/client.cpp:
-        * tests/FL_Cube/server.cpp:
-        * tests/FL_Cube/svc.conf:
-        * tests/FL_Cube/test.idl:
-        * tests/FL_Cube/test_i.cpp:
-        * tests/FL_Cube/test_i.h:
-        * tests/FL_Cube/test_i.i:
-          A small example that illustrates how TAO can work with the
-          FlReactor.  A simple server displays a cube using the FL toolkit
-          for the GUI elements and OpenGL for the graphics, its CORBA
-          interface lets the client control the viewpoint for the cube.
-          A simple client uses GUI elements to let the user control the
-          remote cube displayer.
-
-Tue May 18 11:05:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: removed DU cxx and Green Hills gcx warning
-          suppressions because they're no longer necessary (at least with
-          cxx 6.2-020).
-
-Mon May 17 19:41:04 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/POA_CORBA.h:
-        * tao/Typecode_Constants.cpp:
-        * tao/DynAnyC.{h,i,cpp}:
-        * tao/dynAnyS.cpp:
-        * tao/DynArray_i.{h,cpp}:
-        * tao/DynSequence_i.{h,cpp}:
-        * tao/DynStruct_i.{h,cpp}: Moved AnySeq, FieldName, NameValuePair,
-          and NameValuePairSeq to the CORBA namespace. They had previously
-          been in the global namespace.  Generated new typecodes for
-          these, to reflect the new scoping, and moved the typecodes to
-          Typecode_Constants.cpp. Thanks to Serge Du <du@lal.in2p3.fr> for
-          pointing out a namespace clash with AnySeq in his application
-          that led to all this.
-
-Mon May 17 18:17:42 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/UIOP_Transport.cpp,
-          tao/IIOP_Transport.cpp: Removed ACE_DEFAULT_WRITEV_MAX and
-          replaced it with IOV_MAX.
-
-Mon May 17 15:25:40 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Event_Latency/run_tests.sh: replaced
-          hard-coded user name with $login, which is derived using
-          the same logic as in orbsvcs/tests/start_services.
-          Thanks to Lothar Werzinger <lwerzinger@krones.de> for
-          reporting this.
-
-Mon May 17 15:17:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Event/Makefile:
-        * tests/Event/Performance/Connect.cpp:
-        * tests/Event/Performance/Connect.h:
-        * tests/Event/Performance/Makefile:
-        * tests/Event/Performance/Throughput.cpp:
-        * tests/Event/Performance/Throughput.h:
-        * tests/Event/Performance/ec.mt.conf:
-        * tests/Event/Performance/ec.st.conf:
-        * tests/Event/lib/Consumer.h:
-        * tests/Event/lib/Driver.cpp:
-        * tests/Event/lib/Driver.h:
-        * tests/Event/lib/Supplier.h:
-          Added new test to measure the throughput/latency of the EC and
-          the time it takes to connect/disconnect from it.
-
-        * orbsvcs/orbsvcs/Event_Service_Constants.h:
-        * orbsvcs/Event/Event_Channel.cpp:
-          In some applications we need to use recursive mutexes in the
-          Event Channel otherwise it dead-locks. Thanks to Mike Mazurek
-          <mmazurek@std.saic.com> for finding this bug and providing the
-          fixes.
-
-Mon May 17 14:40:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init): Removed extra call to
-          orb_params()->use_dotted_decimal_addresses.
-
-Mon May 17 11:31:48 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
-        Added "ACE_UNUSED_ARG (c_impl);" to avoid DEC compiler warning.
-
-Mon May 17 11:04:02 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/tests/Param_Test/ub_any_seq.cpp:
-          Changed the logic of check_validity() so that *all* the
-          elements of the sequence get checked instead of just the
-          first one (this should also get rid of a DU warning),
-          added a constant representing the number of possible
-          types tested in the sequence, and removed some
-          unnecessary switch cases in init_parameters() and
-          reset_parameters().
-
-Sun May 16 21:07:34 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * rules.tao.GNU: Merged the stub and skeleton rules for flick
-          compiler together.
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/fe/Makefile.am: lex.yy.cpp needs to be patched with
-          lex.yy.cpp.diff.
-
-        * TAO_IDL/fe/idl.ll: Applied ACE_NOTREACHED to unreachable
-          break's.
-
-        * TAO_IDL/fe/lex.yy.cpp: Patched with lex.yy.cpp.diff.
-
-        * TAO_IDL/fe/lex.yy.cpp.diff: Added this file to preserve patches
-          that can't be done using 'sed'.  It also prevents me from
-          throwing tantrums.
-
-Sun May 16 18:47:38 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.22 released.
-
-Sun May 16 18:25:26 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-          Fixed default concurrency high water mark.
-
-Sun May 16 10:59:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          Added missing template instantiations, at least IRIX/MIPSPro
-          needs them.
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-          Removed unused variable
-
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
-          The generated code produced a warning in the extraction operator
-          of unions from anys.
-
-Sun May 16 10:35:17 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-          Fixed a compile warning regarding checking nil pointers.
-
-Sat May 15 23:04:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp (TAO_YY_BREAK): removed the ACE_NOTREACHED
-          because it caused tao_idl to fail on IRIX and DU.
-          Ref: Sat May 15 11:38:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>.
-
-Sat May 15 22:15:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-          Added some more @@ comments for Pradeep, in response to his
-          questions.
-
-        * tao/Connect.cpp:
-          Remvoed yet another call to ORB_Core_instance()
-
-Sat May 15 22:16:06 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp:
-        Added <status> variable to store the return value in the <init>
-        method.  This is to avoid various compiler warnings regarding
-        "reaching the end of non-void function".
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp:
-        Fixed an incorrect comment.
-
-1999-05-15  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * performance-tests/POA/Demux/poa_names_100.dat:
-        * performance-tests/POA/Demux/demux_test_server.h
-        * performance-tests/POA/Demux/demux_test_server.cpp
-
-        Removed the restriction on the no. of servants on the server
-        side.
-
-Sat May 15 16:51:08 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * tao/ObjectIDList.i : Fixed some warnings on VxWorks. Thanks to
-          David Levine for pointing this out.
-
-Sat May 15 16:26:49 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
-          Fixed placement new expression, thanks to David Levine for
-          pointing this out.
-
-Sat May 15 14:45:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/Repository.h:
-          added #include of ace/SString.h.
-
-        * orbsvcs/ImplRepo_Service/Repository.h,ImplRepo_i.h:
-          change multiple #include protection to #ifndef.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp (activate_object):
-          commented out unused local "new_addr".
-
-Sat May 15 14:35:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ObjectIDList.*: fixed RCS Id string.
-
-Sat May 15 14:11:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument_marshal.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/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_post_docall_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp:
-        * TAO_IDL/be_include/be_visitor_argument.h:
-        * TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h:
-          Fixed warnings in generated code if the arguments of an
-          operation where arrays.  The changes have been tested for both
-          fixed sized and variable sized arrays in Param_Test.
-          This should also fix the compilation problem on HP-UX and other
-          platforms.
-
-Sat May 15 11:38:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp (TAO_YY_BREAK): Reapplied my old change
-          that handles not-reached break statement.  How did it get lost?
-
-Sat May 15 10:22:52 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_array.cpp:
-          TAO_IDL/be_include/be_array.h:
-          TAO_IDL/be/be_enum.cpp:
-          TAO_IDL/be_include/be_enum.h:
-          TAO_IDL/be/be_enum_val.cpp:
-          TAO_IDL/be_include/be_enum_val.h:
-          TAO_IDL/be/be_exception.cpp:
-          TAO_IDL/be_include/be_exception.h:
-          TAO_IDL/be/be_field.cpp:
-          TAO_IDL/be_include/be_field.h:
-          TAO_IDL/be/be_interface.cpp:
-          TAO_IDL/be_include/be_interface.h:
-          TAO_IDL/be/be_interface_fwd.cpp:
-          TAO_IDL/be_include/be_interface_fwd.h:
-          TAO_IDL/be/be_predefined_type.cpp:
-          TAO_IDL/be_include/be_predefined_type.h:
-          TAO_IDL/be/be_scope.cpp:
-          TAO_IDL/be_include/be_scope.h:
-          TAO_IDL/be/be_sequence.cpp:
-          TAO_IDL/be_include/be_sequence.h:
-          TAO_IDL/be/be_string.cpp:
-          TAO_IDL/be_include/be_string.h:
-          TAO_IDL/be/be_structure.cpp:
-          TAO_IDL/be_include/be_structure.h:
-          TAO_IDL/be/be_typedef.cpp:
-          TAO_IDL/be_include/be_typedef.h:
-          TAO_IDL/be/be_union.cpp:
-          TAO_IDL/be_include/be_union.h:
-          TAO_IDL/be/be_union_branch.cpp:
-          TAO_IDL/be_include/be_union_branch.h:
-
-          Removed the gen_encapsulation, gen_typecode, tc_size, and
-          tc_encap_len methods. All this has been moved to the typecode
-          visitor (be_visitor_typecode_defn).
-
-        * TAO_IDL/be/be_decl.cpp:
-          TAO_IDL/be_include/be_decl.h:
-
-          Removed the data members encap_len_, and the methods
-          gen_encapsulation, gen_typecode, tc_encap_len, tc_size,
-          tc_name2long, repoID_encap_len, and name_encap_len. All this has
-          been moved to the be_visitor_typecode_defn visitor.
-
-        * TAO_IDL/be/be_helper.cpp:
-          TAO_IDL/be_include/be_helper.h:
-
-          Added more operator<< for various ACE_CDR types.
-
-        * TAO_IDL/be/be_sequence.cpp:
-          TAO_IDL/be_include/be_sequence.h:
-          TAO_IDL/be/be_structure.cpp:
-          TAO_IDL/be_include/be_structure.h:
-          TAO_IDL/be/be_type.cpp:
-          TAO_IDL/be_include/be_type.h:
-          TAO_IDL/be/be_union.cpp:
-          TAO_IDL/be_include/be_union.h:
-
-          Added a method (in_recursion) that returns a boolean result that
-          indicates whether the sequence's element type is involved in a
-          direct or indirect recursion. An example of such a scenario is:
-
-          struct foo
-          {
-             // other fields
-             sequence <foo> bar;
-          };
-
-          The be_type's in_recursion method always returns 0 because all
-          other subclasses of be_type except be_sequence, be_structure,
-          and be_union will never be involved in the limited recursion
-          allowed by the CORBA spec.
-
-        * TAO_IDL/be/be_visitor_typecode.cpp:
-
-          Added explicit template instantiations for templates used in the
-          typecode_defn.cpp file. See below.
-
-        * TAO_IDL/be/be_visitor_argument_post_docall_cs.cpp:
-
-          In the visit interface method, we were not handling the out
-          type. Now we correctly narrow the type and release the base type.
-
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-          TAO_IDL/be/be_visitor_attribute/attribute.cpp:
-          TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-
-          Added default cases to switch statements to eliminate warnings
-          produced by EGCS about enums not handled.
-
-        * TAO_IDL/be_include/be_codegen.h:
-
-          Added new substate enumerations for use in typecode generation.
-
-        * TAO_IDL/be/be_valuetype.cpp:
-          TAO_IDL/be_include/be_valuetype.h:
-
-          Commented out the typecode related methods. These need to be
-          added later to the typecode visitor. This is still TO-DO.
-
-        * TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
-          TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-          TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-          TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
-          TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp:
-          TAO_IDL/be/be_visitor_union/union_cs.cpp:
-
-          Added a step where we set the context substate to typecode
-          generation. This way we can then generate the top-level typecode
-          encapsulation for the type we are dealing with. Nested typecodes
-          are then generated by the visitor itself by setting the
-          appropriate substate.
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-
-          Rearranged the invocation of the POST_INVOKE_CS
-          visitor. Otherwise some code was getting duplicated.
-          This was also necessary because for interpreted marshaling, we
-          had to do some cleaning up of local variables. However, this was
-          not required for the compiled marshaling stubs.
-
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-          TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
-
-          Commented out the code that generates typecodes for anonymous
-          sequences. Once we are sure that nothing breaks, we will remove
-          this code.
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-          TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
-
-          All the typecode generation is now handled by this visitor
-          rather than individual files such as be_array.cpp, and
-          others. Added all the methods for typecode generation such as
-          gen_typecode, gen_encapsulation, tc_size, tc_encap_len,
-          repoID_encap_len, name_ID_len, and name2long. Also added data
-          members to track the computed sizes. We were required to add all
-          the visit_* methods to deal with all the types.
-
-          The most prominent addition to this visitor is the capability to
-          generate typecodes for recursive types and the ability to
-          generate optimized typecodes. Optimized typecodes use sharing of
-          typecodes for repeated types. This is achieved via
-          indirections. We do not optimize for typecodes of primitive
-          types.
-
-        * TAO_IDL/be/be_visitor_union_branch/public_access.cpp
-        (visit_interface):
-
-          The access method for object references was incorrect. We have
-          now come up we a new way of returning the value from the acces
-          method. In particular, instead of casting the value to
-          CORBA::Object_ptr and then to void *, we simply return a pointer
-          to TAO_Object_Field_T<TYPE>. In the decode and encode methods of
-          the marshaling engine (see ChangeLog entry below), we invoke the
-          appropriate upcast method to give us the right CORBA::Object_ptr
-          value. This fix has now led to successful working of the
-          Param_Test test for obj references that use interpretive
-          marshaling.
-
-        * TAO_IDL/driver/drv_args.cpp:
-
-          Enabled optimized typecode handling. Also, we were checking for
-          -Go option instead of -Gt option. This is now fixed.
-
-        * tao/CDR_Interpreter.cpp:
-
-          Handled indirected streams properly so that it will allow us to
-          cross encapsulation boundaries. Previously, it wouldn't allow us
-          to do so.
-
-        * tao/Typecode.h:
-          tao/Typecode.cpp:
-
-          Added two data members called tc_base_ and root_tc_base_. The
-          tc_base_ points to our tk_kind field in the CDR
-          representation. The root_tc_base_ is for children typecodes
-          (i.e., nested typecodes who have parents) and it points to the
-          tk_kind field of the topmost level typecode.
-
-          Also note that in the CTOR for complex typecodes, we now
-          allocate 8 bytes in addition to the length parameter. The first
-          two words occupy the top-level typecode's tk_kind value and the
-          encapsulation length. The buffer_ member still points to the
-          encapsulation so that no other change in the entire file is
-          required. The reason why we had to have these extra 8 bytes at
-          the start is to handle the recursive typecodes. For example
-
-          struct foo
-          {
-              // fields
-              sequence <foo> bar;
-          };
-
-          The encaspulation for the above will generate an indirection
-          whose offset will point to the tk_kind field of "foo". However,
-          prior to the change described here, we only maintained the CDR
-          representation of the encapsulation. So the offset would have
-          pointed to 8 bytes before the encapsulation which really diod
-          not exist. We would have required unnecessary code to handle
-          such a case. So the best way was to maintain the entire typecode
-          representation.
-
-        * tao/decode.cpp:
-          tao/encode.cpp:
-
-          Indirected streams are now constructed properly such that we can
-          cross encapsulation boundaries. We were not required to make any
-          changes to the CTORs of ACE_InputCDR.
-
-          We also properly handle the object reference fields of
-          unions. The access method gives us a TAO_Object_Field_T<>
-          pointer and then we invoke the _upcast method to give us the
-          CORBA::Object_ptr.
-
-        * tests/Param_Test/param_test.idl:
-          tests/Param_Test/big_union.cpp:
-
-          cosmetic changes.
-
-        TO-DO
-
-          for anonymous sequences whose element type gives rise to a
-          recursion, we must generate the <<, >> compiled marshaling
-          operators in the *.cpp file else we get a circular dependency.
-
-Fri May 14 23:55:47 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Request.{h,i,cpp}:
-          Added Context_ptr member ctx_ to class CORBA_Request, along
-          with accessor and mutator methods. Although Contexts are not
-          implmented by TAO, these methods do not throw
-          CORBA::NO_IMPLEMENT. Since I didn't see any functions in
-          CORBA_Request using environment variables, I kept to that
-          scheme and therefore could not use ACE_THROW or related
-          macros. The accessor simply returns the member (which is
-          set to 0 in all constructors) and the mutator does nothing
-          but throw away its arg. For the record, these were actually
-          checked in a few days ago, but I neglected to make a
-          ChangeLog entry at the time.
-
-Fri May 14 20:27:59 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.{h,cpp}:
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.{h,cpp}:
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-        * orbsvcs/examples/CosEC/Factory/main.cpp:
-          code review changes and compile error fixes.
-
-Fri May 14 17:00:43 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/IIOP_Transport.cpp (send),
-          tao/UIOP_Transport.cpp (send): Removed the local const for
-          TAO_WRITEV_MAX and replaced it with the new
-          ACE_DEFAULT_WRITEV_MAX.
-
-Fri May 14 17:14:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
-          Removed bogus ACE_INLINE, left over when moved from .i file.
-
-Fri May 14 16:15:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs\orbsvcs\Sched\Reconfig_Scheduler.{cpp, h}: more on a
-          very rough draft of the initial implementation.
-
-Fri May 14 15:25:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Added new files in the EC
-          implementation
-
-        * orbsvcs/tests/Event/Event.dsw:
-        * orbsvcs/tests/Event/Basic/Basic.dsw:
-        * orbsvcs/tests/Event/Basic/Schedule.dsp: Added new project for
-          the Schedule test.
-
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp: Fixed type
-          conversions problem.
-
-Fri May 14 15:06:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/OBV.html: Added releases notes contributed by
-          Torsten Kuepper.
-
-Fri May 14 12:34:27 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/DomainC.i:
-        * tao/DomainC.cpp: Moved CORBA_DomainManager::_nil () from
-          DomainC.i to DomainC.cpp file.
-
-        * tao/Request.i:
-        * tao/Request.cpp: Moved two methods CORBA::release () and
-          CORBA_Request::_nil () from the Request.i to Request.cpp. This
-          would help us to avoid annoying warnings with Sun_g++ which was
-          complaining about these two methods being inline as they were
-          used before they were declared so. This seems to be a easier way
-          to get around this.
-
-Fri May 14 12:20:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ValueBase.h:
-        * tao/ValueBase.i:
-        * tao/ValueBase.cpp: Added new patches from Torsten Kuepper, this
-          should eliminate the warnings about enums.
-
-        * */Makefile: Updated all the dependencies
-
-Fri May 14 09:30:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Integrated scheduling back into the EC, this is still
-          experimental.
-
-        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i:
-        * orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i:
-        * orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp: The scheduling
-          strategy parametrize the aspects of the EC that relate to the
-          Scheduler.  When using the Null_Scheduling the EC does not
-          update dependencies in the Scheduler, making that a suitable
-          choice for run-time execution (once the dependencies have been
-          computed in configuration runs) and for systems that do not
-          require scheduling.  The Priority_Scheduling strategy does
-          update the dependencies in the scheduler.  Notice that many
-          real-time properties of the EC do *not* depend on this, for
-          example, locks are bounded to minimize priority inversion in any
-          case.  Thus application that require real-time behavior but no
-          scheduling can use the EC too.
-
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.i: Add fields to carry RT_Info
-          and Preemption priority information.
-
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: Use the
-          scheduling strategy to update the dependencies.
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp: Added new methods to
-          the factory to obtain the scheduling strategy.
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp: The event channel
-          receives an scheduler and an scheduling strategy from the
-          attributes and the factory respectively.  The scheduler may be a
-          nil object reference in it is not used.
-
-        * orbsvcs/orbsvcs/Event/EC_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp: In some cases the
-          Filter_Builder may need to make CORBA calls and thus requires an
-          CORBA::Environment.  Added new operation to add dependencies
-          between leaves of the filter tree and RT_Infos.  This operation
-          is a noop if no scheduling is enabled, and in fact it is not
-          even invoked.
-
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i:
-        * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp: Added new
-          type of filter, it decorates a regular filter to inform the
-          scheduling service of the dependencies between the filter
-          elements and finally between suppliers and consumers.
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp: Allocates the
-          message blocks from a per-queue thread, also use a per-thread
-          data block to minimize memory allocations.
-
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp: Use the
-          TAO_EC_QOS_Info and the scheduling service to determine on which
-          queue we should dispatch the event.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Update the filtering
-          aspects of this class.
-
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Basic/Schedule.h:
-        * orbsvcs/tests/Event/Basic/Schedule.cpp:
-        * orbsvcs/tests/Event/Basic/sched.conf:
-        * orbsvcs/tests/Event/Basic/Reconnect.cpp:
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/Driver.cpp: Added new test that creates
-          an scheduler and uses the scheduling strategies.
-
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp: Loop over
-          consumers and then over events, not vice-versa. That improves
-          throughput by reducing the locking overhead.
-
-        * orbsvcs/orbsvcs/Makefile: Added the new files, updated
-          dependencies
-
-        * orbsvcs/Event_Service/Makefile: Added depedencies
-
-Fri May 14 07:18:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Concurrency/Makefile,lex.CC_command.cpp,
-          lex.CC_command.cpp.diff: hacked scanner a bit to remove
-          unreachable code warning with ace_yy_wrap() #defined to 1.
-
-Thu May 13 22:58:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (invoke): Removed extra return.
-
-Thu May 13 22:46:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/OBV/Typed_Events/Event_Types_impl.h: added "class" to a
-          bunch of friend declarations.
-
-        * examples/OBV/Typed_Events/Makefile: updated dependencies.
-
-Thu May 13 19:33:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/examples/CosEC/Factory/Makefile: don't built if either
-          CosEvent or Naming weren't built.
-
-Thu May 13 18:18:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/DomainC.cpp: Added instantiation for
-          TAO_Object_Manager<CORBA_DomainManager>
-
-Thu May 13 14:48:22 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/corbafwd.h (CORBA):
-        * tao/corbafwd.cpp: Fixed warnings on Greenhills compiler.
-
-Thu May 13 11:44:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.h:
-        * tao/ORB.cpp: Fixed const violation in
-          resolve_initial_references()
-
-Thu May 13 09:55:52 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Makefile:
-        * orbsvcs/examples/Makefile:
-        * orbsvcs/examples/CosEC/Makefile:
-        * orbsvcs/examples/CosEC/Factory/Makefile:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.h:
-        * orbsvcs/examples/CosEC/Factory/FactoryDriver.h: Added several @@
-          comments in the new CosEC/Factory example.
-
-Thu May 13 00:42:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB.h (CORBA_ORB): Rewrote the comments for <perform_work>.
-          Previously, it was somewhat unclear what this function was
-          doing. Thanks to Trey Grubbs <t-grubbs1@raytheon.com> for
-          pointing this out.
-
-Wed May 12 19:40:12 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Object.{h,cpp}: Changed the name of the second
-          create_request function to be identical to the name of the
-          first. The spec clearly indicates in some places that it is to
-          be called 'create_request2', but that's wrong.
-
-Wed May 12 19:22:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corba.h: Added some missing #includes which turned up in the
-          branding tests.
-
-Wed May 12 18:02:20 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.{h,i}: Added a non-copying version of <<= for Any into
-          Any, as required by the CORBA spec (see CORBA 2.3a, section
-          20.16.2, page 20-58).
-
-Wed May 12 16:26:14 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/ORB.cpp (resolve_initial_references): Changed the const
-          CORBA::String to const char * as is expected by the test suite
-          and also by the CORBA v2.2 spec vide page 20-115, section
-          20-39-20.
-
-Wed May 12 16:04:39 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp: Added Bala's new files (below) to the MSVC
-          projects.
-
-Wed May 12 15:46:57 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/ORB.h
-        * tao/ORB.i
-        * tao/ORB.i
-        * tao/Managed_Types.h
-        * tao/Services.h
-        * tao/Services.i
-        * tao/Services.cpp
-        * tao/Pluggable.h
-        * tao/corbafwd.cpp (New file)
-        * tao/corbafwd.i (New file) Added a new method
-          get_service_information in to ORB.h. This added a few circular
-          dependencies which was resolved by Carlos by adding new files
-          viz. corbafwd.cpp & corbafwd.i. Updated the Services.* files
-          with some new headers and removed the "tao/corba.h" file
-          inclusion from them as this would add a high dependency on these
-          files. Managed_Types.h included ORB.h for just a few operations
-          which has now been moved to corbafwd.i
-
-Wed May 12 15:41:39 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/Context.i:
-        * tao/Environment.{h,i,cpp}: Added CORBA::is_nil() for Contexts,
-          and both CORBA::release() and CORBA::is_nil() for
-          Environment. In implementing the release() method, also added
-          refcount_, refcount_lock_, incr_refcount() and decr_refcount()
-          to Environment. All the above methods were declared in
-          corbafwd.h (CORBA::is_nil (Context_ptr) was commented out), but
-          not implemented.
-
-Wed May 12 14:47:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Command.h:
-        * orbsvcs/orbsvcs/Event/EC_Command.i:
-        * orbsvcs/orbsvcs/Event/EC_Command.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: Fixed several
-          memory leaks on "dirty" shutdowns of the EC (i.e. shutdowns when
-          there are some consumers or suppliers still connected).
-          Implemented new "delayed" shutdown operation on the
-          Supplier_Sets.  Handling shutdowns while the EC is still
-          processing events may prove more tricky, I'm certain that there
-          are some race conditions still lurking there.
-
-        * orbsvcs/tests/Event/Basic/Makefile: Fixed order of libraries.
-
-        * orbsvcs/tests/Event/lib/Driver.cpp: Reset all pointers to 0
-          after destruction.
-
-Wed May 12 13:58:59 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/ORB.{h,cpp}: Added the dummy function
-          list_initial_services().  For now it just throws
-          CORBA::NO_IMPLEMENT.
-
-Wed May 12 13:35:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/MProfile.h:
-        * tao/MProfile.cpp: Fixed warnings
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: I forgot to fix the
-          TAO_Stub constructors in this file.
-
-        * orbsvcs/ImplRepo_Service/Makefile: Updated dependencies.
-
-Wed May 12 12:14:41 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * COPYING: Additional updates/clarifications suggested by Richard
-          Stallman.
-
-Wed May 12 10:38:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/MProfile.h:
-        * tao/MProfile.i:
-        * tao/MProfile.cpp:
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/Stub.cpp:
-        * tao/Pluggable.h:
-        * tao/Pluggable.i:
-        * tao/Pluggable.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.i:
-        * tao/IIOP_Profile.cpp:
-        * tao/UIOP_Profile.h:
-        * tao/UIOP_Profile.i:
-        * tao/UIOP_Profile.cpp:
-        * tao/Invocation.cpp:
-        * tao/ORB.cpp:
-        * tao/Object.cpp: Fixed memory leaks in the managment of
-          MProfiles.  Use references to document and clarify the memory
-          managment rules.  Implemented the forward_to() methods on
-          TAO_Profile instead of TAO_IIOP_Profile, they are required for
-          all protocols.
-
-Wed May 12 10:18:34 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/TODO.html:
-        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Some servants where
-          not beign properly deactivated, thanks to J. Russell Noseworthy
-          <rnosewor@objectsciences.com> for pointing this out.
-
-Wed May 12 10:16:15 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/corbafwd.h: Fixed the warnings on NT related to foward
-          declaration of ServiceDetail and ServiceInformation.
-
-        * tao/ObjectIDList.h: Fixed an error in the declaration of the CDR
-          operators.
-
-        * tao/Service.h: Fixed an error where
-          TAO_Unbounded_Sequence<ServiceDetail> should have been
-          TAO_Unbounded_Sequence<CORBA_ServiceDetail>
-
-Wed May 12 08:56:40 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/corbafwd.h
-          tao/ORB.h
-          tao/ObjectIDList.{h, i, cpp}: Fixed a number of compile errors
-          with the newly added ObjectIdList class. We now use the same
-          trick that we use for classes defined in the CORBA
-          namespace. Thus, we define the ObjectIdList class as
-          CORBA_ORB_ObjectIdList and then typedef it inside class
-          CORBA_ORB. We needed some forward declarations in corbafwd.h.
-
-          Removed some possibly unnecessary explicit template
-          instantiation from ObjectIDList.cpp. We were trying to
-          instantiate a TAO_Object_Field_T<CORBA::ORB>.
-
-Wed May 12 02:38:52 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-          Code review changes and additions for the CosEC Factory.
-          Added the following files:
-
-        * orbsvcs/examples/CosEC/Factory/main.cpp
-
-        * orbsvcs/examples/CosEC/Factory/FactoryDriver.{h,cpp}
-          modified the following:
-
-        * orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-          completed the test code for the factory.
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.{h,cpp}:
-
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.{h,cpp}:
-          code review corrections.
-
-Tue May 11 22:39:38 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp: Added Bala's new files to these projects.
-
-Tue May 11 21:46:52 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Added a new type ObjectIDList to the ORB interface. This is
-        required by the list_initital_references (). Handcrafted
-        the IDL generated files into the following files :
-        * tao/ObjectIDList.cpp
-        * tao/ObjectIDList.h
-        * tao/ObjectIDList.i
-        Added the above files.
-
-        Included the declaration of ObjectIDList in the CORBA_ORB class.
-        * tao/ORB.h
-
-        Included ObjectIDList into the makefile.
-        * tao/Makefile
-
-Tue May 11 21:46:29 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DomainC.h: Removed the generated typecode declarations -
-          they're unnecessary and cause warnings on VxWorks.
-
-Tue May 11 20:40:52 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Environment.cpp: Added a check for NULL pointer before
-          dereferencing the exception (to increment the refcount) in the
-          copy constructor. This was causing all the DII param_tests to
-          fail.
-
-        * tao/Any.cpp: Removed the branch from value() that returns (void
-          *)cdr_.  After checking through all the code in the TAO
-          directory, there seems to be nothing that this endangers. Also
-          ran the DII param_tests before and after committing the change -
-          the results were the same. So now the functionality is cleanly
-          divided: Any::value() for the void* and Any::_tao_get_cdr() for
-          the cdr_.
-
-Tue May 11 18:06:40 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/corbafwd.h
-        * tao/corba.h
-        * tao/TypeCode_Constants.cpp
-        * tao/Services.i (New file)
-        * tao/Services.cpp (New file)
-        * tao/Services.h (New file): Addition of new data types that we
-          did not have and which is carefully checked for by the test
-          suite from Open Group. The data types added include ServiceType,
-          ServiceDetailType, ServiceOption, ServiceDetail,
-          ServiceInformation. The defintions come from CORBA 2.2 spec,
-          chapter4, pg-4.2. The above data types have been tested on SunCC
-          & Linux_EGCS with some test cases in TAO liek Param_Test. They
-          compiled clean and ran without any errors.
-
-Tue May 11 17:47:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/append.cpp: Fixed a case (wchar) of
-          TAO_Marshal_Union::append that Andy had marked as TODO and
-          eliminated another shaky call to Any::value().
-
-Tue May 11 17:19:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Event/Event.dsw:
-        * orbsvcs/tests/Event/Basic/Basic.dsw:
-        * orbsvcs/tests/Event/Basic/Reconnect.dsp:
-        * orbsvcs/tests/Event/Basic/Shutdown.dsp:
-        * orbsvcs/tests/Event/lib/Consumer.h:
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/ECTest.dsp:
-        * orbsvcs/tests/Event/lib/ECTest.dsw:
-        * orbsvcs/tests/Event/lib/Supplier.h:
-        * orbsvcs/tests/Event/lib/ectest_export.h: Added project files,
-          workspaces and export macros to compile this tests on NT.
-
-Tue May 11 16:46:20 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Object.{h,cpp}: Added the second form of
-          create_request(). It has two additional args - an exception list
-          and a context list, which are both unused in this
-          implementation.
-
-Tue May 11 16:03:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-          Added some flags to the enum containing the ones
-          for NVList. The new ones are:
-          DEPENDENT_LIST
-             If a sublist is added as a single item,
-             this indicates that it should be freed
-             when the parent list is freed.
-          CTX_RESTRICT_SCOPE
-             Used in Context::get_values to limit the scope of
-             the search to the supplied scope arg.
-          CTX_DELETE_DESCENDENTS
-             Deletes child Context objects along with the parent.
-          INV_NO_RESPONSE
-          INV_TERM_ON_ERR
-          RESP_NO_WAIT
-             Used in deferred synchronous requests.
-
-Tue May 11 14:34:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/{client,server}.cpp:
-          removed unnecessary #includes of "tests/test_config.h".
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_tests.pl: fixed check
-          for existing files to work on NT, by using full path.
-
-Tue May 11 14:17:54 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DomainS.cpp: Added some ACE_UNUSED_ARGs for generated code
-          that has been commented out, and a marshaling exception because
-          this method (ConstructionPolicy::make_domain_manager) is not yet
-          implemented.
-
-Tue May 11 13:51:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/TODO.html:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/tests/Event/Basic/Makefile:
-        * orbsvcs/tests/Event/Basic/Reconnect.cpp:
-        * orbsvcs/tests/Event/Basic/Shutdown.cpp:
-        * orbsvcs/tests/Event/Basic/Shutdown.h:
-        * orbsvcs/tests/Event/lib/Consumer.cpp:
-        * orbsvcs/tests/Event/lib/Driver.cpp:
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/Supplier.cpp: Completed the
-          implementation of the destroy() method in the new Event
-          Channel. It was not invoking the disconnect_push_XXX()
-          operations on its list of suppliers and consumers.
-
-Tue May 11 13:45:00 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/WrongTransactionC.{h,cpp}:
-        * tao/corbafwd.h:
-        * tao/Typecode_Constants.cpp:
-        * tao/TAO.dsp:
-        * tao/TAO_Staatic.dsp:
-        * tao/Makefile: Added WrongTransaction exception. It applies to
-          Requests so it is not part of minimum CORBA. Also, while the
-          spec does not say so explicitly, it seems to be thrown only on
-          the client side, so only that part of the generated code is
-          here. If this turns out not to be the case, server side code
-          will have to be added.
-
-Tue May 11 13:25:40 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/{server.dsp,client.dsp}:
-          fixed path for static release builds.  Actually, Nanbor fixed
-          it.
-
-Tue May 11 12:30:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/AST_Expression.cpp:
-        * TAO_IDL/include/AST_Expression.h: Backed out the change I made
-          yesterday. Not an important change by itself, but one day we'll
-          have to overhaul all the basic type stuff in the IDL compiler.
-
-Tue May 11 11:03:16 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test:
-          support shells that don't have $OPTIND.
-
-Tue May 11 09:48:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
-          Added missing TAO_ORBSVCS_Export macros, thanks to Frank Hodum
-          <fhodum@sito.saic.com> for pointing this out.
-
-Tue May 11 09:22:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/DomainC.cpp: added TAO_Object_Field_T<CORBA_DomainManager>
-          explicit template instantiation.
-
-Mon May 10 22:57:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/DomainC.cpp:
-          Added missing #include
-
-Mon May 10 22:40:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/TODO.html:
-        * docs/releasenotes/ec.html:
-          Updated to include the latest EC results.
-
-Mon May 10 22:39:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/AST_Expression.cpp:
-        * TAO_IDL/include/AST_Expression.h:
-          Added constructors for AST_Expressions of type
-          long long and unsigned long long - bracketed with
-          ifdefs concerning ACE_LACKS_LONGLONG_T.
-
-Mon May 10 21:54:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/Makefile:
-          Added the Event directory
-
-        * orbsvcs/tests/Event/Basic/Reconnect.h:
-        * orbsvcs/tests/Event/Basic/Reconnect.cpp:
-          Added new option to control the number of disconnections, fixed
-          some minor problems. Removed execution of the regular test since
-          it will take too long to run thousands of consumers and
-          suppliers.
-
-        * orbsvcs/tests/Event/lib/Driver.h:
-        * orbsvcs/tests/Event/lib/Driver.i:
-        * orbsvcs/tests/Event/lib/Driver.cpp:
-          Fixed and cleaned up memory managment for tasks.
-          Fixed computation of the Supplier QOS
-          Fixed argument parsing
-          Fixed throughput computation
-
-        * orbsvcs/tests/Event/lib/Supplier.cpp:
-          Better error handling if the QoS is invalid
-
-        * orbsvcs/tests/Event/lib/Consumer.cpp:
-          Fixed throughput computation
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-          Implemented reconnection of suppliers
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-          Fixed typo
-
-Mon May 10 19:44:16 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * Domain.pidl:
-        * DomainC.{h,i,cpp}:
-        * DomainS.{h,cpp}:
-        * DomainS_T.{h,i,cpp}:
-          New files incorporating the (as yet unimplemented)
-          classes DomainManager, ConstructionPolicy, and
-          DomainManagerList.
-
-        * corbafwd.h:
-        * POA_CORBA.h:
-        * Typecode_Constants.cpp:
-        * TAO.dsp:
-        * TAO_Static.dsp:
-        * Makefile:
-          All the necessary modifications corresponding to
-          the above new files. Also removed the (nonexistent)
-          file PolicyS.h from the two projects.
-
-Mon May 10 17:21:52 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-          New class TAO_EC_Event_Channel_Attributes used to initialize the
-          event channel. This will close the interface for the EC
-          constructor, yet will allow us to add more (optional or
-          mandatory) arguments.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          The event channel can be configured to support multiple
-          connect() calls to the same ProxyPushSupplier.
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-          Use the TAO_EC_Event_Channel_Attributes class to initiliaze
-          TAO_EC_Event_Channel
-
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp:
-          Minor cosmetic fixes.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-          Removed dead code.
-
-Mon May 10 16:46:41 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO-INSTALL.html (href): Added a link to Barry Hoggard's CORBA
-          page which contains TAO specific information.
-
-Mon May 10 15:02:21 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Exception.h:
-        * tao/Exception.cpp:
-        * tao/corbafwd.h: Added new exceptions in TAO_SYSTEM_EXCEPTIONS
-        viz.TRANSACTION_REQUIRED, TRANSACTION_ROLLEDBACK &
-        INVALID_TRANSACTION. These are part of the spec, v2.2, section
-        3.5.3, page 3-39. We had not implemented this and it was flagged
-        of by the branding test suite.
-
-Mon May 10 12:47:29 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_cpp_init): TAO_IDL will try
-          to figure out where MSVC is located if CPP_LOCATION is not
-          defined.  It does this by checking if MSVCDir environment
-          variable is defined.  Although this approach ties TAO_IDL closer
-          to MSVC, it is probably the most widely used compiler on Win32
-          platforms.  Therefore, I think it is not really a "bad taste."
-
-          Thanks to Jonathan Biggar <jon@floorboard.com> for suggesting
-          this.
-
-Mon May 10 11:43:04 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * COPYING: Made some updates suggested by Richard Stallman
-          <rms@gnu.org> of the Free Software Foundation
-          (http://www.fsf.org/).
-
-Mon May 10 08:24:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO/orbsvcs/orbsvcs/Makefile,examples/Callback_Quoter/Makefile,
-          tests/MT_Client/Makefile:
-          ran make depend to fix dependencies.  Thanks to Andy for reporting
-          that they were missing.
-
-Mon May 10 08:39:19 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/Request.cpp: Explicit template instantiations for the newly
-          added sequence of CORBA::Request were missing.
-
-Mon May 10 00:36:02 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Request.h (CORBA_Request>):
-        * tao/Request.cpp : Added new definition for the class
-          CORBA_ORB_RequestSeq. This was added to facilitate the testing
-          process. Thanks to Carlos for helping to generate the new class
-          by inheriting from TAO_Pseudo_Unbounded_Sequence ().
-
-Sun May  9 12:47:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-        * docs/releasenotes/OBV.html:
-          Added template for the OBV release notes.
-
-Sun May 09 11:26:57 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * TAO/examples/Callback_Quoter/Makefile
-          TAO/examples/Event_Comm/Makefile
-          TAO/examples/OBV/Typed_Events/Makefile
-          TAO/examples/POA/Adapter_Activator/Makefile
-          TAO/examples/POA/DSI/Makefile
-          TAO/examples/POA/Default_Servant/Makefile
-          TAO/examples/POA/Explicit_Activation/Makefile
-          TAO/examples/POA/Forwarding/Makefile
-          TAO/examples/POA/Generic_Servant/Makefile
-          TAO/examples/POA/Identity/Makefile
-          TAO/examples/POA/On_Demand_Activation/Makefile
-          TAO/examples/POA/Reference_Counted_Servant/Makefile
-          TAO/examples/POA/TIE/Makefile
-          TAO/examples/Quoter/Makefile
-          TAO/examples/Simple/bank/Makefile
-          TAO/examples/Simple/chat/Makefile
-          TAO/examples/Simple/echo/Makefile
-          TAO/examples/Simple/grid/Makefile
-          TAO/examples/Simple/time/Makefile
-          TAO/orbsvcs/Concurrency_Service/Makefile
-          TAO/orbsvcs/CosEvent_Service/Makefile
-          TAO/orbsvcs/Dump_Schedule/Makefile
-          TAO/orbsvcs/Event_Service/Makefile
-          TAO/orbsvcs/ImplRepo_Service/Makefile
-          TAO/orbsvcs/LifeCycle_Service/Makefile
-          TAO/orbsvcs/Logging_Service/Makefile
-          TAO/orbsvcs/Naming_Service/Makefile
-          TAO/orbsvcs/Scheduling_Service/Makefile
-          TAO/orbsvcs/Time_Service/Makefile
-          TAO/orbsvcs/Trading_Service/Makefile
-          TAO/orbsvcs/orbsvcs/Makefile
-          TAO/orbsvcs/tests/Concurrency/Makefile
-          TAO/orbsvcs/tests/CosEC_Basic/Makefile
-          TAO/orbsvcs/tests/CosEC_Multiple/Makefile
-          TAO/orbsvcs/tests/EC_Basic/Makefile
-          TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
-          TAO/orbsvcs/tests/EC_Mcast/Makefile
-          TAO/orbsvcs/tests/EC_Multiple/Makefile
-          TAO/orbsvcs/tests/EC_Throughput/Makefile
-          TAO/orbsvcs/tests/Event_Latency/Makefile
-          TAO/orbsvcs/tests/ImplRepo/Makefile
-          TAO/orbsvcs/tests/Logger/Makefile
-          TAO/orbsvcs/tests/Property/Makefile
-          TAO/orbsvcs/tests/Sched_Conf/Makefile
-          TAO/orbsvcs/tests/Simple_Naming/Makefile
-          TAO/orbsvcs/tests/Time/Makefile
-          TAO/orbsvcs/tests/Trading/Makefile
-          TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
-          TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
-          TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
-          TAO/performance-tests/Thruput/TAO/Makefile
-          TAO/tao/Makefile
-          TAO/tests/MT_Client/Makefile
-          TAO/tests/Multiple_Inheritance/Makefile
-          TAO/tests/NestedUpcall/MT_Client_Test/Makefile
-          TAO/tests/NestedUpcall/Reactor/Makefile
-          TAO/tests/NestedUpcall/Triangle_Test/Makefile
-          TAO/tests/OctetSeq/Makefile
-          TAO/tests/Param_Test/Makefile: ran make depend after adding new
-          RB_Tree interface.
-
-Sat May 08 17:17:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/be/be_valuetype.cpp,be_valuetype_fwd.cpp: removed
-          extraneous ; after function definitions.
-
-Sat May  8 16:10:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
-          Added non-const accesor for array fields in valuetypes. Thanks
-          to David Levine for pointing this out.
-
-Sat May  8 15:02:37 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/GIOP.h (TAO_GIOP):
-        * tao/GIOP.cpp:
-        * tao/Connect.cpp:
-        * tao/corbafwd.h: Changed the exception type defined as an enum in
-          corbafwd.h as 'ExceptionType' to 'exception_type'. This is
-          defined in the spec in chapter-3, pg.3-38, section 3.15.1 under
-          Standard Exception Definitions in CORBAv2.2 spec. The vsOrb test
-          suite also tests for this with this spelling.
-
-          The previous spelling 'ExceptionType' seems to a
-          spill out of the CORBA-COM, CORBA-OLE specs.  Changes to other
-          *.cpp and *.h files listed above to acommodate the change made
-          in corbafwd.h.
-
-Sat May 08 08:42:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: added missing
-          template instantiation for ACE_RB_Tree_Reverse_Iterator.
-
-Sat May 08 08:20:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
-          changed type of SWITCHES from int to u_int to avoid
-          signed/unsigned comparisons.
-
-Sat May 08 08:17:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/DynUnion_i_T.{h,cpp} (DU_Extractor): added virtual
-          destructor, to please egcs 1.1.2/VxWorks.
-
-Sat May 08 03:45:55 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO/TAO_Static.dsp: Added missing source files.
-
-        * TAO_IDL/tao_idl_static.dsp:
-        * examples/Simple/time/client_static.dsp:
-        * examples/Simple/time/server_static.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/client.dsp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/server.dsp:
-        * performance-tests/Cubit/TAO/MT_Cubit/client.dsp:
-        * performance-tests/Cubit/TAO/MT_Cubit/server.dsp:
-        * tao/TAO_Static.dsp: We should have used ACE_NO_INLINE instead of
-          defining __ACE_INLINE__=0 to supress the use of inlining.
-          Thanks to Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com> for
-          reporting this.
-
-Sat May 08 02:36:53 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Identity/Identity.cpp (test_poas): Added testing
-          for root POA.
-
-        * tao/POA.cpp (reference_to_servant and reference_to_id): Fixed
-          the checking of results from TAO_POA::parse_key().  POA names
-          should not be compared when the target POA is the root POA.
-          Thanks to Tommy Andreasen <tommy.andreasen@post.tele.dk> for
-          pointing out this bug.
-
-        * tao/TAO_Static.dsp and tao/TAO.dsp: Removed Sequence_T.cpp from
-          compilation list; it only contains template code.
-
-Fri May 07 23:49:38 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): Fixed
-          ORBuniqueidpolicyreversedemuxstrategy option.  Thanks to Phil
-          Mesnier <mesnier_p@ociweb.com> for pointing out that the "user"
-          option was extra and that the "linear" option was missing.
-
-Fri May 07 22:45:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/Trading/Makefile: removed -lTTest from LDLIBS
-          because it now appears explicitly on the link line, because
-          it is a dependency of $(BIN).  egcs complained about the
-          multiple occurrences.
-
-Fri May  7 22:34:58 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/corbafwd.h (CORBA):
-        * tao/TypeCode_Constants.cpp: Added new typecode for the interface
-          NamedValue. This would make us compatible with CORBA spec.
-
-Fri May  7 19:50:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Sequence_T.i:
-        * 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_ch.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_ch.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_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_cs.cpp:
-          Fixed bug in TAO_Bounded_Sequence<T,MAX> thanks for
-          Jim Rogers <jrogers@viasoft.com> for finding this out.
-
-Fri May  7 20:57:19 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-          Added Sequence_T.cpp and Object_Adapter.h to the
-          projects.
-
-Fri May  7 20:39:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Sequence_T.i:
-          Added a <T> to the argument of the copy constructor for
-          TAO_Object_Manager<T>. Was causing a problem with IBM
-          OpenEdition.
-
-        * tao/Object_Adapter.h:
-          Moved the classes Hint_Strategy, Active_Hint_Strategy, and
-          No_Hint_Strategy to the public section of TAO_Object_Adapter.
-          IBM OpenEdition didn't like the protected class Hint_Strategy
-          being inherited by the other two.
-
-        * tao/ORB.h:
-          Moved forward declaration and typedefs of
-          CORBA_ORB_InconsistentTypeCode outside of class
-          ORBA_ORB to the beginning of the file. IBM OpenEdition
-          didn't like this either.
-
-          Thanks to Jim Rogers <jrogers@viasoft.com> for pointing
-          out the problems and suggesting fixes.
-
-Fri May  7 19:37:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
-          Eliminate one memory allocation on the priority dispatching
-          case, thanks to Tom Venturella <Thomas.Venturella@MW.Boeing.com>
-          for this idea.  In the future we should use a per-supplier data
-          block instead of a global one, to minimize priority inversion.
-
-Fri May  7 19:16:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/include/ast_expression.h:
-          Put in many many #if ! defined (ACE_LACKS_LONGLONG_T)
-          brackets to avoid compile errors on GreenHills and
-          IBM OpenEdition. Thanks to Jim Rogers <jrogers@viasoft.com>
-          for pointing out the problem.
-
-Fri May  7 16:55:08 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Typecode.h (CORBA_TypeCode): Changed the _narrow definitions
-          in TypeCode::BadKind and Type_code::Bounds to be of type
-          static. THis will now be according to the spec. This is the
-          result of test run on the header module.
-
-        * tao/ORB.h,
-        * ORB.cpp: Changed the signature of the method,
-          resolve_initial_reference(). This now takes in const string and
-          it was previously a non-const one. We had to make this change to
-          be compatible with the spec and the vsOrb test suite checks for
-          this.
-
-Fri May  7 12:56:08 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Integrated Byron
-          Harris <harris_b@ociweb.com> 's patches for checking for \\'s in
-          command line IDL file given to tao_idl.
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed the
-          IRIX warnings.
-
-Fri May  7 10:00:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/Context.cpp:
-        * tao/Context.h:
-        * tao/DynAnyC.h:
-        * tao/ORB.cpp:
-        * tao/ORB.h:
-        * tao/Object_Adapter.cpp:
-        * tao/POA.i:
-        * tao/POAC.i:
-        * tao/Typecode_Constants.cpp:
-        * tao/corbafwd.h:
-          Several fixes to support minimum CORBA.
-
-        * examples/Quoter/server.cpp:
-          Fixed error in my use of ACE_PRINT_EXCEPTION.
-
-Thu May  6 21:49:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_si.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * examples/Callback_Quoter/Supplier_i.cpp:
-        * examples/POA/Default_Servant/client.cpp:
-        * examples/POA/Default_Servant/server.cpp:
-        * examples/Quoter/server.cpp:
-        * examples/Simple/Simple_util.cpp:
-        * orbsvcs/Trading_Service/Trading_Service.cpp:
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/Timer_Module.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-        * performance-tests/Thruput/TAO/ttcp_i.cpp:
-        * tao/ORB_Core.cpp:
-        * tao/Operation_Table.cpp:
-        * tests/MT_Client/server.cpp:
-        * tests/Multiple_Inheritance/client.cpp:
-        * tests/Multiple_Inheritance/server.cpp:
-        * utils/catior/catior.cpp:
-          Fixed inconsisten use of ACE_ERROR and LM_DEBUG, also removed
-          use of the DEBUG macro in favor of ACE_NDEBUG.
-
-Thu May  6 18:34:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          Fixed problem with disconnections while pushing an event, thanks
-          to Pradeep Gore for finding this out.
-
-Thu May  6 18:09:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-          Fixed return type for the accesor of array fields of a
-          valuetype.
-
-Thu May  6 17:52:47 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Simple/echo/README (client):
-          Updated Naming Service option from -s to -n.
-
-Thu May  6 15:46:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_args.cpp:
-        * TAO_IDL/be/be_visitor.cpp:
-          Removed characters after #endif
-
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be_include/be_valuetype.h:
-          Function overloaded with different signature?
-
-        * examples/OBV/Typed_Events/Event_Types_impl.cpp:
-          Fixed return expression on void function.
-
-        * tao/ValueBase.h:
-        * tao/ValueBase.i:
-          No sense in passing arguments by value as const, and they gave
-          Sun/CC 4.2 some headaches.
-          Use unsigned quantities for enums MSVC balks at expressions like
-          (-0x80000000L).
-
-        * tao/ValueFactory_Map.cpp:
-          Fixed some constness problems.
-
-        * utils/catior/catior.cpp:
-          Fixed unsigned/signed warning.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-          No need to change the priority of this thread, it is activated
-          at the right priority.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.cpp:
-          Fixed debug messages.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h:
-          Adjusted priorities for LynxOS.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
-          Use (min+max)/2 as default priority, to avoid problems on LynxOS
-          where the lowest real-time priority is the lowest priority of
-          the system!
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i:
-          Inline functions where not declared as such, got duplicate
-          symbols when compiling against static library.
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
-          Do not exit the loop on exception, continue until shutdown
-          event.
-
-Thu May 06 14:34:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/tao_idl.dsp:
-        * TAO_IDL/tao_idl_static.dsp:
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-          Added the new files that support OBV.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-          Added missing idl files CosTradingRepos.idl,
-          CosTradingDynamic.idl and some new EC files too.
-
-Thu May  6 12:11:22 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Many thanks and kudos to Torsten Kuepper
-          <kuepper2@uni-wuppertal.de> who contributes an initial
-          implementation of Object-by-Value to TAO. His ChangeLog entry
-          follows:
-
-        * TAO/tao/Makefile:
-        * TAO/TAO_IDL/Makefile:
-        * TAO/tao/orbconf.h:
-        * TAO/TAO_IDL/include/idl.h:
-          Support of Valuetypes if TAO_HAS_OBV resp. IDL_HAS_OBV is
-          defined.
-          This is far from complete. However
-          + you are able to pass valuetypes as arguments in operation
-          signatures (see examples/OBV).
-            - Valuetype as member of other types (union, sequence ...) is
-            missing until the compiler backend is provided with visitors
-            for that.
-          + A valuetype could have a valuetype as state member, ...
-            - ... but currently the sharing of valuetypes in the context
-            of an invocation is not yet implemented. This means you got
-            two out of one (if two references point to one object) and
-            cyclic references are not feasible.
-          + The marshalling code accesses the state member data directly
-            for optimization (-Wb,obv_opt_accessor).
-            - This will be changed for unoptimized (standard) valuetypes,
-              where the implementer should be able to override the
-              accessor/modifier functions even for marshalling. Currently
-              she isn't able to do so.
-            - The marshalling does no fragmentation (chunking) yet. But
-              this is required for custom marshalling and truncation.
-            - Ordinary (not hashed) repository ids are used. Some code is
-              missing that would optimize sending repo ids away (if the
-              formal parameter is equal the current type) or that
-              backreferences earlier send repository ids, when marshalling
-              a graph.
-            - The code generated for typedefs and forwards of valuetypes
-              is not complete and will not compile.
-            - Support of an interface is not yet there. Perhaps the TIE to
-              a valuetype may give comparable functionality.
-            - Abstract interfaces are not implemented too.
-            - TypeCode for valuetypes are missing, and without that,
-              packing a valuetype into an any is not yet possible.
-            - init () is not yet mapped to create () in the _init
-              class. But you can declare create () on your own in your
-              factory class.
-            - Some helper classes (e.g. _var for ValueFactory) are
-              missing.
-          And I have confused a few issues on constness in modifier
-          functions and members (in _init) which should be private and
-          friend of another class, but it didn't want to compile right. I
-          will correct these points, when I have the time.
-
-        * TAO/examples/OBV/Typed_Events [new]:
-          Demonstration of Typed Events, e.g. measuring values. The idea
-          is to have common attributes (time and origin id) and operations
-          (do_print()) in a base class.
-          The event (temperature, position...) that is derived from the
-          base is created in one process and is passed (type safe) to
-          another process which invokes member function of the base class
-          to do something with this concrete event (e.g. show, perform a
-          test).
-          (Naturally, the receiving process must have an implementation of
-          the valuetypes.)
-
-        * TAO_IDL/idl_global.h:
-        * TAO_IDL/utl_global.cpp:
-        * TAO_IDL/drv_args.cpp:
-        * TAO_IDL/be/be_args.cpp:
-          New TAO_IDL options
-            -Gv   enable OBV (Valuetype)
-            -Sv   disable OBV (Valuetype) (currently default)
-                  read option with idl_global->obv_support()
-            -Wb,obv_opt_accessor  Nonvirtual inline accessor/modifier
-            functions
-          Currently it is necessary to use compiled marshalling (-Gc) when
-          using the valuetype feature.
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/fe_init.cpp:
-          Compiler FE recognizes the OBV token (abstract, custom, init,
-          private, public, supports, truncatable, valuetype) (CORBA 2.3
-          3.2.4), but only if it is compiled with IDL_HAS_OBV and -Gv is
-          given.
-
-        * TAO_IDL/fe/idl.yy:
-          There are some new productions in the parser. member is now a
-          wrapper for member_i, which previously was member but now
-          accesses $0 as visibility parameter.
-
-        * TAO_IDL/include/ast_generator.h:
-        * TAO_IDL/be/be_generator.cpp:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/include/ast_interface_fwd.h:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/include/ast_field.h:
-        * TAO_IDL/ast/ast_field.cpp:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be_include/be_valuetype.h [new]:
-        * TAO_IDL/be/be_valuetype.cpp [new]:
-        * TAO_IDL/include/fe_interface_header.h:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-          AST_Interface is currently used for valuetypes too.  (This
-          attempt was made for better staying in sync with the rushing TAO
-          development.)
-          Though lots of code for name lookup and inheritance rules can be
-          reused. AST_Interface has the new methods is_valuetype(),
-          is_abstract_valuetype() and is_abstract_interface() which allows
-          the frontend to distinguish them. Later on a new AST_ class
-          should  be refactored which is a base class to the IDL types
-          that provide inheritance.
-
-          Some shared code in idl.yy is now in AST_Interface::redefine()
-          and AST_Interface::fwd_redefinition_helper(). Forward definition
-          is a little changed, that the dummy full definition be_ object
-          stored in AST_InterfaceFwd is of the right type.
-
-          FE_InterfaceHeader::compile_inheritance () is extended with the
-          rules to check right inheritance of valuetypes and abstract
-          interfaces.
-          The constructor of FE_InterfaceHeader has now a default
-          parameter which let the derived FE_obv_header invoke
-          compile_inheritance () at later time.
-
-        * TAO_IDL/be_include/be.h:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_visitor_module/module.h:
-        * TAO_IDL/be_include/be_visitor_root/root.h:
-        * TAO_IDL/be_include/be_visitor_argument/arglist.h:
-        * TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h:
-        * TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h:
-        * TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h:
-        * TAO_IDL/be_include/be_visitor_argument/upcall_ss.h:
-        * TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h:
-        * TAO_IDL/be_include/be_visitor_field/field_ch.h:
-        * TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h:
-        * TAO_IDL/be_include/be_visitor_operation/rettype*.h:
-        * TAO_IDL/be_include/be_visitor_valuetype.h [new]:
-        * TAO_IDL/be_include/be_visitor_valuetype_fwd.h [new]:
-        * TAO_IDL/be_include/be_visitor_valuetype/*.h [new]:
-        * TAO_IDL/be/be_visitor.cpp:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_docall_compiled_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_field/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype*.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd.cpp [new]:
-        * TAO_IDL/be/be_visitor_valuetype/*.cpp [new]:
-
-          The visiting of valuetype is integrated into the root and module
-          visitors. The OBV_ classes resp. namespaces are generated in an
-          extra pass over the syntax tree.
-
-        * tao/corba.h:
-        * tao/corbafwd.h:
-        * tao/ValueBase.h [new]:
-        * tao/ValueBase.i [new]:
-        * tao/ValueBase.cpp [new]:
-          All valuetypes inherit from the CORBA::ValueBase. It has
-          abstract operations for the reference counting, which are
-          implemented by multiply inherit from
-          e.g. CORBA::DefaultValueRefCountBase.
-          _copy_value () is not yet implemented.
-          There is some internal stuff for doing [un]marshalling and
-          dynamic type conversion (used by _downcast ()), whose
-          underlaying mechanism is like in the tao_idl compiler
-          itself:
-            The static member _downcast () calls a virtual function, which
-            is implemented from the IDL compiler, with an id of the wanted
-            type. These it is compared against the actual id of the
-            object. In case of mismatch the ancestors of the valuetype are
-            called (in depth first order).
-          _downcast () is used during unmarshaling too. This may result in
-          quite undeterministic real time behaviour. The worst case would
-          be that the _downcast walks the complete inheritance graph.
-          The detailed marshaling is best studied from the comments in
-          ValueBase.cpp.
-
-        * tao/ValueFactory.h [new]:
-        * tao/ValueFactory.i [new]:
-        * tao/ValueFactory.cpp [new]:
-        * tao/ValueFactory_Map.h [new]:
-        * tao/ValueFactory_Map.i [new]:
-        * tao/ValueFactory_Map.cpp [new]:
-          The map of registered valuetype factories.
-          TAO_OBV_REGISTER_FACTORY macro is for on the fly factory
-          registration, but its not like in the OMG specs.
-
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          Integration of the factory map for valuetypes with the ORB.
-          It is accessed through CORBA_ORB::register_value_factory (),
-          unregister_value_factory () and lookup_value_factory ().
-          This needs some revision to make the changing of the map thread
-          safe and changes to make it per ORB and not per process as it is
-          currently.
-
-        * */Makefile:
-          Many makefile dependencies updated.
-
-        * examples/Simple/chat/Makefile:
-          The dependencies did not include Client_i.cpp or Server_i.cpp
-
-        * orbsvcs/tests/Trading/Makefile:
-          Added dependencies to for parallel compilation.
-
-Thu May  6 09:24:30 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-          Small changes in debugging messages.
-
-Wed May 05 15:11:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i (Time_Value_to_TimeT):
-          replaced static cast of ACE_ONE_SECOND_IN_NSECS to ACE_UINT32
-          with ACE_U_ONE_SECOND_IN_NSECS, so we don't cast away
-          constness.
-
-Wed May 05 13:07:49 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * all Makefiles: replaced /bin/rm with $(RM) and /bin/mv with mv.
-
-Wed May  5 12:58:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Calibrate the High_Res_Timer before starting the test.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-          The last shutdown event was not properly initialized.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.cpp:
-          Corrected variance computation and use the
-          ACE_High_Res_Timer::global_scale_factor() to map from
-          ACE_hrtime_t to microseconds.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          Minor cosmetic fixes.
-
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
-          For experimentation purposes the dispatching thread runs at a
-          higher priority that the supplier threads. This minimizes the
-          latency because the dispatching thread becomes runnable as soon
-          as there is data available.
-          Of course this will be controlled by the scheduler in production
-          code.
-
-Wed May 05 12:20:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: added missing
-          template instantiations for ACE_RB_Tree_Iterator_Base.  Thanks
-          to David Levine for reporting this.
-
-Wed May 05 09:52:18 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/Makefile: added subset dependency
-          on Event2, because it needs the TAO_EC_Event_Channel ctor.
-
-Wed May  5 02:20:15 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/Environment.{h,i,cpp}:
-          Added _var and _out classes.
-
-        * tao/Any.{h,i,cpp}:
-          Edited the comment for the Any_var extraction
-          operators, added the Any_out -> operator, which
-          was missing, and made a cosmetic change to Any.cpp.
-
-        * tao/Typecode.{h,i}:
-          Moved the operator assigning a TypeCode_var to a
-          TypeCode_out to private: and removed the
-          implementation - it's not allowed.
-
-Tue May  4 23:50:04 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/ORB.{h,cpp}:
-        * tao/Typecode_Constants.cpp:
-          Added typedef'd strings ORBid to CORBA and
-          ObjectId to CORBA_ORB, along with their typecodes.
-
-          Also moved the typecode initialization for the exception
-          InconsistentTypeCode out of ORB.cpp and into
-          Typecode_Constants. Also cosmetized Typecode_Constants
-          a little.
-
-Tue May  4 21:46:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-          Fixed memory managment problems with the new implicit option
-          -I$TAO_ROOT/tao, also use $ACE_ROOT/TAO if TAO_ROOT is not
-          defined and print a warning message if none is defined.
-
-Tue May  4 21:15:51 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i:
-        * orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp:
-          Added new Dispatching strategy that uses multiple threads (one
-          per priority) and a queues to dispatch the events. This strategy
-          allows invocations from high-priority suppliers to low-priority
-          consumers or vice-versa with minimum priority inversion.
-          It also decouples the collocated suppliers from the time spent
-          in the collocated consumers.
-
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-          Added support for the new dispatching strategy and for Immediate
-          changes in the supplier sets, but with locking.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          Before passing data to the dispatching module we increment the
-          reference count, that way the dispatching module doesn't have to
-          do it and we minimize locking overhead.
-
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
-          Minor cosmetic changes.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-          Enabled debug message if an empty event is received.
-
-        * orbsvcs/tests/EC_Throughput/ec.conf:
-        * orbsvcs/tests/EC_Throughput/ec.mt.conf:
-          Added new configuration for Priority_Dispatching strategy.
-          Re-ordered options in old configuration to match the new one.
-
-Tue May  4 20:23:37 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.{h.cpp}:
-          Change the signature of the constructor
-            CORBA_Any (CORBA::TypeCode_ptr type,
-                       const ACE_Message_Block* mb)
-
-          to
-
-            CORBA_Any (CORBA::TypeCode_ptr type,
-                       COREBA::UShort dummy,
-                       const ACE_Message_Block* mb)
-
-          in order to avoid ambiguity with a call to
-
-            CORBA_Any (CORBA::TypeCode_ptr type,
-             void *value = 0,
-             CORBA::Boolean any_owns_data = 0)
-
-          where the second arg is NULL and the third arg
-          is left out.
-
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.cpp:
-        * tao/Invocation.cpp:
-        * tao/Typecode.cpp:
-          Changed the signature of all the calls to the above
-          constructor.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Fixed the '*/ outside of comment' warning.
-
-Tue May  4 20:17:41 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/CORBA.pidl: New file for adding entries that would generate
-          new typecodes.
-
-1999-05-04  Seth Widoff  <swidoff@cs.cmu.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/CosTrading.idl:
-        * orbsvcs/orbsvcs/CosTradingRepos.idl:
-        * orbsvcs/orbsvcs/CosTradingDynamic.idl:
-          Broke the CosTrading.idl file up so that each idl file
-          gets one module.
-
-        * orbsvcs/orbsvcs/Trader/Offer_Iterators.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader_T.{h,cpp}:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.{h,cpp}:
-          For the stem_id used in federated query, obliterated the calls
-          to rand_r, since they apparently return -1 on NT. Since random
-          numbers were kind of a cludge anyway, the trader now establishes
-          a unique sequence number space by generating a prefix consisting
-          of IP address and process id. If the trader is running on a
-          machine without an IP address, then it defaults to a random
-          prefix (using plain old rand, this time). Thanks to
-          Ulf Jährig <ujaehrig@desys.com> for pointing this problem out.
-
-          I also adapted all servants in the trader to use POA reference
-          counting.
-
-        * orbsvcs/tests/Offer_Exporter.cpp:
-        * orbsvcs/tests/TT_Info.cpp:
-          Fixed the includes to respect the new idl file schema.
-
-Tue May  4 17:45:43 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tao/orb.idl:
-          Added this file as required by CORBA spec. Contains only
-          empty interface defs for ORB, TypeCode and Object, inside
-          module CORBA, so the IDL compiler can recognize 'CORBA::'
-          scoped versions of the above. Interface defs suggested by
-          Carlos, who also says we may need to add to them later.
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-          Added a line to include the $TAO_ROOT/tao directory in the
-          preprocessor invocation, so it can find orb.idl.
-
-Tue May  4 14:11:43 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/sfp.cpp: Fixed the misinterpretation of the
-          credit message where I was adding the cred_num field to the
-          allowed credit. Its actually a sequence number and the credit
-          doesn't change for a session. Thanks to Leif Jakobsmeier
-          <leif@cs.uni-frankfurt.de> for pointing this out.
-
-Tue May  4 12:34:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/orbconf.h:
-        * TAO_IDL/be/be_helper.cpp:
-          The IDL compiler can use either templates or explicit code for
-          the classes mapped from IDL sequences.  I cleaned up the macros
-          to control which scheme is used by default on each platform.
-          The complete documentation is in orbconf.h next to
-          TAO_USE_SEQUENCE_TEMPLATES
-
-Tue May 04 12:15:06 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp (dispatch_servant_i): replaced
-          direct comparison of ACE_thread_t's with ACE_OS::thr_equal ().
-          Thanks to Steven D. Chen <sdc2951@aw101.iasl.ca.boeing.com>
-          for reporting this on HP-UX and for verifying the fix.
-
-Tue May 04 12:03:52 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile,tmplinst-orbsvcs.cpp:
-          removed tmplinst-orbsvcs.cpp, because none of its
-          explicit instantiations appear to be used.
-
-          Arranged orbsvcs subsets so that the Naming Service
-          is always built.  Many examples and tests need it.
-
-        * docs/configurations.html: removed note about orbsvcs
-          subsets not considering dependencies between the services.
-          The hard-coded dependencies and Makefile dependencies
-          should take care of that now.
-
-Tue May  4 09:47:04 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-          Completed implementation of the EC_Basic_ObserverStrategy.
-          Fixed computation of the consumers subscription list.
-          Thanks to J. Russell Noseworthy <rnosewor@objectsciences.com>
-          for helping out with this.
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-          Added locking on the SupplierAdmin object, the ConsumerAdmin
-          does not need it since the locking is handled by its
-          SupplierSet.
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway.cpp:
-          Cleaned up publication list computation, thanks to J. Russell
-          Noseworthy <rnosewor@objectsciences.com> for helping out with
-          this.
-
-        * orbsvcs/Event_Service/svc.conf:
-          Added locks for the ConsumerAdmin and SupplierAdmin modules.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Minor cosmetic fixes.
-
-        * orbsvcs/tests/EC_Mcast/svc.conf:
-          Added the right configuration options for the new EC.
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-          Added initialization of the EC_Default_Factory.
-          Workaround what appears to be a bug in glibc2 implementation of
-          rand_r(), it returns negative values but it should only return
-          numbers in the range [0,RAND_MAX)
-
-Mon May  3 23:46:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp:
-          Added a line to suppress inclusion of "fooC,h" and
-          "fooS.h" if foo.idl is "orb.idl". We're not
-          fully functional with '#include <orb.idl>' yet -
-          more changes to come.
-
-Mon May 03 22:02:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/include/ast_expression.h: reverted replacement of
-          LongLong with Long for GreenHills/Solaris, because it'll
-          take a lot more than that.
-
-Mon May 03 21:57:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/tao_idl.cpp,TAO_IDL/be/be_init.cpp,
-          TAO_IDL/driver/drv_{args,fork,preproc}.cpp,
-          TAO_IDL/fe/fe_init.cpp,TAO_IDL/fe/lex.yy.cpp:
-          replaced exit (n) with ACE_OS::exit (n).  Thanks
-          to Steve Huston for reporting this abomination.
-
-Mon May  3 18:31:25 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/examples/POA/DSI/Database_i.{h,cpp}:
-          Updated format of a CORBA::NO_IMPLEMENT exception and
-          removed a leading underbar from an 'is_a' so that
-          declaration, definition and call signature all agree.
-
-Mon May  3 17:19:26 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.{h,i}:
-          Added insertion and extraction operators for Any_var.
-          CORBA spec requires these for all copying insertion
-          operators defined as members of Any. The extraction
-          operators are there as a tip of the hat to user of
-          other ORBs that may be used to them.
-
-Mon May  3 16:09:24 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/IIOP_Server_Reqeust.*:
-        * tao/GIOP_Server_Request.*:
-
-          Changed all references to IIOP_ServerRequest to GIOP_ServerRequest
-          since the implementation is GIOP-specific, not IIOP-specific.
-
-        * tao/UIOP_Server_Request.*:
-
-          A UIOP-specific ServerRequest class is no longer needed since
-          the UIOP case falls under the GIOP case.  Removed these files.
-
-        * tao/Connect.cpp:
-        * tao/UIOP_Connect.cpp:
-
-          Changed references to IIOP_ServerRequest and UIOP_ServerRequest
-          to GIOP_ServerRequest since both transport protocols fall under
-          GIOP.
-
-Mon May  3 15:53:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/include/AST_Expression.h:
-          Used #if defined (ACE_LACKS_LONGLONG_T) to conditionally
-          define a longlong and unsigned longlong as a long and
-          an unsigned long, respectively. This in only to make
-          GreenHills/Solaris happy. Thanks to David Levine for
-          reporting the problem.
-
-Mon May 03 15:26:19 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Object_Adapter.h: added "class" in friend
-          declarations.
-
-Mon May 03 10:39:33 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.3.21 released.
-
-Mon May 03 10:18:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/NestedUpcall/MT_Client_Test/Makefile:
-          removed unused orbsvcs references.
-
-Mon May 03 10:04:00 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/POA/Demux/Makefile,
-          tests/InterOp-Naming/Makefile: only build if the
-          orbsvcs library was built with the Naming component.
-
-Mon May 03 09:46:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile: removed
-          use of orbsvcs headers and lib.  They're no longer needed.
-
-Sun May 02 22:11:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: always build Trader with LifeCycle.
-
-Sun May 02 22:09:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/{Consumer,Supplier}Admin_i.cpp,
-          EventChannel_i.cpp,ProxyPush{Consumer,Supplier}_i.cpp:
-          added auto_ptr and ACE_Auto_Basic_Ptr explicit instantiations,
-          for old g++.
-
-Sun May 02 22:05:46 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp (create_dispatching):
-          put ??? in a comment, so that old g++ doesn't complain
-          about encountering a trigraph.
-
-Sun May  2 15:57:33 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp:
-          Removed the call to remove_handlers () in the ~Command_Handler
-          to avoid double deletion of the signal handler.
-
-Sun May 02 14:47:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: removed
-          ACE_Reverse_Lock<ACE_Lock> and ACE_Guard<ACE_Reverse_Lock<ACE_Lock> >
-          explicit template instantiations because they're in
-          tao/Object_Adapter.cpp.
-
-Sun May 02 14:32:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i (Time_Value_to_TimeT):
-          added static cast of ACE_ONE_SECOND_IN_NSECS to ACE_UINT32
-          so that it will compile with ACE_LACKS_U_LONGLONG_T.
-
-Sun May 02 14:02:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: always build Sched with Event
-          or Event2.  Added dependency on Event's IDL_SRC's.  Thanks
-          to Carlos for letting me know that these are necessary.
-          Reordered subset support to be top-to-bottom, so that
-          lower level services can be easily included if needed
-          only by higher level services.
-
-        * orbsvcs/Event_Service/Makefile,orbsvcs/tests/EC_Throughput/Makefile:
-          added dependency on TAO_ORBSVCS Naming.  Thanks to Carlos for
-          pointing out that these modules use Naming.
-
-Sun May 02 11:55:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs\orbsvcs\Sched\Reconfig_Scheduler.{cpp, h, i} (new)
-          orbsvcs\orbsvcs\Scheduler_Factory.h: Very early draft
-          of the reconfigurable scheduler implementation.
-
-Sun May 02 08:15:50 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Context.cpp: removed ACE_Unbounded_Queue<char *>
-          explicit instantiations, because they're in ace/ARGV.cpp
-          (except ACE_HAS_MOSTLY_UNICODE_APIS, which we only use on
-          WIN CE).
-
-Sun May  2 00:12:40 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp:
-          Fixed the code to restart the event loop for Audio Buffer and
-          Video Buffer process for the java init case when the Java Gui
-          sends ior to the mpeg client.
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp:
-          Fixed compilation errors for using unsigned char * instead of
-          XmString on SunOS5.7 CC 4.2. Thanks to Bala for helping with this.
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h:
-          Fixed a redundant redinition warnings for macros nextByte and
-          computePicSize.
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.{h,cpp}:
-          Fixed void usleep to int usleep to avoid ambiguity errors on
-          SunOS5.7 CC 4.2.
-
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp:
-          Redefined xdr_void to int xdr_void (XDR *,void *) to fix
-          compilation errors on SunOS5.7 CC 4.2.
-
-Sat May  1 23:30:08 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp}:
-        * orbsvcs/orbsvcs/AV/AVStreams_i_T.{h,cpp}:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-          Added the correct implementation of destroy method according to
-          Irfan's suggestion.  Also corrected some TAO_ macros used for
-          exceptions.
-
-Sat May  1 22:01:41 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.h:
-          added virtual destructors.
-
-Sat May  1 21:01:40 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp: Stub
-          code generation was not checking inout args for the char, wchar,
-          boolean and octet cases, where the Any::to_* structs must be
-          used when demarshaling. Result was 'ambiguous >> operator' error
-          in compilation. Added the switch statement, checks and code
-          generation. Thanks to englishmalc@my-dejanew.com for reporting
-          this bug.
-
-Sat May  1 17:44:34 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB.cpp (multicast_query): Make sure we close down the
-          ACE_SOCK_Acceptor so we don't leak handles.  Thanks to Vishal
-          and James Johnson for tracking this down.
-
-1999-05-01  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.i: Fixed the precision error.
-          Use 64-bit precision for 64bit*32bit operation.  Thanks to
-          Tom Venturella <Thomas.Venturella@MW.Boeing.com> for reporting
-          that is had been using only 32-bit precision.
-
-Sat May  1 15:06:40 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * tao/Typecode.cpp (parameter): Changed the variable env to
-          ACE_TRY_ENV in CORBA_TypeCode::parameter method.
-
-Sat May  1 13:32:13 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp : Fixed the
-        g++ warnings.
-
-1999-05-01  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input):
-          Added stream.close () after stream.send_n () to explicitly
-          close the socket.
-
-          Thanks to James Johnson <jcej@lads.com> for finding this bug
-          and suggesting the fix.
-
-Sat May 01 08:22:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl:
-          check to see that the executables exist before trying
-          to run them.
-
-Sat May 01 03:03:47 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.{h,cpp}:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.{h,cpp}:
-        * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h:
-        * orbsvcs/orbsvcs/CosEvent/Event_Channel_i.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.h: Disable MSVC's warning
-          4250.
-
-        * tao/tao[_static].dsp: Added IIOP_Server_Request.{h,i,cpp}.
-
-Fri Apr 30 21:43:29 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/server.cpp
-        * orbsvcs/tests/Property/README
-        * orbsvcs/tests/Property/client.cpp
-        * orbsvcs/tests/Property/client.h
-        * orbsvcs/tests/Property/main.cpp
-        * orbsvcs/tests/Property/server.cpp
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.h:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp:
-        Update the code to use ACE exception macros.
-        Also updated the destroy method semantics to do POA deactivate.
-        Removed unnecessary ACE_DEBUG's from the code.
-
-Fri Apr 30 20:06:44 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode_Constants.cpp:
-          Fixed a bunch of 'Memory in Use' reports from Purify
-          reported by Irfan. Of a group of 10 Policy-related
-          Typecodes in init(), only 3 had been added to fini().
-
-Fri Apr 30 19:55:26 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEvent/EventChannel_i.*:
-        * orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.*:
-        * orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.*:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.*:
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.*:
-        modified the CosEvent Channel to use reference counted
-        servants.
-
-Fri Apr 30 19:05:32 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/Server_Request.*:
-        * tao/IIOP_Server_Request.*:
-        * tao/UIOP_Server_Request.*:
-
-          Moved IIOP specific stuff from Server_Request.* to
-          IIOP_Server_Request.*.  Created UIOP-specific UIOP_Server_Request
-          files based on the IIOP ones.
-
-        * tao/Makefile:
-
-          Added IIOP_Server_Request files to the Makefile and updated the
-          dependencies.
-
-        * tao/UIOP_Connect.{h,i,cpp}:
-
-          Rough implementation of UIOP connection handlers based on the IIOP
-          connection handlers.  Not operational yet.
-
-        * tao/Connect.*:
-
-          Changed all references of TAO_SVC_HANDLER to TAO_IIOP_SVC_HANDLER.
-
-        * tao/LSOCK_*:
-        * tao/UIOP_*:
-
-          Changed all references of "LSOCK" to "UIOP" (except for ACE
-          related LSOCK references).  Renamed all `LSOCK*' files to
-          `UIOP*'.  Thanks to Fred for motivating these naming
-          conventions.
-
-Fri Apr 30 18:46:10 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_sunsoft.cpp:
-          Added a couple of cases to the character constant switch
-          that eliminated the IDL compiler error messages
-          produced from one of the test IDL files in the OMG tests.
-          I don't think all of the IDL compiler tests have been run
-          yet, so there may remain more to be done.
-
-Fri Apr 30 17:41:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode.{h,cpp}:
-          Added a parameter() function. Although this function is gone
-          from CORBA2.3a, it is still in 2.2 (though deprecated).
-
-          Also found twp methods, ulong_param and typecode_param, that
-          were internal hacks to use until other member functions had
-          been written. They were never part of the spec and not now
-          used by anything in TAO, orbsvcs, or any of the tests or
-          examples, so they have been removed.
-
-Fri Apr 30 14:06:41 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * COPYING: Updated the COPYING file to reflect the use new of
-          ACE(TM) and TAO(TM).
-
-Fri Apr 30 12:42:06 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
-          Generate CORBA::default_environment() instead of
-          CORBA::Environment::default_environment. It is easier to
-          generate code for the TAO library that way and it is slightly
-          more efficient.
-
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-          Added support for reference counting of ProxyPushConsumer and
-          ProxyPushSupplier objects.
-          Also fixed the initialization of the default_POAs for those
-          classes and the Admin interfaces.
-          Added strategized locking to the
-
-        * tao/Context.h:
-        * tao/Context.cpp:
-          Use CORBA::defaul_environment() instead of
-          CORBA::Environment::default_environment() that way we can
-          include Context.h without requiring Environment.h
-          Also reordered some includes in the .cpp file to validate the
-          Context.h file on its own.
-
-        * tao/IOR_LookupTable.cpp:
-        * tao/ORB.cpp:
-          Protected some debug messages with TAO_debug_level. Also added a
-          few more to check the iioploc support.
-
-Fri Apr 30 11:58:23 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Request.{h,cpp} (operator[]): Changed the return type from
-          "const CORBA::Request_ptr" to "const CORBA::Request*".
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp (connect): Reordered the code
-          to avoid putting compiler specific code here.
-
-Fri Apr 30 02:05:22 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
-          (Cubit_Factory_i): Make sure to deactivate the cubit servant (in
-          addition to cubit factory servant) from the POA.
-
-        * tao/TAO.cpp (deactivate_under_child_poa and deactivate): The
-          code was incorrect in assuming that the <id> parameter is the
-          object id; it is actually the ior. Anyway, it should work now.
-
-Fri Apr 30 01:56:37 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h;
-        * tao/Request.{h,cpp}:
-        * tao/ORB.{h,cpp}:
-          Added the RequestSeq class, inherited from
-          TAO_Unbounded_Sequence. Used as an arg in the
-          (no-op) new ORB functions send_multiple_requests_oneway()
-          and send_multiple_requests_deferred(), although the
-          RequestSeq class itself is fully functional, should any
-          of this ever really get implemented.
-
-          Added several spec-required ORB functions:
-          - create_environment()
-          - create_exceptions()
-          - create_context_list()
-          - create_named_value()
-          - get_default_context()
-          - send_multiple_requests_onewasy()
-          - send_multiple_requests_deferred()
-          - get_next_response()
-          - poll_next_response()
-          All of these are no-ops and just throw CORBA::NO_IMPLEMENT.
-
-Fri Apr 30 00:40:44 1999  Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/POA/On_Demand_Loading/Server_Manager.h:
-        * examples/POA/On_Demand_Loading/Servant_Activator.h:
-        * examples/POA/On_Demand_Loading/Servant_Loader.h:
-          Changed TAO_TRY to ACE_TRY macros.
-        * examples/POA/On_Demand_Loading/Server_Manager.cpp:
-        * examples/POA/On_Demand_Loading/Servant_Activator.cpp:
-        * examples/POA/On_Demand_Loading/Servant_Loader.cpp:
-          Added ACE_NEW_DECLARE_CORBA_ENV instead of ACE_TRY_NEW_ENV
-          and also changed the CORBA::OBJECT_NOT_EXIST() exception
-          to fit the current api.
-        * examples/POA/Loader/Server_Manager.h:
-        * examples/POA/Loader/Servant_Activator.h:
-        * examples/POA/Loader/Servant_Loader.h:
-          Changed TAO_TRY to ACE_TRY macros.
-        * examples/POA/Loader/Server_Manager.cpp:
-        * examples/POA/Loader/Servant_Activator.cpp:
-        * examples/POA/Loader/Servant_Loader.cpp:
-          Added ACE_NEW_DECLARE_CORBA_ENV instead of ACE_TRY_NEW_ENV
-          and also changed the CORBA::OBJECT_NOT_EXIST() exception
-          to fit the current api.
-
-Thu Apr 29 22:12:25 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-        modified the dummy servants to use POA reference counting.
-
-Thu Apr 29 19:58:03 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * examples/Simple: Added the new time-date example, which
-          will illustrate how to dynamically link an ORB via the
-          svc.conf!
-
-Thu Apr 29 19:53:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-          Added corbafwd.h and Invocation.h to the projects.
-
-Thu Apr 29 19:21:14 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp (find_servant_i): We are grabbing the
-          lock in this function when we had already grabbed it in
-          find_servant().  This causes a deadlock when the lock are
-          non-recursive (i.e., on all non-NT platforms).  Thanks to Marina
-          for helping with this.
-
-Thu Apr 29 19:28:49 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Request.{h,i,cpp}:
-        * tao/Object.cpp:
-          Added the contexts() and env() operations to Request.
-          Since this involved adding an env_ member to Request,
-          I modified Objects's _create_request and _request
-          methods to pass along their environment args to the
-          Request constructors, whicn were also modified to
-          accept them and initialize env_. This won't change the
-          signature or the functionality of any existing code.
-
-Thu Apr 29 19:16:04 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp (connect):
-          Fixed a Vxworks warning for ACE_NOTREACHED in the connect
-          function.Thanks to Irfan for pointing this out.
-
-Thu Apr 29 18:35:52 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Request.{h,cpp}:
-          Added no-op versions of send_deferred, get_response,
-          and poll_response. These just throw CORBA::NO_IMPLEMENT.
-
-Thu Apr 29 17:28:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        Added support to allow Policy objects to be locality constraint.
-        This reduces the footprint of TAO when policy objects will never
-        be accessed remotely.  You can enable this feature by defining
-        TAO_HAS_LOCALITY_CONSTRAINT_POLICIES.
-
-        * tao/POAC.{h,cpp}:
-        * tao/CurrentS.cpp:
-        * tao/POAS.{h,i,cpp}:
-        * tao/POA_CORBA.h
-        * tao/PolicyS.cpp: Other than supporting locality constraint
-          policies, also removed unused op_tables, skeletons, stubs.
-
-Thu Apr 29 16:33:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: added
-          ACE_Guard<ACE_Reverse_Lock<ACE_Lock> > explicit instantiation,
-          for old g++.
-
-Thu Apr 29 16:23:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/COPYING.sun: Split out the copyright information
-          from the INSTALL.sun file.
-
-Thu Apr 29 15:58:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/PP_Test_Server.{h,cpp}:
-        * TAO/performance-tests/Pluggable/server.dsp:
-          Fixed servant deletion to deactivate under the POA
-          before doing so. Also added some files to the server
-          MSVC project for convenience.
-
-Thu Apr 29 13:59:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Context.cpp: replaced # that was inadvertantly
-          removed by last change.
-
-Thu Apr 29 13:57:33 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Context.cpp:
-          Fixed an include problem that was causing string_dup
-          and string_free not to be found when linking to TAO.
-
-Thu Apr 29 12:15:22 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-        Provided a temporary fix for the <destroy> methods, to avoid
-        crashing since the new POA changes.  Appropriate fix will be
-        committed soon together with the restructured version of Naming
-        implementation classes.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp:
-        Updated for servants to deregister from POA before being destroyed.
-
-Thu Apr 29 10:36:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Servant_Base.{h,cpp}: Changed the type of ref_count_ to
-          CORBA::ULong and removed the template instantiation for
-          Atomic_Ops.
-
-Thu Apr 29 09:34:40 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test:
-          check to see that the executables exist before trying
-          to run them (and wait for the ior file to be created).
-
-Thu Apr 29 06:41:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Context.cpp: removed ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>
-          explicit instantiation because it was already in
-          Exception.cpp.
-
-Thu Apr 29 02:54:04 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * lots of .cpp files: Removed "TAO_DEFAULT_MINOR_CODE,
-          CORBA::COMPLETED_NO" from many system exception instantiations
-          because they are what the default constructors use.  Thanks to
-          Irfan for suggesting this.
-
-Thu Apr 29 01:23:03 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA (policies): Fixed destroy() methods of the policies by
-          (a) removing "delete this" from the destroy() function, and (b)
-          using servant/POA reference counting.
-
-          The new destroy() function simply removes self from POA.
-          Because of reference counting, the POA will automatically delete
-          the servant when all pending requests on this servant are
-          complete.
-
-        * tao/Object_Adapter.cpp (TAO_Object_Adapter): Fixed memory leak
-          by deleting dynamically allocated lock.
-
-Wed Apr 28 21:16:55 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/MessagingS.h: Removed inclusion of MessagingS_T.h.  Old g++
-          cannot handle nested template classes properly.  This is the
-          same reason we cannot compile examples/POA/TIE with old g++.
-
-        * docs/Options.html: Removed -ORBpoa <global/tss> option since it
-          does not make sense in the new ORB/POA architecture.
-
-        * examples/Simple/echo/server.dsp:
-        * examples/Simple/echo/client.dsp:
-
-          Added release dependencies to the IDL compiler.
-
-        * examples/POA/Reference_Counted_Servant/server.dsp: Updated this
-          since some source files were removed.
-
-        * examples/POA/Explicit_Activation/server.cpp (main): Added the
-          use of SINGLE_THREAD_MODEL POA policy.  This helps in MT
-          debugging of the POA.
-
-Wed Apr 28 19:03:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/Context.{h,i,cpp}:
-          Added an implementation of ContextList, based on TAO's
-          implementation of ExceptionList, since the IDL definitions
-          and the C++ mappings are very similar. Also added
-          ContextList_var and ContextList_out classes.
-
-          Added the methods from the OMG C++ mapping for Context.
-          Since our support for Context is intentionally minimal,
-          these methods just throw CORBA::NO_IMPLEMENT. Wherever
-          a Context_ptr is used as an argument in TAO, the only
-          value it may have is 0 (or the above exception is raised).
-
-        * Exception.h:
-          Added the _var_type typedef to class Exception. It wouldn't
-          compile before, because of a (just-discovered) typo in
-          corbafwd.h.
-
-Wed Apr 28 18:52:49 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter:
-
-          - Single_Threaded_POA_Lock: This class helps us by locking
-            servants in a single threaded POA for the duration of the
-            upcall.  Single_Threaded_POA_Lock has a magic constructor and
-            destructor.  We acquire the servant lock in the constructor.
-            We release the servant lock in the destructor.
-
-        * tao/POA:
-
-          - Added appropriate code for establishing and tearing down locks
-            for servants in POAs with the SINGLE_THREAD_MODEL policy.
-
-        * tao/Servant_Base:
-
-          - Added a lock pointer to the servant base class.  This lock
-            will be created when the servant is registered with a single
-            threaded poa and removed/deleted when the servant is
-            deactivated from the POA.
-
-            Note that because a servant maybe registered with multiple
-            single threaded POAs simultaneously, we do reference counting
-            on this lock.
-
-Wed Apr 28 18:05:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs[_static].dsp: Fixed dependencies of some
-          idl files.
-
-Wed Apr 28 15:21:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/TAO.cpp (deactivate_under_child_poa and deactivate): Changed
-          object_id to object_id.in ().
-
-Wed Apr 28 16:21:02 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/DII_Cubit/Makefile:
-          moved BUILD definition to after wrapper_macros.GNU include,
-          because that would always clobber it.  Thanks to Irfan
-          for reporting that the IDL_Cubit server didn't get built
-          first without this change.
-
-Wed Apr 28 15:56:23 1999  Carlos O'Ryan  <coryan@JIG>
-
-        * tao/orbconf.h:
-        * tao/MessagingC.h:
-        * tao/MessagingC.cpp:
-        * tao/MessagingS.h:
-        * tao/MessagingS.cpp:
-        * tao/Policy_Manager.h:
-        * tao/Policy_Manager.cpp:
-        * tao/TAO.dsp
-        * tao/TAO_Static.dsp
-          Added the Messaging components to the NT build, not very
-          relevant since this are just the skeleton features that we will
-          need, but good for validation.
-
-        * tao/MessagingS_T.i:
-        * tao/MessagingS_T.cpp:
-          Fixed problems under HP-UX/aCC thanks to Brian Wallis
-          <Brian.Wallis@sr.com.au> for initially reporting this problem
-          and helping us with the fix validation.
-
-Wed Apr 28 14:00:20 1999  Carlos O'Ryan  <coryan@JIG>
-
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h:
-        * orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-        * orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.cpp:
-          Added @@ comments for Pradeep.
-
-Wed Apr 28 10:07:54 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/POA/Reference_Counted_Servant/Makefile: added PSRC
-          and re-ran make depend.  The old dependencies had a syntax error.
-
-Wed Apr 28 09:47:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO/tests/CDR/octet_sequence.cpp: replaced use of cout
-          with ACE_DEBUG statements.  Thanks to James D. Rucker
-          <jdrucker@huey.jpl.nasa.gov> for reporting that it
-          didn't build on VxWorks.
-
-Wed Apr 28 09:19:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          ORB_init() was crashing if argv was nil or argc was 0, thanks to
-          David for reporting this one.
-
-        * tao/ORB.cpp:
-          Use double checked pattern to reduce locking overhead in
-          CORBA::instance(), the method is invoked on the critical path,
-          that needs fixing too. Thanks to Irfan for reporting this
-          problem.
-
-        * tao/Exception.cpp:
-          Added missing template instantiation.
-
-Wed Apr 28 09:09:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Makefile,
-          orbsvcs/tests/EC_Mcast/Makefile,
-          orbsvcs/tests/EC_Throughput/Makefile:
-          require Event2 TAO_ORBSVCS component, instead of Event.
-
-Wed Apr 28 03:20:42 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Exception.{h,i,cpp}: Added a new class
-          CORBA_ExceptionList_var and changed the class
-          CORBA_ExceptionList to enable reference counting.  Fixed the
-          constructor's signature of all CORBA_SystemException's derived
-          classes.  Thanks to Ian Pepper <ian@aptest.ie> for reporting
-          this.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Added a typedef
-          TAO_EC_Unlock to avoid MSVC errors.
-          (reactive_push_to_consumer): Declared reverse_lock as
-          TAO_EC_Unlock.
-
-        * tao/corbafwd.h: Added typedef of ExceptionList_ptr and
-          ExceptionList_var in CORBA's namespace.
-          Added a macro definition TAO_DEFAULT_MINOR_CODE.
-
-        * orbsvcs/orbsvcs/Trader/Locking.h: Changed system exception
-          initialization signature using TAO_DEFAULT_MINOR_CODE.
-
-        * lots of *.cpp files: Fixed system exception instantiations.
-
-Wed Apr 28 02:07:42 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * created the directories orbsvcs/examples/CosEC/Factory
-        * added the following files:
-           orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl:
-            idl definition of the CosEventChannelFactory module.
-           orbsvcs/examples/CosEC/FactoryCosEventChannelFactory_i.h:
-           orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp:
-            servant implementation of the CosEC Factory.
-           orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.h:
-           orbsvcs/examples/CosEC/Factory/FactoryCosEventChannel_i.cpp:
-            Decorator for the CosEventChannelAdmin::EventChannel servant.
-           orbsvcs/examples/CosEC/Factory/FactoryClient.cpp:
-            Client to test the Factory.
-           orbsvcs/examples/CosEC/Factory/Makefile
-
-Wed Apr 28 01:45:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/Generic_Servant/MyFooServant.cpp (timed_operation):
-          Added a timed operation.  This can be used to see how the POA
-          dispatches multiple upcalls simultaneously.
-
-        * examples/POA/Reference_Counted_Servant/server.cpp
-          (Reference_Counted_Foo): There is no need to completely redefine
-          Reference_Counted_Foo.  Simply use the magic of multiple
-          inheritance and inherit from PortableServer::RefCountServantBase
-          and MyFooServant.
-
-Wed Apr 28 00:44:59 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.{h,cpp}:
-           modified to use the new RtEC.
-
-Tue Apr 27 23:32:52 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/TAO.cpp (deactivate_under_child_poa and deactivate): Added
-          new methods to deactivate the servant.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
-          (~Cubit_Server): Deactivate servant before deleting it.
-
-Tue Apr 27 23:01:30 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Added the directory $TAO_ROOT/performance-tests/POA/Demux and the
-        following files for the POA Demux tests.
-
-        * Makefile
-        * README
-        * client.cpp : client for the tests.
-        * demux_stats.cpp : To calculate statistics out of the timeprobe
-          data generated.
-        * demux_test.idl : IDL used for the test.
-        * demux_test_client.cpp : Makes calls on the remote objects
-          parameterized by the no. of POAs, servants and operations.
-        * demux_test_client.h:
-        * demux_test_client.i: Helper class for the client.
-        * demux_test_i.cpp : Servant Implementation.
-        * demux_test_i.h:
-        * demux_test_macros.h: Some #defines for the test.
-        * demux_test_server.cpp: Server for the test. Parameterized by the
-          POA ID policy, lifespan policy, no. of servants, operations.
-        * demux_test_server.h
-        * names_file: Names used by the servants.
-        * poa_names_100.dat: Names used by the POAs.
-        * server.cpp : server main program.
-        * write_names.cpp : generates the names_file.
-
-Tue Apr 27 22:35:10 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp: Fixed template instantiations and
-          constructor initialization order problems.
-
-Tue Apr 27 21:46:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * Eliminated priority inversion in the reactive dispatcher, we
-          release the lock during the upcall to limit the time during
-          which it is held.
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp:
-          Use the "reactive_push_to_consumer()" method in the
-          ProxyPushSupplier to ensure that the lock is released during the
-          upcall.
-
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
-          The timeout "filters" need direct access to the
-          ProxyPushSupplier.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
-          Added a new callback method to the ProxyPushSupplier used by the
-          Timeout filters to correctly grab the lock before dispatching
-          the timeout.
-          We need to control access to this kind of callback interfaces,
-          possibly using helper classes with "friend" access.
-
-        * orbsvcs/tests/EC_Throughput/ec.conf:
-        * orbsvcs/Event_Service/svc.conf:
-          By default use a regular mutex in the ProxyPushSupplier, it is
-          more efficient and works correctly.
-
-Tue Apr 27 17:27:16 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * tao/LSOCK_Acceptor.{h,cpp}:
-        * tao/LSOCK_Connector.{h,cpp}:
-        * tao/LSOCK_Profile.{h,i,cpp}:
-        * tao/LSOCK_Transport.{h,cpp}:
-
-          These are the Unix Domain Socket pluggable protocol files for TAO.
-          They are not operational yet, but getting them under CVS
-          control at this point seems like a good thing to do.
-
-Tue Apr 27 16:48:24 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA:
-
-          - destroy_i: If the <wait_for_completion> parameter is TRUE, the
-            destroy operation will return only after all requests in
-            process have completed and all invocations of etherealize have
-            completed. Otherwise, the destroy operation returns after
-            destroying the POAs.
-
-            If a servant manager is associated with the POA,
-            ServantLocator::etherealize will be invoked with the oid and
-            the servant. (The deactivate_object operation does not wait
-            for the etherealize operation to complete before
-            deactivate_object returns.)
-
-            If the POA has no ServantActivator associated with it, the POA
-            implementation calls _remove_ref when all operation
-            invocations have completed. If there is a ServantActivator,
-            the Servant is consumed by the call to
-            ServantActivator::etherealize instead.
-
-        * tao/Object_Adapter:
-
-          - Non_Servant_Upcall: This class helps us with a recursive
-            thread lock without using a recursive thread lock.
-            Non_Servant_Upcall has a magic constructor and destructor.  We
-            unlock the Object_Adapter lock for the duration of the
-            non-servant (i.e., adapter activator and servant activator)
-            upcalls; reacquiring once the upcalls complete.  Even though
-            we are releasing the lock, other threads will not be able to
-            make progress since
-            <Object_Adapter::non_servant_upcall_in_progress_> has been
-            set.
-
-          - Outstanding_Requests: This class helps us by increasing
-            <POA::outstanding_requests_> for the duration of the servant
-            upcall. Outstanding_Requests has a magic constructor and
-            destructor.  We increment <POA::outstanding_requests_> in the
-            constructor.  We decrement <POA::outstanding_requests_> in the
-            destructor.  Note that the lock is released after
-            <POA::outstanding_requests_> is increased and
-            <POA::outstanding_requests_> is decreased after the lock has
-            been reacquired.
-
-        * tao/Active_Object_Map:
-
-          - Added <deactivated_> flag to each entry in the map. This flag
-            is needed because there is a period of time between an
-            object's deactivation and the etherealization (during which
-            outstanding requests are being processed) in which arriving
-            requests on that object should not be passed to its
-            servant. During this period, requests targeted for such an
-            object act as if the POA were in holding state until
-            etherealize completes. If etherealize is called as a
-            consequence of a deactivate call with a etherealize_objects
-            parameter of TRUE, incoming requests are rejected.
-
-          - bind_using_system_id(): Removed extra code: entry->system_id_
-            = entry->user_id_; this was already happening in
-            TAO_Active_Hint_Strategy::bind().
-
-          - unbind_using_user_id(): Only unbind servant if non-zero.
-
-        * tao/Servant_Base.h (TAO_ServantBase): Change reference count
-          from ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> to
-          ACE_Atomic_Op<ACE_SYNCH_MUTEX, long>.  This way we can utilize
-          the InterlockedIncrement / InterlockedDecrement specializations
-          for Atomic_Op on NT.
-
-        * tao/ORB_Core.cpp (create_and_set_root_poa): Fixed POA
-          constructor call.
-
-        * tao/default_server.cpp (enable_poa_locking): Changed server
-          factory to simply inform Object Adapter if POA locking should be
-          enabled.  The Object Adapter will create the proper lock.
-
-Tue Apr 27 16:40:00 1999 Chris Gill  <cdgill@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp: added some additional
-          structure member initializations to remove uninitialized memory
-          reads that were being reported by Purify.
-
-Tue Apr 27 15:04:14 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-          Removed an incorrect "var" string appended to the
-          local member name in the case where a union contains
-          another union. Was causing a compile error in fooC.i.
-          Thanks to Srikumar Kareti <skareti@htc.honeywell.com>
-          for reporting this.
-
-Tue Apr 27 12:01:38 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Event_Service.cpp (main): Changed to use
-          TAO_EC_Default_Factory::init_svcs () to add the static service
-          into service configurator.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp (connect):
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp (init):
-          Added ACE_NOTREACHED macros.  KAI compiler is pretty good at
-          figuring out unreachable statements.
-
-Mon Apr 26 16:49:24 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp: Redefined TAO_YY_BREAK as ACE_NOTREACHED
-          (break;) and made sure it is used properly in the file.
-
-Mon Apr 26 10:44:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Added helper method to register the default factory with the
-          service configurator. This is needed on NT where the
-          export/import madness does no allow us to use the static service
-          declaration from outside the DLL.
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-          Added the new Event Channel files.
-
-Mon Apr 26 09:16:51 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.i:
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.cpp:
-          Encapsulated throughput measurements in a helper class.
-          Added support for accumulating several latency measurements.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Added support for accumulated throughput and per-consumer
-          latency.
-
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp:
-          Fine tuned.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp:
-          We should not raise an exception when removing a supplier,
-          because we would need to filter out supplier removal too. It is
-          enough to raise the exception from the SupplierAdmin module.
-
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
-          Added debugging messages (currently commented out).
-
-        * orbsvcs/orbsvcs/Event/EC_Filter.cpp:
-          Added some @@ comments.
-
-Mon Apr 26 05:35:12 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO_Internal.{h,cpp}: Changed *_args to of type const char
-          *.  Thanks to Andy for reporting this.
-
-        * tao/TAO_Internal.{i,cpp} (default_svc_conf_entries): Moved to
-          .cpp file and remove TAO_Internal.i from repository.
-
-Sun Apr 25 16:59:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp: Added ACE_NOTREACHED to two redundant
-          break statements.
-
-        * TAO_IDL/ast/ast_expression.cpp (coerce_value): Removed a
-          redundant return statement.
-
-Sun Apr 25 16:05:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-          The EC_Factories create a Supplier_Filter_Builder now. This
-          simplifies some of the memory managment in the system: now the
-          EC must handle the builder and the builder handles the object it
-          creates.  I was able to lift a restriction of the factories
-          implemented so far: they can be used from multile ECs now.
-
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i:
-        * orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-          The EC_Factory creates a factory object for the supplier-side
-          filters. Analogous to the consumer-side filter builder.
-          The ProxyPushConsumer uses this object to create its filter, but
-          the creation is deferred until the user connects to the
-          ProxyConsumer (as it is done in the consumer side).
-
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp:
-          Moved the trivial supplier-side filter to its own filter. Added
-          a builder for it.
-
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp:
-          Fixed some problems with late registration of
-          suppliers/consumers.
-
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
-          Fixed several bugs during consumer/supplier match. Also added a
-          supplier filter builder for this type.
-          The EC_Default_Factory has support for it too.
-
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-          Fixed comments.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Use the new EC by default.
-          Start the threads at the right priority.
-
-        * orbsvcs/tests/EC_Throughput/ec.conf:
-          Enabled the per-supplier filters by default.
-
-        * Updated many makefiles.
-
-Sat Apr 24 22:57:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp:
-          Fixed a typo that was causing a derived interface's
-          _set_xxx_skel method to call the base class'
-          _get_xxx_skel method. Thanks to Kris Johnson
-          <kjohnson@gardnersys.com> for pointing this out.
-
-Sat Apr 24 08:51:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
-          IRIX required an extra #include
-
-Sat Apr 24 07:21:24 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Global.cpp (get_high_priority):
-          on VxWorks, fixed access of default_priority.  It's in the
-          Globals singleton.
-
-Fri Apr 23 18:11:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/ORB.cpp:
-          Modified file_string_to_object() to use ACE::fopen
-          instead of ACE::open. Formerly it was crashing when
-          called from the MSVC debugger, due to a recent change
-          made to plug a memory leak. This change (suggested by
-          Carlos) will not support cool filename-within-file
-          recursive behavior (past the file descriptor limit), but
-          has the advantage of working with NT and causing no
-          leaks on Unix.
-
-Fri Apr 23 16:09:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp:
-          Added EC_Default_Factory to the project files.
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-          Added include file that is required on NT, but not on Unix,
-          beats me.
-
-Fri Apr 23 16:17:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.{h,cpp}:
-          use ACE_THR_PRI_OTHER_DEF instead of ACE_THR_PRI_FIFO_DEF,
-          and THR_NEW_LWP instead of THR_BOUND, if not using FIFO scheduling.
-          Thanks to David H. Whittington <david.h.whittington@boeing.com>
-          for testing these changes on HP/UX (where we're still not
-          successful) and Irix (where we are successful), not running
-          as root.
-
-Fri Apr 23 11:12:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.i:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Cleaned up EC_Event_Channel initialization: now it takes the POA
-          for the consumer and suppliers in the constructor instead of
-          using the factory.  This is was required since not all factories
-          can be initialized with the right POAs.
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-        * orbsvcs/tests/EC_Mcast/svc.conf:
-          This test also uses the default factory now.
-
-Fri Apr 23 10:15:26 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.cpp:
-          The factory is a service object now.
-          Some factories will require the user to set the POA objects.
-
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.i:
-        * orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp:
-          Added new EC_Factory that uses the command line arguments to
-          control which strategies and objects are created, it is not very
-          efficient, but is very useful for experimentation.
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-          Added new methods to set the POAs in the factory, they should be
-          used for factories that require them.
-          Added support for controlling ownership of the factory
-          class.
-          If the user does not specify any factories explicitly we try to
-          dynamically load the abstract factory. If that fails we fall
-          back of the EC_Default_Factory.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-          The proxy was not reporting its destruction to the EC, thus it
-          wasn't removed from all the data structures.
-
-        * orbsvcs/Event_Service/Event_Service.h:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/Event_Service/svc.conf:
-          The new Event Service is configured using the EC_Default_Factory
-          and the svc.conf file.
-
-        * orbsvcs/tests/EC_Throughput/run_test.pl:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/tests/EC_Throughput/ec.conf:
-          Added support for the new "dynamically loadable"
-          EC_Default_Factory.
-          The ec.conf file contains the proper configuration for this
-          test.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-          Added option to disable EC shutdown on program exit.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-          Minor fixes in debugging messages.
-
-Fri Apr 23 000:39:51 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Marshal.{h,i}:
-          TAO_Marshal_Any::deep_free() was a no-op! I just forced
-          the Any's destructor call. This may not be portable, but
-          the alternative would probably necessitate un-inlining
-          the function. Time will tell. Anyway, this fixed memory
-          leaks due to Anys containing Anys.
-        * tao/append.cpp:
-          TAO_Marshal_Any::append() was causing client side memory
-          leaks due to unreleased typecodes. Also fixed some Any
-          weirdness I noticed by chance in TAO_Marshal_Union.
-        * tao/skip.cpp:
-          TAO_Marshal_Any::skip() was causing server side memory
-          leaks due to unreleased typecodes.
-
-          Thanks to Frank Buschmann <Frank.Buschmann@mchp.siemens.de>
-          for providing a tortuous Any test idea.
-
-Thu Apr 22 20:18:58 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * man/man7/TAO.7:
-
-          Moved `man/man1/TAO.1' to `man/man7/TAO.7' since TAO.1 doesn't
-          describe a user program.  It seems to fit better in
-          "Miscellaneous," i.e. man section 7.
-
-        * man/man1/*:
-
-          Updated to reflect move of TAO.1 to man/man7/TAO.7.
-
-Thu Apr 22 17:24:27 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode.cpp:
-          Cosmetic changes to ~TC_Private_State so I can read it.
-
-Thu Apr 22 13:37:49 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * man/man1/tao_idl.1:
-
-        Moved tao_idl man page to newly created man page directory.
-
-        * man/man1/TAO.1:
-        * man/man1/TAO_Concurrency_Service.1:
-        * man/man1/TAO_CosEvent_Service.1:
-        * man/man1/TAO_Event_Service.1:
-
-        Started added man pages for TAO and TAO's ORB services.  There are
-        still several more to complete.  Some of the ones listed above need
-        to be revised.
-
-Thu Apr 22 07:53:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/POA/Reference_Counted_Servant/Makefile:
-          Fixed small compilation problems.
-
-Wed Apr 21 22:15:43 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA: Phase three of the POA rearchitecturing is now
-          complete.  This phase includes:
-
-          - Addition of reference counting to servants.  This includes:
-
-          (a) obeying reference counting protocol between the POA and the
-              servant
-          (b) addition of the ServantBase_var class to TAO
-          (c) addition of the RefCountServantBase class to TAO
-          (d) addition of reference counting hooks to the ServantBase
-              class
-          (e) addition of reference counting to active object map entries
-              to help in counting the number of outstanding requests on
-              the servant
-
-          - Etherealization of servants has now been fixed.
-            <remaining_activations> and <cleanup_in_progress> should both
-            have correct values.
-
-          - New methods were added that help in deactivating and cleaning
-            up servants.  These methods are used by both the POA and the
-            POA Manager.
-
-          - New example was added. Reference_Counted_Servant shows how to
-            use reference counted servants to automatically manage dynamic
-            memory for servants.
-
-          - Setting up of POA Current object id was only done with the
-            RETAIN policy.  This has now been fixed such that it works
-            properly for all policies.  Thanks to Steve Totten
-            <totten_s@ociweb.com> for pointing this out.
-
-Wed Apr 21 21:56:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Quoter/client.cpp (main): adding missing ,
-          between arguments to activate ().
-
-Wed Apr 21 19:11:00 1999 Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/NS_Resolve.java:
-          New NS resolution method based on CORBA standard approach.
-          Many thanks to Margaret Reitz <margaret@veritas.com> and
-          Hans Ridder <ridder@veritas.com> for contributing these changes.
-
-        * examples/Simulator/NavWeap.idl
-          examples/Simulator/Event_Supplier/{DualEC_Sup, Event_Sup,
-                                             Logging_Sup}.dsp:
-          Changes to use the new CORBA standard TimeBase.idl
-
-Wed Apr 21 14:45:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-          Use Recursive_Mutexes for the Basic_Factory, otherwise we risk a
-          dead-lock if the user decides to disconnect or push a new event
-          that it finally reaches the same consumer.
-
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-          Added new method push_to_consumer() to the ProxyPushSupplier
-          implementation, this method is invoked by the dispatching module
-          to really push the event. Its job is to verify that the consumer
-          is not disconnected and/or suspended.
-          The Dispatching module does not need to receive the consumer
-          anymore.
-
-        * orbsvcs/orbsvcs/Event_Service_Constants.h:
-        * orbsvcs/orbsvcs/Event_Utilities.i:
-          Added new macro for the ANY_SOURCE source id.
-
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
-          Timeout filters should not accept any events in the filter()
-          methods.
-          The Timeout generator passes the event directly to their
-          push_nocopy() methods.
-
-        * orbsvcs/orbsvcs/Makefile:
-          Fixed little problem with the Time -> ImplRepo dependency in
-          TAO_ORBSVCS
-
-        * orbsvcs/tests/Event_Latency/Event_Latency.cpp:
-          Added compile-time support for the new Event Channel, just for
-          experimentation purposes.
-
-Wed Apr 21 11:06:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.{h,cpp},
-          server.cpp,client.cpp:  factored out thread creation flags to
-          Globals::thr_create_flags.  Only set THR_SCHED_FIFO flag if
-          sched_fifo_init operation to set process FIFO scheduling succeeded.
-
-Wed Apr 21 09:37:27 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/summarize:
-          added 0 low-priority thread case to example usage.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test:
-          added exit at end of trap statement, so that the script
-          will die after catching a signal and cleaning up.
-
-Wed Apr 21 09:25:16 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/NestedUpcall/MT_Client_Test/client.cpp (main),
-          examples/Quoter/client.cpp (main),
-          performance-tests/Cubit/COOL/MT_Cubit/client.cpp
-            (do_priority_inversion_test):
-          replaced ACE_SCHED_FIFO with THR_SCHED_FIFO in activate calls.
-          Thanks to Carlos for finding this subtle error.
-
-Wed Apr 21 09:12:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
-          The activate() function was called with the wrong flag,
-          ACE_SCHED_FIFO was used, but THR_SCHED_FIFO is the Right
-          Thing[tm]
-
-Wed Apr 21 03:41:51 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.20 released.
-
-Wed Apr 21 01:24:26 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/default_resource.cpp: Removed extra #pragma instantiates for
-          TAO_Collocation_Table_Lock.
-
-Wed Apr 21 00:56:21 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp
-          (operator=): Added an empty implementation to stop MSVC from
-          complaining.
-
-Tue Apr 20 23:21:22 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode.cpp:
-          Removed a superfluous duplication of an ACE_Message_Block
-          in private_member_label(). This got rid of another memory
-          leak associated with unions. In general, it's never necessary
-          to duplicate a message block before calling the Any
-          constructor that takes a message block or either of the
-          Any::_tao_replace() functions. All of these duplicate the
-          message block themselves.
-
-Tue Apr 20 22:57:57 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
-          <<= was causing a memory leak. Removed the ->clone ()
-          from the message block being inserted into the Any.
-          Tested both copying and non-copying versions of <<=,
-          over the wire, with a dynamically allocated type inside
-          the union. All worked ok, and the leak was gone.
-
-Tue Apr 20 20:43:25 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h: Added a
-        operator= declaration to avoid this being generated which leads to
-        undefined operator= for the PropertyTypes member when linking orbsvcs.
-        Thanks to Irfan Pyarali for the fix.
-
-Tue Apr 20 20:27:48 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/*:  Added an options class for storing
-          program options and also changed the repository class to not
-          use the ACE Naming Context.  It doesn't have persistence now,
-          but that will be added soon.
-
-        * orbsvcs/tests/ImplRepo/*:  Changed to work with the above changes.
-
-Tue Apr 20 17:31:28 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * docs: Performed copy editing on a bunch of documentation and
-          added the new Interoperable Naming Service documentation to the
-          main documentation page.
-
-Tue Apr 20 15:24:00 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/MT_Client/orb_creation.dsp:
-        * tests/MT_Client/MT_Client.dsp:
-          New MSVC project file for orb_creation.
-
-Tue Apr 20 15:18:35 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * TAO_ROOT/docs/INS.html: Added this page. It documents the
-          InterOperable Naming Service.
-        * TAO_ROOT/docs/releasenotes/index.html: Added a link to INS.html
-
-Tue Apr 20 14:27:07 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/deep_free.cpp:
-          Removed local variable discrim_size_with_pad, which is no
-          longer being used.
-
-Tue Apr 20 11:09:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          Removed several memory leaks, including the ORB_Core itself: it
-          wasn't destroyed when the last ORB reference went away.
-
-        * tao/ORB.cpp:
-          Fixed resource leak in file_string_to_object()
-
-        * tao/default_resource.h:
-        * tao/default_resource.i:
-        * tao/default_resource.cpp:
-          Merged the App_Allocated and Pre_Allocated classes into a single
-          class, it is easier to control their lifetime and it didn't make
-          sense to have two.
-
-        * tao/IIOP_Connector.cpp:
-          Fixed comment.
-
-        * tests/MT_Client/client.global.conf:
-        * tests/MT_Client/client.tss.conf:
-          Use static services.
-
-        * tests/MT_Client/orb_creation.cpp:
-        * tests/MT_Client/server.cpp:
-        * tests/MT_Client/client.cpp:
-          Use the ACE macros to print out exceptions.
-
-        * tao/MessagingC.cpp:
-          Fixed warnings about unitialized variables.
-
-        * tests/MT_Client/Makefile:
-          Updated dependencies
-
-        * tests/MT_Client/run_test.pl:
-          Added support for the orb_creation test.
-
-Tue Apr 20 02:47:32 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tests/Param_Test/param_test_i.cpp (test_exception): It was still
-          using environment to throw exceptions.  Changed to use ACE_THROW.
-
-        * tests/Param_Test/except.{h,cpp}: Differentiated results based on
-          the exception received in that iteration so we can determine if
-          the exception is the one the test is waiting.  Egcs on Linux
-          seems to have trouble downcasting exceptions.
-
-Mon Apr 19 22:17:28 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): Removed access to input CDR since it is not
-          used in this function.  Thanks to David for pointing this out.
-
-Mon Apr 19 20:17:02 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.{h,i}:
-          Changed the signature of the constructor for Any::to_object
-          to reflect the change set out in issue 154 of the 1.3 RTF.
-          This makes the caller responsible for disposing of the
-          results of extracting to to_object, and allows the constructor
-          to be passed an Object_var to facilitate this.
-          Also had to add '#include Object.h' to keep sunc++ happy.
-
-Mon Apr 19 17:09:14 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp (start_servant):
-          Arrgh!  There was a missing comma that caused the test to fail!
-          Thanks to David H. Whittington <david.h.whittington@boeing.com>
-          for reporting this.
-
-Mon Apr 19 16:26:43 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/deep_free.cpp:
-          Updated TAO_Marshal_Union::deep_free to use the
-          Union class virtual functions. The old code was
-          bumpint the void *data pointer along to point to
-          the discriminator value, then to the member value.
-          This wasn't working on NT where the first thing
-          in the union class memory layout is the vptr. Also
-          changed the use of value() to _tao_get_cdr() on
-          the elements of the member label list. That
-          wouldn't work on any platform because those Anys
-          are all created with void *value = 0;
-
-        * tao/decode.cpp,
-        * tao/encode.cpp,
-        * tao/skip.cpp:
-          Changed the tk_enum case for the discriminator inside
-          the TAO_Marshal_Union versions to use CORBA::ULong as
-          was determined to be the correct mapping earlier today.
-          Also finished implementing the tk_wchar cases, which
-          Andy had marked TODO.
-
-Mon Apr 19 15:23:56 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/tests/Trading/colocated_test.cpp (main):
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp (run):
-        * orbsvcs/tests/EC_Multiple/EC_Multiple.cpp (run):
-        * orbsvcs/Trading_Service/Trading_Service.cpp (init):
-        * tao/Stub.cpp (set_policy_overrides):
-        * tao/POA.cpp (create_POA):
-
-          Avoided annoying g++ warning about <auto_ptr> by explicitly
-          making a temporary. Thanks to David for pointing this out.
-
-Mon Apr 19 13:54:10 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * docs/configurations.html: removed TAO_ORBSVCS limitation
-          that said we don't check for the macro in the each of the
-          orbsvcs and orbsvcs/tests subdirectories.  We do now.
-
-Mon Apr 19 13:15:25 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA: Fixed POA code to pass and use the environment when
-          calling _add_ref and _remove_ref on servants.
-
-        * tao/Servant_Base (_add_ref and _remove_ref): Added default
-          environment parameter to call.  Thanks to David for pointing
-          this out.
-
-        * tao/ORB.cpp (resolve_root_poa and resolve_poa_current): Now that
-          resolve_initial_references takes a environment, we don't need to
-          create temporary environments.  Changed these functions to take
-          the environment as a parameter.  Thanks to Carlos for pointing
-          this out.
-
-        * tao/POA: The following changes were made to comply with the new
-          servant reference counting schemes in the upcoming CORBA 2.3
-          specification:
-
-          - Changed type of <default_servant_> from Servant to
-            ServantBase_var.  This will help in (a) calling _remove_ref()
-            on <default_servant_> when it is replaced with a new
-            <default_servant_> and (b) calling _remove_ref() on
-            <default_servant_> when the POA goes away.
-
-          - Added servant reference counting to the following methods:
-
-            get_servant
-            set_servant
-            activate_object
-            activate_object_with_id
-            servant_to_id
-            servant_to_reference
-            reference_to_servant
-            id_to_servant
-
-          - To be done: Calling _remove_ref() on deactivation of objects,
-            deactivation of POAs, and destruction of POAs.
-
-Sun Apr 18 12:32:15 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_args.cpp (DRV_parse_args): Added check of
-          validity of temp directory.  If tao_idl can't access the temp
-          directory, spit out some warning and switch to use current
-          directory.
-
-Sun Apr 18 09:08:13 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB.cpp: removed ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>
-          explicit template instantiation.  It duplicated the one
-          in Servant_Base.cpp.
-
-Sun Apr 18 03:34:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Servant_Base.h (class ServantBase_var): Added reference
-          counting servant auto pointer class (as per CORBA spec).
-
-        * tao/Servant_Base (class RefCountServantBase): Added reference
-          counted mix-in class (as per CORBA spec).
-
-        * tao/Servant_Base.cpp (operator= and TAO_ServantBase):
-
-          - Fixed the copy constructor and assignment operator to copy the
-            optable pointer from the <rhs> object.
-
-          - Made the assignment operator protected (as per CORBA spec).
-
-          - Also added _remove_ref() and _add_ref() (as per CORBA spec).
-
-        * tao/Servant_Base.h (TAO_ServantBase): Made _is_a public and add
-          _non_existent.
-
-        * tao/Object.cpp (_non_existent): Added collocation optimization
-          similar to the ones in _is_a().
-
-        * TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
-        * TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
-          (visit_interface): Removed the generation of the _is_a from the
-          collocated class since there is already a call to the servant
-          from the object if the object is collocated.
-
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
-          (visit_interface): Removed the incorrect comment that said that
-          CORBA_Object::_is_a is a remote call.
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp
-          (visit_interface): Changed the _is_a skeleton to use compiled
-          marshaling.  Also, changed the _non_existent skeleton to use
-          compiled marshaling and to call the servant instead of simply
-          returning false.
-
-        * tao/Sequence.cpp (operator==): Moved the comparison of octet
-          sequences from Stub.cpp to Sequence.cpp.  Also, removed the
-          comparison of object keys.
-
-Sat Apr 17 17:41:12 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.{h,cpp} :
-        * orbsvcs/orbsvcs/AV/AVStreams_i_T.cpp :
-          Fixed g++ warnings/errors. Thanks to David Levine and JM Strauss
-          for reporting this.
-
-Fri Apr 16 21:57:15 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simple/{bank,echo,grid,time}/Makefile:
-          only build if the orbsvcs library was built with
-          the Naming TAO_ORBSVCS component.
-
-Fri Apr 16 19:40:27 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Typecode.cpp:
-          Okay, here goes. A recent bug report concerning crashes
-          upon exit after inserting a union into an Any led to this
-          discovery. When the Any goes away, it calls free_value()
-          on the union (since it owns it). This leads eventually to
-          TAO_Marshal_Union::deep_free(). The union wants to free
-          its contents, so it goes to its own typecode's
-          private_member_label() to find out which case is active.
-          The private_state member_label_list is not constructed
-          until a member_label is asked for, so one is often constructed
-          at this point. It is an array of Any_ptrs, and each Any
-          is constructed on the heap from an output CDR stream
-          which is formed from a message block read from an input
-          CDR stream formed from the typecode's buffer_. So far so
-          good? The output CDR stream was constructed using the
-          default ORB allocators. Then, when the typecode's destructor
-          is called, it wants to free the member_label_list, which means
-          freeing the Any(s), which means freeing their message blocks,
-          which means freeing their data blocks. But by this time, the
-          ORB has gone away, so the data block(s) are hanging, and we
-          crash. The solution is to construct the output CDR with
-          specified allocators, namely ACE_Allocator::instance (). This
-          class seems to have been designed especially for problems like
-          this, since it hangs around longer than anybody. As far as I
-          can tell, there are no more instances in Typecode where a CDR
-          stream hangs around, so this should be the only place where
-          this fix is needed (but a better one will come along someday).
-          Thanks to Irfan for mucho help with this and to Frank Buschmann
-          <frank.buschmann@mchp.siemens.de> for reporting the problem.
-
-Fri Apr 16 19:02:07 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Fixed a few warnings in g++
-          and also added TAO_McastConfigIf and TAO_Negotiator class declarations.
-
-Fri Apr 16 16:39:22 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Connect: Added a new connection handling strategy that
-          simply blocks in recv() when waiting for a response from the
-          server instead of waiting in the Reactor.  This strategy only
-          works when the application does not have to worry about new
-          requests showing up when waiting for a response. Therefore, this
-          strategy is appropriate only for "pure" clients.
-
-          Note that applications with nested upcalls are not "pure"
-          clients. Also note that this strategy will only effect two way
-          calls, since there is no waiting for one way calls.
-
-          This strategy can also be used in an application that is both a
-          client and a server, if the server side is handled by a separate
-          thread and the client threads are "pure" clients.
-
-          Carlos has promised to add policies that will make the selection
-          of these connection handling policies finer grain than the "all
-          or nothing" selection that currently exists.  The aim would be
-          to allow some clients (maybe invocations) to use one connection
-          handling policy and while others to use other policies.
-
-          If applications can use this strategy, they can improve their
-          performance since the Reactor will not get involved in this code
-          path.
-
-          Descriptive comparison of the different connection handling
-          strategies is available in:
-          http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/Options.html
-
-          Here are some numbers that compare the effect of different
-          policies on the performance of a simple two way call:
-
-          Policy                                            Performance        Speedup percentage
-                                                            (calls/second)     (relative to MT)
-          ------                                            -----------        ----------------
-
-          MT Connection Handler (with a Reactor lock)          4346                 0.0
-          ST Connection Handler (with a Reactor lock)          4416                 1.6
-          ST Connection Handler (without a Reactor lock)       4473                 2.9
-          RW Connection Handler                                4676                 7.6
-
-          The above numbers were obtained from the
-          examples/POA/Generic_Servant/client and
-          examples/POA/Explicit_Activation/server examples (with the other
-          usual optimizations turned on) using the following configuration
-          in loopback mode:
-
-          MSVC 6.0, release mode, NT4.0 SP 3, on a quad CPU Zeon (400 MHz)
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-
-          Added the new RW connection handling option to these tests.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static: Removed
-          this file is it was now identical to the svc.conf file.
-
-Fri Apr 16 17:16:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simulator/{DOVEMIB,Event_Supplier}/Makefile:
-          only build if the orbsvcs library was built with the necessary
-          TAO_ORBSVCS components.  Also, ran make depend on DOVEMIB
-          Makefile.
-
-Fri Apr 16 17:02:43 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/bank
-        * examples/Simple/time
-        Update the README files
-
-Fri Apr 16 15:31:04 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Trader.h :
-          Added TAO_ORBSVCS_Export to TAO_String_Hash_Key as it is used in
-          AVStreams implemtation.
-
-Fri Apr 16 14:49:04 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * tests/InterOp-Naming/Makefile (LDLIBS):
-          Removed the -lorbsvcs.
-
-Fri Apr 16 14:17:08 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-          Added a visit_typedef() method to
-          be_visitor_cdr_op_field_decl, so that we can
-          generate cdr operations for typedef'd members
-          of structs as well as anonymous ones. Previously,
-          cdr operation code for this type of struct member
-          would just be missing. Thanks to Torsten Kuepper
-          <kuepper2@uni-wuppertal.de> for pointing out the
-          problem and suggesting a fix.
-
-Fri Apr 16 13:41:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
-          examples/Simulator/Event_Supplier/Logging_Sup.cpp
-          examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
-          changed a number of instances of ORBSVCS_Time::zero
-          to ORBSVCS_Time::zero ()
-
-Fri Apr 16 09:39:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/NestedUpcall/Triangle_Test/Makefile:
-          removed unnecessary use of orbsvcs include path and library.
-
-        * tests/NestedUpcall/Reactor/Makefile,
-          performance-tests/Demux/Makefile,
-          examples/Callback_Quoter/Makefile,
-          examples/Event_Comm/Makefile:
-          only build if the orbsvcs library was built with the Naming
-          TAO_ORBSVCS component.
-
-        * examples/Quoter/Makefile:
-          only build if the orbsvcs library was built with the Naming
-          and LifeCycle TAO_ORBSVCS components.
-
-Fri Apr 16 09:36:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/default_resource.cpp: removed ACE_*Guard instantiation
-          pragmas.  There were no corresponding template class
-          instantiation directives, and the pragmas duplicated those
-          in ORB_Core.cpp.
-
-Fri Apr 16 08:24:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/MT_Client/Makefile:
-        * tests/MT_Client/orb_creation.cpp:
-          Added new test to check if the simultaneous creation of multiple
-          ORB works and to check for memory leaks in the ORB
-          lifecycle.
-
-        * tests/MT_Client/client.cpp:
-          Minor cosmetic fix.
-
-        * tao/default_resource.cpp:
-          Re-order the destruction of objects in the
-          TAO_App_Allocated_Resources class, otherwise we get seg faults
-          on shutdown. Thanks to Irfan for reporting this problem.
-
-Fri Apr 16 07:25:25 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Dump_Schedule/Makefile,orbsvcs/Event_Service/Makefile,
-          orbsvcs/Scheduling_Service/Makefile,orbsvcs/tests/EC_Basic/Makefile,
-          orbsvcs/tests/EC_Custom_Marshal/Makefile,
-          orbsvcs/tests/EC_Mcast/Makefile,orbsvcs/tests/EC_Multiple/Makefile,
-          orbsvcs/tests/EC_Throughput/Makefile,
-          orbsvcs/tests/Event_Latency/Makefile
-          orbsvcs/tests/Sched/Makefile,orbsvcs/tests/Sched_Conf/Makefile:
-          only build if the orbsvcs library was built with the respective
-          TAO_ORBSVCS component.
-
-Thu Apr 15 16:35:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-        * tao/Environment.cpp:
-          Fixed initialization problem, to query the default environment
-          we don't need the ORB_Core, only its TSS resources, this allow
-          us to use CORBA_init() without the environment argument.
-
-Thu Apr 15 15:58:52 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.h:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
-        * orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp:
-        * orbsvcs/tests/Trading/Offer_Importer.cpp:
-        * orbsvcs/tests/Trading/Offer_Importer.h:
-          Changed the name of the TAO_Policy_Manager class in Trader_Utils
-          to TAO_Policy_Creator, the previous name had conflicts with the
-          new TAO_Policy_Manager in $TAO_ROOT/tao.
-
-        * docs/releasenotes/TODO.html:
-          A small update
-
-Thu Apr 15 15:40:53 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * all orbscvs/tests/AVStreams Makefiles: added BIN2, LIB2,
-          and SHLIB2 support, for make realclean.
-
-        * orbsvcs/tests/AVStreams/server_discovery/Makefile:
-          added Video_Discovery.idl to make realclean target.
-
-Thu Apr 15 13:22:15 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.h:
-        * tao/ORB_Core.h:
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp:
-          Fixed some problems with compilation under NT.
-
-Thu Apr 15 10:44:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-        * tao/TAO_Internal.cpp:
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          Each ORB creates its own ORB_Core.  The ORB_Core is no longer a
-          TSS singleton, instead it keeps some of its resources in TSS
-          storage, but it is a per-ORB resource.
-          TAO_ORB_Core_instance() returns the ORB_Core of the default ORB.
-
-        * tao/default_server.h:
-        * tao/default_server.cpp:
-        * tao/Server_Strategy_Factory.h:
-        * tao/Server_Strategy_Factory.cpp:
-          The open() method receives the ORB_Core as a parameter to avoid
-          recursive calls to TAO_ORB_Core_instance() during startup.
-
-        * tao/default_client.h:
-        * tao/default_client.cpp:
-          Moved the {MT,ST}_Connect_Creation_Strategy classes to this file
-          because here is where they are used, not in the ORB_Core.
-
-        * tao/IIOP_Connector.cpp:
-          Moved template instantiations required on this file from
-          ORB_Core.cpp
-
-        * tao/Servant_Base.cpp:
-        * tao/POAManager.cpp:
-        * tao/Object_Adapter.h:
-        * tao/Object_Adapter.i:
-        * tao/Invocation.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/Connect.cpp:
-          Added some includes because they were removed from ORB_Core.h
-
-        * tao/Connect.h:
-        * tao/params.h:
-        * tao/params.i:
-        * docs/Options.html:
-          Removed deprecated OA options.
-
-        * tao/Resource_Factory.h:
-        * tao/Resource_Factory.cpp:
-        * tao/default_resource.h:
-        * tao/default_resource.i:
-        * tao/default_resource.cpp:
-          Separated the Resource_Factory from the ORB_Core files, also
-          separated the Resource_Factorty from its default implementation,
-          as we do for the client and server strategy factories.
-
-        * tests/MT_Client/client.global.conf:
-        * tests/MT_Client/client.tss.conf:
-        * tests/NestedUpcall/MT_Client_Test/client.conf:
-        * examples/POA/On_Demand_Loading/svc.conf:
-        * examples/Quoter/client.conf:
-        * examples/Quoter/server.conf:
-        * examples/Simulator/DOVEMIB/svc.conf:
-        * examples/Simulator/Event_Supplier/svc.conf:
-        * orbsvcs/tests/AVStreams/benchmark/clnt.conf:
-        * orbsvcs/tests/AVStreams/benchmark/svc.conf:
-        * orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf:
-        * orbsvcs/tests/ImplRepo/implrepo.conf:
-        * orbsvcs/tests/ImplRepo/svc.conf:
-        * orbsvcs/tests/Time/implrepo.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic:
-        * performance-tests/Thruput/TAO/svc.conf:
-          Updated the configuration files, to reflect the new name of the
-          default resource factory.
-
-Wed Apr 14 20:38:51 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/PolicyC.cpp: Added missing template instantiations.  Thanks
-          to Robert V. Head <rhead@virtc.com> for reporting them.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Added missing instantiation
-          for TAO_PropertySet<POA_AVStreams::StreamEndPoint>.
-
-        * tao/Object_Adapter.cpp: Removed trailing semi-colon from #pragma
-          instantiate.
-
-Wed Apr 14 16:43:32 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp:
-          One of the strings removed in ORB_Core::init() was not
-          duplicated first.
-
-Wed Apr 14 15:33:35 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp:
-        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i_T.cpp:
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-          Replaced all uses of TAO_TRY macros with ACE_TRY macros.
-
-Wed Apr 14 15:25:53 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * TAO_IDL/be_visitor_sequnce/gen_object_manager_ch.cpp
-        * TAO_IDL/be_visitor_sequnce/gen_object_manager_ci.cpp
-        Added a new -> operator and also removed a 'const' signature
-        for the .in method in TAO_Object_Manager_{Name}_Sequence classes
-        that are generated by the IDL compiler. This has been in TAO
-        for sometime now..
-        ---------------------------------------------
-        tao/Sequence_T.i (operator->): Added operator-> to
-          TAO_Object_Manager.  Also, made the in() method return a
-          non-const pointer
-        -------------------------------------------
-Wed Apr 14 13:01:13 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Fixed template instantiation
-        errors. Thanks to Andy Gokhale for reporting this.
-
-Wed Apr 14 07:06:11 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-          fixed semicolons at ends of explicit template
-          instantiations.
-
-Wed Apr 14 00:24:42 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object_Adapter.cpp: Added missing template instantiations.
-          Thanks to Robert V. Head <rhead@virtc.com> for reporting them.
-
-Tue Apr 13 17:02:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Stub.cpp:
-          auto_ptr<> requires an explicit constructor, thanks to David and
-          the green hills compiler for detecting this.
-
-Tue Apr 13 13:59:32 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp:
-          Added inlcudes and macros to send output to a file, as
-          the tests in ACE_wrappers/tests do. The macros are
-          commented out, so the cubit tests will work exactly
-          the same as before unless client.cpp and server.cpp are
-          built with those macros uncommented. Especially useful
-          for dealing with timeprobes, where there might be
-          hundreds of entries in the output
-
-Tue Apr 13 12:35:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Connect.h:
-        * tao/Connect.cpp:
-          The MT_Client_Connection handler was using ORB_Core_instance()
-          all over the place. Now it uses the ORB_Core provided in the
-          send_request call.
-          We will need to revisit this class, right now it allocates one
-          condition variable per-connection, but allocating one on a
-          per-thread (many per-thread-per-ORB) basis should be enough.
-          We are also careful to use the ORB_Core's reactor to send the
-          request and to implement the leader-follower model.
-
-        * tao/ORB_Core.cpp:
-          Changed bunch of calls to TAO_ORB_Core_instance() in an ORB_Core
-          method, using <this> is enough in that case.
-
-        * tests/MT_Client/client.cpp:
-        * tests/MT_Client/server.cpp:
-        * tests/MT_Client/test_i.cpp:
-        * tests/MT_Client/server.conf:
-        * tests/MT_Client/client.tss.conf:
-        * tests/MT_Client/client.global.conf:
-        * tests/MT_Client/run_test.pl:
-          Added configuration files for the client, it can use TSS storage
-          now. Also added some (optional) debugging information to monitor
-          the client progress.
-          The script supports this new features too.
-          Simplified the server configuration file.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic:
-          We can use TSS allocators in this examples.
-
-Tue Apr 13 09:52:20 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Concurrency_Service/Makefile,
-          orbsvcs/CosEvent_Service/Makefile,
-          orbsvcs/ImplRepo_Service/Makefile,
-          orbsvcs/Logging_Service/Makefile,
-          orbsvcs/Naming_Service/Makefile,
-          orbsvcs/tests/Concurrency/Makefile,
-          orbsvcs/tests/CosEC_Basic/Makefile,
-          orbsvcs/tests/CosEC_Multiple/Makefile,
-          orbsvcs/tests/ImplRepo/Makefile,
-          orbsvcs/tests/Logger/Makefile,
-          orbsvcs/tests/Simple_Naming/Makefile: added BIN2 support,
-          for make realclean.
-
-Mon Apr 12 22:12:27 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Removed the resolve_commandline_ref (). This was no longer
-        being used. Also passed ACE_TRY_ENV as a parameter to the
-        following functions. Carlos suggested these changes :
-
-        resolve_service ()
-        multicast_to_service ()
-        resolve_trading_service ()
-
-        * tao/ORB.h
-        * tao/ORB.cpp
-
-Mon Apr 12 17:13:37 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Added the AVStreams_i_T.{h,cpp} and
-          CosPropertyService_i_T.{h,cpp} to the project file.
-
-        * orbsvcs/tests/AVStreams/benchmark/AV_benchmark.dsw:
-        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp:
-        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp:
-        * orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp:
-                Added the NT VC++ project files and worspace files.
-
-        * orbsvcs/tests/AVStreams/benchmark/server.cpp:
-        * orbsvcs/tests/AVStreams/benchmark/client.cpp:
-                Fixed the compilation errors on NT.
-                Works fine on Unix platforms.
-        * orbsvcs/tests/AVStreams/benchmark/child_process.cpp:
-          Added the new file which has just the main() for the child
-          process. Thanks to David Hooker <DHooker@uniview.net> for
-          reporting the errors.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i_T.{h,cpp}: Moved the
-        TAO_StreamEndpoint classes from AVStreams_i.{h,cpp} as it was made
-        a template to avoid interface inheritance errors on NT VC++.
-
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i_T.{h,cpp}: Moved the
-        TAO_PropertySet classes from AVStreams_i.{h,cpp} as it was made
-        a template to avoid interface inheritance errors on NT VC++.
-
-        * orbsvcs/orbsvcs/Makefile: Added the new AVStreams_i_T.{h,cpp}
-        and CosPropertyService_i_T.{h,cpp}.
-
-Mon Apr 12 14:24:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.cpp: The resolve_policy_manager() and
-          resolve_policy_current() only worked if TAO_HAS_CORBA_MESSAGING
-          was defined.
-
-        * tao/ORB_Core.cpp:
-        * tao/Stub.cpp: More problems if TAO_HAS_CORBA_MESSAGING is not
-          defined.
-
-Mon Apr 12 14:19:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * LifeCycle_Service/Makefile,tests/Property/Makefile,
-          Trading_Service/Makefile,tests/Trading/Makefile: only build if
-          the orbsvcs library was built with the necessary component.
-
-        * Time_Service/Makefile,tests/Time/Makefile: added BIN2 support,
-          for make realclean.
-
-Mon Apr 12 14:09:06 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp,
-        * tao/Servant_Base.h,
-        * tao/Server_Request.i,
-        * tao/Operation_Table.h,
-        * tao/Servant_Base.cpp,
-        * tao/Server_Request.cpp,
-        * tao/Operation_Table.cpp: Committed again the changes related to
-          Removing strlen calculation for the Operation Name from the
-          critical path. Length as it is obtained during demarshalling is
-          stored in the IIOP_Request object and passed to the Perfect
-          Hash's find operation. ACE_CString is used to store the
-          operation as opposed char *. Thanks to Irfan for suggesting this
-          change.
-
-Mon Apr 12 13:41:23 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Timeprobe.h,
-        * tao/Connect.cpp,
-        * tao/Invocation.cpp:
-          Added four new timeprobes to measure client outgoing process
-          time and server process time. Whereas the pluggable protocols
-          timeprobes were a subset of the regular timeprobes, these are a
-          disjoint set. If both the pluggable and minimal timeprobes
-          macros are uncommented in Timeprobe.h, pluggable will override.
-
-Mon Apr 12 12:37:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Stub.cpp:
-          Added missing template instantiations.
-
-Mon Apr 12 10:38:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/MessagingC.cpp:
-        * tao/PolicyC.cpp:
-          Removed warnings about unused variables, the variables are
-          required for platforms without native C++ exceptions.
-
-        * docs/Options.html:
-          Fixed description of the ORBinputcdrallocator option.
-
-Mon Apr 12 09:52:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-          Keep working on the CORBA Messaging framework.
-
-        * tao/orbconf.h:
-        * tao/ORB.h:
-        * tao/ORB.cpp:
-          Added support for "PolicyCurrent" and "ORBPolicyManager" into
-          resolve_initial_references()
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp:
-          Added methods to set and query the TSS PolicyCurrent and the
-          per-ORB PolicyManager.
-
-        * tao/Object.h:
-        * tao/Object.cpp:
-          Implemented the standard methods to access and query policies,
-          but they just delegate on the TAO_Stub methods.
-
-        * tao/Stub.h:
-        * tao/Stub.cpp:
-          Added methods to set and query the policies.
-
-        * tao/Policy_Manager.h:
-        * tao/Policy_Manager.i:
-        * tao/Policy_Manager.cpp:
-          Simple implementation of the CORBA::PolicyManager and
-          CORBA::PolicyCurrent interfaces. There is a helper class shared
-          between both implementations that is also used by the
-          corresponding methods in CORBA::Object (and TAO_Stub).
-
-        * tao/MessagingC.cpp:
-          Added missing template instantiation
-
-        * tests/Param_Test/Makefile:
-        * examples/Event_Comm/Makefile:
-        * examples/Quoter/Makefile:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile:
-        * performance-tests/Pluggable/Makefile:
-        * performance-tests/Thruput/TAO/Makefile:
-          Removed extra rules to compile .idl files, they were giving me
-          headaches when running parallel compiles.
-
-Mon Apr 12 03:30:18 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp (gen_extraction):
-          modified ACE_static_cast to ACE_dynamic_cast to fix a compile
-          error on SunCC 5.0 when casting to void* from non-void pointer.
-          Thanks to Darren Whobrey <whobrey@fecit.co.uk> for reporting
-          this bug.
-
-Mon Apr 12 00:26:31 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.19 released.
-
-Sun Apr 11 23:55:50 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/driver.cpp
-        * tests/Param_Test/multdim_array.cpp
-        * tests/Param_Test/param_test.idl
-        * tests/Param_Test/param_test_i.cpp
-        * tests/Param_Test/param_test_i.h
-          Temporarily comments out test code for Multi-dimensional arrays
-          due to nasty compile bugs on NT.
-
-Sun Apr 11 19:38:39 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
-        * orbsvcs/orbsvcs/Persistent_Naming_Context.{h, cpp}
-        * orbsvcs/orbsvcs/Persistent_Context_Index_T.cpp
-          Changed the use of the <index> variable name to <context_index>
-          to avoid conflict with the macro of the same name.
-
-Sun Apr 11 18:29:47 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp (TAO_Naming_Client):
-          Fixed the use of ACE_Thread_Mutex to ACE_SYNCH_MUTEX to ensure
-          this will run properly on non-threaded platforms.  Thanks to
-          Alex for reporting this.
-
-Sun Apr 11 15:36:33 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp
-        * examples/POA/DSI/Database_i.h
-          Fixed some warnings on IRIX
-
-Sun Apr 11 11:45:49 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp:
-          Added missing template instantiation.
-
-
-Sat Apr 10 20:55:00 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/multdim_array.cpp:
-        * tests/Param_Test/multdim_array.h
-        * tests/Param_Test/Makefile
-        * tests/Param_Test/driver.cpp
-        * tests/Param_Test/options.cpp
-        * tests/Param_Test/param_test.idl
-        * tests/Param_Test/param_test_i.cpp
-        * tests/Param_Test/param_test_i.h
-        * tests/Param_Test/tests.h: Added a new test case for
-          multi-dimensional array checking.
-
-Sat Apr 10 16:22:59 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * doc/papers/COOTS-99/poa.tex (): Made the Nos. in the table
-          consistent with the figure.
-
-Sat Apr 10 14:26:48 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * tao/POA.cpp: Removed #POA_NO_TIMESTAMP according to Irfan's
-          suggestion to get things to work on Soalris.
-
-Fri Apr  9 22:18:08 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * tao/Servant_Base.h :
-        * tao/Server_Request.i :
-        * tao/Operation_Table.h :
-        * tao/Servant_Base.cpp:
-        * tao/Server_Request.cpp :
-        * tao/Operation_Table.cpp :
-
-        Reverted the earlier changes related to saving strlen calculation
-        on the critical path.
-
-Fri Apr  9 17:49:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Server_Request.h:
-        * tao/Server_Request.i:
-          Removed extra <const> in return type. The return was by-value,
-          no sense in putting const in that case. Further, some compilers
-          bark when you do so.
-
-Fri Apr  9 17:14:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * rules.tao.GNU:
-          Fixed typos in the alternative extensions for generated files.
-
-Fri Apr  9 16:23:47 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/README:
-          Added a short blurb about persistent Naming Service
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp: Removed
-          the use of nested typedefs, as this was breaking old g++
-          compiler.  Surrounded Debug statements by <if>.  Added a return
-          statement to avoid warnings.
-
-        * orbsvcs/Naming_Service/README: Added description of persistence
-          command-line option.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.{h,cpp}: Changed the order
-          of arguments in <init> method and constructor, to avoid breaking
-          old code with the addition of the new parameter.
-
-Fri Apr 09 16:19:12 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp (create_object_key and parse_key): We must include
-          the persistent bit even when the POA_NO_TIMESTAMP is defined.
-          Otherwise, we won't know which POA map to search. Thanks to Russ
-          Noseworthy for reporting this.
-
-Fri Apr  9 15:20:10 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp (visit_interface):
-        * tao/Servant_Base.h (TAO_ServantBase):
-        * tao/Server_Request.i (operation):
-        * tao/Operation_Table.h (TAO_Operation_Table):
-        * tao/Servant_Base.cpp:
-        * tao/Server_Request.cpp (retval_):
-        * tao/Operation_Table.cpp (TAO_Dynamic_Hash_OpTable): Removed
-          strlen calculation for the Operation Name from the critical
-          path. Length as it is obtained during demarshalling is stored in
-          the IIOP_Request object and passed to the Perfect Hash's find
-          operation.
-
-Fri Apr 09 12:52:24 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (_is_a): Removed
-          ACE_UNUSED_ARG(named_value_1) since named_value_1 was removed.
-
-Fri Apr  9 14:29:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.{h,cpp}: Changed the argument of the static dump()
-          function from const value to const reference. Thanks to Ulf
-          Jaehrig <jaehrig@desys.com> for suggesting this.
-
-Fri Apr  9 13:28:06 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        Added the following .xls files :
-
-        * TAO/performance-tests/Demux/operation_demux2d.xls
-        * TAO/performance-tests/Demux/operation_demux3d.xls
-        * TAO/performance-tests/Demux/servant_dispatch2d.xls
-        * TAO/performance-tests/Demux/servant_dispatch3d.xls
-        * TAO/performance-tests/Demux/poa_lookup2d.xls
-        * TAO/performance-tests/Demux/poa_lookup3d.xls
-
-        Updated the following .dsp files to incorporate the recent file
-        name changes for Time service server and clerk.
-
-        * Time_Service_{Server,Clerk}.dsp
-
-Fri Apr  9 11:30:37 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/default_server.cpp:
-        * tao/default_client.cpp:
-        * tao/ORB_Core.cpp: Removed ACE_STATIC_SVC_REQUIRE.
-
-        * tao/TAO_Internal.cpp (open_services): Added in TAO's default
-          static services here.
-
-Fri Apr 09 08:19:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * Logging_Service/Makefile,Naming_Service/Makefile,
-          tests/Logger/Makefile,tests/Simple_Naming/Makefile:
-          only build if the orbsvcs library was built with the
-          necessary component.
-
-Fri Apr 09 01:51:52 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/PolicyC.i (_duplicate and _nil): Non-inlined these to remove
-          "used before defined" warning.
-
-        * tao/Object_Adapter.i (lock and find_persistent_poa): Rearranged
-          to remove "used before defined" warning.
-
-Fri Apr  9 00:49:35 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/On_Demand_Activation/server.cpp (main),
-        * examples/POA/On_Demand_Activation/Servant_Activator.cpp,
-        * examples/POA/On_Demand_Activation/Servant_Locator.cpp: Made some
-          cosmetic changes.  Basically changed some ACE_TRY macros
-
-Fri Apr  9 00:04:45 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp:
-        * orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp:
-          added trailing ";" to ACE_DECLARE_NEW_CORBA_ENV
-
-Thu Apr  8 23:12:18 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.h (TAO_Naming_Server): Added
-          a default value of 0 to the persistence_location so that the
-          code will build again...
-
-        * tao/ORB.cpp: Rewrote the multicast_query() method to test a
-          theory about what might be causing the problem on NT.  Thanks to
-          Margaret Reitz <margaret@veritas.com> for motivating this.
-
-Thu Apr 08 18:45:56 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (root_poa_reference): Had to non-inline this
-          function because of reference to the TAO_POA class.
-
-        * tao/POA:
-        * tao/POAManager:
-
-          Changed a bunch of functions to be non-virtual.
-
-        * tao/Active_Object_Map.cpp:
-        * tao/Object_Adapter.cpp:
-
-          Inlined a bunch of functions.
-
-        * tao/Object_Adapter: Moved the timeprobes from the POA to this
-          class.
-
-Thu Apr 08 20:36:39 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO[_Static].dsp:
-        * orbsvcs/orbsvcs/orbsvcs[_static].dsp: Reworked.
-
-Thu Apr  8 15:30:55 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated to reflect the
-          availability of the Persistent Naming Service.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp: Added a missing coma
-          after macro.
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.{h, cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.{h, cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h, cpp}: Fixed
-          various compiler warnings/errors, e.g., order of member
-          initialization, explicit template instantiation, qualifying
-          types with class names, etc.
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.{h, cpp}:
-          Added the files to separate template code from non-template code
-          in Persistent_Context_Index.{h,cpp}.
-
-        * orbsvcs/orbsvcs/Naming/Shared_Hash_Map.{h, cpp}: Changed the
-          name to Shared_Hash_Map_T.{h, cpp}.
-
-Thu Apr 08 14:48:15 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic,
-          performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static: Added
-          -ORBallowreactivationofsystemids 0.
-
-Thu Apr 08 14:31:19 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf: Added
-          -ORBallowreactivationofsystemids 0 to the svc.conf files since
-          no reactivation of servants was taking place.
-
-Thu Apr  8 14:17:31 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/sfp/sfp_client.dsp:
-        * orbsvcs/tests/AVStreams/sfp/sfp_server.dsp:
-        * orbsvcs/tests/AVStreams/sfp/sfp_tests.dsw: Added these project/
-          worspace files for VC++.
-
-        * orbsvcs/tests/AVStreams/sfp/server.cpp:
-        * orbsvcs/tests/AVStreams/sfp/client.cpp: Added a ORB shutdown so
-          that the tests terminate when the SFP stream terminates.
-
-        * orbsvcs/tests/AVStreams/sfp/common.h: Added a #include
-          "orbsvcs_export.h" for VC++.
-
-        * orbsvcs/orbsvcs/AV/sfp.{h,cpp}: Changed the DUMP_BUF macro to a
-          function. Fixed the signed/unsigned warnings on NT.Fixed a
-          missing return 0 so that the tests work on NT.
-
-Thu Apr  8 13:49:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Active_Object_Map.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: Added missing
-          template instantiations. Thanks to Dave Meyer <dmeyer@saic.com>
-          for this one.
-
-        * rules.tao.GNU:
-        * orbsvcs/orbsvcs/Makefile: Fixed some dependencies and rules
-          problems with the IDL generated files, now we can do "make -j 4"
-          in orbsvcs (and apparently all the TAO directories)
-
-Thu Apr 08 14:05:28 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * CosEvent_Service/Makefile,tests/CosEC_Basic/Makefile,
-          tests/CosEC_Multiple/Makefile: only build if the orbsvcs library
-          was built with the CosEvent TAO_ORBSVCS component.
-
-Thu Apr 08 13:47:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * BUG-REPORT-FORM,PROBLEM-REPORT-FORM,
-          README,VERSION,Makefile,Makefile.am: moved BUG-REPORT-FORM to
-          PROBLEM-REPORT-FORM.  Thanks to Thomas Lockhart
-          <Thomas.G.Lockhart@jpl.nasa.gov> for suggesting this.
-
-Thu Apr  8 12:59:21 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * tao/orbconf.h (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT): Changed
-          the value from 1 to 4 to prevent premature timeouts.  Thanks to
-          Margaret Reitz <margaret@veritas.com> for motivating this.
-
-          Also removed the #ifdef for TAO_DEFAULT_MULTICAST_SEND_ATTEMPTS
-          since this is obsolete now.
-
-Thu Apr  8 11:40:59 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * orbsvcs/orbsvcs/Naming_Service/Persistent_Context_Index.cpp:
-          Missing implementation of the virtual destructor for TAO_Index
-          added.
-
-Wed Apr  7 20:28:03 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp:  Added trailing
-          semi-columns after ACE_DECLARE_NEW_CORBA_ENV.
-
-Wed Apr  7 19:34:44 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/{server, client}.dsp:Made the release
-          versions.
-
-Wed Apr  7 18:49:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Typecode_Constants.cpp: Added missing _tc_ static in the
-          CORBA module.
-
-        * tao/Object_Adapter.cpp: Removed duplicate template
-          instantiations.
-
-        * tao/MessagingS_T.i: Commented out code for CORBA::Poller and
-          friends.
-
-        * tao/MessagingC.cpp: Removed unwanted template instantiations.
-
-Wed Apr  7 17:31:40 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/sfp.{h,cpp}: Replaced CDR with ACE_CDR.  Also
-          moved the FRAGMENT_SET_ITERATOR typedef outside the
-          TAO_SFP_Fragment_Table_Entry.  Thanks to David Hooker
-          <DHooker@uniview.net> for reporting this.
-
-Wed Apr  7 16:36:26 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * TAO-INSTALL.html: Added a note about rebuilding all when
-          upgrading releases.
-
-Wed Apr  7 16:32:05 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/include/ast_expression.h: A quick fix for the DEC bug
-          report by Rod Joseph <rodjoseph@adt.com> and Hoggard
-          <hoggard@cfx.com>. More extensive changes are in progress. This
-          fix just removes the declaration and definition of
-          AST_Expression constructors taking ACE_CDR::LongLong and
-          ACE_CDR::ULongLong args.
-
-Wed Apr  7 16:25:49 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Renamed references to CosTimeBase
-          to TimeBase.
-
-        * tao/GIOP.cpp: Removed what looked to be a rogue "o".
-
-Wed Apr  7 15:52:06 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * Makefile.am: Added `clean-local' targets to all Makefile.am
-          files.  Minor updates to the top-level TAO Makefile.am.
-
-Wed Apr 07 15:17:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/POA_CORBA.h:
-        * tao/Typecode_Constants.cpp: Fixed problems with the
-          (unimplemented) CORBA::Poller and friends. Thanks to Darrell for
-          pointing this out.
-
-Wed Apr  7 15:13:23 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * configure.in:
-        * tao-config.1.in:
-        * tao-config.in:
-        * taoConf.sh.in:
-        * Makefile.am:
-        * TAO_IDL/ast/Makefile.am:
-        * TAO_IDL/be/Makefile.am:
-        * TAO_IDL/be_include/Makefile.am:
-        * TAO_IDL/driver/Makefile.am:
-        * TAO_IDL/fe/Makefile.am:
-        * TAO_IDL/include/Makefile.am:
-        * TAO_IDL/narrow/Makefile.am:
-        * TAO_IDL/util/Makefile.am:
-        * TAO_IDL/Makefile.am:
-        * orbsvcs/Concurrency_Service/Makefile.am:
-        * orbsvcs/CosEvent_Service/Makefile.am:
-        * orbsvcs/Dump_Schedule/Makefile.am:
-        * orbsvcs/Event_Service/Makefile.am:
-        * orbsvcs/ImplRepo_Service/Makefile.am:
-        * orbsvcs/LifeCycle_Service/Makefile.am:
-        * orbsvcs/Logging_Service/Makefile.am:
-        * orbsvcs/Naming_Service/Makefile.am:
-        * orbsvcs/Scheduling_Service/Makefile.am:
-        * orbsvcs/Time_Service/Makefile.am:
-        * orbsvcs/Trading_Service/Makefile.am:
-        * orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/AV/Makefile.am:
-        * orbsvcs/orbsvcs/Concurrency/Makefile.am:
-        * orbsvcs/orbsvcs/CosEvent/Makefile.am:
-        * orbsvcs/orbsvcs/Event/Makefile.am:
-        * orbsvcs/orbsvcs/Makefile.am:
-        * orbsvcs/orbsvcs/Log/Makefile.am:
-        * orbsvcs/orbsvcs/Naming/Makefile.am:
-        * orbsvcs/orbsvcs/Property/Makefile.am:
-        * orbsvcs/orbsvcs/Sched/Makefile.am:
-        * orbsvcs/orbsvcs/Time/Makefile.am:
-        * orbsvcs/orbsvcs/Trader/Makefile.am:
-        * orbsvcs/tests/AVStreams/benchmark/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/source/Makefile.am:
-        * orbsvcs/tests/AVStreams/mpeg/Makefile.am:
-        * orbsvcs/tests/AVStreams/server_discovery/Makefile.am:
-        * orbsvcs/tests/AVStreams/sfp/Makefile.am:
-        * orbsvcs/tests/AVStreams/Makefile.am:
-        * orbsvcs/tests/Makefile.am:
-        * tao/Makefile.am:
-          Checked these files into the CVS repository.  These files are
-          part of the TAO+auto{conf,make}/libtool integration work.  There
-          are still some missing files and some of the above files need to
-          be modified before they will work.  I just wanted to get these
-          files under CVS control so that I can easily recover from a
-          mishap or for some reason beyond my control.
-
-Wed Apr 07 14:34:31 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (_is_a): Removed unused
-          variable.
-
-        * examples/POA/Loader/Servant_Activator.cpp (ServantActivator_i):
-        * examples/POA/Loader/Servant_Locator.cpp (ServantLocator_i):
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp
-          (obtain_servant): Should use a simple cast for casting functions
-          and not reinterpret_cast.
-
-        * examples/POA/On_Demand_Loading/Servant_Manager.cpp
-          (parse_string): Fixed comparison between signed and unsigned;
-          <index> should be signed.
-
-Wed Apr  7 14:05:09 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Hash_Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Naming_Context.{h, cpp}
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.{h,cpp}
-          Updated to use new exceptions macros.
-
-        * orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Entries.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Shared_Hash_Map.{h,cpp}
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.{h,cpp}
-        * orbsvcs/Naming_Service/Naming_Service.{h,cpp}
-        * orbsvcs/orbsvcs/Makefile: Added the files above, to implement
-          persistent naming service.  The first version of persistent
-          naming service is available.  It uses memory-mapped file to
-          store the persistent state of the naming service.  When starting
-          the Naming Service from orbsvcs/Naming_Service, if -f
-          <file_name> option is provided, the persistent implementation is
-          used, if no -f option is provided, an non-persistent
-          implementation is used.
-
-          We'll be adding comments/documentation for the above shortly.
-          The class structure for the persistent implementation will also
-          change in the near future, as I'll be merging some of
-          persistent/non-persistent classes.
-
-Wed Apr 07 14:11:19 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/PolicyS.cpp: Need to use ACE_CORBA_1 to specify
-          PolicyManager and PolicyCurrent in constructors.
-
-Wed Apr  7 13:42:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (_is_a): Added a ACE_UNSED_ARG
-          to avoid warnings..
-
-Wed Apr 07 13:27:00 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POAS.h:
-        * tao/POAC.h: Removed unnecessary TAO_EXPORT_MACRO redefinition.
-          Made sure warning 4250 is reenabled at the end of header files.
-
-        * tao/POA_CORBA.h: Disabled warnings 4250 on NT.
-
-Wed Apr  7 12:54:49 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.{h,cpp}: Updated the files to
-          use the new exceptions macros.
-
-Wed Apr  7 12:40:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/PolicyC.cpp: Fixed syntax error, Sun/CC is *way* too lax.
-
-        * tao/POA.cpp: Fixed duplicate template instantiations.
-
-Wed Apr  7 12:03:33 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/Exception.h:
-        * tao/Exception.cpp:
-        * tao/Current.pidl:
-        * tao/DynAnyC.cpp:
-        * tao/DynAnyS.cpp:
-        * tao/IOP.pidl:
-        * tao/iopfwd.h:
-        * tao/corbafwd.h:
-        * tao/POA_CORBA.h:
-        * tao/Typecode_Constants.cpp:
-        * tao/InconsistentTypeCodeC.cpp:
-        * tao/Messaging.pidl:
-        * tao/MessagingC.cpp:
-        * tao/MessagingC.h:
-        * tao/MessagingC.i:
-        * tao/MessagingS.cpp:
-        * tao/MessagingS.h:
-        * tao/MessagingS.i:
-        * tao/MessagingS_T.cpp:
-        * tao/MessagingS_T.h:
-        * tao/MessagingS_T.i:
-        * tao/Policy.pidl:
-        * tao/PolicyC.cpp:
-        * tao/PolicyC.h:
-        * tao/PolicyC.i:
-        * tao/PolicyS.cpp:
-        * tao/Pollable.pidl:
-        * tao/PollableC.cpp:
-        * tao/PollableC.h:
-        * tao/PollableC.i:
-        * tao/PollableS.cpp:
-        * tao/PollableS.h:
-        * tao/PollableS.i:
-        * tao/PollableS_T.cpp:
-        * tao/PollableS_T.h:
-        * tao/PollableS_T.i:
-        * tao/TimeBase.pidl:
-        * tao/TimeBaseC.cpp:
-        * tao/TimeBaseC.h:
-        * tao/TimeBaseC.i:
-        * tao/TimeBaseS.cpp:
-        * tao/TimeBaseS.h:
-        * tao/TimeBaseS.i:
-        * tao/TimeBaseS_T.cpp:
-        * tao/TimeBaseS_T.h:
-        * tao/TimeBaseS_T.i: Started work on the Messaging spec policy
-          framework. I added new modules (such as Messaging, TimeBase and
-          IOP) and extended others to include more features (such as
-          Policy).  Right now the modules are not compiled by default, I
-          want to test the changes in more platforms before moving on.
-          Also added support for more system exceptions and left some
-          place holders for the Poller and Handler objects that are part
-          of the AMI support.
-
-        * TAO_IDL/fe/fe_lookup.cpp:
-        * TAO_IDL/fe/keywords.dat: Added support for the "export" C++
-          keyword.
-
-        * TAO_IDL/util/utl_global.cpp: Added support for files with .IDL,
-          .pidl and .PIDL extensions.
-
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp: Any helper
-          classes for the fields of an exception must be generated
-          *before* the code for the ctor, because the ctor uses them.
-
-        * orbsvcs/orbsvcs/CosTimeBase.idl:
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/RtecEventComm.idl:
-        * orbsvcs/orbsvcs/RtecScheduler.idl:
-        * orbsvcs/orbsvcs/TimeBase.idl:
-        * orbsvcs/orbsvcs/TimeService.idl:
-        * orbsvcs/orbsvcs/Time_Utilities.h:
-        * orbsvcs/orbsvcs/Sched/DynSched.cpp:
-        * orbsvcs/orbsvcs/Sched/SchedEntry.cpp:
-        * orbsvcs/orbsvcs/Sched/SchedEntry.i: Removed all references to
-          CosTimeBase.idl, the standard file name is TimeBase.idl, I also
-          changed things so the code is actually defined in
-          $TAO_ROOT/tao/TimeBase.pidl because the ORB needs those types.
-          Many dependencies where updated to match this.
-
-        * orbsvcs/tests/Trading/Offer_Exporter.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h:
-        * orbsvcs/orbsvcs/Trader/Offer_Database.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
-        * orbsvcs/LifeCycle_Service/Factory_Trader.cpp:
-        * orbsvcs/LifeCycle_Service/Factory_Trader.h:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp: Changed all
-          the calls to export() into _cxx_export() the people responsible
-          for this code should revise my changes.
-
-        * orbsvcs/tests/EC_Throughput/Makefile: Added some missing files
-          to the SRC variable, the dependencies were incomplete.
-
-Wed Apr  7 11:27:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/ast/ast_expression.cpp: Fixed the problems with LL_MAX
-          and friends, use the ACE_*_MAX constants instead.
-
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: T::_narrow()
-          can use T::_unchecked_narrow() to complete its job.
-
-        * TAO_IDL/be/be_interface.cpp: The generated operation table is
-          static to avoid namespace pollution.
-
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: The generated
-          code is more readable now.  The code for the collocated class
-          and the skeleton where mixed and thus harder to read.
-
-Wed Apr 07 10:11:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbscvs/Concurrency_Service/Makefile,
-          orbscvs/tests/Concurrency/Makefile, only build if the orbsvcs
-          library was built with the Concurrency TAO_ORBSVCS component.
-
-        * orbscvs/tests/AVStreams/sfp/Makefile: only build if the orbsvcs
-          library was built with the AV TAO_ORBSVCS component.  And,
-          commented out (and replaced /bin/rm with $(RM)) unused realclean
-          target.
-
-Wed Apr 07 02:50:08 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.18 released.
-
-Wed Apr 07 01:02:31 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp (parse_key and create_object_key): Improved the
-          parsing of object keys belonging to the RootPOA.  Since this is
-          the default POA and is commonly used, we have given it a
-          reserved byte in the object key in order to quickly identify
-          it. With the reserved bit, the active demux key for the RootPOA
-          is not used, and no map lookups are required.
-
-        * orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
-          (ServiceTypeRepository): Used Service_Type_Map_Iterator instead
-          of Service_Type_Map::iterator.  Stupid g++ could not gork it.
-
-        * tao/default_server.cpp (parse_args): Removed parsing for
-          POAManager lock since it is no longer supported.
-
-        * tao/Object_Adapter.cpp: Added missing template instantiations
-          for ACE_Hash_Map_Manager_Ex_Adapter and ACE_Map_Manager_Adapter.
-          Thanks to Carlos for pointing this out.
-
-        * tao/POA.cpp (create_object_key and parse_key): Fixed the use of
-          ACE_NTOHL and ACE_HTONL.  Thanks to David for helping here.
-
-        * tao/POA (Current): The object id information in the POA Current
-          was broken since it kept the system id instead of the user
-          id. The fix was to modify the Active_Object_Map to always
-          recover the user id. Thanks to Steve Totten
-          <totten_s@ociweb.com> for pointing this out.
-
-Wed Apr  7 01:10:55 1999  Darrell Brunsch  <brunsch@cs.wustl.edu
-
-        * examples/Quoter/Makefile: Now cleans up all IDL generated files
-          with realclean.
-
-Tue Apr  6 19:52:55 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/PropertyTest.dsw:
-        * orbsvcs/tests/Property/server.dsp:
-        * orbsvcs/tests/Property/client.dsp:
-        * orbsvcs/tests/Property/README: Tested on WIN NT.
-
-Tue Apr  6 18:20:48 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * tao/ORB.cpp (multicast_query ()): Used ACE_HTONS for the sent
-          data length (CORBA::Short).
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input()): Used
-          ACE_NTOHS on the received CORBA::Short.
-
-Tue Apr  6 17:55:48 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/NewPOA/NewPOA.cpp (main):
-        * examples/POA/Loader/server.cpp:
-        * examples/POA/Identity/Identity.cpp:
-        * examples/POA/Generic_Servant/client.cpp: Changed ACE_TRY_NEW_ENV
-          as ACE_TRY with appropriate declaration
-
-Tue Apr 06 16:29:58 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.cpp (ORB_init): Some how, calling to init_orb_globals()
-          got moved before ORB Core initialization.  This must come AFTER
-          the initialization of ORB Core.  Otherwise, all hell breaks
-          loose.
-
-Tue Apr  6 16:29:55 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/echo/Echo_i.cpp (echo_string):
-        * examples/Simple/echo/Echo_Client_i.cpp
-        * examples/Simple/echo/server.cpp: Made some changes to the
-          ACE_TRY macros
-
-Tue Apr  6 15:44:52 1999  Vishal Kachroo  <vishal@cs.wustl.edu>
-
-        * Changed the Names of the following files:
-          orbsvcs/Time_Service/server.cpp -> Time_Service_Server.cpp:
-          orbsvcs/Time_Service/clerk.cpp  -> Time_Service_Clerk.cpp:
-
-        * orbsvcs/Time_Service/Makefile: Changed the Makefile to reflect
-          the above changes.
-
-Tue Apr 06 15:33:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * all orbscvs/tests/AVStreams Makefiles: only build if the orbsvcs
-          library was built with the AV TAO_ORBSVCS component.
-
-Tue Apr 06 05:04:51 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp: Phase two of the new POA design is complete.
-
-          - We now have support for active demuxing of POAs. For transient
-            POAs, we directly use an active demuxing key in the object key
-            since transient POAs cannot be reactivated.  For persistent
-            POAs, we have added a active demux hint field in the object
-            key.  This hint is in addition to the persistent POA name.
-
-          - Transient POAs identifiers in the object key are of fixed
-            size. For persistent POAs, the object key contains a number
-            that specifies how long the POA name is.  This feature speeds
-            up things since there is no need for sequential, byte by byte
-            searching for field separators.
-
-          - The use of the active demux hint for the POA name in the
-            object key is optional.  If used, the lookups are faster
-            (unless the hint is invalidated by a deactivation or by
-            restarting a persistent POA).  However, using the hint results
-            in a larger IOR, and more memory being used in the active
-            object map.  This option can be controlled through the
-            -ORBactivehintinpoanames runtime switch and is turned on by
-            default.
-
-          - The POA related classes have been rewritten with respect to
-            exceptions.  Memory management in case of exceptions from
-            servants and in case of dynamic memory / constructor failures
-            have been greatly improved through the use of auto pointers
-            and the new ACE_NEW_THROW_EX macro.  One of the problems
-            related to exceptions was that the POA Current was not reset
-            properly.  This has also been fixed.
-
-          - New file Object_Adapter contains an abstraction for all the
-            POAs in the ORB.  This class is used to hold the Object
-            Adapter lock and the tables for the POAs in the ORB.  The
-            point of contact for dispatching requests and finding servants
-            has changed from the RootPOA to the Object Adapter.  The file
-            also contains classes to iterate through a folded POA name.
-
-          - New file Key_Adapters contains the common classes used by the
-            Object_Adapter class and the Active_Object_Map class.  These
-            common classes are usually used for similar maps such as the
-            ACE_Active_Map_Manager_Adapter and
-            ACE_Hash_Map_Manager_Ex_Adapter.
-
-          - POA name separator was changed from '/' to '\0'.  Since POA
-            names are strings, this makes a better choice since there is
-            no chance of a conflict with the string specified by the
-            user.
-
-          - The POA name separator change also led to the removal of the
-            TAO specific extension which allowed users to specify a nested
-            POA name in find_POA() and create_POA().  The
-            Explicit_Activation, FindPOA, and NewPOA examples were changed
-            not to use the above TAO extention.
-
-          - Fixed RootPOA example to remove extra exception code left
-            there by Bala.
-
-          - Collocation table now maps addresses to Object Adapters
-            instead to the Root POAs.
-
-          - POA objects and POA Manager objects now contain a reference to
-            lock rather than a lock instance.  The lock comes from the
-            Object Adapter.  This change was made to centralize the
-            locking and reduce the number of locks grabbed during request
-            dispatching.
-
-          - Added ids for POA policies.
-
-        * tao/Active_Object_Map.cpp:
-
-          - Fixed the calculation of <system_id_size>.
-
-          - Removed a memory leak by iterating over the entries left in
-            the user id map and deleting the dynamically allocated
-            <Map_Entry>s.
-
-          - Made sure that the user can specify the map sizes if desired.
-
-        * tao/Connect.cpp (handle_message): Reduced the number of calls
-          made to access the object_key and its buffer.
-
-        * tao/Object_KeyC.h: Added operator!= for Object Keys.
-
-        * tao/poa_macros.h (TAO_POA_GUARD_RETURN and TAO_POA_GUARD): Added
-          new macros.
-
-        * examples/POA/Adapter_Activator/: Added new example to test the
-          dynamic creation of POAs when dispatching requests.  The
-          original POAs are deleted once the object references have been
-          created. After this, an adapter activator is install in the
-          RootPOA to reactivate the POAs on demand.
-
-Tue Apr  6 02:40:31 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * examples/Simple/Simple_util.cpp (init): We have to make sure we
-          don't try to proceed if querying of naming service failed.
-          Thanks to David Hauck <davidh@realtimeint.com> for reporting the
-          bug.
-
-Tue Apr 06 00:12:11 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (_is_a): Added back the code
-          that Bala had commented out.  I am not sure why Bala had
-          commented this out, but without this code, the application does
-          not work.
-
-Mon Apr  5 21:34:05 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/include/ast_expression.h:
-        * TAO_IDL/ast/ast_expression.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/be/be_expression.cpp:
-        * TAO_IDL/be/be_sunsoft.cpp:
-        * TAO_IDL/util/utl_global.cpp: We can now define constants (in
-          .idl files) of type long long, unsigned long long and
-          wchar. This has been made easier by the fact that the CORBA
-          basic types are now defined in ACE. Still need more ACE/TAO
-          support in order to do long double and wide strings, though. All
-          the above builds cleanly on NT, sunc++, g++ and egcs.  A few
-          simple examples work on NT - more testing to come.
-
-Mon Apr  5 16:26:32 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input): Fixed the
-          handle_input () that handles the multicast to work for both
-          Naming and Trading Service. Thanks to James CE Johnson
-          <jcej@tragus.org> for reporting this.
-
-Mon Apr 05 09:59:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile,docs/configurations.html: removed enabling of
-          fakesvcconf with static libraries, so that we can use
-          -ORBsvcconf with them.
-
-        * tao/POA.cpp (create_object_key): don't declare local
-          creation_time_length with POA_NO_TIMESTAMP, to avoid compiler
-          warning.  Also, replaced two occurrences of
-          TAO_Creation_Time::creation_time_length () with
-          creation_time_length, to save the function call.
-
-Mon Apr  5 02:06:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * performance-tests/Thruput/TAO/svc.conf:
-        * orbsvcs/tests/ImplRepo/svc.conf:
-        * orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf:
-        * examples/Simulator/Event_Supplier/svc.conf:
-        * examples/POA/On_Demand_Loading/svc.conf:
-        * examples/Simulator/DOVEMIB/svc.conf:
-        * tests/Param_Test/svc.conf:
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf: Some of the
-          services didn't get changed to be static.
-
-Sun Apr 04 22:33:23 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static: updated
-          comments to show -ORBsvcconf svc.conf.static option.
-
-Sun Apr  4 14:15:12 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/tao_idl.cpp: Removed an extra semicolon from a chain of
-          << stream insertions.
-
-Sun Apr  4 04:50:00 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/be/be_init.cpp:
-        * TAO_IDL/tao_idl.cpp:
-        * TAO_IDL/Makefile: Moved the IDL_CFE_VERSION macro definition
-          from Makefile to tao_idl.cpp.  It doesn't get changed anyway.
-          Changed the version information generated by "tao_idl -V" to
-          something more helpful.  This is what it looks like now:
-
-          tao_idl
-          FE: Base on Sun IDL CFE version 1.3.0
-          TAO C++ BE, Version 0.3.17
-
-        * examples/POA/Forwarding/run_test.pl: Changed to use
-          ACE::waitforfile to ensure proper startup of servers and the
-          client.  Also made sure the temporary ior files get removed
-          after each test cycle so ACE::waitforfile works properly.
-
-        * examples/POA/Forwarding/MyFooServant.cpp (forward): The prefix
-          for I/R id has changed from 'IDL:' to 'IDL:omg.org/'.
-
-        * tao/Forwarding_Servant.cpp (invoke): We do own the exception in
-          Any.
-
-Sun Apr  4 01:59:48 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/sfp/client.cpp:
-        * orbsvcs/tests/AVStreams/sfp/server.cpp: Added code to test the
-          fragmentation/reassembly features using a -f option.
-
-        * orbsvcs/orbsvcs/AV/sfp.h: Defined new classes for sfp
-          fragmentation and reassembly.
-
-        * orbsvcs/orbsvcs/AV/sfp.cpp: Removed the unnecessary connect on
-          the ACE_SOCK_Dgram which prevented the code from working on
-          Windows because calling sendto on a connected socket is wrong.
-          Thanks to David Hooker <DHooker@uniview.net> for reporting this.
-
-          Added code to do reassembly of fragmented SFP packets. The code
-          is now cleaner as it uses the interpretive marshalling to
-          marshal/demarshal sfp headers.
-
-Sun Apr  4 00:33:20 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/Forwarding/client.cpp (do_calls):
-        * examples/POA/Forwarding/Servant_Locator.cpp:
-        * examples/POA/Forwarding/MyFooServant.cpp: Made some aesthetic
-          changes and the way exception is thrown.
-
-Sat Apr  3 23:55:32 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/DSI/Database_i.cpp (destroy_entry): Made some
-          changes to the way exceptions are thrown
-
-Fri Apr 02 23:25:47 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Version.h: added.
-
-Fri Apr 02 15:42:34 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf{,.static}: updated
-          ORB configuration to correspond to that of IDL_Cubit, except to
-          use -ORBresources tss.  Thanks to Irfan for providing the
-          configuration parameters.
-
-Fri Apr  2 13:25:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/POA/Default_Servant/File_i.cpp: Fixed some more
-          warnings.
-
-Fri Apr  2 12:33:45 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/Default_Servant/File_i.cpp: Fixed error in IRIX
-
-Thu Apr 01 22:52:00 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.17 released.
-
-Thu Apr  1 21:41:01 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * $TAO_ROOT/examples/POA/FindPOA/FindPOA.cpp: Made some cosmetic
-          changes
-
-Thu Apr  1 13:47:56 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * tao/Connect.cpp (handle_message): Changed a c-style cast to
-          ACE_reinterpret_cast ().
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input): Fixed a
-          warning for g++.
-
-Thu Apr  1 12:17:14 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp: Moved
-          _duplicate() to the .cpp file again, this eliminates a pesky
-          warning from the broken g++ 2.7.X compilers.
-
-Thu Apr 01 03:26:30 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO/tao/ORB_Core.{h,cpp}:
-        * TAO/tao/TAO_Internal.{h,i,cpp}:
-        * TAO/tao/default_client.{h,cpp}:
-        * TAO/tao/default_server.{h,cpp}: TAO is now build with static
-          services enabled.  You can use TAO components as either static
-          or dynamic services (wrt. Service Configurator.)  There are many
-          ways to set up the svc.conf entries.  All these are documented
-          in
-
-            http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/configurations.html#programming
-
-        * Changed all svc.conf file to use TAO components as static
-          services.  A perl script call tao_svcconf.pl under
-          $ACE_ROOT/bin/ can help you convert svc.conf files.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic: Renamed
-          svc.conf.static to svc.conf.dynamic as a sample svc.conf file
-          that uses dynamic services.
-
-Wed Mar 31 23:32:13 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Purified the INS changes in the following files. Also minimized
-        data copying.
-
-        * tao/IOR_LookupTable.cpp:
-        * tao/IOR_LookupTable.h: Passed params by reference for the add ()
-          and find ().
-        * tao/Connect.cpp: Removed data copying.
-        * tao/ORB_Core.cpp: Changed the add_to_ior_table () to fix some memory
-          leaks.
-        * tao/ORB.cpp: Fixed memory leaks in resolve_initial_references ()
-          and iioploc_string_to_object (). Changed the add/find IOR APIs
-          to take params by reference for minimal copying.
-        * tao/ORB.h: Changed the signatures of the add/find IOR APIs.
-
-Wed Mar 31 14:09:51 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/Explicit_Activation/server.cpp: Made some cosmetic
-          changes to the ACETRY macros defined inside.
-
-Wed Mar 31 09:02:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.i:
-        * tao/ORB_Core.cpp: Moved the output CDR allocators from the
-          ORB_Core into the resource factory.  Even though this resources
-          can always be TSS the ORB_Core is not used is a single thread
-          anymore.  Changes similar to this may be required as the
-          ORB-thread relationship is decoupled.
-
-Wed Mar 31 06:58:28 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB.cpp (multicast_to_service): Fixed a couple mistakes in
-          this function that were causing it to fail on errors.  Thanks to
-          Mike Mazurek <mmazurek@std.saic.com> for reporting this.
-
-Wed Mar 31 03:24:35 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POAS.{h,cpp}:
-        * tao/POAC.{h,i,cpp}: Brought these files in-synch with TAO_IDL
-          generated files.  Major changes are: Use of namespace on
-          platforms that support it.  Use of perfect-hash optable.  Use of
-          compile marshalling.  Added _interface_repository_id accessors.
-          Added _non_existent_skel for skeletons.  Repository ID changed
-          to start with IDL:omg.org/.  Remote operation invocation now
-          understand MP.  Use of ACE_TRY macros.
-
-          Thanks to Jeff for the reminder.
-
-Wed Mar 31 000:42:30 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/lex.yy.cpp: Added a definition above the rules section
-          to generalize newline to handle '\n' and "\r\n", and plugged the
-          definition in where appropriate in the rules section.  Since we
-          don't regenerate lex.yy.cpp with every build, that had to be
-          generated and checked in as well. Thanks to Ossama for his quick
-          hack of a simple test for this.  Also tested by ftp of Ping.idl
-          (in binary mode) from NT to Unix and rebuild of orbsvcs after
-          removing generated Ping interface files.  Also, thanks to
-          Andreas Geisler <andreas.geisler@erls.siemens.de> for reporting
-          the problem.
-
-Wed Mar 31 00:25:17 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp: fixed a bug in
-          counting down the events received in the consumer's <push>
-          method.
-
-Wed Mar 31 00:14:53 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA/Default_Servant/File_i.cpp (destroy):
-        * examples/POA/Default_Servant/server.cpp
-        * examples/POA/Default_Servant/client.cpp
-
-        * examples/POA/DSI/Database_i.cpp
-          examples/POA/DSI/server.cpp
-          examples/POA/DSI/client.cpp: MAde some cosmetic changes to the
-          ACETRY macros defined inside
-
-Tue Mar 30 18:30:27 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/Options.html: Added a paragraph describing the relation and
-          useage of command-line options, environment variables, and
-          svc.conf files.  Thanks to Don Busch <busch_d@ociweb.com> for
-          pointing this out.
-
-Tue Mar 30 12:33:06 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.16 released.
-
-Tue Mar 30 11:16:57 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/ORB.cpp
-          (resolve_initial_references,iioploc_string_to_object): We don't
-          need a char* array here.
-
-Tue Mar 30 09:51:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.cpp: Missing ORB_Core argument in the InputCDR for
-          ior_string_to_object.
-
-        * tao/GIOP.cpp: Improved error messages.
-
-        * tao/Server_Request.cpp: Use ACE_TRY macros to throw exceptions.
-
-        * tao/ORB_Core.cpp: We cannot cache the allocators because the
-          ORB_Core_instance will not be TSS in the future.
-
-        * tests/MT_Client/server.conf: Use global resources.
-
-        * tests/MT_Client/client.cpp: Use ACE_PRINT_EXCEPTION to print the
-          exception.
-
-Mon Mar 29 22:42:31 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * tao/Connect.cpp : Used CORBA::string_dup () in handle_message
-          ().  Un-owned memory was being assigned to an auto-ptr, which
-          caused the INS test to fail on NT.  Also added a check for
-          TAO_debug_level.
-
-        * tests/InterOp-Naming/InterOp_test.cpp (main): Removed some Debug
-          statements.
-
-Mon Mar 29 21:27:56 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO-INSTALL.html: removed 2>&1 from cross-compilation
-          instructions.  Thanks to Jeff for reporting that t/csh doesn't
-          like it.
-
-Mon Mar 29 20:12:12 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Changed the ACE_TRY_ENV in ACE_PRINT_EXCEPTION to ACE_ANY_EXCEPTION.
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp
-        * orbsvcs/orbsvcs/Time/TAO_TIO.cpp
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp
-
-        * TAO/examples/Simple/time: Updated the following projects to
-          contain Simple_util.* Removed the obsolete files. Thanks to
-          Barry Hoggard <hoggard@cfx.com> for pointing this out.
-
-          * TAO/examples/Simple/timeserver.dsp
-          * TAO/examples/Simple/timeclient.dsp
-          * TAO/examples/Simple/timeserver_static.dsp
-          * TAO/examples/Simple/timeclient_static.dsp
-
-        * TAO/examples/Simple/time: Updated the following projects to
-          contain Simple_util.* Removed the obsolete files. Thanks to
-          Barry Hoggard <hoggard@cfx.com> for pointing this out.
-
-          * TAO/examples/Simple/timeserver.dsp
-          * TAO/examples/Simple/timeclient.dsp
-          * TAO/examples/Simple/timeserver_static.dsp
-          * TAO/examples/Simple/timeclient_static.dsp
-
-Mon Mar 29 19:10:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/Stub.cpp: The Stub carries the ORB_Core around, this reduces
-          the number of calls to TAO_ORB_Core_instance(), at least on the
-          client-side.  It is also the first step to be able to get to the
-          policy list effective for an object, because we needed some way
-          to map from the CORBA::Object to the ORB that it belongs to.
-
-        * tao/CDR.h:
-        * tao/CDR.i:
-        * tao/CDR.cpp: The InputCDR class can carry the ORB_Core around to
-          initialize the TAO_Stub's appropiately. Unfortunately we cannot
-          use this feature everywhere.
-
-        * tao/Invocation.i: Initialize the InputCDR with the right
-          ORB_Core.
-
-        * tao/ORB.cpp: Changed the code to create TAO_Stub's to use the
-          new constructor and pass it the ORB_Core.  Use the right
-          ORB_Core when extracting an object reference from a string.
-
-        * tao/Object.cpp: When extracting an Object from a CDR stream we
-          use the right ORB_Core.
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Use the
-          ORB_Core in the stub instead TAO_ORB_Core_instance() to make a
-          request.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: Migrated to the new
-          TAO_Stub constructors.
-
-Mon Mar 29 15:55:23 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Request.h (CORBA_Request): Put a default argument for calls
-          send_oneway () and invoke () as
-          CORBA::Environment::default_environment(). This is for users who
-          are using the native exception. But users using the non-native
-          exceptions should pass in their environment to get the exception
-          back. This change is attributed to Barry Hoggard
-          <hoggardb@cfx.xom>
-
-Sun Mar 28 21:37:42 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simple/grid/Grid_Client_i.cpp (run): fixed typo in
-          ACE_DECLARE_NEW_CORBA_ENV.
-
-Sun Mar 28 18:28:10 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp: Removed extra
-          ACE_File_Connector variables that were not being used.
-
-Sun Mar 28 17:55:10 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Replaced the TAO exception macros with ACE exception macros.
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout):
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp
-        * orbsvcs/orbsvcs/Time/TAO_TIO.cpp
-
-Sun Mar 28 14:58:50 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/any.cpp
-        * tests/Param_Test/bd_short_seq.cpp
-        * tests/Param_Test/bd_str_seq.cpp
-        * tests/Param_Test/client.cpp
-        * tests/Param_Test/except.cpp
-        * tests/Param_Test/objref.cpp
-        * tests/Param_Test/server.cpp
-        Made cosmetic changes to these files.
-
-Sun Mar 28 14:27:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/Event/EC_ObserverStrategy.cpp:
-        * orbsvcs/Event/EC_Per_Supplier_Filter.cpp:
-        * orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp:
-        * orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/Event/EC_SupplierFiltering.cpp:
-        * orbsvcs/Naming/Hash_Naming_Context.cpp: Replaced
-           ACE_GRUAD_THROW* with ACE_GUARD_TRHOW_EX with appropriate
-           ACE_CHECK*.
-
-Sun Mar 28 14:20:25 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/DynAnyC.{h,i,cpp}:
-        * tao/DynAny_i.{h,cpp}:
-        * tao/DynArray_i.{h,cpp}:
-        * tao/DynEnum_i.{h,cpp}:
-        * tao/DynSequence_i.{h,cpp}:
-        * tao/DynStruct_i.{h,cpp}:
-        * tao/DynUnion_i.{h,cpp}: Changed over TAO_IN_ENV to ACE_TRY_ENV
-          and ACE_NEW_THROW_RETURN to ACE_NEW_THROW_EX/ACE_CHECK_RETURN.
-          Also replaced a few Any_ptr/delete pairs with Any_vars.
-
-Sun Mar 28 11:39:36 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * examples/Simple/bank/AccountManager_i.cpp (open): Fixed a typo.
-
-Sun Mar 28 07:40:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.cpp: added
-          ACE_Auto_Basic_Ptr<TAO_Naming_Context> explicit instantiation.
-
-Sun Mar 28 03:27:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO/examples/Callback_Quoter/Notifier_i.cpp:
-        * TAO/examples/Simple/bank/AccountManager_i.cpp:
-        * TAO/examples/Simple/grid/Grid_i.cpp:
-        * TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp:
-        * TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp:
-        * TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
-        * TAO/tao/DynAny_i.cpp:
-        * TAO/tao/Invocation.cpp:
-        * TAO/tao/ORB.cpp:
-        * TAO/tao/Typecode.cpp: Replaced ACE_NEW_THROW* macros with
-           ACE_NEW_THROW_EX and appropriate ACE_CHECK* macros.
-
-1999-03-27  Nagarajan Surendran  <naga@polka.cs.wustl.edu>
-
-        * docs/releasenotes/index.html: Updated the A/V documentation.
-
-Sat Mar 27 14:20:09 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * examples/Event_Comm/Consumer_Input_Handler.cpp,
-          Notifier_Handler.cpp, Supplier_Input_Handler.cpp,
-          notifier.cpp:
-          Fixed compile warnings.
-
-Sat Mar 27 11:57:11 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/ORB.h:
-        * tao/ORB.cpp: Removed an Unbounded_Set<ACE_INET_Addr> that I
-          moved from IIOP_ORB, but it was not used at all.
-
-Sat Mar 27 06:51:38 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Event_Comm/Makefile: updated dependencies so that it
-          can build.
-
-Fri Mar 26 23:50:46 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POA.pidl (PortableServer): Added State and get_state.
-          Thanks to Umar Syyid <usyyid@hns.com> for pointing this out.
-
-Fri Mar 26 22:53:09 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.h:
-        * tao/Context.h:
-        * tao/DynAnyC.h:
-        * tao/Environment.h:
-        * tao/Exception.h:
-        * tao/NVList.h:
-        * tao/ORB.h:
-        * tao/Object.h:
-        * tao/POA_CORBA.h:
-        * tao/POAC.h:
-        * tao/Principal.h:
-        * tao/Request.h:
-        * tao/Server_Request.h:
-        * tao/TypeCode.h: Put in some more of the _ptr_type and _var_type
-          typedefs. As I read in the Henning/Vinoski book, I see that
-          these things are used just about anywhere xxx_ptr and/or xxx_var
-          are defined. This should about do it for TAO code. Still some
-          places in the IDL compiler left where these can be generated.
-
-Fri Mar 26 21:57:44 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/POAManager.cpp (get_state): Made changes to the type
-          declarations in this file. The scoping was not right to acces
-          the enum variables. Thanks to Naga for pointing out the mistake.
-
-Fri Mar 26 18:08:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/TAO.dsp:
-        * tao/TAO_Static.dsp: Removed the IIOP_ORB.{h,cpp} from the
-          project files.
-
-Fri Mar 26 18:07:43 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POAC.h:
-        * tao/POAS.{h,cpp}:
-        * tao/POAManager.{h,cpp} (get_state): Added enum definition for
-          PortableServer::POAManager::State and the get_state method which
-          got added in Corba 2.3 spec.  Thanks to Umar Syyid
-          <usyyid@hns.com> for pointing this out.
-
-Fri Mar 26 18:12:56 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp: I think the passing
-          of a _var into a method that accepts _ptr was causing errors on
-          some platforms so I added .ionout () to it hoping to fix it.
-
-Fri Mar 26 17:59:22 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_i.h:
-        * orbsvcs/tests/ImplRepo/airplane_server.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/airplane_server_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_client_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h: Replaced all TAO
-          exception macros with ACE exception macros.
-
-Fri Mar 26 17:58:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/IIOP_ORB.h:
-        * tao/IIOP_ORB.i:
-        * tao/IIOP_ORB.cpp:
-        * tao/IOR_LookupTable.h:
-        * tao/IOR_LookupTable.cpp:
-        * tao/ORB.h:
-        * tao/ORB.i:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.cpp: Removed the IIOP_ORB class, it was not needed,
-          it was confusing the pluggable protocols work and it added more
-          layering than was desirable.  Also added a pointer from the ORB
-          to the ORB_Core that created it, that way we don't need to rely
-          on the TAO_ORB_Core_instance() method.  The more I think about
-          it the more the ORB_Core looks like an implementation class for
-          the ORB interface.
-
-        * examples/Makefile: Added Event_Comm to the list.
-
-        * docs/releasenotes/TODO.html: Updated with the new tasks ahead.
-
-Fri Mar 26 15:38:00 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input): Cosmetic
-          change. Moved the null termination of service name ahead so it
-          prints properly in the ACE_DEBUG.
-
-Fri Mar 26 16:00:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: instead of not building Time component
-          if ImplRepo component isn't built, build ImplRepo component if
-          Time component is built.
-
-Fri Mar 26 13:01:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp: Modified
-          code to use member environment variable inside cube_* calls, and
-          ACE_TRY_ENV inside init and shutdown code.
-
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp:
-          Deleted a header file that was included twice and added a couple
-          that were missing.
-
-Fri Mar 26 12:51:07 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Naming/Naming_Context.{h, cpp}
-          orbsvcs/orbsvcs/Naming/Hash_Naming_Context.{h, cpp}
-          orbsvcs/orbsvcs/Naming/README: Added the files above.
-
-        * orbsvcs/orbsvcs/Naming/Naming_Utils.{h, cpp}
-          orbsvcs/orbsvcs/Makefile: Update the files above.
-
-        * orbsvcs/orbsvcs/Naming/CosNaming_i.{h, cpp}: Removed the files
-          above.  Restructured the implementation of the Naming Service to
-          follow the bridge pattern.  This will allow to easily plug
-          additional implemenations of the Naming Service, as well as
-          dynamically load the appropriate implementation at run-time with
-          Service_Config.
-
-          Please see orbsvcs/orbsvcs/Naming/README for details.
-
-Fri Mar 26 11:39:44 1999  Steve Huston  <shuston@riverace.com>
-
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h: Replaced forward
-          declaration of TAO_EC_Timeout_Filter with include
-          EC_Timeout_Filter.h so static_cast knows the complete type.
-
-        * utils/IOR-parser/Makefile: Now builds without a library; builds
-          on HP-UX.
-
-Fri Mar 26 09:26:48 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time_Utilities.*: replace static zero object
-          with static zero () member function.  This removes the
-          dependencies of all other services on TAO's Time Service.
-
-        * orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp,
-          orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp,
-          orbsvcs/orbsvcs/Event/EC_Gateway.cpp,
-          orbsvcs/orbsvcs/Event/Event_Channel.{h,cpp},
-          orbsvcs/orbsvcs/Event/ReactorTask.cpp,
-          orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp,
-          orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp,
-          orbsvcs/tests/EC_Basic/EC_Basic.cpp,
-          orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp,
-          orbsvcs/tests/EC_Mcast/EC_Mcast.cpp,
-          orbsvcs/tests/EC_Multiple/EC_Multiple.cpp,
-          orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp,
-          orbsvcs/tests/Event_Latency/Event_Latency.cpp: changed
-          ORBSVCS_Time::zero to ORBSVCS_Time::zero ().
-
-Fri Mar 26 08:39:45 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_helper.cpp: Fixed minor syntax error in the
-          be_helper.cpp file.
-
-Fri Mar 26 01:33:05 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Updated the InterOperable Naming Service sections of the
-        following:
-        * docs/Options.html:
-        * docs/releasenotes/#nservices:
-
-Thu Mar 25 22:08:21 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/CDR.{h,cpp}: Changed TAO_TRY stuff to ACE_TRY;
-
-Thu Mar 25 21:42:28 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * TAO_IDL/be/be_helper.cpp: Updated tao_idl's copyright message.
-
-Thu Mar 25 21:11:11 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Dynany_Test/driver.cpp:
-        * TAO/tests/Dynany_Test/test_dynany.cpp:
-        * TAO/tests/Dynany_Test/test_dynarray.cpp:
-        * TAO/tests/Dynany_Test/test_dynenum.cpp:
-        * TAO/tests/Dynany_Test/test_dynsequence.cpp:
-        * TAO/tests/Dynany_Test/test_dynstruct.cpp:
-        * TAO/tests/Dynany_Test/test_dynunion.cpp:
-        * TAO/tests/Dynany_Test/test_dynunion.cpp:
-        * TAO/tests/CDR/basic_types.cpp:
-        * TAO/tests/CDR/tc.cpp:
-        * TAO/performance-tests/Pluggable/server.cpp:
-        * TAO/performance-tests/Pluggable/PP_Test_Server.cpp:
-        * TAO/performance-tests/Pluggable/PP_Test_Client.cpp:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp:
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp:
-          Changed TAO_TRY stuff to ACE_TRY.  Also re-enabled the
-          cube_union test in DII_Cubit.
-
-Thu Mar 25 20:26:40 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * tao/ORB.cpp : Fixed some memory leaks in
-          resolve_initial_references (). Called resolve_service for
-          service names other than those statically defined in the orb.
-          The resolve_service was initially resolve_naming_service. Now it
-          takes a string as a parameter for the service name to be
-          resolved.
-
-        * tao/ORB.h: Changed the function resolve_naming_service () to
-          resolve_service passing in the service name as a parameter.
-          This function calls multicast_to_service () with the given
-          service name.
-
-Thu Mar 25 16:34:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_union_branch.cpp: The TypeCode buffer generated
-          for unions that had a short, ushort, char or wchar as
-          discriminator was broken.  This was giving all kinds of problems
-          with the new test in Param_Test
-          (union inside any).  Hopefully it will fix the problem that
-          Frank Buschmann <Frank.Buschmann@mchp.siemens.de> reported.
-
-        * tao/Typecode.cpp: Changed one of the methods
-          (private_member_label) to use the ACE_TRY macros and fixed
-          several problems with its demarshaling of the labels.  Another
-          attempt at fixing the problem with unions that was good, but no
-          the right solution.
-
-        * TAO_IDL/be_include/be_visitor_union/any_op_cs.h:
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: Added support for
-          interpretive and compiled marshaling versions of the <<= and >>=
-          operators for unions.  This was an attempt to fix a bug in
-          marshaling unions inside anys, but finally the problem was in
-          other place, the change is useful though, and I am leaving it as
-          an example on how to start removing the need for the encode()
-          and decode() operations, even in the support of the CORBA::Any
-          type.
-
-        * tao/Any.h:
-        * tao/Any.cpp: Added new operations to manipulate CORBA::Any with
-          compiled marshaling.
-
-        * tests/Param_Test/any.h:
-        * tests/Param_Test/any.cpp:
-        * tests/Param_Test/client.cpp:
-        * tests/Param_Test/param_test_i.cpp: Added new sub-test for the
-          any test. It inserts a union into the any.
-
-        * tao/encode.cpp: Simplified implementation of union marshaling.
-
-        * tao/decode.cpp: Minor optimization in Any demarshaling.
-
-        * tao/Invocation.cpp: Added @@ comment.
-
-        * tao/Stub.cpp:
-        * tao/GIOP.cpp: Minor cosmetic fix.
-
-Thu Mar 25 16:24:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/{MT_Cubit_Test,run_test.pl},
-          performance-tests/Cubit/TAO/IDL_Cubit/run_tests.pl: changed
-          iioplite to gioplite.  See ChangeLogTag:Mon Mar 8 20:49:45 1999
-          Carlos O'Ryan.
-
-Thu Mar 25 15:09:37 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Added the following files for the InterOperable Naming Service
-        test.
-        * tests/InterOp-Naming/InterOp_test.cpp:
-        * tests/InterOp-Naming/README:
-        * tests/InterOp-Naming/Makefile:
-
-Thu Mar 25 07:41:57 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_global.cpp: Fixed use of ACE_NEW_RETURN,
-          ACE_NEW was the right macro here.
-
-Thu Mar 25 01:05:47 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/include/idl_global.h (class IDL_GlobalData):
-
-        * TAO_IDL/driver/drv_preproc.cpp: Removed the code that was
-          resolving "TEMP" variable to figure out temp directory. Instead
-          use the global temp_dir () which has already been resolved once
-          in drv_args.cpp
-
-        * TAO_IDL/util/utl_global.cpp (temp_dir):
-        * TAO_IDL/driver/drv_args.cpp:
-          Added an option -t to specify temp directory for the IDL
-          COMPILER. If this is not specified, it will be resolved from
-          ACE_DEFAULT_TEMP_DIR_ENV environment variable. IF that is also
-          not defined, /tmp/ will be used.
-
-        * TAO_IDL/be/be_interface.cpp: Fixed to use the temp directory to
-          keep the gperf temp files.
-
-          Thanks to Margaret Reitz <margaret@veritas.com> for reporting
-          the problem.
-
-Wed Mar 24 16:39:03 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * examples/Quoter/Quoter_i.cpp: Fixed a warning with copy ().
-
-Wed Mar 24 15:07:22 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: Hardcoded our specialized yacc path in it (and
-          it can be overridden via the command line).  Also automatically
-          put an CVS ID string in the y.tab.cpp also.
-
-        * TAO_IDL/fe/y.tab.cpp.diff:
-        * TAO_IDL/fe/y.tab.cpp: Removed some warnings and updated the
-          diff.
-
-Wed Mar 24 10:04:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp:
-          Removed definitions of inline functions for the T_var and T_out
-          classes corresponding to a forward declaration. The classes will
-          be generated again for the interface.  This change should let us
-          use inline versions of T::_nil() and T::_duplicate().
-
-Wed Mar 24 09:00:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: This is the only file
-          outside $TAO_ROOT/tao that was using STUB_Object.
-
-Wed Mar 24 06:13:45 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Invocation.cpp (invoke_i): removed ACE_NOTREACHED wrapper
-          from final return statement.  Both DU cxx and ghs complained
-          that the statement is reachable, I think because the last switch
-          statement doesn't have a default case.
-
-Tue Mar 23 22:33:43 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/Stub.cpp: Changed the name from STUB_Object to TAO_Stub,
-          otherwise it pollutes the namespace.  This affected many files.
-
-        * tao/corbafwd.h:
-        * tao/Exception.h:
-        * tao/Exception.cpp: Added new system exceptions: INV_POLICY
-          (invalid policy), REBIND
-          (request will require object rebind) and TIMEOUT (the request
-          timed out).  This new exceptions are not raised yet, but they
-          will be as part of the CORBA Messaging effort.
-
-        * tao/IIOP_Profile.cpp: Changed all CORBA_DATA_CONVERSION
-          exceptions for CORBA::MARSHAL. DATA_CONVERSION is reserved to
-          errors while handling basic types, such as fixed<> or marshaling
-          character sets.
-
-        * TAO_IDL/be/be_visitor_interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/collocated_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/collocated_ss.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_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: The IDL
-          compiler generates TAO_Stub now.  Moved the generation of the
-          _duplicate() and _nil() methods to the .i files.  We now
-          generate the _unchecked_narrow() method.
-
-Tue Mar 23 21:55:21 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * rules.tao.GNU,orbsvcs/orbsvcs/Makefile,docs/configurations.html:
-          moved TAO_ORBSVCS default setting from rule.tao.GNU to
-          orbsvcs/orbsvcs/Makefile.
-
-Tue Mar 23 21:36:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Invocation.cpp: The error codes returned from invoke_i()
-          were wrong. Resulting in missing user exceptions and other evil
-          things.
-
-        * docs/Options.html:
-        * tao/ORB_Core.cpp: Added option to control TAO_debug_level
-          directly.
-
-        * tao/GIOP.cpp: Enabled more debugging messages for the beginning
-          of an outgoing buffer, only if TAO_debug_level > 3.
-
-        * orbsvcs/tests/Simple_Naming/client.cpp: Print some debugging
-          messages if the tests fail.
-
-Tue Mar 23 19:14:23 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * examples/Simple/Simple_util.h (class Server): Added a method to
-          test the InterOperable Naming Service with any of the existing
-          Simple examples in TAO (like bank,time etc.)  Specifying a "-i
-          object_id" option to the any of the examples will allow a client
-          to use the multiple end-point iioploc ior for the server as
-          iioploc:1.0//<host-name>:<port>/<object_id>,<other-endpoints>
-
-          This change will be used by the InterOperable Naming Service
-          test that will be added soon to the TAO\tests.
-
-        * tao/ORB.cpp (multicast_query): Printed the error message in the
-          accept call only if the TAO_debug_level > 0.
-
-Tue Mar 23 10:14:58 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/be/be_interface.cpp: There were some missing '\n' that
-          were making the ACE_ERROR statements hard to read.
-
-Tue Mar 23 09:27:51 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/Makefile: if not building ImplRepo Service, don't build
-          Time Service.
-
-        * ImplRepo_Service/Makefile,Time_Service/Makefile,
-          tests/ImplRepo/Makefile,tests/Time/Makefile: only build if the
-          orbsvcs library was built with the respective TAO_ORBSVCS
-          component.
-
-Tue Mar 23 09:01:01 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Invocation.h:
-        * tao/Invocation.cpp: Fixed throw spec declarations.
-
-Tue Mar 23 08:59:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Stub.cpp (do_static_call,do_dynamic_call): removed unused
-          local variable "status".
-
-Tue Mar 23 00:22:16 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Invocation.h:
-        * tao/Invocation.i:
-        * tao/Invocation.cpp:
-        * tao/Stub.h:
-        * tao/Stub.cpp: Major changes to the start() and invoke() methods,
-          they now control most of the loop for connection establishment
-          and forwarding. The clients only need to restart the request if
-          the invoke method returns TAO_INVOKE_RESTART.  Also factored out
-          the common code for several versions of the invoke() method.
-          Fixed severe error in protocol implementation, a successful
-          write followed by a read error must result in a COMM_FAILURE
-          exception.  Carefully examined what exceptions and what status
-          code to raise from start() and invoke().  Re-organized the
-          implementation of do_static_call and do_dynamic_call to use the
-          new features of the invocation classes.  Cleaned up the
-          LocationRequest implementation.
-
-        * tao/Pluggable.h:
-        * tao/Pluggable.cpp:
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Connector.cpp: No exceptions are raised by the
-          connector, simply an error code is returned.
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Changed the
-          IDL compiler to exploit the new features in the Invocation
-          classes.
-
-        * tao/IIOP_Transport.cpp:
-        * tao/GIOP.cpp: Cleaned up error propagation.
-
-        * tao/Environment.cpp:
-        * tao/Connect.cpp: Minor cosmetic fixes.  Improved error messages
-          format.
-
-        * tao/Object.cpp: Reimplemented some methods using the new form of
-          compiled marshaling.
-
-Mon Mar 22 17:32:19 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * tao/IIOP_ORB.cpp: Removed an extra ACE_DEBUG.
-
-        * orbsvcs/Time_Service/Server_i.cpp (init): Added a TAO_CHECK_ENV.
-          This came up while I was testing the InterOperable Naming
-          Service on NT.
-
-        * tao/ORB.cpp (multicast_query): removed the unused variable
-          'result'. egcs was complaining for this.
-
-        * tao/orbconf.h: Removed the #defs for IIOPNAME_PREFIX and
-          IIOPLOC_PREFIX. I am not using these anywhere.
-
-        * tao/ORB.cpp (multicast_query): Removed an unnecessary ACE_DEBUG.
-          Moved the dgram.close () up.
-
-Mon Mar 22 17:15:20 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/tao.dsp: Added IOR_LookupTable files.
-
-        * tao/IIOP_ORB.cpp: Fixed a signed/unsigned warning and an error
-          with an ambiguous use of [].
-
-Mon Mar 22 16:40:36 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO): Included
-          "ace/OS.h". Used ACE_static_cast.
-
-Mon Mar 22 16:40:36 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        The first version of the InterOperable Naming Service is commited.
-
-        * tao/ORB.cpp: Changed the resolve_initial_references () to check
-          for the ORB params ORBInitRef and ORBDefaultInitRef.
-
-          resolve_initial_references ():
-          The references are resolved in the following order :
-          1. ORBInitRef 2. DefaultInitRef 3. Multicast to service.  The
-          IORs can be specified in the iiopname or iioploc format.
-
-          multicast_query ():
-          Sends out a multicast to locate a service (specified by a
-          service name) and receives the response using TCP instead of
-          UDP. The service name and port are sent in the data of the
-          multicast.
-
-          multicast_to_service ():
-          Calls multicast_query with a service name instead of a service
-          ID.  Owns the memory read into in multicast_query ().
-
-          resolve_naming_service (), resolve_trading_service ():
-          Call multicast_to_service () with a service name instead of a
-          service ID.
-
-        * tao/IIOP_ORB.h: Added the following APIs to the ORB to access the
-          table of IORs TAO_IOR_LookupTable :
-          _tao_add_to_IOR_table ()
-          _tao_find_in_IOR_table ().
-
-        * tao/IIOP_ORB.cpp: Added the function iioploc_string_to_object().
-          This function is called by the string_to_object () for iioploc
-          IORs.  It creates a multiple profile stub object and then an
-          object reference.  The string_to_object () parses the incoming
-          ior to detect an iioploc IOR and then calls the
-          iiooploc_ior_to_string (). Conversion for the iiopname type IORs
-          will be added soon.
-
-        * tao/ORB_Core.cpp: Added the options -ORBInitRef and
-          -ORBDefaultInitRef.  Added the orb parameters init_ref and
-          ior_lookup_table. These parameters are populated based on the
-          commandline options. They are used by the
-          resolve_initial_references () that calls get on these params
-          through the singleton instance of the ORB core.
-
-        * tao/POA.cpp: Added a TAO_Object_key_prefix (^t^a^o\0). All the
-          changes are within #ifndef (TAO_NO_IOR_TABLE).  Changed the
-          parse_key () to skip over the TAO Object key prefix.  Changed
-          the create_object_key () to prepend TAO Object key to all
-          generated object keys.
-
-        * tao/Connect.cpp : Changed the handle_message () to parse the
-          object key in the incoming IIOP request. If the object key is
-          not preceded by ^(TAO)/0
-          (which is now the default for all usual TAO object keys) then
-          the key is treated as simple and looked up in the IOR table. A
-          LOCATION_FORWARD/NOT_EXIST exception is raised if the key is
-          found/not-found in the table.  Currently only the GIOP Request
-          type messages are handled. Similar logic will be added to the
-          GIOP LocateRequest type messages. This will go into the
-          handle_locate method.
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp: Changed the handle_input
-          method to receive a multicast for a service, parse the data for
-          the service name and a reply port.  Then use TCP to send back
-          the IOR of the requested service. If the service is other than a
-          "NameService" then the table is looked up for an IOR. The table
-          can be populated through commandline orb parameters and can use
-          iioploc/iiopname format IORs.
-
-        * tao/Makefile:
-        * tao/IOR_LookupTable.h:
-        * tao/IOR_LookupTable.cpp: This is an abstraction over the hash
-          map manager.  It is used by the orb to keep track of the
-          object-id : IOR mappings. The table is owned by the orb and
-          _tao_{add,find}_ior_{to,in}_table are APIs to access it.  The
-          APIs take CORBA_Object * as a parameter and stringify it before
-          adding to the table. This takes care of adding only valid IOR
-          strings to the table.
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/IOR_LookupTable.h:
-        * orbsvcs/orbsvcs/IOR_LookupTable.cpp:
-          Removed IOR_LookupTable, it is now in $TAO_ROOT/tao.
-
-        * tao/params.{cpp,h,i}: Added the params init_ref,
-          ior_lookup_table and default_init_ref to the orb core. Also
-          added the GET/SET methods for these.
-
-        * tao/orbconf.h: Added the protocol prefixes iiopname and iioploc.
-
-Mon Mar 22 14:13:17 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile,orbsvcs/orbsvcs/Makefile: added ace_components
-          support for TAO_COMPONENTS and ORBSVCS_COMPONENTS, respectively.
-          This allows other Makefiles to determine which components were
-          built into libTAO and liborbsvcs.
-
-Sun Mar 21 22:33:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB_Core.cpp (init): The second call to sock_rcvbuf_size()
-          should be sock_sndbuf_size().  Thanks to Russ Noseworthy for
-          reporting this.
-
-Sun Mar 21 21:23:44 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.15 released.
-
-Sun Mar 21 20:52:58 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.14 released.
-
-Sun Mar 21 20:27:37 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/objref.cpp:
-          The test for object references was broken; but only Linux/EGCS
-          triggered the error.
-
-Sun Mar 21 15:45:04 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/GIOP.cpp:
-          Added missing comma in timeprobe message string array.
-
-Sun Mar 21 14:47:12 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO): Used #ifdef
-          (ACE_LACKS_U_LONGLONG_T) instead of #ifdef (VXWORKS)||(CHORUS)
-
-Sat Mar 20 23:38:39 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp:
-        * tests/MT_Client/server.dsp:
-        * tests/MT_Client/client.dsp:
-
-          Fixed some project settings for the above project files.
-
-Sat Mar 20 20:27:54 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/MT_Client/MT_Client.dsw:
-          Added projects and workspace for this test, thanks to Irfan
-          for helping me out with it.
-
-        * tests/MT_Client/README:
-        * tests/MT_Client/run_test.pl:
-          Added canonical files to the example.
-
-        * tests/MT_Client/client.cpp:
-          Added an error message in case thread creation fails.
-
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-          Added a debug message when orb->shutdown() is called.
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-          Removed one method from the Profile classes that was only used
-          here.  Used the constructor instead, which is more efficient,
-          anyway.
-
-        * orbsvcs/tests/ImplRepo/Makefile:
-          Removed call to upper level Makefile, that's not the style we
-          use.
-
-Sat Mar 20 19:10:48 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_ORB.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.i:
-        * tao/IIOP_Profile.cpp:
-        * tao/Invocation.h:
-        * tao/Invocation.cpp:
-        * tao/ORB_Core.h:
-        * tao/ORB_Core.cpp:
-        * tao/Pluggable.h:
-        * tao/Pluggable.cpp:
-          Fixed a nasty concurency problem in the Cached_Connector. The
-          solution is to separate the path to return the new hint and the
-          new Svc_Handler from the Cached_Connector (check the ACE
-          changelog for details).
-          We store the profile and transport used for an invocation in the
-          Invocation object to avoid the same concurrency problems. In
-          this way if another thread changes the profile_in_use() of the
-          stub object that we are using we are not affected.
-          We still need to check that the modifications to the MProfile
-          and to STUB_Object object are thread-safe.
-
-Sat Mar 20 15:21:41 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_i.h:
-
-          Implemented persistance for the number of cans.  It saves
-          it to a file.
-
-        * orbsvcs/tests/ImplRepo/nestea_server.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h:
-
-          Removed leftover references to Paper Airplanes.
-
-Sat Mar 20 14:40:10 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * examples/Quoter/Factor_Finder.dsp:
-        * examples/Quoter/client.dsp:
-        * examples/Quoter/server.dsp:
-
-          Removed the generated headers from the projects.  I don't
-          think the listing of generated classes in classview is
-          helpful.
-
-        * examples/Quoter/Quoter_i.h:
-        * examples/Quoter/Quoter_i.cpp:
-
-          Fixed some warnings.
-
-Sat Mar 20 14:28:59 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Makefile:
-        * tests/MT_Client/Makefile:
-        * tests/MT_Client/client.cpp:
-        * tests/MT_Client/server.conf:
-        * tests/MT_Client/server.cpp:
-        * tests/MT_Client/test.idl:
-        * tests/MT_Client/test_i.cpp:
-        * tests/MT_Client/test_i.h:
-        * tests/MT_Client/test_i.i:
-          New test that runs a MT client using the same object reference
-          is all threads. Notice that this may be a bad idea
-          performance-wise, but it must work correctly.
-
-Sat Mar 20 13:38:23 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Timeprobe.h:
-          Left some macros uncommented which would lead to link
-          errors when building TAO. Fixed.
-
-Sat Mar 20 11:06:16 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB.cpp (multicast_query): Only print an error message if
-          the TAO_debug level is > 0.  Also, make sure to terminate the
-          line with '\n'.  Thanks to Russ Noseworthy for reporting this.
-
-Sat Mar 20 01:34:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Timeprobe.h:
-        * tao/CDR.cpp:
-        * tao/Connect.cpp:
-        * tao/GIOP.cpp:
-        * tao/IIOP_Transport.cpp:
-        * tao/Invocation.cpp:
-        * tao/Operation_Table.cpp:
-        * tao/ORB.cpp:
-        * tao/POA.cpp:
-        * tao/Servant_Base.cpp:
-        * tao/Server_Request.cpp:
-        * tao/Stub.cpp:
-          Renamed the timeprobe macros that are pertinent to
-          the pluggable protocols test and added a macro to
-          Timeprobe.h that turns off all the others.
-
-Fri Mar 19 22:04:55 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/decode.cpp (decode):
-          When decoding an Any we need to create a Message_Block, use
-          append() to copy the contents of the CDR stream and then store
-          the message block into the any for later decoding (when we
-          either use DynAny or we have enough static information).
-          The manipulation of the Message_Block was incorrect: the data
-          was copied using an OutputCDR stream, that copies the contents
-          but acts on a duplicate of the Message_Block, thus, it does not
-          update the wr_ptr() and rd_ptr().
-          We corrected this problem and things are happy again.
-
-        * examples/POA/DSI/Database_i.h (class DatabaseImpl): Switched the
-          memory allocator to be a local one rather than a persistent one.
-
-Fri Mar 19 19:15:56 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Stub.h:
-        * tao/IIOP_ORB.h:
-        * Benchmark/Marshal_Test/TAO/tao_marshal_impl.cpp:
-        * Benchmark/Marshal_Test/TAO/marshalS.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * utils/catior/catior.cpp:
-          Removed last references to IIOP_Object.
-
-Fri Mar 19 17:55:47 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/CurrentC.h:
-        * tao/DynAnyC.h:
-        * tao/PolicyC.h:
-        * tao/POAC.h:
-        * tao/Object_KeyC.h:
-          Added the _ptr_type and _var_type typedefs for these
-          non-regenerated classes. Thanks to
-          Carl Grinstead <grinstea@tsunami.com> and
-          James A. Risinger <james@tsunami.com>
-          for pointing out the oversight.
-
-Fri Mar 19 14:56:59 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/corbafwd.h:
-        * tao/CDR.h:
-        * tao/CDR.cpp:
-        * tao/Connect.cpp:
-        * tao/GIOP.cpp:
-        * tao/IIOP_ORB.cpp:
-        * tao/Invocation.h:
-        * tao/Invocation.i:
-        * tao/Invocation.cpp:
-        * tao/Typecode.cpp:
-        * tao/decode.cpp:
-        * orbsvcs/orbsvcs/AV/sfp.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp:
-        * utils/catior/Makefile:
-        * utils/catior/catior.cpp:
-          The CDR class changed to ACE_CDR.
-
-        * TAO_IDL/util/utl_global.cpp:
-          By default we must generate "tao/corba.h" instead of
-          <tao/corba.h>; in other words the compiler behaves as if the if
-          the "-in" option was used.
-
-        * TAO_IDL/driver/drv_args.cpp:
-          Added an error message if the -i option is missused, only -ic
-          and -in are valid.
-
-        * Updated the dependencies since to exploit the change in the
-          generate #includes.
-
-Fri Mar 19 14:27:58 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/examples/POA/DSI/Database_i.cpp:
-          Changed DatabaseImpl::Entry::_is_a() to use >>= before
-          comparing arg values. This slows down the test code, but
-          TAO defers populating the void* field of the Any until
-          necessary (most of the time ;-)), which speeds up everything else.
-
-Fri Mar 19 14:20:58 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Server_Request.cpp:
-          Fixed an incorrect (and on closer inspection, unnecessary)
-          use of TAO_CHECK_ENV. Also added a release() for a newly
-          allocated (and immedialtely duplicated) message block.
-
-Fri Mar 19 01:19:16 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Server_Request.h:
-          Typo in comments.
-
-        * tao/Server_Request.cpp:
-          Fixed IIOP_Server_Request::arguments(), which was
-          totally broken, with a change suggested by Carlos.
-
-1999-03-18  Seth Widoff  <swidoff@cs.cmu.edu>
-
-        * orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp:
-          Returning from a query where the request_id had been seen wasn't
-          allocating memory for the out parameters. This was causing an
-          unwholesome seg fault. Thanks to Pradeep Gore
-          <pradeep@cs.wustl.edu> for discovering this.
-
-Thu Mar 18 21:06:58 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Server_Strategy_Factory.cpp
-          (Active_Object_Map_Creation_Parameters): removed extraneous
-          semicolon following the function definition.
-
-1999-03-18  Seth Widoff  <swidoff@cs.cmu.edu>
-
-        * orbsvcs/Trading_Service/Trading_Service.cpp:
-          On Linux, the get_host_name call added the domain name complete
-          with dots. Since I'm using the hostname as part of the link
-          identifiers for the trader federation, dots are bad. I changed
-          the dots to underscores.
-
-        * orbsvcs/tests/Trader/Offer_Importer.cpp:
-        * orbsvcs/tests/Trader/Offer_Exporter.cpp:
-        * orbsvcs/tests/Trader/Service_Type_Exporter.cpp:
-          Some vestigial TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG code was
-          being compiled and screwing up the exporter_test for federated
-          exports. That code has been vanquished.
-
-Thu Mar 18 16:43:44 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.cpp (execute): fixed NT
-        warnings in two Naming Service tests.
-
-Thu Mar 18 15:41:08 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/run_test.pl: Fixed spelling error
-          and reorganized both_ir test.
-
-Thu Mar 18 12:32:02 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/client.cpp
-          (test_delete_property, test_get_property_value):
-          Fixed warnings about unused arguments.  Fixed conversion from
-          `CORBA_Object_var' to non-scalar type `CORBA_Any::to_object'
-          problem.  Thanks to Jeff for helping me out on this.
-
-Thu Mar 18 01:54:09 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POAC.h: Fixed all the _out copy constructors to prevent
-          warnings.
-
-Wed Mar 17 23:39:44 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp (handle_input):
-
-          1) Made the server send only 1 reply in response to multicast,
-          since the client (ORB.cpp) was modified to use multiple
-          attempts, i.e., it's the responsibility of the client to attempt
-          to insure 'reliability', server just replies once.
-
-          2) If replying to a multicast fails, the multicast handler is
-          *not* deregistered from the reactor, unless we get some really
-          bad errno.  This needs to be further refined.  This fixes the
-          bug on Linux servers of multicast not working properly.
-
-          Thanks to Seth Widoff for tracking this down.
-
-Wed Mar 17 22:53:33 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/POA.cpp: Phase one of the new POA design is complete.
-
-          - We now have support for active demuxing of user defined
-            ids. This is achieved by using a active demux hint field in
-            the object key.
-
-          - We have support for reactivating servants with system
-            generated ids.  In this case, system ids are simply generated
-            by incrementing a counter. Note that in this case, the id ->
-            servant map is a hash map since active demux keys cannot be
-            reused once deactivated. However, the good news is that the
-            active demux key can be used as the hint in the object key.
-
-          - The use of the hint in the object key is optional.  If used,
-            the lookups are faster (unless the hint is invalidated by a
-            deactivation or by restarting a persistent POA).  However,
-            using the hint results in a larger IOR, and more memory being
-            used in the active object map.  This option can be controlled
-            through the -ORBactivehintinids runtime switch and is turned
-            on by default.
-
-          - If the applications knows that reactivations will not occur,
-            they can simply use the old scheme of directly using the
-            active demux key as the system id.  This will (a) make the IOR
-            shorter, (b) less memory will be used in the active object
-            map, and (c) the lookups will be quicker and (more)
-            predictable.
-
-          - Etherialization of servants (through the use of a Servant
-            Activator) is temporarily disabled.  Once we fix the reference
-            counting on the servants, this will start working again.
-
-          - Removed the POA exceptions from the list of system exceptions,
-            and reverted them back to being user exceptions.
-
-          - Timestamps are no longer used in persistent object keys.
-
-          - Removed the TAO specific synchronization POA policy.  In the
-            new POA design, this scheme will not be required.  Also,
-            removed the POA locking example in
-            $TAO_ROOT/examples/POA/locking.
-
-        * examples/POA/Identity/: Added new example to test a whole bunch
-          of conversions from servant to id to reference. The example is
-          designed to test the new POA IOR creation and its Active Object
-          Map.
-
-        * tao: Added support for minimalCORBA to TAO. For some
-          applications CORBA is too large to meet exacting size and
-          performance requirements. Such scenarios require a cut-down
-          version of CORBA. This cut-down version is called
-          minimumCORBA. minimumCORBA defines a profile (or subset) of
-          CORBA where the following features are removed:
-
-          - Dynamic Invocation Interface
-          - Dynamic Skeleton Interface
-          - Dynamic Any
-          - Interface Repository
-          - Interceptors
-          - Advance POA features:
-            - Servant Managers
-            - Adaptor Activators
-            - Most POA Manager features
-
-          On platforms that use the Makefiles, simply minimum_corba=1. On
-          Win32, define TAO_HAS_MINIMUM_CORBA in the orbconf.h file.
-
-        * tao/Makefile: Added support for measuring subsets of TAO.  These
-          subsets are not independent, but are useful in providing an idea
-          of how big different components of the ORB are.
-
-        * tao/Server_Strategy_Factory.cpp: Remove the active object map
-          creation responsibilities from this class.  Now it simply holds
-          on to the creation parameters and feeds them to the active
-          object map constructor.
-
-        * tao/Sequence_T.i (operator->): Added operator-> to
-          TAO_Object_Manager.  Also, made the in() method return a
-          non-const pointer.  Missing still is operator= taking
-          T::var_type. Other managers should also be check for these
-          features (Carlos said he'll look into it).
-
-        * examples/POA/Loader/run_test.pl:
-        * examples/POA/On_Demand_Loading/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-
-          - We now have support for active demuxing of user defined
-            ids. This is achieved by using a active demux hint field in
-            the object key.
-
-          - We have support for reactivating servants with system
-            generated ids.  In this case, system ids are simply generated
-            by incrementing a counter. Note that in this case, the id ->
-            servant map is a hash map since active demux keys cannot be
-            reused once deactivated. However, the good news is that the
-            active demux key can be used as the hint in the object key.
-
-          - The use of the hint in the object key is optional.  If used,
-            the lookups are faster (unless the hint is invalidated by a
-            deactivation or by restarting a persistent POA).  However,
-            using the hint results in a larger IOR, and more memory being
-            used in the active object map.  This option can be controlled
-            through the -ORBactivehintinids runtime switch and is turned
-            on by default.
-
-          - If the applications knows that reactivations will not occur,
-            they can simply use the old scheme of directly using the
-            active demux key as the system id.  This will (a) make the IOR
-            shorter, (b) less memory will be used in the active object
-            map, and (c) the lookups will be quicker and (more)
-            predictable.
-
-          - Etherialization of servants (through the use of a Servant
-            Activator) is temporarily disabled.  Once we fix the reference
-            counting on the servants, this will start working again.
-
-          - Removed the POA exceptions from the list of system exceptions,
-            and reverted them back to being user exceptions.
-
-          - Timestamps are no longer used in persistent object keys.
-
-          - Removed the TAO specific synchronization POA policy.  In the
-            new POA design, this scheme will not be required.  Also,
-            removed the POA locking example in
-            $TAO_ROOT/examples/POA/locking.
-
-        * examples/POA/Identity/: Added new example to test a whole bunch
-          of conversions from servant to id to reference. The example is
-          designed to test the new POA IOR creation and its Active Object
-          Map.
-
-        * tao: Added support for minimalCORBA to TAO. For some
-          applications CORBA is too large to meet exacting size and
-          performance requirements. Such scenarios require a cut-down
-          version of CORBA. This cut-down version is called
-          minimumCORBA. minimumCORBA defines a profile (or subset) of
-          CORBA where the following features are removed:
-
-          - Dynamic Invocation Interface
-          - Dynamic Skeleton Interface
-          - Dynamic Any
-          - Interface Repository
-          - Interceptors
-          - Advance POA features:
-            - Servant Managers
-            - Adpator Activators
-            - Most POA Manager features
-
-          On platforms that use the Makefiles, simply minimum_corba=1. On
-          Win32, define TAO_HAS_MINIMUM_CORBA in the orbconf.h file.
-
-        * tao/Makefile: Added support for measuring subsets of TAO.  These
-          subsets are not independent, but are useful in providing an idea
-          of how big different components of the ORB are.
-
-        * tao/Server_Strategy_Factory.cpp: Remove the active object map
-          creation responsibilities from this class.  Now it simply holds
-          on to the creation parameters and feeds them to the active
-          object map constructor.
-
-        * tao/Sequence_T.i (operator->): Added operator-> to
-          TAO_Object_Manager.  Also, made the in() method return a
-          non-const pointer.  Missing still is operator= taking
-          T::var_type. Other managers should also be check for these
-          features (Carlos said he'll look into it).
-
-        * examples/POA/Loader/run_test.pl:
-        * examples/POA/On_Demand_Loading/run_test.pl:
-        * examples/POA/On_Demand_Activation/run_test.pl:
-
-          Fixed the above scripts to pass the extra parameters along to
-          the client and the server.
-
-        * examples/POA/DSI/server.cpp: Added missing #include
-          "ace/Get_Opt.h"
-
-Wed Mar 17 19:36:31 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        Fixed compilation errors for VxWorks and CHORUS. Used the
-        constructor of ACE_ULongLong (UINT32, UINT32) for VxWorks which
-        doesnt have an unsigned long long.  *
-        orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout) *
-        orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO).
-
-Wed Mar 17 19:00:14 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h: FreeBSD also
-          needs to get SCHED_PRIORITY at runtime.  Thanks to Russell
-          L. Carter <rcarter@consys.com> for reporting this.
-
-Wed Mar 17 14:47:32 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/docs/releasenotes/orbcore.html: Added an entry about the new
-          Context stuff and removed one about DynAnys being "in progress".
-
-Wed Mar 17 14:26:14 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/airplane_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp: Removed the #include
-          "time.h" from these files.  They shouldn't be needed there.
-
-Wed Mar 17 13:33:49 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Context.i: Removed definition of is_nil(). Must have been
-          pasted in by mistake. Anyway, our Contexts are always nil, so we
-          don't need it.
-
-Wed Mar 17 13:14:16 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Any.cpp: Added a check for NULL ACE_Message_Block pointer in
-          _tao_replace().
-
-        * tao/Request.i: Type in comments.
-
-        *tao/Context.{h,i,cpp}: New files for our minimal Context support,
-          basically just so Object::_create_request() can be compliant.
-
-        * tao/Object.{h,cpp}:
-        * tao/corbafwd.h:
-        * tao/corba.h:
-        * tao/TAO.dsp:
-        * tao/Makefile: Other files that needed additions for Context
-          support.
-
-        * TAO/tests/param_test/client.cpp:
-        * TAO/Benchmark/Marshal_Test/TAO/tao_marshal_client.cpp: Test
-          files that use _create_request() and so needed the added Context
-          arg in the calls.
-
-Wed Mar 17 12:28:32 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-          Fixed a cut-and-paste error. Thanks to Greg Holtmeyer
-          <Greg.Holtmeyer@MW.Boeing.com> for pointing this out.
-
-Wed Mar 17 11:32:01 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/objref.cpp
-        * tests/Param_Test/ub_objref_seq.cpp: Fixed warnings from the
-          build.
-
-Wed Mar 17 10:05:15 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/GIOP: Replaced *IIOP_LITE* with *GIOP_LITE* since we've
-          renamed this.
-
-        * tao/GIOP.cpp (recv_request): Replaced the magic number 5 with
-          TAO_IIOP_LITE_HEADER_LEN.  Thanks to the ever vigilant Mark
-          Boriak for reporting this.
-
-Wed Mar 17 08:39:59 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.3.13 released.
-
-Wed Mar 17 02:06:47 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.12 released.
-
-Tue Mar 17 01:01:57 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Object.cpp (_non_existent):
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp
-          (gen_marshal_and_invoke): <_invoke_status> should be set before
-          use (at least according to g++).
-
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO): Changed
-          <this->attr_utc_time_.inacchi> to 0 since the conversion
-          routines Vishal used are not supported on vxworks. Vishal should
-          consult David in fixing this correctly.
-
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout): Also
-          changed <lowest_time> to 0.  Vishal should fix this also.
-
-Tue Mar 16 15:52:57 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/POAManager.i (lock): moved function definition before inline
-          activate (), because that function uses it.
-
-Tue Mar 16 15:41:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/*.cpp Made them exception safe using the latest
-          ACE_TRY macros. Had a bunch of code which did not handle
-          exception. Added code so that they are exception safe..
-
-Tue Mar 16 15:34:29 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * examples/Simple/bank/AccountManager_i.cpp: removed
-          ACE_Hash<ACE_CString> and ACE_Equal_To<ACE_CString> explicit
-          template instantiations, because they're in tao/POA.cpp.  Thanks
-          to Wei Chiang for reporting this.
-
-1999-03-16  Nagarajan Surendran  <naga@polka.cs.wustl.edu>
-
-        * tao/Server_Request.cpp: Removed a continue statement in the
-          marshal method since it prevented an exception from getting
-          printed on the server side if the idl method had no arguments
-          and only a return value.
-
-Tue Mar 16 02:25:56 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp: A line of
-          code was being generated without an ending semicolon.
-
-Tue Mar 16 00:26:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Server_Request.cpp: Used Any::_tao_get_cdr() in init_reply()
-          instead of casting to ACE_Messsage_Block* the return of
-          Any::value().  Also streamlined dsi_marshal(), again based on
-          the use of Any::_tao_get_cdr().
-
-        * tao/Any.cpp: Changed the constructor from ACE_Message_Block* to
-          set the value of any_owns_data_ to 0, since the value_ of this
-          Any is 0, so we want the value() call to return the cdr_.
-
-Mon Mar 15 21:08:55 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/POAC.cpp: Replaced all the <<= and >>= with newer versions
-          generated by the latest TAO IDL compiler.
-
-Mon Mar 15 19:09:35 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/TAO.cpp (run): Added the other run() methods to the
-          ORB_Manager.  Thanks to Jean-Marc Strauss
-          <jms97@club-internet.fr> for pointing this out.
-
-Mon Mar 15 02:27:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Environment.{h,cpp}:
-        * tao/Exception.h:
-        * tao/IIOP_Profile.{h,i}: Removed all FLICK specific code.  Thanks
-          very much to Tim Stack for removing the dependency from FLICK.
-
-Mon Mar 15 17:35:14 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp (visit_predefined_type):
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
-          (visit_predefined_type): For struct/union members that are
-          object references, we always generate the TAO_Object_Field_T
-          parametrized type. Earlier we were generating CORBA::Object_var
-          if the member was of the type CORBA::Object and the parametrized
-          type for interfaces. However, this was causing runtime errors in
-          the (de)marshaling engine.
-
-        * tao/{encode, decode}.cpp (TAO_Marshal_Struct::{encode,decode}):
-          Members that are simple CORBA::Object_ptr and not a user defined
-          interface type is also treated in the same way as if it was an
-          interface type. Thus, we can treat everything as a
-          TAO_Object_Field_T<CORBA::Object>* type.
-
-Mon Mar 15 15:27:34 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/LifeCycle_Service/Life_Cycle_Service.cpp:
-        * orbsvcs/LifeCycle_Service/Life_Cycle_Service.h:
-        * orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.cpp:
-        * orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h:
-          Renamed to the following to have a more consistent
-          naming scheme.
-
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.h:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp:
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h:
-          New file names.
-
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp:
-        * orbsvcs/LifeCycle_Service/Makefile:
-          Uses the new names.
-
-Mon Mar 15 02:27:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POAManager.i: Fixed typos.
-
-        * tao/POAManager.h: Added include 'poa_macros.h'.
-
-Mon Mar 15 10:48:39 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/except.cpp: Fixed throw expression. In
-          platforms that support native C++ exceptions the right way to
-          throw is TAO_THROW(Foo()); not TAO_THROW(Foo).  Of course the
-          form proposed works in platforms without native C++ exceptions
-          too.
-
-Mon Mar 15 10:42:27 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/POAManager.{h,i,cpp}: There were some compile errors in teh
-          changes that Nanbor made. There was a need to include the
-          poa_macros.h file and change "env" to "ACE_TRY_ENV".
-
-        * tao/encode.cpp (Alias::encode): The "data" parameter was first
-          cast to char* and then passed to stream->encode. Instead, we now
-          pass data itself. I am not sure, however, if this will fix some
-          of the runtime errors we are getting in the Trading Service.
-
-Mon Mar 15 02:27:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POA.{h,cpp}: Applied "some" ACE try macros into POA.
-          (etherealize_servants): Moved the function out of destroy
-          method.
-
-        * tao/POAManager.{h,i,cpp} (remove_poa): Removed the POAManager if
-          there is no more POA under this POAManager's control.  The
-          current implementation may cause potential race condition when
-          one thread hold the lock to remove the last POA and another
-          thread is blocked the POAManager's lock and is trying to add
-          another POA into this POAManager.  This should be solved by
-          refcounting the POAMnanger's usage but currently, POA uses
-          TAO_POA_Manager directly...
-
-        * tao/POAManager.{h,i,cpp} (deactivate_i): According to the spec.,
-          this function should etherealize servants in the managing POAs
-          and wait for request completion instead of destroying the POAs.
-          (activate_i,hold_requests_i,discard_requests_i,deactivate_i):
-          Added these no-lock functions.
-
-Sun Mar 14 18:05:51 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tests/Param_Test/*.h
-        * tests/Param_Test/*.cpp: Made the changes that are necessary
-          because of the previous changes to the tao/Request.*
-
-Sun Mar 14 14:58:51 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * tao/Request.i:
-        * tao/Request.cpp:
-        * tao/Request.h: Changed the arguments of two method call in the
-          Request class. They are send_oneway () and invoke (). They now
-          take in the environment variable ACE_TRY_ENV that should be
-          passed in from the application. These methods were using a
-          variable env_ stored in the class itself. The variable env_ has
-          also been removed thus necesitating the users of the API to send
-          their own environment variables that should be theoretically in
-          a TRY block.
-
-        * performance-tests/Cubit/TAO/DII_Cubit/client.cpp: Made the
-          changes that is a fallout of the above changes..
-
-Sun Mar 14 14:13:22 19  99  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout): Fixed
-          warnings reported by David and Carlos for g++/egcs.  Replaced
-          the constant 0xFFFFFFFFFFFFFFFF with 0xFFFFFFFFFFFFFFFFull and
-          for platforms lacking Ulonglong, called the constructor of
-          ACE_U_LongLong.
-
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout): Added
-          the ACE_UINT64_LITERAL () to fix an NT warning.
-
-Sat Mar 13 23:35:01 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp:
-        * orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
-        * orbsvcs/CosEvent_Service/CosEvent_Service.cpp: fixed minor
-          compile warnings regarding "statements not reached", "unused
-          parameters", and using .in ().
-
-Sat Mar 13 23:33:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Object.cpp: removed trailing semicolons from instantiation
-          pragmas.
-
-Sat Mar 13 21:53:57 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * Added the Inaccuracy measure to the time returned by a Universal
-          Time Object (UTO). The inaccuracy is a 64 bit number broken into
-          inacchi and inacclo as:
-
-                  Inaccuracy 64-bits
-          |------------------------------------|
-          |         | inacchi |   inacclo      |
-          |------------------------------------|
-            16-bits   16-bits     32-bits
-
-          The current measure of inaccuracy is the skew in synchronization
-          of the clerk's time. It is the difference in the largest and
-          smallest times from servers that the clerk syncs its time
-          with. The inaccuracy is dynamically updated with every time
-          synchronization cycle.
-
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout): Added
-          the logic to calculate the inaccuracy from the times returned by
-          servers.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp: Constructed the
-          Inaccuracy within UTO from the hi,lo values in UTC struct in
-          uto_from_utc(). Filled the UTO with the current inaccuracy
-          estimate in universal_time (). Added the GET/SET methods for the
-          inaccuracy.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h: Added a class
-          variable for inaccuracy estimate and the declarations for the
-          GET/SET methods. These are used by the Timer_Helper class to set
-          the inaccuracy.
-
-        * orbsvcs/orbsvcs/Time/TAO_UTO.cpp: Changed the constructor to
-          initialise the UTO inacchi and inacclo with properly extracted
-          bits from the given inaccuracy. Rewrote the GET method for
-          inaccuracy to construct the inaccuracy from the UTC struct hi,lo
-          values. This was previously being returned as just the addition
-          of hi and lo values.
-
-        * orbsvcs/tests/Time/Client_i.cpp : Changed the test to test for
-          the newly added inaccuracy and timezone information in the UTO
-          time.
-
-        * orbsvcs/Time_Service/README : Updated to include this addition
-          in the Time Service.  Thanks to Brian Dance
-          <Brian_Dance@UECCS.co.uk> for reporting this.
-
-Sat Mar 13 11:58:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: Removed unused variable,
-          thanks to David Levine for reporting this.
-
-        * TAO-INSTALL.html: Updated the notes on how to compile TAO.
-
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Added the new event channel
-          files to the static library.  Also removed some old files that
-          are no longer used (Event/Task_Manager.cpp) thanks to Francois
-          Bernier <fbernier@gel.ulaval.ca> for reporting this problem.
-
-Sat Mar 13 11:57:27 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * tao/ORB.cpp (ORB_init): Revised the multicast_query() stuff just
-          a bit to make it easier to maintain.
-
-Sat Mar 13 00:44:51 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.11 released.
-
-Fri Mar 12 20:48:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp: Fixed improper use of
-          TAO_RETHROW macros.
-
-        * tao/Invocation.cpp: Fixed problem in location forwarding, the
-          test for errors while demarshaling the new object reference was
-          inverted.
-
-Fri Mar 12 19:51:36 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Fixed some
-          bugs with forwarding support in void functions without output
-          arguments.
-
-        * tao/Object.cpp: Fixed warning about unused variable.
-
-Fri Mar 12 18:09:25 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: Removed warnings
-          in generated code.
-
-        * TAO_IDL/be/be_helper.cpp: Cosmetic changes.
-
-Fri Mar 12 16:17:40 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/tests/ImplRepo/client.cpp:
-        * orbsvcs/tests/ImplRepo/client.dsp:
-        * orbsvcs/tests/ImplRepo/client_impl.cpp:
-        * orbsvcs/tests/ImplRepo/client_impl.h:
-        * orbsvcs/tests/ImplRepo/server.cpp:
-        * orbsvcs/tests/ImplRepo/server.dsp:
-        * orbsvcs/tests/ImplRepo/server_impl.cpp:
-        * orbsvcs/tests/ImplRepo/server_impl.h:
-        * orbsvcs/tests/ImplRepo/Simple_Object.idl:
-        * orbsvcs/tests/ImplRepo/simple_object_impl.cpp:
-        * orbsvcs/tests/ImplRepo/simple_object_impl.h:
-          Removed the Simple Test.
-
-        * orbsvcs/tests/ImplRepo/Nestea.idl:
-        * orbsvcs/tests/ImplRepo/nestea_client.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_client.dsp:
-        * orbsvcs/tests/ImplRepo/nestea_client_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_client_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_i.h:
-        * orbsvcs/tests/ImplRepo/nestea_server.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server.dsp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.cpp:
-        * orbsvcs/tests/ImplRepo/nestea_server_i.h:
-          Added the new Nestea Bookshelf test.
-
-        * orbsvcs/tests/ImplRepo/README:
-        * orbsvcs/tests/ImplRepo/run_test.pl:
-        * orbsvcs/tests/ImplRepo/ImplRepo.dsw:
-          Changed because of the new test.
-
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.h:
-          Now uses ACE exception handling macros.
-
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp:
-          Added the -k option for IOR input.
-
-Fri Mar 12 14:11:28 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * ORB.h, ORB.cpp and orbconf.h: Fixed multicast problem.  Removed
-          dynamic memory allocation in multicast_query () and now pass a
-          pointer to a buffer allocated on the stack in
-          multicast_to_service ().  Also added a macro
-          TAO_DEFAULT_MULTICAST_SEND_ATTEMPTS = 2.  This control the
-          number of attempts multicast)query () will make to get a
-          response.
-
-          Also moved a call to multicast.close () to after to attempt
-          loop.  It seems when multicast.close () is called the reply
-          packet from the server is lost on solaris hosts.  By moving this
-          to after the recv the packets are now read on the first recv.
-
-Fri Mar 12 12:23:07 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout):
-          Retrieved the timezone information and set the time displacement
-          factor for the clerk's time.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h : Added the
-          GET/SET methods for the time displacement factor.
-
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp : Added
-          implementation for the above methods. Passed the time zone
-          information to the UTO created in universal_time ().
-
-          The timer_helper uses the newly added timezone wrappers of
-          OS.h. These wrappers are yet to be tested on NT. Thanks to Brian
-          Dance <Brian_Dance@UECCS.co.uk> for reporting this.
-
-Fri Mar 12 10:38:18 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * tao/CDR_Interpreter.cpp: setup_entry for objrect references
-          required TAO_Object_Field_T<CORBA_Object> as the first parameter
-          instead of CORBA_OBject_ptr for the accurate size
-          computation. Thanks to Alexey Gadzhiev <alg@null.ru> for
-          reporting the bug and supplying us with a test program and other
-          information to help us fix the bug.
-
-        * tao/{encode, decode, deep_free}.cpp: In encode/decode/deep_free
-          for structures, for the case where we are dealing with fields
-          that are object references, we cast the data to
-          TAO_Object_Field_T<CORBA_Object>* instead of simply
-          TAO_Object_Field*. These changes were made during the bug fix
-          described aove. These fixes also removed the Array Bounds Read
-          (ABR) error message produced by Purify.
-
-Fri Mar 12 00:35:47 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp Fixed the problem of client
-          not being able to resolve Naming Service ior through multicast
-          when client and server are run on different hosts.  Thanks to
-          Steve Totten for tracking down since when this was broken, and
-          to Carlos O'Ryan for providing hypotheses as to why.
-
-          Made the server wait a little bit before sending a reply to the
-          multicast as well as send a reply several times.  This 1) gives
-          client a chance to start listening for a reply, 2) provides a
-          better protection against packet loss.  (The problem was
-          occuring because the server sent a reply before the client had a
-          chance to start receiving.  This was happening due to the added
-          dynamic memory allocation in the client code in the interval
-          between multicast_send and reply_receive).
-
-          A more flexible policy-based solution should be added (as
-          opposed to hardcoding intervals and retries).  This will
-          probably be a part of Vishal's upcoming Interoperable Naming
-          Service changes.
-
-          Values encoded in the code now should work for most
-          platforms/networks.  However, they are not guaranteed to work
-          for all!  Part of the problem is that UDP is unreliable, so in
-          theory can be retransmitted 100 times and still not work.  Also,
-          specific network configurations (busy network, busy hosts, old
-          routers, etc.) may have special needs.  Again, this should be
-          better addressed once hardcoded values are replaced by flexible
-          policies.
-
-Thu Mar 11 22:49:35 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * tao/ORB.cpp (multicast_query): INET_Addr::get_port_number ()
-          returns a port number converted to host byte order.  Made
-          changes to account for that.
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp: Made sure that upon the
-          receipt of the multicast packet, the reply was sent to the port
-          indicated in the array contained in the packet as opposed to the
-          port from which the packet came from.
-
-Thu Mar 11 20:41:39 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/IOR_Multicast.cpp: There were some major
-          inconsistencies with byte order conversions.
-
-        * tao/ORB.cpp (multicast_query): Fixed some subtle bugs with
-          multicast.  First, we were sending a struct when we should have
-          been sending an array (due to portability issues with struct
-          padding).  Second, we weren't being consistent with ACE macros.
-
-        * tao/ORB.cpp (multicast_query): There was a read of BUFSIZ where
-          there should have been a read of ACE_MAX_DGRAM_SIZE.  Thanks to
-          Marina for noticing this.
-
-Thu Mar 11 20:46:04 1999  Marina Spivak  <marina@cs.wustl.edu>
-
-        * orbsvcs/tests/Simple_Naming/client.cpp: In the
-          CosNaming_Client::init () changed
-
-              // Initialize ORB.
-                is->orbmgr_.init (argc,
-                                  argv,
-                                  TAO_TRY_ENV);
-          to
-              // Initialize ORB.
-              this->orbmgr_.init (this->argc_,
-                                  this->argv_,
-                                  TAO_TRY_ENV);
-
-          to facilitate proper processing of the arguments.
-
-Thu Mar 11 19:55:18 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Object.cpp: Fixed template instantiations and some warnings.
-
-        * tao/encode.cpp: Removed unused variable.
-
-        * tests/Param_Test/run_test.pl: Use IOR object references, they
-          are actually easier than URL-style.
-
-Thu Mar 11 19:07:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/CDR.h:
-        * tao/CDR.cpp:
-        * tao/Connect.cpp:
-        * tao/Exception.cpp:
-        * tao/IIOP_ORB.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Profile.i:
-        * tao/IIOP_Profile.cpp:
-        * tao/MProfile.h:
-        * tao/MProfile.i:
-        * tao/Object.h:
-        * tao/Object.i:
-        * tao/Object.cpp:
-        * tao/Pluggable.h:
-        * tao/Server_Request.cpp:
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/decode.cpp:
-        * tao/encode.cpp:
-          Implemented compiled marshaling and demarshaling of object
-          references.  Removed uses of do_static_call() from the
-          CORBA::Object class in favor of compiled marshaling.  Removed
-          several uses of interpretive marshaling, we can use compiled
-          marshaling now.
-
-        * tests/Param_Test/run_test.pl: The client cleanly shutdowns the
-          server now.
-
-Thu Mar 11 16:36:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: Fixed code
-          generation of _ptr_type and _var_type typedefs to include a
-          guard against certain versions of g++.
-
-Thu Mar 11 14:30:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp: Check for error in call
-          to Repository::get_hostport
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp: Enabled
-          test for unions and the RTI data structure.
-
-Thu Mar 11 13:59:05 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Any.{i,cpp} (operator<<=): un-inlined, to avoid use of
-          inline CORBA::string_dup () before definition.
-
-Thu Mar 11 13:43:12 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_global.cpp: Enabled compiled marshaling by
-          default (again).
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Fixed
-          generated code to handle location forwarding.
-
-        * tao/Invocation.cpp: Minor cosmetic fixes.
-
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp: We don't abort on
-          the first exception, instead we keep trying. We also clear the
-          environment before making a request.
-
-Wed Mar 10 16:43:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp:
-          The type of event generated by the filter is can be passed in
-          the Filter constructor.  This is also used to control if the
-          event is a one shot timeout or an interval timeout.
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp: We must
-          create a Timeout_Filter for events of type ACE_ES_TIMEOUT_EVENT
-          too.  The type of event is passed to the Timeout_Filter.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Only push events if
-          the consumer is not disconnected.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp: Fixed
-          memory managment bug.
-
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp: The UDP gateway does
-          not require an scheduler, it can be argued that it cannot use an
-          scheduler because UDP is not suitable for hard real-time
-          systems.
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.h:
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: Removed scheduler and some
-          includes related to the old EC.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h: Work around
-          horrible g++ 2.7.2 bug with forward declaration of templates.
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h: Also fixed a couple
-          of g++ 2.7.2 warnings, that look like compiler bugs to me.
-
-        * tao/decode.cpp: Updated some comments in the object reference
-          decoder.
-
-        * tests/CDR/allocator.cpp: Minor cosmetic fixes.
-
-Wed Mar 10 10:43:08 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/fe/idl.yy: The front-end was incorrectly handling
-          "const" definitions of type strings. Thanks to Yaolong Lan
-          (lyaolong@cs.sunysb.edu) for reporting the problem.
-
-        * TAO_IDL/fe/{y.tab.cpp, y.tab.h, lex.yy.cpp}: Regenerated since
-          idl.yy was modified.
-
-Tue Mar  9 20:01:40 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * examples/Simulator/DOVEMIB/Makefile:
-        * examples/Simulator/Event_Supplier/Makefile:
-        * orbsvcs/Naming_Service/Naming_Service.dsp:
-        * orbsvcs/tests/AVStreams/benchmark/Makefile:
-        * orbsvcs/tests/AVStreams/server_discovery/Makefile:
-        * performance-tests/Demux/Makefile:
-        * performance-tests/POA/Object_Creation_And_Registration/Makefile:
-        * tao/Makefile:
-        * tao/ORB.cpp:
-        * tao/TAO.dsp:
-        * tao/TAO4.mak:
-        * tao/TAO_Static.dsp:
-        * tao/Typecode.cpp:
-        * tao/tao.bld: Updated these files to use the newly renamed
-          CDR_Interpreter classes and files.
-
-        * tao/IIOP_Interpreter.h
-        * tao/IIOP_Interpreter.cpp
-
-          Renamed these files to:
-
-        * tao/CDR_Interpreter.h
-        * tao/CDR_Interpreter.cpp
-          All references to IIOP_Interpreter have been changed to
-          CDR_Interpreter since "IIOP_Interpreter" is no longer an
-          accurate name for the classes and files in question.
-
-Tue Mar  9 19:58:54 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/POA.{h,cpp}:
-        * tao/Makefile:
-        * tao/TAO[_Static].dsp:
-        * tao/POAManager.{h,i,cpp}: Moved POA_Manager implementation to
-          separate files.
-
-Tue Mar  9 15:40:06 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/Param_Test/big_union.cpp: Fixed a MSVC++
-          double-to-float warning.
-
-Tue Mar  9 15:35:31 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * examples/Quoter/Factory_Finder.cpp:
-        * examples/Quoter/Generic_Factory.cpp:
-        * examples/Quoter/server.cpp: Fixed null-pointer usage in the
-          server destructors when the naming service wasn't resolved.
-
-        * examples/Quoter/server.cpp: Also fixed some memory leaks.
-
-Tue Mar  9 13:42:49 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO_IDL/fe: Regenerated the y.tab.cpp file using Berkeley yacc
-          rather than yacc so the nifty tracing features will be enabled.
-
-Tue Mar  9 13:05:49 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * docs/releasenotes/index.html:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp: Fixed all the
-          Sequence_out parameters to get created even though their length
-          may be zero. This is according to the CORBA spec.
-
-Tue Mar 09 01:16:41 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.10 released.
-
-Tue Mar 09 00:52:42 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.9 released.
-
-Mon Mar  8 23:33:28 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: Fixed a problem in the Makefile.
-
-Mon Mar 08 22:20:32 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile (TAO_ORBSVCS_SRCS): if the Trader is
-          built without the Naming Service in TAO_ORBSVCS, add
-          IOR_Multicast because the Trader needs it.  Thanks to Seth for
-          reporting this.
-
-Mon Mar  8 20:49:45 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/params.h:
-        * tao/ORB_Core.cpp:
-        * docs/Options.html:
-        * docs/configurations.html:
-        * docs/releasenotes/orbcore.html:
-          Change the iioplite option to gioplite.
-
-        * tao/IIOP_ORB.h:
-        * tao/IIOP_ORB.cpp:
-          Added support for file://-style IORs; we simply use the
-          ACE_Read_Buffer class to read the IOR from the file and then
-          call string_to_object again.
-
-        * tao/GIOP.cpp: Fixed debug message.
-
-        * tao/Server_Request.cpp: Minor cosmetic fixes.
-
-Mon Mar  8 20:09:07 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/docs/releasenotes/index.html: Added an entry about the
-          Pluggable test.
-
-Mon Mar  8 19:02:21 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp: Added the new
-          typedefs for _ptr_type and _var_type (see Advanced CORBA
-          Programming with C++, section 7.6.1).  I couldn't find anywhere
-          that the IDL compiler generates code for template member
-          functions - everything like that in orbsvcs seems to be
-          handwritten. If anyone sees that I overlooked something. let me
-          know.
-
-Mon Mar  8 16:20:22 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB.i: Moved CORBA::string_dup() into the *.i file and made
-          it an inline method.  Thanks to Jon Biggar for suggesting this.
-
-Mon Mar  8 16:46:36 1999  Matthew J Braun  <mjb2@cs.wustl.edu>
-
-        * orbsvcs/tests/Logger/README: Changed description of correct test
-          output to reflect change from get_host_by_name () to
-          get_host_by_addr ().
-
-        * orbsvcs/orbsvcs/Log/Logger_i.cpp: Altered the return values in
-          verbosity_conversion to correspond to the changed values in
-          ace/Log_Msg.h. Also modified logv to use get_host_by_addr ()
-          rather than get_host_by_name (). This speeds things up
-          somewhat. Thanks to Ulf Jährig for pointing this out.
-
-Mon Mar  8 14:27:38 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Invocation.cpp:
-        * tao/IIOP_Transport.cpp:
-        * tao/Connect.cpp:
-        * tao/ORB.cpp:
-        * tao/skip.cpp: The first four files have the new ACE timeprobes
-          for the pluggable protocols test. The last has a change in
-          TAO_Marshal_Union::skip() from using
-          (ACE_Message_Block *) Any::value() to Any::_tao_get_cdr ().
-
-Mon Mar  8 13:44:23 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * tao/ORB.cpp: Added a superfast implementation of
-          CORBA::string_copy().  Thanks to Terry Rosenbaum
-          <Terry.Rosenbaum@Radiology.MSU.edu> for suggesting this and to
-          Jon Biggar <jon@biggar.org> for optimizing it still further ;-).
-
-Mon Mar  8 11:08:02 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
-
-        * TAO_IDL/include/utl_scope.h:
-          TAO_IDL/util/utl_scope.cpp: Incorporated the right scoping
-          lookup rules based on the latest CORBA 2.3 revisions. Thanks to
-          Torsten Kuepper <kuepper2@uni-wuppertal.de> for providing the
-          patches.
-
-Sun Mar  7 19:29:06 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * docs/Options.html (bgcolor): Updated the documentation for the
-          ORB configuration
-
-Sun Mar 07 17:39:22 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/IIOP_Transport.cpp (send): Remember to reset <iovcnt> after
-          we send out a batch of data.
-
-Sun Mar  7 17:27:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/client.cpp: Removed
-          ACE_OS::thr_exit(). this was borrowed from
-          IDL_Cubit/client.cpp. It has been decided that this usage is a
-          "Bad Thing"[TM], and that line has been removed from the IDL
-          Cubit client as well.
-
-Sun Mar 07 16:39:03 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/client.cpp (main): removed
-          call to ACE_OS::thr_exit ().  It's no longer necessary; it's
-          just a relic from a workaround that's no longer needed.  Thanks
-          to Jeff for noticing it.
-
-Sun Mar  7 16:03:51 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Pluggable/PP_Test_Client.{h,cpp}:
-        * TAO/performance-tests/Pluggable/PP_Test_Server.{h,cpp}:
-        * TAO/performance-tests/Pluggable/PP_Test_i.{h,cpp}:
-        * TAO/performance-tests/Pluggable/PP_Test.idl:
-        * TAO/performance-tests/Pluggable/client.cpp:
-        * TAO/performance-tests/Pluggable/server.cpp:
-        * TAO/performance-tests/Pluggable/client.dsp:
-        * TAO/performance-tests/Pluggable/server.dsp:
-        * TAO/performance-tests/Pluggable/Pluggable.dsw:
-        * TAO/performance-tests/Pluggable/Makefile:
-        * TAO/performance-tests/Pluggable/README: New files implementing
-          tests for pluggable protocols stuff, using ACE
-          Timeprobes. Builds and runs fine on NT, builds with suncc, but
-          client seg faults on ACE_OS::thr_exit().  I've emailed the doc
-          group to see if anyone can give me a hand with this bug.
-
-Sun Mar  7 10:41:58 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * orbsvcs/tests/Property/client.cpp: Fixed the g++ warnings
-
-Fri Mar  5 21:59:18 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * examples/Quoter/Factory_Finder.cpp:
-        * examples/Quoter/Factory_Finder_i.cpp:
-        * examples/Quoter/Quoter_i.cpp:
-        * examples/Quoter/Quoter_i.h:
-        * examples/Quoter/client.cpp:
-        * examples/Quoter/client.h:
-        * examples/Quoter/server.cpp:
-        * examples/Quoter/server.h: In general, redid a lot of exception
-          handling to work better with native exceptions.
-
-Fri Mar  5 20:50:23 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/Makefile: included the CosEvent_Channel in the list of
-          directories to build.
-
-        * orbsvcs/CosEvent_Service/CosEvent_Service{.h, .cpp}: replaced
-          the TAO_TRY macros with ACE_ macros.
-
-        * orbsvcs/tests/CosEC_Basic/{*.h, *.cpp}: replaced the TAO_TRY
-          macros with ACE_ macros.
-
-        * orbsvcs/tests/CosEC_Basic/CosECConsumer{.h.cpp}: added an ORB
-          pointer, which is used to shutdown the ORB after a <push> is
-          received by a consumer.
-
-        * orbsvcs/tests/CosEC_Basic/CosEC_Basic{.h, .cpp}: fixed a bug
-          that caused this test to fail - thanks to Jim Crossley
-          <jim@lads.com> for pointing this out.  The RtEC needs to be
-          constructed with a valid TAO_Reactive_Module_Factory. Creating
-          the Rtec on the heap with an initialized module factory fixed
-          this.
-
-        * orbsvcs/tests/CosEC_Multiple {*.h, *.cpp} replaced the TAO_TRY
-          macros with ACE_ macros.
-
-        * docs/releasenotes/index.html: updated the CosEC information.
-
-Fri Mar  5 18:11:04 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Added the new EC files.
-
-Fri Mar  5 16:43:06 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp: Fixed const
-          correctness problem, Sun/CC didn't even give a warning for this
-          one!
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp: Added
-          missing template instantiation.
-
-Fri Mar  5 15:12:00 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i:
-        * orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i:
-        * orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp: Added support
-          for timeout events, including a simple Timeout_Generator based
-          on the ORB's reactor.
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Fixed several
-          problems with g++ 2.7.2.X; thanks to David Levine for reporting
-          them.
-
-        * orbsvcs/tests/Makefile: Added a bunch of missing directories to
-          the list.
-
-        * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp: The Event2
-          service is compiled by default, not need to check for it.
-
-        * orbsvcs/Event_Service/Event_Service.h:
-        * orbsvcs/Event_Service/Event_Service.cpp: Added support for the
-          new EC implementation.
-
-        * tao/append.cpp:
-        * tao/decode.cpp:
-        * tao/deep_free.cpp:
-        * tao/encode.cpp:
-        * tao/skip.cpp: The debug messages are only be printed out if
-          TAO_debug_level is greater than 0.  Also fixed many of them.
-
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/ImplRepo_Service/Makefile:
-        * orbsvcs/tests/EC_Mcast/Makefile:
-        * orbsvcs/tests/EC_Throughput/Makefile:
-        * orbsvcs/tests/CosEC_Multiple/Makefile:
-        * orbsvcs/tests/Property/Makefile:
-        * orbsvcs/tests/Sched/Makefile:
-        * orbsvcs/tests/Sched_Conf/Makefile: Updated dependencies.
-
-        * orbsvcs/tests/ImplRepo/Makefile: Fixed the Makefile so it would
-          compile.
-
-        * orbsvcs/tests/ImplRepo/airplane_client_i.cpp: Fixed memory leak.
-
-        * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h:
-        * orbsvcs/orbsvcs/Event/EC_Command.h:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * orbsvcs/tests/ImplRepo/IR_Helper.cpp:
-          Minor cosmetic changes.
-
-Fri Mar 05 12:51:08 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * rules.tao.GNU: replaced -Wno-used for g++, but just for pre-2.8.
-          It has many complaints about unused parameters in generated
-          code.
-
-Fri Mar  5 12:15:50 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader/Trader.cpp: Removed some repeated
-          template instantiations.
-
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Removed some template
-          instantiations that belong in Trader/Trader.cpp
-
-Thu Mar 04 21:04:59 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Trader: Removed TAO_Hashable_ULong as all the
-          Trader classes were changed to use the new Hash_Map_Manager_Ex.
-
-Thu Mar  4 20:19:32 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp: Removed redundant
-          cast to ACE_Message_Block* of the return value of
-          _tao_get_cdr().
-
-Thu Mar  4 18:40:45 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/CurrentC.cpp: Changed the code for the >>= operator to get
-          rid of another Any::value() inconsistency and to reflect what
-          the IDL compiler now generates for these operators.
-
-Thu Mar  4 16:53:28 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: Removed some more
-          unused args, as noted by Irfan and g++.
-
-Thu Mar 04 16:29:41 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Added new Event Channel to the
-          orbsvcs project file.
-
-Thu Mar 04 16:08:22 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/Makefile: removed unused LSRC2 macro definition.
-
-Thu Mar  4 15:42:23 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Primarily cosmetic changes to
-          tao/GIOP.cpp
-          tao/GIOP.h
-          tao/IIOP_Acceptor.h
-          tao/IIOP_Connector.h
-          tao/IIOP_Profile.cpp
-          tao/IIOP_Profile.h
-          tao/IIOP_Profile.i
-          tao/IIOP_Transport.cpp
-          tao/IIOP_Transport.h
-          tao/Invocation.cpp
-          tao/Pluggable.cpp
-          tao/Pluggable.h
-          tao/Stub.cpp
-
-Thu Mar  4 15:14:19 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp:
-          Fixed minor warnings.
-
-Thu Mar  4 12:43:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Filter.i: Fixed nasty bug, thanks to
-          J. Russell Noseworthy <rnosewor@objectsciences.com> for catching
-          this one.
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: Removed a couple of
-          memory leaks, thanks to J. Russell Noseworthy
-          <rnosewor@objectsciences.com> for catching them up.
-
-        * orbsvcs/Event_Service/Makefile:
-        * orbsvcs/Event_Service/Event_Service.h:
-        * orbsvcs/Event_Service/Event_Service.cpp:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp: The ACE_EventChannel
-          implementation does not shutdown the ORB anymore, instead we use
-          composition in the Event_Service program to shutdown the ORB
-          there (where it actually makes sense).
-
-        * orbsvcs/orbsvcs/Makefile: Updated dependencies.
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i: Minor cosmetic
-          fixes.
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Command.h:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter_Builder.h:
-        * orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_QOS_Info.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-          Added the TAO_ORBSVCS_Export in many classes.
-
-Thu Mar 04 10:22:55 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
-          (parse_args): when type_count_ <= 0, moved the statement that
-          resets it to 1 to before the ACE_ERROR_RETURN.  That way, it
-          really will be reset to 1 :-)
-
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp (parse_args):
-          when ec_concurrency_hwm_ <= 0, moved the statement that resets
-          it to 1 to before the ACE_ERROR_RETURN.
-
-Wed Mar  3 18:28:51 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin_T.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin_T.i:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin_T.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp: Factored
-          out the collection of ProxyPushSuppliers from the ConsumerAdmin
-          class: it is used in other places like the SupplierFiltering
-          strategies.  I also added extensive documentation about the
-          several variations on this particular strategy.
-
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp: Added a new
-          SupplierFiltering strategy, simply keep the list of consumers
-          for each supplier.
-
-        * orbsvcs/orbsvcs/Event/EC_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.i:
-        * orbsvcs/orbsvcs/Event/EC_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.h:
-        * orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp: Changed the mechanism
-          to match suppliers and consumers: the filter objects have a new
-          method that can be used to detect if a event is potentially
-          interesting to the consumer.  The red-black tree is not needed
-          anymore.
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp: Moved the
-          instantiation of the EventHeader red-black tree to this file,
-          because now this is the only place we use it.
-
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp: Added new factory
-          methods to create and detroy EC_ProxyPushSupplier_Set objects.
-
-        * tao/orbconf.h: Added description of the
-          TAO_DOTTED_DECIMAL_ADDRESSES macro.
-
-        * tao/MProfile.i:
-        * tao/Any.h:
-        * orbsvcs/Event_Service/Event_Service.cpp: Minor cosmetic fixes.
-
-Wed Mar  3 18:15:14 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tests/Param_Test/client.dsp:
-        * tests/Param_Test/server.dsp: Added big_union.
-
-Wed Mar  3 03:05:06 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/README:
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile: Removed all
-          the naming service stuff from DII_Cubit_Test.  Made a note in
-          the README file that the IDL server no longer uses it
-          either. Also removed the orbsvcs library load from the makefile
-          since we no longer need it. And removed client.h from the VC
-          project file and the link to orbsvcsd.lib from same.
-
-Tue Mar  2 17:36:29 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/CosEventComm.idl:
-        * orbsvcs/orbsvcs/CosEventChannelAdmin.idl: added a comment header
-          to describe the idl file contents.
-
-Tue Mar  2 11:41:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/DoubleVisComp.java: Added
-          flexible monotonic scaling of all DoubleVisComp windows.
-
-Tue Mar  2 02:32:34 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/IIOP_Profile.{h,i,cpp}: Added new file IIOP_Profile.i for
-          inline functions.  Moved some accessors from .cpp file to .i
-          file.  Added _host_(), _port_(), _object_key_(),
-          reset_object_addr() when TAO_USES_FLICK is defined.  Flick needs
-          to access the structure directly.
-
-Mon Mar  1 23:37:58 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Server_Request.cpp: Fixed yet another instance of backwards
-          any_owns_data behavior, is dsi_marshal(). Will look at the rest
-          of Server_Request.cpp later - there seems to be questionable
-          stuff in the other methods as well.
-
-Mon Mar  1 17:57:18 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/dynany_test/test_dynsequence.cpp: Fixed a
-          double-deletion problem with a data string.  All the dynany test
-          code will need to be looked over for memory-handling behavior
-          since the many recent changes to the IDL compiler. Thanks to
-          Barry Hoggard for reporting this bug.
-
-Mon Mar  1 17:31:57 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/AV/sfp.cpp: Added the flowProtocol:: class
-          specifier for frameHeader so that it compiles on win32. Thanks
-          to David Hooker <DHooker@uniview.net> for the fix.
-
-Mon Mar 01 17:19:04 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.3.8 released.
-
-Mon Mar  1 14:43:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * docs/compiler.html: Fixed minor error in the IDL compiler
-          documentation, thanks to Frederic Maria <fmaria@lucent.com> for
-          pointing this out.
-
-Mon Mar 01 14:20:44 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO version 0.3.7 released.
-
-Mon Mar 01 08:28:26 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tao/ORB_Core.cpp: removed ACE_Guard<ACE_SYNCH_MUTEX> template
-          instantiation, because it collided with
-          ACE_Guard<ACE_Thread_Mutex> in ace/Synch.cpp.
-
-Sat Feb 27 20:05:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp: Removed
-          unused variables.
-
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp: The temporary used to
-          read the discriminant must be declared using the fully qualified
-          name of the type, because the operator>> is in the global scope.
-
-Fri Feb 26 23:41:08 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Oops, unlinking
-          of temp file should not be disable on non-Win32 platforms.
-          Thanks to David for noticing this.
-
-Fri Feb 26 23:30:12 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/Makefile: removed the clean target, because it deleted
-          tao_idl.  The realclean target does that.  Thanks to Tres Seaver
-          <tseaver@palladion.com> for reporting this.
-
-Fri Feb 26 21:03:47 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: Added support
-          for forwarding in stubs generated with compiled marshaling.  We
-          use the new ACE_TRY macros to do this.
-
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_union_label.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.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_include/be_type.h:
-        * TAO_IDL/be_include/be_union_branch.h: Fixed code generation for
-          unions whose discriminators are enums. It wasn't prefixing the
-          enum label with the scope where the enum was generated i.e. for
-          enums defined inside a module Foo it was using "value1" instead
-          of "Foo::value1".
-
-        * orbsvcs/orbsvcs/Event/Timer_Module.cpp: Fixed Timeprobe use.
-
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin_T.cpp: Minor cosmetic
-          fixes.
-
-        * orbsvcs/orbsvcs/Event/README: Added more details, started a
-          section that describes the interaction between the components.
-
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp: The
-          SupplierFiltering module splits an EventSet into single events
-          before passing them to the ProxyPushSuppliers, this is needed so
-          that filtering will work correctly.
-
-Fri Feb 26 18:29:04 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * orbsvcs/tests/Time/implrepo.conf
-          tests/NestedUpcall/MT_Client_Test/client.conf
-          examples/POA/On_Demand_Loading/svc.conf
-          examples/Quoter/client.conf
-          examples/Quoter/server.conf
-          performance-tests/Cubit/TAO/MT_Cubit/svc.conf
-          performance-tests/Thruput/TAO/svc.conf
-
-          Changed -ORBdemuxstrategy option to
-          -ORBsystemidpolicydemuxstrategy
-
-Fri Feb 26 18:00:52 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/Makefile:
-        * tao/TAO.dsp: Removed file Align.h from the repository, the
-          makefile and the project file. All that stuff moved to OS.h with
-          the CDR classes.
-
-Fri Feb 26 17:37:04 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Added the function next_profile_retry to stub object.
-
-Fri Feb 26 16:46:37 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Added some methods to Stub_Object for forwarding.
-
-Fri Feb 26 13:32:35 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/grid/README: New file for the benefit of the
-          community. Thanks to Dr.Schmidt for reminding me to do this.
-
-Fri Feb 26 12:44:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tests/Param_Test/big_union.cpp: Fixed some warnings for
-          Linux/EGCS.  check_validity was incomplete.
-
-        * tests/Param_Test/svc.conf: Removed obsolete options.
-
-Fri Feb 26 11:35:51 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/Makefile:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_visitor_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_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_include/be_codegen.h:
-        * TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h: Implemented
-          compiled marshaling for unions.  I also had to debug and fix
-          parts of the union implementation too.
-
-        * tests/Param_Test/Makefile:
-        * tests/Param_Test/run_test.pl:
-        * tests/Param_Test/tests.h:
-        * tests/Param_Test/driver.cpp:
-        * tests/Param_Test/driver.h:
-        * tests/Param_Test/options.cpp:
-        * tests/Param_Test/options.h:
-        * tests/Param_Test/param_test.idl:
-        * tests/Param_Test/param_test_i.cpp:
-        * tests/Param_Test/param_test_i.h:
-        * tests/Param_Test/big_union.h:
-        * tests/Param_Test/big_union.cpp: Added a new test for unions, the
-          union contains many basic types, sequences, arrays, variable and
-          fixed sized structures, object references, sequences, strings,
-          etc.  I couldn't test unions inside unions because there seems
-          to be a bug with union code generator.
-
-Fri Feb 26 10:06:57 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Fixed inline function ordering in Stub.i!
-
-Fri Feb 26 00:43:30 1999  Douglas C. Schmidt  <schmidt@ace.cs.wustl.edu>
-
-        * orbsvcs/orbsvcs: Updated all the ORB services IDL files so that
-          they are protected by #ifndef ... #endifs.  Thanks to Lothar
-          Werzinger <werzinger.lothar@krones.de> for this suggestion.
-
-Fri Feb 26 00:05:16 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.6 released.
-
-Thu Feb 25 23:38:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/decode.cpp: Fixed another confusion between an Any's value
-          and its message block. This one was in TAO_Marshal_Union.  Maybe
-          unions will work a little better now ;-).
-
-Thu Feb 25 20:19:26 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h:
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp:
-
-        Modified these files so that they will compile if ACE was built
-        without thread support by changing ACE_MT_SYNCH macros to
-        ACE_SYNCH and by using the ACE_SYNCH_SEMAPHORE macro instead of
-        ACE_Thread_Semaphore.  Thanks to Doug for suggesting the ACE_SYNCH
-        changes.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp: Modified
-          these files so that they will compile if ACE was built without
-          thread support by changing ACE_MT_SYNCH macros to ACE_SYNCH and
-          by using the ACE_SYNCH_SEMAPHORE macro instead of
-          ACE_Thread_Semaphore.  Thanks to Doug for suggesting the
-          ACE_SYNCH changes.
-
-        ACE_Condition in Task_Client.h for the unthreaded case will be
-        dealt with soon.
-
-          ACE_Condition in Task_Client.h for the unthreaded case will be
-          dealt with soon.
-
-Thu Feb 25 18:16:31 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp: IDL generated code
-          was passing in the size instead of the length for bounded
-          strings. Then CDR would add 1 to get back the size... Just
-          subtracted 1 in the appropriate spots in IDL compiler
-          code. Checked out the new version in param_test and all seems to
-          be ok. Thanks to Henrik Nordberg <hnordberg@lbl.gov> for
-          reporting this bug.
-
-Thu Feb 25 16:06:49 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * rules.tao.GNU: Added make commands to generate dummy *S_T.*
-          files when building with Flick.
-
-Thu Feb 25 15:53:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * TAO_IDL/be
-          TAO_IDL/driver: Changed the TAO_TRY macros with ACE_TRY macros
-          in the IDL generated stubs and skeletons
-
-Thu Feb 25 15:35:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp (main): removed
-          ACE_OS::thr_exit () call on VxWorks, because it's no longer
-          necessary: the client doesn't die on shutdown.
-
-Thu Feb 25 14:44:40 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * orbsvcs/Event/Timer_Module.cpp: Fixed a typo, still another
-          timeprobe error - not sure what was intended, will email
-          doc_group.
-
-Thu Feb 25 12:41:08 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/Orbix: Updated the Makefiles to use
-          the newer dependencies.  Thanks to Uma Markandu
-          <umam@nortelnetworks.com> for reporting this.
-
-Thu Feb 25 11:38:48 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/default_server.cpp (parse_args): Still allow the use of
-          -ORBdemuxstrategy but spit out a warning when used.
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Don't remove
-          temporary files on Win95/98.  Thanks to Rod Joseph
-          <rodjoseph@adt.com> for reporting the problem.
-
-        * docs/Options.html: Added a short note about the change of
-          -ORBdemuxstrategy.
-
-Thu Feb 25 09:27:07 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * TAO_IDL/util/utl_global.cpp: Use interpretive marshaling by
-          default, at least until unions work correctly.
-
-Wed Feb 24 23:21:53 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
-
-        * orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp:
-        * orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp: added #include
-          <ace/Get_Opt.h>
-
-Wed Feb 24 22:54:59 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/TAO_Internal.i (_svc_conf): This new function allows user to
-          overwrite TAO_DEFAULT_*_ARGS settings at application's main
-          without recompiling TAO library.  Notice these settings are
-          further overwritten by external svc.conf files because svc.conf
-          files are parsed before these fake entries.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf: -ORBdemuxstrategy
-          has become -ORBsystemidpolicydemuxstrategy now.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static: Fixed
-          static service's names.  Changed to use
-          -ORBsystemidpolicydemuxstrategy.
-
-        * tao/orbconf.cpp: Fixed TAO_DEFAULT_*_ARGS.
-
-        * tao/ORB_Core.cpp:
-        * tao/default_client.cpp:
-        * tao/default_server.cpp: Corrected names of the static services.
-
-Wed Feb 24 17:08:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Command.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin_T.h:
-        * orbsvcs/orbsvcs/Event/EC_Filter.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-          Fixed explicit template instantiations.
-
-Wed Feb 24 16:01:53 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * tao/Stub.cpp: Fred and I fixed up Location Forward logic in
-          do_static_call ().  It wasn't advancing the profiles when a
-          location forward message was returned.
-
-Wed Feb 24 14:13:03 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * docs/index.html: Added a link to
-          $ACE_ROOT/docs/exceptions.html.
-
-Wed Feb 24 11:45:29 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Added a test for multiple profile forwarding.  This test
-          verifies the Stub methods by duplicating the forwarding and
-          request handling logic in wrappers.
-          tests/Multiple_Profiles/forwarding.cpp
-
-Wed Feb 24 11:40:08 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Stub.cpp - changed goto two_way to goto one_way
-
-Wed Feb 24 11:07:32 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * Updated how forwarding is performed so that multiple profiles
-          are used.  This following files were modified.  These is still
-          an issue with concurrency since the Stub object is responsible
-          for managing the profile list and forwarding information.
-          IIOP_Profile.cpp
-          IIOP_Profile.h
-          Invocation.cpp
-          MProfile.cpp
-          MProfile.h
-          MProfile.i
-          Pluggable.cpp
-          Pluggable.h
-          Stub.cpp
-          Stub.h
-          Stub.i
-          encode.cpp
-
-Tue Feb 23 20:10:52 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Makefile: Added EC_ObserverStrategy to the set
-          of files for Event2
-
-        * orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/Event/EC_ConsumerAdmin.i:
-        * orbsvcs/Event/EC_ConsumerAdmin.cpp:
-        * orbsvcs/Event/EC_ConsumerAdmin_T.h:
-        * orbsvcs/Event/EC_ConsumerAdmin_T.i:
-        * orbsvcs/Event/EC_ConsumerAdmin_T.cpp:
-        * orbsvcs/Event/EC_SupplierFiltering.cpp: Implemented delayed
-          and/or immediate removal and additions from the ConsumerAdmin
-          internal set (of ProxyPushSupplier). This is important to
-          applications that use reactive dispatching and can generate
-          disconnections and/or connections to the EC as part of the
-          consumer upcalls.  This strategies require condition variables
-          and thus the use of templates to parametrize the locking
-          strategy.  I also added a simple policy to control the level of
-          concurrency in the ConsumerAdmin set: the user can specify how
-          many threads can be concurrently running on the ConsumerAdmin.
-          If this limit is exceeded then the new threads must wait until
-          all the other threads leave.  At that point the delayed
-          operations are executed.  This strategy ensures that operations
-          are not delayed forever; setting the HWM to 1 (the default)
-          ensures that operations are executed before the next upcall;
-          setting the HWM to a very high value results in maximum
-          concurrency; this could be a reasonable options if periodically
-          there are periods without any activity.
-
-        * orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/Event/EC_ObserverStrategy.i:
-        * orbsvcs/Event/EC_ObserverStrategy.cpp: Added missing destructor.
-          Minor cosmetic changes.
-
-        * orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/Event/EC_ProxySupplier.cpp: Added reference counting to
-          this objects.
-
-        * orbsvcs/Event/EC_Busy_Lock.h:
-        * orbsvcs/Event/EC_Busy_Lock.i:
-        * orbsvcs/Event/EC_Busy_Lock.cpp: A simple adapter that conforms
-          to the ACE_Lock interface. It invokes the busy() and idle()
-          method on another object to acquire and release.
-
-        * orbsvcs/Event/EC_Command.h:
-        * orbsvcs/Event/EC_Command.i:
-        * orbsvcs/Event/EC_Command.cpp: Implemented two simple Command
-          objects that can invoke the connected_i() and disconnected_i()
-          methods on another class, this are useful to implement the
-          delayed connection and disconnection from the EC.
-
-        * orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/Event/EC_Basic_Factory.cpp: Use the new EC_ConsumerAdmin
-          types with the right locking strategies.
-
-        * tests/EC_Throughput/ECT_Consumer.cpp:
-        * tests/EC_Throughput/ECT_Consumer.h:
-        * tests/EC_Throughput/ECT_Consumer_Driver.cpp:
-        * tests/EC_Throughput/ECT_Consumer_Driver.h:
-        * tests/EC_Throughput/ECT_Supplier.cpp:
-        * tests/EC_Throughput/ECT_Supplier.h:
-        * tests/EC_Throughput/ECT_Supplier_Driver.cpp:
-        * tests/EC_Throughput/ECT_Supplier_Driver.h:
-        * tests/EC_Throughput/ECT_Throughput.cpp:
-        * tests/EC_Throughput/ECT_Throughput.h: The test is more flexible
-          wrt event types subscribed by each consumer and published by the
-          suppliers, this could be useful to measure how the test scales
-          with the number of consumers and/or suppliers.
-
-        * orbsvcs/RtecEventComm.idl:
-        * orbsvcs/Event/EC_Event_Channel.cpp: Minor cosmetic changes.
-
-Tue Feb 23 19:44:20 1999  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_root/root.cpp: Added context state.
-          Thanks to Mason Taube.
-
-Tue Feb 23 18:11:11 1999 Kirthika Parameswaran  <kirthika@cs.wustl.edu>
-
-        * examples/Callback_Quoter/Callback_Quoter.dsw:
-          examples/Callback_Quoter/Notifier.dsp:
-          examples/Callback_Quoter/Consumer.dsp:
-          examples/Callback_Quoter/Supplier.dsp: Changes due to the
-          removal of the ACE_LACKS_PRAGMA_ONCE directive from the stubs
-          and skeletons generated by the tao_idl compiler.  This directive
-          caused compiler errors using MSVC 5.0. It went through when
-          compiled with MSVC 6.0.
-
-Tue Feb 23 17:22:00 1999 Chris Gill  <cdgill@cs.wustl.edu>
-
-        * examples/Simulator/DOVEBrowser/make.bat
-          examples/Simulator/DOVEMIB/DOVEMIB.dsp
-          examples/Simulator/DOVEMIB/DOVEMIBx.dsp
-          examples/Simulator/DOVEMIB/TestClient.dsp
-          examples/Simulator/Event_Supplier/DualEC_Sup.dsp
-          examples/Simulator/Event_Supplier/Event_Sup.dsp
-          examples/Simulator/Event_Supplier/Logging_Sup.dsp
-          orbsvcs/tests/Simulator/Makefile
-          orbsvcs/tests/Simulator/NavWeap.idl
-          orbsvcs/tests/Simulator/README
-          orbsvcs/tests/Simulator/DOVEBrowser/AnswerEvent.java
-          orbsvcs/tests/Simulator/DOVEBrowser/AnswerListener.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.html
-          orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowserApplet.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DataHandler.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DemoCore.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DemoObservable.java
-          orbsvcs/tests/Simulator/DOVEBrowser/DoubleVisComp.java
-          orbsvcs/tests/Simulator/DOVEBrowser/MTDataHandlerAdapter.java
-          orbsvcs/tests/Simulator/DOVEBrowser/MTQueue.java
-          orbsvcs/tests/Simulator/DOVEBrowser/Makefile
-          orbsvcs/tests/Simulator/DOVEBrowser/NS_Resolve.java
-          orbsvcs/tests/Simulator/DOVEBrowser/NavWeapDataHandler.java
-          orbsvcs/tests/Simulator/DOVEBrowser/NavigationVisComp.java
-          orbsvcs/tests/Simulator/DOVEBrowser/ObservablesDialog.java
-          orbsvcs/tests/Simulator/DOVEBrowser/Properties.java
-          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumer.java
-          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumer.java.JDK1.2
-          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumerFactory.java
-          orbsvcs/tests/Simulator/DOVEBrowser/PushConsumerFactory.java.JDK1.2
-          orbsvcs/tests/Simulator/DOVEBrowser/Queue.java
-          orbsvcs/tests/Simulator/DOVEBrowser/VisComp.java
-          orbsvcs/tests/Simulator/DOVEBrowser/VisCompFactory.java
-          orbsvcs/tests/Simulator/DOVEBrowser/WeaponsVisComp.java
-          orbsvcs/tests/Simulator/DOVEBrowser/make.bat
-          orbsvcs/tests/Simulator/DOVEMIB/AnyAnalyser.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/AnyAnalyser.h
-          orbsvcs/tests/Simulator/DOVEMIB/DOVEMIB.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/DOVEMIB.dsp
-          orbsvcs/tests/Simulator/DOVEMIB/DOVEMIB.dsw
-          orbsvcs/tests/Simulator/DOVEMIB/DOVEMIB.h
-          orbsvcs/tests/Simulator/DOVEMIB/DOVEMIBx.dsp
-          orbsvcs/tests/Simulator/DOVEMIB/Makefile
-          orbsvcs/tests/Simulator/DOVEMIB/Node.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/Node.h
-          orbsvcs/tests/Simulator/DOVEMIB/NodeVisitor.h
-          orbsvcs/tests/Simulator/DOVEMIB/PrintVisitor.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/PrintVisitor.h
-          orbsvcs/tests/Simulator/DOVEMIB/TestClient.dsp
-          orbsvcs/tests/Simulator/DOVEMIB/any_test.idl
-          orbsvcs/tests/Simulator/DOVEMIB/any_test_i.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/any_test_i.h
-          orbsvcs/tests/Simulator/DOVEMIB/clnt.cpp
-          orbsvcs/tests/Simulator/DOVEMIB/clnt.h
-          orbsvcs/tests/Simulator/DOVEMIB/svc.conf
-          orbsvcs/tests/Simulator/DOVEMIB/svr.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/DOVE_Supplier.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/DOVE_Supplier.h
-          orbsvcs/tests/Simulator/Event_Supplier/DualEC_Sup.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/DualEC_Sup.dsp
-          orbsvcs/tests/Simulator/Event_Supplier/DualEC_Sup.h
-          orbsvcs/tests/Simulator/Event_Supplier/EDF.dat
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Con.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Con.h
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.dsp
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.dsw
-          orbsvcs/tests/Simulator/Event_Supplier/Event_Sup.h
-          orbsvcs/tests/Simulator/Event_Supplier/Logging_Sup.cpp
-          orbsvcs/tests/Simulator/Event_Supplier/Logging_Sup.dsp
-          orbsvcs/tests/Simulator/Event_Supplier/Logging_Sup.h
-          orbsvcs/tests/Simulator/Event_Supplier/MLF.dat
-          orbsvcs/tests/Simulator/Event_Supplier/MUF.dat
-          orbsvcs/tests/Simulator/Event_Supplier/Makefile
-          orbsvcs/tests/Simulator/Event_Supplier/RMS.dat
-          orbsvcs/tests/Simulator/Event_Supplier/RMS_Dyn.dat
-          orbsvcs/tests/Simulator/Event_Supplier/svc.conf: moved the DOVE
-          Simulator from orbsvcs/tests to examples (adjusting NT project
-          files and batch scripts accordingly).
-
-Tue Feb 23 16:53:14 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp (run):
-          removed old comment that server shutdown would cause a
-          memPartFree on VxWorks.  It no longer does.
-
-        * performance-tests/Cubit/TAO/MT_Cubit/Globals.{h,cpp}
-          (sched_fifo_init): removed SCHED_PARAMS_FIFO macro, because it's
-          not needed, fixed name of program in comment.
-
-Tue Feb 23 15:24:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: Fixed some more
-          g++ warnings in generated code. It was unused arg in the case of
-          the union and an unnecessary ACE_NOTREACHED in the case of the
-          objref. If g++ is going to complain now about this, we might
-          need to add it to the list in the #define of ACE_NOTREACHED.
-
-Tue Feb 23 11:48:15 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp (start_client_stubs,
-          start_server_skeletons): removed #pragma once directives because
-          they do not make sense in .cpp files, plus they don't work with
-          MSVC 5.
-
-Mon Feb 22 20:34:02 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/orbsvcs_static.dsp: Totally broken.
-
-        * orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp: Fixed
-          configurations.
-
-        * orbsvcs/Concurrency_Service/Concurrency_Service.dsp: Fixed
-          Release build settings.
-
-Mon Feb 22 19:18:55 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * $TAO/examples/POA/RootPoa/RootPoa.cpp: Fixed a annoying warning
-          due to an unchecked exception
-
-        * examples/Simple/Simple_util.cpp:
-
-        * examples/Simple/bank/Makefile: Updated dependencies
-
-Mon Feb 22 19:13:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * examples/Simple/bank/Bank_Client_i.cpp: Removed an annoying
-          warning due to an unchecked exception.
-
-Mon Feb 22 19:15:09 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
-
-        * examples/Simple/bank/bank.dsw:
-        * examples/Simple/bank/client.dsp:
-        * examples/Simple/bank/server.dsp: Created MSVC Project files for
-          the Simple Bank Example.
-
-        * examples/TAO_Examples.dsw: Added the Simple Bank Example project
-          files.
-
-Mon Feb 22 14:27:44 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * rules.tao.GNU: Added rules to compile IDL files using Flick.
-          You need to invoke a Makefile with "use_flick=1" command line
-          flag.  Thanks to Tim Stack <stack@aros.net> for sending the
-          detailed instruction.
-
-Mon Feb 22 12:34:31 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * TAO_IDL/be/be_codegen.cpp
-          (start_client_header,start_client_stubs,
-          start_server_header,start_server_skeletons): added #pragma once
-          directives to generated code.  Thanks to Doug for suggesting
-          this.
-
-Mon Feb 22 10:32:09 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Quoter/Factory_Finder.cpp
-        * examples/Quoter/Factory_Finder_i.cpp
-        * examples/Quoter/Generic_Factory.cpp
-        * examples/Quoter/Generic_Factory_i.cpp
-        * examples/Quoter/Quoter.cpp: Changed the TAO_TRY macros to
-          ACE_TRY macros.
-
-Mon Feb 22 09:38:29 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp:
-        * orbsvcs/orbsvcs/Event/Module_Factory.cpp:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-        * orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp:
-        * orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
-        * orbsvcs/tests/Trading/Service_Type_Exporter.cpp:
-        * performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
-        * tao/IIOP_Profile.cpp:
-          Added some ACE_UNUSED_ARGs to prevent g++ 2.7.x from warning
-          about unused arguments.
-
-Sun Feb 21 21:48:12 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/POA: Changed TAO_TRY macros to ACE_TRY macros.
-
-Sun Feb 21 18:59:15 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
-
-        * TAO version 0.3.5 released.
-
-Sun Feb 21 17:29:28 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/bank/server.cpp:
-        * examples/Simple/bank/AccountManager_i.cpp:
-          Fixed compilation error in EGCS compiler
-
-Sun Feb 21 16:54:46 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/MProfile.i: Modifed TAO_MProfile::get_prev() and
-          TAO_MProfile::get_current_profile() to always return a value -
-          warning turned up in VC 6.0.
-
-Sun Feb 21 16:38:15 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-        * TAO_IDL/driver/drv_preproc.cpp (DRV_pre_proc): Took care of
-          #includes with <>'s in the idl files. Thanks to Mark Little
-          <M.C.Little@ncl.ac.uk> for pointing this out.
-
-Sun Feb 21 09:07:38 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * orbsvcs/tests/EC_Throughput/ECT_Driver.cpp (dump_results): fixed
-          64-to-32 bit conversions so that they operate on the 64-bit
-          quantity directly, instead of a quotient.  And, divide by a
-          float instead of an int, to use floating point division.  Thanks
-          to Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca> for reporting
-          that the code attempted to convert an unsigned 64-bit integer to
-          a double.  That's not supported by MSVC++ 5.0.
-
-Sat Feb 20 21:09:49 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
-
-        * examples/Simple/bank/AccountManager_i.cpp (AccountManager_i):
-        * examples/Simple/bank/Bank_Client_i.cpp:
-        * examples/Simple/bank/Bank_Client_i.h:
-        * examples/Simple/bank/client.cpp:
-        * examples/Simple/bank/server.cpp:
-          Made changes to the TAO_TRY macros
-
-Sat Feb 20 15:55:01 1999  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Param_Test/Makefile: moved TAO_IDLFLAGS override to after
-          includes, so that any settings in platform_macros.GNU are not
-          lost.
-
-Sat Feb 20 000:28:57 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * tao/InconsistentTypeCodeC.h: Added title and description to the
-          class header.
-
-Fri Feb 19 23:12:58 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp: Updated to
-          the new request arg manipulation functions.  Commented out
-          cube_union for the present until compiled marshaling gets
-          finished for unions.
-
-Fri Feb 19 22:53:19 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
-
-        * TAO/tao/Pluggable: Began to add support for CORBA operation
-          calls that can timeout.  Thanks to Kevin Royalty
-          <kroyalty@mdc.com> for suggesting this.
-
-Fri Feb 19 21:52:45 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
-
-        * tao/Invocation.cpp: The Twoway_Invocation class was re-fetching
-          the profile and transport objects *after* sending the
-          request. But during a nested upcall the transport hint in the
-          current profile can change (if an invocation over the same
-          object reference is required).  The solution is to keep a
-          reference to the transport object in the stack and pass it down
-          to the invoke_i() method of the GIOP_Invocation class.  Thanks
-          to Hans Horsmann <Hans.Horsmann@icn.siemens.de> for reporting
-          this bug.
-
-Thu Feb 18 20:07:10 1999  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
-
-        * TAO_IDL/be/be_visitor_factory.cpp: Added missing context states
-          in the TAO_Compiled_Visitor_Factory for servant implementation
-          files Thanks to Mason Taube <taube@westcon.prc.com> for bringing
-          it to our notice.
-
-Thu Feb 18 17:28:43 1999  Jeff Parsons  <parsons@cs.wustl.edu>
-
-        * TAO/tests/dynany_test/Makefile: Fixed a line that needed to
-          start with a tab. Thanks to Hakan Kallberg <hk@simulina.se> for
-          reporting this.
-
-Thu Feb 18 00:50:10 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/MProfile.cpp: Need to include MProfile.i here when not
-          inlined.
-
-Wed Feb 17 17:57:01 1999 Fred Kuhns <fredk@cs.wustl.edu>
-
-        * IIOP_ORB.cpp MProfile.cpp MProfile.h ORB.cpp Stub.cpp Stub.h
-          Stub.i decode.cpp MProfile.i Inlined many of the MProfile
-          methods Also, changed MProfile so it could assume ownership of a
-          profile, thus saving a lock.
-
-Wed Feb 17 10:45:28 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i:
-        * orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp: I added an strategy
-          to support the Event Channel observers. The Event Channel uses
-          this strategy to implement the append_observer(),
-          remove_observer() methods and it informs the strategy of any
-          changes in the set of consumers and/or suppliers.
-
-        * orbsvcs/orbsvcs/RtecEventChannelAdmin.idl: The operation
-          remove_observer can also raise a SYNCHRONIZATION_ERROR exception
-
-        * orbsvcs/orbsvcs/Event/EC_Filter.h: Added a typedef for the
-          HeaderSet iterator.
-
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i:
-        * orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp: Made the iterator
-          over the set of consumers a public interface.
-
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/Event_Channel.i:
-        * orbsvcs/orbsvcs/Event/Event_Channel.cpp: Minor cosmetic fixes.
-
-Tue Feb 16 17:15:12 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.{h,cpp}:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.{h,cpp}
-          Defined a new VideoBuffer () class for the Video buffering
-          process and AudioBuffer class for the audio buffering process
-          and used the reactor for i/o handling instead of blocking i/o
-          calls. Also uses a socketpair between the control process for
-          exit notifications which eliminates the SIGUSR* signals. Also
-          replaced the exit () calls with reactor end_event_loop so that
-          the processes exit cleanly.
-
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp: Replaced
-          the SIGUSR signals code with socket notification code.
-
-Tue Feb 16 16:48:28 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-        * tao/Exception.{h,cpp} (print_exception): Added this method to
-          print out the exception type in a human readable form.  This is
-          not CORBA compliant and should never be used directly in user
-          code.
-
-        * tao/Environment.cpp (print_exception): Changed to use _narrow to
-          determine if we have a SystemException or not.
-
-        * tao/Invocation.cpp (location_forward): Changed to use
-          ACE_PRINT_EXCEPTION.
-
-Tue Feb 16 16:45:38 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
-
-        * tao/Invocation.cpp: Fixed warning due to unproper use of ACE_TRY
-          macros, this time the warning was *very* significant.
-
 Mon Feb 15 21:22:55 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_docall_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp: Some g++ unused
-          arg warning fixes I overlooked checking in.
+        * TAO_IDL/be/be-visitor_argument/post_upcall_ss.cpp:
+        * TAO_IDL/be/be-visitor_argument/pre_docall_cs.cpp:
+        * TAO_IDL/be/be-visitor_argument/upcall_ss.cpp:
+          Some g++ unused arg warning fixes I overlooked checking in.
 
 Mon Feb 15 17:24:52 1999  Pradeep Gore  <pradeep@flamenco.cs.wustl.edu>
 
-        * tao/Invocation.cpp:
-        * tao/Invocation.i: replaced all the TAO_TRY macros with their
-          ACE_ equivalents.
-
+	* tao/Invocation.cpp: 
+	* tao/Invocation.i: 
+	  replaced all the TAO_TRY macros with their ACE_ equivalents.
+	
 Mon Feb 15 16:24:42 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tests/CDR/Makefile:
-        * tests/CDR/allocator.cpp: Added a new test to measure the effect
-          of using TSS allocators in the CDR streams.
+	* tests/CDR/Makefile: 
+	* tests/CDR/allocator.cpp: 
+	  Added a new test to measure the effect of using TSS allocators
+	  in the CDR streams.
 
 Mon Feb 15 13:26:29 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -9493,19 +26,24 @@ Mon Feb 15 10:45:10 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell
 
         * TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp:
         * TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.cpp:
-          Jeff's changes are now valid only for the "inout" paramater and
-          not to the "out" parameter.
+
+	  Jeff's changes are now valid only for the "inout" paramater and
+	  not to the "out" parameter.
 
 Mon Feb 15 09:11:27 EST 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
 
-        * TAO_IDL/be/be_visitor_argument.cpp
-          TAO_IDL/be_include/be_visitor_argument.h: Jeff had forgotten to
-          #include the newly added files that he mentioned in his
-          ChangeLog below. Due to this, we wre getting compile errors.
+	* TAO_IDL/be/be_visitor_argument.cpp
+	  TAO_IDL/be_include/be_visitor_argument.h:
 
-        * TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h: Once
-          again, Jeff had forgotten to add the visit_string method to the
-          class declaration, although he had provided the implementation.
+	  Jeff had forgotten to #include the newly added files that he
+	  mentioned in his ChangeLog below. Due to this, we wre getting
+	  compile errors.
+	 
+	* TAO_IDL/be_include/be_visitor_argument/post_docall_cs.h:
+
+	  Once again, Jeff had forgotten to add the visit_string method to
+	  the class declaration, although he had provided the
+	  implementation. 
 
 Sun Feb 14 18:29:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -9514,200 +52,204 @@ Sun Feb 14 18:29:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
         * TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp:
         * TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.cpp:
         * TAO_IDL/be_include/be_visitor_operation/operation_cs.h:
-        * TAO_IDL/be_include/be_visitor_operation/arglist.h: Added
-          post_invoke string_free() for INOUT and OUT strings, and
+        * TAO_IDL/be_include/be_visitor_operation/arglist.h:
+          Added post_invoke string_free() for INOUT and OUT strings, and
           release() for OUT objects, to plug a leak found with Purify.
           Added the compiled marshaling version classes for this as well.
-          Changed the spot where post_invoke lines are generated, plus
+          Changed the spot where post_invoke lines are generated, plus 
           some other cosmetic fixes.
 
 Sun Feb 14 12:41:55 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/Invocation.cpp:
-        * tao/Pluggable.cpp: We must always check the environment after
-          passing it down to another function.
-
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_ORB.cpp:
-        * tao/IIOP_Profile.cpp:
-        * tao/ORB.cpp:
-        * tao/Object_KeyC.cpp:
-        * tao/POAC.cpp:
-        * tao/Typecode_Constants.cpp:
-        * tao/orbconf.h: Several cosmetic fixes, mostly trailing spaces
-          removed.
+	* tao/Invocation.cpp: 
+	* tao/Pluggable.cpp: 
+	  We must always check the environment after passing it down to
+	  another function.
+
+	* tao/IIOP_Acceptor.cpp: 
+	* tao/IIOP_Connector.cpp: 
+	* tao/IIOP_ORB.cpp: 
+	* tao/IIOP_Profile.cpp: 
+	* tao/ORB.cpp: 
+	* tao/Object_KeyC.cpp: 
+	* tao/POAC.cpp: 
+	* tao/Typecode_Constants.cpp: 
+	* tao/orbconf.h: 
+	  Several cosmetic fixes, mostly trailing spaces removed.
 
 Sat Feb 13 17:52:01 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp,
-        * orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp),
-        * orbsvcs/orbsvcs/Time/Timer_Helper.cpp: Changed the following to
-          make the time returned in units of 100 nanoseconds instead of
-          seconds.
+	Changed the following to make the time returned in units of 100
+	nanoseconds instead of seconds.
+
+	* orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp :
+	* orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp) :
+	* orbsvcs/orbsvcs/Time/Timer_Helper.cpp :
 
 Sat Feb 13 01:11:52 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp:
-        * orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp:
-          Replaced the _env environment variable usages with the
-          TAO_IN_ENV parameters.
+	* orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp:
+	* orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp:
+	  Replaced the  _env environment variable usages with the TAO_IN_ENV
+	  parameters.
 
 Fri Feb 12 22:04:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Event/EC_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
-        * orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
-        * orbsvcs/orbsvcs/Event/EC_Event_Channel.i: Added new methods to
-          create the locking strategies in the ProxyPushConsumer and
-          ProxyPushSupplier.  The Null_Factory uses
-          ACE_Lock_Adapter<ACE_Null_Mutex>, the Basic_Factory uses
-          ACE_Lock_Adapter<ACE_SYNCH_MUTEX>.
+	* orbsvcs/orbsvcs/Event/EC_Factory.h:
+	* orbsvcs/orbsvcs/Event/EC_Basic_Factory.h:
+	* orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Null_Factory.h:
+	* orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp:
+	* orbsvcs/orbsvcs/Event/EC_Event_Channel.h:
+	* orbsvcs/orbsvcs/Event/EC_Event_Channel.i:
+	  Added new methods to create the locking strategies in the
+	  ProxyPushConsumer and ProxyPushSupplier.
+	  The Null_Factory uses ACE_Lock_Adapter<ACE_Null_Mutex>, the
+	  Basic_Factory uses ACE_Lock_Adapter<ACE_SYNCH_MUTEX>.
 
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.i:
-        * orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp: The
-          ProxyPushSupplier uses the new locking strategies.  A couple of
-          private _i methods were added to avoid dead-locks.
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.h:
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.i:
+	* orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp:
+	  The ProxyPushSupplier uses the new locking strategies.
+	  A couple of private _i methods were added to avoid dead-locks.
 
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.h:
-        * orbsvcs/orbsvcs/Event/EC_Dispatching.cpp: The dispatching
-          strategy receives the consumer object reference from the
-          ProxyPushSupplier, otherwise it has to make an upcall and incurs
-          in a dead-lock.
+	* orbsvcs/orbsvcs/Event/EC_Dispatching.h:
+	* orbsvcs/orbsvcs/Event/EC_Dispatching.cpp:
+	  The dispatching strategy receives the consumer object reference
+	  from the ProxyPushSupplier, otherwise it has to make an upcall
+	  and incurs in a dead-lock.
 
-        * orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
-        * orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
-        * orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp: Minor cosmetic
-          changes.
+	* orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h:
+	* orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp:
+	* orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp:
+	  Minor cosmetic changes.
 
-        * orbsvcs/orbsvcs/Makefile: Added dependencies for the new Event2
-          service.
+	* orbsvcs/orbsvcs/Makefile:
+	  Added dependencies for the new Event2 service.
 
-        * tao/GIOP.cpp: Added some comments.
+	* tao/GIOP.cpp:
+	  Added some comments.
 
 Fri Feb 12 21:20:49 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp:
-        * TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp:
-        * TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp:
-        * TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp:
-        * TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
-        * TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.{h,cpp}:
-        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
-        * TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
-        * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
-        * TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h:
-        * TAO/orbsvcs/orbsvcs/Trader/Trader_T.h:
-        * TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
-        * TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp:
-        * TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp:
-        * TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp:
-        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
-        * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
-        * TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
-        * TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.cpp:
-        * TAO/orbsvcs/Time_Service/IR_Helper.cpp:
-        * TAO/orbsvcs/Time_Service/Server_i.cpp:
-        * TAO/orbsvcs/Time_Service/Clerk_i.cpp:
-        * TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * TAO/orbsvcs/tests/Simple_Naming/client.cpp:
-        * TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
-        * TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
-        * TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
-        * TAO/orbsvcs/tests/Concurrency/CC_tests.cpp:
-        * TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp:
-        * TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp:
-        * TAO/orbsvcs/tests/Trading/TT_Info.h:
-        * TAO/orbsvcs/tests/Trading/Simple_Dynamic.h:
-        * TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp:
-        * TAO/examples/Callback_Quoter/Consumer_i.cpp:
-        * TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
-        * TAO/examples/Callback_Quoter/Notifier_i.cpp:
-        * TAO/examples/POA/Forwarding/Servant_Locator.cpp:
-        * TAO/examples/POA/Generic_Servant/MyFooServant.cpp:
-        * TAO/examples/Simple/bank/Account_i.cpp:
-        * TAO/examples/Simple/bank/Server_i.cpp:
-        * TAO/examples/Simple/bank/Client_i.cpp:
-        * TAO/examples/Simple/chat/Broadcaster_i.cpp:
-        * TAO/examples/Simple/echo/Echo_i.cpp:
-        * TAO/examples/Simple/time/Time_i.cpp:
-        * TAO/examples/Simple/grid/Grid_i.cpp:
-        * TAO/tests/OctetSeq/OctetSeq.cpp:
-        * TAO/tests/NestedUpcall/Reactor/reactor_i.cpp:
-        * TAO/tests/NestedUpcall/Reactor/eh_i.cpp:
-        * TAO/tests/NestedUpcall/Traingle_Test/Object_A_i.cpp:
-        * TAO/tests/NestedUpcall/Traingle_Test/Object_B_i.cpp:
-        * TAO/tests/NestedUpcall/Traingle_Test/Initiator_i.cpp:
-        * TAO/tests/NestedUpcall/Traingle_Test/initiator.cpp:
-          This takes care of the g++ unused arg warnings for all except
-          IDL-generated code. I'm sure there are some mistakes in here,
-          and I may have missed a file or two. I'll build what I can
-          before I go tonight, but there will still be a few mistakes, I'm
-          sure.
+	* TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp:
+	* TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp:
+	* TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp:
+	* TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp:
+	* TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp:
+	* TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.{h,cpp}:
+	* TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp:
+	* TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp:
+	* TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+	* TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h:
+	* TAO/orbsvcs/orbsvcs/Trader/Trader_T.h:
+	* TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp:
+	* TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp:
+	* TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp:
+	* TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp:
+	* TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp:
+	* TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp:
+	* TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+	* TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
+	* TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h:
+	* TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.cpp:
+	* TAO/orbsvcs/Time_Service/IR_Helper.cpp:
+	* TAO/orbsvcs/Time_Service/Server_i.cpp:
+	* TAO/orbsvcs/Time_Service/Clerk_i.cpp:
+	* TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+	* TAO/orbsvcs/tests/Simple_Naming/client.cpp:
+	* TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp:
+	* TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp:
+	* TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp:
+	* TAO/orbsvcs/tests/Concurrency/CC_tests.cpp:
+	* TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp:
+	* TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp:
+	* TAO/orbsvcs/tests/Trading/TT_Info.h:
+	* TAO/orbsvcs/tests/Trading/Simple_Dynamic.h:
+	* TAO/examples/Callback_Quoter/Consumer_Signal_Handler.cpp:
+	* TAO/examples/Callback_Quoter/Consumer_i.cpp:
+	* TAO/examples/Callback_Quoter/Supplier_Timer_Handler.cpp:
+	* TAO/examples/Callback_Quoter/Notifier_i.cpp:
+	* TAO/examples/POA/Forwarding/Servant_Locator.cpp:
+	* TAO/examples/POA/Generic_Servant/MyFooServant.cpp:
+	* TAO/examples/Simple/bank/Account_i.cpp:
+	* TAO/examples/Simple/bank/Server_i.cpp:
+	* TAO/examples/Simple/bank/Client_i.cpp:
+	* TAO/examples/Simple/chat/Broadcaster_i.cpp:
+	* TAO/examples/Simple/echo/Echo_i.cpp:
+	* TAO/examples/Simple/time/Time_i.cpp:
+	* TAO/examples/Simple/grid/Grid_i.cpp:
+	* TAO/tests/OctetSeq/OctetSeq.cpp:
+	* TAO/tests/NestedUpcall/Reactor/reactor_i.cpp:
+	* TAO/tests/NestedUpcall/Reactor/eh_i.cpp:
+	* TAO/tests/NestedUpcall/Traingle_Test/Object_A_i.cpp:
+	* TAO/tests/NestedUpcall/Traingle_Test/Object_B_i.cpp:
+	* TAO/tests/NestedUpcall/Traingle_Test/Initiator_i.cpp:
+	* TAO/tests/NestedUpcall/Traingle_Test/initiator.cpp:
+	  This takes care of the g++ unused arg warnings for all except
+ 	  IDL-generated code. I'm sure there are some mistakes in here,
+ 	  and I may have missed a file or two. I'll build what I can
+ 	  before I go tonight, but there will still be a few mistakes, I'm
+ 	  sure.
 
 Fri Feb 12 17:30:50 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * TAO_IDL/be/be_visitor_argument/pre_docall_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp: I missed a couple.
+        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp:
+          I missed a couple.
 
 Fri Feb 12 17:12:33 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * TAO_IDL/util/utl_scope.cpp:
-        * TAO_IDL/be/be_visitor.cpp:
-        * TAO_IDL/be/be_visitor_argument/argument.cpp:
-        * TAO_IDL/be/be_visitor_argument/docall_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/array.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_is.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union.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_reset_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+	* TAO_IDL/be/be_visitor.cpp:
+	* TAO_IDL/be/be_visitor_argument/argument.cpp:
+	* TAO_IDL/be/be_visitor_argument/docall_cs.cpp:
+	* TAO_IDL/be/be_visitor_argument/post_marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp:
+	* TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/pre_invoke_cs.cpp:
+	* TAO_IDL/be/be_visitor_array/array.cpp:
+	* TAO_IDL/be/be_visitor_exception/exception.cpp:
+	* TAO_IDL/be/be_visitor_field/field_ch.cpp:
+	* TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+	* TAO_IDL/be/be_visitor_interface/interface.cpp:
+	* TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+	* TAO_IDL/be/be_visitor_operation/rettype_is.cpp:
+	* TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp:
+	* TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp:
+	* TAO_IDL/be/be_visitor_structure/structure.cpp:
+	* TAO_IDL/be/be_visitor_typedef/typedef.cpp:
+	* TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
+	* TAO_IDL/be/be_visitor_union/union.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_reset_cs.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_access_cs.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_cs.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
           Fixed g++ unused arg warnings for the TAO_IDL files.
 
 Fri Feb 12 16:16:19 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/POA.cpp: Added missing parens.
+	* tao/POA.cpp: Added missing parens.
 
-        * docs/configurations.html: Changed the pointer to multi-thread,
-          thread-per-connection example back to IDL_Cubit.
+	* docs/configurations.html: Changed the pointer to multi-thread,
+	  thread-per-connection example back to IDL_Cubit.
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Makefile: Changed to
-          generate collocation_test executable to collocation/ so it can
-          use a different default svc.conf file.
+	* performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp:
+	* performance-tests/Cubit/TAO/IDL_Cubit/Makefile: Changed to
+	  generate collocation_test executable to collocation/ so it can
+	  use a different default svc.conf file.
 
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.static:
-        * performance-tests/Cubit/TAO/IDL_Cubit/svc.conf: Changed to use
-          global ORB resources.
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.static:
+	* performance-tests/Cubit/TAO/IDL_Cubit/svc.conf: Changed to use
+	  global ORB resources.
 
 Fri Feb 12 15:04:24 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -9724,113 +266,115 @@ Fri Feb 12 15:04:24 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 Fri Feb 12 12:55:53 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/Simple_util.cpp: Fix for the warning from
-          Digital Unix
+	* examples/Simple/Simple_util.cpp:
+	  Fix for the warning from Digital Unix
 
 Fri Feb 12 10:03:56 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
         * tao/IIOP_Profile.{h,cpp}
-          tao/ORB.cpp
-          tao/Stub.{i,cpp} Modified Stub and IIOP_Profile creation to use
-          the cached address info in the orb_core.  Thanks to Dr. David
-          A. Janello <argon@mcs.net> for reporting this performance
-          problem.
+	  tao/ORB.cpp
+	  tao/Stub.{i,cpp}
+	  Modified Stub and IIOP_Profile creation to use the cached
+ 	  address info in the orb_core.  Thanks to Dr. David A. Janello
+ 	  <argon@mcs.net> for reporting this performance problem.
 
         * Modified tao/Stub.i to not print warning messages with a
-          forwarded request is itself forwarded.  Since the multiple
-          profile code and forwarding is still in development I left a
-          debug message.
+ 	  forwarded request is itself forwarded.  Since the multiple
+ 	  profile code and forwarding is still in development I left a
+ 	  debug message.
 
 Fri Feb 12 09:35:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
         * TAO/orbsvcs/tests/Simulator/DOVEBrowser/DemoCore.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/DoubleVisComp.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/MTQueue.java
-          TAO/orbsvcs/tests/Simulator/DOVEBrowser/make.bat: changed all
-          uses of notify () to notifyAll () in MTQueue class, added
-          monotonic scaling of windows for the dual EC demo.
+          TAO/orbsvcs/tests/Simulator/DOVEBrowser/make.bat: changed
+          all uses of notify () to notifyAll () in MTQueue class, added
+ 	  monotonic scaling of windows for the dual EC demo.
 
         * TAO/orbsvcs/tests/Simulator/Event_Supplier/DOVE_Supplier.{cpp, h}
           TAO/orbsvcs/tests/Simulator/Event_Supplier/DualEC_Sup.{cpp, h}:
           added dummy registrations to schedulers to ensure priority
-          separation for high and low priority channels, put all threads
-          in DualEC_Sup process into the realtime scheduling class.
+ 	  separation for high and low priority channels, put all threads
+ 	  in DualEC_Sup process into the realtime scheduling class.
 
 Thu Feb 11 20:11:33 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/grid/Grid_Client_i.cpp:
-        * examples/Simple/grid/Grid_Client_i.h:
-        * examples/Simple/grid/client.cpp: Made changes to accomodate
-          changes that were put in to Simple_util for Naming service.
+	* examples/Simple/grid/Grid_Client_i.cpp:
+	* examples/Simple/grid/Grid_Client_i.h:
+	* examples/Simple/grid/client.cpp:
+	  Made changes to accomodate changes that were put in to
+ 	  Simple_util for Naming service.
 
 Thu Feb 11 18:01:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO/performance-tests/cubit/tao/idl_cubit/Cubit_Client.cpp: Took
-          out one too many "unused args". Had to put one back.  Thanks to
-          Nanbor for pointing this out.
+        * TAO/performance-tests/cubit/tao/idl_cubit/Cubit_Client.cpp:
+          Took out one too many "unused args". Had to put one back.
+  	  Thanks to Nanbor for pointing this out.
 
 Thu Feb 11 17:37:02 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/time/client.cpp (main):
-        * examples/Simple/time/Time_Client_i.cpp:
-        * examples/Simple/time/Time_Client_i.h
-        * examples/Simple/echo/client.cpp:
-        * examples/Simple/echo/Echo_Client_i.cpp:
-        * examples/Simple/echo/Echo_Client_i.h
-        * examples/Simple/Simple_util.cpp
-        * examples/Simple/Simple_util.h: Made changes to use the name
-          service.
+	* examples/Simple/time/client.cpp (main):
+	* examples/Simple/time/Time_Client_i.cpp:
+	* examples/Simple/time/Time_Client_i.h
+	* examples/Simple/echo/client.cpp:
+	* examples/Simple/echo/Echo_Client_i.cpp:
+	* examples/Simple/echo/Echo_Client_i.h
+	* examples/Simple/Simple_util.cpp
+	* examples/Simple/Simple_util.h:
+	  Made changes to use the name service.
 
 Thu Feb 11 16:01:17 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/Time_Service/Clerk_i.cpp: Changed the ior_read () method
-          to use ACE_Read_Buffer instead of fscanf (). Also ran purify on
-          this. Got 0 memory leaks.
+	* orbsvcs/Time_Service/Clerk_i.cpp: Changed the ior_read () method
+ 	  to use ACE_Read_Buffer instead of fscanf (). Also ran purify on
+ 	  this. Got 0 memory leaks.
 
-        * orbsvcs/Time_Service/Clerk_i.h (class Clerk_i): Changed ior_fp_
-          from FILE * to int. Used an ACE_HANDLE instead of FILE*.
+	* orbsvcs/Time_Service/Clerk_i.h (class Clerk_i): Changed ior_fp_
+ 	  from FILE * to int. Used an ACE_HANDLE instead of FILE*.
 
 Thu Feb 11 15:36:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * orbsvcs/Trader/Trader_Utils.h: Fixed a g++ unused arg warning.
+        * orbsvcs/Trader/Trader_Utils.h:
+          Fixed a g++ unused arg warning.
 
 Thu Feb 11 15:29:20 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/Exception.h:
-        * tao/Environment.{h,cpp}: Unprotected private members and add
-          exception id and major number to CORBA_Environment if
-          TAO_USES_FLICK is defined.  Thanks to Tim Stack <stack@aros.net>
-          for notifying us the change.
+	* tao/Exception.h:
+	* tao/Environment.{h,cpp}: Unprotected private members and add
+	  exception id and major number to CORBA_Environment if
+ 	  TAO_USES_FLICK is defined.  Thanks to Tim Stack <stack@aros.net>
+ 	  for notifying us the change.
 
 Thu Feb 11 15:28:49 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Fixed the g++ unused
-          argument warnings. Thanks to Irfan for reporting this.
+	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: Fixed the g++ unused
+	  argument warnings. Thanks to Irfan for reporting this.
 
 Thu Feb 11 15:12:08 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/Forwarding_Servant.cpp (_primary_interface): Fixed the g++
-          unused arg warnings.
+	* tao/Forwarding_Servant.cpp (_primary_interface): Fixed the g++
+	  unused arg warnings.
 
 Thu Feb 11 15:02:44 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * TAO/performance-tests/Cubit/tao/idl_cubit/Cubit_Client.cpp:
-          Fixed the g++ unused arg warnings.
+	  Fixed the g++ unused arg warnings.
 
 Thu Feb 11 14:59:52 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * orbsvcs/tests/Property/client.cpp:
-        * orbsvcs/orbsvcs/CosPropertyService.idl:
-        * orbsvcs/orbsvcs/AVStreams.idl:
-        * orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp : Fixed the
-          problem with marshalling/demarshalling multiple exceptions. Also
-          changed PropertyException from exception to struct the
-          CosPropertyService.idl file, as suggested by OMG. But, AVStreams
-          is not updated by OMG yet. All the instances of "raises
-          CosPropertyService::PropertyException" in AVStreams.idl has been
-          changed to "raises AVStreams::PropertyException". Thanks to
-          Carlos for the great help in debugging exception marshalling
-          problem. Thanks to Ulf <jaehrig@desys.com> for the bug report.
+	* orbsvcs/tests/Property/client.cpp:
+	* orbsvcs/orbsvcs/CosPropertyService.idl:
+	* orbsvcs/orbsvcs/AVStreams.idl:
+	* orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp :
+	Fixed the problem with marshalling/demarshalling multiple
+	exceptions. Also changed PropertyException from exception to struct
+	the CosPropertyService.idl file, as suggested by OMG. But, AVStreams
+	is not updated by OMG yet. All the instances of "raises
+	CosPropertyService::PropertyException" in AVStreams.idl has been
+	changed to "raises AVStreams::PropertyException". Thanks to Carlos for
+	the great help in debugging exception marshalling problem. Thanks to
+	Ulf  <jaehrig@desys.com> for the bug report.
 
 Thu Feb 11 14:40:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -9846,65 +390,69 @@ Thu Feb 11 14:40:01 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 Thu Feb 11 14:34:46 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * tao/tao.dsp:
-        * orbsvcs/orbsvcs/orbsvcs.dsp: Fixed Alpha Configuration.
+        * orbsvcs/orbsvcs/orbsvcs.dsp:
+          Fixed Alpha Configuration.
 
 Thu Feb 11 14:07:54 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * docs/configurations.html: Changed the multi-thread,
-          thread-per-connection example to Concurrency_Service.  Thanks to
-          Terry Rosenbaum <Terry.Rosenbaum@Radiology.MSU.edu> for
-          reporting this.
+	* docs/configurations.html: Changed the multi-thread,
+	thread-per-connection example to Concurrency_Service.  Thanks to
+	Terry Rosenbaum <Terry.Rosenbaum@Radiology.MSU.edu> for reporting
+	this.
 
 Thu Feb 11 11:28:44 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/IOR_LookupTable.cpp: removed an extra #pragma
-          from the file.
+	* orbsvcs/orbsvcs/IOR_LookupTable.cpp:
+	removed an extra #pragma from the file.
 
 Thu Feb 11 11:23:05 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/IIOP_Interpreter.cpp: The GreenHills compiler (at least
-          versions 1.8.8 and 1.8.9 of it) gets really confused by some
-          template forward declarations. We had to re-arrange the includes
-          to match the compiler liking.
+	* tao/IIOP_Interpreter.cpp:
+	  The GreenHills compiler (at least versions 1.8.8 and 1.8.9 of
+	  it) gets really confused by some template forward
+	  declarations. We had to re-arrange the includes to match the
+	  compiler liking.
 
-        * tao/TAO_Internal.cpp: Need to include ORB_Core.h in platforms
-          that do not support svc.conf or when tao is using a static
-          services.
+	* tao/TAO_Internal.cpp:
+	  Need to include ORB_Core.h in platforms that do not support
+	  svc.conf or when tao is using a static services.
 
 Thu Feb 11 10:34:41 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
         * Use of PHandle in MProfile.{h,cpp} create a name conflict.
-          Added TAO_ to fix this.
+	  Added TAO_ to fix this.
 
-        * Thanks to John Morey <jmorey@tbi.com> for reminding me of the
-          ACE-Guidelines ;).
+	* Thanks to  John Morey <jmorey@tbi.com>
+          for reminding me of the ACE-Guidelines ;).
 
 Thu Feb 11 02:51:34 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * tao/ORB.cpp (ORB_init): Only initialize the ORB global variables
-          _after_ the ORB has been initialized.  Otherwise, the
-          init_orb_globals() will create a server_strategy_factory (as TAO
-          is now) before we have a chance to initialize it.  This bug was
-          causing grief in POA registration test. Thanks to David
-          A. Janello <argno@mcs.net> for reporting the bug.
+	* tao/ORB.cpp (ORB_init): Only initialize the ORB global variables
+	  _after_ the ORB has been initialized.  Otherwise, the
+	  init_orb_globals() will create a server_strategy_factory (as TAO
+	  is now) before we have a chance to initialize it.
+
+	  This bug was causing grief in POA registration test. Thanks to
+	  David A. Janello <argno@mcs.net> for reporting the bug.
 
 Wed Feb 10 23:50:11 1999  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-        * tao/Connect.cpp (handle_input): It is unfotunate that an
-          exception (probably a system exception) was thrown by the upcall
-          code (even by the user) when the client was not expecting a
-          response.  However, in this case, we cannot close the connection
-          down, since it really isn't the client's fault.  Thanks to Mark
-          L. Boriack <mboriack@std.saic.com> for helping in tracking down
-          this problem.
+	* tao/Connect.cpp (handle_input): It is unfotunate that an
+	  exception (probably a system exception) was thrown by the upcall
+	  code (even by the user) when the client was not expecting a
+	  response.  However, in this case, we cannot close the connection
+	  down, since it really isn't the client's fault.
+
+          Thanks to Mark L. Boriack <mboriack@std.saic.com> for helping in
+          tracking down this problem.
 
 Wed Feb 10 23:15:27 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/Time_Service/Clerk_i.cpp : Fixed a bug for the service
-          not working on NT with files. The initialization of the
-          ACE_Array_Base was not being done in the right place.  Thanks to
-          Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca> for reporting
-          this.
+	* orbsvcs/Time_Service/Clerk_i.cpp : Fixed a bug for the service
+ 	  not working on NT with files. The initialization of the
+ 	  ACE_Array_Base was not being done in the right place.  Thanks to
+ 	  Souhad Mcheik <mcheiks@inrs-telecom.uquebec.ca> for reporting
+ 	  this.
 
 Wed Feb 10 22:16:01 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
@@ -9913,435 +461,452 @@ Wed Feb 10 22:16:01 1999  Darrell Brunsch <brunsch@cs.wustl.edu>
 
 Wed Feb 10 19:39:27 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/be/be_interface.cpp: Using ACE_DEFAULT_TEMP_FILE for
-          generating gperf input file. Thanks to Lothar Werzinger
-          <lwerzinger@krones.de> for suggesting this.
+	* TAO_IDL/be/be_interface.cpp: Using
+	  ACE_DEFAULT_TEMP_FILE for generating gperf input file. Thanks to
+	  Lothar Werzinger <lwerzinger@krones.de> for suggesting this.
 
 Wed Feb 10 18:55:09 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
-        * Changed Stub.i, set_fwd_profiles () so it doesn't complain about
-          fwd_profiles which are themselves forwarded.
+        * Changed Stub.i, set_fwd_profiles () so it doesn't
+	  complain about fwd_profiles which are themselves forwarded.
 
 Wed Feb 10 17:17:46 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_decl.cpp: I had to zero out the buffer to generate
-          identical Typecodes on all platforms, including the padding
-          bytes (which are now zeros). Thanks to Jim Crossley
-          <JCrossley@mobsec.com> for chasing down the problems with this
-          code and for suggesting that we test it out by comparing the
-          output of different IDL compilers; this showed that the padding
-          bytes were not initialized.
+	* TAO_IDL/be/be_decl.cpp:
+	  I had to zero out the buffer to generate identical Typecodes on
+	  all platforms, including the padding bytes (which are now
+	  zeros). Thanks to Jim Crossley <JCrossley@mobsec.com> for
+	  chasing down the problems with this code and for suggesting that
+	  we test it out by comparing the output of different IDL
+	  compilers; this showed that the padding bytes were not
+	  initialized.
 
 Wed Feb 10 16:36:41 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * tao/Request.{i,cpp}: Streamlined the new arg manipulation helper
-          functions.  They're now short enought to be inlined.
+        * tao/Request.{i,cpp}:
+          Streamlined the new arg manipulation helper functions.
+          They're now short enought to be inlined.
 
 Wed Feb 10 14:22:34 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * rules.tao.GNU: Enabled the unused variable warning again. It
-          compiles cleanly enough on Linux/EGCS.
-
-        * orbsvcs/orbsvcs/Log/Logger_i.cpp:
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_docall_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.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_typedef/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/util/utl_stack.cpp:
-          Fixed bunch of warnings about unused variables.
+	* rules.tao.GNU:
+	  Enabled the unused variable warning again. It compiles cleanly
+	  enough on Linux/EGCS.
+
+	* orbsvcs/orbsvcs/Log/Logger_i.cpp:
+	* TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/post_marshal_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/pre_docall_cs.cpp:
+	* TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/upcall_ss.cpp:
+	* TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
+	* TAO_IDL/be/be_visitor_array/array_ci.cpp:
+	* TAO_IDL/be/be_visitor_array/array_cs.cpp:
+	* TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
+	* TAO_IDL/be/be_visitor_exception/ctor_assign.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.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_typedef/any_op_ch.cpp:
+	* TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp:
+	* TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp:
+	* TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp:
+	* TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
+	* TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+	* TAO_IDL/util/utl_stack.cpp:
+	  Fixed bunch of warnings about unused variables.
 
 Wed Feb 10 14:11:07 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
         * tao/Any.{h,cpp}:
-        * tao/NVList.cpp: Added a method to Any called
-          _tao_replace(). NVList method add_value() called
-          Any::replace(). A bug report pointed out that, in the case where
-          the Any arg to add_value() has been copy-constructed or assigned
-          to, its value_ is 0, and replace() deals only with
-          value_. _tao_replace is now called in add_value() if the value_
-          of the Any arg is 0, and _tao_replace() uses the Any's message
-          block instead. A simple test adapted from the bug report code
-          runs ok now with no leaks. Thanks to Barry Hoggard for reporting
-          this bug.
+        * tao/NVList.cpp:
+          Added a method to Any called _tao_replace(). NVList method
+          add_value() called Any::replace(). A bug report pointed
+          out that, in the case where the Any arg to add_value() has been
+          copy-constructed or assigned to, its value_ is 0, and
+          replace() deals only with value_. _tao_replace is now
+          called in add_value() if the value_ of the Any arg is 0,
+          and _tao_replace() uses the Any's message block instead. A
+          simple test adapted from the bug report code runs ok now
+          with no leaks. Thanks to Barry Hoggard for reporting this
+          bug.
 
 Wed Feb 10 13:05:17 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/Event/Event_Channel.h (pdf): Moved struct
-          Observer_Entry into the public part of the class to avoid
-          problems with the SGI compiler.  Thanks to Eric Mitchell
-          <emitchell@altaira.com> for reporting this.
+	* orbsvcs/orbsvcs/Event/Event_Channel.h (pdf): Moved struct
+ 	  Observer_Entry into the public part of the class to avoid
+ 	  problems with the SGI compiler.  Thanks to Eric Mitchell
+ 	  <emitchell@altaira.com> for reporting this.
 
 Wed Feb 10 10:39:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/Time_Service/IR_Helper.cpp: To use TAO_RETHROW the
-          methods must use TAO_IN_ENV as the incoming CORBA_Environment
-          argument.
+	* orbsvcs/Time_Service/IR_Helper.cpp:
+	  To use TAO_RETHROW the methods must use TAO_IN_ENV as the
+	  incoming CORBA_Environment argument.
 
-        * tao/Typecode.i: Removed unused argument in kind()
+	* tao/Typecode.i:
+	  Removed unused argument in kind()
 
 Wed Feb 10 10:28:16 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/IOR_LookupTable.cpp (add_ior):
-          Fixed a warning by cxx.
+	* orbsvcs/orbsvcs/IOR_LookupTable.cpp (add_ior):
+	Fixed a warning by cxx.
 
 Tue Feb  9 22:26:52 1999  Vishal Kachroo  <vishal@merengue.cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/IOR_LookupTable.cpp,
-        * orbsvcs/orbsvcs/IOR_LookupTable.h,
-        * orbsvcs/orbsvcs/Makefile: Added the class IOR_LookupTable which
-          is an abstraction over the Hash_Map_Manager to store the
-          object_name -> IOR mappings that will be used by the
-          resolve_initial_references ().  Updated the Makefile to include
-          this class.
+	Added the class IOR_LookupTable which is an abstraction over the
+	Hash_Map_Manager to store the object_name -> IOR mappings that
+	will be used by the resolve_initial_references ().
+
+	Updated the Makefile to include this class.
+
+	* orbsvcs/orbsvcs/IOR_LookupTable.cpp:
+	* orbsvcs/orbsvcs/IOR_LookupTable.h:
+	* orbsvcs/orbsvcs/Makefile:
 
 Tue Feb  9 22:11:08 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp: The generated
-          code contained a variable that was not used in all cases. Now we
-          only generate the variable if we actually use it.
+	* TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
+	  The generated code contained a variable that was not used in all
+	  cases. Now we only generate the variable if we actually use it.
 
 Tue Feb  9 22:06:12 1999  Nagarajan Surendran  <naga@cs.wustl.edu>
 
-        * orbsvcs/orbsvcs/IOR_Multicast.h: Added Title and description
-          comments to the class declaration.
+	* orbsvcs/orbsvcs/IOR_Multicast.h: Added Title and description
+	  comments to the class declaration.
 
 Tue Feb  9 21:40:29 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * $TAO_ROOT/examples/Event_Comm/*.cpp Changed all the TAO_* macros
-          for exceptions to ACE_* macros. This went clean on SunOSC++.
+	* $TAO_ROOT/examples/Event_Comm/*.cpp
+	Changed all the TAO_* macros for exceptions to
+	ACE_* macros. This went clean on SunOSC++.
+
 
 Tue Feb  9 20:38:24 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp: Silenced pesky
-          warning about unreached statement.
+	* TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
+	  Silenced pesky warning about unreached statement.
 
-        * TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp: Added new visitor to
-          generate the variable declarations required for marshaling
-          certain kind of fields.
+	* TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h:
+	* TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+	  Added new visitor to generate the variable declarations required
+	  for marshaling certain kind of fields.
 
-        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp: Use the new
-          visitor to generate field declarations.
+	* TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
+	* TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp:
+	  Use the new visitor to generate field declarations.
 
 Tue Feb  9 20:43:13 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * $TAO_ROOT/examples/Callback_Quoter/*.cpp Changed all the TAO_*
-          macros for exceptions to ACE_* macros. This went clean on
-          SunOSC++ and SunOSg++
+	* $TAO_ROOT/examples/Callback_Quoter/*.cpp
+	Changed all the TAO_* macros for exceptions to
+	ACE_* macros. This went clean on SunOSC++ and
+	SunOSg++
 
 Tue Feb  9 17:55:31 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/corbafwd.h:
-        * tao/Active_Object_Map.h:
-        * tao/Any.cpp:
-        * tao/CDR.h:
-        * tao/Client_Strategy_Factory.h:
-        * tao/IIOP_ORB.h:
-        * tao/Marshal.h:
-        * tao/ORB.cpp:
-        * tao/Object.cpp:
-        * tao/Object.i:
-        * tao/POA.h: Fixed several g++ errors and warnings, the main
-          problem was that g++ could not cope with this code:
-
-          class CORBA {
-          public:
-            int foo ();
-            void bar (int x = CORBA::foo ());
-          };
-
-          I had to create two versions of the bar() method (actually
-          ORB_init()).  It also had some problems with the order of
-          definition of some inline methods (which I was able to solve)
-          and it required the definition (not only forward declarations)
-          of some templates before some templates could be instantiated.
-          Overall a small set of re-arrangment of includes and
-          declarations. We have to test in other platforms now.
+	* tao/corbafwd.h:
+	* tao/Active_Object_Map.h:
+	* tao/Any.cpp:
+	* tao/CDR.h:
+	* tao/Client_Strategy_Factory.h:
+	* tao/IIOP_ORB.h:
+	* tao/Marshal.h:
+	* tao/ORB.cpp:
+	* tao/Object.cpp:
+	* tao/Object.i:
+	* tao/POA.h:
+	  Fixed several g++ errors and warnings, the main problem was that
+	  g++ could not cope with this code:
+
+	  class CORBA {
+	  public:
+	    int foo ();
+	    void bar (int x = CORBA::foo ());
+	  };
+
+	  I had to create two versions of the bar() method (actually
+	  ORB_init()).  It also had some problems with the order of
+	  definition of some inline methods (which I was able to solve)
+	  and it required the definition (not only forward declarations)
+	  of some templates before some templates could be instantiated.
+	  Overall a small set of re-arrangment of includes and
+	  declarations. We have to test in other platforms now.
 
 Tue Feb  9 17:53:42 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-        * TAO/docs/configurations.html: Changed the first entry under
-          Homogeneous Systems to reflect the move of
-          tao/orbconf.h/TAO_DISABLE_SWAP_ON_READ to
+        * TAO/docs/configurations.html:
+          Changed the first entry under Homogeneous Systems to reflect the
+          move of tao/orbconf.h/TAO_DISABLE_SWAP_ON_READ to
           ace/OS.h/ACE_DISABLE_SWAP_ON_READ.
 
 Tue Feb  9 16:52:41 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
 
-        * TAO_IDL/be/be_exception.cpp (gen_typecode): Thanks to
-          Carlos. Fixed the problem with the typecode generation for the
-          exceptions.
+	* TAO_IDL/be/be_exception.cpp (gen_typecode): Thanks to
+	Carlos. Fixed the problem with the typecode generation for the
+	exceptions.
 
 Tue Feb  9 16:39:27 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_enum_val.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_union_branch.cpp: The name2long() function was
-          using a <long> but it needed a 32-bit type; the right type to
-          use is a ACE_UINT32.  This fixes some strange problems in 64-bit
-          machines, like Alphas.
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp: Fixed
-          the ACE_DEBUG calls, they should be protected by the
-          TAO_debug_level.
+	* TAO_IDL/be_include/be_decl.h:
+	* TAO_IDL/be/be_decl.cpp:
+	* TAO_IDL/be/be_enum.cpp:
+	* TAO_IDL/be/be_enum_val.cpp:
+	* TAO_IDL/be/be_exception.cpp:
+	* TAO_IDL/be/be_field.cpp:
+	* TAO_IDL/be/be_interface.cpp:
+	* TAO_IDL/be/be_predefined_type.cpp:
+	* TAO_IDL/be/be_structure.cpp:
+	* TAO_IDL/be/be_typedef.cpp:
+	* TAO_IDL/be/be_union.cpp:
+	* TAO_IDL/be/be_union_branch.cpp:
+	  The name2long() function was using a <long> but it needed a
+	  32-bit type; the right type to use is a ACE_UINT32.  This fixes
+	  some strange problems in 64-bit machines, like Alphas.
+
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+	  Fixed the ACE_DEBUG calls, they should be protected by the
+	  TAO_debug_level.
 
 Tue Feb  9 13:47:37 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * tao/try_macros.h: Changed the definition of TAO_IN_ENV to
-        ACE_TRY_ENV
+	* tao/try_macros.h:
+	Changed the definition of TAO_IN_ENV to ACE_TRY_ENV
 
 
 Mon Feb  8 17:09:03 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/debug.h:
-        * tao/debug.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * tao/ORB_Core.cpp:
-        * tao/Stub.cpp:
-        * tao/deep_free.cpp:
-        * tests/NestedUpcall/Reactor/client.cpp: Removed all the
-          references to dmsg(), dmsg1(), dexc() and similar debugging
-          macros, that's what we have ACE_DEBUG() for!!
-
-        * performance-tests/Thruput/TAO/client.cpp:
-        * tests/Multiple_Inheritance/server.cpp: Another couple of files
-          that relied on "tao/corba.h" to include "ace/Get_Opt.h"
+	* tao/debug.h:
+	* tao/debug.cpp:
+	* performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
+	* tao/ORB_Core.cpp:
+	* tao/Stub.cpp:
+	* tao/deep_free.cpp:
+	* tests/NestedUpcall/Reactor/client.cpp:
+	  Removed all the references to dmsg(), dmsg1(), dexc() and
+	  similar debugging macros, that's what we have ACE_DEBUG() for!!
+
+	* performance-tests/Thruput/TAO/client.cpp:
+	* tests/Multiple_Inheritance/server.cpp:
+	  Another couple of files that relied on "tao/corba.h" to include
+	  "ace/Get_Opt.h"
 
 Mon Feb 08 15:20:09 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/corba.h:
-        * tao/corbafwd.h: On NT we need to define DEBUG when _DEBUG is
-          defined, but this definition was left on corba.h by mistake, now
-          it is in corbafwd.h
+	* tao/corba.h:
+	* tao/corbafwd.h:
+	  On NT we need to define DEBUG when _DEBUG is defined, but this
+	  definition was left on corba.h by mistake, now it is in
+	  corbafwd.h
 
-        * tao/Invocation.h: MSVC++ doesn't know that a class and a struct
-          are the same thing, and it complains when a structure is forward
-          declared as a class; silly
+	* tao/Invocation.h:
+	  MSVC++ doesn't know that a class and a struct are the same
+	  thing, and it complains when a structure is forward declared as
+	  a class; silly
 
-        * orbsvcs/orbsvcs/Trader/Trader.cpp: MSVC++ gets confused by
-          typedefs inside classes again.
+	* orbsvcs/orbsvcs/Trader/Trader.cpp:
+	  MSVC++ gets confused by typedefs inside classes again.
 
-        * tao/ORB_Strategies_T.cpp: Added missing #include.
+	* tao/ORB_Strategies_T.cpp:
+	  Added missing #include.
 
-        * tao/debug.cpp:
-        * tao/debug.h: Fixed some #include problems.
+	* tao/debug.cpp:
+	* tao/debug.h:
+	  Fixed some #include problems.
 
 Mon Feb  8 15:25:00 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/echo/Makefile,
-        * examples/Simple/echo/client.cpp,
-        * examples/Simple/echo/server.cpp,
-        * examples/Simple/echo/Echo_i.cpp: Replaced old TAO_TRY macros
-          with ACE_TRY macros
-        * examples/Simple/echo/Echo_Client_i.cpp,
-        * examples/Simple/echo/Echo_Client_i.h: New files after removing
-          Server_i.* and Client_i.*
+	* examples/Simple/echo/Makefile
+	* examples/Simple/echo/client.cpp
+	* examples/Simple/echo/server.cpp
+	* examples/Simple/echo/Echo_i.cpp
+	Replaced old TAO_TRY macros with ACE_TRY macros
+	* examples/Simple/echo/Echo_Client_i.cpp
+	* examples/Simple/echo/Echo_Client_i.h
+	New files after removing Server_i.* and Client_i.*
 
 Mon Feb  8 14:26:29 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/DynAnyC.cpp,
-        * tao/Object.cpp: Added missing #include for template
-          instantiations.
+	* tao/DynAnyC.cpp:
+	* tao/Object.cpp:
+	  Added missing #include for template instantiations.
 
-        * tao/ORB.cpp,
-        * tao/ORB_Core.cpp: Re-ordered includes, otherwise
-          "ace/Dynamic_Service.h" does not have the proper context.
+	* tao/ORB.cpp:
+	* tao/ORB_Core.cpp:
+	  Re-ordered includes, otherwise "ace/Dynamic_Service.h" does not
+	  have the proper context.
 
 Mon Feb  8 13:43:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * tao/corbafwd.h:
-        * tao/corba.h:
-        * tao/Active_Object_Map.cpp:
-        * tao/Active_Object_Map.h:
-        * tao/Any.cpp:
-        * tao/Any.h:
-        * tao/CDR.cpp:
-        * tao/CDR.h:
-        * tao/CDR.i:
-        * tao/Client_Strategy_Factory.cpp:
-        * tao/Client_Strategy_Factory.h:
-        * tao/Connect.cpp:
-        * tao/Connect.h:
-        * tao/CurrentC.cpp:
-        * tao/CurrentC.h:
-        * tao/CurrentS.cpp:
-        * tao/DynAnyC.cpp:
-        * tao/DynAnyC.h:
-        * tao/DynAnyS.cpp:
-        * tao/DynAny_i.cpp:
-        * tao/DynAny_i.h:
-        * tao/DynArray_i.cpp:
-        * tao/DynEnum_i.cpp:
-        * tao/DynSequence_i.cpp:
-        * tao/DynStruct_i.cpp:
-        * tao/DynUnion_i.cpp:
-        * tao/DynUnion_i_T.h:
-        * tao/Environment.cpp:
-        * tao/Environment.h:
-        * tao/Exception.cpp:
-        * tao/Exception.h:
-        * tao/Forwarding_Servant.cpp:
-        * tao/Forwarding_Servant.h:
-        * tao/GIOP.cpp:
-        * tao/GIOP.h:
-        * tao/IIOP_Acceptor.cpp:
-        * tao/IIOP_Acceptor.h:
-        * tao/IIOP_Connector.cpp:
-        * tao/IIOP_Connector.h:
-        * tao/IIOP_Interpreter.cpp:
-        * tao/IIOP_Interpreter.h:
-        * tao/IIOP_ORB.cpp:
-        * tao/IIOP_ORB.h:
-        * tao/IIOP_Profile.cpp:
-        * tao/IIOP_Profile.h:
-        * tao/IIOP_Transport.cpp:
-        * tao/IIOP_Transport.h:
-        * tao/InconsistentTypeCodeC.cpp:
-        * tao/InconsistentTypeCodeC.h:
-        * tao/Invocation.cpp:
-        * tao/Invocation.h:
-        * tao/MProfile.cpp:
-        * tao/MProfile.h:
-        * tao/Makefile:
-        * tao/Managed_Types.cpp:
-        * tao/Managed_Types.h:
-        * tao/Managed_Types.i:
-        * tao/Marshal.cpp:
-        * tao/Marshal.h:
-        * tao/Marshal.i:
-        * tao/NVList.cpp:
-        * tao/NVList.h:
-        * tao/ORB.cpp:
-        * tao/ORB.h:
-        * tao/ORB.i:
-        * tao/ORB_Core.cpp:
-        * tao/ORB_Core.h:
-        * tao/Object.cpp:
-        * tao/Object.h:
-        * tao/Object.i:
-        * tao/Object_KeyC.cpp:
-        * tao/Object_KeyC.h:
-        * tao/Object_KeyC.i:
-        * tao/Operation_Table.cpp:
-        * tao/Operation_Table.h:
-        * tao/POA.cpp:
-        * tao/POA.h:
-        * tao/POAC.cpp:
-        * tao/POAC.h:
-        * tao/POAS.cpp:
-        * tao/POAS.h:
-        * tao/POA_CORBA.h:
-        * tao/Pluggable.cpp:
-        * tao/Pluggable.h:
-        * tao/PolicyC.cpp:
-        * tao/PolicyC.h:
-        * tao/PolicyS.cpp:
-        * tao/Principal.cpp:
-        * tao/Principal.h:
-        * tao/Principal.i:
-        * tao/Request.cpp:
-        * tao/Request.h:
-        * tao/Sequence.cpp:
-        * tao/Sequence.h:
-        * tao/Sequence_T.h:
-        * tao/Servant_Base.cpp:
-        * tao/Servant_Base.h:
-        * tao/Server_Request.cpp:
-        * tao/Server_Request.h:
-        * tao/Server_Request.i:
-        * tao/Server_Strategy_Factory.cpp:
-        * tao/Server_Strategy_Factory.h:
-        * tao/Stub.cpp:
-        * tao/Stub.h:
-        * tao/Stub.i:
-        * tao/TAO.cpp:
-        * tao/TAO.h:
-        * tao/TAO_Internal.h:
-        * tao/Typecode.cpp:
-        * tao/Typecode.h:
-        * tao/Typecode.i:
-        * tao/Typecode_Constants.cpp:
-        * tao/Union.cpp:
-        * tao/Union.h:
-        * tao/append.cpp:
-        * tao/debug.cpp:
-        * tao/decode.cpp:
-        * tao/deep_free.cpp:
-        * tao/default_client.h:
-        * tao/default_server.h:
-        * tao/encode.cpp:
-        * tao/orbconf.h:
-        * tao/params.cpp:
-        * tao/params.h:
-        * tao/poa_T.h:
-        * tao/singletons.h:
-        * tao/skip.cpp:
-        * tao/t-sizes.cpp:
-        * tao/varout.h:
-          Cleaned up the include madness, now all the files inside TAO
-          include "tao/corbafwd.h" to obtain the CORBA namespace. This
-          files includes very little (only "ace/CDR.h" and
-          "tao/orbconf.h"); so it is lighter than including "tao/corba.h".
-          External applications only need to include "tao/corba.h", as
-          before, but this file has been trimmed down somewhat.
-          There are still some dependencies between several header files
-          in TAO (specially "tao/ORB_Core.h"), but this are minor compared
-          to the previous situation.
-
-        * utils/catior/catior.cpp:
-        * orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
-        * orbsvcs/Time_Service/IR_Helper.cpp:
-          This files make changes to the IIOP_Profile so they need to
-          include "tao/IIOP_Profile.h" explicitly, notice that all the
-          other files in TAO do not need to.
-
-        * examples/POA/Default_Servant/server.cpp:
-        * examples/POA/Explicit_Activation/server.cpp:
-        * examples/POA/Forwarding/server.cpp:
-        * examples/POA/On_Demand_Activation/server.cpp:
-        * orbsvcs/Naming_Service/Naming_Service.cpp:
-        * orbsvcs/tests/Trading/colocated_test.cpp:
-        * tests/CDR/basic_types.cpp:
-        * tests/Param_Test/options.cpp:
-          This files used the "fact" that "tao/corba.h" included
-          "ace/Get_Opt.h".
-
-        * All the Makefiles in TAO where updated.
+	* tao/corbafwd.h:
+	* tao/corba.h:
+	* tao/Active_Object_Map.cpp:
+	* tao/Active_Object_Map.h:
+	* tao/Any.cpp:
+	* tao/Any.h:
+	* tao/CDR.cpp:
+	* tao/CDR.h:
+	* tao/CDR.i:
+	* tao/Client_Strategy_Factory.cpp:
+	* tao/Client_Strategy_Factory.h:
+	* tao/Connect.cpp:
+	* tao/Connect.h:
+	* tao/CurrentC.cpp:
+	* tao/CurrentC.h:
+	* tao/CurrentS.cpp:
+	* tao/DynAnyC.cpp:
+	* tao/DynAnyC.h:
+	* tao/DynAnyS.cpp:
+	* tao/DynAny_i.cpp:
+	* tao/DynAny_i.h:
+	* tao/DynArray_i.cpp:
+	* tao/DynEnum_i.cpp:
+	* tao/DynSequence_i.cpp:
+	* tao/DynStruct_i.cpp:
+	* tao/DynUnion_i.cpp:
+	* tao/DynUnion_i_T.h:
+	* tao/Environment.cpp:
+	* tao/Environment.h:
+	* tao/Exception.cpp:
+	* tao/Exception.h:
+	* tao/Forwarding_Servant.cpp:
+	* tao/Forwarding_Servant.h:
+	* tao/GIOP.cpp:
+	* tao/GIOP.h:
+	* tao/IIOP_Acceptor.cpp:
+	* tao/IIOP_Acceptor.h:
+	* tao/IIOP_Connector.cpp:
+	* tao/IIOP_Connector.h:
+	* tao/IIOP_Interpreter.cpp:
+	* tao/IIOP_Interpreter.h:
+	* tao/IIOP_ORB.cpp:
+	* tao/IIOP_ORB.h:
+	* tao/IIOP_Profile.cpp:
+	* tao/IIOP_Profile.h:
+	* tao/IIOP_Transport.cpp:
+	* tao/IIOP_Transport.h:
+	* tao/InconsistentTypeCodeC.cpp:
+	* tao/InconsistentTypeCodeC.h:
+	* tao/Invocation.cpp:
+	* tao/Invocation.h:
+	* tao/MProfile.cpp:
+	* tao/MProfile.h:
+	* tao/Makefile:
+	* tao/Managed_Types.cpp:
+	* tao/Managed_Types.h:
+	* tao/Managed_Types.i:
+	* tao/Marshal.cpp:
+	* tao/Marshal.h:
+	* tao/Marshal.i:
+	* tao/NVList.cpp:
+	* tao/NVList.h:
+	* tao/ORB.cpp:
+	* tao/ORB.h:
+	* tao/ORB.i:
+	* tao/ORB_Core.cpp:
+	* tao/ORB_Core.h:
+	* tao/Object.cpp:
+	* tao/Object.h:
+	* tao/Object.i:
+	* tao/Object_KeyC.cpp:
+	* tao/Object_KeyC.h:
+	* tao/Object_KeyC.i:
+	* tao/Operation_Table.cpp:
+	* tao/Operation_Table.h:
+	* tao/POA.cpp:
+	* tao/POA.h:
+	* tao/POAC.cpp:
+	* tao/POAC.h:
+	* tao/POAS.cpp:
+	* tao/POAS.h:
+	* tao/POA_CORBA.h:
+	* tao/Pluggable.cpp:
+	* tao/Pluggable.h:
+	* tao/PolicyC.cpp:
+	* tao/PolicyC.h:
+	* tao/PolicyS.cpp:
+	* tao/Principal.cpp:
+	* tao/Principal.h:
+	* tao/Principal.i:
+	* tao/Request.cpp:
+	* tao/Request.h:
+	* tao/Sequence.cpp:
+	* tao/Sequence.h:
+	* tao/Sequence_T.h:
+	* tao/Servant_Base.cpp:
+	* tao/Servant_Base.h:
+	* tao/Server_Request.cpp:
+	* tao/Server_Request.h:
+	* tao/Server_Request.i:
+	* tao/Server_Strategy_Factory.cpp:
+	* tao/Server_Strategy_Factory.h:
+	* tao/Stub.cpp:
+	* tao/Stub.h:
+	* tao/Stub.i:
+	* tao/TAO.cpp:
+	* tao/TAO.h:
+	* tao/TAO_Internal.h:
+	* tao/Typecode.cpp:
+	* tao/Typecode.h:
+	* tao/Typecode.i:
+	* tao/Typecode_Constants.cpp:
+	* tao/Union.cpp:
+	* tao/Union.h:
+	* tao/append.cpp:
+	* tao/debug.cpp:
+	* tao/decode.cpp:
+	* tao/deep_free.cpp:
+	* tao/default_client.h:
+	* tao/default_server.h:
+	* tao/encode.cpp:
+	* tao/orbconf.h:
+	* tao/params.cpp:
+	* tao/params.h:
+	* tao/poa_T.h:
+	* tao/singletons.h:
+	* tao/skip.cpp:
+	* tao/t-sizes.cpp:
+	* tao/varout.h:
+	  Cleaned up the include madness, now all the files inside TAO
+	  include "tao/corbafwd.h" to obtain the CORBA namespace. This
+	  files includes very little (only "ace/CDR.h" and
+	  "tao/orbconf.h"); so it is lighter than including "tao/corba.h".
+	  External applications only need to include "tao/corba.h", as
+	  before, but this file has been trimmed down somewhat.
+	  There are still some dependencies between several header files
+	  in TAO (specially "tao/ORB_Core.h"), but this are minor compared
+	  to the previous situation.
+
+	* utils/catior/catior.cpp:
+	* orbsvcs/ImplRepo_Service/ImplRepo_i.cpp:
+	* orbsvcs/Time_Service/IR_Helper.cpp:
+	  This files make changes to the IIOP_Profile so they need to
+	  include "tao/IIOP_Profile.h" explicitly, notice that all the
+	  other files in TAO do not need to.
+
+	* examples/POA/Default_Servant/server.cpp:
+	* examples/POA/Explicit_Activation/server.cpp:
+	* examples/POA/Forwarding/server.cpp:
+	* examples/POA/On_Demand_Activation/server.cpp:
+	* orbsvcs/Naming_Service/Naming_Service.cpp:
+	* orbsvcs/tests/Trading/colocated_test.cpp:
+	* tests/CDR/basic_types.cpp:
+	* tests/Param_Test/options.cpp:
+	  This files used the "fact" that "tao/corba.h" included
+	  "ace/Get_Opt.h".
+
+	* All the Makefiles in TAO where updated.
 
 Mon Feb  8 12:16:33 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
 
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
-          Changed to generate ACE_TRY_ENV instead of TAO_IN_ENV.
+	* TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_cs.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp:
+	* TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_cs.cpp:
+	  Changed to generate ACE_TRY_ENV instead of TAO_IN_ENV.
 
 Mon Feb 08 00:52:18 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
@@ -10349,14 +914,14 @@ Mon Feb 08 00:52:18 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
 Mon Feb  8 00:00:02 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * orbsvcs/tests/Simulator/Event_Supplier/Makefile:
-          Some binaries did not link both NavWeapC.o and NavWeapS.o, this
-          is needed for colocation support.
+	* orbsvcs/tests/Simulator/Event_Supplier/Makefile:
+	  Some binaries did not link both NavWeapC.o and NavWeapS.o, this
+	  is needed for colocation support.
 
 Sun Feb  7 23:45:19 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
         * Updated makefile dependencies in
-          orbsvcs/tests/Simulator/Event_Supplier
+	  orbsvcs/tests/Simulator/Event_Supplier
 
 Sun Feb  7 22:31:01 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
@@ -10365,24 +930,24 @@ Sun Feb  7 22:31:01 1999 Fred Kuhns <fredk@cs.wustl.edu>
 Sun Feb  7 21:35:17 1999 Fred Kuhns <fredk@cs.wustl.edu>
 
         * Stub.i - added initialization for type_id
-          from arg repository_id.
+	  from arg repository_id.
 
 Sun Feb  7 20:01:29 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-        * tao/Stub.i (STUB_Object): Fixed warnings about repository_id
-          being unused.  Thanks to David for reporting this.
+	* tao/Stub.i (STUB_Object): Fixed warnings about repository_id
+ 	  being unused.  Thanks to David for reporting this.
 
-        * tao/IIOP_ORB.cpp: Added some checks for failed memory
-          allocation.
+	* tao/IIOP_ORB.cpp: Added some checks for failed memory
+	  allocation.
 
 Sun Feb  7 16:57:55 1999  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-        * examples/Simple/Simple_util.cpp
-        * examples/Simple/time/Time_Client.cpp
-        * examples/Simple/time/server.cpp
-        * examples/Simple/grid/Grid_Client_i.cpp
-        * examples/Simple/grid/server.cpp
-        Changed TAO_TRY macros to ACE_TRY macros
+	* examples/Simple/Simple_util.cpp
+	* examples/Simple/time/Time_Client.cpp
+	* examples/Simple/time/server.cpp
+	* examples/Simple/grid/Grid_Client_i.cpp
+	* examples/Simple/grid/server.cpp
+	Changed TAO_TRY macros to ACE_TRY macros
 
 Sun Feb  7 15:30:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -10393,30 +958,30 @@ Sun Feb  7 15:30:34 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
 Sun Feb  7 14:32:00 1999  Chris Gill  <cdgill@cs.wustl.edu>
 
-        * TAO/orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.java
-          TAO/orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowserApplet.java
+	* TAO/orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowser.java
+	  TAO/orbsvcs/tests/Simulator/DOVEBrowser/DOVEBrowserApplet.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/DemoCore.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/MTDataHandlerAdapter.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/PushConsumer.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/PushConsumerFactory.java
           TAO/orbsvcs/tests/Simulator/DOVEBrowser/make.bat : strategized
-          browser concurrency: can either use direct orb upcalls (default)
-          or use queueing in active data handler adapter objects
-          (via the -queue command line switch).
+	  browser concurrency: can either use direct orb upcalls (default)
+	  or use queueing in active data handler adapter objects
+	  (via the -queue command line switch).
 
         * TAO/orbsvcs/tests/Simulator/Event_Supplier/DOVE_Supplier.{cpp, h}
           TAO/orbsvcs/tests/Simulator/Event_Supplier/DualEC_Sup.{cpp, h}:
           fixed shutdown to ensure disconnection of the scheduler and EC
-          servants, deregistration of these from the Naming Service.  Also
-          added command line switches -n and -w to set the number of
-          usec slept before generating each navigation or weapons event,
-          respectively.
+	  servants, deregistration of these from the Naming Service.  Also
+	  added command line switches -n and -w to set the number of
+	  usec slept before generating each navigation or weapons event,
+	  respectively.
 
 Sun Feb  7 11:44:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-        * TAO_IDL/driver/drv_args.cpp:
-          Fixed the -Gi parsing code, it was setting compiled marshaling
-          to 1, it must be 0.
+	* TAO_IDL/driver/drv_args.cpp:
+	  Fixed the -Gi parsing code, it was setting compiled marshaling
+	  to 1, it must be 0.
 
 Sun Feb 07 11:19:13 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/Makefile b/TAO/Makefile
index 9af9addbdc7..6df1c06019f 100644
--- a/TAO/Makefile
+++ b/TAO/Makefile
@@ -62,6 +62,7 @@ CONTROLLED_FILES = ChangeLog \
 		   TAO-inheritance.pdf.gz \
 		   TAO-inheritance.ps.gz \
                    TAOACE.dsw \
+                   BUG-REPORT-FORM \
 		   COPYING \
 		   COPYING.sun \
 		   release.chk \
@@ -70,7 +71,6 @@ CONTROLLED_FILES = ChangeLog \
 		   docs \
 		   LICENSE.sun \
 		   Makefile \
-                   PROBLEM-REPORT-FORM \
 		   README \
 		   README.sun \
 		   tao \
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
deleted file mode 100644
index 1344bee68c5..00000000000
--- a/TAO/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for TAO
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 check-news
-
-bin_SCRIPTS = tao-config
-
-man_MANS = tao-config.1
-
-SUBDIRS = \
-        tao \
-        TAO_IDL \
-        orbsvcs
-
-## For some reason, automake doesn't include acconfig.h in the distribution
-EXTRA_DIST = PROBLEM-REPORT-FORM VERSION \
-             COPYING.sun LICENSE.sun README.sun README.taoconf \
-             tao-config.in taoConf.sh.in tao-config.1.in
-
-DISTCLEANFILES = tao-config taoConf.sh tao-config.1
-
-## release:
-##         $(MAKE) dist distdir=$(PACKAGE)$(VERSION)
-release:
-	$(MAKE) dist
-
-## Put `exec' in the name because this should be installed by
-## `install-exec', not `install-data'.
-confexecdir=$(libdir)
-confexec_DATA = taoConf.sh
-
-## We create taoConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-taoConf.sh: taoConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@TAO_LIBDIR\@,$(TAO_LIBDIR),g' \
-            -e 's,\@TAO_INCLUDEDIR\@,$(TAO_INCLUDEDIR),g' \
-            -e 's,\@TAO_LIBS\@,$(TAO_LIBS),g' \
-            -e 's,\@TAO_CXXFLAGS\@,$(TAO_CXXFLAGS),g' \
-              < $(srcdir)/taoConf.sh.in > taoConf.tmp \
-          && mv taoConf.tmp taoConf.sh
-
-tao-config.1: tao-config.1.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's,\@libdir\@,$(libdir),g' \
-              < $(srcdir)/tao-config.1.in > tao-config.1.tmp \
-          && mv tao-config.1.tmp tao-config.1
-
-## Directories to include in the distribution but which I am too lazy to
-## create Makefile.am files for.  A Makefile.am for these directories isn't
-## needed anyway.
-TAO_EXTRA_DIST = docs
-
-dist-hook:
-	(cd $(top_srcdir); tar cf - $(TAO_EXTRA_DIST)) | (cd $(distdir); \
-          tar xfBp -)
-	list=`find $(distdir) -type d -name CVS -print`; for p in $$list; do \
-          rm -rf $$p; \
-        done
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/README b/TAO/README
index 91fc4055831..5067b58b174 100644
--- a/TAO/README
+++ b/TAO/README
@@ -10,7 +10,7 @@ We welcome suggestions for improvement, bug fixes, portability
 enhancements, etc. and will strive to integrate correct bug fixes
 quickly!  The current release has been tested extensively, but if you
 find any bugs, please report them to the ACE mailing list
-ace-users@cs.wustl.edu using the $TAO_ROOT/PROBLEM-REPORT-FORM.
+ace-users@cs.wustl.edu using the $TAO_ROOT/BUG-REPORT-FORM.
 Please use the same form to submit questions, comments, etc.
 To ensure that you see responses, please do one of the following:
 
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 8bdf749c4c2..8a13e9aea3e 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -44,34 +44,22 @@ likely unpredictable and erroneous results. <P>
   <LI>Set <CODE>TAO_ROOT</CODE> environment variable to
       <CODE>$ACE_ROOT/TAO</CODE>. <P>
 
-  <LI>Build and install the TAO release under
-        <CODE>$TAO_ROOT</CODE>.<P>
-
-        <P>The easiest and recommended way to compile the
-          <B>complete</B> TAO distribution by simply simply executing
-          <code><a href="#makenotes">make</a></code>
-          in the <CODE>$TAO_ROOT</CODE> directory.
-        </P>
-
-        <P>A smaller subset, that may be of interest to test basic TAO
-          functionality, is:
-          <CODE>$TAO_ROOT/tao</CODE>,
-          <CODE>$TAO_ROOT/TAO_IDL</CODE>,
-          <CODE>$TAO_ROOT/tests/Param_Test</CODE>.
-          Then you can execute the <CODE>run_test.pl</CODE> script in
-          <CODE>$TAO_ROOT/tests/Param_Test</CODE> and/or
-          follow the instructions contained in the <CODE>README</CODE>
-          file in the same directory.
-        </P>
-
-        <P>If you wish to compile the services distributed with TAO,
-          including the <CODE>Naming_Service</CODE> you
-          must include <CODE>$TAO_ROOT/orbsvcs</CODE> to the list
-          above.
-        </P>
-
-  <LI>To test that the TAO release is properly configured,
-        follow instructions on executing the various examples under
+  <LI>Build and install the TAO release under <CODE>$TAO_ROOT</CODE>.<P>
+
+      <UL>
+        <LI>Compile the Library: Change directory to
+            <CODE>$TAO_ROOT/tao</CODE> and execute
+            <code><a href="#makenotes">make</a></code>.
+	<LI>Compile TAO_IDL: Change directory to
+            <CODE>$TAO_ROOT/TAO_IDL</CODE> and execute
+            <code><a href="#makenotes">make</a></code>.
+	<LI>Compile ORB Services: Change directory to
+            <CODE>$TAO_ROOT/orbsvcs/orbsvcs</CODE> and execute
+            <code><a href="#makenotes">make</a></code>.
+      </UL>
+
+  <LI>To test that the TAO release is properly configured, follow
+      instructions on executing the various examples under
       <CODE>$TAO_ROOT/tests</CODE>.<P>
 
 </OL>
@@ -113,20 +101,20 @@ tree:<p>
   <li><code>ln -s ../../SunOS5_g++/TAO/TAO_IDL</code>
 </ol><p>
 
-To build on the host:
+To build, first on the host, then on the target:<p>
 <ol>
   <li><code>cd build/SunOS5_g++</code>
   <li><code>export ACE_ROOT=`pwd`;
     export LD_LIBRARY_PATH=`pwd`/ace:$LD_LIBRARY_PATH</code>
   <li><code>(cd ace; make && cd ../tests; make && cd ../TAO; make) &gt;
-    make.log</code>
+    make.log 2&gt;&1</code>
   <li><code>cd ../vxworks</code>
   <li><code>export ACE_ROOT=`pwd`</code>
   <li><code>(cd ace; make && cd ../tests; make && cd ../TAO; make) &gt;
-    make.log</code>
+    make.log 2&gt;&1</code>
 </ol><p>
 
-For NT hosts, please see the detailed instructions for building and
+For NT host, please see the detailed instructions for building and
 installing ACE and TAO in <a
 href="../ACE-INSTALL.html#vxworks">../ACE-INSTALL.html</a>.<p>
 
@@ -151,12 +139,6 @@ add a variable CPP_LOCATION to your environment and set it to the compiler
 you want to use.  This variable will override the default.
 </P>
 
-<p><a href="http://www.panix.com/~hoggardb/index.shtml">Barry
-Hoggard</a> maintains a <a
-href="http://www.panix.com/~hoggardb/corba/">CORBA Page</a>
-which contains very helpful information on setting MSVC project
-settings for TAO applications.</P>
-
 Remember to <a href="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/ACE-INSTALL.html">set
 up ACE</A> before building TAO.
 
@@ -174,12 +156,12 @@ files in the correct place.</P>
   <LI>First make sure <CODE>ACE_wrappers\bin</CODE> is listed in the Executable
       Directories in Tools|Options.  This is needed if using the TAO_IDL
       compiler under MSVC.  If you intend to also use the release version of the
-          libraries, also add <CODE>ACE_wrappers\bin\Release</CODE> to the directories.
-          <STRONG>Note:</STRONG> The order that these are listed is important.  If your
-          main development is with the debug versions, make sure \bin is before
-          \bin\Release, otherwise put the \bin\Release first.  Because the output names
-          for the release and debug versions of TAO_IDL are the same, extra care must be
-          taken when both versions are generated simulataneously. <P>
+	  libraries, also add <CODE>ACE_wrappers\bin\Release</CODE> to the directories.
+	  <STRONG>Note:</STRONG> The order that these are listed is important.  If your
+	  main development is with the debug versions, make sure \bin is before
+	  \bin\Release, otherwise put the \bin\Release first.  Because the output names
+	  for the release and debug versions of TAO_IDL are the same, extra care must be
+	  taken when both versions are generated simulataneously. <P>
 
   <LI>Load the workspace <CODE>tao\TAO.dsw</CODE> and build the TAO
       library. <P>
@@ -214,11 +196,6 @@ version of the Naming Service.</P>
       server.<P>
 </OL>
 
-<H4>Upgrading From Older Releases</H4>
-
-<P>When a newer version of ACE/TAO is installed, rebuild all should be
-used to make sure everything is built correctly.</P>
-
 <H4>Changing Include Paths</H4>
 
 <P>If you prefer <code>#include &lt;corba.h&gt;</code> over <code> #include
@@ -329,18 +306,6 @@ compiler flags must also be given to the compiler to enable them.</P>
 
 <HR>
 <P>
-
-<H3>minimumTAO</H3>
-
-<P>By default, all components in TAO will be compiled.  If you only
-want support for <A HREF="docs/minimumTAO.html">minimumTAO</A>, define
-TAO_HAS_MINIMUM_CORBA. This can be accomplished in two ways: by
-defining TAO_HAS_MINIMUM_CORBA in the config.h or orbconf.h files or
-by using <CODE>make minimum_corba=1</CODE> when you compile TAO.</P>
-
-<HR>
-<P>
-
 Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/TAO_IDL/COPYING.sun b/TAO/TAO_IDL/COPYING.sun
deleted file mode 100644
index fb7289a9820..00000000000
--- a/TAO/TAO_IDL/COPYING.sun
+++ /dev/null
@@ -1,62 +0,0 @@
-COPYRIGHT
-
-Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the
-United States of America.  All Rights Reserved.
-
-This product is protected by copyright and distributed under the
-following license restricting its use.
-
-The Interface Definition Language Compiler Front End (CFE) is made
-available for your use provided that you include this license and
-copyright notice on all media and documentation and the software
-program in which this product is incorporated in whole or part. You
-may copy and extend functionality (but may not remove functionality)
-of the Interface Definition Language CFE without charge, but you are
-not authorized to license or distribute it to anyone else except as
-part of a product or program developed by you or with the express
-written consent of Sun Microsystems, Inc. ("Sun").
-
-The names of Sun Microsystems, Inc. and any of its subsidiaries or
-affiliates may not be used in advertising or publicity pertaining to
-distribution of Interface Definition Language CFE as permitted herein.
-
-This license is effective until terminated by Sun for failure to
-comply with this license.  Upon termination, you shall destroy or
-return all code and documentation for the Interface Definition
-Language CFE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES
-OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A
-COURSE OF DEALING, USAGE OR TRADE PRACTICE.
-
-INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND
-WITHOUT ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES
-OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR
-ENHANCEMENT.
-
-SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY
-WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY
-PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
-
-IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE
-LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND
-CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGES.
-
-Use, duplication, or disclosure by the government is subject to
-restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
-Technical Data and Computer Software clause at DFARS 252.227-7013 and
-FAR 52.227-19.
-
-Sun, Sun Microsystems and the Sun logo are trademarks or registered
-trademarks of Sun Microsystems, Inc.
-
-SunSoft, Inc.  
-2550 Garcia Avenue 
-Mountain View, California  94043
-
-NOTE:
-
-SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
-trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/INSTALL.sun b/TAO/TAO_IDL/INSTALL.sun
index 2b26b7fb597..5010206496b 100644
--- a/TAO/TAO_IDL/INSTALL.sun
+++ b/TAO/TAO_IDL/INSTALL.sun
@@ -35,49 +35,47 @@ correctly for Solaris 2.x and with SunPro SparcWorks compilers.
 
 CUSTOMIZATION
 
-The release contains a file idl_make_vars in the current directory,
-which is included in each Makefile. This file defines all the
-customizable variables for the CFE.
-
-OSV should be set to a string denoting the operating system upon which
-you wish to build the CFE. The CFE as shipped is preconfigured to
-compile correctly on Solaris 2.x (OSV=SOLARIS2), and has also been
-tested on SunOS 4.1.x (OSV=SUNOS4). It contains code donated by HP
-which enables it to be compiled on Apollo Domain systems (OSV=apollo)
-and HPUX systems (OSV=hpux), but these two configurations have not
-been tested.
+The release contains a file idl_make_vars in the current directory, which
+is included in each Makefile. This file defines all the customizable
+variables for the CFE.
+
+OSV should be set to a string denoting the operating system upon which you
+wish to build the CFE. The CFE as shipped is preconfigured to compile
+correctly on Solaris 2.x (OSV=SOLARIS2), and has also been tested on SunOS
+4.1.x (OSV=SUNOS4). It contains code donated by HP which enables it to be
+compiled on Apollo Domain systems (OSV=apollo) and HPUX systems (OSV=hpux),
+but these two configurations have not been tested.
 
 C++ and CCC should be set to identify the C++ compiler you will use to
-compile this release. Their values should be identical. Both are set
-to address differences between various make programs - some predefine
-CCC, others use C++ to denote the C++ compiler. The possible values
-are CC (which uses the Sparcworks compilers on SunOS 4.1 and Solaris
-2.3) and g++, which uses the installed version of GNU C++.
+compile this release. Their values should be identical. Both are set to
+address differences between various make programs - some predefine CCC,
+others use C++ to denote the C++ compiler. The possible values are CC
+(which uses the Sparcworks compilers on SunOS 4.1 and Solaris 2.3) and g++,
+which uses the installed version of GNU C++.
 
-CCFLAGS should be set to a list of flags to pass to the C++
-compiler. As shipped, this list is -g. NOTE: We have not extensively
-tested the release with optimization turned on.
+CCFLAGS should be set to a list of flags to pass to the C++ compiler. As
+shipped, this list is -g. NOTE: We have not extensively tested the release
+with optimization turned on.
 
-CPP_FLAGS should be set to a list of flags to pass to the C++
-preprocessor.  Use this variable to enable or disable specific
-customizations you make to the BE or CFE sources.
+CPP_FLAGS should be set to a list of flags to pass to the C++ preprocessor.
+Use this variable to enable or disable specific customizations you make to
+the BE or CFE sources.
 
-YFLAGS should be set to a list of flags to pass to the Yacc
-program. As shipped, the list is -d -t, which causes Yacc to generate
-y.tab.h and y.tab.c files.
+YFLAGS should be set to a list of flags to pass to the Yacc program. As
+shipped, the list is -d -t, which causes Yacc to generate y.tab.h and
+y.tab.c files.
 
-LEXFLAGS should be set to a list of flags to pass to the Lex
-program. As shipped, the list -t.
+LEXFLAGS should be set to a list of flags to pass to the Lex program. As
+shipped, the list -t.
 
-RANLIB should be set to the location of the ranlib program on your
-system.  As shipped this is ranlib. If your system has no ranlib you
-can set this variable to ':' or /bin/true. As shipped the variable is
-preset to /bin/true since Solaris 2.x does not use ranlib.
+RANLIB should be set to the location of the ranlib program on your system.
+As shipped this is ranlib. If your system has no ranlib you can set this
+variable to ':' or /bin/true. As shipped the variable is preset to
+/bin/true since Solaris 2.x does not use ranlib.
 
 AR should be set to the location of the ar program on your system. As
-shipped this is ar. If your system has a different mechanism for
-creating libraries, you should modify the value of this variable
-accordingly.
+shipped this is ar. If your system has a different mechanism for creating
+libraries, you should modify the value of this variable accordingly.
 
 ARFLAGS should be set to the flags to be passed to the ar program. As
 shipped this is 'crv'.
@@ -86,30 +84,29 @@ INSTALLATION
 
 a. Disk space requirements
 
-This distribution requires approximately 350 KBytes when
-compressed. When uncompressed, untarred and compiled, approximately 10
-MBytes of disk space are consumed on a Sun 4.
+This distribution requires approximately 350 KBytes when compressed. When
+uncompressed, untarred and compiled, approximately 10 MBytes of disk space
+are consumed on a Sun 4.
 
 b. Getting the software
 
-Use anonymous FTP to omg.org and supply your e-mail address as
-password.  Change directories to pub/OMG_IDL_CFE_1.3, set bin and get
-the compressed tar file OMG_IDL_CFE_1.3.tar.Z.
+Use anonymous FTP to omg.org and supply your e-mail address as password.
+Change directories to pub/OMG_IDL_CFE_1.3, set bin and get the compressed
+tar file OMG_IDL_CFE_1.3.tar.Z.
 
-The distribution may, in the future, be made available from other
-archives on the Internet. However, omg.org will always have the most
-up-to-date version of this software.
+The distribution may, in the future, be made available from other archives
+on the Internet. However, omg.org will always have the most up-to-date
+version of this software.
 
-After transferring this file, uncompress it and untar it in a
-directory of your choice.
+After transferring this file, uncompress it and untar it in a directory of
+your choice.
 
 c. Compiling it
 
-If you are using a Sparcstation running Solaris 2.x and have the
-SunPro Sparcworks compilers installed, you may directly install the
-software. If your hardware or operating system configurations are
-different, read and follow the instructions in the previous section
-first.
+If you are using a Sparcstation running Solaris 2.x and have the SunPro
+Sparcworks compilers installed, you may directly install the software. If
+your hardware or operating system configurations are different, read and
+follow the instructions in the previous section first.
 
 At the root directory of the release, issue
 
@@ -120,14 +117,13 @@ or
    % make all
 
 This will compile the provided sources and the sources found in the be
-directory. Executing this make target causes 'make all' to be invoked
-in each subdirectory, resulting in building the libraries for each
-component and finally a link step producing an executable IDL
-compiler.
+directory. Executing this make target causes 'make all' to be invoked in
+each subdirectory, resulting in building the libraries for each component
+and finally a link step producing an executable IDL compiler.
 
-In order to make only the compiler front end components, without
-compiling the sources found in the be directory and without building
-an executable, issue
+In order to make only the compiler front end components, without compiling
+the sources found in the be directory and without building an executable,
+issue
 
   % make libs
 
@@ -144,43 +140,102 @@ To remove all files created by the build process, issue
 
   % make clean
 
-This will not remove any files created by Yacc and Lex, because you
-may be using the ones provided in the distribution (see below).
+This will not remove any files created by Yacc and Lex, because you may be
+using the ones provided in the distribution (see below).
 
 d. Yacc and Lex
 
-Some installations may not have a C++ aware Yacc and Lex
-processor. For these installations, we have included the output of
-yacc and lex in the release. If you need to use these files to build
-the release because you don't have access to a C++ capable Yacc or
-Lex, go to the "fe" directory, issue the command:
+Some installations may not have a C++ aware Yacc and Lex processor. For
+these installations, we have included the output of yacc and lex in the
+release. If you need to use these files to build the release because you
+don't have access to a C++ capable Yacc or Lex, go to the "fe" directory,
+issue the command:
 
    % touch lex.yy.cc y.tab.cc y.tab.hh
 
 This will ensure that the processed files appear to be newer than the
-source files they were produced from and will cause "make" to skip
-their production.
+source files they were produced from and will cause "make" to skip their
+production.
 
-NOTE: The files provided in the distribution have been produced on
-Solaris 2.3 and may contain OS-specific #include directives. If you
-intend to use these files, you may have to edit them to make them work
-in your environment. The provided files are known to compile cleanly
-without modification with both SunPro Sparcworks compilers and GNU C++
-on both SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and
-lexer input files with bison or flex.
+NOTE: The files provided in the distribution have been produced on Solaris
+2.3 and may contain OS-specific #include directives. If you intend to use
+these files, you may have to edit them to make them work in your
+environment. The provided files are known to compile cleanly without
+modification with both SunPro Sparcworks compilers and GNU C++ on both
+SunOS 4.1 and Solaris 2.3.  We have not tested the grammar and lexer input
+files with bison or flex.
 
 IMPLEMENTING A BACK END
 
-To implement your own back end, you can start with the provided
-sources in the be directory and modify them. The Makefile understands
-the 'make all' target and will generate libbe.a in the demo_be
-directory. As set up, the variable CPP_FLAGS allows you to place
-include files either in the current directory or in the include
-directory. Alternatively, you can place your include files in a new
-directory and modify CPP_FLAGS to cause the C++ preprocessor to search
-this new directory for referenced include files, by adding a new -I
-directive.
-
-Additional detail on the structure and function of back ends, and on
-the protocol which a back end must implement, are found in the
-document entitled WRITING_A_BE.
+To implement your own back end, you can start with the provided sources in
+the be directory and modify them. The Makefile understands the 'make all'
+target and will generate libbe.a in the demo_be directory. As set up, the
+variable CPP_FLAGS allows you to place include files either in the current
+directory or in the include directory. Alternatively, you can place your
+include files in a new directory and modify CPP_FLAGS to cause the C++
+preprocessor to search this new directory for referenced include files, by
+adding a new -I directive.
+
+Additional detail on the structure and function of back ends, and on the
+protocol which a back end must implement, are found in the document
+entitled WRITING_A_BE.
+
+COPYRIGHT
+
+Copyright 1992, 1993, 1994 Sun Microsystems, Inc.  Printed in the United
+States of America.  All Rights Reserved.
+
+This product is protected by copyright and distributed under the following
+license restricting its use.
+
+The Interface Definition Language Compiler Front End (CFE) is made
+available for your use provided that you include this license and copyright
+notice on all media and documentation and the software program in which
+this product is incorporated in whole or part. You may copy and extend
+functionality (but may not remove functionality) of the Interface
+Definition Language CFE without charge, but you are not authorized to
+license or distribute it to anyone else except as part of a product or
+program developed by you or with the express written consent of Sun
+Microsystems, Inc. ("Sun").
+
+The names of Sun Microsystems, Inc. and any of its subsidiaries or
+affiliates may not be used in advertising or publicity pertaining to
+distribution of Interface Definition Language CFE as permitted herein.
+
+This license is effective until terminated by Sun for failure to comply
+with this license.  Upon termination, you shall destroy or return all code
+and documentation for the Interface Definition Language CFE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF
+ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS
+FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF
+DEALING, USAGE OR TRADE PRACTICE.
+
+INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT
+ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES
+TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT.
+
+SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH
+RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY
+INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF.
+
+IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR
+ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL
+DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+Use, duplication, or disclosure by the government is subject to
+restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in
+Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
+52.227-19.
+
+Sun, Sun Microsystems and the Sun logo are trademarks or registered
+trademarks of Sun Microsystems, Inc.
+
+SunSoft, Inc.  
+2550 Garcia Avenue 
+Mountain View, California  94043
+
+NOTE:
+
+SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are
+trademarks or registered trademarks of Sun Microsystems, Inc.
diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile
index fc93c0adcaa..9a4b8db56ef 100644
--- a/TAO/TAO_IDL/Makefile
+++ b/TAO/TAO_IDL/Makefile
@@ -90,8 +90,6 @@ FILES = tao_idl \
 	be/be_field \
 	be/be_interface \
 	be/be_interface_fwd \
-	be/be_valuetype \
-	be/be_valuetype_fwd\
 	be/be_module \
 	be/be_native \
 	be/be_operation \
@@ -128,8 +126,6 @@ FILES = tao_idl \
 	be/be_visitor_field \
 	be/be_visitor_interface \
 	be/be_visitor_interface_fwd \
-	be/be_visitor_valuetype \
-	be/be_visitor_valuetype_fwd \
 	be/be_visitor_module \
 	be/be_visitor_operation \
 	be/be_visitor_root \
@@ -172,13 +168,34 @@ ifneq ($(CROSS-COMPILE),)
   clean realclean:
 	@echo Nothing to clean in TAO_IDL on CROSS-COMPILE platforms.
 else  # ! CROSS-COMPILE
+  IDL_CFE_VERSION	= \"1.3.0\"
 
   ifeq ($(findstring g++,$(CXX)),g++)
     CCFLAGS += -Wno-switch
+  else
+  ifeq ($(findstring cxx,$(CXX)),cxx)
+    # Digital Unix cxx
+    # 111: statement is unreachable
+    # 177: variable was declared but not referenced
+    # 550: variable set but never used
+    ifneq ($(CXX_VER),CXX_5)
+      WARNING_FLAGS += -msg_disable 111,177,550
+    endif # CXX_5
+  else
+  ifeq ($(findstring gcx,$(CXX)),gcx)
+    # GreenHills gcx, to suppress many warnings about TAO_YY_BREAK
+    # statements being unreachable.
+    CCFLAGS += -w
+  endif # gcx
+  endif # cxx
   endif # g++
 
   CPPFLAGS += -Iinclude -Ibe_include -Ife \
-              -DCPP_LOCATION=\"$(strip $(CXX))\"
+              -DCPP_LOCATION=\"$(strip $(CXX))\" \
+              -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
+
+  clean:
+	rm -f tao_idl
 
   realclean:
 	rm -f tao_idl TAGS
@@ -202,9 +219,6 @@ fe/lex.yy.cpp:	fe/idl.ll
 
 .PHONY: lex.yy.cpp.target
 
-# For DOC group use
-YACC = /home/cs/faculty/schmidt/bin/SunOS5/yacc
-
 lex.yy.cpp.target:
 		$(LEX) -t fe/idl.ll | \
 		sed -e "s/yy/tao_yy/g" \
@@ -213,7 +227,6 @@ lex.yy.cpp.target:
 		    -e "/#include </d" \
 		    -e "s@ECHO@TAO_YY_ECHO@" \
 		    -e 's/\$$Hea''der.*\$$/$$I''d$$/' > fe/lex.yy.cpp
-		(cd fe ; patch < lex.yy.cpp.diff)
 
 fe/y.tab.cpp:	fe/idl.yy
 	@echo "WARNING: Potentially outdated fe/y.tab.cpp"
@@ -234,8 +247,7 @@ y.tab: fe/idl.yy
 		    -e "s%\(#pragma ident\)%// \1%" < y.tab.c > /tmp/$(USER).Y
 		sed -e "s/yy/tao_yy/g" \
 		    -e "s/YY/TAO_YY/g" < y.tab.h > /tmp/$(USER).YH
-		echo '// $$I''d$$' > fe/y.tab.cpp
-		cat /tmp/$(USER).Y >> fe/y.tab.cpp
+		cp /tmp/$(USER).Y fe/y.tab.cpp
 		echo '// $$I''d$$' > fe/y.tab.h
 		cat /tmp/$(USER).YH >> fe/y.tab.h
 		$(RM) -f /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h
@@ -257,6 +269,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -266,60 +280,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -340,6 +309,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -349,60 +320,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -423,6 +349,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -432,60 +360,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -506,6 +389,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -515,17 +400,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ include/drv_private.h include/drv_link.h be_include/be.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 \
@@ -540,6 +440,21 @@ tags:
  $(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/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 \
@@ -547,54 +462,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- include/drv_private.h include/drv_link.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -610,6 +487,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -619,60 +498,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -690,6 +524,20 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  include/drv_private.h \
  $(ACE_ROOT)/ace/Process_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 \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Process_Manager.i
@@ -697,6 +545,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -706,60 +556,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -780,6 +585,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -789,60 +596,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -860,6 +622,20 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  include/drv_private.h include/drv_link.h \
  $(ACE_ROOT)/ace/Process_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 \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Process_Manager.i \
@@ -870,6 +646,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -879,60 +657,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -954,6 +687,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -963,60 +698,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1038,6 +728,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1047,60 +739,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1122,6 +769,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1131,60 +780,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1206,6 +810,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1215,60 +821,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1290,6 +851,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1299,60 +862,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1374,6 +892,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1383,60 +903,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1457,6 +932,8 @@ tags:
 .obj/lex.yy.o .obj/lex.yy.so .shobj/lex.yy.o .shobj/lex.yy.so: fe/lex.yy.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1467,59 +944,14 @@ tags:
  $(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 \
  include/idl.h include/intlmacros.h include/idl_narrow.h \
  include/idl_defines.h include/idl_fwd.h include/idl_bool.h \
  include/utl_string.h include/utl_identifier.h include/ast.h \
  include/utl_scoped_name.h include/ast_decl.h include/ast_expression.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 \
  include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
@@ -1542,6 +974,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1551,60 +985,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1624,6 +1013,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1633,60 +1024,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1706,6 +1052,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1715,60 +1063,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1788,6 +1091,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1797,60 +1102,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1870,6 +1130,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1879,60 +1141,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -1952,6 +1169,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1961,60 +1180,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2034,6 +1208,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2043,60 +1219,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2116,6 +1247,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2125,60 +1258,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2198,6 +1286,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2207,60 +1297,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2280,6 +1325,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2289,60 +1336,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2362,6 +1364,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2371,60 +1375,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2444,6 +1403,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2453,60 +1414,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2526,6 +1442,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2535,60 +1453,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2608,6 +1481,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2617,60 +1492,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2690,6 +1520,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2699,60 +1531,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2772,6 +1559,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2781,60 +1570,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2854,6 +1598,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2863,60 +1609,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -2936,6 +1637,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2945,60 +1648,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3018,6 +1676,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3027,60 +1687,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3100,6 +1715,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3109,60 +1726,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3182,6 +1754,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3191,60 +1765,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3264,6 +1793,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3273,60 +1804,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3346,6 +1832,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3355,60 +1843,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3428,6 +1871,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3437,60 +1882,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3510,6 +1910,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3519,60 +1921,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3592,6 +1949,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3601,60 +1960,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3674,6 +1988,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3683,60 +1999,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3756,6 +2027,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3765,60 +2038,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3838,6 +2066,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3847,60 +2077,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -3920,6 +2105,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3929,60 +2116,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4002,6 +2144,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4011,60 +2155,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4084,6 +2183,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4093,60 +2194,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4166,6 +2222,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4175,60 +2233,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4248,6 +2261,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4257,60 +2272,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4330,6 +2300,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4339,60 +2311,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4412,6 +2339,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4421,60 +2350,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4494,6 +2378,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4503,60 +2389,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4576,6 +2417,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4585,60 +2428,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4658,6 +2456,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4667,60 +2467,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4740,6 +2495,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4749,60 +2506,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4822,6 +2534,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4831,60 +2545,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4904,6 +2573,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4913,60 +2584,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -4986,6 +2612,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4995,60 +2623,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -5068,6 +2651,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5077,60 +2662,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -5150,6 +2690,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5159,60 +2701,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -5232,6 +2729,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5241,60 +2740,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -5314,6 +2768,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5323,17 +2779,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5348,6 +2819,21 @@ tags:
  $(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/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 \
@@ -5355,54 +2841,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5418,6 +2866,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5427,17 +2877,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5452,6 +2917,21 @@ tags:
  $(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/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 \
@@ -5459,54 +2939,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5522,6 +2964,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5531,17 +2975,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5556,6 +3015,21 @@ tags:
  $(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/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 \
@@ -5563,54 +3037,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5626,6 +3062,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5635,17 +3073,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5660,6 +3113,21 @@ tags:
  $(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/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 \
@@ -5667,54 +3135,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5730,6 +3160,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5739,17 +3171,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5764,6 +3211,21 @@ tags:
  $(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/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 \
@@ -5771,54 +3233,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5834,6 +3258,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5843,17 +3269,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5868,6 +3309,21 @@ tags:
  $(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/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 \
@@ -5875,54 +3331,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -5938,6 +3356,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5947,17 +3367,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -5972,6 +3407,21 @@ tags:
  $(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/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 \
@@ -5979,54 +3429,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6042,6 +3454,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6051,17 +3465,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -6076,6 +3505,21 @@ tags:
  $(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/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 \
@@ -6083,54 +3527,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6146,6 +3552,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6155,17 +3563,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -6180,6 +3603,21 @@ tags:
  $(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/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 \
@@ -6187,54 +3625,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6250,6 +3650,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6259,60 +3661,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -6348,50 +3705,6 @@ tags:
  be_include/be_visitor_interface/tie_sh.h \
  be_include/be_visitor_interface/tie_si.h be_include/be.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_codegen.h \
- be_include/be_stream_factory.h be_include/be_visitor_factory.h \
- be_include/be_visitor_context.h
-.obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be/be_interface_fwd.cpp include/idl.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/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 \
- include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
- include/idl_fwd.h include/idl_bool.h include/utl_string.h \
- include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
@@ -6406,6 +3719,21 @@ tags:
  $(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/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 \
@@ -6413,54 +3741,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6470,12 +3760,14 @@ tags:
  be_include/be_sequence.h be_include/be_string.h \
  be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
  be_include/be_helper.h be_include/be_codegen.h \
- be_include/be_stream_factory.h be_include/be_visitor.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h
-.obj/be_valuetype.o .obj/be_valuetype.so .shobj/be_valuetype.o .shobj/be_valuetype.so: be/be_valuetype.cpp include/idl.h \
+ be_include/be_stream_factory.h be_include/be_visitor_factory.h \
+ be_include/be_visitor_context.h
+.obj/be_interface_fwd.o .obj/be_interface_fwd.so .shobj/be_interface_fwd.o .shobj/be_interface_fwd.so: be/be_interface_fwd.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6485,60 +3777,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -6556,50 +3803,6 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  be_include/be.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_codegen.h \
- be_include/be_stream_factory.h be_include/be_visitor.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h
-.obj/be_valuetype_fwd.o .obj/be_valuetype_fwd.so .shobj/be_valuetype_fwd.o .shobj/be_valuetype_fwd.so: be/be_valuetype_fwd.cpp include/idl.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/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 \
- include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
- include/idl_fwd.h include/idl_bool.h include/utl_string.h \
- include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
@@ -6614,6 +3817,21 @@ tags:
  $(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/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 \
@@ -6621,54 +3839,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6684,6 +3864,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6693,17 +3875,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -6718,6 +3915,21 @@ tags:
  $(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/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 \
@@ -6725,54 +3937,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6788,6 +3962,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6797,17 +3973,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -6822,6 +4013,21 @@ tags:
  $(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/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 \
@@ -6829,54 +4035,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6892,6 +4060,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6901,17 +4071,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -6926,6 +4111,21 @@ tags:
  $(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/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 \
@@ -6933,54 +4133,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -6996,6 +4158,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7005,17 +4169,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7030,6 +4209,21 @@ tags:
  $(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/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 \
@@ -7037,54 +4231,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7100,6 +4256,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7109,17 +4267,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7134,6 +4307,21 @@ tags:
  $(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/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 \
@@ -7141,54 +4329,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7204,6 +4354,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7213,17 +4365,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7238,6 +4405,21 @@ tags:
  $(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/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 \
@@ -7245,54 +4427,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7319,6 +4463,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7328,17 +4474,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7353,6 +4514,21 @@ tags:
  $(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/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 \
@@ -7360,54 +4536,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7423,6 +4561,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7432,17 +4572,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7457,6 +4612,21 @@ tags:
  $(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/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 \
@@ -7464,54 +4634,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7527,6 +4659,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7536,17 +4670,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7561,6 +4710,21 @@ tags:
  $(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/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 \
@@ -7568,54 +4732,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7631,6 +4757,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7640,17 +4768,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7665,6 +4808,21 @@ tags:
  $(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/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 \
@@ -7672,54 +4830,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7735,6 +4855,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7744,17 +4866,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7769,6 +4906,21 @@ tags:
  $(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/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 \
@@ -7776,54 +4928,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7839,6 +4953,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7848,17 +4964,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7873,6 +5004,21 @@ tags:
  $(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/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 \
@@ -7880,54 +5026,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -7943,6 +5051,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7952,17 +5062,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -7977,6 +5102,21 @@ tags:
  $(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/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 \
@@ -7984,54 +5124,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8047,6 +5149,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8056,17 +5160,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8081,6 +5200,21 @@ tags:
  $(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/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 \
@@ -8088,54 +5222,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8151,6 +5247,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8160,17 +5258,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8185,6 +5298,21 @@ tags:
  $(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/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 \
@@ -8192,54 +5320,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8250,12 +5340,13 @@ tags:
  be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
  be_include/be_helper.h be_include/be_codegen.h \
  be_include/be_stream_factory.h be_include/be_visitor.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h \
- be/../../tao/Version.h
+ be_include/be_visitor_factory.h be_include/be_visitor_context.h
 .obj/be_produce.o .obj/be_produce.so .shobj/be_produce.o .shobj/be_produce.so: be/be_produce.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8265,17 +5356,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8290,6 +5396,21 @@ tags:
  $(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/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 \
@@ -8297,54 +5418,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8360,6 +5443,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8369,17 +5454,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8394,6 +5494,21 @@ tags:
  $(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/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 \
@@ -8401,54 +5516,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8464,6 +5541,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8473,17 +5552,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8498,6 +5592,21 @@ tags:
  $(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/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 \
@@ -8505,54 +5614,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8568,6 +5639,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8577,17 +5650,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8602,6 +5690,21 @@ tags:
  $(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/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 \
@@ -8609,54 +5712,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8672,6 +5737,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8681,17 +5748,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8706,6 +5788,21 @@ tags:
  $(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/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 \
@@ -8713,54 +5810,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8777,6 +5836,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8786,17 +5847,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8811,6 +5887,21 @@ tags:
  $(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/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 \
@@ -8818,54 +5909,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8881,6 +5934,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8890,17 +5945,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -8915,6 +5985,21 @@ tags:
  $(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/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 \
@@ -8922,54 +6007,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -8985,6 +6032,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8994,17 +6043,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9019,6 +6083,21 @@ tags:
  $(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/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 \
@@ -9026,54 +6105,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9090,6 +6131,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9099,17 +6142,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9124,6 +6182,21 @@ tags:
  $(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/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 \
@@ -9131,54 +6204,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9191,7 +6226,6 @@ tags:
  be_include/be_stream_factory.h be_include/be_visitor.h \
  be_include/be_visitor_factory.h be_include/be_visitor_context.h \
  be_include/be_visitor_argument.h be_include/be_visitor_decl.h \
- be_include/be_visitor_scope.h \
  be_include/be_visitor_argument/argument.h \
  be_include/be_visitor_argument/arglist.h \
  be_include/be_visitor_argument/pre_docall_cs.h \
@@ -9215,7 +6249,7 @@ tags:
  be_include/be_visitor_array/any_op_cs.h \
  be_include/be_visitor_array/cdr_op_ch.h \
  be_include/be_visitor_array/cdr_op_cs.h \
- be_include/be_visitor_attribute.h \
+ be_include/be_visitor_attribute.h be_include/be_visitor_scope.h \
  be_include/be_visitor_attribute/attribute.h \
  be_include/be_visitor_constant.h \
  be_include/be_visitor_constant/constant_ch.h \
@@ -9264,26 +6298,6 @@ tags:
  be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
  be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
  be_include/be_visitor_interface_fwd/cdr_op_ci.h \
- be_include/be_visitor_valuetype.h \
- be_include/be_visitor_valuetype/valuetype.h \
- be_include/be_visitor_valuetype/valuetype_ch.h \
- be_include/be_visitor_valuetype/valuetype_obv_ch.h \
- be_include/be_visitor_valuetype/valuetype_obv_cs.h \
- be_include/be_visitor_valuetype/valuetype_ci.h \
- be_include/be_visitor_valuetype/valuetype_cs.h \
- be_include/be_visitor_valuetype/cdr_op_ch.h \
- be_include/be_visitor_valuetype/cdr_op_cs.h \
- be_include/be_visitor_valuetype/marshal_ch.h \
- be_include/be_visitor_valuetype/marshal_cs.h \
- be_include/be_visitor_valuetype/arglist.h \
- be_include/be_visitor_valuetype/field_ch.h \
- be_include/be_visitor_valuetype/field_cs.h \
- be_include/be_visitor_valuetype/field_cdr_ci.h \
- be_include/be_visitor_valuetype/obv_module.h \
- be_include/be_visitor_valuetype_fwd.h \
- be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h \
- be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h \
- be_include/be_visitor_valuetype_fwd/cdr_op_ci.h \
  be_include/be_visitor_module.h be_include/be_visitor_module/module.h \
  be_include/be_visitor_module/module_ch.h \
  be_include/be_visitor_module/module_sh.h \
@@ -9387,6 +6401,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9396,17 +6412,29 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h be_include/be.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 \
@@ -9421,6 +6449,21 @@ tags:
  $(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/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 \
@@ -9428,51 +6471,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9488,6 +6496,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9497,17 +6507,29 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h be_include/be.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 \
@@ -9522,6 +6544,21 @@ tags:
  $(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/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 \
@@ -9529,51 +6566,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9586,7 +6588,6 @@ tags:
  be_include/be_stream_factory.h be_include/be_visitor.h \
  be_include/be_visitor_factory.h be_include/be_visitor_context.h \
  be_include/be_visitor_argument.h be_include/be_visitor_decl.h \
- be_include/be_visitor_scope.h \
  be_include/be_visitor_argument/argument.h \
  be_include/be_visitor_argument/arglist.h \
  be_include/be_visitor_argument/pre_docall_cs.h \
@@ -9621,6 +6622,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9630,17 +6633,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9655,6 +6673,21 @@ tags:
  $(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/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 \
@@ -9662,54 +6695,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9738,6 +6733,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9747,17 +6744,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9772,6 +6784,21 @@ tags:
  $(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/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 \
@@ -9779,54 +6806,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9846,6 +6835,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9855,17 +6846,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9880,6 +6886,21 @@ tags:
  $(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/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 \
@@ -9887,54 +6908,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -9956,6 +6939,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9965,17 +6950,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -9990,6 +6990,21 @@ tags:
  $(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/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 \
@@ -9997,54 +7012,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10060,6 +7037,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10069,17 +7048,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -10094,6 +7088,21 @@ tags:
  $(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/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 \
@@ -10101,54 +7110,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10165,6 +7136,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10174,17 +7147,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -10199,6 +7187,21 @@ tags:
  $(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/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 \
@@ -10206,54 +7209,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10279,6 +7244,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10288,17 +7255,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -10313,6 +7295,21 @@ tags:
  $(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/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 \
@@ -10320,54 +7317,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10410,6 +7369,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10419,17 +7380,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -10444,6 +7420,21 @@ tags:
  $(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/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 \
@@ -10451,54 +7442,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10523,6 +7476,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10532,17 +7487,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -10557,6 +7527,21 @@ tags:
  $(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/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 \
@@ -10564,54 +7549,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10659,10 +7606,11 @@ tags:
  be/be_visitor_interface/cdr_op_ch.cpp \
  be/be_visitor_interface/cdr_op_cs.cpp
 .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \
- include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
+ include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10672,60 +7620,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -10743,58 +7646,6 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  be_include/be.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_codegen.h \
- be_include/be_stream_factory.h be_include/be_visitor.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h \
- be_include/be_visitor_interface_fwd.h be_include/be_visitor_scope.h \
- be_include/be_visitor_decl.h \
- be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
- be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
- be_include/be_visitor_interface_fwd/cdr_op_ci.h \
- be/be_visitor_interface_fwd/interface_fwd_ch.cpp \
- be/be_visitor_interface_fwd/interface_fwd_ci.cpp \
- be/be_visitor_interface_fwd/cdr_op_ci.cpp
-.obj/be_visitor_valuetype.o .obj/be_visitor_valuetype.so .shobj/be_visitor_valuetype.o .shobj/be_visitor_valuetype.so: be/be_visitor_valuetype.cpp include/idl.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/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 \
- include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
- include/idl_fwd.h include/idl_bool.h include/utl_string.h \
- include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
@@ -10809,6 +7660,21 @@ tags:
  $(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/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 \
@@ -10816,54 +7682,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -10875,77 +7703,20 @@ tags:
  be_include/be_helper.h be_include/be_codegen.h \
  be_include/be_stream_factory.h be_include/be_visitor.h \
  be_include/be_visitor_factory.h be_include/be_visitor_context.h \
- be_include/be_visitor_valuetype.h be_include/be_visitor_scope.h \
+ be_include/be_visitor_interface_fwd.h be_include/be_visitor_scope.h \
  be_include/be_visitor_decl.h \
- be_include/be_visitor_valuetype/valuetype.h \
- be_include/be_visitor_valuetype/valuetype_ch.h \
- be_include/be_visitor_valuetype/valuetype_obv_ch.h \
- be_include/be_visitor_valuetype/valuetype_obv_cs.h \
- be_include/be_visitor_valuetype/valuetype_ci.h \
- be_include/be_visitor_valuetype/valuetype_cs.h \
- be_include/be_visitor_valuetype/cdr_op_ch.h \
- be_include/be_visitor_valuetype/cdr_op_cs.h \
- be_include/be_visitor_valuetype/marshal_ch.h \
- be_include/be_visitor_valuetype/marshal_cs.h \
- be_include/be_visitor_valuetype/arglist.h \
- be_include/be_visitor_valuetype/field_ch.h \
- be_include/be_visitor_valuetype/field_cs.h \
- be_include/be_visitor_valuetype/field_cdr_ci.h \
- be_include/be_visitor_valuetype/obv_module.h \
- be/be_visitor_valuetype/valuetype.cpp \
- be/be_visitor_valuetype/valuetype_ch.cpp \
- be/be_visitor_valuetype/valuetype_obv_ch.cpp \
- be/be_visitor_valuetype/valuetype_obv_cs.cpp \
- be/be_visitor_valuetype/valuetype_ci.cpp \
- be/be_visitor_valuetype/valuetype_cs.cpp \
- be/be_visitor_valuetype/cdr_op_ch.cpp \
- be/be_visitor_valuetype/cdr_op_cs.cpp \
- be/be_visitor_valuetype/marshal_ch.cpp \
- be/be_visitor_valuetype/marshal_cs.cpp \
- be/be_visitor_valuetype/arglist.cpp be_include/be_visitor_operation.h \
- be_include/be_visitor_operation/operation.h \
- be_include/be_visitor_operation/operation_ch.h \
- be_include/be_visitor_operation/operation_cs.h \
- be_include/be_visitor_operation/operation_sh.h \
- be_include/be_visitor_operation/operation_ih.h \
- be_include/be_visitor_operation/operation_ss.h \
- be_include/be_visitor_operation/operation_is.h \
- be_include/be_visitor_operation/tie_sh.h \
- be_include/be_visitor_operation/tie_si.h \
- be_include/be_visitor_operation/collocated_sh.h \
- be_include/be_visitor_operation/collocated_ss.h \
- be_include/be_visitor_operation/arglist.h \
- be_include/be_visitor_operation/rettype.h \
- be_include/be_visitor_operation/rettype_is.h \
- be_include/be_visitor_operation/rettype_vardecl_cs.h \
- be_include/be_visitor_operation/rettype_pre_docall_cs.h \
- be_include/be_visitor_operation/rettype_docall_cs.h \
- be_include/be_visitor_operation/rettype_post_docall_cs.h \
- be_include/be_visitor_operation/rettype_return_cs.h \
- be_include/be_visitor_operation/exceptlist_cs.h \
- be_include/be_visitor_operation/argument.h \
- be_include/be_visitor_operation/argument_invoke.h \
- be_include/be_visitor_operation/argument_marshal.h \
- be_include/be_visitor_operation/rettype_vardecl_ss.h \
- be_include/be_visitor_operation/rettype_assign_ss.h \
- be_include/be_visitor_operation/rettype_post_upcall_ss.h \
- be_include/be_visitor_operation/rettype_marshal_ss.h \
- be_include/be_visitor_operation/compiled_marshal.h \
- be_include/be_visitor_operation/rettype_pre_invoke_cs.h \
- be/be_visitor_valuetype/field_ch.cpp \
- be/be_visitor_valuetype/field_cs.cpp \
- be/be_visitor_valuetype/field_cdr_ci.cpp \
- be_include/be_visitor_field.h be_include/be_visitor_field/field_ch.h \
- be_include/be_visitor_field/field_ci.h \
- be_include/be_visitor_field/field_cs.h \
- be_include/be_visitor_field/cdr_op_ch.h \
- be_include/be_visitor_field/cdr_op_cs.h \
- be/be_visitor_valuetype/obv_module.cpp
-.obj/be_visitor_valuetype_fwd.o .obj/be_visitor_valuetype_fwd.so .shobj/be_visitor_valuetype_fwd.o .shobj/be_visitor_valuetype_fwd.so: be/be_visitor_valuetype_fwd.cpp \
- include/idl.h \
+ be_include/be_visitor_interface_fwd/interface_fwd_ch.h \
+ be_include/be_visitor_interface_fwd/interface_fwd_ci.h \
+ be_include/be_visitor_interface_fwd/cdr_op_ci.h \
+ be/be_visitor_interface_fwd/interface_fwd_ch.cpp \
+ be/be_visitor_interface_fwd/interface_fwd_ci.cpp \
+ be/be_visitor_interface_fwd/cdr_op_ci.cpp
+.obj/be_visitor_module.o .obj/be_visitor_module.so .shobj/be_visitor_module.o .shobj/be_visitor_module.so: be/be_visitor_module.cpp include/idl.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10955,60 +7726,15 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
  include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
  include/ast_interface.h include/ast_interface_fwd.h \
  include/ast_structure.h include/ast_exception.h include/ast_enum.h \
@@ -11026,55 +7752,6 @@ tags:
  include/ast_extern.h include/nr_extern.h include/global_extern.h \
  be_include/be.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
- be_include/be_type.h be_include/be_predefined_type.h \
- be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
- be_include/be_exception.h be_include/be_expression.h \
- be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
- be_include/be_argument.h be_include/be_attribute.h \
- be_include/be_union.h be_include/be_union_branch.h \
- be_include/be_union_label.h be_include/be_constant.h \
- be_include/be_enum_val.h be_include/be_array.h \
- be_include/be_sequence.h be_include/be_string.h \
- be_include/be_typedef.h be_include/be_root.h be_include/be_native.h \
- be_include/be_helper.h be_include/be_codegen.h \
- be_include/be_stream_factory.h be_include/be_visitor.h \
- be_include/be_visitor_factory.h be_include/be_visitor_context.h \
- be_include/be_visitor_valuetype_fwd.h be_include/be_visitor_scope.h \
- be_include/be_visitor_decl.h \
- be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h \
- be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h \
- be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
-.obj/be_visitor_module.o .obj/be_visitor_module.so .shobj/be_visitor_module.o .shobj/be_visitor_module.so: be/be_visitor_module.cpp include/idl.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/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 \
- include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
- include/idl_fwd.h include/idl_bool.h include/utl_string.h \
- include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
@@ -11089,6 +7766,21 @@ tags:
  $(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/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 \
@@ -11096,54 +7788,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11169,6 +7823,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11178,17 +7834,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11203,6 +7874,21 @@ tags:
  $(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/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 \
@@ -11210,54 +7896,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11313,22 +7961,6 @@ tags:
  be/be_visitor_operation/operation_sh.cpp \
  be/be_visitor_operation/operation_ih.cpp \
  be/be_visitor_operation/operation_ss.cpp \
- be_include/be_visitor_argument.h \
- be_include/be_visitor_argument/argument.h \
- be_include/be_visitor_argument/arglist.h \
- be_include/be_visitor_argument/pre_docall_cs.h \
- be_include/be_visitor_argument/docall_cs.h \
- be_include/be_visitor_argument/post_docall_cs.h \
- be_include/be_visitor_argument/post_docall_compiled_cs.h \
- be_include/be_visitor_argument/vardecl_ss.h \
- be_include/be_visitor_argument/pre_upcall_ss.h \
- be_include/be_visitor_argument/upcall_ss.h \
- be_include/be_visitor_argument/post_upcall_ss.h \
- be_include/be_visitor_argument/marshal_ss.h \
- be_include/be_visitor_argument/post_marshal_ss.h \
- be_include/be_visitor_argument/compiled_marshal_cs.h \
- be_include/be_visitor_argument/compiled_marshal_ss.h \
- be_include/be_visitor_argument/pre_invoke_cs.h \
  be/be_visitor_operation/operation_is.cpp \
  be/be_visitor_operation/rettype.cpp \
  be/be_visitor_operation/rettype_is.cpp \
@@ -11348,6 +7980,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11357,17 +7991,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11382,6 +8031,21 @@ tags:
  $(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/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 \
@@ -11389,54 +8053,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11469,6 +8095,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11478,17 +8106,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11503,6 +8146,21 @@ tags:
  $(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/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 \
@@ -11510,54 +8168,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11574,6 +8194,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11583,17 +8205,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11608,6 +8245,21 @@ tags:
  $(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/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 \
@@ -11615,54 +8267,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11716,6 +8330,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11725,17 +8341,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11750,6 +8381,21 @@ tags:
  $(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/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 \
@@ -11757,54 +8403,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11843,6 +8451,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11852,17 +8462,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11877,6 +8502,21 @@ tags:
  $(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/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 \
@@ -11884,54 +8524,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -11944,7 +8546,6 @@ tags:
  be_include/be_stream_factory.h be_include/be_visitor.h \
  be_include/be_visitor_factory.h be_include/be_visitor_context.h \
  be_include/be_visitor_typecode.h be_include/be_visitor_decl.h \
- be_include/be_visitor_scope.h \
  be_include/be_visitor_typecode/typecode_decl.h \
  be_include/be_visitor_typecode/typecode_defn.h \
  be/be_visitor_typecode/typecode_decl.cpp \
@@ -11953,6 +8554,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11962,17 +8565,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -11987,6 +8605,21 @@ tags:
  $(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/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 \
@@ -11994,54 +8627,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -12074,6 +8669,8 @@ tags:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12083,17 +8680,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -12108,6 +8720,21 @@ tags:
  $(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/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 \
@@ -12115,54 +8742,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
@@ -12194,10 +8783,11 @@ tags:
  be/be_visitor_union/any_op_cs.cpp be/be_visitor_union/cdr_op_ch.cpp \
  be/be_visitor_union/cdr_op_cs.cpp
 .obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be/be_visitor_union_branch.cpp \
- include/idl.h \
- $(ACE_ROOT)/ace/ACE.h \
+ include/idl.h $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12207,17 +8797,32 @@ tags:
  $(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 \
  include/intlmacros.h include/idl_narrow.h include/idl_defines.h \
  include/idl_fwd.h include/idl_bool.h include/utl_string.h \
  include/utl_identifier.h include/ast.h include/utl_scoped_name.h \
- include/ast_decl.h include/ast_expression.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 \
+ include/ast_decl.h include/ast_expression.h include/utl_scope.h \
+ include/ast_type.h include/ast_concrete_type.h \
+ include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
+ include/ast_interface.h include/ast_interface_fwd.h \
+ include/ast_structure.h include/ast_exception.h include/ast_enum.h \
+ include/ast_operation.h include/utl_list.h include/ast_field.h \
+ include/ast_argument.h include/ast_attribute.h include/ast_union.h \
+ include/ast_union_branch.h include/ast_union_label.h \
+ include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
+ include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
+ include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
+ include/ast_generator.h include/util.h include/utl_stack.h \
+ include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
+ include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
+ include/utl_error.h include/utl_indenter.h include/idl_extern.h \
+ include/fe_extern.h include/be_extern.h include/drv_extern.h \
+ include/ast_extern.h include/nr_extern.h include/global_extern.h \
+ be_include/be.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 \
@@ -12232,6 +8837,21 @@ tags:
  $(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/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 \
@@ -12239,54 +8859,16 @@ tags:
  $(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 \
- include/utl_scope.h include/ast_type.h include/ast_concrete_type.h \
- include/ast_predefined_type.h include/ast_module.h include/ast_root.h \
- include/ast_interface.h include/ast_interface_fwd.h \
- include/ast_structure.h include/ast_exception.h include/ast_enum.h \
- include/ast_operation.h include/utl_list.h include/ast_field.h \
- include/ast_argument.h include/ast_attribute.h include/ast_union.h \
- include/ast_union_branch.h include/ast_union_label.h \
- include/ast_constant.h include/ast_enum_val.h include/ast_array.h \
- include/ast_sequence.h include/ast_string.h include/ast_typedef.h \
- include/ast_native.h include/utl_strlist.h include/utl_exprlist.h \
- include/ast_generator.h include/util.h include/utl_stack.h \
- include/utl_idlist.h include/utl_exceptlist.h include/utl_namelist.h \
- include/utl_labellist.h include/utl_decllist.h include/idl_global.h \
- include/utl_error.h include/utl_indenter.h include/idl_extern.h \
- include/fe_extern.h include/be_extern.h include/drv_extern.h \
- include/ast_extern.h include/nr_extern.h include/global_extern.h \
- be_include/be.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/Process.i \
  be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \
  be_include/be_type.h be_include/be_predefined_type.h \
  be_include/be_module.h be_include/be_interface.h \
- be_include/be_interface_fwd.h be_include/be_valuetype.h \
- be_include/be_valuetype_fwd.h be_include/be_structure.h \
+ be_include/be_interface_fwd.h be_include/be_structure.h \
  be_include/be_exception.h be_include/be_expression.h \
  be_include/be_enum.h be_include/be_operation.h be_include/be_field.h \
  be_include/be_argument.h be_include/be_attribute.h \
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
deleted file mode 100644
index d2c1459db76..00000000000
--- a/TAO/TAO_IDL/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile.am for the TAO IDL compiler
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = driver fe narrow be be_include include ast util
-
-INCLUDES = -I$(top_srcdir)/TAO_IDL/include \
-           -I$(top_srcdir)/TAO_IDL/be_include -I$(top_srcdir)/TAO_IDL/fe
-
-man_MANS = tao_idl.1
-
-bin_PROGRAMS = tao_idl
-
-tao_idl_SOURCES = \
-        tao_idl.cpp
-
-tao_idl_LDADD = \
-        $(top_builddir)/TAO_IDL/driver/libdriver.a  \
-        $(top_builddir)/TAO_IDL/fe/libfe.a  \
-        $(top_builddir)/TAO_IDL/narrow/libnarrow.a  \
-        $(top_builddir)/TAO_IDL/be/libbe.a  \
-        $(top_builddir)/TAO_IDL/ast/libast.a  \
-        $(top_builddir)/TAO_IDL/util/libutil.a
-
-IDL_CFE_VERSION = \"1.3.0\"
-
-##        Is the "+=" a portable make feature?
-CXXFLAGS += \
-           -DIDL_CFE_VERSION=$(IDL_CFE_VERSION)
-
-EXTRA_DIST = $(man_MANS)
-
-tags:
-	rm -f TAGS
-	find . -name "*.h" -print | etags -a --c++ -
-	find . -name "*.cpp" -print | etags -a -
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/ast/Makefile.am b/TAO/TAO_IDL/ast/Makefile.am
deleted file mode 100644
index 3c9efba103a..00000000000
--- a/TAO/TAO_IDL/ast/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'ast' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include
-
-noinst_LIBRARIES = libast.a
-
-libast_a_SOURCES = \
-         ast_argument.cpp  \
-         ast_array.cpp  \
-         ast_attribute.cpp  \
-         ast_check.cpp  \
-         ast_concrete_type.cpp  \
-         ast_constant.cpp  \
-         ast_decl.cpp  \
-         ast_enum.cpp  \
-         ast_enum_val.cpp  \
-         ast_exception.cpp  \
-         ast_expression.cpp  \
-         ast_field.cpp  \
-         ast_generator.cpp  \
-         ast_interface.cpp  \
-         ast_interface_fwd.cpp  \
-         ast_module.cpp  \
-         ast_native.cpp  \
-         ast_operation.cpp  \
-         ast_predefined_type.cpp  \
-         ast_recursive.cpp  \
-         ast_redef.cpp  \
-         ast_root.cpp  \
-         ast_sequence.cpp  \
-         ast_string.cpp  \
-         ast_structure.cpp  \
-         ast_type.cpp  \
-         ast_typedef.cpp  \
-         ast_union.cpp  \
-         ast_union_branch.cpp  \
-         ast_union_label.cpp
-
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index f8a2bdb19d7..ba9f32570f4 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -117,14 +117,11 @@ exprtype_to_string(AST_Expression::ExprType et)
     return "void";
   case AST_Expression::EV_none:
     return "none";
-  case AST_Expression::EV_ulonglong:
-    return "unsigned long long";
-  case AST_Expression::EV_longlong:
-    return "long long";
-  case AST_Expression::EV_wchar:
-    return "wchar";
   case AST_Expression::EV_wstring:
+  case AST_Expression::EV_wchar:
   case AST_Expression::EV_longdouble:
+  case AST_Expression::EV_ulonglong:
+  case AST_Expression::EV_longlong:
     return NULL;
   }
   return NULL;
diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index a9e0239f8b1..9fc7f8af322 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -85,7 +85,7 @@ ACE_RCSID(ast, ast_expression, "$Id$")
 void
 AST_Expression::fill_definition_details()
 {
-  pd_defined_in = idl_global->scopes()->depth() > 0
+  pd_defined_in = idl_global->scopes()->depth() > 0 
     ? idl_global->scopes()->top()
     : 0 ;
   pd_line       = idl_global->lineno();
@@ -226,7 +226,7 @@ AST_Expression::AST_Expression(unsigned long ulv)
   pd_ev->u.ulval = ulv;
 }
 
-/*
+/* 
  * An AST_Expression denoting a 32-bit floating point number
  */
 AST_Expression::AST_Expression(float fv)
@@ -277,20 +277,6 @@ AST_Expression::AST_Expression(char cv)
   pd_ev->u.cval = cv;
 }
 
-AST_Expression::AST_Expression(ACE_CDR::WChar wcv)
-	      : pd_ec(EC_none),
-		pd_ev(NULL),
-		pd_v1(NULL),
-		pd_v2(NULL),
-		pd_n(NULL)
-{
-  fill_definition_details();
-
-  pd_ev = new AST_ExprValue;
-  pd_ev->et = EV_wchar;
-  pd_ev->u.wcval = wcv;
-}
-
 /*
  * An AST_Expression denoting an octet (unsigned char)
  */
@@ -346,55 +332,35 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_ushort:
       if (ev->u.usval > (unsigned short) SHRT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.sval = (short) ev->u.usval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_long:
       if (ev->u.lval > (long) SHRT_MAX || ev->u.lval < (long) -(SHRT_MAX))
-	      return NULL;
+	return NULL;
       ev->u.sval = (short) ev->u.lval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_ulong:
       if (ev->u.ulval > (unsigned long) SHRT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.sval = (short) ev->u.ulval;
       ev->et = AST_Expression::EV_short;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) SHRT_MAX || ev->u.llval < (ACE_CDR::LongLong) - (SHRT_MAX))
-	      return NULL;
-      ev->u.sval = (short) ev->u.llval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) SHRT_MAX)
-	      return NULL;
-      ev->u.sval = (short) ev->u.ullval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.sval = (short) ev->u.bval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_float:
       if (ev->u.fval > (float) SHRT_MAX || ev->u.fval < (float) -(SHRT_MAX))
-	      return NULL;
+	return NULL;
       ev->u.sval = (short) ev->u.fval;
       ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval > (double) SHRT_MAX || ev->u.dval < (double) -(SHRT_MAX))
-	      return NULL;
+	return NULL;
       ev->u.sval = (short) ev->u.dval;
       ev->et = AST_Expression::EV_short;
       return ev;
@@ -402,17 +368,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.sval = (short) ev->u.cval;
       ev->et = AST_Expression::EV_short;
       return ev;
-    case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) SHRT_MAX)
-        return NULL;
-      ev->u.sval = (short) ev->u.wcval;
-      ev->et = AST_Expression::EV_short;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.sval = (short) ev->u.oval;
       ev->et = AST_Expression::EV_short;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_string:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_any:
@@ -424,7 +387,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     switch (ev->et) {
     case AST_Expression::EV_short:
       if (ev->u.sval < 0)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.sval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
@@ -432,69 +395,46 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_long:
       if (ev->u.lval > (long) USHRT_MAX || ev->u.lval < 0)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.lval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
     case AST_Expression::EV_ulong:
       if (ev->u.ulval > (unsigned long) USHRT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.ulval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) USHRT_MAX || ev->u.llval < 0)
-	      return NULL;
-      ev->u.usval = (unsigned short) ev->u.llval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) USHRT_MAX)
-	      return NULL;
-      ev->u.usval = (unsigned short) ev->u.ullval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.usval = (unsigned short) ev->u.bval;
-      ev->et = AST_Expression::EV_ushort;
+      ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_float:
       if (ev->u.fval < 0.0 || ev->u.fval > (float) USHRT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.fval;
-      ev->et = AST_Expression::EV_ushort;
+      ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval < 0.0 || ev->u.dval > (double) USHRT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.dval;
-      ev->et = AST_Expression::EV_ushort;
+      ev->et = AST_Expression::EV_short;
       return ev;
     case AST_Expression::EV_char:
       if ((signed char) ev->u.cval < 0)
-	      return NULL;
+	return NULL;
       ev->u.usval = (unsigned short) ev->u.cval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
-    case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) USHRT_MAX)
-        return NULL;
-      ev->u.usval = (short) ev->u.wcval;
-      ev->et = AST_Expression::EV_ushort;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.usval = (unsigned short) ev->u.oval;
       ev->et = AST_Expression::EV_ushort;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -516,43 +456,23 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_ulong:
       if (ev->u.ulval > (unsigned long) LONG_MAX)
-	      return NULL;
+	return NULL;
       ev->u.lval = (long) ev->u.ulval;
       ev->et = AST_Expression::EV_long;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) LONG_MAX || ev->u.llval < (ACE_CDR::LongLong) -(LONG_MAX))
-	      return NULL;
-      ev->u.lval = (long) ev->u.llval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) LONG_MAX)
-	      return NULL;
-      ev->u.lval = (long) ev->u.ullval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.lval = (long) ev->u.bval;
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_float:
       if (ev->u.fval > (float) LONG_MAX || ev->u.fval < (float) -(LONG_MAX))
-	      return NULL;
+	return NULL;
       ev->u.lval = (long) ev->u.fval;
       ev->et = AST_Expression::EV_long;
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval > (double) LONG_MAX || ev->u.dval < (double) -(LONG_MAX))
-	      return NULL;
+	return NULL;
       ev->u.lval = (long) ev->u.dval;
       ev->et = AST_Expression::EV_long;
       return ev;
@@ -560,17 +480,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.lval = (long) ev->u.cval;
       ev->et = AST_Expression::EV_long;
       return ev;
-    case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) LONG_MAX)
-        return NULL;
-      ev->u.lval = (long) ev->u.wcval;
-      ev->et = AST_Expression::EV_long;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.lval = (long) ev->u.oval;
       ev->et = AST_Expression::EV_long;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -582,7 +499,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     switch (ev->et) {
     case AST_Expression::EV_short:
       if (ev->u.sval < 0)
-	      return NULL;
+	return NULL;
       ev->u.ulval = (unsigned long) ev->u.sval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
@@ -592,200 +509,42 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_long:
       if (ev->u.lval < 0)
-	      return NULL;
+	return NULL;
       ev->u.ulval = (unsigned long) ev->u.lval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_ulong:
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ULONG_MAX || ev->u.llval < 0)
-	      return NULL;
-      ev->u.ulval = (unsigned long) ev->u.llval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ULONG_MAX)
-	      return NULL;
-      ev->u.ulval = (unsigned long) ev->u.ullval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.ulval = (unsigned long) ev->u.bval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) ULONG_MAX)
-	      return NULL;
+      if (ev->u.fval < 0.0 || ev->u.fval > (float) LONG_MAX)
+	return NULL;
       ev->u.ulval = (unsigned long) ev->u.fval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) ULONG_MAX)
-	      return NULL;
+      if (ev->u.dval < 0.0 || ev->u.dval > (double) LONG_MAX)
+	return NULL;
       ev->u.ulval = (unsigned long) ev->u.dval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
     case AST_Expression::EV_char:
       if ((signed char) ev->u.cval < 0)
-	      return NULL;
+	return NULL;
       ev->u.ulval = (unsigned long) ev->u.cval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
-    case AST_Expression::EV_wchar:
-      ev->u.ulval = (unsigned long) ev->u.wcval;
-      ev->et = AST_Expression::EV_ulong;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.ulval = (unsigned long) ev->u.oval;
       ev->et = AST_Expression::EV_ulong;
       return ev;
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.sval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.usval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_long:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.lval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.ulval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
     case AST_Expression::EV_longlong:
-      return ev;
     case AST_Expression::EV_ulonglong:
-      if (ev->u.ullval > ACE_INT64_MAX)
-	      return NULL;
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.ullval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.bval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) ACE_INT64_MAX
-          || ev->u.fval < (float) ACE_INT64_MIN)
-	      return NULL;
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.fval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) ACE_INT64_MAX
-          || ev->u.dval < (double) ACE_INT64_MIN)
-	      return NULL;
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.dval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_char:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.cval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_wchar:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.wcval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.llval = (ACE_CDR::LongLong) ev->u.oval;
-      ev->et = AST_Expression::EV_longlong;
-      return ev;
     case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-  case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.sval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.usval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.lval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.ulval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_longlong:
-      if (ev->u.llval < 0)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::LongLong) ev->u.llval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_ulonglong:
-      return ev;
-    case AST_Expression::EV_bool:
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.bval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval < 0.0 || ev->u.fval > (float) ACE_UINT64_MAX)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.fval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval < 0.0 || ev->u.dval > (double) ACE_UINT64_MAX)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.dval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-	      return NULL;
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.cval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
     case AST_Expression::EV_wchar:
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.wcval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.ullval = (ACE_CDR::ULongLong) ev->u.oval;
-      ev->et = AST_Expression::EV_ulonglong;
-      return ev;
-    case AST_Expression::EV_longdouble:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -793,9 +552,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     case AST_Expression::EV_none:
       return NULL;
     }
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case AST_Expression::EV_bool:
     switch (ev->et) {
     case AST_Expression::EV_short:
@@ -814,22 +570,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_TRUE;
       ev->et = AST_Expression::EV_bool;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      ev->u.bval = (ev->u.llval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-   case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      ev->u.bval = (ev->u.ullval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       return ev;
     case AST_Expression::EV_float:
@@ -844,15 +584,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE;
       ev->et = AST_Expression::EV_bool;
       return ev;
-    case AST_Expression::EV_wchar:
-      ev->u.bval = (ev->u.wcval == 0) ? I_FALSE : I_TRUE;
-      ev->et = AST_Expression::EV_bool;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE;
       ev->et = AST_Expression::EV_bool;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -878,29 +617,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.fval = (float) ev->u.ulval;
       ev->et = AST_Expression::EV_float;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > FLT_MAX || ev->u.llval < -(FLT_MAX))
-       return NULL;
-      ev->u.fval = (float) ev->u.llval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      // Some compilers don't implement unsigned 64-bit to float conversions,
-      // so we are stuck with the signed 64-bit max value.
-      if (ev->u.ullval > ACE_UINT64_MAX
-          || (ACE_CDR::LongLong) ev->u.ullval > ACE_FLT_MAX)
-       return NULL;
-      ev->u.fval = (float) ((ACE_CDR::LongLong) ev->u.ullval);
-      ev->et = AST_Expression::EV_float;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0);
       ev->et = AST_Expression::EV_float;
@@ -909,7 +625,7 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval > FLT_MAX || ev->u.dval < -FLT_MAX)
-	      return NULL;
+	return NULL;
       ev->u.fval = (float) ev->u.dval;
       ev->et = AST_Expression::EV_float;
       return ev;
@@ -917,15 +633,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.fval = (float) ev->u.cval;
       ev->et = AST_Expression::EV_float;
       return ev;
-    case AST_Expression::EV_wchar:
-      ev->u.fval = (float) ev->u.wcval;
-      ev->et = AST_Expression::EV_float;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.fval = (float) ev->u.oval;
       ev->et = AST_Expression::EV_float;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -951,26 +666,6 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.dval = (double) ev->u.ulval;
       ev->et = AST_Expression::EV_double;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      ev->u.dval = (double) ev->u.llval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      // Some compilers don't implement unsigned 64-bit to double
-      // conversions, so we are stuck with the signed 64-bit max value.
-      if (ev->u.ullval > ACE_INT64_MAX)
-        return NULL;
-      ev->u.dval = (double) ((ACE_CDR::LongLong) ev->u.ullval);
-      ev->et = AST_Expression::EV_double;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0;
       ev->et = AST_Expression::EV_double;
@@ -985,15 +680,14 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
       ev->u.dval = (double) ev->u.cval;
       ev->et = AST_Expression::EV_double;
       return ev;
-    case AST_Expression::EV_wchar:
-      ev->u.dval = (double) ev->u.wcval;
-      ev->et = AST_Expression::EV_double;
-      return ev;
     case AST_Expression::EV_octet:
       ev->u.dval = (double) ev->u.oval;
       ev->et = AST_Expression::EV_double;
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -1005,157 +699,56 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     switch (ev->et) {
     case AST_Expression::EV_short:
       if (ev->u.sval > (short) MAXCHAR || ev->u.sval < (short) -(MAXCHAR))
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.sval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_ushort:
       if (ev->u.usval > (unsigned short) MAXCHAR)
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.usval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_long:
       if (ev->u.lval > (long) MAXCHAR || ev->u.lval < (long) -(MAXCHAR))
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.lval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_ulong:
       if (ev->u.ulval > (unsigned long) MAXCHAR)
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.ulval;
       ev->et = AST_Expression::EV_char;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) MAXCHAR || ev->u.llval < (ACE_CDR::LongLong) -(MAXCHAR))
-	      return NULL;
-      ev->u.cval = (char) ev->u.llval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) MAXCHAR)
-	      return NULL;
-      ev->u.cval = (char) ev->u.ullval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.cval = (char) ev->u.bval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_float:
       if (ev->u.fval > (float) MAXCHAR || ev->u.fval < (float) -(MAXCHAR))
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.fval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval > (double) MAXCHAR || ev->u.dval < (double) -(MAXCHAR))
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.dval;
       ev->et = AST_Expression::EV_char;
       return ev;
     case AST_Expression::EV_char:
       return ev;
-    case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) MAXCHAR)
-        return NULL;
-      ev->u.cval = (char) ev->u.wcval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
     case AST_Expression::EV_octet:
       if (ev->u.oval > (unsigned char) MAXCHAR)
-	      return NULL;
+	return NULL;
       ev->u.cval = (char) ev->u.oval;
       ev->et = AST_Expression::EV_char;
       return ev;
-    case AST_Expression::EV_longdouble:
-    case AST_Expression::EV_wstring:
-    case AST_Expression::EV_string:
-    case AST_Expression::EV_any:
-    case AST_Expression::EV_void:
-    case AST_Expression::EV_none:
-      return NULL;
-    }
-  case AST_Expression::EV_wchar:
-    switch (ev->et) {
-    case AST_Expression::EV_short:
-      if (ev->u.sval < 0)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.sval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_ushort:
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.usval;
-      ev->et = AST_Expression::EV_char;
-      return ev;
-    case AST_Expression::EV_long:
-      if (ev->u.lval < 0)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.lval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_ulong:
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.ulval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
     case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval > (ACE_CDR::LongLong) ULONG_MAX || ev->u.llval < 0)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.llval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) ULONG_MAX)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.ullval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_bool:
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.bval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_float:
-      if (ev->u.fval > (float) ULONG_MAX || ev->u.fval < 0)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.fval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_double:
-      if (ev->u.dval > (double) ULONG_MAX || ev->u.dval < 0)
-	      return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.dval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_char:
-      if ((signed char) ev->u.cval < 0)
-        return NULL;
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.cval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
-    case AST_Expression::EV_wchar:
-      return ev;
-    case AST_Expression::EV_octet:
-      ev->u.wcval = (ACE_CDR::WChar) ev->u.oval;
-      ev->et = AST_Expression::EV_wchar;
-      return ev;
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -1167,79 +760,56 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     switch (ev->et) {
     case AST_Expression::EV_short:
       if (ev->u.sval < 0 || ev->u.sval > (short) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.sval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_ushort:
       if (ev->u.usval > (unsigned short) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.usval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_long:
       if (ev->u.lval < 0 || ev->u.lval > (long) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.lval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_ulong:
       if (ev->u.ulval > (unsigned long) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.ulval;
       ev->et = AST_Expression::EV_octet;
       return ev;
-    case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.llval < 0 || ev->u.llval > (ACE_CDR::LongLong) (MAXCHAR << 1))
-	      return NULL;
-      ev->u.oval = (unsigned char) ev->u.llval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      if (ev->u.ullval > (ACE_CDR::ULongLong) (MAXCHAR << 1))
-	      return NULL;
-      ev->u.oval = (unsigned char) ev->u.ullval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case AST_Expression::EV_bool:
       ev->u.oval = (ev->u.bval == I_FALSE) ? 1 : 0;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_float:
       if (ev->u.fval < 0.0 || ev->u.fval > (float) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.fval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_double:
       if (ev->u.dval < 0.0 || ev->u.dval > (double) (MAXCHAR << 1))
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.dval;
       ev->et = AST_Expression::EV_octet;
       return ev;
     case AST_Expression::EV_char:
       if ((signed char) ev->u.cval < 0)
-	      return NULL;
+	return NULL;
       ev->u.oval = (unsigned char) ev->u.cval;
       ev->et = AST_Expression::EV_octet;
       return ev;
-    case AST_Expression::EV_wchar:
-      if (ev->u.wcval > (ACE_CDR::WChar) (MAXCHAR << 1))
-        return NULL;
-      ev->u.oval = (unsigned char) ev->u.wcval;
-      ev->et = AST_Expression::EV_octet;
-      return ev;
     case AST_Expression::EV_octet:
       return ev;
+    case AST_Expression::EV_longlong:
+    case AST_Expression::EV_ulonglong:
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_string:
     case AST_Expression::EV_any:
@@ -1270,7 +840,10 @@ coerce_value(AST_Expression::AST_ExprValue *ev, AST_Expression::ExprType t)
     default:
       return NULL;
     }
+  case AST_Expression::EV_longlong:
+  case AST_Expression::EV_ulonglong:
   case AST_Expression::EV_longdouble:
+  case AST_Expression::EV_wchar:
   case AST_Expression::EV_wstring:
     return NULL;
   }
@@ -1542,7 +1115,10 @@ AST_Expression::coerce(AST_Expression::ExprType t)
 
   copy->et = pd_ev->et;
   switch (pd_ev->et) {
+  case EV_longlong:
+  case EV_ulonglong:
   case EV_longdouble:
+  case EV_wchar:
   case EV_wstring:
   case EV_void:
   case EV_none:
@@ -1560,20 +1136,6 @@ AST_Expression::coerce(AST_Expression::ExprType t)
   case EV_ulong:
     copy->u.ulval = pd_ev->u.ulval;
     break;
-  case EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    copy->u.llval = pd_ev->u.llval;
-    break;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-  case EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    copy->u.ullval = pd_ev->u.ullval;
-    break;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return NULL;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case EV_bool:
     copy->u.bval = pd_ev->u.bval;
     break;
@@ -1586,9 +1148,6 @@ AST_Expression::coerce(AST_Expression::ExprType t)
   case EV_char:
     copy->u.cval = pd_ev->u.cval;
     break;
-  case EV_wchar:
-    copy->u.wcval = pd_ev->u.wcval;
-    break;
   case EV_octet:
     copy->u.oval = pd_ev->u.oval;
     break;
@@ -1705,37 +1264,24 @@ AST_Expression::operator==(AST_Expression *vc)
     return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
   case EV_char:
     return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_wchar:
-    return (pd_ev->u.wcval == vc->ev()->u.wcval) ? I_TRUE : I_FALSE;
   case EV_octet:
     return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
   case EV_bool:
     return (pd_ev->u.lval == vc->ev()->u.lval) ? I_TRUE : I_FALSE;
   case EV_string:
-    if (pd_ev->u.strval == NULL) 
-      {
-        if (vc->ev()->u.strval == NULL)
-	        return I_TRUE;
-        else
-	        return I_FALSE;
-      } 
-    else if (vc->ev()->u.strval == NULL)
+    if (pd_ev->u.strval == NULL) {
+      if (vc->ev()->u.strval == NULL)
+	return I_TRUE;
+      else
+	return I_FALSE;
+    } else if (vc->ev()->u.strval == NULL)
       return I_FALSE;
     else
       return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
   case EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    return (pd_ev->u.llval == vc->ev()->u.llval) ? I_TRUE : I_FALSE;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return I_FALSE;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    return (pd_ev->u.ullval == vc->ev()->u.ullval) ? I_TRUE : I_FALSE;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return I_FALSE;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case EV_longdouble:
+  case EV_wchar:
   case EV_wstring:
   case EV_any:
   case EV_void:
@@ -1771,8 +1317,6 @@ AST_Expression::compare(AST_Expression *vc)
     return (pd_ev->u.dval == vc->ev()->u.dval) ? I_TRUE : I_FALSE;
   case EV_char:
     return (pd_ev->u.cval == vc->ev()->u.cval) ? I_TRUE : I_FALSE;
-  case EV_wchar:
-    return (pd_ev->u.wcval == vc->ev()->u.wcval) ? I_TRUE : I_FALSE;
   case EV_octet:
     return (pd_ev->u.oval == vc->ev()->u.oval) ? I_TRUE : I_FALSE;
   case EV_bool:
@@ -1788,18 +1332,9 @@ AST_Expression::compare(AST_Expression *vc)
     else
       return (pd_ev->u.strval == vc->ev()->u.strval) ? I_TRUE : I_FALSE;
   case EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    return (pd_ev->u.llval == vc->ev()->u.llval) ? I_TRUE : I_FALSE;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return I_FALSE;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-    return (pd_ev->u.ullval == vc->ev()->u.ullval) ? I_TRUE : I_FALSE;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-    return I_FALSE;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
   case EV_longdouble:
+  case EV_wchar:
   case EV_wstring:
   case EV_any:
   case EV_void:
@@ -1866,9 +1401,6 @@ dump_expr_val(ostream &o, AST_Expression::AST_ExprValue *ev)
   case AST_Expression::EV_char:
     o << ev->u.cval;
     break;
-  case AST_Expression::EV_wchar:
-    o << ev->u.wcval;
-    break;
   case AST_Expression::EV_octet:
     o << ev->u.oval;
     break;
@@ -1879,16 +1411,9 @@ dump_expr_val(ostream &o, AST_Expression::AST_ExprValue *ev)
     if (ev->u.strval != NULL)
       ev->u.strval->dump(o);
   case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-//    o << ev->u.llval;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    break;
   case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-//    o << ev->u.ullval;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-    break;
   case AST_Expression::EV_longdouble:
+  case AST_Expression::EV_wchar:
   case AST_Expression::EV_wstring:
   case AST_Expression::EV_any:
   case AST_Expression::EV_none:
@@ -1968,7 +1493,7 @@ AST_Expression::dump(ostream &o)
   case EC_none:
     break;
   default:
-    o << GTDEVEL("unsupported dump mode for expression with ec == ")
+    o << GTDEVEL("unsupported dump mode for expression with ec == ") 
       << (int) pd_ec ;
     break;
   }
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index 05cc77d5def..1715d29680f 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -78,8 +78,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * nodes and AST_UnionBranch nodes.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(ast, ast_field, "$Id$")
 
@@ -91,17 +91,16 @@ ACE_RCSID(ast, ast_field, "$Id$")
  * Default constructor
  */
 AST_Field::AST_Field()
-         : pd_field_type(NULL), pd_visibility (vis_NA)
+	 : pd_field_type(NULL)
 {
 }
 
 /*
  * To be used when constructing an AST_Field node
  */
-AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
-                                            Visibility vis)
-         : AST_Decl(AST_Decl::NT_field, n, p),
-           pd_field_type(ft), pd_visibility (vis)
+AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
+	 : AST_Decl(AST_Decl::NT_field, n, p),
+	   pd_field_type(ft)
 {
 }
 
@@ -109,9 +108,9 @@ AST_Field::AST_Field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
  * To be used when constructing a node of a subclass of AST_Field
  */
 AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
-                   UTL_ScopedName *n, UTL_StrList *p, Visibility vis)
-         : AST_Decl(nt, n, p),
-           pd_field_type(ft), pd_visibility (vis)
+		   UTL_ScopedName *n, UTL_StrList *p)
+	 : AST_Decl(nt, n, p),
+	   pd_field_type(ft)
 {
 }
 
@@ -134,15 +133,6 @@ AST_Field::AST_Field(AST_Decl::NodeType nt, AST_Type *ft,
 void
 AST_Field::dump(ostream &o)
 {
-  switch (visibility())
-    {
-      case vis_PRIVATE:
-        o << "private ";
-        break;
-      case vis_PUBLIC:
-        o << "public ";
-        break;
-    }
   pd_field_type->local_name()->dump(o);
   o << " ";
   local_name()->dump(o);
@@ -158,12 +148,6 @@ AST_Field::field_type()
   return pd_field_type;
 }
 
-AST_Field::Visibility
-AST_Field::visibility()
-{
-  return pd_visibility;
-}
-
 /*
  * Narrowing methods
  */
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index 0ff6f2f592e..b95c5151e00 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -142,45 +142,10 @@ AST_Generator::create_interface(UTL_ScopedName *n,
 AST_InterfaceFwd *
 AST_Generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
 {
-  return new AST_InterfaceFwd (this->create_interface (n, 0, -1, p), n, p);
+  return new AST_InterfaceFwd(n, p);
 }
 
 /*
- * Create a be_valuetype node
- */
-AST_Interface *
-AST_Generator::create_valuetype(UTL_ScopedName *n,
-                               AST_Interface **ih,
-                               long nih,
-                               UTL_StrList *p)
-{
-  // Valuetypes are represented as be_valuetype derived from be_interface,
-  // which derives from AST_Interface. If you construct a backend which
-  // utilizes only the AST_... classes, you must instantiate an object that
-  // returns true from AST_Interface::is_valuetype().
-  // (currently not implemented)
-  // Also invoke
-  // (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
-
-  ACE_ASSERT (0);
-  return 0;
-}
-
-/*
- * Create a be_valuetype_fwd node
- */
-AST_InterfaceFwd *
-AST_Generator::create_valuetype_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-  // see note in create_valuetype()
-  // dummy placeholder must return true from is_valuetype()
-
-  ACE_ASSERT (0);
-  return 0;
-}
-
-
-/*
  * Construct an AST_Exception node (an exception)
  */
 AST_Exception   *
@@ -223,10 +188,9 @@ AST_Generator::create_operation(AST_Type *rt,
  * Construct an AST_Field node (a field in a struct, union or exception)
  */
 AST_Field       *
-AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
-                                                  AST_Field::Visibility vis)
+AST_Generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
 {
-  return new AST_Field(ft, n, p, vis);
+  return new AST_Field(ft, n, p);
 }
 
 /*
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index c8e1dc69352..66268ee9796 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -75,8 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * interfaces.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(ast, ast_interface, "$Id$")
 
@@ -90,9 +90,9 @@ AST_Interface::AST_Interface()
 }
 
 AST_Interface::AST_Interface(UTL_ScopedName *n,
-                             AST_Interface **ih,
-                             long nih,
-                             UTL_StrList *p)
+			     AST_Interface **ih,
+			     long nih,
+			     UTL_StrList *p)
   : AST_Decl(AST_Decl::NT_interface, n, p),
     UTL_Scope(AST_Decl::NT_interface),
     pd_inherits(ih),
@@ -108,27 +108,6 @@ AST_Interface::AST_Interface(UTL_ScopedName *n,
  * Public operations
  */
 
-idl_bool AST_Interface::is_abstract_interface ()
-{
-  return 0;
-}
-
-
-idl_bool AST_Interface::is_valuetype ()
-{
-  return 0;
-}
-
-
-idl_bool AST_Interface::is_abstract_valuetype ()
-{
-  return 0;
-}
-
-void AST_Interface::set_abstract_valuetype ()
-{
-  ACE_ASSERT (0);
-}
 
 /*
  * Redefinition of inherited virtual operations
@@ -263,50 +242,6 @@ AST_Attribute *AST_Interface::fe_add_attribute(AST_Attribute *t)
   return t;
 }
 
-
-/*
- * Add this AST_Field node (a field declaration) to this scope
- * (only for valuetypes)
- */
-AST_Field *AST_Interface::fe_add_field(AST_Field *t)
-{
-#ifdef IDL_HAS_VALUETYPE
-  AST_Decl *d;
-  /*
-   * Already defined and cannot be redefined? Or already used?
-   */
-  if ((d = lookup_for_add(t, I_FALSE)) != NULL) {
-    if (!can_be_redefined(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, d);
-      return NULL;
-    }
-    if (referenced(d)) {
-      idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, d);
-      return NULL;
-    }
-    if (t->has_ancestor(d)) {
-      idl_global->err()->redefinition_in_scope(t, d);
-      return NULL;
-    }
-  }
-  /*
-   * Add it to scope
-   */
-  add_to_scope(t);
-  /*
-   * Add it to set of locally referenced symbols
-   */
-  add_to_referenced(t, I_FALSE);
-
-  return t;
-
-#else /* IDL_HAS_VALUETYPE */
-  ACE_ASSERT (0);
-  return 0;
-#endif /* IDL_HAS_VALUETYPE */
-}
-
-
 /*
  * Add an AST_Operation node (an operation declaration) to this scope
  */
@@ -617,20 +552,9 @@ AST_Native *AST_Interface::fe_add_native (AST_Native *t)
 void
 AST_Interface::dump(ostream &o)
 {
-  long  i;
+  long	i;
 
-  if (this->is_valuetype ())
-    {
-      if (this->is_abstract_valuetype ())
-        o << "abstract ";
-      o << "valuetype ";
-    }
-  else
-    {
-      if (this->is_abstract_interface ())
-        o << "abstract ";
-      o << "interface ";
-    }
+  o << "interface ";
   local_name()->dump(o);
   o << " ";
   if (pd_n_inherits > 0) {
@@ -638,7 +562,7 @@ AST_Interface::dump(ostream &o)
     for (i = 0; i < pd_n_inherits; i++) {
       pd_inherits[i]->local_name()->dump(o);
       if (i < pd_n_inherits - 1)
-        o << ", ";
+	o << ", ";
     }
   }
   o << " {\n";
@@ -647,93 +571,11 @@ AST_Interface::dump(ostream &o)
   o << "}";
 }
 
-void
-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 (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;
-        }
-      }
-    }
-  }
-}
-
-
 /*
  * Data accessors
  */
 
-void
-AST_Interface::redefine (AST_Interface *from, UTL_StrList *p)
-{
-  this->set_inherits(from->inherits());
-  this->set_n_inherits(from->n_inherits());
-  /*
-   * Update place of definition
-   */
-  this->set_imported(idl_global->imported());
-  this->set_in_main_file(idl_global->in_main_file());
-  this->set_line(idl_global->lineno());
-  this->set_file_name(idl_global->filename());
-  this->add_pragmas(p);
-}
-
-AST_Interface   **
+AST_Interface	**
 AST_Interface::inherits()
 {
   return pd_inherits;
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 08cd2959c2a..48d1bd4fe88 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -73,8 +73,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * encountered.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(ast, ast_interface_fwd, "$Id$")
 
@@ -82,21 +82,19 @@ ACE_RCSID(ast, ast_interface_fwd, "$Id$")
  * Constructor(s) and destructor
  */
 AST_InterfaceFwd::AST_InterfaceFwd()
-                : pd_full_definition(NULL)
+		: pd_full_definition(NULL)
 {
 }
 
-AST_InterfaceFwd::AST_InterfaceFwd( AST_Interface *dummy,
-                                    UTL_ScopedName *n, UTL_StrList *p)
-                 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
+AST_InterfaceFwd::AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p)
+		 : AST_Decl(AST_Decl::NT_interface_fwd, n, p)
 {
   /*
    * Create a dummy placeholder for the forward declared interface. This
    * interface node is not yet defined (n_inherits < 0), so some operations
    * will fail
    */
-  pd_full_definition = dummy;
-  // pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
+  pd_full_definition = idl_global->gen()->create_interface(n, NULL, -1, p);
   /*
    * Record the node in a list to be checked after the entire AST has been
    * parsed. All nodes in the list must have n_inherits >= 0, else this
@@ -110,31 +108,6 @@ AST_InterfaceFwd::AST_InterfaceFwd( AST_Interface *dummy,
  * Private operations
  */
 
-idl_bool AST_InterfaceFwd::is_abstract_interface ()
-{
-  return this->full_definition()->is_abstract_interface();
-}
-
-
-idl_bool AST_InterfaceFwd::is_valuetype ()
-{
-  return this->full_definition()->is_valuetype();
-}
-
-
-idl_bool AST_InterfaceFwd::is_abstract_valuetype ()
-{
-  return this->full_definition()->is_abstract_valuetype();
-}
-
-void AST_InterfaceFwd::set_abstract_valuetype ()
-{
-  // Don't forget about dummy placeholder ! (see constructor)
-  // (only if the be class isn't used)
-  ACE_ASSERT (0);
-}
-
-
 /*
  * Public operations
  */
@@ -149,18 +122,7 @@ void AST_InterfaceFwd::set_abstract_valuetype ()
 void
 AST_InterfaceFwd::dump(ostream &o)
 {
-  if (this->is_valuetype ())
-    {
-      if (this->is_abstract_valuetype ())
-        o << "abstract ";
-      o << "valuetype ";
-    }
-  else
-    {
-      if (this->is_abstract_interface ())
-        o << "abstract ";
-      o << "interface ";
-    }
+  o << "interface ";
   local_name()->dump(o);
 }
 
@@ -168,7 +130,7 @@ AST_InterfaceFwd::dump(ostream &o)
  * Data accessors
  */
 
-AST_Interface   *
+AST_Interface	*
 AST_InterfaceFwd::full_definition()
 {
   return pd_full_definition;
@@ -178,10 +140,10 @@ void
 AST_InterfaceFwd::set_full_definition(AST_Interface *nfd)
 {
   pd_full_definition = nfd;
-}
+}    
 
 /*
- * Narrowing methods
+ * Narrowing methods 
  */
 IMPL_NARROW_METHODS1 (AST_InterfaceFwd, AST_Type)
 IMPL_NARROW_FROM_DECL (AST_InterfaceFwd)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 3002f691e7a..8bab07f277e 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -72,8 +72,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * of UTL_Scope.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(ast, ast_module, "$Id$")
 
@@ -85,9 +85,8 @@ AST_Module::AST_Module()
 }
 
 AST_Module::AST_Module(UTL_ScopedName *n, UTL_StrList *p)
-         : AST_Decl(AST_Decl::NT_module, n, p),
-           UTL_Scope(AST_Decl::NT_module),
-           pd_has_nested_valuetype (0)
+	 : AST_Decl(AST_Decl::NT_module, n, p),
+	   UTL_Scope(AST_Decl::NT_module)
 {
 }
 
@@ -188,8 +187,8 @@ AST_Module *AST_Module::fe_add_module(AST_Module *t)
  */
 AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
 {
-  AST_Decl              *predef;
-  AST_Interface         *fwd;
+  AST_Decl		*predef;
+  AST_Interface		*fwd;
 
   /*
    * Already defined?
@@ -204,11 +203,11 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
       if (fwd == NULL)
           return NULL;
 
-      if (!fwd->is_defined()) { /* Forward declared and not defined yet */
-        if (fwd->defined_in() != this) {
-          idl_global->err()
-             ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
-          return NULL;
+      if (!fwd->is_defined()) {	/* Forward declared and not defined yet */
+	if (fwd->defined_in() != this) {
+	  idl_global->err()
+	     ->error3(UTL_Error::EIDL_SCOPE_CONFLICT, fwd, t, this);
+	  return NULL;
         }
       }
       /*
@@ -217,7 +216,7 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
        */
       else if (referenced(predef)) {
         idl_global->err()->error3(UTL_Error::EIDL_DEF_USE, t, this, predef);
-        return NULL;
+	return NULL;
       }
     } else if (!can_be_redefined(predef)) {
       idl_global->err()->error3(UTL_Error::EIDL_REDEF, t, this, predef);
@@ -248,21 +247,20 @@ AST_Interface *AST_Module::fe_add_interface(AST_Interface *t)
  */
 AST_InterfaceFwd *AST_Module::fe_add_interface_fwd(AST_InterfaceFwd *i)
 {
-  AST_Decl      *d;
-  AST_Interface *itf;
+  AST_Decl	*d;
+  AST_Interface	*itf;
 
   /*
    * Already defined and cannot be redefined? Or already used?
    */
   if ((d = lookup_for_add(i, I_FALSE)) != NULL) {
     if (d->node_type() == AST_Decl::NT_interface &&
-        d->defined_in() == this) {
+	d->defined_in() == this) {
       itf = AST_Interface::narrow_from_decl(d);
       if (itf == NULL)
           return NULL;
 
-      // %! redefinition of forward; type check not implemented
-      i->set_full_definition(itf);   //%! memory leak
+      i->set_full_definition(itf);
       return i;
     }
     if (!can_be_redefined(d)) {
@@ -595,29 +593,6 @@ AST_Module::dump(ostream &o)
   o << "}";
 }
 
-
-// involved in OBV_ namespace generation
-void
-AST_Module::set_has_nested_valuetype ()
-{
-#ifdef IDL_HAS_VALUETYPE
-  UTL_Scope *parent;
-  if (!pd_has_nested_valuetype && (parent = this->defined_in()))
-    {
-      AST_Module *pm = AST_Module::narrow_from_scope (parent);
-      if (pm)
-        pm->set_has_nested_valuetype ();
-    }
-  pd_has_nested_valuetype = 1;
-#endif /* IDL_HAS_VALUETYPE */
-}
-
-idl_bool
-AST_Module::has_nested_valuetype ()
-{
-  return pd_has_nested_valuetype;
-}
-
 /*
  * Narrowing methods
  */
diff --git a/TAO/TAO_IDL/be/Makefile.am b/TAO/TAO_IDL/be/Makefile.am
deleted file mode 100644
index 67b85a70c01..00000000000
--- a/TAO/TAO_IDL/be/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'be' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include \
-           -I$(top_srcdir)/TAO_IDL/be_include
-
-noinst_LIBRARIES = libbe.a
-
-libbe_a_SOURCES = \
-         be_args.cpp  \
-         be_argument.cpp  \
-         be_array.cpp  \
-         be_attribute.cpp  \
-         be_codegen.cpp  \
-         be_constant.cpp  \
-         be_decl.cpp  \
-         be_enum.cpp  \
-         be_enum_val.cpp  \
-         be_exception.cpp  \
-         be_expression.cpp  \
-         be_field.cpp  \
-         be_generator.cpp  \
-         be_helper.cpp  \
-         be_init.cpp  \
-         be_interface.cpp  \
-         be_interface_fwd.cpp  \
-         be_module.cpp  \
-         be_native.cpp  \
-         be_operation.cpp  \
-         be_predefined_type.cpp  \
-         be_produce.cpp  \
-         be_root.cpp  \
-         be_scope.cpp  \
-         be_sequence.cpp  \
-         be_stream_factory.cpp  \
-         be_string.cpp  \
-         be_structure.cpp  \
-         be_sunsoft.cpp  \
-         be_type.cpp  \
-         be_typedef.cpp  \
-         be_union.cpp  \
-         be_union_branch.cpp  \
-         be_union_label.cpp  \
-         be_visitor.cpp  \
-         be_visitor_argument.cpp  \
-         be_visitor_array.cpp  \
-         be_visitor_attribute.cpp  \
-         be_visitor_constant.cpp  \
-         be_visitor_context.cpp  \
-         be_visitor_decl.cpp  \
-         be_visitor_enum.cpp  \
-         be_visitor_exception.cpp  \
-         be_visitor_factory.cpp  \
-         be_visitor_field.cpp  \
-         be_visitor_interface.cpp  \
-         be_visitor_interface_fwd.cpp  \
-         be_visitor_module.cpp  \
-         be_visitor_operation.cpp  \
-         be_visitor_root.cpp  \
-         be_visitor_scope.cpp  \
-         be_visitor_sequence.cpp  \
-         be_visitor_structure.cpp  \
-         be_visitor_typecode.cpp  \
-         be_visitor_typedef.cpp  \
-         be_visitor_union.cpp  \
-         be_visitor_union_branch.cpp
-
-dist-hook:
-	list=`find * -name CVS -prune -o -type d -print`; for p in $$list; do \
-          $(mkinstalldirs) $(distdir)/$$p; \
-          cp $$p/*.cpp $(distdir)/$$p; \
-        done
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/be/be_args.cpp b/TAO/TAO_IDL/be/be_args.cpp
index a0df642dbe2..ae99845193c 100644
--- a/TAO/TAO_IDL/be/be_args.cpp
+++ b/TAO/TAO_IDL/be/be_args.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -66,9 +66,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // be_args.cc - Collect command line arguments for the BE
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 ACE_RCSID(be, be_args, "$Id$")
 
@@ -82,9 +82,6 @@ BE_prep_arg(char *s, idl_bool)
 {
   const char arg_macro[]="export_macro=";
   const char arg_include[]="export_include=";
-#ifdef IDL_HAS_VALUETYPE
-  const char obv_opt_accessor[]="obv_opt_accessor";
-#endif /* IDL_HAS_VALUETYPE */
 
   char* last = 0;
   for (char* arg = ACE_OS::strtok_r (s, ",", &last);
@@ -92,27 +89,21 @@ BE_prep_arg(char *s, idl_bool)
        arg = ACE_OS::strtok_r (0, ",", &last))
     {
       if (ACE_OS::strstr (arg, arg_macro) == arg)
-        {
-          char* val = arg + sizeof (arg_macro) - 1;
-          idl_global->export_macro (val);
-        }
+	{
+	  char* val = arg + sizeof (arg_macro) - 1;
+	  idl_global->export_macro (val);
+	}
       else if (ACE_OS::strstr (arg, arg_include) == arg)
-        {
-          char* val = arg + sizeof (arg_include) - 1;
-          idl_global->export_include (val);
-        }
-#  ifdef IDL_HAS_VALUETYPE
-      else if (ACE_OS::strstr (arg, obv_opt_accessor) == arg)
-        {
-          idl_global->obv_opt_accessor (1);
-        }
-#  endif /* IDL_HAS_VALUETYPE */
+	{
+	  char* val = arg + sizeof (arg_include) - 1;
+	  idl_global->export_include (val);
+	}
       else
-        {
-          cerr << idl_global->prog_name ()
-               << ": invalid or unknown argument <"
-               << arg
-               << "> to back end\n";
-        }
+	{
+	  cerr << idl_global->prog_name ()
+	       << ": invalid or unknown argument <"
+	       << arg
+	       << "> to back end\n";
+	}
     }
 }
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index dac2ad3fc56..34c77c9e340 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -218,6 +218,117 @@ be_array::gen_dimensions (TAO_OutStream *os, unsigned short slice)
   return 0;
 }
 
+int
+be_array::gen_typecode (void)
+{
+  TAO_OutStream *os; // output stream
+
+  os = tao_cg->client_stubs ();
+  os->indent (); // start from whatever indentation level we were at
+
+  *os << "CORBA::tk_array, // typecode kind" << be_nl;
+  *os << this->tc_encap_len () << ", // encapsulation length" << be_idt << "\n";
+  // now emit the encapsulation
+  if (this->gen_encapsulation () == -1)
+    {
+    }
+  //  *os << (this->dims () [0]) << "," << be_nl;
+  return 0;
+}
+
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+
+int
+be_array::gen_encapsulation (void)
+{
+  TAO_OutStream *os; // output stream
+  be_type *bt; // base type
+  unsigned long i;
+
+  os = tao_cg->client_stubs ();
+  os->indent (); // start from the current indentation level
+
+  // retrieve the base type
+  bt = be_type::narrow_from_decl (this->base_type ());
+  if (!bt)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_array::gen_encapsulation - "
+                         "bad base type\n"),
+                        -1);
+    }
+
+  for (i=0; i < (this->n_dims () - 1); i++)
+    {
+      unsigned long rem_encap_len;
+
+      *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
+      *os << "CORBA::tk_array, // typecode kind" << be_nl;
+      rem_encap_len
+        = (this->n_dims () - (i+1))*(4+4)
+        + (this->n_dims () - (i+2))*(4+4)
+        + bt->tc_size ();
+      *os << rem_encap_len << ", // encapsulation length" << be_idt_nl;
+    }
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
+  if (bt->gen_typecode () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_array::gen_encapsulation - "
+                         "base type tyepcode gen failed\n"),
+                        -1);
+    }
+  os->indent ();
+  for (i = (this->n_dims ()-1); i > 0; i--)
+    {
+      *os << this->dims ()[i] << "," << be_uidt_nl;
+    }
+  *os << this->dims ()[0] << be_uidt << ",\n";
+  return 0;
+}
+
+// compute typecode size
+long
+be_array::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+long
+be_array::tc_encap_len (void)
+{
+  // Suppose "N" is the number of dimensions, then for a N dimensional array,
+  // we will have N encapsulations. The innermost encapsulation will hold the
+  // typecode of the real base type.
+  // Thus, we will have N byte order flags and dimensions, and N-1 tk_array
+  // enumerations, encapsulation lengths, and dimensions.
+
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      be_type *bt; // base type
+
+      bt = be_type::narrow_from_decl (this->base_type ());
+      if (!bt)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "be_array::tc_encap_len - bad base type\n"));
+          return 0;
+        }
+      this->encap_len_ =
+        this->n_dims () * (4+4) // N byte order flags and dims
+        + (this->n_dims ()-1)* (4+4); // N-1 of Enum and encap lengths
+      // to this you add the typecode size of the underlying type
+      this->encap_len_ += bt->tc_size ();
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_array::compute_size_type (void)
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 1683b4f777b..0403cdf56f9 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -178,12 +178,6 @@ TAO_CodeGen::start_client_header (const char *fname)
       else
         *this->client_header_ << ">\n";
 
-      // Some compilers don't optimize the #ifndef header include
-      // protection, but do optimize based on #pragma once.
-      *this->client_header_ << "\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-                            << "# pragma once\n"
-                            << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
-
       // Other include files
 
       if (idl_global->export_include () != 0)
@@ -287,7 +281,6 @@ TAO_CodeGen::start_client_stubs (const char *fname)
   *this->client_stubs_ << "#include \"" <<
     idl_global->be_get_client_inline_fname (1) << "\"\n";
   *this->client_stubs_ << "#endif /* !defined INLINE */\n\n";
-
   return 0;
 }
 
@@ -400,12 +393,6 @@ TAO_CodeGen::start_server_header (const char *fname)
       *this->server_header_ << "#include \"" <<
         idl_global->be_get_client_hdr_fname (1) << "\"\n\n";
 
-      // Some compilers don't optimize the #ifndef header include
-      // protection, but do optimize based on #pragma once.
-      *this->server_header_ << "\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-                            << "# pragma once\n"
-                            << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
-
       *this->server_header_ << "#if defined(_MSC_VER)\n"
                             << "#pragma warning(disable:4250)\n"
                             << "#endif /* _MSC_VER */\n\n";
@@ -513,7 +500,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
   *this->server_skeletons_ << "#include \"" <<
     idl_global->be_get_server_inline_fname (1) << "\"\n";
   *this->server_skeletons_ << "#endif /* !defined INLINE */\n\n";
-
   return 0;
 }
 
@@ -589,8 +575,8 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname)
       *this->server_template_skeletons_ << "#include \"" <<
         idl_global->be_get_server_template_inline_fname (1) << "\"\n";
       *this->server_template_skeletons_ << "#endif /* !defined INLINE */\n\n";
-
       return 0;
+
     }
 }
 
@@ -725,10 +711,9 @@ TAO_CodeGen::start_implementation_header (const char *fname)
                                            implementation_hdr);
             }
 
-      *this->implementation_header_
-        << "#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-        << "#pragma once\n"
-        << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
+      *this->implementation_header_ << "#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
+                            << "#pragma once\n"
+                            << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n\n";
 
       const char* server_hdr =
         IDL_GlobalData::be_get_server_hdr_fname (1);
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
index 6b234a304c2..9a184a592b0 100644
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ b/TAO/TAO_IDL/be/be_constant.cpp
@@ -75,12 +75,9 @@ be_constant::exprtype_to_string (void)
     case AST_Expression::EV_none:
       return "none";
     case AST_Expression::EV_longlong:
-      return "CORBA::LongLong";
     case AST_Expression::EV_ulonglong:
-      return "CORBA::ULongLong";
-    case AST_Expression::EV_wchar:
-      return "CORBA::WChar";
     case AST_Expression::EV_longdouble:
+    case AST_Expression::EV_wchar:
     case AST_Expression::EV_wstring:
       return NULL;
     }
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index cf488f0f387..b11ee3133ff 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -44,7 +44,8 @@ be_decl::be_decl (void)
     flatname_ (0),
     repoID_ (0),
     prefix_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN)
+    size_type_ (be_decl::SIZE_UNKNOWN),
+    encap_len_ (-1)
 {
 }
 
@@ -69,7 +70,8 @@ be_decl::be_decl (AST_Decl::NodeType type,
     flatname_ (0),
     repoID_ (0),
     prefix_ (0),
-    size_type_ (be_decl::SIZE_UNKNOWN)
+    size_type_ (be_decl::SIZE_UNKNOWN),
+    encap_len_ (-1)
 {
 }
 
@@ -78,6 +80,19 @@ be_decl::~be_decl (void)
 {
 }
 
+int
+be_decl::gen_encapsulation (void)
+{
+  // do nothing
+  return 0;
+}
+
+long
+be_decl::tc_encap_len (void)
+{
+  return -1;
+}
+
 // return our size type
 be_decl::SIZE_TYPE
 be_decl::size_type (void)
@@ -402,6 +417,29 @@ be_decl::prefix (void)
   return this->prefix_;
 }
 
+// converts a string name into an array of 4 byte longs
+int
+be_decl::tc_name2long (const char *name, ACE_UINT32 *&larr, long &arrlen)
+{
+  const int bytes_per_word = sizeof(ACE_UINT32);
+  static ACE_UINT32 buf [NAMEBUFSIZE];
+  long slen;
+  long i;
+
+  slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
+
+  // compute the number of bytes necessary to hold the name rounded to
+  // the next multiple of 4 (i.e., size of long)
+  arrlen = slen / bytes_per_word + (slen % bytes_per_word ? 1:0);
+
+  ACE_OS::memset (buf, 0, sizeof(buf));
+  larr = buf;
+  ACE_OS::memcpy (buf, name, slen);
+  for (i = 0; i < arrlen; i++)
+    larr [i] = ACE_HTONL (larr [i]);
+  return 0;
+}
+
 idl_bool
 be_decl::is_nested (void)
 {
@@ -416,6 +454,35 @@ be_decl::is_nested (void)
   return I_FALSE;
 }
 
+// return the length in bytes to hold the repoID inside a typecode. This
+// comprises 4 bytes indicating the length of the string followed by the actual
+// string represented as longs.
+long
+be_decl::repoID_encap_len (void)
+{
+  long slen;
+
+  slen = ACE_OS::strlen (this->repoID ()) + 1; // + 1 for NULL terminating char
+  // the number of bytes to hold the string must be a multiple of 4 since this
+  // will be represented as an array of longs
+  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+}
+
+// return the length in bytes to hold the name inside a typecode. This
+// comprises 4 bytes indicating the length of the string followed by the actual
+// string represented as longs.
+long
+be_decl::name_encap_len (void)
+{
+  long slen;
+
+  slen = ACE_OS::strlen (this->local_name ()->get_string ()) + 1;
+
+  // the number of bytes to hold the string must be a multiple of 4 since this
+  // will be represented as an array of longs
+  return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
+}
+
 // compute the size type of the node in question
 int
 be_decl::compute_size_type (void)
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 335301785f5..e80f8704cf0 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -82,6 +82,101 @@ be_enum::member_count (void)
   return this->member_count_;
 }
 
+
+// generate typecode.
+// Typecode for enum comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_enum::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_enum, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  return this->gen_encapsulation ();
+}
+
+int
+be_enum::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+
+  ACE_UINT32 *arr;
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << nl;
+  // generate the member count
+  *cs << this->member_count () << ", // member count\n";
+  cs->incr_indent (0);
+  // hand over to the scope to generate the typecode for elements
+  if (be_scope::gen_encapsulation () == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate code for members\n"));
+      return -1;
+    }
+  cs->decr_indent (0);
+  return 0;
+}
+
+// compute typecode size
+long
+be_enum::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+// return encapsulation length
+long
+be_enum::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // repoID storage
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+      this->encap_len_ += 4; // to hold the member count
+
+      // compute encap length for members
+      this->encap_len_ += be_scope::tc_encap_len ();
+    }
+  return this->encap_len_;
+}
+
 int
 be_enum::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 3fcd99fdd6f..3a52a779278 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -40,6 +40,39 @@ be_enum_val::be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p)
 }
 
 int
+be_enum_val::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << "\n";
+  return 0;
+}
+
+long
+be_enum_val::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      this->encap_len_ = this->name_encap_len (); // for name
+    }
+
+  return this->encap_len_;
+}
+
+int
 be_enum_val::accept (be_visitor *visitor)
 {
   return visitor->visit_enum_val (this);
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index d39abd6b4e4..9c788ce25b6 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -78,62 +78,111 @@ be_exception::member_count (void)
   return this->member_count_;
 }
 
-// Are we or the parameter node involved in any recursion
-idl_bool
-be_exception::in_recursion (be_type *node)
+// generate typecode.
+// Typecode for exceptions comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_exception::gen_typecode (void)
 {
-  if (!node)
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_except, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  cs->incr_indent (0);
+  if (this->gen_encapsulation () == -1)
     {
-      // we are determining the recursive status for ourselves
-      node = this;
+      return -1;
     }
+  cs->decr_indent ();
+  return 0;
+}
 
-  // proceed if the number of members in our scope is greater than 0
-  if (this->nmembers () > 0)
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+int
+be_exception::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+  
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // XXXASG - byte order must be based on what m/c we are generating code -
+  // TODO
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
     {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (this,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      // continue until each element is visited
-      while (!si->is_done ())
-        {
-          be_field *field = be_field::narrow_from_decl (si->item ());
-          if (!field)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_exception::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field node\n")),
-                                0);
-            }
-          be_type *type = be_type::narrow_from_decl (field->field_type ());
-          if (!type)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_exception::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field type\n")),
-                                0);
-            }
-          if (type->in_recursion (node))
-            {
-              delete si;
-              return 1;
-            }
-          si->next ();
-        } // end of while loop
-      delete si;
-    } // end of if
-
-  // not in recursion
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << nl;
+  // generate the member count
+  *cs << this->member_count () << ", // member count\n";
+  cs->incr_indent (0);
+  // hand over to the scope to generate the typecode for elements
+  if (be_scope::gen_encapsulation () == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_exception: cannot generate typecode for members\n"));
+      return -1;
+    }
+  cs->decr_indent (0);
   return 0;
 }
 
+// compute typecode size
+long
+be_exception::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+// compute encapsulation length
+long
+be_exception::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+      this->encap_len_ += 4; // to hold the member count
+
+      // compute encap length for members
+      this->encap_len_ += be_scope::tc_encap_len ();
+    }
+  return this->encap_len_;
+}
+
 int
 be_exception::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index 6b9a4d2e143..60844f6898a 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 ACE_RCSID(be, be_field, "$Id$")
 
@@ -31,13 +31,57 @@ ACE_RCSID(be, be_field, "$Id$")
 be_field::be_field (void)
 {
 }
-
-be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p, Visibility vis)
-  : AST_Field (ft, n, p, vis),
+be_field::be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
+  : AST_Field (ft, n, p),
     AST_Decl (AST_Decl::NT_field, n, p)
 {
 }
 
+int
+be_field::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  be_type *bt;  // our type node
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << "\n";
+
+  // hand over code generation to our type node
+  bt = be_type::narrow_from_decl (this->field_type ());
+  return bt->gen_typecode ();
+}
+
+long
+be_field::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1)  // not computed yet
+    {
+      be_type *bt;
+
+      // struct member is represented as the "name" followed by the typecode
+
+      this->encap_len_ = this->name_encap_len (); // for name
+
+      // add to this, the size of our typecode
+      bt = be_type::narrow_from_decl (this->field_type ());
+      this->encap_len_ += bt->tc_size (); // note that we must add typecode
+                                          // size of the type
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_field::compute_size_type (void)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index a2ca138d2ad..60d53081ba6 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -143,40 +143,7 @@ be_generator::create_interface(UTL_ScopedName *n,
 AST_InterfaceFwd *
 be_generator::create_interface_fwd(UTL_ScopedName *n, UTL_StrList *p)
 {
-  return (AST_InterfaceFwd *) new be_interface_fwd(this->create_interface (n, 0, -1, p),
-                                                                                  n, p);
-}
-
-/*
- * Create a be_valuetype node
- */
-AST_Interface *
-be_generator::create_valuetype(UTL_ScopedName *n,
-                               AST_Interface **ih,
-                               long nih,
-                               UTL_StrList *p)
-{
-#ifdef IDL_HAS_VALUETYPE
-  return (AST_Interface *) new be_valuetype(n, ih, nih, p);
-#else
-  ACE_ASSERT (0);
-  return 0;
-#endif /* IDL_HAS_VALUETYPE */
-}
-
-/*
- * Create a be_valuetype_fwd node
- */
-AST_InterfaceFwd *
-be_generator::create_valuetype_fwd(UTL_ScopedName *n, UTL_StrList *p)
-{
-#ifdef IDL_HAS_VALUETYPE
-  return (AST_InterfaceFwd *) new be_valuetype_fwd(this->create_valuetype (n, 0, -1, p),
-                                                                                  n, p);
-#else
-  ACE_ASSERT (0);
-  return 0;
-#endif /* IDL_HAS_VALUETYPE */
+  return (AST_InterfaceFwd *) new be_interface_fwd(n, p);
 }
 
 /*
@@ -222,10 +189,9 @@ be_generator::create_operation(AST_Type *rt,
  * Create a BE_Field node
  */
 AST_Field *
-be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
-                                                 AST_Field::Visibility vis)
+be_generator::create_field(AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p)
 {
-  return (AST_Field *) new be_field(ft, n, p, vis);
+  return (AST_Field *) new be_field(ft, n, p);
 }
 
 /*
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 3a039fcfb30..0618cf5aed4 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -19,20 +19,20 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 ACE_RCSID(be, be_helper, "$Id$")
 
 static const char copyright [] =
-"/* -*- C++ -*- */\n\n"
-"// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******\n"
-"// TAO and the TAO IDL Compiler have been developed by the Center for\n"
-"// Distributed Object Computing at Washington University, St. Louis.\n"
-"//\n"
-"// Information about TAO is available at:\n"
-"//                 http://www.cs.wustl.edu/~schmidt/TAO.html\n";
+"/* -*- C++ -*- */\n\n\
+// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******\n\
+// TAO ORB and the TAO IDL Compiler have been developed by Washington \n\
+// University Computer Science's Distributed Object Computing Group.\n\
+//\n\
+// Information on TAO is available at\n\
+//                 http://www.cs.wustl.edu/~schmidt/TAO.html\n";
 
 TAO_NL::TAO_NL (void)
 {
@@ -166,10 +166,10 @@ TAO_OutStream::indent (void)
   // spaces in the output
   if (this->indent_level_ > 0)
     {
-      for (i = 0; i < this->indent_level_; i++)
+      for (i=0; i < this->indent_level_; i++)
         {
           ACE_OS::fprintf (this->fp_, "  ");
-          ACE_OS::fflush (this->fp_);
+	  ACE_OS::fflush (this->fp_);
         }
     }
   return 0;
@@ -224,8 +224,6 @@ TAO_OutStream::gen_ifdef_macro (const char *flatname, const char *suffix)
     case TAO_OutStream::TAO_SVR_IMPL:
       ACE_OS::strcat (macro, "SS_");
       break;
-    default:
-      return -1;
     }
   *this << "\n#if !defined (" << macro << ")\n";
   *this << "#define " << macro << "\n\n";
@@ -244,26 +242,22 @@ TAO_OutStream::gen_endif (void)
 int
 TAO_OutStream::gen_ifdef_AHETI (void)
 {
-  *this << "\n"
-        << "#if !defined (TAO_USE_SEQUENCE_TEMPLATES)"
-        << be_idt_nl;
+  *this << be_nl << "#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \\" << be_nl;
+  *this << "       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)" << be_idt_nl;
   return 0;
 }
 
 int
 TAO_OutStream::gen_else_AHETI (void)
 {
-  *this << "\n#else /* TAO_USE_SEQUENCE_TEMPLATES */"
-        << be_nl;
+  *this << be_uidt_nl << "#else /* AHETI */" << be_idt_nl;
   return 0;
 }
 
 int
 TAO_OutStream::gen_endif_AHETI (void)
 {
-  *this << be_uidt
-        << "\n#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ "
-        << be_nl;
+  *this << be_uidt_nl << "#endif /* AHETI */ " << be_nl;
   return 0;
 }
 
@@ -290,46 +284,6 @@ TAO_OutStream::operator<< (const char *str)
 }
 
 TAO_OutStream &
-TAO_OutStream::operator<< (const ACE_CDR::UShort num)
-{
-  ACE_OS::fprintf (this->fp_, "%hu", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const ACE_CDR::Short num)
-{
-  ACE_OS::fprintf (this->fp_, "%hd", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const ACE_CDR::ULong num)
-{
-  ACE_OS::fprintf (this->fp_, "%lu", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const ACE_CDR::Long num)
-{
-  ACE_OS::fprintf (this->fp_, "%ld", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
-TAO_OutStream::operator<< (const unsigned long num)
-{
-  ACE_OS::fprintf (this->fp_, "%lu", num);
-  ACE_OS::fflush (fp_);
-  return *this;
-}
-
-TAO_OutStream &
 TAO_OutStream::operator<< (const long num)
 {
   ACE_OS::fprintf (this->fp_, "%ld", num);
diff --git a/TAO/TAO_IDL/be/be_init.cpp b/TAO/TAO_IDL/be/be_init.cpp
index 1c81b64f288..4558a32dbb3 100644
--- a/TAO/TAO_IDL/be/be_init.cpp
+++ b/TAO/TAO_IDL/be/be_init.cpp
@@ -66,10 +66,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 // BE_init.cc - Initialization for dummy BE
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-#include        "../../tao/Version.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 ACE_RCSID(be, be_init, "$Id$")
 
@@ -84,11 +83,11 @@ AST_Generator *
 BE_init()
 {
   tao_cg = TAO_CODEGEN::instance ();
-  AST_Generator *g = new be_generator();
+  AST_Generator	*g = new be_generator();
 
   if (g == NULL) {
     cerr << GTDEVEL("IDL: BE init failed to create generator, exiting\n");
-    ACE_OS::exit (99);
+    exit(99);
   }
   return g;
 }
@@ -99,7 +98,5 @@ BE_init()
 void
 BE_version()
 {
-  cerr << GTDEVEL("TAO C++ BE, version ")
-       << GTDEVEL(TAO_VERSION)
-       << endl;
+  cerr << GTDEVEL("TAO C++ BE, version 0.1.0\n");
 }
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index b926dfc27d4..6d90df87100 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -172,13 +172,7 @@ be_interface::local_coll_name (void) const
 void
 be_interface::compute_fullskelname (void)
 {
-  this->compute_fullskelname (this->full_skel_name_, "POA_");
-}
-
-void
-be_interface::compute_fullskelname (char *&skelname, const char *prefix)
-{
-  if (skelname)
+  if (full_skel_name_)
     return;
   else
     {
@@ -188,7 +182,7 @@ be_interface::compute_fullskelname (char *&skelname, const char *prefix)
       long second = I_FALSE;
 
       // in the first loop compute the total length
-      namelen = ACE_OS::strlen (prefix);
+      namelen = 4;
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
@@ -211,20 +205,20 @@ be_interface::compute_fullskelname (char *&skelname, const char *prefix)
         }
       delete i;
 
-      skelname = new char [namelen+1];
-      skelname[0] = '\0';
+      this->full_skel_name_ = new char [namelen+1];
+      this->full_skel_name_[0] = '\0';
       first = I_TRUE;
       second = I_FALSE;
-      ACE_OS::strcat (skelname, prefix);
+      ACE_OS::strcat (this->full_skel_name_, "POA_");
       i = new UTL_IdListActiveIterator (this->name ());
       while (!(i->is_done ()))
         {
           if (!first)
-            ACE_OS::strcat (skelname, "::");
+            ACE_OS::strcat (this->full_skel_name_, "::");
           else if (second)
             first = second = I_FALSE;
           // print the identifier
-          ACE_OS::strcat (skelname, i->item ()->get_string ());
+          ACE_OS::strcat (this->full_skel_name_, i->item ()->get_string ());
           if (first)
             {
               if (ACE_OS::strcmp (i->item ()->get_string (), "") != 0)
@@ -277,14 +271,14 @@ void be_interface::in_mult_inheritance (int mi)
 }
 
 //gen copy constructors
-void
+void 
 be_interface::gen_copy_ctors (TAO_OutStream* os)
 {
   this->traverse_inheritance_graph(be_interface::gen_copy_ctors_helper,os);
   return;
 }
 
-int
+int 
 be_interface::gen_copy_ctors_helper (be_interface* node, be_interface* base, TAO_OutStream *os)
 {
   static int first = 0;
@@ -293,14 +287,14 @@ 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)"
-              << ", " << base->full_skel_name () << " (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->flatname () << idl_global->impl_class_suffix () << " (t)" 
               << ", " << base->full_skel_name () << " (t)";   ;
-
+         
         }
     }
   else
@@ -310,19 +304,19 @@ be_interface::gen_copy_ctors_helper (be_interface* node, be_interface* base, TAO
     }
 
   return 1;
-
+  
 }
-
+  
 //generate default constructors
-void
+void 
 be_interface::gen_def_ctors (TAO_OutStream* os)
 {
   this->traverse_inheritance_graph(be_interface::gen_def_ctors_helper,os);
   return;
 }
+  
 
-
-int
+int 
 be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_OutStream *os)
 {
 
@@ -331,13 +325,13 @@ 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->flatname () << idl_global->impl_class_suffix () << " ()";          
           first = 0;
         }
       else
         {
           *os << ", " << idl_global->impl_class_prefix () << base->flatname () << idl_global->impl_class_suffix () << " ()";
-
+         
         }
     }
   else
@@ -347,7 +341,7 @@ be_interface::gen_def_ctors_helper (be_interface* node, be_interface* base, TAO_
     }
 
    return 1;
-
+  
 }
 
 
@@ -804,6 +798,95 @@ be_interface::gen_out_impl (void)
   return 0;
 }
 
+// generate typecode.
+// Typecode for interface comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_interface::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_objref, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  return this->gen_encapsulation ();
+}
+
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+int
+be_interface::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // XXXASG - byte order must be based on what m/c we are generating code -
+  // TODO
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << ",\n";
+
+  return 0;
+}
+
+// compute size of typecode
+long
+be_interface::tc_size (void)
+{
+   return 4 + 4 + this->tc_encap_len ();
+}
+
+// compute the encapsulation length
+long
+be_interface::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      long slen;
+
+      // Macro to avoid "warning: unused parameter" type warning.
+      ACE_UNUSED_ARG (slen);
+
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // for repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+    }
+  return this->encap_len_;
+}
+
 // helper.
 int
 be_interface::gen_operation_table (void)
@@ -861,22 +944,19 @@ be_interface::gen_operation_table (void)
       *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
-          << this->skel_count_ << "," << be_nl
-          << 2*this->skel_count_ << "," << be_nl
-          << "&_tao_" << this->flatname () << "_allocator" << be_uidt_nl
-          << ");" << be_uidt_nl;
+      *ss << "TAO_Dynamic_Hash_OpTable tao_" << this->flatname () << "_optable "
+          << "(" << this->flatname () << "_operations, " << this->skel_count_
+          << ", " << 2*this->skel_count_ << ", &_tao_" << this->flatname ()
+          << "_allocator);" << be_nl;
 
       break;
 
     case TAO_CodeGen::TAO_LINEAR_SEARCH:
       // For generating linear search also, we are calling GPERF
-      // only.
+      // only. 
     case TAO_CodeGen::TAO_BINARY_SEARCH:
       // For generating binary search also, we are calling GPERF
-      // only.
+      // only. 
     case TAO_CodeGen::TAO_PERFECT_HASH:
       // For each interface in the IDL, have a new temp file to
       // collect the input for the gperf program.
@@ -884,13 +964,13 @@ be_interface::gen_operation_table (void)
         // Temp file name.
         char *temp_file = 0;
         ACE_NEW_RETURN (temp_file,
-                        char [ACE_OS::strlen (idl_global->temp_dir ()) +
+                        char [ACE_OS::strlen (ACE_DEFAULT_TEMP_FILE) +
                              ACE_OS::strlen (this->flatname ()) +
-                             ACE_OS::strlen (".gperf") + 1],
+                             ACE_OS::strlen (".gperf") + 2],
                         -1);
         ACE_OS::sprintf (temp_file,
-                         "%s%s.gperf",
-                         idl_global->temp_dir (),
+                         "%s_%s.gperf",
+                         ACE_DEFAULT_TEMP_FILE,
                          this->flatname ());
 
         // Save this file name with the codegen singleton.
@@ -910,7 +990,7 @@ be_interface::gen_operation_table (void)
                              "be_visitor_interface_ss",
                              "::",
                              "visit_interface-",
-                             "make_outstream failed\n"),
+                             "make_outstream failed"),
                             -1);
 
         // Store the outstream with the codegen singleton.
@@ -923,12 +1003,12 @@ be_interface::gen_operation_table (void)
                              "be_visitor_interface_ss",
                              "::",
                              "visit_interface-",
-                             "gperf_input.tmp file open failed\n"),
+                             "gperf_input.tmp file open failed"),
                             -1);
 
         // Add the gperf input header.
-        this->gen_gperf_input_header (ss);
-
+        gen_gperf_input_header (ss);
+        
         // Traverse the graph.
         if (this->traverse_inheritance_graph (be_interface::gen_optable_helper, ss) == -1)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -952,7 +1032,7 @@ be_interface::gen_operation_table (void)
         // Input to the gperf is ready. Run gperf and get things
         // done. This method also unlinks the temp file that we used
         // for the gperf.
-        this->gen_gperf_things ();
+        gen_gperf_things ();
       }
       break;
 
@@ -961,7 +1041,7 @@ be_interface::gen_operation_table (void)
                          "be_interface",
                          "::",
                          "gen_operation_table",
-                         "unknown op_lookup_strategy\n"),
+                         "unknown op_lookup_strategy"),
                         -1);
     }
   return 0;
@@ -1121,7 +1201,7 @@ be_interface::gen_optable_entries (be_interface *derived)
                          "be_interface",
                          "::",
                          "gen_optable_entries",
-                         "unknown op_lookup_strategy\n"),
+                         "unknown op_lookup_strategy"),
                         -1);
     }
   return 0;
@@ -1152,7 +1232,7 @@ be_interface::traverse_inheritance_graph (be_interface::tao_code_emitter gen,
   // insert ourselves in the Queue
   if (queue.enqueue_tail (this) == -1)
     {
-      ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::traverse_inheritance_graph - "
+      ACE_ERROR_RETURN ((LM_ERROR, "(%N:%l) be_interface::gen_operation_table - "
                          "error generating entries\n"), -1);
     }
 
@@ -1283,7 +1363,7 @@ be_interface::gen_optable_helper (be_interface *derived,
 
 // Run GPERF and get the correct lookup and other operations
 // depending on which strategy we are using. Returns 0 on sucess, -1
-// on error.
+// on error. 
 int
 be_interface::gen_gperf_things (void)
 {
@@ -1301,9 +1381,9 @@ be_interface::gen_gperf_things (void)
     {
     case TAO_CodeGen::TAO_PERFECT_HASH:
       // Output a class definition deriving from
-      // TAO_Perfect_Hash_OpTable.
+      // TAO_Perfect_Hash_OpTable.        
       gen_perfect_hash_class_definition ();
-
+      
       // Call GPERF and get the methods defined.
       if (gen_gperf_lookup_methods () == -1)
         return -1;
@@ -1311,14 +1391,14 @@ be_interface::gen_gperf_things (void)
       // Create an instance of the correct class corresponding the
       // operation lookup strategy we are following.
       gen_perfect_hash_instance ();
-
+      
       break;
-
+      
     case TAO_CodeGen::TAO_BINARY_SEARCH:
       // Output a class definition deriving from
       // TAO_Binary_Search_OpTable.
       this->gen_binary_search_class_definition ();
-
+      
       // Call GPERF and get the methods defined.
       if (gen_gperf_lookup_methods () == -1)
         return -1;
@@ -1328,12 +1408,12 @@ be_interface::gen_gperf_things (void)
       gen_binary_search_instance ();
 
       break;
-
+     
     case TAO_CodeGen::TAO_LINEAR_SEARCH:
       // Output a class definition deriving from
       // TAO_Linear_Search_OpTable.
       gen_linear_search_class_definition ();
-
+      
       // Call GPERF and get the methods defined.
       if (gen_gperf_lookup_methods () == -1)
         return -1;
@@ -1343,7 +1423,7 @@ be_interface::gen_gperf_things (void)
       gen_linear_search_instance ();
 
       break;
-
+      
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
                          "tao_idl:ERROR:%N:%l:Unknown Operation Lookup Strategy\n"),
@@ -1383,7 +1463,7 @@ be_interface::gen_perfect_hash_class_definition (void)
 }
 
 // Outputs the class definition for the binary searching. This class
-// will inherit from the TAO_Binary_Seach_OpTable.
+// will inherit from the TAO_Binary_Seach_OpTable. 
 void
 be_interface::gen_binary_search_class_definition (void)
 {
@@ -1413,7 +1493,7 @@ be_interface::gen_linear_search_class_definition (void)
 {
   // Codegen singleton.
   TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
+  
   // Outstream.
   TAO_OutStream *ss = cg->server_skeletons ();
 
@@ -1454,21 +1534,21 @@ be_interface::gen_gperf_lookup_methods (void)
   // <open_temp_file> to  open the file now, so that the file will get
   // deleted once when we close the file.
 
-  // Close the file.
+  // Close the file. 
   if (ACE_OS::fclose (cg->gperf_input_stream ()->file ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p:File close failed on temp gperf's input file\n"),
                       -1);
 
-  // Open the temp file.
+  // Open the temp file. 
   ACE_HANDLE input =  ACE::open_temp_file (cg->gperf_input_filename (),
                                            O_RDONLY);
-
+  
   if (input == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p:File open failed on gperf's temp input file\n"),
                       -1);
-
+  
   // Stdout is server skeleton. Do *not* close the file, just open
   // again with ACE_OS::open with WRITE + APPEND option.. After this,
   // remember to update the file offset to the correct location.
@@ -1484,7 +1564,7 @@ be_interface::gen_gperf_lookup_methods (void)
   process_options.set_handles (input, output);
 
   // Set the command line for the gperf program. Give the right
-  // arguments for the operation lookup strategy that we are using.
+  // arguments for the operation lookup strategy that we are using. 
   switch (cg->lookup_strategy ())
     {
       // Perfect Hashing.
@@ -1505,8 +1585,8 @@ be_interface::gen_gperf_lookup_methods (void)
                                     idl_global->gperf_path (),
                                     this->flatname ());
       break;
-
-      // Binary search methods from GPERF. Everythis and the -B flag.
+        
+      // Binary search methods from GPERF. Everythis and the -B flag. 
     case TAO_CodeGen::TAO_BINARY_SEARCH:
       process_options.command_line ("%s"
                                     " "
@@ -1526,7 +1606,7 @@ be_interface::gen_gperf_lookup_methods (void)
                                     idl_global->gperf_path (),
                                     this->flatname ());
       break;
-
+      
       // Linear search methods from GPERF. Everything and the -z flag.
     case TAO_CodeGen::TAO_LINEAR_SEARCH:
       process_options.command_line ("%s"
@@ -1552,7 +1632,7 @@ be_interface::gen_gperf_lookup_methods (void)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "tao_idl:ERROR:%N:%l:Unknown Operation Lookup Strategy\n"),
                         -1);
-    }
+    }      
 
 
   // Spawn a process for gperf.
@@ -1583,10 +1663,11 @@ be_interface::gen_perfect_hash_instance ()
   // Outstream.
   TAO_OutStream *ss = cg->server_skeletons ();
 
-  *ss << "static TAO_" << this->flatname () << "_Perfect_Hash_OpTable"
+  *ss << "TAO_" << this->flatname () << "_Perfect_Hash_OpTable"
       << " "
       << "tao_" << this->flatname () << "_optable"
-      << ";\n" << be_nl;
+      << ";"
+      << be_nl;
 }
 
 // Create an instance of the binary search optable.
@@ -1599,10 +1680,11 @@ be_interface::gen_binary_search_instance ()
   // Outstream.
   TAO_OutStream *ss = cg->server_skeletons ();
 
-  *ss << "static TAO_" << this->flatname () << "_Binary_Search_OpTable"
+  *ss << "TAO_" << this->flatname () << "_Binary_Search_OpTable"
       << " "
       << "tao_" << this->flatname () << "_optable"
-      << ";\n" << be_nl;
+      << ";"
+      << be_nl;
 }
 
 // Create an instance of this perfect hash table.
@@ -1615,10 +1697,11 @@ be_interface::gen_linear_search_instance ()
   // Outstream.
   TAO_OutStream *ss = cg->server_skeletons ();
 
-  *ss << "static TAO_" << this->flatname () << "_Linear_Search_OpTable"
+  *ss << "TAO_" << this->flatname () << "_Linear_Search_OpTable"
       << " "
       << "tao_" << this->flatname () << "_optable"
-      << ";\n" << be_nl;
+      << ";"
+      << be_nl;
 }
 
 int
@@ -1687,7 +1770,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
                       << "CORBA::Environment &env =" << be_idt_nl
-                      << "CORBA::default_environment ()"
+                      << "CORBA::Environment::default_environment ()"
                       << be_uidt << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
@@ -1738,7 +1821,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "void *obj," << be_nl
                       << "void *context," << be_nl
                       << "CORBA::Environment &env =" << be_idt_nl
-                      << "CORBA::default_environment ()"
+                      << "CORBA::Environment::default_environment ()"
                       << be_uidt << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
@@ -1785,7 +1868,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "void *obj," << be_nl
                           << "void *context," << be_nl
                           << "CORBA::Environment &env = " << be_idt_nl
-                          << "CORBA::default_environment ()"
+                          << "CORBA::Environment::default_environment ()"
                           << be_uidt << be_uidt_nl
                           << ");" << be_uidt << "\n\n";
                     }
@@ -1808,7 +1891,7 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << derived->full_skel_name ()
                           << "_ptr) obj;" << be_nl;
                       *os << ancestor->full_skel_name ()
-                          << "::_set_" << d->local_name ()
+                          << "::_get_" << d->local_name ()
                           << "_skel (" << be_idt << be_idt_nl
                           << "req," << be_nl
                           << "(" << ancestor->full_skel_name ()
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 37b043c003c..75bc5b02e0e 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 ACE_RCSID(be, be_interface_fwd, "$Id$")
 
@@ -34,18 +34,13 @@ be_interface_fwd::be_interface_fwd (void)
   this->size_type (be_decl::VARIABLE); // always the case
 }
 
-be_interface_fwd::be_interface_fwd (AST_Interface *dummy,
-                                    UTL_ScopedName *n, UTL_StrList *p)
-  : AST_InterfaceFwd (dummy, n, p),
+be_interface_fwd::be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p)
+  : AST_InterfaceFwd (n, p),
     AST_Decl (AST_Decl::NT_interface_fwd, n, p)
 {
   this->size_type (be_decl::VARIABLE); // always the case
 }
 
-be_interface_fwd::~be_interface_fwd (void)
-{
-}
-
 // generate the var definition
 int
 be_interface_fwd::gen_var_defn (void)
@@ -500,6 +495,17 @@ be_interface_fwd::gen_out_impl (void)
 
   return 0;
 }
+int
+be_interface_fwd::gen_typecode (void)
+{
+  return 0;
+}
+
+long
+be_interface_fwd::tc_size (void)
+{
+  return 0;
+}
 
 int
 be_interface_fwd::accept (be_visitor *visitor)
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 4541f60d37a..4ca417ca519 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -282,6 +282,149 @@ be_predefined_type::compute_tc_name (void)
     }
 }
 
+int
+be_predefined_type::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  // Macro to avoid "warning: unused parameter" type warning.
+  ACE_UNUSED_ARG (nl);
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from the current indentation level
+
+  switch (this->pt ())
+    {
+    case AST_PredefinedType::PT_void:
+      *cs << "CORBA::tk_void,\n\n";
+      break;
+    case AST_PredefinedType::PT_short:
+      *cs << "CORBA::tk_short,\n\n";
+      break;
+    case AST_PredefinedType::PT_ushort:
+      *cs << "CORBA::tk_ushort,\n\n";
+      break;
+    case AST_PredefinedType::PT_long:
+      *cs << "CORBA::tk_long,\n\n";
+      break;
+    case AST_PredefinedType::PT_ulong:
+      *cs << "CORBA::tk_ulong,\n\n";
+      break;
+    case AST_PredefinedType::PT_longlong:
+      *cs << "CORBA::tk_longlong,\n\n";
+      break;
+    case AST_PredefinedType::PT_ulonglong:
+      *cs << "CORBA::tk_ulonglong,\n\n";
+      break;
+    case AST_PredefinedType::PT_float:
+      *cs << "CORBA::tk_float,\n\n";
+      break;
+    case AST_PredefinedType::PT_double:
+      *cs << "CORBA::tk_double,\n\n";
+      break;
+    case AST_PredefinedType::PT_longdouble:
+      *cs << "CORBA::tk_longdouble,\n\n";
+      break;
+    case AST_PredefinedType::PT_boolean:
+      *cs << "CORBA::tk_boolean,\n\n";
+      break;
+    case AST_PredefinedType::PT_char:
+      *cs << "CORBA::tk_char,\n\n";
+      break;
+    case AST_PredefinedType::PT_octet:
+      *cs << "CORBA::tk_octet,\n\n";
+      break;
+    case AST_PredefinedType::PT_any:
+      *cs << "CORBA::tk_any,\n\n";
+      break;
+    case AST_PredefinedType::PT_wchar:
+      *cs << "CORBA::tk_wchar,\n\n";
+      break;
+    case AST_PredefinedType::PT_pseudo:
+      {
+        if (!ACE_OS::strcmp (this->local_name ()->get_string (), "TypeCode"))
+          *cs << "CORBA::tk_TypeCode,\n\n";
+        else
+          if (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object"))
+            {
+              *cs << "CORBA::tk_objref,\n";
+              *cs << this->tc_encap_len () << ", // encapsulation length\n";
+              // now emit the encapsulation
+              this->gen_encapsulation ();
+            }
+      }
+      break;
+    }
+  return 0;
+}
+
+long
+be_predefined_type::tc_size (void)
+{
+  if (ACE_OS::strcmp (this->local_name ()->get_string (), "Object")) // not same
+    return 4; // for the enum value
+  else
+    return 4 + 4 + this->tc_encap_len ();
+}
+
+long
+be_predefined_type::tc_encap_len (void)
+{
+  if ((this->encap_len_ == -1) // not computed yet
+      && (!ACE_OS::strcmp (this->local_name ()->get_string (), "Object")))
+    // is a CORBA::Object
+    {
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // for repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+    }
+
+  return this->encap_len_;
+}
+
+int
+be_predefined_type::gen_encapsulation (void)
+{
+  if ((this->pt () == AST_PredefinedType::PT_any)
+      || (this->pt () == AST_PredefinedType::PT_pseudo))
+    {
+      TAO_OutStream *cs; // output stream
+      TAO_NL  nl;        // end line
+      TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+      long i, arrlen;
+      ACE_UINT32 *arr;
+
+      cs = cg->client_stubs ();
+      cs->indent (); // start from whatever indentation level we were at
+
+      // XXXASG - byte order must be based on what m/c we are generating code -
+      // TODO
+      *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+      // generate repoID
+      *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+      (void)this->tc_name2long (this->repoID (), arr, arrlen);
+      for (i=0; i < arrlen; i++)
+        {
+          cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+        }
+      *cs << " // repository ID = " << this->repoID () << nl;
+      // generate name
+      *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+      (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+      for (i=0; i < arrlen; i++)
+        {
+          cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+        }
+      *cs << " // name = " << this->local_name () << ",\n";
+    }
+  return 0;
+}
+
 // compute the size type of the node in question
 int
 be_predefined_type::compute_size_type (void)
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
index 16dfb2defe9..24d3eb1daf4 100644
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ b/TAO/TAO_IDL/be/be_scope.cpp
@@ -38,6 +38,79 @@ be_scope::comma (void) const
   return this->comma_;
 }
 
+int
+be_scope::gen_encapsulation (void)
+{
+  UTL_ScopeActiveIterator *si;
+  AST_Decl *d;
+  be_decl *bd;
+
+  // if there are elements in this scope
+  if (this->nmembers () > 0)
+    {
+      // instantiate a scope iterator.
+      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
+
+      while (!(si->is_done ()))
+        {
+          // get the next AST decl node
+          d = si->item ();
+          bd = be_decl::narrow_from_decl (d);
+          if (bd->gen_encapsulation () == -1)
+            {
+              // failure
+              return -1;
+            }
+          si->next ();
+        } // end of while
+      delete si; // free the iterator object
+    }
+  return 0;
+}
+
+long
+be_scope::tc_encap_len (void)
+{
+  UTL_ScopeActiveIterator *si;
+  AST_Decl *d;
+  be_decl *bd;
+  long encap_len = 0;
+
+  if (this->nmembers () > 0)
+    {
+      // if there are elements in this scope
+
+      si = new UTL_ScopeActiveIterator (this, UTL_Scope::IK_decls);
+      // instantiate a scope iterator.
+
+      while (!(si->is_done ()))
+        {
+          // get the next AST decl node
+          d = si->item ();
+
+          // NOTE: Our assumptin here is that whatever scope we are in, the
+          // node type that shows up here *MUST* be valid according to the
+          // IDL grammar. We do not check for this since the front end must
+          // have taken care of weeding out such errors
+
+          bd = be_decl::narrow_from_decl (d);
+          if (bd != 0)
+            {
+              encap_len += bd->tc_encap_len ();
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "WARNING (%N:%l): be_scope::tc_encap_len - "
+                          "narrow_from_decl returned 0\n"));
+            }
+          si->next ();
+        } // end of while
+      delete si; // free the iterator object
+    }
+  return encap_len;
+}
+
 // return the scope created by this node (if one exists, else NULL)
 be_decl *
 be_scope::decl (void)
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 5cbb7686b39..2fca004ea58 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -213,6 +213,90 @@ be_sequence::managed_type (void)
   return this->mt_;
 }
 
+// generate typecode.
+// Typecode for sequences comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_sequence::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_sequence, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  return this->gen_encapsulation ();
+}
+
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+
+int
+be_sequence::gen_encapsulation (void)
+{
+  TAO_OutStream *os; // output stream
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  be_type *bt; // base type
+
+  os = cg->client_stubs ();
+  os->incr_indent ();
+
+  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
+
+  // emit typecode of element type
+  bt = be_type::narrow_from_decl (this->base_type ());
+  if (!bt || (bt->gen_typecode () == -1))
+    {
+      ACE_ERROR ((LM_ERROR, "be_sequence::gen_typecode - bad base type\n"));
+      return -1;
+    }
+
+  //  emit the length
+  os->decr_indent ();
+  *os << this->max_size () << ",\n";
+  return 0;
+}
+
+// compute typecode size
+long
+be_sequence::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+long
+be_sequence::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      be_type *bt; // base type
+
+      this->encap_len_ = 4;  // holds the byte order flag
+      // add the encapsulation length of our base type
+      bt = be_type::narrow_from_decl (this->base_type ());
+      if (!bt)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "be_sequence::tc_encap_len - bad base type\n"));
+          return 0;
+        }
+      this->encap_len_ += bt->tc_size ();
+      this->encap_len_ += 4; // to hold the max size
+
+    }
+  return this->encap_len_;
+}
+
 /*
  * Add this be_sequence to the locally defined types in this scope
  */
@@ -362,37 +446,6 @@ be_sequence::object_manager_name ()
 }
 
 
-idl_bool
-be_sequence::in_recursion (be_type *node)
-{
-  if (!node)
-    {
-      // there has to be a parameter
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_sequence::")
-                         ASYS_TEXT ("in_recursion - ")
-                         ASYS_TEXT ("bad parameter node\n")),
-                        0);
-    }
-
-  be_type *type = be_type::narrow_from_decl (this->base_type ());
-  if (!type)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_sequence::")
-                         ASYS_TEXT ("in_recursion - ")
-                         ASYS_TEXT ("bad base type\n")),
-                        0);
-    }
-  
-  if (!ACE_OS::strcmp (node->fullname (), type->fullname ()))
-    // they match
-    return 1;
-  else
-    // not in recursion
-    return 0;
-}
-
 // Narrowing
 IMPL_NARROW_METHODS3 (be_sequence, AST_Sequence, be_scope, be_type)
 IMPL_NARROW_FROM_DECL (be_sequence)
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index 4d72f2ab761..ba4a3c87277 100644
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ b/TAO/TAO_IDL/be/be_string.cpp
@@ -73,6 +73,45 @@ be_string::compute_tc_name (void)
 }
 
 int
+be_string::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from the current indentation level
+  // emit the enumeration
+  *cs << "CORBA::tk_string, " << nl;
+  *cs << this->max_size () << ", // string length\n";
+  return 0;
+}
+
+// compute typecode size
+long
+be_string::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing string length
+  return 4 + 4;
+}
+
+int
+be_string::gen_encapsulation (void)
+{
+  return 0;
+}
+
+long
+be_string::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1)
+    {
+      this->encap_len_ = 0; // no encapsulation
+    }
+  return this->encap_len_;
+}
+
+int
 be_string::accept (be_visitor *visitor)
 {
   return visitor->visit_string (this);
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index df04d665cae..3073c59e1f3 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -564,6 +564,109 @@ be_structure::gen_out_impl (void)
   return 0;
 }
 
+// generate typecode.
+// Typecode for structures comprises the enumerated value followed by the
+// encapsulation of the parameters
+
+int
+be_structure::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_struct, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  cs->incr_indent (0);
+  if (this->gen_encapsulation () == -1)
+    {
+      return -1;
+    }
+  cs->decr_indent ();
+  return 0;
+}
+
+// generate encapsulation
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+int
+be_structure::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << nl;
+  // generate the member count
+  *cs << this->member_count () << ", // member count\n";
+  cs->incr_indent (0);
+  // hand over to the scope to generate the typecode for elements
+  if (be_scope::gen_encapsulation () == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n"));
+      return -1;
+    }
+  cs->decr_indent (0);
+  return 0;
+}
+
+// compute typecode size
+long
+be_structure::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+// compute encapsulation length
+long
+be_structure::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+      this->encap_len_ += 4; // to hold the member count
+
+      // compute encap length for members
+      this->encap_len_ += be_scope::tc_encap_len ();
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_structure::compute_size_type (void)
@@ -605,62 +708,6 @@ be_structure::compute_size_type (void)
   return 0;
 }
 
-// Are we or the parameter node involved in any recursion
-idl_bool
-be_structure::in_recursion (be_type *node)
-{
-  if (!node)
-    {
-      // we are determining the recursive status for ourselves
-      node = this;
-    }
-
-  // proceed if the number of members in our scope is greater than 0
-  if (this->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (this,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      // continue until each element is visited
-      while (!si->is_done ())
-        {
-          be_field *field = be_field::narrow_from_decl (si->item ());
-          if (!field)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_structure::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field node\n")),
-                                0);
-            }
-          be_type *type = be_type::narrow_from_decl (field->field_type ());
-          if (!type)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_structure::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field type\n")),
-                                0);
-            }
-          if (type->in_recursion (node))
-            {
-              delete si;
-              return 1;
-            }
-          si->next ();
-        } // end of while loop
-      delete si;
-    } // end of if
-
-  // not in recursion
-  return 0;
-}
-
 int
 be_structure::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_sunsoft.cpp b/TAO/TAO_IDL/be/be_sunsoft.cpp
index aeba95b44ba..442d693007e 100644
--- a/TAO/TAO_IDL/be/be_sunsoft.cpp
+++ b/TAO/TAO_IDL/be/be_sunsoft.cpp
@@ -3,7 +3,7 @@
 #include	"idl.h"
 #include	"idl_extern.h"
 #include	"be.h"
-#include  "be_sunsoft.h"
+#include        "be_sunsoft.h"
 
 ACE_RCSID(be, be_sunsoft, "$Id$")
 
@@ -74,14 +74,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           this->TAO_OutStream::print ("%ld", ev->u.ulval);
           break;
         case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-          this->TAO_OutStream::print ("%ld", ev->u.llval);
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
           break;
         case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-          this->TAO_OutStream::print ("%ld", ev->u.ullval);
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
           break;
         case AST_Expression::EV_float:
           this->TAO_OutStream::print ("%f", ev->u.fval);
@@ -93,8 +87,8 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
           break;
         case AST_Expression::EV_char:
           if (isprint (ev->u.cval))
-	          this->TAO_OutStream::print ("'%c'", ev->u.cval);
-	        else if (iscntrl (ev->u.cval))
+	    this->TAO_OutStream::print ("'%c'", ev->u.cval);
+	  else if (iscntrl (ev->u.cval))
             switch (ev->u.cval) 
               {
                 case '\n':
@@ -118,20 +112,13 @@ TAO_SunSoft_OutStream::print (AST_Expression *expr)
                 case '\a':
                   this->TAO_OutStream::print ("'\\a'");
                   break;
-                case '\\':
-                  this->TAO_OutStream::print ("'\\'");
-                  break;
-                case '\?':
-                  this->TAO_OutStream::print ("'?'");
-                  break;
               default:
                 this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
               }
- 	        else 
-	          this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
+ 	  else
+	    this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
-          this->TAO_OutStream::print ("%ld", ev->u.wcval);
           break;
         case AST_Expression::EV_octet:
           this->TAO_OutStream::print ("%d", ev->u.oval);
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index 3e8f126c4bf..19c96513ca8 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -279,13 +279,6 @@ AST_Decl::NodeType be_type::base_node_type (void) const
   return ACE_const_cast(be_type*, this)->node_type ();
 }
 
-idl_bool
-be_type::in_recursion (be_type *)
-{
-  // be default we are not involved in recursion
-  return 0;
-}
-
 int
 be_type::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 5fa56ef674b..f07db98f150 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -54,6 +54,108 @@ be_typedef::primitive_base_type (void)
   return d;
 }
 
+int
+be_typedef::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_alias, // typecode kind for typedefs" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  cs->incr_indent (0);
+  if (this->gen_encapsulation () == -1)
+    {
+      return -1;
+    }
+
+  cs->decr_indent (0);
+  return 0;
+}
+
+// generate encapsulation. A typedef is an alias to its base type
+int
+be_typedef::gen_encapsulation  (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+  be_type *bt; // base type
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << "\n";
+
+  // generate typecode for the base type
+  bt = be_type::narrow_from_decl (this->base_type ());
+  if (!bt || (bt->gen_typecode () == -1))
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+       "be_typedef::gen_encapsulation failed for base type\n"),
+                        -1);
+    }
+  return 0;
+}
+
+long
+be_typedef::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+long
+be_typedef::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      be_type *bt; // base type
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len ();
+
+      // add the encapsulation length of our base type
+      bt = be_type::narrow_from_decl (this->base_type ());
+      if (!bt)
+        {
+          ACE_ERROR ((LM_ERROR,
+              "be_typedef::tc_encap_len - bad base type\n"));
+          return 0;
+        }
+      this->encap_len_ += bt->tc_size ();
+
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_typedef::compute_size_type (void)
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index b33c214f9a3..6a07d15fd6a 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -618,6 +618,123 @@ be_union::gen_out_impl (void)
   return 0;
 }
 
+int
+be_union::gen_typecode (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "CORBA::tk_union, // typecode kind" << nl;
+  *cs << this->tc_encap_len () << ", // encapsulation length\n";
+  // now emit the encapsulation
+  return this->gen_encapsulation ();
+}
+
+// generate encapsulation.
+// An encapsulation for ourselves will be necessary when we are part of some
+// other IDL type and a typecode for that other type is being generated. This
+// will comprise our typecode kind. IDL types with parameters will additionally
+// have the encapsulation length and the entire typecode description
+
+int
+be_union::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  long i, arrlen;
+  ACE_UINT32 *arr;
+  be_type *discrim;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
+  // generate repoID
+  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
+  (void)this->tc_name2long (this->repoID (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // repository ID = " << this->repoID () << nl;
+  // generate name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << ",\n";
+
+  // generate typecode for discriminant
+  discrim = be_type::narrow_from_decl (this->disc_type ());
+  if (discrim->gen_typecode () == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_union: cannot generate typecode for discriminant\n"));
+      return -1;
+    }
+
+  // generate the default used flag
+  cs->indent ();
+  *cs << this->default_index () << ", // default used index" << nl;
+  // generate the member count
+  *cs << this->member_count () << ", // member count\n";
+  cs->incr_indent (0);
+  // hand over to the scope to generate the typecode for elements
+  if (be_scope::gen_encapsulation () == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n"));
+      return -1;
+    }
+  cs->decr_indent (0);
+  return 0;
+}
+
+// compute typecode size
+long
+be_union::tc_size (void)
+{
+  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
+  // actual encapsulation length
+  return 4 + 4 + this->tc_encap_len ();
+}
+
+long
+be_union::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1) // not computed yet
+    {
+      long slen;
+      be_type *discrim;
+
+      // Macro to avoid "warning: unused parameter" type warning.
+      ACE_UNUSED_ARG (slen);
+
+      this->encap_len_ = 4;  // holds the byte order flag
+
+      this->encap_len_ += this->repoID_encap_len (); // for repoID
+
+      // do the same thing for the local name
+      this->encap_len_ += this->name_encap_len (); // for name
+
+      // add encapsulation size of discriminant typecode
+      discrim = be_type::narrow_from_decl (this->disc_type ());
+      this->encap_len_ += discrim->tc_size ();
+
+      this->encap_len_ += 4; // to hold the "default used" flag
+      this->encap_len_ += 4; // to hold the member count
+
+      // compute encap length for members
+      this->encap_len_ += be_scope::tc_encap_len ();
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_union::compute_size_type (void)
@@ -659,62 +776,6 @@ be_union::compute_size_type (void)
   return 0;
 }
 
-// Are we or the parameter node involved in any recursion
-idl_bool
-be_union::in_recursion (be_type *node)
-{
-  if (!node)
-    {
-      // we are determining the recursive status for ourselves
-      node = this;
-    }
-
-  // proceed if the number of members in our scope is greater than 0
-  if (this->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (this,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      // continue until each element is visited
-      while (!si->is_done ())
-        {
-          be_union_branch *field = be_union_branch::narrow_from_decl (si->item ());
-          if (!field)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_union::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field node\n")),
-                                0);
-            }
-          be_type *type = be_type::narrow_from_decl (field->field_type ());
-          if (!type)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%N:%l) be_union::")
-                                 ASYS_TEXT ("in_recursion - ")
-                                 ASYS_TEXT ("bad field type\n")),
-                                0);
-            }
-          if (type->in_recursion (node))
-            {
-              delete si;
-              return 1;
-            }
-          si->next ();
-        } // end of while loop
-      delete si;
-    } // end of if
-
-  // not in recursion
-  return 0;
-}
-
 int
 be_union::accept (be_visitor *visitor)
 {
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index c6c2d44d392..e1ea7eabf91 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -41,6 +41,59 @@ be_union_branch::be_union_branch (AST_UnionLabel *lab, AST_Type *ft,
 {
 }
 
+int
+be_union_branch::gen_encapsulation (void)
+{
+  TAO_OutStream *cs; // output stream
+  TAO_NL  nl;        // end line
+  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
+  be_type *bt;  // our type node
+  long i, arrlen;
+  ACE_UINT32 *arr;
+
+  cs = cg->client_stubs ();
+  cs->indent (); // start from whatever indentation level we were at
+
+  // emit the case label value
+  *cs << this->label ()->label_val ();
+  *cs << ", // union case label (evaluated)" << nl;
+  // emit name
+  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
+  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
+  for (i=0; i < arrlen; i++)
+    {
+      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
+    }
+  *cs << " // name = " << this->local_name () << "\n";
+
+  // hand over code generation to our type node
+  bt = be_type::narrow_from_decl (this->field_type ());
+  if (!bt)
+    return -1;
+  return bt->gen_typecode ();
+}
+
+long
+be_union_branch::tc_encap_len (void)
+{
+  if (this->encap_len_ == -1)
+    {
+      be_type *bt;
+
+      this->encap_len_ = 4; // case label;
+      this->encap_len_ += this->name_encap_len (); // for name
+      bt = be_type::narrow_from_decl (this->field_type ());
+      if (!bt)
+        {
+          ACE_ERROR ((LM_ERROR, "be_union_branch: bad field type\n"));
+          return -1;
+        }
+      this->encap_len_ += bt->tc_size (); // note that we add the typecode size
+                                          // of the type
+    }
+  return this->encap_len_;
+}
+
 // compute the size type of the node in question
 int
 be_union_branch::compute_size_type (void)
@@ -60,46 +113,6 @@ be_union_branch::compute_size_type (void)
 }
 
 int
-be_union_branch::gen_label_value (TAO_OutStream *os)
-{
-  AST_Expression *e = this->label ()->label_val ();
-  if (e->ec () != AST_Expression::EC_symbol)
-    {
-      // Easy, just a number...
-      *os << e;
-      return 0;
-    }
-
-  // If the enum is not in the global scope we have to prefix it.
-  be_union *u =
-    be_union::narrow_from_scope (this->defined_in ());
-  if (u == 0)
-    return -1;
-
-  be_type* dt =
-    be_type::narrow_from_decl (u->disc_type ());
-  if (dt == 0)
-    return -1;
-
-  // Find where was the enum defined, if it was defined in the globa
-  // scope, then it is easy to generate the enum values....
-  be_scope* scope =
-    be_scope::narrow_from_scope (dt->defined_in ());
-  if (scope == 0)
-    {
-      *os << e->n ();
-      return 0;
-    }
-
-  // But if it was generated inside a module or something similar then
-  // we must prefix the enum value with something...
-  be_decl* decl =
-    scope->decl ();
-  *os << decl->fullname () << "::" << e->n ();
-  return 0;
-}
-
-int
 be_union_branch::accept (be_visitor *visitor)
 {
   return visitor->visit_union_branch (this);
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
index aeab28d0d56..16b8a09bb41 100644
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ b/TAO/TAO_IDL/be/be_union_label.cpp
@@ -25,3 +25,4 @@ be_union_label::accept (be_visitor *visitor)
 {
   return visitor->visit_union_label (this);
 }
+
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
deleted file mode 100644
index 57c7006417b..00000000000
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ /dev/null
@@ -1,728 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_valuetype.cpp
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface and be_interface that provides
-//    additional means for C++ mapping of an valuetype.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_interface.cpp
-//
-// ============================================================================
-
-
-#include "idl.h"
-#include "idl_extern.h"
-// #include "be_visitor_valuetype.h"
-#include "be.h"
-
-#ifdef IDL_HAS_VALUETYPE
-
-ACE_RCSID(be, be_valuetype, "$Id$")
-
-/*
- * BE_Valuetype
- */
-
-// default constructor
-be_valuetype::be_valuetype (void)
-  : full_obv_skel_name_ (0),
-    abstract_ (0)
-{
-  this->size_type (be_decl::VARIABLE); // always the case
-  (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
-}
-
-// constructor used to build the AST
-be_valuetype::be_valuetype (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                            UTL_StrList *p, idl_bool set_abstract)
-  : be_interface (n, ih, nih, p),
-    AST_Interface (n, ih, nih, p),
-    AST_Decl (AST_Decl::NT_interface, n, p), // its like an interface
-    UTL_Scope (AST_Decl::NT_interface),
-    full_obv_skel_name_ (0),
-    abstract_ (set_abstract)
-{
-  // check that redefine() copy all members !
-  // ---
-  this->size_type (be_decl::VARIABLE); // always the case
-  (AST_Module::narrow_from_scope (this->defined_in ()))->set_has_nested_valuetype ();
-}
-
-be_valuetype::~be_valuetype (void)
-{
-
-}
-
-void
-be_valuetype::redefine (AST_Interface *from, UTL_StrList *p)
-{
-  this->AST_Interface::redefine (from, p);
-  abstract_ = from->is_abstract_valuetype();
-}
-
-// Is true if no-virtual accessor and modifier should be generated
-// If #pragma TAO OBV opt_accessor (todo) is used or -Wb,obv_opt_accessor
-idl_bool
-be_valuetype::opt_accessor ()
-{
-  return idl_global->obv_opt_accessor ();
-}
-
-idl_bool
-be_valuetype::is_valuetype ()
-{
-  return 1;
-}
-
-idl_bool
-be_valuetype::is_abstract_valuetype ()
-{
-  return abstract_;
-}
-
-void
-be_valuetype::set_abstract_valuetype ()
-{
-  abstract_ = 1;
-}
-
-// compute stringified fully scoped skeleton name (OBV_name)
-void
-be_valuetype::compute_fullobvskelname (void)
-{
-  this->compute_fullskelname (this->full_obv_skel_name_, "OBV_");
-}
-
-
-// retrieve the fully scoped skeleton name
-const char*
-be_valuetype::full_obv_skel_name (void)
-{
-  if (!this->full_obv_skel_name_)
-    compute_fullobvskelname ();
-
-  return this->full_obv_skel_name_;
-}
-
-
-
-// generate the var definition
-int
-be_valuetype::gen_var_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "*);" << nl;
-  *ch << namebuf << " (const " << local_name () << "*); // (TAO extension)" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "*);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "* operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "* () const;" << nl;
-  *ch << "operator " << local_name () << "* ();" << nl;
-
-/* %! &() or () ?
-  *ch << "operator const " << local_name () << "* &() const;" << nl;
-  *ch << "operator " << local_name () << "* &();" << nl;
-*/
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "* in (void) const;" << nl;
-  *ch << local_name () << "* &inout (void);" << nl;
-  *ch << local_name () << "* &out (void);" << nl;
-  *ch << local_name () << "* _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "* ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "* ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_valuetype::gen_var_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (0)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "* p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a const pointer
-  // TAO extension - it appears that there are problems with at least g++
-  // which reclaims amguity between T(T*) and T(const T_var &)
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << name () << "* p)" << nl;
-  *ci << "  : ptr_ (ACE_const_cast(" << name() << "*, p))" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "* " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "{" << be_idt_nl
-      <<    "CORBA::add_ref (p.ptr ());" << be_nl
-      <<    "this->ptr_ = p.ptr ();" << be_uidt_nl
-      << "}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::remove_ref (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "* p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::remove_ref (this->ptr_);" << nl
-      << local_name() << "* tmp = p.ptr ();" << be_nl
-      << "CORBA::add_ref (tmp);" << be_nl
-      << "this->ptr_ = tmp;\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "* () const // cast" << nl;  // %! &() ?
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "* () // cast " << nl;  // %! &()?
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "* " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "*" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "* &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "* &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "* " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << local_name () << "* tmp = this->ptr_;" << nl;
-  *ci << "this->ptr_ = 0;" << nl;
-  *ci << "return tmp;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_valuetype::gen_out_defn (void)
-{
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "* &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (const " << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only interface allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "*);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "* &();" << nl;
-  // ptr fn
-  *ch << local_name () << "* &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "* operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "* &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-  return 0;
-}
-
-int
-be_valuetype::gen_out_impl (void)
-{
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a pointer
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "* &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::remove_ref (this->ptr_);" << nl;
-  *ci << "this->ptr_ = 0;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << fname << "&,p).ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << local_name() << "* tmp = p.ptr ();" << be_nl
-      << "CORBA::add_ref (tmp);" << be_nl
-      << "this->ptr_ = tmp;" << be_nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from *
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "* p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "* &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "* &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "* " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-#if 0
-// generate typecode.
-// Typecode for interface comprises the enumerated value followed by the
-// encapsulation of the parameters
-
-int
-be_valuetype::gen_typecode (void)
-{
-  ACE_ASSERT(0);
-
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  *cs << "CORBA::tk_objref, // typecode kind" << nl;
-  *cs << this->tc_encap_len () << ", // encapsulation length\n";
-  // now emit the encapsulation
-  return this->gen_encapsulation ();
-}
-
-// generate encapsulation
-// An encapsulation for ourselves will be necessary when we are part of some
-// other IDL type and a typecode for that other type is being generated. This
-// will comprise our typecode kind. IDL types with parameters will additionally
-// have the encapsulation length and the entire typecode description
-int
-be_valuetype::gen_encapsulation (void)
-{
-  ACE_ASSERT (0);
-
-  TAO_OutStream *cs; // output stream
-  TAO_NL  nl;        // end line
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-  long i, arrlen;
-  ACE_UINT32 *arr;
-
-  cs = cg->client_stubs ();
-  cs->indent (); // start from whatever indentation level we were at
-
-  // XXXASG - byte order must be based on what m/c we are generating code -
-  // TODO
-  *cs << "TAO_ENCAP_BYTE_ORDER, // byte order" << nl;
-  // generate repoID
-  *cs << (ACE_OS::strlen (this->repoID ())+1) << ", ";
-  (void)this->tc_name2long (this->repoID (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
-    }
-  *cs << " // repository ID = " << this->repoID () << nl;
-  // generate name
-  *cs << (ACE_OS::strlen (this->local_name ()->get_string ())+1) << ", ";
-  (void)this->tc_name2long(this->local_name ()->get_string (), arr, arrlen);
-  for (i=0; i < arrlen; i++)
-    {
-      cs->print ("ACE_NTOHL (0x%x), ", arr[i]);
-    }
-  *cs << " // name = " << this->local_name () << ",\n";
-
-  return 0;
-}
-
-// compute size of typecode
-long
-be_valuetype::tc_size (void)
-{
-  ACE_ASSERT (0);
-
-   return 4 + 4 + this->tc_encap_len ();
-}
-
-// compute the encapsulation length
-long
-be_valuetype::tc_encap_len (void)
-{
-  ACE_ASSERT (0);
-
-  if (this->encap_len_ == -1) // not computed yet
-    {
-      long slen;
-
-      // Macro to avoid "warning: unused parameter" type warning.
-      ACE_UNUSED_ARG (slen);
-
-      this->encap_len_ = 4;  // holds the byte order flag
-
-      this->encap_len_ += this->repoID_encap_len (); // for repoID
-
-      // do the same thing for the local name
-      this->encap_len_ += this->name_encap_len ();
-
-    }
-  return this->encap_len_;
-}
-#endif
-
-// for building the pre and postfix of private data fields
-const char*
-be_valuetype::field_pd_prefix ()
-{
-  return "_pd_";
-}
-
-const char*
-be_valuetype::field_pd_postfix ()
-{
-  return "";
-}
-
-be_valuetype*
-be_valuetype::statefull_inherit ()
-{
-  be_valuetype *rval;
-  if (this->n_inherits () > 0)
-    {
-      rval = be_valuetype::narrow_from_decl (this->inherits ()[0]);
-      if (rval && (rval->is_valuetype ()) && (!rval->is_abstract_valuetype ()))
-        return rval;
-    }
-  return 0;
-}
-
-// accept a visitor
-int
-be_valuetype::accept (be_visitor *visitor)
-{
-  return visitor->visit_valuetype (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1 (be_valuetype, be_interface)
-IMPL_NARROW_FROM_DECL (be_valuetype)
-IMPL_NARROW_FROM_SCOPE (be_valuetype)
-
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
deleted file mode 100644
index d17cbdd02f8..00000000000
--- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
+++ /dev/null
@@ -1,529 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_valuetype_fwd.h
-//
-// = DESCRIPTION
-//    Extension of class be_interface_fwd that provides additional
-//    means for C++ mapping of an valuetype.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale
-//    changed for valuetypes by Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#ifdef IDL_HAS_VALUETYPE
-
-ACE_RCSID(be, be_interface_fwd, "$Id$")
-
-/*
- * BE_ValuetypeFwd
- */
-
-
-be_valuetype_fwd::be_valuetype_fwd (void)
-{
-}
-
-be_valuetype_fwd::be_valuetype_fwd (AST_Interface *dummy,
-                                    UTL_ScopedName *n, UTL_StrList *p)
-  : be_interface_fwd (dummy, n, p),
-    AST_InterfaceFwd (dummy, n, p),
-    AST_Decl (AST_Decl::NT_interface_fwd, n, p)
-{
-}
-
-be_valuetype_fwd::~be_valuetype_fwd (void)
-{
-}
-
-
-void
-be_valuetype_fwd::set_abstract_valuetype ()
-{
-  this->full_definition()->set_abstract_valuetype();
-}
-
-// generate the var definition
-int
-be_valuetype_fwd::gen_var_defn (void)
-{
-  ACE_ASSERT (0);
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // names
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_var", this->local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the var definition (always in the client header).
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ch->indent (); // start with whatever was our current indent level
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // default constr
-  *ch << namebuf << " (void); // default constructor" << nl;
-  *ch << namebuf << " (" << local_name () << "_ptr);" << nl;
-
-  // copy constructor
-  *ch << namebuf << " (const " << namebuf <<
-    " &); // copy constructor" << nl;
-
-  // destructor
-  *ch << "~" << namebuf << " (void); // destructor" << nl;
-  *ch << nl;
-
-  // assignment operator from a pointer
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-
-  // assignment from _var
-  *ch << namebuf << " &operator= (const " << namebuf <<
-    " &);" << nl;
-
-  // arrow operator
-  *ch << local_name () << "_ptr operator-> (void) const;" << nl;
-
-  *ch << nl;
-
-  // other extra types (cast operators, [] operator, and others)
-  *ch << "operator const " << local_name () << "_ptr &() const;" << nl;
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-
-  *ch << "// in, inout, out, _retn " << nl;
-  // the return types of in, out, inout, and _retn are based on the parameter
-  // passing rules and the base type
-  *ch << local_name () << "_ptr in (void) const;" << nl;
-  *ch << local_name () << "_ptr &inout (void);" << nl;
-  *ch << local_name () << "_ptr &out (void);" << nl;
-  *ch << local_name () << "_ptr _retn (void);" << nl;
-
-  // generate an additional member function that returns the underlying pointer
-  *ch << local_name () << "_ptr ptr (void) const;\n";
-
-  *ch << "\n";
-  ch->decr_indent ();
-
-  // private
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-// implementation of the _var class. All of these get generated in the inline
-// file
-int
-be_valuetype_fwd::gen_var_impl (void)
-{
-  ACE_ASSERT (0);
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _var names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_var", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_var", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-  // default constr
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname <<
-    " (void) // default constructor" << nl;
-  *ci << "  " << ": ptr_ (" << this->name () << "::_nil ())" << nl;
-  *ci << "{}\n\n";
-
-  // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{}\n\n";
-
-  // the additional ptr () member function. This member function must be
-  // defined before the remaining member functions including the copy
-  // constructor because this inline function is used elsewhere. Hence to make
-  // inlining of this function possible, we must define it before its use.
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::ptr (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (" << name () << "::_duplicate (p.ptr ()))" << nl;
-  *ci << "{}\n\n";
-
-  // destructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::~" << lname << " (void) // destructor" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "if (this != &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << name () << "::_duplicate (p.ptr ());\n";
-  ci->decr_indent ();
-  *ci << "}" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator const " << name () <<
-    "_ptr &() const // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << name () << "_ptr &() // cast " << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // in, inout, out, and _retn
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr" << nl;
-  *ci << fname << "::in (void) const" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::inout (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr &" << nl;
-  *ci << fname << "::out (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  ci->indent ();
-  *ci << "ACE_INLINE " << name () << "_ptr " << nl;
-  *ci << fname << "::_retn (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "// yield ownership of managed obj reference" << nl;
-  *ci << this->name () << "_ptr val = this->ptr_;" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();" << nl;
-  *ci << "return val;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-// generate the _out definition
-int
-be_valuetype_fwd::gen_out_defn (void)
-{
-  ACE_ASSERT (0);
-  TAO_OutStream *ch; // output stream
-  TAO_NL  nl;        // end line
-  char namebuf [NAMEBUFSIZE];  // to hold the _out name
-
-  ACE_OS::memset (namebuf, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (namebuf, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ch = cg->client_header ();
-
-  // generate the out definition (always in the client header)
-  ch->indent (); // start with whatever was our current indent level
-
-  *ch << "class " << idl_global->export_macro ()
-      << " " << namebuf << nl;
-  *ch << "{" << nl;
-  *ch << "public:\n";
-  ch->incr_indent ();
-
-  // No default constructor
-
-  // constructor from a pointer
-  *ch << namebuf << " (" << local_name () << "_ptr &);" << nl;
-  // constructor from a _var &
-  *ch << namebuf << " (" << local_name () << "_var &);" << nl;
-  // constructor from a _out &
-  *ch << namebuf << " (const " << namebuf << " &);" << nl;
-  // assignment operator from a _out &
-  *ch << namebuf << " &operator= (const " << namebuf << " &);" << nl;
-  // assignment operator from a pointer &, cast operator, ptr fn, operator
-  // -> and any other extra operators
-  // only valuetype allows assignment from var &
-  *ch << namebuf << " &operator= (const " << local_name () << "_var &);" << nl;
-  *ch << namebuf << " &operator= (" << local_name () << "_ptr);" << nl;
-  // cast
-  *ch << "operator " << local_name () << "_ptr &();" << nl;
-  // ptr fn
-  *ch << local_name () << "_ptr &ptr (void);" << nl;
-  // operator ->
-  *ch << local_name () << "_ptr operator-> (void);" << nl;
-
-  *ch << "\n";
-  ch->decr_indent ();
-  *ch << "private:\n";
-  ch->incr_indent ();
-  *ch << local_name () << "_ptr &ptr_;\n";
-
-  ch->decr_indent ();
-  *ch << "};\n\n";
-
-  return 0;
-}
-
-int
-be_valuetype_fwd::gen_out_impl (void)
-{
-  ACE_ASSERT (0);
-  TAO_OutStream *ci; // output stream
-  TAO_NL  nl;        // end line
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_out", this->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_out", local_name ()->get_string ());
-
-  // retrieve a singleton instance of the code generator
-  TAO_CodeGen *cg = TAO_CODEGEN::instance ();
-
-  ci = cg->client_inline ();
-
-  // generate the var implementation in the inline file
-  // Depending upon the data type, there are some differences which we account
-  // for over here.
-
-  ci->indent (); // start with whatever was our current indent level
-
-  *ci << "// *************************************************************"
-      << nl;
-  *ci << "// Inline operations for class " << fname << nl;
-  *ci << "// *************************************************************\n\n";
-
-      // constr from a _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << name () << "_ptr &p)" << nl;
-  *ci << "  : ptr_ (p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // constructor from _var &
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (" << this->name () <<
-    "_var &p) // constructor from _var" << nl;
-  *ci << "  : ptr_ (p.out ())" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "CORBA::release (this->ptr_);" << nl;
-  *ci << "this->ptr_ = " << this->name () << "::_nil ();\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // copy constructor
-  ci->indent ();
-  *ci << "ACE_INLINE" << nl;
-  *ci << fname << "::" << lname << " (const " << fname <<
-    " &p) // copy constructor" << nl;
-  *ci << "  : ptr_ (ACE_const_cast (" << fname
-      << "&,p).ptr_)" << nl;
-  *ci << "{}\n\n";
-
-      // assignment operator from _out &
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << fname <<
-    " &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = ACE_const_cast (" << fname << "&,p).ptr_;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _var
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (const " << this->name () <<
-    "_var &p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = " << this->name () << "::_duplicate (p.ptr ());" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // assignment operator from _ptr
-  ci->indent ();
-  *ci << "ACE_INLINE " << fname << " &" << nl;
-  *ci << fname << "::operator= (" << this->name () <<
-    "_ptr p)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "this->ptr_ = p;" << nl;
-  *ci << "return *this;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // other extra methods - cast operator ()
-  ci->indent ();
-  *ci << "ACE_INLINE " << nl;
-  *ci << fname << "::operator " << this->name () <<
-    "_ptr &() // cast" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  // ptr function
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr &" << nl;
-  *ci << fname << "::ptr (void) // ptr" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-      // operator->
-  ci->indent ();
-  *ci << "ACE_INLINE " << this->name () << "_ptr " << nl;
-  *ci << fname << "::operator-> (void)" << nl;
-  *ci << "{\n";
-  ci->incr_indent ();
-  *ci << "return this->ptr_;\n";
-  ci->decr_indent ();
-  *ci << "}\n\n";
-
-  return 0;
-}
-
-int
-be_valuetype_fwd::accept (be_visitor *visitor)
-{
-  return visitor->visit_valuetype_fwd (this);
-}
-
-// Narrowing
-IMPL_NARROW_METHODS1 (be_valuetype_fwd, be_interface_fwd)
-IMPL_NARROW_FROM_DECL (be_valuetype_fwd)
-
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index 44376118d82..a04b1c4c33f 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -72,18 +72,6 @@ int be_visitor::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-int be_visitor::visit_valuetype (be_valuetype *)
-{
-  return 0;
-}
-
-int be_visitor::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  return 0;
-}
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor::visit_structure (be_structure *)
 {
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 69e658134da..dadb0375cb8 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -176,47 +176,47 @@ int be_visitor_args_arglist::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          *os << "const " << this->type_name (node) << " &";
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << this->type_name (node) << " &";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  *os << "const " << this->type_name (node) << " &";
+	  break;
+	case AST_Argument::dir_INOUT:
+	  *os << this->type_name (node) << " &";
+	  break;
+	case AST_Argument::dir_OUT:
+	  *os << this->type_name (node, "_out");
+	  break;
+	} // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          *os << this->type_name (node, "_ptr");
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << this->type_name (node, "_ptr") << " &";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  *os << this->type_name (node, "_ptr");
+	  break;
+	case AST_Argument::dir_INOUT:
+	  *os << this->type_name (node, "_ptr") << " &";
+	  break;
+	case AST_Argument::dir_OUT:
+	  *os << this->type_name (node, "_out");
+	  break;
+	} // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          *os << this->type_name (node);
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << this->type_name (node) << " &";
-          break;
-        case AST_Argument::dir_OUT:
-          *os << this->type_name (node, "_out");
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  *os << this->type_name (node);
+	  break;
+	case AST_Argument::dir_INOUT:
+	  *os << this->type_name (node) << " &";
+	  break;
+	case AST_Argument::dir_OUT:
+	  *os << this->type_name (node, "_out");
+	  break;
+	} // end switch direction
     } // end of else
 
   return 0;
@@ -312,46 +312,3 @@ int be_visitor_args_arglist::visit_typedef (be_typedef *node)
   this->ctx_->alias (0);
   return 0;
 }
-
-
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_args_arglist::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << this->type_name (node) << " *";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " *&";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_arglist::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get the stream
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      *os << "const " << this->type_name (node) << " *";
-      break;
-    case AST_Argument::dir_INOUT:
-      *os << this->type_name (node) << " *&";
-      break;
-    case AST_Argument::dir_OUT:
-      *os << this->type_name (node, "_out");
-      break;
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
index e8105746d40..17444de85af 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_cs.cpp
@@ -151,12 +151,12 @@ int be_visitor_args_compiled_marshal_cs::visit_array (be_array *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-          *os << node->name () << "_forany ("
+          *os << node->name () << "_forany (" 
               << "(" << node->name () << "_slice *)"
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_INOUT:
-          *os << node->name () << "_forany ("
+          *os << node->name () << "_forany (" 
               << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
@@ -170,16 +170,19 @@ int be_visitor_args_compiled_marshal_cs::visit_array (be_array *node)
         case AST_Argument::dir_IN:
           break;
         case AST_Argument::dir_INOUT:
-          *os << "_tao_argument_" << arg->local_name ();
+          *os << node->name () << "_forany (" 
+              << arg->local_name () << ")";
           break;
         case AST_Argument::dir_OUT:
           if (node->size_type () == be_decl::VARIABLE)
             {
-              *os << "_tao_argument_" << arg->local_name ();
+              *os << node->name () << "_forany (" 
+                  << arg->local_name () << ".ptr ())";
             }
           else
             {
-              *os << "_tao_argument_" << arg->local_name ();
+              *os << node->name () << "_forany (" 
+                  << arg->local_name () << ")";
             }
           break;
         }
@@ -322,97 +325,6 @@ int be_visitor_args_compiled_marshal_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_args_compiled_marshal_cs::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        }
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
-          *os << arg->local_name () << ".ptr ()";
-          break;
-        }
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_compiled_marshal_cs::"
-                         "visit_valuetype - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_visitor_args_compiled_marshal_cs::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        }
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
-          *os << arg->local_name () << ".ptr ()";
-          break;
-        }
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_compiled_marshal_cs::"
-                         "visit_valuetype - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_compiled_marshal_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -470,41 +382,8 @@ int be_visitor_args_compiled_marshal_cs::visit_predefined_type (be_predefined_ty
         case AST_Argument::dir_IN:
           break;
         case AST_Argument::dir_INOUT:
-          switch (node->pt ())
-            {
-            case AST_PredefinedType::PT_pseudo:
-            case AST_PredefinedType::PT_any:
-            case AST_PredefinedType::PT_long:
-            case AST_PredefinedType::PT_ulong:
-            case AST_PredefinedType::PT_longlong:
-            case AST_PredefinedType::PT_ulonglong:
-            case AST_PredefinedType::PT_short:
-            case AST_PredefinedType::PT_ushort:
-            case AST_PredefinedType::PT_float:
-            case AST_PredefinedType::PT_double:
-            case AST_PredefinedType::PT_longdouble:
-              *os << arg->local_name ();
-              break;
-            case AST_PredefinedType::PT_char:
-              *os << "CORBA::Any::to_char (" << arg->local_name () << ")";
-              break;
-            case AST_PredefinedType::PT_wchar:
-              *os << "CORBA::Any::to_wchar (" << arg->local_name () << ")";
-              break;
-            case AST_PredefinedType::PT_boolean:
-              *os << "CORBA::Any::to_boolean (" << arg->local_name () << ")";
-              break;
-            case AST_PredefinedType::PT_octet:
-              *os << "CORBA::Any::to_octet (" << arg->local_name () << ")";
-              break;
-            default:
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_operation_rettype_compiled_marshal_cs::"
-                                 "visit_array - "
-                                 "Bad predefined type\n"),
-                                -1);
-            }
-           break;
+          *os << arg->local_name ();
+          break;
         case AST_Argument::dir_OUT:
           switch (node->pt ())
             {
@@ -645,14 +524,14 @@ int be_visitor_args_compiled_marshal_cs::visit_string (be_string *node)
             case AST_Argument::dir_IN:
               break;
             case AST_Argument::dir_INOUT:
-              *os << "CORBA::Any::to_string ("
+              *os << "CORBA::Any::to_string (" 
                   << arg->local_name () << ", "
-                  << node->max_size ()->ev ()->u.ulval - 1 << ")";
+                  << node->max_size ()->ev ()->u.ulval << ")";
               break;
             case AST_Argument::dir_OUT:
-              *os << "CORBA::Any::to_string ("
+              *os << "CORBA::Any::to_string (" 
                   << arg->local_name () << ".ptr (), "
-                  << node->max_size ()->ev ()->u.ulval - 1 << ")";
+                  << node->max_size ()->ev ()->u.ulval << ")";
               break;
             }
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
index ec62bea1481..0b49ff7edd2 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/compiled_marshal_ss.cpp
@@ -151,21 +151,13 @@ int be_visitor_args_compiled_marshal_ss::visit_array (be_array *node)
       switch (this->direction ())
         {
         case AST_Argument::dir_IN:
-#if 0
-          *os << node->name () << "_forany ("
+          *os << node->name () << "_forany (" 
               << "(" << node->name () << "_slice *)"
               << arg->local_name () << ")";
-#else
-          *os << "_tao_forany_" << arg->local_name ();
-#endif
           break;
         case AST_Argument::dir_INOUT:
-#if 0
-          *os << node->name () << "_forany ("
+          *os << node->name () << "_forany (" 
               << arg->local_name () << ")";
-#else
-          *os << "_tao_forany_" << arg->local_name ();
-#endif
           break;
         case AST_Argument::dir_OUT:
           break;
@@ -178,29 +170,21 @@ int be_visitor_args_compiled_marshal_ss::visit_array (be_array *node)
         case AST_Argument::dir_IN:
           break;
         case AST_Argument::dir_INOUT:
-#if 0
-          *os << node->name () << "_forany ("
+          *os << node->name () << "_forany (" 
               << arg->local_name () << ")";
-#else
-          *os << "_tao_forany_" << arg->local_name ();
-#endif
           break;
         case AST_Argument::dir_OUT:
-#if 0
           if (node->size_type () == be_decl::VARIABLE)
             {
-              *os << node->name () << "_forany ("
+              *os << node->name () << "_forany (" 
                   << "(" << node->name () << "_slice *)"
                   << arg->local_name () << ".in ())";
             }
           else
             {
-              *os << node->name () << "_forany ("
+              *os << node->name () << "_forany (" 
                   << arg->local_name () << ")";
             }
-#else
-          *os << "_tao_forany_" << arg->local_name ();
-#endif
           break;
         }
     }
@@ -338,92 +322,6 @@ int be_visitor_args_compiled_marshal_ss::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_args_compiled_marshal_ss::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name () << ".out ()";
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        }
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
-          *os << arg->local_name () << ".in ()";
-          break;
-        }
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_compiled_marshal_ss::"
-                         "visit_valuetype - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int be_visitor_args_compiled_marshal_ss::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-          *os << arg->local_name () << "out ()";
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        }
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
-          *os << arg->local_name () << ".in ()";
-          break;
-        }
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_compiled_marshal_ss::"
-                         "visit_valuetype_fwd - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_compiled_marshal_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -639,7 +537,7 @@ int be_visitor_args_compiled_marshal_ss::visit_string (be_string *node)
             {
               *os << "CORBA::Any::to_string ("
                   << arg->local_name () << ".out (), "
-                  << node->max_size ()->ev ()->u.ulval - 1
+                  << node->max_size ()->ev ()->u.ulval
                   << ")";
             }
           break;
@@ -672,9 +570,9 @@ int be_visitor_args_compiled_marshal_ss::visit_string (be_string *node)
               break;
             case AST_Argument::dir_INOUT:
             case AST_Argument::dir_OUT:
-              *os << "CORBA::Any::from_string ((char *)"
+              *os << "CORBA::Any::from_string ((char *)" 
                   << arg->local_name () << ".in (), "
-                  << node->max_size ()->ev ()->u.ulval - 1 << ")";
+                  << node->max_size ()->ev ()->u.ulval << ")";
               break;
             }
         }
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index 95b5bb3563b..3d76e31f5ec 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -80,7 +80,7 @@ int be_visitor_args_marshal_ss::visit_array (be_array *node)
     case AST_Argument::dir_IN:
     case AST_Argument::dir_INOUT:
       os->indent ();
-      *os << "_tao_forany_" << arg->local_name ();
+      *os << arg->local_name ();
       break;
     case AST_Argument::dir_OUT:
       os->indent ();
@@ -159,43 +159,43 @@ int be_visitor_args_marshal_ss::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
           os->indent ();
           *os << "&" << arg->local_name ();
-          break;
-        case AST_Argument::dir_OUT:
+	  break;
+	case AST_Argument::dir_OUT:
           os->indent ();
           //          *os << "_tao_ptr_" << arg->local_name ();
           *os << "&" << arg->local_name () << ".inout ()";
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
+	case AST_Argument::dir_OUT:
           os->indent ();
           //          *os << "&_tao_ptr_" << arg->local_name ();
           *os << "&" << arg->local_name () << ".inout ()";
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
+	case AST_Argument::dir_OUT:
           os->indent ();
           *os << "&" << arg->local_name ();
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end of else
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
index 248523c8d3d..e3deb5a070e 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_compiled_cs.cpp
@@ -120,56 +120,6 @@ be_visitor_args_post_docall_compiled_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_args_post_docall_compiled_cs::visit_valuetype (be_valuetype *)
-{
-  // we must narrow the out object reference to the appropriate type
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_INOUT:
-      {
-        os->indent ();
-        *os << "CORBA::remove_ref (" << arg->local_name ()
-            << ");\n";
-      }
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_args_post_docall_compiled_cs::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  // we must narrow the out object reference to the appropriate type
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_INOUT:
-      {
-        os->indent ();
-        *os << "CORBA::remove_ref (" << arg->local_name ()
-            << ");\n";
-      }
-      break;
-    default:
-      break;
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_args_post_docall_compiled_cs::visit_string (be_string *)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp
index 9aa12d3295c..759051aa376 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_docall_cs.cpp
@@ -85,13 +85,12 @@ be_visitor_args_post_docall_cs::visit_interface (be_interface *node)
   switch (this->direction ())
     {
     case AST_Argument::dir_INOUT:
-    case AST_Argument::dir_OUT:
       {
         os->indent ();
         // assign the narrowed obj reference
         *os << arg->local_name () << " = " << node->name ()
             << "::_narrow (_tao_base_" << arg->local_name ()
-            << ", ACE_TRY_ENV);" << be_nl;
+            << ", _tao_environment);" << be_nl;
         *os << "CORBA::release (_tao_base_" << arg->local_name ()
             << ");\n";
       }
@@ -118,7 +117,7 @@ be_visitor_args_post_docall_cs::visit_interface_fwd (be_interface_fwd *node)
         // assign the narrowed obj reference
         *os << arg->local_name () << " = " << node->name ()
             << "::_narrow (_tao_base_" << arg->local_name ()
-            << ", ACE_TRY_ENV);" << be_nl;
+            << ", _tao_environment);" << be_nl;
         *os << "CORBA::release (_tao_base_" << arg->local_name ()
             << ");\n";
       }
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
index caa7a684efa..3a929ecf0db 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
@@ -110,8 +110,8 @@ int be_visitor_args_post_upcall_ss::visit_interface (be_interface *)
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << "_tao_base_var_" << arg->local_name ()
-          << " = CORBA::Object::_duplicate ("
-          << arg->local_name () << ".in ());\n";
+	  << " = CORBA::Object::_duplicate ("
+	  << arg->local_name () << ".in ());\n";
       break;
     }
   return 0;
@@ -130,8 +130,8 @@ int be_visitor_args_post_upcall_ss::visit_interface_fwd (be_interface_fwd *)
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << "_tao_base_var_" << arg->local_name ()
-          << " = CORBA::Object::_duplicate ("
-          << arg->local_name () << ".in ());\n";
+	  << " = CORBA::Object::_duplicate ("
+	  << arg->local_name () << ".in ());\n";
       break;
     }
   return 0;
@@ -143,38 +143,38 @@ int be_visitor_args_post_upcall_ss::visit_predefined_type (be_predefined_type *n
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  break;
+	case AST_Argument::dir_INOUT:
+	  break;
+	case AST_Argument::dir_OUT:
+	  break;
+	} // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  break;
+	case AST_Argument::dir_INOUT:
+	  break;
+	case AST_Argument::dir_OUT:
+	  break;
+	} // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-          break;
-        case AST_Argument::dir_INOUT:
-          break;
-        case AST_Argument::dir_OUT:
-          break;
-        } // end switch direction
+	{
+	case AST_Argument::dir_IN:
+	  break;
+	case AST_Argument::dir_INOUT:
+	  break;
+	case AST_Argument::dir_OUT:
+	  break;
+	} // end switch direction
     } // end of else
 
   return 0;
@@ -250,105 +250,3 @@ int be_visitor_args_post_upcall_ss::visit_typedef (be_typedef *node)
   this->ctx_->alias (0);
   return 0;
 }
-
-// ****************************************************************
-
-// ************************************************************************
-//  visitor for doing any post-processing after the upcall is made
-// ************************************************************************
-
-be_visitor_compiled_args_post_upcall::be_visitor_compiled_args_post_upcall (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_compiled_args_post_upcall::~be_visitor_compiled_args_post_upcall (void)
-{
-}
-
-int
-be_visitor_compiled_args_post_upcall::visit_operation (be_operation *node)
-{
-  return this->visit_scope (node);
-}
-
-int be_visitor_compiled_args_post_upcall::visit_argument (be_argument *node)
-{
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_compiled_args_post_upcall::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_compiled_args_post_upcall::"
-                         "visit_argument - "
-                         "cannot accept visitor\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int be_visitor_compiled_args_post_upcall::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg = this->ctx_->be_node_as_argument ();
-
-  // if the current type is an alias, use that
-  be_type *bt = node;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-
-  switch (arg->direction ())
-    {
-    case AST_Argument::dir_IN:
-      break;
-    case AST_Argument::dir_INOUT:
-      break;
-    case AST_Argument::dir_OUT:
-      if (node->size_type () == be_type::VARIABLE)
-        {
-          *os << bt->name () << "_forany _tao_forany_"
-              << arg->local_name () << " (" << be_idt << be_idt_nl
-              << arg->local_name () << ".inout ()" << be_uidt_nl
-              << ");\n" << be_uidt;
-        }
-      else
-        {
-          *os << bt->name () << "_forany _tao_forany_"
-              << arg->local_name () << " (" << be_idt << be_idt_nl
-              << arg->local_name () << be_uidt_nl
-              << ");\n" << be_uidt;
-        }
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_compiled_args_post_upcall::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_compiled_args_post_upcall::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp
index 9ab4133b028..7a1c822681f 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/pre_upcall_ss.cpp
@@ -92,7 +92,7 @@ int be_visitor_args_pre_upcall_ss::visit_interface (be_interface *node)
       os->indent ();
       *os << arg->local_name () << " = " << node->name ()
           << "::_narrow (_tao_base_var_" << arg->local_name ()
-          << ".in (), ACE_TRY_ENV);\n";
+          << ".in (), _tao_environment);\n";
       break;
     case AST_Argument::dir_OUT:
       break;
@@ -113,7 +113,7 @@ int be_visitor_args_pre_upcall_ss::visit_interface_fwd (be_interface_fwd *node)
       os->indent ();
       *os << arg->local_name () << " = " << node->name ()
           << "::_narrow (_tao_base_var_" << arg->local_name ()
-          << ".in (), ACE_TRY_ENv);\n";
+          << ".in (), _tao_environment);\n";
       break;
     case AST_Argument::dir_OUT:
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 57702ecd178..641501cc9a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -182,79 +182,6 @@ int be_visitor_args_upcall_ss::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_args_upcall_ss::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".in ()";
-      break;
-    case AST_Argument::dir_INOUT:
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".inout ()";
-      break;
-    case AST_Argument::dir_OUT:
-      //      *os << arg->local_name ();
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".out ()";
-      break;
-    }
-  return 0;
-}
-
-int be_visitor_args_upcall_ss::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  os->indent ();
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".in ()";
-      break;
-    case AST_Argument::dir_INOUT:
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".inout ()";
-      break;
-    case AST_Argument::dir_OUT:
-      //      *os << arg->local_name ();
-      if (this->ctx_->state ()
-          == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
-        *os << arg->local_name ();
-      else
-        *os << arg->local_name () << ".out ()";
-      break;
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
-
 int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -266,58 +193,58 @@ int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
           *os << arg->local_name ();
           break;
-        case AST_Argument::dir_OUT:
+	case AST_Argument::dir_OUT:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".out ()";
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
+	{
+	case AST_Argument::dir_IN:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".in ()";
-          break;
-        case AST_Argument::dir_INOUT:
+	  break;
+	case AST_Argument::dir_INOUT:
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".inout ()";
-          break;
-        case AST_Argument::dir_OUT:
+	  break;
+	case AST_Argument::dir_OUT:
           //          *os << arg->local_name ();
           if (this->ctx_->state ()
               == TAO_CodeGen::TAO_ARGUMENT_COLLOCATED_UPCALL_SS)
             *os << arg->local_name ();
           else
             *os << arg->local_name () << ".out ()";
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
+	case AST_Argument::dir_OUT:
           *os << arg->local_name ();
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end of else
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index 22992468549..91c67e64215 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -86,25 +86,25 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node)
     case AST_Argument::dir_IN:
     case AST_Argument::dir_INOUT:
       os->indent ();
-      *os << bt->name () << " " << arg->local_name () << ";" << be_nl
-          << bt->name () << "_forany _tao_forany_"
-          << arg->local_name () << " (" << be_idt << be_idt_nl
-          << arg->local_name () << be_uidt_nl
-          << ");\n" << be_uidt;
+      *os << bt->name () << " " << arg->local_name () << ";\n";
       break;
-
     case AST_Argument::dir_OUT:
       os->indent ();
       if (node->size_type () == be_type::VARIABLE)
         {
-          *os << bt->name () << "_var " << arg->local_name ()
-              << ";\n\n";
+#if 0 /* ASG */
+          *os << bt->name () << "_var _tao_var_"
+	      << arg->local_name () << ";" << be_nl;
+          *os << bt->name () << "_slice *&_tao_ptr_" << arg->local_name ()
+              << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
+          *os << bt->name () << "_out " << arg->local_name ()
+              << " (_tao_ptr_" << arg->local_name () << ");\n";
+#endif
+          *os << bt->name () << "_var "
+	      << arg->local_name () << ";\n";
         }
       else
-        {
-          *os << bt->name () << " " << arg->local_name ()
-              << ";\n\n";
-        }
+        *os << bt->name () << " " << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -166,16 +166,16 @@ int be_visitor_args_vardecl_ss::visit_interface (be_interface *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_ptr _tao_base_ptr_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_var_" << arg->local_name () << ".out ());\n";
 #endif
       *os << bt->name () << "_var "
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_var _tao_base_var_"
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -213,36 +213,21 @@ int be_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_ptr _tao_base_ptr_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_var_" << arg->local_name () << ".out ());\n";
 #endif
       *os << bt->name () << "_var "
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "CORBA::Object_var _tao_base_var_"
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     }
   return 0;
 }
 
-
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_args_vardecl_ss::visit_valuetype (be_valuetype *node)
-{
-  return -1;
-}
-
-int be_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  return -1;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -259,31 +244,31 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
   if (node->pt () == AST_PredefinedType::PT_any)
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
           os->indent ();
           *os << bt->name () << " " << arg->local_name () << ";\n";
-          break;
-        case AST_Argument::dir_OUT:
+	  break;
+	case AST_Argument::dir_OUT:
           os->indent ();
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-              << arg->local_name () << ";" << be_nl;
+	      << arg->local_name () << ";" << be_nl;
           *os << bt->name () << "_ptr &_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-              << arg->local_name () << ";\n";
-          break;
-        } // end switch direction
+	      << arg->local_name () << ";\n";
+	  break;
+	} // end switch direction
     } // end of if
   else if (node->pt () == AST_PredefinedType::PT_pseudo) // e.g., CORBA::Object
     {
       switch (this->direction ())
-        {
+	{
         case AST_Argument::dir_IN:
         case AST_Argument::dir_INOUT:
           os->indent ();
@@ -300,28 +285,28 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
           os->indent ();
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-              << arg->local_name () << ";" << be_nl;
+	      << arg->local_name () << ";" << be_nl;
           *os << bt->name () << "_ptr &_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");" << be_nl;
 #endif
           *os << bt->name () << "_var "
-              << arg->local_name () << ";\n";
+	      << arg->local_name () << ";\n";
           break;
-        } // end switch direction
+	} // end switch direction
     } // end else if
   else // simple predefined types
     {
       switch (this->direction ())
-        {
-        case AST_Argument::dir_IN:
-        case AST_Argument::dir_INOUT:
-        case AST_Argument::dir_OUT:
+	{
+	case AST_Argument::dir_IN:
+	case AST_Argument::dir_INOUT:
+	case AST_Argument::dir_OUT:
           os->indent ();
           *os << bt->name () << " " << arg->local_name () << ";\n";
-          break;
-        } // end switch direction
+	  break;
+	} // end switch direction
     } // end of else
 
   return 0;
@@ -350,14 +335,14 @@ int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node)
       os->indent ();
 #if 0 /* ASG */
       *os << bt->name () << "_var _tao_var_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
           << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
       *os << bt->name () << "_out " << arg->local_name ()
           << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
       *os << bt->name () << "_var "
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       break;
     }
   return 0;
@@ -376,25 +361,25 @@ int be_visitor_args_vardecl_ss::visit_string (be_string *)
       os->indent ();
 #if 0 /* ASG */
       *os << "CORBA::String_var _tao_var_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "char *&" << arg->local_name () << " = _tao_var_"
           << arg->local_name () << ".out ();" << be_nl;
 #endif
       *os << "CORBA::String_var "
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     case AST_Argument::dir_OUT:
       os->indent ();
 #if 0 /* ASG */
       *os << "CORBA::String_var _tao_var_"
-          << arg->local_name () << ";" << be_nl;
+	  << arg->local_name () << ";" << be_nl;
       *os << "char *&_tao_ptr_" << arg->local_name () << " = _tao_var_"
           << arg->local_name () << ".out ();" << be_nl;
       *os << "CORBA::String_out " << arg->local_name ()
           << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
       *os << "CORBA::String_var "
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -426,14 +411,14 @@ int be_visitor_args_vardecl_ss::visit_structure (be_structure *node)
         {
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-              << arg->local_name () << ";" << be_nl;
+	      << arg->local_name () << ";" << be_nl;
           *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-              << arg->local_name () << ";\n";
+	      << arg->local_name () << ";\n";
         }
       else
         *os << bt->name () << " " << arg->local_name () << ";\n";
@@ -468,14 +453,14 @@ int be_visitor_args_vardecl_ss::visit_union (be_union *node)
         {
 #if 0 /* ASG */
           *os << bt->name () << "_var _tao_var_"
-              << arg->local_name () << ";" << be_nl;
+	      << arg->local_name () << ";" << be_nl;
           *os << bt->name () << " *&_tao_ptr_" << arg->local_name ()
               << " = _tao_var_" << arg->local_name () << ".out ();" << be_nl;
           *os << bt->name () << "_out " << arg->local_name ()
               << " (_tao_ptr_" << arg->local_name () << ");\n";
 #endif
           *os << bt->name () << "_var "
-              << arg->local_name () << ";\n";
+	      << arg->local_name () << ";\n";
 
         }
       else
@@ -539,7 +524,7 @@ int be_compiled_visitor_args_vardecl_ss::visit_interface (be_interface *node)
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << bt->name () << "_var "
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     }
   return 0;
@@ -567,70 +552,9 @@ int be_compiled_visitor_args_vardecl_ss::visit_interface_fwd (be_interface_fwd *
     case AST_Argument::dir_OUT:
       os->indent ();
       *os << bt->name () << "_var "
-          << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-
-#ifdef IDL_HAS_VALUETYPE
-
-int be_compiled_visitor_args_vardecl_ss::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << "_var " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << bt->name () << "_var "
-          << arg->local_name () << ";\n";
-      break;
-    }
-  return 0;
-}
-
-int
-be_compiled_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-  be_argument *arg = this->ctx_->be_node_as_argument (); // get the argument
-                                                         // node
-  // if the current type is an alias, use that
-  be_type *bt;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  switch (this->direction ())
-    {
-    case AST_Argument::dir_IN:
-    case AST_Argument::dir_INOUT:
-      os->indent ();
-      *os << bt->name () << "_var " << arg->local_name () << ";\n";
-      break;
-    case AST_Argument::dir_OUT:
-      os->indent ();
-      *os << bt->name () << "_var "
-          << arg->local_name () << ";\n";
+	  << arg->local_name () << ";\n";
       break;
     }
   return 0;
 }
 
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 06584bc7ddb..4384d1d2471 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -57,30 +57,30 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
   *os << "void operator<<= (CORBA::Any &_tao_any, const "
       << node->name () << "_forany &_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "if (_tao_elem.nocopy ()) // no copy" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem.in (), 1, ACE_TRY_ENV); // consume it" << be_uidt_nl
+      << "_tao_elem.in (), 1, TAO_TRY_ENV); // consume it" << be_uidt_nl
       << "else // copy" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", " << node->name ()
-      << "_dup (_tao_elem.in ()), 1, ACE_TRY_ENV);" << be_uidt_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "_dup (_tao_elem.in ()), 1, TAO_TRY_ENV);" << be_uidt_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY {}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_CATCHANY {}" << be_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n\n";
 
   os->indent ();
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << "_forany &_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_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
-      << "ACE_TRY_CHECK;" << be_nl
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "if (_tao_any.any_owns_data ())" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = (" << node->name () << "_slice *)_tao_any.value ();"
@@ -91,25 +91,25 @@ be_visitor_array_any_op_cs::visit_array (be_array *node)
       << "{" << be_idt_nl
       << "_tao_elem.out () = " << node->name () << "_alloc ();" << be_nl
       << "if (!_tao_elem.in ()) return 0;" << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", _tao_elem.inout (), 0, ACE_TRY_ENV)" << be_nl
+      << ", _tao_elem.inout (), 0, TAO_TRY_ENV)" << be_nl
       << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
       << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", _tao_elem.inout (), 1, ACE_TRY_ENV);" << be_nl
+      << node->tc_name () << ", _tao_elem.inout (), 1, TAO_TRY_ENV);" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << node->name () << "_free (_tao_elem._retn ());" << be_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
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
index 520731d3a16..ee2d0ac34f7 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -293,13 +293,6 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         case TAO_CodeGen::TAO_CDR_OUTPUT:
           *os << " ((const char *)_tao_array.in (), ";
           break;
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
-                             "visit_predefined_type - "
-                             "bad substate in context\n"),
-                            -1);
         }
       break;
     default:
@@ -311,13 +304,6 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         case TAO_CodeGen::TAO_CDR_OUTPUT:
           *os << " (_tao_array.in (), ";
           break;
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
-                             "visit_predefined_type - "
-                             "bad substate in context\n"),
-                            -1);
         }
       break;
     }
@@ -502,13 +488,6 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
                 *os << ".out ()";
               }
           }
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
-                             "visit_predefined_type - "
-                             "bad node type\n"),
-                            -1);
         }
       if (bt->node_type () == AST_Decl::NT_array)
         {
@@ -555,13 +534,6 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
                 *os << ".in ()";
               }
           }
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_array_cdr_op_cs::"
-                             "visit_predefined_type - "
-                             "bad node type\n"),
-                            -1);
         }
       if (bt->node_type () == AST_Decl::NT_array)
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 719daab6d35..19c2f374eea 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -110,13 +110,6 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SI:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SI);
       break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "bad codegen state\n"),
-                        -1);
     }
 
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
@@ -189,13 +182,6 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
     case TAO_CodeGen::TAO_ATTRIBUTE_TIE_SI:
       ctx.state (TAO_CodeGen::TAO_OPERATION_TIE_SI);
       break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "bad codegen state\n"),
-                        -1);
     }
 
   visitor = tao_cg->make_visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index 279802dce72..0614d2cc1da 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -60,42 +60,42 @@ be_visitor_enum_any_op_cs::visit_enum (be_enum *node)
       << "ACE_NEW (_any_val, " << node->name ()
       << " (_tao_elem));" << be_nl
       << "if (!_any_val) return;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name ()
-      << ", _any_val, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << ", _any_val, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "// free allocated storage" << be_nl
       << "delete _any_val;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << " &_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_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
-      << "ACE_TRY_CHECK;" << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", &_tao_elem, 0, ACE_TRY_ENV)" << be_nl
+      << ", &_tao_elem, 0, TAO_TRY_ENV)" << be_nl
       << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "  return 1;" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
index fde3be596e2..254939b0378 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
@@ -53,7 +53,6 @@ be_visitor_enum_cs::visit_enum (be_enum *node)
       be_visitor *visitor;
       be_visitor_context ctx (*this->ctx_);
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-      ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 48500f83e6e..2170bdca554 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -59,41 +59,41 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << node->name () << " *_tao_any_val = new " << node->name ()
       << " (_tao_elem);" << be_nl
       << "if (!_tao_any_val) return;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", _tao_any_val, "
-      << "1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY " << be_nl
+      << "TAO_CATCHANY " << be_nl
       << "{" << be_idt_nl
       << "delete _tao_any_val;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "void operator<<= (CORBA::Any &_tao_any, "
       << node->name () << " *_tao_elem) // non copying" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem, 1, ACE_TRY_ENV); // consume it" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "_tao_elem, 1, TAO_TRY_ENV); // consume it" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY {}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_CATCHANY {}" << be_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << " *&_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_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
-      << "ACE_TRY_CHECK;" << be_nl
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "if (_tao_any.any_owns_data ())" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = (" << node->name () << " *)_tao_any.value ();"
@@ -104,15 +104,15 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "{" << be_idt_nl
       << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);"
       << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", _tao_elem, 0, ACE_TRY_ENV)" << be_nl
+      << ", _tao_elem, 0, TAO_TRY_ENV)" << be_nl
       << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
       << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", _tao_elem, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << node->tc_name () << ", _tao_elem, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // decode failed
@@ -121,12 +121,12 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "}" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_elem;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
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 b724b9d6e7b..855abbc721d 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -68,18 +68,6 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
       *os << "{" << be_nl
 	  << "public:\n";
       os->incr_indent ();
-
-      // generate code for field members
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_exception_ch::"
-                             "visit_exception - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      *os << be_nl;
-
       // constructors and destructor
       *os << node->local_name () << " (void); // default ctor" << be_nl;
       *os << node->local_name () << " (const " << node->local_name ()
@@ -114,6 +102,14 @@ int be_visitor_exception_ch::visit_exception (be_exception *node)
           delete visitor;
         }
 
+      // generate code for field members
+      if (this->visit_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_exception_ch::"
+                             "visit_exception - "
+                             "codegen for scope failed\n"), -1);
+        }
 
       *os << be_nl
 	  << "// = TAO extension" << be_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 3d78fa5387b..17aa786ba9f 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -193,7 +193,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       // based on the command line options. This is still TO-DO
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-      ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
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 7793cbff63c..e264ed29f93 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -56,7 +56,6 @@ int be_visitor_exception_ctor::visit_exception (be_exception *node)
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
   this->ctx_->node (node); // save the argument node
 
-  os->indent ();
   if (this->ctx_->state () == TAO_CodeGen::TAO_EXCEPTION_CTOR_CH)
     *os << node->local_name ();
   else
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index ad2de24a08e..51ed3ffd836 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 // individual visitors included only here
 #include "be_visitor_factory.h"
@@ -35,8 +35,6 @@
 #include "be_visitor_field.h"
 #include "be_visitor_interface.h"
 #include "be_visitor_interface_fwd.h"
-#include "be_visitor_valuetype.h"
-#include "be_visitor_valuetype_fwd.h"
 #include "be_visitor_module.h"
 #include "be_visitor_operation.h"
 #include "be_visitor_root.h"
@@ -84,6 +82,7 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
   // created context is a copy of what was sent by the caller. The newly
   // created visitor will own this new copy.
   be_visitor_context *new_ctx = new be_visitor_context (*ctx);
+
   switch (st)
     {
     case TAO_CodeGen::TAO_ROOT_CH:
@@ -183,48 +182,6 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_INTERFACE_FWD_CDR_OP_CI:
       return new be_visitor_interface_fwd_cdr_op_ci (new_ctx);
 
-#   ifdef IDL_HAS_VALUETYPE
-
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      return new be_visitor_valuetype_ch (new_ctx);
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      return new be_visitor_valuetype_cs (new_ctx);
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-      return new be_visitor_valuetype_ci (new_ctx);
-
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-      return new be_visitor_valuetype_obv_ch (new_ctx);
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-      return new be_visitor_decl (new_ctx);  //  currently NO-OP
-      //return new be_visitor_valuetype_obv_ci (new_ctx);
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-      return new be_visitor_valuetype_obv_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_FIELD_OBV_CH:
-      return new be_visitor_valuetype_field_ch (new_ctx);
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OBV_CH:
-    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
-    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
-    //case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
-      return new be_visitor_obv_operation_arglist (new_ctx);
-
-    case TAO_CodeGen::TAO_MODULE_OBV_CH:
-    case TAO_CodeGen::TAO_MODULE_OBV_CI:
-    case TAO_CodeGen::TAO_MODULE_OBV_CS:
-      return new be_visitor_obv_module (new_ctx);
-
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-      return new be_visitor_valuetype_cdr_op_ch (new_ctx);
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-      return new be_visitor_valuetype_cdr_op_cs (new_ctx);
-
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-      return new be_visitor_decl (new_ctx);  // is TODO
-
-#   endif /* IDL_HAS_VALUETYPE */
-
     case TAO_CodeGen::TAO_STRUCT_CH:
       return new be_visitor_structure_ch (new_ctx);
     case TAO_CodeGen::TAO_STRUCT_CS:
@@ -298,7 +255,7 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
     case TAO_CodeGen::TAO_UNION_ANY_OP_CH:
       return new be_visitor_union_any_op_ch (new_ctx);
     case TAO_CodeGen::TAO_UNION_ANY_OP_CS:
-      break;
+      return new be_visitor_union_any_op_cs (new_ctx);
     case TAO_CodeGen::TAO_UNION_CDR_OP_CH:
       return new be_visitor_union_cdr_op_ch (new_ctx);
     case TAO_CodeGen::TAO_UNION_CDR_OP_CS:
@@ -416,7 +373,6 @@ TAO_Common_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       delete new_ctx;
       return 0;
     }
-  return 0;
 }
 
 // The concrete visitor factory for operation visitors  generating interpretive
@@ -442,9 +398,6 @@ TAO_Interpretive_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
   switch (st)
     {
-    case TAO_CodeGen::TAO_UNION_ANY_OP_CS:
-      return new be_visitor_union_any_op_interpretive_cs (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_CH:
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
@@ -565,9 +518,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
 
   switch (st)
     {
-    case TAO_CodeGen::TAO_UNION_ANY_OP_CS:
-      return new be_visitor_union_any_op_compiled_cs (new_ctx);
-
     case TAO_CodeGen::TAO_OPERATION_CH:
       return new be_visitor_operation_ch (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_CS:
@@ -576,10 +526,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_operation_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_SS:
       return new be_compiled_visitor_operation_ss (new_ctx);
-        case TAO_CodeGen::TAO_OPERATION_IS:
-      return new be_visitor_operation_is (new_ctx);
-         case TAO_CodeGen::TAO_OPERATION_IH:
-      return new be_visitor_operation_ih (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SH:
       return new be_visitor_operation_collocated_sh (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_COLLOCATED_SS:
@@ -614,8 +560,6 @@ TAO_Compiled_Visitor_Factory::make_visitor (be_visitor_context *ctx)
       return new be_visitor_decl (new_ctx);
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_CH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
-        case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
       return new be_visitor_operation_arglist (new_ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 7cb35be54ea..2bc03cf4ca1 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_field.h"
 
@@ -86,26 +86,24 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
                          ), -1);
     }
 
-  // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
+  // for anonymous arrays, the type name has a _ prepended. We compute the
+  // fullname 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 on
+      
+      // save the node's local name and full name in a buffer for quick use later
+      // on 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (!this->ctx_->alias () // not a typedef
       && node->is_child (this->ctx_->scope ()))
     {
       // for anonymous arrays ...
-      // we have to generate a name for us that has an underscore
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name
-
+      // we have to generate a name for us that has an underscope prepended to
+      // our local name. This needs to be inserted after the parents's name
+          
       if (node->is_nested ())
         {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
+          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
+          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (), 
                            node->local_name ()->get_string ());
         }
       else
@@ -119,8 +117,8 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
       ACE_OS::sprintf (fname, "%s", node->fullname ());
     }
 
-  // check what is the code generation substate. Are we generating
-  // code for the in/out operators for our parent or for us?
+  // check what is the code generation substate. Are we generating code for
+  // the in/out operators for our parent or for us?
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
@@ -285,7 +283,7 @@ be_visitor_field_cdr_op_cs::visit_interface (be_interface *)
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done because an interface cannit be declared inside a
-      // structure
+      // structure 
       break;
     default:
       // error
@@ -328,7 +326,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *)
       break;
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done because an interface cannit be declared inside a
-      // structure
+      // structure 
       break;
     default:
       // error
@@ -365,40 +363,40 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
       // is a psuedo obj
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
+      if (node->pt () == AST_PredefinedType::PT_pseudo) 
         *os << "(strm >> _tao_aggregate." << f->local_name ()
-            << ".out ())";
+	    << ".out ())";
       else if (node->pt () == AST_PredefinedType::PT_char)
         *os << "(strm >> CORBA::Any::to_char (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_wchar)
         *os << "(strm >> CORBA::Any::to_wchar (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_octet)
         *os << "(strm >> CORBA::Any::to_octet (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_boolean)
         *os << "(strm >> CORBA::Any::to_boolean (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else
         *os << "(strm >> _tao_aggregate." << f->local_name () << ")";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       // is a psuedo obj
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
+      if (node->pt () == AST_PredefinedType::PT_pseudo) 
         *os << "(strm << _tao_aggregate." << f->local_name () << ".in ())";
       else if (node->pt () == AST_PredefinedType::PT_char)
         *os << "(strm << CORBA::Any::from_char (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_wchar)
         *os << "(strm << CORBA::Any::from_wchar (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_octet)
         *os << "(strm << CORBA::Any::from_octet (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else if (node->pt () == AST_PredefinedType::PT_boolean)
         *os << "(strm << CORBA::Any::from_boolean (_tao_aggregate."
-            << f->local_name () << "))";
+	    << f->local_name () << "))";
       else
         *os << "(strm << _tao_aggregate." << f->local_name () << ")";
       break;
@@ -456,8 +454,8 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node)
                          ), -1);
     }
 
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()))
+  if (node->node_type () != AST_Decl::NT_typedef 
+      && node->is_child (this->ctx_->scope ())) 
     // not a typedef AND
     // node is defined inside the structure
     {
@@ -621,7 +619,7 @@ be_visitor_field_cdr_op_cs::visit_typedef (be_typedef *node)
   if (!bt || (bt->accept (this) == -1))
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cdr_op_cs::"
+                         "(%N:%l) be_visitor_union_branch_public_ci::"
                          "visit_typedef - "
                          "Bad primitive type\n"
                          ), -1);
@@ -768,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.
   char fname [NAMEBUFSIZE];  // to hold the full and
-
+      
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (!this->ctx_->alias () // not a typedef
       && node->is_child (this->ctx_->scope ()))
@@ -777,11 +775,11 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
       // we have to generate a name for us that has an underscope
       // prepended to our local name. This needs to be inserted after
       // the parents's name
-
+          
       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->fullname (), 
                            node->local_name ()->get_string ());
         }
       else
@@ -820,26 +818,3 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
     }
   ACE_NOTREACHED (return 0);
 }
-
-
-// visit typedef type
-int
-be_visitor_cdr_op_field_decl::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_cdr_op_field_decl::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index abd9059367f..4698fc9c6b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_field.h"
 
@@ -70,7 +70,7 @@ be_visitor_field_ch::visit_field (be_field *node)
                          "codegen for field type failed\n"
                          ), -1);
     }
-  // now output the field name.
+  // now output the field name. 
   *os << " " << node->local_name () << ";\n";
   return 0;
 }
@@ -237,52 +237,6 @@ be_visitor_field_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-// visit valuetype type
-int
-be_visitor_field_ch::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  os->indent ();
-  *os <<  bt->nested_type_name (this->ctx_->scope (), "")
-      << "_var";
-  return 0;
-}
-
-// visit valuetype forward type
-int
-be_visitor_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;
-
-  os = this->ctx_->stream ();
-  // set the right type;
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-  os->indent ();
-  *os << bt->nested_type_name (this->ctx_->scope (), "")
-      << "_var";
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 // visit predefined type
 int
 be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
@@ -300,15 +254,7 @@ be_visitor_field_ch::visit_predefined_type (be_predefined_type *node)
   // if not a typedef and we are defined in the use scope, we must be defined
   os->indent (); // start from current indentation level
   if (node->pt () == AST_PredefinedType::PT_pseudo) // is a psuedo obj
-    {
-      // check if we are dealing with a CORBA::Object
-      if (!ACE_OS::strcmp (bt->local_name ()->get_string (), "Object"))
-        {
-          *os << "TAO_Object_Field_T<CORBA::Object>";
-        }
-      else
-        *os << bt->nested_type_name (this->ctx_->scope (), "_var");
-    }
+    *os << bt->nested_type_name (this->ctx_->scope (), "_var");
   else
     *os << bt->nested_type_name (this->ctx_->scope ());
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 7ce75a51466..23e9e3e3ad0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -42,3 +42,4 @@
 #include "be_visitor_interface/cdr_op_cs.cpp"
 
 ACE_RCSID(be, be_visitor_interface, "$Id$")
+
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 2b260e2fc39..d773bde03fd 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
@@ -58,59 +58,59 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
       << node->name () << "_ptr _tao_elem)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::Object_ptr *_tao_obj_ptr = 0;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "ACE_NEW (_tao_obj_ptr, CORBA::Object_ptr);" << be_nl
       << "*_tao_obj_ptr = " << node->name ()
       << "::_duplicate (_tao_elem);" << be_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_obj_ptr, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "_tao_obj_ptr, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_obj_ptr;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << "_ptr &_tao_elem)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::Object_ptr *tmp = 0;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = " << node->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
-      << "ACE_TRY_CHECK;" << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "CORBA::Object_var _tao_obj_var;" << be_nl
       << "ACE_NEW_RETURN (tmp, CORBA::Object_ptr, 0);" << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", &_tao_obj_var.out (), 0, ACE_TRY_ENV)" << be_nl
+      << ", &_tao_obj_var.out (), 0, TAO_TRY_ENV)" << be_nl
       << "   == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = " << node->name ()
-      << "::_narrow (_tao_obj_var.in (), ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << "::_narrow (_tao_obj_var.in (), TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "*tmp = (CORBA::Object_ptr) _tao_elem;  // any owns the object"
       << be_nl
       << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", tmp, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << node->tc_name () << ", tmp, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
       << "// failure" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete tmp;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 5c20605093f..9dd3b3c8e6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -75,10 +75,10 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "operator>> (" << be_idt << be_idt_nl
       << "TAO_InputCDR &," << be_nl
       << node->name () << "_ptr &" << be_uidt_nl
-      << ");" << be_uidt << "\n\n";
+      << ");" << be_uidt << "\n";
 
   // Now it really the type to generate the operators for the members
-  // of the interface...
+  // of the interface... 
 
   // set the substate as generating code for the types defined in our scope
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
@@ -101,9 +101,27 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "const " << node->name () << "_ptr _tao_objref" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
+  // hand over the encoding to the TAO's internal engine
+  //  *os << "CORBA::Environment env;" << be_nl;
+  *os << "TAO_TRY" << be_nl
+      << "{" << be_idt_nl;
+  // resolve the nastiness created due to casting to void* and then to
+  // CORBA::Object_ptr
   *os << "CORBA::Object_ptr _tao_corba_obj = _tao_objref;" << be_nl;
-  *os << "return (strm << _tao_corba_obj);" << be_uidt_nl
-      << "}\n\n";
+  *os << "if (TAO_MARSHAL_OBJREF::instance ()->" << be_nl
+      << "        encode (0, &_tao_corba_obj, 0, &strm, TAO_TRY_ENV) == "
+      << be_nl
+      << "        CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
+      << "}" << be_nl
+      << "TAO_CATCHANY" << be_nl
+      << "{" << be_idt_nl
+      << "return 0;" << be_uidt_nl
+      << "}" << be_nl
+      << "TAO_ENDTRY;" << be_nl
+      << "return 0;" << be_uidt_nl;
+  *os << "}\n\n";
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
@@ -117,26 +135,29 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "{" << be_idt_nl;
   // hand over to the TAO's internal marshaling engine
   //  *os << "CORBA::Environment env;" << be_nl;
-  *os << "ACE_TRY_NEW_ENV" << be_nl
+  *os << "TAO_TRY" << be_nl
       << "{" << be_idt_nl;
-  *os << "CORBA::Object_var obj;" << be_nl;
-  *os << "if ((strm >> obj.inout ()) == 0)" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "// narrow to the right type" << be_nl;
-  *os << "_tao_objref =" << be_idt_nl
-      << node->name () << "::_narrow (" << be_idt << be_idt_nl
-      << "obj.in ()," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt << be_uidt_nl;
-  *os << "ACE_TRY_CHECK;" << be_nl;
+  *os << "CORBA::Object_ptr obj;" << be_nl;
+  *os << "if (TAO_MARSHAL_OBJREF::instance ()->" << be_nl
+      << "        decode (0, &obj, 0, &strm, TAO_TRY_ENV) == " << be_nl
+      << "        CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
+      << "{" << be_idt_nl;
+  *os << "TAO_CHECK_ENV;" << be_nl;
+  *os << "// narrow to the right type" << be_nl;
+  *os << "_tao_objref = " << node->name ()
+      << "::_narrow (obj, TAO_TRY_ENV);" << be_nl;
+  *os << "TAO_CHECK_ENV;" << be_nl;
+  *os << "CORBA::release (obj);" << be_nl;
   *os << "return 1;" << be_uidt_nl;
+  *os << "}" << be_nl;
+  *os << "return 0; // error" << be_uidt_nl;
   *os << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
-      << "// do nothing" << be_uidt_nl
+      << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
-      << "return 0;" << be_uidt_nl;
+      << "TAO_ENDTRY;" << be_nl
+      << "ACE_NOTREACHED (return 0);" << be_uidt_nl;
   *os << "}\n\n";
 
   node->cli_stub_cdr_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
index 502272cc7ab..46a63786e3a 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_sh.cpp
@@ -89,7 +89,7 @@ int be_visitor_interface_collocated_sh::visit_interface (be_interface *node)
   *os << node->local_name () << "_ptr "
       << " servant," << be_nl;
 
-  *os << "TAO_Stub *stub\n";
+  *os << "STUB_Object *stub\n";
   os->decr_indent ();
   *os << ");\n";
   os->decr_indent (0);
@@ -104,6 +104,13 @@ int be_visitor_interface_collocated_sh::visit_interface (be_interface *node)
   *os << node->local_name ()
       << "_ptr _get_servant (void) const;" << be_nl;
 
+  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+      << "const char *logical_type_id," << be_nl
+      << "CORBA::Environment &_tao_environment = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");" << be_uidt << "\n";
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
index 27a1ae7c764..a89bb37be3c 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/collocated_ss.cpp
@@ -56,7 +56,7 @@ int be_visitor_interface_collocated_ss::visit_interface (be_interface *node)
   *os << node->full_skel_name () << "_ptr "
       << " servant," << be_nl;
 
-  *os << "TAO_Stub *stub\n";
+  *os << "STUB_Object *stub\n";
   os->decr_indent ();
   *os << ")\n";
   os->decr_indent (0);
@@ -110,6 +110,19 @@ int be_visitor_interface_collocated_ss::visit_interface (be_interface *node)
   os->decr_indent ();
   *os << "}\n\n";
 
+  os->indent ();
+  *os << "CORBA::Boolean " << node->full_coll_name ()
+      << "::_is_a (" << be_idt << be_idt_nl
+      << "const char* logical_type_id," << be_nl
+      << "CORBA::Environment &_tao_environment" << be_uidt_nl
+      << ")" << be_uidt_nl
+      << "{" << be_idt_nl
+      << "return this->servant_->_is_a (" << be_idt << be_idt_nl
+      << "logical_type_id," << be_nl
+      << "_tao_environment" << be_uidt_nl
+      << ");" << be_uidt << be_uidt_nl
+      << "}\n\n";
+
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
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 6711f5197fa..d99981346b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -57,7 +57,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // generate the ifdefined macro for  the _ptr type
       os->gen_ifdef_macro (node->flatname (), "_ptr");
 
-
+     
       // the following two are required to be under the ifdef macro to avoid
       // multiple declarations
 
@@ -103,7 +103,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // now generate the class definition
       os->indent ();
       *os << "class " << idl_global->export_macro ()
-	        << " " << node->local_name ();
+	  << " " << node->local_name ();
 
       if (node->n_inherits () > 0)  // node interface inherits from other
                                     // interfaces
@@ -143,34 +143,18 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // 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__) || __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__ */\n" << be_idt_nl
-
-          // generate the static _duplicate, _narrow, and _nil operations
+          << "public:" << be_idt_nl
+        // generate the static _duplicate, _narrow, and _nil operations
           << "// the static operations" << be_nl
           << "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
-	        << "CORBA::default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl
-          << "static " << node->local_name () << "_ptr "
-	        << "_unchecked_narrow (" << be_idt << be_idt_nl
+	  << "_narrow (" << be_idt << be_idt_nl
           << "CORBA::Object_ptr obj," << be_nl
-	        << "CORBA::Environment &env = " << be_idt_nl
-	        << "CORBA::default_environment ()"
-	        << be_uidt << be_uidt_nl
-	        << ");" << be_uidt_nl
+	  << "CORBA::Environment &env = " << be_idt_nl
+	  << "CORBA::Environment::default_environment ()"
+	  << be_uidt << be_uidt_nl
+	  << ");" << be_uidt_nl
           << "static " << node->local_name () << "_ptr " << "_nil (void);\n\n";
 
       // generate code for the interface definition by traversing thru the
@@ -186,23 +170,23 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       // the _is_a method
       os->indent ();
       *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
-          << "const CORBA::Char *type_id, " << be_nl
+	  << "const CORBA::Char *type_id, " << be_nl
           << "CORBA::Environment &env = " << be_idt_nl
-          << "CORBA::default_environment ()"
-          << be_uidt << be_uidt_nl
-          << ");" << be_uidt_nl
-          << "virtual const char* "
-          << "_interface_repository_id (void) const;\n" << be_uidt_nl;
+	  << "CORBA::Environment::default_environment ()"
+	  << be_uidt << be_uidt_nl
+	  << ");" << be_uidt_nl
+	  << "virtual const char* "
+	  << "_interface_repository_id (void) const;" << be_uidt_nl;
 
       // generate the "protected" constructor so that users cannot instantiate
       // us
       *os << "protected:" << be_idt_nl
-          << node->local_name () << " (void);" << be_nl
+	  << node->local_name () << " (void); // default constructor" << be_nl
           << node->local_name ()
-	        << " (TAO_Stub *objref, " << be_idt << be_idt_nl
+	  << " (STUB_Object *objref, " << be_idt << be_idt_nl
           << "TAO_ServantBase *_tao_servant = 0, " << be_nl
           << "CORBA::Boolean _tao_collocated = 0" << be_uidt_nl
-	        << ");" << be_uidt_nl
+	  << ");" << be_uidt_nl
           << "virtual ~" << node->local_name () << " (void);" << be_uidt_nl;
 
       // private copy constructor and assignment operator. These are not
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 e10d6c3e58c..420bd26cc40 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -59,7 +59,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
 
   *os << "ACE_INLINE" << be_nl;
   *os << node->name () << "::" << node->local_name () <<
-    " (TAO_Stub *objref, TAO_ServantBase *_tao_servant, "
+    " (STUB_Object *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;
@@ -69,14 +69,6 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
     " (void) // destructor" << be_nl;
   *os << "{}\n\n";
 
-  // _nil method
-  *os << "ACE_INLINE "
-      << node->name () << "_ptr" << be_nl
-      << node->name () << "::_nil (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return (" << node->name () << "_ptr)0;" << be_uidt_nl
-      << "}" << be_nl << be_nl;
-
   // generate the ifdefined macro for  the _var type
   os->gen_ifdef_macro (node->flatname (), "_var");
   if (node->gen_var_impl () == -1)
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 41e5c6cb922..624362423f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -54,6 +54,20 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
 
   // first generate the code for the static methods
 
+  // The _duplicate method
+  *os << node->name () << "_ptr " << node->name () << "::_duplicate ("
+      << node->name () << "_ptr obj)" << be_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "if (!CORBA::is_nil (obj))\n";
+  os->incr_indent ();
+  *os << "obj->_incr_refcnt ();\n";
+  os->decr_indent ();
+  *os << be_nl;
+  *os << "return obj;\n";
+  os->decr_indent ();
+  *os << "} // end of _duplicate" << be_nl << be_nl;
+
   // The _narrow method
   *os << node->name () << "_ptr " << node->name ()
       << "::_narrow (" << be_idt << be_idt_nl
@@ -67,52 +81,39 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << be_idt_nl
       << "return " << node->name () << "::_nil ();" << be_uidt_nl;
 
-  *os << "return " << node->name ()
-      << "::_unchecked_narrow (obj, env);" << be_uidt_nl
-      << "}" << be_nl << be_nl;
+  *os << "STUB_Object* stub = obj->_stubobj ();" << be_nl
+      << "stub->_incr_refcnt ();" << be_nl;
+  *os << "if (!obj->_is_collocated ()" << be_idt << be_idt << be_idt_nl
+      << " || !obj->_servant()" << be_nl
+      << " || obj->_servant()->_downcast (\""
+      << node->repoID () << "\") == 0" << be_uidt_nl
+      << ")" << be_uidt << be_uidt_nl
+      << "{" << be_idt_nl;
+  *os << "return new "
+      << node->name () << "(stub);" << be_uidt_nl
+      << "}" << be_nl;
+
+  *os << "void* servant = obj->_servant ()->_downcast (\""
+      << node->repoID () << "\");" << be_nl
+      << "return new ";
 
   // This may be necessary to work around a GCC compiler bug!
   const char *skel_name = node->full_skel_name ();
   const char *coll_name = node->full_coll_name ();
   assert (coll_name != 0);
 
-  // The _unchecked_narrow method
-  *os << node->name () << "_ptr " << node->name ()
-      << "::_unchecked_narrow (" << be_idt << be_idt_nl
-      << "CORBA::Object_ptr obj," << be_nl
-      << "CORBA::Environment &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;
-
-  *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 (\""
-      << node->repoID () << "\");" << be_uidt_nl;
-
-  *os << "if (servant == 0)" << be_idt_nl
-      << "return new " << node->name () << "(stub);" << be_uidt_nl;
-
-  *os << "return new "
-      << coll_name << "(" << be_idt << be_idt_nl
+  *os << coll_name << "(" << be_idt << be_idt_nl
       << "ACE_reinterpret_cast(" << skel_name
       << "_ptr, servant)," << be_nl
       << "stub" << be_uidt_nl
       << ");" << be_uidt << 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
+  // _nil method
+  *os << node->name () << "_ptr "
+      << node->name () << "::_nil (void)" << be_nl
       << "{" << be_idt_nl
-      << "if (!CORBA::is_nil (obj))" << be_idt_nl
-      << "obj->_incr_refcnt ();" << be_uidt_nl
-      << "return obj;" << be_uidt_nl
+      << "return (" << node->name () << "_ptr)0;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // generate code for the elements of the interface
@@ -145,7 +146,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   *os << "  return 1; // success using local knowledge\n";
   os->decr_indent ();
   *os << "else" << be_nl;
-  *os << "  return this->CORBA_Object::_is_a (value, env);\n";
+  *os << "  return this->CORBA_Object::_is_a (value, env); // remote call\n";
   os->decr_indent ();
   *os << "}\n\n";
 
@@ -163,7 +164,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
   be_visitor *visitor;
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-  ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
   visitor = tao_cg->make_visitor (&ctx);
   if (!visitor || (node->accept (visitor) == -1))
     {
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 6c5ef47158f..7b21288dd07 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -102,32 +102,41 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
   *os << be_nl
       << "{" << be_nl
       << "protected:" << be_idt_nl
-      << namebuf << " (void);\n" << be_uidt_nl
+      << namebuf << " (void);" << be_uidt_nl
       << "public:" << be_idt_nl
       << namebuf << " (const " << namebuf << "& rhs);" << be_nl
-      << "virtual ~" << namebuf << " (void);\n\n";
+      << "virtual ~" << namebuf << " (void);" << be_nl;
 
-  *os << be_nl
-      << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
+  *os << "virtual CORBA::Boolean _is_a (" << be_idt << be_idt_nl
       << "const char* logical_type_id," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment &_tao_environment = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
-      << ");\n" << be_uidt_nl;
+      << ");" << be_uidt_nl;
 
   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
       << "const char* logical_type_id" << be_uidt_nl
-      << ");\n" << be_uidt_nl;
+      << ");\n" << be_uidt;
 
+  // generate code for elements in the scope (e.g., operations)
+  if (this->visit_scope (node) ==  -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "be_visitor_interface_sh::"
+                         "visit_interface - "
+                         "codegen for scope failed\n"),
+                        -1);
+    }
   // add a skeleton for our _is_a method
+  os->indent ();
   *os << "static void _is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *context," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment &_tao_enviroment = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
-      << ");\n" << be_uidt_nl;
+      << ");" << be_uidt << "\n\n";
 
   // add a skeleton for our _non_existent method
   os->indent ();
@@ -135,40 +144,15 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
       << "CORBA::ServerRequest &req," << be_nl
       << "void *obj," << be_nl
       << "void *context," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
-      << be_uidt << be_uidt_nl
-      << ");\n" << be_uidt_nl;
-
-  // add the dispatch method
-  *os << "virtual void _dispatch (" << be_idt << be_idt_nl
-      << "CORBA::ServerRequest &_tao_req," << be_nl
-      << "void *_tao_context," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
-      << be_uidt << be_uidt_nl
-      << ");\n" << be_uidt_nl;
-
-  // Print out the _this() method.
-  *os << node->name () << " *_this (" << be_idt << be_idt_nl
-      << "CORBA::Environment &ACE_TRY_ENV = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment &_tao_enviroment = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
-      << ");\n" << be_uidt_nl;
+      << ");" << be_uidt << "\n\n";
 
-  // the _interface_repository_id method
-  *os << "virtual const char* _interface_repository_id "
-      << "(void) const;" << be_uidt_nl;
-
-  // generate code for elements in the scope (e.g., operations)
-  if (this->visit_scope (node) ==  -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_interface_sh::"
-                         "visit_interface - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
+  // add a method that says whether we are involved in a multiple inheritance
+  // or not
+  os->indent ();
+  *os << "CORBA::Boolean in_mult_inheritance (void);\n\n";
 
   // generate skeletons for operations of our base classes. These skeletons
   // just cast the pointer to the appropriate type before invoking the call
@@ -181,6 +165,29 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
                         -1);
     }
 
+  // add the dispatch method
+  os->indent ();
+  *os << "virtual void _dispatch (" << be_idt << be_idt_nl
+      << "CORBA::ServerRequest &_tao_req," << be_nl
+      << "void *_tao_context," << be_nl
+      << "CORBA::Environment &_tao_env = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");" << be_uidt << "\n\n";
+
+  // Print out the _this() method.
+  os->indent ();
+  *os << node->name () << " *_this (" << be_idt << be_idt_nl
+      << "CORBA::Environment &_tao_environment = " << be_idt_nl
+      << "CORBA::Environment::default_environment ()"
+      << be_uidt << be_uidt_nl
+      << ");" << be_uidt << "\n";
+
+  // the _interface_repository_id method
+  os->indent ();
+  *os << "virtual const char* _interface_repository_id (void) const;\n";
+  os->decr_indent ();
+
   *os << "};\n\n";
 
   // generate the collocated class
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index 6ac012bab0a..76768659b91 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -60,6 +60,25 @@ be_visitor_interface_si::visit_interface (be_interface *node)
                         -1);
     }
 
+  os->indent (); // start with whatever indentation level we are at
+  *os << "ACE_INLINE CORBA::Boolean" << be_nl;
+  *os << node->full_skel_name () << "::in_mult_inheritance (void)" << be_nl
+      << "{" << be_idt_nl;
+  switch (node->in_mult_inheritance ())
+    {
+    case 0:
+      *os << "return 0;";
+      break;
+    case 1:
+      *os << "return 1;";
+      break;
+    default:
+      // error
+      return -1;
+    }
+  *os << be_uidt_nl
+      << "}" << be_nl << be_nl;
+
   // Generate skeletons for operations of our base classes. These skeletons
   // just cast the pointer to the appropriate type before invoking the
   // call. Hence we generate these in the inline file
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 45ec707fa93..2b14e10b3cf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -108,8 +108,10 @@ 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;
+      << "{}\n";
 
+  // destructor
+  os->indent ();
   *os << "// skeleton destructor" << be_nl;
 
   if (!node->is_nested ())
@@ -125,7 +127,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         " (void)" << be_nl;
     }
   *os << "{\n";
-  *os << "}\n\n";
+  *os << "}\n";
 
 
   // generate code for elements in the scope (e.g., operations)
@@ -144,46 +146,45 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << "::_is_a_skel (" << be_idt << be_idt_nl
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
       << "void * _tao_object_reference," << be_nl
-      << "void * /* context */," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
-      << ")" << be_uidt_nl;
-  *os << "{" << be_idt_nl;
-  *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << 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;
-  *os << "ACE_THROW (CORBA::MARSHAL ());" << be_uidt_nl << be_nl;
-  *os << "_tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);" << be_nl;
-  *os << "ACE_CHECK;" << be_nl << be_nl;
-  *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl;
-  *os << "ACE_CHECK;" << be_nl;
-  *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";
-
-
-  // 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
-      << "void * _tao_object_reference," << be_nl
-      << "void * /* context */," << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl
+      << "void * /*context*/," << be_nl
+      << "CORBA::Environment &_tao_environment" << be_uidt_nl
       << ")" << be_uidt_nl;
+  *os << "{\n";
+  os->incr_indent ();
+  *os << "static const TAO_Param_Data_Skel " << node->flatname ()
+      << "_is_a_paramdata [] = " << be_nl;
   *os << "{" << be_idt_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;
-  *os << "ACE_CHECK;" << be_nl;
-  *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 << "{CORBA::_tc_boolean, 0, 0}," << be_nl;
+  *os << "{CORBA::_tc_string, CORBA::ARG_IN, 0}" << be_uidt_nl;
+  *os << "};" << be_nl;
+  *os << "static const TAO_Call_Data_Skel " << node->flatname ()
+      << "_is_a_calldata = " << be_nl;
+  *os << "{\"_is_a\", 1, 2, " << node->flatname () << "_is_a_paramdata};"
+      << be_nl;
+  //  *os << "CORBA::Environment _tao_skel_environment;" << be_nl;
+  *os << node->full_skel_name () << "_ptr  _tao_impl = ("
+      << node->full_skel_name () << "_ptr) _tao_object_reference;"
+      << be_nl;
+  *os << "CORBA::Boolean _tao_retval;" << be_nl;
+  *os << "CORBA::String_var _tao_value;" << be_nl;
+  *os << "_tao_server_request.demarshal (" << be_idt_nl
+      << "_tao_environment, " << be_nl
+      << "&" << node->flatname () << "_is_a_calldata, " << be_nl
+      << "&_tao_retval, " << be_nl
+      << "&_tao_value.inout ()" << be_uidt_nl
+      << ");" << be_nl;
+  *os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);" << be_nl;
+  *os << "_tao_retval = _tao_impl->_is_a (_tao_value.in (), "
+      << "_tao_environment);" << be_nl;
+  *os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);" << be_nl;
+  *os << "_tao_server_request.marshal (" << be_idt_nl
+      << "_tao_environment, " << be_nl
+    //      << "_tao_skel_environment," << be_nl
+      << "&" << node->flatname () << "_is_a_calldata, " << be_nl
+      << "&_tao_retval, " << be_nl
+      << "&_tao_value.inout ()" << be_uidt_nl
+      << ");" << be_uidt_nl;
+  //  *os << "CORBA::string_free (_tao_value);" << be_uidt_nl;
   *os << "}\n\n";
 
 
@@ -191,7 +192,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   *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
+      << "CORBA::Environment &_tao_environment" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (\n" << be_idt;
@@ -206,12 +207,41 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
 
   os->indent ();
   *os << "(!ACE_OS::strcmp ((char *)value, "
-      << "CORBA::_tc_Object->id (ACE_TRY_ENV))))"
+      << "CORBA::_tc_Object->id (_tao_environment))))"
       << be_idt_nl << "return 1;" << be_uidt_nl
       << "else" << be_idt_nl
       << "return 0;" << be_uidt << be_uidt << be_uidt_nl
       << "}\n\n";
 
+  // 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
+      << "void * /* _tao_object_reference */ ," << be_nl
+      << "void * /*context*/," << be_nl
+      << "CORBA::Environment &_tao_environment" << be_uidt_nl
+      << ")" << be_uidt_nl;
+  *os << "{" << be_idt_nl;
+  *os << "static const TAO_Param_Data_Skel " << node->flatname ()
+      << "_non_existent_paramdata [] = " << be_nl
+      << "{" << be_idt_nl
+      << "{CORBA::_tc_boolean, 0, 0}" << be_uidt_nl
+      << "};" << be_nl;
+  *os << "static const TAO_Call_Data_Skel " << node->flatname ()
+      << "_non_existent_calldata = " << be_nl
+      << "{\"_non_existent\", 1, 1, " << node->flatname ()
+      << "_non_existent_paramdata};" << be_nl;
+  //  *os << "CORBA::Environment _tao_skel_environment;" << be_nl;
+  *os << "CORBA::Boolean _tao_retval = 0;" << be_nl;
+  *os << "_tao_server_request.marshal (" << be_idt_nl
+      << "_tao_environment, " << be_nl
+    //      << "_tao_skel_environment," << be_nl
+      << "&" << node->flatname () << "_non_existent_calldata, " << be_nl
+      << "&_tao_retval " << be_uidt_nl
+      << ");" << be_uidt_nl;
+  *os << "}\n\n";
+
   os->indent ();
   *os << "void* " << node->full_skel_name ()
       << "::_downcast (" << be_idt << be_idt_nl
@@ -241,23 +271,22 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   os->indent ();
   *os << "void " << node->full_skel_name () <<
     "::_dispatch (CORBA::ServerRequest &req, " <<
-    "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl;
+    "void *context, CORBA::Environment &env)" << be_nl;
   *os << "{\n";
   os->incr_indent ();
   *os << "TAO_Skeleton skel; // pointer to skeleton for operation" << be_nl;
   *os << "const char *opname = req.operation (); // retrieve operation name"
       << be_nl;
   *os << "// find the skeleton corresponding to this opname" << be_nl;
-  *os << "if (this->_find (opname, skel, req.operation_length ()) == -1)" << be_nl;
+  *os << "if (this->_find (opname, skel) == -1)" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "ACE_ERROR ((LM_ERROR, \"Bad operation <%s>\\n\", opname));" << be_nl;
-  *os << "ACE_THROW (CORBA_BAD_OPERATION ());"
-    //<< "ACE_TRY_ENV);" << be_uidt_nl;
-      << be_uidt_nl;
-    //  *os << "env.exception (new CORBA_BAD_OPERATION ());" << be_nl;
+  *os << "TAO_THROW_ENV (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO), "
+      << "env);" << be_uidt_nl;
+    //  *os << "env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));" << be_nl;
   *os << "}" << be_nl;
   *os << "else" << be_idt_nl;
-  *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl;
+  *os << "skel (req, this, context, env);" << be_uidt << be_uidt_nl;
   *os << "}\n\n";
 
   os->indent ();
@@ -270,22 +299,6 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
   os->decr_indent ();
   *os << "}\n\n";
 
-  *os << "\n";
-
-  // the _this () operation
-  *os << node->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
-      << "return new " << node->full_coll_name ()
-      << " (this, stub);" << be_uidt << be_nl;
-
-  *os << "}\n\n";
-
   // generate the collocated class impl
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS);
@@ -309,7 +322,21 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
     }
   delete visitor;
 
-  *os << "\n\n";
+  *os << "\n";
+
+  // the _this () operation
+  *os << node->name () << "*" << be_nl
+      << node->full_skel_name ()
+      << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl
+      << "{" << be_idt_nl
+      << "STUB_Object *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV_RETURN (ACE_TRY_ENV, 0);" << be_nl
+    //      << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl
+    //      << "return 0;" << be_uidt_nl
+      << "return new " << node->full_coll_name ()
+      << " (this, stub);" << be_uidt << be_nl;
+
+  *os << "}\n\n";
 
-  return 0;
+   return 0;
 }
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 e93e0b40e81..78d03c9a8a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -116,7 +116,7 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "// overridden ServantBase operations" << be_nl
       << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl
       << "CORBA::Environment &env = " << be_idt_nl
-      << "CORBA::default_environment ()"
+      << "CORBA::Environment::default_environment ()"
       << be_uidt << be_uidt_nl
       << ");" << be_uidt << "\n";
 
@@ -165,3 +165,4 @@ be_visitor_interface_tie_sh::method_helper (be_interface *,
   delete visitor;
   return 0;
 }
+
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 061af8f7d7d..2d9b0aba3a1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_si.cpp
@@ -208,3 +208,4 @@ be_visitor_interface_tie_si::method_helper (be_interface *derived,
   delete visitor;
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
index 301ef9ce115..173f0829a88 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ci.cpp
@@ -45,20 +45,37 @@ be_visitor_interface_fwd_ci::~be_visitor_interface_fwd_ci (void)
 int
 be_visitor_interface_fwd_ci::visit_interface_fwd (be_interface_fwd *node)
 {
+  TAO_OutStream *os = this->ctx_->stream ();
+
   if (!node->cli_inline_gen () && !node->imported ())
     {
-#if 0
-      // We don't generate any code here.....
 
-      // It is possible to generate the definitions for the _var and
-      // _out types, but if we do that then the _duplicate() and
-      // _nil() methods cannot be inlined.
+      // generate the ifdefined macro for  the _var type
+      os->gen_ifdef_macro (node->flatname (), "_var");
+
+      if (node->gen_var_impl () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_fwd_ci::"
+                             "visit_interface_fwd - "
+                             "codegen for _var failed\n"), -1);
+        }
+
+      os->gen_endif ();
+
+      // generate the ifdefined macro for  the _out type
+      os->gen_ifdef_macro (node->flatname (), "_out");
 
-      // Since these classes will be generated once the forward
-      // declaration is resolved there is really no problem here
-#endif /* 0 */
+      if (node->gen_out_impl () == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_interface_fwd_ci::"
+                             "visit_interface_fwd - "
+                             "codegen for _out failed\n"), -1);
+        }
+      os->gen_endif ();
 
-      node->cli_inline_gen (I_TRUE);
+      node->cli_stub_gen (I_TRUE);
     }
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 060405fa0df..6021ed1c978 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_module.h"
 
@@ -420,149 +420,6 @@ be_visitor_module::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-// visit an valuetype
-int
-be_visitor_module::visit_valuetype (be_valuetype *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_IH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-    case TAO_CodeGen::TAO_MODULE_IS:
-    case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
-    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
-      return 0;    // nothing to do, resp. not yet impl.
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_valuetype - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_valuetype - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_valuetype - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an valuetype_fwd
-int
-be_visitor_module::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CI:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CDR_OP_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_ANY_OP_CH:
-    case TAO_CodeGen::TAO_MODULE_ANY_OP_CS:
-    case TAO_CodeGen::TAO_MODULE_CDR_OP_CH:
-    // case TAO_CodeGen::TAO_MODULE_CDR_OP_CI:
-    case TAO_CodeGen::TAO_MODULE_CS:
-    case TAO_CodeGen::TAO_MODULE_SH:
-    case TAO_CodeGen::TAO_MODULE_SI:
-    case TAO_CodeGen::TAO_MODULE_SS:
-        case TAO_CodeGen::TAO_MODULE_IS:
-        case TAO_CodeGen::TAO_MODULE_IH:
-                return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_module::"
-                           "visit_valuetype_fwd - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_valuetype_fwd - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_module::"
-                         "visit_valuetype_fwd - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 // visit an structure
 int
 be_visitor_module::visit_structure (be_structure *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index 969e55e2c04..453a90735e3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -60,7 +60,7 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
                         -1);
     }
 
-
+ 
 
   switch (this->ctx_->state ())
     {
@@ -69,20 +69,20 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
       // last argument - is always CORBA::Environment
       os->indent ();
-      *os << "CORBA::Environment &ACE_TRY_ENV";
+      *os << "CORBA::Environment &_tao_environment";
       *os << " = " << be_idt_nl
-	        << "CORBA::default_environment ()"
+	        << "CORBA::Environment::default_environment ()"
 	        << be_uidt;
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
       // last argument - is always CORBA::Environment
       os->indent ();
-      *os << "CORBA::Environment &ACE_TRY_ENV";
+      *os << "CORBA::Environment &TAO_TRY_ENV";
       break;
     default:
       os->indent ();
-      *os << "CORBA::Environment &ACE_TRY_ENV";
+      *os << "CORBA::Environment &_tao_environment";
       break;
     }
   *os << be_uidt_nl << ")" << be_uidt;
@@ -156,7 +156,7 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
       ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH);
       break;
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_OTHERS:
-    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:
+    case TAO_CodeGen::TAO_OPERATION_ARGLIST_SH:    
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IH:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_IS:
     case TAO_CodeGen::TAO_OPERATION_ARGLIST_COLLOCATED_SH:
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 284c7d11c25..87f43898983 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -46,7 +46,7 @@ int
 be_visitor_operation_argument::post_process (be_decl *bd)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-
+  
   if (!this->last_node (bd))
     {
       switch (this->ctx_->state ())
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..221eeb62daf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
@@ -20,9 +20,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -30,7 +30,7 @@ ACE_RCSID(be_visitor_operation, argument_marshal, "$Id$")
 
 
 // ************************************************************
-// operation visitor to handle the passing of arguments to the CDR operators
+// operation visitor to handle the passing of arguments to the CDR operators 
 // ************************************************************
 
 be_compiled_visitor_operation_argument_marshal::
@@ -68,7 +68,7 @@ be_compiled_visitor_operation_argument_marshal::pre_process (be_decl *bd)
       if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
         {
           if (this->last_arg_printed_ !=
-              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE)
+              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE) 
             *os << " &&\n";
         }
       else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
@@ -80,13 +80,13 @@ be_compiled_visitor_operation_argument_marshal::pre_process (be_decl *bd)
       if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
         {
           if (this->last_arg_printed_ !=
-              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE)
+              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE) 
             *os << " &&\n";
         }
       else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
         {
           if (this->last_arg_printed_ !=
-              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE)
+              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE) 
             *os << " &&\n";
         }
       break;
@@ -98,7 +98,7 @@ be_compiled_visitor_operation_argument_marshal::pre_process (be_decl *bd)
       else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
         {
           if (this->last_arg_printed_ !=
-              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE)
+              be_compiled_visitor_operation_argument_marshal::TAO_ARG_NONE) 
             *os << " &&\n";
         }
       break;
@@ -129,12 +129,12 @@ be_compiled_visitor_operation_argument_marshal::post_process (be_decl *bd)
         case AST_Argument::dir_IN:
           // only these arguments get printed
           this->last_arg_printed_ =
-            be_compiled_visitor_operation_argument_marshal::TAO_ARG_IN;
+            be_compiled_visitor_operation_argument_marshal::TAO_ARG_IN; 
           break;
         case AST_Argument::dir_INOUT:
           // only these arguments get printed
           this->last_arg_printed_ =
-            be_compiled_visitor_operation_argument_marshal::TAO_ARG_INOUT;
+            be_compiled_visitor_operation_argument_marshal::TAO_ARG_INOUT; 
           break;
         case AST_Argument::dir_OUT:
           // these arguments don't get printed for the << operator on the stub
@@ -150,12 +150,12 @@ be_compiled_visitor_operation_argument_marshal::post_process (be_decl *bd)
         case AST_Argument::dir_INOUT:
           // only these arguments get printed
           this->last_arg_printed_ =
-            be_compiled_visitor_operation_argument_marshal::TAO_ARG_INOUT;
+            be_compiled_visitor_operation_argument_marshal::TAO_ARG_INOUT; 
           break;
         case AST_Argument::dir_OUT:
           // only these arguments get printed
           this->last_arg_printed_ =
-            be_compiled_visitor_operation_argument_marshal::TAO_ARG_OUT;
+            be_compiled_visitor_operation_argument_marshal::TAO_ARG_OUT; 
           break;
         }
       break;
@@ -170,106 +170,3 @@ be_compiled_visitor_operation_argument_marshal::post_process (be_decl *bd)
   return 0;
 }
 
-// ****************************************************************
-
-be_visitor_compiled_args_decl::be_visitor_compiled_args_decl (be_visitor_context *ctx)
-  :  be_visitor_scope (ctx)
-{
-}
-
-int
-be_visitor_compiled_args_decl::visit_operation (be_operation *node)
-{
-  return this->visit_scope (node);
-}
-
-int
-be_visitor_compiled_args_decl::visit_argument (be_argument *node)
-{
-  this->ctx_->node (node); // save the argument node
-
-  // retrieve the type of the argument
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  return bt->accept (this);
-}
-
-// visit array
-int
-be_visitor_compiled_args_decl::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_argument *f = this->ctx_->be_node_as_argument ();
-  if (f == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_compiled_args_decl::"
-                         "visit_array - "
-                         "cannot retrieve argument node\n"
-                         ), -1);
-    }
-
-  // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];  // to hold the full and
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name
-
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
-        }
-    }
-  else
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
-    }
-
-  if (f->direction () != AST_Argument::dir_IN)
-    {
-      *os << fname << "_forany "
-          << "_tao_argument_" << f->local_name () << " ("
-          << be_idt << be_idt_nl
-          << f->local_name ()
-          << be_uidt_nl << ");" << be_uidt_nl;
-    }
-  return 0;
-}
-
-// visit typedef type
-int
-be_visitor_compiled_args_decl::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_compiled_args_decl::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
index 135b06260cf..2d4119b7a62 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/collocated_ss.cpp
@@ -155,7 +155,7 @@ int be_visitor_operation_collocated_ss::visit_operation (be_operation *node)
   if (node->argument_count () > 0)
     *os << ",\n";
   os->indent ();
-  *os << "ACE_TRY_ENV";
+  *os << "_tao_environment";
   // end the upcall
   *os << be_uidt_nl;
   *os << ");" << be_uidt_nl;
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
index fec555db545..6931503b046 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/compiled_marshal.cpp
@@ -120,22 +120,17 @@ int be_visitor_operation_rettype_compiled_marshal::visit_array (be_array *node)
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
-#if 0
       *os << node->name () << "_forany (";
       if (node->size_type () == be_decl::VARIABLE)
         *os << "(" << node->name () << "_slice *)"
             << "_tao_retval.in ()" << ")";
       else
         *os << "_tao_retval" << ")";
-#else
-      *os << "_tao_retval_forany";
-#endif
     }
   else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
-      *os << "_tao_retval_forany";
-      // *os << node->name () << "_forany ("
-      // << "_tao_retval" << ")";
+      *os << node->name () << "_forany (" 
+          << "_tao_retval" << ")";
     }
   else
     {
@@ -217,56 +212,6 @@ int be_visitor_operation_rettype_compiled_marshal::visit_interface_fwd (be_inter
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int be_visitor_operation_rettype_compiled_marshal::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
-    {
-      *os << "_tao_retval.in ()";
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      *os << "_tao_retval";
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_compiled_marshal::"
-                         "visit_valuetype - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-int be_visitor_operation_rettype_compiled_marshal::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // get output stream
-
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
-    {
-      *os << "_tao_retval.in ()";
-    }
-  else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
-    {
-      *os << "_tao_retval";
-    }
-  else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_compiled_marshal::"
-                         "visit_valuetype - "
-                         "Bad substate\n"),
-                        -1);
-    }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int be_visitor_operation_rettype_compiled_marshal::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream (); // get output stream
@@ -401,7 +346,7 @@ int be_visitor_operation_rettype_compiled_marshal::visit_string (be_string *node
       else
         {
           *os << "CORBA::Any::from_string ((char *)_tao_retval.in (), "
-              << node->max_size ()->ev ()->u.ulval - 1 << ")";
+              << node->max_size ()->ev ()->u.ulval << ")";
         }
     }
   else if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
@@ -412,7 +357,7 @@ int be_visitor_operation_rettype_compiled_marshal::visit_string (be_string *node
         *os << "_tao_retval";
       else
         *os << "CORBA::Any::to_string (_tao_retval, "
-            << node->max_size ()->ev ()->u.ulval - 1 << ")";
+            << node->max_size ()->ev ()->u.ulval << ")";
     }
   else
     {
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 a2eed0f22a0..87d7c374976 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -113,7 +113,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
   // Generate the actual code for the stub. However, if any of the argument
   // types is "native", we flag a MARSHAL exception.
   // last argument - is always CORBA::Environment
-  *os << "{" << be_idt_nl;
+  *os << "{\n" << be_idt;
 
   // generate any pre stub info if and only if none of our parameters is of the
   // native type
@@ -150,8 +150,8 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
   if (node->has_native ()) // native exists => no stub
     {
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "") == -1)
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_visitor_operation_cs::"
@@ -162,24 +162,12 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
     }
   else
     {
+      os->indent ();
       // Generate code that retrieves the underlying stub object and then
       // invokes do_static_call on it.
-      *os << be_nl
-          << "TAO_Stub *istub = this->_stubobj ();" << be_nl
-          << "if (istub == 0)" << be_idt_nl;
-
-      // if the stub object was bad, then we raise a system exception
-      if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF",
-                                     "") == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_operation_cs::"
-                             "visit_operation - "
-                             "codegen for checking exception failed\n"),
-                            -1);
-
-        }
-      *os << be_uidt_nl << "\n";
+      *os << "STUB_Object *istub = this->_stubobj ();" << be_nl
+          << "if (istub)" << be_nl
+          << "{\n" << be_idt;
 
       // do any pre marshal and invoke processing with return type. This
       // includes allocating memory, initialization.
@@ -211,7 +199,7 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
         }
 
       // generate the code for marshaling in the parameters and transmitting
-      // them
+      // them 
       if (this->gen_marshal_and_invoke (node, bt) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -222,29 +210,72 @@ be_visitor_operation_cs::visit_operation (be_operation *node)
 
         }
 
-      if (!this->void_return_type (bt))
+      // do any post processing for the retval
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_POST_INVOKE_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_cs::"
+                             "visit_operation - "
+                             "codegen for return type post do_static_call failed\n"),
+                            -1);
+        }
+
+      // This was putting post_invoke code in the wrong place (after
+      // demarshaling). See line 807++ for this block's replacement.
+#if 0
+      // do any post processing for the arguments
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_CS);
+      visitor = tao_cg->make_visitor (&ctx);
+      if (!visitor || (node->accept (visitor) == -1))
         {
-          // now generate the normal successful return statement
-          os->indent ();
-          *os << "return ";
-          // return the appropriate return value
-          ctx = *this->ctx_;
-          ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_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_cs::"
-                                 "visit_operation - "
-                                 "codegen for return var failed\n"),
-                                -1);
-            }
-          *os << ";";
+          delete visitor;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "codegen for args in post do_static_call failed\n"),
+                            -1);
         }
+#endif
+      // now generate the normal successful return statement
+      os->indent ();
+      *os << "return ";
+      // return the appropriate return value
+      ctx = *this->ctx_;
+      ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_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_cs::"
+                             "visit_operation - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << ";" << be_uidt_nl;
+
+      *os << "}\n";
+      // if the stub object was bad, then we raise a system exception
+      if (this->gen_raise_exception (bt, "CORBA::INV_OBJREF", 
+                                     "CORBA::COMPLETED_NO") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_operation_cs::"
+                             "visit_operation - "
+                             "codegen for checking exception failed\n"),
+                            -1);
+
+        }
+      *os << be_uidt;
+
     } // end of if (!native)
 
-  *os << be_uidt_nl << "}\n\n";
+  *os << "}\n\n";
 
   return 0;
 }
@@ -296,16 +327,19 @@ be_visitor_operation_cs::gen_raise_exception (be_type *bt,
   be_visitor *visitor;
   be_visitor_context ctx;
 
+  os->indent ();
   if (this->void_return_type (bt))
     {
-      *os << "ACE_THROW ("
-          << excep << " (" << completion_status << "));\n";
+      *os << "TAO_THROW_ENV ("
+          << excep << " (" << completion_status << "), "
+          << "_tao_environment);\n";
     }
   else
     {
-      *os << "ACE_THROW_RETURN ("
-          << excep << " (" << completion_status << "), ";
-
+      *os << "TAO_THROW_ENV_RETURN ("
+          << excep << " (" << completion_status << "), "
+          << "_tao_environment, ";
+      
       // return the appropriate return value
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
@@ -335,14 +369,14 @@ be_visitor_operation_cs::gen_check_exception (be_type *bt)
   // check if there is an exception
   if (this->void_return_type (bt))
     {
-      *os << "ACE_CHECK;\n";
-      //<< "_tao_environment);\n";
+      *os << "TAO_CHECK_ENV_RETURN_VOID ("
+          << "_tao_environment);\n";
     }
   else
     {
-      *os << "ACE_CHECK_RETURN (";
-      // << "_tao_environment, ";
-
+      *os << "TAO_CHECK_ENV_RETURN ("
+          << "_tao_environment, ";
+      
       // return the appropriate return value
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_RETURN_CS);
@@ -510,7 +544,7 @@ be_interpretive_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
 
 int
 be_interpretive_visitor_operation_cs::gen_marshal_and_invoke (be_operation
-                                                              *node,
+                                                              *node, 
                                                               be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -522,7 +556,7 @@ be_interpretive_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       << node->argument_count () + 1 << "];" << be_nl
       << "const void** _tao_arg = ACE_const_cast (const void**,_tao_arguments);" << be_nl
       << "*_tao_arg = ";
-
+      
   // pass the appropriate return value to docall
   ctx = *this->ctx_;
   ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS);
@@ -555,7 +589,7 @@ be_interpretive_visitor_operation_cs::gen_marshal_and_invoke (be_operation
   // call do_static_call with appropriate number of arguments
   os->indent ();
   *os << "istub->do_static_call (" << be_idt_nl
-      << "ACE_TRY_ENV, " << be_nl
+      << "_tao_environment, " << be_nl
       << "&";
   // check if we are an attribute node in disguise
   if (this->ctx_->attribute ())
@@ -578,38 +612,10 @@ be_interpretive_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                          "(%N:%l) be_interpretive_visitor_operation_cs::"
                          "gen_marshal_and_invoke - "
                          "codegen for checking exception failed\n"),
-                        -1);
-
-    }
-
-  // do any post processing for the arguments
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_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_cs::"
-                         "visit_operation - "
-                         "codegen for args post do_static_call failed\n"),
-                        -1);
-    }
-
-  // do any post processing for the retval
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_POST_INVOKE_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_cs::"
-                         "visit_operation - "
-                         "codegen for return type post do_static_call failed\n"),
-                        -1);
+                            -1);
+      
     }
-
+  
   return 0;
 }
 
@@ -633,15 +639,17 @@ int
 be_compiled_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
                                                      be_type *)
 {
+  be_visitor *visitor;
+  be_visitor_context ctx;
 
   // Check if this operation raises any exceptions. In that case, we must
   // generate a list of exception typecodes. This is not valid for
   // attributes
   if (!this->ctx_->attribute ())
     {
-      be_visitor_context ctx = *this->ctx_;
+      ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_EXCEPTLIST_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
+      visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -658,7 +666,7 @@ be_compiled_visitor_operation_cs::gen_pre_stub_info (be_operation *node,
 
 int
 be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
-                                                          *node,
+                                                          *node, 
                                                           be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
@@ -666,7 +674,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
   be_visitor_context ctx;
 
   os->indent ();
-
+  
   // create the GIOP_Invocation and grab the outgoing CDR stream
   switch (node->flags ())
     {
@@ -676,9 +684,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
     default:
       *os << "TAO_GIOP_Twoway_Invocation _tao_call ";
     }
-  *os << "(" << be_idt << be_idt_nl
-      << "istub," << be_nl;
-
+  *os << "(istub, ";
   if (this->ctx_->attribute ())
     {
       // now check if we are a "get" or "set" operation
@@ -687,17 +693,11 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
       else
         *os << "\"_get_\"";
     }
-  *os << "\"" << node->local_name ()
-      << "\"," << be_nl
-      << "istub->orb_core ()" << be_uidt_nl
-      << ");" << be_uidt_nl;
-
-  *os << "\n" << be_nl
-      << "for (;;)" << be_nl
-      << "{" << be_idt_nl;
+  *os << "\"" << node->local_name () 
+      << "\", TAO_ORB_Core_instance ());" << be_nl;
+  // initialize the invocation
+  *os << "_tao_call.start (_tao_environment);\n";
 
-  *os << "ACE_TRY_ENV.clear ();" << be_nl
-      << "_tao_call.start (ACE_TRY_ENV);" << be_nl;
   // check if there is an exception
   if (this->gen_check_exception (bt) == -1)
     {
@@ -706,18 +706,20 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                          "gen_marshal_and_invoke - "
                          "codegen for checking exception failed\n"),
                         -1);
-
+      
     }
-
+  
+  
   // 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_IN) ||
       this->has_param_type (node, AST_Argument::dir_INOUT))
     {
-      *os << be_nl
-          << "TAO_OutputCDR &_tao_out = _tao_call.out_stream ();"
-          << be_nl
-          << "if (!(\n" << be_idt << be_idt << be_idt;
+      os->indent ();
+      // grab the outgoing stream
+      *os << "TAO_OutputCDR &_tao_out = _tao_call.out_stream ();" << be_nl;
+
+      *os << "if (!(\n" << be_idt;
 
       // marshal each in and inout argument
       ctx = *this->ctx_;
@@ -733,12 +735,11 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                              "codegen for return var in do_static_call failed\n"),
                             -1);
         }
-      *os << be_uidt << be_uidt_nl
-          << "))" << be_nl;
+      *os << be_uidt_nl << "))\n" << be_idt;
 
       // if marshaling fails, raise exception
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "") == -1)
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_cs::"
@@ -746,129 +747,96 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                              "codegen for return var failed\n"),
                             -1);
         }
-      *os << be_uidt;
+      *os << be_uidt << "\n";
+      
     }
 
-  *os << be_nl
-      << "int _invoke_status =" << be_idt_nl;
+  // call invoke
+  os->indent ();
+
+  // We should only need to capture the invocation status if we are
+  // actually going to use it, otherwise we get nasty warnings from
+  // some C++ compiler.
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
+    {
+      *os << "TAO_GIOP_ReplyStatusType _invoke_status = ";
+    }
+  else
+    {
+      *os << "(void) ";
+    }
+        
   if (node->flags () == AST_Operation::OP_oneway)
     {
       // oneway operation
-      *os << "_tao_call.invoke (ACE_TRY_ENV);";
+      *os << "_tao_call.invoke (_tao_environment);" << be_nl;
     }
   else
     {
       if (node->exceptions ())
         {
-          *os << "_tao_call.invoke (_tao_" << node->flatname ()
+          *os << "_tao_call.invoke (_tao_" << node->flatname () 
               << "_exceptiondata, "
               << node->exceptions ()->length ()
-              << ", ACE_TRY_ENV);";
+              << ", _tao_environment);" << be_nl;
         }
       else
         {
-          *os << "_tao_call.invoke (0, 0, ACE_TRY_ENV);";
+          *os << "_tao_call.invoke (0, 0, _tao_environment);" << be_nl;
         }
-    }
-
-  *os << be_uidt_nl;
-  // check if there is an exception
-  if (this->gen_check_exception (bt) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_cs::"
-                         "gen_marshal_and_invoke - "
-                         "codegen for checking exception failed\n"),
-                        -1);
-    }
-
-  *os << be_nl
-      << "if (_invoke_status == TAO_INVOKE_RESTART)" << be_idt_nl
-      << "continue;" << be_uidt_nl
-      << "// if (_invoke_status == TAO_INVOKE_EXCEPTION)" << be_idt_nl
-      << "// cannot happen" << be_uidt_nl
-      << "if (_invoke_status != TAO_INVOKE_OK)" << be_nl
-      << "{" << be_idt_nl;
 
-  if (this->gen_raise_exception (bt,
-                                 "CORBA::UNKNOWN",
-                                 "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES") == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_cs::"
-                         "gen_marshal_and invoke - "
-                         "codegen for return var failed\n"),
-                        -1);
+      *os << "// Exceptions will be caught here\n";
+      // check if there is an exception
+      if (this->gen_check_exception (bt) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_cs::"
+                             "gen_marshal_and_invoke - "
+                             "codegen for checking exception failed\n"),
+                            -1);
+      
+        }
+  
     }
 
-  *os << be_uidt_nl
-      << "}" << be_nl
-      << "break;" << be_nl
-      << be_uidt_nl << "}" << be_nl;
-
   // the code below this is for 2way operations only
 
-  if (this->void_return_type (bt) &&
-      !this->has_param_type (node, AST_Argument::dir_INOUT) &&
-      !this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-      return 0;
-    }
-
-  // Do any post_invoke stuff that might be necessary.
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_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_cs::"
-                         "gen_marshal_and_invoke - "
-                         "codegen for args in post do_static_call\n"),
-                        -1);
-    }
-
-
-  // Generate any temporary variables to demarshal the arguments
-  ctx = *this->ctx_;
-  be_visitor_compiled_args_decl vis1 (new be_visitor_context (ctx));
-  if (node->accept (&vis1) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_cs::"
-                         "gen_pre_stub_info - "
-                         "codegen for pre args failed\n"),
-                        -1);
-    }
-
-  if (!this->void_return_type (bt))
-    {
-      // Generate any temporary variables to demarshal the return value
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
+    {  
+      // Do any post_invoke stuff that might be necessary.
       ctx = *this->ctx_;
-      be_visitor_context *new_ctx =
-        new be_visitor_context (ctx);
-      be_visitor_operation_compiled_rettype_post_docall vis2 (new_ctx);
-      if (bt->accept (&vis2) == -1)
+      ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_POST_INVOKE_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_cs::"
-                             "gen_pre_stub_info - "
-                             "codegen rettype [post docall] failed\n"),
+                             "gen_marshal_and_invoke - "
+                             "codegen for args in post do_static_call\n"),
                             -1);
         }
-    }
-
-  // check if there was a user exception, else demarshal the
-  // return val (if any) and parameters (if any) that came with
-  // the response message
-  *os << "TAO_InputCDR &_tao_in = _tao_call.inp_stream ();" << be_nl
-      << "if (!(\n" << be_idt << be_idt << be_idt;
-
+      // check if there was a user exception, else demarshal the return val (if
+      // any) and parameters (if any) that came with the response message 
+      os->indent ();
+      *os << "if (_invoke_status == TAO_GIOP_NO_EXCEPTION)" << be_nl
+          << "{" << be_idt << "\n";
+
+      os->indent ();
+      // grab the incoming stream
+      *os << "TAO_InputCDR &_tao_in = _tao_call.inp_stream ();" << be_nl;
+      *os << "if (!(\n" << be_idt;
+    }
+  
+  
   if (!this->void_return_type (bt))
     {
-      // demarshal the return val
+      // demarshal the return val and each inout and out argument
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_RETVAL_INVOKE_CS);
       ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -882,15 +850,19 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                              "codegen for return var failed\n"),
                             -1);
         }
+      if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
+          this->has_param_type (node, AST_Argument::dir_OUT))
+        {
+          // there are more to follow
+          *os << " &&\n";
+        }
     }
-
+  
   if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
       this->has_param_type (node, AST_Argument::dir_OUT))
     {
-      if (!this->void_return_type (bt))
-          *os << " &&\n";
-
-      // demarshal each out and inout argument
+      
+      // marshal each in and inout argument
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_INVOKE_CS);
       ctx.sub_state (TAO_CodeGen::TAO_CDR_INPUT);
@@ -905,17 +877,16 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                             -1);
         }
     }
-
+  
   if (!this->void_return_type (bt) ||
       this->has_param_type (node, AST_Argument::dir_INOUT) ||
       this->has_param_type (node, AST_Argument::dir_OUT))
     {
-
-      *os << be_uidt << be_uidt << be_nl
-          << "))" << be_nl;
+      
+      *os << be_uidt_nl << "))\n" << be_idt;
       // if marshaling fails, raise exception
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES") == -1)
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_cs::"
@@ -923,8 +894,27 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation
                              "codegen for return var failed\n"),
                             -1);
         }
-      *os << be_uidt;
+      *os << be_uidt << be_uidt << "\n";
+      os->indent ();
+      *os << "}" << be_nl;
+      // else something has terribly gone wrong
+      *os << "else" << be_nl
+          << "{" << be_idt << "\n";
+      // if this operation is not supposed to raise a user defined exception, then
+      // flag an UNKNOWN exception error
+      if (this->gen_raise_exception (bt, "CORBA::UNKNOWN", 
+                                     "CORBA::COMPLETED_MAYBE") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_cs::"
+                             "gen_marshal_and invoke - "
+                             "codegen for return var failed\n"),
+                            -1);
+        }
+      *os << be_uidt_nl << "}\n";
     }
-
+  
   return 0;
 }
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 0e3244afec0..856be64611b 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -139,7 +139,7 @@ be_visitor_operation_sh::visit_operation (be_operation *node)
           << "void *_tao_obj, " << be_nl
           << "void *_tao_context, " << be_nl
           << "CORBA::Environment &_tao_env = " << be_idt_nl
-	  << "CORBA::default_environment ()"
+	  << "CORBA::Environment::default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt << "\n\n";
     }
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 433346ef360..7ab0f6d3daa 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -18,12 +18,11 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#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, operation_ss, "$Id$")
 
@@ -112,7 +111,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << "CORBA::ServerRequest &_tao_server_request, " << be_nl
       << "void *_tao_object_reference, " << be_nl
       << "void * /* context */, " << be_nl
-      << "CORBA::Environment &ACE_TRY_ENV" << be_uidt << be_uidt_nl
+      << "CORBA::Environment &_tao_environment" << be_uidt << be_uidt_nl
       << ")" << be_nl;
 
   // generate the actual code for the skeleton. However, if any of the argument
@@ -135,7 +134,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   //  *os << "CORBA::Environment _tao_skel_environment;" << be_nl;
   // get the right object implementation.
   *os << intf->full_skel_name () << " *_tao_impl = ("
-      << intf->full_skel_name () << " *)_tao_object_reference;\n\n";
+      << intf->full_skel_name () << " *)_tao_object_reference;\n";
 
   // declare a return type variable
   be_visitor_context ctx = *this->ctx_;
@@ -221,7 +220,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
     *os << ",\n";
   os->indent ();
   //  *os << "_tao_skel_environment";
-  *os << "ACE_TRY_ENV";
+  *os << "_tao_environment";
   // end the upcall
   *os << be_uidt_nl;
   *os << ");\n";
@@ -229,7 +228,7 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
   if (node->flags () != AST_Operation::OP_oneway)
     {
       os->indent ();
-      *os << "ACE_CHECK;\n";
+      *os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);\n";
     }
 
   // do any post processing for the arguments
@@ -340,27 +339,27 @@ int
 be_visitor_operation_ss::gen_raise_exception (be_type *,
                                               const char *excep,
                                               const char *completion_status,
-                                              const char * /* env */)
+                                              const char *env)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
   os->indent ();
-  *os << "ACE_THROW ("
-      << excep << " (" << completion_status << ") "
-      << ");\n";
+  *os << "TAO_THROW_ENV ("
+      << excep << " (" << completion_status << "), "
+      << env << ");\n";
   return 0;
 }
 
 int
-be_visitor_operation_ss::gen_check_exception (be_type *, const char * /* env */)
+be_visitor_operation_ss::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";
-
+  *os << "TAO_CHECK_ENV_RETURN_VOID ("
+      << env << ");\n";
+  
   return 0;
 }
 
@@ -493,7 +492,7 @@ be_interpretive_visitor_operation_ss::gen_demarshal_params (be_operation *node,
   // setup parameters for demarshaling and demarshal them
   os->indent ();
   *os << "_tao_server_request.demarshal (" << be_idt_nl
-      << "ACE_TRY_ENV, " << be_nl
+      << "_tao_environment, " << be_nl
       << "&";
   // check if we are an attribute node in disguise
   if (this->ctx_->attribute ())
@@ -541,7 +540,7 @@ be_interpretive_visitor_operation_ss::gen_demarshal_params (be_operation *node,
   *os << be_uidt_nl;
   *os << ");" << be_nl;
 
-  *os << "ACE_CHECK;\n";
+  *os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);\n";
 
   return 0;
 }
@@ -558,7 +557,7 @@ be_interpretive_visitor_operation_ss::gen_marshal_params (be_operation *node,
   // outgoing stream
   os->indent ();
   *os << "_tao_server_request.marshal (" << be_idt_nl
-      << "ACE_TRY_ENV, " << be_nl
+      << "_tao_environment, " << be_nl
     //      << "_tao_skel_environment, " << be_nl
       << "&";
   // check if we are an attribute node in disguise
@@ -659,7 +658,7 @@ be_compiled_visitor_operation_ss::gen_demarshal_params (be_operation *node,
       this->has_param_type (node, AST_Argument::dir_INOUT))
     {
       os->indent ();
-
+      
       // demarshal the in and inout arguments
       *os << "if (!(\n" << be_idt;
 
@@ -680,9 +679,9 @@ be_compiled_visitor_operation_ss::gen_demarshal_params (be_operation *node,
       *os << be_uidt_nl << "))\n" << be_idt;
 
       // if marshaling fails, raise exception
-      if (this->gen_raise_exception (bt, "CORBA::MARSHAL",
-                                     "",
-                                     "ACE_TRY_ENV") == -1)
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO",
+                                     "_tao_environment") == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "(%N:%l) be_compiled_visitor_operation_ss::"
@@ -691,15 +690,15 @@ be_compiled_visitor_operation_ss::gen_demarshal_params (be_operation *node,
                             -1);
         }
       *os << be_uidt << "\n";
-
+      
     };
-
+  
   return 0;
 }
 
 int
 be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node,
-                                                      be_type *bt)
+                                                          be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   be_visitor *visitor;
@@ -712,53 +711,21 @@ be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node,
   // We will be here only if we are 2way
   // first initialize a reply message
   os->indent ();
-  *os << "_tao_server_request.init_reply (ACE_TRY_ENV);\n";
+  *os << "_tao_server_request.init_reply (_tao_environment);\n";
 
   // We still need the following check because we maybe 2way and yet have no
   // parameters and a void return type
-  if (this->void_return_type (bt) &&
-      !this->has_param_type (node, AST_Argument::dir_INOUT) &&
-      !this->has_param_type (node, AST_Argument::dir_OUT))
-    {
-      return 0;
-    }
-
-  // grab the incoming stream
-  os->indent ();
-  *os << "ACE_CHECK;" << be_nl;
-
-  // Create temporary variables for the out and return parameters..
-  if (!this->void_return_type (bt))
-    {
-      ctx = *this->ctx_;
-      be_visitor_context *new_ctx =
-        new be_visitor_context (ctx);
-      be_visitor_operation_compiled_rettype_post_upcall visitor (new_ctx);
-      if (bt->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_compiled_visitor_operation_ss::"
-                             "gen_marshal_params - "
-                             "codegen for return var [post upcall] failed\n"),
-                            -1);
-        }
-    }
-
-  // Generate any temporary variables to demarshal the arguments
-  ctx = *this->ctx_;
-  be_visitor_compiled_args_post_upcall vis1 (new be_visitor_context (ctx));
-  if (node->accept (&vis1) == -1)
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_cs::"
-                         "gen_pre_stub_info - "
-                         "codegen for pre args failed\n"),
-                        -1);
+      // grab the incoming stream
+      os->indent ();
+      *os << "TAO_CHECK_ENV_RETURN_VOID (_tao_environment);" << be_nl;
+      *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
+      *os << "if (!(\n" << be_idt;
     }
-
-  *os << "TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();" << be_nl;
-  *os << "if (!(\n" << be_idt;
-
+  
   if (!this->void_return_type (bt))
     {
       // demarshal the return val and each inout and out argument
@@ -776,11 +743,11 @@ be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node,
                             -1);
         }
     }
-
+  
   if (this->has_param_type (node, AST_Argument::dir_INOUT) ||
       this->has_param_type (node, AST_Argument::dir_OUT))
     {
-
+      
       if (!this->void_return_type (bt))
         // we have already printed the return val. SO put a &&
         *os << " &&\n";
@@ -800,20 +767,26 @@ be_compiled_visitor_operation_ss::gen_marshal_params (be_operation *node,
                             -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)
+  
+  if (!this->void_return_type (bt) ||
+      this->has_param_type (node, AST_Argument::dir_INOUT) ||
+      this->has_param_type (node, AST_Argument::dir_OUT))
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_compiled_visitor_operation_ss::"
-                         "gen_marshal_params - "
-                         "codegen for raising exception failed\n"),
-                        -1);
+      
+      *os << be_uidt_nl << "))\n" << be_idt;
+      // if marshaling fails, raise exception
+      if (this->gen_raise_exception (bt, "CORBA::MARSHAL", 
+                                     "CORBA::COMPLETED_NO",
+                                     "_tao_environment") == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_compiled_visitor_operation_ss::"
+                             "gen_marshal_params - "
+                             "codegen for raising exception failed\n"),
+                            -1);
+        }
+      *os << be_uidt << be_uidt << "\n";
     }
-  *os << be_uidt << be_uidt << "\n";
-
+  
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index 277021a3a0f..b527420c335 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -46,7 +46,7 @@ int
 be_visitor_operation_rettype::visit_array (be_array *node)
 {
 
-
+  
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -65,7 +65,7 @@ be_visitor_operation_rettype::visit_array (be_array *node)
 int
 be_visitor_operation_rettype::visit_enum (be_enum *node)
 {
-
+ 
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -84,7 +84,7 @@ be_visitor_operation_rettype::visit_enum (be_enum *node)
 int
 be_visitor_operation_rettype::visit_interface (be_interface *node)
 {
-
+ 
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -103,7 +103,7 @@ be_visitor_operation_rettype::visit_interface (be_interface *node)
 int
 be_visitor_operation_rettype::visit_interface_fwd (be_interface_fwd *node)
 {
-
+ 
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -122,7 +122,7 @@ be_visitor_operation_rettype::visit_interface_fwd (be_interface_fwd *node)
 int
 be_visitor_operation_rettype::visit_native (be_native *node)
 {
-
+ 
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -141,7 +141,7 @@ be_visitor_operation_rettype::visit_native (be_native *node)
 int
 be_visitor_operation_rettype::visit_predefined_type (be_predefined_type *node)
 {
-
+ 
   TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
   be_type *bt; // return type
 
@@ -271,47 +271,3 @@ be_visitor_operation_rettype::visit_union (be_union *node)
     *os << " *";
   return 0;
 }
-
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_operation_rettype::visit_valuetype (be_valuetype *node)
-{
-
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope (), " *");
-  else {
-    *os << bt->name () << " *";
-  }
-  return 0;
-}
-
-int
-be_visitor_operation_rettype::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (this->ctx_->state () == TAO_CodeGen::TAO_OPERATION_RETTYPE_CH)
-    *os << bt->nested_type_name (this->ctx_->scope (), "*");
-  else {
-    *os << bt->name () << " *";
-  }
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
index fae87d2e2e5..18da2e48a94 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_assign_ss.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -87,33 +87,6 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_operation_rettype_assign_ss::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_assign_ss::
-visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << "_tao_retval = ";
-
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_assign_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
index b1aadb26abe..aa75c4b0fc3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_marshal_ss.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -89,35 +89,6 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_operation_rettype_marshal_ss::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  //  *os << "&_tao_ptr_retval";
-  *os << "&_tao_retval.inout ()";
-
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_marshal_ss::
-visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  //  *os << "&_tao_ptr_retval";
-  *os << "&_tao_retval.inout ()";
-
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_marshal_ss::
 visit_predefined_type (be_predefined_type *node)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_docall_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_docall_cs.cpp
index 9c43261e406..52d013c259f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_docall_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_docall_cs.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -59,7 +59,7 @@ be_visitor_operation_rettype_post_docall_cs::visit_interface (be_interface *node
 
   os->indent ();
   *os << "_tao_retval = " << bt->name ()
-      << "::_narrow (_tao_base_retval, ACE_TRY_ENV);" << be_nl;
+      << "::_narrow (_tao_base_retval, _tao_environment);" << be_nl;
   *os << "CORBA::release (_tao_base_retval);\n";
   return 0;
 }
@@ -78,47 +78,7 @@ visit_interface_fwd (be_interface_fwd *node)
 
   os->indent ();
   *os << "_tao_retval = " << bt->name ()
-      << "::_narrow (_tao_base_retval, ACE_TRY_ENV);" << be_nl;
+      << "::_narrow (_tao_base_retval, _tao_environment);" << be_nl;
   *os << "CORBA::release (_tao_base_retval);\n";
   return 0;
 }
-
-// ****************************************************************
-
-be_visitor_operation_compiled_rettype_post_docall::
-    be_visitor_operation_compiled_rettype_post_docall (be_visitor_context *ctx)
-      : be_visitor_decl (ctx)
-{
-}
-
-int
-be_visitor_operation_compiled_rettype_post_docall::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt = node;
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-
-  *os << bt->name () << "_forany _tao_retval_forany ("
-      << be_idt << be_idt_nl
-      << "_tao_retval" << be_uidt_nl
-      << ");\n" << be_uidt;
-  return 0;
-}
-
-int
-be_visitor_operation_compiled_rettype_post_docall::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_post_docall::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp
index d30a99cc54f..85e9aa175c6 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_post_upcall_ss.cpp
@@ -19,9 +19,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -111,43 +111,3 @@ be_visitor_operation_rettype_post_upcall_ss::visit_union (be_union *)
 {
   return 0;
 }
-
-// ****************************************************************
-
-be_visitor_operation_compiled_rettype_post_upcall::
-    be_visitor_operation_compiled_rettype_post_upcall (be_visitor_context *ctx)
-      : be_visitor_decl (ctx)
-{
-}
-
-int
-be_visitor_operation_compiled_rettype_post_upcall::visit_array (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt = node;
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-
-  *os << bt->name () << "_forany _tao_retval_forany ("
-      << be_idt << be_idt_nl
-      << "_tao_retval.inout ()" << be_uidt_nl
-      << ");\n" << be_uidt;
-  return 0;
-}
-
-int
-be_visitor_operation_compiled_rettype_post_upcall::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // set the alias node
-  if (node->primitive_base_type ()->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_operation_rettype_post_upcall::"
-                         "visit_typedef - "
-                         "accept on primitive type failed\n"),
-                        -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index 760209f4738..59885aa6786 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -87,32 +87,6 @@ be_visitor_operation_rettype_return_cs::visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_operation_rettype_return_cs::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  //os->indent ();
-  //*os << "return _tao_retval;\n";
-  *os << "_tao_retval";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_return_cs::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  //os->indent ();
-  //*os << "return _tao_retval;\n";
-  *os << "_tao_retval";
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_return_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
index 2dc75fbe214..5613cffe2db 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_cs.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
@@ -56,7 +56,7 @@ be_visitor_operation_rettype_vardecl_cs::visit_array (be_array *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_slice *_tao_retval = 0;\n\n";
+  *os << bt->name () << "_slice *_tao_retval = 0;\n";
   return 0;
 }
 
@@ -108,42 +108,6 @@ be_visitor_operation_rettype_vardecl_cs::visit_interface_fwd (be_interface_fwd *
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "* _tao_retval = 0;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-  be_type *bt; // return type
-
-  if (this->ctx_->alias ()) // a typedefed return type
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  os->indent ();
-  *os << bt->name () << "* _tao_retval = 0;\n";
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_vardecl_cs::visit_predefined_type (be_predefined_type *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
index b368ff8fc43..3bd34ae366f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_vardecl_ss.cpp
@@ -19,20 +19,20 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_operation.h"
 
 ACE_RCSID(be_visitor_operation, rettype_vardecl_ss, "$Id$")
 
 
-// ************************************************************************
+// ********************************************************************************
 //    be_visitor_operation_rettype_vardecl_ss
 //    This visitor generates code for variable declaration and initialization
 //    of the return type.
-// ************************************************************************
+// ********************************************************************************
 
 be_visitor_operation_rettype_vardecl_ss::be_visitor_operation_rettype_vardecl_ss
 (be_visitor_context *ctx)
@@ -57,7 +57,11 @@ be_visitor_operation_rettype_vardecl_ss::visit_array (be_array *node)
     bt = node;
 
   os->indent ();
-  *os << bt->name () << "_var _tao_retval;\n\n";
+#if 0 /* ASG */
+  *os << bt->name () << "_var _tao_retval;" << be_nl;
+  *os << bt->name () << "_slice *&_tao_ptr_retval = _tao_retval.out ();\n";
+#endif
+  *os << bt->name () << "_var _tao_retval;\n";
   return 0;
 }
 
@@ -114,31 +118,6 @@ visit_interface_fwd (be_interface_fwd *)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-// like be_compiled_visitor_operation_rettype_vardecl_ss
-int
-be_visitor_operation_rettype_vardecl_ss::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << node->name () << "_var _tao_retval;\n";
-  return 0;
-}
-
-int
-be_visitor_operation_rettype_vardecl_ss::
-visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // grab the out stream
-
-  os->indent ();
-  *os << node->name () << "_var _tao_retval;\n";
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 int
 be_visitor_operation_rettype_vardecl_ss::
 visit_predefined_type (be_predefined_type *node)
@@ -324,3 +303,4 @@ visit_interface_fwd (be_interface_fwd *node)
   *os << node->name () << "_var _tao_retval;\n";
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
index 03340daede0..21ed4b77977 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_si.cpp
@@ -150,7 +150,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
   if (node->argument_count () > 0)
     *os << ",\n";
   os->indent ();
-  *os << "ACE_TRY_ENV" << be_uidt_nl
+  *os << "_tao_environment" << be_uidt_nl
       << ");" << be_uidt_nl
       << "}\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index e02566fca6d..3cf32b20332 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_root.h"
 
@@ -64,63 +64,15 @@ int be_visitor_root::visit_root (be_root *node)
                          "codegen for scope failed\n"), -1);
     }
 
-
-  be_visitor *visitor;
-  be_visitor_context ctx (*this->ctx_);
-
-#ifdef IDL_HAS_VALUETYPE
-  // make one more pass over the entire tree and generate the OBV_ namespaces
-  // and OBV_ classes
-
-  idl_bool obv = 0;
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      obv = 1;
-      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      obv = 1;
-      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      obv = 1;
-      ctx.state (TAO_CodeGen::TAO_MODULE_OBV_CS);
-      break;
-    }
-  if (obv)
-    {
-      visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "NUL visitor\n"
-                             ),  -1);
-        }
-
-      if (visitor->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "failed to generate OBV_ things\n"
-                             ),  -1);
-        }
-      delete visitor;
-    }
-#endif /* IDL_HAS_VALUETYPE */
-
-
   // The next thing we need to do is make one more pass thru the entire tree
   // and generate code for all the <<= and >>= operators for all the
   // user-defined types.
   //
   // XXXASG - this part of the code may be conditionally generated because at
   // times it is not necessary to have these operators at all. TO-DO.
+  be_visitor *visitor;
+  be_visitor_context ctx (*this->ctx_);
 
-  ctx = *this->ctx_;
   switch (this->ctx_->state ())
     {
     case TAO_CodeGen::TAO_ROOT_CH:
@@ -130,7 +82,7 @@ int be_visitor_root::visit_root (be_root *node)
       ctx.state (TAO_CodeGen::TAO_ROOT_ANY_OP_CS);
       break;
 
-    case TAO_CodeGen::TAO_ROOT_IH:
+    case TAO_CodeGen::TAO_ROOT_IH:  
       (void) tao_cg->end_implementation_header (idl_global->be_get_implementation_hdr_fname (0));
       break;
     case TAO_CodeGen::TAO_ROOT_SH:
@@ -170,7 +122,7 @@ int be_visitor_root::visit_root (be_root *node)
                              "NUL visitor\n"
                              ),  -1);
         }
-
+      
       // generate the << and >> operators for all the user-defined
       // data types in the outermost scope
       if (node->accept (visitor) == -1)
@@ -183,7 +135,7 @@ int be_visitor_root::visit_root (be_root *node)
         }
       delete visitor;
     }
-
+  
   // make one more pass over the entire tree and generate the CDR << and >>
   // operators for compiled marshaling. Again, this code can be conditionally
   // generated if compiled marshaling is desired.
@@ -212,7 +164,9 @@ int be_visitor_root::visit_root (be_root *node)
                            "Bad context state\n"
                            ), -1);
       }
-    }  visitor = tao_cg->make_visitor (&ctx);
+    }
+
+  visitor = tao_cg->make_visitor (&ctx);
   if (!visitor)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -350,8 +304,6 @@ be_visitor_root::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -425,8 +377,6 @@ be_visitor_root::visit_exception (be_exception *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -577,9 +527,7 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
-                return 0; // nothing to be done
+      return 0; // nothing to be done
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -613,149 +561,6 @@ be_visitor_root::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-// visit an valuetype
-int
-be_visitor_root::visit_valuetype (be_valuetype *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_IH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-    case TAO_CodeGen::TAO_ROOT_IS:
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
-      return 0;    // nothing to do, resp. not yet impl.
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_valuetype - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_valuetype - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_valuetype - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit an valuetype_fwd
-int
-be_visitor_root::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_ROOT_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CH);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CI:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_FWD_CDR_OP_CI);
-      break;
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CH:
-    case TAO_CodeGen::TAO_ROOT_CDR_OP_CI:
-    case TAO_CodeGen::TAO_ROOT_CS:
-    case TAO_CodeGen::TAO_ROOT_SH:
-    case TAO_CodeGen::TAO_ROOT_SI:
-    case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
-                return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_root::"
-                           "visit_valuetype_fwd - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_valuetype_fwd - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_root::"
-                         "visit_valuetype_fwd - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 // visit an module
 int
 be_visitor_root::visit_module (be_module *node)
@@ -879,8 +684,6 @@ be_visitor_root::visit_structure (be_structure *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -954,8 +757,6 @@ be_visitor_root::visit_union (be_union *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
@@ -1029,8 +830,6 @@ be_visitor_root::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_ROOT_SH:
     case TAO_CodeGen::TAO_ROOT_SI:
     case TAO_CodeGen::TAO_ROOT_SS:
-        case TAO_CodeGen::TAO_ROOT_IS:
-        case TAO_CodeGen::TAO_ROOT_IH:
       return 0; // nothing to be done
     default:
       {
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index 79fb96574fe..29e8467536d 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -61,42 +61,42 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "ACE_NEW (_tao_any_val, " << node->name ()
       << " (_tao_elem));" << be_nl
       << "if (!_tao_any_val) return;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name ()
-      << ", _tao_any_val, 1, ACE_TRY_ENV);"
+      << ", _tao_any_val, 1, TAO_TRY_ENV);"
       << " // copy the value" << be_nl
-      << "ACE_TRY_CHECK; " << be_uidt_nl
+      << "TAO_CHECK_ENV; " << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_any_val;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "void operator<<= (CORBA::Any &_tao_any, "
       << node->name () << " *_tao_elem) // non copying" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem, 0, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "_tao_elem, 0, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY {}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_CATCHANY {}" << be_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << " *&_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_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
-      << "ACE_TRY_CHECK;" << be_nl
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "if (_tao_any.any_owns_data ())" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = (" << node->name () << " *)_tao_any.value ();"
@@ -107,16 +107,16 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);"
       << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", _tao_elem, 0, ACE_TRY_ENV)" << be_nl
+      << ", _tao_elem, 0, TAO_TRY_ENV)" << be_nl
       << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
       << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", _tao_elem, 1, ACE_TRY_ENV);"
+      << node->tc_name () << ", _tao_elem, 1, TAO_TRY_ENV);"
       << be_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl  // decode failed
@@ -125,12 +125,12 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "}" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_elem;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
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 78af3073c5f..c5c6c4250dc 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
@@ -373,13 +373,6 @@ be_visitor_sequence_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         case TAO_CodeGen::TAO_CDR_OUTPUT:
           *os << " ((const char *)_tao_sequence.get_buffer (), ";
           break;
-        default:
-          // error
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_sequence_cdr_op_cs"
-                             "::visit_predefined_type - "
-                             "bad codegen substate\n"),
-                            -1);
         }
       break;
     default:
@@ -512,7 +505,7 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
             else
               {
                 *os << "CORBA::Any::to_string (_tao_sequence[i].out (), "
-                    << str->max_size ()->ev ()->u.ulval - 1 << ")"; 
+                    << str->max_size ()->ev ()->u.ulval << ")"; 
               }
           }
           break;
@@ -573,8 +566,6 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                 *os << ".in ()";
               }
           }
-        default:
-          break;
         }
       *os << ");";
       break;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
index b453bbe12d2..f9e2ef18168 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp
@@ -46,7 +46,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -87,7 +87,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
 
   // constructor
   *os << class_name << " (CORBA::ULong length," << be_idt_nl;
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -118,14 +118,14 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
       << "// Read-write accessor." << be_nl;
 
   // allocbuf
-  *os << "static ";
-  pt->accept (visitor);
+  *os << "static "; 
+  pt->accept (visitor); 
   *os << " **allocbuf (CORBA::ULong length); "
       << "// Allocate storage for a sequence.." << be_nl;
 
   // freebuf
-  *os << "static void freebuf (";
-  pt->accept (visitor);
+  *os << "static void freebuf ("; 
+  pt->accept (visitor); 
   *os << " **buffer);" << be_nl;
 
   // allocate_buffer
@@ -136,12 +136,12 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   *os << "virtual void _deallocate_buffer (void);" << be_nl;
 
   // get_buffer
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
 
   // get_buffer
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << "* *get_buffer (void) const;" << be_nl;
 
   // _shrink_buffer
@@ -157,7 +157,7 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
 	  << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
-	  << "CORBA::default_environment ()"
+	  << "CORBA::Environment::default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt_nl;
 
@@ -179,3 +179,4 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node)
   delete visitor;
   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 67518bd6354..83be07c508f 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
@@ -45,7 +45,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
       // get the primitive base type of this typedef node
@@ -54,7 +54,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
     }
   else
     pt = bt;
-
+  
   const char * class_name = node->instance_name ();
 
   static char full_class_name [NAMEBUFSIZE];
@@ -107,12 +107,12 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   // some compilers give lost of warnings.
 
   // allocbuf
-  *os << "ACE_INLINE "; pt->accept (visitor);
+  *os << "ACE_INLINE "; pt->accept (visitor); 
   *os << " **" << be_nl;
   *os << full_class_name << "::allocbuf (CORBA::ULong length) "
       << "// Allocate storage for a sequence.." << be_nl
       << "{" << be_idt_nl;
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -125,45 +125,45 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
     }
   *os <<" **buf;" << be_nl
       << be_nl
-      << "ACE_NEW_RETURN (buf, ";
-  pt->accept (visitor);
+      << "ACE_NEW_RETURN (buf, "; 
+  pt->accept (visitor); 
   *os << "*[" << node->max_size () << "], 0);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl
-      << "buf[i] = ";
-  pt->accept (visitor);
+      << "buf[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << be_nl
       << "return buf;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // freebuf
   *os << "ACE_INLINE void" << be_nl
-      << full_class_name << "::freebuf (";
-  pt->accept (visitor);
+      << full_class_name << "::freebuf ("; 
+  pt->accept (visitor); 
   *os << " **buffer)" << be_nl
       << "{" << be_idt_nl
       << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_idt_nl
-      << "if (buffer[i] != ";
-  pt->accept (visitor);
+      << "if (buffer[i] != "; 
+  pt->accept (visitor); 
   *os << "::_nil ())" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (buffer[i]);" << be_nl
-      << "buffer[i] = ";
-  pt->accept (visitor);
+      << "buffer[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << "}" << be_uidt_nl
       << be_nl
       << "delete[] buffer;" << be_uidt_nl
       << "} " << be_nl
       << be_nl;
-
+  
   // constructor
   *os << "// default ctor" << be_nl;
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name << " (void)" << be_idt_nl
-      << "  :  TAO_Bounded_Base_Sequence (" << node->max_size ()
+      << "  :  TAO_Bounded_Base_Sequence (" << node->max_size () 
       << ", " << full_class_name << "::allocbuf (" << node->max_size () << "))" << be_uidt_nl
       << "{" << be_nl
       << "}" << be_nl
@@ -171,7 +171,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // constructor
   *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name
+      << full_class_name << "::" << class_name 
       << " (CORBA::ULong length," << be_idt_nl;
   pt->accept (visitor);
   *os <<"* *value," << be_nl
@@ -179,21 +179,22 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "// Constructor from data." << be_nl
       << "  : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl
       << "{" << be_nl
+      << "  this->_allocate_buffer (" << node->max_size () << ");" << be_nl
       << "}" << be_nl
       << be_nl;
 
   // constructor
   *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name << " (const "
+      << full_class_name << "::" << class_name << " (const " 
       << full_class_name << " &rhs)" << be_nl
       << "// Copy constructor." << be_idt_nl
       << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp1 = allocbuf (" << node->max_size () << ");" << be_nl;
-  pt->accept(visitor);
-  *os <<" ** const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" ** const tmp2 = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << "** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl
       << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
@@ -203,7 +204,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // assignment operator
   *os << "ACE_INLINE " << full_class_name << " &" << be_nl
-      << full_class_name << "::operator= (const "
+      << full_class_name << "::operator= (const " 
       << full_class_name << " &rhs)" << be_nl
       << "// Assignment from another Bounded sequence." << be_nl
       << "{" << be_idt_nl
@@ -212,16 +213,16 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << be_nl
       << "if (this->release_)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **tmp = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " **, this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  pt->accept (visitor);
+      << "tmp[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << "}" << be_nl
       << "// No need to reallocate the buffer since it is always of size" << be_nl
@@ -239,31 +240,31 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << be_nl
       << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl
       << be_nl;
-  pt->accept(visitor);
-  *os <<" **tmp1 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **tmp1 = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " **, this->buffer_);" << be_nl;
-  pt->accept(visitor);
-  *os <<" ** const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" ** const tmp2 = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << "for (CORBA::ULong i=0; i < rhs.length_; ++i)" << be_idt_nl
-      << "tmp1[i] = ";
-  pt->accept (visitor);
+      << "tmp1[i] = "; 
+  pt->accept (visitor); 
   *os << "::_duplicate (tmp2[i]);" << be_uidt_nl
       << "return *this;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // operator[]
   *os << "ACE_INLINE " << object_manager << be_nl
       << full_class_name << "::operator[] (CORBA::ULong index) const"
       << " // Read-write accessor." << be_nl
       << "{" << be_idt_nl
       << "ACE_ASSERT (index < this->maximum_);" << be_nl;
-  pt->accept(visitor);
-  *os <<" **const tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **const tmp = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl
       << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl
       << "}" << be_nl
@@ -271,11 +272,11 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
 
   // get_buffer
   *os << "ACE_INLINE ";
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " **" << be_nl;
   *os << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " **result = 0;" << be_nl
       << "if (orphan == 0)" << be_nl
       << "{" << be_idt_nl
@@ -298,8 +299,8 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "// We set the state back to default and relinquish" << be_nl
       << "// ownership." << be_nl
-      << "result = ACE_reinterpret_cast(";
-  pt->accept (visitor);
+      << "result = ACE_reinterpret_cast("; 
+  pt->accept (visitor); 
   *os << "**,this->buffer_);" << be_nl
       << "this->maximum_ = 0;" << be_nl
       << "this->length_ = 0;" << be_nl
@@ -310,10 +311,10 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
       << "return result;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // get_buffer
-  *os << "ACE_INLINE const ";
-  pt->accept (visitor);
+  *os << "ACE_INLINE const "; 
+  pt->accept (visitor); 
   *os << "* *" << be_nl
       << full_class_name << "::get_buffer (void) const" << be_nl
       << "{" << be_idt_nl
@@ -322,7 +323,7 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   os->gen_endif ();
 
   // generate #endif for AHETI
@@ -331,3 +332,4 @@ be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
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 bea7ce3b364..d1f50bfd03d 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
@@ -45,7 +45,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
     {
       // get the primitive base type of this typedef node
@@ -54,7 +54,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
     }
   else
     pt = bt;
-
+  
   const char * class_name = node->instance_name ();
 
   static char full_class_name [NAMEBUFSIZE];
@@ -120,15 +120,15 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl;
-  pt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **tmp = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << " **, this->buffer_);" << be_nl
       << full_class_name << "::freebuf (tmp);" << be_nl
       << "this->buffer_ = 0;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // destructor
   *os << full_class_name << "::~" << class_name << " (void)" << be_nl
       << "// destructor" << be_nl
@@ -142,7 +142,7 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
       << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
       << "{" << be_idt_nl;
   pt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
+  *os <<" **tmp = ACE_reinterpret_cast ("; 
   pt->accept (visitor);
   *os << " **, this->buffer_);" << be_nl
       << be_nl
@@ -196,3 +196,4 @@ be_visitor_sequence_cs::gen_bounded_obj_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
index 15778c7e2d0..2b6134d63ae 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp
@@ -83,7 +83,7 @@ be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node)
 
   // constructor
   *os << class_name << " (CORBA::ULong length," << be_idt_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<" *data," << be_nl
       << "CORBA::Boolean release = 0);" << be_uidt_nl;
 
@@ -101,23 +101,23 @@ be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node)
   // Accessors
   // operator[]
   *os << "// = Accessors." << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" &operator[] (CORBA::ULong i);// operator []" << be_nl;
 
   // operator[]
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << " &operator[] (CORBA::ULong i) const;" << be_nl;
 
   // Static Operations
   *os << "// = Static operations." << be_nl
-      << "static ";
-  pt->accept (visitor);
+      << "static "; 
+  pt->accept (visitor); 
   *os << " *allocbuf (CORBA::ULong); // Allocate storage for the sequence." << be_nl;
 
   // free_buf
-  *os << "static void freebuf (";
-  pt->accept (visitor);
+  *os << "static void freebuf ("; 
+  pt->accept (visitor); 
   *os << " *buffer); // Free the sequence." << be_nl;
 
   // allocate_buffer
@@ -127,18 +127,18 @@ be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node)
   *os << "virtual void _deallocate_buffer (void);" << be_nl;
 
   // get_buffer
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
 
   // get_buffer
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << " *get_buffer (void) const;" << be_nl;
 
   // replace
   *os << "void replace (CORBA::ULong max," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *data," << be_nl
       << "CORBA::Boolean release = 0);" << be_uidt << be_uidt_nl;
 
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..30935cf4c19 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
@@ -93,9 +93,9 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
   // Static Operations
   // allocbuf
   *os << "// = Static operations." << be_nl
-      << "ACE_INLINE ";
+      << "ACE_INLINE "; 
 
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -110,28 +110,28 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << full_class_name << "::allocbuf (CORBA::ULong) "
       << "// Allocate storage for the sequence." << be_nl
       << "{" << be_idt_nl
-      << "return new ";
-  pt->accept (visitor);
+      << "return new "; 
+  pt->accept (visitor); 
   *os << "[" << node->max_size () << "];" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // free_buf
   *os << "ACE_INLINE void " << be_nl
-      << full_class_name << "::freebuf (";
-  pt->accept (visitor);
+      << full_class_name << "::freebuf ("; 
+  pt->accept (visitor); 
   *os << " *buffer) // Free the sequence." << be_nl
       << "{" << be_idt_nl
       << "delete [] buffer;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // Constructor
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name << " (void)" << be_nl
       << "// Default constructor." << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size ()
-      << ", 0, " << full_class_name << "::allocbuf (" << node->max_size ()
+      << "  : TAO_Bounded_Base_Sequence (" << node->max_size () 
+      << ", 0, " << full_class_name << "::allocbuf (" << node->max_size () 
       << "), 0)" << be_nl
       << "{" << be_nl
       << "}" << be_nl
@@ -140,29 +140,30 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
   // constructor
   *os << "ACE_INLINE" << be_nl;
   *os << full_class_name << "::" << class_name << " (CORBA::ULong length," << be_idt_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<" *data," << be_nl
       << "CORBA::Boolean release)" << be_uidt_nl
       << "// Constructor using the data and memory management flag." << be_nl
       << "  : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, data, release)" << be_nl
       << "{" << be_nl
+      << "  this->_allocate_buffer (" << node->max_size () << ");" << be_nl 
       << "}" << be_nl
       << be_nl;
 
   // constructor
   *os << "ACE_INLINE" << be_nl
-      << full_class_name << "::" << class_name
+      << full_class_name << "::" << class_name 
       << " (const " << full_class_name << " &rhs)" << be_nl
       << "// Copy constructor." << be_idt_nl
       << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
-  *os <<" *tmp1 = " << full_class_name << "::allocbuf (" << node->max_size ()
+  pt->accept(visitor); 
+  *os <<" *tmp1 = " << full_class_name << "::allocbuf (" << node->max_size () 
       << ");" << be_nl
       << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" * const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
@@ -188,13 +189,13 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << be_nl
       <<"TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl
       << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<"* tmp1 = ACE_reinterpret_cast (";
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " *, this->buffer_);" << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<"* const tmp2 = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
@@ -203,44 +204,44 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << "return *this;" << be_uidt_nl << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // Accessors
   *os << "// = Accessors." << be_nl;
   *os << "ACE_INLINE ";
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " &" << be_nl;
   *os << full_class_name << "::operator[] (CORBA::ULong i)// operator []" << be_nl
       << "{" << be_idt_nl
       << "ACE_ASSERT (i < this->maximum_);" << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << "*,this->buffer_);" << be_nl
       << "return tmp[i];" << be_uidt_nl
       << "}" << be_nl;
 
-  *os << "ACE_INLINE const ";
-  pt->accept (visitor);
+  *os << "ACE_INLINE const "; 
+  pt->accept (visitor); 
   *os << " &" << be_nl
       << full_class_name << "::operator[] (CORBA::ULong i) const// operator []" << be_nl
       << "{" << be_idt_nl
       << "ACE_ASSERT (i < this->maximum_);" << be_nl
-      << "const ";
-  pt->accept (visitor);
+      << "const "; 
+  pt->accept (visitor); 
   *os << "* tmp = ACE_reinterpret_cast (const ";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << "* ACE_CAST_CONST,this->buffer_);" << be_nl
       << "return tmp[i];" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // get_buffer
   *os << "ACE_INLINE ";
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " *" << be_nl
       << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " *result = 0;" << be_nl
       << "if (orphan == 0)" << be_nl
       << "{" << be_idt_nl
@@ -263,8 +264,8 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "// We set the state back to default and relinquish" << be_nl
       << "// ownership." << be_nl
-      << "result = ACE_reinterpret_cast(";
-  pt->accept (visitor);
+      << "result = ACE_reinterpret_cast("; 
+  pt->accept (visitor); 
   *os << "*,this->buffer_);" << be_nl
       << "this->maximum_ = 0;" << be_nl
       << "this->length_ = 0;" << be_nl
@@ -275,10 +276,10 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << "return result;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // get_buffer
-  *os << "ACE_INLINE const ";
-  pt->accept (visitor);
+  *os << "ACE_INLINE const "; 
+  pt->accept (visitor); 
   *os << " *" << be_nl
       << full_class_name << "::get_buffer (void) const" << be_nl
       << "{" << be_idt_nl
@@ -287,12 +288,12 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
   *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // replace
   *os << "ACE_INLINE void " << be_nl
       << full_class_name << "::replace (CORBA::ULong max," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *data," << be_nl
       << "CORBA::Boolean release)" << be_uidt_nl
       << "{" << be_idt_nl
@@ -300,21 +301,21 @@ be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node)
       << "this->length_ = length;" << be_nl
       << "if (this->buffer_ && this->release_ == 1)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<"* tmp = ACE_reinterpret_cast(";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << "* ACE_CAST_CONST, this->buffer_);" << be_nl
       << full_class_name << "::freebuf (tmp);" << be_uidt_nl
       << "}" << be_nl
       << "this->buffer_ = data;" << be_nl
       << "this->release_ = release;" << be_uidt_nl
       << "}" << be_nl;
-
+  
   os->gen_endif (); // endif macro
-
+  
   // generate #endif for AHETI
   os->gen_endif_AHETI();
-
+  
   delete visitor;
   return 0;
 }
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 6e4ca76da43..005b454c57f 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
@@ -92,7 +92,7 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
       << "// allocate a buffer of the requested length. The buffer is allocated for the" << be_nl
       << "// right type" << be_nl
       << "{" << be_idt_nl
-      << "this->buffer_ = " << full_class_name << "::allocbuf ("
+      << "this->buffer_ = " << full_class_name << "::allocbuf (" 
       << node->max_size () << ");" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
@@ -104,15 +104,15 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " *, this->buffer_);" << be_nl
       << full_class_name << "::freebuf (tmp);" << be_nl
       << "this->buffer_ = 0;" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
-
+  
   // destructor
   *os << full_class_name << "::~" << class_name << " (void) // Dtor." << be_nl
       << "{" << be_idt_nl
@@ -121,10 +121,10 @@ be_visitor_sequence_cs::gen_bounded_sequence (be_sequence *node)
       << be_nl;
 
   os->gen_endif (); // endif macro
-
+  
   // generate #endif for AHETI
   os->gen_endif_AHETI();
-
+  
   delete visitor;
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
index bb34ba31db0..9d8e5bb6251 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp
@@ -45,7 +45,7 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -63,7 +63,7 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
+  
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -71,7 +71,7 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   os->indent ();
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -128,7 +128,7 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
   *os << "const char* *get_buffer (void) const;" << be_nl;
 
   // shrink_buffer
-  *os << "virtual void _shrink_buffer (CORBA::ULong nl,CORBA::ULong ol);"
+  *os << "virtual void _shrink_buffer (CORBA::ULong nl,CORBA::ULong ol);" 
       << be_uidt_nl;
 
   *os << "};\n";
@@ -142,3 +142,4 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
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 5fbb45f457d..cbac57cb55a 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
@@ -66,7 +66,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
+  
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -78,7 +78,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
 #if 0 /* Why is this here? ASG */
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -88,7 +88,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
   else
     pt = bt;
 
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -136,7 +136,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
   // constructor
   *os << "ACE_INLINE" << be_nl
       << full_class_name << "::" << class_name << " (void)" << be_nl
-      << "  : TAO_Bounded_Base_Sequence (" << node->max_size ()
+      << "  : TAO_Bounded_Base_Sequence (" << node->max_size () 
       << ", " << full_class_name << "::allocbuf(" << node->max_size () << "))" << be_nl
       << "{" << be_nl
       << "}" << be_nl
@@ -149,6 +149,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
       << "CORBA::Boolean release)" << be_uidt_nl
       << "  : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl
       << "{" << be_nl
+      << "  this->_allocate_buffer (" << node->max_size () << ");" << be_nl
       << "}" << be_nl
       << be_nl;
 
@@ -168,7 +169,7 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
       << be_nl;
 
   // operator=
-  *os << "ACE_INLINE " << full_class_name << "& " << be_nl
+  *os << "ACE_INLINE " << full_class_name << "& " << be_nl 
       << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl
       << "{" << be_idt_nl
       << "if (this == &rhs)" << be_idt_nl
@@ -261,3 +262,4 @@ be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
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 fd712bb818c..87d5e6008a9 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
@@ -66,7 +66,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
   be_visitor_context ctx (*this->ctx_);
   ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CS);
   be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
+  
   // !! branching in either compile time template instantiation
   // or manual template instatiation
   os->gen_ifdef_AHETI();
@@ -78,7 +78,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
 #if 0 /* Why is this here? ASG */
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -88,7 +88,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
   else
     pt = bt;
 
-  // the accept is here the first time used and if an
+  // the accept is here the first time used and if an 
   // error occurs, it will occur here. Later no check
   // for errors will be done.
   if (pt->accept (visitor) == -1)
@@ -107,7 +107,7 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "// For this class memory is never reallocated so the implementation" << be_nl
       << "// is *really* simple." << be_nl
-      << "this->buffer_ = " << full_class_name << "::allocbuf ("
+      << "this->buffer_ = " << full_class_name << "::allocbuf (" 
       << node->max_size () << ");" << be_uidt_nl
       << "}" << be_nl
       << be_nl;
@@ -153,3 +153,4 @@ be_visitor_sequence_cs::gen_bounded_str_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp
index 6a48566cb59..79ebbf95882 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp
@@ -111,10 +111,6 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
   pt->accept (visitor); 
   *os << " *p);" << be_nl;
 
-  // operator -> @@Bala
-  pt->accept (visitor); 
-  *os << "* operator-> (void) const;" << be_nl;
-
   //  cast operator
   *os << "operator const "; 
   pt->accept (visitor); 
@@ -125,9 +121,8 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
   pt->accept (visitor); 
   *os << " *&(); // Cast." << be_nl;
   
-  // @@Bala
   // in method
-  //*os << "const "; 
+  *os << "const "; 
   pt->accept (visitor); 
   *os << " *in (void) const; // in " << be_nl;
                                            
@@ -163,4 +158,3 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node)
   return 0;
 }
 
-
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp
index 872ade7ab2b..394bbb01531 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp
@@ -171,16 +171,6 @@ be_visitor_sequence_ci::gen_object_manager (be_sequence *node)
       << "}" << be_nl
       << be_nl;
   
-  // operator -> @@Bala
-  *os << "ACE_INLINE " << be_nl;
-    pt->accept (visitor);
-  *os << "*"<< be_nl
-      << full_object_manager <<"::operator-> (void) const " << be_nl
-      << "{" << be_idt_nl
-      << "return *this->ptr_;" << be_uidt_nl
-      << "}" << be_nl
-      << be_nl;
-
   //  cast operator
   *os << "ACE_INLINE " << be_nl
       << full_object_manager << "::operator const "; 
@@ -201,8 +191,8 @@ be_visitor_sequence_ci::gen_object_manager (be_sequence *node)
       << "}" << be_nl
       << be_nl;
   
-  // in method @@Bala
-  *os << "ACE_INLINE "; 
+  // in method
+  *os << "ACE_INLINE const "; 
   pt->accept (visitor); 
   *os << " *" << be_nl
       << full_object_manager << "::in (void) const // in " 
@@ -265,5 +255,3 @@ be_visitor_sequence_ci::gen_object_manager (be_sequence *node)
   return 0;
 }
 
-
-
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
index 3edf1668afd..1f9e88780c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp
@@ -47,7 +47,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -73,7 +73,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   os->indent ();
-
+  
   //forward declaration of the object manager;
   *os << "class " << object_manager << ";" << be_nl << be_nl;
 
@@ -92,7 +92,7 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   // constructor
   *os << class_name << " (CORBA::ULong maximum," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<"* *value," << be_nl
       << "CORBA::Boolean release = 0);" << be_uidt_nl;
 
@@ -109,8 +109,8 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   *os << object_manager << " operator[] (CORBA::ULong index) const;" << be_nl;
 
   // allocbuf
-  *os << "static ";
-  pt->accept (visitor);
+  *os << "static "; 
+  pt->accept (visitor); 
   *os << " **allocbuf (CORBA::ULong nelems);" << be_nl;
 
   // freebuf
@@ -126,17 +126,17 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   *os << "virtual void _deallocate_buffer (void);" << be_nl;
 
   // get_buffer
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
 
   // get_buffer
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << "* *get_buffer (void) const;" << be_nl;
 
   // shrink_buffer
   *os << "virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);" << be_nl;
-
+  
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
   if ((pt->node_type () != AST_Decl::NT_pre_defined) ||
       (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) &&
@@ -147,13 +147,13 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
 	  << "void* target," << be_nl
 	  << "CORBA_Object *src," << be_nl
 	  << "CORBA_Environment &ACE_TRY_ENV = "  << be_idt_nl
-	  << "CORBA::default_environment ()"
+	  << "CORBA::Environment::default_environment ()"
 	  << be_uidt << be_uidt_nl
 	  << ");" << be_uidt_nl;
 
       *os << "virtual CORBA_Object* _upcast (void *src) const;" <<  be_nl;
     }
-  *os << be_uidt_nl << "};\n";
+  *os << be_uidt_nl << "};\n"; 
 
   os->gen_endif (); // endif macro
 
@@ -169,3 +169,4 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
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 0a79ee9d5f1..9686a29bd3d 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
@@ -47,7 +47,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
 
   // generate the class name
   be_type  *pt; // base types
-
+      
   if (bt->node_type () == AST_Decl::NT_typedef)
   {
     // get the primitive base type of this typedef node
@@ -101,25 +101,25 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   os->gen_ifdef_macro (class_name);
 
   os->indent ();
-
+  
   // allocate_buffer
   *os << "// The Base_Sequence functions, please see tao/Sequence.h" << be_nl
       << "void" << be_nl
       << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp = " << full_class_name << "::allocbuf (length);" << be_nl
       << be_nl
       << "if (this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
-  *os <<" **old = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **old = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << "**, this->buffer_);" << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
       << "if (!this->release_)" << be_idt_nl
-      << "tmp[i] = ";
-  pt->accept (visitor);
+      << "tmp[i] = "; 
+  pt->accept (visitor); 
   *os << "::_duplicate (old[i]);" << be_uidt_nl
       << "else" << be_idt_nl
       << "tmp[i] = old[i];" << be_uidt_nl << be_uidt_nl
@@ -136,15 +136,15 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       << "{" << be_idt_nl
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" **tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << "**, this->buffer_);" << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  pt->accept (visitor);
+      << "tmp[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << "}" << be_nl
       << full_class_name << "::freebuf (tmp);" << be_nl
@@ -163,21 +163,21 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   *os << "void" << be_nl
       << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept(visitor);
-  *os <<" **tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept(visitor); 
+  *os <<" **tmp = ACE_reinterpret_cast ("; 
+  pt->accept (visitor); 
   *os << "**, this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl
       << "{" << be_idt_nl
       << "CORBA::release (tmp[i]);" << be_nl
-      << "tmp[i] = ";
-  pt->accept (visitor);
+      << "tmp[i] = "; 
+  pt->accept (visitor); 
   *os << "::_nil ();" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl;
 
-
+  
   be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt);
   if ((pt->node_type () != AST_Decl::NT_pre_defined) ||
       (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) &&
@@ -200,7 +200,7 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
       pt->accept (visitor);
       *os << "::_narrow (src, ACE_TRY_ENV);" << be_uidt_nl
 	  << "}\n" << be_nl;
-
+      
       *os << "CORBA_Object*" << be_nl
           << full_class_name << "::_upcast (void *src) const" <<  be_nl
 	  << "{" << be_idt_nl;
@@ -220,3 +220,4 @@ be_visitor_sequence_cs::gen_unbounded_obj_sequence (be_sequence *node)
   delete visitor;
   return 0;
 }
+
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
index f123cb3ae37..24a52859130 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp
@@ -112,22 +112,22 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node)
 
   // Accessors
   *os << "// = Accessors." << be_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<" &operator[] (CORBA::ULong i);" << be_nl;
 
   // operator[]
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << " &operator[] (CORBA::ULong i) const;" << be_nl;
 
   // Static operations
   *os << "// = Static operations." << be_nl
-      << "static ";
-  pt->accept (visitor);
+      << "static "; 
+  pt->accept (visitor); 
   *os << " *allocbuf (CORBA::ULong size);" << be_nl;
 
-  *os << "static void freebuf (";
-  pt->accept (visitor);
+  *os << "static void freebuf ("; 
+  pt->accept (visitor); 
   *os << " *buffer);" << be_nl;
 
   // allocate_buffer
@@ -139,18 +139,18 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node)
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
   *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl
       << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl;
 
   // get_buffer
-  *os << "const ";
-  pt->accept (visitor);
+  *os << "const "; 
+  pt->accept (visitor); 
   *os << " *get_buffer (void) const;" << be_nl;
-
+  
   // replace
   *os << "void replace (CORBA::ULong max," << be_idt_nl
       << "CORBA::ULong length," << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *data," << be_nl
       << "CORBA::Boolean release);" << be_uidt << be_uidt_nl;
 
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 c57f5ee63b2..3a088b4bb8f 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
@@ -91,14 +91,14 @@ be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node)
   *os << "void" << be_nl
       << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<"* tmp = " << full_class_name << "::allocbuf (length);" << be_nl
       << be_nl
       << "if (this->buffer_ != 0)" << be_nl
       << "{" << be_idt_nl;
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os <<" *old = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " *,this->buffer_);" << be_nl
       << be_nl
       << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl
@@ -118,9 +118,9 @@ be_visitor_sequence_cs::gen_unbounded_sequence (be_sequence *node)
       << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl
       << "return;" << be_uidt_nl
       << be_nl;
-  pt->accept(visitor);
+  pt->accept(visitor); 
   *os <<" *tmp = ACE_reinterpret_cast (";
-  pt->accept (visitor);
+  pt->accept (visitor); 
   *os << " *,this->buffer_);" << be_nl
       << be_nl
       << full_class_name << "::freebuf (tmp);" << be_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 d618daf3c56..e256d530afa 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -363,7 +363,6 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
   *os << "typedef " << node->local_name () << " *"
       << node->local_name () << "_ptr;\n";
 
-#if 0
   if (!this->ctx_->tdef ())
     {
       // by using a visitor to declare and define the TypeCode, we have the
@@ -381,7 +380,6 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
                              ), -1);
         }
     }
-#endif
 
   os->gen_endif (); // endif macro
 
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 0a0ca1f7832..47d9d6f8a37 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -271,7 +271,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       << " (void) // dtor" << be_nl
       << "{}\n\n";
 
-#if 0
   if (!this->ctx_->tdef ())
     {
       // by using a visitor to declare and define the TypeCode, we have the
@@ -279,7 +278,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
       // based on the command line options. This is still TO-DO
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-      ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
@@ -290,7 +288,6 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node)
                              ), -1);
         }
     }
-#endif
 
   os->gen_endif ();
   node->cli_stub_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 8bc890ea686..dee524518eb 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -59,41 +59,41 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << node->name () << " *_any_val;" << be_nl
       << "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));" << be_nl
       << "if (!_any_val) return;" << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name ()
-      << ", _any_val, 1, ACE_TRY_ENV);" << " // copy the value" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << ", _any_val, 1, TAO_TRY_ENV);" << " // copy the value" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _any_val;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "void operator<<= (CORBA::Any &_tao_any, "
       << node->name () << " *_tao_elem) // non copying" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem, 1, ACE_TRY_ENV); // consume it" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
+      << "_tao_elem, 1, TAO_TRY_ENV); // consume it" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY {}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_CATCHANY {}" << be_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
   *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
       << node->name () << " *&_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_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
-      << "ACE_TRY_CHECK;" << be_nl
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "if (_tao_any.any_owns_data ())" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = (" << node->name () << " *)_tao_any.value ();"
@@ -104,15 +104,15 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "{" << be_idt_nl
       << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);"
       << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());"
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
       << be_nl
       << "if (stream.decode (" << node->tc_name ()
-      << ", _tao_elem, 0, ACE_TRY_ENV)" << be_nl
+      << ", _tao_elem, 0, TAO_TRY_ENV)" << be_nl
       << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
       << "{" << be_idt_nl
       << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", _tao_elem, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << node->tc_name () << ", _tao_elem, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
       << "}" << be_nl
       << "else" << be_nl
@@ -121,12 +121,12 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "}" << be_uidt_nl
       << "}" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_elem;" << be_nl
       << "return 0; " << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index 830b5a7a0a3..8ab877e8f35 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -50,7 +50,6 @@ int be_visitor_structure_cs::visit_structure (be_structure *node)
       be_visitor *visitor;
       be_visitor_context ctx (*this->ctx_);
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-      ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode.cpp
index 5012a6f795b..9267ece581e 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode.cpp
@@ -30,12 +30,3 @@
 
 ACE_RCSID(be, be_visitor_typecode, "$Id$")
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Node<be_visitor_typecode_defn::QNode*>;
-template class ACE_Unbounded_Queue<be_visitor_typecode_defn::QNode*>;
-template class ACE_Unbounded_Queue_Iterator<be_visitor_typecode_defn::QNode*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Node<be_visitor_typecode_defn::QNode*>
-#pragma instantiate ACE_Unbounded_Queue<be_visitor_typecode_defn::QNode*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<be_visitor_typecode_defn::QNode*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
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 3d8b3c569f1..f9e8584abeb 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_typecode.h"
 
@@ -32,20 +32,12 @@ ACE_RCSID(be_visitor_typecode, typecode_defn, "$Id$")
 // ******************************************************
 
 be_visitor_typecode_defn::be_visitor_typecode_defn (be_visitor_context *ctx)
-  : be_visitor_scope (ctx),
-    computed_tc_size_ (0),
-    computed_encap_len_ (0),
-    computed_scope_encap_len_ (0),
-    tc_offset_ (0),
-    index_ (-1)
-
+  : be_visitor_decl (ctx)
 {
 }
 
 be_visitor_typecode_defn::~be_visitor_typecode_defn (void)
 {
-  this->queue_reset (this->tc_queue_);
-  this->queue_reset (this->compute_queue_);
 }
 
 // the following needs to be done to deal with the most bizarre behavior of
@@ -93,56 +85,24 @@ be_visitor_typecode_defn::gen_nested_namespace_end (be_module *node)
   return 0;
 }
 
-// the visit methods will be called for the top-level node whose typecode is
-// being generated
-
 int
 be_visitor_typecode_defn::visit_type (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // reset the queue
-  this->queue_reset (this->tc_queue_);
-  this->tc_offset_ = 0;
-
-  // check if optimized typecodes are desired OR if the node is involved in
-  // some form of recursion
-  if (idl_global->opt_tc () ||
-      node->in_recursion ())
-    {
-      if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_typecode_defn::"
-                             "visit_type - "
-                             "queue insert failed\n"), 
-                            -1);
-        }
-    }
-
-  os->indent (); // start from current indentation level
-
+  os->indent ();
   // generate the typecode information here
   *os << "static const CORBA::Long _oc_" << node->flatname () << "[] ="
       << be_nl;
   *os << "{" << be_idt << "\n";
-
-  // add the sizeof the enum tk_* and the encap length that we do not put into
-  // this array but which will exist in the CDR buffer
-
-  this->tc_offset_ = 4 + 4; 
-
-
   // note that we just need the parameters here and hence we generate the
   // encapsulation for the parameters
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-  if (node->accept (this) == -1)
+  if (node->gen_encapsulation () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_typecode_defn::"
                          "visit_type - "
-                         "codegen for typecode encapsulation failed\n"), 
-                        -1);
+                         "codegen for typecode failed\n"), -1);
     }
   *os << be_uidt << "};" << be_nl;
 
@@ -220,2708 +180,47 @@ be_visitor_typecode_defn::visit_type (be_type *node)
 int
 be_visitor_typecode_defn::visit_array (be_array *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_enum (be_enum *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      return this->visit_scope (node);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-int
-be_visitor_typecode_defn::visit_enum_val (be_enum_val *node)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_exception (be_exception *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      return this->visit_scope (node);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-int
-be_visitor_typecode_defn::visit_field (be_field *node)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_interface (be_interface *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-int
-be_visitor_typecode_defn::visit_interface_fwd (be_interface_fwd *node)
-{
-  // nothing to do
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::visit_predefined_type (be_predefined_type *node)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      // top level typecodes are defined in the CORBA library. If we show up
-      // here, then it is an error
-      break;
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_sequence (be_sequence *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-int
-be_visitor_typecode_defn::visit_string (be_string *node)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      // top level typecode for string is not permitted. It has to be a
-      // typedefed string 
-      break;
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_structure (be_structure *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      return this->visit_scope (node);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_typedef (be_typedef *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
+  return this->visit_type (node);
 }
 
 int
 be_visitor_typecode_defn::visit_union (be_union *node)
 {
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE:
-      return this->visit_type (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED:
-      return this->gen_typecode (node);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_TC_SIZE:
-      this->computed_tc_size_ = this->compute_tc_size (node);
-      return ((this->computed_tc_size_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      return this->visit_scope (node);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-int
-be_visitor_typecode_defn::visit_union_branch (be_union_branch *node)
-{
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE:
-      return this->gen_encapsulation (node);
-    case TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN:
-      this->computed_encap_len_ = this->compute_encap_length (node);
-      return ((this->computed_encap_len_ > 0) ? 0 : -1);
-    default:
-      // error
-      break;
-    }
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                     ASYS_TEXT ("visit - bad sub state ")
-                     ASYS_TEXT ("in visitor context\n")),
-                    -1);
-}
-
-//  methods that actually produce the typecode and the encapsulations
-
-
-int
-be_visitor_typecode_defn::gen_typecode (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // we do not do typecode optimization for anonymous arrays
-
-  *os << "CORBA::tk_array, // typecode kind" << be_nl;
-  // size of the enum
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // emit the encapsulation length
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                         ASYS_TEXT ("gen_typecode (array) - ")
-                         ASYS_TEXT ("Failed to get encap length\n")),
-                        -1);
-    }
-  *os << this->computed_encap_len_ << ", // encapsulation length" 
-      << be_idt << "\n";
-  // size of the encap length
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // now emit the encapsulation
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn::")
-                         ASYS_TEXT ("gen_typecode - ")
-                         ASYS_TEXT ("gen_encapsulation failed for array\n")),
-                        -1);
-    }
-
-  *os << be_uidt << "\n";
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_array *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *bt; // base type
-  unsigned long i;
-
-  os->indent (); // start from the current indentation level
-
-  // retrieve the base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::gen_encapsulation - "
-                         "bad base type\n"),
-                        -1);
-    }
-
-  // compute the typecode size
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                         ASYS_TEXT ("gen_encapsulation (array) - ")
-                         ASYS_TEXT ("Failed to get typecode size\n")),
-                        -1);
-    }
-
-  for (i = 0; i < (node->n_dims () - 1); i++)
-    {
-      unsigned long rem_encap_len;
-
-      *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-      // size of the encapsulation byte order flag. Although it is 1 byte, the
-      // aligned size is 4 bytes
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      *os << "CORBA::tk_array, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      rem_encap_len
-        = (node->n_dims () - (i + 1)) * (4 + 4)
-        + (node->n_dims () - (i + 2)) * (4 + 4)
-        + this->computed_tc_size_;
-      *os << rem_encap_len << ", // encapsulation length" << be_idt_nl;
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  
-  // now generate the typecode of the base type
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_array::gen_encapsulation - "
-                         "base type typecode gen failed\n"),
-                        -1);
-    }
-
-  os->indent ();
-  // now reduce the indentation appropriately
-  for (i = (node->n_dims () - 1); i > 0; i--)
-    {
-      *os << node->dims ()[i] << "," << be_uidt_nl;
-      // size of the dimension which is a 4 byte quantity
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  *os << node->dims ()[0] << ",\n";
-  // size of the dimension which is a 4 byte quantity
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                            -1);
-            }
-        }
-
-      *os << "CORBA::tk_enum, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (enum) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (enum) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-
-      *os << be_uidt << "\n";
-
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_enum *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  // generate the member count
-  os->indent ();
-  *os << node->member_count () << ", // member count\n";
-  // size of the member length
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // hand over to the scope to generate the typecode for elements
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (enum) - ")
-                         ASYS_TEXT ("cannot generate typecode for members\n")),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_enum_val *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  this->gen_name (node);
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_exception *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      *os << "CORBA::tk_except, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (exception) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (exception) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-
-      *os << be_uidt << "\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_exception *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  // generate the member count
-  os->indent ();
-  *os << node->member_count () << ", // member count\n"; 
-  // size of the member count
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // hand over to the scope to generate the typecode for elements
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (exception) - ")
-                         ASYS_TEXT ("cannot generate typecode for members\n")),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_field *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *bt;  // our type node
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // generate name
-  this->gen_name (node);
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (node->field_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (field) - ")
-                         ASYS_TEXT ("failed to generate typecode\n")),
-                        -1);
-    }
-  // revert the state to what it was before because we may be dealing with
-  // subsequent fields for which we have to be in the "gen scope"
-  // substate 
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      *os << "CORBA::tk_objref, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (interface) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (interface) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-      *os << be_uidt << "\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_interface *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_interface_fwd *node)
-{
-  // nothing to do here
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_interface_fwd *node)
-{
-  // nothing to be done
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_predefined_type *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from the current indentation level
-
-  // size of the enum
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_void:
-      *os << "CORBA::tk_void,\n\n";
-      break;
-    case AST_PredefinedType::PT_short:
-      *os << "CORBA::tk_short,\n\n";
-      break;
-    case AST_PredefinedType::PT_ushort:
-      *os << "CORBA::tk_ushort,\n\n";
-      break;
-    case AST_PredefinedType::PT_long:
-      *os << "CORBA::tk_long,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulong:
-      *os << "CORBA::tk_ulong,\n\n";
-      break;
-    case AST_PredefinedType::PT_longlong:
-      *os << "CORBA::tk_longlong,\n\n";
-      break;
-    case AST_PredefinedType::PT_ulonglong:
-      *os << "CORBA::tk_ulonglong,\n\n";
-      break;
-    case AST_PredefinedType::PT_float:
-      *os << "CORBA::tk_float,\n\n";
-      break;
-    case AST_PredefinedType::PT_double:
-      *os << "CORBA::tk_double,\n\n";
-      break;
-    case AST_PredefinedType::PT_longdouble:
-      *os << "CORBA::tk_longdouble,\n\n";
-      break;
-    case AST_PredefinedType::PT_boolean:
-      *os << "CORBA::tk_boolean,\n\n";
-      break;
-    case AST_PredefinedType::PT_char:
-      *os << "CORBA::tk_char,\n\n";
-      break;
-    case AST_PredefinedType::PT_octet:
-      *os << "CORBA::tk_octet,\n\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      *os << "CORBA::tk_any,\n\n";
-      break;
-    case AST_PredefinedType::PT_wchar:
-      *os << "CORBA::tk_wchar,\n\n";
-      break;
-    case AST_PredefinedType::PT_pseudo:
-      {
-        if (!ACE_OS::strcmp (node->local_name ()->get_string (), "TypeCode"))
-          *os << "CORBA::tk_TypeCode,\n\n";
-        else
-          if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
-            {
-              // check if we are repeated
-              const be_visitor_typecode_defn::QNode *qnode = 
-                this->queue_lookup (this->tc_queue_, node);
-              if (qnode)
-                {
-                  // we are repeated, so we must generate an indirection here
-                  *os << "0xffffffff, // indirection" << be_nl;
-                  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-                  // the offset must point to the tc_kind value of the first occurrence of
-                  // this type
-                  os->print ("0x%x, // negative offset (%ld)\n", 
-                             (qnode->offset - this->tc_offset_), 
-                             (qnode->offset - this->tc_offset_));
-                  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-                }
-              else
-                {
-                  if (idl_global->opt_tc () ||
-                      node->in_recursion ())
-                    {
-                      if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-                        {
-                          ACE_ERROR_RETURN ((LM_ERROR,
-                                             "(%N:%l) be_visitor_typecode_defn::"
-                                             "visit_type - "
-                                             "queue insert failed\n"), 
-                                            -1);
-                        }
-                    }
-                  
-                  *os << "CORBA::tk_objref,\n";
-                  
-                  // reset the compute queue to set the stage for computing our
-                  // encapsulation length
-                  this->queue_reset (this->compute_queue_);
-
-                  // emit the encapsulation length
-                  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-                  if (node->accept (this) == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                                         ASYS_TEXT ("gen_typecode (predefined) - ")
-                                         ASYS_TEXT ("Failed to get encap length\n")),
-                                        -1);
-                    }
-                  // reset the compute queue since we must not affect
-                  // computation of other nodes 
-                  this->queue_reset (this->compute_queue_);
-
-                  *os << this->computed_encap_len_ 
-                      << ", // encapsulation length" << be_idt << "\n";
-                  // size of the encap length
-                  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-                  
-                  // now emit the encapsulation
-                  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-                  if (node->accept (this) == -1)
-                    {
-                      ACE_ERROR_RETURN ((LM_ERROR,
-                                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                                         ASYS_TEXT ("::gen_typecode (predefined objref) - ")
-                                         ASYS_TEXT ("failed to generate encapsulation\n")),
-                                        -1);
-                    }
-                  *os << be_uidt << "\n";
-                }
-            }
-      }
-      break;
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_predefined_type *node)
-{
-  // this one is valid only for "Object"
-  if (!ACE_OS::strcmp (node->local_name ()->get_string (), "Object"))
-    {
-      TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-      os->indent (); // start from whatever indentation level we were at
-
-      *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-      // size of the encapsulation byte order flag. Although it is 1 byte, the
-      // aligned size is 4 bytes
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // generate repoID
-      this->gen_repoID (node);
-
-      // generate name
-      os->indent ();
-      this->gen_name (node);
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // no typecode optimization for anonymous sequences
-
-  *os << "CORBA::tk_sequence, // typecode kind" << be_nl;
-  // size of the enum
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // reset the compute queue to set the stage for computing our
-  // encapsulation length
-  this->queue_reset (this->compute_queue_);
-
-  // emit the encapsulation length
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                         ASYS_TEXT ("gen_typecode (sequence) - ")
-                         ASYS_TEXT ("Failed to get encap length\n")),
-                        -1);
-    }
-  // reset the compute queue since we must not affect computation of other
-  // nodes 
-  this->queue_reset (this->compute_queue_);
-
-  *os << this->computed_encap_len_ << ", // encapsulation length" 
-      << be_idt << "\n";
-  // size of the encap length
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_typecode (sequence) - ")
-                         ASYS_TEXT ("failed to generate encapsulation\n")),
-                        -1);
-    }
-  *os << be_uidt << "\n";
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *bt; // base type
-
-  os->indent ();
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order\n";
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // emit typecode of element type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (sequence) - ")
-                         ASYS_TEXT ("failed to generate typecode\n")),
-                        -1);
-    }
-
-  //  emit the sequence bounds (0 if unbounded)
-  os->indent ();
-  *os << node->max_size () << ",\n";
-  // size of the bound length
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_string *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  // no typecode optimizations for anonymous strings
-
-  os->indent (); // start from the current indentation level
-  // emit the enumeration
-  *os << "CORBA::tk_string, " << be_nl;
-  // size of the enum
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // emit the string bounds (0 if unbounded)
-  *os << node->max_size () << ", // string length\n";
-  // size of the bounds
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_string *node)
-{
-  // nothing to be done here
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-  
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      *os << "CORBA::tk_struct, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (struct) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (structure) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-      *os << be_uidt << "\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_structure *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  // generate the member count
-  os->indent ();
-  *os << node->member_count () << ", // member count\n";
-  // size of the member count
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // hand over to the scope to generate the typecode for elements
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_structure: cannot generate typecode for members\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_typedef *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      *os << "CORBA::tk_alias, // typecode kind for typedefs" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (typedef) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (typedef) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-
-      *os << be_uidt << "\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_typedef *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *bt; // base type
-
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  // generate typecode for the base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (typedef) - ")
-                         ASYS_TEXT ("failed to generate typecode\n")),
-                        -1);
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_typecode (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-
-  os->indent (); // start from whatever indentation level we were at
-
-  // check if we are repeated
-  const be_visitor_typecode_defn::QNode *qnode = 
-    this->queue_lookup (this->tc_queue_, node);
-  if (qnode)
-    {
-      // we are repeated, so we must generate an indirection here
-      *os << "0xffffffff, // indirection" << be_nl;
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // the offset must point to the tc_kind value of the first occurrence of
-      // this type
-      os->print ("0x%x, // negative offset (%ld)\n", 
-                 (qnode->offset - this->tc_offset_), 
-                 (qnode->offset - this->tc_offset_));
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->tc_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "visit_type - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      *os << "CORBA::tk_union, // typecode kind" << be_nl;
-      // size of the enum
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // reset the compute queue to set the stage for computing our
-      // encapsulation length
-      this->queue_reset (this->compute_queue_);
-
-      // emit the encapsulation length
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) - be_visitor_typecode_defn")
-                             ASYS_TEXT ("gen_typecode (union) - ")
-                             ASYS_TEXT ("Failed to get encap length\n")),
-                            -1);
-        }
-      // reset the compute queue since we must not affect computation of other
-      // nodes 
-      this->queue_reset (this->compute_queue_);
-
-      *os << this->computed_encap_len_ << ", // encapsulation length" 
-          << be_idt << "\n";
-      // size of the encap length
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-      // now emit the encapsulation
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAPSULATION);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::gen_typecode (union) - ")
-                             ASYS_TEXT ("failed to generate encapsulation\n")),
-                            -1);
-        }
-      *os << be_uidt << "\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_union *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *discrim;
-
-  os->indent (); // start from whatever indentation level we were at
-
-  *os << "TAO_ENCAP_BYTE_ORDER, // byte order" << be_nl;
-  // size of the encapsulation byte order flag. Although it is 1 byte, the
-  // aligned size is 4 bytes
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate repoID
-  this->gen_repoID (node);
-
-  // generate name
-  os->indent ();
-  this->gen_name (node);
-
-  // generate typecode for discriminant
-  discrim = be_type::narrow_from_decl (node->disc_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (discrim->accept (this) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate typecode for discriminant\n"));
-      return -1;
-    }
-
-  // generate the default used flag
-  os->indent ();
-  *os << node->default_index () << ", // default used index" << be_nl;
-  // size of the default index used
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // generate the member count
-  *os << node->member_count () << ", // member count\n";
-  // size of the member count
-  this->tc_offset_ += sizeof (ACE_CDR::ULong);
-
-  // hand over to the scope to generate the typecode for elements
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "be_union: cannot generate code for members\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::gen_encapsulation (be_union_branch *node)
-{
-  TAO_OutStream *os = this->ctx_->stream (); // output stream
-  be_type *bt;  // our type node
-
-  os->indent ();
-
-  ACE_UINT32 buf[1];
-  ACE_OS::memset (buf, 0, sizeof (buf));
-
-  // emit the case label value
-  AST_Expression *expression = node->label ()->label_val ();
-  AST_Expression::AST_ExprValue *ev = expression->ev ();
-  switch (ev->et) // the_union->udisc_type ())
-    {
-    case AST_Expression::EV_char:
-    case AST_Expression::EV_bool:
-      os->print ("ACE_IDL_NCTOHL (0x%02.2x)", (unsigned char)ev->u.cval);
-      // size of bool/char aligned to 4 bytes
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      break;
-
-    case AST_Expression::EV_wchar:
-    case AST_Expression::EV_short:
-    case AST_Expression::EV_ushort:
-      os->print ("ACE_IDL_NSTOHL (0x%04.4x)", (unsigned short)ev->u.sval);
-      // size of short/wchar aligned to 4 bytes
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      break;
-
-    case AST_Expression::EV_ulonglong:
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      // continue with next case where we add aother 4 bytes
-    case AST_Expression::EV_long:
-      // size of long
-      this->tc_offset_ += sizeof (ACE_CDR::ULong);
-      *os << expression;
-      break;
-
-    default:
-      if (expression->ec () == AST_Expression::EC_symbol)
-        {
-          // XXXASG ?? What is this case? What is its size?
-          *os << expression;
-        }
-      else
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "be_union_branch: (%N:%l) Label value "
-                             "type (%d) is invalid\n", ev->et), -1);
-        }
-      break;
-    }
-
-  *os << ", // union case label (evaluated)" << be_nl;
-
-  // emit name
-  this->gen_name (node);
-
-  // hand over code generation to our type node
-  bt = be_type::narrow_from_decl (node->field_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE_NESTED);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::gen_encapsulation (union_branch) - ")
-                         ASYS_TEXT ("failed to generate typecode\n")),
-                        -1);
-    }
-
-  // revert the state
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE);
-  return 0;
-}
-
-
-// = methods for computing typecode and encapsulation sizes
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_array *node)
-{
-  // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-  // actual encapsulation
-
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_tc_size (array) - ")
-                         ASYS_TEXT ("cannot compute encap len\n")),
-                        -1);
-    }
-      
-  this->computed_tc_size_ =  4 + 4 + this->computed_encap_len_;
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_array *node)
-{
-  // Suppose "N" is the number of dimensions, then for a N dimensional array,
-  // we will have N encapsulations. The innermost encapsulation will hold the
-  // typecode of the real base type.
-  // Thus, we will have N byte order flags and dimensions, and N-1 tk_array
-  // enumerations, encapsulation lengths, and dimensions.
-
-  be_type *bt; // base type
-
-  bt = be_type::narrow_from_decl (node->base_type ());
-
-  ACE_CDR::Long encap_len =
-    // N byte order flags and dimensions
-    node->n_dims () * (4 + 4) 
-    +
-    // N-1 of tk_array and that many encapsulation lengths
-    (node->n_dims () - 1) * (4 + 4); 
-  
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (array) - ")
-                         ASYS_TEXT ("cannot compute tc size for base\n")),
-                        -1);
-    }
-      
-  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
-  return this->computed_encap_len_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_enum *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else 
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (enum) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      // 4 bytes for enumeration, 4 bytes for storing encap length val, followed by the
-      // actual encapsulation
-
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (enum) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_enum *node)
-{
-  ACE_CDR::Long encap_len;
-  encap_len = 4;  // holds the byte order flag
-
-  encap_len +=
-    this->repoID_encap_len (node); // repoID storage
-
-  // do the same thing for the local name
-  encap_len += this->name_encap_len (node);
-
-  encap_len += 4; // to hold the member count
-
-  // save the current value of scope len and start with a fresh one for our
-  // scope length computation
-  if (this->push (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (enum) - ")
-                         ASYS_TEXT ("push failed\n")),
-                        -1);
-    }
-  this->computed_scope_encap_len_ = 0;
-
-  // compute encap length for members
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (enum) - ")
-                         ASYS_TEXT ("cannot compute scope tc size\n")),
-                        -1);
-    }
-      
-  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
-
-  // pop off the previous value of computed_scope_len_
-  if (this->pop (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (enum) - ")
-                         ASYS_TEXT ("pop failed\n")),
-                        -1);
-    }
-
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_enum_val *node)
-{
-  this->computed_encap_len_ = this->name_encap_len (node);
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_exception *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (exception) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (array) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_exception *node)
-{
-  ACE_CDR::Long encap_len;
-  encap_len = 4;  // holds the byte order flag
-
-  encap_len += this->repoID_encap_len (node); // repoID
-
-  // do the same thing for the local name
-  encap_len += this->name_encap_len (node);
-
-  encap_len += 4; // to hold the member count
-
-  // save the current value of scope len and start with a fresh one for our
-  // scope length computation
-  if (this->push (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (exception) - ")
-                         ASYS_TEXT ("push failed\n")),
-                        -1);
-    }
-  this->computed_scope_encap_len_ = 0;
-
-  // compute encap length for members
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (exception) - ")
-                         ASYS_TEXT ("cannot compute scope tc size\n")),
-                        -1);
-    }
-
-  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
-
-  // pop off the previous value of computed_scope_len_
-  if (this->pop (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (exception) - ")
-                         ASYS_TEXT ("pop failed\n")),
-                        -1);
-    }
-
-  return this->computed_encap_len_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_field *node)
-{
-  be_type *bt;
-  
-  // struct member is represented as the "name" followed by the typecode
-  
-  ACE_CDR::Long encap_len =
-    this->name_encap_len (node); // for name
-  
-  // add to this, the size of our typecode
-  bt = be_type::narrow_from_decl (node->field_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (array) - ")
-                         ASYS_TEXT ("cannot compute tc size\n")),
-                        -1);
-    }
-      
-  // note that we must add typecode size of base type
-  this->computed_encap_len_ = encap_len + this->computed_tc_size_; 
-
-  // revert the sub state
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-
-  return this->computed_encap_len_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_interface *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else 
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (interface) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (interface) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_interface *node)
-{
-  this->computed_encap_len_ = 4;  // holds the byte order flag
-  
-  this->computed_encap_len_ += 
-    this->repoID_encap_len (node); // for repoID
-  
-  // do the same thing for the local name
-  this->computed_encap_len_ += 
-    this->name_encap_len (node);
-
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_interface_fwd *node)
-{
-  return 0;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_interface_fwd *node)
-{
-  return 0;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_predefined_type *node)
-{
-  if (!ACE_OS::strcmp (node->local_name ()->get_string (), 
-                       "Object")) // not same
-    {
-      // while computing the encapsulation length we must keep in mind the typecode
-      // that has gotten generated until this point. Hence, we must first check the
-      // "tc_queue" to ensure if are already there somewhere in a previous
-      // encapsulation in which case we must count only the bytes for the
-      // indirection. If we are not already generated, we must then check if we
-      // have already been counted in the current computation or not by checking
-      // for our presence in the compute queue. In both cases, we only include the
-      // 8 bytes in the computation
-      if (this->queue_lookup (this->tc_queue_, node) ||
-          this->queue_lookup (this->compute_queue_, node))
-        {
-          this->computed_tc_size_ = 4 + 4;
-        }
-      else 
-        {
-          
-          if (idl_global->opt_tc () ||
-              node->in_recursion ())
-            {
-              if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "(%N:%l) be_visitor_typecode_defn::"
-                                     "compute_tc_size (predefined type) - "
-                                     "queue insert failed\n"), 
-                                    -1);
-                }
-            }
-          
-          this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-          if (node->accept (this) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR, 
-                                 ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                                 ASYS_TEXT ("::compute_tc_size (predefined objref) - ")
-                                 ASYS_TEXT ("cannot compute encap len\n")),
-                                -1);
-            }
-          
-          this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-        }
-    }
-  else
-    this->computed_tc_size_ = 4;
-
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_predefined_type *node)
-{
-  if (!ACE_OS::strcmp (node->local_name ()->get_string (), 
-                       "Object")) // not same
-    {
-      this->computed_encap_len_ = 4;  // holds the byte order flag
-
-      this->computed_encap_len_ += 
-        this->repoID_encap_len (node); // for repoID
-
-      // do the same thing for the local name
-      this->computed_encap_len_ += 
-        this->name_encap_len (node);
-    }
-  else
-    this->computed_encap_len_ = 0;
-  
-  return this->computed_encap_len_;
-}
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_sequence *node)
-{
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_tc_size (sequence) - ")
-                         ASYS_TEXT ("cannot compute encap len\n")),
-                        -1);
-    }
-  
-  this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_sequence *node)
-{
-  be_type *bt; // base type
-  
-  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
-
-  // add the encapsulation length of our base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (sequence) - ")
-                         ASYS_TEXT ("cannot compute tc size\n")),
-                        -1);
-    }
-      
-  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
-  this->computed_encap_len_ += 4; // to hold the max size
-
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_string *node)
-{
-  this->computed_tc_size_ = 4 + 4;
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_string *node)
-{
-  this->computed_encap_len_ = 0;
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_structure *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else 
-    {
-
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (structure) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (structure) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_structure *node)
-{
-  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
-
-  encap_len += this->repoID_encap_len (node); // repoID
-
-  // do the same thing for the local name
-  encap_len += this->name_encap_len (node);
-
-  encap_len += 4; // to hold the member count
-
-  // save the current value of scope len and start with a fresh one for our
-  // scope length computation
-  if (this->push (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (struct) - ")
-                         ASYS_TEXT ("push failed\n")),
-                        -1);
-    }
-  this->computed_scope_encap_len_ = 0;
-
-  // compute encap length for members
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (structure) - ")
-                         ASYS_TEXT ("cannot compute scope tc size\n")),
-                        -1);
-    }
-
-  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
-
-  // pop off the previous value of computed_scope_len_
-  if (this->pop (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (struct) - ")
-                         ASYS_TEXT ("pop failed\n")),
-                        -1);
-    }
-
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_typedef *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else 
-    {
-
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (typedef) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-      
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (array) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_typedef *node)
-{
-  be_type *bt; // base type
-  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
-
-  encap_len += 
-    this->repoID_encap_len (node); // repoID
-  
-  // do the same thing for the local name
-  encap_len += 
-    this->name_encap_len (node);
-
-  // add the encapsulation length of our base type
-  bt = be_type::narrow_from_decl (node->base_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (typedef) - ")
-                         ASYS_TEXT ("cannot compute tc size\n")),
-                        -1);
-    }
-      
-  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
-  return this->computed_encap_len_;
-
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_tc_size (be_union *node)
-{
-  // while computing the encapsulation length we must keep in mind the typecode
-  // that has gotten generated until this point. Hence, we must first check the
-  // "tc_queue" to ensure if are already there somewhere in a previous
-  // encapsulation in which case we must count only the bytes for the
-  // indirection. If we are not already generated, we must then check if we
-  // have already been counted in the current computation or not by checking
-  // for our presence in the compute queue. In both cases, we only include the
-  // 8 bytes in the computation
-  if (this->queue_lookup (this->tc_queue_, node) ||
-      this->queue_lookup (this->compute_queue_, node))
-    {
-      this->computed_tc_size_ = 4 + 4;
-    }
-  else 
-    {
-      if (idl_global->opt_tc () ||
-          node->in_recursion ())
-        {
-          if (this->queue_insert (this->compute_queue_, node, this->tc_offset_) == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_typecode_defn::"
-                                 "compute_tc_size (union) - "
-                                 "queue insert failed\n"), 
-                                -1);
-            }
-        }
-
-      this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_ENCAP_LEN);
-      if (node->accept (this) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, 
-                             ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                             ASYS_TEXT ("::compute_tc_size (union) - ")
-                             ASYS_TEXT ("cannot compute encap len\n")),
-                            -1);
-        }
-      
-      this->computed_tc_size_ = 4 + 4 + this->computed_encap_len_;
-    }
-  return this->computed_tc_size_;
-}
-
-
-ACE_CDR::Long 
-be_visitor_typecode_defn::compute_encap_length (be_union *node)
-{
-  be_type *discrim;
-  
-  ACE_CDR::Long encap_len = 4;  // holds the byte order flag
-  
-  encap_len += this->repoID_encap_len (node); // for repoID
-  
-  // do the same thing for the local name
-  encap_len += this->name_encap_len (node); // for name
-  
-  // add encapsulation size of discriminant typecode
-  discrim = be_type::narrow_from_decl (node->disc_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!discrim || discrim->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (union) - ")
-                         ASYS_TEXT ("cannot compute tc size\n")),
-                        -1);
-    }
-      
-  encap_len += this->computed_tc_size_;
-  
-  encap_len += 4; // to hold the "default used" flag
-  encap_len += 4; // to hold the member count
-  
-  // save the current value of scope len and start with a fresh one for our
-  // scope length computation
-  if (this->push (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (union) - ")
-                         ASYS_TEXT ("push failed\n")),
-                        -1);
-    }
-  this->computed_scope_encap_len_ = 0;
-
-  // compute encap length for members
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-  if (node->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (union) - ")
-                         ASYS_TEXT ("cannot compute scope tc size\n")),
-                        -1);
-    }
-
-  this->computed_encap_len_ = encap_len + this->computed_scope_encap_len_;
-
-  // pop off the previous value of computed_scope_len_
-  if (this->pop (this->computed_scope_encap_len_) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (union) - ")
-                         ASYS_TEXT ("pop failed\n")),
-                        -1);
-    }
-
-  return this->computed_encap_len_;
-}
-
-
-ACE_CDR::Long
-be_visitor_typecode_defn::compute_encap_length (be_union_branch *node)
-{
-  be_type *bt;
-
-  ACE_CDR::Long encap_len = 4; // case label;
-  encap_len += 
-    this->name_encap_len (node); // for name
-
-  bt = be_type::narrow_from_decl (node->field_type ());
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_TC_SIZE);
-  if (!bt || bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::compute_encap_len (union branch) - ")
-                         ASYS_TEXT ("cannot compute tc size\n")),
-                        -1);
-    }
-  this->computed_encap_len_ = encap_len + this->computed_tc_size_;
-      
-  this->ctx_->sub_state (TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN);
-  return this->computed_encap_len_;
-}
-
-// helpers that accomplish a common task - that of generating the repository
-// IDs and names in a TypeCode description
-
-void
-be_visitor_typecode_defn::gen_repoID (be_decl *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  int flag = 0;
-
-  // 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)
-  // generate repoID
-
-  if (idl_global->opt_tc ())
-    {
-      switch (node->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_except:
-          flag = 0;
-          break;
-        case AST_Decl::NT_pre_defined:
-          if (!ACE_OS::strcmp (node->local_name ()->get_string (),
-                               "Object"))
-            flag = 0;
-          else
-            flag = 1;
-          break;
-        default:
-          flag = 1;
-        }
-    }
-
-  // XXXASG -- there is still some doubts in my mind about whether repoID
-  // *must* be supplied or not as per spec 2.3a. So I am not going to allow
-  // optimizations here.
-  //  flag = 0;
-
-  if (flag)
-    {
-      // optimized case
-      *os << "1, 0x0,";
-      *os << " // repository ID = " << node->repoID ();
-      // size of the repoID filed
-      this->tc_offset_ += (2 * sizeof (ACE_CDR::ULong));
-    }
-  else
-    {
-      // unoptimized case
-      *os << (ACE_OS::strlen (node->repoID ()) + 1) << ", ";
-      
-      ACE_CDR::ULong *arr, i, arrlen;
-      (void) this->tc_name2long (node->repoID (), arr, arrlen);
-      for (i = 0; i < arrlen; i++)
-        {
-          os->print ("ACE_NTOHL (0x%x), ", arr[i]);
-        }
-      *os << " // repository ID = " << node->repoID ();
-      // size of the repoID field
-      this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
-    }
-  *os << "\n";
-  return;
-}
-
-void
-be_visitor_typecode_defn::gen_name (be_decl *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // generate name
-  if (idl_global->opt_tc ())
-    {
-      *os << "1, 0x0,";
-      *os << " // name = " << node->local_name ();
-      // size of the name field
-      this->tc_offset_ += (2 * sizeof (ACE_CDR::ULong));
-    }
-  else
-    {
-      ACE_CDR::ULong *arr, i, arrlen;
-      *os << (ACE_OS::strlen (node->local_name ()->get_string ()) + 1) << ", ";
-      (void) this->tc_name2long (node->local_name ()->get_string (), arr, arrlen);
-      for (i = 0; i < arrlen; i++)
-        {
-          os->print ("ACE_NTOHL (0x%x), ", arr[i]);
-        }
-      *os << " // name = " << node->local_name ();
-      // size of the name field
-      this->tc_offset_ += (arrlen + 1) * sizeof (ACE_CDR::ULong);
-    }
-  *os << "\n";
-  return;
-}
-
-// return the length in bytes to hold the repoID inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-ACE_CDR::ULong
-be_visitor_typecode_defn::repoID_encap_len (be_decl *node)
-{
-  int flag = 0;
-
-  // 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)
-  // generate repoID
-
-  if (idl_global->opt_tc ())
-    {
-      switch (node->node_type ())
-        {
-        case AST_Decl::NT_interface:
-        case AST_Decl::NT_interface_fwd:
-        case AST_Decl::NT_except:
-          flag = 0;
-          break;
-        case AST_Decl::NT_pre_defined:
-          if (!ACE_OS::strcmp (node->local_name ()->get_string (),
-                               "Object"))
-            flag = 0;
-          else
-            flag = 1;
-          break;
-        default:
-          flag = 1;
-        }
-    }
-
-  // XXXASG -- there is still some doubts in my mind about whether repoID
-  // *must* be supplied or not as per spec 2.3a. So I am not going to allow
-  // optimizations here.
-  //flag = 0;
-
-  if (flag)
-    {
-      return 4 + 4;
-    }
-  else
-    {
-      ACE_CDR::ULong slen = ACE_OS::strlen (node->repoID ()) + 1; 
-      // + 1 for NULL terminating char 
-      
-      // the number of bytes to hold the string must be a multiple of 4 since this
-      // will be represented as an array of longs
-      return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-    }
-}
-
-// return the length in bytes to hold the name inside a typecode. This
-// comprises 4 bytes indicating the length of the string followed by the actual
-// string represented as longs.
-ACE_CDR::ULong
-be_visitor_typecode_defn::name_encap_len (be_decl *node)
-{
-  if (idl_global->opt_tc ())
-    {
-      return 4 + 4;
-    }
-  else
-    {
-      ACE_CDR::ULong slen = 
-        ACE_OS::strlen (node->local_name ()->get_string ()) + 1; 
-      
-      // the number of bytes to hold the string must be a multiple of 4 since this
-      // will be represented as an array of longs
-      return 4 + 4 * (slen/4 + (slen%4 ? 1:0));
-    }
-}
-  
-// converts a string name into an array of 4 byte longs
-int
-be_visitor_typecode_defn::tc_name2long (const char *name, 
-                                        ACE_CDR::ULong *&larr, 
-                                        ACE_CDR::ULong &arrlen)
-{
-  const int bytes_per_word = sizeof (ACE_CDR::ULong);
-  static ACE_CDR::ULong buf [NAMEBUFSIZE];
-  ACE_CDR::ULong i, slen;
-
-  slen = ACE_OS::strlen (name) + 1; // 1 for NULL terminating
-
-  // compute the number of bytes necessary to hold the name rounded to
-  // the next multiple of 4 (i.e., size of long)
-  arrlen = slen / bytes_per_word + (slen % bytes_per_word ? 1 : 0);
-
-  ACE_OS::memset (buf, 0, sizeof (buf));
-  larr = buf;
-  ACE_OS::memcpy (buf, name, slen);
-  for (i = 0; i < arrlen; i++)
-    larr [i] = ACE_HTONL (larr [i]);
-  return 0;
-}
-
-// post processing
-int
-be_visitor_typecode_defn::post_process (be_decl *node)
-{
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_TC_DEFN_SCOPE_LEN)
-    {
-      this->computed_scope_encap_len_ += this->computed_encap_len_;
-    }
-  return 0;
-}
-
-// scope stack routines
-int
-be_visitor_typecode_defn::push (ACE_CDR::Long val)
-{
-  if (this->index_ >= TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE)
-    return -1;
-
-  this->scope_stack_ [++this->index_] = val;
-  return 0;
-}
-
-int
-be_visitor_typecode_defn::pop (ACE_CDR::Long &val)
-{
-  if (this->index_ < 0)
-    return -1;
-
-  val = this->scope_stack_[this->index_--];
-  return 0;
-}
-
-const be_visitor_typecode_defn::QNode *
-be_visitor_typecode_defn::
-queue_insert (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
-              be_type *node, ACE_CDR::Long offset)
-{
-  be_visitor_typecode_defn::QNode *qnode;
-
-  ACE_NEW_RETURN (qnode, be_visitor_typecode_defn::QNode, 0);
-
-  qnode->node = node;
-  qnode->offset = offset;
-
-  if (queue.enqueue_tail (qnode) == -1)
-    {
-      delete qnode;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("(%N:%l) be_visitor_typecode_defn")
-                         ASYS_TEXT ("::queue_insert - failed\n")),
-                        0);
-    }
-
-  return qnode;
-}
-
-const be_visitor_typecode_defn::QNode *
-be_visitor_typecode_defn::
-queue_lookup (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue,
-              be_type *node)
-{
-  for (ACE_Unbounded_Queue_Iterator<be_visitor_typecode_defn::QNode *>
-         iter (queue);
-       !iter.done ();
-       iter.advance ())
-    {
-      be_visitor_typecode_defn::QNode **addr, *item;
-      iter.next (addr);
-      item = *addr;
-
-      if (!ACE_OS::strcmp (item->node->fullname (),
-                           node->fullname ()))
-        {
-          // found
-          return item;
-        }
-    }
-
-  return 0;
-}
-
-void
-be_visitor_typecode_defn::
-queue_reset (ACE_Unbounded_Queue <be_visitor_typecode_defn::QNode *> &queue)
-{
-  while (!queue.is_empty ())
-    {
-      be_visitor_typecode_defn::QNode *qnode;
-      (void) queue.dequeue_head (qnode);
-      delete qnode;
-    }
-  return;
+  return this->visit_type (node);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
index ebecde2e307..1efcfa25292 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
@@ -130,7 +130,6 @@ be_visitor_typedef_cs::visit_typedef (be_typedef *node)
           be_visitor *visitor;
           be_visitor_context ctx (*this->ctx_);
           ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-          ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
           visitor = tao_cg->make_visitor (&ctx);
           if (!visitor || (node->accept (visitor) == -1))
             {
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 8287b104719..c2c762b19ef 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -52,56 +52,47 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
 
   // generate the Any <<= and >>= operator declarations
   os->indent ();
-  *os << "void operator<<= (" << be_idt << be_idt_nl
-      << "CORBA::Any &_tao_any," << be_nl
-      << "const " << node->name () << " &_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+  *os << "void operator<<= (CORBA::Any &_tao_any, const "
+      << node->name () << " &_tao_elem) // copying" << be_nl
       << "{" << be_idt_nl
       << node->name () << " *_any_val;" << be_nl
-      << "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));"
-      << be_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
-      << "{" << be_idt_nl;
-
-  if (this->gen_insertion (os, node) != 0)
-    return -1;
-
-  *os << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "ACE_NEW (_any_val, " << node->name () << " (_tao_elem));" << be_nl
+      << "if (!_any_val) return;" << be_nl
+      << "TAO_TRY" << be_nl
+      << "{" << be_idt_nl
+      << "_tao_any.replace (" << node->tc_name ()
+      << ", _any_val, 1, TAO_TRY_ENV);" << " // copy the value" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
+      << "}" << be_nl
+      << "TAO_CATCHANY" << be_nl
       << "{" << be_idt_nl
       << "delete _any_val;" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
-  *os << "void operator<<= (" << be_idt << be_idt_nl
-      << "CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+  *os << "void operator<<= (CORBA::Any &_tao_any, "
+      << node->name () << " *_tao_elem) // non copying" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
-      << "{" << be_idt_nl;
-
-  if (this->gen_insertion_nocopy (os, node) != 0)
-    return -1;
-
-  *os << "}" << be_nl
-      << "ACE_CATCHANY {}" << be_nl
-      << "ACE_ENDTRY;" << be_uidt_nl
+      << "TAO_TRY" << be_nl
+      << "{" << be_idt_nl
+      << "_tao_any.replace (" << node->tc_name () << ", "
+      << "_tao_elem, 1, TAO_TRY_ENV); // consume it" << be_nl
+      << "TAO_CHECK_ENV;" << be_uidt_nl
+      << "}" << be_nl
+      << "TAO_CATCHANY {}" << be_nl
+      << "TAO_ENDTRY;" << be_uidt_nl
       << "}\n" << be_nl;
 
-  *os << "CORBA::Boolean operator>>= (" << be_idt << be_idt_nl
-      << "const CORBA::Any &_tao_any," << be_nl
-      << node->name () << " *&_tao_elem" << be_uidt_nl
-      << ")" << be_uidt_nl
+  *os << "CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, "
+      << node->name () << " *&_tao_elem)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_TRY_NEW_ENV" << be_nl
+      << "TAO_TRY" << be_nl
       << "{" << be_idt_nl
       << "CORBA::TypeCode_var type = _tao_any.type ();" << be_nl
       << "if (!type->equal (" << node->tc_name ()
-      << ", ACE_TRY_ENV))" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "ACE_TRY_CHECK;" << be_nl
+      << ", TAO_TRY_ENV)) return 0; // not equal" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "if (_tao_any.any_owns_data ())" << be_nl
       << "{" << be_idt_nl
       << "_tao_elem = (" << node->name () << " *)_tao_any.value ();"
@@ -112,20 +103,29 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "{" << be_idt_nl
       << "ACE_NEW_RETURN (_tao_elem, " << node->name () << ", 0);"
       << be_nl
-      << "TAO_InputCDR stream (_tao_any._tao_get_cdr ());" << be_nl;
-
-  if (this->gen_extraction (os, node) != 0)
-    return -1;
-
-  *os << be_nl
+      << "TAO_InputCDR stream ((ACE_Message_Block *)_tao_any._tao_get_cdr ());"
+      << be_nl
+      << "if (stream.decode (" << node->tc_name ()
+      << ", _tao_elem, 0, TAO_TRY_ENV)" << be_nl
+      << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
+      << "{" << be_idt_nl
+      << "((CORBA::Any *)&_tao_any)->replace ("
+      << node->tc_name () << ", _tao_elem, 1, TAO_TRY_ENV);" << be_nl
+      << "TAO_CHECK_ENV;" << be_nl
       << "return 1;" << be_uidt_nl
-      << "}" << be_uidt_nl
       << "}" << be_nl
-      << "ACE_CATCHANY" << be_nl
+      << "else" << be_nl
       << "{" << be_idt_nl
       << "delete _tao_elem;" << be_uidt_nl
+      << "}" << be_uidt_nl
+      << "}" << be_uidt_nl
+      << "}" << be_nl
+      << "TAO_CATCHANY" << be_nl
+      << "{" << be_idt_nl
+      << "delete _tao_elem;" << be_nl
+      << "return 0; " << be_uidt_nl
       << "}" << be_nl
-      << "ACE_ENDTRY;" << be_nl
+      << "TAO_ENDTRY;" << be_nl
       << "return 0;" << be_uidt_nl
       << "}\n\n";
 
@@ -168,109 +168,3 @@ be_visitor_union_any_op_cs::visit_union_branch (be_union_branch *node)
     }
   return 0;
 }
-
-// ****************************************************************
-
-be_visitor_union_any_op_compiled_cs::
-be_visitor_union_any_op_compiled_cs (be_visitor_context *ctx)
-  : be_visitor_union_any_op_cs (ctx)
-{
-}
-
-int
-be_visitor_union_any_op_compiled_cs::
-gen_insertion (TAO_OutStream *os,
-                      be_union *node)
-{
-  *os << "TAO_OutputCDR stream;" << be_nl
-      << "stream << *_any_val;" << be_nl
-      << "_tao_any._tao_replace (" << be_idt << be_idt_nl
-      << node->tc_name () << "," << be_nl
-      << "stream.begin ()," << be_nl
-      << "1," << be_nl
-      << "_any_val," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl;
-  return 0;
-}
-
-int
-be_visitor_union_any_op_compiled_cs::
-gen_insertion_nocopy (TAO_OutStream *os,
-                      be_union *node)
-{
-  *os << "TAO_OutputCDR stream;" << be_nl
-      << "stream << *_tao_elem;" << be_nl
-      << "_tao_any._tao_replace (" << be_idt << be_idt_nl
-      << node->tc_name () << "," << be_nl
-      << "stream.begin ()," << be_nl
-      << "1," << be_nl
-      << "_tao_elem," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl;
-  return 0;
-}
-
-int
-be_visitor_union_any_op_compiled_cs::
-gen_extraction (TAO_OutStream *os,
-                be_union *node)
-{
-  *os << "stream >> *_tao_elem;" << be_nl
-      << "((CORBA::Any *)&_tao_any)->_tao_replace (" << be_idt << be_idt_nl
-      << node->tc_name () << "," << be_nl
-      << "1," << be_nl
-      << "ACE_reinterpret_cast(void*,_tao_elem)," << be_nl
-      << "ACE_TRY_ENV" << be_uidt_nl
-      << ");" << be_uidt_nl
-      << "ACE_TRY_CHECK;" << be_nl;
-  return 0;
-}
-
-// ****************************************************************
-
-be_visitor_union_any_op_interpretive_cs::
-be_visitor_union_any_op_interpretive_cs (be_visitor_context *ctx)
-  : be_visitor_union_any_op_cs (ctx)
-{
-}
-
-int
-be_visitor_union_any_op_interpretive_cs::
-gen_insertion (TAO_OutStream *os,
-                      be_union *node)
-{
-  *os << "_tao_any.replace (" << node->tc_name ()
-      << ", _any_val, 1, ACE_TRY_ENV);" << " // copy the value" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl;
-  return 0;
-}
-
-int
-be_visitor_union_any_op_interpretive_cs::
-gen_insertion_nocopy (TAO_OutStream *os,
-                      be_union *node)
-{
-  *os << "_tao_any.replace (" << node->tc_name () << ", "
-      << "_tao_elem, 1, ACE_TRY_ENV); // consume it" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl;
-  return 0;
-}
-
-int
-be_visitor_union_any_op_interpretive_cs::
-gen_extraction (TAO_OutStream *os,
-                be_union *node)
-{
-  *os << "if (stream.decode (" << node->tc_name ()
-      << ", _tao_elem, 0, ACE_TRY_ENV)" << be_nl
-      << "  == CORBA::TypeCode::TRAVERSE_CONTINUE)" << be_nl
-      << "{" << be_idt_nl
-      << "((CORBA::Any *)&_tao_any)->replace ("
-      << node->tc_name () << ", _tao_elem, 1, ACE_TRY_ENV);" << be_nl
-      << "ACE_TRY_CHECK;" << be_uidt_nl
-      << "}";
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index bd22d099f15..48fdbbf9fc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -48,33 +48,19 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   if (node->cli_stub_cdr_op_gen () || node->imported ())
     return 0;
 
-  // set the substate as generating code for the types defined in our scope
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-  // all we have to do is to visit the scope and generate code
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_cdr_op_cs"
-                         "::visit_union - "
-                         "codegen for scope failed\n"), -1);
-    }
-
   TAO_OutStream *os = this->ctx_->stream ();
 
   //  set the sub state as generating code for the output operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-
-  *os << "ACE_INLINE CORBA::Boolean operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &strm," << be_nl
-      << "const " << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
+  *os << "ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, "
+      << "const " << node->name () << " &_tao_union)" << be_nl
       << "{" << be_idt_nl
-      << "if (!(strm << _tao_union._d ()))" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "CORBA::Boolean result = 0;" << be_nl
-      << "switch (_tao_union._d ())" << be_nl
-      << "{" << be_idt_nl;
+      << "return 1;" << be_uidt_nl
+      << "}\n\n";
+#if 0 /* TO-DO */
+      << "if (" << be_idt_nl;
 
+  // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -82,83 +68,74 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
                          "visit_union - "
                          "codegen for scope failed\n"), -1);
     }
-  *os << be_uidt_nl << "}" << be_nl
-      << "return result;" << be_uidt_nl
+  *os << be_uidt_nl << ")"
+      << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "else" << be_idt_nl
+      << "return 0;" << be_uidt_nl << be_uidt_nl
       << "}\n\n";
+#endif 
 
   // set the substate as generating code for the input operator
   this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "ACE_INLINE CORBA::Boolean operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &strm," << be_nl
-      << node->name () << " &_tao_union" << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl;
-
-  be_type* disc_type =
-    be_type::narrow_from_decl (node->disc_type ());
-
-  // Generate a temporary to store the discriminant
-  *os << disc_type->fullname ()
-      << " " << "_tao_discriminant;" << be_nl
-      << "if ( !(strm >> _tao_discriminant) )" << be_idt_nl
-      << "return 0;" << be_uidt_nl
-      << "CORBA::Boolean result = 0;" << be_nl
-      << "switch (_tao_discriminant)" << be_nl
-      << "{" << be_idt_nl;
+  *os << "ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, "
+      << node->name () << " &_tao_union)" << be_nl
+      << "{" << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "}\n\n";
 
+#if 0 /* TO-DO */
+      << "if (" << be_idt_nl;
+
+  // all we have to do is to visit the scope and generate code
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_cdr_op_cs::"
-                         "visit_union - "
+                         "(%N:%l) be_visitor_union_cdr_op_cs"
+                         "::visit_union - "
                          "codegen for scope failed\n"), -1);
     }
-
-  *os << be_uidt_nl << "}" << be_nl
-      << "return result;" << be_uidt_nl
+  *os << be_uidt_nl << ")"
+      << be_idt_nl
+      << "return 1;" << be_uidt_nl
+      << "else" << be_idt_nl
+      << "return 0;" << be_uidt_nl << be_uidt_nl
       << "}\n\n";
+#endif
 
-  node->cli_stub_cdr_op_gen (1);
-  return 0;
-}
-
-int
-be_visitor_union_cdr_op_cs::pre_process (be_decl *bd)
-{
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_SCOPE)
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  be_union_branch* b =
-    be_union_branch::narrow_from_decl (bd);
-
-  if (b->label ()->label_kind () == AST_UnionLabel::UL_default)
-    {
-      *os << "default:" << be_idt_nl
-          << "result = ";
-    }
-  else
+  // set the substate as generating code for the types defined in our scope
+  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
+  // all we have to do is to visit the scope and generate code
+  if (this->visit_scope (node) == -1)
     {
-      *os << "case ";
-      b->gen_label_value (os);
-      *os << ":" << be_idt_nl
-          << "{" << be_idt_nl;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_union_cdr_op_cs"
+                         "::visit_union - "
+                         "codegen for scope failed\n"), -1);
     }
 
+  node->cli_stub_cdr_op_gen (1);
   return 0;
 }
 
 int
-be_visitor_union_cdr_op_cs::post_process (be_decl *)
+be_visitor_union_cdr_op_cs::post_process (be_decl *bd)
 {
-  if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_SCOPE)
-    return 0;
-
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_uidt_nl << "}"
-      << be_nl << "break;" << be_uidt_nl;
-
+  if (!this->last_node (bd))
+    {
+      switch (this->ctx_->sub_state ())
+        {
+        case TAO_CodeGen::TAO_CDR_OUTPUT:
+        case TAO_CodeGen::TAO_CDR_INPUT:
+          *os << " &&" << be_nl;
+          break;
+        case TAO_CodeGen::TAO_CDR_SCOPE:
+        default:
+          break;
+        };
+    }
+        
   return 0;
 }
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 8510fc91314..87a6b5285ca 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -103,6 +103,8 @@ int be_visitor_union_cs::visit_union (be_union *node)
       *os << "// Operations for union " << node->name () << be_nl;
       *os << "// *************************************************************\n\n";
 
+      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
+
       // generate the copy constructor and the assignment operator here
       os->indent ();
       *os << "// default constructor" << be_nl
@@ -113,12 +115,12 @@ int be_visitor_union_cs::visit_union (be_union *node)
           << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
-
       *os << "// copy constructor" << be_nl;
-      *os << node->name () << "::" << node->local_name ()
-          << " (const " << node->name () << " &u)" << be_nl;
+      *os << node->name () << "::" << node->local_name () << " (const " <<
+        node->name () << " &u)" << be_nl;
       *os << "{" << be_idt_nl;
+      // first reset and set the discriminant
+      *os << "this->_reset (u.disc_, 0);" << be_nl;
       *os << "this->disc_ = u.disc_;" << be_nl;
       // now switch based on the disc value
       *os << "switch (this->disc_)" << be_nl;
@@ -137,8 +139,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
       os->decr_indent ();
       *os << "}\n\n";
 
-      this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
-
       // assignment operator
       os->indent ();
       *os << "// assignment operator" << be_nl;
@@ -175,6 +175,8 @@ int be_visitor_union_cs::visit_union (be_union *node)
       *os << "void " << node->name () << "::_reset (" << bt->name ()
           << " new_disc_val, CORBA::Boolean finalize)" << be_nl;
       *os << "{" << be_idt_nl;
+      *os << "if ((this->disc_ != new_disc_val) || finalize)" << be_nl;
+      *os << "{" << be_idt_nl;
       *os << "switch (this->disc_)" << be_nl;
       *os << "{" << be_idt_nl;
       if (this->visit_scope (node) == -1)
@@ -186,6 +188,7 @@ int be_visitor_union_cs::visit_union (be_union *node)
         }
 
       *os << be_uidt_nl << "}" << be_uidt_nl
+          << "}" << be_uidt_nl
           << "}\n\n";
 
       // the access method
@@ -215,7 +218,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
       // based on the command line options. This is still TO-DO
       ctx = *this->ctx_;
       ctx.state (TAO_CodeGen::TAO_TYPECODE_DEFN);
-      ctx.sub_state (TAO_CodeGen::TAO_TC_DEFN_TYPECODE);
       visitor = tao_cg->make_visitor (&ctx);
       if (!visitor || (node->accept (visitor) == -1))
         {
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
index 1499fb8d985..5cb1335b6ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
@@ -35,3 +35,4 @@
 #include "be_visitor_union_branch/cdr_op_cs.cpp"
 
 ACE_RCSID(be, be_visitor_union_branch, "$Id$")
+
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 2e02eb36edc..c2bf43934a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -86,63 +86,19 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
                          ), -1);
     }
 
-  // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname 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 on
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscore
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
-        }
-    }
-  else
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
-    }
-
   // check what is the code generations substate. Are we generating code for
   // the in/out operators for our parent or for us?
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << fname << " _tao_union_tmp;" << be_nl
-          << fname << "_forany " << be_idt_nl
-          << "_tao_union_helper (_tao_union_tmp);" << be_uidt_nl
-          << "result = strm >> _tao_union_helper;" << be_nl
-          << "if (result)" << be_idt_nl
-          << "_tao_union." << f->local_name () << "("
-          << "_tao_union_tmp);" << be_uidt;
+      *os << "(strm >> _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << fname << "_forany " << be_idt_nl
-          << "_tao_union_tmp (_tao_union."
-          << f->local_name () << " ());" << be_uidt_nl
-          << "result = strm << _tao_union_tmp;";
+      *os << "(strm << _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // proceed further
       break;
-
     default:
       // error
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -212,18 +168,11 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "CORBA::Long _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;
+      *os << "(strm >> _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "strm << _tao_union." << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // proceed further
       break;
@@ -272,9 +221,10 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
 
 // visit interface type
 int
-be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
+be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
 
   // retrieve the union_branch node
   be_union_branch *f = this->ctx_->be_node_as_union_branch ();
@@ -292,23 +242,15 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << "_var _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.in ());" << be_uidt;
+      *os << "(strm >> _tao_union." << f->local_name () << ".out ())";
       break;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ".in ())";
       break;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done because an interface cannit be declared inside a
-      // structure
+      // structure 
       break;
-
     default:
       // error
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -322,9 +264,10 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
 
 // visit interface forward type
 int
-be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
+be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
 
   // retrieve the union_branch node
   be_union_branch *f = this->ctx_->be_node_as_union_branch ();
@@ -342,23 +285,15 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << node->name () << "_var _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.in ());" << be_uidt;
+      *os << "(strm >> _tao_union." << f->local_name () << ").out ()";
       break;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result  = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ").in ()";
       break;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done because an interface cannit be declared inside a
-      // structure
+      // structure 
       break;
-
     default:
       // error
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -393,71 +328,19 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (be_predefined_type *no
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
-        *os << "result = strm >> _tao_union."
-            << f->local_name () << " ().out ();";
-      else if (node->pt () == AST_PredefinedType::PT_char)
-        *os << "CORBA::Char _tao_union_tmp;" << be_nl
-            << "CORBA::Any::to_char _tao_union_helper "
-            << "(_tao_union_tmp);" << be_nl
-            << "result = strm >> _tao_union_helper;" << be_nl
-            << "if (result)" << be_idt_nl
-            << "_tao_union." << f->local_name ()
-            << "(_tao_union_tmp);" << be_uidt;
-      else if (node->pt () == AST_PredefinedType::PT_wchar)
-        *os << "CORBA::WChar _tao_union_tmp;" << be_nl
-            << "CORBA::Any::to_wchar _tao_union_helper "
-            << "(_tao_union_tmp);" << be_nl
-            << "result = strm >> _tao_union_helper;" << be_nl
-            << "if (result)" << be_idt_nl
-            << "_tao_union." << f->local_name ()
-            << "(_tao_union_tmp);" << be_uidt;
-      else if (node->pt () == AST_PredefinedType::PT_octet)
-        *os << "CORBA::Octet _tao_union_tmp;" << be_nl
-            << "CORBA::Any::to_octet _tao_union_helper "
-            << "(_tao_union_tmp);" << be_nl
-            << "result = strm >> _tao_union_helper;" << be_nl
-            << "if (result)" << be_idt_nl
-            << "_tao_union." << f->local_name ()
-            << "(_tao_union_tmp);" << be_uidt;
-      else if (node->pt () == AST_PredefinedType::PT_boolean)
-        *os << "CORBA::Boolean _tao_union_tmp;" << be_nl
-            << "CORBA::Any::to_boolean _tao_union_helper "
-            << "(_tao_union_tmp);" << be_nl
-            << "result = strm >> _tao_union_helper;" << be_nl
-            << "if (result)" << be_idt_nl
-            << "_tao_union." << f->local_name ()
-            << "(_tao_union_tmp);" << be_uidt;
+      // is a psuedo obj
+      if (node->pt () == AST_PredefinedType::PT_pseudo) 
+        *os << "(strm >> _tao_union." << f->local_name () << ".out ())";
       else
-        *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;
+        *os << "(strm >> _tao_union." << f->local_name () << ")";
       break;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-
-      *os << "result = ";
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
-        *os << "strm << _tao_union." << f->local_name () << " ().in ();";
-      else if (node->pt () == AST_PredefinedType::PT_char)
-        *os << "strm << CORBA::Any::from_char (_tao_union."
-	    << f->local_name () << " ());";
-      else if (node->pt () == AST_PredefinedType::PT_wchar)
-        *os << "strm << CORBA::Any::from_wchar (_tao_union."
-	    << f->local_name () << " ());";
-      else if (node->pt () == AST_PredefinedType::PT_octet)
-        *os << "strm << CORBA::Any::from_octet (_tao_union."
-	    << f->local_name () << " ());";
-      else if (node->pt () == AST_PredefinedType::PT_boolean)
-        *os << "strm << CORBA::Any::from_boolean (_tao_union."
-	    << f->local_name () << " ());";
+      // is a psuedo obj
+      if (node->pt () == AST_PredefinedType::PT_pseudo) 
+        *os << "(strm << _tao_union." << f->local_name () << ".in ())";
       else
-        *os << "strm << _tao_union." << f->local_name () << " ();";
+        *os << "(strm << _tao_union." << f->local_name () << ")";
       break;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done
       break;
@@ -495,18 +378,11 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *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;
+      *os << "(strm >> _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // proceed further
       break;
@@ -519,8 +395,8 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
                          ), -1);
     }
 
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()))
+  if (node->node_type () != AST_Decl::NT_typedef 
+      && node->is_child (this->ctx_->scope ())) 
     // not a typedef AND
     // node is defined inside the structure
     {
@@ -578,18 +454,11 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "CORBA::String_var _tao_union_tmp;" << be_nl
-          << "result = strm >> _tao_union_tmp.out ();" << be_nl
-          << "if (result)" << be_idt_nl
-          << "_tao_union."
-          << f->local_name () << " (_tao_union_tmp);" << be_uidt;
+      *os << "(strm >> _tao_union." << f->local_name () << ".out ())";
       break;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ".in ())";
       break;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // nothing to be done
       break;
@@ -609,7 +478,8 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *)
 int
 be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
 {
-  TAO_OutStream *os = this->ctx_->stream ();
+  TAO_OutStream *os; // output stream
+  os = this->ctx_->stream ();
 
   // retrieve the union_branch node
   be_union_branch *f = this->ctx_->be_node_as_union_branch ();
@@ -627,18 +497,11 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *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;
+      *os << "(strm >> _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // proceed further
       break;
@@ -730,15 +593,11 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "result = strm >> _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm >> _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "result = strm << _tao_union."
-          << f->local_name () << " ();";
+      *os << "(strm << _tao_union." << f->local_name () << ")";
       return 0;
-
     case TAO_CodeGen::TAO_CDR_SCOPE:
       // proceed further
       break;
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 9fbe2ab935a..6c98c9b7dc2 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
@@ -241,15 +241,8 @@ be_visitor_union_branch_private_ch::visit_predefined_type (be_predefined_type *n
     {
       // Cannot have an object inside of a union
       os->indent (); // start from current indentation
-      // check if we are dealing with a CORBA::Object
-      if (!ACE_OS::strcmp (bt->local_name ()->get_string (), "Object"))
-        {
-          *os << "TAO_Object_Field_T<CORBA::Object> *" << ub->local_name () 
-              << "_;\n";
-        }
-      else
-        *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () 
-            << "_;\n";
+      *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () <<
+        "_;\n";
     }
   else if (node->pt () == AST_PredefinedType::PT_any)
     {
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 054dcd7dadf..892d4eab0d7 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
@@ -66,9 +66,15 @@ visit_union_branch (be_union_branch *node)
     }
 
   this->ctx_->node (node); // save the node
-  *os << "case ";
-  node->gen_label_value (os);
-  *os << ":" << be_idt_nl;
+
+  if (node->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+    {
+      *os << "case " << node->label ()->label_val ()->n ()  << ":" << be_idt_nl;
+    }
+  else
+    {
+      *os << "case " << node->label ()->label_val () << ":" << be_idt_nl;
+    }
 
   if (bt->accept (this) == -1)
     {
@@ -113,7 +119,7 @@ be_visitor_union_branch_public_access_cs::visit_array (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
-  // on
+  // on 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
       && bt->is_child (bu)) // bt is defined inside the union
@@ -125,7 +131,7 @@ 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->fullname (), 
                            bt->local_name ()->get_string ());
         }
       else
@@ -171,20 +177,12 @@ be_visitor_union_branch_public_access_cs::visit_enum (be_enum *)
 }
 
 int
-be_visitor_union_branch_public_access_cs::visit_interface (be_interface *node)
+be_visitor_union_branch_public_access_cs::visit_interface (be_interface *)
 {
   be_union_branch *ub =
     this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
     this->ctx_->be_scope_as_union ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
 
   if (!ub || !bu)
     {
@@ -195,10 +193,8 @@ 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;
-  *os << "ACE_NEW_RETURN (this->u_." << ub->local_name () << "_, "
-      << "TAO_Object_Field_T<" << bt->name () << ">, 0);" << be_uidt_nl;
-  *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl;
+  *os << "return (CORBA::Object_ptr *) &this->u_." << ub->local_name () 
+      << "_->inout ();" << 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 c10d8d7b258..41073c58db3 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
@@ -49,6 +49,9 @@ be_visitor_union_branch_public_assign_cs::~be_visitor_union_branch_public_assign
 int
 be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *node)
 {
+  be_union_branch *ub =
+    this->ctx_->be_node_as_union_branch (); // get union branch
+
   TAO_OutStream *os = this->ctx_->stream ();
 
   // This visitor is used when we are generating the copy ctor and
@@ -57,10 +60,16 @@ be_visitor_union_branch_public_assign_cs::visit_union_branch (be_union_branch *n
   // statement because the type of member assigned is based on the value
   // of the discriminant
   os->indent ();
-  *os << "case ";
-  node->gen_label_value (os);
-  *os << ":" << be_nl;
-  *os << "{" << be_idt << "\n";
+  if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+    {
+      *os << "case " << ub->label ()->label_val ()->n ()  << ":" << be_nl;
+      *os << "{" << be_idt << "\n";
+    }
+  else
+    {
+      *os << "case " << ub->label ()->label_val () << ":" << be_nl;
+      *os << "{" << be_idt << "\n";
+    }
 
   // first generate the type information
   be_type *bt = be_type::narrow_from_decl (node->field_type ());
@@ -120,7 +129,7 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
-  // on
+  // on 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
       && bt->is_child (bu)) // bt is defined inside the union
@@ -132,7 +141,7 @@ 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->fullname (), 
                            bt->local_name ()->get_string ());
         }
       else
@@ -150,11 +159,18 @@ be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free "
+          << "it on an assignment" << be_nl;
+      *os << fname << "_var " << ub->local_name () 
+          << "_var (this->u_." << ub->local_name () << "_);" << be_nl;
       *os << "// make a deep copy" << be_nl;
-      *os << "this->u_." << ub->local_name ()
-          << "_  = " << fname
-          << "_dup (u.u_."
-          << ub->local_name () << "_);" << be_uidt_nl;
+      *os << ub->local_name () << "_var = " << fname
+          << "_dup (u.u_." << ub->local_name () << "_);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -231,10 +247,18 @@ be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
-      *os << "this->u_." << ub->local_name ()
-          << "_ = new TAO_Object_Field_T<" << bt->name ()
-          << "> (" << bt->name () << "::_duplicate (u.u_."
-          << ub->local_name () << "_->ptr ()));" << be_uidt_nl;
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// make a copy" << be_nl;
+      *os << ub->local_name () << "_var = " << bt->name ()
+          << "::_duplicate (u.u_." << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "*this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -274,10 +298,18 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (be_interface_fwd
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
-      *os << "this->u_." << ub->local_name ()
-          << "_ = new TAO_Object_Field_T<" << bt->name ()
-          << "> (" << bt->name () << "::_duplicate (u.u_."
-          << ub->local_name () << "_->ptr ()));" << be_uidt_nl;
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// make a copy" << be_nl;
+      *os << ub->local_name () << "_var = " << bt->name ()
+          << "::_duplicate (u.u_." << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "*this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -317,24 +349,41 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (be_predefined_t
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid label
       switch (node->pt ())
         {
         case AST_PredefinedType::PT_pseudo:
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// make a copy" << be_nl;
+          *os << ub->local_name () << "_var = " << bt->name ()
+              << "::_duplicate (u.u_." << ub->local_name () << "_);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
           *os << "this->u_." << ub->local_name () << "_ = "
-              << bt->name () << "::_duplicate (u.u_."
-              << ub->local_name () << "_);" << be_uidt_nl;
+              << ub->local_name () << "_var._retn ();" << be_uidt_nl;
           break;
         case AST_PredefinedType::PT_any:
-          *os << "this->u_." << ub->local_name () << "_ = new "
-              << bt->name () << " (*u.u_."
-              << ub->local_name () << "_);" << be_uidt_nl;
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// make a deep copy" << be_nl;
+          *os << ub->local_name () << "_var = new " << bt->name ()
+              << " (*u.u_." << ub->local_name () << "_);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
+          *os << "this->u_." << ub->local_name () << "_ = "
+              << ub->local_name () << "_var._retn ();" << be_uidt_nl;
           break;
         case AST_PredefinedType::PT_void:
           break;
         default:
           *os << "// set the value" << be_nl
-              << "this->u_." << ub->local_name () << "_ = "
-              << "u.u_." << ub->local_name () << "_;" << be_uidt_nl;
+              << "this->u_." << ub->local_name () << "_ = u.u_."
+              << ub->local_name () << "_;" << be_uidt_nl;
           break;
         }
 
@@ -377,9 +426,18 @@ be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
-      *os << "this->u_." << ub->local_name () << "_ = new "
-          << bt->name () << " (*u.u_."
-          << ub->local_name () << "_);" << be_uidt_nl;
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = new " << bt->name ()
+          << " (*u.u_." << ub->local_name () << "_);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -412,9 +470,18 @@ be_visitor_union_branch_public_assign_cs::visit_string (be_string *)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << "CORBA::String_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = CORBA::string_dup (u.u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
       *os << "this->u_." << ub->local_name () << "_ = "
-          << "CORBA::string_dup (u.u_."
-          << ub->local_name () << "_);" << be_uidt_nl;
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -454,14 +521,24 @@ be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid label
       if (bt->size_type () == be_type::VARIABLE)
         {
-          *os << "this->u_." << ub->local_name () << "_ = new "
-              << bt->name () << " (*u.u_."
-              << ub->local_name () << "_);" << be_uidt_nl;
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// make a deep copy" << be_nl;
+          *os << ub->local_name () << "_var = new " << bt->name ()
+              << " (*u.u_." << ub->local_name () << "_);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
+          *os << "this->u_." << ub->local_name () << "_ = "
+              << ub->local_name () << "_var._retn ();" << be_uidt_nl;
         }
       else
         {
+          *os << "// set the value" << be_nl;
           *os << "this->u_." << ub->local_name () << "_ = u.u_."
               << ub->local_name () << "_;" << be_uidt_nl;
         }
@@ -525,9 +602,18 @@ be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
-      *os << "this->u_." << ub->local_name () << "_ = new "
-          << bt->name () << " (*u.u_."
+      // valid label
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
           << ub->local_name () << "_);" << be_nl;
+      *os << "// make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = new " << bt->name ()
+          << " (*u.u_." << ub->local_name () << "_);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 7ef8ae84983..847eede719c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -18,9 +18,9 @@
 //
 // ============================================================================
 
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
+#include	"idl.h"
+#include	"idl_extern.h"
+#include	"be.h"
 
 #include "be_visitor_union_branch.h"
 
@@ -297,84 +297,6 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node)
   return 0;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-
-// visit valuetype type
-int
-be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_valuetype - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "*")
-      << ");// set" << be_nl;
-  // get method
-  *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-  return 0;
-}
-
-// visit valuetype forward type
-int
-be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get union branch
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ch::"
-                         "visit_valuetype_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "*")
-      << ");// set" << be_nl;
-  // get method
-  *os << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const; // get method\n\n";
-  return 0;
-}
-
-#endif /* IDL_HAS_VALUETYPE */
-
 // visit predefined type
 int
 be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *node)
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 7b1a58bb887..366137876c4 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
@@ -135,7 +135,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
-  // on
+  // on 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
       && bt->is_child (bu)) // bt is defined inside the union
@@ -147,7 +147,7 @@ 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->fullname (), 
                            bt->local_name ()->get_string ());
         }
       else
@@ -171,17 +171,34 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << fname << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// release old and make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = " << fname
+          << "_dup (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
       *os << "this->u_." << ub->local_name () << "_ = "
-          << fname << "_dup (val);" << be_uidt_nl;
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -237,15 +254,23 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
       *os << "// set the value" << be_nl
           << "this->u_." << ub->local_name () << "_ = val;\n";
     }
@@ -306,19 +331,39 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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 TAO_Object_Field_T<"
-          << bt->nested_type_name (bu, "")
-          << "> (" << bt->name ()
-          << "::_duplicate (val));" << be_uidt_nl;
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << "if (!u_." << ub->local_name () << "_)" << be_idt_nl;
+      *os << "{" << be_idt_nl;
+      *os << "u_." << ub->local_name () << "_ = new TAO_Object_Field_T<"
+          << bt->nested_type_name (bu, "") << ">;" << be_uidt_nl;
+      *os << "}" << be_uidt_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// release old storage and make a copy" << be_nl;
+      *os << ub->local_name () << "_var = " << bt->name ()
+          << "::_duplicate (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "*this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -376,19 +421,39 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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 TAO_Object_Field_T<"
-          << bt->nested_type_name (bu, "")
-          << "> (" << bt->name ()
-          << "::_duplicate (val));" << be_uidt_nl;
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << "if (!u_." << ub->local_name () << "_)" << be_idt_nl;
+      *os << "{" << be_idt_nl;
+      *os << "u_." << ub->local_name () << "_ = new TAO_Object_Field_T<"
+          << bt->nested_type_name (bu, "") << ">;" << be_uidt_nl;
+      *os << "}" << be_uidt_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_->ptr ());" << be_nl;
+      *os << "// release old storage and make a copy" << be_nl;
+      *os << ub->local_name () << "_var = " << bt->name ()
+          << "::_duplicate (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "*this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -447,33 +512,56 @@ be_visitor_union_branch_public_ci::visit_predefined_type (be_predefined_type *no
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
       switch (node->pt ())
         {
         case AST_PredefinedType::PT_pseudo:
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// release old storage and make a copy" << be_nl;
+          *os << ub->local_name () << "_var = " << bt->name ()
+              << "::_duplicate (val);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
           *os << "this->u_." << ub->local_name () << "_ = "
-              << bt->name () << "::_duplicate (val);" << be_uidt_nl;
+              << ub->local_name () << "_var._retn ();" << be_uidt_nl;
           break;
-
         case AST_PredefinedType::PT_any:
-          *os << "this->u_." << ub->local_name () << "_ = new "
-              << bt->name () << " (val);" << be_uidt_nl;
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// release old and make a deep copy" << be_nl;
+          *os << ub->local_name () << "_var = new " << bt->name ()
+              << " (val);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
+          *os << "this->u_." << ub->local_name () << "_ = "
+              << ub->local_name () << "_var._retn ();" << 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;
+              << "this->u_." << ub->local_name () << "_ = val;" << be_uidt_nl;
         }
     }
   else
@@ -596,16 +684,34 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";"
+              << be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// release old and make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = new " << bt->name ()
+          << " (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -663,16 +769,33 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << "CORBA::String_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// release old and make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = CORBA::string_dup (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
    }
   else
     {
@@ -691,17 +814,28 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
       *os << "// set the value" << be_nl
+          << "CORBA::String_var " << ub->local_name ()
+          << "_var (val);" << be_nl
           << "this->u_." << ub->local_name () << "_ = "
-          << "CORBA::string_dup (val);" << be_uidt_nl;
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
@@ -720,14 +854,23 @@ be_visitor_union_branch_public_ci::visit_string (be_string *)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
       *os << "// set the value" << be_nl
           << "CORBA::String_var " << ub->local_name ()
           << "_var = val;" << be_nl
@@ -818,18 +961,36 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
   // set the discriminant to the appropriate label
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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;
-
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";"
+              << be_nl;
+        }
       if (bt->size_type () == be_type::VARIABLE)
         {
-          *os << "this->u_." << ub->local_name () << "_ = new "
-              << bt->name () << " (val);" << be_uidt_nl;
+          *os << "// set the value" << be_nl;
+          *os << "// store current val in a _var so as to free it on an assignment"
+              << be_nl;
+          *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+              << ub->local_name () << "_);" << be_nl;
+          *os << "// release old and make a deep copy" << be_nl;
+          *os << ub->local_name () << "_var = new " << bt->name ()
+              << " (val);" << be_nl;
+          *os << "// the _var gives up ownership" << be_nl;
+          *os << "this->u_." << ub->local_name () << "_ = "
+              << ub->local_name () << "_var._retn ();" << be_uidt_nl;
         }
       else
         {
@@ -954,17 +1115,34 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node)
       << "{" << be_idt_nl;
   if (ub->label ()->label_kind () == AST_UnionLabel::UL_label)
     {
+      // valid 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 ()
+      // check if the case label is a symbol or a literal
+      if (ub->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()->n ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val ()->n ()
+              << ";" << be_nl;
+        }
+      else
+        {
+          *os << "this->_reset (" << ub->label ()->label_val ()
+              << ", 0);" << be_nl;
+          *os << "this->disc_ = " << ub->label ()->label_val () << ";" <<
+            be_nl;
+        }
+      *os << "// set the value" << be_nl;
+      *os << "// store current val in a _var so as to free it on an assignment"
+          << be_nl;
+      *os << bt->name () << "_var " << ub->local_name () << "_var (this->u_."
+          << ub->local_name () << "_);" << be_nl;
+      *os << "// release old and make a deep copy" << be_nl;
+      *os << ub->local_name () << "_var = new " << bt->name ()
           << " (val);" << be_nl;
+      *os << "// the _var gives up ownership" << be_nl;
+      *os << "this->u_." << ub->local_name () << "_ = "
+          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
     }
   else
     {
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 f2e7c09199f..0c3d1b7dcfc 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
@@ -67,9 +67,14 @@ visit_union_branch (be_union_branch *node)
 
   this->ctx_->node (node); // save the node
 
-  *os << "case ";
-  node->gen_label_value (os);
-  *os << ":" << be_idt_nl;
+  if (node->label ()->label_val ()->ec () == AST_Expression::EC_symbol)
+    {
+      *os << "case " << node->label ()->label_val ()->n ()  << ":" << be_idt_nl;
+    }
+  else
+    {
+      *os << "case " << node->label ()->label_val () << ":" << be_idt_nl;
+    }
 
   if (bt->accept (this) == -1)
     {
@@ -114,7 +119,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
   char fname [NAMEBUFSIZE];  // to hold the full and
 
   // save the node's local name and full name in a buffer for quick use later
-  // on
+  // on 
   ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
   if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
       && bt->is_child (bu)) // bt is defined inside the union
@@ -126,7 +131,7 @@ 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->fullname (), 
                            bt->local_name ()->get_string ());
         }
       else
@@ -141,10 +146,9 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
     }
 
   os = this->ctx_->stream ();
-  *os << fname << "_free (this->u_." << ub->local_name ()
-      << "_);" << be_nl
-      << "this->u_." << ub->local_name () << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << fname << "_free (this->u_." << ub->local_name () 
+      << "_);" << be_nl;
+  *os << "break;" << be_uidt_nl;
   return 0;
 }
 
@@ -187,13 +191,10 @@ be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *)
                          "bad context information\n"
                          ), -1);
     }
-
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "delete this->u_."
-      << ub->local_name () << "_;" << be_nl
-      << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << "delete this->u_." << ub->local_name () << "_;" << be_nl;
+  *os << "ACE_OS::memset ((void *) &this->u_, 0, sizeof (this->u_));" << be_nl;
+  *os << "break;" << be_uidt_nl;
 
   return 0;
 }
@@ -215,11 +216,9 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *
                          ), -1);
     }
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "delete this->u_."
-      << ub->local_name () << "_;" << be_nl
-      << "this->u_." << ub->local_name ()
-      << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << "delete this->u_." << ub->local_name () << "_;" << be_nl;
+  *os << "ACE_OS::memset ((void *) &this->u_, 0, sizeof (this->u_));" << be_nl;
+  *os << "break;" << be_uidt_nl;
 
   return 0;
 }
@@ -236,7 +235,7 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (be_predefined_ty
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
-                         "visit_predefined_type - "
+                         "visit_interface - "
                          "bad context information\n"
                          ), -1);
     }
@@ -247,17 +246,13 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (be_predefined_ty
     {
     case AST_PredefinedType::PT_pseudo:
       *os << "CORBA::release (this->u_."
-	  << ub->local_name () << "_);" << be_nl
-          << "this->u_." << ub->local_name ()
-          << "_ = 0;" << be_nl
-          << "break;" << be_uidt_nl;
+	  << ub->local_name () << "_);" << be_nl;
+      *os << "break;" << be_uidt_nl;
       break;
     case AST_PredefinedType::PT_any:
       *os << "delete this->u_."
-	  << ub->local_name () << "_;" << be_nl
-          << "this->u_." << ub->local_name ()
-          << "_ = 0;" << be_nl
-          << "break;" << be_uidt_nl;
+	  << ub->local_name () << "_;" << be_nl;
+      *os << "break;" << be_uidt_nl;
       break;
     case AST_PredefinedType::PT_void:
       break;
@@ -285,12 +280,8 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (be_sequence *)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "delete this->u_."
-      << ub->local_name () << "_;" << be_nl
-      << "this->u_."
-      << ub->local_name ()
-      << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << "delete this->u_." << ub->local_name () << "_;" << be_nl;
+  *os << "break;" << be_uidt_nl;
 
   return 0;
 }
@@ -313,12 +304,8 @@ be_visitor_union_branch_public_reset_cs::visit_string (be_string *)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "CORBA::string_free (this->u_."
-      << ub->local_name () << "_);" << be_nl
-      << "this->u_."
-      << ub->local_name ()
-      << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << "CORBA::string_free (this->u_." << ub->local_name () << "_);" << be_nl;
+  *os << "break;" << be_uidt_nl;
 
   return 0;
 }
@@ -350,12 +337,8 @@ be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node)
   os = this->ctx_->stream ();
   if (bt->size_type () == be_type::VARIABLE)
     {
-      *os << "delete this->u_." << ub->local_name ()
-          << "_;" << be_nl
-          << "this->u_."
-          << ub->local_name ()
-          << "_ = 0;" << be_nl;
-   }
+      *os << "delete this->u_." << ub->local_name () << "_;" << be_nl;
+    }
 
   *os << "break;" << be_uidt_nl;
 
@@ -401,11 +384,8 @@ be_visitor_union_branch_public_reset_cs::visit_union (be_union *)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  *os << "delete this->u_."
-      << ub->local_name () << "_;" << be_nl
-      << "this->u_."
-      << ub->local_name () << "_ = 0;" << be_nl
-      << "break;" << be_uidt_nl;
+  *os << "delete this->u_." << ub->local_name () << "_;" << be_nl;
+  *os << "break;" << be_uidt_nl;
 
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
deleted file mode 100644
index d735991df3f..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_valuetype.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype class
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include "idl.h"
-#include "idl_extern.h"
-#include "be.h"
-
-#ifdef IDL_HAS_VALUETYPE
-
-#include "be_visitor_valuetype.h"
-
-#include "be_visitor_valuetype/valuetype.cpp"
-#include "be_visitor_valuetype/valuetype_ch.cpp"
-#include "be_visitor_valuetype/valuetype_obv_ch.cpp"
-#include "be_visitor_valuetype/valuetype_obv_cs.cpp"
-#include "be_visitor_valuetype/valuetype_ci.cpp"
-#include "be_visitor_valuetype/valuetype_cs.cpp"
-//#include "be_visitor_valuetype/valuetype_ih.cpp"
-//#include "be_visitor_valuetype/valuetype_is.cpp"
-//#include "be_visitor_valuetype/any_op_ch.cpp"
-//#include "be_visitor_valuetype/any_op_cs.cpp"
-#include "be_visitor_valuetype/cdr_op_ch.cpp"
-#include "be_visitor_valuetype/cdr_op_cs.cpp"
-#include "be_visitor_valuetype/marshal_ch.cpp"
-#include "be_visitor_valuetype/marshal_cs.cpp"
-#include "be_visitor_valuetype/arglist.cpp"
-#include "be_visitor_valuetype/field_ch.cpp"
-#include "be_visitor_valuetype/field_cs.cpp"
-#include "be_visitor_valuetype/field_cdr_ci.cpp"
-#include "be_visitor_valuetype/obv_module.cpp"
-
-#endif /* IDL_HAS_VALUETYPE */
-
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
deleted file mode 100644
index c5538060056..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    arglist.cpp
-//
-// = DESCRIPTION
-//    Visitor generating the parameter list of operations
-//    in the Valuetype class.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_operation.h"
-
-ACE_RCSID(be_visitor_operation, arglist, "$Id$")
-
-
-// ************************************************************
-//   operation visitor  to generate the argument list.
-//   We have separated code generation for this from the 4 main
-//   visitors to avoid code duplication and tight coupling
-// ************************************************************
-
-be_visitor_obv_operation_arglist::be_visitor_obv_operation_arglist (be_visitor_context
-                                                            *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_obv_operation_arglist::~be_visitor_obv_operation_arglist (void)
-{
-}
-
-int
-be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << " (";
-  // *os << " (" << be_idt << be_idt << "\n";
-
-  // all we do is hand over code generation to our scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_obv_operation_arglist::"
-                         "visit_operation - "
-                         "codegen for scope failed\n"),
-                        -1);
-    }
-
-
-  // *os << be_uidt;
-  // os->indent ();
-  *os << ")";// << be_uidt;
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
-      // each method is pure virtual in the Valuetype class
-      *os << " = 0;\n";
-      break;
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
-      break;
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
-      break;
-    default:
-       *os << "\n";
-    }
-  if (!this->ctx_->attribute ())    // hack to get a nice newline
-    *os << "\n";
-  return 0;
-}
-
-int
-be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
-{
-  // TAO_OutStream *os = this->ctx_->stream ();
-
-  // get the visitor that will dump the argument's mapping in the operation
-  // signature.
-  be_visitor_context ctx (*this->ctx_);
-
-  // first grab the interface definition inside which this operation is
-  // defined. We need this since argument types may very well be declared
-  // inside the scope of the interface node. In such cases, we would like to
-  // generate the appropriate relative scoped names.
-  be_operation *op = this->ctx_->be_scope_as_operation ();
-  if (!op)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad operation\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
-  // %! use AST_Interface
-  be_valuetype *intf;
-  intf = this->ctx_->attribute ()
-    ? be_valuetype::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-    : be_valuetype::narrow_from_scope (op->defined_in ());
-
-  if (!intf)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad interface\n"),
-                        -1);
-    }
-  ctx.scope (intf); // set new scope
-
-  //  snipped from
-  //  be_visitor_args_arglist::visit_argument (be_argument *node)
-  ctx.node (node); // save the argument node
-
-  // retrieve the type
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_args_arglist::"
-                         "visit_argument - "
-                         "Bad argument type\n"),
-                        -1);
-    }
-
-  // os->indent (); // start with current indentation level
-
-  // Different types have different mappings when used as in/out or
-  // inout parameters. Let this visitor deal with the type
-
-  // end of be_visitor_args_arglist::visit_argument ()
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_CH);
-      break;
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_SH:
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
-    case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
-      ctx.state (TAO_CodeGen::TAO_ARGUMENT_ARGLIST_OTHERS);
-      break;
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_arglist::"
-                           "visit_argument - "
-                           "Bad context\n"),
-                          -1);
-      }
-    }
-
-  // grab a visitor
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "Bad visitor\n"),
-                        -1);
-    }
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arglist::"
-                         "visit_argument - "
-                         "codegen for argument failed\n"),
-                        -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-int
-be_visitor_obv_operation_arglist::post_process (be_decl *bd)
-// derived from be_visitor_operation_argument::post_process (be_decl *bd)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-      switch (this->ctx_->state ())
-        {
-        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH:
-        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_OTHERS:
-        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_SH:
-        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IH:
-        case TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_IS:
-          if (!this->last_node (bd))
-            *os << ", "; // "\n";
-          else
-            *os << "";  // "\n";
-          break;
-        default:
-          break;
-        }
-
-  return 0;
-}
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
deleted file mode 100644
index eb01d5ff6c4..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ch.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, cdr_op_ch, "$Id$")
-
-be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch
-(be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_cdr_op_ch::~be_visitor_valuetype_cdr_op_ch (void)
-{
-}
-
-int
-be_visitor_valuetype_cdr_op_ch::visit_valuetype (be_valuetype *node)
-{
-  if (node->cli_hdr_cdr_op_gen () || node->imported ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // generate the CDR << and >> operator declarations (prototypes)
-
-  os->indent ();
-  *os << "CORBA::Boolean " << idl_global->export_macro ()
-      << " operator<< (TAO_OutputCDR &, const " << node->name ()
-      << " *); // " << be_nl;
-  *os << "CORBA::Boolean " << idl_global->export_macro ()
-      << " operator>> (TAO_InputCDR &, "
-      << node->name () << " *&);\n";
-
-  // set the substate as generating code for the types defined in our scope
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-  // all we have to do is to visit the scope and generate code
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cdr_op_ch::"
-                         "visit_valuetype - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-
-  node->cli_hdr_cdr_op_gen (1);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
deleted file mode 100644
index 1740bf75f4f..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-// #include "be_visitor_field.h"
-
-ACE_RCSID(be_visitor_valuetype, cdr_op_cs, "$Id$")
-
-be_visitor_valuetype_cdr_op_cs::be_visitor_valuetype_cdr_op_cs
-(be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_cdr_op_cs::~be_visitor_valuetype_cdr_op_cs (void)
-{
-}
-
-int
-be_visitor_valuetype_cdr_op_cs::visit_valuetype (be_valuetype *node)
-{
-  // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_cdr_op_gen () || node->imported ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // First generate code for our children. The reason we do this first is
-  // because the inlined code for our children must be available before we use
-  // it in our parent
-
-  // set the substate as generating code for the types defined in our scope
-  //this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_SCOPE);
-  // all we have to do is to visit the scope and generate code
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cdr_op_cs"
-                         "::visit_valuetype - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-  //  set the sub state as generating code for the output operator
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator<< (TAO_OutputCDR &strm, const "
-      << node->name ()
-      << " *_tao_valuetype)" << be_nl
-      << "{" << be_idt_nl;
-  *os << "return CORBA_ValueBase::_tao_marshal (strm,"  << be_idt_nl
-      << "ACE_const_cast (" << node->name () << "*, _tao_valuetype)," << be_nl
-      << "(ptr_arith_t) &" << node->name() <<"::_downcast);"
-      << be_uidt<< be_uidt_nl
-      << "}\n\n";
-
-  // set the substate as generating code for the input operator
-  //this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator>> (TAO_InputCDR &strm, "
-      << node->name ()
-      << " *&_tao_valuetype)" << be_nl
-      << "{" << be_idt_nl;
-  *os << "return " << node->name() << "::_tao_unmarshal (strm, _tao_valuetype);"
-#ifdef obv_marshal_old_version
-  *os << "CORBA::ValueBase *ptr;" << be_nl
-      << "int retval = CORBA_ValueBase::_tao_unmarshal (strm,"
-      << be_idt_nl << "ptr, (ptr_arith_t) &" << node->name() <<"::_downcast);"
-      << be_uidt_nl
-      << "if (retval) {" << be_idt_nl
-      << "_tao_valuetype = " << node->name() << "::_downcast (ptr);"
-      << be_nl << "if (_tao_valuetype) retval = 1;"
-      << be_uidt_nl << "}" << be_idt_nl
-      << "return retval;"
-#endif /* obv_marshal_old_version */
-      << be_uidt_nl
-      << "}\n\n";
-
-  if (!node->is_abstract_valuetype ())
-    { // functions that marshal state
-      be_visitor_context* new_ctx  =
-        new be_visitor_context (*this->ctx_);
-      be_visitor_valuetype_marshal_cs visitor (new_ctx);
-      visitor.visit_valuetype (node);
-    }
-
-  node->cli_stub_cdr_op_gen (1);
-  return 0;
-}
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
deleted file mode 100644
index b54d83166b8..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ci.cpp
+++ /dev/null
@@ -1,947 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_cdr_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Field in the client stubs file.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_field/cdr_op_cs.cpp
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_field.h"
-
-ACE_RCSID(be_visitor_valuetype, field_cdr_op_cs, "$Id$")
-
-
-// **********************************************
-//  visitor for field in the client stubs file
-// **********************************************
-
-// constructor
-be_visitor_valuetype_field_cdr_ci::be_visitor_valuetype_field_cdr_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx),
-    pre_ (""), post_ ("")
-{
-}
-
-// destructor
-be_visitor_valuetype_field_cdr_ci::~be_visitor_valuetype_field_cdr_ci (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_valuetype_field_cdr_ci::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit array
-int
-be_visitor_valuetype_field_cdr_ci::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_array - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname 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 on
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscore
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name
-
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
-        }
-    }
-  else
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
-    }
-
-  // check what is the code generation substate. Are we generating
-  // code for the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> "
-          << "_tao_" << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << "
-          << "_tao_" << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // proceed further
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_array - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  // if not a typedef and we are defined in the use scope, we must be defined
-
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // this is the case for anonymous arrays. Generate the <<, >> operators
-      // for the type defined by the anonymous array
-
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the  declaration
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CDR_OP_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_array - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_array - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_valuetype_field_cdr_ci::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_array - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // proceed further
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_enum - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // generate the typcode for enums
-      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit interface type
-int
-be_visitor_valuetype_field_cdr_ci::visit_interface (be_interface *)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_interface - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done because an interface cannit be declared inside a
-      // structure
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_interface - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit interface forward type
-int
-be_visitor_valuetype_field_cdr_ci::visit_interface_fwd (be_interface_fwd *)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_interface_fwd - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ").in ()";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done because an interface cannit be declared inside a
-      // structure
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_interface_fwd - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit valuetype type
-int
-be_visitor_valuetype_field_cdr_ci::visit_valuetype (be_valuetype *)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_valuetype - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done because an valuetype cannit be declared inside a
-      // structure
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_valuetype - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit valuetype forward type
-int
-be_visitor_valuetype_field_cdr_ci::visit_valuetype_fwd (be_valuetype_fwd *)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_valuetype_fwd - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ").out ()";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ").in ()";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done because an valuetype cannit be declared inside a
-      // structure
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_valuetype_fwd - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit predefined type
-int
-be_visitor_valuetype_field_cdr_ci::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_predefined_type - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      // is a psuedo obj
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
-        *os << "(strm >> " << pre_ << f->local_name () << post_
-            << ".out ())";
-      else if (node->pt () == AST_PredefinedType::PT_char)
-        *os << "(strm >> CORBA::Any::to_char (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_wchar)
-        *os << "(strm >> CORBA::Any::to_wchar (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_octet)
-        *os << "(strm >> CORBA::Any::to_octet (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_boolean)
-        *os << "(strm >> CORBA::Any::to_boolean (" << pre_
-            << f->local_name () << post_ << "))";
-      else
-        *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      // is a psuedo obj
-      if (node->pt () == AST_PredefinedType::PT_pseudo)
-        *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
-      else if (node->pt () == AST_PredefinedType::PT_char)
-        *os << "(strm << CORBA::Any::from_char (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_wchar)
-        *os << "(strm << CORBA::Any::from_wchar (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_octet)
-        *os << "(strm << CORBA::Any::from_octet (" << pre_
-            << f->local_name () << post_ << "))";
-      else if (node->pt () == AST_PredefinedType::PT_boolean)
-        *os << "(strm << CORBA::Any::from_boolean (" << pre_
-            << f->local_name () << post_ << "))";
-      else
-        *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_array - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cdr_ci::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_sequence - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // proceed further
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_sequence - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  if (node->node_type () != AST_Decl::NT_typedef
-      && node->is_child (this->ctx_->scope ()))
-    // not a typedef AND
-    // node is defined inside the structure
-    {
-      // Anonymous sequence
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited.
-      // The scope is still the same
-
-      // generate the inline code for structs
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CDR_OP_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit string type
-int
-be_visitor_valuetype_field_cdr_ci::visit_string (be_string *)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_string - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ".out ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ".in ())";
-      break;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // nothing to be done
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_array - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_valuetype_field_cdr_ci::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_structure - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // proceed further
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_structure - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope is
-      // still the same
-
-      // generate the inline code for structs
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_struct - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_struct - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-// visit typedef type
-int
-be_visitor_valuetype_field_cdr_ci::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_union_branch_public_ci::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_valuetype_field_cdr_ci::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_union - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // check what is the code generations substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-      *os << "(strm >> " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "(strm << " << pre_ << f->local_name () << post_ << ")";
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-      // proceed further
-      break;
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                         "visit_union - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-
-  if (node->node_type () != AST_Decl::NT_typedef // not a typedef
-      && node->is_child (this->ctx_->scope ())) // node is defined inside the
-    // structure
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope is
-      // still the same
-
-      // generate the inline code for union
-      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CS);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cdr_ci::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-
-// ****************************************************************
-
-be_visitor_valuetype_field_cdr_decl::
-    be_visitor_valuetype_field_cdr_decl (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-// This is a field, but the action depends on the type of the field,
-// use this visitor to detect the type of the field.
-// Notice that this is why the parent visitor (who create us) cannot
-// do the job, because it may have another purpose for some or all of
-// the visit_* methods; in other words, while running a visitor to
-// generate CDR operators for structures we cannot use that one to
-// generate the code of each field, because visit_struct already has a
-// meaning in that visitor.
-int
-be_visitor_valuetype_field_cdr_decl::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  // @@ Shouldn't this be saved in the visitor and not the context?!
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// visit array
-int
-be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  // retrieve the field node
-  be_field *f = this->ctx_->be_node_as_field ();
-  if (!f)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
-                         "visit_array - "
-                         "cannot retrieve field node\n"
-                         ), -1);
-    }
-
-  // retrieve the valuetype scope in which the code is generated
-  be_decl *sc = this->ctx_->scope ();
-  be_valuetype *vt = be_valuetype::narrow_from_decl (sc);
-  if (!vt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
-                         "visit_array - "
-                         "cannot retrieve valuetype node\n"
-                         ), -1);
-    }
-
-  // for anonymous arrays, the type name has a _ prepended. We compute
-  // the fullname with or without the underscore and use it later on.
-  char fname [NAMEBUFSIZE];  // to hold the full and
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  if (!this->ctx_->alias () // not a typedef
-      && node->is_child (this->ctx_->scope ()))
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope
-      // prepended to our local name. This needs to be inserted after
-      // the parents's name
-
-      if (node->is_nested ())
-        {
-          be_decl *parent = be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", node->fullname ());
-        }
-    }
-  else
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", node->fullname ());
-    }
-
-  // check what is the code generation substate. Are we generating code for
-  // the in/out operators for our parent or for us?
-  switch (this->ctx_->sub_state ())
-    {
-    case TAO_CodeGen::TAO_CDR_INPUT:
-    case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << fname << "_forany "
-          << "_tao_" << vt->field_pd_prefix () << f->local_name ()
-          << vt->field_pd_postfix () << be_idt << be_idt_nl
-          << "(ACE_const_cast (" << be_idt << be_idt_nl
-          << fname << "_slice*," << be_nl
-          << vt->field_pd_prefix () << f->local_name ()
-          << vt->field_pd_postfix () << be_uidt_nl
-          << ")" << be_uidt << be_uidt_nl
-          << ");" << be_uidt_nl;
-      return 0;
-    case TAO_CodeGen::TAO_CDR_SCOPE:
-    default:
-      // error
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
-                         "visit_array - "
-                         "bad sub state\n"
-                         ), -1);
-    }
-  ACE_NOTREACHED (return 0);
-}
-
-// visit typedef type
-int
-be_visitor_valuetype_field_cdr_decl::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_cdr_op_field_decl::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
deleted file mode 100644
index 7b30bb757a7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ /dev/null
@@ -1,748 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating the accessor and modifier declarations
-//    for valuetype fields in the valuetype class (header).
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_union_branch/public_ch.cpp
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-ACE_RCSID(be_visitor_valuetype, field_ch, "$Id$")
-
-
-// constructor
-be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch
-    (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-  setenclosings ("",";");
-}
-
-// destructor
-be_visitor_valuetype_field_ch::~be_visitor_valuetype_field_ch (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_valuetype_field_ch::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_union_branch - "
-                         "Bad type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_union_branch - "
-                         "codegen failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types (valuetype state member)
-
-// visit array type
-int
-be_visitor_valuetype_field_ch::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
-  be_type *bt;
-
-  // check if we are visiting this via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_array - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // this is the case of an anonymous array inside a union
-
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the array declaration
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_array - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_array - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-      // now use this array as a "type" for the subsequent declarator
-      os->indent (); // start from current indentation
-      // the set method
-      *os << pre_op() << "void " << ub->local_name () << " ("
-          << "_" << bt->local_name () << ")"
-          << post_op() << "    // set" << be_nl;
-      // the get method
-      *os << pre_op() << "const _" << bt->local_name ()
-          << "_slice * " << ub->local_name ()
-          << " (void)" << post_op() << be_nl;
-      *os << pre_op() << "_" << bt->local_name ()
-          << "_slice * " << ub->local_name ()
-          << " (void)" << post_op();
-    }
-  else
-    {
-      // now use this array as a "type" for the subsequent declarator
-      os->indent (); // start from current indentation
-      // the set method
-      *os << pre_op() << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu) << ")" << post_op() << "    // set"
-          << be_nl;
-      // the get method
-      *os << pre_op()
-          << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
-          << " (void)" << post_op() << be_nl;
-      // the get (read/write) method
-      *os << pre_op() << "const "
-          << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name ()
-          << " (void) const" << post_op() << "\n\n";
-    }
-
-  return 0;
-}
-
-// visit enum type
-int
-be_visitor_valuetype_field_ch::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union node
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_enum - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_enum - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // now use this enum as a "type" for the subsequent declarator
-  os->indent (); // start from current indentation
-  // the set method
-  *os << pre_op() << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu) << ")" << post_op() << "    // set"
-      << be_nl;
-  // the get method
-  *os << pre_op() << bt->nested_type_name (bu) << " " << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-
-  return 0;
-}
-
-// visit interface type
-int
-be_visitor_valuetype_field_ch::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "_ptr")
-      << ")" << post_op() << "    // set" << be_nl;
-  // get method
-  *os << pre_op()
-      << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-  return 0;
-}
-
-// visit interface forward type
-int
-be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_interface_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "_ptr")
-      << ")" << post_op() << "    // set" << be_nl;
-  // get method
-  *os << pre_op()
-      << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-  return 0;
-}
-
-// visit valuetype type
-int
-be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_valuetype - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "*")
-      << ")" << post_op() << "    // set" << be_nl;
-  // get method
-  *os << pre_op()
-      << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-  return 0;
-}
-
-// visit valuetype forward type
-int
-be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_valuetype_fwd - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from current indentation
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " ("
-      << bt->nested_type_name (bu, "*")
-      << ")" << post_op() << "    // set" << be_nl;
-  // get method
-  *os << pre_op()
-      << bt->nested_type_name (bu, "*") << " " << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-  return 0;
-}
-
-// visit predefined type
-int
-be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_predefined_type - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-  os->indent (); // start from current indentation
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      // set method
-      *os << pre_op() << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu, "_ptr") << ")"
-          << post_op() << "    // set" << be_nl;
-        // get method
-      *os << pre_op()
-          << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name ()
-          << " (void) const" << post_op() << "     // get method\n\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      // set method
-      *os << pre_op() << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu) << ")"
-          << post_op() << "    // set" << be_nl;
-      // get method (read-only)
-      *os << pre_op() << "const " << bt->nested_type_name (bu) << " "
-          << ub->local_name () << " (void) const"
-          << post_op() << "     // get method\n\n";
-      // get method (read/write)
-      *os << pre_op() << bt->nested_type_name (bu) << " "
-          << ub->local_name () << " (void)"
-          << post_op() << "     // get method\n\n";
-      break;
-    case AST_PredefinedType::PT_void:
-      break;
-    default:
-      // set method
-      *os << pre_op() << "void " << ub->local_name () << " ("
-          << bt->nested_type_name (bu) << ")"
-          << post_op() << "    // set" << be_nl;
-      // get method
-      *os << pre_op() << bt->nested_type_name (bu) << " " << ub->local_name ()
-          << " (void) const" << post_op() << "     // get method\n\n";
-    }
-  return 0;
-}
-
-// visit sequence type
-int
-be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_sequence - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &)"
-      << post_op() << "    // set" << be_nl;
-  // read-only
-  *os << pre_op() << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const"
-      << post_op() << "     // get method (read only)" << be_nl;
-  // read/write
-  *os << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void)"
-      << post_op() << "     // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-// visit string type
-int
-be_visitor_valuetype_field_ch::visit_string (be_string *)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_string - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  os->indent ();
-  // three methods to set the string value
-  *os << pre_op()
-      << "void " << ub->local_name () << " (char *)"
-      << post_op() << "     // set" << be_nl;
-  *os << pre_op()
-      << "void " << ub->local_name () << " (const char *)"
-      << post_op() << "     // set" << be_nl;
-  *os << pre_op()
-      << "void " << ub->local_name () << " (const CORBA::String_var&)"
-      << post_op() << "     // set" << be_nl;
-  //get method
-  *os << pre_op() << "const char *" << ub->local_name ()
-      << " (void) const" << post_op() << "     // get method\n\n";
-  return 0;
-}
-
-// visit structure type
-int
-be_visitor_valuetype_field_ch::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_structure - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_structure - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_structure - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &)"
-      << post_op() << "    // set" << be_nl
-    // read-only
-      << pre_op() << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const"
-      << post_op() << "     // get method (read only)" << be_nl
-    // read/write
-      << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void)" << post_op() << "     // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-// visit typedefed type
-int
-be_visitor_valuetype_field_ch::visit_typedef (be_typedef *node)
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent (); // start from current indentation level
-  this->ctx_->alias (node);     // save the node for use in code generation and
-                               // indicate that the union_branch of the union_branch node
-                               // is a typedefed quantity
-
-  // make a decision based on the primitive base type
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_spec_ch::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-  this->ctx_->alias (0);
-  return 0;
-}
-
-// visit union type
-int
-be_visitor_valuetype_field_ch::visit_union (be_union *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub = this->ctx_->node (); // get state member
-  be_decl *bu = this->ctx_->scope ();  // get the enclosing union backend
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_ch::"
-                         "visit_union - "
-                         "bad context information\n"
-                         ), -1);
-    }
-
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the sequence declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_ch::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  os->indent ();
-  // set method
-  *os << pre_op() << "void " << ub->local_name () << " (const "
-      << bt->nested_type_name (bu) << " &)"
-      << post_op() << "    // set" << be_nl
-    // read-only
-      << pre_op() << "const " << bt->nested_type_name (bu) << " &"
-      << ub->local_name  () << " (void) const"
-      << post_op() << "     // get method (read only)"
-      << be_nl
-    // read/write
-      << pre_op() << bt->nested_type_name (bu) << " &" << ub->local_name ()
-      << " (void)" << post_op() << "     // get method (read/write only)\n\n";
-
-  return 0;
-}
-
-void
-be_visitor_valuetype_field_ch::setenclosings (char *pre, char *post)
-{
-  pre_op_ = pre;
-  post_op_ = post;
-}
-
-const char*
-be_visitor_valuetype_field_ch::pre_op ()
-{
-  return pre_op_;
-}
-
-const char*
-be_visitor_valuetype_field_ch::post_op ()
-{
-  return post_op_;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
deleted file mode 100644
index 31d1d47a135..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ /dev/null
@@ -1,1050 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_cs.cpp
-//
-// = DESCRIPTION
-//     Visitor for the Valuetype class.
-//     This one generates code for accessor and modifier functions of
-//     valuetype state members (in the stub or inline file).
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_union_branch/public_ci.cpp
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, field_cs, "$Id$")
-
-
-// constructor
-be_visitor_valuetype_field_cs::
-be_visitor_valuetype_field_cs (be_visitor_context *ctx)
-  : be_visitor_decl (ctx),
-    in_obv_space_ (0)
-{
-  setenclosings ("");
-}
-
-// destructor
-be_visitor_valuetype_field_cs::
-~be_visitor_valuetype_field_cs (void)
-{
-}
-
-// visit the field node
-int
-be_visitor_valuetype_field_cs::
-visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cs::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  this->ctx_->node (node); // save the node
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_cs::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  return 0;
-}
-
-// =visit operations on all possible data types  that a union_branch can be
-
-int
-be_visitor_valuetype_field_cs::visit_array (be_array *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_array - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the inline operations for this anonymous array type
-      ctx.state (TAO_CodeGen::TAO_ARRAY_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_array - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_array - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // for anonymous arrays, the type name has a _ prepended. We compute the
-  // fullname 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
-  // on
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // for anonymous arrays ...
-      // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name
-
-      if (bt->is_nested ())
-        {
-          be_decl *parent =
-                 be_scope::narrow_from_scope (bt->defined_in ())->decl ();
-          ACE_OS::sprintf (fname, "%s::_%s", parent->fullname (),
-                           bt->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname, "_%s", bt->fullname ());
-        }
-    }
-  else
-    {
-      // typedefed node
-      ACE_OS::sprintf (fname, "%s", bt->fullname ());
-    }
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os); *os << "::" << ub->local_name () << " (" << fname
-      << " val)// set" << be_nl
-      << "{" << be_idt_nl;
-
-  *os << fname << "_copy ("
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ", val);" << be_uidt_nl;
-
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << "const " << fname << "_slice *" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl;
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name ()
-      << bu->field_pd_postfix() << ";" << be_uidt_nl
-      << "}\n" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << fname << "_slice *" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl;
-      *os << "return this->"
-          << bu->field_pd_prefix() << ub->local_name ()
-          << bu->field_pd_postfix() << ";" << be_uidt_nl;
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_enum (be_enum *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_enum - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (" << bt->name ()
-      << " val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << " = val;\n";
-  os->decr_indent ();
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << bt->name () << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " () const"
-      << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_interface (be_interface *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (" << bt->name ()
-      << "_ptr val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << " = val->duplicate ();" << be_uidt_nl;
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << bt->name () << "_ptr " << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " () const"
-      << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ".ptr ();\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_interface_fwd (be_interface_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (" << bt->name ()
-      << "_ptr val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << " = val->duplicate ();" << be_uidt_nl;
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << bt->name () << "_ptr " << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " () const"
-      << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ".ptr ();\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (" << bt->name ()
-      << "* val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "if (val) val->_add_ref ();" << be_nl
-      << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << " = val;" << be_uidt_nl;
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << bt->name () << "* " << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " () const"
-      << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ".ptr ();\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_interface - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " (" << bt->name ()
-      << "* val)// set" << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "if (val) val->_add_ref ();" << be_nl
-      << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << " = val;" << be_uidt_nl;
-  *os << "}" << be_nl;
-
-  // get method
-  *os << "// retrieve the member" << be_nl
-      << this->pre_op() << bt->name () << "* " << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name () << " () const"
-      << be_nl
-      << "{\n";
-  os->incr_indent ();
-  *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ".ptr ();\n";
-  os->decr_indent ();
-  *os << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
-{
-  TAO_OutStream *os; // output stream
-
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_predef... - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  // set method
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (" << bt->name ();
-  if (node->pt () == AST_PredefinedType::PT_pseudo)
-    *os << "_ptr";
-  *os << " val) // set" << be_nl
-      << "{" << be_idt_nl;
-
-      switch (node->pt ())
-        {
-        case AST_PredefinedType::PT_pseudo:
-          *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-              << " = "
-              << bt->name () << "::_duplicate (val);" << be_uidt_nl;
-          break;
-
-        case AST_PredefinedType::PT_any:
-          *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-              << " = new "
-              << bt->name () << " (val);" << be_uidt_nl;
-          break;
-
-        case AST_PredefinedType::PT_void:
-          break;
-
-        default:
-          *os << "// set the value" << be_nl
-              << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-              << " = val;" << be_uidt_nl;
-        }
-  *os << "}" << be_nl;
-
-  switch (node->pt ())
-    {
-    case AST_PredefinedType::PT_pseudo:
-      // get method
-      *os << "// retrieve the member" << be_nl
-          << this->pre_op() << bt->name () << "_ptr" << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
-          << "{" << be_idt_nl
-          << "return this->u"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << ";" << be_uidt_nl
-          << "}\n\n";
-      break;
-    case AST_PredefinedType::PT_any:
-      // get method with read-only access
-      *os << "// retrieve the member" << be_nl
-          << this->pre_op() << "const " << bt->name () << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
-          << "{" << be_idt_nl
-          << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << ";" << be_uidt_nl
-          << "}" << be_nl;
-
-      // get method with read/write access
-      *os << "// retrieve the member" << be_nl
-          << this->pre_op() << bt->name () << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name ()
-          << " (void)" << be_nl
-          << "{" << be_idt_nl
-          << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << ";" << be_uidt_nl
-          << "}\n\n";
-      break;
-    case AST_PredefinedType::PT_void:
-      break;
-    default:
-      // get method
-      *os << "// retrieve the member" << be_nl
-          << this->pre_op() << bt->name () << be_nl;
-      this->op_name(bu,os);
-      *os << "::" << ub->local_name ()
-          << " (void) const" << be_nl
-          << "{" << be_idt_nl
-          << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << ";" << be_uidt_nl
-          << "}\n\n";
-    }
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_sequence - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the inline operations for this anonymous sequence type
-      ctx.state (TAO_CodeGen::TAO_SEQUENCE_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_sequence - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_sequence - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-
-      *os << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = new "
-          << bt->name () << " (val);" << be_uidt_nl;
-
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return this->"   // %! *this (seq_var, not seq member)
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";" << be_uidt_nl
-      << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << this->pre_op() << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";" << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_string (be_string *)
-{
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_string - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // three methods to set the string value
-
-  // (1) set method from char*
-  os->indent (); // start from current indentation
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (char *val)"
-      << be_nl
-      << "{" << be_idt_nl;
-
-      *os << "// set the value" << be_nl
-          << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = val;" << be_uidt_nl
-      << "}" << be_nl;
-
-  // (2) set method from const char *
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (const char *val)" << be_nl
-      << "{\n";
-  os->incr_indent ();
-
-      *os << "// set the value" << be_nl
-          << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = "
-          << "CORBA::string_dup (val);" << be_uidt_nl;
-
-  *os << "}" << be_nl;
-
-  // (3) set from const String_var&
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (const CORBA::String_var &val)" << be_nl
-      << "{" << be_idt_nl;
-      *os << ";" << be_nl;
-
-      *os << "// set the value" << be_nl
-          << "CORBA::String_var " << ub->local_name ()
-          << "_var = val;" << be_nl
-          << "this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = "
-          << ub->local_name () << "_var._retn ();" << be_uidt_nl;
-
-  *os << "}" << be_nl;
-
-  // get method
-  *os << this->pre_op() << "const char *" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (void) const // get method" << be_nl
-      << "{" << be_idt_nl
-      << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";" << be_uidt_nl
-      << "}\n\n";
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_structure (be_structure *node)
-{
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_structure - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_structure - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_structure - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-
-  if (0) // %! (bt->size_type () == be_type::VARIABLE)
-    { cerr <<"!t VARIABLE struct in field_cs\n";
-      *os << "delete this->"
-     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << ";" << be_nl;
-      *os << "this->"
-     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = new "
-          << bt->name () << " (val);" << be_uidt_nl;
-    }
-  else
-    {
-      *os << "this->"
-     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << " = val;" << be_uidt_nl;
-    }
-
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl;
-  if (0) // %! (bt->size_type () == be_type::VARIABLE)
-    *os << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-        << ";" << be_uidt_nl;
-  else
-    *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-        << ";" << be_uidt_nl;
-  *os << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << this->pre_op() << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl;
-  if (0) // %! (bt->size_type () == be_type::VARIABLE)
-    *os << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-        << ";" << be_uidt_nl;
-  else
-    *os << "return this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-        << ";" << be_uidt_nl;
-  *os << "}\n\n";
-
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node); // save the typedef node for use in code generation
-                           // as we visit the base type
-
-  // the node to be visited in the base primitve type that gets typedefed
-  be_type *bt = node->primitive_base_type ();
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"
-                         ), -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-int
-be_visitor_valuetype_field_cs::visit_union (be_union *node)
-{
-  cerr << "!u be_visitor_valuetype_field_cs::visit_union unimp.\n";
-  TAO_OutStream *os; // output stream
-  be_decl *ub =
-    this->ctx_->node (); // get field node
-  be_valuetype *bu =
-    be_valuetype::narrow_from_decl (this->ctx_->scope ());
-  be_type *bt;
-
-  // check if we are visiting this node via a visit to a typedef node
-  if (this->ctx_->alias ())
-    bt = this->ctx_->alias ();
-  else
-    bt = node;
-
-  if (!ub || !bu)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_field_cs::"
-                         "visit_union - "
-                         "bad context information\n"
-                         ), -1);
-    }
-  os = this->ctx_->stream ();
-
-  if (bt->node_type () != AST_Decl::NT_typedef // not a typedef
-      && bt->is_child (bu)) // bt is defined inside the union
-    {
-      // instantiate a visitor context with a copy of our context. This info
-      // will be modified based on what type of node we are visiting
-      be_visitor_context ctx (*this->ctx_);
-      ctx.node (node); // set the node to be the node being visited. The scope
-                       // is still the same
-
-      // first generate the enum declaration
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      be_visitor *visitor = tao_cg->make_visitor (&ctx);
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_union - "
-                             "Bad visitor\n"
-                             ), -1);
-        }
-      if (node->accept (visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_field_cs::"
-                             "visit_union - "
-                             "codegen failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-
-  // (1) set from a const
-  *os << "// accessor to set the member" << be_nl
-      << this->pre_op() << "void" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name ()
-      << " (const " << bt->name () << " &val)" << be_nl
-      << "{" << be_idt_nl;
-
-      *os << "this->"
-     << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-          << "_var = new " << bt->name ()
-          << " (val);" << be_nl;
-
-  *os << "}" << be_nl;
-
-  // readonly get method
-  *os << "// readonly get method " << be_nl
-      << this->pre_op() << "const " << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void) const" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";" << be_uidt_nl
-      << "}" << be_nl;
-
-  // read/write get method
-  *os << "// read/write get method " << be_nl
-      << this->pre_op() << bt->name () << " &" << be_nl;
-  this->op_name(bu,os);
-  *os << "::" << ub->local_name () << " (void)" << be_nl
-      << "{" << be_idt_nl
-      << "return *this->"
-      << bu->field_pd_prefix() << ub->local_name () << bu->field_pd_postfix()
-      << ";" << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-void
-be_visitor_valuetype_field_cs::setenclosings (char *pre)
-{
-  pre_op_ = pre;
-}
-
-const char*
-be_visitor_valuetype_field_cs::pre_op ()
-{
-  return pre_op_;
-}
-
-// retrieve the fully scoped skeleton name
-void
-be_visitor_valuetype_field_cs::op_name (be_valuetype *node,
-                                        TAO_OutStream *os)
-{
-  if (this->in_obv_space_)
-    *os << node->full_obv_skel_name ();
-  else
-    *os << node->name ();
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
deleted file mode 100644
index 7c960555450..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    marshal_ch.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for marshalling.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, marshal_ch, "$Id$")
-
-// ***************************************************************************
-// Structure visitor for generating  declarations
-// ***************************************************************************
-
-be_visitor_valuetype_marshal_ch::be_visitor_valuetype_marshal_ch
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_valuetype_marshal_ch::~be_visitor_valuetype_marshal_ch (void)
-{
-}
-
-int
-be_visitor_valuetype_marshal_ch::visit_valuetype (be_valuetype *node)
-{
-   return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
deleted file mode 100644
index 1f7e5405a67..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    marshal_cs.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for marshalling.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, marshal_cs, "$Id$")
-
-
-be_visitor_valuetype_marshal_cs::be_visitor_valuetype_marshal_cs
-(be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_valuetype_marshal_cs::~be_visitor_valuetype_marshal_cs (void)
-{
-}
-
-int
-be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_OUTPUT);
-  os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl;
-  this->class_name (node, os);
-  *os << "::_tao_marshal_state (TAO_OutputCDR &strm)" << be_nl
-      << "{" << be_idt_nl;
-  be_valuetype *inh = node->statefull_inherit ();
-  if (inh)
-    {
-      if (inh->opt_accessor ())
-        {
-          *os << "if (!";
-          this->class_name (inh, os);
-          *os << "::_tao_marshal_state (strm)) return 0;" << be_nl;
-        }
-      else // only can access base class via virtual function
-        {
-          *os << "if (!this->_tao_marshal__"
-              <<       inh->flatname ()
-              << " (strm)) return 0;" << be_nl;
-        }
-    }
-
-  { // array _forany
-    be_visitor_context* new_ctx =
-      new be_visitor_context (*this->ctx_);
-    be_visitor_valuetype_field_cdr_decl field_decl (new_ctx);
-    field_decl.visit_scope (node);
-  }
-
-  *os << "if (" << be_idt_nl;
-  // all we have to do is to visit the scope and generate code
-  this->gen_fields (node, *this->ctx_);
-
-  *os << be_uidt_nl << ")"
-      << be_idt_nl
-      << "return 1;" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "return 0;" << be_uidt_nl << be_uidt_nl
-      << "}\n\n";
-
-  // set the substate as generating code for the input operator
-  this->ctx_->sub_state(TAO_CodeGen::TAO_CDR_INPUT);
-  os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl;
-  this->class_name (node, os);
-  *os << "::_tao_unmarshal_state (TAO_InputCDR &strm)" << be_nl
-      << "{" << be_idt_nl;
-  inh = node->statefull_inherit ();
-  if (inh)
-    {
-      if (inh->opt_accessor ())
-        {
-          *os << "if (!";
-          this->class_name (inh, os);
-          *os << "::_tao_unmarshal_state (strm)) return 0;" << be_nl;
-        }
-      else // only can access base class via virtual function
-        {
-          *os << "if (!this->_tao_unmarshal__"
-              <<       inh->flatname ()
-              << " (strm)) return 0;" << be_nl;
-        }
-    }
-
-  { // array _forany
-    be_visitor_context* new_ctx =
-      new be_visitor_context (*this->ctx_);
-    be_visitor_valuetype_field_cdr_decl field_decl (new_ctx);
-    field_decl.visit_scope (node);
-  }
-
-  *os << "if (" << be_idt_nl;
-  // all we have to do is to visit the scope and generate code
-  this->gen_fields (node, *this->ctx_);
-
-  *os << be_uidt_nl << ")"
-      << be_idt_nl
-      << "return 1;" << be_uidt_nl
-      << "else" << be_idt_nl
-      << "return 0;" << be_uidt_nl << be_uidt_nl
-      << "}\n\n";
-
-  return 0;
-}
-
-// retrieve the fully scoped skeleton name
-void
-be_visitor_valuetype_marshal_cs::class_name (be_valuetype *node,
-                                          TAO_OutStream *os)
-{
-  if (node->opt_accessor ())
-    *os << node->name ();
-  else
-    *os << node->full_obv_skel_name ();
-}
-
-// ops for field marshal
-int
-be_visitor_valuetype_marshal_cs::gen_fields (be_valuetype *node,
-                                             be_visitor_context &ctx)
-{
-  int n_processed = 0;
-
-  TAO_OutStream *os = ctx.stream ();
-  // proceed if the number of members in our scope is greater than 0
-  if (node->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      this->elem_number_ = 0;
-      // continue until each field is visited
-      for (;!si->is_done ();si->next())
-        {
-          AST_Decl *d = si->item ();
-          if (!d)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "bad node in this scope\n"), -1);
-
-            }
-          be_field *field = be_field::narrow_from_decl (d);
-          if (field)
-            {
-              if (n_processed > 0)
-                *os << " &&" << be_nl;
-              ++n_processed;
-              be_visitor_context* new_ctx =
-                     new be_visitor_context (ctx);
-              be_visitor_valuetype_field_cdr_ci visitor (new_ctx);
-              visitor.pre_ = node->field_pd_prefix ();
-              visitor.post_ = node->field_pd_postfix ();
-              if (visitor.visit_field (field) == -1)
-                {
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                               "(%N:%l) be_visitor_valuetype_marshal_cs::"
-                                     "visit_valuetype - "
-                                     "codegen for scope failed\n"), -1);
-                }
-
-             }
-           } // end of for loop
-      delete si;
-    }
-  if (n_processed == 0)
-    *os << "1";
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
deleted file mode 100644
index 70806d09556..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    obv_module.cpp
-//
-// = DESCRIPTION
-//    Concrete visitor for the Module class
-//    This provides code generation for the module in the header
-//    for the OBV_ namespace (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-ACE_RCSID(be_visitor_obv_module, obv_module, "$Id$")
-
-
-// ************************************************************
-// Module visitor for server header
-// ************************************************************
-
-be_visitor_obv_module::be_visitor_obv_module (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_obv_module::~be_visitor_obv_module (void)
-{
-}
-
-
-
-// This states are processed:
-//    TAO_MODULE_OBV_CH
-//    TAO_MODULE_OBV_CI
-//    TAO_MODULE_OBV_CH
-
-
-int
-be_visitor_obv_module::visit_module (be_module *node)
-{
-  TAO_OutStream *os; // output stream
-  os = this->ctx_->stream ();
-
-  if (node->has_nested_valuetype ())
-    {
-      if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
-        {
-          os->indent ();
-
-          *os << "TAO_NAMESPACE "; // << idl_global->export_macro ()
-
-          if (!node->is_nested ())
-              // we are outermost module, so prepend
-              *os << " OBV_" << node->local_name () << be_nl;
-          else
-              // we are inside another module
-              *os << " " << node->local_name () << be_nl;
-
-          *os << "{" << be_nl
-              << be_idt;
-        } // client header
-
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_obv_module::"
-                             "visit_module - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      if (this->ctx_->state () == TAO_CodeGen::TAO_MODULE_OBV_CH)
-        {
-          os->decr_indent ();
-          *os << "};\n\n";
-        }
-    }
-  return 0;
-}
-
-
-int
-be_visitor_obv_module::visit_valuetype (be_valuetype *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_MODULE_OBV_CH:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CH);
-      break;
-    case TAO_CodeGen::TAO_MODULE_OBV_CI:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CI);
-      break;
-    case TAO_CodeGen::TAO_MODULE_OBV_CS:
-      ctx.state (TAO_CodeGen::TAO_VALUETYPE_OBV_CS);
-      break;
-  default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_obv_module::"
-                           "visit_valuetype - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_obv_module::"
-                         "visit_valuetype - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_obv_module::"
-                         "visit_valuetype - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
deleted file mode 100644
index 32a732cb82e..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ /dev/null
@@ -1,827 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes. This is a generic visitor.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on interface.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-//#include      "idl.h"
-//#include      "idl_extern.h"
-//#include      "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, valuetype, "$Id$")
-
-
-be_visitor_valuetype::be_visitor_valuetype (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_valuetype::~be_visitor_valuetype (void)
-{
-}
-
-// this method must be overridden by the derived valuetype visitors
-int
-be_visitor_valuetype::visit_valuetype (be_valuetype *)
-{
-//!  ACE_ASSERT (0);
-  return -1;
-}
-
-
-// visit the scope of the valuetype node
-// (in public/private field order)
-int
-be_visitor_valuetype::visit_valuetype_scope (be_valuetype *node)
-{
-  // proceed if the number of members in our scope is greater than 0
-  if (node->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      int n_processed = 0;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      this->elem_number_ = 0;
-      // continue until each element is visited
-      for (;!si->is_done ();si->next())
-        {
-          AST_Decl *d = si->item ();
-          if (!d)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "bad node in this scope\n"), -1);
-
-            }
-          AST_Field *field = AST_Field::narrow_from_decl (d);
-          if (field && field->visibility() == AST_Field::vis_PRIVATE)
-            {
-              continue;      // ignore private fields in this run
-              // AST_Attribute derives from AST_Field, so test for
-              // vis_PRIVATE is ok (the attribute has it set to vis_NA)
-            }
-          ++ n_processed;
-          if (n_processed == 1)
-            this->begin_public ();
-          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
-          this->ctx_->node (bd);
-          this->elem_number_++;
-
-          if (bd == 0 || bd->accept (this) == -1)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "codegen for scope failed\n"), -1);
-
-            }
-        } // end of for loop
-      delete si;
-     // next run with private fields only
-      n_processed = 0;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      this->elem_number_ = 0;
-      // continue until each element is visited
-      for (;!si->is_done ();si->next())
-        {
-          AST_Decl *d = si->item ();
-          if (!d)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "bad node in this scope\n"), -1);
-
-            }
-          AST_Field *field = AST_Field::narrow_from_decl (d);
-          if (!field ||
-              (field && field->visibility() != AST_Field::vis_PRIVATE))
-            {
-              continue;      // only private fields in this run
-            }
-          ++ n_processed;
-          if (n_processed == 1)
-            this->begin_private ();
-          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
-          this->ctx_->node (bd);
-          this->elem_number_++;
-
-          if (bd == 0 || bd->accept (this) == -1)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "codegen for scope failed\n"), -1);
-
-            }
-        } // end of for loop
-      delete si;
-    } // end of if
-  return 0;
-}
-
-// this two are called from visit_valuetype_scope()
-void
-be_visitor_valuetype::begin_public ()
-{
-  // in derived visitors print "public:" in class definition
-}
-
-void
-be_visitor_valuetype::begin_private ()
-{
-  // in derived visitors print "protected:" in class definition
-}
-
-// =all common visit methods for valuetype visitor
-
-// visit an attribute
-int
-be_visitor_valuetype::visit_attribute (be_attribute *node)
-// was be_visitor_attribute::visit_attribute (be_attribute *node)
-{
-  this->ctx_->node (node); // save the node
-  this->ctx_->attribute (node); // save this attribute node
-
-  be_operation *op;
-
-  // first the "get" operation
-  op = new be_operation (node->field_type (), AST_Operation::OP_noflags,
-                         node->name (), 0);
-  op->set_name (node->name ());
-  if (!op || this->visit_operation (op) == -1)
-    {
-      delete op;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "codegen for get_attribute failed\n"),
-                        -1);
-    }
-  delete op;
-  if (node->readonly ())
-    return 0;  // nothing else to do
-
-  // the set method.
-  // the return type  is "void"
-  be_predefined_type *rt = new be_predefined_type (AST_PredefinedType::PT_void,
-                                                   new UTL_ScopedName
-                                                   (new Identifier
-                                                    ("void", 1, 0, I_FALSE), 0),
-                                                   0);
-  // argument type is the same as the attribute type
-  be_argument *arg = new be_argument (AST_Argument::dir_IN,
-                                      node->field_type (),
-                                      node->name (),
-                                      0);
-  arg->set_name (node->name ());
-  // create the operation
-  op = new be_operation (rt, AST_Operation::OP_noflags,
-                         node->name (), 0);
-  op->set_name (node->name ());
-  op->add_argument_to_scope (arg);
-
- if (!op || this->visit_operation (op) == -1)
-    {
-      delete op;
-      delete arg;
-      delete rt;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_attribute::"
-                         "visit_attribute - "
-                         "codegen for set_attribute failed\n"),
-                        -1);
-    }
-  delete op;
-  delete rt;
-  delete arg;
-  return 0;
-}
-
-
-// visit a constant
-int
-be_visitor_valuetype::visit_constant (be_constant *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      ctx.state (TAO_CodeGen::TAO_CONSTANT_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_SH:
-    case TAO_CodeGen::TAO_VALUETYPE_IH:
-    case TAO_CodeGen::TAO_VALUETYPE_IS:
-    case TAO_CodeGen::TAO_VALUETYPE_SI:
-    case TAO_CodeGen::TAO_VALUETYPE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_valuetype::"
-                           "visit_constant - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_constant - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_constant - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-//visit an enum
-int
-be_visitor_valuetype::visit_enum (be_enum *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_ANY_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_ANY_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_ENUM_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_SH:
-    case TAO_CodeGen::TAO_VALUETYPE_IH:
-    case TAO_CodeGen::TAO_VALUETYPE_IS:
-    case TAO_CodeGen::TAO_VALUETYPE_SI:
-    case TAO_CodeGen::TAO_VALUETYPE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_valuetype::"
-                           "visit_enum - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_enum - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_enum - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-
-// visit an operation
-int
-be_visitor_valuetype::visit_operation (be_operation *node)
-{
-  // is overridden in derived visitors
-  return 0;
-}
-
-// visit an exception (not used)
-int
-be_visitor_valuetype::visit_exception (be_exception *node)
-{
-  cerr << "! be_visitor_valuetype::visit_exception() --- not allowed\n";
- ACE_ASSERT (0);
- return 0;
-}
-
-// visit an structure
-int
-be_visitor_valuetype::visit_structure (be_structure *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CI);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_ANY_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_ANY_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_STRUCT_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_SH:
-    case TAO_CodeGen::TAO_VALUETYPE_IH:
-    case TAO_CodeGen::TAO_VALUETYPE_IS:
-    case TAO_CodeGen::TAO_VALUETYPE_SI:
-    case TAO_CodeGen::TAO_VALUETYPE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_valuetype::"
-                           "visit_structure - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_structure - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_structure - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a union
-int
-be_visitor_valuetype::visit_union (be_union *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-      ctx.state (TAO_CodeGen::TAO_UNION_CI);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_ANY_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_ANY_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_UNION_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_SH:
-    case TAO_CodeGen::TAO_VALUETYPE_IH:
-    case TAO_CodeGen::TAO_VALUETYPE_IS:
-    case TAO_CodeGen::TAO_VALUETYPE_SI:
-    case TAO_CodeGen::TAO_VALUETYPE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_valuetype::"
-                           "visit_union - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_union - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_union - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-// visit a typedef
-int
-be_visitor_valuetype::visit_typedef (be_typedef *node)
-{
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  // this switch is acceptable rather than having derived visitors overriding
-  // this method and differing only in what state they set
-
-  switch (this->ctx_->state ())
-    {
-    case TAO_CodeGen::TAO_VALUETYPE_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CI:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CI);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_ANY_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_ANY_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_ANY_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CH:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CDR_OP_CH);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_CDR_OP_CS:
-      ctx.state (TAO_CodeGen::TAO_TYPEDEF_CDR_OP_CS);
-      break;
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CH:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CI:
-    case TAO_CodeGen::TAO_VALUETYPE_OBV_CS:
-    case TAO_CodeGen::TAO_VALUETYPE_SH:
-    case TAO_CodeGen::TAO_VALUETYPE_IH:
-    case TAO_CodeGen::TAO_VALUETYPE_IS:
-    case TAO_CodeGen::TAO_VALUETYPE_SI:
-    case TAO_CodeGen::TAO_VALUETYPE_SS:
-      return 0; // nothing to be done
-    default:
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) be_visitor_valuetype::"
-                           "visit_typedef - "
-                           "Bad context state\n"
-                           ), -1);
-      }
-    }
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_typedef - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (node->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype::"
-                         "visit_typedef - "
-                         "failed to accept visitor\n"
-                         ),  -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-int
-be_visitor_valuetype::visit_field (be_field *node)
-{
-  // is overridden in derived visitors
-  return 0;
-}
-
-
-// private data fields for scope
-int
-be_visitor_valuetype::gen_pd (be_valuetype *node)
-{
-  // proceed if the number of members in our scope is greater than 0
-  if (node->nmembers () > 0)
-    {
-      // initialize an iterator to iterate thru our scope
-      UTL_ScopeActiveIterator *si;
-      int n_processed = 0;
-      ACE_NEW_RETURN (si,
-                      UTL_ScopeActiveIterator (node,
-                                               UTL_Scope::IK_decls),
-                      -1);
-      this->elem_number_ = 0;
-      // continue until each field is visited
-      for (;!si->is_done ();si->next())
-        {
-          AST_Decl *d = si->item ();
-          if (!d)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "bad node in this scope\n"), -1);
-
-            }
-          be_field *field = be_field::narrow_from_decl (d);
-          if (!field)
-            {
-              continue;
-            }
-          ++ n_processed;
-          // 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
-          this->ctx_->node (field);
-          this->elem_number_++;
-
-          if (this->gen_field_pd (field) == -1)
-            {
-              delete si;
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_scope::visit_scope - "
-                                 "codegen for scope failed\n"), -1);
-
-            }
-        } // end of for loop
-      delete si;
-    }
-  return 0;
-}
-
-// private data for field
-int
-be_visitor_valuetype::gen_field_pd (be_field *node)
-// derived from be_visitor_field_ch
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt; // field's type
-  be_valuetype *vt;  // field declared in this scope
-
-  os = this->ctx_->stream ();
-  // first generate the type information
-  bt = be_type::narrow_from_decl (node->field_type ());
-  vt = be_valuetype::narrow_from_scope (node->defined_in ());
-  if (!bt || !vt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "Bad field type\n"
-                         ), -1);
-    }
-
-  // instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node); // set the node to be the node being visited. The scope is
-                   // still the same
-
-  ctx.state (TAO_CodeGen::TAO_FIELD_CH);
-
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_structure::"
-                         "visit_field - "
-                         "NUL visitor\n"
-                         ),  -1);
-    }
-
-  // let the node accept this visitor
-  if (bt->accept (visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_field_ch::"
-                         "visit_field - "
-                         "codegen for field type failed\n"
-                         ), -1);
-    }
-  delete visitor;
-
-  // now output the field name.
-  *os << " " << vt->field_pd_prefix ()
-             << node->local_name ()
-             << vt->field_pd_postfix() << ";\n";
-  return 0;
-
-}
-
-
-// generate the _init definition
-int
-be_visitor_valuetype::gen_init_defn (be_valuetype *node)
-{
-  if (node->is_abstract_valuetype ())
-    return 0;   // no instance of it can created
-
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent (); // start with whatever indentation level we are at
-
-  *os << "class " << idl_global->export_macro ()
-      << " " << node->local_name ()
-      << "_init : public ACE_CORBA_1 (ValueFactoryBase)" << be_nl;
-
-  // generate the body
-
-  *os << "{" << be_nl
-      << "public:" << be_idt_nl
-      << "virtual ~" << node->local_name () << "_init ();" << be_nl;
-
-      /* %!     << "static " << node->local_name () << "* "
-              << "_downcast (CORBA::ValueFactoryBase* );" << be_nl */
-
-  *os << "virtual const char* tao_repository_id ();\n" << be_nl;
-  *os << "// create () goes here" << be_nl;  // %!
-
-  *os << be_uidt_nl << "};\n";
-
-  return 0;
-}
-
-int
-be_visitor_valuetype::gen_init_impl (be_valuetype *node)
-{
-  if (node->is_abstract_valuetype ())
-    return 0;   // no instance of it can created
-
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent (); // start with whatever indentation level we are at
-
-  char fname [NAMEBUFSIZE];  // to hold the full and
-  char lname [NAMEBUFSIZE];  // local _out names
-
-  ACE_OS::memset (fname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (fname, "%s_init", node->fullname ());
-
-  ACE_OS::memset (lname, '\0', NAMEBUFSIZE);
-  ACE_OS::sprintf (lname, "%s_init", node->local_name ()->get_string ());
-
-  // destructor
-  *os << fname << "::~" << lname << " ()" << be_nl
-      << "{" << be_nl << "}\n\n";
-
-  *os << "const char* " << be_nl
-      << fname << "::tao_repository_id ()" << be_nl
-      << "{" << be_idt_nl
-      <<   "return " << node->name()
-      <<                "::_tao_obv_static_repository_id ();"
-      << be_uidt_nl << "}\n\n";
-
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
deleted file mode 100644
index e15b3aedea9..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes in the client header
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on interface_ch.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, valuetype_ch, "$Id$")
-
-
-// ******************************************************
-// Valuetype visitor for client header
-// ******************************************************
-
-be_visitor_valuetype_ch::be_visitor_valuetype_ch (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_ch::~be_visitor_valuetype_ch (void)
-{
-}
-
-int
-be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (!node->cli_hdr_gen () && !node->imported ()) // not already generated and
-                                                   // not imported
-    {
-
-      os = this->ctx_->stream ();
-      *os << "// valuetype class\n";
-
-      // == STEP 1:  generate the class name and class names we inherit ==
-
-      os->indent (); // start with whatever indentation level we are at
-      // forward declaration
-      *os << "class " << node->local_name () << ";" << be_nl;
-
-      // generate the ifdefined macro for the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      // generate the _var declaration
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_ch::"
-                             "visit_valuetype - "
-                             "codegen for _var failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      // generate the ifdef macro for the _out class
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_ch::"
-                             "visit_valuetype - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-
-      // generate the ifdef macro for the _init class
-      os->gen_ifdef_macro (node->flatname (), "_init");
-
-      // generate the _init declaration - ptc/98-09-03 20.17.10 p.20-93
-      if (this->gen_init_defn (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_ch::"
-                             "visit_valuetype - "
-                             "codegen for _init failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-
-      // now the valuetype definition itself
-      os->gen_ifdef_macro (node->flatname ());
-
-      // now generate the class definition
-      os->indent ();
-      *os << "class " << idl_global->export_macro ()
-                << " " << node->local_name ();
-
-      // node valuetype inherits from other valuetypes (OMG 20.17.9)
-      // (ordinary (not abstract) interfaces ignored)
-
-      *os << " : ";
-      int i;  // loop index
-      int n_inherits_valuetypes = 0;
-      idl_bool valuebase_inherited = 0;
-      if (node->n_inherits () > 0)
-        {
-          for (i = 0; i < node->n_inherits (); i++)
-            {
-              // %! move is_nested() and nested_type_name() to
-              // AST_Interface, then type AST_Interface can be used
-              be_interface *inherited =
-                be_interface::narrow_from_decl (node->inherits ()[i]);
-              if (!inherited->is_valuetype() &&
-                  !inherited->is_abstract_interface())
-                continue;
-
-              ++ n_inherits_valuetypes;
-              if (inherited->is_valuetype())
-                valuebase_inherited = 1;
-              if (n_inherits_valuetypes > 1)  // node is the case of multiple
-                                              // inheritance, so put a comma
-                {
-                  *os << ", ";
-                }
-              be_decl *scope = 0;
-              if (inherited->is_nested ())
-                {
-                  // inherited node is used in the scope of "node" node
-                  scope = be_scope::narrow_from_scope (node->defined_in ())
-                    ->decl ();
-                }
-
-              // dump the scoped name
-              *os << "public virtual ";
-              *os << inherited->nested_type_name (scope);
-            }  // end of for loop
-          if (n_inherits_valuetypes > 0)
-            *os << be_nl;
-        }
-      if (!valuebase_inherited)
-        {
-          // we do not inherit from any valuetype, hence we do so from the base
-          // CORBA::ValueBase class
-          // Generate code that uses the macro. This is required to deal with
-          // the MSVC++ insanity
-          if (n_inherits_valuetypes > 1)  // node is the case of multiple
-                                          // inheritance, so put a comma
-            {
-              *os << ", ";
-            }
-          *os << "public virtual ACE_CORBA_1 (ValueBase)" << be_nl;
-        }
-
-      // generate the body
-
-      *os << "{" << be_nl
-          << "public:" << be_nl
-
-          // generate the _ptr_type and _var_type typedef
-          // but we must protect against certain versions of g++
-          << "#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__ */\n" << be_idt_nl
-
-          // generate the static _downcast operation
-          // (see OMG 20.17.{4,5})
-          << "static " << node->local_name () << "* "
-                << "_downcast (CORBA::ValueBase* );" << be_nl
-          << "// The address of static _downcast is implicit used as type id\n"
-          << be_nl
-
-          << "// (TAO extensions or internals)" << be_nl
-          << "static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &, "
-          <<    node->local_name () << " *&);" << be_nl
-          << "virtual const char* "
-          << "_tao_obv_repository_id () const;"
-          << be_nl
-          << "static const char* "
-          << "_tao_obv_static_repository_id ();\n";
-
-      // generate code for the valuetype definition
-      if (this->visit_valuetype_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_ch::"
-                             "visit_valuetype - "
-                             "codegen for scope failed\n"), -1);
-        }
-
-      // protected member:
-
-      // generate the "protected" constructor so that users cannot instantiate
-      // us
-      *os << be_uidt_nl << "protected:" << be_idt_nl
-                << node->local_name ()
-                << " ();           // default constructor" << be_nl
-          << "virtual ~" << node->local_name () << " ();\n" << be_nl;
-
-      *os << "// TAO internals" << be_nl
-          << "virtual void *_tao_obv_narrow (ptr_arith_t);" << be_nl;
-      // support for marshalling
-      if (!node->is_abstract_valuetype ())
-        {
-          *os << "virtual CORBA::Boolean "
-              << "_tao_marshal_v (TAO_OutputCDR &);" << be_nl;
-          *os << "virtual CORBA::Boolean "
-              << "_tao_unmarshal_v (TAO_InputCDR &);" << be_nl;
-          // %! optimize _downcast away: extra parameter with type info
-          // set (void *) in CDR Stream with the right derived pointer
-        }
-
-
-      // private member:
-
-      // private copy constructor and assignment operator. These are not
-      // allowed, hence they are private.
-      *os << be_uidt_nl << "private:" << be_idt_nl;
-      *os << node->local_name () << " (const " << node->local_name () << " &);"
-          << be_nl
-          << "void operator= (const " << node->local_name () << " &);"
-          << be_nl;
-
-      // map fields to private data (if optimizing)
-      if (node->opt_accessor ())
-        {
-          *os << be_uidt_nl << "protected:" << be_idt_nl;
-          *os << "CORBA::Boolean "
-              << "_tao_marshal_state (TAO_OutputCDR &);" << be_nl
-              << "CORBA::Boolean "
-              << "_tao_unmarshal_state (TAO_InputCDR &);\n\n";
-          *os << be_uidt_nl << "private:\n" << be_idt;
-          this->gen_pd (node);
-        }
-      else // need a way to access the state of derived OBV_ classes
-        {
-          if (!node->is_abstract_valuetype ())
-            {
-              *os << be_uidt_nl << "protected:" << be_idt_nl;
-              *os << "virtual CORBA::Boolean _tao_marshal__"
-                  <<    node->flatname () << " (TAO_OutputCDR &) = 0;"
-                  << be_nl;
-              *os << "virtual CORBA::Boolean _tao_unmarshal__"
-                  <<    node->flatname () << " (TAO_InputCDR &) = 0;"
-                  << be_nl;
-            }
-        }
-
-      *os << be_uidt_nl << "};\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
-          // (see interface code how to do this. not yet impl.)
-
-      node->cli_hdr_gen (I_TRUE);
-    } // if !cli_hdr_gen
-  return 0;
-}
-
-
-int
-be_visitor_valuetype_ch::visit_operation (be_operation *node)
-// derived from be_visitor_operation_ch::visit_operation
-{
-  TAO_OutStream *os; // output stream
-  be_type *bt;       // type node
-
-  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_valuetype_ch::"
-                         "visit_operation - "
-                         "Bad return type\n"),
-                        -1);
-    }
-
-  // grab the right visitor to generate the return type
-  be_visitor_context ctx (*this->ctx_);
-  ctx.state (TAO_CodeGen::TAO_OPERATION_RETTYPE_CH);
-  be_visitor *visitor = tao_cg->make_visitor (&ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_valuetype_ch::"
-                         "visit_operation - "
-                         "Bad visitor to return type\n"),
-                        -1);
-    }
-
-  if (bt->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ch::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  // STEP 2: generate the operation name
-  *os << " " << node->local_name ();
-
-  // STEP 3: generate the argument list with the appropriate mapping. For these
-  // we grab a visitor that generates the parameter listing
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OBV_OPERATION_ARGLIST_CH);
-  visitor = tao_cg->make_visitor (&ctx);
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_valuetype_ch::"
-                         "visit_operation - "
-                         "Bad visitor to argument list\n"),
-                        -1);
-    }
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_operation_ch::"
-                         "visit_operation - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-  delete visitor;
-
-  return 0;
-}
-
-int
-be_visitor_valuetype_ch::visit_field (be_field *node)
-{
-  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
-  if (!vt)
-    return -1;
-  be_visitor_context* ctx = new be_visitor_context (*this->ctx_);
-  ctx->state (TAO_CodeGen::TAO_FIELD_OBV_CH);
-  be_visitor_valuetype_field_ch *visitor =
-             new be_visitor_valuetype_field_ch (ctx);
-
-  if (!visitor)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_valuetype_obv_ch::"
-                         "visit_field - bad visitor\n"),
-                        -1);
-    }
-
-  if (vt->opt_accessor ())
-    visitor->setenclosings ("",";");
-  else
-    visitor->setenclosings ("virtual "," = 0;");
-
-  if (node->accept (visitor) == -1)
-    {
-      delete visitor;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_obv_ch::"
-                        "visit_field - codegen failed\n"),
-                        -1);
-    }
-  delete visitor;
-  return 0;
-}
-
-
-void
-be_visitor_valuetype_ch::begin_public ()
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  *os << be_uidt;
-  os->indent ();
-  *os << "public:\n" << be_idt;
-}
-
-void
-be_visitor_valuetype_ch::begin_private ()
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  *os << be_uidt;
-  os->indent ();
-  *os << "protected:\n" << be_idt;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
deleted file mode 100644
index 368a53e1e71..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes in the client inline file
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, valuetype_ci, "$Id$")
-
-
-// **************************************************
-// Valuetype visitor for client inline
-// **************************************************
-be_visitor_valuetype_ci::be_visitor_valuetype_ci (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx),
-    opt_accessor_ (0)
-{
-}
-
-be_visitor_valuetype_ci::~be_visitor_valuetype_ci (void)
-{
-}
-
-int
-be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->cli_inline_gen () || node->imported ())
-    return 0;
-
-  // need to access it in visit_field ()
-  if (node->opt_accessor ())
-    this->opt_accessor_ = 1;
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start from the current indentation level
-
-  // generate the constructors and destructor
-  *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::" << node->local_name () <<
-    " () // default constructor" << be_nl;
-  *os << "{}" << be_nl << be_nl;
-
-  *os << "ACE_INLINE" << be_nl;
-  *os << node->name () << "::~" << node->local_name () <<
-    " () // destructor" << be_nl;
-  *os << "{}\n" << be_nl;
-
-  *os << "ACE_INLINE const char* " << be_nl
-      << node->name() << "::_tao_obv_static_repository_id ()" << be_nl
-      <<  "{" << be_idt_nl
-      <<     "return \"" << node->repoID () << "\";" << be_uidt_nl
-      <<  "}\n\n";
-
-  // generate the ifdefined macro for  the _var type
-  os->gen_ifdef_macro (node->flatname (), "_var");
-  if (node->gen_var_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ci::"
-                         "visit_valuetype - "
-                         "codegen for _var failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate the ifdefined macro for  the _out type
-  os->gen_ifdef_macro (node->flatname (), "_out");
-  if (node->gen_out_impl () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ci::"
-                         "visit_valuetype - "
-                         "codegen for _out failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate inline methods for elements of our scope
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_ci::"
-                         "visit_valuetype - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-  return 0;
-}
-
-
-int
-be_visitor_valuetype_ci::visit_field (be_field *node)
-{
-  if (opt_accessor_)
-    {
-      be_visitor_context *ctx = new be_visitor_context (*this->ctx_);
-      be_visitor_valuetype_field_cs *visitor =
-        new be_visitor_valuetype_field_cs (ctx);
-      visitor->in_obv_space_ = 0;
-      visitor->setenclosings ("ACE_INLINE ");
-      if (visitor->visit_field (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_ci::"
-                             "visit_field - "
-                             "visit_field failed\n"
-                             ), -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
deleted file mode 100644
index 40b655a80b1..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes in the client stubs file.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype, valuetype_cs, "$Id$")
-
-
-// ************************************************************
-// Valuetype visitor for client stubs
-// ************************************************************
-
-be_visitor_valuetype_cs::be_visitor_valuetype_cs (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_cs::~be_visitor_valuetype_cs (void)
-{
-}
-
-int
-be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
-{
-  TAO_OutStream *os; // output stream
-
-  if (node->cli_stub_gen () || node->imported ())
-    return 0;
-
-  os = this->ctx_->stream ();
-
-  os->indent (); // start with whatever indentation level we are at
-
-  // The _downcast method    // %! use ACE_xxx_cast here ?
-  *os << node->name() << "* " << node->name()
-      <<                 "::_downcast (CORBA::ValueBase* v)" << be_nl
-      <<  "{" << be_idt_nl
-      <<     "if (v == 0) return 0;" << be_nl
-      <<     "return (" << node->local_name() << "* ) "
-      <<          "v->_tao_obv_narrow ((ptr_arith_t) &_downcast);" << be_uidt_nl
-      <<  "}\n" << be_nl
-
-  // The _tao_obv_repository_id method
-      << "const char* " << node->name()
-      <<                   "::_tao_obv_repository_id () const" << be_nl
-      <<  "{" << be_idt_nl
-      <<     "return this->_tao_obv_static_repository_id ();" << be_uidt_nl
-      <<  "}\n" << be_nl
-
-  // The _tao_obv_narrow method
-      << "void* " << node->name()
-      << "::_tao_obv_narrow (ptr_arith_t type_id)" << be_nl
-      <<  "{" << be_idt_nl
-      <<    "if (type_id == (ptr_arith_t) &_downcast)" << be_idt_nl
-      <<       "return this;" << be_uidt_nl
-      <<    "void *rval = 0;" << be_nl;
-
-  // Find the possible base classes.
-
-  int n_inherits_downcastable = 0;
-  for (int i = 0; i < node->n_inherits (); i++)
-    {
-      AST_Interface *inherited =
-          AST_Interface::narrow_from_decl (node->inherits ()[i]);
-      if (inherited->is_valuetype())
-        {
-          ++n_inherits_downcastable;
-          *os << "if (rval == 0)" << be_idt_nl
-              <<   "rval = " << inherited->name()
-              <<                "::_tao_obv_narrow (type_id);" << be_uidt_nl;
-        }
-    }
-
-  *os <<    "return rval;" << be_uidt_nl
-      <<  "}\n\n";
-
-  // Nothing to marshal if abstract valuetype.
-  if (!node->is_abstract_valuetype ())
-    {
-      // The virtual _tao_marshal_v method
-      *os << "CORBA::Boolean " << node->name()
-          <<                   "::_tao_marshal_v (TAO_OutputCDR & strm)"
-          << be_nl
-          <<  "{" << be_idt_nl
-          <<   "return ";
-      if (node->opt_accessor ())
-        {
-          *os << node->name ()
-              <<"::_tao_marshal_state (strm);" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "this->_tao_marshal__" << node->flatname ()
-              << " (strm);" << be_uidt_nl;
-        }
-      *os << "}\n" << be_nl;
-
-      // The virtual _tao_unmarshal_v method
-      *os << "CORBA::Boolean " << node->name()
-          <<                   "::_tao_unmarshal_v (TAO_InputCDR & strm)"
-          << be_nl
-          <<  "{" << be_idt_nl
-          <<   "return ";
-      if (node->opt_accessor ())
-        {
-          *os << node->name ()
-              <<"::_tao_unmarshal_state (strm);" << be_uidt_nl;
-        }
-      else
-        {
-          *os << "this->_tao_unmarshal__" << node->flatname ()
-              << " (strm);" << be_uidt_nl;
-        }
-      *os << "}\n" << be_nl;
-    }  // !node->is_abstract_valuetype ()
-
-  // The static T::_tao_unmarshal method  ----------------------------
-
-  *os << "CORBA::Boolean " << node->name()
-      <<                   "::_tao_unmarshal (TAO_InputCDR &strm, "
-      <<                   node->name() <<" *&new_object)" << be_nl
-      <<  "{" << be_idt_nl
-      <<    "CORBA::Boolean retval = 1;" << be_nl
-      <<    "CORBA::ValueBase *base;   // %! should be a _var"
-      <<       be_nl
-      <<    "CORBA::ValueFactory_ptr factory;   // %! should be a _var"
-      <<       be_nl
-
-      <<    "if (!CORBA::ValueBase::_tao_unmarshal_pre (strm, factory, base," << be_idt_nl
-      <<       "      " << node->name ()
-      << "::_tao_obv_static_repository_id ()) )" << be_nl
-      <<       "{" << be_idt_nl
-      <<          "return 0;" << be_uidt_nl
-      <<       "}" << be_uidt_nl
-      <<    "if (factory != 0)" << be_idt_nl
-      <<      "{" << be_idt_nl
-
-      <<        "base = factory->create_for_unmarshal ();" << be_nl
-      <<        "factory->_remove_ref ();" << be_nl
-      <<        "if (base == 0)  return 0;  // %! except.?" << be_nl
-      <<        "//%! ACE_DEBUG ((LM_DEBUG, \"" << node->name()
-      <<            "::_tao_unmarshal %s\\n\", "
-      <<            "base->_tao_obv_repository_id () ));" << be_nl
-      <<        "retval = base->_tao_unmarshal_v (strm);" << be_nl
-      <<        "//%! ACE_DEBUG ((LM_DEBUG, \"" << node->name()
-      <<            "::_tao_unmarshal retval unmarshal_v is %d\\n\", "
-      <<            "retval));" << be_nl
-      <<         "if (!retval) return 0;"
-
-      <<       be_uidt_nl << "}" << be_uidt_nl
-      <<    "// Now base must be null or point to the unmarshaled object."
-      <<      be_nl
-      <<    "// Align the pointer to the right subobject." << be_nl
-      <<    "new_object = " << node->name () << "::_downcast (base);" << be_nl
-      <<    "// %! unmarshal_post" << be_nl
-      <<    "return 1;" << be_uidt_nl
-      <<  "}\n" << be_nl;
-
-  // The static T::_tao_unmarshal method  ------------------------ end
-
-  // generate the ifdefined macro for  the _init type
-  os->gen_ifdef_macro (node->flatname (), "_init");
-  if (this->gen_init_impl (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cs::"
-                         "visit_valuetype - "
-                         "codegen for _init failed\n"), -1);
-    }
-  os->gen_endif ();
-
-  // generate code for the elements of the valuetype
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_cs::"
-                         "visit_valuetype - "
-                         "codegen for scope failed\n"), -1);
-    }
-
-
-  // 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
-     // (see interface code how to do this. not yet impl.)
-
-  return 0;
-}
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
deleted file mode 100644
index 4cdee96d078..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_obv__ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes in the client header
-//    OBV_ class
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on interface_ch.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype_obv_ch, valuetype_obv_ch, "$Id$")
-
-
-// ******************************************************
-// Valuetype visitor for client header
-// ******************************************************
-
-be_visitor_valuetype_obv_ch::be_visitor_valuetype_obv_ch (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_obv_ch::~be_visitor_valuetype_obv_ch (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace
-int
-be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
-{
-  // only visit non-abstract valuetype
-  if (node->is_abstract_valuetype ())
-    return 0;
-
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-
-  // OBV_ class maps only to a typedef if we are optimizing accessors
-  if (node->opt_accessor ())
-    {
-      os->indent ();
-      *os << "typedef " << node->fullname () << " ";
-      if (!node->is_nested ())
-        *os << "OBV_";
-      *os << node->local_name () << ";" << be_nl;
-    }
-  else
-    {
-      // == STEP 1:  generate the class name and the class name we inherit ==
-
-      os->gen_ifdef_macro (node->flatname (), "_OBV");
-      os->indent ();
-
-      *os << "// OBV_ class" << be_nl;
-      *os << "class ";
-      if (!node->is_nested())   // we are in root ?
-        *os << "OBV_";
-      *os << node->local_name () << " : public virtual "
-                                 << node->fullname () << be_nl;
-
-      // == STEP 2: generate the body ==
-
-      *os << "{\n" << be_idt;
-
-      // generate code for the OBV_ class definition
-      if (this->visit_valuetype_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_obv_ch::"
-                             "visit_valuetype - "
-                             "codegen for scope failed\n"), -1);
-        }
-      // map fields to private data
-      if (!node->opt_accessor ())  // check again (redundant)
-        {
-          *os << be_uidt_nl << "protected:" << be_idt_nl;
-          *os << "virtual CORBA::Boolean _tao_marshal__"
-              <<    node->flatname () << " (TAO_OutputCDR &);" << be_nl;
-          *os << "virtual CORBA::Boolean _tao_unmarshal__"
-              <<    node->flatname () << " (TAO_InputCDR &);" << be_nl;
-          *os << "CORBA::Boolean "
-              << "_tao_marshal_state (TAO_OutputCDR &);" << be_nl
-              << "CORBA::Boolean "
-              << "_tao_unmarshal_state (TAO_InputCDR &);\n\n";
-          *os << be_uidt_nl << "private:" << be_idt_nl;
-          this->gen_pd (node);
-        }
-      *os << be_uidt;
-      os->indent ();
-      *os << "};\n";
-      os->gen_endif ();
-    } // if !opt_accessor ()
-
-  return 0;
-}
-
-
-int
-be_visitor_valuetype_obv_ch::visit_field (be_field *node)
-{
-  be_valuetype *vt = be_valuetype::narrow_from_scope (node->defined_in ());
-  if (!vt)
-    return -1;
-  // only in OBV_ class, if we are not optimizing accessors (and modifiers)
-  if (!vt->opt_accessor ())
-    {
-      be_visitor_context* ctx = new be_visitor_context (*this->ctx_);
-      ctx->state (TAO_CodeGen::TAO_FIELD_OBV_CH);
-      be_visitor_valuetype_field_ch *visitor =
-                 new be_visitor_valuetype_field_ch (ctx);
-
-      if (!visitor)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "be_visitor_valuetype_obv_ch::"
-                             "visit_field - bad visitor\n"),
-                            -1);
-        }
-
-      visitor->setenclosings ("virtual ",";");
-      if (node->accept (visitor) == -1)
-        {
-          delete visitor;
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_obv_ch::"
-                            "visit_field - codegen failed\n"),
-                            -1);
-        }
-      delete visitor;
-    }
-  return 0;
-}
-
-void
-be_visitor_valuetype_obv_ch::begin_public ()
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  *os << be_uidt;
-  os->indent ();
-  *os << "public:\n" << be_idt;
-}
-
-void
-be_visitor_valuetype_obv_ch::begin_private ()
-{
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  *os << be_uidt;
-  os->indent ();
-  *os << "protected:\n" << be_idt;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
deleted file mode 100644
index ca026ba9dfd..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_obv_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes
-//    OBV_ class implementation
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on interface_ch.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype_obv_ci, valuetype_obv_ci, "$Id$")
-
-
-// ******************************************************
-// Valuetype visitor for OBV_ class implementation
-// ******************************************************
-
-be_visitor_valuetype_obv_ci::be_visitor_valuetype_obv_ci (be_visitor_context *ctx)
-  : be_visitor_valuetype (ctx)
-{
-}
-
-be_visitor_valuetype_obv_ci::~be_visitor_valuetype_obv_ci (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace
-int
-be_visitor_valuetype_obv_ci::visit_valuetype (be_valuetype *node)
-{
-return 0; // %! dead code
-  // only visit non-abstract valuetype
-  if (node->is_abstract_valuetype ())
-    return 0;
-
-  TAO_OutStream *os; // output stream
-
-  os = this->ctx_->stream ();
-  os->indent ();
-
-  // OBV_ class is only a typedef if we are optimizing accessors
-  if (node->opt_accessor ())
-    {
-    }
-  else
-    {
-    } // if !opt_accessor ()
-  return 0;
-}
-
-
-int
-be_visitor_valuetype_obv_ci::visit_field (be_field *node)
-{
-  // dead code
-  return 0;
-}
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
deleted file mode 100644
index 4bcf4ef00ba..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_obv_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes
-//    OBV_ class implementation
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    derived from interface_ch.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype.h"
-
-ACE_RCSID(be_visitor_valuetype_obv_cs, valuetype_obv_cs, "$Id$")
-
-
-// ******************************************************
-// Valuetype visitor for OBV_ class implementation
-// ******************************************************
-
-be_visitor_valuetype_obv_cs::be_visitor_valuetype_obv_cs (be_visitor_context *ctx)
-  : be_visitor_scope (ctx)
-{
-}
-
-be_visitor_valuetype_obv_cs::~be_visitor_valuetype_obv_cs (void)
-{
-}
-
-
-// OBV_ class must be in OBV_ namespace
-int
-be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node)
-{
-  // only visit non-abstract valuetype
-  if (node->is_abstract_valuetype ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // OBV_ class has no accessors or modifiers if we are optimizing
-  // or the valuetype is abstract.
-  if (!(node->opt_accessor () || node->is_abstract_valuetype () ))
-    {
-      os->indent ();
-      *os << "CORBA::Boolean " << be_nl
-          << node->full_obv_skel_name ()
-          << "::_tao_marshal__" << node->flatname ()
-          <<    " (TAO_OutputCDR &strm)"
-          << "{" << be_idt_nl
-          <<   "return " << node->full_obv_skel_name ()
-          <<   "::_tao_marshal_state (strm);" << be_nl
-          << be_uidt_nl << "}\n";
-
-      *os << "CORBA::Boolean "
-          << node->full_obv_skel_name ()
-          << "::_tao_unmarshal__" << node->flatname ()
-          <<    " (TAO_InputCDR &strm)"
-          << "{" << be_idt_nl
-          <<   "return " << node->full_obv_skel_name ()
-          <<   "::_tao_unmarshal_state (strm);" << be_nl
-          << be_uidt_nl << "}\n";
-
-      if (this->visit_scope (node) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_obv_cs::"
-                             "visit_valuetype - "
-                             "visit_scope failed\n"
-                             ), -1);
-        }
-      }
-  return 0;
-}
-
-int
-be_visitor_valuetype_obv_cs::visit_field (be_field *node)
-{
-  be_visitor_context *ctx = new be_visitor_context (*this->ctx_);
-  be_visitor_valuetype_field_cs *visitor =
-    new be_visitor_valuetype_field_cs (ctx);
-  visitor->in_obv_space_ = 1;
-  // visitor->setenclosings ("ACE_INLINE ");
-  if (visitor->visit_field (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_valuetype_obv_cs::"
-                         "visit_field - "
-                         "visit_field failed\n"
-                         ), -1);
-    }
-  delete visitor;
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
deleted file mode 100644
index 79d1f442b5b..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_valuetype_fwd.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of code for Valuetype_Fwd
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#ifdef IDL_HAS_VALUETYPE
-
-#include "be_visitor_valuetype_fwd.h"
-
-// include all the individual files
-//#include "be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp"
-//#include "be_visitor_valuetype_fwd/valuetype_fwd_ci.cpp"
-//#include "be_visitor_valuetype_fwd/cdr_op_ci.cpp"
-
-ACE_RCSID(be, be_visitor_valuetype_fwd, "$Id$")
-
-#endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
deleted file mode 100644
index a290ee99010..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for CDR operators for forward
-//    declarations of valuetypes. This uses compiled marshaling.
-//
-// = AUTHOR
-//    Torsten Kuepper based on code from
-//    Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
-//
-// ================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype_fwd.h"
-
-ACE_RCSID(be_visitor_valuetype_fwd, cdr_op_ci, "$Id$")
-
-// ****************************************************************
-// Interface visitor for generating CDR operator declarations in the
-// client header
-// ****************************************************************
-
-be_visitor_valuetype_fwd_cdr_op_ci::
-be_visitor_valuetype_fwd_cdr_op_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_cdr_op_ci::"
-                             "must be implemented\n"), -1);
-}
-
-be_visitor_valuetype_fwd_cdr_op_ci::
-~be_visitor_valuetype_fwd_cdr_op_ci (void)
-{
-}
-
-int
-be_visitor_valuetype_fwd_cdr_op_ci::
-visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  if (node->cli_inline_cdr_op_gen () || node->imported ())
-    return 0;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // generate the CDR << and >> operator declarations
-  os->indent ();
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator<< (" << be_idt << be_idt_nl
-      << "TAO_OutputCDR &," << be_nl
-      << "const " << node->name () << "_ptr" << be_uidt_nl
-      << ");" << be_uidt_nl;
-  *os << "ACE_INLINE CORBA::Boolean" << be_nl
-      << "operator>> (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &," << be_nl
-      << node->name () << "_ptr &" << be_uidt_nl
-      << ");" << be_uidt << "\n";
-
-  node->cli_inline_cdr_op_gen (1);
-  return 0;
-}
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
deleted file mode 100644
index 5411463a7ec..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ch.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_fwd_ch.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Interface_Fwd node in the client header.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    based on code from Aniruddha Gokhale (interface_fwd_ch.cpp)
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype_fwd.h"
-
-ACE_RCSID(be_visitor_valuetype_fwd, valuetype_fwd_ch, "$Id$")
-
-
-// ********************************************************************
-// Visitor implementation for the Interface_Fwd type
-// This one for the client header file
-// ********************************************************************
-
-be_visitor_valuetype_fwd_ch::be_visitor_valuetype_fwd_ch (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
-                             "must be implemented\n"), -1);
-}
-
-be_visitor_valuetype_fwd_ch::~be_visitor_valuetype_fwd_ch (void)
-{
-}
-
-// visit the Interface_Fwd_Ch node and its scope
-int
-be_visitor_valuetype_fwd_ch::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_hdr_gen () && !node->imported ())
-    {
-      os->indent (); // start from the current
-
-      // all we do in this is generate a forward declaration of the class
-      *os << "class " << node->local_name () << ";" << be_nl;
-
-      // generate the ifdefined macro for the _ptr type
-      os->gen_ifdef_macro (node->flatname (), "_ptr");
-
-      // generate the _ptr declaration
-      *os << "typedef " << node->local_name () << " *" << node->local_name ()
-          << "_ptr;\n";
-
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      // generate the _var declaration
-      if (node->gen_var_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
-                             "visit_valuetype_fwd - "
-                             "codegen for _var failed\n"), -1);
-        }
-      // gen an endif
-      os->gen_endif ();
-
-      // enclose under an ifdef macro
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      // generate the _out declaration - ORBOS/97-05-15 pg 16-20 spec
-      if (node->gen_out_defn () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ch::"
-                             "visit_valuetype_fwd - "
-                             "codegen for _out failed\n"), -1);
-        }
-      // generate the endif macro
-      os->gen_endif ();
-      node->cli_hdr_gen (I_TRUE);
-    }
-  return 0;
-}
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
deleted file mode 100644
index aaadbbb38f6..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/interface_fwd_ci.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_fwd_ci.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Interface_Fwd node in the client inline.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    based on code from Aniruddha Gokhale (interface_fwd_ci.cpp)
-//
-// ============================================================================
-
-#include        "idl.h"
-#include        "idl_extern.h"
-#include        "be.h"
-
-#include "be_visitor_valuetype_fwd.h"
-
-ACE_RCSID(be_visitor_valuetype_fwd, valuetype_fwd_ci, "$Id$")
-
-
-// ********************************************************************
-// Visitor implementation for the Interface_Fwd type
-// This one for the client inline file
-// ********************************************************************
-
-be_visitor_valuetype_fwd_ci::be_visitor_valuetype_fwd_ci (be_visitor_context *ctx)
-  : be_visitor_decl (ctx)
-{
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
-                             "must be implemented\n"), -1);
-}
-
-be_visitor_valuetype_fwd_ci::~be_visitor_valuetype_fwd_ci (void)
-{
-}
-
-// visit the Interface_Fwd_ci node and its scope
-int
-be_visitor_valuetype_fwd_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (!node->cli_inline_gen () && !node->imported ())
-    {
-
-      // generate the ifdefined macro for  the _var type
-      os->gen_ifdef_macro (node->flatname (), "_var");
-
-      if (node->gen_var_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
-                             "visit_valuetype_fwd - "
-                             "codegen for _var failed\n"), -1);
-        }
-
-      os->gen_endif ();
-
-      // generate the ifdefined macro for  the _out type
-      os->gen_ifdef_macro (node->flatname (), "_out");
-
-      if (node->gen_out_impl () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_valuetype_fwd_ci::"
-                             "visit_valuetype_fwd - "
-                             "codegen for _out failed\n"), -1);
-        }
-      os->gen_endif ();
-
-      node->cli_stub_gen (I_TRUE);
-    }
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be_include/Makefile.am b/TAO/TAO_IDL/be_include/Makefile.am
deleted file mode 100644
index 5574114093a..00000000000
--- a/TAO/TAO_IDL/be_include/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'be_include' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-noinst_HEADERS = \
-         be.h  \
-         be_argument.h  \
-         be_array.h  \
-         be_attribute.h  \
-         be_codegen.h  \
-         be_constant.h  \
-         be_decl.h  \
-         be_enum.h  \
-         be_enum_val.h  \
-         be_exception.h  \
-         be_expression.h  \
-         be_field.h  \
-         be_generator.h  \
-         be_helper.h  \
-         be_interface.h  \
-         be_interface_fwd.h  \
-         be_module.h  \
-         be_native.h  \
-         be_operation.h  \
-         be_predefined_type.h  \
-         be_root.h  \
-         be_scope.h  \
-         be_sequence.h  \
-         be_state.h  \
-         be_stream_factory.h  \
-         be_string.h  \
-         be_structure.h  \
-         be_sunsoft.h  \
-         be_type.h  \
-         be_typedef.h  \
-         be_union.h  \
-         be_union_branch.h  \
-         be_union_label.h  \
-         be_visitor.h  \
-         be_visitor_argument.h  \
-         be_visitor_array.h  \
-         be_visitor_attribute.h  \
-         be_visitor_constant.h  \
-         be_visitor_context.h  \
-         be_visitor_decl.h  \
-         be_visitor_enum.h  \
-         be_visitor_exception.h  \
-         be_visitor_factory.h  \
-         be_visitor_field.h  \
-         be_visitor_interface.h  \
-         be_visitor_interface_fwd.h  \
-         be_visitor_module.h  \
-         be_visitor_operation.h  \
-         be_visitor_root.h  \
-         be_visitor_scope.h  \
-         be_visitor_sequence.h  \
-         be_visitor_structure.h  \
-         be_visitor_typecode.h  \
-         be_visitor_typedef.h  \
-         be_visitor_union.h  \
-         be_visitor_union_branch.h
-
-dist-hook:
-	list=`find * -name CVS -prune -o -type d -print`; for p in $$list; do \
-          $(mkinstalldirs) $(distdir)/$$p; \
-          cp $$p/*.h $(distdir)/$$p; \
-        done
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/be_include/be.h b/TAO/TAO_IDL/be_include/be.h
index b2c9ee43602..972dafa2e0d 100644
--- a/TAO/TAO_IDL/be_include/be.h
+++ b/TAO/TAO_IDL/be_include/be.h
@@ -101,8 +101,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include        "be_module.h"           // class BE_Module
 #include        "be_interface.h"        // class BE_Interface
 #include        "be_interface_fwd.h"    // class BE_InterfaceFwd
-#include        "be_valuetype.h"        // class be_valuetype
-#include        "be_valuetype_fwd.h"    // class be_valuetype_fwd
 #include        "be_structure.h"        // class BE_Structure
 #include        "be_exception.h"        // class BE_Exception
 #include        "be_expression.h"       // class BE_Expr_val
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index b1f6b674bea..4f2e6e2339d 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -45,6 +45,18 @@ public:
   // generate dimensions. If slice == 1, generate dimensions for the slice
   // definition
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index 4b2e260b1d1..fe1edcb6b0f 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -1,6 +1,6 @@
 // $Id$
 /* -*- c++ -*- */
-// ================================================================
+// ============================================================================
 //
 // = LIBRARY
 //    TAO IDL
@@ -14,7 +14,7 @@
 // = AUTHOR
 //    Aniruddha Gokhale
 //
-// ================================================================
+// ============================================================================
 
 #ifndef TAO_BE_CODEGEN_H
 #define TAO_BE_CODEGEN_H
@@ -126,7 +126,6 @@ public:
     TAO_FIELD_CS,
     TAO_FIELD_CDR_OP_CH,
     TAO_FIELD_CDR_OP_CS,
-    TAO_FIELD_OBV_CH,
 
     // emitting code for the interface
     TAO_INTERFACE_CH,
@@ -151,34 +150,6 @@ public:
     TAO_INTERFACE_FWD_CI,
     TAO_INTERFACE_FWD_CDR_OP_CI,
 
-    // emitting code for the valuetype
-    TAO_VALUETYPE_CH,
-    TAO_VALUETYPE_CI,
-    TAO_VALUETYPE_CS,
-    TAO_VALUETYPE_SH,
-    TAO_VALUETYPE_IH,
-    TAO_VALUETYPE_SI,
-    TAO_VALUETYPE_SS,
-    TAO_VALUETYPE_IS,
-    TAO_VALUETYPE_OBV_CH,               // OBV_ class
-    TAO_VALUETYPE_OBV_CI,
-    TAO_VALUETYPE_OBV_CS,
-    TAO_VALUETYPE_COLLOCATED_SH,
-    TAO_VALUETYPE_COLLOCATED_SS,
-    TAO_VALUETYPE_ANY_OP_CH,
-    TAO_VALUETYPE_ANY_OP_CS,
-    TAO_VALUETYPE_MARSHAL_CH,          // the actual generation of CDR in header
-    TAO_VALUETYPE_MARSHAL_CS,          // and the implementation, activated from:
-    TAO_VALUETYPE_CDR_OP_CH,
-    TAO_VALUETYPE_CDR_OP_CS,
-    //TAO_VALUETYPE_TIE_SH,
-    //TAO_VALUETYPE_TIE_SI,
-
-    // emitting code for the valuetype forward declaration
-    TAO_VALUETYPE_FWD_CH,
-    TAO_VALUETYPE_FWD_CI,
-    TAO_VALUETYPE_FWD_CDR_OP_CI,
-
     // emitting code for the module
     TAO_MODULE_CH,
     TAO_MODULE_CI,
@@ -192,9 +163,6 @@ public:
     TAO_MODULE_ANY_OP_CS,
     TAO_MODULE_CDR_OP_CH,
     TAO_MODULE_CDR_OP_CS,
-    TAO_MODULE_OBV_CH,                  // for OBV_ (cmp. POA_ namespace)
-    TAO_MODULE_OBV_CI,
-    TAO_MODULE_OBV_CS,
 
     // emitting code for an operation.
     TAO_OPERATION_CH,                       // in client header
@@ -249,15 +217,6 @@ public:
     TAO_OPERATION_TIE_SH,
     TAO_OPERATION_TIE_SI,
 
-    TAO_OBV_OPERATION_ARGLIST_CH,      // parameter list in obv op signature
-                                             // ... for client header
-    TAO_OBV_OPERATION_ARGLIST_OBV_CH,        // ... for OBV_ class
-    TAO_OBV_OPERATION_ARGLIST_SH,            // ... for server header
-    TAO_OBV_OPERATION_ARGLIST_IH,            // ... for implementation header
-    TAO_OBV_OPERATION_ARGLIST_IS,            // ... for implementation header
-    TAO_OBV_OPERATION_ARGLIST_COLLOCATED_SH,   // ... for collocated server
-    TAO_OBV_OPERATION_ARGLIST_OTHERS,          // ... for all other cases
-
     // emitting code for root
     TAO_ROOT_CH,
     TAO_ROOT_CI,
@@ -366,22 +325,10 @@ public:
   enum CG_SUB_STATE
   {
     // sub states
-
-    // these are for the CDR operators
     TAO_CDR_INPUT,
     TAO_CDR_OUTPUT,
     TAO_CDR_SCOPE,
 
-    // these are for typecode generation
-    TAO_TC_DEFN_TYPECODE, // top level typecode
-    TAO_TC_DEFN_TYPECODE_NESTED, // nested tc
-    TAO_TC_DEFN_ENCAPSULATION, // encapsulation
-    TAO_TC_DEFN_SCOPE, // scope
-    TAO_TC_DEFN_TC_SIZE, // tc size computation
-    TAO_TC_DEFN_ENCAP_LEN, // encap size computation
-    TAO_TC_DEFN_SCOPE_LEN, // scope size computation
-
-    // used to denote either error or don't care
     TAO_SUB_STATE_UNKNOWN
   };
 
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index cea43133eda..46e64ee99df 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -79,6 +79,12 @@ public:
   virtual idl_bool is_nested (void);
   // determines if we are inside of a nested scope or not
 
+  virtual int gen_encapsulation (void);
+  // encapsulation of parameters
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual be_scope *scope (void);
   // return the scope created by this node (if one exists)
 
@@ -141,6 +147,15 @@ protected:
   virtual void compute_prefix (void);
   // computes the prefix for the repoID
 
+  virtual int tc_name2long (const char *name, ACE_UINT32 *&, long &);
+  // name represented as a padded array of longs
+
+  virtual long repoID_encap_len (void);
+  // return encapsulation length required to hold repository ID
+
+  virtual long name_encap_len (void);
+  // return encapsulation length required to hold IDL name
+
   // variables that indicate if the code generation for that node is already
   // been done. This way we avoid regenerating same code.
   idl_bool cli_hdr_gen_;
@@ -173,6 +188,9 @@ protected:
   SIZE_TYPE size_type_;
   // whether we are fixed or variable size (by default fixed)
 
+  long encap_len_;
+  // encapsulation length - required for typecodes
+
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index c87f73cdb60..354d155e25e 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -39,6 +39,18 @@ public:
   be_enum (UTL_ScopedName *n, UTL_StrList *p);
   // constructor
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual int member_count (void);
   // return the count of members
 
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index cfde79677bf..e04b9e139c9 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -38,6 +38,12 @@ public:
   be_enum_val (unsigned long v, UTL_ScopedName *n, UTL_StrList *p);
   // constructor
 
+  virtual int gen_encapsulation (void);
+  // generate the typecode
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index d73076c2ee5..bd24a6bbaa5 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -21,12 +21,21 @@ public:
 
   // =code generation
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual int member_count (void);
   // return the count of members
 
-  virtual idl_bool in_recursion (be_type *node = 0);
-  // check if we or the parameter node is in recursion
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index 0a0de3dbffa..526cab7c19b 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -34,10 +34,15 @@ public:
   be_field (void);
   // default constructor
 
-  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p,
-                                    Visibility vis = vis_NA);
+  be_field (AST_Type *ft, UTL_ScopedName *n, UTL_StrList *p);
   // constructor
 
+  virtual int gen_encapsulation (void);
+  // generate the typecode
+
+  virtual long tc_encap_len (void);
+  // return the total byte length of ourselves represented as an encapsulation
+
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 2bb9b227933..d28bf650f1d 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -100,12 +100,6 @@ public:
                                           UTL_StrList *p);
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
                                                  UTL_StrList *p);
-  virtual AST_Interface *create_valuetype(UTL_ScopedName *n,
-                                          AST_Interface **ih,
-                                          long nih,
-                                          UTL_StrList *p);
-  virtual AST_InterfaceFwd *create_valuetype_fwd(UTL_ScopedName *n,
-                                                 UTL_StrList *p);
   virtual AST_Exception *create_exception(UTL_ScopedName *n, UTL_StrList *p);
   virtual AST_Structure *create_structure(UTL_ScopedName *n, UTL_StrList *p);
   virtual AST_Enum      *create_enum(UTL_ScopedName *n, UTL_StrList *p);
@@ -114,9 +108,7 @@ public:
                                           UTL_ScopedName *n,
                                           UTL_StrList *p);
   virtual AST_Field     *create_field(AST_Type *ft, UTL_ScopedName *n,
-                                      UTL_StrList *p,
-                                      AST_Field::Visibility vis = AST_Field::vis_NA);
-
+                                      UTL_StrList *p);
   virtual AST_Argument  *create_argument(AST_Argument::Direction d,
                                          AST_Type *ft,
                                          UTL_ScopedName *n,
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index c931b758f97..ace81617c8b 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -154,21 +154,6 @@ public:
   TAO_OutStream &operator<< (const char *str);
   // output the char string and return a reference to ourselves
 
-  TAO_OutStream &operator<< (const ACE_CDR::UShort num);
-  // output the integer and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const ACE_CDR::Short num);
-  // output the integer and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const ACE_CDR::ULong num);
-  // output the integer and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const ACE_CDR::Long num);
-  // output the integer and return a reference to ourselves
-
-  TAO_OutStream &operator<< (const unsigned long num);
-  // output the integer and return a reference to ourselves
-
   TAO_OutStream &operator<< (const long num);
   // output the integer and return a reference to ourselves
 
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 3a1cccd7baa..ce0eacdfbe9 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -94,6 +94,18 @@ public:
   const char *local_coll_name (void) const;
   // retrieve the fully qualified collocated class name
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual int traverse_inheritance_graph (tao_code_emitter gen,
                                           TAO_OutStream *os);
   // template method using breadth first traversal of inheritance graph
@@ -161,21 +173,20 @@ public:
   // helper method to determine if the interface node is involved in some kind
   // of multiple inheritance or not. Required on the skeleton side
 
-  static int gen_def_ctors_helper (be_interface* node,
-                                   be_interface* base,
+  static int gen_def_ctors_helper (be_interface* node, 
+                                   be_interface* base, 
                                    TAO_OutStream *os);
 
   //helper method to generate a call to the default constructors of all the base classes
 
-  static int gen_copy_ctors_helper (be_interface* node,
-                                   be_interface* base,
+  static int gen_copy_ctors_helper (be_interface* node, 
+                                   be_interface* base, 
                                    TAO_OutStream *os);
 
   //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);
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 4f24869a02f..f3b2d156710 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -39,11 +39,9 @@ public:
   be_interface_fwd (void);
   // default constructor
 
-  be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
+  be_interface_fwd (UTL_ScopedName *n, UTL_StrList *p);
   // constructor
 
-  virtual ~be_interface_fwd (void);
-
   virtual int gen_var_defn (void);
   // generate the _var class definition
 
@@ -56,6 +54,12 @@ public:
   virtual int gen_out_impl (void);
   // generate the _out implementation
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual long tc_size (void);
+  // return typecode size
+
   // Visiting
   virtual int accept (be_visitor* visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
index 0ad44f5944f..c0b2014aead 100644
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO/TAO_IDL/be_include/be_predefined_type.h
@@ -44,6 +44,18 @@ public:
                       UTL_StrList *p);
   // constructor
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   // Visiting
   virtual int accept (be_visitor* visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
index 45b567587b1..f8aa25516fd 100644
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ b/TAO/TAO_IDL/be_include/be_scope.h
@@ -46,6 +46,12 @@ public:
   virtual ~be_scope (void);
   // destructor
 
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual void comma (unsigned short set);
   // set the comma producing state
 
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 07fad27f576..8edeeb6ba5b 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -59,6 +59,18 @@ public:
   // create a name for ourselves. If we are typedefed, then we get the name of
   // the typedef node, else we generate a name for ourselves
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual MANAGED_TYPE managed_type (void);
   // return the managed type
 
@@ -71,9 +83,6 @@ public:
   virtual be_decl *decl (void);
   // overridden method on the be_scope class
 
-  virtual idl_bool in_recursion (be_type *node = 0);
-  // are we or the node represented by node involved in recursion
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
index a33b0196626..771da6c5c35 100644
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ b/TAO/TAO_IDL/be_include/be_string.h
@@ -40,6 +40,18 @@ public:
   be_string (AST_Expression *v, long wide);
   // constructor
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   // Visiting
   virtual int accept (be_visitor *visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 2cea9b86c6b..4d20ad82671 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -51,12 +51,21 @@ public:
   virtual int gen_out_impl (void);
   // generate the _out implementation
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual int member_count (void);
   // return the count of members
 
-  virtual idl_bool in_recursion (be_type *node = 0);
-  // are we or the node represented by node involved in recursion
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
@@ -77,7 +86,6 @@ private:
 
   int member_count_;
   // number of members
-
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index b6dbeedf362..13d1d215217 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -53,10 +53,16 @@ public:
   virtual int gen_out_impl (void);
   // generate the _out implementation
 
+  virtual int gen_typecode (void) = 0;
+  // generate the typecode description
+
+  virtual long tc_size (void) = 0;
+  // return typecode size
+
   UTL_ScopedName *tc_name (void);
   // return the typecode name
 
-  virtual const char *nested_type_name (be_decl *d,
+  virtual const char *nested_type_name (be_decl *d, 
                                         const char *suffix = 0,
                                         const char *prefix = 0);
   // type name of a node used when generating declarations
@@ -67,11 +73,6 @@ public:
   // recursive simply using "base_type->node_type()" will not work, so
   // the most "unaliased" type is needed.
 
-  virtual idl_bool in_recursion (be_type *node = 0);
-  // determine if we are involved in some kind of limited recursion. Most types
-  // cannot be involved except structs and unions.
-  // If the parameter is 0, we are trying to determine this for ourselves.
-
   // Visiting
   virtual int accept (be_visitor* visitor);
 
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index 32befef0852..a0b8dca12c9 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -41,6 +41,18 @@ public:
   // return the most primitive base type by traversing the chain of typedefed
   // base types
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual AST_Decl::NodeType base_node_type (void) const;
   // Return the most "unaliased" type node for the base type (see
   // be_type.h).
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index 0c0541028ea..ee92ff75fa6 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -50,15 +50,24 @@ public:
   virtual int gen_out_impl (void);
   // generate the _out implementation
 
+  virtual int gen_typecode (void);
+  // generate the typecode
+
+  virtual int gen_encapsulation (void);
+  // encapsulation for parameters
+
+  virtual long tc_size (void);
+  // return typecode size
+
+  virtual long tc_encap_len (void);
+  // return length of encapsulation
+
   virtual int member_count (void);
   // return the count of members
 
   virtual int default_index (void);
   // 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 
-
   // Visiting
   virtual int accept (be_visitor *visitor);
 
@@ -85,7 +94,6 @@ private:
 
   int default_index_;
   // default label index (zero based indexing)
-
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
index 8b354afb2af..f31fb468ff6 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -37,8 +37,11 @@ public:
                    UTL_StrList *p);
   // constructor
 
-  int gen_label_value (TAO_OutStream *os);
-  // Generate the label value (as in a switch/case statement).
+  virtual int gen_encapsulation (void);
+  // generate the encapsulation
+
+  virtual long tc_encap_len (void);
+  // return the total byte length of ourselves represented as an encapsulation
 
   // Visiting
   virtual int accept (be_visitor *visitor);
@@ -46,7 +49,6 @@ public:
   // Narrowing
   DEF_NARROW_METHODS2 (be_union_branch, AST_UnionBranch, be_decl);
   DEF_NARROW_FROM_DECL (be_union_branch);
-
 protected:
   virtual int compute_size_type (void);
   // compute the size type if it is unknown
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
deleted file mode 100644
index da176b327e0..00000000000
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_valuetype.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface and be_interface that provides
-//    additional means for C++ mapping of an valuetype.
-//
-// ============================================================================
-
-#ifndef TAO_BE_VALUETYPE_H
-#define TAO_BE_VALUETYPE_H
-
-#ifdef IDL_HAS_VALUETYPE
-
-class TAO_OutStream;
-
-/*
- * BE_Valuetype
- */
-class be_valuetype : public virtual be_interface
-{
-  // = TITLE
-  //   Backend-class for valuetypes
-  //
-  // = DESCRIPTION
-  //   Extends be_interface and overrides member functions for valuetype
-  //   mapping.
-  //
-public:
-
-  // used to pass functions to the template method
-  //: typedef int (*tao_code_emitter) (be_interface *, be_interface *, TAO_OutStream *);
-
-  // Operations
-  be_valuetype (void);
-  // Default constructor
-
-  be_valuetype (UTL_ScopedName *n, AST_Interface **ih, long nih,
-                UTL_StrList *p, idl_bool set_abstract = 0);
-  // Constructor that sets its scoped name <n>, a list of inherited valuetypes
-  // and supported interfaces <ih>, the number of inherited interfaces <nih>,
-  // and any pragmas <p>
-
-  ~be_valuetype (void);
-  // dtor
-
-  virtual void redefine (AST_Interface *from, UTL_StrList *p);
-
-  idl_bool opt_accessor ();
-  // should generate optimized form ?
-
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  // virtual void gen_def_ctors (TAO_OutStream* os);
-  //call the default constructors of all the base classes
-
-
-
-  // virtual void gen_copy_ctors (TAO_OutStream* os);
-  //call the copy constructors of all the base classes
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  const char *full_obv_skel_name (void);
-  // retrieve the fully scoped skel class name
-
-
-#if 0
-  virtual int gen_typecode (void);
-  // generate the typecode
-
-  virtual int gen_encapsulation (void);
-  // encapsulation for parameters
-
-  virtual long tc_size (void);
-  // return typecode size
-
-  virtual long tc_encap_len (void);
-  // return length of encapsulation
-#endif
-
-  // 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
-
-  const char *field_pd_prefix ();
-  const char *field_pd_postfix ();
-  // for building the name for private data fields
-  be_valuetype *statefull_inherit ();
-
-
-  // Visiting
-  virtual int accept (be_visitor *visitor);
-
-  virtual idl_bool is_valuetype ();
-  virtual idl_bool is_abstract_valuetype ();
-  virtual void set_abstract_valuetype ();
-
- // Narrowing
-  DEF_NARROW_METHODS1 (be_valuetype, be_interface);
-  DEF_NARROW_FROM_DECL (be_valuetype);
-  DEF_NARROW_FROM_SCOPE (be_valuetype);
-
-  void compute_fullobvskelname (void);
-  // compute the fully scoped skel class name
-
-
-private:
-  char * full_obv_skel_name_;
-  idl_bool abstract_;
-};
-
-#endif  /* IDL_HAS_VALUETYPE */
-
-#endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
deleted file mode 100644
index 43ba4525274..00000000000
--- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_valuetype_fwd.h
-//
-// = DESCRIPTION
-//    Extension of class AST_Interface_Fwd that provides additional
-//    means for C++ mapping of a valuetype.
-//
-// = AUTHOR
-//    Copyright 1994-1995 by Sun Microsystems, Inc.
-//    and
-//    Aniruddha Gokhale,
-//    changed for valuetypes from Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef BE_VALUETYPE_FWD_H
-#define BE_VALUETYPE_FWD_H
-
-#ifdef IDL_HAS_VALUETYPE
-
-/*
- * BE_InterfaceFwd
- */
-
-class be_valuetype_fwd : public virtual be_interface_fwd
-{
-  // =TITLE
-  //  be_valuetype_fwd
-  // =DESCRIPTION
-  //  Extensions to the be_interface_fwd class
-public:
-  // Operations
-
-  be_valuetype_fwd (void);
-  // default constructor
-
-  be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
-  // constructor
-
-  virtual ~be_valuetype_fwd (void);
-
-  virtual void set_abstract_valuetype ();
-
-  // Generate Mapping
-  virtual int gen_var_defn (void);
-  // generate the _var class definition
-
-  virtual int gen_var_impl (void);
-  // generate the implementation for the _var class
-
-  virtual int gen_out_defn (void);
-  // generate the _out class definition
-
-  virtual int gen_out_impl (void);
-  // generate the _out implementation
-
-  // Visiting
-  virtual int accept (be_visitor* visitor);
-
-  // Narrowing
-  DEF_NARROW_METHODS1 (be_valuetype_fwd, be_interface_fwd);
-  DEF_NARROW_FROM_DECL (be_valuetype_fwd);
-
-};
-
-#endif /* IDL_HAS_VALUETYPE */
-
-#endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index 249bee0d4c2..c6d0b00d9fd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -32,10 +32,6 @@ class be_predefined_type;
 class be_module;
 class be_interface;
 class be_interface_fwd;
-#ifdef IDL_HAS_VALUETYPE
-  class be_valuetype;
-  class be_valuetype_fwd;
-#endif /* IDL_HAS_VALUETYPE */
 class be_structure;
 class be_exception;
 class be_expression;
@@ -95,14 +91,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface_fwd
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_structure (be_structure *node);
   // visit a structure
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index 560d37f2859..5bbc8eca5ff 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -23,7 +23,6 @@
 #define _BE_VISITOR_ARGUMENT_H
 
 #include "be_visitor_decl.h"
-#include "be_visitor_scope.h"
 #include "be_visitor_argument/argument.h"
 #include "be_visitor_argument/arglist.h"
 #include "be_visitor_argument/pre_docall_cs.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index 0e784a7e4b1..fe811e1104c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -83,14 +83,6 @@ public:
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
index 47a30f5b143..e06bfc3baa8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_cs.h
@@ -58,14 +58,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
index e04b8edf204..db6f8da19dd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/compiled_marshal_ss.h
@@ -58,14 +58,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
index 53ae360551c..caf968f0565 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_docall_compiled_cs.h
@@ -52,14 +52,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_typedef (be_typedef *node);
   // visit the typedef type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
index 63ac801198b..55805fb04f2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
@@ -79,36 +79,4 @@ public:
 
 };
 
-// ****************************************************************
-
-// ************************************************************
-// class be_visitor_compiled_args_post_upcall
-// ************************************************************
-
-class be_visitor_compiled_args_post_upcall : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_compiled_args_post_upcall
-  //
-  // = DESCRIPTION
-  //   Visitor for post processing after upcall
-  //
-public:
-  be_visitor_compiled_args_post_upcall (be_visitor_context *ctx);
-  // constructor
-
-  virtual ~be_visitor_compiled_args_post_upcall (void);
-  // destructor
-
-  virtual int visit_argument (be_argument *node);
-  // visit the argument node
-
-  // =visit all the nodes that can be the types for the argument
-
-  virtual int visit_operation (be_operation *node);
-  virtual int visit_array (be_array *node);
-  virtual int visit_typedef (be_typedef *node);
-};
-
 #endif  /* _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index fc578fe2662..cd7707f74f3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -58,14 +58,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index a4209caeb9e..a09695a383c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -58,14 +58,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
@@ -111,15 +103,6 @@ public:
 
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward
-
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_VARDECL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
index 79899495ff1..03513da5539 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
@@ -100,9 +100,6 @@ public:
 
   virtual int visit_array (be_array *node);
   // visit array type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedef type
 };
 
 #endif /*  _BE_VISITOR_FIELD_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index 27e7d702085..a3fc7ce30db 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -55,14 +55,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index c12aeeed170..1949e865ef7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -57,14 +57,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_module (be_module *node);
   // visit a module
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
index 2a4802db351..e483d001735 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
@@ -63,26 +63,4 @@ private:
   LAST_ARG_PRINTED last_arg_printed_;
 };
 
-// ****************************************************************
-
-class be_visitor_compiled_args_decl : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_compiled_args_decl
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate variables declarations in the
-  //   compiled marshaling stubs.
-  //
-public:
-  be_visitor_compiled_args_decl (be_visitor_context *ctx);
-  // constructor
-
-  int visit_array (be_array *node);
-  int visit_typedef (be_typedef *node);
-  int visit_argument (be_argument *node);
-  int visit_operation (be_operation *node);
-};
-
 #endif /* _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
index e27360f0b29..6ebfa0a3e80 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/compiled_marshal.h
@@ -59,14 +59,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index a5ed3483393..9a196b55d48 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -76,11 +76,6 @@ public:
   int visit_union (be_union *node);
   // visit a union node
 
-# ifdef IDL_HAS_VALUETYPE
-  int visit_valuetype (be_valuetype *node);
-  int visit_valuetype_fwd (be_valuetype_fwd *node);
-# endif /* IDL_HAS_VALUETYPE */
-
 };
 
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
index 26d943d55d5..c43e3094c57 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_assign_ss.h
@@ -57,14 +57,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
index 845ddb5f6c1..644f9d27fbd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_marshal_ss.h
@@ -56,14 +56,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
index 9129e0b86aa..5efdc22d2a2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_docall_cs.h
@@ -51,25 +51,4 @@ public:
   // visit an interface node
 };
 
-// ****************************************************************
-
-class be_visitor_operation_compiled_rettype_post_docall : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_post_docall
-  //
-  // = DESCRIPTION
-  //   This is a visitor for post processing after the invocation in
-  //   compiled marshaling
-  //
-  //
-public:
-  be_visitor_operation_compiled_rettype_post_docall (be_visitor_context *ctx);
-  // constructor
-
-  int visit_array (be_array *node);
-  int visit_typedef (be_typedef *node);
-};
-
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_POST_DOCALL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
index 3ba7eedbef3..1895cb7983d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_post_upcall_ss.h
@@ -76,25 +76,4 @@ public:
 
 };
 
-// ****************************************************************
-
-class be_visitor_operation_compiled_rettype_post_upcall : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_operation_rettype_post_upcall
-  //
-  // = DESCRIPTION
-  //   This is a visitor for post processing after an upcall in
-  //   compiled marshaling
-  //
-  //
-public:
-  be_visitor_operation_compiled_rettype_post_upcall (be_visitor_context *ctx);
-  // constructor
-
-  int visit_array (be_array *node);
-  int visit_typedef (be_typedef *node);
-};
-
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_POST_UPCALL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index cd173c0cedb..05626351ea5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -55,14 +55,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
index 3b0d6613299..f7bce1756ab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_cs.h
@@ -55,14 +55,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
index 5adf69c8c89..ba942a2bbfd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_vardecl_ss.h
@@ -56,14 +56,6 @@ public:
   int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface node
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward
-#endif /* IDL_HAS_VALUETYPE */
-
   int visit_predefined_type (be_predefined_type *node);
   // visit a predefined type node
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index ded8bb0c11c..79507d2254b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -60,14 +60,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit an interface
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_module (be_module *node);
   // visit a module
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
index c6d623cf5a0..3f00ab6a94a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
@@ -23,7 +23,6 @@
 #define TAO_BE_VISITOR_TYPECODE_H
 
 #include "be_visitor_decl.h"
-#include "be_visitor_scope.h"
 
 #include "be_visitor_typecode/typecode_decl.h"
 #include "be_visitor_typecode/typecode_defn.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 e701ed72120..e3a1765d864 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,9 +23,7 @@
 #ifndef _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 
-const int TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE = 1024;
-
-class be_visitor_typecode_defn : public be_visitor_scope
+class be_visitor_typecode_defn : public be_visitor_decl
 {
   //
   // = TITLE
@@ -59,18 +57,9 @@ public:
   virtual int visit_interface (be_interface *node);
   // visit interface
 
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined types
-
   virtual int visit_sequence (be_sequence *node);
   // visit a sequence
 
-  virtual int visit_string (be_string *node);
-  // visit a structure
-
   virtual int visit_structure (be_structure *node);
   // visit a structure
 
@@ -80,16 +69,6 @@ public:
   virtual int visit_union (be_union *node);
   // visit a union
 
-  // = visit methods for the scope elements
-
-  virtual int visit_enum_val (be_enum_val *node);
-  // visit the enumeration values
-
-  virtual int visit_field (be_field *node);
-  // visit the field (struct and exception member)
-
-  virtual int visit_union_branch (be_union_branch *node);
-  // visit the union member
 
   // = special methods
 
@@ -98,189 +77,6 @@ public:
 
   virtual int gen_nested_namespace_end (be_module *node);
   // generate the nested namespace ends
-
-  // = methods for generating typecodes
-
-  int gen_typecode (be_array *node);
-
-  int gen_typecode (be_enum *node);
-
-  int gen_typecode (be_exception *node);
-
-  int gen_typecode (be_interface *node);
-
-  int gen_typecode (be_interface_fwd *node);
-
-  int gen_typecode (be_predefined_type *node);
-
-  int gen_typecode (be_sequence *node);
-
-  int gen_typecode (be_string *node);
-
-  int gen_typecode (be_structure *node);
-
-  int gen_typecode (be_typedef *node);
-
-  int gen_typecode (be_union *node);
-
-  // = methods to generate encapsulations for typecodes
-
-  int gen_encapsulation (be_array *node);
-
-  int gen_encapsulation (be_enum *node);
-
-  int gen_encapsulation (be_enum_val *node);
-
-  int gen_encapsulation (be_exception *node);
-
-  int gen_encapsulation (be_field *node);
-
-  int gen_encapsulation (be_interface *node);
-
-  int gen_encapsulation (be_interface_fwd *node);
-
-  int gen_encapsulation (be_predefined_type *node);
-
-  int gen_encapsulation (be_sequence *node);
-
-  int gen_encapsulation (be_string *node);
-
-  int gen_encapsulation (be_structure *node);
-
-  int gen_encapsulation (be_typedef *node);
-
-  int gen_encapsulation (be_union *node);
-
-  int gen_encapsulation (be_union_branch *node);
-
-  // = methods for computing typecode sizes
-
-  ACE_CDR::Long compute_tc_size (be_array *node);
-
-  ACE_CDR::Long compute_tc_size (be_enum *node);
-
-  ACE_CDR::Long compute_tc_size (be_exception *node);
-
-  ACE_CDR::Long compute_tc_size (be_interface *node);
-
-  ACE_CDR::Long compute_tc_size (be_interface_fwd *node);
-
-  ACE_CDR::Long compute_tc_size (be_predefined_type *node);
-
-  ACE_CDR::Long compute_tc_size (be_sequence *node);
-
-  ACE_CDR::Long compute_tc_size (be_string *node);
-
-  ACE_CDR::Long compute_tc_size (be_structure *node);
-
-  ACE_CDR::Long compute_tc_size (be_typedef *node);
-
-  ACE_CDR::Long compute_tc_size (be_union *node);
-
-  // methods for computing the encapsulation length
-
-  ACE_CDR::Long compute_encap_length (be_array *node);
-
-  ACE_CDR::Long compute_encap_length (be_enum *node);
-
-  ACE_CDR::Long compute_encap_length (be_enum_val *node);
-
-  ACE_CDR::Long compute_encap_length (be_exception *node);
-
-  ACE_CDR::Long compute_encap_length (be_field *node);
-
-  ACE_CDR::Long compute_encap_length (be_interface *node);
-
-  ACE_CDR::Long compute_encap_length (be_interface_fwd *node);
-
-  ACE_CDR::Long compute_encap_length (be_predefined_type *node);
-
-  ACE_CDR::Long compute_encap_length (be_sequence *node);
-
-  ACE_CDR::Long compute_encap_length (be_string *node);
-
-  ACE_CDR::Long compute_encap_length (be_structure *node);
-
-  ACE_CDR::Long compute_encap_length (be_typedef *node);
-
-  ACE_CDR::Long compute_encap_length (be_union *node);
-
-  ACE_CDR::Long compute_encap_length (be_union_branch *node);
-
-  // helpers to generate the repoID and name
-
-  void gen_repoID (be_decl *node);
-
-  void gen_name (be_decl *node);
-
-  // helpers to generate encap len of the repoID and name
-
-  ACE_CDR::ULong repoID_encap_len (be_decl *node);
-
-  ACE_CDR::ULong name_encap_len (be_decl *node);
-
-  // helper to get an array of long from a name
-
-  int tc_name2long (const char *name, 
-                    ACE_CDR::ULong *&larr, 
-                    ACE_CDR::ULong &arrlen);
-
-  // processing for scopes
-
-  virtual int post_process (be_decl *);
-  // do any processing after every element except the last one of the scope is
-  // processed
-
-  // data structure for handling recursive and repeated typecodes
-
-  struct QNode
-  {
-    be_type *node;
-    ACE_CDR::Long offset;
-  };
-
-private:
-  
-  ACE_CDR::Long computed_tc_size_;
-  // the tc size of the node under consideration
-
-  ACE_CDR::Long computed_encap_len_;
-  // the encap length of the node under consideration
-
-  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 
-
-  ACE_CDR::Long tc_offset_;
-  // current computed length of the typecode
-
-  ACE_Unbounded_Queue <QNode*> tc_queue_;
-  // queue to keep nodes
-
-  ACE_Unbounded_Queue <QNode*> compute_queue_;
-  // queue to keep nodes
-
-  ACE_CDR::Long scope_stack_ [TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE];
-  // stores scope lens during computation
-
-  // scope related routines
-
-  int index_;
-
-  int push (ACE_CDR::Long);
-
-  int pop (ACE_CDR::Long &);
-
-  // queue related routines
-
-  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);
-
-  void queue_reset (ACE_Unbounded_Queue <QNode*> &);
-
 };
 
 #endif /* _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
index 05e6192d346..7f6ea89b519 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
@@ -31,8 +31,8 @@ class be_visitor_union_any_op_cs : public be_visitor_union
   //   be_visitor_union_any_op_cs
   //
   // = DESCRIPTION
-  //   This is a base class for the visitors generate the Any
-  //   operator implementations
+  //   This is a concrete visitor for union that generates the Any operator
+  //   implementations
   //
 
 public:
@@ -42,67 +42,11 @@ public:
   ~be_visitor_union_any_op_cs (void);
   // destructor
 
-  // template methods that the derived visitors must implement.
-  // They generate the body for the insertion and extraction
-  // operators.
-  virtual int gen_insertion_nocopy (TAO_OutStream* os,
-                                    be_union *node) = 0;
-  virtual int gen_insertion (TAO_OutStream* os,
-                             be_union *node) = 0;
-  virtual int gen_extraction (TAO_OutStream* os,
-                              be_union *node) = 0;
-
-  // = The be_visitor methods.
   virtual int visit_union (be_union *node);
-  virtual int visit_union_branch (be_union_branch *node);
-};
-
-class be_visitor_union_any_op_compiled_cs : public be_visitor_union_any_op_cs
-{
-  //
-  // = TITLE
-  //   be_visitor_union_any_op_compiled_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for union that generates the Any
-  //   operator implementations, using compiled marshaling.
-  //
-
-public:
-  be_visitor_union_any_op_compiled_cs (be_visitor_context *ctx);
-  // constructor
+  // visit union
 
-  // = See be_visitor_union_any_op_cs
-  virtual int gen_insertion (TAO_OutStream* os,
-                             be_union *node);
-  virtual int gen_insertion_nocopy (TAO_OutStream* os,
-                                    be_union *node);
-  virtual int gen_extraction (TAO_OutStream* os,
-                              be_union *node);
-};
-
-class be_visitor_union_any_op_interpretive_cs : public be_visitor_union_any_op_cs
-{
-  //
-  // = TITLE
-  //   be_visitor_union_any_op_interpretive_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for union that generates the Any
-  //   operator implementations, using interpretive marshaling.
-  //
-
-public:
-  be_visitor_union_any_op_interpretive_cs (be_visitor_context *ctx);
-  // constructor
-
-  // = See be_visitor_union_any_op_cs
-  virtual int gen_insertion (TAO_OutStream* os,
-                             be_union *node);
-  virtual int gen_insertion_nocopy (TAO_OutStream* os,
-                                    be_union *node);
-  virtual int gen_extraction (TAO_OutStream* os,
-                              be_union *node);
+  virtual int visit_union_branch (be_union_branch *node);
+  // visit union_branch
 };
 
 #endif /* _BE_VISITOR_UNION_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
index 800c43910f6..a57a7dfb859 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
@@ -45,8 +45,9 @@ public:
   virtual int visit_union (be_union *node);
   // visit union
 
-  virtual int pre_process (be_decl *);
   virtual int post_process (be_decl *);
+  // any post processing that needs to be done after a scope element is handled
+
 };
 
 #endif /* _BE_VISITOR_UNION_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index ffbcc9de479..d0deb7bc4f6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -59,14 +59,6 @@ public:
   virtual int visit_interface_fwd (be_interface_fwd *node);
   // visit interface forward type
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-#endif /* IDL_HAS_VALUETYPE */
-
   virtual int visit_predefined_type (be_predefined_type *node);
   // visit predefined type
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
deleted file mode 100644
index 116bc7147eb..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_valuetype.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype class
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_VALUETYPE_H
-#define TAO_BE_VISITOR_VALUETYPE_H
-
-#ifdef IDL_HAS_VALUETYPE
-
-#include "be_visitor_scope.h"
-
-#include "be_visitor_valuetype/valuetype.h"
-#include "be_visitor_valuetype/valuetype_ch.h"
-#include "be_visitor_valuetype/valuetype_obv_ch.h"
-#include "be_visitor_valuetype/valuetype_obv_cs.h"
-#include "be_visitor_valuetype/valuetype_ci.h"
-#include "be_visitor_valuetype/valuetype_cs.h"
-//#include "be_visitor_valuetype/valuetype_ih.h"
-//#include "be_visitor_valuetype/valuetype_is.h"
-//#include "be_visitor_valuetype/any_op_ch.h"
-//#include "be_visitor_valuetype/any_op_cs.h"
-#include "be_visitor_valuetype/cdr_op_ch.h"
-#include "be_visitor_valuetype/cdr_op_cs.h"
-#include "be_visitor_valuetype/marshal_ch.h"
-#include "be_visitor_valuetype/marshal_cs.h"
-#include "be_visitor_valuetype/arglist.h"
-#include "be_visitor_valuetype/field_ch.h"
-#include "be_visitor_valuetype/field_cs.h"
-#include "be_visitor_valuetype/field_cdr_ci.h"
-#include "be_visitor_valuetype/obv_module.h"
-
-#endif /* IDL_HAS_VALUETYPE */
-
-#endif /* TAO_BE_VISITOR_VALUETYPE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
deleted file mode 100644
index e9b6747180d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    arglist.h
-//
-// = DESCRIPTION
-//    Visitor for generating code for IDL (valuetype) operations.
-//    This generates the operation signature.
-//
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
-#define _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
-
-// ******************************************************************************
-// Operation visitor for argument list - generates parameters in the signature
-// ******************************************************************************
-
-class be_visitor_obv_operation_arglist : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_operaion_arglist
-  //
-  // = DESCRIPTION
-  //   This is a visitor to generate operation argument list
-  //
-  //
-public:
-  be_visitor_obv_operation_arglist (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_obv_operation_arglist (void);
-  // destructor
-
-  int visit_operation (be_operation *node);
-  // visit the operation
-
-  int visit_argument (be_argument *node);
-  // visit each argument
-
-  int post_process (be_decl *bd);
-  // set 'comma' only between arguments
-
-};
-
-#endif /* _BE_VISITOR_OBV_OPERATION_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
deleted file mode 100644
index 15d64a457cc..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
-#define _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
-
-class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_cdr_op_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for interface that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_cdr_op_ch (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
deleted file mode 100644
index 9ed00ec9478..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for the CDR operators.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
-#define _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
-
-class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_cdr_op_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for interface that generates the CDR operator
-  //   implementations
-  //
-
-public:
-  be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_cdr_op_cs (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h
deleted file mode 100644
index db0a7d798a5..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ci.h
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_cdr_ci.h
-//
-// = DESCRIPTION
-//    Visitor generating code for Field in the client stubs file.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_field/cdr_op_cs.h
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_
-#define _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_
-
-#include "be_visitor_scope.h"
-
-class be_visitor_valuetype_field_cdr_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_valuetype_field_cdr_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for the be_field node for the client header.
-  //
-public:
-  be_visitor_valuetype_field_cdr_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_field_cdr_ci (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a field can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  const char *pre_, *post_;
-};
-
-class be_visitor_valuetype_field_cdr_decl : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_cdr_op_cs_field_decl
-  //
-  // = DESCRIPTION
-  //   When generating CDR operators for fields of structures and/or
-  //   unions it may be necessary to define some local variables (for
-  //   instance to hold temporary T_forany objects); this visitor
-  //   generates that code.
-  //
-public:
-  be_visitor_valuetype_field_cdr_decl (be_visitor_context *ctx);
-  // constructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // = visit operations for data types that require a local variable.
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedef type
-};
-
-#endif /*  _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
deleted file mode 100644
index cb1e6519f20..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_ch.h
-//
-// = DESCRIPTION
-//    Visitor generating code for valuetype fields in the valuetype class
-//    (header).
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_union_branch/public_ch.h
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_FIELD_CH_H_
-#define _BE_VISITOR_VALUETYPE_FIELD_CH_H_
-
-class be_visitor_valuetype_field_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_field_ch
-  //
-  // = DESCRIPTION
-  //    Visitor generating code for valuetype fields in the valuetype class
-  //    (header).
-  //
-public:
-  be_visitor_valuetype_field_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_field_ch (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a valuetype
-  //  state member can be.
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  void setenclosings (char *pre, char *post);
-  const char *pre_op ();
-  const char *post_op ();
-  // print additional material around the field (e.g. virtual before)
-
-private:
-  char *pre_op_;
-  char *post_op_;
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_FIELD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
deleted file mode 100644
index b976f21ea44..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    field_cs.h
-//
-// = DESCRIPTION
-//     Visitor for the Valuetype class.
-//     This one generates code for accessor and modifier functions of
-//     valuetype state members (in the stub or inline file).
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    derived from be_visitor_union_branch/public_ci.h
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_FIELD_CS_H_
-#define _BE_VISITOR_VALUETYPE_FIELD_CS_H_
-
-class be_visitor_valuetype_field_cs : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //    be_visitor_valuetype_field_cs
-  //
-  // = DESCRIPTION
-  //    This visitor is used to generate the accessors and modifiers
-  //    for the members of valuetype
-  //
-public:
-  be_visitor_valuetype_field_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_field_cs (void);
-  // destructor
-
-  virtual int visit_field (be_field *node);
-  // visit the field node
-
-  // =visit operations on all possible data types that a union_branch can be
-
-  virtual int visit_array (be_array *node);
-  // visit array type
-
-  virtual int visit_enum (be_enum *node);
-  // visit enum type
-
-  virtual int visit_interface (be_interface *node);
-  // visit interface type
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-  // visit interface forward type
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype type
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype forward type
-
-  virtual int visit_predefined_type (be_predefined_type *node);
-  // visit predefined type
-
-  virtual int visit_sequence (be_sequence *node);
-  // visit sequence type
-
-  virtual int visit_string (be_string *node);
-  // visit string type
-
-  virtual int visit_structure (be_structure *node);
-  // visit structure type
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit typedefed type
-
-  virtual int visit_union (be_union *node);
-  // visit union type
-
-  void setenclosings (char *pre);
-  const char *pre_op ();
-  // print additional string before op (e.g. ACE_INLINE)
-
-  void op_name (be_valuetype *node, TAO_OutStream *os);
-  // if (in_obv_space_) print OBV_name else print name
-
-  idl_bool in_obv_space_;
-private:
-  char *pre_op_;
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_FIELD_CS_H_ */
-
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
deleted file mode 100644
index 662529b8de8..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    marshal_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for marshalling.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
-#define _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
-
-class be_visitor_valuetype_marshal_ch : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_marshal_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for interface that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_valuetype_marshal_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_marshal_ch (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
deleted file mode 100644
index 8ec036d370f..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    marshal_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for valuetypes.
-//    This one provides code generation for marshalling.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
-#define _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
-
-class be_visitor_valuetype_marshal_cs : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_marshal_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for interface that generates the CDR operator
-  //   declarations
-  //
-
-public:
-  be_visitor_valuetype_marshal_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_marshal_cs (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit valuetype
-
-  void class_name (be_valuetype *node, TAO_OutStream *os);
-  int gen_fields (be_valuetype *node, be_visitor_context &ctx);
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
deleted file mode 100644
index 84e82d06cca..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    module_obv.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Module class
-//    This provides code generation for the module in the header
-//    for the OBV_ namespace
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
-#define _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
-
-class be_visitor_obv_module : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_obv_module
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the header for module
-  //   OBV_ namespace
-  //
-public:
-  be_visitor_obv_module (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_obv_module (void);
-  // destructor
-
-  virtual int visit_module (be_module *node);
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-};
-
-#endif /* _BE_VISITOR_VALUETYPE_OBV_MODULE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
deleted file mode 100644
index 745e5e73e0f..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ /dev/null
@@ -1,103 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides the generic visitor for valuetypes from which others
-//    will inherit.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on interface.h from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_H_
-#define _BE_VALUETYPE_VALUETYPE_H_
-
-
-class be_visitor_valuetype : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for valuetype that abstracts all common tasks
-  //
-
-public:
-  be_visitor_valuetype (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // visit the valuetype node
-
-  virtual int visit_valuetype_scope (be_valuetype *node);
-  // visit the scope of the valuetype node
-  // (in public/private field order)
-
-  virtual void begin_public ();
-  virtual void begin_private ();
-
- // =visit methods on all elements syntactically valid in a Valuetype scope
-
-  virtual int visit_attribute (be_attribute *node);
-  // visit attribute
-
-  virtual int visit_constant (be_constant *node);
-  // visit a constant
-
-  virtual int visit_enum (be_enum *node);
-  // visit an enum
-
-  virtual int visit_operation (be_operation *node);
-  // visit operation
-
-  virtual int visit_exception (be_exception *node);
-  // visit exception (not used)
-
-  virtual int visit_structure (be_structure *node);
-  // visit a structure
-
-  virtual int visit_union (be_union *node);
-  // visit a union
-
-  virtual int visit_typedef (be_typedef *node);
-  // visit the typedef node
-
-  virtual int visit_field (be_field *node);
-  // visit a field
-
-  // =helper methods for generation of fields
-
-  //int gen_field_i (be_field *node, idl_bool make_inline);
-  // field accessor and modifier implemantation
-
-  int gen_pd (be_valuetype *node);
-  // private data fields for scope
-
-  int gen_field_pd (be_field *node);
-  // private data for field
-
-  virtual int gen_init_defn (be_valuetype *node);
-  // generate the _init class definition
-
-  virtual int gen_init_impl (be_valuetype *node);
-  // generate the _init implementation
-
-};
-
-#endif /*  _BE_VALUETYPE_VALUETYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
deleted file mode 100644
index 527262a2721..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides code generation for valuetypes in the (client) header.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_CH_H_
-#define _BE_VALUETYPE_VALUETYPE_CH_H_
-
-// we need derived valuetype visitors for the client and server header files. For
-// the others, they use the default valuetype visitor
-
-class be_visitor_valuetype_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client header for valuetype
-  //
-  //
-public:
-  be_visitor_valuetype_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_ch (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_operation (be_operation *node);
-  virtual int visit_field (be_field *node);
-
-  void begin_public ();
-  void begin_private ();
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
deleted file mode 100644
index 44e8445de09..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
+++ /dev/null
@@ -1,51 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides code generation for valuetypes in the client inline.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_CI_H_
-#define _BE_VALUETYPE_VALUETYPE_CI_H_
-
-class be_visitor_valuetype_ci : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client inline for valuetype
-  //
-  //
-public:
-  be_visitor_valuetype_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_ci (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
-
-  virtual int visit_field (be_field *node);
-private:
-  idl_bool opt_accessor_;
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
deleted file mode 100644
index b05f5ddc9ab..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_cs.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides code generation for valuetypes in the client stubs.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_CS_H_
-#define _BE_VALUETYPE_VALUETYPE_CS_H_
-
-class be_visitor_valuetype_cs : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the client stubs for valuetype
-  //
-  //
-public:
-  be_visitor_valuetype_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_cs (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-  // set the right context and make a visitor
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
deleted file mode 100644
index 10fc526dca8..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides code generation for valuetype OBV_ class
-//    in the (client) header.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
-#define _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
-
-// we need derived valuetype visitors for the client and server header files. For
-// the others, they use the default valuetype visitor
-
-class be_visitor_valuetype_obv_ch : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_ch
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the header for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_valuetype_obv_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_obv_ch (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_field (be_field *node);
-
-  void begin_public ();
-  void begin_private ();
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
deleted file mode 100644
index ba4f3b0d584..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Valuetype node.
-//    This one provides code generation for valuetype OBV_ class
-//    in the (client) header.
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
-#define _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
-
-// we need derived valuetype visitors for the client and server header files. For
-// the others, they use the default valuetype visitor
-
-class be_visitor_valuetype_obv_ci : public be_visitor_valuetype
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the implementation for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_valuetype_obv_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_obv_ci (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_field (be_field *node);
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
deleted file mode 100644
index fc7eba823b4..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_obv_cs.cpp
-//
-// = DESCRIPTION
-//    Visitor generating code for Valuetypes
-//    OBV_ class implementation
-//    (see C++ mapping OMG 20.17)
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
-//    derived from interface_ch.cpp from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
-#define _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
-
-class be_visitor_valuetype_obv_cs : public be_visitor_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_obv_cs
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor to generate the implementation for valuetype
-  //   OBV_ class
-  //
-public:
-  be_visitor_valuetype_obv_cs (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_obv_cs (void);
-  // destructor
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_field (be_field *node);
-};
-
-#endif /* _BE_VALUETYPE_VALUETYPE_OBV_CS_H_ */
-
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
deleted file mode 100644
index 435a992ae9d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_valuetype_fwd.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the valuetype_fwd class
-//
-// = AUTHOR
-//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//    based on code from Aniruddha Gokhale (be_visitor_interface_fwd.h)
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_VALUETYPE_FWD_H
-#define TAO_BE_VISITOR_VALUETYPE_FWD_H
-
-#ifdef IDL_HAS_VALUETYPE
-
-#include "be_visitor.h"
-#include "be_visitor_scope.h"
-
-#include "be_visitor_valuetype_fwd/valuetype_fwd_ch.h"
-#include "be_visitor_valuetype_fwd/valuetype_fwd_ci.h"
-#include "be_visitor_valuetype_fwd/cdr_op_ci.h"
-
-#endif /* IDL_HAS_VALUETYPE */
-
-#endif /* TAO_BE_VISITOR_VALUETYPE_FWD_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
deleted file mode 100644
index 756824a5e28..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ci.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    cdr_op_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the valuetype_fwd class
-//    This one provides code generation for the CDR operators
-//    (actually just their declarations) for the valuetype forward
-//    declaration in the client inline.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    based on code from Aniruddha Gokhale & Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H
-#define BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H
-
-class be_visitor_valuetype_fwd_cdr_op_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_fwd_cdr_op_ci
-  //
-  // = DESCRIPTION
-  //   This is a concrete visitor for valuetype that generates the CDR
-  //   operator forward declarations.
-  //
-
-public:
-  be_visitor_valuetype_fwd_cdr_op_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_fwd_cdr_op_ci (void);
-  // destructor
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype
-
-};
-
-#endif /* BE_VISITOR_INTERFACE_FWD_CDR_OP_CI_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
deleted file mode 100644
index 57103509505..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_fwd_ch.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface Forward node.
-//    This one provides code generation for valuetype forward node.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_INTERFACE_FWD_CH_H_
-#define _BE_INTERFACE_INTERFACE_FWD_CH_H_
-
-class be_visitor_valuetype_fwd_ch : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_fwd_ch
-  //
-  // = DESCRIPTION
-  //   This is the visitor for valuetype_fwd for the header file
-  //
-  //
-public:
-  be_visitor_valuetype_fwd_ch (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_fwd_ch (void);
-  // destructor
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd.
-
-};
-
-#endif /* _BE_INTERFACE_INTERFACE_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h
deleted file mode 100644
index e32639d9a6b..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ci.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-/* -*- c++ -*- */
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    valuetype_fwd_ci.h
-//
-// = DESCRIPTION
-//    Concrete visitor for the Interface Forward node.
-//    This one provides code generation for valuetype forward node.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    based on code from Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef _BE_INTERFACE_INTERFACE_FWD_CI_H_
-#define _BE_INTERFACE_INTERFACE_FWD_CI_H_
-
-class be_visitor_valuetype_fwd_ci : public be_visitor_decl
-{
-  //
-  // = TITLE
-  //   be_visitor_valuetype_fwd_ci
-  //
-  // = DESCRIPTION
-  //   This is the visitor for valuetype_fwd for the inline file
-  //
-  //
-public:
-  be_visitor_valuetype_fwd_ci (be_visitor_context *ctx);
-  // constructor
-
-  ~be_visitor_valuetype_fwd_ci (void);
-  // destructor
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-  // visit valuetype_fwd
-
-};
-
-#endif /* _BE_INTERFACE_INTERFACE_FWD_CH_I_ */
diff --git a/TAO/TAO_IDL/driver/Makefile.am b/TAO/TAO_IDL/driver/Makefile.am
deleted file mode 100644
index b7293137b69..00000000000
--- a/TAO/TAO_IDL/driver/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'driver' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include \
-           -I$(top_srcdir)/TAO_IDL/be_include
-
-noinst_LIBRARIES = libdriver.a
-
-libdriver_a_SOURCES = \
-         drv_args.cpp  \
-         drv_fork.cpp  \
-         drv_init.cpp  \
-         drv_link.cpp  \
-         drv_preproc.cpp  \
-         drv_private.cpp
-
-## FIXME: What should CPP_LOCATION be?
-##        Is the "+=" a portable make feature?
-CXXFLAGS += \
-           -DCPP_LOCATION=\"$(CXX)\"
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index 9f09ca74382..e783e7d3fb2 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -123,9 +123,6 @@ DRV_usage (void)
   cerr << GTDEVEL (" -Gi\t\t\tenable Interpretive marshaling (default)\n");
   cerr << GTDEVEL (" -Ge\t\t\tenable C++ Exception support (suppressed by default)\n");
   cerr << GTDEVEL (" -Gt\t\t\tenable optimized TypeCode support (unopt by default)\n");
-#ifdef IDL_HAS_VALUETYPE
-  cerr << GTDEVEL (" -Gv\t\t\tenable OBV (Valuetype) support (disabled by default)\n");
-#endif /* IDL_HAS_VALUETYPE */
   cerr << GTDEVEL (" -GI[h|s|b|e|c]\tGenerate Implemenation Files \n");
   cerr << GTDEVEL ("  \t\t\th - Implementation header file name ending. Default is I.h \n");
   cerr << GTDEVEL ("  \t\t\ts - Implementation skeleton file name ending. Default is I.cpp\n");
@@ -149,11 +146,6 @@ DRV_usage (void)
   cerr << GTDEVEL (" -sT\t\t\tServer's template skeleton file name ending. Default is S_T.cpp\n");
   cerr << GTDEVEL (" -Sa\t\t\tsuppress Any support (support enabled by default)\n");
   cerr << GTDEVEL (" -St\t\t\tsuppress TypeCode support (support enabled by default)\n");
-#ifdef IDL_HAS_VALUETYPE
-  cerr << GTDEVEL (" -Sv\t\t\tdisable OBV (Valuetype) support (disabled by default)\n");
-#endif /* IDL_HAS_VALUETYPE */
-  cerr << GTDEVEL (" -t\t\t\tTemporary directory to be used by the IDL compiler."
-                   "(default is value of environment variable ACE_DEFAULT_TEMP_DIR_ENV)\n");
   cerr << GTDEVEL (" -u\t\t\tprints usage message and exits\n");
   cerr << GTDEVEL (" -Uname\t\t\tundefines name for preprocessor\n");
   cerr << GTDEVEL (" -v\t\t\ttraces compilation stages\n");
@@ -272,19 +264,19 @@ DRV_parse_args (long ac, char **av)
                   idl_global->client_stub_ending (av[i+1]);
                   i++;
                 }
-
+              
               else if (av[i][2] == 'i')
                 {
                   idl_global->client_inline_ending (av[i+1]);
                   i++;
                 }
-
+              
               else
                 {
                   // I expect 's' or 'i' after 'c'.
                   cerr << GTDEVEL("Incomplete Flag : ")
                        << av[i];
-                  ACE_OS::exit (99);
+                  exit(99);
                 }
               break;
 
@@ -321,13 +313,13 @@ DRV_parse_args (long ac, char **av)
                   idl_global->server_template_inline_ending (av[i+1]);
                   i++;
                 }
-
+              
               else if (av[i][2] == 'I')
                 {
                   idl_global->implementation_skel_ending (av[i+1]);
                   i++;
                 }
-
+              
               else
                 {
                   // I expect 's' or 'T' or 'i' or 't' after 's'.
@@ -349,26 +341,16 @@ DRV_parse_args (long ac, char **av)
                 cg->lookup_strategy (TAO_CodeGen::TAO_BINARY_SEARCH);
               else if (ACE_OS::strcmp (av[i+1], "linear_search") == 0)
                 cg->lookup_strategy (TAO_CodeGen::TAO_LINEAR_SEARCH);
-              else
-                ACE_ERROR ((LM_ERROR,
-                            "%s: unknown operation lookup <%s>\n",
-                            av[0], av[i+1]));
               i++;
               break;
 
-              // Switching between ""s and <>'s when we generate
+              // Switching between "'s and <'s when we generate
               // #include statements for the standard files (e.g. tao/corba.h)
             case 'i':
               if (av[i][2] == 'c')
                 idl_global->changing_standard_include_files (1);
-              else if (av[i][2] == 'n')
-                idl_global->changing_standard_include_files (0);
-              else
-                ACE_ERROR ((LM_ERROR,
-                            "%s: unknown -i modifier <%c>\n",
-                            av[0], av[i][2]));
               break;
-
+                
               // Path for the perfect hash generator(gperf) program. Default
               // is $ACE_ROOT/bin/gperf.
             case 'g':
@@ -384,12 +366,6 @@ DRV_parse_args (long ac, char **av)
               i++;
               break;
 
-              // Temp directory for the IDL compiler to keep its files.
-            case 't':
-              idl_global->temp_dir (av [i+1]);
-              i++;
-              break;
-
             case 'D':
             case 'U':
             case 'I':
@@ -413,17 +389,14 @@ DRV_parse_args (long ac, char **av)
               else
                 DRV_cpp_putarg (av[i]);
               break;
-
             case 'E':
               idl_global->set_compile_flags (idl_global->compile_flags () |
                                              IDL_CF_ONLY_PREPROC);
               break;
-
             case 'V':
               idl_global->set_compile_flags (idl_global->compile_flags () |
                                              IDL_CF_VERSION);
               break;
-
             case 'W':
               if (av[i][2] == '\0')
                 {
@@ -457,7 +430,6 @@ DRV_parse_args (long ac, char **av)
                   break;
                 }
               break;
-
             case 'Y':
               if (av[i][2] == '\0')
                 {
@@ -489,7 +461,6 @@ DRV_parse_args (long ac, char **av)
                   break;
                 }
               break;
-
             case 'b':
               if (av[i][2] == '\0')
                 {
@@ -510,7 +481,6 @@ DRV_parse_args (long ac, char **av)
                 s = av[i] + 2;
               idl_global->set_be (s);
               break;
-
             case 'd':
               idl_global->set_compile_flags (idl_global->compile_flags () |
                                              IDL_CF_DUMP_AST);
@@ -536,16 +506,9 @@ DRV_parse_args (long ac, char **av)
                 }
               else if (av[i][2] == 't')
                 {
-                  // suppress typecode support
+                  // supress typecode support
                   idl_global->tc_support (0);
                 }
-              else if (av[i][2] == 'v')
-                {
-                  // disable OBV (Valuetype) support
-#                 ifdef IDL_HAS_VALUETYPE
-                  idl_global->obv_support (0);
-#                 endif
-                }
               else
                 {
                   cerr << GTDEVEL("IDL: missing argument after '")
@@ -554,7 +517,6 @@ DRV_parse_args (long ac, char **av)
                   ACE_OS::exit (99);
                 }
               break;
-
             case 'G':
               // enable generation of ...
               if (av[i][2] == 'c')
@@ -572,22 +534,13 @@ DRV_parse_args (long ac, char **av)
                   // exception support
                   idl_global->exception_support (1);
                 }
-              else if (av[i][2] == 't')
+              else if (av[i][2] == 'o')
                 {
                   // optimized typecode support
                   idl_global->opt_tc (1);
                 }
-              else if (av[i][2] == 'v')
-                {
-#             ifdef IDL_HAS_VALUETYPE
-                  // enable OBV (Valuetype) support
-                  idl_global->obv_support (1);
-#             else /* IDL_HAS_VALUETYPE */
-                  cerr << GTDEVEL("IDL: -Gv (Valuetype) not compiled in\n");
-                  ACE_OS::exit (99);
-#             endif /* IDL_HAS_VALUETYPE */
-                }
               else if (av[i][2] == 'I')
+
                 {
                   int options = ACE_OS::strlen(av[i]) - 3;
                   int j;
@@ -596,10 +549,10 @@ DRV_parse_args (long ac, char **av)
                   idl_global->gen_impl_files (1);
                   for (j=0;j<options;j++)
                     {
-
+                     
                       if (av[k][j+3] == 's')
                         {
-
+                          
                           idl_global->implementation_skel_ending (av[i+1]);
                           i++;
                         }
@@ -643,7 +596,7 @@ DRV_parse_args (long ac, char **av)
                   ACE_OS::exit (99);
                 }
               break;
-
+              
             default:
               cerr << GTDEVEL ("IDL: Illegal option '") << av[i] << "'\n";
               idl_global->set_compile_flags (idl_global->compile_flags () |
@@ -701,27 +654,6 @@ DRV_parse_args (long ac, char **av)
       cerr << GTDEVEL ("Bad Combination -St and -Go \n");
       ACE_OS::exit (99);
     }
-
-  // Make sure the output directory is valid.
-  if (idl_global->temp_dir () == 0)
-    {
-      const char* tmpdir = getenv (ACE_DEFAULT_TEMP_DIR_ENV);
-
-      if (tmpdir == 0)
-        tmpdir = ACE_DIRECTORY_SEPARATOR_STR_A
-          "tmp"
-          ACE_DIRECTORY_SEPARATOR_STR_A;
-
-      if (ACE_OS::access (tmpdir, F_OK | R_OK | W_OK) == -1)
-        {
-          cerr << GTDEVEL ("Warning: Can't access temporary directory (")
-               << tmpdir
-               << GTDEVEL ("), using current directory for temp files.\n");
-          tmpdir = ".";
-        }
-
-      idl_global->temp_dir (tmpdir);
-    }
 }
 
 // Return 0 on success, -1 failure. The <errno> corresponding to the
diff --git a/TAO/TAO_IDL/driver/drv_fork.cpp b/TAO/TAO_IDL/driver/drv_fork.cpp
index 6865ad5b9c8..db5fb4ab976 100644
--- a/TAO/TAO_IDL/driver/drv_fork.cpp
+++ b/TAO/TAO_IDL/driver/drv_fork.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -66,13 +66,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 /*
  * DRV_fork.cc - Fork a process for each file to be processed, wait for
- *               status from the child process
+ *		 status from the child process
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
-#include        "drv_private.h"
+#include	"drv_private.h"
 
 #include "ace/Process_Manager.h"
 
@@ -99,31 +99,31 @@ DRV_fork()
       ACE_Process_Manager manager;
       pid_t child_pid = manager.spawn (options);
       if (child_pid == 0)
-        {
-          /*
-           * OK, do it to this file (in the child)
-           */
-          DRV_drive(DRV_files[DRV_file_index]);
-          ACE_OS::exit(0);
-        }
+	{
+	  /*
+	   * OK, do it to this file (in the child)
+	   */
+	  DRV_drive(DRV_files[DRV_file_index]);
+	  ACE_OS::exit(0);
+	}
 
       if (child_pid == -1)
-        {
-          cerr << GTDEVEL("IDL: spawn failed\n");
-          ACE_OS::exit (99);
-          /*NOTREACHED*/
-        }
+	{
+	  cerr << GTDEVEL("IDL: spawn failed\n");
+	  ACE_OS::exit (99);
+	  /*NOTREACHED*/
+	}
 
       // child_pid is the process id of something at this point.
       if (manager.wait () == -1)
-        {
-          cerr << GTDEVEL("IDL: wait failed\n");
-          ACE_OS::exit (99);
-          /*NOTREACHED*/
-        }
+	{
+	  cerr << GTDEVEL("IDL: wait failed\n");
+	  ACE_OS::exit (99);
+	  /*NOTREACHED*/
+	}
     }
   /*
    * Now the parent process can exit
    */
-  ACE_OS::exit (0);
+  exit(0);
 }
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 67fa0c7e3b4..0b38a8f7bcc 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -116,8 +116,7 @@ DRV_cpp_putarg(char *str)
 void
 DRV_cpp_init()
 {
-  // @@ There are two "one time" memory leaks in this function.
-  //    They will not blow off the program but should be fixed at some point.
+
   char *cpp_loc;
 
   // DRV_cpp_putarg("\\cygnus\\H-i386-cygwin32\\bin\\echo");
@@ -125,62 +124,15 @@ DRV_cpp_init()
 
   if (cpp_path != 0)
       cpp_loc = cpp_path;
-#if defined (_MSC_VER)
-  else
-    {
-      cpp_path.open ("MSVCDir", (char*) 0);
-
-      if (cpp_path != 0)
-        {
-          cpp_loc = new char[BUFSIZ];
-          ACE_OS::strcpy (cpp_loc, cpp_path);
-          ACE_OS::strcat (cpp_loc, "\\bin\\CL.exe");
-        }
-      else
-        cpp_loc = idl_global->cpp_location();
-    }
-
-#else
   else
       cpp_loc = idl_global->cpp_location();
-#endif /* _MSC_VER */
-
-  DRV_cpp_putarg (cpp_loc);
+  DRV_cpp_putarg(cpp_loc);
 #if defined (ACE_WIN32)
-  DRV_cpp_putarg ("-nologo");
+  DRV_cpp_putarg("-nologo");
 #endif /* ACE_WIN32 */
-  DRV_cpp_putarg ("-E");
+  DRV_cpp_putarg("-E");
   DRV_cpp_putarg("-DIDL");
-  DRV_cpp_putarg ("-I.");
-
-  // So we can find the required orb.idl file.
-  char* option = new char[BUFSIZ];
-  ACE_OS::strcpy (option, "-I");
-  const char* TAO_ROOT =
-    ACE_OS::getenv ("TAO_ROOT");
-  if (TAO_ROOT != 0)
-    {
-      ACE_OS::strcat (option, TAO_ROOT);
-      ACE_OS::strcat (option, "/tao");
-    }
-  else
-    {
-      const char* ACE_ROOT =
-        ACE_OS::getenv ("ACE_ROOT");
-      if (ACE_ROOT != 0)
-        {
-          ACE_OS::strcat (option, ACE_ROOT);
-          ACE_OS::strcat (option, "TAO/tao");
-        }
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "TAO_IDL: neither TAO_ROOT nor ACE_ROOT defined\n"));
-          ACE_OS::strcat (option, ".");
-        }
-    }
-
-  DRV_cpp_putarg (option);
+  DRV_cpp_putarg("-I.");
 }
 
 /*
@@ -223,12 +175,12 @@ DRV_copy_input(FILE *fin, char *fn, const char *orig_filename)
          << GTDEVEL(": cannot open temp file ")
          << fn
          << GTDEVEL(" for writing\n");
-    ACE_OS::exit (99);
+    exit(99);
   }
   if (fin == NULL) {
       cerr << idl_global->prog_name()
            << GTDEVEL(": cannot open input file\n");
-      ACE_OS::exit (99);
+      exit(99);
   }
 #if !defined (ACE_WIN32)
   fprintf (f, "#line 1 \"%s\"\n", orig_filename);
@@ -268,9 +220,8 @@ DRV_copy_input(FILE *fin, char *fn, const char *orig_filename)
 }
 
 /*
- * Strip down a name to the last component, i.e. everything after the
- last
- * '/' or '\' character
+ * Strip down a name to the last component, i.e. everything after the last
+ * '/' character
  */
 static char *
 DRV_stripped_name(char *fn)
@@ -279,13 +230,10 @@ DRV_stripped_name(char *fn)
     long        l;
 
     if (n == NULL)
-      return NULL;
+        return NULL;
     l = strlen(n);
-    int slash_found = 0;
-    for (n += l-1; n >= fn && !slash_found; n--)
-        slash_found = (*n == '/' || *n == '\\');
-    n += 1;
-    if (slash_found) n += 1;
+    for (n += l; l > 0 && *n != '/'; l--, n--);
+    if (*n == '/') n++;
     return n;
 }
 
@@ -307,17 +255,28 @@ DRV_pre_proc(char *myfile)
   // Macro to avoid "warning: unused parameter" type warning.
   ACE_UNUSED_ARG (readfromstdin);
 
-  const char* tmpdir = idl_global->temp_dir ();
-
-  ACE_OS::strcpy (tmp_file, tmpdir);
-  ACE_OS::strcpy (tmp_ifile, tmpdir);
+  const char* tmpdir = getenv("TMP");
+  if (tmpdir != 0)
+    {
+      ACE_OS::strcpy (tmp_file, tmpdir);
+      ACE_OS::strcpy (tmp_ifile, tmpdir);
+    }
+  else
+    {
+      ACE_OS::strcpy (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
+      ACE_OS::strcat (tmp_file, "tmp");
+      ACE_OS::strcpy (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
+      ACE_OS::strcat (tmp_ifile, "tmp");
+    }
 
+  ACE_OS::strcat (tmp_file, ACE_DIRECTORY_SEPARATOR_STR_A);
   ACE_OS::strcat (tmp_file, "idlf_XXXXXX");
+
+  ACE_OS::strcat (tmp_ifile, ACE_DIRECTORY_SEPARATOR_STR_A);
   ACE_OS::strcat (tmp_ifile, "idli_XXXXXX");
 
   (void) ACE_OS::mktemp (tmp_file); ACE_OS::strcat (tmp_file, ".cc");
   (void) ACE_OS::mktemp (tmp_ifile); ACE_OS::strcat (tmp_ifile, ".cc");
-
   if (strcmp(myfile, "standard input") == 0)
     {
       idl_global->set_filename((*DRV_FE_new_UTL_String)(tmp_ifile));
@@ -401,7 +360,7 @@ DRV_pre_proc(char *myfile)
          << GTDEVEL(": Could not open cpp output file ")
          << tmp_file
          << "\n";
-    ACE_OS::exit (99);
+    exit(99);
   }
   (*DRV_FE_set_yyin)(ACE_reinterpret_cast(File *, yyin));
 
@@ -416,21 +375,19 @@ DRV_pre_proc(char *myfile)
          << GTDEVEL(": Could not remove cpp input file ")
          << tmp_ifile
          << "\n";
-    ACE_OS::exit (99);
+    exit(99);
   }
 
-#if !defined (ACE_WIN32) || defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
   if (ACE_OS::unlink(tmp_file) == -1) {
     cerr << idl_global->prog_name()
          << GTDEVEL(": Could not remove cpp output file ")
          << tmp_file
          << "\n";
-    ACE_OS::exit (99);
+    exit(99);
   }
-#endif /* ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0 */
 
   if (idl_global->compile_flags() & IDL_CF_ONLY_PREPROC)
-    ACE_OS::exit (0);
+    exit(0);
 }
 
 // We really need to know whether this line is a "#include ...". If
@@ -465,17 +422,12 @@ DRV_check_for_include (const char* buf)
       return;
 
   // Next thing is finding the file that has been `#include'd. Skip
-  // all the blanks and tabs and reach the startng " or < character.
-  for (; (*r != '"') && (*r != '<'); r++)
+  // all the blanks and tabs and reach the startng " character.
+  for (; *r != '"'; r++)
     if (*r == '\n' || *r == '\0')
       return;
 
-  // Decide on the end char.
-  char end_char = '"';
-  if (*r == '<')
-    end_char = '>';
-
-  // Skip this " or <.
+  // Skip this ".
   r++;
 
   // Store this position.
@@ -485,8 +437,8 @@ DRV_check_for_include (const char* buf)
   if (*h == '\0')
     return;
 
-  // Find the closing " or < character.
-  for (; *r != end_char; r++)
+  // Find the closing " character.
+  for (; *r != '"'; r++)
     continue;
 
   // Make a new string for this file name.
@@ -515,10 +467,8 @@ DRV_check_for_include (const char* buf)
   // Terminate this string.
   file_name [i] = '\0';
 
-  // Store in the idl_global, unless it's "orb.idl" -
-  // we don't want to generate header includes for that.
-  if (ACE_OS::strcmp (file_name, "orb.idl"))
-    idl_global->add_to_included_idl_files (file_name);
+  // Store in the idl_global.
+  idl_global->add_to_included_idl_files (file_name);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/TAO_IDL/fe/Makefile.am b/TAO/TAO_IDL/fe/Makefile.am
deleted file mode 100644
index 3fdc82246d3..00000000000
--- a/TAO/TAO_IDL/fe/Makefile.am
+++ /dev/null
@@ -1,95 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'fe' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include
-
-noinst_LIBRARIES = libfe.a
-
-libfe_a_SOURCES = \
-         fe_declarator.cpp  \
-         fe_extern.cpp  \
-         fe_init.cpp  \
-         fe_interface_header.cpp  \
-         fe_lookup.cpp  \
-         fe_private.cpp  \
-         lex.yy.cpp  \
-         y.tab.cpp
-
-noinst_HEADERS = y.tab.h
-
-##BUILT_SOURCES = fe_lookup.cpp lex.yy.cpp y.tab.cpp y.tab.h
-
-fe_lookup.cpp: keywords.dat
-	rm -f fe_lookup.cpp
-	echo "// \$$Id\$$" > fe_lookup.cpp
-	echo "#include	\"idl.h\"" >> fe_lookup.cpp
-	echo "#include	\"idl_extern.h\"" >> fe_lookup.cpp
-	echo "#include	\"fe_private.h\"" >> fe_lookup.cpp
-	$(GPERF) -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_  \
-			-L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$$ keywords.dat \
-			 >> fe_lookup.cpp
-
-lex.yy.cpp: idl.ll
-	@echo "WARNING: Potentially outdated fe/lex.yy.cpp"
-	@echo "         either touch(1) the file or explicitly"
-	@echo "         generate it using:"
-	@echo "    make lex.yy.cpp.target"
-
-.PHONY: lex.yy.cpp.target
-
-lex.yy.cpp.target:
-	$(LEX) -t idl.ll | \
-	sed -e "s/yy/tao_yy/g" \
-            -e "s/YY/TAO_YY/g" \
-            -e "s@#include <unistd\.h>@#include \"ace/OS.h\"@" \
-            -e "/#include </d" \
-            -e "s@ECHO@TAO_YY_ECHO@" \
-            -e 's/\$$Hea''der.*\$$/$$I''d$$/' > lex.yy.cpp
-        patch < lex.yy.cpp.diff
-	echo timestamp > $@
-
-y.tab.cpp: idl.yy
-	@echo "WARNING: Potentially outdated fe/y.tab.cpp"
-	@echo "         either touch(1) the file or explicitly"
-	@echo "         generate it using:"
-	@echo "    make y.tab"
-
-.PHONY: y.tab
-
-y.tab: idl.yy
-	$(YACC) -d idl.yy
-	sed -e "s/char \*getenv/char *ace_foo/g" \
-            -e "s/= getenv/= ACE_OS::getenv/g" \
-            -e "s/yynewerror://g" \
-            -e "s/yy/tao_yy/g" \
-            -e "s/YY/TAO_YY/g" \
-	    -e "s/y\.tab\.c/y.tab.cpp/g" < y.tab.c > /tmp/$(USER).Y
-	sed -e "s/yy/tao_yy/g" \
-            -e "s/YY/TAO_YY/g" < y.tab.h > /tmp/$(USER).YH
-	cp /tmp/$(USER).Y y.tab.cpp
-	cp /tmp/$(USER).YH y.tab.h
-	rm -f /tmp/$(USER).Y /tmp/$(USER).YH y.tab.c y.tab.h
-	patch < y.tab.cpp.diff
-	echo timestamp > $@
-
-noinst_DATA = keywords.dat
-
-EXTRA_DIST = idl.ll idl.yy keywords.dat y.tab.cpp.diff
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 32b82f1731e..e7c39af95e0 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -79,10 +79,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * stack as the outermost scope.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
-#include        "fe_private.h"
+#include	"fe_private.h"
 
 ACE_RCSID(fe, fe_init, "$Id$")
 
@@ -104,275 +104,218 @@ fe_populate(AST_Module *m)
   AST_PredefinedType *pdt;
 
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_long,
-                                                  create_scoped_name("long"),
-                                                  NULL);
+					          create_scoped_name("long"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
 
   pdt =
     idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ulong,
-                                           create_scoped_name("unsigned long"),
-                                           NULL);
+					   create_scoped_name("unsigned long"),
+					   NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()
-        ->create_predefined_type(AST_PredefinedType::PT_longlong,
-                                 create_scoped_name("long long"),
-                                 NULL);
+	->create_predefined_type(AST_PredefinedType::PT_longlong,
+				 create_scoped_name("long long"),
+				 NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()
-        ->create_predefined_type(AST_PredefinedType::PT_ulonglong,
-                                 create_scoped_name("unsigned long long"),
-                                 NULL);
+	->create_predefined_type(AST_PredefinedType::PT_ulonglong,
+				 create_scoped_name("unsigned long long"),
+				 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_short,
-                                                  create_scoped_name("short"),
-                                                  NULL);
+						  create_scoped_name("short"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
    idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_ushort,
-                                          create_scoped_name("unsigned short"),
-                                          NULL);
+					  create_scoped_name("unsigned short"),
+					  NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_float,
-                                                  create_scoped_name("float"),
-                                                  NULL);
+						  create_scoped_name("float"),
+					       	  NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_double,
-                                              create_scoped_name("double"),
-                                              NULL);
+					      create_scoped_name("double"),
+					      NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()
-        ->create_predefined_type(AST_PredefinedType::PT_longdouble,
-                                 create_scoped_name("long double"),
-                                 NULL);
+	->create_predefined_type(AST_PredefinedType::PT_longdouble,
+				 create_scoped_name("long double"),
+				 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_char,
-                                                  create_scoped_name("char"),
-                                                  NULL);
+						  create_scoped_name("char"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()
-        ->create_predefined_type(AST_PredefinedType::PT_wchar,
-                                 create_scoped_name("wchar"),
-                                 NULL);
+	->create_predefined_type(AST_PredefinedType::PT_wchar,
+				 create_scoped_name("wchar"),
+				 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_octet,
-                                                  create_scoped_name("octet"),
-                                                  NULL);
+						  create_scoped_name("octet"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_any,
-                                                  create_scoped_name("any"),
-                                                  NULL);
+						  create_scoped_name("any"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
   pdt =
     idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_boolean,
-                                              create_scoped_name("boolean"),
-                                              NULL);
+					      create_scoped_name("boolean"),
+					      NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()->create_predefined_type(AST_PredefinedType::PT_void,
-                                                  create_scoped_name("void"),
-                                                  NULL);
+						  create_scoped_name("void"),
+						  NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("Object"),
-                                         NULL);
+		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("Object"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("TypeCode"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("TypeCode"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
 
-# ifdef IDL_HAS_VALUETYPE
-  if (idl_global->obv_support ())
-    {
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("ValueBase"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-    }
-# endif /* IDL_HAS_VALUETYPE */
-
   /*
    * Add these to make all keywords protected even in different spellings
    */
 
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("attribute"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("attribute"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("case"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("case"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("const"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("const"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("context"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("context"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("default"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("default"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("enum"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("enum"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("exception"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("exception"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("in"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("in"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("out"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("out"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("inout"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("inout"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("interface"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("interface"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("module"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("module"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("oneway"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("oneway"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("raises"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("raises"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("readonly"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("readonly"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("sequence"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("sequence"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("string"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("string"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("wstring"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("wstring"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("struct"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("struct"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("switch"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("switch"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("typedef"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("typedef"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("union"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("union"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("unsigned"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("unsigned"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("TRUE"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("TRUE"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
   pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("FALSE"),
-                                         NULL);
+  		->create_predefined_type(AST_PredefinedType::PT_pseudo,
+					 create_scoped_name("FALSE"),
+					 NULL);
   m->fe_add_predefined_type(pdt);
-
-# ifdef IDL_HAS_VALUETYPE
-  if (idl_global->obv_support ())
-    {
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("abstract"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("custom"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("init"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("private"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("public"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("supports"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("truncatable"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-      pdt = idl_global->gen()
-                ->create_predefined_type(AST_PredefinedType::PT_pseudo,
-                                         create_scoped_name("valuetype"),
-                                         NULL);
-      m->fe_add_predefined_type(pdt);
-    }
-# endif /* IDL_HAS_VALUETYPE */
 }
 
 /*
@@ -384,7 +327,7 @@ FE_init_stage1()
   idl_global->set_scopes(new UTL_ScopeStack());
   if (idl_global->scopes() == NULL) {
     cerr << GTDEVEL("IDL: FE init failed to create scope stack, exiting\n");
-    ACE_OS::exit (99);
+    exit(99);
   }
 }
 
@@ -394,14 +337,14 @@ FE_init_stage1()
 void
 FE_init_stage2()
 {
-  AST_Root      *r;
+  AST_Root	*r;
 
   /*
    * Check that the BE init created a generator object
    */
   if (idl_global->gen() == NULL) {
     cerr << GTDEVEL("IDL: BE did not initialize idl_global->gen(), exiting\n");
-    ACE_OS::exit (99);
+    exit(99);
   }
   /*
    * Create a global root for the AST. Note that the AST root has no
@@ -411,7 +354,7 @@ FE_init_stage2()
   idl_global->set_root(r);
   if (r == NULL) {
     cerr << GTDEVEL("IDL: FE init failed to create AST root, exiting\n");
-    ACE_OS::exit (99);
+    exit(99);
   }
   /*
    * Push it on the stack
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 1922b537a6f..e1b70fb99aa 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -72,10 +72,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * AST_Interface node used to represent this interface is created.
  */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
-#include        "fe_private.h"
+#include	"fe_private.h"
 
 ACE_RCSID(fe, fe_interface_header, "$Id$")
 
@@ -83,13 +83,10 @@ ACE_RCSID(fe, fe_interface_header, "$Id$")
  * Constructor(s) and destructor
  */
 
-FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl,
-                                       UTL_NameList *supports,
-                                       idl_bool compile_now)
-                  : pd_interface_name(n)
+FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl)
+		  : pd_interface_name(n)
 {
-  if (compile_now)
-    compile_inheritance (nl, supports);
+  compile_inheritance(nl);
 }
 
 /*
@@ -98,16 +95,16 @@ FE_InterfaceHeader::FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *nl,
 
 // Compute flattened, non-repeating list of inherited interfaces
 
-#undef  INCREMENT
-#define INCREMENT       512
+#undef	INCREMENT
+#define	INCREMENT	512
 
 /*
  * Private storage used to store interfaces seen already in the
  * computation of the unique, flattened inheritance list
  */
 static AST_Interface **iseen = NULL;
-static long         iallocated = 0;
-static long         iused = 0;
+static long	    iallocated = 0;
+static long	    iused = 0;
 
 /*
  * Add an interface to an inheritance spec
@@ -115,8 +112,8 @@ static long         iused = 0;
 static void
 add_inheritance(AST_Interface *i)
 {
-  long                  k;
-  AST_Interface       **oiseen;
+  long			k;
+  AST_Interface	      **oiseen;
 
   /*
    * Make sure there's space for one more
@@ -130,7 +127,7 @@ add_inheritance(AST_Interface *i)
       iallocated += INCREMENT;
       iseen = new AST_Interface *[iallocated];
       for (k = 0; k < iused; k++)
-        iseen[k] = oiseen[k];
+	iseen[k] = oiseen[k];
       delete oiseen;
     }
   }
@@ -147,7 +144,7 @@ add_inheritance(AST_Interface *i)
 static long
 already_seen(AST_Interface *ip)
 {
-  long  i;
+  long	i;
 
   for (i = 0; i < iused; i++) {
     if (iseen[i] == ip)
@@ -182,104 +179,71 @@ FE_InterfaceHeader::compile_one_inheritance(AST_Interface *i)
  * Compute the list of top-level interfaces this one inherits from
  */
 void
-FE_InterfaceHeader::compile_inheritance(UTL_NameList *ifaces,
-                                        UTL_NameList *supports)
+FE_InterfaceHeader::compile_inheritance(UTL_NameList *nl)
 {
-  UTL_NamelistActiveIterator   *l;
-  AST_Decl                     *d;
-  AST_Interface                *i;
-  long                          k;
-  UTL_NameList                 *nl;
-  int                           loops;
-  long                          ichecked = 0;
-  idl_bool                      inh_err = 0;
-  idl_bool                      in_supports = 0;
+  UTL_NamelistActiveIterator *l = new UTL_NamelistActiveIterator(nl);
+  AST_Decl		       *d;
+  AST_Interface		       *i;
+  long			        k;
 
   iused = 0;
   /*
    * Compute expanded flattened non-repeating list of interfaces
    * which this one inherits from
    */
-  nl = ifaces;
-  // loop twice if nl and supports are nonempty
-  for (loops = 0; loops < 2; ++loops) {
-    if (nl != NULL) {
-      l = new UTL_NamelistActiveIterator(nl);
-      while (!(l->is_done())) {
-        /*
-         * Check that scope stack is valid
-         */
-        if (idl_global->scopes()->top() == NULL) {
-          idl_global->err()->lookup_error(l->item());
-          return;
-        }
-        /*
-         * Look it up
-         */
-        d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
-        /*
-         * Not found?
-         */
-        if (d == NULL) {
-          idl_global->err()->lookup_error(l->item());
-          return;
-        }
-        /*
-         * Not an appropriate interface?
-         */
-        while(d->node_type() == AST_Decl::NT_typedef)
-          d = AST_Typedef::narrow_from_decl(d)->base_type();
-        if (d->node_type() == AST_Decl::NT_interface)
-          i = AST_Interface::narrow_from_decl(d);
-        else
-          i = NULL;
-        if (i != NULL)
-          {
-            if (in_supports)
-              {
-                inh_err = ! this->check_supports (i);
-              }
-            else
-              {
-                if (ichecked == 0)
-                  inh_err = ! this->check_first (i);
-                else
-                  inh_err = ! this->check_further (i);
-              }
-          }
-        else
-          {
-            inh_err = 1;
-          }
-        if (inh_err)
-          {
-            idl_global->err()->inheritance_error(pd_interface_name, d);
-            return;  //%! really ? inh_err=0; and test the remaining...?
-          }
-        /*
-         * Forward declared interface?
-         */
-        if (!i->is_defined()) {
-          idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
-          return;
-        }
-        /*
-         * OK, see if we have to add this to the list of interfaces
-         * inherited from
-         */
-        compile_one_inheritance(i);
-
-        /*
-         * Next element in header list
-         */
-        ++ ichecked;
-        l->next();
-      }
-      delete l;
+  while (!(l->is_done())) {
+    /*
+     * Check that scope stack is valid
+     */
+    if (idl_global->scopes()->top() == NULL) {
+      idl_global->err()->lookup_error(l->item());
+      return;
     }
-    in_supports = 1;
-    nl = supports;
+    /*
+     * Look it up
+     */
+    d = idl_global->scopes()->top()->lookup_by_name(l->item(), I_TRUE);
+    /*
+     * Not found?
+     */
+    if (d == NULL) {
+      idl_global->err()->lookup_error(l->item());
+      return;
+    }
+    /*
+     * Not an interface?
+     */
+    while(d->node_type() == AST_Decl::NT_typedef) 
+      d = AST_Typedef::narrow_from_decl(d)->base_type();
+    if (d->node_type() != AST_Decl::NT_interface) {
+      idl_global->err()->inheritance_error(pd_interface_name, d);
+      return;
+    }
+    /*
+     * OK, cast to an interface
+     */
+    i = AST_Interface::narrow_from_decl(d);
+    if (i == NULL)
+       idl_global->err()->inheritance_error(pd_interface_name, d);
+    /*
+     * Forward declared interface?
+     */
+    if (!i->is_defined()) {
+      idl_global->err()->inheritance_fwd_error(pd_interface_name, i);
+      return;
+    }
+    /*
+     * OK, see if we have to add this to the list of interfaces
+     * inherited from
+     */
+    compile_one_inheritance(i);
+
+    /*
+     * Next element in header list
+     */
+    l->next();
   }
+  delete l;
   /*
    * OK, install in interface header
    */
@@ -289,35 +253,6 @@ FE_InterfaceHeader::compile_inheritance(UTL_NameList *ifaces,
   pd_n_inherits = iused;
 }
 
-// check_ methods called from compile_inheritance()
-// overridden in derived classes
-idl_bool
-FE_InterfaceHeader::check_first (AST_Interface *i)
-{
-  // nothing special for the first
-  return this->check_further (i);
-}
-
-idl_bool
-FE_InterfaceHeader::check_further (AST_Interface *i)
-{
-  if (i && ! i->is_valuetype())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-idl_bool
-FE_InterfaceHeader::check_supports (AST_Interface *i)
-{
-  return 0;
-}
-
-
 /*
  * Public operations
  */
@@ -347,67 +282,3 @@ FE_InterfaceHeader::n_inherits()
 {
   return pd_n_inherits;
 }
-
-
-// #ifdef IDL_HAS_VALUETYPE
-
-// FE_obv_header
-
-FE_obv_header::FE_obv_header (UTL_ScopedName *n, UTL_NameList *nl, UTL_NameList *supports)
-                  : FE_InterfaceHeader (n, nl, supports,0),
-                    truncatable_ (0),
-                    n_concrete_ (0)
-{
-  compile_inheritance (nl, supports);
-}
-
-// check_ methods called from compile_inheritance()
-idl_bool
-FE_obv_header::check_first (AST_Interface *i)
-{
-  if (i && i->is_valuetype())
-    {
-      if (! i->is_abstract_valuetype())
-        ++ n_concrete_;
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-idl_bool
-FE_obv_header::check_further (AST_Interface *i)
-{
-  if (i && i->is_valuetype() && i->is_abstract_valuetype())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-idl_bool
-FE_obv_header::check_supports (AST_Interface *i)
-{
-  if (i && ! i->is_valuetype())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-
-long
-FE_obv_header::n_concrete ()
-{
-  return n_concrete_;
-}
-
-// #endif /* IDL_HAS_VALUETYPE */
diff --git a/TAO/TAO_IDL/fe/fe_lookup.cpp b/TAO/TAO_IDL/fe/fe_lookup.cpp
index 2af34391bd3..7520b71a6a7 100644
--- a/TAO/TAO_IDL/fe/fe_lookup.cpp
+++ b/TAO/TAO_IDL/fe/fe_lookup.cpp
@@ -2,27 +2,27 @@
 #include	"idl.h"
 #include	"idl_extern.h"
 #include	"fe_private.h"
-/* starting time is 17:20:28 */
+/* starting time is 14:07:18 */
 /* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat  */
+/* Command-line: /opt/gokhale/build/SunCC/bin/gperf -M -J -c -C -D -E -T -f 0 -a -o -t -p -K keyword_ -L C++ -Z TAO_IDL_CPP_Keyword_Table -N lookup -k1,2,$ fe/keywords.dat  */
 unsigned int
 TAO_IDL_CPP_Keyword_Table::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252, 252, 252, 252,
-     252, 252, 252, 252, 252, 252, 252,  15,  35,  65,
-       0,   0,  35,   5,   0,  60, 252,   0,  30,   0,
-       5,   5,  20,  50,  40,  20, 110,   0,  45,  35,
-      95,  55, 252, 252, 252, 252, 252, 252,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243, 243, 243, 243,
+     243, 243, 243, 243, 243, 243, 243,  30,   0,  60,
+       0,   0,  20,  35,  25,  55, 243,   0,  15,  45,
+       5,   5,  50,  55,  30,  20,  95,   0,  70,  80,
+      10,  45, 243, 243, 243, 243, 243, 243,
     };
   return len + asso_values[str[1]] + asso_values[str[0]] + asso_values[str[len - 1]];
 }
@@ -32,12 +32,12 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 74,
+      TOTAL_KEYWORDS = 73,
       MIN_WORD_LENGTH = 2,
       MAX_WORD_LENGTH = 16,
       MIN_HASH_VALUE = 6,
-      MAX_HASH_VALUE = 251,
-      HASH_VALUE_RANGE = 246,
+      MAX_HASH_VALUE = 242,
+      HASH_VALUE_RANGE = 237,
       DUPLICATES = 0
     };
 
@@ -45,133 +45,129 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
     {
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"delete",  "_cxx_delete"},
-      {"mutable",  "_cxx_mutable"},
-      {"",}, 
-      {"enum",  "_cxx_enum"},
-      {"",}, 
+      {"",}, {"",}, {"",}, {"",}, 
       {"double",  "_cxx_double"},
       {"do",  "_cxx_do"},
       {"unsigned",  "_cxx_unsigned"},
       {"",}, 
       {"union",  "_cxx_union"},
       {"",}, {"",}, {"",}, 
-      {"goto",  "_cxx_goto"},
-      {"",}, {"",}, {"",}, 
-      {"and",  "_cxx_and"},
-      {"auto",  "_cxx_auto"},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"namespace",  "_cxx_namespace"},
-      {"using",  "_cxx_using"},
-      {"",}, {"",}, {"",}, 
       {"else",  "_cxx_else"},
-      {"",}, {"",}, {"",}, 
-      {"asm",  "_cxx_asm"},
       {"",}, 
-      {"while",  "_cxx_while"},
+      {"extern",  "_cxx_extern"},
       {"",}, {"",}, 
-      {"new",  "_cxx_new"},
-      {"long",  "_cxx_long"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"return",  "_cxx_return"},
+      {"bool",  "_cxx_bool"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, 
+      {"break",  "_cxx_break"},
       {"",}, {"",}, 
-      {"void",  "_cxx_void"},
-      {"false",  "_cxx_false"},
+      {"and",  "_cxx_and"},
+      {"auto",  "_cxx_auto"},
+      {"",}, 
+      {"return",  "_cxx_return"},
       {"",}, {"",}, 
-      {"volatile",  "_cxx_volatile"},
+      {"namespace",  "_cxx_namespace"},
+      {"",}, {"",}, {"",}, 
+      {"xor",  "_cxx_xor"},
+      {"goto",  "_cxx_goto"},
       {"",}, {"",}, 
-      {"switch",  "_cxx_switch"},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"not_eq",  "_cxx_not_eq"},
-      {"private",  "_cxx_private"},
+      {"mutable",  "_cxx_mutable"},
       {"",}, 
-      {"protected",  "_cxx_protected"},
+      {"enum",  "_cxx_enum"},
+      {"false",  "_cxx_false"},
+      {"friend",  "_cxx_friend"},
       {"",}, 
+      {"for",  "_cxx_for"},
+      {"long",  "_cxx_long"},
+      {"using",  "_cxx_using"},
+      {"bitand",  "_cxx_bitand"},
+      {"",}, {"",}, {"",}, {"",}, 
       {"inline",  "_cxx_inline"},
+      {"or",  "_cxx_or"},
+      {"register",  "_cxx_register"},
+      {"",}, {"",}, 
+      {"not_eq",  "_cxx_not_eq"},
       {"",}, 
-      {"operator",  "_cxx_operator"},
-      {"bool",  "_cxx_bool"},
+      {"continue",  "_cxx_continue"},
+      {"",}, {"",}, 
+      {"xor_eq",  "_cxx_xor_eq"},
+      {"",}, {"",}, 
+      {"void",  "_cxx_void"},
       {"",}, 
-      {"and_eq",  "_cxx_and_eq"},
+      {"signed",  "_cxx_signed"},
       {"",}, 
-      {"continue",  "_cxx_continue"},
+      {"volatile",  "_cxx_volatile"},
       {"",}, 
-      {"break",  "_cxx_break"},
-      {"friend",  "_cxx_friend"},
+      {"compl",  "_cxx_compl"},
       {"",}, 
-      {"for",  "_cxx_for"},
-      {"case",  "_cxx_case"},
-      {"catch",  "_cxx_catch"},
-      {"signed",  "_cxx_signed"},
-      {"or",  "_cxx_or"},
-      {"register",  "_cxx_register"},
+      {"private",  "_cxx_private"},
+      {"new",  "_cxx_new"},
+      {"protected",  "_cxx_protected"},
+      {"bitor",  "_cxx_bitor"},
       {"",}, {"",}, 
-      {"public",  "_cxx_public"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"operator",  "_cxx_operator"},
+      {"case",  "_cxx_case"},
       {"or_eq",  "_cxx_or_eq"},
-      {"bitand",  "_cxx_bitand"},
-      {"",}, {"",}, {"",}, 
-      {"compl",  "_cxx_compl"},
-      {"extern",  "_cxx_extern"},
-      {"",}, {"",}, 
-      {"char",  "_cxx_char"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"default",  "_cxx_default"},
-      {"template",  "_cxx_template"},
+      {"and_eq",  "_cxx_and_eq"},
+      {"if",  "_cxx_if"},
+      {"asm",  "_cxx_asm"},
       {"",}, 
       {"class",  "_cxx_class"},
       {"sizeof",  "_cxx_sizeof"},
-      {"",}, 
-      {"not",  "_cxx_not"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"if",  "_cxx_if"},
-      {"",}, 
-      {"this",  "_cxx_this"},
-      {"short",  "_cxx_short"},
+      {"default",  "_cxx_default"},
+      {"template",  "_cxx_template"},
       {"",}, {"",}, {"",}, {"",}, 
-      {"bitor",  "_cxx_bitor"},
+      {"not",  "_cxx_not"},
       {"",}, 
-      {"virtual",  "_cxx_virtual"},
-      {"xor",  "_cxx_xor"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
-      {"throw",  "_cxx_throw"},
-      {"",}, {"",}, {"",}, 
+      {"while",  "_cxx_while"},
+      {"",}, {"",}, 
+      {"explicit",  "_cxx_explicit"},
+      {"",}, {"",}, 
+      {"public",  "_cxx_public"},
+      {"",}, {"",}, 
+      {"char",  "_cxx_char"},
+      {"catch",  "_cxx_catch"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"true",  "_cxx_true"},
       {"",}, 
-      {"xor_eq",  "_cxx_xor_eq"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"switch",  "_cxx_switch"},
+      {"",}, {"",}, {"",}, 
+      {"float",  "_cxx_float"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"reinterpret_cast",  "_cxx_reinterpret_cast"},
-      {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, 
+      {"this",  "_cxx_this"},
+      {"short",  "_cxx_short"},
       {"typeid",  "_cxx_typeid"},
-      {"",}, 
+      {"virtual",  "_cxx_virtual"},
       {"typename",  "_cxx_typename"},
       {"",}, {"",}, {"",}, 
       {"dynamic_cast",  "_cxx_dynamic_cast"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"int",  "_cxx_int"},
-      {"",}, 
-      {"float",  "_cxx_float"},
-      {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"const",  "_cxx_const"},
-      {"",}, {"",}, {"",}, {"",}, 
-      {"const_cast",  "_cxx_const_cast"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, 
-      {"static",  "_cxx_static"},
-      {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"typedef",  "_cxx_typedef"},
-      {"try",  "_cxx_try"},
       {"",}, {"",}, 
-      {"export",  "_cxx_export"},
-      {"",}, 
-      {"explicit",  "_cxx_explicit"},
-      {"",}, {"",}, {"",}, 
-      {"wchar_t",  "_cxx_wchar_t"},
+      {"const_cast",  "_cxx_const_cast"},
+      {"",}, {"",}, 
+      {"try",  "_cxx_try"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"static",  "_cxx_static"},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"throw",  "_cxx_throw"},
       {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
       {"",}, 
       {"struct",  "_cxx_struct"},
       {"",}, {"",}, {"",}, {"",}, 
       {"static_cast",  "_cxx_static_cast"},
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, 
+      {"",}, {"",}, 
+      {"wchar_t",  "_cxx_wchar_t"},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -188,4 +184,4 @@ TAO_IDL_CPP_Keyword_Table::lookup (const char *str, unsigned int len)
     }
   return 0;
 }
-/* ending time is 17:20:28 */
+/* ending time is 14:07:18 */
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index c8d3e4ff3a7..7efcf9e9392 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -1,6 +1,6 @@
 
 %{
-/*  $Id$
+/*
 
 COPYRIGHT
 
@@ -93,24 +93,8 @@ inline char *__yytext()
 #else
 #define ace_yytext yytext
 #endif /* 0 */
-
-static int scan_obv_token (int token)
-{
-#ifdef IDL_HAS_VALUETYPE
-    if (idl_global->obv_support ())
-      {
-        return token;
-      }
-#endif /* IDL_HAS_VALUETYPE */
-    yylval.strval = ACE_OS::strdup (ace_yytext);
-    return IDENTIFIER;
-}
-
 %}
 
-/* SO we don't choke on files that use \r\n */
-NL [\r?\n]
-
 %array
 %option never-interactive
 
@@ -146,14 +130,6 @@ boolean		return IDL_BOOLEAN;
 octet		return IDL_OCTET;
 void		return IDL_VOID;
 native          return IDL_NATIVE;
-abstract        return scan_obv_token (IDL_ABSTRACT);
-custom          return scan_obv_token (IDL_CUSTOM);
-init            return scan_obv_token (IDL_INIT);
-private         return scan_obv_token (IDL_PRIVATE);
-public          return scan_obv_token (IDL_PUBLIC);
-supports        return scan_obv_token (IDL_SUPPORTS);
-truncatable     return scan_obv_token (IDL_TRUNCATABLE);
-valuetype       return scan_obv_token (IDL_VALUETYPE);
 
 TRUE		return IDL_TRUETOK;
 FALSE		return IDL_FALSETOK;
@@ -177,7 +153,7 @@ oneway		return IDL_ONEWAY;
 
     TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
     const TAO_IDL_CPP_Keyword_Entry *entry =
-            cpp_key_tbl.lookup (ace_yytext,
+            cpp_key_tbl.lookup (ace_yytext, 
                                 ACE_OS::strlen (ace_yytext));
     if (entry)
       {
@@ -237,27 +213,27 @@ oneway		return IDL_ONEWAY;
 		  yylval.cval = idl_escape_reader(ace_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
-^#[ \t]*pragma[ \t].*{NL}	{/* remember pragma */
+^#[ \t]*pragma[ \t].*\n	{/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_yytext);
 		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*{NL}		{
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""" "[0-9]*\n		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
+^#[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#line[ \t]*[0-9]*" ""\""[^\"]*"\""{NL}		{
+^#line[ \t]*[0-9]*" ""\""[^\"]*"\""\n		{
 		  idl_parse_line_and_file(ace_yytext);
 		}
-^#[ \t]*[0-9]*{NL} {
+^#[ \t]*[0-9]*\n {
 		  idl_parse_line_and_file(ace_yytext);
 	        }
-^#[ \t]*ident.*{NL}	{
+^#[ \t]*ident.*\n	{
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-\/\/.*{NL}	{
+\/\/.*\n	{
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
@@ -276,7 +252,7 @@ oneway		return IDL_ONEWAY;
 	          }
 	        }
 [ \t]*		;
-{NL}		{
+\n		{
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
 .		return ace_yytext [0];
@@ -393,7 +369,7 @@ idl_store_pragma(char *buf)
 	  ++tp; ++sp;
         }
     }
-
+  
   if (ACE_OS::strstr(buf + 8, "import") != 0) {
     idl_global->set_import(I_TRUE);
     return;
@@ -555,7 +531,7 @@ idl_escape_reader(
 	    str[i] = save;
 	    return out;
 	}
-	ACE_NOTREACHED (break;)
+	break;
       default:
 	// check for octal value
 	if (str[1] >= '0' && str[1] <= '7') {
@@ -571,6 +547,6 @@ idl_escape_reader(
 	} else {
 	  return str[1] - 'a';
 	}
-	ACE_NOTREACHED  (break;)
+	break;
     }
 }
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 94bddc33d33..2413fc647e0 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -1,4 +1,4 @@
-/* $Id$ */
+
 
 /*
 
@@ -102,11 +102,9 @@ extern int yyleng;
   UTL_LabelList		*llval;		/* Label list		*/
   UTL_DeclList		*dlval;		/* Declaration list	*/
   FE_InterfaceHeader	*ihval;		/* Interface header	*/
-  FE_obv_header         *vhval;         /* Valuetype header     */
   AST_Expression	*exval;		/* Expression value	*/
   AST_UnionLabel	*ulval;		/* Union label		*/
   AST_Field		*ffval;		/* Field value		*/
-  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
   AST_Expression::ExprType etval;	/* Expression type	*/
   AST_Argument::Direction dival;	/* Argument direction	*/
   AST_Operation::Flags	ofval;		/* Operation flags	*/
@@ -164,15 +162,6 @@ extern int yyleng;
 %token		IDL_RAISES
 %token		IDL_CONTEXT
 %token          IDL_NATIVE
-                 /* OBV tokens  see OMG ptc/98-10-04 3.2.4 */
-%token          IDL_ABSTRACT
-%token          IDL_CUSTOM
-%token          IDL_INIT
-%token          IDL_PRIVATE
-%token          IDL_PUBLIC
-%token          IDL_SUPPORTS
-%token          IDL_TRUNCATABLE
-%token          IDL_VALUETYPE
 
 %token <ival>	IDL_INTEGER_LITERAL
 %token <sval>	IDL_STRING_LITERAL
@@ -200,7 +189,7 @@ extern int yyleng;
 %type <slval>	string_literals
 
 %type <nlval>	at_least_one_scoped_name scoped_names inheritance_spec
-%type <nlval>	opt_raises supports_spec 
+%type <nlval>	opt_raises
 
 %type <elval>	at_least_one_array_dim array_dims
 
@@ -211,8 +200,6 @@ extern int yyleng;
 
 %type <ihval>	interface_header
 
-%type <vhval>   value_header
-
 %type <exval>	expression const_expr or_expr xor_expr and_expr shift_expr
 %type <exval>	add_expr mult_expr unary_expr primary_expr literal
 %type <exval>	positive_int_expr array_dim
@@ -231,9 +218,9 @@ extern int yyleng;
 
 %type <deval>	declarator simple_declarator complex_declarator
 
-%type <bval>	opt_readonly, opt_truncatable
+%type <bval>	opt_readonly
 
-%type <idval>	interface_decl value_decl id
+%type <idval>	interface_decl id
 
 %type <ival> type_dcl
 %%
@@ -289,14 +276,6 @@ definition
 	{
 	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
         }
-	| value_def
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen);
-        }
-	  ';'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
 	| error
 	{
 	  idl_global->err()->syntax_error(idl_global->parse_state());
@@ -369,6 +348,9 @@ interface :
 	  AST_Interface *i = NULL;
 	  AST_Decl	*v = NULL;
 	  UTL_StrList   *p = idl_global->pragmas();
+	  AST_Decl	*d = NULL;
+	  AST_Interface *fd = NULL;
+
 	  ACE_UNUSED_ARG (v);
 
 	  /*
@@ -379,7 +361,61 @@ interface :
 						    $1->inherits(),
 						    $1->n_inherits(),
 						    p);
-            AST_Interface::fwd_redefinition_helper (i,s,p);
+	    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?
+		   */
+		}
+		/*
+		 * 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 {
+		    fd->set_inherits($1->inherits());
+		    fd->set_n_inherits($1->n_inherits());
+		    /*
+		     * Update place of definition
+		     */
+		    fd->set_imported(idl_global->imported());
+		    fd->set_in_main_file(idl_global->in_main_file());
+		    fd->set_line(idl_global->lineno());
+		    fd->set_file_name(idl_global->filename());
+		    fd->add_pragmas(p);
+		    /*
+		     * Use full definition node
+		     */
+		    delete i;
+		    i = fd;
+		  }
+	        }
+	      }
+	    }
 	    /*
 	     * Add the interface to its definition scope
 	     */
@@ -455,250 +491,6 @@ inheritance_spec
 	}
 	;
 
-value_def
-        : valuetype
-        | value_abs_decl
-        | value_forward_decl
-        | value_box_decl
-	;
-
-valuetype
-        : IDL_CUSTOM value_concrete_decl
-        {
-           cerr << "error in " << idl_global->filename()->get_string()
-		<< " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle custom yet\n";
-            /* set custom (if not truncatable) */
-        }
-        | value_concrete_decl
-        ;
-
-value_concrete_decl :
-        value_header
-	{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-
-	  if (s != NULL && $1 != NULL) {
-	    i = idl_global->gen()->create_valuetype($1->interface_name(),
-						    $1->inherits(),
-						    $1->n_inherits(),
-						    p);
-            AST_Interface::fwd_redefinition_helper (i,s,p);
-	    /*
-	     * Add the valuetype to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
-	value_elements
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
-	'}'
-        {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  UTL_Scope* s = idl_global->scopes()->top();
-	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
-	  UTL_StrList *p = m->pragmas ();
-	  if (p != 0) p = (UTL_StrList*)p->copy ();
-	  idl_global->set_pragmas (p);
-	  idl_global->scopes()->pop();
-        }
-        ;
-
-value_abs_decl :
-        IDL_ABSTRACT
-        value_header
-	{
-	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
-	  AST_Interface *i = NULL;
-	  UTL_StrList   *p = idl_global->pragmas();
-
-	  if (s != NULL && $2 != NULL) {
-
-            if ($2->n_concrete() > 0) {
-              idl_global->err()->abstract_inheritance_error ($2->interface_name ());
-            }
-
-	    i = idl_global->gen()->create_valuetype($2->interface_name(),
-						    $2->inherits(),
-						    $2->n_inherits(),
-						    p);
-            i->set_abstract_valuetype ();
-            AST_Interface::fwd_redefinition_helper (i,s,p);
-	    /*
-	     * Add the valuetype to its definition scope
-	     */
-	    (void) s->fe_add_interface(i);
-	  }
-	  /*
-	   * Push it on the scope stack
-	   */
-	  idl_global->scopes()->push(i);
-        }
-	'{'
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-	}
-	exports
-	{
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-	}
-	'}'
-        {
-	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-	  /*
-	   * Done with this interface - pop it off the scopes stack
-	   */
-	  UTL_Scope* s = idl_global->scopes()->top();
-	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
-	  UTL_StrList *p = m->pragmas ();
-	  if (p != 0) p = (UTL_StrList*)p->copy ();
-	  idl_global->set_pragmas (p);
-	  idl_global->scopes()->pop();
-        }
-
-        ;
-
-value_header : 
-        value_decl 
-        opt_truncatable
-        inheritance_spec
-        supports_spec
-        {
-          $$ = new FE_obv_header (new UTL_ScopedName ($1, NULL), $3, $4);
-        }
-        ;
-
-value_decl
-        : IDL_VALUETYPE
-        {
-	   idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen);
-        }
-        id
-        {
-           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen);
-	   $$ = $3;
-        }
-        ;
-
-opt_truncatable :
-          IDL_TRUNCATABLE 
- 	  {
-            cerr << "warning in " << idl_global->filename()->get_string()
-	         << " line " << idl_global->lineno() << ":\n" ;
-            cerr << "truncatable modifier not supported and is ignored\n";
-	    $$ = I_FALSE;
-	    /* $$ = I_TRUE; */
-	  }
-	| /* EMPTY */
-	  {
-	    $$ = I_FALSE;
-	  }
-	;
-
-supports_spec :
-            IDL_SUPPORTS 
-            scoped_name 
-            { 
-              $$ = new UTL_NameList($2, NULL); 
-            }
-        |   /* empty */     
-            { 
-              $$ = NULL; 
-            }
-        ;
-
-value_forward_decl :
-        IDL_ABSTRACT
-        value_decl
-        {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($2, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * valuetype. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_valuetype_fwd(n, p);
-         //   if ($1)
-            f->set_abstract_valuetype ();
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
-      |
-        value_decl
-        {
-	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
-	  UTL_ScopedName	*n = new UTL_ScopedName($1, NULL);
-	  AST_InterfaceFwd	*f = NULL;
-	  UTL_StrList		*p = idl_global->pragmas();
-
-	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-	  /*
-	   * Create a node representing a forward declaration of an
-	   * valuetype. Store it in the enclosing scope
-	   */
-	  if (s != NULL) {
-	    f = idl_global->gen()->create_valuetype_fwd(n, p);
-	    (void) s->fe_add_interface_fwd(f);
-	  }
-	}
-	;
-
-      
-value_box_decl
-        : value_decl type_spec /* in this order %!?*/
-        {
-           cerr << "error in " << idl_global->filename()->get_string()
-		<< " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle boxes yet\n";
-        }
-        ;
-
-value_elements
-        : value_elements value_element
-        | /* EMPTY */
-        ;
-
-value_element
-        : state_member
-        | export
-        | init_decl
-        ;
-
-state_member
-        : IDL_PUBLIC
-          {
-            /* is $0 to member_i */
-            $<vival>$ = AST_Field::vis_PUBLIC;
-          }
-          member_i
-        | IDL_PRIVATE
-          {
-            /* is $0 to member_i */
-            $<vival>$ = AST_Field::vis_PRIVATE;
-          }
-          member_i
-        ; 
-
 exports
 	: exports export
 	| /* EMPTY */
@@ -932,11 +724,7 @@ const_type
 	      } else {
 	         $$ = AST_Expression::EV_any;
 	      }
-	    } else if (d->node_type () == AST_Decl::NT_string) {
-                $$ = AST_Expression::EV_string;
-            /* @ASG@ we will need a similar one for wstring after it
-                is implemented */
-            } else            
+	    } else
 	      $$ = AST_Expression::EV_any;
 	  } else
 	    $$ = AST_Expression::EV_any;
@@ -1427,15 +1215,7 @@ members
 	| /* EMPTY */
 	;
 
-member  : 
-        { 
-          /* is $0 to member_i */
-          $<vival>$ = AST_Field::vis_NA;
-        }
-        member_i
-        ;
-
-member_i:
+member	:
 	type_spec
 	{
 	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
@@ -1471,8 +1251,7 @@ member_i:
  	      AST_Type *tp = d->compose($1);
 	      if (tp == NULL)
 		continue;
-              /* $0 denotes Visibility, must be on yacc reduction stack */
-	      f = idl_global->gen()->create_field(tp, d->name(), p, $<vival>0);
+	      f = idl_global->gen()->create_field(tp, d->name(), p);
 	      (void) s->fe_add_field(f);
 	    }
 	    delete l;
@@ -2341,16 +2120,6 @@ op_type_spec
 	}
 	;
 
-init_decl
-        : IDL_INIT
-        {
-           cerr << "error in " << idl_global->filename()->get_string()
-		<< " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle init yet\n";
-        }
-        ;
-
-
 parameter_list
 	: '('
 	{
diff --git a/TAO/TAO_IDL/fe/keywords.dat b/TAO/TAO_IDL/fe/keywords.dat
index 0a3ade2e91a..5fafd81051e 100644
--- a/TAO/TAO_IDL/fe/keywords.dat
+++ b/TAO/TAO_IDL/fe/keywords.dat
@@ -24,7 +24,6 @@ dynamic_cast, "_cxx_dynamic_cast"
 else, "_cxx_else"
 enum, "_cxx_enum"
 explicit, "_cxx_explicit"
-export, "_cxx_export"
 extern, "_cxx_extern"
 false, "_cxx_false"
 float, "_cxx_float"
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 6fde2156aba..9afb8f22793 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -281,65 +281,59 @@ static void tao_yy_fatal_error TAO_YY_PROTO(( tao_yyconst char msg[] ));
 	tao_yy_flex_strncpy( tao_yytext, tao_yytext_ptr, tao_yyleng + 1 ); \
 	tao_yy_c_buf_p = tao_yy_cp;
 
-#define TAO_YY_NUM_RULES 70
-#define TAO_YY_END_OF_BUFFER 71
-static tao_yyconst short int tao_yy_accept[339] =
+#define TAO_YY_NUM_RULES 62
+#define TAO_YY_END_OF_BUFFER 63
+static tao_yyconst short int tao_yy_accept[284] =
     {   0,
-       67,   67,   71,   69,   67,   68,   68,   69,   69,   69,
-       69,   53,   51,   69,   69,   69,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   69,   67,    0,
-       54,    0,    0,   53,   51,   66,    0,   49,   53,    0,
-        0,    0,   51,   47,   45,   46,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   42,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,    0,   63,    0,    0,    0,
-
-        0,    0,   55,    0,   55,    0,    0,    0,   65,   65,
-       49,    0,   49,    0,   50,   52,   48,   48,   48,    1,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   43,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,    0,    0,    0,
-        0,    0,   58,   56,    0,    0,    0,   49,   50,   48,
-       39,   48,   48,   48,   18,   25,   48,   48,   48,   48,
-       48,   12,   48,   48,   33,   48,   48,   22,   48,   48,
-       48,   48,   48,   48,   48,   48,   48,   48,   48,   48,
-
-       48,   48,   48,   48,   48,   48,   48,   29,   48,   48,
-        0,    0,    0,    0,    0,   56,    0,   57,    0,   40,
-       48,   48,   48,    9,   48,   48,   48,   48,   48,   20,
-       41,   48,   48,   48,   28,   48,   48,   48,   48,   48,
-       48,   23,   48,   48,   48,   48,   48,   48,   16,   48,
-       48,   26,   48,   61,    0,    0,    0,    0,   48,   48,
-       48,   48,   32,   48,   21,   48,   48,    2,   30,   44,
-       48,   35,    3,   48,   48,   13,   11,   48,   17,   48,
-       48,   48,   48,   48,   60,    0,    0,    0,    0,    0,
-        0,   48,   48,   27,    7,   19,   48,   48,   34,   48,
-
-       48,   48,   48,   10,   48,   48,   14,    0,   64,   64,
-        0,    0,    0,   31,   48,   48,   48,    4,   15,   36,
-       48,   24,   48,    0,    0,    0,    5,    6,    8,   48,
-       38,   62,    0,   59,   59,   48,   37,    0
+       59,   59,   63,   61,   59,   60,   61,   61,   61,   61,
+       45,   43,   61,   61,   61,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   61,   59,    0,   46,    0,
+        0,   45,   43,   58,    0,   41,   45,    0,    0,    0,
+       43,   39,   37,   38,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   34,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,    0,   55,    0,    0,
+        0,    0,    0,   47,    0,   47,    0,    0,    0,   57,
+
+       41,    0,   41,    0,   42,   44,   40,   40,    1,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   35,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,    0,
+        0,    0,    0,    0,   50,   48,    0,    0,    0,   41,
+       42,   40,   31,   40,   40,   18,   25,   40,   40,   40,
+       40,   12,   40,   40,   40,   40,   22,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   29,   40,   40,    0,    0,    0,    0,    0,   48,
+        0,   49,    0,   32,   40,   40,    9,   40,   40,   40,
+
+       40,   20,   33,   40,   40,   40,   28,   40,   40,   40,
+       40,   23,   40,   40,   40,   40,   16,   40,   26,   40,
+       53,    0,    0,    0,    0,   40,   40,   40,   40,   21,
+       40,   40,    2,   30,   36,    3,   40,   40,   13,   11,
+       17,   40,   40,   40,   52,    0,    0,    0,    0,    0,
+        0,   40,   27,    7,   19,   40,   40,   40,   40,   10,
+       40,   14,    0,   56,    0,    0,    0,   40,   40,   40,
+        4,   15,   24,    0,    0,    0,    5,    6,    8,   54,
+        0,   51,    0
     } ;
 
 static tao_yyconst int tao_yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
-        1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    5,    1,    6,    7,    1,    1,    1,    8,    1,
-        1,    9,   10,    1,   11,   12,   13,   14,   15,   15,
-       15,   15,   15,   15,   15,   16,   16,   17,    1,   18,
-        1,   19,    4,    1,   20,   21,   21,   21,   22,   23,
-       24,   24,   24,   24,   24,   25,   24,   24,   24,   24,
-       24,   26,   27,   28,   29,   24,   24,   30,   24,   24,
-        1,   31,    1,    1,   32,    1,   33,   34,   35,   36,
-
-       37,   38,   39,   40,   41,   24,   24,   42,   43,   44,
-       45,   46,   47,   48,   49,   50,   51,   52,   53,   54,
-       55,   24,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    4,    1,    5,    6,    1,    1,    1,    7,    1,
+        1,    8,    9,    1,   10,   11,   12,   13,   14,   14,
+       14,   14,   14,   14,   14,   15,   15,   16,    1,   17,
+        1,   18,    1,    1,   19,   20,   20,   20,   21,   22,
+       23,   23,   23,   23,   23,   24,   23,   23,   23,   23,
+       23,   25,   26,   27,   28,   23,   23,   29,   23,   23,
+        1,   30,    1,    1,   31,    1,   32,   33,   34,   35,
+
+       36,   37,   38,   39,   40,   23,   23,   41,   42,   43,
+       44,   45,   46,   47,   48,   49,   50,   51,   52,   53,
+       54,   23,    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,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -356,234 +350,210 @@ static tao_yyconst int tao_yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static tao_yyconst int tao_yy_meta[56] =
+static tao_yyconst int tao_yy_meta[55] =
     {   0,
-        1,    1,    2,    1,    1,    1,    1,    3,    1,    1,
-        1,    1,    1,    4,    4,    4,    1,    1,    1,    4,
-        4,    4,    4,    5,    5,    5,    5,    5,    5,    5,
-        1,    5,    4,    4,    4,    4,    4,    4,    5,    5,
+        1,    1,    2,    1,    1,    1,    3,    1,    1,    1,
+        1,    1,    4,    4,    4,    1,    1,    1,    4,    4,
+        4,    4,    5,    5,    5,    5,    5,    5,    5,    1,
+        5,    4,    4,    4,    4,    4,    4,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    5,    5
+        5,    5,    5,    5
     } ;
 
-static tao_yyconst short int tao_yy_base[351] =
+static tao_yyconst short int tao_yy_base[296] =
     {   0,
-        0,  518,  524,  526,   54,  526,  526,  517,  491,   46,
-       54,   54,   59,  504,  502,  500,    0,  498,  491,   38,
-      471,   47,   20,   35,  473,  470,  468,  467,  478,   42,
-       46,   62,   63,   30,  466,   57,   66,  115,  102,  503,
-      526,  500,   97,  110,  121,  526,  106,  151,  138,  165,
-      180,    0,  170,  526,  526,  526,    0,  482,  477,  456,
-      449,  453,  457,  452,  467,  455,  449,  459,  445,  444,
-      459,  448,  118,  448,  455,  440,  439,  451,  437,  445,
-      451,  443,  450,  435,  436,  432,  433,  437,  426,  430,
-       93,  433,  433,  433,  422,  429,  526,  156,  196,  434,
-
-      428,  420,  526,  459,  458,  130,  457,  145,  526,  166,
-        0,  203,  526,  189,  206,    0,  437,  441,  412,    0,
-      413,  418,  422,  410,  122,  407,  423,  421,  411,  416,
-      419,  401,  399,  412,  409,  396,  405,  408,  391,    0,
-      391,  400,  392,  404,  388,  390,  165,  391,  386,  391,
-      397,  388,  391,  380,  394,  396,  380,  421,  420,  388,
-      380,  390,  526,  526,  218,  414,  209,  220,  526,  399,
-        0,  372,  378,  381,    0,    0,  367,  379,  370,  363,
-      371,    0,  366,  361,    0,  360,  361,    0,  366,  355,
-      356,  372,  371,  362,  365,  356,  363,  349,  354,  362,
-
-      351,  360,  359,  357,  348,  352,  353,    0,  341,  347,
-      381,  234,  342,  348,  345,  526,  375,  526,  374,    0,
-      348,  346,  346,    0,  324,  334,  334,  338,  324,    0,
-        0,  335,  335,  334,    0,  315,  319,  333,  318,  322,
-      321,    0,  325,  313,  314,  321,  327,  322,    0,  314,
-      307,    0,  312,  526,  237,  305,  245,  311,  318,  301,
-      307,  300,    0,  299,    0,  307,  314,    0,    0,    0,
-      309,    0,    0,  303,  309,    0,    0,  293,    0,  292,
-      303,  303,  284,  299,  526,  251,  205,  266,  270,  273,
-      272,  248,  233,    0,    0,    0,  234,  242,    0,  187,
-
-      193,  166,  164,    0,  147,  132,    0,  224,  526,  253,
-      149,  140,  244,    0,  104,   95,   91,    0,    0,    0,
-       89,    0,   84,  100,  260,  266,    0,    0,    0,   41,
-        0,  526,  270,  526,  287,   27,    0,  526,  291,  296,
-      298,  303,  308,   54,  311,  315,  318,  322,  327,  332
+        0,  457,  462,  464,   53,  464,  456,  430,   45,   53,
+       53,   58,  443,  441,  439,    0,  437,  430,   13,  410,
+       31,   40,   34,  412,  409,  407,  406,  417,   47,   56,
+       44,  394,  404,  402,   51,  105,   96,  440,  464,  437,
+       88,  100,  111,  464,  440,  141,  153,  158,  124,    0,
+      170,  464,  464,  464,    0,  418,  413,  386,  390,  394,
+      389,  404,  392,  397,  383,  382,  397,  386,   42,  386,
+      393,  378,  377,  389,  375,  383,  390,  375,  376,  372,
+      378,  372,   64,  376,  376,  365,  184,  464,  111,  145,
+      378,  372,  364,  464,  403,  402,  188,  401,  404,  464,
+
+        0,  194,  464,  129,  197,    0,  380,  384,    0,  357,
+      362,  366,  354,   79,  368,  366,  356,  361,  364,  345,
+      358,  355,  342,  351,  354,  337,    0,  340,  352,  336,
+      338,   90,  335,  347,  338,  341,  345,  347,  331,  372,
+      371,  339,  331,  341,  464,  464,  209,  365,  200,  213,
+      464,  350,    0,  330,  333,    0,    0,  319,  331,  316,
+      324,    0,  319,  314,  313,  314,    0,  319,  308,  309,
+      325,  320,  311,  318,  304,  309,  317,  316,  314,  305,
+      309,    0,  299,  305,  339,  172,  300,  306,  303,  464,
+      333,  464,  332,    0,  305,  305,    0,  283,  294,  298,
+
+      284,    0,    0,  295,  295,  294,    0,  275,  280,  284,
+      283,    0,  287,  275,  284,  286,    0,  278,    0,  277,
+      464,  217,  238,  238,  238,  220,  226,  219,  218,    0,
+      221,  224,    0,    0,    0,    0,  208,  213,    0,    0,
+        0,  204,  203,  198,  464,  230,  222,  244,  258,  251,
+      186,  168,    0,    0,    0,  161,  166,  142,  157,    0,
+      157,    0,  187,  464,  175,  165,  101,  125,  114,  115,
+        0,    0,    0,  130,  128,  120,    0,    0,    0,  464,
+      107,  464,  464,  273,  278,  280,  285,  290,   74,  293,
+      297,  300,  304,  309,  314
+
     } ;
 
-static tao_yyconst short int tao_yy_def[351] =
+static tao_yyconst short int tao_yy_def[296] =
     {   0,
-      338,    1,  338,  338,  338,  338,  338,  339,  340,  338,
-      338,  338,  338,  338,  338,  338,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  338,  338,  339,
-      338,  338,  342,  338,  338,  338,  343,  338,  338,  338,
-      338,  344,  338,  338,  338,  338,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,   38,  338,   38,  338,  338,
-
-      338,  338,  338,  338,  338,  338,  345,  343,  338,  343,
-       48,  338,  338,  338,  338,  344,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  346,  338,  338,
-      338,  338,  338,  338,  338,  347,  338,  338,  338,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      346,  338,  338,  338,  338,  338,  338,  338,  338,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  338,  338,  338,  338,  338,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  338,  338,  348,  338,  338,  338,
-      338,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  348,  338,  348,
-      349,  338,  338,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  349,  338,  350,  341,  341,  341,  341,
-      341,  338,  350,  338,  350,  341,  341,    0,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338
+      283,    1,  283,  283,  283,  283,  284,  285,  283,  283,
+      283,  283,  283,  283,  283,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  283,  283,  284,  283,  283,
+      287,  283,  283,  283,  288,  283,  283,  283,  283,  289,
+      283,  283,  283,  283,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  283,  283,   36,  283,
+      283,  283,  283,  283,  283,  283,  283,  290,  288,  283,
+
+       46,  283,  283,  283,  283,  289,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  291,
+      283,  283,  283,  283,  283,  283,  283,  292,  283,  283,
+      283,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  291,  283,  283,  283,  283,  283,
+      283,  283,  283,  286,  286,  286,  286,  286,  286,  286,
+
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      283,  283,  283,  283,  283,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  286,  286,  283,  283,  293,  283,  283,  283,
+      283,  286,  286,  286,  286,  286,  286,  286,  286,  286,
+      286,  286,  293,  283,  294,  283,  283,  286,  286,  286,
+      286,  286,  286,  294,  283,  295,  286,  286,  286,  283,
+      295,  283,    0,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283
+
     } ;
 
-static tao_yyconst short int tao_yy_nxt[582] =
+static tao_yyconst short int tao_yy_nxt[519] =
     {   0,
-        4,    5,    6,    7,    5,    8,    4,    9,    4,    4,
-       10,    4,   11,   12,   13,   13,   14,   15,   16,   17,
-       17,   17,   18,   17,   17,   17,   17,   19,   17,   17,
-        4,    4,   20,   21,   22,   23,   24,   25,   17,   17,
-       26,   27,   28,   29,   30,   31,   17,   32,   33,   34,
-       35,   36,   37,   17,   17,   39,   68,  116,   39,   44,
-       45,   45,   46,  337,   69,   48,   47,   49,   49,   50,
-       48,   60,   53,   53,   53,   51,   77,   89,   70,   64,
-       51,   61,  336,   52,   90,   78,   65,   62,   71,   92,
-       51,   66,   79,   80,   82,   51,   81,   67,   83,   84,
-
-       94,   93,   85,   39,  105,  325,   39,   52,  109,  110,
-      106,  106,   86,   87,   95,   88,   96,   97,   97,   98,
-      331,   48,  330,   49,   49,   50,  107,  329,   99,   99,
-       99,   51,   48,  152,   53,   53,   53,  164,  328,   52,
-      327,  153,   51,  165,  165,  311,   51,  109,  110,   48,
-      107,   49,   49,   50,  325,  100,  101,   51,  132,   51,
-      102,  158,  133,   52,  111,  111,  111,  134,  109,  110,
-      177,  178,  112,  113,   51,  113,   48,  323,   50,   50,
-       50,   48,  322,   53,   53,   53,   51,  112,  113,  114,
-      114,   51,  113,  115,  115,  115,  321,  338,   97,   97,
-
-      159,   51,  115,  115,  115,  199,   51,  309,  310,   99,
-       99,   99,  167,  167,  320,  200,  168,  168,  168,  115,
-      115,  115,  168,  168,  168,  216,  309,  310,  169,  319,
-      169,  217,  217,  168,  168,  168,  254,  254,  255,  285,
-      285,  318,  113,  169,  113,  326,  288,  169,  326,  289,
-      286,  286,  286,  285,  285,  309,  310,  113,  290,  290,
-      290,  113,  332,  332,  286,  286,  286,  288,  334,  335,
-      289,  288,  334,  335,  289,  311,  317,  312,  316,  290,
-      290,  290,  315,  290,  290,  290,  290,  290,  290,  334,
-      335,   40,   40,   40,   40,   40,   42,  314,   42,   42,
-
-       42,   57,   57,  104,  313,  104,  104,  104,  108,  108,
-      108,  108,  108,  166,  166,  211,  211,  211,  211,  211,
-      219,  219,  308,  308,  308,  308,  308,  324,  324,  324,
-      324,  324,  333,  333,  333,  333,  333,  307,  306,  305,
-      304,  303,  302,  301,  300,  299,  298,  297,  296,  295,
-      294,  293,  292,  291,  287,  284,  283,  282,  281,  280,
-      279,  278,  277,  276,  275,  274,  273,  272,  271,  270,
-      269,  268,  267,  266,  265,  264,  263,  262,  261,  260,
-      259,  218,  216,  258,  257,  256,  212,  253,  252,  251,
-      250,  249,  248,  247,  246,  245,  244,  243,  242,  241,
-
-      240,  239,  238,  237,  236,  235,  234,  233,  232,  231,
-      230,  229,  228,  227,  226,  225,  224,  223,  222,  221,
-      220,  218,  215,  214,  213,  158,  212,  210,  209,  208,
-      207,  206,  205,  204,  203,  202,  201,  198,  197,  196,
-      195,  194,  193,  192,  191,  190,  189,  188,  187,  186,
-      185,  184,  183,  182,  181,  180,  179,  176,  175,  174,
-      173,  172,  171,  170,  163,  163,  163,  162,  161,  160,
-      338,  157,  156,  155,  154,  151,  150,  149,  148,  147,
-      146,  145,  144,  143,  142,  141,  140,  139,  138,  137,
-      136,  135,  131,  130,  129,  128,  127,  126,  125,  124,
-
-      123,  122,  121,  120,  119,  118,  117,  103,   41,   91,
-       76,   75,   74,   73,   72,   63,   59,   58,   56,   55,
-       54,   43,   41,  338,   38,    3,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338
+        4,    5,    6,    5,    7,    4,    8,    4,    4,    9,
+        4,   10,   11,   12,   12,   13,   14,   15,   16,   16,
+       16,   17,   16,   16,   16,   16,   18,   16,   16,    4,
+        4,   19,   20,   21,   22,   23,   24,   16,   16,   25,
+       26,   27,   28,   29,   16,   16,   30,   31,   32,   33,
+       34,   35,   16,   16,   37,   58,   37,   42,   43,   43,
+       44,   59,   61,   46,   45,   47,   47,   48,   46,   62,
+       51,   51,   51,   49,   63,   64,   66,  106,   49,   78,
+       73,   50,   79,   65,   85,  120,   67,   76,   49,   74,
+      121,   77,   80,   49,   96,   81,   75,   37,   86,   37,
+
+       97,   97,  276,  135,  276,   50,   87,   88,   89,  282,
+       46,  136,   47,   47,   48,  140,   98,   90,   90,   90,
+       49,   46,  282,   51,   51,   51,  158,  159,   50,  176,
+      280,   49,  104,  104,  275,   49,  105,  105,  105,  177,
+       98,  105,  105,  105,   91,   92,   49,   88,  141,   93,
+      279,  283,   50,  101,  101,  101,  278,   90,   90,   90,
+      277,  102,  103,   46,  103,   47,   47,   48,   46,  265,
+       48,   48,   48,   49,  221,  222,  102,  103,   49,  275,
+       46,  103,   51,   51,   51,   87,   88,   89,   49,  264,
+       49,  273,  272,   49,  146,  271,   90,   90,   90,  270,
+
+      147,  147,  149,  149,  269,   49,  150,  150,  150,  105,
+      105,  105,  150,  150,  150,  190,  268,  267,  151,  245,
+      151,  191,  191,   91,  264,  150,  150,  150,   93,  246,
+      246,  246,  245,  151,  103,  262,  103,  151,  261,  248,
+      260,  249,  246,  246,  246,  248,  259,  249,  258,  103,
+      250,  250,  250,  103,  266,  257,  250,  250,  250,  248,
+      256,  249,  265,  250,  250,  250,  255,  254,  253,  252,
+      250,  250,  250,   38,   38,   38,   38,   38,   40,  251,
+       40,   40,   40,   55,   55,   95,  247,   95,   95,   95,
+       99,   99,   99,   99,   99,  148,  148,  185,  185,  185,
+
+      185,  185,  193,  193,  263,  263,  263,  263,  263,  274,
+      274,  274,  274,  274,  281,  281,  281,  281,  281,  244,
+      243,  242,  241,  240,  239,  238,  237,  236,  235,  234,
+      233,  232,  231,  230,  229,  228,  227,  226,  192,  190,
+      225,  224,  223,  186,  220,  219,  218,  217,  216,  215,
+      214,  213,  212,  211,  210,  209,  208,  207,  206,  205,
+      204,  203,  202,  201,  200,  199,  198,  197,  196,  195,
+      194,  192,  189,  188,  187,  140,  186,  184,  183,  182,
+      181,  180,  179,  178,  175,  174,  173,  172,  171,  170,
+      169,  168,  167,  166,  165,  164,  163,  162,  161,  160,
+
+      157,  156,  155,  154,  153,  152,  100,  145,  145,  145,
+      144,  143,  142,  139,  138,  137,  134,  133,  132,  131,
+      130,  129,  128,  127,  126,  125,  124,  123,  122,  119,
+      118,  117,  116,  115,  114,  113,  112,  111,  110,  109,
+      108,  107,  100,   94,   39,   84,   83,   82,   72,   71,
+       70,   69,   68,   60,   57,   56,   54,   53,   52,   41,
+       39,  283,   36,    3,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283
     } ;
 
-static tao_yyconst short int tao_yy_chk[582] =
+static tao_yyconst short int tao_yy_chk[519] =
     {   0,
         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,    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,    1,    5,   23,  344,    5,   10,
-       10,   10,   11,  336,   23,   12,   11,   12,   12,   12,
-       13,   20,   13,   13,   13,   12,   30,   34,   24,   22,
-       13,   20,  330,   12,   34,   30,   22,   20,   24,   36,
-       12,   22,   30,   31,   32,   13,   31,   22,   32,   33,
-
-       37,   36,   33,   39,   43,  324,   39,   12,   47,   47,
-       43,   43,   33,   33,   37,   33,   38,   38,   38,   38,
-      323,   44,  321,   44,   44,   44,   43,  317,   38,   38,
-       38,   44,   45,   91,   45,   45,   45,  106,  316,   44,
-      315,   91,   45,  106,  106,  312,   44,  108,  108,   49,
-       43,   49,   49,   49,  311,   38,   38,   45,   73,   49,
-       38,   98,   73,   44,   48,   48,   48,   73,  110,  110,
-      125,  125,   48,   48,   49,   48,   50,  306,   50,   50,
-       50,   53,  305,   53,   53,   53,   50,   48,   48,   51,
-       51,   53,   48,   51,   51,   51,  303,   98,   99,   99,
-
-       99,   50,  114,  114,  114,  147,   53,  287,  287,   99,
-       99,   99,  112,  112,  302,  147,  112,  112,  112,  115,
-      115,  115,  167,  167,  167,  165,  308,  308,  115,  301,
-      115,  165,  165,  168,  168,  168,  212,  212,  212,  255,
-      255,  300,  168,  115,  168,  313,  257,  115,  313,  257,
-      255,  255,  255,  286,  286,  310,  310,  168,  257,  257,
-      257,  168,  325,  325,  286,  286,  286,  288,  326,  326,
-      288,  289,  333,  333,  289,  289,  298,  290,  297,  288,
-      288,  288,  293,  289,  289,  289,  290,  290,  290,  335,
-      335,  339,  339,  339,  339,  339,  340,  292,  340,  340,
-
-      340,  341,  341,  342,  291,  342,  342,  342,  343,  343,
-      343,  343,  343,  345,  345,  346,  346,  346,  346,  346,
-      347,  347,  348,  348,  348,  348,  348,  349,  349,  349,
-      349,  349,  350,  350,  350,  350,  350,  284,  283,  282,
-      281,  280,  278,  275,  274,  271,  267,  266,  264,  262,
-      261,  260,  259,  258,  256,  253,  251,  250,  248,  247,
-      246,  245,  244,  243,  241,  240,  239,  238,  237,  236,
-      234,  233,  232,  229,  228,  227,  226,  225,  223,  222,
-      221,  219,  217,  215,  214,  213,  211,  210,  209,  207,
-      206,  205,  204,  203,  202,  201,  200,  199,  198,  197,
-
-      196,  195,  194,  193,  192,  191,  190,  189,  187,  186,
-      184,  183,  181,  180,  179,  178,  177,  174,  173,  172,
-      170,  166,  162,  161,  160,  159,  158,  157,  156,  155,
-      154,  153,  152,  151,  150,  149,  148,  146,  145,  144,
-      143,  142,  141,  139,  138,  137,  136,  135,  134,  133,
-      132,  131,  130,  129,  128,  127,  126,  124,  123,  122,
-      121,  119,  118,  117,  107,  105,  104,  102,  101,  100,
-       96,   95,   94,   93,   92,   90,   89,   88,   87,   86,
-       85,   84,   83,   82,   81,   80,   79,   78,   77,   76,
-       75,   74,   72,   71,   70,   69,   68,   67,   66,   65,
-
-       64,   63,   62,   61,   60,   59,   58,   42,   40,   35,
-       29,   28,   27,   26,   25,   21,   19,   18,   16,   15,
-       14,    9,    8,    3,    2,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338,  338,  338,  338,  338,  338,  338,  338,  338,  338,
-      338
+        1,    1,    1,    1,    5,   19,    5,    9,    9,    9,
+       10,   19,   21,   11,   10,   11,   11,   11,   12,   21,
+       12,   12,   12,   11,   21,   22,   23,  289,   12,   31,
+       29,   11,   31,   22,   35,   69,   23,   30,   11,   29,
+       69,   30,   31,   12,   41,   31,   29,   37,   35,   37,
+
+       41,   41,  267,   83,  267,   11,   36,   36,   36,  281,
+       42,   83,   42,   42,   42,   89,   41,   36,   36,   36,
+       42,   43,  276,   43,   43,   43,  114,  114,   42,  132,
+      275,   43,   49,   49,  274,   42,   49,   49,   49,  132,
+       41,  104,  104,  104,   36,   36,   43,   90,   90,   36,
+      270,   89,   42,   46,   46,   46,  269,   90,   90,   90,
+      268,   46,   46,   47,   46,   47,   47,   47,   48,  266,
+       48,   48,   48,   47,  186,  186,   46,   46,   48,  265,
+       51,   46,   51,   51,   51,   87,   87,   87,   47,  263,
+       51,  261,  259,   48,   97,  258,   87,   87,   87,  257,
+
+       97,   97,  102,  102,  256,   51,  102,  102,  102,  105,
+      105,  105,  149,  149,  149,  147,  252,  251,  105,  222,
+      105,  147,  147,   87,  247,  150,  150,  150,   87,  222,
+      222,  222,  246,  105,  150,  244,  150,  105,  243,  224,
+      242,  224,  246,  246,  246,  248,  238,  248,  237,  150,
+      224,  224,  224,  150,  250,  232,  248,  248,  248,  249,
+      231,  249,  249,  250,  250,  250,  229,  228,  227,  226,
+      249,  249,  249,  284,  284,  284,  284,  284,  285,  225,
+      285,  285,  285,  286,  286,  287,  223,  287,  287,  287,
+      288,  288,  288,  288,  288,  290,  290,  291,  291,  291,
+
+      291,  291,  292,  292,  293,  293,  293,  293,  293,  294,
+      294,  294,  294,  294,  295,  295,  295,  295,  295,  220,
+      218,  216,  215,  214,  213,  211,  210,  209,  208,  206,
+      205,  204,  201,  200,  199,  198,  196,  195,  193,  191,
+      189,  188,  187,  185,  184,  183,  181,  180,  179,  178,
+      177,  176,  175,  174,  173,  172,  171,  170,  169,  168,
+      166,  165,  164,  163,  161,  160,  159,  158,  155,  154,
+      152,  148,  144,  143,  142,  141,  140,  139,  138,  137,
+      136,  135,  134,  133,  131,  130,  129,  128,  126,  125,
+      124,  123,  122,  121,  120,  119,  118,  117,  116,  115,
+
+      113,  112,  111,  110,  108,  107,   99,   98,   96,   95,
+       93,   92,   91,   86,   85,   84,   82,   81,   80,   79,
+       78,   77,   76,   75,   74,   73,   72,   71,   70,   68,
+       67,   66,   65,   64,   63,   62,   61,   60,   59,   58,
+       57,   56,   45,   40,   38,   34,   33,   32,   28,   27,
+       26,   25,   24,   20,   18,   17,   15,   14,   13,    8,
+        7,    3,    2,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+
+      283,  283,  283,  283,  283,  283,  283,  283,  283,  283,
+      283,  283,  283,  283,  283,  283,  283,  283
     } ;
 
 static tao_yy_state_type tao_yy_last_accepting_state;
@@ -605,7 +575,7 @@ char *tao_yytext_ptr;
 #line 1 "fe/idl.ll"
 #define INITIAL 0
 #line 3 "fe/idl.ll"
-/*  $Id: idl.ll,v 1.28 1999/05/06 18:24:25 coryan Exp $
+/*
 
 COPYRIGHT
 
@@ -698,20 +668,6 @@ inline char *__tao_yytext()
 #else
 #define ace_tao_yytext tao_yytext
 #endif /* 0 */
-
-static int scan_obv_token (int token)
-{
-#ifdef IDL_HAS_VALUETYPE
-    if (idl_global->obv_support ())
-      {
-        return token;
-      }
-#endif /* IDL_HAS_VALUETYPE */
-    tao_yylval.strval = ACE_OS::strdup (ace_tao_yytext);
-    return IDENTIFIER;
-}
-
-/* SO we don't choke on files that use \r\n */
 #define TAO_YY_NEVER_INTERACTIVE 1
 
 /* Macros after this point can all be overridden by user definitions in
@@ -850,7 +806,7 @@ TAO_YY_MALLOC_DECL
 
 /* Code executed at the end of each rule. */
 #ifndef TAO_YY_BREAK
-#define TAO_YY_BREAK ACE_NOTREACHED (break;)
+#define TAO_YY_BREAK break;
 #endif
 
 #define TAO_YY_RULE_SETUP \
@@ -865,7 +821,7 @@ TAO_YY_DECL
 	register char *tao_yy_cp, *tao_yy_bp;
 	register int tao_yy_act;
 
-#line 117 "fe/idl.ll"
+#line 101 "fe/idl.ll"
 
 
 
@@ -919,13 +875,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 >= 339 )
+				if ( tao_yy_current_state >= 284 )
 					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] != 526 );
+		while ( tao_yy_base[tao_yy_current_state] != 464 );
 
 tao_yy_find_action:
 		tao_yy_act = tao_yy_accept[tao_yy_current_state];
@@ -953,245 +909,205 @@ do_action:	/* This label is used only to access EOF actions. */
 
 case 1:
 TAO_YY_RULE_SETUP
-#line 119 "fe/idl.ll"
+#line 103 "fe/idl.ll"
 return IDL_ANY;
 	TAO_YY_BREAK
 case 2:
 TAO_YY_RULE_SETUP
-#line 120 "fe/idl.ll"
+#line 104 "fe/idl.ll"
 return IDL_MODULE;
 	TAO_YY_BREAK
 case 3:
 TAO_YY_RULE_SETUP
-#line 121 "fe/idl.ll"
+#line 105 "fe/idl.ll"
 return IDL_RAISES;
 	TAO_YY_BREAK
 case 4:
 TAO_YY_RULE_SETUP
-#line 122 "fe/idl.ll"
+#line 106 "fe/idl.ll"
 return IDL_READONLY;
 	TAO_YY_BREAK
 case 5:
 TAO_YY_RULE_SETUP
-#line 123 "fe/idl.ll"
+#line 107 "fe/idl.ll"
 return IDL_ATTRIBUTE;
 	TAO_YY_BREAK
 case 6:
 TAO_YY_RULE_SETUP
-#line 124 "fe/idl.ll"
+#line 108 "fe/idl.ll"
 return IDL_EXCEPTION;
 	TAO_YY_BREAK
 case 7:
 TAO_YY_RULE_SETUP
-#line 125 "fe/idl.ll"
+#line 109 "fe/idl.ll"
 return IDL_CONTEXT;
 	TAO_YY_BREAK
 case 8:
 TAO_YY_RULE_SETUP
-#line 126 "fe/idl.ll"
+#line 110 "fe/idl.ll"
 return IDL_INTERFACE;
 	TAO_YY_BREAK
 case 9:
 TAO_YY_RULE_SETUP
-#line 127 "fe/idl.ll"
+#line 111 "fe/idl.ll"
 return IDL_CONST;
 	TAO_YY_BREAK
 case 10:
 TAO_YY_RULE_SETUP
-#line 128 "fe/idl.ll"
+#line 112 "fe/idl.ll"
 return IDL_TYPEDEF;
 	TAO_YY_BREAK
 case 11:
 TAO_YY_RULE_SETUP
-#line 129 "fe/idl.ll"
+#line 113 "fe/idl.ll"
 return IDL_STRUCT;
 	TAO_YY_BREAK
 case 12:
 TAO_YY_RULE_SETUP
-#line 130 "fe/idl.ll"
+#line 114 "fe/idl.ll"
 return IDL_ENUM;
 	TAO_YY_BREAK
 case 13:
 TAO_YY_RULE_SETUP
-#line 131 "fe/idl.ll"
+#line 115 "fe/idl.ll"
 return IDL_STRING;
 	TAO_YY_BREAK
 case 14:
 TAO_YY_RULE_SETUP
-#line 132 "fe/idl.ll"
+#line 116 "fe/idl.ll"
 return IDL_WSTRING;
 	TAO_YY_BREAK
 case 15:
 TAO_YY_RULE_SETUP
-#line 133 "fe/idl.ll"
+#line 117 "fe/idl.ll"
 return IDL_SEQUENCE;
 	TAO_YY_BREAK
 case 16:
 TAO_YY_RULE_SETUP
-#line 134 "fe/idl.ll"
+#line 118 "fe/idl.ll"
 return IDL_UNION;
 	TAO_YY_BREAK
 case 17:
 TAO_YY_RULE_SETUP
-#line 135 "fe/idl.ll"
+#line 119 "fe/idl.ll"
 return IDL_SWITCH;
 	TAO_YY_BREAK
 case 18:
 TAO_YY_RULE_SETUP
-#line 136 "fe/idl.ll"
+#line 120 "fe/idl.ll"
 return IDL_CASE;
 	TAO_YY_BREAK
 case 19:
 TAO_YY_RULE_SETUP
-#line 137 "fe/idl.ll"
+#line 121 "fe/idl.ll"
 return IDL_DEFAULT;
 	TAO_YY_BREAK
 case 20:
 TAO_YY_RULE_SETUP
-#line 138 "fe/idl.ll"
+#line 122 "fe/idl.ll"
 return IDL_FLOAT;
 	TAO_YY_BREAK
 case 21:
 TAO_YY_RULE_SETUP
-#line 139 "fe/idl.ll"
+#line 123 "fe/idl.ll"
 return IDL_DOUBLE;
 	TAO_YY_BREAK
 case 22:
 TAO_YY_RULE_SETUP
-#line 140 "fe/idl.ll"
+#line 124 "fe/idl.ll"
 return IDL_LONG;
 	TAO_YY_BREAK
 case 23:
 TAO_YY_RULE_SETUP
-#line 141 "fe/idl.ll"
+#line 125 "fe/idl.ll"
 return IDL_SHORT;
 	TAO_YY_BREAK
 case 24:
 TAO_YY_RULE_SETUP
-#line 142 "fe/idl.ll"
+#line 126 "fe/idl.ll"
 return IDL_UNSIGNED;
 	TAO_YY_BREAK
 case 25:
 TAO_YY_RULE_SETUP
-#line 143 "fe/idl.ll"
+#line 127 "fe/idl.ll"
 return IDL_CHAR;
 	TAO_YY_BREAK
 case 26:
 TAO_YY_RULE_SETUP
-#line 144 "fe/idl.ll"
+#line 128 "fe/idl.ll"
 return IDL_WCHAR;
 	TAO_YY_BREAK
 case 27:
 TAO_YY_RULE_SETUP
-#line 145 "fe/idl.ll"
+#line 129 "fe/idl.ll"
 return IDL_BOOLEAN;
 	TAO_YY_BREAK
 case 28:
 TAO_YY_RULE_SETUP
-#line 146 "fe/idl.ll"
+#line 130 "fe/idl.ll"
 return IDL_OCTET;
 	TAO_YY_BREAK
 case 29:
 TAO_YY_RULE_SETUP
-#line 147 "fe/idl.ll"
+#line 131 "fe/idl.ll"
 return IDL_VOID;
 	TAO_YY_BREAK
 case 30:
 TAO_YY_RULE_SETUP
-#line 148 "fe/idl.ll"
+#line 132 "fe/idl.ll"
 return IDL_NATIVE;
 	TAO_YY_BREAK
 case 31:
 TAO_YY_RULE_SETUP
-#line 149 "fe/idl.ll"
-return scan_obv_token (IDL_ABSTRACT);
-	TAO_YY_BREAK
-case 32:
-TAO_YY_RULE_SETUP
-#line 150 "fe/idl.ll"
-return scan_obv_token (IDL_CUSTOM);
-	TAO_YY_BREAK
-case 33:
-TAO_YY_RULE_SETUP
-#line 151 "fe/idl.ll"
-return scan_obv_token (IDL_INIT);
-	TAO_YY_BREAK
-case 34:
-TAO_YY_RULE_SETUP
-#line 152 "fe/idl.ll"
-return scan_obv_token (IDL_PRIVATE);
-	TAO_YY_BREAK
-case 35:
-TAO_YY_RULE_SETUP
-#line 153 "fe/idl.ll"
-return scan_obv_token (IDL_PUBLIC);
-	TAO_YY_BREAK
-case 36:
-TAO_YY_RULE_SETUP
-#line 154 "fe/idl.ll"
-return scan_obv_token (IDL_SUPPORTS);
-	TAO_YY_BREAK
-case 37:
-TAO_YY_RULE_SETUP
-#line 155 "fe/idl.ll"
-return scan_obv_token (IDL_TRUNCATABLE);
-	TAO_YY_BREAK
-case 38:
-TAO_YY_RULE_SETUP
-#line 156 "fe/idl.ll"
-return scan_obv_token (IDL_VALUETYPE);
-	TAO_YY_BREAK
-case 39:
-TAO_YY_RULE_SETUP
-#line 158 "fe/idl.ll"
+#line 134 "fe/idl.ll"
 return IDL_TRUETOK;
 	TAO_YY_BREAK
-case 40:
+case 32:
 TAO_YY_RULE_SETUP
-#line 159 "fe/idl.ll"
+#line 135 "fe/idl.ll"
 return IDL_FALSETOK;
 	TAO_YY_BREAK
-case 41:
+case 33:
 TAO_YY_RULE_SETUP
-#line 161 "fe/idl.ll"
+#line 137 "fe/idl.ll"
 return IDL_INOUT;
 	TAO_YY_BREAK
-case 42:
+case 34:
 TAO_YY_RULE_SETUP
-#line 162 "fe/idl.ll"
+#line 138 "fe/idl.ll"
 return IDL_IN;
 	TAO_YY_BREAK
-case 43:
+case 35:
 TAO_YY_RULE_SETUP
-#line 163 "fe/idl.ll"
+#line 139 "fe/idl.ll"
 return IDL_OUT;
 	TAO_YY_BREAK
-case 44:
+case 36:
 TAO_YY_RULE_SETUP
-#line 164 "fe/idl.ll"
+#line 140 "fe/idl.ll"
 return IDL_ONEWAY;
 	TAO_YY_BREAK
-case 45:
+case 37:
 TAO_YY_RULE_SETUP
-#line 166 "fe/idl.ll"
+#line 142 "fe/idl.ll"
 return IDL_LEFT_SHIFT;
 	TAO_YY_BREAK
-case 46:
+case 38:
 TAO_YY_RULE_SETUP
-#line 167 "fe/idl.ll"
+#line 143 "fe/idl.ll"
 return IDL_RIGHT_SHIFT;
 	TAO_YY_BREAK
-case 47:
+case 39:
 TAO_YY_RULE_SETUP
-#line 168 "fe/idl.ll"
+#line 144 "fe/idl.ll"
 {
 		  tao_yylval.strval = "::";
 		  return IDL_SCOPE_DELIMITOR;
 		}
 	TAO_YY_BREAK
-case 48:
+case 40:
 TAO_YY_RULE_SETUP
-#line 173 "fe/idl.ll"
+#line 149 "fe/idl.ll"
 {
     /* make sure that this identifier is not a C++ keyword. If it is,
        prepend it with a _cxx_. Lookup in the perfect hash table for
@@ -1199,7 +1115,7 @@ TAO_YY_RULE_SETUP
 
     TAO_IDL_CPP_Keyword_Table cpp_key_tbl;
     const TAO_IDL_CPP_Keyword_Entry *entry =
-            cpp_key_tbl.lookup (ace_tao_yytext,
+            cpp_key_tbl.lookup (ace_tao_yytext, 
                                 ACE_OS::strlen (ace_tao_yytext));
     if (entry)
       {
@@ -1212,49 +1128,49 @@ TAO_YY_RULE_SETUP
     return IDENTIFIER;
 }
 	TAO_YY_BREAK
-case 49:
+case 41:
 TAO_YY_RULE_SETUP
-#line 193 "fe/idl.ll"
+#line 169 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	TAO_YY_BREAK
-case 50:
+case 42:
 TAO_YY_RULE_SETUP
-#line 197 "fe/idl.ll"
+#line 173 "fe/idl.ll"
 {
                   tao_yylval.dval = idl_atof(ace_tao_yytext);
                   return IDL_FLOATING_PT_LITERAL;
                 }
 	TAO_YY_BREAK
-case 51:
+case 43:
 TAO_YY_RULE_SETUP
-#line 202 "fe/idl.ll"
+#line 178 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 10);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	TAO_YY_BREAK
-case 52:
+case 44:
 TAO_YY_RULE_SETUP
-#line 206 "fe/idl.ll"
+#line 182 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 16);
 		  return IDL_INTEGER_LITERAL;
 	        }
 	TAO_YY_BREAK
-case 53:
+case 45:
 TAO_YY_RULE_SETUP
-#line 210 "fe/idl.ll"
+#line 186 "fe/idl.ll"
 {
 		  tao_yylval.ival = idl_atoi(ace_tao_yytext, 8);
 		  return IDL_INTEGER_LITERAL;
 	      	}
 	TAO_YY_BREAK
-case 54:
+case 46:
 TAO_YY_RULE_SETUP
-#line 215 "fe/idl.ll"
+#line 191 "fe/idl.ll"
 {
 		  /* Skip the quotes */
 		  char *tmp = ace_tao_yytext;
@@ -1263,95 +1179,95 @@ TAO_YY_RULE_SETUP
 		  return IDL_STRING_LITERAL;
 	      	}
 	TAO_YY_BREAK
-case 55:
+case 47:
 TAO_YY_RULE_SETUP
-#line 222 "fe/idl.ll"
+#line 198 "fe/idl.ll"
 {
 		  tao_yylval.cval = ace_tao_yytext [1];
 		  return IDL_CHARACTER_LITERAL;
 	      	}
 	TAO_YY_BREAK
-case 56:
+case 48:
 TAO_YY_RULE_SETUP
-#line 226 "fe/idl.ll"
+#line 202 "fe/idl.ll"
 {
 		  // octal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	TAO_YY_BREAK
-case 57:
+case 49:
 TAO_YY_RULE_SETUP
-#line 231 "fe/idl.ll"
+#line 207 "fe/idl.ll"
 {
 		  // hexadecimal character constant
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	TAO_YY_BREAK
-case 58:
+case 50:
 TAO_YY_RULE_SETUP
-#line 236 "fe/idl.ll"
+#line 212 "fe/idl.ll"
 {
 		  tao_yylval.cval = idl_escape_reader(ace_tao_yytext + 1);
 		  return IDL_CHARACTER_LITERAL;
 		}
 	TAO_YY_BREAK
-case 59:
+case 51:
 TAO_YY_RULE_SETUP
-#line 240 "fe/idl.ll"
+#line 216 "fe/idl.ll"
 {/* remember pragma */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		  idl_store_pragma(ace_tao_yytext);
 		}
-	break;
-case 60:
+	TAO_YY_BREAK
+case 52:
 TAO_YY_RULE_SETUP
-#line 244 "fe/idl.ll"
+#line 220 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
-	break;
-case 61:
+	TAO_YY_BREAK
+case 53:
 TAO_YY_RULE_SETUP
-#line 247 "fe/idl.ll"
+#line 223 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
-	break;
-case 62:
+	TAO_YY_BREAK
+case 54:
 TAO_YY_RULE_SETUP
-#line 250 "fe/idl.ll"
+#line 226 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 		}
-	break;
-case 63:
+	TAO_YY_BREAK
+case 55:
 TAO_YY_RULE_SETUP
-#line 253 "fe/idl.ll"
+#line 229 "fe/idl.ll"
 {
 		  idl_parse_line_and_file(ace_tao_yytext);
 	        }
-	break;
-case 64:
+	TAO_YY_BREAK
+case 56:
 TAO_YY_RULE_SETUP
-#line 256 "fe/idl.ll"
+#line 232 "fe/idl.ll"
 {
 		  /* ignore cpp ident */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-	break;
-case 65:
+	TAO_YY_BREAK
+case 57:
 TAO_YY_RULE_SETUP
-#line 260 "fe/idl.ll"
+#line 236 "fe/idl.ll"
 {
 		  /* ignore comments */
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-	break;
-case 66:
+	TAO_YY_BREAK
+case 58:
 TAO_YY_RULE_SETUP
-#line 264 "fe/idl.ll"
+#line 240 "fe/idl.ll"
 {
 		  for(;;) {
 		    char c = tao_yyinput();
@@ -1366,29 +1282,29 @@ TAO_YY_RULE_SETUP
 		    }
 	          }
 	        }
-	break;
-case 67:
+	TAO_YY_BREAK
+case 59:
 TAO_YY_RULE_SETUP
-#line 278 "fe/idl.ll"
+#line 254 "fe/idl.ll"
 ;
-	break;
-case 68:
+	TAO_YY_BREAK
+case 60:
 TAO_YY_RULE_SETUP
-#line 279 "fe/idl.ll"
+#line 255 "fe/idl.ll"
 {
   		  idl_global->set_lineno(idl_global->lineno() + 1);
 		}
-	break;
-case 69:
+	TAO_YY_BREAK
+case 61:
 TAO_YY_RULE_SETUP
-#line 282 "fe/idl.ll"
+#line 258 "fe/idl.ll"
 return ace_tao_yytext [0];
 	TAO_YY_BREAK
-case 70:
+case 62:
 TAO_YY_RULE_SETUP
-#line 284 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 TAO_YY_ECHO;
-	break;
+	TAO_YY_BREAK
 case TAO_YY_STATE_EOF(INITIAL):
 	tao_yyterminate();
 
@@ -1681,7 +1597,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 >= 339 )
+			if ( tao_yy_current_state >= 284 )
 				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];
@@ -1716,11 +1632,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 >= 339 )
+		if ( tao_yy_current_state >= 284 )
 			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 == 338);
+	tao_yy_is_jam = (tao_yy_current_state == 283);
 
 	return tao_yy_is_jam ? 0 : tao_yy_current_state;
 	}
@@ -2276,7 +2192,7 @@ int main()
 	return 0;
 	}
 #endif
-#line 284 "fe/idl.ll"
+#line 260 "fe/idl.ll"
 
 	/* subroutines */
 
@@ -2389,7 +2305,7 @@ idl_store_pragma(char *buf)
 	  ++tp; ++sp;
         }
     }
-
+  
   if (ACE_OS::strstr(buf + 8, "import") != 0) {
     idl_global->set_import(I_TRUE);
     return;
@@ -2551,7 +2467,7 @@ idl_escape_reader(
 	    str[i] = save;
 	    return out;
 	}
-	ACE_NOTREACHED (break;)
+	break;
       default:
 	// check for octal value
 	if (str[1] >= '0' && str[1] <= '7') {
@@ -2567,6 +2483,6 @@ idl_escape_reader(
 	} else {
 	  return str[1] - 'a';
 	}
-	ACE_NOTREACHED  (break;)
+	break;
     }
 }
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp.diff b/TAO/TAO_IDL/fe/lex.yy.cpp.diff
deleted file mode 100644
index 062d7890a14..00000000000
--- a/TAO/TAO_IDL/fe/lex.yy.cpp.diff
+++ /dev/null
@@ -1,102 +0,0 @@
---- lex.yy.cpp	Sun May 16 19:42:18 1999
-+++ lex.yy.cpp.new	Sun May 16 19:40:55 1999
-@@ -850,7 +850,7 @@
- 
- /* Code executed at the end of each rule. */
- #ifndef TAO_YY_BREAK
--#define TAO_YY_BREAK break;
-+#define TAO_YY_BREAK ACE_NOTREACHED (break;)
- #endif
- 
- #define TAO_YY_RULE_SETUP \
-@@ -1304,35 +1304,35 @@
-   		  idl_global->set_lineno(idl_global->lineno() + 1);
- 		  idl_store_pragma(ace_tao_yytext);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 60:
- TAO_YY_RULE_SETUP
- #line 244 "fe/idl.ll"
- {
- 		  idl_parse_line_and_file(ace_tao_yytext);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 61:
- TAO_YY_RULE_SETUP
- #line 247 "fe/idl.ll"
- {
- 		  idl_parse_line_and_file(ace_tao_yytext);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 62:
- TAO_YY_RULE_SETUP
- #line 250 "fe/idl.ll"
- {
- 		  idl_parse_line_and_file(ace_tao_yytext);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 63:
- TAO_YY_RULE_SETUP
- #line 253 "fe/idl.ll"
- {
- 		  idl_parse_line_and_file(ace_tao_yytext);
- 	        }
--	TAO_YY_BREAK
-+	break;
- case 64:
- TAO_YY_RULE_SETUP
- #line 256 "fe/idl.ll"
-@@ -1340,7 +1340,7 @@
- 		  /* ignore cpp ident */
-   		  idl_global->set_lineno(idl_global->lineno() + 1);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 65:
- TAO_YY_RULE_SETUP
- #line 260 "fe/idl.ll"
-@@ -1348,7 +1348,7 @@
- 		  /* ignore comments */
-   		  idl_global->set_lineno(idl_global->lineno() + 1);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 66:
- TAO_YY_RULE_SETUP
- #line 264 "fe/idl.ll"
-@@ -1366,19 +1366,19 @@
- 		    }
- 	          }
- 	        }
--	TAO_YY_BREAK
-+	break;
- case 67:
- TAO_YY_RULE_SETUP
- #line 278 "fe/idl.ll"
- ;
--	TAO_YY_BREAK
-+	break;
- case 68:
- TAO_YY_RULE_SETUP
- #line 279 "fe/idl.ll"
- {
-   		  idl_global->set_lineno(idl_global->lineno() + 1);
- 		}
--	TAO_YY_BREAK
-+	break;
- case 69:
- TAO_YY_RULE_SETUP
- #line 282 "fe/idl.ll"
-@@ -1388,7 +1388,7 @@
- TAO_YY_RULE_SETUP
- #line 284 "fe/idl.ll"
- TAO_YY_ECHO;
--	TAO_YY_BREAK
-+	break;
- case TAO_YY_STATE_EOF(INITIAL):
- 	tao_yyterminate();
- 
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index 9272762ed31..2526d7b54b8 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -1,17 +1,13 @@
 // $Id$
-#ifndef lint
-char tao_yysccsid[] = "@(#)yaccpar      1.4 (Berkeley) 02/25/90 \n\
- Modified 5/2/90 by J. Roskind to support graphic debugging modes";
-#endif
-#line 74 "fe/idl.tao_yy"
+# line 74 "fe/idl.tao_yy"
 #include "idl.h"
 #include "idl_extern.h"
 #include "fe_private.h"
 #include <stdio.h>
 
 #if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
-extern  "C" int tao_yywrap();
-#endif  /* (defined(apollo) || defined(hpux)) && defined(__cplusplus)*/
+extern	"C" int tao_yywrap();
+#endif	// (defined(apollo) || defined(hpux)) && defined(__cplusplus)
 
 void tao_yyerror (const char *);
 int tao_yylex (void);
@@ -19,897 +15,133 @@ extern "C" int tao_yywrap (void);
 extern char tao_yytext[];
 extern int tao_yyleng;
 #define TAO_YYDEBUG_LEXER_TEXT (tao_yytext[tao_yyleng] = '\0', tao_yytext)
-/* Force the pretty debugging code to compile.*/
+// Force the pretty debugging code to compile.
 #define TAO_YYDEBUG 1
-#line 97 "fe/idl.tao_yy"
-typedef union {
-  AST_Decl              *dcval;         /* Decl value           */
-  UTL_StrList           *slval;         /* String list          */
-  UTL_NameList          *nlval;         /* Name list            */
-  UTL_ExprList          *elval;         /* Expression list      */
-  UTL_LabelList         *llval;         /* Label list           */
-  UTL_DeclList          *dlval;         /* Declaration list     */
-  FE_InterfaceHeader    *ihval;         /* Interface header     */
-  FE_obv_header         *vhval;         /* Valuetype header     */
-  AST_Expression        *exval;         /* Expression value     */
-  AST_UnionLabel        *ulval;         /* Union label          */
-  AST_Field             *ffval;         /* Field value          */
-  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
-  AST_Expression::ExprType etval;       /* Expression type      */
-  AST_Argument::Direction dival;        /* Argument direction   */
-  AST_Operation::Flags  ofval;          /* Operation flags      */
-  FE_Declarator         *deval;         /* Declarator value     */
-  idl_bool              bval;           /* Boolean value        */
-  long                  ival;           /* Long value           */
-  double                dval;           /* Double value         */
-  float                 fval;           /* Float value          */
-  char                  cval;           /* Char value           */
-
-  String                *sval;          /* String value         */
-  char                  *strval;        /* char * value         */
-  Identifier            *idval;         /* Identifier           */
-  UTL_IdList            *idlist;        /* Identifier list      */
+
+# line 97 "fe/idl.tao_yy"
+typedef union
+#ifdef __cplusplus
+	TAO_YYSTYPE
+#endif
+ {
+  AST_Decl		*dcval;		/* Decl value		*/
+  UTL_StrList		*slval;		/* String list		*/
+  UTL_NameList		*nlval;		/* Name list		*/
+  UTL_ExprList		*elval;		/* Expression list	*/
+  UTL_LabelList		*llval;		/* Label list		*/
+  UTL_DeclList		*dlval;		/* Declaration list	*/
+  FE_InterfaceHeader	*ihval;		/* Interface header	*/
+  AST_Expression	*exval;		/* Expression value	*/
+  AST_UnionLabel	*ulval;		/* Union label		*/
+  AST_Field		*ffval;		/* Field value		*/
+  AST_Expression::ExprType etval;	/* Expression type	*/
+  AST_Argument::Direction dival;	/* Argument direction	*/
+  AST_Operation::Flags	ofval;		/* Operation flags	*/
+  FE_Declarator		*deval;		/* Declarator value	*/
+  idl_bool		bval;		/* Boolean value	*/
+  long			ival;		/* Long value		*/
+  double		dval;		/* Double value		*/
+  float			fval;		/* Float value		*/
+  char			cval;		/* Char value		*/
+
+  String		*sval;		/* String value		*/
+  char			*strval;	/* char * value		*/
+  Identifier		*idval;		/* Identifier		*/
+  UTL_IdList		*idlist;	/* Identifier list	*/
 } TAO_YYSTYPE;
-#line 53 "y.tab.cpp"
-#define IDENTIFIER 257
-#define IDL_CONST 258
-#define IDL_MODULE 259
-#define IDL_INTERFACE 260
-#define IDL_TYPEDEF 261
-#define IDL_LONG 262
-#define IDL_SHORT 263
-#define IDL_UNSIGNED 264
-#define IDL_DOUBLE 265
-#define IDL_FLOAT 266
-#define IDL_CHAR 267
-#define IDL_WCHAR 268
-#define IDL_OCTET 269
-#define IDL_BOOLEAN 270
-#define IDL_ANY 271
-#define IDL_STRUCT 272
-#define IDL_UNION 273
-#define IDL_SWITCH 274
-#define IDL_ENUM 275
-#define IDL_SEQUENCE 276
-#define IDL_STRING 277
-#define IDL_WSTRING 278
-#define IDL_EXCEPTION 279
-#define IDL_CASE 280
-#define IDL_DEFAULT 281
-#define IDL_READONLY 282
-#define IDL_ATTRIBUTE 283
-#define IDL_ONEWAY 284
-#define IDL_IDEMPOTENT 285
-#define IDL_VOID 286
-#define IDL_IN 287
-#define IDL_OUT 288
-#define IDL_INOUT 289
-#define IDL_RAISES 290
-#define IDL_CONTEXT 291
-#define IDL_NATIVE 292
-#define IDL_ABSTRACT 293
-#define IDL_CUSTOM 294
-#define IDL_INIT 295
-#define IDL_PRIVATE 296
-#define IDL_PUBLIC 297
-#define IDL_SUPPORTS 298
-#define IDL_TRUNCATABLE 299
-#define IDL_VALUETYPE 300
-#define IDL_INTEGER_LITERAL 301
-#define IDL_STRING_LITERAL 302
-#define IDL_CHARACTER_LITERAL 303
-#define IDL_FLOATING_PT_LITERAL 304
-#define IDL_TRUETOK 305
-#define IDL_FALSETOK 306
-#define IDL_SCOPE_DELIMITOR 307
-#define IDL_LEFT_SHIFT 308
-#define IDL_RIGHT_SHIFT 309
-#define TAO_YYERRCODE 256
-short tao_yylhs[] = {                                        -1,
-    0,   71,   71,   73,   72,   75,   72,   77,   72,   79,
-   72,   81,   72,   83,   72,   84,   72,   85,   86,   87,
-   88,   80,   78,   78,   91,   93,   94,   89,   95,   67,
-   33,   96,   22,   22,   82,   82,   82,   82,   97,   97,
-  102,  104,  105,  101,  106,  107,  108,   98,   34,  109,
-   68,   66,   66,   24,   24,   99,   99,  100,  103,  103,
-  110,  110,  110,  115,  111,  116,  111,   92,   92,  117,
-  112,  118,  112,  119,  112,  121,  112,  123,  112,  124,
-  112,   20,  125,   21,   21,   16,  126,   16,  127,   16,
-   69,   90,  128,  129,  130,  131,   74,   50,   50,   50,
-   50,   50,   50,   50,   50,   35,   36,   37,   37,   38,
-   38,   39,   39,   40,   40,   40,   41,   41,   41,   42,
-   42,   42,   42,   43,   43,   43,   43,   44,   44,   44,
-   45,   45,   45,   45,   45,   45,   46,  133,   70,   70,
-   70,   70,   70,  134,  132,    1,    1,    2,    2,    2,
-   58,   58,   58,   58,   58,   58,    4,    4,    4,    3,
-    3,    3,   29,  135,   30,   30,   62,   62,   31,  136,
-   32,   32,   63,   64,   51,   51,   56,   56,   56,   57,
-   57,   57,   54,   54,   54,   52,   52,   59,   53,   55,
-  137,  138,  140,  141,    7,  139,  143,  143,  144,  142,
-  145,  146,  114,  147,  114,  148,  149,  150,  151,  152,
-  153,  155,  156,   10,    9,    9,    9,    9,    9,    9,
-  154,  158,  158,  159,  160,  157,  161,  157,   27,   28,
-   28,  162,   48,  163,  164,   48,  165,   49,  166,  167,
-  169,  170,    8,  168,  173,  172,  172,  171,  174,  175,
-    5,    5,  176,  177,   13,  179,  180,    6,    6,  178,
-  182,  183,   14,   14,  181,  184,   11,   25,   26,   26,
-  185,  186,   47,  187,  188,  120,   65,   65,  189,  190,
-  191,  192,   76,  193,  195,  196,  197,  122,   61,   61,
-   61,   12,   12,  113,  198,  194,  200,  194,  199,  203,
-  202,  202,  204,  205,  201,   15,   15,   15,   60,   60,
-   60,  206,  207,   23,   23,  208,  209,   17,   17,   18,
-  210,   19,   19,
-};
-short tao_yylen[] = {                                         2,
-    1,    2,    0,    0,    3,    0,    3,    0,    3,    0,
-    3,    0,    3,    0,    3,    0,    3,    0,    0,    0,
-    0,    9,    1,    1,    0,    0,    0,    7,    0,    3,
-    2,    0,    3,    0,    1,    1,    1,    1,    2,    1,
-    0,    0,    0,    7,    0,    0,    0,    8,    4,    0,
-    3,    1,    0,    2,    0,    2,    1,    2,    2,    0,
-    1,    1,    1,    0,    3,    0,    3,    2,    0,    0,
-    3,    0,    3,    0,    3,    0,    3,    0,    3,    0,
-    3,    2,    0,    4,    0,    1,    0,    3,    0,    4,
-    1,    1,    0,    0,    0,    0,    9,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    3,    1,
-    3,    1,    3,    1,    3,    3,    1,    3,    3,    1,
-    3,    3,    3,    1,    2,    2,    2,    1,    1,    3,
-    1,    1,    1,    1,    1,    1,    1,    0,    3,    1,
-    1,    1,    2,    0,    3,    1,    1,    1,    1,    1,
-    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-    1,    1,    2,    0,    4,    0,    1,    1,    2,    0,
-    4,    0,    1,    1,    1,    1,    1,    2,    1,    2,
-    3,    2,    1,    1,    2,    1,    1,    1,    1,    1,
-    0,    0,    0,    0,    9,    2,    2,    0,    0,    2,
-    0,    0,    5,    0,    3,    0,    0,    0,    0,    0,
-    0,    0,    0,   17,    1,    1,    1,    1,    1,    1,
-    2,    2,    0,    0,    0,    5,    0,    3,    2,    2,
-    0,    0,    3,    0,    0,    5,    0,    3,    0,    0,
-    0,    0,    9,    2,    0,    4,    0,    1,    0,    0,
-    6,    2,    0,    0,    5,    0,    0,    6,    1,    1,
-    0,    0,    6,    1,    1,    0,    3,    2,    2,    0,
-    0,    0,    5,    0,    0,    6,    1,    0,    0,    0,
-    0,    0,    9,    0,    0,    0,    0,   10,    1,    1,
-    0,    1,    1,    1,    0,    3,    0,    4,    2,    0,
-    4,    0,    0,    0,    5,    1,    1,    1,    1,    1,
-    1,    0,    0,    6,    0,    0,    0,    6,    0,    2,
-    0,    4,    0,
-};
-short tao_yydefred[] = {                                      0,
-   16,   93,   18,   29,  138,  191,  206,  239,  279,    0,
-    0,    0,   50,    0,  140,  142,  141,   25,   41,    0,
-    0,    4,    1,    0,    6,    8,   10,   12,   14,   23,
-   24,   35,   36,   37,   38,   40,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,   91,  143,  173,   45,    0,
-    0,   39,    0,    0,    0,   32,   31,    0,  179,    0,
-  183,  184,  186,  187,  188,  189,  190,  253,  260,  265,
-   52,   87,   58,  146,  147,  149,  157,  158,  160,  162,
-  161,    0,  159,    0,  151,  153,  154,  152,  156,  175,
-  176,  148,  155,    0,   86,    0,    0,    0,    2,    0,
-    0,    0,    0,    0,   17,  103,  104,    0,   94,   98,
-   99,  101,  102,  100,   19,   30,  144,  139,  192,  207,
-  240,  280,    0,   51,   26,   42,    0,  178,  185,    0,
-  182,    0,    0,  249,  252,   89,    0,  256,  261,    5,
-    7,    9,   11,   13,   15,    0,    0,    0,    0,    0,
-    0,    0,   46,   69,   60,    0,   33,  181,  254,   88,
-    0,    0,    0,   49,    0,    0,   95,   20,  174,  145,
-  166,  167,  168,    0,  193,  208,  241,  281,   69,    0,
-    0,    0,    0,  131,  132,  133,  134,  135,  136,    0,
-    0,    0,    0,    0,  137,    0,    0,    0,    0,    0,
-    0,  120,  124,  129,  250,   90,    0,  257,  262,    0,
-    0,    0,    0,  199,    0,    0,  198,    0,   80,  277,
-  289,  290,    0,    0,   70,   72,   74,    0,   68,   76,
-   78,  294,   66,   64,    0,   59,   61,   62,   63,   83,
-  255,  125,  126,  127,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,   96,   21,
-  164,  271,  267,  270,  194,  198,    0,  209,  248,  242,
-  247,    0,    0,    0,  293,  307,  284,  292,    0,  306,
-  274,    0,    0,    0,   28,    0,    0,    0,    0,   44,
-    0,  130,    0,    0,    0,    0,    0,    0,    0,  121,
-  122,  123,  251,  258,  263,    0,    0,    0,    0,    0,
-    0,    0,  204,  201,  200,    0,    0,    0,  197,    0,
-   48,   81,    0,    0,   71,   73,   75,   77,   79,   67,
-   65,    0,   97,  106,   22,  165,  272,  269,  195,    0,
-    0,    0,  219,  210,    0,  215,  216,  218,  217,  243,
-  245,  283,  285,  275,    0,  205,  202,    0,    0,    0,
-    0,  273,    0,  211,  246,    0,  286,  276,  172,  203,
-    0,    0,    0,    0,    0,  212,  296,  309,  310,  311,
-  303,    0,  302,  312,  287,  170,    0,    0,  298,    0,
-    0,    0,    0,  227,  234,  232,  224,  231,  213,  223,
-  304,  300,  313,  316,  288,  171,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  228,  235,  233,
-  237,  225,  230,  214,  222,  305,  301,    0,  317,    0,
-    0,    0,  314,    0,  236,  238,  226,  323,    0,    0,
-  318,  321,    0,  322,
-};
-short tao_yydgoto[] = {                                      14,
-  314,   74,   75,   76,   77,   78,   15,   16,  344,   17,
-  169,  277,   82,   83,  278,  194,  405,  439,  440,  157,
-  182,   57,  385,  164,  263,  310,  397,  411,  170,  212,
-  368,  375,   18,   19,  333,  195,  196,  197,  198,  199,
-  200,  201,  202,  203,  204,  205,  264,  398,  422,  109,
-   85,   86,   87,   88,   89,   90,   91,   92,   93,  381,
-  223,  171,  172,  173,  224,   94,   20,   21,   95,   22,
-   23,   24,   98,   25,  100,   26,  101,   27,  102,   28,
-  103,   29,  104,   37,   39,  147,  211,  307,   30,   31,
-   54,  180,  154,  228,   40,  127,   32,   33,   34,   35,
-   36,   55,  181,  155,  235,  123,  179,  273,   53,  236,
-  237,  229,  239,  315,  289,  288,  282,  283,  284,  230,
-  286,  231,  287,  274,  291,  133,  162,   38,  146,  210,
-  306,  118,   41,  148,  308,  393,   42,  149,  265,  214,
-  311,  319,  272,  267,  341,  363,  340,   43,  150,  215,
-  316,  358,  371,  399,  387,  412,  400,  413,  410,  432,
-  407,  409,  408,  430,  431,   44,  151,  270,  216,  317,
-  271,  318,  359,  161,  256,  132,  183,   96,  165,  257,
-   97,  166,  258,  213,  309,  355,  324,  361,   45,  152,
-  217,  320,  323,  367,  360,  374,  392,  372,  382,  373,
-  383,  390,  415,  388,  414,  391,  416,  417,  434,  443,
-};
-short tao_yysindex[] = {                                    493,
-    0,    0,    0,    0,    0,    0,    0,    0,    0, -234,
- -269, -269,    0,    0,    0,    0,    0,    0,    0,   -3,
-  312,    0,    0,  493,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,   17,  440, -198, -234,
-  358, -234, -234, -234, -234,    0,    0,    0,    0, -208,
- -208,    0, -234,  -21,    5,    0,    0,  -92,    0, -154,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,   69,    0, -191,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   -3,    0,   74,   81,   88,    0,  123,
-  128,  135,  150,  157,    0,    0,    0, -191,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  101,    0,    0,    0, -215,    0,    0,   -6,
-    0,  182, -234,    0,    0,    0,  -52,    0,    0,    0,
-    0,    0,    0,    0,    0, -234,  129, -234,  144,   29,
-  156,  195,    0,    0,    0, -191,    0,    0,    0,    0,
-   72, -234, -215,    0,   72,   72,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  547,
-  517,  246,  392,    0,    0,    0,    0,    0,    0,   20,
-   20,   20,   72, -191,    0,  181,  234,  292, -119,   43,
-  196,    0,    0,    0,    0,    0, -191,    0,    0,  274,
-  493,  293,  245,    0,  298,   82,    0,  547,    0,    0,
-    0,    0,  409,   57,    0,    0,    0,  217,    0,    0,
-    0,    0,    0,    0,  218,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  305,   72,   72,   72,   72,   72,
-   72,   72,   72,   72,   72,  285,  286,  288,    0,    0,
-    0,    0,    0,    0,    0,    0,  287,    0,    0,    0,
-    0,    0,  224,  294,    0,    0,    0,    0, -191,    0,
-    0,  296,  299,  300,    0,  303,  306,  287,  287,    0,
- -215,    0,  234,  292, -119,   43,   43,  196,  196,    0,
-    0,    0,    0,    0,    0,   72,  227, -234,   72,  245,
-  241,    0,    0,    0,    0,  473,  242,  325,    0,  255,
-    0,    0,  124,  457,    0,    0,    0,    0,    0,    0,
-    0, -191,    0,    0,    0,    0,    0,    0,    0,  323,
- -234,  125,    0,    0, -191,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,  295,    0,    0,  344,   82,  349,
- -234,    0,  333,    0,    0,    0,    0,    0,    0,    0,
-  270,  354,  -67,  108,  355,    0,    0,    0,    0,    0,
-    0,  359,    0,    0,    0,    0, -155,  457,    0,  357,
-  362,  112, -234,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  347,   72,  351,  358,
-  -84,  289, -155, -234,  -67, -215,  370,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  371,    0,  353,
- -234,  356,    0,  111,    0,    0,    0,    0,  378,  372,
-    0,    0,  118,    0,
-};
-short tao_yyrindex[] = {                                    422,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   16,
-  -45,    0,    0,   39,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   -1,
-  -43,    0,    0,    0,    0,    0,    0,    9,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  106,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  -94,    0,  107,  115,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,  178,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,   23,
-    0,    0,    0,    0,    0,    0,  319,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -24,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,  158,    0,    0,    0,    0,    0,  207,
-  232,   10,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    3,    0,  248,  126,  113,  167,   25,
-   11,    0,    0,    0,    0,    0,  320,    0,    0,    0,
-  338,  385,    0,    0,    0,    0,    0,  259,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  161,    0,    0,    0,    0,    0,    0,  188,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,  177,  121,  479,   52,   62,   36,   99,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  258,
-    0,  184,    0,    0,    0,    0,    0,  340,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  -17,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  417,    0,    0,  425,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,  -30,    0,    0,    0,    0,
-    0,    0,    0,  -47,  408,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  438,
-    0,  421,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  375,    0,  360,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,  441,
-    0,    0,    0,    0,
-};
-short tao_yygindex[] = {                                      0,
-  -19,  304,    0,    0,    0,  -32,  -13,  -16,    0,   -5,
-    0,    0,    0,  443, -235,  -20,    0,    0,    0,   67,
-    0,  394,    0,    0,    0,    0,    0,    0,  145,    0,
-    0,    0,    0,  481,    0, -174,    0,  260,  257,  262,
-  -49,   12,  -23,  103,    0, -128,  197,   94,    0,    0,
-  -34,  -31,  -29,  470,    0,    0,    0, -176,  -28,    0,
-    0, -236,   -7,    0,    0,    0,    0,  302,  -10,   30,
-    2,    0,    0,   47,    0,   60,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  332,    0,    0,    0,    0,    0,    0,    0,    0,
-  500,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  350,    0,   27,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,  318,  247,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,  120,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  160,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-  119,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-};
-#define TAO_YYTABLESIZE 839
-short tao_yytable[] = {                                      48,
-   84,   73,   47,  110,   80,  106,  111,   79,  112,  114,
-  295,  315,   53,   57,   53,   81,   85,  108,  245,   85,
-   84,  117,   46,   84,   80,   99,   84,   79,   34,  116,
-   13,  119,  120,  121,  122,   81,  208,  209,    3,  128,
-  128,   46,  124,  128,  128,  128,  280,  128,  117,  128,
-   82,  117,  177,  117,   56,  117,   53,   56,  115,  193,
-  128,  128,  114,  180,  128,  114,  180,  177,  117,  117,
-  177,  336,  117,  118,   92,  105,  118,   53,  118,   53,
-  118,  180,  114,  114,  180,  251,  114,  252,  354,  115,
-   71,   72,  115,  118,  118,  128,  128,  118,   85,  116,
-  394,  125,  116,  117,  117,   84,  156,  130,  131,  115,
-  115,  193,  134,  115,  190,  136,  191,  114,  114,  116,
-  116,   53,  160,  116,  395,  396,  128,  126,  118,  118,
-  135,  334,   82,  138,  117,  167,  119,  174,   34,  119,
-  139,  119,  207,  119,  115,  115,  140,  280,  114,  150,
-  259,  206,  401,  110,  116,  116,  119,  119,  264,  118,
-  119,  111,   84,    3,  150,  259,  108,  150,  259,  128,
-  110,  110,  129,  264,  110,  115,  264,  426,  111,  111,
-  337,  141,  111,  108,  108,  116,  142,  108,  249,  250,
-  276,  119,  119,  143,  436,  395,  396,  192,  173,  296,
-  297,  173,  279,   34,  112,  110,  110,  112,  144,  225,
-  225,  280,  260,  111,  111,  145,  173,  109,  108,  378,
-  379,  380,  119,  153,  112,  112,  226,  226,  112,  300,
-  301,  302,  255,  419,  109,  109,  110,  253,  109,  227,
-  227,  159,  254,  315,  111,  163,   84,  225,  266,  108,
-   80,  168,   53,   79,   53,  158,  297,  297,  297,  112,
-  112,   81,  298,  299,  226,  177,  175,   84,   84,  109,
-  332,   80,   80,   85,   79,   79,   46,  227,  177,  180,
-   84,  346,   81,   81,  347,  282,  348,  349,  107,  240,
-  112,  276,  242,  243,  244,  345,   53,  174,  268,  343,
-  109,  268,  176,  279,  246,  107,  107,   82,  196,  107,
-  128,  128,   50,   51,  330,  331,  268,  178,  117,  117,
-  184,  185,  186,  187,  188,  189,   72,  247,   46,  248,
-  174,   27,  114,  114,  259,  262,  261,  268,  269,  281,
-  107,  285,  290,  118,  118,  292,  303,  304,  321,  305,
-   48,  335,  322,  369,  325,  276,   43,  326,  327,  115,
-  115,  328,  150,  259,  329,  339,  350,  279,  351,  116,
-  116,  264,  184,  185,  186,  187,  188,  189,   72,  352,
-  353,  356,   48,   47,  364,  406,  128,  362,  366,   84,
-  421,  370,  376,   80,  377,  156,   79,  384,  386,  389,
-  402,  403,  404,  174,   81,  418,  119,  119,  420,  429,
-  435,  433,  438,  424,  437,  442,  199,  199,  441,  444,
-  174,    3,  199,  199,  199,  199,  199,  199,  199,  199,
-  199,  199,  199,  199,  105,  199,  199,  199,  199,  199,
-  199,   55,   54,  163,  308,  199,  199,  199,  199,  199,
-  199,  199,  199,  199,  199,  199,  199,  177,  199,  199,
-  199,  199,    3,  291,  244,  220,  169,  199,  291,  291,
-  291,  291,  291,  291,  291,  291,  291,  291,  299,  319,
-  107,  320,  428,  291,  221,  357,  241,  137,  291,  278,
-  199,   49,  291,  291,  291,  291,  291,  291,  291,  291,
-  291,  291,  291,  294,  423,  293,  338,  113,  291,  295,
-  218,   52,  312,  291,  278,  291,  113,  291,  365,  113,
-  291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
-  238,  266,  425,  427,    0,  291,  113,  113,  291,    0,
-  113,  278,  313,   46,  291,    0,    0,    0,   58,   59,
-   60,   61,   62,   63,   64,   65,   66,   67,    6,    7,
-    0,    8,   68,   69,   70,  291,    0,    0,   46,    0,
-    0,  113,  113,   58,   59,   60,   61,   62,   63,   64,
-   65,   66,   67,    6,    7,    0,    8,   68,   69,   70,
-    0,    0,    0,   72,    0,    0,    0,    0,    0,    0,
-    0,    0,  113,    0,    0,    0,    0,    0,    0,    0,
-   71,    0,    0,    0,   46,    0,    0,    0,   72,   58,
-   59,   60,   61,   62,   63,   64,   65,   66,   67,    6,
-    7,  229,    8,   68,   69,   70,  229,  229,  229,  229,
-  229,  229,  229,  229,  229,  229,  229,  229,   46,  229,
-  229,  229,  229,   58,   59,   60,   61,   62,   63,   64,
-   65,   66,   67,    0,   72,   46,    0,   68,   69,   70,
-   58,   59,   60,   61,   62,   63,   64,   65,   66,   67,
-    0,  229,    0,    0,    0,   69,    0,    0,    0,    0,
-    0,    0,    0,    0,  275,    0,   46,    0,   72,    0,
-    0,   58,   59,   60,   61,   62,   63,   64,   65,   66,
-    0,    0,    0,   46,    0,   72,   69,   70,   58,   59,
-   60,   61,   62,   63,   64,   65,   66,   67,    0,   46,
-    0,    0,    0,   69,  342,   59,   60,    0,    0,   63,
-   64,   65,   66,    0,    0,    0,   72,    8,    1,    0,
-    2,    3,    4,    5,    0,    0,    0,    0,    0,    0,
-    0,    0,    0,   72,    6,    7,    0,    8,    0,    0,
-    0,    9,  219,    0,    2,    0,    0,    5,    0,   72,
-    0,    0,    0,    0,   10,   11,   12,    0,    6,    7,
-    0,    8,   13,    0,    0,    9,    0,    0,  220,    0,
-  221,  222,  219,    0,    2,    0,    0,    5,   10,    0,
-    0,  232,  233,  234,    0,    0,    0,    0,    6,    7,
-    0,    8,    0,    0,    0,    9,    0,    0,  220,    0,
-  221,  222,    0,    0,    0,    0,    0,    0,   10,
-};
-short tao_yycheck[] = {                                      10,
-   21,   21,   10,   38,   21,   38,   38,   21,   38,   38,
-   41,   59,   58,   59,   58,   21,   41,   38,  193,   44,
-   41,   41,  257,   41,   41,   24,   44,   41,  123,   40,
-  300,   42,   43,   44,   45,   41,  165,  166,    0,   37,
-   38,  257,   53,   41,   42,   43,  223,   45,   38,   47,
-   41,   41,   44,   43,   58,   45,   58,   59,  257,   40,
-   58,   59,   38,   41,   62,   41,   44,   59,   58,   59,
-   62,  308,   62,   38,   59,   59,   41,  123,   43,  123,
-   45,   59,   58,   59,   62,   43,   62,   45,  324,   38,
-  299,  307,   41,   58,   59,   93,   94,   62,  123,   38,
-  256,  123,   41,   93,   94,  123,  127,  262,  263,   58,
-   59,   40,   44,   62,   43,  307,   45,   93,   94,   58,
-   59,  123,  133,   62,  280,  281,  124,  123,   93,   94,
-   62,  306,  123,   60,  124,  146,   38,  148,  123,   41,
-   60,   43,  163,   45,   93,   94,   59,  324,  124,   44,
-   44,  162,  388,   41,   93,   94,   58,   59,   44,  124,
-   62,   41,  183,  125,   59,   59,   41,   62,   62,  262,
-   58,   59,  265,   59,   62,  124,   62,  414,   58,   59,
-  309,   59,   62,   58,   59,  124,   59,   62,  308,  309,
-  223,   93,   94,   59,  431,  280,  281,  126,   41,  249,
-  250,   44,  223,  298,   38,   93,   94,   41,   59,  180,
-  181,  388,  211,   93,   94,   59,   59,   41,   93,  287,
-  288,  289,  124,  123,   58,   59,  180,  181,   62,  253,
-  254,  255,   37,  408,   58,   59,  124,   42,   62,  180,
-  181,   60,   47,  291,  124,  298,  267,  218,   91,  124,
-  267,  123,  298,  267,  298,  262,  287,  288,  289,   93,
-   94,  267,  251,  252,  218,  257,  123,  288,  289,   93,
-  291,  288,  289,  298,  288,  289,  257,  218,  123,  257,
-  298,  316,  288,  289,  316,  125,  316,  316,   41,   44,
-  124,  324,  190,  191,  192,  316,  298,  308,   41,  316,
-  124,   44,  274,  324,  124,   58,   59,  298,  125,   62,
-  308,  309,   11,   12,  288,  289,   59,  123,  308,  309,
-  301,  302,  303,  304,  305,  306,  307,   94,  257,   38,
-  341,  125,  308,  309,   61,   91,   44,   40,  257,  283,
-   93,  125,  125,  308,  309,   41,   62,   62,  125,   62,
-  361,  125,   59,  361,   59,  388,  125,   59,   59,  308,
-  309,   59,  257,  257,   59,  125,  125,  388,   44,  308,
-  309,  257,  301,  302,  303,  304,  305,  306,  307,  125,
-  257,   59,  393,  125,   41,  393,  262,   93,   40,  410,
-  410,   59,  123,  410,   41,  416,  410,  290,   44,   41,
-   44,   40,  291,  414,  410,   59,  308,  309,   58,   40,
-   58,   41,  302,  125,   59,   44,  256,  257,   41,  302,
-  431,    0,  262,  263,  264,  265,  266,  267,  268,  269,
-  270,  271,  272,  273,  257,  275,  276,  277,  278,  256,
-  257,  123,  123,   59,  257,  262,  263,  264,  265,  266,
-  267,  268,  269,  270,  271,  272,  273,   41,  275,  276,
-  277,  278,  125,  257,  125,   41,   59,  307,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,   41,   59,
-   38,   41,  416,  277,  125,  341,  183,   94,  257,  283,
-  307,   11,  286,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  247,  411,  246,  310,   38,  277,  248,
-  179,   12,  266,  307,  283,  257,   38,  286,  359,   41,
-  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-  181,  214,  413,  415,   -1,  277,   58,   59,  307,   -1,
-   62,  283,  256,  257,  286,   -1,   -1,   -1,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,  272,  273,
-   -1,  275,  276,  277,  278,  307,   -1,   -1,  257,   -1,
-   -1,   93,   94,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,  272,  273,   -1,  275,  276,  277,  278,
-   -1,   -1,   -1,  307,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,  124,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-  299,   -1,   -1,   -1,  257,   -1,   -1,   -1,  307,  262,
-  263,  264,  265,  266,  267,  268,  269,  270,  271,  272,
-  273,  257,  275,  276,  277,  278,  262,  263,  264,  265,
-  266,  267,  268,  269,  270,  271,  272,  273,  257,  275,
-  276,  277,  278,  262,  263,  264,  265,  266,  267,  268,
-  269,  270,  271,   -1,  307,  257,   -1,  276,  277,  278,
-  262,  263,  264,  265,  266,  267,  268,  269,  270,  271,
-   -1,  307,   -1,   -1,   -1,  277,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,   -1,  286,   -1,  257,   -1,  307,   -1,
-   -1,  262,  263,  264,  265,  266,  267,  268,  269,  270,
-   -1,   -1,   -1,  257,   -1,  307,  277,  278,  262,  263,
-  264,  265,  266,  267,  268,  269,  270,  271,   -1,  257,
-   -1,   -1,   -1,  277,  262,  263,  264,   -1,   -1,  267,
-  268,  269,  270,   -1,   -1,   -1,  307,  275,  256,   -1,
-  258,  259,  260,  261,   -1,   -1,   -1,   -1,   -1,   -1,
-   -1,   -1,   -1,  307,  272,  273,   -1,  275,   -1,   -1,
-   -1,  279,  256,   -1,  258,   -1,   -1,  261,   -1,  307,
-   -1,   -1,   -1,   -1,  292,  293,  294,   -1,  272,  273,
-   -1,  275,  300,   -1,   -1,  279,   -1,   -1,  282,   -1,
-  284,  285,  256,   -1,  258,   -1,   -1,  261,  292,   -1,
-   -1,  295,  296,  297,   -1,   -1,   -1,   -1,  272,  273,
-   -1,  275,   -1,   -1,   -1,  279,   -1,   -1,  282,   -1,
-  284,  285,   -1,   -1,   -1,   -1,   -1,   -1,  292,
-};
-#define TAO_YYFINAL 14
-#ifndef TAO_YYDEBUG
-#define TAO_YYDEBUG 0
+# define IDENTIFIER 257
+# define IDL_CONST 258
+# define IDL_MODULE 259
+# define IDL_INTERFACE 260
+# define IDL_TYPEDEF 261
+# define IDL_LONG 262
+# define IDL_SHORT 263
+# define IDL_UNSIGNED 264
+# define IDL_DOUBLE 265
+# define IDL_FLOAT 266
+# define IDL_CHAR 267
+# define IDL_WCHAR 268
+# define IDL_OCTET 269
+# define IDL_BOOLEAN 270
+# define IDL_ANY 271
+# define IDL_STRUCT 272
+# define IDL_UNION 273
+# define IDL_SWITCH 274
+# define IDL_ENUM 275
+# define IDL_SEQUENCE 276
+# define IDL_STRING 277
+# define IDL_WSTRING 278
+# define IDL_EXCEPTION 279
+# define IDL_CASE 280
+# define IDL_DEFAULT 281
+# define IDL_READONLY 282
+# define IDL_ATTRIBUTE 283
+# define IDL_ONEWAY 284
+# define IDL_IDEMPOTENT 285
+# define IDL_VOID 286
+# define IDL_IN 287
+# define IDL_OUT 288
+# define IDL_INOUT 289
+# define IDL_RAISES 290
+# define IDL_CONTEXT 291
+# define IDL_NATIVE 292
+# define IDL_INTEGER_LITERAL 293
+# define IDL_STRING_LITERAL 294
+# define IDL_CHARACTER_LITERAL 295
+# define IDL_FLOATING_PT_LITERAL 296
+# define IDL_TRUETOK 297
+# define IDL_FALSETOK 298
+# define IDL_SCOPE_DELIMITOR 299
+# define IDL_LEFT_SHIFT 300
+# define IDL_RIGHT_SHIFT 301
+
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#else
+#include <malloc.h>
+#include <memory.h>
 #endif
-#define TAO_YYMAXTOKEN 309
-#if TAO_YYDEBUG
-char *tao_yyname[] = {
-"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,"'%'","'&'",0,"'('","')'","'*'","'+'","','","'-'",0,"'/'",0,0,0,0,0,0,0,0,
-0,0,"':'","';'","'<'","'='","'>'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,"'['",0,"']'","'^'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,"'{'","'|'","'}'","'~'",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"IDENTIFIER","IDL_CONST",
-"IDL_MODULE","IDL_INTERFACE","IDL_TYPEDEF","IDL_LONG","IDL_SHORT",
-"IDL_UNSIGNED","IDL_DOUBLE","IDL_FLOAT","IDL_CHAR","IDL_WCHAR","IDL_OCTET",
-"IDL_BOOLEAN","IDL_ANY","IDL_STRUCT","IDL_UNION","IDL_SWITCH","IDL_ENUM",
-"IDL_SEQUENCE","IDL_STRING","IDL_WSTRING","IDL_EXCEPTION","IDL_CASE",
-"IDL_DEFAULT","IDL_READONLY","IDL_ATTRIBUTE","IDL_ONEWAY","IDL_IDEMPOTENT",
-"IDL_VOID","IDL_IN","IDL_OUT","IDL_INOUT","IDL_RAISES","IDL_CONTEXT",
-"IDL_NATIVE","IDL_ABSTRACT","IDL_CUSTOM","IDL_INIT","IDL_PRIVATE","IDL_PUBLIC",
-"IDL_SUPPORTS","IDL_TRUNCATABLE","IDL_VALUETYPE","IDL_INTEGER_LITERAL",
-"IDL_STRING_LITERAL","IDL_CHARACTER_LITERAL","IDL_FLOATING_PT_LITERAL",
-"IDL_TRUETOK","IDL_FALSETOK","IDL_SCOPE_DELIMITOR","IDL_LEFT_SHIFT",
-"IDL_RIGHT_SHIFT",
-};
-char *tao_yyrule[] = {
-"$accept : start",
-"start : definitions",
-"definitions : definition definitions",
-"definitions :",
-"$$1 :",
-"definition : type_dcl $$1 ';'",
-"$$2 :",
-"definition : const_dcl $$2 ';'",
-"$$3 :",
-"definition : exception $$3 ';'",
-"$$4 :",
-"definition : interface_def $$4 ';'",
-"$$5 :",
-"definition : module $$5 ';'",
-"$$6 :",
-"definition : value_def $$6 ';'",
-"$$7 :",
-"definition : error $$7 ';'",
-"$$8 :",
-"$$9 :",
-"$$10 :",
-"$$11 :",
-"module : IDL_MODULE $$8 IDENTIFIER $$9 '{' $$10 definitions $$11 '}'",
-"interface_def : interface",
-"interface_def : forward",
-"$$12 :",
-"$$13 :",
-"$$14 :",
-"interface : interface_header $$12 '{' $$13 exports $$14 '}'",
-"$$15 :",
-"interface_decl : IDL_INTERFACE $$15 id",
-"interface_header : interface_decl inheritance_spec",
-"$$16 :",
-"inheritance_spec : ':' $$16 at_least_one_scoped_name",
-"inheritance_spec :",
-"value_def : valuetype",
-"value_def : value_abs_decl",
-"value_def : value_forward_decl",
-"value_def : value_box_decl",
-"valuetype : IDL_CUSTOM value_concrete_decl",
-"valuetype : value_concrete_decl",
-"$$17 :",
-"$$18 :",
-"$$19 :",
-"value_concrete_decl : value_header $$17 '{' $$18 value_elements $$19 '}'",
-"$$20 :",
-"$$21 :",
-"$$22 :",
-"value_abs_decl : IDL_ABSTRACT value_header $$20 '{' $$21 exports $$22 '}'",
-"value_header : value_decl opt_truncatable inheritance_spec supports_spec",
-"$$23 :",
-"value_decl : IDL_VALUETYPE $$23 id",
-"opt_truncatable : IDL_TRUNCATABLE",
-"opt_truncatable :",
-"supports_spec : IDL_SUPPORTS scoped_name",
-"supports_spec :",
-"value_forward_decl : IDL_ABSTRACT value_decl",
-"value_forward_decl : value_decl",
-"value_box_decl : value_decl type_spec",
-"value_elements : value_elements value_element",
-"value_elements :",
-"value_element : state_member",
-"value_element : export",
-"value_element : init_decl",
-"$$24 :",
-"state_member : IDL_PUBLIC $$24 member_i",
-"$$25 :",
-"state_member : IDL_PRIVATE $$25 member_i",
-"exports : exports export",
-"exports :",
-"$$26 :",
-"export : type_dcl $$26 ';'",
-"$$27 :",
-"export : const_dcl $$27 ';'",
-"$$28 :",
-"export : exception $$28 ';'",
-"$$29 :",
-"export : attribute $$29 ';'",
-"$$30 :",
-"export : operation $$30 ';'",
-"$$31 :",
-"export : error $$31 ';'",
-"at_least_one_scoped_name : scoped_name scoped_names",
-"$$32 :",
-"scoped_names : scoped_names ',' $$32 scoped_name",
-"scoped_names :",
-"scoped_name : id",
-"$$33 :",
-"scoped_name : IDL_SCOPE_DELIMITOR $$33 id",
-"$$34 :",
-"scoped_name : scoped_name IDL_SCOPE_DELIMITOR $$34 id",
-"id : IDENTIFIER",
-"forward : interface_decl",
-"$$35 :",
-"$$36 :",
-"$$37 :",
-"$$38 :",
-"const_dcl : IDL_CONST $$35 const_type $$36 id $$37 '=' $$38 expression",
-"const_type : integer_type",
-"const_type : char_type",
-"const_type : octet_type",
-"const_type : boolean_type",
-"const_type : floating_pt_type",
-"const_type : string_type_spec",
-"const_type : wstring_type_spec",
-"const_type : scoped_name",
-"expression : const_expr",
-"const_expr : or_expr",
-"or_expr : xor_expr",
-"or_expr : or_expr '|' xor_expr",
-"xor_expr : and_expr",
-"xor_expr : xor_expr '^' and_expr",
-"and_expr : shift_expr",
-"and_expr : and_expr '&' shift_expr",
-"shift_expr : add_expr",
-"shift_expr : shift_expr IDL_LEFT_SHIFT add_expr",
-"shift_expr : shift_expr IDL_RIGHT_SHIFT add_expr",
-"add_expr : mult_expr",
-"add_expr : add_expr '+' mult_expr",
-"add_expr : add_expr '-' mult_expr",
-"mult_expr : unary_expr",
-"mult_expr : mult_expr '*' unary_expr",
-"mult_expr : mult_expr '/' unary_expr",
-"mult_expr : mult_expr '%' unary_expr",
-"unary_expr : primary_expr",
-"unary_expr : '+' primary_expr",
-"unary_expr : '-' primary_expr",
-"unary_expr : '~' primary_expr",
-"primary_expr : scoped_name",
-"primary_expr : literal",
-"primary_expr : '(' const_expr ')'",
-"literal : IDL_INTEGER_LITERAL",
-"literal : IDL_STRING_LITERAL",
-"literal : IDL_CHARACTER_LITERAL",
-"literal : IDL_FLOATING_PT_LITERAL",
-"literal : IDL_TRUETOK",
-"literal : IDL_FALSETOK",
-"positive_int_expr : const_expr",
-"$$39 :",
-"type_dcl : IDL_TYPEDEF $$39 type_declarator",
-"type_dcl : struct_type",
-"type_dcl : union_type",
-"type_dcl : enum_type",
-"type_dcl : IDL_NATIVE simple_declarator",
-"$$40 :",
-"type_declarator : type_spec $$40 at_least_one_declarator",
-"type_spec : simple_type_spec",
-"type_spec : constructed_type_spec",
-"simple_type_spec : base_type_spec",
-"simple_type_spec : template_type_spec",
-"simple_type_spec : scoped_name",
-"base_type_spec : integer_type",
-"base_type_spec : floating_pt_type",
-"base_type_spec : char_type",
-"base_type_spec : boolean_type",
-"base_type_spec : octet_type",
-"base_type_spec : any_type",
-"template_type_spec : sequence_type_spec",
-"template_type_spec : string_type_spec",
-"template_type_spec : wstring_type_spec",
-"constructed_type_spec : struct_type",
-"constructed_type_spec : union_type",
-"constructed_type_spec : enum_type",
-"at_least_one_declarator : declarator declarators",
-"$$41 :",
-"declarators : declarators ',' $$41 declarator",
-"declarators :",
-"declarator : simple_declarator",
-"declarator : complex_declarator",
-"at_least_one_simple_declarator : simple_declarator simple_declarators",
-"$$42 :",
-"simple_declarators : simple_declarators ',' $$42 simple_declarator",
-"simple_declarators :",
-"simple_declarator : id",
-"complex_declarator : array_declarator",
-"integer_type : signed_int",
-"integer_type : unsigned_int",
-"signed_int : IDL_LONG",
-"signed_int : IDL_LONG IDL_LONG",
-"signed_int : IDL_SHORT",
-"unsigned_int : IDL_UNSIGNED IDL_LONG",
-"unsigned_int : IDL_UNSIGNED IDL_LONG IDL_LONG",
-"unsigned_int : IDL_UNSIGNED IDL_SHORT",
-"floating_pt_type : IDL_DOUBLE",
-"floating_pt_type : IDL_FLOAT",
-"floating_pt_type : IDL_LONG IDL_DOUBLE",
-"char_type : IDL_CHAR",
-"char_type : IDL_WCHAR",
-"octet_type : IDL_OCTET",
-"boolean_type : IDL_BOOLEAN",
-"any_type : IDL_ANY",
-"$$43 :",
-"$$44 :",
-"$$45 :",
-"$$46 :",
-"struct_type : IDL_STRUCT $$43 id $$44 '{' $$45 at_least_one_member $$46 '}'",
-"at_least_one_member : member members",
-"members : members member",
-"members :",
-"$$47 :",
-"member : $$47 member_i",
-"$$48 :",
-"$$49 :",
-"member_i : type_spec $$48 at_least_one_declarator $$49 ';'",
-"$$50 :",
-"member_i : error $$50 ';'",
-"$$51 :",
-"$$52 :",
-"$$53 :",
-"$$54 :",
-"$$55 :",
-"$$56 :",
-"$$57 :",
-"$$58 :",
-"union_type : IDL_UNION $$51 id $$52 IDL_SWITCH $$53 '(' $$54 switch_type_spec $$55 ')' $$56 '{' $$57 at_least_one_case_branch $$58 '}'",
-"switch_type_spec : integer_type",
-"switch_type_spec : char_type",
-"switch_type_spec : octet_type",
-"switch_type_spec : boolean_type",
-"switch_type_spec : enum_type",
-"switch_type_spec : scoped_name",
-"at_least_one_case_branch : case_branch case_branches",
-"case_branches : case_branches case_branch",
-"case_branches :",
-"$$59 :",
-"$$60 :",
-"case_branch : at_least_one_case_label $$59 element_spec $$60 ';'",
-"$$61 :",
-"case_branch : error $$61 ';'",
-"at_least_one_case_label : case_label case_labels",
-"case_labels : case_labels case_label",
-"case_labels :",
-"$$62 :",
-"case_label : IDL_DEFAULT $$62 ':'",
-"$$63 :",
-"$$64 :",
-"case_label : IDL_CASE $$63 const_expr $$64 ':'",
-"$$65 :",
-"element_spec : type_spec $$65 declarator",
-"$$66 :",
-"$$67 :",
-"$$68 :",
-"$$69 :",
-"enum_type : IDL_ENUM $$66 id $$67 '{' $$68 at_least_one_enumerator $$69 '}'",
-"at_least_one_enumerator : enumerator enumerators",
-"$$70 :",
-"enumerators : enumerators ',' $$70 enumerator",
-"enumerators :",
-"enumerator : IDENTIFIER",
-"$$71 :",
-"$$72 :",
-"sequence_type_spec : seq_head ',' $$71 positive_int_expr $$72 '>'",
-"sequence_type_spec : seq_head '>'",
-"$$73 :",
-"$$74 :",
-"seq_head : IDL_SEQUENCE $$73 '<' $$74 simple_type_spec",
-"$$75 :",
-"$$76 :",
-"string_type_spec : string_head '<' $$75 positive_int_expr $$76 '>'",
-"string_type_spec : string_head",
-"string_head : IDL_STRING",
-"$$77 :",
-"$$78 :",
-"wstring_type_spec : wstring_head '<' $$77 positive_int_expr $$78 '>'",
-"wstring_type_spec : wstring_head",
-"wstring_head : IDL_WSTRING",
-"$$79 :",
-"array_declarator : id $$79 at_least_one_array_dim",
-"at_least_one_array_dim : array_dim array_dims",
-"array_dims : array_dims array_dim",
-"array_dims :",
-"$$80 :",
-"$$81 :",
-"array_dim : '[' $$80 positive_int_expr $$81 ']'",
-"$$82 :",
-"$$83 :",
-"attribute : opt_readonly IDL_ATTRIBUTE $$82 param_type_spec $$83 at_least_one_simple_declarator",
-"opt_readonly : IDL_READONLY",
-"opt_readonly :",
-"$$84 :",
-"$$85 :",
-"$$86 :",
-"$$87 :",
-"exception : IDL_EXCEPTION $$84 id $$85 '{' $$86 members $$87 '}'",
-"$$88 :",
-"$$89 :",
-"$$90 :",
-"$$91 :",
-"operation : opt_op_attribute op_type_spec $$88 IDENTIFIER $$89 parameter_list $$90 opt_raises $$91 opt_context",
-"opt_op_attribute : IDL_ONEWAY",
-"opt_op_attribute : IDL_IDEMPOTENT",
-"opt_op_attribute :",
-"op_type_spec : param_type_spec",
-"op_type_spec : IDL_VOID",
-"init_decl : IDL_INIT",
-"$$92 :",
-"parameter_list : '(' $$92 ')'",
-"$$93 :",
-"parameter_list : '(' $$93 at_least_one_parameter ')'",
-"at_least_one_parameter : parameter parameters",
-"$$94 :",
-"parameters : parameters ',' $$94 parameter",
-"parameters :",
-"$$95 :",
-"$$96 :",
-"parameter : direction $$95 param_type_spec $$96 declarator",
-"param_type_spec : base_type_spec",
-"param_type_spec : string_type_spec",
-"param_type_spec : scoped_name",
-"direction : IDL_IN",
-"direction : IDL_OUT",
-"direction : IDL_INOUT",
-"$$97 :",
-"$$98 :",
-"opt_raises : IDL_RAISES $$97 '(' $$98 at_least_one_scoped_name ')'",
-"opt_raises :",
-"$$99 :",
-"$$100 :",
-"opt_context : IDL_CONTEXT $$99 '(' $$100 at_least_one_string_literal ')'",
-"opt_context :",
-"at_least_one_string_literal : IDL_STRING_LITERAL string_literals",
-"$$101 :",
-"string_literals : string_literals ',' $$101 IDL_STRING_LITERAL",
-"string_literals :",
-};
+
+
+#ifdef __cplusplus
+
+#ifndef tao_yyerror
+	void tao_yyerror(const char *);
 #endif
-#define tao_yyclearin (tao_yychar=(-1))
-#define tao_yyerrok (tao_yyerrflag=0)
-#ifndef TAO_YYSTACKSIZE
-#ifdef TAO_YYMAXDEPTH
-#define TAO_YYSTACKSIZE TAO_YYMAXDEPTH
+
+#ifndef tao_yylex
+#ifdef __EXTERN_C__
+	extern "C" { int tao_yylex(void); }
 #else
-#define TAO_YYSTACKSIZE 300
+	int tao_yylex(void);
 #endif
 #endif
-int tao_yydebug;
-int tao_yynerrs;
-int tao_yyerrflag;
-int tao_yychar;
-short *tao_yyssp;
-TAO_YYSTYPE *tao_yyvsp;
-TAO_YYSTYPE tao_yyval;
+	int tao_yyparse(void);
+
+#endif
+#define tao_yyclearin tao_yychar = -1
+#define tao_yyerrok tao_yyerrflag = 0
+extern int tao_yychar;
+extern int tao_yyerrflag;
 TAO_YYSTYPE tao_yylval;
-#define tao_yystacksize TAO_YYSTACKSIZE
-short tao_yyss[TAO_YYSTACKSIZE];
-TAO_YYSTYPE tao_yyvs[TAO_YYSTACKSIZE];
-#line 2521 "fe/idl.tao_yy"
+TAO_YYSTYPE tao_yyval;
+typedef int tao_yytabelem;
+#ifndef TAO_YYMAXDEPTH
+#define TAO_YYMAXDEPTH 150
+#endif
+#if TAO_YYMAXDEPTH > 0
+int tao_yy_tao_yys[TAO_YYMAXDEPTH], *tao_yys = tao_yy_tao_yys;
+TAO_YYSTYPE tao_yy_tao_yyv[TAO_YYMAXDEPTH], *tao_yyv = tao_yy_tao_yyv;
+#else	/* user does initial allocation */
+int *tao_yys;
+TAO_YYSTYPE *tao_yyv;
+#endif
+static int tao_yymaxdepth = TAO_YYMAXDEPTH;
+# define TAO_YYERRCODE 256
+
+# line 2289 "fe/idl.tao_yy"
+
 /* programs */
 
 /*
@@ -931,2748 +163,3156 @@ void
 tao_yyerror(const char *)
 {
 }
-#line 934 "y.tab.cpp"
-#define TAO_YYABORT goto tao_yyabort
-#define TAO_YYACCEPT goto tao_yyaccept
-#define TAO_YYERROR goto tao_yyerrlab
-#ifdef TAO_YYDEBUG
-#ifndef TAO_YYDEBUG_LEXER_TEXT /* pointer to the text isolated by the lexer*/
-#define TAO_YYDEBUG_LEXER_TEXT "TAO_YYDEBUG_LEXER_TEXT not defined"
-#endif
-#ifndef TAO_YYDEBUG_INDENT_STRING
-#define TAO_YYDEBUG_INDENT_STRING  "|       "
-#endif
-#ifndef TAO_YYDEBUG_REDUCE_STRING
-#define TAO_YYDEBUG_REDUCE_STRING  "+-------"
-#endif
-#ifndef TAO_YYDEBUG_INDENT
-#ifdef __cplusplus
-void TAO_YYDEBUG_INDENT(int tao_yyindent)
-#else
-TAO_YYDEBUG_INDENT(tao_yyindent)
-int tao_yyindent;
-#endif
-{
-    while(tao_yyindent-- > 0)
-        printf("%s", TAO_YYDEBUG_INDENT_STRING);
-}
-#endif /* TAO_YYDEBUG_INDENT */
-#ifndef TAO_YYDEBUG_REDUCE
-#ifdef __cplusplus
-void TAO_YYDEBUG_REDUCE(int tao_yynew_state, int tao_yyrule_num, char *tao_yyrule_string, int tao_yynew_indent, int tao_yyrhs_count)
-#else
-TAO_YYDEBUG_REDUCE(tao_yynew_state, tao_yyrule_num, tao_yyrule_string, tao_yynew_indent, tao_yyrhs_count)
-int tao_yynew_state;
-int tao_yyrule_num;
-char * tao_yyrule_string;
-int tao_yynew_indent;
-int tao_yyrhs_count;
-#endif
-{
-    if (1 < tao_yyrhs_count)
-    {  /* draw the graphics for the reduction */
-        TAO_YYDEBUG_INDENT(tao_yynew_indent);
-        while(1 < tao_yyrhs_count--)
-            printf("%s", TAO_YYDEBUG_REDUCE_STRING);
-        putchar('+'); /* left rotated L would look nice */
-        putchar('\n');
-        TAO_YYDEBUG_INDENT(tao_yynew_indent);
-        putchar('|'); /* down arrow would look nice */
-        putchar('\n');
-    }
-    TAO_YYDEBUG_INDENT(tao_yynew_indent);
-    /* Only print the resulting token name */
-    while (*tao_yyrule_string)
-        putchar(*tao_yyrule_string++);
-    putchar('\n');
-}
-#endif /* TAO_YYDEBUG_REDUCE */
-#ifndef TAO_YYDEBUG_SHIFT_LEXEME
+static const tao_yytabelem tao_yyexca[] ={
+-1, 0,
+	0, 3,
+	-2, 0,
+-1, 1,
+	0, -1,
+	-2, 0,
+-1, 3,
+	0, 3,
+	125, 3,
+	-2, 0,
+-1, 24,
+	123, 32,
+	-2, 57,
+-1, 134,
+	91, 229,
+	-2, 138,
+-1, 149,
+	257, 254,
+	262, 254,
+	263, 254,
+	264, 254,
+	265, 254,
+	266, 254,
+	267, 254,
+	268, 254,
+	269, 254,
+	270, 254,
+	271, 254,
+	277, 254,
+	283, 241,
+	286, 254,
+	299, 254,
+	125, 25,
+	-2, 0,
+-1, 181,
+	125, 3,
+	-2, 0,
+-1, 222,
+	125, 245,
+	-2, 0,
+-1, 269,
+	125, 161,
+	-2, 0,
+-1, 319,
+	41, 257,
+	-2, 259,
+-1, 357,
+	125, 184,
+	-2, 0,
+	};
+# define TAO_YYNPROD 286
+# define TAO_YYLAST 528
+static const tao_yytabelem tao_yyact[]={
+
+    72,   131,   347,   331,   344,    57,   167,   155,   128,   241,
+    70,   230,   132,   207,   208,    35,   226,   110,   393,   388,
+   333,   334,   335,   352,   328,   239,   147,    34,   349,   348,
+   130,   112,   118,   119,   113,   112,   141,    36,    36,   101,
+    59,   103,   104,   105,   100,   227,    36,   108,    98,   169,
+    54,    78,    87,    88,    76,    77,    79,    80,    82,    81,
+    83,    20,    21,    36,    22,    89,    90,    91,    78,    87,
+    88,    76,    77,    79,    80,    82,    81,    83,    20,    21,
+    73,    22,    89,    90,    91,   231,   305,    36,    73,   102,
+   201,   346,    78,    87,    88,    76,    77,    79,    80,    82,
+    81,    83,   162,   222,   160,    73,    89,    90,    91,   161,
+   134,   154,   137,    36,   129,   349,   348,   159,   301,    87,
+    88,    67,   143,    79,    80,    82,    81,   158,     2,    73,
+   157,    22,    26,    36,   265,     6,     5,   153,    78,    87,
+    88,    76,    77,    79,    80,    82,    81,    83,    55,   169,
+    66,   367,   164,    90,   165,    73,   302,   291,   290,    95,
+    36,   289,   242,   232,   204,    78,    87,    88,    76,    77,
+    79,    80,    82,    81,    83,    73,    65,   217,    62,    13,
+    90,    63,    13,   325,     4,    59,    36,   148,    96,    59,
+   163,    78,    87,    88,    76,    77,    79,    80,    82,    81,
+   243,   245,    73,   146,   145,   244,    90,    91,   192,   144,
+    15,   106,   205,    10,    94,   312,   202,   263,   262,    93,
+   250,   114,   221,   142,    20,    21,   117,    22,    73,    59,
+   116,    16,   384,   371,   195,   166,   196,   197,     9,   115,
+    15,    19,    25,    10,    14,   313,    61,    12,   134,   284,
+    12,   176,   177,   283,    20,    21,   293,    22,   280,    60,
+    11,    16,   279,    11,   278,   277,    36,   276,   275,    52,
+    51,   134,   288,    50,    14,    49,    59,    48,    47,   300,
+   386,   373,    45,   391,   213,   189,   188,   243,   245,   211,
+   354,   304,   244,   209,   212,   210,   326,   303,   199,   198,
+   389,   292,   170,   171,   172,   173,   174,   175,    73,   383,
+   223,    35,   254,   255,   258,   259,   260,   225,   340,   256,
+   257,   315,   329,   317,   253,   314,   261,   220,    13,   269,
+   375,   353,   319,   252,   187,   251,   228,   206,    35,   285,
+    64,    71,   392,   382,   363,   364,   339,   366,   243,   245,
+   350,   342,   355,   244,   365,   214,   215,   216,   341,   330,
+    13,   286,   368,   372,   324,    59,    36,   134,   378,   377,
+   374,   129,   323,   376,   338,   370,   322,   318,    97,    99,
+   311,   134,   385,   282,   266,   180,   122,    38,   310,   281,
+   306,   249,   152,   219,   297,   140,    12,    86,   218,   139,
+    85,   178,   170,   171,   172,   173,   174,   175,    73,    11,
+   120,   203,   138,   309,   274,   273,   229,   184,   126,    42,
+   380,   381,   362,   298,   361,   359,   379,   358,    12,   357,
+   356,   343,   336,   320,   308,   272,   183,   125,    41,   271,
+   307,    11,   270,   268,   224,   182,   124,    40,   337,   296,
+   247,   299,   109,    53,   295,    33,   264,   179,   121,    37,
+   136,   111,   246,   238,   237,   191,   236,   190,   235,   234,
+   233,   186,   107,    46,   185,   149,   127,    43,    18,    17,
+   267,   181,   123,    39,    32,    31,     8,    30,     7,    29,
+    28,    27,     3,     1,    24,   193,   133,   194,   332,    75,
+    74,    68,    92,   369,   168,   156,   287,    23,   321,   316,
+   151,   360,   345,   248,   200,   327,    44,   150,   390,   387,
+   351,    84,   240,   135,   294,    69,    58,    56 };
+static const tao_yytabelem tao_yypact[]={
+
+   -18,-10000000,-10000000,   -18,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,  -220,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,   224,-10000000,-10000000,   219,   218,   216,
+   214,   211,   210,  -194,-10000000,-10000000,-10000000,   -71,  -220,  -168,
+  -220,  -220,  -220,    88,-10000000,-10000000,  -220,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -282,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -231,-10000000,
+-10000000,-10000000,-10000000,-10000000,   177,   170,   166,-10000000,  -230,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+  -282,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -219,-10000000,  -220,
+-10000000,  -220,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -226,-10000000,
+   163,  -220,    86,    81,    80,  -248,    64,-10000000,-10000000,  -282,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -220,-10000000,   109,   109,
+   109,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,   -48,
+   255,   254,   125,-10000000,-10000000,-10000000,    40,   118,   299,  -287,
+   250,   247,-10000000,-10000000,     9,     9,     9,  -282,-10000000,   109,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,  -170,   161,
+-10000000,   -18,  -211,   296,  -172,    38,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,  -258,  -124,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,   158,   109,   109,   109,   109,   109,   109,
+   109,   109,   109,   109,-10000000,-10000000,-10000000,   285,   156,   155,
+-10000000,-10000000,  -211,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,   209,   208,   206,   205,   203,   199,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,  -282,  -219,  -220,   125,   109,
+-10000000,   118,   299,  -287,   250,   250,   247,   247,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,   109,-10000000,    36,    33,    32,  -211,
+  -220,   197,  -144,    31,   253,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,   -97,  -171,  -282,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+  -282,  -227,-10000000,-10000000,-10000000,-10000000,   122,   186,   284,  -172,
+  -220,   292,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+    60,   252,  -266,   281,  -267,-10000000,-10000000,-10000000,-10000000,-10000000,
+   277,-10000000,-10000000,-10000000,-10000000,-10000000,  -165,  -220,  -268,   291,
+-10000000,   246,   -97,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,    26,  -165,  -194,   174,
+  -252,   223,   109,   290,  -219,  -267,  -220,-10000000,-10000000,-10000000,
+-10000000,-10000000,-10000000,-10000000,-10000000,-10000000,   268,-10000000,-10000000,   173,
+  -220,   222,  -275,-10000000,-10000000,-10000000,-10000000,   259,-10000000,-10000000,
+   239,-10000000,  -276,-10000000 };
+static const tao_yytabelem tao_yypgo[]={
+
+     0,    16,   148,   527,   526,   525,    10,   259,   178,   524,
+   246,   523,   522,   521,   341,     9,     6,   520,   519,   518,
+     8,   517,   516,   515,   514,   513,   512,   511,    30,   510,
+   509,   508,   507,   506,     7,   505,   130,   127,   117,   104,
+   109,   102,   190,   504,   111,    90,     2,   503,   502,   181,
+   176,   150,   340,   501,   500,   499,     5,   121,   498,   497,
+     1,    12,   496,   495,   494,     0,   184,   493,   128,   492,
+   491,   136,   490,   135,   489,   488,   487,   486,   485,   484,
+   483,   482,   481,   480,   479,   478,   477,   476,   475,   474,
+   473,   472,   471,   470,   469,   468,   467,   466,   465,   464,
+   463,   462,   461,   460,   459,   458,   457,   456,   455,   453,
+   452,   450,   448,   447,   446,   445,   444,   443,   134,   103,
+   442,   440,   439,   438,   437,   436,   435,   434,   433,   432,
+   431,   430,     4,   429,   427,   426,   425,   424,   422,   421,
+   420,   419,   418,   417,   416,   415,    11,   414,   413,   412,
+   411,   410,   401,   400,   399,   398,   397,   395,   393,   392,
+   391,   390,   389,   388,   387,   386,   385,   384,   383,   380,
+   377,   376,   374,   372,   364,   359,     3,   358,   354,   351,
+   347,   346,   345,   344,   343,   342 };
+static const tao_yytabelem tao_yyr1[]={
+
+     0,    67,    68,    68,    70,    69,    72,    69,    74,    69,
+    76,    69,    78,    69,    79,    69,    80,    81,    82,    83,
+    77,    75,    75,    86,    87,    89,    84,    90,    64,    32,
+    91,    22,    22,    88,    88,    93,    92,    94,    92,    95,
+    92,    97,    92,    99,    92,   100,    92,    20,   101,    21,
+    21,    16,   102,    16,   103,    16,    65,    85,   104,   105,
+   106,   107,    71,    48,    48,    48,    48,    48,    48,    48,
+    48,    33,    34,    35,    35,    36,    36,    37,    37,    38,
+    38,    38,    39,    39,    39,    40,    40,    40,    40,    41,
+    41,    41,    41,    42,    42,    42,    43,    43,    43,    43,
+    43,    43,    44,   108,    66,    66,    66,    66,    66,   110,
+   109,     1,     1,     2,     2,     2,    56,    56,    56,    56,
+    56,    56,     4,     4,     4,     3,     3,     3,    28,   111,
+    29,    29,    60,    60,    30,   112,    31,    31,    61,    62,
+    49,    49,    54,    54,    54,    55,    55,    55,    52,    52,
+    52,    50,    50,    57,    51,    53,   113,   114,   115,   117,
+     7,   116,   119,   119,   120,   121,   118,   122,   118,   123,
+   124,   125,   126,   127,   128,   129,   131,    10,     9,     9,
+     9,     9,     9,     9,   130,   133,   133,   134,   135,   132,
+   136,   132,    26,    27,    27,   137,    46,   138,   139,    46,
+   140,    47,   141,   142,   143,   145,     8,   144,   148,   147,
+   147,   146,   149,   150,     5,     5,   151,   152,    13,   154,
+   155,     6,     6,   153,   157,   158,    14,    14,   156,   159,
+    11,    24,    25,    25,   160,   161,    45,   162,   163,    96,
+    63,    63,   164,   165,   166,   167,    73,   168,   169,   171,
+   172,    98,    59,    59,    59,    12,    12,   173,   170,   174,
+   170,   175,   178,   177,   177,   179,   180,   176,    15,    15,
+    15,    58,    58,    58,   181,   182,    23,    23,   183,   184,
+    17,    17,    18,   185,    19,    19 };
+static const tao_yytabelem tao_yyr2[]={
+
+     0,     2,     4,     0,     1,     7,     1,     7,     1,     7,
+     1,     7,     1,     7,     1,     7,     1,     1,     1,     1,
+    19,     2,     2,     1,     1,     1,    15,     1,     7,     5,
+     1,     7,     1,     4,     0,     1,     7,     1,     7,     1,
+     7,     1,     7,     1,     7,     1,     7,     5,     1,     9,
+     1,     3,     1,     7,     1,     9,     3,     3,     1,     1,
+     1,     1,    19,     2,     2,     2,     2,     2,     3,     3,
+     3,     2,     2,     2,     7,     2,     7,     2,     7,     2,
+     7,     7,     2,     7,     7,     2,     7,     7,     7,     2,
+     5,     5,     5,     3,     2,     7,     3,     3,     3,     3,
+     3,     3,     3,     1,     7,     3,     3,     3,     5,     1,
+     7,     2,     2,     3,     2,     3,     2,     2,     2,     2,
+     2,     2,     2,     2,     2,     2,     2,     2,     5,     1,
+     9,     1,     2,     2,     5,     1,     9,     1,     3,     3,
+     2,     2,     3,     5,     3,     5,     7,     5,     3,     3,
+     5,     3,     3,     3,     3,     3,     1,     1,     1,     1,
+    19,     4,     4,     0,     1,     1,    11,     1,     7,     1,
+     1,     1,     1,     1,     1,     1,     1,    35,     3,     3,
+     3,     3,     2,     3,     4,     4,     0,     1,     1,    11,
+     1,     7,     5,     5,     1,     1,     7,     1,     1,    11,
+     1,     7,     1,     1,     1,     1,    19,     4,     1,     8,
+     0,     3,     1,     1,    13,     5,     1,     1,    11,     1,
+     1,    13,     3,     3,     1,     1,    13,     3,     3,     1,
+     7,     5,     5,     1,     1,     1,    11,     1,     1,    13,
+     3,     1,     1,     1,     1,     1,    19,     1,     1,     1,
+     1,    21,     3,     3,     1,     2,     3,     1,     7,     1,
+     9,     4,     1,     8,     0,     1,     1,    11,     3,     2,
+     3,     3,     3,     3,     1,     1,    13,     1,     1,     1,
+    13,     1,     5,     1,     9,     1 };
+static const tao_yytabelem tao_yychk[]={
+
+-10000000,   -67,   -68,   -69,   -66,   -71,   -73,   -75,   -77,   256,
+   261,    -7,   -10,    -8,   292,   258,   279,   -84,   -85,   259,
+   272,   273,   275,   -32,   -64,   260,   -68,   -70,   -72,   -74,
+   -76,   -78,   -79,  -108,   -61,   -65,   257,  -104,  -164,   -80,
+  -113,  -123,  -141,   -86,   -22,    58,   -90,    59,    59,    59,
+    59,    59,    59,  -109,    -1,    -2,    -3,   -56,    -4,   -16,
+    -7,   -10,    -8,   -49,   -52,   -50,   -51,   -57,   -53,    -5,
+    -6,   -14,   -65,   299,   -54,   -55,   265,   266,   262,   267,
+   268,   270,   269,   271,   -13,  -153,  -156,   263,   264,   276,
+   277,   278,   -48,   -49,   -50,   -57,   -51,   -52,    -6,   -14,
+   -16,   -65,   257,   -65,   -65,   -65,   123,   -91,   -65,  -110,
+   299,  -102,   262,   265,    44,    62,    60,    60,   262,   263,
+  -151,  -105,  -165,   -81,  -114,  -124,  -142,   -87,   -20,   -16,
+   -28,   -60,   -61,   -62,   -65,   -11,  -103,   -65,  -149,  -154,
+  -157,   262,    60,   -65,   123,   123,   123,   274,   123,   -88,
+   -21,   -29,  -159,   -65,   -44,   -34,   -35,   -36,   -37,   -38,
+   -39,   -40,   -41,   -42,    43,    45,   126,   -16,   -43,    40,
+   293,   294,   295,   296,   297,   298,   -44,   -44,  -152,  -106,
+  -166,   -82,  -115,  -125,  -143,   -89,   -92,   -66,   -71,   -73,
+   -96,   -98,   256,   -63,   -59,   282,   284,   285,    44,    44,
+   -24,   -45,    91,  -150,   124,    94,    38,   300,   301,    43,
+    45,    42,    47,    37,   -42,   -42,   -42,   -34,  -155,  -158,
+    -2,    61,  -119,   -68,  -116,  -118,    -1,   256,    40,  -144,
+  -146,   257,   125,   -93,   -94,   -95,   -97,   -99,  -100,   283,
+   -12,   -15,   286,   -56,    -6,   -16,  -101,  -111,   -25,  -160,
+    62,   -36,   -37,   -38,   -39,   -39,   -40,   -40,   -41,   -41,
+   -41,    41,    62,    62,  -107,  -118,  -167,   -83,  -117,  -119,
+  -120,  -122,  -126,  -145,  -147,    59,    59,    59,    59,    59,
+    59,  -162,  -168,   -16,   -60,   -45,   -44,   -33,   -34,   125,
+   125,   125,   -28,    59,    -9,   -49,   -50,   -57,   -51,    -8,
+   -16,   262,   125,    44,   -15,   257,  -161,  -121,  -127,  -148,
+  -163,  -169,    93,    59,    41,  -146,   -30,   -61,  -170,    40,
+  -128,   -31,  -171,  -173,  -174,   123,    44,   -23,   290,    41,
+  -175,  -176,   -58,   287,   288,   289,  -129,  -112,  -172,  -181,
+    41,  -177,  -179,  -130,  -132,   -26,   256,   -46,   281,   280,
+   -61,   -17,   291,    40,    44,   -15,  -131,  -133,  -134,  -136,
+   -27,  -137,  -138,  -183,  -182,  -178,  -180,   125,  -132,   -47,
+    -1,    59,   -46,    58,   -34,    40,   -20,  -176,   -60,  -135,
+  -140,  -139,  -184,    41,    59,   -60,    58,   -18,   294,    41,
+   -19,    44,  -185,   294 };
+static const tao_yytabelem tao_yydef[]={
+
+    -2,    -2,     1,    -2,     4,     6,     8,    10,    12,    14,
+   103,   105,   106,   107,     0,    58,   242,    21,    22,    16,
+   156,   169,   202,    23,    -2,    27,     2,     0,     0,     0,
+     0,     0,     0,     0,   108,   138,    56,     0,     0,     0,
+     0,     0,     0,     0,    29,    30,     0,     5,     7,     9,
+    11,    13,    15,   104,   109,   111,   112,   113,   114,   115,
+   125,   126,   127,   116,   117,   118,   119,   120,   121,   122,
+   123,   124,    51,    52,   140,   141,   148,   149,   142,   151,
+   152,   154,   153,   155,     0,   222,   227,   144,     0,   216,
+   223,   228,    59,    63,    64,    65,    66,    67,    68,    69,
+    70,   243,    17,   157,   170,   203,    24,     0,    28,     0,
+    54,     0,   143,   150,   212,   215,   219,   224,   145,   147,
+     0,     0,     0,     0,     0,     0,     0,    34,    31,    50,
+   110,   131,   132,   133,    -2,   139,     0,    53,     0,     0,
+     0,   146,   217,    60,   244,    18,   158,   171,   204,    -2,
+    47,   128,     0,    55,   213,   102,    72,    73,    75,    77,
+    79,    82,    85,    89,     0,     0,     0,    93,    94,     0,
+    96,    97,    98,    99,   100,   101,   220,   225,     0,     0,
+   163,    -2,     0,     0,     0,     0,    33,    35,    37,    39,
+    41,    43,    45,     0,     0,   240,   252,   253,    48,   129,
+   230,   233,   234,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     0,     0,    90,    91,    92,     0,     0,     0,
+   218,    61,    -2,    19,   159,   163,   164,   167,   172,   205,
+   210,   211,    26,     0,     0,     0,     0,     0,     0,   237,
+   247,   255,   256,   268,   269,   270,     0,     0,   231,     0,
+   214,    74,    76,    78,    80,    81,    83,    84,    86,    87,
+    88,    95,   221,   226,     0,   162,     0,     0,     0,    -2,
+     0,     0,     0,     0,   207,    36,    38,    40,    42,    44,
+    46,     0,     0,    49,   130,   232,   235,    62,    71,   246,
+    20,   160,   165,   168,   173,   178,   179,   180,   181,   182,
+   183,   142,   206,   208,   238,   248,     0,     0,     0,     0,
+     0,     0,   236,   166,   174,   209,   239,   137,   249,    -2,
+     0,   134,   277,     0,     0,   175,   135,   250,   274,   258,
+     0,   264,   265,   271,   272,   273,     0,     0,   281,     0,
+   260,   261,     0,   176,   186,   187,   190,   194,   195,   197,
+   136,   251,   278,   275,   262,   266,     0,    -2,     0,     0,
+   192,     0,     0,     0,     0,     0,     0,   177,   185,   188,
+   200,   191,   193,   196,   198,   279,     0,   263,   267,     0,
+     0,     0,     0,   276,   189,   201,   199,     0,   285,   280,
+   282,   283,     0,   284 };
+typedef struct
 #ifdef __cplusplus
-void TAO_YYDEBUG_SHIFT_LEXEME(int tao_yyold_state, int tao_yynew_state, char *tao_yytoken_string, int tao_yynew_indent)
-#else
-TAO_YYDEBUG_SHIFT_LEXEME(tao_yyold_state, tao_yynew_state, tao_yytoken_string, tao_yynew_indent)
-int tao_yyold_state;
-int tao_yynew_state;
-char * tao_yytoken_string;
-int tao_yynew_indent;
+	tao_yytoktype
 #endif
-{
-    TAO_YYDEBUG_INDENT(tao_yynew_indent);
-    printf("%s <-- `%s'\n", tao_yytoken_string, TAO_YYDEBUG_LEXER_TEXT);
-}
-#endif /*  TAO_YYDEBUG_SHIFT_LEXEME */
-#ifndef TAO_YYDEBUG_LOOK_AHEAD
-#ifdef __cplusplus
-void TAO_YYDEBUG_LOOK_AHEAD(int tao_yynew_state, int tao_yytoken_num, char *tao_yytoken_string, int tao_yyindent)
-#else
-TAO_YYDEBUG_LOOK_AHEAD(tao_yynew_state, tao_yytoken_num, tao_yytoken_string, tao_yyindent)
-int tao_yynew_state;
-int tao_yytoken_num;
-char * tao_yytoken_string;
-int tao_yyindent;
+{ char *t_name; int t_val; } tao_yytoktype;
+#ifndef TAO_YYDEBUG
+#	define TAO_YYDEBUG	0	/* don't allow debugging */
 #endif
-{
-    TAO_YYDEBUG_INDENT(tao_yyindent);
-    printf("          .... look ahead at %s   `%s'\n",
-           tao_yytoken_string,
-           (0 == tao_yytoken_num)? "\0": TAO_YYDEBUG_LEXER_TEXT);
+
+#if TAO_YYDEBUG
+
+tao_yytoktype tao_yytoks[] =
+{
+	{"IDENTIFIER",	257},
+	{"IDL_CONST",	258},
+	{"IDL_MODULE",	259},
+	{"IDL_INTERFACE",	260},
+	{"IDL_TYPEDEF",	261},
+	{"IDL_LONG",	262},
+	{"IDL_SHORT",	263},
+	{"IDL_UNSIGNED",	264},
+	{"IDL_DOUBLE",	265},
+	{"IDL_FLOAT",	266},
+	{"IDL_CHAR",	267},
+	{"IDL_WCHAR",	268},
+	{"IDL_OCTET",	269},
+	{"IDL_BOOLEAN",	270},
+	{"IDL_ANY",	271},
+	{"IDL_STRUCT",	272},
+	{"IDL_UNION",	273},
+	{"IDL_SWITCH",	274},
+	{"IDL_ENUM",	275},
+	{"IDL_SEQUENCE",	276},
+	{"IDL_STRING",	277},
+	{"IDL_WSTRING",	278},
+	{"IDL_EXCEPTION",	279},
+	{"IDL_CASE",	280},
+	{"IDL_DEFAULT",	281},
+	{"IDL_READONLY",	282},
+	{"IDL_ATTRIBUTE",	283},
+	{"IDL_ONEWAY",	284},
+	{"IDL_IDEMPOTENT",	285},
+	{"IDL_VOID",	286},
+	{"IDL_IN",	287},
+	{"IDL_OUT",	288},
+	{"IDL_INOUT",	289},
+	{"IDL_RAISES",	290},
+	{"IDL_CONTEXT",	291},
+	{"IDL_NATIVE",	292},
+	{"IDL_INTEGER_LITERAL",	293},
+	{"IDL_STRING_LITERAL",	294},
+	{"IDL_CHARACTER_LITERAL",	295},
+	{"IDL_FLOATING_PT_LITERAL",	296},
+	{"IDL_TRUETOK",	297},
+	{"IDL_FALSETOK",	298},
+	{"IDL_SCOPE_DELIMITOR",	299},
+	{"IDL_LEFT_SHIFT",	300},
+	{"IDL_RIGHT_SHIFT",	301},
+	{"-unknown-",	-1}	/* ends search */
+};
+
+char * tao_yyreds[] =
+{
+	"-no such reduction-",
+	"start : definitions",
+	"definitions : definition definitions",
+	"definitions : /* empty */",
+	"definition : type_dcl",
+	"definition : type_dcl ';'",
+	"definition : const_dcl",
+	"definition : const_dcl ';'",
+	"definition : exception",
+	"definition : exception ';'",
+	"definition : interface_def",
+	"definition : interface_def ';'",
+	"definition : module",
+	"definition : module ';'",
+	"definition : error",
+	"definition : error ';'",
+	"module : IDL_MODULE",
+	"module : IDL_MODULE IDENTIFIER",
+	"module : IDL_MODULE IDENTIFIER '{'",
+	"module : IDL_MODULE IDENTIFIER '{' definitions",
+	"module : IDL_MODULE IDENTIFIER '{' definitions '}'",
+	"interface_def : interface",
+	"interface_def : forward",
+	"interface : interface_header",
+	"interface : interface_header '{'",
+	"interface : interface_header '{' exports",
+	"interface : interface_header '{' exports '}'",
+	"interface_decl : IDL_INTERFACE",
+	"interface_decl : IDL_INTERFACE id",
+	"interface_header : interface_decl inheritance_spec",
+	"inheritance_spec : ':'",
+	"inheritance_spec : ':' at_least_one_scoped_name",
+	"inheritance_spec : /* empty */",
+	"exports : exports export",
+	"exports : /* empty */",
+	"export : type_dcl",
+	"export : type_dcl ';'",
+	"export : const_dcl",
+	"export : const_dcl ';'",
+	"export : exception",
+	"export : exception ';'",
+	"export : attribute",
+	"export : attribute ';'",
+	"export : operation",
+	"export : operation ';'",
+	"export : error",
+	"export : error ';'",
+	"at_least_one_scoped_name : scoped_name scoped_names",
+	"scoped_names : scoped_names ','",
+	"scoped_names : scoped_names ',' scoped_name",
+	"scoped_names : /* empty */",
+	"scoped_name : id",
+	"scoped_name : IDL_SCOPE_DELIMITOR",
+	"scoped_name : IDL_SCOPE_DELIMITOR id",
+	"scoped_name : scoped_name IDL_SCOPE_DELIMITOR",
+	"scoped_name : scoped_name IDL_SCOPE_DELIMITOR id",
+	"id : IDENTIFIER",
+	"forward : interface_decl",
+	"const_dcl : IDL_CONST",
+	"const_dcl : IDL_CONST const_type",
+	"const_dcl : IDL_CONST const_type id",
+	"const_dcl : IDL_CONST const_type id '='",
+	"const_dcl : IDL_CONST const_type id '=' expression",
+	"const_type : integer_type",
+	"const_type : char_type",
+	"const_type : octet_type",
+	"const_type : boolean_type",
+	"const_type : floating_pt_type",
+	"const_type : string_type_spec",
+	"const_type : wstring_type_spec",
+	"const_type : scoped_name",
+	"expression : const_expr",
+	"const_expr : or_expr",
+	"or_expr : xor_expr",
+	"or_expr : or_expr '|' xor_expr",
+	"xor_expr : and_expr",
+	"xor_expr : xor_expr '^' and_expr",
+	"and_expr : shift_expr",
+	"and_expr : and_expr '&' shift_expr",
+	"shift_expr : add_expr",
+	"shift_expr : shift_expr IDL_LEFT_SHIFT add_expr",
+	"shift_expr : shift_expr IDL_RIGHT_SHIFT add_expr",
+	"add_expr : mult_expr",
+	"add_expr : add_expr '+' mult_expr",
+	"add_expr : add_expr '-' mult_expr",
+	"mult_expr : unary_expr",
+	"mult_expr : mult_expr '*' unary_expr",
+	"mult_expr : mult_expr '/' unary_expr",
+	"mult_expr : mult_expr '%' unary_expr",
+	"unary_expr : primary_expr",
+	"unary_expr : '+' primary_expr",
+	"unary_expr : '-' primary_expr",
+	"unary_expr : '~' primary_expr",
+	"primary_expr : scoped_name",
+	"primary_expr : literal",
+	"primary_expr : '(' const_expr ')'",
+	"literal : IDL_INTEGER_LITERAL",
+	"literal : IDL_STRING_LITERAL",
+	"literal : IDL_CHARACTER_LITERAL",
+	"literal : IDL_FLOATING_PT_LITERAL",
+	"literal : IDL_TRUETOK",
+	"literal : IDL_FALSETOK",
+	"positive_int_expr : const_expr",
+	"type_dcl : IDL_TYPEDEF",
+	"type_dcl : IDL_TYPEDEF type_declarator",
+	"type_dcl : struct_type",
+	"type_dcl : union_type",
+	"type_dcl : enum_type",
+	"type_dcl : IDL_NATIVE simple_declarator",
+	"type_declarator : type_spec",
+	"type_declarator : type_spec at_least_one_declarator",
+	"type_spec : simple_type_spec",
+	"type_spec : constructed_type_spec",
+	"simple_type_spec : base_type_spec",
+	"simple_type_spec : template_type_spec",
+	"simple_type_spec : scoped_name",
+	"base_type_spec : integer_type",
+	"base_type_spec : floating_pt_type",
+	"base_type_spec : char_type",
+	"base_type_spec : boolean_type",
+	"base_type_spec : octet_type",
+	"base_type_spec : any_type",
+	"template_type_spec : sequence_type_spec",
+	"template_type_spec : string_type_spec",
+	"template_type_spec : wstring_type_spec",
+	"constructed_type_spec : struct_type",
+	"constructed_type_spec : union_type",
+	"constructed_type_spec : enum_type",
+	"at_least_one_declarator : declarator declarators",
+	"declarators : declarators ','",
+	"declarators : declarators ',' declarator",
+	"declarators : /* empty */",
+	"declarator : simple_declarator",
+	"declarator : complex_declarator",
+	"at_least_one_simple_declarator : simple_declarator simple_declarators",
+	"simple_declarators : simple_declarators ','",
+	"simple_declarators : simple_declarators ',' simple_declarator",
+	"simple_declarators : /* empty */",
+	"simple_declarator : id",
+	"complex_declarator : array_declarator",
+	"integer_type : signed_int",
+	"integer_type : unsigned_int",
+	"signed_int : IDL_LONG",
+	"signed_int : IDL_LONG IDL_LONG",
+	"signed_int : IDL_SHORT",
+	"unsigned_int : IDL_UNSIGNED IDL_LONG",
+	"unsigned_int : IDL_UNSIGNED IDL_LONG IDL_LONG",
+	"unsigned_int : IDL_UNSIGNED IDL_SHORT",
+	"floating_pt_type : IDL_DOUBLE",
+	"floating_pt_type : IDL_FLOAT",
+	"floating_pt_type : IDL_LONG IDL_DOUBLE",
+	"char_type : IDL_CHAR",
+	"char_type : IDL_WCHAR",
+	"octet_type : IDL_OCTET",
+	"boolean_type : IDL_BOOLEAN",
+	"any_type : IDL_ANY",
+	"struct_type : IDL_STRUCT",
+	"struct_type : IDL_STRUCT id",
+	"struct_type : IDL_STRUCT id '{'",
+	"struct_type : IDL_STRUCT id '{' at_least_one_member",
+	"struct_type : IDL_STRUCT id '{' at_least_one_member '}'",
+	"at_least_one_member : member members",
+	"members : members member",
+	"members : /* empty */",
+	"member : type_spec",
+	"member : type_spec at_least_one_declarator",
+	"member : type_spec at_least_one_declarator ';'",
+	"member : error",
+	"member : error ';'",
+	"union_type : IDL_UNION",
+	"union_type : IDL_UNION id",
+	"union_type : IDL_UNION id IDL_SWITCH",
+	"union_type : IDL_UNION id IDL_SWITCH '('",
+	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec",
+	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')'",
+	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{'",
+	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{' at_least_one_case_branch",
+	"union_type : IDL_UNION id IDL_SWITCH '(' switch_type_spec ')' '{' at_least_one_case_branch '}'",
+	"switch_type_spec : integer_type",
+	"switch_type_spec : char_type",
+	"switch_type_spec : octet_type",
+	"switch_type_spec : boolean_type",
+	"switch_type_spec : enum_type",
+	"switch_type_spec : scoped_name",
+	"at_least_one_case_branch : case_branch case_branches",
+	"case_branches : case_branches case_branch",
+	"case_branches : /* empty */",
+	"case_branch : at_least_one_case_label",
+	"case_branch : at_least_one_case_label element_spec",
+	"case_branch : at_least_one_case_label element_spec ';'",
+	"case_branch : error",
+	"case_branch : error ';'",
+	"at_least_one_case_label : case_label case_labels",
+	"case_labels : case_labels case_label",
+	"case_labels : /* empty */",
+	"case_label : IDL_DEFAULT",
+	"case_label : IDL_DEFAULT ':'",
+	"case_label : IDL_CASE",
+	"case_label : IDL_CASE const_expr",
+	"case_label : IDL_CASE const_expr ':'",
+	"element_spec : type_spec",
+	"element_spec : type_spec declarator",
+	"enum_type : IDL_ENUM",
+	"enum_type : IDL_ENUM id",
+	"enum_type : IDL_ENUM id '{'",
+	"enum_type : IDL_ENUM id '{' at_least_one_enumerator",
+	"enum_type : IDL_ENUM id '{' at_least_one_enumerator '}'",
+	"at_least_one_enumerator : enumerator enumerators",
+	"enumerators : enumerators ','",
+	"enumerators : enumerators ',' enumerator",
+	"enumerators : /* empty */",
+	"enumerator : IDENTIFIER",
+	"sequence_type_spec : seq_head ','",
+	"sequence_type_spec : seq_head ',' positive_int_expr",
+	"sequence_type_spec : seq_head ',' positive_int_expr '>'",
+	"sequence_type_spec : seq_head '>'",
+	"seq_head : IDL_SEQUENCE",
+	"seq_head : IDL_SEQUENCE '<'",
+	"seq_head : IDL_SEQUENCE '<' simple_type_spec",
+	"string_type_spec : string_head '<'",
+	"string_type_spec : string_head '<' positive_int_expr",
+	"string_type_spec : string_head '<' positive_int_expr '>'",
+	"string_type_spec : string_head",
+	"string_head : IDL_STRING",
+	"wstring_type_spec : wstring_head '<'",
+	"wstring_type_spec : wstring_head '<' positive_int_expr",
+	"wstring_type_spec : wstring_head '<' positive_int_expr '>'",
+	"wstring_type_spec : wstring_head",
+	"wstring_head : IDL_WSTRING",
+	"array_declarator : id",
+	"array_declarator : id at_least_one_array_dim",
+	"at_least_one_array_dim : array_dim array_dims",
+	"array_dims : array_dims array_dim",
+	"array_dims : /* empty */",
+	"array_dim : '['",
+	"array_dim : '[' positive_int_expr",
+	"array_dim : '[' positive_int_expr ']'",
+	"attribute : opt_readonly IDL_ATTRIBUTE",
+	"attribute : opt_readonly IDL_ATTRIBUTE param_type_spec",
+	"attribute : opt_readonly IDL_ATTRIBUTE param_type_spec at_least_one_simple_declarator",
+	"opt_readonly : IDL_READONLY",
+	"opt_readonly : /* empty */",
+	"exception : IDL_EXCEPTION",
+	"exception : IDL_EXCEPTION id",
+	"exception : IDL_EXCEPTION id '{'",
+	"exception : IDL_EXCEPTION id '{' members",
+	"exception : IDL_EXCEPTION id '{' members '}'",
+	"operation : opt_op_attribute op_type_spec",
+	"operation : opt_op_attribute op_type_spec IDENTIFIER",
+	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list",
+	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list opt_raises",
+	"operation : opt_op_attribute op_type_spec IDENTIFIER parameter_list opt_raises opt_context",
+	"opt_op_attribute : IDL_ONEWAY",
+	"opt_op_attribute : IDL_IDEMPOTENT",
+	"opt_op_attribute : /* empty */",
+	"op_type_spec : param_type_spec",
+	"op_type_spec : IDL_VOID",
+	"parameter_list : '('",
+	"parameter_list : '(' ')'",
+	"parameter_list : '('",
+	"parameter_list : '(' at_least_one_parameter ')'",
+	"at_least_one_parameter : parameter parameters",
+	"parameters : parameters ','",
+	"parameters : parameters ',' parameter",
+	"parameters : /* empty */",
+	"parameter : direction",
+	"parameter : direction param_type_spec",
+	"parameter : direction param_type_spec declarator",
+	"param_type_spec : base_type_spec",
+	"param_type_spec : string_type_spec",
+	"param_type_spec : scoped_name",
+	"direction : IDL_IN",
+	"direction : IDL_OUT",
+	"direction : IDL_INOUT",
+	"opt_raises : IDL_RAISES",
+	"opt_raises : IDL_RAISES '('",
+	"opt_raises : IDL_RAISES '(' at_least_one_scoped_name ')'",
+	"opt_raises : /* empty */",
+	"opt_context : IDL_CONTEXT",
+	"opt_context : IDL_CONTEXT '('",
+	"opt_context : IDL_CONTEXT '(' at_least_one_string_literal ')'",
+	"opt_context : /* empty */",
+	"at_least_one_string_literal : IDL_STRING_LITERAL string_literals",
+	"string_literals : string_literals ','",
+	"string_literals : string_literals ',' IDL_STRING_LITERAL",
+	"string_literals : /* empty */",
+};
+#endif /* TAO_YYDEBUG */
+# line	1 "/usr/ccs/bin/yaccpar"
+/*
+ * Copyright (c) 1993 by Sun Microsystems, Inc.
+ */
+
+// #pragma ident	"@(#)yaccpar	6.14	97/01/16 SMI"
+
+/*
+** Skeleton parser driver for yacc output
+*/
+
+/*
+** yacc user known macros and defines
+*/
+#define TAO_YYERROR		goto tao_yyerrlab
+#define TAO_YYACCEPT	return(0)
+#define TAO_YYABORT		return(1)
+#define TAO_YYBACKUP( newtoken, newvalue )\
+{\
+	if ( tao_yychar >= 0 || ( tao_yyr2[ tao_yytmp ] >> 1 ) != 1 )\
+	{\
+		tao_yyerror( "syntax error - cannot backup" );\
+		goto tao_yyerrlab;\
+	}\
+	tao_yychar = newtoken;\
+	tao_yystate = *tao_yyps;\
+	tao_yylval = newvalue;\
+	goto tao_yynewstate;\
 }
-#endif /* TAO_YYDEBUG_LOOK_AHEAD */
-#ifndef TAO_YYDEBUG_DISCARD_STATE
-#ifdef __cplusplus
-void TAO_YYDEBUG_DISCARD_STATE(int tao_yynew_state, int tao_yyindent)
-#else
-TAO_YYDEBUG_DISCARD_STATE(tao_yynew_state, tao_yyindent)
-int tao_yynew_state;
-int tao_yyindent;
+#define TAO_YYRECOVERING()	(!!tao_yyerrflag)
+#define TAO_YYNEW(type)	malloc(sizeof(type) * tao_yynewmax)
+#define TAO_YYCOPY(to, from, type) \
+	(type *) memcpy(to, (char *) from, tao_yymaxdepth * sizeof (type))
+#define TAO_YYENLARGE( from, type) \
+	(type *) realloc((char *) from, tao_yynewmax * sizeof(type))
+#ifndef TAO_YYDEBUG
+#	define TAO_YYDEBUG	1	/* make debugging available */
 #endif
-{
-    if (0 < tao_yyindent)
-    {  /* draw the graphics for the reduction */
-        TAO_YYDEBUG_INDENT(tao_yyindent-1);
-        printf("%s", TAO_YYDEBUG_REDUCE_STRING);
-        putchar('+'); /* left rotated L would look nice */
-        printf("  discarding state\n");
-        TAO_YYDEBUG_INDENT(tao_yyindent-1);
-        putchar('|'); /* down arrow would look nice */
-        putchar('\n');
-    }
-    else
-    {
-        if (0 == tao_yyindent)
-            printf("discarding state\n");
-        else
-            printf("no more states to discard: parser will abort\n");
-    }
-}
-#endif /* TAO_YYDEBUG_DISCARD_STATE */
-#ifndef TAO_YYDEBUG_DISCARD_TOKEN
-#ifdef __cplusplus
-void TAO_YYDEBUG_DISCARD_TOKEN(int tao_yynew_state, int tao_yytoken_num, char *tao_yytoken_string, int tao_yyindent)
+
+/*
+** user known globals
+*/
+int tao_yydebug;			/* set to 1 to get debugging */
+
+/*
+** driver internal defines
+*/
+#define TAO_YYFLAG		(-10000000)
+
+/*
+** global variables used by the parser
+*/
+TAO_YYSTYPE *tao_yypv;			/* top of value stack */
+int *tao_yyps;			/* top of state stack */
+
+int tao_yystate;			/* current state */
+int tao_yytmp;			/* extra var (lasts between blocks) */
+
+int tao_yynerrs;			/* number of errors */
+int tao_yyerrflag;			/* error recovery flag */
+int tao_yychar;			/* current input token number */
+
+
+
+#ifdef TAO_YYNMBCHARS
+#define TAO_YYLEX()		tao_yycvtok(tao_yylex())
+/*
+** tao_yycvtok - return a token if i is a wchar_t value that exceeds 255.
+**	If i<255, i itself is the token.  If i>255 but the neither
+**	of the 30th or 31st bit is on, i is already a token.
+*/
+#if defined(__STDC__) || defined(__cplusplus)
+int tao_yycvtok(int i)
 #else
-TAO_YYDEBUG_DISCARD_TOKEN(tao_yynew_state, tao_yytoken_num, tao_yytoken_string, tao_yyindent)
-int tao_yynew_state;
-int tao_yytoken_num;
-char * tao_yytoken_string;
-int tao_yyindent;
+int tao_yycvtok(i) int i;
 #endif
 {
-    TAO_YYDEBUG_INDENT(tao_yyindent);
-    printf("discarding token %s\n", tao_yytoken_string);
+	int first = 0;
+	int last = TAO_YYNMBCHARS - 1;
+	int mid;
+	wchar_t j;
+
+	if(i&0x60000000){/*Must convert to a token. */
+		if( tao_yymbchars[last].character < i ){
+			return i;/*Giving up*/
+		}
+		while ((last>=first)&&(first>=0)) {/*Binary search loop*/
+			mid = (first+last)/2;
+			j = tao_yymbchars[mid].character;
+			if( j==i ){/*Found*/
+				return tao_yymbchars[mid].tvalue;
+			}else if( j<i ){
+				first = mid + 1;
+			}else{
+				last = mid -1;
+			}
+		}
+		/*No entry in the table.*/
+		return i;/* Giving up.*/
+	}else{/* i is already a token. */
+		return i;
+	}
 }
-#endif /* TAO_YYDEBUG_DISCARD_TOKEN */
-#ifndef TAO_YYDEBUG_SHIFT_ERROR_LEXEME
-#ifdef __cplusplus
-void TAO_YYDEBUG_SHIFT_ERROR_LEXEME(int tao_yyold_state, int tao_yynew_state, int tao_yyindent)
+#else/*!TAO_YYNMBCHARS*/
+#define TAO_YYLEX()		tao_yylex()
+#endif/*!TAO_YYNMBCHARS*/
+
+/*
+** tao_yyparse - return 0 if worked, 1 if syntax error not recovered from
+*/
+#if defined(__STDC__) || defined(__cplusplus)
+int tao_yyparse(void)
 #else
-TAO_YYDEBUG_SHIFT_ERROR_LEXEME(tao_yyold_state, tao_yynew_state, tao_yyindent)
-int tao_yyold_state;
-int tao_yynew_state;
-int tao_yyindent;
-#endif
-{
-    TAO_YYDEBUG_INDENT(tao_yyindent);
-    printf("error\n");
-}
-#endif /* TAO_YYDEBUG_SHIFT_ERROR_LEXEME */
-#endif /* TAO_YYDEBUG */
-#ifdef __cplusplus
-extern "C" { extern char *ace_foo(const char *); }
+int tao_yyparse()
 #endif
-int
-tao_yyparse()
 {
-    register int tao_yym, tao_yyn, tao_yystate;
-#if TAO_YYDEBUG
-    register char *tao_yys;
-#ifndef __cplusplus
-    extern char *ace_foo();
+	register TAO_YYSTYPE *tao_yypvt = 0;	/* top of value stack for $vars */
+
+#if defined(__cplusplus) || defined(lint)
+/*
+	hacks to please C++ and lint - goto's inside
+	switch should never be executed
+*/
+	static int __yaccpar_lint_hack__ = 0;
+	switch (__yaccpar_lint_hack__)
+	{
+		case 1: goto tao_yyerrlab;
+		case 2: goto tao_yynewstate;
+	}
 #endif
 
-    if ((tao_yys = ACE_OS::getenv("TAO_YYDEBUG")))
-    {
-        tao_yyn = *tao_yys;
-        if (tao_yyn >= '0' && tao_yyn <= '9')
-            tao_yydebug = tao_yyn - '0';
-    }
+	/*
+	** Initialize externals - tao_yyparse may be called more than once
+	*/
+	tao_yypv = &tao_yyv[-1];
+	tao_yyps = &tao_yys[-1];
+	tao_yystate = 0;
+	tao_yytmp = 0;
+	tao_yynerrs = 0;
+	tao_yyerrflag = 0;
+	tao_yychar = -1;
+
+#if TAO_YYMAXDEPTH <= 0
+	if (tao_yymaxdepth <= 0)
+	{
+		if ((tao_yymaxdepth = TAO_YYEXPAND(0)) <= 0)
+		{
+			tao_yyerror("yacc initialization error");
+			TAO_YYABORT;
+		}
+	}
 #endif
 
-    tao_yynerrs = 0;
-    tao_yyerrflag = 0;
-    tao_yychar = (-1);
+	{
+		register TAO_YYSTYPE *tao_yy_pv;	/* top of value stack */
+		register int *tao_yy_ps;		/* top of state stack */
+		register int tao_yy_state;		/* current state */
+		register int  tao_yy_n;		/* internal state number info */
+	goto tao_yystack;	/* moved from 6 lines above to here to please C++ */
+
+		/*
+		** get globals into registers.
+		** branch to here only if TAO_YYBACKUP was called.
+		*/
+	tao_yynewstate:
+		tao_yy_pv = tao_yypv;
+		tao_yy_ps = tao_yyps;
+		tao_yy_state = tao_yystate;
+		goto tao_yy_newstate;
 
-    tao_yyssp = tao_yyss;
-    tao_yyvsp = tao_yyvs;
-    *tao_yyssp = tao_yystate = 0;
+		/*
+		** get globals into registers.
+		** either we just started, or we just finished a reduction
+		*/
+	tao_yystack:
+		tao_yy_pv = tao_yypv;
+		tao_yy_ps = tao_yyps;
+		tao_yy_state = tao_yystate;
 
-tao_yyloop:
-    if ((tao_yyn = tao_yydefred[tao_yystate])) goto tao_yyreduce;
-    if (tao_yychar < 0)
-    {
-        if ((tao_yychar = tao_yylex()) < 0) tao_yychar = 0;
+		/*
+		** top of for (;;) loop while no reductions done
+		*/
+	tao_yy_stack:
+		/*
+		** put a state and value onto the stacks
+		*/
 #if TAO_YYDEBUG
-        if (tao_yydebug)
-        {
-            tao_yys = 0;
-            if (tao_yychar <= TAO_YYMAXTOKEN) tao_yys = tao_yyname[tao_yychar];
-            if (!tao_yys) tao_yys = "illegal-symbol";
-            if (5 < tao_yydebug)
-                printf("tao_yydebug: state %d, reading %d (%s)\n", tao_yystate,
-                        tao_yychar, tao_yys);
-            else
-                TAO_YYDEBUG_LOOK_AHEAD(tao_yystate, tao_yychar, tao_yys, tao_yyssp-tao_yyss);
-        }
+		/*
+		** if debugging, look up token value in list of value vs.
+		** name pairs.  0 and negative (-1) are special values.
+		** Note: linear search is used since time is not a real
+		** consideration while debugging.
+		*/
+		if ( tao_yydebug )
+		{
+			register int tao_yy_i;
+
+			printf( "State %d, token ", tao_yy_state );
+			if ( tao_yychar == 0 )
+				printf( "end-of-file\n" );
+			else if ( tao_yychar < 0 )
+				printf( "-none-\n" );
+			else
+			{
+				for ( tao_yy_i = 0; tao_yytoks[tao_yy_i].t_val >= 0;
+					tao_yy_i++ )
+				{
+					if ( tao_yytoks[tao_yy_i].t_val == tao_yychar )
+						break;
+				}
+				printf( "%s\n", tao_yytoks[tao_yy_i].t_name );
+			}
+		}
+#endif /* TAO_YYDEBUG */
+		if ( ++tao_yy_ps >= &tao_yys[ tao_yymaxdepth ] )	/* room on stack? */
+		{
+			/*
+			** reallocate and recover.  Note that pointers
+			** have to be reset, or bad things will happen
+			*/
+			int tao_yyps_index = (tao_yy_ps - tao_yys);
+			int tao_yypv_index = (tao_yy_pv - tao_yyv);
+			int tao_yypvt_index = (tao_yypvt - tao_yyv);
+			int tao_yynewmax;
+#ifdef TAO_YYEXPAND
+			tao_yynewmax = TAO_YYEXPAND(tao_yymaxdepth);
+#else
+			tao_yynewmax = 2 * tao_yymaxdepth;	/* double table size */
+			if (tao_yymaxdepth == TAO_YYMAXDEPTH)	/* first time growth */
+			{
+				char *newtao_yys = (char *)TAO_YYNEW(int);
+				char *newtao_yyv = (char *)TAO_YYNEW(TAO_YYSTYPE);
+				if (newtao_yys != 0 && newtao_yyv != 0)
+				{
+					tao_yys = TAO_YYCOPY(newtao_yys, tao_yys, int);
+					tao_yyv = TAO_YYCOPY(newtao_yyv, tao_yyv, TAO_YYSTYPE);
+				}
+				else
+					tao_yynewmax = 0;	/* failed */
+			}
+			else				/* not first time */
+			{
+				tao_yys = TAO_YYENLARGE(tao_yys, int);
+				tao_yyv = TAO_YYENLARGE(tao_yyv, TAO_YYSTYPE);
+				if (tao_yys == 0 || tao_yyv == 0)
+					tao_yynewmax = 0;	/* failed */
+			}
 #endif
-    }
-    if ((tao_yyn = tao_yysindex[tao_yystate]) && (tao_yyn += tao_yychar) >= 0 &&
-            tao_yyn <= TAO_YYTABLESIZE && tao_yycheck[tao_yyn] == tao_yychar)
-    {
+			if (tao_yynewmax <= tao_yymaxdepth)	/* tables not expanded */
+			{
+				tao_yyerror( "yacc stack overflow" );
+				TAO_YYABORT;
+			}
+			tao_yymaxdepth = tao_yynewmax;
+
+			tao_yy_ps = tao_yys + tao_yyps_index;
+			tao_yy_pv = tao_yyv + tao_yypv_index;
+			tao_yypvt = tao_yyv + tao_yypvt_index;
+		}
+		*tao_yy_ps = tao_yy_state;
+		*++tao_yy_pv = tao_yyval;
+
+		/*
+		** we have a new state - find out what to do
+		*/
+	tao_yy_newstate:
+		if ( ( tao_yy_n = tao_yypact[ tao_yy_state ] ) <= TAO_YYFLAG )
+			goto tao_yydefault;		/* simple state */
 #if TAO_YYDEBUG
-        if (tao_yydebug)
-            if (5 < tao_yydebug)
-                printf("tao_yydebug: state %d, shifting to state %d\n",
-                        tao_yystate, tao_yytable[tao_yyn]);
-            else
-                TAO_YYDEBUG_SHIFT_LEXEME(tao_yystate, tao_yytable[tao_yyn], tao_yys, tao_yyssp-tao_yyss);
-#endif
-        if (tao_yyssp >= tao_yyss + tao_yystacksize - 1)
-        {
-            goto tao_yyoverflow;
-        }
-        *++tao_yyssp = tao_yystate = tao_yytable[tao_yyn];
-        *++tao_yyvsp = tao_yylval;
-        tao_yychar = (-1);
-        if (tao_yyerrflag > 0)  --tao_yyerrflag;
-        goto tao_yyloop;
-    }
-    if ((tao_yyn = tao_yyrindex[tao_yystate]) && (tao_yyn += tao_yychar) >= 0 &&
-            tao_yyn <= TAO_YYTABLESIZE && tao_yycheck[tao_yyn] == tao_yychar)
-    {
-        tao_yyn = tao_yytable[tao_yyn];
-        goto tao_yyreduce;
-    }
-    if (tao_yyerrflag) goto tao_yyinrecovery;
-#ifdef lint
-    goto tao_yynewerror;
+		/*
+		** if debugging, need to mark whether new token grabbed
+		*/
+		tao_yytmp = tao_yychar < 0;
 #endif
+		if ( ( tao_yychar < 0 ) && ( ( tao_yychar = TAO_YYLEX() ) < 0 ) )
+			tao_yychar = 0;		/* reached EOF */
+#if TAO_YYDEBUG
+		if ( tao_yydebug && tao_yytmp )
+		{
+			register int tao_yy_i;
 
-    tao_yyerror("syntax error");
-#ifdef lint
-    goto tao_yyerrlab;
-#endif
-    ++tao_yynerrs;
-tao_yyinrecovery:
-    if (tao_yyerrflag < 3)
-    {
-        tao_yyerrflag = 3;
-        for (;;)
-        {
-            if ((tao_yyn = tao_yysindex[*tao_yyssp]) && (tao_yyn += TAO_YYERRCODE) >= 0 &&
-                    tao_yyn <= TAO_YYTABLESIZE && tao_yycheck[tao_yyn] == TAO_YYERRCODE)
-            {
+			printf( "Received token " );
+			if ( tao_yychar == 0 )
+				printf( "end-of-file\n" );
+			else if ( tao_yychar < 0 )
+				printf( "-none-\n" );
+			else
+			{
+				for ( tao_yy_i = 0; tao_yytoks[tao_yy_i].t_val >= 0;
+					tao_yy_i++ )
+				{
+					if ( tao_yytoks[tao_yy_i].t_val == tao_yychar )
+						break;
+				}
+				printf( "%s\n", tao_yytoks[tao_yy_i].t_name );
+			}
+		}
+#endif /* TAO_YYDEBUG */
+		if ( ( ( tao_yy_n += tao_yychar ) < 0 ) || ( tao_yy_n >= TAO_YYLAST ) )
+			goto tao_yydefault;
+		if ( tao_yychk[ tao_yy_n = tao_yyact[ tao_yy_n ] ] == tao_yychar )	/*valid shift*/
+		{
+			tao_yychar = -1;
+			tao_yyval = tao_yylval;
+			tao_yy_state = tao_yy_n;
+			if ( tao_yyerrflag > 0 )
+				tao_yyerrflag--;
+			goto tao_yy_stack;
+		}
+
+	tao_yydefault:
+		if ( ( tao_yy_n = tao_yydef[ tao_yy_state ] ) == -2 )
+		{
 #if TAO_YYDEBUG
-                if (tao_yydebug)
-                    if (5 < tao_yydebug)
-                        printf("tao_yydebug: state %d, error recovery shifting\
- to state %d\n", *tao_yyssp, tao_yytable[tao_yyn]);
-                    else
-                        TAO_YYDEBUG_SHIFT_ERROR_LEXEME(*tao_yyssp, tao_yytable[tao_yyn], tao_yyssp-tao_yyss);
+			tao_yytmp = tao_yychar < 0;
 #endif
-                if (tao_yyssp >= tao_yyss + tao_yystacksize - 1)
-                {
-                    goto tao_yyoverflow;
-                }
-                *++tao_yyssp = tao_yystate = tao_yytable[tao_yyn];
-                *++tao_yyvsp = tao_yylval;
-                goto tao_yyloop;
-            }
-            else
-            {
+			if ( ( tao_yychar < 0 ) && ( ( tao_yychar = TAO_YYLEX() ) < 0 ) )
+				tao_yychar = 0;		/* reached EOF */
 #if TAO_YYDEBUG
-                if (tao_yydebug)
-                    if (5 < tao_yydebug)
-                        printf("tao_yydebug: error recovery discarding state %d\
-",
-                            *tao_yyssp);
-                    else
-                        TAO_YYDEBUG_DISCARD_STATE(*tao_yyssp, tao_yyssp-tao_yyss-1);
-#endif
-                if (tao_yyssp <= tao_yyss) goto tao_yyabort;
-                --tao_yyssp;
-                --tao_yyvsp;
-            }
-        }
-    }
-    else
-    {
-        if (tao_yychar == 0) goto tao_yyabort;
+			if ( tao_yydebug && tao_yytmp )
+			{
+				register int tao_yy_i;
+
+				printf( "Received token " );
+				if ( tao_yychar == 0 )
+					printf( "end-of-file\n" );
+				else if ( tao_yychar < 0 )
+					printf( "-none-\n" );
+				else
+				{
+					for ( tao_yy_i = 0;
+						tao_yytoks[tao_yy_i].t_val >= 0;
+						tao_yy_i++ )
+					{
+						if ( tao_yytoks[tao_yy_i].t_val
+							== tao_yychar )
+						{
+							break;
+						}
+					}
+					printf( "%s\n", tao_yytoks[tao_yy_i].t_name );
+				}
+			}
+#endif /* TAO_YYDEBUG */
+			/*
+			** look through exception table
+			*/
+			{
+				register const int *tao_yyxi = tao_yyexca;
+
+				while ( ( *tao_yyxi != -1 ) ||
+					( tao_yyxi[1] != tao_yy_state ) )
+				{
+					tao_yyxi += 2;
+				}
+				while ( ( *(tao_yyxi += 2) >= 0 ) &&
+					( *tao_yyxi != tao_yychar ) )
+					;
+				if ( ( tao_yy_n = tao_yyxi[1] ) < 0 )
+					TAO_YYACCEPT;
+			}
+		}
+
+		/*
+		** check for syntax error
+		*/
+		if ( tao_yy_n == 0 )	/* have an error */
+		{
+			/* no worry about speed here! */
+			switch ( tao_yyerrflag )
+			{
+			case 0:		/* new error */
+				tao_yyerror( "syntax error" );
+				goto skip_init;
+			tao_yyerrlab:
+				/*
+				** get globals into registers.
+				** we have a user generated syntax type error
+				*/
+				tao_yy_pv = tao_yypv;
+				tao_yy_ps = tao_yyps;
+				tao_yy_state = tao_yystate;
+			skip_init:
+				tao_yynerrs++;
+				/* FALLTHRU */
+			case 1:
+			case 2:		/* incompletely recovered error */
+					/* try again... */
+				tao_yyerrflag = 3;
+				/*
+				** find state where "error" is a legal
+				** shift action
+				*/
+				while ( tao_yy_ps >= tao_yys )
+				{
+					tao_yy_n = tao_yypact[ *tao_yy_ps ] + TAO_YYERRCODE;
+					if ( tao_yy_n >= 0 && tao_yy_n < TAO_YYLAST &&
+						tao_yychk[tao_yyact[tao_yy_n]] == TAO_YYERRCODE)					{
+						/*
+						** simulate shift of "error"
+						*/
+						tao_yy_state = tao_yyact[ tao_yy_n ];
+						goto tao_yy_stack;
+					}
+					/*
+					** current state has no shift on
+					** "error", pop stack
+					*/
 #if TAO_YYDEBUG
-        if (tao_yydebug)
-        {
-            tao_yys = 0;
-            if (tao_yychar <= TAO_YYMAXTOKEN) tao_yys = tao_yyname[tao_yychar];
-            if (!tao_yys) tao_yys = "illegal-symbol";
-            if (5 < tao_yydebug)
-                printf("tao_yydebug: state %d, error recovery discards token %d (%s)\n",
-                    tao_yystate, tao_yychar, tao_yys);
-            else
-                TAO_YYDEBUG_DISCARD_TOKEN(tao_yystate, tao_yychar, tao_yys, tao_yyssp-tao_yyss);
-        }
+#	define _POP_ "Error recovery pops state %d, uncovers state %d\n"
+					if ( tao_yydebug )
+						printf( _POP_, *tao_yy_ps,
+							tao_yy_ps[-1] );
+#	undef _POP_
 #endif
-        tao_yychar = (-1);
-        goto tao_yyloop;
-    }
-tao_yyreduce:
-    tao_yym = tao_yylen[tao_yyn];
-    tao_yyval = tao_yyvsp[1-tao_yym];
+					tao_yy_ps--;
+					tao_yy_pv--;
+				}
+				/*
+				** there is no state on stack with "error" as
+				** a valid shift.  give up.
+				*/
+				TAO_YYABORT;
+			case 3:		/* no shift yet; eat a token */
 #if TAO_YYDEBUG
-    if (tao_yydebug)
-        if (5 < tao_yydebug)
-            printf("tao_yydebug: state %d, reducing by rule %d (%s)\n",
-                    tao_yystate, tao_yyn, tao_yyrule[tao_yyn]);
-        else
-            TAO_YYDEBUG_REDUCE(tao_yystate, tao_yyn, tao_yyrule[tao_yyn], tao_yyssp-tao_yyss-tao_yym, tao_yym);
+				/*
+				** if debugging, look up token in list of
+				** pairs.  0 and negative shouldn't occur,
+				** but since timing doesn't matter when
+				** debugging, it doesn't hurt to leave the
+				** tests here.
+				*/
+				if ( tao_yydebug )
+				{
+					register int tao_yy_i;
+
+					printf( "Error recovery discards " );
+					if ( tao_yychar == 0 )
+						printf( "token end-of-file\n" );
+					else if ( tao_yychar < 0 )
+						printf( "token -none-\n" );
+					else
+					{
+						for ( tao_yy_i = 0;
+							tao_yytoks[tao_yy_i].t_val >= 0;
+							tao_yy_i++ )
+						{
+							if ( tao_yytoks[tao_yy_i].t_val
+								== tao_yychar )
+							{
+								break;
+							}
+						}
+						printf( "token %s\n",
+							tao_yytoks[tao_yy_i].t_name );
+					}
+				}
+#endif /* TAO_YYDEBUG */
+				if ( tao_yychar == 0 )	/* reached EOF. quit */
+					TAO_YYABORT;
+				tao_yychar = -1;
+				goto tao_yy_newstate;
+			}
+		}/* end if ( tao_yy_n == 0 ) */
+		/*
+		** reduction by production tao_yy_n
+		** put stack tops, etc. so things right after switch
+		*/
+#if TAO_YYDEBUG
+		/*
+		** if debugging, print the string that is the user's
+		** specification of the reduction which is just about
+		** to be done.
+		*/
+		if ( tao_yydebug )
+			printf( "Reduce by (%d) \"%s\"\n",
+				tao_yy_n, tao_yyreds[ tao_yy_n ] );
 #endif
-    switch (tao_yyn)
-    {
+		tao_yytmp = tao_yy_n;			/* value to switch over */
+		tao_yypvt = tao_yy_pv;			/* $vars top of value stack */
+		/*
+		** Look in goto table for next state
+		** Sorry about using tao_yy_state here as temporary
+		** register variable, but why not, if it works...
+		** If tao_yyr2[ tao_yy_n ] doesn't have the low order bit
+		** set, then there is no action to be done for
+		** this reduction.  So, no saving & unsaving of
+		** registers done.  The only difference between the
+		** code just after the if and the body of the if is
+		** the goto tao_yy_stack in the body.  This way the test
+		** can be made before the choice of what to do is needed.
+		*/
+		{
+			/* length of production doubled with extra bit */
+			register int tao_yy_len = tao_yyr2[ tao_yy_n ];
+
+			if ( !( tao_yy_len & 01 ) )
+			{
+				tao_yy_len >>= 1;
+				tao_yyval = ( tao_yy_pv -= tao_yy_len )[1];	/* $$ = $1 */
+				tao_yy_state = tao_yypgo[ tao_yy_n = tao_yyr1[ tao_yy_n ] ] +
+					*( tao_yy_ps -= tao_yy_len ) + 1;
+				if ( tao_yy_state >= TAO_YYLAST ||
+					tao_yychk[ tao_yy_state =
+					tao_yyact[ tao_yy_state ] ] != -tao_yy_n )
+				{
+					tao_yy_state = tao_yyact[ tao_yypgo[ tao_yy_n ] ];
+				}
+				goto tao_yy_stack;
+			}
+			tao_yy_len >>= 1;
+			tao_yyval = ( tao_yy_pv -= tao_yy_len )[1];	/* $$ = $1 */
+			tao_yy_state = tao_yypgo[ tao_yy_n = tao_yyr1[ tao_yy_n ] ] +
+				*( tao_yy_ps -= tao_yy_len ) + 1;
+			if ( tao_yy_state >= TAO_YYLAST ||
+				tao_yychk[ tao_yy_state = tao_yyact[ tao_yy_state ] ] != -tao_yy_n )
+			{
+				tao_yy_state = tao_yyact[ tao_yypgo[ tao_yy_n ] ];
+			}
+		}
+					/* save until reenter driver code */
+		tao_yystate = tao_yy_state;
+		tao_yyps = tao_yy_ps;
+		tao_yypv = tao_yy_pv;
+	}
+	/*
+	** code supplied by user is placed in this switch
+	*/
+	switch( tao_yytmp )
+	{
+
 case 4:
-#line 253 "fe/idl.tao_yy"
+# line 240 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+        } break;
 case 5:
-#line 257 "fe/idl.tao_yy"
+# line 244 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 6:
-#line 261 "fe/idl.tao_yy"
+# line 248 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
+        } break;
 case 7:
-#line 265 "fe/idl.tao_yy"
+# line 252 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 8:
-#line 269 "fe/idl.tao_yy"
+# line 256 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
+        } break;
 case 9:
-#line 273 "fe/idl.tao_yy"
+# line 260 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 10:
-#line 277 "fe/idl.tao_yy"
+# line 264 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceDeclSeen);
+        } break;
 case 11:
-#line 281 "fe/idl.tao_yy"
+# line 268 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 12:
-#line 285 "fe/idl.tao_yy"
+# line 272 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ModuleDeclSeen);
+        } break;
 case 13:
-#line 289 "fe/idl.tao_yy"
+# line 276 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 14:
-#line 293 "fe/idl.tao_yy"
+# line 280 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeDeclSeen);
-        }
-break;
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	} break;
 case 15:
-#line 297 "fe/idl.tao_yy"
+# line 284 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	} break;
 case 16:
-#line 301 "fe/idl.tao_yy"
+# line 291 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
-break;
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
+	  } break;
 case 17:
-#line 305 "fe/idl.tao_yy"
+# line 295 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
-break;
+	    UTL_ScopedName 	*n =
+		new UTL_ScopedName(new Identifier(tao_yypvt[-0].strval, 1, 0, I_FALSE), NULL);
+	    AST_Module		*m = NULL;
+	    UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	    UTL_StrList		*p = idl_global->pragmas();
+
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
+	    /*
+	     * Make a new module and add it to the enclosing scope
+	     */
+	    if (s != NULL) {
+	      m = idl_global->gen()->create_module(n, p);
+	      (void) s->fe_add_module(m);
+	    }
+	    /*
+	     * Push it on the stack
+	     */
+	    idl_global->scopes()->push(m);
+	  } break;
 case 18:
-#line 312 "fe/idl.tao_yy"
+# line 316 "fe/idl.tao_yy"
 {
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSeen);
-          }
-break;
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
+	  } break;
 case 19:
-#line 316 "fe/idl.tao_yy"
-{
-            UTL_ScopedName      *n =
-                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-            AST_Module          *m = NULL;
-            UTL_Scope           *s = idl_global->scopes()->top_non_null();
-            UTL_StrList         *p = idl_global->pragmas();
-
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleIDSeen);
-            /*
-             * Make a new module and add it to the enclosing scope
-             */
-            if (s != NULL) {
-              m = idl_global->gen()->create_module(n, p);
-              (void) s->fe_add_module(m);
-            }
-            /*
-             * Push it on the stack
-             */
-            idl_global->scopes()->push(m);
-          }
-break;
+# line 320 "fe/idl.tao_yy"
+{
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
+	  } break;
 case 20:
-#line 337 "fe/idl.tao_yy"
-{
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleSqSeen);
-          }
-break;
-case 21:
-#line 341 "fe/idl.tao_yy"
-{
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleBodySeen);
-          }
-break;
-case 22:
-#line 345 "fe/idl.tao_yy"
-{
-            idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
-            /*
-             * Finished with this module - pop it from the scope stack
-             */
-            UTL_Scope* s = idl_global->scopes()->top();
-            AST_Module* m = AST_Module::narrow_from_scope (s);
-            UTL_StrList *p = m->pragmas ();
-            if (p != 0)
-                p = (UTL_StrList*)p->copy ();
-            idl_global->set_pragmas (p);
-            idl_global->scopes()->pop();
-          }
-break;
+# line 324 "fe/idl.tao_yy"
+{
+	    idl_global->set_parse_state(IDL_GlobalData::PS_ModuleQsSeen);
+	    /*
+	     * Finished with this module - pop it from the scope stack
+	     */
+	    UTL_Scope* s = idl_global->scopes()->top();
+	    AST_Module* m = AST_Module::narrow_from_scope (s);
+	    UTL_StrList *p = m->pragmas ();
+	    if (p != 0)
+		p = (UTL_StrList*)p->copy ();
+	    idl_global->set_pragmas (p);
+	    idl_global->scopes()->pop();
+	  } break;
+case 23:
+# line 346 "fe/idl.tao_yy"
+{
+	  UTL_Scope     *s = idl_global->scopes()->top_non_null();
+	  AST_Interface *i = NULL;
+	  AST_Decl	*v = NULL;
+	  UTL_StrList   *p = idl_global->pragmas();
+	  AST_Decl	*d = NULL;
+	  AST_Interface *fd = NULL;
+
+	  ACE_UNUSED_ARG (v);
+
+	  /*
+	   * Make a new interface node and add it to its enclosing scope
+	   */
+	  if (s != NULL && tao_yypvt[-0].ihval != NULL) {
+	    i = idl_global->gen()->create_interface(tao_yypvt[-0].ihval->interface_name(),
+						    tao_yypvt[-0].ihval->inherits(),
+						    tao_yypvt[-0].ihval->n_inherits(),
+						    p);
+	    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?
+		   */
+		}
+		/*
+		 * 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 {
+		    fd->set_inherits(tao_yypvt[-0].ihval->inherits());
+		    fd->set_n_inherits(tao_yypvt[-0].ihval->n_inherits());
+		    /*
+		     * Update place of definition
+		     */
+		    fd->set_imported(idl_global->imported());
+		    fd->set_in_main_file(idl_global->in_main_file());
+		    fd->set_line(idl_global->lineno());
+		    fd->set_file_name(idl_global->filename());
+		    fd->add_pragmas(p);
+		    /*
+		     * Use full definition node
+		     */
+		    delete i;
+		    i = fd;
+		  }
+	        }
+	      }
+	    }
+	    /*
+	     * Add the interface to its definition scope
+	     */
+	    (void) s->fe_add_interface(i);
+	  }
+	  /*
+	   * Push it on the scope stack
+	   */
+	  idl_global->scopes()->push(i);
+        } break;
+case 24:
+# line 430 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
+	} break;
 case 25:
-#line 367 "fe/idl.tao_yy"
+# line 434 "fe/idl.tao_yy"
 {
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Interface *i = NULL;
-          AST_Decl      *v = NULL;
-          UTL_StrList   *p = idl_global->pragmas();
-          ACE_UNUSED_ARG (v);
-
-          /*
-           * Make a new interface node and add it to its enclosing scope
-           */
-          if (s != NULL && tao_yyvsp[0].ihval != NULL) {
-            i = idl_global->gen()->create_interface(tao_yyvsp[0].ihval->interface_name(),
-                                                    tao_yyvsp[0].ihval->inherits(),
-                                                    tao_yyvsp[0].ihval->n_inherits(),
-                                                    p);
-            AST_Interface::fwd_redefinition_helper (i,s,p);
-            /*
-             * Add the interface to its definition scope
-             */
-            (void) s->fe_add_interface(i);
-          }
-          /*
-           * Push it on the scope stack
-           */
-          idl_global->scopes()->push(i);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
+	} break;
 case 26:
-#line 394 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-        }
-break;
+# line 438 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
+	  /*
+	   * Done with this interface - pop it off the scopes stack
+	   */
+	  UTL_Scope* s = idl_global->scopes()->top();
+	  AST_Interface* m = AST_Interface::narrow_from_scope (s);
+	  UTL_StrList *p = m->pragmas ();
+	  if (p != 0)
+		p = (UTL_StrList*)p->copy ();
+	  idl_global->set_pragmas (p);
+	  idl_global->scopes()->pop();
+	} break;
 case 27:
-#line 398 "fe/idl.tao_yy"
+# line 455 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-        }
-break;
+	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
+	 } break;
 case 28:
-#line 402 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-          /*
-           * Done with this interface - pop it off the scopes stack
-           */
-          UTL_Scope* s = idl_global->scopes()->top();
-          AST_Interface* m = AST_Interface::narrow_from_scope (s);
-          UTL_StrList *p = m->pragmas ();
-          if (p != 0)
-                p = (UTL_StrList*)p->copy ();
-          idl_global->set_pragmas (p);
-          idl_global->scopes()->pop();
-        }
-break;
-case 29:
-#line 419 "fe/idl.tao_yy"
+# line 459 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSeen);
-         }
-break;
+	   idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
+	   tao_yyval.idval = tao_yypvt[-0].idval;
+	 } break;
+case 29:
+# line 467 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
+	  /*
+	   * Create an AST representation of the information in the header
+	   * part of an interface - this representation contains a computed
+	   * list of all interfaces which this interface inherits from,
+	   * recursively
+	   */
+	  tao_yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(tao_yypvt[-1].idval, NULL), tao_yypvt[-0].nlval);
+	} break;
 case 30:
-#line 423 "fe/idl.tao_yy"
+# line 481 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceIDSeen);
-           tao_yyval.idval = tao_yyvsp[0].idval;
-         }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
+        } break;
 case 31:
-#line 431 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InheritSpecSeen);
-          /*
-           * Create an AST representation of the information in the header
-           * part of an interface - this representation contains a computed
-           * list of all interfaces which this interface inherits from,
-           * recursively
-           */
-          tao_yyval.ihval = new FE_InterfaceHeader(new UTL_ScopedName(tao_yyvsp[-1].idval, NULL), tao_yyvsp[0].nlval);
-        }
-break;
+# line 485 "fe/idl.tao_yy"
+{
+	  tao_yyval.nlval = tao_yypvt[-0].nlval;
+	} break;
 case 32:
-#line 445 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InheritColonSeen);
-        }
-break;
-case 33:
-#line 449 "fe/idl.tao_yy"
-{
-          tao_yyval.nlval = tao_yyvsp[0].nlval;
-        }
-break;
-case 34:
-#line 453 "fe/idl.tao_yy"
-{
-          tao_yyval.nlval = NULL;
-        }
-break;
+# line 489 "fe/idl.tao_yy"
+{
+	  tao_yyval.nlval = NULL;
+	} break;
+case 35:
+# line 501 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
+        } break;
+case 36:
+# line 505 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
+case 37:
+# line 509 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
+        } break;
+case 38:
+# line 513 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 39:
-#line 467 "fe/idl.tao_yy"
-{
-           cerr << "error in " << idl_global->filename()->get_string()
-                << " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle custom yet\n";
-            /* set custom (if not truncatable) */
-        }
-break;
+# line 517 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
+        } break;
+case 40:
+# line 521 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 41:
-#line 478 "fe/idl.tao_yy"
-{
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Interface *i = NULL;
-          UTL_StrList   *p = idl_global->pragmas();
-
-          if (s != NULL && tao_yyvsp[0].vhval != NULL) {
-            i = idl_global->gen()->create_valuetype(tao_yyvsp[0].vhval->interface_name(),
-                                                    tao_yyvsp[0].vhval->inherits(),
-                                                    tao_yyvsp[0].vhval->n_inherits(),
-                                                    p);
-            AST_Interface::fwd_redefinition_helper (i,s,p);
-            /*
-             * Add the valuetype to its definition scope
-             */
-            (void) s->fe_add_interface(i);
-          }
-          /*
-           * Push it on the scope stack
-           */
-          idl_global->scopes()->push(i);
-        }
-break;
+# line 525 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
+        } break;
 case 42:
-#line 500 "fe/idl.tao_yy"
+# line 529 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 43:
-#line 504 "fe/idl.tao_yy"
+# line 533 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
+        } break;
 case 44:
-#line 508 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-          /*
-           * Done with this interface - pop it off the scopes stack
-           */
-          UTL_Scope* s = idl_global->scopes()->top();
-          AST_Interface* m = AST_Interface::narrow_from_scope (s);
-          UTL_StrList *p = m->pragmas ();
-          if (p != 0) p = (UTL_StrList*)p->copy ();
-          idl_global->set_pragmas (p);
-          idl_global->scopes()->pop();
-        }
-break;
+# line 537 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+        } break;
 case 45:
-#line 525 "fe/idl.tao_yy"
-{
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Interface *i = NULL;
-          UTL_StrList   *p = idl_global->pragmas();
-
-          if (s != NULL && tao_yyvsp[0].vhval != NULL) {
-
-            if (tao_yyvsp[0].vhval->n_concrete() > 0) {
-              idl_global->err()->abstract_inheritance_error (tao_yyvsp[0].vhval->interface_name ());
-            }
-
-            i = idl_global->gen()->create_valuetype(tao_yyvsp[0].vhval->interface_name(),
-                                                    tao_yyvsp[0].vhval->inherits(),
-                                                    tao_yyvsp[0].vhval->n_inherits(),
-                                                    p);
-            i->set_abstract_valuetype ();
-            AST_Interface::fwd_redefinition_helper (i,s,p);
-            /*
-             * Add the valuetype to its definition scope
-             */
-            (void) s->fe_add_interface(i);
-          }
-          /*
-           * Push it on the scope stack
-           */
-          idl_global->scopes()->push(i);
-        }
-break;
+# line 541 "fe/idl.tao_yy"
+{
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	} break;
 case 46:
-#line 553 "fe/idl.tao_yy"
+# line 545 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceSqSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	} break;
 case 47:
-#line 557 "fe/idl.tao_yy"
+# line 553 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceBodySeen);
-        }
-break;
+	  tao_yyval.nlval = new UTL_NameList(tao_yypvt[-1].idlist, tao_yypvt[-0].nlval);
+	} break;
 case 48:
-#line 561 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_InterfaceQsSeen);
-          /*
-           * Done with this interface - pop it off the scopes stack
-           */
-          UTL_Scope* s = idl_global->scopes()->top();
-          AST_Interface* m = AST_Interface::narrow_from_scope (s);
-          UTL_StrList *p = m->pragmas ();
-          if (p != 0) p = (UTL_StrList*)p->copy ();
-          idl_global->set_pragmas (p);
-          idl_global->scopes()->pop();
-        }
-break;
+# line 561 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
+        } break;
 case 49:
-#line 581 "fe/idl.tao_yy"
+# line 565 "fe/idl.tao_yy"
 {
-          tao_yyval.vhval = new FE_obv_header (new UTL_ScopedName (tao_yyvsp[-3].idval, NULL), tao_yyvsp[-1].nlval, tao_yyvsp[0].nlval);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
+
+	  if (tao_yypvt[-3].nlval == NULL)
+	    tao_yyval.nlval = new UTL_NameList(tao_yypvt[-0].idlist, NULL);
+	  else {
+	    tao_yypvt[-3].nlval->nconc(new UTL_NameList(tao_yypvt[-0].idlist, NULL));
+	    tao_yyval.nlval = tao_yypvt[-3].nlval;
+	  }
+	} break;
 case 50:
-#line 588 "fe/idl.tao_yy"
+# line 576 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeSeen);
-        }
-break;
+	  tao_yyval.nlval = NULL;
+	} break;
 case 51:
-#line 592 "fe/idl.tao_yy"
+# line 583 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_ValuetypeIDSeen);
-           tao_yyval.idval = tao_yyvsp[0].idval;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+	  tao_yyval.idlist = new UTL_IdList(tao_yypvt[-0].idval, NULL);
+	} break;
 case 52:
-#line 600 "fe/idl.tao_yy"
-{
-            cerr << "warning in " << idl_global->filename()->get_string()
-                 << " line " << idl_global->lineno() << ":\n" ;
-            cerr << "truncatable modifier not supported and is ignored\n";
-            tao_yyval.bval = I_FALSE;
-            /* $$ = I_TRUE; */
-          }
-break;
+# line 589 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
+        } break;
 case 53:
-#line 608 "fe/idl.tao_yy"
+# line 593 "fe/idl.tao_yy"
 {
-            tao_yyval.bval = I_FALSE;
-          }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+	  tao_yyval.idlist = new UTL_IdList(new Identifier(tao_yypvt[-2].strval, 1, 0, I_FALSE),
+			      new UTL_IdList(tao_yypvt[-0].idval, NULL));
+	} break;
 case 54:
-#line 616 "fe/idl.tao_yy"
+# line 601 "fe/idl.tao_yy"
 {
-              tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
-            }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
+        } break;
 case 55:
-#line 620 "fe/idl.tao_yy"
+# line 605 "fe/idl.tao_yy"
 {
-              tao_yyval.nlval = NULL;
-            }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
+
+	  tao_yypvt[-3].idlist->nconc(new UTL_IdList(tao_yypvt[-0].idval, NULL));
+	  tao_yyval.idlist = tao_yypvt[-3].idlist;
+	} break;
 case 56:
-#line 628 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_InterfaceFwd      *f = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-          /*
-           * Create a node representing a forward declaration of an
-           * valuetype. Store it in the enclosing scope
-           */
-          if (s != NULL) {
-            f = idl_global->gen()->create_valuetype_fwd(n, p);
-         /*   if ($1)*/
-            f->set_abstract_valuetype ();
-            (void) s->fe_add_interface_fwd(f);
-          }
-        }
-break;
+# line 614 "fe/idl.tao_yy"
+{
+            tao_yyval.idval = new Identifier(tao_yypvt[-0].strval, 1, 0, I_FALSE);
+        } break;
 case 57:
-#line 648 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_InterfaceFwd      *f = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-          /*
-           * Create a node representing a forward declaration of an
-           * valuetype. Store it in the enclosing scope
-           */
-          if (s != NULL) {
-            f = idl_global->gen()->create_valuetype_fwd(n, p);
-            (void) s->fe_add_interface_fwd(f);
-          }
-        }
-break;
+# line 621 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-0].idval, NULL);
+	  AST_InterfaceFwd	*f = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
+	  /*
+	   * Create a node representing a forward declaration of an
+	   * interface. Store it in the enclosing scope
+	   */
+	  if (s != NULL) {
+	    f = idl_global->gen()->create_interface_fwd(n, p);
+	    (void) s->fe_add_interface_fwd(f);
+	  }
+	} break;
 case 58:
-#line 669 "fe/idl.tao_yy"
-{
-           cerr << "error in " << idl_global->filename()->get_string()
-                << " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle boxes yet\n";
-        }
-break;
-case 64:
-#line 689 "fe/idl.tao_yy"
-{
-            /* is $0 to member_i */
-            tao_yyval.vival = AST_Field::vis_PUBLIC;
-          }
-break;
-case 66:
-#line 695 "fe/idl.tao_yy"
-{
-            /* is $0 to member_i */
-            tao_yyval.vival = AST_Field::vis_PRIVATE;
-          }
-break;
+# line 641 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
+        } break;
+case 59:
+# line 645 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
+        } break;
+case 60:
+# line 649 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
+        } break;
+case 61:
+# line 653 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
+        } break;
+case 62:
+# line 657 "fe/idl.tao_yy"
+{
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-4].idval, NULL);
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Constant		*c = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+	  AST_Decl		*v = NULL;
+
+	  ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
+	  /*
+	   * Create a node representing a constant declaration. Store
+	   * it in the enclosing scope
+	   */
+	  if (tao_yypvt[-0].exval != NULL && s != NULL) {
+	    if (tao_yypvt[-0].exval->coerce(tao_yypvt[-6].etval) == NULL)
+	      idl_global->err()->coercion_error(tao_yypvt[-0].exval, tao_yypvt[-6].etval);
+	    else {
+	      c =
+		idl_global->gen()->create_constant(tao_yypvt[-6].etval, tao_yypvt[-0].exval, n, p);
+	      (void) s->fe_add_constant(c);
+	    }
+	  }
+	} break;
+case 68:
+# line 690 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_string;
+	} break;
+case 69:
+# line 694 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_wstring;
+        } break;
 case 70:
-#line 709 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeDeclSeen);
-        }
-break;
-case 71:
-#line 713 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 72:
-#line 717 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstDeclSeen);
-        }
-break;
-case 73:
-#line 721 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
-case 74:
-#line 725 "fe/idl.tao_yy"
+# line 698 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptDeclSeen);
-        }
-break;
-case 75:
-#line 729 "fe/idl.tao_yy"
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Decl		*d = NULL;
+	  AST_PredefinedType	*c = NULL;
+	  AST_Typedef		*t = NULL;
+
+	  /*
+	   * If the constant's type is a scoped name, it must resolve
+	   * to a scalar constant type
+	   */
+	  if (s != NULL && (d = s->lookup_by_name(tao_yypvt[-0].idlist, I_TRUE)) != NULL) {
+	    /*
+	     * Look through typedefs
+	     */
+	    while (d->node_type() == AST_Decl::NT_typedef) {
+	      t = AST_Typedef::narrow_from_decl(d);
+	      if (t == NULL)
+	        break;
+	      d = t->base_type();
+	    }
+	    if (d == NULL)
+	      tao_yyval.etval = AST_Expression::EV_any;
+	    else if (d->node_type() == AST_Decl::NT_pre_defined) {
+	      c = AST_PredefinedType::narrow_from_decl(d);
+	      if (c != NULL) {
+	         tao_yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
+	      } else {
+	         tao_yyval.etval = AST_Expression::EV_any;
+	      }
+	    } else
+	      tao_yyval.etval = AST_Expression::EV_any;
+	  } else
+	    tao_yyval.etval = AST_Expression::EV_any;
+	} break;
+case 74:
+# line 740 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 76:
-#line 733 "fe/idl.tao_yy"
+# line 748 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrDeclSeen);
-        }
-break;
-case 77:
-#line 737 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 78:
-#line 741 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpDeclSeen);
-        }
-break;
-case 79:
-#line 745 "fe/idl.tao_yy"
+# line 756 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 80:
-#line 749 "fe/idl.tao_yy"
+# line 764 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yypvt[-2].exval,tao_yypvt[-0].exval);
+	} break;
 case 81:
-#line 753 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
-break;
-case 82:
-#line 761 "fe/idl.tao_yy"
-{
-          tao_yyval.nlval = new UTL_NameList(tao_yyvsp[-1].idlist, tao_yyvsp[0].nlval);
-        }
-break;
+# line 768 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yypvt[-2].exval,tao_yypvt[-0].exval);
+	} break;
 case 83:
-#line 769 "fe/idl.tao_yy"
+# line 776 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SNListCommaSeen);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 84:
-#line 773 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ScopedNameSeen);
-
-          if (tao_yyvsp[-3].nlval == NULL)
-            tao_yyval.nlval = new UTL_NameList(tao_yyvsp[0].idlist, NULL);
-          else {
-            tao_yyvsp[-3].nlval->nconc(new UTL_NameList(tao_yyvsp[0].idlist, NULL));
-            tao_yyval.nlval = tao_yyvsp[-3].nlval;
-          }
-        }
-break;
-case 85:
-#line 784 "fe/idl.tao_yy"
-{
-          tao_yyval.nlval = NULL;
-        }
-break;
+# line 780 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yypvt[-2].exval,tao_yypvt[-0].exval);
+	} break;
 case 86:
-#line 791 "fe/idl.tao_yy"
+# line 788 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-          tao_yyval.idlist = new UTL_IdList(tao_yyvsp[0].idval, NULL);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 87:
-#line 797 "fe/idl.tao_yy"
+# line 792 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 88:
-#line 801 "fe/idl.tao_yy"
+# line 796 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-          tao_yyval.idlist = new UTL_IdList(new Identifier(tao_yyvsp[-2].strval, 1, 0, I_FALSE),
-                              new UTL_IdList(tao_yyvsp[0].idval, NULL));
-        }
-break;
-case 89:
-#line 809 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ScopeDelimSeen);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yypvt[-2].exval, tao_yypvt[-0].exval);
+	} break;
 case 90:
-#line 813 "fe/idl.tao_yy"
+# line 804 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SN_IDSeen);
-
-          tao_yyvsp[-3].idlist->nconc(new UTL_IdList(tao_yyvsp[0].idval, NULL));
-          tao_yyval.idlist = tao_yyvsp[-3].idlist;
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
+					      tao_yypvt[-0].exval,
+					      NULL);
+	} break;
 case 91:
-#line 822 "fe/idl.tao_yy"
+# line 810 "fe/idl.tao_yy"
 {
-            tao_yyval.idval = new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
+					      tao_yypvt[-0].exval,
+					      NULL);
+	} break;
 case 92:
-#line 829 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_InterfaceFwd      *f = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_ForwardDeclSeen);
-          /*
-           * Create a node representing a forward declaration of an
-           * interface. Store it in the enclosing scope
-           */
-          if (s != NULL) {
-            f = idl_global->gen()->create_interface_fwd(n, p);
-            (void) s->fe_add_interface_fwd(f);
-          }
-        }
-break;
-case 93:
-#line 849 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstSeen);
-        }
-break;
-case 94:
-#line 853 "fe/idl.tao_yy"
+# line 816 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstTypeSeen);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
+					      tao_yypvt[-0].exval,
+					      NULL);
+	} break;
+case 93:
+# line 825 "fe/idl.tao_yy"
+{
+	  /*
+	   * An expression which is a scoped name is not resolved now,
+	   * but only when it is evaluated (such as when it is assigned
+	   * as a constant value)
+	   */
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].idlist);
+	} break;
 case 95:
-#line 857 "fe/idl.tao_yy"
+# line 835 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstIDSeen);
-        }
-break;
+	  tao_yyval.exval = tao_yypvt[-1].exval;
+	} break;
 case 96:
-#line 861 "fe/idl.tao_yy"
+# line 842 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstAssignSeen);
-        }
-break;
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].ival);
+	} break;
 case 97:
-#line 865 "fe/idl.tao_yy"
-{
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[-4].idval, NULL);
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Constant          *c = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-          AST_Decl              *v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_ConstExprSeen);
-          /*
-           * Create a node representing a constant declaration. Store
-           * it in the enclosing scope
-           */
-          if (tao_yyvsp[0].exval != NULL && s != NULL) {
-            if (tao_yyvsp[0].exval->coerce(tao_yyvsp[-6].etval) == NULL)
-              idl_global->err()->coercion_error(tao_yyvsp[0].exval, tao_yyvsp[-6].etval);
-            else {
-              c =
-                idl_global->gen()->create_constant(tao_yyvsp[-6].etval, tao_yyvsp[0].exval, n, p);
-              (void) s->fe_add_constant(c);
-            }
-          }
-        }
-break;
+# line 846 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].sval);
+	} break;
+case 98:
+# line 850 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].cval);
+	} break;
+case 99:
+# line 854 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].dval);
+	} break;
+case 100:
+# line 858 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
+					    AST_Expression::EV_bool);
+	} break;
+case 101:
+# line 863 "fe/idl.tao_yy"
+{
+	  tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
+					    AST_Expression::EV_bool);
+	} break;
+case 102:
+# line 871 "fe/idl.tao_yy"
+{
+	    tao_yypvt[-0].exval->evaluate(AST_Expression::EK_const);
+	    tao_yyval.exval = idl_global->gen()->create_expr(tao_yypvt[-0].exval, AST_Expression::EV_ulong);
+	} break;
 case 103:
-#line 898 "fe/idl.tao_yy"
+# line 879 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_string;
-        }
-break;
+	    idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
+	  } break;
 case 104:
-#line 902 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_wstring;
-        }
-break;
+# line 882 "fe/idl.tao_yy"
+{tao_yyval.ival = 0;} break;
 case 105:
-#line 906 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Decl              *d = NULL;
-          AST_PredefinedType    *c = NULL;
-          AST_Typedef           *t = NULL;
-
-          /*
-           * If the constant's type is a scoped name, it must resolve
-           * to a scalar constant type
-           */
-          if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
-            /*
-             * Look through typedefs
-             */
-            while (d->node_type() == AST_Decl::NT_typedef) {
-              t = AST_Typedef::narrow_from_decl(d);
-              if (t == NULL)
-                break;
-              d = t->base_type();
-            }
-            if (d == NULL)
-              tao_yyval.etval = AST_Expression::EV_any;
-            else if (d->node_type() == AST_Decl::NT_pre_defined) {
-              c = AST_PredefinedType::narrow_from_decl(d);
-              if (c != NULL) {
-                 tao_yyval.etval = idl_global->PredefinedTypeToExprType(c->pt());
-              } else {
-                 tao_yyval.etval = AST_Expression::EV_any;
-              }
-            } else if (d->node_type () == AST_Decl::NT_string) {
-                tao_yyval.etval = AST_Expression::EV_string;
-            /* @ASG@ we will need a similar one for wstring after it
-                is implemented */
-            } else
-              tao_yyval.etval = AST_Expression::EV_any;
-          } else
-            tao_yyval.etval = AST_Expression::EV_any;
-        }
-break;
+# line 883 "fe/idl.tao_yy"
+{ tao_yyval.ival = 0;} break;
+case 106:
+# line 884 "fe/idl.tao_yy"
+{ tao_yyval.ival = 0;} break;
+case 107:
+# line 885 "fe/idl.tao_yy"
+{ tao_yyval.ival = 0;} break;
+case 108:
+# line 887 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Native		*node = NULL;
+	  AST_Decl		*v = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
+	  /*
+	   * Create a node representing a Native and add it to its
+	   * enclosing scope
+	   */
+	  if (s != NULL) {
+	    node = idl_global->gen()->create_native (tao_yypvt[-0].deval->name (), p);
+	    /*
+	     * Add it to its defining scope
+	     */
+	    (void) s->fe_add_native (node);
+	  }
+	} break;
 case 109:
-#line 952 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_or, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
-case 111:
-#line 960 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_xor, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
+# line 912 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
+        } break;
+case 110:
+# line 916 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_DecllistActiveIterator *l;
+	  FE_Declarator		*d = NULL;
+	  AST_Typedef		*t = NULL;
+	  AST_Decl		*v = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
+	  /*
+	   * Create a list of type renamings. Add them to the
+	   * enclosing scope
+	   */
+	  if (s != NULL && tao_yypvt[-2].dcval != NULL && tao_yypvt[-0].dlval != NULL) {
+	    l = new UTL_DecllistActiveIterator(tao_yypvt[-0].dlval);
+	    for (;!(l->is_done()); l->next()) {
+	      d = l->item();
+	      if (d == NULL)
+		      continue;
+              AST_Type * tp = d->compose(tao_yypvt[-2].dcval);
+              if (tp == NULL)
+		     continue;
+	      t = idl_global->gen()->create_typedef(tp, d->name(), p);
+	      (void) s->fe_add_typedef(t);
+	    }
+	    delete l;
+	  }
+	} break;
 case 113:
-#line 968 "fe/idl.tao_yy"
+# line 955 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_and, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yypvt[-0].etval);
+	} break;
 case 115:
-#line 976 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_right,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-        }
-break;
-case 116:
-#line 980 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_left,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-        }
-break;
-case 118:
-#line 988 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_add, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
-case 119:
-#line 992 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_minus,tao_yyvsp[-2].exval,tao_yyvsp[0].exval);
-        }
-break;
-case 121:
-#line 1000 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mul, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
-case 122:
-#line 1004 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_div, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
-case 123:
-#line 1008 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_mod, tao_yyvsp[-2].exval, tao_yyvsp[0].exval);
-        }
-break;
-case 125:
-#line 1016 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_plus,
-                                              tao_yyvsp[0].exval,
-                                              NULL);
-        }
-break;
-case 126:
-#line 1022 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_u_minus,
-                                              tao_yyvsp[0].exval,
-                                              NULL);
-        }
-break;
-case 127:
-#line 1028 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(AST_Expression::EC_bit_neg,
-                                              tao_yyvsp[0].exval,
-                                              NULL);
-        }
-break;
+# line 960 "fe/idl.tao_yy"
+{
+	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
+	  AST_Decl	*d = NULL;
+
+	  if (s != NULL)
+	    d = s->lookup_by_name(tao_yypvt[-0].idlist, I_TRUE);
+	  if (d == NULL)
+	    idl_global->err()->lookup_error(tao_yypvt[-0].idlist);
+	  tao_yyval.dcval = d;
+	} break;
 case 128:
-#line 1037 "fe/idl.tao_yy"
-{
-          /*
-           * An expression which is a scoped name is not resolved now,
-           * but only when it is evaluated (such as when it is assigned
-           * as a constant value)
-           */
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].idlist);
-        }
-break;
+# line 995 "fe/idl.tao_yy"
+{
+	  tao_yyval.dlval = new UTL_DeclList(tao_yypvt[-1].deval, tao_yypvt[-0].dlval);
+	} break;
+case 129:
+# line 1003 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+        } break;
 case 130:
-#line 1047 "fe/idl.tao_yy"
+# line 1007 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = tao_yyvsp[-1].exval;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+
+	  if (tao_yypvt[-3].dlval == NULL)
+	    tao_yyval.dlval = new UTL_DeclList(tao_yypvt[-0].deval, NULL);
+	  else {
+	    tao_yypvt[-3].dlval->nconc(new UTL_DeclList(tao_yypvt[-0].deval, NULL));
+	    tao_yyval.dlval = tao_yypvt[-3].dlval;
+	  }
+	} break;
 case 131:
-#line 1054 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].ival);
-        }
-break;
-case 132:
-#line 1058 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].sval);
-        }
-break;
-case 133:
-#line 1062 "fe/idl.tao_yy"
-{
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].cval);
-        }
-break;
+# line 1018 "fe/idl.tao_yy"
+{
+	  tao_yyval.dlval = NULL;
+	} break;
 case 134:
-#line 1066 "fe/idl.tao_yy"
+# line 1030 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].dval);
-        }
-break;
+	  tao_yyval.dlval = new UTL_DeclList(tao_yypvt[-1].deval, tao_yypvt[-0].dlval);
+	} break;
 case 135:
-#line 1070 "fe/idl.tao_yy"
+# line 1038 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_TRUE,
-                                            AST_Expression::EV_bool);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
+        } break;
 case 136:
-#line 1075 "fe/idl.tao_yy"
+# line 1042 "fe/idl.tao_yy"
 {
-          tao_yyval.exval = idl_global->gen()->create_expr((idl_bool) I_FALSE,
-                                            AST_Expression::EV_bool);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
+
+	  if (tao_yypvt[-3].dlval == NULL)
+	    tao_yyval.dlval = new UTL_DeclList(tao_yypvt[-0].deval, NULL);
+	  else {
+	    tao_yypvt[-3].dlval->nconc(new UTL_DeclList(tao_yypvt[-0].deval, NULL));
+	    tao_yyval.dlval = tao_yypvt[-3].dlval;
+	  }
+	} break;
 case 137:
-#line 1083 "fe/idl.tao_yy"
+# line 1053 "fe/idl.tao_yy"
 {
-            tao_yyvsp[0].exval->evaluate(AST_Expression::EK_const);
-            tao_yyval.exval = idl_global->gen()->create_expr(tao_yyvsp[0].exval, AST_Expression::EV_ulong);
-        }
-break;
+	  tao_yyval.dlval = NULL;
+	} break;
 case 138:
-#line 1091 "fe/idl.tao_yy"
+# line 1060 "fe/idl.tao_yy"
 {
-            idl_global->set_parse_state(IDL_GlobalData::PS_TypedefSeen);
-          }
-break;
+	  tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yypvt[-0].idval, NULL),
+				 FE_Declarator::FD_simple, NULL);
+	} break;
 case 139:
-#line 1094 "fe/idl.tao_yy"
-{tao_yyval.ival = 0;}
-break;
-case 140:
-#line 1095 "fe/idl.tao_yy"
-{ tao_yyval.ival = 0;}
-break;
-case 141:
-#line 1096 "fe/idl.tao_yy"
-{ tao_yyval.ival = 0;}
-break;
+# line 1068 "fe/idl.tao_yy"
+{
+	  tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yypvt[-0].dcval->local_name(), NULL),
+				 FE_Declarator::FD_complex,
+				 tao_yypvt[-0].dcval);
+	} break;
 case 142:
-#line 1097 "fe/idl.tao_yy"
-{ tao_yyval.ival = 0;}
-break;
+# line 1082 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_long;
+	} break;
 case 143:
-#line 1099 "fe/idl.tao_yy"
+# line 1086 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Native            *node = NULL;
-          AST_Decl              *v = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_NativeSeen);
-          /*
-           * Create a node representing a Native and add it to its
-           * enclosing scope
-           */
-          if (s != NULL) {
-            node = idl_global->gen()->create_native (tao_yyvsp[0].deval->name (), p);
-            /*
-             * Add it to its defining scope
-             */
-            (void) s->fe_add_native (node);
-          }
-        }
-break;
+	  tao_yyval.etval = AST_Expression::EV_longlong;
+        } break;
 case 144:
-#line 1124 "fe/idl.tao_yy"
+# line 1090 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_TypeSpecSeen);
-        }
-break;
+	  tao_yyval.etval = AST_Expression::EV_short;
+	} break;
 case 145:
-#line 1128 "fe/idl.tao_yy"
+# line 1097 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_DecllistActiveIterator *l;
-          FE_Declarator         *d = NULL;
-          AST_Typedef           *t = NULL;
-          AST_Decl              *v = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclaratorsSeen);
-          /*
-           * Create a list of type renamings. Add them to the
-           * enclosing scope
-           */
-          if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
-            l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
-            for (;!(l->is_done()); l->next()) {
-              d = l->item();
-              if (d == NULL)
-                      continue;
-              AST_Type * tp = d->compose(tao_yyvsp[-2].dcval);
-              if (tp == NULL)
-                     continue;
-              t = idl_global->gen()->create_typedef(tp, d->name(), p);
-              (void) s->fe_add_typedef(t);
-            }
-            delete l;
-          }
-        }
-break;
+	  tao_yyval.etval = AST_Expression::EV_ulong;
+	} break;
+case 146:
+# line 1101 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_ulonglong;
+        } break;
+case 147:
+# line 1105 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_ushort;
+	} break;
 case 148:
-#line 1167 "fe/idl.tao_yy"
+# line 1112 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_double;
+	} break;
+case 149:
+# line 1116 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
-break;
+	  tao_yyval.etval = AST_Expression::EV_float;
+	} break;
 case 150:
-#line 1172 "fe/idl.tao_yy"
-{
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Decl      *d = NULL;
-
-          if (s != NULL)
-            d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
-          if (d == NULL)
-            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-          tao_yyval.dcval = d;
-        }
-break;
-case 163:
-#line 1207 "fe/idl.tao_yy"
-{
-          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-        }
-break;
+# line 1120 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_longdouble;
+        } break;
+case 151:
+# line 1127 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_char;
+	} break;
+case 152:
+# line 1131 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_wchar;
+        } break;
+case 153:
+# line 1138 "fe/idl.tao_yy"
+{
+          tao_yyval.etval = AST_Expression::EV_octet;
+	} break;
+case 154:
+# line 1145 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_bool;
+        } break;
+case 155:
+# line 1152 "fe/idl.tao_yy"
+{
+	  tao_yyval.etval = AST_Expression::EV_any;
+	} break;
+case 156:
+# line 1159 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
+        } break;
+case 157:
+# line 1163 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-0].idval, NULL);
+	  AST_Structure		*d = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+	  AST_Decl		*v = NULL;
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
+	  /*
+	   * Create a node representing a struct declaration. Add it
+	   * to the enclosing scope
+	   */
+	  if (s != NULL) {
+	    d = idl_global->gen()->create_structure(n, p);
+	    (void) s->fe_add_structure(d);
+	  }
+	  /*
+	   * Push the scope of the struct on the scopes stack
+	   */
+	  idl_global->scopes()->push(d);
+	} break;
+case 158:
+# line 1187 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
+        } break;
+case 159:
+# line 1191 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
+        } break;
+case 160:
+# line 1195 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
+	  /*
+	   * Done with this struct. Pop its scope off the scopes stack
+	   */
+          tao_yyval.dcval =
+	      AST_Structure::narrow_from_scope(
+				   idl_global->scopes()->top_non_null());
+	   UTL_StrList *p = tao_yyval.dcval->pragmas ();
+	   if (p != 0)
+	     p = (UTL_StrList*)p->copy ();
+	  idl_global->set_pragmas (p);
+          idl_global->scopes()->pop();
+	} break;
 case 164:
-#line 1215 "fe/idl.tao_yy"
+# line 1220 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
+        } break;
 case 165:
-#line 1219 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-          if (tao_yyvsp[-3].dlval == NULL)
-            tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
-          else {
-            tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
-            tao_yyval.dlval = tao_yyvsp[-3].dlval;
-          }
-        }
-break;
+# line 1224 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
+        } break;
 case 166:
-#line 1230 "fe/idl.tao_yy"
+# line 1228 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = NULL;
-        }
-break;
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_DecllistActiveIterator *l = NULL;
+	  FE_Declarator		*d = NULL;
+	  AST_Field		*f = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
+	  /*
+	   * Check for illegal recursive use of type
+	   */
+	  if (tao_yypvt[-4].dcval != NULL && AST_illegal_recursive_type(tao_yypvt[-4].dcval))
+	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yypvt[-4].dcval);
+	  /*
+	   * Create a node representing a struct or exception member
+	   * Add it to the enclosing scope
+	   */
+	  else if (s != NULL && tao_yypvt[-4].dcval != NULL && tao_yypvt[-2].dlval != NULL) {
+	    l = new UTL_DecllistActiveIterator(tao_yypvt[-2].dlval);
+	    for (;!(l->is_done()); l->next()) {
+	      d = l->item();
+	      if (d == NULL)
+		continue;
+ 	      AST_Type *tp = d->compose(tao_yypvt[-4].dcval);
+	      if (tp == NULL)
+		continue;
+	      f = idl_global->gen()->create_field(tp, d->name(), p);
+	      (void) s->fe_add_field(f);
+	    }
+	    delete l;
+	  }
+	} break;
+case 167:
+# line 1261 "fe/idl.tao_yy"
+{
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	} break;
+case 168:
+# line 1265 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	} break;
 case 169:
-#line 1242 "fe/idl.tao_yy"
+# line 1273 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[-1].deval, tao_yyvsp[0].dlval);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
+        } break;
 case 170:
-#line 1250 "fe/idl.tao_yy"
+# line 1277 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsCommaSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
+        } break;
 case 171:
-#line 1254 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_DeclsDeclSeen);
-
-          if (tao_yyvsp[-3].dlval == NULL)
-            tao_yyval.dlval = new UTL_DeclList(tao_yyvsp[0].deval, NULL);
-          else {
-            tao_yyvsp[-3].dlval->nconc(new UTL_DeclList(tao_yyvsp[0].deval, NULL));
-            tao_yyval.dlval = tao_yyvsp[-3].dlval;
-          }
-        }
-break;
+# line 1281 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
+        } break;
 case 172:
-#line 1265 "fe/idl.tao_yy"
+# line 1285 "fe/idl.tao_yy"
 {
-          tao_yyval.dlval = NULL;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
+        } break;
 case 173:
-#line 1272 "fe/idl.tao_yy"
+# line 1289 "fe/idl.tao_yy"
 {
-          tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].idval, NULL),
-                                 FE_Declarator::FD_simple, NULL);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
+        } break;
 case 174:
-#line 1280 "fe/idl.tao_yy"
+# line 1293 "fe/idl.tao_yy"
 {
-          tao_yyval.deval = new FE_Declarator(new UTL_ScopedName(tao_yyvsp[0].dcval->local_name(), NULL),
-                                 FE_Declarator::FD_complex,
-                                 tao_yyvsp[0].dcval);
-        }
-break;
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-8].idval, NULL);
+	  AST_Union		*u = NULL;
+	  AST_Decl		*v = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
+	  /*
+	   * Create a node representing a union. Add it to its enclosing
+	   * scope
+	   */
+	  if (tao_yypvt[-2].dcval != NULL && s != NULL) {
+ 	    AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(tao_yypvt[-2].dcval);
+            if (tp == NULL) {
+              idl_global->err()->not_a_type(tao_yypvt[-2].dcval);
+            } else {
+	      u = idl_global->gen()->create_union(tp, n, p);
+	      (void) s->fe_add_union(u);
+ 	    }
+	  }
+	  /*
+	   * Push the scope of the union on the scopes stack
+	   */
+	  idl_global->scopes()->push(u);
+	} break;
+case 175:
+# line 1322 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
+        } break;
+case 176:
+# line 1326 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
+        } break;
 case 177:
-#line 1294 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_long;
-        }
-break;
+# line 1330 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
+	  /*
+	   * Done with this union. Pop its scope from the scopes stack
+	   */
+	  tao_yyval.dcval =
+	     AST_Union::narrow_from_scope(
+				idl_global->scopes()->top_non_null());
+	  UTL_StrList *p = tao_yyval.dcval->pragmas ();
+	  if (p != 0)
+	     p = (UTL_StrList*)p->copy ();
+	  idl_global->set_pragmas (p);
+	  idl_global->scopes()->pop();
+	} break;
 case 178:
-#line 1298 "fe/idl.tao_yy"
+# line 1348 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_longlong;
-        }
-break;
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yypvt[-0].etval);
+	} break;
 case 179:
-#line 1302 "fe/idl.tao_yy"
+# line 1352 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_short;
-        }
-break;
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yypvt[-0].etval);
+	} break;
 case 180:
-#line 1309 "fe/idl.tao_yy"
+# line 1356 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_ulong;
-        }
-break;
+          // octets are not allowed
+          idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
+	} break;
 case 181:
-#line 1313 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_ulonglong;
-        }
-break;
-case 182:
-#line 1317 "fe/idl.tao_yy"
+# line 1361 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_ushort;
-        }
-break;
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yypvt[-0].etval);
+	} break;
 case 183:
-#line 1324 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_double;
-        }
-break;
-case 184:
-#line 1328 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_float;
-        }
-break;
-case 185:
-#line 1332 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_longdouble;
-        }
-break;
-case 186:
-#line 1339 "fe/idl.tao_yy"
-{
-          tao_yyval.etval = AST_Expression::EV_char;
-        }
-break;
+# line 1366 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Decl		*d = NULL;
+	  AST_PredefinedType	*p = NULL;
+	  AST_Typedef		*t = NULL;
+	  long			found = I_FALSE;
+
+	  /*
+	   * The discriminator is a scoped name. Try to resolve to
+	   * one of the scalar types or to an enum. Thread through
+	   * typedef's to arrive at the base type at the end of the
+	   * chain
+	   */
+	  if (s != NULL && (d = s->lookup_by_name(tao_yypvt[-0].idlist, I_TRUE)) != NULL) {
+	    while (!found) {
+	      switch (d->node_type()) {
+	      case AST_Decl::NT_enum:
+		tao_yyval.dcval = d;
+		found = I_TRUE;
+		break;
+	      case AST_Decl::NT_pre_defined:
+		p = AST_PredefinedType::narrow_from_decl(d);
+		if (p != NULL) {
+		  switch (p->pt()) {
+		  case AST_PredefinedType::PT_long:
+		  case AST_PredefinedType::PT_ulong:
+		  case AST_PredefinedType::PT_longlong:
+		  case AST_PredefinedType::PT_ulonglong:
+		  case AST_PredefinedType::PT_short:
+		  case AST_PredefinedType::PT_char:
+		  case AST_PredefinedType::PT_wchar:
+		  case AST_PredefinedType::PT_boolean:
+		    tao_yyval.dcval = p;
+		    found = I_TRUE;
+		    break;
+		  case AST_PredefinedType::PT_octet:
+                    // octets are not allowed
+                    idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
+                    tao_yyval.dcval = NULL;
+		    found = I_TRUE;
+		    break;
+		  default:
+		    tao_yyval.dcval = NULL;
+		    found = I_TRUE;
+		    break;
+		  }
+		} else
+                {
+		    tao_yyval.dcval = NULL;
+		    found = I_TRUE;
+                }
+		break;
+	      case AST_Decl::NT_typedef:
+		t = AST_Typedef::narrow_from_decl(d);
+		if (t != NULL) d = t->base_type();
+		break;
+	      default:
+		tao_yyval.dcval = NULL;
+		found = I_TRUE;
+		break;
+	      }
+	    }
+	  } else
+	    tao_yyval.dcval = NULL;
+
+	  if (tao_yyval.dcval == NULL)
+	    idl_global->err()->lookup_error(tao_yypvt[-0].idlist);
+	} break;
 case 187:
-#line 1343 "fe/idl.tao_yy"
+# line 1445 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_wchar;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
+        } break;
 case 188:
-#line 1350 "fe/idl.tao_yy"
+# line 1449 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_octet;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
+        } break;
 case 189:
-#line 1357 "fe/idl.tao_yy"
+# line 1453 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_bool;
-        }
-break;
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_LabellistActiveIterator *l = NULL;
+	  AST_UnionLabel	*d = NULL;
+	  AST_UnionBranch	*b = NULL;
+	  AST_Field		*f = tao_yypvt[-2].ffval;
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
+	  /*
+	   * Create several nodes representing branches of a union.
+	   * Add them to the enclosing scope (the union scope)
+	   */
+	  if (s != NULL && tao_yypvt[-4].llval != NULL && tao_yypvt[-2].ffval != NULL) {
+	    l = new UTL_LabellistActiveIterator(tao_yypvt[-4].llval);
+	    for (;!(l->is_done()); l->next()) {
+	      d = l->item();
+	      if (d == NULL)
+		continue;
+	      b = idl_global->gen()->create_union_branch(d,
+						      f->field_type(),
+						      f->name(),
+						      f->pragmas());
+	      (void) s->fe_add_union_branch(b);
+	    }
+	    delete l;
+	  }
+	} break;
 case 190:
-#line 1364 "fe/idl.tao_yy"
+# line 1481 "fe/idl.tao_yy"
 {
-          tao_yyval.etval = AST_Expression::EV_any;
-        }
-break;
+	  idl_global->err()->syntax_error(idl_global->parse_state());
+	} break;
 case 191:
-#line 1371 "fe/idl.tao_yy"
+# line 1486 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
+	  tao_yyerrok;
+	} break;
 case 192:
-#line 1375 "fe/idl.tao_yy"
+# line 1494 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_Structure         *d = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-          AST_Decl              *v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructIDSeen);
-          /*
-           * Create a node representing a struct declaration. Add it
-           * to the enclosing scope
-           */
-          if (s != NULL) {
-            d = idl_global->gen()->create_structure(n, p);
-            (void) s->fe_add_structure(d);
-          }
-          /*
-           * Push the scope of the struct on the scopes stack
-           */
-          idl_global->scopes()->push(d);
-        }
-break;
+	  tao_yyval.llval = new UTL_LabelList(tao_yypvt[-1].ulval, tao_yypvt[-0].llval);
+	} break;
 case 193:
-#line 1399 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructSqSeen);
-        }
-break;
+# line 1501 "fe/idl.tao_yy"
+{
+	  if (tao_yypvt[-1].llval == NULL)
+	    tao_yyval.llval = new UTL_LabelList(tao_yypvt[-0].ulval, NULL);
+	  else {
+	    tao_yypvt[-1].llval->nconc(new UTL_LabelList(tao_yypvt[-0].ulval, NULL));
+	    tao_yyval.llval = tao_yypvt[-1].llval;
+	  }
+	} break;
 case 194:
-#line 1403 "fe/idl.tao_yy"
+# line 1510 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructBodySeen);
-        }
-break;
+	  tao_yyval.llval = NULL;
+	} break;
 case 195:
-#line 1407 "fe/idl.tao_yy"
+# line 1517 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StructQsSeen);
-          /*
-           * Done with this struct. Pop its scope off the scopes stack
-           */
-          tao_yyval.dcval =
-              AST_Structure::narrow_from_scope(
-                                   idl_global->scopes()->top_non_null());
-           UTL_StrList *p = tao_yyval.dcval->pragmas ();
-           if (p != 0)
-             p = (UTL_StrList*)p->copy ();
-          idl_global->set_pragmas (p);
-          idl_global->scopes()->pop();
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
+        } break;
+case 196:
+# line 1521 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+
+	  tao_yyval.ulval = idl_global->gen()->
+	            create_union_label(AST_UnionLabel::UL_default,
+				       NULL);
+	} break;
+case 197:
+# line 1529 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
+        } break;
+case 198:
+# line 1533 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
+        } break;
 case 199:
-#line 1431 "fe/idl.tao_yy"
+# line 1537 "fe/idl.tao_yy"
 {
-          /* is $0 to member_i */
-          tao_yyval.vival = AST_Field::vis_NA;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
+
+	  tao_yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
+						     tao_yypvt[-2].exval);
+	} break;
+case 200:
+# line 1547 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
+        } break;
 case 201:
-#line 1440 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_MemberTypeSeen);
-        }
-break;
+# line 1551 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
+	  /*
+	   * Check for illegal recursive use of type
+	   */
+	  if (tao_yypvt[-2].dcval != NULL && AST_illegal_recursive_type(tao_yypvt[-2].dcval))
+	    idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yypvt[-2].dcval);
+	  /*
+	   * Create a field in a union branch
+	   */
+	  else if (tao_yypvt[-2].dcval == NULL || tao_yypvt[-0].deval == NULL)
+	    tao_yyval.ffval = NULL;
+	  else {
+	    AST_Type *tp = tao_yypvt[-0].deval->compose(tao_yypvt[-2].dcval);
+	    if (tp == NULL)
+	      tao_yyval.ffval = NULL;
+ 	    else
+	      tao_yyval.ffval = idl_global->gen()->create_field(tp,
+			        		   tao_yypvt[-0].deval->name(),
+			        		   idl_global->pragmas());
+	  }
+	} break;
 case 202:
-#line 1444 "fe/idl.tao_yy"
+# line 1577 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
+        } break;
 case 203:
-#line 1448 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_DecllistActiveIterator *l = NULL;
-          FE_Declarator         *d = NULL;
-          AST_Field             *f = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_MemberDeclsCompleted);
-          /*
-           * Check for illegal recursive use of type
-           */
-          if (tao_yyvsp[-4].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-4].dcval))
-            idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-4].dcval);
-          /*
-           * Create a node representing a struct or exception member
-           * Add it to the enclosing scope
-           */
-          else if (s != NULL && tao_yyvsp[-4].dcval != NULL && tao_yyvsp[-2].dlval != NULL) {
-            l = new UTL_DecllistActiveIterator(tao_yyvsp[-2].dlval);
-            for (;!(l->is_done()); l->next()) {
-              d = l->item();
-              if (d == NULL)
-                continue;
-              AST_Type *tp = d->compose(tao_yyvsp[-4].dcval);
-              if (tp == NULL)
-                continue;
-              /* $0 denotes Visibility, must be on yacc reduction stack */
-              f = idl_global->gen()->create_field(tp, d->name(), p, tao_yyvsp[-5].vival);
-              (void) s->fe_add_field(f);
-            }
-            delete l;
-          }
-        }
-break;
+# line 1581 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-0].idval, NULL);
+	  AST_Enum		*e = NULL;
+	  AST_Decl		*v = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
+	  /*
+	   * Create a node representing an enum and add it to its
+	   * enclosing scope
+	   */
+	  if (s != NULL) {
+	    e = idl_global->gen()->create_enum(n, p);
+	    /*
+	     * Add it to its defining scope
+	     */
+	    (void) s->fe_add_enum(e);
+	  }
+	  /*
+	   * Push the enum scope on the scopes stack
+	   */
+	  idl_global->scopes()->push(e);
+	} break;
 case 204:
-#line 1482 "fe/idl.tao_yy"
+# line 1608 "fe/idl.tao_yy"
 {
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
+        } break;
 case 205:
-#line 1486 "fe/idl.tao_yy"
+# line 1612 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
+        } break;
 case 206:
-#line 1494 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSeen);
-        }
-break;
-case 207:
-#line 1498 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionIDSeen);
-        }
-break;
+# line 1616 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
+	  /*
+	   * Done with this enum. Pop its scope from the scopes stack
+	   */
+	  if (idl_global->scopes()->top() == NULL)
+	    tao_yyval.dcval = NULL;
+	  else {
+	    tao_yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
+	    idl_global->scopes()->pop();
+	  }
+	} break;
 case 208:
-#line 1502 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchSeen);
-        }
-break;
-case 209:
-#line 1506 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchOpenParSeen);
-        }
-break;
-case 210:
-#line 1510 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchTypeSeen);
-        }
-break;
-case 211:
-#line 1514 "fe/idl.tao_yy"
+# line 1635 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[-8].idval, NULL);
-          AST_Union             *u = NULL;
-          AST_Decl              *v = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
+	  idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
+        } break;
+case 211:
+# line 1644 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n =
+		new UTL_ScopedName(new Identifier(tao_yypvt[-0].strval, 1, 0, I_FALSE), NULL);
+	  AST_EnumVal		*e = NULL;
+	  AST_Enum		*c = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
 
-          idl_global->set_parse_state(IDL_GlobalData::PS_SwitchCloseParSeen);
-          /*
-           * Create a node representing a union. Add it to its enclosing
-           * scope
-           */
-          if (tao_yyvsp[-2].dcval != NULL && s != NULL) {
-            AST_ConcreteType    *tp = AST_ConcreteType::narrow_from_decl(tao_yyvsp[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
-            } else {
-              u = idl_global->gen()->create_union(tp, n, p);
-              (void) s->fe_add_union(u);
-            }
-          }
-          /*
-           * Push the scope of the union on the scopes stack
-           */
-          idl_global->scopes()->push(u);
-        }
-break;
+	  /*
+	   * Create a node representing one enumerator in an enum
+	   * Add it to the enclosing scope (the enum scope)
+	   */
+	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
+	    c = AST_Enum::narrow_from_scope(s);
+	    if (c != NULL)
+	      e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
+	    (void) s->fe_add_enum_val(e);
+	  }
+	} break;
 case 212:
-#line 1543 "fe/idl.tao_yy"
+# line 1668 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionSqSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
+        } break;
 case 213:
-#line 1547 "fe/idl.tao_yy"
+# line 1672 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionBodySeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
+        } break;
 case 214:
-#line 1551 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionQsSeen);
-          /*
-           * Done with this union. Pop its scope from the scopes stack
-           */
-          tao_yyval.dcval =
-             AST_Union::narrow_from_scope(
-                                idl_global->scopes()->top_non_null());
-          UTL_StrList *p = tao_yyval.dcval->pragmas ();
-          if (p != 0)
-             p = (UTL_StrList*)p->copy ();
-          idl_global->set_pragmas (p);
-          idl_global->scopes()->pop();
-        }
-break;
+# line 1676 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
+	  /*
+	   * Remove sequence marker from scopes stack
+	   */
+	  if (idl_global->scopes()->top() == NULL)
+	    idl_global->scopes()->pop();
+	  /*
+	   * Create a node representing a sequence
+	   */
+	  if (tao_yypvt[-2].exval == NULL || tao_yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+	    idl_global->err()->coercion_error(tao_yypvt[-2].exval, AST_Expression::EV_ulong);
+	    tao_yyval.dcval = NULL;
+	  } else if (tao_yypvt[-5].dcval == NULL) {
+	    tao_yyval.dcval = NULL;
+	  } else {
+ 	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yypvt[-5].dcval);
+	    if (tp == NULL)
+	      tao_yyval.dcval = NULL;
+	    else {
+	      tao_yyval.dcval = idl_global->gen()->create_sequence(tao_yypvt[-2].exval, tp);
+	      /*
+	       * Add this AST_Sequence to the types defined in the global scope
+	       */
+	      (void) idl_global->root()
+		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
+ 	    }
+	  }
+	} break;
 case 215:
-#line 1569 "fe/idl.tao_yy"
-{
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
-break;
+# line 1707 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
+	  /*
+	   * Remove sequence marker from scopes stack
+	   */
+	  if (idl_global->scopes()->top() == NULL)
+	    idl_global->scopes()->pop();
+	  /*
+	   * Create a node representing a sequence
+	   */
+	  if (tao_yypvt[-1].dcval == NULL)
+	    tao_yyval.dcval = NULL;
+	  else {
+	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yypvt[-1].dcval);
+	    if (tp == NULL)
+	      tao_yyval.dcval = NULL;
+            else {
+	      tao_yyval.dcval =
+	        idl_global->gen()->create_sequence(
+		  	     idl_global->gen()->create_expr((unsigned long) 0),
+			     tp);
+	      /*
+	       * Add this AST_Sequence to the types defined in the global scope
+	       */
+	      (void) idl_global->root()
+		        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
+	    }
+	  }
+	} break;
 case 216:
-#line 1573 "fe/idl.tao_yy"
-{
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
-break;
+# line 1740 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
+	  /*
+	   * Push a sequence marker on scopes stack
+	   */
+	  idl_global->scopes()->push(NULL);
+	} break;
 case 217:
-#line 1577 "fe/idl.tao_yy"
+# line 1748 "fe/idl.tao_yy"
 {
-          /* octets are not allowed*/
-          idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
+        } break;
 case 218:
-#line 1582 "fe/idl.tao_yy"
+# line 1752 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
+	  tao_yyval.dcval = tao_yypvt[-0].dcval;
+        } break;
+case 219:
+# line 1761 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+        } break;
 case 220:
-#line 1587 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Decl              *d = NULL;
-          AST_PredefinedType    *p = NULL;
-          AST_Typedef           *t = NULL;
-          long                  found = I_FALSE;
-
-          /*
-           * The discriminator is a scoped name. Try to resolve to
-           * one of the scalar types or to an enum. Thread through
-           * typedef's to arrive at the base type at the end of the
-           * chain
-           */
-          if (s != NULL && (d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE)) != NULL) {
-            while (!found) {
-              switch (d->node_type()) {
-              case AST_Decl::NT_enum:
-                tao_yyval.dcval = d;
-                found = I_TRUE;
-                break;
-              case AST_Decl::NT_pre_defined:
-                p = AST_PredefinedType::narrow_from_decl(d);
-                if (p != NULL) {
-                  switch (p->pt()) {
-                  case AST_PredefinedType::PT_long:
-                  case AST_PredefinedType::PT_ulong:
-                  case AST_PredefinedType::PT_longlong:
-                  case AST_PredefinedType::PT_ulonglong:
-                  case AST_PredefinedType::PT_short:
-                  case AST_PredefinedType::PT_char:
-                  case AST_PredefinedType::PT_wchar:
-                  case AST_PredefinedType::PT_boolean:
-                    tao_yyval.dcval = p;
-                    found = I_TRUE;
-                    break;
-                  case AST_PredefinedType::PT_octet:
-                    /* octets are not allowed*/
-                    idl_global->err ()->error0 (UTL_Error::EIDL_DISC_TYPE);
-                    tao_yyval.dcval = NULL;
-                    found = I_TRUE;
-                    break;
-                  default:
-                    tao_yyval.dcval = NULL;
-                    found = I_TRUE;
-                    break;
-                  }
-                } else
-                {
-                    tao_yyval.dcval = NULL;
-                    found = I_TRUE;
-                }
-                break;
-              case AST_Decl::NT_typedef:
-                t = AST_Typedef::narrow_from_decl(d);
-                if (t != NULL) d = t->base_type();
-                break;
-              default:
-                tao_yyval.dcval = NULL;
-                found = I_TRUE;
-                break;
-              }
-            }
-          } else
-            tao_yyval.dcval = NULL;
-
-          if (tao_yyval.dcval == NULL)
-            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-        }
-break;
+# line 1765 "fe/idl.tao_yy"
+{
+	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+        } break;
+case 221:
+# line 1769 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
+	  /*
+	   * Create a node representing a string
+	   */
+	  if (tao_yypvt[-2].exval == NULL || tao_yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+	    idl_global->err()->coercion_error(tao_yypvt[-2].exval, AST_Expression::EV_ulong);
+	    tao_yyval.dcval = NULL;
+	  } else {
+	    tao_yyval.dcval = idl_global->gen()->create_string(tao_yypvt[-2].exval);
+	    /*
+	     * Add this AST_String to the types defined in the global scope
+	     */
+	    (void) idl_global->root()
+		      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+	  }
+	} break;
+case 222:
+# line 1787 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
+	  /*
+	   * Create a node representing a string
+	   */
+	  tao_yyval.dcval =
+	    idl_global->gen()->create_string(
+			 idl_global->gen()->create_expr((unsigned long) 0));
+	  /*
+	   * Add this AST_String to the types defined in the global scope
+	   */
+	  (void) idl_global->root()
+                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+	} break;
+case 223:
+# line 1805 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+        } break;
 case 224:
-#line 1666 "fe/idl.tao_yy"
+# line 1813 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionLabelSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
+        } break;
 case 225:
-#line 1670 "fe/idl.tao_yy"
+# line 1817 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemSeen);
-        }
-break;
+	   idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
+        } break;
 case 226:
-#line 1674 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_LabellistActiveIterator *l = NULL;
-          AST_UnionLabel        *d = NULL;
-          AST_UnionBranch       *b = NULL;
-          AST_Field             *f = tao_yyvsp[-2].ffval;
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemCompleted);
-          /*
-           * Create several nodes representing branches of a union.
-           * Add them to the enclosing scope (the union scope)
-           */
-          if (s != NULL && tao_yyvsp[-4].llval != NULL && tao_yyvsp[-2].ffval != NULL) {
-            l = new UTL_LabellistActiveIterator(tao_yyvsp[-4].llval);
-            for (;!(l->is_done()); l->next()) {
-              d = l->item();
-              if (d == NULL)
-                continue;
-              b = idl_global->gen()->create_union_branch(d,
-                                                      f->field_type(),
-                                                      f->name(),
-                                                      f->pragmas());
-              (void) s->fe_add_union_branch(b);
-            }
-            delete l;
-          }
-        }
-break;
+# line 1821 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
+	  /*
+	   * Create a node representing a string
+	   */
+	  if (tao_yypvt[-2].exval == NULL || tao_yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+	    idl_global->err()->coercion_error(tao_yypvt[-2].exval, AST_Expression::EV_ulong);
+	    tao_yyval.dcval = NULL;
+	  } else {
+	    tao_yyval.dcval = idl_global->gen()->create_wstring(tao_yypvt[-2].exval);
+	    /*
+	     * Add this AST_String to the types defined in the global scope
+	     */
+	    (void) idl_global->root()
+		      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+	  }
+	} break;
 case 227:
-#line 1702 "fe/idl.tao_yy"
-{
-          idl_global->err()->syntax_error(idl_global->parse_state());
-        }
-break;
+# line 1839 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
+	  /*
+	   * Create a node representing a string
+	   */
+	  tao_yyval.dcval =
+	    idl_global->gen()->create_wstring(
+			 idl_global->gen()->create_expr((unsigned long) 0));
+	  /*
+	   * Add this AST_String to the types defined in the global scope
+	   */
+	  (void) idl_global->root()
+                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
+	} break;
 case 228:
-#line 1707 "fe/idl.tao_yy"
+# line 1857 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_NoState);
-          tao_yyerrok;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
+        } break;
 case 229:
-#line 1715 "fe/idl.tao_yy"
+# line 1864 "fe/idl.tao_yy"
 {
-          tao_yyval.llval = new UTL_LabelList(tao_yyvsp[-1].ulval, tao_yyvsp[0].llval);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
+        } break;
 case 230:
-#line 1722 "fe/idl.tao_yy"
-{
-          if (tao_yyvsp[-1].llval == NULL)
-            tao_yyval.llval = new UTL_LabelList(tao_yyvsp[0].ulval, NULL);
-          else {
-            tao_yyvsp[-1].llval->nconc(new UTL_LabelList(tao_yyvsp[0].ulval, NULL));
-            tao_yyval.llval = tao_yyvsp[-1].llval;
-          }
-        }
-break;
+# line 1868 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
+	  /*
+	   * Create a node representing an array
+	   */
+	  if (tao_yypvt[-0].elval != NULL) {
+	     tao_yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(tao_yypvt[-2].idval, NULL),
+						  tao_yypvt[-0].elval->length(), tao_yypvt[-0].elval);
+	  }
+	} break;
 case 231:
-#line 1731 "fe/idl.tao_yy"
+# line 1882 "fe/idl.tao_yy"
 {
-          tao_yyval.llval = NULL;
-        }
-break;
+	  tao_yyval.elval = new UTL_ExprList(tao_yypvt[-1].exval, tao_yypvt[-0].elval);
+	} break;
 case 232:
-#line 1738 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_DefaultSeen);
-        }
-break;
+# line 1889 "fe/idl.tao_yy"
+{
+	  if (tao_yypvt[-1].elval == NULL)
+	    tao_yyval.elval = new UTL_ExprList(tao_yypvt[-0].exval, NULL);
+	  else {
+	    tao_yypvt[-1].elval->nconc(new UTL_ExprList(tao_yypvt[-0].exval, NULL));
+	    tao_yyval.elval = tao_yypvt[-1].elval;
+	  }
+	} break;
 case 233:
-#line 1742 "fe/idl.tao_yy"
+# line 1898 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-          tao_yyval.ulval = idl_global->gen()->
-                    create_union_label(AST_UnionLabel::UL_default,
-                                       NULL);
-        }
-break;
+	  tao_yyval.elval = NULL;
+	} break;
 case 234:
-#line 1750 "fe/idl.tao_yy"
+# line 1905 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_CaseSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
+        } break;
 case 235:
-#line 1754 "fe/idl.tao_yy"
+# line 1909 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelExprSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
+        } break;
 case 236:
-#line 1758 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_LabelColonSeen);
-
-          tao_yyval.ulval = idl_global->gen()->create_union_label(AST_UnionLabel::UL_label,
-                                                     tao_yyvsp[-2].exval);
-        }
-break;
+# line 1913 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
+	  /*
+	   * Array dimensions are expressions which must be coerced to
+	   * positive integers
+	   */
+	  if (tao_yypvt[-2].exval == NULL || tao_yypvt[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
+	    idl_global->err()->coercion_error(tao_yypvt[-2].exval, AST_Expression::EV_ulong);
+	    tao_yyval.exval = NULL;
+	  } else
+	    tao_yyval.exval = tao_yypvt[-2].exval;
+	} break;
 case 237:
-#line 1768 "fe/idl.tao_yy"
+# line 1930 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemTypeSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
+        } break;
 case 238:
-#line 1772 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_UnionElemDeclSeen);
-          /*
-           * Check for illegal recursive use of type
-           */
-          if (tao_yyvsp[-2].dcval != NULL && AST_illegal_recursive_type(tao_yyvsp[-2].dcval))
-            idl_global->err()->error1(UTL_Error::EIDL_RECURSIVE_TYPE, tao_yyvsp[-2].dcval);
-          /*
-           * Create a field in a union branch
-           */
-          else if (tao_yyvsp[-2].dcval == NULL || tao_yyvsp[0].deval == NULL)
-            tao_yyval.ffval = NULL;
-          else {
-            AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
-            if (tp == NULL)
-              tao_yyval.ffval = NULL;
-            else
-              tao_yyval.ffval = idl_global->gen()->create_field(tp,
-                                                   tao_yyvsp[0].deval->name(),
-                                                   idl_global->pragmas());
-          }
-        }
-break;
+# line 1934 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
+        } break;
 case 239:
-#line 1798 "fe/idl.tao_yy"
+# line 1938 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSeen);
-        }
-break;
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_DecllistActiveIterator *l = NULL;
+	  AST_Attribute		*a = NULL;
+	  FE_Declarator		*d = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
+	  /*
+	   * Create nodes representing attributes and add them to the
+	   * enclosing scope
+	   */
+	  if (s != NULL && tao_yypvt[-2].dcval != NULL && tao_yypvt[-0].dlval != NULL) {
+	    l = new UTL_DecllistActiveIterator(tao_yypvt[-0].dlval);
+	    for (;!(l->is_done()); l->next()) {
+	      d = l->item();
+	      if (d == NULL)
+		continue;
+	      AST_Type *tp = d->compose(tao_yypvt[-2].dcval);
+ 	      if (tp == NULL)
+	 	continue;
+	      a = idl_global->gen()->create_attribute(tao_yypvt[-5].bval, tp, d->name(), p);
+	      /*
+	       * Add one attribute to the enclosing scope
+	       */
+	      (void) s->fe_add_attribute(a);
+	    }
+	    delete l;
+	  }
+	} break;
 case 240:
-#line 1802 "fe/idl.tao_yy"
+# line 1972 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_Enum              *e = NULL;
-          AST_Decl              *v = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumIDSeen);
-          /*
-           * Create a node representing an enum and add it to its
-           * enclosing scope
-           */
-          if (s != NULL) {
-            e = idl_global->gen()->create_enum(n, p);
-            /*
-             * Add it to its defining scope
-             */
-            (void) s->fe_add_enum(e);
-          }
-          /*
-           * Push the enum scope on the scopes stack
-           */
-          idl_global->scopes()->push(e);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
+	  tao_yyval.bval = I_TRUE;
+	} break;
 case 241:
-#line 1829 "fe/idl.tao_yy"
+# line 1977 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumSqSeen);
-        }
-break;
+	  tao_yyval.bval = I_FALSE;
+	} break;
 case 242:
-#line 1833 "fe/idl.tao_yy"
+# line 1984 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumBodySeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
+	} break;
 case 243:
-#line 1837 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumQsSeen);
-          /*
-           * Done with this enum. Pop its scope from the scopes stack
-           */
-          if (idl_global->scopes()->top() == NULL)
-            tao_yyval.dcval = NULL;
-          else {
-            tao_yyval.dcval = AST_Enum::narrow_from_scope(idl_global->scopes()->top_non_null());
-            idl_global->scopes()->pop();
-          }
-        }
-break;
-case 245:
-#line 1856 "fe/idl.tao_yy"
+# line 1988 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_EnumCommaSeen);
-        }
-break;
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n = new UTL_ScopedName(tao_yypvt[-0].idval, NULL);
+	  AST_Exception		*e = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+	  AST_Decl		*v = NULL;
+
+          ACE_UNUSED_ARG (v);
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
+	  /*
+	   * Create a node representing an exception and add it to
+	   * the enclosing scope
+	   */
+	  if (s != NULL) {
+	    e = idl_global->gen()->create_exception(n, p);
+	    (void) s->fe_add_exception(e);
+	  }
+	  /*
+	   * Push the exception scope on the scope stack
+	   */
+	  idl_global->scopes()->push(e);
+	} break;
+case 244:
+# line 2012 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
+        } break;
+case 245:
+# line 2016 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
+        } break;
+case 246:
+# line 2020 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
+	  /*
+	   * Done with this exception. Pop its scope from the scope stack
+	   */
+	  idl_global->scopes()->pop();
+	} break;
+case 247:
+# line 2032 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
+        } break;
 case 248:
-#line 1865 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n =
-                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-          AST_EnumVal           *e = NULL;
-          AST_Enum              *c = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          /*
-           * Create a node representing one enumerator in an enum
-           * Add it to the enclosing scope (the enum scope)
-           */
-          if (s != NULL && s->scope_node_type() == AST_Decl::NT_enum) {
-            c = AST_Enum::narrow_from_scope(s);
-            if (c != NULL)
-              e = idl_global->gen()->create_enum_val(c->next_enum_val(), n, p);
-            (void) s->fe_add_enum_val(e);
-          }
-        }
-break;
+# line 2036 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  UTL_ScopedName	*n =
+		new UTL_ScopedName(new Identifier(tao_yypvt[-0].strval, 1, 0, I_FALSE), NULL);
+	  AST_Operation		*o = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
+	  /*
+	   * Create a node representing an operation on an interface
+	   * and add it to its enclosing scope
+	   */
+	  if (s != NULL && tao_yypvt[-2].dcval != NULL) {
+	    AST_Type *tp = AST_Type::narrow_from_decl(tao_yypvt[-2].dcval);
+            if (tp == NULL) {
+              idl_global->err()->not_a_type(tao_yypvt[-2].dcval);
+            } else if (tp->node_type() == AST_Decl::NT_except) {
+              idl_global->err()->not_a_type(tao_yypvt[-2].dcval);
+            } else {
+	      o = idl_global->gen()->create_operation(tp, tao_yypvt[-3].ofval, n, p);
+	      (void) s->fe_add_operation(o);
+	    }
+	  }
+	  /*
+	   * Push the operation scope onto the scopes stack
+	   */
+	  idl_global->scopes()->push(o);
+	} break;
 case 249:
-#line 1889 "fe/idl.tao_yy"
+# line 2065 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceCommaSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
+        } break;
 case 250:
-#line 1893 "fe/idl.tao_yy"
+# line 2069 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceExprSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
+        } break;
 case 251:
-#line 1897 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-          /*
-           * Remove sequence marker from scopes stack
-           */
-          if (idl_global->scopes()->top() == NULL)
-            idl_global->scopes()->pop();
-          /*
-           * Create a node representing a sequence
-           */
-          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-            tao_yyval.dcval = NULL;
-          } else if (tao_yyvsp[-5].dcval == NULL) {
-            tao_yyval.dcval = NULL;
-          } else {
-            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-5].dcval);
-            if (tp == NULL)
-              tao_yyval.dcval = NULL;
-            else {
-              tao_yyval.dcval = idl_global->gen()->create_sequence(tao_yyvsp[-2].exval, tp);
-              /*
-               * Add this AST_Sequence to the types defined in the global scope
-               */
-              (void) idl_global->root()
-                        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
-            }
-          }
-        }
-break;
+# line 2073 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Operation		*o = NULL;
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
+	  /*
+	   * Add exceptions and context to the operation
+	   */
+	  if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
+	    o = AST_Operation::narrow_from_scope(s);
+
+	    if (tao_yypvt[-2].nlval != NULL && o != NULL)
+	      (void) o->fe_add_exceptions(tao_yypvt[-2].nlval);
+	    if (tao_yypvt[-0].slval != NULL)
+	      (void) o->fe_add_context(tao_yypvt[-0].slval);
+	  }
+	  /*
+	   * Done with this operation. Pop its scope from the scopes stack
+	   */
+	  idl_global->scopes()->pop();
+	} break;
 case 252:
-#line 1928 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceQsSeen);
-          /*
-           * Remove sequence marker from scopes stack
-           */
-          if (idl_global->scopes()->top() == NULL)
-            idl_global->scopes()->pop();
-          /*
-           * Create a node representing a sequence
-           */
-          if (tao_yyvsp[-1].dcval == NULL)
-            tao_yyval.dcval = NULL;
-          else {
-            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-1].dcval);
-            if (tp == NULL)
-              tao_yyval.dcval = NULL;
-            else {
-              tao_yyval.dcval =
-                idl_global->gen()->create_sequence(
-                             idl_global->gen()->create_expr((unsigned long) 0),
-                             tp);
-              /*
-               * Add this AST_Sequence to the types defined in the global scope
-               */
-              (void) idl_global->root()
-                        ->fe_add_sequence(AST_Sequence::narrow_from_decl(tao_yyval.dcval));
-            }
-          }
-        }
-break;
+# line 2098 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+	  tao_yyval.ofval = AST_Operation::OP_oneway;
+	} break;
 case 253:
-#line 1961 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSeen);
-          /*
-           * Push a sequence marker on scopes stack
-           */
-          idl_global->scopes()->push(NULL);
-        }
-break;
+# line 2103 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
+	  tao_yyval.ofval = AST_Operation::OP_idempotent;
+	} break;
 case 254:
-#line 1969 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceSqSeen);
-        }
-break;
-case 255:
-#line 1973 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_SequenceTypeSeen);
-          tao_yyval.dcval = tao_yyvsp[0].dcval;
-        }
-break;
+# line 2108 "fe/idl.tao_yy"
+{
+	  tao_yyval.ofval = AST_Operation::OP_noflags;
+	} break;
 case 256:
-#line 1982 "fe/idl.tao_yy"
+# line 2116 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-break;
+	  tao_yyval.dcval =
+	    idl_global->scopes()->bottom()
+	       ->lookup_primitive_type(AST_Expression::EV_void);
+	} break;
 case 257:
-#line 1986 "fe/idl.tao_yy"
+# line 2125 "fe/idl.tao_yy"
 {
-           idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+        } break;
 case 258:
-#line 1990 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-          /*
-           * Create a node representing a string
-           */
-          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-            tao_yyval.dcval = NULL;
-          } else {
-            tao_yyval.dcval = idl_global->gen()->create_string(tao_yyvsp[-2].exval);
-            /*
-             * Add this AST_String to the types defined in the global scope
-             */
-            (void) idl_global->root()
-                      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-          }
-        }
-break;
+# line 2129 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+        } break;
 case 259:
-#line 2008 "fe/idl.tao_yy"
+# line 2133 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-          /*
-           * Create a node representing a string
-           */
-          tao_yyval.dcval =
-            idl_global->gen()->create_string(
-                         idl_global->gen()->create_expr((unsigned long) 0));
-          /*
-           * Add this AST_String to the types defined in the global scope
-           */
-          (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
+        } break;
 case 260:
-#line 2026 "fe/idl.tao_yy"
+# line 2138 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-break;
-case 261:
-#line 2034 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSqSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
+        } break;
 case 262:
-#line 2038 "fe/idl.tao_yy"
-{
-           idl_global->set_parse_state(IDL_GlobalData::PS_StringExprSeen);
-        }
-break;
-case 263:
-#line 2042 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringQsSeen);
-          /*
-           * Create a node representing a string
-           */
-          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-            tao_yyval.dcval = NULL;
-          } else {
-            tao_yyval.dcval = idl_global->gen()->create_wstring(tao_yyvsp[-2].exval);
-            /*
-             * Add this AST_String to the types defined in the global scope
-             */
-            (void) idl_global->root()
-                      ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-          }
-        }
-break;
-case 264:
-#line 2060 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringCompleted);
-          /*
-           * Create a node representing a string
-           */
-          tao_yyval.dcval =
-            idl_global->gen()->create_wstring(
-                         idl_global->gen()->create_expr((unsigned long) 0));
-          /*
-           * Add this AST_String to the types defined in the global scope
-           */
-          (void) idl_global->root()
-                    ->fe_add_string(AST_String::narrow_from_decl(tao_yyval.dcval));
-        }
-break;
+# line 2148 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
+        } break;
 case 265:
-#line 2078 "fe/idl.tao_yy"
+# line 2157 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_StringSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
+        } break;
 case 266:
-#line 2085 "fe/idl.tao_yy"
+# line 2161 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ArrayIDSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
+        } break;
 case 267:
-#line 2089 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_ArrayCompleted);
-          /*
-           * Create a node representing an array
-           */
-          if (tao_yyvsp[0].elval != NULL) {
-             tao_yyval.dcval = idl_global->gen()->create_array(new UTL_ScopedName(tao_yyvsp[-2].idval, NULL),
-                                                  tao_yyvsp[0].elval->length(), tao_yyvsp[0].elval);
-          }
-        }
-break;
+# line 2165 "fe/idl.tao_yy"
+{
+	  UTL_Scope		*s = idl_global->scopes()->top_non_null();
+	  AST_Argument		*a = NULL;
+	  UTL_StrList		*p = idl_global->pragmas();
+
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
+	  /*
+	   * Create a node representing an argument to an operation
+	   * Add it to the enclosing scope (the operation scope)
+	   */
+	  if (tao_yypvt[-2].dcval != NULL && tao_yypvt[-0].deval != NULL && s != NULL) {
+	    AST_Type *tp = tao_yypvt[-0].deval->compose(tao_yypvt[-2].dcval);
+	    if (tp != NULL) {
+	      a = idl_global->gen()->create_argument(tao_yypvt[-4].dival, tp, tao_yypvt[-0].deval->name(), p);
+	      (void) s->fe_add_argument(a);
+	    }
+	  }
+	} break;
 case 268:
-#line 2103 "fe/idl.tao_yy"
-{
-          tao_yyval.elval = new UTL_ExprList(tao_yyvsp[-1].exval, tao_yyvsp[0].elval);
-        }
-break;
-case 269:
-#line 2110 "fe/idl.tao_yy"
-{
-          if (tao_yyvsp[-1].elval == NULL)
-            tao_yyval.elval = new UTL_ExprList(tao_yyvsp[0].exval, NULL);
-          else {
-            tao_yyvsp[-1].elval->nconc(new UTL_ExprList(tao_yyvsp[0].exval, NULL));
-            tao_yyval.elval = tao_yyvsp[-1].elval;
-          }
-        }
-break;
+# line 2187 "fe/idl.tao_yy"
+{
+	  tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yypvt[-0].etval);
+	} break;
 case 270:
-#line 2119 "fe/idl.tao_yy"
+# line 2192 "fe/idl.tao_yy"
 {
-          tao_yyval.elval = NULL;
-        }
-break;
+	  UTL_Scope	*s = idl_global->scopes()->top_non_null();
+	  AST_Decl	*d = NULL;
+
+	  if (s != NULL)
+	    d = s->lookup_by_name(tao_yypvt[-0].idlist, I_TRUE);
+	  if (d == NULL)
+	    idl_global->err()->lookup_error(tao_yypvt[-0].idlist);
+	  tao_yyval.dcval = d;
+	} break;
 case 271:
-#line 2126 "fe/idl.tao_yy"
+# line 2206 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DimSqSeen);
-        }
-break;
+	  tao_yyval.dival = AST_Argument::dir_IN;
+	} break;
 case 272:
-#line 2130 "fe/idl.tao_yy"
+# line 2210 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_DimExprSeen);
-        }
-break;
+	  tao_yyval.dival = AST_Argument::dir_OUT;
+	} break;
 case 273:
-#line 2134 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_DimQsSeen);
-          /*
-           * Array dimensions are expressions which must be coerced to
-           * positive integers
-           */
-          if (tao_yyvsp[-2].exval == NULL || tao_yyvsp[-2].exval->coerce(AST_Expression::EV_ulong) == NULL) {
-            idl_global->err()->coercion_error(tao_yyvsp[-2].exval, AST_Expression::EV_ulong);
-            tao_yyval.exval = NULL;
-          } else
-            tao_yyval.exval = tao_yyvsp[-2].exval;
-        }
-break;
+# line 2214 "fe/idl.tao_yy"
+{
+	  tao_yyval.dival = AST_Argument::dir_INOUT;
+	} break;
 case 274:
-#line 2151 "fe/idl.tao_yy"
+# line 2221 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
+        } break;
 case 275:
-#line 2155 "fe/idl.tao_yy"
+# line 2225 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrTypeSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
+        } break;
 case 276:
-#line 2159 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_DecllistActiveIterator *l = NULL;
-          AST_Attribute         *a = NULL;
-          FE_Declarator         *d = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrCompleted);
-          /*
-           * Create nodes representing attributes and add them to the
-           * enclosing scope
-           */
-          if (s != NULL && tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].dlval != NULL) {
-            l = new UTL_DecllistActiveIterator(tao_yyvsp[0].dlval);
-            for (;!(l->is_done()); l->next()) {
-              d = l->item();
-              if (d == NULL)
-                continue;
-              AST_Type *tp = d->compose(tao_yyvsp[-2].dcval);
-              if (tp == NULL)
-                continue;
-              a = idl_global->gen()->create_attribute(tao_yyvsp[-5].bval, tp, d->name(), p);
-              /*
-               * Add one attribute to the enclosing scope
-               */
-              (void) s->fe_add_attribute(a);
-            }
-            delete l;
-          }
-        }
-break;
+# line 2230 "fe/idl.tao_yy"
+{
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
+	  tao_yyval.nlval = tao_yypvt[-1].nlval;
+	} break;
 case 277:
-#line 2193 "fe/idl.tao_yy"
+# line 2235 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_AttrROSeen);
-          tao_yyval.bval = I_TRUE;
-        }
-break;
+	  tao_yyval.nlval = NULL;
+	} break;
 case 278:
-#line 2198 "fe/idl.tao_yy"
+# line 2242 "fe/idl.tao_yy"
 {
-          tao_yyval.bval = I_FALSE;
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
+        } break;
 case 279:
-#line 2205 "fe/idl.tao_yy"
+# line 2246 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSeen);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
+        } break;
 case 280:
-#line 2209 "fe/idl.tao_yy"
+# line 2251 "fe/idl.tao_yy"
 {
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n = new UTL_ScopedName(tao_yyvsp[0].idval, NULL);
-          AST_Exception         *e = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-          AST_Decl              *v = NULL;
-
-          ACE_UNUSED_ARG (v);
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptIDSeen);
-          /*
-           * Create a node representing an exception and add it to
-           * the enclosing scope
-           */
-          if (s != NULL) {
-            e = idl_global->gen()->create_exception(n, p);
-            (void) s->fe_add_exception(e);
-          }
-          /*
-           * Push the exception scope on the scope stack
-           */
-          idl_global->scopes()->push(e);
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
+	  tao_yyval.slval = tao_yypvt[-1].slval;
+	} break;
 case 281:
-#line 2233 "fe/idl.tao_yy"
+# line 2256 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptSqSeen);
-        }
-break;
+	  tao_yyval.slval = NULL;
+	} break;
 case 282:
-#line 2237 "fe/idl.tao_yy"
+# line 2263 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptBodySeen);
-        }
-break;
+	  tao_yyval.slval = new UTL_StrList(tao_yypvt[-1].sval, tao_yypvt[-0].slval);
+	} break;
 case 283:
-#line 2241 "fe/idl.tao_yy"
+# line 2271 "fe/idl.tao_yy"
 {
-          idl_global->set_parse_state(IDL_GlobalData::PS_ExceptQsSeen);
-          /*
-           * Done with this exception. Pop its scope from the scope stack
-           */
-          idl_global->scopes()->pop();
-        }
-break;
+	  idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
+        } break;
 case 284:
-#line 2253 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpTypeSeen);
-        }
-break;
+# line 2275 "fe/idl.tao_yy"
+{
+	  if (tao_yypvt[-3].slval == NULL)
+	    tao_yyval.slval = new UTL_StrList(tao_yypvt[-0].sval, NULL);
+	  else {
+	    tao_yypvt[-3].slval->nconc(new UTL_StrList(tao_yypvt[-0].sval, NULL));
+	    tao_yyval.slval = tao_yypvt[-3].slval;
+	  }
+	} break;
 case 285:
-#line 2257 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          UTL_ScopedName        *n =
-                new UTL_ScopedName(new Identifier(tao_yyvsp[0].strval, 1, 0, I_FALSE), NULL);
-          AST_Operation         *o = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpIDSeen);
-          /*
-           * Create a node representing an operation on an interface
-           * and add it to its enclosing scope
-           */
-          if (s != NULL && tao_yyvsp[-2].dcval != NULL) {
-            AST_Type *tp = AST_Type::narrow_from_decl(tao_yyvsp[-2].dcval);
-            if (tp == NULL) {
-              idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
-            } else if (tp->node_type() == AST_Decl::NT_except) {
-              idl_global->err()->not_a_type(tao_yyvsp[-2].dcval);
-            } else {
-              o = idl_global->gen()->create_operation(tp, tao_yyvsp[-3].ofval, n, p);
-              (void) s->fe_add_operation(o);
-            }
-          }
-          /*
-           * Push the operation scope onto the scopes stack
-           */
-          idl_global->scopes()->push(o);
-        }
-break;
-case 286:
-#line 2286 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParsCompleted);
-        }
-break;
-case 287:
-#line 2290 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseCompleted);
-        }
-break;
-case 288:
-#line 2294 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Operation         *o = NULL;
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpCompleted);
-          /*
-           * Add exceptions and context to the operation
-           */
-          if (s != NULL && s->scope_node_type() == AST_Decl::NT_op) {
-            o = AST_Operation::narrow_from_scope(s);
-
-            if (tao_yyvsp[-2].nlval != NULL && o != NULL)
-              (void) o->fe_add_exceptions(tao_yyvsp[-2].nlval);
-            if (tao_yyvsp[0].slval != NULL)
-              (void) o->fe_add_context(tao_yyvsp[0].slval);
-          }
-          /*
-           * Done with this operation. Pop its scope from the scopes stack
-           */
-          idl_global->scopes()->pop();
-        }
-break;
-case 289:
-#line 2319 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-          tao_yyval.ofval = AST_Operation::OP_oneway;
-        }
-break;
-case 290:
-#line 2324 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpAttrSeen);
-          tao_yyval.ofval = AST_Operation::OP_idempotent;
-        }
-break;
-case 291:
-#line 2329 "fe/idl.tao_yy"
-{
-          tao_yyval.ofval = AST_Operation::OP_noflags;
-        }
-break;
-case 293:
-#line 2337 "fe/idl.tao_yy"
+# line 2284 "fe/idl.tao_yy"
 {
-          tao_yyval.dcval =
-            idl_global->scopes()->bottom()
-               ->lookup_primitive_type(AST_Expression::EV_void);
-        }
-break;
-case 294:
-#line 2346 "fe/idl.tao_yy"
-{
-           cerr << "error in " << idl_global->filename()->get_string()
-                << " line " << idl_global->lineno() << ":\n" ;
-           cerr << "Sorry, I (TAO_IDL) can't handle init yet\n";
-        }
-break;
-case 295:
-#line 2356 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-break;
-case 296:
-#line 2360 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-break;
-case 297:
-#line 2364 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpSqSeen);
-        }
-break;
-case 298:
-#line 2369 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpQsSeen);
-        }
-break;
-case 300:
-#line 2379 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParCommaSeen);
-        }
-break;
-case 303:
-#line 2388 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParDirSeen);
-        }
-break;
-case 304:
-#line 2392 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParTypeSeen);
-        }
-break;
-case 305:
-#line 2396 "fe/idl.tao_yy"
-{
-          UTL_Scope             *s = idl_global->scopes()->top_non_null();
-          AST_Argument          *a = NULL;
-          UTL_StrList           *p = idl_global->pragmas();
-
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpParDeclSeen);
-          /*
-           * Create a node representing an argument to an operation
-           * Add it to the enclosing scope (the operation scope)
-           */
-          if (tao_yyvsp[-2].dcval != NULL && tao_yyvsp[0].deval != NULL && s != NULL) {
-            AST_Type *tp = tao_yyvsp[0].deval->compose(tao_yyvsp[-2].dcval);
-            if (tp != NULL) {
-              a = idl_global->gen()->create_argument(tao_yyvsp[-4].dival, tp, tao_yyvsp[0].deval->name(), p);
-              (void) s->fe_add_argument(a);
-            }
-          }
-        }
-break;
-case 306:
-#line 2418 "fe/idl.tao_yy"
-{
-          tao_yyval.dcval = idl_global->scopes()->bottom()->lookup_primitive_type(tao_yyvsp[0].etval);
-        }
-break;
-case 308:
-#line 2423 "fe/idl.tao_yy"
-{
-          UTL_Scope     *s = idl_global->scopes()->top_non_null();
-          AST_Decl      *d = NULL;
-
-          if (s != NULL)
-            d = s->lookup_by_name(tao_yyvsp[0].idlist, I_TRUE);
-          if (d == NULL)
-            idl_global->err()->lookup_error(tao_yyvsp[0].idlist);
-          tao_yyval.dcval = d;
-        }
-break;
-case 309:
-#line 2437 "fe/idl.tao_yy"
-{
-          tao_yyval.dival = AST_Argument::dir_IN;
-        }
-break;
-case 310:
-#line 2441 "fe/idl.tao_yy"
-{
-          tao_yyval.dival = AST_Argument::dir_OUT;
-        }
-break;
-case 311:
-#line 2445 "fe/idl.tao_yy"
-{
-          tao_yyval.dival = AST_Argument::dir_INOUT;
-        }
-break;
-case 312:
-#line 2452 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSeen);
-        }
-break;
-case 313:
-#line 2456 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseSqSeen);
-        }
-break;
-case 314:
-#line 2461 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpRaiseQsSeen);
-          tao_yyval.nlval = tao_yyvsp[-1].nlval;
-        }
-break;
-case 315:
-#line 2466 "fe/idl.tao_yy"
-{
-          tao_yyval.nlval = NULL;
-        }
-break;
-case 316:
-#line 2473 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSeen);
-        }
-break;
-case 317:
-#line 2477 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextSqSeen);
-        }
-break;
-case 318:
-#line 2482 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextQsSeen);
-          tao_yyval.slval = tao_yyvsp[-1].slval;
-        }
-break;
-case 319:
-#line 2487 "fe/idl.tao_yy"
-{
-          tao_yyval.slval = NULL;
-        }
-break;
-case 320:
-#line 2494 "fe/idl.tao_yy"
-{
-          tao_yyval.slval = new UTL_StrList(tao_yyvsp[-1].sval, tao_yyvsp[0].slval);
-        }
-break;
-case 321:
-#line 2502 "fe/idl.tao_yy"
-{
-          idl_global->set_parse_state(IDL_GlobalData::PS_OpContextCommaSeen);
-        }
-break;
-case 322:
-#line 2506 "fe/idl.tao_yy"
-{
-          if (tao_yyvsp[-3].slval == NULL)
-            tao_yyval.slval = new UTL_StrList(tao_yyvsp[0].sval, NULL);
-          else {
-            tao_yyvsp[-3].slval->nconc(new UTL_StrList(tao_yyvsp[0].sval, NULL));
-            tao_yyval.slval = tao_yyvsp[-3].slval;
-          }
-        }
-break;
-case 323:
-#line 2515 "fe/idl.tao_yy"
-{
-          tao_yyval.slval = NULL;
-        }
-break;
-#line 3619 "y.tab.cpp"
-    }
-    tao_yyssp -= tao_yym;
-    tao_yystate = *tao_yyssp;
-    tao_yyvsp -= tao_yym;
-    tao_yym = tao_yylhs[tao_yyn];
-    if (tao_yystate == 0 && tao_yym == 0)
-    {
-#ifdef TAO_YYDEBUG
-        if (5 < tao_yydebug)
-            printf("tao_yydebug: after reduction, shifting from state 0 to\
- state %d\n", TAO_YYFINAL);
-#endif
-        tao_yystate = TAO_YYFINAL;
-        *++tao_yyssp = TAO_YYFINAL;
-        *++tao_yyvsp = tao_yyval;
-        if (tao_yychar < 0)
-        {
-            if ((tao_yychar = tao_yylex()) < 0) tao_yychar = 0;
-#if TAO_YYDEBUG
-            if (tao_yydebug)
-            {
-                tao_yys = 0;
-                if (tao_yychar <= TAO_YYMAXTOKEN) tao_yys = tao_yyname[tao_yychar];
-                if (!tao_yys) tao_yys = "illegal-symbol";
-                if (5 < tao_yydebug)
-                    printf("tao_yydebug: state %d, reading %d (%s)\n",
-                        TAO_YYFINAL, tao_yychar, tao_yys);
-                else
-                    TAO_YYDEBUG_LOOK_AHEAD(TAO_YYFINAL, tao_yychar, tao_yys, tao_yyssp-tao_yyss);
-            }
-#endif
-        }
-        if (tao_yychar == 0) goto tao_yyaccept;
-        goto tao_yyloop;
-    }
-    if ((tao_yyn = tao_yygindex[tao_yym]) && (tao_yyn += tao_yystate) >= 0 &&
-            tao_yyn <= TAO_YYTABLESIZE && tao_yycheck[tao_yyn] == tao_yystate)
-        tao_yystate = tao_yytable[tao_yyn];
-    else
-        tao_yystate = tao_yydgoto[tao_yym];
-#ifdef TAO_YYDEBUG
-    if (5 < tao_yydebug)
-        printf("tao_yydebug: after reduction, shifting from state %d \
-to state %d\n", *tao_yyssp, tao_yystate);
-#endif
-    if (tao_yyssp >= tao_yyss + tao_yystacksize - 1)
-    {
-        goto tao_yyoverflow;
-    }
-    *++tao_yyssp = tao_yystate;
-    *++tao_yyvsp = tao_yyval;
-    goto tao_yyloop;
-tao_yyoverflow:
-    tao_yyerror("yacc stack overflow");
-tao_yyabort:
-    return (1);
-tao_yyaccept:
-    return (0);
+	  tao_yyval.slval = NULL;
+	} break;
+# line	531 "/usr/ccs/bin/yaccpar"
+	}
+	goto tao_yystack;		/* reset registers in driver code */
 }
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp.diff b/TAO/TAO_IDL/fe/y.tab.cpp.diff
index 8bffff881d0..ed413bfaabd 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp.diff
+++ b/TAO/TAO_IDL/fe/y.tab.cpp.diff
@@ -1,28 +1,115 @@
---- y.tab.cpp.orig	Wed Mar 24 14:30:15 1999
-+++ y.tab.cpp	Wed Mar 24 14:50:58 1999
-@@ -971,7 +972,7 @@
-     extern char *ace_foo();
+--- y.tab.cpp.orig	Fri Sep  4 18:41:31 1998
++++ y.tab.cpp	Fri Sep  4 18:43:08 1998
+@@ -1,4 +1,4 @@
+-
++// $Id$
+ # line 74 "fe/idl.tao_yy"
+ #include "idl.h"
+ #include "idl_extern.h"
+@@ -103,7 +103,6 @@
+ #include <memory.h>
  #endif
  
--    if (tao_yys = ACE_OS::getenv("TAO_YYDEBUG"))
-+    if ((tao_yys = ACE_OS::getenv("TAO_YYDEBUG")))
-     {
-         tao_yyn = *tao_yys;
-         if (tao_yyn >= '0' && tao_yyn <= '9')
-@@ -988,7 +989,7 @@
-     *tao_yyssp = tao_yystate = 0;
+-#include <values.h>
  
- tao_yyloop:
--    if (tao_yyn = tao_yydefred[tao_yystate]) goto tao_yyreduce;
-+    if ((tao_yyn = tao_yydefred[tao_yystate])) goto tao_yyreduce;
-     if (tao_yychar < 0)
-     {
-         if ((tao_yychar = tao_yylex()) < 0) tao_yychar = 0;
-@@ -1042,7 +1043,6 @@
- #ifdef lint
-     goto tao_yyerrlab;
- #endif
--tao_yyerrlab:
-     ++tao_yynerrs;
- tao_yyinrecovery:
-     if (tao_yyerrflag < 3)
+ #ifdef __cplusplus
+ 
+@@ -494,52 +493,52 @@
+ 
+ tao_yytoktype tao_yytoks[] =
+ {
+-	"IDENTIFIER",	257,
+-	"IDL_CONST",	258,
+-	"IDL_MODULE",	259,
+-	"IDL_INTERFACE",	260,
+-	"IDL_TYPEDEF",	261,
+-	"IDL_LONG",	262,
+-	"IDL_SHORT",	263,
+-	"IDL_UNSIGNED",	264,
+-	"IDL_DOUBLE",	265,
+-	"IDL_FLOAT",	266,
+-	"IDL_CHAR",	267,
+-	"IDL_WCHAR",	268,
+-	"IDL_OCTET",	269,
+-	"IDL_BOOLEAN",	270,
+-	"IDL_ANY",	271,
+-	"IDL_STRUCT",	272,
+-	"IDL_UNION",	273,
+-	"IDL_SWITCH",	274,
+-	"IDL_ENUM",	275,
+-	"IDL_SEQUENCE",	276,
+-	"IDL_STRING",	277,
+-	"IDL_WSTRING",	278,
+-	"IDL_EXCEPTION",	279,
+-	"IDL_CASE",	280,
+-	"IDL_DEFAULT",	281,
+-	"IDL_READONLY",	282,
+-	"IDL_ATTRIBUTE",	283,
+-	"IDL_ONEWAY",	284,
+-	"IDL_IDEMPOTENT",	285,
+-	"IDL_VOID",	286,
+-	"IDL_IN",	287,
+-	"IDL_OUT",	288,
+-	"IDL_INOUT",	289,
+-	"IDL_RAISES",	290,
+-	"IDL_CONTEXT",	291,
+-	"IDL_NATIVE",	292,
+-	"IDL_INTEGER_LITERAL",	293,
+-	"IDL_STRING_LITERAL",	294,
+-	"IDL_CHARACTER_LITERAL",	295,
+-	"IDL_FLOATING_PT_LITERAL",	296,
+-	"IDL_TRUETOK",	297,
+-	"IDL_FALSETOK",	298,
+-	"IDL_SCOPE_DELIMITOR",	299,
+-	"IDL_LEFT_SHIFT",	300,
+-	"IDL_RIGHT_SHIFT",	301,
+-	"-unknown-",	-1	/* ends search */
++	{"IDENTIFIER",	257},
++	{"IDL_CONST",	258},
++	{"IDL_MODULE",	259},
++	{"IDL_INTERFACE",	260},
++	{"IDL_TYPEDEF",	261},
++	{"IDL_LONG",	262},
++	{"IDL_SHORT",	263},
++	{"IDL_UNSIGNED",	264},
++	{"IDL_DOUBLE",	265},
++	{"IDL_FLOAT",	266},
++	{"IDL_CHAR",	267},
++	{"IDL_WCHAR",	268},
++	{"IDL_OCTET",	269},
++	{"IDL_BOOLEAN",	270},
++	{"IDL_ANY",	271},
++	{"IDL_STRUCT",	272},
++	{"IDL_UNION",	273},
++	{"IDL_SWITCH",	274},
++	{"IDL_ENUM",	275},
++	{"IDL_SEQUENCE",	276},
++	{"IDL_STRING",	277},
++	{"IDL_WSTRING",	278},
++	{"IDL_EXCEPTION",	279},
++	{"IDL_CASE",	280},
++	{"IDL_DEFAULT",	281},
++	{"IDL_READONLY",	282},
++	{"IDL_ATTRIBUTE",	283},
++	{"IDL_ONEWAY",	284},
++	{"IDL_IDEMPOTENT",	285},
++	{"IDL_VOID",	286},
++	{"IDL_IN",	287},
++	{"IDL_OUT",	288},
++	{"IDL_INOUT",	289},
++	{"IDL_RAISES",	290},
++	{"IDL_CONTEXT",	291},
++	{"IDL_NATIVE",	292},
++	{"IDL_INTEGER_LITERAL",	293},
++	{"IDL_STRING_LITERAL",	294},
++	{"IDL_CHARACTER_LITERAL",	295},
++	{"IDL_FLOATING_PT_LITERAL",	296},
++	{"IDL_TRUETOK",	297},
++	{"IDL_FALSETOK",	298},
++	{"IDL_SCOPE_DELIMITOR",	299},
++	{"IDL_LEFT_SHIFT",	300},
++	{"IDL_RIGHT_SHIFT",	301},
++	{"-unknown-",	-1}	/* ends search */
+ };
+ 
+ char * tao_yyreds[] =
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index 9072bf04bde..29a0adbf3fd 100644
--- a/TAO/TAO_IDL/fe/y.tab.h
+++ b/TAO/TAO_IDL/fe/y.tab.h
@@ -1,83 +1,78 @@
 // $Id$
-#define IDENTIFIER 257
-#define IDL_CONST 258
-#define IDL_MODULE 259
-#define IDL_INTERFACE 260
-#define IDL_TYPEDEF 261
-#define IDL_LONG 262
-#define IDL_SHORT 263
-#define IDL_UNSIGNED 264
-#define IDL_DOUBLE 265
-#define IDL_FLOAT 266
-#define IDL_CHAR 267
-#define IDL_WCHAR 268
-#define IDL_OCTET 269
-#define IDL_BOOLEAN 270
-#define IDL_ANY 271
-#define IDL_STRUCT 272
-#define IDL_UNION 273
-#define IDL_SWITCH 274
-#define IDL_ENUM 275
-#define IDL_SEQUENCE 276
-#define IDL_STRING 277
-#define IDL_WSTRING 278
-#define IDL_EXCEPTION 279
-#define IDL_CASE 280
-#define IDL_DEFAULT 281
-#define IDL_READONLY 282
-#define IDL_ATTRIBUTE 283
-#define IDL_ONEWAY 284
-#define IDL_IDEMPOTENT 285
-#define IDL_VOID 286
-#define IDL_IN 287
-#define IDL_OUT 288
-#define IDL_INOUT 289
-#define IDL_RAISES 290
-#define IDL_CONTEXT 291
-#define IDL_NATIVE 292
-#define IDL_ABSTRACT 293
-#define IDL_CUSTOM 294
-#define IDL_INIT 295
-#define IDL_PRIVATE 296
-#define IDL_PUBLIC 297
-#define IDL_SUPPORTS 298
-#define IDL_TRUNCATABLE 299
-#define IDL_VALUETYPE 300
-#define IDL_INTEGER_LITERAL 301
-#define IDL_STRING_LITERAL 302
-#define IDL_CHARACTER_LITERAL 303
-#define IDL_FLOATING_PT_LITERAL 304
-#define IDL_TRUETOK 305
-#define IDL_FALSETOK 306
-#define IDL_SCOPE_DELIMITOR 307
-#define IDL_LEFT_SHIFT 308
-#define IDL_RIGHT_SHIFT 309
-typedef union {
-  AST_Decl              *dcval;         /* Decl value           */
-  UTL_StrList           *slval;         /* String list          */
-  UTL_NameList          *nlval;         /* Name list            */
-  UTL_ExprList          *elval;         /* Expression list      */
-  UTL_LabelList         *llval;         /* Label list           */
-  UTL_DeclList          *dlval;         /* Declaration list     */
-  FE_InterfaceHeader    *ihval;         /* Interface header     */
-  FE_obv_header         *vhval;         /* Valuetype header     */
-  AST_Expression        *exval;         /* Expression value     */
-  AST_UnionLabel        *ulval;         /* Union label          */
-  AST_Field             *ffval;         /* Field value          */
-  AST_Field::Visibility  vival;         /* N/A, pub or priv     */
-  AST_Expression::ExprType etval;       /* Expression type      */
-  AST_Argument::Direction dival;        /* Argument direction   */
-  AST_Operation::Flags  ofval;          /* Operation flags      */
-  FE_Declarator         *deval;         /* Declarator value     */
-  idl_bool              bval;           /* Boolean value        */
-  long                  ival;           /* Long value           */
-  double                dval;           /* Double value         */
-  float                 fval;           /* Float value          */
-  char                  cval;           /* Char value           */
 
-  String                *sval;          /* String value         */
-  char                  *strval;        /* char * value         */
-  Identifier            *idval;         /* Identifier           */
-  UTL_IdList            *idlist;        /* Identifier list      */
+typedef union
+#ifdef __cplusplus
+	TAO_YYSTYPE
+#endif
+ {
+  AST_Decl		*dcval;		/* Decl value		*/
+  UTL_StrList		*slval;		/* String list		*/
+  UTL_NameList		*nlval;		/* Name list		*/
+  UTL_ExprList		*elval;		/* Expression list	*/
+  UTL_LabelList		*llval;		/* Label list		*/
+  UTL_DeclList		*dlval;		/* Declaration list	*/
+  FE_InterfaceHeader	*ihval;		/* Interface header	*/
+  AST_Expression	*exval;		/* Expression value	*/
+  AST_UnionLabel	*ulval;		/* Union label		*/
+  AST_Field		*ffval;		/* Field value		*/
+  AST_Expression::ExprType etval;	/* Expression type	*/
+  AST_Argument::Direction dival;	/* Argument direction	*/
+  AST_Operation::Flags	ofval;		/* Operation flags	*/
+  FE_Declarator		*deval;		/* Declarator value	*/
+  idl_bool		bval;		/* Boolean value	*/
+  long			ival;		/* Long value		*/
+  double		dval;		/* Double value		*/
+  float			fval;		/* Float value		*/
+  char			cval;		/* Char value		*/
+
+  String		*sval;		/* String value		*/
+  char			*strval;	/* char * value		*/
+  Identifier		*idval;		/* Identifier		*/
+  UTL_IdList		*idlist;	/* Identifier list	*/
 } TAO_YYSTYPE;
 extern TAO_YYSTYPE tao_yylval;
+# define IDENTIFIER 257
+# define IDL_CONST 258
+# define IDL_MODULE 259
+# define IDL_INTERFACE 260
+# define IDL_TYPEDEF 261
+# define IDL_LONG 262
+# define IDL_SHORT 263
+# define IDL_UNSIGNED 264
+# define IDL_DOUBLE 265
+# define IDL_FLOAT 266
+# define IDL_CHAR 267
+# define IDL_WCHAR 268
+# define IDL_OCTET 269
+# define IDL_BOOLEAN 270
+# define IDL_ANY 271
+# define IDL_STRUCT 272
+# define IDL_UNION 273
+# define IDL_SWITCH 274
+# define IDL_ENUM 275
+# define IDL_SEQUENCE 276
+# define IDL_STRING 277
+# define IDL_WSTRING 278
+# define IDL_EXCEPTION 279
+# define IDL_CASE 280
+# define IDL_DEFAULT 281
+# define IDL_READONLY 282
+# define IDL_ATTRIBUTE 283
+# define IDL_ONEWAY 284
+# define IDL_IDEMPOTENT 285
+# define IDL_VOID 286
+# define IDL_IN 287
+# define IDL_OUT 288
+# define IDL_INOUT 289
+# define IDL_RAISES 290
+# define IDL_CONTEXT 291
+# define IDL_NATIVE 292
+# define IDL_INTEGER_LITERAL 293
+# define IDL_STRING_LITERAL 294
+# define IDL_CHARACTER_LITERAL 295
+# define IDL_FLOATING_PT_LITERAL 296
+# define IDL_TRUETOK 297
+# define IDL_FALSETOK 298
+# define IDL_SCOPE_DELIMITOR 299
+# define IDL_LEFT_SHIFT 300
+# define IDL_RIGHT_SHIFT 301
diff --git a/TAO/TAO_IDL/include/Makefile.am b/TAO/TAO_IDL/include/Makefile.am
deleted file mode 100644
index d589b7b2e95..00000000000
--- a/TAO/TAO_IDL/include/Makefile.am
+++ /dev/null
@@ -1,87 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'include' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## SUBDIRS = utl_tmpl
-
-noinst_HEADERS = \
-         ast.h  \
-         ast_argument.h  \
-         ast_array.h  \
-         ast_attribute.h  \
-         ast_concrete_type.h  \
-         ast_constant.h  \
-         ast_decl.h  \
-         ast_enum.h  \
-         ast_enum_val.h  \
-         ast_exception.h  \
-         ast_expression.h  \
-         ast_extern.h  \
-         ast_field.h  \
-         ast_generator.h  \
-         ast_interface.h  \
-         ast_interface_fwd.h  \
-         ast_module.h  \
-         ast_native.h  \
-         ast_operation.h  \
-         ast_predefined_type.h  \
-         ast_root.h  \
-         ast_sequence.h  \
-         ast_string.h  \
-         ast_structure.h  \
-         ast_type.h  \
-         ast_typedef.h  \
-         ast_union.h  \
-         ast_union_branch.h  \
-         ast_union_label.h  \
-         be_extern.h  \
-         drv_extern.h  \
-         drv_link.h  \
-         drv_private.h  \
-         fe_declarator.h  \
-         fe_extern.h  \
-         fe_interface_header.h  \
-         fe_private.h  \
-         global_extern.h  \
-         idl.h  \
-         idl_bool.h  \
-         idl_defines.h  \
-         idl_extern.h  \
-         idl_fwd.h  \
-         idl_global.h  \
-         idl_narrow.h  \
-         intlmacros.h  \
-         nr_extern.h  \
-         util.h  \
-         utl_decllist.h  \
-         utl_error.h  \
-         utl_exceptlist.h  \
-         utl_exprlist.h  \
-         utl_identifier.h  \
-         utl_idlist.h  \
-         utl_indenter.h  \
-         utl_labellist.h  \
-         utl_list.h  \
-         utl_namelist.h  \
-         utl_scope.h  \
-         utl_scoped_name.h  \
-         utl_stack.h  \
-         utl_string.h  \
-         utl_strlist.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 21a7064fb09..5ac661d52df 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -67,8 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_EXPRESSION_AST_EXPRESSION_HH
 #define _AST_EXPRESSION_AST_EXPRESSION_HH
 
-#include "ace/CDR_Stream.h"
-
 // Representation of expression values
 
 /*
@@ -128,30 +126,25 @@ public:
     , EV_none                   // Expression value is missing
   };
 
-  // Structure to describe value of constant expression and its type
+  // Structure to descrive value of constant expression and its type
   struct AST_ExprValue {
     union {
-      short               sval;     // Contains short expression value
-      unsigned short      usval;    // Contains unsigned short expr value
-      long                lval;     // Contains long expression value
-      unsigned long       ulval;    // Contains unsigned long expr value
-      unsigned long       bval;     // Contains boolean expression value
-#if ! defined (ACE_LACKS_LONGLONG_T)
-      ACE_CDR::LongLong   llval;   // Contains long long expr value
-      ACE_CDR::ULongLong  ullval;  // Contains unsigned long long expr value
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-      float               fval;     // Contains 32-bit float expr value
-      double              dval;     // Contains 64-bit float expr value
-      char                cval;     // Contains char expression value
-      ACE_CDR::WChar      wcval;    // Contains wchar expression value
-      unsigned char       oval;     // Contains unsigned char expr value
-      String              *strval;  // Contains String * expr value
-      unsigned long       eval;     // Contains enumeration value
+      short             sval;   // Contains short expression value
+      unsigned short    usval;  // Contains unsigned short expr value
+      long              lval;   // Contains long expression value
+      unsigned long     ulval;  // Contains unsigned long expr value
+      unsigned long     bval;   // Contains boolean expression value
+      float             fval;   // Contains 32-bit float expr value
+      double            dval;   // Contains 64-bit float expr value
+      char              cval;   // Contains char expression value
+      unsigned char     oval;   // Contains unsigned char expr value
+      String            *strval; // Contains String * expr value
+      unsigned long     eval;   // Contains enumeration value
     } u;
     ExprType et;
   };
 
- // Operations
+  // Operations
 
   // Constructor(s)
   AST_Expression(AST_Expression *v, ExprType t);
@@ -166,7 +159,6 @@ public:
   AST_Expression(float          f);
   AST_Expression(double         d);
   AST_Expression(char           c);
-  AST_Expression(ACE_CDR::WChar wc);
   AST_Expression(unsigned char  uc);
   AST_Expression(String         *s);
   AST_Expression(UTL_ScopedName *n);
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index a6583ee3ec0..20df9f68fe3 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -90,20 +90,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class   AST_Field : public virtual AST_Decl
 {
 public:
-  enum Visibility {vis_NA, vis_PUBLIC, vis_PRIVATE};
   // Operations
 
   // Constructor(s)
   AST_Field();
   AST_Field(AST_Type *field_type,
-            UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA);
+            UTL_ScopedName *n, UTL_StrList *p);
   AST_Field(AST_Decl::NodeType nt, AST_Type *field_type,
-            UTL_ScopedName *n, UTL_StrList *p, Visibility vis = vis_NA);
+            UTL_ScopedName *n, UTL_StrList *p);
   virtual ~AST_Field() {}
 
   // Data Accessors
   AST_Type *field_type();
-  Visibility visibility();
 
   // Narrowing
   DEF_NARROW_METHODS1(AST_Field, AST_Decl);
@@ -115,7 +113,7 @@ public:
 private:
   // Data
   AST_Type                      *pd_field_type; // Base type for field
-  Visibility                    pd_visibility;
+
 };
 
 #endif           // _AST_FIELD_AST_FIELD_HH
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index cc2ce73cbe2..b6a6686ffb8 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -113,16 +113,6 @@ public:
   virtual AST_InterfaceFwd *create_interface_fwd(UTL_ScopedName *n,
                                                  UTL_StrList *p);
 
-  // Create a node representing an valuetype
-  virtual AST_Interface *create_valuetype(UTL_ScopedName *n,
-                                          AST_Interface **ih,
-                                          long nih,
-                                          UTL_StrList *p);
-
-  // Create a node representing a forward declaration of an valuetype
-  virtual AST_InterfaceFwd *create_valuetype_fwd(UTL_ScopedName *n,
-                                                 UTL_StrList *p);
-
   // Create a node representing an exception
   virtual AST_Exception *create_exception(UTL_ScopedName *n,
                                           UTL_StrList *p);
@@ -145,8 +135,7 @@ public:
   // union
   virtual AST_Field     *create_field(AST_Type *ft,
                                       UTL_ScopedName *n,
-                                      UTL_StrList *p,
-                                      AST_Field::Visibility vis = AST_Field::vis_NA);
+                                      UTL_StrList *p);
 
   // Create a node representing an argument to an operation
   virtual AST_Argument  *create_argument(AST_Argument::Direction d,
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 7cf75626a5c..317a181dcd0 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -100,10 +100,6 @@ public:
   virtual ~AST_Interface() {}
 
   // Data Accessors
-  static void fwd_redefinition_helper (AST_Interface *&i,
-                                       UTL_Scope *s, UTL_StrList *p);
-
-  virtual void redefine (AST_Interface *from, UTL_StrList *p);
   AST_Interface **inherits();
   void set_inherits(AST_Interface **i);
   long n_inherits();
@@ -117,11 +113,6 @@ public:
     return (pd_n_inherits < 0) ? I_FALSE : I_TRUE;
   }
 
-  virtual idl_bool is_abstract_interface ();
-  virtual idl_bool is_valuetype ();
-  virtual idl_bool is_abstract_valuetype ();
-  virtual void set_abstract_valuetype ();
-
   // Narrowing
   DEF_NARROW_METHODS2(AST_Interface, AST_Type, UTL_Scope);
   DEF_NARROW_FROM_DECL(AST_Interface);
@@ -143,7 +134,6 @@ private:
   virtual AST_Constant          *fe_add_constant(AST_Constant   *c);
   virtual AST_Exception         *fe_add_exception(AST_Exception *e);
   virtual AST_Attribute         *fe_add_attribute(AST_Attribute *a);
-  virtual AST_Field             *fe_add_field(AST_Field *o);
   virtual AST_Operation         *fe_add_operation(AST_Operation *o);
   virtual AST_Union             *fe_add_union(AST_Union         *u);
   virtual AST_Structure         *fe_add_structure(AST_Structure *s);
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 64a334f4223..49153b9da59 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -83,18 +83,13 @@ public:
 
   // Constructor(s)
   AST_InterfaceFwd();
-  AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n, UTL_StrList *p);
+  AST_InterfaceFwd(UTL_ScopedName *n, UTL_StrList *p);
   virtual ~AST_InterfaceFwd() {}
 
   // Data Accessors
   AST_Interface *full_definition();
   void set_full_definition(AST_Interface *nfd);
 
-  virtual idl_bool is_abstract_interface ();
-  virtual idl_bool is_valuetype ();
-  virtual idl_bool is_abstract_valuetype ();
-  virtual void set_abstract_valuetype ();
-
   // Narrowing
   DEF_NARROW_METHODS1(AST_InterfaceFwd, AST_Type);
   DEF_NARROW_FROM_DECL(AST_InterfaceFwd);
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 4cf89f0f27c..cae2cb03b3c 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -97,10 +97,6 @@ public:
   // AST Dumping
   virtual void                  dump(ostream &o);
 
-  // involved in OBV_ namespace generation
-  void set_has_nested_valuetype ();
-  idl_bool has_nested_valuetype ();
-
 private:
   friend void fe_populate(AST_Module *m);
   friend int tao_yyparse();
@@ -120,7 +116,6 @@ private:
   virtual AST_Typedef           *fe_add_typedef(AST_Typedef             *t);
   virtual AST_Native            *fe_add_native (AST_Native      *n);
 
-  idl_bool pd_has_nested_valuetype;
 };
 
 #endif           // _AST_MODULE_AST_MODULE_HH
diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h
index b427dcd2812..0fe78e3e227 100644
--- a/TAO/TAO_IDL/include/fe_interface_header.h
+++ b/TAO/TAO_IDL/include/fe_interface_header.h
@@ -70,10 +70,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FE_InterfaceHeader
 //
 // Internal class for FE to describe interface headers
-//
-// FE_obv_header
-// Internal class for FE to describe valuetype headers
-//
 
 /*
 ** DEPENDENCIES: utl_scoped_name.hh, ast_interface.hh, utl_scope.hh,
@@ -88,9 +84,7 @@ public:
   // Operations
 
   // Constructor(s)
-  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l,
-                                        UTL_NameList *supports = 0,
-                                        idl_bool compile_now = 1);
+  FE_InterfaceHeader(UTL_ScopedName *n, UTL_NameList *l);
   virtual ~FE_InterfaceHeader() {}
 
   // Data Accessors
@@ -98,10 +92,9 @@ public:
   AST_Interface **inherits();
   long n_inherits();
 
+private:
   // Data
-protected:
   UTL_ScopedName        *pd_interface_name;     // Interface name
-private:
   AST_Interface         **pd_inherits;          // Inherited interfaces
   long                  pd_n_inherits;          // How many
 
@@ -109,46 +102,8 @@ private:
 
   // Compile the flattened unique list of interfaces which this
   // interface inherits from
-protected:
-  void                  compile_inheritance(UTL_NameList *l,
-                                            UTL_NameList *supports);
-private:
   void                  compile_one_inheritance(AST_Interface *i);
-
-  // called from compile_inheritance()
-  virtual idl_bool check_first (AST_Interface *i);
-  virtual idl_bool check_further (AST_Interface *i);
-  virtual idl_bool check_supports (AST_Interface *i);
+  void                  compile_inheritance(UTL_NameList *l);
 };
 
-
-class FE_obv_header;
-
-// #ifdef IDL_HAS_VALUETYPE
-
-class FE_obv_header : public FE_InterfaceHeader
-{
-public:
-
-  // Constructor(s)
-  FE_obv_header(UTL_ScopedName *n, UTL_NameList *l, UTL_NameList *supports);
-  virtual ~FE_obv_header() {}
-
-  // Data Accessors
-  void valuetype_name (UTL_ScopedName *n);
-  long n_concrete ();
-
- private:
-
-  // called from compile_inheritance()
-  virtual idl_bool check_first (AST_Interface *i);
-  virtual idl_bool check_further (AST_Interface *i);
-  virtual idl_bool check_supports (AST_Interface *i);
-
-  idl_bool truncatable_;  /* currently 0, ignored */
-  long n_concrete_;
-};
-
-// #endif /* IDL_HAS_VALUETYPE */
-
 #endif           // _FE_INTERFACE_HEADER_FE_INTERFACE_HH
diff --git a/TAO/TAO_IDL/include/idl.h b/TAO/TAO_IDL/include/idl.h
index fedbd9d8b53..0b9161c511b 100644
--- a/TAO/TAO_IDL/include/idl.h
+++ b/TAO/TAO_IDL/include/idl.h
@@ -79,8 +79,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#define IDL_HAS_VALUETYPE
-
 #include        "intlmacros.h"          // Define macros for intl'ion
 
 #include        <stdlib.h>              // POSIX standard defns
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index c9bf29936e3..1d78e6bf613 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -87,7 +87,6 @@ public:
     , PS_ExceptDeclSeen         // Seen complete exception declaration
     , PS_InterfaceDeclSeen      // Seen complete interface declaration
     , PS_ModuleDeclSeen         // Seen complete module declaration
-    , PS_ValuetypeDeclSeen      // Seen complete valuetype declaration
     , PS_AttrDeclSeen           // Seen complete attribute declaration
     , PS_OpDeclSeen             // Seen complete operation declaration
     , PS_ModuleSeen             // Seen a MODULE keyword
@@ -103,8 +102,6 @@ public:
     , PS_InterfaceQsSeen        // '}' seen for interface
     , PS_InterfaceBodySeen      // Seen an interface body
     , PS_InheritColonSeen       // Seen ':' in inheritance list
-    , PS_ValuetypeSeen          // Seen a VALUETYPE keyword
-    , PS_ValuetypeIDSeen        // Seen the valuetype ID
     , PS_SNListCommaSeen        // Seen ',' in list of scoped names
     , PS_ScopedNameSeen         // Seen a complete scoped name
     , PS_SN_IDSeen              // Seen an identifier as part of a scoped name
@@ -294,18 +291,18 @@ public:
 
   // The number of currently availabe include files.
   virtual size_t n_included_idl_files (void);
-
+  
   // Set the number of included_idl_files. Use this carefully. This
   // method is used when we validate all the #included idl files,
   // against the ones that we get after preprocessing.
   virtual void n_included_idl_files (size_t n);
 
   // Validate the included idl files, somefiles might have been
-  // ignored by the preprocessor.
+  // ignored by the preprocessor. 
   virtual void validate_included_idl_files (void);
-
-  virtual ParseState            parse_state();          // What state we're in
-  virtual void                  set_parse_state(ParseState s); // Set it
+  
+  virtual ParseState		parse_state();		// What state we're in
+  virtual void			set_parse_state(ParseState s); // Set it
 
   // Convert from a predefined type to an expression type
   virtual AST_Expression::ExprType
@@ -418,7 +415,7 @@ public:
 
   virtual void impl_class_suffix (const char* s);
   // Set the implementation class suffix.
-
+  
   virtual void implementation_skel_ending (const char* s);
   // Set the implementation_skel_ending.
 
@@ -474,16 +471,6 @@ public:
   // to be kept. Default  is current directory from which the
   // <tao_idl> is called.
 
-  virtual void temp_dir (const char* s);
-  // Set the directory where the IDL compiler can keep all its temp
-  // files. By default, IDL compiler looks for TEMP env variable and
-  // if it is not set,  "/tmp/" is assigned.
-
-  virtual const char* temp_dir (void) const;
-  // Get the directory where the IDL compiler can keep all its temp
-  // files. By default, IDL compiler looks for TEMP env variable and
-  // if it is not set,  "/tmp/" is assigned.
-
   virtual void gperf_path (const char* s);
   // Set the path for the perfect hashing program (GPERF).
 
@@ -491,10 +478,10 @@ public:
   // Get the path for the perfect hashing program (GPERF).
 
   virtual void any_support (idl_bool);
-  // enable suppressing any support    ?T.Kuepper: suppressed?
+  // enable suppressing any support
 
   virtual idl_bool any_support (void);
-  // check if Any support is suppressed  ? enabled ?
+  // check if Any support is suppressed
 
   virtual void tc_support (idl_bool);
   // enable suppressing TypeCode support
@@ -502,17 +489,6 @@ public:
   virtual idl_bool tc_support (void);
   // check if TypeCode support is suppressed
 
-#ifdef IDL_HAS_VALUETYPE
-  virtual void obv_opt_accessor (idl_bool);
-  virtual idl_bool obv_opt_accessor (void);
-
-  virtual void obv_support (idl_bool);
-  // set enable/disable OBV (Valuetype) support
-#endif /* IDL_HAS_VALUETYPE */
-
-  virtual idl_bool obv_support (void);
-  // check if OBV (Valuetype) support is enabled
-
   virtual void compiled_marshaling (idl_bool);
   // enable compiled marshaling support
 
@@ -593,7 +569,7 @@ private:
                                                         // before?
 
   String                        *pd_idl_src_file;       // IDL source file.
-
+  
   size_t  changing_standard_include_files_;
   // To switch between changing or non-changing standard include
   // files (e.g. tao/corba.h)  so that #include statements can be
@@ -619,7 +595,7 @@ private:
 
  // Implementation's skeleton file name ending. Default is "I.cpp".
   char* implementation_skel_ending_;
-
+  
   //Implementaion class prefix
   char* impl_class_prefix_;
 
@@ -646,15 +622,10 @@ private:
   // is $ACE_ROOT/bin/gperf.
   char* gperf_path_;
 
-
-  char* output_dir_;
   // Directory where all the IDL-Compiler-Generated files are to be
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
-
-  char* temp_dir_;
-  // Temp directory where which we can rewsolve in drv_preproc.cpp by
-  // checking for  TEMP env variable otherwise we assign to /tmp/.
+  char* output_dir_;
 
   idl_bool any_support_;
   // do we support Any operators?
@@ -662,12 +633,6 @@ private:
   idl_bool tc_support_;
   // do we support typecodes?
 
-  idl_bool obv_support_;
-  // do we support OBV (Valuetype)?
-
-  idl_bool obv_opt_accessor_;
-  // do we optimize valuetype accessors?
-
   idl_bool compiled_marshaling_;
   // do we support compiled marshaling
 
@@ -688,3 +653,15 @@ private:
 };
 
 #endif  //_IDL_IDL_GLOBAL_HH
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 6a1b73556a6..f0d4bb86d2e 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -144,8 +144,6 @@ public:
   // Report an attempt to inherit from something other than an interface
   void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
-  void  abstract_inheritance_error (UTL_ScopedName *n);
-
   // Report an error while evaluating an expression (division by zero, etc.)
   void  eval_error(AST_Expression *d);
 
diff --git a/TAO/TAO_IDL/include/utl_error.h b/TAO/TAO_IDL/include/utl_error.h
index 6a1b73556a6..f0d4bb86d2e 100644
--- a/TAO/TAO_IDL/include/utl_error.h
+++ b/TAO/TAO_IDL/include/utl_error.h
@@ -144,8 +144,6 @@ public:
   // Report an attempt to inherit from something other than an interface
   void  inheritance_error(UTL_ScopedName *n, AST_Decl *d);
 
-  void  abstract_inheritance_error (UTL_ScopedName *n);
-
   // Report an error while evaluating an expression (division by zero, etc.)
   void  eval_error(AST_Expression *d);
 
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index b017f25575f..9fb67002cf3 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -159,8 +159,7 @@ public:
 
   // Name Lookup Mechanism
   virtual AST_Decl              *lookup_by_name(UTL_ScopedName *,
-                                                idl_bool treat_as_ref,
-                                                idl_bool in_parent = 1);
+                                                idl_bool treat_as_ref);
 
   // Look up the Identifier * specified only in the local scope
   virtual AST_Decl              *lookup_by_name_local(Identifier *,
diff --git a/TAO/TAO_IDL/narrow/Makefile.am b/TAO/TAO_IDL/narrow/Makefile.am
deleted file mode 100644
index 160565df988..00000000000
--- a/TAO/TAO_IDL/narrow/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'narrow' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include
-
-noinst_LIBRARIES = libnarrow.a
-
-libnarrow_a_SOURCES = \
-         narrow.cpp
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/man/man1/tao_idl.1 b/TAO/TAO_IDL/tao_idl.1
index d2a9466e4c3..ebd9e76d402 100644
--- a/TAO/man/man1/tao_idl.1
+++ b/TAO/TAO_IDL/tao_idl.1
@@ -1,8 +1,6 @@
 .\" Process this file with
 .\" groff -man -Tascii tao_idl.1
 .\"
-.\" $Id$
-.\"
 .TH tao_idl 1 "DECEMBER 1998" "CORBA Tools" "User Manuals"
 .SH NAME
 tao_idl \- Compile IDL sources for use with the ACE ORB (TAO)
@@ -38,11 +36,13 @@ the compiler printouts its version and exits
 .TP
 .BI "\-Wb," "option_list" 
 pass options to the backend
+.Sp
 .IP
 .BI "export_macro=" "macro_name"
 The compiler will emit macro_name right after each class or extern 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.
+.Sp
 .IP
 .BI "export_include=" "include_path"
 The compiler will generate code to include include_path at the top of the
@@ -163,5 +163,4 @@ Carlos O'Ryan <coryan@cs.wustl.edu>
 Ossama Othman <ossama@debian.org>
 performed man page conversion from original HTML source
 .SH "SEE ALSO"
-.BR gperf (1),
-.BR TAO (7)
+.BR gperf (1)
diff --git a/TAO/TAO_IDL/tao_idl.cpp b/TAO/TAO_IDL/tao_idl.cpp
index b23aff4f2f0..18a8af7973b 100644
--- a/TAO/TAO_IDL/tao_idl.cpp
+++ b/TAO/TAO_IDL/tao_idl.cpp
@@ -53,8 +53,8 @@ Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR
 Sun, Sun Microsystems and the Sun logo are trademarks or registered
 trademarks of Sun Microsystems, Inc.
 
-SunSoft, Inc.
-2550 Garcia Avenue
+SunSoft, Inc.  
+2550 Garcia Avenue 
 Mountain View, California  94043
 
 NOTE:
@@ -75,22 +75,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 ** 4. Otherwise, for the single file, invoke DRV_drive
 */
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
-#include        "drv_private.h"
+#include	"drv_private.h"
 #include        "drv_link.h"
 
 ACE_RCSID(TAO_IDL, tao_idl, "$Id$")
 
-#define         IDL_CFE_VERSION        "1.3.0"
-
 static void
 DRV_version()
 {
-  cerr << idl_global->prog_name() << endl
-       << GTDEVEL("FE: Based on Sun IDL CFE version ")
-       << IDL_CFE_VERSION
+  cerr << idl_global->prog_name() 
+       << GTDEVEL(", version ")
+       << IDL_CFE_VERSION 
        << "\n";
   (*DRV_BE_version)();
 }
@@ -113,7 +111,7 @@ DRV_version()
 void
 DRV_drive(char *s)
 {
-  char  *fn;
+  char	*fn;
 
   // Macro to avoid "warning: unused parameter" type warning.
   ACE_UNUSED_ARG (fn);
@@ -126,9 +124,9 @@ DRV_drive(char *s)
    */
   if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
     cerr << idl_global->prog_name()
-         << GTDEVEL(": preprocessing ")
-         << s
-         << "\n";
+	 << GTDEVEL(": preprocessing ")
+	 << s
+	 << "\n";
   DRV_pre_proc(s);
   /*
    * Initialize FE stage 1
@@ -147,28 +145,28 @@ DRV_drive(char *s)
    */
   if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
     cerr << idl_global->prog_name()
-         << GTDEVEL(": parsing ")
-         << s
-         << "\n";
+	 << GTDEVEL(": parsing ")
+	 << s
+	 << "\n";
   (*DRV_FE_yyparse)();
   /*
    * If there were any errors, stop
    */
   if (idl_global->err_count() > 0) {
     cerr << idl_global->prog_name()
-         << ": "
-         << s
-         << GTDEVEL(": found ");
+	 << ": "
+	 << s 
+	 << GTDEVEL(": found ");
     cerr << idl_global->err_count()
-         << GTDEVEL(" error");
+	 << GTDEVEL(" error");
     cerr << (idl_global->err_count() > 1
-            ? GTDEVEL("s") : "")
-         << "\n";
+	    ? GTDEVEL("s") : "")
+    	 << "\n";
     /*
      * Call BE_abort to allow a BE to clean up after itself
      */
     (*DRV_BE_abort)();
-    ACE_OS::exit (ACE_static_cast (int, idl_global->err_count()));
+    exit((int) idl_global->err_count());
   }
   /*
    * Dump the code
@@ -176,9 +174,9 @@ DRV_drive(char *s)
   if ((idl_global->compile_flags() & IDL_CF_INFORMATIVE)
       && (idl_global->compile_flags() & IDL_CF_DUMP_AST))
     cerr << idl_global->prog_name()
-         << GTDEVEL(": dump ")
-         << s
-         << "\n";
+	 << GTDEVEL(": dump ")
+	 << s
+	 << "\n";
   if (idl_global->compile_flags() & IDL_CF_DUMP_AST) {
     cerr << GTDEVEL("Dump of AST:\n");
     idl_global->root()->dump(cerr);
@@ -188,14 +186,14 @@ DRV_drive(char *s)
    */
   if (idl_global->compile_flags() & IDL_CF_INFORMATIVE)
     cerr << idl_global->prog_name()
-         << GTDEVEL(": BE processing on ")
-         << s
-         << "\n";
+	 << GTDEVEL(": BE processing on ")
+	 << s
+	 << "\n";
   (*DRV_BE_produce)();
   /*
    * Exit cleanly
    */
-  ACE_OS::exit (0);
+  exit(0);
 }
 
 /*
@@ -226,14 +224,14 @@ main(int argc, char **argv)
    */
   if (idl_global->compile_flags() & IDL_CF_VERSION) {
     DRV_version();
-    ACE_OS::exit (0);
+    exit(0);
   }
   /*
    * If a usage message is requested, give it and exit
    */
   if (idl_global->compile_flags() & IDL_CF_ONLY_USAGE) {
     DRV_usage();
-    ACE_OS::exit (0);
+    exit(0);
   }
   /*
    * Fork off a process for each file to process. Fork only if
@@ -257,7 +255,7 @@ main(int argc, char **argv)
     DRV_file_index = 0;
     DRV_drive(DRV_files[DRV_file_index]);
   }
-  ACE_OS::exit (0);
+  exit(0);
   /* NOTREACHED */
   return 0;
 }
diff --git a/TAO/TAO_IDL/tao_idl.dsp b/TAO/TAO_IDL/tao_idl.dsp
index a3c35dd112b..91c9931631f 100644
--- a/TAO/TAO_IDL/tao_idl.dsp
+++ b/TAO/TAO_IDL/tao_idl.dsp
@@ -44,7 +44,7 @@ CFG=TAO_IDL Compiler - Win32 Alpha Debug
 # PROP Target_Dir ""

 CPP=cl.exe

 # 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 "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

@@ -72,7 +72,7 @@ LINK32=link.exe
 # 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 /Gy /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 RSC=rc.exe

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

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

@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /YX /FD /MDd /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 RSC=rc.exe

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

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

@@ -130,7 +130,8 @@ LINK32=link.exe
 CPP=cl.exe

 # ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

@@ -164,8 +165,200 @@ SOURCE=.\ast\ast_argument.cpp
 

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

 

+DEP_CPP_AST_A=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_A=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_A=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_A=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -179,8 +372,200 @@ SOURCE=.\ast\ast_array.cpp
 

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

 

+DEP_CPP_AST_AR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_AR=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_AR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_AR=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -194,8 +579,200 @@ SOURCE=.\ast\ast_attribute.cpp
 

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

 

+DEP_CPP_AST_AT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_AT=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_AT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_AT=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -209,8 +786,200 @@ SOURCE=.\ast\ast_check.cpp
 

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

 

+DEP_CPP_AST_C=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_C=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_C=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_C=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -224,8 +993,200 @@ SOURCE=.\ast\ast_concrete_type.cpp
 

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

 

+DEP_CPP_AST_CO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_CO=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_CO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_CO=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -239,8 +1200,200 @@ SOURCE=.\ast\ast_constant.cpp
 

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

 

+DEP_CPP_AST_CON=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_CON=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_CON=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_CON=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -254,8 +1407,200 @@ SOURCE=.\ast\ast_decl.cpp
 

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

 

+DEP_CPP_AST_D=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_D=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_D=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_D=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -269,8 +1614,200 @@ SOURCE=.\ast\ast_enum.cpp
 

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

 

+DEP_CPP_AST_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_E=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_E=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -284,8 +1821,200 @@ SOURCE=.\ast\ast_enum_val.cpp
 

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

 

+DEP_CPP_AST_EN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EN=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_EN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EN=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -299,8 +2028,200 @@ SOURCE=.\ast\ast_exception.cpp
 

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

 

+DEP_CPP_AST_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EX=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EX=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -314,8 +2235,200 @@ SOURCE=.\ast\ast_expression.cpp
 

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

 

+DEP_CPP_AST_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EXP=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_EXP=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -329,8 +2442,200 @@ SOURCE=.\ast\ast_field.cpp
 

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

 

+DEP_CPP_AST_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_F=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_F=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -344,8 +2649,200 @@ SOURCE=.\ast\ast_generator.cpp
 

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

 

+DEP_CPP_AST_G=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_G=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_G=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_G=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -359,8 +2856,200 @@ SOURCE=.\ast\ast_interface.cpp
 

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

 

+DEP_CPP_AST_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_I=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_I=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -374,8 +3063,200 @@ SOURCE=.\ast\ast_interface_fwd.cpp
 

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

 

+DEP_CPP_AST_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_IN=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_IN=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -389,8 +3270,200 @@ SOURCE=.\ast\ast_module.cpp
 

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

 

+DEP_CPP_AST_M=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_M=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_M=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_M=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -404,8 +3477,200 @@ SOURCE=.\ast\ast_native.cpp
 

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

 

+DEP_CPP_AST_N=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_N=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_N=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_N=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -419,8 +3684,200 @@ SOURCE=.\ast\ast_operation.cpp
 

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

 

+DEP_CPP_AST_O=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_O=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_O=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_O=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -434,8 +3891,200 @@ SOURCE=.\ast\ast_predefined_type.cpp
 

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

 

+DEP_CPP_AST_P=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_P=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_P=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_P=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -449,8 +4098,200 @@ SOURCE=.\ast\ast_recursive.cpp
 

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

 

+DEP_CPP_AST_R=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_R=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_R=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_R=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -464,8 +4305,200 @@ SOURCE=.\ast\ast_redef.cpp
 

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

 

+DEP_CPP_AST_RE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_RE=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_RE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_RE=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -479,8 +4512,200 @@ SOURCE=.\ast\ast_root.cpp
 

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

 

+DEP_CPP_AST_RO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_RO=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_RO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_RO=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -494,8 +4719,200 @@ SOURCE=.\ast\ast_sequence.cpp
 

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

 

+DEP_CPP_AST_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_S=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_S=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -509,8 +4926,200 @@ SOURCE=.\ast\ast_string.cpp
 

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

 

+DEP_CPP_AST_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_ST=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_ST=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -524,8 +5133,200 @@ SOURCE=.\ast\ast_structure.cpp
 

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

 

+DEP_CPP_AST_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_STR=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_STR=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -539,8 +5340,200 @@ SOURCE=.\ast\ast_type.cpp
 

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

 

+DEP_CPP_AST_T=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_T=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_T=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_T=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -554,8 +5547,200 @@ SOURCE=.\ast\ast_typedef.cpp
 

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

 

+DEP_CPP_AST_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_TY=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_TY=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -569,8 +5754,200 @@ SOURCE=.\ast\ast_union.cpp
 

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

 

+DEP_CPP_AST_U=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_U=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_U=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_U=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -584,8 +5961,200 @@ SOURCE=.\ast\ast_union_branch.cpp
 

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

 

+DEP_CPP_AST_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_UN=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_UN=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -599,8 +6168,200 @@ SOURCE=.\ast\ast_union_label.cpp
 

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

 

+DEP_CPP_AST_UNI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_UNI=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_AST_UNI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_AST_UNI=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -614,8 +6375,338 @@ SOURCE=.\be\be_args.cpp
 

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

 

+DEP_CPP_BE_AR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_AR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_AR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_AR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -629,8 +6720,338 @@ SOURCE=.\be\be_argument.cpp
 

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

 

+DEP_CPP_BE_ARG=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ARG=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_ARG=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ARG=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -644,8 +7065,338 @@ SOURCE=.\be\be_array.cpp
 

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

 

+DEP_CPP_BE_ARR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ARR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_ARR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ARR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -659,8 +7410,338 @@ SOURCE=.\be\be_attribute.cpp
 

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

 

+DEP_CPP_BE_AT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_AT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_AT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_AT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -674,8 +7755,338 @@ SOURCE=.\be\be_codegen.cpp
 

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

 

+DEP_CPP_BE_CO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_CO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_CO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_CO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -689,8 +8100,338 @@ SOURCE=.\be\be_constant.cpp
 

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

 

+DEP_CPP_BE_CON=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_CON=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_CON=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_CON=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -704,8 +8445,338 @@ SOURCE=.\be\be_decl.cpp
 

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

 

+DEP_CPP_BE_DE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_DE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_DE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_DE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -719,8 +8790,338 @@ SOURCE=.\be\be_enum.cpp
 

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

 

+DEP_CPP_BE_EN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_EN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -734,8 +9135,338 @@ SOURCE=.\be\be_enum_val.cpp
 

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

 

+DEP_CPP_BE_ENU=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ENU=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_ENU=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ENU=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -749,8 +9480,338 @@ SOURCE=.\be\be_exception.cpp
 

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

 

+DEP_CPP_BE_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EX=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EX=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -764,8 +9825,338 @@ SOURCE=.\be\be_expression.cpp
 

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

 

+DEP_CPP_BE_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EXP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_EXP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -779,8 +10170,338 @@ SOURCE=.\be\be_field.cpp
 

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

 

+DEP_CPP_BE_FI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_FI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_FI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_FI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -794,8 +10515,338 @@ SOURCE=.\be\be_generator.cpp
 

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

 

+DEP_CPP_BE_GE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_GE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_GE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_GE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -809,8 +10860,338 @@ SOURCE=.\be\be_helper.cpp
 

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

 

+DEP_CPP_BE_HE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_HE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_HE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_HE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -824,8 +11205,338 @@ SOURCE=.\be\be_init.cpp
 

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

 

+DEP_CPP_BE_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_IN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_IN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -839,8 +11550,370 @@ SOURCE=.\be\be_interface.cpp
 

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

 

+DEP_CPP_BE_INT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface.h"\

+	".\be_include\be_visitor_interface\any_op_ch.h"\

+	".\be_include\be_visitor_interface\any_op_cs.h"\

+	".\be_include\be_visitor_interface\collocated_sh.h"\

+	".\be_include\be_visitor_interface\collocated_ss.h"\

+	".\be_include\be_visitor_interface\interface.h"\

+	".\be_include\be_visitor_interface\interface_ch.h"\

+	".\be_include\be_visitor_interface\interface_ci.h"\

+	".\be_include\be_visitor_interface\interface_cs.h"\

+	".\be_include\be_visitor_interface\interface_sh.h"\

+	".\be_include\be_visitor_interface\interface_si.h"\

+	".\be_include\be_visitor_interface\interface_ss.h"\

+	".\be_include\be_visitor_interface\tie_sh.h"\

+	".\be_include\be_visitor_interface\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_INT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_INT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface.h"\

+	".\be_include\be_visitor_interface\any_op_ch.h"\

+	".\be_include\be_visitor_interface\any_op_cs.h"\

+	".\be_include\be_visitor_interface\collocated_sh.h"\

+	".\be_include\be_visitor_interface\collocated_ss.h"\

+	".\be_include\be_visitor_interface\interface.h"\

+	".\be_include\be_visitor_interface\interface_ch.h"\

+	".\be_include\be_visitor_interface\interface_ci.h"\

+	".\be_include\be_visitor_interface\interface_cs.h"\

+	".\be_include\be_visitor_interface\interface_sh.h"\

+	".\be_include\be_visitor_interface\interface_si.h"\

+	".\be_include\be_visitor_interface\interface_ss.h"\

+	".\be_include\be_visitor_interface\tie_sh.h"\

+	".\be_include\be_visitor_interface\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_INT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -854,8 +11927,338 @@ SOURCE=.\be\be_interface_fwd.cpp
 

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

 

+DEP_CPP_BE_INTE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_INTE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_INTE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_INTE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -869,8 +12272,338 @@ SOURCE=.\be\be_module.cpp
 

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

 

+DEP_CPP_BE_MO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_MO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_MO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_MO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -884,8 +12617,338 @@ SOURCE=.\be\be_native.cpp
 

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

 

+DEP_CPP_BE_NA=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_NA=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_NA=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_NA=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -899,8 +12962,338 @@ SOURCE=.\be\be_operation.cpp
 

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

 

+DEP_CPP_BE_OP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_OP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_OP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_OP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -914,8 +13307,338 @@ SOURCE=.\be\be_predefined_type.cpp
 

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

 

+DEP_CPP_BE_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_PR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_PR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -929,8 +13652,340 @@ SOURCE=.\be\be_produce.cpp
 

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

 

+DEP_CPP_BE_PRO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_PRO=\

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

+	".\be_include\be_factory.h"\

+	".\be_include\be_interpretive.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_PRO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_PRO=\

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

+	".\be_include\be_factory.h"\

+	".\be_include\be_interpretive.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -944,8 +13999,338 @@ SOURCE=.\be\be_root.cpp
 

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

 

+DEP_CPP_BE_RO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_RO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_RO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_RO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -959,8 +14344,338 @@ SOURCE=.\be\be_scope.cpp
 

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

 

+DEP_CPP_BE_SC=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SC=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_SC=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SC=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -974,8 +14689,358 @@ SOURCE=.\be\be_sequence.cpp
 

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

 

+DEP_CPP_BE_SE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_sequence.h"\

+	".\be_include\be_visitor_sequence\any_op_ch.h"\

+	".\be_include\be_visitor_sequence\any_op_cs.h"\

+	".\be_include\be_visitor_sequence\buffer_type.h"\

+	".\be_include\be_visitor_sequence\elemtype.h"\

+	".\be_include\be_visitor_sequence\sequence_base.h"\

+	".\be_include\be_visitor_sequence\sequence_ch.h"\

+	".\be_include\be_visitor_sequence\sequence_ci.h"\

+	".\be_include\be_visitor_sequence\sequence_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_SE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_sequence.h"\

+	".\be_include\be_visitor_sequence\any_op_ch.h"\

+	".\be_include\be_visitor_sequence\any_op_cs.h"\

+	".\be_include\be_visitor_sequence\buffer_type.h"\

+	".\be_include\be_visitor_sequence\elemtype.h"\

+	".\be_include\be_visitor_sequence\sequence_base.h"\

+	".\be_include\be_visitor_sequence\sequence_ch.h"\

+	".\be_include\be_visitor_sequence\sequence_ci.h"\

+	".\be_include\be_visitor_sequence\sequence_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1004,8 +15069,338 @@ SOURCE=.\be\be_string.cpp
 

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

 

+DEP_CPP_BE_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ST=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_ST=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1019,8 +15414,338 @@ SOURCE=.\be\be_structure.cpp
 

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

 

+DEP_CPP_BE_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_STR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_STR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1034,8 +15759,340 @@ SOURCE=.\be\be_sunsoft.cpp
 

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

 

+DEP_CPP_BE_SU=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_sunsoft.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SU=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_SU=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_sunsoft.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_SU=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1049,8 +16106,338 @@ SOURCE=.\be\be_type.cpp
 

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

 

+DEP_CPP_BE_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_TY=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_TY=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1064,8 +16451,338 @@ SOURCE=.\be\be_typedef.cpp
 

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

 

+DEP_CPP_BE_TYP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_TYP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_TYP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_TYP=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1079,8 +16796,338 @@ SOURCE=.\be\be_union.cpp
 

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

 

+DEP_CPP_BE_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1094,8 +17141,338 @@ SOURCE=.\be\be_union_branch.cpp
 

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

 

+DEP_CPP_BE_UNI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UNI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_UNI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UNI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1109,37 +17486,337 @@ SOURCE=.\be\be_union_label.cpp
 

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

 

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_valuetype.cpp

-

-!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

-

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

+DEP_CPP_BE_UNIO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UNIO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

 

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

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_valuetype_fwd.cpp

-

-!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

-

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

-

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

+DEP_CPP_BE_UNIO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_UNIO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

 

 !ENDIF 

 

@@ -1154,8 +17831,324 @@ SOURCE=.\be\be_visitor.cpp
 

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

 

+DEP_CPP_BE_VI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1169,8 +18162,372 @@ SOURCE=.\be\be_visitor_argument.cpp
 

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

 

+DEP_CPP_BE_VIS=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_argument\arglist.cpp"\

+	".\be\be_visitor_argument\argument.cpp"\

+	".\be\be_visitor_argument\docall_cs.cpp"\

+	".\be\be_visitor_argument\marshal_ss.cpp"\

+	".\be\be_visitor_argument\post_docall_cs.cpp"\

+	".\be\be_visitor_argument\post_marshal_ss.cpp"\

+	".\be\be_visitor_argument\post_upcall_ss.cpp"\

+	".\be\be_visitor_argument\pre_docall_cs.cpp"\

+	".\be\be_visitor_argument\pre_upcall_ss.cpp"\

+	".\be\be_visitor_argument\upcall_ss.cpp"\

+	".\be\be_visitor_argument\vardecl_ss.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_argument.h"\

+	".\be_include\be_visitor_argument\arglist.h"\

+	".\be_include\be_visitor_argument\argument.h"\

+	".\be_include\be_visitor_argument\docall_cs.h"\

+	".\be_include\be_visitor_argument\marshal_ss.h"\

+	".\be_include\be_visitor_argument\post_docall_cs.h"\

+	".\be_include\be_visitor_argument\post_marshal_ss.h"\

+	".\be_include\be_visitor_argument\post_upcall_ss.h"\

+	".\be_include\be_visitor_argument\pre_docall_cs.h"\

+	".\be_include\be_visitor_argument\pre_upcall_ss.h"\

+	".\be_include\be_visitor_argument\upcall_ss.h"\

+	".\be_include\be_visitor_argument\vardecl_ss.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VIS=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VIS=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_argument\arglist.cpp"\

+	".\be\be_visitor_argument\argument.cpp"\

+	".\be\be_visitor_argument\docall_cs.cpp"\

+	".\be\be_visitor_argument\marshal_ss.cpp"\

+	".\be\be_visitor_argument\post_docall_cs.cpp"\

+	".\be\be_visitor_argument\post_marshal_ss.cpp"\

+	".\be\be_visitor_argument\post_upcall_ss.cpp"\

+	".\be\be_visitor_argument\pre_docall_cs.cpp"\

+	".\be\be_visitor_argument\pre_upcall_ss.cpp"\

+	".\be\be_visitor_argument\upcall_ss.cpp"\

+	".\be\be_visitor_argument\vardecl_ss.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_argument.h"\

+	".\be_include\be_visitor_argument\arglist.h"\

+	".\be_include\be_visitor_argument\argument.h"\

+	".\be_include\be_visitor_argument\docall_cs.h"\

+	".\be_include\be_visitor_argument\marshal_ss.h"\

+	".\be_include\be_visitor_argument\post_docall_cs.h"\

+	".\be_include\be_visitor_argument\post_marshal_ss.h"\

+	".\be_include\be_visitor_argument\post_upcall_ss.h"\

+	".\be_include\be_visitor_argument\pre_docall_cs.h"\

+	".\be_include\be_visitor_argument\pre_upcall_ss.h"\

+	".\be_include\be_visitor_argument\upcall_ss.h"\

+	".\be_include\be_visitor_argument\vardecl_ss.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VIS=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1184,8 +18541,366 @@ SOURCE=.\be\be_visitor_array.cpp
 

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

 

+DEP_CPP_BE_VISI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_array\any_op_ch.cpp"\

+	".\be\be_visitor_array\any_op_cs.cpp"\

+	".\be\be_visitor_array\array.cpp"\

+	".\be\be_visitor_array\array_ch.cpp"\

+	".\be\be_visitor_array\array_ci.cpp"\

+	".\be\be_visitor_array\array_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_array.h"\

+	".\be_include\be_visitor_array\any_op_ch.h"\

+	".\be_include\be_visitor_array\any_op_cs.h"\

+	".\be_include\be_visitor_array\array.h"\

+	".\be_include\be_visitor_array\array_ch.h"\

+	".\be_include\be_visitor_array\array_ci.h"\

+	".\be_include\be_visitor_array\array_cs.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_array\any_op_ch.cpp"\

+	".\be\be_visitor_array\any_op_cs.cpp"\

+	".\be\be_visitor_array\array.cpp"\

+	".\be\be_visitor_array\array_ch.cpp"\

+	".\be\be_visitor_array\array_ci.cpp"\

+	".\be\be_visitor_array\array_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_array.h"\

+	".\be_include\be_visitor_array\any_op_ch.h"\

+	".\be_include\be_visitor_array\any_op_cs.h"\

+	".\be_include\be_visitor_array\array.h"\

+	".\be_include\be_visitor_array\array_ch.h"\

+	".\be_include\be_visitor_array\array_ci.h"\

+	".\be_include\be_visitor_array\array_cs.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISI=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1199,8 +18914,348 @@ SOURCE=.\be\be_visitor_attribute.cpp
 

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

 

+DEP_CPP_BE_VISIT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_attribute\attribute.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_attribute.h"\

+	".\be_include\be_visitor_attribute\attribute.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISIT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISIT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_attribute\attribute.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_attribute.h"\

+	".\be_include\be_visitor_attribute\attribute.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISIT=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1214,8 +19269,352 @@ SOURCE=.\be\be_visitor_constant.cpp
 

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

 

+DEP_CPP_BE_VISITO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_constant\constant_ch.cpp"\

+	".\be\be_visitor_constant\constant_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_constant.h"\

+	".\be_include\be_visitor_constant\constant_ch.h"\

+	".\be_include\be_visitor_constant\constant_cs.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_constant\constant_ch.cpp"\

+	".\be\be_visitor_constant\constant_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_constant.h"\

+	".\be_include\be_visitor_constant\constant_ch.h"\

+	".\be_include\be_visitor_constant\constant_cs.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITO=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1229,8 +19628,338 @@ SOURCE=.\be\be_visitor_context.cpp
 

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

 

+DEP_CPP_BE_VISITOR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1244,8 +19973,340 @@ SOURCE=.\be\be_visitor_decl.cpp
 

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

 

+DEP_CPP_BE_VISITOR_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1259,8 +20320,360 @@ SOURCE=.\be\be_visitor_enum.cpp
 

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

 

+DEP_CPP_BE_VISITOR_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_enum\any_op_ch.cpp"\

+	".\be\be_visitor_enum\any_op_cs.cpp"\

+	".\be\be_visitor_enum\enum_ch.cpp"\

+	".\be\be_visitor_enum\enum_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_enum.h"\

+	".\be_include\be_visitor_enum\any_op_ch.h"\

+	".\be_include\be_visitor_enum\any_op_cs.h"\

+	".\be_include\be_visitor_enum\enum_ch.h"\

+	".\be_include\be_visitor_enum\enum_cs.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_E=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_enum\any_op_ch.cpp"\

+	".\be\be_visitor_enum\any_op_cs.cpp"\

+	".\be\be_visitor_enum\enum_ch.cpp"\

+	".\be\be_visitor_enum\enum_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_enum.h"\

+	".\be_include\be_visitor_enum\any_op_ch.h"\

+	".\be_include\be_visitor_enum\any_op_cs.h"\

+	".\be_include\be_visitor_enum\enum_ch.h"\

+	".\be_include\be_visitor_enum\enum_cs.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_E=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1274,8 +20687,376 @@ SOURCE=.\be\be_visitor_exception.cpp
 

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

 

+DEP_CPP_BE_VISITOR_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_exception\any_op_ch.cpp"\

+	".\be\be_visitor_exception\any_op_cs.cpp"\

+	".\be\be_visitor_exception\ctor_assign.cpp"\

+	".\be\be_visitor_exception\exception.cpp"\

+	".\be\be_visitor_exception\exception_ch.cpp"\

+	".\be\be_visitor_exception\exception_ci.cpp"\

+	".\be\be_visitor_exception\exception_cs.cpp"\

+	".\be\be_visitor_exception\exception_ctor.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_exception.h"\

+	".\be_include\be_visitor_exception\any_op_ch.h"\

+	".\be_include\be_visitor_exception\any_op_cs.h"\

+	".\be_include\be_visitor_exception\ctor.h"\

+	".\be_include\be_visitor_exception\ctor_assign.h"\

+	".\be_include\be_visitor_exception\exception.h"\

+	".\be_include\be_visitor_exception\exception_ch.h"\

+	".\be_include\be_visitor_exception\exception_ci.h"\

+	".\be_include\be_visitor_exception\exception_cs.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_EX=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_exception\any_op_ch.cpp"\

+	".\be\be_visitor_exception\any_op_cs.cpp"\

+	".\be\be_visitor_exception\ctor_assign.cpp"\

+	".\be\be_visitor_exception\exception.cpp"\

+	".\be\be_visitor_exception\exception_ch.cpp"\

+	".\be\be_visitor_exception\exception_ci.cpp"\

+	".\be\be_visitor_exception\exception_cs.cpp"\

+	".\be\be_visitor_exception\exception_ctor.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_exception.h"\

+	".\be_include\be_visitor_exception\any_op_ch.h"\

+	".\be_include\be_visitor_exception\any_op_cs.h"\

+	".\be_include\be_visitor_exception\ctor.h"\

+	".\be_include\be_visitor_exception\ctor_assign.h"\

+	".\be_include\be_visitor_exception\exception.h"\

+	".\be_include\be_visitor_exception\exception_ch.h"\

+	".\be_include\be_visitor_exception\exception_ci.h"\

+	".\be_include\be_visitor_exception\exception_cs.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_EX=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1304,8 +21085,354 @@ SOURCE=.\be\be_visitor_field.cpp
 

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

 

+DEP_CPP_BE_VISITOR_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_field\field_ch.cpp"\

+	".\be\be_visitor_field\field_ci.cpp"\

+	".\be\be_visitor_field\field_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_field.h"\

+	".\be_include\be_visitor_field\field_ch.h"\

+	".\be_include\be_visitor_field\field_ci.h"\

+	".\be_include\be_visitor_field\field_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_F=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_field\field_ch.cpp"\

+	".\be\be_visitor_field\field_ci.cpp"\

+	".\be\be_visitor_field\field_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_field.h"\

+	".\be_include\be_visitor_field\field_ch.h"\

+	".\be_include\be_visitor_field\field_ci.h"\

+	".\be_include\be_visitor_field\field_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_F=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1319,8 +21446,396 @@ SOURCE=.\be\be_visitor_interface.cpp
 

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

 

+DEP_CPP_BE_VISITOR_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_interface\any_op_ch.cpp"\

+	".\be\be_visitor_interface\any_op_cs.cpp"\

+	".\be\be_visitor_interface\collocated_sh.cpp"\

+	".\be\be_visitor_interface\collocated_ss.cpp"\

+	".\be\be_visitor_interface\interface.cpp"\

+	".\be\be_visitor_interface\interface_ch.cpp"\

+	".\be\be_visitor_interface\interface_ci.cpp"\

+	".\be\be_visitor_interface\interface_cs.cpp"\

+	".\be\be_visitor_interface\interface_sh.cpp"\

+	".\be\be_visitor_interface\interface_si.cpp"\

+	".\be\be_visitor_interface\interface_ss.cpp"\

+	".\be\be_visitor_interface\tie_sh.cpp"\

+	".\be\be_visitor_interface\tie_si.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface.h"\

+	".\be_include\be_visitor_interface\any_op_ch.h"\

+	".\be_include\be_visitor_interface\any_op_cs.h"\

+	".\be_include\be_visitor_interface\collocated_sh.h"\

+	".\be_include\be_visitor_interface\collocated_ss.h"\

+	".\be_include\be_visitor_interface\interface.h"\

+	".\be_include\be_visitor_interface\interface_ch.h"\

+	".\be_include\be_visitor_interface\interface_ci.h"\

+	".\be_include\be_visitor_interface\interface_cs.h"\

+	".\be_include\be_visitor_interface\interface_sh.h"\

+	".\be_include\be_visitor_interface\interface_si.h"\

+	".\be_include\be_visitor_interface\interface_ss.h"\

+	".\be_include\be_visitor_interface\tie_sh.h"\

+	".\be_include\be_visitor_interface\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_I=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_interface\any_op_ch.cpp"\

+	".\be\be_visitor_interface\any_op_cs.cpp"\

+	".\be\be_visitor_interface\collocated_sh.cpp"\

+	".\be\be_visitor_interface\collocated_ss.cpp"\

+	".\be\be_visitor_interface\interface.cpp"\

+	".\be\be_visitor_interface\interface_ch.cpp"\

+	".\be\be_visitor_interface\interface_ci.cpp"\

+	".\be\be_visitor_interface\interface_cs.cpp"\

+	".\be\be_visitor_interface\interface_sh.cpp"\

+	".\be\be_visitor_interface\interface_si.cpp"\

+	".\be\be_visitor_interface\interface_ss.cpp"\

+	".\be\be_visitor_interface\tie_sh.cpp"\

+	".\be\be_visitor_interface\tie_si.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface.h"\

+	".\be_include\be_visitor_interface\any_op_ch.h"\

+	".\be_include\be_visitor_interface\any_op_cs.h"\

+	".\be_include\be_visitor_interface\collocated_sh.h"\

+	".\be_include\be_visitor_interface\collocated_ss.h"\

+	".\be_include\be_visitor_interface\interface.h"\

+	".\be_include\be_visitor_interface\interface_ch.h"\

+	".\be_include\be_visitor_interface\interface_ci.h"\

+	".\be_include\be_visitor_interface\interface_cs.h"\

+	".\be_include\be_visitor_interface\interface_sh.h"\

+	".\be_include\be_visitor_interface\interface_si.h"\

+	".\be_include\be_visitor_interface\interface_ss.h"\

+	".\be_include\be_visitor_interface\tie_sh.h"\

+	".\be_include\be_visitor_interface\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_I=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1334,8 +21849,352 @@ SOURCE=.\be\be_visitor_interface_fwd.cpp
 

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

 

+DEP_CPP_BE_VISITOR_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_interface_fwd\interface_fwd_ch.cpp"\

+	".\be\be_visitor_interface_fwd\interface_fwd_ci.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface_fwd.h"\

+	".\be_include\be_visitor_interface_fwd\interface_fwd_ch.h"\

+	".\be_include\be_visitor_interface_fwd\interface_fwd_ci.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_IN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_interface_fwd\interface_fwd_ch.cpp"\

+	".\be\be_visitor_interface_fwd\interface_fwd_ci.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_interface_fwd.h"\

+	".\be_include\be_visitor_interface_fwd\interface_fwd_ch.h"\

+	".\be_include\be_visitor_interface_fwd\interface_fwd_ci.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_IN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1349,8 +22208,360 @@ SOURCE=.\be\be_visitor_module.cpp
 

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

 

+DEP_CPP_BE_VISITOR_M=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_module\any_op.cpp"\

+	".\be\be_visitor_module\module.cpp"\

+	".\be\be_visitor_module\module_ch.cpp"\

+	".\be\be_visitor_module\module_sh.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_module.h"\

+	".\be_include\be_visitor_module\any_op.h"\

+	".\be_include\be_visitor_module\module.h"\

+	".\be_include\be_visitor_module\module_ch.h"\

+	".\be_include\be_visitor_module\module_sh.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_M=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_M=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_module\any_op.cpp"\

+	".\be\be_visitor_module\module.cpp"\

+	".\be\be_visitor_module\module_ch.cpp"\

+	".\be\be_visitor_module\module_sh.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_module.h"\

+	".\be_include\be_visitor_module\any_op.h"\

+	".\be_include\be_visitor_module\module.h"\

+	".\be_include\be_visitor_module\module_ch.h"\

+	".\be_include\be_visitor_module\module_sh.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_M=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1364,8 +22575,428 @@ SOURCE=.\be\be_visitor_operation.cpp
 

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

 

+DEP_CPP_BE_VISITOR_O=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_operation\arglist.cpp"\

+	".\be\be_visitor_operation\argument.cpp"\

+	".\be\be_visitor_operation\collocated_sh.cpp"\

+	".\be\be_visitor_operation\collocated_ss.cpp"\

+	".\be\be_visitor_operation\exceptlist_cs.cpp"\

+	".\be\be_visitor_operation\operation_ch.cpp"\

+	".\be\be_visitor_operation\operation_cs.cpp"\

+	".\be\be_visitor_operation\operation_sh.cpp"\

+	".\be\be_visitor_operation\operation_ss.cpp"\

+	".\be\be_visitor_operation\rettype.cpp"\

+	".\be\be_visitor_operation\rettype_assign_ss.cpp"\

+	".\be\be_visitor_operation\rettype_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_marshal_ss.cpp"\

+	".\be\be_visitor_operation\rettype_post_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_post_upcall_ss.cpp"\

+	".\be\be_visitor_operation\rettype_pre_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_return_cs.cpp"\

+	".\be\be_visitor_operation\rettype_vardecl_cs.cpp"\

+	".\be\be_visitor_operation\rettype_vardecl_ss.cpp"\

+	".\be\be_visitor_operation\tie_sh.cpp"\

+	".\be\be_visitor_operation\tie_si.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_operation.h"\

+	".\be_include\be_visitor_operation\arglist.h"\

+	".\be_include\be_visitor_operation\argument.h"\

+	".\be_include\be_visitor_operation\collocated_sh.h"\

+	".\be_include\be_visitor_operation\collocated_ss.h"\

+	".\be_include\be_visitor_operation\exceptlist_cs.h"\

+	".\be_include\be_visitor_operation\operation_ch.h"\

+	".\be_include\be_visitor_operation\operation_cs.h"\

+	".\be_include\be_visitor_operation\operation_sh.h"\

+	".\be_include\be_visitor_operation\operation_ss.h"\

+	".\be_include\be_visitor_operation\rettype.h"\

+	".\be_include\be_visitor_operation\rettype_assign_ss.h"\

+	".\be_include\be_visitor_operation\rettype_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_marshal_ss.h"\

+	".\be_include\be_visitor_operation\rettype_post_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_post_upcall_ss.h"\

+	".\be_include\be_visitor_operation\rettype_pre_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_return_cs.h"\

+	".\be_include\be_visitor_operation\rettype_vardecl_cs.h"\

+	".\be_include\be_visitor_operation\rettype_vardecl_ss.h"\

+	".\be_include\be_visitor_operation\tie_sh.h"\

+	".\be_include\be_visitor_operation\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_O=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_O=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_operation\arglist.cpp"\

+	".\be\be_visitor_operation\argument.cpp"\

+	".\be\be_visitor_operation\collocated_sh.cpp"\

+	".\be\be_visitor_operation\collocated_ss.cpp"\

+	".\be\be_visitor_operation\exceptlist_cs.cpp"\

+	".\be\be_visitor_operation\operation_ch.cpp"\

+	".\be\be_visitor_operation\operation_cs.cpp"\

+	".\be\be_visitor_operation\operation_sh.cpp"\

+	".\be\be_visitor_operation\operation_ss.cpp"\

+	".\be\be_visitor_operation\rettype.cpp"\

+	".\be\be_visitor_operation\rettype_assign_ss.cpp"\

+	".\be\be_visitor_operation\rettype_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_marshal_ss.cpp"\

+	".\be\be_visitor_operation\rettype_post_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_post_upcall_ss.cpp"\

+	".\be\be_visitor_operation\rettype_pre_docall_cs.cpp"\

+	".\be\be_visitor_operation\rettype_return_cs.cpp"\

+	".\be\be_visitor_operation\rettype_vardecl_cs.cpp"\

+	".\be\be_visitor_operation\rettype_vardecl_ss.cpp"\

+	".\be\be_visitor_operation\tie_sh.cpp"\

+	".\be\be_visitor_operation\tie_si.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_operation.h"\

+	".\be_include\be_visitor_operation\arglist.h"\

+	".\be_include\be_visitor_operation\argument.h"\

+	".\be_include\be_visitor_operation\collocated_sh.h"\

+	".\be_include\be_visitor_operation\collocated_ss.h"\

+	".\be_include\be_visitor_operation\exceptlist_cs.h"\

+	".\be_include\be_visitor_operation\operation_ch.h"\

+	".\be_include\be_visitor_operation\operation_cs.h"\

+	".\be_include\be_visitor_operation\operation_sh.h"\

+	".\be_include\be_visitor_operation\operation_ss.h"\

+	".\be_include\be_visitor_operation\rettype.h"\

+	".\be_include\be_visitor_operation\rettype_assign_ss.h"\

+	".\be_include\be_visitor_operation\rettype_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_marshal_ss.h"\

+	".\be_include\be_visitor_operation\rettype_post_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_post_upcall_ss.h"\

+	".\be_include\be_visitor_operation\rettype_pre_docall_cs.h"\

+	".\be_include\be_visitor_operation\rettype_return_cs.h"\

+	".\be_include\be_visitor_operation\rettype_vardecl_cs.h"\

+	".\be_include\be_visitor_operation\rettype_vardecl_ss.h"\

+	".\be_include\be_visitor_operation\tie_sh.h"\

+	".\be_include\be_visitor_operation\tie_si.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_O=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1379,8 +23010,376 @@ SOURCE=.\be\be_visitor_root.cpp
 

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

 

+DEP_CPP_BE_VISITOR_R=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_root\any_op.cpp"\

+	".\be\be_visitor_root\root.cpp"\

+	".\be\be_visitor_root\root_ch.cpp"\

+	".\be\be_visitor_root\root_ci.cpp"\

+	".\be\be_visitor_root\root_cs.cpp"\

+	".\be\be_visitor_root\root_sh.cpp"\

+	".\be\be_visitor_root\root_si.cpp"\

+	".\be\be_visitor_root\root_ss.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_root.h"\

+	".\be_include\be_visitor_root\any_op.h"\

+	".\be_include\be_visitor_root\root.h"\

+	".\be_include\be_visitor_root\root_ch.h"\

+	".\be_include\be_visitor_root\root_ci.h"\

+	".\be_include\be_visitor_root\root_cs.h"\

+	".\be_include\be_visitor_root\root_sh.h"\

+	".\be_include\be_visitor_root\root_si.h"\

+	".\be_include\be_visitor_root\root_ss.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_R=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_R=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_root\any_op.cpp"\

+	".\be\be_visitor_root\root.cpp"\

+	".\be\be_visitor_root\root_ch.cpp"\

+	".\be\be_visitor_root\root_ci.cpp"\

+	".\be\be_visitor_root\root_cs.cpp"\

+	".\be\be_visitor_root\root_sh.cpp"\

+	".\be\be_visitor_root\root_si.cpp"\

+	".\be\be_visitor_root\root_ss.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_root.h"\

+	".\be_include\be_visitor_root\any_op.h"\

+	".\be_include\be_visitor_root\root.h"\

+	".\be_include\be_visitor_root\root_ch.h"\

+	".\be_include\be_visitor_root\root_ci.h"\

+	".\be_include\be_visitor_root\root_cs.h"\

+	".\be_include\be_visitor_root\root_sh.h"\

+	".\be_include\be_visitor_root\root_si.h"\

+	".\be_include\be_visitor_root\root_ss.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_R=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1394,8 +23393,342 @@ SOURCE=.\be\be_visitor_scope.cpp
 

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

 

+DEP_CPP_BE_VISITOR_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_S=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_S=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1409,8 +23742,386 @@ SOURCE=.\be\be_visitor_sequence.cpp
 

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

 

+DEP_CPP_BE_VISITOR_SE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_sequence\any_op_ch.cpp"\

+	".\be\be_visitor_sequence\any_op_cs.cpp"\

+	".\be\be_visitor_sequence\buffer_type.cpp"\

+	".\be\be_visitor_sequence\elemtype.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_obj_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_str_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_object_manager_ch.cpp"\

+	".\be\be_visitor_sequence\gen_unbounded_obj_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_unbounded_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\sequence_base.cpp"\

+	".\be\be_visitor_sequence\sequence_ch.cpp"\

+	".\be\be_visitor_sequence\sequence_ci.cpp"\

+	".\be\be_visitor_sequence\sequence_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_sequence.h"\

+	".\be_include\be_visitor_sequence\any_op_ch.h"\

+	".\be_include\be_visitor_sequence\any_op_cs.h"\

+	".\be_include\be_visitor_sequence\buffer_type.h"\

+	".\be_include\be_visitor_sequence\elemtype.h"\

+	".\be_include\be_visitor_sequence\sequence_base.h"\

+	".\be_include\be_visitor_sequence\sequence_ch.h"\

+	".\be_include\be_visitor_sequence\sequence_ci.h"\

+	".\be_include\be_visitor_sequence\sequence_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_SE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_SE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_sequence\any_op_ch.cpp"\

+	".\be\be_visitor_sequence\any_op_cs.cpp"\

+	".\be\be_visitor_sequence\buffer_type.cpp"\

+	".\be\be_visitor_sequence\elemtype.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_obj_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_bounded_str_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_object_manager_ch.cpp"\

+	".\be\be_visitor_sequence\gen_unbounded_obj_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\gen_unbounded_sequence_ch.cpp"\

+	".\be\be_visitor_sequence\sequence_base.cpp"\

+	".\be\be_visitor_sequence\sequence_ch.cpp"\

+	".\be\be_visitor_sequence\sequence_ci.cpp"\

+	".\be\be_visitor_sequence\sequence_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_sequence.h"\

+	".\be_include\be_visitor_sequence\any_op_ch.h"\

+	".\be_include\be_visitor_sequence\any_op_cs.h"\

+	".\be_include\be_visitor_sequence\buffer_type.h"\

+	".\be_include\be_visitor_sequence\elemtype.h"\

+	".\be_include\be_visitor_sequence\sequence_base.h"\

+	".\be_include\be_visitor_sequence\sequence_ch.h"\

+	".\be_include\be_visitor_sequence\sequence_ci.h"\

+	".\be_include\be_visitor_sequence\sequence_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_SE=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1424,8 +24135,368 @@ SOURCE=.\be\be_visitor_structure.cpp
 

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

 

+DEP_CPP_BE_VISITOR_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_structure\any_op_ch.cpp"\

+	".\be\be_visitor_structure\any_op_cs.cpp"\

+	".\be\be_visitor_structure\structure.cpp"\

+	".\be\be_visitor_structure\structure_ch.cpp"\

+	".\be\be_visitor_structure\structure_ci.cpp"\

+	".\be\be_visitor_structure\structure_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_structure.h"\

+	".\be_include\be_visitor_structure\any_op_ch.h"\

+	".\be_include\be_visitor_structure\any_op_cs.h"\

+	".\be_include\be_visitor_structure\structure.h"\

+	".\be_include\be_visitor_structure\structure_ch.h"\

+	".\be_include\be_visitor_structure\structure_ci.h"\

+	".\be_include\be_visitor_structure\structure_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_ST=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_structure\any_op_ch.cpp"\

+	".\be\be_visitor_structure\any_op_cs.cpp"\

+	".\be\be_visitor_structure\structure.cpp"\

+	".\be\be_visitor_structure\structure_ch.cpp"\

+	".\be\be_visitor_structure\structure_ci.cpp"\

+	".\be\be_visitor_structure\structure_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_structure.h"\

+	".\be_include\be_visitor_structure\any_op_ch.h"\

+	".\be_include\be_visitor_structure\any_op_cs.h"\

+	".\be_include\be_visitor_structure\structure.h"\

+	".\be_include\be_visitor_structure\structure_ch.h"\

+	".\be_include\be_visitor_structure\structure_ci.h"\

+	".\be_include\be_visitor_structure\structure_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_ST=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1439,8 +24510,350 @@ SOURCE=.\be\be_visitor_typecode.cpp
 

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

 

+DEP_CPP_BE_VISITOR_T=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_typecode\typecode_decl.cpp"\

+	".\be\be_visitor_typecode\typecode_defn.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_typecode.h"\

+	".\be_include\be_visitor_typecode\typecode_decl.h"\

+	".\be_include\be_visitor_typecode\typecode_defn.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_T=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_T=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_typecode\typecode_decl.cpp"\

+	".\be\be_visitor_typecode\typecode_defn.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_typecode.h"\

+	".\be_include\be_visitor_typecode\typecode_decl.h"\

+	".\be_include\be_visitor_typecode\typecode_defn.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_T=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1454,8 +24867,368 @@ SOURCE=.\be\be_visitor_typedef.cpp
 

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

 

+DEP_CPP_BE_VISITOR_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_typedef\any_op_ch.cpp"\

+	".\be\be_visitor_typedef\any_op_cs.cpp"\

+	".\be\be_visitor_typedef\typedef.cpp"\

+	".\be\be_visitor_typedef\typedef_ch.cpp"\

+	".\be\be_visitor_typedef\typedef_ci.cpp"\

+	".\be\be_visitor_typedef\typedef_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_typedef.h"\

+	".\be_include\be_visitor_typedef\any_op_ch.h"\

+	".\be_include\be_visitor_typedef\any_op_cs.h"\

+	".\be_include\be_visitor_typedef\typedef.h"\

+	".\be_include\be_visitor_typedef\typedef_ch.h"\

+	".\be_include\be_visitor_typedef\typedef_ci.h"\

+	".\be_include\be_visitor_typedef\typedef_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_TY=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_TY=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_typedef\any_op_ch.cpp"\

+	".\be\be_visitor_typedef\any_op_cs.cpp"\

+	".\be\be_visitor_typedef\typedef.cpp"\

+	".\be\be_visitor_typedef\typedef_ch.cpp"\

+	".\be\be_visitor_typedef\typedef_ci.cpp"\

+	".\be\be_visitor_typedef\typedef_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_typedef.h"\

+	".\be_include\be_visitor_typedef\any_op_ch.h"\

+	".\be_include\be_visitor_typedef\any_op_cs.h"\

+	".\be_include\be_visitor_typedef\typedef.h"\

+	".\be_include\be_visitor_typedef\typedef_ch.h"\

+	".\be_include\be_visitor_typedef\typedef_ci.h"\

+	".\be_include\be_visitor_typedef\typedef_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_TY=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1469,8 +25242,380 @@ SOURCE=.\be\be_visitor_union.cpp
 

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

 

+DEP_CPP_BE_VISITOR_U=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_union\any_op_ch.cpp"\

+	".\be\be_visitor_union\any_op_cs.cpp"\

+	".\be\be_visitor_union\discriminant_ch.cpp"\

+	".\be\be_visitor_union\discriminant_ci.cpp"\

+	".\be\be_visitor_union\discriminant_cs.cpp"\

+	".\be\be_visitor_union\union.cpp"\

+	".\be\be_visitor_union\union_ch.cpp"\

+	".\be\be_visitor_union\union_ci.cpp"\

+	".\be\be_visitor_union\union_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_union.h"\

+	".\be_include\be_visitor_union\any_op_ch.h"\

+	".\be_include\be_visitor_union\any_op_cs.h"\

+	".\be_include\be_visitor_union\discriminant_ch.h"\

+	".\be_include\be_visitor_union\discriminant_ci.h"\

+	".\be_include\be_visitor_union\discriminant_cs.h"\

+	".\be_include\be_visitor_union\union.h"\

+	".\be_include\be_visitor_union\union_ch.h"\

+	".\be_include\be_visitor_union\union_ci.h"\

+	".\be_include\be_visitor_union\union_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_U=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_BE_VISITOR_U=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_union\any_op_ch.cpp"\

+	".\be\be_visitor_union\any_op_cs.cpp"\

+	".\be\be_visitor_union\discriminant_ch.cpp"\

+	".\be\be_visitor_union\discriminant_ci.cpp"\

+	".\be\be_visitor_union\discriminant_cs.cpp"\

+	".\be\be_visitor_union\union.cpp"\

+	".\be\be_visitor_union\union_ch.cpp"\

+	".\be\be_visitor_union\union_ci.cpp"\

+	".\be\be_visitor_union\union_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_scope.h"\

+	".\be_include\be_visitor_union.h"\

+	".\be_include\be_visitor_union\any_op_ch.h"\

+	".\be_include\be_visitor_union\any_op_cs.h"\

+	".\be_include\be_visitor_union\discriminant_ch.h"\

+	".\be_include\be_visitor_union\discriminant_ci.h"\

+	".\be_include\be_visitor_union\discriminant_cs.h"\

+	".\be_include\be_visitor_union\union.h"\

+	".\be_include\be_visitor_union\union_ch.h"\

+	".\be_include\be_visitor_union\union_ci.h"\

+	".\be_include\be_visitor_union\union_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_U=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1484,37 +25629,369 @@ SOURCE=.\be\be_visitor_union_branch.cpp
 

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

 

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_valuetype.cpp

-

-!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

-

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

+DEP_CPP_BE_VISITOR_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_union_branch\private_ch.cpp"\

+	".\be\be_visitor_union_branch\public_access_cs.cpp"\

+	".\be\be_visitor_union_branch\public_assign_cs.cpp"\

+	".\be\be_visitor_union_branch\public_ch.cpp"\

+	".\be\be_visitor_union_branch\public_ci.cpp"\

+	".\be\be_visitor_union_branch\public_cs.cpp"\

+	".\be\be_visitor_union_branch\public_reset_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_union_branch.h"\

+	".\be_include\be_visitor_union_branch\private_ch.h"\

+	".\be_include\be_visitor_union_branch\public_access_cs.h"\

+	".\be_include\be_visitor_union_branch\public_assign_cs.h"\

+	".\be_include\be_visitor_union_branch\public_ch.h"\

+	".\be_include\be_visitor_union_branch\public_ci.h"\

+	".\be_include\be_visitor_union_branch\public_cs.h"\

+	".\be_include\be_visitor_union_branch\public_reset_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_UN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

 

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

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_valuetype_fwd.cpp

-

-!IF  "$(CFG)" == "TAO_IDL Compiler - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO_IDL Compiler - Win32 Debug"

-

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

-

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

+DEP_CPP_BE_VISITOR_UN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be\be_visitor_union_branch\private_ch.cpp"\

+	".\be\be_visitor_union_branch\public_access_cs.cpp"\

+	".\be\be_visitor_union_branch\public_assign_cs.cpp"\

+	".\be\be_visitor_union_branch\public_ch.cpp"\

+	".\be\be_visitor_union_branch\public_ci.cpp"\

+	".\be\be_visitor_union_branch\public_cs.cpp"\

+	".\be\be_visitor_union_branch\public_reset_cs.cpp"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\be_include\be_visitor_decl.h"\

+	".\be_include\be_visitor_union_branch.h"\

+	".\be_include\be_visitor_union_branch\private_ch.h"\

+	".\be_include\be_visitor_union_branch\public_access_cs.h"\

+	".\be_include\be_visitor_union_branch\public_assign_cs.h"\

+	".\be_include\be_visitor_union_branch\public_ch.h"\

+	".\be_include\be_visitor_union_branch\public_ci.h"\

+	".\be_include\be_visitor_union_branch\public_cs.h"\

+	".\be_include\be_visitor_union_branch\public_reset_cs.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_BE_VISITOR_UN=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

 

 !ENDIF 

 

@@ -1529,8 +26006,342 @@ SOURCE=.\driver\drv_args.cpp
 

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

 

+DEP_CPP_DRV_A=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_A=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_A=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.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\inc_user_config.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\be_include\be.h"\

+	".\be_include\be_argument.h"\

+	".\be_include\be_array.h"\

+	".\be_include\be_attribute.h"\

+	".\be_include\be_codegen.h"\

+	".\be_include\be_constant.h"\

+	".\be_include\be_decl.h"\

+	".\be_include\be_enum.h"\

+	".\be_include\be_enum_val.h"\

+	".\be_include\be_exception.h"\

+	".\be_include\be_expression.h"\

+	".\be_include\be_field.h"\

+	".\be_include\be_generator.h"\

+	".\be_include\be_helper.h"\

+	".\be_include\be_interface.h"\

+	".\be_include\be_interface_fwd.h"\

+	".\be_include\be_module.h"\

+	".\be_include\be_native.h"\

+	".\be_include\be_operation.h"\

+	".\be_include\be_predefined_type.h"\

+	".\be_include\be_root.h"\

+	".\be_include\be_scope.h"\

+	".\be_include\be_sequence.h"\

+	".\be_include\be_string.h"\

+	".\be_include\be_structure.h"\

+	".\be_include\be_type.h"\

+	".\be_include\be_typedef.h"\

+	".\be_include\be_union.h"\

+	".\be_include\be_union_branch.h"\

+	".\be_include\be_union_label.h"\

+	".\be_include\be_visitor.h"\

+	".\be_include\be_visitor_context.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_A=\

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

+	".\be_include\be_factory.h"\

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1544,8 +26355,238 @@ SOURCE=.\driver\drv_fork.cpp
 

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

 

+DEP_CPP_DRV_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Process_Manager.h"\

+	"..\..\ace\Process_Manager.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_F=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_F=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Process_Manager.h"\

+	"..\..\ace\Process_Manager.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_F=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1559,8 +26600,204 @@ SOURCE=.\driver\drv_init.cpp
 

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

 

+DEP_CPP_DRV_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_I=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_I=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1574,8 +26811,204 @@ SOURCE=.\driver\drv_link.cpp
 

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

 

+DEP_CPP_DRV_L=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_L=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_L=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_L=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1589,8 +27022,246 @@ SOURCE=.\driver\drv_preproc.cpp
 

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

 

+DEP_CPP_DRV_P=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Env_Value_T.cpp"\

+	"..\..\ace\Env_Value_T.h"\

+	"..\..\ace\Env_Value_T.i"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Process_Manager.h"\

+	"..\..\ace\Process_Manager.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_P=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_P=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Env_Value_T.cpp"\

+	"..\..\ace\Env_Value_T.h"\

+	"..\..\ace\Env_Value_T.i"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\Process.h"\

+	"..\..\ace\Process.i"\

+	"..\..\ace\Process_Manager.h"\

+	"..\..\ace\Process_Manager.i"\

+	"..\..\ace\SString.h"\

+	"..\..\ace\SString.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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\ws2tcpip.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_P=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1604,8 +27275,202 @@ SOURCE=.\driver\drv_private.cpp
 

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

 

+DEP_CPP_DRV_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_PR=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_DRV_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_DRV_PR=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1619,8 +27484,206 @@ SOURCE=.\fe\fe_declarator.cpp
 

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

 

+DEP_CPP_FE_DE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_DE=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_FE_DE=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_DE=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1634,8 +27697,206 @@ SOURCE=.\fe\fe_extern.cpp
 

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

 

+DEP_CPP_FE_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_EX=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_FE_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_EX=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1649,8 +27910,206 @@ SOURCE=.\fe\fe_init.cpp
 

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

 

+DEP_CPP_FE_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_IN=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_FE_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_IN=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1664,8 +28123,206 @@ SOURCE=.\fe\fe_interface_header.cpp
 

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

 

+DEP_CPP_FE_INT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_INT=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_FE_INT=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_INT=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1694,8 +28351,206 @@ SOURCE=.\fe\fe_private.cpp
 

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

 

+DEP_CPP_FE_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_PR=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_FE_PR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_FE_PR=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1709,8 +28564,208 @@ SOURCE=.\fe\lex.yy.cpp
 

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

 

+DEP_CPP_LEX_Y=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\fe\y.tab.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_LEX_Y=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_LEX_Y=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\fe\y.tab.h"\

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_LEX_Y=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1724,8 +28779,200 @@ SOURCE=.\narrow\narrow.cpp
 

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

 

+DEP_CPP_NARRO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_NARRO=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_NARRO=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_NARRO=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1739,8 +28986,204 @@ SOURCE=.\tao_idl.cpp
 

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

 

+DEP_CPP_TAO_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_TAO_I=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_TAO_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\drv_link.h"\

+	".\include\drv_private.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_TAO_I=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1754,8 +29197,200 @@ SOURCE=.\util\utl_decllist.cpp
 

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

 

+DEP_CPP_UTL_D=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_D=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_D=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_D=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1769,8 +29404,200 @@ SOURCE=.\util\utl_error.cpp
 

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

 

+DEP_CPP_UTL_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_E=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_E=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_E=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1784,8 +29611,200 @@ SOURCE=.\util\utl_exceptlist.cpp
 

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

 

+DEP_CPP_UTL_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_EX=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_EX=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_EX=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1799,8 +29818,200 @@ SOURCE=.\util\utl_exprlist.cpp
 

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

 

+DEP_CPP_UTL_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_EXP=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_EXP=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_EXP=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1814,8 +30025,200 @@ SOURCE=.\util\utl_global.cpp
 

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

 

+DEP_CPP_UTL_G=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_G=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_G=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_G=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1829,8 +30232,200 @@ SOURCE=.\util\utl_identifier.cpp
 

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

 

+DEP_CPP_UTL_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_I=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_I=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_I=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1844,8 +30439,200 @@ SOURCE=.\util\utl_idlist.cpp
 

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

 

+DEP_CPP_UTL_ID=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_ID=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_ID=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_ID=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1859,8 +30646,200 @@ SOURCE=.\util\utl_indenter.cpp
 

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

 

+DEP_CPP_UTL_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_IN=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_IN=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_IN=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1874,8 +30853,200 @@ SOURCE=.\util\utl_labellist.cpp
 

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

 

+DEP_CPP_UTL_L=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_L=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_L=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_L=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1889,8 +31060,200 @@ SOURCE=.\util\utl_list.cpp
 

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

 

+DEP_CPP_UTL_LI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_LI=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_LI=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_LI=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1904,8 +31267,200 @@ SOURCE=.\util\utl_namelist.cpp
 

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

 

+DEP_CPP_UTL_N=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_N=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_N=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_N=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1919,8 +31474,200 @@ SOURCE=.\util\utl_scope.cpp
 

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

 

+DEP_CPP_UTL_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_S=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_S=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_S=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1934,8 +31681,200 @@ SOURCE=.\util\utl_stack.cpp
 

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

 

+DEP_CPP_UTL_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_ST=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_ST=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_ST=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1949,8 +31888,200 @@ SOURCE=.\util\utl_string.cpp
 

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

 

+DEP_CPP_UTL_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_STR=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_STR=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_STR=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1964,8 +32095,200 @@ SOURCE=.\util\utl_strlist.cpp
 

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

 

+DEP_CPP_UTL_STRL=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_STRL=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_UTL_STRL=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_extern.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_UTL_STRL=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1979,8 +32302,206 @@ SOURCE=.\fe\y.tab.cpp
 

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

 

+DEP_CPP_Y_TAB=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_Y_TAB=\

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

+	".\ys\types.h"\

+	

+

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

 

+DEP_CPP_Y_TAB=\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\Log_Msg.h"\

+	"..\..\ace\Log_Priority.h"\

+	"..\..\ace\Log_Record.h"\

+	"..\..\ace\Log_Record.i"\

+	"..\..\ace\Malloc_Base.h"\

+	"..\..\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\streams.h"\

+	"..\..\ace\Trace.h"\

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

+	".\include\ast.h"\

+	".\include\ast_argument.h"\

+	".\include\ast_array.h"\

+	".\include\ast_attribute.h"\

+	".\include\ast_concrete_type.h"\

+	".\include\ast_constant.h"\

+	".\include\ast_decl.h"\

+	".\include\ast_enum.h"\

+	".\include\ast_enum_val.h"\

+	".\include\ast_exception.h"\

+	".\include\ast_expression.h"\

+	".\include\ast_extern.h"\

+	".\include\ast_field.h"\

+	".\include\ast_generator.h"\

+	".\include\ast_interface.h"\

+	".\include\ast_interface_fwd.h"\

+	".\include\ast_module.h"\

+	".\include\ast_native.h"\

+	".\include\ast_operation.h"\

+	".\include\ast_predefined_type.h"\

+	".\include\ast_root.h"\

+	".\include\ast_sequence.h"\

+	".\include\ast_string.h"\

+	".\include\ast_structure.h"\

+	".\include\ast_type.h"\

+	".\include\ast_typedef.h"\

+	".\include\ast_union.h"\

+	".\include\ast_union_branch.h"\

+	".\include\ast_union_label.h"\

+	".\include\be_extern.h"\

+	".\include\drv_extern.h"\

+	".\include\fe_declarator.h"\

+	".\include\fe_extern.h"\

+	".\include\fe_interface_header.h"\

+	".\include\fe_private.h"\

+	".\include\global_extern.h"\

+	".\include\idl.h"\

+	".\include\idl_bool.h"\

+	".\include\idl_defines.h"\

+	".\include\idl_extern.h"\

+	".\include\idl_fwd.h"\

+	".\include\idl_global.h"\

+	".\include\idl_narrow.h"\

+	".\include\intlmacros.h"\

+	".\include\nr_extern.h"\

+	".\include\util.h"\

+	".\include\utl_decllist.h"\

+	".\include\utl_error.h"\

+	".\include\utl_exceptlist.h"\

+	".\include\utl_exprlist.h"\

+	".\include\utl_identifier.h"\

+	".\include\utl_idlist.h"\

+	".\include\utl_indenter.h"\

+	".\include\utl_labellist.h"\

+	".\include\utl_list.h"\

+	".\include\utl_namelist.h"\

+	".\include\utl_scope.h"\

+	".\include\utl_scoped_name.h"\

+	".\include\utl_stack.h"\

+	".\include\utl_string.h"\

+	".\include\utl_strlist.h"\

+	

+NODEP_CPP_Y_TAB=\

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

+	".\ys\types.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -2242,14 +32763,6 @@ SOURCE=.\be_include\be_union_label.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_valuetype_fwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\be_include\be_visitor.h

 # End Source File

 # Begin Source File

@@ -2342,14 +32855,6 @@ SOURCE=.\be_include\be_visitor_union_branch.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\be_include\be_visitor_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_valuetype_fwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\include\drv_extern.h

 # End Source File

 # Begin Source File

diff --git a/TAO/TAO_IDL/tao_idl_static.dsp b/TAO/TAO_IDL/tao_idl_static.dsp
index 92f33aba81e..83db9fd4688 100644
--- a/TAO/TAO_IDL/tao_idl_static.dsp
+++ b/TAO/TAO_IDL/tao_idl_static.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # 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 "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "be_include" /I "..\.." /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

 # SUBTRACT CPP /YX

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

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

@@ -68,7 +68,7 @@ LINK32=link.exe
 # 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 "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "include" /I "be_include" /I "..\.." /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D IDL_CFE_VERSION=\"1.3.0\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /D CPP_LOCATION="\"C:\\Program Files\\DevStudio\\VC\\bin\\CL.EXE\"" /c

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

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

 BSC32=bscmake.exe

@@ -1045,37 +1045,5 @@ SOURCE=.\include\utl_strlist.h
 SOURCE=.\fe\y.tab.h

 # End Source File

 # End Group

-# Begin Source File

-

-SOURCE=.\be\be_valuetype.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_valuetype_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_valuetype_fwd.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_valuetype.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_valuetype.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\be\be_visitor_valuetype_fwd.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\be_include\be_visitor_valuetype_fwd.h

-# End Source File

 # End Target

 # End Project

diff --git a/TAO/TAO_IDL/util/Makefile.am b/TAO/TAO_IDL/util/Makefile.am
deleted file mode 100644
index 94e553b4c06..00000000000
--- a/TAO/TAO_IDL/util/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO IDL compiler --- 'util' sub-directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## SUBDIRS = utl_tmpl
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) \
-           -I$(top_srcdir)/TAO_IDL/include
-
-noinst_LIBRARIES = libutil.a
-
-libutil_a_SOURCES = \
-         utl_decllist.cpp  \
-         utl_error.cpp  \
-         utl_exceptlist.cpp  \
-         utl_exprlist.cpp  \
-         utl_global.cpp  \
-         utl_identifier.cpp  \
-         utl_idlist.cpp  \
-         utl_indenter.cpp  \
-         utl_labellist.cpp  \
-         utl_list.cpp  \
-         utl_namelist.cpp  \
-         utl_scope.cpp  \
-         utl_stack.cpp  \
-         utl_string.cpp  \
-         utl_strlist.cpp
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 326552a74aa..30f9f0e51e6 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -65,10 +65,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // utl_error.cc - Implementation of error reporting object for IDL
-//                compiler program
+//		  compiler program
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(util, utl_error, "$Id$")
 
@@ -114,7 +114,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_ILLEGAL_CONTEXT:
     return GTDEVEL("error in context(..) clause, ");
   case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("");
+    return GTDEVEL("cannot inherit from ");
   case UTL_Error::EIDL_LOOKUP_ERROR:
     return GTDEVEL("error in lookup of symbol: ");
   case UTL_Error::EIDL_INHERIT_FWD_ERROR:
@@ -468,8 +468,8 @@ void
 UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
 {
   idl_error_header(EIDL_SYNTAX_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << parse_state_to_error_message(ps) << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -501,9 +501,9 @@ UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
 
 void
 UTL_Error::error3(UTL_Error::ErrorCode c,
-                  AST_Decl *d1,
-                  AST_Decl *d2,
-                  AST_Decl *d3)
+		  AST_Decl *d1,
+		  AST_Decl *d2,
+		  AST_Decl *d3)
 {
   idl_error_header(c, d1->line(), d1->file_name());
   d1->name()->dump(cerr); cerr << ", ";
@@ -527,8 +527,8 @@ void
 UTL_Error::lookup_error(UTL_ScopedName *n)
 {
   idl_error_header(EIDL_LOOKUP_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   n->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
@@ -552,27 +552,15 @@ UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
 void
 UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
 {
-  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
-  /* cerr << " interface "; */
+  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
+  cerr << " interface ";
   n->dump(cerr);
   cerr << GTDEVEL(" attempts to inherit from ");
-  d->name()->dump(cerr);
+  d->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
 
-// Report inheritance from non-abstract valuetype
-void
-UTL_Error::abstract_inheritance_error (UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
-  cerr << " abstract valuetype ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from nonabstract type\n");
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-
 // Report an error while evaluating an expression
 void
 UTL_Error::eval_error(AST_Expression *v)
@@ -618,8 +606,8 @@ UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
 // the enum discriminator type
 void
 UTL_Error::enum_val_lookup_failure(AST_Union *u,
-                                AST_Enum *e,
-                                UTL_ScopedName *n)
+				AST_Enum *e,
+				UTL_ScopedName *n)
 {
   idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
   cerr << " union " << u->local_name()->get_string() << ", ";
@@ -635,8 +623,8 @@ void
 UTL_Error::name_case_error(char *b, char *n)
 {
   idl_error_header(EIDL_NAME_CASE_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -673,8 +661,8 @@ void
 UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
 {
   idl_error_header(EIDL_FWD_DECL_LOOKUP,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << GTDEVEL("trying to look up ");
   n->dump(cerr);
   cerr << GTDEVEL(" in undefined forward declared interface ");
@@ -700,8 +688,8 @@ void
 UTL_Error::not_a_type(AST_Decl *d)
 {
   idl_error_header(EIDL_NOT_A_TYPE,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   if (d == NULL || d->name() == NULL)
     cerr << GTDEVEL("unknown symbol");
   else
diff --git a/TAO/TAO_IDL/util/utl_error.cpp b/TAO/TAO_IDL/util/utl_error.cpp
index 326552a74aa..30f9f0e51e6 100644
--- a/TAO/TAO_IDL/util/utl_error.cpp
+++ b/TAO/TAO_IDL/util/utl_error.cpp
@@ -65,10 +65,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // utl_error.cc - Implementation of error reporting object for IDL
-//                compiler program
+//		  compiler program
 
-#include        "idl.h"
-#include        "idl_extern.h"
+#include	"idl.h"
+#include	"idl_extern.h"
 
 ACE_RCSID(util, utl_error, "$Id$")
 
@@ -114,7 +114,7 @@ error_string(UTL_Error::ErrorCode c)
   case UTL_Error::EIDL_ILLEGAL_CONTEXT:
     return GTDEVEL("error in context(..) clause, ");
   case UTL_Error::EIDL_CANT_INHERIT:
-    return GTDEVEL("");
+    return GTDEVEL("cannot inherit from ");
   case UTL_Error::EIDL_LOOKUP_ERROR:
     return GTDEVEL("error in lookup of symbol: ");
   case UTL_Error::EIDL_INHERIT_FWD_ERROR:
@@ -468,8 +468,8 @@ void
 UTL_Error::syntax_error(IDL_GlobalData::ParseState ps)
 {
   idl_error_header(EIDL_SYNTAX_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << parse_state_to_error_message(ps) << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -501,9 +501,9 @@ UTL_Error::error2(UTL_Error::ErrorCode c, AST_Decl *d1, AST_Decl *d2)
 
 void
 UTL_Error::error3(UTL_Error::ErrorCode c,
-                  AST_Decl *d1,
-                  AST_Decl *d2,
-                  AST_Decl *d3)
+		  AST_Decl *d1,
+		  AST_Decl *d2,
+		  AST_Decl *d3)
 {
   idl_error_header(c, d1->line(), d1->file_name());
   d1->name()->dump(cerr); cerr << ", ";
@@ -527,8 +527,8 @@ void
 UTL_Error::lookup_error(UTL_ScopedName *n)
 {
   idl_error_header(EIDL_LOOKUP_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   n->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
@@ -552,27 +552,15 @@ UTL_Error::inheritance_fwd_error(UTL_ScopedName *n, AST_Interface *f)
 void
 UTL_Error::inheritance_error(UTL_ScopedName *n, AST_Decl *d)
 {
-  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
-  /* cerr << " interface "; */
+  idl_error_header(EIDL_CANT_INHERIT, d->line(), d->file_name());
+  cerr << " interface ";
   n->dump(cerr);
   cerr << GTDEVEL(" attempts to inherit from ");
-  d->name()->dump(cerr);
+  d->dump(cerr);
   cerr << "\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
 
-// Report inheritance from non-abstract valuetype
-void
-UTL_Error::abstract_inheritance_error (UTL_ScopedName *n)
-{
-  idl_error_header(EIDL_CANT_INHERIT, idl_global->lineno(), idl_global->filename());
-  cerr << " abstract valuetype ";
-  n->dump(cerr);
-  cerr << GTDEVEL(" attempts to inherit from nonabstract type\n");
-  idl_global->set_err_count(idl_global->err_count() + 1);
-}
-
-
 // Report an error while evaluating an expression
 void
 UTL_Error::eval_error(AST_Expression *v)
@@ -618,8 +606,8 @@ UTL_Error::enum_val_expected(AST_Union *u, AST_UnionLabel *l)
 // the enum discriminator type
 void
 UTL_Error::enum_val_lookup_failure(AST_Union *u,
-                                AST_Enum *e,
-                                UTL_ScopedName *n)
+				AST_Enum *e,
+				UTL_ScopedName *n)
 {
   idl_error_header(EIDL_ENUM_VAL_NOT_FOUND, u->line(), u->file_name());
   cerr << " union " << u->local_name()->get_string() << ", ";
@@ -635,8 +623,8 @@ void
 UTL_Error::name_case_error(char *b, char *n)
 {
   idl_error_header(EIDL_NAME_CASE_ERROR,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << "\"" << b << GTDEVEL("\" and ") << "\"" << n << "\"\n";
   idl_global->set_err_count(idl_global->err_count() + 1);
 }
@@ -673,8 +661,8 @@ void
 UTL_Error::fwd_decl_lookup(AST_Interface *d, UTL_ScopedName *n)
 {
   idl_error_header(EIDL_FWD_DECL_LOOKUP,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   cerr << GTDEVEL("trying to look up ");
   n->dump(cerr);
   cerr << GTDEVEL(" in undefined forward declared interface ");
@@ -700,8 +688,8 @@ void
 UTL_Error::not_a_type(AST_Decl *d)
 {
   idl_error_header(EIDL_NOT_A_TYPE,
-                   idl_global->lineno(),
-                   idl_global->filename());
+		   idl_global->lineno(),
+		   idl_global->filename());
   if (d == NULL || d->name() == NULL)
     cerr << GTDEVEL("unknown symbol");
   else
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index cc6897af78f..22f95d7d230 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -105,7 +105,7 @@ IDL_GlobalData::IDL_GlobalData (void)
       n_allocated_idl_files_ (0),
       pd_parse_state (PS_NoState),
       pd_idl_src_file (0),
-      changing_standard_include_files_ (1),
+      changing_standard_include_files_ (0),
       export_macro_ (0),
       export_include_ (0),
       client_hdr_ending_ (ACE::strnew ("C.h")),
@@ -123,15 +123,8 @@ IDL_GlobalData::IDL_GlobalData (void)
       server_template_inline_ending_ (ACE::strnew ("S_T.i")),
       gperf_path_ (0),
       output_dir_ (0),
-      temp_dir_ (0),
       any_support_ (I_TRUE),
       tc_support_ (I_TRUE),
-#ifdef IDL_HAS_VALUETYPE
-      obv_support_ (I_FALSE), // maybe I_TRUE
-      obv_opt_accessor_ (0),
-#else
-      obv_support_ (I_FALSE), // ever
-#endif
       compiled_marshaling_ (I_TRUE),
       gen_impl_files_ (I_FALSE),
       gen_copy_ctor_ (I_FALSE),
@@ -532,10 +525,11 @@ IDL_GlobalData::add_to_included_idl_files (char* file_name)
         {
           // Adding more storage.
 
-          char** old_included_idl_files =
-            this->included_idl_files_;
-          size_t n_old_allocated_idl_files =
-            this->n_allocated_idl_files_;
+          char** old_included_idl_files;
+          size_t n_old_allocated_idl_files;
+
+          old_included_idl_files = this->included_idl_files_;
+          n_old_allocated_idl_files = this->n_allocated_idl_files_;
           this->n_allocated_idl_files_ += INCREMENT;
           ACE_NEW (this->included_idl_files_,
                    char *[this->n_allocated_idl_files_]);
@@ -546,7 +540,8 @@ IDL_GlobalData::add_to_included_idl_files (char* file_name)
     }
 
   // Store it.
-  this->included_idl_files_ [this->n_included_idl_files_++] = file_name;
+  this->included_idl_files_ [this->n_included_idl_files_++] =
+    file_name;
 }
 
 char**
@@ -675,26 +670,16 @@ IDL_GlobalData::PredefinedTypeToExprType(AST_PredefinedType::PredefinedType pt)
     return AST_Expression::EV_short;
   case AST_PredefinedType::PT_ushort:
     return AST_Expression::EV_ushort;
-  case AST_PredefinedType::PT_longlong:
-    return AST_Expression::EV_longlong;
-  case AST_PredefinedType::PT_ulonglong:
-    return AST_Expression::EV_ulonglong;
   case AST_PredefinedType::PT_float:
     return AST_Expression::EV_float;
   case AST_PredefinedType::PT_double:
     return AST_Expression::EV_double;
-  case AST_PredefinedType::PT_longdouble:
-    return AST_Expression::EV_longdouble;
   case AST_PredefinedType::PT_char:
     return AST_Expression::EV_char;
-  case AST_PredefinedType::PT_wchar:
-    return AST_Expression::EV_wchar;
   case AST_PredefinedType::PT_octet:
     return AST_Expression::EV_octet;
   case AST_PredefinedType::PT_boolean:
     return AST_Expression::EV_bool;
-  case AST_PredefinedType::PT_void:
-    return AST_Expression::EV_void;
   default:
     return AST_Expression::EV_any;
   }
@@ -713,10 +698,10 @@ void IDL_GlobalData::idl_src_file(String *s)
 }
 
 // To switch between changing or non-changing standard include files
-// include files, so that #include statements can be
+// include files, so that #include statements can be 
 // generated with ""s or <>s respectively, for the standard include
-// files (e.g. tao/corba.h)
-void
+// files (e.g. tao/corba.h) 
+void 
 IDL_GlobalData::changing_standard_include_files (size_t changing)
 {
   this->changing_standard_include_files_ = changing;
@@ -745,24 +730,9 @@ be_change_idl_file_extension (String* idl_file,
   // Get the char* from the String.
   const char* string = idl_file->get_string ();
 
-  // Get the base part of the filename, we try several extensions
-  // before giving up.
-  const char *base = 0;
-
-  static const char* extensions[] = {
-    ".idl",
-    ".pidl",
-    ".IDL",
-    ".PIDL"
-  };
-  static int nextensions = sizeof(extensions)/sizeof(extensions[0]);
+  // Get the base part of the filename.
+  const char *base = ACE_OS::strstr (string, ".idl");
 
-  for (int k = 0; k < nextensions; ++k)
-    {
-      base = ACE_OS::strstr (string, extensions[k]);
-      if (base != 0)
-        break;
-    }
   if (base == 0)
     return 0;
 
@@ -1203,31 +1173,6 @@ IDL_GlobalData::output_dir (void) const
 }
 
 void
-IDL_GlobalData::temp_dir (const char* s)
-{
-  // Delete the old pointer.
-  delete [] this->temp_dir_;
-
-  // Allocate memory, 1 for the end of string.
-  ACE_NEW (this->temp_dir_,
-           char [ACE_OS::strlen (s) +
-                ACE_OS::strlen (ACE_DIRECTORY_SEPARATOR_STR_A) +
-                1]);
-
-  // Copy the strings.
-  ACE_OS::sprintf (this->temp_dir_,
-                   "%s%s",
-                   s,
-                   ACE_DIRECTORY_SEPARATOR_STR_A);
-}
-
-const char*
-IDL_GlobalData::temp_dir (void) const
-{
-  return this->temp_dir_;
-}
-
-void
 IDL_GlobalData::gperf_path (const char* s)
 {
   delete [] this->gperf_path_;
@@ -1264,32 +1209,6 @@ IDL_GlobalData::tc_support (void)
   return this->tc_support_;
 }
 
-#ifdef IDL_HAS_VALUETYPE
-void
-IDL_GlobalData::obv_opt_accessor (idl_bool val)
-{
-  this->obv_opt_accessor_ = val;
-}
-
-idl_bool
-IDL_GlobalData::obv_opt_accessor (void)
-{
-  return this->obv_opt_accessor_;
-}
-
-void
-IDL_GlobalData::obv_support (idl_bool val)
-{
-  this->obv_support_ = val;
-}
-#endif /* IDL_HAS_VALUETYPE */
-
-idl_bool
-IDL_GlobalData::obv_support (void)
-{
-  return this->obv_support_;
-}
-
 void
 IDL_GlobalData::compiled_marshaling (idl_bool val)
 {
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index be8084d2f44..23c688e8c98 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -131,7 +131,6 @@ iter_lookup_by_name_local(AST_Decl *d, UTL_ScopedName *e,
      * Next component in name was not found
      */
     if (d == NULL) {
-      delete i;
       return NULL;
     }
     /*
@@ -141,25 +140,19 @@ iter_lookup_by_name_local(AST_Decl *d, UTL_ScopedName *e,
     if (!(i->is_done())) {
       while (d != NULL && d->node_type() == AST_Decl::NT_typedef) {
         td = AST_Typedef::narrow_from_decl(d);
-        if (td == NULL) {
-          delete i;
+        if (td == NULL)
           return NULL;
-        }
         d = td->base_type();
       }
-      if (d == NULL) {
-        delete i;
+      if (d == NULL)
         return NULL;
-      }
     }
     /*
      * Try to convert the AST_Decl to a UTL_Scope
      */
     sc = DeclAsScope(d);
-    if (sc == NULL) {
-      delete i;
+    if (sc == NULL)
       return NULL;
-    }
     /*
      * Look up the next element
      */
@@ -168,7 +161,6 @@ iter_lookup_by_name_local(AST_Decl *d, UTL_ScopedName *e,
   /*
    * OK, done with the loop
    */
-  delete i;
   return d;
 }
 
@@ -212,7 +204,6 @@ AST_Decl * add_type(AST_Type *type)
 {
   AST_Decl * result = 0;
   UTL_Scope * scope = 0;
-
   switch (type->node_type()) {
     case AST_Decl::NT_array:
       result =
@@ -769,7 +760,6 @@ AST_Decl *
 UTL_Scope::look_in_inherited(UTL_ScopedName *e, idl_bool treat_as_ref)
 {
   AST_Decl              *d = NULL;
-  AST_Decl		*d_before = NULL;
   AST_Interface         *i = AST_Interface::narrow_from_scope(this);
   AST_Interface         **is;
   long                  nis;
@@ -786,36 +776,18 @@ UTL_Scope::look_in_inherited(UTL_ScopedName *e, idl_bool treat_as_ref)
     idl_global->err()->fwd_decl_lookup(i, e);
     return NULL;
   }
-
   /*
-   * OK, loop through inherited interfaces.
+   * OK, loop through inherited interfaces. Stop when you find it
    */
-  // (Don't leave the inheritance hierarchy, no module or global ...)
-  // Find all and report ambiguous results as error.
-
   for (nis = i->n_inherits(), is = i->inherits(); nis > 0; nis--, is++) {
-    d = (*is)->lookup_by_name(e, treat_as_ref, 0 /* not in_parent */);
-     if (d != NULL) {
-	if (d_before == NULL) {   // first result found
-	    d_before = d;
-	}
-	else {			  // conflict against further results ?
-	    if (d != d_before)  {
-                //    idl_global->err()->ambiguous (this,
-		cerr << "warning in " << idl_global->filename()->get_string()
-		     << " line " << idl_global->lineno() << ": " ;
-		e->dump(cerr);
-		cerr <<  " is ambiguous in scope.\nFound ";
-		d->name()->dump(cerr);
-		cerr << " and ";
-		d_before->name()->dump(cerr);
-		cerr << ".\n";
-	    }
-	}
-     }
+    d = (*is)->lookup_by_name(e, treat_as_ref);
+    if (d != NULL)
+      return d;
   }
-
-  return d_before;
+  /*
+   * Not found
+   */
+  return NULL;
 }
 
 /*
@@ -858,7 +830,6 @@ UTL_Scope::lookup_by_name_local(Identifier *e,
     }
     i->next();
   }
-  delete i;
   /*
    * OK, not found, return NULL
    */
@@ -869,8 +840,7 @@ 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)
+UTL_Scope::lookup_by_name(UTL_ScopedName *e, idl_bool treat_as_ref)
 {
   AST_Decl                   *d;
   UTL_Scope                  *t = NULL;
@@ -929,28 +899,26 @@ UTL_Scope::lookup_by_name(UTL_ScopedName *e, idl_bool treat_as_ref,
    while (1) {
      d = lookup_by_name_local(e->head(), treat_as_ref, index);
      if (d == NULL) {
-        /*
+       /*
+        * OK, not found. Go down parent scope chain.
+        */
+       d = ScopeAsDecl(this);
+       if (d != NULL) {
+         t = d->defined_in();
+         if (t == NULL)
+           d = NULL;
+         else
+           d = t->lookup_by_name(e, treat_as_ref);
+       }
+       /*
         * Special case for scope which is an interface. We have to look
         * in the inherited interfaces as well..
-	* Look before parent scopes !
         */
-        if (pd_scope_node_type == AST_Decl::NT_interface)
+       if (d == NULL) {
+         if (pd_scope_node_type == AST_Decl::NT_interface)
            d = look_in_inherited(e, treat_as_ref);
-
-        if ((d == NULL) && in_parent) {
-          /*
-           * OK, not found. Go down parent scope chain.
-           */
-          d = ScopeAsDecl(this);
-          if (d != NULL) {
-            t = d->defined_in();
-            if (t == NULL)
-            d = NULL;
-           else
-             d = t->lookup_by_name(e, treat_as_ref);
-          }
-         }
-      /*
+       }
+       /*
         * If treat_as_ref is true and d is not NULL, add d to
         * set of nodes referenced here
         */
diff --git a/TAO/VERSION b/TAO/VERSION
index a63ca4fa3e5..16e5931aaa4 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,8 +1,8 @@
-This is TAO version 0.3.23, released Sat May 22 17:10:11 1999.
+This is TAO version 0.3.4, released Mon Feb 15 13:26:29 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
-found in the file TAO/PROBLEM-REPORT-FORM.  To ensure that you see responses,
+found in the file BUG-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
diff --git a/TAO/configure.in b/TAO/configure.in
deleted file mode 100644
index f0e3b36c626..00000000000
--- a/TAO/configure.in
+++ /dev/null
@@ -1,608 +0,0 @@
-dnl
-dnl $Id$
-
-AC_REVISION($Revision 0.5 $)dnl
-
-dnl
-dnl An autoconf script to automatically configure TAO.
-dnl Process this file with autoconf to produce a configure script.
-dnl
-
-dnl
-dnl The autoconf documentation states that this is the recommended
-dnl sequence for this file:
-dnl
-dnl   `AC_INIT(FILE)'
-dnl   checks for programs
-dnl   checks for libraries
-dnl   checks for header files
-dnl   checks for typedefs
-dnl   checks for structures
-dnl   checks for variables
-dnl   checks for compiler characteristics
-dnl   checks for library functions
-dnl   checks for system services
-dnl   `AC_OUTPUT([FILE...])'
-dnl
-dnl I followed this convention, and added a few sections.
-dnl                      -- Gonzo
-
- 
-dnl
-dnl SECTION 1: `AC_INIT(FILE)'
-dnl
-dnl This macro must be the very first invoked.
-dnl Its argument names a file that must exist in the directory where
-dnl autoconf will run, just to check things.
-dnl AC_INIT(ace_unique.m4)
-dnl
-AC_INIT(tao/TAO.cpp)
-
-dnl Require GNU Autoconf 2.13 or better.
-AC_PREREQ(2.13)
-
-dnl Check what platform we are running on.
-AC_CANONICAL_SYSTEM
-
-dnl Allow the standard program name transformations.
-dnl We probably don't need AC_ARG_PROGRAM any longer since AM_INIT_AUTOMAKE
-dnl handles this functionality.  -- Ossama
-dnl AC_ARG_PROGRAM
-
-dnl Cause GNU Automake to initialize the state of things and run
-dnl some sanity checks
-TAO_PACKAGE="tao"
-dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
-changequote(, )dnl
-TAO_VERSION=`head -1 ${srcdir}/VERSION | sed 's/.*version \([0-9.]*\).*/\1/'`
-changequote([, ])dnl
-
-AM_INIT_AUTOMAKE("$TAO_PACKAGE", "$TAO_VERSION", )
-
-dnl Generate a header file with all settings.
-dnl AM_CONFIG_HEADER(tao/config.h)
-
-dnl Move before the AC_ARG_ENABLE stuff to prevent autoconf complaints.
-dnl This is a bit messy but it makes life easier for me.
-dnl                          -Ossama
-dnl
-dnl SECTION: checks for programs
-dnl
-
-dnl Check if system supports "#! /bin/sh" line in scripts
-AC_SYS_INTERPRETER
-
-dnl Check the C compiler and preprocessor.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CC_C_O
-
-dnl Check the C++ compiler and preprocessor.
-AC_PROG_CXX
-AC_PROG_CXXCPP
-
-dnl This checks for a binary called gm4, gnum4 or m4, and assigns
-dnl whatever was found (or "gonzo") to the M4 macro.
-dnl AC_CHECK_PROGS(M4, gm4 gnum4 m4, gonzo)
-
-dnl Look for the best awk-style program available.
-AC_PROG_AWK
-
-dnl Set some version information
-TAO_CURRENT="0"
-TAO_AGE="0"
-TAO_REVISION="0"
-
-if test -n "$AWK"; then
-  TAO_MAJOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]1 }'`
-  TAO_MINOR=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]2 }'`
-  TAO_BETA=`echo "$TAO_VERSION" | sed 's/\./ /g' | $AWK '{ print \[$]3 }'`
-
-dnl This is a terrible kludge to fool libtool into making it produce a shared
-dnl library with the "right" version information.
-dnl We really should switch to a version scheme that is compatible with
-dnl libtool.
-dnl               -Ossama
-TAO_CURRENT=`expr $TAO_MAJOR + $TAO_MINOR`
-TAO_AGE=$TAO_MINOR
-TAO_REVISION=$TAO_BETA
-
-fi
-
-AC_SUBST(TAO_CURRENT)
-AC_SUBST(TAO_AGE)
-AC_SUBST(TAO_REVISION)
-
-dnl Do the usual install settings; don't forget to include a
-dnl install-sh script, in case the is no BDS compatible install
-dnl installed (no pun intended) in your machine.
-dnl 
-dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AM_PROG_INSTALL
-dnl yes "AM_PROG_INSTALL," not "AC_PROG_INSTALL." -- Ossama
-dnl AC_PROG_INSTALL
-
-dnl Special handling for some UNIX variants and Cygwin32
-AC_AIX
-AC_ISC_POSIX
-AC_MINIX
-AC_CYGWIN
-
-dnl The user's/default C++ flags are stored in "CXXFLAGS."  We use
-dnl the variable "TAO_CXXFLAGS" to set the C++ flags we want.  At the end
-dnl of the configuration process we combine TAO_CXXFLAGS and CXXFLAGS
-dnl into CXXFLAGS (e.g., CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS").  CXXFLAGS
-dnl goes after TAO_CXXFLAGS so that the user's C++ flag command line
-dnl choices always override the configure script's choices.
-TAO_CXXFLAGS=""
-TAO_CFLAGS=""
-
-dnl Set the test language as C++
-AC_LANG_CPLUSPLUS
-
-dnl Check if we support symlinks
-AC_PROG_LN_S
-
-dnl Check if a lexical analyzer exists (lex, flex, etc.)
-AM_PROG_LEX
-
-dnl Check if some implementation of YACC exists (yacc, byacc, bison, etc.)
-AC_PROG_YACC
-dnl if test -z "$YACC"; then
-dnl   ./missing yacc
-dnl fi
-
-dnl Check for ace-config script
-AC_CHECK_PROG(ACE_CONFIG, ace-config, ace-config,) dnl
-if test -z "$ACE_CONFIG"; then
-  AC_MSG_WARN(ace-config script not found)
-  AC_MSG_WARN(TAO may not find all of the necessary ACE related libraries)
-fi
-
-dnl We actually check for this in the user AC_ARG_WITH(--with-gperf) 
-dnl block since it is more convenient to put it there.
-dnl Check for gperf program
-dnl AC_CHECK_PROGS(GPERF, gperf-ace gperf,) dnl
-
-dnl Check for profiling progam
-AC_CHECK_PROGS(PROF, gprof prof,) dnl
-
-dnl Since we are linking TAO with the C++ compiler, and since
-dnl libtool checks linker characteristics using the C compiler,
-dnl temporarily state that the C compiler is the C++ compiler.
-TEMP_CC="$CC"
-CC="$CXX"
-
-dnl Disable building of static libraries by default
-AM_DISABLE_STATIC
-
-dnl Check for libtool and turn on Automake processing for Libtool
-AM_PROG_LIBTOOL
-
-
-dnl Restore the C compiler variable
-CC="$TEMP_CC"
-
-dnl
-dnl SECTION 2: Configure script command line options
-dnl
-AC_ARG_ENABLE(fast,
-              [  --enable-fast           enable -fast flag, e.g. Sun C++ [default=no]],
-              [
-               case "${enableval}" in
-                yes)
-                  TAO_CXXFLAGS="$TAO_CXXFLAGS -fast"
-                  TAO_CFLAGS="$TAO_CFLAGS -fast"
-                  ;;
-                no)
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-fast)
-                  ;;
-               esac
-              ],)
-
-AC_ARG_ENABLE(optimize,
-              [  --enable-optimize       enable additional optimizations [default=no]],
-              [
-               case "${enableval}" in
-                yes)
-                  AC_MSG_WARN(Optimization configure support not implemented yet.)
-                  ;;
-                no)
-                  AC_MSG_WARN(Optimization configure support not implemented yet.)
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-optimize)
-                  ;;
-               esac
-              ],)
-
-AC_ARG_ENABLE(profile,
-              [  --enable-profile        enable profiling                [default=no]],
-              [
-               case "${enableval}" in
-                yes)
-                  if test -z "$PROF"; then
-                    AC_MSG_WARN(No profiling program found.  Assuming 'prof' exists)
-                    TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
-                    TAO_CFLAGS="$TAO_CFLAGS -p"
-                  else
-                    case "$PROF" in
-                    gprof)
-                      echo "Building with 'gprof' support"
-                      TAO_CXXFLAGS="$TAO_CXXFLAGS -pg"
-                      TAO_CFLAGS="$TAO_CFLAGS -pg"
-                      ;;
-                    prof)
-                      echo "Building with 'prof' support"
-                      TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
-                      TAO_CFLAGS="$TAO_CFLAGS -p"
-                      ;;
-                    *)
-                      dnl We shouldn't get here.
-                      AC_MSG_WARN(Assuming 'prof' exists)
-                      TAO_CXXFLAGS="$TAO_CXXFLAGS -p"
-                      TAO_CFLAGS="$TAO_CFLAGS -p"
-                      ;;
-                    esac
-                  fi
-                  ;;
-                no)
-                  dnl Do nothing
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-profile)
-                  ;;
-               esac
-              ],)
-
-AC_ARG_ENABLE(purify,
-              [  --enable-purify         Purify all executables          [default=no]],
-              [
-               case "${enableval}" in
-                yes)
-                  AC_CHECK_PROG(PURIFY, purify, purify,)
-                  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"
-                    TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_PURIFY"
-                    TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_PURIFY"
-                  else
-                    AC_MSG_WARN(Purify program was not found.)
-                    AC_MSG_WARN(Disabling purify support.)
-                  fi
-                  ;;
-                no)
-                  PURELINK=""
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-purify)
-                  ;;
-               esac
-              ], PURELINK="")
-
-AC_ARG_ENABLE(quantify,
-              [  --enable-quantify       Quantify all executables        [default=no]],
-              [
-               case "${enableval}" in
-                yes)
-                  AC_CHECK_PROG(QUANTIFY, quantify, quantify,)
-                  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"
-                    TAO_CXXFLAGS="$TAO_CXXFLAGS -DTAO_HAS_QUANTIFY"
-                    TAO_CFLAGS="$TAO_CFLAGS -DTAO_HAS_QUANTIFY"
-                  else
-                    AC_MSG_WARN(Quantify program was not found.)
-                    AC_MSG_WARN(Disabling quantify support.)
-                  fi
-                  ;;
-                no)
-                  PRELINK=""
-                  ;;
-                *)
-                  AC_MSG_ERROR(bad value ${enableval} for --enable-quantify)
-                  ;;
-               esac
-              ], PRELINK="")
-
-AC_ARG_WITH(ace-includes,
-              [  --with-ace-includes=DIR ACE include files are in DIR],
-              [
-               case "${withval}" in
-                yes)
-                  AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.)
-                  ;;
-                no)
-                  AC_MSG_ERROR(specify a directory where the 'ace' include directory exists.)
-                  ;;
-                *)
-                  if test -d "${withval}"; then
-                    ACE_INCLUDEDIR="${withval}"
-                    CXXFLAGS="${CXXFLAGS} -I${ACE_INCLUDEDIR}"
-                  else
-                    AC_MSG_ERROR(header directory '${withval}' does not exist.)
-                  fi
-                  ;;
-               esac
-              ],)
-
-AC_ARG_WITH(ace-libs,
-              [  --with-ace-libs=DIR     ACE library files are in DIR],
-              [
-               case "${withval}" in
-                yes)
-                  AC_MSG_ERROR(specify a directory where the ACE libraries exist.)
-                  ;;
-                no)
-                  AC_MSG_ERROR(specify a directory where the ACE libraries exist.)
-                  ;;
-                *)
-                  if test -d "${withval}"; then
-                    ACE_LIBDIR="${withval}"
-                    LDFLAGS="${LDFLAGS} -L${ACE_LIBDIR}"
-                  else
-                    AC_MSG_ERROR(library directory '${withval}' does not exist.)
-                  fi
-                  ;;
-               esac
-              ],)
-
-AC_ARG_WITH(gperf,
-              [  --with-gperf=PROG       gperf program                   [default=gperf]],
-              [
-               case "${withval}" in
-                yes)
-                  AC_MSG_ERROR(Specify the gperf program.)
-                  ;;
-                no)
-                  AC_MSG_ERROR(Specify the gperf program.)
-                  ;;
-                *)
-                  AC_CHECK_PROGS(GPERF, ${withval} gperf-ace gperf,) dnl
-                  if test -n "$GPERF"; then
-                    AC_DEFINE_UNQUOTED(ACE_GPERF, "${withval}")
-                  else
-                    AC_MSG_ERROR(gperf program ${withval} does not exist.)
-                  fi
-                  ;;
-               esac
-              ],
-              [
-               if test -z "$GPERF"; then
-                 AC_MSG_WARN(No gperf program found.  TAO will not use perfect hashing.)
-               else
-                 AC_DEFINE_UNQUOTED(ACE_GPERF, "${GPERF}")
-               fi
-              ])
-
-dnl Check for a working ACE installation
-ac_save_CXXFLAGS="$CXXFLAGS"
-ac_save_LDFLAGS="$LDFLAGS"
-ac_save_LIBS="$LIBS"
-if test -n "$ACE_CONFIG"; then
-  CXXFLAGS=`$ACE_CONFIG --cxxflags ace`
-  LDFLAGS=`$ACE_CONFIG --libs-only-L ace`
-  LIBS=`$ACE_CONFIG --libs-only-l ace`
-fi
-CXXFLAGS="$ac_save_CXXFLAGS $CXXFLAGS"
-LDFLAGS="$ac_save_LDFLAGS $LDFLAGS"
-LIBS="$ac_save_LIBS -lACE $LIBS"
-AC_MSG_CHECKING(for a working ACE installation)
-AC_CACHE_VAL(ac_cv_lib_ace_ace_os_exit,
-[
- cat > conftest.$ac_ext <<EOF
-
-#include <ace/OS.h>
-changequote(, )dnl
-int main(int argc, char *argv[])
-changequote([, ])dnl
-{
- ACE_OS::exit(0);
-}
-EOF
-
- if (eval "$CXX -o conftest conftest.$ac_ext $CXXFLAGS $LDFLAGS $LIBS") 2>&5; then
-   ac_cv_lib_ace_ace_os_exit="yes"
-   rm -f conftest*
- else
-   ac_cv_lib_ace_ace_os_exit="no"
-   dnl rm -f conftest*
- fi
-])
-if test "$ac_cv_lib_ace_ace_os_exit" = "yes"; then
-  AC_MSG_RESULT(yes)
-else
-  AC_MSG_RESULT(no)
-  AC_MSG_WARN(no functional ACE library found)
-  AC_MSG_ERROR(specify needed compiler flags using CXXFLAGS variable first)
-fi
-
-dnl We only set the following if the ace-config script doesn't exist!
-if test -z "$ACE_CONFIG"; then
-
-  dnl Check if platform supports exceptions using ACE headers
-  AC_MSG_CHECKING(if ACE supports exceptions)
-  AC_EGREP_CPP(TAO_EXCEPTIONS,
-    [
-#include <ace/config.h>
-
-#if defined (ACE_HAS_EXCEPTIONS)
-       TAO_EXCEPTIONS
-#endif
-    ],
-    [
-     AC_MSG_RESULT(yes)
-    ] ,
-    [
-     AC_MSG_RESULT(no)
-     if test -n "$GXX"; then
-dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
-changequote(, )dnl
-       if g++ --version | egrep -v '^2\.[0-7]' > /dev/null; then
-changequote([, ])dnl
-         if test -z "$ACE_CONFIG"; then
-           TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-exceptions"
-         fi
-       fi
-     fi
-     if test -n "$GCC"; then
-dnl Temporarily change M4 quotes to prevent "regex []" from being eaten
-changequote(, )dnl
-       if gcc --version | egrep -v '^2\.[0-7]' > /dev/null; then
-changequote([, ])dnl
-         if test -z "$ACE_CONFIG"; then
-           TAO_CFLAGS="$TAO_CFLAGS -fno-exceptions" 
-         fi
-       fi
-     fi
-    ])
-
-  dnl Check if platform supports run-time type identification using ACE headers
-  AC_MSG_CHECKING(if ACE supports GNU C++ repositories)
-  AC_EGREP_CPP(TAO_GNU_REPO,
-    [
-#include <ace/config.h>
-
-#if defined (ACE_HAS_GNU_REPO)
-       TAO_GNU_REPO
-#endif
-    ],
-    [
-     AC_MSG_RESULT(yes)
-     if test -n "$GXX" && test -z "$ACE_CONFIG"; then
-       TAO_CXXFLAGS="$TAO_CXXFLAGS -frepo"
-     fi
-    ] ,
-    [
-     AC_MSG_RESULT(no)
-     if test -n "$GXX" && test -z "$ACE_CONFIG"; then
-       TAO_CXXFLAGS="$TAO_CXXFLAGS -fno-implicit-templates"
-     fi
-    ])
-
-  dnl Check if platform supports run-time type identification using ACE headers
-  AC_MSG_CHECKING(if ACE supports run-time type identification)
-  AC_EGREP_CPP(TAO_RTTI,
-    [
-#include <ace/config.h>
-
-#if !defined (ACE_LACKS_RTTI)
-       TAO_RTTI
-#endif
-    ],
-    [
-     AC_MSG_RESULT(yes)
-       if test -z "$GXX" && test -z "$ACE_CONFIG"; then
-         case "$target" in
-           *solaris*)
-              TAO_CXXFLAGS="$TAO_CXXFLAGS -features=rtti"
-              ;;
-           *)
-              ;;
-         esac
-       fi
-    ],
-    [
-     AC_MSG_RESULT(no)
-    ])
-
-fi dnl test -z "$ACE_CONFIG"
-
-dnl Check if templates require source on platform using ACE headers
-AC_MSG_CHECKING(if ACE and TAO require template source)
-AC_EGREP_CPP(TAO_TEMPLATES_SOURCE,
-  [
-#include <ace/config.h>
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-       TAO_TEMPLATES_SOURCE
-#endif
-  ],
-  [
-   tao_cv_feature_templates_require_source="yes"
-   AC_MSG_RESULT(yes)
-  ],
-  [
-   tao_cv_feature_templates_require_source="no"
-   AC_MSG_RESULT(no)
-  ])
-AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE,
-               test X$tao_cv_feature_templates_require_source = Xyes)
-
-
-dnl Additional flags to set by the configure script
-
-if test -n "$GXX" && test -z "$ACE_CONFIG"; then
-  TAO_CXXFLAGS="$TAO_CXXFLAGS -Wall -Wpointer-arith -Wno-switch"
-else
-  TAO_CXXFLAGS="$TAO_CXXFLAGS -Wno-switch"
-fi
-
-if test -n "$GCC" && test -z "$ACE_CONFIG"; then
-  TAO_CFLAGS="$TAO_CFLAGS -Wall -Wpointer-arith -Wno-switch"
-fi
-
-dnl Combine package set flags with user's flags.
-dnl User's flags go after package flags to allow user to override
-dnl package defaults.
-dnl X_CFLAGS comes from AC_PATH_XTRA.  It may include, for example,
-dnl additional include file paths or macros that need to be defined
-dnl in order for X11 related files to be compiled properly.
-CXXFLAGS="$TAO_CXXFLAGS $CXXFLAGS"
-CXXCPPFLAGS="$TAO_CXXCPPFLAGS $CXXCPPFLAGS"
-CFLAGS="$TAO_CFLAGS $CFLAGS"
-CPPFLAGS="$TAO_CPPFLAGS $CPPFLAGS"
-LDFLAGS="$TAO_LDFLAGS $LDFLAGS"
-
-dnl Prepend purify and quantify command lines if purify and quantify are
-dnl enabled.  Otherwise, PURELINK and PRELINK will just be "blank."
-LD="$PURELINK $PRELINK $LD"
-dnl LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
-
-dnl AC_SUBST(LDFLAGS)
-dnl AC_SUBST(LIBOBJS)
-
-dnl These definitions are expanded in the makefile and ace-config
-TAO_LIBDIR='-L${libdir}'
-TAO_LIBS="${LIBS}"
-TAO_INCLUDEDIR='-I${includedir}'
-
-AC_SUBST(TAO_LIBDIR)
-AC_SUBST(TAO_LIBS)
-AC_SUBST(TAO_INCLUDEDIR)
-
-dnl Force CXXFLAGS to be substituted in Makefiles that don't "need" them.
-AC_SUBST(CXXFLAGS)
-
-dnl
-dnl SECTION 16: `AC_OUTPUT([FILE...])'
-dnl
-dnl
-dnl We can finally create all the files listed here; Makefile is
-dnl created from Makefile.in, etc.  Top-level Makefiles should be
-dnl created first.
-AC_OUTPUT([
-           Makefile
-           TAO_IDL/Makefile
-           TAO_IDL/ast/Makefile
-           TAO_IDL/be/Makefile
-           TAO_IDL/be_include/Makefile
-           TAO_IDL/driver/Makefile
-           TAO_IDL/fe/Makefile
-           TAO_IDL/include/Makefile
-           TAO_IDL/narrow/Makefile
-           TAO_IDL/util/Makefile
-           tao/Makefile
-           tao-config
-          ])
-
-echo ""
-echo "Configuration of TAO is now complete."
-echo ""
diff --git a/TAO/docs/INS.html b/TAO/docs/INS.html
deleted file mode 100644
index 8369da0eab1..00000000000
--- a/TAO/docs/INS.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<HTML>
-
-<HEAD>
-<TITLE>TAO Interoperable Naming Service</TITLE>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
-
-<HR><P>
-<H3>TAO Interoperable Naming Service</H3>
-
-The Interoperable Naming Service (INS) service allows the ORB to be
-configured administratively to return object references from
-<CODE>CORBA::ORB::resolve_initial_references</CODE> for non-locality
-constrained objects.  The service also introduces the
-<CODE>iioploc</CODE> and <CODE>iiopname</CODE> IOR formats, which can
-be used to bootstrap services not available at ORB installation time.
-<P>
-
-This document presents an overview of TAO's INS implementation and
-addresses common questions. <P>
-
-<HR align=left width=80% ><P>
-<H4>How does <CODE>resolve_initial_references</CODE> work ?</H4><P>
-
-The following is the order that <CODE>resolve_initial_references</CODE>
-locates a service: <P>
-
-<OL>
-<LI><A HREF="#oir">ORBInitRef</A> <br>
-<LI><A HREF="#odir">ORBDefaultInitRef</A> <br>
-<LI>ORB Default Settings <br>
-<LI>Multicast to Service <p>
-</OL>
-
-TAO uses the <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/man/html/ACE_Hash_Map_Manager.html">ACE_Hash_Map_Manager</A>
-to keep track of the ObjectID:IOR mappings specified on the
-command-line. The IOR could be in <CODE>IOR</CODE>, <CODE>iiop</CODE>,
-or <CODE>iioploc</CODE> format.  If the ORB fails to resolve the IOR
-using the command-line parameters or the default settings, it uses UDP
-multicast to resolve the service. <P>
-
-The Naming Service process acts as an IIOP Agent to respond with the
-IOR for the given service name. If the service being resolved is the
-Naming Service or the Trading Service, TAO checks the appropriate <A
-HREF="Options.html#ev">environment variables</A> prior to using
-multicast to obtain the appropriate port number or IOR.<p>
-
-The following diagram illustrates the order in which these various
-components interact. <P>
-
-<img width=200 height=5
-src="http://www.cs.wustl.edu/~schmidt/gifs/space.gif"><img width=723
-height=529
-src="http://www.cs.wustl.edu/~schmidt/gifs/interop-naming.gif"><p>
-
-<HR align=left width=80% ><P>
-
-<H4>ORB Parameters Used for Configuration</H4>
-<A NAME="oir"></A>
-<DL>
-<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
-<B><FONT COLOR="#000000">-ORBInitRef :</FONT> </B>
-The ORB initial reference argument allows specification of an
-    arbitrary object reference for an initial service. The format is :
-    <p>
-    <CODE>-ORBInitRef [ObjectID]=[ObjectURL]</CODE> <p>
-    Examples of use are: <p>
-    <CODE>-ORBInitRef  NameService=IOR:0002342344AB345</CODE> ...<br>
-    <CODE>-ORBInitRef MyServiceID=iioploc://tango.cs.wustl.edu:87777/myService </CODE><p>
-
-    This mechanism allows an ORB to be configured with new initial
-    service Object IDs that were not defined when the ORB was
-    installed. The ObjectURL can be any of the URL schemes supported
-    by <CODE>CORBA::ORB::string_to_object</CODE>.<p>
-
-    <A NAME="odir"></A>
-<DT> <img alt="o" src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif"><B><FONT COLOR="#000000">
--ORBDefaultInitRef :</FONT></B></LI>
-The ORB default initial reference argument assists in resolution of
-    initial references not explicitly specified with
-    <CODE>-ORBInitRef</CODE>. <CODE>-ORBDefaultInitRef</CODE> requires a URL that, after
-    appending a slash '/' and a stringified object key, forms a new
-    URL to identify an initial object reference. <p>
-    For example: <P>
-    <CODE>-ORBDefaultInitRef
-    iioploc://tango.cs.wustl.edu:89899,merengue.cs.wustl.edu:99990</CODE> <p>
-
-    A call to <CODE>resolve_initial_references ("NameService")</CODE> with this
-    argument results in a new multiple profile URL equivalent to the following: <P>
-    <CODE>iioploc://tango.cs.wustl.edu:89899/NameService</CODE> <br>
-    <CODE>iioploc://merengue.cs.wustl.edu:99990/NameService</CODE> <p>
-    
-    The URL is passed to <CODE>CORBA::ORB::string_to_object</CODE> to obtain the
-    initial reference for the service.
-</DL>
-
-<HR align=left width=80% ><P>
-
-<H4>iioploc:// IOR format</H4>
-The <CODE>CORBA::ORB::string_to_object</CODE> now understands the <CODE>iioploc://</CODE>
-format IORs. These are user-friendly multiple end-point IORs. For
-example - <p>
- <img width=50 height=5
-src="http://www.cs.wustl.edu/~schmidt/gifs/space.gif">iioploc:1.0//tango.cs.wustl.edu:99999/SimpleKey,
-merengue.cs.wustl.edu:99990/SimpleKey <p>
-
-Each of the end-points is converted into an IIOP Profile. These
-profiles are used to construct the Multiple Profile Object. This
-object is then used to construct the Object Reference.<p>
-
-The object references constructed using this format have a
-'SimpleKey' in the Object Key field of the IOR. The server side ORB
-intercepts the incoming IIOP request, recognizes the Simple Key and
-looks up a table to get the complete IOR. It then raises a
-LOCATION_FORWARD or an OBJECT_NOT_EXIST exception to forward/fail the
-request depending on if a mapping for the given simple key exists. <p>
-
-All default TAO Object keys are preceded by a special sequence of
-octets ^t^a^o/0. This is taken care of by the POA when it generates
-the Object key for the IOR. The sequence is useful for the ORB to
-distinguish a simple key from the usual TAO object key. <p>
-
-<HR align=left width=80% ><P>
-
-<!--<EM>
-Visitor #1 since Thu Apr 15 22:33:36 1999
-
-from merengue.cs.wustl.edu
-
-<EM><br> -->
-<I> Last modified Tue Apr 20 14:47:21 CDT 1999 </I>
-
-
-</BODY>
-</HTML>
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 9f87f4aeedb..68e0304dca2 100644
--- a/TAO/docs/Options.html
+++ b/TAO/docs/Options.html
@@ -22,16 +22,6 @@ environment variables or (2) strings passed on the command-line.  They
 are generally passed to component initialization methods for
 consumption.</P>
 
-<p>Both command-line options and environment variables are used to
-control the global ORB features like the IOR format or ORB's
-bootstraping methods.  Options in <code>svc.conf</code> file on the
-other hand provides a mechanism to fine-tune the internal components
-in TAO and they are specific to individual components.
-<code>svc.conf</code> files are not required to run TAO programs.
-However, if you know the behavior of your programs, you can tune-up
-your programs and use various optimization provided by TAO thru the
-use of svc.conf files.</p>
-
 <P><EM>Programmer's Note:</EM> the internal structure for options is
 the traditional <CODE>argc</CODE>/<CODE>argv</CODE> vector of strings
 style popularized by C and Unix.  By convention, an initialization
@@ -39,7 +29,7 @@ method will consume, <EM>i.e.</EM>, remove from the vector, any
 options that it recognizes.</P> </blockquote>
 
 <HR><P>
-<H3><A NAME="ev">Environment Variables</A></H3>
+<H3>Environment Variables</H3>
 
 The following environment variables are supported by TAO:
 
@@ -68,6 +58,11 @@ Specifies which IOR the Trading Service is listening on.
 <TD>
 Specifies which port the Trading Service is listening on.
 </TD></TR>
+<TR>
+<TD><CODE>TAO_ORB_DEBUG</CODE> <EM>which</EM></TD>
+<TD>
+Enables TAO debugging mode.
+</TD></TR>
 </TABLE>
 </P>
 </BLOCKQUOTE>
@@ -81,6 +76,7 @@ Specifies which port the Trading Service is listening on.
 
 <UL>
   <LI><A HREF="#ORB"><CODE>CORBA::ORB</CODE></A>
+  <LI><A HREF="#POA"><CODE>CORBA::POA</CODE></A>
   <LI><A HREF="#ResourceFactory"><CODE>TAO_Resource_Factory</CODE></A>
   <LI><A HREF="#DefaultServer"><CODE>TAO_Default_Server_Strategy_Factory</CODE></A>
   <LI><A HREF="#DefaultClient" TARGET="_top"><CODE>TAO_Default_Client_Strategy_Factory</CODE></A>
@@ -116,32 +112,24 @@ directive, which is passed to ACE's Service Configurator.</TD></TR>
 <TD>Turns on the output of debugging messages within ACE's Service Configurator
 componentry.</TD></TR>
 <TR>
-<TD><CODE>-ORBdebuglevel</CODE> <EM>level</EM></TD>
-<TD>Control the level of debugging in the ORB. Higher number produce
-more output (try 10).
-</TD></TR>
-<TR>
-
-<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD> <TD><a
-name="-ORBhost"></a>Tells the ORB to listen for requests on the
-interface associated with the host named
-<I><EM>hostname</EM></I>.</TD></TR>
-
+<TD><CODE>-ORBhost</CODE> <EM>hostname</EM></TD>
+<TD><a name="-ORBhost"></a>Tells the Object Adapter to listen for requests on the interface associated
+with the host named <I><EM>hostname</EM></I>.</TD></TR>
 <TR>
-
-<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD> <TD>Tells the ORB to
-listen for requests on the port specified by
-<I><EM>portspec</EM></I>. If not specified, the OS gets to choose a
-random empty port.</TD>
-
-</TR>
-
+<TD><CODE>-ORBport</CODE> <EM>portspec</EM></TD>
+<TD>Tells the Object Adapter to listen for requests on the port specified by
+<I><EM>portspec</EM></I>, which can be a name as found in <TT>/etc/services</TT>
+or a number. The default is <TT>10013</TT>.</TD></TR>
 <TR>
 <TD><CODE>-ORBobjrefstyle</CODE> <EM>which</EM></TD>
 <TD>Specifies the user-visible style of object references. The range of values
 is <CODE>IOR</CODE>, which is the traditional nonsensical object reference,
 or <CODE>URL</CODE>, which looks more like a URL.</TD></TR>
 <TR>
+<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
+<TD>Specifies the size of the object table as a positive, non-zero integer.
+If not specified, the default is <TT>64</TT>.</TD></TR>
+<TR>
 <TD><CODE>-ORBrcvsock</CODE> <EM>receive buffer size</EM></TD>
 <TD><A NAME="-ORBrcvsock"></a>Specify the size of the socket receive buffer as a positive, non-zero integer.
 If not specified, the system-dependent default is used.</TD></TR>
@@ -156,13 +144,6 @@ If not specified, the system-dependent default is used.</TD></TR>
 <TD><CODE>-ORBnameserviceior</CODE> <EM>ior</EM></TD>
 <TD>Specifies the IOR for the Naming Service.</TD></TR>
 <TR>
-<TD><CODE>-ORBtradingserviceior"</CODE> <EM>ior</EM></TD>
-<TD>Specifiles the IOR for the Trading Service.</TD></TR>
-<TR>
-<TD><CODE>-ORBtradingserviceport"</CODE> <EM>portspec</EM></TD>
-<TD>Specifies to which port the tradingservice is listening
-    on.</TD></TR>
-<TR>
 <TD><CODE>-ORBcollocation</CODE> <EM>yes/no</EM></TD>
 <TD>Specifies the use of collocation object optimization.  Default is yes.</TD></TR>
 <TR>
@@ -173,16 +154,16 @@ be established, a warning is announced and it continues with the
 next listed.  Listing the same combination multiple times will
 properly establish multiple connections to that endpoint.</TD></TR>
 <TR>
-<TD><CODE>-ORBcdrtradeoff</CODE> <EM>maxsize</EM></TD>
+<TD><CODE>-ORBCDRtradeoff</CODE> <EM>maxsize</EM></TD>
 <TD><A name="-ORBCDRtradeoff"></a>Control the strategy to tradeoff
 between copy vs no copy marshalling of octet sequences.
 If an octet sequence is smaller than <EM>maxsize</EM> and the current
 message block contains enough space for it the octet sequence is
 copied instead of appended to the CDR stream.</TD></TR>
 <TR>
-<TD><CODE>-ORBgioplite</CODE></TD>
-<TD><A name="-ORBgioplite"></a>Enable a lightweight version of the
-	    GIOP protocol. This protocol removes some of the fields in
+<TD><CODE>-ORBiioplite</CODE></TD>
+<TD><A name="-ORBiioplite"></a>Enable a lightweight version of the
+	    IIOP protocol. This protocol removes some of the fields in
 	    the GIOP and the Request header. It only works on
 	    homogenous environments..</TD></TR>
 <TR>
@@ -191,12 +172,23 @@ copied instead of appended to the CDR stream.</TD></TR>
             notation for addresses.</TD></TR>
 <TR>
 <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 the one of the following formats : OMG IOR, URL or iioploc form. iioploc is a multiple end-point IORs 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.</TD></TR>
+<TD><A name="-ORBInitRef"></a> Specify a mapping between an ObjectId and an IOR. The IOR could be in the OMG IOR
+    form or in the URL form. More formats for the IOR will be supported soon. This mapping is used by the
+    resolve_initial_references () and overrides the orb-install-time defaults.</TD></TR>
+</TABLE>
+</P>
+</blockquote>
 
-<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 '/' 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>
+<H3><CODE>CORBA::POA</CODE><A NAME="POA"></A></H3>
 
+<blockquote>
+<P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0">
+<TR>
+<TH>Option</TH>
+<TH>Description</TH></TR>
+<TR>
+<TD><CODE>-OAid</CODE> <EM>OA Identifier</EM></TD>
+<TD>Associates <I><EM>OA Identifier</EM></I> with the Object Adapter.</TD></TR>
 </TABLE>
 </P>
 </blockquote>
@@ -214,45 +206,15 @@ copied instead of appended to the CDR stream.</TD></TR>
 (<em>which</em> = <code>global</code>) or a thread-specific
 (<em>which</em> = <code>tss</code>) instance for the resources it returns.</TD></TR>
 <TR>
+<TD><CODE>-ORBpoa</CODE> <EM>which</EM></TD>
+<TD><a name="-ORBpoa"></a>Specify whether each thread uses a global
+(<em>which</em> = <code>global</code>) or a thread-specific
+(<em>which</em> = <code>tss</code>) instance for the Root POA.</TD></TR>
+<TR>
 <TD><CODE>-ORBreactorlock</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBreactorlock"></a>Specify whether the ORB reactor is
-	      thread-safe
+<TD><a name="-ORBcoltable"></a>Specify whether the ORB reactor is thread-safe
 (<em>which</em> = <code>token</code>) or not
-(<em>which</em> = <code>null</code>).  Default is <code>token</code>.
-	      <P>This option has been superseeded by
-		<CODE>-ORBreactortype</CODE>
-	      </P>
-</TD></TR>
-<TR>
-<TD><CODE>-ORBreactortype</CODE> <EM>which</EM></TD>
-<TD><a name="-ORBcoltable"></a>Specify what kind of reactor does the
-	      ORB use, the options are:
-  <TABLE BORDER="1" CELLSPACING="2" CELLPADDING="0">
-  <TR><TH><em>which</em></TH><TH>Reactor</TH></TR>
-  <TR><TD><CODE>select_mt<CODE></TD><TD>Use the
-		    <CODE>ACE_Select_Reactor</CODE> with the usual
-		    locking mechanism for this platform</TD></TR>
-  <TR><TD><CODE>select_st<CODE></TD><TD>Use the
-		    <CODE>ACE_Select_Reactor</CODE> with null locks
-		  </TD></TR>
-  <TR><TD><CODE>fl_reactor<CODE></TD><TD>Use the
-		    <CODE>ACE_FlReactor</CODE> only available if ACE
-		    was compiled with support for the FL toolkit
-		  </TD></TR>
-  <TR><TD><CODE>xt_reactor<CODE></TD><TD>Use the
-		    <CODE>ACE_FlReactor</CODE> only available if ACE
-		    was compiled with support for the XWindows Toolkit
-		  </TD></TR>
-  <TR><TD><CODE>WFMO<CODE></TD><TD>Use the
-		    <CODE>ACE_WFMO_Reactor</CODE> only available on
-		    Win32 platforms.
-		  </TD></TR>
-  <TR><TD><CODE>MsgWFMO<CODE></TD><TD>Use the
-		    <CODE>ACE_Msg_WFMO_Reactor</CODE> only available on
-		    Win32 platforms.
-		  </TD></TR>
-  </TABLE>
-  The default is <code>select_mt</code></TD></TR>
+(<em>which</em> = <code>null</code>).  Default is <code>token</code></TD></TR>
 <TR>
 <TD><CODE>-ORBcoltable</CODE> <EM>which</EM></TD>
 <TD><a name="-ORBcoltable"></a>Specify whether each ORB uses a global
@@ -265,15 +227,10 @@ copied instead of appended to the CDR stream.</TD></TR>
 	      (<em>which</em> = <code>global</code>)
 	      or a per-thread (<em>which</em> = <code>tss</code>)
 	      allocator for the incoming CDR buffers.
-	      Though <CODE>tss</CODE> should give the
+	      The default is <CODE>tss</CODE> and should give the
 	      optimal performance;
-	      we made the default <CODE>global</CODE>.
-	      TAO optimizations for octet sequences will not work when
-	      returning that data type if the allocator is
-	      <CODE>tss</CODE>.
-	      Using global allocator also allows the users to
-	      take advantage of the TAO octet sequence
-	      extensions to preserve the buffer after the upcall.
+	      unless the user takes advantage of the features in TAO
+	      to keep the CDR stream buffer after the upcall.
 	    </TD></TR>
 </TABLE>
 </P>
@@ -281,93 +238,43 @@ copied instead of appended to the CDR stream.</TD></TR>
 
 <H3><CODE>TAO_Default_Server_Strategy_Factory</CODE><A NAME="DefaultServer"></A></H3>
 
-<p><em>Note:</em> <code>-ORBdemuxstrategy</code> flag has been changed to <code>-ORBsystemidpolicydemuxstrategy</code> and <code>-ORBuseridpolicydemuxstrategy</code>.
-<p><em>Note:</em> <code>-ORBtablesize</code> flag has been changed to <code>-ORBactiveobjectmapsize</code>.
-
 <blockquote>
 <P><TABLE BORDER="2" CELLSPACING="2" CELLPADDING="0" >
 <TR>
 <TH>Option</TH>
 <TH>Description</TH></TR>
 <TR>
-
-<TD><CODE>-ORBconcurrency</CODE> <EM>which</EM></TD> <TD>Specify which
-concurrency strategy to use.  Range of values is <code>reactive</code>
+<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
-<code>thread-per-connection</code> for creating a new thread to
-service each connection.</TD></TR> <TR>
-
-<TD><CODE>-ORBactiveobjectmapsize</CODE> <EM>active object map
-size</EM></TD> <TD>Specify the size of the active object map. If not
-specified, the default value is 64.</TD></TR> <TR>
+<code>thread-per-connection</code> for creating a new thread to service each connection.</TD></TR>
+<TR>
+<TD><CODE>-ORBtablesize</CODE> <EM>object table size</EM></TD>
+<TD>Specify the size of the object table. If not specified, the default value
+is 64.</TD></TR>
+<TR>
 
 <TD><CODE>-ORBuseridpolicydemuxstrategy</CODE> <EM>user id policy
 based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
 lookup strategy to be used with the user id policy.  The
-<EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE> or
-<CODE>linear</CODE>.  This option defaults to use the
-<CODE>dynamic</CODE> strategy. </TD></TR> <TR>
+<EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE>,
+<CODE>linear</CODE>, or <CODE>user</CODE>.  This option defaults to
+use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
 
 <TD><CODE>-ORBsystemidpolicydemuxstrategy</CODE> <EM>system id policy
 based demultiplexing strategy</EM></TD> <TD>Specify the demultiplexing
 lookup strategy to be used with the system id policy. The
 <EM>demultiplexing strategy</EM> can be one of <CODE>dynamic</CODE>,
-<CODE>linear</CODE>, or <CODE>active</CODE>. This option defaults to
-use the <CODE>active</CODE> strategy. </TD></TR> <TR>
+<CODE>linear</CODE>, <CODE>active</CODE>, or <CODE>user</CODE>. This
+option defaults to use the <CODE>active</CODE> strategy. </TD></TR>
+<TR>
 
 <TD><CODE>-ORBuniqueidpolicyreversedemuxstrategy</CODE> <EM>unique id
 policy based reverse demultiplexing strategy</EM></TD> <TD>Specify the
 reverse demultiplexing lookup strategy to be used with the unique id
 policy. The <EM>reverse demultiplexing strategy</EM> can be one of
-<CODE>dynamic</CODE> or <CODE>linear</CODE>. This option defaults to
-use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
-
-<TD><CODE>-ORBallowreactivationofsystemids</CODE> <EM>allows
-reactivation of system ids</EM></TD> <TD>Specify whether system ids
-can be reactivated, i.e., once an id that was generated by the system
-has be deactivated, will the user reactivate a new servant using the
-old id.  If the user is not going to use this feature, the IORs can be
-shortened, an extra comparison in the critical upcall path removed,
-and some memory on the server side can be saved. The
-<CODE>ORBallowreactivationofsystemids</CODE> can be <CODE>0</CODE> or
-<CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
-<TR>
-
-<TD><CODE>-ORBactivehintinids</CODE> <EM>adds an active hint in
-ids</EM></TD> <TD>Specify whether an active hint should be added to
-ids. With active hints, ids can be found quickly.  However, they lead
-to larger IORs. Note that this option is disregarded
-<CODE>-ORBallowreactivationofsystemids</CODE> is set to
-<CODE>0</CODE>. The <EM>-ORBactivehintinids</EM> can be <CODE>0</CODE>
-or <CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
-<TR>
-
-<TD><CODE>-ORBpoamapsize</CODE> <EM>poa map size</EM></TD> <TD>Specify
-the size of the poa map. If not specified, the default value is
-24.</TD></TR> <TR>
-
-<TD><CODE>-ORBpersiententidpolicydemuxstrategy</CODE> <EM>persistent
-id policy based demultiplexing strategy</EM></TD> <TD>Specify the
-demultiplexing lookup strategy to be used with the persistent id
-policy.  The <EM>demultiplexing strategy</EM> can be one of
-<CODE>dynamic</CODE> or <CODE>linear</CODE>.  This option defaults to
-use the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
-
-<TD><CODE>-ORBtransientidpolicydemuxstrategy</CODE> <EM>transient id
-policy based demultiplexing strategy</EM></TD> <TD>Specify the
-demultiplexing lookup strategy to be used with the transient id
-policy. The <EM>demultiplexing strategy</EM> can be one of
-<CODE>dynamic</CODE>, <CODE>linear</CODE>, or
-<CODE>active</CODE>. This option defaults to use the
-<CODE>active</CODE> strategy. </TD></TR> <TR>
-
-<TD><CODE>-ORBactivehintinpoanames</CODE> <EM>adds an active hint in
-poa names</EM></TD> <TD>Specify whether an active hint should be added
-to poa names. With active hints, poa names can be found quickly.
-However, they lead to larger IORs. The
-<EM>-ORBactivehintinpoanames</EM> can be <CODE>0</CODE> or
-<CODE>1</CODE>. This option defaults to <CODE>1</CODE>. </TD></TR>
-<TR>
+<CODE>dynamic</CODE> or <CODE>user</CODE>. This option defaults to use
+the <CODE>dynamic</CODE> strategy. </TD></TR> <TR>
 
 <TD><CODE>-ORBthreadflags</CODE> <EM>thread flags</EM></TD>
 <TD>Specify the flags used for thread creation. Flags can be any
@@ -399,6 +306,14 @@ used to guarantee exclusive acccess, and <code>null</code>, which
 specifies that no locking be performed.  The default is
 <code>thread</code>.</TD></TR> <TR>
 
+<TD><CODE>-ORBpoamgrlock</CODE> <EM>lock type</EM></TD> <TD><a
+name="-ORBpoamgrlock"></a>Specify the type of lock to be used for POA
+Manager accesses.  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>null</code>.</TD></TR>
+
 </TABLE>
 </P>
 </blockquote>
@@ -420,35 +335,10 @@ This makes sense in case of optiziations and is allowed when
 no forwarding is used or only a single threaded client.
 </TD></TR>
 <TR>
-<TD><CODE>-ORBclientconnectionhandler</CODE> <EM>MT / ST / RW</EM></TD>
-
-<TD><A name="-ORBclientconnectionhandler"></a>
-
-ST means use the single-threaded client connection handler, i.e., the
-leader follower model will not be used.  However, ST does support
-nested upcalls and handling of new requests while waiting for the
-reply from a server. <p>
-
-MT means use the multi-threaded client connection handler which uses
-the leader follower model. This model allows the use of multiple
-threads with a single Reactor.  <p>
-
-RW selects a strategy that simply blocks in recv() when waiting for a
-response from the server instead of waiting in the Reactor.  The RW
-strategy only works when the application does not have to worry about
-new request showing up when waiting for a response. Therefore, this
-strategy is appropriate only for "pure" clients. Note that
-applications with nested upcalls are not "pure" clients. Also note
-that this strategy will only effect two way calls, since there is no
-waiting for one way calls. This strategy can also be used in an
-application that is both a client and a server if the server side is
-handled by a separate thread and the client threads are "pure"
-clients. <p>
-
-Default for this option is MT.
-
-</TD></TR>
-
+<TD><CODE>-ORBclientconnectionhandler</CODE> <EM>MT / ST</EM></TD>
+<TD><A name="-ORBclientconnectionhandler"></a> ST means use the
+single-threaded client connection handler and MT means use the
+multi-threaded client connection handler .</TD></TR>
 </TABLE>
 </P>
 </BLOCKQUOTE>
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index b37fe57cc6e..41414080579 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -250,7 +250,7 @@ put in the current directory from where&nbsp;<tao_idl>is called.&nbsp;</td>
 <tr NAME="si">
 <td><tt>-si</tt></td>
 
-<td>Server inline skeleton file name ending. Default is "S.i".</td>
+<td>Server inline skeleton file name ending. Default is "S_i.cpp".</td>
 </tr>
 
 <tr NAME="st">
@@ -259,16 +259,6 @@ put in the current directory from where&nbsp;<tao_idl>is called.&nbsp;</td>
 <td>Server's template inline file name ending. Default is "S_T.i".</td>
 </tr>
 
-<tr NAME="t">
-<td><tt>-t</tt></td>
-
-<td>Temporary directory to be used by the IDL compiler. Default :
-    Resolve ACE_DEFAULT_TEMP_DIR_ENV. If it is not defined, choose
-    /tmp/.
-</td>
-</tr>
-
-
 <tr NAME="Gc">
 <td><tt>-Gc</tt></td>
 
diff --git a/TAO/docs/configurations.html b/TAO/docs/configurations.html
index 906c67cfb92..9a2fc06402a 100644
--- a/TAO/docs/configurations.html
+++ b/TAO/docs/configurations.html
@@ -1,38 +1,30 @@
-<!-- $Id$ -->
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-
 <html>
 <head>
    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    <meta name="GENERATOR" content="Mozilla/4.5 [en] (WinNT; I) [Netscape]">
    <title>Configuring TAO's Components</title>
+<!-- $Id$ -->
 </head>
-
 <body text="#000000" bgcolor="#FFFFFF" link="#000FFF" vlink="#FF0F0F">
 
 <hr>
+<center>
 <h3>
-Configuring TAO's Components</h3>
-
-<h3> Overview</h3>
-
-<p> As described in the <a href="Options.html">options</a>
-documentation, various components in TAO can be customized by
-specifying options for those components.  This document illustrates
-how to combine these options in order to affect ORB behavior and
-performance, particularly its <a
-href="http://www.cs.wustl.edu/~schmidt/CACM-arch.ps.gz">concurrency
-model</a>.  </p>
+Configuring TAO's Components</h3></center>
 
-<p> TAO configures itself using the <a
-href="http://www.cs.wustl.edu/~schmidt/O-Service-Configurator.ps.gz">ACE
+<h3>
+Overview</h3>
+As described in the <a href="Options.html">options</a> documentation, various
+components in TAO can be customized by specifying options for those components.
+This document illustrates how to combine these options in order to affect
+ORB behavior and performance, particularly its <a href="http://www.cs.wustl.edu/~schmidt/CACM-arch.ps.gz">concurrency
+model</a>.
+<p>TAO configures itself using the <a href="http://www.cs.wustl.edu/~schmidt/O-Service-Configurator.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>
-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>
-
+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> option).
+<br>
 <hr>
 <h3>
 Roadmap</h3>
@@ -91,9 +83,9 @@ Each configuration has the following information:</li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="70%" >
 <tr ALIGN=LEFT>
-<th>Typical Use</th>
+<th>Typical Use&nbsp;</th>
 
-<td>A brief description of the scenario and its typical use.</td>
+<td>A brief description of the scenario and its typical use.&nbsp;</td>
 </tr>
 
 <tr ALIGN=LEFT>
@@ -129,9 +121,6 @@ Each configuration has the following information:</li>
 </ul>
 
 <li>
-<b><a href="#programming">Programming considerations</a></b>
-
-<li>
 <b><a href="#homogenous">Configuration for homogenous systems</a></b></li>
 
 <ul>
@@ -152,8 +141,10 @@ Each configuration has the following information:</li>
 <li>
 <a NAME="concurrency"></a><b>Server concurrency strategy</b> specifies
 the concurrency strategy an ORB uses. It says nothing about how many ORBs
-(or, threads) are there in a process.</li><P>
+(or, threads) are there in a process.</li>
 
+<br>&nbsp;
+<p>&nbsp;
 <ul>
 <li>
 <tt>reactive</tt>: The ORB handles requests reactively, i.e., the ORB runs
@@ -161,6 +152,8 @@ in one thread and service multiple requests/connections simultaneously
 using "<tt>select</tt>" call. You can have multiple ORBs accepting requests
 reactively and running in separate threads.</li>
 
+<br>&nbsp;
+<p>&nbsp;
 <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.
@@ -168,11 +161,15 @@ The new threads inherits all properties from the ORB threads (see below.)</li>
 
 <li>
 <tt>thread-pool</tt> (not yet implemented): ... to be continued ...</li>
-</UL><P>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
 
 <li>
-<a NAME="orb"></a><b>ORB and other resources.</b></li><P>
+<a NAME="orb"></a><b>ORB and other resources.</b></li>
 
+<br>&nbsp;
+<p>&nbsp;
 <ul>
 <li>
 <tt>global</tt>: There's only one ORB process-wide. <tt>ORB_init () </tt>must
@@ -183,41 +180,52 @@ be called only once. Every thread accesses the same ORB.</li>
 for spawning the ORB threads and setting up the ORB by calling <tt>ORB_init
 ()</tt> for each ORB threads. Any ORB spawned thread (i.e., thru thread-per-connection)
 shares the same resource the spawning ORB uses.</li>
-</ul><P>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
 
 <li>
-<a NAME="poa"></a><b>POA.</b></li><P>
+<a NAME="poa"></a><b>POA.</b></li>
 
+<br>&nbsp;
+<p>&nbsp;
 <ul>
 <li>
 <tt>global</tt>: All ORBs share the same POA. The advantage of using a
 global POA is that once an object is registered to the POA under an ORB,
 it can be externalized from other ORB.</li>
 
+<br>&nbsp;
+<p>&nbsp;
 <li>
 per ORB (<tt>tss</tt>): Each ORB has its own POA, which means, the programmer
 should also instantiate the POA for each ORB (otherwise, a default RootPOA
 gets created, which might not be what you what and thus, is discouraged.)</li>
-</ul><P>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
 
 <li>
-<a NAME="coltbl"></a><b>Collocation Table:</b> Care must be
+<a NAME="coltbl"></a><b>Collocation Table:</b> <sup>*</sup>Care must be
 taken when using CORBA objects to control the ORB directly. For you are
 actually executing the collocated object, not in the object's ORB context,
-but in the calling ORB's context.</li><P>
+but in the calling ORB's context.</li>
 
+<br>&nbsp;
+<p>&nbsp;
 <ul>
 <li>
 <tt>global</tt>: Process keeps a global collocation table which contains
-tuples of listening endpoint and its corresponding RootPOA.</li><P>
+tuples of listening endpoint and its corresponding RootPOA.</li>
 
 <li>
 per ORB (<tt>tss</tt>): At this moment, since TAO only supports one listening
 endpoint per ORB, there is no per-ORB collocation Table. Checking of collocated
 objects is done by comparing object's IIOP profile and the calling ORB's
-listening endpoint.</li><P>
+listening endpoint.</li>
 
-</ul>
+<br>&nbsp;
+<p>&nbsp;</ul>
 
 <li>
 <a NAME="iiopprofile"></a><b>Forwarding IIOP Profile:</b> In the case of
@@ -231,43 +239,66 @@ to do this might be performance reasons in cases, where no forwarding is
 used or no multithreading with access to shared <tt>CORBA::Object</tt>'s.
 Deactivating forces the ORB to use a null mutex, which does introduce only
 a very small overhead, compared with overhead introduced by a regular mutex
-lock.</li><P>
+lock.</li>
 
 <li>
 <a NAME="orbsvcs"></a><b>orbsvcs Library:</b> By default, the TAO orbsvcs
 library contains all of the services that TAO currently supports. To reduce
 build time and library size, you can exclude unused services. To do that,
-define a <tt>TAO_ORBSVCS</tt> variable using one of these approaches:</li><P>
-
-  <ol>
-    <li>In your <tt>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</tt>
-      file,<p>
+define a <tt>TAO_ORBSVCS</tt> variable using one of these approaches:</li>
 
-    <li>On the make command line, <i>e.g.</i>,
-      <tt>make TAO_ORBSVCS=Event</tt>, or<p>
+<br>&nbsp;
+<p>&nbsp;
+<ol>
+<li>
+In your <tt>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</tt> file,</li>
 
-    <li>Set (and export) a <tt>TAO_ORBSVCS</tt> environment variable.
+<br>&nbsp;
+<p>&nbsp;
+<li>
+On the make command line, <i>e.g.</i>,</li>
 
-  </ol><p>
+<br>&nbsp;
+<p>&nbsp;
+<pre>
+<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; make TAO_ORBSVCS=Naming
+</tt></pre>
+or
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Set (and export) a <tt>TAO_ORBSVCS</tt> environment variable.</li>
 
-Please see the <code><a href="../orbsvcs/orbsvcs/Makefile">ORBSVCS
-Makefile</a></code> for the default setting of <code>TAO_ORBSVCS</code>.<p>
+<br>&nbsp;
+<p>&nbsp;</ol>
+Please see <tt><a href="../rules.tao.GNU">rules.tao.GNU</a></tt> for the
+default setting of <tt>TAO_ORBSVCS</tt>.
+<p>&nbsp;Please note the current limitations:
+<br>&nbsp;
+<br>&nbsp;
+<ol>
+<li>
+We currently don't check for interdependencies between services. For example,
+if you build the CosEvent service, you must also explicitly specify the
+Sched and Event services, at least.</li>
 
-Please note that the Naming Service will always be built, even
-if Naming is not specified in <code>TAO_ORBSVCS</code>.  That's
-because many examples, tests, and presumably applications use it.<p>
+<br>&nbsp;
+<p>&nbsp;
+<li>
+We currently don't check this macro in each of the orbsvcs Makefiles, or
+in their tests. We'll add those checks soon.</li>
 
+<br>&nbsp;
+<p>&nbsp;</ol>
 </ul>
 
 <hr>
 <h3>
-<a NAME="examples"></a>Configuration Examples</h3>
-
-The following are common ORB configurations used by TAO applications.<P>
+<a NAME="examples"></a>Configuration Example</h3>
 
 <ul>
 <li>
-<a NAME="reactive"></a>Single-threaded, reactive model.</li><P>
+<a NAME="reactive"></a>Single-threaded, reactive model.</li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr>
@@ -310,11 +341,12 @@ when the requests (1) take a fixed, relatively uniform amount of time and
 <br><tt>TAO_Server_Strategy_Factory</tt>: <tt>-ORBconcurrency reactive</tt></td>
 </tr>
 </table>
-<P>Check out the <tt><a
-href="../tests/Param_Test/">Param_Test</a></tt> for
-an example of this configuration. <P>
+Check out the <tt><a href="../tests/Param_Test/">Param_Test</a></tt>for
+an example of this configuration.
+<br>&nbsp;
+<br>&nbsp;
 <li>
-<a NAME="tpc"></a>Multiple threads, thread-per-connection model.</li> <P>
+<a NAME="tpc"></a>Multiple threads, thread-per-connection model.</li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
@@ -359,21 +391,23 @@ them. Other threads handle requests for established connections.</td>
 <br><tt>TAO_Server_Strategy_Factory</tt>: <tt>-ORBconcurrency thread-per-connection</tt></td>
 </tr>
 </table>
-<P>
 <tt><a href="../performance-tests/Cubit/TAO/IDL_Cubit/">IDL_Cubit</a></tt>
 is a good example on using <i>multiple threads, thread-per-connection</i>
-configuration.<P>
+configuration.
+<br>&nbsp;
+<br>&nbsp;
 <li>
-<P>Multiple threads, ORB-per-thread model.<a NAME="multiorb"></a></li><P>
+Multiple threads, ORB-per-thread model.<a NAME="multiorb"></a></li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
 <th>Typical Use</th>
 
-<td>In this configuration, there multiple ORBs per process each
-running in its own thread. Each thread handles requests
-reactively. It's good for hard real-time applications that require
-different thread priorities for the various ORBs.</td> </tr>
+<td>In this configuration, there multiple ORBs per process each running
+in its own thread. Each thread handles requests reactively. It's good for
+hard real-time applications that require different thread priorities for
+the various ORBs.</td>
+</tr>
 
 <tr ALIGN=LEFT>
 <th>Number of Threads</th>
@@ -406,10 +440,9 @@ different thread priorities for the various ORBs.</td> </tr>
 <br><tt>TAO_Server_Strategy_Factory</tt>: <tt>-ORBconcurrency reactive</tt></td>
 </tr>
 </table>
-<P>
 
 <li>
-Multiple threads, ORB-per-thread, thread-per-connection model.<a NAME="multiorb-tpc"></a></li><P>
+Multiple threads, ORB-per-thread, thread-per-connection model.<a NAME="multiorb-tpc"></a></li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
@@ -452,12 +485,13 @@ threads which service requests form establiched connections.</td>
 <br><tt>TAO_Server_Strategy_Factory</tt>: <tt>-ORBconcurrency thread-per-connection</tt></td>
 </tr>
 </table>
-<P>
 <tt><a href="../performance-tests/Cubit/TAO/MT_Cubit/">MT_Cubit</a></tt>
 is a good example on using <i>multiple threads, ORB-per-thread, and thread-per-connection</i>
-configuration.<P>
+configuration.
+<br>&nbsp;
+<br>&nbsp;
 <li>
-<a NAME="tpool"></a>Multiple threads, thread-pool model. (Not yet implemented.)</li><P>
+<a NAME="tpool"></a>Multiple threads, thread-pool model. (Not yet implemented.)</li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
@@ -493,9 +527,9 @@ movement between threads.</td>
 </tr>
 </table>
 
-<P><li>
+<li>
 Multiple threads, ORB-per-thread, thread-pool model.<a NAME="multiorb-tpool"></a>
-(Not yet implemented.)</li><P>
+(Not yet implemented.)</li>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0 WIDTH="90%" >
 <tr ALIGN=LEFT>
@@ -532,99 +566,9 @@ Multiple threads, ORB-per-thread, thread-pool model.<a NAME="multiorb-tpool"></a
 
 <hr>
 <h3>
-Programming Considerations<a NAME="programming"></a></h3>
-
-  There are several ways to pass option flags into TAO's
-  components. <P>
-
-<ul>
-
-  <li><p>The plain vanilla approach is do nothing.  All TAO components
-      use their default settings as described in <a
-      href="Options.html">this document</a>.</p>
-
-  <li><p>The most common use case is to use a file called
-      <code>svc.conf</code>.  On most platforms, TAO programs
-      automatically search and read in the file.  The disadvantage of
-      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
-      a config file that is not called <code>svc.conf</code>.
-      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
-      setting up or knowing about <code>svc.conf</code> files, you can
-      call <code>TAO_Internal::default_svc_conf_entries()</code>
-      before calling the first <code>ORB_init()</code> in your program
-      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>
-      option to tune the program.<P>
-
-  <li><p>TAO programs evaluate the configuration settings in the following
-      order,</p>
-
-      <ul>
-        <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.
-        <li>Default entries set by
-            <code>TAO_Internal::default_svc_conf_entries()</code>, if
-            ones exist.
-        <li>Default configuration as specified in <a
-            href="Options.html">this document</a>.
-      </ul>
-
-      <p>Notice that the first encountered component settings are
-      always the ones take effect.  For example, if you set the entries
-      for <code>Resource_Factory</code> and
-      <code>Server_Strategy_Factory</code> using
-      <code>TAO_Internal::default_svc_conf_entries()</code> in a
-      program and you also have a file called <code>svc.conf</code>
-      which has an entry for <code>Resource_Factory</code>.  This
-      program will use the entry for <code>Resource_Factory</code> in
-      the <code>svc.conf</code> file, the entry for
-      <code>Server_Strategy_Factory</code> set in the program, and the
-      in-stock <code>Client_Strategy_Factory</code> that TAO defines.
-
-  <li><p>Some platforms do not support reading of <code>svc.conf</code>
-      files or you would rather not to use the feature.  In this case,
-      you must define <code>TAO_PLATFORM_SVC_CONF_FILE_NOTSUP</code>
-      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
-      the program behavior temporarily.</p>
-
-      <p>On these platform, you can alter the default settings for
-      TAO components by defining the following macros in your
-      <code>config.h</code> file:</p>
-
-      <ul>
-        <li><code>TAO_DEFAULT_RESOURCE_FACTORY_ARGS</code>
-        <li><code>TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS</code>
-        <li><code>TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS</code>
-      </ul>
-
-      <p>The ACE Makefiles <code>fakesvcconf</code> flag can be
-      used to define <code>TAO_PLATFORM_SVC_CONF_FILE_NOTSUP</code>.
-      To define that macro, just add <code>fakesvcconf=1</code> to
-      your <code>make</code> invocation.
-
-      <p>See <a href="../tao/orbconf.h"><code>orbconf.h</code></a> for
-      an example.
-</ul>
-
-<hr>
-<h3>
 Configuration for homogenous systems<a NAME="homogenous"></a></h3>
 
-<ul>
-<LI><b>Compile-time options</b><a NAME="homogenous_compile"></a>
+<ul><b>Compile time options</b><a NAME="homogenous_compile"></a>
 <p>Many real-time applications run on homogenous environments, TAO (and
 ACE) can take advantage of this fact by simplifying the server side demarshaling;
 to enable this feature you have to edit the <tt>$ACE_ROOT/ace/OS.h</tt>
@@ -639,11 +583,9 @@ options for TAO, the macros <tt>TAO_DEFAULT_RESOURCE_FACTORY_ARGS</tt>,
 can be used for those purposes. If the footprint size is an issue users
 may consider writing custom strategy factories that only create the right
 strategies, this eliminates the parsing code for the different options.
-
-<p>
-<LI><b>Run-time options</b><a NAME="homogenous_runtime"></a>
+<p><b>Runtime 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>-ORBiioplite</tt> can be used to reduce the message size
 and the processing time.
 <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
@@ -652,15 +594,14 @@ don't need to do any name resolution. The compile-time define <tt>TAO_USES_DOTTE
 in <tt>$TAO_ROOT/tao/orbconf.h</tt> to make this the default behavior.</ul>
 
 <hr>
-<h3>Hints</h3>
-
+<center>
+<h3>
+Hints</h3></center>
 Choosing the right configuration is hard and, of course, depends on your
 application. In the following section we will attempt to describe some
 motivations for features in TAO, hopefully that can guide you through the
 choice of your configuration options.
-<ul>
-
-<LI><b>ORB-per-thread</b> The main motivation behind this options is to
+<ul><b>ORB-per-thread</b> The main motivation behind this options is to
 minimize priority invertion, since threads share no ORB resources no locking
 is required and thus, priority is preserved in most cases (assuming proper
 support from the OS). If you are not too concerned about priority inversion
@@ -677,44 +618,40 @@ policy for the dynamic servants and the root poa (with no locking) for
 the majority of the servants.
 <p>As the reader will note this is a delicate configuration option, the
 rule of thumb should be <b>not</b> to use ORB-per-thread unless it is really
-required. <P>
-
+required.
+<li>
+<b>Collocation tables</b> Why could the application what a non-global collocation
+table? If objects are to serve requests only at a well known priority the
+application can be configured with the ORB-per-thread option, and the object
+is activated only in the thread (ORB) corresponding to the desired priority.
+But using a global table would subert the priority assignment (because
+calls would run at the priority of the client).</li>
+
+<li>
+<b>Single-threaded vs. Multi-threaded Connection Handlers</b> The <tt>Client_Connection_Handler</tt>
+is the component in TAO that writes the requests to the underlying transport
+socket; this is also the component that reads the response back from the
+server.</li>
+
+<p><br>While waiting for this response new requests to the local ORB can
+arrive, this is the so-called nested upcall support. TAO supports two mechanisms
+for handling nested upcalls, the default uses the leader-follower model
+to allow multiple threads to wait on a single 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 controled by the <tt>-ORBclientconnectionhandler</tt>
+option, good opportunities to use this option are:
+<ul>
 <li>
-
-<b>Collocation tables</b> Why could the application what a non-global
-collocation table? If objects are to serve requests only at a well
-known priority the application can be configured with the
-ORB-per-thread option, and the object is activated only in the thread
-(ORB) corresponding to the desired priority.  But using a global table
-would subert the priority assignment (because calls would run at the
-priority of the client).</li><P>
-
-<li> <b>Single-threaded vs. Multi-threaded Connection Handlers</b> The
-<tt>Client_Connection_Handler</tt> is the component in TAO that writes
-the requests to the underlying transport socket; this is also the
-component that reads the response back from the server.</li>
-
-<p>
-
-While waiting for this response new requests to the local ORB can
-arrive, this is the so-called nested upcall support. TAO supports two
-mechanisms for handling nested upcalls, the default uses the
-leader-follower model to allow multiple threads to wait on a single
-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 controled by the <tt>-ORBclientconnectionhandler</tt>
-option, good opportunities to use this option are:<P>
-
- <ul> <li> Single
-threaded servers</li>
+Single threaded servers</li>
 
 <li>
 Servers running in ORB-per-thread mode</li>
 
 <li>
 Pure clients that will never receive a request</li>
-</ul><P>
+</ul>
 
 <li>
 <b>Allocator for input CDR streams</b> Normally the application has no
@@ -723,23 +660,22 @@ access to this buffer, and it is only used on the demarshaling of arguments
 tss</tt>" option since it will allocate memory from a thread specific allocator
 and it will not need locks to manage that memory.</li>
 
-<p>In some cases the user <i>may</i> gain access to the CDR stream
+<p><br>In some cases the user <i>may</i> gain access to the CDR stream
 buffer: TAO makes no copies when demarshaling octet sequences, instead
-the octet sequence simply points to the CDR buffer, since the octet
-sequence does not own this buffer a copy must be made if the user
-wants to keep the buffer after the upcall.
-
-<p>The user can, however, increase the reference count on the CDR
-stream buffer, thus allowing her to extend the lifetime of this
-buffer. Still passing this buffer to another thread and attempting to
-release it in that thread will result in some memory leak or
-corruption. Users willing to use this feature of TAO can still do so,
-<b>if</b> they use a global allocator for their input CDR stream, but
-that will introduce extra locking on the critical path.  <p>As the
-reader can see this is an option that has limited applicability and
-requires careful consideration of the tradeoffs involved.</ul>
+the octet sequence simply points to the CDR buffer, since the octet sequence
+does not own this buffer a copy must be made if the user wants to keep
+the buffer after the upcall.
+<p>The user can, however, increase the reference count on the CDR stream
+buffer, thus allowing her to extend the lifetime of this buffer. Still
+passing this buffer to another thread and attempting to release it in that
+thread will result in some memory leak or corruption. Users willing to
+use this feature of TAO can still do so, <b>if</b> they use a global allocator
+for their input CDR stream, but that will introduce extra locking on the
+critical path.
+<p>As the reader can see this is an option that has limited applicability
+and requires careful consideration of the tradeoffs involved.</ul>
 
 <hr>
-<p>Back to the TAO <a href="components.html">components documentation</a>.<!--#include virtual="/~schmidt/cgi-sig.html" -->
+<p>Back to the TAO <a href="components.html">components documentation</a>.&nbsp;<!--#include virtual="/~schmidt/cgi-sig.html" -->
 </body>
 </html>
diff --git a/TAO/docs/index.html b/TAO/docs/index.html
index ded8b72b715..e4f650ca8e8 100644
--- a/TAO/docs/index.html
+++ b/TAO/docs/index.html
@@ -18,7 +18,6 @@
       <dt><a HREF="http://www.cs.wustl.edu/~schmidt/corba-research-realtime.html">Technical
         Overview</a> </dt><P>
       <dt><a HREF="http://www.omg.org/library/c2indx.html">OMG CORBA 2.x spec</a> </dt><P>
-      <dt><p><a href="../../docs/exceptions.html">Exception Handling</a></p>
       <dt><a HREF="http://www.cs.wustl.edu/~schmidt/events_tutorial.html">Event Service Tutorial</a></dt><P>
       <dt><a HREF="http://www.cs.wustl.edu/~schmidt/TAO/index.html">TAO Viewgraphs</a></dt><P>
       <dt><a HREF="releasenotes/index.html">Release Notes</a> </dt><P>
@@ -29,9 +28,8 @@
       <dt><a HREF="components.html">ORB Configuration Options</a> </dt><P>
       <dt><a HREF="compiler.html">TAO IDL Compiler Options</a> </dt><P>
       <dt><a HREF="orbsvcs.html">ORB Services Directories</a> </dt><P>
-      <dt><a HREF="INS.html">Interoperable Naming Service</a> </dt><P>
+      <dt><a HREF="poa_migration.html">POA Migration Notes</a> </dt><P>
       <dt><a HREF="implrepo/">Implementation Repository</a> </dt><P>
-      <dt><a HREF="minimumTAO.html">Minimum TAO</a> </dt><P>
     </dl>
     </td></font>
   </tr>
diff --git a/TAO/docs/minimumTAO.html b/TAO/docs/minimumTAO.html
deleted file mode 100644
index 3db1cd0779c..00000000000
--- a/TAO/docs/minimumTAO.html
+++ /dev/null
@@ -1,243 +0,0 @@
-<title> Minimum TAO </title>
-
-<body text = "#000000"
-      link="#000fff"
-      vlink="#ff0f0f"
-      bgcolor="#ffffff">
-
-<hr>
-<p>
-
-<b> Minimum TAO </b>
-<p>
-
-We have added support for the new <a href =
-"http://www.omg.org/cgi-bin/doc?orbos/98-08-04.pdf"> <em> minimumCORBA
-</em> </a> specification to <a href =
-"http://www.cs.wustl.edu/~schmidt/TAO.html"> TAO</a>.  The <em>
-minimumCORBA </em> specification removes the following features from
-the CORBA <a href = "http://www.omg.org/library/c2indx.html"> 2.2 </a>
-specification.
-
-<ul>
-
-<li> Dynamic Skeleton Interface <br>
-<li> Dynamic Invocation Interface <br>
-<li> Dynamic Any <br>
-<li> Interceptors <br>
-<li> Interface Repository <br>
-<li> Advanced POA features <br>
-<li> CORBA/COM interworking <br>
-
-</ul>
-<p>
-
-To minimize the footprint of TAO, we first <a href =
-"../../ACE-INSTALL.html"> configure </a> ACE to support only those <a
-href = "../../docs/ACE-subsets.html"> components </a> that are
-required by TAO. Secondly, we <a href = "../TAO-INSTALL.html">
-configure </a> TAO to only support the components specified by the
-<em> minimumCORBA </em> specification.  The following two tables show
-the footprint reduction achieved.  Note that the IDL Compiler column
-refers to the code required to collaborate between the IDL compiler
-and the ORB, and not to the code for the IDL compiler itself.
-
-<p>
-<hr>
-<p>
-
-<I> Note: All measurement are for ACE 4.6.29 and TAO 0.3.13 using
-egcs-2.91.60 on SunOS5.7 <br>
-
-Make options used were:
-
-<code> debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0 </code> <br>
-
-The above make options translate into:
-
-(a) No debugging,
-(b) Optimization is set to -O2,
-(c) Static ACE and TAO libraries, and
-(d) Use of RCS Ids is turned off. <br>
-
-<p> </I>
-
-<p>
-<hr>
-<p>
-
-<center><table cellpadding=4 border=4>
-  <tr>
-    <th>Configuration
-    <th>Component
-    <th>Total
-    <th>OS
-    <th>Utils
-    <th>Logging
-    <th>Threads
-    <th>Demux
-    <th>Connection
-    <th>Sockets
-    <th>IPC
-    <th>Svcconf
-    <th>Streams
-    <th>Memory
-    <th>Token
-    <th>Other
-  <tr>
-    <th rowspan=2>ACE (all components)
-    <th>Size, Kbytes
-    <td align=center>577.6
-    <td align=center>11.5
-    <td align=center>116.2
-    <td align=center>14.0
-    <td align=center>60.0
-    <td align=center>40.0
-    <td align=center>0.7
-    <td align=center>13.7
-    <td align=center>40.2
-    <td align=center>101.5
-    <td align=center>19.4
-    <td align=center>20.9
-    <td align=center>75.5
-    <td align=center>64.5
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>2
-    <td align=center>20
-    <td align=center>2
-    <td align=center>10
-    <td align=center>7
-    <td align=center>0
-    <td align=center>2
-    <td align=center>7
-    <td align=center>18
-    <td align=center>3
-    <td align=center>4
-    <td align=center>13
-    <td align=center>11
-  <tr>
-    <th rowspan=2>ACE (TAO components)
-    <th>Size, Kbytes
-    <td align=center>437.4
-    <td align=center>11.5
-    <td align=center>116.2
-    <td align=center>14.0
-    <td align=center>60.0
-    <td align=center>40.0
-    <td align=center>0.7
-    <td align=center>13.7
-    <td align=center>40.2
-    <td align=center>101.5
-    <td align=center>19.4
-    <td align=center>20.9
-    <td align=center>0.0
-    <td align=center>0.0
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>3
-    <td align=center>27
-    <td align=center>3
-    <td align=center>14
-    <td align=center>9
-    <td align=center>0
-    <td align=center>3
-    <td align=center>9
-    <td align=center>23
-    <td align=center>4
-    <td align=center>5
-    <td align=center>0
-    <td align=center>0
-  <tr>
-    <th>Reduction
-    <th>%
-    <td align=center>24.3
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>100
-    <td align=center>100
-</table></center><p>
-
-<hr>
-
-<p>
-
-<center><table cellpadding=4 border=4>
-  <tr>
-    <th>Configuration
-    <th>Component
-    <th>Total
-    <th>POA
-    <th>Pluggable Protocols
-    <th>Default Resources
-    <th>Interpretive Marshaling
-    <th>IDL Compiler
-    <th>ORB Core
-    <th>Dynamic Any
-  <tr>
-    <th rowspan=2>Complete TAO
-    <th>Size, bytes
-    <td align=center>862.0
-    <td align=center>281.9
-    <td align=center>14.6
-    <td align=center>7.9
-    <td align=center>68.7
-    <td align=center>10.5
-    <td align=center>347.1
-    <td align=center>131.3
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>33
-    <td align=center>2
-    <td align=center>1
-    <td align=center>8
-    <td align=center>1
-    <td align=center>40
-    <td align=center>15
-  <tr>
-    <th rowspan=2>Minimum  TAO
-    <th>Size, bytes
-    <td align=center>639.5
-    <td align=center>207.2
-    <td align=center>14.6
-    <td align=center>7.9
-    <td align=center>68.7
-    <td align=center>10.5
-    <td align=center>330.3
-    <td align=center>0.0
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>32
-    <td align=center>2
-    <td align=center>1
-    <td align=center>11
-    <td align=center>2
-    <td align=center>52
-    <td align=center>0
-  <tr>
-    <th>Reduction
-    <th>%
-    <td align=center>25.8
-    <td align=center>26.5
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>0
-    <td align=center>48
-    <td align=center>100
-</table></center><p>
-
-<p>
diff --git a/TAO/docs/orbsvcs.html b/TAO/docs/orbsvcs.html
index d8a02aac033..12e0a8a990f 100644
--- a/TAO/docs/orbsvcs.html
+++ b/TAO/docs/orbsvcs.html
@@ -122,7 +122,7 @@ bgcolor="#ffffff">
       starts server executables, and it doesn't make sense to collocate
       it in another server. Because of this, only the IDL files are
       located in <CODE>$TAO_ROOT/orbsvcs/orbsvcs</CODE>. The other
-      files are all located in
+      files are all located in 
       <CODE>$TAO_ROOT/orbsvcs/ImplRepo_Service</code>.</P>
 
     <P>Finally the tests and example programs are located in
@@ -214,7 +214,7 @@ bgcolor="#ffffff">
 	  locate a factory.</TD></TR>
       <TR>
 	<TD><CODE>Naming</CODE></TD>
-	<TD>This is an obsolete directory.</TD></TR>
+	<TD>An advanced test of the Naming Service.</TD></TR>
       <TR>
 	<TD><CODE>Property</CODE></TD>
 	<TD>Testing for the Property Service.</TD></TR>
@@ -223,7 +223,7 @@ bgcolor="#ffffff">
 	<TD>A test of the Scheduling Service.</TD></TR>
       <TR>
 	<TD><CODE>Simple_Naming</CODE></TD>
-	<TD>A number of Naming Service tests: from very simple to more fancy.</TD></TR>
+	<TD>A very simple Naming Service test.</TD></TR>
       <TR>
 	<TD><CODE>Simulator</CODE></TD>
 	<TD>Prototype implementation of DOVE (DOVE Agent, DOVE
diff --git a/TAO/docs/poa_migration.html b/TAO/docs/poa_migration.html
index 9c925e511f2..5623a283698 100644
--- a/TAO/docs/poa_migration.html
+++ b/TAO/docs/poa_migration.html
@@ -10,194 +10,53 @@ vlink="#cc0000"
 bgcolor="#ffffff">
 
 <HR><P>
-<H3>Migrating CORBA Applications from BOA to POA</H3>
-
-Starting with the CORBA 2.2, the Basic Object Adapter (BOA) has been
-deprecated in favor of the <A
-HREF="http://www.cs.wustl.edu/~schmidt/POA.ps.gz">Portable Object
-Adapter</A> (POA).  This document explains the changes required to
-migrate CORBA applications based on the BOA to use TAO's POA
-implementation, which is the only Object Adapter supported by TAO.
-For more information on the benefits of the POA please see the <A
-HREF="http://www.cs.wustl.edu/~schmidt/report-doc.html">Object
-Interconnection</A> columns written by <A
-HREF="http://www.cs.wustl.edu/~schmidt/">Doug Schmidt</A> and <A
-HREF="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a>.
-
-<h3>Contents</h3>
-<ul>
-  <li><a href="#Client-side Changes">Client-side Changes</a>
-  <li><a href="#Server-side Changes">Server-side Changes</a>
-  <li><a href="#Reference counting Servants">Reference counting Servants</a>
-</ul>
-
-<H4><a name="Client-side Changes">Client-side Changes</a></h4>
+<H3>Migrating from BOA to POA</H3>
 
+<UL>
+<LI><EM><B>Client side</b></EM><P>
 <ul>
-<li>Very little has changed.  Thus, many applications require to changes.</li><P>
+<li>Very little has changed, and some have not needed any changes.</li><P>
 <li>You'll have to insure that the Makefile includes .o's for both the server
-and client, which is necessary in TAO to support collocation.</li> <P>
+and client; this is necessary to support collocation.</li> <P>
 </ul>
 
-<h4><a name="Server-side Changes">Server-side Changes</a></h4>
-
+<LI><EM><B>Server side</B></EM><P>
 <UL>
-<li><CODE>POA_init</CODE> is replaced with <CODE>resolve_initial_references("RootPOA")</CODE> followed
-by a <CODE>_narrow</CODE> operation.</li><P>
-
-<li>The implementation no longer inherits from the client-side stub.
-Instead, they inherit from <CODE>PortableServer::ServantBase</CODE>.
-The implications of this are (a) if you want a object reference for
-that, you must use the <CODE>_this</CODE> method.</li><P>
-
-<li>Object ID's are assigned by the POA unless you activate the
-servant with a specific ID.  <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/performance-tests/Cubit/TAO/IDL_Cubit">IDL_Cubit</A>
-has examples on how to do this.</li><P>
-
-<li>Unlike the BOA, the POA explicitly addresses the temporal nature
-of servants and declares that a POA can service either transient or
-persistent servants (not both).  The root POA's (mandated,
-unchangeable) policy is "transient".  The implications of this are
-that in order for a client to be able to manufacture an object
-reference on its own and use that to access an object, the servant for
-that object must be registered with a POA whose policy is
-"persistent".  Thus, you must create a child POA with that policy and
-register the servant with that POA.  NOTE: when the POA declares
-something as "persistent", it is only stating that the key is valid
-between different runs of the server; it makes no claims that state or
-anything else is persistent.</li><P>
+<li>POA_init() is replaced with resolve_initial_references("RootPOA") followed
+by a _narrow operation.</li><P>
+<li>The implementation no longer inherits from the client-side stub; they
+inherit from PortableServer::ServantBase.  The implications of this are (a) if
+you want a object reference for that, you must use the _this() method.</li><P>
+<li>Object ID's are assigned by the POA unless you activate the servant with a
+specific ID; IDL_Cubit has examples on how to do this.</li><P>
+<li>Unlike the BOA, the POA explicitly addresses the temporal nature of servants
+and declares that a POA can service either transient or persistent servants
+(not both).  The root POA's (mandated, unchangeable) policy is "transient". 
+The implications of this are that in order for a client to be able to
+manufacture an object reference on its own and use that to access an object,
+the servant for that object must be registered with a POA whose policy is
+"persistent".  Thus, you must create a child POA with that policy and register
+the servant with that POA.  NOTE: when the POA declares something as
+"persistent", it is only stating that the key is valid between different runs
+of the server; it makes no claims that state or anything else is persistent.</li><P>
 
 <ul>
-	<li> Servants are not automatically activated, hence you must register
-	them by calling some of the <CODE>activate_object*</CODE> methods on a POA or
-	calling <CODE>_this</CODE> on the servant; with the latest you have no control on
-	the ObjectId (which sometimes is good), and the POA must support the
+	<li> Servants are not automatically activated, hence you must register 
+	them by calling some of the activate_object* methods on a POA or 
+	calling _this() on the servant; with the latest you have no control on 
+	the ObjectId (which sometimes is good), and the POA must support the 
 	right policies (the RootPOA does).</li><P>
-
-	<li>Servant constructors use to take a <CODE>const
-char*</CODE> parameter to set
-	they object id, this is not needed now, in fact in many cases they use
-	to pass this argument to the skeleton class: this will fail
-now.</li><P> </ul> This list is not intended to be exhaustive, but
-should give you a good starting point.  If you find things along the
-way that change your applications and I didn't note them, please send
-them to me.  Perhaps we can work together on the ultimate migration
-document. <P> </UL>
-
-<h4><a name="Reference counting Servants">Reference counting Servants</h4>
-
-The new POA/servant <a
-href="ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf">reference
-counting rules</a> of the CORBA 2.3 spec are somewhat tricky. Here are
-two main reasons why: <p>
-
-<ul>
-
-<li> If a servant is deleted without deactivating from the POA, the
-application will crash because the POA will try to access the still
-registered (but now non-existent) servant when the POA is destroyed. <p>
-
-The solution to this is to make sure that the servant is deleted after
-the POA is deleted or make sure that the servant is deactivated from
-the POA before the servant is deleted. </li> <p>
-
-<li> You cannot delete a servant which is the target of the current
-upcall/request.  A good example of this is the typical destroy()
-method, usually written like this:
-
-<PRE>
-
-class TAO_Export TAO_Thread_Policy : public POA_PortableServer::ThreadPolicy
-{
-  void destroy (CORBA_Environment &ACE_TRY_ENV);
-};
-
-void
-TAO_Thread_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Commit suicide: must have been dynamically allocated.
-  delete this;
-}
-
-</PRE>
-
-The correct implementation is:
-
-<PRE>
-
-class TAO_Export TAO_Thread_Policy : public virtual PortableServer::RefCountServantBase,
-                                     public virtual POA_PortableServer::ThreadPolicy
-{
-  void destroy (CORBA_Environment &ACE_TRY_ENV);
-};
-
-void
-TAO_Thread_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-</PRE>
-
-One additional step required is to make the POA responsible for the
-servant after it has been registered with the POA:
-
-<PRE>
-
-  // Register with the POA.
-  PortableServer::ThreadPolicy_var result = new_thread_policy->_this (ACE_TRY_ENV);
-
-  // Give ownership of this servant to the POA.
-  new_thread_policy->_remove_ref (ACE_TRY_ENV);
-
-</PRE>
-
-If you use the above approach of multiple inheritance, you must add
-the following to your header file:
-
-<PRE>
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-</PRE>
-
-To see the above example in detail, checkout <A
-HREF="../examples/POA/Reference_Counted_Servant">TAO/examples/POA/Reference_Counted_Servant</A>
-and/or <A HREF="../tao/POA.cpp">POA.cpp</A> and <A
-HREF="../tao/POA.h">POA.h</A>. </li> <p>
-
+    
+	<li>Servant constructors use to take a <const char*> parameter to set 
+	they object id, this is not needed now, in fact in many cases they use 
+	to pass this argument to the skeleton class: this will fail now.</li><P>
 </ul>
+This list is not intended to be exhaustive, but should give you a good
+starting point.  If you find things along the way which have to change and I
+didn't note them, please send them to me.  Perhaps we can work together on the
+ultimate migration document. <P>
+</UL>
+</UL>
 
 <hr><P>
 
@@ -206,5 +65,5 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/index.html">TAO
 documentation</A> page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY>
+</BODY> 
 </html>
diff --git a/TAO/docs/releasenotes/OBV.html b/TAO/docs/releasenotes/OBV.html
deleted file mode 100644
index b0d729c4179..00000000000
--- a/TAO/docs/releasenotes/OBV.html
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<body text="#000000" bgcolor="#FFFFFF">
-
-    <head>
-      <title>Object-by-Value status</title>
-      <!-- $Id$ -->
-    </head>
-
-    <body>
-      <center>
-        <h1><a name="orb"></a>Objects-by-Value</h1>
-        Point of contact: <a href="mailto: coryan@cs.wustl.edu">Carlos O'Ryan</a>
-
-        <p>Last Update: $Date$</p>
-      </center>
-
-      <p>Objects-by-Value (OBV) describes the new type, <CODE>valuetype</CODE>.
-        It is introduced in CORBA 2.3
-        <br>(Core:
-        <a href="http://www.omg.org/docs/ptc/98-12-04.pdf">ptc/98-12-04.pdf
-        </a> Mapping to C++:
-        <a href="http://www.omg.org/docs/ptc/98-09-03.pdf">ptc/98-09-03.pdf</a>).
-        This first implementation was contributed from
-        <a href="mailto: kuepper2@uni-wuppertal.de">Torsten Kuepper</a>.
-      <CODDE>Valuetype</CODE>s are similar to IDL <CODE>struct</CODE>s extended with 
-        these features:
-      <ul>
-        <li><p>Encapsulate state and operations with local implementation.</p>
-        </li>
-
-        <li><p>Single inheritance from a <CODE>valuetype</CODE> and
-            multiple inheritance from abstract
-            <CODE>valuetype</CODE>s. Eventually support of an
-            interface.</p> 
-        </li>
-        <li><p>References to other <CODE>valuetype</CODE>s, with the
-            possibility of NULL references or shared (aliased) references.</p>
-        </li>
-      </ul>
-
-      <p><CODE>Valuetype</CODE>s will likely be used to implement
-      abstract datatypes (ADT)s that can be copied to another process.
-      All processes that use the <CODE>valuetype</CODE> must have an
-      implementation for it since CORBA does not support code
-      migration, a la Java RMI.</p> 
-
-      <a name="current"><h3>Current status:</h3></a>
-
-      <ul>
-        <li><p>The IDL compiler understands <CODE>valuetype</CODE>, if
-            it was compiled with <CODE>IDL_HAS_VALUETYPE</CODE>
-            defined. New options of TAO's IDL are: <P>
-            <UL>
-            <LI>-Gv Enable OBV support
-            <LI>-Sv Disable OBV support (default)
-            <LI>-Wb,obv_opt_accessor Make accessor and modifier functions inline.
-            Overriding them is not allowed in this mode.
-            </UL>
-          <p><CODE>libTAO</CODE> must be compiled with <CODE>TAO_HAS_VALUETYPE</CODE>.</p>
-        </li>
-        <li><p><CODE>Valuetype</CODE>s can be used as arguments in CORBA invocations.
-            There is an example in
-            <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/examples/OBV/Typed_Events">$TAO_ROOT/TAO/examples/OBV/Typed_Events</A>.
-            <CODE>Valuetype</CODE>s could even reference other
-            <CODE>valuetype</CODE> objects (but without sharing).
-          </p>
-        </li>
-      </ul>
-
-      <a name="issues"><h3>Known issues:</h3></a>
-
-      <ul>
-        <li><p>No support for <code>TypeCodes</code> of
-            <code>valuetype</code> objects
-          </p>
-        </li>
-
-        <li><p><CODE>Valuetype</CODE>s work only in conjunction with
-            compiled marshalling (<CODE>-Gc</CODE>, currently default for
-            <CODE>tao_idl</CODE>). 
-          </p>
-        </li>
-
-        <li><p>No support for <code>TypeCodes</code> of
-            <code>valuetype</code> objects. Hence moving it into an
-            <code>any</code> is not possible yet.
-          </p>
-        </li>
-
-        <li><p><CODE>Valuetype</CODE>s can not be contained in other types like
-            <CODE>struct</CODE>, <CODE>union</CODE>,
-            <CODE>sequence</CODE> or <CODE>array</CODE>. 
-          </p>
-        </li>
-
-        <li><p>No support for sharing (aliasing).
-          </p>
-        </li>
-
-        <li><p>Forward and typedef'd declaration does not work.</p>
-        </li>
-
-        <li><p>Inheritance (support) from an ordinary interface
-            not implemented.</p>
-        </li>
-
-        <li><p>No support for abstract interfaces.
-          </p>
-        </li>
-
-        <li><p>No support for <CODE>valuebox</CODE>es
-          </p>
-        </li>
-
-        <li><p>No support for fragmentation (chunking) of the marshalled
-            <CODE>valuetype</CODE> object. Hence no support for truncation or
-            custom marshalling.</p>
-        </li>
-
-        <li><p>The marshal engine accesses the state members directly and
-            does not utilize the accessor/modifier functions. This not
-            like in the CORBA specs and needs a change. But the
-            optimized mode  (<CODE>-Wb,obv_opt_accessor</CODE>) should be
-            unaffected of that.
-          </p>
-        </li>
-
-        <li><p>Obtaining a repository id of a <CODE>valuetype</CODE>
-            is currently non-standard. Hashed repository ids are not
-            implemented. 
-          </p>
-        </li>
-
-        <li><p>The map of <CODE>valuetype</CODE> factories needs some
-            revision to provide proper locking. Currently the
-            registration of factories is best completed before
-            unmarshalling <CODE>valuetype</CODE>s.
-            There is one map of factories for the whole process. This
-            will once be changed to conform to the specs, which
-            suggests one per ORB.
-          </p>
-        </li>
-      </ul>
-
-      <P><HR><P>
-      <a href="#toc">Back to TOC</a>
-    </body>
-</html>
diff --git a/TAO/docs/releasenotes/TODO.html b/TAO/docs/releasenotes/TODO.html
index f74be91a90c..a1e08195c42 100644
--- a/TAO/docs/releasenotes/TODO.html
+++ b/TAO/docs/releasenotes/TODO.html
@@ -38,6 +38,12 @@
 	</P>
       </LI>
 
+      <LI><P>Add support for multiple Profiles in the ORB (completing
+          the IIOP 1.0 support)
+          <BR>[ASSIGNED TO:] Fred
+        </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.
@@ -45,73 +51,59 @@
         </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><B>EC:</B> The current architecture of the real-time
+          Event Channel does not support some features, such as:
+	  <UL>
+	    <LI><P><B>EC:</B> Some applications are both suppliers and
+                consumers of events,
+                they may be interested in all the
+                events of type <B>T</B> unless the event is generated
+		by them.
+            </LI>
+            <LI><P><B>EC:</B> Can we factor out the scheduling service from
+                the EC?
+              </P>
+            </LI>
 
-      <LI><P>Implement the Interoperable Naming Service spec,
-	  specially the new standard features to bootstrap the initial 
-	  object references in the ORB.
-          <BR>[ASSIGNED TO:] Vishal
-	  <BR>[STATUS] He is making good progress, near completion by
-	  now.
-        </P>
-      </LI>
+            <LI><P><B>EC:</B> The reactive event channel can eliminate
+                data copies because the data does not need to survive
+		after the <CODE>push()</CODE> call.
+              </P>
+            </LI>
 
-      <LI><P>Improve the connection recycling strategies, for
-	  instance,
-	  several strategies are possible: limit the maximum number of
-	  open sockets, probably with both HWM and LWM bounds,
-	  with different policies to choose the socket to close (LFU,
-	  MRU?);
-	  or maybe be more aggresive and recycle a socket once
-	  all the object references pointing to a server are closed.
-	  The later approach could be easily implemented if each
-	  IIOP_Object held a reference to the set of sockets opened to
-	  a certain TCP/IP address.
-          <BR>[ASSIGNED TO:] Kirthika
-	</P>
-      </LI>
+	    <LI><P><B>EC:</B> Many applications require to intercept
+	        the EC event processing, for example to keep track of
+		the number of events received and sent. 
+                This requires strategized factories for many (if not
+		all) of the Event Channel internal servants.
+               </P>
+             </LI>
 
-      <LI><P>If the connection to the server cannot be established the
-	  right exception is <CODE>TRANSIENT</CODE>, not
-	  <CODE>COMM_FAILURE</CODE>; this and other exception
-	  inconsistencies have to be checked
-	  <BR>[STATUS] Most of this work has been completed, there are 
-	  a few i's to dot and t's to cross, for example:
-	  what is the right exception to raise when a
-	  <CODE>write()</CODE> fails? The answer is
-	  none, we must transparently retry the current profile, not
-	  the next one.
-          <BR>[ASSIGNED TO:] Carlos
-	  <BR>[STATUS] The path on the client side seems clean
-	  now. The server side is still under revision.
-	</P>
-      </LI>
+	    <LI><P><B>EC:</B> Some applications require ad-hoc
+                filters, such as "this events must arrive in
+                sequence", or "wait for all this events and then send
+                this other event".
+               </P>
+             </LI>
 
-      <LI><P>Add support for timeouts and protocol attributes to the
-	  ORB.
+            <!-- This is Boeing specific -->
+            <LI><P><B>EC:</B> For some applications it is insteresting
+                to activate the EC servants (such as the
+                ConsumerProxys) in different POAs
+              </P>
+            </LI>
+      
+          </UL>
+	  We have completed a new design for the real-time event
+          channel that will let us implement all this features (and
+          others).
           <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>
+        </P>
       </LI>
 
     </OL>
 
     <HR>
-
     <P>
     <H3>Pending Tasks</H3>
     </P>
@@ -134,8 +126,6 @@
 	incoming data buffer, thus improving interleaving between the
 	client and server (the client does something useful before
 	starting to wait for the server).
-	The client could also deallocate the outgoing buffers before
-	waiting for the reply.
       <P></LI>
 
       <LI>The data blocks and their buffers could be allocated in a
@@ -143,6 +133,16 @@
 	the data block and the rest of it to contain the actual buffer
       <P></LI>
 
+      <LI><P>Some applications cannot afford compiled marshaling for
+	  all the stubs and skeletons,
+	  the generated code size would be too big.
+	  Yet some operations could be critical and require code as
+	  efficient as possible;
+	  a <CODE>#pragma</CODE> can be added to give users
+          fine-grained control over code generation.
+	</P>
+      </LI>
+
       <LI><P>For extremely low latency applications we could remove
 	  some fields from the IIOP protocol, for instance:
 	  <UL>
@@ -156,7 +156,7 @@
 	  </LI>
 	  </UL>
 	<BR>[STATUS] Most of this optimizations were implemented,
-	and can be enabled using the <CODE>-ORBgioplite</CODE> command
+	and can be enabled using the <CODE>-ORBiioplite</CODE> command
 	line option.
       </P>
       </LI>
@@ -234,6 +234,23 @@
 	</P>
       </LI>
 
+      <LI><P>In the collocated case the generated
+          <CODE>_narrow()</CODE> method calls the
+          <CODE>_create_stub()</CODE> method that allocates several
+          temporary objects.
+        </P>
+      </LI>
+           
+      <LI><P>For various projects, we need to produce a
+          minimal-footprint TAO ORB.  One thing we could probably do
+          very easily would be to provide an #ifdef that will
+          conditionally omit the servant manager, POA manager, and
+          adapter activator features from TAO, along with all the
+          demuxing features that aren't active demuxing or perfect
+          hashing.
+        </P>
+      </LI>
+
       <LI><P>The CDR streaming classes compute the alignment on each
           operation, but they could remember the alingment from the
           previous insertion or extraction operation; saving a few
@@ -241,105 +258,18 @@
         </P>
       </LI>
 
-      <LI><P>Some applications cannot afford compiled marshaling for
-	  all the stubs and skeletons,
-	  the generated code size would be too big.
-	  Yet some operations could be critical and require code as
-	  efficient as possible;
-	  a <CODE>#pragma</CODE> can be added to give users
-          fine-grained control over code generation.
-	</P>
-      </LI>
-
     </OL>
 
     <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>
-	  <LI>A throughput test (move from
-	    <CODE>EC_Throughtput</CODE>).
-	  </LI>
-	  <LI>A latency test (move from
-	    <CODE>Event_Latency</CODE>)
-	  </LI>
-	  <LI>A connection time test
-	  </LI>
-	  <LI>A test to verify filtering and correlation
-	  </LI>
-	  <LI>A test to timeouts
-	  </LI>
-	  <LI>A priority inversion test
-	  </LI>
-	  <LI>A test to measure CPU scalability
-	  </LI>
-	  <LI>A stress test for gateways and observers
-	  </LI>
-	  </UL>
-        </P>
-      </LI>
-      <LI><P><B>EC:</B>Should we provide strategies to enforce the QoS 
-	  publications and subscriptions? This could require
-	  collaborations with the scheduling service and possibly it
-	  is only useful for debugging real-time applications, but it
-	  certainly seems interesting.
-        </P>
-      </LI>
-
-      <LI><P><B>EC:</B> Optimize the updates to the SupplierFiltering
-	  module, specially when it is a singleton: currently it
-	  receives a <CODE>connected</CODE> call for each supplier,
-	  event though one would be enough.
+      <LI><P><B>EC:</B>Sometimes the Event Channel dead-locks during
+          shutdown. According to Ulf Jährig &lt;jaehrig@desys.com&gt>;, an
+          easy way to reproduce the problem is to run the
+          EC_Throughput test under windows NT.
         </P>
       </LI>
 
-      <LI><P><B>EC:</B> We need some strategy in the EC to periodically 
-	  flush out mibehaving 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>EC:</B>The observer in the <CODE>TAO_EC_Gateway</CODE> 
-	  class is not properly deactivated.
-        </P>
-      </LI>
-
-      <LI><P><B>EC:</B> Sometimes the Event Channel dead-locks during
-          shutdown. According to Ulf Jährig
-	  &lt;jaehrig@desys.com&gt;, an easy way to reproduce the
-	  problem is to run the EC_Throughput test under windows NT.
-	  <BR>[STATUS] The test in question works perfectly on NT; it
-	  looks like a race condition. Apparently this is only a
-	  problem with the old EC.
-        </P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> Support for the <CODE>version</CODE> 
+      <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>
@@ -394,31 +324,27 @@
 	    <BR>[DONE]
 	  <P></LI>
 
-	  <LI><B>IDL Compiler:</B> The IDL compiler should be able to
+	  <LI><B>IDL Compiler:</B>The IDL compiler should be able to
             generate the 
 	    alternative mapping, but with the TSS default for the env
 	    argument.
 	    <BR>[DONE]
 	  <P></LI>
 
-	  <LI><B>IDL Compiler:</B> The IDL compiler should generate the
+	  <LI><B>IDL Compiler:</B>The IDL compiler should generate the
             standard mapping, without the environment argument.
 	  <P></LI>
 	  
-	  <LI><P>In general we will need to complete and debug the
-	      <CODE>TAO_TRY</CODE> macros;
-	      they have limitations when dealing with the
-	      alternative mapping, but are very useful.
-	      <BR>[STATUS] This seems to be OK now, the code seems to
-	      compile and work correctly now.
-	      <BR>[STATUS] We need a new macro (TAO_TRY_THROW) to use
-	      inside the TAO_TRY blocks, because TAO_THROW will not go
-	      into the TAO_CATCH blocks, even if the exceptions match.
-	      <BR>[STATUS] Nanbor implemented a much better set of
-	      macros, that can be used with other ORBs, it is
-	      implemented in <CODE>$ACE_ROOT/ace/CORBA_macros.h</CODE>
-	    </P>
-	  </LI>
+	  <LI>In general we will need to complete and debug the
+	    <CODE>TAO_TRY</CODE> macros;
+	    they have limitations when dealing with the
+	    alternative mapping, but are very useful.
+	    <BR>[STATUS] This seems to be OK now, the code seems to
+	    compile and work correctly now.
+	    <BR>[STATUS] We need a new macro (TAO_TRY_THROW) to use
+	    inside the TAO_TRY blocks, because TAO_THROW will not go
+	    into the TAO_CATCH blocks, even if the exceptions match.
+	  <P></LI>
 
 	  <LI>We need to test the ORB for resource leaking in the
 	    presence of exceptions.
@@ -498,21 +424,16 @@ class POA_Foo {
 	</P>
       </LI>
 
-      <LI><P><B>EC:</B> The <CODE>TAO_EC_Gateway_IIOP</CODE> can be
+      <LI><P><B>EC:</B>The <CODE>TAO_EC_Gateway_IIOP</CODE> can be
 	  required to subscribe for events by source, but the source
 	  can be local instead of remote.
 	  This is not a problem since the Event Channel supports
 	  multiple supplier IDs,
 	  but we could check the local publications and remove those
 	  events from the Gateway publication and subscription list.
-	  <BR>[STATUS] The task is a second order optimization and has 
-	  very low priority.
 	</P>
       </LI>
 
-      <LI>Support GIOP 1.1 in the ORB (fragments)
-      <P></LI>
-
       <LI>Support IIOP 1.1 in the ORB
       <P></LI>
 
@@ -523,6 +444,9 @@ class POA_Foo {
       <LI>Support IIOP 1.2 in the ORB
       <P></LI>
 
+      <LI>Support GIOP 1.1 in the ORB (fragments)
+      <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
@@ -550,11 +474,9 @@ class POA_Foo {
 	in the IDL compiler is incomplete.
       <P></LI>
 
-      <LI><P>It seems that some memory is leaked from the ORB cached
-	  connector; but Purify gets confused by the fact that TAO
-	  dynamically loads libTAO, so it could be just a bogus report.
-	</P>
-      </LI>
+      <LI>It seems that some memory is leaked from the ORB cached
+	connector.
+      <P></LI>
 
       <LI><B>IDL Compiler:</B>Support for the <CODE>fixed</CODE> data
         type in the IDL compiler 
@@ -564,6 +486,10 @@ class POA_Foo {
         least untested.
       <P></LI>
 
+      <LI>Add a <CODE>corbafwd.h</CODE> header file to eliminate the
+        deep (and recursive) header dependencies in TAO.
+      <P></LI>
+
       <LI>Add &lt&lt and &gt&gt operators to the
 	<CODE>CORBA::Request</CODE> class, to simplify DII invocations
 	(this is an Orbix-sism).
@@ -571,49 +497,45 @@ class POA_Foo {
 	types.
       <P></LI>
 
-      <LI><P><B>ORB:</B>
-	  Add a -ORBlogfile flag so we can set the ACE_ERROR and
-	  ACE_DEBUG output destination in all TAO applications
-	</P>
-      </LI>
-      
-      <LI><P><B>ORB:</B>
-	  Support multiple calls to ORB_init().
-	  This requires several changes:
-	<UL>
-	  <LI>Object references must keep an explicit reference to the
-	    ORB that created them. In turn this requires that CDR
-	    streams carry the ORB pointer for object reference
-	    decoding.
+      <LI>Several helper structs for <CODE>Any</CODE> have to be
+	added, mainly: <CODE>to_object</CODE>, <CODE>to_wchar</CODE>,
+	<CODE>to_wstring</CODE> and their <CODE>from_</CODE>
+	<BR>[STATUS] Jeff added several of them, I need to check what
+	is missing.
+      <P></LI>
+
+      <LI>Prepare the 1.0 release:<P>
+	<OL>
+	  <LI>Integrate the compiled marshalling approach.
+            <BR>[STATUS] Andy has made great progress on this. 
 	  </LI>
-	  <LI>We must keep a table of ORB pointers based on the
-	    <CODE>-ORBid</CODE> option.
+	  <LI>Verify the GPERF is working in all the relevant
+	    platforms.
+            <BR>[STATUS] As far as we know it is working correctly.
 	  </LI>
-	  <LI>The hint on the cached connector has to be revised if
-	    support for zero locks in the cached connector is going to 
-	    work.
+	  <LI>Integrate active demux of operations?
 	  </LI>
-	</UL>
-        </P>
-      </LI>
+	</OL>
+      <P></LI>
 
-      <LI><P><B>ORB:</B>
-	  Support multiple endpoints in the ORB.
-	  Some interesting concurrency models (such as
-	  thread-per-endpoint or thread-pool-per-endpoint) require
-	  that we give an explicit name to each endpoint, and use
-	  policies to match the thread with the endpoints it will
-	  serve (and share).
-        </P>
-      </LI>
+      <LI>Support the Sun bootstrapping mechanism for the Naming
+	Service
+      <P></LI>
+
+      <LI>Add a -ORBlogfile flag so we can set the ACE_ERROR and
+	ACE_DEBUG output destination in all TAO applications
+      <P></LI>
+      
+      <LI>Support several calls to ORB_init() on the same thread.
+      <P></LI>
 
       <LI><B>EC:</B> Call ORB_init() in the EC threads?
 	[The dispatching threads for Boeing]
       <P></LI>
 
       <LI><B>EC:</B> Build an EC example that uses all the cool features
-	(multiple endpoints on each process, collocated EC and
-	Scheduling Service, Naming, etc.)
+	(multiple ORBs on each process, collocated EC and Scheduling
+	service, Naming, etc.)
       <P></LI>
 
       <LI><B>EC:</B> Extend the Concurrency Service (or create a new
@@ -624,6 +546,11 @@ class POA_Foo {
       <LI><B>EC:</B> Debug interval computation in Linux (and NT?)
       <P></LI>
 
+      <LI><P>Remove the uneeded methods from CORBA::Object
+	  <BR>[STATUS] This task seems to be complete
+	</P>
+      </LI>
+
       <LI><B>IDL Compiler:</B> The IDL compiler could generate a static
         method to access the interface repository ID of a class.
       <P></LI>
@@ -643,8 +570,10 @@ class POA_Foo {
 	<BR>[STATUS] The user can control collocation, but we need a
 	dynamic way to do it (or an example) that exploits the Service
 	Configurator. We also may need to split the library.
-	<BR>[STATUS] David added a mechanism to compile only the
-	services that we want.
+      <P></LI>
+
+      <LI><B>EC:</B> Use the Service_Configurator to dynamically load
+	the EC Module_Factory thus making it really configurable.
       <P></LI>
 
       <LI><B>EC:</B> Cleanup the IDL structures for subscriptions,
@@ -691,22 +620,16 @@ class POA_Foo {
 	</P>
       </LI>
 
-      <LI><P>Test <CODE>Any</CODE> with variable sized types, such as
-	  structures that contain a string inside.
-	  Jeff reports that there is a
+      <LI><P>Test Any with variable sized types, such as structures
+	  that contain a string inside. Jeff reports that there is a
 	  problem when destroying Anys initialized with this types,
-	  even if the IDL compiler generated &lt&lt= operator is
-	  used.
-	  <BR>[STATUS] Many of the services do this kind of thing, for 
-	  example the Trading service passes all kinds of data in
-	  Anys.  The current version seems to be working , so this is
-	  not a high priority task.
+	  even if the IDL compiler generated <<= operator is used.
 	</P>
       </LI>
 
-      <LI><P><B>IDL Compiler:</B> Include a regression test to verify
-	  that <CODE>octet</CODE> is <B>not</B> a valid discriminator
-	  for unions
+      <LI><P>Include a regression test to verify that
+	  <CODE>octet</CODE> is <B>not</B> a valid discriminator for
+	  unions
 	</P>
       </LI>
 
@@ -716,29 +639,42 @@ class POA_Foo {
 	</P>
       </LI>
 
-      <LI><P><P><B>IDL Compiler:</B> Verify that the typecode for
-	  unions use a <CODE>octet</CODE> with value <CODE>0</CODE>
-	  for the default discriminator.
+      <LI><P>Verify that the typecode for unions use a
+	  <CODE>octet</CODE> with value <CODE>0</CODE> for the default
+	  discriminator
 	</P>
       </LI>
 
-      <LI><P><B>ORB:</B>
-	  Is the client side in TAO handling a
+      <LI><P>Is the client side in TAO handling a
 	  <CODE>CloseConnection</CODE> GIOP message properly?
 	</P>
       </LI>
 
-      <LI><P><P><B>IDL Compiler:</B> In some platforms it may be
-	  necessary to add an extra value to an enum to force it to be
-	  32-bits wide.
+      <LI><P>If the connection to the server cannot be established the
+	  right exception is <CODE>TRANSIENT</CODE>, not
+	  <CODE>COMM_FAILURE</CODE>; this and other exception
+	  inconsistencies have to be checked
+	</P>
+      </LI>
+
+      <LI><P>The spec (CORBA 2.2, 20.17) defines accesor methods for the
+	  fields of a <CODE>SystemException</CODE>.
 	</P>
       </LI>
 
-      <LI><P><B>POA:</B> The <CODE>SINGLE_THREAD_MODEL</CODE> for the
-	  POA requires that at most one concurrent call is invoked on
-	  each servant in that POA.
-	  <BR>[STATUS] Irfan is working on it as part of the POA
-	  concurrency fixes.
+      <LI><P>In some platforms it may be necessary to add an extra
+	  value to an enum to force it to be 32-bits wide.
+	</P>
+      </LI>
+
+      <LI><P>The spec requires that strings as fields of structures be
+	  initialized to the empty (not the null) string.
+	</P>
+      </LI>
+
+      <LI><P>The <CODE>SINGLE_THREAD_MODEL</CODE> for the POA requires
+	  that the execution for all request on that POA happen on the
+	  same thread.
 	</P>
       </LI>
 
@@ -748,43 +684,54 @@ class POA_Foo {
 	</P>
       </LI>
 
-      <LI><P>Can <CODE>_duplicate()</CODE> raise an exception?
-	  If so the mapping that we generate is not correct for
-	  platforms without native C++ exceptions.
+      <LI><P>The <CODE>_duplicate()</CODE> and <CODE>_narrow()</CODE>
+	  functions can throw exceptions, yet our mapping does not
+	  contain an <CODE>CORBA::Environment</CODE> argument.
+	  A similar problem ocurs with
+	  <CODE>ORB::resolve_initial_references</CODE>, the ORB can
+	  throw the <CODE>InvalidName</CODE> exception.
 	</P>
       </LI>
 
-      <LI><P><B>ORB:</B>
-	  The implementation for the leader-follower
+      <LI><P>Apparently the implementation for the leader-follower
 	  model on the client side has bug:
 	  it will add the current thread to the follower list every
 	  time it returns from waiting in the condition variable,
 	  assuming that it was signaled and removed every time.
-	  <BR>[STATUS] This is not a big problem because only a
-	  warning is printed out.
 	</P>
       </LI>
 
-      <LI><P><B>ORB:</B>
-	  By default TAO disables Nagle's algorithm, this should be
+      <LI><P>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>Improve the connection recycling strategies, for
+	  instance,
+	  several strategies are possible: limit the maximum number of
+	  open sockets, probably with both HWM and LWM bounds,
+	  with different policies to choose the socket to close (LFU,
+	  MRU?);
+	  or maybe be more aggresive and recycle a socket once
+	  all the object references pointing to a server are closed.
+	  The later approach could be easily implemented if each
+	  IIOP_Object held a reference to the set of sockets opened to
+	  a certain TCP/IP address.
 	</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.
-	  <BR>[STATUS] In general this is done by ACE, but there have
-	  been bug reports related to this.
         </P>
       </LI>
 
-      <LI><P><B>IDL Compiler:</B> The CORBA 2.3 spec clarifies the
-	  scope of a
+      <LI><P>Update the collocated test in Cubit
+        </P>
+      </LI>
+
+      <LI><P><B>IDL Compiler:</B> The CORBA 2.3 spec clarifies the scope of a
           <CODE>#pragma prefix</CODE>:
           the prefix is supposed to get cleared after each
           <CODE>#include</CODE>,
@@ -820,6 +767,13 @@ class POA_Foo {
         </P>
       </LI>
 
+      <LI><P><B>IDL Compiler:</B> Tom Ziomek
+          &lt;tomz@cc.comm.mot.com&gt; reports that the IDL
+          compiler does not verify that <CODE>oneway</CODE> operations
+          cannot include a <CODE>raise</CODE> expression.
+        </P>
+      </LI>
+
       <LI><P><B>IDL Compiler:</B> We must also check that oneways do
           not contain any <CODE>out</CODE> or <CODE>inout</CODE>
           parameters.
@@ -831,76 +785,6 @@ class POA_Foo {
           instead of blocking directly on the <CODE>writev</CODE> call.
         </P>
       </LI>
-
-      <LI><P><B>ORB:</B>
-	  When handling a forward request we may get forwarded to a
-	  collocated object.
-	  The typical scenario is a server that register with the
-	  Implementation Repository:
-	  if it creates an object reference to a local object the
-	  object reference will be pointing to the ImplRepo and
-	  potentially none of its profiles will match the local ones.
-	  Trying to contact the ImplRepo will result in a
-	  LOCATION_FORWARD exceptions (and/or a LocateReply) pointing
-	  to the local endpoints, but now we should use collocation.
-        </P>
-      </LI>
-
-      <LI><P><B>ImplRepo:</B>
-	  How do the ImplRepo and pluggable protocols interact? What
-	  if the ImplRepo is using a protocol that is not implemented
-	  in the server? Or vice-versa?
-        </P>
-      </LI>
-
-      <LI><P>We need support for the timeout policies specified in
-	  CORBAmessaging. The timeouts can control connection and
-	  total request time.
-        </P>
-      </LI>
-
-      <LI><P><B>ORB:</B>
-	  Decouple the ORB from interpretive marshaling. This style of 
-	  marshaling will not be required for many applications, and
-	  it increases the footprint significantly (around 10%).
-	  The tasks required are:
-	<UL>
-	  <LI>Write one class per marshaling operation (encode,
-	    decode, skip, etc), instead of one class per type.
-	    This way we can extract out the operations we don't use.
-	  </LI>
-	  <LI>The IDL compiler could generate a
-	    <CODE>_tao_destroy</CODE> method, that would delete an
-	    object through a <CODE>void*</CODE>.
-	    Such an operation will allow us to implement
-	    <CODE>Any</CODE> without the <CODE>deep_free</CODE>
-	    operation.
-	  </LI>
-	  <LI>Optimize <CODE>append</CODE> to stop the recursion once
-	    the source and destination CDR streams have the same
-	    alignment.
-	  </LI>
-	  <LI>It seems like the <CODE>skip</CODE> operation is only
-	    used in the <CODE>Any</CODE> support.
-	    It may be possible to agressively reduce the footprint by
-	    removing both <CODE>skip</CODE> and <CODE>Any</CODE>.
-	  </LI>
-	</UL>
-	</P>
-      </LI>
-
-      <LI><P>The <CODE>TAO_Object_Manager</CODE> class needs an
-	  assigment operator from <CODE>T_var</CODE>.
-	  Either change the class to have two arguments or 
-	  use the <CODE>T::_var_type</CODE> trait.
-	  We also have to change the class generated by the IDL
-	  compiler.
-	  Similar changes maybe required for the
-	  <CODE>TAO_String_Manager</CODE> and the
-	  <CODE>TAO_Object_Field</CODE> classes.
-	</P>
-      </LI>
-
     <HR>
 
   <!-- Things below this point are "big" tasks" that -->
@@ -1046,6 +930,7 @@ encapsulation format.
 	    interpretive marshalling in the CORBAlite framework (where
 	    TypeCodes don't have enough methods as to traverse them).
       </P>
+      <P>
     </LI>
 
     <LI><P>Consider decompositions of the ORB that would allow
@@ -1111,197 +996,6 @@ encapsulation format.
       <H3>Completed Tasks</H3>
 
     <OL>
-      <LI><P><B>EC:</B>The new implementation of the EC does not send
-	  <CODE>disconnect</CODE> messages on shutdown, this has to be 
-	  implemented.
-	  <BR>[DONE]
-        </P>
-      </LI>
-      <LI><P><B>EC:</B> Use the Service_Configurator to dynamically load
-	  the EC Module_Factory thus making it really configurable.
-	  The same feature is needed for the new
-	  <CODE>EC_Factory</CODE> class.
-	  <BR>[STATUS] Notice that this is fairly easy to implement,
-	  there doesn't seem to be much demand for it.
-	  <BR>[DONE] In the new EC it is possible to load the
-	  strategy factory.
-	</P>
-      </LI>
-
-      <LI><P><B>EC:</B> The supplier filters could depend on the QoS
-	  data, as consumer filters do. We should provide a factory
-	  for them too.
-	  <BR>[DONE]
-        </P>
-      </LI>
-
-      <LI><P><B>EC:</B> We need to provide simple operations to update
-	  the subscriptions of a consumer, as well as the publications 
-	  of a supplier, the current scheme (disconnecting and
-	  connecting again) is inefficient.
-          <BR>[ASSIGNED TO:] Carlos
-	  <BR>[DONE]
-        </P>
-      </LI>
-
-      <LI><P><B>IDL Compiler:</B> Tom Ziomek
-          &lt;tomz@cc.comm.mot.com&gt; reports that the IDL
-          compiler does not verify that <CODE>oneway</CODE> operations
-          cannot include a <CODE>raise</CODE> expression.
-	  <BR>[DONE] Andy fixed this.
-        </P>
-      </LI>
-
-      <LI><P>The <CODE>_duplicate()</CODE> and <CODE>_narrow()</CODE>
-	  functions can throw exceptions, yet our mapping does not
-	  contain an <CODE>CORBA::Environment</CODE> argument.
-	  A similar problem ocurs with
-	  <CODE>ORB::resolve_initial_references</CODE>, the ORB can
-	  throw the <CODE>InvalidName</CODE> exception.
-	  <BR>[DONE] But the status of <CODE>_duplicate()</CODE>
-	  remains, I added an entry for it.
-	</P>
-      </LI>
-
-      <LI><P>The spec requires that strings as fields of structures be
-	  initialized to the empty (not the null) string.
-	  <BR>[DONE] Andy this this is the <CODE>String_Manager</CODE> 
-	  class.
-	</P>
-      </LI>
-
-      <LI><P>The spec (CORBA 2.2, 20.17) defines accesor methods for the
-	  fields of a <CODE>SystemException</CODE>.
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P>Remove the unneeded methods from CORBA::Object
-	  <BR>[STATUS] This task seems to be complete
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P>Support the Sun bootstrapping mechanism for the Naming
-	  Service
-	  <BR>[STATUS] Replaced by the interoperable naming service
-	  bootstraping.
-	</P>
-      </LI>
-
-      <LI><P>Integrate the compiled marshalling approach.
-	  <BR>[STATUS] Andy has made great progress on this.
-	  <BR>[DONE]
-	</P>
-      </LI>
-      <LI><P>Verify the GPERF is working in all the relevant
-	  platforms.
-	  <BR>[STATUS] As far as we know it is working correctly.
-	  <BR>[DONE]
-	</P>
-      </LI>
-      <LI><P>Integrate active demux of operations?
-	  <BR>[STATUS] We use perfect hashing instead.
-	<P>
-      </LI>
-
-      <LI><P>Several helper structs for <CODE>Any</CODE> have to be
-	  added, mainly: <CODE>to_object</CODE>, <CODE>to_wchar</CODE>,
-	  <CODE>to_wstring</CODE> and their <CODE>from_</CODE>
-	  <BR>[DONE] Jeff added them to the Any class, later they were 
-	  moved to the CDR streaming classes because they are needed
-	  there too.
-	</P>
-      </LI>
-
-      <LI><P>Add a <CODE>corbafwd.h</CODE> header file to eliminate
-	  the deep (and recursive) header dependencies in TAO.
-	  <BR>[DONE]
-	</P>
-      </LI>
-
-      <LI><P>In the collocated case the generated
-          <CODE>_narrow()</CODE> method calls the
-          <CODE>_create_stub()</CODE> method that allocates several
-          temporary objects.
-	  <BR>[DONE]
-        </P>
-      </LI>
-           
-      <LI><P>For various projects, we need to produce a
-          minimal-footprint TAO ORB.  One thing we could probably do
-          very easily would be to provide an #ifdef that will
-          conditionally omit the servant manager, POA manager, and
-          adapter activator features from TAO, along with all the
-          demuxing features that aren't active demuxing or perfect
-          hashing.
-	  <BR>[DONE] Irfan implemented exactly this. We still have
-	  room for more footprint size optimizations, but they are
-	  second order things.
-        </P>
-      </LI>
-
-      <LI><P>Add support for multiple Profiles in the ORB (completing
-          the IIOP 1.0 support)
-          <BR>[ASSIGNED TO:] Fred
-	  <BR>[DONE] Fred added support for multiple profiles as part
-	  of the pluggable protocols effort.
-        </P>
-      </LI>
-
-      <LI><P><B>EC:</B> The current architecture of the real-time
-          Event Channel does not support some features, such as:
-	  <UL>
-	    <LI><P><B>EC:</B> Some applications are both suppliers and
-                consumers of events,
-                they may be interested in all the
-                events of type <B>T</B> unless the event is generated
-		by them.
-            </LI>
-            <LI><P><B>EC:</B> Can we factor out the scheduling service from
-                the EC?
-              </P>
-            </LI>
-
-            <LI><P><B>EC:</B> The reactive event channel can eliminate
-                data copies because the data does not need to survive
-		after the <CODE>push()</CODE> call.
-              </P>
-            </LI>
-
-	    <LI><P><B>EC:</B> Many applications require to intercept
-	        the EC event processing, for example to keep track of
-		the number of events received and sent. 
-                This requires strategized factories for many (if not
-		all) of the Event Channel internal servants.
-               </P>
-             </LI>
-
-	    <LI><P><B>EC:</B> Some applications require ad-hoc
-                filters, such as "this events must arrive in
-                sequence", or "wait for all this events and then send
-                this other event".
-               </P>
-             </LI>
-
-            <!-- This is Boeing specific -->
-            <LI><P><B>EC:</B> For some applications it is insteresting
-                to activate the EC servants (such as the
-                ConsumerProxys) in different POAs
-              </P>
-            </LI>
-      
-          </UL>
-	We have completed a new design for the real-time event
-	channel that will let us implement all this features (and
-	others).
-	<BR>[DONE] The new implementation is working, we have to add 
-	several strategies and stress test it, but the architecture
-	seems sound.
-	<BR>[ASSIGNED TO:] Carlos
-      </P>
-      </LI>
-
       <LI><P><B>IDL Compiler:</B>The IDL compiler could generate files
           with empty 
 	  implementation classes, just to make the life of implementors
diff --git a/TAO/docs/releasenotes/ec.html b/TAO/docs/releasenotes/ec.html
index a78acc6c6fe..89c4fb506e8 100644
--- a/TAO/docs/releasenotes/ec.html
+++ b/TAO/docs/releasenotes/ec.html
@@ -1,84 +1,86 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.06 [en] (X11; I; SunOS 5.5.1 sun4u) [Netscape]">
    <TITLE>Event Service Status</TITLE>
-    <!-- $Id$ -->
+<!-- $Id$ -->
 </HEAD>
 <BODY TEXT="#000000" BGCOLOR="#FFFFFF">
 
 <H3>TAO's Real-time Event Service</H3>
-    Point of contact: <A HREF="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</A>
-    <H4>Last Updated: $Date$</H4>
-
-<H3>New on this release</H3>
-
-    <UL>
-      <LI><P>It has been available for several releases now, but not
-	  well documented. A complete re-implementation of the EC is
-	  available, this implementation provides:
-	</P>
-      </LI>
-      <LI><P>The new EC allows the suppliers and consumers to update
-	  their publications and subscriptions, they can simply call
-	  the corresponding <CODE>connect</CODE> operation.
-	  The default EC configuration disallows this, but it is very
-	  easy to change it.
-	</P>
-      </LI>
-      <LI><P>The new EC uses an asbtract factory to build its
-	  strategies, this factory can be dynamically loaded using the
-	  service configurator.
-	</P>
-      </LI>
-      <LI><P>The new EC can use trivial filters for both consumers and 
-	  suppliers, resulting in optimal performance for broadcasters.
-	</P>
-      </LI>
-      <LI><P>Most of the locks on the new EC are strategized.
-	</P>
-      </LI>
-      <LI><P>The duration of all locks in the EC can be bounded,
-	  resulting in very predictable behavior.
-	</P>
-      </LI>
-      <LI><P>More details can be found on the <CODE>README</CODE> file
-	  in the <CODE>$TAO_ROOT/orbsvcs/orbsvcs/Event</CODE>
-	  directory.
-	</P>
-      </LI>
-    </UL>
-
-<H3>Known issues:</H3>
-
-    <DL>
-      <DT><I>The new EC does not use the scheduling service</I>
-      </DT>
-      <DD>
-	<P>The new implementation has been designed to simplify its use
-	  in applications that do not require an scheduling service and
-	  to minimize the code footprint when the scheduling service is
-	  only required for dispatching
-	</P>
-	<P>To achieve this goals the EC will able to run without any
-	  scheduling service or only consulting the schedule, but not
-	  updating the dependencies.
-	</P>
-	<P>Using strategies and factories we will be able to
-	  configure the EC to update the schedule only in the
-	  configurations that required.
-	  Unfortunately this features have not been implemented yet.
-	</P>
-      </DD>
-
-      <DT><I>Further details:</I></DT>
-
-      <DD><P>Many lower level issues and tasks can be found in the
-	  <A HREF="TODO.html">TODO list</A>.
-	  </P>
-      </DD>
-    </DL>
-
-<H3>Examples</H3>
+Point of contact: <A HREF="mailto:coryan@cs.wustl.edu">Carlos O'Ryan</A>
+<H4>
+Last Updated: $Date$</H4>
+
+<H3>
+New on this release</H3>
+
+<UL>
+  <LI><P>Added fragmentation and reassembly support for the multicast
+    gateways</P>
+  </LI>
+</UL>
+
+<H3>
+Known issues:</H3>
+
+<DL>
+<DT>
+<I>The schedule cannot be downloaded</I></DT>
+
+<DD>
+The Scheduling Service seems to compute proper schedules, but it is not
+possible to download them, apparently there is a marshalling problem for
+sequences of complex structures.</DD>
+
+<P>Due to this problem we have been unable to test the run-time scheduler
+and performance it is impossible to complete performance measurements and
+optimizations: the (global) scheduling service latency and overhead is
+at least as large as the EC itself.
+<P><B>Note:</B> This does not seem to be the case anymore, but the comment
+will remain here until I can confirm that the problem dissapeared.
+<DT>
+
+<P><I>Run-time scheduler requires re-link</I></DT>
+
+<DD>
+During a normal execution of the system there is no need to use the a global
+Real-time Scheduling Service, a faster, collocated implementation for the
+service is available. Obviously the scheduling information is precomputed
+in some config run.</DD>
+
+<P>Unfortunately the current scheme requires a relink of all the involved
+applications against the generated tables for the run-time scheduling service.
+<P>We should be able to download the schedule to the interested parties,
+without need for a separate link phase. This will simplify and speed up
+the developing cycle, but requires a (small and fixed) amount of dynamic
+memory allocation. It could be interesting to "save" the schedule computation
+in some persistent form, so startup cost are lower too.
+<P>The current design contemplates a config run were a global consumer
+accumulates the QoS requirements of all the objects, next an external utility
+is used to force a computation and save of the schedule. In future executions
+the global scheduler pre-loads this schedule and the clients simply download
+the precomputed schedule, and all scheduling queries are to a local scheduling
+service, without any further contact to the global instance.
+<DT>
+<P><I>Users have no control over service collocations</I></DT>
+
+<P>The user should have complete control of services collocation, using
+ACE Service Configurator; currently the services must be explicitly instantiated
+by the user.
+<DT>
+
+<DT>
+<P><I>Further details:</I></DT>
+
+<P>Many lower level issues and tasks can be found in the <A HREF="TODO.html">TODO
+list</A>.
+
+</DL>
+
+<H3>
+Examples</H3>
 
 
 For general documentation on the Event Service please read <A HREF="http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz">The
@@ -117,10 +119,6 @@ Features in previous releases</H3>
 
 <UL>
 
-  <LI><P>Added fragmentation and reassembly support for the multicast
-    gateways</P>
-  </LI>
-
 <LI><P>Continued work on the multicast support for the EC, we added a new
 server that maps the event types (and supplier ids) into the right mcast
 group. Usually this server is collocated with the helper classes that send
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 2e1c82cbda4..03d5a386740 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -1,7 +1,7 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-
+  
    <title>TAO Release Information and TODO List</title>
 </head>
 <body text="#000000" bgcolor="#FFFFFF">
@@ -25,10 +25,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <a href="#pp">Pluggable Protocols</a></li>
 
 <li>
-<a href="#poa">Portable Object Adapter (POA)</a></li>
-
-<li>
-<a HREF="../poa_migration.html">POA Migration Notes</a></li>
+<a href="#poa">Portable Object Adapter</a></li>
 
 <li>
 <a href="../implrepo/status.html">Implementation Repository</a></li>
@@ -37,10 +34,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <a href="#interfrepo">Interface Repository</a></li>
 
 <li>
-<a href="OBV.html">Object-by-Value</a></li>
-
-<li>
-<a href="#nservices">CORBA Naming Service </a>and <a href="../INS.html">Interoperable Naming Service</a></li>
+<a href="#nservices">CORBA Naming Service</a></li>
 
 <li>
 <a href="#tservices">CORBA Trading Service</a></li>
@@ -52,7 +46,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <a href="#cservices">CORBA Concurrency Service</a></li>
 
 <li>
-<a href="#av">CORBA Audio/Video Streaming Service</a></li>
+<a href="#av">CORBA Audio/Video Control Service</a></li>
 
 <li>
 <a href="#ts">CORBA Time Service</a></li>
@@ -70,7 +64,7 @@ release</a> of <a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>:
 <a href="#logging">TAO's Logging Service</a></li>
 
 <li>
-<a href="#apps">Test &amp;  Tests</a></li>
+<a href="#apps">Test &amp; Performance Tests</a></li>
 
 <li>
 <a href="#ace">ORB-related ACE Changes</a></li>
@@ -97,18 +91,13 @@ A complete list of all modifications to TAO is available in the <a href="http://
 <a NAME="idl"></a>IDL Compiler</h3>
 Point of contact: <a href="mailto:gokhale@research.bell-labs.com">Aniruddha
 Gokhale</a>
-<p>Current status: (As of May 15, 1999.)
+<p>Current status: (As of Jan 22, 1999.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
 C++ mapping for CORBA 2.3 (Document ptc/98-09-03).</li>
 
 <li>
-We are now able to handle recursive types. We are also able to
-generate optimized typecodes.
-</li>
-
-<li>
 Struct members of type strings and arrays of strings now use the managed
 type instead of the _var type. This change was necessary to conform to
 the IDL->C++ mapping.</li>
@@ -174,14 +163,13 @@ Verified support for the "long long" and "unsigned long long" datatypes.
 On platforms that do not support 64 bit longs we provided <i>partial</i>
 emulation through ACE_U_LongLong.</li>
 
-<li> Perfect Hashed Operation Lookup Strategy has been added to the
-IDL Compiler.  -P flag to <code>tao_idl</code> enables the perfect
-hased lookup strategy.  This strategy uses <a
-href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">GPERF</a>, the
-GNU's Perfect Hash Function Generator written by Dr.Douglas
-C. Schmidt.  Right now, GPERF works only on Solaris. Any work on
-porting GPERF to other platforms will be highly
-appreciated.</L1></li>
+<li>
+Perfect Hashed Operation Lookup Strategy has been added to the IDL Compiler.
+-P flag to the&nbsp;<tao_idl>enables the perfect hased lookup strategy.
+This strategy uses <a href="http://www.cs.wustl.edu/~schmidt/gperf.ps.gz">GPERF</a>,
+the GNU's Perfect Hash Function Generator written by Dr.Douglas C. Schmidt.
+Right now, GPERF works only on Solaris. Any work on porting GPERF to other
+platforms will be highly appreciated.&nbsp;</L1></li>
 
 <li>
 Significantly improved the support for unions. The default case is yet
@@ -197,15 +185,15 @@ templates have problems on most compilers.</li>
 <li>
 The &lt;&lt;= and >>= operators for user-defined types are now generated.</li>
 
-<li> Completely redesigned the IDL compiler using the Visitor
-patterns. Many incomplete issues have been resolved. These include
-support for "sequence of typecodes", passing object references as in,
-inout, and out parameters.  Code generation for sequences is also
-properly handled i.e., for a named sequence such as <CODE>typedef
-sequence&lt;char&gt;CharSeq;</CODE>, we now generate a new class (and
-hence a type) called "class CharSeq". Arrays are still being worked
-out and will be done soon. An important difference in the generated
-code is that the skeletons now use a table driven approach very
+<li>
+Completely redesigned the IDL compiler using the Visitor patterns. Many
+incomplete issues have been resolved. These include support for "sequence
+of typecodes", passing object references as in, inout, and out parameters.
+Code generation for sequences is also properly handled i.e., for a named
+sequence such as "typedef sequence&nbsp;<char>CharSeq;", we now generate
+a new class (and hence a type) called "class CharSeq". Arrays are still
+being worked out and will be done soon. An important difference in the
+generated code is that the skeletons now use a table driven approach very
 similar to the stubs.</li>
 
 <li>
@@ -254,8 +242,8 @@ is mainly contained in the generated header file directly in the class
 declaration.</li>
 
 <li>
-The IDL Compiler generates templates for servant implementations. The options
-are -GI [ h | s | b | e | c ]</li>
+The IDL Compiler generates templates for&nbsp; servant implementations. The options
+are -GI [ h |&nbsp; s | b | e | c ]</li>
 </ul>
 
 <p><br>Known bugs/unimplemented constructs:
@@ -291,6 +279,18 @@ include support for Unions.</li>
 Use <a href="http://www.cs.utah.edu/projects/flux/flick/">Flick</a> (from
 the University of Utah) to generate compiled stubs.</li>
 
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
 <p>Goal is to measure the code size of the interpretive stubs generated
 by TAO IDL compiler <i>vs</i> code size of compiled stubs. Then compare
 the performance of each. We want to prove the thesis that TAO IDL compiler
@@ -303,15 +303,13 @@ of size/performance/determinism will be made.
 Tweak the IDL compiler to generate code that's more easily integrated back
 into the ORB Core, e.g., POA, etc. This will depend largely on our ability
 to generalize the changes necessary to generated code.</li>
+</ul>
 
 <li>
 The generated sequence classes should not be generated per sequence, but
 per type and parent scope. Which means, that the overhead of having the
 source code generated serveral times should be reduced. To do this, an
-extra pass over the internal representation of the IDL file has to be done.<P>
-</ul>
-
-
+extra pass over the internal representation of the IDL file has to be done.&nbsp;
 <hr></li>
 
 <br><!--#include virtual="orbcore.html" -->
@@ -380,7 +378,6 @@ shared memory and system buses like PCI or VME.</li>
 Current Status:
 <ul>
 <li>
-
 The initial prototype of the basic framework to support pluggable transport
 protocols has been compiled, linked and, tested against an older version
 of TAO. The standard TAO regression tests
@@ -434,263 +431,202 @@ and transport protocols for a given platform.</li>
 
 <hr>
 <h3>
-<a NAME="poa"></a>Portable Object Adapter (POA)</h3>
+<a NAME="poa"></a>Portable Object Adapter</h3>
 Point of contact: <a href="mailto:irfan@cs.wustl.edu">Irfan Pyarali</a>
-
-The POA associates servants with the ORB and demultiplexes incoming
-requests to servants. <P>
-
 <p>Current Status:
 <ul>
 <li>
-TAO supports the POA spec. This section will carry updates as available.</li>
+TAO fully supports the POA spec. This section will carry updates as available.</li>
 </ul>
 Known issues:
-
 <ul>
-
-<li> ORB::shutdown needs to deactive the POA Managers. We need to fix
-this. </li><P>
-
-</UL>
-
+<li>
+The synchronization in the POA is broken. For example, the locks are held
+across the invocation on the servant. The locks are also held across the
+invocation on the AdapterActivator. This forces the use of recursive locks
+inside the POA. However, the problem with recursive locks is that multiple
+threads cannot dispatch requests on the same POA simultaneous.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Add the new RefCountServantBase class to TAO. This reference counted base
+class was added to the CORBA specification to avoid race conditions for
+servant deletion in threaded servers. <a href="ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf">ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf</a>
+contains the relevant text.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Currently, the complete POA name is used as the POA identity. This scheme
+is inefficient in many ways including: (a) the complete POA name can be
+significantly large in size, and therefore, ineffient to pass with every
+method call from the client to the server; (b) it is varible in size, and
+therefore, does not lend itself to smart and effective parsing; (c) the
+searching based on the complete POA name is very ineffient.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<p>The correct solution here is to use an active demux table, and flatten
+the POA hierarchy. This will help in the searching since active demuxing
+is fast and predictable. This will also help in the parsing since the demux
+key will be fixed size.
+<p>Note that for persistent ids, we have to pass the complete POA name
+in addition to the demux key in order to handle POA creation on demand.
+<li>
+Timestamps in persistent IORs are note required. They should be removed.</li>
+
+<li>
+POA exceptions should be removed from the list of system exceptions.</li>
+
+<li>
+We need to separate out the POA functionality required to support the full
+CORBA spec from the POA functionality required to support the Minimal CORBA
+spec.</li>
+
+<li>
+We need to investigate whether it feasible for us to provide active demuxing
+for the USER_ID policy. Currently, the best we do with the USER_ID policy
+is a hash table based demuxing.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<p>Note that we have to pass the user id in addition to the demux key in
+order to handle servant creation on demand.
+<li>
+We can potentially add active demuxing for method name lookup. The benefit
+of this optimization is questionable since the current perfect hashing
+scheme provide very good and predictable behavior.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<p>Also, note that this optimization will require many changes. We would
+have to use the help of the IDL compiler to modify the object key that
+is passed for every method call differently. Note that this scheme doesn't
+work in the case of multiple inheritance or when the client stubs are not
+TAO.
+<li>
+There are some POA objects in a typical server that are not freed up properly,
+resulting in a memory leak. This is not very significant since the leak
+does not grow. However, it still needs a fix.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;</ul>
 Future work:
 <ul>
+<li>
+Determine the degree to which we will support the full semantics of remote
+objects on a collocated object. The spec mandates that collocated object
+should behave <i>exactly</i> like remote objects, but that means that request
+will have to be queued rather than calling a method directly, and this
+could be hazardous to our quest for real-time ORB status.</li>
 
-<li> Determine the degree to which we will support the full semantics
-of remote objects on a collocated object. The spec mandates that
-collocated object should behave <i>exactly</i> like remote objects,
-but that means that request will have to be queued rather than calling
-a method directly, and this could be hazardous to our quest for
-real-time ORB status.</li><P>
-
-</ul>
-
-Recently completed work:<P>
+<li>
+Provide extensions of the specification to ensure real-time delivery of
+messages.</li>
 
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;</ul>
+Recently completed work:
+<br>&nbsp;
+<br>&nbsp;
 <ul>
+<li>
+Support for collocation should be much better now because the POA can tell
+if we created the object reference.</li>
 
-<li> TAO's POA now properly supports both the threading policies:
-SINGLE_THREAD_MODEL and ORB_CTRL_MODEL. </li><P>
-
-<li>The synchronization in the POA is now very optimal. For example,
-the locks are not held across the invocation on the servant. The locks
-are also not held across the invocation on the AdapterActivator and
-ServantManagers. This allows us to use regular locks instead of
-recursive locks inside the POA. This also allows multiple threads to
-dispatch requests on the same POA simultaneous.</li><P>
-
-<li>TAO now supports reference counting between POA and servants,
-including the new RefCountServantBase and ServantBase_var
-classes. RefCountServantBase is a reference counted base class that
-was added to the CORBA specification to avoid race conditions for
-servant deletion in threaded servers. <a
-href="ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf">ftp://ftp.omg.org/pub/docs/orbos/98-07-12.pdf</a>
-contains the relevant text. Check <a
-href="../poa_migration.html#Reference counting Servants">here</a> on
-some hints to avoid trouble.</li><P>
-
-<li> The POA now supports active demultiplexing of servants in the
-SYSTEM_ID and the USER_ID policy. This should make the POA faster and
-more predictable since there is no hashing involved and the index of
-the slot where the servant is registered is in the Object Key.</li>
-<P>
-
-<li> Previously, the complete POA name was used as the POA
-identity. This scheme was inefficient in many ways including: (a) the
-complete POA name can be significantly large in size, and therefore,
-ineffient to pass with every method call from the client to the
-server; (b) it is varible in size, and therefore, does not lend itself
-to smart and effective parsing; (c) the searching based on the
-complete POA name is very ineffient.</li>
-
-<p> The new solution is to use an active demux table, and flatten the
-POA hierarchy. This will help in the searching since active demuxing
-is fast and predictable. This will also help in the parsing since the
-demux key will be fixed size.
-
-<p> Note that for persistent ids, we have to pass the complete POA
-name in addition to the demux key in order to handle POA creation on
-demand.<P>
-
-<li> There were some POA objects in a typical server that are not
-freed up properly, resulting in a memory leak. This has now been
-fixed.</li> <P>
-
-<li> Timestamps in persistent IORs were not required and have been
-removed.</li> <P>
-
-<li> POA exceptions are not not system exceptions and have been
-removed from the list of system exceptions.</li> <P>
-
-<li> Vastly improved the ability of the POA to deal with user
-exceptions, memory allocation failures, and constructor failures.</li>
-<P>
-
-<li> We now support a minimal POA for the minimal CORBA
-specification.</li> <P>
-
-<li> We have decided not to support active demuxing for method name
-lookup. The benefit of this optimization was questionable since the
-current perfect hashing scheme provide very good and predictable
-behavior.</li> <P>
-
-Also, note that this optimization will require many changes. We would
-have to use the help of the IDL compiler to modify the object key that
-is passed for every method call differently. Note that this scheme
-doesn't work in the case of multiple inheritance or when the client
-stubs are not TAO.<P>
-
-<li> Improved the parsing of object keys belonging to the
-RootPOA. Since this is the default POA and is commonly used, we have
-given it a reserved byte in the object key in order to quickly
-identify it. With the reserved bit, the active demux key for the
-RootPOA is not used, and no map lookups are required.</li> <P>
-
-<li> POA name separator was changed from '/' to '\0'.  Since POA names
-are strings, this makes a better choice since there is no chance of a
-conflict with the string specified by the user. </li> <P>
-
-<li> We have support for reactivating servants with system generated
-ids.  </li> <P>
-
-<li> The TAO specific synchronization POA policy has been
-removed. </li> <P>
-
-<li> New examples have been added to show how servants can be
-dynamically loaded from DLLs on demand. </li> <P>
+<li>
+The POA now supports active demultiplexing of servants in the SYSTEM_ID
+policy. This should make the POA faster and more predictable since there
+is no hashing involved and the index of the slot where the servant is registered
+is in the Object Key.</li>
 
-<li> Support for collocation should be much better now because the POA
-can tell if we created the object reference.</li><P>
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;
+<br>&nbsp;</ul>
 
-</UL>
 <hr>
 <h3>
 <a NAME="interfrepo"></a>Interface Repository</h3>
-Point of contact: <a href="mailto:parsons@cs.wustl.edu">Jeff Parsons</a><P>
-
-The Interface Repository provides run-time information about IDL
-interfaces.  Using this information, it is possible for a program to
-encounter an object whose interface was not known when the program was
-compiled, yet, be able to determine what operations are valid on the
-object and make invocations on it using the DII.
-
-<p>Current Status: TDB
-<p>Known Issues: TDB
-<p>Recent Work: TDB
-<p>Future Work: TDB
+Point of contact: <a href="mailto:parsons@cs.wustl.edu">Jeff Parsons</a>
+<p>Current Status:
+<p>Known Issues:
+<p>Recent Work:
+<p>Future Work:
 <p>
-
 <hr>
-
-<br><!--#include virtual="OBV.html" -->
-<hr>
-
 <h3>
-<a NAME="nservices"></a>CORBA Naming Service and Interoperable Naming Service</h3>
-Points of contact: <a href="mailto:marina@cs.wustl.edu">Marina
-Spivak</a> and <a href="mailto:vishal@cs.wustl.edu">Vishal Kachroo</a>
-<p>
-
-The CORBA <a href="ftp://www.omg.org/pub/docs/formal/97-07-12.pdf">
-Naming Service</a> supports a hierarchical mapping between sequences
-of strings and object references.  The CORBA <A
-HREF="ftp://ftp.omg.org/pub/docs/orbos/98-10-11.pdf">Interoperable
-Naming Service</A> defines a standard way for clients and servers to
-locate the Naming Service. It allows the ORB to be administratively
-configured for bootstrapping to services not set up with the orb at
-install time. <P>
-
-<p>Current status (as of 7th Apr 1999):
+<a NAME="nservices"></a>CORBA Naming Service</h3>
+Point of contact: <a href="mailto:marina@cs.wustl.edu">Marina Spivak</a>
+<p>Current status (as of Jan 11 1999):
 <ul>
 <li>
-Implementation of the CORBA Naming Service spec is complete.  TAO's
-Naming Service provides an optional persistence capability.</li>
-<li>
-Implementation of the CORBA InterOperable Naming Service is in
-progress. </li>
+Implementation of the CORBA Naming Service spec is complete.</li>
 </ul>
 Recently completed work:
 <ul>
 <li>
-Added support for Persistence (using memory-mapped files).  Persistence
-feature is optional, and is controlled by the command line argument.</li>
+The implementation of the Naming Service has been upgraded to use TAO's
+exception macros, which allow it to work both with C++ exceptions and without.</li>
 
 <li>
-Updated the implementation of the Naming Service to use new ACE
-exception macros.</li>
-<li>
-Added support for the InterOperable Naming Service, which enables the
-ORB to support IORs in user-friendly <CODE>iioploc</CODE> format.
-These features allow the ORB to be configured to return arbitrary object
-references from <CODE>CORBA::ORB::resolve_initial_references</CODE>
-for non-locality-constrained objects. Two options -ORBInitRef and
--ORBDefaultInitRef have been added to the orb for bootstrapping to
-arbitrary services.
-</li>
-
-<li>Added support for the Naming service to act like an agent: to understand IIOP
-request messages from clients and respond with reply messages with a
-LOCATION_FORWARD/OBJECT_NOT_EXIST status. The Naming Service can be
-configured through ORB options to register arbitrary services given
-the URL-format IOR for the service. The resolve_initial_references ()
-resolves a service in the following order :
-<br>1. -ORBInitRef
-<br>2. -ORBDefaultInitRef
-<br>3. Multicast to service.
-</li>
+Destroy method has been updated.</li>
 
 <li>
-Added a test for the InterOperable Naming Service that works in
-conjunction with the current TAO examples.
-</li>
-
+More test examples have been added to TAO/orbsvcs/tests/Simple_Naming.</li>
 </ul>
-
 Work in progress:
 <ul>
-
-<LI> Support for the iiopname format and conversions
-to and from URL-style IORs.
-</LI>
-
-<LI>
-A detailed InterOperable Naming Service test.
-</LI>
-
+<li>
+Currently the bindings are stored as a table in memory. Work is under way
+to provide persistance option for the Naming Service.</li>
 </ul>
 Future work:
 <ul>
 <li>
-Support for a load balancing feature similar to the one present in ORBIX.
-It will be possible to bind a group of objects under a single name, and when a client attempts to resolve the name in question, a preset policy (e.g., random, round robin, etc.) will determine which one of the object references from the group will be returned.
-</li>
-<li>
-Update to the 'destroy' method, once the POA restructuring effort is complete, to do the "Right Thing TM".
-</li>
-<li>
 Replication of the bindings to other Naming Service's currently running.
-It will probably be modeled after the LDAP Multi-Master Replication
-Protocol.</li>
-<li>
-Support for the Naming Service to handle the IIOP
-LocateRequest messages and respond with LocateReply messages with a
-LOCATION_FORWARD/OBJECT_NOT_EXIST status.
+It will probably be modeled after the LDAP Multi-Master Replication Protocol.</li>
 </ul>
-
+For general documentation on the Naming Service please read <a href="ftp://www.omg.org/pub/docs/formal/97-07-12.pdf">The
+Naming Service Specification</a>.
 <p>
 <hr>
 <h3>
 <a NAME="tservices"></a>CORBA Trading Service</h3>
 Point of contact: <a href="mailto:sbw1@cs.wustl.edu">Seth Widoff</a>
-
-<p>The <a href="http://www.omg.org/corba/sectrans.htm#trader"> Trading
-Service</a> is an implementation of the COS Trading Service
-speficiation that meets the Linked Trader conformance criteria --- it
-implements the <tt>Lookup</tt>, <tt>Register</tt>, <tt>Admin</tt>, and
-<tt>Link</tt> interfaces, but not the <tt>Proxy</tt>
-interface. Notably, the TAO trader supports the following features:<P>
-<ul> <li> Multithreaded operation;</li>
+<p>The TAO Trading Service is a transient implementation of the COS Trading
+Service speficiation that meets the Linked Trader conformance criteria
+--- it implements the <tt>Lookup</tt>, <tt>Register</tt>, <tt>Admin</tt>,
+and <tt>Link</tt> interfaces, but not the <tt>Proxy</tt> interface. Notably,
+the TAO trader supports the following features:
+<ul>
+<li>
+Multithreaded operation;</li>
 
 <li>
 Trader federations and distributed queries;</li>
@@ -719,110 +655,66 @@ The Proxy Interface.</li>
 <li>
 Persistent storage of service types and offers.</li>
 </ul>
+For general documentation of the Trading Service, please read <a href="http://www.omg.org/corba/sectrans.htm#trader">The
+Trading Service Specification.</a>
 <p>
 <hr>
 <h3>
 <a NAME="pservices"></a>CORBA Property Service</h3>
-Point of contact: <a href="mailto:alex@cs.wustl.edu">Alexander Babu
-Arulanthu</a>
-
-<p>Current status (as of Mar 9th, 1999): All the interfaces of this
-service have been implemented.  Please
-go through the test examples at $TAO/orbsvcs/tests/CosPropertyService.
-Property Service is has been used by the TAO's <a href="#av">Audio Video Streaming
-Service</a>developed for TAO. For general documentation of the
-Property Service, please read <a
-href="http://www.omg.org/corba/sectrans.htm#prop">The Property Service
-Specification.</a>
-
-<P>Recent Work:
-<ul>
- <li>
-     Changed the PropertyException from Exception to struct, according
-     to the OMG's changes.
- </li>
- <li>
-     Changed the implementation to allocate storage for the Sequence
-     out parameters, eventhough their length is 0. This is according
-     to the CORBA specification.
- </li>
-</ul>
-
+Point of contact: <a href="mailto:alex@cs.wustl.edu">Alexander Babu Arulanthu</a>
+<p>Current status (as of May&nbsp; 02, 1998)
+<p>All the interfaces of this service have been implemented.&nbsp; Please
+go through the&nbsp; test examples at&nbsp; $TAO/orbsvcs/tests/CosPropertyService.&nbsp;
+Property Service is&nbsp; now used by the AVStreams that is currently being
+developed for TAO. More testing is being done.
+<p>For general documentation of the Property Service, please read <a href="http://www.omg.org/corba/sectrans.htm#prop">The
+Property Service Specification.</a>
 <p>
 <hr>
 <h3>
 <a NAME="cservices"></a>CORBA Concurrency Service</h3>
 Point of contact: <a href="mailto:tworm@cs.wustl.edu">Torben Worm</a>
 <p>Current status (as of May 3rd):
-
-The <a href="http://www.omg.org/corba/sectrans.htm#concur">
-Concurrency Service</a> provides a mechanism that allows clients to
-acquire and release various types of locks in a distributed system.<P>
-
 <ul>
 <li>
-A simple version of the Concurrency Service has been implemented, i.e.
+A simple version of the concurrency service has been implemented, i.e.
 a version without transactions. It is currently being tested.</li>
 </ul>
 Future Work:
 <ul>
 <li>
 Implementation of the Concurrency Service with transactions</li>
-</ul><P>
+</ul>
+For general documentation of the Concurrency Service, please read
+<a href="http://www.omg.org/corba/sectrans.htm#concur">The
+Concurrency Service Specification.</a>
 <hr WIDTH="100%">
-<h3><a NAME="av"></a>CORBA Audio/Video Streaming Service</h3>
-Point of contact: <a href="mailto:naga@cs.wustl.edu">Nagarajan
-Surendran</a> and <a href="mailto:yamuna@cs.wustl.edu">Yamuna Krishnamurthy</a>
+<h3>
+<a NAME="av"></a>CORBA Audio/Video Control Service</h3>
+Point of contact: <a href="mailto:naga@cs.wustl.edu">Nagarajan Surendran</a>
 <p>This is an implementation of the OMG spec addressing the <a href="http://www.cs.wustl.edu/~sumedh/research/corbaav.pdf">Control
-and Management of Audio/Video Streams</a>.For more documentation on
-TAO's A/V Service please have a look <A HREF="http://www.cs.wustl.edu/~naga/av.html">here</A>.
-
-<p><h4>Current Status:</h4>
-<p>
-<ul>
-  <li>
-      The audio/video streaming service has been implemented in the full
-      profile. The current implementation support all the flow related
-      components like flowEndpoint,FDev,FlowConnection,..,etc.
-  </li>
-  <li>
-      An MPEG-1 application which streams mpeg-1 video and mpeg-1 audio
-      separately has been developed using the service. The client side
-      of the mpeg player requires X windows support.Its available in
-      the release at $TAO_ROOT/orbsvcs/tests/AVStreams/mpeg/source.
-  </li>
-  <li>
-      An Integrated Video-on-demand application has been developed
-      using the Trading Service and the A/V Service. The demo uses a
-      Java FrontEnd and JNI to talk to the TAO C++ trader client. The
-      demo is available in the release at
-      $TAO_ROOT/orbsvcs/tests/AVStreams/server_discovery.
-  </li>
-</ul>
+and Management of Audio/Video Streams</a>.
+<p>The audio/video streaming service has been implemented in the light
+profile. An MPEG-1 application which streams mpeg-1 video and mpeg-1 audio
+separately has been developed using the service. This application currently
+works only for Unix platforms.
 <p>Work in progress:
 <ul>
 <li>
-Implementing the SFP protocol.
-</li>
-<li>
-    Adding Multipoint streams support.
-</li>
+Implementing the SFP protocol</li>
+
 <li>
-    Developing a Video-conferencing application using the A/V Service.
-</li>
+Integrating the mpeg-1 streaming application with the trading service.</li>
 </ul>
 
 <hr>
 <p><a NAME="ts"></a><b>CORBA Time Service</b>
 <p>Point of contact: <a href="mailto:vishal@cs.wustl.edu">Vishal Kachroo</a>
-
-<p> The <a href="ftp://ftp.omg.org/pub/docs/formal/97-02-22.pdf">Time Service</a>
- allows clients to connect to Time Service Clerks and obtain globally
-synchronized time. This time is calculated from the time obtained from
-one or more Time Servers running on multiple machines in the
-network. The service uses the TAO Implementation Repository to
-activate the time servers on demand.
-
+<p>TAO's Time Service allows clients to connect to Time Service Clerks
+and obtain globally synchronized time. This time is calculated from the
+time obtained from one or more Time Servers running on multiple machines
+in the network. The service uses the TAO Implementation Repository to activate
+the time servers on demand.
 <p>Current status (as of 10th Jan 1999):
 <ul>
 <li>
@@ -838,14 +730,15 @@ algorithm can be used in the future.</li>
 <li>
 Implementation of the Timer Event Service.</li>
 </ul>
+For OMG's documentation on the Time Service please read&nbsp; <a href="ftp://ftp.omg.org/pub/docs/formal/97-02-22.pdf">The
+Time Service Specification. (.pdf)</a>
 <p>
-
 <hr WIDTH="100%">
 <h3>
 <a NAME="ec"></a>CORBA Event Service</h3>
 
 <h4>
-Last updated: Fri Mar  5 20:38:26 CST 1999</h4>
+Last updated: Wed Jan 13 20:01:27 CST 1999</h4>
 Point of contact: <a href="mailto:pradeep@cs.wustl.edu">Pradeep Gore</a>
 <p>The COS compliant Event Service implements the Event Service Specification:
 <a href="http://www.omg.org/docs/formal/97-12-11.pdf">(.pdf)</a>,
@@ -868,30 +761,23 @@ Event Service (<tt>$TAO_ROOT/orbsvcs/CosEvent_Service</tt>)The Event Service
 creates a COS compliant event channel and registers it with the naming
 service with the default name "CosEventChannel".</li>
 
-<br>Please read the associated README for more details.
+<br>Please read the associated README for more details.</ul>
 
-<li>
-CosEC_Multiple: <tt>($TAO_ROOT/orbsvcs/tests/CosEC_Multiple)</tt>:
-This test demonstrates how multiple CosEC's connect to one RtEC and how
-multiple consumers and producers exchange events in this configuration.</li>
-</ul>
 <h3>
-Known bugs:</h3>
+Current Work:</h3>
+
 <ul>
 <li>
-CosEC_Multiple: <tt>($TAO_ROOT/orbsvcs/tests/CosEC_Multiple)</tt>:
-Once the tests are done, the control doesn't return to the shell,
-you have to say CTRL-C to get back to the prompt.
-</li>
+CosEC_Multiple: <tt>($TAO_ROOT/orbsvcs/tests/CosEC_Multiple)</tt>:&nbsp;
+This test demonstrates how multiple CosEC's connect to one RtEC and how
+multiple consumers and producers exchange events in this configuration.</li>
 </ul>
-
-<hr WIDTH="100%">
 <!--#include virtual="ec.html" -->
 <p>
 <hr>
 <h3>
 <a NAME="scheduling"></a>TAO's Scheduling Service</h3>
-Point of contact: <a href="mailto:cdgill@cs.wustl.edu">Chris Gill</a>
+Point of contact:&nbsp; <a href="mailto:cdgill@cs.wustl.edu">Chris Gill</a>
 and <a href="mailto:levine@cs.wustl.edu">David Levine</a>
 <p>Currently Implemented Features:
 <ul>
@@ -920,25 +806,25 @@ strategy to use for that priority level.</li>
 Future work:
 <ul>
 <li>
-Implement heap-based dispatching queues.</li>
+&nbsp;Implement heap-based dispatching queues.</li>
 
 <li>
-Add support for additional configurability, especially in the type
+&nbsp;Add support for additional configurability, especially in the type
 of dispatching strategy (list vs. heap) that will be used to dispatch operations
 at a given static priority level.</li>
 
 <li>
-Benchmark the various alternative strategies to obtain performance
+&nbsp;Benchmark the various alternative strategies to obtain performance
 profiles across different operation loads and OS platforms.</li>
 
 <li>
-Add increased functionality. Requests and suggestions are welcome.</li>
+&nbsp;Add increased functionality. Requests and suggestions are welcome.</li>
 </ul>
 
 <hr>
 <h3>
 <a NAME="logging"></a>TAO's Logging Service</h3>
-Point of contact: <a href="mailto:mjb2@cs.wustl.edu">Matt Braun</a>
+Point of contact:&nbsp; <a href="mailto:mjb2@cs.wustl.edu">Matt Braun</a>
 <p>Current status (as of August 4'th):
 <ul>
 <li>
@@ -948,7 +834,7 @@ from multiple clients. It is currently in the testing stage.</li>
 Future work:
 <ul>
 <li>
-Add increased functionality. Requests and suggestions are welcome.</li>
+&nbsp;Add increased functionality. Requests and suggestions are welcome.</li>
 </ul>
 
 <hr>
@@ -997,20 +883,6 @@ Evolve into a testbed for discovering sources of performance non-determinism
 &amp; priority inversion.</li>
 </ul>
 
-<p>Pluggable:
-<p>Current status:
-<p>The TAO Pluggable test utilizes ACE Timeprobes to time the latency at
-various points in the ORB, especially that incurred by the Pluggable Protocols
-implementation. Comparisons can be made not only between different layers of the
-ORB, but also between different protocols as they  become available.
-<p>Future work:
-<ul>
-<li>
-Add options to redirect the output to a file.</li>
-<li>
-Script or otherwise automate the piping of the output to a spreadsheet.</li>
-</ul>
-
 <hr>
 <h3>
 <a NAME="ace"></a>ORB-related ACE Changes</h3>
@@ -1064,6 +936,8 @@ and <a href="mailto:cdgill@cs.wustl.edu">Chris Gill</a>.
 <p><a href="http://www.cs.wustl.edu/~schmidt/dove.html">DOVE</a> is documented
 in detail <a href="http://www.cs.wustl.edu/~schmidt/Dove.ps.gz">online</a>.
 This discussion focuses on the following goals:
+<br>&nbsp;
+<br>&nbsp;
 <ul>
 <li>
 Have a DOVE Browser running using Java Beans as vizualization components.</li>
@@ -1113,7 +987,7 @@ Enhancing MIB functionality</li>
 <li>
 Monitoring the AV Streaming Service</li>
 </ul>
-For more information on the DOVE demo, please refer to: $TAO_ROOT/orbsvcs/tests/Simulator/README.<P>
+For more information on the DOVE demo, please refer to: $TAO_ROOT/orbsvcs/tests/Simulator/README&nbsp;
 <hr>
 <h3>
 <a NAME="forwarding"></a>Location Forwarding</h3>
@@ -1140,6 +1014,6 @@ Kircher</a>.
 <p>For more information see <a href="../locate_request.html">Locate request</a>
 <p>
 <hr>
-<p>Back to the TAO <a href="../index.html">documentation index</a>.<!--#include virtual="/~schmidt/cgi-sig.html" -->
+<p>Back to the TAO <a href="../index.html">documentation index</a>.&nbsp;<!--#include virtual="/~schmidt/cgi-sig.html" -->
 </body>
 </html>
diff --git a/TAO/docs/releasenotes/orbcore.html b/TAO/docs/releasenotes/orbcore.html
index 4c932e52eef..9fa1b985a40 100644
--- a/TAO/docs/releasenotes/orbcore.html
+++ b/TAO/docs/releasenotes/orbcore.html
@@ -1,435 +1,505 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>ORB Core Status</title>
+<HTML>
+<HEAD>
+   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+   <META NAME="GENERATOR" CONTENT="Mozilla/4.5b2 [en] (WinNT; I) [Netscape]">
+   <TITLE>ORB Core Status</TITLE>
 <!-- $Id$ -->
-</head>
-<body text="#000000" bgcolor="#FFFFFF">
-
-<!-- *********************************** -->
-<a name="toc"><h2>Table of Contents</h2></a>
-<ul>
-  <li><a href="#current">Current Status</a>
-  <li><a href="#issues">Known Issues</a>
-  <li><a href="#ongoing">Ongoing work</a>
-  <li><a href="#rework">Rework Notes</a>
-  <li><a href="#future">Future Work</a>
-  <li><a href="#completed">Completed Work</a>
-</ul>
-<!-- *********************************** -->
-
-<hr>
-<center>
-<h1> <a name="orb"></a>ORB &amp; ORB Core</h1>
-
-Point of contact: <a href="mailto: irfan@cs.wustl.edu">Irfan Pyarali</a>
-
-<p>Last Update: $Date$</p>
-</center>
-
-<!-- ============================================================ -->
-<a name="current"><h3>Current status:</h3></a>
-
-<ul>
-  <li><p>Trying to figure out a better <em>resource</em> management
-      scheme.  <em>Resouces</em> here include ORB, POA, connections,
-      profiles.... that provide services for CORBA invocations.</p>
-  </li>
-</ul>
-
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
-
-<!-- ============================================================ -->
-<a name="issues"><h3>Known issues:</h3></a>
-
-<ul>
-  <li><p>Since collocated objects run in the client thread's context,
-      calling <code>CORBA::ORB::shutdown()</code> does <em>not</em>
-      actually close down the target ORB but instead on the client
-      side ORB.  This issue will be addressed in the new ORB Core
-      architecture.</p>
-
-      <p>Also, since the collocated invocations circumvent POA
-      completely, POA Current won't get set up, LOCATION_FORWARD will
-      not work, race condition may occur when several threads invoke
-      operations on an objects registered with POAs with SINGLE_THREAD
-      policy, operation invocations will still get thru even the POA
-      is in holding state, or invoking operations on a servant that
-      has already been deactivated.</p>
-  </li>
-
-  <li><p>When using the thread-per-connection concurrency model, if
-      some client leave the socket connection open without sending any
-      request, the server will crash on NT.  This is because we are
-      doing a blocking recv when a server connection handler acts as
-      an active object, and the recv won't break out until the process
-      gets kill by the OS.  This is especially a problem on NT becuase
-      on shutdown, NT close down the socket service, which cause the
-      blocking recv to unblock at which point, these threads try to
-      access the already destroyed ORB resources.  A temporary
-      workaround is to close the sockets when the ORB is shutting
-      down.  But this is not portable and only works on NT.</p>
-  </li>
-
-  <li><p>Some CORBA objects need to have access to the ORB. We tend to
-      use <code>TAO_ORB_Core_instance()->orb()</code> to fetch the
-      right ORB the object is using. This is most often true when
-      implementing the shutdown method which allow other process to
-      shutdown a remote ORB. Althought this may be the "right" thing
-      to do in TAO, it is not CORBA compliant and hurts the
-      portability of object implementation.  A common way of getting
-      around this problem is to cache the ORB pointer in the object
-      when it is created and simply use the cached ORB when needed.
-      However, remember that there could be multiple ORBs in a process
-      and a POA may be shared by several ORBs. That means, we may not
-      handling the object with the same ORB it was
-      created. Collocation optimization further complicated the
-      problem.</p>
-
-      <p> At the moment, using
-      <code>TAO_ORB_Core_instance()->orb()</code> is the only sane way
-      to get arond the problem. Though there may be a better way.</p>
-  </li>
-
-  <li><p>Object references for objects dynamically created within a
-      server may not have proper host. When an object is dynamically
-      created and its object reference returned, it simply has to
-      "guess" at the host information that is returned in the IIOP
-      Profile.  Currently, it guesses using the host name, which is a
-      reasonable guess in most cases.  However, if there are multiple
-      interfaces on a machine <em>and</em> they have different host
-      names, it is possible that the desired effect will not be
-      realized, i.e., the connection to that new object may use a
-      different interface from the original object. Currently the only
-      way to change this is to use the <A
-      HREF="../Options.html#-ORBhost"><b>-ORBhost</b> option</a> to
-      manually specify that dynamically-created objects bind to a
-      specific interface so that their IIOP Profile has the desired
-      hostname. A more desirable fix is being investigated.</p>
-  </li>
-</ul>
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
-
-<!-- ============================================================ -->
-<a name="ongoing"><h3>Ongoing Work:</h3></a>
-
-<ul>
-  <li><p>ORB Core overhaul.</p>
-  </li>
-
-  <li><p>Identify/fix the problems in multithreaded client with TSS
-      resources. This could be done using the leader-follower model
-      (thread-pool.)</p>
-  </li>
-
-  <li><p>Support new concurrency models, e.g., Thread-per-Request,
-      thread pool, etc..</p>
-  </li>
-</ul>
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
-
-<!-- ============================================================ -->
-<a name="rework"><h3>Rework Notes:</h3></a>
-
-Here are some thoughts/points of concern that we have regarding the
-new ORB Core structure.
-
-<ul>
-  <li>
-</ul>
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
-
-<!-- ============================================================ -->
-<a name="future"><h3>Future work:</h3></a>
-
-<ul>
-  <li>Performance optimizations, such as:</li>
-      <ol>
-        <li><p>Replace all uses of <code>new</code> and <code>delete</code>
-            with allocators that can be put into TSS. The main
-            motivation for this is to eliminate lock contention when
-            multiple threads need to allocate/deallocate memory,
-            however it might also be possible to substitute an
-            allocator better-tuned to an application's specific
-            usage.</p>
-        </li>
-      </ol>
-
-  <li>Robustness improvements:</li>
-      <ol>
-        <li><p>Improve connection cache so that it won't crash when
-            there are no more slots or sockets.
-        </li>
-
-        <li><p>Add an option to the ORB core, e.g.,
-            <b>-ORBnameservicetimeout</b>, to allow specification of
-            an upper bound on the itime-to-wait for a response from
-            the ORB's multicast "search" for a running name server.<p>
-        </li>
-      </ol>
-
-  <li>New features:</li>
-      <ol>
-        <li><p>Implement <code>ORB::perform_work</code> and
-            <code>ORB::work_pending</code> so that <code>ORB::run</code>
-            <em>could</em> be implemented in terms of them.</p>
-        </li>
-
-        <li><p>Implement <code>RT-CORBA</code> spec. once it passes
-            OMG member vote.</p>
-        </li>
-
-        <li><p>Added support for CORBA Messaging Spec.</p>
-        </li>
-
-        <li><p>According to tentative CORBA 2.3a spec, once
-            ORB::shutdown has been called, operation invocations on
-            object references obtained from this ORB must throw an
-            <code>BAD_INV_ORDER</code> exception.</p>
-        </li>
-      </ol>
-
-  <li>Internal restructuring:</li>
-      <ol>
-        <li><p>Create some sort of internal "request" object which
-            carries enough context to suport deferred method
-            invocation such as one might find in the thread-pool
-            approach or wherever queuing might occur.</p>
-        </li>
-      </ol>
-
-  <li>Documentation:</li>
-        <li><p>Writing up ORB restructuring notes.</p>
-        </li>
-      </ol>
-
-  <li>Potential Optimizations:</li>
-
-      <ol>
-        <li><p>There is a certain amount of overhead introduced by the
-            use of TSS Singletons. TSS singletons are very convenient
-            as the variable does not have to be passed from function
-            to function. Even though sort of access is generally
-            acceptable, the overhead of this approach maybe too high
-            when used in code which is executed frequently (e.g.,
-            during an upcall). This critical code may have to be
-            restructured not to use TSS Singletons because of the high
-            overhead associated with it.</p>
-        </li>
-      </ol>
-</ul>
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
-
-<!-- ============================================================ -->
-<a name="completed"><h3>Completed Work:</h3></a>
-
-<!-- ************************************************************ -->
-<!-- Please make sure you append new items at the end of the list -->
-<!-- ************************************************************ -->
-<ul>
-  <li><p>Provides dynamically linked wholesale assignment of ORB
-      strategies for communication, concurrency, demultiplexing,
-      scheduling, and dispatching using the ACE Service Configurator
-      framework.</p>
-  </li>
-
-  <li><p>Supports several concurrency models out of the box: Reactive,
-      Thread-per-Connection, and ORB-per-thread. The ORB-per-thread
-      design is optimized for real-time I/O subsystems. (See: <A
-      HREF="../configurations.html">Configuration Guide</a>.)</p>
-  </li>
-
-  <li><p>Supports <code>resolve_initial_references("&lt;CORBA
-      Service>")</code> using ACE support for multicast. <em>(TAO
-      proprietary.)</em></p>
-  </li>
-
-  <li><p>Support both native C++ exceptions and
-      <code>CORBA::Environment</code> based exceptions handling.</p>
-
-  <li><p>Support for TAO proprietary <code>-ORBgioplite</code>
-      command-line option.  When this option is enabled the ORB
-      removes a few fields of the GIOP messages that are normally not
-      used, such as the version numbers, the magic 'GIOP' string, the
-      service context, the Principal object, etc. This option give us
-      a slight performance improvement but it is important for
-      extremely low-latency systems (such as avionics), that
-      fortunately have tightly controlled environments so this kind of
-      optimization is safe to use.</p>
-  </li>
-
-  <li><p>The buffers for outgoing CDR streams are allocated from TSS
-      memory pools, reducing locking on the critical path.</p>
-  </li>
-
-  <li><p>Several optimizations on the critical path have been
-      implemented, carefully removing excesive locking, memory
-      allocations and data copying. In some cases special demarshaling
-      and marshaling functions where written for the request
-      headers.</p>
-  </li>
-
-  <li><p>Adding a new option into TAO_Resource_Factory to control the
-      internal lock used by ORB's reacotr. With "<code>-ORBreactorlock
-      null</code>" added into <code>svc.conf</code>, you can eliminate
-      the token inside the Select_Reactor inside the ORB even on
-      multi-threaded platforms. This eliminate some overheads caused
-      by synchronizing access to the Select_Reactor. Usually, if you
-      have TSS ORB and are using reactive concurrency startegy, the
-      ORB are not accessed by multiple threads, then, you can safely
-      turn the lock off.</p>
-  </li>
-
-  <li><p>Strategized the connection management scheme so that we don't
-      always have to pay the price of a look up in the connection
-      cache. Basically, we "hold" a service handler for a string of
-      requests.</p>
-  </li>
-
-  <li><p>There is no need to call ORB::open if the port is 0. It will
-      automagically be called when the first stub is created.</p>
-  </li>
-
-  <li><p>The ORB now handles nested upcalls correctly. See <a
-      href="../leader_follower.html">this </a>for details on the
-      design of the solution.</p>
-  </li>
-
-  <li><p>Added optimization for collocated objects. This optimization
-      enables TAO to bypass communication layers and talks to
-      collocated objects directly.</p>
-  </li>
-
-  <li><p>Making the collocation table configurable. We can either use
-      a global collocation table to share objects among ORBs, or use
-      the per-ORB collocation table.</p>
-  </li>
-
-  <li><p>Implement the inheritance mechanism in
-      Default_Server_Connection_Handler to access the parent's
-      POA. This is necessary when we are using thread-per-connection
-      concurrency model.</p>
-  </li>
-
-  <li><p>It is often desireable for a server to start up and not have
-      to specify the TCP port number on which the ORB will listen,
-      i.e., let the OS decide.  While this works properly (by
-      providing an argument <code>-ORBport 0</code>), the actual port
-      number used by the server won't be available after the server
-      starts listening. TAO now tries to bind the address when
-      <code>-ORBport 0</code> is issued so it can get the actual
-      address to publish the IOR for clients' use.</p>
-  </li>
-
-  <li><p>Broke the tight coupling between <code>CORBA_Object</code>
-      and <code>IIOP_Object</code> so that multiple
-      <code>CORBA_Object</code>s can share a single
-      <code>IIOP_Object</code>. This has a big win in
-      <code>_narrow</code> operations.</p>
-  </li>
-
-  <li><p>The ORBs manipulation of object keys and object ids is now
-      consistent. Canonically, everything is managed as an opaque
-      sequence of octets. Conversion to/from strings is permitted,
-      with non-printables turning into a trigraph <b>\hl</b> where
-      <b>h</b> is the high nibble digit in hex, and <b>l</b> is the
-      low nibble in hex.</p>
-  </li>
-
-  <li><p><code>CORBA_ORB::run()</code> should be able to be called
-      multiply in the same execution path now.</p>
-  </li>
-
-  <li><p>Fixed the <b>LOCATION_FORWARD</b> capabilities to work as
-      described in the CORBA 2.1 and the POA specification.</p>
-  </li>
-
-  <li><p>Support for <b><a
-      href="../Options.html#-ORBsndsock">-ORBsndsock</a></b> and <b><a
-      href="../Options.html#-ORBrcvsock">-ORBrcvsock</a></b> ORB
-      options. See <a href="../Options.html">options documentation</a>
-      for details.</p>
-  </li>
-
-  <li><p>Support for connections pre-establishment using the <b><a
-      href="../Options.html#-ORBpreconnect">-ORBpreconnect</a></b>
-      option. This allows connections to be esablished before any
-      CORBA requests are made. See <a href="../Options.html">options
-      documentation</a> for details.</p>
-  </li>
-
-  <li><p>Placed an optimization in IIOP::Profile that should speed up
-      invocations on the client side rather substantially. This was
-      done by caching an instance of <code>ACE_INET_Addr</code> in the
-      private portion of <code>Profile</code> because the cost of
-      constructing one for every invocation (in
-      <code>TAO_GIOP_Invocation::start</code>) was simply
-      enormous--the construction was something like 100 cycles on
-      Solaris. This is all because deep down this ends up calling
-      <code>gethostbyname()</code>, which can be very costly. Of
-      course, this is platform-dependent, so the improvements may not
-      be as great on a different platform.</p>
-  </li>
-
-  <li><p>Eliminated need for <code>CORBA::Object</code> to keep a
-      pointer to its orb sitting around anywhere.</p>
-  </li>
-
-  <li><p>Tested <code>CORBA_ORB::shutdown()</code> as a manner in
-      which a thread of control can request that
-      <code>CORBA_ORB::run()</code> should return and no longer
-      service requests. It only honors a <em>wait_for_completion</em>
-      argument of <b>FALSE</b> right now because we haven't fully
-      explored the issues which surround doing all the completion.</p>
-  </li>
-
-  <li><p>Implemented <code>CORBA_ORB::shutdown()</code> as a manner in
-      which a thread of control can request that
-      <code>CORBA_ORB::run()</code> should return and no longer
-      service requests.</p>
-  </li>
-
-  <li><p>Support for the -ORBInitRef option. This allows run-time
-      specification of an ObjectId:IOR mapping. It is used by
-      resolve_initial_references () and overrides the orb-install-time
-      defaults.</p>
-  </li>
-
-  <li><p>minimal support for CORBA Contexts. This is an inherently
-      un-typesafe feature, and many believe it will disappear from
-      CORBA eventually, but in order to make _create_request()
-      compliant, we have added a CORBA_Context class. The only
-      permissible value for a Context pointer passed as an argument to
-      _create_request is 0. If a non-zero pointer is passed, a
-      NO_IMPLEMENT exception is raised.</p>
-  </li>
-
-  <li><p>Support configuring TAO's component as both static and
-      dynamic services.   Improve robustness of setting default
-      svc.conf entries.  See <a
-      href="../configurations.html#programming">Configuration
-      Document</a> for details.</p>
-  </li>
-
-  <li><p>TAO now understands <a
-      href="index.html#nservices">Interoperable Naming Service</a>'s
-      <code>iioploc://</code> and <code>iiopname://</code>
-      formats.</p>
-  </li>
-</ul>
-<!-- --------------------- -->
-<a href="#toc">Back to TOC</a>
-<!-- --------------------- -->
+</HEAD>
+<BODY TEXT="#000000" BGCOLOR="#FFFFFF">
+
+<H3>
+<A NAME="orb"></A>ORB &amp; ORB Core</H3>
+Point of contact: <A HREF="mailto:nanbor@cs.wustl.edu">Nanbor Wang</A>
+<P>Last Update: $Date$
+<P><B>Current status:</B>
+<UL>
+<LI>
+Provides dynamically linked wholesale assignment of ORB strategies for
+communication, concurrency, demultiplexing, scheduling, and dispatching
+using the ACE Service Configurator framework.</LI>
+
+<LI>
+Supports several concurrency models out of the box: Reactive, Thread-per-Connection,
+and ORB-per-thread. The ORB-per-thread design is optimized for real-time
+I/O subsystems. (See: <A HREF="../configurations.html">Configuration Guide</A>.)</LI>
+
+<LI>
+Supports <TT>resolve_initial_references("&lt;CORBA Service>")</TT> using
+ACE support for multicast.</LI>
+</UL>
+<B>Known issues:</B>
+<UL>
+<LI>
+
+Some CORBA objects need to have access to the ORB. We tend to use
+<CODE>TAO_ORB_Core_instance()->orb()</CODE> to fetch the right ORB the
+object is using. This is most often true when implementing the
+shutdown method which allow other process to shutdown a remote
+ORB. Althought this may be the "right" thing to do in TAO, it is not
+CORBA compliant and hurts the portability of object implementation.  A
+common way of getting around this problem is to cache the ORB pointer
+in the object when it is created and simply use the cached ORB when
+needed.  However, remember that there could be multiple ORBs in a
+process and a POA may be shared by several ORBs. That means, we may
+not handling the object with the same ORB it was created. Collocation
+optimization further complicated the problem. <P> At the moment, using
+<CODE>TAO_ORB_Core_instance()->orb()</CODE> is the only sane way to
+get arond the problem. Though there may be a better way. <P>
+
+<LI> Object references for objects dynamically created within a server
+may not have proper host. (See also <A HREF="#hostfix">recent
+fix</A>.) When an object is dynamically created and its object
+reference returned, it simply has to "guess" at the host information
+that is returned in the IIOP Profile.  Currently, it guesses using the
+host name, which is a reasonable guess in most cases.  However, if
+there are multiple interfaces on a machine <I>and</I> they have
+different host names, it is possible that the desired effect will not
+be realized, i.e., the connection to that new object may use a
+different interface from the original object. Currently the only way
+to change this is to use the <A
+HREF="../Options.html#-ORBhost"><B>-ORBhost</B> option</A> to manually
+specify that dynamically-created objects bind to a specific interface
+so that their IIOP Profile has the desired hostname. A more desirable
+fix is being investigated.<P> </UL>
+
+<B>Recently Completed Work:</B>
+<UL>
+<LI>
+The ORB Core is ready to throw exceptions received from the wire as a native
+C++ exception. Similarly, on the server side, native C++ exceptions are
+catched and sent over the wire to the client.</LI>
+
+<LI>
+Added new option <TT>-ORBiioplite</TT> when this option is enabled the
+ORB removes a few fields of the GIOP messages that are normally not used,
+such as the version numbers, the magic 'GIOP' string, the service context,
+the Principal object, etc. This option give us a slight performance improvement
+but it is important for extremely low-latency systems (such as avionics),
+that fortunately have tightly controlled environments so this kind of optimization
+is safe to use.</LI>
+
+<LI>
+The buffers for outgoing CDR streams are allocated from TSS memory pools,
+reducing locking on the critical path.</LI>
+
+<LI>
+Several optimizations on the critical path have been implemented, carefully
+removing excesive locking, memory allocations and data copying. In some
+cases special demarshaling and marshaling functions where written for the
+request headers.</LI>
+
+<LI>
+Adding a new option into TAO_Resource_Factory to control the internal lock
+used by ORB's reacotr. With "<TT>-ORBreactorlock null</TT>" added into
+<TT>svc.conf</TT>, you can eliminate the token inside the Select_Reactor
+inside the ORB even on multi-threaded platforms. This eliminate some overheads
+caused by synchronizing access to the Select_Reactor. Usually, if you have
+TSS ORB and are using reactive concurrency startegy, the ORB are not accessed
+by multiple threads, then, you can safely turn the lock off.
+
+<LI>
+Strategized the connection management scheme so that we don't always have
+to pay the price of a look up in the connection cache. Basically, we "hold"
+a service handler for a string of requests.</LI>
+
+<LI>
+There is no need to call ORB::open if the port is 0. It will automagically
+be called when the first stub is created.
+
+<LI> The ORB now handles nested upcalls correctly. See <A
+HREF="../leader_follower.html">this </A>for details on the design of
+the solution.
+
+<LI> Making the collocation table configurable. We can either use a
+global collocation table to share objects among ORBs, or use the
+per-ORB collocation table.
+
+<LI>
+Implement the inheritance mechanism in Default_Server_Connection_Handler
+to access the parent's POA. This is necessary when we are using thread-per-connection
+concurrency model.
+
+<LI> It is often desireable for a server to start up and not have to
+specify the TCP port number on which the ORB will listen, i.e., let
+the OS decide.  While this works properly (by providing an argument
+<TT>-ORBport 0</TT>), the actual port number used by the server won't
+be available after the server starts listening. TAO now tries to bind
+the address when <TT>-ORBport 0</TT> is issued so it can get the
+actual address to publish the IOR for clients' use.
+
+<LI> Added optimization for collocated objects. This optimization
+enables TAO to bypass communication layers and talks to collocated
+objects directly.
+
+<LI>
+Broke the tight coupling between <TT>CORBA_Object</TT> and <TT>IIOP_Object</TT>
+so that multiple <TT>CORBA_Object</TT>s can share a single <TT>IIOP_Object</TT>.
+This has a big win in <TT>_narrow</TT> operations.
+
+<LI>
+Eliminated substantial memory leaks in servers.
+
+<LI>
+Added documentation for <B><A HREF="../Options.html#-ORBpoa">-ORBpoa</A></B>,
+which allows individual tweaking of the POA's locality (global vs. thread-specific)
+independent of the locality of other ORB resources. Also, <B><A HREF="../Options.html#-ORBpoalock">-ORBpoalock</A></B>
+and <B><A HREF="../Options.html#-ORBpoamgrlock">-ORBpoamgrlock</A></B>
+control locking in the POA and POA manager, respectively, according to
+application needs.
+
+<LI>
+Began the process of changing the internals of TAO to use the "underbar"
+namespace mapping. This should be completed soon.
+
+<LI>
+The ORBs manipulation of object keys and object ids is now consistent.
+Canonically, everything is managed as an opaque sequence of octets. Conversion
+to/from strings is permitted, with non-printables turning into a trigraph
+<B>\hl</B> where <B>h</B> is the high nibble digit in hex, and <B>l</B>
+is the low nibble in hex.</LI>
+
+<LI>
+<TT>CORBA_ORB::run()</TT> should be able to be called multiply in the same
+execution path now.</LI>
+
+<LI>
+Fixed the <B>LOCATION_FORWARD</B> capabilities to work as described in
+the CORBA 2.1 and the POA specification.</LI>
+
+<LI>
+Fixed problem in the IDL Cubit example which caused the server to dump
+core when dealing with <TT>_out</TT> sequence types <I>ONLY</I> when compiled
+with G++. It seems that G++ decided to interpret the expression <TT>output
+== 0</TT> (where <TT>output</TT> is of type <TT>vector_out</TT>) differently
+from Sun's C++ compiler.</LI>
+
+<LI>
+Fixed a slight problem in <A HREF="#hostfix">other recent work</A> where
+a servant listening on <TT>INADDR_ANY</TT> reported an IOR with address
+<TT>0.0.0.0</TT>. It now reports the default hostname instead.</LI>
+
+<LI>
+Working version of TAO on VxWorks with VME transport.</LI>
+
+<LI>
+TAO now reacts gracefully in the face of a non-existent <TT>svc.conf</TT>
+file or simply missing entries in the file. It logs a warning message and
+uses default values versions of items which it would normally obtain from
+the Service Repository.</LI>
+
+<LI>
+<A NAME="hostfix"></A>Fixed problem where object references for objects
+dynamically created within a server do not have proper host, at least if
+the desired host was specified using <B><A HREF="../Options.html#-ORBhost">-ORBhost</A></B>
+on the command line.</LI>
+
+<LI>
+Added support for <B><A HREF="../Options.html#-ORBsndsock">-ORBsndsock</A></B>
+and <B><A HREF="../Options.html#-ORBrcvsock">-ORBrcvsock</A></B> ORB options.
+See <A HREF="../Options.html">options documentation</A> for details.</LI>
+
+<LI>
+Added support for pre-established connections using the <B><A HREF="../Options.html#-ORBpreconnect">-ORBpreconnect</A></B>
+option. This allows connections to be esablished before any CORBA requests
+are made. See <A HREF="../Options.html">options documentation</A> for details.</LI>
+
+<LI>
+Eliminated deprecated <B>-OAxxx</B> options parsed by the Object Adapter
+<TT>init</TT> method but no longer used by part of the ORB.</LI>
+
+<LI>
+Made argument parsing within the ORB and POA consume the arguments it parses.</LI>
+
+<LI>
+Placed an optimization in IIOP::Profile that should speed up invocations
+on the client side rather substantially. This was done by caching an instance
+of <TT>ACE_INET_Addr</TT> in the private portion of <TT>Profile</TT> because
+the cost of constructing one for every invocation (in <TT>TAO_GIOP_Invocation::start</TT>)
+was simply enormous--the construction was something like 100 cycles on
+Solaris. This is all because deep down this ends up calling <TT>gethostbyname()</TT>,
+which can be very costly. Of course, this is platform-dependent, so the
+improvements may not be as great on a different platform.</LI>
+
+<LI>
+Got rid of need to have compile in TSS ORB Core (<TT>-DTAO_HAS_TSS_ORBCORE</TT>).
+This is accomplished by having a Resource Factory (<TT>TAO_Resource_Factory</TT>)
+singleton which the ORB Core consults in order to get pointers to resources.
+The Resource Factory can be configured to return pointers from thread-specific
+storage, or process-global storage. By doing this, the ORB Core is shielded
+from ever having to know whether or not its resources are global or not.</LI>
+
+<LI>
+Made all command-line like options look like the standard-professed options,
+i.e., <B>-ORBxxx</B> or <B>-OAxxxx</B>.</LI>
+
+<LI>
+Moved ORB option parsing into <TT>TAO_ORB_Core::init()</TT> rather than
+in <TT>ORB_init()</TT>.</LI>
+
+<LI>
+Define <TT>_FAR</TT> for all cases as an interim fix for LynxOS.</LI>
+
+<LI>
+Fixed TAO so that the default port of 5001 is defined in <TT>orb_core.h</TT>
+config header somewhere rather than in <TT>orbobj.cpp</TT>, and use <B>MAXHOSTNAMELEN</B>
+ACE
+constant for the hostname buffer.</LI>
+
+<LI>
+Eliminated need for <TT>CORBA::Object</TT> to keep a pointer to its orb
+sitting around anywhere.</LI>
+
+<LI>
+Tested <TT>CORBA_ORB::shutdown()</TT> as a manner in which a thread of
+control can request that <TT>CORBA_ORB::run()</TT> should return and no
+longer service requests. It only honors a <I>wait_for_completion</I> argument
+of <B>FALSE</B> right now because we haven't fully explored the issues
+which surround doing all the completion.</LI>
+
+<LI>
+Created a brief section in <TT><A HREF="../../TAO-INSTALL.html">$TAO_ROOT/TAO-INSTALL.html</A></TT>
+that <I>briefly</I> documents installation on Unix platforms. There is
+also a brief section which documents issues that apply across ALL platforms,
+such as the fact that TAO and its application will likely not work well
+if your ACE is linked through Orbix, VisiBroker, or another ORB. <A HREF="../../ChangeLog">ChangeLog</A>
+discovery attribution for this should go to <I>Steve Wohlever &lt;wohlever@mitre.org></I>.</LI>
+
+<LI>
+Implemented <TT>CORBA_ORB::shutdown()</TT> as a manner in which a thread
+of control can request that <TT>CORBA_ORB::run()</TT> should return and
+no longer service requests.</LI>
+
+<LI>
+Validated movement of Strategy Connector into ORB Core.</LI>
+
+<LI>
+Tested and commited <TT>Connector::connect_n</TT> changes to ACE.</LI>
+
+<LI>
+ACE &amp; TAO compiling cleanly using Sun's CC on Solaris and G++ on Linux.
+Also, the ACE tests run properly.</LI>
+
+<LI>
+Use <TT>truss</TT> to verify for <A HREF="mailto:PAUL.G.WEHLAGE@cdev.com">Paul
+Wehlage</A> that TAO really uses <TT>select</TT> vs. <TT>recv</TT> for
+<B>-R</B> vs. <B>-T</B>.</LI>
+
+<LI>
+Renamed <TT>boa.*</TT> to <TT>poa.*</TT>.</LI>
+
+<LI>
+Renamed following files: Orb_Core.* ->orb_core.* &amp; orbobj.* -> corba_orb.*.</LI>
+
+<LI>
+The lock used in <TT>giop.cpp:626</TT> originally appeared in the IIOP-1.4
+code base. Its purpose was to protect access to the <TT>fwd_profile</TT>
+data member. The original features are available, but they are currently
+not used because none of our concurrency models present a thread-unsafe
+condition. The <A HREF="../../ChangeLog">ChangeLog</A> presents more details
+on the subject.</LI>
+
+<LI>
+Fixed problems seen by <A HREF="mailto:brian.r.mendel@boeing.com">Brian
+Mendel</A> of Boeing where the Cubit server application was crashing in
+<TT>TAO_OA_Connection_Handler::handle_message</TT> when it was trying to
+call <TT>CORBA::POA::handle_request</TT> through a NULL <TT>root_poa</TT>
+pointer. The NULL pointer resulted from the inadvertent use of the Thread-per-Connection
+concurrency model, which is currently incompatible with the ORB-per-thread
+model. It was not caught because the change is normally done in configuration
+files parsed by the Service Configurator, and VxWorks requires special
+code in that area which was not tested until Boeing got hold of the code.</LI>
+
+<LI>
+Clean up build under g++. All 'function used before declared inline' warnings
+have been eliminated. Also, all other warnings (except for one that is
+nearly unavoidable) have been eliminated.</LI>
+
+<LI>
+Removed BOA and ROA names from the ORB.</LI>
+
+<LI>
+Changed <TT>CORBA_ORB::open()</TT> to return an error status (first cut
+at this already there--needs to be checked out).</LI>
+
+<LI>
+Added README file to multiCubit test.</LI>
+
+<LI>
+Added support for the -ORBInitRef option. This allows run-time specification of
+an ObjectId:IOR mapping. It is used by resolve_initial_references () and
+overrides the orb-install-time defaults.</LI>
+
+</UL>
+<B>Ongoing Work:</B>
+<UL>
+<LI>
+Verify ACE &amp; TAO on Linux using g++, Solaris using CC, and Solaris
+using g++.</LI>
+
+<LI>
+Use Purify to eliminate straggling problems.</LI>
+
+<LI>
+Clean up the internals and analyze for performance bottlenecks using Quantify.</LI>
+
+<LI>
+Resolve <TT>// @@</TT> comment blocks. These are questions or comments
+placed in the code by a reviewer (typically Doug).</LI>
+
+<LI>
+Make more and better documentation on the internals of TAO.</LI>
+</UL>
+<B>Current Work:</B>
+<UL>Verify that, in the ORB-per-thread concurrency model, it's possible
+to have a factory in each thread that creates a client and returns an object
+reference to that client within that thread. This is different from the
+model that Sumedh originally had where the factory was trying to turn out
+a client in a separate thread/ORB combination.
+There is no application which attempts this at the moment, so both a
+client and a server will need to be manufactured. Using existing Cubit-like
+examples (that poor app is so weary) should reduce development time to
+a couple of hours.
+The real strategy/solution is to make <TT>CORBA::Object</TT> not keep
+a pointer to its orb sitting around anywhere. It should only get it when
+it needs it. This should not be difficult to change.</UL>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; The interface Dynamic
+Any (CORBA v.2.2) is being implemented. It will conform to and implement
+all areas of the spec except for the following:
+<UL>
+<LI>
+Interface DynFixed not implemented since TAO does not currently support
+the IDL fixed data type.</LI>
+
+<LI>
+Long double data type not supported in accessor and mutator functions.</LI>
+
+<LI>
+Wstring (wide character string) data type not supported in accessor and
+mutator functions.</LI>
+
+<LI>
+DynUnion attribute set_as_default in treated as read only.</LI>
+</UL>
+<B>Critical Work:</B>
+<UL>
+<LI>
+Identify/fix the problems in multithreaded client with TSS resources. This
+could be done using the leader-follower model (thread-pool.)</LI>
+
+<LI>
+Support new concurrency models, e.g., Thread-per-Request, thread pool,
+etc..</LI>
+</UL>
+<B>Future work:</B>
+<UL>
+<LI>
+Performance optimizations, such as:</LI>
+
+<OL>
+<LI>
+Replace all uses of <TT>new</TT> and <TT>delete</TT> with allocators that
+can be put into TSS. The main motivation for this is to eliminate lock
+contention when multiple threads need to allocate/deallocate memory, however
+it might also be possible to substitute an allocator better-tuned to an
+application's specific usage.</LI>
+</OL>
+
+<LI>
+Robustness improvements:</LI>
+
+<OL>
+<LI>
+Improve connection cache so that it won't crash when there are no more
+slots or sockets.</LI>
+
+<LI>
+Add an option to the ORB core, e.g., <B>-ORBnameservicetimeout</B>, to
+allow specification of an upper bound on the itime-to-wait for a response
+from the ORB's multicast "search" for a running name server.</LI>
+</OL>
+
+<LI>
+New features:</LI>
+
+<OL>
+<LI>
+Implement <TT>ORB::perform_work</TT> and <TT>ORB::work_pending</TT> so
+that <TT>ORB::run</TT> <I>could</I> be implemented in terms of them.</LI>
+
+<LI>
+Improve the <TT>Service Configurator</TT> service entry faking on VxWorks.</LI>
+
+<LI>
+Integrate with realtime upcalls (RTUs).</LI>
+</OL>
+
+<LI>
+Internal restructuring:</LI>
+
+<OL>
+<LI>
+Create some sort of internal "request" object which carries enough context
+to suport deferred method invocation such as one might find in the thread-pool
+approach or wherever queuing might occur.</LI>
+</OL>
+
+<LI>
+Documentation:</LI>
+
+<OL>
+<LI>
+Update ORB Patterns paper to reflect the latest TAO has to offer. Specifically</LI>
+
+<UL>
+<LI>
+sections on the Abstract Factory and Concurrency strategies need to be
+updated, and the entire paper needs to be reviewed for accuracy w.r.t the
+current TAO.</LI>
+
+<LI>
+Metrics must be re-computed.</LI>
+
+<LI>
+Tighten existing discussions.</LI>
+
+<LI>
+Add information on new patterns (such as TSS) which have been used since
+initial work.</LI>
+</UL>
+
+<LI>
+Make the section in <TT><A HREF="../../TAO-Install.html">$TAO_ROOT/TAO-Install.html</A></TT>
+that documents installation on Unix platforms more complete.</LI>
+</OL>
+
+<LI>
+Miscellany:</LI>
+
+<OL>
+<LI>
+Assist in porting higher level services (e.g., <A HREF="ec.html">Event
+Channel</A>) to TAO.</LI>
+
+<LI>
+Compile and verify ACE and TAO on Linux using the Kuck and Associates,
+Inc. (KAI) compiler tools.</LI>
+</OL>
+
+<LI>
+Potential Optimizations:</LI>
+
+<OL>
+<LI>
+There is a certain amount of overhead introduced by the use of TSS Singletons.
+TSS singletons are very convenient as the variable does not have to be
+passed from function to function. Even though sort of access is generally
+acceptable, the overhead of this approach maybe too high when used in code
+which is executed frequently (e.g., during an upcall). This critical code
+may have to be restructured not to use TSS Singletons because of the high
+overhead associated with it.</LI>
+</OL>
+</UL>
 
 </BODY>
 </HTML>
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.dsw b/TAO/examples/Callback_Quoter/Callback_Quoter.dsw
index c237c5e736b..580d27aecee 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.dsw
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

+Microsoft Developer Studio Workspace File, Format Version 5.00

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

 

 ###############################################################################

diff --git a/TAO/examples/Callback_Quoter/Consumer.dsp b/TAO/examples/Callback_Quoter/Consumer.dsp
index 28286ee798f..a3500963b04 100644
--- a/TAO/examples/Callback_Quoter/Consumer.dsp
+++ b/TAO/examples/Callback_Quoter/Consumer.dsp
@@ -1,339 +1,221 @@
-# Microsoft Developer Studio Project File - Name="Consumer" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Consumer - 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 "Consumer.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 "Consumer.mak" CFG="Consumer - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

- "Win32 (x86) Console Application")

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

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Consumer - 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 ""

-# 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 "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib tao.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "Consumer - 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 "..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /U "SIGWINCH" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Consumer - Win32 Release"

-# Name "Consumer - Win32 Debug"

-# Begin Group "Source files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\consumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_Input_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_Signal_Handler.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.cpp

-# End Source File

-# End Group

-# Begin Group "Header files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Consumer_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_Input_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Consumer_Signal_Handler.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.i

-# End Source File

-# End Group

-# Begin Group "IDL files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Consumer.idl

-

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

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Consumer.idl

-InputName=Consumer

-

-BuildCmds= \

-	tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs

-

-"$(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)" == "Consumer - Win32 Debug"

-

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

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Consumer.idl

-InputName=Consumer

-

-BuildCmds= \

-	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notifier.idl

-

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

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Notifier.idl

-InputName=Notifier

-

-BuildCmds= \

-	tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs

-

-"$(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)" == "Consumer - Win32 Debug"

-

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

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Notifier.idl

-InputName=Notifier

-

-BuildCmds= \

-	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="Consumer" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Consumer - 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 "Consumer.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 "Consumer.mak" CFG="Consumer - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Consumer - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Consumer - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Consumer - 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 /MDd /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\\" /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 /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ELSEIF  "$(CFG)" == "Consumer - 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 "..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /U "SIGWINCH" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Consumer - Win32 Release"
+# Name "Consumer - Win32 Debug"
+# Begin Group "Source files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\consumer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_i.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_Input_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_Signal_Handler.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.cpp
+# End Source File
+# End Group
+# Begin Group "Header files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Consumer_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_Input_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Consumer_Signal_Handler.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.i
+# End Source File
+# End Group
+# Begin Group "IDL files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\Consumer.idl
+USERDEP__CONSU="..\..\..\bin\tao_idl.exe"	
+
+!IF  "$(CFG)" == "Consumer - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "Consumer - Win32 Debug"
+
+# Begin Custom Build - Invoking TAO_IDL Compiler
+InputPath=.\Consumer.idl
+InputName=Consumer
+
+BuildCmds= \
+	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/examples/Callback_Quoter/Makefile b/TAO/examples/Callback_Quoter/Makefile
index 952dd72c619..489dce2ad8d 100644
--- a/TAO/examples/Callback_Quoter/Makefile
+++ b/TAO/examples/Callback_Quoter/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,18 +14,18 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO -lorbsvcs
 
-IDL_SRC = NotifierC.cpp NotifierS.cpp ConsumerC.cpp ConsumerS.cpp
+IDL_SRC	= NotifierC.cpp NotifierS.cpp ConsumerC.cpp ConsumerS.cpp
 
 PROG_SRCS = \
-        consumer.cpp \
+	consumer.cpp \
         supplier.cpp \
-        Supplier_i.cpp \
-        Supplier_Timer_Handler.cpp\
-        notifier.cpp \
-        Notifier_Input_Handler.cpp \
-        Notifier_i.cpp \
+	Supplier_i.cpp \
+	Supplier_Timer_Handler.cpp\
+	notifier.cpp \
+	Notifier_Input_Handler.cpp \
+	Notifier_i.cpp \
         Consumer_i.cpp \
-        Consumer_Input_Handler.cpp \
+	Consumer_Input_Handler.cpp \
         Consumer_Signal_Handler.cpp \
         Consumer_Handler.cpp
 
@@ -33,49 +33,44 @@ PROG_SRCS = \
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 CONSUMER_CLT_OBJS = \
-                NotifierC.o \
-                NotifierS.o \
-                Consumer_Input_Handler.o \
+		NotifierC.o \
+		NotifierS.o \
+		Consumer_Input_Handler.o \
                 Consumer_Signal_Handler.o \
                 Consumer_Handler.o \
-                consumer.o\
-                ConsumerC.o\
-                ConsumerS.o \
-                Consumer_i.o
+		consumer.o\
+		ConsumerC.o\
+		ConsumerS.o \
+		Consumer_i.o
 MARKET_CLT_OBJS = \
-                NotifierC.o \
-                NotifierS.o \
-                Supplier_i.o \
-                Supplier_Timer_Handler.o \
-                supplier.o \
-                ConsumerC.o\
-                ConsumerS.o \
-                Consumer_i.o
+		NotifierC.o \
+		NotifierS.o \
+		Supplier_i.o \
+		Supplier_Timer_Handler.o \
+		supplier.o \
+		ConsumerC.o\
+		ConsumerS.o \
+		Consumer_i.o
 
 SIMPLE_SVR_OBJS = \
-                NotifierC.o \
-                NotifierS.o \
-                Notifier_i.o \
-                Notifier_Input_Handler.o \
-                ConsumerC.o\
-                ConsumerS.o\
-                notifier.o
+		NotifierC.o \
+		NotifierS.o \
+		Notifier_i.o \
+		Notifier_Input_Handler.o \
+		ConsumerC.o\
+		ConsumerS.o\
+		notifier.o
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = notifier \
-       consumer\
-       supplier
+BIN = notifier \
+      consumer\
+      supplier
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -88,7 +83,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
@@ -110,20 +105,56 @@ supplier:$(addprefix $(VDIR),$(MARKET_CLT_OBJS))
 consumer:$(addprefix $(VDIR),$(CONSUMER_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 realclean: clean
-	-$(RM) NotifierC.* NotifierS.* NotifierS_T.* \
-               ConsumerC.* ConsumerS.* ConsumerS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf NotifierC.* NotifierS.* NotifierS_T.* \
+                     ConsumerC.* ConsumerS.* ConsumerS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/NotifierC.o .obj/NotifierC.so .shobj/NotifierC.o .shobj/NotifierC.so: NotifierC.cpp NotifierC.h \
+.obj/NotifierC.o .obj/NotifierC.so .shobj/NotifierC.o .shobj/NotifierC.so: NotifierC.cpp NotifierC.h ConsumerC.h ConsumerC.i \
+ NotifierC.i NotifierS.h ConsumerS.h ConsumerS_T.h ConsumerS_T.i \
+ ConsumerS_T.cpp ConsumerS.i NotifierS_T.h NotifierS_T.i \
+ NotifierS_T.cpp NotifierS.i
+.obj/NotifierS.o .obj/NotifierS.so .shobj/NotifierS.o .shobj/NotifierS.so: NotifierS.cpp NotifierS.h ConsumerS.h ConsumerC.h \
+ ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
+ NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
+ NotifierS.i
+.obj/ConsumerC.o .obj/ConsumerC.so .shobj/ConsumerC.o .shobj/ConsumerC.so: ConsumerC.cpp ConsumerC.h ConsumerC.i ConsumerS.h \
+ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i
+.obj/ConsumerS.o .obj/ConsumerS.so .shobj/ConsumerS.o .shobj/ConsumerS.so: ConsumerS.cpp ConsumerS.h ConsumerC.h ConsumerC.i \
+ ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i
+.obj/consumer.o .obj/consumer.so .shobj/consumer.o .shobj/consumer.so: consumer.cpp Consumer_Handler.h ConsumerC.h ConsumerC.i \
+ NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h ConsumerS_T.h \
+ ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h NotifierS_T.h \
+ NotifierS_T.i NotifierS_T.cpp NotifierS.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ Consumer_Input_Handler.h Consumer_Signal_Handler.h
+.obj/supplier.o .obj/supplier.so .shobj/supplier.o .shobj/supplier.so: supplier.cpp Supplier_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -187,293 +218,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.h ConsumerC.i NotifierC.i NotifierS.h ConsumerS.h \
- ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS_T.h \
- NotifierS_T.i NotifierS_T.cpp NotifierS.i
-.obj/NotifierS.o .obj/NotifierS.so .shobj/NotifierS.o .shobj/NotifierS.so: NotifierS.cpp NotifierS.h ConsumerS.h ConsumerC.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/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/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 \
- $(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.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/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 \
@@ -500,52 +291,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -554,311 +299,22 @@ realclean: clean
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
- NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
- NotifierS.i
-.obj/ConsumerC.o .obj/ConsumerC.so .shobj/ConsumerC.o .shobj/ConsumerC.so: ConsumerC.cpp ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -880,287 +336,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
- ConsumerS.i
-.obj/ConsumerS.o .obj/ConsumerS.so .shobj/ConsumerS.o .shobj/ConsumerS.so: ConsumerS.cpp ConsumerS.h ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1177,350 +357,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i
-.obj/consumer.o .obj/consumer.so .shobj/consumer.o .shobj/consumer.so: consumer.cpp Consumer_Handler.h ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
- ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
- NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1529,18 +398,25 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
- Consumer_Input_Handler.h Consumer_Signal_Handler.h
-.obj/supplier.o .obj/supplier.so .shobj/supplier.o .shobj/supplier.so: supplier.cpp Supplier_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i \
+ Supplier_Timer_Handler.h
+.obj/Supplier_i.o .obj/Supplier_i.so .shobj/Supplier_i.o .shobj/Supplier_i.so: Supplier_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1548,16 +424,14 @@ realclean: clean
  $(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/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 \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -1596,6 +470,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ Supplier_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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 \
@@ -1604,314 +485,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i \
- Supplier_Timer_Handler.h
-.obj/Supplier_i.o .obj/Supplier_i.so .shobj/Supplier_i.o .shobj/Supplier_i.so: Supplier_i.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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.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/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/Read_Buffer.i \
- Supplier_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
@@ -1938,52 +558,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1992,31 +566,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2038,8 +603,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2056,65 +624,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -2123,17 +665,21 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i \
  Supplier_Timer_Handler.h
 .obj/Supplier_Timer_Handler.o .obj/Supplier_Timer_Handler.so .shobj/Supplier_Timer_Handler.o .shobj/Supplier_Timer_Handler.so: Supplier_Timer_Handler.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2210,299 +756,53 @@ realclean: clean
  $(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/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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i
-.obj/notifier.o .obj/notifier.so .shobj/notifier.o .shobj/notifier.so: notifier.cpp Notifier_Input_Handler.h Notifier_i.h \
- NotifierS.h ConsumerS.h ConsumerC.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/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/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 \
- $(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.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/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 \
@@ -2519,62 +819,7 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -2583,31 +828,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2629,8 +865,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2647,68 +886,61 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
- NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
- NotifierS.i \
+ $(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/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ NotifierC.h ConsumerC.h ConsumerC.i NotifierC.i
+.obj/notifier.o .obj/notifier.so .shobj/notifier.o .shobj/notifier.so: notifier.cpp Notifier_Input_Handler.h Notifier_i.h \
+ NotifierS.h ConsumerS.h ConsumerC.h ConsumerC.i ConsumerS_T.h \
+ ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierC.h NotifierC.i \
+ NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -2724,289 +956,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/Notifier_Input_Handler.o .obj/Notifier_Input_Handler.so .shobj/Notifier_Input_Handler.o .shobj/Notifier_Input_Handler.so: Notifier_Input_Handler.cpp \
  Notifier_Input_Handler.h Notifier_i.h NotifierS.h ConsumerS.h \
- ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
- NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
- NotifierS.i \
+ ConsumerC.h ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
+ ConsumerS.i NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i \
+ NotifierS_T.cpp NotifierS.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -3022,568 +978,16 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/Notifier_i.o .obj/Notifier_i.so .shobj/Notifier_i.o .shobj/Notifier_i.so: Notifier_i.cpp Notifier_i.h NotifierS.h ConsumerS.h \
- ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
- NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
- NotifierS.i \
+ ConsumerC.h ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
+ ConsumerS.i NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i \
+ NotifierS_T.cpp NotifierS.i \
  $(TAO_ROOT)/tao/TAO.h
 .obj/Consumer_i.o .obj/Consumer_i.so .shobj/Consumer_i.o .shobj/Consumer_i.so: Consumer_i.cpp Consumer_i.h ConsumerS.h ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  ConsumerC.i ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
  NotifierS.h NotifierC.h NotifierC.i NotifierS_T.h NotifierS_T.i \
  NotifierS_T.cpp NotifierS.i
@@ -3591,6 +995,9 @@ realclean: clean
  Consumer_Input_Handler.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3652,223 +1059,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- Consumer_Handler.h ConsumerC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
- ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
- NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
+ Consumer_Handler.h ConsumerC.h ConsumerC.i NotifierC.h NotifierC.i \
+ Consumer_i.h ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
+ ConsumerS.i NotifierS.h NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
+ NotifierS.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/TAO.h \
@@ -3881,17 +1075,21 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Consumer_Signal_Handler.h
 .obj/Consumer_Signal_Handler.o .obj/Consumer_Signal_Handler.so .shobj/Consumer_Signal_Handler.o .shobj/Consumer_Signal_Handler.so: Consumer_Signal_Handler.cpp \
  Consumer_Signal_Handler.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3953,223 +1151,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- Consumer_Handler.h ConsumerC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
- ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
- NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
+ Consumer_Handler.h ConsumerC.h ConsumerC.i NotifierC.h NotifierC.i \
+ Consumer_i.h ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp \
+ ConsumerS.i NotifierS.h NotifierS_T.h NotifierS_T.i NotifierS_T.cpp \
+ NotifierS.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/TAO.h \
@@ -4182,294 +1167,18 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Consumer_Input_Handler.h
 .obj/Consumer_Handler.o .obj/Consumer_Handler.so .shobj/Consumer_Handler.o .shobj/Consumer_Handler.so: Consumer_Handler.cpp Consumer_Handler.h \
- ConsumerC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h ConsumerS.h \
- ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i NotifierS.h \
- NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
+ ConsumerC.h ConsumerC.i NotifierC.h NotifierC.i Consumer_i.h \
+ ConsumerS.h ConsumerS_T.h ConsumerS_T.i ConsumerS_T.cpp ConsumerS.i \
+ NotifierS.h NotifierS_T.h NotifierS_T.i NotifierS_T.cpp NotifierS.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/TAO.h \
@@ -4482,12 +1191,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Consumer_Input_Handler.h Consumer_Signal_Handler.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
diff --git a/TAO/examples/Callback_Quoter/Notifier.dsp b/TAO/examples/Callback_Quoter/Notifier.dsp
index ac609bbd7ec..1c0fd431d53 100644
--- a/TAO/examples/Callback_Quoter/Notifier.dsp
+++ b/TAO/examples/Callback_Quoter/Notifier.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Notifier" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

@@ -37,13 +37,12 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

+# 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 "..\..\\" /I "..\..\orbsvcs" /I "..\..\orbsvcs\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\\" /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

@@ -159,130 +158,13 @@ SOURCE=.\NotifierS.i
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Consumer.idl

-

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

-

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Consumer.idl

-InputName=Consumer

-

-BuildCmds= \

-	tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

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

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Consumer.idl

-InputName=Consumer

-

-BuildCmds= \

-	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Notifier.idl

+USERDEP__NOTIF="..\..\..\bin\tao_idl.exe"	

 

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

 

-# Begin Custom Build - Invoking TAO_IDL compiler

-InputPath=.\Notifier.idl

-InputName=Notifier

-

-BuildCmds= \

-	tao_idl $(InputName).idl -I../../orbsvcs/orbsvcs

-

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

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

 

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

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Notifier.idl

 InputName=Notifier

diff --git a/TAO/examples/Callback_Quoter/Notifier_i.cpp b/TAO/examples/Callback_Quoter/Notifier_i.cpp
index 65aa956d458..5d24dcc77e7 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_i.cpp
@@ -51,7 +51,7 @@ Notifier_i::register_callback (const char *stock_name,
   // after the method invocation is done.
   consumer_data.consumer_ =
     Callback_Quoter::Consumer::_duplicate (consumer_handler);
-
+ 
   consumer_data.desired_value_= threshold_value;
 
   CONSUMERS *consumers = 0;
@@ -75,16 +75,19 @@ Notifier_i::register_callback (const char *stock_name,
     }
   else
     {
+      ///*done*/ @@ Make sure to use the ACE_NEW_THROW macro, which works with
+      // CORBA exceptions...
+      
+      
       // the unbounded set entry is created.
-      // NOTE:: its pathetic, but to make this macro call its necessary to name
+      // NOTE:: its pathetic, but to make this macro call its necessary to name 
       // your environment variable ACE_TRY_ENV
-      ACE_NEW_THROW_EX (consumers, CONSUMERS, CORBA::NO_MEMORY ());
-      ACE_CHECK;
+      ACE_NEW_THROW (consumers, CONSUMERS, CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
-      // When a new entry is tried to be inserted into the unbounded set and it
+      // When a new entry is tried to be inserted into the unbounded set and it 
       // fails an exception is raised.
       if (consumers->insert (consumer_data) == -1)
-        ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Stock
+        ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Stock 
                        ("Insertion failed! Invalid Stock!\n"));
 
       // The bond between the stockname <hash_key> and the consumers <hash_value>
@@ -97,7 +100,7 @@ Notifier_i::register_callback (const char *stock_name,
                     "new map entry: stockname %s threshold %d\n",
                     stock_name,
                     threshold_value));
-
+      
     }
 }
 
@@ -141,13 +144,13 @@ Notifier_i::unregister_callback (Callback_Quoter::Consumer_ptr consumer,
        // int_id is a member of the ACE_Hash_Map_Entry.  The remove
        // method will do a find internally using operator == which
        // will check only the consumer pointers.  If match found it
-       // will be removed from the set. If the consumer cannot be
+       // will be removed from the set. If the consumer cannot be 
        // removed an exception is raised.
 
        if ((*iter).int_id_->remove (consumer_to_remove) == -1)
-	 ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Handle
+	 ACE_TRY_ENV.exception (new Callback_Quoter::Invalid_Handle 
                                 ("Unregistration failed! Invalid Consumer Handle!\n"));
-
+                                
        else
         ACE_DEBUG ((LM_DEBUG,
 		    "unregister_callback:consumer removed\n"));
@@ -206,7 +209,7 @@ Notifier_i::market_status (const char *stock_name,
 
     // /*done*/@@ Please add a user defined exception called something like
     // NOT_FOUND.
-
+  
       // Exception is raised when the stock doesnt exist in the Hash_map.
     //  env.exception (new Callback_Quoter::Invalid_Stock (" Nonexistent Stock"));
   //  stock_name,
diff --git a/TAO/examples/Callback_Quoter/Supplier.dsp b/TAO/examples/Callback_Quoter/Supplier.dsp
index 9a7ee329684..16724d84ba5 100644
--- a/TAO/examples/Callback_Quoter/Supplier.dsp
+++ b/TAO/examples/Callback_Quoter/Supplier.dsp
@@ -1,260 +1,162 @@
-# Microsoft Developer Studio Project File - Name="Supplier" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Supplier - 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 "Supplier.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 "Supplier.mak" CFG="Supplier - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

- "Win32 (x86) Console Application")

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

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Supplier - 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 ""

-# 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 "..\..\..\\" /I "..\..\orbsvcs\\" /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "Supplier - 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 "..\..\..\\" /I "..\..\orbsvcs\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Supplier - Win32 Release"

-# Name "Supplier - Win32 Debug"

-# Begin Group "Source files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\consumerC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\supplier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier_Timer_Handler.cpp

-# End Source File

-# End Group

-# Begin Group "Header files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\consumerC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\consumerS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\NotifierS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier_Timer_Handler.h

-# End Source File

-# End Group

-# Begin Group "IDL files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Consumer.idl

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

-

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

-

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

-

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Consumer.idl

-InputName=Consumer

-

-BuildCmds= \

-	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Notifier.idl

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

-

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

-

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

-

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Notifier.idl

-InputName=Notifier

-

-BuildCmds= \

-	tao_idl $(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.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="Supplier" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=Supplier - 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 "Supplier.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 "Supplier.mak" CFG="Supplier - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Supplier - Win32 Release" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Supplier - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "Supplier - 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 /MDd /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\orbsvcs\\" /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 /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ELSEIF  "$(CFG)" == "Supplier - 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 "..\..\..\\" /I "..\..\orbsvcs\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace" /libpath:"..\..\orbsvcs\orbsvcs"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Supplier - Win32 Release"
+# Name "Supplier - Win32 Debug"
+# Begin Group "Source files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\consumerC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\supplier.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Supplier_i.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Supplier_Timer_Handler.cpp
+# End Source File
+# End Group
+# Begin Group "Header files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\consumerC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\consumerS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierC.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\NotifierS.i
+# End Source File
+# Begin Source File
+
+SOURCE=.\Supplier_i.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\Supplier_Timer_Handler.h
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 2e6a4a77469..05ebdf85a17 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -38,7 +38,7 @@ Supplier::~Supplier (void)
 {
   // Release the memory allocated for ior_.
   ACE_OS::free (this->ior_);
-
+  
   // Close the stream.
   ACE_OS::fclose (f_ptr_);
 
@@ -175,9 +175,9 @@ Supplier::send_market_status (const char *stock_name,
 int
 Supplier::run (void)
 {
-
+  
   long timer_id = 0;
-
+ 
   ACE_DEBUG ((LM_DEBUG,
               "Market Status Supplier Daemon is running...\n "));
 
@@ -185,16 +185,16 @@ Supplier::run (void)
   ACE_Time_Value period (period_value_);
 
   // "Your time starts now!" ;) the timer is scheduled to begin work.
-  timer_id = reactor_used ()->schedule_timer (supplier_timer_handler_,
+  timer_id = reactor_used ()->schedule_timer (supplier_timer_handler_, 
                                               "Periodic stockfeed",
                                               period,
                                               period);
   if ( timer_id== -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "%p\n", 
                            "schedule_timer"),
                           -1);
-
+                                            
    // ACE_DEBUG ((LM_DEBUG,
    //               "cancelling timer\n"));
    //  this->reactor_used ()->cancel_timer (timer_id);
@@ -202,7 +202,7 @@ Supplier::run (void)
 
   // The reactor starts executing in a loop.
    this->reactor_used ()->run_event_loop ();
-
+  
    return 0;
 }
 
diff --git a/TAO/examples/Event_Comm/Consumer_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Handler.cpp
index 0b5037afaa7..215796c7dd7 100644
--- a/TAO/examples/Event_Comm/Consumer_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Handler.cpp
@@ -71,8 +71,7 @@ Consumer_Handler::init (int argc,
      return -1;
    }
   ACE_ENDTRY;
-
-  ACE_NOTREACHED (return 0;)
+  return 0;
 }
 
 int
diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
index cc234899bb2..94286df5850 100644
--- a/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.cpp
@@ -100,7 +100,7 @@ Consumer_Input_Handler::handle_input (ACE_HANDLE h)
   if (n > 0)
     {
       // Null terminate the buffer, replacing the '\n' with '\0'.
-      if (buf[n - 1] == '\n')
+      if (buf[n - 1] == '\n' || buf[n - 1] == EOF)
 	buf[n - 1] = '\0';
       else
 	buf[n] = '\0';
diff --git a/TAO/examples/Event_Comm/Event_Comm_i.cpp b/TAO/examples/Event_Comm/Event_Comm_i.cpp
index 72c64456e91..6d6ebdf013c 100644
--- a/TAO/examples/Event_Comm/Event_Comm_i.cpp
+++ b/TAO/examples/Event_Comm/Event_Comm_i.cpp
@@ -235,7 +235,7 @@ Notifier_i::unsubscribe (Event_Comm::Consumer_ptr consumer_ref,
        mi.next (me) != 0;
        mi.advance ())
     {
-      nr_entry = me->int_id_;
+       Consumer_Entry *nr_entry = me->int_id_;
 
       // The <_is_equivalent> function checks if objects are the same.
       // NOTE: this call might not behave well on other ORBs since
diff --git a/TAO/examples/Event_Comm/Makefile b/TAO/examples/Event_Comm/Makefile
index ec9af048e1f..ebb7924422c 100644
--- a/TAO/examples/Event_Comm/Makefile
+++ b/TAO/examples/Event_Comm/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,54 +14,49 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lorbsvcs -lTAO
 PROG_SRCS = Consumer_Handler.cpp \
-            Consumer_Input_Handler.cpp \
-            Event_Comm_i.cpp \
+	    Consumer_Input_Handler.cpp \
+	    Event_Comm_i.cpp \
             Notifier_Handler.cpp \
-            Supplier_Input_Handler.cpp \
-            consumer.cpp \
+	    Supplier_Input_Handler.cpp \
+	    consumer.cpp \
             notifier.cpp \
-            supplier.cpp \
-            Notifier_Server.cpp
+	    supplier.cpp \
+	    Notifier_Server.cpp
 
-IDL_SRC = Event_CommS.cpp Event_CommC.cpp
+IDL_SRC	= Event_CommS.cpp Event_CommC.cpp
 
 LSRC = $(IDL_SRC) $(PROG_SRCS)
 
 CONSUMER_OBJS = Event_CommC.o \
                 Event_CommS.o \
-                Consumer_Handler.o \
-                Consumer_Input_Handler.o \
-                Event_Comm_i.o \
-                consumer.o
+		Consumer_Handler.o \
+	      	Consumer_Input_Handler.o \
+	        Event_Comm_i.o \
+		consumer.o
 
 SUPPLIER_OBJS = Event_CommC.o \
-                Event_CommS.o \
-                Supplier_Input_Handler.o \
-                Event_Comm_i.o \
-                Notifier_Handler.o \
-                supplier.o
+		Event_CommS.o \
+		Supplier_Input_Handler.o \
+	        Event_Comm_i.o \
+		Notifier_Handler.o \
+		supplier.o
 
 NOTIFIER_OBJS = Event_CommC.o \
-                Event_CommS.o \
-                Notifier_Server.o \
-                Event_Comm_i.o \
-                notifier.o
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+		Event_CommS.o \
+		Notifier_Server.o \
+		Event_Comm_i.o \
+		notifier.o
 
-BIN2 = supplier \
-       notifier \
-       consumer
+BIN = supplier \
+      notifier \
+      consumer
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -83,13 +78,15 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
 .PRECIOUS: Event_CommC.cpp Event_CommS.cpp Event_CommC.h Event_CommS.h
+#$(IDL_SRC): event.idl
+#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
 
 supplier: $(addprefix $(VDIR),$(SUPPLIER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -101,580 +98,26 @@ notifier: $(addprefix $(VDIR),$(NOTIFIER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) Event_CommS.* Event_CommC.* Event_CommS_T.*
+	-/bin/rm -rf Event_CommS.* Event_CommC.* Event_CommS_T.*
 
 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.
 
 .obj/Event_CommS.o .obj/Event_CommS.so .shobj/Event_CommS.o .shobj/Event_CommS.so: Event_CommS.cpp Event_CommS.h Event_CommC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
  Event_CommS.i
-.obj/Event_CommC.o .obj/Event_CommC.so .shobj/Event_CommC.o .shobj/Event_CommC.so: Event_CommC.cpp Event_CommC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS.h Event_CommS_T.h Event_CommS_T.i \
- Event_CommS_T.cpp Event_CommS.i
+.obj/Event_CommC.o .obj/Event_CommC.so .shobj/Event_CommC.o .shobj/Event_CommC.so: Event_CommC.cpp Event_CommC.h Event_CommC.i \
+ Event_CommS.h Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
+ Event_CommS.i
 .obj/Consumer_Handler.o .obj/Consumer_Handler.so .shobj/Consumer_Handler.o .shobj/Consumer_Handler.so: Consumer_Handler.cpp Consumer_Handler.h \
  Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -745,212 +188,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -960,12 +199,13 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/Consumer_Input_Handler.o .obj/Consumer_Input_Handler.so .shobj/Consumer_Input_Handler.o .shobj/Consumer_Input_Handler.so: Consumer_Input_Handler.cpp \
  Consumer_Input_Handler.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -974,6 +214,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1042,212 +284,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -1257,16 +295,19 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/Event_Comm_i.o .obj/Event_Comm_i.so .shobj/Event_Comm_i.o .shobj/Event_Comm_i.so: Event_Comm_i.cpp Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1337,212 +378,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i
 .obj/Notifier_Handler.o .obj/Notifier_Handler.so .shobj/Notifier_Handler.o .shobj/Notifier_Handler.so: Notifier_Handler.cpp Notifier_Handler.h \
  $(ACE_ROOT)/ace/CORBA_Handler.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -1551,6 +388,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1621,212 +460,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -1836,16 +471,19 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/Supplier_Input_Handler.o .obj/Supplier_Input_Handler.so .shobj/Supplier_Input_Handler.o .shobj/Supplier_Input_Handler.so: Supplier_Input_Handler.cpp Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1916,212 +554,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i Notifier_Handler.h \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i Notifier_Handler.h \
  $(ACE_ROOT)/ace/CORBA_Handler.h \
  $(ACE_ROOT)/ace/Pipe.h \
  $(ACE_ROOT)/ace/Pipe.i \
@@ -2134,17 +568,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Supplier_Input_Handler.h
 .obj/consumer.o .obj/consumer.so .shobj/consumer.o .shobj/consumer.so: consumer.cpp Consumer_Handler.h Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2215,212 +652,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -2430,17 +663,20 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Consumer_Input_Handler.h
 .obj/notifier.o .obj/notifier.so .shobj/notifier.o .shobj/notifier.so: notifier.cpp Notifier_Server.h Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2511,212 +747,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -2732,7 +764,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  notifier.h
 .obj/supplier.o .obj/supplier.so .shobj/supplier.o .shobj/supplier.so: supplier.cpp Notifier_Handler.h \
  $(ACE_ROOT)/ace/CORBA_Handler.h \
@@ -2742,6 +775,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2812,212 +847,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
@@ -3027,18 +858,21 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  Supplier_Input_Handler.h supplier.h
 .obj/Notifier_Server.o .obj/Notifier_Server.so .shobj/Notifier_Server.o .shobj/Notifier_Server.so: Notifier_Server.cpp Notifier_Server.h \
  Event_Comm_i.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3109,212 +943,8 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Event_CommS.h Event_CommC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_CommC.i Event_CommS_T.h Event_CommS_T.i Event_CommS_T.cpp \
- Event_CommS.i \
+ Event_CommS.h Event_CommC.h Event_CommC.i Event_CommS_T.h \
+ Event_CommS_T.i Event_CommS_T.cpp Event_CommS.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -3330,6 +960,7 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Event_Comm/Notifier_Handler.cpp b/TAO/examples/Event_Comm/Notifier_Handler.cpp
index 582c13c6acf..322cb2c6128 100644
--- a/TAO/examples/Event_Comm/Notifier_Handler.cpp
+++ b/TAO/examples/Event_Comm/Notifier_Handler.cpp
@@ -75,8 +75,8 @@ Notifier_Handler::notifier (Event_Comm::Notifier *notifier)
 // Init function.
 
 int
-Notifier_Handler::init (int argc,
-			char *argv[],
+Notifier_Handler::init (int argc, 
+			char *argv[], 
 			ShutdownCallback* _shutdowncallback)
 {
   // set the callback
@@ -126,5 +126,5 @@ Notifier_Handler::init (int argc,
    }
  ACE_ENDTRY;
 
- ACE_NOTREACHED (return 0;)
+ return 0;
 }
diff --git a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
index b82a857b9fb..2efd951efb9 100644
--- a/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
+++ b/TAO/examples/Event_Comm/Supplier_Input_Handler.cpp
@@ -67,17 +67,17 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE h)
   if (ACE_OS::fgets (buf,
 		     sizeof buf - 1,
                      stdin) == 0)
-    {
+    {      
       ACE_DEBUG ((LM_DEBUG,
                   "shutting down Supplier_Input_Handler\n"));
-      return 0;
+      return 0; 
     }
   else
     {
       size_t n = ACE_OS::strlen (buf);
 
       // Null terminate the buffer, replacing the '\n' with '\0'.
-      if (buf[n - 1] == '\n')
+      if (buf[n - 1] == '\n' || buf[n - 1] == EOF)
 	buf[n - 1] = '\0';
       else
 	buf[n] = '\0';
@@ -86,7 +86,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE h)
 		  buf));
     }
 
-
+  
 
   if (ACE_OS::strncmp (buf, "quit", 4) == 0)
     // Tell the main event loop to shutdown.
@@ -95,7 +95,7 @@ Supplier_Input_Handler::handle_input (ACE_HANDLE h)
     {
       Event_Comm::Notifier *notifier = this->notifier_->notifier ();
       ACE_ASSERT (notifier != 0);
-
+      
       // Use the notifier to notify Consumers.
       ACE_TRY_NEW_ENV
         {
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 68237474aa3..213738cf943 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -37,7 +37,6 @@ Notifier::Notifier (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       ns_.init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/examples/Makefile b/TAO/examples/Makefile
index d195ad5816c..a15e9fed4f2 100644
--- a/TAO/examples/Makefile
+++ b/TAO/examples/Makefile
@@ -13,9 +13,7 @@
 DIRS  = Callback_Quoter \
         POA \
 	Quoter \
-	Simple \
-	Event_Comm \
-	OBV
+	Simple
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -26,3 +24,4 @@ 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/OBV/Makefile b/TAO/examples/OBV/Makefile
deleted file mode 100644
index 524e8067824..00000000000
--- a/TAO/examples/OBV/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#  Makefile for the TAO/OBV examples
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  = Typed_Events
-
-#----------------------------------------------------------------------------
-#	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/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
deleted file mode 100644
index 93ff0c293f3..00000000000
--- a/TAO/examples/OBV/Simple_util.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-//$Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-#ifndef SIMPLE_UTIL_C
-#define SIMPLE_UTIL_C
-# include "Simple_util.h"
-
-// Constructor.
-
-template <class Servant>
-Server<Servant>::Server (void)
-    : ior_output_file_ (0),
-      naming_ (0),
-      ins_ (0)
-{
-  // no-op.
-}
-
-// Destructor.
-
-template <class Servant>
-Server<Servant>::~Server (void)
-{
-}
-
-// Parse the command-line arguments and set options.
-
-template <class Servant> int
-Server<Servant>::parse_args (void)
-{
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
-  int c = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      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,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-
-      case 'i': // For Testing the InterOperable Naming Service.
-        this->ins_ = CORBA::string_dup (get_opts.optarg);
-        break;
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Add the ObjectID:IOR mapping to the IOR table of
-// the ORB. Ignore this method if you are not testing for
-// the InterOperable Naming Service.
-
-template <class Servant> int
-Server<Servant>::test_for_ins (CORBA::String_var ior)
-{
-
-  CORBA::Object_ptr bank_servant =
-    this->orb_manager_.orb ()->string_to_object (ior.in());
-
-  // Add a KEY:IOR mapping to the ORB table.
-  ACE_CString object_id (this->ins_);
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Adding (KEY:IOR) %s:%s\n",
-                object_id.c_str (),
-                ior.in ()));
-
-  if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (object_id,
-                                                        bank_servant) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Simple_Util : Unable to add IOR to table\n"),
-                      -1);
-
-  return 0;
-}
-
-// Initialize the server.
-template <class Servant> int
-Server<Servant>::init (const char *servant_name,
-                       int argc,
-                       char *argv[],
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  // 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,
-                                         argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init_child_poa"),
-                      -1);
-
-  ACE_CHECK_RETURN (-1);
-
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  int retval = this->parse_args ();
-
-  if (retval != 0)
-    return retval;
-
-  CORBA::ORB_var orb = this->orb_manager_.orb ();
-
-  // Stash our ORB pointer for later reference.
-  this->servant_.orb (orb.in ());
-
-  // Activate the servant in its own child POA.
-
-  // Make sure that you check for failures here via the ACE_TRY
-  // macros?!
-  ACE_TRY
-    {
-      CORBA::String_var str  =
-        this->orb_manager_.activate_under_child_poa (servant_name,
-                                                     &this->servant_,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n",
-                  str.in ()));
-
-      if (this->ins_)
-        if (this->test_for_ins (str) != 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "test_for_ins (): failed\n"),
-                            -1);
-
-      if (this->ior_output_file_)
-        {
-          ACE_OS::fprintf (this->ior_output_file_,
-                           "%s",
-                           str.in ());
-          ACE_OS::fclose (this->ior_output_file_);
-        }
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("\tException in activation of POA");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template <class Servant>int
-Server<Servant>::run (CORBA::Environment &env)
-{
-    // Run the main event loop for the ORB.
-  if (this->orb_manager_.run (env) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Server_i::run"),
-                      -1);
-
-  return 0;
-}
-
-template <class Servant> int
-Server<Servant>::register_name (void)
-{
-  return -1;
-}
-
-// Constructor.
-
-template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::Client (void)
-  : ior_ (0)
-{
-  //no-op
-}
-
-// Reads the Server ior from a file
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::read_ior (char *filename)
-{
-  // Open the file for reading.
-  ACE_HANDLE f_handle = ACE_OS::open (filename, 0);
-
-  if (f_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
-                       filename),
-                      -1);
-
-  ACE_Read_Buffer ior_buffer (f_handle);
-  char *data = ior_buffer.read ();
-
-  if (data == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to read ior: %p\n"),
-                      -1);
-
-  this->ior_ = ACE_OS::strdup (data);
-  ior_buffer.alloc ()->free (data);
-
-  ACE_OS::close (f_handle);
-
-  return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
-  int c = 0;
-  int result = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'k':  // ior provide on command line
-        this->ior_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-        break;
-      case 'x': // read the flag for shutting down
-        this->shutdown_ = 1;
-        break;
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-template <class InterfaceObj, class Var>
-Client<InterfaceObj, Var>::~Client (void)
-{
-  ACE_OS::free (this->ior_);
-}
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::init (const char *name,
-                                 int argc,
-                                 char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    0,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-
-
-      if(this->ior_ != 0)
-        {
-          CORBA::Object_var server_object =
-            this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-
-          if (CORBA::is_nil (server_object.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "invalid ior <%s>\n",
-                               this->ior_),
-                              -1);
-          this->server_ = InterfaceObj::_narrow (server_object.in (),
-                                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "no ior or naming options  specified\n"),
-                          -1);
-
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("Client_i::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-
-  return 0;
-}
-
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV)
-{
-
-  return 0;
-}
-
-template <class InterfaceObj, class Var> int
-Client<InterfaceObj, Var>::shutdown (void )
-{
-  // Returns the shutdwon flag
-  return shutdown_;
-}
-
-template <class InterfaceObj, class Var> void
-Client<InterfaceObj, Var>::shutdown (int flag)
-{
-  // Fills the flag
-  shutdown_ = flag;
-}
-
-#endif
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
deleted file mode 100644
index 7620821eff5..00000000000
--- a/TAO/examples/OBV/Simple_util.h
+++ /dev/null
@@ -1,182 +0,0 @@
-//$Id$
-
-// This version of Simple_Util doesn't need to link against orbsvcs
-// On the other hand it has no naming service.
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    taken from TAO/tests/Simple
-//
-// = FILENAME
-//    Simple_Util.h
-//
-// = DESCRIPTION
-//    The classe define the templates for the client and server.
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UTIL_H
-#define TAO_UTIL_H
-
-#include "tao/TAO.h"
-//#include "orbsvcs/Naming/Naming_Utils.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-template <class Servant>
-class Server
-{
-  // = TITLE
-  //   A set of useful class Templates for using the TAO CORBA
-  //   implementation.
-  //
-  // = DESCRIPTION
-  //   A template server definition. This template can be used by
-  //   single server/client projects for defintion of their
-  //   server/clients.  See the directories time, bank, echo for
-  //   further details of implemenatation.
-public:
-  // = Initialization and termination methods.
-
-  Server (void);
-  // Constructor.
-
-  ~Server (void);
-  // Destructor.
-
-  int init (const char *servant_name,
-            int argc,
-            char *argv[],
-            CORBA::Environment &env);
-  // Initialize the Server state - parsing arguments and waiting.
-  // interface_name is the name used to register the Servant.
-
-  int register_name (void);
-  // After calling <init>, this method will register the server with
-  // the TAO Naming Service using the servant_name passed to <init>.
-
-  int run (CORBA::Environment &env);
-  // Run the orb.
-
-  int test_for_ins (CORBA::String_var ior);
-  // Ignore this method if you are not testing the InterOperable
-  // Naming Service.
-
-protected:
-  Servant servant_;
-  // Servant class
-
-  const char *name;
-  // name of the servant to be used for TAO Naming Service
-
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager - a helper class for accessing the POA and
-  // registering objects.
-
-  // TAO_Naming_Server namingServer;
-  // helper class for getting access to Naming Service.
-
-  FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
-
-  int naming_;
-  // Flag to indicate whether naming service could be used
-
-  char * ins_;
-  // Used test the INS.
-
-  int argc_;
-  // Number of command line arguments.
-
-  char **argv_;
-  // The command line arguments.
-};
-
-template <class InterfaceObj, class Var>
-class Client
-{
-  // = TITLE
-  //   Template Client class
-  //
-  // = DESCRIPTION
-  //   A template client implementation for a single server/client
-  //   model. The example usage of these usage can be found in the
-  //   sub-directories below
-public:
-
-  // = Initialization and termination methods.
-  Client (void);
-  // Constructor.
-
-  ~Client (void);
-  // Destructor.
-
-  int init (const char *name,int argc, char *argv[]);
-  // Initialize the client communication endpoint with server.
-
-  InterfaceObj *operator-> () { return server_.in ();};
-  // Return the interface object pointer.
-
-  int shutdown (void );
-  // Returns the shutdown flag.
-
-  void shutdown (int);
-  // Fills in the shutdwon flag.
-
-  int obtain_initial_references (CORBA::Environment &);
-  // Initialize naming service
-
-protected:
-  int read_ior (char *filename);
-  // Function to read the server IOR from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-//  TAO_Naming_Client namingClient;
-  // helper class for getting access to Naming Service.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *ior_;
-  // IOR of the obj ref of the server.
-
-  char *name_;
-  // Name to be usred for the naming service
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  Var server_;
-  // Server object
-
-  int naming_;
-  // Flag to use the naming service
-
-  int shutdown_;
-  // Flag for shutting down the server
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Simple_util.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_UTIL_H */
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
deleted file mode 100644
index 45eed87883d..00000000000
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-//$Id$
-
-#include "Client_i.h"
-#include "Event_Types_impl.h"
-#include "ace/Get_Opt.h"
-
-
-int
-Checkpoint_Client_i::run (char *name,
-                    int argc,
-                    char *argv[])
-{
-  // Initialize the client (read ior...).
-  if (checkpoint.init (name,argc, argv) == -1)
-    return -1;
-
-  // Set random seed
-  ACE_Time_Value now (ACE_OS::gettimeofday ());
-  ACE_OS::srand ((unsigned int) now.sec () );
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Make factories to unmarshal OBV, when getting back a list
-      // of events which raised an alarm condition.
-
-      // TAO_OBV_REGISTER_FACTORY (Event_factory);
-      // This one not (see header file)
-
-      TAO_OBV_REGISTER_FACTORY (Temperature_factory);
-      TAO_OBV_REGISTER_FACTORY (Position_factory);
-      TAO_OBV_REGISTER_FACTORY (Log_Msg_factory);
-      TAO_OBV_REGISTER_FACTORY (Event_List_factory);
-      TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory);
-
-      ACE_DEBUG ((LM_DEBUG, "Send some random events:\n"));
-
-      double temperature = random_number (29,34);
-      Temperature_var t_e (new Temperature_impl (temperature));
-      t_e->origin_id_ (KITCHEN);
-      t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      temperature = random_number (25,30);
-      t_e = new Temperature_impl (temperature);
-      t_e->origin_id_ (BATHROOM);
-      t_e->do_print ();
-      checkpoint->put_event (t_e, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Point point = { random_number (0,4),
-                      random_number (0,4),
-                      random_number (0,4)  };
-      Position_var p_e (new Position_impl (point));
-      p_e->origin_id_ (JONAS);
-      p_e->do_print ();
-      checkpoint->put_event (p_e, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      int urgent = (random_number (0,2) > 1) ? 1 : 0;
-      const char *a_text = (random_number (0,2) > 1) ? "Coffee is cold."
-                                                     : "I want pasta.";
-      Log_Msg_var l_e (new Log_Msg_impl (urgent, a_text));
-      l_e->origin_id_ (JONAS);
-      l_e->do_print ();
-      checkpoint->put_event (l_e, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      ACE_DEBUG ((LM_DEBUG, "\nNow getting the alarms:\n"));
-
-      Event_List_var list (checkpoint->get_critical_events (ACE_TRY_ENV));
-      ACE_TRY_CHECK;
-
-      for (Event_List_Iterator i (list); i.next (); i.advance ())
-        {
-          i.next ()-> do_print ();
-        }
-
-      if (checkpoint.shutdown () == 1)
-        checkpoint->shutdown (ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-// Constructor.
-Checkpoint_Client_i::Checkpoint_Client_i (void)
-{
-  //no-op
-}
-
-//Destructor.
-Checkpoint_Client_i::~Checkpoint_Client_i (void)
-{
-  //no-op
-}
-
-
-// A random number in the range of min to max.
-double random_number (double min, double max)
-{
-  double range = max - min;
-  return (min + (range * ACE_OS::rand () / (RAND_MAX + 1.0)));
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Client<Checkpoint,Checkpoint_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Client<Checkpoint,Checkpoint_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.h b/TAO/examples/OBV/Typed_Events/Client_i.h
deleted file mode 100644
index 222c1ff5708..00000000000
--- a/TAO/examples/OBV/Typed_Events/Client_i.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/OBV/Typed_Events
-//
-// = FILENAME
-//    Client_i.h
-//
-// = DESCRIPTION
-//    This class is a template for a CORBA client.
-//    run () sends some valuetypes to a server and
-//    gets back a list of valuetypes.
-//
-// = AUTHOR
-//
-//   Torsten Kuepper
-//   based on the echo example
-//   from code from Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ECHO_CLIENT_I_H
-#define ECHO_CLIENT_I_H
-
-#include "../Simple_util.h"
-#include "Event_TypesC.h"
-
-double random_number (double min, double max);
-
-class Checkpoint_Client_i
-{
-  // = TITLE
-  //   Checkpoint_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
-public:
-  // = Initialization and termination methods.
-  Checkpoint_Client_i (void);
-  // Constructor
-
-  virtual  ~Checkpoint_Client_i (void);
-  // Destructor
-
-  virtual int run (char *,int, char** );
-  // Execute the methods
-
-private:
-  Client<Checkpoint, Checkpoint_var> checkpoint;
-  // Instantiate the checkpoint object.
-};
-
-
-#endif /* TIME_CLIENT_I_H */
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types.idl b/TAO/examples/OBV/Typed_Events/Event_Types.idl
deleted file mode 100644
index 40c167d1250..00000000000
--- a/TAO/examples/OBV/Typed_Events/Event_Types.idl
+++ /dev/null
@@ -1,245 +0,0 @@
-// Event_Types.idl
-// Simple demonstration of typed events in a distributed system.
-//
-// Author:
-//   Torsten Kuepper
-//
-
-// $Id$
-
-// Event inheritance hierarchy  ===========================
-
-// Base class  --------------------------------------------
-
-valuetype Event
-{
-  void do_print ();
-
-  // An operation. In some implementations (e.g. operator terminal)
-  // the event should visualize itself. That is of no use at the
-  // event producing sensor. So, the declaration of do_print ()
-  // could be deferred to the implementation classes, but then you need
-  // to downcast from the pointer to the event valuetype to your
-  // implementation. Another solution is perhaps to inherit do_print ()
-  // through an additional abstract valuetype base only in that
-  // IDL that a visualizing implementation sees. But this would change
-  // the type and this is a bad thing. The cleanest thing to do may be
-  // to apply the visitor pattern. Event::accept (visitor) would be
-  // implemented as null-op in the measurement device, if you take this
-  // example.
-
-
-  public long time_;
-
-  // A state member. Don't confuse with attributes, which are
-  // ok here too, but they do only map to a pair of local operations,
-  // in opposite to (public/private) state members they haven't got no
-  // implementation for the state data and finally they are not transmitted
-  // over the wire.
-
-
-  public unsigned long origin_id_;
-
-  // This id should identify the origin (e.g. sensor) in the system.
-  // This makes an id-space beside the object references which has to be
-  // maintained. It would be useful to implement some consistency check
-  // protocol (as CORBA interfaces) to verify that the suppliers and
-  // consumers are connected (through some event channel) in the
-  // right way.
-
-};
-
-
-// Derived Events  ----------------------------------------
-
-
-valuetype Temperature : Event
-{
-  // do_print () is overridden in the implementation. We can't
-  // tell this in IDL, because operations can't be declared again.
-  // They are implicit assumed to be polymorph.
-
-  public float temperature_;
-  // Extends Event with the state member for the temperature.
-};
-
-
-typedef float Point[3];
-// (anonymous arrays are not yet working in this OBV ...%!)
-// (( BTW %! <- no emoticon, this is my to do mark))
-
-valuetype Position : Event
-{
-  attribute float x, y, z;
-  // The Position can be accessed both through the coordinates ...
-
-  public Point xyz;
-  // ... or as a whole array, which is a state member.
-};
-
-
-valuetype Log_Msg : Event
-{
-  public short  urgency;
-  public string message;
-};
-
-// (Valuetypes which hold other types as shown are not yet tested %!)
-
-// You may extend the system with aggregated events, such the status
-// message of a boiler, which has temperature and a pressure valuetype
-// as state member (recall: unshared valuetypes are well at this time.
-// But a shared valuetype splits at the receiving end of an invocation
-// in two or more instances, dependend on the number of references on it
-// (in the argument list plus in the members of compound types). This
-// misbehaviour will go away once valuetype sharing is implemented %!
-// But to do this in an efficient and thread safe manner seems a little tricky)
-
-
-// Passing back the critical events in a list  ----------------------------
-
-// This is the link, that is used internally -----
-// (should come after Event_List, but forward decl. is not yet complete %!)
-
-valuetype Event_List_Link
-{
-  Event get_event ();
-  // get the event
-
-  Event_List_Link get_next_link ();
-  // get the event
-
-  void attach_next_link (in Event_List_Link chain);
-  // Link a chain at the end.
-
-  private Event my_event;
-  // event which is held
-
-  private Event_List_Link next;
-  // link to the next event container
-};
-
-// 'private' state member are mapped to 'protected' in C++, so
-// they can be accessed from the implementation class, which should
-// be derived from OBV_Event_chain.
-
-
-// The event list uses links as declared above. But its implementation
-// could be changed 'under the hood' to use e.g. a CORBA sequence.
-// (This doesn't go yet, because valuetype is only allowed
-// as an operation argument for now. Just impl. the visitors in tao_idl %!)
-
-valuetype Event_List
-{
-  void store_event (in Event e);
-  // Attach an event at the lists's end.
-
-  public Event_List_Link first_link;
-  // Should better be private, but then the iterator can't access it.
-};
-
-
-// Interface to access the "event server" ------------------
-
-// A client (e.g. sensor) delivers the events via put_event ().
-// The server checks against alarm conditions and memorizes
-// critical events, which can be passed back
-// to a client (e.g. operator terminal) with get_critical_events ().
-
-interface Checkpoint
-{
-  void  put_event (in Event e);
-  // Put event in the server. If it exceeds an alarm criterion
-  // it will be stored.
-
-  Event_List  get_critical_events ();
-  // Ask for a list of critical events.
-
-  oneway void shutdown ();
-  // This operation will shutdown the server.
-};
-
-
-// Checkpoint server side --------------------------------------------
-// The Checkpoint should compare the incoming event against a
-// criterion for the specific event type. My approach is the following
-// (to facilitate separation of application logic and event specific
-// code): An abstract valuetype Criterion provides is_critical () to check
-// against a boundary. Concrete alarm boundaries for any existing
-// event derive from this class and perform the check. Thats's it for
-// the event type maintainer --- the customs that use this 'framework'.
-
-// The concrete criterions inherit from Event too. I wanted to reuse
-// the list which works on events. The wrapper Criterion_List makes it safe
-// that only criterions are accepted to this list. Templates would be fine,
-// but currently I have no idea how to apply them to a valuetype. Perhaps
-// there is no way to get around custom marshalling [n.y.avail.%!] in the
-// area of containers.
-// Finally the concrete criterions must have a suitable implementation for
-// is_critical ().
-
-// Now the internals of the server which shouldn't need to be touched by
-// the final implementer: The above mentioned wrapper Criterion_List
-// uses an Event_List to compare an incoming event against the
-// boundaries. In this simple example it will just apply the event to
-// is_critical () of any criterion, which origin id matches.
-// The criterion checks with
-// valuetype's _downcast () if the event matches its event type and then
-// performs the alarm check. A real world approach with many event types
-// and criterions could better use a hash map for the criterions. The
-// external map index would be the repository id of the event.
-
-abstract valuetype Criterion
-{
-  boolean is_critical (in Event e);
-  // Check against alarm boundaries.
-};
-
-
-// The specialized criterions. Note: A valuetype can only inherit
-// from one non-abstract other valuetype (which then must be the first
-// one listed). Further Criterions may only be abstract valuetypes
-// without the ability to contain state members. (The support of
-// a CORBA interface is not yet supported.)
-// P.S. Please don't bother about the class hierarchy
-// (Criterion inherits from Event _and_ has some Events as boundary values
-// aggregated). I just wanted to reuse the code for the list of events.
-// Certainly not an example of good OO design.
-
-
-valuetype Temperature_Criterion : Event, Criterion
-{
-  private Temperature meltingpoint;
-  // The boundary is stored in a state member.
-};
-
-
-valuetype Position_Criterion : Event, Criterion
-{
-  private Position leftbottom, topright;
-  // Any position should be contained in a box.
-};
-
-
-valuetype Log_Msg_Criterion : Event, Criterion
-{
-  // No state member. All Log_Msg which have urgency
-  // greater zero meet the criterion.
-};
-
-
-
-// The Criterion_List  ===========================================
-
-valuetype Criterion_List
-{
-  void store_criterion (in Criterion c);
-  // Attach an criterion at the lists's end.
-
-  boolean is_critical (in Event e);
-  // Check with the listmembers if e should raise an alarm.
-
-  public Event_List my_list;
-  // Used in the implementation. Is public for allowing
-  // access to the iterator.
-};
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
deleted file mode 100644
index 08306339676..00000000000
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp
+++ /dev/null
@@ -1,595 +0,0 @@
-// $Id$
-
-#include "Event_Types_impl.h"
-
-// Implementation of the valuetype member functions.
-
-Event_impl::Event_impl ()
-  // initializers (': foo ()') don't work for OBV state members
-  // since we should only access the state through modifier functions
-{
-  // Put a timestamp on event's birth.
-  ACE_Time_Value now (ACE_OS::gettimeofday ());
-  this->time_ (now.sec ());
-}
-
-Event_impl::~Event_impl ()
-{
-}
-
-void
-Event_impl::do_print (void)
-{
-  ACE_DEBUG((LM_DEBUG, "(time %d origin %d)  ",
-             (CORBA::ULong) this->time_(), (CORBA::ULong) this->origin_id_() ));
-}
-
-
-/* Not defined, see header
-Event_factory::~Event_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Event)
-Event_factory::create_for_unmarshal ()
-{
-  return new Event_impl;
-}
-*/
-
-// Temperature implementation  ===================================
-
-Temperature_impl::Temperature_impl ()
-{
-}
-
-Temperature_impl::Temperature_impl (CORBA::Float temp)
-{
-  this->temperature_ (temp);
-}
-
-Temperature_impl::~Temperature_impl ()
-{
-}
-
-void
-Temperature_impl::do_print (void)
-{
-  Event_impl::do_print ();
-  // The timestamp
-
-  ACE_DEBUG((LM_DEBUG, "Temperature is %f\n", this->temperature_() ));
-}
-
-Temperature_factory::~Temperature_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Temperature)
-Temperature_factory::create_for_unmarshal ()
-{
-  return new Temperature_impl;
-}
-
-
-// Position implementation  ======================================
-
-Position_impl::Position_impl ()
-{
-}
-
-Position_impl::Position_impl (Point &p)
-{
-  this->xyz (p);
-  // Does a copy of the p array
-}
-
-Position_impl::~Position_impl ()
-{
-}
-
-void
-Position_impl::do_print (void)
-{
-  Event_impl::do_print ();
-  // The timestamp
-
-  ACE_DEBUG((LM_DEBUG, "Position is (%f, %f, %f)\n",
-             this->x(), this->y(), this->z() ));
-}
-
-CORBA::Float Position_impl::x ()  { return this->xyz()[0]; }
-void Position_impl::x (CORBA::Float x)   { this->xyz()[0] = x; }
-CORBA::Float Position_impl::y ()  { return this->xyz()[1]; }
-void Position_impl::y (CORBA::Float y)   { this->xyz()[1] = y; }
-CORBA::Float Position_impl::z ()  { return this->xyz()[2]; }
-void Position_impl::z (CORBA::Float z)   { this->xyz()[2] = z; }
-
-
-Position_factory::~Position_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Position)
-Position_factory::create_for_unmarshal ()
-{
-  return new Position_impl;
-}
-
-
-// Log_Msg implementation  ===================================
-
-Log_Msg_impl::Log_Msg_impl ()
-{
-}
-
-Log_Msg_impl::Log_Msg_impl (CORBA::Short u, const char *m)
-{
-  this->urgency (u);
-  this->message (CORBA::string_dup (m));
-}
-
-Log_Msg_impl::~Log_Msg_impl ()
-{
-}
-
-void
-Log_Msg_impl::do_print (void)
-{
-  Event_impl::do_print ();
-  // The timestamp
-
-  if (this->urgency () > 0)
-    {
-      ACE_DEBUG((LM_DEBUG, "**** %s ****\n", this->message () ));
-    }
-  else
-    {
-      ACE_DEBUG((LM_DEBUG, "%s\n", this->message () ));
-    }
-}
-
-Log_Msg_factory::~Log_Msg_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)
-Log_Msg_factory::create_for_unmarshal ()
-{
-  return new Log_Msg_impl;
-}
-
-
-
-// Event_List_Link implementation  ===================================
-
-Event_List_Link_impl::Event_List_Link_impl ()
-{
-  this->my_event (0);
-  this->next (0);
-}
-
-Event_List_Link_impl::Event_List_Link_impl (Event* e)
-{
-  this->my_event (e);
-  // Note that the modifier increases the reference counter of e.
-
-  this->next (0);
-}
-
-Event_List_Link_impl::~Event_List_Link_impl ()
-{
-  // Destructor does nothing explicit, because my_event and next are
-  // _var types, which destroy (decrement the reference counter of)
-  // the held event resp. the next links.
-}
-
-Event*
-Event_List_Link_impl::get_event (void)
-{
-  return this->my_event ();
-}
-
-Event_List_Link*
-Event_List_Link_impl::get_next_link (void)
-{
-  return this->next ();
-}
-
-void
-Event_List_Link_impl::attach_next_link (Event_List_Link *n)
-{
-  this->next (n);
-}
-
-Event_List_Link_factory::~Event_List_Link_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)
-Event_List_Link_factory::create_for_unmarshal ()
-{
-  return new Event_List_Link_impl;
-}
-
-
-// Event_List implementation  ===================================
-
-Event_List_impl::Event_List_impl ()
-{
-  this->first_link (0);
-  last_link_cache_ = 0;
-}
-
-Event_List_impl::~Event_List_impl ()
-{
-  // Destructor does nothing explicit, because the _var types do care.
-}
-
-void
-Event_List_impl::store_event (Event* e)
-{
-  // This operation should perform atomically and should
-  // guard against the access to the list from another thread.
-  // But this is omitted in this example.
-
-   Event_List_Link_var new_link (new Event_List_Link_impl (e));
-
-   // We need a new link to store the reference to the event e.
-   // But if we'd had assigned the newly created instance directly through
-   // a modifier function to a valuetype member, it would never be released.
-   // From pointer to _var the reference count of the pointed to never
-   // increased, but the modifier does.
-
-
-  if (last_link_cache_ == 0)
-    {
-      // Search the end.
-      for (Event_List_Link *i = this->first_link ();
-           i != 0;
-           i = i->get_next_link ())
-        {
-          last_link_cache_ = i;
-        }
-    }
-
-
-  // If still null then the list is empty.
-  if (last_link_cache_ == 0)
-    {
-      this->first_link (new_link);
-    }
-  else
-    {
-      last_link_cache_->attach_next_link (new_link);
-      last_link_cache_ = new_link;
-    }
-}
-
-Event_List_factory::~Event_List_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Event_List)
-Event_List_factory::create_for_unmarshal ()
-{
-  return new Event_List_impl;
-}
-
-
-Event_List_Iterator::Event_List_Iterator (Event_List *list)
-{
-  this->init (list);
-}
-
-Event_List_Iterator::Event_List_Iterator ()
-{
-  // current_ is a _var and set itself to null.
-}
-
-Event_List_Iterator::~Event_List_Iterator ()
-{
-  // nothing
-}
-
-
-void
-Event_List_Iterator::init (Event_List *list)
-{
-  Event_List_Link *tmp = list->first_link ();
-  CORBA::add_ref (tmp);
-  current_ = tmp;
-}
-
-
-CORBA::Boolean
-Event_List_Iterator::next (Event_var &next)
-{
-  if (current_)
-    {
-      Event *e = current_->get_event ();
-      CORBA::add_ref (e);
-      next = e;
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-Event *
-Event_List_Iterator::next ()
-{
-  if (current_)
-    {
-      return current_->get_event ();
-    }
-  return 0;
-}
-
-void
-Event_List_Iterator::advance ()
-{
-  if (current_)
-    {
-      Event_List_Link *tmp = current_->get_next_link ();
-      CORBA::add_ref (tmp);
-      current_ = tmp;
-    }
-}
-
-
-
-// Checkpoint server side --------------------------------------------
-
-
-// Criterion classes implementation ----------------------------------
-
-
-
-Temperature_Criterion_impl::Temperature_Criterion_impl ()
-{
-}
-
-Temperature_Criterion_impl::
-Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp)
-{
-  this->origin_id_ (origin_id);
-  Temperature_var tmp (new Temperature_impl (temp));
-  this->meltingpoint (tmp.in ());
-}
-
-Temperature_Criterion_impl::~Temperature_Criterion_impl ()
-{
-}
-
-
-CORBA::Boolean
-Temperature_Criterion_impl::is_critical (Event* e)
-{
-  // Downcast to a temperature.
-  Temperature* t = Temperature::_downcast (e);
-  // Is Event really a Temperature ?
-  if (t)
-    {
-      // Now return the comparison with the meltingpoint.
-      return
-        (t->temperature_ () > this->meltingpoint ()->temperature_ ()) ?
-        1 : 0;
-    }
-  return 0;
-}
-
-
-void
-Temperature_Criterion_impl::do_print (void)
-{
-  ACE_DEBUG((LM_DEBUG, "Alarm boundary for events with origin id %d is\n",
-             this->origin_id_ () ));
-  this->meltingpoint ()->do_print();
-}
-
-
-Temperature_Criterion_factory::~Temperature_Criterion_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion)
-Temperature_Criterion_factory::create_for_unmarshal ()
-{
-  return new Temperature_Criterion_impl;
-}
-
-
-
-Position_Criterion_impl::Position_Criterion_impl ()
-{
-}
-
-Position_Criterion_impl::Position_Criterion_impl (CORBA::ULong origin_id,
-                                                  Position *lb,
-                                                  Position *tr)
-{
-  this->origin_id_ (origin_id);
-  this->leftbottom(lb);
-  this->topright(tr);
-}
-
-Position_Criterion_impl::~Position_Criterion_impl ()
-{
-}
-
-
-CORBA::Boolean
-Position_Criterion_impl::is_critical (Event* e)
-{
-  Position* p = Position::_downcast (e);
-  // Is Event really a Position ?
-  if (p)
-    {
-      // If the position of p is out of the box return true.
-      return (
-              (p->x () > this->leftbottom ()->x ()) &&
-              (p->y () > this->leftbottom ()->y ()) &&
-              (p->z () > this->leftbottom ()->z ()) &&
-              (p->x () < this->topright ()->x ()) &&
-              (p->y () < this->topright ()->y ()) &&
-              (p->z () < this->topright ()->z ())
-              ) ? 0 : 1;
-    }
-  return 0;
-}
-
-
-void
-Position_Criterion_impl::do_print (void)
-{
-  ACE_DEBUG((LM_DEBUG,
-             "Alarm boundary for events with origin id %d is the box\n",
-             this->origin_id_ () ));
-  this->leftbottom ()->do_print();
-  this->topright ()->do_print();
-}
-
-Position_Criterion_factory::~Position_Criterion_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)
-Position_Criterion_factory::create_for_unmarshal ()
-{
-  return new Position_Criterion_impl;
-}
-
-
-
-Log_Msg_Criterion_impl::Log_Msg_Criterion_impl ()
-{
-}
-
-
-Log_Msg_Criterion_impl::~Log_Msg_Criterion_impl ()
-{
-}
-
-
-CORBA::Boolean
-Log_Msg_Criterion_impl::is_critical (Event* e)
-{
-  Log_Msg* lm = Log_Msg::_downcast (e);
-
-  // Is Event really a Log_Msg ?
-  if (lm)
-    {
-      return (lm->urgency () ? 1 : 0);
-    }
-  return 0;
-}
-
-
-void
-Log_Msg_Criterion_impl::do_print (void)
-{
-  ACE_DEBUG((LM_DEBUG,
-             "All log messages with urgency greater zero are registered.\n" ));
-}
-
-Log_Msg_Criterion_factory::~Log_Msg_Criterion_factory ()
-{
-}
-
-TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)
-Log_Msg_Criterion_factory::create_for_unmarshal ()
-{
-  return new Log_Msg_Criterion_impl;
-}
-
-
-
-Criterion_List_impl::Criterion_List_impl ()
-{
-  this->my_list (0);
-  // We don't want create our list member here, because this constructor
-  // is called before unmarshalling too. We cant't distinguish that.
-  // If we transmit this type eventually. This is not done in this example.
-  // (That is no weakness of OBV since the instance should be created and
-  // initialized through the factory create (),
-  // which is not yet implemented %!)
-}
-
-Criterion_List_impl::~Criterion_List_impl ()
-{
-}
-
-void
-Criterion_List_impl::store_criterion (Criterion *c)
-{
-  if (!my_list ())
-    {
-      Event_List_var ev(new Event_List_impl);
-      my_list (ev);
-    }
-
-  Event *e = Event::_downcast (c);
-  my_list ()->store_event (e);
-}
-
-CORBA::Boolean
-Criterion_List_impl::is_critical (Event *e)
-{
-  // Try all criterions. Walking the list is efficient enough for
-  // demonstration.
-
-  for (Criterion_List_Iterator i (this); i.next (); i.advance ())
-    {
-      Criterion *c = i.next ();
-
-      // Let e_c point to the Event part of the Criterion.
-      // We know that c has an Event part.
-      Event *e_c = Event::_downcast (c);
-
-
-      // A criterion is applied if the origin id is matching the event.
-      // A null id flags that it should be applied to all events.
-
-      if (e->origin_id_() == e_c->origin_id_ () ||
-          e_c->origin_id_ () == 0)
-        {
-          if (c->is_critical (e))
-            return 1;
-        }
-    }
-  return 0;
-}
-
-
-Criterion_List_Iterator::Criterion_List_Iterator (Criterion_List *list)
-{
-  this->init (list);
-}
-
-Criterion_List_Iterator::~Criterion_List_Iterator ()
-{
-  // nothing
-}
-
-
-void
-Criterion_List_Iterator::init (Criterion_List *list)
-{
-  iterator_.init (list->my_list());
-}
-
-
-Criterion *
-Criterion_List_Iterator::next ()
-{
-  return (Criterion::_downcast (iterator_.next ()));
-}
-
-void
-Criterion_List_Iterator::advance ()
-{
-  (void) iterator_.advance ();
-}
diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h b/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
deleted file mode 100644
index 4e3122425f9..00000000000
--- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.h
+++ /dev/null
@@ -1,415 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Event_TypesC.h"
-
-// Event hierarchy implementation classes ======================
-
-// The implementation of a valuetype in C++ needs to derive from
-// the IDL generated OBV_Event, which provides the data members
-// and their accessor/modifier.
-// In TAO it is possible to have inline instead the standard virtual
-// accessor/modifier functions. But then they can't be overridden for
-// marshalling. (doesn't yet work anyway but will come soon %!).
-//
-// The 'client' of a valuetype (client means here the parts
-// of an application which locally access the valuetype through its interface)
-// uses pointer to the 'Event' class, or better the Event_var type
-// which is similar an object reference _var.
-//
-// Specs say that the instances of Event_impl should be created by means
-// of Event_init::create (), which are equivalents to the init () operations
-// in the IDL of the valuetype --- its not yet impl. and will come later on %!
-// Today you have to declare your own create () member.
-//
-// One more step to make (far way from Event to Event_impl, isn't it?):
-// We must mix in a class to have a reference counter implementation
-// (: Sit down and type twenty times CORBA::DefaultValueRefCountBase :)
-// A plus is its on your hand to choose possibly a reference counter
-// with (like the standard supplied one) or without lock. But I hate
-// the fact that reference counting is based on virtual _add_ref ()/
-// _remove_ref () functions, which may cause substantial overhead.
-// I'm thinking of a TAO option to let tao_idl mix in the reference counter
-// previous and generate _var classes which access inline functions.
-// ... And I wonder how the OMG want to manage cyclic graphs with
-// reference counting.
-
-class Event_impl : public virtual OBV_Event,
-                   public virtual CORBA::DefaultValueRefCountBase
-{
- public:
-  Event_impl ();
-  virtual ~Event_impl ();
-
-  virtual void do_print (void);
-  // Implementation of the do_print () operation the valuetype should have.
-  // All operations in valuetypes are virtual.
-
-  // The state member for the event time is yet implemented in OBV_Event
-  // (or in the Event class, if -Wb,obv_opt_accessor is given to tao_idl).
-};
-
-// An instance of the Event_factory class has to be registered
-// in the ORB with ORB::register_value_factory ().
-
-// Then the unmarshal engine can obtain a fresh instance of Event_impl
-// from the (user implemented) Event_factory::create_for_unmarshal ()
-// function. These should return a pointer to Event, but as long as
-// covariant return types are not commonly supported one has to
-// return a pointer to CORBA::ValueBase. This option handles the macro
-// in front of the create_for_unmarshal () declaration. Now the code
-// is compiler portable, but not ORB vendor portable ...
-
-// ... but stop a moment. We don't want an instance of Event.
-// It is only the base class for Temperature, Position and Log_Msg.
-// We didn't declared Event as abstract valuetype, cause we want to
-// store the timestamp in it. So we express that no instance can
-// exists while we don't make a factory for it (and don't register one).
-
-#ifdef is_certainly_not_defined
-class Event_factory : public Event_init
-{
- public:
-
-  // create (...) would go here
-private:
-  virtual ~Event_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Event)  create_for_unmarshal ();
-};
-#endif /* is not defined */
-
-
-// The procedure to register your instance is currently not much like
-// OBV specs says. This implementation has currently one
-// process-wide map for the registered factories. The specs want one
-// per ORB. To run first OBV tests, and that is what we do yet, it is
-// more practicable to have simply just one map. (%!)
-// Further on it is non-standard how the repository id of the valuetype
-// is obtained. Look at the macro TAO_OBV_REGISTER_FACTORY(your_factory_type)
-// in tao/ValueFactory.h (explained there) how it is done or just use it
-// for first experiments.
-// Exceptions are not yet implemented in this area.
-
-
-// Temperature implementation classes ===================================
-
-// The Temperature_impl should inherit its own OBV_Temperature and
-// the implementation of Event. (so-called ladder style implementation
-// inheritance, I guess.) Its yet there, but purists
-// can additionally inherit public virtual from the CORBA::DefaultVal...
-
-
-class Temperature_impl : public virtual OBV_Temperature,
-                         public virtual Event_impl
-{
-public:
-  Temperature_impl ();
-  // Constructor for the factory
-
-  Temperature_impl (CORBA::Float temp);
-  // Constructor, should regularly be a factory create () method.
-  // But it is more simple to do so here.
-
-  virtual ~Temperature_impl ();
-
-  virtual void do_print (void);
-  // Overrides Event_impl::do_print (). Note that a new declaration
-  // in IDL in a derived class is not allowed.
-};
-
-class Temperature_factory : public Temperature_init
-{
-  friend class Temperature;
- public:
-  // create (...) would go here
-private:
-  virtual ~Temperature_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature)  create_for_unmarshal ();
-};
-
-
-// Position implementation classes =====================================
-
-class Position_impl : public virtual OBV_Position,
-                      public virtual Event_impl
-{
-public:
-  Position_impl ();
-  Position_impl (Point &p);
-  virtual ~Position_impl ();
-
-  virtual CORBA::Float x ();
-  virtual void x (CORBA::Float);
-  virtual CORBA::Float y ();
-  virtual void y (CORBA::Float);
-  virtual CORBA::Float z ();
-  virtual void z (CORBA::Float);
-  //These are the attributes
-
-  virtual void do_print (void);
-};
-
-class Position_factory : public Position_init
-{
-  friend class Position;
- public:
-
-  // create (...) would go here
-private:
-  virtual ~Position_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Position)  create_for_unmarshal ();
-};
-
-
-// Log_Msg implementation classes =====================================
-
-class Log_Msg_impl : public virtual OBV_Log_Msg,
-                     public virtual Event_impl
-{
-public:
-  Log_Msg_impl ();
-  Log_Msg_impl (CORBA::Short urgency_p, const char *message_p);
-  virtual ~Log_Msg_impl ();
-
-  virtual void do_print (void);
-};
-
-class Log_Msg_factory : public Log_Msg_init
-{
-  friend class Log_Msg;
- public:
-
-  // create (...) would go here
-private:
-  virtual ~Log_Msg_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg)  create_for_unmarshal ();
-};
-
-
-// Event_List_Link implementation classes =====================================
-
-class Event_List_Link_factory;
-class Event_List_Iterator;
-
-class Event_List_Link_impl : public virtual OBV_Event_List_Link,
-                         public virtual CORBA::DefaultValueRefCountBase
-{
-  friend class Event_List_Link_factory;
-  friend class Event_List;
-  friend class Event_List_Iterator;
-
- public:
-  Event_List_Link_impl ();
-  Event_List_Link_impl (Event *e);
-  virtual ~Event_List_Link_impl ();
-
-  Event *get_event (void);
-
- private:
-  Event_List_Link *get_next_link (void);
-
-  void attach_next_link (Event_List_Link * chain);
-  // Attach a chain at the end.
-};
-
-
-class Event_List_Link_factory : public Event_List_Link_init
-{
-  friend class Event_List_Link;
- private:
-  virtual ~Event_List_Link_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List_Link)  create_for_unmarshal ();
-};
-
-
-// The event list itself.   ----------------------------------
-
-class Event_List_impl : public virtual OBV_Event_List,
-                        public virtual CORBA::DefaultValueRefCountBase
-{
-  friend class Event_List_Iterator;
- public:
-  Event_List_impl ();
-  virtual ~Event_List_impl ();
-
-  void store_event (Event* e);
-
-  Event_List_Link *get_first_link();
-  // The iterator needs it.
-
- private:
-  Event_List_Link *last_link_cache_;
-  // For fast attachment. Need not to be a _var cause we hold at least one
-  // reference through my_first_event_list_link which is a state member and
-  // is mapped to a _var.
-
-  // And it isn't a state member of valuetype.
-  // Currently we can't yet do this, because sharing of valuetypes is not
-  // yet impl ...%!.
-  // Without the availability to share we would get two different instances
-  // of the last list link at the receiving end of an invocation.
-};
-
-
-class Event_List_factory : public Event_List_init
-{
-  friend class Event_List;
- private:
-  virtual ~Event_List_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Event_List)  create_for_unmarshal ();
-};
-
-
-class Event_List_Iterator
-{
- public:
-  Event_List_Iterator (void);
-  Event_List_Iterator (Event_List *list);
-  // Construct it to point to the first list link.
-
-  virtual ~Event_List_Iterator ();
-
-  void init (Event_List *list);
-
-  Event *next ();
-  // Get pointer to the current event.
-
-  CORBA::Boolean next (Event_var &event);
-  // Sets the Event_var argument to the current event.
-  // This forces proper memory management in the user code, as the Event_var
-  // could be stored beyond the life time of the iterator.
-
-  void advance ();
-  // Walks one event ahead.
-
- private:
-  Event_List_Link_var current_;
-};
-
-
-// Checkpoint server side --------------------------------------------
-
-
-// Criterion classes -------------------------------------------------
-
-
-// Criterion itself has no implementation since it is abstract.
-
-// It is necessary to inherit from OBV_Event (or an Event implementation)
-// for implementing the state members of Event.
-
-
-class Temperature_Criterion_impl :
-                           public virtual OBV_Temperature_Criterion,
-                           public virtual OBV_Event,
-                           public virtual CORBA::DefaultValueRefCountBase
-{
-public:
-  Temperature_Criterion_impl ();
-  Temperature_Criterion_impl (CORBA::ULong origin_id, CORBA::Float temp);
-
-  virtual ~Temperature_Criterion_impl ();
-
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
-};
-
-class Temperature_Criterion_factory : public Temperature_Criterion_init
-{
-  friend class Temperature;
-private:
-  virtual ~Temperature_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Temperature_Criterion) create_for_unmarshal ();
-};
-
-
-
-class Position_Criterion_impl :
-                            public virtual OBV_Position_Criterion,
-                            public virtual OBV_Event,
-                            public virtual CORBA::DefaultValueRefCountBase
-{
-public:
-  Position_Criterion_impl ();
-  Position_Criterion_impl (CORBA::ULong origin_id,
-                           Position *lb,
-                           Position *tr);
-  virtual ~Position_Criterion_impl ();
-
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
-};
-
-class Position_Criterion_factory : public Position_Criterion_init
-{
-  friend class Position;
-private:
-  virtual ~Position_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Position_Criterion)  create_for_unmarshal ();
-};
-
-
-
-class Log_Msg_Criterion_impl : public virtual OBV_Log_Msg_Criterion,
-                               public virtual OBV_Event,
-                               public virtual CORBA::DefaultValueRefCountBase
-{
-public:
-  Log_Msg_Criterion_impl ();
-  virtual ~Log_Msg_Criterion_impl ();
-
-  CORBA::Boolean is_critical (Event* e);
-  virtual void do_print (void);
-};
-
-class Log_Msg_Criterion_factory : public Log_Msg_Criterion_init
-{
-  friend class Log_Msg;
-private:
-  virtual ~Log_Msg_Criterion_factory ();
-  TAO_OBV_CREATE_RETURN_TYPE (Log_Msg_Criterion)  create_for_unmarshal ();
-};
-
-
-class Criterion_List_impl : public virtual OBV_Criterion_List,
-                        public virtual CORBA::DefaultValueRefCountBase
-{
- public:
-  Criterion_List_impl ();
-  virtual ~Criterion_List_impl ();
-
-  void store_criterion (Criterion *c);
-  CORBA::Boolean is_critical (Event *e);
-};
-
-
-// This is just a wrapper and it uses the Event_List_Iterator on
-// the underlaying Event_List. Better would be a template for all the
-// iterators.
-
-class Criterion_List_Iterator
-{
- public:
-  Criterion_List_Iterator (Criterion_List *list);
-  // Construct it to point to the first list link.
-
-  virtual ~Criterion_List_Iterator ();
-
-  void init (Criterion_List *list);
-
-  Criterion *next ();
-  // Get pointer to the current Criterion.
-
-  void advance ();
-  // Walks one Criterion ahead.
-
- private:
-  Event_List_Iterator iterator_;
-};
-
-
-// Some origin_id's
-
-#define KITCHEN 1001
-#define BATHROOM 1002
-#define JONAS 1
diff --git a/TAO/examples/OBV/Typed_Events/Makefile b/TAO/examples/OBV/Typed_Events/Makefile
deleted file mode 100644
index b0298ba526e..00000000000
--- a/TAO/examples/OBV/Typed_Events/Makefile
+++ /dev/null
@@ -1,2184 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= Event_TypesC.cpp Event_TypesS.cpp
-
-PROG_SRCS = \
-	client.cpp \
-	server.cpp \
-	Server_i.cpp \
-	Client_i.cpp \
-	Event_Types_impl.cpp \
-	../Simple_util.cpp
-
-SRC = $(IDL_SRC) $(PROG_SRCS)
-
-SIMPLE_CLT_OBJS = \
-		Event_TypesC.o \
-		Event_TypesS.o \
-	        Client_i.o \
-		Event_Types_impl.o \
-		../Simple_util.o \
-		client.o
-SIMPLE_SVR_OBJS = \
-		Event_TypesC.o \
-		Event_TypesS.o \
-		Server_i.o \
-		Event_Types_impl.o \
-		../Simple_util.o \
-		server.o
-
-BIN = server \
-      client
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	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
-#----------------------------------------------------------------------------
-
-LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-override TAO_IDLFLAGS += -Gc -Gv
-
-.PRECIOUS: Event_TypesC.cpp Event_TypesC.i Event_TypesC.h
-.PRECIOUS: Event_TypesS.cpp Event_TypesS.i Event_TypesS.h
-.PRECIOUS: Event_TypesS_T.cpp Event_TypesS_T.i Event_TypesS_T.h
-
-server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-/bin/rm -rf Event_TypesC.* Event_TypesS.* Event_TypesS_T.*
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Event_TypesC.o .obj/Event_TypesC.so .shobj/Event_TypesC.o .shobj/Event_TypesC.so: Event_TypesC.cpp Event_TypesC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i Event_TypesS.h Event_TypesS_T.h Event_TypesS_T.i \
- Event_TypesS_T.cpp Event_TypesS.i
-.obj/Event_TypesS.o .obj/Event_TypesS.so .shobj/Event_TypesS.o .shobj/Event_TypesS.so: Event_TypesS.cpp Event_TypesS.h Event_TypesC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i Event_TypesS_T.h Event_TypesS_T.i Event_TypesS_T.cpp \
- Event_TypesS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/ORB.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Event_TypesC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/ORB.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Server_i.h Event_TypesS.h Event_TypesC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i Event_TypesS_T.h Event_TypesS_T.i Event_TypesS_T.cpp \
- Event_TypesS.i
-.obj/Server_i.o .obj/Server_i.so .shobj/Server_i.o .shobj/Server_i.so: Server_i.cpp Server_i.h Event_TypesS.h Event_TypesC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i Event_TypesS_T.h Event_TypesS_T.i Event_TypesS_T.cpp \
- Event_TypesS.i Event_Types_impl.h
-.obj/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.cpp Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/ORB.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Event_TypesC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i Event_Types_impl.h
-.obj/Event_Types_impl.o .obj/Event_Types_impl.so .shobj/Event_Types_impl.o .shobj/Event_Types_impl.so: Event_Types_impl.cpp Event_Types_impl.h \
- Event_TypesC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event_TypesC.i
-.obj/Simple_util.o .obj/Simple_util.so .shobj/Simple_util.o .shobj/Simple_util.so: ../Simple_util.cpp ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/ORB.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/OBV/Typed_Events/README b/TAO/examples/OBV/Typed_Events/README
deleted file mode 100644
index 77b3950e13f..00000000000
--- a/TAO/examples/OBV/Typed_Events/README
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-Typed Events
-============
-
-This is a demonstration of the CORBA 2.3 valuetype feature.
-Event_Types.idl defines a hierarchy of event classes. The common
-attributes (indeed not CORBA attributes, they're state members) 
-like creation time and id of the origin are in a base class. 
-Concrete events like Temperature, Position and Log Message are derived 
-from this class.
-
-The client sends a few random events to the server. The server has
-suitable implementations of the event classes. So it is able to
-show the incoming events by invoking the do_print () operation, which is
-declared in the Event baseclass. 
-After that the server does an "alarm" check on the event.
-For each possible origin id (KITCHEN, BATHROOM) a criterion has been
-registered. The criterion which equals the origin id of the event is
-searched and then asked with is_critical (event).
-
-Finally a list with all the events which causes an alarm is
-requested by the client.
-
-
-Start with:
-
-% ./server -o ior
-% ./client -f ior [-x]
-
-
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.cpp b/TAO/examples/OBV/Typed_Events/Server_i.cpp
deleted file mode 100644
index 9d61d0c4e28..00000000000
--- a/TAO/examples/OBV/Typed_Events/Server_i.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// $Id$
-
-#include "Server_i.h"
-#include "Event_Types_impl.h"
-
-
-Event_List_var alarms;
-// The list of events which caused an alarm. ('Singleton')
-
-Criterion_List_var criterions;
-// Arriving events are tested against the list members.
-
-
-
-// Set the ORB pointer, register OBV factories and init the
-// lists declared above.
-
-void
-Checkpoint_i::orb (CORBA::ORB_ptr o)
-{
-  this->orb_ = CORBA::ORB::_duplicate (o);
-
-  // Make factories to unmarshal OBV. The macro TAO_OBV_REGISTER_FACTORY is defined
-  // in tao/ValueFactory.h to prevent from getting wound fingertips.
-  // Notice that the way we currently do register_factory is not OMG conform.
-
-  // TAO_OBV_REGISTER_FACTORY (Event_factory);
-  // This one not. Event behaves as an abstract base,
-  // so we should't receive it (see header file)
-
-  TAO_OBV_REGISTER_FACTORY (Temperature_factory);
-  TAO_OBV_REGISTER_FACTORY (Position_factory);
-  TAO_OBV_REGISTER_FACTORY (Log_Msg_factory);
-  TAO_OBV_REGISTER_FACTORY (Event_List_factory);
-  TAO_OBV_REGISTER_FACTORY (Event_List_Link_factory);
-
-  // This list is returned by get_critical_events ().
-  alarms = new Event_List_impl;
-
-  // Now we build the list against which the events are tested.
-  criterions = new Criterion_List_impl;
-
-  // The conditions which will raise an alarm follow.
-
-  // The first parameter is the origin_id and the second the temperature.
-  Temperature_Criterion_var tc (new Temperature_Criterion_impl (KITCHEN, 32));
-  criterions->store_criterion (tc.in ());
-
-  tc = new Temperature_Criterion_impl (BATHROOM, 27);
-  criterions->store_criterion (tc.in ());
-
-
-  // Alarm if little Jonas is not in the child's room
-
-  Point leftbottom = {1, 2, 3};
-  Position_var leftbottom_v (new Position_impl (leftbottom));
-  Point topright = {2, 3, 4};
-  Position_var topright_v (new Position_impl (topright));
-  Position_Criterion_var pc (new Position_Criterion_impl (JONAS,
-                                                          leftbottom_v,
-                                                          topright_v));
-  criterions->store_criterion (pc.in ());
-
-  // Generic criterion matches every urgent massage
-  Log_Msg_Criterion_var lc (new Log_Msg_Criterion_impl);
-  // Null id flags to handle every Log_Msg
-  lc->origin_id_ (0);
-  criterions->store_criterion (lc.in ());
-
-  ACE_DEBUG ((LM_DEBUG, "This criterions are stored:\n"));
-  for (Criterion_List_Iterator i (criterions); i.next (); i.advance ())
-    {
-      Event *e = Event::_downcast (i.next ());
-      e->do_print ();
-    }
-    ACE_DEBUG ((LM_DEBUG, "\nNow waiting for events...\n"));
-}
-
-
-// Sidebar on assignment from pointer to _var type.
-//
-//   Event_var e_var (event);
-// This is fatal because the reference counter in *event is not increased
-// when a pointer is assigned to a _var. (This happens only
-// in assignments from another Event_var;
-// But Assignment from new is fine, the referencecount is yet one.)
-//
-// ok is
-//   CORBA::add_ref (event);
-//   Event_var e_var (event);
-//
-// but possibly easier to read it a macro
-#define DUP_REF(vt_ptr) (CORBA::add_ref (vt_ptr), vt_ptr)
-//   then it reads: Event_var e_var (DUP_REF (event));
-// (But it may cause desaster if vt_ptr is a function call.)
-//
-// Be careful with assignments from T1_var to T2_var, if T1 and T2 are
-// related through inheritance. Because there are many implicit casts
-// between pointer and _var types possible, the reference counter of
-// the duplicated reference is not increased.
-//
-// Is there any general solution with faulty reference counting ?
-
-
-void
-Checkpoint_i::put_event (Event *event,
-                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // In general this function would be a dispatcher which looks at the
-  // origin id and finds an event handler object for the event. The
-  // event handler then would (type-safe) downcast the event to the
-  // concrete type it can handle. Here we only apply the list of
-  // criterions to the event.
-
-
-  // Let us see what event has arrived
-  event->do_print ();
-
-  // Does it match any criterion for alarm ?
-  if (criterions->is_critical (event))
-    {
-      alarms->store_event (event);
-    }
-
-
-
-  // If we want to return the event (e.g. return type is Event *)
-  // return (DUP_REF (event));
-  // should be right.
-
-  return;
-}
-
-
-Event_List *
-Checkpoint_i::get_critical_events (CORBA::Environment &ACE_TRY_ENV)
-{
-  // The skeleton should not steal our list by decrementing
-  // the reference counter.
-
-  CORBA::add_ref (alarms.ptr ());
-
-  // alarms._retn () would reset and destroy our alarms.
-
-  return alarms.in ();
-}
-
-
-// Shutdown the server application.
-
-void
-Checkpoint_i::shutdown (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n%s\n",
-              "The Checkpoint server is shutting down"));
-
-  // Instruct the ORB to shutdown.
-  this->orb_->shutdown ();
-}
-
-
-// Constructor.
-
-Checkpoint_i::Checkpoint_i (void)
-{
-}
-
-// Destructor.
-
-Checkpoint_i::~Checkpoint_i (void)
-{
-}
diff --git a/TAO/examples/OBV/Typed_Events/Server_i.h b/TAO/examples/OBV/Typed_Events/Server_i.h
deleted file mode 100644
index 76bfacc68c2..00000000000
--- a/TAO/examples/OBV/Typed_Events/Server_i.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/OBV/Typed_Events
-//
-// = FILENAME
-//    Server_i.h
-//
-// = DESCRIPTION
-//    This class implements the Event_Types IDL interface.
-//
-// = AUTHOR
-//    Torsten Kuepper
-//    derived from the Echo example TAO/example/Simple/echo
-//    of Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ECHO_I_H
-#define ECHO_I_H
-
-#include "Event_TypesS.h"
-
-
-class Checkpoint_i : public POA_Checkpoint
-{
-public:
-  // = Initialization and termination methods.
-  Checkpoint_i (void);
-  // Constructor.
-
-  ~Checkpoint_i (void);
-  // Destructor.
-
-  virtual void put_event (
-        Event * e,
-        CORBA::Environment &ACE_TRY_ENV
-  );
-
-  virtual Event_List * get_critical_events (
-        CORBA::Environment &ACE_TRY_ENV
-  );
-
-  virtual void shutdown (CORBA::Environment &env);
-  // Shutdown the server.
-
-  void orb (CORBA::ORB_ptr o);
-  // Set the ORB pointer.
-
-private:
-  CORBA::ORB_var orb_;
-  // ORB pointer.
-};
-
-#endif /* ECHO_I_H */
-
diff --git a/TAO/examples/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
deleted file mode 100644
index d4e502a26bd..00000000000
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//$Id$
-
-# include "Client_i.h"
-
-// The client program for the application.
-
-int
-main (int argc, char **argv)
-{
-  Checkpoint_Client_i client;
-
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\nEvent_Types client\n\n"));
-
-  if (client.run ("Event_Types_Checkpoint",
-                  argc,
-                  argv) == -1)
-    return -1;
-  else
-    return 0;
-
-}
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
deleted file mode 100644
index 076099e93c9..00000000000
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#include "../Simple_util.h"
-#include "Server_i.h"
-
-// This is the main driver program for the time and date server.
-
-int
-main (int argc, char *argv[])
-{
-  Server<Checkpoint_i> server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tCheckpoint Event_Types server\n\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      if (server.init ("Event_Types_Checkpoint",
-                       argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
-        return 1;
-      else
-        {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Server<Checkpoint_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Server<Checkpoint_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/examples/POA/Adapter_Activator/README b/TAO/examples/POA/Adapter_Activator/README
deleted file mode 100644
index 6f7a41e48b3..00000000000
--- a/TAO/examples/POA/Adapter_Activator/README
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-This example is very similar to the Explicit_Activation example except
-that the POAs are deleted once the object references have been
-created. After this, an adapter activator is install in the RootPOA to
-reactivate the POAs on demand.
-
-The server program is available here. Use the Generic_Servant/client
-program to test this.
-
-________________________________________
-
-To test this example, type run_test.pl
-________________________________________
-
-Or
-________________________________________
-
-Run the server as follows:
-
-% ./server -f output
-
-This will produce three output files: output_1, output_2, and output_3
-
-Run the client as follows:
-
-% cd $TAO_ROOT/examples/POA/Generic_Servant
-% ./client -f ../Explicit_Activation/output_1
-% ./client -f ../Explicit_Activation/output_2
-% ./client -f ../Explicit_Activation/output_3
-________________________________________
-
-Or
-________________________________________
-
-Run the server as follows:
-
-% ./server -ORBobjrefstyle URL &
-
-Run the client as follows:
-
-% cd $TAO_ROOT/examples/POA/Generic_Servant
-% ./client -k <IOR>
-
-Comments :
-=========
- - As soon as, the server prints out the IOR, cut it and use it for
-running the client.
-________________________________________
diff --git a/TAO/examples/POA/Adapter_Activator/run_test.pl b/TAO/examples/POA/Adapter_Activator/run_test.pl
deleted file mode 100755
index ad17a70c16d..00000000000
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ /dev/null
@@ -1,76 +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 ACEutils;
-
-$iorfile = "ior";
-
-$oneway = "";
-$iterations = 100;
-
-$extra_args = "";
-
-# Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++)
-{
-  SWITCH:
-  {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
-    {
-      print "run_test [-h] [-i iterations] [-o] [-f ior file]\n";
-      print "\n";
-      print "-h                  -- prints this information\n";
-      print "-f                  -- ior file\n";
-      print "-i iterations       -- specifies iterations\n";
-      print "-o                  -- call issued are oneways\n";
-      exit;
-    }
-    if ($ARGV[$i] eq "-o")
-    {
-      $oneway = "-o";
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-i")
-    {
-      $iterations = $ARGV[$i + 1];
-      $i++;
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-f")
-    {
-      $iorfile = $ARGV[$i + 1];
-      $i++;
-      last SWITCH;
-    }
-    $extra_args .= " " . $ARGV[$i];
-  }
-}
-
-$iorfile_1 = $iorfile."_1";
-$iorfile_2 = $iorfile."_2";
-$iorfile_3 = $iorfile."_3";
-
-unlink $iorfile_1;
-unlink $iorfile_2;
-unlink $iorfile_3;
-
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
-
-ACE::waitforfile ($iorfile_1);
-ACE::waitforfile ($iorfile_2);
-ACE::waitforfile ($iorfile_3);
-
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2");
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_3 -x");
-
-unlink $iorfile_1;
-unlink $iorfile_2;
-unlink $iorfile_3;
-
-exit $status;
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
deleted file mode 100644
index 66a31b5b079..00000000000
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Adapter_Activator
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This example is very similar to the Explicit_Activation example
-//    except that the POAs are deleted once the object references have
-//    been created. After this, an adapter activator is install in the
-//    RootPOA to reactivate the POAs on demand.
-//
-//    Similar to the Explicit_Activation, the client for this example
-//    is Generic_Servant.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
-
-#include "ace/Get_Opt.h"
-#include "MyFooServant.h"
-
-ACE_RCSID(Adapter_Activator, server, "$Id$")
-
-class Adapter_Activator : public POA_PortableServer::AdapterActivator
-{
-public:
-
-  Adapter_Activator (PortableServer::POAManager_ptr poa_manager,
-                     CORBA::ORB_ptr orb);
-
-  CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name,
-                                  CORBA_Environment &ACE_TRY_ENV);
-
-  CORBA::PolicyList first_poa_policies_;
-  CORBA::PolicyList second_poa_policies_;
-
-private:
-
-  PortableServer::POAManager_var poa_manager_;
-  CORBA::ORB_var orb_;
-};
-
-Adapter_Activator::Adapter_Activator (PortableServer::POAManager_ptr poa_manager,
-                                      CORBA::ORB_ptr orb)
-  : poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager)),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-CORBA::Boolean
-Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                    const char *name,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (ACE_OS::strcmp (name, "firstPOA") == 0)
-    {
-      PortableServer::POA_var child = parent->create_POA (name,
-                                                          this->poa_manager_.in (),
-                                                          this->first_poa_policies_,
-                                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Creation of firstPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < this->first_poa_policies_.length ();
-           ++i)
-        {
-          this->first_poa_policies_[i]->destroy (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-
-      PortableServer::AdapterActivator_var activator = this->_this (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      child->the_activator (activator.in (),
-                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      MyFooServant *foo_impl = new MyFooServant (this->orb_.in (),
-                                                 child.in (),
-                                                 28);
-
-      child->set_servant (foo_impl,
-                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Finally everything is fine
-      return 1;
-    }
-  else if (ACE_OS::strcmp (name, "secondPOA") == 0)
-    {
-      PortableServer::POA_var child = parent->create_POA (name,
-                                                          this->poa_manager_.in (),
-                                                          this->second_poa_policies_,
-                                                          ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Creation of secondPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < this->second_poa_policies_.length ();
-           ++i)
-        {
-          this->second_poa_policies_[i]->destroy (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-
-      MyFooServant *foo_impl = new MyFooServant (this->orb_.in (),
-                                                 child.in (),
-                                                 29);
-
-      PortableServer::ObjectId_var oid =
-        PortableServer::string_to_ObjectId ("third Foo");
-
-      child->activate_object_with_id (oid.in (),
-                                      foo_impl,
-                                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Finally everything is fine
-      return 1;
-    }
-  else
-    {
-      // Unknown POA.
-      return 0;
-    }
-}
-
-static char *ior_output_file = 0;
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "f:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'f':
-        ior_output_file = get_opts.optarg;
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "[-f ior_output_file]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-static int
-write_iors_to_file (const char *first_ior,
-                    const char *second_ior,
-                    const char *third_ior)
-{
-  if (ior_output_file == 0)
-    // No filename was specified; simply return
-    return 0;
-
-  char ior_output_file_1[BUFSIZ];
-  char ior_output_file_2[BUFSIZ];
-  char ior_output_file_3[BUFSIZ];
-
-  ACE_OS::sprintf (ior_output_file_1, "%s_1", ior_output_file);
-  ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file);
-  ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file);
-
-  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w");
-  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w");
-  FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w");
-
-  if (output_file_1 == 0 ||
-      output_file_2 == 0 ||
-      output_file_3 == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n",
-                       ior_output_file_1,
-                       ior_output_file_2,
-                       ior_output_file_3),
-                      -1);
-
-  u_int result = 0;
-
-  result = ACE_OS::fprintf (output_file_1,
-                            "%s",
-                            first_ior);
-  if (result != ACE_OS::strlen (first_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
-                       first_ior,
-                       ior_output_file_1),
-                      -1);
-
-  result = ACE_OS::fprintf (output_file_2,
-                            "%s",
-                            second_ior);
-  if (result != ACE_OS::strlen (second_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
-                       second_ior,
-                       ior_output_file_2),
-                      -1);
-
-  result = ACE_OS::fprintf (output_file_3,
-                            "%s",
-                            third_ior);
-  if (result != ACE_OS::strlen (third_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
-                       third_ior,
-                       ior_output_file_3),
-                      -1);
-
-  ACE_OS::fclose (output_file_1);
-  ACE_OS::fclose (output_file_2);
-  ACE_OS::fclose (output_file_3);
-
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the ORB first.
-      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;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Adapter_Activator adapter_activator (poa_manager.in (),
-                                           orb.in ());
-
-      PortableServer::AdapterActivator_var activator = adapter_activator._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      root_poa->the_activator (activator.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var first_poa;
-      PortableServer::POA_var second_poa;
-
-      {
-        // Policies for the firstPOA to be created.
-        CORBA::PolicyList &policies = adapter_activator.first_poa_policies_;
-        policies.length (4);
-
-        // Id Assignment Policy
-        policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                 ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Lifespan policy
-        policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                            ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Request Processing policy
-        policies[2] =
-          root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
-                                                      ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Id Uniqueness
-        policies[3] =
-          root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                 ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Create the firstPOA under the RootPOA.
-        first_poa = root_poa->create_POA ("firstPOA",
-                                          poa_manager.in (),
-                                          policies,
-                                          ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-      }
-
-      {
-        // Policies for the secondPOA to be created.
-        CORBA::PolicyList &policies = adapter_activator.second_poa_policies_;
-        policies.length (2);
-
-        // Id Assignment Policy
-        policies[0] =
-          root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                                 ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Lifespan policy
-        policies[1] =
-          root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                            ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-
-        // Create the secondPOA under the firstPOA.
-        second_poa = first_poa->create_POA ("secondPOA",
-                                            poa_manager.in (),
-                                            policies,
-                                            ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-      }
-
-      // Create a servant.
-      MyFooServant first_foo_impl (orb.in (),
-                                   root_poa.in (),
-                                   27);
-
-      PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_foo_impl,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var second_foo =
-        first_poa->create_reference ("IDL:Foo:1.0",
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var third_oid =
-        PortableServer::string_to_ObjectId ("third Foo");
-
-      CORBA::Object_var third_foo =
-        second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n%s\n",
-                  first_ior.in (),
-                  second_ior.in (),
-                  third_ior.in ()));
-
-      int write_result = write_iors_to_file (first_ior.in (),
-                                             second_ior.in (),
-                                             third_ior.in ());
-      if (write_result != 0)
-        return write_result;
-
-      first_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-      // Destroy RootPOA (also destroys all child POAs).
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/examples/POA/Adapter_Activator/server.dsp b/TAO/examples/POA/Adapter_Activator/server.dsp
deleted file mode 100644
index 3fdab5e5a91..00000000000
--- a/TAO/examples/POA/Adapter_Activator/server.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Adapter Activator Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Adapter Activator 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 NMAKE /f "server.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 "server.mak"\

- CFG="POA Adapter Activator Server - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "POA Adapter Activator Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "POA Adapter Activator Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "POA Adapter Activator Server - 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 ""

-# 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 "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "POA Adapter Activator Server - 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 "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 ..\Generic_Servant\Generic_Servantd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF

-

-# Begin Target

-

-# Name "POA Adapter Activator Server - Win32 Release"

-# Name "POA Adapter Activator Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/POA/DSI/Database.idl b/TAO/examples/POA/DSI/Database.idl
index 3fd2aaf97df..ed1a44b971a 100644
--- a/TAO/examples/POA/DSI/Database.idl
+++ b/TAO/examples/POA/DSI/Database.idl
@@ -3,9 +3,9 @@
 module Database
 {
   typedef unsigned long Flags;
-
+  
   typedef string Identifier;
-
+  
   exception Unknown_Type
     {
       string type;
@@ -26,23 +26,23 @@ module Database
       string key;
     };
 
-  interface Entry
+  interface Entry 
     {
       readonly attribute string name;
     };
-
-  interface Employee : Entry
+  
+  interface Employee : Entry 
     {
       attribute long id;
     };
-
+  
   /*
-  interface Machine : Entry
+  interface Machine : Entry 
     {
       attribute string make;
     };
   */
-
+  
   struct NamedValue
     {
       Identifier name;
@@ -51,25 +51,23 @@ module Database
     };
 
   typedef sequence<NamedValue> NVPairSequence;
-
-  interface Agent
+  
+  interface Agent 
     {
       Entry create_entry (in string key,
                           in Identifier entry_type,
                           in NVPairSequence initial_attributes)
         raises (Unknown_Type,
                 Duplicate_Key);
-
+      
       Entry find_entry (in string key,
                         in Identifier entry_type)
         raises (Unknown_Type,
                 Not_Found);
-
+      
       void destroy_entry (in string key,
                           in Identifier entry_type)
         raises (Unknown_Type,
                 Unknown_Key);
-
-      void shutdown ();
     };
 };
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index a8c998cfa1f..94ceae588be 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -9,133 +9,119 @@ DatabaseImpl::Simpler_Malloc::Simpler_Malloc (void)
 {
 }
 
-DatabaseImpl::Simpler_Malloc::~Simpler_Malloc (void)
-{
-  this->remove ();
-}
-
 DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa))
 {
-  // Get the POA Current object reference
-  CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent",
-                                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Narrow the object reference to a POA Current reference
-  this->poa_current_ = PortableServer::Current::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 DatabaseImpl::Entry::~Entry (void)
 {
 }
 
-void
+void 
 DatabaseImpl::Entry::invoke (CORBA::ServerRequest_ptr request,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  // The servant determines the key associated with thex database
-  // entry represented by self
-  PortableServer::ObjectId_var oid =
-    this->poa_current_->get_object_id (ACE_TRY_ENV);
-  ACE_CHECK;
+  // Get the POA Current object reference
+  CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent");
 
-  // Now convert the id into a string
-  CORBA::String_var key =
-    PortableServer::ObjectId_to_string (oid.in ());
+  // Narrow the object reference to a POA Current reference
+  PortableServer::Current_var poa_current = PortableServer::Current::_narrow (obj.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::Current::_narrow");
+      return;
+    }
+  
+  // The servant determines the key associated with thex database entry
+  // represented by self
+  PortableServer::ObjectId_var oid = poa_current->get_object_id (env);
+  if (env.exception () != 0)
+    return;
 
+  // Now convert the id into a string
+  CORBA::String_var key = PortableServer::ObjectId_to_string (oid.in ());
+  
   // Get the operation name for this request
   const char *operation = request->operation ();
-
+  
   if (ACE_OS::strcmp (operation, "_is_a") == 0)
-    {
-      this->is_a (request, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+    this->_is_a (request, env);
   else
     {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
+      env.exception (new CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO));
+      return;
+    }    
 }
 
-void
-DatabaseImpl::Entry::is_a (CORBA::ServerRequest_ptr request,
-                           CORBA::Environment &ACE_TRY_ENV)
+void 
+DatabaseImpl::Entry::_is_a (CORBA::ServerRequest_ptr request,
+                            CORBA::Environment &env)
 {
   CORBA::NVList_ptr list;
-  this->orb_->create_list (0, list);
+  this->orb_->create_list (1, list);
 
-  CORBA::Any any_1 (CORBA::_tc_string);
+  char *value = 0;
+  CORBA::Any any_1 (CORBA::_tc_string, &value);
 
-  list->add_value ("value",
-                   any_1,
-                   CORBA::ARG_IN,
-                   ACE_TRY_ENV);
-  ACE_CHECK;
+  CORBA::NamedValue_ptr named_value_1 = list->add_value ("value", 
+                                                         any_1, 
+                                                         CORBA::ARG_IN, 
+                                                         env);
+  if (env.exception () != 0)
+    return;
 
   request->arguments (list,
-                      ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA_NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Any_ptr ap = nv->value ();
-  char *value;
-  *ap >>= value;
-
-  const char *object_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
-  ACE_CHECK;
+                      env);
+  if (env.exception () != 0)
+    return;
 
   CORBA::Boolean result;
   if (!ACE_OS::strcmp (value, "IDL:Database/Employee:1.0") ||
       !ACE_OS::strcmp (value, "IDL:Database/Entry:1.0") ||
-      !ACE_OS::strcmp (value, object_id))
+      !ACE_OS::strcmp (value, CORBA::_tc_Object->id (env)))
     result = 1;
   else
     result = 0;
-
+  
   CORBA::Any result_any;
   CORBA::Any::from_boolean from_boolean (result);
   result_any <<= from_boolean;
 
-  request->set_result (result_any, ACE_TRY_ENV);
-  ACE_CHECK;
+  request->set_result (result_any, env);
 }
 
-CORBA::RepositoryId
-DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/,
-                                         PortableServer::POA_ptr,
-                                         CORBA::Environment &)
+CORBA::RepositoryId 
+DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &oid,
+                                         PortableServer::POA_ptr poa,
+                                         CORBA::Environment &env)
 {
   return 0;
 }
 
-PortableServer::POA_ptr
-DatabaseImpl::Entry::_default_POA (CORBA::Environment &)
+PortableServer::POA_ptr 
+DatabaseImpl::Entry::_default_POA (CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb,
-                            PortableServer::POA_ptr poa,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            PortableServer::POA_ptr poa)
   : orb_ (CORBA::ORB::_duplicate (orb)),
     poa_ (PortableServer::POA::_duplicate (poa)),
-    common_servant_ (orb,
-                     poa,
-                     ACE_TRY_ENV)
+    common_servant_ (orb, poa)
 {
-  ACE_CHECK;
+  CORBA::Environment env;
 
-  this->poa_->set_servant (&this->common_servant_,
-                           ACE_TRY_ENV);
-  ACE_CHECK;
+  this->poa_->set_servant (&this->common_servant_, env);
+  if (env.exception () != 0)
+    {
+      ACE_ERROR ((LM_ERROR, "PortableServer::POA::set_servant\n"));
+      ACE_OS::exit (-1);
+    }
 }
 
 DatabaseImpl::Agent::~Agent (void)
@@ -146,80 +132,68 @@ Database::Entry_ptr
 DatabaseImpl::Agent::create_entry (const char *key,
                                    const char *entry_type,
                                    const Database::NVPairSequence &initial_attributes,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
-  // Create a new entry in the database:
+  // Create a new entry in the database:  
   if (ACE_OS::strcmp (entry_type, "Employee") != 0 ||
       initial_attributes.length () != 2)
     {
-      ACE_THROW_RETURN (Database::Unknown_Type (),
-                        Database::Entry::_nil ());
+      CORBA::Exception *exception = new Database::Unknown_Type (entry_type);
+      env.exception (exception);
+      return Database::Entry::_nil ();
     }
-
+  
   char *name = 0;
   CORBA::Long id = 0;
 
-  const Database::NamedValue &first = initial_attributes[0];
-  const Database::NamedValue &second = initial_attributes[1];
+  const Database::NamedValue &first = initial_attributes[0];    
+  const Database::NamedValue &second = initial_attributes[1];    
   if (ACE_OS::strcmp (first.name.in (), "name") != 0 ||
       ACE_OS::strcmp (second.name.in (), "id") != 0)
     {
-      ACE_THROW_RETURN (Database::Unknown_Type (),
-                        Database::Entry::_nil ());
+      CORBA::Exception *exception = new Database::Unknown_Type (entry_type);
+      env.exception (exception);
+      return Database::Entry::_nil ();
     }
-
+      
   first.value >>= name;
   second.value >>= id;
 
   Employee *new_employee = new Employee (name, id);
   DATABASE::instance ()->bind (key, new_employee);
 
-  ACE_DEBUG ((LM_DEBUG,
-              "New employee created with name = %s and id = %d\n",
-              name,
-              id));
-
   // creates a reference to the CORBA object used to encapsulate
   // access to the new entry in the database.  There is an interface
   // for each entry type:
   PortableServer::ObjectId_var obj_id = PortableServer::string_to_ObjectId (key);
   CORBA::String_var repository_id = DatabaseImpl::entry_type_to_repository_id ("Entry");
-
   CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (),
                                                                 repository_id.in (),
-                                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Database::Entry::_nil ()) ;
-
-  Database::Entry_var entry = Database::Entry::_narrow (obj.in (),
-                                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (Database::Entry::_nil ());
+                                                                env);
+  Database::Entry_var entry = Database::Entry::_narrow (obj.in (), env);
+  if (env.exception () != 0)
+    return Database::Entry::_nil ();
 
   return entry._retn ();
 }
 
-Database::Entry_ptr
+Database::Entry_ptr 
 DatabaseImpl::Agent::find_entry (const char *key,
                                  const char *entry_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     {
-      ACE_THROW_RETURN (Database::Unknown_Type (),
-                        Database::Entry::_nil ());
+      CORBA::Exception *exception = new Database::Unknown_Type (entry_type);
+      env.exception (exception);
+      return Database::Entry::_nil ();
     }
-
+  
   void *temp;
-  Database::Entry_var entry;
   if (DATABASE::instance ()->find (key, temp) == 0)
     {
       Employee *employee = (Employee *) temp;
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee with key = %s found: name = %s and id = %d\n",
-                  key,
-                  employee->name (),
-                  employee->id ()));
-
       // creates a reference to the CORBA object used to encapsulate
       // access to the new entry in the database.  There is an interface
       // for each entry type:
@@ -227,69 +201,52 @@ DatabaseImpl::Agent::find_entry (const char *key,
       CORBA::String_var repository_id = DatabaseImpl::entry_type_to_repository_id ("Entry");
       CORBA::Object_var obj = this->poa_->create_reference_with_id (obj_id.in (),
                                                                     repository_id.in (),
-                                                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (Database::Entry::_nil ());
+                                                                    env);
+      Database::Entry_var entry = Database::Entry::_narrow (obj.in (), env);
+      if (env.exception () != 0)
+        return Database::Entry::_nil ();
 
-      entry = Database::Entry::_narrow (obj.in (),
-                                        ACE_TRY_ENV);
-      ACE_CHECK_RETURN (Database::Entry::_nil ());
+      return entry._retn ();
     }
+
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee with key = %s not found\n",
-                  key));
-
-      ACE_THROW_RETURN (Database::Unknown_Key (),
-                        Database::Entry::_nil ());
+      CORBA::Exception *exception = new Database::Unknown_Key (key);
+      env.exception (exception);
+      return Database::Entry::_nil ();
     }
-
-  return entry._retn ();
 }
 
-void
+void 
 DatabaseImpl::Agent::destroy_entry (const char *key,
                                     const char *entry_type,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   if (ACE_OS::strcmp (entry_type, "Employee") != 0)
     {
-      ACE_THROW (Database::Unknown_Type ());
+      CORBA::Exception *exception = new Database::Unknown_Type (entry_type);
+      env.exception (exception);
+      return;
     }
-
+  
   void *temp;
   if (DATABASE::instance ()->unbind (key, temp) == 0)
     {
       Employee *employee = (Employee *) temp;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee with key = %s will be removed from the database: "
-                  "name = %s and id = %d \n",
-                  key,
-                  employee->name (),
-                  employee->id ()));
-
       delete employee;
     }
   else
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Employee with key = %s not found\n",
-                  key));
-
-      ACE_THROW (Database::Unknown_Key ());
+      CORBA::Exception *exception = new Database::Unknown_Key (key);
+      env.exception (exception);
+      return;
     }
 }
 
-void
-DatabaseImpl::Agent::shutdown (CORBA::Environment &)
-{
-  this->orb_->shutdown ();
-}
-
-PortableServer::POA_ptr
-DatabaseImpl::Agent::_default_POA (CORBA::Environment &)
+PortableServer::POA_ptr 
+DatabaseImpl::Agent::_default_POA (CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
@@ -297,14 +254,14 @@ char *
 DatabaseImpl::entry_type_to_repository_id (const char *entry_type)
 {
   static const char *prefix = "IDL:Database/";
-  static int prefix_length = ACE_OS::strlen (prefix);
+  static int prefix_length = ACE_OS::strlen (prefix); 
   static const char *suffix = ":1.0";
-  static int suffix_length = ACE_OS::strlen (prefix);
+  static int suffix_length = ACE_OS::strlen (prefix); 
 
-  int len =
-    prefix_length +
-    ACE_OS::strlen (entry_type) +
-    suffix_length +
+  int len = 
+    prefix_length + 
+    ACE_OS::strlen (entry_type) + 
+    suffix_length +     
     1;
 
   char *result = CORBA::string_alloc (len);
@@ -316,26 +273,26 @@ DatabaseImpl::entry_type_to_repository_id (const char *entry_type)
   return result;
 }
 
-DatabaseImpl::Employee::Employee (const char* name,
-                                  CORBA::Long id)
+DatabaseImpl::Employee::Employee (const char* name, 
+                                  CORBA::Long id) 
   : id_ (id),
     name_ (0)
 {
   this->name (name);
 }
 
-DatabaseImpl::Employee::~Employee (void)
-{
-  DATABASE::instance ()->free (this->name_);
+DatabaseImpl::Employee::~Employee (void) 
+{ 
+  DATABASE::instance ()->free (this->name_); 
 }
 
 const char *
 DatabaseImpl::Employee::name (void) const
-{
-  return this->name_;
+{ 
+  return this->name_; 
 }
 
-void
+void 
 DatabaseImpl::Employee::name (const char* name)
 {
   DATABASE::instance ()->free (this->name_);
@@ -343,16 +300,16 @@ DatabaseImpl::Employee::name (const char* name)
   ACE_OS::strcpy (this->name_, name);
 }
 
-CORBA::Long
-DatabaseImpl::Employee::id (void) const
-{
-  return this->id_;
+CORBA::Long 
+DatabaseImpl::Employee::id (void) const 
+{ 
+  return this->id_; 
 }
 
-void
+void 
 DatabaseImpl::Employee::id (CORBA::Long id)
-{
-  this->id_ = id;
+{ 
+  this->id_ = id; 
 }
 
 void *
@@ -361,10 +318,10 @@ DatabaseImpl::Employee::operator new (size_t size)
   return DATABASE::instance ()->malloc (size);
 }
 
-void
-DatabaseImpl::Employee::operator delete (void *pointer)
-{
-  DATABASE::instance ()->free (pointer);
+void 
+DatabaseImpl::Employee::operator delete (void *pointer) 
+{ 
+  DATABASE::instance ()->free (pointer); 
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -376,3 +333,4 @@ template class ACE_Singleton<DatabaseImpl::Simpler_Malloc, ACE_Null_Mutex>;
 #pragma instantiate ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex>
 #pragma instantiate ACE_Singleton<DatabaseImpl::Simpler_Malloc, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index b48464d3b7f..72d37d31984 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -11,26 +11,22 @@ class DatabaseImpl
 {
 public:
 
-  //typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
-  typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
+  typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> MALLOC;
 
   class Simpler_Malloc : public MALLOC
   {
   public:
     Simpler_Malloc (void);
-    ~Simpler_Malloc (void);
   };
 
   typedef ACE_Singleton<Simpler_Malloc, ACE_Null_Mutex> DATABASE;
-  //typedef ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> DATABASE_ITERATOR;
-  typedef ACE_Malloc_Iterator<ACE_LOCAL_MEMORY_POOL, ACE_Null_Mutex> DATABASE_ITERATOR;
+  typedef ACE_Malloc_Iterator<ACE_MMAP_MEMORY_POOL, ACE_Null_Mutex> DATABASE_ITERATOR;
 
   class Entry : public PortableServer::DynamicImplementation
   {
   public:
     Entry (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           CORBA::Environment &);
+           PortableServer::POA_ptr poa);
     ~Entry (void);
 
     virtual void invoke (CORBA::ServerRequest_ptr request,
@@ -49,7 +45,7 @@ public:
     virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
     // Returns the default POA for this servant.
 
-    virtual void is_a (CORBA::ServerRequest_ptr request,
+    virtual void _is_a (CORBA::ServerRequest_ptr request,
                         CORBA::Environment &env);
     // Handles the _is_a call
 
@@ -59,17 +55,13 @@ public:
 
     PortableServer::POA_var poa_;
     // Default POA
-
-    PortableServer::Current_var poa_current_;
-    // POA Current.
   };
 
   class Agent : public POA_Database::Agent
   {
   public:
     Agent (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr poa,
-           CORBA::Environment &);
+           PortableServer::POA_ptr poa);
     ~Agent (void);
 
     virtual Database::Entry_ptr create_entry (const char *key,
@@ -85,8 +77,6 @@ public:
                                 const char *entry_type,
                                 CORBA::Environment &env);
 
-    virtual void shutdown (CORBA::Environment &env);
-
     virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
     // Returns the default POA for this servant.
 
diff --git a/TAO/examples/POA/DSI/Makefile b/TAO/examples/POA/DSI/Makefile
index 64be5a684d0..08bd749d7d8 100644
--- a/TAO/examples/POA/DSI/Makefile
+++ b/TAO/examples/POA/DSI/Makefile
@@ -50,1408 +50,11 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) DatabaseC.* DatabaseS.*
+	-/bin/rm -rf DatabaseC.* DatabaseS.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/DatabaseC.o .obj/DatabaseC.so .shobj/DatabaseC.o .shobj/DatabaseC.so: DatabaseC.cpp DatabaseC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- DatabaseC.i DatabaseS.h DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp \
- DatabaseS.i
-.obj/DatabaseS.o .obj/DatabaseS.so .shobj/DatabaseS.o .shobj/DatabaseS.so: DatabaseS.cpp DatabaseS.h DatabaseC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Database_i.h DatabaseS.h DatabaseC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: 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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.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/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/Read_Buffer.i \
- DatabaseC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- DatabaseC.i
-.obj/Database_i.o .obj/Database_i.so .shobj/Database_i.o .shobj/Database_i.so: Database_i.cpp Database_i.h DatabaseS.h DatabaseC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- DatabaseC.i DatabaseS_T.h DatabaseS_T.i DatabaseS_T.cpp DatabaseS.i
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index a2f9076e2bc..aba09b9dcd4 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -23,12 +23,11 @@ ACE_RCSID(DSI, client, "$Id$")
 
 static char *IOR = 0;
 static char *IOR_file = 0;
-static int shutdown_server = 0;
 
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:f:");
+  ACE_Get_Opt get_opts (argc, argv, "k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -42,17 +41,12 @@ parse_args (int argc, char **argv)
         IOR_file = get_opts.optarg;
         break;
 
-      case 'x':
-        shutdown_server = 1;
-        break;
-
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            "-k IOR "
                            "-f IOR file "
-                           "-x [for shutting down the server] "
                            "\n",
                            argv [0]),
                           -1);
@@ -97,115 +91,103 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  char str [255];
   // Initialize the ORB
-  ACE_TRY
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
     {
-      ACE_OS::strcpy (str,
-                      "CORBA::ORB_init");
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Parse the command-line arguments to get the location of the IOR
-      if (parse_args (argc, argv) == -1)
-        return -1;
-
-      if (IOR == 0)
-        {
-          int result = read_IOR_from_file ();
-          if (result != 0)
-            ACE_ERROR_RETURN ((LM_ERROR, "Cannot read IOR from %s\n", IOR_file), -1);
-        }
-
-      ACE_OS::strcpy (str, "CORBA::ORB::string_to_object");
-
-      // Get the object reference with the IOR
-      CORBA::Object_var object = orb->string_to_object (IOR,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"Database::Agent::_narrow");
-
-      // Narrow the object reference to a Database::Agent
-      Database::Agent_var database_agent = Database::Agent::_narrow (object.in (),
-                                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Database::NVPairSequence employee_attributes (2);
-      employee_attributes.length (2);
-
-      Database::NamedValue &first = employee_attributes[0];
-      Database::NamedValue &second = employee_attributes[1];
-
-      char *name = "irfan";
-      CORBA::Long id = 555;
-
-      first.name = CORBA::string_dup ("name");
-      first.value <<= name;
-      second.name = CORBA::string_dup ("id");
-      second.value <<= id;
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
 
-      ACE_OS::strcpy (str,"Database::Agent::create_entry");
+  // Parse the command-line arguments to get the location of the IOR 
+  if (parse_args (argc, argv) == -1)
+    return -1;
 
-      // Create an employee
-      Database::Entry_var entry = database_agent->create_entry ("irfan",
-                                                                "Employee",
-                                                                employee_attributes,
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  if (IOR == 0)
+    {
+      int result = read_IOR_from_file ();
+      if (result != 0)
+        ACE_ERROR_RETURN ((LM_ERROR, "Cannot read IOR from %s\n", IOR_file), -1);
+    }
 
-      ACE_OS::strcpy (str, "Database::Employee::_narrow");
+  // Get the object reference with the IOR
+  CORBA::Object_var object = orb->string_to_object (IOR, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::string_to_object");
+      return -1;
+    }
+  
+  // Narrow the object reference to a Database::Agent
+  Database::Agent_var database_agent = Database::Agent::_narrow (object.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Database::Agent::_narrow");
+      return -1;
+    }
 
-      Database::Employee_var employee = Database::Employee::_narrow (entry.in (),
-                                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  Database::NVPairSequence employee_attributes (2);
+  employee_attributes.length (2);
+
+  Database::NamedValue &first = employee_attributes[0];    
+  Database::NamedValue &second = employee_attributes[1];    
+      
+  char *name = "irfan";
+  CORBA::Long id = 555;
+
+  first.name = CORBA::string_dup ("name");
+  first.value <<= name;
+  second.name = CORBA::string_dup ("id");
+  second.value <<= id;
+  
+  // Create an employee
+  Database::Entry_var entry = database_agent->create_entry ("irfan",
+                                                            "Employee",
+                                                            employee_attributes,
+                                                            env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Database::Agent::create_entry");
+      return -1;
+    }
 
-      /*
-       *
-       *  NOT IMPLEMENTED YET
-       *
-       *
-       */
+  Database::Employee_var employee = Database::Employee::_narrow (entry.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Database::Employee::_narrow");
+      return -1;
+    }
 
+  /*
+   * 
+   *  NOT IMPLEMENTED YET 
+   * 
+   *
+   */
+   
 #if 0
-      // Reset the id
-      ACE_OS::strcpy (str, "Database::Employee::id");
-      employee->id (666, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Reset the id
+  employee->id (666, env);  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Database::Employee::id");
+      return -1;
+    }
 #endif /* 0 */
 
-      ACE_OS::strcpy (str, "Database::Entry::find");
-      // Find the employee
-      entry = database_agent->find_entry ("irfan",
-                                          "Employee",
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "Database::Entry::destroy");
-      // Destroy the employee
-      database_agent->destroy_entry ("irfan",
-                                     "Employee",
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (shutdown_server)
-        {
-          database_agent->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_OS::free (IOR);
-
-    }
-  ACE_CATCHANY
+  // Destroy the employee
+  database_agent->destroy_entry ("irfan",
+                                 "Employee",
+                                 env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("Database::Entry::destroy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
+  ACE_OS::free (IOR);
+  
   return 0;
 }
diff --git a/TAO/examples/POA/DSI/run_test.pl b/TAO/examples/POA/DSI/run_test.pl
index f81e9b9c09a..5416ca78616 100755
--- a/TAO/examples/POA/DSI/run_test.pl
+++ b/TAO/examples/POA/DSI/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
@@ -16,9 +15,9 @@ $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", " -f $iorfile");
 
 ACE::waitforfile ($iorfile);
 
-$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x");
+$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile");
 
-$SV->Wait ();
+$SV->Kill (); $SV->Wait ();
 
 unlink $iorfile;
 
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index f320edadc25..21271bc9e9e 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -16,10 +16,9 @@
 //====================================================================
 
 #include "Database_i.h"
-#include "ace/Get_Opt.h"
 
 ACE_RCSID(DSI, server, "$Id$")
-
+  
 static char *ior_output_file = 0;
 
 static int
@@ -56,172 +55,199 @@ write_iors_to_file (const char *first_ior)
     return 0;
 
   FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
-
+  
   if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
-                       ior_output_file),
+    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n", 
+                       ior_output_file), 
                       -1);
-
+  
   int result = 0;
 
   result = ACE_OS::fprintf (output_file,
-                            "%s",
+                            "%s", 
                             first_ior);
-  if (result < 0 ||
+  if (result < 0 || 
       ACE_static_cast (size_t, result) != ACE_OS::strlen (first_ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "ACE_OS::fprintf failed while writing %s to %s\n", 
                        first_ior,
                        ior_output_file),
                       -1);
-
+  
   ACE_OS::fclose (output_file);
 
   return 0;
 }
 
-int
+int 
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  char str[256];
-  ACE_TRY
-    {
-      ACE_OS::strcpy (str,"CORBA::ORB_init");
-      // Initialize the ORB
-      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;
-
-      // Get the Root POA object reference
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-      ACE_OS::strcpy (str,"PortableServer::POA::_narrow");
-      // Narrow the object reference to a POA reference
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
-                                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::the_POAManager");
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::PolicyList policies (5);
-      policies.length (5);
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_id_assignment_policy");
-      // ID Assignment Policy
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_lifespan_policy");
-      // Lifespan Policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_request_processing_policy");
-      // Request Processing Policy
-      policies[2] =
-        root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT,
-                                                    ACE_TRY_ENV);
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_servant_retention_policy");
-      // Servant Retention Policy
-      policies[3] =
-        root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_id_uniqueness_policy");
-      // Id Uniqueness Policy
-      policies[4] =
-        root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str,"PortableServer::POA::create_POA");
-      ACE_CString name = "firstPOA";
-      PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
-                                                                poa_manager.in (),
-                                                                policies,
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::create_POA");
-      for (CORBA::ULong i = 0;
-           i < policies.length () && ACE_TRY_ENV.exception () == 0;
-           ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      // Create a Database Agent Implementation object in first_poa
-      DatabaseImpl::Agent database_agent_impl (orb.in (),
-                                               first_poa.in (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var database_agent_oid =
-        PortableServer::string_to_ObjectId ("DatabaseAgent");
-
-      ACE_OS::strcpy (str, "PortableServer::POA::activate_object_with_id");
-      first_poa->activate_object_with_id (database_agent_oid.in (),
-                                          &database_agent_impl,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "PortableServer::POA::id_to_reference");
-      CORBA::Object_var database_agent =
-        first_poa->id_to_reference (database_agent_oid.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_OS::strcpy (str, "CORBA::ORB::object_to_string");
-
-      // Get the IOR for the "DatabaseAgent" object
-      CORBA::String_var database_agent_ior =
-        orb->object_to_string (database_agent.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,"%s\n",
-                  database_agent_ior.in ()));
-
-      int write_result = write_iors_to_file (database_agent_ior.in ());
-      if (write_result != 0)
-        return write_result;
-
-      ACE_OS::strcpy (str, "PortableServer::POAManager::activate");
-      // set the state of the poa_manager to active i.e ready to process requests
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      // Run the ORB
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-      ACE_OS::strcpy (str,"PortableServer::POA::destroy");
-      // Destroy the rootPOA and its children
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Environment env;
+
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  int result = parse_args (argc, argv);
+  if (result != 0)
+    return result;
+
+  // Get the Root POA object reference
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+
+  // Narrow the object reference to a POA reference
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+  
+  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
     }
-  ACE_CATCHANY
+  
+  CORBA::PolicyList policies (5);
+  policies.length (5);  
+
+  // ID Assignment Policy
+  policies[0] =
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
       return -1;
     }
-  ACE_ENDTRY;
- ACE_CHECK_RETURN (-1);
 
- return 0;
+  // Lifespan Policy
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
+  
+  // Request Processing Policy
+  policies[2] =
+    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_request_processing_policy");
+      return -1;
+    }
+  
+  // Servant Retention Policy
+  policies[3] =
+    root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_servant_retention_policy");
+      return -1;
+    }
+
+  // Id Uniqueness Policy
+  policies[4] =
+    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_uniqueness_policy");
+      return -1;
+    }
+
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
+                                                            poa_manager.in (),
+                                                            policies,
+                                                            env);  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Create a Database Agent Implementation object in first_poa
+  DatabaseImpl::Agent database_agent_impl (orb.in (),
+                                           first_poa.in ());
+
+  PortableServer::ObjectId_var database_agent_oid =
+    PortableServer::string_to_ObjectId ("DatabaseAgent");
+
+  first_poa->activate_object_with_id (database_agent_oid.in (), 
+                                      &database_agent_impl, 
+                                      env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::activate_object_with_id");
+      return -1;
+    }
+  
+  CORBA::Object_var database_agent =
+    first_poa->id_to_reference (database_agent_oid.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::id_to_reference");
+      return -1;
+    }
+  // Get the IOR for the "DatabaseAgent" object
+  CORBA::String_var database_agent_ior =
+    orb->object_to_string (database_agent.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,"%s\n",
+              database_agent_ior.in ()));
+  
+  int write_result = write_iors_to_file (database_agent_ior.in ());
+  if (write_result != 0)
+    return write_result;
+
+  // set the state of the poa_manager to active i.e ready to process requests
+  poa_manager->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
+
+  // Run the ORB
+  if (orb->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+
+  // Destroy the rootPOA and its children
+  root_poa->destroy (1, 
+                     1, 
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
+
+  return 0;
 }
+
+
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 42096598455..3e4fc0f883f 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -24,10 +24,10 @@ FileImpl::System::System (PortableServer::POA_ptr poa)
    // Create the Default Descriptor Servant
     fd_servant_ (poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
   // set the default servant of the POA
-  poa->set_servant (&this->fd_servant_, ACE_TRY_ENV);
-  ACE_CHECK;
+  poa->set_servant (&this->fd_servant_, env);
+  ACE_ASSERT (env.exception () == 0);
 }
 
 FileImpl::System::~System (void)
@@ -35,15 +35,16 @@ FileImpl::System::~System (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::System::_default_POA (CORBA::Environment &)
+FileImpl::System::_default_POA (CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 File::Descriptor_ptr
 FileImpl::System::open (const char *file_name,
                         CORBA::Long flags,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // Do an ACE_OS::open
   ACE_HANDLE file_descriptor = ACE_OS::open (file_name,
@@ -51,13 +52,9 @@ FileImpl::System::open (const char *file_name,
 
   if (file_descriptor == ACE_INVALID_HANDLE)
     {
-      //CORBA::Exception exception = File::IOError (errno);
-      ACE_THROW_RETURN (File::IOError (), 0);
-
-      /*      ACE_NEW_THROW_EX (exception,
-                        File::IOError (errno),
-                        exception);
-                        ACE_CHECK_RETURN (0);*/
+      CORBA::Exception *exception = new File::IOError (errno);
+      env.exception (exception);
+      return 0;
     }
 
   char file_descriptor_buffer[BUFSIZ];
@@ -76,14 +73,16 @@ FileImpl::System::open (const char *file_name,
   CORBA::Object_var obj =
     this->poa_->create_reference_with_id (oid.in (),
                                           "IDL:File/Descriptor:1.0",
-                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
+                                          env);
+  if (env.exception () != 0)
+    return File::Descriptor::_nil ();
 
   // Narrow the object reference to a File Descriptor
   File::Descriptor_var fd =
-    File::Descriptor::_narrow (obj.in (), ACE_TRY_ENV);
+    File::Descriptor::_narrow (obj.in (), env);
 
-  ACE_CHECK_RETURN (File::Descriptor::_nil ());
+  if (env.exception () != 0)
+    return File::Descriptor::_nil ();
 
   return fd._retn ();
 }
@@ -99,27 +98,30 @@ FileImpl::Descriptor::~Descriptor (void)
 }
 
 PortableServer::POA_ptr
-FileImpl::Descriptor::_default_POA (CORBA::Environment &)
+FileImpl::Descriptor::_default_POA (CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 //Extracts the ACE_HANDLE from the passed object reference
 ACE_HANDLE
-FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::fd (CORBA::Environment &env)
 {
   // Get a reference to myself
-  File::Descriptor_var me = this->_this (ACE_TRY_ENV);
+  File::Descriptor_var me = this->_this (env);
 
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+  if (env.exception () != 0)
+    return ACE_INVALID_HANDLE;
 
   // Get the ObjectId from the reference
   PortableServer::ObjectId_var oid =
-    this->poa_->reference_to_id (me.in (), ACE_TRY_ENV);
-  
-  ACE_CHECK_RETURN (ACE_INVALID_HANDLE);
+    this->poa_->reference_to_id (me.in (), env);
+
+  if (env.exception () != 0)
+    return ACE_INVALID_HANDLE;
 
-    // Convert the ObjectId to a string
+  // Convert the ObjectId to a string
   CORBA::String_var s =
     PortableServer::ObjectId_to_string (oid.in ());
 
@@ -129,10 +131,12 @@ FileImpl::Descriptor::fd (CORBA::Environment &ACE_TRY_ENV)
 
 CORBA::Long
 FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd (env);
+
+  if (env.exception () != 0)
+    return 0;
 
   const CORBA::Octet *data = &buffer[0];
 
@@ -141,16 +145,22 @@ FileImpl::Descriptor::write (const File::Descriptor::DataBuffer &buffer,
                                buffer.length ());
   if (len > 0)
     return len;
-
-  ACE_THROW_RETURN (File::IOError (), 0);
+  else
+    {
+      CORBA::Exception *exception = new File::IOError (errno);
+      env.exception (exception);
+      return 0;
+    }
 }
 
 File::Descriptor::DataBuffer *
 FileImpl::Descriptor::read (CORBA::Long num_bytes,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd (env);
+
+  if (env.exception () != 0)
+    return 0;
 
   CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (num_bytes);
   int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
@@ -160,40 +170,54 @@ FileImpl::Descriptor::read (CORBA::Long num_bytes,
                                              length,
                                              buffer,
                                              1);
-
-  File::Descriptor::DataBuffer::freebuf (buffer);
-  ACE_THROW_RETURN (File::IOError (), 0);
+  else
+    {
+      File::Descriptor::DataBuffer::freebuf (buffer);
+      CORBA::Exception *exception = new File::IOError (errno);
+      env.exception (exception);
+      return 0;
+    }
 }
 
 CORBA::ULong
 FileImpl::Descriptor::lseek (CORBA::ULong offset,
                              CORBA::Long whence,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  ACE_HANDLE file_descriptor = this->fd (env);
+
+  if (env.exception () != 0)
+    return 0;
 
   CORBA::Long result = (CORBA::Long) ACE_OS::lseek (file_descriptor,
                                                     offset,
                                                     whence);
   if (result == -1)
-    ACE_THROW_RETURN (File::IOError (), 0);
-
-  return (CORBA::ULong) result;
+    {
+      CORBA::Exception *exception = new File::IOError (errno);
+      env.exception (exception);
+      return 0;
+    }
+  else
+    return (CORBA::ULong) result;
 }
 
 void
-FileImpl::Descriptor::destroy (CORBA::Environment &ACE_TRY_ENV)
+FileImpl::Descriptor::destroy (CORBA::Environment &env)
 {
   // Get the ACE_HANDLE for this object reference
-  ACE_HANDLE file_descriptor = this->fd (ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_HANDLE file_descriptor = this->fd (env);
+
+  if (env.exception () != 0)
+    return;
 
   //close the file corresponding to this object reference
   int result = ACE_OS::close (file_descriptor);
 
   if (result != 0)
     {
-      ACE_THROW (File::IOError ());
+      CORBA::Exception *exception = new File::IOError (errno);
+      env.exception (exception);
+      return;
     }
 }
diff --git a/TAO/examples/POA/Default_Servant/Makefile b/TAO/examples/POA/Default_Servant/Makefile
index e4ad51bcb80..98b696dad90 100644
--- a/TAO/examples/POA/Default_Servant/Makefile
+++ b/TAO/examples/POA/Default_Servant/Makefile
@@ -50,570 +50,21 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) FileC.* FileS.* FileS_T.*
+	-/bin/rm -rf FileC.* FileS.* FileS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/FileC.o .obj/FileC.so .shobj/FileC.o .shobj/FileC.so: FileC.cpp FileC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FileC.i FileS.h FileS_T.h FileS_T.i FileS_T.cpp FileS.i
-.obj/FileS.o .obj/FileS.so .shobj/FileS.o .shobj/FileS.so: FileS.cpp FileS.h FileC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
+.obj/FileC.o .obj/FileC.so .shobj/FileC.o .shobj/FileC.so: FileC.cpp FileC.h FileC.i FileS.h FileS_T.h FileS_T.i \
+ FileS_T.cpp FileS.i
+.obj/FileS.o .obj/FileS.so .shobj/FileS.o .shobj/FileS.so: FileS.cpp FileS.h FileC.h FileC.i FileS_T.h FileS_T.i \
+ FileS_T.cpp FileS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -629,272 +80,14 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- File_i.h FileS.h FileC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
+ $(ACE_ROOT)/ace/Get_Opt.i File_i.h \
+ FileS.h FileC.h FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -950,508 +143,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- FileC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Read_Buffer.i FileC.h \
  FileC.i
-.obj/File_i.o .obj/File_i.so .shobj/File_i.o .shobj/File_i.so: File_i.cpp File_i.h FileS.h FileC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FileC.i FileS_T.h FileS_T.i FileS_T.cpp FileS.i
+.obj/File_i.o .obj/File_i.so .shobj/File_i.o .shobj/File_i.so: File_i.cpp File_i.h FileS.h FileC.h FileC.i FileS_T.h \
+ FileS_T.i FileS_T.cpp FileS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Default_Servant/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index 917d0bbe412..9131e4e6dd4 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -71,87 +71,105 @@ parse_args (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
+  char* ior=0;
+  // Initialize the ORB
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  // Parse the command-line arguments to get the IOR 
+  parse_args (argc, argv);
 
-  ACE_TRY
+  // parse args should catch this, but just in case...
+  if (iorfile == 0)
+    return 0;
+
+  // Read the file, and get the IOR
+  ACE_HANDLE input_file = ACE_OS::open (iorfile, 0);
+  if (input_file == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_DEBUG,
+		       "Cannot open input file for reading IOR: %s\n", 
+		       iorfile),
+		      -1);
+  ACE_Read_Buffer ior_buffer (input_file);
+  char *data = ior_buffer.read ();
+  if (data == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+		       "Unable to read ior\n"),
+		      -1);
+  ior = ACE_OS::strdup (data);
+  ior_buffer.alloc ()-> free (data);
+  ACE_OS::close (input_file);
+  
+  CORBA::Object_var object = orb->string_to_object (ior, env);
+  if (env.exception () != 0)
     {
+      env.print_exception ("CORBA::ORB::string_to_object");
+      return -1;
+    }
+  
+  // Narrow the object reference to a File::System
+  File::System_var file_system = File::System::_narrow (object.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("File::System::_narrow");
+      return -1;
+    }
 
-      char* ior=0;
+  // Creat the file filename i.e "test"
+  File::Descriptor_var fd = file_system->open (filename, O_CREAT | O_RDWR, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("File::System::open");
+      return -1;
+    }
 
-      // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  int message_length = ACE_OS::strlen (message) + 1;
+  CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (message_length);
+  ACE_OS::strcpy ((char *) buffer, message);
+  File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
 
-      // Parse the command-line arguments to get the IOR
-      parse_args (argc, argv);
+  // write the message to the file
+  fd->write (data_sent, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("File::Descriptor::write");
+      return -1;
+    }
 
-      // parse args should catch this, but just in case...
-      if (iorfile == 0)
-        return 0;
+  //seek to the beginning of the file
+  fd->lseek (0, SEEK_SET, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("File::Descriptor::lseek");
+      return -1;
+    }
 
-      // Read the file, and get the IOR
-      ACE_HANDLE input_file = ACE_OS::open (iorfile, 0);
-      if (input_file == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open input file for reading IOR: %s\n",
-                           iorfile),
-                          -1);
-      ACE_Read_Buffer ior_buffer (input_file);
-      char *data = ior_buffer.read ();
-      if (data == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to read ior\n"),
-                          -1);
-      ior = ACE_OS::strdup (data);
-      ior_buffer.alloc ()-> free (data);
-      ACE_OS::close (input_file);
-
-      CORBA::Object_var object = orb->string_to_object (ior, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow the object reference to a File::System
-      File::System_var file_system = File::System::_narrow (object.in (),
-                                                            ACE_TRY_ENV);
-      // Creat the file filename i.e "test"
-      File::Descriptor_var fd = file_system->open (filename,
-                                                   O_CREAT | O_RDWR,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      int message_length = ACE_OS::strlen (message) + 1;
-      CORBA::Octet *buffer = File::Descriptor::DataBuffer::allocbuf (message_length);
-      ACE_OS::strcpy ((char *) buffer, message);
-      File::Descriptor::DataBuffer data_sent (message_length, message_length, buffer, 1);
-
-      // write the message to the file
-      fd->write (data_sent, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      //seek to the beginning of the file
-      fd->lseek (0, SEEK_SET, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Read back the written message
-      File::Descriptor::DataBuffer_var data_received = fd->read (message_length,
-                                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      char *result = (char *) &data_received[0];
-
-      // print the read message
-      ACE_DEBUG((LM_DEBUG,"%s\n",
-                 result));
-
-      // close the file
-      fd->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Read back the written message
+  File::Descriptor::DataBuffer_var data_received = fd->read (message_length, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("File::Descriptor::read");
+      return -1;
     }
-  ACE_CATCHANY
+
+  char *result = (char *) &data_received[0];
+
+  // print the read message
+  ACE_DEBUG((LM_DEBUG,"%s\n",
+	     result));
+
+  // close the file 
+  fd->destroy (env);
+  if (env.exception () != 0)
     {
+      env.print_exception ("File::Descriptor::destroy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index e391e365f5e..bb50518dae3 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index 215f301845b..5c43f9feb91 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -54,73 +54,112 @@ parse_args (int argc, char **argv)
   return 0;
 }
 
-int
+int 
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
   // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
 
   int result = parse_args (argc, argv);
   if (result != 0)
     return result;
-
+ 
   // Get the Root POA object reference
   CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
 
   // Narrow the object reference to a POA reference
-  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+  
+  PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
+  
   CORBA::PolicyList policies (5);
-  policies.length (5);
+  policies.length (5);  
 
   // ID Assignment Policy
   policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return -1;
+    }
 
   // Lifespan Policy
   policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
+  
   // Request Processing Policy
   policies[2] =
-    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    root_poa->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_request_processing_policy");
+      return -1;
+    }
+  
   // Servant Retention Policy
   policies[3] =
-    root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_servant_retention_policy");
+      return -1;
+    }
 
   // Id Uniqueness Policy
   policies[4] =
-    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_uniqueness_policy");
+      return -1;
+    }
 
   ACE_CString name = "firstPOA";
   PortableServer::POA_var first_poa = root_poa->create_POA (name.c_str (),
                                                             poa_manager.in (),
                                                             policies,
-                                                            ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                                            env);  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
   for (CORBA::ULong i = 0;
-       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       i < policies.length () && env.exception () == 0;
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (env);
+    }  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
     }
-  ACE_CHECK_RETURN (-1);
-
 
   // Create a File System Implementation object in first_poa
   FileImpl::System file_system_impl (first_poa.in ());
@@ -128,51 +167,70 @@ main (int argc, char **argv)
   PortableServer::ObjectId_var file_system_oid =
     PortableServer::string_to_ObjectId ("FileSystem");
 
-  first_poa->activate_object_with_id (file_system_oid.in (),
-                                      &file_system_impl,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  first_poa->activate_object_with_id (file_system_oid.in (), 
+                                      &file_system_impl, 
+                                      env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::activate_object_with_id");
+      return -1;
+    }
+  
   CORBA::Object_var file_system =
-    first_poa->id_to_reference (file_system_oid.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    first_poa->id_to_reference (file_system_oid.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::id_to_reference");
+      return -1;
+    }
   // Get the IOR for the "FileSystem" object
   CORBA::String_var file_system_ior =
-    orb->object_to_string (file_system.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    orb->object_to_string (file_system.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,"%s\n",
 		file_system_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",
+	ACE_ERROR_RETURN ((LM_DEBUG, "Cannot open output file for writing IOR: %s", 
 			   ior_output_file),
-			  -1);
+			  -1);  
       ACE_OS::fprintf (output_file, "%s", file_system_ior.in ());
       ACE_OS::fclose (output_file);
     }
-
+  
   // set the state of the poa_manager to active i.e ready to process requests
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
 
   // Run the ORB
   if (orb->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
 
   // Destroy the rootPOA and its children
-  root_poa->destroy (1,
-                     1,
-                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  root_poa->destroy (1, 
+                     1, 
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
 
   return 0;
 }
+
+
diff --git a/TAO/examples/POA/Default_Servant/svc.conf b/TAO/examples/POA/Default_Servant/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/examples/POA/Default_Servant/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/Default_Servant/test b/TAO/examples/POA/Default_Servant/test
new file mode 100644
index 00000000000..09ab97bfb35
--- /dev/null
+++ b/TAO/examples/POA/Default_Servant/test
@@ -0,0 +1 @@
+POA rules!!
\ No newline at end of file
diff --git a/TAO/examples/POA/Explicit_Activation/Alt_Resources/README b/TAO/examples/POA/Explicit_Activation/Alt_Resources/README
index ec8d77de73f..9d8ca43abec 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/README
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/README
@@ -1,8 +1,7 @@
 This module shows how to modify the default TAO Resource Factory to do
 something user specific.  In this example, the reactor() accessor is
-modified to provide the ORB with an instance of the ACE_WFMO_Reactor
-instead of the regular ACE_Select_Reactor.  You could also configure
-the ACE_XtReactor here, as well.
+modified to provide the ORB with an instance of the WFMO_Reactor
+instead of the regular Select_Reactor.  
 
 To use this altered resource factory in the Explicit_Activation
 example, please specify the -ORBsvcconf alternate.conf as a additional
diff --git a/TAO/examples/POA/Explicit_Activation/Makefile b/TAO/examples/POA/Explicit_Activation/Makefile
index 249417ccc49..eb7b54f71bf 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile
+++ b/TAO/examples/POA/Explicit_Activation/Makefile
@@ -42,6 +42,9 @@ endif
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -61,269 +64,9 @@ endif
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
- ../Generic_Servant/FooC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
- ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
- ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
+ ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
+ ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
+ ../Generic_Servant/FooS_T.i ../Generic_Servant/FooS_T.cpp \
+ ../Generic_Servant/FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Explicit_Activation/README b/TAO/examples/POA/Explicit_Activation/README
index fd31291356c..fdf1a3bf367 100644
--- a/TAO/examples/POA/Explicit_Activation/README
+++ b/TAO/examples/POA/Explicit_Activation/README
@@ -21,7 +21,7 @@ This will produce three output files: output_1, output_2, and output_3
 
 Run the client as follows:
 
-% cd $TAO_ROOT/examples/POA/Generic_Servant
+% cd $TAO_ROOT/tests/POA/Generic_Servant
 % ./client -f ../Explicit_Activation/output_1
 % ./client -f ../Explicit_Activation/output_2
 % ./client -f ../Explicit_Activation/output_3
@@ -36,11 +36,13 @@ Run the server as follows:
 
 Run the client as follows:
 
-% cd $TAO_ROOT/examples/POA/Generic_Servant
+% cd $TAO_ROOT/tests/POA/Generic_Servant
 % ./client -k <IOR>
 
-Comments :
+Comments : 
 =========
  - As soon as, the server prints out the IOR, cut it and use it for
 running the client.
 ________________________________________
+
+
diff --git a/TAO/examples/POA/Explicit_Activation/run_test.pl b/TAO/examples/POA/Explicit_Activation/run_test.pl
index ad17a70c16d..70f9c45c46c 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 261904d4335..9c17d8ed3a8 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -10,7 +10,7 @@
 //
 // = DESCRIPTION
 //    In this example,
-//     - A new POA (firstPOA) is created, and the different functions
+//     - A new POA ( firstPOA) is created, and the different functions
 //       for the explicit activation of objects are demonstrated.
 //     - The Foo application class objects (defined in
 //       ./../Generic_Servant/MyFooServant) are used as sample objects.
@@ -128,209 +128,257 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  ACE_TRY
+  // Initialize the ORB first.
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  int result = parse_args (argc, argv);
+  if (result != 0)
+    return result;
+
+  // Obtain the RootPOA.
+  CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
+
+  // Get the POA_var object from Object_var.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  // Get the POAManager of the RootPOA.
+  PortableServer::POAManager_var poa_manager =
+    root_poa->the_POAManager (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
+
+  // Policies for the firstPOA to be created.
+  CORBA::PolicyList policies (2);
+  policies.length (2);
+
+  // Id Assignment Policy
+  policies[0] =
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return -1;
+    }
+
+  // Lifespan policy
+  policies[1] =
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
+
+  // Create the firstPOA under the RootPOA.
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa =
+    root_poa->create_POA (name.c_str (),
+                          poa_manager.in (),
+                          policies,
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Create the secondPOA under the firstPOA.
+  name = "secondPOA";
+  PortableServer::POA_var second_poa =
+    first_poa->create_POA (name.c_str (),
+                           poa_manager.in (),
+                           policies,
+                           env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Creation of POAs is over. Destroy the Policy objects.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Create two Objects of Class MyFooServant (defined in
+  // ./../GenericServant/MyFooServant.h) Create one object at RootPOA
+  // and the other at firstPOA.
+  MyFooServant first_foo_impl (orb.in (), root_poa.in (), 27);
+  MyFooServant second_foo_impl (orb.in (), first_poa.in (), 28);
+
+  // Do "activate_object" to activate the first_foo_impl object.  It
+  // returns ObjectId for that object.  Operation Used :
+  //  ObjectId activate_object( in Servant p_servant)
+  //    raises (ServantAlreadyActive, WrongPolicy);
+  PortableServer::ObjectId_var first_oid =
+    root_poa->activate_object (&first_foo_impl, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::activate_object");
+      return -1;
+    }
+
+  // Get Object Reference for the first_foo_impl object.
+  Foo_var first_foo = first_foo_impl._this (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("POA_Foo::_this");
+      return -1;
+    }
+
+  // Get ObjectId for object secondFoo and use that ObjectId to
+  // activate the second_foo_impl object.
+  // Operation Used :
+  //  void activate_object_with_id( in ObjectId oid, in Servant p_servant)
+  //       raises (ObjectAlreadyActive, ServantAlreadyActive, WrongPolicy);
+  PortableServer::ObjectId_var second_oid =
+    PortableServer::string_to_ObjectId ("secondFoo");
+
+  first_poa->activate_object_with_id (second_oid.in (),
+                                      &second_foo_impl,
+                                      env);
+  if (env.exception () != 0)
     {
-      // Initialize the ORB first.
-      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;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Policies for the firstPOA to be created.
-      CORBA::PolicyList policies (3);
-      policies.length (3);
-
-      // Id Assignment Policy
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Lifespan policy
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Threading policy
-      policies[2] =
-        root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Create the firstPOA under the RootPOA.
-      ACE_CString name = "firstPOA";
-      PortableServer::POA_var first_poa =
-        root_poa->create_POA (name.c_str (),
-                              poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      policies[2]->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Threading policy
-      policies[2] =
-        root_poa->create_thread_policy (PortableServer::SINGLE_THREAD_MODEL,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Create the secondPOA under the firstPOA.
-      name = "secondPOA";
-      PortableServer::POA_var second_poa =
-        first_poa->create_POA (name.c_str (),
-                               poa_manager.in (),
-                               policies,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Creation of POAs is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      // Create two Objects of Class MyFooServant (defined in
-      // ./../GenericServant/MyFooServant.h) Create one object at RootPOA
-      // and the other at firstPOA.
-      MyFooServant first_foo_impl (orb.in (),
-                                   root_poa.in (),
-                                   27);
-      MyFooServant second_foo_impl (orb.in (),
-                                    first_poa.in (),
-                                    28);
-
-      // Do "activate_object" to activate the first_foo_impl object.  It
-      // returns ObjectId for that object.  Operation Used :
-      //  ObjectId activate_object(in Servant p_servant)
-      //    raises (ServantAlreadyActive, WrongPolicy);
-      PortableServer::ObjectId_var first_oid =
-        root_poa->activate_object (&first_foo_impl,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get Object Reference for the first_foo_impl object.
-      Foo_var first_foo = first_foo_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get ObjectId for object secondFoo and use that ObjectId to
-      // activate the second_foo_impl object.
-      // Operation Used :
-      //  void activate_object_with_id(in ObjectId oid, in Servant p_servant)
-      //       raises (ObjectAlreadyActive, ServantAlreadyActive, WrongPolicy);
-      PortableServer::ObjectId_var second_oid =
-        PortableServer::string_to_ObjectId ("secondFoo");
-
-      first_poa->activate_object_with_id (second_oid.in (),
-                                          &second_foo_impl,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get Object reference for second_foo_impl object.
-      Foo_var second_foo = second_foo_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get ObjectId for the string thirdPOA Create the object reference
-      // for thirdPOA using that ObjectId.  Operation Used :
-      //   Object create_reference_with_id (in ObjectId oid, in CORBA::RepositoryId intf );
-      // This operation creates an object reference that encapsulates the
-      // specified Object Id and interface repository Id values.
-      /*
-        PortableServer::ObjectId_var third_oid =
-        PortableServer::string_to_ObjectId ("thirdFoo");
-      */
-
-      // This will test how the POA handles a user given ID
-      PortableServer::ObjectId_var third_oid =
-        PortableServer::string_to_ObjectId ("third Foo");
-
-      third_oid[5] = (CORBA::Octet) '\0';
-
-      CORBA::Object_var third_foo =
-        second_poa->create_reference_with_id (third_oid.in (),
-                                              "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var first_ior =
-        orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var second_ior =
-        orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var third_ior =
-        orb->object_to_string (third_foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n%s\n",
-                  first_ior.in (),
-                  second_ior.in (),
-                  third_ior.in ()));
-
-      int write_result = write_iors_to_file (first_ior.in (),
-                                             second_ior.in (),
-                                             third_ior.in ());
-      if (write_result != 0)
-        return write_result;
-
-      // Activate third servant using its ObjectID.
-      MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29);
-      second_poa->activate_object_with_id (third_oid.in (),
-                                           &third_foo_impl,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-      // Destroy RootPOA (also destroys all child POAs).
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      ACE_TIMEPROBE_PRINT;
+      env.print_exception ("PortableServer::POA::activate_object_with_id");
+      return -1;
     }
-  ACE_CATCHANY
+
+  // Get Object reference for second_foo_impl object.
+  Foo_var second_foo = second_foo_impl._this (env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      env.print_exception ("POA_Foo::_this");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
+  // Get ObjectId for the string thirdPOA Create the object reference
+  // for thirdPOA using that ObjectId.  Operation Used :
+  //   Object create_reference_with_id (in ObjectId oid, in CORBA::RepositoryId intf );
+  // This operation creates an object reference that encapsulates the
+  // specified Object Id and interface repository Id values.
+  /*
+  PortableServer::ObjectId_var third_oid =
+    PortableServer::string_to_ObjectId ("thirdFoo");
+  */
+
+  // This will test how the POA handles a user given ID
+  PortableServer::ObjectId_var third_oid =
+    PortableServer::string_to_ObjectId ("third Foo");
+
+  third_oid[5] = (CORBA::Octet) '\0';
+
+  CORBA::Object_var third_foo =
+    second_poa->create_reference_with_id (third_oid.in (),
+                                          "IDL:Foo:1.0", env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_reference_with_id");
+      return -1;
+    }
+
+  // Stringyfy all the object references and print them out.
+  CORBA::String_var first_ior =
+    orb->object_to_string (first_foo.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  CORBA::String_var second_ior =
+    orb->object_to_string (second_foo.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  CORBA::String_var third_ior =
+    orb->object_to_string (third_foo.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s\n%s\n%s\n",
+              first_ior.in (),
+              second_ior.in (),
+              third_ior.in ()));
+
+  int write_result = write_iors_to_file (first_ior.in (),
+                                         second_ior.in (),
+                                         third_ior.in ());
+  if (write_result != 0)
+    return write_result;
+
+  // Activate thirdPOA using its ObjectID.
+  MyFooServant third_foo_impl (orb.in (), second_poa.in (), 29);
+  second_poa->activate_object_with_id (third_oid.in (),
+                                       &third_foo_impl,
+                                       env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::activate_object_with_id");
+      return -1;
+    }
+
+  poa_manager->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
+
+  if (orb->run () == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
+
+  // Destroy RootPOA. ( Also destroys firstPOA)
+  root_poa->destroy (1,
+                     1,
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
+
+  ACE_TIMEPROBE_PRINT;
 
   return 0;
 }
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 44edc46c1b2..53ac0eb2850 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -23,94 +23,156 @@ ACE_RCSID(FindPOA, FindPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
-  //  CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
   // Initialize the ORB
-  char str[256]; // Exception message
-  ACE_TRY
+
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  // Get Object reference to RootPOA.
+  CORBA::Object_var obj =
+    orb->resolve_initial_references ("RootPOA");
+
+  // Narrow Object reference to RootPOA to a POA reference.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in(), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  // Get a TAO_Adapter_Activator reference
+  TAO_Adapter_Activator activator_impl;
+
+  PortableServer::AdapterActivator_var activator =
+    activator_impl._this (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("TAO_Adapter_Activator::_this");
+      return -1;
+    }
+
+  // Register the TAO_Adapter_Activator reference to be the RootPOA's
+  // Adapter Activator.
+
+  root_poa->the_activator (activator.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_activator");
+      return -1;
+    }
+
+  // Try to find a childPOA of RootPOA named firstPOA
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa =
+    root_poa->find_POA (name.c_str (),
+                        1,
+                        env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::find_POA");
+      return -1;
+    }
+
+  // Use the TAO_POA name_separator (which is '/') to find a childPOA
+  // of firstPOA named secondPOA.
+
+  name += TAO_POA::name_separator ();
+  name += "secondPOA";
+  PortableServer::POA_var second_poa =
+    root_poa->find_POA (name.c_str (),
+                        1,
+                        env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::find_POA");
+      return -1;
+    }
+
+  // Create a hierarchical string of POA names
+  // eg. thirdPOA/forthPOA/fifthPOA thirdPOA being the root of the
+  // hierarchy with forthPOA as its child and fifthPOA as its
+  // grandchild.
+
+  name = "thirdPOA";
+  name += TAO_POA::name_separator ();
+  name += "forthPOA";
+  name += TAO_POA::name_separator ();
+  name += "fifthPOA";
+
+  // Try to find the fifth_poa by passing the hierarchy of POA names
+  // resulting in the creation of third and forth POAs as well as the
+  // fifth POA.
+
+  PortableServer::POA_var fifth_poa =
+    root_poa->find_POA (name.c_str (),
+                        1,
+                        env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::find_POA");
+      return -1;
+    }
+
+  // Get the names of all the POAs
+
+  CORBA::String_var root_poa_name =
+    root_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  CORBA::String_var first_poa_name =
+    first_poa->the_name (env);
+  if (env.exception () != 0)
     {
-      ACE_OS::strcpy (str, "CORBA::ORB_init");
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get Object reference to RootPOA.
-      CORBA::Object_var obj =
-        orb->resolve_initial_references ("RootPOA");
-
-      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
-      // Narrow Object reference to RootPOA to a POA reference.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get a TAO_Adapter_Activator reference
-      TAO_Adapter_Activator activator_impl;
-
-      ACE_OS::strcpy (str, "TAO_Adapter_Activator::_this");
-      PortableServer::AdapterActivator_var activator =
-        activator_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Register the TAO_Adapter_Activator reference to be the RootPOA's
-      // Adapter Activator.
-      ACE_OS::strcpy (str,"PortableServer::POA::the_activator");
-      root_poa->the_activator (activator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Try to find a childPOA of RootPOA named firstPOA
-      ACE_CString name = "firstPOA";
-      ACE_OS::strcpy (str,"PortableServer::POA::find_POA");
-      PortableServer::POA_var first_poa =
-        root_poa->find_POA (name.c_str (),
-                            1,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      name = "secondPOA";
-      PortableServer::POA_var second_poa =
-        first_poa->find_POA (name.c_str (),
-                             1,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the names of all the POAs
-      ACE_OS::strcpy (str, "PortableServer::POA::_narrow");
-
-      CORBA::String_var root_poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var first_poa_name =
-        first_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var second_poa_name =
-        second_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n%s\n%s\n",
-                  root_poa_name.in (),
-                  first_poa_name.in (),
-                  second_poa_name.in ()));
-
-      // This should destroy all its children
-      ACE_OS::strcpy (str, "PortableServer::POA::destroy");
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
+  CORBA::String_var second_poa_name =
+    second_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
     }
-  ACE_CATCHANY
+
+  CORBA::String_var fifth_poa_name =
+    fifth_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+
+  ACE_DEBUG((LM_DEBUG,"%s\n%s\n%s\n%s\n",
+	     root_poa_name.in (),
+	     first_poa_name.in (),
+	     second_poa_name.in (),
+	     fifth_poa_name.in ()));
+
+  // This should destroy all its children
+
+  root_poa->destroy (1,
+                     1,
+                     env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, str);
+      env.print_exception ("PortableServer::POA::destroy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/POA/FindPOA/Makefile b/TAO/examples/POA/FindPOA/Makefile
index 4928f5964ba..3f32e81fed8 100644
--- a/TAO/examples/POA/FindPOA/Makefile
+++ b/TAO/examples/POA/FindPOA/Makefile
@@ -44,6 +44,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -107,85 +110,79 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -194,31 +191,22 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -240,8 +228,11 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -258,64 +249,38 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/FindPOA/README b/TAO/examples/POA/FindPOA/README
index 9ac212956d3..e0bc53df588 100644
--- a/TAO/examples/POA/FindPOA/README
+++ b/TAO/examples/POA/FindPOA/README
@@ -8,7 +8,7 @@ Executable:	FindPOA
 Description:
 ===========
 
-This is a program to test the find_POA() method of the POA. It makes
+This is a program to test the findPOA() method of the POA. It makes
 use of TAO_Adapter_Activator.
 
 Adapter activators are associated with POAs. An adapter activator
@@ -20,14 +20,23 @@ at the beginning of execution does not need to use or provide an
 adapter activator; it is necessary only for the case in which POAs
 need to be created during request processing.
 
-The test program tests the "find_POA" method in RootPOA with a single
-POA named "firstPOA" and then with a POA namestring "secondPOA".  In
-the second case the secondPOA is non-existent and is created.
+TAO_Adapter_Activator takes a '/' (backslash) separated string of POA
+names and creates them in a hierarchy with the left most substring as
+the root of that hierarchy.
+
+The test program tests the "findPOA" method in RootPOA with a single
+POA named "firstPOA" and then with a POA namestring
+"firstPOA/secondPOA".  In the second case the secondPOA is
+non-existent and is created.
+
+Finally the findPOA method in RootPOA is called with a string
+"thirdPOA/forthPOA/fifthPOA", resulting in the creation of
+thirdPOA,forthPOA and a fifthPOA and returns the fifthPOA.
 
 To check the findPOA method the names of the POA are queried and
 printed on the screen. POAs hold only the name relative to its
-parent. For eg. the name of secondPOA is just "secondPOA" and NOT
-"/firstPOA/secondPOA".
+parent. For eg. the name of fifthPOA is just "fifthPOA" and NOT
+"RootPOA/thirdPOA/forthPOA/fifthPOA".
 
 To Test:
 ========
@@ -38,5 +47,6 @@ To Test:
 		<Empty string for RootPOA>
 		firstPOA
 		secondPOA
+		fifthPOA
 
 	3. There might be other diagnostic messages.
diff --git a/TAO/examples/POA/FindPOA/run_test.pl b/TAO/examples/POA/FindPOA/run_test.pl
index 38a074d6601..931304a076c 100755
--- a/TAO/examples/POA/FindPOA/run_test.pl
+++ b/TAO/examples/POA/FindPOA/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
diff --git a/TAO/examples/POA/Forwarding/Makefile b/TAO/examples/POA/Forwarding/Makefile
index 0c75537e81a..a05ec3e77ee 100644
--- a/TAO/examples/POA/Forwarding/Makefile
+++ b/TAO/examples/POA/Forwarding/Makefile
@@ -50,15 +50,22 @@ client:	$(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) FooC.* FooS.* FooS_T.*
+	-/bin/rm -rf FooC.* FooS.* FooS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.h \
+.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i
+.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -122,291 +129,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
-.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.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/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/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 \
- $(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.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/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 \
@@ -433,52 +202,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -487,31 +210,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -533,8 +247,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -551,70 +268,52 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i Servant_Locator.h
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -678,296 +377,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
- FooS.i Servant_Locator.h
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(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/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/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 \
- $(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.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/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 \
@@ -994,52 +450,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1048,31 +458,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1094,8 +495,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1112,74 +516,51 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- FooC.h FooC.i
+ $(ACE_ROOT)/ace/Read_Buffer.i FooC.h \
+ FooC.i
 .obj/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1243,85 +624,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1330,31 +705,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1376,8 +742,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1394,71 +763,48 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
  FooS.i Servant_Locator.h
 .obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1522,85 +868,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1609,31 +949,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1655,8 +986,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1673,65 +1007,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  MyFooServant.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
  FooS.i
 
diff --git a/TAO/examples/POA/Forwarding/MyFooServant.cpp b/TAO/examples/POA/Forwarding/MyFooServant.cpp
index 45870b3aa69..9e84310d454 100644
--- a/TAO/examples/POA/Forwarding/MyFooServant.cpp
+++ b/TAO/examples/POA/Forwarding/MyFooServant.cpp
@@ -61,35 +61,41 @@ MyFirstFooServant::shutdown (CORBA::Environment &/*env*/)
 
 
 void 
-MyFirstFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
+MyFirstFooServant::forward (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "MyFirstFooServant::forward: being called\n"));
   if (!CORBA::is_nil (this->forward_to_var_.in ()))
     {
       PortableServer::ObjectId_var oid =
-        this->poa_var_->servant_to_id (this, ACE_TRY_ENV);
-      ACE_CHECK;
+        this->poa_var_->servant_to_id (this, env);
+      
+      if (env.exception () != 0)
+        return;
 
       PortableServer::Servant servant = this->poa_var_->_servant ();
       if (servant == 0)
         {
-          ACE_THROW (Foo::Cannot_Forward ());
+          CORBA::Exception *exception = new Foo::Cannot_Forward;
+          env.exception (exception);
+          return;
         }
       
-      void *ptr = servant->_downcast ("IDL:omg.org/PortableServer/POA:1.0");
+      void *ptr = servant->_downcast ("IDL:PortableServer/POA:1.0");
       POA_PortableServer::POA *poa = (POA_PortableServer::POA *) ptr;
       TAO_POA *tao_poa = ACE_dynamic_cast (TAO_POA *, poa);
       
       tao_poa->forward_object (oid.in (),
                                this->forward_to_var_.in (),
-                               ACE_TRY_ENV);
+                               env);
     }
   else
     {
       ACE_DEBUG ((LM_DEBUG,
                   "POA approach: Forward_to refenence is nil.\n"));
-      ACE_THROW (Foo::Cannot_Forward ());
+      CORBA::Exception *exception = new Foo::Cannot_Forward;
+      env.exception (exception);
+      return;
     }
 }
 
@@ -119,13 +125,12 @@ MySecondFooServant::doit (CORBA::Environment &/*env*/)
 }
 
 void 
-MySecondFooServant::forward (CORBA::Environment &ACE_TRY_ENV)
+MySecondFooServant::forward (CORBA::Environment &env)
 {
   // forward the forwarding request to the Servant Locator :-) This is
   // kind of a loop back, but it is correct only the IDL interface can
   // be assumed !!
-  this->locator_ptr_->forward (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->locator_ptr_->forward (env);  
 }
 
 
diff --git a/TAO/examples/POA/Forwarding/Servant_Locator.cpp b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
index 180cb15f302..ea6177c9076 100644
--- a/TAO/examples/POA/Forwarding/Servant_Locator.cpp
+++ b/TAO/examples/POA/Forwarding/Servant_Locator.cpp
@@ -44,7 +44,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr /* poa_ptr */,
                                 const char *operation,
                                 PortableServer::ServantLocator::Cookie & /* cookie */,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (operation);
 
@@ -78,24 +78,35 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
         }
       else
         {
-          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
+          CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return 0;
         }
     }
   else // now forward, in throwing the ForwardRequest Exception
   {
     // Throw forward exception
-    ACE_THROW_RETURN (PortableServer::ForwardRequest (), 0);
+    env.exception (new PortableServer::ForwardRequest (this->forward_to_var_.in ()));
+
+    ACE_DEBUG ((LM_DEBUG,"MyFooServantLocator::preinvoke: Threw the ForwardRequest exception.\n"));
+    return 0;
   }
 }
 
 void
-MyFooServantLocator::postinvoke (const PortableServer::ObjectId &,
-                                 PortableServer::POA_ptr ,
-                                 const char *,
-                                 PortableServer::ServantLocator::Cookie ,
-                                 PortableServer::Servant ,
-                                 CORBA::Environment &)
+MyFooServantLocator::postinvoke (const PortableServer::ObjectId &oid,
+                                 PortableServer::POA_ptr poa,
+                                 const char *operation,
+                                 PortableServer::ServantLocator::Cookie cookie,
+                                 PortableServer::Servant p_servant,
+                                 CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (oid);
+  ACE_UNUSED_ARG (poa);
+  ACE_UNUSED_ARG (operation);
+  ACE_UNUSED_ARG (cookie);
+  ACE_UNUSED_ARG (p_servant);
+  ACE_UNUSED_ARG (env);
 }
 
 void
diff --git a/TAO/examples/POA/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index 94bf8b5ffa1..56c71aff99c 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -93,8 +93,7 @@ parse_args (int argc, char **argv)
 
 int do_calls (Foo_ptr foo_ptr)
 {
-  //  CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
   CORBA::Long result = 0;
   
@@ -103,17 +102,24 @@ int do_calls (Foo_ptr foo_ptr)
       // About half way through
       if (i % 3 == 0)
         {
-          foo_ptr->forward (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (-1);
+          foo_ptr->forward (env);
+	  
+          // If exception
+          if (env.exception () != 0)
+            {
+              env.print_exception ("Foo::forward");
+              return -1;
+            }
         }
       else
         {
           // Invoke the doit() method of the foo reference.
-          result = foo_ptr->doit (ACE_TRY_ENV);
+          result = foo_ptr->doit (env);
+	  
           // If exception
-          if (ACE_TRY_ENV.exception () != 0)
+          if (env.exception () != 0)
           {
-            ACE_TRY_ENV.print_exception ("calling doit");
+            env.print_exception ("calling doit");
           }
           else
             // Print the result of doit () method of the foo
@@ -140,30 +146,51 @@ main (int argc, char **argv)
 {
   // @@ Michael, this function is too long.  Can you please break it
   // up into multiple smaller functions.
-  //CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
-
+  CORBA::Environment env;
+  
   // Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+  
   // Initialize options based on command-line arguments.
   int parse_args_result = parse_args (argc, argv);
   if (parse_args_result != 0)
     return parse_args_result;
   
   // Get an object reference from the argument string.
-  CORBA::Object_var object = orb->string_to_object (server_IOR_, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  CORBA::Object_var object = orb->string_to_object (server_IOR_, env);
 
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::string_to_object");
+      return -1;
+    }
+  
   // Try to narrow the object reference to a Foo reference.
-  Foo_var foo_var = Foo::_narrow (object.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  Foo_var foo_var = Foo::_narrow (object.in (), env);
   
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Foo::_narrow");
+      return -1;
+    }
   
   CORBA::String_var original_location =
-    orb->object_to_string (foo_var.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (foo_var.in (), env);
+
+  if (env.exception () == 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "original location = %s \n",
+                original_location.in ()));
+  else
+    {
+      env.print_exception ("ORB::object_to_string");
+      return -1;
+    }
 
   if (do_calls (foo_var.in()) == -1)
     return -1;
diff --git a/TAO/examples/POA/Forwarding/run_test.pl b/TAO/examples/POA/Forwarding/run_test.pl
index 92b58c93cb7..33980674242 100755
--- a/TAO/examples/POA/Forwarding/run_test.pl
+++ b/TAO/examples/POA/Forwarding/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 require ACEutils;
 
@@ -12,32 +11,32 @@ $brace="\#\#\#\#\#";
 
 # There are three ways to run the test with different results, requiring
 # different numbers of servers and with variable arguments, hence the
-# arrays
+# arrays 
 
 # Servers 1 and 2 are used in all tests
-@server1arglist = ("-o server1 -ORBport 10040 -ORBobjrefstyle url",
-                   "-p server1  -ORBport 10040 -ORBobjrefstyle url",
-                   "-o server1 -ORBport 10040 -ORBobjrefstyle url");
-@server2arglist = ("-f server1 -o server2 -ORBport 10041 -ORBobjrefstyle url",
-                   "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url",
-                   "-g server1 -p server2 -ORBport 10041 -ORBobjrefstyle url");
-
-# The third server is only needed for the last test, but I'm making it
-# a list in case anyone wants to run it in multiple tests, rather than
+@server1arglist = ("-o server2 -ORBport 10040 -ORBobjrefstyle url",
+		   "-p server2  -ORBport 10040 -ORBobjrefstyle url",
+		   "-o server3 -ORBport 10040 -ORBobjrefstyle url");
+@server2arglist = ("-f server2 -o server1 -ORBport 10041 -ORBobjrefstyle url",
+		   "-g server2 -p server1 -ORBport 10041 -ORBobjrefstyle url",
+		   "-g server3 -p server2 -ORBport 10041 -ORBobjrefstyle url");
+
+# The third server is only needed for the last test, but I'm making it 
+# a list in case anyone wants to run it in multiple tests, rather than 
 # just one
 @server3arglist = ("",
-                   "",
-                   "-f server2 -o server3 -ORBport 10043 -ORBobjrefstyle url");
+		   "",
+		   "-f server2 -o server1 -ORBport 10043 -ORBobjrefstyle url");
 
 # The client is run for all tests
-@clientarglist = ("-f server2 -i 5",
-                  "-g server2 -i 5",
-                  "-f server3 -i 8");
+@clientarglist = ("-f server1 -i 5",
+		  "-g server1 -i 5",
+		  "-f server1 -i 8");
 
 # Descriptions of the tests
 @testlist = ("POA approach",
-             "servant locator approach",
-             "dual POA and servant locator approaches");
+	     "servant locator approach",
+	     "dual POA and servant locator approaches");
 
 $testtype = "";
 
@@ -48,7 +47,7 @@ $server3args = "";
 $clientargs = "";
 
 # Set STDERR to autoflush (weird unbufferd output stuff)
-$| = 1;
+$| = 1; 
 
 # Make pretty look thing
 print STDERR "\n";
@@ -62,60 +61,50 @@ sub argshift
     $clientargs = shift (@clientarglist);
     $testtype = shift (@testlist);
 }
-
-# IOR files must be cleaned up before next run
-sub cleanup_ior
-{
-    unlink "server1", "server2", "server3";
-}
+	
 
 # Run the test in it's three forms
-sub run_test
-{
+sub run_test 
+{    
     print STDERR "\n$brace Test of $testtype BEGUN\n";
-
+    
     # Run the servers
     $SRV1 = Process::Create  (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
-                             "$server1args");
+			     "$server1args");
     print STDERR ("server $server1args\n");
-    ACE::waitforfile ("server1");
-
     $SRV2 = Process::Create  (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
-                             "$server2args");
+			     "$server2args");
     print STDERR ("server $server2args\n");
-    ACE::waitforfile ("server2");
 
     if ($server3args ne "")
     {
-        $SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
-                                 "$server3args");
-        ACE::waitforfile ("server3");
+	$SRV3 = Process::Create (".".$DIR_SEPARATOR."server".$Process::EXE_EXT,
+				 "$server3args");
     }
-
+    
     # Run the client and block until completion
     $status  = system ("client$Process::EXE_EXT $clientargs");
     print STDERR ("client $clientargs");
-
+    
     # Now that the client has finished, kill off the servers
-
+ 
     $SRV1->Kill (); $SRV1->Wait ();
     $SRV2->Kill (); $SRV2->Wait ();
-
+    
     if ($server3args ne "")
     {
-        $SRV3->Kill (); $SRV3->Wait ();
+	$SRV3->Kill (); $SRV3->Wait ();
     }
 
     if ($status != 0)
     {
-        print STDERR ("\n$brace Test of $testtype FAILED\n");
-        $retval = -1;
+	print STDERR ("\n$brace Test of $testtype FAILED\n");
+	$retval = -1;
     }
     else
     {
-        print STDERR ("\n$brace Test of $testtype SUCCEEDED\n");
+	print STDERR ("\n$brace Test of $testtype SUCCEEDED\n");
     }
-    cleanup_ior ();
     return $status;
 }
 
@@ -126,7 +115,8 @@ for ($q = 0; $q < 3; $q++)
     run_test ();
     if ($q < 2)
     {
-        print STDERR ("\n\t\t Waiting for things to stabilize...\n");
-        sleep ($ACE::sleeptime);
+	print STDERR ("\n\t\t Waiting for things to stabilize...\n");
+	sleep ($ACE::sleeptime);
     }
 }
+
diff --git a/TAO/examples/POA/Forwarding/svc.conf b/TAO/examples/POA/Forwarding/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/examples/POA/Forwarding/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/Generic_Servant/Foo.idl b/TAO/examples/POA/Generic_Servant/Foo.idl
index 31e27f46e5f..7010d9c2133 100644
--- a/TAO/examples/POA/Generic_Servant/Foo.idl
+++ b/TAO/examples/POA/Generic_Servant/Foo.idl
@@ -18,9 +18,6 @@ interface Foo
   // A simple oneway operation, the idea is to measure any differences
   // to the previous one.
 
-  void timed_operation (in unsigned long timeout);
-  // A timed operation.
-
   void shutdown ();
   // Shutdown the server.
 };
diff --git a/TAO/examples/POA/Generic_Servant/Makefile b/TAO/examples/POA/Generic_Servant/Makefile
index 4c474d2f9c9..eb1888200e0 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile
+++ b/TAO/examples/POA/Generic_Servant/Makefile
@@ -64,845 +64,16 @@ client: $(POA_CLT_OBJS)
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) FooC.* FooS.* FooS_T.*
+	-/bin/rm -rf FooC.* FooS.* FooS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- generic_servant_export.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \
- FooS.i
-.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
+.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.h generic_servant_export.h FooC.i FooS.h \
+ FooS_T.h FooS_T.i FooS_T.cpp FooS.i
+.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h generic_servant_export.h FooC.i \
+ FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/MyFooServant.o .obj/MyFooServant.so .shobj/MyFooServant.o .shobj/MyFooServant.so: MyFooServant.cpp MyFooServant.h FooS.h FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  generic_servant_export.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
index e40b0ee5b83..d236da4f6f6 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.cpp
@@ -53,20 +53,6 @@ MyFooServant::simply_doit (CORBA::Environment &/*env*/)
 }
 
 void
-MyFooServant::timed_operation (CORBA::ULong timeout,
-                               CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Thread %t starting  MyFooServant::timed_operation with timeout %d\n",
-              timeout));
-
-  ACE_OS::sleep (timeout);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Thread %t completes MyFooServant::timed_operation\n"));
-}
-
-void
 MyFooServant::shutdown (CORBA::Environment &)
 {
   this->orb_->shutdown ();
@@ -137,3 +123,5 @@ destroy_servant (const PortableServer::ObjectId & /* oid */,
 {
   delete servant;
 }
+
+
diff --git a/TAO/examples/POA/Generic_Servant/MyFooServant.h b/TAO/examples/POA/Generic_Servant/MyFooServant.h
index 8643f512562..af9afb37c43 100644
--- a/TAO/examples/POA/Generic_Servant/MyFooServant.h
+++ b/TAO/examples/POA/Generic_Servant/MyFooServant.h
@@ -21,29 +21,25 @@
 class GENERIC_SERVANT_Export MyFooServant : public POA_Foo
 {
 public:
+  // constructor - takes a POA and a value parameter
   MyFooServant (CORBA::ORB_ptr orb,
                 PortableServer::POA_ptr poa,
                 CORBA::Long value);
-  // Constructor - takes a POA and a value parameter
 
-  virtual ~MyFooServant (void);
   // Destructor
+  virtual ~MyFooServant (void);
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
   // Returns the Default POA of this Servant object
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
 
-  virtual CORBA::Long doit (CORBA::Environment &env);
   // Simple doit method
+  virtual CORBA::Long doit (CORBA::Environment &env);
 
-  virtual void simply_doit (CORBA::Environment &env);
   // Even simpler doit method
+  virtual void simply_doit (CORBA::Environment &env);
 
-  virtual void timed_operation (CORBA::ULong timeout,
-                                CORBA::Environment &env);
-  // Timed operation.
-
-  virtual void shutdown (CORBA::Environment &env);
   // Shutdown the ORB
+  virtual void shutdown (CORBA::Environment &env);
 
 protected:
   CORBA::ORB_var orb_;
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index d1f9c2296a5..6f5d2b8650e 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -28,13 +28,11 @@ static char *IOR_file = 0;
 static int iterations = 1;
 static int oneway = 0;
 static int shutdown_server = 0;
-static CORBA::ULong timeout = 5;
-static int timed_operations = 0;
 
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:k:i:T:otx");
+  ACE_Get_Opt get_opts (argc, argv, "f:k:i:ox");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,18 +50,10 @@ parse_args (int argc, char **argv)
         oneway = 1;
         break;
 
-      case 't':
-        timed_operations = 1;
-        break;
-
       case 'i':
         iterations = ::atoi (get_opts.optarg);
         break;
 
-      case 'T':
-        timeout = ACE_static_cast (CORBA::ULong, ::atoi (get_opts.optarg));
-        break;
-
       case 'x':
 	shutdown_server = 1;
 	break;
@@ -75,8 +65,6 @@ parse_args (int argc, char **argv)
                            "-k IOR "
                            "-f IOR file "
                            "-o oneway "
-                           "-t timed operations "
-                           "-T timeout for timed operations "
                            "\n",
                            argv [0]),
                           -1);
@@ -154,22 +142,17 @@ read_IOR_from_file (void)
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY 
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Initialize options based on command-line arguments.
       int parse_args_result = parse_args (argc, argv);
       if (parse_args_result != 0)
         return parse_args_result;
-
+      
       if (IOR == 0)
         {
           int result = read_IOR_from_file ();
@@ -178,84 +161,72 @@ main (int argc, char **argv)
         }
 
       // Get an object reference from the argument string.
-      CORBA::Object_var object = orb->string_to_object (IOR,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var object = orb->string_to_object (IOR, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Try to narrow the object reference to a Foo reference.
-      Foo_var foo = Foo::_narrow (object.in (),
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      Foo_var foo = Foo::_narrow (object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       CORBA::String_var ior =
-        orb->object_to_string (foo.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        orb->object_to_string (foo.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
 
       ACE_DEBUG ((LM_DEBUG,
                   "\nConnecting to: %s\n\n",
                   ior.in ()));
-
+      
       ACE_Profile_Timer timer;
       ACE_Profile_Timer::ACE_Elapsed_Time elapsed_time;
-
+      
       // We start an ACE_Profile_Timer here...
       timer.start ();
-
+      
       CORBA::Long result = 0;
       int i = 0;
-
+      
       for (i = 0; i < iterations; i++)
         {
           if (oneway)
             {
               // Invoke the simply_doit() method of the foo reference.
-              foo->simply_doit (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-          else if (timed_operations)
-            {
-              // Invoke the timed_operation() method of the foo reference.
-              foo->timed_operation (timeout,
-                                    ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              foo->simply_doit (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
           else
             {
               // Invoke the doit() method of the foo reference.
-              result = foo->doit (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+              result = foo->doit (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
             }
         }
 
       // stop the timer.
       timer.stop ();
       timer.elapsed_time (elapsed_time);
-
+      
       // compute average time.
       print_stats (elapsed_time, i);
-
+      
       if (shutdown_server)
         {
-          foo->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          foo->shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
       // Print the result of doit () method of the foo reference.
       ACE_DEBUG ((LM_DEBUG, "The result of doit is %d\n", result));
-
+      
       ACE_TIMEPROBE_PRINT;
-
+      
       ACE_OS::free (IOR);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Error!");
-      return -1;
+      TAO_TRY_ENV.print_exception ("Error!");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;  
 
   return 0;
 }
diff --git a/TAO/examples/POA/Identity/Identity.cpp b/TAO/examples/POA/Identity/Identity.cpp
deleted file mode 100644
index 1b3673abd0d..00000000000
--- a/TAO/examples/POA/Identity/Identity.cpp
+++ /dev/null
@@ -1,755 +0,0 @@
-// $Id$
-
-// ==================================================
-// = LIBRARY
-//    TAO/examples/POA/Identity
-//
-// = FILENAME
-//    Identity.cpp
-//
-// = DESCRIPTION
-//    This program demonstrates how to move between id, reference, and
-//    servants.
-//
-// = AUTHOR
-//    Irfan Pyarali
-// ==================================================
-
-#include "testS.h"
-
-ACE_RCSID(Identity, Identity, "$Id$")
-
-class test_i : public POA_test
-{
-public:
-
-  test_i (PortableServer::POA_ptr poa)
-    : poa_ (PortableServer::POA::_duplicate (poa))
-    {
-    }
-
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &)
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    }
-
-protected:
-
-  PortableServer::POA_var poa_;
-};
-
-void
-create_poas (PortableServer::POA_ptr root_poa,
-             PortableServer::LifespanPolicyValue lifespan_policy,
-             PortableServer::POA_out first_poa,
-             PortableServer::POA_out second_poa,
-             PortableServer::POA_out third_poa,
-             PortableServer::POA_out forth_poa,
-             CORBA::Environment &ACE_TRY_ENV)
-{
-  // Policies for the new POAs
-  CORBA::PolicyList policies (3);
-  policies.length (3);
-
-  policies[0] = root_poa->create_lifespan_policy (lifespan_policy,
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Creation of the firstPOA
-  ACE_CString name = "firstPOA";
-  first_poa = root_poa->create_POA (name.c_str (),
-                                    PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[1]->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Creation of the secondPOA
-  name = "secondPOA";
-  second_poa = root_poa->create_POA (name.c_str (),
-                                     PortableServer::POAManager::_nil (),
-                                     policies,
-                                     ACE_TRY_ENV);
-
-  policies[2]->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[2] = root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                                       ACE_TRY_ENV);
-
-  // Creation of the thirdPOA
-  name = "thirdPOA";
-  third_poa = root_poa->create_POA (name.c_str (),
-                                    PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[1]->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  policies[1] = root_poa->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID,
-                                                       ACE_TRY_ENV);
-
-  // Creation of the forthPOA
-  name = "forthPOA";
-  forth_poa = root_poa->create_POA (name.c_str (),
-                                    PortableServer::POAManager::_nil (),
-                                    policies,
-                                    ACE_TRY_ENV);
-
-  // Creation of the new POAs over, so destroy the policies
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      policies[i]->destroy (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-test_poas (CORBA::ORB_ptr orb,
-           PortableServer::POA_ptr root_poa,
-           PortableServer::POA_ptr first_poa,
-           PortableServer::POA_ptr second_poa,
-           PortableServer::POA_ptr third_poa,
-           PortableServer::POA_ptr forth_poa,
-           int perform_deactivation_test,
-           CORBA::Environment &ACE_TRY_ENV)
-{
-  {
-    test_i servant (root_poa);
-
-    CORBA::Object_var obj = root_poa->create_reference ("IDL:test:1.0",
-                                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id = root_poa->reference_to_id (obj.in (),
-                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    root_poa->activate_object_with_id (id.in (),
-                                       &servant,
-                                       ACE_TRY_ENV);
-    ACE_CHECK;
-
-    obj = root_poa->id_to_reference (id.in (),
-                                     ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::Servant servant_from_reference = root_poa->reference_to_servant (obj.in (),
-                                                                                     ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::Servant servant_from_id = root_poa->id_to_servant (id.in (),
-                                                                       ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (servant_from_reference == servant_from_id);
-    ACE_ASSERT (servant_from_reference == &servant);
-
-    obj = root_poa->servant_to_reference (&servant,
-                                          ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = servant._this (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id_from_servant = root_poa->servant_to_id (&servant,
-                                                                            ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (id_from_servant.in () == id.in ());
-
-    root_poa->deactivate_object (id.in (),
-                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (perform_deactivation_test)
-      {
-        root_poa->activate_object_with_id (id.in (),
-                                           &servant,
-                                           ACE_TRY_ENV);
-        ACE_CHECK;
-
-        servant_from_reference = root_poa->reference_to_servant (obj.in (),
-                                                                 ACE_TRY_ENV);
-        ACE_CHECK;
-
-        ACE_ASSERT (servant_from_reference == &servant);
-
-        root_poa->deactivate_object (id.in (),
-                                     ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-  }
-
-  {
-    test_i servant (root_poa);
-
-    PortableServer::ObjectId_var id = root_poa->activate_object (&servant,
-                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::Object_var obj = root_poa->id_to_reference (id.in (),
-                                                       ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = root_poa->create_reference_with_id (id.in (),
-                                              "IDL:test:1.0",
-                                              ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    root_poa->deactivate_object (id.in (),
-                                 ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  {
-    test_i servant (first_poa);
-
-    CORBA::Object_var obj = first_poa->create_reference ("IDL:test:1.0",
-                                                         ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id = first_poa->reference_to_id (obj.in (),
-                                                                  ACE_TRY_ENV);
-    ACE_CHECK;
-
-    first_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    obj = first_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::Servant servant_from_reference = first_poa->reference_to_servant (obj.in (),
-                                                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::Servant servant_from_id = first_poa->id_to_servant (id.in (),
-                                                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (servant_from_reference == servant_from_id);
-    ACE_ASSERT (servant_from_reference == &servant);
-
-    first_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (perform_deactivation_test)
-      {
-        first_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
-        ACE_CHECK;
-
-        servant_from_reference = first_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
-        ACE_CHECK;
-
-        ACE_ASSERT (servant_from_reference == &servant);
-
-        first_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-  }
-
-  {
-    test_i servant (first_poa);
-
-    PortableServer::ObjectId_var id = first_poa->activate_object (&servant,
-                                                                  ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::Object_var obj = first_poa->id_to_reference (id.in (),
-                                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = first_poa->create_reference_with_id (id.in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    first_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  {
-    test_i servant (second_poa);
-
-    CORBA::Object_var obj = second_poa->create_reference ("IDL:test:1.0",
-                                                          ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id = second_poa->reference_to_id (obj.in (),
-                                                                   ACE_TRY_ENV);
-    ACE_CHECK;
-
-    second_poa->activate_object_with_id (id.in (),
-                                         &servant,
-                                         ACE_TRY_ENV);
-    ACE_CHECK;
-
-    obj = second_poa->id_to_reference (id.in (),
-                                       ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::Servant servant_from_reference = second_poa->reference_to_servant (obj.in (),
-                                                                                       ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::Servant servant_from_id = second_poa->id_to_servant (id.in (),
-                                                                         ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (servant_from_reference == servant_from_id);
-    ACE_ASSERT (servant_from_reference == &servant);
-
-    obj = second_poa->servant_to_reference (&servant,
-                                            ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = servant._this (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id_from_servant = second_poa->servant_to_id (&servant,
-                                                                              ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (id_from_servant.in () == id.in ());
-
-    second_poa->deactivate_object (id.in (),
-                                   ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (perform_deactivation_test)
-      {
-        second_poa->activate_object_with_id (id.in (),
-                                             &servant,
-                                             ACE_TRY_ENV);
-        ACE_CHECK;
-
-        servant_from_reference = second_poa->reference_to_servant (obj.in (),
-                                                                   ACE_TRY_ENV);
-        ACE_CHECK;
-
-        ACE_ASSERT (servant_from_reference == &servant);
-
-        second_poa->deactivate_object (id.in (),
-                                       ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-  }
-
-  {
-    test_i servant (second_poa);
-
-    PortableServer::ObjectId_var id = second_poa->activate_object (&servant,
-                                                                   ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::Object_var obj = second_poa->id_to_reference (id.in (),
-                                                         ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = second_poa->create_reference_with_id (id.in (),
-                                                "IDL:test:1.0",
-                                                ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    second_poa->deactivate_object (id.in (),
-                                   ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  {
-    test_i servant (third_poa);
-    PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
-
-    CORBA::Object_var obj = third_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0",
-                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id_from_reference = third_poa->reference_to_id (obj.in (),
-                                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = PortableServer::ObjectId_to_string (id_from_reference.in ());
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    ACE_ASSERT (id_from_reference.in () == id.in ());
-
-    third_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    obj = third_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::Servant servant_from_reference = third_poa->reference_to_servant (obj.in (),
-                                                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::Servant servant_from_id = third_poa->id_to_servant (id.in (),
-                                                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (servant_from_reference == servant_from_id);
-    ACE_ASSERT (servant_from_reference == &servant);
-
-    obj = third_poa->servant_to_reference (&servant,
-                                           ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    obj = servant._this (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id_from_servant = third_poa->servant_to_id (&servant,
-                                                                             ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = PortableServer::ObjectId_to_string (id_from_servant.in ());
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    ACE_ASSERT (id_from_servant.in () == id.in ());
-
-    third_poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
-    ACE_CHECK;
-
-    if (perform_deactivation_test)
-      {
-        third_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
-        ACE_CHECK;
-
-        servant_from_reference = third_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
-        ACE_CHECK;
-
-        ACE_ASSERT (servant_from_reference == &servant);
-
-        third_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-  }
-
-  {
-    test_i servant (forth_poa);
-    PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("hello");
-
-    CORBA::Object_var obj = forth_poa->create_reference_with_id (id.in (),
-                                                                 "IDL:test:1.0",
-                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    CORBA::String_var string = orb->object_to_string (obj.in (),
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::ObjectId_var id_from_reference = forth_poa->reference_to_id (obj.in (),
-                                                                                 ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = PortableServer::ObjectId_to_string (id_from_reference.in ());
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    ACE_ASSERT (id_from_reference.in () == id.in ());
-
-    forth_poa->activate_object_with_id (id.in (),
-                                        &servant,
-                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    obj = forth_poa->id_to_reference (id.in (),
-                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    string = orb->object_to_string (obj.in (),
-                                    ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
-
-    PortableServer::Servant servant_from_reference = forth_poa->reference_to_servant (obj.in (),
-                                                                                      ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::Servant servant_from_id = forth_poa->id_to_servant (id.in (),
-                                                                        ACE_TRY_ENV);
-    ACE_CHECK;
-
-    ACE_ASSERT (servant_from_reference == servant_from_id);
-    ACE_ASSERT (servant_from_reference == &servant);
-
-    forth_poa->deactivate_object (id.in ());
-
-    if (perform_deactivation_test)
-      {
-        forth_poa->activate_object_with_id (id.in (),
-                                            &servant,
-                                            ACE_TRY_ENV);
-        ACE_CHECK;
-
-        servant_from_reference = forth_poa->reference_to_servant (obj.in (),
-                                                                  ACE_TRY_ENV);
-        ACE_CHECK;
-
-        ACE_ASSERT (servant_from_reference == &servant);
-
-        forth_poa->deactivate_object (id.in (),
-                                      ACE_TRY_ENV);
-        ACE_CHECK;
-      }
-  }
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0,
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in (),
-                                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters
-        = TAO_ORB_Core_instance ()->server_factory ()->active_object_map_creation_parameters ();
-
-      int perform_deactivation_test = creation_parameters.allow_reactivation_of_system_ids_;
-
-      PortableServer::POA_var first_poa;
-      PortableServer::POA_var second_poa;
-      PortableServer::POA_var third_poa;
-      PortableServer::POA_var forth_poa;
-
-      create_poas (root_poa.in (),
-                   PortableServer::TRANSIENT,
-                   first_poa.out (),
-                   second_poa.out (),
-                   third_poa.out (),
-                   forth_poa.out (),
-                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_poas (orb.in (),
-                 root_poa.in (),
-                 first_poa.in (),
-                 second_poa.in (),
-                 third_poa.in (),
-                 forth_poa.in (),
-                 perform_deactivation_test,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      first_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      second_poa->destroy (1,
-                           1,
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      third_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      forth_poa->destroy (1,
-                          1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      create_poas (root_poa.in (),
-                   PortableServer::PERSISTENT,
-                   first_poa.out (),
-                   second_poa.out (),
-                   third_poa.out (),
-                   forth_poa.out (),
-                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_poas (orb.in (),
-                 root_poa.in (),
-                 first_poa.in (),
-                 second_poa.in (),
-                 third_poa.in (),
-                 forth_poa.in (),
-                 perform_deactivation_test,
-                 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,
-                           "Exception!");
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/examples/POA/Identity/Identity.dsp b/TAO/examples/POA/Identity/Identity.dsp
deleted file mode 100644
index dbf16356da3..00000000000
--- a/TAO/examples/POA/Identity/Identity.dsp
+++ /dev/null
@@ -1,196 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Identity" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Identity - 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 "Identity.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 "Identity.mak" CFG="POA Identity - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "POA Identity - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Identity - 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 Identity - 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 /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 Identity - 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 Identity - Win32 Release"

-# Name "POA Identity - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Identity.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"

-# 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 ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "POA Identity - Win32 Release"

-

-USERDEP__TEST_="..\..\..\..\bin\Release\tao_idl.exe"

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

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	tao_idl $(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 Identity - Win32 Debug"

-

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

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

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	tao_idl $(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/examples/POA/Identity/Identity.dsw b/TAO/examples/POA/Identity/Identity.dsw
deleted file mode 100644
index cc5f350c703..00000000000
--- a/TAO/examples/POA/Identity/Identity.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: "Identity"=.\Identity.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/POA/Identity/Makefile b/TAO/examples/POA/Identity/Makefile
deleted file mode 100644
index 0191598aa9d..00000000000
--- a/TAO/examples/POA/Identity/Makefile
+++ /dev/null
@@ -1,887 +0,0 @@
-#
-# $Id$
-#
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= testC.cpp testS.cpp
-PROG_SRCS = $(IDL_SRC) Identity.cpp
-
-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
-#----------------------------------------------------------------------------
-
-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
-
-Identity: $(addprefix $(VDIR),$(PROG_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# 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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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.h testS_T.h testS_T.i testS_T.cpp testS.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Identity.o .obj/Identity.so .shobj/Identity.o .shobj/Identity.so: Identity.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Identity/svc.conf b/TAO/examples/POA/Identity/svc.conf
deleted file mode 100644
index f58fc4ea337..00000000000
--- a/TAO/examples/POA/Identity/svc.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id$
-#
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
-
-static Server_Strategy_Factory "-ORBuseridpolicydemuxstrategy dynamic -ORBsystemidpolicydemuxstrategy active -ORBuniqueidpolicyreversedemuxstrategy dynamic -ORBallowreactivationofsystemids 1 -ORBactivehintinids 1"
diff --git a/TAO/examples/POA/Identity/test.idl b/TAO/examples/POA/Identity/test.idl
deleted file mode 100644
index ae2a5fd10d4..00000000000
--- a/TAO/examples/POA/Identity/test.idl
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-interface test
-{
-};
diff --git a/TAO/examples/POA/Loader/Makefile b/TAO/examples/POA/Loader/Makefile
index 3d9fdcfb033..ea2d5c9daa8 100644
--- a/TAO/examples/POA/Loader/Makefile
+++ b/TAO/examples/POA/Loader/Makefile
@@ -4,15 +4,15 @@
 
 BIN = server
 
-MYFILES = Server_Manager Servant_Activator Servant_Locator
+MYFILES = Server_Manager Servant_Activator Servant_Locator 
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
 
-CPPFLAGS += -I$(TAO_ROOT)
+CPPFLAGS += -I$(TAO_ROOT) 
 
 LDLIBS = -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/tao 
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -43,1123 +43,5 @@ endif
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Server_Manager.o .obj/Server_Manager.so .shobj/Server_Manager.o .shobj/Server_Manager.so: Server_Manager.cpp Server_Manager.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- Servant_Activator.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- $(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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/DLL.h \
- Servant_Locator.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/Servant_Activator.o .obj/Servant_Activator.so .shobj/Servant_Activator.o .shobj/Servant_Activator.so: Servant_Activator.cpp Servant_Activator.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/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/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 \
- $(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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/DLL.h
-.obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.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/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/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 \
- $(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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/DLL.h
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- Servant_Activator.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- $(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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/DLL.h \
- Servant_Locator.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index db831d7a92e..f98404fe0b1 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -24,7 +24,7 @@ ACE_RCSID(Loader, Servant_Activator, "$Id$")
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
 // is used for obtaining the servant. The garbage_collection_function
-// is used to kill the servant.
+// is used to kill the servant. 
 
 ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb,
                                         const char *dllname,
@@ -37,17 +37,17 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb,
      ACE_ERROR ((LM_ERROR,
                  "%p\n",
                  this->dll_.error ()));
-
+                   
 
   // Obtain the symbol for the function that will
   // get the servant object.
-  servant_supplier_ =
-    (SERVANT_FACTORY) this->dll_.symbol (factory_function);
+  servant_supplier_ = ACE_reinterpret_cast
+    (SERVANT_FACTORY, this->dll_.symbol (factory_function));
 
   // Obtain tne symbol for the function which
-  // will destroy the servant.
-  servant_garbage_collector_ =
-    (SERVANT_GARBAGE_COLLECTOR) this->dll_.symbol (garbage_collection_function);
+  // will destroy the servant.  
+  servant_garbage_collector_ = ACE_reinterpret_cast
+    (SERVANT_GARBAGE_COLLECTOR, this->dll_.symbol (garbage_collection_function));
 
 }
 
@@ -56,7 +56,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb,
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // Obtain the servant else exception.
   PortableServer::Servant servant =
@@ -66,8 +66,9 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   if (servant != 0)
     return servant;
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
+                          env,
+                          0);
 }
 
 // This is the method invoked when the object is deactivated or the
@@ -91,3 +92,4 @@ ServantActivator_i::etherealize (const PortableServer::ObjectId &oid,
                                    servant);
 
 }
+
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 84de271ec87..14afe4c4e8b 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -59,7 +59,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
-                                             CORBA::Environment &ACE_TRY_ENV);
+                                             CORBA::Environment &env);
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
   // RETAIN policies, whenever it receives a request for a
   // MyFooServant object that is not currently active. When an servant
@@ -75,7 +75,7 @@ public:
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &env);
   // This method is invoked whenever a MyFooServant for a MyFoo object
   // is deactivated. This occurs when the POA is destroyed or the
   // Object is deactivated. When the POA is getting destroyed, it
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 6c9a7503f7f..439c78d9d61 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -24,7 +24,7 @@ ACE_RCSID(Loader, Servant_Locator, "$Id$")
 // Initialization.The dllname is used by the Loactor to load it into
 // memory. The factory function is the point of entry into the dll and
 // is used for obtaining the servant. The garbage_collection_function
-// is used to kill the servant.
+// is used to kill the servant. 
 
 ServantLocator_i::ServantLocator_i (CORBA::ORB_ptr orb,
                                     const char *dllname,
@@ -37,16 +37,16 @@ ServantLocator_i::ServantLocator_i (CORBA::ORB_ptr orb,
      ACE_ERROR ((LM_ERROR,
                  "%p",
                  this->dll_.error ()));
-
+                
   // Obtain the symbol for the function that will
   // get the servant object.
-  servant_supplier_ =
-    (SERVANT_FACTORY) this->dll_.symbol (factory_function);
+  servant_supplier_ = ACE_reinterpret_cast
+    (SERVANT_FACTORY, this->dll_.symbol (factory_function));
 
   // Obtain tne symbol for the function which
-  // will destroy the servant.
-  servant_garbage_collector_ =
-    (SERVANT_GARBAGE_COLLECTOR) this->dll_.symbol (garbage_collection_function);
+  // will destroy the servant.  
+  servant_garbage_collector_ = ACE_reinterpret_cast
+    (SERVANT_GARBAGE_COLLECTOR, this->dll_.symbol (garbage_collection_function));
 
 }
 
@@ -57,7 +57,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
                              PortableServer::ServantLocator::Cookie &cookie,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   PortableServer::Servant servant =
     (*servant_supplier_) (oid,
@@ -67,13 +67,14 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
     {
       // Return the servant as the cookie , used as a check when
       // postinvoke is called on this ServantLocator_i.
-
+      
       cookie = servant;
       return servant;
     }
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
+                          env,
+                          0);
 }
 
 // Since the servant gets invoked per operation, the servant has to be
@@ -92,7 +93,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
   PortableServer::Servant my_servant =
     ACE_reinterpret_cast (PortableServer::Servant,
                           cookie);
-
+  
   ACE_ASSERT (servant == my_servant);
 
   // Invoke the garbage_collection_function.
@@ -103,3 +104,4 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
   // To avoid warning about unused variable with ACE_NDEBUG.
   ACE_UNUSED_ARG (my_servant);
 }
+
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 5e099a7938b..280e11c08e7 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -63,7 +63,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie,
-                                             CORBA::Environment &ACE_TRY_ENV);
+                                             CORBA::Environment &env);
   // This method is invoked by a POA whenever it receives a request
   // for MyFoo object that is not currently active.  When the POA is
   // created using the NON_RETAIN policy the Active Object Map is not
@@ -79,7 +79,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA::Environment &env);
   // This method is invoked whenever a MyFooServant completes a
   // request. As the Servant Loactor interface is used when the POA
   // doesnt maintain the Active Object Map, its necessary to get rid
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 2fb1ee10d7f..16bf3ee6fee 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "Server_Manager.h"
-#include "ace/Get_Opt.h"
 
 ACE_RCSID(Loader, Server_Manager, "$Id$")
 
@@ -108,16 +107,16 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  //CORBA::Environment TAO_TRY_ENV;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::Environment TAO_TRY_ENV;
+
+  TAO_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0,
-                              ACE_TRY_ENV); 
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV); 
+      TAO_CHECK_ENV;
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -129,20 +128,20 @@ Server_i::init (int argc, char **argv)
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);  
-      ACE_TRY_CHECK;
+                                                TAO_TRY_ENV);  
+      TAO_CHECK_ENV;
   
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager_ = root_poa_->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Server_i:init_poa ()");
+      TAO_TRY_ENV.print_exception ("Server_i:init_poa ()");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   
   return 0;
 }
@@ -155,12 +154,10 @@ PortableServer::POA_ptr
 Server_i::create_poa (const char *name,
                       int servant_retention_policy)
 {
-  // CORBA::Environment TAO_TRY_ENV;
+  CORBA::Environment TAO_TRY_ENV;
   PortableServer::POA_ptr my_poa = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+ 
+  TAO_TRY
     {  
       policies_.length (4);
       
@@ -168,36 +165,36 @@ Server_i::create_poa (const char *name,
       policies_[0] =
         root_poa_->create_id_assignment_policy 
         (PortableServer::USER_ID,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy 
         (PortableServer::PERSISTENT,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
   
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy 
         (PortableServer::USE_SERVANT_MANAGER,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
       policies_[3] =
         root_poa_->create_servant_retention_policy 
         (PortableServer::RETAIN,
-         ACE_TRY_ENV);
+         TAO_TRY_ENV);
       
       if (servant_retention_policy == 0)
       policies_[3] =
         root_poa_->create_servant_retention_policy 
         (PortableServer::NON_RETAIN,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Create myPOA as the child of RootPOA with the above
       // policies_. myPOA will use SERVANT_ACTIVATOR or
@@ -206,26 +203,25 @@ Server_i::create_poa (const char *name,
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
                                       policies_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
       for (CORBA::ULong i = 0;
-           i < policies_.length () && ACE_TRY_ENV.exception () == 0;
+           i < policies_.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_TRY_ENV);
         }
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_poa ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;  
-  ACE_CHECK_RETURN (0);
+  TAO_ENDTRY;  
 
   return my_poa;
 }
@@ -235,11 +231,9 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  // CORBA::Environment TAO_TRY_ENV;
+  CORBA::Environment TAO_TRY_ENV;
    
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY
     { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
@@ -251,14 +245,14 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                       0);
       
       PortableServer::ServantActivator_var servant_activator =
-        servant_activator_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        servant_activator_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (servant_activator.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
   
       // Create a reference with user created ID in firstPOA which
       // uses the MyFooServantActivator. 
@@ -267,15 +261,15 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                                                       
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
                                                         "IDL:Foo:1.0",
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_activator ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;  
+  TAO_ENDTRY;  
 
   return 0;
 }
@@ -285,10 +279,9 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  // CORBA::Environment TAO_TRY_ENV;
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  CORBA::Environment TAO_TRY_ENV;
+   
+  TAO_TRY
     { 
       // An Servant Locator object is created which will activate 
       // the servant on demand.
@@ -300,15 +293,15 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
                       0);
       
       PortableServer::ServantLocator_var servant_locator =
-        servant_locator_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        servant_locator_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
 
       second_poa->set_servant_manager (servant_locator.in (),
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
         
       // Try to create a reference with user created ID in second_poa
       // which uses MyFooServantLocator. 
@@ -318,15 +311,15 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_foo_ = 
         second_poa->create_reference_with_id (second_foo_oid.in (),
                                               "IDL:Foo:1.0",
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:create_locator ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;   
+  TAO_ENDTRY;   
 
   return 0;
 }
@@ -336,24 +329,22 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int 
 Server_i::run (void) 
 {
-  // CORBA::Environment TAO_TRY_ENV;
+  CORBA::Environment TAO_TRY_ENV;
    
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY
     { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       // Print the ior's of first_foo and second_foo.
 
@@ -369,9 +360,9 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_TRY_ENV);
+      poa_manager_->activate (TAO_TRY_ENV);
      
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
   
       // Run the ORB.
       if (orb_->run () == -1)
@@ -383,15 +374,15 @@ Server_i::run (void)
       // Destroy the root_poa_ and also first_poa and second_poa.
       root_poa_->destroy (1,
                           1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Server_i:run ()");
+      TAO_TRY_ENV.print_exception ("Server_i:run ()");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   
   return 0;
 }
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 4961df7a72e..025f876b3fe 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -2,9 +2,8 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
+#$Id$
 # -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
@@ -13,8 +12,6 @@ $iorfile = "ior";
 $oneway = "";
 $iterations = 100;
 
-$extra_args = "";
-
 # Parse the arguments
 for ($i = 0; $i <= $#ARGV; $i++)
 {
@@ -47,7 +44,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       $i++;
       last SWITCH;
     }
-    $extra_args .= " " . $ARGV[$i];
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
   }
 }
 
@@ -57,13 +54,13 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile");
 
 ACE::waitforfile ($iorfile_1);
 ACE::waitforfile ($iorfile_2);
 
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
diff --git a/TAO/examples/POA/Makefile b/TAO/examples/POA/Makefile
index 716a58d8166..42b631fb286 100644
--- a/TAO/examples/POA/Makefile
+++ b/TAO/examples/POA/Makefile
@@ -10,21 +10,16 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-DIRS  = Generic_Servant \
-	Adapter_Activator \
-	DSI \
-	Default_Servant \
-	Explicit_Activation \
+DIRS  = Default_Servant \
 	FindPOA \
 	Forwarding \
-	Identity \
-	Loader \
+	Generic_Servant \
+	Explicit_Activation \
 	NewPOA \
 	On_Demand_Activation \
-	On_Demand_Loading \
 	RootPOA \
-	Reference_Counted_Servant \
-	TIE
+	TIE \
+	locking \
 
 # The following test hasn't been updated yet
 # Demux_Test
@@ -40,3 +35,4 @@ 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/POA/NewPOA/Makefile b/TAO/examples/POA/NewPOA/Makefile
index 3975f9fa5db..5a039f3f9bd 100644
--- a/TAO/examples/POA/NewPOA/Makefile
+++ b/TAO/examples/POA/NewPOA/Makefile
@@ -44,6 +44,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -107,85 +110,79 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -194,31 +191,22 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -240,8 +228,11 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -258,64 +249,38 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 8a52461c054..80058d2f059 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -10,12 +10,12 @@
 // = DESCRIPTION
 //    This program demonstrates creation of new POAs, as children of the root POA or the
 //    existing POA.
-//    There are three new POA created in this example.
+//    There are five new POA created in this example.
 //    The hierarchy of POAs looks like this.
 //
 //             /-->first_poa-->first_poa/second_poa
 //    RootPOA--
-//             \-->third_poa
+//             \-->third_poa-->third_poa/fourth_poa-->third_poa/fourth_poa/fifth_poa
 //
 // = AUTHOR
 //    Irfan Pyarali
@@ -28,25 +28,29 @@ ACE_RCSID(NewPOA, NewPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
-  //  CORBA::Environment env;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
   // The first step Initialize the ORB
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                        argv, 
-                                        0, 
-                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-  
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
   // Obtain the object reference to the RootPOA.
   CORBA::Object_var obj =
     orb->resolve_initial_references ("RootPOA");
 
   // _narrow() the Object to get the POA object, i.e., the root_poa.
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (obj.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
   // Policies for the new POAs
   CORBA::PolicyList policies (2);
@@ -54,13 +58,23 @@ main (int argc, char **argv)
 
   // Threading policy
   policies[0] =
-    root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_thread_policy (PortableServer::ORB_CTRL_MODEL, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_thread_policy");
+      return -1;
+    }
 
   // Lifespan policy
   policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::TRANSIENT, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_lifespan_policy (PortableServer::TRANSIENT, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
 
   // Creation of the firstPOA
   ACE_CString name = "firstPOA";
@@ -68,70 +82,111 @@ main (int argc, char **argv)
     root_poa->create_POA (name.c_str (),
                           PortableServer::POAManager::_nil (),
                           policies,
-                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
   // Creation of the new POA, i.e. firstPOA/secondPOA
-  name = "secondPOA";
+  name += TAO_POA::name_separator ();
+  name += "secondPOA";
   PortableServer::POA_var second_poa =
-    first_poa->create_POA (name.c_str (),
-                           PortableServer::POAManager::_nil (),
-                           policies,
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->create_POA (name.c_str (),
+                          PortableServer::POAManager::_nil (),
+                          policies,
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
-  // Creating thirdPOA.
+  // Creating thirdPOA/fourthPOA/fifthPOA. The non-existing thirdPOA
+  // and thirdPOA/fourthPOA are created automatically.
   name = "thirdPOA";
+  name += TAO_POA::name_separator ();
+  name += "forthPOA";
+  name += TAO_POA::name_separator ();
+  name += "fifthPOA";
 
-  PortableServer::POA_var third_poa =
+  PortableServer::POA_var fifth_poa =
     root_poa->create_POA (name.c_str (),
                           PortableServer::POAManager::_nil (),
                           policies,
-                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
   // Creation of the new POAs over, so destroy the Policy_ptr's.
   for (CORBA::ULong i = 0;
-       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       i < policies.length () && env.exception () == 0;
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (env);
     }
 
-  ACE_CHECK_RETURN (-1);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
 
   // Get the names of all the POAs and print them out.
 
   CORBA::String_var root_poa_name =
-    root_poa->the_name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    root_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
   CORBA::String_var first_poa_name =
-    first_poa->the_name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    first_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
   CORBA::String_var second_poa_name =
-    second_poa->the_name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    second_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
-  CORBA::String_var third_poa_name =
-    third_poa->the_name (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var fifth_poa_name =
+    fifth_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
   ACE_DEBUG ((LM_DEBUG,
               "%s\n%s\n%s\n%s\n",
               root_poa_name.in (),
               first_poa_name.in (),
               second_poa_name.in (),
-              third_poa_name.in ()));
-
+              fifth_poa_name.in ()));
+  
   // This should destroy all its children
   root_poa->destroy (1,
                      1,
-                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
 
   return 0;
 }
diff --git a/TAO/examples/POA/NewPOA/run_test.pl b/TAO/examples/POA/NewPOA/run_test.pl
index 58004c58b48..e89d7d4e29b 100755
--- a/TAO/examples/POA/NewPOA/run_test.pl
+++ b/TAO/examples/POA/NewPOA/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile b/TAO/examples/POA/On_Demand_Activation/Makefile
index 5c49f464fdb..569e24a7c01 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile
@@ -47,6 +47,9 @@ endif
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -110,85 +113,79 @@ endif
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -197,31 +194,22 @@ endif
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -243,8 +231,11 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -261,65 +252,39 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
  ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
  ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
@@ -329,6 +294,9 @@ endif
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -392,85 +360,79 @@ endif
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -479,31 +441,22 @@ endif
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -525,8 +478,11 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -543,65 +499,39 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
  ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
  ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
@@ -610,6 +540,9 @@ endif
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -677,85 +610,79 @@ endif
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -764,31 +691,22 @@ endif
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -810,8 +728,11 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -828,65 +749,39 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  Servant_Locator.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
index da07b2643ae..8a82cdaf4d2 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.cpp
@@ -30,7 +30,7 @@ MyFooServantActivator::MyFooServantActivator (CORBA::ORB_ptr orb)
 PortableServer::Servant
 MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
                                   PortableServer::POA_ptr poa,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   // Convert ObjectId to String.
 
@@ -43,23 +43,26 @@ MyFooServantActivator::incarnate (const PortableServer::ObjectId &oid,
     return new MyFooServant (this->orb_.in (), poa, 27);
   else
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST ();
-      //env.exception (exception);
-      //return 0;
+      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
     }
 }
 
 
 void
-MyFooServantActivator::etherealize (const PortableServer::ObjectId &,
-                                    PortableServer::POA_ptr ,
+MyFooServantActivator::etherealize (const PortableServer::ObjectId &oid,
+                                    PortableServer::POA_ptr poa,
                                     PortableServer::Servant servant,
-                                    CORBA::Boolean ,
+                                    CORBA::Boolean cleanup_in_progress,
                                     CORBA::Boolean remaining_activations,
-                                    CORBA::Environment &)
+                                    CORBA::Environment &env)
 {
-  
+  ACE_UNUSED_ARG (oid);
+  ACE_UNUSED_ARG (poa);
+  ACE_UNUSED_ARG (cleanup_in_progress);
+  ACE_UNUSED_ARG (env);
+
   // If there are no remaining activations i.e ObjectIds associated
   // with MyFooServant delete it.
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
index 3ee40ec6b0b..52b21000087 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.cpp
@@ -34,7 +34,7 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
                                 PortableServer::POA_ptr poa,
                                 const char * /* operation */,
                                 PortableServer::ServantLocator::Cookie &cookie,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   // Convert ObjectID to String.
 
@@ -55,12 +55,10 @@ MyFooServantLocator::preinvoke (const PortableServer::ObjectId &oid,
     }
   else
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0);
-      //
-      //CORBA::Exception *exception =
-      //  new CORBA::OBJECT_NOT_EXIST ();
-      //env.exception (exception);
-      //return 0;
+      CORBA::Exception *exception =
+        new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
     }
 }
 
diff --git a/TAO/examples/POA/On_Demand_Activation/run_test.pl b/TAO/examples/POA/On_Demand_Activation/run_test.pl
index 4961df7a72e..075fbce9d81 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 
@@ -13,8 +12,6 @@ $iorfile = "ior";
 $oneway = "";
 $iterations = 100;
 
-$extra_args = "";
-
 # Parse the arguments
 for ($i = 0; $i <= $#ARGV; $i++)
 {
@@ -47,7 +44,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       $i++;
       last SWITCH;
     }
-    $extra_args .= " " . $ARGV[$i];
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
   }
 }
 
@@ -57,13 +54,13 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile");
 
 ACE::waitforfile ($iorfile_1);
 ACE::waitforfile ($iorfile_2);
 
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
diff --git a/TAO/examples/POA/On_Demand_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index 94baef307ce..78900f66f70 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -104,13 +104,16 @@ write_iors_to_file (const char *first_ior,
 int
 main (int argc, char **argv)
 {
-  //  CORBA::Environment env;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
   // Initialize the ORB.
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
 
   int result = parse_args (argc, argv);
   if (result != 0)
@@ -122,40 +125,65 @@ main (int argc, char **argv)
 
   // Narrow the Object reference to a POA reference
   PortableServer::POA_var root_poa =
-    PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    PortableServer::POA::_narrow (obj.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
 
   // Get the POAManager of RootPOA
 
   PortableServer::POAManager_var poa_manager =
-    root_poa->the_POAManager (ACE_TRY_ENV);
+    root_poa->the_POAManager (env);
 
-  ACE_CHECK_RETURN (-1);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
 
   CORBA::PolicyList policies (4);
   policies.length (4);
 
     // ID Assignment Policy
   policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
- 
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return -1;
+    }
+
   // Lifespan Policy
   policies[1] =
-    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    root_poa->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return -1;
+    }
+  
   // Request Processing Policy
   policies[2] =
-    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+    root_poa->create_request_processing_policy (PortableServer::USE_SERVANT_MANAGER, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_request_processing_policy");
+      return -1;
+    }
+  
   PortableServer::POA_var first_poa;
   {
     // Servant Retention Policy
     policies[3] =
-      root_poa->create_servant_retention_policy (PortableServer::RETAIN, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
+      root_poa->create_servant_retention_policy (PortableServer::RETAIN, env);
+    if (env.exception () != 0)
+      {
+        env.print_exception ("PortableServer::POA::create_servant_retention_policy");
+        return -1;
+      }
 
     ACE_CString name = "firstPOA";
 
@@ -164,17 +192,24 @@ main (int argc, char **argv)
     first_poa = root_poa->create_POA (name.c_str (),
                                       poa_manager.in (),
                                       policies,
-                                      ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
-
+                                      env);
+    if (env.exception () != 0)
+      {
+        env.print_exception ("PortableServer::POA::create_POA");
+        return -1;
+      }
   }
 
   PortableServer::POA_var second_poa;
   {
     // Servant Retention Policy
     policies[3] =
-      root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
+      root_poa->create_servant_retention_policy (PortableServer::NON_RETAIN, env);
+    if (env.exception () != 0)
+      {
+        env.print_exception ("PortableServer::POA::create_servant_retention_policy");
+        return -1;
+      }
 
     ACE_CString name = "secondPOA";
 
@@ -184,32 +219,48 @@ main (int argc, char **argv)
     second_poa = root_poa->create_POA (name.c_str (),
                                       poa_manager.in (),
                                       policies,
-                                      ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
-
+                                      env);
+    if (env.exception () != 0)
+      {
+        env.print_exception ("PortableServer::POA::create_POA");
+        return -1;
+      }
   }
 
   // Destroy the policy objects as they have been passed to
   // create_POA and no longer needed.
   for (CORBA::ULong i = 0;
-       i < policies.length () && ACE_TRY_ENV.exception () == 0;
+       i < policies.length () && env.exception () == 0;
        ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (env);
+    }
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
     }
-  ACE_CHECK_RETURN (-1);
 
   MyFooServantActivator servant_activator_impl (orb.in ());
   PortableServer::ServantActivator_var servant_activator =
-    servant_activator_impl._this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    servant_activator_impl._this (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::_this");
+      return -1;
+    }
 
   // Set MyFooServantActivator object as the servant_manager of
   // firstPOA.
 
-  first_poa->set_servant_manager (servant_activator.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  first_poa->set_servant_manager (servant_activator.in (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::set_servant_manager");
+      return -1;
+    }
 
   // Create a reference with user created ID in firstPOA which uses
   // the MyFooServantActivator.
@@ -218,20 +269,34 @@ main (int argc, char **argv)
     PortableServer::string_to_ObjectId ("firstFoo");
 
   CORBA::Object_var first_foo =
-    first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    first_poa->create_reference_with_id (first_foo_oid.in (), "IDL:Foo:1.0", env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_reference_with_id");
+      return -1;
+    }
 
-  
   MyFooServantLocator servant_locator_impl (orb.in ());
   PortableServer::ServantLocator_var servant_locator =
-    servant_locator_impl._this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    servant_locator_impl._this (env);
 
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::_this");
+      return -1;
+    }
 
   // Set MyFooServantLocator object as the servant Manager of
   // secondPOA.
-  second_poa->set_servant_manager (servant_locator.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+
+  second_poa->set_servant_manager (servant_locator.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::set_servant_manager");
+      return -1;
+    }
 
   // Try to create a reference with user created ID in second_poa
   // which uses MyFooServantLocator.
@@ -241,20 +306,34 @@ main (int argc, char **argv)
 
   CORBA::Object_var second_foo =
     second_poa->create_reference_with_id (second_foo_oid.in (),
-                                          "IDL:Foo:1.0", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                          "IDL:Foo:1.0", env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_reference_with_id");
+      return -1;
+    }
 
   // Invoke object_to_string on the references created in firstPOA and
   // secondPOA.
 
   CORBA::String_var first_foo_ior = 
-    orb->object_to_string (first_foo.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (first_foo.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
-  
   CORBA::String_var second_foo_ior = 
-    orb->object_to_string (second_foo.in (), ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    orb->object_to_string (second_foo.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
 
   // Print the ior's of first_foo and second_foo.
 
@@ -268,8 +347,13 @@ main (int argc, char **argv)
     return write_result;
 
   // Set the poa_manager state to active, ready to process requests.
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  poa_manager->activate (env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
+    }
 
   // Run the ORB.
   if (orb->run () == -1)
@@ -279,8 +363,12 @@ main (int argc, char **argv)
 
   root_poa->destroy (1,
                      1,
-                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
 
   return 0;
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/svc.conf b/TAO/examples/POA/On_Demand_Activation/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/examples/POA/On_Demand_Activation/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/On_Demand_Loading/Makefile b/TAO/examples/POA/On_Demand_Loading/Makefile
index 4592f924297..820696cff66 100644
--- a/TAO/examples/POA/On_Demand_Loading/Makefile
+++ b/TAO/examples/POA/On_Demand_Loading/Makefile
@@ -4,7 +4,7 @@
 
 BIN = server
 
-MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator
+MYFILES = Server_Manager Servant_Manager Servant_Activator Servant_Locator 
 
 SRC = $(addsuffix .cpp,$(MYFILES)) $(addsuffix .cpp, $(BIN))
 OBJ = $(addsuffix .o,$(MYFILES))
@@ -43,11 +43,13 @@ endif
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Server_Manager.o .obj/Server_Manager.so .shobj/Server_Manager.o .shobj/Server_Manager.so: Server_Manager.cpp Server_Manager.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- Servant_Activator.h Servant_Manager.h \
+.obj/Servant_Manager.o .obj/Servant_Manager.so .shobj/Servant_Manager.o .shobj/Servant_Manager.so: Servant_Manager.cpp Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
@@ -101,31 +103,27 @@ endif
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/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 \
@@ -145,88 +143,14 @@ endif
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -239,14 +163,22 @@ endif
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -262,72 +194,110 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- Servant_Locator.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/Servant_Manager.o .obj/Servant_Manager.so .shobj/Servant_Manager.o .shobj/Servant_Manager.so: Servant_Manager.cpp Servant_Manager.h \
+ $(TAO_ROOT)/tao/DynAny_i.h
+.obj/Servant_Activator.o .obj/Servant_Activator.so .shobj/Servant_Activator.o .shobj/Servant_Activator.so: Servant_Activator.cpp Servant_Activator.h \
+ Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -382,31 +352,27 @@ endif
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/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 \
@@ -426,88 +392,14 @@ endif
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -520,14 +412,22 @@ endif
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -543,70 +443,116 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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
-.obj/Servant_Activator.o .obj/Servant_Activator.so .shobj/Servant_Activator.o .shobj/Servant_Activator.so: Servant_Activator.cpp Servant_Activator.h \
- Servant_Manager.h \
+ ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
+ ../Generic_Servant/FooC.h ../Generic_Servant/generic_servant_export.h \
+ ../Generic_Servant/FooC.i ../Generic_Servant/FooS_T.h \
+ ../Generic_Servant/FooS_T.i ../Generic_Servant/FooS_T.cpp \
+ ../Generic_Servant/FooS.i
+.obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -621,71 +567,40 @@ endif
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/DLL.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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
- $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
@@ -694,6 +609,30 @@ endif
  $(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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -705,88 +644,14 @@ endif
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -799,14 +664,22 @@ endif
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -822,71 +695,117 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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
-.obj/Servant_Locator.o .obj/Servant_Locator.so .shobj/Servant_Locator.o .shobj/Servant_Locator.so: Servant_Locator.cpp Servant_Locator.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/DLL.h \
+ Servant_Manager.h ../Generic_Servant/MyFooServant.h \
+ ../Generic_Servant/FooS.h ../Generic_Servant/FooC.h \
+ ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
+ ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
+ ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
+.obj/Server_Manager.o .obj/Server_Manager.so .shobj/Server_Manager.o .shobj/Server_Manager.so: Server_Manager.cpp Server_Manager.h \
  $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ Servant_Activator.h Servant_Manager.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
@@ -900,9 +819,12 @@ endif
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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/DLL.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -927,11 +849,6 @@ endif
  $(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 \
@@ -941,28 +858,28 @@ endif
  $(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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/corba.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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/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 \
@@ -982,88 +899,14 @@ endif
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1076,14 +919,22 @@ endif
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1099,71 +950,110 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- $(ACE_ROOT)/ace/DLL.h \
- Servant_Manager.h
+ Servant_Locator.h
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_Manager.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  Servant_Activator.h Servant_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1219,31 +1109,27 @@ endif
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/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 \
@@ -1263,88 +1149,14 @@ endif
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1357,14 +1169,22 @@ endif
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1380,66 +1200,103 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
  Servant_Locator.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
index 90351b5df31..44fc163baac 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.cpp
@@ -33,7 +33,7 @@ ServantActivator_i::ServantActivator_i (CORBA::ORB_ptr orb)
 PortableServer::Servant
 ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
                                PortableServer::POA_ptr poa,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // Convert ObjectId to String.
    CORBA::String_var s =
@@ -47,8 +47,9 @@ ServantActivator_i::incarnate (const PortableServer::ObjectId &oid,
   if (servant != 0)
     return servant;
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
+                          env,
+                          0);
 }
 
 // This is the method invoked when the object is deactivated or the
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index c7b838d0c0a..a6678e82af9 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -38,7 +38,7 @@ public:
 
   virtual PortableServer::Servant incarnate (const PortableServer::ObjectId &oid,
                                              PortableServer::POA_ptr poa,
-                                             CORBA::Environment &ACE_TRY_ENV);
+                                             CORBA::Environment &env);
   // This method is invoked by a POA with USE_SERVANT_MANAGER and
   // RETAIN policies, whenever it receives a request for a
   // MyFooServant object that is not currently active. When an servant
@@ -54,7 +54,7 @@ public:
                             PortableServer::Servant servant,
                             CORBA::Boolean cleanup_in_progress,
                             CORBA::Boolean remaining_activations,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &env);
   // This method is invoked whenever a MyFooServant for a MyFoo object
   // is deactivated. This occurs when the POA is destroyed or the
   // Object is deactivated. When the POA is getting destroyed, it
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
index ce56ddbd2f8..e89f4305c27 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.cpp
@@ -35,7 +35,7 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
                              PortableServer::POA_ptr poa,
                              const char * /* operation */,
                              PortableServer::ServantLocator::Cookie &cookie,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   // Convert ObjectID to String.
 
@@ -58,8 +58,9 @@ ServantLocator_i::preinvoke (const PortableServer::ObjectId &oid,
       return servant;
     }
   else
-    ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                      0);
+    TAO_THROW_ENV_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO),
+                          env,
+                          0);
 }
 
 // Since the servant gets invoked per operation, the servant has to be
@@ -72,7 +73,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
                               const char * /* operation */,
                               PortableServer::ServantLocator::Cookie cookie,
                               PortableServer::Servant servant,
-                              CORBA::Environment &/* ACE_TRY_ENV */)
+                              CORBA::Environment &/* env */)
 {
   // Check the passed servant with the cookie.
 
@@ -94,7 +95,7 @@ ServantLocator_i::postinvoke (const PortableServer::ObjectId &oid,
 
 PortableServer::ObjectId_var
 ServantLocator_i::create_dll_object_id (const char *dllname,
-                                        const char *factory_function)
+                                           const char *factory_function)
 {
   return this->servant_manager_.create_dll_object_id (dllname,
                                                       factory_function);
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 46428ea86b9..48368e06f9f 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -43,7 +43,7 @@ public:
                                              PortableServer::POA_ptr adapter,
                                              const char *operation,
                                              PortableServer::ServantLocator::Cookie &the_cookie,
-                                             CORBA::Environment &ACE_TRY_ENV);
+                                             CORBA::Environment &env);
   // This method is invoked by a POA whenever it receives a request
   // for MyFoo object that is not currently active.  When the POA is
   // created using the NON_RETAIN policy the Active Object Map is not
@@ -59,7 +59,7 @@ public:
                            const char *operation,
                            PortableServer::ServantLocator::Cookie the_cookie,
                            PortableServer::Servant the_servant,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA::Environment &env);
   // This method is invoked whenever a MyFooServant completes a
   // request. As the Servant Loactor interface is used when the POA
   // doesnt maintain the Active Object Map, its necessary to get rid
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 3ffa8a7881e..2c6069f5d02 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -43,11 +43,11 @@ ServantManager_i::obtain_servant (const char *str,
 {
   // The string format is <dllname:factory_function> that must be
   // parsed.
-  this->parse_string (str);
+  this->parse_string (str); 
 
   // Create the DLL object.
   ACE_DLL *dll;
-
+ 
   ACE_NEW_RETURN (dll,
                   ACE_DLL,
                   0);
@@ -61,10 +61,10 @@ ServantManager_i::obtain_servant (const char *str,
                "before bind\n"));
   // Make an HASH_MAP entry by binding the object_id and the DLL
   // object associated with it together.
-   if (this->servant_map_.bind (oid.in (),
+   if (this->servant_map_.bind (oid.in (), 
                                 dll) == -1)
-     ACE_ERROR_RETURN ((LM_ERROR,
-                        "%p\n",
+     ACE_ERROR_RETURN ((LM_ERROR,                      
+                        "%p\n", 
                         "Bind failed"),
                        0);
    // Now that the dll name is available we open the dll.
@@ -76,8 +76,8 @@ ServantManager_i::obtain_servant (const char *str,
 
    // The next step is to obtain the symbol for the function that will
   // create the servant object and return it.
-  SERVANT_FACTORY servant_creator =
-    (SERVANT_FACTORY) dll->symbol (create_symbol_.c_str ());
+  SERVANT_FACTORY servant_creator = ACE_reinterpret_cast
+    (SERVANT_FACTORY, dll->symbol (create_symbol_.c_str ()));
 
   // Checking whether it is possible to create the servant.
   if (servant_creator == 0)
@@ -95,7 +95,7 @@ ServantManager_i::obtain_servant (const char *str,
 // The objectID is in a format of dllname:factory_function which has
 // to be parsed and separated into tokens to be used.
 
-void
+void 
 ServantManager_i::parse_string (const char *s)
 {
   // The format of the objectid is <dll:factory_function>.  This
@@ -104,16 +104,16 @@ ServantManager_i::parse_string (const char *s)
 
   ACE_CString str (s);
 
-  int index = str.find (':');
+  size_t index = str.find (':');
   // On error, npos is returned.
   if (index == ACE_CString::npos)
     ACE_ERROR ((LM_ERROR,
                 "Required character absent!\n"));
-
+  
   // The index gives us the location which is equivalent to the size
   // of the dllname_ string.
   this->dllname_ = str.substr (0, index);
-
+  
   // Obtain the substring from the offset which is one greater than
   // the location of ':'.
   this->create_symbol_ = str.substr (index + 1);
@@ -146,19 +146,19 @@ ServantManager_i::create_dll_object_id (const char *libname,
 }
 
 // This method destroys the servant and its caretaking DLL object.
-
+ 
 void
 ServantManager_i::destroy_servant (PortableServer::Servant servant,
                                    const PortableServer::ObjectId &oid)
 {
   // The servant is destroyed.
   delete servant;
-
+  
   // Since the servant is no more the DLL object associated with it
   // has to be destroyed too.
 
   ACE_DLL *dll = 0;
-
+  
   // Since the servant is no more the DLL object associated with it
   // has to be destroyed too.
 
@@ -167,7 +167,7 @@ ServantManager_i::destroy_servant (PortableServer::Servant servant,
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 "Unbind failed!\n"));
-  delete dll;
+  delete dll;                          
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index 71eb22f9d5b..b801317c2ad 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Server_Manager.h"
-#include "ace/Get_Opt.h"
+
 ACE_RCSID(On_Demand_Loading, Server_Manager, "$Id$")
 
 Server_i::Server_i(void)
@@ -107,16 +107,16 @@ Server_i::write_iors_to_file (const char *first_ior,
 int
 Server_i::init (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment TAO_TRY_ENV;
 
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize the ORB.
       orb_ = CORBA::ORB_init (argc,
                               argv,
                               0,
-                              ACE_TRY_ENV); 
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV); 
+      TAO_CHECK_ENV;
 
       int result = parse_args (argc, argv);
       if (result != 0)
@@ -128,20 +128,20 @@ Server_i::init (int argc, char **argv)
 
       // Narrow the Object reference to a POA reference
       root_poa_ = PortableServer::POA::_narrow (obj.in (),
-                                                ACE_TRY_ENV);  
-      ;
+                                                TAO_TRY_ENV);  
+      TAO_CHECK_ENV;
   
       // Get the POAManager of RootPOA
-      poa_manager_ = root_poa_->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager_ = root_poa_->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:init_poa ()");
+      TAO_TRY_ENV.print_exception ("Server_i:init_poa ()");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   
   return 0;
 }
@@ -154,10 +154,10 @@ PortableServer::POA_ptr
 Server_i::create_poa (const char *name,
                       int servant_retention_policy)
 {
+  CORBA::Environment TAO_TRY_ENV;
   PortableServer::POA_ptr my_poa = 0;
  
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {  
       policies_.length (4);
       
@@ -165,36 +165,36 @@ Server_i::create_poa (const char *name,
       policies_[0] =
         root_poa_->create_id_assignment_policy 
         (PortableServer::USER_ID,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Lifespan Policy.
       policies_[1] =
         root_poa_->create_lifespan_policy 
         (PortableServer::PERSISTENT,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
   
       // Request Processing Policy.
       policies_[2] =
         root_poa_->create_request_processing_policy 
         (PortableServer::USE_SERVANT_MANAGER,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Servant Retention Policy.
       if (servant_retention_policy == 1)
       policies_[3] =
         root_poa_->create_servant_retention_policy 
         (PortableServer::RETAIN,
-         ACE_TRY_ENV);
+         TAO_TRY_ENV);
       
       if (servant_retention_policy == 0)
       policies_[3] =
         root_poa_->create_servant_retention_policy 
         (PortableServer::NON_RETAIN,
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Create myPOA as the child of RootPOA with the above
       // policies_. myPOA will use SERVANT_ACTIVATOR or
@@ -203,25 +203,25 @@ Server_i::create_poa (const char *name,
       my_poa = root_poa_->create_POA (name,
                                       poa_manager_.in (),
                                       policies_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Destroy the policy objects as they have been passed to
       // create_POA and no longer needed.
       for (CORBA::ULong i = 0;
-           i < policies_.length () && ACE_TRY_ENV.exception () == 0;
+           i < policies_.length () && TAO_TRY_ENV.exception () == 0;
            ++i)
         {
           CORBA::Policy_ptr policy = policies_[i];
-          policy->destroy (ACE_TRY_ENV);
+          policy->destroy (TAO_TRY_ENV);
         }
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_poa ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_poa ()");
       return 0;
     }
-  ACE_ENDTRY;  
+  TAO_ENDTRY;  
 
   return my_poa;
 }
@@ -231,8 +231,9 @@ Server_i::create_poa (const char *name,
 int
 Server_i::create_activator (PortableServer::POA_var first_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::Environment TAO_TRY_ENV;
+   
+  TAO_TRY
     { 
       // An Servant Activator object is created which will activate
       // the servant on demand.
@@ -241,14 +242,14 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
                       0);
       
       PortableServer::ServantActivator_var servant_activator =
-        servant_activator_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        servant_activator_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       // Set ServantActivator_i object as the servant_manager of
       // firstPOA.
       first_poa->set_servant_manager (servant_activator.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
   
       // Create a reference with user created ID in firstPOA which
       // uses the MyFooServantActivator. The servant dll name as well
@@ -261,15 +262,15 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 
       first_foo_ = first_poa->create_reference_with_id (first_foo_oid.in (),
                                                         "IDL:Foo:1.0",
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_activator ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_activator ()");
       return 1;
     }
-  ACE_ENDTRY;  
+  TAO_ENDTRY;  
 
   return 0;
 }
@@ -279,8 +280,9 @@ Server_i::create_activator (PortableServer::POA_var first_poa)
 int
 Server_i::create_locator (PortableServer::POA_var second_poa)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  CORBA::Environment TAO_TRY_ENV;
+   
+  TAO_TRY
     { 
       // An Servant Locator object is created which will activate 
       // the servant on demand.
@@ -289,15 +291,15 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
                       0);
       
       PortableServer::ServantLocator_var servant_locator =
-        servant_locator_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        servant_locator_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Set ServantLocator_i object as the servant Manager of
       // secondPOA.
 
       second_poa->set_servant_manager (servant_locator.in (),
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
         
       // Try to create a reference with user created ID in second_poa
       // which uses MyFooServantLocator. The servant dll name as well
@@ -310,15 +312,15 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
       second_foo_ = second_poa->create_reference_with_id 
         (second_foo_oid.in (),
          "IDL:Foo:1.0",
-         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:create_locator ()");
+      TAO_TRY_ENV.print_exception ("Server_i:create_locator ()");
       return 1;
     }
-  ACE_ENDTRY;   
+  TAO_ENDTRY;   
 
   return 0;
 }
@@ -328,21 +330,22 @@ Server_i::create_locator (PortableServer::POA_var second_poa)
 int 
 Server_i::run (void) 
 {
-  ACE_DECLARE_NEW_CORBA_ENV; 
-  ACE_TRY
+  CORBA::Environment TAO_TRY_ENV;
+   
+  TAO_TRY
     { 
       // Invoke object_to_string on the references created in firstPOA
       // and secondPOA.
 
       CORBA::String_var first_foo_ior =
         orb_->object_to_string (first_foo_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       CORBA::String_var second_foo_ior =
         orb_->object_to_string (second_foo_.in (),
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
  
       // Print the ior's of first_foo and second_foo.
 
@@ -358,9 +361,9 @@ Server_i::run (void)
 
       // Set the poa_manager state to active, ready to process
       // requests.
-      poa_manager_->activate (ACE_TRY_ENV);
+      poa_manager_->activate (TAO_TRY_ENV);
      
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
   
       // Run the ORB.
       if (orb_->run () == -1)
@@ -372,15 +375,15 @@ Server_i::run (void)
       // Destroy the root_poa_ and also first_poa and second_poa.
       root_poa_->destroy (1,
                           1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY 
+  TAO_CATCHANY 
     {
-      ACE_TRY_ENV.print_exception ("Server_i:run ()");
+      TAO_TRY_ENV.print_exception ("Server_i:run ()");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   
   return 0;
 }
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 4961df7a72e..7ecf9218f71 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
+#$Id$
 # -*- perl -*-
 
 unshift @INC, '../../../../bin';
@@ -13,8 +13,6 @@ $iorfile = "ior";
 $oneway = "";
 $iterations = 100;
 
-$extra_args = "";
-
 # Parse the arguments
 for ($i = 0; $i <= $#ARGV; $i++)
 {
@@ -47,7 +45,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
       $i++;
       last SWITCH;
     }
-    $extra_args .= " " . $ARGV[$i];
+    print "run_test: Unknown Option: ".$ARGV[$i]."\n";
   }
 }
 
@@ -57,13 +55,13 @@ $iorfile_2 = $iorfile."_2";
 unlink $iorfile_1;
 unlink $iorfile_2;
 
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
+$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile");
 
 ACE::waitforfile ($iorfile_1);
 ACE::waitforfile ($iorfile_2);
 
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_1");
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile_2 -x");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_1");
+$status  = system ("../Generic_Servant/client$Process::EXE_EXT $oneway -i $iterations -f $iorfile_2 -x");
 
 unlink $iorfile_1;
 unlink $iorfile_2;
diff --git a/TAO/examples/POA/On_Demand_Loading/svc.conf b/TAO/examples/POA/On_Demand_Loading/svc.conf
index a5a704c4cdc..43c6a486c92 100644
--- a/TAO/examples/POA/On_Demand_Loading/svc.conf
+++ b/TAO/examples/POA/On_Demand_Loading/svc.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/POA/README b/TAO/examples/POA/README
index eeb3dd50fa7..f7bbc2d70bc 100644
--- a/TAO/examples/POA/README
+++ b/TAO/examples/POA/README
@@ -4,7 +4,7 @@ The following TAO applications illustate various Portable Object
 Adapter (POA) interfaces and their usage scenarios.
 
         Individual README files in the respective directories explain
-these applications further.
+these applications further. 
 
         . RootPOA
 
@@ -30,15 +30,15 @@ these applications further.
                 implemented using different POA policies; a common
                 client for all the servers is also provided.
 
-        . On_Demand_Activation
-
+        . On_Demand_Activation 
+                
                 Contains programs that test the POA's 2 types of
                 activation of objects on demand, namely , Servant
                 Activator approach and Servant Locator , which depend
                 on the RETAIN/NON-RETAIN policy of a POA.
 
-        . Default_Servant
-
+        . Default_Servant 
+		
 		Contains a File IDL module and its implementation and
 		a server,client to test the File Module interfaces.
 		The System interface uses the USE_DEFAULT_MANAGER policy
@@ -51,67 +51,8 @@ these applications further.
                 This application explains various operations involved
                 in the explicit activation of objects; including the
                 creation of objects without servants (the servant is
-                created on demand).
-
-        . DSI
-
-                The client/server couple tests the DSI features of the
-                POA.
-
-        . Forwarding
-
-                The example is used to test the support for forwarding
-                in TAO.  Three ways are shown: (a) Forwarding using
-                Servant Activators, (b) Forwarding using Servant
-                Locators, and (c) Forwarding using POA (this feature
-                is TAO specific).
-
-        . TIE
-
-                Shows off the standard TIE features of the new CORBA
-                2.2 specification.
-
-        . Identity
-
-                The example shows the identity between servants, ids,
-                and references.
-
-        . On_Demand_Loading
-
-                This example illustrates how to dynamically link and
-                load servants into a POA in a platform-independent
-                manner using the ACE_DLL feature and standard CORBA
-                Servant Manager features.  In the example, the POA is
-                configured with the USE_SERVANT_MANAGER policy value,
-                which relies on an application supplied Servant
-                Manager object to supply object/server associations.
-
-                This example illustrates both Servant Activator and
-                Servant_Locator interfaces.  The servant object is
-                created by a factory function that resides in a DLL
-                that is linked and loaded into the server's address
-                space on-demand when client requests arrive.  The
-                ObjectID in each client request indicates which DLL
-                name and which factory function to use to create the
-                servant.
-
-         . Loader
-
-                This example is similar to the above except the id is
-                not hijacked to store the DLL and factory function
-                name.  This information is provided to the Servant
-                Managers on creation.
-
-        . Explicit_Activation
-
-                This example is very similar to the
-                Explicit_Activation example except that the POAs are
-                deleted once the object references have been
-                created. After this, an adapter activator is install
-                in the RootPOA to reactivate the POAs on demand.
-
-        . Reference_Counted_Servant
-
-                This example shows how to use reference counted
-                servants to automatically manage dynamic memory for
-                servants.
+                created on demand).  NOTE: Currently the example does
+                not work.  < It compiles; but at runtime, _narrow()
+                raises an exception on the client. >
+        
+        
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile b/TAO/examples/POA/Reference_Counted_Servant/Makefile
deleted file mode 100644
index 8b22f89c383..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile
+++ /dev/null
@@ -1,329 +0,0 @@
-#
-# $Id$
-#
-
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-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
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
-
-#### For make depend
-PSRC = $(BIN:%=%.cpp)
-
-#----------------------------------------------------------------------------
-#	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.local.GNU
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.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/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
- ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
- ../Generic_Servant/FooC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
- ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
- ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Reference_Counted_Servant/README b/TAO/examples/POA/Reference_Counted_Servant/README
deleted file mode 100644
index effa3c1cdd2..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/README
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-
-This application demostrates reference counted servants.
-
-The server program is available here. Use the Generic_Servant/client
-program to test this.
-
-________________________________________
-
-To test this example, type run_test.pl
-________________________________________
-
-Or
-________________________________________
-
-Run the server as follows:
-
-% ./server -f output
-
-This will produce a file named output which will contain the ior.
-
-Run the client as follows:
-
-% cd $TAO_ROOT/examples/POA/Generic_Servant
-% ./client -f ../Reference_Counted_Servant/output
-________________________________________
-
-Or
-________________________________________
-
-Run the server as follows:
-
-% ./server -ORBobjrefstyle URL &
-
-Run the client as follows:
-
-% cd $TAO_ROOT/examples/POA/Generic_Servant
-% ./client -k <IOR>
-
-Comments :
-=========
- - As soon as, the server prints out the IOR, cut it and use it for
-running the client.
-________________________________________
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.dsw b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.dsw
deleted file mode 100644
index 369f9e2c9dc..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.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: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

diff --git a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
deleted file mode 100755
index 92d71a06ebd..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ /dev/null
@@ -1,64 +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 ACEutils;
-
-$iorfile = "ior";
-
-$oneway = "";
-$iterations = 100;
-
-$extra_args = "";
-
-# Parse the arguments
-for ($i = 0; $i <= $#ARGV; $i++)
-{
-  SWITCH:
-  {
-    if ($ARGV[$i] eq "-h" || $ARGV[$i] eq "-?")
-    {
-      print "run_test [-h] [-i iterations] [-o] [-f ior file]\n";
-      print "\n";
-      print "-h                  -- prints this information\n";
-      print "-f                  -- ior file\n";
-      print "-i iterations       -- specifies iterations\n";
-      print "-o                  -- call issued are oneways\n";
-      exit;
-    }
-    if ($ARGV[$i] eq "-o")
-    {
-      $oneway = "-o";
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-i")
-    {
-      $iterations = $ARGV[$i + 1];
-      $i++;
-      last SWITCH;
-    }
-    if ($ARGV[$i] eq "-f")
-    {
-      $iorfile = $ARGV[$i + 1];
-      $i++;
-      last SWITCH;
-    }
-    $extra_args .= " " . $ARGV[$i];
-  }
-}
-
-unlink $iorfile;
-
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-f $iorfile $extra_args");
-
-ACE::waitforfile ($iorfile);
-
-$status  = system ("../Generic_Servant/client$Process::EXE_EXT $extra_args $oneway -i $iterations -f $iorfile -x");
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
deleted file mode 100644
index 3caa80dbf77..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-// $Id$
-
-// ================================================================
-//
-// = LIBRARY
-//    TAO/tests/POA/Reference_Counted_Servant
-//
-// = FILENAME
-//    server.cpp
-//
-// = DESCRIPTION
-//    This example shows how to use reference counted servants to
-//    automatically manage dynamic memory for servants.
-//    Stubs/Skeletons and client code is available in
-//    ../Generic_Servant.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ================================================================
-
-#include "ace/Get_Opt.h"
-#include "MyFooServant.h"
-
-ACE_RCSID(Reference_Counted_Servant, server, "$Id$")
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class Reference_Counted_Foo : public virtual PortableServer::RefCountServantBase,
-                              public virtual MyFooServant
-{
-public:
-  Reference_Counted_Foo (CORBA::ORB_ptr orb,
-                         PortableServer::POA_ptr poa,
-                         CORBA::Long value);
-  // Constructor - takes a POA and a value parameter
-};
-
-Reference_Counted_Foo::Reference_Counted_Foo (CORBA::ORB_ptr orb,
-                                              PortableServer::POA_ptr poa,
-                                              CORBA::Long value)
-  : MyFooServant (orb,
-                  poa,
-                  value)
-{
-}
-
-static char *ior_output_file = 0;
-
-static int
-parse_args (int argc, char **argv)
-{
-  ACE_Get_Opt get_opts (argc, argv, "f:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'f':
-        ior_output_file = get_opts.optarg;
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "[-f ior_output_file]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-static int
-write_iors_to_file (const char *ior)
-{
-  if (ior_output_file == 0)
-    // No filename was specified; simply return
-    return 0;
-
-  FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
-
-  if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n",
-                       ior_output_file),
-                      -1);
-
-  u_int result = 0;
-
-  result = ACE_OS::fprintf (output_file,
-                            "%s",
-                            ior);
-  if (result != ACE_OS::strlen (ior))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_OS::fprintf failed while writing %s to %s\n",
-                       ior,
-                       ior_output_file),
-                      -1);
-
-  ACE_OS::fclose (output_file);
-
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      // Initialize the ORB first.
-      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;
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA");
-
-      // Get the POA_var object from Object_var.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Create a servant.
-      Reference_Counted_Foo *foo_impl = 0;
-      ACE_NEW_RETURN (foo_impl,
-                      Reference_Counted_Foo (orb.in (),
-                                             root_poa.in (),
-                                             27),
-                      -1);
-
-      // Get Object Reference for the foo_impl object.
-      Foo_var foo = foo_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // This means that the ownership of <foo_impl> now belongs to
-      // the POA.
-      foo_impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Stringyfy all the object references and print them out.
-      CORBA::String_var ior = orb->object_to_string (foo.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "%s\n",
-                  ior.in ()));
-
-      int write_result = write_iors_to_file (ior.in ());
-      if (write_result != 0)
-        return write_result;
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CORBA::ORB::run"), -1);
-
-      // Destroy RootPOA (also destroys all child POAs).
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.dsp b/TAO/examples/POA/Reference_Counted_Servant/server.dsp
deleted file mode 100644
index a8a47476f07..00000000000
--- a/TAO/examples/POA/Reference_Counted_Servant/server.dsp
+++ /dev/null
@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="POA Reference Counted Servant Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=POA Reference Counted Servant 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 NMAKE /f "server.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 "server.mak" CFG="POA Reference Counted Servant Server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "POA Reference Counted Servant Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "POA Reference Counted Servant Server - 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 Reference Counted Servant Server - 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 ""

-# 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 "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib ..\Generic_Servant\Generic_Servant.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "POA Reference Counted Servant Server - 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 "..\..\..\.." /I "..\Generic_Servant\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 ..\Generic_Servant\Generic_Servantd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "POA Reference Counted Servant Server - Win32 Release"

-# Name "POA Reference Counted Servant Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/examples/POA/RootPOA/Makefile b/TAO/examples/POA/RootPOA/Makefile
index 827b3d62167..16911367d23 100644
--- a/TAO/examples/POA/RootPOA/Makefile
+++ b/TAO/examples/POA/RootPOA/Makefile
@@ -43,6 +43,9 @@ endif
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -106,85 +109,79 @@ endif
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -193,31 +190,22 @@ endif
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -239,8 +227,11 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -257,64 +248,38 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index a7a3538466a..2ba42fddcc7 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -25,45 +25,50 @@ ACE_RCSID(RootPOA, RootPOA, "$Id$")
 int
 main (int argc, char **argv)
 {
+  CORBA::Environment env;
+
   // Initilize the ORB
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // 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");
-
-      // apply _narrow on the object of type CORBA::Object, to make it a
-      // POA class Object.
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the name of the root POA.
-      CORBA::String_var poa_name =
-        root_poa->the_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The RootPOA is : %s\n",
-                  poa_name.in ()));
-
-      // Destroy the POA object,also destroys the child POAs if any.
-      root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Exceptions raised \n"));
-      ACE_CHECK_RETURN (-1);
-    }
-  ACE_ENDTRY;
-
-return 0;
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+
+  TAO_CHECK_ENV_PRINT_RETURN (env,
+                              "CORBA::ORB_init",
+                              -1);
+
+
+  // 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");
+
+  // apply _narrow on the object of type CORBA::Object, to make it a
+  // POA class Object.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), env);
+
+  TAO_CHECK_ENV_PRINT_RETURN (env,
+                              "PortableServer::POA::_narrow",
+                              -1);
+
+  // Get the name of the root POA.
+  CORBA::String_var poa_name =
+    root_poa->the_name (env);
+
+  TAO_CHECK_ENV_PRINT_RETURN (env,
+                              "PortableServer::POA::_narrow",
+                              -1);
+
+  ACE_DEBUG ((LM_DEBUG,
+              "The RootPOA is : %s\n",
+              poa_name.in ()));
+
+  // Destroy the POA object,also destroys the child POAs if any.
+  root_poa->destroy (1,
+                     1,
+                     env);
+
+  TAO_CHECK_ENV_PRINT_RETURN (env,
+                              "PortableServer::POA::destroy",
+                              -1);
+
+  return 0;
 }
diff --git a/TAO/examples/POA/TIE/Makefile b/TAO/examples/POA/TIE/Makefile
index 994405ba4ee..db349291c26 100644
--- a/TAO/examples/POA/TIE/Makefile
+++ b/TAO/examples/POA/TIE/Makefile
@@ -59,851 +59,30 @@ client: $(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) FooC.* FooS.* FooS_T.*
+	-/bin/rm -rf FooC.* FooS.* FooS_T.*
 
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp FooS.i
-.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
+.obj/FooC.o .obj/FooC.so .shobj/FooC.o .shobj/FooC.so: FooC.cpp FooC.h FooC.i FooS.h FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i
+.obj/FooS.o .obj/FooS.so .shobj/FooS.o .shobj/FooS.so: FooS.cpp FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp \
+ FooS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- Foo_i.h FooS.h FooC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ Foo_i.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -924,545 +103,9 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- FooC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Profile_Timer.i FooC.h \
  FooC.i
-.obj/Foo_i.o .obj/Foo_i.so .shobj/Foo_i.o .shobj/Foo_i.so: Foo_i.cpp Foo_i.h FooS.h FooC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- FooC.i FooS_T.h FooS_T.i FooS_T.cpp FooS.i
+.obj/Foo_i.o .obj/Foo_i.so .shobj/Foo_i.o .shobj/Foo_i.so: Foo_i.cpp Foo_i.h FooS.h FooC.h FooC.i FooS_T.h FooS_T.i \
+ FooS_T.cpp FooS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile b/TAO/examples/POA/locking/Makefile
index bc7c79ff034..6423104fa58 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile
+++ b/TAO/examples/POA/locking/Makefile
@@ -2,14 +2,18 @@
 # $Id$
 #
 
-BIN = server
+ifndef TAO_ROOT
+  TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+BIN = locking
 
 LSRC = 	$(addsuffix .cpp,$(BIN))
 
-CPPFLAGS += -I$(TAO_ROOT) -I../Generic_Servant
+CPPFLAGS += -I$(TAO_ROOT)
 
-LDLIBS     =   -lGeneric_Servant -lTAO
-LDFLAGS += -L$(TAO_ROOT)/tao -L../Generic_Servant
+LDLIBS     =  -lTAO
+LDFLAGS += -L$(TAO_ROOT)/tao
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -23,15 +27,12 @@ INSTALL =
 
 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
 
-ifndef TAO_ROOT
-TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
 #----------------------------------------------------------------------------
 #	Dependencies
 #----------------------------------------------------------------------------
@@ -39,11 +40,13 @@ endif
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.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 \
+.obj/locking.o .obj/locking.so .shobj/locking.o .shobj/locking.so: locking.cpp \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -51,16 +54,13 @@ endif
  $(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/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/Get_Opt.i \
- ../Generic_Servant/MyFooServant.h ../Generic_Servant/FooS.h \
- ../Generic_Servant/FooC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -110,85 +110,79 @@ endif
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -197,31 +191,22 @@ endif
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -243,8 +228,11 @@ endif
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -261,67 +249,38 @@ endif
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- ../Generic_Servant/generic_servant_export.h ../Generic_Servant/FooC.i \
- ../Generic_Servant/FooS_T.h ../Generic_Servant/FooS_T.i \
- ../Generic_Servant/FooS_T.cpp ../Generic_Servant/FooS.i
+ $(TAO_ROOT)/tao/Union.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/POA/locking/locking.cpp b/TAO/examples/POA/locking/locking.cpp
new file mode 100644
index 00000000000..2bd92d53409
--- /dev/null
+++ b/TAO/examples/POA/locking/locking.cpp
@@ -0,0 +1,167 @@
+// $Id$
+
+// ==================================================
+// = LIBRARY
+//    TAO/tests/POA/NewPOA
+//
+// = FILENAME
+//    NewPOA.cpp
+//
+// = DESCRIPTION
+//
+//    This program demonstrates creation of new POAs using TAO
+//    specific locking policies
+//
+// = AUTHOR
+//    Irfan Pyarali
+// ==================================================
+
+#include "tao/corba.h"
+
+ACE_RCSID(locking, locking, "$Id$")
+
+int
+main (int argc, char **argv)
+{
+  CORBA::Environment env;
+
+  // The first step -- Initialize the ORB.
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("CORBA::ORB_init");
+      return -1;
+    }
+
+  // Obtain the object reference to the RootPOA.
+  TAO_POA_Policies root_poa_policies;
+  root_poa_policies.implicit_activation (PortableServer::IMPLICIT_ACTIVATION);
+  root_poa_policies.lifespan (PortableServer::PERSISTENT);
+  root_poa_policies.synchronization (PortableServer::NULL_LOCK);
+
+  CORBA::Object_var obj = orb->resolve_root_poa ("RootPOA",
+                                                 0, 
+                                                 &root_poa_policies);
+
+  // _narrow () the Object to get the POA object, i.e., the root_poa.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  // Policies for the new POAs
+  CORBA::PolicyList policies (1);
+  policies.length (1);
+
+  // TAO specific threading policy
+  policies[0] =
+    root_poa->create_synchronization_policy (PortableServer::THREAD_LOCK,
+                                             env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("create_synchronization_policy");
+      return -1;
+    }
+
+  // Creation of the firstPOA
+  ACE_CString name = "firstPOA";
+  PortableServer::POA_var first_poa =
+    root_poa->create_POA (name.c_str (),
+                          PortableServer::POAManager::_nil (),
+                          policies,
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // TAO specific threading policy
+  policies[0] =
+    root_poa->create_synchronization_policy (PortableServer::DEFAULT_LOCK, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("create_synchronization_policy");
+      return -1;
+    }
+
+  // Creation of the new POA, i.e. firstPOA/secondPOA
+  name += TAO_POA::name_separator ();
+  name += "secondPOA";
+  PortableServer::POA_var second_poa =
+    root_poa->create_POA (name.c_str (),
+                          PortableServer::POAManager::_nil (),
+                          policies,
+                          env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Creation of the new POAs over, so destroy the Policy_ptr's.
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_POA");
+      return -1;
+    }
+
+  // Get the names of all the POAs and print them out.
+
+  CORBA::String_var root_poa_name =
+    root_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  CORBA::String_var first_poa_name =
+    first_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  CORBA::String_var second_poa_name =
+    second_poa->the_name (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+
+  ACE_DEBUG ((LM_DEBUG,
+              "%s\n%s\n%s\n",
+              root_poa_name.in (),
+              first_poa_name.in (),
+              second_poa_name.in ()));
+  
+  // This should destroy all its children
+  root_poa->destroy (1,
+                     1,
+                     env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::destroy");
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_server.dsp b/TAO/examples/POA/locking/locking.dsp
index 818cc37117d..c6beec47b6c 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_server.dsp
+++ b/TAO/examples/POA/locking/locking.dsp
@@ -1,25 +1,25 @@
-# Microsoft Developer Studio Project File - Name="sfp_server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="POA Locking" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=sfp_server - Win32 Debug

+CFG=POA Locking - 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 "sfp_server.mak".

+!MESSAGE NMAKE /f "locking.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 "sfp_server.mak" CFG="sfp_server - Win32 Debug"

+!MESSAGE NMAKE /f "locking.mak" CFG="POA Locking - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "sfp_server - Win32 Release" (based on\

+!MESSAGE "POA Locking - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "sfp_server - Win32 Debug" (based on\

+!MESSAGE "POA Locking - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +29,7 @@ CFG=sfp_server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

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

+!IF  "$(CFG)" == "POA Locking - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -38,11 +38,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

+# PROP Output_Dir ""

 # 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 /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" /FD /c

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -50,9 +52,10 @@ BSC32=bscmake.exe
 # 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 /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 /nologo /subsystem:console /machine:I386

+# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# SUBTRACT LINK32 /pdb:none

 

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

+!ELSEIF  "$(CFG)" == "POA Locking - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,7 +69,7 @@ LINK32=link.exe
 # 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 "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -75,21 +78,22 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

+# ADD LINK32 TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

+# SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

 

 # Begin Target

 

-# Name "sfp_server - Win32 Release"

-# Name "sfp_server - Win32 Debug"

-# Begin Source File

+# Name "POA Locking - Win32 Release"

+# Name "POA Locking - Win32 Debug"

+# Begin Group "Source Files"

 

-SOURCE=.\common.h

-# End Source File

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\server.cpp

+SOURCE=.\locking.cpp

 # End Source File

+# End Group

 # End Target

 # End Project

diff --git a/TAO/examples/POA/Adapter_Activator/Adaptor_Activator.dsw b/TAO/examples/POA/locking/locking.dsw
index f121fae15c3..d9129842929 100644
--- a/TAO/examples/POA/Adapter_Activator/Adaptor_Activator.dsw
+++ b/TAO/examples/POA/locking/locking.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "server"=.\server.dsp - Package Owner=<4>

+Project: "locking"=.\locking.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index 699ffbcbc7a..9bb2b2133c0 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -23,107 +23,105 @@ static const char usage [] = "[-? |\n[-O[RBport] ORB port number]]";
 
 Quoter_Factory_Finder_Server::Quoter_Factory_Finder_Server (void)
 {
-  // Nothing
 }
 
 Quoter_Factory_Finder_Server::~Quoter_Factory_Finder_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Unbind the Quoter Factory Finder.
       CosNaming::Name factory_Finder_Name (2);
       factory_Finder_Name.length (2);
       factory_Finder_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_Finder_Name[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
-      if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (factory_Finder_Name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->quoterNamingContext_var_->unbind (factory_Finder_Name,TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_ERROR ((LM_ERROR, "Could not unbind the Factor Finder from the Name Service\n"));
-      ACE_TRY_ENV.print_exception ("~Quoter_Factor_Finder_Server");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 int
-Quoter_Factory_Finder_Server::init (int argc,
-                                    char *argv[],
-                                    CORBA::Environment &ACE_TRY_ENV)
+Quoter_Factory_Finder_Server::init (int argc, char *argv[], CORBA::Environment& env)
 {
-  const char *exception_message = "Null Message";
-  
-  ACE_TRY
-    {
-      exception_message = "While ORB_Manager::init";
-      if (this->orb_manager_.init (argc,
-                                   argv,
-                                   ACE_TRY_ENV) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "init"),
-                          -1);
-      ACE_TRY_CHECK;
+  if (this->orb_manager_.init (argc,
+                               argv,
+                               env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "init"),
+                      -1);
 
-      // Copy them, because parse_args expects them there.
-      this->argc_ = argc;
-      this->argv_ = argv;
+  // Copy them, because parse_args expects them there.
+  this->argc_ = argc;
+  this->argv_ = argv;
 
-      this->parse_args ();
+  this->parse_args ();
 
 
-      ACE_NEW_RETURN (this->quoter_Factory_Finder_i_ptr_,
-                      Quoter_Factory_Finder_i(),
-                      -1);
+  ACE_NEW_RETURN (this->quoter_Factory_Finder_i_ptr_,
+                  Quoter_Factory_Finder_i(),
+                  -1);
 
-      // Activate the object.
-      exception_message = "Failure while activating the Quoter Factory Finder Impl";
-      CORBA::String_var str  =
-        this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Activate the object.
+  CORBA::String_var str  =
+    this->orb_manager_.activate (this->quoter_Factory_Finder_i_ptr_,
+                                 env);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n",
-                  str.in ()));
+  // Failure while activating the Quoter Factory Finder object
+  if (env.exception () != 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "init: Failure while activating the Quoter Factory Finder Impl.\n"),
+                      -1);
 
-      // Register the Quoter Factory Finder with the Naming Service
 
+  ACE_DEBUG ((LM_DEBUG,
+              "The IOR is: <%s>\n",
+              str.in ()));
+
+  // Register the Quoter Factory Finder with the Naming Service
+  TAO_TRY
+    {
       ACE_DEBUG ((LM_DEBUG,"Trying to get a reference to the Naming Service.\n"));
 
       // Get the Naming Service object reference.
-      exception_message = "While resolving the Name Service";
       CORBA::Object_var namingObj_var =
         orb_manager_.orb()->resolve_initial_references ("NameService");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
                     " (%P|%t) Unable get the Naming Service.\n"));
 
       // Narrow the object reference to a Naming Context.
-      exception_message = "While narrowing the Naming Context";
       CosNaming::NamingContext_var namingContext_var =
         CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      ACE_DEBUG ((LM_DEBUG,"Have a proper reference to the Naming Service.\n"));
 
       // Get the IDL_Quoter naming context.
       CosNaming::Name quoterContextName (1);  // max = 1
       quoterContextName.length (1);
       quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
 
-      exception_message = "While resolving the Quoter Naming Context";
       CORBA::Object_var quoterNamingObj_var =
-        namingContext_var->resolve (quoterContextName, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        namingContext_var->resolve (quoterContextName, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      exception_message = "While narrowing the Quoter Naming Context";
       quoterNamingContext_var_ =
         CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Have a proper reference to the Quoter Naming Context.\n"));
@@ -134,31 +132,26 @@ Quoter_Factory_Finder_Server::init (int argc,
       quoter_Factory_Finder_Name_.length (1);
       quoter_Factory_Finder_Name_[0].id = CORBA::string_dup ("Quoter_Factory_Finder");
 
-      exception_message = "While binding the Factory Finder";
       quoterNamingContext_var_->bind (quoter_Factory_Finder_Name_,
-                                      this->quoter_Factory_Finder_i_ptr_->_this(ACE_TRY_ENV),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                      this->quoter_Factory_Finder_i_ptr_->_this(TAO_TRY_ENV),
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Bound the Quoter Factory Finder to the Quoter Naming Context.\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, "Quoter_Factor_Finder_Server::init - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-      return -1;
+      TAO_TRY_ENV.print_exception ("SYS_EX");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
+
 
   return 0;
 }
 
 int
-Quoter_Factory_Finder_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Factory_Finder_Server::run (CORBA::Environment& env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   if (orb_manager_.orb()->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -208,28 +201,28 @@ main (int argc, char *argv [])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tIDL_Quoter:Quoter_Factory_Finder \n \n"));
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      if (quoter_Factory_Finder_Server.init (argc,argv,ACE_TRY_ENV) == -1)
+      if (quoter_Factory_Finder_Server.init (argc,argv,TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          quoter_Factory_Finder_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          quoter_Factory_Finder_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/Factory_Finder.dsp b/TAO/examples/Quoter/Factory_Finder.dsp
index 38aa8810cb9..e8c3f237ce2 100644
--- a/TAO/examples/Quoter/Factory_Finder.dsp
+++ b/TAO/examples/Quoter/Factory_Finder.dsp
@@ -115,6 +115,14 @@ SOURCE=.\Factory_Finder.h
 

 SOURCE=.\Factory_Finder_i.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\QuoterC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\QuoterS.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

diff --git a/TAO/examples/Quoter/Factory_Finder_i.cpp b/TAO/examples/Quoter/Factory_Finder_i.cpp
index 384d9d68809..24e46bb1516 100644
--- a/TAO/examples/Quoter/Factory_Finder_i.cpp
+++ b/TAO/examples/Quoter/Factory_Finder_i.cpp
@@ -24,81 +24,97 @@ ACE_RCSID(Quoter, Factory_Finder_i, "$Id$")
 // Constructor
 Quoter_Factory_Finder_i::Quoter_Factory_Finder_i (void)
 {
-  // Nothing
 }
 
 // Destructor.
 Quoter_Factory_Finder_i::~Quoter_Factory_Finder_i (void)
 {
-  // Nothing
 }
 
 
 CosLifeCycle::Factories *
 Quoter_Factory_Finder_i::find_factories (const CosLifeCycle::Key &factory_key,
-                                         CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV_there)
 {
-  const char *exception_message = "Null Message";
+  CORBA::Environment env_here;
+
+  // Get a reference to the ORB.
+  CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance ()->orb ();
+
+  // Get the Naming Service object reference.
+  CORBA::Object_var namingObj_var = 
+    orb_ptr->resolve_initial_references ("NameService");
+
+  if (CORBA::is_nil (namingObj_var.in ())) 
+    ACE_ERROR ((LM_ERROR,
+                " (%P|%t) Unable get the Naming Service.\n"));
+
+  // Narrow the object reference to a Naming Context.
+  CosNaming::NamingContext_var namingContext_var =
+    CosNaming::NamingContext::_narrow (namingObj_var.in (),
+                                       env_here);
+
+  // See if there is an exception, if yes then throw the NoFactory
+  // exception.
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+
+
+  // Take the key supplied to search for a Quoter Factory
+  CosNaming::Name factoryName = (CosNaming::Name) factory_key;
 
-  CosLifeCycle::Factories *factories_ptr = 0;
+  // Try to get a reference to a Quoter Factory
+  CORBA::Object_var quoterFactoryObject_var =  
+    namingContext_var->resolve (factoryName, env_here);
   
-  ACE_TRY
-  {
-    // Get a reference to the ORB.
-    CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance ()->orb ();
-
-    // Get the Naming Service object reference.
-    exception_message = "While resolving the Name Service";
-    CORBA::Object_var namingObj_var =
-      orb_ptr->resolve_initial_references ("NameService", ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    if (CORBA::is_nil (namingObj_var.in ()))
-      ACE_ERROR ((LM_ERROR,
-                  " (%P|%t) Unable get the Naming Service.\n"));
-
-    // Narrow the object reference to a Naming Context.
-    exception_message = "While narrowing the Naming Context";
-    CosNaming::NamingContext_var namingContext_var =
-      CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                         ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    // Take the key supplied to search for a Quoter Factory
-    CosNaming::Name factoryName = (CosNaming::Name) factory_key;
-
-    // Try to get a reference to a Quoter Factory
-    exception_message = "While resolving the Factory Object";
-    CORBA::Object_var quoterFactoryObject_var =
-      namingContext_var->resolve (factoryName, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-
-    // Check if it is a valid Quoter Factory reference
-    if (CORBA::is_nil (quoterFactoryObject_var.in()))
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
-
-    // create a sequence of factories object
-    factories_ptr = new CosLifeCycle::Factories (1);
-
-    // using the Naming Service only one reference is available
-    factories_ptr->length (1);
-
-    // Check if it is a valid Quoter Factory reference.
-    if (CORBA::is_nil (quoterFactoryObject_var.in ())) // throw a NoFactory exception.
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
-
-    // insert the object reference
-    (*factories_ptr)[0] = CORBA::Object::_duplicate (quoterFactoryObject_var.ptr());
-
-    ACE_DEBUG ((LM_DEBUG,
-                "Have reference to a Quoter Factory.\n"));
-  }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "Quoter_Factory_Finder::find_factories - %s\n", exception_message));
-      ACE_THROW_RETURN (CosLifeCycle::NoFactory (factory_key), 0);
+  // see if there is an exception, if yes then throw the NoFactory exception
+  if (env_here.exception () != 0) // throw a NoFactory exception  
+    { 
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
     }
-  ACE_ENDTRY;
 
-  return factories_ptr;
+  // were able to get a reference to Quoter Factory
+
+  // Check if it is a valid Quoter Factory reference
+  if (CORBA::is_nil (quoterFactoryObject_var.in())) 
+    { // throw a NoFactory exception  
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+      return 0;
+    }
+  else 
+    {
+
+      // create a sequence of factories object
+      CosLifeCycle::Factories *factories_ptr = new CosLifeCycle::Factories (1);      
+
+      // See if there is an exception, if yes then throw the NoFactory
+      // exception.
+      if (env_here.exception () != 0) 
+        {
+          // Throw a NoFactory exception.
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+          return 0;
+        }
+
+      // using the Naming Service only one reference is available
+      factories_ptr->length (1);      
+
+      // Check if it is a valid Quoter Factory reference.
+      if (CORBA::is_nil (quoterFactoryObject_var.in ())) // throw a NoFactory exception.
+        {      
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
+          return 0;
+        }
+
+      // insert the object reference 
+      (*factories_ptr)[0] = CORBA::Object::_duplicate (quoterFactoryObject_var.ptr());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "Have reference to a Quoter Factory.\n"));
+      return factories_ptr;
+    }
 }
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 486085f5bfb..a2badd69620 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -28,38 +28,37 @@ Quoter_Generic_Factory_Server::Quoter_Generic_Factory_Server (void)
 
 Quoter_Generic_Factory_Server::~Quoter_Generic_Factory_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Unbind the Quoter Factory Finder.
       CosNaming::Name generic_Factory_Name (2);
       generic_Factory_Name.length (2);
       generic_Factory_Name[0].id = CORBA::string_dup ("IDL_Quoter");
       generic_Factory_Name[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
-      if (this->quoterNamingContext_var_.ptr () != 0)
-        this->quoterNamingContext_var_->unbind (generic_Factory_Name,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->quoterNamingContext_var_->unbind (generic_Factory_Name,TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 int
 Quoter_Generic_Factory_Server::init (int argc,
                                      char *argv[],
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment& env)
 {
   if (this->orb_manager_.init (argc,
                                argv,
-                               ACE_TRY_ENV) == -1)
+                               env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init"),
@@ -79,10 +78,10 @@ Quoter_Generic_Factory_Server::init (int argc,
   // Activate the object.
   CORBA::String_var str  =
     this->orb_manager_.activate (this->quoter_Generic_Factory_i_ptr_,
-                                 ACE_TRY_ENV);
+                                 env);
 
   // Failure while activating the Quoter Factory Finder object
-  if (ACE_TRY_ENV.exception () != 0)
+  if (env.exception () != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init: Failure while activating the Quoter Generic Factory Impl.\n"),
@@ -94,7 +93,7 @@ Quoter_Generic_Factory_Server::init (int argc,
               str.in ()));
 
   // Register the Quoter GenericFactory with the Naming Service.
-  ACE_TRY
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Trying to get a reference to the Naming Service.\n"));
@@ -102,7 +101,7 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Get the Naming Service object reference.
       CORBA::Object_var namingObj_var =
         orb_manager_.orb()->resolve_initial_references ("NameService");
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (namingObj_var.in ()))
         ACE_ERROR ((LM_ERROR,
@@ -111,14 +110,14 @@ Quoter_Generic_Factory_Server::init (int argc,
       // Narrow the object reference to a Naming Context.
       CosNaming::NamingContext_var namingContext_var =
         CosNaming::NamingContext::_narrow (namingObj_var.in (),
-                                           ACE_TRY_ENV);
+                                           TAO_TRY_ENV);
 
       if (CORBA::is_nil (namingContext_var.in ()))
         ACE_ERROR ((LM_ERROR,
                    " (%P|%t) Unable get the Naming Service.\n"));
 
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Have a proper reference to the Naming Service.\n"));
 
@@ -129,12 +128,12 @@ Quoter_Generic_Factory_Server::init (int argc,
 
       CORBA::Object_var quoterNamingObj_var =
         namingContext_var->resolve (quoterContextName,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       quoterNamingContext_var_ =
         CosNaming::NamingContext::_narrow (quoterNamingObj_var.in (),
-                                           ACE_TRY_ENV);
+                                           TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
                   "Have a proper reference to the Quoter Naming Context.\n"));
@@ -146,9 +145,9 @@ Quoter_Generic_Factory_Server::init (int argc,
       quoter_Generic_Factory_Name[0].id = CORBA::string_dup ("Quoter_Generic_Factory");
 
       quoterNamingContext_var_->bind (quoter_Generic_Factory_Name,
-                                      this->quoter_Generic_Factory_i_ptr_->_this(ACE_TRY_ENV),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      this->quoter_Generic_Factory_i_ptr_->_this(TAO_TRY_ENV),
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Bound the Quoter GenericFactory to the Quoter Naming Context.\n"));
 
@@ -167,34 +166,34 @@ Quoter_Generic_Factory_Server::init (int argc,
 
         CORBA::Object_var life_Cycle_Service_Obj_var =
           namingContext_var->resolve (life_Cycle_Service_Name,
-                                      ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+        TAO_CHECK_ENV;
 
         LifeCycleService::Life_Cycle_Service_var  life_Cycle_Service_var =
           LifeCycleService::Life_Cycle_Service::_narrow (life_Cycle_Service_Obj_var.in (),
-                                                         ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+        TAO_CHECK_ENV;
 
         ACE_DEBUG ((LM_DEBUG, "Have a proper reference to Life Cycle Service.\n"));
 
-        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(ACE_TRY_ENV);
+        CORBA::Object_var object_var = this->quoter_Generic_Factory_i_ptr_->_this(TAO_TRY_ENV);
 
         life_Cycle_Service_var->register_factory ("Quoter_Generic_Factory",  // name
-                                                  "Bryan 503",               // location
-                                                  "Generic Factory",         // description
-                                                  object_var.in (),
-                                                  ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+				  		                                    "Bryan 503",               // location
+					  	                                    "Generic Factory",         // description
+						                                      object_var.in (),
+						                                      TAO_TRY_ENV);
+        TAO_CHECK_ENV;
         ACE_DEBUG ((LM_DEBUG,
                     "Registered the Quoter GenericFactory to the Life Cycle Service.\n"));
       }
             
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Quoter_Generic_Factory_Server::init: Exception");
+      TAO_TRY_ENV.print_exception ("Quoter_Generic_Factory_Server::init: Exception");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 
   return 0;
@@ -254,30 +253,30 @@ main (int argc, char *argv [])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tIDL_Quoter: Quoter_Generic_Factory_Server \n\n"));
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       if (quoter_Generic_Factory_Server.init (argc,
                                               argv,
-                                              ACE_TRY_ENV) == -1)
+                                              TAO_TRY_ENV) == -1)
         return 1;
       else
         {
-          quoter_Generic_Factory_Server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          quoter_Generic_Factory_Server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/Generic_Factory_i.cpp b/TAO/examples/Quoter/Generic_Factory_i.cpp
index e050fbdf97c..52522d5ad83 100644
--- a/TAO/examples/Quoter/Generic_Factory_i.cpp
+++ b/TAO/examples/Quoter/Generic_Factory_i.cpp
@@ -32,10 +32,10 @@ Quoter_Generic_Factory_i::~Quoter_Generic_Factory_i (void)
 
 CORBA::Boolean 
 Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &factory_key,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV_there)
 {
   ACE_UNUSED_ARG (factory_key);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV_there);
 
   return 0;
 }
@@ -44,8 +44,8 @@ Quoter_Generic_Factory_i::supports (const CosLifeCycle::Key &factory_key,
 
 CosNaming::NamingContext_ptr
 Quoter_Generic_Factory_i::get_naming_context (const CosLifeCycle::Key &factory_key,
-                                              CORBA::Environment &env_here,
-                                              CORBA::Environment &TAO_IN_ENV_there)
+                                                 CORBA::Environment &env_here,
+                                                 CORBA::Environment &TAO_IN_ENV_there)
 {
   // Get a reference to the ORB.
   CORBA::ORB_ptr orb_ptr =
diff --git a/TAO/examples/Quoter/Makefile b/TAO/examples/Quoter/Makefile
index a85d1e14203..76b6fd4de0f 100644
--- a/TAO/examples/Quoter/Makefile
+++ b/TAO/examples/Quoter/Makefile
@@ -8,34 +8,38 @@ endif # TAO_ROOT
 
 override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
+BIN = client server Factory_Finder Generic_Factory
+
+
 # The following lines tell the souce code that the trading
 # service is available.
 
 ifdef trader
-  CPPFLAGS += -DTRADER_AVAILABLE
+
+CPPFLAGS += -DTRADER_AVAILABLE
+
 endif # trader
 
-LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC = \
-        QuoterC.cpp QuoterS.cpp
+IDL_SRC	= \
+	QuoterC.cpp QuoterS.cpp
 
 CLIENT_SRCS = \
-        client.cpp
+	client.cpp
 
 SERVER_SRCS = \
-        server.cpp Quoter_i.cpp
+	server.cpp Quoter_i.cpp
 
 FACTORY_FINDER_SRCS = \
-        Factory_Finder.cpp Factory_Finder_i.cpp
+	Factory_Finder.cpp Factory_Finder_i.cpp
 
 GENERIC_FACTORY_SRCS = \
-        Generic_Factory.cpp Generic_Factory_i.cpp
+	Generic_Factory.cpp Generic_Factory_i.cpp
 
 
 LSRC= \
-        $(IDL_SRC) $(CLIENT_SRCS) $(SERVER_SRCS) \
-        $(FACTORY_FINDER_SRCS) $(GENERIC_FACTORY_SRCS)
+	$(IDL_SRC) $(CLIENT_SRCS) $(SERVER_SRCS) \
+	$(FACTORY_FINDER_SRCS) $(GENERIC_FACTORY_SRCS)
 
 COMMON_OBJS = QuoterC.o QuoterS.o
 CLIENT_OBJS = $(COMMON_OBJS) client.o
@@ -43,22 +47,21 @@ SERVER_OBJS = $(COMMON_OBJS) server.o Quoter_i.o
 FACTORY_FINDER_OBJS = $(COMMON_OBJS) Factory_Finder.o Factory_Finder_i.o
 GENERIC_FACTORY_OBJS = $(COMMON_OBJS) Generic_Factory.o Generic_Factory_i.o
 
-BIN2 = client server Factory_Finder Generic_Factory
+ifdef trader
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # LifeCycle
-endif # Naming
+LDLIBS = -lorbsvcs -lTAO
+
+else
+
+LDLIBS = -lorbsvcs -lTAO
+
+endif
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
 
 ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
 
@@ -69,22 +72,24 @@ ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
 
 else # ! ACE_HAS_GNUG_PRE_2_8
 
-include $(ACE_ROOT)/include/makeinclude/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	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #### Local rules and variables...
 
 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)/orbsvcs/orbsvcs \
-        -I$(TAO_ROOT) $(TSS_ORB_FLAG)
-TAO_IDLFLAGS +=  -I$(TAO_ROOT)/orbsvcs/orbsvcs
+	-I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 realclean: clean
-	-$(RM) *C.* *S.* *S_T.*
+	-/bin/rm -rf QuoterC.* QuoterS.* QuoterS_T.*
+
+$(IDL_SRC): Quoter.idl
+	$(TAO_ROOT)/TAO_IDL/tao_idl Quoter.idl -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
 .PRECIOUS: $(IDL_SRC)
 
@@ -103,12 +108,1471 @@ Generic_Factory: $(addprefix $(VDIR),$(GENERIC_FACTORY_OBJS))
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/QuoterC.o .obj/QuoterC.so .shobj/QuoterC.o .shobj/QuoterC.so: QuoterC.cpp QuoterC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ QuoterC.i QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/QuoterS.o .obj/QuoterS.so .shobj/QuoterS.o .shobj/QuoterS.so: QuoterS.cpp QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/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/Read_Buffer.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ client.h $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i QuoterC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ QuoterC.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(TAO_ROOT)/tao/TAO.h Quoter_i.h \
+ QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/Quoter_i.o .obj/Quoter_i.so .shobj/Quoter_i.o .shobj/Quoter_i.so: Quoter_i.cpp \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(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.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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.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/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h Quoter_i.h \
+ QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/Factory_Finder.o .obj/Factory_Finder.so .shobj/Factory_Finder.o .shobj/Factory_Finder.so: Factory_Finder.cpp \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(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.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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.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/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ Factory_Finder.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ Factory_Finder_i.h QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/Factory_Finder_i.o .obj/Factory_Finder_i.so .shobj/Factory_Finder_i.o .shobj/Factory_Finder_i.so: Factory_Finder_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
+ $(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/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/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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.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/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ Factory_Finder_i.h QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/Generic_Factory.o .obj/Generic_Factory.so .shobj/Generic_Factory.o .shobj/Generic_Factory.so: Generic_Factory.cpp \
+ $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(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.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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.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/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.i \
+ Generic_Factory.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ Generic_Factory_i.h QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
+.obj/Generic_Factory_i.o .obj/Generic_Factory_i.so .shobj/Generic_Factory_i.o .shobj/Generic_Factory_i.so: Generic_Factory_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
+ $(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/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/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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.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/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/Union.h \
+ Generic_Factory_i.h QuoterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ QuoterC.h QuoterC.i QuoterS_T.h QuoterS_T.i QuoterS_T.cpp QuoterS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 4b796fabdbf..a7cdd1259c8 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -21,12 +21,39 @@ ACE_RCSID(Quoter, Quoter_i, "$Id$")
 // Constructor.  Create all the quoter factories.
 
 Quoter_Factory_i::Quoter_Factory_i (size_t num, PortableServer::POA_ptr poa_ptr)
-  : poa_ptr_ (poa_ptr),
-    my_quoters_ (0),
+  : my_quoters_ (0),
     quoter_num_ (num),
     next_quoter_ (0)
+
 {
-  // Nothing
+  {
+    CORBA::Environment env;
+    ACE_NEW(this->my_quoters_, Quoter_i *[num]);
+
+    for (size_t i = 0; i < num; i++)
+    {
+      ACE_NEW(this->my_quoters_[i], Quoter_i("x",  // name
+                                                0,    // don't use the LifeCycle_Service
+                                                poa_ptr)); // a reference to the poa */
+
+
+      poa_ptr->activate_object (this->my_quoters_[i], env);
+      if (env.exception () != 0)
+      {
+        env.print_exception ("POA::activate");
+      }
+
+      // Stringify the object reference and print it out.
+      CORBA::String_var quoter_ior =
+        TAO_ORB_Core_instance()->orb()->object_to_string (this->my_quoters_[i]->_this(env), env);
+
+      if (env.exception () != 0)
+      {
+        env.print_exception ("CORBA::ORB::object_to_string");
+      }
+    }
+  }
+
 }
 
 
@@ -40,57 +67,11 @@ Quoter_Factory_i::~Quoter_Factory_i (void)
 }
 
 
-// Initialize everything in the factory
-
-int Quoter_Factory_i::init (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_NEW_RETURN (this->my_quoters_, 
-                  Quoter_i *[this->quoter_num_], 
-                  -1);
-
-  for (size_t i = 0; i < this->quoter_num_; i++)
-    {
-      ACE_NEW_RETURN (this->my_quoters_[i], 
-                      Quoter_i("x",  // name
-                               0,    // don't use the LifeCycle_Service
-                               this->poa_ptr_), // a reference to the poa
-                      -1);
-
-      const char *location_string = "POA::activate";
-      ACE_TRY
-        {
-          this->poa_ptr_->activate_object (this->my_quoters_[i], ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          location_string = "_this";
-          Stock::Quoter_var quoter_var = this->my_quoters_[i]->_this(ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          location_string = "CORBA::ORB::object_to_string";
-          // Stringify the object reference and print it out.
-          CORBA::String_var quoter_ior =
-            TAO_ORB_Core_instance()->orb()->object_to_string (quoter_var.in (),
-                                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_TRY_ENV.print_exception (location_string);
-          return -1;
-        }
-      ACE_ENDTRY;
-    }
-
-  // Everything is ok
-  return 0;
-}
-
-
 // Return the quoter by the id <name>.
 
 Stock::Quoter_ptr
 Quoter_Factory_i::create_quoter (const char *name,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (name);
 
@@ -99,15 +80,15 @@ Quoter_Factory_i::create_quoter (const char *name,
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Quoter %d Created\n", this->next_quoter_));
 
-  return my_quoters_[this->next_quoter_]->_this (ACE_TRY_ENV);
+  return my_quoters_[this->next_quoter_]->_this (env);
 }
 
 
 // Constructor
 
 Quoter_i::Quoter_i (const char *name,
-                    const unsigned char use_LifeCycle_Service,
-                    PortableServer::POA_ptr poa_ptr)
+                          const unsigned char use_LifeCycle_Service,
+                          PortableServer::POA_ptr poa_ptr)
   : use_LifeCycle_Service_ (use_LifeCycle_Service),
     poa_var_ (PortableServer::POA::_duplicate (poa_ptr))
 {
@@ -119,7 +100,6 @@ Quoter_i::Quoter_i (const char *name,
 
 Quoter_i::~Quoter_i (void)
 {
-  // Nothing
 }
 
 
@@ -128,10 +108,10 @@ Quoter_i::~Quoter_i (void)
 
 CORBA::Long
 Quoter_i::get_quote (char const *stock_name,
-                     class CORBA_Environment &ACE_TRY_ENV)
+                        class CORBA_Environment &env)
 {
   ACE_UNUSED_ARG (stock_name);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   return 42;
 }
@@ -141,34 +121,42 @@ Quoter_i::get_quote (char const *stock_name,
 
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
-                const CosLifeCycle::Criteria &the_criteria,
-                CORBA::Environment &ACE_TRY_ENV)
+                   const CosLifeCycle::Criteria &the_criteria,
+                   CORBA::Environment &TAO_IN_ENV_there)
 {
-  const char *exception_message = "Null message";
-  ACE_TRY
+  TAO_TRY
     {
       // The name of the Generic Factory
       CosLifeCycle::Key factoryKey (2);  // max = 2
 
       if (this->use_LifeCycle_Service_ == 1)
-        {
-          // use the LifeCycle Service
-          factoryKey.length(1);
-          factoryKey[0].id = CORBA::string_dup ("Life_Cycle_Service");
-        }
+            {
+              // use the LifeCycle Service
+              factoryKey.length(1);
+              factoryKey[0].id = CORBA::string_dup ("Life_Cycle_Service");
+            }
       else
         {
-          // use a Generic Factory
-          factoryKey.length(2);
-          factoryKey[0].id = CORBA::string_dup ("IDL_Quoter");
-          factoryKey[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
-        }
+              // use a Generic Factory
+              factoryKey.length(2);
+              factoryKey[0].id = CORBA::string_dup ("IDL_Quoter");
+              factoryKey[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
+            }
 
       // Find an appropriate factory over there.
-      exception_message = "While trying to find a factory.\n";
       CosLifeCycle::Factories_ptr factories_ptr =
-        there->find_factories (factoryKey, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        there->find_factories (factoryKey, TAO_IN_ENV_there);
+
+      // Only a NoFactory exception might have occured, so if it
+      // occured, then go immediately back.
+      if (TAO_IN_ENV_there.exception() != 0)
+        {
+              // TAO_IN_ENV_there contains already the exception.
+              ACE_ERROR ((LM_ERROR,
+                                "Quoter::copy: Exception occured while trying to find a factory.\n"));
+
+              return CosLifeCycle::LifeCycleObject::_nil();
+            }
 
       // Now it is known that there is at least one factory.
       Stock::Quoter_var quoter_var;
@@ -179,84 +167,75 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
         CORBA::Object_ptr generic_FactoryObj_ptr = (*factories_ptr)[i];
 
         // Narrow it to a Quoter Factory.
-        exception_message = "While narrowing.\n";
         CosLifeCycle::GenericFactory_var generic_Factory_var =
           CosLifeCycle::GenericFactory::_narrow (generic_FactoryObj_ptr,
-                                                 ACE_TRY_ENV);
-        ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+        TAO_CHECK_ENV;
 
         if (CORBA::is_nil (generic_Factory_var.in ()))
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "Quoter::copy: Narrow failed. Generic Factory is not valid.\n"));
+          return CosLifeCycle::LifeCycleObject::_nil();
+              }
+
+              CosLifeCycle::Key genericFactoryName (1);  // max = 1
+              genericFactoryName.length(1);
+              genericFactoryName[0].id = CORBA::string_dup ("Quoter_Factory");
+
+        CosLifeCycle::Criteria criteria(1);
+              criteria.length (1);
+              criteria[0].name = CORBA::string_dup ("filter");
+              criteria[0].value <<= CORBA::string_dup ("name=='Quoter_Generic_Factory'");
+
+              CORBA::Object_var quoterObject_var =
+                  generic_Factory_var->create_object (genericFactoryName,
+                                                                                criteria,
+                                                                                  TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+
+              quoter_var = Stock::Quoter::_narrow (quoterObject_var.in(), TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+
+        if (CORBA::is_nil (quoter_var.in ()))
+        {
+          // If we had already our last chance, then give up.
+          if (i == factories_ptr->length ())
           {
+            TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factoryKey));
             ACE_ERROR ((LM_ERROR,
-                       "Quoter::copy: Narrow failed. Generic Factory is not valid.\n"));
+                        "Quoter::copy: Last factory did not work. \n"
+                        "No more factories are available. I give up.\n"));
             return CosLifeCycle::LifeCycleObject::_nil();
           }
-
-          CosLifeCycle::Key genericFactoryName (1);  // max = 1
-          genericFactoryName.length(1);
-          genericFactoryName[0].id = CORBA::string_dup ("Quoter_Factory");
-
-          CosLifeCycle::Criteria criteria(1);
-          criteria.length (1);
-          criteria[0].name = CORBA::string_dup ("filter");
-          criteria[0].value <<= CORBA::string_dup ("name=='Quoter_Generic_Factory'");
-
-          exception_message = "While creating an object";
-          CORBA::Object_var quoterObject_var =
-            generic_Factory_var->create_object (genericFactoryName,
-                                                criteria,
-                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          exception_message = "While narrowing object";
-          quoter_var = Stock::Quoter::_narrow (quoterObject_var.in(), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (quoter_var.in ()))
-            {
-              // If we had already our last chance, then give up.
-              if (i == factories_ptr->length ())
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "Quoter::copy: Last factory did not work. \n"
-                              "No more factories are available. I give up.\n"));
-                  ACE_THROW_RETURN (CosLifeCycle::NoFactory (factoryKey),
-                                    CosLifeCycle::LifeCycleObject::_nil());
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "Quoter::copy: Factory did not create the Quoter properly.\n"));
-                  // Tell what's wrong and try the next factory.
-                }
-            }
           else
-            // if succeeded in creating a new Quoter over there, then stop trying
-            break;
+          {
+            ACE_ERROR ((LM_ERROR,
+                        "Quoter::copy: Factory did not create the Quoter properly.\n"));
+            // Tell what's wrong and try the next factory.
+          }
         }
+        else
+          // if succeeded in creating a new Quoter over there, then stop trying
+          break;
+      }
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Quoter copied\n"));
 
       CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr =
         CosLifeCycle::LifeCycleObject::_duplicate ((CosLifeCycle::LifeCycleObject_ptr) quoter_var.in());
-  
-      // Duplicate and return an object reference to the newly created Quoter.
+      // Duplicate and eturn an object reference to the newly created Quoter.
       return lifeCycleObject_ptr;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, "Quoter_i::copy - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-      
+      TAO_TRY_ENV.print_exception ("SYS_EX");
       // Report a NoFactory exception back to the caller
-      ACE_TRY_THROW (CosLifeCycle::NoFactory ());
+      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory ());
+      return CosLifeCycle::LifeCycleObject::_nil();
     }
-  ACE_ENDTRY;
-
-  ACE_CHECK_RETURN (CosLifeCycle::LifeCycleObject::_nil());
-  
-  return 0;
+  TAO_ENDTRY_RETURN (CosLifeCycle::LifeCycleObject::_nil());
 }
 
 
@@ -264,23 +243,20 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
 
 void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr there,
-                const CosLifeCycle::Criteria &the_criteria,
-                CORBA::Environment &ACE_TRY_ENV)
+                   const CosLifeCycle::Criteria &the_criteria,
+                   CORBA::Environment &TAO_IN_ENV_there)
 {
-  const char *exception_message = "Null message";
-  
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,"Quoter_i::move: being called\n"));
+  ACE_DEBUG ((LM_DEBUG,"Quoter_i::move: being called\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
       // We need to have a Factory Finder
       if (CORBA::is_nil (there))
         {
           ACE_ERROR ((LM_ERROR,
                       "Quoter_i::move: No Factory Finder, don't know how to go on.\n"));
-          
-          ACE_THROW (CosLifeCycle::NoFactory ());
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory ());
+          return;
         }
 
       // We need to have access to the POA
@@ -288,74 +264,81 @@ Quoter_i::move (CosLifeCycle::FactoryFinder_ptr there,
         {
           ACE_ERROR ((LM_ERROR,
                       "Quoter_i::move: No access to the POA. Cannot move.\n"));
-          ACE_THROW (CosLifeCycle::NotMovable ());
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NotMovable ());
+          return;
         }
 
       // Create a new Quoter over there
-      exception_message = "While creating a new Quoter";
       CosLifeCycle::LifeCycleObject_var lifeCycleObject_var =
-        this->copy (there, the_criteria, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->copy (there, the_criteria, TAO_IN_ENV_there);
+
+      if (TAO_IN_ENV_there.exception () != 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "Quoter_i::move: Exception while creating new Quoter.\n"));
+          // The exception is already contained in the right environment
+          return;
+        }
 
       if (CORBA::is_nil (lifeCycleObject_var.in ()))
         {
           ACE_ERROR ((LM_ERROR,
                       "Quoter_i::move: Created Quoter is not valid.\n"));
-          ACE_THROW (CosLifeCycle::NoFactory ());
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory ());
+          return;
         }
 
       // Set the POA, so that the requests will be forwarded to the new location
 
       // new location
-      CORBA::Object_var forward_to_var = 
-        CORBA::Object::_duplicate ((CORBA::Object_ptr) lifeCycleObject_var.in());
+      CORBA::Object_var forward_to_var = CORBA::Object::_duplicate ((CORBA::Object_ptr) lifeCycleObject_var.in());
 
       if (!CORBA::is_nil (forward_to_var.in ()))
         {
-          exception_message = "While servant_to_id";
-          PortableServer::ObjectId_var oid = this->poa_var_->servant_to_id (this, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          PortableServer::ObjectId_var oid = this->poa_var_->servant_to_id (this, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           PortableServer::Servant servant = this->poa_var_->_servant ();
 
           if (servant == 0)
             {
               ACE_ERROR ((LM_ERROR,"Quoter_i::move: Could not find servant.\n"));
-              ACE_THROW (CosLifeCycle::NotMovable());
+              TAO_IN_ENV_there.exception (new CosLifeCycle::NotMovable());
+              return;
             }
 
           void *ptr = servant->_downcast ("IDL:PortableServer/POA:1.0");
           POA_PortableServer::POA *poa = (POA_PortableServer::POA *) ptr;
           TAO_POA *tao_poa = ACE_dynamic_cast (TAO_POA *, poa);
 
-          exception_message = "While forwarding object";
           tao_poa->forward_object (oid.in (),
                                    forward_to_var.in (),
-                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
       else
         {
           ACE_ERROR ((LM_ERROR,"Quoter_i::move: forward_to refenence is nil.\n"));
-          ACE_THROW (CosLifeCycle::NotMovable());
+          TAO_IN_ENV_there.exception (new CosLifeCycle::NotMovable());
+          return;
         }
+
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR,"Quoter_i::move: %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
+      TAO_TRY_ENV.print_exception ("SYS_EX");
       return;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
 // Removes the object.  Once we shut down the ORB we can call it a day.
 
 void
-Quoter_i::remove (CORBA::Environment &ACE_TRY_ENV)
+Quoter_i::remove (CORBA::Environment &_tao_environment)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (_tao_environment);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "I have been asked to shut down.\n"));
diff --git a/TAO/examples/Quoter/Quoter_i.h b/TAO/examples/Quoter/Quoter_i.h
index 0be4e4c6f3d..23573a1a648 100644
--- a/TAO/examples/Quoter/Quoter_i.h
+++ b/TAO/examples/Quoter/Quoter_i.h
@@ -3,7 +3,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/examples/Quoter
+//    TAO/tests/Quoter
 //
 // = FILENAME
 //    Quoter_i.h
@@ -35,8 +35,8 @@ class Quoter_i: public POA_Stock::Quoter
   //   and provides an example for the lifecycle functionality.
 public:
   Quoter_i (const char *obj_name = "",
-            const unsigned char use_LifeCycle_Service = 0,
-            PortableServer::POA_ptr poa_ptr = 0);
+               const unsigned char use_LifeCycle_Service = 0,
+               PortableServer::POA_ptr poa_ptr = 0);
   // Constructor (use_LifeCycle_Service is 1 if the LifeCycle_Service should be used
   // instead of the Quoter Generic_Factory
 
@@ -44,7 +44,7 @@ public:
   // Destructor
 
   virtual CORBA::Long get_quote (const char *stock_name,
-                                 CORBA::Environment &ACE_TRY_ENV);
+                                 CORBA::Environment &env);
   // Returns the current quote for the stock <stock_name>
 
   // = Lifecycle methods
@@ -56,10 +56,10 @@ public:
 
   virtual void move (CosLifeCycle::FactoryFinder_ptr there,
                      const CosLifeCycle::Criteria &the_criteria,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &_tao_environment);
   // Move this object using <there>
 
-  virtual void remove (CORBA::Environment &ACE_TRY_ENV);
+  virtual void remove (CORBA::Environment &_tao_environment);
   // Removes the object.
 
 private:
@@ -90,17 +90,11 @@ public:
   ~Quoter_Factory_i (void);
   // Destructor.
 
-  int init (CORBA::Environment &ACE_TRY_ENV);
-  // Initialize everything in the factory
-
   virtual Stock::Quoter_ptr create_quoter (const char *name,
-                                           CORBA::Environment &ACE_TRY_ENV);
+                                           CORBA::Environment &env);
   // Return the quoter by the id <name>.
 
 private:
-  PortableServer::POA_ptr poa_ptr_;
-  // Pointer to the poa.
-
   Quoter_i **my_quoters_;
   // Array of quoters.
 
diff --git a/TAO/examples/Quoter/client.conf b/TAO/examples/Quoter/client.conf
index 3c0cc0cc469..6eee002c688 100644
--- a/TAO/examples/Quoter/client.conf
+++ b/TAO/examples/Quoter/client.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index 33b0a7acb04..052c81f9b94 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -12,7 +12,7 @@ Quoter_Task::Quoter_Task (int argc, char **argv)
   // Nothing
 }
 
-int
+int 
 Quoter_Task::svc (void)
 {
   if (this->quoter_client.init (this->argc_, this->argv_) == -1)
@@ -39,10 +39,10 @@ Quoter_Client::parse_args (void)
 {
   ACE_Get_Opt get_opts (argc_, argv_, "n:dlx");
   int c;
-
+  
   while ((c = get_opts ()) != -1)
     switch (c)
-    {
+    {   
       case 'n':  // multiple threads
         // ignore it, it was handled already
         break;
@@ -52,7 +52,7 @@ Quoter_Client::parse_args (void)
       case 'l':
         this->useLifeCycleService_ = 1;
         break;
-      case 'x':
+      case 'x': 
         this->shutdown_ = 1;
         break;
       case '?':
@@ -68,7 +68,7 @@ Quoter_Client::parse_args (void)
                           this->argv_ [0]),
                           -1);
     }
-
+  
   // Indicates successful parsing of command line.
   return 0;
 }
@@ -76,79 +76,93 @@ Quoter_Client::parse_args (void)
 int
 Quoter_Client::run (void)
 {
-  const char *exception_message = "Null Message";
-  ACE_TRY_NEW_ENV
-    {
-      exception_message = "While using get_quote ()";
-      CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "ACE Hardware = %i\n", q));
-
-      // Copy the Quoter
-
-      CosLifeCycle::Criteria criteria;
-      exception_message = "While copying the quoter";
-      CORBA::Object_var quoterObj_var =
-        this->quoter_var_->copy (factory_Finder_var_.in (),
-                                 criteria,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (quoterObj_var.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Quoter_Client::run: Copied Object pointer is nil!"),
-                          -1);
-
-      // Narrow it to the actual Quoter interface
-      exception_message = "While narrowing the quoter";
-      Stock::Quoter_var copied_quoter_var =
-        Stock::Quoter::_narrow (quoterObj_var.in (),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (copied_quoter_var.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Quoter_Client::run: Copied Quoter is nil!"),
-                          -1);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Copied object.\n"));
-
-      exception_message = "While using get_quote () on copied object";
-      q = copied_quoter_var->get_quote ("ACE Hardware", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Copied object: ACE Hardware = %i\n", q));
-
-      // Move the Quoter
-
-      exception_message = "While moving the quoter";
-      this->quoter_var_->move (factory_Finder_var_.in (),
-                               criteria,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Caution, the object reference stays the same
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Moved object\n"));
-
-      exception_message = "While using get_quote () on moved object";
-      q = this->quoter_var_->get_quote ("ACE Hardware", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Moved object: ACE Hardware = %i\n", q));
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("Quoter_Client::run");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
+  CORBA::Long q = this->quoter_var_->get_quote ("ACE Hardware", this->env_);
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with get_quote.");
+    this->env_.clear();
+    return -1;
+  }
+  ACE_DEBUG ((LM_DEBUG, "ACE Hardware = %i\n", q));
+
+  // Copy the Quoter
+
+  CosLifeCycle::Criteria criteria;
+  CORBA::Object_var quoterObj_var =
+    this->quoter_var_->copy (factory_Finder_var_.in (), 
+			     criteria,
+			     this->env_);
+
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with copy.");
+    this->env_.clear();
+    return -1;
+  }
+
+  if (CORBA::is_nil (quoterObj_var.in()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Quoter_Client::run: Copied Object pointer is nil!"),
+                      -1);
+
+  // Narrow it to the actual Quoter interface
+
+  Stock::Quoter_var copied_quoter_var =
+    Stock::Quoter::_narrow (quoterObj_var.in (),
+			    this->env_);
+
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with narrow.");
+    this->env_.clear();
+    return -1;
+  }
+  if (CORBA::is_nil (copied_quoter_var.in()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Quoter_Client::run: Copied Quoter is nil!"),
+                      -1);
+  
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "Copied object.\n"));
+
+  q = 0;
+  q = copied_quoter_var->get_quote ("ACE Hardware", this->env_);
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with get_quote on copied object.");
+    this->env_.clear();
+    return -1;
+  }
+  
+  ACE_DEBUG ((LM_DEBUG, "Copied object: ACE Hardware = %i\n", q));
+
+  // Move the Quoter
+  this->quoter_var_->move (factory_Finder_var_.in (), 
+			     criteria,
+			     this->env_);
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with move.");
+    this->env_.clear();
+    return -1;
+  }
+
+  // Caution, the object reference stays the same
+    
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "Moved object\n"));
+
+  q = 0;
+  q = this->quoter_var_->get_quote ("ACE Hardware", this->env_);
+  if (this->env_.exception () != 0)
+  {
+    this->env_.print_exception ("with get_quote on moved object.");
+    this->env_.clear();
+    return -1;
+  }
+  
+  ACE_DEBUG ((LM_DEBUG, "Moved object: ACE Hardware = %i\n", q));
+  return 0;  
 }
 
 Quoter_Client::~Quoter_Client (void)
@@ -164,131 +178,126 @@ Quoter_Client::~Quoter_Client (void)
 int
 Quoter_Client::init_naming_service (void)
 {
-  const char *exception_message = "Null Message";
-
-  ACE_TRY_NEW_ENV
+  TAO_TRY
+  {
+    // Resolve the Naming Service
+    CORBA::Object_var naming_obj = 
+      orb_->resolve_initial_references ("NameService");
+
+    if (CORBA::is_nil (naming_obj.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                        "Unable to resolve the Name Service.\n"),
+         -1);
+
+    CosNaming::NamingContext_var naming_context = 
+      CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Naming Service.\n"));
+
+ 
+    CosNaming::Name quoterFactoryFinderName (2);
+    quoterFactoryFinderName.length (2);
+    quoterFactoryFinderName[0].id = CORBA::string_dup ("IDL_Quoter");
+    quoterFactoryFinderName[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Trying to resolve the Quoter Factory Finder!\n"));
+
+    CORBA::Object_var factory_obj =
+      naming_context->resolve (quoterFactoryFinderName,
+                               TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Resolved the Quoter Factory Finder!\n"));
+    
+    factory_Finder_var_ =
+      Stock::Quoter_Factory_Finder::_narrow (factory_obj.in (), 
+                                             TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+   
+    if (CORBA::is_nil (factory_Finder_var_.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+      " could not resolve quoter factory in Naming service <%s>\n"),
+      -1);
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory Finder.\n"));
+
+    // The name of the Quoter Generic Factory
+    CosLifeCycle::Key factoryName (2);  // max = 2
+
+    if (this->useLifeCycleService_ == 1)
     {
-      // Resolve the Naming Service
-      CORBA::Object_var naming_obj =
-        orb_->resolve_initial_references ("NameService");
-
-      if (CORBA::is_nil (naming_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to resolve the Name Service.\n"),
-                          -1);
-
-      exception_message = "While narrowing the naming context";
-      CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Naming Service.\n"));
-
-      CosNaming::Name quoterFactoryFinderName (2);
-      quoterFactoryFinderName.length (2);
-      quoterFactoryFinderName[0].id = CORBA::string_dup ("IDL_Quoter");
-      quoterFactoryFinderName[1].id = CORBA::string_dup ("Quoter_Factory_Finder");
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Trying to resolve the Quoter Factory Finder!\n"));
-
-      exception_message = "While resolving the factory finder";
-      CORBA::Object_var factory_obj =
-        naming_context->resolve (quoterFactoryFinderName,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Resolved the Quoter Factory Finder!\n"));
-
-      exception_message = "While narrowing the factory finder";
-      factory_Finder_var_ =
-        Stock::Quoter_Factory_Finder::_narrow (factory_obj.in (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (factory_Finder_var_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve quoter factory in Naming service <%s>\n"),
-                          -1);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory Finder.\n"));
-
-      // The name of the Quoter Generic Factory
-      CosLifeCycle::Key factoryName (2);  // max = 2
-
-      if (this->useLifeCycleService_ == 1)
-      {
-        // use the LifeCycle Service
-        factoryName.length(1);
-        factoryName[0].id = CORBA::string_dup ("Life_Cycle_Service");
-      }
-      else
-      {
-        // use a Generic Factory
-        factoryName.length(2);
-        factoryName[0].id = CORBA::string_dup ("IDL_Quoter");
-        factoryName[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
-      }
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Trying to get a reference of a factory.\n"));
-
-      // Find an appropriate factory over there.
-      exception_message = "While finding factories";
-      CosLifeCycle::Factories_ptr factories_ptr =
-          factory_Finder_var_->find_factories (factoryName, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (factories_ptr == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Did not get a Generic Quoter Factory.\n"),
-                          -1);
+      // use the LifeCycle Service
+      factoryName.length(1);
+      factoryName[0].id = CORBA::string_dup ("Life_Cycle_Service");
+    }
+    else
+    {
+      // use a Generic Factory
+      factoryName.length(2);
+      factoryName[0].id = CORBA::string_dup ("IDL_Quoter");
+      factoryName[1].id = CORBA::string_dup ("Quoter_Generic_Factory");
+    }
+    
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Trying to get a reference of a factory.\n"));
 
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Got a proper reference of a factory.\n"));
+    // Find an appropriate factory over there.
+    CosLifeCycle::Factories_ptr factories_ptr = 
+        factory_Finder_var_->find_factories (factoryName, TAO_TRY_ENV);
 
+    if (factories_ptr == 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Did not get a Generic Quoter Factory.\n"),
+                         -1);
 
-      // Get the first object reference to a factory.
-      CORBA::Object_var quoter_FactoryObj_var;
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Got a proper reference of a factory.\n"));
 
-      if (factories_ptr->length () >= 1)
-        quoter_FactoryObj_var = (*factories_ptr)[0]; // everything is ok, at least one factory is there
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "No Factory received.\n"),
-                          -1);
 
-      // Narrow it to a Quoter Generic Factory
-      exception_message = "While narrowing the factory";
-      generic_Factory_var_ =
-        CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (),
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+    // Get the first object reference to a factory.
+    CORBA::Object_var quoter_FactoryObj_var;
 
-      if (CORBA::is_nil (this->generic_Factory_var_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Factory received is not valid.\n"),
-                          -1);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory.\n"));
-    }
-  ACE_CATCH (CosLifeCycle::NoFactory, excpt)
+    if (factories_ptr->length () >= 1)
     {
-      ACE_ERROR ((LM_ERROR, "Quoter_Client::run - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("Quoter::init_naming_service: No Factory available!");
+      // everything is ok, at least one factory is there
+      quoter_FactoryObj_var = (*factories_ptr)[0];
     }
-  ACE_CATCHANY
+    else
     {
-      ACE_ERROR ((LM_ERROR, "Quoter_Client::init_naming_service - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("Quoter::init_naming_service");
-      return -1;
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "No Factory received.\n"),
+                         -1);
     }
-  ACE_ENDTRY;
 
+    // Narrow it to a Quoter Generic Factory
+    generic_Factory_var_ = CosLifeCycle::GenericFactory::_narrow (quoter_FactoryObj_var.in (), TAO_TRY_ENV);
+
+    TAO_CHECK_ENV;
+
+    if (CORBA::is_nil (this->generic_Factory_var_.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Factory received is not valid.\n"),
+                         -1);
+
+    if (TAO_debug_level > 0)
+      ACE_DEBUG ((LM_DEBUG, "Have a proper reference to the Quoter Factory.\n"));
+  }
+  TAO_CATCH (CosLifeCycle::NoFactory, excpt)
+  {
+    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service: No Factory available!");
+  }
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service");
+    return -1;
+  }
+  TAO_ENDTRY;
+  
   return 0;
 }
 
@@ -300,35 +309,37 @@ Quoter_Client::init (int argc, char **argv)
 
   // Make a copy of argv since ORB_init will change it.
   this->argv_ = new char *[argc];
-
+  
   for (i = 0; i < argc; i++)
     this->argv_[i] = argv[i];
-
-  ACE_TRY_NEW_ENV
-    {
+  
+  TAO_TRY
+  {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
         return -1;
-
-      int naming_result = this->init_naming_service ();
-      if (naming_result == -1)
-        return naming_result;
-
+    
+      // deprecated
+      //if (this->use_naming_service_) 
+      //{
+          int naming_result = this->init_naming_service ();
+          if (naming_result == -1)
+            return naming_result;
+    
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Factory received OK\n"));
-
+    
       // using the Quoter Generic Factory
-      CosLifeCycle::Key genericFactoryName (1);  // max = 1
+      CosLifeCycle::Key genericFactoryName (1);  // max = 1 
       genericFactoryName.length(1);
-      genericFactoryName[0].id = CORBA::string_dup ("Quoter_Factory");
-
+      genericFactoryName[0].id = CORBA::string_dup ("Quoter_Factory"); 
       // The final factory
 
       CosLifeCycle::Criteria criteria(1);
@@ -336,19 +347,19 @@ Quoter_Client::init (int argc, char **argv)
       criteria[0].name = CORBA::string_dup ("filter");
       criteria[0].value <<= CORBA::string_dup ("name=='Quoter_Generic_Factory'");
       // used to find the last generic factory in the chain
-
-      CORBA::Object_var quoterObject_var =
-        this->generic_Factory_var_->create_object (genericFactoryName,
-                                                   criteria,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      
+      CORBA::Object_var quoterObject_var = 
+	this->generic_Factory_var_->create_object (genericFactoryName,
+						   criteria,
+						   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
+      this->quoter_var_ = Stock::Quoter::_narrow (quoterObject_var.in(), TAO_TRY_ENV);     
+      TAO_CHECK_ENV;
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Quoter Created\n"));
-
+    
       if (CORBA::is_nil (this->quoter_var_.in()))
       {
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -356,13 +367,13 @@ Quoter_Client::init (int argc, char **argv)
                             -1);
       }
     }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("Quoter::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("Quoter::init");
+    return -1;
+  }
+  TAO_ENDTRY;
+  
   return 0;
 }
 
@@ -382,16 +393,15 @@ main (int argc, char **argv)
   for (i = 0; i < argc; i++)
     if (ACE_OS::strcmp (argv[i], "-n") == 0)
       threads = ACE_OS::atoi(argv[i + 1]);
-
+    
   Quoter_Task **clients = new Quoter_Task*[threads];
-
+    
   for (i = 0; i < threads; i++)
     clients[i] = new Quoter_Task (argc, argv);
 
 
   for (i = 0; i < threads; i++)
-    clients[i]->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0,
-                          ACE_DEFAULT_THREAD_PRIORITY);
+    clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
 
   int result = ACE_Thread_Manager::instance ()->wait ();
 
@@ -402,3 +412,4 @@ main (int argc, char **argv)
 
   return result;
 }
+
diff --git a/TAO/examples/Quoter/client.dsp b/TAO/examples/Quoter/client.dsp
index 5184c64f76b..5e3dee9617c 100644
--- a/TAO/examples/Quoter/client.dsp
+++ b/TAO/examples/Quoter/client.dsp
@@ -107,6 +107,14 @@ SOURCE=.\QuoterS.cpp
 

 SOURCE=.\client.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\QuoterC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\QuoterS.h

+# End Source File

 # End Group

 # Begin Group "Inline Files"

 

diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h
index 0ee79286cbe..a0bee1d9a05 100644
--- a/TAO/examples/Quoter/client.h
+++ b/TAO/examples/Quoter/client.h
@@ -4,13 +4,13 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/examples/Quoter
+//    TAO/tests/Quoter
 //
 // = FILENAME
 //    quoter_client.h
 //
 // = DESCRIPTION
-//    Contains classes that do the work of the client side of the Quoter Test
+//    @@ Write this
 //
 // = AUTHORS
 //    Darrell Brunsch
@@ -35,10 +35,10 @@
 class Quoter_Client
 {
   // = TITLE
-  //    Quoter_Client
+  //    @@ Write this
   //
   // = DESCRIPTION
-  //    Does all the work of making the calls on the Quoter server
+  //    @@ Write this
 public:
   // = Constructor and destructor.
   Quoter_Client (void);
@@ -81,6 +81,9 @@ private:
   CosLifeCycle::GenericFactory_var generic_Factory_var_;
   // Pointer to a generic factory
 
+  CORBA::Environment env_;
+  // Environment variable.
+
   Stock::Quoter_var quoter_var_;
   // Quoter obj ref.
 
@@ -95,10 +98,10 @@ private:
 class Quoter_Task : public ACE_Task<ACE_SYNCH>
 {
   // = TITLE
-  //    Quoter_Task
+  //    @@ Write this
   //
   // = DESCRIPTION
-  //    Task that creates a Quoter_Client and uses it
+  //    @@ Write this
 public:
   Quoter_Task (int argc, char **argv);
 
diff --git a/TAO/examples/Quoter/run_test.pl b/TAO/examples/Quoter/run_test.pl
index 681f6768bb6..42d1be9df40 100755
--- a/TAO/examples/Quoter/run_test.pl
+++ b/TAO/examples/Quoter/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 # This is a Perl script that runs the client and all the other servers that
 # are needed.
 
@@ -71,7 +70,7 @@ sub lifecycle_server
   my $prog = "..$DIR_SEPARATOR..$DIR_SEPARATOR"."orbsvcs$DIR_SEPARATOR".
              "LifeCycle_Service$DIR_SEPARATOR".
              "LifeCycle_Service$Process::EXE_EXT";
-
+  
   $LC = Process::Create ($prog, $args);
 }
 
diff --git a/TAO/examples/Quoter/server.conf b/TAO/examples/Quoter/server.conf
index a785e63f513..43c6a486c92 100644
--- a/TAO/examples/Quoter/server.conf
+++ b/TAO/examples/Quoter/server.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources global"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index 3a4c64d1604..f92de0c4743 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -5,7 +5,7 @@
 //    Quoter_Server.cpp
 //
 // = DESCRIPTION
-//    The Server for the Quoter Factory
+//    The Server for the Quoter Factory 
 //
 // = AUTHOR
 //    Darrell Brunsch (brunsch@cs.wustl.edu)
@@ -54,164 +54,154 @@ Quoter_Server::parse_args (void)
   return 0;
 }
 
-
-//Initialize the Quoter Server
-
 int
 Quoter_Server::init (int argc,
                     char* argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment& env)
 {
-  const char *exception_message = "Null Message";
-  ACE_TRY
-    {
-      exception_message = "While ORB Manager init";
-      if (this->orb_manager_.init (argc, argv, ACE_TRY_ENV) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "init"),
-                          -1);
-      ACE_TRY_CHECK;
-
-      // Copy them, because parse_args expects them there.
-      this->argc_ = argc;
-      int i;
-
-      // Make a copy of argv since ORB_init will change it.
-      this->argv_ = new char *[argc];
-
-      for (i = 0; i < argc; i++)
-        this->argv_[i] = argv[i];
-
-      this->parse_args ();
-
-      // Obtain the RootPOA.
-      CORBA::Object_var obj = this->orb_manager_.orb()->resolve_initial_references ("RootPOA");
-
-      // Get the POA_var object from Object_var.
-      exception_message = "While narrowing the root pos";
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Get the POAManager of the RootPOA.
-      exception_message = "While getting the POA Manager";
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_NEW_RETURN (quoter_Factory_i_ptr_,
-                      Quoter_Factory_i(this->num_of_objs_,
-                                       root_poa.in()),
-                      0);
-
-      exception_message = "While initing the quoter factory";
-      quoter_Factory_i_ptr_->init (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      PortableServer::ObjectId_var quoter_Factory_oid =
-        PortableServer::string_to_ObjectId ("Quoter_Factory");
+  if (this->orb_manager_.init (argc,
+                               argv,
+                               env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "%p\n", 
+                       "init"),
+                      -1);
 
-      exception_message = "While activating quoter factory";
-      root_poa->activate_object_with_id (quoter_Factory_oid.in (),
-                                         quoter_Factory_i_ptr_,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Copy them, because parse_args expects them there.
+  this->argc_ = argc;
+  int i;
+
+  // Make a copy of argv since ORB_init will change it.
+  this->argv_ = new char *[argc];
+  
+  for (i = 0; i < argc; i++)
+    this->argv_[i] = argv[i];
+
+  this->parse_args ();
+
+    // Obtain the RootPOA.
+  CORBA::Object_var obj = this->orb_manager_.orb()->resolve_initial_references ("RootPOA");
+  
+  // Get the POA_var object from Object_var.
+  PortableServer::POA_var root_poa =
+    PortableServer::POA::_narrow (obj.in (), env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::_narrow");
+      return -1;
+    }
+  
+  // Get the POAManager of the RootPOA.
+  PortableServer::POAManager_var poa_manager =
+    root_poa->the_POAManager (env);
+  
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::the_POAManager");
+      return -1;
+    }
 
-      // Get Object reference for first_foo_impl object.
-      exception_message = "While quoter_Factor::_this";
-      Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  ACE_NEW_RETURN (quoter_Factory_i_ptr_, 
+                  Quoter_Factory_i(this->num_of_objs_, 
+                                      root_poa.in()),
+                  0);
 
-      // Stringify the object reference and print it out.
-      exception_message = "While object_to_string";
-      CORBA::String_var quoter_Factory_ior =
-        this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in (), ACE_TRY_ENV);
+  PortableServer::ObjectId_var quoter_Factory_oid =
+    PortableServer::string_to_ObjectId ("Quoter_Factory");
 
-      exception_message = "While activating the POA Manager";
-      poa_manager->activate (ACE_TRY_ENV);
+  root_poa->activate_object_with_id (quoter_Factory_oid.in (),
+                                     quoter_Factory_i_ptr_,
+                                     env);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "The IOR is: <%s>\n",
-                  quoter_Factory_ior.in ()));
+  // Get Object reference for first_foo_impl object.
+  Stock::Quoter_Factory_var quoter_Factory_var = quoter_Factory_i_ptr_->_this (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("Quoter_Factory::_this");
+      return -1;
     }
-  ACE_CATCHANY
+  
+  // Stringyfy the object reference and print it out.
+  CORBA::String_var quoter_Factory_ior =
+    this->orb_manager_.orb()->object_to_string (quoter_Factory_var.in (), env);
+  
+  if (env.exception () != 0)
     {
-      ACE_ERROR ((LM_ERROR, "Quote_Server::init - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-      ACE_RETHROW;
+      env.print_exception ("CORBA::ORB::object_to_string");
+      return -1;
+    }
+  
+  poa_manager->activate (env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POAManager::activate");
+      return -1;
     }
-  ACE_ENDTRY;
 
-  return this->init_naming_service (ACE_TRY_ENV);
-}
 
+  ACE_DEBUG ((LM_DEBUG,
+              "The IOR is: <%s>\n",
+              quoter_Factory_ior.in ()));
+
+  return this->init_naming_service (env);
+}
 
 // Initialization of Naming Service and register IDL_Quoter Context
 // and Quoter_factory object.
 
 int
-Quoter_Server::init_naming_service (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Server::init_naming_service (CORBA::Environment& env)
 {
-  const char *exception_message = "Null Message";
-  ACE_TRY
-    {
-      CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
-
-      CORBA::Object_var naming_obj =
-        orb_ptr->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);
-
-      exception_message = "While narrowing naming context";
-      namingContext_var_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name quoterContextName (1);
-      quoterContextName.length (1);
-      quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
-
-      exception_message = "While binding a new context";
-      CosNaming::NamingContext_var quoterNameContext =
-        namingContext_var_->bind_new_context (quoterContextName, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      //Register the quoter_factory name with the IDL_quoter Naming
-      //Context...
-      CosNaming::Name quoterFactoryContextName (1);
-      quoterFactoryContextName.length (1);
-      quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory");
-
-      exception_message = "While using factory _this";
-      Stock::Quoter_Factory_var quoter_factory_var = quoter_Factory_i_ptr_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      exception_message = "While binding factory";
-      quoterNameContext->bind (quoterFactoryContextName,
-                               quoter_factory_var,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR, "Quote_Server::init_naming_service - %s", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
-      return -1;
-    }
-  ACE_ENDTRY;
-
+  TAO_TRY 
+  {
+    CORBA::ORB_ptr orb_ptr = TAO_ORB_Core_instance()->orb();
+    TAO_CHECK_ENV;
+
+    CORBA::Object_var naming_obj = 
+      orb_ptr->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);
+
+    namingContext_var_ = 
+      CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+    
+  
+    CosNaming::Name quoterContextName (1);
+    quoterContextName.length (1);
+    quoterContextName[0].id = CORBA::string_dup ("IDL_Quoter");
+    CosNaming::NamingContext_var quoterNameContext =
+      namingContext_var_->bind_new_context (quoterContextName, env);
+    TAO_CHECK_ENV_RETURN (env, -1);
+
+    //Register the quoter_factory name with the IDL_quoter Naming
+    //Context...
+    CosNaming::Name quoterFactoryContextName (1);
+    quoterFactoryContextName.length (1);
+    quoterFactoryContextName[0].id = CORBA::string_dup ("Quoter_Factory");
+    quoterNameContext->bind (quoterFactoryContextName,
+                             quoter_Factory_i_ptr_->_this(env),
+                             env);
+    TAO_CHECK_ENV_RETURN (env, -1);
+
+  }
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("Quoter::init_naming_service");
+    return -1;
+  }
+  TAO_ENDTRY;
+  
   return 0;
 }
 
 int
-Quoter_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Quoter_Server::run (CORBA::Environment& env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   if (orb_manager_.orb()->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -222,33 +212,29 @@ Quoter_Server::run (CORBA::Environment &ACE_TRY_ENV)
 
 Quoter_Server::~Quoter_Server (void)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Unbind quoter factory context and name.
       CosNaming::Name factory_name (2);
       factory_name.length (2);
       factory_name[0].id = CORBA::string_dup ("IDL_Quoter");
       factory_name[1].id = CORBA::string_dup ("Quoter_Factory");
-      if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      this->namingContext_var_->unbind (factory_name,TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       factory_name.length (1);
-      if (this->namingContext_var_.ptr () != 0)
-        this->namingContext_var_->unbind (factory_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->namingContext_var_->unbind (factory_name,TAO_TRY_ENV);
     }
-  ACE_CATCHANY
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_ERROR ((LM_ERROR,
-                  "Could not unbind Quoter Server from the Name Service\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "~Quoter_Server");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
     }
-  ACE_ENDTRY;
-
-  delete [] this->argv_;
-  delete this->quoter_Factory_i_ptr_;
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+    }
+  TAO_ENDTRY;
 }
 
 int
@@ -258,28 +244,28 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tQuoter:SERVER \n \n"));
-
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      if (quoter_server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (quoter_server.init (argc, argv, TAO_TRY_ENV) == -1)
         return 1;
-      ACE_TRY_CHECK;
-
-      quoter_server.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      else
+        {
+          quoter_server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/examples/Quoter/server.dsp b/TAO/examples/Quoter/server.dsp
index d6893d72fc3..222e15f2ac7 100644
--- a/TAO/examples/Quoter/server.dsp
+++ b/TAO/examples/Quoter/server.dsp
@@ -114,6 +114,14 @@ SOURCE=.\Quoter_i.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\QuoterC.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\QuoterS.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\server.h

 # End Source File

 # End Group

diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index d8883bacf08..522f775ed1d 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -4,7 +4,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/examples/Quoter
+//    TAO/tests/Quoter
 //
 // = FILENAME
 //    quoter_server.h
@@ -55,8 +55,8 @@ public:
   int init (int argc, char *argv[], CORBA::Environment& env);
   // Initialize the Quoter_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
-  // Run the server.
+  int run (CORBA::Environment& env);
+  // Run the orb
 
 private:
   int parse_args (void);
diff --git a/TAO/examples/Quoter/svc.conf b/TAO/examples/Quoter/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/examples/Quoter/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 4dcc6bafa13..27ee6a4a661 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -7,9 +7,7 @@
 
 template <class Servant>
 Server<Servant>::Server (void)
-  : ior_output_file_ (0),
-    naming_ (0),
-    ins_ (0)
+    : ior_output_file_ (0)
 {
   // no-op.
 }
@@ -23,12 +21,12 @@ Server<Servant>::~Server (void)
 
 // Parse the command-line arguments and set options.
 
-template <class Servant> int
+template <class Servant> int 
 Server<Servant>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:n");
   int c = 0;
-
+  
   while ((c = get_opts ()) != -1)
     switch (c)
       {
@@ -46,9 +44,6 @@ Server<Servant>::parse_args (void)
       case 'n': //Use naming service
         this->naming_ = 1;
         break;
-      case 'i': // For Testing the InterOperable Naming Service.
-	this->ins_ = CORBA::string_dup (get_opts.optarg);
-	break;
       case '?':  // display help for use of the server.
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -60,45 +55,16 @@ Server<Servant>::parse_args (void)
                            argv_ [0]),
                           -1);
       }
-
+  
   // Indicates successful parsing of command line.
   return 0;
 }
 
-// Add the ObjectID:IOR mapping to the IOR table of
-// the ORB. Ignore this method if you are not testing for
-// the InterOperable Naming Service.
-
-template <class Servant> int
-Server<Servant>::test_for_ins (CORBA::String_var ior)
-{
-
-  CORBA::Object_ptr object =
-    this->orb_manager_.orb ()->string_to_object (ior.in ());
-
-  // Add a KEY:IOR mapping to the ORB table.
-  ACE_CString ins (this->ins_);
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-		"Adding (KEY:IOR) %s:%s\n",
-		ins.c_str (),
-		ior.in ()));
-
-  if (this->orb_manager_.orb ()->_tao_add_to_IOR_table (ins,
-							object) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       "Simple_Util : Unable to add IOR to table\n"),
-		      -1);
-
-  return 0;
-}
-
 // Initialize the server.
-template <class Servant> int
-Server<Servant>::init (const char *servant_name,
-                       int argc,
-                       char *argv[],
+template <class Servant> int 
+Server<Servant>::init (const char *servant_name, 
+                       int argc, 
+                       char *argv[], 
                        CORBA::Environment &ACE_TRY_ENV)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
@@ -111,9 +77,9 @@ Server<Servant>::init (const char *servant_name,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-
+	
   ACE_CHECK_RETURN (-1);
-
+  
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -121,7 +87,7 @@ Server<Servant>::init (const char *servant_name,
 
   if (retval != 0)
     return retval;
-
+  
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   // Stash our ORB pointer for later reference.
@@ -131,16 +97,14 @@ Server<Servant>::init (const char *servant_name,
     {
 
       // Save name in case we use TAO Naming Service.
-      name = servant_name;
-
-      // Call naming service
+      name = servant_name;	
+      
+      // Call naming service 
       if (this->register_name () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "\n Naming Service\n"),-1);
-
       return 0;
     }
-
   // Activate the servant in its own child POA.
 
   // Make sure that you check for failures here via the ACE_TRY
@@ -153,23 +117,16 @@ Server<Servant>::init (const char *servant_name,
                                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      ACE_DEBUG ((LM_DEBUG,
+     ACE_DEBUG ((LM_DEBUG,
                   "The IOR is: <%s>\n",
                   str.in ()));
-
-      if (this->ins_)
-	if (this->test_for_ins (str) != 0)
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "test_for_ins (): failed\n"),
-			    -1);
-
-      if (this->ior_output_file_)
-	{
-	  ACE_OS::fprintf (this->ior_output_file_,
-			   "%s",
-			   str.in ());
-	  ACE_OS::fclose (this->ior_output_file_);
-	}
+     if (this->ior_output_file_)
+       {
+         ACE_OS::fprintf (this->ior_output_file_,
+                          "%s",
+                          str.in ());
+         ACE_OS::fclose (this->ior_output_file_);
+       }
 
     }
   ACE_CATCHANY
@@ -182,7 +139,7 @@ Server<Servant>::init (const char *servant_name,
   return 0;
 }
 
-template <class Servant>int
+template <class Servant>int 
 Server<Servant>::run (CORBA::Environment &env)
 {
     // Run the main event loop for the ORB.
@@ -190,46 +147,36 @@ Server<Servant>::run (CORBA::Environment &env)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Server_i::run"),
                       -1);
-
+  
   return 0;
 }
 
-template <class Servant> int
+template <class Servant> int 
 Server<Servant>::register_name (void)
 {
   this->namingServer.init (this->orb_manager_.orb(),
                            this->orb_manager_.child_poa ());
   // create the name for the naming service
-
+  
   CosNaming::Name bindName;
   bindName.length (1);
   bindName[0].id = CORBA::string_dup (name);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
   // (re)Bind the object.
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object = servant_._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       namingServer->rebind (bindName,
-                            object.in(),
+                            object.in(),       
                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Test for INS.
-      if (this->ins_)
-	if (this->test_for_ins (this->orb_manager_.orb ()
-				->object_to_string (object.in ())) != 0)
-	  ACE_ERROR_RETURN ((LM_ERROR,
-			     "test_for_ins (): failed\n"),
-			    -1);
+      ACE_TRY_CHECK;  
     }
   ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
       ACE_TRY_ENV.clear ();
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "Unable to bind %s \n",
                          name),
                         -1);
@@ -250,7 +197,7 @@ Client<InterfaceObj, Var>::Client (void)
 
 // Reads the Server ior from a file
 
-template <class InterfaceObj, class Var> int
+template <class InterfaceObj, class Var> int 
 Client<InterfaceObj, Var>::read_ior (char *filename)
 {
   // Open the file for reading.
@@ -261,7 +208,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
                        "Unable to open %s for writing: %p\n",
                        filename),
                       -1);
-
+  
   ACE_Read_Buffer ior_buffer (f_handle);
   char *data = ior_buffer.read ();
 
@@ -269,7 +216,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Unable to read ior: %p\n"),
                       -1);
-
+  
   this->ior_ = ACE_OS::strdup (data);
   ior_buffer.alloc ()->free (data);
 
@@ -280,7 +227,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
 
 // Parses the command line arguments and returns an error status.
 
-template <class InterfaceObj, class Var> int
+template <class InterfaceObj, class Var> int 
 Client<InterfaceObj, Var>::parse_args (void)
 {
   ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
@@ -311,7 +258,7 @@ Client<InterfaceObj, Var>::parse_args (void)
         this->shutdown_ = 1;
         break;
       }
-
+  
   // Indicates successful parsing of command line.
   return 0;
 }
@@ -322,18 +269,17 @@ Client<InterfaceObj, Var>::~Client (void)
   ACE_OS::free (this->ior_);
 }
 
-template <class InterfaceObj, class Var> int
+template <class InterfaceObj, class Var> int 
 Client<InterfaceObj, Var>::init (const char *name,
-                                 int argc,
+                                 int argc, 
                                  char **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
 
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  
+  
+  ACE_TRY_NEW_ENV
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
@@ -341,44 +287,44 @@ Client<InterfaceObj, Var>::init (const char *name,
                                     0,
                                     ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
         return -1;
+      
+
 
       if(this->ior_ != 0)
         {
           CORBA::Object_var server_object =
             this->orb_->string_to_object (this->ior_, ACE_TRY_ENV);
           ACE_TRY_CHECK;
-
-
+      
+      
           if (CORBA::is_nil (server_object.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
                                "invalid ior <%s>\n",
                                this->ior_),
-                              -1);
+                              -1);      
           this->server_ = InterfaceObj::_narrow (server_object.in (),
                                                  ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
       else if (this->naming_ == 1)
-        {
+        { 
           // No IOR specified. Use the Naming Service
           ACE_DEBUG((LM_DEBUG,
                      "Using the Naming Service \n"));
           this->name_ = ACE_const_cast (char *, name);
-          int retv = this->obtain_initial_references (ACE_TRY_ENV);
+          this->obtain_initial_references (ACE_TRY_ENV);
           ACE_TRY_CHECK;
-          if (retv ==-1)
-            return -1;
         }
       else
         ACE_ERROR_RETURN ((LM_ERROR,
                            "no ior or naming options  specified\n"),
                           -1);
-
-
+        
+      
     }
   ACE_CATCHANY
     {
@@ -386,16 +332,16 @@ Client<InterfaceObj, Var>::init (const char *name,
       return -1;
     }
   ACE_ENDTRY;
-
-
+  
+  
   return 0;
 }
 
 
-template <class InterfaceObj, class Var> int
+template <class InterfaceObj, class Var> int 
 Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TRY_ENV)
 {
-
+  
   ACE_TRY
     {
       // Initialize the naming services.
@@ -414,29 +360,29 @@ Client<InterfaceObj, Var>::obtain_initial_references (CORBA::Environment &ACE_TR
         namingClient->resolve (server_name,
                               ACE_TRY_ENV);
       ACE_TRY_CHECK;
-
+      
       this->server_ = InterfaceObj::_narrow (obj.in (),
                                              ACE_TRY_ENV);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Client::obtain_initial_references");
+      ACE_TRY_ENV.print_exception ("Bank::obtain_initial_references");
       return -1;
     }
   ACE_ENDTRY;
-
+  
   return 0;
 }
 
-template <class InterfaceObj, class Var> int
+template <class InterfaceObj, class Var> int 
 Client<InterfaceObj, Var>::shutdown (void )
 {
   // Returns the shutdwon flag
   return shutdown_;
 }
 
-template <class InterfaceObj, class Var> void
+template <class InterfaceObj, class Var> void  
 Client<InterfaceObj, Var>::shutdown (int flag)
 {
   // Fills the flag
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 3be6bfb2c25..00c17888add 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -59,10 +59,6 @@ public:
   int run (CORBA::Environment &env);
   // Run the orb.
 
-  int test_for_ins (CORBA::String_var ior);
-  // Ignore this method if you are not testing the InterOperable
-  // Naming Service.
-
 protected:
   Servant servant_;
   // Servant class
@@ -85,9 +81,6 @@ protected:
 
   int naming_;
   // Flag to indicate whether naming service could be used
-       
-  char * ins_;
-  // Used test the INS.
 
   int argc_;
   // Number of command line arguments.
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index fae106e9322..56da62e1e23 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -43,8 +43,8 @@ AccountManager_i::set_orb_manager (TAO_ORB_Manager *orb_manager)
 
 Bank::Account_ptr
 AccountManager_i::open (const char *name,
-                        CORBA::Float initial_balance,
-                        CORBA::Environment &ACE_TRY_ENV)
+			CORBA::Float initial_balance,
+			CORBA::Environment &TAO_IN_ENV)
 {
   Account_i *result = 0;
 
@@ -53,35 +53,35 @@ AccountManager_i::open (const char *name,
 
 
       if (hash_map_.find (name, result) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "[SERVER] Process/Thread Id : (%P/%t) Opening Account (%s,%8.2f)\n",
-                      name,
-                      initial_balance));
-
-          ACE_NEW_THROW_EX (result,
-                            Account_i (name,
-                                       initial_balance),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (Bank::Account::_nil ());
-
-          // Enter the new Account in the hash map. If the <bind>
-          // fails throw an UNKNOWN exception. <result> may be valid
-          // but since it is not properly bound, it's behaviour may be
-          // off, so delete it to be safe.
-
-          if (hash_map_.bind (name, result) == -1)
-            {
-              delete result;
-              TAO_THROW_RETURN (CORBA::UNKNOWN (),
-                                Bank::Account::_nil ());
-            }
-        }
+	{
+	  ACE_DEBUG ((LM_DEBUG,
+		      "[SERVER] Process/Thread Id : (%P/%t) Opening Account (%s,%8.2f)\n",
+		      name,
+		      initial_balance));
+
+	  ACE_NEW_THROW_RETURN (result,
+				Account_i (name,
+					   initial_balance),
+				CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+				Bank::Account::_nil ());
+
+	  // Enter the new Account in the hash map. If the <bind>
+	  // fails throw an UNKNOWN exception. <result> may be valid
+	  // but since it is not properly bound, it's behaviour may be
+	  // off, so delete it to be safe.
+
+	  if (hash_map_.bind (name, result) == -1)
+	    {
+	      delete result;
+	      TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO),
+				Bank::Account::_nil ());
+	    }
+	}
       else
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "[SERVER] Process/Thread Id : (%P/%t) Account already exists for %s\n",
-                      name));
+	if (TAO_debug_level > 0)
+	  ACE_DEBUG ((LM_DEBUG,
+		      "[SERVER] Process/Thread Id : (%P/%t) Account already exists for %s\n",
+		      name));
       // Generate an IOR for the result object and register it with
       // the POA.  In case the object already exists then the
       // previously generated IOR is returned.
@@ -93,32 +93,32 @@ AccountManager_i::open (const char *name,
 
 void
 AccountManager_i::close (Bank::Account_ptr account,
-                         CORBA::Environment &ACE_TRY_ENV)
+			 CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::String_var name =
-        CORBA::string_dup (account->name (ACE_TRY_ENV));
+	CORBA::string_dup (account->name (TAO_TRY_ENV));
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (hash_map_.unbind ((const char *) name) == -1)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG((LM_DEBUG,
-                       "Unable to close account\n"));
-        }
+	{
+	  if (TAO_debug_level > 0)
+	    ACE_DEBUG((LM_DEBUG,
+		       "Unable to close account\n"));
+	}
       else if (TAO_debug_level > 0)
-        ACE_DEBUG((LM_DEBUG,
-                   "[SERVER] Process/Thread Id : (%P/%t) Closing Account for %s\n",
-                   (char *) name));
-    }
-  ACE_CATCHANY
+	ACE_DEBUG((LM_DEBUG,
+		   "[SERVER] Process/Thread Id : (%P/%t) Closing Account for %s\n",
+		   (char *) name));
+
+       }
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Unable to close Account\n");
+      TAO_TRY_ENV.print_exception ("Unable to close Account\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
@@ -138,6 +138,8 @@ template class ACE_Hash_Map_Manager_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CS
 template class ACE_Hash_Map_Iterator<ACE_CString,Account_i *,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<ACE_CString, Account_i *>;
+template class ACE_Hash<ACE_CString>;
+template class ACE_Equal_To<ACE_CString>;
 template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, Account_i *, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
@@ -147,6 +149,8 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Account_i *, ACE_Hash<
 #pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,Account_i *,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, Account_i *>
+#pragma instantiate ACE_Hash<ACE_CString>
+#pragma instantiate ACE_Equal_To<ACE_CString>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, Account_i *, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, Account_i *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.cpp b/TAO/examples/Simple/bank/Bank_Client_i.cpp
deleted file mode 100644
index 4f9dbc36f68..00000000000
--- a/TAO/examples/Simple/bank/Bank_Client_i.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-//$Id$
-
-#include "Bank_Client_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-// This is the interface program that accesses the remote object
-
-// Constructor.
-Bank_Client_i::Bank_Client_i (void)
-{
-  //no-op
-}
-
-//Destructor.
-Bank_Client_i::~Bank_Client_i (void)
-{
-  //no-op
-}
-
-
-int
-Bank_Client_i::run (char *name,
-                    int argc,
-                    char *argv[])
-{
-  // Initialize the client.
-  if (client.init (name,argc, argv) == -1)
-    return -1;
-
-  ACE_TRY_NEW_ENV
-    {
-      this->check_accounts ();
-      if (client.shutdown () == 1)
-        client->shutdown (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nException caught in run\n"));
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-int
-Bank_Client_i::check_accounts (void )
-{
-  ACE_TRY_NEW_ENV
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for account with same name"));
-      this->test_for_same_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for account with different names"));
-      this->test_for_different_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "\nTests for overdrafts"));
-      this->test_for_overdraft (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(\nFrom Bank_Client_i::check_accounts()"));
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// This method tests whether an account with a
-// a same name can be opened
-
-void
-Bank_Client_i::test_for_same_name (CORBA::Environment &ACE_TRY_ENV)
-{
-
-  const char *name = "Name";
-  CORBA::Float initial_bal = 0.00;
-
-  Bank::Account_var acct_id1 = client->open (name,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
-
-  Bank::Account_var acct_id2 = client->open (name,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
-
-  ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *) acct_id2.in ()) != 0);
-
-  client->close (acct_id1.in (),
-                 ACE_TRY_ENV);
-
-  client->close (acct_id2.in (),
-                 ACE_TRY_ENV);
-}
-
-// This method tests whether an account with different names can be opened
-
-void
-Bank_Client_i::test_for_different_name (CORBA::Environment &ACE_TRY_ENV)
-{
-  const char *name1 = "Name1";
-  const char *name2 = "Name2";
-
-  CORBA::Float initial_bal = 0.0;
-
-  Bank::Account_var acct_id1 = client->open (name1,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
-
-  Bank::Account_var acct_id2 = client->open (name2,
-                                             initial_bal,
-                                             ACE_TRY_ENV);
-  ACE_ASSERT (acct_id1->_is_equivalent ((CORBA::Object *)acct_id2.in ()) == 0);
-
-  client->close (acct_id1.in (),
-                 ACE_TRY_ENV);
-
-  client->close (acct_id2.in (),
-                 ACE_TRY_ENV);
-}
-
-// This method tests the Overdraft exception.
-
-void
-Bank_Client_i::test_for_overdraft (CORBA::Environment &ACE_TRY_ENV)
-{
-
-  CORBA::Float initial_bal = 100.0;
-  const char *name = "Name";
-
-  Bank::Account_var acct_id = client->open (name,
-                                            initial_bal,
-                                            ACE_TRY_ENV);
-  acct_id->deposit (100.00,
-                    ACE_TRY_ENV);
-
-  acct_id->withdraw (acct_id->balance (ACE_TRY_ENV) + 20);
-
-  client->close (acct_id.in (),
-                 ACE_TRY_ENV);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Client<Bank::AccountManager,Bank::AccountManager_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Client<Bank,Bank_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/Simple/bank/Bank_Client_i.h b/TAO/examples/Simple/bank/Bank_Client_i.h
deleted file mode 100644
index d1a99b7c99f..00000000000
--- a/TAO/examples/Simple/bank/Bank_Client_i.h
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/bank
-//
-// = FILENAME
-//    Bank_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the  interface calls for RMI.
-//
-// = AUTHOR
-//    
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//    
-// ============================================================================
-
-#ifndef BANK_CLIENT_I_H
-#define BANK_CLIENT_I_H
-
-#include "../Simple_util.h"
-#include "BankC.h"
-
-class Bank_Client_i
-{
-  // = TITLE
-  //   Grid_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client .
-public:
-  // = Initialization and termination methods.
-  Bank_Client_i (void);
-  // Constructor
-
-  virtual ~Bank_Client_i (void);
-  // Destructor
-
-  virtual int run (char *,int, char *[]);
-  // Execute the methods.
-
-private:
-  Client<Bank::AccountManager, Bank::AccountManager_var> client;
-  // Instantiate the client object.
-
-  int check_accounts (void);
-  // Method that calls all the test functions
-
-  void test_for_different_name (CORBA::Environment &env);
-  // Tests if accounts opened with different names return a different account
-  // reference.
-
-  void test_for_same_name (CORBA::Environment &env);
-  // Tests if accounts opened with the same name return the same 
-  // object reference.
-  
-  void test_for_overdraft (CORBA::Environment &env);
-  // Tests for the Overdraft Exception when the client tries to
-  // withdraw more money than the current balance.
-};
-
-#endif /* TIME_CLIENT_I_H */
diff --git a/TAO/examples/Simple/bank/Client_i.cpp b/TAO/examples/Simple/bank/Client_i.cpp
new file mode 100644
index 00000000000..6a3a3a80406
--- /dev/null
+++ b/TAO/examples/Simple/bank/Client_i.cpp
@@ -0,0 +1,382 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+#include "Client_i.h"
+
+ACE_RCSID(Bank, Client_i, "$Id$")
+
+// Constructor.
+
+Client_i::Client_i (void)
+  : ior_ (0),
+    loop_count_ (10),
+    shutdown_ (0),
+    server1_ (),
+    server2_ ()
+{
+}
+
+// Reads the Server factory ior from a file
+
+int
+Client_i::read_ior (char *filename)
+{
+  // Open the file for reading.
+  ACE_HANDLE f_handle = ACE_OS::open (filename, 0);
+
+  if (f_handle == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "[CLIENT] Process/Thread Id : (%P/%t) Unable to open %s for writing: %p\n",
+                       filename),
+                      -1);
+
+  ACE_Read_Buffer ior_buffer (f_handle);
+  char *data = ior_buffer.read ();
+
+  if (data == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior: %p\n"),
+                      -1);
+
+  this->ior_ = ACE_OS::strdup (data);
+  ior_buffer.alloc ()->free (data);
+
+  ACE_OS::close (f_handle);
+
+  return 0;
+}
+
+// Parses the command line arguments and returns an error status.
+
+int
+Client_i::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:b:y:z:f:xk:");
+  int c;
+  int result;
+
+  while ((c = get_opts ()) != -1)
+    // ACE_DEBUG((LM_DEBUG,"bal =1%c",c
+    //             ));
+    switch (c)
+      {
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+      case 'n':  // loop count
+        this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'b':  // initial balance
+        this->initial_balance_ = (float) ACE_OS::atoi (get_opts.optarg);
+      break;
+      case 'y': // Name of one account holder.
+        this->account_holder_name1_ = ACE_OS::strdup (get_opts.optarg);
+        break;
+      case 'z': // Name of another account holder.
+        this->account_holder_name2_ = ACE_OS::strdup (get_opts.optarg);
+        break;
+      case 'k':  // ior provide on command line
+        this->ior_ = ACE_OS::strdup (get_opts.optarg);
+        break;
+      case 'f': // read the IOR from the file.
+        result = this->read_ior (get_opts.optarg);
+        if (result < 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "[CLIENT] Process/Thread Id : (%P/%t) Unable to read ior from %s : %p\n",
+                             get_opts.optarg),
+                            -1);
+        break;
+      case 'x':
+        this->shutdown_ = 1;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-b Initial Balance]"
+                           " [-y First Account Holder's Name]"
+                           " [-z Second Account Holder's Name]"
+                           " [-n loopcount]"
+                           " [-f ior-file]"
+                           " [-k ior]"
+                           " [-x]"
+                           "\n",
+                           this->argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+void
+Client_i::deposit (Bank::Account_ptr server,
+                   CORBA::Float deposit_amount,
+                   CORBA::Environment &)
+{
+  server->deposit (deposit_amount,
+                   this->env_);
+}
+
+void
+Client_i::withdraw (Bank::Account_ptr server,
+                    CORBA::Float withdrawl_amount)
+{
+  TAO_TRY
+    {
+      server->withdraw (withdrawl_amount,
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      Bank::Account::Overdraft_ptr except =
+        Bank::Account::Overdraft::_narrow
+        (TAO_TRY_ENV.exception ());
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "[CLIENT] Process/Thread Id : (%P/%t): %s",
+                  except->reason.in ()));
+    }
+  TAO_ENDTRY;
+}
+
+Bank::Account_ptr
+Client_i::open (const char *name,
+                CORBA::Float initial_balance,
+                CORBA::Environment &env)
+{
+  return this->accountmanager_server_->open (name,
+                                             initial_balance,
+                                             env);
+}
+
+void
+Client_i::close (Bank::Account_ptr account,
+                 CORBA::Environment &env)
+{
+  this->accountmanager_server_->close (account,
+                                       env);
+}
+
+
+// This method tests if opening an account with the same name returns
+// the same IOR.
+
+void
+Client_i::test_for_same_name (CORBA::Environment &)
+{
+  this->server1_ = this->open (this->account_holder_name1_,
+                               this->initial_balance_,
+                               this->env_);
+  this->server2_ = this->open (this->account_holder_name1_,
+                               this->initial_balance_,
+                               this->env_);
+  ACE_ASSERT (server1_->_is_equivalent ((CORBA::Object *) server2_.in ()) != 0);
+
+  this->close (server1_.in (),
+               this->env_);
+  this->close (server2_.in (),
+               this->env_);
+}
+
+// This method tests if opening an account with different names
+// returns a different IOR.
+void
+Client_i::test_for_different_name (CORBA::Environment &)
+{
+  this->server1_ = this->open (this->account_holder_name1_,
+                               this->initial_balance_,
+                               this->env_);
+  this->server2_ = this->open (this->account_holder_name2_,
+                               this->initial_balance_,
+                               this->env_);
+
+  ACE_ASSERT (server1_->_is_equivalent ((CORBA::Object *)server2_.in ()) == 0);
+
+  this->close (server1_.in (),
+               this->env_);
+  this->close (server2_.in (),
+               this->env_);
+}
+
+// This method tests the Overdraft exception.
+
+void
+Client_i::test_for_overdraft (CORBA::Environment &)
+{
+  this->server1_ = this->open (this->account_holder_name1_,
+                               this->initial_balance_,
+                               this->env_);
+  this->deposit (server1_.in (),
+                 100.00,
+                 this->env_);
+  this->withdraw (server1_.in (),
+                  server1_->balance(this->env_) + 20);
+  this->close (server1_.in (),
+               this->env_);
+}
+
+
+CORBA::Float
+Client_i::check_accounts (void)
+{
+  TAO_TRY
+    {
+      ACE_DEBUG((LM_DEBUG,
+                 "\n[CLIENT] Process/Thread Id : (%P/%t):Test for Accounts with same name\n"));
+      this->test_for_same_name (this->env_);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG((LM_DEBUG,
+                 "\n[CLIENT] Process/Thread Id : (%P/%t):Test for Accounts with different name\n"));
+      this->test_for_different_name (this->env_);
+      TAO_CHECK_ENV;
+
+      ACE_DEBUG((LM_DEBUG,
+                 "\n[CLIENT] Process/Thread Id : (%P/%t):Test for Overdraft Exception\n"));
+      this->test_for_overdraft (this->env_);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      if (this->env_.exception () != 0)
+        this->env_.print_exception ("From Client_i::check_accounts()");
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+// Execute client example code.
+
+int
+Client_i::run (void)
+{
+  this->check_accounts ();
+
+  TAO_TRY
+    {
+      if (this->shutdown_)
+        this->accountmanager_server_->shutdown (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "[CLIENT] Process/Thread Id : (%P/%t) Unable to shut down the server\n"));
+    }
+  TAO_ENDTRY;
+
+return 0;
+
+}
+
+Client_i::~Client_i (void)
+{
+  ACE_OS::free (this->ior_);
+}
+
+int
+Client_i::obtain_initial_references (void)
+{
+  TAO_TRY
+    {
+      // Initialize the naming services.
+      if (my_name_client_.init (orb_.in ()) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "[CLIENT] Process/Thread Id : (%P/%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                          -1);
+
+      CosNaming::Name account_manager_name (1);
+      account_manager_name.length (1);
+      account_manager_name[0].id =
+      CORBA::string_dup ("AccountManager");
+
+      CORBA::Object_var account_manager_obj =
+        my_name_client_->resolve (account_manager_name,
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->accountmanager_server_ =
+        Bank::AccountManager::_narrow (account_manager_obj.in (),
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Bank::obtain_initial_references");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+// This method uses the IOR if specified on the command line or in a
+// file, else it uses the Naming Service
+
+int
+Client_i::init (int argc, char **argv)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  TAO_TRY
+    {
+      // Retrieve the ORB.
+      this->orb_ = CORBA::ORB_init (this->argc_,
+                                    this->argv_,
+                                    0,
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Parse command line and verify parameters.
+      if (this->parse_args () == -1)
+        return -1;
+
+      if (this->ior_)
+        {
+          // An ior is specified for the client through a commandline
+          // option or a file.
+
+          CORBA::Object_var server_object =
+          this->orb_->string_to_object (this->ior_,
+                                        TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          if (CORBA::is_nil (server_object.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "invalid ior <%s>\n",
+                               this->ior_),
+                              -1);
+
+          this->accountmanager_server_ =
+            Bank::AccountManager::_narrow (server_object.in (),
+                                           TAO_TRY_ENV);
+
+          ACE_DEBUG ((LM_DEBUG,
+                      "[CLIENT] Process/Thread Id : (%P/%t) Using the IOR provided\n"));
+          TAO_CHECK_ENV;
+        }
+      else
+        { // No IOR specified. Use the Naming Service
+          ACE_DEBUG((LM_DEBUG,
+                     "[CLIENT] Process/Thread Id : (%P/%t) Using the Naming Service\n"));
+
+          this->obtain_initial_references ();
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Client_i::init");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/examples/Simple/bank/Client_i.h b/TAO/examples/Simple/bank/Client_i.h
new file mode 100644
index 00000000000..eb9bf8ce1ab
--- /dev/null
+++ b/TAO/examples/Simple/bank/Client_i.h
@@ -0,0 +1,132 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/Simple
+//
+// = FILENAME
+//    Client_i.h
+//
+// = DESCRIPTION
+//    This class implements a simple CORBA client that accesses a Bank
+//    server.
+//
+// = AUTHORS
+//    Vishal Kachroo <vishal@cs.wustl.edu>
+//
+// ============================================================================
+
+#include "BankC.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
+
+class Client_i
+{
+  // = TITLE
+  //     Simple Client implementation.
+  //
+  // = DESCRIPTION
+  //     Class wrapper for a client that gets the server IOR and then
+  //     makes several calls to the server before optionally shutting
+  //     it down.
+public:
+  // = Initialization and termination methods.
+  Client_i (void);
+  // Constructor.
+
+  ~Client_i (void);
+  // Destructor.
+
+  int run (void);
+  // Execute client example code.
+
+  int init (int argc, char *argv[]);
+  // Initialize the client communication endpoint with server.
+
+private:
+  int read_ior (char *filename);
+  // Function to read the server IOR from a file.
+
+  int parse_args (void);
+  // Parses the arguments passed on the command line.
+
+  CORBA::Float check_accounts (void);
+  // Checks the various operations of the account.
+
+  void deposit (Bank::Account_ptr server,
+                CORBA::Float deposit_amount,
+                CORBA::Environment &env);
+  // Deposit in the account.
+
+  void withdraw (Bank::Account_ptr server,
+                 CORBA::Float withdrawl_amount);
+  // Withdraw from the account.
+
+  Bank::Account_ptr open (const char *name,
+                          CORBA::Float initial_balance,
+                          CORBA::Environment &env);
+  // Open a new account with the given name and initial balance.
+
+
+  void close (Bank::Account_ptr account,
+              CORBA::Environment &env);
+  // Close a given Account.
+
+  void test_for_different_name (CORBA::Environment &env);
+  // Tests if accounts opened with different names return a different account reference.
+
+  void test_for_same_name (CORBA::Environment &env);
+  // Tests if accounts opened with the same name return the same object reference.
+
+  void test_for_overdraft (CORBA::Environment &env);
+  // Tests for the Overdraft Exception when the client tries to
+  // withdraw more money than the current balance.
+
+  int obtain_initial_references (void);
+  // To initialize the naming service and get a ptr to server.
+
+  int argc_;
+  // # of arguments on the command line.
+
+  char **argv_;
+  // arguments from command line.
+
+  char *ior_;
+  // IOR of the obj ref of the server.
+
+  u_int loop_count_;
+  // Number of times to invoke the <time> operation.
+
+  int shutdown_;
+  // Flag for server shutdown.
+
+  CORBA::Environment env_;
+  // Environment variable.
+
+  Bank::Account_var server1_;
+  // Account Server object ptr #1.
+
+  Bank::Account_var server2_;
+  // Account Serverobject ptr #2.
+
+  Bank::AccountManager_var accountmanager_server_;
+  // Account Manager server object ptr.
+
+  TAO_Naming_Client my_name_client_;
+  // An instance of the name client used for resolving the factory
+  // objects.
+
+  CORBA::ORB_var orb_;
+  // Remember our orb.
+
+  CORBA::Float initial_balance_;
+  // Filled up by a command line argument.
+
+  char *account_holder_name1_;
+  // Name of the first Account Holder.
+
+  char *account_holder_name2_;
+  // Name of the second Account Holder.
+
+};
diff --git a/TAO/examples/Simple/bank/Makefile b/TAO/examples/Simple/bank/Makefile
index f2f16f9a476..7b350eacd28 100644
--- a/TAO/examples/Simple/bank/Makefile
+++ b/TAO/examples/Simple/bank/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,46 +14,39 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC = BankC.cpp BankS.cpp
+IDL_SRC	= BankC.cpp BankS.cpp
 
 PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Account_i.cpp \
-        AccountManager_i.cpp \
-        Bank_Client_i.cpp\
-        ../Simple_util.cpp
+	client.cpp \
+	Client_i.cpp \
+	server.cpp \
+	Server_i.cpp \
+	Account_i.cpp \
+	AccountManager_i.cpp \
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                BankC.o \
-                BankS.o \
-                client.o \
-                ../Simple_util.o \
-                Bank_Client_i.o
+		BankC.o \
+		BankS.o \
+		Client_i.o \
+		client.o
 SIMPLE_SVR_OBJS = \
-                BankC.o \
-                BankS.o \
-                Account_i.o \
-                AccountManager_i.o \
-                ../Simple_util.o \
-                server.o
+		BankC.o \
+		BankS.o \
+		Account_i.o \
+		AccountManager_i.o \
+		Server_i.o \
+		server.o
 
+BIN = server \
+      client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server \
-       client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -65,7 +58,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -76,857 +69,24 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: BankS.cpp BankS.i BankS.h
 .PRECIOUS: BankS_T.cpp BankS_T.i BankS_T.h
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) BankC.* BankS.* BankS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf BankC.* BankS.* BankS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/BankC.o .obj/BankC.so .shobj/BankC.o .shobj/BankC.so: BankC.cpp BankC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- BankC.i BankS.h BankS_T.h BankS_T.i BankS_T.cpp BankS.i
-.obj/BankS.o .obj/BankS.so .shobj/BankS.o .shobj/BankS.so: BankS.cpp BankS.h BankC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Bank_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/ORB.i \
+.obj/BankC.o .obj/BankC.so .shobj/BankC.o .shobj/BankC.so: BankC.cpp BankC.h BankC.i BankS.h BankS_T.h BankS_T.i \
+ BankS_T.cpp BankS.i
+.obj/BankS.o .obj/BankS.so .shobj/BankS.o .shobj/BankS.so: BankS.cpp BankS.h BankC.h BankC.i BankS_T.h BankS_T.i \
+ BankS_T.cpp BankS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h BankC.h BankC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
@@ -935,25 +95,21 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp BankC.h BankC.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -967,6 +123,8 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -1005,226 +163,9 @@ realclean: clean
  $(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/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/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/ORB.i \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ Client_i.h BankC.h BankC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
@@ -1233,22 +174,21 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp AccountManager_i.h BankS.h BankC.h BankC.i \
- BankS_T.h BankS_T.i BankS_T.cpp BankS.i Account_i.h
-.obj/Account_i.o .obj/Account_i.so .shobj/Account_i.o .shobj/Account_i.so: Account_i.cpp Account_i.h BankS.h BankC.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/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1256,13 +196,14 @@ realclean: clean
  $(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/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/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -1312,221 +253,51 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i
-.obj/AccountManager_i.o .obj/AccountManager_i.so .shobj/AccountManager_i.o .shobj/AccountManager_i.so: AccountManager_i.cpp AccountManager_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ Account_i.h BankS.h BankC.h BankC.i BankS_T.h BankS_T.i BankS_T.cpp \
+ BankS.i AccountManager_i.h
+.obj/Server_i.o .obj/Server_i.so .shobj/Server_i.o .shobj/Server_i.so: Server_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1540,6 +311,7 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i Server_i.h \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1590,525 +362,52 @@ realclean: clean
  $(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/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/ORB.i \
- BankS.h BankC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i Account_i.h
-.obj/Bank_Client_i.o .obj/Bank_Client_i.so .shobj/Bank_Client_i.o .shobj/Bank_Client_i.so: Bank_Client_i.cpp Bank_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp BankC.h BankC.i
-.obj/Simple_util.o .obj/Simple_util.so .shobj/Simple_util.o .shobj/Simple_util.so: ../Simple_util.cpp ../Simple_util.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ Account_i.h BankS.h BankC.h BankC.i BankS_T.h BankS_T.i BankS_T.cpp \
+ BankS.i AccountManager_i.h
+.obj/Account_i.o .obj/Account_i.so .shobj/Account_i.o .shobj/Account_i.so: Account_i.cpp Account_i.h BankS.h BankC.h BankC.i \
+ BankS_T.h BankS_T.i BankS_T.cpp BankS.i
+.obj/AccountManager_i.o .obj/AccountManager_i.so .shobj/AccountManager_i.o .shobj/AccountManager_i.so: AccountManager_i.cpp AccountManager_i.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2122,6 +421,10 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -2168,236 +471,25 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i BankS.h \
+ BankC.h BankC.i BankS_T.h BankS_T.i BankS_T.cpp BankS.i Account_i.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simple/bank/README b/TAO/examples/Simple/bank/README
index f3d5b938aee..1863986f061 100644
--- a/TAO/examples/Simple/bank/README
+++ b/TAO/examples/Simple/bank/README
@@ -38,7 +38,6 @@ moment, only 2 levels of debugging are implemented, and more than 2 -d
 options are ignored.
 
 -o    This option creates an ior file for the server with the name ior_filename.
--n    Use naming service
 
 The file can be used by clients who wish to access the server directly using this ior file. This
 obviates the need for the client to use the naming service for getting the server ior. The client can
@@ -58,7 +57,7 @@ Options:
 
 -x    Tells the server to shutdown at the end of the test.
 
--n    Use naming service
+-n    no. of iterations
 
 -b    initial balance
 
diff --git a/TAO/examples/Simple/bank/Server_i.cpp b/TAO/examples/Simple/bank/Server_i.cpp
new file mode 100644
index 00000000000..8c09fe89b31
--- /dev/null
+++ b/TAO/examples/Simple/bank/Server_i.cpp
@@ -0,0 +1,201 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "Server_i.h"
+
+ACE_RCSID(Bank, Server_i, "$Id$")
+
+// Constructor.
+
+Server_i::Server_i (void)
+  : ior_output_file_ (0)
+{
+  // no-op.
+}
+
+// Destructor.
+
+Server_i::~Server_i (void)
+{
+  // no-op.
+}
+
+// Parse the command-line arguments and set options.
+
+int
+Server_i::parse_args (void)
+{
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+      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,
+                             "[SERVER] Process/Thread Id : (%P/%t)Unable to open %s for writing: %p\n",
+                             get_opts.optarg), -1);
+        break;
+      case '?':  // display help for use of the server.
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "[SERVER] Process/Thread Id : (%P/%t)"
+                           "usage:  %s"
+                           " [-d]"
+                           " [-o] <ior_output_file>"
+                           "\n",
+                           argv_ [0]),
+                          1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+// Initialisation of Naming Service and registering the AccountManager Object
+
+int
+Server_i::init_naming_service (CORBA::Environment &)
+{
+  TAO_TRY
+    {
+      CORBA::ORB_var orb = this->orb_manager_.orb ();
+      this->orb_manager_.init_child_poa (this->argc_,
+					 this->argv_,
+					 "my_child_poa",
+					 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      PortableServer::POA_ptr child_poa
+	= this->orb_manager_.child_poa ();
+
+      int result = this->my_name_server_.init (orb.in (),
+					       child_poa);
+      if (result == -1)
+	{
+	  return result;
+	}
+
+      // Generate an IOR for the AccountManager Object and register it
+      // with POA.
+
+      CORBA::String_var str =
+	this->orb_manager_.activate_under_child_poa ("AccountManager",
+						     this->account_manager_impl_,
+						     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // @@ Converting the stringified IOR to an IOR.
+
+      Bank::AccountManager_var account_manager =
+	Bank::AccountManager::_narrow (orb->string_to_object (str,TAO_TRY_ENV));
+
+      TAO_CHECK_ENV;
+
+      // Pass the Account Manager an ORB reference to use.
+      account_manager_impl_->orb (orb.in ());
+
+      // Pass the Account Manager a POA reference to use.
+      account_manager_impl_->poa (child_poa);
+
+      account_manager_impl_->set_orb_manager (&orb_manager_);
+
+      // Convert an Account Manager reference to a string.
+      CORBA::String_var objref =
+	orb->object_to_string (account_manager.in (),
+			       TAO_TRY_ENV);
+
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      // Print the Account Manager IOR on the console.
+      ACE_DEBUG ((LM_DEBUG,
+		  "[SERVER] Process/Thread Id : (%P/%t) The IOR is: <%s>\n",
+		  (const char *) objref));
+
+      // Print the Account Manager IOR to a file.
+      if (this->ior_output_file_)
+	{
+	  ACE_OS::fprintf (this->ior_output_file_,
+			   "%s",
+			   account_manager.in ());
+	  ACE_OS::fclose (this->ior_output_file_);
+	}
+
+      // Bind the Account Manager with the Naming Service.
+      CosNaming::Name account_manager_name (1);
+      account_manager_name.length (1);
+      account_manager_name[0].id = CORBA::string_dup ("AccountManager");
+
+      this->my_name_server_->rebind (account_manager_name,
+				     account_manager.in (),
+				     TAO_TRY_ENV);
+
+      TAO_CHECK_ENV;
+
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception:");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+// Initialize the server.
+
+int
+Server_i::init (int argc,
+		char *argv[],
+		CORBA::Environment &env)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  // 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,
+                                         argv,
+                                         "child_poa",
+                                         env) == -1)
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     "%p\n",
+                     "init_child_poa"),
+                     -1);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  int result = this->parse_args ();
+
+  if (result != 0)
+    return result;
+
+  // Now create the implementation for the Account Manager.
+  ACE_NEW_RETURN (this->account_manager_impl_,
+		  AccountManager_i,
+		  -1);
+
+  // Register the above implementation with the Naming Service.
+  if (this->init_naming_service (env) == -1)
+    return -1;
+
+  return 0;
+}
+
+int
+Server_i::run (CORBA::Environment &env)
+{
+  // Run the main event loop for the ORB.
+  if (this->orb_manager_.run (env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "[SERVER] Process/Thread Id : (%P/%t) Server_i::run"),
+                      -1);
+  return 0;
+}
diff --git a/TAO/examples/Simple/bank/Server_i.h b/TAO/examples/Simple/bank/Server_i.h
new file mode 100644
index 00000000000..e195f184c2c
--- /dev/null
+++ b/TAO/examples/Simple/bank/Server_i.h
@@ -0,0 +1,91 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/Simple
+//
+// = FILENAME
+//    Server_i.h
+//
+// = DESCRIPTION
+//    A CORBA server that initializes the AccountManager server
+//    implementation and the ORB.
+//
+// = AUTHORS
+//    Vishal Kachroo <vishal@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef SERVER_I_H
+#define SERVER_I_H
+
+#include "ace/Get_Opt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Log_Msg.h"
+#include "tao/TAO.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
+#include "Account_i.h"
+#include "AccountManager_i.h"
+
+class Server_i
+{
+  // = TITLE
+  //   CORBA Server implementation.
+public:
+  // = Initialization and termination methods.
+  Server_i (void);
+  // Constructor.
+
+  ~Server_i (void);
+  // Destructor.
+
+  int init (int argc,
+            char *argv[],
+            CORBA::Environment &env);
+  // Initialize the Server state - parsing arguments and waiting.
+
+  int run (CORBA::Environment &env);
+  // Run the orb.
+
+private:
+  Account_i servant_;
+  // Servant for the Account interface.
+
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  TAO_ORB_Manager orb_manager_;
+  // The ORB manager.
+
+  FILE *ior_output_file_;
+  // File where the IOR of the server object is stored.
+
+  int init_naming_service (CORBA::Environment &env);
+  // Initialises the name server and registers the <AccountManager>
+  // objects with it.
+
+  TAO_Naming_Server my_name_server_;
+  // An instance of the name server used for registering the
+  // <AccountManager> objects.
+
+  AccountManager_i *account_manager_impl_;
+  // Implementation of the <AccountManager> object.
+
+  CosNaming::NamingContext_var naming_context_;
+  // Naming context for the Naming Service.
+
+  int argc_;
+  // Number of command line arguments.
+
+  char **argv_;
+  // The command line arguments.
+};
+
+#endif /* SERVER_I_H */
diff --git a/TAO/examples/Simple/bank/bank.dsw b/TAO/examples/Simple/bank/bank.dsw
deleted file mode 100644
index 3f8e63ab141..00000000000
--- a/TAO/examples/Simple/bank/bank.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Simple Bank Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Simple Bank Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/examples/Simple/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp
index 0f426992f06..eddf8018816 100644
--- a/TAO/examples/Simple/bank/client.cpp
+++ b/TAO/examples/Simple/bank/client.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-# include "Bank_Client_i.h"
+#include "Client_i.h"
 
-// The client program for the application.
+ACE_RCSID(Time, client, "$Id$")
+
+// This function runs the Bank client test.
 
 int
-main (int argc, char **argv)
+main (int argc, char *argv[])
 {
-  Bank_Client_i client;
-  
+  Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nBank client\n\n"));
+              "[CLIENT] Process/Thread Id : (%P/%t) Bank client\n"));
 
-  if (client.run ("Bank",argc, argv) == -1)
-    return -1; 
+  if (client.init (argc, argv) == -1)
+    return -1;
   else
-    return 0;
-   
+    return client.run ();
 }
-
-                                 
diff --git a/TAO/examples/Simple/bank/run_test.pl b/TAO/examples/Simple/bank/run_test.pl
index 7fcb67ec476..e567d989d86 100755
--- a/TAO/examples/Simple/bank/run_test.pl
+++ b/TAO/examples/Simple/bank/run_test.pl
@@ -1,24 +1,23 @@
+#$Id $
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 require ACEutils;
 require Process;
 
-$iorfile = "grid.ior";
-
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile ");
 
-ACE::waitforfile ($iorfile);
+$SV = Process::Create ("server$Process::EXE_EXT", " ");
 
-$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile");
+sleep(10);
+$status  = system ("client$Process::EXE_EXT  -x -b 100 -y Vishal -z Kachroo");
+#sleep($ACE::sleeptime);
 
 $SV->Kill (); $SV->Wait ();
 
-unlink $iorfile;
-
 exit $status;
+
+
+
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index b72ba205331..e664e0402be 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -1,50 +1,45 @@
 // $Id$
-#include "../Simple_util.h"
-#include "AccountManager_i.h"
 
-// This is the main driver program for the time and date server.
+#include "Server_i.h"
+
+ACE_RCSID(Time, server, "$Id$")
+
+// This is the main driver program for the Bank server.
 
 int
 main (int argc, char *argv[])
 {
-  Server<AccountManager_i> server;
+  Server_i server;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n\tBank server\n\n"));
+              "[SERVER] Process/Thread Id : (%P/%t) Bank server\n"));
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      if (server.init ("Bank",
-                       argc,
-                       argv,
-                       ACE_TRY_ENV) == -1)
-        return 1;
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
+        {
+	  TAO_CHECK_ENV;
+	  return 1;
+	}
       else
         {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Server<AccountManager_i>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Server<Account_Manager_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/examples/Simple/chat/Makefile b/TAO/examples/Simple/chat/Makefile
index 2a5c566cb80..5e3c351fdbb 100644
--- a/TAO/examples/Simple/chat/Makefile
+++ b/TAO/examples/Simple/chat/Makefile
@@ -15,8 +15,6 @@ IDL_SRC	= ReceiverC.cpp ReceiverS.cpp BroadcasterC.cpp BroadcasterS.cpp
 PROG_SRCS = \
 	Receiver_i.cpp \
 	Broadcaster_i.cpp \
-	Client_i.cpp \
-	Server_i.cpp \
 	client.cpp \
 	server.cpp
 
@@ -66,9 +64,12 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS +=  -L$(TAO_ROOT)/tao
 CPPFLAGS +=
 
-$(foreach ext, $(IDL_EXT), Broadcaster$(ext)): Receiver.idl
-
-.PRECIOUS: $(foreach file, Broadcaster Receiver, $(foreach ext, $(IDL_EXT), $(file)$(ext))))
+.PRECIOUS: ReceiverC.cpp ReceiverC.i ReceiverC.h
+.PRECIOUS: ReceiverS.cpp  ReceiverS.i ReceiverS.h
+.PRECIOUS: ReceiverS_T.cpp ReceiverS_T.i ReceiverS_T.h
+.PRECIOUS: BroadcasterC.cpp BroadcasterC.i BroadcasterC.h
+.PRECIOUS: BroadcasterS.cpp  BroadcasterS.i BroadcasterS.h
+.PRECIOUS: BroadcasterS_T.cpp BroadcasterS_T.i BroadcasterS_T.h
 
 server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -77,2821 +78,40 @@ client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) ReceiverC.* ReceiverS.* ReceiverS_T.* BroadcasterC.* BroadcasterS.* BroadcasterS_T.*
+	-/bin/rm -rf ReceiverC.* ReceiverS.* ReceiverS_T.* BroadcasterC.* BroadcasterS.* BroadcasterS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \
- ReceiverS.i
-.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
-.obj/BroadcasterC.o .obj/BroadcasterC.so .shobj/BroadcasterC.o .shobj/BroadcasterC.so: BroadcasterC.cpp BroadcasterC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.h ReceiverC.i BroadcasterC.i BroadcasterS.h ReceiverS.h \
- ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i
+.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h ReceiverC.i ReceiverS.h \
+ ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h ReceiverC.i \
+ ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+.obj/BroadcasterC.o .obj/BroadcasterC.so .shobj/BroadcasterC.o .shobj/BroadcasterC.so: BroadcasterC.cpp BroadcasterC.h ReceiverC.h \
+ ReceiverC.i BroadcasterC.i BroadcasterS.h ReceiverS.h ReceiverS_T.h \
+ ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i BroadcasterS_T.h \
+ BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i
 .obj/BroadcasterS.o .obj/BroadcasterS.so .shobj/BroadcasterS.o .shobj/BroadcasterS.so: BroadcasterS.cpp BroadcasterS.h ReceiverS.h \
- ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
- BroadcasterS_T.cpp BroadcasterS.i
+ ReceiverC.h ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp \
+ ReceiverS.i BroadcasterC.h BroadcasterC.i BroadcasterS_T.h \
+ BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i
 .obj/Receiver_i.o .obj/Receiver_i.so .shobj/Receiver_i.o .shobj/Receiver_i.so: Receiver_i.cpp Receiver_i.h ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
 .obj/Broadcaster_i.o .obj/Broadcaster_i.so .shobj/Broadcaster_i.o .shobj/Broadcaster_i.so: Broadcaster_i.cpp Broadcaster_i.h BroadcasterS.h \
- ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
- BroadcasterS_T.cpp BroadcasterS.i \
+ ReceiverS.h ReceiverC.h ReceiverC.i ReceiverS_T.h ReceiverS_T.i \
+ ReceiverS_T.cpp ReceiverS.i BroadcasterC.h BroadcasterC.i \
+ BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i \
  $(TAO_ROOT)/tao/TAO.h
-.obj/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.cpp Client_i.h Receiver_i.h ReceiverS.h \
- ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/Server_i.o .obj/Server_i.so .shobj/Server_i.o .shobj/Server_i.so: Server_i.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \
- ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
- BroadcasterS_T.cpp BroadcasterS.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h Receiver_i.h ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
  BroadcasterC.h BroadcasterC.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/TAO.h
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h Broadcaster_i.h BroadcasterS.h \
- ReceiverS.h ReceiverC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReceiverC.i ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i \
- BroadcasterC.h BroadcasterC.i BroadcasterS_T.h BroadcasterS_T.i \
- BroadcasterS_T.cpp BroadcasterS.i \
+ ReceiverS.h ReceiverC.h ReceiverC.i ReceiverS_T.h ReceiverS_T.i \
+ ReceiverS_T.cpp ReceiverS.i BroadcasterC.h BroadcasterC.i \
+ BroadcasterS_T.h BroadcasterS_T.i BroadcasterS_T.cpp BroadcasterS.i \
  $(TAO_ROOT)/tao/TAO.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simple/echo/Echo_Client_i.cpp b/TAO/examples/Simple/echo/Echo_Client_i.cpp
index b931e85fdfd..67e3e1c6b7a 100644
--- a/TAO/examples/Simple/echo/Echo_Client_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_Client_i.cpp
@@ -27,9 +27,7 @@ Echo_Client_i::run (char *name,
   if (client.init (name,argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV 
     {
       while (1)
         {
@@ -59,11 +57,9 @@ Echo_Client_i::run (char *name,
     }
   ACE_CATCHANY 
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"\n Exception in RMI");
-      return -1;
+      ACE_TRY_ENV.print_exception ("\n Exception in RMI");
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index e73f7525206..7b9cf2e56c3 100644
--- a/TAO/examples/Simple/echo/Echo_i.cpp
+++ b/TAO/examples/Simple/echo/Echo_i.cpp
@@ -62,8 +62,10 @@ Echo_i::echo_string (const char *mesg,
   // raised.
 
   if (str.in () == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+    ACE_TRY_ENV.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
+  //if (str.in () == 0)
+  //ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO),0);
   // Got thru! now, make a deep copy of the mesg string and send it
   // back to the client.
 
diff --git a/TAO/examples/Simple/echo/Makefile b/TAO/examples/Simple/echo/Makefile
index d0d0195a86e..95b9f155b1d 100644
--- a/TAO/examples/Simple/echo/Makefile
+++ b/TAO/examples/Simple/echo/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,44 +14,38 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO -lorbsvcs
 
-IDL_SRC = EchoC.cpp EchoS.cpp
+IDL_SRC	= EchoC.cpp EchoS.cpp
 
 PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Echo_i.cpp \
+	client.cpp \
+	server.cpp \
+	Echo_i.cpp \
         Echo_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                EchoC.o \
-                EchoS.o \
+		EchoC.o \
+		EchoS.o \
                 Echo_Client_i.o \
-                ../Simple_util.o \
-                client.o
+        	../Simple_util.o \
+		client.o
 SIMPLE_SVR_OBJS = \
-                EchoC.o \
-                EchoS.o \
-                Echo_i.o \
-                ../Simple_util.o \
-                server.o
+		EchoC.o \
+		EchoS.o \
+		Echo_i.o \
+        	../Simple_util.o \
+		server.o
 
+BIN = server \
+      client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server \
-       client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -63,7 +57,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS +=  -L$(TAO_ROOT)/tao -L$(ACE_ROOT)/ace
@@ -73,26 +67,33 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: EchoS.cpp EchoS.i EchoS.h
 .PRECIOUS: EchoS_T.cpp EchoS_T.i EchoS_T.h
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) -rf EchoC.* EchoS.* EchoS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf EchoC.* EchoS.* EchoS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/EchoC.o .obj/EchoC.so .shobj/EchoC.o .shobj/EchoC.so: EchoC.cpp EchoC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/EchoC.o .obj/EchoC.so .shobj/EchoC.o .shobj/EchoC.so: EchoC.cpp EchoC.h EchoC.i EchoS.h EchoS_T.h EchoS_T.i \
+ EchoS_T.cpp EchoS.i
+.obj/EchoS.o .obj/EchoS.so .shobj/EchoS.o .shobj/EchoS.so: EchoS.cpp EchoS.h EchoC.h EchoC.i EchoS_T.h EchoS_T.i \
+ EchoS_T.cpp EchoS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Echo_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -100,16 +101,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -156,64 +153,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -224,223 +199,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- EchoC.i EchoS.h EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
-.obj/EchoS.o .obj/EchoS.so .shobj/EchoS.o .shobj/EchoS.so: EchoS.cpp EchoS.h EchoC.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/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/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 \
- $(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.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/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 \
@@ -467,365 +230,28 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Echo_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -847,8 +273,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -865,65 +294,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -932,12 +335,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -951,6 +355,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1010,32 +417,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1062,68 +494,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1145,8 +537,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1163,65 +558,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1230,22 +599,32 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  ../Simple_util.cpp Echo_i.h EchoS.h EchoC.h EchoC.i EchoS_T.h \
  EchoS_T.i EchoS_T.cpp EchoS.i
-.obj/Echo_i.o .obj/Echo_i.so .shobj/Echo_i.o .shobj/Echo_i.so: Echo_i.cpp Echo_i.h EchoS.h EchoC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Echo_i.o .obj/Echo_i.so .shobj/Echo_i.o .shobj/Echo_i.so: Echo_i.cpp Echo_i.h EchoS.h EchoC.h EchoC.i EchoS_T.h \
+ EchoS_T.i EchoS_T.cpp EchoS.i
+.obj/Echo_Client_i.o .obj/Echo_Client_i.so .shobj/Echo_Client_i.o .shobj/Echo_Client_i.so: Echo_Client_i.cpp Echo_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1253,16 +632,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -1309,64 +684,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -1377,242 +730,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- EchoC.i EchoS_T.h EchoS_T.i EchoS_T.cpp EchoS.i
-.obj/Echo_Client_i.o .obj/Echo_Client_i.so .shobj/Echo_Client_i.o .shobj/Echo_Client_i.so: Echo_Client_i.cpp Echo_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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 \
@@ -1639,68 +761,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1722,8 +804,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1740,65 +825,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1807,12 +866,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1826,6 +886,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1885,32 +948,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1937,68 +1025,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2020,8 +1068,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2038,65 +1089,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -2105,12 +1130,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
diff --git a/TAO/examples/Simple/echo/README b/TAO/examples/Simple/echo/README
index 019118524b4..71e990e537d 100644
--- a/TAO/examples/Simple/echo/README
+++ b/TAO/examples/Simple/echo/README
@@ -7,7 +7,7 @@ shuts down the server.
 server:
 -------
 
-server [-d] [-o <ior_output_file>] [-n]
+server [-d] [-o <ior_output_file>] [-s]
 
 Options:
 -------
@@ -15,7 +15,7 @@ Options:
 -o    Outputs the ior to the file
       The ior is the reference using which the client can interact with
       the target server object.
--n    Use the naming service
+-s    Use the naming service
 
 When the server is started, you should see as the first line of output
 something that looks like
@@ -34,22 +34,21 @@ options are ignored.
 client:
 -------
 
-client [-d] [-x] [-f <Server_ior_file>] [-k ior] [-n naming service]
+client [-d] [-x] [-f <Server_ior_file>] [-n iterations] [-k ior] [-s]
 
 Options:
 -------
 -d    Debug flag
 -x    Tells the server to shutdown at the end of the test.
 -f    Reads the server ior from the file
--k    IOR or The IOR can also be given in the format like file://[file.ior]
-      with the full path
-
--n    Use the naming service
+-n    no. of iterations
+-k    IOR
+-s    Use the naming service
 
 You can either cut and paste the IOR from the server to the client
 (with the -k option), have the client read the IOR from a file using
 the -f option (this file is produced using the -o option of the
-server), or use the naming service (with the -n option).
+server), or use the naming service (with the -s option).
 
 run_test.pl:
 ------------
diff --git a/TAO/examples/Simple/echo/client.dsp b/TAO/examples/Simple/echo/client.dsp
index 04092c8e6e7..05520c61811 100644
--- a/TAO/examples/Simple/echo/client.dsp
+++ b/TAO/examples/Simple/echo/client.dsp
@@ -93,7 +93,7 @@ SOURCE=.\client.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Echo_Client_i.cpp

+SOURCE=.\Client_i.cpp

 # End Source File

 # Begin Source File

 

@@ -103,17 +103,13 @@ SOURCE=.\EchoC.cpp
 

 SOURCE=.\EchoS.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=..\Simple_util.cpp

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\Echo_Client_i.h

+SOURCE=.\Client_i.h

 # End Source File

 # Begin Source File

 

@@ -127,10 +123,6 @@ SOURCE=.\EchoS.h
 

 SOURCE=.\EchoS_T.h

 # End Source File

-# Begin Source File

-

-SOURCE=..\Simple_util.h

-# End Source File

 # End Group

 # Begin Group "IDL Files"

 

@@ -141,7 +133,6 @@ SOURCE=.\Echo.idl
 

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

 

-USERDEP__ECHO_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Echo.idl

 InputName=Echo

diff --git a/TAO/examples/Simple/echo/run_test.pl b/TAO/examples/Simple/echo/run_test.pl
index bc8a10e0fe3..82ef2b5e244 100755
--- a/TAO/examples/Simple/echo/run_test.pl
+++ b/TAO/examples/Simple/echo/run_test.pl
@@ -2,7 +2,7 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
+#$Id$
 # -*- perl -*-
 
 use lib "../../../../bin";
diff --git a/TAO/examples/Simple/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index e8100524fae..8bf82088ef7 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -12,9 +12,7 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tEcho server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       if (server.init ("Echo",
                        argc,
diff --git a/TAO/examples/Simple/echo/server.dsp b/TAO/examples/Simple/echo/server.dsp
index 152d49b40fd..2cf91d55070 100644
--- a/TAO/examples/Simple/echo/server.dsp
+++ b/TAO/examples/Simple/echo/server.dsp
@@ -103,6 +103,10 @@ SOURCE=.\EchoS.cpp
 

 SOURCE=.\server.cpp

 # End Source File

+# Begin Source File

+

+SOURCE=.\Server_i.cpp

+# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -123,6 +127,10 @@ SOURCE=.\EchoS.h
 

 SOURCE=.\EchoS_T.h

 # End Source File

+# Begin Source File

+

+SOURCE=.\Server_i.h

+# End Source File

 # End Group

 # Begin Group "IDL Files"

 

@@ -133,7 +141,6 @@ SOURCE=.\Echo.idl
 

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

 

-USERDEP__ECHO_="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Echo.idl

 InputName=Echo

diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index 9a817273e42..2f9d290b0ee 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -29,7 +29,7 @@ Grid_Client_i::parse_args (int argc,
                            char *argv[])
 {
   // Parses some of the options that are specific to this example
-  ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:p:q:v:");
+  ACE_Get_Opt get_opts (argc, argv, "w:h:p:q:v:");
 
   int c = 0;
   while ((c = get_opts ()) != -1)
@@ -69,18 +69,16 @@ Grid_Client_i::run (char *name,
                     char *argv[])
 {
   // Initialize the client.
-  if (client.init (name, argc, argv) == -1)
+  if (client.init (name,argc, argv) == -1)
     return -1;
 
   if (this->parse_args (argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       // Make the Grid.
-
+      
       Grid_ptr grid = client->make_grid (width_,
                                          height_,
                                          ACE_TRY_ENV);
@@ -105,25 +103,23 @@ Grid_Client_i::run (char *name,
       ACE_TRY_CHECK;
 
       ACE_ASSERT (ret_val == value_);
-
+  
       if (client.shutdown () == 1)
         client->shutdown (ACE_TRY_ENV);
       ACE_UNUSED_ARG (ret_val);
     }
   ACE_CATCH (CORBA::UserException, range_ex)
     {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set grid");
+      ACE_UNUSED_ARG (range_ex);
+      ACE_TRY_ENV.print_exception ("\tFrom get and set grid");
       return -1;
     }
   ACE_CATCH (CORBA::SystemException, memex)
     {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make grid as Memory exhausted");
-      return -1;
+      ACE_UNUSED_ARG (memex);
+      ACE_TRY_ENV.print_exception (" Cannot make grid as Memory exhausted");
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   return 0;
 }
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.h b/TAO/examples/Simple/grid/Grid_Client_i.h
index 75b91d88e17..e39aa3c948c 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.h
+++ b/TAO/examples/Simple/grid/Grid_Client_i.h
@@ -4,15 +4,16 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/examples/Simple/grid
+//    TAO/tests/Simple/grid
 //
 // = FILENAME
 //    Grid_Client_i.h
 //
 // = DESCRIPTION
-//    This class implements the interface calls for RMI.
+//    This class implements the  interface calls for RMI.
 //
 // = AUTHOR
+//    
 //   Balachandran Natarajan <bala@cs.wustl.edu>
 //    
 // ============================================================================
@@ -39,12 +40,11 @@ public:
   virtual ~Grid_Client_i (void);
   // Destructor
 
-  virtual int run (char *, int, char *[]);
+  virtual int run (char *,int, char *[]);
   // Execute the methods.
 
-  virtual int parse_args (int argc, char *argv[]);
-  // Parses the command line arguments.
-
+  virtual int parse_args (int argc, char**argv);
+  // Parses the command line arguments
 private:
   Client<Grid_Factory, Grid_Factory_var> client;
   // Instantiate the client object.
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 364c63fa682..d52162cc2a3 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -21,21 +21,16 @@ Grid_i::Grid_i (CORBA::Short x,
   : width_ (x),
     height_ (y)
 {
-  ACE_NEW_THROW_EX (array_,
-                    CORBA::Long *[y],
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
+  ACE_NEW_THROW (array_,
+	         CORBA::Long *[y],
+                 CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Allocate memory for the matrix.
 
   for (int ctr = 0; ctr < y; ctr++)
-    {
-      ACE_NEW_THROW_EX (array_[ctr],
-                        CORBA::Long[x],
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-
+    ACE_NEW_THROW (array_[ctr],
+	           CORBA::Long[x],
+                   CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 }
 
 // Default destructor.
@@ -47,7 +42,7 @@ Grid_i::~Grid_i (void)
 
 //  Set a value in the grid.
 
-void
+void 
 Grid_i::set (CORBA::Short x,
 	     CORBA::Short y,
 	     CORBA::Long value,
@@ -58,7 +53,7 @@ Grid_i::set (CORBA::Short x,
       || x >= width_
       || y >= height_)
     ACE_THROW (Grid::RANGE_ERROR ());
-  else
+  else 
     array_[x][y] = value;
 }
 
@@ -74,32 +69,32 @@ Grid_i::get (CORBA::Short x,
       || x >= width_
       || y >= height_)
     ACE_THROW_RETURN (Grid::RANGE_ERROR (), -1);
-  else
+  else 
     return array_[x][y];
 }
 
 // Access methods.
 
-CORBA::Short
+CORBA::Short 
 Grid_i::width (CORBA::Environment &A)
 {
   return this->width_;
 }
 
-CORBA::Short
+CORBA::Short 
 Grid_i::height (CORBA::Environment &)
 {
   return this->height_;
 }
 
-void
+void 
 Grid_i::width (CORBA::Short x,
 	       CORBA::Environment &)
 {
   this->width_ = x;
 }
 
-void
+void 
 Grid_i::height (CORBA::Short y,
 		CORBA::Environment &)
 {
@@ -108,7 +103,7 @@ Grid_i::height (CORBA::Short y,
 
 // Destroy the grid
 
-void
+void 
 Grid_i::destroy (CORBA::Environment &)
 {
   // Delete the array.
@@ -133,7 +128,7 @@ Grid_Factory_i::orb (CORBA::ORB_ptr o)
 
 // Shutdown.
 
-void
+void 
 Grid_Factory_i::shutdown (CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -167,30 +162,30 @@ Grid_Factory_i::~Grid_Factory_i (void)
 
 // Make a <Grid>.
 
-Grid_ptr
+Grid_ptr 
 Grid_Factory_i::make_grid (CORBA::Short width,
                            CORBA::Short height,
                            CORBA::Environment &ACE_TRY_ENV)
 {
   Grid_i *grid_ptr = 0;
-
+ 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Making a new Grid\n"));
 
   // Set a default value for width.
   if (width <= 0)
     width = Grid_Factory::DEFAULT_WIDTH;
-
+ 
   // Set a default value for height.
   if (height <= 0)
     height = Grid_Factory::DEFAULT_HEIGHT;
 
   // This attempts to create a new Grid_i and throws an exception and
   // returns a null value if it fails
-  ACE_NEW_THROW_EX (grid_ptr,
-                    Grid_i (width, height, ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (Grid::_nil ());
+  ACE_NEW_THROW_RETURN (grid_ptr,
+			Grid_i (width, height, ACE_TRY_ENV),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			Grid::_nil ());
 
   // Register the Grid pointer.
   return grid_ptr->_this (ACE_TRY_ENV);
diff --git a/TAO/examples/Simple/grid/Grid_i.h b/TAO/examples/Simple/grid/Grid_i.h
index d905e6e60cc..34da693c472 100644
--- a/TAO/examples/Simple/grid/Grid_i.h
+++ b/TAO/examples/Simple/grid/Grid_i.h
@@ -4,7 +4,7 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/examples/Simple/grid
+//    TAO/tests/Simple/grid
 //
 // = FILENAME
 //    Grid_i.h
diff --git a/TAO/examples/Simple/grid/Makefile b/TAO/examples/Simple/grid/Makefile
index bd281457e17..49cea104675 100644
--- a/TAO/examples/Simple/grid/Makefile
+++ b/TAO/examples/Simple/grid/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,44 +14,38 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC = GridC.cpp GridS.cpp
+IDL_SRC	= GridC.cpp GridS.cpp
 
 PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Grid_i.cpp \
+	client.cpp \
+	server.cpp \
+	Grid_i.cpp \
         Grid_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                GridC.o \
-                GridS.o \
-                client.o \
+		GridC.o \
+		GridS.o \
+		client.o \
                 ../Simple_util.o \
-                Grid_Client_i.o
+                Grid_Client_i.o 
 SIMPLE_SVR_OBJS = \
-                GridC.o \
-                GridS.o \
-                Grid_i.o \
-                server.o \
+		GridC.o \
+		GridS.o \
+		Grid_i.o \
+		server.o \
                 ../Simple_util.o
 
+BIN = server \
+      client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server \
-       client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -63,7 +57,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -74,26 +68,33 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: GridS.cpp GridS.i GridS.h
 .PRECIOUS: GridS_T.cpp GridS_T.i GridS_T.h
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) GridC.* GridS.* GridS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf GridC.* GridS.* GridS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/GridC.o .obj/GridC.so .shobj/GridC.o .shobj/GridC.so: GridC.cpp GridC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/GridC.o .obj/GridC.so .shobj/GridC.o .shobj/GridC.so: GridC.cpp GridC.h GridC.i GridS.h GridS_T.h GridS_T.i \
+ GridS_T.cpp GridS.i
+.obj/GridS.o .obj/GridS.so .shobj/GridS.o .shobj/GridS.so: GridS.cpp GridS.h GridC.h GridC.i GridS_T.h GridS_T.i \
+ GridS_T.cpp GridS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Grid_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -101,16 +102,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -157,64 +154,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -225,223 +200,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- GridC.i GridS.h GridS_T.h GridS_T.i GridS_T.cpp GridS.i
-.obj/GridS.o .obj/GridS.so .shobj/GridS.o .shobj/GridS.so: GridS.cpp GridS.h GridC.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/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/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 \
- $(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.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/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 \
@@ -468,365 +231,28 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Grid_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -848,8 +274,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -866,65 +295,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -933,12 +336,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -952,6 +356,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1011,32 +418,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1063,68 +495,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1146,8 +538,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1164,65 +559,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1231,22 +600,32 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  ../Simple_util.cpp Grid_i.h GridS.h GridC.h GridC.i GridS_T.h \
  GridS_T.i GridS_T.cpp GridS.i
-.obj/Grid_i.o .obj/Grid_i.so .shobj/Grid_i.o .shobj/Grid_i.so: Grid_i.cpp Grid_i.h GridS.h GridC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Grid_i.o .obj/Grid_i.so .shobj/Grid_i.o .shobj/Grid_i.so: Grid_i.cpp Grid_i.h GridS.h GridC.h GridC.i GridS_T.h \
+ GridS_T.i GridS_T.cpp GridS.i
+.obj/Grid_Client_i.o .obj/Grid_Client_i.so .shobj/Grid_Client_i.o .shobj/Grid_Client_i.so: Grid_Client_i.cpp Grid_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1254,16 +633,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -1310,64 +685,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -1378,242 +731,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- GridC.i GridS_T.h GridS_T.i GridS_T.cpp GridS.i
-.obj/Grid_Client_i.o .obj/Grid_Client_i.so .shobj/Grid_Client_i.o .shobj/Grid_Client_i.so: Grid_Client_i.cpp Grid_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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 \
@@ -1640,68 +762,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1723,8 +805,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1741,65 +826,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1808,12 +867,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1827,6 +887,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1886,32 +949,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1938,68 +1026,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2021,8 +1069,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2039,65 +1090,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -2106,12 +1131,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
diff --git a/TAO/examples/Simple/grid/README b/TAO/examples/Simple/grid/README
deleted file mode 100644
index b27e153aa07..00000000000
--- a/TAO/examples/Simple/grid/README
+++ /dev/null
@@ -1,74 +0,0 @@
-$Id$
-
-This is a simple CORBA example that makes a grid of user defined size.
-The grid can be imagined as a matrix with cells that can hold values.
-
-This example  creates a simple grid server with user defined sizes.
-If the user does not define the size a default grid is created.  The user
-can give a value to be held in the grid. 
-
-
-server:
--------
-
-server [-d] [-o <ior_output_file>] [-n]
-
-Options:
--------
--d    Debug flag (It is additive more -d flags will give debugging).
--o    Outputs the ior to the file
-      The ior is the reference using which the client can interact with
-      the target server object.
--n    Use the naming service
-
-When the server is started, you should see as the first line of output
-something that looks like
-
-	iiop:1.0//danzon.cs.wustl.edu:10015/P35ad159600081a38/child_poa/server
-	(-ORBobjrefstyle url)
-or
-	IOR:000000000000001649444c3a43756269745...
-	(-ORBobjrefstyle ior)
-
-Using -d turns on debugging messages.  This option is additive, i.e.,
-the more -d options provided, the more debugging you can get.  At the
-moment, only 2 levels of debugging are implemented, and more than 2 -d
-options are ignored.
-
-client:
--------
-
-client [-d] [-x] [-f <Server_ior_file>] [-n iterations] [-k ior] [-n] [-p] 
-       [-q] [-w] [-h] [-v]
-
-Options:
--------
--d    Debug flag
--x    Tells the server to shutdown at the end of the test.
--f    Reads the server ior from the file
--n    no. of iterations
--k    IOR or The IOR can also be given in the format like file://[file.ior]
-      with the full path
-
--n    Use the naming service
-
--p    A horizontal position of the grid where the value [v] is stored
--q    A vertical  position of the grid where the value [v] is stored
--w    Width of the grid
--h    Height of the grid
--v    Value that needs to be stored in the grid.
-
-The last four options ie. p,q,w,h,v have default values. So, if the client 
-is invoked without these options then default values of one or all are 
-taken.
-
-You can either cut and paste the IOR from the server to the client
-(with the -k option), have the client read the IOR from a file using
-the -f option (this file is produced using the -o option of the
-server), or use the naming service (with the -s option).
-
-run_test.pl:
-------------
-
-This perl script runs the server and client and shuts down the server
-when it is done.
diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 4bec0e49dad..7e94d10b54f 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -5,7 +5,7 @@
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+main (int argc, char **argv)
 {
   Grid_Client_i client;
   
@@ -13,7 +13,7 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
 
-  if (client.run ("Grid", argc, argv) == -1)
+  if (client.run ("Grid",argc, argv) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/grid/run_test.pl b/TAO/examples/Simple/grid/run_test.pl
index 7c1e18a1afc..63c0bee9564 100755
--- a/TAO/examples/Simple/grid/run_test.pl
+++ b/TAO/examples/Simple/grid/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 require ACEutils;
 require Process;
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 0d31fd11cef..98aa3dd04ee 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -12,9 +12,7 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tGrid server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV
     {
       if (server.init ("Grid",
                        argc,
diff --git a/TAO/examples/Simple/time-date/Makefile b/TAO/examples/Simple/time-date/Makefile
deleted file mode 100644
index 03b079fdbc7..00000000000
--- a/TAO/examples/Simple/time-date/Makefile
+++ /dev/null
@@ -1,2029 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDLIBS = -lorbsvcs -lTAO
-
-IDL_SRC = Time_DateC.cpp Time_DateS.cpp
-
-PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Time_Date_i.cpp \
-        Time_Date_Client_i.cpp \
-        ../Simple_util.cpp
-
-SRC = $(IDL_SRC) $(PROG_SRCS)
-
-SIMPLE_CLT_OBJS = \
-                Time_DateC.o \
-                Time_DateS.o \
-                client.o \
-                ../Simple_util.o \
-                Time_Date_Client_i.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
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
-
-#----------------------------------------------------------------------------
-#       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
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-.PRECIOUS: Time_DateC.cpp Time_DateC.i Time_DateC.h
-.PRECIOUS: Time_DateS.cpp Time_DateS.i Time_DateS.h
-.PRECIOUS: Time_DateS_T.cpp Time_DateS_T.i Time_DateS_T.h
-
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) Time_DateC.* Time_DateS.* Time_DateS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Time_DateC.o .obj/Time_DateC.so .shobj/Time_DateC.o .shobj/Time_DateC.so: Time_DateC.cpp Time_DateC.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/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/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 \
- $(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.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- Time_DateC.i Time_DateS.h Time_DateS_T.h Time_DateS_T.i Time_DateS_T.cpp Time_DateS.i
-.obj/Time_DateS.o .obj/Time_DateS.so .shobj/Time_DateS.o .shobj/Time_DateS.so: Time_DateS.cpp Time_DateS.h Time_DateC.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/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/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 \
- $(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.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- Time_DateC.i Time_DateS_T.h Time_DateS_T.i Time_DateS_T.cpp Time_DateS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Time_Date_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(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/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/ORB.i \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.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/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/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Time_DateC.h Time_DateC.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(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/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/ORB.i \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.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/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/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Time_Date_i.h Time_DateS.h Time_DateC.h Time_DateC.i Time_DateS_T.h \
- Time_DateS_T.i Time_DateS_T.cpp Time_DateS.i
-.obj/Time_Date_i.o .obj/Time_Date_i.so .shobj/Time_Date_i.o .shobj/Time_Date_i.so: Time_Date_i.cpp Time_Date_i.h Time_DateS.h Time_DateC.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/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/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 \
- $(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.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- Time_DateC.i Time_DateS_T.h Time_DateS_T.i Time_DateS_T.cpp Time_DateS.i
-.obj/Time_Date_Client_i.o .obj/Time_Date_Client_i.so .shobj/Time_Date_Client_i.o .shobj/Time_Date_Client_i.so: Time_Date_Client_i.cpp Time_Date_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(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/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/ORB.i \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.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/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/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp Time_DateC.h Time_DateC.i
-.obj/Simple_util.o .obj/Simple_util.so .shobj/Simple_util.o .shobj/Simple_util.so: ../Simple_util.cpp ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(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/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/ORB.i \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.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/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/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- ../Simple_util.cpp
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simple/time-date/README b/TAO/examples/Simple/time-date/README
deleted file mode 100644
index e7cca6369c5..00000000000
--- a/TAO/examples/Simple/time-date/README
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id$
-
-This example illustrates how to dynamically link an ORB into an
-application via the ACE Service Configurator.  It also illustrates a
-simple Time & Date class.
-
-run_test.pl:
-------------
-
-This perl script runs the server and client and shuts down the server
-when it is done.
diff --git a/TAO/examples/Simple/time-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
deleted file mode 100644
index b2da4a3ea23..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#include "tao/TAO.h"
-#include "../Simple_util.h"
-#include "Time_Date_i.h"
-
-class DLL_ORB : public ACE_Task_Base
-{
-public:
-  virtual int init (int argc, char *argv[]);
-  // Initialize the <TAO_ORB_Manager>.
-
-  virtual int fini (void);
-  // Shutdown the <TAO_ORB_Manager>.
-  
-  virtual int svc (void);
-  // Concurrency hook.
-
-private:
-  TAO_ORB_Manager orb_manager_;
-  // ORB manager.
-  
-  Server<Time_Date_i> server_;
-  // Servant for the <Time_Date> object.
-};
-
-int 
-DLL_ORB::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\trunning ORB event loop\n\n"));
-
-  ACE_TRY
-    {
-      this->server_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-}
-
-int 
-DLL_ORB::init (int argc, char *argv[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tTime_Date server\n\n"));
-
-  // Initialize the ORB.
-  if (this->orb_manager_.init (argc,
-                               argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n", 
-                       "ORB_Manager::init"),
-                      1);
-  // Initialize the <Time_Date_i> servant.
-  else if (this->server_.init ("Time_Date",
-                               argc,
-                               argv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n", 
-                       "Server::init"),
-                      1);
-  else
-    // Become an Active Object so that the ORB
-    // will execute in a separate thread.
-    return this->activate ();
-}
-
-int 
-DLL_ORB::fini (void)
-{
-  return 0;
-}
diff --git a/TAO/examples/Simple/time-date/Time_Date.idl b/TAO/examples/Simple/time-date/Time_Date.idl
deleted file mode 100644
index 842d6060752..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-interface Time_Date
-{
-  // = TITLE
-  //   IDL schema definition for Time and Date interface.
-
-  void bin_date (out long time_date);
-  // Obtain the time and date in binary format.
-
-  void str_date (out string time_date);
-  // Obtain the time and date in string format.
-};
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp b/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
deleted file mode 100644
index c822df9cf9f..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//$Id$
-
-#include "Time_Date_Client_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-// This is the interface program that accesses the remote object
-
-// Constructor.
-Time_Date_Client_i::Time_Date_Client_i (void)
-{
-  // no-op
-}
-
-//Destructor.
-Time_Date_Client_i::~Time_Date_Client_i (void)
-{
-  // no-op
-}
-
-int
-Time_Date_Client_i::parse_args (int argc,
-                                char *argv[])
-{
-  return 0;
-}
-
-int
-Time_Date_Client_i::run (char *name,
-                         int argc,
-                         char *argv[])
-{
-  // Initialize the client.
-  if (client.init (name, argc, argv) == -1)
-    return -1;
-
-  if (this->parse_args (argc, argv) == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
-    {
-      Time_Date_ptr time_date;
-
-      CORBA::Long l;
-
-      // Get the time_date.
-      time_date->bin_date (l,
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Binary time_date = %d\n",
-                  l));
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Setting a value for the time_date\n"));
-
-      if (client.shutdown () == 1)
-        client->shutdown (ACE_TRY_ENV);
-      ACE_UNUSED_ARG (ret_val);
-    }
-  ACE_CATCH (CORBA::UserException, range_ex)
-    {
-      ACE_PRINT_EXCEPTION (range_ex,
-                           "\tFrom get and set time_date");
-      return -1;
-    }
-  ACE_CATCH (CORBA::SystemException, memex)
-    {
-      ACE_PRINT_EXCEPTION (memex,
-                           "Cannot make time_date as Memory exhausted");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Client<Time_Date_Factory,Time_Date_Factory_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Client<Time_Date_Factory,Time_Date_Factory_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/Simple/time-date/Time_Date_Client_i.h b/TAO/examples/Simple/time-date/Time_Date_Client_i.h
deleted file mode 100644
index 6c5c3118831..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date_Client_i.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/examples/Simple/time-date
-//
-// = FILENAME
-//    Time_Date_Client_i.h
-//
-// = DESCRIPTION
-//    This class implements the interface calls for RMI.
-//
-// = AUTHOR
-//   Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//    
-// ============================================================================
-
-#ifndef TIME_DATE_CLIENT_I_H
-#define TIME_DATE_CLIENT_I_H
-
-#include "../Simple_util.h"
-#include "Time_DateC.h"
-
-class Time_Date_Client_i
-{
-  // = TITLE
-  //   Time_Date_Client interface subclass.
-  //
-  // = DESCRIPTION
-  //   This class implements the interface between the interface
-  //   objects and the client.
-public:
-  // = Initialization and termination methods.
-  Time_Date_Client_i (void);
-  // Constructor
-
-  virtual ~Time_Date_Client_i (void);
-  // Destructor
-
-  virtual int run (char *, int, char *[]);
-  // Execute the methods.
-
-  virtual int parse_args (int argc, char *argv[]);
-  // Parses the command line arguments
-
-private:
-  Client<Time_Date_Factory, Time_Date_Factory_var> client;
-  // Instantiate the client object.
-};
-
-#endif /* TIME_CLIENT_I_H */
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.cpp b/TAO/examples/Simple/time-date/Time_Date_i.cpp
deleted file mode 100644
index 8295c3d5e10..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date_i.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// -*- C++ -*-
-// $Id$
-#include "Time_Date_i.h"
-#include "tao/corba.h"
-
-// Default constructor.
-
-Time_Date_i::Time_Date_i (void)
-{
-  //no-op
-}
-
-// Default destructor.
-
-Time_Date_i::~Time_Date_i (void)
-{
-  // no-op.
-}
-
-// Obtain the time and date in binary format.
-
-void
-Time_Date::bin_date (CORBA::Long_out time_date)
-{
-}
-
-// Obtain the time and date in string format.
-
-void 
-Time_Date::str_date (CORBA::String_out time_date)
-{
-
-}
diff --git a/TAO/examples/Simple/time-date/Time_Date_i.h b/TAO/examples/Simple/time-date/Time_Date_i.h
deleted file mode 100644
index fd40f0ac7d0..00000000000
--- a/TAO/examples/Simple/time-date/Time_Date_i.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Simple/time_date
-//
-// = FILENAME
-//    Time_Date_i.h
-//
-// = DESCRIPTION
-//    This class implements the Time_Date IDL interface.
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-// ============================================================================
-
-#ifndef TIME_DATE_I_H
-#define TIME_DATE_I_H
-
-#include "Time_DateS.h"
-
-class Time_Date_i: public POA_Time_Date
-{
-  // = TITLE
-  //    Time_Date object implementation.
-  //
-  // = DESCRIPTION
-  //    Time_Date object implementation
-public:
-  // = Initialization and termination methods.
-
-  Time_Date_i (void);
-  // Constructor
-
-  ~Time_Date_i (void);
-  // Destructor
-
-  virtual void bin_date (CORBA::Long_out time_date);
-  // Obtain the time and date in binary format.
-
-  virtual void str_date (CORBA::String_out time_date);
-  // Obtain the time and date in string format.
-};
-
-#endif /* TIME_DATE_I_H */
diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp
deleted file mode 100644
index 4700bf2d346..00000000000
--- a/TAO/examples/Simple/time-date/client.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-# include "Time_Date_Client_i.h"
-
-// The client program for the application.
-
-int
-main (int argc, char *argv[])
-{
-  Time_Date_Client_i client;
-  
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\nTime_Date client\n\n"));
-
-  if (client.run ("Time_Date", argc, argv) == -1)
-    return -1; 
-  else
-    return 0;
-   
-}
-
-                                 
diff --git a/TAO/examples/Simple/time-date/run_test.pl b/TAO/examples/Simple/time-date/run_test.pl
deleted file mode 100755
index 7c1e18a1afc..00000000000
--- a/TAO/examples/Simple/time-date/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 -*-
-
-use lib "../../../../bin";
-require ACEutils;
-require Process;
-
-$iorfile = "grid.ior";
-
-$SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", "-o $iorfile ");
-
-ACE::waitforfile ($iorfile);
-
-$status  = system ($EXEPREFIX."client$Process::EXE_EXT -f $iorfile -x -w 12 -h 12 -p 2 -q 2 -v 2345");
-
-$SV->Kill (); $SV->Wait ();
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp
deleted file mode 100644
index ca745af3558..00000000000
--- a/TAO/examples/Simple/time-date/server.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    examples/DLL_ORB/Misc
-//
-// = FILENAME
-//    main.cpp
-//
-// = DESCRIPTION
-//   This directory contains an example that illustrates how the ACE
-//   Service Configurator can dynamically configure an ORB from a
-//   svc.config file.  
-//
-// = AUTHOR
-//    Doug Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/Service_Config.h"
-
-ACE_RCSID(Misc, main, "$Id$")
-
-int
-main (int argc, ASYS_TCHAR *argv[])
-{
-  if (ACE_Service_Config::open (argc, argv) == -1 && errno != ENOENT)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"),
-                       ASYS_TEXT ("open")),
-                      1);
-
-  // Run forever, performing the configured services until we
-  // shutdown.
-
-  ACE_Reactor::run_event_loop ();
-  return 0;
-}
diff --git a/TAO/examples/Simple/time-date/svc.conf b/TAO/examples/Simple/time-date/svc.conf
deleted file mode 100644
index 1cca8e22f43..00000000000
--- a/TAO/examples/Simple/time-date/svc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dynamically configure the Time_Date service into the application process.
-dynamic Time_Date Service_Object * Time_Date:_make_DLL_ORB()
diff --git a/TAO/examples/Simple/time/Makefile b/TAO/examples/Simple/time/Makefile
index 5698c1db90d..c8dcd238b73 100644
--- a/TAO/examples/Simple/time/Makefile
+++ b/TAO/examples/Simple/time/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,44 +14,38 @@ endif
 
 LDLIBS = -lorbsvcs -lTAO
 
-IDL_SRC = TimeC.cpp TimeS.cpp
+IDL_SRC	= TimeC.cpp TimeS.cpp
 
 PROG_SRCS = \
-        client.cpp \
-        server.cpp \
-        Time_i.cpp \
+	client.cpp \
+	server.cpp \
+	Time_i.cpp \
         Time_Client_i.cpp \
         ../Simple_util.cpp
 
 SRC = $(IDL_SRC) $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = \
-                TimeC.o \
-                TimeS.o \
-                client.o \
+		TimeC.o \
+		TimeS.o \
+		client.o \
                 ../Simple_util.o \
-                Time_Client_i.o
+                Time_Client_i.o 
 SIMPLE_SVR_OBJS = \
-                TimeC.o \
-                TimeS.o \
-                Time_i.o \
-                server.o \
+		TimeC.o \
+		TimeS.o \
+		Time_i.o \
+		server.o \
                 ../Simple_util.o
 
+BIN = server \
+      client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server \
-       client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -63,7 +57,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -74,26 +68,33 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: TimeS.cpp TimeS.i TimeS.h
 .PRECIOUS: TimeS_T.cpp TimeS_T.i TimeS_T.h
 
-server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) -rf TimeC.* TimeS.* TimeS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf TimeC.* TimeS.* TimeS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/TimeC.o .obj/TimeC.so .shobj/TimeC.o .shobj/TimeC.so: TimeC.cpp TimeC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/TimeC.o .obj/TimeC.so .shobj/TimeC.o .shobj/TimeC.so: TimeC.cpp TimeC.h TimeC.i TimeS.h TimeS_T.h TimeS_T.i \
+ TimeS_T.cpp TimeS.i
+.obj/TimeS.o .obj/TimeS.so .shobj/TimeS.o .shobj/TimeS.so: TimeS.cpp TimeS.h TimeC.h TimeC.i TimeS_T.h TimeS_T.i \
+ TimeS_T.cpp TimeS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Time_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -101,16 +102,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -157,64 +154,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -225,223 +200,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TimeC.i TimeS.h TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
-.obj/TimeS.o .obj/TimeS.so .shobj/TimeS.o .shobj/TimeS.so: TimeS.cpp TimeS.h TimeC.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/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/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 \
- $(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.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/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 \
@@ -468,365 +231,28 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Time_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -848,8 +274,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -866,65 +295,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -933,12 +336,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -952,6 +356,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1011,32 +418,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1063,68 +495,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1146,8 +538,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1164,65 +559,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1231,22 +600,32 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  ../Simple_util.cpp Time_i.h TimeS.h TimeC.h TimeC.i TimeS_T.h \
  TimeS_T.i TimeS_T.cpp TimeS.i
-.obj/Time_i.o .obj/Time_i.so .shobj/Time_i.o .shobj/Time_i.so: Time_i.cpp Time_i.h TimeS.h TimeC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Time_i.o .obj/Time_i.so .shobj/Time_i.o .shobj/Time_i.so: Time_i.cpp Time_i.h TimeS.h TimeC.h TimeC.i TimeS_T.h \
+ TimeS_T.i TimeS_T.cpp TimeS.i
+.obj/Time_Client_i.o .obj/Time_Client_i.so .shobj/Time_Client_i.o .shobj/Time_Client_i.so: Time_Client_i.cpp Time_Client_i.h ../Simple_util.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1254,16 +633,12 @@ realclean: clean
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -1310,64 +685,42 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -1378,242 +731,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TimeC.i TimeS_T.h TimeS_T.i TimeS_T.cpp TimeS.i
-.obj/Time_Client_i.o .obj/Time_Client_i.so .shobj/Time_Client_i.o .shobj/Time_Client_i.so: Time_Client_i.cpp Time_Client_i.h ../Simple_util.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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 \
@@ -1640,68 +762,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1723,8 +805,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1741,65 +826,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -1808,12 +867,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
@@ -1827,6 +887,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1886,32 +949,57 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1938,68 +1026,28 @@ realclean: clean
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2021,8 +1069,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2039,65 +1090,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -2106,12 +1131,13 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
diff --git a/TAO/examples/Simple/time/README b/TAO/examples/Simple/time/README
index c80a08a651d..b40e9a8d770 100644
--- a/TAO/examples/Simple/time/README
+++ b/TAO/examples/Simple/time/README
@@ -25,7 +25,6 @@ The -o option makes it easier to run from a script because the ior
 passing is done through the <ior_output_file>.
 
 -d    Debug flag 
--n    Use the naming service
 
 Using -d turns on debugging messages.  This option is additive, i.e.,
 the more -d options provided, the more debugging you can get.  At the
@@ -42,9 +41,8 @@ Options:
 -d    Debug flag
 -x    Tells the server to shutdown at the end of the test.
 -f    Reads the server ior from the file
--n    Use the naming service
--k    IOR or The IOR can also be given in the format like file://[file.ior]
-      with the full path
+-n    number of iterations
+-k    IOR
 	
 You can either cut and paste the IOR from the server to the client
 (with the -k option), or have the client read the IOR from a file
diff --git a/TAO/examples/Simple/time/Time_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index 7037fd5c5c1..9b7f5dc6473 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -25,9 +25,7 @@ Time_Client_i::run (char *name,
   if (client.init (name, argc, argv) == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  ACE_TRY_NEW_ENV 
     {
       //Make the RMI.
       CORBA::Long timedate = client->time (ACE_TRY_ENV);
diff --git a/TAO/examples/Simple/time/Time_i.h b/TAO/examples/Simple/time/Time_i.h
index 87b92ad471a..edebf12b18d 100644
--- a/TAO/examples/Simple/time/Time_i.h
+++ b/TAO/examples/Simple/time/Time_i.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 // $Id$
 
@@ -58,5 +59,3 @@ private:
 };
 
 #endif /* TIME_I_H */
-
-
diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp
index 28eab3cb977..40415933932 100644
--- a/TAO/examples/Simple/time/client.cpp
+++ b/TAO/examples/Simple/time/client.cpp
@@ -11,7 +11,7 @@ main (int argc, char **argv)
   
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n\tTime and date client\n\n"));
+              "\n\ttime and date client\n\n"));
 
   if (client.run ("Time",argc, argv) == -1)
     return -1; 
diff --git a/TAO/examples/Simple/time/client.dsp b/TAO/examples/Simple/time/client.dsp
index 920a12c1fb5..0b822d36001 100644
--- a/TAO/examples/Simple/time/client.dsp
+++ b/TAO/examples/Simple/time/client.dsp
@@ -18,17 +18,14 @@ CFG=Simple Time Client - Win32 Alpha Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Time Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Client - Win32 Alpha Debug" (based on\

- "Win32 (ALPHA) Console Application")

-!MESSAGE "Simple Time Client - Win32 Alpha Release" (based on\

- "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Client - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Client - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -101,9 +98,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "client"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd ..\..\..\..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /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"

@@ -130,9 +127,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "client"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

@@ -318,11 +315,11 @@ DEP_CPP_CLIEN=\
 	"..\..\..\..\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"\

@@ -340,6 +337,9 @@ DEP_CPP_CLIEN=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -398,9 +398,6 @@ DEP_CPP_CLIEN=\
 	

 NODEP_CPP_CLIEN=\

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

-	"..\..\..\tao\Align.h"\

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

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

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

 	".\Client_impl.h"\

 	".\TimeC.h"\

@@ -589,11 +586,11 @@ DEP_CPP_TIMEC=\
 	"..\..\..\..\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"\

@@ -611,6 +608,9 @@ DEP_CPP_TIMEC=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -669,9 +669,6 @@ DEP_CPP_TIMEC=\
 	

 NODEP_CPP_TIMEC=\

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

-	"..\..\..\tao\Align.h"\

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

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

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

 	".\TimeC.h"\

 	".\TimeC.i"\

@@ -850,11 +847,11 @@ DEP_CPP_TIMES=\
 	"..\..\..\..\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"\

@@ -872,6 +869,9 @@ DEP_CPP_TIMES=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -930,9 +930,6 @@ DEP_CPP_TIMES=\
 	

 NODEP_CPP_TIMES=\

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

-	"..\..\..\tao\Align.h"\

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

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

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

 	".\TimeC.h"\

 	".\TimeC.i"\

@@ -973,7 +970,7 @@ InputPath=.\Time.idl
 InputName=Time

 

 BuildCmds= \

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

+	tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simple/time/client_static.dsp b/TAO/examples/Simple/time/client_static.dsp
index 8048d4c254e..aadb5bf2e30 100644
--- a/TAO/examples/Simple/time/client_static.dsp
+++ b/TAO/examples/Simple/time/client_static.dsp
@@ -13,18 +13,16 @@ CFG=Simple Time Client Static - Win32 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 "client_static.mak"\

- CFG="Simple Time Client Static - Win32 Debug"

+!MESSAGE NMAKE /f "client_static.mak" CFG="Simple Time Client Static - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Time Client Static - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Client Static - Win32 Release" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Client Static - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Client Static - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -46,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir "client"

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -73,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir "client"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -99,6 +97,10 @@ SOURCE=.\client.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Client_i.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\TimeC.cpp

 # End Source File

 # Begin Source File

@@ -130,7 +132,7 @@ InputPath=.\Time.idl
 InputName=Time

 

 BuildCmds= \

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

+	..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simple/time/run_test.pl b/TAO/examples/Simple/time/run_test.pl
index 855a403c494..aa418952d2e 100755
--- a/TAO/examples/Simple/time/run_test.pl
+++ b/TAO/examples/Simple/time/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../../bin';
 require ACEutils;
 require Process;
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 6b710f67f48..952f850ec4d 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -11,10 +11,8 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and Date server\n\n"));
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
- 
-  ACE_TRY
+
+  ACE_TRY_NEW_ENV
     {
       if (server.init ("Time",
                        argc,
diff --git a/TAO/examples/Simple/time/server.dsp b/TAO/examples/Simple/time/server.dsp
index d08945fbfa0..fa0d30a9fdc 100644
--- a/TAO/examples/Simple/time/server.dsp
+++ b/TAO/examples/Simple/time/server.dsp
@@ -18,17 +18,14 @@ CFG=Simple Time Server - Win32 Alpha Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Time Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Server - Win32 Alpha Debug" (based on\

- "Win32 (ALPHA) Console Application")

-!MESSAGE "Simple Time Server - Win32 Alpha Release" (based on\

- "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Server - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

+!MESSAGE "Simple Time Server - Win32 Alpha Release" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 

@@ -101,9 +98,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "server"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /I" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd ..\..\..\..\\ /c

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I "..\..\..\\ /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"

@@ -130,9 +127,9 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "server"

 CPP=cl.exe

-# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD ..\..\..\..\\ /c

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\..\..\\ /I " ..\..\..\..\\ /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

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

@@ -318,6 +315,7 @@ DEP_CPP_SERVE=\
 	"..\..\..\..\ace\WFMO_Reactor.h"\

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

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

+	"..\..\..\tao\Align.h"\

 	"..\..\..\tao\Any.h"\

 	"..\..\..\tao\Any.i"\

 	"..\..\..\tao\CDR.h"\

@@ -339,6 +337,9 @@ DEP_CPP_SERVE=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -398,10 +399,6 @@ DEP_CPP_SERVE=\
 	

 NODEP_CPP_SERVE=\

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

-	"..\..\..\tao\Align.h"\

-	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

 	".\Server_impl.h"\

 	".\Time_impl.h"\

@@ -597,6 +594,7 @@ DEP_CPP_TIMEC=\
 	"..\..\..\..\ace\WFMO_Reactor.h"\

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

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

+	"..\..\..\tao\Align.h"\

 	"..\..\..\tao\Any.h"\

 	"..\..\..\tao\Any.i"\

 	"..\..\..\tao\CDR.h"\

@@ -618,6 +616,9 @@ DEP_CPP_TIMEC=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -676,10 +677,6 @@ DEP_CPP_TIMEC=\
 	

 NODEP_CPP_TIMEC=\

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

-	"..\..\..\tao\Align.h"\

-	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

 	".\TimeC.h"\

 	".\TimeC.i"\

@@ -858,6 +855,7 @@ DEP_CPP_TIMES=\
 	"..\..\..\..\ace\WFMO_Reactor.h"\

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

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

+	"..\..\..\tao\Align.h"\

 	"..\..\..\tao\Any.h"\

 	"..\..\..\tao\Any.i"\

 	"..\..\..\tao\CDR.h"\

@@ -879,6 +877,9 @@ DEP_CPP_TIMES=\
 	"..\..\..\tao\Exception.i"\

 	"..\..\..\tao\GIOP.h"\

 	"..\..\..\tao\GIOP.i"\

+	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

@@ -937,10 +938,6 @@ DEP_CPP_TIMES=\
 	

 NODEP_CPP_TIMES=\

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

-	"..\..\..\tao\Align.h"\

-	"..\..\..\tao\IIOP_Interpreter.h"\

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

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

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

 	".\TimeC.h"\

 	".\TimeC.i"\

diff --git a/TAO/examples/Simple/time/server_static.dsp b/TAO/examples/Simple/time/server_static.dsp
index 91632009fdc..919165ee41b 100644
--- a/TAO/examples/Simple/time/server_static.dsp
+++ b/TAO/examples/Simple/time/server_static.dsp
@@ -13,18 +13,16 @@ CFG=Simple Time Server Static - Win32 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 "server_static.mak"\

- CFG="Simple Time Server Static - Win32 Debug"

+!MESSAGE NMAKE /f "server_static.mak" CFG="Simple Time Server Static - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Time Server Static - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Simple Time Server Static - Win32 Release" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Server Static - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Simple Time Server Static - Win32 Release" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -46,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir "server"

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -73,7 +71,7 @@ LINK32=link.exe
 # PROP Target_Dir "server"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D ACE_NO_INLINE /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -99,6 +97,10 @@ SOURCE=.\server.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Server_i.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=.\Time_i.cpp

 # End Source File

 # Begin Source File

@@ -138,7 +140,7 @@ InputPath=.\Time.idl
 InputName=Time

 

 BuildCmds= \

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

+	..\..\..\tao_idl\tao_idl $(InputName).idl

 

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

    $(BuildCmds)

diff --git a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java b/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java
index 228d9931fc7..b7fe9f101f5 100644
--- a/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java
+++ b/TAO/examples/Simulator/DOVEBrowser/DoubleVisComp.java
@@ -32,21 +32,15 @@ public class DoubleVisComp extends Canvas implements VisComp
   private int max_value_;
   private int old_max_value_;
   private int spacing_;
+  private float local_max_ = 0;
   private boolean max_increased_ = false;
   private static boolean monotonic_scale_ = false;
-
-  private float local_max_ = 0;
-  private static float local_max_values_ [] = null;
-  private static int local_max_value_count_ = 0;
-  private int local_max_value_index_ = 0;
+  private static int global_max_value_ = 0;
 
   public DoubleVisComp()
   {
     super();
 
-    // Re-initialize the global array of local maxima.
-    local_max_init ();
-
     plot_ = new Queue();
     spacing_ = MIN_SPACING;
     title_ = "";
@@ -79,6 +73,14 @@ public class DoubleVisComp extends Canvas implements VisComp
     return monotonic_scale_;
   }
 
+  public static synchronized void raise_global_max_value (int i) {
+    global_max_value_ = global_max_value_ < i ? i : global_max_value_;
+  }
+
+  public static synchronized int global_max_value () {
+    return global_max_value_;
+  }
+
   public void setName (String title) {
       title_ = title;
   }
@@ -120,21 +122,17 @@ public class DoubleVisComp extends Canvas implements VisComp
     plot_.enqueue_head(new Float(new_point));
     
     if (new_point > local_max_)
-      {
-        local_max_ = new_point;
-        local_max_values_ [local_max_value_index_] = local_max_;
-      }
+      local_max_ = new_point;
     
     if (monotonic_scale_)
       {
-        float global_max = 0;
-        global_max = global_max_value ();
+        while (local_max_ > max_value_)
+          max_value_ *= 2;
 
-        while (global_max > max_value_)
+        while (global_max_value_ > max_value_)
           max_value_ *= 2;
-    
-        while ((global_max < max_value_/2) && (max_value_ > old_max_value_))
-          max_value_ /= 2;
+
+        raise_global_max_value (max_value_);
       }
     else
       {
@@ -173,7 +171,6 @@ public class DoubleVisComp extends Canvas implements VisComp
     g.draw3DRect (2, 2, d.width - 5, d.height - 5, true);
     
     local_max_ = 0;
-
     offgraphics_.setColor (getBackground());
     offgraphics_.fillRect (0, 0, offscreensize_.width, offscreensize_.height);
     offgraphics_.setColor (getForeground());    
@@ -202,8 +199,6 @@ public class DoubleVisComp extends Canvas implements VisComp
 	  break;
       }
 
-    local_max_values_ [local_max_value_index_] = local_max_;
-
     g.drawImage(offscreen_, 3, 3, null);
   }
   
@@ -227,40 +222,6 @@ public class DoubleVisComp extends Canvas implements VisComp
     update(g);
   }
 
-  private static synchronized float global_max_value () {
-    float result = 0;
-
-    for (int i = 0; i < local_max_value_count_; ++i)
-      {
-        if (result < local_max_values_ [i])
-          {
-            result = local_max_values_ [i];
-          }
-      }
-
-    return result;
-  }
-
-  private synchronized void local_max_init () {
-
-    // Create a new, larger, array to hold the local maxima
-    float new_max_values [] = 
-      new float [local_max_value_count_ + 1];
-
-    // Copy the previously stored maxima (if any) into the new array.
-    for (int i = 0; i < local_max_value_count_; ++i)
-      {
-        new_max_values [i] = local_max_values_ [i];
-      }
-
-    // Replace the old array with the new one.
-    local_max_values_ = new_max_values;
-
-    // Store the local index for this object, bump up the count.
-    local_max_value_index_ = local_max_value_count_;
-    local_max_value_count_++;
-  }
-
 
   private int normalize(int height, float coord)
   {
@@ -272,4 +233,3 @@ public class DoubleVisComp extends Canvas implements VisComp
   }
 }
 
-
diff --git a/TAO/examples/Simulator/DOVEBrowser/Makefile b/TAO/examples/Simulator/DOVEBrowser/Makefile
index d3de3e5a12e..dc2a7f4612b 100644
--- a/TAO/examples/Simulator/DOVEBrowser/Makefile
+++ b/TAO/examples/Simulator/DOVEBrowser/Makefile
@@ -46,7 +46,7 @@ ifeq ($(CROSS-COMPILE),)
   include $(TAO_ROOT)/taoconfig.mk
 
   realclean: clean
-	-$(RM) $(DOVE_BROWSER_JAVA) \
+	-/bin/rm -rf $(DOVE_BROWSER_JAVA) \
          $(patsubst %.java,%.idl,$(DOVE_BROWSER_JAVA)) NavWeap.idl \
          Navigation.java NavigationH*.java \
          Weapons.java WeaponsH*.java *.class CosNaming \
diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
index 737edeaf5ac..51eedd40742 100644
--- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
@@ -7,7 +7,6 @@
 //
 // = AUTHOR
 //    Michael Kircher (mk1@cs.wustl.edu)
-//    Modified for new protocol by Hans Ridder <ridder@veritas.com>
 //
 // = DESCRIPTION
 //   Resolves the initial reference to the Naming service,
@@ -27,10 +26,15 @@ import java.io.*;
 
 public class NS_Resolve
 {
+  
   private static final String ACE_DEFAULT_MULTICAST_ADDR = "224.9.9.2";
   private static final int TAO_DEFAULT_NAME_SERVER_REQUEST_PORT = 10013;
-  private static final String TAO_SERVICEID_NAMESERVICE = "NameService";
+  private static final int MULTICAST_SEND_PORT = 10060;
+  private static final int MULTICAST_RECEIVE_PORT = 10061;
+  private static final int TAO_SERVICEID_NAMESERVICE = 0;
+  private static final int TAO_SERVICEID_TRADINGSERVICE = 1;
 
+  org.omg.CORBA.Object name_service_;
   int nameServicePort_;
 
   public NS_Resolve (String nameServicePort)
@@ -51,53 +55,47 @@ public class NS_Resolve
     {
       try
 	{
-	  // Create the multicast socket at any port
-	  MulticastSocket sendSocket = new MulticastSocket(0);
-
-	  // Create a socket at any port for the Naming Service answer
-	  ServerSocket listenSocket = new ServerSocket(0);
-
-	  // Create a message with the port and service name in it,
-	  // length and port number are in network byte order
-	  ByteArrayOutputStream msg = new ByteArrayOutputStream();
-	  int dataLength = TAO_SERVICEID_NAMESERVICE.length() + 2;
-	  msg.write((dataLength >> 8) & 0xff);
-	  msg.write(dataLength & 0xff);
-	  msg.write((listenSocket.getLocalPort() >> 8) & 0xff);
-	  msg.write(listenSocket.getLocalPort() & 0xff);
-	  msg.write(TAO_SERVICEID_NAMESERVICE.getBytes());
+	  // Create a message with the multicast receive port in it
+	  ByteArrayOutputStream byte_stream_ = new ByteArrayOutputStream ();
+      	  byte_stream_.write ((int)((MULTICAST_RECEIVE_PORT&0xff00)>>>8));
+	  byte_stream_.write ((int)(MULTICAST_RECEIVE_PORT&0x00ff));
+      	  byte_stream_.write ((int)((TAO_SERVICEID_NAMESERVICE&0xff00)>>>8));
+	  byte_stream_.write ((int)(TAO_SERVICEID_NAMESERVICE&0x00ff));
+	  byte[] msg = byte_stream_.toByteArray();
+
 
 	  // Define the group for the multicast
+
 	  InetAddress group = InetAddress.getByName(ACE_DEFAULT_MULTICAST_ADDR);
-	  // Create a datagram with the message and send it
-	  sendSocket.send(new DatagramPacket(msg.toByteArray(),
-					 msg.size(),
-					 group, nameServicePort_));
-
-	  // Wait 3 seconds for the Naming Service to connect
-	  listenSocket.setSoTimeout(3000);
-	  Socket replySocket = listenSocket.accept();
-      
+	  // Create the multicast socket at any port you want
+	  MulticastSocket multicastsocket_ = new MulticastSocket(MULTICAST_SEND_PORT);
+	  // Create a socket for the answer of the Naming Service 
+	  DatagramSocket socket_ = new DatagramSocket (MULTICAST_RECEIVE_PORT);
+	  // Give three seconds time for the Naming Service to respond
+	  socket_.setSoTimeout (3000);
+	  // Build a packet with the port number in it
+	  DatagramPacket  hello = new DatagramPacket(msg, msg.length,
+						     group, nameServicePort_);
+
+	  // Send the packet
+	  multicastsocket_.send (hello);
+
 	  // @@ The restriction right now is that the length of the IOR cannot be longer than 4096
-	  byte[] reply = new byte[4096];
+	  byte[] buf = new byte[4096];
+	  // Set up packet which can be received
+	  DatagramPacket recv = new DatagramPacket (buf, buf.length);	  
+	  // Receive a packet or time out
+	  socket_.receive (recv);
 
-	  // Receive the reply (0 terminated string) or time out
-	  replySocket.setSoTimeout(3000);
-	  InputStream in = replySocket.getInputStream();
+	  // Determine the length of the IOR
 	  int length;
-	  for (length = 0; length < reply.length; length++) {
-	    if ((reply[length] = (byte) in.read()) == 0) {
-	      break;
-	    }
-	  }
-
-	  // Close all the sockets
-	  sendSocket.close();
-	  listenSocket.close();
-	  replySocket.close();
-
-	  // Convert the String into ??
-	  return orb.string_to_object(new String(reply, 0, length));
+	  for (length = 0; buf[length] != 0; length++);
+
+	  // Store the IOR in a String
+       	  String name_service_ior_ = new String (recv.getData (),0,length);
+
+	  // Convert the String into
+	  return orb.string_to_object (name_service_ior_);
 	}
       catch (SocketException e)
 	{
@@ -116,5 +114,12 @@ public class NS_Resolve
 	  System.err.println (e);
 	}
       return null;
+      
     } 
-}
+
+};
+
+
+
+
+
diff --git a/TAO/examples/Simulator/DOVEBrowser/make.bat b/TAO/examples/Simulator/DOVEBrowser/make.bat
index 49677db37bb..dcbc8dc52ed 100755
--- a/TAO/examples/Simulator/DOVEBrowser/make.bat
+++ b/TAO/examples/Simulator/DOVEBrowser/make.bat
@@ -59,11 +59,11 @@ javac *.java
 
 @del *.idl
 @xcopy ..\NavWeap.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosTimeBase.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosNaming.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventComm.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventChannelAdmin.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecScheduler.idl
+@xcopy ..\..\..\orbsvcs\CosTimeBase.idl
+@xcopy ..\..\..\orbsvcs\CosNaming.idl
+@xcopy ..\..\..\orbsvcs\RtecEventComm.idl
+@xcopy ..\..\..\orbsvcs\RtecEventChannelAdmin.idl
+@xcopy ..\..\..\orbsvcs\RtecScheduler.idl
 
 @goto end
 
@@ -73,11 +73,11 @@ javac *.java
 
 @del *.idl
 @xcopy ..\NavWeap.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosTimeBase.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosNaming.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventComm.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventChannelAdmin.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\RtecScheduler.idl
+@xcopy ..\..\..\orbsvcs\CosTimeBase.idl
+@xcopy ..\..\..\orbsvcs\CosNaming.idl
+@xcopy ..\..\..\orbsvcs\RtecEventComm.idl
+@xcopy ..\..\..\orbsvcs\RtecEventChannelAdmin.idl
+@xcopy ..\..\..\orbsvcs\RtecScheduler.idl
 
 :clean
 
diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp
index 87e4d81839c..567d22c72b6 100644
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp
+++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIB.dsp
@@ -22,7 +22,6 @@ CFG=DOVEMIB - Win32 Debug
 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -65,7 +64,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FR /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FR /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -74,7 +73,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /pdb:"DOVEMIB.pdb" /debug /machine:I386 /out:"DOVEMIB.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /pdb:"DOVEMIB.pdb" /debug /machine:I386 /out:"DOVEMIB.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp b/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp
index 8c5fecb6623..3334d2ab7bc 100644
--- a/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp
+++ b/TAO/examples/Simulator/DOVEMIB/DOVEMIBx.dsp
@@ -17,12 +17,12 @@ CFG=DOVEMIBx - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DOVEMIBx - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "DOVEMIBx - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE "DOVEMIBx - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -65,7 +65,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /YX /FD /c

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

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

 BSC32=bscmake.exe

@@ -73,7 +73,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /pdb:"DOVEMIBx.pdb" /debug /machine:I386 /out:"DOVEMIBx.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /pdb:"DOVEMIBx.pdb" /debug /machine:I386 /out:"DOVEMIBx.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -95,7 +95,7 @@ InputPath=.\any_test.idl
 InputName=any_test

 

 BuildCmds= \

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

+	..\..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -140,7 +140,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl . \

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

+	..\..\..\..\..\bin\tao_idl $(InputName).idl \

 	

 

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

@@ -165,10 +165,6 @@ SOURCE=.\NavWeapC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\NavWeapS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Node.cpp

 # End Source File

 # Begin Source File

diff --git a/TAO/examples/Simulator/DOVEMIB/Makefile b/TAO/examples/Simulator/DOVEMIB/Makefile
index 88ea73ab780..a09a44c6649 100644
--- a/TAO/examples/Simulator/DOVEMIB/Makefile
+++ b/TAO/examples/Simulator/DOVEMIB/Makefile
@@ -16,23 +16,11 @@ LSRC = $(PROG_SRCS)
 
 MIB_OBJS = DOVEMIB.o NavWeapC.o Node.o PrintVisitor.o AnyAnalyser.o
 
-LDLIBS = -lorbsvcs -lTAO
+BIN = DOVEMIB
 VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
-BIN2 = DOVEMIB
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-    ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
-      ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-        BIN = $(BIN2)
-      endif # Naming
-    endif # Time
-  endif # Sched
-endif # Event
+LDLIBS = -lorbsvcs -lTAO
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -64,7 +52,7 @@ NavWeap.idl: ../NavWeap.idl
 DOVEMIB: $(addprefix $(VDIR),$(MIB_OBJS))
 
 realclean: clean
-	-$(RM) NavWeap.idl NavWeap[CS].* NavWeap[CS]_T.*
+	-/bin/rm -rf NavWeap.idl NavWeap[CS].* NavWeap[CS]_T.*
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -73,843 +61,1036 @@ realclean: clean
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/DOVEMIB.o .obj/DOVEMIB.so .shobj/DOVEMIB.o .shobj/DOVEMIB.so: DOVEMIB.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/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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+DOVEMIB.o: DOVEMIB.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/inc_user_config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config-g++-common.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/streams.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Trace.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Priority.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Sched_Params.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Sched_Params.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Profile_Timer.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Time_Value.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/High_Res_Timer.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/High_Res_Timer.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Profile_Timer.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Event_Utilities.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/corba.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/orbconf.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Atomic_Op.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor_Impl.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Conf_Tokens.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IO_Cntl_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Align.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Union.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/try_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/singletons.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA_CORBA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/poa_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Operation_Table.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/debug.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Client_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Interpreter.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/InconsistentTypeCodeC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAny_i.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/orbsvcs_export.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Time_Utilities.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Time_Utilities.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Event_Utilities.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosNamingC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosNamingC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i \
  DOVEMIB.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/orbsvcs/orbsvcs/RtecEventCommS.i \
  AnyAnalyser.h PrintVisitor.h NodeVisitor.h Node.h
-.obj/Node.o .obj/Node.so .shobj/Node.o .shobj/Node.so: Node.cpp Node.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/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/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/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 \
- $(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.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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h NodeVisitor.h
-.obj/PrintVisitor.o .obj/PrintVisitor.so .shobj/PrintVisitor.o .shobj/PrintVisitor.so: PrintVisitor.cpp PrintVisitor.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/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/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/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 \
- $(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.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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.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/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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.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/Principal.i \
- $(TAO_ROOT)/tao/Request.h \
- $(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/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/DynAnyC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Invocation.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/Union.h NodeVisitor.h \
- Node.h
+Node.o: Node.cpp Node.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/corba.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/orbconf.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/inc_user_config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config-g++-common.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/streams.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Trace.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Priority.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Atomic_Op.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor_Impl.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Conf_Tokens.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Time_Value.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IO_Cntl_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Align.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Union.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/try_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/singletons.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA_CORBA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/poa_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Operation_Table.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/debug.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Client_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Interpreter.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/InconsistentTypeCodeC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAny_i.h \
+ NodeVisitor.h
+PrintVisitor.o: PrintVisitor.cpp PrintVisitor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/corba.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/orbconf.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/inc_user_config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config-g++-common.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/streams.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Trace.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Priority.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Atomic_Op.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor_Impl.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Conf_Tokens.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Time_Value.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IO_Cntl_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Align.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Union.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/try_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/singletons.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA_CORBA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/poa_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Operation_Table.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/debug.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Client_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Interpreter.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/InconsistentTypeCodeC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAny_i.h \
+ NodeVisitor.h Node.h
+AnyAnalyser.o: AnyAnalyser.cpp AnyAnalyser.h PrintVisitor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/corba.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/orbconf.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/inc_user_config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/config-g++-common.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/streams.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Basic_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/OS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Trace.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/ACE.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Priority.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SString.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Log_Record.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Get_Opt.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IPC_SAP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_IO.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/INET_Addr.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Stream.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Event_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Simple.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SV_Semaphore_Complex.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Atomic_Op.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Functor_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Shared_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Containers_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Free_List.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Malloc_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Mem_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Memory_Pool.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Signal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Object_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Managed_Object.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Config.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Handle_Set.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Timer_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Reactor_Impl.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Conf_Tokens.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Hash_Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Time_Value.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/SOCK_Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Synch_Options.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Thread_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Service_Repository.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Block_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/IO_Cntl_Msg.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Message_Queue.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/WFMO_Reactor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Strategies.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Map_Manager.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Task_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Module.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Stream_Modules.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Svc_Handler.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Singleton.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Connector.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Acceptor.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Align.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Environment.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Exception.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Sequence_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object_KeyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Union.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Managed_Types.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/try_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Any.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/NVList.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Principal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Stub.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/varout.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Typecode.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Marshal.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/singletons.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CDR.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/PolicyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/CurrentC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Servant_Base.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA_CORBA.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAnyC.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POAS.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Active_Object_Map.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/POA.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/poa_macros.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/params.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Connect.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Core.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/ace/Dynamic_Service.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Operation_Table.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/debug.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Client_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Strategy_Factory.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_client.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/ORB_Strategies_T.cpp \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/default_server.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Object.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_ORB.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/IIOP_Interpreter.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/GIOP.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Invocation.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/Server_Request.i \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/InconsistentTypeCodeC.h \
+ /home/cs/staff/cdgill/project_temp/ACE_wrappers/build/g++/TAO/tao/DynAny_i.h \
+ NodeVisitor.h Node.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/examples/Simulator/DOVEMIB/TestClient.dsp b/TAO/examples/Simulator/DOVEMIB/TestClient.dsp
index f53272d0c99..1ce6af83ce7 100644
--- a/TAO/examples/Simulator/DOVEMIB/TestClient.dsp
+++ b/TAO/examples/Simulator/DOVEMIB/TestClient.dsp
@@ -17,12 +17,13 @@ CFG=TestClient - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "TestClient - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "TestClient - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "TestClient - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "TestClient - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -65,7 +66,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\tao" /I "..\..\..\orbsvcs" /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

@@ -73,7 +74,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"TestClient.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"TestClient.exe" /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 

 !ENDIF 

 

@@ -94,7 +95,7 @@ InputPath=.\any_test.idl
 InputName=any_test

 

 BuildCmds= \

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

+	..\..\..\..\..\bin\tao_idl $(InputName).idl

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -135,7 +136,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl . \

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

+	..\..\..\..\..\bin\tao_idl $(InputName).idl \

 	

 

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

@@ -164,9 +165,5 @@ BuildCmds= \
 

 SOURCE=.\NavWeapC.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\NavWeapS.cpp

-# End Source File

 # End Target

 # End Project

diff --git a/TAO/examples/Simulator/DOVEMIB/svc.conf b/TAO/examples/Simulator/DOVEMIB/svc.conf
index eb4772f319e..43c6a486c92 100644
--- a/TAO/examples/Simulator/DOVEMIB/svc.conf
+++ b/TAO/examples/Simulator/DOVEMIB/svc.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
index 4b2713fd8b6..eb1ec2bcc55 100644
--- a/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DOVE_Supplier.cpp
@@ -256,8 +256,8 @@ DOVE_Supplier::notify (CORBA::Any &message)
     event.header.ttl = 1;
     ACE_hrtime_t creation_time = ACE_OS::gethrtime ();
     ORBSVCS_Time::hrtime_to_TimeT (event.header.creation_time, creation_time);
-    event.header.ec_recv_time = ORBSVCS_Time::zero ();
-    event.header.ec_send_time = ORBSVCS_Time::zero ();
+    event.header.ec_recv_time = ORBSVCS_Time::zero;
+    event.header.ec_send_time = ORBSVCS_Time::zero;
     event.data.any_value = message;
 
     RtecEventComm::EventSet events;
@@ -436,9 +436,9 @@ DOVE_Supplier::connect_Supplier ()
     qos.publications[0].event.header.source = SOURCE_ID;
     qos.publications[0].event.header.type = ACE_ES_EVENT_NOTIFICATION;
     qos.publications[0].event.header.ttl = 1;
-    qos.publications[0].event.header.creation_time = ORBSVCS_Time::zero ();
-    qos.publications[0].event.header.ec_recv_time = ORBSVCS_Time::zero ();
-    qos.publications[0].event.header.ec_send_time = ORBSVCS_Time::zero ();
+    qos.publications[0].event.header.creation_time = ORBSVCS_Time::zero;
+    qos.publications[0].event.header.ec_recv_time = ORBSVCS_Time::zero;
+    qos.publications[0].event.header.ec_send_time = ORBSVCS_Time::zero;
     qos.publications[0].event.data.any_value.replace (CORBA::_tc_short,
 						      &x,
 						      0,
@@ -499,15 +499,15 @@ DOVE_Supplier::pod_rt_info_instance ()
       DOVE_Supplier::pod_rt_info_instance_->criticality = 
         RtecScheduler::VERY_LOW_CRITICALITY;
       DOVE_Supplier::pod_rt_info_instance_->worst_case_execution_time = 
-        ORBSVCS_Time::zero ();
+        ORBSVCS_Time::zero;
       DOVE_Supplier::pod_rt_info_instance_->typical_execution_time = 
-        ORBSVCS_Time::zero ();
+        ORBSVCS_Time::zero;
       DOVE_Supplier::pod_rt_info_instance_->cached_execution_time = 
-        ORBSVCS_Time::zero ();
+        ORBSVCS_Time::zero;
       DOVE_Supplier::pod_rt_info_instance_->period = 10000000;
       DOVE_Supplier::pod_rt_info_instance_->importance = 
         RtecScheduler::VERY_LOW_IMPORTANCE;
-      DOVE_Supplier::pod_rt_info_instance_->quantum = ORBSVCS_Time::zero ();
+      DOVE_Supplier::pod_rt_info_instance_->quantum = ORBSVCS_Time::zero;
       DOVE_Supplier::pod_rt_info_instance_->threads = 1;
       DOVE_Supplier::pod_rt_info_instance_->info_type = 
         RtecScheduler::OPERATION;
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 87c6c01e5ca..ceb8710c86f 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -109,12 +109,12 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
   // Initialize the high priority RT_Info data
   rt_info_nav_hi_.entry_point = "DUALEC_NAV_HI";
   rt_info_nav_hi_.criticality = RtecScheduler::VERY_HIGH_CRITICALITY;
-  rt_info_nav_hi_.worst_case_execution_time = ORBSVCS_Time::zero ();
-  rt_info_nav_hi_.typical_execution_time = ORBSVCS_Time::zero ();
-  rt_info_nav_hi_.cached_execution_time = ORBSVCS_Time::zero ();
+  rt_info_nav_hi_.worst_case_execution_time = ORBSVCS_Time::zero;
+  rt_info_nav_hi_.typical_execution_time = ORBSVCS_Time::zero;
+  rt_info_nav_hi_.cached_execution_time = ORBSVCS_Time::zero;
   rt_info_nav_hi_.period = 2500000;
   rt_info_nav_hi_.importance = RtecScheduler::VERY_HIGH_IMPORTANCE;
-  rt_info_nav_hi_.quantum = ORBSVCS_Time::zero ();
+  rt_info_nav_hi_.quantum = ORBSVCS_Time::zero;
   rt_info_nav_hi_.threads = 1;
   rt_info_nav_hi_.info_type = RtecScheduler::OPERATION;
   rt_info_weap_hi_ = rt_info_nav_hi_;
@@ -125,12 +125,12 @@ DualEC_Supplier::DualEC_Supplier (int argc, char** argv)
   // Initialize the low priority RT_Info data
   rt_info_nav_lo_.entry_point = "DUALEC_NAV_LO";
   rt_info_nav_lo_.criticality = RtecScheduler::VERY_LOW_CRITICALITY;
-  rt_info_nav_lo_.worst_case_execution_time = ORBSVCS_Time::zero ();
-  rt_info_nav_lo_.typical_execution_time = ORBSVCS_Time::zero ();
-  rt_info_nav_lo_.cached_execution_time = ORBSVCS_Time::zero ();
+  rt_info_nav_lo_.worst_case_execution_time = ORBSVCS_Time::zero;
+  rt_info_nav_lo_.typical_execution_time = ORBSVCS_Time::zero;
+  rt_info_nav_lo_.cached_execution_time = ORBSVCS_Time::zero;
   rt_info_nav_lo_.period = 10000000;
   rt_info_nav_lo_.importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  rt_info_nav_lo_.quantum = ORBSVCS_Time::zero ();
+  rt_info_nav_lo_.quantum = ORBSVCS_Time::zero;
   rt_info_nav_lo_.threads = 1;
   rt_info_nav_lo_.info_type = RtecScheduler::OPERATION;
   rt_info_weap_lo_ = rt_info_nav_lo_;
@@ -932,9 +932,9 @@ DualEC_Supplier::load_schedule_data ()
                       weap->weapon5_status = 0;
                       weap->utilization =       0.0;
                       weap->overhead =          0.0;
-                      weap->arrival_time =      ORBSVCS_Time::zero ();
-                      weap->completion_time  =  ORBSVCS_Time::zero ();
-                      weap->computation_time =  ORBSVCS_Time::zero ();
+                      weap->arrival_time =      ORBSVCS_Time::zero;
+                      weap->completion_time  =  ORBSVCS_Time::zero;
+                      weap->computation_time =  ORBSVCS_Time::zero;
                       weap->update_data =       update_data_;
 
                       // Insert the data into the queue.
@@ -963,9 +963,9 @@ DualEC_Supplier::load_schedule_data ()
                       nav->pitch = this->nav_pitch_;
                       nav->utilization =       0.0;
                       nav->overhead =          0.0;
-                      nav->arrival_time =      ORBSVCS_Time::zero ();
-                      nav->completion_time =   ORBSVCS_Time::zero ();
-                      nav->computation_time =  ORBSVCS_Time::zero ();
+                      nav->arrival_time =      ORBSVCS_Time::zero;
+                      nav->completion_time =   ORBSVCS_Time::zero;
+                      nav->computation_time =  ORBSVCS_Time::zero;
                       nav->update_data =       this->update_data_;
                       nav->utilization = (double) (20.0 + ACE_OS::rand() % 10);
                       nav->overhead = (double) (ACE_OS::rand() % 10);
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
index 89282308069..713aaa60bc3 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
@@ -17,12 +17,13 @@ CFG=DualEC_Sup - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DualEC_Sup - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DualEC_Sup - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DualEC_Sup - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "DualEC_Sup - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -65,7 +66,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -74,7 +75,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 

 !ENDIF 

 

@@ -128,19 +129,21 @@ SOURCE=.\NavWeapS.h
 # Begin Source File

 

 SOURCE=.\NavWeap.idl

+USERDEP__NAVWE="..\$(InputName).idl"	

 

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

 

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

 

-USERDEP__NAVWE="..\$(InputName).idl"	

 # Begin Custom Build

 InputPath=.\NavWeap.idl

 InputName=NavWeap

 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl  -I ..\..\..\ -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\..\bin\tao_idl -I ..\..\..\orbsvcs\

+ $(InputName).idl..\..\..\..\..\bin\tao_idl -I ..\..\..\orbsvcs $(InputName).idl\

+ \

 	

 

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

diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
index 5a508b9137e..f3619298fac 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 

 !ENDIF 

 

@@ -137,7 +137,7 @@ InputName=NavWeap
 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl    -I ..\..\..\  -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\..\bin\tao_idl -I ..\..\..\orbsvcs $(InputName).idl \

 	

 

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

diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index 2565d39232f..5007f65a7f5 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -294,9 +294,9 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
 
         navigation_.utilization =       0.0;
         navigation_.overhead =          0.0;
-        navigation_.arrival_time =      ORBSVCS_Time::zero ();
-        navigation_.completion_time =   ORBSVCS_Time::zero ();
-        navigation_.computation_time =  ORBSVCS_Time::zero ();
+        navigation_.arrival_time =      ORBSVCS_Time::zero;
+        navigation_.completion_time =   ORBSVCS_Time::zero;
+        navigation_.computation_time =  ORBSVCS_Time::zero;
         navigation_.update_data =       update_data_;
 
 
@@ -350,9 +350,9 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
         weapons_.weapon5_status = 0;
         weapons_.utilization =       0.0;
         weapons_.overhead =          0.0;
-        weapons_.arrival_time =      ORBSVCS_Time::zero ();
-        weapons_.completion_time  =  ORBSVCS_Time::zero ();
-        weapons_.computation_time =  ORBSVCS_Time::zero ();
+        weapons_.arrival_time =      ORBSVCS_Time::zero;
+        weapons_.completion_time  =  ORBSVCS_Time::zero;
+        weapons_.computation_time =  ORBSVCS_Time::zero;
         weapons_.update_data =       update_data_;
 
 
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
index fa79b9858ad..a490246ff9a 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
@@ -17,12 +17,13 @@ CFG=Logging_Sup - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Logging_Sup - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Logging_Sup - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Logging_Sup - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Logging_Sup - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -65,7 +66,7 @@ LINK32=link.exe
 # 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 "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

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

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

@@ -74,7 +75,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\orbsvcs"

 

 !ENDIF 

 

@@ -124,19 +125,19 @@ SOURCE=.\NavWeapC.h
 # Begin Source File

 

 SOURCE=.\NavWeap.idl

+USERDEP__NAVWE="..\$(InputName).idl"	

 

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

 

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

 

-USERDEP__NAVWE="..\$(InputName).idl"	

 # Begin Custom Build

 InputPath=.\NavWeap.idl

 InputName=NavWeap

 

 BuildCmds= \

 	xcopy ..\$(InputName).idl \

-	..\..\..\..\bin\tao_idl    -I ..\..\..\  -I ..\..\..\orbsvcs\orbsvcs $(InputName).idl \

+	..\..\..\..\..\bin\tao_idl  -I ..\..\..\orbsvcs $(InputName).idl \

 	

 

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

diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile b/TAO/examples/Simulator/Event_Supplier/Makefile
index 3c50e09c0f4..9da289eeabc 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile
+++ b/TAO/examples/Simulator/Event_Supplier/Makefile
@@ -20,22 +20,9 @@ EVENT_CON_OBJS = NavWeapC.o NavWeapS.o Event_Con.o
 LOGGING_SUP_OBJS = NavWeapC.o NavWeapS.o Logging_Sup.o DOVE_Supplier.o
 DUALEC_SUP_OBJS = NavWeapC.o NavWeapS.o DualEC_Sup.o DOVE_Supplier.o
 
-LDLIBS = -lorbsvcs -lTAO
-
-BIN2 = Event_Sup Logging_Sup DualEC_Sup Event_Con
+BIN = Event_Sup Logging_Sup DualEC_Sup Event_Con
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-    ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
-      ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-        BIN = $(BIN2)
-      endif # Naming
-    endif # Time
-  endif # Sched
-endif # Event
+LDLIBS = -lorbsvcs -lTAO
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -76,7 +63,8 @@ DualEC_Sup: $(addprefix $(VDIR),$(DUALEC_SUP_OBJS))
 Event_Con: $(addprefix $(VDIR),$(EVENT_CON_OBJS))
 
 realclean: clean
-	-$(RM) NavWeap.idl NavWeap[CS].* NavWeap[CS]_T.*
+	-/bin/rm -rf NavWeap.idl NavWeap[CS].* NavWeap[CS]_T.*
+
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -355,7 +343,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -642,7 +630,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -929,7 +917,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
@@ -1329,7 +1317,7 @@ realclean: clean
  $(TAO_ROOT)/tao/Stub.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/Server_Request.h \
diff --git a/TAO/examples/Simulator/Event_Supplier/svc.conf b/TAO/examples/Simulator/Event_Supplier/svc.conf
index eb4772f319e..43c6a486c92 100644
--- a/TAO/examples/Simulator/Event_Supplier/svc.conf
+++ b/TAO/examples/Simulator/Event_Supplier/svc.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/examples/Simulator/NavWeap.idl b/TAO/examples/Simulator/NavWeap.idl
index ded20426e61..af9fd81f804 100644
--- a/TAO/examples/Simulator/NavWeap.idl
+++ b/TAO/examples/Simulator/NavWeap.idl
@@ -14,7 +14,7 @@
 //     Chris Gill <cdgill@cs.wustl.edu>
 // ========================================================================================================= 
 
-#include "TimeBase.idl"
+#include "CosTimeBase.idl"
 
 struct Navigation {
 	long position_latitude;
diff --git a/TAO/examples/TAO_Examples.dsw b/TAO/examples/TAO_Examples.dsw
index 113578b551a..bc8cd6750db 100644
--- a/TAO/examples/TAO_Examples.dsw
+++ b/TAO/examples/TAO_Examples.dsw
@@ -3,21 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "POA Adapter Activator Server"=.\POA\Adapter_Activator\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "POA DSI Client"=.\POA\DSI\client.dsp - Package Owner=<4>

 

 Package=<5>

@@ -144,7 +129,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "POA Identity"=.\POA\Identity\Identity.dsp - Package Owner=<4>

+Project: "POA Loader Server"=.\POA\Loader\server.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -152,11 +137,14 @@ Package=<5>
 

 Package=<4>

 {{{

+    Begin Project Dependency

+    Project_Dep_Name POA Generic Servant DLL

+    End Project Dependency

 }}}

 

 ###############################################################################

 

-Project: "POA Loader Server"=.\POA\Loader\server.dsp - Package Owner=<4>

+Project: "POA Locking"=.\POA\locking\locking.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -164,9 +152,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name POA Generic Servant DLL

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -213,18 +198,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "POA Reference Counted Servant Server"=.\POA\Reference_Counted_Servant\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "POA RootPOA"=.\POA\RootPOA\RootPOA.dsp - Package Owner=<4>

 

 Package=<5>

@@ -309,30 +282,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Simple Bank Client"=.\Simple\bank\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Simple Bank Server"=.\Simple\bank\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Simple Echo Client"=.\Simple\echo\client.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/man/man1/TAO_Concurrency_Service.1 b/TAO/man/man1/TAO_Concurrency_Service.1
deleted file mode 100644
index 27d277addfe..00000000000
--- a/TAO/man/man1/TAO_Concurrency_Service.1
+++ /dev/null
@@ -1,53 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii TAO_Concurrency_Service.1
-.\"
-.\" $Id$
-.\"
-.TH TAO_Concurrency_Service 1 "April 1999" "CORBA Tools"
-.SH NAME
-TAO_Concurrency_Service \- The TAO Concurrency Service
-.SH SYNOPSIS
-.B TAO_Concurrency_Service
-.B [
-\-d
-.B ]
-.B [
-\-s
-.B ]
-.B [
-\-o
-IOR_output_file
-.B ]
-.SH DESCRIPTION
-.B TAO_Concurrency_Service
-is an implentation of the CORBA Concurrency Service.  It provides a mechanism
-that allows clients to acquire and release various types of locks in a
-distributed system.
-.SH OPTIONS
-.TP
-.B \-d
-enable debugging
-.TP
-.B \-s
-prevent the concurrency server from using the naming server
-.TP
-.BI \-o IOR_output_file
-output the IOR of the lock set factory to a specified file
-.SH BUGS
-(blank for now)
-.SH AUTHORS
-.IP
-Torben Worm <tworm@cs.wustl.edu>
-.IP
-Ossama Othman <othman@cs.wustl.edu>
-.SH "SEE ALSO"
-.BR TAO (7),
-.BR TAO_CosEvent_Service (1),
-.BR TAO_Event_Service (1),
-.BR TAO_ImplRepo_Service (1),
-.BR TAO_LifeCycle_Service (1),
-.BR TAO_Logging_Service (1),
-.BR TAO_Naming_Service (1),
-.BR TAO_Scheduling_Service (1),
-.BR TAO_Time_Service (1),
-.BR TAO_Trading_Service (1)
diff --git a/TAO/man/man1/TAO_CosEvent_Service.1 b/TAO/man/man1/TAO_CosEvent_Service.1
deleted file mode 100644
index 2a0830d8781..00000000000
--- a/TAO/man/man1/TAO_CosEvent_Service.1
+++ /dev/null
@@ -1,88 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii TAO_CosEvent_Service.1
-.\"
-.\" $Id$
-.\"
-.TH TAO_CosEvent_Service 1 "April 1999" "CORBA Tools"
-.SH NAME
-TAO_CosEvent_Service \- The TAO COS compliant Event Service
-.SH SYNOPSIS
-.B TAO_CosEvent_Service
-.B [
-.I OPTIONS
-.B ]
-.SH DESCRIPTION
-.B TAO_CosEvent_Service
-is a COS compilant Event Service.  The service is registered with the naming
-service with the name "CosEventService." It exposes the EventChannel interface
-which can be used by suppliers and consumers to send and receive events.
-
-TAO_Naming_Service (1) and TAO_Event_Service (1) must be running in order to
-run the Event Channel.
-.SH OPTIONS
-.TP
-.BI \-n \ COS_Event_Service_Name
-specify the name with which to register the Event Service
-.TP
-.BI \-r \ Real_Time_Event_Service_Name
-specify the name with which to
-.I look
-for the RtEC
-.TP
-.BI \-s \ global | local
-specify if the scheduler is
-.I local
-or
-.I global
-
-If the scheduler option is
-.I global
-then the naming service is to locate the scheduling service with the name
-"ScheduleService."
-
-If the scheduler is
-.I local
-then a new scheduling service is created and started.
-.I local
-is the default.
-.TP
-.B \-l
-specify that a local Real Time Event Channel (RtEC).
-
-If you specify this option but no RtEC is already running, then the 
-TAO_CosEvent_Service starts its oewn RtEC.
-.SH FILTERING OPTIONS
-The following options are used to introduce a filtering mechanism for the Event
-Channel based on event types and source IDs.
-.TP
-.BI \-e \ "EventType_1\ EventType_2\ ..."
-specify the event types for the ConsumerQOS.  The ConsumerQOS is specified
-when the RtEC is being set up.
-
-The event types should be >= ACE_ES_EVENT_UNDEFINED = 16.  For example, \-e
-"17 20 40" specifies that event types with IDs 17, 20 and 40 should be passed
-to the consumers.
-.TP
-.BI \-o \ "EventSourceID_1\ EventSourceID_2\ ..."
-specify the source IDs for the ConsumerQOS.
-.TP
-.BI \-p \ "sourceID\ EventTypeID"
-specify a sourceID and event type pair for the Supplier QOS.
-.SH BUGS
-(blank for now)
-.SH AUTHORS
-.IP
-Pradeep Gore <pradeep@cs.wustl.edu>
-.IP
-Ossama Othman <othman@cs.wustl.edu>
-.SH "SEE ALSO"
-.BR TAO (7),
-.BR TAO_Concurrency_Service (1),
-.BR TAO_Event_Service (1),
-.BR TAO_ImplRepo_Service (1),
-.BR TAO_LifeCycle_Service (1),
-.BR TAO_Logging_Service (1),
-.BR TAO_Naming_Service (1),
-.BR TAO_Scheduling_Service (1),
-.BR TAO_Time_Service (1),
-.BR TAO_Trading_Service (1)
diff --git a/TAO/man/man1/TAO_Event_Service.1 b/TAO/man/man1/TAO_Event_Service.1
deleted file mode 100644
index 973e3cabca0..00000000000
--- a/TAO/man/man1/TAO_Event_Service.1
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii TAO_Event_Service.1
-.\"
-.\" $Id$
-.\"
-.TH TAO_Event_Service 1 "April 1999" "CORBA Tools"
-.SH NAME
-TAO_Event_Service \- The TAO Real-time Event Service
-.SH SYNOPSIS
-.B TAO_Event_Service
-.B [
-.I OPTIONS
-.B ]
-.SH DESCRIPTION
-.B TAO_Event_Service
-
-.SH OPTIONS
-.TP
-.BI \-n \ service_name
-specify the name with which to register the Event Service
-.TP
-.BI \-s \ global | local
-specify if the scheduler is
-.I local
-or
-.I global
-
-If the scheduler option is
-.I global
-then the naming service is to locate the scheduling service with the name
-"ScheduleService."
-
-If the scheduler is
-.I local
-then a new scheduling service is created and started.
-.I local
-is the default.
-.TP
-.B \-t \ null_filtering | reactive | old_reactive | old_mt
-(FIXME: NEED OPTION DESCRIPTIONS)
-.SH BUGS
-(blank for now)
-.SH AUTHORS
-.IP
-Carlos O'Ryan <coryan@cs.wustl.edu>
-.IP
-Ossama Othman <othman@cs.wustl.edu>
-.SH "SEE ALSO"
-.BR TAO (7),
-.BR TAO_Concurrency_Service (1),
-.BR TAO_CosEvent_Service (1),
-.BR TAO_ImplRepo_Service (1),
-.BR TAO_LifeCycle_Service (1),
-.BR TAO_Logging_Service (1),
-.BR TAO_Naming_Service (1),
-.BR TAO_Scheduling_Service (1),
-.BR TAO_Time_Service (1),
-.BR TAO_Trading_Service (1)
diff --git a/TAO/man/man7/TAO.7 b/TAO/man/man7/TAO.7
deleted file mode 100644
index 62439260be5..00000000000
--- a/TAO/man/man7/TAO.7
+++ /dev/null
@@ -1,386 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii TAO.7
-.\"
-.\" $Id$
-.\"
-.TH TAO 7 "April 1999" "CORBA Tools"
-.SH NAME
-TAO \- The ACE ORB
-.SH SYNOPSIS
-.B TAO_Application
-.B [
-.I TAO OPTIONS
-.B ]
-.SH DESCRIPTION
-.B TAO
-is a high performance real-time
-.SM CORBA
-.SM ORB.
-All applications that use TAO can take advantage of the environment variables
-and command line options described in this manual page.
-.SH TAO ENVIRONMENT VARIABLES
-.TP
-.B NameServiceIOR
-Specifies which IOR the TAO Naming Service is listening on.
-.TP
-.B NameServicePort
-Specifies which port the TAO Naming Service is listening on.
-.TP
-.B TradingServiceIOR
-Specifies which IOR the TAO Trading Service is listening on.
-.TP
-.B TradingServicePort
-Specifies which port the Trading Service is listening on.
-.TP
-.B TAO_ORB_DEBUG
-Enables TAO debugging mode.
-.SH TAO OPTIONS
-The following components can be tuned via options:
-.IP
-.B CORBA::ORB
-.IP
-.B TAO_Resource_Factory
-.IP
-.B TAO_Default_Server_Strategy_Factory
-.IP
-.B TAO_Default_Client_Strategy_Factory
-.TP
-.B CORBA::ORB
-Typically, CORBA::ORB options are set via command line parameters, while the
-rest of the options are set via the service configurator
-.B (svc.conf)
-file.
-.IP
-.BI \-ORBsvcconf \ config_file_name
-\ \ Specifies the name of the file from which it will read dynamic service
-configuration directives ala ACE's Service Configurator.
-.IP
-.BI \-ORBsvcconfdirective \ directivestring
-\ \ Specifies a service configuration directive, which is passed to ACE's
-Service Configurator.
-.IP
-.B \-ORBdaemon
-\ \ Specifies that the ORB should daemonize itself.
-.IP
-.BI \-ORBdebug
-\ \ Turns on the output of debugging messages within ACE's Service
-Configurator componentry.
-.IP
-.BI \-ORBdebuglevel \ level
-\ \ Control the level of debugging in the ORB. Higher number produce more
-output (try 10).
-.IP
-.BI \-ORBhost \ hostname
-\ \  Tells the Object Adapter to listen for requests on the interface associated with the host named
-.I hostname.
-.IP
-.BI \-ORBport \ portspec
-\ \ Tells the Object Adapter to listen for requests on the port specified by
-.IR portspec ,
-which can be a name as found in
-.B /etc/services
-or a number. The default is 10013.
-.IP
-.BI \-ORBobjrefstyle \ IOR | URL
-\ \ Specifies the user-visible style of object references.
-.B IOR 
-is the traditional nonsensical object reference.
-.B URL
-makes the object reference look more like a URL.
-.IP
-.BI \-ORBtablesize \ object_table_size
-\ \ Specifies the size of the object table as a positive, non-zero integer. If
-not specified, the default is 64.
-.IP
-.BI \-ORBrcvsock \ receive_qabuffer_size
-\ \ Specify the size of the socket receive buffer as a positive, non-zero
-integer. If not specified, the system-dependent default is used.
-.IP
-.BI \-ORBsndsock \ send_buffer_size
-\ \ Specify the size of the socket send buffer as a positive, non-zero
-integer. If not specified, the system-dependent default is used.
-.IP
-.BI \-ORBnameserviceport \ portspec
-\ \ Specifies which port the Naming Service is listening on.
-.IP
-.BI \-ORBnameserviceior \ IOR
-\ \ Specifies the
-.I IOR
-for the Naming Service.
-.IP
-.BI \-ORBtradingserviceior \ IOR
-\ \ Specifies the
-.I IOR
-for the Trading Service.
-.IP
-.BI \-ORBtradingserviceport \ portspec
-\ \ Specifies which port the Trading Service is listening on.
-.IP
-.BI \-ORBcollocation \ yes | no
-\ \ Specifies the use of collocation object optimization. Default is
-.IR yes .
-.IP
-.BI \-ORBpreconnect \ host:port
-.BR [,
-.I host:port
-.RB ... ]
-\ \ Pre-establishes a blocking connection to each listed host:port combination.
-If a connection cannot be established, a warning is announced and it continues
-with the next listed. Listing the same combination multiple times will properly
-establish multiple connections to that endpoint.
-.IP
-.BI \-ORBcdrtradeoff \ maxsize
-\ \ Control the strategy to tradeoff between copy vs no copy marshalling of
-octet sequences. If an octet sequence is smaller than maxsize and the current
-message block contains enough space for it the octet sequence is copied instead
-of appended to the CDR stream.
-.IP
-.B \-ORBgioplite
-\ \ Enable a lightweight version of the GIOP protocol. This protocol removes
-some of the fields in the GIOP and the Request header. It only works on
-homogenous environments.
-.IP
-.BI \-ORBdotteddecimaladdresses \ boolean
-(0/1)   Use the dotted decimal notation for addresses.
-.IP
-.BI \-ORBInitRef\  ObjectId=IOR
-\ \ Allows specification of an arbitrary object reference for an initial
-service. The IOR could be in the one of the following formats:
-.BR OMG\ IOR , \ URL \ or \ iioploc
-form.
-.B iioploc
-is a multiple end-point IORs understood by
-.B string_to_object\ ()
-and used as a boot-strapping mechanism by
-.BR resolve_initial_references\ () .
-The mappings specified through this argument override the
-.B orb-install-time
-defaults.
-.IP
-.BI \-ORBDefaultInitRef \ IOR_prefix
-\ \ This argument allows resolution of initial references not explicitly
-specified with -ORBInitRef. It requires a URL prefix that, after appending a
-slash
-.B '/'
-and a simple object key, forms a new URL to identify an initial object
-reference. The URL prefix format currently supported is iioploc.
-.TP
-.B TAO_Resource_Factory
-.IP
-.BI \-ORBresources \ global | tss
-\ \ Specify whether each thread uses a global or a thread\-specific (
-.I tss
-) instance for the resources it returns.
-.IP
-.BI \-ORBpoa \ global | tss
-\ \ Specify whether each thread uses a global or a thread\-specific (
-.I tss
-) instance for the Root POA.
-.IP
-.BI \-ORBreactorlock \ token | null
-\ \ Specify whether the ORB reactor is thread\-safe (
-.I token
-) or not (
-.I null
-). Default is
-.IR token .
-.IP
-.BI \-ORBcoltable \ global | orb
-\ \ Specify whether each ORB uses a global or a per\-ORB (
-.I orb
-) collocation table.
-.IP
-.BI \-ORBinputcdrallocator \ global | tss
-\ \ Specify whether the ORB uses a global or a per\-thread (
-.I tss
-) allocator for the incoming CDR buffers. Though
-.I tss
-should give the optimal performance; we made the default
-.IR global .
-TAO optimizations for octet sequences will not work when returning that data
-type if the allocator is
-.IR tss .
-Using a
-.I global
-allocator also allows the users to take advantage of the TAO octet sequence
-extensions to preserve the buffer after the upcall.
-.TP
-.B TAO_Default_Server_Strategy_Factory
-.IP
-.IR Note :
-.B \-ORBdemuxstrategy
-flag has been changed to
-.B \-ORBsystemidpolicydemuxstrategy
-and
-.BR \-ORBuseridpolicydemuxstrategy .
-.IP
-.IR Note :
-.B \-ORBtablesize
-flag has been changed to
-.BR \-ORBactiveobjectmapsize .
-.IP
-.BI \-ORBconcurrency \ reactive | thread\-per\-connection 
-\ \ Specify which concurrency strategy to use. Range of values is
-.I reactive
-for
-a purely Reactor\-driven concurrency strategy or
-.I thread\-per\-connection
-for creating a new thread to service each connection.
-.IP
-.BI \-ORBactiveobjectmapsize \ active_object_map_size
-\ \ Specify the size of the active object map. If not specified, the default
-value is 64.
-.IP
-.BI \-ORBuseridpolicydemuxstrategy \ dynamic | linear
-\ \ Specify the demultiplexing lookup strategy to be used with the user ID
-policy.  This option defaults to use the
-.I dynamic
-strategy.
-.IP
-.BI \-ORBsystemidpolicydemuxstrategy \ dynamic | linear | active
-\ \ Specify the demultiplexing lookup strategy to be used with the system ID
-policy.  This option defaults to use the
-.I active
-strategy. 
-.IP
-.BI \-ORBuniqueidpolicyreversedemuxstrategy \ dynamic | linear
-\ \ Specify the reverse demultiplexing lookup strategy to be used with the
-unique ID policy.  This option defaults to use the
-.I dynamic
-strategy. 
-.IP
-.BI \-ORBallowreactivationofsystemids \ 0 | 1
-\ \ Specify whether system ids can be reactivated, i.e., once an id that was
-generated by the system has be deactivated, will the user reactivate a new
-servant using the old ID. If the user is not going to use this feature, the
-IORs can be shortened, an extra comparison in the critical upcall path removed,
-and some memory on the server side can be saved.  This option defaults to
-.IR 1 .
-.IP
-.BI \-ORBactivehintinids \ 0 | 1
-\ \ Specify whether an active hint should be added to IDs. With active hints,
-IDs can be found quickly. However, they lead to larger IORs. Note that this
-option is disregarded if
-.B \-ORBallowreactivationofsystemids
-is set to
-.IR 0 .
-The
-.B \-ORBactivehintinids
-option can be
-.IR 0 \ or \ 1 .
-This option defaults to
-.IR 1 .
-.IP
-.BI \-ORBpoamapsize \ poa_map_size
-\ \ Specify the size of the POA map. If not specified, the default value is 24.
-.IP
-.BI \-ORBpersiententidpolicydemuxstrategy \ dynamic | linear
-\ \ Specify the demultiplexing lookup strategy to be used with the persistent
-ID policy.  This option defaults to use the
-.I dynamic
-strategy.
-.IP
-.BI \-ORBtransientidpolicydemuxstrategy \ dynamic | linear | active
-\ \ Specify the demultiplexing lookup strategy to be used with the transient ID
-policy.  This option defaults to use the
-.I active
-strategy. 
-.IP
-.BI \-ORBactivehintinpoanames \ 0 | 1
-\ \ Specify whether an active hint should be added to POA names. With active
-hints, POA names can be found quickly. However, they lead to larger IORs.  This
-option defaults to
-.IR 1 .
-.IP
-.BI \ -ORBthreadflags \ thread_flags
-\ \ Specify the flags used for thread creation. Flags can be any logical\-OR
-combination of
-.BR THR_DETACHED ,
-.BR THR_BOUND ,
-.B THR_NEW_LWP
-and
-.BR THR_SUSPENDED .
-.IP
-.BI \-ORBpoalock \ thread | null
-\ \ Specify the type of lock to be used for POA accesses.
-.I thread
-specifies that an inter\-thread mutex is used to guarantee exclusive
-access and
-.I null
-specifies that no locking be performed. The default is
-.IR thread .
-.IP
-.BI \-ORBcoltbllock \ thread | null
-\ \ Specify the type of lock to be used for the global collocation table.
-.I thread
-specifies that an inter\-thread mutex is used to guarantee exclusive access
-and
-.I null
-specifies that no locking be performed. The default is
-.IR thread .
-.IP
-.BI \-ORBconnectorlock \ thread | null
-\ \ Specify the type of lock to be used by the connector.
-.I thread
-specifies that an inter\-thread mutex is used to guarantee exclusive access
-and
-.I null
-specifies that no locking be performed. The default is
-.IR thread .
-.TP
-.B TAO_Default_Client_Strategy_Factory
-.IP
-.BI \-ORBiiopprofilelock \ thread | null
-\ \ Specify, whether to use a lock for accessing the IIOP Profile or not.
-Default is
-.IR thread ,
-which means that a lock is used. The second option is
-.IR null ,
-which means a
-.B null
-lock is used. This makes sense in case of optimizations and is allowed when no
-forwarding is used or only a single\-threaded client.
-.IP
-.BI \-ORBclientconnectionhandler \ MT | ST | RW
-.IP
-.I MT
-means use the multi\-threaded client connection handler which uses the leader
-follower model. This model allows the use of multiple threads with a single
-Reactor.
-.IP
-.I ST
-means use the single\-threaded client connection handler, i.e., the leader
-follower model will not be used. However,
-.I ST
-does support nested upcalls and handling of new requests while waiting for the
-reply from a server. 
-.IP
-.I RW
-selects a strategy that simply blocks in
-.B recv()
-when waiting for a response from the server instead of waiting in the Reactor.
-The
-.I RW
-strategy only works when the application does not have to worry about new
-request showing up when waiting for a response. Therefore, this strategy is
-appropriate only for "pure" clients. Note that applications with nested upcalls
-are not "pure" clients.  Also note that this strategy will only effect two way
-calls, since there is no waiting for one way calls. This strategy can also be
-used in an application that is both a client and a server if the server side is
-handled by a separate thread and the client threads are "pure" clients.
-.IP
-Default for this option is
-.IR MT .
-.SH AUTHORS
-Center for Distributed Object Computing <http://www.cs.wustl.edu/~schmidt/doc-center.html>
-.SH "SEE ALSO"
-.BR TAO_Concurrency_Service (1),
-.BR TAO_CosEvent_Service (1),
-.BR TAO_Event_Service (1),
-.BR TAO_ImplRepo_Service (1),
-.BR TAO_LifeCycle_Service (1),
-.BR TAO_Logging_Service (1),
-.BR TAO_Naming_Service (1),
-.BR TAO_Scheduling_Service (1),
-.BR TAO_Time_Service (1),
-.BR TAO_Trading_Service (1)
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp
index 2b3e265d35a..b611e3593ff 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsp
@@ -13,16 +13,18 @@ CFG=Concurrency_Service - Win32 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 "Concurrency_Service.mak" CFG="Concurrency_Service - Win32 Debug"

+!MESSAGE NMAKE /f "Concurrency_Service.mak"\

+ CFG="Concurrency_Service - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Concurrency_Service - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Concurrency_Service - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Concurrency_Service - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "Concurrency_Service - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -39,10 +41,9 @@ RSC=rc.exe
 # 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 "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /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

@@ -50,7 +51,7 @@ BSC32=bscmake.exe
 # 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 /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# 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 /nologo /subsystem:console /machine:I386

 

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

 

diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile b/TAO/orbsvcs/Concurrency_Service/Makefile
index c16764fd998..b72d46a343a 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile
@@ -5,25 +5,21 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-SRC = Concurrency_Service.cpp
+BIN 	= Concurrency_Service
+
+SRC=Concurrency_Service.cpp
 
 LDLIBS  = -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = Concurrency_Service
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Concurrency
+BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -43,10 +39,6 @@ endif
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -55,6 +47,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -119,32 +114,57 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -171,68 +191,28 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(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/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Concurrency/Concurrency_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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -254,8 +234,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -272,65 +255,39 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
@@ -348,11 +305,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
deleted file mode 100644
index 083ebfe5f1c..00000000000
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Concurrency Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Concurrency_Service
-
-Concurrency_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Concurrency_Service_SOURCES = \
-        Concurrency_Service.cpp
-
-noinst_HEADERS = \
-        Concurrency_Service.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Concurrency_Service/svc.conf b/TAO/orbsvcs/Concurrency_Service/svc.conf
new file mode 100644
index 00000000000..da10b90ce7a
--- /dev/null
+++ b/TAO/orbsvcs/Concurrency_Service/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
index cf87f55089f..ada0e5ff4ba 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.cpp
@@ -2,12 +2,27 @@
 
 #include "ace/Get_Opt.h"
 #include "CosEvent_Service.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+
+// @@ Pradeep: somehow the user should be able to specify if the EC is
+// to be instantiated locally or if you want to use a remote EC.
+// Please check the real-time Event_Service and how they manage
+// optionally create a scheduling service.
 
 CosEvent_Service::CosEvent_Service (void)
   : service_name ("CosEventService"),
     rt_service_name ("EventService"),
-    remote_Rtec_ (0)
+    schedule_name_ ("ScheduleService"),
+    ec_impl_ (0,
+              ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+              &module_factory_),
+    rtec_ (RtecEventChannelAdmin::EventChannel::_nil ()),
+    scheduler_ (RtecScheduler::Scheduler::_nil ()),
+    cos_ec_ (CosEventChannelAdmin::EventChannel::_nil ()),
+    global_scheduler_ (0),
+    remote_Rtec_ (1),
+    eventTypeIds_ (0),
+    eventSourceIds_ (0),
+    source_type_pairs_ (0)
 {
   // No-Op.
 }
@@ -17,38 +32,51 @@ CosEvent_Service::~CosEvent_Service (void)
   // No-Op.
 }
 
-void
-CosEvent_Service::init_ORB  (int argc, char *argv [],
-                             CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::init_ORB  (int argc, char *argv [])
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                "",
-                                ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    this->poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      this->orb_ = CORBA::ORB_init (argc,
+                                    argv,
+                                    "",
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      CORBA::Object_var poa_object  =
+        this->orb_->resolve_initial_references("RootPOA",
+                                               TAO_TRY_ENV);
+      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 (),
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      PortableServer::POAManager_var poa_manager =
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      return 0;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::init_ORB");
+      return -1;
+    }
+  TAO_ENDTRY;
 }
 
 int
 CosEvent_Service::parse_args (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "t:n:e:o:p:r");
+  ACE_Get_Opt get_opt (argc, argv, "r:n:s:e:o:p:l");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -59,12 +87,32 @@ CosEvent_Service::parse_args (int argc, char *argv [])
           this->service_name = get_opt.optarg;
           break;
 
-        case 't':
+        case 'r':
           this->rt_service_name = get_opt.optarg;
           break;
 
-        case 'r':
-          this->remote_Rtec_ = 1;
+        case 's':
+          if (ACE_OS::strcasecmp (get_opt.optarg, "global") == 0)
+            {
+              this->global_scheduler_ = 1;
+            }
+          else if (ACE_OS::strcasecmp (get_opt.optarg, "local") == 0)
+            {
+              this->global_scheduler_ = 0;
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Unknown scheduling type <%s> "
+                          "defaulting to local\n",
+                          get_opt.optarg));
+              this->global_scheduler_ = 0;
+              return -1;
+            }
+          break;
+
+        case 'l':
+          this->remote_Rtec_ = 0;
           break;
 
         case 'e':
@@ -83,13 +131,14 @@ CosEvent_Service::parse_args (int argc, char *argv [])
         default:
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
-                      "\n\t-n <COS Event Service name>"
-                      "\n\t-t <RealTime Event Service name>"
-                      "\n\t-r" // creates the RtEC locally.
-                      "\n\t-e [\"EventType_1, EventType_2...\"] for ConsumerQOS."
-                      "\n\t-o [\"EventSourceID_1, [EventSourceID_2...\"] for ConsumerQOS."
-                      "\n\t-p [\"Source, Event\" pairs] for SupplierQOS."
-                      "\n",
+                      " -n <COS Event Service name>"
+                      " -r <RealTime Event Service name>"
+                      " -s <global|local>"
+                      " -l" // creates the RtEC locally.
+                      " -e [\"EventType_1, EventType_2...\"] for ConsumerQOS."
+                      " -o [\"EventSourceID_1, [EventSourceID_2...\"] for ConsumerQOS."
+                      " -p [\"Source, Event\" pair] for SupplierQOS."
+                      " \n",
                       argv[0]));
           return -1;
         }
@@ -98,206 +147,491 @@ CosEvent_Service::parse_args (int argc, char *argv [])
   return 0;
 }
 
-void
-CosEvent_Service::startup (int argc, char *argv[],
-                           CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::init_NamingService (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Starting up the CosEvent Service...\n"));
-
-  // initalize the ORB.
-  this->init_ORB (argc, argv,
-                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->resolve_naming_service (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->init (this->poa_,
-              this->poa_,
-              this->eventTypeIds_,
-              this->eventSourceIds_,
-              this->source_type_pairs_,
-              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->activate (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Register ourselves with the naming service.
-  ACE_ASSERT(!CORBA::is_nil (this->naming_.in ()));
-
-  CORBA::Object_var obj =
-    this->poa_->servant_to_reference (this,
-                                      ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::String_var str =
-    this->orb_->object_to_string (obj.in (), ACE_TRY_ENV);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "The CosEC IOR is <%s>\n", str.in ()));
-
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->service_name);
-
-  this->naming_->rebind (name,
-                         obj.in (),
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Registered with the naming service as: %s\n",
-              this->service_name));
+  TAO_TRY
+  {
+    // Initialization of the naming service.
+    if (this->naming_client_.init (this->orb_.in ()) != 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%P|%t) Unable to initialize "
+                           "the TAO_Naming_Client. \n"),
+                        -1);
+    return 0;
+  }
+ TAO_CATCHANY
+   {
+     TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::get_Rtec_viaNamingService\n");
+     return -1;
+   }
+ TAO_ENDTRY;
 }
 
-POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEvent_Service::create_rtec (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::get_Rtec_viaNamingService (void)
 {
-  // see if the user wants a local Rtec..
-  if (this->remote_Rtec_ == 0)
-    return CosEC_ServantBase::create_rtec (ACE_TRY_ENV);
-  else
-    return 0;
+  TAO_TRY
+    {
+      CosNaming::Name rt_ref_name (1); // name of the RT Event service.
+      rt_ref_name.length (1);
+      rt_ref_name[0].id =
+      CORBA::string_dup (this->rt_service_name);
+
+      CORBA::Object_var rtEC_obj =
+       this->naming_client_->resolve (rt_ref_name,
+				      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // The CORBA::Object_var object is downcast to
+      // RtecEventChannelAdmin::EventChannel
+      // using the <_narrow> method.
+      this->rtec_ =
+        RtecEventChannelAdmin::EventChannel::_narrow (rtEC_obj.in (),
+                                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      return 0;
+  }
+ TAO_CATCHANY
+   {
+     TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::get_Rtec_viaNamingService\n");
+     return -1;
+   }
+ TAO_ENDTRY;
 }
 
-void
-CosEvent_Service::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::start_Scheduler (void)
 {
-  // see if the user wants to use a local Rtec..
-  if (this->remote_Rtec_ == 0)
+  TAO_TRY
     {
-      CosEC_ServantBase::activate_rtec (ACE_TRY_ENV);
-      ACE_CHECK;
+      if (this->global_scheduler_ == 0)
+        {
+          this->scheduler_ =
+            this->scheduler_impl_._this (TAO_TRY_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+          CORBA::String_var str =
+            this->orb_->object_to_string (this->scheduler_.in (),
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+          ACE_DEBUG ((LM_DEBUG,
+                      "CosEvent_Service: The (local) scheduler IOR is <%s>\n",
+                      str.in ()));
+
+          if (ACE_Scheduler_Factory::server (this->scheduler_.in ()) == -1)
+            return -1;
+        }
+      else // get the global scheduler
+        {
+          CosNaming::Name schedule_name (1);
+          schedule_name.length (1);
+          schedule_name[0].id = CORBA::string_dup (this->schedule_name_);
+
+          CORBA::Object_var sched_obj =
+            this->naming_client_->resolve (schedule_name,
+                                           TAO_TRY_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+          // The CORBA::Object_var object is downcast to
+          // RtecScheduler::Scheduler using the <_narrow> method.
+          this->scheduler_ =
+            RtecScheduler::Scheduler::_narrow (sched_obj.in (),
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+          if (ACE_Scheduler_Factory::server (this->scheduler_.in ()) == -1)
+            return -1;
+        }
+
+      ACE_Scheduler_Factory::use_config (this->naming_client_.get_context());
+      return 0;
     }
-  else
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::start_Scheduler\n");
+      return -1;
+    }
+  TAO_ENDTRY;
+}
+int
+CosEvent_Service::create_local_RtecService (void)
+{
+ TAO_TRY
+    {
+      this->rtec_ = this->ec_impl_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+
+      CORBA::String_var str = this->orb_->object_to_string (this->rtec_.in (),
+                                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "CosEvent_Service: The RTEC IOR is <%s>\n",
+                  str.in ()));
+
+      this->ec_impl_.activate ();
+
+      return 0;
+    }
+  TAO_CATCHANY
     {
-      // Try to locate a remote rtec.
-      this->locate_rtec (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Use the return value to check success.
-      if (CORBA::is_nil (this->rtec_.in ()))
-        ACE_DEBUG ((LM_DEBUG,
-                    "Could not locate a RT EventChannel.Please start one and try again\n"));
-      ACE_CHECK;
+      TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::create_local_RtecService\n");
+      return -1;
     }
+  TAO_ENDTRY;
 }
 
 void
-CosEvent_Service::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEvent_Service::init_SupplierQOS (RtecScheduler::handle_t supp_handle)
 {
-  // Check if the local rtec is to be deactivated.
-  if (this->remote_Rtec_ == 0)
+  // @@ Pradeep: It is very important that you make the type of
+  // events generated by the CosEC an option.
+  // I know this is not very well documented, but the type should
+  // be >= ACE_ES_EVENT_UNDEFINED = 16
+  // Something else: please make the EventSourceID for the
+  // supplier also an option...
+
+  char c = ' '; // space
+  char *tok = 0;
+
+ // if nothing was specified on the command line use defaults..
+  if (this->source_type_pairs_ == 0)
+    this->supplier_qos_.insert (1,
+                                ACE_ES_EVENT_ANY,
+                                supp_handle,
+                                1);
+  else // parse the event types..
     {
-      CosEC_ServantBase::deactivate_rtec (ACE_TRY_ENV);
-      ACE_CHECK;
+      tok = ACE_OS::strtok (this->source_type_pairs_, &c);
+      if (tok == 0) // error
+        {
+          ACE_DEBUG ((LM_DEBUG, "error parsing source,event pairs for SupplierQOS, defaulting to source id = 1, eventid = ACE_ES_EVENT_ANY"));
+
+          this->supplier_qos_.insert (1,
+                                      ACE_ES_EVENT_ANY,
+                                      supp_handle,
+                                      1);
+        }
+      else
+        // we just use 1 source-type pair in the event channel.
+        // so scan for the 1st pair only.
+        {
+          int source_val = 0, type_val = 0;
+          source_val = ACE_OS::atoi (tok);
+
+          tok = ACE_OS::strtok (0, &c);
+
+          if (tok != 0)
+            type_val = ACE_OS::atoi (tok);
+
+          ACE_DEBUG ((LM_DEBUG, "supplier_qos::insert (%d, %d)\n",
+                      source_val, type_val));
+
+          // Setup the QOS params..
+          this->supplier_qos_.insert (source_val,
+                                      type_val,
+                                      supp_handle,
+                                      1);
+        }
     }
 }
 
 void
-CosEvent_Service::locate_rtec (CORBA::Environment &ACE_TRY_ENV)
+CosEvent_Service::init_ConsumerQOS (RtecScheduler::handle_t cons_handle)
 {
-  CosNaming::Name ref_name (1);
-  ref_name.length (1);
-  ref_name[0].id =
-    CORBA::string_dup (this->rt_service_name);
-
-  CORBA::Object_var obj =
-    this->naming_->resolve (ref_name,
-                            ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->rtec_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (obj.in (),
-                                                  ACE_TRY_ENV);
-  ACE_CHECK;
+  // @@ Pradeep: ditto here, make the set of sources (and/or type)
+  // a parameter, and make sure the user can specify multiple of
+  // them (just call insert_source() or insert_type() in the
+  // parse_args routine).
+
+  char c = ' '; // space
+  char *tok = 0;
+
+  this->consumer_qos_.start_disjunction_group ();
+
+  // insert the event ids first..
+
+  // if nothing was specified on the command line use defaults..
+  if (this->eventTypeIds_ == 0)
+    {
+      //this->consumer_qos_.insert_type (ACE_ES_EVENT_ANY, // default
+      //                             cons_handle);
+      // @@ if i uncomment this line then the Rtec displays the message
+      // "Consumer tried to register for allevents!  This is not implemented."
+      // whenever a consumer tries to register with it.
+    }
+  else // parse the event types..
+    {
+      tok = ACE_OS::strtok ( this->eventTypeIds_, &c);
+      if (tok == 0) // error
+        {
+          ACE_DEBUG ((LM_DEBUG, "error parsing eventIds for ConsumerQOS, defaulting to 1"));
+          this->consumer_qos_.insert_type (ACE_ES_EVENT_ANY,
+                                           cons_handle);
+        }
+      else
+        do
+          {
+            int type_val = ACE_OS::atoi (tok);
+            ACE_DEBUG ((LM_DEBUG, "consumer_qos::insert_type (%d)\n",
+                        type_val));
+            this->consumer_qos_.insert_type (type_val,
+                                             cons_handle);
+            tok = ACE_OS::strtok (0, &c);
+          }
+        while (tok != 0);
+    }
+
+  // repeat for source ids..
+
+  // if nothing was specified on the command line use defaults..
+  if (this->eventSourceIds_ == 0)
+    this->consumer_qos_.insert_source (1, // default = 1
+                                       cons_handle);
+  else // parse the event types..
+    {
+      tok = ACE_OS::strtok (this->eventSourceIds_, &c);
+      if (tok == 0) // error
+        {
+          ACE_DEBUG ((LM_DEBUG, "error parsing sourceIds for ConsumerQOS, defaulting to 1"));
+          this->consumer_qos_.insert_source (1, // default = 1
+                                             cons_handle);
+        }
+      else
+        do
+          {
+            int source_val = ACE_OS::atoi (tok);
+            ACE_DEBUG ((LM_DEBUG, "consumer_qos::insert_source (%d)\n",
+                        source_val));
+            this->consumer_qos_.insert_type (source_val,
+                                             cons_handle);
+            tok = ACE_OS::strtok (0, &c);
+          }
+        while (tok != 0);
+    }
 }
 
-void
-CosEvent_Service::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::create_CosEC (void)
 {
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Need to check return value for errors.
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
-
-  this->naming_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                       ACE_TRY_ENV);
-  ACE_CHECK;
+  TAO_TRY
+    {
+      RtecScheduler::handle_t supp_handle =
+        this->scheduler_->create ("supplier",
+                                  TAO_TRY_ENV);
+
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      this->init_SupplierQOS (supp_handle);
+
+      RtecScheduler::handle_t cons_handle =
+        this->scheduler_->create ("consumer",
+                                  TAO_TRY_ENV);
+
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      this->init_ConsumerQOS (cons_handle);
+
+      const RtecEventChannelAdmin::ConsumerQOS &consumerqos =
+        this->consumer_qos_.get_ConsumerQOS ();
+
+      const RtecEventChannelAdmin::SupplierQOS &supplierqos =
+        this->supplier_qos_.get_SupplierQOS ();
+
+      if (this->ec_i_.init (consumerqos,
+                            supplierqos,
+                            this->rtec_,
+                            TAO_TRY_ENV) != 0)
+        return -1;
+
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      this->cos_ec_ = this->ec_i_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      CORBA::String_var str = this->orb_->object_to_string (this->cos_ec_,
+                                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "CosEvent_Service: The COSEC IOR is <%s>\n",
+                  str.in ()));
+      return 0;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception in CosEvent_Service::create_CosEC");
+      return -1;
+    }
+  TAO_ENDTRY;
+}
+
+int
+CosEvent_Service::register_CosEC (void)
+{
+  TAO_TRY
+   {
+      // Name the object.
+      CosNaming::Name ec_obj_name (1);
+      ec_obj_name.length (1);
+      ec_obj_name[0].id =
+	CORBA::string_dup (this->service_name);
+
+      // Now, attach the object name to the context.
+      this->naming_client_->rebind (ec_obj_name,
+                                    this->cos_ec_,
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      return 0;
+    }
+ TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("CosEvent_Service::register_CosEC.\n");
+      return -1;
+    }
+  TAO_ENDTRY;
+}
+
+int
+CosEvent_Service::startup (int argc, char *argv[])
+{
+  // initalize the ORB.
+  if (this->init_ORB (argc, argv) == -1)
+    return -1;
+
+  // The ORB is initialized before <parse_args> because the ACE_Channel
+  // <destroy> method assumes an initialized ORB.
+
+  // check command line args.
+  if (this->parse_args (argc, argv) == -1)
+    return -1;
+
+  // initialize the Naming Client.
+  if (this->init_NamingService () == -1)
+    return -1;
+
+  // see if the user wants a local Rtec..
+  if (this->remote_Rtec_ == 0 && this->create_local_RtecService () == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         " (%P|%t) Failed to create a local RtEC.\n"),
+                        -1);
+    }
+  else
+    // get hold of the Rtec Service via the Naming Service.
+    if (this->get_Rtec_viaNamingService () == -1)
+      {
+        ACE_DEBUG ((LM_ERROR, "Could not locate the Real Time Event service <%s> via the Naming Service, trying to create a local copy..\n", this->rt_service_name));
+
+        // Rtec was not active.. try creating a local copy.
+        if (this->create_local_RtecService () == -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             " (%P|%t) Failed to create a local RtEC.\n"),
+                            -1);
+      }
+
+  // start the scheduler
+  if (this->start_Scheduler ())
+    {
+      // scheduler startup failed..cleanup
+      this->shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%P|%t) Failed to start the scheduler\n"),
+                        -1);
+    }
+  // now try to create the COS EC.
+  if (this->create_CosEC () == -1)
+    {
+      // CosEC creation failed.. cleanup
+      this->shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         " (%P|%t) Failed to create CosEC.\n"),
+                        -1);
+    }
+
+  // finally, register it with the naming service.
+  if (this->register_CosEC () == -1)
+    {
+      // CosEC registration failed.. cleanup
+      this->shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         " (%P|%t) Failed to register the CosEC with the naming service.\n"),
+                        -1);
+    }
+
+  return 0;
 }
 
 int
 CosEvent_Service::run (void)
 {
-  ACE_DEBUG ((LM_DEBUG, "%s: Running the CosEventService\n", __FILE__));
+  ACE_DEBUG ((LM_DEBUG, "%s; running the Cos event service\n", __FILE__));
   if (this->orb_->run () == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
   return 0;
 }
 
-void
-CosEvent_Service::shutdown (CORBA::Environment &ACE_TRY_ENV)
+int
+CosEvent_Service::shutdown (void)
 {
-  // Deactivate.
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
+ TAO_TRY
+    {
+      if (this->cos_ec_ != CosEventChannelAdmin::EventChannel::_nil ())
+        {
+          // unbind the cosEC from the naming service.
+          CosNaming::Name ec_obj_name (1);
+          ec_obj_name.length (1);
+          ec_obj_name[0].id =
+            CORBA::string_dup (this->service_name);
+          this->naming_client_->unbind (ec_obj_name,
+                                        TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          this->cos_ec_->destroy (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
 
-  // Unbind from the naming service.
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->service_name);
+      this->ec_impl_.shutdown ();
 
-  this->naming_->unbind (name,
-                         ACE_TRY_ENV);
+      // shutdown the ORB.
+      if (this->orb_ != CORBA::ORB::_nil ())
+        this->orb_->shutdown ();
 
-  // shutdown the ORB.
-  if (!CORBA::is_nil (this->orb_.in ()))
-    this->orb_->shutdown ();
+      return 0;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception in shutdown.\n");
+      return -1;
+    }
+  TAO_ENDTRY;
 }
 
 int
 main (int argc, char *argv[])
 {
-  TAO_EC_Default_Factory::init_svcs ();
-
   CosEvent_Service service;
 
-  // check command line args.
-  if (service.parse_args (argc, argv) == -1)
-    return 1;
-
-  ACE_TRY_NEW_ENV
+  if (service.startup (argc, argv) == -1)
     {
-      service.startup (argc,
-                       argv,
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (service.run () == -1)
-        {
-          service.shutdown ();
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Failed to run the CosEventService.\n"),
-                            1);
-        }
+      service.shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Failed to setup the Cos Event Channel.\n"),
+                        1);
     }
-  ACE_CATCHANY
+
+  if (service.run () == -1)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Failed to start CosEventService");
-      return 1;
+      service.shutdown ();
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Failed to run the Cos Event Channel.\n"),
+                        1);
     }
-  ACE_ENDTRY;
 
   service.shutdown ();
-
-  return 0;
 }
diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp
deleted file mode 100644
index 3fb1f66fe87..00000000000
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsp
+++ /dev/null
@@ -1,103 +0,0 @@
-# Microsoft Developer Studio Project File - Name="CosEvent_Service" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=CosEvent_Service - 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 "CosEvent_Service.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 "CosEvent_Service.mak" CFG="CosEvent_Service - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "CosEvent_Service - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "CosEvent_Service - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "CosEvent_Service - 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 "../../" /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\orbsvcs"

-

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

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "CosEvent"

-# PROP BASE Intermediate_Dir "CosEvent"

-# 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 "../../" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "CosEvent_Service - Win32 Release"

-# Name "CosEvent_Service - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\CosEvent_Service.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\CosEvent_Service.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.dsw
deleted file mode 100644
index d893bea034a..00000000000
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.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: "CosEvent_Service"=.\CosEvent_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
index b4cfd607b1a..ef4cd9ab113 100644
--- a/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
+++ b/TAO/orbsvcs/CosEvent_Service/CosEvent_Service.h
@@ -16,10 +16,20 @@
 #ifndef COSEVENT_SERVICE_H
 #define COSEVENT_SERVICE_H
 
-#include "orbsvcs/CosEvent_Utilities.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 #include "orbsvcs/CosNamingC.h"
-
-class CosEvent_Service : public CosEC_ServantBase
+#include "orbsvcs/Event_Utilities.h"
+#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Scheduler_Factory.h"
+#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Event/Module_Factory.h"
+#include "orbsvcs/CosEvent/EventChannel_i.h"
+
+class CosEvent_Service
 {
   // = TITLE
   //   CosEvent_Service
@@ -32,14 +42,10 @@ class CosEvent_Service : public CosEC_ServantBase
   CosEvent_Service (void);
   // Constructor.
 
-  virtual ~CosEvent_Service (void);
+  ~CosEvent_Service (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv []);
-  // Parses the command line arguments.
-
-  void startup (int argc, char *argv[],
-               CORBA::Environment &ACE_TRY_ENV);
+  int startup (int argc, char *argv[]);
   // Initializes the COS Event Service.
   // Returns 0 on success, -1 on error.
 
@@ -47,51 +53,105 @@ class CosEvent_Service : public CosEC_ServantBase
   // run the COS Event Service.
   // Returns 0 on success, -1 on error.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                 CORBA::default_environment ());
+  int shutdown (void);
   // Shutdown the COS Event Service.
   // Returns 0 on success, -1 on error.
 
-protected:
-  // = Methods from CosEC_ServantBase
-  virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Create a local rtec.
+ private:
+  int init_ORB  (int argc, char *argv []);
+  // initialize the ORB.
+
+  int parse_args (int argc, char *argv []);
+  // Parses the command line arguments.
+
+  int init_NamingService (void);
+  // Initializes the Naming Client.
+  // Returns 0 on success, -1 on error.
+
+  int get_Rtec_viaNamingService (void);
+  // Gets a reference to a Rtec via the  naming service.
+  // Returns 0 on success, -1 on error.
 
-  virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Activates the rtec.
+  int start_Scheduler (void);
+  // start the Scheduler used ny the RtEC.
+  // Returns 0 on success, -1 on error.
 
-  virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivates the rtec.
+  int create_local_RtecService (void);
+  // Creates a local Rtec.
+  // Returns 0 on success, -1 on error.
 
-  void init_ORB (int argc, char *argv [],
-                 CORBA::Environment &ACE_TRY_ENV);
-  // initialize the ORB.
+  void init_SupplierQOS (RtecScheduler::handle_t supp_handle);
+  // Initialize the SupplierQOS Factory.
 
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
-  // Resolve the naming service.
+  void init_ConsumerQOS (RtecScheduler::handle_t cons_handle);
+  // Initialize the ConsumerQOS Factory.
 
-  void locate_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Locate a rtec.
+  int create_CosEC (void);
+  // Creates a local CosEC.
+  // Returns 0 on success, -1 on error.
+
+  int register_CosEC (void);
+  // Registers the Cos EC with the Naming Service.
+  // Returns 0 on success, -1 on error.
 
-  // = Data members
   const char* service_name;
   // The name we use to register with the Naming Service.
 
   const char* rt_service_name;
   // The name of the Real Time Event Service.
 
-  PortableServer::POA_var poa_;
-  // Reference to the root poa.
+  const char* schedule_name_;
+  // The name of the scheduler service.
 
   CORBA::ORB_var orb_;
   // The ORB that we use.
 
-  CosNaming::NamingContext_var naming_;
-  // A naming context.
+  TAO_Naming_Client naming_client_;
+  // An instance of the name client used for resolving the factory
+  // objects.
+
+ TAO_Reactive_Module_Factory module_factory_;
+  // The Module_Factory required by the Rtec.
+
+  ACE_Config_Scheduler scheduler_impl_;
+  // Scheduler used by the Rtec.
+
+  RtecScheduler::Scheduler_var scheduler_;
+  // Reference to the Scheduler after activating it in the ORB.
+
+  ACE_EventChannel ec_impl_;
+  // The servant object of the Rtec.
+
+  RtecEventChannelAdmin::EventChannel_var rtec_;
+  // Reference to the Rtec returned after activating it in the ORB.
+
+  ACE_ConsumerQOS_Factory consumer_qos_;
+  // The Consumer QOS.
 
-  CORBA::Boolean remote_Rtec_;
+  ACE_SupplierQOS_Factory supplier_qos_;
+  // The Supplier QOS.
+
+  TAO_CosEC_EventChannel_i ec_i_;
+  // The servant object of the COS Event Channel.
+
+  CosEventChannelAdmin::EventChannel_ptr cos_ec_;
+  // Reference to the CosEC returned after activating it in the ORB.
+
+  int global_scheduler_;
+  // Flag to indicate if the scheduler is local/global,
+  // 0 => local, 1 => global, default is local.
+
+  int remote_Rtec_;
   // Flag to indicate if the RtEC is local/remote,
-  // 0 => local, 1 => remote, default is local.
+  // 0 => local, 1 => remote, default is remote.\
+
+  char* eventTypeIds_;
+  // The list of EventTypeIDs (for ConsumerQOS) seperated by spaces. e.g. "1 2 3 4"
+
+  char* eventSourceIds_;
+  // The list of EventSourceIDs (for ConsumerQOS) seperated by spaces. e.g. "1 2 3 4"
+
+  char *source_type_pairs_;
+  // The pairs of Source and EventType Ids (for the SupplierQOS).
 };
 #endif /* COSEVENT_SERVICE_H */
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile b/TAO/orbsvcs/CosEvent_Service/Makefile
index b6190d7cc0f..30c0f73b033 100644
--- a/TAO/orbsvcs/CosEvent_Service/Makefile
+++ b/TAO/orbsvcs/CosEvent_Service/Makefile
@@ -2,33 +2,26 @@
 # $Id$
 #
 
-LSRC = CosEvent_Service.cpp \
+BIN = CosEvent_Service
 
-ES_OBJS=$(LSRC:.cpp=.o)
 
-LDLIBS = -lorbsvcs -lTAO
+LSRC = 	\
+	CosEvent_Service.cpp \
 
-BIN2 = CosEvent_Service
+ES_OBJS=$(LSRC:.cpp=.o)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # Event2
-endif # CosEvent
+LDLIBS = -lorbsvcs -lTAO
 
 #----------------------------------------------------------------------------
-#       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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
@@ -41,7 +34,7 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -52,6 +45,8 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -65,73 +60,42 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- CosEvent_Service.h \
+ $(ACE_ROOT)/ace/Get_Opt.i CosEvent_Service.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(TAO_ROOT)/tao/orbconf.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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
@@ -140,6 +104,30 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -151,88 +139,14 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -245,14 +159,22 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -268,66 +190,103 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
@@ -336,19 +295,18 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -361,16 +319,11 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -442,12 +395,6 @@ CosEvent_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/CosEvent_Service/Makefile.am b/TAO/orbsvcs/CosEvent_Service/Makefile.am
deleted file mode 100644
index 2b19fa4cfef..00000000000
--- a/TAO/orbsvcs/CosEvent_Service/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's CosEvent Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = CosEvent_Service
-
-CosEvent_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-CosEvent_Service_SOURCES = \
-        CosEvent_Service.cpp
-
-noinst_HEADERS = \
-        CosEvent_Service.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/CosEvent_Service/README b/TAO/orbsvcs/CosEvent_Service/README
index 2904f62c291..7065338a66f 100644
--- a/TAO/orbsvcs/CosEvent_Service/README
+++ b/TAO/orbsvcs/CosEvent_Service/README
@@ -1,34 +1,36 @@
-                        CORBA COS Event Service
-                        -----------------------
 The CosEvent_Service is a COS compilant Event Service.
 
-The service is registered with the naming service with the name
-"CosEventService" .It exposes the <EventChannel> interface which can be
-used by suppliers and consumers to send and receive events.
+The service is registered with the naming service with the name "CosEventService"
+It exposes the <EventChannel> interface which can be used by suppliers and consumers to send and receive events.
 
 
 To run the Event Channel:
-------------------------
 1. you should have a running Naming Service.
    if not, start one at $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service
 
-2. if you want to use the -t option you should have a running
-   Real Time Event Channel.
+2. you should have a running Real Time Event Channel.
    if not, start one at $TAO_ROOT/orbsvcs/Event_Service/Event_Service
 
-3. execute the CosEvent_Service.
+3. execute the CosEvent_Service. It takes the following parameters :
 
-Command line parameters:
-------------------------
       -n <COS Event Service name>
         specifies the name with which to register the Event Service.
 
-      -e <Real Time Event Service name>
+      -r <Real Time Event Service name>
         specifies the name with which to *look* for the RtEC.
 
-       -r
-        specifies that a local Real Time Event Channel (Rtec) should be
-        created and used.
+      -s <"global" | "local">
+        specifies if the scheduler is "local" or "global".
+                If the scheduler option is "global" then the naming service
+        is used to locate the a Scheduling service with the
+        name "ScheduleService".
+                if the scheduler is "local" then a new Scheduling service
+        is created and started.
+        The default option is "local".
+
+       -l
+        specifies that a local Real Time Event Channel (Rtec) should be created
+        and used.
         If you specify this option but Rtec is not already running, then the
         CosEvent_Service starts its own Rtec.
 
@@ -48,6 +50,4 @@ Event Channel based on event types and source ids.
         -p ["sourceID EventTypeID"]
         specifies a pair of sourceid and event type for the Supplier QOS.
 
-Author:
--------
-Pradeep Gore <pradeep@cs.wustl.edu>
+- Pradeep <pradeep@cs.wustl.edu>
diff --git a/TAO/orbsvcs/CosEvent_Service/svc.conf b/TAO/orbsvcs/CosEvent_Service/svc.conf
deleted file mode 100644
index fa9576a1919..00000000000
--- a/TAO/orbsvcs/CosEvent_Service/svc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECfiltering basic -ECpushsupplierset delayed -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock thread -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile b/TAO/orbsvcs/Dump_Schedule/Makefile
index 1edb53c4f1f..e3cf31f00d6 100644
--- a/TAO/orbsvcs/Dump_Schedule/Makefile
+++ b/TAO/orbsvcs/Dump_Schedule/Makefile
@@ -1,36 +1,32 @@
 # $Id$
 
-DUMP_SRCS = Dump_Schedule.cpp
-SRC = $(DUMP_SRCS)
+BIN = Dump_Schedule
 
-SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
-DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
 
-LDLIBS  = -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+DUMP_SRCS = \
+	Dump_Schedule.cpp
 
-BIN2 = Dump_Schedule
+SRC = $(DUMP_SRCS)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Sched
+SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
+DUMP_OBJS=$(DUMP_SRCS:.cpp=.o)
+
+LDLIBS     =  -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -39,8 +35,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -50,6 +47,9 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -117,85 +117,79 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -204,31 +198,22 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -250,8 +235,11 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -268,74 +256,46 @@ Dump_Schedule: $(addprefix $(VDIR),$(DUMP_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i
 
diff --git a/TAO/orbsvcs/Dump_Schedule/Makefile.am b/TAO/orbsvcs/Dump_Schedule/Makefile.am
deleted file mode 100644
index 80ae24e06b5..00000000000
--- a/TAO/orbsvcs/Dump_Schedule/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Dump Schedule Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Dump_Schedule
-
-Dump_Schedule_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Dump_Schedule_SOURCES = \
-        Dump_Schedul.cpp
-
-## noinst_HEADERS = 
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Dump_Schedule/svc.conf b/TAO/orbsvcs/Dump_Schedule/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/Dump_Schedule/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 93118609611..3e6614c5d7f 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -1,337 +1,214 @@
 // $Id$
 
-#include "Event_Service.h"
-
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
+#include "tao/corba.h"
 
 #include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Sched/Config_Scheduler.h"
 #include "orbsvcs/Event/Module_Factory.h"
 #include "orbsvcs/Event/Event_Channel.h"
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-
 ACE_RCSID(Event_Service, Event_Service, "$Id$")
 
-int main (int argc, char *argv[])
-{
-  TAO_EC_Default_Factory::init_svcs ();
+const char* service_name = "EventService";
+// The name we use to register with the Naming Service.
 
-  Event_Service event_service;
-  return event_service.run (argc, argv);
-}
+int global_scheduler = 0;
+// If 0 we instantiante a local Scheduling Service and register it
+// with the Naming Service.
+// Otherwise we just resolve the Scheduling Service using the Naming
+// Service (i.e. we assume there is a global scheduling service running.
 
-// ****************************************************************
-
-Event_Service::Event_Service (void)
-  : module_factory_ (0),
-    sched_impl_ (0),
-    ec_impl_ (0),
-    service_name_ (0),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
-    event_service_type_ (ES_OLD_MT),
-    global_scheduler_ (0)
-{
-}
+int reactive = 0;
+// If 1 we use the reactive EC.
 
-Event_Service::~Event_Service (void)
+int
+parse_args (int argc, char *argv [])
 {
-  delete this->ec_impl_;
-  this->ec_impl_ = 0;
-  delete this->sched_impl_;
-  this->sched_impl_ = 0;
-  delete this->module_factory_;
-  this->module_factory_ = 0;
+  ACE_Get_Opt get_opt (argc, argv, "n:s:r");
+  int opt;
+
+  while ((opt = get_opt ()) != EOF)
+    {
+      switch (opt)
+        {
+        case 'n':
+          service_name = get_opt.optarg;
+          break;
+
+	case 's':
+	  // It could be just a flag (i.e. no "global" or "local"
+	  // argument, but this is consistent with the EC_Multiple
+	  // test and also allows for a runtime scheduling service.
+
+          if (ACE_OS::strcasecmp (get_opt.optarg, "global") == 0)
+            {
+              global_scheduler = 1;
+            }
+          else if (ACE_OS::strcasecmp (get_opt.optarg, "local") == 0)
+            {
+              global_scheduler = 0;
+            }
+          else
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Unknown scheduling type <%s> "
+                          "defaulting to local\n",
+                          get_opt.optarg));
+              global_scheduler = 0;
+            }
+          break;
+
+        case 'r':
+          reactive = 1;
+          break;
+	  
+        case '?':
+        default:
+          ACE_DEBUG ((LM_DEBUG,
+                      "Usage: %s "
+                      "-n service_name "
+                      "-s <global|local> "
+                      "-r "
+                      "\n",
+                      argv[0]));
+          return -1;
+        }
+    }
+
+  return 0;
 }
 
-int
-Event_Service::run (int argc, char* argv[])
+
+int main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Initialize ORB.
-      this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc, argv, "internet", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      if (this->parse_args (argc, argv) == -1)
+      if (parse_args (argc, argv) == -1)
         return 1;
 
       CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA");
+        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::POA::_narrow (poa_object.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::Object_var naming_obj =
-        this->orb_->resolve_initial_references ("NameService");
+        orb->resolve_initial_references ("NameService");
       if (CORBA::is_nil (naming_obj.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the Naming Service.\n"),
                           1);
 
       CosNaming::NamingContext_var naming_context =
-        CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        CosNaming::NamingContext::_narrow (naming_obj.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
+      auto_ptr<POA_RtecScheduler::Scheduler> scheduler_impl;
       RtecScheduler::Scheduler_var scheduler;
+
       // This is the name we (potentially) register the Scheduling
       // Service in the Naming Service.
       CosNaming::Name schedule_name (1);
       schedule_name.length (1);
       schedule_name[0].id = CORBA::string_dup ("ScheduleService");
 
-
-      if (1) // this->event_service_type_ == ES_OLD_REACTIVE
-             // || this->event_service_type_ == ES_OLD_MT)
+      if (global_scheduler == 0)
         {
-          // We must find the scheduler object reference...
-
-          if (this->global_scheduler_ == 0)
-            {
-              ACE_NEW_RETURN (this->sched_impl_,
-                              ACE_Config_Scheduler,
-                              1);
-
-              scheduler = this->sched_impl_->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              // Register the servant with the Naming Context....
-              naming_context->rebind (schedule_name, scheduler.in (),
-                                      ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-          else
-            {
-              CORBA::Object_var tmp =
-                naming_context->resolve (schedule_name, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-
-              scheduler = RtecScheduler::Scheduler::_narrow (tmp.in (),
-                                                             ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
+          scheduler_impl =
+            auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler);
+          if (scheduler_impl.get () == 0)
+	    return 1;
+          scheduler = scheduler_impl->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+	  CORBA::String_var str =
+	    orb->object_to_string (scheduler.in (), TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+	  ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
+		      str.in ()));
+
+	  // Register the servant with the Naming Context....
+	  naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
         }
 
-      switch (this->event_service_type_)
-        {
-        case ES_NEW:
-          {
-            TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
-                                                  root_poa.in ());
-            TAO_EC_Event_Channel* ec;
-            ACE_NEW_RETURN (ec,
-                            TAO_EC_Event_Channel (attr),
-                            1);
-            this->ec_impl_ = ec;
-            ec->activate (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-          }
-          break;
+      ACE_Scheduler_Factory::use_config (naming_context.in ());
 
-        case ES_OLD_REACTIVE:
-          {
-            ACE_NEW_RETURN (this->module_factory_,
-                            TAO_Reactive_Module_Factory,
-                            1);
-            ACE_NEW_RETURN (this->ec_impl_,
-                            ACE_EventChannel (scheduler.in (),
-                                              1,
-                                              ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-                                              this->module_factory_),
-                            1);
-          }
-          break;
-        case ES_OLD_MT:
-          {
-            ACE_NEW_RETURN (this->module_factory_,
-                            TAO_Default_Module_Factory,
-                            1);
-
-            ACE_NEW_RETURN (this->ec_impl_,
-                            ACE_EventChannel (scheduler.in (),
-                                              1,
-                                              ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-                                              this->module_factory_),
-                            1);
-          }
+      // We pick the right module factory according to the command
+      // line options
+      TAO_Default_Module_Factory default_module_factory;
+      TAO_Reactive_Module_Factory reactive_module_factory;
 
-          break;
-        }
+      TAO_Module_Factory* module_factory = &default_module_factory;
+      if (reactive)
+        module_factory = &reactive_module_factory;
+
+      // Register Event_Service with Naming Service.
+      ACE_EventChannel ec_impl (1,
+                                ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                                module_factory);
 
-      // Notice that we activate *this* object with the POA, but we
-      // forward all the requests to the underlying EC
-      // implementation.
       RtecEventChannelAdmin::EventChannel_var ec =
-        this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        ec_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
-        this->orb_->object_to_string (ec.in (), ACE_TRY_ENV);
+        orb->object_to_string (ec.in (), TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
-                  "The EC IOR is <%s>\n", str.in ()));
+		  "The EC IOR is <%s>\n", str.in ()));
 
       CosNaming::Name channel_name (1);
       channel_name.length (1);
-      channel_name[0].id = CORBA::string_dup (this->service_name_);
-      naming_context->rebind (channel_name, ec.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      channel_name[0].id = CORBA::string_dup (service_name);
+      naming_context->bind (channel_name, ec.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "%s; running event service\n", __FILE__));
-      if (this->orb_->run () == -1)
+      if (orb->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), 1);
 
-      naming_context->unbind (channel_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      naming_context->unbind (channel_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      if (!CORBA::is_nil (scheduler.in ()))
-        {
-          naming_context->unbind (schedule_name, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+      if (global_scheduler == 0)
+	{
+	  naming_context->unbind (schedule_name, TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+	}
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("EC");
+      TAO_TRY_ENV.print_exception ("EC");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 
   return 0;
 }
 
-int
-Event_Service::parse_args (int argc, char *argv [])
-{
-  // default values...
-  this->service_name_ = "EventService";
-
-  ACE_Get_Opt get_opt (argc, argv, "n:s:t:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-        {
-        case 'n':
-          this->service_name_ = get_opt.optarg;
-          break;
-
-        case 's':
-          // It could be just a flag (i.e. no "global" or "local"
-          // argument, but this is consistent with the EC_Multiple
-          // test and also allows for a runtime scheduling service.
-
-          if (ACE_OS::strcasecmp (get_opt.optarg, "global") == 0)
-            {
-              this->global_scheduler_ = 1;
-            }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "local") == 0)
-            {
-              this->global_scheduler_ = 0;
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Unknown scheduling type <%s> "
-                          "defaulting to local\n",
-                          get_opt.optarg));
-              this->global_scheduler_ = 0;
-            }
-          break;
-
-        case 't':
-          if (ACE_OS::strcasecmp (get_opt.optarg, "NEW") == 0)
-            {
-              this->event_service_type_ = ES_NEW;
-            }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "OLD_REACTIVE") == 0)
-            {
-              this->event_service_type_ = ES_OLD_REACTIVE;
-            }
-          else if (ACE_OS::strcasecmp (get_opt.optarg, "OLD_MT") == 0)
-            {
-              this->event_service_type_ = ES_OLD_MT;
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Unknown event service type <%s> "
-                          "defaulting to REACTIVE\n",
-                          get_opt.optarg));
-              this->event_service_type_ = ES_NEW;
-            }
-          break;
-
-        case '?':
-        default:
-          ACE_DEBUG ((LM_DEBUG,
-                      "Usage: %s "
-                      "-n service_name "
-                      "-s <global|local> "
-                      "-t <new|old_reactive|old_mt> "
-                      "\n",
-                      argv[0]));
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-
-RtecEventChannelAdmin::ConsumerAdmin_ptr
-Event_Service::for_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->ec_impl_->for_consumers (ACE_TRY_ENV);
-}
-
-RtecEventChannelAdmin::SupplierAdmin_ptr
-Event_Service::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->ec_impl_->for_suppliers (ACE_TRY_ENV);
-}
-
-void
-Event_Service::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->ec_impl_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->orb_->shutdown ();
-}
-
-RtecEventChannelAdmin::Observer_Handle
-Event_Service::append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->ec_impl_->append_observer (observer, ACE_TRY_ENV);
-}
-
-void
-Event_Service::remove_observer (RtecEventChannelAdmin::Observer_Handle handle,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  this->ec_impl_->remove_observer (handle, ACE_TRY_ENV);
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Auto_Basic_Ptr<POA_RtecScheduler::Scheduler>;
 template class auto_ptr<POA_RtecScheduler::Scheduler>;
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.h b/TAO/orbsvcs/Event_Service/Event_Service.h
deleted file mode 100644
index b88ac45abe7..00000000000
--- a/TAO/orbsvcs/Event_Service/Event_Service.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = DESCRIPTION
-//   The TAO event service implementation.
-//
-// ============================================================================
-
-#ifndef EC_EVENT_SERVICE_H
-#define EC_EVENT_SERVICE_H
-
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/RtecSchedulerS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Module_Factory;
-
-class Event_Service : public POA_RtecEventChannelAdmin::EventChannel
-{
-  //
-  // = TITLE
-  //   This class decorates an Event Channel implementation, but in a
-  //   very simple way: destroy() also shutdowns the ORB.
-  //
-  // = DESCRIPTION
-  //   The Event_Channel implementations should not shutdown the ORB
-  //   by default, but in this case, where the Event_Channel is
-  //   (almost) the only service on the host, it makes more sense to
-  //   do so.
-  //
-public:
-  Event_Service (void);
-  virtual ~Event_Service (void);
-
-  int run (int argc, char* argv[]);
-  // Run the event service.
-
-  // = The RtecEventChannelAdmin::Event_Channel methods
-  virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
-    for_consumers (CORBA::Environment &);
-  virtual RtecEventChannelAdmin::SupplierAdmin_ptr
-    for_suppliers (CORBA::Environment &);
-  virtual void destroy (CORBA::Environment &);
-  virtual RtecEventChannelAdmin::Observer_Handle
-    append_observer (RtecEventChannelAdmin::Observer_ptr observer,
-                     CORBA::Environment &env);
-  virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                                CORBA::Environment &env);
-
-private:
-  int parse_args (int argc, char* argv[]);
-  // parse the command line args
-
-  enum {
-    ES_NEW, // Use the Service Configurator to find factory
-    ES_OLD_REACTIVE,   // Reactive dispatching, old EC.
-    ES_OLD_MT          // Prioritized dispatching, old EC.
-  };
-
-private:
-  TAO_Module_Factory *module_factory_;
-  // The module factory for the EC.
-
-  POA_RtecScheduler::Scheduler *sched_impl_;
-  // The Scheduler implementation.
-
-  POA_RtecEventChannelAdmin::EventChannel *ec_impl_;
-  // The Event Channel implementation.
-
-  const char* service_name_;
-  // The name we use to bind with the NameService
-
-  const char* ior_file_name_;
-  // The name of the file were we output the Event_Service IOR.
-
-  const char* pid_file_name_;
-  // The name of a file where the process stores its pid
-
-  int event_service_type_;
-  // The type of event service we will use
-
-  int global_scheduler_;
-  // Should we use a global scheduler or a local one?
-
-  CORBA::ORB_var orb_;
-  // A reference to the ORB, to shut it down properly.
-};
-
-#endif /* EC_EVENT_SERVICE_H */
diff --git a/TAO/orbsvcs/Event_Service/Makefile b/TAO/orbsvcs/Event_Service/Makefile
index 62c42cef9a2..708b9bd740f 100644
--- a/TAO/orbsvcs/Event_Service/Makefile
+++ b/TAO/orbsvcs/Event_Service/Makefile
@@ -1,36 +1,30 @@
+#
 # $Id$
+#
 
-LSRC = Event_Service.cpp
-ES_OBJS=$(LSRC:.cpp=.o)
+BIN = Event_Service
 
-LDLIBS = -lorbsvcs -lTAO
 
-BIN2 = Event_Service
+LSRC = 	\
+	Event_Service.cpp \
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-    ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-      BIN = $(BIN2)
-    endif # Naming
-  endif # Event
-endif # Event2
+ES_OBJS=$(LSRC:.cpp=.o)
+
+LDLIBS = -lorbsvcs -lTAO
 
 #----------------------------------------------------------------------------
-#       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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -40,26 +34,20 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Event_Service.o .obj/Event_Service.so .shobj/Event_Service.o .shobj/Event_Service.so: Event_Service.cpp Event_Service.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+.obj/Event_Service.o .obj/Event_Service.so .shobj/Event_Service.o .shobj/Event_Service.so: Event_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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -73,6 +61,14 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -119,26 +115,53 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/Typecode.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/ORB.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -165,44 +188,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -211,31 +196,22 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -257,8 +233,11 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -275,103 +254,68 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
@@ -381,9 +325,17 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
@@ -410,12 +362,6 @@ Event_Service: $(addprefix $(VDIR),$(ES_OBJS))
  $(ACE_ROOT)/ace/Timer_List_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
deleted file mode 100644
index 5b39b7edfb1..00000000000
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Event Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Event_Service
-
-Event_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Event_Service_SOURCES = \
-        Event_Service.cpp
-
-noinst_HEADERS = \
-        Event_Service.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Event_Service/svc.conf b/TAO/orbsvcs/Event_Service/svc.conf
index fa9576a1919..f3362851751 100644
--- a/TAO/orbsvcs/Event_Service/svc.conf
+++ b/TAO/orbsvcs/Event_Service/svc.conf
@@ -1,2 +1,7 @@
 # $Id$
-static EC_Factory "-ECfiltering basic -ECpushsupplierset delayed -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock thread -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
+#
+# The options are described in $TAO_ROOT/docs/Options.html
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global -ORBinputcdrallocator global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread"
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
index 5b3607b1a2a..fa7d151b89a 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp
@@ -2,18 +2,20 @@
 // $Id$
 
 #include "ImplRepo_i.h"
-#include "Options.h"
+#include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Process.h"
 #include "tao/IIOP_Profile.h"
 
-// Constructor
+ACE_RCSID(ImplRepo_Service, ImplRepo_i, "$Id$")
 
 ImplRepo_i::ImplRepo_i (void)
   : forwarder_impl_ (0),
-    activator_ (0)
+    activator_ (0),
+    ior_output_file_ (0),
+    server_key_ (0),
+    debug_level_ (1)
 {
-  // Nothing
 }
 
 // Starts up the server associated with the object pointer and returns
@@ -21,57 +23,56 @@ ImplRepo_i::ImplRepo_i (void)
 
 CORBA::Object_ptr
 ImplRepo_i::activate_object (CORBA::Object_ptr obj,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &TAO_IN_ENV)
 {
-  /* Implementation_Repository::INET_Addr *new_addr; */
-  TAO_Stub *new_stub_obj = 0;
+  Implementation_Repository::INET_Addr *new_addr;
+  IIOP_Object *new_iiop_obj = 0;
 
-  if (OPTIONS::instance()->debug () >= 1)
+  if (this->debug_level_ >= 1) 
     ACE_DEBUG ((LM_DEBUG,
                 "Activating Object: %s\n",
                 this->orb_manager_.orb ()->object_to_string (obj)));
 
-  ACE_TRY
+  TAO_TRY
     {
       // @@ Where to get the poa name from?
-      /* new_addr = */ this->activate_server (0, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      new_addr = this->activate_server (0, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      // @@ Use auto_ptr<> to avoid memory leaks!
-      TAO_Stub *stub_obj = obj->_stubobj ();
+      IIOP_Object *iiop_obj = ACE_dynamic_cast (IIOP_Object *,
+                                                obj->_stubobj ());
       TAO_IIOP_Profile *iiop_pfile =
                 ACE_dynamic_cast (TAO_IIOP_Profile *,
-                                  stub_obj->profile_in_use ());
-
-      TAO_MProfile mp(1);
+                                  iiop_obj->profile_in_use ());
 
-      TAO_Profile *new_pfile;
+      TAO_IIOP_Profile *new_pfile;
       // @@ Would new_addr->host_ be different from object_addr()?
-      // if so I will add another ctor  fred
+      // if so I wil add another ctor  frde
       ACE_NEW_RETURN (new_pfile,
-                      TAO_IIOP_Profile (iiop_pfile->object_addr (),
+                      TAO_IIOP_Profile (new_addr->host_,
+                                        new_addr->port_,
                                         iiop_pfile->object_key ()),
-                      CORBA::Object::_nil ());
-
-      mp.give_profile (new_pfile);
+                      0);
+                                   
+      // over write and possibly change the value set from
+      // that set by new_addr!
+      new_pfile->object_addr (&iiop_pfile->object_addr ());
 
       // create new obj, pfile will be copied!
-      new_stub_obj = new TAO_Stub (stub_obj->type_id,
-                                   mp,
-                                   stub_obj->orb_core ());
+      new_iiop_obj = new IIOP_Object (iiop_obj->type_id, new_pfile);
+
+      delete new_pfile;
 
-      if (new_stub_obj == 0)
-        return CORBA::Object::_nil ();
+      if (new_iiop_obj == 0)
+        return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_ENDTRY;
-
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  TAO_ENDTRY;
 
-  return new CORBA_Object (new_stub_obj,
+  return new CORBA_Object (new_iiop_obj,
                            obj->_servant ());
 }
 
@@ -79,16 +80,16 @@ ImplRepo_i::activate_object (CORBA::Object_ptr obj,
 
 Implementation_Repository::INET_Addr *
 ImplRepo_i::activate_server (const char *server,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &TAO_IN_ENV)
 {
   int start = 0;
-  ASYS_TCHAR *ping_ior;
+  char *ping_ior;
   Implementation_Repository::INET_Addr *address =
     new Implementation_Repository::INET_Addr;
   address->port_ = 0;
   address->host_ = CORBA::string_dup ("");
 
-  if (OPTIONS::instance()->debug () >= 1)
+  if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "Activating Server: %s\n",
                 server));
@@ -101,41 +102,41 @@ ImplRepo_i::activate_server (const char *server,
       ACE_ERROR ((LM_ERROR,
                   "Error: Cannot find ping IOR for server <%s>\n",
                   server));
-      ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+      TAO_THROW_RETURN (Implementation_Repository::Not_Found (),
                         address);
     }
 
   // if length is 0, then none is running yet.
   if (ACE_OS::strlen (ping_ior) != 0)
     {
-      ACE_TRY
+      TAO_TRY
         {
           CORBA::Object_var object =
             this->orb_manager_.orb ()->string_to_object (ping_ior,
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           Ping_Object_var ping_object = Ping_Object::_narrow (object.in (),
-                                                              ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                                              TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (CORBA::is_nil (ping_object.in ()))
             {
               ACE_ERROR ((LM_ERROR,
                           "Error: Invalid Ping Object ior: <%s>\n",
                           ping_ior));
-              ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+              TAO_THROW_RETURN (Implementation_Repository::Not_Found (),
                                 address);
             }
 
-          ping_object->ping (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          ping_object->ping (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
           start = 1;
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
   else
     start = 1;
@@ -151,7 +152,7 @@ ImplRepo_i::activate_server (const char *server,
 
       if (status == 0)
         {
-          if (OPTIONS::instance()->debug () >= 1)
+          if (this->debug_level_ >= 1)
             ACE_DEBUG ((LM_DEBUG,
                         "Starting %s\n",
                         server));
@@ -168,7 +169,7 @@ ImplRepo_i::activate_server (const char *server,
                           server,
                           cl));
               delete [] cl;
-              ACE_THROW_RETURN (Implementation_Repository::Cannot_Activate (CORBA::string_dup ("N/A")),
+              TAO_THROW_RETURN (Implementation_Repository::Cannot_Activate (CORBA::string_dup ("N/A")),
                                 address);
             }
 
@@ -179,7 +180,7 @@ ImplRepo_i::activate_server (const char *server,
           ACE_ERROR ((LM_ERROR,
                       "Error: Cannot find commandline for server <%s>\n",
                       server));
-          ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+          TAO_THROW_RETURN (Implementation_Repository::Not_Found (),
                             address);
         }
 
@@ -191,14 +192,7 @@ ImplRepo_i::activate_server (const char *server,
   char *host;
   u_short port;
 
-  if (this->repository_.get_hostport (server, host, port) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "ImplRepo_i::activate_server: "
-                  "cannot resolve server <%s>\n",
-                  server));
-      return address;
-    }
+  this->repository_.get_hostport (server, host, port);
 
   address->host_ = CORBA::string_dup (host);
   address->port_ = port;
@@ -211,24 +205,15 @@ ImplRepo_i::activate_server (const char *server,
 void
 ImplRepo_i::register_server (const char *server,
                              const Implementation_Repository::Process_Options &options,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &TAO_IN_ENV)
 {
-  if (OPTIONS::instance()->debug () >= 2)
-        ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
-                              "Command Line: %s\n"
-                              "Environment: %s\n"
-                              "Working Directory: %s\n\n",
-                              server,
-                              options.command_line_.in (),
-                              options.environment_.in (),
-                              options.working_directory_.in ()));
-
-  Repository_Record rec (options.command_line_,
-                         options.environment_,
-                         options.working_directory_,
-                         "",
-                         0,
-                         "");
+  Repository::Record rec;
+  rec.comm_line = CORBA::string_dup (options.command_line_);
+  rec.env = CORBA::string_dup (options.environment_);
+  rec.wdir = CORBA::string_dup (options.working_directory_);
+  rec.host = "";
+  rec.port = 0;
+  rec.ping_ior = "";
 
   int status = this->repository_.add (server, rec);
 
@@ -237,20 +222,19 @@ ImplRepo_i::register_server (const char *server,
       ACE_ERROR ((LM_ERROR,
                   "Error: Server %s Already Registered!\n",
                   server));
-      ACE_THROW (Implementation_Repository::Already_Registered ());
+      TAO_THROW (Implementation_Repository::Already_Registered ());
     }
   else
     {
-      if (OPTIONS::instance()->debug () >= 1)
+      if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG,
                     "register_server: Server %s Successfully Registered\n",
                     server));
-      if (OPTIONS::instance()->debug () >= 2)
+      if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
                               "Command Line: %s\n"
                               "Environment: %s\n"
                               "Working Directory: %s\n\n",
-                              server,
                               rec.comm_line,
                               rec.env,
                               rec.wdir));
@@ -263,28 +247,31 @@ ImplRepo_i::register_server (const char *server,
 void
 ImplRepo_i::reregister_server (const char *server,
                                const Implementation_Repository::Process_Options &options,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  Repository_Record rec (options.command_line_,
-                         options.environment_,
-                         options.working_directory_,
-                         "",
-                         0,
-                         "");
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+  Repository::Record rec;
+  // @@ Darrell, please make sure to use the ACE_ALLOCATOR and
+  // ACE_ALLOCATOR_RETURN macros for all of these string_dup() calls
+  // in your code.
+  rec.comm_line = CORBA::string_dup (options.command_line_);
+  rec.env = CORBA::string_dup (options.environment_);
+  rec.wdir = CORBA::string_dup (options.working_directory_);
+  rec.host = "";
+  rec.port = 0;
+  rec.ping_ior = "";
 
   this->repository_.update (server, rec);
 
-  if (OPTIONS::instance()->debug () >= 1)
+  if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "Server %s Successfully Registered\n",
                 server));
-  if (OPTIONS::instance()->debug () >= 2)
+  if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG, "Server: %s\n"
                           "Command Line: %s\n"
                           "Environment: %s\n"
                           "Working Directory: %s\n\n",
-                          server,
                           rec.comm_line,
                           rec.env,
                           rec.wdir));
@@ -294,11 +281,11 @@ ImplRepo_i::reregister_server (const char *server,
 
 void
 ImplRepo_i::remove_server (const char *server,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   if (this->repository_.remove (server) == 0)
     {
-      if (OPTIONS::instance()->debug () >= 1)
+      if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG,
                     "Successfully Removed Server\n"));
     }
@@ -307,7 +294,7 @@ ImplRepo_i::remove_server (const char *server,
       ACE_ERROR ((LM_ERROR,
                   "Error: Trying to remove unknown server <%s>\n",
                   server));
-      ACE_THROW (Implementation_Repository::Not_Found ());
+      TAO_THROW (Implementation_Repository::Not_Found ());
     }
 }
 
@@ -317,25 +304,24 @@ Implementation_Repository::INET_Addr *
 ImplRepo_i::server_is_running (const char *server,
                                const Implementation_Repository::INET_Addr &addr,
                                CORBA::Object_ptr ping,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &TAO_IN_ENV)
 {
   Implementation_Repository::INET_Addr *new_addr =
     new Implementation_Repository::INET_Addr;
 
-  if (OPTIONS::instance()->debug () >= 1)
+  if (this->debug_level_ >= 1)
     ACE_DEBUG ((LM_DEBUG,
                 "Server <%s> is running\n",
                 server));
 
   // Update the record in the repository
-  Repository_Record rec;
-
+  Repository::Record rec;
   if (this->repository_.resolve (server, rec) == -1)
     {
       ACE_ERROR ((LM_ERROR,
                   "Error: Unknown Server <%s>\n",
                   server));
-      ACE_THROW_RETURN (Implementation_Repository::Not_Found (),
+      TAO_THROW_RETURN (Implementation_Repository::Not_Found (),
                         new_addr);
     }
 
@@ -343,19 +329,15 @@ ImplRepo_i::server_is_running (const char *server,
   delete [] rec.ping_ior;
   delete [] rec.host;
 
-  ACE_NEW_RETURN (rec.host, ASYS_TCHAR[ACE_OS::strlen (addr.host_.in ()) + 1], 0);
-  ACE_OS::strcpy (rec.host, addr.host_.in ());
+  rec.host = ACE::strnew (addr.host_.in ());
   rec.port = addr.port_;
-
-  ASYS_TCHAR *ping_ior = this->orb_manager_.orb ()->object_to_string (ping, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_NEW_RETURN (rec.ping_ior, ASYS_TCHAR[ACE_OS::strlen (ping_ior) + 1], 0);
-  ACE_OS::strcpy (rec.ping_ior, ping_ior);
+  rec.ping_ior = ACE::strnew (this->orb_manager_.orb ()->object_to_string (ping,
+                                                                           TAO_IN_ENV));
+  this->repository_.update (server, rec);
 
   if (this->repository_.update (server, rec) == 0)
     {
-      if (OPTIONS::instance()->debug () >= 1)
+      if (this->debug_level_ >= 1)
         ACE_DEBUG ((LM_DEBUG,
                     "Successful server_is_running () of <%s>\n",
                     server));
@@ -365,10 +347,10 @@ ImplRepo_i::server_is_running (const char *server,
       ACE_ERROR ((LM_ERROR,
                  "Error: While updating Repository while server_is_running () %s\n",
                  server));
-      return new_addr;
+      // @@ Return here?
     }
 
-  if (OPTIONS::instance()->debug () >= 2)
+  if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG,
                 "The old host/port was: %Lu:%hu\n",
                 rec.host,
@@ -380,7 +362,7 @@ ImplRepo_i::server_is_running (const char *server,
   new_addr->host_ = CORBA::string_dup (my_addr.get_host_name ());
   new_addr->port_ = my_addr.get_port_number ();
 
-  if (OPTIONS::instance()->debug () >= 2)
+  if (this->debug_level_ >= 2)
     ACE_DEBUG ((LM_DEBUG,
                 "The new host/port is: %Lu:%hu\n",
                 new_addr->host_.inout (),
@@ -393,20 +375,20 @@ ImplRepo_i::server_is_running (const char *server,
 
 void
 ImplRepo_i::server_is_shutting_down (const char *server,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  Repository_Record rec;
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+  Repository::Record rec;
 
   if (this->repository_.resolve (server, rec) == 0)
     {
-      ACE_OS::strcpy (rec.host, ASYS_TEXT (""));
+      rec.host = "";
       rec.port = 0;
-      ACE_OS::strcpy (rec.ping_ior, ASYS_TEXT (""));
+      rec.ping_ior = "";
 
       if (this->repository_.update (server, rec) == 0)
         {
-          if (OPTIONS::instance()->debug () >= 1)
+          if (this->debug_level_ >= 1)
             ACE_DEBUG ((LM_DEBUG,
                         "Successful server_is_shutting_down () of <%s>\n",
                         server));
@@ -423,28 +405,94 @@ ImplRepo_i::server_is_shutting_down (const char *server,
       ACE_ERROR ((LM_ERROR,
                   "Error: Unknown Server <%s>\n",
                   server));
-      ACE_THROW (Implementation_Repository::Not_Found ());
+      TAO_THROW (Implementation_Repository::Not_Found ());
     }
 }
 
+// Reads the Server factory ior from a file
+
+int
+ImplRepo_i::read_ior (char *filename)
+{
+  // Open the file for reading.
+  ACE_HANDLE f_handle_ = ACE_OS::open (filename, 0);
+
+  if (f_handle_ == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error: Unable to open %s for writing: %p\n",
+                       filename),
+                      -1);
+  ACE_Read_Buffer ior_buffer (f_handle_);
+  this->server_key_ = ior_buffer.read ();
+
+  if (this->server_key_ == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error: Unable to allocate memory to read ior: %p\n"),
+                      -1);
+
+  ACE_OS::close (f_handle_);
+  return 0;
+}
+
+int
+ImplRepo_i::parse_args (void)
+{
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "d:f:o:");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        this->debug_level_ = ACE_OS::atoi (get_opts.optarg);
+        break;
+      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,
+                             "Error: Unable to open %s for writing: %p\n",
+                             get_opts.optarg), -1);
+        break;
+      case 'f': // read the IOR from the file.
+        this->server_input_file_ = ACE::strnew (get_opts.optarg);
+        break;
+      case '?':  // display help for use of the server.
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Usage:  %s"
+                           " [-d] <debug_level>"
+                           " [-f] <server_ior_file>"
+                           " [-o] <ior_output_file>"
+                           "\n",
+                           argv_ [0]),
+                          1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
 int
-ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
+ImplRepo_i::init (int argc, char **argv, CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       // 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,
                                              argv,
                                              "ir_poa",
-                                             ACE_TRY_ENV) == -1)
+                                             TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Error: With %p\n",
                            "init_child_poa"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
+
+      this->argc_ = argc;
+      this->argv_ = argv;
 
-      int retval = OPTIONS::instance()->parse_args (argc, argv);
+      int retval = this->parse_args ();
 
       if (retval != 0)
         return retval;
@@ -457,26 +505,26 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
 
       CORBA::String_var str  =
         this->orb_manager_.activate (this->forwarder_impl_);
-      if (OPTIONS::instance()->debug () >= 2)
+      if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "The server IOR is: <%s>\n",
                     str.in ()));
 
-      if (OPTIONS::instance()->output_file ())
+      if (this->ior_output_file_)
         {
-          ACE_OS::fprintf (OPTIONS::instance()->output_file (),
+          ACE_OS::fprintf (this->ior_output_file_,
                            "%s",
                            str.in ());
-          ACE_OS::fclose (OPTIONS::instance()->output_file ());
+          ACE_OS::fclose (this->ior_output_file_);
         }
 
       CORBA::String_var ir_var  =
         this->orb_manager_.activate_under_child_poa ("implrepo",
                                                      this,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      if (OPTIONS::instance()->debug () >= 2)
+      if (this->debug_level_ >= 2)
         ACE_DEBUG ((LM_DEBUG,
                     "The IR IOR is: <%s>\n",
                     ir_var.in ()));
@@ -490,24 +538,22 @@ ImplRepo_i::init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV)
                       -1);
 
       PortableServer::AdapterActivator_var activator =
-        this->activator_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->activator_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
 
       this->orb_manager_.root_poa ()->the_activator (activator.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Server_i::init");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("Server_i::init");
+      TAO_RETHROW_RETURN (-1);
     }
-  ACE_ENDTRY;
-
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
   return 0;
 }
 
@@ -564,74 +610,97 @@ IR_Adapter_Activator::IR_Adapter_Activator (IR_Forwarder *servant)
 CORBA::Boolean
 IR_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
                                        const char *name,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                                       CORBA_Environment &env)
 {
   CORBA::PolicyList policies (4);
   policies.length (4);
 
-  const char *exception_message = "Null Message";
+  // ID Assignment Policy
+  policies[0] =
+    parent->create_id_assignment_policy (PortableServer::USER_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_assignment_policy");
+      return 0;
+    }
 
-  ACE_TRY
+  // Lifespan Policy
+  policies[1] =
+    parent->create_lifespan_policy (PortableServer::PERSISTENT, env);
+  if (env.exception () != 0)
     {
-      // ID Assignment Policy
-      exception_message = "While PortableServer::POA::create_id_assignment_policy";
-      policies[0] =
-        parent->create_id_assignment_policy (PortableServer::USER_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Lifespan Policy
-      exception_message = "While PortableServer::POA::create_lifespan_policy";
-      policies[1] =
-        parent->create_lifespan_policy (PortableServer::PERSISTENT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Request Processing Policy
-      exception_message = "While PortableServer::POA::create_request_processing_policy";
-      policies[2] =
-        parent->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Id Uniqueness Policy
-      exception_message = "While PortableServer::POA::create_id_uniqueness_policy";
-      policies[3] =
-        parent->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      exception_message = "While create_POA";
-      PortableServer::POA_var child = parent->create_POA (name,
-                                                          PortableServer::POAManager::_nil (),
-                                                          policies,
-                                                          ACE_TRY_ENV);
-
-      exception_message = "While unknown_adapter::policy->destroy";
-      for (CORBA::ULong i = 0; i < policies.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+      env.print_exception ("PortableServer::POA::create_lifespan_policy");
+      return 0;
+    }
 
-      exception_message = "While _this";
-      PortableServer::AdapterActivator_var activator = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Request Processing Policy
+  policies[2] =
+    parent->create_request_processing_policy (PortableServer::USE_DEFAULT_SERVANT, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_request_processing_policy");
+      return 0;
+    }
 
-      exception_message = "While child->the_activator";
-      child->the_activator (activator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // @@ Darrell, can you please make all this code work correctly with
+  // native C++ exceptions?!
 
-      exception_message = "While unknown_adapter, set_servant";
-      child->set_servant (this->servant_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Id Uniqueness Policy
+  policies[3] =
+    parent->create_id_uniqueness_policy (PortableServer::MULTIPLE_ID, env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("PortableServer::POA::create_id_uniqueness_policy");
+      return 0;
     }
-  ACE_CATCHANY
+
+  PortableServer::POA_var child = parent->create_POA (name,
+                                                      PortableServer::POAManager::_nil (),
+                                                      policies,
+                                                      env);
+  if (env.exception () != 0)
+    return 0;
+
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       ++i)
+    {
+      CORBA::Policy_ptr policy = policies[i];
+      policy->destroy (env);
+    }
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("unknown_adapter::policy->destroy");
+      return 0;
+    }
+
+  PortableServer::AdapterActivator_var activator = this->_this (env);
+  if (env.exception () != 0)
     {
-      ACE_ERROR ((LM_ERROR, "IR_Adapter_Activator::unknown_adapter - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
+      child->destroy (0, 0, env);
       return 0;
     }
-  ACE_ENDTRY;
 
-  // Finally, now everything is fine
+  child->the_activator (activator.in (), env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("unknown_adapter, the_activator");
+      child->destroy (0, 0, env);
+      return 0;
+    }
+
+  child->set_servant (this->servant_, env);
+
+  if (env.exception () != 0)
+    {
+      env.print_exception ("unknown_adapter, set_servant");
+      child->destroy (0, 0, env);
+      return 0;
+    }
+
+  // Finally everything is fine
   return 1;
 }
 
@@ -655,47 +724,71 @@ IR_Forwarder::_primary_interface (const PortableServer::ObjectId & /* oid */,
 
 void
 IR_Forwarder::invoke (CORBA::ServerRequest_ptr /* request */,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &TAO_IN_ENV)
 {
-  TAO_ORB_Core *orb_core = this->orb_var_->orb_core ();
-  TAO_POA_Current_Impl *poa_current_impl = orb_core->poa_current ().implementation ();
+  // Get the POA Current object reference
+  CORBA::Object_var obj = this->orb_var_->resolve_initial_references ("POACurrent");
+
+  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
+  TAO_POA_Current *poa_current = orb_core->poa_current ();
+
+  if (TAO_IN_ENV.exception () != 0)
+    {
+      TAO_IN_ENV.print_exception ("PortableServer::Current::_narrow");
+      return;
+    }
 
   // The servant determines the key associated with the database entry
   // represented by self
-  PortableServer::ObjectId_var oid = poa_current_impl->get_object_id (ACE_TRY_ENV);
-  ACE_CHECK;
+  PortableServer::ObjectId_var oid = poa_current->get_object_id (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return;
 
   // Now convert the id into a string
   CORBA::String_var key = PortableServer::ObjectId_to_string (oid.in ());
 
-  PortableServer::POA_ptr poa = poa_current_impl->get_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+  PortableServer::POA_ptr poa = poa_current->get_POA (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return;
 
   // Now FORWARD!!!
 
   Implementation_Repository::INET_Addr *new_addr = 0;
-  new_addr = this->ir_impl_->activate_server (poa->the_name (),
-                                              ACE_TRY_ENV);
-  ACE_CHECK;
+
+  TAO_TRY
+    {
+      new_addr = this->ir_impl_->activate_server (poa->the_name (),
+                                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 
   CORBA_Object_ptr forward_object =
-    this->orb_var_->key_to_object (poa_current_impl->object_key (),
+    this->orb_var_->key_to_object (poa_current->object_key (),
                                    0,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
+                                   TAO_IN_ENV);
 
-  TAO_Stub *stub_obj = ACE_dynamic_cast (TAO_Stub *,
-                                         forward_object->_stubobj ());
+  IIOP_Object *iiop_obj = ACE_dynamic_cast (IIOP_Object *,
+                                            forward_object->_stubobj ());
 
   TAO_IIOP_Profile *iiop_pfile =
             ACE_dynamic_cast (TAO_IIOP_Profile *,
-                              stub_obj->profile_in_use ());
+                              iiop_obj->profile_in_use ());
 
   iiop_pfile->port (new_addr->port_);
   iiop_pfile->host (new_addr->host_);
 
+//  if (TAO_debug_level > 0)
+//    ACE_DEBUG ((LM_DEBUG,
+//                "The forward_to is <%s>\n",
+//                this->orb_var_->object_to_string (forward_object, TAO_IN_ENV)));
+
   if (!CORBA::is_nil (forward_object))
-    ACE_THROW (PortableServer::ForwardRequest (forward_object));
+    TAO_IN_ENV.exception (new PortableServer::ForwardRequest (forward_object));
   else
     ACE_ERROR ((LM_ERROR,
                 "Error: Forward_to reference is nil.\n"));
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
index 9c3466006f0..dab6b1c6fda 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.h
@@ -17,7 +17,7 @@
 //
 // ============================================================================
 
-#ifndef IMPLREPO_I_H
+#if !defined (IMPLREPO_I_H)
 #define IMPLREPO_I_H
 
 #include "orbsvcs/ImplRepoS.h"
@@ -47,14 +47,11 @@ public:
 
   virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
                                           const char *name,
-                                          CORBA_Environment &ACE_TRY_ENV
-                                            = CORBA_Environment::default_environment ());
-  // Called by the POA when the incoming requested object/POA isn't found.  This will
-  // create POAs when needed and will also put a DSI object (IR_Forwarder) in that POA
-  // as a default servant to handle that request
+                                          CORBA_Environment &_env = CORBA_Environment::default_environment ());
 private:
+  // @@ Darrell, please add comments for all of the methods in this file.
+
   IR_Forwarder *servant_;
-  // The object to use as the default servant.
 };
 
 class ImplRepo_i : public POA_Implementation_Repository
@@ -73,54 +70,37 @@ public:
   // = Interface methods
 
   virtual CORBA::Object_ptr activate_object (CORBA::Object_ptr obj,
-                                             CORBA_Environment &ACE_TRY_ENV
-                                               = CORBA_Environment::default_environment ());
-  // Starts up the server containing the object <obj> if not already running.
+                                             CORBA::Environment &env);
 
-  virtual Implementation_Repository::INET_Addr *activate_server (const char *server,
+  virtual Implementation_Repository::INET_Addr *activate_server (const char * server,
                                                                  CORBA::Environment &env);
-  // Starts up the server <server> if not already running.
 
-  virtual void register_server (const char *server,
+  virtual void register_server (const char * server,
                                 const Implementation_Repository::Process_Options &options,
-                                CORBA_Environment &ACE_TRY_ENV
-                                  = CORBA_Environment::default_environment ());
-  // Adds the server to the repository and registers the startup information about
-  // the server <server>.
+                                CORBA::Environment &env);
 
-  virtual void reregister_server (const char *server,
+  virtual void reregister_server (const char * server,
                                   const Implementation_Repository::Process_Options &options,
-                                  CORBA_Environment &ACE_TRY_ENV
-                                    = CORBA_Environment::default_environment ());
-  // Updates the startup information about the server <server>.
+                                  CORBA::Environment &env);
 
-  virtual void remove_server (const char *server,
-                              CORBA_Environment &ACE_TRY_ENV
-                                = CORBA_Environment::default_environment ());
-  // Removes the server <server> from the repository.
+  virtual void remove_server (const char * server,
+                              CORBA::Environment &env);
 
-  virtual Implementation_Repository::INET_Addr
-    *server_is_running (const char *server,
+  virtual Implementation_Repository::INET_Addr  
+    *server_is_running (const char * server,
                         const Implementation_Repository::INET_Addr &addr,
                         CORBA::Object_ptr ping,
-                        CORBA_Environment &ACE_TRY_ENV
-                          = CORBA_Environment::default_environment ());
-  // Called by the server to update transient information such as current location of
-  // the <server> and its ping object.
+                        CORBA::Environment &env);
 
   virtual void server_is_shutting_down (const char * server,
-                                        CORBA_Environment &ACE_TRY_ENV
-                                          = CORBA_Environment::default_environment ());
-  // What the server should call before it shutsdown.
+                                        CORBA::Environment &env);
 
   // = Other methods
 
-  int init (int argc, char **argv,
-            CORBA_Environment &ACE_TRY_ENV
-              = CORBA_Environment::default_environment ());
+  int init (int argc, char **argv, CORBA::Environment& env);
   // Initialize the Server state - parsing arguments and waiting.
 
-  int run (CORBA_Environment &ACE_TRY_ENV = CORBA_Environment::default_environment ());
+  int run (CORBA::Environment& env);
   // Runs the orb.
 
   CORBA::String get_forward_host (const char *server);
@@ -131,7 +111,6 @@ public:
 
 private:
   IR_Forwarder *forwarder_impl_;
-  // The class that handles the forwarding.
 
   IR_Adapter_Activator *activator_;
   // Used for the forwarding of any type of POA.
@@ -139,9 +118,18 @@ private:
   Repository repository_;
   // Repository containing information about each server.
 
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  int read_ior (char *filename);
+  // Reads the IOR of the real server from the file.
+
   TAO_ORB_Manager orb_manager_;
   // The ORB manager.
 
+  FILE *ior_output_file_;
+  // File where the IOR of the server object is stored.
+
   char *server_key_;
   // Key of the obj ref of the server.
 
@@ -153,6 +141,12 @@ private:
 
   char **argv_;
   // The command line arguments.
+
+  unsigned int debug_level_;
+  // Debug level for the IR.  
+  // 0 - Quiet
+  // 1 - Trace messages
+  // 2 - Detailed messages
 };
 
 class IR_Forwarder: public  PortableServer::DynamicImplementation
@@ -161,7 +155,6 @@ public:
   IR_Forwarder (CORBA::ORB_ptr orb_ptr,
                 PortableServer::POA_ptr poa_ptr,
                 ImplRepo_i *ir_impl);
-  // Constructor
 
   virtual void invoke (CORBA::ServerRequest_ptr request,
                        CORBA::Environment &env);
@@ -172,17 +165,15 @@ public:
   CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                           PortableServer::POA_ptr poa,
                                           CORBA::Environment &env);
-  // DynamicImplementation stuff
 
 private:
+  int forward (char *name, char *poa, char *obj, CORBA::Environment &env);
+
   class ImplRepo_i *ir_impl_;
-  // Where we find out where to forward to.
 
   CORBA::ORB_var orb_var_;
-  // ORB reference.
-
   PortableServer::POA_var poa_var_;
-  // POA reference.
+
 };
 
 #endif /* IMPLREPO_I_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile b/TAO/orbsvcs/ImplRepo_Service/Makefile
index 17b4781e9ba..cf197fdc574 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -15,32 +15,24 @@ endif
 LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = \
-        ImplRepo.cpp \
-        ImplRepo_i.cpp \
-        Repository.cpp \
-        Options.cpp
+	ImplRepo.cpp \
+	ImplRepo_i.cpp \
+	Repository.cpp
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_SVR_OBJS = \
-                ImplRepo.o \
-                ImplRepo_i.o \
-                Repository.o \
-                Options.o
+		ImplRepo.o \
+		ImplRepo_i.o \
+		Repository.o
 
+BIN = ImplRepo_Service
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = ImplRepo_Service
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # ImplRepo
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -52,19 +44,17 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+ImplRepo_Service:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+			$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
+realclean: clean
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -73,282 +63,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
@@ -362,14 +76,48 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
  Repository.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Name_Proxy.h \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
  $(TAO_ROOT)/tao/TAO.h
 .obj/ImplRepo_i.o .obj/ImplRepo_i.so .shobj/ImplRepo_i.o .shobj/ImplRepo_i.so: ImplRepo_i.cpp ImplRepo_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
+ Repository.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Name_Proxy.h \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h
+.obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -377,16 +125,17 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/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 \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -411,11 +160,6 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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 \
@@ -425,315 +169,27 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoS.i \
- Repository.h \
- $(TAO_ROOT)/tao/TAO.h \
- Options.h \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/IIOP_Profile.i
-.obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.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/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/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/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/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/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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -745,50 +201,9 @@ ImplRepo_Service: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- Options.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp
-.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.cpp Options.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 \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/ImplRepo_Service/Makefile.am b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
deleted file mode 100644
index e681e218b0d..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Implementation Repository Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = ImplRepo_Service
-
-ImplRepo_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-ImplRepo_Service_SOURCES = \
-        ImplRepo.cpp \
-        ImplRepo_i.cpp \
-        Repository.cpp
-
-noinst_HEADERS = \
-        ImplRepo_i.h \
-        Repository.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Options.cpp
deleted file mode 100644
index 146f6cff0ed..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Options.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-#include "Options.h"
-#include "ace/Get_Opt.h"
- 
-// Default Constructor
-Options::Options ()
-: debug_ (1),
-  ior_output_file_ (0)
-{
-  // Nothing
-}
-
-int
-Options::parse_args (int argc, ASYS_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "d:o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        this->debug_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      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,
-                             "Error: Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':  // display help for use of the server.*/
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage:  %s"
-                           " [-d] <debug_level>"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Returns the debug level for the IR.  
-
-int 
-Options::debug (void) const
-{
-  return this->debug_;
-}
-
-// Returns the file where the IOR should be stored.
-
-FILE *
-Options::output_file (void) const
-{
-  return this->ior_output_file_;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton <Options, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragme instantiate ACE_Singleton <Options, ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Options.h b/TAO/orbsvcs/ImplRepo_Service/Options.h
deleted file mode 100644
index d0a4f0492fb..00000000000
--- a/TAO/orbsvcs/ImplRepo_Service/Options.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-// $Id $
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/ImplRepo_Service
-//
-// = FILENAME
-//    Options.h
-//
-// = DESCRIPTION
-//    This class implements the Options container for the Implementation 
-//    Repository.
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef OPTIONS_H
-#define OPTIONS_H
-
-#include "ace/Singleton.h"
-
-class Options
-{
-  // = TITLE
-  //   Maintains the global options.
-  //
-  // = DESCRIPTION
-  //   This class is converted into a Singleton by the 
-  //   <ACE_Singleton> template.
-public:
-  Options ();
-  // Default Constructor
-
-  int parse_args (int argc, ASYS_TCHAR *argv[]);
-  // Parse the command-line arguments and initialize the options.
-
-  int debug (void) const;
-  // Debug level for the IR.  
-  // 0 - Quiet
-  // 1 - Trace messages
-  // 2 - Detailed messages
-
-  FILE *output_file (void) const;
-  // Returns the file where the IOR should be stored.
-
-private:
-  unsigned int debug_;
-  // Debug information
-
-  FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
-
-};
-
-// Typedef an Options Singleton. 
-typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
-
-#endif /* OPTIONS_H */
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
index 4f6d2303a82..37b9d4f73fe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.cpp
@@ -1,153 +1,110 @@
 /* -*- C++ -*- */
 // $Id$
 #include "Repository.h"
-#include "Options.h"
-#include "ace/ACE.h"
 
 ACE_RCSID(ImplRepo_Service, Repository, "$Id$")
 
-Repository_Record::Repository_Record ()
-: comm_line (ACE::strnew ("")),
-  env (ACE::strnew ("")),
-  wdir (ACE::strnew ("")),
-  host (ACE::strnew ("")),
-  port (0),
-  ping_ior (ACE::strnew (""))
-{
-  // Nothing
-}
-
-Repository_Record::Repository_Record (const Repository_Record &r)
-: comm_line (ACE::strnew (r.comm_line)),
-  env (ACE::strnew (r.env)),
-  wdir (ACE::strnew (r.wdir)),
-  host (ACE::strnew (r.host)),
-  port (r.port),
-  ping_ior (ACE::strnew (r.ping_ior))
-{
-  // Nothing
-}
-
-Repository_Record::Repository_Record (const ASYS_TCHAR *c,
-                                      const ASYS_TCHAR *e,
-                                      const ASYS_TCHAR *w,
-                                      const ASYS_TCHAR *h,
-                                      const unsigned short p,
-                                      const ASYS_TCHAR *pi)
-: comm_line (ACE::strnew (c)),
-  env (ACE::strnew (e)),
-  wdir (ACE::strnew (w)),
-  host (ACE::strnew (h)),
-  port (p),
-  ping_ior (ACE::strnew (pi))
-{
-}
-
-Repository_Record::~Repository_Record ()
-{
-  delete [] this->comm_line;
-  delete [] this->env;
-  delete [] this->wdir;
-  delete [] this->host;
-  delete [] this->ping_ior;
-}
-
-Repository_Record &
-Repository_Record::operator= (Repository_Record &r)
-{
-  if (this == &r)
-    return *this;
-
-  delete [] this->comm_line;
-  delete [] this->env;
-  delete [] this->wdir;
-  delete [] this->host;
-  delete [] this->ping_ior;
-
-  this->comm_line = ACE::strnew (r.comm_line);
-  this->env = ACE::strnew (r.env);
-  this->wdir = ACE::strnew (r.wdir);
-  this->host = ACE::strnew (r.host);
-  this->port = r.port;
-  this->ping_ior = ACE::strnew (r.ping_ior);
-  
-  return *this;
-}
-
 // Default Constructor
 Repository::Repository ()
 {
-  // Nothing
+  this->repository_.open (ACE_Naming_Context::PROC_LOCAL);
 }
 
 // Add a new server to the Repository
 int
-Repository::add (ACE_TString key, const Repository_Record &rec)
-{
-  if (OPTIONS::instance ()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "Repository: Adding key %s\n", key.c_str ()));
-
-  Repository_Record *new_rec = new Repository_Record (rec);
+Repository::add (const char *key, const Repository::Record &rec)
+{
+  char *temp; // Temporary string to hold all the variables in.
+
+  // Needs to be as long as all the lengths plus the separators and the
+  // null character (6) and then also the size that the host/port could
+  // take up.
+  ACE_NEW_RETURN (temp,
+                  char [ACE_OS::strlen (rec.comm_line)
+                        + ACE_OS::strlen (rec.env)
+                        + ACE_OS::strlen (rec.wdir)
+                        + ACE_OS::strlen (rec.ping_ior)
+                        + ACE_OS::strlen (rec.host)
+                        + 40],
+                  -1);
+
+  // Put them all in a string
+  // Why use the extra space?  Well, strtok doesn't like null strings
+  // because they show up as \n\n, which it skips past.
+  ACE_OS::sprintf (temp,
+                   " %s\n %s\n %s\n %s\n %hu\n %s\n",
+                   rec.comm_line,
+                   rec.env,
+                   rec.wdir,
+                   rec.host,
+                   rec.port,
+                   rec.ping_ior);
 
   // Store the record in the repository.
-  return this->repository_.bind (key, new_rec);
+  int retval = this->repository_.bind (key, temp);
+
+  // Clean up and exit.
+  delete [] temp;
+
+  return retval;
 }
 
 int 
-Repository::update (ACE_TString key, const Repository_Record &rec)
+Repository::update (const char *key, const Repository::Record &rec)
 {
-  if (OPTIONS::instance ()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "Repository: Updating key %s\n", key.c_str ()));
-
-  Repository_Record *new_rec = new Repository_Record (rec);
-  Repository_Record *old_rec;
-
-  // Store the record in the repository.
-  int retval = this->repository_.rebind (key, new_rec, old_rec);
-  
-  if (retval == 1)
-    delete old_rec;
-
-  return retval >= 0 ? 0 : -1;
+  this->remove (key);
+  return this->add (key, rec);
 }
 
 // Removes the server from the Repository
 int
-Repository::remove (ACE_TString key)
+Repository::remove (const char *key)
 {
-  if (OPTIONS::instance ()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "Repository: Removing key %s\n", key.c_str ()));
-  return this->repository_.unbind (key.c_str ());
+  return this->repository_.unbind (key);
 }
 
 
 // Find the key record in the Repository
 int
-Repository::resolve (ACE_TString key, Repository_Record &rec)
+Repository::resolve (const char *key, Repository::Record &rec)
 {
-  if (OPTIONS::instance ()->debug () >= 2)
-    ACE_DEBUG ((LM_DEBUG, "Repository: Resolving key %s\n", key.c_str ()));
-
-  Repository_Record *rep_rec;
-  int retval = this->repository_.find (key, rep_rec);
+  char *value = 0, *type = 0; // Temp variables needed for resolve
+  int retval = this->repository_.resolve (key, value, type);
 
   if (retval == 0)
-    rec = *rep_rec;
+    {
+      // +1 to get rid of the space
+      rec.comm_line = ACE::strnew (ACE_OS::strtok (value, "\n") + 1);
+      rec.env = ACE::strnew (ACE_OS::strtok (NULL, "\n") + 1);
+      rec.wdir = ACE::strnew (ACE_OS::strtok (NULL, "\n") + 1);
+      rec.host = ACE::strnew (ACE_OS::strtok (NULL, "\n") + 1);
+      ::sscanf (ACE_OS::strtok (NULL, "\n"), "%hu", &rec.port);
+      rec.ping_ior = ACE::strnew (ACE_OS::strtok (NULL, "\n") + 1);
+    }
+  else
+    {
+      retval = -1;
+    }
+
+  delete [] value;
+  delete [] type;
 
   return retval;
 }
 // = Accessor methods
 
 int
-Repository::get_comm_line (ACE_TString key, ASYS_TCHAR *&comm_line)
+Repository::get_comm_line (const char *key, char *&comm_line)
 {
-  Repository_Record *rec;
-  int retval = this->repository_.find (key, rec);
+  Repository::Record rec;
+  int retval = this->resolve (key, rec);
 
   if (retval == 0)
     {
-      ACE_NEW_RETURN (comm_line, ASYS_TCHAR [ACE_OS::strlen (rec->comm_line) + 1], -1);
-      ACE_OS::strcpy (comm_line, rec->comm_line);
+      comm_line = rec.comm_line;
+      delete [] rec.env;
+      delete [] rec.wdir;
+      delete [] rec.ping_ior;
     }
 
   return retval;
@@ -155,60 +112,73 @@ Repository::get_comm_line (ACE_TString key, ASYS_TCHAR *&comm_line)
 
 
 int
-Repository::get_env (ACE_TString key, ASYS_TCHAR *&env)
+Repository::get_env (const char *key, char *&env)
 {
-  Repository_Record *rec;
-  int retval = this->repository_.find (key, rec);
+  Repository::Record rec;
+  int retval = this->resolve (key, rec);
 
   if (retval == 0)
     {
-      ACE_NEW_RETURN (env, ASYS_TCHAR [ACE_OS::strlen (rec->env) + 1], -1);
-      ACE_OS::strcpy (env, rec->env);
+      delete [] rec.comm_line;
+      env = rec.env;
+      delete [] rec.wdir;
+      delete [] rec.host;
+      delete [] rec.ping_ior;
     }
 
   return retval;
 }
 
 int
-Repository::get_wdir (ACE_TString key, ASYS_TCHAR *&wdir)
+Repository::get_wdir (const char *key, char *&wdir)
 {
-  Repository_Record *rec;
-  int retval = this->repository_.find (key, rec);
+  Repository::Record rec;
+  int retval = this->resolve (key, rec);
 
   if (retval == 0)
     {
-      ACE_NEW_RETURN (wdir, ASYS_TCHAR [ACE_OS::strlen (rec->wdir) + 1], -1);
-      ACE_OS::strcpy (wdir, rec->wdir);
+      delete [] rec.comm_line;
+      delete [] rec.env;
+      wdir = rec.wdir;
+      delete [] rec.host;
+      delete [] rec.ping_ior;
     }
 
   return retval;
 }
 
 int
-Repository::get_hostport (ACE_TString key, ASYS_TCHAR *&host, unsigned short &port)
+Repository::get_hostport (const char *key, char *&host, unsigned short &port)
 {
-  Repository_Record *rec;
-  int retval = this->repository_.find (key, rec);
+  Repository::Record rec;
+  int retval = this->resolve (key, rec);
 
   if (retval == 0)
     {
-      host = rec->host;
-      port = rec->port;
+      delete [] rec.comm_line;
+      delete [] rec.env;
+      delete [] rec.wdir;
+      host = rec.host;
+      port = rec.port;
+      delete [] rec.ping_ior;
     }
 
   return retval;
 }
 
 int
-Repository::get_ping_ior (ACE_TString key, ASYS_TCHAR *&ping_ior)
+Repository::get_ping_ior (const char *key, char *&ping_ior)
 {
-  Repository_Record *rec;
-  int retval = this->repository_.find (key, rec);
+  Repository::Record rec;
+  int retval = this->resolve (key, rec);
 
   if (retval == 0)
     {
-      ACE_NEW_RETURN (ping_ior, ASYS_TCHAR [ACE_OS::strlen (rec->ping_ior) + 1], -1);
-      ACE_OS::strcpy (ping_ior, rec->ping_ior);
+      delete [] rec.comm_line;
+      delete [] rec.env;
+      delete [] rec.wdir;
+      delete [] rec.host;
+      ping_ior = rec.ping_ior;
     }
 
   return retval;
@@ -217,38 +187,5 @@ Repository::get_ping_ior (ACE_TString key, ASYS_TCHAR *&ping_ior)
 void
 Repository::dump (void)
 {
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Total size: %d\n"), this->repository_.total_size ()));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Current size: %d\n"), this->repository_.current_size ()));
-  HASH_IR_ENTRY *entry;
-  size_t i = 0;
-
-  for (HASH_IR_ITER hash_iter (this->repository_);
-       hash_iter.next (entry) != 0;
-       hash_iter.advance ())
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ASYS_TEXT ("Record %d has server name \"%s\"\n"),
-                  i,
-                  ((ACE_TString) entry->ext_id_).c_str ()));
-      i++;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  this->repository_.dump ();
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Entry<ACE_TString, Repository_Record *>;
-template class ACE_Hash_Map_Manager_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Entry<ACE_TString, Repository_Record *>;
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_TString, Repository_Record *, ACE_Hash<ACE_TString>, ACE_Equal_To<ACE_TString>, ACE_Null_Mutex>;
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/orbsvcs/ImplRepo_Service/Repository.h b/TAO/orbsvcs/ImplRepo_Service/Repository.h
index 1253be51e7b..7e174e7ff93 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Repository.h
@@ -5,7 +5,7 @@
 //
 // = LIBRARY
 //    TAO/orbsvcs/ImplRepo_Service
-//
+// 
 // = FILENAME
 //    Repository.h
 //
@@ -14,49 +14,13 @@
 //
 // = AUTHOR
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
+// 
 // ============================================================================
 
-#ifndef REPOSITORY_H
+#if !defined (REPOSITORY_H)
 #define REPOSITORY_H
 
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-#include "ace/SString.h"
-
-#if defined (UNICODE)
-#define ACE_TString ACE_WString
-#else /* UNICODE */
-#define ACE_TString ACE_CString
-#endif /* UNICODE */
-
-struct Repository_Record
-{
-  // Constructors
-  Repository_Record ();
-  Repository_Record (const Repository_Record &);
-  Repository_Record (const ASYS_TCHAR *c,
-                     const ASYS_TCHAR *e,
-                     const ASYS_TCHAR *w,
-                     const ASYS_TCHAR *h,
-                     const unsigned short p,
-                     const ASYS_TCHAR *pi);
-
-
-  // Destructor
-  ~Repository_Record ();
-
-  // Assignment Operator
-  Repository_Record &operator= (Repository_Record &);
-
-  // Fields
-  ASYS_TCHAR *comm_line;
-  ASYS_TCHAR *env;
-  ASYS_TCHAR *wdir;
-  ASYS_TCHAR *host;
-  unsigned short port;
-  ASYS_TCHAR *ping_ior;
-};
+#include "ace/Naming_Context.h"
 
 class Repository
 {
@@ -64,45 +28,40 @@ public:
   Repository ();
   // Default Constructor
 
-  typedef ACE_Hash_Map_Entry<ACE_TString,
-                             Repository_Record *> HASH_IR_ENTRY;
-
-  typedef ACE_Hash_Map_Manager_Ex<ACE_TString,
-                                  Repository_Record *,
-                                  ACE_Hash<ACE_TString>,
-                                  ACE_Equal_To<ACE_TString>,
-                                  ACE_Null_Mutex> HASH_IR_MAP;
-
-  typedef ACE_Hash_Map_Iterator_Ex<ACE_TString,
-                                   Repository_Record *,
-                                   ACE_Hash<ACE_TString>,
-                                   ACE_Equal_To<ACE_TString>,
-                                   ACE_Null_Mutex> HASH_IR_ITER;
-
-  int add (ACE_TString key, const Repository_Record &rec);
+  struct Record
+  {
+    char *comm_line;
+    char *env;
+    char *wdir;
+    char *host;
+    unsigned short port;
+    char *ping_ior;
+  };
+
+  int add (const char *key, const Repository::Record &rec);
   // Add a new server to the Repository
 
-  int update (ACE_TString key, const Repository_Record &rec);
+  int update (const char *key, const Repository::Record &rec);
   // Updates an existing key with <rec>
-
-  int remove (ACE_TString key);
+  
+  int remove (const char *key);
   // Removes the server from the Repository
 
-  int resolve (ACE_TString key, Repository_Record &rec);
+  int resolve (const char *key, Repository::Record &rec);
   // Find the key record in the Repository
 
   // = Accessor methods
-  int get_comm_line (ACE_TString key, ASYS_TCHAR *&comm_line);
-  int get_env (ACE_TString key, ASYS_TCHAR *&env);
-  int get_wdir (ACE_TString key, ASYS_TCHAR *&wdir);
-  int get_ping_ior (ACE_TString key, ASYS_TCHAR *&ping_ior);
-  int get_hostport (ACE_TString key, ASYS_TCHAR *&host, unsigned short &port);
+  int get_comm_line (const char *key, char *&comm_line);
+  int get_env (const char *key, char *&env);
+  int get_wdir (const char *key, char *&wdir);
+  int get_ping_ior (const char *key, char *&ping_ior);
+  int get_hostport (const char *key, char *&host, unsigned short &port);
 
   // Dump method
   void dump (void);
 
 private:
-  HASH_IR_MAP repository_;
+  ACE_Naming_Context repository_;
 };
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/implrepo.dsp b/TAO/orbsvcs/ImplRepo_Service/implrepo.dsp
index f1b995a3150..7dba0aa8b3b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/implrepo.dsp
+++ b/TAO/orbsvcs/ImplRepo_Service/implrepo.dsp
@@ -97,10 +97,6 @@ SOURCE=.\ImplRepo_i.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Options.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Repository.cpp

 # End Source File

 # End Group

@@ -113,10 +109,6 @@ SOURCE=.\ImplRepo_i.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Options.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Repository.h

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
index f70a833fc5d..45ab9292f20 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.cpp
@@ -8,9 +8,9 @@
 //   Factory_Trader.cpp
 //
 // = DESCRIPTION
-//   A colocated instance of the Trading Service, only part of
+//   A colocated instance of the Trading Service, only part of 
 //   the functionality provided is used. This class serves
-//   as Wrapper around the Trading Service and provides
+//   as Wrapper around the Trading Service and provides 
 //   smaller interfaces.
 //   TRADER_AVAILABLE is defined via compiler switch in the Makefile
 //
@@ -21,7 +21,7 @@
 
 #include "Factory_Trader.h"
 #include "orbsvcs/CosTradingC.h"
-
+ 
 ACE_RCSID(LifeCycle_Service, Factory_Trader, "$Id$")
 
 // This const char * is used for adding a new type to the service repository
@@ -31,41 +31,41 @@ const char * Factory_Trader::GENERIC_FACTORY_INTERFACE_REPOSITORY_ID = "IDL:CosL
 
 Factory_Trader::Factory_Trader ()
   : trader_ptr_(0),
-    trading_Components_ptr_ (0),
+    trading_Components_ptr_ (0), 
     support_Attributes_ptr_(0)
-{
+{ 
   TAO_TRY
-    {
+    {      
       int argc = 0;
-      // create the trader
+      // create the trader 
       this->trader_ptr_ = TAO_Trader_Factory::create_trader (argc, 0);
       this->support_Attributes_ptr_ = &(trader_ptr_->support_attributes ());
       // this pointer is deleted when the trader_ptr is deleted
       this->trading_Components_ptr_ = &(trader_ptr_->trading_components ());
       // this pointer is deleted when the trader_ptr is deleted
-
+            
       // Set the service type repository
       support_Attributes_ptr_->type_repos (this->repository_._this (TAO_TRY_ENV));
-      TAO_CHECK_ENV;
-
+      TAO_CHECK_ENV;  
+      
       // Add the "Factory" type to the repository
-      this->add_type ();
+      this->add_type ();    
     }
   TAO_CATCHANY
     {
       ACE_ERROR ((LM_ERROR, "Factory_Trader constructor: Failed adding a new type."));
       TAO_TRY_ENV.print_exception ("Factory_Trader constructor: Exception.\n");
     }
-  TAO_ENDTRY;
+  TAO_ENDTRY;  
 }
 
 Factory_Trader::~Factory_Trader ()
-{
+{ 
   delete this->trader_ptr_;
 }
 
 
-void
+void 
 Factory_Trader::add_type ()
 {
   TAO_TRY
@@ -75,23 +75,23 @@ Factory_Trader::add_type ()
       propStruct_name.name = CORBA::string_dup ("name");
       propStruct_name.value_type = CORBA::_tc_string;
       propStruct_name.mode =  CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY;
-
+      
       CosTradingRepos::ServiceTypeRepository::PropStruct propStruct_location;
       propStruct_location.name  = CORBA::string_dup ("location");
       propStruct_location.value_type = CORBA::_tc_string;
       propStruct_location.mode =  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
-
+      
       CosTradingRepos::ServiceTypeRepository::PropStruct propStruct_description;
       propStruct_description.name = CORBA::string_dup ("description");
       propStruct_description.value_type = CORBA::_tc_string;
       propStruct_description.mode =  CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
-
+      
       CosTradingRepos::ServiceTypeRepository::PropStructSeq propStructSeq(3);
       propStructSeq.length (3);
       propStructSeq[0] = propStruct_name;
       propStructSeq[1] = propStruct_location;
       propStructSeq[2] = propStruct_description;
-
+            
       CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq superTypeSeq;
 
       // Add the new type
@@ -118,11 +118,11 @@ Factory_Trader::add_type ()
     }
   TAO_ENDTRY;
 }
+  
 
-
-void
-Factory_Trader::_cxx_export (const char * name,
-	       const char * location,
+void 
+Factory_Trader::export (const char * name, 
+	       const char * location, 
 	       const char * description,
 	       const CORBA::Object_ptr object_ptr)
 {
@@ -141,18 +141,18 @@ Factory_Trader::_cxx_export (const char * name,
       propertySeq[1].name =  CORBA::string_dup("location");
       propertySeq[1].value <<= CORBA::string_dup (location);
       propertySeq[2].name =  CORBA::string_dup("description");
-      propertySeq[2].value <<= CORBA::string_dup (description);
-
+      propertySeq[2].value <<= CORBA::string_dup (description);      
+      
       // get the register interface
-      CosTrading::Register_ptr register_ptr = this->trading_Components_ptr_->register_if ();
+      CosTrading::Register_ptr register_ptr = this->trading_Components_ptr_->register_if (); 
       // this pointer is deleted when the trader_ptr is deleted
-
+      
       // invoke the export method on the Register interface of the Trading Service
-      register_ptr->_cxx_export (CORBA::Object::_duplicate (object_ptr),
+      register_ptr->export (CORBA::Object::_duplicate (object_ptr),
 			    CORBA::string_dup("Factory"),
 			    propertySeq,
 			    TAO_TRY_ENV);
-
+			    
       TAO_CHECK_ENV;
     }
   TAO_CATCH (CORBA::UserException, userex)
@@ -169,7 +169,7 @@ Factory_Trader::_cxx_export (const char * name,
     {
       ACE_ERROR ((LM_ERROR, "Factory_Trader::export: Failed to export factory.\n"));
     }
-  TAO_ENDTRY;
+  TAO_ENDTRY;  
 }
 
 
@@ -177,17 +177,17 @@ CORBA::Object_ptr
 Factory_Trader::query (const CORBA::String constraint)
 {
   TAO_TRY
-    {
+    {           
       CosTrading::Lookup::SpecifiedProps specifiedProps;
       specifiedProps._d(CosTrading::Lookup::all);
-
+      
       // Get some pointers for the out parameters of the call.
-      CosTrading::OfferSeq_ptr offerSeq_ptr =  0;
-      CosTrading::OfferIterator_ptr offerIterator_ptr = 0;
+      CosTrading::OfferSeq_ptr offerSeq_ptr =  0;      
+      CosTrading::OfferIterator_ptr offerIterator_ptr = 0;      
       CosTrading::PolicyNameSeq_ptr policyNameSeq_ptr = 0;
-
+      
       // An empty policy sequence
-      CosTrading::PolicySeq policySeq;
+      CosTrading::PolicySeq policySeq;           
 
       // Get a reference to the lookup interface
       CosTrading::Lookup_ptr lookup_ptr = this->trading_Components_ptr_->lookup_if ();
@@ -196,7 +196,7 @@ Factory_Trader::query (const CORBA::String constraint)
       // Invoke the query method on the Lookup Interface.
       lookup_ptr->query ("Factory",         // Type name
 			 constraint,        // Constraint, very important
-			 "",                // Preferences
+			 "",                // Preferences 
 			 policySeq,         // Policy
 			 specifiedProps,    // Specified Properties
 			 1,                 // Number of wanted results
@@ -204,17 +204,17 @@ Factory_Trader::query (const CORBA::String constraint)
 			 CosTrading::OfferIterator_out(offerIterator_ptr),     // more results
 			 CosTrading::PolicyNameSeq_out(policyNameSeq_ptr),     // Policies
 			 TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
+      TAO_CHECK_ENV;      
+      
       // Initialize
       CORBA::Object_ptr object_ptr = 0;
-
+      
       // Check if an offer was made
       if (offerSeq_ptr != 0)
 	{
 	  // Insert the pointer into the out class
 	  CosTrading::OfferSeq_var offerSeq_var(offerSeq_ptr);
-
+	  
 	  // We need at least one offer.
 	  if (offerSeq_var->length() >= 1)
 	    {
@@ -228,12 +228,12 @@ Factory_Trader::query (const CORBA::String constraint)
 		}
 	      else
 		ACE_DEBUG ((LM_DEBUG,"Factory_Trader::query: Received a proper object reference.\n"));
-	    }
+	    } 
 	  else
-	    ACE_DEBUG ((LM_DEBUG,"Factory_Trader::query: OfferSequence.length is smaller than 1.\n"));
+	    ACE_DEBUG ((LM_DEBUG,"Factory_Trader::query: OfferSequence.length is smaller than 1.\n"));	   
 	}
-      return object_ptr;
-    }
+      return object_ptr;      
+    } 
   TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
@@ -248,6 +248,8 @@ Factory_Trader::query (const CORBA::String constraint)
     {
       ACE_ERROR ((LM_ERROR, "Factory_Trader::query: Failed.\n"));
     }
-  TAO_ENDTRY;
+  TAO_ENDTRY;    
   return 0;
 }
+
+
diff --git a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
index 9556cc43dc9..6730e707e99 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Factory_Trader.h
@@ -32,10 +32,10 @@ public:
   void add_type ();
   // Add a the Factory type to the repository
 
-  void _cxx_export (const char * name,
-                    const char * location,
-                    const char * description,
-                    const CORBA::Object_ptr object_ptr);
+  void export (const char * name,
+               const char * location,
+               const char * description,
+               const CORBA::Object_ptr object_ptr);
   // export a specific factory
 
   CORBA::Object_ptr query (const CORBA::String constraint);
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp
index e3b473a6aa7..0df58ff0fdf 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsp
@@ -17,12 +17,13 @@ CFG=LifeCycle_Service - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "LifeCycle_Service - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "LifeCycle_Service - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "LifeCycle_Service - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "LifeCycle_Service - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -39,10 +40,9 @@ RSC=rc.exe
 # 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 "..\.." /I "..\..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /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

@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # 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 /machine:I386

-# ADD LINK32 TAO.lib orbsvcs.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# 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 /nologo /subsystem:console /machine:I386

 

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

 

@@ -61,7 +61,7 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

+# PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

@@ -75,7 +75,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

+# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"LifeCycle_Service.exe" /pdbtype:sept /libpath:"..\orbsvcs" /libpath:"..\..\tao" /libpath:"..\..\..\ace"

 

 !ENDIF 

 

@@ -96,11 +96,11 @@ SOURCE=.\Factory_Trader.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycle_Service.cpp

+SOURCE=.\Life_Cycle_Service.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycle_Service_i.cpp

+SOURCE=.\Life_Cycle_Service_i.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -116,11 +116,11 @@ SOURCE=.\Factory_Trader.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycle_Service.h

+SOURCE=.\Life_Cycle_Service.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\LifeCycle_Service_i.h

+SOURCE=.\Life_Cycle_Service_i.h

 # End Source File

 # End Group

 # Begin Group "Inline Files"

diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.cpp
index c187953e7bc..8b4430a5f79 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.cpp
@@ -14,9 +14,9 @@
 // ============================================================================
 
 #include "tao/corba.h"
-#include "LifeCycle_Service.h"
+#include "Life_Cycle_Service.h"
 
-ACE_RCSID(LifeCycle_Service, LifeCycle_Service, "$Id$")
+ACE_RCSID(LifeCycle_Service, Life_Cycle_Service, "$Id$")
 
 static const char usage [] = "[-? |\n[-O[RBport] ORB port number]]";
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h
index 8691ee6547d..ab24a98dc6f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service.h
@@ -3,7 +3,7 @@
 // ============================================================================
 //
 // = FILENAME
-//    LifeCycle_Service.h
+//    Life_Cycle_Service.h
 //
 // = DESCRIPTION
 //    A creation service for objects using the CosLifeCycle GenericFactory.
@@ -20,10 +20,10 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO.h"
-#include "LifeCycle_Service_i.h"
+#include "Life_Cycle_Service_i.h"
 
-#ifndef LIFECYCLE_SERVICE_H
-#define LIFECYCLE_SERVICE_H
+#ifndef LIFE_CYCLE_SERVICE_H
+#define IFE_CYCLE_SERVICE_H
 
 class Life_Cycle_Service_Server
 {
@@ -65,5 +65,5 @@ private:
   // commandline arguments.
 };
 
-#endif /* LIFECYCLE_SERVICE_H */
+#endif /* LIFE_CYCLE_SERVICE_H */
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.cpp
index ed8bfac5754..5420ba8c5ae 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.cpp
@@ -16,9 +16,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/corba.h"
 #include "orbsvcs/LifeCycleServiceC.h"
-#include "LifeCycle_Service_i.h"
+#include "Life_Cycle_Service_i.h"
 
-ACE_RCSID(LifeCycle_Service, LifeCycle_Service_i, "$Id$")
+ACE_RCSID(LifeCycle_Service, Life_Cycle_Service_i, "$Id$")
 
 // Constructor
 Life_Cycle_Service_i::Life_Cycle_Service_i (void)
@@ -32,7 +32,7 @@ Life_Cycle_Service_i::~Life_Cycle_Service_i (void)
 }
 
 
-CORBA::Boolean
+CORBA::Boolean 
 Life_Cycle_Service_i::supports (const CosLifeCycle::Key &factory_key,
                                        CORBA::Environment &TAO_IN_ENV_there)
 {
@@ -42,7 +42,7 @@ Life_Cycle_Service_i::supports (const CosLifeCycle::Key &factory_key,
 }
 
 CORBA::Object_ptr
-Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
+Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key, 
                                             const CosLifeCycle::Criteria &the_criteria,
                                             CORBA::Environment &TAO_IN_ENV_there)
 {
@@ -53,77 +53,77 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
     {
       Criteria_Evaluator criteria_Evaluator(the_criteria);
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: new evaluator.\n"));
-
+      
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: getFilter will be called.\n"));
-
+      
       CORBA::String filter = criteria_Evaluator.getFilter (TAO_IN_ENV_there);
-
+      
       if (TAO_IN_ENV_there.exception() != 0)
 	{
 	  return 0;
-	}
-
+	} 
+      
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query(%s) will be called.\n",filter));
 
       CORBA::Object_ptr genericFactoryObj_ptr = factory_trader_ptr_->query (filter);
-
+      
       ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i:create_object: query was called.\n"));
-
+      
       if (CORBA::is_nil (genericFactoryObj_ptr))
-	ACE_ERROR_RETURN ((LM_ERROR,
+	ACE_ERROR_RETURN ((LM_ERROR, 
 			   "Life_Cycle_Service_i::create_object: Factory is nil!\n"),
 			  0);
       else // everyting is ok
-	ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Object reference OK.\n"));
+	ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Object reference OK.\n"));    
 
       // Now we have a proper reference to a Generic Factory
       // the create_object call will be forwarded to this factory
 
 
       // Check if it is a valid Generic Factory reference
-      if (CORBA::is_nil (genericFactoryObj_ptr))
-	{ // throw a NoFactory exception
-	  TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));
+      if (CORBA::is_nil (genericFactoryObj_ptr)) 
+	{ // throw a NoFactory exception  
+	  TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
 	  return 0;
 	}
-      else
-	{
+      else 
+	{ 
 	  CORBA::Environment env_here;
-
-	  CosLifeCycle::GenericFactory_var genericFactory_var =
-	    CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr,
+	  
+	  CosLifeCycle::GenericFactory_var genericFactory_var = 
+	    CosLifeCycle::GenericFactory::_narrow (genericFactoryObj_ptr, 
 					    env_here);
-
+	  
 	  // see if there is an exception, if yes then throw the NoFactory exception
-	  if (env_here.exception () != 0) // throw a NoFactory exception
-	    {
-	      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));
+	  if (env_here.exception () != 0) // throw a NoFactory exception  
+	    { 
+	      TAO_IN_ENV_there.exception (new CosLifeCycle::NoFactory (factory_key));      
 	      return 0;
 	    }
-
-	  if (CORBA::is_nil (genericFactory_var.in()))
+	  
+	  if (CORBA::is_nil (genericFactory_var.in()))      
 	    ACE_ERROR_RETURN ((LM_ERROR,
 			       "Life_Cycle_Service_i::create_object: Invalid Generic Factory.\n"),
 			      0);
-
-	  ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Generic Factory reference OK.\n"));
-
+	  
+	  ACE_DEBUG ((LM_DEBUG, "Life_Cycle_Service_i::create_object: Generic Factory reference OK.\n"));    
+	  
 	  // Now retrieve the Object obj ref corresponding to the key.
 	  CORBA::Object_var object_var = genericFactory_var->create_object (factory_key,
 									    the_criteria,
 									    TAO_IN_ENV_there);
-
+      
 	  ACE_DEBUG ((LM_DEBUG,
 		      "Life_Cycle_Service_i::create_object: Forwarded request.\n"));
-
+	  
 	  if (CORBA::is_nil (object_var.in()))
 	    ACE_ERROR_RETURN ((LM_ERROR,
 			       "Life_Cycle_Service_i::create_object: Null object refeference returned by factory.\n"),
 			      0);
-
+	  
 	  ACE_DEBUG ((LM_DEBUG,
 		      "Life_Cycle_Service_i::create_object: Return a object reference to a new object.\n"));
-
+	  
 	  return CORBA::Object::_duplicate (object_var.in());
 	}
     }
@@ -133,7 +133,7 @@ Life_Cycle_Service_i::create_object (const CosLifeCycle::Key &factory_key,
     }
 }
 
-void
+void 
 Life_Cycle_Service_i::register_factory (const char * name,
 					   const char * location,
 					   const char * description,
@@ -145,14 +145,24 @@ Life_Cycle_Service_i::register_factory (const char * name,
       ACE_NEW (factory_trader_ptr_, Factory_Trader());
     }
   // we have an proper reference to the Factory Trader
-
-  // Just forward the call to the factory trader
+  
+  // Just forward the call to the factory trader 
   // Exceptions are not handled here, they are returned
-  factory_trader_ptr_->_cxx_export (name, location, description, object);
-
+  factory_trader_ptr_->export (name, location, description, object);     
+  
   ACE_DEBUG ((LM_DEBUG, "Registered a factory with:\n"
 	      "     name: %s\n"
 	      "     location: %s\n"
 	      "     description: %s\n",
-	      name, location, description));
+	      name, location, description));       
 }
+
+
+ 
+
+
+
+
+
+
+
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h
index c44b432ff33..7b4aa4d18ba 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service_i.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Life_Cycle_Service_i.h
@@ -3,7 +3,7 @@
 // ============================================================================
 //
 // = FILENAME
-//    LifeCycle_Service_i.h
+//    Life_Cycle_Service_i.h
 //
 // = DESCRIPTION
 //    A Life Cycle Service for the Quoter example.
@@ -17,8 +17,8 @@
 #include "Factory_Trader.h"
 #include "Criteria_Evaluator.h"
 
-#ifndef LIFECYCLE_SERVICE_IMPL_H
-#define LIFECYCLE_SERVICE_IMPL_H
+#ifndef LIFE_CYCLE_SERVICE_IMPL_H
+#define LIFE_CYCLE_SERVICE_IMPL_H
 
 class Life_Cycle_Service_i : public POA_LifeCycleService::Life_Cycle_Service
 {
@@ -52,7 +52,7 @@ private:
   Factory_Trader *factory_trader_ptr_;
 };
 
-#endif /* LIFECYCLE_SERVICE_IMPL_H */
+#endif /* LIFE_CYCLE_SERVICE_IMPL_H */
 
 
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile b/TAO/orbsvcs/LifeCycle_Service/Makefile
index 04d0450719e..24573cd3978 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile
+++ b/TAO/orbsvcs/LifeCycle_Service/Makefile
@@ -10,63 +10,65 @@ endif # TAO_ROOT
 
 TAO_IDLFLAGS=-I$(TAO_ROOT)/orbsvcs/orbsvcs
 
+
+BIN = Life_Cycle_Service
+
+
 # The following lines tell the souce code that the trading
 # service is available.
 
-LIFECYCLE_SERVICE_SRCS = \
-        LifeCycle_Service.cpp LifeCycle_Service_i.cpp \
-        Factory_Trader.cpp Criteria_Evaluator.cpp
+LIFE_CYCLE_SERVICE_SRCS = \
+	Life_Cycle_Service.cpp Life_Cycle_Service_i.cpp \
+	Factory_Trader.cpp Criteria_Evaluator.cpp
+
 
 LSRC= \
-        LifeCycle_Service.cpp LifeCycle_Service_i.cpp \
-        Factory_Trader.cpp Criteria_Evaluator.cpp
+	Life_Cycle_Service.cpp Life_Cycle_Service_i.cpp \
+	Factory_Trader.cpp Criteria_Evaluator.cpp
 
-LIFECYCLE_SERVICE_OBJS = LifeCycle_Service.o LifeCycle_Service_i.o \
-        Factory_Trader.o Criteria_Evaluator.o
+LIFE_CYCLE_SERVICE_OBJS = Life_Cycle_Service.o Life_Cycle_Service_i.o \
+		Factory_Trader.o Criteria_Evaluator.o
 
 LDLIBS = -lorbsvcs -lTAO
 
-BIN2 = LifeCycle_Service
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (LifeCycle,$(findstring LifeCycle,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # LifeCycle
-
 #----------------------------------------------------------------------------
-#       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/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	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #### Local rules and variables...
 
 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)/orbsvcs/orbsvcs \
-        -I$(TAO_ROOT) $(TSS_ORB_FLAG)
+	-I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
-LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
+realclean: clean
+
+Life_Cycle_Service: $(addprefix $(VDIR),$(LIFE_CYCLE_SERVICE_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/LifeCycle_Service.o .obj/LifeCycle_Service.so .shobj/LifeCycle_Service.o .shobj/LifeCycle_Service.so: LifeCycle_Service.cpp \
+.obj/Life_Cycle_Service.o .obj/Life_Cycle_Service.so .shobj/Life_Cycle_Service.o .shobj/Life_Cycle_Service.so: Life_Cycle_Service.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -130,344 +132,53 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- LifeCycle_Service.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(TAO_ROOT)/tao/TAO.h \
- LifeCycle_Service_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS.i \
- Factory_Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
- Criteria_Evaluator.h
-.obj/LifeCycle_Service_i.o .obj/LifeCycle_Service_i.so .shobj/LifeCycle_Service_i.o .shobj/LifeCycle_Service_i.so: LifeCycle_Service_i.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/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/Get_Opt.i \
- $(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/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/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/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 \
@@ -494,52 +205,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -548,31 +213,22 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -594,8 +250,11 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -612,84 +271,62 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/LifeCycleServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.i \
- LifeCycle_Service_i.h \
+ Life_Cycle_Service.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ Life_Cycle_Service_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.cpp \
@@ -703,26 +340,16 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
  Criteria_Evaluator.h
-.obj/Factory_Trader.o .obj/Factory_Trader.so .shobj/Factory_Trader.o .shobj/Factory_Trader.so: Factory_Trader.cpp Factory_Trader.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Life_Cycle_Service_i.o .obj/Life_Cycle_Service_i.so .shobj/Life_Cycle_Service_i.o .shobj/Life_Cycle_Service_i.so: Life_Cycle_Service_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -730,13 +357,14 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/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/Get_Opt.i \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -786,319 +414,53 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i
-.obj/Criteria_Evaluator.o .obj/Criteria_Evaluator.so .shobj/Criteria_Evaluator.o .shobj/Criteria_Evaluator.so: Criteria_Evaluator.cpp Criteria_Evaluator.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.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/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/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 \
- $(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.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/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 \
@@ -1125,52 +487,6 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1179,31 +495,22 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1225,8 +532,11 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1243,65 +553,75 @@ LifeCycle_Service: $(addprefix $(VDIR),$(LIFECYCLE_SERVICE_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/LifeCycleServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceC.i \
+ Life_Cycle_Service_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LifeCycleServiceS.i \
+ Factory_Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h \
+ Criteria_Evaluator.h
+.obj/Criteria_Evaluator.o .obj/Criteria_Evaluator.so .shobj/Criteria_Evaluator.o .shobj/Criteria_Evaluator.so: Criteria_Evaluator.cpp Criteria_Evaluator.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/orbsvcs/LifeCycle_Service/Makefile.am b/TAO/orbsvcs/LifeCycle_Service/Makefile.am
deleted file mode 100644
index d456fd634f0..00000000000
--- a/TAO/orbsvcs/LifeCycle_Service/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Life Cycle Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = LifeCycle_Service
-
-LifeCycle_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-LifeCycle_Service_SOURCES = \
-        Criteria_Evaluator.cpp \
-        Factory_Trader.cpp \
-        LifeCycle_Service.cpp \
-        LifeCycle_Service_i.cpp
-
-noinst_HEADERS = \
-        Criteria_Evaluator.h \
-        Factory_Trader.h \
-        LifeCycle_Service.h \
-        LifeCycle_Service_i.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/LifeCycle_Service/svc.conf b/TAO/orbsvcs/LifeCycle_Service/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/LifeCycle_Service/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Logging_Service/Makefile b/TAO/orbsvcs/Logging_Service/Makefile
index 8c7dfac04e2..21ac337f722 100644
--- a/TAO/orbsvcs/Logging_Service/Makefile
+++ b/TAO/orbsvcs/Logging_Service/Makefile
@@ -1,37 +1,31 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Top-level Makefile for the Logging Service of the TAO ORB
+#	Top-level Makefile for the Logging Service of the TAO ORB
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-SRC     = Logging_Service_i.cpp Logging_Service.cpp
+BIN 	= Logging_Service
+VBIN    = $(BIN:%=%$(VAR))
 
-LDLIBS  = -lorbsvcs -lTAO
+SRC	= Logging_Service_i.cpp Logging_Service.cpp
+
+LDLIBS	= -lorbsvcs -lTAO
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-LOGGING_OBJS =  Logging_Service_i.o Logging_Service.o
+LOGGING_OBJS = 	Logging_Service_i.o Logging_Service.o
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-BIN2 = Logging_Service
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Log,$(findstring Log,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Log
-
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -49,10 +43,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
 Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -61,6 +51,9 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -125,218 +118,26 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -345,12 +146,13 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
@@ -364,6 +166,9 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -428,218 +233,26 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -648,12 +261,13 @@ Logging_Service: $(addprefix $(VDIR),$(LOGGING_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
diff --git a/TAO/orbsvcs/Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/Makefile.am
deleted file mode 100644
index 93e3437fbb5..00000000000
--- a/TAO/orbsvcs/Logging_Service/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Logging Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Logging_Service
-
-Logging_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Logging_Service_SOURCES = \
-        Logging_Service.cpp \
-        Logging_Service_i.cpp
-
-noinst_HEADERS = \
-        Logging_Service_i.h
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Makefile b/TAO/orbsvcs/Makefile
index d88ef1d5de3..b9b97bcff8f 100644
--- a/TAO/orbsvcs/Makefile
+++ b/TAO/orbsvcs/Makefile
@@ -19,9 +19,7 @@ DIRS  =	orbsvcs \
 	Logging_Service \
 	Time_Service \
 	ImplRepo_Service \
-	CosEvent_Service \
-	tests \
-	examples
+	tests
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/Makefile.am b/TAO/orbsvcs/Makefile.am
deleted file mode 100644
index faa3a7cc56c..00000000000
--- a/TAO/orbsvcs/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO orbsvcs library
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        orbsvcs \
-        Naming_Service \
-        Scheduling_Service \
-        Event_Service \
-        Dump_Schedule \
-        Concurrency_Service \
-        LifeCycle_Service \
-        Trading_Service \
-        Logging_Service \
-        tests
-
-
diff --git a/TAO/orbsvcs/Naming_Service/Makefile b/TAO/orbsvcs/Naming_Service/Makefile
index 0e1196806b1..b270d352cc7 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile
+++ b/TAO/orbsvcs/Naming_Service/Makefile
@@ -5,26 +5,21 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
+BIN 	= Naming_Service
+
 SRC = $(addsuffix .cpp, $(BIN))
 
 LDLIBS  = -lorbsvcs -lTAO
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = Naming_Service
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN) 
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -44,10 +39,6 @@ endif
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -56,6 +47,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -121,32 +115,57 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(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 \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(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/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/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(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 \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -173,68 +192,28 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -256,8 +235,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -274,65 +256,39 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -341,11 +297,12 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
deleted file mode 100644
index eb0a2f09d7c..00000000000
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Naming Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Naming_Service
-
-Naming_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Naming_Service_SOURCES = \
-        Naming_Service.cpp
-
-noinst_HEADERS = \
-        Naming_Service.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 9edb245c7ed..0a70041ff48 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -11,7 +11,6 @@ TAO_Naming_Service::TAO_Naming_Service (void)
   : ior_output_file_ (0),
     pid_file_name_ (0),
     context_size_ (ACE_DEFAULT_MAP_SIZE),
-    persistence_file_name_ (0),
     time_ (0)
 {
 }
@@ -23,7 +22,6 @@ TAO_Naming_Service::TAO_Naming_Service (int argc,
   : ior_output_file_ (0),
     pid_file_name_ (0),
     context_size_ (ACE_DEFAULT_MAP_SIZE),
-    persistence_file_name_ (0),
     time_ (0)
 {
   this->init (argc, argv);
@@ -33,7 +31,7 @@ int
 TAO_Naming_Service::parse_args (int argc,
                                 char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "do:p:s:t:f:");
+  ACE_Get_Opt get_opts (argc, argv, "do:p:s:t:");
   int c;
   int size, time;
 
@@ -55,9 +53,6 @@ TAO_Naming_Service::parse_args (int argc,
       case 'p':
         this->pid_file_name_ = get_opts.optarg;
         break;
-      case 'f':
-        this->persistence_file_name_ = get_opts.optarg;
-        break;
       case 's':
         size = ACE_OS::atoi (get_opts.optarg);
         if (size >= 0)
@@ -75,7 +70,6 @@ TAO_Naming_Service::parse_args (int argc,
                            "-NScontextname <contextname> "
                            "-o <ior_output_file> "
                            "-p <pid_file_name> "
-                           "-f <persistence_file_name> "
                            "\n",
                            argv [0]),
                           -1);
@@ -92,14 +86,13 @@ TAO_Naming_Service::init (int argc,
   CORBA::ORB_var orb;
   PortableServer::POA_var child_poa;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_manager_.init_child_poa (argc,
                                          argv,
                                          "child_poa",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       orb = this->orb_manager_.orb ();
       child_poa = this->orb_manager_.child_poa ();
@@ -116,18 +109,17 @@ TAO_Naming_Service::init (int argc,
                                              child_poa.in (),
                                              context_size_,
                                              0,
-                                             0,
-                                             persistence_file_name_);
+                                             0);
+      TAO_CHECK_ENV;
       if (result == -1)
         return result;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Service::init");
+      TAO_TRY_ENV.print_exception ("TAO_Naming_Service::init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   if (this->ior_output_file_ != 0)
     {
@@ -156,14 +148,14 @@ TAO_Naming_Service::init (int argc,
 // Run the ORB event loop.
 
 int
-TAO_Naming_Service::run (CORBA_Environment& ACE_TRY_ENV)
+TAO_Naming_Service::run (CORBA_Environment& env)
 {
   if (time_ == 0)
-      return this->orb_manager_.run (ACE_TRY_ENV);
+      return this->orb_manager_.run (env);
   else
     {
       ACE_Time_Value *t = new ACE_Time_Value (time_);
-      return this->orb_manager_.run (ACE_TRY_ENV, t);
+      return this->orb_manager_.run (env, t);
     }
 }
 
@@ -183,19 +175,16 @@ main (int argc, char *argv[])
   if (init_result == -1)
     return -1;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      naming_service.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      naming_service.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NamingService");
+      TAO_TRY_ENV.print_exception ("NamingService");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
index 4b5cb666629..aedd52f160c 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.dsp
@@ -341,7 +341,7 @@ DEP_CPP_NAMIN=\
 	"..\..\tao\Exception.i"\

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

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

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

+	"..\..\tao\IIOP_Interpreter.h"\

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

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

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

diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 506afb2fd67..819f496802f 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -42,7 +42,7 @@ public:
   int init (int argc, char *argv[]);
   // Initialize the Naming Service with the arguments.
 
-  int run (CORBA_Environment& ACE_TRY_ENV);
+  int run (CORBA_Environment& env);
   // Run the TAO_Naming_Service.
 
   ~TAO_Naming_Service (void);
@@ -70,10 +70,6 @@ private:
   // created under the given context will use the same size for their
   // initial hash table allocations.
 
-  LPCTSTR persistence_file_name_;
-  // Path to the file to be used to store/read in Naming Service
-  // persistent state.
-
   size_t time_;
   // After how long the server should stop listening to requests (in
   // seconds).
diff --git a/TAO/orbsvcs/Naming_Service/README b/TAO/orbsvcs/Naming_Service/README
index 509e3023530..f43590489d6 100644
--- a/TAO/orbsvcs/Naming_Service/README
+++ b/TAO/orbsvcs/Naming_Service/README
@@ -1,40 +1,26 @@
 // $Id$
 
         This directory contains the files that implement the TAO
-Naming server.  The TAO Naming Service uses IP Multicast to process
+Naming Service.  The TAO Naming Service uses IP Multicast to process
 client "resolve_initial_references()" requests.
 
 To Run:
 ======
 
-% Naming_Service [-ORBport port]
+% Naming_Service [-ORBport port] 
                  [-ORBobjrefstyle url]
                  [-ORBnameserviceport nsport]
-                 [-o ior_output_file]
-                 [-p pid_file_name]
-                 [-s context_size]
+                 [-s context_size] 
                  [-t time]
-                 [-f persitence_file_name]
 
 Arguments:
 ==========
         port
                  The ORB port.
 
-        nsport
+        nsport 
                 Multicast port.
 
-
-        output_file
-                The name of the file, in which to store IOR of the
-                root Naming Service context.  (This file can then be
-                used by clients instead of multicast, to obtain the
-                Naming Service IOR).
-
-       pid_file_name
-                The name of the file, in which to store the process id
-                of the Naming Service server.
-
         context_size
                  Size of the hash table allocated upon the creation of
                  the root Naming Context (if one is created).  All
@@ -45,43 +31,10 @@ Arguments:
                 How long the server should listen for requests before
                 exiting.
 
-        persistence_file_name
-                The name of the file to use to store/read from the
-                persistent state of the Naming Service.
-
 Environment Variables:
 =====================
 
-        NameServicePort - Multicast port to listen on for
-        "resolve_initial_references" requests.
-
-Persistence:
-===========
-TAO Naming Service has an optional persistence capability.  By
-default, a non-persistent version of the Naming Service is used.
-Supplying "-f" command-line option to the server causes a persistent
-version of the Naming Service to run.
-
-The file, which name is supplied along with the "-f" option, is used to store the
-persistent state of the Naming Service, i.e., all Naming Contexts and
-all their bindings.  When "-f" option is specified:
-
-    1. If the specified file does not exist, the file is created
-       and used to store the state of the Naming Service.  An initial
-       (root) Naming Context is also created.
-
-    2. If the specified file exists, it is scanned and:
-                        a) If any inconsistency is detected in the
-                        stored state or the file is not recognized by
-                        the Naming Service, the server exits.  A
-                        noncorrupted version of the file must be used.
-
-                        b) If no Naming Contexts exist, an initial
-                        (root) Naming Context is created.
-
-                        c) If one or more Naming Contexts exist, the
-                        state stored in the file becomes the state of
-                        the Naming Service.
+        NameServicePort - Multicast port.
 
 Sample Run:
 ==========
@@ -114,7 +67,7 @@ Multicast.  This behavior can be overridden in the following ways:
 
            % client -ORBnameserviceior <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
 
-        2. Set the environment variable `NameServiceIOR' (minus the
+        2. Set the environment variable `NameService' (minus the
            quotes), as follows in csh or tcsh:
 
            % setenv NameServiceIOR <iiop:1.0//tango:20000/P35194c690003809cRootPOA/child_poa/NameService>
@@ -128,9 +81,11 @@ These two techniques may be needed in an environment where
         1. There is more than one NamingService, to avoid the
            confusion of a server registering its object with one
            NamingService and the client getting the reply from some
-           other NamingService.
+           other NamingService. 
 
         2. The OS platform doesn't support multicast.
 
         3. The client or server isn't written using TAO, and therefore
            doesn't use TAO's multicast NameService resolution protocol.
+
+
diff --git a/TAO/orbsvcs/Naming_Service/svc.conf b/TAO/orbsvcs/Naming_Service/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/Naming_Service/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile b/TAO/orbsvcs/Scheduling_Service/Makefile
index fca6408e072..a3695d1bc03 100644
--- a/TAO/orbsvcs/Scheduling_Service/Makefile
+++ b/TAO/orbsvcs/Scheduling_Service/Makefile
@@ -1,35 +1,33 @@
+#
 # $Id$
+#
 
-SCHEDULE_SRCS = Scheduling_Service.cpp
-LSRC =  $(SCHEDULE_SRCS)
+BIN = Scheduling_Service
 
-SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
 
-LDLIBS  = -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+SCHEDULE_SRCS = \
+	Scheduling_Service.cpp
+
+LSRC = 	$(SCHEDULE_SRCS)
 
-BIN2 = Scheduling_Service
+SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Sched
+LDLIBS     =  -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -39,7 +37,7 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -50,6 +48,9 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -114,85 +115,79 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -201,31 +196,22 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -247,8 +233,11 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -265,84 +254,51 @@ Scheduling_Service: $(addprefix $(VDIR),$(SCHEDULE_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
diff --git a/TAO/orbsvcs/Scheduling_Service/Makefile.am b/TAO/orbsvcs/Scheduling_Service/Makefile.am
deleted file mode 100644
index a1c9126feca..00000000000
--- a/TAO/orbsvcs/Scheduling_Service/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Scheduling Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Scheduling_Service
-
-Scheduling_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Scheduling_Service_SOURCES = \
-        Scheduling_Service.cpp
-
-## noinst_HEADERS =
-
-## EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Scheduling_Service/svc.conf b/TAO/orbsvcs/Scheduling_Service/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/Scheduling_Service/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/Time_Service/Makefile b/TAO/orbsvcs/Time_Service/Makefile
index e33d2e4ab8f..30dcd896b52 100644
--- a/TAO/orbsvcs/Time_Service/Makefile
+++ b/TAO/orbsvcs/Time_Service/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -15,71 +15,68 @@ endif
 LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = \
-        Time_Service_Server.cpp \
-        Time_Service_Clerk.cpp \
-        Clerk_i.cpp \
-        Server_i.cpp \
-        IR_Helper.cpp \
+	server.cpp \
+	clerk.cpp \
+	Clerk_i.cpp \
+	Server_i.cpp \
+	IR_Helper.cpp \
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_SVR_OBJS = IR_Helper.o \
-        Server_i.o \
-        Time_Service_Server.o \
+	Server_i.o \
+	server.o \
 
 SIMPLE_CRK_OBJS = Clerk_i.o \
-        Time_Service_Clerk.o \
+	clerk.o \
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = Time_Service_Server \
-       Time_Service_Clerk
+BIN = server \
+      clerk
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Time
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	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
+#	Local targets
 #----------------------------------------------------------------------------
 
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-Time_Service_Server: $(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(SIMPLE_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
+clerk:	$(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
+realclean: clean
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Time_Service_Server.o .obj/Time_Service_Server.so .shobj/Time_Service_Server.o .shobj/Time_Service_Server.so: Time_Service_Server.cpp Server_i.h \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Server_i.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -144,218 +141,26 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -364,28 +169,22 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
@@ -397,11 +196,14 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
-.obj/Time_Service_Clerk.o .obj/Time_Service_Clerk.so .shobj/Time_Service_Clerk.o .shobj/Time_Service_Clerk.so: Time_Service_Clerk.cpp Clerk_i.h \
+.obj/clerk.o .obj/clerk.so .shobj/clerk.o .shobj/clerk.so: clerk.cpp Clerk_i.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -466,218 +268,26 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -686,28 +296,22 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
@@ -720,6 +324,9 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -774,8 +381,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- Clerk_i.h \
- $(TAO_ROOT)/tao/TAO.h \
+ Clerk_i.h $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -787,218 +393,26 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1007,28 +421,22 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
@@ -1041,6 +449,9 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1054,8 +465,7 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Server_i.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Server_i.h \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -1106,218 +516,26 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -1326,28 +544,22 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
@@ -1367,6 +579,9 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1426,218 +641,26 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
@@ -1647,7 +670,6 @@ Time_Service_Clerk:  $(addprefix $(VDIR),$(SIMPLE_CRK_OBJS))
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
diff --git a/TAO/orbsvcs/Time_Service/Makefile.am b/TAO/orbsvcs/Time_Service/Makefile.am
deleted file mode 100644
index d675105e61e..00000000000
--- a/TAO/orbsvcs/Time_Service/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Time Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Time_Service_Server Time_Service_Clerk
-
-Time_Service_Server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Time_Service_Server_SOURCES = \
-        IR_Helper.cpp \
-        Server_i.cpp \
-        Time_Service_Server.cpp
-
-Time_Service_Clerk_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Time_Service_Clerk_SOURCES = \
-        Clerk_i.cpp \
-        Time_Service_Clerk.cpp
-
-noinst_HEADERS = \
-        Clerk_i.h \
-        IR_Helper.h \
-        Server_i.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Time_Service/README b/TAO/orbsvcs/Time_Service/README
index 7bea0a6145a..fb8c275eef0 100644
--- a/TAO/orbsvcs/Time_Service/README
+++ b/TAO/orbsvcs/Time_Service/README
@@ -8,7 +8,7 @@ client. The Time Service interface has been implemented as two servants:
 the clerk and the server. Clients who wish to use the service talk to
 clerks and the clerks in turn keep their time synchronized
 globally. The clerks do this by talking to the servers running on
-different machines. 
+different machines.
 
 There needs to be atleast one time server running in the network. The Clerks
 update their time periofically from the servers. The servers and clerks
@@ -69,28 +69,3 @@ Algorithms
 Currently, updating the system time involves taking the average of all
 the times received from the servers. This can be extended by using a
 more elaborate distributed time synchronization algorithm.
-
-Version Updates : (10th March, 1999)
------------------
-
-The TAO Time Service has been updated to include the timezone information 
-in the Universal Time Object. This object now also has an inaccuracy estimate 
-in it. The inaccuracy is a measure of the skew in the synchronization of 
-the clerks time. It is the difference between the highest and the lowest times
-from the servers that the clerk synchronizes its time with. The high-inaccuracy 
-and the low-inaccuracy fields are also being calculated from the inaccuracy as 
-follows :
-
-		Inaccuracy 64-bits
-	|------------------------------------|
-	|         | inacchi |   inacclo      |
-	|------------------------------------|
-	  16-bits   16-bits     32-bits
-
-Thanks to Brian Dance <Brian_Dance@UECCS.co.uk> for reporting this.
-
-Future Versions of the service could include other measures of inaccuracy too,
-say the one based on precision in the time reported by servers. In this case
-the servers will have to supply an estimate of inaccuracy in their times.
-
-
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index 8a8f0662ae1..220e33563e7 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -368,8 +368,6 @@ Server_i::init (int argc,
       if (this->use_ir_ == 0)
         this->init_naming_service (TAO_TRY_ENV);
 
-      TAO_CHECK_ENV;
-
       // Create the server object.
       this->create_server ();
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
index d7269a9f4a3..4d07c421140 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Clerk.dsp
@@ -13,18 +13,16 @@ CFG=Time_Service_Clerk - Win32 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 "Time_Service_Clerk.mak"\

- CFG="Time_Service_Clerk - Win32 Debug"

+!MESSAGE NMAKE /f "Time_Service_Clerk.mak" CFG="Time_Service_Clerk - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Service_Clerk - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Time_Service_Clerk - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

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

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

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -78,7 +76,7 @@ BSC32=bscmake.exe
 # 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 taod.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"clerk.exe" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

+# ADD LINK32 aced.lib taod.lib orbsvcsd.lib /nologo /subsystem:console /pdb:"Time_Service_Clerk.pdb" /debug /machine:I386 /out:"clerk.exe" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\orbsvcs" /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -92,11 +90,11 @@ LINK32=link.exe
 # PROP Default_Filter "cpp"

 # Begin Source File

 

-SOURCE=.\Clerk_i.cpp

+SOURCE=.\clerk.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time_Service_Clerk.cpp

+SOURCE=.\Clerk_i.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp b/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
index 9ebae4cde8d..0ba9d374d30 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
+++ b/TAO/orbsvcs/Time_Service/Time_Service_Server.dsp
@@ -13,18 +13,16 @@ CFG=Time_Service_Server - Win32 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 "Time_Service_Server.mak"\

- CFG="Time_Service_Server - Win32 Debug"

+!MESSAGE NMAKE /f "Time_Service_Server.mak" CFG="Time_Service_Server - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Time_Service_Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Time_Service_Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

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

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

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -93,11 +91,11 @@ SOURCE=.\IR_Helper.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Server_i.cpp

+SOURCE=.\server.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time_Service_Server.cpp

+SOURCE=.\Server_i.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp b/TAO/orbsvcs/Time_Service/clerk.cpp
index debf4a123f3..64ad86a7d5a 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/Time_Service/clerk.cpp
@@ -2,7 +2,7 @@
 
 #include "Clerk_i.h"
 
-ACE_RCSID(TimeService, Time_Service_Clerk, "$Id$")
+ACE_RCSID(TimeService, clerk, "$Id$")
 
 // This is the main driver program for the Time Service clerk.
 
diff --git a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp b/TAO/orbsvcs/Time_Service/server.cpp
index efcfe4b27d3..516fbeaf0d5 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service_Server.cpp
+++ b/TAO/orbsvcs/Time_Service/server.cpp
@@ -2,7 +2,7 @@
 
 #include "Server_i.h"
 
-ACE_RCSID(TimeService, Time_Service_Server, "$Id$")
+ACE_RCSID(TimeService, server, "$Id$")
 
 // This is the main driver program for the Time Service server.
 
diff --git a/TAO/orbsvcs/Trading_Service/Makefile b/TAO/orbsvcs/Trading_Service/Makefile
index 2cd37ee00be..5418063044a 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile
+++ b/TAO/orbsvcs/Trading_Service/Makefile
@@ -3,26 +3,21 @@
 # Build the TAO Trading Service
 #--------------------------------------------------------------------------
 #--------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #--------------------------------------------------------------------------
 
-LDLIBS  = -lorbsvcs -lTAO
+BIN 	= Trading_Service
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+LDLIBS  = -lorbsvcs -lTAO 
 
-SRC = $(addsuffix .cpp, $(BIN))
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = Trading_Service
+BUILD = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Trader
+SRC=$(addsuffix .cpp, $(BIN))
 
 #--------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #--------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -42,16 +37,15 @@ endif
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 .obj/Trading_Service.o .obj/Trading_Service.so .shobj/Trading_Service.o .shobj/Trading_Service.so: Trading_Service.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -118,75 +112,45 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(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 \
@@ -197,44 +161,59 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/POA.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/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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -256,8 +235,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -274,65 +256,39 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/orbsvcs_export.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
@@ -346,20 +302,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
deleted file mode 100644
index 859084b3f0b..00000000000
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Trading Service
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = Trading_Service
-
-Trading_Service_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-Trading_Service_SOURCES = \
-        Trading_Service.cpp
-
-noinst_HEADERS = \
-        Trading_Service.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
index bdb8d3cd6cc..dbffc0f5e71 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.cpp
@@ -7,7 +7,7 @@
 ACE_RCSID(Trading_Service, Trading_Service, "$Id$")
 
 Trading_Shutdown::Trading_Shutdown (Trading_Service& trader)
-  : trader_ (trader)
+  : trader_ (trader) 
 {
   if (this->shutdown_.register_handler (SIGINT, this) == -1)
     {
@@ -48,12 +48,6 @@ Trading_Service::Trading_Service (void)
       localhost.get_host_name (host_name, MAXHOSTNAMELEN);
       ACE_OS::sprintf (trader_name, "%s_%d", host_name, ACE_OS::getpid ());
 
-      char* dot = 0;
-      while ((dot = ACE_OS::strchr (trader_name, '.')) != 0)
-        *dot = '_';
-
-      ACE_DEBUG ((LM_DEBUG, "*** Trading Service %s initializing.\n", trader_name));
-
       this->name_ = trader_name;
     }
 }
@@ -70,15 +64,15 @@ Trading_Service::init (int argc, char* argv[])
     {
       this->orb_manager_.init (argc, argv, TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       if (this->parse_args (argc, argv) == -1)
         return -1;
-
+                  
       CORBA::ORB_ptr orb = this->orb_manager_.orb ();
-
+      
       // Create a Trader Object and set its Service Type Repository.
-      auto_ptr<TAO_Trader_Factory::TAO_TRADER> auto_trader (TAO_Trader_Factory::create_trader (argc, argv));
-      this->trader_ = auto_trader;
+      this->trader_ = 
+	auto_ptr<TAO_Trader_Factory::TAO_TRADER> (TAO_Trader_Factory::create_trader (argc, argv));
       TAO_Support_Attributes_i& sup_attr = this->trader_->support_attributes ();
       TAO_Trading_Components_i& trd_comp = this->trader_->trading_components ();
       sup_attr.type_repos (this->type_repos_._this (TAO_TRY_ENV));
@@ -96,15 +90,15 @@ Trading_Service::init (int argc, char* argv[])
           ACE_OS::fprintf (this->ior_output_file_, "%s", this->ior_.in ());
           ACE_OS::fclose (this->ior_output_file_);
         }
-
+      
       if (this->federate_)
         {
           // Only become a multicast server if we're the only trader
           // on the multicast network.
           // @@ Could do other things. For example, every timeout
-          // period try to federate again, but let's not hardcode that
+          // period try to federate again, but let's not hardcode that 
           // policy.
-          if (this->bootstrap_to_federation () == -1)
+          if (this->bootstrap_to_federation () == -1)            
             this->init_multicast_server ();
         }
       else
@@ -119,25 +113,25 @@ Trading_Service::init (int argc, char* argv[])
   return 0;
 }
 
-
+  
 int
 Trading_Service::run (void)
 {
   int return_value;
   CORBA::Environment TAO_IN_ENV;
   Trading_Shutdown trading_shutdown (*this);
-
+  
   // Run the Trading Service.
   return_value = this->orb_manager_.run (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
-
+  
   return return_value;
 }
 
 int
 Trading_Service::init_multicast_server (void)
 {
-#if defined ACE_HAS_IP_MULTICAST
+#if defined ACE_HAS_IP_MULTICAST      
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = TAO_ORB_Core_instance ()->reactor ();
 
@@ -145,12 +139,12 @@ Trading_Service::init_multicast_server (void)
   // for the name service on the command-line;
   u_short port =
     TAO_ORB_Core_instance ()->orb_params ()->trading_service_port ();
-
+  
   if (port == 0)
     {
       const char *port_number =
         ACE_OS::getenv ("TradingServicePort");
-
+      
       if (port_number != 0)
         port = ACE_OS::atoi (port_number);
       else
@@ -165,7 +159,7 @@ Trading_Service::init_multicast_server (void)
     {
       ACE_ERROR_RETURN ((LM_ERROR, "Failed to init IOR multicast.\n"), -1);
     }
-
+  
   // Register event handler for the ior multicast.
   if (reactor->register_handler (&this->ior_multicast_,
                                  ACE_Event_Handler::READ_MASK) == -1)
@@ -177,7 +171,7 @@ Trading_Service::init_multicast_server (void)
 
   // Other trader instances will bootstrap to us.
   this->bootstrapper_ = 1;
-
+  
 #endif /* ACE_HAS_IP_MULTICAST */
   return 0;
 }
@@ -186,7 +180,7 @@ int
 Trading_Service::bootstrap_to_federation (void)
 {
   // If all traders follow this strategy, it creates a complete graph
-  // of all known traders on a multicast network.
+  // of all known traders on a multicast network. 
   CORBA::ORB_var orb = this->orb_manager_.orb ();
 
   ACE_DEBUG ((LM_DEBUG, "*** Bootstrapping to another Trading Service.\n"));
@@ -198,14 +192,14 @@ Trading_Service::bootstrap_to_federation (void)
                        "We're all alone. "
                        "Unable to link to other traders.\n"),
                       -1);
-
+  
   TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n"));
-      CosTrading::Lookup_var lookup_if =
+      CosTrading::Lookup_var lookup_if = 
         CosTrading::Lookup::_narrow (trading_obj.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       ACE_DEBUG ((LM_DEBUG, "*** Obtaining the link interface.\n"));
       CosTrading::Link_var link_if =  lookup_if->link_if (TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -230,19 +224,19 @@ Trading_Service::bootstrap_to_federation (void)
                           CosTrading::always,
                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       ACE_DEBUG ((LM_DEBUG, "*** Retrieving list of known linked traders.\n"));
       CosTrading::LinkNameSeq_var link_name_seq =
         link_if->list_links (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       ACE_DEBUG ((LM_DEBUG, "*** Linking self to all linked traders.\n"));
       for (int i = link_name_seq->length () - 1; i >= 0; i--)
         {
           // Avoid linking to ourselves.
           if (ACE_OS::strcmp (ACE_static_cast (const char*, link_name_seq[i]),
                               this->name_.in ()) != 0)
-            {
+            {                              
               ACE_DEBUG ((LM_DEBUG, "*** Getting info for link %s.\n",
                           ACE_static_cast (const char*, link_name_seq[i])));
               CosTrading::Link::LinkInfo_var link_info =
@@ -251,12 +245,12 @@ Trading_Service::bootstrap_to_federation (void)
 
               CosTrading::Lookup_ptr remote_lookup;
               remote_lookup = link_info->target.in ();
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
                 remote_lookup->link_if (TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Creating a link to me from it.\n"));
               remote_link->add_link (this->name_.in (),
                                      our_lookup,
@@ -264,7 +258,7 @@ Trading_Service::bootstrap_to_federation (void)
                                      CosTrading::always,
                                      TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Creating a link to it from me.\n"));
               our_link->add_link (link_name_seq[i],
                                   remote_lookup,
@@ -286,18 +280,18 @@ Trading_Service::bootstrap_to_federation (void)
 
 int
 Trading_Service::shutdown (void)
-{
+{  
   CORBA::Environment TAO_IN_ENV;
 
   if (this->trader_.get () != 0)
-    {
+    {  
       TAO_Trading_Components_i& trd_comp
-        = this->trader_->trading_components ();
+        = this->trader_->trading_components (); 
       CosTrading::Link_ptr our_link = trd_comp.link_if ();
-
+      
       CosTrading::LinkNameSeq_var link_name_seq =
         our_link->list_links (TAO_IN_ENV);
-
+      
       ACE_DEBUG ((LM_DEBUG, "*** Unlinking from federated traders.\n"));
       for (int i = link_name_seq->length () - 1; i >= 0; i--)
         {
@@ -307,7 +301,7 @@ Trading_Service::shutdown (void)
               CosTrading::Link::LinkInfo_var link_info =
                 our_link->describe_link (link_name_seq[i], TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Removing link to %s.\n",
                           ACE_static_cast (const char*, link_name_seq[i])));
               our_link->remove_link (link_name_seq[i], TAO_TRY_ENV);
@@ -315,14 +309,14 @@ Trading_Service::shutdown (void)
 
               CosTrading::Lookup_ptr remote_lookup;
               remote_lookup = link_info->target.in ();
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Retrieving its link interface.\n"));
               CosTrading::Link_var remote_link =
                 remote_lookup->link_if (TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
+              
               ACE_DEBUG ((LM_DEBUG, "*** Removing its link to us.\n"));
-
+              
               if (this->bootstrapper_)
                 remote_link->remove_link ("Bootstrap", TAO_TRY_ENV);
               else
@@ -348,25 +342,25 @@ Trading_Service::parse_args (int& argc, char *argv[])
   while (arg_shifter.is_anything_left ())
     {
       char *current_arg = arg_shifter.get_current ();
-
+      
       if (ACE_OS::strcmp (current_arg, "-TSfederate") == 0)
         {
           arg_shifter.consume_arg ();
           this->federate_ = 1;
-        }
+        }      
       if (ACE_OS::strcmp (current_arg, "-TSdumpior") == 0)
         {
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
-
+              
               char* file_name = arg_shifter.get_current ();
               this->ior_output_file_ = ACE_OS::fopen (file_name, "w");
 
               if (this->ior_output_file_ == 0)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "Unable to open %s for writing: %p\n",
-                                   file_name), -1);
+                                   file_name), -1);              
 
               arg_shifter.consume_arg ();
             }
@@ -377,7 +371,7 @@ Trading_Service::parse_args (int& argc, char *argv[])
       else
         arg_shifter.ignore_arg ();
     }
-
+  
   return 0;
 }
 
@@ -385,12 +379,12 @@ int
 main (int argc, char** argv)
 {
   Trading_Service trader;
-
+  
   if (trader.init (argc, argv) != -1)
     trader.run ();
   else
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "Failed to initialize the trader.\n"),
                         -1);
     }
@@ -406,3 +400,4 @@ template class ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>;
 #pragma instantiate auto_ptr<TAO_Trader_Factory::TAO_TRADER>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Trader_Factory::TAO_TRADER>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/TAO/orbsvcs/Trading_Service/svc.conf b/TAO/orbsvcs/Trading_Service/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/Trading_Service/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
deleted file mode 100644
index 0fc19f99056..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory.idl
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = FILENAME
-//    CosEventChannelFactory.idl
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_COSEVENTCHANNELFACTORY_IDL
-#define TAO_COSEVENTCHANNELFACTORY_IDL
-
-#include "orbsvcs/CosEventChannelAdmin.idl"
-
-module CosEventChannelFactory
-{
-  // = TITLE
-  //   Module that describes the Channel Factory.
-  //
-  exception DuplicateChannel
-  {
-    // = TITLE
-    //    This exception is raised to indicate that a specified
-    //    channel already exists.
-  };
-
-  exception NoSuchChannel
-  {
-    // = TITLE
-    //   This exception is raised to indicate that a specified
-    //   channel does not exist.
-  };
-
-  exception BindFailed
-  {
-    // = TITLE
-    //    This exception is raised to indicate that the EventChannel
-    //    could not be registered with the naming service.
-  };
-
-  interface ChannelFactory
-  {
-    // = TITLE
-    //   Interface definition of the ChannelFactory.
-    //
-    // = DESCRIPTION
-    //   The ChannelFactory is used to create,destroy and
-    //   locate CosEventChannels.
-
-    CosEventChannelAdmin::EventChannel create (
-      in string channel_id,
-      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.
-
-    void destroy (
-       in string channel_id,
-       in boolean unbind_from_naming_service) raises (NoSuchChannel);
-    // Destroys the channel specified by the channel id.
-    // If the channel does not exist then the NoSuchChannel exception
-    // is raised.
-
-    CosEventChannelAdmin::EventChannel find (
-       in string channel_id) raises (NoSuchChannel);
-    // Finds an EventChannel given the channel id.
-    // If the channel does not exist then the NoSuchChannel exception
-    // is raised.
-
-    string find_channel_id (
-       in CosEventChannelAdmin::EventChannel channel) raises (NoSuchChannel);
-   // Returns a channel id given a reference to it.
-   // If the channel does not exist then the NoSuchChannel exception
-   // is raised.
-  };
-};
-
-#endif /* TAO_COSEVENTCHANNELFACTORY_IDL */
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
deleted file mode 100644
index 30204bdaa91..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.cpp
+++ /dev/null
@@ -1,347 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "CosEventChannelFactory_i.h"
-#include "orbsvcs/CosEvent_Utilities.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/POA.h"
-
-TAO_CosEventChannelFactory_i::TAO_CosEventChannelFactory_i (void)
-  :poa_ (PortableServer::POA::_nil ()),
-   naming_ (CosNaming::NamingContext::_nil ())
-{
-  // No-Op.
-}
-
-TAO_CosEventChannelFactory_i::~TAO_CosEventChannelFactory_i (void)
-{
-#if 0
-  ACE_DEBUG ((LM_DEBUG,
-              "in TAO_CosEventChannelFactory_i dtor"));
-#endif
-  // No-Op.
-}
-
-int
-TAO_CosEventChannelFactory_i::init (PortableServer::POA_ptr poa,
-                                    const char* child_poa_name,
-                                    CosNaming::NamingContext_ptr naming,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Check if we have a parent poa.
-  if (CORBA::is_nil (poa))
-    return -1;
-
-  this->naming_ = CosNaming::NamingContext::_duplicate (naming);
-  // Save the naming context.
-
-  // Create a UNIQUE_ID and USER_ID policy because we want the POA
-  // to detect duplicates for us.
-  PortableServer::IdUniquenessPolicy_var idpolicy =
-    poa->create_id_uniqueness_policy (PortableServer::UNIQUE_ID,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::IdAssignmentPolicy_var assignpolicy =
-    poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Create a PolicyList
-  CORBA::PolicyList policy_list;
-  policy_list.length (2);
-  policy_list [0] =
-    PortableServer::IdUniquenessPolicy::_duplicate (idpolicy);
-  policy_list [1] =
-    PortableServer::IdAssignmentPolicy::_duplicate (assignpolicy);
-
-  // Create the child POA.
-  this->poa_ = poa->create_POA (child_poa_name,
-                                PortableServer::POAManager::_nil (),
-                                policy_list,
-                                ACE_TRY_ENV);
-
-  ACE_CHECK_RETURN (-1);
-
-  idpolicy->destroy (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  assignpolicy->destroy (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  //this->poa_ =  PortableServer::POA::_duplicate (poa);
-  // uncomment this if we want to use the parent poa for some reason.
-   return 0;
-}
-
-CosEventChannelAdmin::EventChannel_ptr
-TAO_CosEventChannelFactory_i::create (const char * channel_id,
-                                      CORBA::Boolean store_in_naming_service,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-
-  CosEventChannelAdmin::EventChannel_ptr const ec_nil =
-    CosEventChannelAdmin::EventChannel::_nil ();
-
-  ACE_TRY
-    {
-      PortableServer::ObjectId_var oid =
-        TAO_POA::string_to_ObjectId (channel_id);
-
-      CosEC_ServantBase *_ec = 0;
-
-      ACE_NEW_THROW_EX (_ec,
-                        CosEC_ServantBase (),
-                        CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;
-
-      auto_ptr <CosEC_ServantBase> ec (_ec);
-      // @@ Pradeep: could we pass the POA used to activate the
-      //    EC-generated objects as an argument?  The point is that
-      //    the user must be aware that we require a POA with the
-      //    SYSTEM_ID policy....  This is not urgent, but a "wishlist"
-
-      // @@ Carlos: I'am passing the POA to activate the
-      // generated objects as an argument in <init>.
-      // Do you want the FactoryCosEventChannel_i constructor
-      // to take that?
-
-      // let all those contained in FactoryEC use the default POA.
-      // We only need the FactoryEC's to be unique!
-      PortableServer::POA_ptr defPOA = this->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // @@ Pradeep: I hate to bring this up, but what happens if the
-      //    init() method raises ServantAlreadyActive or something
-      //    similar?  Do we want to convert that into
-      //    DuplicateChannel?  IMHO you should be more careful about
-      //    the exception translation.
-
-      // @@ Carlos: ServantAlreadyActive and ObjectAlreadyActive
-      // mean that duplicates were detected, so i thought that
-      // it made sense to translate them to DuplicateChannel.
-
-      // @@ Pradeep: right, but you want to report those only if they
-      //    are raised during the activation of the EC, the problem is
-      //    that you are raising the same error if the EC makes a
-      //    mistake and activates the same object twice.
-
-      ec->init (this->poa_.in(),
-                defPOA,
-                0,0,0,
-                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      int retval = ec->activate (channel_id,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (retval == -1)
-        ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                          ec_nil);
-
-      ec.release (); // release the ownership from the auto_ptr.
-
-      CORBA::Object_var obj =
-        this->poa_->servant_to_reference (_ec, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (store_in_naming_service &&
-          !CORBA::is_nil (this->naming_.in ()))
-        {
-          CosNaming::Name name (1);
-          name.length (1);
-          name[0].id = CORBA::string_dup (channel_id);
-
-          this->naming_->rebind (name,
-                                 obj.in (),
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      return CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
-    }
-  ACE_CATCH (PortableServer::POA::ServantAlreadyActive, sa_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_nil);
-    }
-  ACE_CATCH (PortableServer::POA::ObjectAlreadyActive, oaa_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::DuplicateChannel (),
-                        ec_nil);
-    }
-  ACE_CATCH (PortableServer::POA::WrongPolicy, wp_ex)
-    {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                        ec_nil);
-    }
-  ACE_CATCH (PortableServer::POA::ObjectNotActive, ona_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_nil);
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_nil);
-    }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_nil);
-    }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_nil);
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ab)
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::BindFailed (),
-                        ec_nil);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_nil);
-
-  ACE_NOTREACHED (return ec_nil);
-}
-
-void
-TAO_CosEventChannelFactory_i::destroy
-(
- const char * channel_id,
- CORBA::Boolean unbind_from_naming_service,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-
-  ACE_TRY
-    {
-      // Get hold of the objectid first.
-      PortableServer::ObjectId_var oid =
-        TAO_POA::string_to_ObjectId (channel_id);
-
-      CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CosEventChannelAdmin::EventChannel_var fact_ec =
-        CosEventChannelAdmin::EventChannel::_narrow (obj.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      fact_ec->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Remove from the naming service.
-      if (unbind_from_naming_service &&
-          !CORBA::is_nil (this->naming_.in ()))
-        {
-          CosNaming::Name name (1);
-          name.length (1);
-          name[0].id = CORBA::string_dup (channel_id);
-
-          this->naming_->unbind (name,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, nf_ex)
-    {
-      return; // don't bother the user with exceptions if unbind fails.
-    }
-  ACE_CATCH (CosNaming::NamingContext::CannotProceed, cp_ex)
-    {
-      return; // don't bother the user with exceptions if unbind fails.
-    }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, in_ex)
-    {
-      return; // don't bother the user with exceptions if unbind fails.
-    }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any other user exception.
-    {
-      ACE_THROW (CosEventChannelFactory::NoSuchChannel ());
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-CosEventChannelAdmin::EventChannel_ptr
-TAO_CosEventChannelFactory_i::find
-(
- const char * channel_id,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-
-  CosEventChannelAdmin::EventChannel_ptr const ec_nil =
-    CosEventChannelAdmin::EventChannel::_nil ();
-
-  ACE_TRY
-    {
-      PortableServer::ObjectId_var oid =
-        TAO_POA::string_to_ObjectId (channel_id);
-
-      CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
-    }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        ec_nil);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ec_nil);
-
-  ACE_NOTREACHED (return ec_nil);
-}
-
-char*
-TAO_CosEventChannelFactory_i::find_channel_id
-(
- CosEventChannelAdmin::EventChannel_ptr channel,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-
-  ACE_TRY
-    {
-      PortableServer::ObjectId_var oid =
-        this->poa_->reference_to_id (channel,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      return TAO_POA::ObjectId_to_string (oid);
-    }
-  ACE_CATCH (CORBA::UserException, ue) // Translate any user exception.
-    {
-      ACE_THROW_RETURN (CosEventChannelFactory::NoSuchChannel (),
-                        0);
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  ACE_NOTREACHED (return 0);
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr <CosEC_ServantBase>;
-template class ACE_Auto_Basic_Ptr <CosEC_ServantBase>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr <CosEC_ServantBase>
-#pragma instantiate  ACE_Auto_Basic_Ptr <CosEC_ServantBase>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h b/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
deleted file mode 100644
index 7372aa8f75c..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/CosEventChannelFactory_i.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/CosEC/Factory
-//
-// = FILENAME
-//    CosEventChannelFactory_i.h
-//
-// = DESCRIPTION
-//    This class implements the CosEventChannelFactory
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_COSEVENTCHANNELFACTORY_I_H
-#define TAO_COSEVENTCHANNELFACTORY_I_H
-
-#include "CosEventChannelFactoryS.h"
-#include "orbsvcs/CosNamingC.h"
-
-class TAO_CosEventChannelFactory_i :
-  public virtual POA_CosEventChannelFactory::ChannelFactory,
-  public virtual PortableServer::RefCountServantBase
-{
- public:
-  // = Initialization and termination code.
-  TAO_CosEventChannelFactory_i (void);
-  // Constructor.
-
-  ~TAO_CosEventChannelFactory_i (void);
-  // Destructor.
-
-  int init (PortableServer::POA_ptr poa,
-            const char* child_poa_name,
-            CosNaming::NamingContext_ptr naming = CosNaming::NamingContext::_nil (),
-            CORBA::Environment &ACE_TRY_ENV =  CORBA::Environment::default_environment ());
-  // This method creates a child poa with <poa> as the
-  // parent. It also accepts a Naming_Context which is used to register
-  // the event channels if specified.
-  // Returns -1 on error, 0 on success.
-  // @@ Pradeep: this looks OK. I wonder if it would be a good idea to
-  //    raise exceptions, but I'm undecided.
-  // @@ Pradeep: when is the child poa destroyed? Maybe we should add
-  //    a destroy() method to the factory interface (in IDL).
-  // @@ Carlos: if we add a <destroy> to the factory, any client will be
-  // able to destroy the factory!
-  // @@ Pradeep: it could be a method of the Factory_i class, it
-  //    doesn't have to be exposed through the IDL interface. Anyway,
-  //    there must be a way to cleanup any resources created by the
-  //    factory, and you must avoid CORBA calls in the destructor,
-  //    first because you won't have an ACE_TRY_ENV and second because
-  //    exceptions in destructors are evil.
-  // @@ Pradeep: anyway you can just use exceptions and not return -1?
-
-  // = CosEventChannelFactory::ChannelFactory methods.
-  virtual CosEventChannelAdmin::EventChannel_ptr create
-    (
-     const char * channel_id,
-     CORBA::Boolean store_in_naming_service,
-     CORBA::Environment &ACE_TRY_ENV
-     );
-
-  virtual void destroy
-    (
-     const char * channel_id,
-     CORBA::Boolean unbind_from_naming_service,
-     CORBA::Environment &ACE_TRY_ENV
-     );
-
-  virtual CosEventChannelAdmin::EventChannel_ptr find
-    (
-     const char * channel_id,
-     CORBA::Environment &ACE_TRY_ENV
-     );
-
-  virtual char * find_channel_id
-    (
-     CosEventChannelAdmin::EventChannel_ptr channel,
-     CORBA::Environment &ACE_TRY_ENV
-     );
-
- protected:
-
-  PortableServer::POA_var poa_;
-  // The Poa with which we activate all the Event Channels.
-
-  CosNaming::NamingContext_var naming_;
-  // The naming context to use.
-};
-
-#endif /* TAO_COSEVENTCHANNELFACTORY_I_H */
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Factory.dsw b/TAO/orbsvcs/examples/CosEC/Factory/Factory.dsw
deleted file mode 100644
index ffaf92f2543..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/Factory.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "FactoryClient"=.\FactoryClient.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "FactoryServer"=.\FactoryServer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
deleted file mode 100644
index 0250d33633a..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "CosEventChannelFactoryC.h"
-#include "orbsvcs/CosNamingC.h"
-
-class FactoryClient
-{
-  // = TITLE
-  //   A simple client to test the CosEC factory
-  //
-  // = DESCRIPTION
-  //   Test Client for the CosEC factory.
-
-public:
-  // Initialization and termination methods
-  FactoryClient (void);
-  // constructor.
-
-  virtual ~FactoryClient (void);
-  // destructor.
-
-  void init_ORB (int argc, char *argv [], CORBA::Environment &ACE_TRY_ENV);
-  // Initializes the ORB.
-
-  void resolve_naming_service (CORBA::Environment &ACE_TRY_ENV);
-  // Try to get hold of a running naming service.
-
-  void resolve_factory (CORBA::Environment &ACE_TRY_ENV);
-  // Try to resolve the factory from the Naming service.
-
-  CosEventChannelFactory::ChannelFactory_ptr
-  create_factory (CORBA::Environment &ACE_TRY_ENV);
-  // Create a local Factory and also set the <factory_>.
-
-  virtual void run_test (CORBA::Environment &ACE_TRY_ENV);
-  // Runs a couple of tests to check if the factory behaves correctly.
-
-protected:
-  CosEventChannelAdmin::EventChannel_ptr
-      create_channel (const char *channel_id,
-                     CosEventChannelFactory::ChannelFactory_ptr factory,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Create a channel.
-
-  void destroy_channel (const char *channel_id,
-                       CORBA::Environment &ACE_TRY_ENV);
-  // Destroy the channel.
-
-  void find_channel (const char* channel_id,
-                    CORBA::Environment &ACE_TRY_ENV);
-  // Find a channel.
-
-  void find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
-                       CORBA::Environment &ACE_TRY_ENV);
-  // Find a channel.
-
-  // = Protected Data members.
-  const char* factory_name_;
-  // The name of the factory registered with the naming service.
-
-  PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
-
-  CORBA::ORB_var orb_;
-  // The ORB that we use.
-
-  CosNaming::NamingContext_var naming_context_;
-  // Handle to the name service.
-
-  CosEventChannelFactory::ChannelFactory_var factory_;
-  // object from naming service.
-
-  int use_naming_service;
-  // flag to indicate if the naming service should be used.
-};
-
-FactoryClient::FactoryClient (void)
-  :factory_name_ ("CosEC_Factory"),
-   root_poa_ (PortableServer::POA::_nil ()),
-   use_naming_service (0)
-{
-  // No-Op.
-}
-
-FactoryClient::~FactoryClient (void)
-{
-  // No-Op.
-}
-
-void
-FactoryClient::init_ORB (int argc,
-                       char *argv [],
-                       CORBA::Environment &ACE_TRY_ENV)
-{
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
-                                "",
-                                ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object  =
-    this->orb_->resolve_initial_references("RootPOA",
-                                           ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (CORBA::is_nil (poa_object.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  " (%P|%t) Unable to initialize the POA.\n"));
-      return;
-    }
-  this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (),
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    root_poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-FactoryClient::resolve_naming_service (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService",
-                                            ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Need to check return value for errors.
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_THROW (CORBA::UNKNOWN ());
-
-  this->naming_context_ =
-    CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->use_naming_service = 1;
-}
-
-void
-FactoryClient::resolve_factory (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (this->use_naming_service == 1);
-
-  CosNaming::Name name (1);
-  name.length (1);
-  name[0].id = CORBA::string_dup (this->factory_name_);
-
-  CORBA::Object_var obj =
-    this->naming_context_->resolve (name,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->factory_ =
-    CosEventChannelFactory::ChannelFactory::_narrow (obj.in (),
-                                                     ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CosEventChannelFactory::ChannelFactory_ptr
-FactoryClient::create_factory (CORBA::Environment &ACE_TRY_ENV)
-{
-  // TBD:
-  ACE_THROW_RETURN (CORBA::UNKNOWN (),
-                    CosEventChannelFactory::ChannelFactory::_nil ());
-  return 0;
-}
-
-CosEventChannelAdmin::EventChannel_ptr
-FactoryClient::create_channel (const char *channel_id,
-                            CosEventChannelFactory::ChannelFactory_ptr factory,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Trying to create channel %s\n", channel_id));
-
-  CosEventChannelAdmin::EventChannel_var ec =
-    CosEventChannelAdmin::EventChannel::_nil ();
-
-  ACE_TRY
-    {
-      ec = factory->create (channel_id,
-                            this->use_naming_service,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_ASSERT (!CORBA::is_nil (ec.in ()));
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Created Cos Event Channel \"%s \"\n",
-                  channel_id));
-    }
- ACE_CATCH (CORBA::UserException, ue)
-   {
-     ACE_PRINT_EXCEPTION (ue,
-                          "User Exception in createChannel: ");
-     return CosEventChannelAdmin::EventChannel::_nil ();
-   }
-  ACE_CATCH (CORBA::SystemException, se)
-    {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in createChannel: ");
-      return CosEventChannelAdmin::EventChannel::_nil ();
-    }
-  ACE_ENDTRY;
-
-  return ec._retn ();
-}
-
-void
-FactoryClient::destroy_channel (const char *channel_id,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Destroying Cos Event Channel \"%s \"\n",
-              channel_id));
-
-  this->factory_->destroy (channel_id,
-                           use_naming_service,
-                           ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-FactoryClient::find_channel (const char* channel_id,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "trying to find the Channel \"%s \"\n",
-                  channel_id));
-
-      CosEventChannelAdmin::EventChannel_var channel =
-        this->factory_->find (channel_id,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-
-      CORBA::String_var str =
-        orb_->object_to_string (channel.in (),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-              "Find returned - %s \n",
-                  str.in ()));
-
-      this->find_channel_id (channel.in (),
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::UserException, ue)
-    {
-      ACE_PRINT_EXCEPTION (ue,
-                           "User Exception in findchannel: ");
-    }
-  ACE_CATCH (CORBA::SystemException, se)
-    {
-      ACE_PRINT_EXCEPTION (se,
-                           "System Exception in findchannel: ");
-    }
-  ACE_ENDTRY;
-}
-
-void
-FactoryClient::find_channel_id (CosEventChannelAdmin::EventChannel_ptr channel,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::String_var str =
-    orb_->object_to_string (channel,
-                            ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "trying to find the Channel %s \n",
-              str.in ()));
-
-  char *channel_id =
-    this->factory_->find_channel_id (channel,
-                                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "find returned %s\n", channel_id));
-}
-
-/*
- * excercise the factory: create 3 Channels and test the factory.
- */
-
-void
-FactoryClient::run_test (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (!CORBA::is_nil (this->factory_.in ()));
-
-  const char *channel_id [3] = {"cosec1", "cosec2", "cosec3"};
-  CosEventChannelAdmin::EventChannel_var cosec [3];
-
-  // create the first cosec
-  cosec[0] = this->create_channel (channel_id[0],
-                                  this->factory_,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
- // create the second cosec
-  cosec[1] = this->create_channel (channel_id[1],
-                                  this->factory_,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // create the third cosec
-  cosec[2] = this->create_channel (channel_id[2],
-                                  this->factory_,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // see it we can destroy this one..
-  this->destroy_channel (channel_id[2],
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // see if we can find it?
-  this->find_channel_id (cosec[2],
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // see if we can create it again?
-  cosec[2] = this->create_channel (channel_id[2],
-                                   this->factory_,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // try and find a channel that does not exist.
-  this->find_channel ("areyouthere?",
-                      ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // see if it can detect duplicates.
-  this->create_channel (channel_id[2],
-                        this->factory_,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // see if it can give us the id?
-  this->find_channel_id (cosec[0],
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->find_channel_id (cosec[1],
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->find_channel_id (cosec[2],
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // check if we can get the channels from the id.
-  this->find_channel (channel_id[0],
-                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->find_channel (channel_id[1],
-                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->find_channel (channel_id[2],
-                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  //destroy them all.
-  this->destroy_channel (channel_id[0],
-                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->destroy_channel (channel_id[1],
-                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->destroy_channel (channel_id[2],
-                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // end of testing.
-  ACE_DEBUG ((LM_DEBUG,
-              "Factory testing complete\n"));
-}
-
-int
-main (int argc, char *argv [])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "The FactoryClient will test the Cos Event Channel Factory\n"));
-  ACE_TRY_NEW_ENV
-    {
-      FactoryClient ft;
-
-      ft.init_ORB (argc,
-                   argv,
-                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_TRY_EX (naming)
-        {
-          ft.resolve_naming_service (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (naming);
-
-          ft.resolve_factory (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (naming);
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Failed to resolve the naming service");
-          ACE_DEBUG ((LM_DEBUG,
-                      "Creating a local Factory\n"));
-          // TBD:
-          ft.create_factory (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_ENDTRY;
-
-      ft.run_test (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::UserException, ue)
-    {
-      ACE_PRINT_EXCEPTION (ue,
-                           "test failed: User Exception in FactoryClient: ");
-      return 1;
-    }
-  ACE_CATCH (CORBA::SystemException, se)
-    {
-      ACE_PRINT_EXCEPTION (se,
-                           "test failed: System Exception in FactoryClient: ");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
deleted file mode 100644
index 1c5d5d23449..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.dsp
+++ /dev/null
@@ -1,177 +0,0 @@
-# Microsoft Developer Studio Project File - Name="FactoryClient" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=FactoryClient - 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 "FactoryClient.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 "FactoryClient.mak" CFG="FactoryClient - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "FactoryClient - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "FactoryClient - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "FactoryClient - 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 "..\..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "FactoryClient - 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 "..\..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "FactoryClient - Win32 Release"

-# Name "FactoryClient - Win32 Debug"

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactory.idl

-

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

-

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

-

-# Begin Custom Build - Invoking TAO IDL compiler

-InputPath=.\CosEventChannelFactory.idl

-InputName=CosEventChannelFactory

-

-BuildCmds= \

-	tao_idl -I..\..\.. $(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

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FactoryClient.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
deleted file mode 100644
index 946fec75f6b..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "FactoryDriver.h"
-#include "ace/Get_Opt.h"
-
-FactoryDriver::FactoryDriver (const char* name)
-  :factoryName_ (name),
-   child_poa_name_ ("CosEC_ChildPOA"),
-   factory_servant_ (0)
-{
-  //No-Op.
-}
-
-FactoryDriver::~FactoryDriver (void)
-{
-  //No-Op.
-}
-
-int
-FactoryDriver::parse_args (int argc, char *argv [])
-{
-  ACE_Get_Opt get_opts (argc, argv, "dr:");
-  int c = 0;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-
-      case 'r':
-        factoryName_ = get_opts.optarg;
-        break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-r] <Factory Name>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-FactoryDriver::start (int argc, char *argv [])
-{
-  if (this->parse_args (argc, argv) == -1)
-    return -1;
-
-  // Ref counted servants are on the heap..
-  ACE_NEW_RETURN (factory_servant_,
-                  TAO_CosEventChannelFactory_i (),
-                  -1);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
-                              "",
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object  =
-        orb_->resolve_initial_references("RootPOA",
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          -1);
-
-      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;
-
-      // Initialization of the naming service.
-      if (naming_client_.init (orb_.in ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to initialize "
-                           "the TAO_Naming_Client. \n"),
-                          1);
-
-      if (factory_servant_->init (root_poa_.in (),
-                                  child_poa_name_,
-                                  naming_client_.get_context (),
-                                 ACE_TRY_ENV) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to initialize "
-                           "the factory. \n"),
-                          1);
-
-      // activate the factory in the root poa.
-      factory_ = factory_servant_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Give the ownership to the POA.
-      factory_servant_->_remove_ref (ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-      CORBA::String_var
-        str = orb_->object_to_string (factory_.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "CosEvent_Service: The Cos Event Channel Factory IOR is <%s>\n",
-                  str.in ()));
-
-      CosNaming::Name name (1);
-      name.length (1);
-      name[0].id = CORBA::string_dup (factoryName_);
-      naming_client_->rebind (name,
-                              factory_.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Registered with the naming service as %s\n", factoryName_));
-
-      orb_->run ();
-    }
-  ACE_CATCH (CORBA::UserException, ue)
-    {
-      ACE_PRINT_EXCEPTION (ue,
-                           "cosecfactory: ");
-      return 1;
-    }
-  ACE_CATCH (CORBA::SystemException, se)
-    {
-      ACE_PRINT_EXCEPTION (se,
-                           "cosecfactory: ");
-      return 1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-
-  return 0;
-}
-
-int
-FactoryDriver::stop (void)
-{
-  orb_->shutdown ();
-  return 0;
-}
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
deleted file mode 100644
index 95072b6221b..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ /dev/null
@@ -1,80 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/examples/CosEC/Factory
-//
-// = FILENAME
-//    FactoryDriver.h
-//
-// = DESCRIPTION
-//    This class implements the Factory driver.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_FACTORYDRIVER_H
-#define TAO_FACTORYDRIVER_H
-
-#include "CosEventChannelFactory_i.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-// @@ Pradeep: I know this is just an example, but could you talk to
-//    Vishal about making this a service that could be bootstraped
-//    using the -ORBInitRef mechanisms?  That way we can run this
-//    stuff without the naming service running.
-
-class FactoryDriver
-{
-  // = TITLE
-  //   Driver class for the CosEventChannel Factory.
-  // = DESCRIPTION
-  //   creates a CosEventChannel Factory and registers it with the
-  //   naming service.
-  //
- public:
-  // = Initialization and termination code.
-  FactoryDriver (const char* factory = "CosEC_Factory");
-  // Constructor.
-
-  ~FactoryDriver (void);
-  // Destructor.
-
-  int start (int argc, char *argv []);
-  // Start the driver.
-
-  int stop (void);
-  //Stop the driver.
-
- protected:
-  int parse_args (int argc, char *argv []);
-  // Parse the command-line arguments and set options.
-
-  const char* factoryName_;
-  // The name of the factory registered with the naming service.
-
-  const char* child_poa_name_;
-  // The name of the Child POA.
-
-  TAO_CosEventChannelFactory_i *factory_servant_;
-  // The factory servant.
-
-  PortableServer::POA_var root_poa_;
-  // Reference to the root poa.
-
-  CORBA::ORB_var orb_;
-  // The ORB that we use.
-
-  CosEventChannelFactory::ChannelFactory_var factory_;
-  // The corba object after activation.
-
-  TAO_Naming_Client naming_client_;
-  // Use a naming client.
-
-};
-#endif /*  TAO_FACTORYDRIVER_H */
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
deleted file mode 100644
index cc351d043ee..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryServer.dsp
+++ /dev/null
@@ -1,193 +0,0 @@
-# Microsoft Developer Studio Project File - Name="FactoryServer" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=FactoryServer - 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 "FactoryServer.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 "FactoryServer.mak" CFG="FactoryServer - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "FactoryServer - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "FactoryServer - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "FactoryServer - 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 "..\..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "FactoryServer - 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 "..\..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "FactoryServer - Win32 Release"

-# Name "FactoryServer - Win32 Debug"

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactory_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\FactoryDriver.h

-# End Source File

-# End Group

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactory_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\FactoryDriver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactory.idl

-

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

-

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

-

-# Begin Custom Build - Invoking TAO IDL compiler

-InputPath=.\CosEventChannelFactory.idl

-InputName=CosEventChannelFactory

-

-BuildCmds= \

-	tao_idl -I..\..\.. $(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

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelFactoryS.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile b/TAO/orbsvcs/examples/CosEC/Factory/Makefile
deleted file mode 100644
index 9ed4c5cdad5..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile
+++ /dev/null
@@ -1,1637 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDLIBS = -lorbsvcs -lTAO
-
-IDL_SRC = CosEventChannelFactoryC.cpp CosEventChannelFactoryS.cpp
-
-PROG_SRCS = \
-	CosEventChannelFactory_i.cpp \
-	FactoryClient.cpp \
-	FactoryDriver.cpp \
-	main.cpp
-
-SRC = $(IDL_SRC) $(PROG_SRCS)
-
-FACTORY_OBJS = \
-	 CosEventChannelFactoryC.o \
-	 CosEventChannelFactoryS.o \
-	 CosEventChannelFactory_i.o \
-	 FactoryDriver.o \
-	 main.o
-
-CLIENT_OBJS = \
-	FactoryClient.o \
-        CosEventChannelFactoryC.o \
-	CosEventChannelFactoryS.o
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = factory \
-	factoryclient
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-    BIN = $(BIN2)
-  endif # Naming
-endif # CosEvent
-
-#----------------------------------------------------------------------------
-#       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
-#----------------------------------------------------------------------------
-
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-override TAO_IDLFLAGS += -I$(TAO_ROOT)/orbsvcs
-
-factory: $(addprefix $(VDIR),$(FACTORY_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-factoryclient: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) -rf CosEventChannelFactoryC.* CosEventChannelFactoryS.* CosEventChannelFactoryS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/CosEventChannelFactoryS.o .obj/CosEventChannelFactoryS.so .shobj/CosEventChannelFactoryS.o .shobj/CosEventChannelFactoryS.so: CosEventChannelFactoryS.cpp \
- CosEventChannelFactoryS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEventChannelFactoryC.h CosEventChannelFactoryC.i \
- CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.i \
- CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS.i
-.obj/CosEventChannelFactory_i.o .obj/CosEventChannelFactory_i.so .shobj/CosEventChannelFactory_i.o .shobj/CosEventChannelFactory_i.so: CosEventChannelFactory_i.cpp \
- CosEventChannelFactory_i.h CosEventChannelFactoryS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEventChannelFactoryC.h CosEventChannelFactoryC.i \
- CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.i \
- CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/FactoryClient.o .obj/FactoryClient.so .shobj/FactoryClient.o .shobj/FactoryClient.so: FactoryClient.cpp CosEventChannelFactoryC.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- CosEventChannelFactoryC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
-.obj/FactoryDriver.o .obj/FactoryDriver.so .shobj/FactoryDriver.o .shobj/FactoryDriver.so: FactoryDriver.cpp FactoryDriver.h \
- CosEventChannelFactory_i.h CosEventChannelFactoryS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEventChannelFactoryC.h CosEventChannelFactoryC.i \
- CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.i \
- CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp FactoryDriver.h CosEventChannelFactory_i.h \
- CosEventChannelFactoryS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEventChannelFactoryC.h CosEventChannelFactoryC.i \
- CosEventChannelFactoryS_T.h CosEventChannelFactoryS_T.i \
- CosEventChannelFactoryS_T.cpp CosEventChannelFactoryS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
deleted file mode 100644
index fca20c05e2a..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "FactoryDriver.h"
-
-int
-main (int argc, char *argv [])
-{
-  FactoryDriver driver;
-  driver.start (argc, argv);
-  return 0;
-}
diff --git a/TAO/orbsvcs/examples/CosEC/Makefile b/TAO/orbsvcs/examples/CosEC/Makefile
deleted file mode 100644
index 1d4c50e91ea..00000000000
--- a/TAO/orbsvcs/examples/CosEC/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	Factory
-
-#----------------------------------------------------------------------------
-#	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/orbsvcs/examples/Makefile b/TAO/orbsvcs/examples/Makefile
deleted file mode 100644
index 2439a158d51..00000000000
--- a/TAO/orbsvcs/examples/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	CosEC
-
-#----------------------------------------------------------------------------
-#	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/orbsvcs/orbsvcs.dsw b/TAO/orbsvcs/orbsvcs.dsw
index bd98922ee09..16723dd5170 100644
--- a/TAO/orbsvcs/orbsvcs.dsw
+++ b/TAO/orbsvcs/orbsvcs.dsw
@@ -18,21 +18,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CosEvent_Service"=.\CosEvent_Service\CosEvent_Service.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name orbsvcs

-    End Project Dependency

-}}}

-

-###############################################################################

-

 Project: "Dump_Schedule"=.\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 5668be63315..3737067379d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1,4 +1,4 @@
-// $Id$
+ // $Id$
 
 // ============================================================================
 //
@@ -46,27 +46,26 @@ TAO_Basic_StreamCtrl::~TAO_Basic_StreamCtrl (void)
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::stop (const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  if (CORBA::is_nil (this->sep_a_.in ()))
+  if (CORBA::is_nil (this->stream_endpoint_a_.in ()))
     return;
 
   // Make the upcall into the application
-  this->sep_a_->stop (the_spec, ACE_TRY_ENV);
+  this->stream_endpoint_a_->stop (the_spec, env);
 }
 
 // Start the transfer of data in the stream.
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  // call start on the flow connections.
-  if (CORBA::is_nil (this->sep_a_.in ()))
+  if (CORBA::is_nil (this->stream_endpoint_a_.in ()))
     return;
 
   // Make the upcall into the application
-  this->sep_a_->start (flow_spec, ACE_TRY_ENV);
+  this->stream_endpoint_a_->start (flow_spec, env);
 }
 
 // Tears down the stream. This will close the connection, and delete
@@ -74,94 +73,76 @@ TAO_Basic_StreamCtrl::start (const AVStreams::flowSpec &flow_spec,
 // Empty the_spec means apply operation to all flows
 void
 TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &the_spec,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  if (CORBA::is_nil (this->sep_a_.in ()))
+  if (CORBA::is_nil (this->stream_endpoint_a_.in ()))
     return;
 
   // Make the upcall into the application
-  this->sep_a_->destroy (the_spec, ACE_TRY_ENV);
+  this->stream_endpoint_a_->destroy (the_spec, env);
 }
 
 // Changes the QoS associated with the stream
 // Empty the_spec means apply operation to all flows
 CORBA::Boolean
-TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS & new_qos,
+TAO_Basic_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
                                   const AVStreams::flowSpec &the_spec,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      this->vdev_a_->modify_QoS (new_qos,the_spec,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->vdev_b_->modify_QoS (new_qos,the_spec,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Basic_StreamCtrl::modify_QoS");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return 1;
+  ACE_UNUSED_ARG (new_qos);
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (env);
+  return 0;
 }
 
 // Used by StreamEndPoint and VDev to inform StreamCtrl of events.
 // E.g., loss of flow, reestablishment of flow, etc..
 void
-TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property & /* the_event */,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_Basic_StreamCtrl::push_event (const struct CosPropertyService::Property & the_event,
+                                  CORBA::Environment &env)
 {
-  ACE_DEBUG ((LM_DEBUG,"\n(%P|%t) Recieved event \""));
+  ACE_DEBUG ((LM_DEBUG,
+              "\n(%P|%t) Recieved event \""));
+  ACE_UNUSED_ARG (the_event);
+  ACE_UNUSED_ARG (env);
 }
 
 // @@ Need to throw not-supported exception here
 void
-TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &/* the_spec */,
-                                    const char  * /* fp_name */,
-                                    const CORBA::Any &/* fp_settings */,
-                                    CORBA::Environment &/* ACE_TRY_ENV */)
+TAO_Basic_StreamCtrl::set_FPStatus (const AVStreams::flowSpec &the_spec,
+                                    const char *fp_name,
+                                    const CORBA::Any &fp_settings,
+                                    CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (fp_name);
+  ACE_UNUSED_ARG (fp_settings);
+  ACE_UNUSED_ARG (env);
 }
 
 // @@ Need to throw not-supported exception here
 CORBA::Object_ptr
 TAO_Basic_StreamCtrl::get_flow_connection (const char *flow_name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &)
 {
   TAO_String_Hash_Key flow_name_key (flow_name);
   FlowConnection_Map::ENTRY *flow_connection_entry = 0;
   if (this->flow_map_.find (flow_name_key,flow_connection_entry) == 0)
     return flow_connection_entry->int_id_;
-  else
-    ACE_THROW_RETURN (AVStreams::noSuchFlow (),CORBA::Object::_nil ());
+  return 0;
 }
 
 // @@ Need to throw not-supported exception here
 void
 TAO_Basic_StreamCtrl::set_flow_connection (const char *flow_name,
                                            CORBA::Object_ptr flow_connection,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &env)
 {
   // add the flowname and the flowconnection to the hashtable.
   this->flows_ [this->flow_count_++] = CORBA::string_dup (flow_name);
   TAO_String_Hash_Key flow_name_key (flow_name);
   if (this->flow_map_.bind (flow_name_key,flow_connection) != 0)
-    ACE_THROW (AVStreams::noSuchFlow ());// is this right?
-}
-
-
-// ----------------------------------------------------------------------
-// TAO_Negotiator
-// ----------------------------------------------------------------------
-
-CORBA::Boolean
-TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                           const AVStreams::streamQoS &qos_spec,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  return 0;
+    TAO_THROW_ENV (AVStreams::noSuchFlow (),env);// is this right?
 }
 
 // ----------------------------------------------------------------------
@@ -169,8 +150,6 @@ TAO_Negotiator::negotiate (AVStreams::Negotiator_ptr remote_negotiator,
 // ----------------------------------------------------------------------
 
 TAO_StreamCtrl::TAO_StreamCtrl (void)
-  :mcastconfigif_ (0),
-   mcastconfigif_ptr_ (0)
 {
 }
 
@@ -187,139 +166,83 @@ TAO_StreamCtrl::bind_devs (AVStreams::MMDevice_ptr a_party,
                            AVStreams::MMDevice_ptr b_party,
                            AVStreams::streamQoS &the_qos,
                            const AVStreams::flowSpec &the_flows,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // do a Qos Translation from application level Qos to Network level Qos??
-  ACE_TRY
-    {
-      if (CORBA::is_nil (a_party) && CORBA::is_nil (b_party))
-        ACE_ERROR_RETURN ((LM_ERROR,"Both parties are nil\n"),0);
-      // Check to see if we have non-nil parties to bind!
-      if (CORBA::is_nil (a_party) ||
-          CORBA::is_nil (b_party))
-        ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) TAO_StreamCtrl::bind_devs: "
-                    "a_party or b_party is null"
-                    "Multicast mode\n"));
-
-      // Request a_party to create the endpoint and vdev
-      CORBA::Boolean met_qos;
-      CORBA::String_var named_vdev;
-
-      if (!CORBA::is_nil (a_party))
-        {
-          this->sep_a_ =
-            a_party-> create_A (this->_this (ACE_TRY_ENV),
-                                this->vdev_a_.out (),
-                                the_qos,
-                                met_qos,
-                                named_vdev.inout (),
-                                the_flows,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
-        }
 
-      // Request b_party to create the endpoint and vdev
+  // Check to see if we have non-nil parties to bind!
+  if (CORBA::is_nil (a_party) ||
+      CORBA::is_nil (b_party))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%P|%t) TAO_StreamCtrl::bind_devs: "
+                       "a_party or b_party is null"
+                       "Multicast not supported in this implementation!\n"),
+                      1);
+
+  // Request a_party to create the endpoint and vdev
+  CORBA::Boolean met_qos;
+  CORBA::String_var named_vdev;
+
+  this->stream_endpoint_a_ =
+    a_party-> create_A (this->_this (env),
+                        this->vdev_a_.out (),
+                        the_qos,
+                        met_qos,
+                        named_vdev.inout (),
+                        the_flows,
+                        env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
-      if (!CORBA::is_nil (b_party))
-        {
-          this->sep_b_ =
-            b_party-> create_B (this->_this (ACE_TRY_ENV),
-                                this->vdev_b_.out (),
-                                the_qos,
-                                met_qos,
-                                named_vdev.inout (),
-                                the_flows,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
-          ACE_DEBUG ((LM_DEBUG,
-                      "\n(%P|%t)stream_endpoint_b_ = %s",
-                      TAO_ORB_Core_instance ()->orb ()->object_to_string (this->sep_b_.in (),
-                                                                          ACE_TRY_ENV)));
-          ACE_TRY_CHECK;
-        }
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) TAO_StreamCtrl::create_A: succeeded\n"));
 
-      if (CORBA::is_nil (b_party))
-        {
-          if (this->mcastconfigif_ != 0)
-            {
-              ACE_NEW_RETURN (this->mcastconfigif_,
-                              TAO_MCastConfigIf,
-                              0);
-              this->mcastconfigif_ptr_ = this->mcastconfigif_->_this (ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-          // Multicast source being added.
-          CORBA::Boolean result = this->vdev_a_->set_Mcast_peer (this->_this (ACE_TRY_ENV),
-                                                                 this->mcastconfigif_ptr_,
-                                                                 the_qos,
-                                                                 the_flows,
-                                                                 ACE_TRY_ENV);
-          if (!result)
-            ACE_ERROR_RETURN ((LM_ERROR,"set_Mcast_peer failed\n"),0);
-        }
+  // Request b_party to create the endpoint and vdev
 
-      if (CORBA::is_nil (a_party))
-        {
-          // Multicast sink being added.
-          if (this->mcastconfigif_ != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,"first add a source and then a sink\n"),0);
-          this->mcastconfigif_->set_peer (this->vdev_b_.in (),
-                                          the_qos,
-                                          the_flows,
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          this->sep_a_->connect_leaf (this->sep_b_.in (),
-                                      the_qos,
-                                      the_flows,
-                                      ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
+  this->stream_endpoint_b_ =
+    b_party-> create_B (this->_this (env),
+                        this->vdev_b_.out (),
+                        the_qos,
+                        met_qos,
+                        named_vdev.inout (),
+                        the_flows,
+                        env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
-      if (!CORBA::is_nil (a_party) && !CORBA::is_nil (b_party))
-        {
-          // Tell the 2 VDev's about one another
-          this->vdev_a_->set_peer (this->_this (ACE_TRY_ENV),
-                                   this->vdev_b_.in (),
-                                   the_qos,
-                                   the_flows,
-                                   ACE_TRY_ENV);
-
-          ACE_TRY_CHECK;
-
-          this->vdev_b_->set_peer (this->_this (ACE_TRY_ENV),
-                                   this->vdev_a_.in (),
-                                   the_qos,
-                                   the_flows,
-                                   ACE_TRY_ENV);
-
-          ACE_TRY_CHECK;
-
-
-          // Now connect the streams together. This will
-          // establish the connection
-          this->sep_a_->connect (this->sep_b_.in (),
-                                             the_qos,
-                                             the_flows,
-                                             ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamCtrl::bind_devs");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return 1;
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) TAO_StreamCtrl::create_B: succeeded\n"));
+
+  ACE_DEBUG ((LM_DEBUG,
+              "\n(%P|%t)stream_endpoint_b_ = %s",
+              TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_.in (),
+                                                                  env)));
+  TAO_CHECK_ENV_RETURN (env, 1);
+
+  // Tell the 2 VDev's about one another
+  this->vdev_a_->set_peer (this->_this (env),
+                           this->vdev_b_.in (),
+                           the_qos,
+                           the_flows,
+                           env);
+
+  TAO_CHECK_ENV_RETURN (env, 1);
+
+  this->vdev_b_->set_peer (this->_this (env),
+                           this->vdev_a_.in (),
+                           the_qos,
+                           the_flows,
+                           env);
+
+  TAO_CHECK_ENV_RETURN (env, 1);
+
+
+  // Now connect the streams together. This will
+  // establish the connection
+  this->stream_endpoint_a_->connect (this->stream_endpoint_b_.in (),
+                                     the_qos,
+                                     the_flows,
+                                     env);
+  TAO_CHECK_ENV_RETURN (env, 1);
+  return 0;
 }
 
 // Used to establish a connection between two endpoints
@@ -329,19 +252,19 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
                       AVStreams::StreamEndPoint_B_ptr sep_b,
                       AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &the_flows,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
-  this->sep_a_ = sep_a;
-  this->sep_b_ = sep_b;
+  this->stream_endpoint_a_ = sep_a;
+  this->stream_endpoint_b_ = sep_b;
 
-  ACE_TRY
+  TAO_TRY
     {
       if (CORBA::is_nil (sep_a) ||
           CORBA::is_nil (sep_b))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_StreamCtrl::bind:"
                            "a_party or b_party null!"),
-                          0);
+                          1);
 
       // since its full profile we do the viable stream setup algorithm.
       // get the flows for the A streamendpoint.
@@ -351,11 +274,11 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           AVStreams::flowSpec *a_flows = 0,*b_flows = 0;
           AVStreams::FlowEndPoint_seq a_feps,b_feps;
           CORBA::Any_ptr flows_any;
-          flows_any = sep_a->get_property_value ("Flows",ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          flows_any = sep_a->get_property_value ("Flows",TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           *flows_any >>= a_flows;
-          flows_any = sep_b->get_property_value ("Flows",ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          flows_any = sep_b->get_property_value ("Flows",TAO_TRY_ENV);
+          TAO_CHECK_ENV;
           *flows_any >>= b_flows;
           u_int i;
           for (i=0;i<a_flows->length ();i++)
@@ -363,12 +286,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
               // get the flowendpoint references.
               CORBA::Object_ptr fep_obj;
               fep_obj = sep_a->get_fep ((*a_flows)[i],
-                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                        TAO_TRY_ENV);
+              TAO_CHECK_ENV;
               AVStreams::FlowEndPoint_ptr fep;
               fep = AVStreams::FlowEndPoint::_narrow (fep_obj,
-                                                      ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                                      TAO_TRY_ENV);
+              TAO_CHECK_ENV;
               a_feps [i] = fep;
             }
           // get the flowendpoints for streamendpoint_b
@@ -377,12 +300,12 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
               // get the flowendpoint references.
               CORBA::Object_ptr fep_obj;
               fep_obj = sep_b->get_fep ((*b_flows)[i],
-                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                        TAO_TRY_ENV);
+              TAO_CHECK_ENV;
               AVStreams::FlowEndPoint_ptr fep;
               fep = AVStreams::FlowEndPoint::_narrow (fep_obj,
-                                                      ACE_TRY_ENV);
-              ACE_TRY_CHECK;
+                                                      TAO_TRY_ENV);
+              TAO_CHECK_ENV;
               b_feps [i] = fep;
             }
           // Now go thru the list of flow endpoint and match them.
@@ -391,46 +314,46 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
             {
               for (u_int j=0;j<b_feps.length ();j++)
                 {
-                  AVStreams::FlowEndPoint_ptr fep_a =
-                    AVStreams::FlowEndPoint::_narrow (a_feps [i],ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
+                  AVStreams::FlowEndPoint_ptr fep_a = 
+                    AVStreams::FlowEndPoint::_narrow (a_feps [i],TAO_TRY_ENV);
+                  TAO_CHECK_ENV;
                   AVStreams::FlowEndPoint_ptr fep_b =
-                    AVStreams::FlowEndPoint::_narrow (b_feps [j],ACE_TRY_ENV);
+                    AVStreams::FlowEndPoint::_narrow (b_feps [j],TAO_TRY_ENV);
 
                   if (fep_b->get_connected_fep () != 0)
                     {
                       if (fep_a->is_fep_compatible (fep_b,
-                                                   ACE_TRY_ENV) == 1)
+                                                   TAO_TRY_ENV) == 1)
                         {
                           // assume that flow names are same so that we
-                          // can use either of them.
+                          // can use either of them. 
                           CORBA::Object_ptr flow_connection_obj;
                           AVStreams::FlowConnection_ptr flow_connection;
                           if ((flow_connection_obj
-                               = this->get_flow_connection ((*a_flows)[i],ACE_TRY_ENV))!= 0)
+                               = this->get_flow_connection ((*a_flows)[i],TAO_TRY_ENV))!= 0)
                             {
-                              flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj,ACE_TRY_ENV);
-                              ACE_TRY_CHECK;
+                              flow_connection = AVStreams::FlowConnection::_narrow (flow_connection_obj,TAO_TRY_ENV);
+                              TAO_CHECK_ENV;
                             }
                           else
                             {
                               TAO_FlowConnection *flowConnection;
                               ACE_NEW_RETURN (flowConnection,TAO_FlowConnection,0);
-                              flow_connection = flowConnection->_this (ACE_TRY_ENV);
-                              ACE_TRY_CHECK;
+                              flow_connection = flowConnection->_this (TAO_TRY_ENV);
+                              TAO_CHECK_ENV;
                             }
                           // make sure that a_feps is flow_producer and b_feps is flow_consumer
                           // There should be a way to find which flow endpoint is producer and which is consumer.
                           AVStreams::FlowProducer_ptr producer =
-                            AVStreams::FlowProducer::_narrow (fep_a,ACE_TRY_ENV);
-                          ACE_TRY_CHECK;
+                            AVStreams::FlowProducer::_narrow (fep_a,TAO_TRY_ENV);
+                          TAO_CHECK_ENV;
                           AVStreams::FlowConsumer_ptr consumer =
-                            AVStreams::FlowConsumer::_narrow (fep_b,ACE_TRY_ENV);
-                          ACE_TRY_CHECK;
+                            AVStreams::FlowConsumer::_narrow (fep_b,TAO_TRY_ENV);
+                          TAO_CHECK_ENV;
                           // what should be passed to QoS?
-                          flow_connection->connect (producer,consumer,the_qos [0],ACE_TRY_ENV);
-                          fep_a->set_peer (flow_connection,fep_b,the_qos[0],ACE_TRY_ENV);
-                          fep_b->set_peer (flow_connection,fep_a,the_qos[0],ACE_TRY_ENV);
+                          flow_connection->connect (producer,consumer,the_qos [0],env);
+                          fep_a->set_peer (flow_connection,fep_b,the_qos[0],env);
+                          fep_b->set_peer (flow_connection,fep_a,the_qos[0],env);
                         }
                     }
                 }
@@ -443,107 +366,34 @@ TAO_StreamCtrl::bind (AVStreams::StreamEndPoint_A_ptr sep_a,
           // not implemented yet.
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       // error was thrown because one of the streamendpoints is light profile.
       // Now connect the streams together
-      this->sep_a_->connect (this->sep_b_.in (),
+      this->stream_endpoint_a_->connect (this->stream_endpoint_b_.in (),
                                          the_qos,
                                          the_flows,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         env);
+      TAO_CHECK_ENV_RETURN (env, 1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return 1;
+  TAO_ENDTRY;
+  return 0;
 }
 
 void
-TAO_StreamCtrl::unbind (CORBA::Environment &ACE_TRY_ENV)
+TAO_StreamCtrl::unbind (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 void
 TAO_StreamCtrl::unbind_party (AVStreams::StreamEndPoint_ptr the_ep,
                               const AVStreams::flowSpec &the_spec,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_ep);
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-}
-
-void
-TAO_StreamCtrl::unbind_dev (AVStreams::MMDevice_ptr dev,
-                            const AVStreams::flowSpec & the_spec,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-
-}
-
-AVStreams::VDev_ptr
-TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                  AVStreams::StreamEndPoint_out sep,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  return AVStreams::VDev::_nil ();
-}
-
-CORBA::Boolean
-TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &the_qos,
-                            const AVStreams::flowSpec &the_spec,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->mcastconfigif_ != 0)
-    {
-      // call modify_Qos on the root VDev which is the mcast configif.
-      ACE_DEBUG ((LM_DEBUG,"Cannot Modify the Qos for multipoint streams\n"));
-    }
-  else
-    {
-      TAO_Basic_StreamCtrl::modify_QoS (the_qos,the_spec,ACE_TRY_ENV);
-    }
-  return 1;
-}
-
-// ----------------------------------------------------------------------
-// TAO_MCastConfigIf
-// ----------------------------------------------------------------------
-
-CORBA::Boolean
-TAO_MCastConfigIf::set_peer (CORBA::Object_ptr peer,
-                             AVStreams::streamQoS & the_qos,
-                             const AVStreams::flowSpec & the_spec,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  return 0;
-}
-
-void
-TAO_MCastConfigIf::configure (const CosPropertyService::Property & a_configuration,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-}
-
-void
-TAO_MCastConfigIf::set_initial_configuration (const CosPropertyService::Properties & initial,
-                                              CORBA::Environment &ACE_TRY_ENV)
-{
-}
-
-void
-TAO_MCastConfigIf::set_format (const char * flowName,
-                               const char * format_name,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-}
-
-void
-TAO_MCastConfigIf::set_dev_params (const char * flowName,
-                                   const CosPropertyService::Properties & new_params,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
+  ACE_UNUSED_ARG (env);
 }
 
 // ----------------------------------------------------------------------
@@ -554,186 +404,18 @@ TAO_Base_StreamEndPoint::~TAO_Base_StreamEndPoint (void)
 {
 }
 
-int
-TAO_Base_StreamEndPoint::handle_close (void)
+int TAO_Base_StreamEndPoint::handle_close (void)
 {
   // This method should not be defined, but EGCS complains endlessly
   // about it.
   return -1;
 }
 
-
-// ----------------------------------------------------------------------
-// TAO_Client_StreamEndPoint
-// ----------------------------------------------------------------------
-
-TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint: created\n"));
-}
-
-CORBA::Boolean
-TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
-                                    AVStreams::streamQoS &qos_spec,
-                                    const AVStreams::flowSpec &the_spec,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Boolean retv = 0;
-
-  ACE_TRY
-    {
-      AVStreams::flowSpec flow_spec (the_spec);
-      this->handle_preconnect (flow_spec);
-
-      // Use the base class implementation of connect
-      responder->request_connection (this->_this (ACE_TRY_ENV),
-                                     0,
-                                     qos_spec,
-                                     flow_spec,
-                                     ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-
-      // Make the upcall to the app
-      retv = this->handle_postconnect (flow_spec);
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return retv;
-}
-
-
-// @@ Need to throw not-supported exception here
-CORBA::Boolean
-TAO_Client_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
-                                         AVStreams::flowSpec &the_spec,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return 0;
-}
-
-// Multicast is not supported yet.
-CORBA::Boolean
-TAO_Client_StreamEndPoint::connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                         AVStreams::streamQoS &the_qos,
-                                         const AVStreams::flowSpec &the_flows,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (the_ep);
-  ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (the_flows);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return 0;
-}
-
-// Multicast not supported yet.
-void
-TAO_Client_StreamEndPoint::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
-                                            const AVStreams::flowSpec &theSpec,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (the_ep);
-  ACE_UNUSED_ARG (theSpec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-}
-
-TAO_Client_StreamEndPoint::~TAO_Client_StreamEndPoint (void)
-{
-}
-
-// ----------------------------------------------------------------------
-// TAO_Server_StreamEndPoint
-// ----------------------------------------------------------------------
-
-TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "\n(%P|%t) TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint: created"));
-}
-
-
-// Called by streamctrl, requesting us to call request_connection
-// on the responder (to initiate a connection)
-CORBA::Boolean
-TAO_Server_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
-                                    AVStreams::streamQoS &qos_spec,
-                                    const AVStreams::flowSpec &the_spec,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (responder);
-  ACE_UNUSED_ARG (qos_spec);
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "(%P|%t) Calling TAO_Server_StreamEndPoint::connect"
-                     " is not compatible with the spec!"
-                     "\n"),
-                    0);
-}
-
-CORBA::Boolean
-TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator,
-                                               CORBA::Boolean is_mcast,
-                                               AVStreams::streamQoS &qos,
-                                               AVStreams::flowSpec &the_spec,
-                                               CORBA::Environment &ACE_TRY_ENV)
-
-{
-  int result = 0;
-  ACE_TRY
-    {
-      // Use the base class implementation of request_connection
-      TAO_StreamEndPoint::request_connection (initiator,
-                                              is_mcast,
-                                              qos,
-                                              the_spec,
-                                              ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-      // Make the upcall to the app
-      result = this->handle_connection_requested (the_spec,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Server_StreamEndpoint::request_connection");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-  return result;
-}
-
-CORBA::Boolean
-TAO_Server_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
-                                         AVStreams::flowSpec &the_spec,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return 0;
-}
-
-TAO_Server_StreamEndPoint::~TAO_Server_StreamEndPoint (void)
-{
-}
-
-
 // ----------------------------------------------------------------------
 // TAO_StreamEndPoint
 // ----------------------------------------------------------------------
 
 // constructor.
-
 TAO_StreamEndPoint::TAO_StreamEndPoint (void)
   :flow_count_ (1)
 {
@@ -742,54 +424,53 @@ TAO_StreamEndPoint::TAO_StreamEndPoint (void)
 
 // Stop the physical flow of data on the stream
 // Empty the_spec --> apply to all flows
-
 void
 TAO_StreamEndPoint::stop (const AVStreams::flowSpec &the_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   // Make the upcall into the app
-  this->handle_stop (the_spec, ACE_TRY_ENV);
+  this->handle_stop (the_spec, env);
 }
 
 // Start the physical flow of data on the stream
 // Empty the_spec --> apply to all flows
-
 void
 TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // Make the upcall into the app
-  this->handle_start (flow_spec, ACE_TRY_ENV);
+  this->handle_start (flow_spec, env);
 }
 
 // Close the connection
-
 void
 TAO_StreamEndPoint::destroy (const AVStreams::flowSpec &the_spec,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-//   // Make the upcall into the app
-//   this->handle_destroy (the_spec, ACE_TRY_ENV);
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
+  // Make the upcall into the app
+  this->handle_destroy (the_spec, env);
+}
 
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+// Called by streamctrl, requesting us to call request_connection
+// on the responder (to initiate a connection)
+CORBA::Boolean
+TAO_Server_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
+                                    AVStreams::streamQoS &qos_spec,
+                                    const AVStreams::flowSpec &the_spec,
+                                    CORBA::Environment &)
+{
+  ACE_UNUSED_ARG (responder);
+  ACE_UNUSED_ARG (qos_spec);
+  ACE_UNUSED_ARG (the_spec);
+  ACE_ERROR_RETURN ((LM_ERROR,
+                     "(%P|%t) Calling TAO_Server_StreamEndPoint::connect"
+                     " is not compatible with the spec!"
+                     "\n"),
+                    0);
 }
 
 // Called by our peer endpoint, requesting us to establish
 // a connection
-
 CORBA::Boolean
 TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator,
                                         CORBA::Boolean is_mcast,
@@ -815,68 +496,53 @@ TAO_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator,
 }
 
 // @@ Need to throw not-supported exception here
-
 CORBA::Boolean
 TAO_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos,
                                 const AVStreams::flowSpec &the_flows,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (new_qos);
   ACE_UNUSED_ARG (the_flows);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // @@ Need to throw not-supported exception here
-
 CORBA::Boolean
 TAO_StreamEndPoint::set_protocol_restriction (const AVStreams::protocolSpec &the_pspec,
-                                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      CORBA::Any protocol_restriction_any;
-
-      protocol_restriction_any <<= the_pspec;
-      this->define_property ("ProtocolRestriction",
-                             protocol_restriction_any,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamEndPoint::set_protocol_restriction");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+                                              CORBA::Environment &env)
+{
+  CORBA::Any protocol_restriction_any;
+  
+  protocol_restriction_any <<= the_pspec;
+  this->define_property ("ProtocolRestriction",
+                         protocol_restriction_any,
+                         env);
+  TAO_CHECK_ENV_RETURN (env,0);
   return 1;
 }
 
-
 void
 TAO_StreamEndPoint::disconnect (const AVStreams::flowSpec &the_spec,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 // @@ Need to throw not-supported exception here
-
 void
 TAO_StreamEndPoint::set_FPStatus (const AVStreams::flowSpec &the_spec,
                                   const char *fp_name,
                                   const CORBA::Any &fp_settings,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_spec);
   ACE_UNUSED_ARG (fp_name);
   ACE_UNUSED_ARG (fp_settings);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
-
 CORBA::Object_ptr
 TAO_StreamEndPoint::get_fep (const char *flow_name,
                              CORBA::Environment &)
@@ -888,146 +554,106 @@ TAO_StreamEndPoint::get_fep (const char *flow_name,
   return 0;
 }
 
-
 char *
 TAO_StreamEndPoint::add_fep (CORBA::Object_ptr the_fep,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   char *flow_name = 0;
-  ACE_TRY_EX (flow_name);
-  {
-    ACE_NEW_RETURN (flow_name,char [BUFSIZ],0);
-    CORBA::Any_ptr flow_name_any;
-    AVStreams::FlowEndPoint_ptr fep =
-      AVStreams::FlowEndPoint::_narrow (the_fep,ACE_TRY_ENV);
-    ACE_TRY_CHECK_EX (flow_name);
-    flow_name_any = fep->get_property_value ("FlowName",ACE_TRY_ENV);
-    ACE_TRY_CHECK_EX (flow_name);
-    *flow_name_any >>= flow_name;
-  }
-  ACE_CATCHANY
+  ACE_NEW_RETURN (flow_name,char [BUFSIZ],0);
+  CORBA::Any_ptr flow_name_any;
+  AVStreams::FlowEndPoint_ptr fep = 
+    AVStreams::FlowEndPoint::_narrow (the_fep,env);
+  TAO_CHECK_ENV_RETURN (env,0);
+  TAO_TRY
+    {
+      flow_name_any = fep->get_property_value ("FlowName",TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      *flow_name_any >>= flow_name;
+    }
+  TAO_CATCHANY
     {
       // exception implies the flow name is not defined and is system generated.
       ACE_OS::sprintf (flow_name,"flow%d",flow_num_++);
     }
-  ACE_ENDTRY;
   // Add it to the sequence of flowNames supported.
   // put the flowname and the flowendpoint in a hashtable.
   TAO_String_Hash_Key fep_name_key (flow_name);
   if (this->fep_map_.bind (fep_name_key,the_fep) != 0)
-    {
-      ACE_THROW_RETURN (AVStreams::streamOpFailed (),0);
-    }
-  ACE_TRY_EX (flows)
-    {
-      // increment the flow count.
-      this->flow_count_++;
-      this->flows_.length (this->flow_count_);
-      this->flows_ [this->flow_count_-1] = flow_name;
-      // define/modify the "Flows" property.
-      CORBA::Any flows_any;
-      flows_any <<= this->flows_;
-      this->define_property ("Flows",
-                             flows_any,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (flows);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamEndPoint::add_fep");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+    TAO_THROW_ENV_RETURN (AVStreams::streamOpFailed (),env,0);
+
+  // increment the flow count.
+  this->flow_count_++;
+  this->flows_.length (this->flow_count_);
+  this->flows_ [this->flow_count_-1] = flow_name;
+  // define/modify the "Flows" property.
+  CORBA::Any flows_any;
+  flows_any <<= this->flows_;
+  this->define_property ("Flows",
+                         flows_any,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_StreamEndPoint::add_fep",0);
+  TAO_ENDTRY;
   return flow_name;
 }
 
-
 void
 TAO_StreamEndPoint::remove_fep (const char *flow_name,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      TAO_String_Hash_Key fep_name_key (flow_name);
-      CORBA::Object_ptr fep_entry = 0;
-      // Remove the fep from the hash table.
-      if (this->fep_map_.unbind (fep_name_key,fep_entry)!= 0)
-        TAO_THROW_ENV (AVStreams::streamOpFailed (),ACE_TRY_ENV);
-      // redefine the "Flows" property
-      AVStreams::flowSpec new_flows (this->flows_.length ());
-      for (u_int i=0,j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name,this->flows_[i]) != 0)
-          new_flows[j++] = this->flows_[i];
-
-      CORBA::Any flows;
-      flows <<= new_flows;
-      this->flows_ = new_flows;
-      this->define_property ("Flows",
-                             flows,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamEndPoint::remove_fep");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_String_Hash_Key fep_name_key (flow_name);
+  CORBA::Object_ptr fep_entry = 0;
+  // Remove the fep from the hash table.
+  if (this->fep_map_.unbind (fep_name_key,fep_entry)!= 0)
+    TAO_THROW_ENV (AVStreams::streamOpFailed (),env);
+  // redefine the "Flows" property
+  AVStreams::flowSpec new_flows (this->flows_.length ());
+  for (u_int i=0,j=0 ; i <this->flows_.length (); i++)
+    if (ACE_OS::strcmp (flow_name,this->flows_[i]) != 0)
+      new_flows[j++] = this->flows_[i];
+
+  CORBA::Any flows;
+  flows <<= new_flows;
+  this->flows_ = new_flows;
+  this->define_property ("Flows",
+                         flows,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_StreamEndPoint::remove_fep");
+  return;
 }
 
 // @@ Need to throw not-supported exception here
-
 void
 TAO_StreamEndPoint::set_negotiator (AVStreams::Negotiator_ptr new_negotiator,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      CORBA::Any negotiator;
-      negotiator <<= new_negotiator;
-      this->define_property ("Negotiator",
-                             negotiator,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamEndPoint::set_negotiator");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+                                    CORBA::Environment &env)
+{
+  CORBA::Any negotiator;
+  negotiator <<= new_negotiator;
+  this->define_property ("Negotiator",
+                         negotiator,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_StreamEndPoint::set_negotiator");
+  return;
 }
 
 // Sets the public key used for this streamendpoint.
-
 void
 TAO_StreamEndPoint::set_key (const char *flow_name,
                              const AVStreams::key & the_key,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-
-      CORBA::Any PublicKey;
-      PublicKey <<= the_key;
-      char PublicKey_property [BUFSIZ];
-      ACE_OS::sprintf (PublicKey_property,"%s_PublicKey",flow_name);
-      this->define_property (PublicKey_property,
-                             PublicKey,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_StreamEndPoint::set_key");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+                             CORBA::Environment &env)
+{
+  CORBA::Any PublicKey;
+  PublicKey <<= the_key;
+  char PublicKey_property [BUFSIZ];
+  ACE_OS::sprintf (PublicKey_property,"%s_PublicKey",flow_name);
+  this->define_property (PublicKey_property,
+                         PublicKey,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_StreamEndPoint::set_key");
+  return;
 }
 
 // Set the source id.
-
 void
 TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
                                    CORBA::Environment &)
@@ -1035,13 +661,134 @@ TAO_StreamEndPoint::set_source_id (CORBA::Long source_id,
   this->source_id_ = source_id;
 }
 
-
 TAO_StreamEndPoint::~TAO_StreamEndPoint (void)
 {
   //this->handle_close ();
 }
 
 // ----------------------------------------------------------------------
+// TAO_Client_StreamEndPoint
+// ----------------------------------------------------------------------
+
+TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) TAO_Client_StreamEndPoint::TAO_Client_StreamEndPoint: created\n"));
+}
+
+CORBA::Boolean
+TAO_Client_StreamEndPoint::connect (AVStreams::StreamEndPoint_ptr responder,
+                                    AVStreams::streamQoS &qos_spec,
+                                    const AVStreams::flowSpec &the_spec,
+                                    CORBA::Environment &env)
+{
+  AVStreams::flowSpec flow_spec (the_spec);
+  this->handle_preconnect (flow_spec);
+
+  // Use the base class implementation of connect
+  responder->request_connection (this->_this (env),
+                                 0,
+                                 qos_spec,
+                                 flow_spec,
+                                 env);
+
+  TAO_CHECK_ENV_RETURN (env,0);
+
+  // Make the upcall to the app
+  return this->handle_postconnect (flow_spec);
+
+
+}
+
+
+// @@ Need to throw not-supported exception here
+CORBA::Boolean
+TAO_Client_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
+                                    AVStreams::flowSpec &the_spec,
+                                    CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+// Multicast is not supported yet.
+CORBA::Boolean
+TAO_Client_StreamEndPoint::connect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
+                                    AVStreams::streamQoS &the_qos,
+                                    const AVStreams::flowSpec &the_flows,
+                                    CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (the_ep);
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (the_flows);
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+// Multicast not supported yet.
+void
+TAO_Client_StreamEndPoint::disconnect_leaf (AVStreams::StreamEndPoint_B_ptr the_ep,
+                                            const AVStreams::flowSpec &theSpec,
+                                            CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (the_ep);
+  ACE_UNUSED_ARG (theSpec);
+  ACE_UNUSED_ARG (env);
+}
+
+TAO_Client_StreamEndPoint::~TAO_Client_StreamEndPoint (void)
+{
+}
+
+// ----------------------------------------------------------------------
+// TAO_Server_StreamEndPoint
+// ----------------------------------------------------------------------
+
+TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "\n(%P|%t) TAO_Server_StreamEndPoint::TAO_Server_StreamEndPoint: created"));
+}
+
+CORBA::Boolean
+TAO_Server_StreamEndPoint::request_connection (AVStreams::StreamEndPoint_ptr initiator,
+                                               CORBA::Boolean is_mcast,
+                                               AVStreams::streamQoS &qos,
+                                               AVStreams::flowSpec &the_spec,
+                                               CORBA::Environment &env)
+
+{
+  // Use the base class implementation of request_connection
+  TAO_StreamEndPoint::request_connection (initiator,
+                                          is_mcast,
+                                          qos,
+                                          the_spec,
+                                          env);
+
+  TAO_CHECK_ENV_RETURN (env,0);
+  // Make the upcall to the app
+  return this->handle_connection_requested (the_spec,
+                                            env);
+
+}
+CORBA::Boolean
+TAO_Server_StreamEndPoint::multiconnect (AVStreams::streamQoS &the_qos,
+                                         AVStreams::flowSpec &the_spec,
+                                         CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (the_spec);
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+TAO_Server_StreamEndPoint::~TAO_Server_StreamEndPoint (void)
+{
+}
+
+// ----------------------------------------------------------------------
 // TAO_VDev
 // ----------------------------------------------------------------------
 
@@ -1052,79 +799,72 @@ TAO_VDev::TAO_VDev (void)
 }
 
 // StreamCtrl will call this to give us a reference to itself, and to
-// our peer vdev..
+// our peer vdev.. 
 CORBA::Boolean
 TAO_VDev::set_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                     AVStreams::VDev_ptr the_peer_dev,
                     AVStreams::streamQoS &the_qos,
                     const AVStreams::flowSpec &the_spec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) TAO_VDev::set_peer: called"));
 
-  CORBA::Boolean result = 0;
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) TAO_VDev::set_peer: called"));
-
-      CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev,
-                                                                                  ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
+  CORBA::String_var ior = TAO_ORB_Core_instance ()->orb ()->object_to_string (the_peer_dev,
+                                                                              env);
 
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) TAO_VDev::set_peer: my peer is %s\n",
-                  ior.in ()));
+  TAO_CHECK_ENV_RETURN (env,
+                        0);
 
-      CORBA::Any anyval;
-      anyval <<= ior.in ();
-      this->define_property ("Related_VDev",
-                             anyval,
-                             ACE_TRY_ENV);
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) TAO_VDev::set_peer: my peer is %s\n",
+              ior.in ()));
 
-      ACE_TRY_CHECK;
+  CORBA::Any anyval;
+  anyval <<= ior.in ();
+  this->define_property ("Related_VDev",
+                         anyval,
+                         env);
 
-      this->streamctrl_ = the_ctrl;
-      this->peer_ = the_peer_dev;
+  TAO_CHECK_ENV_RETURN (env,
+                        0);
 
-      CORBA::Any_ptr anyptr;
-      CORBA::String media_ctrl_ior;
-      anyptr = this->peer_->get_property_value ("Related_MediaCtrl",
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  this->streamctrl_ = the_ctrl;
+  this->peer_ = the_peer_dev;
 
-      if (anyptr != 0)
-        {
-          *anyptr >>= media_ctrl_ior;
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t)The Media Control IOR is %s\n",
-                      media_ctrl_ior));
-        }
-      CORBA::Object_ptr media_ctrl_obj =
-        TAO_ORB_Core_instance ()->orb ()->string_to_object
-        (media_ctrl_ior,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  CORBA::Any_ptr anyptr;
+  CORBA::String media_ctrl_ior;
+  anyptr = this->peer_->get_property_value ("Related_MediaCtrl",
+                                            env);
+  TAO_CHECK_ENV_RETURN (env,1);
 
-      result = this->set_media_ctrl (media_ctrl_obj,ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
+  if (anyptr != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_Server_StreamEndpoint::request_connection");
-      return 0;
+      *anyptr >>= media_ctrl_ior;
+      ACE_DEBUG ((LM_DEBUG,"(%P|%t)The Media Control IOR is %s\n",
+                  media_ctrl_ior));
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+  CORBA::Object_ptr media_ctrl_obj =
+    TAO_ORB_Core_instance ()->orb ()->string_to_object
+    (media_ctrl_ior,env);
+  TAO_CHECK_ENV_RETURN (env, 0);
+
+  CORBA::Boolean result =
+    this->set_media_ctrl (media_ctrl_obj,env);
+  TAO_CHECK_ENV_RETURN (env,0);
+
   return result;
 }
 
 CORBA::Boolean
 TAO_VDev::set_media_ctrl (CORBA::Object_ptr media_ctrl,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (media_ctrl);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 1;
 }
 
@@ -1134,51 +874,41 @@ TAO_VDev::set_Mcast_peer (AVStreams::StreamCtrl_ptr the_ctrl,
                           AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                           AVStreams::streamQoS &the_qos,
                           const AVStreams::flowSpec &the_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_ctrl);
   ACE_UNUSED_ARG (a_mcastconfigif);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // applications should override this to handle configuration changes.
 void
 TAO_VDev::configure (const CosPropertyService::Property &the_config_mesg,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_config_mesg);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 // sets the media format used for the flowname as a property.
 void
 TAO_VDev::set_format (const char *flowName,
                       const char *format_name,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      if (flowName == 0 || format_name == 0)
-        ACE_ERROR ((LM_ERROR,"TAO_VDev::set_format: flowName or format_name is null\n"));
-      char format_property [BUFSIZ];
-      ACE_OS::sprintf (format_property,"%s_currFormat",flowName);
-      CORBA::Any format;
-      format <<= format_name;
-      this->define_property (format_property,
-                             format,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_VDev::set_format");
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+                      CORBA::Environment &env)
+{
+  if (flowName == 0 || format_name == 0)
+    ACE_ERROR ((LM_ERROR,"TAO_VDev::set_format: flowName or format_name is null\n"));
+  char format_property [BUFSIZ];
+  ACE_OS::sprintf (format_property,"%s_currFormat",flowName);
+  CORBA::Any format;
+  format <<= format_name;
+  this->define_property (format_property,
+                         format,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"set_format");
   return;
 }
 
@@ -1186,29 +916,18 @@ TAO_VDev::set_format (const char *flowName,
 void
 TAO_VDev::set_dev_params (const char *flowName,
                           const CosPropertyService::Properties &new_params,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-
-      if (flowName == 0)
-        ACE_ERROR ((LM_ERROR,"TAO_VDev::set_dev_params:flowName is null\n"));
-      char devParams_property[BUFSIZ];
-      ACE_OS::sprintf (devParams_property,"%s_devParams",flowName);
-      CORBA::Any devParams;
-      devParams <<= new_params;
-      this->define_property (devParams_property,
-                             devParams,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_VDev::set_dev_params");
-      return;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+                          CORBA::Environment &env)
+{
+  if (flowName == 0)
+    ACE_ERROR ((LM_ERROR,"TAO_VDev::set_dev_params:flowName is null\n"));
+  char devParams_property[BUFSIZ];
+  ACE_OS::sprintf (devParams_property,"%s_devParams",flowName);
+  CORBA::Any devParams;
+  devParams <<= new_params;
+  this->define_property (devParams_property,
+                         devParams,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_VDev::set_dev_params");
   return;
 }
 
@@ -1216,11 +935,11 @@ TAO_VDev::set_dev_params (const char *flowName,
 CORBA::Boolean
 TAO_VDev::modify_QoS (AVStreams::streamQoS &the_qos,
                       const AVStreams::flowSpec &the_spec,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
@@ -1245,33 +964,20 @@ TAO_MMDevice::bind (AVStreams::MMDevice_ptr peer_device,
                     AVStreams::streamQoS &the_qos,
                     CORBA::Boolean_out is_met,
                     const AVStreams::flowSpec &the_spec,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &env)
 {
-  AVStreams::StreamCtrl_ptr streamctrl (AVStreams::StreamCtrl::_nil ());
-  ACE_TRY
-    {
-      ACE_UNUSED_ARG (is_met);
-      TAO_StreamCtrl *stream_ctrl;
-      ACE_NEW_RETURN (stream_ctrl,
-                      TAO_StreamCtrl,
-                      0);
-      stream_ctrl->bind_devs (peer_device,
-                              AVStreams::MMDevice::_duplicate (this->_this (ACE_TRY_ENV)),
-                              the_qos,
-                              the_spec,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      streamctrl = stream_ctrl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_MMDevice::bind");
-      return streamctrl;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (streamctrl);
-  return streamctrl;
+  ACE_UNUSED_ARG (is_met);
+  TAO_StreamCtrl *stream_ctrl;
+  ACE_NEW_RETURN (stream_ctrl,
+                  TAO_StreamCtrl,
+                  0);
+  stream_ctrl->bind_devs (peer_device,
+                          AVStreams::MMDevice::_duplicate (this->_this (env)),
+                          the_qos,
+                          the_spec,
+                          env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_MMDevice::bind",0);
+  return stream_ctrl->_this (env);
 }
 
 // Multicast is not supported yet.
@@ -1280,13 +986,13 @@ TAO_MMDevice::bind_mcast (AVStreams::MMDevice_ptr first_peer,
                           AVStreams::streamQoS &the_qos,
                           CORBA::Boolean_out is_met,
                           const AVStreams::flowSpec &the_spec,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
   ACE_UNUSED_ARG (the_spec);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
@@ -1297,35 +1003,24 @@ TAO_MMDevice::create_A (AVStreams::StreamCtrl_ptr the_requester,
                                    CORBA::Boolean_out met_qos,
                                    char *&named_vdev,
                                    const AVStreams::flowSpec &the_spec,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (met_qos);
   ACE_UNUSED_ARG (named_vdev);
   ACE_UNUSED_ARG (the_spec);
+  // In full profile application can override this to use FDevs.
+  AVStreams::StreamEndPoint_A_ptr ptr;
+  if (this->endpoint_strategy_->create_A (ptr,
+                                          the_vdev,
+                                          env) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%P|%t) Error in create_A\n"),
+                      0);
 
-  AVStreams::StreamEndPoint_A_ptr ptr (AVStreams::StreamEndPoint_A::_nil ());
-  ACE_TRY
-    {
-      // In full profile application can override this to use FDevs.
-
-      if (this->endpoint_strategy_->create_A (ptr,
-                                              the_vdev,
-                                              ACE_TRY_ENV) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Error in create_A\n"),
-                          0);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_MMDevice::create_A");
-      return ptr;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ptr);
   return ptr;
 }
 
@@ -1337,7 +1032,7 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
                         CORBA::Boolean_out met_qos,
                         char *&named_vdev,
                         const AVStreams::flowSpec &the_spec,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
@@ -1346,26 +1041,16 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
   ACE_UNUSED_ARG (the_spec);
 
   // In full profile application can override this to use FDevs.
-  AVStreams::StreamEndPoint_B_ptr ptr (AVStreams::StreamEndPoint_B::_nil ());
-
-  ACE_TRY
-    {
+  AVStreams::StreamEndPoint_B_ptr ptr;
   if (this->endpoint_strategy_->create_B (ptr,
                                           the_vdev,
-                                          ACE_TRY_ENV) == -1)
+                                          env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) Error in create_B\n"),
                       0);
 
-  ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_MMDevice::create_B");
-      return ptr;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (ptr);
+  TAO_CHECK_ENV_RETURN (env, 0);
+
   return ptr;
 }
 
@@ -1373,52 +1058,40 @@ TAO_MMDevice::create_B (AVStreams::StreamCtrl_ptr the_requester,
 void
 TAO_MMDevice::destroy (AVStreams::StreamEndPoint_ptr the_ep,
                        const char *vdev_name,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_UNUSED_ARG (the_ep);
+  ACE_UNUSED_ARG (vdev_name);
+  ACE_UNUSED_ARG (env);
 }
 
 // Adds the fdev object to the MMDevice.
 char *
 TAO_MMDevice::add_fdev (CORBA::Object_ptr the_fdev,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   char *flow_name = 0;
-  ACE_TRY_EX (flow_name)
+  ACE_NEW_RETURN (flow_name,char [BUFSIZ],0);
+  CORBA::Any_ptr flow_name_any;
+  AVStreams::FDev_ptr fdev = 
+    AVStreams::FDev::_narrow (the_fdev,env);
+  TAO_CHECK_ENV_RETURN (env,0);
+  TAO_TRY
     {
-      ACE_NEW_RETURN (flow_name,char [BUFSIZ],0);
-      CORBA::Any_ptr flow_name_any;
-      AVStreams::FDev_ptr fdev =
-        AVStreams::FDev::_narrow (the_fdev,ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (flow_name);
-      flow_name_any = fdev->get_property_value ("Flow",ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (flow_name);
+      flow_name_any = fdev->get_property_value ("Flow",TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       *flow_name_any >>= flow_name;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       // exception implies the flow name is not defined and is system generated.
       ACE_OS::sprintf (flow_name,"flow%d",flow_num_++);
     }
-  ACE_ENDTRY;
   // Add it to the sequence of flowNames supported.
   // put the flowname and the fdev in a hashtable.
   TAO_String_Hash_Key fdev_name_key (flow_name);
   if (this->fdev_map_.bind (fdev_name_key,the_fdev) != 0)
-    ACE_THROW_RETURN (AVStreams::streamOpFailed (),0);
+    TAO_THROW_ENV_RETURN (AVStreams::streamOpFailed (),env,0);
 
   // increment the flow count.
   this->flow_count_++;
@@ -1427,29 +1100,20 @@ TAO_MMDevice::add_fdev (CORBA::Object_ptr the_fdev,
   // define/modify the "Flows" property.
   CORBA::Any flows_any;
   flows_any <<= this->flows_;
-  ACE_TRY_EX (flows)
-    {
-      this->define_property ("Flows",
-                             flows_any,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (flows);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_MMDevice::add_fdev");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+  this->define_property ("Flows",
+                         flows_any,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN(env,"TAO_MMDevice::add_fdev",0);
+  TAO_ENDTRY;
   return flow_name;
 }
 
 // Gets the FDev object associated with this flow.
 CORBA::Object_ptr
 TAO_MMDevice::get_fdev (const char *flow_name,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   TAO_String_Hash_Key fdev_name_key (flow_name);
   FDev_Map::ENTRY *fdev_entry = 0;
@@ -1461,35 +1125,27 @@ TAO_MMDevice::get_fdev (const char *flow_name,
 // Removes the fdev from this MMDevice.
 void
 TAO_MMDevice::remove_fdev (const char *flow_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      TAO_String_Hash_Key fdev_name_key (flow_name);
-      CORBA::Object_ptr fdev_entry = 0;
-      // Remove the fep from the hash table.
-      if (this->fdev_map_.unbind (flow_name,fdev_entry)!= 0)
-        ACE_THROW (AVStreams::streamOpFailed ());
-
-      AVStreams::flowSpec new_flows (this->flows_.length ());
-      for (u_int i=0,j=0 ; i <this->flows_.length (); i++)
-        if (ACE_OS::strcmp (flow_name,this->flows_[i]) != 0)
-          new_flows[j++] = this->flows_[i];
-
-      CORBA::Any flows;
-      flows <<= new_flows;
-      this->flows_ = new_flows;
-      this->define_property ("Flows",
-                             flows,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_MMDevice::remove_fdev");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_String_Hash_Key fdev_name_key (flow_name);
+  CORBA::Object_ptr fdev_entry = 0;
+  // Remove the fep from the hash table.
+  if (this->fdev_map_.unbind (flow_name,fdev_entry)!= 0)
+    TAO_THROW_ENV (AVStreams::streamOpFailed (),env);
+
+  AVStreams::flowSpec new_flows (this->flows_.length ());
+  for (u_int i=0,j=0 ; i <this->flows_.length (); i++)
+    if (ACE_OS::strcmp (flow_name,this->flows_[i]) != 0)
+      new_flows[j++] = this->flows_[i];
+
+  CORBA::Any flows;
+  flows <<= new_flows;
+  this->flows_ = new_flows;
+  this->define_property ("Flows",
+                         flows,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_MMDevice::remove_fdev");
+  return;
 }
 
 // destructor.
@@ -1498,7 +1154,7 @@ TAO_MMDevice::~TAO_MMDevice (void)
 }
 
 //------------------------------------------------------------------
-// TAO_FlowConnection
+// TAO_FlowConnection 
 //------------------------------------------------------------------
 
 // default constructor.
@@ -1511,169 +1167,147 @@ TAO_FlowConnection::TAO_FlowConnection (void)
 
 // stop this flow.
 void
-TAO_FlowConnection::stop (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::stop (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 // start this flow.
 void
-TAO_FlowConnection::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::start (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 // destroy this flow.
 void
-TAO_FlowConnection::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::destroy (CORBA::Environment &env)
 {
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_UNUSED_ARG (env);
 }
 
 // modify the QoS for this flow.
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::modify_QoS (AVStreams::QoS & new_qos,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (new_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // use the specified flow protocol for this flow.
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::use_flow_protocol (const char * fp_name,
                                        const CORBA::Any & fp_settings,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (fp_settings);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->fp_name_ = (char *)fp_name;
   return 1;
 }
 
-void
+void 
 TAO_FlowConnection::push_event (const AVStreams::streamEvent & the_event,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_event);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::connect_devs (AVStreams::FDev_ptr a_party,
                                   AVStreams::FDev_ptr b_party,
                                   AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (a_party);
   ACE_UNUSED_ARG (b_party);
   ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
-// connect the producer and the consumer
-CORBA::Boolean
+// connect the producer and the consumer 
+CORBA::Boolean 
 TAO_FlowConnection::connect (AVStreams::FlowProducer_ptr flow_producer,
                              AVStreams::FlowConsumer_ptr flow_consumer,
                              AVStreams::QoS & the_qos,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      this->producer_ = flow_producer;
-      this->consumer_ = flow_consumer;
-
-      this->producer_->set_peer (this->_this (ACE_TRY_ENV),
-                                 this->consumer_,
-                                 the_qos,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->consumer_->set_peer (this->_this (ACE_TRY_ENV),
-                                 this->producer_,
-                                 the_qos,
-                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      char *consumer_address =
-        this->consumer_->go_to_listen (the_qos,
-                                       0,// false for is_mcast
-                                       this->producer_,
-                                       this->fp_name_,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->producer_->connect_to_peer (the_qos,
-                                        consumer_address,
-                                        this->fp_name_,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowConnection::connect");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+  this->producer_ = flow_producer;
+  this->consumer_ = flow_consumer;
+
+  this->producer_->set_peer (this->_this (env),
+                             this->consumer_,
+                             the_qos,
+                             env);
+  TAO_CHECK_ENV_RETURN (env,0);
+  
+  this->consumer_->set_peer (this->_this (env),
+                             this->producer_,
+                             the_qos,
+                             env);
+  TAO_CHECK_ENV_RETURN (env,0);
+  
+  char *consumer_address = 
+    this->consumer_->go_to_listen (the_qos,
+                                   0,// false for is_mcast
+                                   this->producer_,
+                                   this->fp_name_,
+                                   env);
+  
+  TAO_CHECK_ENV_RETURN (env,0);
+  this->producer_->connect_to_peer (the_qos,
+                                    consumer_address,
+                                    this->fp_name_,
+                                    env);
+  TAO_CHECK_ENV_RETURN (env,0);
   return 1;
 }
 
 
 CORBA::Boolean
-TAO_FlowConnection::disconnect (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowConnection::disconnect (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return  0;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr flow_producer,
                                   AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->producer_ = flow_producer;
   return 1;
-}
+} 
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::add_consumer (AVStreams::FlowConsumer_ptr flow_consumer,
                                   AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->consumer_ = flow_consumer;
   return 1;
-}
+} 
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowConnection::drop (AVStreams::FlowEndPoint_ptr target,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (target);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // -----------------------------------------------------------------
-// TAO_FlowEndPoint
+// TAO_FlowEndPoint 
 // -----------------------------------------------------------------
 
 //default constructor.
@@ -1686,242 +1320,183 @@ TAO_FlowEndPoint::TAO_FlowEndPoint (void)
 // used by one flowconnection so that multiple connections cant use
 // the same flowendpoint.
 CORBA::Boolean
-TAO_FlowEndPoint::lock (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::lock (CORBA::Environment &env)
 {
   // lock the current flowendpoint
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // unlocks the flowendpoint ,becomes free to be used in another flow.
 void
-TAO_FlowEndPoint::unlock (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::unlock (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 // The start,stop and destroy are to be handled by the application.
 void
-TAO_FlowEndPoint::stop (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::stop (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 void
-TAO_FlowEndPoint::start (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::start (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 }
 
 void
-TAO_FlowEndPoint::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::destroy (CORBA::Environment &env)
 {
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_UNUSED_ARG (env);
 }
 
 AVStreams::StreamEndPoint_ptr
-TAO_FlowEndPoint::related_sep (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::related_sep (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return this->related_sep_;
 }
 
 void
 TAO_FlowEndPoint::related_sep (AVStreams::StreamEndPoint_ptr related_sep,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->related_sep_ = related_sep;
 }
 
 AVStreams::FlowConnection_ptr
-TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::related_flow_connection (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return this->related_flow_connection_;
 }
 
 void
 TAO_FlowEndPoint::related_flow_connection (AVStreams::FlowConnection_ptr related_flow_connection,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->related_flow_connection_ = related_flow_connection;
 }
 
 // returns the connected peer for this flow
 AVStreams::FlowEndPoint_ptr
-TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowEndPoint::get_connected_fep (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return this->peer_fep_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowEndPoint::use_flow_protocol (const char * fp_name,
                                      const CORBA::Any & fp_settings,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (fp_settings);
-  ACE_TRY
-    {
-      // Define the property called FlowProtocol
-      CORBA::Any flowname_property;
-      flowname_property <<= fp_name;
-      this->define_property ("FlowProtocol",
-                             flowname_property,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowEndPoint::use_flow_protocol");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
+  // Define the property called FlowProtocol
+  CORBA::Any flowname_property;
+  flowname_property <<= fp_name;
+  this->define_property ("FlowProtocol",
+                         flowname_property,
+                         env);
+  TAO_CHECK_ENV_RETURN (env,0);
   return 1;
 }
 
 void
 TAO_FlowEndPoint::set_format (const char * format,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      // make this a property so that is_fep_compatible can query this and
-      // check if 2 flowendpoints are compatible.
-      CORBA::Any format_val;
-      format_val <<= format;
-      this->define_property ("Format",
-                             format_val,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowEndpoint::set_format");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  // make this a property so that is_fep_compatible can query this and
+  // check if 2 flowendpoints are compatible.
+  CORBA::Any format_val;
+  format_val <<= format;
+  this->define_property ("Format",
+                         format_val,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_FlowEndPoint::set_format");
 }
 
 void
 TAO_FlowEndPoint::set_dev_params (const CosPropertyService::Properties & new_settings,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      CORBA::Any DevParams_property;
-      DevParams_property <<= new_settings;
-      this->define_property ("DevParams",
-                             DevParams_property,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowEndPoint::set_dev_params");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Any DevParams_property;
+  DevParams_property <<= new_settings;
+  this->define_property ("DevParams",
+                         DevParams_property,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_FlowEndPoint::set_dev_params");
+  
 }
 
 void
 TAO_FlowEndPoint::set_protocol_restriction (const AVStreams::protocolSpec & the_spec,
-                                            CORBA::Environment &ACE_TRY_ENV)
-
-
+                                            CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      CORBA::Any AvailableProtocols_property;
-      AvailableProtocols_property <<= the_spec;
-      this->define_property ("AvailableProtocols",
-                             AvailableProtocols_property,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowEndpoint::set_protocol_restriction");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Any AvailableProtocols_property;
+  AvailableProtocols_property <<= the_spec;
+  this->define_property ("AvailableProtocols",
+                         AvailableProtocols_property,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_FlowEndPoint::set_protocol_restriction");
+
 }
 
 CORBA::Boolean
 TAO_FlowEndPoint::is_fep_compatible (AVStreams::FlowEndPoint_ptr peer_fep,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      // check whether the passed flowendpoint is compatible with this flowendpoint.
-      // should we check for the availableFormats and choose one format.
-      // get my format value
-      CORBA::Any_ptr format_ptr;
-      CORBA::String my_format,peer_format;
-      format_ptr = this->get_property_value ("Format",
-                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (format_ptr != 0)
-        *format_ptr >>= my_format;
-      else
-        // property is not defined
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
-
-      // get my peer's format value
+                                     CORBA::Environment &env)
+{
+  // check whether the passed flowendpoint is compatible with this flowendpoint.
+  // should we check for the availableFormats and choose one format.
+  // get my format value
+  CORBA::Any_ptr format_ptr;
+  CORBA::String my_format,peer_format;
+  format_ptr = this->get_property_value ("Format",
+                                         env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_FlowEndPoint::is_fep_compatible",0);
+  if (format_ptr != 0)
+    *format_ptr >>= my_format;
+  else
+    // property is not defined 
+    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
+    
+  // get my peer's format value
+
+  format_ptr = peer_fep->get_property_value ("Format",
+                                              env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_FlowEndPoint::is_fep_compatible",0);
+  if (format_ptr != 0)
+    *format_ptr >>= peer_format;
+  else
+    // property is not defined 
+    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
 
-      format_ptr = peer_fep->get_property_value ("Format",
-                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (format_ptr != 0)
-        *format_ptr >>= peer_format;
-      else
-        // property is not defined
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
-
-      // can we use strcmp??
-      if (ACE_OS::strcmp (my_format,peer_format) != 0)
-        return 0;
-      // since formats are same, check for a common protocol
-      CORBA::Any* AvailableProtocols_ptr;
-      AVStreams::protocolSpec *my_protocolSpec,*peer_protocolSpec;
-
-      AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols",
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (AvailableProtocols_ptr != 0)
-        *AvailableProtocols_ptr >>= my_protocolSpec;
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
+  // can we use strcmp??
+  if (ACE_OS::strcmp (my_format,peer_format) != 0)
+    return 0;
+  // since formats are same, check for a common protocol
+  CORBA::Any* AvailableProtocols_ptr;
+  AVStreams::protocolSpec *my_protocolSpec,*peer_protocolSpec;
+  
+  AvailableProtocols_ptr = this->get_property_value ("AvailableProtocols",
+                                                     env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_FlowEndPoint::is_fep_compatible",0);
+  if (AvailableProtocols_ptr != 0)
+    *AvailableProtocols_ptr >>= my_protocolSpec;
+  else
+    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) TAO_FlowEndPoint::is_fep_compatible"),0);
+  
+  AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols",
+                                                               env);
+  TAO_CHECK_ENV_PRINT_RETURN (env,"TAO_FlowEndPoint::AvailableProtocols",0);
+  if (AvailableProtocols_ptr != 0)
+    *AvailableProtocols_ptr >>= peer_protocolSpec;
 
-      AvailableProtocols_ptr = peer_fep->get_property_value ("AvailableProtocols",
-                                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (AvailableProtocols_ptr != 0)
-        *AvailableProtocols_ptr >>= peer_protocolSpec;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowEndPoint::is_fep_compatible");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
   return 1;
 }
 
@@ -1929,61 +1504,44 @@ CORBA::Boolean
 TAO_FlowEndPoint::set_peer (AVStreams::FlowConnection_ptr the_fc,
                             AVStreams::FlowEndPoint_ptr the_peer_fep,
                             AVStreams::QoS & the_qos,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_fc);
   ACE_UNUSED_ARG (the_peer_fep);
   ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   this->peer_fep_ = the_peer_fep;
   return 1;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 TAO_FlowEndPoint::set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                   AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                   AVStreams::QoS & the_qos,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_fc);
   ACE_UNUSED_ARG (a_mcastconfigif);
   ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
-char *
-TAO_FlowEndPoint::go_to_listen (AVStreams::QoS & the_qos,
-                               CORBA::Boolean is_mcast,
-                               AVStreams::FlowProducer_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->handle_go_to_listen (the_qos,is_mcast,peer,flowProtocol,ACE_TRY_ENV);
-}
+// ------------------------------------------------------------
+// TAO_FlowProducer class
+// ------------------------------------------------------------
 
-char *
-TAO_FlowEndPoint::handle_go_to_listen (AVStreams::QoS & the_qos,
-                               CORBA::Boolean is_mcast,
-                               AVStreams::FlowProducer_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &ACE_TRY_ENV)
+//default constructor
+TAO_FlowProducer::TAO_FlowProducer (void)
 {
-  ACE_UNUSED_ARG (the_qos);
-  ACE_UNUSED_ARG (is_mcast);
-  ACE_UNUSED_ARG (peer);
-  ACE_UNUSED_ARG (flowProtocol);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  return 0;
 }
 
 CORBA::Boolean
-TAO_FlowEndPoint::connect_to_peer (AVStreams::QoS & the_qos,
-                                   const char * address,
-                                   const char * use_flow_protocol,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_FlowProducer::connect_to_peer (AVStreams::QoS & the_qos,
+                                                  const char * address,
+                                                  const char * use_flow_protocol,
+                                                  CORBA::Environment &env)
 {
   // Right now since the A/V framework doesnt bother about the
   // protocols we leave it to the application to handle the connection
@@ -1991,86 +1549,68 @@ TAO_FlowEndPoint::connect_to_peer (AVStreams::QoS & the_qos,
   // interaction like UDP and TCP this will be handled by the
   // framework.
 
-  return this->handle_connect_to_peer (the_qos,address,use_flow_protocol,ACE_TRY_ENV);
+  return this->handle_connect_to_peer (the_qos,address,use_flow_protocol,env);
 }
 
 CORBA::Boolean
-TAO_FlowEndPoint::handle_connect_to_peer (AVStreams::QoS & the_qos,
+TAO_FlowProducer::handle_connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
                                           const char * use_flow_protocol,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (address);
   ACE_UNUSED_ARG (use_flow_protocol);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 
-// ------------------------------------------------------------
-// TAO_FlowProducer class
-// ------------------------------------------------------------
-
-//default constructor
-TAO_FlowProducer::TAO_FlowProducer (void)
-{
-}
-
 //  multicast is currently not supported
 char *
 TAO_FlowProducer::connect_mcast (AVStreams::QoS & the_qos,
                                            CORBA::Boolean_out is_met,
                                            const char * address,
                                            const char * use_flow_protocol,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
   ACE_UNUSED_ARG (address);
   ACE_UNUSED_ARG (use_flow_protocol);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // gets the reverse channel for feedback.
 char *
 TAO_FlowProducer::get_rev_channel (const char * pcol_name,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (pcol_name);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 // sets the key for this flow.
 void
 TAO_FlowProducer::set_key (const AVStreams::key & the_key,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      CORBA::Any anyval;
-      anyval <<= the_key;
-      this->define_property ("PublicKey",
-                             anyval,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_FlowProducer::set_key");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  CORBA::Any anyval;
+  anyval <<= the_key;
+  this->define_property ("PublicKey",
+                         anyval,
+                         env);
+  TAO_CHECK_ENV_PRINT_RETURN_VOID (env,"TAO_FlowProducer::set_key");
 }
 
 // source id to be used to distinguish this source from others.
 void
 TAO_FlowProducer::set_source_id (CORBA::Long source_id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   this->source_id_ = source_id;
 }
 
@@ -2084,6 +1624,32 @@ TAO_FlowConsumer::TAO_FlowConsumer (void)
 {
 }
 
+char * 
+TAO_FlowConsumer::go_to_listen (AVStreams::QoS & the_qos,
+                               CORBA::Boolean is_mcast,
+                               AVStreams::FlowProducer_ptr peer,
+                               char *& flowProtocol,
+                               CORBA::Environment &env)
+{
+  return this->handle_go_to_listen (the_qos,is_mcast,peer,flowProtocol,env);
+}
+
+char * 
+TAO_FlowConsumer::handle_go_to_listen (AVStreams::QoS & the_qos,
+                               CORBA::Boolean is_mcast,
+                               AVStreams::FlowProducer_ptr peer,
+                               char *& flowProtocol,
+                               CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (the_qos);
+  ACE_UNUSED_ARG (is_mcast);
+  ACE_UNUSED_ARG (peer);
+  ACE_UNUSED_ARG (flowProtocol);
+  ACE_UNUSED_ARG (env);
+
+  return 0;
+}
+
 // ------------------------------------------------------------
 // TAO_FDev
 // ------------------------------------------------------------
@@ -2100,24 +1666,24 @@ TAO_FDev::create_producer (AVStreams::FlowConnection_ptr the_requester,
                            AVStreams::QoS & the_qos,
                            CORBA::Boolean_out met_qos,
                            char *& named_fdev,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // call the bridge method.
   this->producer_ = this->make_producer (the_requester,
                                          the_qos,
                                          met_qos,
                                          named_fdev,
-                                         ACE_TRY_ENV);
+                                         env);
   return this->producer_;
 }
 
 // hook for the applications to override the creation process.
 AVStreams::FlowProducer_ptr
 TAO_FDev::make_producer (AVStreams::FlowConnection_ptr the_requester,
-                         AVStreams::QoS & the_qos,
-                         CORBA::Boolean_out met_qos,
-                         char *& named_fdev,
-                         CORBA::Environment &ACE_TRY_ENV)
+                           AVStreams::QoS & the_qos,
+                           CORBA::Boolean_out met_qos,
+                           char *& named_fdev,
+                           CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
@@ -2129,7 +1695,7 @@ TAO_FDev::make_producer (AVStreams::FlowConnection_ptr the_requester,
   ACE_NEW_RETURN (producer,
                   TAO_FlowProducer,
                   0);
-  return producer->_this (ACE_TRY_ENV);
+  return producer->_this (env);
 }
 
 // hook for the applications to override the consumer creation.
@@ -2138,7 +1704,7 @@ TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr the_requester,
                          AVStreams::QoS & the_qos,
                          CORBA::Boolean_out met_qos,
                          char *& named_fdev,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (the_requester);
   ACE_UNUSED_ARG (the_qos);
@@ -2150,7 +1716,7 @@ TAO_FDev::make_consumer (AVStreams::FlowConnection_ptr the_requester,
   ACE_NEW_RETURN (consumer,
                   TAO_FlowConsumer,
                   0);
-  return consumer->_this (ACE_TRY_ENV);
+  return consumer->_this (env);
 }
 
 AVStreams::FlowConsumer_ptr
@@ -2158,13 +1724,13 @@ TAO_FDev::create_consumer (AVStreams::FlowConnection_ptr the_requester,
                            AVStreams::QoS & the_qos,
                            CORBA::Boolean_out met_qos,
                            char *& named_fdev,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   this->consumer_ = this->make_consumer (the_requester,
                                          the_qos,
                                          met_qos,
                                          named_fdev,
-                                         ACE_TRY_ENV);
+                                         env);
   return this->consumer_;
 }
 
@@ -2173,12 +1739,12 @@ AVStreams::FlowConnection_ptr
 TAO_FDev::bind (AVStreams::FDev_ptr peer_device,
                 AVStreams::QoS & the_qos,
                 CORBA::Boolean_out is_met,
-                CORBA::Environment &ACE_TRY_ENV)
+                CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (peer_device);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
@@ -2187,209 +1753,29 @@ AVStreams::FlowConnection_ptr
 TAO_FDev::bind_mcast (AVStreams::FDev_ptr first_peer,
                       AVStreams::QoS & the_qos,
                       CORBA::Boolean_out is_met,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (first_peer);
   ACE_UNUSED_ARG (the_qos);
   ACE_UNUSED_ARG (is_met);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
   return 0;
 }
 
 void
-TAO_FDev::destroy (AVStreams::FlowEndPoint_ptr /* the_ep */,
-                   const char * /* fdev_name */,
-                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-//------------------------------------------------------------
-// TAO_Tokenizer
-//------------------------------------------------------------
-TAO_Tokenizer::TAO_Tokenizer (char *string, char delimiter)
-  :token_array_ (10),
-   count_ (0)
-{
-  this->parse (string,delimiter);
-}
-
-int
-TAO_Tokenizer::parse (char *string,char delimiter)
-{
-  char delimiter_str [2] = {0,0};
-  delimiter_str [0] = delimiter;
-  char *token = ACE_OS::strtok (string,delimiter_str);
-  int count=0,result;
-  while (token != 0)
-    {
-      result = this->token_array_.set (token,count);
-      if (result == -1)
-        {
-          this->token_array_.size (this->token_array_.size ()*2);
-          result = this->token_array_.set (token,count);
-          if (result == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,"TAO_Tokenizer::parse error"),-1);
-        }
-      token = ACE_OS::strtok (string,0);
-      count++;
-    }
-  this->num_tokens_ = count;
-  return 0;
-}
-
-char*
-TAO_Tokenizer::token (void)
-{
-  if (count_ < num_tokens_)
-    return this->token_array_[this->count_++];
-  else
-    return 0;
-}
-
-int
-TAO_Tokenizer::num_tokens (void)
-{
-  return this->num_tokens_;
-}
-
-char *
-TAO_Tokenizer::operator [] (size_t index) const
-{
-  if (index >= this->num_tokens_)
-    return 0;
-  return this->token_array_[index];
-}
-
-//------------------------------------------------------------
-// TAO_FlowSpec_Entry
-//------------------------------------------------------------
-
-// constructor.
-TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
-  :sfp_ (0),
-   address_ (0),
-   format_ (0),
-   direction_ (TAO_AV_INVALID)
-{
-}
-
-// Destructor.
-TAO_FlowSpec_Entry::~TAO_FlowSpec_Entry (void)
-{
-}
-
-int
-TAO_FlowSpec_Entry::direction (void)
-{
-  return this->direction_;
-}
-
-TAO_SFP*
-TAO_FlowSpec_Entry::flow_protocol (void)
-{
-  return this->sfp_;
-}
-
-ACE_Addr*
-TAO_FlowSpec_Entry::carrier_protocol (void)
-{
-  return address_;
-}
-
-char*
-TAO_FlowSpec_Entry::format (void)
-{
-  return this->format_;
-}
-
-int
-TAO_Forward_FlowSpec_Entry::parse (char *flowSpec_entry)
-{
-  TAO_Tokenizer tokenizer (flowSpec_entry,'\\');
-  if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0)
-    return -1;
-  this->set_direction (tokenizer [TAO_AV_DIRECTION]);
-  if (this->parse_address (tokenizer [TAO_AV_ADDRESS]) < 0)
-    return -1;
-  this->format_ = tokenizer [TAO_AV_FORMAT];
-  this->flowname_ = tokenizer [TAO_AV_FLOWNAME];
-  return 0;
-}
-
-int
-TAO_FlowSpec_Entry::set_direction (char *direction)
-{
-  if (ACE_OS::strcasecmp (direction,"in") == 0)
-    this->direction_ = TAO_AV_DIR_IN;
-  else if (ACE_OS::strcasecmp (direction,"out") == 0)
-    this->direction_ = TAO_AV_DIR_OUT;
-  else if (ACE_OS::strcasecmp (direction,"inout") == 0)
-    this->direction_ = TAO_AV_DIR_INOUT;
-  return 0;
-}
-
-int
-TAO_FlowSpec_Entry::parse_flow_protocol_string (char *flow_string)
+TAO_FDev::destroy (AVStreams::FlowEndPoint_ptr the_ep,
+                   const char * fdev_name,
+                   CORBA::Environment &env)
 {
-  if (ACE_OS::strncasecmp (flow_string,"sfp",3) == 0)
-    {
-      // do some flow protocol processing.
-    }
-  return 0;
-}
-
-int
-TAO_FlowSpec_Entry::parse_address (char *address)
-{
-  TAO_Tokenizer protocol_tokenizer (address,'=');
-  this->protocol_ = protocol_tokenizer[0];
-  TAO_Tokenizer address_tokenizer (protocol_tokenizer[1],';');
-  char addr[BUFSIZ];
-  ACE_OS::sprintf (addr,"%s:%s",address_tokenizer[0],address_tokenizer[1]);
-  if (ACE_OS::strncasecmp (this->protocol_,"AAL",3) == 0)
-    ACE_DEBUG ((LM_DEBUG,"ATM support not added yet\n"));
-//      ACE_NEW_RETURN (this->address_,
-//                      ACE_ATM_Addr (addr),
-//                      -1);
-  else // we assume everything else is INET addr.
-    {
-      ACE_NEW_RETURN (this->address_,
-                      ACE_INET_Addr (addr),
-                      -1);
-    }
-  return 0;
-}
-
-int
-TAO_Reverse_FlowSpec_Entry::parse (char *flowSpec_entry)
-{
-  TAO_Tokenizer tokenizer (flowSpec_entry,'\\');
-  if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0)
-    return -1;
-  this->set_direction (tokenizer [TAO_AV_DIRECTION]);
-  if (this->parse_address (tokenizer [TAO_AV_ADDRESS]) < 0)
-    return -1;
-  this->format_ = tokenizer [TAO_AV_FORMAT];
-  this->flowname_ = tokenizer [TAO_AV_FLOWNAME];
-  return 0;
+  ACE_UNUSED_ARG (the_ep);
+  ACE_UNUSED_ARG (fdev_name);
+  ACE_UNUSED_ARG (env);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA::Object_ptr>;
+template class ACE_Hash<TAO_String_Hash_Key>;
+template class ACE_Equal_To<TAO_String_Hash_Key>;
 template class ACE_Hash_Map_Manager<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>;
@@ -2397,10 +1783,10 @@ template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CORBA::Object_ptr,
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
-template class ACE_Array<char*>;
-template class ACE_Array_Base<char*>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,CORBA::Object_ptr>
+#pragma instantiate ACE_Hash<TAO_String_Hash_Key>
+#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
@@ -2408,6 +1794,4 @@ template class ACE_Array_Base<char*>;
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::Object_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Array<char*>
-#pragma instantiate ACE_Array_Base<char*>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index abcf1e9568a..007dec183ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -20,45 +20,35 @@
 #ifndef AVSTREAMS_I_H
 #define AVSTREAMS_I_H
 
-#include "ace/SOCK_Dgram_Mcast.h"
-#include "ace/ATM_Addr.h"
-#include "ace/Containers_T.h"
-#include "ace/Process.h"
-
 #include "orbsvcs/orbsvcs_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 #include "orbsvcs/AVStreamsS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
+#include "ace/Process.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
 #include "orbsvcs/Null_MediaCtrlS.h"
+
 #include "orbsvcs/Trader/Trader.h"
 // for the Hash_Map helper classes.
-
-#include "sfp.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export AV_Null_MediaCtrl
-  : public virtual POA_Null_MediaCtrl,
-    public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export AV_Null_MediaCtrl : public virtual POA_Null_MediaCtrl
 {
-public:
+  public:
   AV_Null_MediaCtrl (void);
 };
 
 
 class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl 
   : public virtual POA_AVStreams::Basic_StreamCtrl,
-    public virtual TAO_PropertySet,
-    public virtual PortableServer::RefCountServantBase
-// = DESCRIPTION
-//    Base class for StreamCtrl, implements basic stream start
-//    and stop functionality
+           public virtual TAO_PropertySet
+  // = DESCRIPTION
+  //    Base class for StreamCtrl, implements basic stream start
+  //    and stop functionality
 {
  public:
   TAO_Basic_StreamCtrl (void);
@@ -117,8 +107,8 @@ class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
   AVStreams::VDev_var vdev_b_;
   // The Virtual Devices for this stream
 
-  AVStreams::StreamEndPoint_A_var sep_a_;
-  AVStreams::StreamEndPoint_B_var sep_b_;
+  AVStreams::StreamEndPoint_A_var stream_endpoint_a_;
+  AVStreams::StreamEndPoint_B_var stream_endpoint_b_;
   // The Endpoints for this stream
 
   typedef ACE_Hash_Map_Manager <TAO_String_Hash_Key,CORBA::Object_ptr,ACE_Null_Mutex> FlowConnection_Map;
@@ -131,22 +121,9 @@ class TAO_ORBSVCS_Export TAO_Basic_StreamCtrl
   //sequence of flow names.
 };
 
-class TAO_ORBSVCS_Export TAO_Negotiator
-  : public POA_AVStreams::Negotiator,
-    public virtual PortableServer::RefCountServantBase
-{
-public:
-  virtual CORBA::Boolean negotiate (AVStreams::Negotiator_ptr remote_negotiator,
-                                    const AVStreams::streamQoS &qos_spec,
-                                    CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-};
-
-class TAO_MCastConfigIf;
-
 class TAO_ORBSVCS_Export TAO_StreamCtrl
   : public virtual POA_AVStreams::StreamCtrl,
-    public virtual TAO_Basic_StreamCtrl,
-    public virtual PortableServer::RefCountServantBase
+    public virtual TAO_Basic_StreamCtrl
 // = DESCRIPTION
 //    Implementation the A/V StreamCtrl class. this class
 //    is used to control the stream. It should be subclassed
@@ -184,58 +161,11 @@ public:
   virtual void unbind (CORBA::Environment &env = CORBA::Environment::default_environment ());
   // unbind the stream. Same effect as Basic_StreamCtrl::destroy ()
 
-  virtual void unbind_dev (AVStreams::MMDevice_ptr dev,
-                           const AVStreams::flowSpec & the_spec,
-                           CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-  virtual AVStreams::VDev_ptr get_related_vdev (AVStreams::MMDevice_ptr adev,
-                                                AVStreams::StreamEndPoint_out sep,
-                                                CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
-  virtual CORBA::Boolean modify_QoS (AVStreams::streamQoS &new_qos,
-                                     const AVStreams::flowSpec &the_spec,
-                                     CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // Changes the QoS associated with the stream
-  // Empty the_spec means apply operation to all flows
-
   virtual ~TAO_StreamCtrl (void);
-  // Destructor.
+  // Destructor
 
- protected:
-  TAO_MCastConfigIf *mcastconfigif_;
-  AVStreams::MCastConfigIf_ptr mcastconfigif_ptr_;
 };
 
-class TAO_ORBSVCS_Export TAO_MCastConfigIf
-  : public virtual POA_AVStreams::MCastConfigIf,
-    public virtual TAO_PropertySet,
-    public virtual PortableServer::RefCountServantBase
-{
-public:
-  virtual CORBA::Boolean set_peer (CORBA::Object_ptr peer,
-                                   AVStreams::streamQoS & the_qos,
-                                   const AVStreams::flowSpec & the_spec,
-                                   CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
-
-  virtual void configure (const CosPropertyService::Property & a_configuration,
-                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
-
-  virtual void set_initial_configuration (const CosPropertyService::Properties & initial,
-                                          CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
-
-  virtual void set_format (const char * flowName,
-                           const char * format_name,
-                           CORBA::Environment &ACE_TRY_ENV = 
-                           CORBA::Environment::default_environment ()) ;
-
-  virtual void set_dev_params (const char * flowName,
-                               const CosPropertyService::Properties & new_params,
-                               CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ()) ;
-
-protected:
-  ACE_SOCK_Dgram_Mcast sock_mcast_;
-  // Multicast socket.
-};
 
 class TAO_ORBSVCS_Export TAO_Base_StreamEndPoint
 // = DESCRIPTION
@@ -287,10 +217,9 @@ public:
 };
 
 class TAO_ORBSVCS_Export TAO_StreamEndPoint
-  : public virtual POA_AVStreams::StreamEndPoint,
-    public virtual TAO_Base_StreamEndPoint,
-    public virtual TAO_PropertySet,
-    public virtual PortableServer::RefCountServantBase
+  : public virtual POA_AVStreams::StreamEndPoint, // The POA class
+           public virtual TAO_Base_StreamEndPoint,
+    public virtual TAO_PropertySet
 {
   // = DESCRIPTION
   //    The Stream EndPoint. Used to implement one endpoint of a stream
@@ -311,6 +240,7 @@ public:
                         CORBA::Environment &env = CORBA::Environment::default_environment ());
   // Destroy the stream, Empty the_spec means, for all the flows
 
+
   virtual CORBA::Boolean connect (AVStreams::StreamEndPoint_ptr responder,
                                   AVStreams::streamQoS &qos_spec,
                                   const AVStreams::flowSpec &the_spec,
@@ -392,8 +322,7 @@ private:
 class TAO_ORBSVCS_Export TAO_Client_StreamEndPoint :
   public virtual POA_AVStreams::StreamEndPoint_A,
   public virtual TAO_StreamEndPoint,
-  public virtual TAO_Client_Base_StreamEndPoint,
-  public virtual PortableServer::RefCountServantBase
+  public virtual TAO_Client_Base_StreamEndPoint
 {
   // = DESCRIPTION
   //     The "A" side of a streamendpoint
@@ -431,8 +360,7 @@ public:
 class TAO_ORBSVCS_Export TAO_Server_StreamEndPoint :
   public virtual POA_AVStreams::StreamEndPoint_B,
   public virtual TAO_StreamEndPoint,
-  public virtual TAO_Server_Base_StreamEndPoint,// Abstract interface
-  public virtual PortableServer::RefCountServantBase
+  public virtual TAO_Server_Base_StreamEndPoint // Abstract interface
 {
   // = DESCRIPTION
   //     The "B" side of a streamendpoint
@@ -464,8 +392,7 @@ public:
 
 class TAO_ORBSVCS_Export TAO_VDev
   :public virtual TAO_PropertySet,
-   public virtual POA_AVStreams::VDev,
-   public virtual PortableServer::RefCountServantBase
+   public virtual POA_AVStreams::VDev
 // = DESCRIPTION
 //    Implements the VDev interface. One of these is created per connection,
 //    and represents device-specific parameters
@@ -514,7 +441,7 @@ class TAO_ORBSVCS_Export TAO_VDev
   virtual CORBA::Boolean set_media_ctrl (CORBA::Object_ptr media_ctrl,
                                          CORBA::Environment &env = CORBA::Environment::default_environment ());
   // hook called after set_peer is done to set the media ctrl of the peer vdev.
-
+ private:
   AVStreams::StreamCtrl_var streamctrl_;
   // My stream controller
 
@@ -525,9 +452,8 @@ class TAO_ORBSVCS_Export TAO_VDev
 class TAO_AV_Endpoint_Strategy;
 
 class TAO_ORBSVCS_Export TAO_MMDevice
-  :public virtual POA_AVStreams::MMDevice,
-   public TAO_PropertySet,
-   public virtual PortableServer::RefCountServantBase
+  : public  TAO_PropertySet,
+            public  POA_AVStreams::MMDevice
 // = DESCRIPTION
 //     Implements a factory to create Endpoints and VDevs
 {
@@ -593,7 +519,7 @@ class TAO_ORBSVCS_Export TAO_MMDevice
   virtual ~TAO_MMDevice (void);
   // Destructor
 
- protected:
+private:
   u_int flow_count_;
   // Count of the number of flows in this MMDevice , used to
   // generate unique names for the flows.
@@ -611,10 +537,8 @@ class TAO_ORBSVCS_Export TAO_MMDevice
 class TAO_FlowConsumer;
 class TAO_FlowProducer;
 
-class TAO_ORBSVCS_Export TAO_FlowConnection
- : public virtual POA_AVStreams::FlowConnection,
-   public TAO_PropertySet,
-   public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_FlowConnection : public TAO_PropertySet,
+                                                      public POA_AVStreams::FlowConnection
 {
   //  =TITLE
   //     Class to manage a flow connection.
@@ -678,7 +602,7 @@ public:
                                CORBA::Environment &env = CORBA::Environment::default_environment ());
   // drops a flow endpoint from the flow.
 
-protected:
+private:
   AVStreams::FlowProducer *producer_;
   // The producer of this flow.
   AVStreams::FlowConsumer *consumer_;
@@ -689,8 +613,7 @@ protected:
 
 class TAO_ORBSVCS_Export TAO_FlowEndPoint :
   public virtual POA_AVStreams::FlowEndPoint,
-  public virtual TAO_PropertySet,
-  public virtual PortableServer::RefCountServantBase
+         public virtual TAO_PropertySet
 {
   // = DESCRIPTION
   //     This class is used per flow e.g video flow and an audio flow
@@ -772,15 +695,30 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
                                    AVStreams::FlowEndPoint_ptr the_peer_fep,
                                    AVStreams::QoS & the_qos,
                                    CORBA::Environment &env = CORBA::Environment::default_environment ());
-  // sets the peer flowendpoint.
+  //sets the peer flowendpoint.
 
   virtual CORBA::Boolean set_Mcast_peer (AVStreams::FlowConnection_ptr the_fc,
                                          AVStreams::MCastConfigIf_ptr a_mcastconfigif,
                                          AVStreams::QoS & the_qos,
                                          CORBA::Environment &env =
                                          CORBA::Environment::default_environment ());
-  // sets the multicast peer flowendpoint, not implemented.
+  ///sets the multicast peer flowendpoint, not implemented.
+private:
+  AVStreams::StreamEndPoint_ptr related_sep_;
+  // The related streamendpoint.
+  AVStreams::FlowConnection_ptr related_flow_connection_;
+  // The related flow connection reference
+  AVStreams::FlowEndPoint_ptr peer_fep_;
+  // The peer flowendpoint reference.
+};
 
+class TAO_ORBSVCS_Export TAO_FlowProducer:
+  public virtual POA_AVStreams::FlowProducer,
+         public virtual TAO_FlowEndPoint
+{
+  public:
+  TAO_FlowProducer (void);
+  // default constructor
 
   virtual CORBA::Boolean connect_to_peer (AVStreams::QoS & the_qos,
                                           const char * address,
@@ -797,42 +735,6 @@ class TAO_ORBSVCS_Export TAO_FlowEndPoint :
 
   // hook method to be overridden by the application to handle the connection request.
 
-  virtual char * go_to_listen (AVStreams::QoS & the_qos,
-                               CORBA::Boolean is_mcast,
-                               AVStreams::FlowProducer_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &env =
-                               CORBA::Environment::default_environment
-                               ());
-
-  // listen request from the peer.
-
-  virtual char * handle_go_to_listen (AVStreams::QoS & the_qos,
-                               CORBA::Boolean is_mcast,
-                               AVStreams::FlowProducer_ptr peer,
-                               char *& flowProtocol,
-                               CORBA::Environment &env =
-                               CORBA::Environment::default_environment
-                               ());
-  // applications should override this method.
-
-protected:
-  AVStreams::StreamEndPoint_ptr related_sep_;
-  // The related streamendpoint.
-  AVStreams::FlowConnection_ptr related_flow_connection_;
-  // The related flow connection reference
-  AVStreams::FlowEndPoint_ptr peer_fep_;
-  // The peer flowendpoint reference.
-};
-
-class TAO_ORBSVCS_Export TAO_FlowProducer:
-  public virtual POA_AVStreams::FlowProducer,
-  public virtual TAO_FlowEndPoint,
-  public virtual PortableServer::RefCountServantBase
-{
-  public:
-  TAO_FlowProducer (void);
-  // default constructor
   virtual char * connect_mcast (AVStreams::QoS & the_qos,
                                 CORBA::Boolean_out is_met,
                                 const char * address,
@@ -856,27 +758,43 @@ class TAO_ORBSVCS_Export TAO_FlowProducer:
   // sets the source id of this flow producer so that it can be used
   // to distinguish this producer from others in the multicast case.
 
-protected:
+  private:
   CORBA::Long source_id_;
   // source id of this producer.
 };
 
 class TAO_ORBSVCS_Export TAO_FlowConsumer :
   public virtual POA_AVStreams::FlowConsumer,
-  public virtual TAO_FlowEndPoint,
-  public virtual PortableServer::RefCountServantBase
+         public virtual TAO_FlowEndPoint
 {
   public:
   TAO_FlowConsumer (void);
   // default constructor.
 
+  virtual char * go_to_listen (AVStreams::QoS & the_qos,
+                               CORBA::Boolean is_mcast,
+                               AVStreams::FlowProducer_ptr peer,
+                               char *& flowProtocol,
+                               CORBA::Environment &env =
+                               CORBA::Environment::default_environment
+                               ());
+
+  // listen request from the peer.
+
+  virtual char * handle_go_to_listen (AVStreams::QoS & the_qos,
+                               CORBA::Boolean is_mcast,
+                               AVStreams::FlowProducer_ptr peer,
+                               char *& flowProtocol,
+                               CORBA::Environment &env =
+                               CORBA::Environment::default_environment
+                               ());
+  // applications should override this method.
 
 };
 
 class TAO_ORBSVCS_Export TAO_FDev :
   public virtual POA_AVStreams::FDev,
-  public virtual TAO_PropertySet,
-  public virtual PortableServer::RefCountServantBase
+         public virtual TAO_PropertySet
 {
   public:
   TAO_FDev (void);
@@ -930,15 +848,14 @@ class TAO_ORBSVCS_Export TAO_FDev :
                         CORBA::Environment::default_environment ());
   // destroys this FDev.
 
-protected:
+  private:
   AVStreams::FlowProducer_ptr producer_;
   AVStreams::FlowConsumer_ptr consumer_;
   // references to the created producers and consumers.
 };
 
 class TAO_ORBSVCS_Export TAO_MediaControl
-  :public virtual POA_AVStreams::MediaControl,
-   public virtual PortableServer::RefCountServantBase
+  :public virtual POA_AVStreams::MediaControl
 {
   // = TITLE
   //     Abstract Mediacontrol class.
@@ -971,127 +888,4 @@ class TAO_ORBSVCS_Export TAO_MediaControl
 
 };
 
-class TAO_ORBSVCS_Export TAO_Tokenizer
-{
-public:
-  TAO_Tokenizer (char *string,char delimiter);
-  // constructor.
-
-  int parse (char *string,char delimiter);
-  // parses the string and tokenizes it.
-
-  char *token (void);
-  // Returns the next token.
-  
-  int num_tokens (void);
-  // Number of tokens.
-
-  char *operator [] (size_t index) const;
-
-protected:
-  ACE_Array<char*> token_array_;
-  size_t count_;
-  size_t num_tokens_;
-};
-
-class TAO_ORBSVCS_Export TAO_FlowSpec_Entry
-{
-public:
-  // = TITLE
-  //     An helper entry class in the flow spec sequence passed to bind_devs.
-  enum Direction
-  {
-    TAO_AV_INVALID = -1, 
-    TAO_AV_DIR_IN = 0, 
-    TAO_AV_DIR_OUT = 1, 
-    TAO_AV_DIR_INOUT = 2};
-
-  TAO_FlowSpec_Entry (void);
-  // constructor.
-
-  virtual int parse (char* flowSpec_entry) = 0;
-  // construct the entry from a string specified by the flowSpec grammar.
-
-  virtual ~TAO_FlowSpec_Entry (void);
-  // virtual destructor.
-
-  virtual int direction (void);
-  
-  virtual TAO_SFP* flow_protocol (void);
-  // Accessor to the flow protocol.
-
-  virtual ACE_Addr *carrier_protocol (void);
-  // carrier protocol.
-  
-  virtual char *format (void);
-  // format to be used for this flow.
-
-protected:
-  int parse_flow_protocol_string (char *flow_options_string);
-  // parses the flow protocol string with tokens separated by :
-  
-  int set_direction (char *direction_string);
-  // sets the direction flag.
-  
-  int parse_address (char *format_string);
-  // sets the address for this flow.
-
-  TAO_SFP *sfp_;
-  // reference to the flowprotocol implementation.
-
-  ACE_Addr *address_;
-  // Addr information for the carrier protocol.
-  
-  char *format_;
-  // format string.
-
-  Direction direction_;
-  // Direction of this flow.
-  
-  char *flowname_;
-  // name of this flow.
-  
-  char *protocol_;
-  // name of the protocol used.
-};
-
-class TAO_ORBSVCS_Export TAO_Forward_FlowSpec_Entry
-  :public TAO_FlowSpec_Entry
-{
-public:
-  enum Position {TAO_AV_FLOWNAME = 0,
-                 TAO_AV_DIRECTION = 1,
-                 TAO_AV_FORMAT = 2,
-                 TAO_AV_FLOW_PROTOCOL = 3,
-                 TAO_AV_ADDRESS = 4};
-
-  virtual int parse (char* flowSpec_entry);
-  // construct the entry from a string specified by the flowSpec grammar.
-};
-
-class TAO_ORBSVCS_Export TAO_Reverse_FlowSpec_Entry
-  :public TAO_FlowSpec_Entry
-{
-public:
-  enum Position {TAO_AV_FLOWNAME = 0,
-                 TAO_AV_ADDRESS = 1,
-                 TAO_AV_FLOW_PROTOCOL = 2,
-                 TAO_AV_DIRECTION = 3,
-                 TAO_AV_FORMAT = 4};
-
-  virtual int parse (char* flowSpec_entry);
-  // construct the entry from a string specified by the flowSpec grammar.
-};  
-
-// class TAO_ORBSVCS_Export TAO_AV_QoS
-// {
-// public:
-//   TAO_AV_QoS (void);
-//   // constructor.
-
-//   int convert (const AVStreams::streamQoS &application_qos,
-//                AVStreams::streamQoS &network_qos);
-//   // converts the application level QoS to Network-level QoS.
-// };
-
 #endif /* AVSTREAMS_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
index 616552b1f05..654098b048a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#include "Endpoint_Strategy.h"
+#include "orbsvcs/AV/Endpoint_Strategy.h"
 
 ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
 
@@ -151,107 +151,87 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                        "remove"),
                       -1);
   
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY 
     {
       // Get ourselves a Naming service
-      this->bind_to_naming_service (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->bind_to_naming_service (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Get the stream endpoint created by the child from the naming service
-      this->get_stream_endpoint (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->get_stream_endpoint (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Get the Vdev created by the child from the naming service
-      this->get_vdev (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->get_vdev (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::activate");
+      TAO_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate");
       return -1;
     }      
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
+
   return 0;
 }
 
 // Get ourselves a Naming service reference
 int
-TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      if (CORBA::is_nil (this->naming_context_.in ()) == 0)
-        return 0;
-
-      CORBA::Object_var naming_obj =
-        TAO_ORB_Core_instance ()->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);
-      this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::bind_to_naming_service");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  if (CORBA::is_nil (this->naming_context_.in ()) == 0)
+    return 0;
+
+  CORBA::Object_var naming_obj =
+    TAO_ORB_Core_instance ()->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);
+  this->naming_context_ =
+    CosNaming::NamingContext::_narrow (naming_obj.in (),
+                                       env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
   return 0;
 }
 
 // Get the VDev created in the child process from the namingservice
 int
-TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy::get_vdev (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      char vdev_name [BUFSIZ];
-      ACE_OS::sprintf (vdev_name,
-                       "%s:%s:%d",
-                       "VDev",
-                       this->host_,
-                       this->pid_);
-
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name));
-
-      // Create the name
-      CosNaming::Name VDev_Name (1);
-      VDev_Name.length (1);
-      VDev_Name [0].id = CORBA::string_dup (vdev_name);
-
-      // Get the CORBA::Object
-      CORBA::Object_var vdev =
-        this->naming_context_->resolve (VDev_Name,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow it
-      this->vdev_ =
-        AVStreams::VDev::_narrow (vdev.in (),
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Check if valid
-      if (CORBA::is_nil (this->vdev_))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy::get_vdev");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  char vdev_name [BUFSIZ];
+  ACE_OS::sprintf (vdev_name,
+                   "%s:%s:%d",
+                   "VDev",
+                   this->host_,
+                   this->pid_);
+
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name));
+
+  // Create the name
+  CosNaming::Name VDev_Name (1);
+  VDev_Name.length (1);
+  VDev_Name [0].id = CORBA::string_dup (vdev_name);
+
+  // Get the CORBA::Object
+  CORBA::Object_var vdev =
+    this->naming_context_->resolve (VDev_Name,
+                             env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  // Narrow it
+  this->vdev_ =
+    AVStreams::VDev::_narrow (vdev.in (),
+                              env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  // Check if valid
+  if (CORBA::is_nil (this->vdev_))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
+                      -1);
   return 0;
 }
 
@@ -291,50 +271,40 @@ TAO_AV_Endpoint_Process_Strategy_A::create_A (AVStreams::StreamEndPoint_A_ptr &s
 
 // Gets the stream endpoint object reference from the naming service
 int
-TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      char stream_endpoint_name[BUFSIZ];
-      ACE_OS::sprintf (stream_endpoint_name,
-                       "%s:%s:%d",
-                       "Stream_Endpoint_A",
-                       this->host_,
-                       this->pid_);
+  char stream_endpoint_name[BUFSIZ];
+  ACE_OS::sprintf (stream_endpoint_name,
+                   "%s:%s:%d",
+                   "Stream_Endpoint_A",
+                   this->host_,
+                   this->pid_);
 
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
 
-      // Create the name
-      CosNaming::Name Stream_Endpoint_A_Name (1);
+  // Create the name
+  CosNaming::Name Stream_Endpoint_A_Name (1);
   
-      Stream_Endpoint_A_Name.length (1);
-      Stream_Endpoint_A_Name [0].id = CORBA::string_dup (stream_endpoint_name);
-
-      // Get the CORBA::Object
-      CORBA::Object_var stream_endpoint_a =
-        this->naming_context_->resolve (Stream_Endpoint_A_Name,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  Stream_Endpoint_A_Name.length (1);
+  Stream_Endpoint_A_Name [0].id = CORBA::string_dup (stream_endpoint_name);
+
+  // Get the CORBA::Object
+  CORBA::Object_var stream_endpoint_a =
+    this->naming_context_->resolve (Stream_Endpoint_A_Name,
+                                    env);
+  TAO_CHECK_ENV_RETURN (env, -1);
   
-      // Narrow the reference
-      this->stream_endpoint_a_ =
-        AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in (),
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  // Narrow the reference
+  this->stream_endpoint_a_ =
+    AVStreams::StreamEndPoint_A::_narrow (stream_endpoint_a.in (),
+                                          env);
+  TAO_CHECK_ENV_RETURN (env, -1);
   
-      // Check for validity
-      if (CORBA::is_nil (this->stream_endpoint_a_))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Stream_Endpoint_A in Naming service <%s>\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_A::get_stream_endpoint");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // Check for validity
+  if (CORBA::is_nil (this->stream_endpoint_a_))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " could not resolve Stream_Endpoint_A in Naming service <%s>\n"),
+                      -1);
   return 0;
 }
 
@@ -356,10 +326,10 @@ TAO_AV_Endpoint_Process_Strategy_B::~TAO_AV_Endpoint_Process_Strategy_B (void)
 // Creates and returns a "B" type endpoint
 int
 TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
-                                              AVStreams::VDev_ptr &vdev,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                           AVStreams::VDev_ptr &vdev,
+                                           CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
     if (this->activate () == -1)
       ACE_ERROR_RETURN ((LM_ERROR, 
@@ -368,66 +338,55 @@ TAO_AV_Endpoint_Process_Strategy_B::create_B (AVStreams::StreamEndPoint_B_ptr &s
 
     ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Process_Strategy_B::create_B ()\n: stream_endpoint is:%s\n",
                 TAO_ORB_Core_instance ()->orb ()->object_to_string (this->stream_endpoint_b_,
-                                                                    ACE_TRY_ENV)));
-    ACE_TRY_CHECK;
+                                                                    TAO_TRY_ENV)));
+    TAO_CHECK_ENV;
     stream_endpoint = this->stream_endpoint_b_;
     vdev = this->vdev_;
   }
-  ACE_CATCHANY
+  TAO_CATCHANY
     { 
-      ACE_TRY_ENV.print_exception ("TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
+      TAO_TRY_ENV.print_exception ("TAO_AV_Endpoint_Process_Strategy_B::create_B\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
   return 0;
 }
 
 // Gets the B type stream_endpoint from the Naming service
 int
-TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      char stream_endpoint_name[BUFSIZ];
-      ACE_OS::sprintf (stream_endpoint_name,
-                       "%s:%s:%d",
-                       "Stream_Endpoint_B",
-                       this->host_,
-                       this->pid_);
+  char stream_endpoint_name[BUFSIZ];
+  ACE_OS::sprintf (stream_endpoint_name,
+                   "%s:%s:%d",
+                   "Stream_Endpoint_B",
+                   this->host_,
+                   this->pid_);
 
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",stream_endpoint_name));
 
-      // Create the name
-      CosNaming::Name Stream_Endpoint_B_Name (1);
+  // Create the name
+  CosNaming::Name Stream_Endpoint_B_Name (1);
   
-      Stream_Endpoint_B_Name.length (1);
-      Stream_Endpoint_B_Name [0].id = CORBA::string_dup (stream_endpoint_name);
+  Stream_Endpoint_B_Name.length (1);
+  Stream_Endpoint_B_Name [0].id = CORBA::string_dup (stream_endpoint_name);
   
-      // Get the CORBA::Object reference
-      CORBA::Object_var stream_endpoint_b =
-        this->naming_context_->resolve (Stream_Endpoint_B_Name,
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Narrow the reference
-      this->stream_endpoint_b_ =
-        AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in (),
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Check for validity
-      if (CORBA::is_nil (this->stream_endpoint_b_))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Process_Strategy_B::get_stream_endpoint");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // Get the CORBA::Object reference
+  CORBA::Object_var stream_endpoint_b =
+    this->naming_context_->resolve (Stream_Endpoint_B_Name,
+                                    env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  // Narrow the reference
+  this->stream_endpoint_b_ =
+    AVStreams::StreamEndPoint_B::_narrow (stream_endpoint_b.in (),
+                                          env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  // Check for validity
+  if (CORBA::is_nil (this->stream_endpoint_b_))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       " could not resolve Stream_Endpoint_B in Naming service <%s>\n"),
+                      -1);
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 4f014c5c53d..d964036148a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -19,15 +19,9 @@
 #ifndef TAO_AV_ENDPOINT_STRATEGY_H
 #define TAO_AV_ENDPOINT_STRATEGY_H
 
-#include "AVStreams_i.h"
+#include "orbsvcs/AV/AVStreams_i.h"
 #include "tao/TAO.h"
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
 class TAO_ORBSVCS_Export TAO_AV_Endpoint_Strategy
 // = DESCRIPTION
 //    Base class to define various endpoint strategies
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
index 56f02d1fad8..5d262e6f616 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -26,104 +26,84 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      this->activate_stream_endpoint (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_stream_endpoint (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated stream_endpoint\n"));
 
-      this->activate_vdev (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_vdev (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated vdev\n"));
 
-      this->activate_mediactrl (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->activate_mediactrl (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activated mediactrl\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
+      TAO_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
   return 0;
 }
 
 // Activate VDev into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_vdev (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      // Bridge pattern. Allow subclasses to override this behavior
-      T_VDev *vdev = 0;
-      if (this->make_vdev (vdev) == -1)
-        return -1;
-
-      // Activate the object under the root poa.
-      CORBA::String_var vdev_ior = this->orb_manager_->activate (vdev,
-                                                                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
-                  vdev_ior. in ()));
-
-      // Save the object reference, so that create_A can return it
-      this->vdev_ = vdev->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      vdev->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_vdev");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // Bridge pattern. Allow subclasses to override this behavior
+  T_VDev *vdev = 0;
+  if (this->make_vdev (vdev) == -1)
+    return -1;
+
+  // Put the object in the POA
+  CORBA::String_var vdev_ior = this->orb_manager_->activate (vdev,
+                                                             env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_vdev, vdev ior is:%s\n",
+              vdev_ior. in ()));
+
+  // Save the object reference, so that create_A can return it
+  this->vdev_ = vdev->_this (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+
   return 0;
 }
 
 // Activate the media_controller
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_mediactrl (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      // Bridge pattern. Subclasses can override this
-      T_MediaCtrl *media_ctrl = 0;
-      if (this->make_mediactrl (media_ctrl) == -1)
-        return -1;
-
-      // Activate the mediactrl object under the root poa.
-      CORBA::String_var mediactrl_ior = this->orb_manager_->activate (media_ctrl,
-                                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n",
-                  mediactrl_ior.in ()));
-
-
-      // Associate the media controller object reference with the vdev, as per the OMG spec
-      CORBA::Any anyval;
-      anyval <<= this->orb_manager_->orb ()->object_to_string (media_ctrl->_this (ACE_TRY_ENV),
-                                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->vdev_->define_property ("Related_MediaCtrl",
-                                    anyval,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // Bridge pattern. Subclasses can override this
+  T_MediaCtrl *media_ctrl = 0;
+  if (this->make_mediactrl (media_ctrl) == -1)
+    return -1;
+
+  // Put the object in the POA
+  CORBA::String_var mediactrl_ior = this->orb_manager_->activate (media_ctrl,
+                                                                  env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Endpoint_Reactive_Strategy::activate_mediactrl , media_ctrl ior is :%s\n",
+              mediactrl_ior.in ()));
+
+
+  // Associate the media controller object reference with the vdev, as per the OMG spec
+  CORBA::Any anyval;
+  anyval <<= this->orb_manager_->orb ()->object_to_string (media_ctrl->_this (env),
+                                                           env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  this->vdev_->define_property ("Related_MediaCtrl",
+                                anyval,
+                                env);
+
+  TAO_CHECK_ENV_RETURN (env, -1);
+
   return 0;
 }
 
@@ -134,6 +114,7 @@ TAO_AV_Endpoint_Reactive_Strategy<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_s
 {
   ACE_NEW_RETURN (stream_endpoint,
                   T_StreamEndpoint,
+
                   -1);
   return 0;
 }
@@ -185,7 +166,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_A (AVStreams::StreamEndPoint_A_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &ACE_TRY_ENV)
+                                                                                      CORBA::Environment &env)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -201,34 +182,23 @@ TAO_AV_Endpoint_Reactive_Strategy_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::crea
 // Put the stream_endpoint into the POA
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy_A <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      T_StreamEndpoint *stream_endpoint_a = 0;
-
-      // Use the bridge method
-      if (this->make_stream_endpoint (stream_endpoint_a) == -1)
-        return -1;
-
-      CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_a,
-                                                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
-
-      // Save the object references, so that create_a can return them
-      this->stream_endpoint_a_ = stream_endpoint_a->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      stream_endpoint_a->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  T_StreamEndpoint *stream_endpoint_a = 0;
+
+  // Use the bridge method
+  if (this->make_stream_endpoint (stream_endpoint_a) == -1)
+    return -1;
+
+  CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_a,
+                                                                        env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_A::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
+
+  // Save the object references, so that create_a can return them
+  this->stream_endpoint_a_ = stream_endpoint_a->_this (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
   return 0;
 }
 
@@ -252,31 +222,20 @@ TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TA
 // Activate stream_endpoint
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Endpoint_Reactive_Strategy_B <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_stream_endpoint (CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      T_StreamEndpoint *stream_endpoint_b = 0;
-
-      if (this->make_stream_endpoint (stream_endpoint_b) == -1)
-        return -1;
-      CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_b,
-                                                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
-
-      this->stream_endpoint_b_ = stream_endpoint_b->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      stream_endpoint_b->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  T_StreamEndpoint *stream_endpoint_b = 0;
+
+  if (this->make_stream_endpoint (stream_endpoint_b) == -1)
+    return -1;
+  CORBA::String_var stream_endpoint_ior = this->orb_manager_->activate (stream_endpoint_b,
+                                                                          env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"TAO_AV_Endpoint_Reactive_Strategy_B::activate_stream_endpoint,Stream Endpoint ior is : %s\n",stream_endpoint_ior.in ()));
+
+  this->stream_endpoint_b_ = stream_endpoint_b->_this (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
   return 0;
 }
 
@@ -285,7 +244,7 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Endpoint_Reactive_Strategy_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::create_B (AVStreams::StreamEndPoint_B_ptr &stream_endpoint,
                                                                                       AVStreams::VDev_ptr &vdev,
-                                                                                      CORBA::Environment &ACE_TRY_ENV)
+                                                                                      CORBA::Environment &env)
 {
   if (this->activate () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -320,33 +279,32 @@ template <class T_StreamEndpoint_B, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::init (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // create the objects and activate them in the poa
       this->activate_objects (argc,
                               argv,
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Get ourselves a naming_service object reference
-      this->bind_to_naming_service (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->bind_to_naming_service (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Register the vdev with the naming service
-      this->register_vdev (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->register_vdev (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // register the stream_endpoing with the naming_service
-      this->register_stream_endpoint (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->register_stream_endpoint (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("TAO_Child_Process");
+      TAO_TRY_ENV.print_exception ("TAO_Child_Process");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   // release the semaphore the parent is waiting on
   if (this->release_semaphore () == -1)
@@ -362,155 +320,112 @@ template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
 TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::activate_objects (int argc,
                                                                                 char **argv,
-                                                                                CORBA::Environment &ACE_TRY_ENV)
+                                                                                CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      // initialize the orb
-      this->orb_manager_.init (argc,
-                               argv,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // bridge method to make a new stream endpoint
-      if (this->make_stream_endpoint (this->stream_endpoint_) == -1)
-        return -1;
-
-      // bridge method to make a new vdev
-      if (this->make_vdev (this->vdev_) == -1)
-        return -1;
-
-      // bridge method to make a new media controller
-      if (this->make_mediactrl (this->media_ctrl_) == -1)
-        return -1;
-
-      // activate the stream_endpoint
-      CORBA::String_var stream_endpoint_ior = this->orb_manager_.activate (this->stream_endpoint_,
-                                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",stream_endpoint_ior.in ()));
-
-      // activate the vdev
-      CORBA::String_var vdev_ior = this->orb_manager_.activate (this->vdev_,
-                                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",vdev_ior.in ()));
-
-      // activate the media controller
-      CORBA::String_var media_ctrl_ior = this->orb_manager_.activate (this->media_ctrl_,
-                                                                      ACE_TRY_ENV);
-
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::init ");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  // initialize the orb
+  this->orb_manager_.init (argc,
+                           argv,
+                           env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+
+  // bridge method to make a new stream endpoint
+  if (this->make_stream_endpoint (this->stream_endpoint_) == -1)
+    return -1;
+
+  // bridge method to make a new vdev
+  if (this->make_vdev (this->vdev_) == -1)
+    return -1;
+
+  // bridge method to make a new media controller
+  if (this->make_mediactrl (this->media_ctrl_) == -1)
+    return -1;
+
+  // activate the stream_endpoint
+  CORBA::String_var stream_endpoint_ior = this->orb_manager_.activate (this->stream_endpoint_,
+                                                                       env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,stream_endpoint_ior :%s\n",stream_endpoint_ior.in ()));
+
+  // activate the vdev
+  CORBA::String_var vdev_ior = this->orb_manager_.activate (this->vdev_,
+                                                            env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects, vdev ior is :%s\n",vdev_ior.in ()));
+
+  // activate the media controller
+  CORBA::String_var media_ctrl_ior = this->orb_manager_.activate (this->media_ctrl_,
+                                                                  env);
+
+  TAO_CHECK_ENV_RETURN (env, -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)TAO_AV_Child_Process::activate_objects,media_ctrl_ior is: %s\n",media_ctrl_ior.in ()));
+
   return 0;
+
 }
 
 // Bind to the namingservice
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::bind_to_naming_service (CORBA::Environment &env)
 {
-  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);
-      //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-      this->naming_context_ =
-        CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_AV_Child_Process::bind_to_naming_service");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  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);
+  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
+  this->naming_context_ =
+    CosNaming::NamingContext::_narrow (naming_obj.in (),
+                                       env);
+  TAO_CHECK_ENV_RETURN (env,
+                        -1);
+
   return 0;
 }
 
 // register the vdev with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &ACE_TRY_ENV)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_vdev (CORBA::Environment &env)
 {
-  CORBA::Object_ptr vdev_obj;
-  ACE_TRY
-    {
-      char vdev_name [BUFSIZ];
-      ACE_OS::sprintf (vdev_name,
-                       "%s:%s:%d",
-                       "VDev",
-                       this->host_,
-                       this->pid_);
-
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name));
-      // create the name
-      this->vdev_name_.length (1);
-      this->vdev_name_ [0].id = CORBA::string_dup (vdev_name);
-
-      // make the media controller a property of the vdev
-      CORBA::Any media_ctrl_property;
-      CORBA::Object_var media_ctrl_obj = 
-        this->media_ctrl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      media_ctrl_property <<= this->orb_manager_.orb ()->object_to_string (media_ctrl_obj.in (),
-                                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->vdev_->define_property ("Related_MediaCtrl",
-                                    media_ctrl_property,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      vdev_obj = this->vdev_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->vdev_->_remove_ref (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_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)
+  char vdev_name [BUFSIZ];
+  ACE_OS::sprintf (vdev_name,
+                   "%s:%s:%d",
+                   "VDev",
+                   this->host_,
+                   this->pid_);
+
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t)%s\n",vdev_name));
+  // create the name
+  this->vdev_name_.length (1);
+  this->vdev_name_ [0].id = CORBA::string_dup (vdev_name);
+
+  // make the media controller a property of the vdev
+  CORBA::Any media_ctrl_property;
+  media_ctrl_property <<= this->orb_manager_.orb ()->object_to_string (this->media_ctrl_->_this (env),
+                                                                       env);
+  this->vdev_->define_property ("Related_MediaCtrl",
+                                media_ctrl_property,
+                                env);
+  TAO_CHECK_ENV_RETURN (env,-1);
+
+  // Register the vdev with the naming server.
+  this->naming_context_->bind (this->vdev_name_,
+                               this->vdev_->_this (env),
+                               env);
+
+  // If the object was already there, replace the older reference
+  // with this one
+  if (env.exception () != 0)
     {
-      // If the object was already there, replace the older reference
-      // with this one
+      env.clear ();
       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;
+                                     this->vdev_->_this (env),
+                                     env);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
 
@@ -520,18 +435,17 @@ int
 TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::run (ACE_Time_Value *tv)
 {
   int result;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      result = this->orb_manager_.run (ACE_TRY_ENV,tv);
-      ACE_TRY_CHECK;
+      result = this->orb_manager_.run (TAO_TRY_ENV,tv);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("orb_manager_.run ()");
+      TAO_TRY_ENV.print_exception ("orb_manager_.run ()");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return result;
 }
 
@@ -543,7 +457,7 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
   char sem_str [BUFSIZ];
 
   sprintf (sem_str,
-           "%s:%s:%ld",
+           "%s:%s:%d",
            "TAO_AV_Process_Semaphore",
            this->host_,
            this->pid_);
@@ -570,39 +484,26 @@ TAO_AV_Child_Process  <T_StreamEndpoint_B, T_VDev, T_MediaCtrl>::release_semapho
 // register the stream_endpoint with the naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
 int
-TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_ptr stream_endpoint_obj = CORBA::Object::_nil ();
-  ACE_TRY
-    {
-      stream_endpoint_obj = this->stream_endpoint_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->stream_endpoint_->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
-      // Create a name for the video control object
-      // subclasses can define their own name for the streamendpoint
-      // Register the stream endpoint object with the naming server.
-      this->naming_context_->bind (this->stream_endpoint_name_,
-                                   stream_endpoint_obj,
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound,ex)
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::register_stream_endpoint (CORBA::Environment &env)
+{
+  //  ACE_DEBUG ((LM_DEBUG, "(%P|%t) %s:%d\n", __FILE__, __LINE__));
+  // Create a name for the video control object
+  // subclasses can define their own name for the streamendpoint
+  // Register the stream endpoint object with the naming server.
+  this->naming_context_->bind (this->stream_endpoint_name_,
+                               this->stream_endpoint_->_this (env),
+                               env);
+
+  // if the name was already there, replace the reference with the new one
+  if (env.exception () != 0)
     {
-      // if the name was already there, replace the reference with the new one
+      env.clear ();
       this->naming_context_->rebind (this->stream_endpoint_name_,
-                                     stream_endpoint_obj,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     this->stream_endpoint_->_this (env),
+                                     env);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Reactive_Strategy::activate");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+
   return 0;
 }
 
@@ -646,27 +547,26 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::make_mediactrl (T_M
 // For now, we dont delete the objects, since they exist for the
 // lifetime of the process anyway
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process ()
+TAO_AV_Child_Process  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process ()
 {
   // Remove the names from the naming service
   if (CORBA::is_nil (this->naming_context_.in ()) == 0)
     return;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->naming_context_->unbind (this->stream_endpoint_name_,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->naming_context_->unbind (this->vdev_name_,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate");
+      TAO_TRY_ENV.print_exception ("TAO_Endpoint_Process_Strategy::activate");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
 //  if (this->stream_endpoint_ != 0)
 //    delete this->stream_endpoint_;
@@ -683,7 +583,7 @@ TAO_AV_Child_Process<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Proce
 // Define the name of the stream_endpoint, as used to register with
 // the  naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Child_Process_A<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_A ()
+TAO_AV_Child_Process_A  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_A ()
 {
   char stream_endpoint_name[BUFSIZ];
   ACE_OS::sprintf (stream_endpoint_name,
@@ -709,7 +609,7 @@ TAO_AV_Child_Process_A  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_P
 // Define the name of the stream_endpoint, as used to register with
 // the  naming service
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_B ()
+TAO_AV_Child_Process_B  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Process_B ()
 {
   char stream_endpoint_name[BUFSIZ];
   ACE_OS::sprintf (stream_endpoint_name,
@@ -724,7 +624,7 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::TAO_AV_Child_Proc
 }
 
 template <class T_StreamEndpoint, class T_VDev , class T_MediaCtrl>
-TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process_B ()
+TAO_AV_Child_Process_B  <T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Process_B ()
 {
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Makefile.am b/TAO/orbsvcs/orbsvcs/AV/Makefile.am
deleted file mode 100644
index 8aa87e9e67d..00000000000
--- a/TAO/orbsvcs/orbsvcs/AV/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Audio/Visual (AV) Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_AV.la
-
-libTAO_AV_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_AV_la_SOURCES = \
-        AVStreams_i.cpp \
-        Endpoint_Strategy.cpp \
-        Endpoint_Strategy_T.cpp \
-        sfp.cpp
-
-noinst_HEADERS = \
-        AVStreams_i.h \
-        Endpoint_Strategy.h \
-        Endpoint_Strategy_T.h \
-        sfp.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/README b/TAO/orbsvcs/orbsvcs/AV/README
index e3482716a80..ffe6958a6db 100644
--- a/TAO/orbsvcs/orbsvcs/AV/README
+++ b/TAO/orbsvcs/orbsvcs/AV/README
@@ -24,4 +24,5 @@ TAO/orbsvcs/tests/AVStreams/mpeg/source/
 
 Sumedh Mungee <sumedh@cs.wustl.edu>
 Nagarajan Surendran <naga@cs.wustl.edu>
+Alexander Arulanthu <alex@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index f103e7aa9a5..4e1e3d21413 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -3,118 +3,72 @@
 
 // $Id$
 
-// default arguments to pass to use for the ORB
-const char *TAO_SFP::TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL";
-
-// SFP magic numbers
-const char *TAO_SFP::TAO_SFP_MAGIC_NUMBER = "=SFP";
-const char *TAO_SFP::TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG";
-const char *TAO_SFP::TAO_SFP_START_MAGIC_NUMBER = "=STA";
-const char *TAO_SFP::TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE";
-const char *TAO_SFP::TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR";
-
-// SFP version 1.0
-const unsigned char TAO_SFP::TAO_SFP_MAJOR_VERSION = 1;
-const unsigned char TAO_SFP::TAO_SFP_MINOR_VERSION = 0;
-
-// lengths of various SFP headers
-const unsigned char TAO_SFP::TAO_SFP_FRAME_HEADER_LEN = 12;
-
-int 
-operator< (const TAO_SFP_Fragment_Node& left,
-           const TAO_SFP_Fragment_Node& right)
-{
-  return left.fragment_info_.frag_number < right.fragment_info_.frag_number;
-}
-
 // constructor.
-TAO_SFP::TAO_SFP (CORBA::ORB_ptr orb,
-                  ACE_Reactor* reactor,
-                  ACE_Time_Value timeout1,
-                  ACE_Time_Value timeout2,
-                  SFP_Callback *callback)
+SFP::SFP (CORBA::ORB_ptr orb,
+          ACE_Reactor* reactor,
+          ACE_Time_Value timeout1,
+          ACE_Time_Value timeout2,
+          SFP_Callback *callback)
   :orb_ (orb),
    reactor_ (reactor),
-   start_tries_ (10),
-   startReply_tries_ (10),
+   encoder_ (0),
+   decoder_ (0),
    timeout1_ (timeout1),
    timeout2_ (timeout2),
+   start_tries_ (10),
+   startReply_tries_ (10),
    callback_ (callback),
-   sequence_num_ (0),
-   credit_num_ (10),
-   magic_number_len_ (sizeof (magic_number_)-1)
+   sequence_num_ (0)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  
+}
+
+void
+SFP::set_cdr_length (void)
+{
+  CORBA::ULong bodylen = encoder_->total_length ();
+  char* buf = ACE_const_cast(char*,encoder_->buffer ());
+  buf += 4;
+#if !defined (TAO_ENABLE_SWAP_ON_WRITE)
+  *ACE_reinterpret_cast(CORBA::ULong*,buf) = bodylen;
+#else
+  if (!encoder_->do_byte_swap ())
     {
-      // fill in the default frameHeader fields.
-      this->frame_header_.magic_number [0] = '=';
-      this->frame_header_.magic_number [1] = 'S';
-      this->frame_header_.magic_number [2] = 'F';
-      this->frame_header_.magic_number [3] = 'P';
-      this->frame_header_.flags = TAO_ENCAP_BYTE_ORDER;
-      this->output_cdr_.reset ();
-      this->output_cdr_.encode (flowProtocol::_tc_frameHeader,
-                                &this->frame_header_,
-                                0,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->frame_header_len_ = this->output_cdr_.total_length ();
-      // fill in the default fragment message fields.
-      this->fragment_.magic_number [0] = 'F';
-      this->fragment_.magic_number [1] = 'R';
-      this->fragment_.magic_number [2] = 'A';
-      this->fragment_.magic_number [3] = 'G';
-      this->output_cdr_.reset ();
-      this->output_cdr_.encode (flowProtocol::_tc_fragment,
-                                &this->fragment_,
-                                0,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->fragment_len_ = this->output_cdr_.total_length ();
-      // fill in the default Start message fields.
-      this->start_.magic_number [0] = '=';
-      this->start_.magic_number [1] = 'S';
-      this->start_.magic_number [2] = 'T';
-      this->start_.magic_number [3] = 'A';
-      this->start_.major_version = TAO_SFP_MAJOR_VERSION;
-      this->start_.minor_version = TAO_SFP_MINOR_VERSION;
-      this->start_.flags = 0;
-      this->start_len_ = sizeof (this->start_);
-      // fill in the default StartReply message fields.
-      this->start_reply_.magic_number [0] = '=';
-      this->start_reply_.magic_number [1] = 'S';
-      this->start_reply_.magic_number [2] = 'T';
-      this->start_reply_.magic_number [3] = 'R';
-      this->start_reply_.flags = 0;
-      this->start_reply_len_ = sizeof (this->start_reply_);
-      // fill in the default Credit message fields.
-      this->credit_.magic_number [0] = '=';
-      this->credit_.magic_number [1] = 'C';
-      this->credit_.magic_number [2] = 'R';
-      this->credit_.magic_number [3] = 'E';
-      this->credit_len_ = sizeof (this->credit_);
-      this->output_cdr_.reset ();
-      //      this->output_cdr_ <<= this->credit_;
-      this->output_cdr_.reset ();
-      this->output_cdr_.encode (flowProtocol::_tc_credit,
-                                &this->credit_,
-                                0,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      this->credit_len_ = this->output_cdr_.total_length ();
+      *ACE_reinterpret_cast(CORBA::ULong*, buf) = bodylen;
     }
-  ACE_CATCHANY
+  else
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_SFP constructor");
+      CDR::swap_4 (ACE_reinterpret_cast(char*,&bodylen), buf);
     }
-  ACE_ENDTRY;
+#endif
 }
 
+// Copies length bytes from the given message into the
+// CDR buffer. Returns 0 on success, -1 on failure
+int
+SFP::create_cdr_buffer (char *message,
+                        size_t length)
+{
+  if (this->decoder_)
+    delete this->decoder_;
+
+  ACE_NEW_RETURN (this->decoder_,
+                  TAO_InputCDR (message,
+                                length),
+                  -1);
+  
+  ACE_OS::memcpy (this->decoder_->rd_ptr (), 
+                  message, 
+                  length);
+  
+  return 0;
+}
+  
 // Start the active end of the stream.
 int
-TAO_SFP::start_stream (const char *receiver_addr)
+SFP::start_stream (const char *receiver_addr)
 {
+  // @@we have to do ACE_NTOHS for all the network-byte ordered fields.
   int result;
   ACE_INET_Addr sender;
   result = this->connect_to_receiver (receiver_addr);
@@ -122,17 +76,16 @@ TAO_SFP::start_stream (const char *receiver_addr)
     return result;
   while (this->start_tries_ > 0)
     {
-      result = this->send_start ();
-      if (result != 0)
+      if ((result = this->send_start ()) != 0)
         return result;
+      char magic_number [4];
       // Timed recv.
-      char magic_number [MAGIC_NUMBER_LEN];
       ssize_t n =this->dgram_.recv (magic_number,
-                                    this->magic_number_len_,
+                                    sizeof(magic_number),
                                     sender,
                                     MSG_PEEK,
                                     &this->timeout1_);
-      //      ACE_DEBUG ((LM_DEBUG,"n = %d\n",n));
+      ACE_DEBUG ((LM_DEBUG,"n = %d\n",n));
       if (n == -1) 
         {
           if (errno == ETIME)
@@ -142,14 +95,15 @@ TAO_SFP::start_stream (const char *receiver_addr)
               continue;
             }
           else
-            ACE_ERROR_RETURN ((LM_ERROR,"dgram recv error:%d,%p",errno,"recv"),-1);
+            ACE_ERROR_RETURN ((LM_ERROR,"dgram recv error:%p","recv"),-1);
         }
       else if (n==0)
         ACE_ERROR_RETURN ((LM_ERROR,"SFP::start_stream -peek"),-1);
-      // Null terminate the magic number.
-      magic_number [this->magic_number_len_] = 0;
+      // successful receive of dgram.
+      ACE_DEBUG ((LM_DEBUG,"StartReply received"));
       // check if its startreply message.
-      if (ACE_OS::strcmp (magic_number,TAO_SFP_STARTREPLY_MAGIC_NUMBER) == 0)
+      char *magic_string = this->magic_number_to_string (magic_number);
+      if (ACE_OS::strcmp (magic_string,TAO_SFP_STARTREPLY_MAGIC_NUMBER) == 0)
         {
           ACE_DEBUG ((LM_DEBUG,"(%P|%t)StartReply message received\n"));
           flowProtocol::StartReply start_reply;
@@ -159,19 +113,19 @@ TAO_SFP::start_stream (const char *receiver_addr)
           if (n != sizeof (start_reply))
             ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input-StartReply\n"),0);
           //  check for SFP version difference.??
+          // Call the application back.
           this->state_ = REPLY_RECEIVED;
         }
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,"Invalid message while StartReply expected\n"),0);
       // register the data handler.
-      return this->register_dgram_handler ();
+      result = this->register_dgram_handler ();
+      return result;
     }
   return 0;
 }
 
 // Start the passive end of the stream.
 int
-TAO_SFP::start_stream (const char *local_addr,int Credit)
+SFP::start_stream (const char *local_addr,int Credit)
 {
   int result;
   ACE_INET_Addr sender;
@@ -183,10 +137,10 @@ TAO_SFP::start_stream (const char *local_addr,int Credit)
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,"SFP::passive start- open failed\n"),-1);
 
-  char magic_number[MAGIC_NUMBER_LEN];
+  char magic_number[4];
   // Timed recv.
   ssize_t n =this->dgram_.recv (magic_number,
-                                this->magic_number_len_,
+                                sizeof(magic_number),
                                 sender,
                                 MSG_PEEK,
                                 &this->timeout2_);
@@ -196,11 +150,11 @@ TAO_SFP::start_stream (const char *local_addr,int Credit)
     }
   else if (n==0)
     ACE_ERROR_RETURN ((LM_ERROR,"SFP::start_stream -peek"),-1);
-  // Null terminate the magic_number.
-  magic_number [this->magic_number_len_] = 0;
-  if (ACE_OS::strcmp (magic_number,TAO_SFP_START_MAGIC_NUMBER) == 0)
+
+  ACE_DEBUG ((LM_DEBUG,"Start received:"));
+  char *magic_string = this->magic_number_to_string (magic_number);
+  if (ACE_OS::strcmp (magic_string,TAO_SFP_START_MAGIC_NUMBER) == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,"Start received:"));
       // Read the start message.
       flowProtocol::Start start;
       n = this->dgram_.recv ((char *)&start,
@@ -225,95 +179,270 @@ TAO_SFP::start_stream (const char *local_addr,int Credit)
         ACE_ERROR_RETURN ((LM_ERROR,"schedule_timer failed\n"),result);
 
       // register the data handler.
-      return this->register_dgram_handler ();
+      result = this->register_dgram_handler ();
+      return result;
     }
+
   else
-      ACE_ERROR_RETURN ((LM_ERROR,"Invalid messaged received while Start expected\n"),-1);
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,"Invalid messaged received"),-1);
+    }
+  return 0;
 }
 
 // Sends the ACE_Message_Block data as a frame, fragmenting if necessary.
 int
-TAO_SFP::send_frame (ACE_Message_Block *frame)
+SFP::send_simple_frame (ACE_Message_Block *frame)
 {
-  ACE_TRY_NEW_ENV
+  // Currently there is no fragmentation  handled, just a simple
+  // frame.
+  
+  ACE_Message_Block *mb;
+  ACE_NEW_RETURN (mb,
+                  ACE_Message_Block,
+                  -1);
+  if (this->credit_ > 0)
     {
-      if (this->credit_num_ > 0)
+      // if we have enough credit then we send.
+      // Currently no fragmentation.
+      int length = frame->length ();
+
+      if (length > ACE_MAX_DGRAM_SIZE)
+          ACE_ERROR_RETURN ((LM_ERROR,"sfp doesn't support fragmentation yet"),-1);
+
+      flowProtocol::frameHeader frame_header;
+
+      // The magic_number and flags are to be sent in network-byte order.
+      frame_header.magic_number [0] = ACE_HTONS ('=');
+      frame_header.magic_number [1] = ACE_HTONS ('S');
+      frame_header.magic_number [2] = ACE_HTONS ('F');
+      frame_header.magic_number [3] = ACE_HTONS ('P');
+
+      // set the byte order and no fragments.
+      frame_header.flags = 0;
+      frame_header.flags |= TAO_ENCAP_BYTE_ORDER;
+
+      frame_header.flags = ACE_HTONS (frame_header.flags);
+      //set the size of the message block.
+      int len = sizeof(frame_header.magic_number)+sizeof
+        (frame_header.flags);
+        mb->size (len);
+      
+        mb->rd_ptr ((char *)&frame_header);
+        mb->wr_ptr ((char *)&frame_header+len);
+        if (this->encoder_ != 0)
+          delete this->encoder_;
+        ACE_NEW_RETURN (this->encoder_,
+                      TAO_OutputCDR,
+                      -1);
+
+      frame_header.message_type = flowProtocol::SimpleFrame;
+      frame_header.message_size = frame->length ();
+      this->encoder_->write_octet (frame_header.message_type);
+      this->encoder_->write_ulong (frame_header.message_size);
+      
+      // This is a good maximum, because Dgrams cannot be longer than
+      // 64K and the usual size for a CDR fragment is 512 bytes.
+      // @@ TODO In the future we may need to allocate some memory
+      // from the heap.
+      const int TAO_WRITEV_MAX = 128;
+      iovec iov[TAO_WRITEV_MAX];
+
+      iov[0].iov_base = mb->rd_ptr ();
+      iov[0].iov_len = mb->length ();
+      ACE_DEBUG ((LM_DEBUG,"length: %d ",mb->length ()));
+      int iovcnt = 1;
+      for (const ACE_Message_Block* b = this->encoder_->begin ();
+           b != this->encoder_->end () && iovcnt < TAO_WRITEV_MAX;
+           b = b->cont ())
         {
-          // if we have enough credit then we send.
-          int total_length = 0;
-          for (ACE_Message_Block *temp = frame;temp != 0;temp = temp->cont ())
-            total_length += temp->length ();
-          ACE_DEBUG ((LM_DEBUG,"total_length of frame=%d\n",total_length));
-          if (total_length < (SFP_MAX_PACKET_SIZE -this->frame_header_len_))
-            {  
-              // clear the output cdr.
-              this->output_cdr_.reset ();
-              // CDR encode the frame header.
-              //(<<= isAvailable only in compiled marshalling!)
-              this->frame_header_.message_type = flowProtocol::SimpleFrame;
-              this->frame_header_.message_size = frame->length ()+this->frame_header_len_;
-              this->output_cdr_.encode (flowProtocol::_tc_frameHeader,
-                                        &this->frame_header_,
-                                        0,
-                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              //          this->output_cdr_ <<= this->frame_header_;
-              this->send_cdr_buffer (this->output_cdr_,frame);
-            }
-          else // larger frame,fragment and send it.
+          iov[iovcnt].iov_base = b->rd_ptr ();
+          iov[iovcnt].iov_len =  b->length ();
+          ACE_DEBUG ((LM_DEBUG,"length: %d ",b->length ()));
+          iovcnt++;
+        }
+      iov[iovcnt].iov_base = frame->rd_ptr ();
+      iov[iovcnt].iov_len = frame->length ();
+      ACE_DEBUG ((LM_DEBUG,"length: %d ",frame->length ()));
+      ssize_t n = this->dgram_.send (iov,
+                                     iovcnt,
+                                     this->receiver_inet_addr_);
+      if (n == -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "send_simple_frame (%t) send failed %p\n", ""),-1);
+      else if (n == 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "send_simple_Frame (%t) EOF on send \n"),-1);
+    }
+  return 0;
+}
+
+// This is used to send large frames with fragmentation.This is not
+// complete yet.
+int
+SFP::send_frame (ACE_Message_Block *frame)
+{
+  ACE_Message_Block *mb;
+  ACE_NEW_RETURN (mb,
+                  ACE_Message_Block,
+                  -1);
+  if (this->credit_ > 0)
+    {
+      // if we have enough credit then we send.
+      // Do fragmentation if necessary.
+      int length = frame->length ();
+
+      int total_length = 0;
+      ACE_Message_Block *temp = frame;
+      while (temp != 0)
+        {
+          total_length += temp->length ();
+          temp = temp->next ();
+        }
+      flowProtocol::frameHeader frame_header;
+
+      // The magic_number and flags are to be sent in network-byte order.
+      frame_header.magic_number [0] = ACE_HTONS ('=');
+      frame_header.magic_number [1] = ACE_HTONS ('S');
+      frame_header.magic_number [2] = ACE_HTONS ('F');
+      frame_header.magic_number [3] = ACE_HTONS ('P');
+      // sizeof (frameHeader) may have to be replaced with more
+      // accurate size??.
+      if (total_length > (ACE_MAX_DGRAM_SIZE- sizeof (frameHeader)))
+        {
+          // If the message size is not okay including the headers i.e it
+          // cannot fit in a dgram.
+
+          // set the byte order and no fragments.
+          frame_header.flags = 0;
+          frame_header.flags |= TAO_ENCAP_BYTE_ORDER;
+          // set the fragments bit.
+          frame_header.flags |= 2;
+          
+          frame_header.flags = ACE_HTONS (frame_header.flags);
+
+          // first fragment will have size to be
+          //set the size of the message block.
+          int len = sizeof(frame_header.magic_number)+sizeof
+            (frame_header.flags);
+          mb->size (len);
+      
+          mb->rd_ptr ((char *)&frame_header);
+          mb->wr_ptr ((char *)&frame_header+len);
+          if (this->encoder_ != 0)
+            delete this->encoder_;
+          ACE_NEW_RETURN (this->encoder_,
+                          TAO_OutputCDR,
+                          -1);
+
+                                      
+          // This is a good maximum, because Dgrams cannot be longer than
+          // 64K and the usual size for a CDR fragment is 512 bytes.
+          // @@ TODO In the future we may need to allocate some memory
+          // from the heap.
+          int message_len = 0;
+          const int TAO_WRITEV_MAX = 128;
+          iovec iov[TAO_WRITEV_MAX];
+
+          iov[0].iov_base = mb->rd_ptr ();
+          iov[0].iov_len = mb->length ();
+          int header_len = mb->length ()+2* sizeof(CORBA::ULong);
+          message_len += header_len;
+          ACE_DEBUG ((LM_DEBUG,"length: %d ",mb->length ()));
+          int iovcnt = 2;
+          ACE_Message_Block *mb = frame;
+          int prev_len;
+          while (mb != 0)
             {
-              // set the fragments bit.
-              this->frame_header_.flags |= 2;
-              // This is a good maximum, because Dgrams cannot be longer than
-              // 64K and the usual size for a CDR fragment is 512 bytes.
-              // @@ TODO In the future we may need to allocate some memory
-              // from the heap.
-              int message_len = this->frame_header_len_;
-              iovec iov[TAO_WRITEV_MAX];
-              int iovcnt = 1;// since first iov is for frameHeader. 
-              flowProtocol::frame frame_info;
-              frame_info.timestamp = 10;
-              frame_info.synchSource = 10;
-              frame_info.source_ids.length (1);
-              frame_info.source_ids [0] = 1; // XXX random number.
-              frame_info.sequence_num = this->sequence_num_;
-              this->output_cdr_.reset ();
-              this->output_cdr_.encode (flowProtocol::_tc_frame,
-                                        &frame_info,
-                                        0,
-                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              ACE_DEBUG ((LM_DEBUG,"frame info length:%d\n",this->output_cdr_.total_length ()));
-              for (const ACE_Message_Block* b = this->output_cdr_.begin ()->clone ();
-                   b != 0 && iovcnt < TAO_WRITEV_MAX;
-                   b = b->cont ())
+              prev_len = message_len;
+              message_len += mb->length ();
+              if (message_len > ACE_MAX_DGRAM_SIZE)
+                {
+                  // get only the length that we can accomodate.
+                  int current_len = ACE_MAX_DGRAM_SIZE - prev_len;
+                  if (current_len < mb->length ())
+                    {
+                      // The above condition is an assertion.
+                      iov [iovcnt].iov_base = mb->rd_ptr ();
+                      iov [iovcnt].iov_len = current_len;
+                      message_len += current_len;
+                      mb->rd_ptr (current_len);
+                      iovcnt++;
+                    }
+                  break;
+                }
+              else
                 {
-                  //                  ACE_DEBUG ((LM_DEBUG,"iovcnt:%d\n",iovcnt));
-                  iov[iovcnt].iov_base = b->rd_ptr ();
-                  iov[iovcnt].iov_len =  b->length ();
-                  message_len += b->length ();
-                  ACE_DEBUG ((LM_DEBUG,"send_cdr_buffer:length=%d\n",b->length ()));
-                  // print the buffer.
-                  //                  this->dump_buf (b->rd_ptr (),b->length ());
-                  iovcnt++;
+                  // we can accomodate this message block
+                      iov [iovcnt].iov_base = mb->rd_ptr ();
+                      iov [iovcnt].iov_len = mb->length ();
+                      message_len += mb->length ();
+                      iovcnt++;
+                      mb = mb->next ();
                 }
-              ACE_Message_Block *mb = frame;
-              int prev_len;
+            }
+          frame_header.message_type = flowProtocol::SimpleFrame;
+          frame_header.message_size = message_len - header_len;
+          this->encoder_->write_octet (frame_header.message_type);
+          this->encoder_->write_ulong (frame_header.message_size);
+
+          // THe header will be only in the first cdr fragment.
+          iov[1].iov_base = this->encoder_->begin ()->rd_ptr ();
+          iov[1].iov_len = this->encoder_->begin ()->length ();
+
+          // send the fragment 0.
+          ssize_t n = this->dgram_.send (iov,
+                                         iovcnt,
+                                         this->receiver_inet_addr_);
+          if (n == -1)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "send_frame (%t) fragment 0 send failed %p\n", ""),-1);
+          else if (n == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "send_Frame (%t) EOF on send \n"),-1);
+
+          int frag_number = 0;
+          // If there is any more data send those as fragments.
+          while (mb != 0)
+            {
+              flowProtocol::fragment frag;
+              
+              // The magic_number and flags are to be sent in network-byte order.
+              frag.magic_number [0] = ACE_HTONS ('F');
+              frag.magic_number [1] = ACE_HTONS ('R');
+              frag.magic_number [2] = ACE_HTONS ('A');
+              frag.magic_number [3] = ACE_HTONS ('G');
+
+              ACE_Message_Block *magic_block;
+              ACE_NEW_RETURN (magic_block,
+                              ACE_Message_Block,
+                              -1);
+              magic_block->size (5);// magic_number+flags size. 
+              magic_block->rd_ptr ((char *)&frag);
+              magic_block->wr_ptr (5);
+
+              iov [0].iov_base = magic_block->rd_ptr ();
+              iov [0].iov_len = magic_block->length ();
+
+              int header_len = 5 + 4 *sizeof (CORBA::ULong);
+              message_len = header_len;
+              // 5 for magic_number+flags and 4 ulongs in the fragment header.
+              iovcnt = 2;//  1 is for the frag header.
               while (mb != 0)
                 {
                   prev_len = message_len;
                   message_len += mb->length ();
-                  if (message_len > SFP_MAX_PACKET_SIZE)
+                  if (message_len > ACE_MAX_DGRAM_SIZE)
                     {
                       // get only the length that we can accomodate.
-                      size_t current_len = SFP_MAX_PACKET_SIZE - prev_len;
+                      int current_len = ACE_MAX_DGRAM_SIZE - prev_len;
                       if (current_len < mb->length ())
                         {
                           // The above condition is an assertion.
                           iov [iovcnt].iov_base = mb->rd_ptr ();
                           iov [iovcnt].iov_len = current_len;
-                          message_len += (current_len-mb->length ());
                           mb->rd_ptr (current_len);
+                          message_len += current_len;
                           iovcnt++;
                         }
                       break;
@@ -325,134 +454,59 @@ TAO_SFP::send_frame (ACE_Message_Block *frame)
                       iov [iovcnt].iov_len = mb->length ();
                       message_len += mb->length ();
                       iovcnt++;
-                      mb = mb->cont ();
+                      mb = mb->next ();
                     }
                 }
-              //  This can be either a simpleframe or a sequenced frame,other types of frames.
-              this->frame_header_.message_type = flowProtocol::Frame;
-              this->frame_header_.message_size = message_len;
-              ACE_DEBUG ((LM_DEBUG,"first fragment of size:%d\n",message_len- this->frame_header_len_));
-              this->output_cdr_.reset ();
-              this->output_cdr_.encode (flowProtocol::_tc_frameHeader,
-                                        &this->frame_header_,
-                                        0,
-                                        ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-              // header will be only in the first cdr fragment.
-              iov[0].iov_base = this->output_cdr_.begin ()->rd_ptr ();
-              iov[0].iov_len = this->output_cdr_.begin ()->length ();
-              ACE_DEBUG ((LM_DEBUG,"frame header len:%d\n",iov[0].iov_len));
-              // send the first fragment.
-              for (int i=0;i<iovcnt;i++)
-                {
-                  //                  this->dump_buf (iov[i].iov_base,iov[i].iov_len);
-                }
+              // send this fragment.
+              // set the more fragments flag
+              if ((mb != 0) && (mb->length () != 0))
+                frag.flags = ACE_HTONS (2);
+              else
+                break;
+              if (this->encoder_ != 0)
+                delete this->encoder_;
+              ACE_NEW_RETURN (this->encoder_,
+                              TAO_OutputCDR,
+                              -1);
+              frag.frag_number = frag_number++;
+              frag.sequence_num = this->sequence_num_;
+              frag.frag_sz = message_len - header_len;
+              frag.source_id = 0;
+              this->encoder_->write_ulong (frag.frag_number);
+              this->encoder_->write_ulong (frag.sequence_num);
+              this->encoder_->write_ulong (frag.frag_sz);
+              this->encoder_->write_ulong (frag.source_id);
+              
+              // THe header will be only in the first cdr fragment.
+              iov[1].iov_base = this->encoder_->begin ()->rd_ptr ();
+              iov[1].iov_len = this->encoder_->begin ()->length ();
+
+              //   send the fragment now.
               ssize_t n = this->dgram_.send (iov,
                                              iovcnt,
                                              this->receiver_inet_addr_);
               if (n == -1)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "send_frame (%t) fragment 0 send failed %p\n", ""),-1);
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              "SFP::send_frame (%t) send failed %p\n", ""));
+                  return -1;
+                }
               else if (n == 0)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "send_Frame (%t) EOF on send \n"),-1);
-
-              int frag_number = 1;
-              // If there is any more data send those as fragments.
-              while (mb != 0)
                 {
-                  message_len = this->fragment_len_;
-                  iovcnt = 1;//  1 is for the frag header.
-                  while (mb != 0)
-                    {
-                      prev_len = message_len;
-                      message_len += mb->length ();
-                      if (message_len > SFP_MAX_PACKET_SIZE)
-                        {
-                          // get only the length that we can accomodate.
-                          size_t current_len = SFP_MAX_PACKET_SIZE - prev_len;
-                          if (current_len < mb->length ())
-                            {
-                              // The above condition is an assertion.
-                              iov [iovcnt].iov_base = mb->rd_ptr ();
-                              iov [iovcnt].iov_len = current_len;
-                              message_len += (current_len - mb->length ());
-                              mb->rd_ptr (current_len);
-                              iovcnt++;
-                            }
-                          break;
-                        }
-                      else
-                        {
-                          // we can accomodate this message block
-                          iov [iovcnt].iov_base = mb->rd_ptr ();
-                          iov [iovcnt].iov_len = mb->length ();
-                          iovcnt++;
-                          mb = mb->cont ();
-                        }
-                    }
-                  this->fragment_.flags =  TAO_ENCAP_BYTE_ORDER;
-                  if (mb == 0)
-                    {
-                      ACE_DEBUG ((LM_DEBUG,"sending the last fragment\n"));
-                      // This is the last fragment so clear the fragments bit.
-                    }
-                  else
-                    {
-                      // set the more fragments flag
-                      this->fragment_.flags |= 2;
-                    }
-                  // if there are no data blocks.
-                  if (iovcnt == 1)
-                    break;
-                  this->fragment_.frag_number = frag_number++;
-                  this->fragment_.sequence_num = this->sequence_num_;
-                  this->fragment_.frag_sz = message_len;
-                  this->fragment_.source_id = 0;
-                  this->output_cdr_.reset ();
-                  this->output_cdr_.encode (flowProtocol::_tc_fragment,
-                                            &this->fragment_,
-                                            0,
-                                            ACE_TRY_ENV);
-                  ACE_TRY_CHECK;
-                  ACE_DEBUG ((LM_DEBUG,"sending a fragment numbered %d of size %d\n",
-                              this->fragment_.frag_number,
-                              this->fragment_.frag_sz));
-                  // THe header will be only in the first cdr fragment.
-                  iov[0].iov_base = this->output_cdr_.begin ()->rd_ptr ();
-                  iov[0].iov_len = this->output_cdr_.begin ()->length ();
-                  //   send the fragment now.
-                  // without the sleep the fragments gets lost! 
-                  // probably because the UDP buffer queue on the sender side
-                  // is overflown it drops the packets.
-                  // XXX: This is a hack.
-                  ACE_OS::sleep (1);
-                  ssize_t n = this->dgram_.send (iov,
-                                                 iovcnt,
-                                                 this->receiver_inet_addr_);
-                  if ((n == -1) || (n==0))
-                    ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP::send_framed failed:%p\n",""),-1);
+                  ACE_DEBUG ((LM_DEBUG,
+                              "SFP::send_frame (%t) EOF on send \n"));
+                  return -1;
                 }
             }
         }
-      else
-        {
-          // flow controlled so wait. 
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("TAO_SFP::send_frame");
-      return -1;
     }
-  ACE_ENDTRY;
   return 0;
 }
 
 
 // creates a connected dgram.
 int
-TAO_SFP::connect_to_receiver (const char *receiver_addr)
+SFP::connect_to_receiver (const char *receiver_addr)
 {
   this->receiver_addr_ = ACE_OS::strdup (receiver_addr);
   // Get the local UDP address
@@ -477,35 +531,30 @@ TAO_SFP::connect_to_receiver (const char *receiver_addr)
     return -1;
 
   this->receiver_inet_addr_.set (receiver_addr);
+  if (ACE_OS::connect (this->dgram_.get_handle (),(sockaddr *) this->receiver_inet_addr_.get_addr (),
+                       this->receiver_inet_addr_.get_size ()) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t) datagram connect failed %p\n"),-1);
   return 0;
 }
 
 // sends all the ACE_Message_Blocks in the current CDR stream.
 int
-TAO_SFP::send_cdr_buffer (TAO_OutputCDR &cdr,ACE_Message_Block *mb)
+SFP::send_cdr_buffer (void)
 {
   // This is a good maximum, because Dgrams cannot be longer than
   // 64K and the usual size for a CDR fragment is 512 bytes.
   // @@ TODO In the future we may need to allocate some memory
   // from the heap.
+  const int TAO_WRITEV_MAX = 128;
   iovec iov[TAO_WRITEV_MAX];
+
   int iovcnt = 0;
-  const ACE_Message_Block* b = 0;
-  for (b = cdr.begin ();
-       b != cdr.end () && iovcnt < TAO_WRITEV_MAX;
+  for (const ACE_Message_Block* b = this->encoder_->begin ();
+       b != this->encoder_->end () && iovcnt < TAO_WRITEV_MAX;
        b = b->cont ())
     {
       iov[iovcnt].iov_base = b->rd_ptr ();
       iov[iovcnt].iov_len =  b->length ();
-      //      ACE_DEBUG ((LM_DEBUG,"send_cdr_buffer:length=%d\n",b->length ()));
-      // print the buffer.
-      //      this->dump_buf (b->rd_ptr (),b->length ());
-      iovcnt++;
-    }
-  for (b = mb; b!=0 && iovcnt < TAO_WRITEV_MAX; b=b->cont ())
-    {
-      iov [iovcnt].iov_base = b->rd_ptr ();
-      iov [iovcnt].iov_len = b->length ();
       iovcnt++;
     }
   // send the message.
@@ -528,28 +577,66 @@ TAO_SFP::send_cdr_buffer (TAO_OutputCDR &cdr,ACE_Message_Block *mb)
 }
 
 int
-TAO_SFP::send_start (void)
+SFP::send_start (void)
 {
+  int result;
+  // Start message is in network byte order.
+  // construct the start message
+  flowProtocol::Start start;
+      
   // copy the magic number into the message
+  start.magic_number [0] = ACE_HTONS ('=');
+  start.magic_number [1] = ACE_HTONS ('S');
+  start.magic_number [2] = ACE_HTONS ('T');
+  start.magic_number [3] = ACE_HTONS ('A');
+      
+  // put the version number into the field
+  start.major_version = ACE_HTONS (TAO_SFP_MAJOR_VERSION);
+  start.minor_version = ACE_HTONS (TAO_SFP_MINOR_VERSION);
+      
+  // flags field is all zeroes
+  start.flags = ACE_HTONS (0);
+
   this->state_ = ACTIVE_START;
+
   // Now send the network byte ordered start message.
-  int n = this->dgram_.send ((char *)&this->start_,
-                             this->start_len_,
+  int n = this->dgram_.send ((char *)&start,
+                             sizeof (start),
                              this->receiver_inet_addr_);
-  if (n!= this->start_len_)
+  if (n!= sizeof (start))
     ACE_ERROR_RETURN ((LM_ERROR,"start send failed\n"),-1);
 
   ACE_DEBUG ((LM_DEBUG," Start sent\n"));
+//   // non-interval timer. 
+//   result = this->reactor_->schedule_timer (this,
+//                                            0,
+//                                            this->timeout1_);
+//   if (result != 0)
+//     return result;
+
   return 0;
 }
 
 int
-TAO_SFP::send_startReply (void)
+SFP::send_startReply (void)
 {
-  int n = this->dgram_.send ((char *)&this->start_reply_,
-                             this->start_reply_len_,
+  int result;
+
+  flowProtocol::StartReply start_reply;
+  
+  // copy the magic number into the message
+  start_reply.magic_number [0] = ACE_HTONS ('=');
+  start_reply.magic_number [1] = ACE_HTONS ('S');
+  start_reply.magic_number [2] = ACE_HTONS ('T');
+  start_reply.magic_number [3] = ACE_HTONS ('R');
+
+  start_reply.flags = ACE_HTONS (0);
+
+  // Now send the network byte ordered start message.
+  int n = this->dgram_.send ((char *)&start_reply,
+                             sizeof (start_reply),
                              this->receiver_inet_addr_);
-  if (n!= this->start_reply_len_)
+  if (n!= sizeof (start_reply))
     ACE_ERROR_RETURN ((LM_ERROR,"startreply send failed\n"),-1);
 
   ACE_DEBUG ((LM_DEBUG," startReply sent\n"));
@@ -557,7 +644,7 @@ TAO_SFP::send_startReply (void)
 }
 
 int
-TAO_SFP::handle_timeout (const ACE_Time_Value &tv,
+SFP::handle_timeout (const ACE_Time_Value &tv,
                      const void *arg)
 {
   int result;
@@ -587,9 +674,6 @@ TAO_SFP::handle_timeout (const ACE_Time_Value &tv,
         {
           this->end_stream ();
         }
-      break;
-    default:
-      ACE_DEBUG ((LM_DEBUG,"Handle_timeout: No Action in this state %d",this->state_));
     }
   return 0;
 }
@@ -598,49 +682,50 @@ TAO_SFP::handle_timeout (const ACE_Time_Value &tv,
 // socket. Currently both the receiver and sender side input is
 // handled in this same handle_input ().
 int 
-TAO_SFP::handle_input (ACE_HANDLE fd)
+SFP::handle_input (ACE_HANDLE fd)
 {
-  ACE_DEBUG ((LM_DEBUG,"TAO_SFP::handle_input\n"));
   flowProtocol::MsgType msg_type;
   ACE_INET_Addr sender;
-  char peek_buffer [MAGIC_NUMBER_LEN+2];// 2 is for flags + message_type.
-  int peek_len = MAGIC_NUMBER_LEN +2;
-  ssize_t n =this->dgram_.recv (peek_buffer,
-                                peek_len,
+  char magic_number[4];
+  ssize_t n =this->dgram_.recv (magic_number,
+                                sizeof(magic_number),
                                 sender,
                                 MSG_PEEK);
-  ACE_OS::strncpy (this->magic_number_,
-                   peek_buffer,
-                   this->magic_number_len_);
-  this->magic_number_ [this->magic_number_len_] = 0;
   if (n == -1)
     ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),-1);
   else if (n==0)
     ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
 
-  if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_START_MAGIC_NUMBER) == 0)
+  // convert from network byte order to host order.
+
+  magic_number [0] = ACE_NTOHS (magic_number [0]);
+  magic_number [1] = ACE_NTOHS (magic_number [1]);
+  magic_number [2] = ACE_NTOHS (magic_number [2]);
+  magic_number [3] = ACE_NTOHS (magic_number [3]);
+
+  char *magic_string = this->magic_number_to_string (magic_number);
+  
+  if (ACE_OS::strcmp (magic_string,TAO_SFP_START_MAGIC_NUMBER) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)Start message received\n"));
       msg_type = flowProtocol::start;
     }
-  else if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_STARTREPLY_MAGIC_NUMBER) == 0)
+  else if (ACE_OS::strcmp (magic_string,TAO_SFP_STARTREPLY_MAGIC_NUMBER) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t)StartReply message received\n"));
       msg_type = flowProtocol::startReply;
     }
-  else if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_MAGIC_NUMBER) == 0)
+  else if (ACE_OS::strcmp (magic_string,TAO_SFP_MAGIC_NUMBER) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) frameHeader received\n"));
-      //      msg_type = flowProtocol::SimpleFrame;
-      msg_type = (flowProtocol::MsgType)peek_buffer [MESSAGE_TYPE_OFFSET];
-      ACE_DEBUG ((LM_DEBUG,"Message Type = %d\n",msg_type));
+      msg_type = flowProtocol::SimpleFrame;
     }
-  else if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_FRAGMENT_MAGIC_NUMBER) == 0)
+  else if (ACE_OS::strcmp (magic_string,TAO_SFP_FRAGMENT_MAGIC_NUMBER) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) fragment Header received\n"));
       msg_type = flowProtocol::Fragment;
     }
-  else if (ACE_OS::strcmp (this->magic_number_,TAO_SFP_CREDIT_MAGIC_NUMBER) == 0)
+  else if (ACE_OS::strcmp (magic_string,TAO_SFP_CREDIT_MAGIC_NUMBER) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) credit message received\n"));
       msg_type = flowProtocol::Credit;
@@ -667,6 +752,7 @@ TAO_SFP::handle_input (ACE_HANDLE fd)
                                    sender);
             if (n != sizeof (credit))
               ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input - Credit\n"),0);
+            this->credit_ += credit.cred_num;
             break;
           }
         case flowProtocol::start:
@@ -680,53 +766,15 @@ TAO_SFP::handle_input (ACE_HANDLE fd)
               ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input - Start\n"),0);
             else
               ACE_DEBUG ((LM_DEBUG,"Start message consumed\n"));
+            //          ACE_DEBUG ((LM_DEBUG,"Unexpected message while
+            // Credit expected\n"));
             break;
           }
-
-        case flowProtocol::Frame:
         case flowProtocol::SimpleFrame:
           {
             ACE_Message_Block * mb =this->read_simple_frame ();
-            if (mb != 0)
-              this->callback_->receive_frame (mb);
-            else
-              {
-                if (!this->more_fragments_)
-                  {
-                    char buf[BUFSIZ];
-                    // consume the wrong UDP frame.
-                    this->dgram_.recv (buf,
-                                       BUFSIZ,
-                                       sender);
-                  }
-              }
-            break;
+            this->callback_->receive_frame (mb);
           }
-        case flowProtocol::Fragment:
-          {
-            ACE_DEBUG ((LM_DEBUG,"Fragment received\n"));
-            ACE_Message_Block *result = this->read_fragment ();
-            // no more fragments.
-            if (result != 0)
-              this->callback_->receive_frame (result);
-            break;
-          }
-        case flowProtocol::EndofStream:
-          {
-            char *buf;
-            ACE_NEW_RETURN (buf,
-                            char [ this->frame_header_len_],
-                            -1);
-            n = this->dgram_.recv (buf,
-                                   this->frame_header_len_,
-                                   sender);
-            if (n == -1)
-              ACE_ERROR_RETURN ((LM_ERROR,"Error reading EndofStream;%p",""),-1);
-            this->callback_->end_stream ();
-            return -1;
-          }
-        default:
-          break;
         }
       break;
     case REPLY_RECEIVED:
@@ -744,56 +792,38 @@ TAO_SFP::handle_input (ACE_HANDLE fd)
             else
               ACE_DEBUG ((LM_DEBUG,"start reply consumed\n"));
           }
-          break;
-        default:
-          ACE_DEBUG ((LM_DEBUG,"Invalid message in state REPLY_RECEIVED\n"));
-          break;
         }
-      break;
-    default:
-      break;
     }
   return 0;
 }
 
-int
-TAO_SFP::end_stream (void)
+char *
+SFP::magic_number_to_string (char *magic_number)
 {
-  int result;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  char *buf;
+  ACE_NEW_RETURN (buf,
+                  char [5],
+                  0);
+  for (int i=0;i<4;i++)
     {
-      ACE_DEBUG ((LM_DEBUG,"SFP - ending the stream\n"));
-      // send the EndofStream message.
-      this->frame_header_.flags = TAO_ENCAP_BYTE_ORDER;
-      this->frame_header_.message_type = flowProtocol::EndofStream;
-      this->output_cdr_.reset ();
-      this->output_cdr_.encode (flowProtocol::_tc_frameHeader,
-                                &this->frame_header_,
-                                0,
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ssize_t n = this->dgram_.send (this->output_cdr_.begin ()->rd_ptr (),
-                                     this->output_cdr_.begin ()->length (),
-                                     this->receiver_inet_addr_);
-      if ((n==-1) || (n==0))
-        ACE_ERROR_RETURN ((LM_ERROR,"Error sending endofstream message:%p",""),-1);
-      result = this->reactor_->remove_handler (this,
-                                                   ACE_Event_Handler::READ_MASK);
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("TAO_SFP::end_stream ()\n");
-      return -1;
+      buf [i] = magic_number [i];
+      ACE_DEBUG ((LM_DEBUG,"%c ",buf [i]));
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  buf[i] = 0;
+  return buf;
+}
+
+int
+SFP::end_stream (void)
+{
+  ACE_DEBUG ((LM_DEBUG,"SFP - ending the stream\n"));
+  int result = this->reactor_->remove_handler (this,
+                                               ACE_Event_Handler::READ_MASK);
   return result;
 }
                                   
 int
-TAO_SFP::register_dgram_handler (void)
+SFP::register_dgram_handler (void)
 {
   int result;
   result = this->reactor_->register_handler (this,
@@ -802,345 +832,87 @@ TAO_SFP::register_dgram_handler (void)
 }
 
 ACE_HANDLE
-TAO_SFP::get_handle (void) const
+SFP::get_handle (void) const
 {
   return this->dgram_.get_handle ();
 }
 
 ACE_Message_Block *
-TAO_SFP::read_simple_frame (void)
+SFP::read_simple_frame (void)
 {
-  ACE_Message_Block *message_block = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_DEBUG ((LM_DEBUG,"Reading simple frame\n"));
-      // Check to see what the length of the message is.
+  ACE_DEBUG ((LM_DEBUG,"Reading simple frame\n"));
+  // Check to see what the length of the message is.
 
-      flowProtocol::frameHeader frame_header;
+  flowProtocol::frameHeader frame_header;
+  char *buf;
+  ssize_t firstlen =sizeof (frame_header.magic_number)+sizeof (frame_header.flags);
+  ssize_t buflen =firstlen+2*sizeof (CORBA::ULong)+3;// hack to ensure
+  //  that buffer is aligned for CDR.
 
-      int result = 
-        this->read_frame_header (frame_header);
-      
-      if (result < 0)
-        return 0;
-      int byte_order = frame_header.flags & 0x1;
-      int message_len = frame_header.message_size;
-
-      ACE_NEW_RETURN (message_block,
-                      ACE_Message_Block (message_len),
-                      0);
-      ACE_INET_Addr sender;
-      int n = this->dgram_.recv (message_block->wr_ptr (),message_len,sender);
-      if (n == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
-      else if (n==0)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
-      else if (n != message_len)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame:message truncated\n"),0);
-      // print the buffer.
-      //      this->dump_buf (message,n);
-      // skip over the frame header.
-      message_block->rd_ptr (this->frame_header_len_);
-      message_block->wr_ptr (n);
-      if (frame_header.flags & 0x2)
-        {
-          ACE_DEBUG ((LM_DEBUG,"fragmented frame:0th fragment\n"));
-          this->more_fragments_ = 1;
-          // read the frame info.
-          ACE_Message_Block frame_info_mb (message_len-this->frame_header_len_+ACE_CDR::MAX_ALIGNMENT);
-          ACE_CDR::mb_align (&frame_info_mb);
-          frame_info_mb.copy (message_block->rd_ptr (),
-                              message_block->length ());
-          // print the buffer.
-          //          this->dump_buf (message_block->rd_ptr (),16);
-          TAO_InputCDR frame_info_cdr (&frame_info_mb,byte_order);
-          flowProtocol::frame frame_info;
-          frame_info_cdr.decode (flowProtocol::_tc_frame,
-                                 &frame_info,
-                                 0,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          ACE_DEBUG ((LM_DEBUG,"frame.timestamp = %d, frame.synchsource = %d, frame.sequence_num = %d\n",
-                      frame_info.timestamp,
-                      frame_info.synchSource,
-                      frame_info.sequence_num));
-          // The remaining message in the CDR stream is the fragment data for frag.0
-          ACE_Message_Block *data = 
-            frame_info_cdr.start ()->clone ();
-          ACE_DEBUG ((LM_DEBUG,"Length of 0th fragment= %d\n",data->length ()));
-          TAO_SFP_Fragment_Table_Entry *fragment_entry = 0;
-          TAO_SFP_Fragment_Node *new_node;
-          ACE_NEW_RETURN (new_node,
-                          TAO_SFP_Fragment_Node,
-                          0);
-          new_node->fragment_info_.frag_sz = data->length ();
-          new_node->fragment_info_.frag_number = 0;
-          new_node->fragment_info_.source_id = frame_info.source_ids [0];
-          new_node->data_ = data;
-          if (this->fragment_table_.find (frame_info.sequence_num,fragment_entry) == 0)
-            {
-              // This case can happen where a nth (n > 0)fragment is received before the 0th fragment.
-              ACE_DEBUG ((LM_DEBUG,"fragment table entry found for 0th fragment:\n"));
-              result = fragment_entry->fragment_set_.insert (*new_node);
-              if (result != 0)
-                ACE_ERROR_RETURN ((LM_ERROR,"insert for 0th fragment failed\n"),0);
-              // check if all the fragments have been received.
-              return check_all_fragments (fragment_entry);
-            }
-          else
-            {
-              ACE_DEBUG ((LM_DEBUG,"fragment table entry not found for 0th fragment\n"));
-              TAO_SFP_Fragment_Table_Entry *new_entry;
-              ACE_NEW_RETURN (new_entry,
-                              TAO_SFP_Fragment_Table_Entry,
-                              0);
-              result = new_entry->fragment_set_.insert (*new_node);
-              if (result != 0)
-                ACE_ERROR_RETURN ((LM_ERROR,"insert for 0th fragment failed\n"),0);
-              // not found. so bind a new entry.
-              result = this->fragment_table_.bind (frame_info.sequence_num,new_entry);
-              if (result != 0)
-                ACE_ERROR_RETURN ((LM_ERROR,"fragment table bind failed\n"),0);
-	      return 0;
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("read_simple_frame");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return message_block;
-}
+  ACE_DEBUG ((LM_DEBUG,"firstlen = %d,buflen =%d\n",firstlen,buflen));
+  ACE_NEW_RETURN (buf,
+                  char [buflen],
+                  0);
 
-int
-TAO_SFP::read_frame_header (flowProtocol::frameHeader &frame_header)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_INET_Addr sender;
-      char *buf;
-      ACE_NEW_RETURN (buf,
-                      char [this->frame_header_len_+ACE_CDR::MAX_ALIGNMENT],
-                      0);
-      ssize_t n =this->dgram_.recv (buf,
-				   this->frame_header_len_,
-				   sender,
-				   MSG_PEEK);
-      if (n == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame -peek:%p",""),0);
-      else if (n==0)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame -peek:%p",""),0);
-      else if (n != this->frame_header_len_)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame - not able to peek\n"),0);
-      // print the buffer.
-      //      this->dump_buf (buf,n);
-      ACE_Message_Block mb (n+ACE_CDR::MAX_ALIGNMENT);
-      ACE_CDR::mb_align (&mb);
-      int result
-        = mb.copy (buf,n);
-      if (result == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"Message_Block::copy failed\n"),0);
-      // buf[4] is the byte order.
-      int byte_order = buf[4] & 0x1;
-      ACE_DEBUG ((LM_DEBUG,"mb len = %d,byte_order=%d\n",mb.length (),byte_order));
-      TAO_InputCDR cdr (&mb,byte_order);
-      //  cdr >>= frame_header;
-      cdr.decode (flowProtocol::_tc_frameHeader,
-                  &frame_header,
-                  0,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,"message_type = %d, message_size = %d,message_flags = %d\n",
-                  frame_header.message_type,frame_header.message_size,frame_header.flags));
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"TAO_SFP::read_frame_header");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  return 0;
-}
-
-ACE_Message_Block *
-TAO_SFP::read_fragment (void)
-{
-  TAO_SFP_Fragment_Table_Entry *fragment_entry = 0;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      flowProtocol::fragment fragment;
-      ACE_INET_Addr sender;
-      char *buf = 0;
-      ACE_NEW_RETURN (buf,
-                      char [this->fragment_len_+ACE_CDR::MAX_ALIGNMENT],
-                      0);
-      ssize_t n =this->dgram_.recv (buf,
-                                    this->fragment_len_,
-                                    sender,
-                                    MSG_PEEK);
-      if (n == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_fragment -peek:%p",""),0);
-      else if (n==0)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame -peek:%p",""),0);
-      else if (n != this->fragment_len_)
-        ACE_ERROR_RETURN ((LM_ERROR,"SFP::read_simple_frame - not able to peek\n"),0);
-      // print the buffer.
-      this->dump_buf (buf,n);
-      ACE_Message_Block mb (n+ACE_CDR::MAX_ALIGNMENT);
-      ACE_CDR::mb_align (&mb);
-      int result
-        = mb.copy (buf,n);
-      if (result == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"read_fragment::Message_Block::copy failed\n"),0);
-      // buf[4] is the byte order.
-      int byte_order = buf[4] & 0x1;
-      ACE_DEBUG ((LM_DEBUG,"mb len = %d,byte_order=%d\n",mb.length (),byte_order));
-      TAO_InputCDR cdr (&mb,byte_order);
-      //  cdr >>= frame_header;
-      cdr.decode (flowProtocol::_tc_fragment,
-                  &fragment,
-                  0,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG,"frag number = %d, frag size = %d,source id  = %d\n",
-                  fragment.frag_number,fragment.frag_sz,fragment.source_id));
-
-      ACE_Message_Block *data;
-      ACE_NEW_RETURN (data,
-                      ACE_Message_Block(fragment.frag_sz),
-                      0);
-                       
-      // Read the fragment.
-      n = this->dgram_.recv (data->wr_ptr (),fragment.frag_sz,sender);
-      if ((n == -1) || (n==0))
-        ACE_ERROR_RETURN ((LM_ERROR,"TAO_SFP::read_fragment:%p",""),0);
-      // move past the fragment header.
-      data->rd_ptr (this->fragment_len_);
-      data->wr_ptr (n);
-      ACE_DEBUG ((LM_DEBUG,"length of %dth fragment is: %d\n",
-                  fragment.frag_number,
-                  data->length ()));
-
-      TAO_SFP_Fragment_Node *new_node;
-      ACE_NEW_RETURN (new_node,
-                      TAO_SFP_Fragment_Node,
-                      0);
-      new_node->fragment_info_ = fragment;
-      new_node->data_ = data;
-      if (this->fragment_table_.find (fragment.sequence_num,fragment_entry) == 0)
-        {
-          // Already an entry exists. Traverse the list and insert it at the right place.
-          result = fragment_entry->fragment_set_.insert (*new_node);
-          if (result != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,"insert for %dth node failed\n",fragment.frag_number),0);
-          // check if all the fragments have been received.
-        }
-      else 
-        {
-          ACE_NEW_RETURN (fragment_entry,
-                          TAO_SFP_Fragment_Table_Entry,
-                          0);
-          fragment_entry->fragment_set_.insert (*new_node);
-          // bind a new entry for this sequence number.
-          result = this->fragment_table_.bind (fragment.sequence_num,fragment_entry);
-          if (result != 0)
-            ACE_ERROR_RETURN ((LM_ERROR,"bind for %dth fragment failed\n",
-                               fragment.frag_number),0);
-        }
-      if (!(fragment.flags & 0x2))
-        {
-          ACE_DEBUG ((LM_DEBUG,"Last fragment received\n"));
-          // if bit 1 is not set then there are 
-          // no more fragments.
-          fragment_entry->last_received_ = 1;
-          // since fragment number starts from 0 to n-1 we add 1.
-          fragment_entry->num_fragments_ = fragment.frag_number + 1;
-        }
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("TAO_SFP::read_fragment");
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  return check_all_fragments (fragment_entry);
-}
+  ACE_INET_Addr sender;
 
-ACE_Message_Block*
-TAO_SFP::check_all_fragments (TAO_SFP_Fragment_Table_Entry *fragment_entry)
-{
-  ACE_DEBUG ((LM_DEBUG,"table size: %d, num_fragments: %d\n",fragment_entry->fragment_set_.size (),fragment_entry->num_fragments_));
-  // check to see if all the frames have been received.
-  if (fragment_entry->fragment_set_.size () == fragment_entry->num_fragments_)
-    {
-      ACE_DEBUG ((LM_DEBUG,"all fragments have been received\n"));
-      // all the fragments have been received
-      // we can now chain the ACE_Message_Blocks in the fragment_set_ and then return them 
-      // back.
-      ACE_Message_Block *frame = 0,*head = 0;
-      FRAGMENT_SET_ITERATOR frag_iterator (fragment_entry->fragment_set_);
-      TAO_SFP_Fragment_Node *node;
-      for (;frag_iterator.next (node) != 0;frag_iterator.advance ())
-        {
-//           ACE_Message_Block *block = node->data_;
-//           char *buf =block->rd_ptr ();
-//           ACE_DEBUG ((LM_DEBUG,"length of buf = %d\n",block->length ()));
-//           for (int i=0;i<block->length ();i++)
-//             ACE_DEBUG ((LM_DEBUG,"%c ",buf[i]));
-//           ACE_DEBUG ((LM_DEBUG,"\n"));
-
-          if (!head)
-            {
-              frame = node->data_;
-              head = frame;
-            }
-          else
-            {
-              frame->cont (node->data_);
-              frame = node->data_;
-            }
-        }
-      return head;
-    }
-  return 0;
-}
+  buf +=3;
+  ssize_t n =this->dgram_.recv (buf,
+                                buflen,
+                                sender,
+                                MSG_PEEK);
+  if (n == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
+  else if (n==0)
+    ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
+  for (int i=0;i<4;i++)
+    ACE_DEBUG ((LM_DEBUG,"%c ",buf[i]));
+  //skip the magic_number..
+  buf += 4 ;
+
+  // Get the byte order from the flags.
+
+  int byte_order = buf[0];
+  ACE_DEBUG ((LM_DEBUG,"byte_order = %d\n",byte_order));
+  // move past the flags.
+  buf += 1;
+  //  CORBA::ULong *header = (CORBA::ULong *) (buf+firstlen);
+  //  ACE_DEBUG ((LM_DEBUG,"first ulong = %d, second ulong = %d",*(CORBA::ULong*)(buf+firstlen),
+  //              *(CORBA::ULong *)(buf+firstlen+sizeof (CORBA::ULong))));
+
+  //  ACE_DEBUG ((LM_DEBUG,"first ulong = %d, second ulong = %d",header [0],header[1]));
+
+
+  ACE_Message_Block mb (buf,buflen-firstlen+CDR::MAX_ALIGNMENT);
+  CDR::mb_align (&mb);
+  mb.wr_ptr (buflen-firstlen);
+  ACE_DEBUG ((LM_DEBUG,"mb len = %d\n",mb.length ()));
+  TAO_InputCDR cdr (&mb,byte_order);
+  cdr.read_octet (frame_header.message_type);
+  cdr.read_ulong (frame_header.message_size);
+  
+  ACE_DEBUG ((LM_DEBUG,"message_type = %d, message_size = %d",
+              frame_header.message_type,frame_header.message_size));
+
+  char *message;
+  int message_len = buflen+frame_header.message_size;
+  ACE_NEW_RETURN (message,
+                  char [message_len],
+                  0);
+
+  ACE_DEBUG ((LM_DEBUG,"message_len = %d\n",message_len));
+  n = this->dgram_.recv (message,message_len,sender);
+  if (n == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
+  else if (n==0)
+    ACE_ERROR_RETURN ((LM_ERROR,"SFP::handle_input -peek"),0);
 
-void
-TAO_SFP::dump_buf(char *buffer,int size) 
-{
-  char *buf = buffer;
-  ACE_DEBUG ((LM_DEBUG,"========================================n"));
-  for (int i=0;i<size;i++)
-    ACE_DEBUG ((LM_DEBUG,"%d ",buf[i]));
-  ACE_DEBUG ((LM_DEBUG,"n========================================n"));
+  ACE_Message_Block *message_block;
+  ACE_NEW_RETURN (message_block,
+                  ACE_Message_Block (message+buflen,
+                                     message_len-buflen),
+                  0);
+  message_block->wr_ptr (message_len-buflen);
+  ACE_DEBUG ((LM_DEBUG,"messageblock length: ",message_block ->length ()));
+  return message_block;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_DNode<TAO_SFP_Fragment_Node>;
-template class ACE_Ordered_MultiSet<TAO_SFP_Fragment_Node>;
-template class ACE_Ordered_MultiSet_Iterator<TAO_SFP_Fragment_Node>;
-template class ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<unsigned int, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<unsigned int, TAO_SFP_Fragment_Table_Entry *>;
-template class ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_DNode<TAO_SFP_Fragment_Node>
-#pragma instantiate ACE_Ordered_MultiSet<TAO_SFP_Fragment_Node>
-#pragma instantiate ACE_Ordered_MultiSet_Iterator<TAO_SFP_Fragment_Node>
-#pragma instantiate ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<unsigned int, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<unsigned int, TAO_SFP_Fragment_Table_Entry *>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<unsigned int, TAO_SFP_Fragment_Table_Entry *, ACE_Hash<unsigned int>, ACE_Equal_To<unsigned int>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h
index c6b3212cb5f..2dfa734a1c5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -17,20 +17,25 @@
 #if !defined (TAO_AV_SFP_H)
 #define TAO_AV_SFP_H
 
-#include "orbsvcs/orbsvcs_export.h"
 #include "ace/SOCK_Dgram.h"
 #include "orbsvcs/sfpC.h"
 
-#define MAGIC_NUMBER_LEN 5
-#define MESSAGE_TYPE_OFFSET 5
-#define TAO_WRITEV_MAX 128
+// default arguments to pass to use for the ORB
+const char *TAO_SFP_ORB_ARGUMENTS = "-ORBobjrefstyle URL";
 
+// SFP magic numbers
+const char *TAO_SFP_MAGIC_NUMBER = "=SFP";
+const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER = "FRAG";
+const char *TAO_SFP_START_MAGIC_NUMBER = "=STA";
+const char *TAO_SFP_CREDIT_MAGIC_NUMBER = "=CRE";
+const char *TAO_SFP_STARTREPLY_MAGIC_NUMBER = "=STR";
 
-#define SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE
-//#define SFP_MAX_PACKET_SIZE 100
+// SFP version 1.0
+const unsigned char TAO_SFP_MAJOR_VERSION = 1;
+const unsigned char TAO_SFP_MINOR_VERSION = 0;
 
-
-// various message class for SFP.
+// lengths of various SFP headers
+const unsigned char TAO_SFP_FRAME_HEADER_LEN = 12;
 
 class TAO_ORBSVCS_Export SFP_Callback
   // =TITLE
@@ -51,39 +56,9 @@ public:
   // establshment.
   
   virtual int receive_frame (ACE_Message_Block *frame) =0;
-  // upcall to the application to receive a frame.
-
-  virtual void end_stream (void) = 0;
-  // called when the EndofStream message is received.
 };
 
-class TAO_SFP_Fragment_Node
-{
-public:
-  TAO_SFP_Fragment_Node (void)
-    :data_ (0)
-    {}
-  flowProtocol::fragment fragment_info_;
-  ACE_Message_Block *data_;
-  friend int operator< (const TAO_SFP_Fragment_Node& left,
-                        const TAO_SFP_Fragment_Node& right);
-};
-
-class TAO_SFP_Fragment_Table_Entry
-{
-public:
-  TAO_SFP_Fragment_Table_Entry (void)
-    :last_received_ (0),
-     num_fragments_ (0)
-    {}
-  int last_received_;
-  size_t num_fragments_;
-  ACE_Ordered_MultiSet<TAO_SFP_Fragment_Node> fragment_set_;
-};
-
-typedef ACE_Ordered_MultiSet_Iterator<TAO_SFP_Fragment_Node> FRAGMENT_SET_ITERATOR;
-
-class TAO_ORBSVCS_Export TAO_SFP :public virtual ACE_Event_Handler
+class TAO_ORBSVCS_Export SFP :public virtual ACE_Event_Handler
   // = TITLE
   //     SFP implementation on UDP.
   //
@@ -93,22 +68,6 @@ class TAO_ORBSVCS_Export TAO_SFP :public virtual ACE_Event_Handler
 
 {
 public:
-  // default arguments to pass to use for the ORB
-  static const char *TAO_SFP_ORB_ARGUMENTS;
-
-  // SFP magic numbers
-  static const char *TAO_SFP_MAGIC_NUMBER;
-  static const char *TAO_SFP_FRAGMENT_MAGIC_NUMBER;
-  static const char *TAO_SFP_START_MAGIC_NUMBER;
-  static const char *TAO_SFP_CREDIT_MAGIC_NUMBER;
-  static const char *TAO_SFP_STARTREPLY_MAGIC_NUMBER;
-
-  // SFP version 1.0
-  static const unsigned char TAO_SFP_MAJOR_VERSION;
-  static const unsigned char TAO_SFP_MINOR_VERSION;
-
-// lengths of various SFP headers
-  static const unsigned char TAO_SFP_FRAME_HEADER_LEN;
   enum State
   {
     ACTIVE_START,
@@ -119,11 +78,11 @@ public:
     START_RECEIVED
   };
 
-  TAO_SFP (CORBA::ORB_ptr orb,
-           ACE_Reactor* reactor,
-           ACE_Time_Value timeout1,
-           ACE_Time_Value timeout2,
-           SFP_Callback *callback);
+  SFP (CORBA::ORB_ptr orb,
+       ACE_Reactor* reactor,
+       ACE_Time_Value timeout1,
+       ACE_Time_Value timeout2,
+       SFP_Callback *callback);
   // constructor.
 
   virtual int start_stream (const char *receiver_addr);
@@ -133,9 +92,15 @@ public:
   virtual int start_stream (const char *local_addr,int credit_);
   // Passive start.
 
-  virtual int send_frame (ACE_Message_Block *frame);
+  virtual int send_simple_frame (ACE_Message_Block *frame);
   // sends a single frame over UDP.
 
+  virtual int send_frame (ACE_Message_Block *frame);
+  // This will send a larger frame fragmenting if necessary.
+
+  virtual ACE_Message_Block* read_simple_frame (void);
+  // receives a single frame from the network.
+
   virtual int end_stream (void);
   // terminates the stream.
 
@@ -148,14 +113,16 @@ public:
   virtual ACE_HANDLE get_handle (void) const;
 private:
 
-  ACE_Message_Block* read_simple_frame (void);
-  // receives a single frame from the network.
-
-  int read_frame_header (flowProtocol::frameHeader &frame_header);
-  // reads the frame header from the peek buffer in the datagram.
+  int create_cdr_buffer (char *message,
+                         size_t length);
+  // Helper - copies length bytes from the given message into the CDR
+  // buffer. Returns 0 on success, -1 on failure
 
-  ACE_Message_Block* read_fragment (void);
-  // reads a fragment from the wire.
+  ////  ACE_Message_Block *create_message_block (void);
+  void set_cdr_length (void);
+  // Helper method - copies the buffer in encoder_
+  // into a new ACE_Message_Block and returns it.
+  // Returns 0 on failure
 
   void create_local_dgram (void);
   // Create the local dgram endpoint.
@@ -169,30 +136,25 @@ private:
   int send_startReply (void);
   // sends the StartReply message to the receiver.
 
-  int send_cdr_buffer (TAO_OutputCDR &cdr,
-                       ACE_Message_Block *mb);
-  // sends the cdr buffer using iovecs.
+  int send_cdr_buffer (void);
+  // sends the encoders cdr buffer using iovecs.
+
+  char *magic_number_to_string (char *magic_number);
+  // appends a 0 to the end of the magic number.
 
   int register_dgram_handler (void);
   // registers the dgram socket with the reactor.
 
-  ACE_Message_Block *check_all_fragments (TAO_SFP_Fragment_Table_Entry *fragment_entry);
-  // checks if all the fragments for this entry has been received and returns the 
-  // head of the chain of message blocks for that frame.
-
-  void dump_buf (char *buf,int n);
-  // dumps the buffer to the screen.
-
   CORBA::ORB_ptr orb_;
   // ORB reference.
 
   ACE_Reactor* reactor_;
   // Used for registering the dgram handler.
 
-  TAO_OutputCDR output_cdr_;
-  // Use the TAO CDR decoder to decode everything
+  TAO_OutputCDR *encoder_;
+  // Use the TAO CDR encoder to encode everything
 
-  //  TAO_InputCDR input_cdr_;
+  TAO_InputCDR *decoder_;
   // Use the TAO CDR encoder to encode everything
   
   ACE_SOCK_Dgram dgram_;
@@ -204,6 +166,9 @@ private:
   int startReply_tries_;
   // Number of tries to send a StartReply message.
 
+  CORBA::ULong credit_;
+  // Credit on the number of frames.
+
   ACE_Time_Value timeout1_;
   // Timeout used for Start on Sender side and also for Credit on
   // receiver side.
@@ -214,6 +179,7 @@ private:
 
   State state_;
   // State variable.
+  // @@We can use the state pattern here.
 
   const char *receiver_addr_;
   // The address of the receiver to which we're connected to.
@@ -226,36 +192,6 @@ private:
   
   int sequence_num_;
   // sequence number of the packet.
-
-  flowProtocol::frameHeader frame_header_;
-  ssize_t frame_header_len_;
-  // frame header to be sent with all frames.
-  // length of the frame header.
-
-  flowProtocol::fragment fragment_;
-  ssize_t fragment_len_;
-  // fragment header for each fragment.
-
-  flowProtocol::Start start_;
-  ssize_t start_len_;
-  // Start message and its length.
-
-  flowProtocol::StartReply start_reply_;
-  ssize_t start_reply_len_;
-  // StartReply message and its length.
-  
-  flowProtocol::credit credit_;
-  ssize_t credit_len_;
-  CORBA::ULong credit_num_;
-  // Credit message and its  length.
-
-  char magic_number_[MAGIC_NUMBER_LEN];
-  // used for peeking the magic_number.
-  const size_t magic_number_len_;
-  u_int more_fragments_;
-  // boolean flags indicating that there are more fragments.
-  ACE_Hash_Map_Manager<CORBA::ULong,TAO_SFP_Fragment_Table_Entry*,ACE_Null_Mutex> fragment_table_;
-  // chain of fragments of the current frame.
 };
 
 #endif /* !defined (TAO_SFP_H) */
diff --git a/TAO/orbsvcs/orbsvcs/AVStreams.idl b/TAO/orbsvcs/orbsvcs/AVStreams.idl
index cddb915e4c8..0d23279ddc1 100644
--- a/TAO/orbsvcs/orbsvcs/AVStreams.idl
+++ b/TAO/orbsvcs/orbsvcs/AVStreams.idl
@@ -1,4 +1,5 @@
 /* -*- C++ -*- */
+
 // $Id$
 
 // ============================================================================
@@ -10,14 +11,10 @@
 //   AVStreams.idl
 //
 // = AUTHOR
-//    Sumedh Mungee <sumehd@cs.wustl.edu> and Nagarajan Surendran
-//    <naga@cs.wustl.edu>
+//    OMG
 // 
 // ============================================================================
 
-#ifndef TAO_AV_STREAMS_IDL
-#define TAO_AV_STREAMS_IDL
-
 #include "CosPropertyService.idl"
 
 #pragma prefix "omg.org"
@@ -240,9 +237,6 @@ module AVStreams
       // be used if the streamendpoints have been created independent
       // of a MMDevice
       
-      void unbind_dev(in MMDevice dev, in flowSpec the_spec) 
-        raises (streamOpFailed, noSuchFlow);
-
       void unbind_party (in StreamEndPoint the_ep,
                          in flowSpec the_spec)
         raises (streamOpFailed, noSuchFlow);
@@ -253,11 +247,6 @@ module AVStreams
         raises (streamOpFailed);
       // unbind the stream. Same effect as Basic_StreamCtrl::destroy
       // ()
-
-      VDev get_related_vdev(in MMDevice adev, 
-                            out StreamEndPoint sep) 
-        raises (streamOpFailed);
-
     };
   
   interface MCastConfigIf : CosPropertyService::PropertySet{
@@ -292,7 +281,7 @@ module AVStreams
         raises (PropertyException,
                 streamOpFailed);
       // Multicasting operations are not supported yet.
-  };
+    };
 
   interface StreamEndPoint : CosPropertyService::PropertySet{
       // = DESCRIPTION
@@ -374,7 +363,7 @@ module AVStreams
       void set_source_id (in long source_id);
       // Used to set a unique id for packets sent by this
       // streamendpoint.
-  };
+    };
 
   interface StreamEndPoint_A : StreamEndPoint
     {
@@ -635,27 +624,16 @@ module AVStreams
                              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);
 
-      // 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>
-        // The out value of flowProtocol contains SFP version
-        // supported and all options including "Credit".
-        raises(failedToListen, AVStreams::FPError, 
-               AVStreams::QoSRequestFailed);
-    };
-
-  interface FlowProducer : FlowEndPoint
-    {
       string connect_mcast(inout AVStreams::QoS the_qos,
                            out boolean is_met,
                            in string address,
@@ -673,6 +651,16 @@ module AVStreams
 
   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 : CosPropertyService::PropertySet {
@@ -753,13 +741,11 @@ module AVStreams
       raises(InvalidPosition);
   };
 
-  // Additional sequences needed for the properties.
+// Additional sequences needed for the properties.
 
-  typedef sequence<FlowConnection> FlowConnection_seq;
-  typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
-  typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
-  typedef sequence<FlowEndPoint> FlowEndPoint_seq;
-  typedef sequence<Object>  Object_seq;
+typedef sequence<FlowConnection> FlowConnection_seq;
+typedef sequence<StreamEndPoint_A> StreamEndPoint_A_seq;
+typedef sequence<StreamEndPoint_B> StreamEndPoint_B_seq;
+typedef sequence<FlowEndPoint> FlowEndPoint_seq;
 };
 
-#endif /* TAO_AV_STREAMS_IDL */
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/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index aaa6ddd4387..0fc157de0a1 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -46,7 +46,7 @@ CC_Lock::lock (CORBA::Environment &)
   lock_held_++;
 
   //  if (semaphore_.acquire () == -1)
-  //    TAO_THROW (CORBA::INTERNAL ());
+  //    TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 }
 
 CORBA::Boolean
@@ -74,7 +74,7 @@ CC_Lock::try_lock (CORBA::Environment &TAO_IN_ENV)
           return 0;
         }
       else
-        TAO_THROW_RETURN (CORBA::INTERNAL (),
+        TAO_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO),
                           0);
     }
   ACE_DEBUG ((LM_DEBUG,
@@ -95,7 +95,7 @@ CC_Lock::unlock (CORBA::Environment &TAO_IN_ENV)
   int success = 0; //semaphore_.release ();
 
   if (success == -1)
-    TAO_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   lock_held_--;
 
@@ -218,9 +218,9 @@ void CC_LockModeIterator::Next(CORBA::Environment &TAO_IN_ENV)
       current_ = CosConcurrencyControl::write;
       break;
     case CosConcurrencyControl::write:
-      TAO_THROW(CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL (CORBA::COMPLETED_NO));
     default:
-      TAO_THROW(CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 1fea8231ad1..eb880306e0c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -65,7 +65,7 @@ CC_LockSet::Init (CORBA::Environment &TAO_IN_ENV)
 
   // Acquire the semaphore in order to be able to put requests on hold
   if (semaphore_.acquire () == -1)
-    TAO_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 }
 
 // Destructor
@@ -104,7 +104,7 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
   // the FIFO properties of ACE_Token!
   if (this->lock_i (lm) == 1)
     if (semaphore_.acquire () == -1)
-      TAO_THROW (CORBA::INTERNAL ());
+      TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 }
 
 // Tries to lock. If it is not possible false is returned.
@@ -181,7 +181,7 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
           if (compatible (lock_on_queue) == 1)
             {
               if (semaphore_.release () == -1)
-                TAO_THROW (CORBA::INTERNAL ());
+                TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
               lock_[lock_on_queue]++;
             }
           else
@@ -221,7 +221,7 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
           TAO_CHECK_ENV;
 
           if (semaphore_.acquire () == -1)
-            TAO_THROW (CORBA::INTERNAL ());
+            TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
         }
     }
   TAO_CATCHANY
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
index bb3c86dd21d..c3d44e587e4 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -29,36 +29,36 @@ CC_LockSetFactory::~CC_LockSetFactory (void)
 }
 
 CosConcurrencyControl::LockSet_ptr
-CC_LockSetFactory::create (CORBA::Environment &ACE_TRY_ENV)
+CC_LockSetFactory::create (CORBA::Environment &TAO_IN_ENV)
 {
   CC_LockSet *ls = 0;
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
-  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
-  ACE_NEW_THROW_EX (ls,
-                    CC_LockSet,
-                    CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
+  TAO_IN_ENV.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
+  ACE_NEW_THROW_RETURN (ls,
+                        CC_LockSet,
+                        CORBA::NO_MEMORY(CORBA::COMPLETED_NO),
+                        CosConcurrencyControl::LockSet::_nil ());
+  TAO_IN_ENV.clear ();
 
-  return ls->_this (ACE_TRY_ENV);
+  return ls->_this (TAO_IN_ENV);
 }
 
 CosConcurrencyControl::LockSet_ptr
 CC_LockSetFactory::create_related (CosConcurrencyControl::LockSet_ptr which,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &TAO_IN_ENV)
 {
   CC_LockSet *ls = 0;
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, CosConcurrencyControl::LockSet::_nil ());
 
-  // @@ I commented out the following statement becuase it doesn't make any
-  //    sense at all.    -- Nanbor
-  //  TAO_IN_ENV.exception (new CORBA::NO_MEMORY ());
-  ACE_NEW_THROW_EX (ls,
-                    CC_LockSet (which),
-                    CORBA::NO_MEMORY());
-  ACE_CHECK_RETURN (CosConcurrencyControl::LockSet::_nil ());
+  TAO_IN_ENV.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
+  ACE_NEW_THROW_RETURN (ls,
+                        CC_LockSet (which),
+                        CORBA::NO_MEMORY(CORBA::COMPLETED_NO),
+                        CosConcurrencyControl::LockSet::_nil ());
+  TAO_IN_ENV.clear ();
 
-  return ls->_this (ACE_TRY_ENV);
+  return ls->_this (TAO_IN_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am b/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
deleted file mode 100644
index 1038e3ee925..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Concurrency Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Concurrency.la
-
-libTAO_Concurrency_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Concurrency_la_SOURCES = \
-        CC_Lock.cpp \
-        CC_LockSet.cpp \
-        CC_LockSetFactory.cpp \
-        Concurrency_Utils.cpp
-
-noinst_HEADERS = \
-        CC_Lock.h \
-        CC_LockSet.h \
-        CC_LockSetFactory.h \
-        Concurrency_Utils.h
-
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
index 1c7cc0d2994..26b90b70deb 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
@@ -16,13 +16,10 @@
 //    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
 //
 // = AUTHOR
-//    Torben Worm <tworm@cs.wustl.edu>
+//    OMG and Torben Worm <tworm@cs.wustl.edu>
 //
 // ============================================================================
 
-#ifndef TAO_CONCURRENCY_IDL
-#define TAO_CONCURRENCY_IDL
-
 //CosConcurrencyControl Module, page 7-8
 //Includes the following interfaces:
 //  LockCoordinator, LockSet, TransactionalLockSet, LockSetFactory
@@ -196,4 +193,4 @@ module CosConcurrencyControl
     };
 };
 
-#endif /* TAO_CONCURRENCY_IDL */
+
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
index bca8b7bfca7..5d12d65ab08 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ConsumerAdmin_i.h"
-#include "ace/Auto_Ptr.h"
 
 TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i (void)
   : qos_ (),
@@ -26,35 +25,20 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
-  CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
-    CosEventChannelAdmin::ProxyPushSupplier::_nil ();
-
   RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
-    this->rtec_consumeradmin_->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxysupplier_nil);
+    this->rtec_consumeradmin_->obtain_push_supplier (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
-  TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier;
+  TAO_CosEC_ProxyPushSupplier_i *pps;
 
-  ACE_NEW_RETURN (proxypushsupplier,
+  ACE_NEW_RETURN (pps,
                   TAO_CosEC_ProxyPushSupplier_i (this->qos_,
                                                  rtecproxypushsupplier.in ()),
-                  proxysupplier_nil);
-
-  auto_ptr<TAO_CosEC_ProxyPushSupplier_i>
-    auto_proxysupplier (proxypushsupplier);
-
-  CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
-    auto_proxysupplier.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxysupplier_nil);
+                  CosEventChannelAdmin::ProxyPushSupplier::_nil ());
 
-   // give the ownership to the POA.
-  auto_proxysupplier.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxysupplier_nil);
-
-  auto_proxysupplier.release ();
-  return proxy_obj;
+  return pps->_this (TAO_IN_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
@@ -63,11 +47,3 @@ TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &)
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullSupplier::_nil ();
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushSupplier_i>;
-  template class auto_ptr<TAO_CosEC_ProxyPushSupplier_i>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushSupplier_i>
-# pragma instantiate auto_ptr<TAO_CosEC_ProxyPushSupplier_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
index 29e08d8a9ed..4122d74dbbf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
@@ -25,13 +25,7 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "orbsvcs/CosEvent/ProxyPushSupplier_i.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_CosEC_ConsumerAdmin_i :
-  public virtual POA_CosEventChannelAdmin::ConsumerAdmin,
-  public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_CosEC_ConsumerAdmin_i : public POA_CosEventChannelAdmin::ConsumerAdmin
 {
   // = TITLE
   //   class TAO_CosEC_ConsumerAdmin_i implements the ConsumerAdmin interface.
@@ -51,11 +45,11 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV);
+    obtain_push_supplier(CORBA::Environment &TAO_TRY_ENV);
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV);
+    obtain_pull_supplier(CORBA::Environment &TAO_TRY_ENV);
   // Returns a new ProxyPullSupplier_ptr.
 
 private:
@@ -67,8 +61,4 @@ private:
   // this class.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* CONSUMERADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
index a79a37674f7..0c23ad08946 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
@@ -1,10 +1,9 @@
 // $Id$
 #include "EventChannel_i.h"
-#include "ace/Auto_Ptr.h"
 
 TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i (void)
-  : consumer_admin_ (0),
-    supplier_admin_ (0),
+  : consumer_admin_ (),
+    supplier_admin_ (),
     consumeradmin_ (CosEventChannelAdmin::ConsumerAdmin::_nil ()),
     supplieradmin_ (CosEventChannelAdmin::SupplierAdmin::_nil ())
 {
@@ -20,57 +19,29 @@ int
 TAO_CosEC_EventChannel_i::init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
                                 const RtecEventChannelAdmin::SupplierQOS &supplierqos,
                                 RtecEventChannelAdmin::EventChannel_ptr rtec,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &TAO_IN_ENV)
 {
-  // Allocate the admins..
-  TAO_CosEC_ConsumerAdmin_i *consumer_;
-  ACE_NEW_RETURN (consumer_,
-                  TAO_CosEC_ConsumerAdmin_i (),
-                  -1);
-
-  auto_ptr <TAO_CosEC_ConsumerAdmin_i> auto_consumer_ (consumer_);
-
-  TAO_CosEC_SupplierAdmin_i *supplier_;
-  ACE_NEW_RETURN (supplier_,
-                  TAO_CosEC_SupplierAdmin_i (),
-                  -1);
-
-  auto_ptr <TAO_CosEC_SupplierAdmin_i> auto_supplier_ (supplier_);
-
   RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin =
-    rtec->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    rtec->for_consumers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
-  if (auto_consumer_.get ()->init (consumerqos,
-                                   rtec_consumeradmin) == -1)
+  if (this->consumer_admin_.init (consumerqos,
+                                  rtec_consumeradmin) == -1)
     return -1;
 
-  this->consumeradmin_ =
-    auto_consumer_.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // give the ownership to the POA.
-  auto_consumer_.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->consumeradmin_ = consumer_admin_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin =
-    rtec->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    rtec->for_suppliers (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
-  if (auto_supplier_.get ()->init (supplierqos,
-                                   rtec_supplieradmin) == -1)
+  if (this->supplier_admin_.init (supplierqos,
+                                  rtec_supplieradmin) == -1)
     return -1;
 
-  this->supplieradmin_ =
-    auto_supplier_.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // give the ownership to the POA.
-  auto_supplier_.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->consumer_admin_ = auto_consumer_.release ();
-  this->supplier_admin_ = auto_supplier_.release ();
+  this->supplieradmin_ = supplier_admin_._this (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
   return 0;
 }
@@ -94,39 +65,28 @@ TAO_CosEC_EventChannel_i::for_suppliers (CORBA::Environment &)
 }
 
 void
-TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_EventChannel_i::destroy (CORBA::Environment &TAO_IN_ENV)
 {
   // Deactivate the CosEventChannel
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
+                                                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->supplieradmin_ =  CosEventChannelAdmin::SupplierAdmin::_nil ();
   this->consumeradmin_ =  CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_EventChannel_i::shutdown (CORBA::Environment &TAO_IN_ENV)
 {
-  this->destroy (ACE_TRY_ENV);
+  this->destroy (TAO_IN_ENV);
+  delete this;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_ConsumerAdmin_i>;
-  template class auto_ptr<TAO_CosEC_ConsumerAdmin_i>;
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_SupplierAdmin_i>;
-  template class auto_ptr<TAO_CosEC_SupplierAdmin_i>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ConsumerAdmin_i>
-# pragma instantiate auto_ptr<TAO_CosEC_ConsumerAdmin_i>
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_SupplierAdmin_i>
-# pragma instantiate auto_ptr<TAO_CosEC_SupplierAdmin_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
index 05596522e5f..e44087e7c4a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
@@ -26,13 +26,7 @@
 #include "orbsvcs/CosEvent/ConsumerAdmin_i.h"
 #include "orbsvcs/CosEvent/SupplierAdmin_i.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_CosEC_EventChannel_i :
-public virtual POA_CosEventChannelAdmin::EventChannel,
-public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_CosEC_EventChannel_i : public POA_CosEventChannelAdmin::EventChannel
 {
   // = TITLE
   //   class TAO_CosEC_EventChannel_i implements the standard Cos EventChannel
@@ -55,29 +49,29 @@ public:
   int init (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
             const RtecEventChannelAdmin::SupplierQOS &supplierqos,
             RtecEventChannelAdmin::EventChannel_ptr rtec,
-            CORBA::Environment &ACE_TRY_ENV);
+            CORBA::Environment &TAO_IN_ENV);
   // Activates the ConsumerAdmin and SupplierAdmin servants.  Returns
   // -1 on error, 0 on success.
 
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV);
+  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &TAO_IN_ENV);
   // The for_consumers method will return the same ConsumerAdmin_ptr
   // everytime its called.
 
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &TAO_IN_ENV);
   // The for_suppliers method will return the same SupplierAdmin_ptr
   // everytime its called.
 
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
+  virtual void destroy (CORBA::Environment &TAO_IN_ENV);
   // Destroys this Event Channel object.
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV);
+  void shutdown (CORBA::Environment &TAO_IN_ENV);
   // destroys this Event Channel object and <delete>s this object.
 
 private:
-  TAO_CosEC_ConsumerAdmin_i* consumer_admin_;
+  TAO_CosEC_ConsumerAdmin_i consumer_admin_;
   // ConsumerAdmin servant object.
 
-  TAO_CosEC_SupplierAdmin_i* supplier_admin_;
+  TAO_CosEC_SupplierAdmin_i supplier_admin_;
   // SupplierAdmin servant object.
 
   CosEventChannelAdmin::ConsumerAdmin_var consumeradmin_;
@@ -89,8 +83,4 @@ private:
   // activating the servant in the ORB.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* EVENTCHANNEL_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am b/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
deleted file mode 100644
index 4e1ad8fc3fb..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's CosEvent Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_CosEvent.la
-
-libTAO_CosEvent_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_CosEvent_la_SOURCES = \
-        ConsumerAdmin_i.cpp \
-        EventChannel_i.cpp \
-        ProxyPushConsumer_i.cpp \
-        ProxyPushSupplier_i.cpp \
-        SupplierAdmin_i.cpp
-
-noinst_HEADERS = \
-        ConsumerAdmin_i.h \
-        EventChannel_i.h \
-        ProxyPushConsumer_i.h \
-        ProxyPushSupplier_i.h \
-        SupplierAdmin_i.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
index 26a990ce886..0844f0b672b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
@@ -7,15 +7,8 @@
 #include "orbsvcs/RtecEventCommS.h"
 #include "orbsvcs/CosEventCommS.h"
 #include "ProxyPushConsumer_i.h"
-#include "ace/Auto_Ptr.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_CosEC_PushSupplierWrapper :
-  public virtual POA_RtecEventComm::PushSupplier,
-  public virtual PortableServer::RefCountServantBase
+class TAO_CosEC_PushSupplierWrapper : public POA_RtecEventComm::PushSupplier
 {
   // = TITLE
   //   A Wrapper for the Rtec PushSupplier.
@@ -32,7 +25,7 @@ public:
   ~TAO_CosEC_PushSupplierWrapper (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV);
   // Disconnects the push supplier.
 
 private:
@@ -46,10 +39,6 @@ private:
   // The Cos PushSupplier that we're proxying for.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper
 (CosEventComm::PushSupplier_ptr supplier)
   : supplier_ (CosEventComm::PushSupplier::_duplicate (supplier))
@@ -57,38 +46,39 @@ TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper
   // No-Op.
 }
 
-TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper (void)
+TAO_CosEC_PushSupplierWrapper::~TAO_CosEC_PushSupplierWrapper ()
 {
   // No-Op.
 }
 
 void
-TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->supplier_->disconnect_push_supplier (ACE_TRY_ENV);
+  this->supplier_->disconnect_push_supplier (TAO_TRY_ENV);
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   // @@ If we keep a list remember to remove this object from the
   // list.
+  delete this;
 }
 
 TAO_CosEC_ProxyPushConsumer_i::TAO_CosEC_ProxyPushConsumer_i (const RtecEventChannelAdmin::SupplierQOS &qos,
-                                                              RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer)
+                                                              RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc)
   : qos_ (qos),
-    proxypushconsumer_ (RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (proxypushconsumer)),
+    ppc_ (RtecEventChannelAdmin::ProxyPushConsumer::_duplicate (ppc)),
     wrapper_ (0)
 {
   // No-Op.
@@ -101,7 +91,7 @@ TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void)
 
 void
 TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_TRY_ENV)
 {
   RtecEventComm::Event buffer[1];
   // Create an event set that does not own the buffer....
@@ -126,67 +116,52 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data,
 
   ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time,
                                  t);
-  e.header.ec_recv_time = ORBSVCS_Time::zero ();
-  e.header.ec_send_time = ORBSVCS_Time::zero ();
+  e.header.ec_recv_time = ORBSVCS_Time::zero;
+  e.header.ec_send_time = ORBSVCS_Time::zero;
 
   e.data.any_value = data;
 
-  this->proxypushconsumer_->push (events,
-                                  ACE_TRY_ENV);
+  this->ppc_->push (events,
+                    TAO_TRY_ENV);
 }
 
 void
-TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->proxypushconsumer_->disconnect_push_consumer (ACE_TRY_ENV);
+  this->ppc_->disconnect_push_consumer (TAO_TRY_ENV);
 
   // Deactivate the ProxyPushConsumer
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
+
+  delete this;
 }
 
 void
 TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier,
-                                                      CORBA::Environment &ACE_TRY_ENV)
+                                                      CORBA::Environment &TAO_IN_ENV)
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
-
-  TAO_CosEC_PushSupplierWrapper *wrapper;
+    TAO_THROW (CosEventChannelAdmin::AlreadyConnected ());
 
-  ACE_NEW_THROW_EX (wrapper,
-                    TAO_CosEC_PushSupplierWrapper (push_supplier),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
+  ACE_NEW_THROW (this->wrapper_,
+                 TAO_CosEC_PushSupplierWrapper (push_supplier),
+                 CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
-  auto_ptr <TAO_CosEC_PushSupplierWrapper>
-    auto_wrapper (wrapper);
-
-  RtecEventComm::PushSupplier_ptr rtecpushsupplier
-    = auto_wrapper.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->proxypushconsumer_->connect_push_supplier
-    (rtecpushsupplier,
-     this->qos_,
-     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->wrapper_ = auto_wrapper.release ();
+  this->ppc_->connect_push_supplier (this->wrapper_->_this (TAO_IN_ENV),
+                                     this->qos_,
+                                     TAO_IN_ENV);
 }
 
 int
@@ -194,11 +169,3 @@ TAO_CosEC_ProxyPushConsumer_i::connected (void)
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_PushSupplierWrapper>;
-  template class auto_ptr<TAO_CosEC_PushSupplierWrapper>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_PushSupplierWrapper>
-# pragma instantiate auto_ptr<TAO_CosEC_PushSupplierWrapper>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
index 5784e15ed91..96b16b6f384 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
@@ -24,15 +24,9 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class TAO_CosEC_PushSupplierWrapper;
 
-class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i :
-  public virtual POA_CosEventChannelAdmin::ProxyPushConsumer,
-  public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i : public POA_CosEventChannelAdmin::ProxyPushConsumer
 {
   // = TITLE
   //   class TAO_CosEC_ProxyPushConsumer_i implements the ProxyPushConsumer
@@ -50,21 +44,21 @@ class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushConsumer_i :
 public:
   // = Initialization and termination methods.
   TAO_CosEC_ProxyPushConsumer_i (const RtecEventChannelAdmin::SupplierQOS &qos,
-                                 RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer);
+                                 RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc);
   // Constructor.
 
   ~TAO_CosEC_ProxyPushConsumer_i (void);
   // Destructor.
 
   virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   // Suppliers call this method to pass data to connected consumers.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Disconnects the supplier from the event communication.
 
   virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
-                                     CORBA::Environment &ACE_TRY_ENV);
+                                     CORBA::Environment &TAO_IN_ENV);
   // Connects a push supplier.
 
 private:
@@ -75,15 +69,11 @@ private:
   const RtecEventChannelAdmin::SupplierQOS &qos_;
   // The SupplierQOS specified by the user of this class.
 
-  RtecEventChannelAdmin::ProxyPushConsumer_var proxypushconsumer_;
+  RtecEventChannelAdmin::ProxyPushConsumer_var ppc_;
   // The Rtec ProxyPushConsumer specified by the user of this class.
 
   TAO_CosEC_PushSupplierWrapper *wrapper_;
   // The Rtec PushSupplier wrapper used by the Rtec ProxyPushConsumer.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* _PROXYPUSHCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
index 9239f86cc09..c0f1f4cdf43 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
@@ -6,15 +6,8 @@
 #include "orbsvcs/CosEventCommS.h"
 #include "orbsvcs/RtecEventCommS.h"
 #include "ProxyPushSupplier_i.h"
-#include "ace/Auto_Ptr.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_CosEC_PushConsumerWrapper :
-  public POA_RtecEventComm::PushConsumer,
-  public virtual PortableServer::RefCountServantBase
+class TAO_CosEC_PushConsumerWrapper : public POA_RtecEventComm::PushConsumer
 {
   // = TITLE
   //   Wrapper class for the Rtec PushConsumer.
@@ -32,10 +25,10 @@ public:
   // Destructor.
 
   virtual void push (const RtecEventComm::EventSet & data,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   // This method is called by the RTEvent Channel to supply data.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Disconnects the consumer from the event channel.
 
 private:
@@ -43,10 +36,6 @@ private:
   // The Cos PushConsumer that we're proxying for.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 TAO_CosEC_PushConsumerWrapper::TAO_CosEC_PushConsumerWrapper
 (CosEventComm::PushConsumer_ptr consumer)
   : consumer_ (CosEventComm::PushConsumer::_duplicate (consumer))
@@ -61,37 +50,37 @@ TAO_CosEC_PushConsumerWrapper::~TAO_CosEC_PushConsumerWrapper ()
 
 void
 TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_IN_ENV)
 {
   for (CORBA::ULong i = 0;
        i < set.length ();
        ++i)
     this->consumer_->push (set[i].data.any_value,
-                           ACE_TRY_ENV);
+                           TAO_IN_ENV);
 }
 
 void
-TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
   // Deactivate the supplier proxy.
-  this->consumer_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_->disconnect_push_consumer (TAO_IN_ENV);
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // @@ If we keep a list remember to remove this object from the
   // list.
+  delete this;
 }
 
 TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i
@@ -110,63 +99,47 @@ TAO_CosEC_ProxyPushSupplier_i::~TAO_CosEC_ProxyPushSupplier_i (void)
 }
 
 void
-TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
-  this->pps_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->pps_->disconnect_push_supplier (TAO_IN_ENV);
 
   // Deactivate the supplier proxy
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // @@ If we keep a list remember to remove this object from the
   // list.
+  delete this;
 }
 
-void
-TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer
-(CosEventComm::PushConsumer_ptr push_consumer,
- CORBA::Environment &ACE_TRY_ENV)
+void TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer_ptr push_consumer,
+                                                           CORBA::Environment &TAO_IN_ENV)
 {
   if (this->connected ())
-    ACE_THROW (CosEventChannelAdmin::AlreadyConnected ());
+    TAO_THROW_ENV (CosEventChannelAdmin::AlreadyConnected (),
+                   TAO_IN_ENV);
 
   if (push_consumer == CosEventComm::PushConsumer::_nil())
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  TAO_CosEC_PushConsumerWrapper *wrapper;
-  ACE_NEW_THROW_EX (wrapper,
-                    TAO_CosEC_PushConsumerWrapper (push_consumer),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
+    TAO_THROW_ENV (CORBA::BAD_PARAM (CORBA::COMPLETED_NO),
+                   TAO_IN_ENV);
 
-  auto_ptr <TAO_CosEC_PushConsumerWrapper> auto_wrapper (wrapper);
+  ACE_NEW_THROW (this->wrapper_,
+                 TAO_CosEC_PushConsumerWrapper (push_consumer),
+                 CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
-  // @@ This code is not exception safe.
-  RtecEventComm::PushConsumer_ptr  rtecpushconsumer =
-    auto_wrapper.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // give the ownership to the POA.
-  auto_wrapper.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->pps_->connect_push_consumer (rtecpushconsumer,
-                                     this->qos_,
-                                     ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->wrapper_ = auto_wrapper.release ();
+  this->pps_->connect_push_consumer (this->wrapper_->_this (TAO_IN_ENV),
+                                       this->qos_,
+                                       TAO_IN_ENV);
 }
 
 int
@@ -174,11 +147,3 @@ TAO_CosEC_ProxyPushSupplier_i::connected (void)
 {
   return this->wrapper_ == 0 ? 0 : 1;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_PushConsumerWrapper>;
-  template class auto_ptr<TAO_CosEC_PushConsumerWrapper>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_PushConsumerWrapper>
-# pragma instantiate auto_ptr<TAO_CosEC_PushConsumerWrapper>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
index 548864e1ee9..ad3b105db81 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
@@ -24,15 +24,9 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/CosEventChannelAdminC.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class TAO_CosEC_PushConsumerWrapper;
 
-class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushSupplier_i :
-  public POA_CosEventChannelAdmin::ProxyPushSupplier,
-  public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_CosEC_ProxyPushSupplier_i : public POA_CosEventChannelAdmin::ProxyPushSupplier
 {
   // = TITLE
   //   class ProxyPushSupplier-i implements the ProxyPushConsumer interface.
@@ -49,11 +43,11 @@ public:
   ~TAO_CosEC_ProxyPushSupplier_i (void);
   // Destructor.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV);
   // Ends the event communication and disposes this object.
 
   virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer,
-                                     CORBA::Environment &ACE_TRY_ENV);
+                                     CORBA::Environment &TAO_IN_ENV);
   // Connects the <push_consumer> to the Event Channel.
 
 private:
@@ -71,8 +65,4 @@ private:
   // The Rtec PushConsumer wrapper used by the Rtec ProxyPushSupplier.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* _PROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
index 6d5b09275b6..7a3faa191f8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "SupplierAdmin_i.h"
-#include "ace/Auto_Ptr.h"
 
 TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void)
   : qos_ (),
@@ -26,34 +25,19 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
-  CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
-    CosEventChannelAdmin::ProxyPushConsumer::_nil ();
-
   RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
-    this->rtec_supplieradmin_->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
+    this->rtec_supplieradmin_->obtain_push_consumer (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
-  TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer;
+  TAO_CosEC_ProxyPushConsumer_i *ppc;
 
-  ACE_NEW_RETURN (proxypushconsumer,
+  ACE_NEW_RETURN (ppc,
                   TAO_CosEC_ProxyPushConsumer_i (this->qos_,
                                                  rtecproxypushconsumer.in ()),
-                  proxyconsumer_nil);
-  auto_ptr <TAO_CosEC_ProxyPushConsumer_i>
-    auto_proxyconsumer (proxypushconsumer);
-
-  CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
-    auto_proxyconsumer.get ()->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
-
-   // give the ownership to the POA.
-  auto_proxyconsumer.get ()->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxyconsumer_nil);
-
-  auto_proxyconsumer.release ();
-  return proxy_obj;
+                  CosEventChannelAdmin::ProxyPushConsumer::_nil ());
+  return ppc->_this (TAO_IN_ENV);
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
@@ -62,11 +46,3 @@ TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &)
   // TODO: implement this.
   return CosEventChannelAdmin::ProxyPullConsumer::_nil ();
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i>;
-  template class auto_ptr<TAO_CosEC_ProxyPushConsumer_i>;
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate ACE_Auto_Basic_Ptr<TAO_CosEC_ProxyPushConsumer_i>
-# pragma instantiate auto_ptr<TAO_CosEC_ProxyPushConsumer_i>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
index 4bb1d866953..c18dbf08717 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
@@ -25,13 +25,7 @@
 #include "orbsvcs/CosEventChannelAdminC.h"
 #include "orbsvcs/CosEvent/ProxyPushConsumer_i.h"
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_CosEC_SupplierAdmin_i :
-  public virtual POA_CosEventChannelAdmin::SupplierAdmin,
-  public virtual PortableServer::RefCountServantBase
+class TAO_ORBSVCS_Export TAO_CosEC_SupplierAdmin_i : public POA_CosEventChannelAdmin::SupplierAdmin
 {
   // = TITLE
   //   class TAO_CosEC_SupplierAdmin_i implements the SupplierAdmin interface.
@@ -53,11 +47,11 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-  obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV);
+  obtain_push_consumer (CORBA::Environment &TAO_IN_ENV);
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-  obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV);
+  obtain_pull_consumer(CORBA::Environment &TAO_IN_ENV);
   // Returns a new ProxyPullConsumer_ptr.
 
 private:
@@ -69,8 +63,4 @@ private:
   // this class.
 };
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* SUPPLIER_ADMIN_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
index a5fa1dd2057..93da8203357 100644
--- a/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl
@@ -1,31 +1,5 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    CosEventChannelAdmin.idl
-//
-// = DESCRIPTION
-//    EVENT SERVICE - described in CORBAservices: Common Object Services
-//    Specification, chapter 4.
-//    CosEventChannelAdmin Module, page 4-15 includes the following interfaces:
-//    ProxyPushConsumer, ProxyPullSupplier, ProxyPullConsumer,
-//    ProxyPushSupplier, ConsumerAdmin, SupplierAdmin, EventChannel
-//    The Event service description can be downloaded from
-//    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-
-#ifndef TAO_EVENTCHANNELADMIN_IDL
-#define  TAO_EVENTCHANNELADMIN_IDL
-
 #include "CosEventComm.idl"
 
 #pragma prefix "omg.org"
@@ -177,5 +151,3 @@ module CosEventChannelAdmin
       // The destroy operation destroys the event channel.
     };
 };
-
-#endif /* TAO_EVENTCHANNELADMIN_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEventComm.idl b/TAO/orbsvcs/orbsvcs/CosEventComm.idl
index 69ce506fbad..e7b2e269e80 100644
--- a/TAO/orbsvcs/orbsvcs/CosEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/CosEventComm.idl
@@ -1,38 +1,13 @@
 // $Id$
 
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    CosEventComm.idl
-//
-// = DESCRIPTION
-//    EVENT SERVICE - described in CORBAservices: Common Object Services
-//    Specification, chapter 4.
-//    CosEventComm Module, page 4-8 includes the following interfaces:
-//    PushConsumer, PushSupplier, PullSupplier, PullConsumer
-//    The Event service description can be downloaded from
-//    ftp://www.omg.org/pub/docs/formal/97-11-02.idl
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_EVENTCOMM_IDL
-#define TAO_EVENTCOMM_IDL
-
 #pragma prefix "omg.org"
 
 module CosEventComm
 {
   // = TITLE
-  //   IDL module for the Corba Object Service for Event
-  //   Communication.
+  //   IDL module for the Corba Object Service for Event Communication.
 
-  exception Disconnected
+  exception Disconnected 
     {
       // = TITLE
       // If the event communication has already been disconnected, the
@@ -122,5 +97,3 @@ module CosEventComm
       // reference is disposed.
     };
 };
-
-#endif /* TAO_EVENTCOMM_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
deleted file mode 100644
index 861f156b83d..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.cpp
+++ /dev/null
@@ -1,455 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "CosEvent_Utilities.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/CosEvent/EventChannel_i.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "ace/Auto_Ptr.h"
-
-CosEC_ServantBase::CosEC_ServantBase (void)
-  :poa_ (PortableServer::POA::_nil ()),
-   rtec_servant_ (0),
-   cosec_servant_ (0),
-   rtec_ (RtecEventChannelAdmin::EventChannel::_nil ()),
-   cosec_ (CosEventChannelAdmin::EventChannel::_nil ()),
-   eventTypeIds_ (0),
-   eventSourceIds_ (0),
-   source_type_pairs_ (0)
-{
-  // No-Op.
-}
-
-CosEC_ServantBase::~CosEC_ServantBase (void)
-{
-  // No-Op.
-#if 0
-  ACE_DEBUG ((LM_DEBUG, "in cosec servant base %d \n", this));
-#endif
-}
-
-void
-CosEC_ServantBase::init (PortableServer::POA_ptr thispoa,
-                         PortableServer::POA_ptr poa,
-                         char *eventTypeIds,
-                         char *eventSourceIds,
-                         char *source_type_pairs,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (!CORBA::is_nil (thispoa));
-  ACE_ASSERT (!CORBA::is_nil (poa));
-
-  // Save the POA refs.
-  this->thispoa_ = PortableServer::POA::_duplicate (thispoa);
-  this->poa_ = PortableServer::POA::_duplicate (poa);
-
-  auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
-    auto_rtec_servant_ (this->create_rtec (ACE_TRY_ENV));
-  ACE_CHECK;
-
-  auto_ptr<TAO_CosEC_EventChannel_i>
-    auto_cosec_servant_ (this->create_cosec (ACE_TRY_ENV));
-  ACE_CHECK;
-
-  // if all the servants were allocated then set the class pointers.
-  this->rtec_servant_ = auto_rtec_servant_.release ();
-  this->cosec_servant_ = auto_cosec_servant_.release ();
-}
-
-int
-CosEC_ServantBase::activate (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-  ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
-
-  // Activate the Rtec
-  this->activate_rtec (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the CosEC
-  if (this->activate_cosec (ACE_TRY_ENV) != 0)
-    return -1;
-  ACE_CHECK_RETURN (-1);
-
-   // Activate ourselves..
-   // Note that the POA is <thispoa_>
-
-   PortableServer::ObjectId_var oid =
-     this->thispoa_->activate_object (this,
-                                      ACE_TRY_ENV);
-   ACE_CHECK_RETURN (-1);
-
-   this->_remove_ref (ACE_TRY_ENV);
-   ACE_CHECK_RETURN (-1);
-
-   CORBA::Object_var obj =
-     this->thispoa_->id_to_reference (oid,
-                                      ACE_TRY_ENV);
-   ACE_CHECK_RETURN (-1);
-
-   return 0; // success.
-}
-
-int
-CosEC_ServantBase::activate (const char* servant_id,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_ASSERT (!CORBA::is_nil (this->poa_.in ()));
-  ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ()));
-
-  // Activate the Rtec
-  this->activate_rtec (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the CosEC
-  if (this->activate_cosec (ACE_TRY_ENV) != 0)
-    return -1;
-   ACE_CHECK_RETURN (-1);
-
-
-  PortableServer::ObjectId_var oid =
-    TAO_POA::string_to_ObjectId (servant_id);
-
-  // Activate ourselves.
-  // Note that the POA is <thispoa_>
-  this->thispoa_->activate_object_with_id (oid,
-                                           this,
-                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  CORBA::Object_var obj =
-    this->thispoa_->id_to_reference (oid,
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  return 0; // success.
-}
-
-void
-CosEC_ServantBase::activate_rtec (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Activate the Rtec
-  PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->rtec_servant_,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->rtec_servant_->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->rtec_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (obj.in ());
-}
-
-int
-CosEC_ServantBase::activate_cosec (CORBA::Environment &ACE_TRY_ENV)
-{
- // Initialize the CosEC servant.
-  RtecScheduler::handle_t supp_handle = 0;
-
-  this->init_SupplierQOS (supp_handle,
-                          this->supplier_qos_,
-                          this->source_type_pairs_);
-
-  RtecScheduler::handle_t cons_handle = 0;
-
-  this->init_ConsumerQOS (cons_handle,
-                          this->consumer_qos_,
-                          this->eventTypeIds_,
-                          this->eventSourceIds_);
-
-  const RtecEventChannelAdmin::ConsumerQOS &consumerqos =
-    this->consumer_qos_.get_ConsumerQOS ();
-
-  const RtecEventChannelAdmin::SupplierQOS &supplierqos =
-    this->supplier_qos_.get_SupplierQOS ();
-
-  if (this->cosec_servant_->init (consumerqos,
-                                  supplierqos,
-                                  this->rtec_.in (),
-                                  ACE_TRY_ENV) != 0)
-    return -1;
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the CosEC
-  PortableServer::ObjectId_var oid =
-    this->poa_->activate_object (this->cosec_servant_,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->cosec_servant_->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  CORBA::Object_var obj =
-    this->poa_->id_to_reference (oid,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  this->cosec_ =
-    CosEventChannelAdmin::EventChannel::_narrow (obj.in ());
-  return 0; // success
-}
-
-void
-CosEC_ServantBase::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Deactivate all those we control...
-  this->deactivate_rtec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->deactivate_cosec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Finally we go away..
-  PortableServer::ObjectId_var oid =
-    this->thispoa_->servant_to_id (this,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // deactivate from the poa.
-  this->thispoa_->deactivate_object (oid,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-CosEC_ServantBase::deactivate_rtec (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Deactivate the rtec.
-  PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->rtec_servant_,
-                               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // deactivate from the poa.
-  this->poa_->deactivate_object (oid,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-CosEC_ServantBase::deactivate_cosec (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Deactivate the cosec.
-  PortableServer::ObjectId_var oid =
-    this->poa_->servant_to_id (this->cosec_servant_,
-                               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // deactivate from the poa.
-  this->poa_->deactivate_object (oid,
-                                 ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CosEventChannelAdmin::ConsumerAdmin_ptr
-CosEC_ServantBase::for_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->cosec_->for_consumers (ACE_TRY_ENV);
-}
-
-CosEventChannelAdmin::SupplierAdmin_ptr
-CosEC_ServantBase::for_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->cosec_->for_suppliers (ACE_TRY_ENV);
-}
-
-void
-CosEC_ServantBase::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Deactivate all the contained servants and ourselves.
-  // The poa will "destroy" the ref counted servants.
-
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-POA_RtecEventChannelAdmin::EventChannel_ptr
-CosEC_ServantBase::create_rtec (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Create the RtEC servant.
-  TAO_EC_Event_Channel_Attributes attr (this->poa_.in (),
-                                        this->poa_.in ());
-  TAO_EC_Event_Channel* _rtec_servant;
-  ACE_NEW_THROW_EX (_rtec_servant,
-                    TAO_EC_Event_Channel (attr),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return _rtec_servant;
-}
-
-TAO_CosEC_EventChannel_i*
-CosEC_ServantBase::create_cosec (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Create the CosEC servant.
-  TAO_CosEC_EventChannel_i* _cosec_servant;
-  ACE_NEW_THROW_EX (_cosec_servant,
-                    TAO_CosEC_EventChannel_i (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return _cosec_servant;
-}
-
-void
-CosEC_ServantBase::init_SupplierQOS (RtecScheduler::handle_t supp_handle,
-                                     ACE_SupplierQOS_Factory &supplier_qos,
-                                     char *source_type_pairs)
-{
-  // @@ Pradeep: It is very important that you make the type of
-  // events generated by the CosEC an option.
-  // I know this is not very well documented, but the type should
-  // be >= ACE_ES_EVENT_UNDEFINED = 16
-  // Something else: please make the EventSourceID for the
-  // supplier also an option...
-
-  char *c = " "; // space
-  char *tok = 0;
-
- // if nothing was specified on the command line use defaults..
-  if (source_type_pairs == 0)
-    supplier_qos.insert (1,
-                         ACE_ES_EVENT_ANY,
-                         supp_handle,
-                         1);
-  else // parse the event types..
-    {
-      tok = ACE_OS::strtok (source_type_pairs, c);
-      if (tok == 0) // error
-        {
-          ACE_DEBUG ((LM_DEBUG, "error parsing source,event pairs for SupplierQOS, defaulting to source id = 1, eventid = ACE_ES_EVENT_ANY"));
-
-          supplier_qos.insert (1,
-                               ACE_ES_EVENT_ANY,
-                               supp_handle,
-                               1);
-        }
-      else
-        // we just use 1 source-type pair in the event channel.
-        // so scan for the 1st pair only.
-        {
-          int source_val = 0, type_val = 0;
-          source_val = ACE_OS::atoi (tok);
-
-          tok = ACE_OS::strtok (0, c);
-
-          if (tok != 0)
-            type_val = ACE_OS::atoi (tok);
-
-          ACE_DEBUG ((LM_DEBUG, "supplier_qos::insert (%d, %d)\n",
-                      source_val, type_val));
-
-          // Setup the QOS params..
-          supplier_qos.insert (source_val,
-                               type_val,
-                               supp_handle,
-                               1);
-        }
-    }
-}
-
-void
-CosEC_ServantBase::init_ConsumerQOS (RtecScheduler::handle_t cons_handle,
-                                     ACE_ConsumerQOS_Factory &consumer_qos,
-                                     char *eventTypeIds,
-                                     char *eventSourceIds
-                                     )
-{
-  // @@ Pradeep: ditto here, make the set of sources (and/or type)
-  // a parameter, and make sure the user can specify multiple of
-  // them (just call insert_source() or insert_type() in the
-  // parse_args routine).
-
-  char *c = " "; // space
-  char *tok = 0;
-
-  consumer_qos.start_disjunction_group ();
-
-  // insert the event ids first..
-
-  // if nothing was specified on the command line use defaults..
-  if (eventTypeIds == 0)
-    {
-      //consumer_qos.insert_type (ACE_ES_EVENT_ANY, // default
-      //                             cons_handle);
-      // @@ if i uncomment this line then the Rtec displays the message
-      // "Consumer tried to register for allevents!  This is not implemented."
-      // whenever a consumer tries to register with it.
-    }
-  else // parse the event types..
-    {
-      tok = ACE_OS::strtok (eventTypeIds, c);
-      if (tok == 0) // error
-        {
-          ACE_DEBUG ((LM_DEBUG, "error parsing eventIds for ConsumerQOS, defaulting to 1"));
-          consumer_qos.insert_type (ACE_ES_EVENT_ANY,
-                                    cons_handle);
-        }
-      else
-        do
-          {
-            int type_val = ACE_OS::atoi (tok);
-            ACE_DEBUG ((LM_DEBUG, "consumer_qos::insert_type (%d)\n",
-                        type_val));
-            consumer_qos.insert_type (type_val,
-                                      cons_handle);
-            tok = ACE_OS::strtok (0, c);
-          }
-        while (tok != 0);
-    }
-
-  // repeat for source ids..
-
-  // if nothing was specified on the command line use defaults..
-  if (eventSourceIds == 0)
-    consumer_qos.insert_source (1, // default = 1
-                                cons_handle);
-  else // parse the event types..
-    {
-      tok = ACE_OS::strtok (eventSourceIds, c);
-      if (tok == 0) // error
-        {
-          ACE_DEBUG ((LM_DEBUG, "error parsing sourceIds for ConsumerQOS, defaulting to 1"));
-          consumer_qos.insert_source (1, // default = 1
-                                      cons_handle);
-        }
-      else
-        do
-          {
-            int source_val = ACE_OS::atoi (tok);
-            ACE_DEBUG ((LM_DEBUG, "consumer_qos::insert_source (%d)\n",
-                        source_val));
-            consumer_qos.insert_type (source_val,
-                                      cons_handle);
-            tok = ACE_OS::strtok (0, c);
-          }
-        while (tok != 0);
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr <POA_RtecEventChannelAdmin::EventChannel>;
-template class ACE_Auto_Basic_Ptr <POA_RtecEventChannelAdmin::EventChannel>;
-
-template class auto_ptr <TAO_CosEC_EventChannel_i>;
-template class ACE_Auto_Basic_Ptr <TAO_CosEC_EventChannel_i>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr <POA_RtecEventChannelAdmin::EventChannel>
-#pragma instantiate  ACE_Auto_Basic_Ptr <POA_RtecEventChannelAdmin::EventChannel>
-
-#pragma instantiate auto_ptr <TAO_CosEC_EventChannel_i>
-#pragma instantiate  ACE_Auto_Basic_Ptr <TAO_CosEC_EventChannel_i>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h b/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
deleted file mode 100644
index cb4c03d0fc9..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent_Utilities.h
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/orbsvcs
-//
-// = FILENAME
-//     CosEvent_Utilities.h
-//
-// = DESCRIPTION
-//    A few utility classes to make it easier to write EC applications.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_COSEVENT_UTILITIES_H
-#define TAO_COSEVENT_UTILITIES_H
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/Event_Utilities.h"
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_CosEC_EventChannel_i;
-
-class TAO_ORBSVCS_Export CosEC_ServantBase :
-  public virtual POA_CosEventChannelAdmin::EventChannel,
-  public virtual PortableServer::RefCountServantBase
-{
-  // = TITLE
-  //   A generic servant base class.
-  // = DESCRIPTION
-  //   This class contains all the member data and methods required to
-  //   create and manage a CosEC servant.
-  //   Clients can derive from this class and create servants.
- public:
-  // = Initialization method.
-  CosEC_ServantBase (void);
-  // Constructor.
-
-  virtual ~CosEC_ServantBase (void);
-  // Destructor.
-
-  virtual void init (PortableServer::POA_ptr thispoa,
-                     PortableServer::POA_ptr poa,
-                     char *eventTypeIds,
-                     char *eventSourceIds,
-                     char *source_type_pairs,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // This method creates a local scheduler, rtec and cosec.
-  // The POA <poa> specified here is used when <activate> is called to
-  // activate the contained servants.
-  // The POA <thispoa> is used to activate this.
-
-  int activate (CORBA::Environment &ACE_TRY_ENV);
-  // Activates the CosEC with <thispoa_> and friends with the <poa_>
-
-  int activate (const char* servant_id, CORBA::Environment &ACE_TRY_ENV);
-  // If the servant_id is not nil then it is used to supply the object id
-  // for <this> servant.
-
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivates the CosEC and friends with the POA.
-
-  // =  POA_CosEventChannelAdmin::EventChannel methods.
-  virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
-  // Destroys this Event Channel object.
-
- protected:
-  // = RtEC creation, activation and deactivation methods.
-  virtual POA_RtecEventChannelAdmin::EventChannel_ptr
-  create_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Create a local rtec.
-
-  virtual void activate_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Activates the rtec.
-
-  virtual void deactivate_rtec (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivates the rtec.
-
-  // = CosEC creation, activation and deactivation methods.
-  TAO_CosEC_EventChannel_i*
-  create_cosec (CORBA::Environment &ACE_TRY_ENV);
-  // Create a local cosec.
-
-  int activate_cosec (CORBA::Environment &ACE_TRY_ENV);
-  // Activates the cosec.
-
-  void deactivate_cosec (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivates the cosec.
-
-  void init_SupplierQOS (RtecScheduler::handle_t supp_handle,
-                         ACE_SupplierQOS_Factory &supplier_qos,
-                         char *source_type_pairs);
-  // Initialize the SupplierQOS Factory.
-
-
-  void init_ConsumerQOS (RtecScheduler::handle_t cons_handle,
-                         ACE_ConsumerQOS_Factory &consumer_qos,
-                         char *eventTypeIds,
-                         char *eventSourceIds);
-  // Initialize the ConsumerQOS Factory.
-
-  // = Protected Data members.
-
-  PortableServer::POA_var thispoa_;
-  // The poa that we use to activate ourselves.
-
-  PortableServer::POA_var poa_;
-  // The poa that we use to activate others
-
-  POA_RtecEventChannelAdmin::EventChannel_ptr rtec_servant_;
-  // The Event Channel servant.
-
-  TAO_CosEC_EventChannel_i *cosec_servant_;
-  // The servant object of the COS Event Channel.
-
-  RtecEventChannelAdmin::EventChannel_var rtec_;
-  // Ref to the Rtec.
-
-  CosEventChannelAdmin::EventChannel_var cosec_;
-  // Ref to the cosec.
-
-  ACE_ConsumerQOS_Factory consumer_qos_;
-  // The Consumer QOS.
-
-  ACE_SupplierQOS_Factory supplier_qos_;
-  // The Supplier QOS.
-
-  char *eventTypeIds_;
-  // The list of EventTypeIDs (for ConsumerQOS) seperated by spaces.
-  // e.g. "1 2 3 4"
-
-  char *eventSourceIds_;
-  // The list of EventSourceIDs (for ConsumerQOS) seperated by spaces.
-  // e.g. "1 2 3 4"
-
-  char *source_type_pairs_;
-  // The pairs of Source and EventType Ids (for the SupplierQOS).
-  // e.g "1 4 2 5 3 6" where (1,4) (2,5) and (3,6) from source id,
-  // event id pairs.
-};
-
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_COSEVENT_UTILITIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
index 16c964fa3f1..a24ac7c4075 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
@@ -22,9 +22,6 @@
 //
 // ============================================================================
 
-#ifndef TAO_LIFECYCLE_IDL
-#define TAO_LIFECYCLE_IDL
-
 // OMG IDL for CosLifeCycle Module, page 6-10 in 
 // Includes the following interfaces:
 //   FactoryFinder, LifeCycleObject, GenericFactory
@@ -122,5 +119,3 @@ typedef struct NVP
 
 typedef sequence <NameValuePair> Criteria;
 */
-
-#endif /* TAO_LIFECYCLE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming.idl b/TAO/orbsvcs/orbsvcs/CosNaming.idl
index cfd4153fd4f..701eae8bd78 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.idl
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.idl
@@ -14,9 +14,6 @@
 //
 // ============================================================================
 
-#ifndef TAO_NAMING_IDL
-#define TAO_NAMING_IDL
-
 #pragma prefix "omg.org"
 
 module CosNaming
@@ -233,5 +230,3 @@ module CosNaming
       // This operation destroys the iterator.
     };
 };
-
-#endif /* TAO_NAMING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
index 4f1d76df69c..71ec99858a9 100644
--- a/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
+++ b/TAO/orbsvcs/orbsvcs/CosPropertyService.idl
@@ -19,9 +19,6 @@
 //
 // ================================================================
 
-#ifndef TAO_PROPERTY_IDL
-#define TAO_PROPERTY_IDL
-
 #pragma prefix "omg.org"
 
 module CosPropertyService
@@ -407,5 +404,3 @@ module CosPropertyService
       // The destroy operation destroys the iterator.
     };
 };
-
-#endif /* TAO_PROPERTY_IDL */
diff --git a/TAO/tao/TimeBase.pidl b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
index d3fd6a84b42..3d4eed07d76 100644
--- a/TAO/tao/TimeBase.pidl
+++ b/TAO/orbsvcs/orbsvcs/CosTimeBase.idl
@@ -1,12 +1,13 @@
+//
 // $Id$
+//
 
-#ifndef TIME_BASE_PIDL
-#define TIME_BASE_PIDL
+#ifndef COS_TIME_BASE_IDL
+#define COS_TIME_BASE_IDL
 
 #pragma prefix "omg.org"
 
-module TimeBase
-{
+module TimeBase {
   // = TITLE
   //   COS Time Service basic types.
   //
@@ -25,9 +26,7 @@ module TimeBase
   typedef short TdfT;
   // Minutes of displacement from the Greenwich time.
 
-  struct UtcT
-  {
-    // = TITLE
+  struct UtcT {
     //   Structure of the time value.  The inaccuracy is packed into
     //   inacclo & inacchi.  The tdf holds the time displacement
     //   factor.
@@ -49,7 +48,7 @@ module TimeBase
 
   };
 
-  struct IntervalT
+   struct IntervalT
   {
     // = TITLE
     // This type holds a time interval represented as two TimeT values
@@ -64,4 +63,4 @@ module TimeBase
 
 };
 
-#endif /* TIME_BASE_PIDL */
+#endif /* COS_TIME_BASE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.idl b/TAO/orbsvcs/orbsvcs/CosTrading.idl
index 066d150ca0f..b8fe1703e5e 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.idl
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.idl
@@ -13,9 +13,6 @@
 //
 // ========================================================================
 
-#ifndef TAO_TRADING_IDL
-#define TAO_TRADING_IDL
-
 #pragma prefix "omg.org"
 
 module CosTrading
@@ -521,4 +518,165 @@ module CosTrading
           
 }; /* end module CosTrading */
 
-#endif /* TAO_TRADING_IDL */
+
+// OMG IDL for Dynamic Property  Module, p 16-88
+
+module CosTradingDynamic
+{
+  
+  exception DPEvalFailure {
+    CosTrading::PropertyName name;
+    TypeCode returned_type;
+    any extra_info;
+  };
+  
+  interface DynamicPropEval
+    {      
+      any evalDP (in CosTrading::PropertyName name,
+                  in TypeCode returned_type,
+                  in any extra_info)
+        raises (DPEvalFailure);
+    };
+
+    struct DynamicProp {
+      DynamicPropEval eval_if;
+      TypeCode returned_type;
+      any extra_info;
+    };
+}; /* end module CosTradingDynamic */
+
+
+// OMG IDL for Service Type Repository Module, p 16-89
+
+module CosTradingRepos
+{
+  interface ServiceTypeRepository
+    {     
+      // local types
+      typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
+      enum PropertyMode {
+        PROP_NORMAL, PROP_READONLY,
+        PROP_MANDATORY, PROP_MANDATORY_READONLY
+      };
+      struct PropStruct
+      {
+        CosTrading::PropertyName name;
+        TypeCode value_type;
+        PropertyMode mode;
+      };
+      typedef sequence<PropStruct> PropStructSeq;
+      
+      typedef CosTrading::Istring Identifier;  // IR::Identifier
+
+      struct IncarnationNumber
+      {
+        unsigned long high;
+        unsigned long low;
+      };
+
+      struct TypeStruct
+      {
+        Identifier if_name;
+        PropStructSeq props;
+        ServiceTypeNameSeq super_types;
+        boolean masked;
+        IncarnationNumber incarnation;
+      };
+
+      enum ListOption { all, since };
+      union SpecifiedServiceTypes switch ( ListOption ) {
+      case all: boolean all_;
+      case since: IncarnationNumber incarnation;
+      };
+
+      // local exceptions
+      exception ServiceTypeExists {
+        CosTrading::ServiceTypeName name;
+      };
+
+      exception InterfaceTypeMismatch {
+        CosTrading::ServiceTypeName base_service;
+        Identifier base_if;
+        CosTrading::ServiceTypeName derived_service;
+        Identifier derived_if;
+      };
+
+      exception HasSubTypes {
+        CosTrading::ServiceTypeName the_type;
+        CosTrading::ServiceTypeName sub_type;
+      };
+
+      exception AlreadyMasked {
+        CosTrading::ServiceTypeName name;
+      };
+
+      exception NotMasked {
+        CosTrading::ServiceTypeName name;
+      };
+
+      exception ValueTypeRedefinition {
+        CosTrading::ServiceTypeName type_1;
+        PropStruct definition_1;
+        CosTrading::ServiceTypeName type_2;
+        PropStruct definition_2;
+      };
+
+      exception DuplicateServiceTypeName {
+        CosTrading::ServiceTypeName name;
+      };
+      
+      // attributes
+      readonly attribute IncarnationNumber incarnation;
+      
+      // operation signatures
+      IncarnationNumber add_type (in CosTrading::ServiceTypeName name,
+                                  in Identifier if_name,
+                                  in PropStructSeq props,
+                                  in ServiceTypeNameSeq super_types)
+        raises (CosTrading::IllegalServiceType,
+                ServiceTypeExists,
+                InterfaceTypeMismatch,
+                CosTrading::IllegalPropertyName,
+                CosTrading::DuplicatePropertyName,
+                ValueTypeRedefinition,
+                CosTrading::UnknownServiceType,
+                DuplicateServiceTypeName);
+
+      void remove_type (in CosTrading::ServiceTypeName name)
+        raises (CosTrading::IllegalServiceType,
+                CosTrading::UnknownServiceType,
+                HasSubTypes);
+      
+      ServiceTypeNameSeq list_types (in SpecifiedServiceTypes which_types);
+
+      TypeStruct describe_type (in CosTrading::ServiceTypeName name)
+        raises (CosTrading::IllegalServiceType,
+                CosTrading::UnknownServiceType);
+
+      TypeStruct fully_describe_type (in CosTrading::ServiceTypeName name)
+        raises (CosTrading::IllegalServiceType,
+                CosTrading::UnknownServiceType);
+
+      void mask_type (in CosTrading::ServiceTypeName name)
+        raises (CosTrading::IllegalServiceType,
+                CosTrading::UnknownServiceType,
+                AlreadyMasked);
+
+      void unmask_type (in CosTrading::ServiceTypeName name)
+        raises (CosTrading::IllegalServiceType,
+                CosTrading::UnknownServiceType,
+                NotMasked);      
+    };
+}; /* end module CosTradingRepos */
+
+module CosTradingSequences
+{
+  typedef sequence<short> ShortSeq;
+  typedef sequence<unsigned short> UShortSeq;
+  typedef sequence<long> LongSeq;
+  typedef sequence<unsigned long> ULongSeq;
+  typedef sequence<boolean> BooleanSeq;
+  typedef sequence<float> FloatSeq;
+  typedef sequence<double> DoubleSeq;
+  typedef sequence<string> StringSeq;
+};
diff --git a/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl b/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl
deleted file mode 100644
index 9ab95622883..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTradingDynamic.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = FILENAME
-//   CosTradingDynamic.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-//
-// ========================================================================
-
-#ifndef TAO_TRADING_DYNAMIC_IDL
-#define TAO_TRADING_DYNAMIC_IDL
-
-#include "CosTrading.idl"
-
-#pragma prefix "omg.org"
-
-// OMG IDL for Dynamic Property  Module, p 16-88
-
-module CosTradingDynamic
-{
-  
-  exception DPEvalFailure {
-    CosTrading::PropertyName name;
-    TypeCode returned_type;
-    any extra_info;
-  };
-  
-  interface DynamicPropEval
-    {      
-      any evalDP (in CosTrading::PropertyName name,
-                  in TypeCode returned_type,
-                  in any extra_info)
-        raises (DPEvalFailure);
-    };
-
-    struct DynamicProp {
-      DynamicPropEval eval_if;
-      TypeCode returned_type;
-      any extra_info;
-    };
-}; /* end module CosTradingDynamic */
-
-#endif /* TAO_TRADING_DYNAMIC_IDL  */
diff --git a/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl b/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl
deleted file mode 100644
index c3cf8b0dfab..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosTradingRepos.idl
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- C++ -*- */
-
-// ========================================================================
-// $Id$
-//
-// = FILENAME
-//   CosTradingRepos.idl
-//
-// = DESCRIPTION
-//   Trader  Service v1.0 described in CORBAservices: Common Object
-//   Services Specification, chapter 16 OMG IDL for Trading Function
-//   Module, p 16-74
-//
-// ========================================================================
-
-#ifndef TAO_TRADING_REPOS_IDL
-#define TAO_TRADING_REPOS_IDL
-
-#include "CosTrading.idl"
-
-#pragma prefix "omg.org"
-
-// OMG IDL for Service Type Repository Module, p 16-89
-
-module CosTradingRepos
-{
-  interface ServiceTypeRepository
-    {     
-      // local types
-      typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
-      enum PropertyMode {
-        PROP_NORMAL, PROP_READONLY,
-        PROP_MANDATORY, PROP_MANDATORY_READONLY
-      };
-      struct PropStruct
-      {
-        CosTrading::PropertyName name;
-        TypeCode value_type;
-        PropertyMode mode;
-      };
-      typedef sequence<PropStruct> PropStructSeq;
-      
-      typedef CosTrading::Istring Identifier;  // IR::Identifier
-
-      struct IncarnationNumber
-      {
-        unsigned long high;
-        unsigned long low;
-      };
-
-      struct TypeStruct
-      {
-        Identifier if_name;
-        PropStructSeq props;
-        ServiceTypeNameSeq super_types;
-        boolean masked;
-        IncarnationNumber incarnation;
-      };
-
-      enum ListOption { all, since };
-      union SpecifiedServiceTypes switch ( ListOption ) {
-      case all: boolean all_;
-      case since: IncarnationNumber incarnation;
-      };
-
-      // local exceptions
-      exception ServiceTypeExists {
-        CosTrading::ServiceTypeName name;
-      };
-
-      exception InterfaceTypeMismatch {
-        CosTrading::ServiceTypeName base_service;
-        Identifier base_if;
-        CosTrading::ServiceTypeName derived_service;
-        Identifier derived_if;
-      };
-
-      exception HasSubTypes {
-        CosTrading::ServiceTypeName the_type;
-        CosTrading::ServiceTypeName sub_type;
-      };
-
-      exception AlreadyMasked {
-        CosTrading::ServiceTypeName name;
-      };
-
-      exception NotMasked {
-        CosTrading::ServiceTypeName name;
-      };
-
-      exception ValueTypeRedefinition {
-        CosTrading::ServiceTypeName type_1;
-        PropStruct definition_1;
-        CosTrading::ServiceTypeName type_2;
-        PropStruct definition_2;
-      };
-
-      exception DuplicateServiceTypeName {
-        CosTrading::ServiceTypeName name;
-      };
-      
-      // attributes
-      readonly attribute IncarnationNumber incarnation;
-      
-      // operation signatures
-      IncarnationNumber add_type (in CosTrading::ServiceTypeName name,
-                                  in Identifier if_name,
-                                  in PropStructSeq props,
-                                  in ServiceTypeNameSeq super_types)
-        raises (CosTrading::IllegalServiceType,
-                ServiceTypeExists,
-                InterfaceTypeMismatch,
-                CosTrading::IllegalPropertyName,
-                CosTrading::DuplicatePropertyName,
-                ValueTypeRedefinition,
-                CosTrading::UnknownServiceType,
-                DuplicateServiceTypeName);
-
-      void remove_type (in CosTrading::ServiceTypeName name)
-        raises (CosTrading::IllegalServiceType,
-                CosTrading::UnknownServiceType,
-                HasSubTypes);
-      
-      ServiceTypeNameSeq list_types (in SpecifiedServiceTypes which_types);
-
-      TypeStruct describe_type (in CosTrading::ServiceTypeName name)
-        raises (CosTrading::IllegalServiceType,
-                CosTrading::UnknownServiceType);
-
-      TypeStruct fully_describe_type (in CosTrading::ServiceTypeName name)
-        raises (CosTrading::IllegalServiceType,
-                CosTrading::UnknownServiceType);
-
-      void mask_type (in CosTrading::ServiceTypeName name)
-        raises (CosTrading::IllegalServiceType,
-                CosTrading::UnknownServiceType,
-                AlreadyMasked);
-
-      void unmask_type (in CosTrading::ServiceTypeName name)
-        raises (CosTrading::IllegalServiceType,
-                CosTrading::UnknownServiceType,
-                NotMasked);      
-    };
-}; /* end module CosTradingRepos */
-
-module CosTradingSequences
-{
-  typedef sequence<short> ShortSeq;
-  typedef sequence<unsigned short> UShortSeq;
-  typedef sequence<long> LongSeq;
-  typedef sequence<unsigned long> ULongSeq;
-  typedef sequence<boolean> BooleanSeq;
-  typedef sequence<float> FloatSeq;
-  typedef sequence<double> DoubleSeq;
-  typedef sequence<string> StringSeq;
-};
-
-#endif /* TAO_TRADING_REPOS_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
index b0a177262c1..7d810dc4436 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -141,14 +141,14 @@ void
 ACE_ES_Dispatching_Base::shutdown (void)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "EC (%t) ACE_ES_Dispatching_Base module shutting down.\n"));
+	      "EC (%t) ACE_ES_Dispatching_Base module shutting down.\n"));
 }
 
 // Just forward the request.  This is basically a hook for the RTU
-// stuff.
+// stuff. 
 int
 ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request,
-                                         u_long &command_action)
+					 u_long &command_action)
 {
   TAO_TRY
     {
@@ -191,7 +191,7 @@ ACE_ES_Priority_Dispatching::ACE_ES_Priority_Dispatching (ACE_EventChannel *chan
       this->queues_[x] = 0;
     }
 
-  this->scheduler_ =
+  this->scheduler_ = 
     this->channel_->scheduler ();
 }
 
@@ -206,7 +206,7 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
   for (int x = 0; x < ACE_Scheduler_MAX_PRIORITIES; x++)
     {
       if (this->queues_[x] != 0)
-        continue;
+	continue;
 
       // Convert ACE_Scheduler_Rate (it's really a period, not a rate!)
       // to a form we can easily work with.
@@ -217,16 +217,16 @@ ACE_ES_Priority_Dispatching::initialize_queues (void)
                                        period_tv.usec () * 10;
 
       ACE_NEW (this->queues_[x],
-               ACE_ES_Dispatch_Queue (this,
+	       ACE_ES_Dispatch_Queue (this,
                                       &this->notification_strategy_,
                                       this->scheduler_.in ()));
       this->queues_[x]->thr_mgr (&this->thr_mgr_);
 
       if ( this->queues_[x]->open_queue (period,
-                                         threads_per_queue_) == -1)
+					 threads_per_queue_) == -1)
         {
           ACE_ERROR ((LM_ERROR, "%p.\n",
-                      "ACE_ES_Priority_Dispatching::initialize_queues"));
+		      "ACE_ES_Priority_Dispatching::initialize_queues"));
           return;
         }
 
@@ -265,7 +265,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
         // Allocate a new dispatch queue.
         queues_[priority] = new ACE_ES_Dispatch_Queue (this, &notification_strategy_);
         if (queues_[priority] == 0)
-          TAO_THROW (CORBA::NO_MEMORY (0, ,
+          TAO_THROW (CORBA::NO_MEMORY (0, CORBA::COMPLETED_NO,
                                           "ACE_ES_Priority_Dispatching::connected"));
 
         // Initialize the dispatch queue corresponding to the
@@ -281,7 +281,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
         // spawns the threads.
         if (queues_[priority]->open_queue (priority,
                                            threads_per_queue_) == -1)
-          TAO_THROW (DISPATCH_ERROR (0, ,
+          TAO_THROW (DISPATCH_ERROR (0, CORBA::COMPLETED_NO,
                                      "ACE_ES_Priority_Dispatching::connected:"
                                      "queue open failed.\n"));
 
@@ -293,7 +293,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer,
           highest_priority_ = priority;
 
         ACE_DEBUG ((LM_DEBUG,
-                    "EC (%t) Created queue priority = %d.\n", priority));
+		    "EC (%t) Created queue priority = %d.\n", priority));
       }
     else
       queue_count_[priority]++;
@@ -379,10 +379,10 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
   if (queues_[preemption_priority] == 0)
     {
       ACE_ERROR ((LM_ERROR, "EC (%t): Push to closed queue %d,"
-                  " dropping event.\n", preemption_priority));
+		  " dropping event.\n", preemption_priority));
       return;
 #if 0
-      TAO_THROW (SYNC_ERROR (0, , "ACE_ES_Priority_Dispatching::push"));
+      TAO_THROW (SYNC_ERROR (0, CORBA::COMPLETED_NO, "ACE_ES_Priority_Dispatching::push"));
 #endif /* 0 */
     }
 
@@ -397,9 +397,9 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request,
                     " release failed.\n"));
       if (errno != EPIPE)
         {
-          TAO_THROW (CORBA::NO_MEMORY ());
+          TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
           // @@ Orbix parameters
-          // 0, ,
+          // 0, CORBA::COMPLETED_NO,
           // "ACE_ES_Priority_Dispatching::push enqueue failed"));
         }
       else
@@ -485,21 +485,21 @@ ACE_ES_Priority_Dispatching::shutdown (void)
     if (queues_[x] != 0)
       {
         ACE_DEBUG ((LM_DEBUG,
-                    "EC (%t) shutting down dispatch queue %d.\n", x));
+		    "EC (%t) shutting down dispatch queue %d.\n", x));
         queues_[x]->shutdown_task ();
       }
 
   if (this->thr_mgr_.wait () == -1)
     ACE_ERROR ((LM_ERROR, "%p\n",
-                "Priority_Dispatching::shutdown - waiting"));
+		"Priority_Dispatching::shutdown - waiting"));
 
   for (int i = 0; i <= this->highest_priority_; ++i)
     {
       if (this->queues_[i] != 0)
-        {
-          delete this->queues_[i];
-          this->queues_[i] = 0;
-        }
+	{
+	  delete this->queues_[i];
+	  this->queues_[i] = 0;
+	}
     }
 }
 
@@ -510,7 +510,6 @@ ACE_ES_Priority_Dispatching::shutdown (void)
 void
 ACE_ES_Priority_Dispatching::dispatch_queue_closed (ACE_ES_Dispatch_Queue *queue)
 {
-  ACE_UNUSED_ARG (queue);
 }
 
 /*
@@ -558,9 +557,9 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
   else
     {
       // quick hack to test dynamic queue performance (to be replaced soon)
-          ACE_ES_QUEUE *mq = 0;
-#if defined (TAO_USES_STRATEGY_SCHEDULER)
-#if defined (TAO_USES_EDF_SCHEDULING)
+	  ACE_ES_QUEUE *mq = 0;
+      #if defined (TAO_USES_STRATEGY_SCHEDULER)
+        #if defined (TAO_USES_EDF_SCHEDULING)
 
           ACE_Deadline_Message_Strategy *adms = new ACE_Deadline_Message_Strategy;
 
@@ -569,7 +568,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
             mq = new ACE_Dynamic_Message_Queue<ACE_SYNCH> (*adms);
           }
 
-#elif defined (TAO_USES_MLF_SCHEDULING) || defined (TAO_USES_MUF_SCHEDULING)
+        #elif defined (TAO_USES_MLF_SCHEDULING) || defined (TAO_USES_MUF_SCHEDULING)
 
           ACE_Laxity_Message_Strategy *alms = new ACE_Laxity_Message_Strategy;
 
@@ -578,13 +577,13 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
             mq = new ACE_Dynamic_Message_Queue<ACE_SYNCH> (*alms);
           }
 
-#else
+        #else
           mq = new ACE_ES_QUEUE;
-#endif
-#else
+        #endif
+      #else
         // Allocate a message queue that does not notify.
         mq = new ACE_ES_MQ;
-#endif
+      #endif
 
       if (mq == 0)
         ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
@@ -617,42 +616,42 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period,
                          "ACE_ES_Dispatch_Queue::open_queue"), -1);
     case 0:
       {
-        TAO_TRY
-          {// @@ TODO: Handle exceptions...
+	TAO_TRY
+	  {// @@ TODO: Handle exceptions...
 #if 1
             this->scheduler_->set
               (rt_info_,
                RtecScheduler::VERY_HIGH_CRITICALITY,
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
                period,
                RtecScheduler::VERY_LOW_IMPORTANCE,
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
                1,
                RtecScheduler::OPERATION,
                TAO_TRY_ENV);
 #else
-            ACE_Scheduler_Factory::server()->set (rt_info_,
-                                                  RtecScheduler::VERY_HIGH_CRITICALITY,
-                                                  ORBSVCS_Time::zero (),
-                                                  ORBSVCS_Time::zero (),
-                                                  ORBSVCS_Time::zero (),
-                                                  period,
-                                                  RtecScheduler::VERY_LOW_IMPORTANCE,
-                                                  ORBSVCS_Time::zero (),
-                                                  1,
-                                                  RtecScheduler::OPERATION,
-                                                  TAO_TRY_ENV);
+	    ACE_Scheduler_Factory::server()->set (rt_info_,
+						  RtecScheduler::VERY_HIGH_CRITICALITY,
+						  ORBSVCS_Time::zero,
+						  ORBSVCS_Time::zero,
+						  ORBSVCS_Time::zero,
+						  period,
+						  RtecScheduler::VERY_LOW_IMPORTANCE,
+						  ORBSVCS_Time::zero,
+						  1,
+						  RtecScheduler::OPERATION,
+						  TAO_TRY_ENV);
 #endif
-            TAO_CHECK_ENV;
-          }
-        TAO_CATCHANY
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "ACE_ES_Dispatch_Queue::exception"), -1);
-          }
-        TAO_ENDTRY;
+	    TAO_CHECK_ENV;
+	  }
+	TAO_CATCHANY
+	  {
+	    ACE_ERROR_RETURN ((LM_ERROR,
+			       "ACE_ES_Dispatch_Queue::exception"), -1);
+	  }
+	TAO_ENDTRY;
       }
       // FALLTHROUGH
     case 1:
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 31c65a2a770..b2bc69d5f15 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -3,16 +3,12 @@
 #include "EC_Basic_Factory.h"
 #include "EC_Dispatching.h"
 #include "EC_Basic_Filter_Builder.h"
-#include "EC_Trivial_Supplier_Filter.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_SupplierAdmin.h"
 #include "EC_ProxyConsumer.h"
 #include "EC_ProxySupplier.h"
 #include "EC_SupplierFiltering.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_ProxyPushSupplier_Set_T.h"
-#include "EC_Reactive_Timeout_Generator.h"
+#include "Timer_Module.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Basic_Factory.i"
@@ -22,6 +18,8 @@ ACE_RCSID(Event, EC_Basic_Factory, "$Id$")
 
 TAO_EC_Basic_Factory::~TAO_EC_Basic_Factory (void)
 {
+  delete this->supplier_filtering_;
+  this->supplier_filtering_ = 0;
 }
 
 TAO_EC_Dispatching*
@@ -37,9 +35,9 @@ TAO_EC_Basic_Factory::destroy_dispatching (TAO_EC_Dispatching *x)
 }
 
 TAO_EC_Filter_Builder*
-TAO_EC_Basic_Factory::create_filter_builder (TAO_EC_Event_Channel *ec)
+TAO_EC_Basic_Factory::create_filter_builder (TAO_EC_Event_Channel *)
 {
-  return new TAO_EC_Basic_Filter_Builder (ec);
+  return new TAO_EC_Basic_Filter_Builder;
 }
 
 void
@@ -48,18 +46,6 @@ TAO_EC_Basic_Factory::destroy_filter_builder (TAO_EC_Filter_Builder *x)
   delete x;
 }
 
-TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Basic_Factory::create_supplier_filter_builder (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_Trivial_Supplier_Filter_Builder (ec);
-}
-
-void
-TAO_EC_Basic_Factory::destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder *x)
-{
-  delete x;
-}
-
 TAO_EC_ConsumerAdmin*
 TAO_EC_Basic_Factory::create_consumer_admin (TAO_EC_Event_Channel *ec)
 {
@@ -99,7 +85,11 @@ TAO_EC_Basic_Factory::destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier *x)
 TAO_EC_ProxyPushConsumer*
 TAO_EC_Basic_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel *ec)
 {
-  return new TAO_EC_ProxyPushConsumer (ec);
+  if (this->supplier_filtering_ == 0)
+    ACE_NEW_RETURN (this->supplier_filtering_,
+                    TAO_EC_Null_SupplierFiltering (ec),
+                    0);
+  return new TAO_EC_ProxyPushConsumer (ec, this->supplier_filtering_);
 }
 
 void
@@ -108,56 +98,30 @@ TAO_EC_Basic_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x)
   delete x;
 }
 
-TAO_EC_Timeout_Generator*
-TAO_EC_Basic_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
+TAO_EC_Timer_Module*
+TAO_EC_Basic_Factory::create_timer_module (TAO_EC_Event_Channel *ec)
 {
   // @@ TODO fixme
   TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
-  return new TAO_EC_Reactive_Timeout_Generator (orb_core->reactor ());
-}
-
-void
-TAO_EC_Basic_Factory::destroy_timeout_generator (TAO_EC_Timeout_Generator *x)
-{
-  delete x;
-}
-
-TAO_EC_ObserverStrategy*
-TAO_EC_Basic_Factory::create_observer_strategy (TAO_EC_Event_Channel *ec)
-{
-  ACE_Lock* lock;
-  ACE_NEW_RETURN (lock, ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, 0);
-  return new TAO_EC_Basic_ObserverStrategy (ec, lock);
+  return new TAO_EC_ST_Timer_Module (orb_core->reactor ());
 }
 
 void
-TAO_EC_Basic_Factory::destroy_observer_strategy (TAO_EC_ObserverStrategy *x)
+TAO_EC_Basic_Factory::destroy_timer_module (TAO_EC_Timer_Module *x)
 {
   delete x;
 }
 
-TAO_EC_ProxyPushSupplier_Set*
-TAO_EC_Basic_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
+PortableServer::POA_ptr
+TAO_EC_Basic_Factory::consumer_poa (CORBA::Environment&)
 {
-  return new TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH> ();
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-TAO_EC_Scheduling_Strategy*
-TAO_EC_Basic_Factory::create_scheduling_strategy (TAO_EC_Event_Channel*)
+PortableServer::POA_ptr
+TAO_EC_Basic_Factory::supplier_poa (CORBA::Environment&)
 {
-  return new TAO_EC_Null_Scheduling;
-}
-
-void
-TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x)
-{
-  delete x;
-}
-
-void
-TAO_EC_Basic_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
-{
-  delete x;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 ACE_Lock*
@@ -175,7 +139,7 @@ TAO_EC_Basic_Factory::destroy_consumer_lock (ACE_Lock* x)
 ACE_Lock*
 TAO_EC_Basic_Factory::create_supplier_lock (void)
 {
-  return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> ();
+  return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ();
 }
 
 void
@@ -207,19 +171,3 @@ TAO_EC_Basic_Factory::destroy_supplier_admin_lock (ACE_Lock* x)
 {
   delete x;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH>;
-template class ACE_Node<ACE_Command_Base*>;
-template class ACE_Unbounded_Queue<ACE_Command_Base*>;
-template class ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH>
-#pragma instantiate ACE_Node<ACE_Command_Base*>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Command_Base*>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Command_Base*>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
index cee001ac85c..de3b3e008f4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   A factory for a basic event channel: it provides filtering and
+//   correlation, but only at the consumer level.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -33,7 +37,7 @@
 
 class TAO_EC_SupplierFiltering;
 
-class TAO_ORBSVCS_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
+class TAO_EC_Basic_Factory : public TAO_EC_Factory
 {
   // = TITLE
   //   The factory for a simple event channel.
@@ -47,9 +51,11 @@ class TAO_ORBSVCS_Export TAO_EC_Basic_Factory : public TAO_EC_Factory
   //   This object creates a single instance of the Supplier
   //
   // = MEMORY MANAGMENT
+  //   A single event channel instance can be used with an instance of
+  //   this class.
   //
 public:
-  TAO_EC_Basic_Factory (void);
+  TAO_EC_Basic_Factory (PortableServer::POA_ptr poa);
   // Constructor
 
   virtual ~TAO_EC_Basic_Factory (void);
@@ -64,10 +70,6 @@ public:
       create_filter_builder (TAO_EC_Event_Channel*);
   virtual void
       destroy_filter_builder (TAO_EC_Filter_Builder*);
-  virtual TAO_EC_Supplier_Filter_Builder*
-      create_supplier_filter_builder (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder*);
   virtual TAO_EC_ConsumerAdmin*
       create_consumer_admin (TAO_EC_Event_Channel*);
   virtual void
@@ -84,22 +86,14 @@ public:
       create_proxy_push_consumer (TAO_EC_Event_Channel*);
   virtual void
       destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
-  virtual TAO_EC_Timeout_Generator*
-      create_timeout_generator (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_timeout_generator (TAO_EC_Timeout_Generator*);
-  virtual TAO_EC_ObserverStrategy*
-      create_observer_strategy (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_observer_strategy (TAO_EC_ObserverStrategy*);
-  virtual TAO_EC_Scheduling_Strategy*
-      create_scheduling_strategy (TAO_EC_Event_Channel*);
+  virtual TAO_EC_Timer_Module*
+      create_timer_module (TAO_EC_Event_Channel*);
   virtual void
-      destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy*);
-  virtual TAO_EC_ProxyPushSupplier_Set*
-      create_proxy_push_supplier_set (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*);
+      destroy_timer_module (TAO_EC_Timer_Module*);
+  virtual PortableServer::POA_ptr
+       consumer_poa (CORBA::Environment& env);
+  virtual PortableServer::POA_ptr
+       supplier_poa (CORBA::Environment& env);
 
   virtual ACE_Lock* create_consumer_lock (void);
   virtual void destroy_consumer_lock (ACE_Lock*);
@@ -110,6 +104,13 @@ public:
   virtual void destroy_consumer_admin_lock (ACE_Lock*);
   virtual ACE_Lock* create_supplier_admin_lock (void);
   virtual void destroy_supplier_admin_lock (ACE_Lock*);
+
+private:
+  PortableServer::POA_var poa_;
+  // The POA
+
+  TAO_EC_SupplierFiltering* supplier_filtering_;
+  // The filtering strategy
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
index 115f6915927..2644a38808f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i
@@ -1,6 +1,8 @@
 // $Id$
 
 ACE_INLINE
-TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
+TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (PortableServer::POA_ptr poa)
+  :  poa_ (PortableServer::POA::_duplicate (poa)),
+     supplier_filtering_ (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index b180b3492cf..105794b8d1b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -5,7 +5,6 @@
 #include "EC_Type_Filter.h"
 #include "EC_Conjunction_Filter.h"
 #include "EC_Disjunction_Filter.h"
-#include "EC_Timeout_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Basic_Filter_Builder.i"
@@ -18,20 +17,17 @@ TAO_EC_Basic_Filter_Builder::~TAO_EC_Basic_Filter_Builder (void)
 }
 
 TAO_EC_Filter*
-TAO_EC_Basic_Filter_Builder::build (
-    TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::Environment&) const
+TAO_EC_Basic_Filter_Builder::
+    build (RtecEventChannelAdmin::ConsumerQOS& qos) const
 {
   CORBA::ULong pos = 0;
-  return this->recursive_build (supplier, qos, pos);
+  return this->recursive_build (qos, pos);
 }
 
 TAO_EC_Filter*
-TAO_EC_Basic_Filter_Builder:: recursive_build (
-    TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::ULong& pos) const
+TAO_EC_Basic_Filter_Builder::
+    recursive_build (RtecEventChannelAdmin::ConsumerQOS& qos,
+                     CORBA::ULong& pos) const
 {
   const RtecEventComm::Event& e = qos.dependencies[pos].event;
   if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR)
@@ -43,7 +39,7 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
       for (CORBA::ULong i = 0; i != n; ++i)
         {
-          children[i] = this->recursive_build (supplier, qos, pos);
+          children[i] = this->recursive_build (qos, pos);
           pos++;
         }
       return new TAO_EC_Conjunction_Filter (children, n);
@@ -57,23 +53,11 @@ TAO_EC_Basic_Filter_Builder:: recursive_build (
       ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
       for (CORBA::ULong i = 0; i != n; ++i)
         {
-          children[i] = this->recursive_build (supplier, qos, pos);
+          children[i] = this->recursive_build (qos, pos);
           pos++;
         }
       return new TAO_EC_Disjunction_Filter (children, n);
     }
-  else if (e.header.type == ACE_ES_EVENT_TIMEOUT
-           || e.header.type == ACE_ES_EVENT_INTERVAL_TIMEOUT
-           || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT)
-    {
-      pos++;
-      TAO_EC_QOS_Info qos_info;
-      return new TAO_EC_Timeout_Filter (this->event_channel_,
-                                        supplier,
-                                        qos_info,
-                                        e.header.type,
-                                        e.header.creation_time);
-    }
   return new TAO_EC_Type_Filter (e.header);
 }
 
@@ -83,8 +67,9 @@ TAO_EC_Basic_Filter_Builder::
                     CORBA::ULong pos) const
 {
   CORBA::ULong l = qos.dependencies.length ();
-  CORBA::ULong i;
-  for (i = pos; i != l; ++i)
+  for (CORBA::ULong i = pos;
+       i != l;
+       ++i)
     {
       const RtecEventComm::Event& e = qos.dependencies[i].event;
       if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index 8b245bd0ce0..1fcbcdbba30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -12,6 +12,9 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Filter builder to the basic filters.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -32,9 +35,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_EC_Filter;
-class TAO_EC_Event_Channel;
 
-class TAO_ORBSVCS_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Builder
+class TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Builder
 {
   // = TITLE
   //   Implement a builder for the fundamental filters.
@@ -45,20 +47,17 @@ class TAO_ORBSVCS_Export TAO_EC_Basic_Filter_Builder : public TAO_EC_Filter_Buil
   //   are constructed using this class.
   //
 public:
-  TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel* ec);
+  TAO_EC_Basic_Filter_Builder (void);
   // constructor.
 
   virtual ~TAO_EC_Basic_Filter_Builder (void);
   // destructor...
 
   // = The TAO_EC_Filter_Builder methods...
-  TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &env) const;
+  TAO_EC_Filter* build (RtecEventChannelAdmin::ConsumerQOS& qos) const;
 
 private:
-  TAO_EC_Filter* recursive_build (TAO_EC_ProxyPushSupplier *supplier,
-                                  RtecEventChannelAdmin::ConsumerQOS& qos,
+  TAO_EC_Filter* recursive_build (RtecEventChannelAdmin::ConsumerQOS& qos,
                                   CORBA::ULong& pos) const;
   // Recursively build the filter tree.
 
@@ -66,10 +65,6 @@ private:
                                CORBA::ULong pos) const;
   // Count the number of children of the current node, i.e. until a
   // conjunction or disjunction starts.
-
-private:
-  TAO_EC_Event_Channel* event_channel_;
-  // The event channel.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
index 3ee17166869..d62386e9259 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
@@ -1,8 +1,6 @@
 // $Id$
 
 ACE_INLINE
-TAO_EC_Basic_Filter_Builder::
-      TAO_EC_Basic_Filter_Builder (TAO_EC_Event_Channel *ec)
-  :  event_channel_ (ec)
+TAO_EC_Basic_Filter_Builder::TAO_EC_Basic_Filter_Builder (void)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
deleted file mode 100644
index e85b8a15dab..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_BUSY_LOCK_CPP
-#define TAO_EC_BUSY_LOCK_CPP
-
-#include "EC_Busy_Lock.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Busy_Lock.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Busy_Lock, "$Id$")
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::remove (void)
-{
-  return 0;
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire (void)
-{
-  return this->adaptee_->busy ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire (void)
-{
-  return this->adaptee_->busy ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::release (void)
-{
-  return this->adaptee_->idle ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_read (void)
-{
-  return this->adaptee_->busy ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::acquire_write (void)
-{
-  return this->adaptee_->busy ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_read (void)
-{
-  return this->adaptee_->busy ();
-}
-
-template<class T>
-int TAO_EC_Busy_Lock_Adapter<T>::tryacquire_write (void)
-{
-  return this->adaptee_->busy ();
-}
-
-#endif /* TAO_EC_BUSY_LOCK_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
deleted file mode 100644
index 1f36fdb6fc3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_ConsumerAdmin
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_BUSY_LOCK_H
-#define TAO_EC_BUSY_LOCK_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class Adaptee>
-class TAO_EC_Busy_Lock_Adapter
-{
-public:
-  TAO_EC_Busy_Lock_Adapter (Adaptee* adaptee);
-  // Constructor
-
-  // = The ACE_Lock methods, please check $ACE_ROOT/ace/Synch.h for
-  // details.
-
-  int remove (void);
-  int acquire (void);
-  int tryacquire (void);
-  int release (void);
-  int acquire_read (void);
-  int acquire_write (void);
-  int tryacquire_read (void);
-  int tryacquire_write (void);
-
-private:
-  Adaptee* adaptee_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Busy_Lock.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Busy_Lock.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Busy_Lock.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_EC_BUSY_LOCK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
deleted file mode 100644
index dd4c3e7a956..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-template<class T> ACE_INLINE
-TAO_EC_Busy_Lock_Adapter<T>::TAO_EC_Busy_Lock_Adapter (T* adaptee)
-  :  adaptee_ (adaptee)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
deleted file mode 100644
index 2590494e730..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_COMMAND_CPP
-#define TAO_EC_COMMAND_CPP
-
-#include "EC_Command.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Command.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Command, "$Id$")
-
-template<class Target, class Object> int
-TAO_EC_Connected_Command<Target,Object>::execute (void* arg)
-{
-  CORBA::Environment *env = &CORBA::default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->connected_i (this->object_, *env);
-  return 0;
-}
-
-// ****************************************************************
-
-template<class Target, class Object> int
-TAO_EC_Disconnected_Command<Target,Object>::execute (void* arg)
-{
-  CORBA::Environment *env = &CORBA::default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->disconnected_i (this->object_, *env);
-  return 0;
-}
-
-// ****************************************************************
-
-template<class Target> int
-TAO_EC_Shutdown_Command<Target>::execute (void* arg)
-{
-  CORBA::Environment *env = &CORBA::default_environment ();
-  if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->shutdown_i (*env);
-  return 0;
-}
-
-#endif /* TAO_EC_COMMAND_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h b/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
deleted file mode 100644
index b50e8c7ab3a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Command
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_COMMAND_H
-#define TAO_EC_COMMAND_H
-
-#include "ace/Functor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class Target, class Object>
-class TAO_EC_Connected_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Connected_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the connected_i() method
-  //   on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Connected_Command (Target *target,
-                            Object *object);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-
-  Object *object_;
-  // The argument
-};
-
-// ****************************************************************
-
-template<class Target, class Object>
-class TAO_EC_Disconnected_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Disconnected_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the disconnected_i()
-  //   method on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Disconnected_Command (Target *target,
-                               Object *object);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-
-  Object *object_;
-  // The argument
-};
-
-// ****************************************************************
-
-template<class Target>
-class TAO_EC_Shutdown_Command : public ACE_Command_Base
-{
-  // = TITLE
-  //   EC_Shutdown_Command
-  //
-  // = DESCRIPTION
-  //   Implements a Command object that invokes the shutdown_i()
-  //   method on the target, passing an argument of type Object.
-  //
-  // = MEMORY MANAGMENT
-  //   It does not assume ownership of Object nor the Target
-  //   arguments.
-  //   Usually allocated from the heap or an allocator; but it is not
-  //   self-managed.
-  //
-  // = LOCKING
-  //   No provisions for locking, access must be serialized
-  //   externally.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_Shutdown_Command (Target *target);
-  // constructor...
-
-  virtual int execute (void *arg);
-  // The callback method, if the argument is not nil it is interpreted
-  // as a CORBA::Environment.
-
-private:
-  Target *target_;
-  // The target
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "EC_Command.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_Command.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_Command.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_EC_COMMAND_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i b/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
deleted file mode 100644
index fe46a45f115..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Command.i
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-template<class Target, class Object>
-TAO_EC_Connected_Command<Target,Object>::
-      TAO_EC_Connected_Command (Target *target,
-                                Object *object)
-  : target_ (target),
-    object_ (object)
-{
-}
-
-// ****************************************************************
-
-template<class Target, class Object>
-TAO_EC_Disconnected_Command<Target,Object>::
-      TAO_EC_Disconnected_Command (Target *target,
-                                   Object *object)
-  : target_ (target),
-    object_ (object)
-{
-}
-
-// ****************************************************************
-
-template<class Target>
-TAO_EC_Shutdown_Command<Target>::
-      TAO_EC_Shutdown_Command (Target *target)
-  : target_ (target)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
index 9349a960ba3..c281e046f7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -3,7 +3,7 @@
 #include "EC_Conjunction_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Conjunction_Filter.i"
+#include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Conjunction_Filter, "$Id$")
@@ -56,30 +56,12 @@ TAO_EC_Conjunction_Filter::all_received (void) const
        i != this->bitvec_ + this->nwords_;
        ++i)
     {
-      if (*i != ACE_static_cast(Word,~0))
+      if (*i != ~0)
         return 0;
     }
   return 0;
 }
 
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Conjunction_Filter::begin (void) const
-{
-  return this->children_;
-}
-
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Conjunction_Filter::end (void) const
-{
-  return this->children_ + this->n_;
-}
-
-int
-TAO_EC_Conjunction_Filter::size (void) const
-{
-  return this->n_;
-}
-
 int
 TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info,
@@ -121,7 +103,7 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event,
                                  TAO_EC_QOS_Info& qos_info,
                                  CORBA::Environment& ACE_TRY_ENV)
 {
-  CORBA::Long pos = this->current_child_ - this->begin ();
+  offset_t pos = this->current_child_ - this->begin ();
   int w = pos / bits_per_word;
   int b = pos % bits_per_word;
   if (ACE_BIT_ENABLED (this->bitvec_[w], 1<<b))
@@ -184,26 +166,14 @@ TAO_EC_Conjunction_Filter::max_event_size (void) const
   return n;
 }
 
-int
-TAO_EC_Conjunction_Filter::can_match (
-      const RtecEventComm::EventHeader& header) const
+void
+TAO_EC_Conjunction_Filter::event_ids (TAO_EC_Filter::Headers& headers)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      if ((*i)->can_match (header) != 0)
-        return 1;
+      (*i)->event_ids (headers);
     }
-  return 0;
-}
-
-int
-TAO_EC_Conjunction_Filter::add_dependencies (
-      const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info&,
-      CORBA::Environment &)
-{
-  return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
index 04d4efb7b61..6c3e3c2f26a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   A per-consumer filter that accepts events from a set of
+//   children.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -31,7 +35,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_EC_Conjunction_Filter : public TAO_EC_Filter
+class TAO_EC_Conjunction_Filter : public TAO_EC_Filter
 {
   // = TITLE
   //   The conjunction filter.
@@ -48,15 +52,12 @@ public:
                              size_t n);
   // Constructor. It assumes ownership of both the array and the
   // children.
-
+  
   virtual ~TAO_EC_Conjunction_Filter (void);
   // Destructor
 
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info,
                       CORBA::Environment& env);
@@ -71,21 +72,25 @@ public:
                             CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void event_ids (TAO_EC_Filter::Headers& headers);
+
+  typedef TAO_EC_Filter* value_type;
+  typedef TAO_EC_Filter* const const_value_type;
+  typedef const_value_type* ChildrenIterator;
+  ChildrenIterator begin (void) const;
+  ChildrenIterator end (void) const;
+  // STL-like iterators...
 
   typedef unsigned int Word;
 
-private:
+private: 
   int all_received (void) const;
   // Determine if all the children have received their events.
-
+  
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter
                               (const TAO_EC_Conjunction_Filter&))
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Conjunction_Filter& operator=
-                              (const TAO_EC_Conjunction_Filter&))
+                              (const TAO_EC_Conjunction_Filter&))  
 
 private:
   TAO_EC_Filter** children_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
index cfa1da318d3..b6621443d40 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.i
@@ -1 +1,13 @@
 // $Id$
+
+ACE_INLINE TAO_EC_Conjunction_Filter::ChildrenIterator
+TAO_EC_Conjunction_Filter::begin (void) const
+{
+  return this->children_;
+}
+
+ACE_INLINE TAO_EC_Conjunction_Filter::ChildrenIterator
+TAO_EC_Conjunction_Filter::end (void) const
+{
+  return this->children_ + this->n_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 23b54f7bf11..0f038b70f36 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
+#include "orbsvcs/RtecEventChannelAdminC.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
 #include "EC_Event_Channel.h"
-#include "EC_Command.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_ConsumerAdmin.i"
@@ -12,119 +11,74 @@
 
 ACE_RCSID(Event, EC_ConsumerAdmin, "$Id$")
 
-TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel *ec,
-                                            TAO_EC_ProxyPushSupplier_Set* ss)
-  :  event_channel_ (ec),
-     supplier_set_ (ss)
+TAO_EC_ConsumerAdmin::TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel *ec)
+  :  event_channel_ (ec)
 {
-  if (this->supplier_set_ == 0)
-    {
-      this->supplier_set_ =
-        this->event_channel_->create_proxy_push_supplier_set ();
-      this->supplier_set_->busy_hwm (this->event_channel_->busy_hwm ());
-      this->supplier_set_->max_write_delay (this->event_channel_->max_write_delay ());
-    }
-  this->default_POA_ =
-    this->event_channel_->consumer_poa ();
 }
 
 TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 {
-  this->event_channel_->destroy_proxy_push_supplier_set (this->supplier_set_);
-  this->supplier_set_ = 0;
 }
 
 void
-TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushConsumer *consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ConsumerAdmin::set_default_POA (PortableServer::POA_ptr poa)
 {
-  ACE_GUARD_THROW_EX (TAO_EC_ConsumerAdmin::Busy_Lock,
-      ace_mon, this->busy_lock (),
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
+  this->default_POA_ = 
+    PortableServer::POA::_duplicate (poa);
+}
 
+void
+TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushConsumer *consumer,
+				 CORBA::Environment &ACE_TRY_ENV)
+{
   SupplierSetIterator end = this->end ();
   for (SupplierSetIterator i = this->begin ();
        i != end;
        ++i)
     {
       (*i)->connected (consumer, ACE_TRY_ENV);
-      ACE_CHECK;
-      consumer->connected (*i, ACE_TRY_ENV);
-      ACE_CHECK;
     }
 }
 
 void
 TAO_EC_ConsumerAdmin::disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (TAO_EC_ConsumerAdmin::Busy_Lock,
-      ace_mon, this->busy_lock (),
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
   SupplierSetIterator end = this->end ();
   for (SupplierSetIterator i = this->begin ();
        i != end;
        ++i)
     {
       (*i)->disconnected (consumer, ACE_TRY_ENV);
-      ACE_CHECK;
-      consumer->disconnected (*i, ACE_TRY_ENV);
-      ACE_CHECK;
     }
 }
 
 void
 TAO_EC_ConsumerAdmin::connected (TAO_EC_ProxyPushSupplier *supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &ACE_TRY_ENV)
 {
-  this->supplier_set_->connected (supplier, ACE_TRY_ENV);
+  if (this->all_suppliers_.insert (supplier) != 0)
+    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_EC_ConsumerAdmin::disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
-  this->supplier_set_->disconnected (supplier, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ConsumerAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  {
-    ACE_GUARD_THROW_EX (TAO_EC_ConsumerAdmin::Busy_Lock,
-      ace_mon, this->busy_lock (),
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    SupplierSetIterator end = this->end ();
-    for (SupplierSetIterator i = this->begin ();
-         i != end;
-         ++i)
-      {
-        ACE_TRY
-          {
-            (*i)->shutdown (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-          }
-        ACE_CATCHANY
-          {
-            /* ignore all exceptions */
-          }
-        ACE_ENDTRY;
-      }
-  }
-  this->supplier_set_->shutdown (ACE_TRY_ENV);
+  if (this->all_suppliers_.remove (supplier) != 0)
+    ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ());
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
 TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_EC_ProxyPushSupplier* supplier =
+  TAO_EC_ProxyPushSupplier* supplier = 
     this->event_channel_->create_proxy_push_supplier ();
 
+  PortableServer::POA_var poa =
+    this->event_channel_->supplier_poa (ACE_TRY_ENV);
+  supplier->set_default_POA (poa.in ());
+
   return supplier->_this (ACE_TRY_ENV);
 }
 
@@ -136,6 +90,14 @@ TAO_EC_ConsumerAdmin::_default_POA (CORBA::Environment&)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_Node<TAO_EC_ProxyPushSupplier*>;
+template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*>;
+template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*>;
+
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Node<TAO_EC_ProxyPushSupplier*>
+#pragma instantiate ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 4dee0091898..210698e92bf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -12,6 +12,11 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Implement the RtecEventChannelAdmin::ConsumerAdmin interface.
+//   This class is an Abstract Factory for the
+//   TAO_EC_ProxyPushSupplier.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -19,37 +24,35 @@
 //   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
 //   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
 //
+//
 // ============================================================================
 
 #ifndef TAO_EC_CONSUMERADMIN_H
 #define TAO_EC_CONSUMERADMIN_H
 
 #include "ace/Containers.h"
+#include "orbsvcs/RtecEventChannelAdminS.h"
+#include "orbsvcs/Event/EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "EC_ProxyPushSupplier_Set.h"
-
 class TAO_EC_Event_Channel;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ProxyPushConsumer;
 
-class TAO_ORBSVCS_Export TAO_EC_ConsumerAdmin : public POA_RtecEventChannelAdmin::ConsumerAdmin
+class TAO_EC_ConsumerAdmin : public POA_RtecEventChannelAdmin::ConsumerAdmin
 {
   // = TITLE
-  //   ConsumerAdmin
+  //   ProxyPushSupplier
   //
   // = DESCRIPTION
   //   Implements the ConsumerAdmin interface, i.e. the factory for
   //   ProxyPushSupplier objects.
   //
   // = MEMORY MANAGMENT
-  //   It does not assume ownership of the TAO_EC_Event_Channel
-  //   object; but it *does* assume ownership of the
-  //   TAO_EC_ProxyPushSupplier_Set object.
+  //   It does not assume ownership of the TAO_EC_Event_Channel object 
   //
   // = LOCKING
   //   No provisions for locking, access must be serialized
@@ -58,24 +61,24 @@ class TAO_ORBSVCS_Export TAO_EC_ConsumerAdmin : public POA_RtecEventChannelAdmin
   // = TODO
   //
 public:
-  TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel* event_channel,
-                        TAO_EC_ProxyPushSupplier_Set* supplier_set = 0);
-  // constructor. If <supplier_set> is nil then it builds one using
-  // the <event_channel> argument.
-  // In any case it assumes ownership.
+  TAO_EC_ConsumerAdmin (TAO_EC_Event_Channel* event_channel);
+  // constructor...
 
   virtual ~TAO_EC_ConsumerAdmin (void);
   // destructor...
 
-  typedef TAO_EC_ProxyPushSupplier_Set::SupplierSet SupplierSet;
-  typedef TAO_EC_ProxyPushSupplier_Set::SupplierSetIterator SupplierSetIterator;
+  typedef ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*> SupplierSet;
+  typedef ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*> SupplierSetIterator;
 
   SupplierSetIterator begin (void);
   SupplierSetIterator end (void);
   // Iterators over the set of ProxyPushSuppliers
 
-  typedef TAO_EC_ProxyPushSupplier_Set::Busy_Lock Busy_Lock;
-  Busy_Lock& busy_lock (void);
+  void set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
+
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  // Override the ServantBase method.
 
   virtual void connected (TAO_EC_ProxyPushConsumer*,
                           CORBA::Environment&);
@@ -91,26 +94,18 @@ public:
   // Used to inform the EC that a Supplier has connected or
   // disconnected from it.
 
-  virtual void shutdown (CORBA::Environment&);
-  // The event channel is shutting down, inform all the consumers of
-  // this
-
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
       obtain_push_supplier (CORBA::Environment &);
 
-  // = The PortableServer::ServantBase methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-
 private:
   TAO_EC_Event_Channel *event_channel_;
   // The Event Channel we belong to
 
-  TAO_EC_ProxyPushSupplier_Set* supplier_set_;
-  // The implementation for the supplier set container.
-
   PortableServer::POA_var default_POA_;
   // Store the default POA.
+
+  SupplierSet all_suppliers_;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
index ee065379a5e..061e81dba2b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i
@@ -3,17 +3,11 @@
 ACE_INLINE TAO_EC_ConsumerAdmin::SupplierSetIterator
 TAO_EC_ConsumerAdmin::begin (void)
 {
-  return this->supplier_set_->begin ();
+  return this->all_suppliers_.begin ();
 }
 
 ACE_INLINE TAO_EC_ConsumerAdmin::SupplierSetIterator
 TAO_EC_ConsumerAdmin::end (void)
 {
-  return this->supplier_set_->end ();
-}
-
-ACE_INLINE TAO_EC_ConsumerAdmin::Busy_Lock&
-TAO_EC_ConsumerAdmin::busy_lock (void)
-{
-  return this->supplier_set_->busy_lock ();
+  return this->all_suppliers_.end ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
deleted file mode 100644
index c56aa9dda40..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-// $Id$
-
-#include "EC_Default_Factory.h"
-#include "EC_Priority_Dispatching.h"
-#include "EC_Basic_Filter_Builder.h"
-#include "EC_Sched_Filter_Builder.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_Per_Supplier_Filter.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_Priority_Scheduling.h"
-#include "EC_ProxyPushSupplier_Set_T.h"
-#include "EC_Reactive_Timeout_Generator.h"
-#include "EC_Event_Channel.h"
-#include "ace/Arg_Shifter.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Default_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Default_Factory, "$Id$")
-
-TAO_EC_Default_Factory::~TAO_EC_Default_Factory (void)
-{
-}
-
-int
-TAO_EC_Default_Factory::init_svcs (void)
-{
-  return ACE_Service_Config::static_svcs ()->
-    insert (&ace_svc_desc_TAO_EC_Default_Factory);
-}
-
-int
-TAO_EC_Default_Factory::init (int argc, char* argv[])
-{
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-ECdispatching") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "reactive") == 0)
-                {
-                  this->dispatching_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "priority") == 0)
-                {
-                  this->dispatching_ = 1;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported dispatching <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECfiltering") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->filtering_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "basic") == 0)
-                {
-                  this->filtering_ = 1;
-                }
-               else if (ACE_OS::strcasecmp (opt, "priority") == 0)
-                {
-                  this->filtering_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported filtering <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECsupplierfiltering") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->supplier_filtering_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "per-supplier") == 0)
-                {
-                  this->supplier_filtering_ = 1;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported supplier filtering <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECtimeout") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "reactive") == 0)
-                {
-                  this->timeout_ = 0;
-                }
-#if 0
-              else if (ACE_OS::strcasecmp (opt, "priority") == 0)
-                {
-                  this->timeout_ = 1;
-                }
-#endif /* 0 */
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported timeout <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECobserver") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->observer_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "basic") == 0)
-                {
-                  this->observer_ = 1;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported observer <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECscheduling") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->scheduling_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "priority") == 0)
-                {
-                  this->scheduling_ = 1;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported scheduling <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECpushsupplierset") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "immediate") == 0)
-                {
-                  this->supplier_set_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "delayed") == 0)
-                {
-                  this->supplier_set_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "immediate_st") == 0)
-                {
-                  this->supplier_set_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported supplier set <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECproxyconsumerlock") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->consumer_lock_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "thread") == 0)
-                {
-                  this->consumer_lock_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "recursive") == 0)
-                {
-                  this->consumer_lock_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported consumer lock <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECproxysupplierlock") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->supplier_lock_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "thread") == 0)
-                {
-                  this->supplier_lock_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "recursive") == 0)
-                {
-                  this->supplier_lock_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported supplier lock <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECconsumeradminlock") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->consumer_admin_lock_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "thread") == 0)
-                {
-                  this->consumer_admin_lock_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "recursive") == 0)
-                {
-                  this->consumer_admin_lock_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported consumer admin lock <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-ECsupplieradminlock") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "null") == 0)
-                {
-                  this->supplier_admin_lock_ = 0;
-                }
-              else if (ACE_OS::strcasecmp (opt, "thread") == 0)
-                {
-                  this->supplier_admin_lock_ = 1;
-                }
-              else if (ACE_OS::strcasecmp (opt, "recursive") == 0)
-                {
-                  this->supplier_admin_lock_ = 2;
-                }
-              else
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "EC_Default_Factory - "
-                              "unsupported supplier lock <%s>\n",
-                              opt));
-                }
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strncmp (arg, "-EC", 3) == 0)
-        {
-          arg_shifter.consume_arg ();
-          ACE_ERROR ((LM_ERROR,
-                      "EC_Default_Factory - "
-                      "unknowns option <%s>\n",
-                      arg));
-        }
-    }
-  return 0;
-}
-
-int
-TAO_EC_Default_Factory::fini (void)
-{
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_EC_Dispatching*
-TAO_EC_Default_Factory::create_dispatching (TAO_EC_Event_Channel *ec)
-{
-  if (this->dispatching_ == 0)
-    return new TAO_EC_Reactive_Dispatching ();
-  else if (this->dispatching_ == 1)
-    return new TAO_EC_Priority_Dispatching (ec);
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_dispatching (TAO_EC_Dispatching *x)
-{
-  delete x;
-}
-
-TAO_EC_Filter_Builder*
-TAO_EC_Default_Factory::create_filter_builder (TAO_EC_Event_Channel *ec)
-{
-  if (this->filtering_ == 0)
-    return new TAO_EC_Null_Filter_Builder ();
-  else if (this->filtering_ == 1)
-    return new TAO_EC_Basic_Filter_Builder (ec);
-  else if (this->filtering_ == 2)
-    return new TAO_EC_Sched_Filter_Builder (ec);
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_filter_builder (TAO_EC_Filter_Builder *x)
-{
-  delete x;
-}
-
-TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Default_Factory::create_supplier_filter_builder (TAO_EC_Event_Channel *ec)
-{
-  if (this->supplier_filtering_ == 0)
-    return new TAO_EC_Trivial_Supplier_Filter_Builder (ec);
-  else if (this->supplier_filtering_ == 1)
-    return new TAO_EC_Per_Supplier_Filter_Builder (ec);
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder *x)
-{
-  delete x;
-}
-
-TAO_EC_ConsumerAdmin*
-TAO_EC_Default_Factory::create_consumer_admin (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_ConsumerAdmin (ec);
-}
-
-void
-TAO_EC_Default_Factory::destroy_consumer_admin (TAO_EC_ConsumerAdmin *x)
-{
-  delete x;
-}
-
-TAO_EC_SupplierAdmin*
-TAO_EC_Default_Factory::create_supplier_admin (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_SupplierAdmin (ec);
-}
-
-void
-TAO_EC_Default_Factory::destroy_supplier_admin (TAO_EC_SupplierAdmin *x)
-{
-  delete x;
-}
-
-TAO_EC_ProxyPushSupplier*
-TAO_EC_Default_Factory::create_proxy_push_supplier (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_ProxyPushSupplier (ec);
-}
-
-void
-TAO_EC_Default_Factory::destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier *x)
-{
-  delete x;
-}
-
-TAO_EC_ProxyPushConsumer*
-TAO_EC_Default_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_ProxyPushConsumer (ec);
-}
-
-void
-TAO_EC_Default_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x)
-{
-  delete x;
-}
-
-TAO_EC_Timeout_Generator*
-TAO_EC_Default_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
-{
-  if (this->timeout_ == 0)
-    {
-      // @@ TODO fixme
-      TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
-      return new TAO_EC_Reactive_Timeout_Generator (orb_core->reactor ());
-    }
-#if 0
-  else if (this->timeout_ == 1)
-    {
-    }
-#endif
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_timeout_generator (TAO_EC_Timeout_Generator *x)
-{
-  delete x;
-}
-
-TAO_EC_ObserverStrategy*
-TAO_EC_Default_Factory::create_observer_strategy (TAO_EC_Event_Channel *ec)
-{
-  if (this->observer_ == 0)
-    return new TAO_EC_Null_ObserverStrategy;
-  else if (this->observer_ == 1)
-    {
-      // @@ The lock should also be under control of the user...
-      ACE_Lock* lock;
-      ACE_NEW_RETURN (lock, ACE_Lock_Adapter<ACE_SYNCH_MUTEX>, 0);
-      return new TAO_EC_Basic_ObserverStrategy (ec, lock);
-    }
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_observer_strategy (TAO_EC_ObserverStrategy *x)
-{
-  delete x;
-}
-
-TAO_EC_Scheduling_Strategy*
-TAO_EC_Default_Factory::create_scheduling_strategy (TAO_EC_Event_Channel* ec)
-{
-  if (this->scheduling_ == 0)
-    return new TAO_EC_Null_Scheduling;
-  else if (this->scheduling_ == 1)
-    {
-      RtecScheduler::Scheduler_var scheduler = ec->scheduler ();
-      return new TAO_EC_Priority_Scheduling (scheduler.in ());
-    }
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x)
-{
-  delete x;
-}
-
-TAO_EC_ProxyPushSupplier_Set*
-TAO_EC_Default_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
-{
-  if (this->supplier_set_ == 0)
-    return new TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_SYNCH_MUTEX> ();
-  else if (this->supplier_set_ == 1)
-    return new TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH> ();
-  else if (this->supplier_set_ == 2)
-    return new TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex> ();
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
-{
-  delete x;
-}
-
-ACE_Lock*
-TAO_EC_Default_Factory::create_consumer_lock (void)
-{
-  if (this->consumer_lock_ == 0)
-    return new ACE_Lock_Adapter<ACE_Null_Mutex>;
-  else if (this->consumer_lock_ == 1)
-    return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ();
-  else if (this->consumer_lock_ == 2)
-    return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_consumer_lock (ACE_Lock* x)
-{
-  delete x;
-}
-
-ACE_Lock*
-TAO_EC_Default_Factory::create_supplier_lock (void)
-{
-  if (this->supplier_lock_ == 0)
-    return new ACE_Lock_Adapter<ACE_Null_Mutex>;
-  else if (this->supplier_lock_ == 1)
-    return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ();
-  else if (this->supplier_lock_ == 2)
-    return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_supplier_lock (ACE_Lock* x)
-{
-  delete x;
-}
-
-ACE_Lock*
-TAO_EC_Default_Factory::create_consumer_admin_lock (void)
-{
-  if (this->consumer_admin_lock_ == 0)
-    return new ACE_Lock_Adapter<ACE_Null_Mutex>;
-  else if (this->consumer_admin_lock_ == 1)
-    return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ();
-  else if (this->consumer_admin_lock_ == 2)
-    return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_consumer_admin_lock (ACE_Lock* x)
-{
-  delete x;
-}
-
-ACE_Lock*
-TAO_EC_Default_Factory::create_supplier_admin_lock (void)
-{
-  if (this->supplier_admin_lock_ == 0)
-    return new ACE_Lock_Adapter<ACE_Null_Mutex>;
-  else if (this->supplier_admin_lock_ == 1)
-    return new ACE_Lock_Adapter<ACE_SYNCH_MUTEX> ();
-  else if (this->supplier_admin_lock_ == 2)
-    return new ACE_Lock_Adapter<ACE_SYNCH_RECURSIVE_MUTEX> ();
-  return 0;
-}
-
-void
-TAO_EC_Default_Factory::destroy_supplier_admin_lock (ACE_Lock* x)
-{
-  delete x;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_EC_Default_Factory,
-                       ASYS_TEXT ("EC_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_EC_Default_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_ORBSVCS, TAO_EC_Default_Factory)
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_SYNCH_MUTEX>;
-template class TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_SYNCH_MUTEX>
-#pragma instantiate TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
deleted file mode 100644
index 4c4ac433c98..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Default_Factory
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_DEFAULT_FACTORY_H
-#define TAO_EC_DEFAULT_FACTORY_H
-
-#include "EC_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_SupplierFiltering;
-
-class TAO_ORBSVCS_Export TAO_EC_Default_Factory : public TAO_EC_Factory
-{
-  // = TITLE
-  //   A generic factory for EC experimentation.
-  //
-  // = DESCRIPTION
-  //   This class allows the user to experiment with different EC
-  //   configurations.  Using a command-line like interface the user
-  //   can specify which strategies will this factory generate.
-  //   Since the class can be dynamically loaded the strategies can be
-  //   set in the service configurator file.
-  //
-  // = MEMORY MANAGMENT
-  //
-public:
-  TAO_EC_Default_Factory (void);
-  // Constructor
-
-  virtual ~TAO_EC_Default_Factory (void);
-  // destructor...
-
-  static int init_svcs (void);
-  // Helper function to register the default factory into the service
-  // configurator.
-
-  // = The Service_Object entry points
-  virtual int init (int argc, char* argv[]);
-  virtual int fini (void);
-
-  // = The EC_Factory methods
-  virtual TAO_EC_Dispatching*
-      create_dispatching (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_dispatching (TAO_EC_Dispatching*);
-  virtual TAO_EC_Filter_Builder*
-      create_filter_builder (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_filter_builder (TAO_EC_Filter_Builder*);
-  virtual TAO_EC_Supplier_Filter_Builder*
-      create_supplier_filter_builder (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder*);
-  virtual TAO_EC_ConsumerAdmin*
-      create_consumer_admin (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_consumer_admin (TAO_EC_ConsumerAdmin*);
-  virtual TAO_EC_SupplierAdmin*
-      create_supplier_admin (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_supplier_admin (TAO_EC_SupplierAdmin*);
-  virtual TAO_EC_ProxyPushSupplier*
-      create_proxy_push_supplier (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier*);
-  virtual TAO_EC_ProxyPushConsumer*
-      create_proxy_push_consumer (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
-  virtual TAO_EC_Timeout_Generator*
-      create_timeout_generator (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_timeout_generator (TAO_EC_Timeout_Generator*);
-  virtual TAO_EC_ObserverStrategy*
-      create_observer_strategy (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_observer_strategy (TAO_EC_ObserverStrategy*);
-  virtual TAO_EC_Scheduling_Strategy*
-      create_scheduling_strategy (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy*);
-  virtual TAO_EC_ProxyPushSupplier_Set*
-      create_proxy_push_supplier_set (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*);
-
-  virtual ACE_Lock* create_consumer_lock (void);
-  virtual void destroy_consumer_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_lock (void);
-  virtual void destroy_supplier_lock (ACE_Lock*);
-
-  virtual ACE_Lock* create_consumer_admin_lock (void);
-  virtual void destroy_consumer_admin_lock (ACE_Lock*);
-  virtual ACE_Lock* create_supplier_admin_lock (void);
-  virtual void destroy_supplier_admin_lock (ACE_Lock*);
-
-private:
-  int dispatching_;
-  int filtering_;
-  int supplier_filtering_;
-  int timeout_;
-  int observer_;
-  int scheduling_;
-  int supplier_set_;
-  int consumer_lock_;
-  int supplier_lock_;
-  int consumer_admin_lock_;
-  int supplier_admin_lock_;
-  // Several flags to control the kind of object created.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Default_Factory.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory)
-ACE_FACTORY_DECLARE (TAO_ORBSVCS, TAO_EC_Default_Factory)
-
-#endif /* TAO_EC_DEFAULT_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
deleted file mode 100644
index 7518517f769..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Default_Factory::TAO_EC_Default_Factory (void)
-  :  dispatching_ (0),
-     filtering_ (0),
-     supplier_filtering_ (0),
-     timeout_ (0),
-     observer_ (0),
-     scheduling_ (0),
-     supplier_set_ (0),
-     consumer_lock_ (0),
-     supplier_lock_ (0),
-     consumer_admin_lock_ (0),
-     supplier_admin_lock_ (0)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
index a2ecf5c688e..9531f527e43 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -3,7 +3,7 @@
 #include "EC_Disjunction_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Disjunction_Filter.i"
+#include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Disjunction_Filter, "$Id$")
@@ -38,24 +38,6 @@ TAO_EC_Disjunction_Filter::~TAO_EC_Disjunction_Filter (void)
   this->n_ = 0;
 }
 
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Disjunction_Filter::begin (void) const
-{
-  return this->children_;
-}
-
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Disjunction_Filter::end (void) const
-{
-  return this->children_ + this->n_;
-}
-
-ACE_INLINE int
-TAO_EC_Disjunction_Filter::size (void) const
-{
-  return this->n_;
-}
-
 int
 TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info,
@@ -138,26 +120,14 @@ TAO_EC_Disjunction_Filter::max_event_size (void) const
   return n;
 }
 
-int
-TAO_EC_Disjunction_Filter::can_match (
-      const RtecEventComm::EventHeader& header) const
+void
+TAO_EC_Disjunction_Filter::event_ids(TAO_EC_Filter::Headers& headers)
 {
   ChildrenIterator end = this->end ();
   for (ChildrenIterator i = this->begin ();
        i != end;
        ++i)
     {
-      if ((*i)->can_match (header) != 0)
-        return 1;
+      (*i)->event_ids (headers);
     }
-  return 0;
-}
-
-int
-TAO_EC_Disjunction_Filter::add_dependencies (
-      const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
-{
-  return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
index 2bb90482cb3..adf973f29e3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   A per-consumer filter that accepts events from a set of
+//   children.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -31,7 +35,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_EC_Disjunction_Filter : public TAO_EC_Filter
+class TAO_EC_Disjunction_Filter : public TAO_EC_Filter
 {
   // = TITLE
   //   The disjunction filter.
@@ -48,16 +52,12 @@ public:
                              size_t n);
   // Constructor. It assumes ownership of both the array and the
   // children.
-
+  
   virtual ~TAO_EC_Disjunction_Filter (void);
   // Destructor
 
-
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info,
                       CORBA::Environment& env);
@@ -72,16 +72,20 @@ public:
                             CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void event_ids (TAO_EC_Filter::Headers& headers);
 
-private:
+  typedef TAO_EC_Filter* value_type;
+  typedef TAO_EC_Filter* const const_value_type;
+  typedef const_value_type* ChildrenIterator;
+  ChildrenIterator begin (void) const;
+  ChildrenIterator end (void) const;
+  // STL-like iterators...
+
+private: 
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter
                               (const TAO_EC_Disjunction_Filter&))
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter& operator=
-                              (const TAO_EC_Disjunction_Filter&))
+                              (const TAO_EC_Disjunction_Filter&))  
 
 private:
   TAO_EC_Filter** children_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
index cfa1da318d3..d5a62ac2a0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.i
@@ -1 +1,13 @@
 // $Id$
+
+ACE_INLINE TAO_EC_Disjunction_Filter::ChildrenIterator
+TAO_EC_Disjunction_Filter::begin (void) const
+{
+  return this->children_;
+}
+
+ACE_INLINE TAO_EC_Disjunction_Filter::ChildrenIterator
+TAO_EC_Disjunction_Filter::end (void) const
+{
+  return this->children_ + this->n_;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
index ab66a4195eb..d380adb9d98 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -30,19 +30,21 @@ TAO_EC_Reactive_Dispatching::shutdown (void)
 }
 
 void
-TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
+TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier*,
+                                   RtecEventComm::PushConsumer_ptr consumer,
                                    const RtecEventComm::EventSet& event,
                                    TAO_EC_QOS_Info& qos_info,
                                    CORBA::Environment& ACE_TRY_ENV)
 {
-  proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
+  consumer->push (event, ACE_TRY_ENV);
 }
 
 void
 TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
+                                          RtecEventComm::PushConsumer_ptr consumer,
                                           RtecEventComm::EventSet& event,
                                           TAO_EC_QOS_Info& qos_info,
                                           CORBA::Environment& ACE_TRY_ENV)
 {
-  proxy->reactive_push_to_consumer (event, ACE_TRY_ENV);
+  consumer->push (event, ACE_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
index cbd2d15ef7d..e2731aa7a4b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -12,6 +12,14 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   The dispatching strategies.
+//   The EC may be configured with different dispatching strategies,
+//   for instance, it can use a pool of threads to dispatch the
+//   events, or a set of queues with threads at different priorities
+//   for each queue or can simply push the event to the consumer in
+//   FIFO order.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -34,18 +42,13 @@
 class TAO_EC_QOS_Info;
 class TAO_EC_ProxyPushSupplier;
 
-class TAO_ORBSVCS_Export TAO_EC_Dispatching
+class TAO_EC_Dispatching
 {
   // = TITLE
   //   Abstract base class for the dispatching strategies.
   //
   // = DESCRIPTION
-  //   The dispatching strategies.
-  //   The EC may be configured with different dispatching strategies,
-  //   for instance, it can use a pool of threads to dispatch the
-  //   events, or a set of queues with threads at different priorities
-  //   for each queue or can simply push the event to the consumer in
-  //   FIFO order.
+  //   Defines the dispatching strategy interface.
   //
 public:
   virtual ~TAO_EC_Dispatching (void);
@@ -61,10 +64,12 @@ public:
   // their jobs.
 
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
+                     RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info,
                      CORBA::Environment& env) = 0;
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
+                            RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info,
                             CORBA::Environment& env) = 0;
@@ -75,7 +80,7 @@ public:
 
 // ****************************************************************
 
-class TAO_ORBSVCS_Export TAO_EC_Reactive_Dispatching : public TAO_EC_Dispatching
+class TAO_EC_Reactive_Dispatching : public TAO_EC_Dispatching
 {
   // = TITLE
   //   Dispatch using the caller thread.
@@ -93,15 +98,53 @@ public:
   virtual void activate (void);
   virtual void shutdown (void);
   virtual void push (TAO_EC_ProxyPushSupplier* proxy,
+                     RtecEventComm::PushConsumer_ptr consumer,
                      const RtecEventComm::EventSet& event,
                      TAO_EC_QOS_Info& qos_info,
                      CORBA::Environment& env);
   virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
+                            RtecEventComm::PushConsumer_ptr consumer,
                             RtecEventComm::EventSet& event,
                             TAO_EC_QOS_Info& qos_info,
                             CORBA::Environment& env);
 };
 
+// ****************************************************************
+
+#if 0
+#include "orbsvcs/RtecSchedulerC.h"
+// @@ Move to a separate file, otherwise we have to include the file
+// above everywhere
+class TAO_EC_Priority_Dispatching
+{
+  // = TITLE
+  //   Priority based dispatching.
+  //
+  // = DESCRIPTION
+  //   The events are processed using a different queue for each
+  //   priority; a thread process each queue, each thread runs at a
+  //   different OS priority.
+  //
+public:
+  TAO_EC_Priority_Dispatching (RtecScheduler::Scheduler_ptr
+                               scheduler);
+  // The scheduler is used to find the range of priorities and similar
+  // info.
+
+  // = The EC_Dispatching methods.
+  virtual void activate (void);
+  virtual void shutdown (void);
+  virtual void push (TAO_EC_ProxyPushSupplier* proxy,
+                     const RtecEventComm::EventSet& event,
+                     const TAO_EC_QOS_Info& qos_info,
+                     CORBA::Environment& env);
+
+private:
+  ACE_Thread_Manager thread_manager_;
+  // Use our own thread manager.
+};
+#endif /* 0 */
+
 // @@ TODO
 // We could implement other dispatching strategies, such as:
 // - A single queue with a thread pool to process each event (how does
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
deleted file mode 100644
index 7fee17d7d68..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#include "EC_Dispatching_Task.h"
-#include "EC_ProxySupplier.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Dispatching_Task.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Dispatching, "$Id$")
-
-int
-TAO_EC_Dispatching_Task::svc (void)
-{
-  int done = 0;
-  while (!done)
-    {
-      ACE_TRY_NEW_ENV
-        {
-          ACE_Message_Block *mb;
-          if (this->getq (mb) == -1)
-            if (ACE_OS::last_error () == ESHUTDOWN)
-              return 0;
-          else
-            ACE_ERROR ((LM_ERROR,
-                        "EC (%P|%t) getq error in Dispatching Queue\n"));
-
-          TAO_EC_Dispatch_Command *command =
-            ACE_dynamic_cast(TAO_EC_Dispatch_Command*, mb);
-
-          if (command == 0)
-            {
-              ACE_Message_Block::release (mb);
-              continue;
-            }
-
-          int result = command->execute (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_Message_Block::release (mb);
-
-          if (result == -1)
-            done = 1;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "EC (%P|%t) exception in dispatching queue");
-        }
-      ACE_ENDTRY;
-    }
-  return 0;
-}
-
-void
-TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
-                               RtecEventComm::EventSet& event,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command));
-
-  if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                 CORBA::COMPLETED_NO));
-
-  ACE_Message_Block *mb =
-    new (buf) TAO_EC_Push_Command (proxy,
-                                   event,
-                                   this->data_block_.duplicate (),
-                                   this->allocator_);
-  this->putq (mb);
-}
-
-// ****************************************************************
-
-TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void)
-{
-}
-
-// ****************************************************************
-
-int
-TAO_EC_Shutdown_Command::execute (CORBA::Environment&)
-{
-  return -1;
-}
-
-// ****************************************************************
-
-int
-TAO_EC_Push_Command::execute (CORBA::Environment& ACE_TRY_ENV)
-{
-  this->proxy_->push_to_consumer (this->event_, ACE_TRY_ENV);
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
deleted file mode 100644
index 3133fcdf1c4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Dispatching_Task
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_DISPATCHING_TASK_H
-#define TAO_EC_DISPATCHING_TASK_H
-
-#include "ace/Task.h"
-#include "ace/Message_Block.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/RtecEventCommC.h"
-
-class TAO_EC_ProxyPushSupplier;
-
-class TAO_ORBSVCS_Export TAO_EC_Dispatching_Task : public ACE_Task<ACE_SYNCH>
-{
-  // = TITLE
-  //   Implement the dispatching queues for FIFO and Priority
-  //   dispatching.
-  //
-  // = DESCRIPTION
-  //
-public:
-  TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager = 0);
-  // Constructor
-
-  virtual int svc (void);
-  // Process the events in the queue.
-
-  virtual void push (TAO_EC_ProxyPushSupplier *proxy,
-                     RtecEventComm::EventSet& event,
-                     CORBA::Environment &env);
-
-private:
-  ACE_Allocator *allocator_;
-  // An per-task allocator
-
-  ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> > data_block_;
-  // Helper data structure to minimize memory allocations...
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Dispatch_Command : public ACE_Message_Block
-{
-public:
-  TAO_EC_Dispatch_Command (ACE_Allocator *mb_allocator = 0);
-  // Constructor, it will allocate its own data block
-
-  TAO_EC_Dispatch_Command (ACE_Data_Block*,
-                           ACE_Allocator *mb_allocator = 0);
-  // Constructor, it assumes ownership of the data block
-
-  virtual ~TAO_EC_Dispatch_Command (void);
-  // Destructor
-
-  virtual int execute (CORBA::Environment&) = 0;
-  // Command callback
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Shutdown_Command : public TAO_EC_Dispatch_Command
-{
-public:
-  TAO_EC_Shutdown_Command (ACE_Allocator *mb_allocator = 0);
-  // Constructor
-
-  virtual int execute (CORBA::Environment&);
-  // Command callback
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Push_Command : public TAO_EC_Dispatch_Command
-{
-public:
-  TAO_EC_Push_Command (TAO_EC_ProxyPushSupplier* proxy,
-                       RtecEventComm::EventSet& event,
-                       ACE_Data_Block* data_block,
-                       ACE_Allocator *mb_allocator);
-  // Constructor
-
-  virtual int execute (CORBA::Environment&);
-  // Command callback
-
-private:
-  TAO_EC_ProxyPushSupplier* proxy_;
-  // The proxy
-
-  RtecEventComm::EventSet event_;
-  // The event
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Dispatching_Task.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_DISPATCHING_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
deleted file mode 100644
index 550d4859ce8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Dispatching_Task::
-TAO_EC_Dispatching_Task (ACE_Thread_Manager* thr_manager)
-  :  ACE_Task<ACE_SYNCH> (thr_manager)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Dispatch_Command::TAO_EC_Dispatch_Command (ACE_Allocator *mb_allocator)
-  :  ACE_Message_Block (mb_allocator)
-{
-}
-
-ACE_INLINE
-TAO_EC_Dispatch_Command::TAO_EC_Dispatch_Command (ACE_Data_Block *data_block,
-                                                  ACE_Allocator *mb_allocator)
-  :  ACE_Message_Block (data_block, mb_allocator)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Shutdown_Command::TAO_EC_Shutdown_Command (ACE_Allocator *mb_allocator)
-  :  TAO_EC_Dispatch_Command (mb_allocator)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Push_Command::TAO_EC_Push_Command (TAO_EC_ProxyPushSupplier* proxy,
-                                          RtecEventComm::EventSet& event,
-                                          ACE_Data_Block* data_block,
-                                          ACE_Allocator *mb_allocator)
-  :  TAO_EC_Dispatch_Command (data_block, mb_allocator),
-     proxy_ (proxy)
-{
-  //
-  // Efficient copy, steal the buffer from <event>
-  // We cannot do this on the initialization because get_buffer()
-  // could get called first, effectively setting maximum() and
-  // length() to 0!
-  //
-  CORBA::ULong maximum = event.maximum ();
-  CORBA::ULong length = event.length ();
-  RtecEventComm::Event* buffer = event.get_buffer (1);
-  event_.replace (maximum, length, buffer, 1);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
index 72694d63538..24dc5e9abd4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
 #include "EC_Event_Channel.h"
-#include "EC_Default_Factory.h"
+#include "EC_Factory.h"
 #include "EC_Dispatching.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_SupplierAdmin.h"
-#include "EC_Timeout_Generator.h"
-#include "EC_ObserverStrategy.h"
-#include "ace/Dynamic_Service.h"
+#include "Timer_Module.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Event_Channel.i"
@@ -15,53 +13,21 @@
 
 ACE_RCSID(Event, EC_Event_Channel, "$Id$")
 
-TAO_EC_Event_Channel::
-TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attr,
-                      TAO_EC_Factory* factory,
-                      int own_factory)
-  : supplier_poa_ (PortableServer::POA::_duplicate (attr.supplier_poa)),
-    consumer_poa_ (PortableServer::POA::_duplicate (attr.consumer_poa)),
-    factory_ (factory),
-    own_factory_ (own_factory),
-    consumer_reconnect_ (attr.consumer_reconnect),
-    supplier_reconnect_ (attr.supplier_reconnect),
-    busy_hwm_ (attr.busy_hwm),
-    max_write_delay_ (attr.max_write_delay)
+TAO_EC_Event_Channel::TAO_EC_Event_Channel (TAO_EC_Factory* factory)
+  : factory_ (factory)
 {
-  if (this->factory_ == 0)
-    {
-      this->factory_ =
-        ACE_Dynamic_Service<TAO_EC_Factory>::instance ("EC_Factory");
-      this->own_factory_ = 0;
-
-      if (this->factory_ == 0)
-        {
-          ACE_NEW (this->factory_,
-                   TAO_EC_Default_Factory);
-          this->own_factory_ = 1;
-        }
-    }
-
-  this->dispatching_ =
+  ACE_ASSERT (this->factory_ != 0);
+
+  this->dispatching_ = 
     this->factory_->create_dispatching (this);
-  this->filter_builder_ =
+  this->filter_builder_ = 
     this->factory_->create_filter_builder (this);
-  this->supplier_filter_builder_ =
-    this->factory_->create_supplier_filter_builder (this);
   this->consumer_admin_ =
     this->factory_->create_consumer_admin (this);
-  this->supplier_admin_ =
+  this->supplier_admin_ = 
     this->factory_->create_supplier_admin (this);
-  this->timeout_generator_ =
-    this->factory_->create_timeout_generator (this);
-  this->observer_strategy_ =
-    this->factory_->create_observer_strategy (this);
-
-  this->scheduler_ =
-    RtecScheduler::Scheduler::_duplicate (attr.scheduler);
-
-  this->scheduling_strategy_ =
-    this->factory_->create_scheduling_strategy (this);
+  this->timer_module_ = 
+    this->factory_->create_timer_module (this);
 }
 
 TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
@@ -70,33 +36,36 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void)
   this->dispatching_ = 0;
   this->factory_->destroy_filter_builder (this->filter_builder_);
   this->filter_builder_ = 0;
-  this->factory_->destroy_supplier_filter_builder (this->supplier_filter_builder_);
-  this->supplier_filter_builder_ = 0;
   this->factory_->destroy_consumer_admin (this->consumer_admin_);
   this->consumer_admin_ = 0;
   this->factory_->destroy_supplier_admin (this->supplier_admin_);
   this->supplier_admin_ = 0;
-  this->factory_->destroy_timeout_generator (this->timeout_generator_);
-  this->timeout_generator_ = 0;
-  this->factory_->destroy_observer_strategy (this->observer_strategy_);
-  this->observer_strategy_ = 0;
-
-  if (this->own_factory_)
-    delete this->factory_;
+  this->factory_->destroy_timer_module (this->timer_module_);
+  this->timer_module_ = 0;
 }
 
 void
-TAO_EC_Event_Channel::activate (CORBA::Environment&)
+TAO_EC_Event_Channel::activate (CORBA::Environment& ACE_TRY_ENV)
 {
   this->dispatching_->activate ();
-  this->timeout_generator_->activate ();
+  this->timer_module_->activate ();
+  
+  PortableServer::POA_var supplier_poa =
+    this->factory_->supplier_poa (ACE_TRY_ENV);
+  ACE_CHECK;
+  this->supplier_admin_->set_default_POA (supplier_poa.in ());
+
+  PortableServer::POA_var consumer_poa =
+    this->factory_->consumer_poa (ACE_TRY_ENV);
+  ACE_CHECK;
+  this->consumer_admin_->set_default_POA (consumer_poa.in ());
 }
 
 void
 TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV)
 {
   this->dispatching_->shutdown ();
-  this->timeout_generator_->shutdown ();
+  this->timer_module_->shutdown ();
 
   PortableServer::POA_var consumer_poa =
     this->consumer_admin_->_default_POA (ACE_TRY_ENV);
@@ -115,58 +84,46 @@ TAO_EC_Event_Channel::shutdown (CORBA::Environment& ACE_TRY_ENV)
   ACE_CHECK;
   supplier_poa->deactivate_object (supplier_id.in (), ACE_TRY_ENV);
   ACE_CHECK;
-
-  this->supplier_admin_->shutdown (ACE_TRY_ENV);
-
-  this->consumer_admin_->shutdown (ACE_TRY_ENV);
 }
 
 void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &ACE_TRY_ENV)
 {
   this->consumer_admin_->connected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
   this->supplier_admin_->connected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
-  this->observer_strategy_->connected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
   this->consumer_admin_->disconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
   this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (consumer, ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &ACE_TRY_ENV)
 {
   this->supplier_admin_->connected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
   this->consumer_admin_->connected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
-  this->observer_strategy_->connected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
 TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
   this->supplier_admin_->disconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
   this->consumer_admin_->disconnected (supplier, ACE_TRY_ENV);
   ACE_CHECK;
-  this->observer_strategy_->disconnected (supplier, ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 RtecEventChannelAdmin::ConsumerAdmin_ptr
@@ -188,23 +145,16 @@ TAO_EC_Event_Channel::destroy (CORBA::Environment &TAO_TRY_ENV)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_EC_Event_Channel::append_observer (
-       RtecEventChannelAdmin::Observer_ptr observer,
-       CORBA::Environment &ACE_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
+TAO_EC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr,
+                                       CORBA::Environment &)
 {
-  return this->observer_strategy_->append_observer (observer, ACE_IN_ENV);
+  // @@ TODO
+  return 0;
 }
 
 void
-TAO_EC_Event_Channel::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle,
-       CORBA::Environment &ACE_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
+TAO_EC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle,
+                                       CORBA::Environment &)
 {
-  this->observer_strategy_->remove_observer (handle, ACE_IN_ENV);
 }
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
index 264417b61d3..9bfa6b3daf8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -35,56 +35,7 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "EC_Factory.h"
 
-class TAO_ORBSVCS_Export TAO_EC_Event_Channel_Attributes
-{
-  // = TITLE
-  //   Defines the construction time attributes for the Event
-  //   Channel.
-  //
-  // = DESCRIPTION
-  //   The event channel implementation is controlled by two
-  //   mechanisms:
-  //      The EC_Factory that provides the strategies for the EC
-  //      implementation.
-  //      The EC attributes that define constants and values required
-  //      by the EC construction.
-  //   This class encapsulates those constants and values, providing
-  //   an easy mechanism to extend the attributes without requiring
-  //   changes in the EC constructor.
-  //
-public:
-  TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr supplier_poa,
-                                   PortableServer::POA_ptr consumer_poa);
-  // The basic constructor.
-  // The attributes listed as arguments are *required* by the EC, and
-  // no appropiate defaults are available for them.
-
-  // Most fields are public, there is no need to protect them, in fact
-  // the user should be able to set any values she wants.
-
-  int consumer_reconnect;
-  int supplier_reconnect;
-  // Can consumers or suppliers invoke connect_push_* multiple times?
-
-  int busy_hwm;
-  int max_write_delay;
-  // Flags for the Consumer Admin
-
-  RtecScheduler::Scheduler_ptr scheduler;
-  // The scheduling service that we will use with this event channel.
-  // Notice that this is optional and will only take effect if the EC
-  // is configured with the right filtering strategies.
-
-private:
-  friend class TAO_EC_Event_Channel;
-  // Only the EC can read the private fields.
-
-  PortableServer::POA_ptr supplier_poa;
-  PortableServer::POA_ptr consumer_poa;
-  // The POAs
-};
-
-class TAO_ORBSVCS_Export TAO_EC_Event_Channel : public POA_RtecEventChannelAdmin::EventChannel
+class TAO_EC_Event_Channel : public POA_RtecEventChannelAdmin::EventChannel
 {
   // = TITLE
   //   The RtecEventChannelAdmin::EventChannel implementation.
@@ -98,13 +49,8 @@ class TAO_ORBSVCS_Export TAO_EC_Event_Channel : public POA_RtecEventChannelAdmin
   //   interface to the EC_Factory.
   //
 public:
-  TAO_EC_Event_Channel (const TAO_EC_Event_Channel_Attributes& attributes,
-                        TAO_EC_Factory* factory = 0,
-                        int own_factory = 0);
+  TAO_EC_Event_Channel (TAO_EC_Factory* factory);
   // constructor
-  // If <own_factory> is not 0 it assumes ownership of the factory.
-  // If the factory is <nil> it uses the Service_Configurator to load
-  // the Factory, if not found it uses TAO_EC_Default_Resource_Factory
 
   virtual ~TAO_EC_Event_Channel (void);
   // destructor
@@ -123,9 +69,6 @@ public:
   TAO_EC_Filter_Builder* filter_builder (void) const;
   // Access the filter builder....
 
-  TAO_EC_Supplier_Filter_Builder* supplier_filter_builder (void) const;
-  // Access the filter builder....
-
   TAO_EC_ConsumerAdmin* consumer_admin (void) const;
   // Access the consumer admin implementation, useful for controlling
   // the activation...
@@ -134,12 +77,9 @@ public:
   // Access the supplier admin implementation, useful for controlling
   // the activation...
 
-  TAO_EC_Timeout_Generator* timeout_generator (void) const;
+  TAO_EC_Timer_Module* timer_module (void) const;
   // Access the timer module...
 
-  TAO_EC_Scheduling_Strategy* scheduling_strategy (void) const;
-  // Access the scheduling strategy
-
   // = The factory methods, they delegate on the EC_Factory.
   TAO_EC_ProxyPushSupplier* create_proxy_push_supplier (void);
   void destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier*);
@@ -149,12 +89,8 @@ public:
   void destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
   // Create and destroy a ProxyPushConsumer
 
-  TAO_EC_ProxyPushSupplier_Set* create_proxy_push_supplier_set (void);
-  void destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*);
-  // Create and destroy a ProxyPushSupplier_Set
-
-  PortableServer::POA_ptr supplier_poa (void);
-  PortableServer::POA_ptr consumer_poa (void);
+  PortableServer::POA_ptr supplier_poa (CORBA::Environment&);
+  PortableServer::POA_ptr consumer_poa (CORBA::Environment&);
   // Access the supplier and consumer POAs from the factory.
 
   ACE_Lock* create_consumer_lock (void);
@@ -163,14 +99,7 @@ public:
   void destroy_supplier_lock (ACE_Lock*);
   // Locking strategies for the ProxyPushConsumer and
   // ProxyPushSupplier objects
-
-  ACE_Lock* create_consumer_admin_lock (void);
-  void destroy_consumer_admin_lock (ACE_Lock*);
-  ACE_Lock* create_supplier_admin_lock (void);
-  void destroy_supplier_admin_lock (ACE_Lock*);
-  // Locking strategies for the ConsumerAdmin and SupplierAdmin
-  // objects
-
+  
   virtual void connected (TAO_EC_ProxyPushConsumer*,
                           CORBA::Environment&);
   virtual void disconnected (TAO_EC_ProxyPushConsumer*,
@@ -185,23 +114,6 @@ public:
   // Used to inform the EC that a Supplier has connected or
   // disconnected from it.
 
-  // Simple flags to control the EC behavior, set by the application
-  // at construction time.
-
-  int consumer_reconnect (void) const;
-  // Can the consumers reconnect to the EC?
-
-  int supplier_reconnect (void) const;
-  // Can the suppliers reconnect to the EC?
-
-  RtecScheduler::Scheduler_ptr scheduler (void);
-  // Obtain the scheduler, the user must release
-
-  int busy_hwm (void) const;
-  int max_write_delay (void) const;
-  // Control the concurrency of the delayed connect/disconnect
-  // operations.
-
   // = The RtecEventChannelAdmin::EventChannel methods...
   virtual RtecEventChannelAdmin::ConsumerAdmin_ptr
       for_consumers (CORBA::Environment& env);
@@ -216,68 +128,33 @@ public:
   virtual void destroy (CORBA::Environment &env);
   // Commit suicide.
 
-  virtual RtecEventChannelAdmin::Observer_Handle
+  RtecEventChannelAdmin::Observer_Handle
       append_observer (RtecEventChannelAdmin::Observer_ptr,
-                       CORBA::Environment &env)
-      TAO_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                       RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void
-      remove_observer (RtecEventChannelAdmin::Observer_Handle,
-                       CORBA::Environment &env)
-      TAO_THROW_SPEC ((CORBA::SystemException,
-                       RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                       RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
+		       CORBA::Environment &env);
+  void remove_observer (RtecEventChannelAdmin::Observer_Handle,
+                        CORBA::Environment &env);
+  // @@ Do we need to strategize this also????? How???
 
 private:
-  PortableServer::POA_var supplier_poa_;
-  PortableServer::POA_var consumer_poa_;
-  // The POAs used to activate "supplier-side" and "consumer-side"
-  // objects.
-
   TAO_EC_Factory *factory_;
   // This is the abstract factory that creates all the objects that
   // compose an event channel, the event channel simply acts as a
   // Mediator among them.
 
-  int own_factory_;
-  // Flag that indicates if we own the factory.
-
   TAO_EC_Dispatching *dispatching_;
   // The dispatching "module"
 
   TAO_EC_Filter_Builder *filter_builder_;
   // The filter builder
 
-  TAO_EC_Supplier_Filter_Builder *supplier_filter_builder_;
-  // The filter builder for suppliers
-
   TAO_EC_ConsumerAdmin *consumer_admin_;
   // The ConsumerAdmin implementation
 
   TAO_EC_SupplierAdmin *supplier_admin_;
   // The SupplierAdmin implementation
 
-  TAO_EC_Timeout_Generator *timeout_generator_;
-  // The timeout generator
-
-  TAO_EC_ObserverStrategy *observer_strategy_;
-  // The observer strategy
-
-  RtecScheduler::Scheduler_var scheduler_;
-  // The scheduler (may be nil)
-
-  TAO_EC_Scheduling_Strategy *scheduling_strategy_;
-  // The scheduling strategy
-
-  int consumer_reconnect_;
-  int supplier_reconnect_;
-  // Consumer/Supplier reconnection flags
-
-  int busy_hwm_;
-  int max_write_delay_;
-  // Control the level of concurrency in the supplier sets with
-  // delayed operations
+  TAO_EC_Timer_Module *timer_module_;
+  // The timer module
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
index 003de1ebbef..5bcb4a7d3ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.i
@@ -1,19 +1,5 @@
 // $Id$
 
-ACE_INLINE
-TAO_EC_Event_Channel_Attributes::
-TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
-                                 PortableServer::POA_ptr c_poa)
-  :  consumer_reconnect (0),
-     supplier_reconnect (0),
-     busy_hwm (1),
-     max_write_delay (1),
-     scheduler (RtecScheduler::Scheduler::_nil ()),
-     supplier_poa (s_poa),
-     consumer_poa (c_poa)
-{
-}
-
 ACE_INLINE TAO_EC_Dispatching*
 TAO_EC_Event_Channel::dispatching (void) const
 {
@@ -26,12 +12,6 @@ TAO_EC_Event_Channel::filter_builder (void) const
   return this->filter_builder_;
 }
 
-ACE_INLINE TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Event_Channel::supplier_filter_builder (void) const
-{
-  return this->supplier_filter_builder_;
-}
-
 ACE_INLINE TAO_EC_ConsumerAdmin*
 TAO_EC_Event_Channel::consumer_admin (void) const
 {
@@ -44,16 +24,10 @@ TAO_EC_Event_Channel::supplier_admin (void) const
   return this->supplier_admin_;
 }
 
-ACE_INLINE TAO_EC_Timeout_Generator*
-TAO_EC_Event_Channel::timeout_generator (void) const
+ACE_INLINE TAO_EC_Timer_Module*
+TAO_EC_Event_Channel::timer_module (void) const
 {
-  return this->timeout_generator_;
-}
-
-ACE_INLINE TAO_EC_Scheduling_Strategy*
-TAO_EC_Event_Channel::scheduling_strategy (void) const
-{
-  return this->scheduling_strategy_;
+  return this->timer_module_;
 }
 
 ACE_INLINE TAO_EC_ProxyPushSupplier*
@@ -74,18 +48,6 @@ TAO_EC_Event_Channel::create_proxy_push_consumer (void)
   return this->factory_->create_proxy_push_consumer (this);
 }
 
-ACE_INLINE TAO_EC_ProxyPushSupplier_Set*
-TAO_EC_Event_Channel::create_proxy_push_supplier_set (void)
-{
-  return this->factory_->create_proxy_push_supplier_set (this);
-}
-
-ACE_INLINE void
-TAO_EC_Event_Channel::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set* x)
-{
-  this->factory_->destroy_proxy_push_supplier_set (x);
-}
-
 ACE_INLINE void
 TAO_EC_Event_Channel::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* consumer)
 {
@@ -93,15 +55,15 @@ TAO_EC_Event_Channel::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer* con
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel::supplier_poa (void)
+TAO_EC_Event_Channel::supplier_poa (CORBA::Environment &ACE_TRY_ENV)
 {
-  return PortableServer::POA::_duplicate (this->supplier_poa_.in ());
+  return this->factory_->supplier_poa (ACE_TRY_ENV);
 }
 
 ACE_INLINE PortableServer::POA_ptr
-TAO_EC_Event_Channel::consumer_poa (void)
+TAO_EC_Event_Channel::consumer_poa (CORBA::Environment &ACE_TRY_ENV)
 {
-  return PortableServer::POA::_duplicate (this->consumer_poa_.in ());
+  return this->factory_->consumer_poa (ACE_TRY_ENV);
 }
 
 ACE_INLINE ACE_Lock*
@@ -127,57 +89,3 @@ TAO_EC_Event_Channel::destroy_supplier_lock (ACE_Lock* x)
 {
   this->factory_->destroy_supplier_lock (x);
 }
-
-ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel::create_consumer_admin_lock (void)
-{
-  return this->factory_->create_consumer_admin_lock ();
-}
-
-ACE_INLINE void
-TAO_EC_Event_Channel::destroy_consumer_admin_lock (ACE_Lock* x)
-{
-  this->factory_->destroy_consumer_admin_lock (x);
-}
-
-ACE_INLINE ACE_Lock*
-TAO_EC_Event_Channel::create_supplier_admin_lock (void)
-{
-  return this->factory_->create_supplier_admin_lock ();
-}
-
-ACE_INLINE void
-TAO_EC_Event_Channel::destroy_supplier_admin_lock (ACE_Lock* x)
-{
-  this->factory_->destroy_supplier_admin_lock (x);
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::consumer_reconnect (void) const
-{
-  return this->consumer_reconnect_;
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::supplier_reconnect (void) const
-{
-  return this->supplier_reconnect_;
-}
-
-ACE_INLINE RtecScheduler::Scheduler_ptr
-TAO_EC_Event_Channel::scheduler (void)
-{
-  return RtecScheduler::Scheduler::_duplicate (this->scheduler_.in ());
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::busy_hwm (void) const
-{
-  return this->busy_hwm_;
-}
-
-ACE_INLINE int
-TAO_EC_Event_Channel::max_write_delay (void) const
-{
-  return this->max_write_delay_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
index 1c141711388..e77c179bdf5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "EC_Factory.h"
-#include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Factory.i"
@@ -12,13 +11,3 @@ ACE_RCSID(Event, EC_Factory, "$Id$")
 TAO_EC_Factory::~TAO_EC_Factory (void)
 {
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_EC_Factory>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_EC_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
index 20fb1863401..4d2750f30a1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.h
@@ -7,11 +7,14 @@
 //   ORBSVCS Real-time Event Channel
 //
 // = FILENAME
-//   EC_Factory
+//   EC_Filter
 //
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   The abstract factory for all the Event Channel components.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -25,32 +28,25 @@
 #ifndef TAO_EC_FACTORY_H
 #define TAO_EC_FACTORY_H
 
-#include "orbsvcs/orbsvcs_export.h"
+#include "tao/corba.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/corba.h"
-#include "ace/Service_Object.h"
-
 class ACE_Lock;
 
 class TAO_EC_Event_Channel;
 
 class TAO_EC_Dispatching;
 class TAO_EC_Filter_Builder;
-class TAO_EC_Supplier_Filter_Builder;
 class TAO_EC_ConsumerAdmin;
 class TAO_EC_SupplierAdmin;
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_ProxyPushSupplier;
-class TAO_EC_ObserverStrategy;
-class TAO_EC_ProxyPushSupplier_Set;
-class TAO_EC_Timeout_Generator;
-class TAO_EC_Scheduling_Strategy;
+class TAO_EC_Timer_Module;
 
-class TAO_ORBSVCS_Export TAO_EC_Factory : public ACE_Service_Object
+class TAO_EC_Factory
 {
   // = TITLE
   //   Abstract base class for the Event Channel components.
@@ -80,12 +76,6 @@ public:
       destroy_filter_builder (TAO_EC_Filter_Builder*) = 0;
   // Create and destroy the filter builder.
 
-  virtual TAO_EC_Supplier_Filter_Builder*
-      create_supplier_filter_builder (TAO_EC_Event_Channel*)   = 0;
-  virtual void
-      destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder*) = 0;
-  // Create and destroy the filter builder.
-
   virtual TAO_EC_ConsumerAdmin*
       create_consumer_admin (TAO_EC_Event_Channel*)  = 0;
   virtual void
@@ -110,29 +100,18 @@ public:
       destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*) = 0;
   // Create and destroy a ProxyPushConsumer
 
-  virtual TAO_EC_Timeout_Generator*
-      create_timeout_generator (TAO_EC_Event_Channel*)  = 0;
+  virtual TAO_EC_Timer_Module*
+      create_timer_module (TAO_EC_Event_Channel*)  = 0;
   virtual void
-      destroy_timeout_generator (TAO_EC_Timeout_Generator*) = 0;
+      destroy_timer_module (TAO_EC_Timer_Module*) = 0;
   // Create and destroy the timer module.
 
-  virtual TAO_EC_ObserverStrategy*
-      create_observer_strategy (TAO_EC_Event_Channel*) = 0;
-  virtual void
-      destroy_observer_strategy (TAO_EC_ObserverStrategy*) = 0;
-  // Create and destroy the observer strategy.
-
-  virtual TAO_EC_Scheduling_Strategy*
-      create_scheduling_strategy (TAO_EC_Event_Channel*) = 0;
-  virtual void
-      destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy*) = 0;
-  // Create and destroy the observer strategy.
-
-  virtual TAO_EC_ProxyPushSupplier_Set*
-      create_proxy_push_supplier_set (TAO_EC_Event_Channel*) = 0;
-  virtual void
-      destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*) = 0;
-  // Create and destroy a ProxyPushSupplier_Set
+  virtual PortableServer::POA_ptr
+       consumer_poa (CORBA::Environment& env) = 0;
+  virtual PortableServer::POA_ptr
+       supplier_poa (CORBA::Environment& env) = 0;
+  // The Event Channel uses this methods to control the activation of
+  // the run-time servants.
 
   virtual ACE_Lock* create_consumer_lock (void) = 0;
   virtual void destroy_consumer_lock (ACE_Lock*) = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index cee603fc208..7b3f0b6a76d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -18,32 +18,6 @@ TAO_EC_Filter::adopt_child (TAO_EC_Filter* child)
   child->parent_ = this;
 }
 
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Filter::begin (void) const
-{
-  return 0;
-}
-
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Filter::end (void) const
-{
-  return 0;
-}
-
-int
-TAO_EC_Filter::size (void) const
-{
-  return 0;
-}
-
-void
-TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info&,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
 // ****************************************************************
 
 int
@@ -95,32 +69,26 @@ TAO_EC_Null_Filter::clear (void)
 CORBA::ULong
 TAO_EC_Null_Filter::max_event_size (void) const
 {
-  // @@ Is there a better way to express this?
   return 0;
 }
 
-int
-TAO_EC_Null_Filter::can_match (const RtecEventComm::EventHeader&) const
-{
-  // @@ This method should be correctly so we can implement null
-  // filtering at the consumers but real filtering on the suppliers.
-  return 1;
-}
-
-int
-TAO_EC_Null_Filter::add_dependencies (
-      const RtecEventComm::EventHeader &,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
-
+void
+TAO_EC_Null_Filter::event_ids(TAO_EC_Filter::Headers& headers)
 {
-  return 0;
+  // @@ TODO maybe we should add the AnyType/AnySource header?
+  // right now we do nothing...
 }
 
 // ****************************************************************
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
+template class ACE_RB_Tree<RtecEventComm::EventHeader,int,Header_Compare,ACE_Null_Mutex>;
+template class ACE_RB_Tree<RtecEventComm::EventHeader,int>;
+
 #elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_RB_Tree<RtecEventComm::EventHeader,int,Header_Compare,ACE_Null_Mutex>
+#pragma instantiate ACE_RB_Tree<RtecEventComm::EventHeader,int>
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index ccc1ccc2d51..55613fdc659 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -12,6 +12,19 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   The per-consumer filtering mechanisms.
+//   The EC needs to filter data passed to the consumers, so it can
+//   correctly satisfy its subscription requirements.
+//   This filtering can include correlations, sequences, timeouts,
+//   etc. each consumer can request different filtering criteria.
+//
+//   Different filtering objects are associated with each consumer,
+//   the filters are organized in a hierarchical structure,
+//   corresponding to the subscription "expression" that the events
+//   must satisfy.
+//   The hierarchy is constructed using the "Builder" pattern.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -25,31 +38,23 @@
 #ifndef TAO_EC_FILTER_H
 #define TAO_EC_FILTER_H
 
-#include "orbsvcs/RtecEventCommC.h"
+#include "ace/RB_Tree.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "orbsvcs/RtecEventCommC.h"
+
 class TAO_EC_QOS_Info;
 
-class TAO_ORBSVCS_Export TAO_EC_Filter
+class TAO_EC_Filter
 {
   // = TITLE
   //   Abstract base class for the filter hierarchy.
   //
   // = DESCRIPTION
-  //   The per-consumer filtering mechanisms.
-  //   The EC needs to filter data passed to the consumers, so it can
-  //   correctly satisfy its subscription requirements.
-  //   This filtering can include correlations, sequences, timeouts,
-  //   etc. each consumer can request different filtering criteria.
-  //
-  //   Different filtering objects are associated with each consumer,
-  //   the filters are organized in a hierarchical structure,
-  //   corresponding to the subscription "expression" that the events
-  //   must satisfy.
-  //   The hierarchy is constructed using the "Builder" pattern.
+  //   Defines the filter interface.
   //
   // = MEMORY MANAGMENT
   //   It does *not* assume ownership of its parent.
@@ -72,18 +77,6 @@ public:
   // matches two event headers.
   // @@ TODO: strategize this...
 
-  typedef TAO_EC_Filter* value_type;
-  typedef TAO_EC_Filter* const const_value_type;
-  typedef const_value_type* ChildrenIterator;
-
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
-  // STL-like iterators
-  // Filters follow the Composite pattern. All filters expose the same
-  // interface as if they all had children, but for simple filters the
-  // iterators return an empty range.
-
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info,
                       CORBA::Environment& env) = 0;
@@ -113,33 +106,17 @@ public:
   virtual CORBA::ULong max_event_size (void) const = 0;
   // Returns the maximum size of the events pushed by this filter.
 
-  virtual int can_match (const RtecEventComm::EventHeader& header) const = 0;
-  // Returns 0 if an event with that header could never be accepted.
-  // This can used by the suppliers to filter out consumers that
-  // couldn't possibly be interested in their events.
-  // The rt_info and
+  struct Header_Compare {
+    int operator () (const RtecEventComm::EventHeader& lhs,
+                     const RtecEventComm::EventHeader& rhs) const;
+  };
 
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info& qos_info,
-                                CORBA::Environment &ACE_TRY_ENV) = 0;
-  // This is used for computing the scheduling dependencies:
-  //
-  // Leaf filters check if the header could be matched, similar to the
-  // can_match() method; if it does they return 1, and 0 otherwise.
-  // Intermediate nodes always return 0.
-  //
-  // This is used to build precise dependencies between the suppliers
-  // and the leaf of the filters that accept that event.  Notice that
-  // only the nodes doing scheduling recurse through the list, so in
-  // configurations that do no require scheduling the recursion stops
-  // fairly soon.
-
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV);
-  // Obtain the QOS information for this filter, the default
-  // implementation returns an invalid QOS.  Only the filters that
-  // support scheduling information implement this method.
-  // Returns 0 on success and -1 on failure
+  typedef ACE_RB_Tree<RtecEventComm::EventHeader,int,Header_Compare,ACE_Null_Mutex> Headers;
+  // typedef ACE_Array<RtecEventComm::EventHeader> Headers;
+
+  virtual void event_ids (Headers& headers) = 0;
+  // Compute the disjunction of all the event types that could be of
+  // interest for this filter (and its children).
 
 private:
   TAO_EC_Filter* parent_;
@@ -148,7 +125,7 @@ private:
 
 // ****************************************************************
 
-class TAO_ORBSVCS_Export TAO_EC_Null_Filter : public TAO_EC_Filter
+class TAO_EC_Null_Filter : public TAO_EC_Filter
 {
   // = TITLE
   //   A null filter
@@ -184,10 +161,7 @@ public:
                             CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void event_ids (TAO_EC_Filter::Headers& headers);
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
index 3820754ed5a..7f937618246 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
@@ -26,7 +26,19 @@ TAO_EC_Filter::matches (const RtecEventComm::EventHeader& rhs,
   if (rhs.type == 0 || lhs.type == 0)
     return rhs.source == lhs.source;
 
-  return (rhs.type == lhs.type && rhs.source == lhs.source);
+  return (rhs.type == lhs.type && rhs.source == lhs.type);
+}
+
+// ****************************************************************
+
+ACE_INLINE int
+TAO_EC_Filter::Header_Compare::
+    operator () (const RtecEventComm::EventHeader& lhs,
+                 const RtecEventComm::EventHeader& rhs) const
+{
+  if (lhs.source == rhs.source)
+    return lhs.type < rhs.type;
+  return lhs.source < rhs.source;
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index dfcc830e1d7..5600df57453 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -20,10 +20,8 @@ TAO_EC_Null_Filter_Builder::~TAO_EC_Null_Filter_Builder (void)
 }
 
 TAO_EC_Filter*
-TAO_EC_Null_Filter_Builder::build (
-    TAO_EC_ProxyPushSupplier *,
-    RtecEventChannelAdmin::ConsumerQOS&,
-    CORBA::Environment&) const
+TAO_EC_Null_Filter_Builder::
+    build (RtecEventChannelAdmin::ConsumerQOS&) const
 {
   return new TAO_EC_Null_Filter;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index e0cfe6dddf4..d8d6b8e29eb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -12,6 +12,12 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   The creation of a builder hierarchy is controlled by a
+//   Filter_Builder. The relationship between TAO_EC_Filter and
+//   TAO_EC_Filter_Builder follows the "Builder Pattern" (Gamma et
+//   al.)
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -32,28 +38,21 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 class TAO_EC_Filter;
-class TAO_EC_ProxyPushSupplier;
 
-class TAO_ORBSVCS_Export TAO_EC_Filter_Builder
+class TAO_EC_Filter_Builder
 {
   // = TITLE
   //   Abstract base class for the filter builders.
   //
   // = DESCRIPTION
-  //   The creation of a filter hierarchy is controlled by a
-  //   Filter_Builder. The relationship between TAO_EC_Filter and
-  //   TAO_EC_Filter_Builder follows the "Builder Pattern" (Gamma et
-  //   al.)
-  //
+  //   Defines the filter builder interface.
   //
 public:
   virtual ~TAO_EC_Filter_Builder (void);
   // destructor...
 
   virtual TAO_EC_Filter*
-      build (TAO_EC_ProxyPushSupplier *supplier,
-             RtecEventChannelAdmin::ConsumerQOS& qos,
-             CORBA::Environment &ACE_TRY_ENV) const = 0;
+      build (RtecEventChannelAdmin::ConsumerQOS& qos) const = 0;
   // Create the filter, the caller must assume ownership of the filter
   // returned.
 
@@ -61,7 +60,7 @@ public:
 
 // ****************************************************************
 
-class TAO_ORBSVCS_Export TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_Builder
+class TAO_EC_Null_Filter_Builder : public TAO_EC_Filter_Builder
 {
   // = TITLE
   //   A simple implementation of the filter builder.
@@ -77,9 +76,7 @@ public:
   // destructor...
 
   // = The TAO_EC_Filter_Builder methods...
-  TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &ACE_TRY_ENV) const;
+  TAO_EC_Filter* build (RtecEventChannelAdmin::ConsumerQOS& qos) const;
 };
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
index 9b61bcae6a8..1b847895381 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -30,12 +30,8 @@ TAO_EC_Gateway::observer_handle (void) const
 // ****************************************************************
 
 TAO_EC_Gateway_IIOP::TAO_EC_Gateway_IIOP (void)
-  :  busy_count_ (0),
-     update_posted_ (0),
-     consumer_ (this),
-     consumer_is_active_ (0),
-     supplier_ (this),
-     supplier_is_active_ (0)
+  :  consumer_ (this),
+     supplier_ (this)
 {
 }
 
@@ -43,85 +39,65 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void)
 {
 }
 
-void
+void 
 TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec,
                            RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
                            RtecScheduler::Scheduler_ptr rmt_sched,
                            RtecScheduler::Scheduler_ptr lcl_sched,
                            const char* lcl_name,
                            const char* rmt_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (!CORBA::is_nil (this->rmt_ec_.in ()))
-    return;
-
-  this->rmt_ec_ =
+  this->rmt_ec_ = 
     RtecEventChannelAdmin::EventChannel::_duplicate (rmt_ec);
-  this->lcl_ec_ =
+  this->lcl_ec_ = 
     RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec);
 
-  if (!CORBA::is_nil (rmt_sched))
-    {
-      this->rmt_info_ =
-        rmt_sched->create (rmt_name, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // @@ TODO Many things are hard-coded in the RT_Info here.
-
-      // The worst case execution time is far less than 500 usecs, but
-      // that is a safe estimate....
-      ACE_Time_Value tv (0, 500);
-      TimeBase::TimeT time;
-      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-      rmt_sched->set (this->rmt_info_,
-                      RtecScheduler::VERY_HIGH_CRITICALITY,
-                      time, time, time,
-                      25000 * 10,
-                      RtecScheduler::VERY_LOW_IMPORTANCE,
-                      time,
-                      0,
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  if (!CORBA::is_nil (lcl_sched))
-    {
-      this->lcl_info_ =
-        lcl_sched->create (lcl_name, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      ACE_Time_Value tv (0, 500);
-      TimeBase::TimeT time;
-      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-      lcl_sched->set (this->lcl_info_,
-                      RtecScheduler::VERY_HIGH_CRITICALITY,
-                      time, time, time,
-                      25000 * 10,
-                      RtecScheduler::VERY_LOW_IMPORTANCE,
-                      time,
-                      1,
-                      RtecScheduler::REMOTE_DEPENDANT,
-                      ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Gateway_IIOP::close (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  this->rmt_info_ = 
+    rmt_sched->create (rmt_name, TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
+
+  // @@ TODO Many things are hard-coded in the RT_Info here.
+
+  // The worst case execution time is far less than 500 usecs, but
+  // that is a safe estimate....
+  ACE_Time_Value tv (0, 500);
+  TimeBase::TimeT time;
+  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  rmt_sched->set (this->rmt_info_,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  25000 * 10,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  0,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
+
+  this->lcl_info_ =
+    lcl_sched->create (lcl_name, TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
+
+  lcl_sched->set (this->lcl_info_,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  25000 * 10,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  1,
+                  RtecScheduler::REMOTE_DEPENDANT,
+                  TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0) return;
 
-  this->close_i (ACE_TRY_ENV);
 }
 
-
 void
-TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::close (CORBA::Environment &env)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
+  if (CORBA::is_nil (this->supplier_proxy_.in ()))
+    return;
 
   if (this->consumer_proxy_map_.current_size () > 0)
     {
@@ -129,131 +105,75 @@ TAO_EC_Gateway_IIOP::close_i (CORBA::Environment &ACE_TRY_ENV)
            j != this->consumer_proxy_map_.end ();
            ++j)
         {
-          RtecEventComm::PushConsumer_ptr consumer = (*j).int_id_;
-          if (CORBA::is_nil (consumer))
-            continue;
-          consumer->disconnect_push_consumer (ACE_TRY_ENV);
-          CORBA::release (consumer);
-          ACE_CHECK;
+          (*j).int_id_->disconnect_push_consumer (env);
+          CORBA::release ((*j).int_id_);
+          TAO_CHECK_ENV_RETURN_VOID (env);
         }
       this->consumer_proxy_map_.close ();
     }
 
-  if (!CORBA::is_nil (this->default_consumer_proxy_.in ()))
-    {
-      this->default_consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->default_consumer_proxy_ =
-        RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-    }
-
-  if (this->supplier_is_active_)
-    {
-      PortableServer::POA_var poa =
-        this->supplier_._default_POA (ACE_TRY_ENV);
-      ACE_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->supplier_, ACE_TRY_ENV);
-      ACE_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-      this->supplier_is_active_ = 0;
-    }
-
-  if (!CORBA::is_nil (this->supplier_proxy_.in ()))
-    {
-      this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-      ACE_CHECK;
+  this->default_consumer_proxy_->disconnect_push_consumer (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+  this->default_consumer_proxy_ =
+    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
-      this->supplier_proxy_ =
-        RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-    }
-
-  if (this->consumer_is_active_)
-    {
-      PortableServer::POA_var poa =
-        this->consumer_._default_POA (ACE_TRY_ENV);
-      ACE_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (&this->consumer_, ACE_TRY_ENV);
-      ACE_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-      this->consumer_is_active_ = 0;
-    }
+  this->supplier_proxy_->disconnect_push_supplier (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+  this->supplier_proxy_ =
+    RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-TAO_EC_Gateway_IIOP::update_consumer (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos,
-    CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::update_consumer (const RtecEventChannelAdmin::ConsumerQOS& c_qos,
+                                      CORBA::Environment& env)
 {
+  this->close (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+
   if (c_qos.dependencies.length () <= 1)
     return;
 
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->busy_count_ != 0)
-    {
-      this->update_posted_ = 1;
-      this->c_qos_ = c_qos;
-      return;
-    }
-
-  this->update_consumer_i (c_qos, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Gateway_IIOP::update_consumer_i (
-    const RtecEventChannelAdmin::ConsumerQOS& c_qos,
-    CORBA::Environment& ACE_TRY_ENV)
-{
-  this->close_i (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
   if (CORBA::is_nil (this->lcl_ec_.in ())
       || CORBA::is_nil (this->rmt_ec_.in ()))
     return;
 
-  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n"));
-
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->lcl_ec_->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->lcl_ec_->for_suppliers (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
+
+  this->default_consumer_proxy_ =
+    supplier_admin->obtain_push_consumer (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   // Change the RT_Info in the consumer QoS.
   // On the same loop we discover the subscriptions by event source,
   // and fill the consumer proxy map.
   RtecEventChannelAdmin::ConsumerQOS sub = c_qos;
-  sub.is_gateway = 1;
   for (CORBA::ULong i = 0; i < sub.dependencies.length (); ++i)
     {
       sub.dependencies[i].rt_info = this->rmt_info_;
-
+      
       RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = 0;
       RtecEventComm::EventSourceID sid =
         sub.dependencies[i].event.header.source;
       if (sid != 0
           && this->consumer_proxy_map_.find (sid, proxy) == -1)
         {
-          proxy = supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-          ACE_CHECK;
+          proxy = supplier_admin->obtain_push_consumer (env);
+          TAO_CHECK_ENV_RETURN_VOID (env);
           this->consumer_proxy_map_.bind (sid, proxy);
         }
     }
 
+  // Obtain a reference to our supplier personality...
+  RtecEventComm::PushSupplier_var supplier_ref =
+    this->supplier_._this (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   if (this->consumer_proxy_map_.current_size () > 0)
     {
-      this->supplier_is_active_ = 1;
-
-      // Obtain a reference to our supplier personality...
-      RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_TRY_ENV);
-      ACE_CHECK;
-
       // For each subscription by source build the set of publications
       // (they may several, by type, for instance) and connect to the
       // consumer proxy.
@@ -262,7 +182,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
            ++j)
         {
           RtecEventChannelAdmin::SupplierQOS pub;
-          pub.publications.length (sub.dependencies.length ());
+          pub.publications.length (sub.dependencies.length () - 1);
           pub.is_gateway = 1;
           int c = 0;
 
@@ -288,8 +208,8 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
           pub.publications.length (c);
           (*j).int_id_->connect_push_supplier (supplier_ref.in (),
                                                pub,
-                                               ACE_TRY_ENV);
-          ACE_CHECK;
+                                               env);
+          TAO_CHECK_ENV_RETURN_VOID (env);
         }
     }
 
@@ -309,66 +229,51 @@ TAO_EC_Gateway_IIOP::update_consumer_i (
               && h.type < ACE_ES_EVENT_UNDEFINED))
         continue;
       pub.publications[c].event.header = h;
-      pub.publications[c].event.header.creation_time = ORBSVCS_Time::zero ();
+      pub.publications[c].event.header.creation_time = ORBSVCS_Time::zero;
       pub.publications[c].dependency_info.dependency_type =
         RtecScheduler::TWO_WAY_CALL;
       pub.publications[c].dependency_info.number_of_calls = 1;
       pub.publications[c].dependency_info.rt_info = this->lcl_info_;
       c++;
     }
-
   if (c > 0)
     {
-      this->supplier_is_active_ = 1;
-
-      // Obtain a reference to our supplier personality...
-      RtecEventComm::PushSupplier_var supplier_ref =
-        this->supplier_._this (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Obtain the consumer....
-      this->default_consumer_proxy_ =
-        supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-      ACE_CHECK;
-
       pub.publications.length (c);
       this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (),
                                                             pub,
-                                                            ACE_TRY_ENV);
-      ACE_CHECK;
+                                                            env);
+      TAO_CHECK_ENV_RETURN_VOID (env);
     }
 
 
-  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
-  // ACE_SupplierQOS_Factory::debug (pub);
+  //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
+  //ACE_SupplierQOS_Factory::debug (pub);
 
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->rmt_ec_->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->rmt_ec_->for_consumers (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
   this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    consumer_admin->obtain_push_supplier (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
-  this->consumer_is_active_ = 1;
   RtecEventComm::PushConsumer_var consumer_ref =
-    this->consumer_._this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_._this (env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
-  // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer "));
-  // ACE_ConsumerQOS_Factory::debug (sub);
+  //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer "));
+  //ACE_ConsumerQOS_Factory::debug (sub);
 
   this->supplier_proxy_->connect_push_consumer (consumer_ref.in (),
                                                 sub,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                env);
+  TAO_CHECK_ENV_RETURN_VOID (env);
 
 }
 
 void
-TAO_EC_Gateway_IIOP::update_supplier (
-    const RtecEventChannelAdmin::SupplierQOS&,
-    CORBA::Environment&)
+TAO_EC_Gateway_IIOP::update_supplier (const RtecEventChannelAdmin::SupplierQOS&,
+                                      CORBA::Environment&)
 {
   // Do nothing...
 }
@@ -391,7 +296,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (CORBA::Environment &)
 
 void
 TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
-                           CORBA::Environment & ACE_TRY_ENV)
+                           CORBA::Environment & env)
 {
   //ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push - "));
 
@@ -401,13 +306,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
       return;
     }
 
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-    this->busy_count_++;
-  }
-
-  // ACE_DEBUG ((LM_DEBUG, "ECG: %d event(s)\n", events.length ()));
+  //ACE_DEBUG ((LM_DEBUG, "ECP: %d event(s) - ", events.length ()));
 
   // @@ TODO, there is an extra data copy here, we should do the event
   // modification without it and only compact the necessary events.
@@ -427,43 +326,21 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events,
           // default consumer proxy.
           proxy = this->default_consumer_proxy_.in ();
         }
-
-      if (CORBA::is_nil (proxy))
-        continue;
-
       out[0] = events[i];
       out[0].header.ttl--;
-
-      proxy->push (out, ACE_TRY_ENV);
-      ACE_CHECK;
+      proxy->push (out, env);
+      TAO_CHECK_ENV_RETURN_VOID (env);
     }
-
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-    this->busy_count_--;
-
-    if (this->busy_count_ == 0 && this->update_posted_ != 0)
-      {
-        this->update_posted_ = 0;
-        this->update_consumer_i (this->c_qos_, ACE_TRY_ENV);
-      }
-  }
-
 }
 
 int
-TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_EC_Gateway_IIOP::shutdown (CORBA::Environment& TAO_IN_ENV)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  this->close_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->close (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () == 0) return -1;
 
-  this->lcl_ec_ =
-    RtecEventChannelAdmin::EventChannel::_nil ();
-  this->rmt_ec_ =
-    RtecEventChannelAdmin::EventChannel::_nil ();
+  this->lcl_ec_ = 0;
+  this->rmt_ec_ = 0;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
index 50835bec895..e5ba8e67229 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -66,6 +66,8 @@ public:
   // The gateway must disconnect from all the relevant event channels,
   // or any other communication media (such as multicast groups).
 
+private:
+  friend class ACE_EventChannel;
   void observer_handle (RtecEventChannelAdmin::Observer_Handle h);
   RtecEventChannelAdmin::Observer_Handle observer_handle (void) const;
   // Obtain and modify the observer handle.
@@ -143,25 +145,6 @@ public:
                                 CORBA::Environment& env);
 
 private:
-  void close_i (CORBA::Environment& );
-
-  void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub,
-                          CORBA::Environment& env);
-
-private:
-  ACE_SYNCH_MUTEX lock_;
-  // Lock to synchronize internal changes
-
-  CORBA::ULong busy_count_;
-  // How many threads are running push() we cannot make changes until
-  // that reaches 0
-
-  int update_posted_;
-  RtecEventChannelAdmin::ConsumerQOS c_qos_;
-  // An update_consumer() message arrived *while* we were doing a
-  // push() the modification is stored <pub_>, if multiple
-  // update_consumer messages arrive only the last one is executed.
-
   RtecEventChannelAdmin::EventChannel_var rmt_ec_;
   RtecEventChannelAdmin::EventChannel_var lcl_ec_;
   // The remote and the local EC, so we can reconnect when the list changes.
@@ -172,13 +155,9 @@ private:
 
   ACE_PushConsumer_Adapter<TAO_EC_Gateway_IIOP> consumer_;
   // Our consumer personality....
-  int consumer_is_active_;
-  // If it is not 0 then we must deactivate the supplier
 
   ACE_PushSupplier_Adapter<TAO_EC_Gateway_IIOP> supplier_;
   // Our supplier personality....
-  int supplier_is_active_;
-  // If it is not 0 then we must deactivate the supplier
 
   // We use a different Consumer_Proxy
   typedef ACE_Map_Manager<RtecEventComm::EventSourceID,RtecEventChannelAdmin::ProxyPushConsumer_ptr,ACE_Null_Mutex> Consumer_Map;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index c6e919c2dd3..9e8b2a1d0de 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -27,6 +27,8 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr)
 
 void
 TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
+                          RtecScheduler::Scheduler_ptr lcl_sched,
+                          const char* lcl_name,
                           RtecUDPAdmin::AddrServer_ptr addr_server,
                           TAO_ECG_UDP_Out_Endpoint* endpoint,
                           CORBA::Environment &TAO_IN_ENV)
@@ -38,6 +40,29 @@ TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
     RtecUDPAdmin::AddrServer::_duplicate (addr_server);
 
   this->endpoint_ = endpoint;
+
+  this->lcl_info_ = lcl_sched->lookup (lcl_name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  if (this->lcl_info_ == -1)
+    {
+      this->lcl_info_ =
+        lcl_sched->create (lcl_name, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+      ACE_Time_Value tv (0, 500);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      lcl_sched->set (this->lcl_info_,
+                      RtecScheduler::VERY_HIGH_CRITICALITY,
+                      time, time, time,
+                      25000 * 10,
+                      RtecScheduler::VERY_LOW_IMPORTANCE,
+                      time,
+                      0,
+                      RtecScheduler::OPERATION,
+                      TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+    }
 }
 
 int
@@ -72,6 +97,10 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
 
   if (sub.dependencies.length () == 0)
     return;
+  for (CORBA::ULong j = 0; j < sub.dependencies.length (); ++j)
+    {
+      sub.dependencies[j].rt_info = this->lcl_info_;
+    }
 
   //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Supplier "));
   //ACE_SupplierQOS_Factory::debug (pub);
@@ -98,26 +127,16 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub,
 }
 
 void
-TAO_ECG_UDP_Sender::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Sender::close (CORBA::Environment &env)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->supplier_proxy_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->supplier_proxy_->disconnect_push_supplier (env);
+  if (env.exception () != 0) return;
   this->supplier_proxy_ =
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
@@ -130,7 +149,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (CORBA::Environment &)
 
 void
 TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
-                          CORBA::Environment & ACE_TRY_ENV)
+                          CORBA::Environment & TAO_IN_ENV)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n"));
 
@@ -167,8 +186,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
 
       // Grab the right mcast group for this event...
       RtecUDPAdmin::UDP_Addr udp_addr;
-      this->addr_server_->get_addr (header, udp_addr, ACE_TRY_ENV);
-      ACE_CHECK;
+      this->addr_server_->get_addr (header, udp_addr, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
 
       // Start building the message
       TAO_OutputCDR cdr;
@@ -177,11 +196,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
       // marshal a modified version of the header, but the payload is
       // marshal without any extra copies.
       cdr.write_ulong (1);
-      cdr.encode (RtecEventComm::_tc_EventHeader, &header, 0, ACE_TRY_ENV);
-      ACE_CHECK;
+      cdr.encode (RtecEventComm::_tc_EventHeader, &header, 0, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
 
-      cdr.encode (RtecEventComm::_tc_EventData, &e.data, 0, ACE_TRY_ENV);
-      ACE_CHECK;
+      cdr.encode (RtecEventComm::_tc_EventData, &e.data, 0, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
 
       const int TAO_WRITEV_MAX = IOV_MAX;
       iovec iov[TAO_WRITEV_MAX];
@@ -229,8 +248,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_count,
                                    iov,
                                    iovcnt,
-                                   ACE_TRY_ENV);
-              ACE_CHECK;
+                                   TAO_IN_ENV);
+              TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
               fragment_id++;
               fragment_offset += max_fragment_payload;
 
@@ -256,8 +275,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_count,
                                    iov,
                                    iovcnt,
-                                   ACE_TRY_ENV);
-              ACE_CHECK;
+                                   TAO_IN_ENV);
+              TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
               fragment_id++;
               fragment_offset += max_fragment_payload;
 
@@ -277,8 +296,8 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
                                    fragment_count,
                                    iov,
                                    iovcnt,
-                                   ACE_TRY_ENV);
-              ACE_CHECK;
+                                   TAO_IN_ENV);
+              TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
               fragment_id++;
               fragment_offset += fragment_size;
 
@@ -330,7 +349,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
 {
   CORBA::ULong header[TAO_ECG_UDP_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
-                     + ACE_CDR::MAX_ALIGNMENT];
+                     + CDR::MAX_ALIGNMENT];
   char* buf = ACE_reinterpret_cast(char*,header);
   TAO_OutputCDR cdr (buf, sizeof(header));
   cdr.write_boolean (TAO_ENCAP_BYTE_ORDER);
@@ -364,14 +383,14 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr,
       // @@ TODO Use a Event Channel specific exception
       ACE_DEBUG ((LM_DEBUG,
                   "ECG_UDP (%t) send failed %p\n", ""));
-      TAO_THROW(CORBA::COMM_FAILURE ());
+      TAO_THROW(CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
     }
   else if (n == 0)
     {
       // @@ TODO Use a Event Channel specific exception
       ACE_DEBUG ((LM_DEBUG,
                   "ECG_UDP (%t) EOF on send \n"));
-      TAO_THROW(CORBA::COMM_FAILURE ());
+      TAO_THROW(CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
     }
 }
 
@@ -518,7 +537,7 @@ TAO_ECG_UDP_Request_Entry (CORBA::Boolean byte_order,
      request_size_ (request_size),
      fragment_count_ (fragment_count)
 {
-  ACE_CDR::grow (&this->payload_, this->request_size_);
+  CDR::grow (&this->payload_, this->request_size_);
   this->payload_.wr_ptr (request_size_);
 
   this->received_fragments_ = this->default_received_fragments_;
@@ -638,6 +657,8 @@ TAO_ECG_UDP_Receiver::TAO_ECG_UDP_Receiver (void)
 
 void
 TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
+                            RtecScheduler::Scheduler_ptr lcl_sched,
+                            const char* lcl_name,
                             TAO_ECG_UDP_Out_Endpoint* ignore_from,
                             RtecUDPAdmin::AddrServer_ptr addr_server,
                             ACE_Reactor *reactor,
@@ -653,6 +674,29 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
   this->addr_server_ =
     RtecUDPAdmin::AddrServer::_duplicate (addr_server);
 
+  this->lcl_info_ = lcl_sched->lookup (lcl_name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+  if (this->lcl_info_ == -1)
+    {
+      this->lcl_info_ =
+        lcl_sched->create (lcl_name, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+      ACE_Time_Value tv (0, 500);
+      TimeBase::TimeT time;
+      ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+      lcl_sched->set (this->lcl_info_,
+                      RtecScheduler::VERY_HIGH_CRITICALITY,
+                      time, time, time,
+                      25000 * 10,
+                      RtecScheduler::VERY_LOW_IMPORTANCE,
+                      time,
+                      1,
+                      RtecScheduler::REMOTE_DEPENDANT,
+                      TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+    }
+
   this->reactor_ = reactor;
   this->max_timeout_ = max_timeout;
   // @@ TODO throw an exception....
@@ -679,6 +723,11 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub,
   if (pub.publications.length () == 0)
     return;
 
+  for (CORBA::ULong i = 0; i < pub.publications.length (); ++i)
+    {
+      pub.publications[i].dependency_info.rt_info = this->lcl_info_;
+    }
+
   // = Connect as a supplier to the local EC
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     this->lcl_ec_->for_suppliers (TAO_IN_ENV);
@@ -702,26 +751,17 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub,
 }
 
 void
-TAO_ECG_UDP_Receiver::close (CORBA::Environment &ACE_TRY_ENV)
+TAO_ECG_UDP_Receiver::close (CORBA::Environment &env)
 {
   // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n"));
   if (CORBA::is_nil (this->consumer_proxy_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->consumer_proxy_->disconnect_push_consumer (env);
+  if (env.exception () != 0) return;
   this->consumer_proxy_ =
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 void
@@ -749,7 +789,7 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram)
   // Use ULong so the alignment is right.
   CORBA::ULong header[TAO_ECG_UDP_Sender::ECG_HEADER_SIZE
                      / sizeof(CORBA::ULong)
-                     + ACE_CDR::MAX_ALIGNMENT];
+                     + CDR::MAX_ALIGNMENT];
   ACE_INET_Addr from;
   ssize_t n = dgram.recv (header, sizeof(header), from, MSG_PEEK);
   if (n == -1)
@@ -1065,17 +1105,6 @@ TAO_ECG_Mcast_EH::close (CORBA::Environment& TAO_IN_ENV)
   this->handle_ = 0;
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV, -1);
 
-  {
-    PortableServer::POA_var poa =
-      this->observer_._default_POA (ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (&this->observer_, ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
-    ACE_CHECK_RETURN (-1);
-  }
-
   return 0;
 }
 
@@ -1137,7 +1166,7 @@ TAO_ECG_Mcast_EH::update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub
 
       ACE_INET_Addr inet_addr (addr.port, addr.ipaddr);
       if (this->subscribe (inet_addr) == -1)
-        ACE_ERROR ((LM_ERROR,
+        ACE_ERROR ((LM_DEBUG,
                     "cannot subscribe to %s:%d\n",
                     inet_addr.get_host_addr (),
                     inet_addr.get_port_number ()));
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 50e4e9f7f95..70c3df83ba7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -131,6 +131,8 @@ public:
   // Get the local endpoint used to send the events.
 
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
+             RtecScheduler::Scheduler_ptr lcl_sched,
+             const char* lcl_name,
              RtecUDPAdmin::AddrServer_ptr addr_server,
              TAO_ECG_UDP_Out_Endpoint* endpoint,
              CORBA::Environment &_env);
@@ -198,6 +200,9 @@ private:
   // The remote and the local EC, so we can reconnect when the
   // subscription list changes.
 
+  RtecScheduler::handle_t lcl_info_;
+  // Our local and remote RT_Infos.
+
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC (as a consumer) using this proxy.
 
@@ -283,7 +288,7 @@ public:
   ACE_INLINE int operator== (const TAO_ECG_UDP_Request_Index& rhs) const;
   ACE_INLINE int operator!= (const TAO_ECG_UDP_Request_Index& rhs) const;
   // Compare
-
+  
   ACE_INET_Addr from;
   CORBA::ULong request_id;
 };
@@ -308,7 +313,7 @@ public:
   // TAO_ECG_UDP_Request_Entry (const TAO_ECG_UDP_Request_Entry& rhs);
   // TAO_ECG_UDP_Request_Entry& operator=(const TAO_ECG_UDP_Request_Entry& rhs);
   ~TAO_ECG_UDP_Request_Entry (void);
-
+  
   TAO_ECG_UDP_Request_Entry (CORBA::Boolean byte_order,
                              CORBA::ULong request_id,
                              CORBA::ULong request_size,
@@ -321,7 +326,7 @@ public:
                          CORBA::ULong fragment_offset,
                          CORBA::ULong fragment_id,
                          CORBA::ULong fragment_count) const;
-  // Validate a fragment, it should be rejected if it is invalid..
+  // Validate a fragment, it should be rejected if it is invalid.. 
 
   int test_received (CORBA::ULong fragment_id) const;
   // Has <fragment_id> been received?
@@ -344,7 +349,7 @@ public:
 
   int get_timeout (void) const;
   // Get the timeout counter....
-
+  
 private:
   CORBA::Boolean byte_order_;
   CORBA::ULong request_id_;
@@ -422,6 +427,8 @@ public:
   TAO_ECG_UDP_Receiver (void);
 
   void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec,
+             RtecScheduler::Scheduler_ptr lcl_sched,
+             const char* lcl_name,
              TAO_ECG_UDP_Out_Endpoint* ignore_from,
              RtecUDPAdmin::AddrServer_ptr addr_server,
              ACE_Reactor *reactor,
@@ -470,7 +477,10 @@ private:
   RtecEventChannelAdmin::EventChannel_var lcl_ec_;
   // The remote and the local EC, so we can reconnect when the list changes.
 
- RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
+  RtecScheduler::handle_t lcl_info_;
+  // Our RT_Info.
+
+  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
   // We talk to the EC (as a consumer) using this proxy.
 
   TAO_ECG_UDP_Out_Endpoint* ignore_from_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
index 3f3188711df..5d494997767 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.i
@@ -63,7 +63,7 @@ TAO_ECG_UDP_Request_Index::hash (void) const
 ACE_INLINE int
 TAO_ECG_UDP_Request_Index::operator== (const TAO_ECG_UDP_Request_Index& rhs) const
 {
-  return (this->from == rhs.from &&
+  return (this->from == rhs.from && 
           this->request_id == rhs.request_id);
 }
 
@@ -75,14 +75,16 @@ TAO_ECG_UDP_Request_Index::operator!= (const TAO_ECG_UDP_Request_Index& rhs) con
 
 // ****************************************************************
 
-ACE_INLINE void
+void
 TAO_ECG_UDP_Request_Entry::inc_timeout (void)
 {
   this->timeout_counter_++;
 }
 
-ACE_INLINE int
+int
 TAO_ECG_UDP_Request_Entry::get_timeout (void) const
 {
   return this->timeout_counter_;
 }
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
index 71acd51ec2e..d7bf883633c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.cpp
@@ -3,16 +3,12 @@
 #include "EC_Null_Factory.h"
 #include "EC_Dispatching.h"
 #include "EC_Filter_Builder.h"
-#include "EC_Trivial_Supplier_Filter.h"
 #include "EC_ConsumerAdmin.h"
 #include "EC_SupplierAdmin.h"
 #include "EC_ProxyConsumer.h"
 #include "EC_ProxySupplier.h"
 #include "EC_SupplierFiltering.h"
-#include "EC_ObserverStrategy.h"
-#include "EC_Null_Scheduling.h"
-#include "EC_ProxyPushSupplier_Set_T.h"
-#include "EC_Reactive_Timeout_Generator.h"
+#include "Timer_Module.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_Null_Factory.i"
@@ -22,6 +18,8 @@ ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
 TAO_EC_Null_Factory::~TAO_EC_Null_Factory (void)
 {
+  delete this->supplier_filtering_;
+  this->supplier_filtering_ = 0;
 }
 
 TAO_EC_Dispatching*
@@ -48,18 +46,6 @@ TAO_EC_Null_Factory::destroy_filter_builder (TAO_EC_Filter_Builder *x)
   delete x;
 }
 
-TAO_EC_Supplier_Filter_Builder*
-TAO_EC_Null_Factory::create_supplier_filter_builder (TAO_EC_Event_Channel *ec)
-{
-  return new TAO_EC_Trivial_Supplier_Filter_Builder (ec);
-}
-
-void
-TAO_EC_Null_Factory::destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder *x)
-{
-  delete x;
-}
-
 TAO_EC_ConsumerAdmin*
 TAO_EC_Null_Factory::create_consumer_admin (TAO_EC_Event_Channel *ec)
 {
@@ -99,7 +85,11 @@ TAO_EC_Null_Factory::destroy_proxy_push_supplier (TAO_EC_ProxyPushSupplier *x)
 TAO_EC_ProxyPushConsumer*
 TAO_EC_Null_Factory::create_proxy_push_consumer (TAO_EC_Event_Channel *ec)
 {
-  return new TAO_EC_ProxyPushConsumer (ec);
+  if (this->supplier_filtering_ == 0)
+    ACE_NEW_RETURN (this->supplier_filtering_,
+                    TAO_EC_Null_SupplierFiltering (ec),
+                    0);
+  return new TAO_EC_ProxyPushConsumer (ec, this->supplier_filtering_);
 }
 
 void
@@ -108,54 +98,30 @@ TAO_EC_Null_Factory::destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer *x)
   delete x;
 }
 
-TAO_EC_Timeout_Generator*
-TAO_EC_Null_Factory::create_timeout_generator (TAO_EC_Event_Channel *ec)
+TAO_EC_Timer_Module*
+TAO_EC_Null_Factory::create_timer_module (TAO_EC_Event_Channel *ec)
 {
   // @@ TODO fixme
   TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
-  return new TAO_EC_Reactive_Timeout_Generator (orb_core->reactor ());
+  return new TAO_EC_ST_Timer_Module (orb_core->reactor ());
 }
 
 void
-TAO_EC_Null_Factory::destroy_timeout_generator (TAO_EC_Timeout_Generator *x)
+TAO_EC_Null_Factory::destroy_timer_module (TAO_EC_Timer_Module *x)
 {
   delete x;
 }
 
-TAO_EC_ObserverStrategy*
-TAO_EC_Null_Factory::create_observer_strategy (TAO_EC_Event_Channel *)
+PortableServer::POA_ptr
+TAO_EC_Null_Factory::consumer_poa (CORBA::Environment&)
 {
-  return new TAO_EC_Null_ObserverStrategy;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-void
-TAO_EC_Null_Factory::destroy_observer_strategy (TAO_EC_ObserverStrategy *x)
+PortableServer::POA_ptr
+TAO_EC_Null_Factory::supplier_poa (CORBA::Environment&)
 {
-  delete x;
-}
-
-TAO_EC_Scheduling_Strategy*
-TAO_EC_Null_Factory::create_scheduling_strategy (TAO_EC_Event_Channel*)
-{
-  return new TAO_EC_Null_Scheduling;
-}
-
-void
-TAO_EC_Null_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x)
-{
-  delete x;
-}
-
-TAO_EC_ProxyPushSupplier_Set*
-TAO_EC_Null_Factory::create_proxy_push_supplier_set (TAO_EC_Event_Channel *)
-{
-  return new TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_Null_Mutex> ();
-}
-
-void
-TAO_EC_Null_Factory::destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set *x)
-{
-  delete x;
+  return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 ACE_Lock*
@@ -205,9 +171,3 @@ TAO_EC_Null_Factory::destroy_supplier_admin_lock (ACE_Lock* x)
 {
   delete x;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
index 0d31d1f9627..e9960f40e48 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   A factory for a simple event channel: no filtering or any
+//   real-time features.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -33,7 +37,7 @@
 
 class TAO_EC_SupplierFiltering;
 
-class TAO_ORBSVCS_Export TAO_EC_Null_Factory : public TAO_EC_Factory
+class TAO_EC_Null_Factory : public TAO_EC_Factory
 {
   // = TITLE
   //   The factory for a simple event channel.
@@ -46,9 +50,11 @@ class TAO_ORBSVCS_Export TAO_EC_Null_Factory : public TAO_EC_Factory
   //   This object creates a single instance of the Supplier
   //
   // = MEMORY MANAGMENT
+  //   A single event channel instance can be used with an instance of
+  //   this class.
   //
 public:
-  TAO_EC_Null_Factory (void);
+  TAO_EC_Null_Factory (PortableServer::POA_ptr poa);
   // Constructor
 
   virtual ~TAO_EC_Null_Factory (void);
@@ -63,10 +69,6 @@ public:
       create_filter_builder (TAO_EC_Event_Channel*);
   virtual void
       destroy_filter_builder (TAO_EC_Filter_Builder*);
-  virtual TAO_EC_Supplier_Filter_Builder*
-      create_supplier_filter_builder (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_supplier_filter_builder (TAO_EC_Supplier_Filter_Builder*);
   virtual TAO_EC_ConsumerAdmin*
       create_consumer_admin (TAO_EC_Event_Channel*);
   virtual void
@@ -83,22 +85,14 @@ public:
       create_proxy_push_consumer (TAO_EC_Event_Channel*);
   virtual void
       destroy_proxy_push_consumer (TAO_EC_ProxyPushConsumer*);
-  virtual TAO_EC_Timeout_Generator*
-      create_timeout_generator (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_timeout_generator (TAO_EC_Timeout_Generator*);
-  virtual TAO_EC_ObserverStrategy*
-      create_observer_strategy (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_observer_strategy (TAO_EC_ObserverStrategy*);
-  virtual TAO_EC_Scheduling_Strategy*
-      create_scheduling_strategy (TAO_EC_Event_Channel*);
+  virtual TAO_EC_Timer_Module*
+      create_timer_module (TAO_EC_Event_Channel*);
   virtual void
-      destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy*);
-  virtual TAO_EC_ProxyPushSupplier_Set*
-      create_proxy_push_supplier_set (TAO_EC_Event_Channel*);
-  virtual void
-      destroy_proxy_push_supplier_set (TAO_EC_ProxyPushSupplier_Set*);
+      destroy_timer_module (TAO_EC_Timer_Module*);
+  virtual PortableServer::POA_ptr
+       consumer_poa (CORBA::Environment& env);
+  virtual PortableServer::POA_ptr
+       supplier_poa (CORBA::Environment& env);
 
   virtual ACE_Lock* create_consumer_lock (void);
   virtual void destroy_consumer_lock (ACE_Lock*);
@@ -109,6 +103,13 @@ public:
   virtual void destroy_consumer_admin_lock (ACE_Lock*);
   virtual ACE_Lock* create_supplier_admin_lock (void);
   virtual void destroy_supplier_admin_lock (ACE_Lock*);
+
+private:
+  PortableServer::POA_var poa_;
+  // The POA
+
+  TAO_EC_SupplierFiltering* supplier_filtering_;
+  // The filtering strategy
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
index d8ec0a6e4f9..416f167ef06 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.i
@@ -1,6 +1,8 @@
 // $Id$
 
 ACE_INLINE
-TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
+TAO_EC_Null_Factory::TAO_EC_Null_Factory (PortableServer::POA_ptr poa)
+  :  poa_ (PortableServer::POA::_duplicate (poa)),
+     supplier_filtering_ (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
deleted file mode 100644
index df75136d3b9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#include "EC_Null_Scheduling.h"
-#include "EC_QOS_Info.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Null_Scheduling.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
-
-void
-TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies (
-      TAO_EC_ProxyPushSupplier *,
-      TAO_EC_ProxyPushConsumer *,
-      CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Null_Scheduling::init_event_qos (
-    const RtecEventComm::EventHeader&,
-    TAO_EC_ProxyPushConsumer *,
-    TAO_EC_QOS_Info&,
-    CORBA::Environment &)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
deleted file mode 100644
index 56c5070acd5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Null_Scheduling
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_NULL_SCHEDULING_H
-#define TAO_EC_NULL_SCHEDULING_H
-
-#include "EC_Scheduling_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORBSVCS_Export TAO_EC_Null_Scheduling : public TAO_EC_Scheduling_Strategy
-{
-  // = TITLE
-  //   A scheduling strategy that uses TAO's real-time scheduler
-  //
-  // = DESCRIPTION
-  //   This implementation of the Scheduling_Strategy uses TAO's
-  //   real-time scheduler.
-  //
-  // = MEMORY MANAGMENT
-  //
-public:
-  TAO_EC_Null_Scheduling (void);
-  // Constructor.
-
-  virtual void add_proxy_supplier_dependencies (
-      TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV);
-  // Add all the dependencies between <supplier> and <consumer>
-
-  virtual void init_event_qos (
-      const RtecEventComm::EventHeader& header,
-      TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV);
-  // Initializes <qos_info> based on the QoS information for
-  // <consumer> and the event header.
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling
-                              (const TAO_EC_Null_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling& operator=
-                              (const TAO_EC_Null_Scheduling&))
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Null_Scheduling.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_NULL_SCHEDULING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i
deleted file mode 100644
index 60c72cb9e56..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Null_Scheduling::TAO_EC_Null_Scheduling (void)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
deleted file mode 100644
index ac02d5b112f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-// $Id$
-
-#include "EC_ObserverStrategy.h"
-#include "EC_Event_Channel.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_SupplierAdmin.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "ace/Synch.h"
-#include "ace/Auto_Ptr.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_ObserverStrategy.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
-
-TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
-{
-}
-
-// ****************************************************************
-
-RtecEventChannelAdmin::Observer_Handle
-TAO_EC_Null_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr obs,
-       CORBA::Environment &ACE_TRY_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
-{
-  ACE_THROW_RETURN (
-      RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
-      0);
-}
-
-void
-TAO_EC_Null_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle,
-       CORBA::Environment &ACE_TRY_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
-{
-  ACE_THROW (RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
-}
-
-void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer*,
-                                         CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer*,
-                                            CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier*,
-                                         CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier*,
-                                            CORBA::Environment &)
-{
-}
-
-// ****************************************************************
-
-TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void)
-{
-  delete this->lock_;
-  this->lock_ = 0;
-}
-
-RtecEventChannelAdmin::Observer_Handle
-TAO_EC_Basic_ObserverStrategy::append_observer (
-       RtecEventChannelAdmin::Observer_ptr obs,
-       CORBA::Environment &ACE_TRY_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
-{
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK_RETURN (0);
-
-    this->handle_generator_++;
-    Observer_Entry entry (this->handle_generator_,
-                          RtecEventChannelAdmin::Observer::_duplicate (obs));
-
-    if (this->observers_.bind (entry.handle, entry) == -1)
-      ACE_THROW_RETURN (
-          RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER(),
-          0);
-  }
-
-  RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  obs->update_consumer (c_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  obs->update_supplier (s_qos, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  return this->handle_generator_;
-}
-
-
-void
-TAO_EC_Basic_ObserverStrategy::remove_observer (
-       RtecEventChannelAdmin::Observer_Handle handle,
-       CORBA::Environment &ACE_TRY_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK;
-
-  if (this->observers_.unbind (handle) == -1)
-    ACE_THROW (
-        RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER());
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushConsumer *consumer,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (consumer->publications ().is_gateway)
-    return;
-
-  RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int size = 0;
-  ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy;
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
-    size = this->observers_.current_size ();
-    RtecEventChannelAdmin::Observer_var *tmp;
-    ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
-    copy.reset (tmp);
-
-    Observer_Map_Iterator end = this->observers_.end ();
-    int j = 0;
-    for (Observer_Map_Iterator i  = this->observers_.begin ();
-         i != end;
-         ++i)
-      {
-        Observer_Entry& entry = (*i).int_id_;
-        copy[j++] =
-          RtecEventChannelAdmin::Observer::_duplicate (entry.observer);
-      }
-  }
-
-  for (int i = 0; i != size; ++i)
-    {
-      copy[i]->update_supplier (s_qos, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushConsumer* consumer,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (consumer->publications ().is_gateway)
-    return;
-
-  RtecEventChannelAdmin::SupplierQOS s_qos;
-  this->fill_qos (s_qos, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int size = 0;
-  ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy;
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
-    size = this->observers_.current_size ();
-    RtecEventChannelAdmin::Observer_var *tmp;
-    ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
-    copy.reset (tmp);
-
-    Observer_Map_Iterator end = this->observers_.end ();
-    int j = 0;
-    for (Observer_Map_Iterator i  = this->observers_.begin ();
-         i != end;
-         ++i)
-      {
-        Observer_Entry& entry = (*i).int_id_;
-        copy[j++] =
-          RtecEventChannelAdmin::Observer::_duplicate (entry.observer);
-      }
-  }
-
-  for (int i = 0; i != size; ++i)
-    {
-      copy[i]->update_supplier (s_qos, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::connected (
-    TAO_EC_ProxyPushSupplier* supplier,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (supplier->subscriptions ().is_gateway)
-    return;
-
-  RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int size = 0;
-  ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy;
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
-    size = this->observers_.current_size ();
-    RtecEventChannelAdmin::Observer_var *tmp;
-    ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
-    copy.reset (tmp);
-
-    Observer_Map_Iterator end = this->observers_.end ();
-    int j = 0;
-    for (Observer_Map_Iterator i  = this->observers_.begin ();
-         i != end;
-         ++i)
-      {
-        Observer_Entry& entry = (*i).int_id_;
-        copy[j++] =
-          RtecEventChannelAdmin::Observer::_duplicate (entry.observer);
-      }
-  }
-
-  for (int i = 0; i != size; ++i)
-    {
-      copy[i]->update_consumer (c_qos, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::disconnected (
-    TAO_EC_ProxyPushSupplier* supplier,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (supplier->subscriptions ().is_gateway)
-    return;
-
-  RtecEventChannelAdmin::ConsumerQOS c_qos;
-  this->fill_qos (c_qos, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int size = 0;
-  ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var> copy;
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
-    size = this->observers_.current_size ();
-    RtecEventChannelAdmin::Observer_var *tmp;
-    ACE_NEW (tmp, RtecEventChannelAdmin::Observer_var[size]);
-    copy.reset (tmp);
-
-    Observer_Map_Iterator end = this->observers_.end ();
-    int j = 0;
-    for (Observer_Map_Iterator i  = this->observers_.begin ();
-         i != end;
-         ++i)
-      {
-        Observer_Entry& entry = (*i).int_id_;
-        copy[j++] =
-          RtecEventChannelAdmin::Observer::_duplicate (entry.observer);
-      }
-  }
-
-  for (int i = 0; i != size; ++i)
-    {
-      copy[i]->update_consumer (c_qos, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::ConsumerQOS &qos,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  Headers headers;
-
-  {
-    ACE_GUARD_THROW_EX (TAO_EC_ConsumerAdmin::Busy_Lock,
-        ace_mon, this->event_channel_->consumer_admin ()->busy_lock (),
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    TAO_EC_ConsumerAdmin::SupplierSetIterator end =
-      this->event_channel_->consumer_admin ()->end ();
-    for (TAO_EC_ConsumerAdmin::SupplierSetIterator i =
-           this->event_channel_->consumer_admin ()->begin ();
-         i != end;
-         ++i)
-      {
-        TAO_EC_ProxyPushSupplier* supplier = *i;
-
-        const RtecEventChannelAdmin::ConsumerQOS& sub =
-          supplier->subscriptions ();
-        if (sub.is_gateway)
-          continue;
-        for (CORBA::ULong j = 0; j < sub.dependencies.length (); ++j)
-          {
-            const RtecEventComm::Event& event =
-              sub.dependencies[j].event;
-            RtecEventComm::EventType type = event.header.type;
-
-            if (0 < type && type < ACE_ES_EVENT_UNDEFINED)
-              continue;
-            headers.insert (event.header, 1);
-          }
-      }
-  }
-  CORBA::ULong count = 1;
-  HeadersIterator i (headers);
-  for (i.first (); !i.is_done (); i.next ())
-    {
-      count++;
-    }
-
-  RtecEventChannelAdmin::DependencySet& dep = qos.dependencies;
-
-  dep.length (count);
-
-  dep[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR;
-  dep[0].event.header.source = 0;
-  dep[0].event.header.creation_time = ORBSVCS_Time::zero ();
-  dep[0].rt_info = 0;
-  count = 1;
-  for (i.first (); !i.is_done (); i.next ())
-    {
-      qos.dependencies[count++].event.header = *i.key ();
-    }
-}
-
-void
-TAO_EC_Basic_ObserverStrategy::fill_qos (
-      RtecEventChannelAdmin::SupplierQOS &qos,
-      CORBA::Environment &)
-{
-  Headers headers;
-
-  {
-    // @@ TODO locking in the consumer admin?
-    TAO_EC_SupplierAdmin::ConsumerSetIterator end =
-      this->event_channel_->supplier_admin ()->end ();
-    for (TAO_EC_SupplierAdmin::ConsumerSetIterator i =
-           this->event_channel_->supplier_admin ()->begin ();
-         i != end;
-         ++i)
-      {
-        TAO_EC_ProxyPushConsumer* consumer = *i;
-        const RtecEventChannelAdmin::SupplierQOS& pub =
-          consumer->publications ();
-        if (pub.is_gateway)
-          continue;
-        for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
-          {
-            const RtecEventComm::Event& event =
-              pub.publications[j].event;
-            RtecEventComm::EventType type = event.header.type;
-
-            if (0 < type && type < ACE_ES_EVENT_UNDEFINED)
-              continue;
-            headers.insert (event.header, 1);
-          }
-      }
-  }
-  CORBA::ULong count = 0;
-  HeadersIterator i (headers);
-  for (i.first (); !i.is_done (); i.next ())
-    {
-      count++;
-    }
-  qos.publications.length (count);
-  count = 0;
-  for (i.first (); !i.is_done (); i.next ())
-    {
-      qos.publications[count++].event.header = *i.key ();
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>;
-template class ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>;
-template class ACE_Map_Entry<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry>;
-
-template class ACE_RB_Tree<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator_Base<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>;
-template class ACE_RB_Tree_Node<RtecEventComm::EventHeader,int>;
-
-template class ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry,ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<RtecEventChannelAdmin::Observer_Handle,TAO_EC_Basic_ObserverStrategy::Observer_Entry>
-
-#pragma instantiate ACE_RB_Tree<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<RtecEventComm::EventHeader,int,TAO_EC_Basic_ObserverStrategy::Header_Compare,ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Node<RtecEventComm::EventHeader,int>
-
-#pragma instantiate ACE_Auto_Basic_Array_Ptr<RtecEventChannelAdmin::Observer_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
deleted file mode 100644
index ed9c0b15ffb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_ObserverStrategy
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_OBSERVERSTRATEGY_H
-#define TAO_EC_OBSERVERSTRATEGY_H
-
-#include "ace/Map_Manager.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/RB_Tree.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-
-class ACE_Lock;
-class TAO_EC_Event_Channel;
-class TAO_EC_ProxyPushConsumer;
-class TAO_EC_ProxyPushSupplier;
-
-class TAO_ORBSVCS_Export TAO_EC_ObserverStrategy
-{
-  // = TITLE
-  //   The strategy to handle observers for the Event Channel
-  //   subscriptions and publication.
-  //
-  // = DESCRIPTION
-  //   The Event Channel supports Observers for the set of
-  //   subscriptions and publications.
-  //   This is used to implement federations of event channels,
-  //   either through UDP (multicast and unicast) and/or regular CORBA
-  //   calls.
-  //
-  //   This behavior of the EC is strategized to avoid overhead when
-  //   no gateways are needed.
-  //
-public:
-  virtual ~TAO_EC_ObserverStrategy (void);
-  // Destructor
-
-  virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-		       CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER))
-    = 0;
-  virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER))
-     = 0;
-  // The basic methods to support the EC strategies.
-
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&) = 0;
-  // Used by the EC to inform the ObserverStrategy that a Consumer has
-  // connected or disconnected from it.
-
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&) = 0;
-  // Used by the EC to inform the ObserverStrategy that a Consumer has
-  // connected or disconnected from it.
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Null_ObserverStrategy : public TAO_EC_ObserverStrategy
-{
-  // = TITLE
-  //   A null observer strategy.
-  //
-  // = DESCRIPTION
-  //   This class keeps no information and simply ignores the messages
-  //   from the EC.
-  //
-public:
-  TAO_EC_Null_ObserverStrategy (void);
-  // Constructor
-
-  // = The TAO_EC_ObserverStrategy methods.
-  virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-		       CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Basic_ObserverStrategy : public TAO_EC_ObserverStrategy
-{
-  // = TITLE
-  //   A simple observer strategy.
-  //
-  // = DESCRIPTION
-  //   This class simply keeps the information about the current list
-  //   of observers, whenever the list of consumers and/or suppliers
-  //   changes in queries the EC, computes the global subscription
-  //   and/or publication list and sends the update message to all the
-  //   observers.
-  //
-  // = MEMORY MANAGMENT
-  //   It assumes ownership of the <lock>, but not of the
-  //   Event_Channel.
-  //
-public:
-  TAO_EC_Basic_ObserverStrategy (TAO_EC_Event_Channel* ec,
-                                 ACE_Lock* lock);
-  // Constructor
-
-  virtual ~TAO_EC_Basic_ObserverStrategy (void);
-  // Destructor
-
-  // = The TAO_EC_ObserverStrategy methods.
-  virtual RtecEventChannelAdmin::Observer_Handle
-      append_observer (RtecEventChannelAdmin::Observer_ptr,
-		       CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_APPEND_OBSERVER));
-  virtual void remove_observer (
-                        RtecEventChannelAdmin::Observer_Handle,
-                        CORBA::Environment &env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecEventChannel::EventChannel::SYNCHRONIZATION_ERROR,
-                     RtecEventChannel::EventChannel::CANT_REMOVE_OBSERVER));
-  virtual void connected (TAO_EC_ProxyPushConsumer*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushConsumer*,
-                             CORBA::Environment&);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-
-
-  struct Observer_Entry
-  {
-    // = TITLE
-    //   The data kept for each observer.
-    //
-    // = DESCRIPTION
-    //   The observer and its handle are kept in a simple structure.
-    //   In the future this structure could contain QoS information,
-    //   such as:
-    //   + how often do we update the observer?
-    //   + When was the last update.
-    //   + Does it want to receive all changes?
-    //
-
-    ACE_INLINE Observer_Entry (void);
-    ACE_INLINE Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
-                               RtecEventChannelAdmin::Observer_ptr o);
-
-    RtecEventChannelAdmin::Observer_Handle handle;
-    // The handle
-
-    RtecEventChannelAdmin::Observer_var observer;
-    // The observer
-  };
-
-  struct Header_Compare
-  {
-    int operator () (const RtecEventComm::EventHeader& lhs,
-                     const RtecEventComm::EventHeader& rhs) const;
-  };
-
-private:
-  void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos,
-                 CORBA::Environment &env);
-  void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos,
-                 CORBA::Environment &env);
-  // Helper functions to compute the consumer and supplier QOS.
-
-private:
-  TAO_EC_Event_Channel* event_channel_;
-  // The event channel.
-
-  ACE_Lock* lock_;
-  // The lock
-
-  typedef ACE_Map_Manager<RtecEventChannelAdmin::Observer_Handle,Observer_Entry,ACE_Null_Mutex> Observer_Map;
-  typedef ACE_Map_Iterator<RtecEventChannelAdmin::Observer_Handle,Observer_Entry,ACE_Null_Mutex> Observer_Map_Iterator;
-
-  RtecEventChannelAdmin::Observer_Handle handle_generator_;
-  // The handles are generated in sequential order, but are opaque to
-  // the client.
-
-  Observer_Map observers_;
-  // Keep the set of Observers
-
-  typedef ACE_RB_Tree<RtecEventComm::EventHeader,int,Header_Compare,ACE_Null_Mutex> Headers;
-  typedef ACE_RB_Tree_Iterator<RtecEventComm::EventHeader,int,Header_Compare,ACE_Null_Mutex> HeadersIterator;
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_ObserverStrategy.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_OBSERVERSTRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
deleted file mode 100644
index 07836b8e4d1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry (void)
-  :  handle (0)
-{
-}
-
-ACE_INLINE
-TAO_EC_Basic_ObserverStrategy::Observer_Entry::
-      Observer_Entry (RtecEventChannelAdmin::Observer_Handle h,
-                      RtecEventChannelAdmin::Observer_ptr o)
-  :  handle (h),
-     observer (o)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE int
-TAO_EC_Basic_ObserverStrategy::Header_Compare::
-    operator () (const RtecEventComm::EventHeader& lhs,
-                 const RtecEventComm::EventHeader& rhs) const
-{
-  if (lhs.source == rhs.source)
-    return lhs.type < rhs.type;
-  return lhs.source < rhs.source;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_EC_Basic_ObserverStrategy::
-      TAO_EC_Basic_ObserverStrategy (TAO_EC_Event_Channel* ec,
-                                     ACE_Lock* lock)
-  :  event_channel_ (ec),
-     lock_ (lock),
-     handle_generator_ (1)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
deleted file mode 100644
index 9aa562b6060..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "EC_Per_Supplier_Filter.h"
-#include "EC_Event_Channel.h"
-#include "EC_ProxyPushSupplier_Set.h"
-#include "EC_ProxySupplier.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_Scheduling_Strategy.h"
-#include "EC_QOS_Info.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Per_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$")
-
-TAO_EC_Per_Supplier_Filter::
-    TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel* ec)
-  :  event_channel_ (ec),
-     refcnt_ (1)
-{
-  this->supplier_set_ =
-    this->event_channel_->create_proxy_push_supplier_set ();
-  this->supplier_set_->busy_hwm (this->event_channel_->busy_hwm ());
-  this->supplier_set_->max_write_delay (this->event_channel_->max_write_delay ());
-}
-
-TAO_EC_Per_Supplier_Filter::~TAO_EC_Per_Supplier_Filter (void)
-{
-  this->event_channel_->destroy_proxy_push_supplier_set (this->supplier_set_);
-  this->supplier_set_ = 0;
-}
-
-void
-TAO_EC_Per_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer* consumer)
-{
-  this->consumer_ = consumer;
-}
-
-void
-TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer)
-{
-  if (this->consumer_ != 0 && this->consumer_ != consumer)
-    return;
-
-  this->consumer_ = 0;
-}
-
-void
-TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->consumer_ == 0)
-    return;
-
-  const RtecEventChannelAdmin::SupplierQOS& pub =
-    this->consumer_->publications_i ();
-
-  for (CORBA::ULong j = 0; j < pub.publications.length (); ++j)
-    {
-      const RtecEventComm::Event& event =
-        pub.publications[j].event;
-
-      //      ACE_DEBUG ((LM_DEBUG, "Trying %d:%d in %x\n",
-      //                  event.header.source, event.header.type,
-      //                  this));
-      if (supplier->can_match (event.header))
-        {
-          //          ACE_DEBUG ((LM_DEBUG, "  matched %x\n", supplier));
-          this->supplier_set_->connected (supplier, ACE_TRY_ENV);
-          return;
-        }
-    }
-}
-
-void
-TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  this->supplier_set_->disconnected (supplier, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Per_Supplier_Filter::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->supplier_set_->shutdown (ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_Scheduling_Strategy* scheduling_strategy =
-    this->event_channel_->scheduling_strategy ();
-  for (CORBA::ULong j = 0; j < event.length (); ++j)
-    {
-      const RtecEventComm::Event& e = event[j];
-      RtecEventComm::Event* buffer =
-        ACE_const_cast(RtecEventComm::Event*, &e);
-      RtecEventComm::EventSet single_event (1, 1, buffer, 0);
-
-      TAO_EC_QOS_Info event_info;
-      scheduling_strategy->init_event_qos (e.header,
-                                           this->consumer_,
-                                           event_info,
-                                           ACE_TRY_ENV);
-      ACE_CHECK;
-
-      ACE_GUARD_THROW_EX (TAO_EC_ProxyPushSupplier_Set::Busy_Lock,
-          ace_mon, this->supplier_set_->busy_lock (),
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-      ACE_CHECK;
-
-      TAO_EC_ProxyPushSupplier_Set::SupplierSetIterator end =
-        this->supplier_set_->end ();
-
-      for (TAO_EC_ProxyPushSupplier_Set::SupplierSetIterator i =
-             this->supplier_set_->begin ();
-           i != end;
-           ++i)
-        {
-          TAO_EC_QOS_Info qos_info = event_info;
-
-          (*i)->filter (single_event, qos_info, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-}
-
-CORBA::ULong
-TAO_EC_Per_Supplier_Filter::_incr_refcnt (void)
-{
-  this->refcnt_++;
-  return this->refcnt_;
-}
-
-CORBA::ULong
-TAO_EC_Per_Supplier_Filter::_decr_refcnt (void)
-{
-  this->refcnt_--;
-  if (this->refcnt_ == 0)
-    {
-      this->event_channel_->supplier_filter_builder ()->destroy (this);
-      return 0;
-    }
-  return this->refcnt_;
-}
-
-// ****************************************************************
-
-TAO_EC_SupplierFiltering*
-TAO_EC_Per_Supplier_Filter_Builder::create (
-    RtecEventChannelAdmin::SupplierQOS&)
-{
-  return new TAO_EC_Per_Supplier_Filter (this->event_channel_);
-}
-
-void
-TAO_EC_Per_Supplier_Filter_Builder::destroy (
-    TAO_EC_SupplierFiltering* x)
-{
-  delete x;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
deleted file mode 100644
index 33201e670c1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Per_Supplier_Filter
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_PER_SUPPLIER_FILTER_H
-#define TAO_EC_PER_SUPPLIER_FILTER_H
-
-#include "EC_SupplierFiltering.h"
-#include "EC_Supplier_Filter_Builder.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_ProxyPushSupplier_Set;
-
-class TAO_ORBSVCS_Export TAO_EC_Per_Supplier_Filter : public TAO_EC_SupplierFiltering
-{
-  // = TITLE
-  //   Filter the events on each supplier.
-  //
-  // = DESCRIPTION
-  //   This is a filtering strategy for the suppliers. In this
-  //   particular case we keep a collection of the consumers that
-  //   could potentially be interested in any event generated by a
-  //   particular supplier.
-  //   This minimizes the amount of consumers touched by the EC when
-  //   dispatching an event.
-  //
-public:
-  TAO_EC_Per_Supplier_Filter (TAO_EC_Event_Channel* ec);
-  // Constructor
-
-  virtual ~TAO_EC_Per_Supplier_Filter (void);
-  // Destructor
-
-  // = The TAO_EC_SupplierFiltering methods.
-  virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
-  virtual void shutdown (CORBA::Environment &env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
-
-private:
-  TAO_EC_Event_Channel *event_channel_;
-  // The event channel, used to locate the set of consumers.
-
-  TAO_EC_ProxyPushConsumer* consumer_;
-  // The proxy for the supplier we are bound to.
-
-  TAO_EC_ProxyPushSupplier_Set* supplier_set_;
-  // Keep the list of proxies for the consumers that may be interested
-  // in our events.
-
-  CORBA::ULong refcnt_;
-  // Reference counting
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Per_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
-{
-  // = TITLE
-  //   Create Per_Supplier_Filter objects
-  //
-  // = DESCRIPTION
-  //
-public:
-  TAO_EC_Per_Supplier_Filter_Builder (TAO_EC_Event_Channel* ec);
-  // constructor....
-
-  // = The TAO_EC_Supplier_Filter_Builder methods...
-  virtual TAO_EC_SupplierFiltering*
-      create (RtecEventChannelAdmin::SupplierQOS& qos);
-  virtual void
-      destroy (TAO_EC_SupplierFiltering *filter);
-
-private:
-  TAO_EC_Event_Channel* event_channel_;
-  // The event channel
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Per_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_PER_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
deleted file mode 100644
index f1fc6e2687b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Per_Supplier_Filter_Builder::
-TAO_EC_Per_Supplier_Filter_Builder (TAO_EC_Event_Channel* ec)
-  :  event_channel_ (ec)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
deleted file mode 100644
index ad346c58e44..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// $Id$
-
-#include "EC_Priority_Dispatching.h"
-#include "EC_Dispatching_Task.h"
-#include "EC_Event_Channel.h"
-#include "EC_QOS_Info.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "ace/Sched_Params.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Priority_Dispatching, "$Id$")
-
-TAO_EC_Priority_Dispatching::TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel *ec)
-  :  ntasks_ (0),
-     tasks_ (0),
-     scheduler_ (ec->scheduler ())
-{
-}
-
-void
-TAO_EC_Priority_Dispatching::activate (void)
-{
-  if (this->tasks_ != 0)
-    return;
-
-  // @@ Query the scheduler to obtain this....
-  this->ntasks_ = ACE_Scheduler_MAX_PRIORITIES;
-  ACE_NEW (this->tasks_, TAO_EC_Dispatching_Task*[this->ntasks_]);
-
-  // @@ Query the scheduler to obtain the priorities!
-  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);
-
-  for (int i = 0; i < this->ntasks_; ++i)
-    {
-      ACE_NEW (this->tasks_[i],
-               TAO_EC_Dispatching_Task (&this->thread_manager_));
-
-      // @@ Query the scheduler to obtain the priority...
-      long flags = THR_BOUND | THR_SCHED_FIFO;
-      if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1)
-        {
-          flags = THR_BOUND;
-          priority = ACE_Sched_Params::priority_min (ACE_SCHED_OTHER,
-                                                     ACE_SCOPE_THREAD);
-          if (this->tasks_[i]->activate (flags, 1, 1, priority) == -1)
-            ACE_ERROR ((LM_ERROR,
-                        "EC (%P|%t) cannot activate queue %d", i));
-        }
-    }
-}
-
-void
-TAO_EC_Priority_Dispatching::shutdown (void)
-{
-  if (this->tasks_ == 0)
-    return;
-
-  for (int i = 0; i < this->ntasks_; ++i)
-    this->tasks_[i]->putq (new TAO_EC_Shutdown_Command);
-
-  this->thread_manager_.wait ();
-
-  for (int j = 0; j < this->ntasks_; ++j)
-    delete this->tasks_[j];
-
-  delete[] this->tasks_;
-  this->tasks_ = 0;
-}
-
-void
-TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy,
-                                   const RtecEventComm::EventSet& event,
-                                   TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment& ACE_TRY_ENV)
-{
-  RtecEventComm::EventSet event_copy = event;
-  this->push_nocopy (proxy, event_copy, qos_info, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
-                                          RtecEventComm::EventSet& event,
-                                          TAO_EC_QOS_Info& qos_info,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->tasks_ == 0)
-    this->activate ();
-
-  int i = qos_info.preemption_priority;
-  if (i < 0 || i >= this->ntasks_)
-    {
-      // @@ Throw something?
-      i = 0;
-    }
-
-
-  this->tasks_[i]->push (proxy, event, ACE_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
deleted file mode 100644
index 121e9bdc452..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Priority_Dispatching
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_PRIORITY_DISPATCHING_H
-#define TAO_EC_PRIORITY_DISPATCHING_H
-
-#include "orbsvcs/RtecSchedulerC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "EC_Dispatching.h"
-
-class TAO_EC_Dispatching_Task;
-class TAO_EC_Event_Channel;
-
-class TAO_ORBSVCS_Export TAO_EC_Priority_Dispatching : public TAO_EC_Dispatching
-{
-  // = TITLE
-  //   Dispatching strategy that minimizes priority inversion.
-  //
-  // = DESCRIPTION
-  //   This strategy uses multiple queues, each serviced by a thread
-  //   at different priority.  This minimizes priority inversion
-  //   because the consumers at higher priority are serviced before
-  //   consumers at lower priority.
-  //   It is more flexible than using the supplier thread to dispatch
-  //   because it allows high-priority suppliers to push events to
-  //   low-priority consumers (and vice-versa).
-  //   It also isolates the supplier threads from the time spent on
-  //   upcalls to the consumer objects, making the system easier to
-  //   analyze and schedule.
-  //
-public:
-  TAO_EC_Priority_Dispatching (TAO_EC_Event_Channel* ec);
-  // The scheduler is used to find the range of priorities and similar
-  // info.
-
-  // = The EC_Dispatching methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
-  virtual void push (TAO_EC_ProxyPushSupplier* proxy,
-                     const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
-  virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
-                            RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
-
-private:
-  ACE_Thread_Manager thread_manager_;
-  // Use our own thread manager.
-
-  int ntasks_;
-  // The number of active tasks
-
-  TAO_EC_Dispatching_Task** tasks_;
-  // The tasks..
-
-  RtecScheduler::Scheduler_var scheduler_;
-  // The scheduler
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Priority_Dispatching.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_PRIORITY_DISPATCHING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
deleted file mode 100644
index 51c28b3fa4e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-
-#include "EC_Priority_Scheduling.h"
-#include "EC_QOS_Info.h"
-#include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Priority_Scheduling.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$")
-
-TAO_EC_Priority_Scheduling::~TAO_EC_Priority_Scheduling (void)
-{
-}
-
-void
-TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies (
-      TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  const RtecEventChannelAdmin::SupplierQOS& qos =
-    consumer->publications ();
-  for (CORBA::ULong i = 0; i < qos.publications.length (); ++i)
-    {
-      const RtecEventComm::EventHeader &header =
-        qos.publications[i].event.header;
-      TAO_EC_QOS_Info qos_info;
-      qos_info.rt_info = qos.publications[i].dependency_info.rt_info;
-
-      RtecScheduler::OS_Priority os_priority;
-      RtecScheduler::Preemption_Subpriority_t p_subpriority;
-      RtecScheduler::Preemption_Priority_t p_priority;
-      this->scheduler_->priority (qos_info.rt_info,
-                                  os_priority,
-                                  p_subpriority,
-                                  p_priority,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-      qos_info.preemption_priority = p_priority;
-
-      supplier->add_dependencies (header, qos_info, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_EC_Priority_Scheduling::init_event_qos (
-    const RtecEventComm::EventHeader &header,
-    TAO_EC_ProxyPushConsumer *consumer,
-    TAO_EC_QOS_Info &qos_info,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  const RtecEventChannelAdmin::SupplierQOS& qos =
-    consumer->publications ();
-  for (CORBA::ULong i = 0; i < qos.publications.length (); ++i)
-    {
-      const RtecEventComm::EventHeader &qos_header =
-        qos.publications[i].event.header;
-
-      if (TAO_EC_Filter::matches (header, qos_header) == 0)
-        continue;
-
-      qos_info.rt_info = qos.publications[i].dependency_info.rt_info;
-
-      RtecScheduler::OS_Priority os_priority;
-      RtecScheduler::Preemption_Subpriority_t p_subpriority;
-      RtecScheduler::Preemption_Priority_t p_priority;
-      this->scheduler_->priority (qos_info.rt_info,
-                                  os_priority,
-                                  p_subpriority,
-                                  p_priority,
-                                  ACE_TRY_ENV);
-      ACE_CHECK;
-      qos_info.preemption_priority = p_priority;
-    }
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
deleted file mode 100644
index f07673689b7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Priority_Scheduling
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_PRIORITY_SCHEDULING_H
-#define TAO_EC_PRIORITY_SCHEDULING_H
-
-#include "EC_Scheduling_Strategy.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORBSVCS_Export TAO_EC_Priority_Scheduling : public TAO_EC_Scheduling_Strategy
-{
-  // = TITLE
-  //   A scheduling strategy that uses TAO's real-time scheduler
-  //
-  // = DESCRIPTION
-  //   This implementation of the Scheduling_Strategy uses TAO's
-  //   real-time scheduler.
-  //
-  // = MEMORY MANAGMENT
-  //
-public:
-  TAO_EC_Priority_Scheduling (RtecScheduler::Scheduler_ptr scheduler);
-  // Constructor.
-
-  virtual ~TAO_EC_Priority_Scheduling (void);
-  // Destructor
-
-  virtual void add_proxy_supplier_dependencies (
-      TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV);
-  // Add all the dependencies between <supplier> and <consumer>
-
-  virtual void init_event_qos (
-      const RtecEventComm::EventHeader& header,
-      TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV);
-  // Initializes <qos_info> based on the QoS information for
-  // <consumer> and the event header.
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling
-                              (const TAO_EC_Priority_Scheduling&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling& operator=
-                              (const TAO_EC_Priority_Scheduling&))
-
-  void init_rt_info (CORBA::Environment& env);
-  // Initialize our RT_Info handle and dependencies
-
-private:
-  RtecScheduler::Scheduler_var scheduler_;
-  // The scheduler we are going to use
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Priority_Scheduling.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_PRIORITY_SCHEDULING_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
deleted file mode 100644
index af004f6fcde..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Priority_Scheduling::TAO_EC_Priority_Scheduling (
-       RtecScheduler::Scheduler_ptr scheduler)
-  :  scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler))
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index c1512e55bcb..97e9c83ecbc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -3,7 +3,6 @@
 #include "EC_ProxyConsumer.h"
 #include "EC_Event_Channel.h"
 #include "EC_SupplierFiltering.h"
-#include "EC_Supplier_Filter_Builder.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_ProxyConsumer.i"
@@ -11,82 +10,44 @@
 
 ACE_RCSID(Event, EC_ProxyConsumer, "$Id$")
 
-typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
-
 TAO_EC_ProxyPushConsumer::
-    TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel* ec)
+    TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel* ec,
+                              TAO_EC_SupplierFiltering* filtering)
   : event_channel_ (ec),
-    refcount_ (1),
-    filter_ (0)
+    supplier_filtering_ (filtering)
 {
-  this->lock_ =
-    this->event_channel_->create_consumer_lock ();
+  this->supplier_filtering_->bind (this);
+}
 
+TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
+{
+}
+
+void
+TAO_EC_ProxyPushConsumer::set_default_POA (PortableServer::POA_ptr poa)
+{
   this->default_POA_ =
-    this->event_channel_->consumer_poa ();
+    PortableServer::POA::_duplicate (poa);
 }
 
-TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void)
+PortableServer::POA_ptr
+TAO_EC_ProxyPushConsumer::_default_POA (CORBA::Environment&)
 {
-  this->event_channel_->destroy_consumer_lock (this->lock_);
+  return PortableServer::POA::_duplicate (this->default_POA_);
 }
 
 void
 TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier,
                                      CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_EC_SupplierFiltering* filter = 0;
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      return;
-
-    filter = this->filter_;
-    filter->_incr_refcnt ();
-  }
-
-  filter->connected (supplier, ACE_TRY_ENV);
-
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-    filter->_decr_refcnt ();
-  }
+  this->supplier_filtering_->connected (supplier, ACE_TRY_ENV);
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier,
                                         CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_EC_SupplierFiltering* filter = 0;
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      return;
-
-    filter = this->filter_;
-    filter->_incr_refcnt ();
-  }
-
-  filter->disconnected (supplier, ACE_TRY_ENV);
-
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-    filter->_decr_refcnt ();
-  }
+  this->supplier_filtering_->disconnected (supplier, ACE_TRY_ENV);
 }
 
 void
@@ -102,126 +63,17 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer*,
 }
 
 void
-TAO_EC_ProxyPushConsumer::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  RtecEventComm::PushSupplier_var supplier;
-
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      return;
-
-    supplier = this->supplier_._retn ();
-
-    this->filter_->shutdown (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    this->cleanup_i ();
-  }
-
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  supplier->disconnect_push_supplier (ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ProxyPushConsumer::cleanup_i (void)
-{
-  this->supplier_ =
-    RtecEventComm::PushSupplier::_nil ();
-
-  this->filter_->unbind (this);
-  this->filter_->_decr_refcnt ();
-  this->filter_ = 0;
-}
-
-void
-TAO_EC_ProxyPushConsumer::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::ULong
-TAO_EC_ProxyPushConsumer::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_EC_ProxyPushConsumer::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  // Notify the event channel
-  this->event_channel_->destroy_proxy_push_consumer (this);
-  return 0;
-}
-
-void
 TAO_EC_ProxyPushConsumer::connect_push_supplier (
       RtecEventComm::PushSupplier_ptr push_supplier,
       const RtecEventChannelAdmin::SupplierQOS& qos,
       CORBA::Environment &ACE_TRY_ENV)
 {
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i ())
-      {
-        if (this->event_channel_->supplier_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
-
-        // Re-connections are allowed, go ahead and disconnect the
-        // consumer...
-        this->cleanup_i ();
-
-        // @@ Please read the comments in EC_ProxySuppliers about
-        //     possible race conditions in this area...
-        TAO_EC_Unlock reverse_lock (*this->lock_);
+  if (this->is_connected ())
+    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
 
-        {
-          ACE_GUARD_THROW_EX (
-              TAO_EC_Unlock, ace_mon, reverse_lock,
-              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
-
-          this->event_channel_->disconnected (this, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-
-        // What if a second thread connected us after this?
-        if (this->is_connected_i ())
-          return;
-      }
-    this->supplier_ =
-      RtecEventComm::PushSupplier::_duplicate (push_supplier);
-    this->qos_ = qos;
-
-    this->filter_ =
-      this->event_channel_->supplier_filter_builder ()->create (this->qos_);
-    this->filter_->bind (this);
-  }
+  this->supplier_ =
+    RtecEventComm::PushSupplier::_duplicate (push_supplier);
+  this->qos_ = qos;
 
   // Notify the event channel...
   this->event_channel_->connected (this, ACE_TRY_ENV);
@@ -231,78 +83,27 @@ void
 TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event,
                                 CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_EC_SupplierFiltering* filter = 0;
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      return; // @@ THROW something???
-
-    filter = this->filter_;
-    filter->_incr_refcnt ();
-
-    this->refcount_++;
-  }
-
-  // No need to keep the lock, the filter_ class is supposed to be
-  // thread safe....
-  filter->push (event, ACE_TRY_ENV);
-
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-    filter->_decr_refcnt ();
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return;
-  }
-  this->event_channel_->destroy_proxy_push_consumer (this);
+  this->supplier_filtering_->push (event, ACE_TRY_ENV);
 }
 
 void
 TAO_EC_ProxyPushConsumer::disconnect_push_consumer (
       CORBA::Environment &ACE_TRY_ENV)
 {
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ()); // @@ add user exception?
-
-    this->cleanup_i ();
-  }
+  this->supplier_ =
+    RtecEventComm::PushSupplier::_nil ();
 
-  this->deactivate (ACE_TRY_ENV);
+  PortableServer::POA_var poa =
+    this->_default_POA (ACE_TRY_ENV);
+  ACE_CHECK;
+  PortableServer::ObjectId_var id =
+    poa->servant_to_id (this, ACE_TRY_ENV);
+  ACE_CHECK;
+  poa->deactivate_object (id.in (), ACE_TRY_ENV);
   ACE_CHECK;
 
-  // Notify the event channel...
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
-
-  this->_decr_refcnt ();
-}
-
-PortableServer::POA_ptr
-TAO_EC_ProxyPushConsumer::_default_POA (CORBA::Environment&)
-{
-  return PortableServer::POA::_duplicate (this->default_POA_.in ());
-}
-
-void
-TAO_EC_ProxyPushConsumer::_add_ref (CORBA::Environment &)
-{
-  this->_incr_refcnt ();
-}
+  this->supplier_filtering_->unbind (this);
+  this->supplier_filtering_ = 0;
 
-void
-TAO_EC_ProxyPushConsumer::_remove_ref (CORBA::Environment &)
-{
-  this->_decr_refcnt ();
+  this->event_channel_->destroy_proxy_push_consumer (this);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index 3cc9cd8b303..e1ce7779e39 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -12,6 +12,12 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Implement the RtecEventChannelAdmin::ProxyPushConsumer interface,
+//   remember that this class is used to communicate with a
+//   PushSupplier, so, in effect, this is the ambassador for a
+//   supplier inside the event channel.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -36,16 +42,14 @@ class TAO_EC_Event_Channel;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_SupplierFiltering;
 
-class TAO_ORBSVCS_Export TAO_EC_ProxyPushConsumer : public POA_RtecEventChannelAdmin::ProxyPushConsumer
+class TAO_EC_ProxyPushConsumer : public POA_RtecEventChannelAdmin::ProxyPushConsumer
 {
   // = TITLE
   //   ProxyPushConsumer
   //
   // = DESCRIPTION
-  //   Implement the RtecEventChannelAdmin::ProxyPushConsumer interface,
-  //   remember that this class is used to communicate with a
-  //   PushSupplier, so, in effect, this is the ambassador for a
-  //   supplier inside the event channel.
+  //   Implements the ProxyPushConsumer interface, i.e. the object
+  //   used to communicate with a particular supplier.
   //
   // = MEMORY MANAGMENT
   //   It makes a copy of the SupplierQOS and the supplier object
@@ -60,7 +64,8 @@ class TAO_ORBSVCS_Export TAO_EC_ProxyPushConsumer : public POA_RtecEventChannelA
   //   externally.
   //
 public:
-  TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel* event_channel);
+  TAO_EC_ProxyPushConsumer (TAO_EC_Event_Channel* event_channel,
+                            TAO_EC_SupplierFiltering* filtering);
   // constructor...
 
   virtual ~TAO_EC_ProxyPushConsumer (void);
@@ -77,65 +82,40 @@ public:
   // The QoS (subscription) used to connect to the EC.
 
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
+			  CORBA::Environment &env);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
+			     CORBA::Environment &env);
   // Concrete implementations can use this methods to keep track of
   // the consumers interested in this events.
 
   virtual void connected (TAO_EC_ProxyPushConsumer* consumer,
-                          CORBA::Environment &env);
+			  CORBA::Environment &env);
   virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer,
-                             CORBA::Environment &env);
+			     CORBA::Environment &env);
   // Usually implemented as no-ops, but some configurations may
   // require this methods.
 
-  virtual void shutdown (CORBA::Environment&);
-  // The event channel is shutting down
-
-  const RtecEventChannelAdmin::SupplierQOS& publications_i (void) const;
-  // The QoS (subscription) used to connect to the EC, assumes the
-  // locks are held, use with care!
+  void set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
 
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-  // Increment and decrement the reference count.
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  // Override the ServantBase method.
 
   // = The RtecEventChannelAdmin::ProxyPushConsumer methods...
   virtual void connect_push_supplier (
-                RtecEventComm::PushSupplier_ptr push_supplier,
+		RtecEventComm::PushSupplier_ptr push_supplier,
                 const RtecEventChannelAdmin::SupplierQOS& qos,
                 CORBA::Environment &);
   virtual void push (const RtecEventComm::EventSet& event,
                      CORBA::Environment &);
   virtual void disconnect_push_consumer (CORBA::Environment &);
 
-  // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                             CORBA::default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                                CORBA::default_environment ());
-
-private:
-  CORBA::Boolean is_connected_i (void) const;
-  // The private version (without locking) of is_connected().
-
-  void cleanup_i (void);
-  // Release the filter and the supplier
-
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
-
 private:
   TAO_EC_Event_Channel* event_channel_;
   // The supplier admin, used for activation and memory managment.
 
-  ACE_Lock* lock_;
-  // The locking strategy.
-
-  CORBA::ULong refcount_;
-  // The reference count.
+  TAO_EC_SupplierFiltering* supplier_filtering_;
+  // The strategy to do filtering close to the supplier
 
   RtecEventComm::PushSupplier_var supplier_;
   // The supplier....
@@ -145,9 +125,6 @@ private:
 
   PortableServer::POA_var default_POA_;
   // Store the default POA.
-
-  TAO_EC_SupplierFiltering* filter_;
-  // The strategy to do filtering close to the supplier
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
index e5abd1f309f..bd596291b5b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
@@ -1,37 +1,19 @@
 // $Id$
 
 ACE_INLINE CORBA::Boolean
-TAO_EC_ProxyPushConsumer::is_connected_i (void) const
-{
-  return !CORBA::is_nil (this->supplier_.in ());
-}
-
-ACE_INLINE CORBA::Boolean
 TAO_EC_ProxyPushConsumer::is_connected (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-
-  return this->is_connected_i ();
+  return !CORBA::is_nil (this->supplier_.in ());
 }
 
 ACE_INLINE RtecEventComm::PushSupplier_ptr
 TAO_EC_ProxyPushConsumer::supplier (void) const
 {
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-  return RtecEventComm::PushSupplier::_duplicate (this->supplier_.in ());
+  return RtecEventComm::PushSupplier::_duplicate (this->supplier_);
 }
 
 ACE_INLINE const RtecEventChannelAdmin::SupplierQOS&
 TAO_EC_ProxyPushConsumer::publications (void) const
 {
-  // @@ TODO There should some way to signal errors here.
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, this->qos_);
-
-  return this->qos_;
-}
-
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS&
-TAO_EC_ProxyPushConsumer::publications_i (void) const
-{
   return this->qos_;
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
deleted file mode 100644
index b1d6d23fb99..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-#include "EC_ProxyPushSupplier_Set.h"
-#include "EC_ProxySupplier.h"
-#include "EC_Command.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_ProxyPushSupplier_Set.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_ProxyPushSupplier_Set, "$Id$")
-
-TAO_EC_ProxyPushSupplier_Set::TAO_EC_ProxyPushSupplier_Set (void)
-  :  busy_lock_ (this),
-     busy_hwm_ (1),
-     max_write_delay_ (1)
-{
-}
-
-TAO_EC_ProxyPushSupplier_Set::~TAO_EC_ProxyPushSupplier_Set (void)
-{
-}
-
-void
-TAO_EC_ProxyPushSupplier_Set::connected_i (
-      TAO_EC_ProxyPushSupplier *supplier,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->all_suppliers_.insert (supplier) != 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
-}
-
-void
-TAO_EC_ProxyPushSupplier_Set::disconnected_i (
-      TAO_EC_ProxyPushSupplier *supplier,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->all_suppliers_.remove (supplier) != 0)
-    return; // ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ());
-  supplier->_decr_refcnt ();
-}
-
-void
-TAO_EC_ProxyPushSupplier_Set::shutdown_i (
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  SupplierSetIterator end = this->end ();
-  for (SupplierSetIterator i = this->begin (); i != end; ++i)
-    {
-      (*i)->_decr_refcnt ();
-    }
-  this->all_suppliers_.reset ();
-}
-
-void
-TAO_EC_ProxyPushSupplier_Set::execute_delayed_operations (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<TAO_EC_ProxyPushSupplier*>;
-template class ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*>;
-template class ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*>;
-template class ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> >;
-template class TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set>;
-template class TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-template class TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-template class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>;
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<TAO_EC_ProxyPushSupplier*>
-#pragma instantiate ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*>
-#pragma instantiate TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set>
-#pragma instantiate ACE_Guard<TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> >
-#pragma instantiate TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>
-#pragma instantiate TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>
-#pragma instantiate TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
deleted file mode 100644
index 050446e1bf1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_ProxyPushSupplier_Set
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-// ============================================================================
-
-#ifndef TAO_EC_PROXYPUSHSUPPLIER_SET_H
-#define TAO_EC_PROXYPUSHSUPPLIER_SET_H
-
-#include "orbsvcs/orbsvcs_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers.h"
-#include "tao/corba.h"
-#include "EC_Busy_Lock.h"
-#if defined(__GNUC__) && __GNUC__ == 2 && __GNUC_MINOR__ < 8
-// g++ 2.7.2 is broken and cannot handle forward declaration of
-// templates in this case.
-// I could just include this file for all compilers, but I want to
-// minimize compile-time dependencies *and* document this problem so
-// we can fix it as g++ 2.7.2 is phased out.
-#include "EC_Command.h"
-#endif /* __GNUC__ */
-
-class TAO_EC_ProxyPushSupplier;
-template<class Target,class Object> class TAO_EC_Connected_Command;
-template<class Target,class Object> class TAO_EC_Disconnected_Command;
-template<class Target> class TAO_EC_Shutdown_Command;
-
-class TAO_ORBSVCS_Export TAO_EC_ProxyPushSupplier_Set
-{
-  // = TITLE
-  //   ProxyPushSupplier_Set
-  //
-  // = DESCRIPTION
-  //   Many components in the Event Channel need to keep a collection
-  //   of ProxyPushSuppliers; this collections must be able to cope
-  //   with several concurrency issues:
-  //   + Some threads may need to iterate over the collection and
-  //     invoke a method on each element.  Locking the collection
-  //     while this is done is not feasible in all cases: under some
-  //     configurations the same thread that is iterating over the
-  //     collection may need to make changes.
-  //   + A recursive lock does not solve the concurrency problems
-  //     correctly because in the common case we don't want to stop
-  //     other threads from doing the same iteration, and changes to
-  //     the collection could be very uncommon wrt dispatching over
-  //     the set of ProxyPushSuppliers.
-  //   + Using a reader-write lock with upgrades does not solve the
-  //     problem either: upgrading the lock can fail and still
-  //     invalidates the iterators that the thread has.
-  //   + Copying the collection to iterate over it is a good solution
-  //     for non-real-time systems, but again the copying could be
-  //     non-deterministic, and is expensive since most iterations
-  //     will not result in changes.
-  //
-  //   This class encapsulates a protocol to solve this concurrency
-  //   issues (and other minor ones).  The first solution is to delay
-  //   changes by putting them on an "operation queue", the operations
-  //   are stored as command objects in this queue and executed once
-  //   the system is quiescent (i.e. no threads are iterating over the
-  //   collection).
-  //   This solves the major problems, but there are other issues to
-  //   be addressed:
-  //   + How do we ensure that the operations are eventually executed?
-  //   + How do we simplify the execution of the locking protocol for
-  //   clients of this class?
-  //   + How do we minimize overhead for single threaded execution?
-  //   + How do we minimize the overhead for the cases where the
-  //     threads dispatching events don't post changes to the
-  //     collection?
-  //
-  // = VARIANTS
-  //
-  //   We identify several sources of variation:
-  //
-  //   + Immediate changes without delay (only locking). This is only
-  //     useful in configurations where a separate thread dispatches
-  //     the events, and thus, can only be used with real locks.
-  //     The busy()/idle() methods use a read acquire/release, the
-  //     connected()/disconnected() methods use a write
-  //     acquire/release. We can either use RW or regular mutexes.
-  //     IMPLEMENTATION: a derived class with strategized locking
-  //     (ACE_Lock? or templates?).
-  //
-  //   + Copying data for iteration:
-  //     Can use a regular mutex (as in the previous case), or even a
-  //     null lock.
-  //     @@ Must stablish if there is a simple way to encapsulate this
-  //     in the Set class, as opposed to the clients of the class.
-  //     @@ The implementation is essentially the same as above, but
-  //     the clients must make the copy.
-  //     IMPLEMENTATION: As above.
-  //
-  //   + Delayed operations:
-  //     Only makes sense if the thread dispatching is the same thread
-  //     where the upcalls run.
-  //     Can require regular locks or null locks (for ST
-  //     implementations); notice that this will require templates
-  //     to parametrize the mutexes and condition variables.
-  //     There are two main variations:
-  //
-  //     - An upcall can result in new dispatches: in this case we
-  //       have to keep track of a the list of current threads using
-  //       a Set, to avoid dead-locks.
-  //       IMPLEMENTATION: the design is not complete, probably
-  //       similar to the next one.
-  //
-  //     - Otherwise we just need to control the concurrency using the
-  //       algorithm described below.
-  //       IMPLEMENTATION: a derived parametric class (the arguments
-  //       are the types of locks).
-  //
-  // = DELAYED OPERATIONS AND CONCURRENCY
-  //
-  //   The algorithm proposed so far is:
-  //   - If a thread is using the set then it increases the busy
-  //     count, this is done by calling the busy() method. Once the
-  //     thread has stopped using the collection the idle() method is
-  //     invoked and the busy count is decreased.
-  //     A helper class (Busy_Lock) is used to hide this protocol
-  //     behind the familiar GUARD idiom.
-  //   - If the busy count reaches the busy_hwm then the thread must
-  //     wait until the count reaches 0 again.
-  //     This can be used to control the maximum concurrency in the
-  //     EC, matching it (for example) with the number of
-  //     processors. Setting the concurrency to a high value (say one
-  //     million) allows for an arbitrary number of threads to execute
-  //     concurrently.
-  //  - If a modification is posted to the collection we need to
-  //    execute it at some point.
-  //    Just using the busy_hwm would not work, the HWM may not be
-  //    reached ever, so another form of control is needed.
-  //    Instead we use another counter, that keeps track of how many
-  //    threads have used the set since the modification was
-  //    posted. If this number of threads reaches max_write_delay then
-  //    we don't allow any more threads to go in, eventually the
-  //    thread count reaches 0 and we can proceed with the operations.
-  //
-  //  - There is one aspect of concurrency that can be problematic: if
-  //    thread pushes events as part of an upcall then the same thread
-  //    could be counted twice, we need to keep track of the threads
-  //    that are dispatching events and not increase (or decrease) the
-  //    reference count when a thread iterates twice over the same
-  //    set.
-  //
-  // = MEMORY MANAGMENT
-  //   It assumes ownership of the ProxyPushSuppliers added to the
-  //   collection: simply by increasing their reference count.
-  //
-  // = LOCKING
-  //   Locking is provided by derived classes.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_ProxyPushSupplier_Set (void);
-  // Constructor.
-
-  virtual ~TAO_EC_ProxyPushSupplier_Set (void);
-  // Destructor.
-
-  typedef ACE_Unbounded_Set<TAO_EC_ProxyPushSupplier*> SupplierSet;
-  typedef ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushSupplier*> SupplierSetIterator;
-  // The actual implementation of the collection, notice that only
-  // iteration is exposed, methods to insert and remove objects are
-  // hidden behind proper interfaces.
-
-  SupplierSetIterator begin (void);
-  SupplierSetIterator end (void);
-  // Iterators over the set of ProxyPushSuppliers
-  // Remember that all clients of this class must call busy() before
-  // starting an iteration and call idle() once the iteration is
-  // finished.  Otherwise the iterators may be invalidated by other
-  // threads.
-  // A helper object (the busy_lock) is provided to simplify this task
-  // and make it exception safe.
-
-  typedef TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> Busy_Lock;
-  Busy_Lock& busy_lock (void);
-  // This object is an adapter to the busy/idle protocol.
-
-  void busy_hwm (CORBA::ULong hwm);
-  CORBA::ULong busy_hwm (void) const;
-  void max_write_delay (CORBA::ULong hwm);
-  CORBA::ULong max_write_delay (void) const;
-  // This two attributes control the maximum number of concurrent
-  // readers allowed in the set (busy_hwm) and the maximum number of
-  // threads that can proceed after there is a modification posted.
-
-  virtual int busy (void) = 0;
-  virtual int idle (void) = 0;
-  // The implementation of this methods is provided by derived
-  // classes, that provide appropiate locking.
-
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&) = 0;
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&) = 0;
-  // Used to inform the EC that a Supplier has connected or
-  // disconnected from it.
-
-  virtual void shutdown (CORBA::Environment&) = 0;
-  // The EC is shutting down, release all our resources
-
-protected:
-  virtual void connected_i (TAO_EC_ProxyPushSupplier* supplier,
-                            CORBA::Environment &env);
-  // The implementation of connected(), without locking.
-  // It does not increase the reference count on the supplier
-
-  virtual void disconnected_i (TAO_EC_ProxyPushSupplier* supplier,
-                               CORBA::Environment &env);
-  // The implementation of disconnected(), without locking.
-  // It decreases the reference count on the supplier if the operation
-  // is successful.
-
-  virtual void shutdown_i (CORBA::Environment& env);
-  // Implement the shutdown method, assuming the right locks are
-  // acquired by the base class.
-
-  typedef TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> Connected_Command;
-  typedef TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier> Disconnected_Command;
-  typedef TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set> Shutdown_Command;
-
-  friend class TAO_EC_Connected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-  friend class TAO_EC_Disconnected_Command<TAO_EC_ProxyPushSupplier_Set,TAO_EC_ProxyPushSupplier>;
-  friend class TAO_EC_Shutdown_Command<TAO_EC_ProxyPushSupplier_Set>;
-  // This classes call the connected_i(), disconnected_i() and
-  // shutdown_i() methods, that's ok because they do while this class
-  // is holding its lock.
-
-  virtual void execute_delayed_operations (void);
-  // Derived classes that implement delayed disconnects and connects
-  // must override this method.
-
-protected:
-  SupplierSet all_suppliers_;
-  // The collection of ProxyPushSupplier objects.
-
-  TAO_EC_Busy_Lock_Adapter<TAO_EC_ProxyPushSupplier_Set> busy_lock_;
-  // The busy lock object
-
-private:
-  CORBA::ULong busy_hwm_;
-  CORBA::ULong max_write_delay_;
-  // Control variables for the concurrency policies.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_ProxyPushSupplier_Set.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_PROXYPUSHSUPPLIER_SET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i
deleted file mode 100644
index dda5992d8a4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_EC_ProxyPushSupplier_Set::SupplierSetIterator
-TAO_EC_ProxyPushSupplier_Set::begin (void)
-{
-  return this->all_suppliers_.begin ();
-}
-
-ACE_INLINE TAO_EC_ProxyPushSupplier_Set::SupplierSetIterator
-TAO_EC_ProxyPushSupplier_Set::end (void)
-{
-  return this->all_suppliers_.end ();
-}
-
-ACE_INLINE void
-TAO_EC_ProxyPushSupplier_Set::busy_hwm (CORBA::ULong hwm)
-{
-  this->busy_hwm_ = hwm;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_EC_ProxyPushSupplier_Set::busy_hwm (void) const
-{
-  return this->busy_hwm_;
-}
-
-ACE_INLINE void
-TAO_EC_ProxyPushSupplier_Set::max_write_delay (CORBA::ULong mwd)
-{
-  this->max_write_delay_ = mwd;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_EC_ProxyPushSupplier_Set::max_write_delay (void) const
-{
-  return this->max_write_delay_;
-}
-
-ACE_INLINE TAO_EC_ProxyPushSupplier_Set::Busy_Lock&
-TAO_EC_ProxyPushSupplier_Set::busy_lock (void)
-{
-  return this->busy_lock_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp
deleted file mode 100644
index 0b832320644..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// $Id$
-
-#ifndef TAO_EC_PROXYPUSHSUPPLIER_SET_T_CPP
-#define TAO_EC_PROXYPUSHSUPPLIER_SET_T_CPP
-
-#include "EC_ProxyPushSupplier_Set_T.h"
-#include "EC_Command.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_ProxyPushSupplier_Set_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_ProxyPushSupplier_Set_T, "$Id$")
-
-template<class ACE_LOCK>int
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::busy (void)
-{
-  return this->lock_.acquire_read ();
-}
-
-template<class ACE_LOCK> int
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::idle (void)
-{
-  return this->lock_.release ();
-}
-
-template<class ACE_LOCK> void
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::connected (
-      TAO_EC_ProxyPushSupplier* supplier,
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  supplier->_incr_refcnt ();
-  this->connected_i (supplier, ACE_TRY_ENV);
-}
-
-template<class ACE_LOCK> void
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::disconnected (
-      TAO_EC_ProxyPushSupplier* supplier,
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  this->disconnected_i (supplier, ACE_TRY_ENV);
-}
-
-template<class ACE_LOCK> void
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::shutdown (
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_LOCK, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-  this->shutdown_i (ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-template<ACE_SYNCH_DECL>int
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::busy (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
-
-  while (this->busy_count_ >= this->busy_hwm ()
-         || this->write_delay_ >= this->max_write_delay ())
-    this->busy_cond_.wait ();
-  this->busy_count_++;
-
-  return 0;
-}
-
-template<ACE_SYNCH_DECL> int
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::idle (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_, -1);
-
-  this->busy_count_--;
-  if (this->busy_count_ == 0)
-    {
-      this->write_delay_ = 0;
-      this->execute_delayed_operations ();
-      this->busy_cond_.broadcast ();
-    }
-  return 0;
-}
-
-template<ACE_SYNCH_DECL> void
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::connected (
-      TAO_EC_ProxyPushSupplier* supplier,
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  if (this->busy_count_ == 0)
-    {
-      // We can add the object immediately
-      supplier->_incr_refcnt ();
-      this->connected_i (supplier, ACE_TRY_ENV);
-    }
-  else
-    {
-      supplier->_incr_refcnt ();
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               TAO_EC_ProxyPushSupplier_Set::Connected_Command (this,
-                                                        supplier));
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_++;
-    }
-}
-
-template<ACE_SYNCH_DECL> void
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::disconnected (
-      TAO_EC_ProxyPushSupplier* supplier,
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  if (this->busy_count_ == 0)
-    {
-      // We can remove the object immediately
-      this->disconnected_i (supplier, ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               TAO_EC_ProxyPushSupplier_Set::Disconnected_Command (this,
-                                                           supplier));
-
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_++;
-    }
-}
-
-template<ACE_SYNCH_DECL> void
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::shutdown (
-      CORBA::Environment& ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_SYNCH_MUTEX_T, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  if (this->busy_count_ == 0)
-    {
-      // We can remove the object immediately
-      this->shutdown_i (ACE_TRY_ENV);
-    }
-  else
-    {
-      ACE_Command_Base* command;
-      ACE_NEW (command,
-               TAO_EC_ProxyPushSupplier_Set::Shutdown_Command (this));
-      ACE_DEBUG ((LM_DEBUG,
-                  "EC (%P|%t) Delayed shutdown command = %x\n",
-                  command));
-
-      this->command_queue_.enqueue_tail (command);
-      this->write_delay_++;
-    }
-}
-
-template<ACE_SYNCH_DECL> void
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::execute_delayed_operations (void)
-{
-  // LOCKING: the lock is taken by the idle() function
-  while (!this->command_queue_.is_empty ())
-    {
-      ACE_Command_Base* command;
-      this->command_queue_.dequeue_head (command);
-
-      command->execute ();
-
-      delete command;
-    }
-}
-
-#endif /* TAO_EC_PROXYPUSHSUPPLIER_SET_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h
deleted file mode 100644
index 6da089b3396..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_ProxyPushSupplier_Set_T
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-// ============================================================================
-
-#ifndef TAO_EC_PROXYPUSHSUPPLIER_SET_T_H
-#define TAO_EC_PROXYPUSHSUPPLIER_SET_T_H
-
-#include "EC_ProxyPushSupplier_Set.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template<class ACE_LOCK>
-class TAO_EC_ProxyPushSupplier_Set_Immediate : public TAO_EC_ProxyPushSupplier_Set
-{
-  // = TITLE
-  //   ProxyPushSupplier_Set_Immediate
-  //
-  // = DESCRIPTION
-  //   A concrete implementation of EC_ProxyPushSupplier_Set that
-  //   propagate changes to the set immediately.
-  //
-  // = LOCKING
-  //   Uses parametric types to provide locking.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_ProxyPushSupplier_Set_Immediate (void);
-  // Constructor.
-
-  // = Read the descriptions in EC_ProxyPushSupplier_Set
-  virtual int busy (void);
-  virtual int idle (void);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  virtual void shutdown (CORBA::Environment&);
-
-private:
-  ACE_LOCK lock_;
-  // The lock.
-};
-
-// ****************************************************************
-
-template<ACE_SYNCH_DECL>
-class TAO_EC_ProxyPushSupplier_Set_Delayed : public TAO_EC_ProxyPushSupplier_Set
-{
-  // = TITLE
-  //   ProxyPushSupplier_Set_Delayed
-  //
-  // = DESCRIPTION
-  //   A concrete implementation of EC_ProxyPushSupplier_Set that
-  //   delays changes to the set until no threads are using the set.
-  //
-  // = LOCKING
-  //   Uses parametric types to provide locking.
-  //
-  // = TODO
-  //
-public:
-  TAO_EC_ProxyPushSupplier_Set_Delayed (void);
-  // Constructor.
-
-  // = Read the descriptions in EC_ProxyPushSupplier_Set
-  virtual int busy (void);
-  virtual int idle (void);
-  virtual void connected (TAO_EC_ProxyPushSupplier*,
-                          CORBA::Environment&);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier*,
-                             CORBA::Environment&);
-  virtual void shutdown (CORBA::Environment&);
-
-protected:
-  virtual void execute_delayed_operations (void);
-
-private:
-  ACE_SYNCH_MUTEX_T lock_;
-  // The lock.
-
-  ACE_SYNCH_CONDITION_T busy_cond_;
-  // A condition variable to wait while the object is too busy.
-
-  CORBA::ULong busy_count_;
-  // Keep track of the number of threads using the set
-
-  CORBA::ULong write_delay_;
-  // Keep track of the number of threads that have used the set since
-  // the last change was posted.
-
-  ACE_Unbounded_Queue<ACE_Command_Base*> command_queue_;
-  // The commands that carry the delayed operations are enqueued
-  // here.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_ProxyPushSupplier_Set_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "EC_ProxyPushSupplier_Set_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("EC_ProxyPushSupplier_Set_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_EC_PROXYPUSHSUPPLIER_SET_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.i
deleted file mode 100644
index f65b57d2cc7..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set_T.i
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-template<class ACE_LOCK> ACE_INLINE
-TAO_EC_ProxyPushSupplier_Set_Immediate<ACE_LOCK>::
-       TAO_EC_ProxyPushSupplier_Set_Immediate (void)
-{
-}
-
-// ****************************************************************
-
-template<ACE_SYNCH_DECL> ACE_INLINE
-TAO_EC_ProxyPushSupplier_Set_Delayed<ACE_SYNCH_USE>::
-       TAO_EC_ProxyPushSupplier_Set_Delayed (void)
- :  busy_cond_ (lock_),
-    busy_count_ (0),
-    write_delay_ (0)
-{
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index bbc4163bf0c..2af0a1838b4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -3,7 +3,6 @@
 #include "EC_ProxySupplier.h"
 #include "EC_Dispatching.h"
 #include "EC_Filter_Builder.h"
-#include "EC_QOS_Info.h"
 #include "EC_Event_Channel.h"
 
 #if ! defined (__ACE_INLINE__)
@@ -12,19 +11,11 @@
 
 ACE_RCSID(Event, EC_ProxySupplier, "$Id$")
 
-typedef ACE_Reverse_Lock<ACE_Lock> TAO_EC_Unlock;
-
 TAO_EC_ProxyPushSupplier::TAO_EC_ProxyPushSupplier (TAO_EC_Event_Channel* ec)
-  : event_channel_ (ec),
-    refcount_ (1),
-    suspended_ (0),
-    child_ (0)
+  : event_channel_ (ec)
 {
-  this->lock_ =
+  this->lock_ = 
     this->event_channel_->create_supplier_lock ();
-
-  this->default_POA_ =
-    this->event_channel_->supplier_poa ();
 }
 
 TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
@@ -33,101 +24,48 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void)
 }
 
 void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer*,
-                                     CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::set_default_POA (PortableServer::POA_ptr poa)
 {
+  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
+  this->default_POA_ = PortableServer::POA::_duplicate (poa);
 }
 
-void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*,
-                                        CORBA::Environment &)
+PortableServer::POA_ptr
+TAO_EC_ProxyPushSupplier::_default_POA_i ()
 {
+  return PortableServer::POA::_duplicate (this->default_POA_);
 }
 
-void
-TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*,
-                                     CORBA::Environment &)
+PortableServer::POA_ptr
+TAO_EC_ProxyPushSupplier::_default_POA (CORBA::Environment&)
 {
+  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_,
+                    PortableServer::POA::_nil ());
+  return this->_default_POA_i ();
 }
 
 void
-TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*,
-                                        CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer*,
+                                     CORBA::Environment &)
 {
 }
 
 void
-TAO_EC_ProxyPushSupplier::shutdown (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer*,
+                                        CORBA::Environment &)
 {
-  RtecEventComm::PushConsumer_var consumer;
-
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i () == 0)
-      return;
-
-    consumer = this->consumer_._retn ();
-
-    this->cleanup_i ();
-  }
-
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  consumer->disconnect_push_consumer (ACE_TRY_ENV);
-
-  this->_decr_refcnt ();
 }
 
 void
-TAO_EC_ProxyPushSupplier::cleanup_i (void)
+TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier*,
+                                     CORBA::Environment &)
 {
-  this->consumer_ =
-    RtecEventComm::PushConsumer::_nil ();
-
-  // @@ Why don't we have a destroy() method in the
-  // filter_builder?
-  delete this->child_;
-  this->child_ = 0;
 }
 
 void
-TAO_EC_ProxyPushSupplier::deactivate (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::ULong
-TAO_EC_ProxyPushSupplier::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_EC_ProxyPushSupplier::_decr_refcnt (void)
+TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier*,
+                                        CORBA::Environment &)
 {
-  {
-    ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  // Notify the event channel
-  this->event_channel_->destroy_proxy_push_supplier (this);
-  return 0;
 }
 
 void
@@ -136,64 +74,20 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer (
       const RtecEventChannelAdmin::ConsumerQOS& qos,
       CORBA::Environment &ACE_TRY_ENV)
 {
-  {
-    ACE_GUARD_THROW_EX (
-        ACE_Lock, ace_mon, *this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    if (this->is_connected_i ())
-      {
-        if (this->event_channel_->consumer_reconnect () == 0)
-          ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
-
-        // Re-connections are allowed, go ahead and disconnect the
-        // consumer...
-        this->cleanup_i ();
-
-        // @@ Are there any race conditions here:
-        //   + The lock is released, but the object is marked as
-        //     disconnected already, so:
-        //     - No events will be pushed
-        //     - Any disconnects will just return
-        //   + But another thread could invoke connect_push_consumer()
-        //     again, notice that by the time the lock is acquired
-        //     again the connected() call may still be running.
-        //     It seems like we need delayed operations again, or
-        //     something similar to what the POA does in this
-        //     scenario.
-        //     Meanwhile we can tell the users: "if it hurts don't do
-        //     it".
-        //
-        TAO_EC_Unlock reverse_lock (*this->lock_);
-
-        {
-          ACE_GUARD_THROW_EX (
-              TAO_EC_Unlock, ace_mon, reverse_lock,
-              RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-          ACE_CHECK;
-
-          this->event_channel_->disconnected (this, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-
-        // What if a second thread connected us after this?
-        if (this->is_connected_i ())
-          return;
-      }
+  ACE_GUARD_THROW (
+            ACE_Lock, ace_mon, *this->lock_,
+            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
 
-    this->consumer_ =
-      RtecEventComm::PushConsumer::_duplicate (push_consumer);
-    this->qos_ = qos;
+  if (this->is_connected_i ())
+    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected ());
 
-    this->child_ =
-      this->event_channel_->filter_builder ()->build (this,
-                                                      this->qos_,
-                                                      ACE_TRY_ENV);
-    ACE_CHECK;
+  this->consumer_ =
+    RtecEventComm::PushConsumer::_duplicate (push_consumer);
+  this->qos_ = qos;
 
-    this->adopt_child (this->child_);
-  }
+  this->child_ =
+    this->event_channel_->filter_builder ()->build (this->qos_);
+  this->adopt_child (this->child_);
 
   // Notify the event channel...
   this->event_channel_->connected (this, ACE_TRY_ENV);
@@ -204,44 +98,40 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier (
       CORBA::Environment &ACE_TRY_ENV)
 {
   {
-    ACE_GUARD_THROW_EX (
+    ACE_GUARD_THROW (
         ACE_Lock, ace_mon, *this->lock_,
         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
+    
+    this->consumer_ =
+    RtecEventComm::PushConsumer::_nil ();
 
-    if (this->is_connected_i () == 0)
-      ACE_THROW (CORBA::BAD_INV_ORDER ());
+    PortableServer::POA_var poa =
+      this->_default_POA_i ();
 
-    this->cleanup_i ();
+    PortableServer::ObjectId_var id =
+      poa->servant_to_id (this, ACE_TRY_ENV);
+    ACE_CHECK;
+    poa->deactivate_object (id.in (), ACE_TRY_ENV);
+    ACE_CHECK;
   }
-
-  this->deactivate (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Notify the event channel....
-  this->event_channel_->disconnected (this, ACE_TRY_ENV);
-
-  this->_decr_refcnt ();
+  this->event_channel_->destroy_proxy_push_supplier (this);
 }
 
 void
 TAO_EC_ProxyPushSupplier::suspend_connection (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
+  ACE_GUARD_THROW (
             ACE_Lock, ace_mon, *this->lock_,
             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
   this->suspended_ = 1;
 }
 
 void
 TAO_EC_ProxyPushSupplier::resume_connection (CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
+  ACE_GUARD_THROW (
             ACE_Lock, ace_mon, *this->lock_,
             RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
 
   this->suspended_ = 0;
 }
@@ -251,25 +141,12 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event,
                                   TAO_EC_QOS_Info& qos_info,
                                   CORBA::Environment& ACE_TRY_ENV)
 {
-  int result = 0;
-
-  {
-    ACE_GUARD_THROW_EX (
+  ACE_GUARD_THROW_RETURN (
             ACE_Lock, ace_mon, *this->lock_,
-            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
-
-    if (this->is_connected_i () == 0)
-      return 0;
-
-    result =
-      this->child_->filter (event, qos_info, ACE_TRY_ENV);
-    if (this->refcount_ > 0)
-      return result;
-  }
+            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR (),
+            0);
 
-  this->event_channel_->destroy_proxy_push_supplier (this);
-  return result;
+  return this->child_->filter (event, qos_info, ACE_TRY_ENV);
 }
 
 int
@@ -277,25 +154,12 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event,
                                          TAO_EC_QOS_Info& qos_info,
                                          CORBA::Environment& ACE_TRY_ENV)
 {
-  int result = 0;
-
-  {
-    ACE_GUARD_THROW_EX (
+  ACE_GUARD_THROW_RETURN (
             ACE_Lock, ace_mon, *this->lock_,
-            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK_RETURN (0);
+            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR (),
+            0);
 
-    if (this->is_connected_i () == 0)
-      return 0;
-
-    result =
-      this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
-    if (this->refcount_ > 0)
-      return result;
-  }
-
-  this->event_channel_->destroy_proxy_push_supplier (this);
-  return result;
+  return this->child_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
 }
 
 void
@@ -303,15 +167,14 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event,
                                 TAO_EC_QOS_Info& qos_info,
                                 CORBA::Environment& ACE_TRY_ENV)
 {
-  // No need to grab the lock, it is beign held already by the
-  // filter() method
-  this->refcount_++;
+  // Do not take a lock, this is a call back from our child filter, so 
+  // we are holding the lock already (in the filter() method).
   this->event_channel_->dispatching ()->push (this,
+                                              this->consumer_,
                                               event,
                                               qos_info,
                                               ACE_TRY_ENV);
-  if (this->child_ != 0)
-    this->child_->clear ();
+  this->child_->clear ();
 }
 
 void
@@ -319,103 +182,14 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event,
                                        TAO_EC_QOS_Info& qos_info,
                                        CORBA::Environment& ACE_TRY_ENV)
 {
-  // No need to grab the lock, it is beign held already by the
-  // filter() method
-  this->refcount_++;
+  // Do not take a lock, this is a call back from our child filter, so 
+  // we are holding the lock already (in the filter() method).
   this->event_channel_->dispatching ()->push_nocopy (this,
+                                                     this->consumer_,
                                                      event,
                                                      qos_info,
                                                      ACE_TRY_ENV);
-  if (this->child_ != 0)
-    this->child_->clear ();
-}
-
-void
-TAO_EC_ProxyPushSupplier::push_to_consumer (const RtecEventComm::EventSet& event,
-                                            CORBA::Environment& ACE_TRY_ENV)
-{
-  RtecEventComm::PushConsumer_var consumer;
-  {
-    ACE_GUARD_THROW_EX (
-            ACE_Lock, ace_mon, *this->lock_,
-            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    // The reference count was increased just before pushing to the
-    // dispatching module, we must decrease here.  But if we get
-    // removed then we abort.  We don't want to call _decr_refcnt()
-    // because that will require two locks.
-    this->refcount_--;
-    if (this->refcount_ == 0)
-      {
-        ace_mon.release ();
-        this->event_channel_->destroy_proxy_push_supplier (this);
-        return;
-      }
-
-    if (this->is_connected_i () == 0)
-      return; // ACE_THROW (RtecEventComm::Disconnected ());????
-
-    if (this->suspended_ != 0)
-      return;
-
-    consumer =
-      RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
-
-    // The refcount cannot be zero, because we have at least two
-    // references,
-  }
-
-  consumer->push (event, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_ProxyPushSupplier::reactive_push_to_consumer (
-    const RtecEventComm::EventSet& event,
-    CORBA::Environment& ACE_TRY_ENV)
-{
-  if (this->is_connected_i () == 0)
-    return; // TAO_THROW (RtecEventComm::Disconnected ());????
-
-  if (this->suspended_ != 0)
-    return;
-
-  RtecEventComm::PushConsumer_var consumer =
-    RtecEventComm::PushConsumer::_duplicate (this->consumer_.in ());
-
-  {
-    TAO_EC_Unlock reverse_lock (*this->lock_);
-
-    ACE_GUARD_THROW_EX (TAO_EC_Unlock, ace_mon, reverse_lock,
-                        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-    consumer->push (event, ACE_TRY_ENV);
-  }
-
-  // The reference count was incremented just before delegating on the
-  // dispatching strategy, in this can we need to decrement it *now*.
-  this->refcount_--;
-}
-
-void
-TAO_EC_ProxyPushSupplier::push_timeout (
-    TAO_EC_Filter* timeout_filter,
-    const RtecEventComm::EventSet &event,
-    TAO_EC_QOS_Info& qos_info,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  {
-    ACE_GUARD_THROW_EX (
-          ACE_Lock, ace_mon, *this->lock_,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-    ACE_CHECK;
-
-    timeout_filter->push (event, qos_info, ACE_TRY_ENV);
-    if (this->refcount_ > 0)
-      return;
-  }
-
-  this->event_channel_->destroy_proxy_push_supplier (this);
+  this->child_->clear ();
 }
 
 void
@@ -434,54 +208,11 @@ TAO_EC_ProxyPushSupplier::max_event_size (void) const
   return this->child_->max_event_size ();
 }
 
-int
-TAO_EC_ProxyPushSupplier::can_match (
-      const RtecEventComm::EventHeader &header) const
-{
-  ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
-
-  if (this->is_connected_i () == 0)
-    return 0;
-
-  return this->child_->can_match (header);
-}
-
-int
-TAO_EC_ProxyPushSupplier::add_dependencies (
-      const RtecEventComm::EventHeader &header,
-      const TAO_EC_QOS_Info &qos_info,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (
-          ACE_Lock, ace_mon, *this->lock_,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK_RETURN (0);
-
-  return this->child_->add_dependencies (header,
-                                         qos_info,
-                                         ACE_TRY_ENV);
-}
-
-PortableServer::POA_ptr
-TAO_EC_ProxyPushSupplier::_default_POA (CORBA::Environment&)
-{
-  return PortableServer::POA::_duplicate (this->default_POA_.in ());
-}
-
 void
-TAO_EC_ProxyPushSupplier::_add_ref (CORBA::Environment &)
+TAO_EC_ProxyPushSupplier::event_ids (TAO_EC_Filter::Headers& headerset)
 {
-  this->_incr_refcnt ();
-}
+  ACE_GUARD (ACE_Lock, ace_mon, *this->lock_);
 
-void
-TAO_EC_ProxyPushSupplier::_remove_ref (CORBA::Environment &)
-{
-  this->_decr_refcnt ();
+  // @@ TODO cache this result....
+  this->child_->event_ids (headerset);
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index fc79092b87f..711cb49728f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -12,6 +12,12 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Implement the RtecEventChannelAdmin::ProxyPushSupplier interface,
+//   remember that this class is used to communicate with a
+//   PushConsumer, so, in effect, this is the ambassador for a
+//   consumer inside the event channel.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -35,24 +41,23 @@
 class TAO_EC_Event_Channel;
 class TAO_EC_ProxyPushConsumer;
 
-class TAO_ORBSVCS_Export TAO_EC_ProxyPushSupplier : public POA_RtecEventChannelAdmin::ProxyPushSupplier, public TAO_EC_Filter
+class TAO_EC_ProxyPushSupplier : public POA_RtecEventChannelAdmin::ProxyPushSupplier, public TAO_EC_Filter
 {
   // = TITLE
   //   ProxyPushSupplier
   //
   // = DESCRIPTION
-  //   Implement the RtecEventChannelAdmin::ProxyPushSupplier interface,
-  //   remember that this class is used to communicate with a
-  //   PushConsumer, so, in effect, this is the ambassador for a
-  //   consumer inside the event channel.
+  //   Implements the ProxyPushSupplier interface, i.e. the object
+  //   used to communicate with a particular consumer.
   //
   // = MEMORY MANAGMENT
+  //   This object will be reference counted.
   //   It does not assume ownership of the TAO_EC_Dispatching object.
   //   It makes a copy of the ConsumerQOS and the consumer object
   //   reference.
   //
   // = LOCKING
-  //   Locking is strategized, the event channel acts as a factory for
+  //   Locking is strategized, the event channel acts as a factory for 
   //   the locking strategies.
   //
   // = TODO
@@ -83,48 +88,34 @@ public:
   // The QoS (subscription) used to connect to the EC.
 
   virtual void connected (TAO_EC_ProxyPushConsumer* consumer,
-                          CORBA::Environment &env);
+			  CORBA::Environment &env);
   virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer,
-                             CORBA::Environment &env);
+			     CORBA::Environment &env);
   // Concrete implementations can use this methods to keep track of
   // the suppliers that publish its events.
 
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
+			  CORBA::Environment &env);
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
+			     CORBA::Environment &env);
   // Usually implemented as no-ops, but some configurations may
   // require this methods.
 
-  virtual void shutdown (CORBA::Environment &env);
-  // The event channel is shutting down
-
-  void push_to_consumer (const RtecEventComm::EventSet &event,
-                         CORBA::Environment &env);
-  void reactive_push_to_consumer (const RtecEventComm::EventSet &event,
-                                  CORBA::Environment &env);
-  // Pushes to the consumer, verifies that it is connected and that it
-  // is not suspended.
+  void set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
 
-  void push_timeout (TAO_EC_Filter* timeout_filter,
-                     const RtecEventComm::EventSet &event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment &env);
-  // Callback from the timeout filters
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
+  // Override the ServantBase method.
 
   // = The RtecEventChannelAdmin::ProxyPushSupplier methods...
   virtual void connect_push_consumer (
-                RtecEventComm::PushConsumer_ptr push_consumer,
+		RtecEventComm::PushConsumer_ptr push_consumer,
                 const RtecEventChannelAdmin::ConsumerQOS& qos,
                 CORBA::Environment &);
   virtual void disconnect_push_supplier (CORBA::Environment &);
   virtual void suspend_connection (CORBA::Environment &);
   virtual void resume_connection (CORBA::Environment &);
 
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-  // Increment and decrement the reference count.
-
   // = The TAO_EC_Filter methods, only push() is implemented...
   virtual int filter (const RtecEventComm::EventSet& event,
                       TAO_EC_QOS_Info& qos_info,
@@ -140,27 +131,14 @@ public:
                             CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader &header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
-
-  // = The Servant methods
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV =
-                             CORBA::default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV =
-                                CORBA::default_environment ());
+  virtual void event_ids (TAO_EC_Filter::Headers& headerset);
 
 private:
   CORBA::Boolean is_connected_i (void) const;
   // The private version (without locking) of is_connected().
 
-  void cleanup_i (void);
-  // Release the child and the consumer
-
-  void deactivate (CORBA::Environment &ACE_TRY_ENV);
-  // Deactivate from the POA
+  PortableServer::POA_ptr _default_POA_i ();
+  // The private version (without locking) of _default_POA_i ().
 
 private:
   TAO_EC_Event_Channel* event_channel_;
@@ -169,9 +147,6 @@ private:
   ACE_Lock* lock_;
   // The locking strategy.
 
-  CORBA::ULong refcount_;
-  // The reference count.
-
   RtecEventComm::PushConsumer_var consumer_;
   // The consumer....
 
@@ -184,8 +159,8 @@ private:
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 
+private:
   TAO_EC_Filter* child_;
-  // The filter object
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
index c72e7ca8d45..bc572a336d2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
@@ -27,7 +27,7 @@ TAO_EC_ProxyPushSupplier::consumer (void) const
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->lock_, 0);
 
-  return this->consumer_.in ();
+  return this->consumer_;
 }
 
 ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS&
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index a5597b40d3d..d9c1ad87fc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Filters compute QOS information for real-time dispatching, this
+//   class encapsulates that information.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -24,29 +28,25 @@
 #ifndef TAO_EC_QOS_INFO_H
 #define TAO_EC_QOS_INFO_H
 
-#include "orbsvcs/RtecSchedulerC.h"
+#include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_EC_QOS_Info
+class TAO_EC_QOS_Info
 {
   // = TITLE
   //   A representation of QoS information for the event channel
   //   filters.
   //
   // = DESCRIPTION
-  //   Filters compute QOS information for real-time dispatching, this
-  //   class encapsulates that information.
   //   This first implementation is just a place-holder.
   //
 public:
   TAO_EC_QOS_Info (void);
   // constructor
 
-  RtecScheduler::handle_t rt_info;
-  RtecScheduler::Preemption_Priority_t preemption_priority;
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
index df63cf59ad5..2e50c43a45f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
@@ -2,7 +2,5 @@
 
 ACE_INLINE
 TAO_EC_QOS_Info::TAO_EC_QOS_Info (void)
-  :  rt_info (-1),
-     preemption_priority (0)
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
deleted file mode 100644
index 7e0fff38b55..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-#include "EC_Reactive_Timeout_Generator.h"
-#include "tao/corba.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Reactive_Timeout_Generator, "$Id$")
-
-TAO_EC_Reactive_Timeout_Generator::
-      TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor)
- : reactor_ (reactor)
-{
-  if (this->reactor_ == 0)
-    {
-      this->reactor_ = TAO_ORB_Core_instance ()->reactor ();
-    }
-}
-
-TAO_EC_Reactive_Timeout_Generator::~TAO_EC_Reactive_Timeout_Generator (void)
-{
-}
-
-void
-TAO_EC_Reactive_Timeout_Generator::activate (void)
-{
-}
-
-void
-TAO_EC_Reactive_Timeout_Generator::shutdown (void)
-{
-  this->reactor_->cancel_timer (&this->event_handler_);
-}
-
-int
-TAO_EC_Reactive_Timeout_Generator::schedule_timer (
-      TAO_EC_Timeout_Filter* filter,
-      const ACE_Time_Value& delta,
-      const ACE_Time_Value& interval)
-{
-  return this->reactor_->schedule_timer (&this->event_handler_,
-                                         ACE_static_cast(void*,filter),
-                                         delta,
-                                         interval);
-}
-
-int
-TAO_EC_Reactive_Timeout_Generator::cancel_timer (
-      const TAO_EC_QOS_Info&,
-      int id)
-{
-  const void *vp;
-
-  return this->reactor_->cancel_timer (id, &vp);
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
deleted file mode 100644
index d53a054b6ac..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Reactive_Timeout_Generator
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   A new implementation of the Real Time Event Services.
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
-#define TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H
-
-#include "EC_Timeout_Generator.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORBSVCS_Export TAO_EC_Reactive_Timeout_Generator : public TAO_EC_Timeout_Generator
-{
-  // = TITLE
-  //   A simple implementation of the Timeout_Generator based on the
-  //   Reactor.
-  //
-  // = DESCRIPTION
-  //   Implements the Timeout_Generator using an ACE_Reactor. Usually
-  //   the same reactor that is used by the ORB where the EC runs.
-  //
-public:
-  TAO_EC_Reactive_Timeout_Generator (ACE_Reactor *reactor = 0);
-  // Constructor.
-  // If <reactor> is 0 then we use the reactor in the ORB singleton.
-
-  virtual ~TAO_EC_Reactive_Timeout_Generator (void);
-  // destructor
-
-  // = The TAO_EC_Timeout_Generator methods.
-  virtual void activate (void);
-  virtual void shutdown (void);
-  virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
-                              const ACE_Time_Value& delta,
-                              const ACE_Time_Value& interval);
-  virtual int cancel_timer (const TAO_EC_QOS_Info& info,
-                            int id);
-
-private:
-  ACE_Reactor *reactor_;
-  // The reactor
-
-  TAO_EC_Timeout_Adapter event_handler_;
-  // An adapter to receive the timeout events.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Reactive_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_REACTIVE_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
deleted file mode 100644
index d5fa6eafba3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// $Id$
-
-#include "EC_Sched_Filter.h"
-#include "EC_QOS_Info.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Sched_Filter, "$Id$")
-
-TAO_EC_Sched_Filter::
-    TAO_EC_Sched_Filter (const char* name,
-                         RtecScheduler::Scheduler_ptr scheduler,
-                         TAO_EC_Filter* body,
-                         RtecScheduler::handle_t body_info,
-                         RtecScheduler::Info_Type_t info_type)
-
-  :  rt_info_ (-1),
-     name_ (name),
-     scheduler_ (RtecScheduler::Scheduler::_duplicate (scheduler)),
-     body_ (body),
-     body_info_ (body_info),
-     info_type_ (info_type)
-{
-  this->adopt_child (this->body_);
-}
-
-TAO_EC_Sched_Filter::~TAO_EC_Sched_Filter (void)
-{
-  delete this->body_;
-}
-
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Sched_Filter::begin (void) const
-{
-  return this->body_->begin ();
-}
-
-TAO_EC_Filter::ChildrenIterator
-TAO_EC_Sched_Filter::end (void) const
-{
-  return this->body_->end ();
-}
-
-int
-TAO_EC_Sched_Filter::size (void) const
-{
-  return this->body_->size ();
-}
-
-int
-TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->body_->filter (event, qos_info, ACE_TRY_ENV);
-}
-
-int
-TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event,
-                                    TAO_EC_QOS_Info& qos_info,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->body_->filter_nocopy (event, qos_info, ACE_TRY_ENV);
-}
-
-// This is private, so we can make it inline in the .cpp file...
-ACE_INLINE void
-TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  this->init_rt_info (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  qos_info.rt_info = this->rt_info_;
-  switch (this->info_type_)
-    {
-    default:
-    case RtecScheduler::DISJUNCTION:
-      break;
-
-    case RtecScheduler::CONJUNCTION:
-    case RtecScheduler::OPERATION:
-      {
-        RtecScheduler::OS_Priority os_priority;
-        RtecScheduler::Preemption_Subpriority_t p_subpriority;
-        RtecScheduler::Preemption_Priority_t p_priority;
-        this->scheduler_->priority (this->rt_info_,
-                                    os_priority,
-                                    p_subpriority,
-                                    p_priority,
-                                    ACE_TRY_ENV);
-        ACE_CHECK;
-        qos_info.preemption_priority = p_priority;
-      }
-    }
-}
-
-void
-TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event,
-                           TAO_EC_QOS_Info& qos_info,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->parent () != 0)
-    {
-      this->compute_qos_info (qos_info, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->parent ()->push (event, qos_info, ACE_TRY_ENV);
-    }
-}
-
-void
-TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event,
-                                  TAO_EC_QOS_Info& qos_info,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->parent () != 0)
-    {
-      this->compute_qos_info (qos_info, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
-    }
-}
-
-void
-TAO_EC_Sched_Filter::clear (void)
-{
-  this->body_->clear ();
-}
-
-CORBA::ULong
-TAO_EC_Sched_Filter::max_event_size (void) const
-{
-  return this->body_->max_event_size ();
-}
-
-int
-TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const
-{
-  return this->body_->can_match (header);
-}
-
-int
-TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header,
-                                       const TAO_EC_QOS_Info &qos_info,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  this->init_rt_info (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  int matches = this->body_->add_dependencies (header,
-                                               qos_info,
-                                               ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  if (matches != 0)
-    this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1,
-                                      RtecScheduler::TWO_WAY_CALL,
-                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ChildrenIterator end = this->end ();
-  for (ChildrenIterator i = this->begin (); i != end; ++i)
-    {
-      (*i)->add_dependencies (header, qos_info, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  return 0;
-}
-
-void
-TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->init_rt_info (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  qos_info.rt_info = this->rt_info_;
-}
-
-void
-TAO_EC_Sched_Filter::init_rt_info (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->rt_info_ != -1)
-    return;
-
-  // Create an entry in the Scheduling service...
-  RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (this->name_.c_str (),
-                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Provide dummy values the scheduler will compute them based on the
-  // dependencies and the fact that this is a DISJUNCTION.
-  this->scheduler_->set (rt_info,
-                         RtecScheduler::VERY_LOW_CRITICALITY,
-                         0, // worst_cast_execution_time
-                         0, // typical_cast_execution_time
-                         0, // cached_cast_execution_time
-                         0, // period
-                         RtecScheduler::VERY_LOW_IMPORTANCE,
-                         0, // quantum
-                         0, // threads
-                         this->info_type_,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ChildrenIterator end = this->end ();
-  for (ChildrenIterator i = this->begin (); i != end; ++i)
-    {
-      TAO_EC_Filter* filter = *i;
-
-      TAO_EC_QOS_Info child;
-      filter->get_qos_info (child, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->scheduler_->add_dependency (rt_info, child.rt_info, 1,
-                                        RtecScheduler::TWO_WAY_CALL,
-                                        ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  this->scheduler_->add_dependency (this->body_info_, rt_info, 1,
-                                    RtecScheduler::TWO_WAY_CALL,
-                                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->rt_info_ = rt_info;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
deleted file mode 100644
index 8779eda1d55..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Sched_Filter
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_SCHED_FILTER_H
-#define TAO_EC_SCHED_FILTER_H
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "EC_Filter.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_ORBSVCS_Export TAO_EC_Sched_Filter : public TAO_EC_Filter
-{
-  // = TITLE
-  //   Decorate a filter with scheduling information
-  //
-  // = DESCRIPTION
-  //   This filter decorates a regular filter with scheduling
-  //   information. It creates a new RT_Info entry for the filter and
-  //   it adds the dependencies between the filter and any childrens
-  //   it may have.
-  //
-  // = MEMORY MANAGMENT
-  //   It assumes ownership of the children.
-  //
-public:
-  TAO_EC_Sched_Filter (const char* name,
-                       RtecScheduler::Scheduler_ptr scheduler,
-                       TAO_EC_Filter* body,
-                       RtecScheduler::handle_t body_info,
-                       RtecScheduler::Info_Type_t info_type);
-  // Constructor.
-  // It assumes ownership of the <body>, makes a copy of the other
-  // parameters
-
-  virtual ~TAO_EC_Sched_Filter (void);
-  // Destructor
-
-  // = The TAO_EC_Filter methods, please check the documentation in
-  // TAO_EC_Filter.
-  virtual ChildrenIterator begin (void) const;
-  virtual ChildrenIterator end (void) const;
-  virtual int size (void) const;
-  virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
-  virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
-  virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
-  virtual void get_qos_info (TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter
-                              (const TAO_EC_Sched_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter& operator=
-                              (const TAO_EC_Sched_Filter&))
-
-  void init_rt_info (CORBA::Environment& env);
-  // Initialize our RT_Info handle and dependencies
-
-  void compute_qos_info (TAO_EC_QOS_Info& qos_info,
-                         CORBA::Environment &ACE_TRY_ENV);
-  // Compute a new qos_info to push up.
-
-private:
-  RtecScheduler::handle_t rt_info_;
-  // The RT_Info handle for this object
-
-  ACE_CString name_;
-  // Our operation name
-
-  RtecScheduler::Scheduler_var scheduler_;
-  // The scheduler we are going to use
-
-  TAO_EC_Filter* body_;
-  // The implementation
-
-  RtecScheduler::handle_t body_info_;
-  // The RT_Info handle for the body
-
-  RtecScheduler::Info_Type_t info_type_;
-  // Required for the scheduling service
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Sched_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_SCHED_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
deleted file mode 100644
index 6d79ec09d64..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-#include "EC_Sched_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "EC_Sched_Filter_Builder.h"
-#include "EC_Type_Filter.h"
-#include "EC_Conjunction_Filter.h"
-#include "EC_Disjunction_Filter.h"
-#include "EC_Timeout_Filter.h"
-#include "EC_Event_Channel.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Sched_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$")
-
-TAO_EC_Sched_Filter_Builder::~TAO_EC_Sched_Filter_Builder (void)
-{
-}
-
-TAO_EC_Filter*
-TAO_EC_Sched_Filter_Builder::build (
-    TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::Environment &ACE_TRY_ENV) const
-{
-  CORBA::ULong pos = 0;
-  RtecScheduler::Scheduler_var scheduler =
-    this->event_channel_->scheduler ();
-  return this->recursive_build (supplier, qos, pos,
-                                scheduler.in (), 0,
-                                ACE_TRY_ENV);
-}
-
-TAO_EC_Filter*
-TAO_EC_Sched_Filter_Builder:: recursive_build (
-    TAO_EC_ProxyPushSupplier *supplier,
-    RtecEventChannelAdmin::ConsumerQOS& qos,
-    CORBA::ULong& pos,
-    RtecScheduler::Scheduler_ptr scheduler,
-    const char* base_name,
-    CORBA::Environment& ACE_TRY_ENV) const
-{
-  const RtecEventComm::Event& e = qos.dependencies[pos].event;
-  ACE_CString name;
-  RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info;
-  if (base_name == 0)
-    {
-      RtecScheduler::RT_Info_var info =
-        scheduler->get (body_info, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      name = info->entry_point.in ();
-    }
-  else
-    name = base_name;
-
-  if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR)
-    {
-      pos++; // Consume the designator
-      CORBA::ULong n = this->count_children (qos, pos);
-
-      TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
-      for (CORBA::ULong i = 0; i != n; ++i)
-        {
-          ACE_CString child_name = name;
-          char buf[16];
-          ACE_OS::sprintf (buf, "/%04.4x", i);
-          child_name += buf;
-          children[i] = this->recursive_build (supplier, qos, pos,
-                                               scheduler,
-                                               child_name.c_str (),
-                                               ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          pos++;
-        }
-      return new TAO_EC_Sched_Filter (name.c_str (),
-                                      scheduler,
-                                      new TAO_EC_Conjunction_Filter(children,
-                                                                    n),
-                                      body_info,
-                                      RtecScheduler::CONJUNCTION);
-    }
-
-  else if (e.header.type == ACE_ES_DISJUNCTION_DESIGNATOR)
-    {
-      pos++; // Consume the designator
-      CORBA::ULong n = this->count_children (qos, pos);
-
-      TAO_EC_Filter** children;
-      ACE_NEW_RETURN (children, TAO_EC_Filter*[n], 0);
-      for (CORBA::ULong i = 0; i != n; ++i)
-        {
-          ACE_CString child_name = name;
-          char buf[16];
-          ACE_OS::sprintf (buf, "/%04.4x", i);
-          child_name += buf;
-
-          children[i] = this->recursive_build (supplier, qos, pos,
-                                               scheduler,
-                                               child_name.c_str (),
-                                               ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-          pos++;
-        }
-      return new TAO_EC_Sched_Filter (name.c_str (),
-                                      scheduler,
-                                      new TAO_EC_Disjunction_Filter (children,
-                                                                     n),
-                                      body_info,
-                                      RtecScheduler::DISJUNCTION);
-    }
-
-  else if (e.header.type == ACE_ES_EVENT_TIMEOUT
-           || e.header.type == ACE_ES_EVENT_INTERVAL_TIMEOUT
-           || e.header.type == ACE_ES_EVENT_DEADLINE_TIMEOUT)
-    {
-      pos++;
-      TAO_EC_QOS_Info qos_info;
-
-      qos_info.rt_info =
-        scheduler->create (name.c_str (), ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // Convert the time to the proper units....
-      RtecScheduler::Period_t period =
-        ACE_static_cast (RtecScheduler::Period_t,
-                         e.header.creation_time / 10);
-
-      scheduler->set (qos_info.rt_info,
-                      RtecScheduler::VERY_LOW_CRITICALITY,
-                      0, // worst_cast_execution_time
-                      0, // typical_cast_execution_time
-                      0, // cached_cast_execution_time
-                      period,
-                      RtecScheduler::VERY_LOW_IMPORTANCE,
-                      0, // quantum
-                      1, // threads
-                      RtecScheduler::OPERATION,
-                      ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      return new TAO_EC_Timeout_Filter (this->event_channel_,
-                                        supplier,
-                                        qos_info,
-                                        e.header.type,
-                                        e.header.creation_time);
-    }
-
-  return new TAO_EC_Sched_Filter (name.c_str (),
-                                  scheduler,
-                                  new TAO_EC_Type_Filter (e.header),
-                                  body_info,
-                                  RtecScheduler::OPERATION);
-}
-
-CORBA::ULong
-TAO_EC_Sched_Filter_Builder::
-    count_children (RtecEventChannelAdmin::ConsumerQOS& qos,
-                    CORBA::ULong pos) const
-{
-  CORBA::ULong l = qos.dependencies.length ();
-  CORBA::ULong i;
-  for (i = pos; i != l; ++i)
-    {
-      const RtecEventComm::Event& e = qos.dependencies[i].event;
-      if (e.header.type == ACE_ES_CONJUNCTION_DESIGNATOR
-          || e.header.type == ACE_ES_DISJUNCTION_DESIGNATOR)
-        break;
-    }
-  return i - 1;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
deleted file mode 100644
index 27d50c44ccf..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Sched_Filter_Builder
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_SCHED_FILTER_BUILDER_H
-#define TAO_EC_SCHED_FILTER_BUILDER_H
-
-#include "EC_Filter_Builder.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_Filter;
-class TAO_EC_Event_Channel;
-
-class TAO_ORBSVCS_Export TAO_EC_Sched_Filter_Builder : public TAO_EC_Filter_Builder
-{
-  // = TITLE
-  //   Implement a builder for the fundamental filters.
-  //
-  // = DESCRIPTION
-  //   The sched filtering mechanisms in the Event channel
-  //   (source/type based filtering + disjunctions and conjunctions)
-  //   are constructed using this class.
-  //
-public:
-  TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel* ec);
-  // constructor.
-
-  virtual ~TAO_EC_Sched_Filter_Builder (void);
-  // destructor...
-
-  // = The TAO_EC_Filter_Builder methods...
-  TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier,
-                        RtecEventChannelAdmin::ConsumerQOS& qos,
-                        CORBA::Environment &env) const;
-
-private:
-  TAO_EC_Filter* recursive_build (TAO_EC_ProxyPushSupplier *supplier,
-                                  RtecEventChannelAdmin::ConsumerQOS& qos,
-                                  CORBA::ULong& pos,
-                                  RtecScheduler::Scheduler_ptr scheduler,
-                                  const char* base_name,
-                                  CORBA::Environment& env) const;
-  // Recursively build the filter tree.
-
-  CORBA::ULong count_children (RtecEventChannelAdmin::ConsumerQOS& qos,
-                               CORBA::ULong pos) const;
-  // Count the number of children of the current node, i.e. until a
-  // conjunction or disjunction starts.
-
-private:
-  TAO_EC_Event_Channel* event_channel_;
-  // The event channel.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Sched_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_SCHED_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
deleted file mode 100644
index a6c08b50552..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Sched_Filter_Builder::
-      TAO_EC_Sched_Filter_Builder (TAO_EC_Event_Channel *ec)
-  :  event_channel_ (ec)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
deleted file mode 100644
index b96abfd40a8..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-
-#include "EC_Scheduling_Strategy.h"
-#include "EC_QOS_Info.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Scheduling_Strategy, "$Id$")
-
-TAO_EC_Scheduling_Strategy::~TAO_EC_Scheduling_Strategy (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
deleted file mode 100644
index 46615edcdc0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Scheduling_Strategy
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_SCHEDULING_STRATEGY_H
-#define TAO_EC_SCHEDULING_STRATEGY_H
-
-#include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/RtecEventCommC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_ProxyPushConsumer;
-class TAO_EC_ProxyPushSupplier;
-class TAO_EC_QOS_Info;
-
-class TAO_ORBSVCS_Export TAO_EC_Scheduling_Strategy
-{
-  // = TITLE
-  //   Define the interface for the scheduling strategy
-  //
-  // = DESCRIPTION
-  //   The scheduling strategy controls the actions that the event
-  //   channel must take to update the dependency information in the
-  //   scheduler and to query the scheduler for the priority of each
-  //   event pushed by a supplier.
-  //
-  //   The base
-  //
-  // = MEMORY MANAGMENT
-  //
-public:
-  virtual ~TAO_EC_Scheduling_Strategy (void);
-  // Destructor
-
-  virtual void add_proxy_supplier_dependencies (
-      TAO_EC_ProxyPushSupplier *supplier,
-      TAO_EC_ProxyPushConsumer *consumer,
-      CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Add all the dependencies between <supplier> and <consumer>
-
-  virtual void init_event_qos (
-      const RtecEventComm::EventHeader& header,
-      TAO_EC_ProxyPushConsumer *consumer,
-      TAO_EC_QOS_Info& qos_info,
-      CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Initializes <qos_info> based on the QoS information for
-  // <consumer> and the event header.
-
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Scheduling_Strategy.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_SCHEDULING_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 39ef736df01..77d4628c5cb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -2,7 +2,6 @@
 
 #include "EC_SupplierAdmin.h"
 #include "EC_ProxyConsumer.h"
-#include "EC_ProxySupplier.h"
 #include "EC_Event_Channel.h"
 
 #if ! defined (__ACE_INLINE__)
@@ -14,22 +13,17 @@ ACE_RCSID(Event, EC_SupplierAdmin, "$Id$")
 TAO_EC_SupplierAdmin::TAO_EC_SupplierAdmin (TAO_EC_Event_Channel *ec)
   :  event_channel_ (ec)
 {
-  this->default_POA_ =
-    this->event_channel_->supplier_poa ();
-
-  // @@ We must consider using the techniques in the ConsumerAdmin
-  //    also, i.e. not using locks but delaying operations that modify
-  //    the set.  I don't see much use for them right now, since there
-  //    is no potential for dead-lock when dispatching events and/or
-  //    adding multiple suppliers and consumers, but we could avoid
-  //    some priority inversions.
-  this->lock_ =
-    this->event_channel_->create_supplier_admin_lock ();
 }
 
 TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 {
-    this->event_channel_->destroy_supplier_admin_lock (this->lock_);
+}
+
+void
+TAO_EC_SupplierAdmin::set_default_POA (PortableServer::POA_ptr poa)
+{
+  this->default_POA_ = 
+    PortableServer::POA::_duplicate (poa);
 }
 
 PortableServer::POA_ptr
@@ -40,106 +34,56 @@ TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&)
 
 void
 TAO_EC_SupplierAdmin::connected (TAO_EC_ProxyPushSupplier *supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
-      ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  ConsumerSetIterator end = this->end ();
-  for (ConsumerSetIterator i = this->begin ();
+  ConsumerSetIterator end = this->all_consumers_.end ();
+  for (ConsumerSetIterator i = this->all_consumers_.begin ();
        i != end;
        ++i)
     {
       (*i)->connected (supplier, ACE_TRY_ENV);
-      ACE_CHECK;
-      supplier->connected (*i, ACE_TRY_ENV);
-      ACE_CHECK;
     }
 }
 
 void
 TAO_EC_SupplierAdmin::disconnected (TAO_EC_ProxyPushSupplier *supplier,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
-      ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  ConsumerSetIterator end = this->end ();
-  for (ConsumerSetIterator i = this->begin ();
+  ConsumerSetIterator end = this->all_consumers_.end ();
+  for (ConsumerSetIterator i = this->all_consumers_.begin ();
        i != end;
        ++i)
     {
       (*i)->disconnected (supplier, ACE_TRY_ENV);
-      ACE_CHECK;
-      supplier->disconnected (*i, ACE_TRY_ENV);
-      ACE_CHECK;
     }
 }
 
 void
 TAO_EC_SupplierAdmin::connected (TAO_EC_ProxyPushConsumer *consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
-      ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
   if (this->all_consumers_.insert (consumer) != 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    ACE_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_EC_SupplierAdmin::disconnected (TAO_EC_ProxyPushConsumer *consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+				    CORBA::Environment &ACE_TRY_ENV)
 {
-  ACE_GUARD_THROW_EX (
-      ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
   if (this->all_consumers_.remove (consumer) != 0)
     ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR ());
 }
 
-void
-TAO_EC_SupplierAdmin::shutdown (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (
-      ACE_Lock, ace_mon, *this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-  ACE_CHECK;
-
-  ConsumerSetIterator end = this->end ();
-  for (ConsumerSetIterator i = this->begin ();
-       i != end;
-       ++i)
-    {
-      ACE_TRY
-        {
-          (*i)->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          (*i)->_decr_refcnt ();
-        }
-      ACE_CATCHANY
-        {
-          /* ignore all exceptions */
-        }
-      ACE_ENDTRY;
-    }
-  this->all_consumers_.reset ();
-}
-
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
 TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
 {
-  TAO_EC_ProxyPushConsumer* consumer =
+  TAO_EC_ProxyPushConsumer* consumer = 
     this->event_channel_->create_proxy_push_consumer ();
 
+  PortableServer::POA_var poa =
+    this->event_channel_->consumer_poa (ACE_TRY_ENV);
+  consumer->set_default_POA (poa.in ());
+
   return consumer->_this (ACE_TRY_ENV);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index d9beff66865..6245c2cd9e2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -12,6 +12,11 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   Implement the RtecEventChannelAdmin::SupplierAdmin interface.
+//   This class is an Abstract Factory for the
+//   TAO_EC_ProxyPushConsumer.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -36,21 +41,19 @@ class TAO_EC_Event_Channel;
 class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ProxyPushConsumer;
 
-class TAO_ORBSVCS_Export TAO_EC_SupplierAdmin : public POA_RtecEventChannelAdmin::SupplierAdmin
+class TAO_EC_SupplierAdmin : public POA_RtecEventChannelAdmin::SupplierAdmin
 {
   // = TITLE
   //   ProxyPushSupplier
   //
   // = DESCRIPTION
-  //   Implement the RtecEventChannelAdmin::SupplierAdmin interface.
-  //   This class is an Abstract Factory for the
-  //   TAO_EC_ProxyPushConsumer.
+  //   Implements the SupplierAdmin interface, i.e. the factory for
+  //   ProxyPushConsumer objects.
   //
   // = MEMORY MANAGMENT
   //   It does not assume ownership of the TAO_EC_Event_Channel object
   //
   // = LOCKING
-  //   @@ TODO
   //   No provisions for locking, access must be serialized
   //   externally.
   //
@@ -63,6 +66,9 @@ public:
   virtual ~TAO_EC_SupplierAdmin (void);
   // destructor...
 
+  void set_default_POA (PortableServer::POA_ptr poa);
+  // Set this servant's default POA
+
   virtual PortableServer::POA_ptr _default_POA (CORBA::Environment& env);
   // Override the ServantBase method.
 
@@ -80,21 +86,10 @@ public:
   // Used to inform the EC that a Supplier has connected or
   // disconnected from it.
 
-  virtual void shutdown (CORBA::Environment&);
-  // The event channel is shutting down, inform all the consumers of
-  // this
-
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
       obtain_push_consumer (CORBA::Environment &);
 
-  typedef ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer*> ConsumerSet;
-  typedef ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer*> ConsumerSetIterator;
-
-  ConsumerSetIterator begin (void);
-  ConsumerSetIterator end (void);
-  // Iterators over the set of ProxyPushConsumers
-
 private:
   TAO_EC_Event_Channel *event_channel_;
   // The Event Channel we belong to
@@ -102,11 +97,9 @@ private:
   PortableServer::POA_var default_POA_;
   // Store the default POA.
 
-  ACE_Lock* lock_;
-  // The locking strategy
-
+  typedef ACE_Unbounded_Set<TAO_EC_ProxyPushConsumer*> ConsumerSet;
+  typedef ACE_Unbounded_Set_Iterator<TAO_EC_ProxyPushConsumer*> ConsumerSetIterator;
   ConsumerSet all_consumers_;
-  // The set of consumers...
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
index 5946ae5b1b5..cfa1da318d3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.i
@@ -1,13 +1 @@
 // $Id$
-
-ACE_INLINE TAO_EC_SupplierAdmin::ConsumerSetIterator
-TAO_EC_SupplierAdmin::begin (void)
-{
-  return this->all_consumers_.begin ();
-}
-
-ACE_INLINE TAO_EC_SupplierAdmin::ConsumerSetIterator
-TAO_EC_SupplierAdmin::end (void)
-{
-  return this->all_consumers_.end ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp
index 6bb56e89909..06d94ed726c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.cpp
@@ -1,6 +1,10 @@
 // $Id$
 
 #include "EC_SupplierFiltering.h"
+#include "EC_Event_Channel.h"
+#include "EC_ConsumerAdmin.h"
+#include "EC_ProxySupplier.h"
+#include "EC_QOS_Info.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "EC_SupplierFiltering.i"
@@ -11,3 +15,55 @@ ACE_RCSID(Event, EC_SupplierFiltering, "$Id$")
 TAO_EC_SupplierFiltering::~TAO_EC_SupplierFiltering (void)
 {
 }
+
+// ****************************************************************
+
+TAO_EC_Null_SupplierFiltering::
+    TAO_EC_Null_SupplierFiltering (TAO_EC_Event_Channel* ec)
+  :  event_channel_ (ec)
+{
+}
+
+void
+TAO_EC_Null_SupplierFiltering::bind (TAO_EC_ProxyPushConsumer*)
+{
+}
+
+void
+TAO_EC_Null_SupplierFiltering::unbind (TAO_EC_ProxyPushConsumer*)
+{
+}
+
+void
+TAO_EC_Null_SupplierFiltering::connected (TAO_EC_ProxyPushSupplier*,
+                                          CORBA::Environment &)
+{
+}
+
+void
+TAO_EC_Null_SupplierFiltering::disconnected (TAO_EC_ProxyPushSupplier*,
+                                             CORBA::Environment &)
+{
+}
+
+void
+TAO_EC_Null_SupplierFiltering::push (const RtecEventComm::EventSet& event,
+                                     CORBA::Environment &ACE_TRY_ENV)
+{
+  TAO_EC_ConsumerAdmin* consumer_admin = 
+    this->event_channel_->consumer_admin ();
+  TAO_EC_ConsumerAdmin::SupplierSetIterator end =
+    consumer_admin->end ();
+
+  TAO_EC_QOS_Info qos_info;
+  for (TAO_EC_ConsumerAdmin::SupplierSetIterator i =
+         consumer_admin->begin ();
+       i != end;
+       ++i)
+    {
+      (*i)->filter (event, qos_info, ACE_TRY_ENV);
+      ACE_CHECK;
+    }
+}
+
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
index e9167f64c5d..6bc067499e6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierFiltering.h
@@ -39,7 +39,7 @@ class TAO_EC_ProxyPushSupplier;
 class TAO_EC_ProxyPushConsumer;
 class TAO_EC_Event_Channel;
 
-class TAO_ORBSVCS_Export TAO_EC_SupplierFiltering
+class TAO_EC_SupplierFiltering
 {
   // = TITLE
   //   The strategy to handle filtering close to the supplier.
@@ -96,24 +96,48 @@ public:
   // information can simply ignore the message.
 
   virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env) = 0;
+			  CORBA::Environment &env) = 0;
   virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env) = 0;
+			     CORBA::Environment &env) = 0;
   // Concrete implementations can use this methods to keep track of
   // the consumers interested in this events.
 
-  virtual void shutdown (CORBA::Environment &env) = 0;
-  // The event channel is shutting down.
-
   virtual void push (const RtecEventComm::EventSet& event,
                      CORBA::Environment &) = 0;
   // The ProxyPushConsumer delegates on this class to actually send
   // the event.
+};
+
+// ****************************************************************
+
+class TAO_EC_Null_SupplierFiltering : public TAO_EC_SupplierFiltering
+{
+  // = TITLE
+  //   A null filtering strategy.
+  //
+  // = DESCRIPTION
+  //   This strategy does no filtering, it is useful for backends of
+  //   the CosEventChannel, testing and broadcasters; it uses the
+  //   ConsumerAdmin to find all the consumers and pushes the event to
+  //   all of them.
+  //
+public:
+  TAO_EC_Null_SupplierFiltering (TAO_EC_Event_Channel* ec);
+  // Constructor
+
+  // = The TAO_EC_SupplierFiltering methods.
+  virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
+  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
+			  CORBA::Environment &env);
+  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
+			     CORBA::Environment &env);
+  virtual void push (const RtecEventComm::EventSet& event,
+                     CORBA::Environment &);
 
-  virtual CORBA::ULong _incr_refcnt (void) = 0;
-  virtual CORBA::ULong _decr_refcnt (void) = 0;
-  // Increment and decrement the reference count, locking must be
-  // provided by the user.
+private:
+  TAO_EC_Event_Channel *event_channel_;
+  // The event channel, used to locate the set of consumers.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
deleted file mode 100644
index 049f8f88626..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "EC_Supplier_Filter_Builder.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Supplier_Filter_Builder, "$Id$")
-
-TAO_EC_Supplier_Filter_Builder::~TAO_EC_Supplier_Filter_Builder (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
deleted file mode 100644
index d829d74ba19..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Supplier_Filter_Builder
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_SUPPLIER_FILTER_BUILDER_H
-#define TAO_EC_SUPPLIER_FILTER_BUILDER_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_SupplierFiltering;
-class TAO_EC_ProxyPushConsumer;
-
-class TAO_ORBSVCS_Export TAO_EC_Supplier_Filter_Builder
-{
-  // = TITLE
-  //   Abstract base class for the supplier filter builders.
-  //
-  // = DESCRIPTION
-  //   The creation of the right filter for each supplier controlled
-  //   by a Supplier_Filter_Builder.
-  //
-  //
-public:
-  virtual ~TAO_EC_Supplier_Filter_Builder (void);
-  // destructor...
-
-  virtual TAO_EC_SupplierFiltering*
-      create (RtecEventChannelAdmin::SupplierQOS& qos) = 0;
-  // Create the filter. The <consumer> is bound to the returned
-  // Supplier_Filter, it must be <unbound> upon destruction and/or
-  // disconnection.
-
-  virtual void
-      destroy (TAO_EC_SupplierFiltering *filter) = 0;
-  // The user is returning the filter for destruction/recycling.
-};
-
-// ****************************************************************
-
-#if defined (__ACE_INLINE__)
-#include "EC_Supplier_Filter_Builder.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_FILTER_BUILDER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
deleted file mode 100644
index 77f15f3ea28..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-// $Id$
-
-#include "EC_Timeout_Filter.h"
-#include "EC_Timeout_Generator.h"
-#include "EC_Event_Channel.h"
-#include "EC_ProxySupplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Timeout_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Timeout_Filter, "$Id$")
-
-TAO_EC_Timeout_Filter::TAO_EC_Timeout_Filter (
-      TAO_EC_Event_Channel *event_channel,
-      TAO_EC_ProxyPushSupplier *supplier,
-      const TAO_EC_QOS_Info& qos_info,
-      RtecEventComm::EventType type,
-      RtecEventComm::Time period)
-  : event_channel_ (event_channel),
-    supplier_ (supplier),
-    qos_info_ (qos_info),
-    type_ (type)
-{
-  ACE_Time_Value tv_delta;
-  ORBSVCS_Time::TimeT_to_Time_Value (tv_delta, period);
-
-  TAO_EC_Timeout_Generator *tg =
-    this->event_channel_->timeout_generator ();
-
-  if (type == ACE_ES_EVENT_INTERVAL_TIMEOUT)
-    {
-      ACE_Time_Value tv_interval;
-      ORBSVCS_Time::TimeT_to_Time_Value (tv_interval, period);
-
-      this->id_ =
-        tg->schedule_timer (this,
-                            tv_delta,
-                            tv_interval);
-    }
-  else
-    {
-      this->id_ =
-        tg->schedule_timer (this,
-                            tv_delta,
-                            ACE_Time_Value::zero);
-    }
-
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "EC_Timeout_Filter - interval = %d:%d, ID = %d\n",
-  //              tv_interval.sec (), tv_interval.usec (),
-  //              this->id_));
-}
-
-TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void)
-{
-  this->event_channel_->timeout_generator ()->cancel_timer (this->qos_info_,
-                                                            this->id_);
-}
-
-void
-TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info,
-                                      CORBA::Environment& ACE_TRY_ENV)
-{
-  this->supplier_->push_timeout (this,
-                                 event,
-                                 qos_info,
-                                 ACE_TRY_ENV);
-}
-
-int
-TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet& event,
-                               TAO_EC_QOS_Info& qos_info,
-                               CORBA::Environment& ACE_TRY_ENV)
-{
-  return 0;
-}
-
-int
-TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet& event,
-                                      TAO_EC_QOS_Info& qos_info,
-                                      CORBA::Environment& ACE_TRY_ENV)
-{
-  return 0;
-}
-
-void
-TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet& event,
-                          TAO_EC_QOS_Info& qos_info,
-                          CORBA::Environment& ACE_TRY_ENV)
-{
-  if (this->parent () != 0)
-    this->parent ()->push (event, qos_info, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet& event,
-                                 TAO_EC_QOS_Info& qos_info,
-                                 CORBA::Environment& ACE_TRY_ENV)
-{
-  if (this->parent () != 0)
-    this->parent ()->push_nocopy (event, qos_info, ACE_TRY_ENV);
-}
-
-void
-TAO_EC_Timeout_Filter::clear (void)
-{
-}
-
-CORBA::ULong
-TAO_EC_Timeout_Filter::max_event_size (void) const
-{
-  return 1;
-}
-
-int
-TAO_EC_Timeout_Filter::can_match (
-      const RtecEventComm::EventHeader& header) const
-{
-  return 0;
-}
-
-int
-TAO_EC_Timeout_Filter::add_dependencies (
-      const RtecEventComm::EventHeader&,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
-{
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
deleted file mode 100644
index 9232bdb6e24..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Timeout_Filter
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_TIMEOUT_FILTER_H
-#define TAO_EC_TIMEOUT_FILTER_H
-
-#include "EC_Filter.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "EC_QOS_Info.h"
-
-class TAO_EC_Event_Channel;
-class TAO_EC_ProxyPushSupplier;
-
-class TAO_ORBSVCS_Export TAO_EC_Timeout_Filter : public TAO_EC_Filter
-{
-  // = TITLE
-  //   A filter based on event type/source
-  //
-  // = DESCRIPTION
-  //   This filter only accept events with a predefined type/source,
-  //   both the source and the type can be wildcards.
-  //
-public:
-  TAO_EC_Timeout_Filter (TAO_EC_Event_Channel *event_channel,
-                         TAO_EC_ProxyPushSupplier *supplier,
-                         const TAO_EC_QOS_Info& qos_info,
-                         RtecEventComm::EventType type,
-                         RtecEventComm::Time period);
-  // Constructor.
-
-  virtual ~TAO_EC_Timeout_Filter (void);
-  // Destructor.
-
-  const TAO_EC_QOS_Info& qos_info (void) const;
-  // Return the QOS_Info for this Timeout filter.
-
-  RtecEventComm::EventType type (void) const;
-  // The type of timeout event that we generate.
-
-  void push_to_proxy (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& ACE_TRY_ENV);
-  // Callback from the Timeout_Generator
-
-  // = The TAO_EC_Filter methods, please check the documentation in
-  // TAO_EC_Filter.
-  virtual int filter (const RtecEventComm::EventSet& event,
-                      TAO_EC_QOS_Info& qos_info,
-                      CORBA::Environment& env);
-  virtual int filter_nocopy (RtecEventComm::EventSet& event,
-                             TAO_EC_QOS_Info& qos_info,
-                             CORBA::Environment& env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     TAO_EC_QOS_Info& qos_info,
-                     CORBA::Environment& env);
-  virtual void push_nocopy (RtecEventComm::EventSet& event,
-                            TAO_EC_QOS_Info& qos_info,
-                            CORBA::Environment& env);
-  virtual void clear (void);
-  virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter
-                              (const TAO_EC_Timeout_Filter&))
-  ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter& operator=
-                              (const TAO_EC_Timeout_Filter&))
-
-private:
-  TAO_EC_Event_Channel* event_channel_;
-  // The event channel.
-
-  TAO_EC_ProxyPushSupplier *supplier_;
-  // The supplier that finally receives the timeout event.
-
-  TAO_EC_QOS_Info qos_info_;
-  // Events "generated" by this filter use this QOS_Info.
-
-  RtecEventComm::EventType type_;
-  // The type of timeout event...
-
-  int id_;
-  // The ID of the timeout in the Timeout_Generator, for
-  // cancellation.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Timeout_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_TIMEOUT_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
deleted file mode 100644
index f47bb605f57..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE const TAO_EC_QOS_Info&
-TAO_EC_Timeout_Filter::qos_info (void) const
-{
-  return this->qos_info_;
-}
-
-ACE_INLINE RtecEventComm::EventType
-TAO_EC_Timeout_Filter::type (void) const
-{
-  return this->type_;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
deleted file mode 100644
index 93176469a1e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include "EC_Timeout_Generator.h"
-#include "EC_Timeout_Filter.h"
-#include "orbsvcs/Event_Service_Constants.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Timeout_Generator, "$Id$")
-
-TAO_EC_Timeout_Generator::~TAO_EC_Timeout_Generator (void)
-{
-}
-
-// ****************************************************************
-
-int
-TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */,
-                                        const void *vp)
-{
-  //  ACE_DEBUG ((LM_DEBUG,
-  //              "TAO_EC_Timeout_Adapter::handle_timeout -"
-  //              " expire at %d:%d\n",
-  //              tv.sec (), tv.usec ()));
-
-  TAO_EC_Timeout_Filter *filter =
-    ACE_static_cast(TAO_EC_Timeout_Filter*, ACE_const_cast(void*,vp));
-
-  if (filter == 0)
-    return 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      RtecEventComm::Event e;
-      e.header.type = filter->type ();
-      e.header.source = 0;
-
-      RtecEventComm::EventSet single_event (1, 1, &e, 0);
-
-      TAO_EC_QOS_Info qos_info = filter->qos_info ();
-      filter->push_to_proxy (single_event,
-                             qos_info,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
deleted file mode 100644
index 1810a51683a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_Timeout_Generator
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = DESCRIPTION
-//   A new implementation of the Real Time Event Services.
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_TIMEOUT_GENERATOR_H
-#define TAO_EC_TIMEOUT_GENERATOR_H
-
-#include "orbsvcs/orbsvcs_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Event_Handler.h"
-#include "EC_Timeout_Filter.h"
-
-class TAO_EC_QOS_Info;
-
-class TAO_ORBSVCS_Export TAO_EC_Timeout_Generator
-{
-  // = TITLE
-  //   Define the interface for the generators of timeout events.
-  //
-  // = DESCRIPTION
-  //   The Event Channel can use several strategies to dispatch
-  //   timers, for instance, it can use the ORB reactor or a pool of
-  //   reactors running at different priorities or a pool of
-  //   Thread_Timer_Queue_Adapters running at different priorities
-  //   also.
-  //   This class is the abstract base class to abstract this
-  //   strategies.
-  //
-public:
-  virtual ~TAO_EC_Timeout_Generator (void);
-  // destructor
-
-  virtual void activate (void) = 0;
-  // Activate any internal threads.
-
-  virtual void shutdown (void) = 0;
-  // Deactivate any internal threads, clients can destroy the object
-  // after calling this method.
-
-  virtual int schedule_timer (TAO_EC_Timeout_Filter* filter,
-                              const ACE_Time_Value& delta,
-                              const ACE_Time_Value& interval) = 0;
-  // Add a timer at the given priority, returns the timer ID.
-
-  virtual int cancel_timer (const TAO_EC_QOS_Info& info,
-                            int id) = 0;
-  // Cancel a timer at the given priority.
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Timeout_Adapter : public ACE_Event_Handler
-{
-  // = TITLE
-  //   Adapt the EC_Filter interface as an Event_Handler.
-  //
-  // = DESCRIPTION
-  //   ACE timer queues (including the reactor) use Event_Handlers to
-  //   dispatch events, but we want to receive them in EC_Filters,
-  //   this class is and adaptor for that purpose.
-  //
-public:
-  TAO_EC_Timeout_Adapter (void);
-  // Default construction.
-
-private:
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-                              const void *act);
-  // Casts <act> to EC_Filter and dispatches an event to it.
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Timeout_Generator.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_TIMEOUT_GENERATOR_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
deleted file mode 100644
index e5024c3fb1d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
deleted file mode 100644
index 98a28ba0cd9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "EC_Trivial_Supplier_Filter.h"
-#include "EC_Event_Channel.h"
-#include "EC_ConsumerAdmin.h"
-#include "EC_ProxySupplier.h"
-#include "EC_QOS_Info.h"
-
-#if ! defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Event, EC_Trivial_Supplier_Filter, "$Id$")
-
-// ****************************************************************
-
-TAO_EC_Trivial_Supplier_Filter::
-    TAO_EC_Trivial_Supplier_Filter (TAO_EC_Event_Channel* ec)
-  :  event_channel_ (ec)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::bind (TAO_EC_ProxyPushConsumer*)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier*,
-                                           CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier*,
-                                              CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::shutdown (CORBA::Environment &)
-{
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_EC_ConsumerAdmin* consumer_admin =
-    this->event_channel_->consumer_admin ();
-
-  for (CORBA::ULong j = 0; j < event.length (); ++j)
-    {
-      const RtecEventComm::Event& e = event[j];
-      RtecEventComm::Event* buffer =
-        ACE_const_cast(RtecEventComm::Event*, &e);
-      RtecEventComm::EventSet single_event (1, 1, buffer, 0);
-
-      ACE_GUARD_THROW_EX (
-          TAO_EC_ConsumerAdmin::Busy_Lock,
-          ace_mon, consumer_admin->busy_lock (),
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ());
-      ACE_CHECK;
-
-      TAO_EC_ConsumerAdmin::SupplierSetIterator end =
-        consumer_admin->end ();
-
-      for (TAO_EC_ConsumerAdmin::SupplierSetIterator i =
-             consumer_admin->begin ();
-           i != end;
-           ++i)
-        {
-          TAO_EC_QOS_Info qos_info;
-
-          (*i)->filter (single_event, qos_info, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-}
-
-CORBA::ULong
-TAO_EC_Trivial_Supplier_Filter::_incr_refcnt (void)
-{
-  return 1;
-}
-
-CORBA::ULong
-TAO_EC_Trivial_Supplier_Filter::_decr_refcnt (void)
-{
-  return 1;
-}
-
-// ****************************************************************
-
-TAO_EC_Trivial_Supplier_Filter_Builder::
-  TAO_EC_Trivial_Supplier_Filter_Builder (TAO_EC_Event_Channel *ec)
-  :  filter_ (ec)
-{
-}
-
-TAO_EC_SupplierFiltering*
-TAO_EC_Trivial_Supplier_Filter_Builder::create (
-    RtecEventChannelAdmin::SupplierQOS&)
-{
-  return &this->filter_;
-}
-
-void
-TAO_EC_Trivial_Supplier_Filter_Builder::destroy (
-    TAO_EC_SupplierFiltering*)
-{
-}
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
deleted file mode 100644
index 26a6cd8cb1f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel
-//
-// = FILENAME
-//   EC_trivial_Supplier_Filter
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// = CREDITS
-//   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
-//   and other members of the DOC group.
-//   More details can be found in:
-//   http://www.cs.wustl.edu/~schmidt/oopsla.ps.gz
-//   http://www.cs.wustl.edu/~schmidt/JSAC-98.ps.gz
-//
-//
-// ============================================================================
-
-#ifndef TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
-#define TAO_EC_TRIVIAL_SUPPLIER_FILTER_H
-
-#include "EC_SupplierFiltering.h"
-#include "EC_Supplier_Filter_Builder.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_EC_ProxyPushSupplier_Set;
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Trivial_Supplier_Filter : public TAO_EC_SupplierFiltering
-{
-  // = TITLE
-  //   A null filtering strategy.
-  //
-  // = DESCRIPTION
-  //   This strategy does no filtering, it is useful for backends of
-  //   the CosEventChannel, testing and broadcasters; it uses the
-  //   ConsumerAdmin to find all the consumers and pushes the event to
-  //   all of them.
-  //
-public:
-  TAO_EC_Trivial_Supplier_Filter (TAO_EC_Event_Channel* ec);
-  // Constructor
-
-  // = The TAO_EC_SupplierFiltering methods.
-  virtual void bind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void unbind (TAO_EC_ProxyPushConsumer* consumer);
-  virtual void connected (TAO_EC_ProxyPushSupplier* supplier,
-                          CORBA::Environment &env);
-  virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier,
-                             CORBA::Environment &env);
-  virtual void shutdown (CORBA::Environment &env);
-  virtual void push (const RtecEventComm::EventSet& event,
-                     CORBA::Environment &);
-  virtual CORBA::ULong _decr_refcnt (void);
-  virtual CORBA::ULong _incr_refcnt (void);
-
-private:
-  TAO_EC_Event_Channel *event_channel_;
-  // The event channel, used to locate the set of consumers.
-};
-
-// ****************************************************************
-
-class TAO_ORBSVCS_Export TAO_EC_Trivial_Supplier_Filter_Builder : public TAO_EC_Supplier_Filter_Builder
-{
-  // = TITLE
-  //   Create a single Trivial_Supplier_Filter.
-  //
-  // = DESCRIPTION
-  //   This Factory creates a single Trivial_Supplier_Filter that is
-  //   used by all the suppliers (i.e. ProxyConsumers) of an event
-  //   channel.
-  //
-  //
-public:
-  TAO_EC_Trivial_Supplier_Filter_Builder (TAO_EC_Event_Channel* ec);
-  // constructor....
-
-  // = The TAO_EC_Supplier_Filter_Builder methods...
-  virtual TAO_EC_SupplierFiltering*
-      create (RtecEventChannelAdmin::SupplierQOS& qos);
-  virtual void
-      destroy (TAO_EC_SupplierFiltering *filter);
-
-private:
-  TAO_EC_Trivial_Supplier_Filter filter_;
-  // The filter....
-};
-
-#if defined (__ACE_INLINE__)
-#include "EC_Trivial_Supplier_Filter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_EC_TRIVIAL_SUPPLIER_FILTER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
index fa8d1cc68ff..0eef922ab1c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -3,7 +3,7 @@
 #include "EC_Type_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "EC_Type_Filter.i"
+#include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_Type_Filter, "$Id$")
@@ -22,7 +22,7 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event,
   if (event.length () != 1)
     return 0;
 
-  if (this->can_match (event[0].header)) // TAO_EC_Filter::matches (this->header
+  if (TAO_EC_Filter::matches (this->header_, event[0].header))
     {
       this->push (event, qos_info, ACE_TRY_ENV);
       return 1;
@@ -39,7 +39,7 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event,
   if (event.length () != 1)
     return 0;
 
-  if (this->can_match (event[0].header)) // TAO_EC_Filter::matches (this->header
+  if (TAO_EC_Filter::matches (this->header_, event[0].header))
     {
       this->push_nocopy (event, qos_info, ACE_TRY_ENV);
       return 1;
@@ -76,28 +76,8 @@ TAO_EC_Type_Filter::max_event_size (void) const
   return 1;
 }
 
-int
-TAO_EC_Type_Filter::can_match (
-      const RtecEventComm::EventHeader& header) const
-{
-  if (this->header_.source == 0)
-    if (this->header_.type == 0)
-      return 1;
-    else
-      return this->header_.type == header.type;
-  else if (this->header_.type == 0)
-    return this->header_.source == header.source;
-
-  return (this->header_.type == header.type
-          && this->header_.source == header.source);
-}
-
-int
-TAO_EC_Type_Filter::add_dependencies (
-      const RtecEventComm::EventHeader& header,
-      const TAO_EC_QOS_Info &,
-      CORBA::Environment &)
+void
+TAO_EC_Type_Filter::event_ids(TAO_EC_Filter::Headers& headers)
 {
-  return this->can_match (header);
+  headers.insert (this->header_, 1);
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
index c9d6b7d7b1a..334150aea78 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -12,6 +12,10 @@
 // = AUTHOR
 //   Carlos O'Ryan (coryan@cs.wustl.edu)
 //
+// = DESCRIPTION
+//   A per-consumer filter that only accept events whose type/source
+//   match.
+//
 // = CREDITS
 //   Based on previous work by Tim Harrison (harrison@cs.wustl.edu)
 //   and other members of the DOC group.
@@ -31,7 +35,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_ORBSVCS_Export TAO_EC_Type_Filter : public TAO_EC_Filter
+class TAO_EC_Type_Filter : public TAO_EC_Filter
 {
   // = TITLE
   //   A filter based on event type/source
@@ -40,10 +44,12 @@ class TAO_ORBSVCS_Export TAO_EC_Type_Filter : public TAO_EC_Filter
   //   This filter only accept events with a predefined type/source,
   //   both the source and the type can be wildcards.
   //
+  // = MEMORY MANAGMENT
+  //
 public:
   TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header);
   // Constructor.
-
+  
   // = The TAO_EC_Filter methods, please check the documentation in
   // TAO_EC_Filter.
   virtual int filter (const RtecEventComm::EventSet& event,
@@ -60,16 +66,13 @@ public:
                             CORBA::Environment& env);
   virtual void clear (void);
   virtual CORBA::ULong max_event_size (void) const;
-  virtual int can_match (const RtecEventComm::EventHeader& header) const;
-  virtual int add_dependencies (const RtecEventComm::EventHeader& header,
-                                const TAO_EC_QOS_Info &qos_info,
-                                CORBA::Environment &ACE_TRY_ENV);
+  virtual void event_ids (TAO_EC_Filter::Headers& headers);
 
 private:
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter
                               (const TAO_EC_Type_Filter&))
   ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter& operator=
-                              (const TAO_EC_Type_Filter&))
+                              (const TAO_EC_Type_Filter&))  
 
 private:
   RtecEventComm::EventHeader header_;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index 2f8f9662fea..627f4f33c57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -12,6 +12,10 @@
 #include "orbsvcs/Event/Event_Manip.h"
 #include "orbsvcs/Event/Event_Channel.h"
 
+// These are to save space.
+#define WRITE_GUARD ACE_ES_WRITE_GUARD
+#define READ_GUARD ACE_ES_READ_GUARD
+
 #if !defined (__ACE_INLINE__)
 #include "Event_Channel.i"
 #endif /* __ACE_INLINE__ */
@@ -294,10 +298,10 @@ ACE_Push_Supplier_Proxy::ACE_Push_Supplier_Proxy (ACE_ES_Supplier_Module *sm)
 void
 ACE_Push_Supplier_Proxy::connect_push_supplier (RtecEventComm::PushSupplier_ptr push_supplier,
                                                 const RtecEventChannelAdmin::SupplierQOS &qos,
-                                                CORBA::Environment &ACE_TRY_ENV)
+                                                CORBA::Environment &TAO_IN_ENV)
 {
   if (this->connected ())
-    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected());
+    TAO_THROW (RtecEventChannelAdmin::AlreadyConnected());
 
   this->push_supplier_ =
     RtecEventComm::PushSupplier::_duplicate(push_supplier);
@@ -405,6 +409,7 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "EC (%t) Push to disconnected consumer\n"));
+      // ACE_ES_DEBUG_ST (::dump_sequence (events));
       return;
     }
 
@@ -413,13 +418,12 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events,
 }
 
 void
-ACE_Push_Consumer_Proxy::connect_push_consumer (
-    RtecEventComm::PushConsumer_ptr push_consumer,
-    const RtecEventChannelAdmin::ConsumerQOS &qos,
-    CORBA::Environment &ACE_TRY_ENV)
+ACE_Push_Consumer_Proxy::connect_push_consumer (RtecEventComm::PushConsumer_ptr push_consumer,
+                                                const RtecEventChannelAdmin::ConsumerQOS &qos,
+                                                CORBA::Environment &TAO_IN_ENV)
 {
   if (this->connected ())
-    ACE_THROW (RtecEventChannelAdmin::AlreadyConnected());
+    TAO_THROW (RtecEventChannelAdmin::AlreadyConnected());
 
   this->push_consumer_ =
     RtecEventComm::PushConsumer::_duplicate(push_consumer);
@@ -434,16 +438,15 @@ ACE_Push_Consumer_Proxy::connect_push_consumer (
 
   // ACE_ConsumerQOS_Factory::debug (qos_);
 
-  this->consumer_module_->connected (this, ACE_TRY_ENV);
+  this->consumer_module_->connected (this, TAO_IN_ENV);
 }
 
 void
-ACE_Push_Consumer_Proxy::disconnect_push_supplier (
-    CORBA::Environment &TAO_IN_ENV)
+ACE_Push_Consumer_Proxy::disconnect_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
   ACE_TIMEPROBE_PRINT;
   this->push_consumer_ = RtecEventComm::PushConsumer::_nil ();
-  this->consumer_module_->disconnecting (this, ACE_TRY_ENV);
+  this->consumer_module_->disconnecting (this, TAO_IN_ENV);
 }
 
 void
@@ -487,7 +490,7 @@ ACE_EventChannel::ACE_EventChannel (RtecScheduler::Scheduler_ptr scheduler,
     own_factory_ (0),
     module_factory_ (factory)
 {
-  this->scheduler_ =
+  this->scheduler_ = 
     RtecScheduler::Scheduler::_duplicate (scheduler);
 
   this->init (activate_threads);
@@ -504,7 +507,7 @@ ACE_EventChannel::ACE_EventChannel (CORBA::Boolean activate_threads,
     own_factory_ (0),
     module_factory_ (factory)
 {
-  this->scheduler_ =
+  this->scheduler_ = 
     RtecScheduler::Scheduler::_duplicate (ACE_Scheduler_Factory::server ());
   this->init (activate_threads);
 }
@@ -582,6 +585,8 @@ ACE_EventChannel::~ACE_EventChannel (void)
 void
 ACE_EventChannel::destroy (CORBA::Environment &)
 {
+  TAO_ORB_Core_instance ()->orb ()->shutdown ();
+
   {
     ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_);
 
@@ -601,12 +606,12 @@ ACE_EventChannel::destroy (CORBA::Environment &)
   // Flush all messages in the channel.
   Shutdown_Channel *sc = new Shutdown_Channel (this);
   if (sc == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Create a wrapper around the dispatch request.
   Flush_Queue_ACT *act = new Flush_Queue_ACT (sc, dispatching_module_);
   if (act == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Set a 100ns timer.
   if (this->timer_module ()->schedule_timer (0, // no rt-info
@@ -641,7 +646,9 @@ ACE_EventChannel::shutdown (void)
 void
 ACE_EventChannel::report_connect (u_long event)
 {
-  ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_);
+  ACE_ES_GUARD ace_mon (lock_);
+  if (ace_mon.locked () == 0)
+    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_connect"));
 
   this->report_connect_i (event);
 }
@@ -656,7 +663,9 @@ void
 ACE_EventChannel::report_disconnect (u_long event)
 {
   // No need to gtrab the lock is already take by our callers.
-  ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_);
+  ACE_ES_GUARD ace_mon (lock_);
+  if (ace_mon.locked () == 0)
+    ACE_ERROR ((LM_ERROR, "ACE_EventChannel::report_disconnect"));
 
   this->report_disconnect (event);
 }
@@ -691,14 +700,12 @@ ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw,
 }
 
 void
-ACE_EventChannel::update_consumer_gwys (CORBA::Environment& ACE_TRY_ENV)
+ACE_EventChannel::update_consumer_gwys (CORBA::Environment& TAO_IN_ENV)
 {
   Observer_Map observers;
   {
-    ACE_GUARD_THROW_EX (
-         ACE_ES_MUTEX, ace_mon, this->lock_,
-         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
+    TAO_GUARD_THROW (ACE_ES_MUTEX, ace_mon, this->lock_, TAO_IN_ENV,
+                     RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (this->observers_.current_size () == 0
         || this->state_ == ACE_EventChannel::SHUTDOWN)
@@ -1120,7 +1127,7 @@ ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer,
 void
 ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       Shutdown_Consumer *sc = (Shutdown_Consumer *) request;
 
@@ -1137,26 +1144,24 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
 
       // Deactivate the consumer proxy
       PortableServer::POA_var poa =
-        sc->consumer ()->_default_POA (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        sc->consumer ()->_default_POA (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       PortableServer::ObjectId_var id =
-        poa->servant_to_id (sc->consumer (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        poa->servant_to_id (sc->consumer (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      poa->deactivate_object (id.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      // Delete the consumer proxy, no need to delete it, is is owned
-      // by the POA
-      // delete sc->consumer ();
+      // Delete the consumer proxy.
+      delete sc->consumer ();
 
       if (!dont_update)
-        this->channel_->update_consumer_gwys (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->channel_->update_consumer_gwys (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      ACE_GUARD_THROW_EX (
-          ACE_ES_MUTEX, ace_mon, this->lock_,
-          RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-      ACE_TRY_CHECK;
+      ACE_ES_GUARD ace_mon (lock_);
+      if (ace_mon.locked () == 0)
+        return;
 
       // Tell the channel that we may need to shut down.
       if (all_consumers_.size () <= 0)
@@ -1166,12 +1171,11 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request)
           channel_->report_disconnect_i (ACE_EventChannel::CONSUMER);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Consumer_Module::shutdown_request");
+      TAO_TRY_ENV.print_exception ("Consumer_Module::shutdown_request");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
@@ -1180,7 +1184,7 @@ ACE_ES_Consumer_Module::shutdown (void)
   Consumers copy;
 
   {
-    ACE_Guard<ACE_ES_MUTEX> ace_mon (lock_);
+    ACE_ES_GUARD ace_mon (lock_);
     if (ace_mon.locked () == 0)
       goto DONE;
 
@@ -1219,7 +1223,7 @@ ACE_ES_Consumer_Module::shutdown (void)
 
         // Remove the consumer from our list.
         {
-          ACE_Guard<ACE_ES_MUTEX> ace_mon (lock_);
+          ACE_ES_GUARD ace_mon (lock_);
           if (ace_mon.locked () == 0)
             ACE_ERROR ((LM_ERROR, "%p Failed to acquire lock.\n", "ACE_ES_Consumer_Module::shutdown"));
 
@@ -1227,8 +1231,7 @@ ACE_ES_Consumer_Module::shutdown (void)
             ACE_ERROR ((LM_ERROR, "%p Failed to remove consumer.\n", "ACE_ES_Consumer_Module::shutdown"));
         }
 
-        // No need to delete it, owned by the POA
-        // delete *proxy;
+        delete *proxy;
       }
   }
 
@@ -1238,16 +1241,15 @@ DONE:
 
 void
 ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
 {
   {
-    ACE_GUARD_THROW_EX (
-        ACE_ES_MUTEX, ace_mon, this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
+    ACE_ES_GUARD ace_mon (lock_);
+    if (ace_mon.locked () == 0)
+      TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (all_consumers_.remove (consumer) == -1)
-      ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
+      TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
   }
 
   // Tell everyone else that the consumer is disconnecting.  This
@@ -1255,7 +1257,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
   // etc.  However, messages may still be queued in the ReactorEx or
   // in the Dispatching Module for this consumer, so no queues or
   // proxies can be deleted just yet.
-  down_->disconnecting (consumer, ACE_TRY_ENV);
+  down_->disconnecting (consumer, TAO_IN_ENV);
 
   // Send a shutdown message through the system.  When this is
   // dispatched, the consumer proxy will be deleted.  <request> is
@@ -1265,18 +1267,18 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
 
   // Create a shutdown message.  When this is dispatched, it will
   // delete the proxy.
-  RtecScheduler::Scheduler_var scheduler =
+  RtecScheduler::Scheduler_var scheduler = 
     this->channel_->scheduler ();
   Shutdown_Consumer *sc =
     new Shutdown_Consumer (this, consumer, scheduler.in ());
   if (sc == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Create a wrapper around the dispatch request.
   Flush_Queue_ACT *act =
     new Flush_Queue_ACT (sc, channel_->dispatching_module_);
   if (act == 0)
-    ACE_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) initiating consumer disconnect.\n"));
 
@@ -1287,7 +1289,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer,
                                       act,
                                       ACE_Scheduler_MIN_PREEMPTION_PRIORITY,
                                       ns100,
-                                      ORBSVCS_Time::zero ()) == -1)
+                                      ORBSVCS_Time::zero) == -1)
     {
       ACE_ERROR ((LM_ERROR, "%p queue_request failed.\n", "ACE_ES_Consumer_Module"));
       delete sc;
@@ -1323,11 +1325,8 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request,
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &TAO_IN_ENV)
 {
-  RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy =
-    RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-
   auto_ptr<ACE_Push_Consumer_Proxy> new_consumer (new ACE_Push_Consumer_Proxy (this));
 
   // Get a new supplier proxy object.
@@ -1335,26 +1334,20 @@ ACE_ES_Consumer_Module::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
     {
       ACE_ERROR ((LM_ERROR, "ACE_EventChannel"
                   "::obtain_push_supplier failed.\n"));
-      ACE_THROW_RETURN (CORBA::NO_MEMORY (), proxy);
+      TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
     }
 
   {
-    ACE_GUARD_THROW_EX (
-        ACE_ES_MUTEX, ace_mon, this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK_RETURN (proxy);
+    TAO_GUARD_THROW_RETURN (ACE_ES_MUTEX, ace_mon, this->lock_, 0, TAO_IN_ENV,
+                            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (all_consumers_.insert (new_consumer.get ()) == -1)
       ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n"));
   }
 
-  proxy = new_consumer->_this (ACE_TRY_ENV);
-  TAO_CHECK_RETURN (proxy);
-
-  // Give away ownership to the POA....
-  new_consumer.release ()->_remove_ref ();
-
-  return proxy;
+  // Return the CORBA object reference to the new supplier proxy,
+  // there is no need to hold a pointer, it is now help in the map...
+  return new_consumer.release ()->get_ref (TAO_IN_ENV);
 }
 
 void
@@ -1386,7 +1379,7 @@ ACE_ES_Consumer_Module::fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos)
   CORBA::ULong cc = 0;
   dep[cc].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR;
   dep[cc].event.header.source = 0;
-  dep[cc].event.header.creation_time = ORBSVCS_Time::zero ();
+  dep[cc].event.header.creation_time = ORBSVCS_Time::zero;
   dep[cc].rt_info = 0;
   cc++;
 
@@ -1431,7 +1424,7 @@ ACE_ES_Consumer_Module::fill_qos (RtecEventChannelAdmin::ConsumerQOS& c_qos)
             {
               dep[cc].event.header.type = event.header.type;
               dep[cc].event.header.source = event.header.source;
-              dep[cc].event.header.creation_time = ORBSVCS_Time::zero ();
+              dep[cc].event.header.creation_time = ORBSVCS_Time::zero;
               // The RT_Info is filled up later.
               dep[cc].rt_info = 0;
               cc++;
@@ -2093,57 +2086,57 @@ ACE_ES_Dispatch_Request *
 ACE_ES_Consumer_Correlation::correlate (ACE_ES_Consumer_Rep *cr,
                                         const TAO_EC_Event &event)
 {
-  // If the consumer has specified correlation criteria, then we must
-  // first acquire the mutex.
-  ACE_Guard<ACE_ES_MUTEX> ace_mon (lock_);
-  if (ace_mon.locked () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                       "ACE_ES_Consumer_Correlation::push"), 0);
-
-  int bit = ACE_INT2BIT[cr->type_id ()];
-  if (ACE_BIT_DISABLED (this->pending_flags_, bit))
-    {
-      // Add the new event to the pending events.
-      pending_events_[cr->type_id ()] += event;
-      // Set the bit corresponding to the arrived event.
-      // This should be pending_flags_->event_arrived (index);
-      ACE_SET_BITS (pending_flags_, bit);
-    }
-
-  ACE_ES_Dispatch_Request *request = 0;
-  TAO_EC_Event_Array *outbox = 0;
-  // Since add_events changes pending_flags_, we need to keep this
-  // for all iterations through the conjunction groups.
-  u_long freeze_pending_flags = pending_flags_;
-
-  for (int x=0; x < n_conjunction_groups_; x++)
-    {
-      if (conjunction_groups_[x].should_forward (freeze_pending_flags))
-        {
-          // If there is a deadline timer for this conjunction group,
-          // this will reschedule them.
-          conjunction_groups_[x].reschedule_deadline ();
-
-          // First time in, allocate the new dispatch request.
-          if (request == 0)
-            {
-              request =
-                new ACE_ES_Dispatch_Request (consumer_,
-                                             cr->dependency ()->rt_info);
-              if (request == 0)
-                ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
-                                   "ACE_ES_Consumer_Correlation::correlate"), 0);
-              outbox = &(request->event_set ());
-            }
-
-          // Add each of the pending events for this correlation to
-          // the outgoing dispatch request.  If outbox == 0, then
-          // this will just clear any pending events.
-          conjunction_groups_[x].add_events (outbox,
-                                             pending_events_,
-                                             pending_flags_);
-        }
-    }
+   // If the consumer has specified correlation criteria, then we must
+   // first acquire the mutex.
+   ACE_ES_GUARD ace_mon (lock_);
+   if (ace_mon.locked () == 0)
+     ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
+                        "ACE_ES_Consumer_Correlation::push"), 0);
+
+   int bit = ACE_INT2BIT[cr->type_id ()];
+   if (ACE_BIT_DISABLED (this->pending_flags_, bit))
+     {
+       // Add the new event to the pending events.
+       pending_events_[cr->type_id ()] += event;
+       // Set the bit corresponding to the arrived event.
+       // This should be pending_flags_->event_arrived (index);
+       ACE_SET_BITS (pending_flags_, bit);
+     }
+
+   ACE_ES_Dispatch_Request *request = 0;
+   TAO_EC_Event_Array *outbox = 0;
+   // Since add_events changes pending_flags_, we need to keep this
+   // for all iterations through the conjunction groups.
+   u_long freeze_pending_flags = pending_flags_;
+
+   for (int x=0; x < n_conjunction_groups_; x++)
+     {
+       if (conjunction_groups_[x].should_forward (freeze_pending_flags))
+         {
+           // If there is a deadline timer for this conjunction group,
+           // this will reschedule them.
+           conjunction_groups_[x].reschedule_deadline ();
+
+           // First time in, allocate the new dispatch request.
+           if (request == 0)
+             {
+               request =
+                 new ACE_ES_Dispatch_Request (consumer_,
+                                              cr->dependency ()->rt_info);
+               if (request == 0)
+                 ACE_ERROR_RETURN ((LM_ERROR, "%p.\n",
+                                    "ACE_ES_Consumer_Correlation::correlate"), 0);
+               outbox = &(request->event_set ());
+             }
+
+           // Add each of the pending events for this correlation to
+           // the outgoing dispatch request.  If outbox == 0, then
+           // this will just clear any pending events.
+           conjunction_groups_[x].add_events (outbox,
+                                              pending_events_,
+                                              pending_flags_);
+         }
+     }
 
    return request;
 }
@@ -2373,15 +2366,14 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s
 
 void
 ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_WRITE_GUARD_THROW_EX (
-      ACE_ES_RW_LOCK, ace_mon, this->lock_,
-      RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-  ACE_CHECK;
+  ACE_ES_WGUARD ace_mon (lock_);
+  if (ace_mon.locked () == 0)
+    TAO_THROW (RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
   if (all_suppliers_.remove (supplier) == -1)
-    ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
+    TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
 
   // Remove all consumers from the supplier's source-based subscription lists.
   ACE_ES_Subscription_Info::Subscriber_Set_Iterator source_iterator
@@ -3142,19 +3134,17 @@ ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier,
 
 void
 ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
 {
   CORBA::Boolean need_update = 0;
   {
-    ACE_GUARD_THROW_EX (
-        ACE_ES_MUTEX, ace_mon, this->lock_,
-        RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK;
+    TAO_GUARD_THROW (ACE_SYNCH_MUTEX,  ace_mon, this->lock_, TAO_IN_ENV,
+                     RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (all_suppliers_.remove (supplier) == -1)
-      ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
+      TAO_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR());
 
-    up_->disconnecting (supplier, ACE_TRY_ENV);
+    up_->disconnecting (supplier, TAO_IN_ENV);
 
     if (this->all_suppliers_.size () <= 0)
       {
@@ -3171,7 +3161,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier,
     // CORBA::release (supplier);
   }
   if (need_update)
-    this->channel_->update_supplier_gwys (ACE_TRY_ENV);
+    this->channel_->update_supplier_gwys (TAO_IN_ENV);
 }
 
 void
@@ -3180,7 +3170,9 @@ ACE_ES_Supplier_Module::shutdown (void)
   Suppliers copy;
 
   {
-    ACE_GUARD (ACE_ES_MUTEX, ace_mon, this->lock_);
+    ACE_ES_GUARD ace_mon (lock_);
+    if (ace_mon.locked () == 0)
+      return;
 
     copy = all_suppliers_;
   }
@@ -3204,33 +3196,22 @@ ACE_ES_Supplier_Module::shutdown (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+ACE_ES_Supplier_Module::obtain_push_consumer (CORBA::Environment &TAO_IN_ENV)
 {
-  RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy =
-    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-
   auto_ptr<ACE_Push_Supplier_Proxy> new_supplier (new ACE_Push_Supplier_Proxy (this));
 
   if (new_supplier.get () == 0)
-    ACE_THROW_RETURN (CORBA::NO_MEMORY (), proxy);
+    TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
   {
-    ACE_GUARD_THROW_EX (
-         ACE_ES_MUTEX, ace_mon, this->lock_,
-         RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
-    ACE_CHECK_RETURN (proxy);
+    TAO_GUARD_THROW_RETURN (ACE_ES_MUTEX, ace_mon, this->lock_, 0, TAO_IN_ENV,
+                            RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR());
 
     if (all_suppliers_.insert (new_supplier.get ()) == -1)
       ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n"));
   }
 
-  proxy = new_supplier->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (proxy);
-
-  // Give ownership to the POA
-  new_supplier.release ()->_remove_ref ();
-
-  return proxy;
+  return new_supplier.release ()->get_ref (TAO_IN_ENV);
 }
 
 void
@@ -3244,7 +3225,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy,
     TAO_EC_Event_Set::_create (event_set);
 
   if (event == 0)
-    TAO_THROW (CORBA::NO_MEMORY ());
+    TAO_THROW (CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // ACE_DEBUG ((LM_DEBUG, "EC (%t) Supplier_Module::push\n"));
   for (CORBA::ULong i = 0; i < event->length (); ++i)
@@ -3323,7 +3304,7 @@ ACE_ES_Supplier_Module::fill_qos (RtecEventChannelAdmin::SupplierQOS& s_qos)
             {
               pub[sc].event.header.type = event.header.type;
               pub[sc].event.header.source = event.header.source;
-              pub[sc].event.header.creation_time = ORBSVCS_Time::zero ();
+              pub[sc].event.header.creation_time = ORBSVCS_Time::zero;
               pub[sc].dependency_info.dependency_type =
                 RtecScheduler::TWO_WAY_CALL;
               pub[sc].dependency_info.number_of_calls = 1;
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
index 71792377d92..beaec387aef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h
@@ -100,10 +100,6 @@ void TAO_ORBSVCS_Export dump_event (const RtecEventComm::Event &event);
 // ************************************************************
 
 
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
 class TAO_ORBSVCS_Export ACE_RTU_Manager
 // = TITLE
 //   ACE RTU Manager
@@ -188,7 +184,7 @@ public:
   // enumerations defined below.
   // By default we activate the threads on construction, but it is
   // possible to create the EC first and activate the threads later.
-  // A factory for the modules can be provided, by default it uses
+  // A factory for the modules can be provided, by default it uses 
   // TAO_EC_Default_Module_Factory
   // If an scheduler is not provided it uses the singleton in
   // ACE_Scheduler_Factory.
@@ -266,7 +262,7 @@ public:
                       const ACE_Command_Base *act,
                       RtecScheduler::OS_Priority preemption_priority,
                       const RtecScheduler::Time& delta,
-                      const RtecScheduler::Time& interval = ORBSVCS_Time::zero ());
+                      const RtecScheduler::Time& interval = ORBSVCS_Time::zero);
   // Schedule a timer at the appropriate priority for <preemption_priority>.
   // Returns the preemption priority used on success, -1 on failure.
 
@@ -1248,8 +1244,7 @@ class ACE_EventChannel;
 
 // = Event Channel interfaces.
 
-class TAO_ORBSVCS_Export ACE_Push_Supplier_Proxy : public POA_RtecEventChannelAdmin::ProxyPushConsumer, public PortableServer::RefCountServantBase
-//
+class TAO_ORBSVCS_Export ACE_Push_Supplier_Proxy : public POA_RtecEventChannelAdmin::ProxyPushConsumer
 // = TITLE
 //    Push Supplier Proxy.
 //
@@ -1283,6 +1278,9 @@ public:
 
   // = Operations for the Event Channel.
 
+  RtecEventChannelAdmin::ProxyPushConsumer_ptr get_ref (CORBA::Environment &);
+  // Allow transformations to RtecEventChannelAdmin::ProxyPushConsumer.
+
   int connected (void);
   // Returns 1 if the proxy has been connected to a "remote" client.
 
@@ -1325,8 +1323,7 @@ private:
 
 // ************************************************************
 
-class TAO_ORBSVCS_Export ACE_Push_Consumer_Proxy : public POA_RtecEventChannelAdmin::ProxyPushSupplier, public PortableServer::RefCountServantBase
-//
+class TAO_ORBSVCS_Export ACE_Push_Consumer_Proxy : public POA_RtecEventChannelAdmin::ProxyPushSupplier
 // = TITLE
 //     Push Consumer Proxy.
 //
@@ -1372,6 +1369,9 @@ public:
   void shutdown (void);
   // Actively disconnect from the consumer.
 
+  RtecEventChannelAdmin::ProxyPushSupplier_ptr get_ref (CORBA::Environment &);
+  // Allow transformations to RtecEventChannelAdmin::ProxyPushSupplier.
+
   ACE_ES_Consumer_Correlation &correlation (void);
   // Access the consumer-specific Consumer_Correlation.
 
@@ -1398,8 +1398,4 @@ private:
 #include "Event_Channel.i"
 #endif /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
 #endif /* ACE_EVENT_CHANNEL_H */
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index 95618c081de..ae9c1904ea6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -11,6 +11,12 @@ const unsigned int ACE_INT2BIT[32] =
 
 // **************************************************
 
+ACE_INLINE RtecEventChannelAdmin::ProxyPushConsumer_ptr
+ACE_Push_Supplier_Proxy::get_ref (CORBA::Environment &env)
+{
+  return this->_this (env);
+}
+
 ACE_INLINE int
 ACE_Push_Supplier_Proxy::connected (void)
 {
@@ -50,6 +56,12 @@ ACE_Push_Supplier_Proxy::qos (void) const
 
 // **************************************************
 
+ACE_INLINE RtecEventChannelAdmin::ProxyPushSupplier_ptr
+ACE_Push_Consumer_Proxy::get_ref (CORBA::Environment &env)
+{
+  return this->_this (env);
+}
+
 ACE_INLINE RtecEventChannelAdmin::ConsumerQOS &
 ACE_Push_Consumer_Proxy::qos (void)
 {
@@ -378,7 +390,7 @@ ACE_RTU_Manager::should_preempt (void)
       // find out what it is supposed to do.
       ACE_ERROR ((LM_WARNING,
 		  "EC (%t) RTU_Manager::should_preempt - obsolete\n"));
-
+		 
       int should_preempt = should_preempt_;
       should_preempt_ = 0;
       return should_preempt;
@@ -739,3 +751,4 @@ ACE_EventChannel::scheduler (void)
 }
 
 // ************************************************************
+
diff --git a/TAO/orbsvcs/orbsvcs/Event/Makefile.am b/TAO/orbsvcs/orbsvcs/Event/Makefile.am
deleted file mode 100644
index c3d26dff635..00000000000
--- a/TAO/orbsvcs/orbsvcs/Event/Makefile.am
+++ /dev/null
@@ -1,149 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Event Channel library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Event.la
-
-libTAO_Event_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Event_la_SOURCES = \
-        BCU.cpp \
-        Dispatching_Modules.cpp \
-        EC_Basic_Factory.cpp \
-        EC_Basic_Filter_Builder.cpp \
-        EC_Busy_Lock.cpp \
-        EC_Command.cpp \
-        EC_Conjunction_Filter.cpp \
-        EC_ConsumerAdmin.cpp \
-        EC_Disjunction_Filter.cpp \
-        EC_Dispatching.cpp \
-        EC_Event_Channel.cpp \
-        EC_Factory.cpp \
-        EC_Filter.cpp \
-        EC_Filter_Builder.cpp \
-        EC_Gateway.cpp \
-        EC_Gateway_UDP.cpp \
-        EC_Null_Factory.cpp \
-        EC_ObserverStrategy.cpp \
-        EC_Per_Supplier_Filter.cpp \
-        EC_ProxyConsumer.cpp \
-        EC_ProxyPushSupplier_Set.cpp \
-        EC_ProxyPushSupplier_Set_T.cpp \
-        EC_ProxySupplier.cpp \
-        EC_QOS_Info.cpp \
-        EC_Reactive_Timeout_Generator.cpp \
-        EC_SupplierAdmin.cpp \
-        EC_SupplierFiltering.cpp \
-        EC_Timeout_Filter.cpp \
-        EC_Timeout_Generator.cpp \
-        EC_Type_Filter.cpp \
-        EC_UDP_Admin.cpp \
-        Event_Channel.cpp \
-        Event_Manip.cpp \
-        GPlot_File.cpp \
-        Local_ESTypes.cpp \
-        Memory_Pools.cpp \
-        Module_Factory.cpp \
-        RT_Task.cpp \
-        ReactorTask.cpp \
-        Timer_Module.cpp
-
-noinst_HEADERS = \
-        BCU.h \
-        Debug_Macros.h \
-        Dispatching_Modules.h \
-        Dispatching_Modules.i \
-        EC_Basic_Factory.h \
-        EC_Basic_Factory.i \
-        EC_Basic_Filter_Builder.h \
-        EC_Basic_Filter_Builder.i \
-        EC_Busy_Lock.h \
-        EC_Busy_Lock.i \
-        EC_Command.h \
-        EC_Command.i \
-        EC_Conjunction_Filter.h \
-        EC_Conjunction_Filter.i \
-        EC_ConsumerAdmin.h \
-        EC_ConsumerAdmin.i \
-        EC_Disjunction_Filter.h \
-        EC_Disjunction_Filter.i \
-        EC_Dispatching.h \
-        EC_Dispatching.i \
-        EC_Event_Channel.h \
-        EC_Event_Channel.i \
-        EC_Factory.h \
-        EC_Factory.i \
-        EC_Filter.h \
-        EC_Filter.i \
-        EC_Filter_Builder.h \
-        EC_Filter_Builder.i \
-        EC_Gateway.h \
-        EC_Gateway_UDP.h \
-        EC_Gateway_UDP.i \
-        EC_Null_Factory.h \
-        EC_Null_Factory.i \
-        EC_ObserverStrategy.h \
-        EC_ObserverStrategy.i \
-        EC_Per_Supplier_Filter.h \
-        EC_Per_Supplier_Filter.i \
-        EC_ProxyConsumer.h \
-        EC_ProxyConsumer.i \
-        EC_ProxyPushSupplier_Set.h \
-        EC_ProxyPushSupplier_Set.i \
-        EC_ProxyPushSupplier_Set_T.h \
-        EC_ProxyPushSupplier_Set_T.i \
-        EC_ProxySupplier.h \
-        EC_ProxySupplier.i \
-        EC_QOS_Info.h \
-        EC_QOS_Info.i \
-        EC_Reactive_Timeout_Generator.h \
-        EC_Reactive_Timeout_Generator.i \
-        EC_SupplierAdmin.h \
-        EC_SupplierAdmin.i \
-        EC_SupplierFiltering.h \
-        EC_SupplierFiltering.i \
-        EC_Timeout_Filter.h \
-        EC_Timeout_Filter.i \
-        EC_Timeout_Generator.h \
-        EC_Timeout_Generator.i \
-        EC_Type_Filter.h \
-        EC_Type_Filter.i \
-        EC_UDP_Admin.h \
-        Event_Channel.h \
-        Event_Channel.i \
-        Fast_Reactor.h \
-        GPlot_File.h \
-        GPlot_File.i \
-        Local_ESTypes.h \
-        Local_ESTypes.i \
-        Memory_Pools.h \
-        Memory_Pools.i \
-        Module_Factory.h \
-        RT_Task.h \
-        RT_Task.i \
-        ReactorTask.h \
-        Timer_Module.h \
-        Timer_Module.i
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
index a90709b3ed1..62e604203dc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Module_Factory.cpp
@@ -167,8 +167,6 @@ TAO_Reactive_Module_Factory::destroy_supplier_module (ACE_ES_Supplier_Module* x)
 TAO_EC_Timer_Module*
 TAO_Reactive_Module_Factory::create_timer_module (ACE_EventChannel* ec)
 {
-  ACE_UNUSED_ARG (ec);
-
   return new TAO_EC_ST_Timer_Module (TAO_ORB_Core_instance ()->reactor ());
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/README b/TAO/orbsvcs/orbsvcs/Event/README
index a4c88f35452..5da01f9baf6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/README
+++ b/TAO/orbsvcs/orbsvcs/Event/README
@@ -15,9 +15,6 @@ channel, yet it will be properly strategized so it can be adapted and
 extended to other domains (such as distributed interactive
 simulation).
 
-= Thanks to Irfan for providing feedback on this document and
-  designing the delayed operation for the event dispatching.
-
 = The module architecture
 
         The current event channel is based on a series of modules
@@ -34,8 +31,6 @@ operations on each module need to be strategized, and that using
 Template Method or Strategy on each module would be a better solution
 than to replace the module wholesale.
 
-= The new architecture
-
         The new Event Channel will consist of the following
 components:
 
@@ -66,14 +61,7 @@ components:
   are needed (until we arrive to the dispatching module).
 
     This filter objects can also be used to strategize the priority
-  assignment in conjuctive and disjunctive correlations; for example,
-  some consumers may require a fixed priority for disjunctions or the
-  highest priority for conjunctions, instead of just the priority of
-  the last event.
-
-    Another feature that can be implemented using filters is a
-  per-consumer buffering policy, thanks to John Aughey
-  <jaughey@mdc.com> for putting this idea in my head.
+  assignment in conjuctive and disjunctive correlations.
 
 - The Dispatching module: as in the original event channel
   implementation there are multiple ways to dispatch events, this
@@ -81,29 +69,6 @@ components:
       Possible implementations: Reactive Dispatching, a single queue
   served by multiple threads, multiple queues serviced by threads at
   different priorities.
-      An interesting challenge to solve in this module is to minimize
-  the amount of copying of events, for instance:
-    + Reactive dipatching does not require any copies for an event,
-      the event is simply pushed from the supplier to the consumer.
-    + If the dispatching module has any form of queueing then at least 
-      one copy must be made. Ideally we want to avoid making multiple
-      copies for each consumer interested in the event; a potential
-      solution is to let the dispatching module create up front a
-      "reference counted" version of the event; this reference counted 
-      version is used by the SupplierFiltering strategy to push to
-      each consumer. 
-      @@ TODO: how do we match this with the filtering interfaces?
-
-  Another important aspect of dispatching:
-    + If the dispatcher is reactive then there is potential for
-      dead-lock, the consumer may decide to disconnect itself during
-      the upcall or to dispatch another event.
-      The dispatching module will call back the EC_ProxyPushSupplier
-      to handle the final dispatch.
-      With Reactive dispatching the ProxyPushSupplier should use
-      recursive locks, with non-reactive dispatching regular locks
-      could be enough.
-      @@ TODO ensure that only the right people calls this method.
 
 - The ConsumerAdmin module: this object acts as a factory for the
   ProxyPushSupplier objects (i.e. the interface between the event
@@ -111,22 +76,21 @@ components:
   channel implementation to create the objects, and provides a simple
   mechanism to control the object activation in different POAs: it
   queries the Event Channel for the right POA to use.
-      Possible implementations: it could keep the consumers classified 
-  by the events they consume, minimizing the time required to
-  connect/disconnect a consumer or to dispatch an event
-  [see the relationship with SupplierFiltering]
+      Possible implementations: it could keep the suppliers classified 
+  by the events they push, minimizing the time required to
+  connect/disconnect a consumer.
 
 - The SupplierAdmin module: this is a factory for the
   ProxyPushConsumer objects (again delegating on the event channel);
   it also provides the user with control over the proxy activation.
-  It provides two template methods that can be used to:
+  It provides two template method that can be used to:
     + Inform all supplier that a consumer has connected/disconnected.
     + Inform only the suppliers that are publish the events in the
       consumer.
     + Do not inform the suppliers.
-      Possible implementations: it could keep the supplier classified 
-  by the events they publish, minimizing the time to
-  connect/disconnect a supplier.
+      Possible implementations: it could keep the consumers classified 
+  by the events they push, minimizing the time to connect/disconnect a
+  supplier.
 
 - The ProxyPushSupplier object delegates on the filter to do most of
   its job, but it can be subclassed to provide event counting and
@@ -163,19 +127,15 @@ components:
        for filtering (using the EC_Filter objects).
 
   An interesting aspect of this object is how is it to manage event
-  dispatching: will it iterate over the set of consumers (holding a
+  dispatching: will it iterate over the set of consumers (holdign a
   lock?) and just dispatch the event to each one? Will it make a copy
   of the consumers (reducing the duration of the lock)?  We forsee
   several alternatives:
-
 	+ Simply iterate over the set of consumers for the current
 	  supplier (can be a global set), holding a lock as we go.
 	  This is potentially the most efficient version, but it can
 	  suffer from priority inversion because the lock is held for
-	  a long time. 
-	  It can also produce dead-locks if there is no queueing in
-	  the dispatching module. 
-
+	  a long time.
 	+ Make a copy of the current set of consumers, unfortunately
 	  this could requires a memory allocation, and potentially
 	  increasing the reference count on the consumers.
@@ -193,20 +153,6 @@ components:
 	  the array, the dispatching to each consumer is done after
 	  releasing the global lock.
 
-	+ Mark the list as "busy" so no changes will be made to it
-	  while we iterate over it.  Instead, any changes to the list
-	  are "posted" in a list of Command objects.
-	  After finishing the iteration the lock is acquired again,
-	  the is is marked as "idle" and any posted operations are
-	  executed.
-	  "busy" and "idle" could be implemented using a reference
-	  count; so multiple "reader" threads can go in [with a
-	  limit?]
-	  Drawbacks: can lead to dead-lock if the HWM is reached when
-	  a consumer that also plays the Supplier role pushes an event 
-	  as part of its upcall.
-	  Can give too much priority to the writes if the HWM is 1.
-
 - The Timer_Module: this is used by the EC_Filter_Builder to create
   per-consumer timeout events. It will simply push events directly to
   the EC_ProxyPushSupplier objects.
@@ -222,44 +168,6 @@ components:
   factory because not all the combinations of the classes described
   make sense.
 
-= Interactions
-
-  The architecture described above is a bit hard to understand if we
-  don't describe the interaction between all the components above:
-
-  - Dispatching an event: the path to dispatch an event starts with an 
-    EC_ProxyPushConsumer that receives the event from its supplier, 
-    it simply delegates on the SupplierFiltering object bound to it at 
-    creation time.
-    The SupplierFiltering object pushes the event [since the event is
-    a set it has to push one event at a time] to the a set of
-    ProxyPushSuppliers [recall that this are the consumer ambassadors] 
-    They pass the event through their own set of filters, if the
-    filter accepts the event it callbacks on the ProxyPushSupplier.
-    At that point the ProxyPushSupplier requests that the
-    DispatchingModule pushes the event.
-    The dispatching module finally pushes the event to the consumer.
-
-  - Adding a consumer:
-    The client calls for_consumers() and obtain_push_supplier() to
-    obtain a reference to the [global] ConsumerAdmin object and to its 
-    own ProxyPushSupplier object.
-    The ProxyPushSupplier object is initially empty, once the user
-    calls connect_push_consumer() on it the set of filters is created
-    using the Filter_Builder strategy and the user supplied QoS
-    parameters.
-    At this point the ProxyPushSupplier becomes "connected" and it
-    uses the Event_Channel implementation to broadcast its
-    subscriptions to all the Suppliers in the set.
-
-  - Adding a supplier:
-
-  - Removing a consumer:
-
-  - Removing a supplier:
-
-  - Shutting down the event channel:
-
 = Performance
 
   The main sources of overhead in the EC are:
@@ -271,7 +179,7 @@ components:
   the new design do not neglect this issues, for instance:
 
   - The EC_Factory creates strategized locks, so the single threaded
-    implementations can perform optimally.
+    implementations can perform correctly.
 
   - Each consumer has its own filters, so no locking is required at
     each filter (just one for the consumer).
@@ -310,13 +218,13 @@ components:
     events with no data copying (with Reactive dispatching) and with 
     only one data copy (if Prioritized dispatching is used).
     We believe that even this extra data copy could be minimized in
-    the multi-threaded case (or at least limited to the event header
-    and avoided for the event payload).
+    the multi-threaded case (or at least avoided for that event
+    payload).
 
 	In general we expect that the performance of the new real-time 
 Event Service will be equal or better than the previous
-implementation. As we mention above initial experiments suggest that
-this is going to be the case.
+implementation. Initial experiments suggest that this is going to be
+the case.
 
 = Locking revisited
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
index 729284fdf1d..2fcf5663853 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp
@@ -18,7 +18,7 @@ static const char *TAO_Reactor_Task_Timeprobe_Description[] =
 
 enum
 {
-  // Timeprobe description table start key
+  // Timeprobe description table start key 
   TAO_REACTOR_TASK_WAITING_FOR_EVENTS = 5300,
   TAO_REACTOR_TASK_EVENTS_HANDLED
 };
@@ -81,12 +81,12 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
             this->scheduler_->set
               (rt_info_,
                RtecScheduler::VERY_HIGH_CRITICALITY,
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
                period,
                RtecScheduler::VERY_LOW_IMPORTANCE,
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
                1,
                RtecScheduler::OPERATION,
                TAO_TRY_ENV);
@@ -94,12 +94,12 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period)
             ACE_Scheduler_Factory::server()->set
               (rt_info_,
                RtecScheduler::VERY_HIGH_CRITICALITY,
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
+               ORBSVCS_Time::zero,
                period,
                RtecScheduler::VERY_LOW_IMPORTANCE,
-               ORBSVCS_Time::zero (),
+               ORBSVCS_Time::zero,
                1,
                RtecScheduler::OPERATION,
                TAO_TRY_ENV);
diff --git a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
index 05c3f23f6d3..45cd920e38a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Timer_Module.cpp
@@ -25,7 +25,7 @@ enum
 {
   // Timeprobe description table start key
   TAO_EC_TIMER_MODULE_START_EXECUTE = 5400,
-  TAO_EC_TIMER_MODULE_END_EXECUTE
+  TAO_EC_TIMER_MOUDLE_END_EXECUTE
 };
 
 // Setup Timeprobes
@@ -124,12 +124,12 @@ TAO_EC_RPT_Timer_Module::
 {
   if (CORBA::is_nil (scheduler))
     {
-      this->scheduler_ =
+      this->scheduler_ = 
         RtecScheduler::Scheduler::_duplicate (ACE_Scheduler_Factory::server ());
     }
   else
     {
-      this->scheduler_ =
+      this->scheduler_ = 
         RtecScheduler::Scheduler::_duplicate (scheduler);
     }
   for (int i = 0; i < ACE_Scheduler_MAX_PRIORITIES; ++i)
@@ -195,7 +195,7 @@ TAO_EC_RPT_Timer_Module::shutdown (void)
     }
 
   if (this->ThrMgr ()->wait () == -1)
-    ACE_ERROR ((LM_ERROR, "%p\n", "EC (%t) Timer_Module wait"));
+    ACE_ERROR ((LM_DEBUG, "%p\n", "EC (%t) Timer_Module wait"));
 }
 
 RtecScheduler::handle_t
@@ -267,7 +267,8 @@ TAO_EC_Timeout_Handler::handle_timeout (const ACE_Time_Value &,
                        "received act == 0!!!.\n"), 0);
 
   {
-    ACE_FUNCTION_TIMEPROBE (TAO_EC_TIMER_MODULE_START_EXECUTE);
+    ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_ES_PRIORITY_QUEUE_START_EXECUTE);
+
     act->execute ();
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
index 0e72ce3b192..dd91d88c36e 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -46,9 +46,6 @@ const long ACE_ES_CONJUNCTION_DESIGNATOR = 8;
 const long ACE_ES_DISJUNCTION_DESIGNATOR = 9;
 const long ACE_ES_EVENT_UNDEFINED = 16;
 
-// = Predefined event sources.
-const long ACE_ES_EVENT_SOURCE_ANY = 0;
-
 // The max number of priorities provided by the target platform.
 // TODO: This should be defined in ACE (somehow) and only mapped here
 // to some variables (and even that is doubtful).
@@ -76,13 +73,8 @@ const u_long ACE_Scheduler_MAX_SUB_PRIORITY =
 const u_long ACE_Scheduler_MIN_SUB_PRIORITY =
       ACE_Message_Block::MB_NORMAL;
 
-#if defined(TAO_EC_USE_RECURSIVE_MUTEX)
-typedef ACE_SYNCH_RECURSIVE_MUTEX ACE_ES_MUTEX;
-typedef ACE_Guard<ACE_ES_RECURSIVE_MUTEX> ACE_ES_GUARD;
-#else
 typedef ACE_SYNCH_MUTEX ACE_ES_MUTEX;
 typedef ACE_Guard<ACE_ES_MUTEX> ACE_ES_GUARD;
-#endif
 
 typedef ACE_SYNCH_RW_MUTEX ACE_ES_RW_LOCK;
 typedef ACE_Write_Guard<ACE_ES_RW_LOCK> ACE_ES_WGUARD;
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
index 34fb9916eaa..53910d1ac1c 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
@@ -22,7 +22,7 @@ ACE_ConsumerQOS_Factory::insert_type (RtecEventComm::EventType type,
 				      RtecScheduler::handle_t rt_info)
 {
   RtecEventChannelAdmin::Dependency dependency;
-  dependency.event.header.source = ACE_ES_EVENT_SOURCE_ANY;
+  dependency.event.header.source = 0;
   dependency.event.header.type = type;
   //dependency.event.header.creation_time = 0;
   //dependency.event.header.ec_recv_time = 0;
@@ -51,7 +51,7 @@ ACE_ConsumerQOS_Factory::insert_time (RtecEventComm::EventType type,
 				      RtecScheduler::handle_t rt_info)
 {
   RtecEventChannelAdmin::Dependency dependency;
-  dependency.event.header.source = ACE_ES_EVENT_SOURCE_ANY;
+  dependency.event.header.source = 0;
   dependency.event.header.type = type;
   dependency.event.header.creation_time = interval;
   //dependency.event.header.ec_recv_time = 0;
@@ -73,7 +73,7 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act)
   return this->insert (dependency);
 }
 
-ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS&
+ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& 
 ACE_ConsumerQOS_Factory::get_ConsumerQOS (void)
 {
   return qos_;
@@ -87,7 +87,7 @@ ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (voi
 
 // ************************************************************
 
-ACE_INLINE const RtecEventChannelAdmin::SupplierQOS&
+ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& 
 ACE_SupplierQOS_Factory::get_SupplierQOS (void)
 {
   return qos_;
diff --git a/TAO/tao/IOR_LookupTable.cpp b/TAO/orbsvcs/orbsvcs/IOR_LookupTable.cpp
index 5ed31afa4b0..b2e503b427e 100644
--- a/TAO/tao/IOR_LookupTable.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_LookupTable.cpp
@@ -1,9 +1,8 @@
 // $Id$
 
-#include "tao/IOR_LookupTable.h"
-#include "tao/debug.h"
+#include "IOR_LookupTable.h"
 
-ACE_RCSID(tao, IOR_TableLookup, "$Id$")
+ACE_RCSID(orbsvcs, IOR_TableLookup, "$Id$")
 
   // = Initialization and termination methods.
 TAO_IOR_LookupTable::TAO_IOR_LookupTable (void)
@@ -26,56 +25,42 @@ return 0;
 }
 
 int
-TAO_IOR_LookupTable::add_ior (ACE_CString &object_name,
-                              ACE_CString &ior)
+TAO_IOR_LookupTable::add_ior (const ACE_CString &object_name,
+                              const ACE_CString &ior)
 {
+
   // Make an entry in the table.
   switch (this->hash_map_.bind (object_name, ior))
     {
     case 1 : // object name already exists in the table.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Object Name already exists in the IOR table\n"));
       return 1;
     case -1 : // Failure.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) Unable to bind in IOR tao\n"));
       return -1;
     }
 
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IOR Table: <%s> -> <%s>\n",
-                object_name.c_str (),
-                ior.c_str ()));
-
   return 0;
 }
 
 int
-TAO_IOR_LookupTable::find_ior (ACE_CString &object_name,
+TAO_IOR_LookupTable::find_ior (const ACE_CString &object_name,
                                ACE_CString &ior)
 {
   // Find the IOR corresponding to the object name.
   // returns 0 on success.
   //        -1 on failure.
 
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) IOR Table find <%s>\n",
-                object_name.c_str ()));
-
   return this->hash_map_.find (object_name, ior);
-
 }
 
+
 #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>;
 template class ACE_Hash_Map_Iterator<ACE_CString,ACE_CString,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<ACE_CString, ACE_CString>;
+template class ACE_Hash<ACE_CString>;
+template class ACE_Equal_To<ACE_CString>;
 template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
@@ -85,6 +70,8 @@ template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, ACE_CString, ACE_Hash<
 #pragma instantiate ACE_Hash_Map_Iterator<ACE_CString,ACE_CString,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, ACE_CString>
+#pragma instantiate ACE_Hash<ACE_CString>
+#pragma instantiate ACE_Equal_To<ACE_CString>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, ACE_CString, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_CString, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_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/orbsvcs/orbsvcs/IOR_LookupTable.h
index b15c162781c..00a3863c056 100644
--- a/TAO/tao/IOR_LookupTable.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_LookupTable.h
@@ -7,15 +7,14 @@
 //    TAO/orbsvcs/orbsvcs
 //
 // = FILENAME
-//   IOR_LookupTable.h
+//    IOR_LookupTable.h
 //
 // = DESCRIPTION
-//   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
-//   etc. This class is going to be used as a backing store by the
-//   resolve initial references. IOR_Multicast will be responsible for
-//   initialising this class.
+//    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 etc. This class is going to be used as a backing store
+//    by the resolve initial references. IOR_Multicast will be responsible for initialising
+//    this class.
 //
 // = AUTHOR
 //   Vishal Kachroo.
@@ -27,18 +26,17 @@
 
 #include "ace/Synch_T.h"
 #include "ace/Hash_Map_Manager.h"
-#include "tao/corbafwd.h"
+#include "orbsvcs/orbsvcs_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class TAO_Export TAO_IOR_LookupTable
+class TAO_ORBSVCS_Export TAO_IOR_LookupTable
 {
-  // @@ Vishal, the DESCRIPTION above belongs to the class, not to the 
-  // file, please move it here...
-  //
+
 public:
+
   // = Initialization and termination methods.
   TAO_IOR_LookupTable (void);
   // Constructor.
@@ -50,21 +48,20 @@ public:
   // This creates and initialises the table.
   // Currently, the hash map manager.
 
-  int add_ior (ACE_CString &object_name,
-               ACE_CString &ior);
+  int add_ior (const ACE_CString &object_name,
+               const ACE_CString &ior);
   // Associate <object_name> with <ior>.  If <object_name> is already in the
   // map then the <ACE_Hash_Map_Entry> is not changed.  Returns 0 if a
   // new IOR is bound successfully, returns 1 if an attempt is made
   // to bind an existing object_name, and returns -1 if failures occur.
 
-  int find_ior (ACE_CString &object_name,
+  int find_ior (const ACE_CString &object_name,
                 ACE_CString &ior);
   // Locate <object_name> and pass out parameter via <ior>.  If the IOR is
   // found, return 0. Return -1 if not found.
 
 private:
-  // @@ Vishal the following two fields are not used in the class, do
-  // you have any plans for them or should we zap them?
+
   ACE_CString object_name_;
   // object string to do the lookup with.
 
@@ -72,9 +69,10 @@ private:
   // IOR returned as a result of the lookup.
 
   ACE_Hash_Map_Manager<ACE_CString,
-    ACE_CString,
-    ACE_Null_Mutex> hash_map_;
+                       ACE_CString,
+                       ACE_Null_Mutex> hash_map_;
   // Maintains the table of object_names -> IORs.
+
 };
 
 #endif /* TAO_IOR_LOOKUPTABLE_H */
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 9aba0522e27..76982c0b5bd 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -12,9 +12,9 @@ TAO_IOR_Multicast::get_handle (void) const
 
 TAO_IOR_Multicast::TAO_IOR_Multicast (void)
   : service_id_ ((TAO_Service_ID) 0),
-    ior_ (0)
+    ior_ (0)    
 {
-}
+}  
 
 TAO_IOR_Multicast::TAO_IOR_Multicast (const char *ior,
                                       u_short port,
@@ -55,11 +55,6 @@ TAO_IOR_Multicast::init (const char *ior,
                        "%p\n",
                        "subscribe"),
                       -1);
-
-  // Initialise the IOR_LookupTable.
-
-  //  this->ior_lookup_table_.add_ior ("ObjectID1","iioploc://tango.cs.wustl.edu:9999/ObjectID1");
-
   return 0;
 }
 
@@ -72,115 +67,64 @@ TAO_IOR_Multicast::handle_timeout (const ACE_Time_Value &,
 
 int
 TAO_IOR_Multicast::handle_input (ACE_HANDLE)
-{
-  // The header has the length of the data following it.
-  CORBA::Short header;
-  ACE_UINT16 remote_port;
-
-  char *name;
-  ACE_NEW_RETURN (name,
-                  char[BUFSIZ],
-                  0);
-
-  CORBA::String_var service_name (name);
+{  
+  struct
+  {
+    u_short reply_port;
+    CORBA::Short service_id;
+  } mcast_info;
 
   ACE_INET_Addr remote_addr;
-
-  // Take a peek at the header and get the length of data in bytes.
-  ssize_t n = this->mcast_dgram_.recv (&header,
-                                       sizeof(header),
-				       remote_addr,
-                                       MSG_PEEK);
-  if (n <= 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "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"),
-                      0);
-
-  // Construct an iovec to receive.
-  const int iovcnt = 3;
-  iovec iov[iovcnt];
-
-  iov[0].iov_base = (char *) &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;
-  iov[2].iov_len  = ACE_NTOHS (header) - sizeof (ACE_UINT16);
-
-  // Read the iovec.
-  n = this->mcast_dgram_.recv (iov,
-                               iovcnt,
-                               remote_addr);
-  if (n <= 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "TAO_IOR_Multicast::handle_input recv = %d\n",
-		       n),
-		      0);
-  // Null terminate.
-  service_name [ACE_NTOHS (header) - sizeof (ACE_UINT16)] = 0;
+  ssize_t retcode =
+    this->mcast_dgram_.recv (&mcast_info,
+                             sizeof (mcast_info),
+                             remote_addr);
+  if (retcode == -1)
+    return -1;
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-		"(%P|%t) Received multicast.\n"
-		"Service Name received : %s\n"
-		"Port received : %u\n",
-		service_name.in (),
-		ACE_NTOHS (remote_port)));
-  ACE_CString ior(this->ior_);
-
-  if (ACE_OS::strcmp (service_name.in (),
-                      "NameService") != 0
-      && ACE_OS::strcmp (service_name.in (),
-                         "TradingService") != 0)
-    {
-      // The client has requested an IOR other than for the
-      // Name/Trading Service.  Lookup the table for the IOR. The call
-      // to find_ior will fill the ior for us if the service name is
-      // found in the table.
-
-      ACE_CString service (service_name.in ());
-
-      if (this->ior_lookup_table_.find_ior (service, ior) != 0)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "IOR_Multicast::find failed.\n"),
-			  0);
-    }
+                "(%P|%t) Received multicast.\n"));
 
-  ACE_SOCK_Connector connector;
-  ACE_INET_Addr peer_addr (ACE_NTOHS (remote_port),
-			   remote_addr.get_host_name ());
-  ACE_SOCK_Stream stream;
+  // @@ validate data string received is from a valid client here
+  // @@ Probably not needed
 
-  // Connect.
-  if (connector.connect (stream,
-                         peer_addr) == -1)
+  if (retcode != sizeof (mcast_info))
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "IOR_Multicast::connect failed\n"),
-		      0);
-  // Send the IOR back to the client.
-  ssize_t result = stream.send_n (ior.c_str (),
-                                  ACE_OS::strlen (ior.c_str ()) + 1);
-  // Close the stream.
-  stream.close ();
-
-  // Check for error.
-  if (result == -1)
-    return 0;
+                       "Reply to multicast not sent. Received %d bytes, expected %d.",
+                       retcode,
+                       sizeof (mcast_info)),
+                      -1);
 
-  if (TAO_debug_level > 0)
+  // Confirm that we were meant to respond to this request.
+  mcast_info.service_id = ntohs (mcast_info.service_id);
+  if (mcast_info.service_id == this->service_id_)
+    {
+      // Convert port number received to network byte order and set port
+      // number to reply;
+      mcast_info.reply_port = ntohs (mcast_info.reply_port);
+      remote_addr.set_port_number (mcast_info.reply_port);
+
+      // send the object reference for the naming service
+      retcode = response_.send (this->ior_,
+                                ACE_OS::strlen (this->ior_) + 1,
+                                remote_addr,
+                                0);
+      if (TAO_debug_level > 0)
+	ACE_DEBUG ((LM_DEBUG,
+		    "(%P|%t) ior_: <%s>\n"
+		    " sent through port %u.\n"
+		    "retcode=%d\n",
+		    this->ior_,
+		    remote_addr.get_port_number (),
+		    retcode));
+
+      if (retcode == -1)
+        return -1;
+    }
+  else
     ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) ior_: <%s>\n"
-                "sent to %s:%u.\n"
-                "result from send = %d\n",
-                ior.c_str (),
-                peer_addr.get_host_name (),
-		peer_addr.get_port_number (),
-                result));
+                "(%P|%t) Multicast was not for us."));
+
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
index aabf42e0b73..779cb4820bd 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -32,8 +32,6 @@
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/Reactor.h"
 
-#include "tao/IOR_LookupTable.h"
-
 class TAO_ORBSVCS_Export TAO_IOR_Multicast : public ACE_Event_Handler
 {
   // = TITLE
@@ -94,11 +92,10 @@ private:
 
   ACE_SOCK_Dgram response_;
   // socket for response to the multicast
-
-  TAO_IOR_LookupTable ior_lookup_table_;
-  // Lookup Table for the IORs which are not resolved otherwise.
-
 };
 
 #endif /* TAO_IOR_MULTICAST_H */
 
+
+
+
diff --git a/TAO/orbsvcs/orbsvcs/LifeCycleService.idl b/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
index d1cf1872d0b..e750cfd7b42 100644
--- a/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
+++ b/TAO/orbsvcs/orbsvcs/LifeCycleService.idl
@@ -14,9 +14,6 @@
 //
 // ============================================================================
 
-#ifndef TAO_LIFECYCLESERVICE_IDL
-#define TAO_LIFECYCLESERVICE_IDL
-
 #include "CosLifeCycle.idl"
 
 module LifeCycleService
@@ -72,4 +69,3 @@ module LifeCycleService
     };
 };
 
-#endif /* TAO_LIFECYCLESERVICE_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
index ae7ebbc6ffc..6149c041bd3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Logger_i.cpp
@@ -42,10 +42,10 @@ Logger_Factory_i::make_logger (const char *name,
 
       // This attempts to create a new Logger_i and throws an
       // exception and returns a null value if it fails
-      ACE_NEW_THROW_EX (result,
-                        Logger_i (name),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (Logger::_nil ());
+      ACE_NEW_THROW_RETURN (result,
+                            Logger_i (name),
+                            CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                            Logger::_nil ());
     }
 
   // Enter the new logger into the hash map.  Check if the <bind>
@@ -55,7 +55,7 @@ Logger_Factory_i::make_logger (const char *name,
   if (hash_map_.bind (name, result) == -1)
     {
       delete result;
-      TAO_THROW_RETURN (CORBA::UNKNOWN (),
+      TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO),
                         Logger::_nil ());
     }
   else
@@ -109,12 +109,12 @@ Logger_i::verbosity_conversion (Logger::Verbosity_Level verbosity_level)
   switch (verbosity_level)
     {
     case Logger::SILENT:
-      return 64;
+      return 040;
     case Logger::VERBOSE_LITE:
-      return 32;
+      return 020;
     default:
     case Logger::VERBOSE:
-      return 16;
+      return 010;
     }
 }
 
@@ -178,8 +178,9 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 
   // Create a buffer and fill it with the host name of the logger
   ASYS_TCHAR namebuf[MAXHOSTNAMELEN + 1];
+  addy.get_host_name (namebuf,
+                      MAXHOSTNAMELEN);
 
-  ACE_OS::strncpy (namebuf, addy.get_host_addr (), MAXHOSTNAMELEN);
 
   u_long verb_level = this->verbosity_conversion (verbosity);
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/Makefile.am b/TAO/orbsvcs/orbsvcs/Log/Makefile.am
deleted file mode 100644
index 81a356344ff..00000000000
--- a/TAO/orbsvcs/orbsvcs/Log/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Logging Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Logger.la
-
-libTAO_Logger_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Logger_la_SOURCES = \
-        Logger_i.cpp
-
-noinst_HEADERS = \
-        Logger_i.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Logger.idl b/TAO/orbsvcs/orbsvcs/Logger.idl
index 7feaeafcfb6..c6c10f13e65 100644
--- a/TAO/orbsvcs/orbsvcs/Logger.idl
+++ b/TAO/orbsvcs/orbsvcs/Logger.idl
@@ -1,8 +1,5 @@
 // $Id$
 
-#ifndef TAO_LOGGER_IDL
-#define TAO_LOGGER_IDL
-
 // TAO_MAXLOGMSGLEN must be the same size as ACE_MAXLOGMSGLEN.
 #if !defined TAO_MAXLOGMSGLEN
 #define TAO_MAXLOGMSGLEN 4 * 1024
@@ -115,5 +112,3 @@ interface Logger_Factory
   // Returns a new <Logger> instance if <name> is unique, or retuns a
   // previously created instance of that name
 };
-
-#endif /* TAO_LOGGER_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Makefile b/TAO/orbsvcs/orbsvcs/Makefile
index edb11a0e1a7..39d8bea66ec 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile
+++ b/TAO/orbsvcs/orbsvcs/Makefile
@@ -24,7 +24,6 @@ endif
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
 override TAO_IDLFLAGS += \
-        -I$(TAO_ROOT) \
         -Wb,export_macro=TAO_ORBSVCS_Export \
         -Wb,export_include=orbsvcs_export.h \
         $(TAO_LACKS_EVENT_CHANNEL_ANY)
@@ -38,151 +37,66 @@ LIBS    += -lTAO -lACE
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-####
-#### Build customization.
-####
-ifndef TAO_ORBSVCS
-  #### Please see docs/configurations.html#orbsvcs for documentation of
-  #### TAO_ORBSVCS.
-  TAO_ORBSVCS = Naming \
-                ImplRepo \
-                Time \
-                Log \
-                Concurrency \
-                Property \
-                Trader \
-                LifeCycle \
-                Sched \
-                Event \
-                CosEvent \
-                Event2 \
-                AV
-endif # TAO_ORBSVCS
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
 
 ####
 #### TAO_ORBSVCS support.
 ####
-ifeq (,$(findstring Naming,$(TAO_ORBSVCS)))
-  #### Many examples and tests use Naming, so always build it.
-  TAO_ORBSVCS += Naming
-endif # Naming
-
-ifneq (,$(findstring AV,$(TAO_ORBSVCS)))
-  IDL_SRCS += AVStreams Null_MediaCtrl sfp
-  TAO_ORBSVCS_SRCS += \
-        AV/AVStreams_i \
-        AV/Endpoint_Strategy \
-        AV/Endpoint_Strategy_T\
-	AV/sfp
-endif # AV
-
-ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
-  ifeq (,$(findstring Event,$(TAO_ORBSVCS)))
-    IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
-  endif # ! Event
+ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosNaming
   TAO_ORBSVCS_SRCS += \
-        Event/EC_Event_Channel \
-        Event/EC_ConsumerAdmin \
-        Event/EC_SupplierAdmin \
-        Event/EC_ProxyConsumer \
-        Event/EC_ProxySupplier \
-        Event/EC_SupplierFiltering \
-        Event/EC_Supplier_Filter_Builder \
-        Event/EC_Trivial_Supplier_Filter \
-        Event/EC_Filter \
-        Event/EC_Filter_Builder \
-        Event/EC_Dispatching \
-        Event/EC_Factory \
-        Event/EC_QOS_Info \
-        Event/EC_Null_Factory \
-        Event/EC_Disjunction_Filter \
-        Event/EC_Conjunction_Filter \
-        Event/EC_Type_Filter \
-        Event/EC_Basic_Filter_Builder \
-        Event/EC_Basic_Factory \
-        Event/EC_Default_Factory \
-        Event/EC_ObserverStrategy \
-        Event/EC_ProxyPushSupplier_Set \
-        Event/EC_Per_Supplier_Filter \
-        Event/EC_Timeout_Filter \
-        Event/EC_Timeout_Generator \
-        Event/EC_Reactive_Timeout_Generator \
-	Event/EC_Priority_Dispatching \
-	Event/EC_Dispatching_Task \
-	Event/EC_Sched_Filter \
-	Event/EC_Sched_Filter_Builder \
-	Event/EC_Scheduling_Strategy \
-	Event/EC_Null_Scheduling \
-	Event/EC_Priority_Scheduling
-
-  #### TAO's Event requires its Sched Service.
-  ifeq (,$(findstring Sched,$(TAO_ORBSVCS)))
-    TAO_ORBSVCS += Sched
-  endif # ! Sched
-endif # Event2
+        IOR_Multicast \
+	IOR_LookupTable \
+        Naming/CosNaming_i \
+        Naming/Entries \
+        Naming/Naming_Utils
+endif # Naming
 
-ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosEventComm CosEventChannelAdmin
+ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosTimeBase TimeService
   TAO_ORBSVCS_SRCS += \
-        CosEvent/ConsumerAdmin_i \
-        CosEvent/SupplierAdmin_i \
-        CosEvent/EventChannel_i \
-        CosEvent/ProxyPushConsumer_i \
-        CosEvent/ProxyPushSupplier_i \
-	CosEvent_Utilities
-endif # CosEvent
+        Time_Utilities \
+        Time/TAO_Time_Service_Server \
+        Time/TAO_Time_Service_Clerk \
+        Time/TAO_UTO \
+        Time/TAO_TIO \
+        Time/Timer_Helper
+endif # Time
 
-ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
-  IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
+ifneq (,$(findstring Log,$(TAO_ORBSVCS)))
+  IDL_SRCS += Logger
   TAO_ORBSVCS_SRCS += \
-        Event_Utilities \
-        Event/BCU \
-        Event/Dispatching_Modules \
-        Event/Event_Channel \
-        Event/Event_Manip \
-        Event/Local_ESTypes \
-        Event/Memory_Pools \
-        Event/RT_Task \
-        Event/ReactorTask \
-        Event/Timer_Module \
-        Event/EC_Gateway \
-        Event/EC_Gateway_UDP \
-        Event/EC_UDP_Admin \
-        Event/Module_Factory
-
-  #### TAO's Event requires its Sched Service.
-  ifeq (,$(findstring Sched,$(TAO_ORBSVCS)))
-    TAO_ORBSVCS += Sched
-  endif # ! Sched
-endif # Event
+        Log/Logger_i
+endif # Log
 
-ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
-  IDL_SRCS += RtecScheduler
+ifneq (,$(findstring Concurrency,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosConcurrencyControl
   TAO_ORBSVCS_SRCS += \
-        Scheduler_Factory \
-        Runtime_Scheduler \
-        Scheduler_Utilities \
-        Sched/Config_Scheduler \
-        Sched/DynSched \
-        Sched/SchedEntry \
-        Sched/Scheduler \
-        Sched/Scheduler_Generic \
-        Sched/Strategy_Scheduler
-endif # Sched
+        Concurrency/CC_Lock \
+        Concurrency/CC_LockSet \
+        Concurrency/CC_LockSetFactory \
+        Concurrency/Concurrency_Utils
+endif # Concurrency
 
 ifneq (,$(findstring LifeCycle,$(TAO_ORBSVCS)))
   IDL_SRCS += CosLifeCycle LifeCycleService
   TAO_ORBSVCS_SRCS +=
-
-  ifeq (,$(findstring Trader,$(TAO_ORBSVCS)))
-    #### LifeCycle needs Trader.
-    TAO_ORBSVCS += Trader
-  endif # ! Trader
 endif # LifeCycle
 
+ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
+  IDL_SRCS += Ping ImplRepo
+  TAO_ORBSVCS_SRCS +=
+endif # ImplRepo
+
+ifneq (,$(findstring Property,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosPropertyService
+  TAO_ORBSVCS_SRCS += \
+        Property/CosPropertyService_i
+endif # Property
+
 ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosTrading CosTradingDynamic CosTradingRepos
+  IDL_SRCS += CosTrading
   TAO_ORBSVCS_SRCS += \
         Trader/Constraint_Interpreter \
         Trader/Constraint_Nodes \
@@ -197,81 +111,88 @@ ifneq (,$(findstring Trader,$(TAO_ORBSVCS)))
         Trader/Trader_Interfaces \
         Trader/Trader_T \
         Trader/Trader_Utils
-
-  ifeq (,$(findstring Naming,$(TAO_ORBSVCS)))
-    #### The Trader needs IOR_Multicast, so add it in if the
-    #### Naming Service isn't included.
-    TAO_ORBSVCS_SRCS += IOR_Multicast
-  endif # ! Naming
 endif # Trader
 
-ifneq (,$(findstring Property,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosPropertyService
-  TAO_ORBSVCS_SRCS += \
-        Property/CosPropertyService_i
-endif # Property
-
-ifneq (,$(findstring Concurrency,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosConcurrencyControl
+ifneq (,$(findstring Sched,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecScheduler
   TAO_ORBSVCS_SRCS += \
-        Concurrency/CC_Lock \
-        Concurrency/CC_LockSet \
-        Concurrency/CC_LockSetFactory \
-        Concurrency/Concurrency_Utils
-endif # Concurrency
+        Scheduler_Factory \
+        Runtime_Scheduler \
+        Scheduler_Utilities \
+        Sched/Config_Scheduler \
+        Sched/DynSched \
+        Sched/SchedEntry \
+        Sched/Scheduler \
+        Sched/Scheduler_Generic \
+        Sched/Strategy_Scheduler
+endif # Sched
 
-ifneq (,$(findstring Log,$(TAO_ORBSVCS)))
-  IDL_SRCS += Logger
+ifneq (,$(findstring Event,$(TAO_ORBSVCS)))
+  IDL_SRCS += RtecEventComm RtecEventChannelAdmin RtecUDPAdmin
   TAO_ORBSVCS_SRCS += \
-        Log/Logger_i
-endif # Log
+        Event_Utilities \
+        Event/BCU \
+        Event/Dispatching_Modules \
+        Event/Event_Channel \
+        Event/Event_Manip \
+        Event/Local_ESTypes \
+        Event/Memory_Pools \
+        Event/RT_Task \
+        Event/ReactorTask \
+        Event/Timer_Module \
+        Event/EC_Gateway \
+        Event/EC_Gateway_UDP \
+        Event/EC_UDP_Admin \
+        Event/Module_Factory
+endif # Event
 
-ifneq (,$(findstring Time,$(TAO_ORBSVCS)))
-  IDL_SRCS += TimeBase TimeService
+ifneq (,$(findstring Event2,$(TAO_ORBSVCS)))
   TAO_ORBSVCS_SRCS += \
-        Time_Utilities \
-        Time/TAO_Time_Service_Server \
-        Time/TAO_Time_Service_Clerk \
-        Time/TAO_UTO \
-        Time/TAO_TIO \
-        Time/Timer_Helper
+	Event/EC_Event_Channel \
+	Event/EC_ConsumerAdmin \
+	Event/EC_SupplierAdmin \
+	Event/EC_ProxyConsumer \
+	Event/EC_ProxySupplier \
+	Event/EC_SupplierFiltering \
+	Event/EC_Filter \
+	Event/EC_Filter_Builder \
+	Event/EC_Dispatching \
+	Event/EC_Factory \
+	Event/EC_QOS_Info \
+	Event/EC_Null_Factory \
+	Event/EC_Disjunction_Filter \
+	Event/EC_Conjunction_Filter \
+	Event/EC_Type_Filter \
+	Event/EC_Basic_Filter_Builder \
+	Event/EC_Basic_Factory \
 
-  #### TAO's Time Service requires its ImplRepo Service.
-  ifeq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-    #### Add ImplRepo
-    TAO_ORBSVCS += ImplRepo
-  endif # ! ImplRepo
-endif # Time
+endif # Event2
 
-ifneq (,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  IDL_SRCS += Ping ImplRepo
-  TAO_ORBSVCS_SRCS +=
-endif # ImplRepo
+ifneq (,$(findstring CosEvent,$(TAO_ORBSVCS)))
+  IDL_SRCS += CosEventComm CosEventChannelAdmin
+  TAO_ORBSVCS_SRCS += \
+        CosEvent/ConsumerAdmin_i \
+        CosEvent/SupplierAdmin_i \
+        CosEvent/EventChannel_i \
+        CosEvent/ProxyPushConsumer_i \
+        CosEvent/ProxyPushSupplier_i
+endif # CosEvent
 
-ifneq (,$(findstring Naming,$(TAO_ORBSVCS)))
-  IDL_SRCS += CosNaming
+ifneq (,$(findstring AV,$(TAO_ORBSVCS)))
+  IDL_SRCS += AVStreams Null_MediaCtrl sfp
   TAO_ORBSVCS_SRCS += \
-        IOR_Multicast \
-        Naming/Naming_Context \
-        Naming/Hash_Naming_Context \
-        Naming/Entries \
-        Naming/Persistent_Naming_Context \
-        Naming/Persistent_Entries \
-        Naming/Persistent_Bindings_Map \
-        Naming/Persistent_Context_Index \
-        Naming/Naming_Utils
-endif # Naming
+        AV/AVStreams_i \
+        AV/Endpoint_Strategy \
+        AV/Endpoint_Strategy_T
+endif # AV
 
 IDL_FILES = \
         $(addsuffix S, $(IDL_SRCS)) \
         $(addsuffix C, $(IDL_SRCS))
-FILES = $(IDL_FILES) $(TAO_ORBSVCS_SRCS)
+FILES = $(IDL_FILES) $(TAO_ORBSVCS_SRCS) tmplinst-orbsvcs
 DEFS  = $(addsuffix .h,$(FILES))
 LSRC  = $(addsuffix .cpp,$(FILES))
-BUILD += ORBSVCS_COMPONENTS
 
-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.lib.GNU
@@ -284,17 +205,18 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG) \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
+	$(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
+
+IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
 
 #
-# Extra dependencies not caught by make depend.
+# Extra dependencies not catched by make depend.
 #
-$(foreach ext, $(IDL_EXT), TimeService$(ext)): TimeBase.idl
-$(foreach ext, $(IDL_EXT), RtecScheduler$(ext)): TimeBase.idl
-$(foreach ext, $(IDL_EXT), RtecEventComm$(ext)): TimeBase.idl
 $(foreach ext, $(IDL_EXT), RtecUDPAdmin(ext)): RtecEventComm.idl
-$(foreach ext, $(IDL_EXT), RtecEventChannelAdmin$(ext)): TimeBase.idl
-$(foreach ext, $(IDL_EXT), RtecEventChannelAdmin$(ext)): RtecScheduler.idl
+$(foreach ext, $(IDL_EXT), RtecScheduler$(ext)): CosTimeBase.idl
+$(foreach ext, $(IDL_EXT), RtecEventComm$(ext)): CosTimeBase.idl
+$(foreach ext, $(IDL_EXT), TimeService$(ext)): CosTimeBase.idl
+$(foreach ext, $(IDL_EXT), RtecEventChannelAdmin$(ext)): CosTimeBase.idl
 $(foreach ext, $(IDL_EXT), RtecEventChannelAdmin$(ext)): RtecEventComm.idl
 $(foreach ext, $(IDL_EXT), CosEventChannelAdmin$(ext)): CosEventComm.idl
 $(foreach ext, $(IDL_EXT), LifeCycleService$(ext)): CosLifeCycle.idl
@@ -308,43 +230,226 @@ $(foreach ext, $(IDL_EXT), ImplRepo$(ext)): Ping.idl
 
 idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
-realclean: clean
-	-$(RM) $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
-	@$(ACE_ROOT)/bin/ace_components --orbsvcs --remove
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
 
-.PHONY: ORBSVCS_COMPONENTS
-ORBSVCS_COMPONENTS:
-	@$(ACE_ROOT)/bin/ace_components --orbsvcs --set " $(TAO_ORBSVCS) "
+realclean: clean
+	-/bin/rm -rf $(foreach file, $(IDL_SRCS), $(foreach ext, $(IDL_EXT), $(file)$(ext)))
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
+.obj/CosNamingS.o .obj/CosNamingS.so .shobj/CosNamingS.o .shobj/CosNamingS.so: CosNamingS.cpp CosNamingS.h CosNamingC.h \
+ orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.i
+.obj/CosTimeBaseS.o .obj/CosTimeBaseS.so .shobj/CosTimeBaseS.o .shobj/CosTimeBaseS.so: CosTimeBaseS.cpp CosTimeBaseS.h CosTimeBaseC.h \
+ orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS_T.h CosTimeBaseS_T.i \
+ CosTimeBaseS_T.cpp CosTimeBaseS.i
+.obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h CosTimeBaseS.h \
+ CosTimeBaseC.h orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS_T.h \
+ CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i TimeServiceC.h \
+ TimeServiceC.i TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp \
+ TimeServiceS.i
+.obj/LoggerS.o .obj/LoggerS.so .shobj/LoggerS.o .shobj/LoggerS.so: LoggerS.cpp LoggerS.h LoggerC.h orbsvcs_export.h LoggerC.i \
+ LoggerS_T.h LoggerS_T.i LoggerS_T.cpp LoggerS.i
+.obj/CosConcurrencyControlS.o .obj/CosConcurrencyControlS.so .shobj/CosConcurrencyControlS.o .shobj/CosConcurrencyControlS.so: CosConcurrencyControlS.cpp \
+ CosConcurrencyControlS.h CosConcurrencyControlC.h orbsvcs_export.h \
+ CosConcurrencyControlC.i CosConcurrencyControlS_T.h \
+ CosConcurrencyControlS_T.i CosConcurrencyControlS_T.cpp \
+ CosConcurrencyControlS.i
+.obj/CosLifeCycleS.o .obj/CosLifeCycleS.so .shobj/CosLifeCycleS.o .shobj/CosLifeCycleS.so: CosLifeCycleS.cpp CosLifeCycleS.h CosNamingS.h \
+ CosNamingC.h orbsvcs_export.h CosNamingC.i CosNamingS_T.h \
+ CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i CosLifeCycleC.h \
+ CosLifeCycleC.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
+ CosLifeCycleS_T.cpp CosLifeCycleS.i
+.obj/LifeCycleServiceS.o .obj/LifeCycleServiceS.so .shobj/LifeCycleServiceS.o .shobj/LifeCycleServiceS.so: LifeCycleServiceS.cpp LifeCycleServiceS.h \
+ CosLifeCycleS.h CosNamingS.h CosNamingC.h orbsvcs_export.h \
+ CosNamingC.i CosNamingS_T.h CosNamingS_T.i CosNamingS_T.cpp \
+ CosNamingS.i CosLifeCycleC.h CosLifeCycleC.i CosLifeCycleS_T.h \
+ CosLifeCycleS_T.i CosLifeCycleS_T.cpp CosLifeCycleS.i \
+ LifeCycleServiceC.h LifeCycleServiceC.i LifeCycleServiceS_T.h \
+ LifeCycleServiceS_T.i LifeCycleServiceS_T.cpp LifeCycleServiceS.i
+.obj/PingS.o .obj/PingS.so .shobj/PingS.o .shobj/PingS.so: PingS.cpp PingS.h PingC.h orbsvcs_export.h PingC.i PingS_T.h \
+ PingS_T.i PingS_T.cpp PingS.i
+.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h PingS.h PingC.h \
+ orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i \
+ ImplRepoC.h ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \
+ ImplRepoS.i
+.obj/CosPropertyServiceS.o .obj/CosPropertyServiceS.so .shobj/CosPropertyServiceS.o .shobj/CosPropertyServiceS.so: CosPropertyServiceS.cpp CosPropertyServiceS.h \
+ CosPropertyServiceC.h orbsvcs_export.h CosPropertyServiceC.i \
+ CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i
+.obj/CosTradingS.o .obj/CosTradingS.so .shobj/CosTradingS.o .shobj/CosTradingS.so: CosTradingS.cpp CosTradingS.h CosTradingC.h \
+ orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
+ CosTradingS_T.cpp CosTradingS.i
+.obj/RtecSchedulerS.o .obj/RtecSchedulerS.so .shobj/RtecSchedulerS.o .shobj/RtecSchedulerS.so: RtecSchedulerS.cpp RtecSchedulerS.h CosTimeBaseS.h \
+ CosTimeBaseC.h orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS_T.h \
+ CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i RtecSchedulerC.h \
+ RtecSchedulerC.i RtecSchedulerS_T.h RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp RtecSchedulerS.i
+.obj/RtecEventCommS.o .obj/RtecEventCommS.so .shobj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h CosTimeBaseS.h \
+ CosTimeBaseC.h orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS_T.h \
+ CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i RtecEventCommC.h \
+ RtecEventCommC.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i
+.obj/RtecEventChannelAdminS.o .obj/RtecEventChannelAdminS.so .shobj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \
+ RtecEventChannelAdminS.h RtecEventCommS.h CosTimeBaseS.h \
+ CosTimeBaseC.h orbsvcs_export.h CosTimeBaseC.i CosTimeBaseS_T.h \
+ CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i RtecEventCommC.h \
+ RtecEventCommC.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i RtecSchedulerS.h \
+ RtecSchedulerC.h RtecSchedulerC.i RtecSchedulerS_T.h \
+ RtecSchedulerS_T.i RtecSchedulerS_T.cpp RtecSchedulerS.i \
+ RtecEventChannelAdminC.h RtecEventChannelAdminC.i \
+ RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \
+ RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i
+.obj/RtecUDPAdminS.o .obj/RtecUDPAdminS.so .shobj/RtecUDPAdminS.o .shobj/RtecUDPAdminS.so: RtecUDPAdminS.cpp RtecUDPAdminS.h RtecEventCommS.h \
+ CosTimeBaseS.h CosTimeBaseC.h orbsvcs_export.h CosTimeBaseC.i \
+ CosTimeBaseS_T.h CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i \
+ RtecEventCommC.h RtecEventCommC.i RtecEventCommS_T.h \
+ RtecEventCommS_T.i RtecEventCommS_T.cpp RtecEventCommS.i \
+ RtecUDPAdminC.h RtecUDPAdminC.i RtecUDPAdminS_T.h RtecUDPAdminS_T.i \
+ RtecUDPAdminS_T.cpp RtecUDPAdminS.i
+.obj/CosEventCommS.o .obj/CosEventCommS.so .shobj/CosEventCommS.o .shobj/CosEventCommS.so: CosEventCommS.cpp CosEventCommS.h CosEventCommC.h \
+ orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
+ CosEventCommS_T.cpp CosEventCommS.i
+.obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \
+ CosEventChannelAdminS.h CosEventCommS.h CosEventCommC.h \
+ orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
+ CosEventCommS_T.cpp CosEventCommS.i CosEventChannelAdminC.h \
+ CosEventChannelAdminC.i CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i
 .obj/AVStreamsS.o .obj/AVStreamsS.so .shobj/AVStreamsS.o .shobj/AVStreamsS.so: AVStreamsS.cpp AVStreamsS.h CosPropertyServiceS.h \
- CosPropertyServiceC.h \
+ CosPropertyServiceC.h orbsvcs_export.h CosPropertyServiceC.i \
+ CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i AVStreamsC.h \
+ AVStreamsC.i AVStreamsS_T.h AVStreamsS_T.i AVStreamsS_T.cpp \
+ AVStreamsS.i
+.obj/Null_MediaCtrlS.o .obj/Null_MediaCtrlS.so .shobj/Null_MediaCtrlS.o .shobj/Null_MediaCtrlS.so: Null_MediaCtrlS.cpp Null_MediaCtrlS.h \
+ Null_MediaCtrlC.h orbsvcs_export.h Null_MediaCtrlC.i \
+ Null_MediaCtrlS_T.h Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp \
+ Null_MediaCtrlS.i
+.obj/sfpS.o .obj/sfpS.so .shobj/sfpS.o .shobj/sfpS.so: sfpS.cpp sfpS.h sfpC.h orbsvcs_export.h sfpC.i sfpS_T.h \
+ sfpS_T.i sfpS_T.cpp sfpS.i
+.obj/CosNamingC.o .obj/CosNamingC.so .shobj/CosNamingC.o .shobj/CosNamingC.so: CosNamingC.cpp CosNamingC.h orbsvcs_export.h \
+ CosNamingC.i CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.i
+.obj/CosTimeBaseC.o .obj/CosTimeBaseC.so .shobj/CosTimeBaseC.o .shobj/CosTimeBaseC.so: CosTimeBaseC.cpp CosTimeBaseC.h orbsvcs_export.h \
+ CosTimeBaseC.i CosTimeBaseS.h CosTimeBaseS_T.h CosTimeBaseS_T.i \
+ CosTimeBaseS_T.cpp CosTimeBaseS.i
+.obj/TimeServiceC.o .obj/TimeServiceC.so .shobj/TimeServiceC.o .shobj/TimeServiceC.so: TimeServiceC.cpp TimeServiceC.h orbsvcs_export.h \
+ CosTimeBaseC.h CosTimeBaseC.i TimeServiceC.i TimeServiceS.h \
+ CosTimeBaseS.h CosTimeBaseS_T.h CosTimeBaseS_T.i CosTimeBaseS_T.cpp \
+ CosTimeBaseS.i TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp \
+ TimeServiceS.i
+.obj/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp LoggerC.h orbsvcs_export.h LoggerC.i LoggerS.h \
+ LoggerS_T.h LoggerS_T.i LoggerS_T.cpp LoggerS.i
+.obj/CosConcurrencyControlC.o .obj/CosConcurrencyControlC.so .shobj/CosConcurrencyControlC.o .shobj/CosConcurrencyControlC.so: CosConcurrencyControlC.cpp \
+ CosConcurrencyControlC.h orbsvcs_export.h CosConcurrencyControlC.i \
+ CosConcurrencyControlS.h CosConcurrencyControlS_T.h \
+ CosConcurrencyControlS_T.i CosConcurrencyControlS_T.cpp \
+ CosConcurrencyControlS.i
+.obj/CosLifeCycleC.o .obj/CosLifeCycleC.so .shobj/CosLifeCycleC.o .shobj/CosLifeCycleC.so: CosLifeCycleC.cpp CosLifeCycleC.h orbsvcs_export.h \
+ CosNamingC.h CosNamingC.i CosLifeCycleC.i CosLifeCycleS.h \
+ CosNamingS.h CosNamingS_T.h CosNamingS_T.i CosNamingS_T.cpp \
+ CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i CosLifeCycleS_T.cpp \
+ CosLifeCycleS.i
+.obj/LifeCycleServiceC.o .obj/LifeCycleServiceC.so .shobj/LifeCycleServiceC.o .shobj/LifeCycleServiceC.so: LifeCycleServiceC.cpp LifeCycleServiceC.h \
+ orbsvcs_export.h CosLifeCycleC.h CosNamingC.h CosNamingC.i \
+ CosLifeCycleC.i LifeCycleServiceC.i LifeCycleServiceS.h \
+ CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
+ CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
+ CosLifeCycleS_T.cpp CosLifeCycleS.i LifeCycleServiceS_T.h \
+ LifeCycleServiceS_T.i LifeCycleServiceS_T.cpp LifeCycleServiceS.i
+.obj/PingC.o .obj/PingC.so .shobj/PingC.o .shobj/PingC.so: PingC.cpp PingC.h orbsvcs_export.h PingC.i PingS.h PingS_T.h \
+ PingS_T.i PingS_T.cpp PingS.i
+.obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h orbsvcs_export.h PingC.h \
+ PingC.i ImplRepoC.i ImplRepoS.h PingS.h PingS_T.h PingS_T.i \
+ PingS_T.cpp PingS.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \
+ ImplRepoS.i
+.obj/CosPropertyServiceC.o .obj/CosPropertyServiceC.so .shobj/CosPropertyServiceC.o .shobj/CosPropertyServiceC.so: CosPropertyServiceC.cpp CosPropertyServiceC.h \
+ orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS.h \
+ CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i
+.obj/CosTradingC.o .obj/CosTradingC.so .shobj/CosTradingC.o .shobj/CosTradingC.so: CosTradingC.cpp CosTradingC.h orbsvcs_export.h \
+ CosTradingC.i CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
+ CosTradingS_T.cpp CosTradingS.i
+.obj/RtecSchedulerC.o .obj/RtecSchedulerC.so .shobj/RtecSchedulerC.o .shobj/RtecSchedulerC.so: RtecSchedulerC.cpp RtecSchedulerC.h orbsvcs_export.h \
+ CosTimeBaseC.h CosTimeBaseC.i RtecSchedulerC.i RtecSchedulerS.h \
+ CosTimeBaseS.h CosTimeBaseS_T.h CosTimeBaseS_T.i CosTimeBaseS_T.cpp \
+ CosTimeBaseS.i RtecSchedulerS_T.h RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp RtecSchedulerS.i
+.obj/RtecEventCommC.o .obj/RtecEventCommC.so .shobj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h orbsvcs_export.h \
+ CosTimeBaseC.h CosTimeBaseC.i RtecEventCommC.i RtecEventCommS.h \
+ CosTimeBaseS.h CosTimeBaseS_T.h CosTimeBaseS_T.i CosTimeBaseS_T.cpp \
+ CosTimeBaseS.i RtecEventCommS_T.h RtecEventCommS_T.i \
+ RtecEventCommS_T.cpp RtecEventCommS.i
+.obj/RtecEventChannelAdminC.o .obj/RtecEventChannelAdminC.so .shobj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \
+ RtecEventChannelAdminC.h orbsvcs_export.h RtecEventCommC.h \
+ CosTimeBaseC.h CosTimeBaseC.i RtecEventCommC.i RtecSchedulerC.h \
+ RtecSchedulerC.i RtecEventChannelAdminC.i RtecEventChannelAdminS.h \
+ RtecEventCommS.h CosTimeBaseS.h CosTimeBaseS_T.h CosTimeBaseS_T.i \
+ CosTimeBaseS_T.cpp CosTimeBaseS.i RtecEventCommS_T.h \
+ RtecEventCommS_T.i RtecEventCommS_T.cpp RtecEventCommS.i \
+ RtecSchedulerS.h RtecSchedulerS_T.h RtecSchedulerS_T.i \
+ RtecSchedulerS_T.cpp RtecSchedulerS.i RtecEventChannelAdminS_T.h \
+ RtecEventChannelAdminS_T.i RtecEventChannelAdminS_T.cpp \
+ RtecEventChannelAdminS.i
+.obj/RtecUDPAdminC.o .obj/RtecUDPAdminC.so .shobj/RtecUDPAdminC.o .shobj/RtecUDPAdminC.so: RtecUDPAdminC.cpp RtecUDPAdminC.h orbsvcs_export.h \
+ RtecEventCommC.h CosTimeBaseC.h CosTimeBaseC.i RtecEventCommC.i \
+ RtecUDPAdminC.i RtecUDPAdminS.h RtecEventCommS.h CosTimeBaseS.h \
+ CosTimeBaseS_T.h CosTimeBaseS_T.i CosTimeBaseS_T.cpp CosTimeBaseS.i \
+ RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
+ RtecEventCommS.i RtecUDPAdminS_T.h RtecUDPAdminS_T.i \
+ RtecUDPAdminS_T.cpp RtecUDPAdminS.i
+.obj/CosEventCommC.o .obj/CosEventCommC.so .shobj/CosEventCommC.o .shobj/CosEventCommC.so: CosEventCommC.cpp CosEventCommC.h orbsvcs_export.h \
+ CosEventCommC.i CosEventCommS.h CosEventCommS_T.h CosEventCommS_T.i \
+ CosEventCommS_T.cpp CosEventCommS.i
+.obj/CosEventChannelAdminC.o .obj/CosEventChannelAdminC.so .shobj/CosEventChannelAdminC.o .shobj/CosEventChannelAdminC.so: CosEventChannelAdminC.cpp \
+ CosEventChannelAdminC.h orbsvcs_export.h CosEventCommC.h \
+ CosEventCommC.i CosEventChannelAdminC.i CosEventChannelAdminS.h \
+ CosEventCommS.h CosEventCommS_T.h CosEventCommS_T.i \
+ CosEventCommS_T.cpp CosEventCommS.i CosEventChannelAdminS_T.h \
+ CosEventChannelAdminS_T.i CosEventChannelAdminS_T.cpp \
+ CosEventChannelAdminS.i
+.obj/AVStreamsC.o .obj/AVStreamsC.so .shobj/AVStreamsC.o .shobj/AVStreamsC.so: AVStreamsC.cpp AVStreamsC.h orbsvcs_export.h \
+ CosPropertyServiceC.h CosPropertyServiceC.i AVStreamsC.i AVStreamsS.h \
+ CosPropertyServiceS.h CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
+ CosPropertyServiceS_T.cpp CosPropertyServiceS.i AVStreamsS_T.h \
+ AVStreamsS_T.i AVStreamsS_T.cpp AVStreamsS.i
+.obj/Null_MediaCtrlC.o .obj/Null_MediaCtrlC.so .shobj/Null_MediaCtrlC.o .shobj/Null_MediaCtrlC.so: Null_MediaCtrlC.cpp Null_MediaCtrlC.h \
+ orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS.h \
+ Null_MediaCtrlS_T.h Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp \
+ Null_MediaCtrlS.i
+.obj/sfpC.o .obj/sfpC.so .shobj/sfpC.o .shobj/sfpC.so: sfpC.cpp sfpC.h orbsvcs_export.h sfpC.i sfpS.h sfpS_T.h \
+ sfpS_T.i sfpS_T.cpp sfpS.i
+.obj/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
  $(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 \
@@ -386,639 +491,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
- CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
- CosPropertyServiceS.i AVStreamsC.h AVStreamsC.i AVStreamsS_T.h \
- AVStreamsS_T.i AVStreamsS_T.cpp AVStreamsS.i
-.obj/Null_MediaCtrlS.o .obj/Null_MediaCtrlS.so .shobj/Null_MediaCtrlS.o .shobj/Null_MediaCtrlS.so: Null_MediaCtrlS.cpp Null_MediaCtrlS.h \
- Null_MediaCtrlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS_T.h \
- Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp Null_MediaCtrlS.i
-.obj/sfpS.o .obj/sfpS.so .shobj/sfpS.o .shobj/sfpS.so: sfpS.cpp sfpS.h sfpC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -1030,217 +538,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h sfpC.i sfpS_T.h sfpS_T.i sfpS_T.cpp sfpS.i
-.obj/CosEventCommS.o .obj/CosEventCommS.so .shobj/CosEventCommS.o .shobj/CosEventCommS.so: CosEventCommS.cpp CosEventCommS.h CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -1267,52 +568,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1321,603 +576,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
- CosEventCommS_T.cpp CosEventCommS.i
-.obj/CosEventChannelAdminS.o .obj/CosEventChannelAdminS.so .shobj/CosEventChannelAdminS.o .shobj/CosEventChannelAdminS.so: CosEventChannelAdminS.cpp \
- CosEventChannelAdminS.h CosEventCommS.h CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosEventCommC.i CosEventCommS_T.h CosEventCommS_T.i \
- CosEventCommS_T.cpp CosEventCommS.i CosEventChannelAdminC.h \
- CosEventChannelAdminC.i CosEventChannelAdminS_T.h \
- CosEventChannelAdminS_T.i CosEventChannelAdminS_T.cpp \
- CosEventChannelAdminS.i
-.obj/RtecEventCommS.o .obj/RtecEventCommS.so .shobj/RtecEventCommS.o .shobj/RtecEventCommS.so: RtecEventCommS.cpp RtecEventCommS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1939,299 +613,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i
-.obj/RtecEventChannelAdminS.o .obj/RtecEventChannelAdminS.so .shobj/RtecEventChannelAdminS.o .shobj/RtecEventChannelAdminS.so: RtecEventChannelAdminS.cpp \
- RtecEventChannelAdminS.h RtecEventCommS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2248,456 +634,77 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecSchedulerS.h RtecSchedulerC.h RtecSchedulerC.i \
- RtecSchedulerS_T.h RtecSchedulerS_T.i RtecSchedulerS_T.cpp \
- RtecSchedulerS.i RtecEventChannelAdminC.h RtecEventChannelAdminC.i \
- RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i
-.obj/RtecUDPAdminS.o .obj/RtecUDPAdminS.so .shobj/RtecUDPAdminS.o .shobj/RtecUDPAdminS.so: RtecUDPAdminS.cpp RtecUDPAdminS.h RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i RtecEventCommC.h RtecEventCommC.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecUDPAdminC.h RtecUDPAdminC.i RtecUDPAdminS_T.h \
- RtecUDPAdminS_T.i RtecUDPAdminS_T.cpp RtecUDPAdminS.i
-.obj/RtecSchedulerS.o .obj/RtecSchedulerS.so .shobj/RtecSchedulerS.o .shobj/RtecSchedulerS.so: RtecSchedulerS.cpp RtecSchedulerS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
+.obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp IOR_LookupTable.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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 \
@@ -2713,848 +720,30 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecSchedulerS_T.h RtecSchedulerS_T.i RtecSchedulerS_T.cpp \
- RtecSchedulerS.i
-.obj/CosLifeCycleS.o .obj/CosLifeCycleS.so .shobj/CosLifeCycleS.o .shobj/CosLifeCycleS.so: CosLifeCycleS.cpp CosLifeCycleS.h CosNamingS.h \
- CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
- CosNamingS_T.cpp CosNamingS.i CosLifeCycleC.h CosLifeCycleC.i \
- CosLifeCycleS_T.h CosLifeCycleS_T.i CosLifeCycleS_T.cpp \
- CosLifeCycleS.i
-.obj/LifeCycleServiceS.o .obj/LifeCycleServiceS.so .shobj/LifeCycleServiceS.o .shobj/LifeCycleServiceS.so: LifeCycleServiceS.cpp LifeCycleServiceS.h \
- CosLifeCycleS.h CosNamingS.h CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
- CosNamingS_T.cpp CosNamingS.i CosLifeCycleC.h CosLifeCycleC.i \
- CosLifeCycleS_T.h CosLifeCycleS_T.i CosLifeCycleS_T.cpp \
- CosLifeCycleS.i LifeCycleServiceC.h LifeCycleServiceC.i \
- LifeCycleServiceS_T.h LifeCycleServiceS_T.i LifeCycleServiceS_T.cpp \
- LifeCycleServiceS.i
-.obj/CosTradingS.o .obj/CosTradingS.so .shobj/CosTradingS.o .shobj/CosTradingS.so: CosTradingS.cpp CosTradingS.h CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -3566,262 +755,38 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
- CosTradingS_T.cpp CosTradingS.i
-.obj/CosTradingDynamicS.o .obj/CosTradingDynamicS.so .shobj/CosTradingDynamicS.o .shobj/CosTradingDynamicS.so: CosTradingDynamicS.cpp CosTradingDynamicS.h \
- CosTradingS.h CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h
+.obj/CosNaming_i.o .obj/CosNaming_i.so .shobj/CosNaming_i.o .shobj/CosNaming_i.so: Naming/CosNaming_i.cpp Naming/CosNaming_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(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 \
+ Naming/Entries.h
+.obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -3830,228 +795,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
- CosTradingS_T.cpp CosTradingS.i CosTradingDynamicC.h \
- CosTradingDynamicC.i CosTradingDynamicS_T.h CosTradingDynamicS_T.i \
- CosTradingDynamicS_T.cpp CosTradingDynamicS.i
-.obj/CosTradingReposS.o .obj/CosTradingReposS.so .shobj/CosTradingReposS.o .shobj/CosTradingReposS.so: CosTradingReposS.cpp CosTradingReposS.h \
- CosTradingS.h CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -4066,624 +809,36 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosTradingC.i CosTradingS_T.h CosTradingS_T.i \
- CosTradingS_T.cpp CosTradingS.i CosTradingReposC.h CosTradingReposC.i \
- CosTradingReposS_T.h CosTradingReposS_T.i CosTradingReposS_T.cpp \
- CosTradingReposS.i
-.obj/CosPropertyServiceS.o .obj/CosPropertyServiceS.so .shobj/CosPropertyServiceS.o .shobj/CosPropertyServiceS.so: CosPropertyServiceS.cpp CosPropertyServiceS.h \
- CosPropertyServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS_T.h \
- CosPropertyServiceS_T.i CosPropertyServiceS_T.cpp \
- CosPropertyServiceS.i
-.obj/CosConcurrencyControlS.o .obj/CosConcurrencyControlS.so .shobj/CosConcurrencyControlS.o .shobj/CosConcurrencyControlS.so: CosConcurrencyControlS.cpp \
- CosConcurrencyControlS.h CosConcurrencyControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Mem_Map.h \
+ $(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/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 \
@@ -4695,894 +850,50 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS_T.h \
- CosConcurrencyControlS_T.i CosConcurrencyControlS_T.cpp \
- CosConcurrencyControlS.i
-.obj/LoggerS.o .obj/LoggerS.so .shobj/LoggerS.o .shobj/LoggerS.so: LoggerS.cpp LoggerS.h LoggerC.h \
  $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h LoggerC.i LoggerS_T.h LoggerS_T.i LoggerS_T.cpp \
- LoggerS.i
-.obj/TimeBaseS.o .obj/TimeBaseS.so .shobj/TimeBaseS.o .shobj/TimeBaseS.so: TimeBaseS.cpp TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i
-.obj/TimeServiceS.o .obj/TimeServiceS.so .shobj/TimeServiceS.o .shobj/TimeServiceS.so: TimeServiceS.cpp TimeServiceS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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 \
- TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -5594,9 +905,9 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
@@ -5606,591 +917,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.i TimeBaseS_T.h TimeBaseS_T.i \
- TimeBaseS_T.cpp TimeBaseS.i TimeServiceC.h TimeServiceC.i \
- TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp TimeServiceS.i
-.obj/PingS.o .obj/PingS.so .shobj/PingS.o .shobj/PingS.so: PingS.cpp PingS.h PingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i
-.obj/ImplRepoS.o .obj/ImplRepoS.so .shobj/ImplRepoS.o .shobj/ImplRepoS.so: ImplRepoS.cpp ImplRepoS.h PingS.h PingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -6212,289 +954,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h PingC.i PingS_T.h PingS_T.i PingS_T.cpp PingS.i \
- ImplRepoC.h ImplRepoC.i ImplRepoS_T.h ImplRepoS_T.i ImplRepoS_T.cpp \
- ImplRepoS.i
-.obj/CosNamingS.o .obj/CosNamingS.so .shobj/CosNamingS.o .shobj/CosNamingS.so: CosNamingS.cpp CosNamingS.h CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -6511,654 +975,110 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosNamingC.i CosNamingS_T.h CosNamingS_T.i \
- CosNamingS_T.cpp CosNamingS.i
-.obj/AVStreamsC.o .obj/AVStreamsC.so .shobj/AVStreamsC.o .shobj/AVStreamsC.so: AVStreamsC.cpp AVStreamsC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosPropertyServiceC.h CosPropertyServiceC.i \
- AVStreamsC.i AVStreamsS.h CosPropertyServiceS.h \
- CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
- CosPropertyServiceS_T.cpp CosPropertyServiceS.i AVStreamsS_T.h \
- AVStreamsS_T.i AVStreamsS_T.cpp AVStreamsS.i
-.obj/Null_MediaCtrlC.o .obj/Null_MediaCtrlC.so .shobj/Null_MediaCtrlC.o .shobj/Null_MediaCtrlC.so: Null_MediaCtrlC.cpp Null_MediaCtrlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- orbsvcs_export.h Null_MediaCtrlC.i Null_MediaCtrlS.h \
- Null_MediaCtrlS_T.h Null_MediaCtrlS_T.i Null_MediaCtrlS_T.cpp \
- Null_MediaCtrlS.i
-.obj/sfpC.o .obj/sfpC.so .shobj/sfpC.o .shobj/sfpC.so: sfpC.cpp sfpC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
+.obj/Naming_Utils.o .obj/Naming_Utils.so .shobj/Naming_Utils.o .shobj/Naming_Utils.so: Naming/Naming_Utils.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ Naming/CosNaming_i.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 \
+ Naming/Entries.h \
+ $(ACE_ROOT)/ace/Arg_Shifter.h
+.obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
+.obj/TAO_Time_Service_Server.o .obj/TAO_Time_Service_Server.so .shobj/TAO_Time_Service_Server.o .shobj/TAO_Time_Service_Server.so: Time/TAO_Time_Service_Server.cpp \
+ Time/TAO_UTO.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
+ Time/TAO_TIO.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ Time/TAO_Time_Service_Server.h
+.obj/TAO_Time_Service_Clerk.o .obj/TAO_Time_Service_Clerk.so .shobj/TAO_Time_Service_Clerk.o .shobj/TAO_Time_Service_Clerk.so: Time/TAO_Time_Service_Clerk.cpp \
+ Time/TAO_Time_Service_Clerk.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7173,1235 +1093,80 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_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/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h sfpC.i sfpS.h sfpS_T.h sfpS_T.i sfpS_T.cpp sfpS.i
-.obj/CosEventCommC.o .obj/CosEventCommC.so .shobj/CosEventCommC.o .shobj/CosEventCommC.so: CosEventCommC.cpp CosEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Mem_Map.h \
+ $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosEventCommC.i CosEventCommS.h CosEventCommS_T.h \
- CosEventCommS_T.i CosEventCommS_T.cpp CosEventCommS.i
-.obj/CosEventChannelAdminC.o .obj/CosEventChannelAdminC.so .shobj/CosEventChannelAdminC.o .shobj/CosEventChannelAdminC.so: CosEventChannelAdminC.cpp \
- CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosEventCommC.h CosEventCommC.i \
- CosEventChannelAdminC.i CosEventChannelAdminS.h CosEventCommS.h \
- CosEventCommS_T.h CosEventCommS_T.i CosEventCommS_T.cpp \
- CosEventCommS.i CosEventChannelAdminS_T.h CosEventChannelAdminS_T.i \
- CosEventChannelAdminS_T.cpp CosEventChannelAdminS.i
-.obj/RtecEventCommC.o .obj/RtecEventCommC.so .shobj/RtecEventCommC.o .shobj/RtecEventCommC.so: RtecEventCommC.cpp RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i RtecEventCommC.i RtecEventCommS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i
-.obj/RtecEventChannelAdminC.o .obj/RtecEventChannelAdminC.so .shobj/RtecEventChannelAdminC.o .shobj/RtecEventChannelAdminC.so: RtecEventChannelAdminC.cpp \
- RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -8413,233 +1178,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h RtecEventCommC.h TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i RtecEventCommC.i RtecSchedulerC.h RtecSchedulerC.i \
- RtecEventChannelAdminC.i RtecEventChannelAdminS.h RtecEventCommS.h \
- TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecSchedulerS.h RtecSchedulerS_T.h \
- RtecSchedulerS_T.i RtecSchedulerS_T.cpp RtecSchedulerS.i \
- RtecEventChannelAdminS_T.h RtecEventChannelAdminS_T.i \
- RtecEventChannelAdminS_T.cpp RtecEventChannelAdminS.i
-.obj/RtecUDPAdminC.o .obj/RtecUDPAdminC.so .shobj/RtecUDPAdminC.o .shobj/RtecUDPAdminC.so: RtecUDPAdminC.cpp RtecUDPAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -8656,62 +1198,7 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -8720,613 +1207,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h RtecEventCommC.h TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i RtecEventCommC.i RtecUDPAdminC.i RtecUDPAdminS.h \
- RtecEventCommS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- RtecEventCommS_T.h RtecEventCommS_T.i RtecEventCommS_T.cpp \
- RtecEventCommS.i RtecUDPAdminS_T.h RtecUDPAdminS_T.i \
- RtecUDPAdminS_T.cpp RtecUDPAdminS.i
-.obj/RtecSchedulerC.o .obj/RtecSchedulerC.so .shobj/RtecSchedulerC.o .shobj/RtecSchedulerC.so: RtecSchedulerC.cpp RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i RtecSchedulerC.i RtecSchedulerS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- RtecSchedulerS_T.h RtecSchedulerS_T.i RtecSchedulerS_T.cpp \
- RtecSchedulerS.i
-.obj/CosLifeCycleC.o .obj/CosLifeCycleC.so .shobj/CosLifeCycleC.o .shobj/CosLifeCycleC.so: CosLifeCycleC.cpp CosLifeCycleC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -9348,290 +1244,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosNamingC.h CosNamingC.i CosLifeCycleC.i \
- CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
- CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
- CosLifeCycleS_T.cpp CosLifeCycleS.i
-.obj/LifeCycleServiceC.o .obj/LifeCycleServiceC.so .shobj/LifeCycleServiceC.o .shobj/LifeCycleServiceC.so: LifeCycleServiceC.cpp LifeCycleServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -9648,372 +1265,113 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosLifeCycleC.h CosNamingC.h CosNamingC.i \
- CosLifeCycleC.i LifeCycleServiceC.i LifeCycleServiceS.h \
- CosLifeCycleS.h CosNamingS.h CosNamingS_T.h CosNamingS_T.i \
- CosNamingS_T.cpp CosNamingS.i CosLifeCycleS_T.h CosLifeCycleS_T.i \
- CosLifeCycleS_T.cpp CosLifeCycleS.i LifeCycleServiceS_T.h \
- LifeCycleServiceS_T.i LifeCycleServiceS_T.cpp LifeCycleServiceS.i
-.obj/CosTradingC.o .obj/CosTradingC.so .shobj/CosTradingC.o .shobj/CosTradingC.so: CosTradingC.cpp CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- orbsvcs_export.h CosTradingC.i CosTradingS.h CosTradingS_T.h \
- CosTradingS_T.i CosTradingS_T.cpp CosTradingS.i
-.obj/CosTradingDynamicC.o .obj/CosTradingDynamicC.so .shobj/CosTradingDynamicC.o .shobj/CosTradingDynamicC.so: CosTradingDynamicC.cpp CosTradingDynamicC.h \
- $(TAO_ROOT)/tao/corba.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/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
+ Time/Timer_Helper.h Time/TAO_TIO.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ Time/TAO_UTO.h
+.obj/TAO_UTO.o .obj/TAO_UTO.so .shobj/TAO_UTO.o .shobj/TAO_UTO.so: Time/TAO_UTO.cpp Time/TAO_UTO.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
+ Time/TAO_TIO.h \
+ $(TAO_ROOT)/tao/TAO.h
+.obj/TAO_TIO.o .obj/TAO_TIO.so .shobj/TAO_TIO.o .shobj/TAO_TIO.so: Time/TAO_TIO.cpp Time/TAO_TIO.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
- $(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 \
@@ -10055,529 +1413,73 @@ ORBSVCS_COMPONENTS:
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingDynamicC.i \
- CosTradingDynamicS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
- CosTradingS_T.cpp CosTradingS.i CosTradingDynamicS_T.h \
- CosTradingDynamicS_T.i CosTradingDynamicS_T.cpp CosTradingDynamicS.i
-.obj/CosTradingReposC.o .obj/CosTradingReposC.so .shobj/CosTradingReposC.o .shobj/CosTradingReposC.so: CosTradingReposC.cpp CosTradingReposC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
+ Time/TAO_UTO.h
+.obj/Timer_Helper.o .obj/Timer_Helper.so .shobj/Timer_Helper.o .shobj/Timer_Helper.so: Time/Timer_Helper.cpp Time/Timer_Helper.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosTradingC.h CosTradingC.i CosTradingReposC.i \
- CosTradingReposS.h CosTradingS.h CosTradingS_T.h CosTradingS_T.i \
- CosTradingS_T.cpp CosTradingS.i CosTradingReposS_T.h \
- CosTradingReposS_T.i CosTradingReposS_T.cpp CosTradingReposS.i
-.obj/CosPropertyServiceC.o .obj/CosPropertyServiceC.so .shobj/CosPropertyServiceC.o .shobj/CosPropertyServiceC.so: CosPropertyServiceC.cpp CosPropertyServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -10587,8 +1489,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10601,11 +1501,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -10615,535 +1510,87 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosPropertyServiceC.i CosPropertyServiceS.h \
- CosPropertyServiceS_T.h CosPropertyServiceS_T.i \
- CosPropertyServiceS_T.cpp CosPropertyServiceS.i
-.obj/CosConcurrencyControlC.o .obj/CosConcurrencyControlC.so .shobj/CosConcurrencyControlC.o .shobj/CosConcurrencyControlC.so: CosConcurrencyControlC.cpp \
- CosConcurrencyControlC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
+ Time/TAO_Time_Service_Clerk.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/Logger_i.o .obj/Logger_i.so .shobj/Logger_i.o .shobj/Logger_i.so: Log/Logger_i.cpp \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosConcurrencyControlC.i CosConcurrencyControlS.h \
- CosConcurrencyControlS_T.h CosConcurrencyControlS_T.i \
- CosConcurrencyControlS_T.cpp CosConcurrencyControlS.i
-.obj/LoggerC.o .obj/LoggerC.so .shobj/LoggerC.o .shobj/LoggerC.so: LoggerC.cpp LoggerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.i
+.obj/CC_Lock.o .obj/CC_Lock.so .shobj/CC_Lock.o .shobj/CC_Lock.so: Concurrency/CC_Lock.cpp Concurrency/CC_Lock.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -11157,273 +1604,30 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h LoggerC.i LoggerS.h LoggerS_T.h LoggerS_T.i \
- LoggerS_T.cpp LoggerS.i
-.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
+.obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -11437,902 +1641,141 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i
-.obj/TimeServiceC.o .obj/TimeServiceC.so .shobj/TimeServiceC.o .shobj/TimeServiceC.so: TimeServiceC.cpp TimeServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
+.obj/CC_LockSetFactory.o .obj/CC_LockSetFactory.so .shobj/CC_LockSetFactory.o .shobj/CC_LockSetFactory.so: Concurrency/CC_LockSetFactory.cpp \
+ Concurrency/CC_LockSetFactory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \
+ Concurrency/CC_LockSet.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i
+.obj/Concurrency_Utils.o .obj/Concurrency_Utils.so .shobj/Concurrency_Utils.o .shobj/Concurrency_Utils.so: Concurrency/Concurrency_Utils.cpp \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
+.obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- TimeBaseC.i TimeServiceC.i TimeServiceS.h TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.h \
- $(TAO_ROOT)/tao/TimeBaseS_T.i \
- $(TAO_ROOT)/tao/TimeBaseS_T.cpp \
- $(TAO_ROOT)/tao/TimeBaseS.i \
- TimeBaseS_T.h TimeBaseS_T.i TimeBaseS_T.cpp TimeBaseS.i \
- TimeServiceS_T.h TimeServiceS_T.i TimeServiceS_T.cpp TimeServiceS.i
-.obj/PingC.o .obj/PingC.so .shobj/PingC.o .shobj/PingC.so: PingC.cpp PingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i
+.obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Trader/Constraint_Interpreter.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \
+ Trader/Constraint_Visitors.h Trader/Trader.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h PingC.i PingS.h PingS_T.h PingS_T.i PingS_T.cpp \
- PingS.i
-.obj/ImplRepoC.o .obj/ImplRepoC.so .shobj/ImplRepoC.o .shobj/ImplRepoC.so: ImplRepoC.cpp ImplRepoC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -12341,226 +1784,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h PingC.h PingC.i ImplRepoC.i ImplRepoS.h PingS.h \
- PingS_T.h PingS_T.i PingS_T.cpp PingS.i ImplRepoS_T.h ImplRepoS_T.i \
- ImplRepoS_T.cpp ImplRepoS.i
-.obj/CosNamingC.o .obj/CosNamingC.so .shobj/CosNamingC.o .shobj/CosNamingC.so: CosNamingC.cpp CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -12575,358 +1798,36 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- orbsvcs_export.h CosNamingC.i CosNamingS.h CosNamingS_T.h \
- CosNamingS_T.i CosNamingS_T.cpp CosNamingS.i
-.obj/AVStreams_i.o .obj/AVStreams_i.so .shobj/AVStreams_i.o .shobj/AVStreams_i.so: AV/AVStreams_i.cpp AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Containers_T.h \
+ $(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/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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Process.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
@@ -12938,996 +1839,110 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i
-.obj/Endpoint_Strategy.o .obj/Endpoint_Strategy.so .shobj/Endpoint_Strategy.o .shobj/Endpoint_Strategy.so: AV/Endpoint_Strategy.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.h Trader/Offer_Database.h Trader/Offer_Iterators.h \
+ Trader/Offer_Database.cpp Trader/Trader_T.cpp \
+ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.cpp
+.obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(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/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/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/Process.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Process.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
-.obj/Endpoint_Strategy_T.o .obj/Endpoint_Strategy_T.so .shobj/Endpoint_Strategy_T.o .shobj/Endpoint_Strategy_T.so: AV/Endpoint_Strategy_T.cpp \
- AV/Endpoint_Strategy_T.h AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(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/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/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/Process.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Process.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ Trader/Constraint_Visitors.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(TAO_ROOT)/tao/TAO.h \
- AV/Endpoint_Strategy_T.cpp
-.obj/sfp.o .obj/sfp.so .shobj/sfp.o .shobj/sfp.so: AV/sfp.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ Trader/Trader_Utils.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h
+.obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \
+ Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.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_Dgram.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -13936,227 +1951,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/sfpC.i \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i
-.obj/EC_Event_Channel.o .obj/EC_Event_Channel.so .shobj/EC_Event_Channel.o .shobj/EC_Event_Channel.so: Event/EC_Event_Channel.cpp \
- Event/EC_Event_Channel.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -14171,312 +1965,14 @@ ORBSVCS_COMPONENTS:
  $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_Default_Factory.h Event/EC_Default_Factory.i \
- Event/EC_Dispatching.h Event/EC_Dispatching.i \
- Event/EC_ConsumerAdmin.h Event/EC_ProxyPushSupplier_Set.h \
- Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_SupplierAdmin.i Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_ObserverStrategy.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- Event/EC_ObserverStrategy.i
-.obj/EC_ConsumerAdmin.o .obj/EC_ConsumerAdmin.so .shobj/EC_ConsumerAdmin.o .shobj/EC_ConsumerAdmin.so: Event/EC_ConsumerAdmin.cpp \
- Event/EC_ConsumerAdmin.h \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -14484,91 +1980,21 @@ ORBSVCS_COMPONENTS:
  $(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/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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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 \
@@ -14580,306 +2006,38 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Event_Channel.i Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp
-.obj/EC_SupplierAdmin.o .obj/EC_SupplierAdmin.so .shobj/EC_SupplierAdmin.o .shobj/EC_SupplierAdmin.so: Event/EC_SupplierAdmin.cpp \
- Event/EC_SupplierAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Offer_Iterators.h Trader/Trader_Utils.h \
+ Trader/Offer_Database.cpp
+.obj/Offer_Iterators.o .obj/Offer_Iterators.so .shobj/Offer_Iterators.o .shobj/Offer_Iterators.so: Trader/Offer_Iterators.cpp Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -14888,253 +2046,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Event_Channel.i
-.obj/EC_ProxyConsumer.o .obj/EC_ProxyConsumer.so .shobj/EC_ProxyConsumer.o .shobj/EC_ProxyConsumer.so: Event/EC_ProxyConsumer.cpp \
- Event/EC_ProxyConsumer.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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 \
@@ -15149,697 +2060,36 @@ ORBSVCS_COMPONENTS:
  $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
- Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_SupplierFiltering.h Event/EC_SupplierFiltering.i \
- Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i
-.obj/EC_ProxySupplier.o .obj/EC_ProxySupplier.so .shobj/EC_ProxySupplier.o .shobj/EC_ProxySupplier.so: Event/EC_ProxySupplier.cpp \
- Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_Dispatching.h \
- Event/EC_Dispatching.i Event/EC_Filter_Builder.h \
- Event/EC_Filter_Builder.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
- Event/EC_Event_Channel.h Event/EC_Factory.h Event/EC_Factory.i \
- Event/EC_Event_Channel.i
-.obj/EC_SupplierFiltering.o .obj/EC_SupplierFiltering.so .shobj/EC_SupplierFiltering.o .shobj/EC_SupplierFiltering.so: Event/EC_SupplierFiltering.cpp \
- Event/EC_SupplierFiltering.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Mem_Map.h \
+ $(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/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 \
@@ -15851,268 +2101,37 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_SupplierFiltering.i
-.obj/EC_Supplier_Filter_Builder.o .obj/EC_Supplier_Filter_Builder.so .shobj/EC_Supplier_Filter_Builder.o .shobj/EC_Supplier_Filter_Builder.so: Event/EC_Supplier_Filter_Builder.cpp \
- Event/EC_Supplier_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+.obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -16121,236 +2140,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Supplier_Filter_Builder.i
-.obj/EC_Trivial_Supplier_Filter.o .obj/EC_Trivial_Supplier_Filter.so .shobj/EC_Trivial_Supplier_Filter.o .shobj/EC_Trivial_Supplier_Filter.so: Event/EC_Trivial_Supplier_Filter.cpp \
- Event/EC_Trivial_Supplier_Filter.h Event/EC_SupplierFiltering.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -16365,671 +2154,36 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_SupplierFiltering.i Event/EC_Supplier_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \
- Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_ConsumerAdmin.h Event/EC_ProxyPushSupplier_Set.h \
- Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i
-.obj/EC_Filter.o .obj/EC_Filter.so .shobj/EC_Filter.o .shobj/EC_Filter.so: Event/EC_Filter.cpp Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i
-.obj/EC_Filter_Builder.o .obj/EC_Filter_Builder.so .shobj/EC_Filter_Builder.o .shobj/EC_Filter_Builder.so: Event/EC_Filter_Builder.cpp \
- Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Mem_Map.h \
+ $(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/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 \
@@ -17041,216 +2195,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Filter.h Event/EC_Filter.i
-.obj/EC_Dispatching.o .obj/EC_Dispatching.so .shobj/EC_Dispatching.o .shobj/EC_Dispatching.so: Event/EC_Dispatching.cpp Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Offer_Database.h Trader/Offer_Database.cpp \
+ Trader/Offer_Iterators_T.cpp
+.obj/Service_Type_Repository.o .obj/Service_Type_Repository.so .shobj/Service_Type_Repository.o .shobj/Service_Type_Repository.so: Trader/Service_Type_Repository.cpp \
+ Trader/Locking.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
  $(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 \
@@ -17292,76 +2272,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -17373,256 +2319,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i
-.obj/EC_Factory.o .obj/EC_Factory.so .shobj/EC_Factory.o .shobj/EC_Factory.so: Event/EC_Factory.cpp Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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 \
@@ -17649,52 +2349,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -17703,311 +2357,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event/EC_Factory.i
-.obj/EC_QOS_Info.o .obj/EC_QOS_Info.so .shobj/EC_QOS_Info.o .shobj/EC_QOS_Info.so: Event/EC_QOS_Info.cpp Event/EC_QOS_Info.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -18029,295 +2394,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_QOS_Info.i
-.obj/EC_Null_Factory.o .obj/EC_Null_Factory.so .shobj/EC_Null_Factory.o .shobj/EC_Null_Factory.so: Event/EC_Null_Factory.cpp Event/EC_Null_Factory.h \
- Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -18334,493 +2415,68 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.h \
- Event/EC_SupplierFiltering.h Event/EC_SupplierFiltering.i \
- Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i \
- Event/EC_Trivial_Supplier_Filter.i Event/EC_ConsumerAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_ObserverStrategy.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
- Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
- Event/EC_Null_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
- Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i
-.obj/EC_Disjunction_Filter.o .obj/EC_Disjunction_Filter.so .shobj/EC_Disjunction_Filter.o .shobj/EC_Disjunction_Filter.so: Event/EC_Disjunction_Filter.cpp \
- Event/EC_Disjunction_Filter.h Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
+ Trader/Service_Type_Repository.h Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_Disjunction_Filter.i
-.obj/EC_Conjunction_Filter.o .obj/EC_Conjunction_Filter.so .shobj/EC_Conjunction_Filter.o .shobj/EC_Conjunction_Filter.so: Event/EC_Conjunction_Filter.cpp \
- Event/EC_Conjunction_Filter.h Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+.obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -18829,232 +2485,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_Conjunction_Filter.i
-.obj/EC_Type_Filter.o .obj/EC_Type_Filter.so .shobj/EC_Type_Filter.o .shobj/EC_Type_Filter.so: Event/EC_Type_Filter.cpp Event/EC_Type_Filter.h \
- Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -19069,645 +2499,36 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_Type_Filter.i
-.obj/EC_Basic_Filter_Builder.o .obj/EC_Basic_Filter_Builder.so .shobj/EC_Basic_Filter_Builder.o .shobj/EC_Basic_Filter_Builder.so: Event/EC_Basic_Filter_Builder.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.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.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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
- Event/EC_Type_Filter.h Event/EC_Filter.h Event/EC_Filter.i \
- Event/EC_Type_Filter.i Event/EC_Conjunction_Filter.h \
- Event/EC_Conjunction_Filter.i Event/EC_Disjunction_Filter.h \
- Event/EC_Disjunction_Filter.i Event/EC_Timeout_Filter.h \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i
-.obj/EC_Basic_Factory.o .obj/EC_Basic_Factory.so .shobj/EC_Basic_Factory.o .shobj/EC_Basic_Factory.so: Event/EC_Basic_Factory.cpp \
- Event/EC_Basic_Factory.h Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/Mem_Map.h \
+ $(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/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 \
@@ -19719,326 +2540,45 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_Basic_Filter_Builder.h \
- Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
- Event/EC_Trivial_Supplier_Filter.h Event/EC_SupplierFiltering.h \
- Event/EC_SupplierFiltering.i Event/EC_Supplier_Filter_Builder.h \
- Event/EC_Supplier_Filter_Builder.i Event/EC_Trivial_Supplier_Filter.i \
- Event/EC_ConsumerAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_ObserverStrategy.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
- Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
- Event/EC_Null_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
- Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i
-.obj/EC_Default_Factory.o .obj/EC_Default_Factory.so .shobj/EC_Default_Factory.o .shobj/EC_Default_Factory.so: Event/EC_Default_Factory.cpp \
- Event/EC_Default_Factory.h Event/EC_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Offer_Database.h \
+ Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
+ Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
+ Trader/Constraint_Visitors.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.h Trader/Trader_T.cpp Trader/Trader_Interfaces.cpp \
+ $(ACE_ROOT)/ace/Arg_Shifter.h
+.obj/Trader_Interfaces.o .obj/Trader_Interfaces.so .shobj/Trader_Interfaces.o .shobj/Trader_Interfaces.so: Trader/Trader_Interfaces.cpp \
+ Trader/Trader_Interfaces.h Trader/Trader_Utils.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -20047,289 +2587,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event/EC_Factory.i Event/EC_Default_Factory.i \
- Event/EC_Priority_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_Priority_Dispatching.i \
- Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
- Event/EC_Sched_Filter_Builder.h Event/EC_Sched_Filter_Builder.i \
- Event/EC_ConsumerAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i Event/EC_Trivial_Supplier_Filter.h \
- Event/EC_SupplierFiltering.h Event/EC_SupplierFiltering.i \
- Event/EC_Supplier_Filter_Builder.h Event/EC_Supplier_Filter_Builder.i \
- Event/EC_Trivial_Supplier_Filter.i Event/EC_Per_Supplier_Filter.h \
- Event/EC_Per_Supplier_Filter.i Event/EC_ObserverStrategy.h \
- $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- Event/EC_ObserverStrategy.i Event/EC_Null_Scheduling.h \
- Event/EC_Scheduling_Strategy.h Event/EC_Scheduling_Strategy.i \
- Event/EC_Null_Scheduling.i Event/EC_Priority_Scheduling.h \
- Event/EC_Priority_Scheduling.i Event/EC_ProxyPushSupplier_Set_T.h \
- Event/EC_ProxyPushSupplier_Set_T.i \
- Event/EC_ProxyPushSupplier_Set_T.cpp Event/EC_Command.h \
- Event/EC_Command.i Event/EC_Command.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i \
- Event/EC_Event_Channel.h Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h
-.obj/EC_ObserverStrategy.o .obj/EC_ObserverStrategy.so .shobj/EC_ObserverStrategy.o .shobj/EC_ObserverStrategy.so: Event/EC_ObserverStrategy.cpp \
- Event/EC_ObserverStrategy.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -20344,329 +2601,14 @@ ORBSVCS_COMPONENTS:
  $(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/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/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/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/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/RB_Tree.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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_ObserverStrategy.i Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_ConsumerAdmin.h \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ConsumerAdmin.i \
- Event/EC_SupplierAdmin.h Event/EC_SupplierAdmin.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/EC_ProxyPushSupplier_Set.o .obj/EC_ProxyPushSupplier_Set.so .shobj/EC_ProxyPushSupplier_Set.o .shobj/EC_ProxyPushSupplier_Set.so: Event/EC_ProxyPushSupplier_Set.cpp \
- Event/EC_ProxyPushSupplier_Set.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.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 \
@@ -20674,72 +2616,21 @@ ORBSVCS_COMPONENTS:
  $(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/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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(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 \
- $(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 \
@@ -20751,302 +2642,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Event/EC_Busy_Lock.h Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_Command.h Event/EC_Command.i \
- Event/EC_Command.cpp
-.obj/EC_Per_Supplier_Filter.o .obj/EC_Per_Supplier_Filter.so .shobj/EC_Per_Supplier_Filter.o .shobj/EC_Per_Supplier_Filter.so: Event/EC_Per_Supplier_Filter.cpp \
- Event/EC_Per_Supplier_Filter.h Event/EC_SupplierFiltering.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
+ Trader/Offer_Database.h Trader/Offer_Database.cpp \
+ Trader/Offer_Iterators_T.cpp Trader/Trader_T.h Trader/Trader_T.cpp \
+ Trader/Trader_Interfaces.cpp
+.obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -21055,276 +2686,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_SupplierFiltering.i Event/EC_Supplier_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Supplier_Filter_Builder.i Event/EC_Per_Supplier_Filter.i \
- Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_ProxyPushSupplier_Set.h Event/EC_Busy_Lock.h \
- Event/EC_Busy_Lock.i Event/EC_Busy_Lock.cpp \
- Event/EC_ProxyPushSupplier_Set.i Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i Event/EC_ProxyConsumer.h \
- Event/EC_ProxyConsumer.i Event/EC_Scheduling_Strategy.h \
- Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
-.obj/EC_Timeout_Filter.o .obj/EC_Timeout_Filter.so .shobj/EC_Timeout_Filter.o .shobj/EC_Timeout_Filter.so: Event/EC_Timeout_Filter.cpp \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -21339,387 +2700,36 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_QOS_Info.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.h Event/EC_Timeout_Generator.i \
- Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- Event/EC_ProxySupplier.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h
-.obj/EC_Timeout_Generator.o .obj/EC_Timeout_Generator.so .shobj/EC_Timeout_Generator.o .shobj/EC_Timeout_Generator.so: Event/EC_Timeout_Generator.cpp \
- Event/EC_Timeout_Generator.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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/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/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/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/Mem_Map.h \
+ $(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/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 \
@@ -21731,277 +2741,44 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_QOS_Info.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
-.obj/EC_Reactive_Timeout_Generator.o .obj/EC_Reactive_Timeout_Generator.so .shobj/EC_Reactive_Timeout_Generator.o .shobj/EC_Reactive_Timeout_Generator.so: \
- Event/EC_Reactive_Timeout_Generator.cpp \
- Event/EC_Reactive_Timeout_Generator.h Event/EC_Timeout_Generator.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Trader/Offer_Database.h Trader/Offer_Iterators.h \
+ Trader/Trader_Utils.h Trader/Offer_Database.cpp \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ Trader/Trader_T.cpp Trader/Trader_Interfaces.h \
+ Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
+ Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
+ Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
+ Trader/Trader_Interfaces.cpp
+.obj/Trader_Utils.o .obj/Trader_Utils.so .shobj/Trader_Utils.o .shobj/Trader_Utils.so: Trader/Trader_Utils.cpp Trader/Trader_Utils.h \
+ Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- Event/EC_Timeout_Filter.h Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -22010,235 +2787,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_QOS_Info.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_QOS_Info.i Event/EC_Timeout_Filter.i \
- Event/EC_Timeout_Generator.i Event/EC_Reactive_Timeout_Generator.i
-.obj/EC_Priority_Dispatching.o .obj/EC_Priority_Dispatching.so .shobj/EC_Priority_Dispatching.o .shobj/EC_Priority_Dispatching.so: Event/EC_Priority_Dispatching.cpp \
- Event/EC_Priority_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -22253,331 +2801,14 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_Dispatching.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching.i Event/EC_Priority_Dispatching.i \
- Event/EC_Dispatching_Task.h Event/EC_Dispatching_Task.i \
- Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/EC_Dispatching_Task.o .obj/EC_Dispatching_Task.so .shobj/EC_Dispatching_Task.o .shobj/EC_Dispatching_Task.so: Event/EC_Dispatching_Task.cpp \
- Event/EC_Dispatching_Task.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/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 \
@@ -22591,34 +2822,15 @@ ORBSVCS_COMPONENTS:
  $(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/Mem_Map.h \
+ $(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/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 \
@@ -22630,259 +2842,35 @@ ORBSVCS_COMPONENTS:
  $(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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Dispatching_Task.i Event/EC_ProxySupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxySupplier.i
-.obj/EC_Sched_Filter.o .obj/EC_Sched_Filter.so .shobj/EC_Sched_Filter.o .shobj/EC_Sched_Filter.so: Event/EC_Sched_Filter.cpp Event/EC_Sched_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+.obj/Scheduler_Factory.o .obj/Scheduler_Factory.so .shobj/Scheduler_Factory.o .shobj/Scheduler_Factory.so: Scheduler_Factory.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.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 \
@@ -22897,611 +2885,135 @@ ORBSVCS_COMPONENTS:
  $(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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Runtime_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_Sched_Filter.i Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i
-.obj/EC_Sched_Filter_Builder.o .obj/EC_Sched_Filter_Builder.so .shobj/EC_Sched_Filter_Builder.o .shobj/EC_Sched_Filter_Builder.so: Event/EC_Sched_Filter_Builder.cpp \
- Event/EC_Sched_Filter.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i
+.obj/Runtime_Scheduler.o .obj/Runtime_Scheduler.so .shobj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i
+.obj/Scheduler_Utilities.o .obj/Scheduler_Utilities.so .shobj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Filter.i Event/EC_Sched_Filter.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.i
+.obj/Config_Scheduler.o .obj/Config_Scheduler.so .shobj/Config_Scheduler.o .shobj/Config_Scheduler.so: Sched/Config_Scheduler.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Event/EC_Sched_Filter_Builder.h Event/EC_Filter_Builder.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- Event/EC_Filter_Builder.i Event/EC_Sched_Filter_Builder.i \
- Event/EC_Type_Filter.h Event/EC_Type_Filter.i \
- Event/EC_Conjunction_Filter.h Event/EC_Conjunction_Filter.i \
- Event/EC_Disjunction_Filter.h Event/EC_Disjunction_Filter.i \
- Event/EC_Timeout_Filter.h Event/EC_QOS_Info.h Event/EC_QOS_Info.i \
- Event/EC_Timeout_Filter.i Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i
-.obj/EC_Scheduling_Strategy.o .obj/EC_Scheduling_Strategy.so .shobj/EC_Scheduling_Strategy.o .shobj/EC_Scheduling_Strategy.so: Event/EC_Scheduling_Strategy.cpp \
- Event/EC_Scheduling_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
+ Sched/Config_Scheduler.i
+.obj/DynSched.o .obj/DynSched.so .shobj/DynSched.o .shobj/DynSched.so: Sched/DynSched.cpp Sched/DynSched.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -23516,296 +3028,11 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Scheduling_Strategy.i Event/EC_QOS_Info.h \
- Event/EC_QOS_Info.i
-.obj/EC_Null_Scheduling.o .obj/EC_Null_Scheduling.so .shobj/EC_Null_Scheduling.o .shobj/EC_Null_Scheduling.so: Event/EC_Null_Scheduling.cpp \
- Event/EC_Null_Scheduling.h Event/EC_Scheduling_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -23827,33 +3054,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -23870,847 +3070,89 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Scheduling_Strategy.i Event/EC_Null_Scheduling.i \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i
-.obj/EC_Priority_Scheduling.o .obj/EC_Priority_Scheduling.so .shobj/EC_Priority_Scheduling.o .shobj/EC_Priority_Scheduling.so: Event/EC_Priority_Scheduling.cpp \
- Event/EC_Priority_Scheduling.h Event/EC_Scheduling_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- Event/EC_Scheduling_Strategy.i Event/EC_Priority_Scheduling.i \
- Event/EC_QOS_Info.h Event/EC_QOS_Info.i Event/EC_ProxyConsumer.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
- Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
- Event/EC_ProxySupplier.i
-.obj/ConsumerAdmin_i.o .obj/ConsumerAdmin_i.so .shobj/ConsumerAdmin_i.o .shobj/ConsumerAdmin_i.so: CosEvent/ConsumerAdmin_i.cpp \
- CosEvent/ConsumerAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Sched/SchedEntry.i Sched/DynSched.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
+.obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Sched/SchedEntry.i
+.obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Sched/Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/SupplierAdmin_i.o .obj/SupplierAdmin_i.so .shobj/SupplierAdmin_i.o .shobj/SupplierAdmin_i.so: CosEvent/SupplierAdmin_i.cpp \
- CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ Sched/Scheduler.i
+.obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \
+ $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ Sched/Scheduler_Generic.h Sched/Scheduler.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -24725,339 +3167,11 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/EventChannel_i.o .obj/EventChannel_i.so .shobj/EventChannel_i.o .shobj/EventChannel_i.so: CosEvent/EventChannel_i.cpp \
- CosEvent/EventChannel_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -25079,33 +3193,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -25122,600 +3209,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/ProxyPushConsumer_i.o .obj/ProxyPushConsumer_i.so .shobj/ProxyPushConsumer_i.o .shobj/ProxyPushConsumer_i.so: CosEvent/ProxyPushConsumer_i.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- CosEvent/ProxyPushConsumer_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/ProxyPushSupplier_i.o .obj/ProxyPushSupplier_i.so .shobj/ProxyPushSupplier_i.o .shobj/ProxyPushSupplier_i.so: CosEvent/ProxyPushSupplier_i.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
+ Sched/Scheduler.i Sched/Scheduler_Generic.i
+.obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \
+ Sched/Strategy_Scheduler.h Sched/DynSched.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -25730,328 +3259,11 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- CosEvent/ProxyPushSupplier_i.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/CosEvent_Utilities.o .obj/CosEvent_Utilities.so .shobj/CosEvent_Utilities.o .shobj/CosEvent_Utilities.so: CosEvent_Utilities.cpp CosEvent_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -26073,33 +3285,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -26116,535 +3301,30 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(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 \
+ Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ Sched/SchedEntry.i Sched/DynSched.i Sched/Strategy_Scheduler.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
 .obj/Event_Utilities.o .obj/Event_Utilities.so .shobj/Event_Utilities.o .shobj/Event_Utilities.so: Event_Utilities.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -26657,16 +3337,21 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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 \
  Event/BCU.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h
@@ -26674,291 +3359,31 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Sched_Params.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
@@ -26969,16 +3394,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -27033,16 +3453,21 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -27062,7 +3487,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -27085,8 +3509,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -27103,219 +3525,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
@@ -27351,16 +3565,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Timer_List_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -27395,26 +3604,36 @@ ORBSVCS_COMPONENTS:
 .obj/Event_Manip.o .obj/Event_Manip.so .shobj/Event_Manip.o .shobj/Event_Manip.so: Event/Event_Manip.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i
+.obj/Local_ESTypes.o .obj/Local_ESTypes.so .shobj/Local_ESTypes.o .shobj/Local_ESTypes.so: Event/Local_ESTypes.cpp Event/Local_ESTypes.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
  $(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 \
@@ -27456,76 +3675,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -27537,223 +3722,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i
-.obj/Local_ESTypes.o .obj/Local_ESTypes.so .shobj/Local_ESTypes.o .shobj/Local_ESTypes.so: Event/Local_ESTypes.cpp Event/Local_ESTypes.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -27780,52 +3752,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -27834,31 +3760,22 @@ ORBSVCS_COMPONENTS:
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -27880,8 +3797,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -27898,88 +3818,54 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -28004,16 +3890,21 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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 \
@@ -28030,7 +3921,6 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Synch_T.cpp \
  Event/Event_Channel.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 \
@@ -28062,8 +3952,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -28084,211 +3972,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
@@ -28296,16 +3984,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -28357,291 +4040,31 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Sched_Params.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Event/RT_Task.h Event/RT_Task.i Event/Debug_Macros.h \
@@ -28653,16 +4076,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -28715,292 +4133,32 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Event/ReactorTask.h Event/Fast_Reactor.h \
@@ -29026,16 +4184,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -29059,17 +4212,22 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -29077,271 +4235,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  Event/ReactorTask.h Event/Fast_Reactor.h \
@@ -29367,16 +4265,11 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -29405,298 +4298,14 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
@@ -29732,16 +4341,21 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -29758,274 +4372,14 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
@@ -30062,298 +4416,14 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecUDPAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
@@ -30372,17 +4442,22 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
@@ -30405,7 +4480,6 @@ ORBSVCS_COMPONENTS:
  $(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 \
@@ -30461,67 +4535,42 @@ ORBSVCS_COMPONENTS:
  $(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/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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -30533,10 +4582,27 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -30545,31 +4611,22 @@ ORBSVCS_COMPONENTS:
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -30591,8 +4648,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -30609,87 +4669,53 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -30721,1826 +4747,382 @@ ORBSVCS_COMPONENTS:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Dispatching_Modules.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h
-.obj/Scheduler_Factory.o .obj/Scheduler_Factory.so .shobj/Scheduler_Factory.o .shobj/Scheduler_Factory.so: Scheduler_Factory.cpp \
+.obj/EC_Event_Channel.o .obj/EC_Event_Channel.so .shobj/EC_Event_Channel.o .shobj/EC_Event_Channel.so: Event/EC_Event_Channel.cpp \
+ Event/EC_Event_Channel.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i
-.obj/Runtime_Scheduler.o .obj/Runtime_Scheduler.so .shobj/Runtime_Scheduler.o .shobj/Runtime_Scheduler.so: Runtime_Scheduler.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
+ Event/EC_Dispatching.h Event/EC_Dispatching.i \
+ Event/EC_ConsumerAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_SupplierAdmin.i Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ Event/Timer_Module.i
+.obj/EC_ConsumerAdmin.o .obj/EC_ConsumerAdmin.so .shobj/EC_ConsumerAdmin.o .shobj/EC_ConsumerAdmin.so: Event/EC_ConsumerAdmin.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ Event/EC_ConsumerAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i
-.obj/Scheduler_Utilities.o .obj/Scheduler_Utilities.so .shobj/Scheduler_Utilities.o .shobj/Scheduler_Utilities.so: Scheduler_Utilities.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ConsumerAdmin.i Event/EC_ProxySupplier.h \
+ Event/EC_ProxySupplier.i Event/EC_Event_Channel.h Event/EC_Factory.h \
+ Event/EC_Factory.i Event/EC_Event_Channel.i
+.obj/EC_SupplierAdmin.o .obj/EC_SupplierAdmin.so .shobj/EC_SupplierAdmin.o .shobj/EC_SupplierAdmin.so: Event/EC_SupplierAdmin.cpp \
+ Event/EC_SupplierAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
+ Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
+ Event/EC_Factory.i Event/EC_Event_Channel.i
+.obj/EC_ProxyConsumer.o .obj/EC_ProxyConsumer.so .shobj/EC_ProxyConsumer.o .shobj/EC_ProxyConsumer.so: Event/EC_ProxyConsumer.cpp \
+ Event/EC_ProxyConsumer.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Utilities.i
-.obj/Config_Scheduler.o .obj/Config_Scheduler.so .shobj/Config_Scheduler.o .shobj/Config_Scheduler.so: Sched/Config_Scheduler.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ProxyConsumer.i Event/EC_Event_Channel.h Event/EC_Factory.h \
+ Event/EC_Factory.i Event/EC_Event_Channel.i \
+ Event/EC_SupplierFiltering.h Event/EC_SupplierFiltering.i
+.obj/EC_ProxySupplier.o .obj/EC_ProxySupplier.so .shobj/EC_ProxySupplier.o .shobj/EC_ProxySupplier.so: Event/EC_ProxySupplier.cpp \
+ Event/EC_ProxySupplier.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- Sched/Config_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ProxySupplier.i Event/EC_Dispatching.h \
+ Event/EC_Dispatching.i Event/EC_Filter_Builder.h \
+ Event/EC_Filter_Builder.i Event/EC_Event_Channel.h Event/EC_Factory.h \
+ Event/EC_Factory.i Event/EC_Event_Channel.i
+.obj/EC_SupplierFiltering.o .obj/EC_SupplierFiltering.so .shobj/EC_SupplierFiltering.o .shobj/EC_SupplierFiltering.so: Event/EC_SupplierFiltering.cpp \
+ Event/EC_SupplierFiltering.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_SupplierFiltering.i Event/EC_Event_Channel.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
- Sched/Config_Scheduler.i
-.obj/DynSched.o .obj/DynSched.so .shobj/DynSched.o .shobj/DynSched.so: Sched/DynSched.cpp Sched/DynSched.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ Event/EC_Factory.h Event/EC_Factory.i Event/EC_Event_Channel.i \
+ Event/EC_ConsumerAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ConsumerAdmin.i Event/EC_ProxySupplier.h \
+ Event/EC_ProxySupplier.i Event/EC_QOS_Info.h Event/EC_QOS_Info.i
+.obj/EC_Filter.o .obj/EC_Filter.so .shobj/EC_Filter.o .shobj/EC_Filter.so: Event/EC_Filter.cpp Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Map_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 \
- $(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 \
- $(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/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 \
- $(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/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 \
- Sched/SchedEntry.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.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 \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Filter.i
+.obj/EC_Filter_Builder.o .obj/EC_Filter_Builder.so .shobj/EC_Filter_Builder.o .shobj/EC_Filter_Builder.so: Event/EC_Filter_Builder.cpp \
+ Event/EC_Filter_Builder.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/SchedEntry.i Sched/DynSched.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/SchedEntry.o .obj/SchedEntry.so .shobj/SchedEntry.o .shobj/SchedEntry.so: Sched/SchedEntry.cpp Sched/SchedEntry.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ Event/EC_Filter_Builder.i Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ Event/EC_Filter.i
+.obj/EC_Dispatching.o .obj/EC_Dispatching.so .shobj/EC_Dispatching.o .shobj/EC_Dispatching.so: Event/EC_Dispatching.cpp Event/EC_Dispatching.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Dispatching.i Event/EC_ProxySupplier.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ProxySupplier.i
+.obj/EC_Factory.o .obj/EC_Factory.so .shobj/EC_Factory.o .shobj/EC_Factory.so: Event/EC_Factory.cpp Event/EC_Factory.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/SchedEntry.i
-.obj/Scheduler.o .obj/Scheduler.so .shobj/Scheduler.o .shobj/Scheduler.so: Sched/Scheduler.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -32582,662 +5164,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- Sched/Scheduler.i
-.obj/Scheduler_Generic.o .obj/Scheduler_Generic.so .shobj/Scheduler_Generic.o .shobj/Scheduler_Generic.so: Sched/Scheduler_Generic.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Sched/Scheduler_Generic.h Sched/Scheduler.h \
- $(ACE_ROOT)/ace/Map_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 \
- $(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 \
- $(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/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 \
- $(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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.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 \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/Scheduler.i Sched/Scheduler_Generic.i
-.obj/Strategy_Scheduler.o .obj/Strategy_Scheduler.so .shobj/Strategy_Scheduler.o .shobj/Strategy_Scheduler.so: Sched/Strategy_Scheduler.cpp \
- Sched/Strategy_Scheduler.h Sched/DynSched.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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/Map_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 \
- $(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 \
- $(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/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 \
- $(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/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 \
- Sched/SchedEntry.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.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 \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -33249,228 +5211,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- Sched/SchedEntry.i Sched/DynSched.i Sched/Strategy_Scheduler.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Trader/Constraint_Interpreter.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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/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 \
@@ -33497,52 +5241,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -33551,640 +5249,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_Nodes.o .obj/Constraint_Nodes.so .shobj/Constraint_Nodes.o .shobj/Constraint_Nodes.so: Trader/Constraint_Nodes.cpp \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Trader/Constraint_Visitors.cpp \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -34206,317 +5286,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.h Trader/Offer_Database.h Trader/Offer_Iterators.h \
- Trader/Offer_Database.cpp Trader/Trader_T.cpp \
- Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.cpp
-.obj/Constraint_l.o .obj/Constraint_l.so .shobj/Constraint_l.o .shobj/Constraint_l.so: Trader/Constraint_l.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -34533,1324 +5307,86 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Constraint_y.o .obj/Constraint_y.so .shobj/Constraint_y.o .shobj/Constraint_y.so: Trader/Constraint_y.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- Trader/Constraint_Visitors.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Trader_Utils.h \
- $(TAO_ROOT)/tao/DynSequence_i.h
-.obj/Offer_Database.o .obj/Offer_Database.so .shobj/Offer_Database.o .shobj/Offer_Database.so: Trader/Offer_Database.cpp Trader/Offer_Database.h \
- Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Iterators.h Trader/Trader_Utils.h \
- Trader/Offer_Database.cpp
-.obj/Offer_Iterators.o .obj/Offer_Iterators.so .shobj/Offer_Iterators.o .shobj/Offer_Iterators.so: Trader/Offer_Iterators.cpp Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ Event/EC_Factory.i
+.obj/EC_QOS_Info.o .obj/EC_QOS_Info.so .shobj/EC_QOS_Info.o .shobj/EC_QOS_Info.so: Event/EC_QOS_Info.cpp Event/EC_QOS_Info.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ Event/EC_QOS_Info.i
+.obj/EC_Null_Factory.o .obj/EC_Null_Factory.so .shobj/EC_Null_Factory.o .shobj/EC_Null_Factory.so: Event/EC_Null_Factory.cpp Event/EC_Null_Factory.h \
+ Event/EC_Factory.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/Offer_Iterators_T.o .obj/Offer_Iterators_T.so .shobj/Offer_Iterators_T.o .shobj/Offer_Iterators_T.so: Trader/Offer_Iterators_T.cpp \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Database.h Trader/Offer_Database.cpp \
- Trader/Offer_Iterators_T.cpp
-.obj/Service_Type_Repository.o .obj/Service_Type_Repository.so .shobj/Service_Type_Repository.o .shobj/Service_Type_Repository.so: Trader/Service_Type_Repository.cpp \
- Trader/Locking.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
+ $(ACE_ROOT)/ace/Malloc_Base.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 \
@@ -35892,996 +5428,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Trader/Service_Type_Repository.h Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/Trader.o .obj/Trader.so .shobj/Trader.o .shobj/Trader.so: Trader/Trader.cpp Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Offer_Database.h \
- Trader/Offer_Database.cpp Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.h Trader/Constraint_Interpreter.h \
- Trader/Constraint_Nodes.h Trader/Constraint_Tokens.h \
- Trader/Constraint_Visitors.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.h Trader/Trader_T.cpp Trader/Trader_Interfaces.cpp \
- $(ACE_ROOT)/ace/Arg_Shifter.h
-.obj/Trader_Interfaces.o .obj/Trader_Interfaces.so .shobj/Trader_Interfaces.o .shobj/Trader_Interfaces.so: Trader/Trader_Interfaces.cpp \
- Trader/Trader_Interfaces.h Trader/Trader_Utils.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators.h \
- Trader/Offer_Database.h Trader/Offer_Database.cpp \
- Trader/Offer_Iterators_T.cpp Trader/Trader_T.h Trader/Trader_T.cpp \
- Trader/Trader_Interfaces.cpp
-.obj/Trader_T.o .obj/Trader_T.so .shobj/Trader_T.o .shobj/Trader_T.so: Trader/Trader_T.cpp Trader/Trader_T.h Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -36893,549 +5475,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- Trader/Offer_Database.h Trader/Offer_Iterators.h \
- Trader/Trader_Utils.h Trader/Offer_Database.cpp \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- Trader/Trader_T.cpp Trader/Trader_Interfaces.h \
- Trader/Constraint_Interpreter.h Trader/Constraint_Nodes.h \
- Trader/Constraint_Tokens.h Trader/Constraint_Visitors.h \
- Trader/Offer_Iterators_T.h Trader/Offer_Iterators_T.cpp \
- Trader/Trader_Interfaces.cpp
-.obj/Trader_Utils.o .obj/Trader_Utils.so .shobj/Trader_Utils.o .shobj/Trader_Utils.so: Trader/Trader_Utils.cpp Trader/Trader_Utils.h \
- Trader/Trader.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
-.obj/CosPropertyService_i.o .obj/CosPropertyService_i.so .shobj/CosPropertyService_i.o .shobj/CosPropertyService_i.so: Property/CosPropertyService_i.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.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/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 \
@@ -37462,52 +5505,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -37516,599 +5513,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i
-.obj/CC_Lock.o .obj/CC_Lock.so .shobj/CC_Lock.o .shobj/CC_Lock.so: Concurrency/CC_Lock.cpp Concurrency/CC_Lock.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.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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.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/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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
-.obj/CC_LockSet.o .obj/CC_LockSet.so .shobj/CC_LockSet.o .shobj/CC_LockSet.so: Concurrency/CC_LockSet.cpp Concurrency/CC_LockSet.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.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/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/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.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/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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -38130,295 +5550,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
-.obj/CC_LockSetFactory.o .obj/CC_LockSetFactory.so .shobj/CC_LockSetFactory.o .shobj/CC_LockSetFactory.so: Concurrency/CC_LockSetFactory.cpp \
- Concurrency/CC_LockSetFactory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -38435,1878 +5571,214 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i \
- Concurrency/CC_LockSet.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i
-.obj/Concurrency_Utils.o .obj/Concurrency_Utils.so .shobj/Concurrency_Utils.o .shobj/Concurrency_Utils.so: Concurrency/Concurrency_Utils.cpp \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- Concurrency/Concurrency_Utils.h Concurrency/CC_LockSetFactory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlS.i
-.obj/Logger_i.o .obj/Logger_i.so .shobj/Logger_i.o .shobj/Logger_i.so: Log/Logger_i.cpp \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
+ Event/EC_Factory.i Event/EC_Null_Factory.i Event/EC_Dispatching.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Log/Logger_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerS.i
-.obj/Time_Utilities.o .obj/Time_Utilities.so .shobj/Time_Utilities.o .shobj/Time_Utilities.so: Time_Utilities.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Dispatching.i Event/EC_Filter_Builder.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ Event/EC_Filter_Builder.i Event/EC_ConsumerAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
+ Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
+ Event/EC_ProxySupplier.i Event/EC_SupplierFiltering.h \
+ Event/EC_SupplierFiltering.i Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ Event/Timer_Module.i
+.obj/EC_Disjunction_Filter.o .obj/EC_Disjunction_Filter.so .shobj/EC_Disjunction_Filter.o .shobj/EC_Disjunction_Filter.so: Event/EC_Disjunction_Filter.cpp \
+ Event/EC_Disjunction_Filter.h Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
-.obj/TAO_Time_Service_Server.o .obj/TAO_Time_Service_Server.so .shobj/TAO_Time_Service_Server.o .shobj/TAO_Time_Service_Server.so: Time/TAO_Time_Service_Server.cpp \
- Time/TAO_UTO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Filter.i Event/EC_Disjunction_Filter.i
+.obj/EC_Conjunction_Filter.o .obj/EC_Conjunction_Filter.so .shobj/EC_Conjunction_Filter.o .shobj/EC_Conjunction_Filter.so: Event/EC_Conjunction_Filter.cpp \
+ Event/EC_Conjunction_Filter.h Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- Time/TAO_TIO.h \
- $(TAO_ROOT)/tao/TAO.h \
- Time/TAO_Time_Service_Server.h
-.obj/TAO_Time_Service_Clerk.o .obj/TAO_Time_Service_Clerk.so .shobj/TAO_Time_Service_Clerk.o .shobj/TAO_Time_Service_Clerk.so: Time/TAO_Time_Service_Clerk.cpp \
- Time/TAO_Time_Service_Clerk.h \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Filter.i Event/EC_Conjunction_Filter.i
+.obj/EC_Type_Filter.o .obj/EC_Type_Filter.so .shobj/EC_Type_Filter.o .shobj/EC_Type_Filter.so: Event/EC_Type_Filter.cpp Event/EC_Type_Filter.h \
+ Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.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/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(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/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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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 \
- $(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/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- Time/Timer_Helper.h Time/TAO_TIO.h \
- $(TAO_ROOT)/tao/TAO.h \
- Time/TAO_UTO.h
-.obj/TAO_UTO.o .obj/TAO_UTO.so .shobj/TAO_UTO.o .shobj/TAO_UTO.so: Time/TAO_UTO.cpp Time/TAO_UTO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Filter.i Event/EC_Type_Filter.i
+.obj/EC_Basic_Filter_Builder.o .obj/EC_Basic_Filter_Builder.so .shobj/EC_Basic_Filter_Builder.o .shobj/EC_Basic_Filter_Builder.so: Event/EC_Basic_Filter_Builder.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- Time/TAO_TIO.h \
- $(TAO_ROOT)/tao/TAO.h
-.obj/TAO_TIO.o .obj/TAO_TIO.so .shobj/TAO_TIO.o .shobj/TAO_TIO.so: Time/TAO_TIO.cpp Time/TAO_TIO.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.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/Malloc_Base.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 \
@@ -40348,585 +5820,47 @@ ORBSVCS_COMPONENTS:
  $(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/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/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- Time/TAO_UTO.h
-.obj/Timer_Helper.o .obj/Timer_Helper.so .shobj/Timer_Helper.o .shobj/Timer_Helper.so: Time/Timer_Helper.cpp Time/Timer_Helper.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ Event/EC_Basic_Filter_Builder.h Event/EC_Filter_Builder.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
+ Event/EC_Type_Filter.h Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ Event/EC_Filter.i Event/EC_Type_Filter.i \
+ Event/EC_Conjunction_Filter.h Event/EC_Conjunction_Filter.i \
+ Event/EC_Disjunction_Filter.h Event/EC_Disjunction_Filter.i
+.obj/EC_Basic_Factory.o .obj/EC_Basic_Factory.so .shobj/EC_Basic_Factory.o .shobj/EC_Basic_Factory.so: Event/EC_Basic_Factory.cpp \
+ $(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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Event_Handler.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_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_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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceS.i \
- Time/TAO_Time_Service_Clerk.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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/IOR_Multicast.o .obj/IOR_Multicast.so .shobj/IOR_Multicast.o .shobj/IOR_Multicast.so: IOR_Multicast.cpp IOR_Multicast.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -40940,291 +5874,14 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
-.obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming/Naming_Context.cpp Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ Event/EC_Basic_Factory.h Event/EC_Factory.h \
  $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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 \
@@ -41250,76 +5907,42 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -41331,228 +5954,10 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(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/Hash_Naming_Context.o .obj/Hash_Naming_Context.so .shobj/Hash_Naming_Context.o .shobj/Hash_Naming_Context.so: Naming/Hash_Naming_Context.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.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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Naming/Hash_Naming_Context.h Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
@@ -41579,52 +5984,6 @@ ORBSVCS_COMPONENTS:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -41633,316 +5992,22 @@ ORBSVCS_COMPONENTS:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(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 \
- Naming/Entries.h
-.obj/Entries.o .obj/Entries.so .shobj/Entries.o .shobj/Entries.so: Naming/Entries.cpp Naming/Entries.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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/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/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/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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -41964,295 +6029,11 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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
-.obj/Persistent_Naming_Context.o .obj/Persistent_Naming_Context.so .shobj/Persistent_Naming_Context.o .shobj/Persistent_Naming_Context.so: Naming/Persistent_Naming_Context.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.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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Naming/Persistent_Naming_Context.h Naming/Naming_Context.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -42269,1224 +6050,491 @@ ORBSVCS_COMPONENTS:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(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 \
- Naming/Persistent_Bindings_Map.h Naming/Persistent_Entries.h \
- Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp \
- Naming/Persistent_Context_Index.h
-.obj/Persistent_Entries.o .obj/Persistent_Entries.so .shobj/Persistent_Entries.o .shobj/Persistent_Entries.so: Naming/Persistent_Entries.cpp \
- Naming/Persistent_Entries.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
+ Event/EC_Factory.i Event/EC_Basic_Factory.i Event/EC_Dispatching.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ Event/EC_Dispatching.i Event/EC_Basic_Filter_Builder.h \
+ Event/EC_Filter_Builder.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ Event/EC_Filter_Builder.i Event/EC_Basic_Filter_Builder.i \
+ Event/EC_ConsumerAdmin.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Filter.i \
+ Event/EC_ConsumerAdmin.i Event/EC_SupplierAdmin.h \
+ Event/EC_SupplierAdmin.i Event/EC_ProxyConsumer.h \
+ Event/EC_ProxyConsumer.i Event/EC_ProxySupplier.h \
+ Event/EC_ProxySupplier.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h \
+ Event/EC_SupplierFiltering.h Event/EC_SupplierFiltering.i \
+ Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ Event/Timer_Module.i
+.obj/ConsumerAdmin_i.o .obj/ConsumerAdmin_i.so .shobj/ConsumerAdmin_i.o .shobj/ConsumerAdmin_i.so: CosEvent/ConsumerAdmin_i.cpp \
+ CosEvent/ConsumerAdmin_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+.obj/SupplierAdmin_i.o .obj/SupplierAdmin_i.so .shobj/SupplierAdmin_i.o .shobj/SupplierAdmin_i.so: CosEvent/SupplierAdmin_i.cpp \
+ CosEvent/SupplierAdmin_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i
+.obj/EventChannel_i.o .obj/EventChannel_i.so .shobj/EventChannel_i.o .shobj/EventChannel_i.so: CosEvent/EventChannel_i.cpp \
+ CosEvent/EventChannel_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i
+.obj/ProxyPushConsumer_i.o .obj/ProxyPushConsumer_i.so .shobj/ProxyPushConsumer_i.o .shobj/ProxyPushConsumer_i.so: CosEvent/ProxyPushConsumer_i.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ CosEvent/ProxyPushConsumer_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i
+.obj/ProxyPushSupplier_i.o .obj/ProxyPushSupplier_i.so .shobj/ProxyPushSupplier_i.o .shobj/ProxyPushSupplier_i.so: CosEvent/ProxyPushSupplier_i.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ CosEvent/ProxyPushSupplier_i.h
+.obj/AVStreams_i.o .obj/AVStreams_i.so .shobj/AVStreams_i.o .shobj/AVStreams_i.so: AV/AVStreams_i.cpp AV/AVStreams_i.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
-.obj/Persistent_Bindings_Map.o .obj/Persistent_Bindings_Map.so .shobj/Persistent_Bindings_Map.o .shobj/Persistent_Bindings_Map.so: Naming/Persistent_Bindings_Map.cpp \
- Naming/Persistent_Bindings_Map.h Naming/Persistent_Entries.h \
- $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
-.obj/Persistent_Context_Index.o .obj/Persistent_Context_Index.so .shobj/Persistent_Context_Index.o .shobj/Persistent_Context_Index.so: Naming/Persistent_Context_Index.cpp \
- Naming/Persistent_Context_Index.h Naming/Persistent_Entries.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+.obj/Endpoint_Strategy.o .obj/Endpoint_Strategy.so .shobj/Endpoint_Strategy.o .shobj/Endpoint_Strategy.so: AV/Endpoint_Strategy.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- Naming/Shared_Hash_Map_T.h Naming/Shared_Hash_Map_T.cpp
-.obj/Naming_Utils.o .obj/Naming_Utils.so .shobj/Naming_Utils.o .shobj/Naming_Utils.so: Naming/Naming_Utils.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+.obj/Endpoint_Strategy_T.o .obj/Endpoint_Strategy_T.so .shobj/Endpoint_Strategy_T.o .shobj/Endpoint_Strategy_T.so: AV/Endpoint_Strategy_T.cpp \
+ AV/Endpoint_Strategy_T.h AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ AV/Endpoint_Strategy_T.cpp
+.obj/tmplinst-orbsvcs.o .obj/tmplinst-orbsvcs.so .shobj/tmplinst-orbsvcs.o .shobj/tmplinst-orbsvcs.so: tmplinst-orbsvcs.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- 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 \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- Naming/Hash_Naming_Context.h Naming/Entries.h \
- Naming/Persistent_Context_Index_T.h Naming/Persistent_Context_Index.h \
- Naming/Persistent_Entries.h Naming/Shared_Hash_Map_T.h \
- Naming/Shared_Hash_Map_T.cpp Naming/Persistent_Context_Index_T.cpp \
- Naming/Persistent_Naming_Context.h Naming/Persistent_Bindings_Map.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosLifeCycleC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
deleted file mode 100644
index e8fc260b88d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the TAO orbsvcs library
-##            orbsvcs subdirectory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## # Uncomment out the following line (or invoke make with
-## # TAO_LACKS_EVENT_CHANNEL_ANY=1)
-## # if you don't want support for anys in the Event Channel.
-## #### TAO_LACKS_EVENT_CHANNEL_ANY = 1
-## ifneq ($(TAO_LACKS_EVENT_CHANNEL_ANY),)
-##   override TAO_LACKS_EVENT_CHANNEL_ANY = -DTAO_LACKS_EVENT_CHANNEL_ANY
-## endif
-
-# TODO: This should be a configure script option
-# Uncomment out the following line (or invoke make with
-# if you don't want support for anys in the Event Channel.
-#TAO_LACKS_EVENT_CHANNEL_ANY = -DTAO_LACKS_EVENT_CHANNEL_ANY
-
-TAO_IDLFLAGS = \
-        -Wb,export_macro=TAO_ORBSVCS_Export \
-        -Wb,export_include=orbsvcs_export.h \
-        $(TAO_LACKS_EVENT_CHANNEL_ANY)
-
-# Build a libtool library, liborbsvcs.la for installation in libdir.
-lib_LTLIBRARIES = liborbsvcs.la
-liborbsvcs_la_SOURCES = \
-        CosConcurrencyControlS.h \
-        CosConcurrencyControlS.cpp \
-        CosConcurrencyControlC.h \
-        CosConcurrencyControlC.cpp \
-        CosNamingS.h \
-        CosNamingS.cpp \
-        CosNamingC.h \
-        CosNamingC.cpp \
-        CosLifeCycleS.h \
-        CosLifeCycleS.cpp \
-        CosLifeCycleC.h \
-        CosLifeCycleC.cpp \
-        CosPropertyServiceS.h \
-        CosPropertyServiceS.cpp \
-        CosPropertyServiceC.h \
-        CosPropertyServiceC.cpp \
-        CosTimeBaseS.h \
-        CosTimeBaseS.cpp \
-        CosTimeBaseC.h \
-        CosTimeBaseC.cpp \
-        LoggerS.h \
-        LoggerS.cpp \
-        LoggerC.h \
-        LoggerC.cpp \
-        RtecEventCommS.h \
-        RtecEventCommS.cpp \
-        RtecEventCommC.h \
-        RtecEventCommC.cpp \
-        RtecSchedulerS.h \
-        RtecSchedulerS.cpp \
-        RtecSchedulerC.h \
-        RtecSchedulerC.cpp \
-        RtecEventChannelAdminS.h \
-        RtecEventChannelAdminS.cpp \
-        RtecEventChannelAdminC.h \
-        RtecEventChannelAdminC.cpp \
-        RtecUDPAdminS.h \
-        RtecUDPAdminS.cpp \
-        RtecUDPAdminC.h \
-        RtecUDPAdminC.cpp \
-        LifeCycleServiceS.h \
-        LifeCycleServiceS.cpp \
-        LifeCycleServiceC.h \
-        LifeCycleServiceC.cpp \
-        CosTradingS.h \
-        CosTradingS.cpp \
-        CosTradingC.h \
-        CosTradingC.cpp \
-        AVStreamsS.h \
-        AVStreamsS.cpp \
-        AVStreamsC.h \
-        AVStreamsC.cpp \
-        Null_MediaCtrlS.h \
-        Null_MediaCtrlS.cpp \
-        Null_MediaCtrlC.h \
-        Null_MediaCtrlC.cpp \
-        \
-        
-
-VPATH=.:Naming:Time:Log:Concurrency:Property:Trader:Sched:Event:CosEvent:AV:
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
index 75622f13e48..01009608664 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.cpp
@@ -1,35 +1,34 @@
 // $Id$
+
 // ============================================================================
 //
 // = LIBRARY
 //    cos
 //
 // = FILENAME
-//   Hash_Naming_Context.cpp
+//   CosNaming_i.cpp
 //
 // = AUTHOR
 //    Marina Spivak <marina@cs.wustl.edu> and
 //    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
 //
 // ============================================================================
-#include "ace/Auto_Ptr.h"
-#include "Hash_Naming_Context.h"
 
-ACE_RCSID(Naming, Hash_Naming_Context, "$Id:")
+#include "CosNaming_i.h"
 
-TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (TAO_Naming_Context *interface,
-                                                  PortableServer::POA_ptr poa,
-                                                  const char *poa_id,
-                                                  size_t default_hash_table_size,
-                                                  int root)
-  : poa_ (PortableServer::POA::_duplicate (poa)),
-    counter_ (0),
-    poa_id_ (poa_id),
-    context_ (default_hash_table_size),
+ACE_RCSID(Naming, CosNaming_i, "$Id$")
+
+TAO_NamingContext::TAO_NamingContext (PortableServer::POA_ptr poa,
+                                      const char *poa_id,
+                                      size_t default_hash_table_size,
+                                      int root)
+  : context_ (default_hash_table_size),
     root_ (root),
     lock_ (0),
+    poa_ (PortableServer::POA::_duplicate (poa)),
+    counter_ (0),
     hash_table_size_ (default_hash_table_size),
-    interface_ (interface)
+    poa_id_ (poa_id)
 {
   // Get the lock from the ORB, which knows what type is appropriate.
   // This method must be called AFTER the ORB has been initialized via
@@ -37,24 +36,24 @@ TAO_Hash_Naming_Context::TAO_Hash_Naming_Context (TAO_Naming_Context *interface,
   // work correctly...
   ACE_ALLOCATOR (this->lock_,
                  TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
-
-  interface_->impl (this);
 }
 
-TAO_Hash_Naming_Context::~TAO_Hash_Naming_Context (void)
+TAO_NamingContext::~TAO_NamingContext (void)
 {
   delete this->lock_;
 }
 
+// Return the Default POA of this Servant
+
 PortableServer::POA_ptr
-TAO_Hash_Naming_Context::_default_POA (void)
+TAO_NamingContext::_default_POA (CORBA::Environment &/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
-                                      CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::get_context (const CosNaming::Name &name,
+                               CORBA::Environment &TAO_IN_ENV)
 {
   // The naming context we will return.
   CosNaming::NamingContext_var result =
@@ -69,19 +68,21 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
                              ACE_const_cast
                              (CosNaming::NameComponent*,
                               name.get_buffer ()));
-  ACE_TRY
+  TAO_TRY
     {
       // Resolve the name.
       CORBA::Object_var context = resolve (comp_name,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // @@ There may be a check for context being nil needed.
 
       // Try narrowing object reference to a context type.
       result = CosNaming::NamingContext::_narrow (context.in (),
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       // Add the last component of the name, which was stripped before
       // the call to resolve.
@@ -92,11 +93,13 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
       if (ex.why == CosNaming::NamingContext::not_object)
         ex.why = CosNaming::NamingContext::missing_node;
 
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (result._retn ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result._retn ());
-
+  TAO_CATCHANY
+    {
+      TAO_RETHROW_RETURN (result._retn ());
+    }
+  TAO_ENDTRY;
   // This has to be outside the TRY block, othewise we'll catch our
   // own exception.
   if (CORBA::is_nil (result.in ()))
@@ -105,10 +108,9 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
       rest.length (2);
       rest[0] = name[len - 2];
       rest[1] = name[len - 1];
-      ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                        (CosNaming::NamingContext::not_context,
-                         rest),
-                        result._retn());
+      TAO_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+                                                            rest),
+                         result._retn());
     }
   // Finally, if everything went smoothly, just return the resolved
   // context.
@@ -116,36 +118,41 @@ TAO_Hash_Naming_Context::get_context (const CosNaming::Name &name,
 }
 
 void
-TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
-                               CORBA::Object_ptr obj,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::bind (const CosNaming::Name& n,
+                        CORBA::Object_ptr obj,
+                        CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    TAO_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
   // target context.
   if (len > 1)
     {
-      CosNaming::NamingContext_var context =
-        this->get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->bind (simple_name, obj, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          CosNaming::NamingContext_var context =
+            this->get_context (n, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosNaming::Name simple_name;
+          simple_name.length (1);
+          simple_name[0] = n[len - 1];
+          context->bind (simple_name, obj, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -156,45 +163,50 @@ TAO_Hash_Naming_Context::bind (const CosNaming::Name& n,
       // Try binding the name.
       int result = this->context_.bind (name, entry);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        TAO_THROW (CosNaming::NamingContext::AlreadyBound());
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
 void
-TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
-                                 CORBA::Object_ptr obj,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::rebind (const CosNaming::Name& n,
+                          CORBA::Object_ptr obj,
+                          CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    TAO_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
   // on target context.
   if (len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->rebind (simple_name, obj, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          CosNaming::NamingContext_var context =
+            get_context (n, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosNaming::Name simple_name;
+          simple_name.length (1);
+          simple_name[0] = n[len - 1];
+          context->rebind (simple_name, obj, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
     }
   else
     {
@@ -213,41 +225,46 @@ TAO_Hash_Naming_Context::rebind (const CosNaming::Name& n,
                                           oldentry);
       // Something went wrong with the internal structure
       if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
 void
-TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
-                                       CosNaming::NamingContext_ptr nc,
-                                       CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::bind_context (const CosNaming::Name &n,
+                                CosNaming::NamingContext_ptr nc,
+                                CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    TAO_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the binding should take place, then perform the binding on
   // target context.
   if (len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->bind_context (simple_name, nc, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          CosNaming::NamingContext_var context =
+            get_context (n, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosNaming::Name simple_name;
+          simple_name.length (1);
+          simple_name[0] = n[len - 1];
+          context->bind_context (simple_name, nc, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
     }
   // If we received a simple name, we need to bind it in this context.
   else
@@ -258,45 +275,50 @@ TAO_Hash_Naming_Context::bind_context (const CosNaming::Name &n,
       // Try binding the name.
       int result = this->context_.bind (name, entry);
       if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
+        TAO_THROW (CosNaming::NamingContext::AlreadyBound());
 
       // Something went wrong with the internal structure
       else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
+        TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
 void
-TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                         CosNaming::NamingContext_ptr nc,
-                                         CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::rebind_context (const CosNaming::Name &n,
+                                  CosNaming::NamingContext_ptr nc,
+                                  CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    TAO_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the rebinding should take place, then perform the rebinding
   // on target context.
   if (len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->rebind_context (simple_name, nc, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          CosNaming::NamingContext_var context =
+            get_context (n, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosNaming::Name simple_name;
+          simple_name.length (1);
+          simple_name[0] = n[len - 1];
+          context->rebind_context (simple_name, nc, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
     }
   // If we received a simple name, we need to rebind it in this
   // context.
@@ -312,25 +334,25 @@ TAO_Hash_Naming_Context::rebind_context (const CosNaming::Name &n,
                                  entry,
                                  oldname,
                                  oldentry) < 0)
-        ACE_THROW (CORBA::INTERNAL ());
+        TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
 }
 
 CORBA::Object_ptr
-TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::resolve (const CosNaming::Name& n,
+                           CORBA::Environment &TAO_IN_ENV)
 {
   CORBA::Object_ptr result = CORBA::Object::_nil ();
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (result);
+  ACE_GUARD_THROW_RETURN (ACE_Lock, ace_mon, *this->lock_,
+                          CORBA::INTERNAL (CORBA::COMPLETED_NO),
+                          result);
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
+    TAO_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
                       result);
 
   // Resolve the first component of the name.
@@ -339,7 +361,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
 
   if (this->context_.find (name,
                            entry) == -1)
-    ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
+    TAO_THROW_RETURN (CosNaming::NamingContext::NotFound
                       (CosNaming::NamingContext::not_object,
                        n),
                       result);
@@ -356,16 +378,24 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
         CosNaming::NamingContext::_nil ();
       if (entry.type_ == CosNaming::ncontext)
         {
-          context = CosNaming::NamingContext::_narrow (result,
-                                                       ACE_TRY_ENV);
-          ACE_CHECK_RETURN (context._retn ());
+          TAO_TRY
+            {
+              context = CosNaming::NamingContext::_narrow (result,
+                                                           TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+            }
+          TAO_CATCHANY
+            {
+              TAO_RETHROW_RETURN (context._retn ());
+            }
+          TAO_ENDTRY;
         }
       else
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+        TAO_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
                                                               n),
                           context._retn ());
       if (CORBA::is_nil (context.in ()))
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
+        TAO_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
                                                               n),
                           context._retn ());
       else
@@ -384,7 +414,7 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
              + 1);
           // If there are any exceptions, they will propagate up.
           return context->resolve (rest_of_name,
-                                   ACE_TRY_ENV);
+                                   TAO_IN_ENV);
         }
     }
   // If the name we had to resolve was simple, we just need to return
@@ -394,34 +424,40 @@ TAO_Hash_Naming_Context::resolve (const CosNaming::Name& n,
 }
 
 void
-TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::unbind (const CosNaming::Name& n,
+                          CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock, ace_mon, *this->lock_, CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Get the length of the name.
   CORBA::ULong len = n.length ();
 
   // Check for invalid name.
   if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
+    TAO_THROW (CosNaming::NamingContext::InvalidName());
 
   // If we received compound name, resolve it to get the context in
   // which the unbinding should take place, then perform the unbinding
   // on target context.
   if (len > 1)
     {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->unbind (simple_name, ACE_TRY_ENV);
-      ACE_CHECK;
+      TAO_TRY
+        {
+          CosNaming::NamingContext_var context =
+            get_context (n, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosNaming::Name simple_name;
+          simple_name.length (1);
+          simple_name[0] = n[len - 1];
+          context->unbind (simple_name, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
     }
   // If we received a simple name, we need to unbind it in this
   // context.
@@ -430,27 +466,22 @@ TAO_Hash_Naming_Context::unbind (const CosNaming::Name& n,
       TAO_ExtId name (n[0].id, n[0].kind);
       // Try unbinding the name.
       if (this->context_.unbind (name) == -1)
-        ACE_THROW (CosNaming::NamingContext::NotFound
+        TAO_THROW (CosNaming::NamingContext::NotFound
                    (CosNaming::NamingContext::not_object,
                     n));
     }
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::new_context (CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  TAO_Hash_Naming_Context *c_impl = 0;
-
-  // To keep compilers warnings away.
-  ACE_UNUSED_ARG (c_impl);
+  ACE_GUARD_THROW_RETURN (ACE_Lock,
+                          ace_mon,
+                          *this->lock_,
+                          CORBA::INTERNAL (CORBA::COMPLETED_NO),
+                          CosNaming::NamingContext::_nil ());
 
-  TAO_Naming_Context *c = 0;
+  TAO_NamingContext *c = 0;
   CosNaming::NamingContext_var result;
   char poa_id[BUFSIZ];
   ACE_OS::sprintf (poa_id,
@@ -458,168 +489,137 @@ TAO_Hash_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
                    this->poa_id_.c_str (),
                    this->counter_++);
 
-  ACE_NEW_THROW_EX (c,
-                    TAO_Naming_Context,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // Put <c> into the auto pointer temporarily, in case next
-  // allocation fails.
-  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
-
-  ACE_NEW_THROW_EX (c_impl,
-                    TAO_Hash_Naming_Context (c,
-                                             poa_.in (),
-                                             poa_id,
-                                             this->hash_table_size_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // Allocation succeeded, get rid of auto pointer.
-  temp.release ();
-
-  ACE_TRY
+  ACE_NEW_THROW_RETURN (c,
+                        TAO_NamingContext (poa_.in (),
+                                           poa_id,
+                                           this->hash_table_size_),
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                        result._retn ());
+  TAO_TRY
     {
       PortableServer::ObjectId_var id =
         PortableServer::string_to_ObjectId (poa_id);
 
       this->poa_->activate_object_with_id (id.in (),
                                            c,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      result = c->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      result = c->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
       delete c;
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (result._retn ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result._retn ());
+  TAO_ENDTRY;
 
   return result._retn ();
 }
 
 CosNaming::NamingContext_ptr
-TAO_Hash_Naming_Context::bind_new_context (const CosNaming::Name& n,
-                                           CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::bind_new_context (const CosNaming::Name& n,
+                                    CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
   CosNaming::NamingContext_var result =
     CosNaming::NamingContext::_nil ();
 
-  result = new_context (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  result = new_context (TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN (TAO_IN_ENV, CosNaming::NamingContext::_nil ());
 
-  ACE_TRY
+  TAO_TRY
     {
       bind_context (n,
                     result.in (),
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        result->destroy (ACE_TRY_ENV);
-      }
-      ACE_RETHROW;
+      result->destroy (TAO_IN_ENV);
+      TAO_RETHROW_RETURN (CosNaming::NamingContext::_nil ());
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
+  TAO_ENDTRY;
 
   return result._retn ();
 }
 
 void
-TAO_Hash_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::destroy (CORBA::Environment &TAO_IN_ENV)
 {
   {
-    ACE_GUARD_THROW_EX (ACE_Lock,
-                        ace_mon,
-                        *this->lock_,
-                        CORBA::INTERNAL ());
-    ACE_CHECK;
+    ACE_GUARD_THROW (ACE_Lock,
+                     ace_mon,
+                     *this->lock_,
+                     CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
     if (this->context_.current_size () != 0)
-      ACE_THROW (CosNaming::NamingContext::NotEmpty());
+      TAO_THROW (CosNaming::NamingContext::NotEmpty());
 
     if (this->root_ != 0)
       return; // Destroy is a no-op on a root context.
     else
       {
-        PortableServer::POA_var poa =
-          this->_default_POA ();
-
-        PortableServer::ObjectId_var id =
-          poa->servant_to_id (interface_,
-                              ACE_TRY_ENV);
-        ACE_CHECK;
-
-        poa->deactivate_object (id.in (),
-                                ACE_TRY_ENV);
-        ACE_CHECK;
+        TAO_TRY
+          {
+            PortableServer::POA_var poa =
+              this->_default_POA (TAO_TRY_ENV);
+            TAO_CHECK_ENV;
+
+            PortableServer::ObjectId_var id =
+              poa->servant_to_id (this,
+                                  TAO_TRY_ENV);
+            TAO_CHECK_ENV;
+
+            poa->deactivate_object (id.in (),
+                                    TAO_TRY_ENV);
+            TAO_CHECK_ENV;
+          }
+        TAO_CATCHANY
+          {
+            TAO_RETHROW;
+          }
+        TAO_ENDTRY;
       }
   }
 
-  // Let go of the lock and kill the interface, which will, in turn,
-  // invoke our destructor.  We *must* be dynamically allocated for this to work right...
-  // The code below, and in <destroy> in general, should NOT be
-  // factored into the TAO_Naming_Context, because only the *concrete
-  // implementation* knows how to clean up appropriately, e.g., we may
-  // have one servant serving many objects and will not want to delete
-  // the servant in <destroy>.
-
-  //@@ Now that the POA has been fixed to work right, this is no
-  // longer a correct approach to disposing off the servants.  This is
-  // a temporary fix to avoid crashing (but with the memory leak), a
-  // proper fix will be in the next release.
-
-  //if (this->root_ == 0)
-  //delete interface_;
+  // Let go of the lock and commit suicide.  We *must* be dynamically
+  // allocated for this to work right...
+  if (this->root_ == 0)
+    delete this;
 }
 
 void
-TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
-                               CosNaming::BindingList_out &bl,
-                               CosNaming::BindingIterator_out &bi,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_NamingContext::list (CORBA::ULong how_many,
+                        CosNaming::BindingList_out bl,
+                        CosNaming::BindingIterator_out bi,
+                        CORBA::Environment &TAO_IN_ENV)
 {
   // Allocate nil out parameters in case we won't be able to complete
   // the operation.
   bi = CosNaming::BindingIterator::_nil ();
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
+  ACE_NEW_THROW (bl,
+                 CosNaming::BindingList (0),
+                 CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Obtain a lock before we proceed with the operation.
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
+  ACE_GUARD_THROW (ACE_Lock,
+                   ace_mon,
+                   *this->lock_,
+                   CORBA::INTERNAL (CORBA::COMPLETED_NO));
 
   // Dynamically allocate hash map iterator.
-  TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter = 0;
-  ACE_NEW_THROW_EX (hash_iter,
-                    TAO_Hash_Naming_Context::HASH_MAP::ITERATOR (context_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
+  TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter = 0;
+  ACE_NEW_THROW (hash_iter,
+                 TAO_NamingContext::HASH_MAP::ITERATOR (context_),
+                 CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
   // Number of bindings that will go into the BindingList.
   CORBA::ULong n;
 
   // A pointer to BindingIterator servant.
-  TAO_Hash_Binding_Iterator *bind_iter = 0;
+  TAO_BindingIterator *bind_iter = 0;
 
   // Calculate number of bindings that will go into bl.
   if (this->context_.current_size () > how_many)
@@ -630,7 +630,7 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
   // Use hash iterator to populate a BindingList with bindings.
   bl->length (n);
 
-  TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+  TAO_NamingContext::HASH_MAP::ENTRY *hash_entry;
 
   for (CORBA::ULong i = 0; i < n; i++)
     {
@@ -640,7 +640,7 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
       if (populate_binding (hash_entry, bl[i]) == 0)
         {
           delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY());
+          TAO_THROW (CORBA::NO_MEMORY(CORBA::COMPLETED_NO));
         }
     }
 
@@ -652,17 +652,14 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
     delete hash_iter;
   else
     {
-      // Create a BindingIterator for return.
-
-      bind_iter = new TAO_Hash_Binding_Iterator (hash_iter, this->poa_.in (), this->lock_);
-      if (bind_iter == 0)
+      TAO_TRY
         {
-          delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY ());
-        }
+          // Create a BindingIterator for return.
+          list_helper (bind_iter,
+                       hash_iter,
+                       TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-      ACE_TRY
-        {
           char poa_id[BUFSIZ];
           ACE_OS::sprintf (poa_id,
                            "%s_%ld",
@@ -674,26 +671,44 @@ TAO_Hash_Naming_Context::list (CORBA::ULong how_many,
 
           this->poa_->activate_object_with_id (id.in (),
                                                bind_iter,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          bi = bind_iter->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
+          bi = bind_iter->_this (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
           delete bind_iter;
-          ACE_RETHROW;
+          TAO_RETHROW;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
+    }
+}
+
+void
+TAO_NamingContext::list_helper (TAO_BindingIterator* &bind_iter,
+                               TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter,
+                               CORBA::Environment &TAO_IN_ENV)
+{
+  TAO_TRY
+    {
+      ACE_NEW_TRY_THROW (bind_iter,
+                         TAO_BindingIterator (hash_iter, this->poa_.in (), this->lock_),
+                         CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      delete hash_iter;
+      TAO_RETHROW;
     }
+  TAO_ENDTRY;
 }
 
-TAO_Hash_Binding_Iterator::TAO_Hash_Binding_Iterator (TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
-                                                      PortableServer::POA_ptr poa,
-                                                      ACE_Lock *lock)
+TAO_BindingIterator::TAO_BindingIterator (TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter,
+                                          PortableServer::POA_ptr poa,
+                                          ACE_Lock *lock)
   : hash_iter_ (hash_iter),
     lock_ (lock),
     poa_ (PortableServer::POA::_duplicate (poa))
@@ -701,47 +716,46 @@ TAO_Hash_Binding_Iterator::TAO_Hash_Binding_Iterator (TAO_Hash_Naming_Context::H
 {
 }
 
-TAO_Hash_Binding_Iterator::~TAO_Hash_Binding_Iterator (void)
+TAO_BindingIterator::~TAO_BindingIterator (void)
 {
   delete hash_iter_;
 }
 
 // Return the Default POA of this Servant
 PortableServer::POA_ptr
-TAO_Hash_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
+TAO_BindingIterator::_default_POA (CORBA::Environment &/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 CORBA::Boolean
-TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_BindingIterator::next_one (CosNaming::Binding_out b,
+                              CORBA::Environment &TAO_IN_ENV)
 {
   CosNaming::Binding *binding;
 
   // Allocate a binding to be returned (even if there no more
   // bindings, we need to allocate an out parameter.)
-  ACE_NEW_THROW_EX (binding,
-                    CosNaming::Binding,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (binding,
+                        CosNaming::Binding,
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                        0);
   b = binding;
 
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+  ACE_GUARD_THROW_RETURN (ACE_Lock,
+                          ace_mon,
+                          *this->lock_,
+                          CORBA::INTERNAL (CORBA::COMPLETED_NO), 0);
   // If there are no more bindings.
   if (hash_iter_->done ())
     return 0;
   else
     {
-      TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+      TAO_NamingContext::HASH_MAP::ENTRY *hash_entry;
       hash_iter_->next (hash_entry);
 
-      if (TAO_Hash_Naming_Context::populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+      if (TAO_NamingContext::populate_binding (hash_entry, *binding) == 0)
+        TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
       hash_iter_->advance ();
       return 1;
@@ -749,8 +763,8 @@ TAO_Hash_Binding_Iterator::next_one (CosNaming::Binding_out b,
 }
 
 int
-TAO_Hash_Naming_Context::populate_binding (TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry,
-                                           CosNaming::Binding &b)
+TAO_NamingContext::populate_binding (TAO_NamingContext::HASH_MAP::ENTRY *hash_entry,
+                                     CosNaming::Binding &b)
 {
   b.binding_type = hash_entry->int_id_.type_;
   b.binding_name.length (1);
@@ -776,22 +790,22 @@ TAO_Hash_Naming_Context::populate_binding (TAO_Hash_Naming_Context::HASH_MAP::EN
 }
 
 CORBA::Boolean
-TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
-                                   CosNaming::BindingList_out bl,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_BindingIterator::next_n (CORBA::ULong how_many,
+                            CosNaming::BindingList_out bl,
+                            CORBA::Environment &TAO_IN_ENV)
 {
   // We perform an allocation before obtaining the lock so that an out
   // parameter is allocated in case we fail to obtain the lock.
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (bl,
+                        CosNaming::BindingList (0),
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                        0);
   // Obtain a lock.
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
+  ACE_GUARD_THROW_RETURN (ACE_Lock,
+                          ace_mon,
+                          *this->lock_,
+                          CORBA::INTERNAL (CORBA::COMPLETED_NO),
+                          0);
 
   // If there are no more bindings...
   if (hash_iter_->done ())
@@ -802,7 +816,7 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
       // bindings.
       bl->length (how_many);
 
-      TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry;
+      TAO_NamingContext::HASH_MAP::ENTRY *hash_entry;
 
       // Iterate and populate the BindingList.
 
@@ -810,8 +824,8 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
         {
           hash_iter_->next (hash_entry);
 
-          if (TAO_Hash_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
+          if (TAO_NamingContext::populate_binding (hash_entry, bl[i]) == 0)
+            TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 0);
 
           if (hash_iter_->advance () == 0)
             {
@@ -826,39 +840,34 @@ TAO_Hash_Binding_Iterator::next_n (CORBA::ULong how_many,
 }
 
 void
-TAO_Hash_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_BindingIterator::destroy (CORBA::Environment &TAO_IN_ENV)
 {
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock,
-                        ace_mon,
-                        *this->lock_,
-                        CORBA::INTERNAL ());
-    ACE_CHECK;
-
-    PortableServer::POA_var poa =
-      this->_default_POA (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (this,
-                          ACE_TRY_ENV);
-    ACE_CHECK;
-
-    poa->deactivate_object (id.in (),
-                            ACE_TRY_ENV);
-    ACE_CHECK;
-  }
+  TAO_TRY
+    {
+      PortableServer::POA_var poa =
+        this->_default_POA (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      PortableServer::ObjectId_var id =
+        poa->servant_to_id (this,
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-  // Let go of the lock and commit suicide: must have been dynamically allocated
-  //@@ Now that the POA has been fixed to work right, this is no
-  // longer a correct approach to disposing off the servants.  This is
-  // a temporary fix to avoid crashing (but with the memory leak), a
-  // proper fix will be in the next release.
-  //delete this;
+      poa->deactivate_object (id.in (),
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Commit suicide: must have been dynamically allocated
+      delete this;
+    }
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Auto_Basic_Ptr<TAO_Hash_Naming_Context>;
 template class ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>;
@@ -870,7 +879,6 @@ template class ACE_Hash_Map_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId
 template class ACE_Hash_Map_Reverse_Iterator<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Hash_Naming_Context>
 #pragma instantiate ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_ExtId, TAO_IntId, ACE_Hash<TAO_ExtId>, ACE_Equal_To<TAO_ExtId>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_ExtId, TAO_IntId>
diff --git a/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
new file mode 100644
index 00000000000..ca51363c127
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Naming/CosNaming_i.h
@@ -0,0 +1,232 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    cos
+//
+// = FILENAME
+//   CosNaming_i.h
+//
+// = AUTHOR
+//    Marina Spivak <marina@cs.wustl.edu> and
+//    Sergio Flores-Gaitan <sergio@cs.wustl.edu>
+//
+// ============================================================================
+
+#ifndef TAO_NAMING_I_H
+#define TAO_NAMING_I_H
+
+#include "orbsvcs/CosNamingS.h"
+#include "Entries.h"
+
+// Forward declaration.
+class TAO_BindingIterator;
+
+class TAO_ORBSVCS_Export TAO_NamingContext : public POA_CosNaming::NamingContext
+{
+  // = TITLE
+  //     This class implements the <NamingContext> interface that is
+  //     part of the <CosNaming> IDL module.
+  //
+  // = DESCRIPTION
+  //     Extensive comments can be found in the Naming IDL file.
+
+public:
+  typedef ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex>
+          HASH_MAP;
+
+  // = Initialization and termination methods.
+  TAO_NamingContext (PortableServer::POA_ptr poa,
+                     const char *poa_id,
+                     size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE,
+                     int root = 0);
+  // Default constructor, which initializes the <size> of the table,
+  // and sets a root flag.
+
+  ~TAO_NamingContext (void);
+  // destructor.
+
+  // Returns the Default POA of this Servant object
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+
+  virtual void bind (const CosNaming::Name &n,
+                     CORBA::Object_ptr obj,
+                     CORBA::Environment &IT_env);
+  // Create a binding for name <n> and object <obj> in the naming
+  // context.  Compound names are treated as follows: ctx->bind (<c1;
+  // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
+  // obj) if the there already exists a binding for the specified
+  // name, <AlreadyBound> exception is thrown.  Naming contexts should
+  // be bound using <bind_context> and <rebind_context> in order to
+  // participate in name resolution later.
+
+  virtual void rebind (const CosNaming::Name &n,
+                       CORBA::Object_ptr obj,
+                       CORBA::Environment &IT_env);
+  // This is similar to <bind> operation above, except for when the
+  // binding for the specified name already exists in the specified
+  // context.  In that case, the existing binding is replaced with the
+  // new one.
+
+  virtual void bind_context (const CosNaming::Name &n,
+                             CosNaming::NamingContext_ptr nc,
+                             CORBA::Environment &IT_env);
+  // This is the version of <bind> specifically for binding naming
+  // contexts, so that they will participate in name resolution when
+  // compound names are passed to be resolved.
+
+  virtual void rebind_context (const CosNaming::Name &n,
+                               CosNaming::NamingContext_ptr nc,
+                               CORBA::Environment &IT_env);
+  // This is a version of <rebind> specifically for naming contexts,
+  // so that they can participate in name resolution when compound
+  // names are passed.
+
+  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
+                                     CORBA::Environment &IT_env);
+  // Return object reference that is bound to the name.  Compound name
+  // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
+  // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
+  // does not return the type of the object.  Clients are responsible
+  // for "narrowing" the object to the appropriate type.
+
+  virtual void unbind (const CosNaming::Name &n,
+                       CORBA::Environment &IT_env);
+  // Remove the name binding from the context.  When compound names
+  // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
+  // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
+
+  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &IT_env);
+  // This operation returns a new naming context implemented by the
+  // same naming server in which the operation was invoked.  The
+  // context is not bound.
+
+  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
+                                                         CORBA::Environment &IT_env);
+  // This operation creates a new context and binds it to the name
+  // supplied as an argument.  The newly-created context is
+  // implemented by the same server as the context in which it was
+  // bound (the name argument excluding the last component).
+
+  virtual void destroy (CORBA::Environment &IT_env);
+  // Delete the naming context.  NOTE: the user should <unbind> any
+  // bindings in which the given context is bound to some names before
+  // invoking <destroy> operation on it.
+  // NOTE: this operation is a no-op on the root context.
+
+  virtual void list (CORBA::ULong how_many,
+                     CosNaming::BindingList_out bl,
+                     CosNaming::BindingIterator_out bi,
+                     CORBA::Environment &IT_env);
+  // Returns at most the requested number of bindings <how_many> in
+  // <bl>.  If the naming context contains additional bindings, they
+  // are returned with a BindingIterator.  In the naming context does
+  // not contain any additional bindings <bi> returned as null.
+
+  static int populate_binding (TAO_NamingContext::HASH_MAP::ENTRY *hash_entry,
+                               CosNaming::Binding &b);
+  // Helper function used by TAO_NamingContext and
+  // TAO_BindingIterator: populate a binding <b> with info contained
+  // in <hash_entry>.  Return 1 if everything went smoothly, 0 if an
+  // allocation failed.
+
+protected:
+  // = These are the helper methods used by other methods.
+
+  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
+                                            CORBA::Environment &_env);
+  // This is used by methods that need to resolve a compound name to
+  // get the reference to the target context before performing the
+  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
+  // (including the last component that doesn't need to be resolved)
+  // Returns a pointer to the target context.
+
+  int is_valid (CORBA::ULong len,
+                CORBA::Environment &_env);
+  // Check to see if we've got a valid name and raise an exception if
+  // we don't.
+
+  void list_helper (TAO_BindingIterator *&bind_iter,
+                     TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter,
+                     CORBA::Environment &_env);
+  // This is a helper function for <list> method.  It is necessary due
+  // to inability to have 2 TRY blocks in one function.
+
+  HASH_MAP context_;
+  // This implementation of <NamingContext> uses <ACE_Hash_Map> for
+  // storage and manipulation of name-object bindings.
+
+  int root_;
+  // Flag indicating whether the context is a root or not.  It allows
+  // to do things like have <destroy> be a no-op on root context.
+  // Values: 1 indicates root, 0 indicates not a root.
+
+  ACE_Lock *lock_;
+  // Lock to serialize access to the underlying data structure.  This
+  // is a lock adapter that hides the type of lock, which may be a
+  // null lock if the ORB decides threading is not necessary.
+
+  PortableServer::POA_var poa_;
+  // Implement a different <_default_POA>.
+
+  u_long counter_;
+  // This counter is used to generate names for children.
+
+  size_t hash_table_size_;
+  // Hash table size.
+
+  ACE_CString poa_id_;
+  // My POA Id.
+};
+
+class TAO_ORBSVCS_Export TAO_BindingIterator : public POA_CosNaming::BindingIterator
+{
+  // = TITLE
+  //     This class implements the <BindingIterator> interface that is
+  //     part of the <CosNaming> idl module.
+  //
+  // = DESCRIPTION
+  //     <TAO_BindingIterator> constructor expects a pointer to a
+  //     dynamically allocated hash map iterator. Destructor
+  //     deallocates hash map iterator.
+public:
+  // = Intialization and termination methods.
+  TAO_BindingIterator (TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter,
+                       PortableServer::POA_ptr poa,
+                       ACE_Lock *lock);
+  // Constructor.
+
+  ~TAO_BindingIterator (void);
+  // Destructor.
+
+  // Returns the Default POA of this Servant object
+  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
+
+  CORBA::Boolean next_one (CosNaming::Binding_out b,
+                           CORBA::Environment &IT_env);
+  // This operation returns the next binding.  If there are no more
+  // bindings false is returned.
+
+  CORBA::Boolean next_n (CORBA::ULong how_many,
+                         CosNaming::BindingList_out bl,
+                         CORBA::Environment &IT_env);
+  // This operation returns at most the requested number of bindings.
+
+  void destroy (CORBA::Environment &IT_env);
+  // This operation destroys the iterator.
+
+private:
+  TAO_NamingContext::HASH_MAP::ITERATOR *hash_iter_;
+  // A pointer to the hash map iterator.
+
+  ACE_Lock *lock_;
+  // Lock passed on from <TAO_NamingContext> to serialize access to the
+  // internal data structure.
+
+  PortableServer::POA_var poa_;
+  // Implement a different _default_POA()
+};
+
+#endif /* TAO_NAMING_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
deleted file mode 100644
index 889abc65c9e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Hash_Naming_Context.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_HASH_NAMING_CONTEXT_H
-#define TAO_HASH_NAMING_CONTEXT_H
-
-#include "Naming_Context.h"
-#include "Entries.h"
-
-class TAO_ORBSVCS_Export TAO_Hash_Naming_Context : public TAO_Naming_Context_Impl
-{
-  // = TITLE
-  //     This class plays a role of a 'ConcreteImplementor' in the
-  //     Bridge pattern architecture of the Naming Service
-  //     implementation.  This implementation of the NamingContext
-  //     uses ACE_Hash_Map_Manager to store name bindings.
-  //
-  // = DESCRIPTION
-  //     Extensive idl method descriptions can be found in Naming_Context.h
-
-public:
-  typedef ACE_Hash_Map_Manager<TAO_ExtId, TAO_IntId, ACE_Null_Mutex> HASH_MAP;
-
-  // = Initialization and termination methods.
-  TAO_Hash_Naming_Context (TAO_Naming_Context *interface,
-                           PortableServer::POA_ptr poa,
-                           const char *poa_id,
-                           size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE,
-                           int root = 0);
-  // Default constructor, which initializes the <size> of the table,
-  // and sets a root flag.
-
-  virtual ~TAO_Hash_Naming_Context (void);
-  // destructor.
-
-  // = CosNaming::NamingContext idl interface methods.
-  virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void list (CORBA::ULong how_many,
-                     CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual PortableServer::POA_ptr _default_POA (void);
-  // Returns the Default POA of this Servant object
-
-  // = Helper functions.
-  static int populate_binding (TAO_Hash_Naming_Context::HASH_MAP::ENTRY *hash_entry,
-                               CosNaming::Binding &b);
-  // Helper function used by TAO_Hash_Naming_Context and
-  // TAO_BindingIterator: populate a binding <b> with info contained
-  // in <hash_entry>.  Return 1 if everything went smoothly, 0 if an
-  // allocation failed.
-
-protected:
-  // = These are the helper methods used by other methods.
-
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
-                                            CORBA::Environment &_env);
-  // This is used by methods that need to resolve a compound name to
-  // get the reference to the target context before performing the
-  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
-  // (including the last component that doesn't need to be resolved)
-  // Returns a pointer to the target context.
-
-  PortableServer::POA_var poa_;
-  // POA we are registered with.
-
-  ACE_UINT32 counter_;
-  // Counter used for generation of POA ids for objects created by
-  // this context.
-
-  ACE_CString poa_id_;
-  // ID with which we are registered with <poa_>.
-
-  HASH_MAP context_;
-  // This implementation of <NamingContext> uses <ACE_Hash_Map> for
-  // storage and manipulation of name-object bindings.
-
-  int root_;
-  // Flag indicating whether the context is a root or not.  It allows
-  // to do things like have <destroy> be a no-op on root context.
-  // Values: 1 indicates root, 0 indicates not a root.
-
-  ACE_Lock *lock_;
-  // Lock to serialize access to the underlying data structure.  This
-  // is a lock adapter that hides the type of lock, which may be a
-  // null lock if the ORB decides threading is not necessary.
-
-  size_t hash_table_size_;
-  // Hash table size.
-
-  TAO_Naming_Context *interface_;
-  // Pointer to the 'Abstraction' in the bridge pattern.  We need this
-  // pointer so that we can clean up the Abstraction as necessary when <destroy>
-  // method is called.  The reason we need to clean up as opposed to
-  // the Abstraction itself is that we, the concrete implementation,  have the *knowledge* of how
-  // to do this, e.g., we may have one servant serving many objects
-  // and would not want to delete the servant in the <destroy> operation.
-};
-
-class TAO_ORBSVCS_Export TAO_Hash_Binding_Iterator :
-  public POA_CosNaming::BindingIterator
-{
-  // = TITLE
-  //     This class implements the <BindingIterator> interface that is
-  //     part of the <CosNaming> idl module based on the Hash_Map
-  //     implementation for CosNaming::NamingContext.
-  //
-  // = DESCRIPTION
-  //     <TAO_Hash_Binding_Iterator> constructor expects a pointer to a
-  //     dynamically allocated hash map iterator. Destructor
-  //     deallocates hash map iterator.
-public:
-  // = Intialization and termination methods.
-  TAO_Hash_Binding_Iterator (TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
-                             PortableServer::POA_ptr poa,
-                             ACE_Lock *lock);
-  // Constructor.
-
-  ~TAO_Hash_Binding_Iterator (void);
-  // Destructor.
-
-  // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-  CORBA::Boolean next_one (CosNaming::Binding_out b,
-                           CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns the next binding.  If there are no more
-  // bindings false is returned.
-
-  CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl,
-                         CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns at most the requested number of bindings.
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
-  // This operation destroys the iterator.
-
-private:
-  TAO_Hash_Naming_Context::HASH_MAP::ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-
-  ACE_Lock *lock_;
-  // Lock passed on from <TAO_NamingContext> to serialize access to the
-  // internal data structure.
-
-  PortableServer::POA_var poa_;
-  // Implement a different _default_POA()
-};
-
-#endif /* TAO_HASH_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am b/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
deleted file mode 100644
index 65f3bb1b56d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Naming Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Naming.la
-
-libTAO_Naming_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Naming_la_SOURCES = \
-        Entries.cpp \
-        Hash_Naming_Context.cpp \
-        Naming_Context.cpp \
-        Naming_Utils.cpp
-
-noinst_HEADERS = \
-        Entries.h \
-        Hash_Naming_Context.h \
-        Naming_Context.h \
-        Naming_Utils.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
deleted file mode 100644
index 74cb7670bca..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Naming_Context.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "Naming_Context.h"
-
-TAO_Naming_Context::TAO_Naming_Context (void)
-  : impl_ (0)
-{
-}
-
-TAO_Naming_Context::~TAO_Naming_Context (void)
-{
-  delete impl_;
-}
-
-void
-TAO_Naming_Context::impl (TAO_Naming_Context_Impl *impl)
-{
-  impl_ = impl;
-}
-
-PortableServer::POA_ptr
-TAO_Naming_Context::_default_POA (CORBA::Environment &/*env*/)
-{
-  return impl_->_default_POA ();
-}
-
-void
-TAO_Naming_Context::bind (const CosNaming::Name &n,
-                          CORBA::Object_ptr obj,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->bind (n, obj, ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::rebind (const CosNaming::Name &n,
-                            CORBA::Object_ptr obj,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->rebind (n, obj, ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::bind_context (const CosNaming::Name &n,
-                                  CosNaming::NamingContext_ptr nc,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->bind_context (n, nc, ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                    CosNaming::NamingContext_ptr nc,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->rebind_context (n, nc, ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-TAO_Naming_Context::resolve (const CosNaming::Name &n,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  return impl_->resolve (n, ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::unbind (const CosNaming::Name &n,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->unbind (n, ACE_TRY_ENV);
-}
-
-CosNaming::NamingContext_ptr
-TAO_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-{
-  return impl_->new_context (ACE_TRY_ENV);
-}
-
-CosNaming::NamingContext_ptr
-TAO_Naming_Context::bind_new_context (const CosNaming::Name &n,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  return impl_->bind_new_context (n, ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->destroy (ACE_TRY_ENV);
-}
-
-void
-TAO_Naming_Context::list (CORBA::ULong how_many,
-                          CosNaming::BindingList_out bl,
-                          CosNaming::BindingIterator_out bi,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  impl_->list (how_many, bl, bi, ACE_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
deleted file mode 100644
index 8cb611da717..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Naming_Context.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_NAMING_CONTEXT_H
-#define TAO_NAMING_CONTEXT_H
-
-#include "orbsvcs/CosNamingS.h"
-
-class TAO_Naming_Context_Impl;
-
-class TAO_ORBSVCS_Export TAO_Naming_Context : public POA_CosNaming::NamingContext
-{
-  // = TITLE
-  //   This class plays a role of the 'Abstraction' (aka 'Interface')
-  //   in the Bridge pattern architecture for the Naming Service implementation.
-  //
-  // = DESCRIPTION
-  //   This class simply forwards all client requests to a concrete
-  //   Naming Service implementation through its <impl_> pointer.  See
-  //   README file for more info.  Comments for the idl methods
-  //   describe methods semantics - actual actions are carried out by
-  //   concrete implementors.
-
-public:
-
-  // = Initialization and termination methods.
-  TAO_Naming_Context (void);
-  // Constructor.
-
-  ~TAO_Naming_Context (void);
-  // destructor.
-
-  void impl (TAO_Naming_Context_Impl *impl);
-  // Initialize <impl_> with a concrete implementation.
-
-  // = CosNaming::NamingContext idl interface methods.
-
-  virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Create a binding for name <n> and object <obj> in the naming
-  // context.  Compound names are treated as follows: ctx->bind (<c1;
-  // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
-  // obj) if the there already exists a binding for the specified
-  // name, <AlreadyBound> exception is thrown.  Naming contexts should
-  // be bound using <bind_context> and <rebind_context> in order to
-  // participate in name resolution later.
-
-  virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV);
-  // This is similar to <bind> operation above, except for when the
-  // binding for the specified name already exists in the specified
-  // context.  In that case, the existing binding is replaced with the
-  // new one.
-
-  virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV);
-  // This is the version of <bind> specifically for binding naming
-  // contexts, so that they will participate in name resolution when
-  // compound names are passed to be resolved.
-
-  virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV);
-  // This is a version of <rebind> specifically for naming contexts,
-  // so that they can participate in name resolution when compound
-  // names are passed.
-
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV);
-  // Return object reference that is bound to the name.  Compound name
-  // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
-  // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
-  // does not return the type of the object.  Clients are responsible
-  // for "narrowing" the object to the appropriate type.
-
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV);
-  // Remove the name binding from the context.  When compound names
-  // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
-  // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
-
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment
-                                                    &ACE_TRY_ENV);
-  // This operation returns a new naming context implemented by the
-  // same naming server in which the operation was invoked.  The
-  // context is not bound.
-
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV);
-  // This operation creates a new context and binds it to the name
-  // supplied as an argument.  The newly-created context is
-  // implemented by the same server as the context in which it was
-  // bound (the name argument excluding the last component).
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
-  // Delete the naming context.  NOTE: the user should <unbind> any
-  // bindings in which the given context is bound to some names before
-  // invoking <destroy> operation on it.
-  // NOTE: this operation is a no-op on the root context.
-
-  virtual void list (CORBA::ULong how_many,
-                     CosNaming::BindingList_out bl,
-                     CosNaming::BindingIterator_out bi,
-                     CORBA::Environment &ACE_TRY_ENV);
-  // Returns at most the requested number of bindings <how_many> in
-  // <bl>.  If the naming context contains additional bindings, they
-  // are returned with a BindingIterator.  In the naming context does
-  // not contain any additional bindings <bi> returned as null.
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-  // Returns the Default POA of this Servant object
-
-protected:
-
-  TAO_Naming_Context_Impl *impl_;
-  // A concrete implementor of the NamingContext functions.
-};
-
-class TAO_ORBSVCS_Export TAO_Naming_Context_Impl
-{
-  // = TITLE
-  //   This abstract base class plays a role of the 'Implementor' in the Bridge
-  //   pattern architecture for the implementation of the Naming Service.
-  //
-  // = DESCRIPTION
-  //   Subclasses of TAO_NamingContext_Impl provide concrete
-  //   implementations of the NamingContext functionality.
-
-public:
-
-  // = CosNaming::NamingContext idl interface methods.
-
-  virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Create a binding for name <n> and object <obj> in the naming
-  // context.  Compound names are treated as follows: ctx->bind (<c1;
-  // c2; c3; cn>, obj) = (ctx->resolve (<c1; c2; cn-1>))->bind (<cn>,
-  // obj) if the there already exists a binding for the specified
-  // name, <AlreadyBound> exception is thrown.  Naming contexts should
-  // be bound using <bind_context> and <rebind_context> in order to
-  // participate in name resolution later.
-
-  virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
-  // This is similar to <bind> operation above, except for when the
-  // binding for the specified name already exists in the specified
-  // context.  In that case, the existing binding is replaced with the
-  // new one.
-
-  virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV) = 0;
-  // This is the version of <bind> specifically for binding naming
-  // contexts, so that they will participate in name resolution when
-  // compound names are passed to be resolved.
-
-  virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
-  // This is a version of <rebind> specifically for naming contexts,
-  // so that they can participate in name resolution when compound
-  // names are passed.
-
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Return object reference that is bound to the name.  Compound name
-  // resolve is defined as follows: ctx->resolve (<c1; c2; cn>) =
-  // ctx->resolve (<c1; c2 cn-1>)->resolve (<cn>) The naming service
-  // does not return the type of the object.  Clients are responsible
-  // for "narrowing" the object to the appropriate type.
-
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Remove the name binding from the context.  When compound names
-  // are used, unbind is defined as follows: ctx->unbind (<c1; c2;
-  // cn>) = (ctx->resolve (<c1; c2; cn-1>))->unbind (<cn>)
-
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment
-                                                    &ACE_TRY_ENV) = 0;
-  // This operation returns a new naming context implemented by the
-  // same naming server in which the operation was invoked.  The
-  // context is not bound.
-
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV) = 0;
-  // This operation creates a new context and binds it to the name
-  // supplied as an argument.  The newly-created context is
-  // implemented by the same server as the context in which it was
-  // bound (the name argument excluding the last component).
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Delete the naming context.  NOTE: the user should <unbind> any
-  // bindings in which the given context is bound to some names before
-  // invoking <destroy> operation on it.
-  // NOTE: this operation is a no-op on the root context.
-
-  virtual void list (CORBA::ULong how_many,
-                     CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV) = 0;
-  // Returns at most the requested number of bindings <how_many> in
-  // <bl>.  If the naming context contains additional bindings, they
-  // are returned with a BindingIterator.  In the naming context does
-  // not contain any additional bindings <bi> returned as null.
-
-  virtual PortableServer::POA_ptr _default_POA (void) = 0;
-  // Returns the Default POA of this Servant object
-};
-
-
-#endif /* TAO_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
index d5476f99651..77a7e8e7234 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -4,9 +4,6 @@
 #include "tao/corba.h"
 #include "Naming_Utils.h"
 #include "ace/Arg_Shifter.h"
-#include "Hash_Naming_Context.h"
-#include "Persistent_Context_Index_T.h"
-#include "ace/Auto_Ptr.h"
 
 ACE_RCSID(Naming, Naming_Utils, "$Id$")
 
@@ -22,8 +19,7 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
                                       PortableServer::POA_ptr poa,
                                       size_t context_size,
                                       ACE_Time_Value *timeout,
-                                      int resolve_for_existing_naming_service,
-                                      LPCTSTR persistence_location)
+                                      int resolve_for_existing_naming_service)
   : naming_context_impl_ (0),
     naming_context_ (),
     ior_multicast_ (0),
@@ -33,8 +29,7 @@ TAO_Naming_Server::TAO_Naming_Server (CORBA::ORB_ptr orb,
                   poa,
                   context_size,
                   timeout,
-                  resolve_for_existing_naming_service,
-                  persistence_location) == -1)
+                  resolve_for_existing_naming_service) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) %p\n",
                 "TAO_Naming_Server::init"));
@@ -46,14 +41,12 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                          PortableServer::POA_ptr poa,
                          size_t context_size,
                          ACE_Time_Value *timeout,
-                         int resolve_for_existing_naming_service,
-                         LPCTSTR persistence_location)
+                         int resolve_for_existing_naming_service)
 {
   CORBA::Object_var naming_obj;
 
   if (resolve_for_existing_naming_service)
-    naming_obj = orb->resolve_initial_references ("NameService",
-                                                  timeout);
+    naming_obj = orb->resolve_initial_references ("NameService", timeout);
 
   if (CORBA::is_nil (naming_obj.in ()))
     {
@@ -62,7 +55,6 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
                     "\nNameService not resolved, so we'll become a NameService\n"));
       return this->init_new_naming (orb,
                                     poa,
-                                    persistence_location,
                                     context_size);
     }
   else
@@ -71,26 +63,24 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
         ACE_DEBUG ((LM_DEBUG,
                     "\nNameService found!\n"));
 
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY
         {
           this->naming_context_ =
             CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                               TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           this->naming_service_ior_ =
             orb->object_to_string (naming_obj.in (),
-                                   ACE_TRY_ENV);
+                                   TAO_TRY_ENV);
 
-          ACE_TRY_CHECK;
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_Naming_Server::init");
+          TAO_TRY_ENV.print_exception ("TAO_Naming_Server::init");
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      TAO_ENDTRY;
     }
   return 0;
 }
@@ -98,99 +88,42 @@ TAO_Naming_Server::init (CORBA::ORB_ptr orb,
 int
 TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
                                     PortableServer::POA_ptr poa,
-                                    LPCTSTR persistence_location,
                                     size_t context_size)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  ACE_NEW_RETURN (this->naming_context_impl_,
+                  TAO_NamingContext (poa,
+                                     "root",
+                                     context_size,
+                                     1),
+                  -1);
+
+  TAO_TRY
     {
-      if (persistence_location != 0)
-        {
-          // 1.  Please do not change to ACE_NEW_RETURN, 2.  This
-          // needs to be cleaned up (currently a memory leak) when
-          // TAO_Naming_Server dies.
-          TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> *context_index =
-            new TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> (orb,
-                                                                                     poa);
-
-          if (context_index == 0)
-            {
-              errno = ENOMEM;
-              return -1;
-            }
-
-          if (context_index->open (persistence_location) == -1)
-            ACE_DEBUG ((LM_DEBUG,
-                        "context_index->open failed"));
-
-          if (context_index->init () == -1)
-            ACE_DEBUG ((LM_DEBUG,
-                        "context_index->init failed"));
-
-          // Set the ior and objref to the root naming context.
-          this->naming_service_ior_= 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_ =
-            CosNaming::NamingContext::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      else
-        {
-          TAO_Naming_Context *c = 0;
-          TAO_Hash_Naming_Context *c_impl = 0;
-
-          // To keep compilers warnings away.
-          ACE_UNUSED_ARG (c_impl);
-
-          ACE_NEW_RETURN (c,
-                          TAO_Naming_Context,
-                          -1);
-
-          // Put <c> into the auto pointer temporarily, in case
-          // next allocation fails.
-          ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
-
-          ACE_NEW_RETURN (c_impl,
-                          TAO_Hash_Naming_Context (c,
-                                                   poa,
-                                                   "NameService",
-                                                   context_size,
-                                                   1),
-                          -1);
-          PortableServer::ObjectId_var id =
-           PortableServer::string_to_ObjectId ("NameService");
+      PortableServer::ObjectId_var id =
+        PortableServer::string_to_ObjectId ("NameService");
 
-          poa->activate_object_with_id (id.in (),
-                                        c,
-                                        ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      poa->activate_object_with_id (id.in (),
+                                    this->naming_context_impl_,
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-          this->naming_context_ =
-            c->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      this->naming_context_ =
+        this->naming_context_impl_->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-          // Stringify the objref we'll be implementing, and print it
-          // to stdout.  Someone will take that string and give it to
-          // a client.
-          this->naming_service_ior_=
-            orb->object_to_string (this->naming_context_.in (),
-                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+      // Stringify the objref we'll be implementing, and print it to
+      // stdout.  Someone will take that string and give it to a
+      // client.
+      this->naming_service_ior_=
+        orb->object_to_string (this->naming_context_.in (),
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "NameService IOR is <%s>\n",
-                        this->naming_service_ior_.in ()));
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "NameService IOR is <%s>\n",
+                    this->naming_service_ior_.in ()));
 
-          // everything succeeded, so set the pointer, get rid of Auto_Ptr.
-          this->naming_context_impl_ = temp.release ();
-        }
 #if defined (ACE_HAS_IP_MULTICAST)
       // Get reactor instance from TAO.
       ACE_Reactor *reactor =
@@ -238,20 +171,18 @@ TAO_Naming_Server::init_new_naming (CORBA::ORB_ptr orb,
         }
 #endif /* ACE_HAS_IP_MULTICAST */
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Naming Service");
+      TAO_TRY_ENV.print_exception ("Naming Service");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
+  TAO_ENDTRY;
   return 0;
 }
 
 // Returns the "NameService" NamingContext implementation object.
 
-TAO_Naming_Context &
+TAO_NamingContext &
 TAO_Naming_Server::get_naming_context (void)
 {
   return *this->naming_context_impl_;
@@ -303,8 +234,7 @@ int
 TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                          ACE_Time_Value *timeout)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::Object_var naming_obj =
         orb->resolve_initial_references ("NameService", timeout);
@@ -315,16 +245,15 @@ TAO_Naming_Client::init (CORBA::ORB_ptr orb,
                           -1);
       this->naming_context_ =
         CosNaming::NamingContext::_narrow (naming_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      TAO_TRY_ENV.print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -338,15 +267,3 @@ TAO_Naming_Client::~TAO_Naming_Client (void)
 {
   // Do nothing
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class ACE_Auto_Basic_Ptr<TAO_Naming_Context>;
-  template class TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-  template class ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>;
-  template class ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-  #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Naming_Context>
-  #pragma instantiate TAO_Persistent_Context_Index<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
-  #pragma instantiate ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX>
-  #pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
index 699c883ab97..91f356d8989 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.h
@@ -25,7 +25,7 @@
 #include "tao/corba.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/IOR_Multicast.h"
-#include "Naming_Context.h"
+#include "CosNaming_i.h"
 
 class TAO_ORBSVCS_Export TAO_Naming_Server
 {
@@ -50,8 +50,7 @@ public:
                      PortableServer::POA_ptr poa,
                      size_t context_size = ACE_DEFAULT_MAP_SIZE,
                      ACE_Time_Value *timeout = 0,
-                     int resolve_for_existing_naming_service = 1,
-                     LPCTSTR persistence_location = 0);
+                     int resolve_for_existing_naming_service = 1);
   // Either find an existing Naming Service or creates one.  Takes the
   // POA under which to register the Naming Service implementation
   // object.
@@ -60,8 +59,7 @@ public:
             PortableServer::POA_ptr poa,
             size_t context_size = ACE_DEFAULT_MAP_SIZE,
             ACE_Time_Value *timeout = 0,
-            int resolve_for_existing_naming_service = 1,
-            LPCTSTR persistence_location = 0);
+            int resolve_for_existing_naming_service = 1);
   // Either find an existing Naming Service or creates one.  Takes the
   // POA under which to register the Naming Service implementation
   // object.
@@ -69,7 +67,7 @@ public:
   ~TAO_Naming_Server (void);
   // Destructor.
 
-  TAO_Naming_Context &get_naming_context (void);
+  TAO_NamingContext &get_naming_context (void);
   // Returns the "NameService" NamingContext implementation object
   // reference.
 
@@ -82,11 +80,10 @@ public:
 protected:
   int init_new_naming (CORBA::ORB_ptr orb,
                        PortableServer::POA_ptr root_poa,
-                       LPCTSTR persistence_location,
                        size_t context_size);
   // Initialize a new name server under the given ORB and POA.
 
-  TAO_Naming_Context *naming_context_impl_;
+  TAO_NamingContext *naming_context_impl_;
   // Naming context implementation for "NameService".
 
   CosNaming::NamingContext_var naming_context_;
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp
deleted file mode 100644
index e83a1a64ff5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Persistent_Bindings_Map.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "Persistent_Bindings_Map.h"
-
-
-int
-TAO_Persistent_Bindings_Map::unbind (const char *id,
-                                     const char *kind)
-{
-  TAO_Persistent_ExtId name (id, kind);
-  TAO_Persistent_IntId entry;
-  if (this->map_->unbind (name, entry, this->allocator_) != 0)
-    return -1;
-  else
-    {
-      // Free up the memory we allocated in shared_bind().  Note that
-      // this assumes that the "ref" pointer comes first and that
-      // the ref, id and kind are contiguously allocated (see
-      // shared_bind() for details)
-      this->allocator_->free ((void *) (entry.ref_));
-      return 0;
-    }
-}
-
-int
-TAO_Persistent_Bindings_Map::bind (const char *id,
-                                   const char *kind,
-                                   CORBA::Object_ptr obj,
-                                   CosNaming::BindingType type)
-{
-  return this->shared_bind (id, kind, obj, type, 0);
-}
-
-int
-TAO_Persistent_Bindings_Map::rebind (const char *id,
-                                     const char *kind,
-                                     CORBA::Object_ptr obj,
-                                     CosNaming::BindingType type)
-{
-  return this->shared_bind (id, kind, obj, type, 1);
-}
-
-int
-TAO_Persistent_Bindings_Map::find (const char *id,
-                                   const char *kind,
-                                   CORBA::Object_ptr & obj,
-                                   CosNaming::BindingType &type)
-{
-  TAO_Persistent_ExtId name (id, kind);
-  TAO_Persistent_IntId entry;
-
-  if (this->map_->find (name,
-                        entry,
-                        this->allocator_) != 0)
-    return -1;
-  else
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      obj = orb_->string_to_object (entry.ref_, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-      type = entry.type ();
-
-      return 0;
-    }
-}
-
-TAO_Persistent_Bindings_Map::TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb)
-  : allocator_ (0),
-    map_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-TAO_Persistent_Bindings_Map::~TAO_Persistent_Bindings_Map (void)
-{
-}
-
-void
-TAO_Persistent_Bindings_Map::destroy (void)
-{
-  allocator_->free (map_);
-}
-
-TAO_Persistent_Bindings_Map::HASH_MAP *
-TAO_Persistent_Bindings_Map::map (void)
-{
-  return map_;
-}
-
-size_t
-TAO_Persistent_Bindings_Map::total_size (void)
-{
-  return map_->total_size ();
-}
-
-size_t
-TAO_Persistent_Bindings_Map::current_size (void)
-{
-  return map_->current_size ();
-}
-
-int
-TAO_Persistent_Bindings_Map::open (size_t size,
-                                   ACE_Allocator *alloc)
-{
-  allocator_ = alloc;
-
-  void *ns_map = 0;
-
-  size_t map_size = sizeof (HASH_MAP);
-  ns_map = this->allocator_->malloc (map_size);
-
-  // Initialize the map into its memory location (e.g., shared memory).
-  ACE_NEW_RETURN (this->map_,
-                  (ns_map) HASH_MAP (size, this->allocator_),
-                  -1);
-
-  return 0;
-}
-
-void
-TAO_Persistent_Bindings_Map::set (HASH_MAP *map,
-                                  ACE_Allocator *alloc)
-{
-  allocator_ = alloc;
-  map_ = map;
-}
-
-int
-TAO_Persistent_Bindings_Map::shared_bind (const char * id,
-                                          const char * kind,
-                                          CORBA::Object_ptr obj,
-                                          CosNaming::BindingType type,
-                                          int rebind)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::String_var ref = orb_->object_to_string (obj, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  size_t id_len = ACE_OS::strlen (id) + 1;
-  size_t kind_len = ACE_OS::strlen (kind) + 1;
-  size_t ref_len = ACE_OS::strlen (ref) + 1;
-  size_t total_len = id_len + kind_len + ref_len;
-  char *ptr = (char *) this->allocator_->malloc (total_len);
-
-  if (ptr == 0)
-    return -1;
-  else
-    {
-      // Note that the <ref> *must* come first to make sure we can
-      // retrieve this pointer later on in unbind().
-      char * ref_ptr = ptr;
-      char * id_ptr =  ptr + ref_len;
-      char * kind_ptr = ptr + ref_len + id_len;
-      ACE_OS::strcpy (ref_ptr, ref.in ());
-      ACE_OS::strcpy (id_ptr, id);
-      ACE_OS::strcpy (kind_ptr, kind);
-
-      TAO_Persistent_ExtId new_name (id_ptr, kind_ptr);
-      TAO_Persistent_IntId new_entry (ref_ptr, type);
-      int result = -1;
-
-      if (rebind == 0)
-        {
-          // Do a normal bind.  This will fail if there's already an
-          // <new_internal> with the same name.
-          result = this->map_->bind (new_name, new_entry, this->allocator_);
-
-          if (result == 1)
-            {
-              // Entry already existed so bind failed. Free our dynamically allocated memory.
-              this->allocator_->free ((void *) ptr);
-              return result;
-            }
-        }
-      else
-        {
-          // Do a rebind.  If there's already any entry, this will return the existing
-          // <new_name> and <new_internal> and overwrite the existing name binding.
-          TAO_Persistent_ExtId old_name;
-          TAO_Persistent_IntId old_entry;
-
-          result = this->map_->rebind (new_name, new_entry,
-                                       old_name, old_entry,
-                                       this->allocator_);
-          if (result == 1)
-            {
-              // Free up the memory we allocated in shared_bind().  Note that this
-              // assumes that the "value" pointer comes first and that the value,
-              // name, and type are contiguously allocated (see above for details)
-              this->allocator_->free ((void *) old_entry.ref_);
-            }
-        }
-
-      if (result == -1)
-        // Free our dynamically allocated memory.
-        this->allocator_->free ((void *) ptr);
-      else
-        // If bind() or rebind() succeed, they will automatically sync
-        // up the map manager entry.  However, we must sync up our
-        // name/value memory.
-        this->allocator_->sync (ptr, total_len);
-
-      return result;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>;
-template class ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId>;
-template class ACE_Hash<TAO_Persistent_ExtId>;
-template class ACE_Equal_To<TAO_Persistent_ExtId>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_ExtId, TAO_Persistent_IntId>
-#pragma instantiate ACE_Hash<TAO_Persistent_ExtId>
-#pragma instantiate ACE_Equal_To<TAO_Persistent_ExtId>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_ExtId, TAO_Persistent_IntId, ACE_Hash<TAO_Persistent_ExtId>, ACE_Equal_To<TAO_Persistent_ExtId>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
deleted file mode 100644
index 0ef047598ff..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Bindings_Map.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Persistent_Bindings_Map.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PERSISTENT_BINDINGS_MAP_H
-#define TAO_PERSISTENT_BINDINGS_MAP_H
-
-#include "Persistent_Entries.h"
-
-class TAO_ORBSVCS_Export TAO_Persistent_Bindings_Map
-{
-  // = TITLE
-  //
-  //
-  // = DESCRIPTION
-  //
-public:
-  typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId, TAO_Persistent_IntId> HASH_MAP;
-
-  // = Initialization and termination methods.
-  TAO_Persistent_Bindings_Map (CORBA::ORB_ptr orb);
-  // "Do-nothing" constructor.
-
-  int open (size_t size,
-            ACE_Allocator *alloc);
-  // Allocate hash map using the <alloc>.
-
-  void set (HASH_MAP *map,
-           ACE_Allocator *alloc);
-  // The map is already preallocated for us.
-
-  ~TAO_Persistent_Bindings_Map (void);
-  // destructor, do some cleanup :TBD: last dtor should "compress"
-  // file
-
-  void destroy (void);
-  // This method removes frees up the hash map from allocator.
-  // It better be empty, since we are not cleaning up the insides. (We
-  // could add <close> to clean entries, but not the data inside.
-
-  size_t total_size (void);
-  size_t current_size (void);
-  // return the size of the underlying hash map.
-
-  int bind (const char *id,
-            const char *kind,
-            CORBA::Object_ptr obj,
-            CosNaming::BindingType type);
-  // Bind a new name to a naming context
-
-  int rebind (const char *id,
-              const char *kind,
-              CORBA::Object_ptr obj,
-              CosNaming::BindingType type);
-  // Overwrite the value or type of an existing name in a
-  // ACE_Local_Name_Space or bind a new name to the context, if it
-  // didn't exist yet. (Wide charcter strings interface).
-
-  int unbind (const char * id,
-              const char * kind);
-
-  int find (const char * id,
-            const char * kind,
-            CORBA::Object_ptr & obj,
-            CosNaming::BindingType &type);
-
-  //A method to get the iterator.
-
-  HASH_MAP *map (void);
-  // accessor
-
-private:
-
-  int shared_bind (const char *id,
-                   const char *kind,
-                   CORBA::Object_ptr obj,
-                   CosNaming::BindingType type,
-                   int rebind);
-  // Factor out code from <bind> and <rebind>.
-
-  ACE_Allocator *allocator_;
-  // Pointer to the allocator
-
-  HASH_MAP *map_;
-  // Pointer to the allocated map manager.
-
-  CORBA::ORB_var orb_;
-  // a pointer to the orb so that we can do string/object conversions.
-};
-
-#endif /* TAO_PERSISTENT_BINDINGS_MAP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
deleted file mode 100644
index f34f53fc34d..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-#include "Persistent_Context_Index.h"
-
-TAO_Index::~TAO_Index (void)
-{
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>;
-template class ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>;
-template class ACE_Hash<TAO_Persistent_Index_ExtId>;
-template class ACE_Equal_To<TAO_Persistent_Index_ExtId>;
-template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>
-#pragma instantiate ACE_Hash_Map_Manager<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>
-#pragma instantiate ACE_Hash<TAO_Persistent_Index_ExtId>
-#pragma instantiate ACE_Equal_To<TAO_Persistent_Index_ExtId>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId, ACE_Hash<TAO_Persistent_Index_ExtId>, ACE_Equal_To<TAO_Persistent_Index_ExtId>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
deleted file mode 100644
index ce28c847968..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Persistent_Context_Index.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PERSISTENT_CONTEXT_INDEX_H
-#define TAO_PERSISTENT_CONTEXT_INDEX_H
-
-
-#define TAO_NAME_CONTEXTS_INDEX "Naming_Service_Index"
-
-#include "Persistent_Entries.h"
-
-class TAO_ORBSVCS_Export TAO_Index
-{
-  // = TITLE
-  //   Base class.  For now it is here to avoid templatizing
-  //   TAO_Persistent_Naming_Context.
-
-public:
-
-typedef ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
-  TAO_Persistent_Index_IntId> INDEX;
-typedef ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
-  TAO_Persistent_IntId> CONTEXT;
-
-  virtual ~TAO_Index (void);
-  // Destructor.
-
-  virtual int bind (const char *poa_id,
-                    ACE_UINT32* & counter,
-                    CONTEXT *hash_map) = 0;
-  // Create an entry - new context is created.
-
-  virtual int unbind (const char * poa_id) = 0;
-  // Unbind an entry - a context is destroyed.
-
-  virtual ACE_Allocator *allocator (void) = 0;
-  // accessor.
-
-  virtual CORBA::ORB_ptr orb (void) = 0;
-  //
-};
-
-#endif /* TAO_PERSISTENT_CONTEXT_INDEX_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
deleted file mode 100644
index 846f5a191ef..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
+++ /dev/null
@@ -1,355 +0,0 @@
-// $Id$
-
-#ifndef TAO_PERSISTENT_CONTEXT_INDEX_T_CPP
-#define TAO_PERSISTENT_CONTEXT_INDEX_T_CPP
-
-#include "Persistent_Context_Index_T.h"
-#include "Persistent_Naming_Context.h"
-#include "ace/Auto_Ptr.h"
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::unbind (const char *poa_id)
-{
-  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
-
-  TAO_Persistent_Index_ExtId name (poa_id);
-  TAO_Persistent_Index_IntId entry;
-  if (this->index_->unbind (name, entry, this->allocator_) != 0)
-    return -1;
-  else
-    {
-      // Free up the memory we allocated in bind().
-      this->allocator_->free ((void *) (entry.counter_));
-      return 0;
-    }
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::bind (const char *poa_id,
-                                                              ACE_UINT32 *&counter,
-                                                              TAO_Index::CONTEXT *hash_map)
-{
-  ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *this->lock_, -1);
-
-  size_t poa_id_len = ACE_OS::strlen (poa_id) + 1;
-  size_t counter_len = sizeof (ACE_UINT32);
-  char *ptr = (char *) this->allocator_->malloc (poa_id_len + counter_len);
-
-  if (ptr == 0)
-    return -1;
-  else
-    {
-      counter = ACE_reinterpret_cast (ACE_UINT32 *, ptr);
-      *counter = 0;
-      char * poa_id_ptr = ptr + counter_len;
-      ACE_OS::strcpy (poa_id_ptr, poa_id);
-
-      TAO_Persistent_Index_ExtId name (poa_id_ptr);
-      TAO_Persistent_Index_IntId entry (counter, hash_map);
-      int result = -1;
-
-      // Do a normal bind.  This will fail if there's already an
-      // entry with the same name.
-      result = this->index_->bind (name, entry, this->allocator_);
-
-      if (result == 1)
-        {
-          // Entry already existed so bind failed. Free our dynamically allocated memory.
-          this->allocator_->free ((void *) ptr);
-          return result;
-        }
-
-      if (result == -1)
-        // Free our dynamically allocated memory.
-        this->allocator_->free ((void *) ptr);
-      else
-        // If bind() succeed, it will automatically sync
-        // up the map manager entry.  However, we must sync up our
-        // name/value memory.
-        this->allocator_->sync (ptr, poa_id_len + counter_len);
-
-      return result;
-    }
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK>
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::TAO_Persistent_Context_Index
-  (CORBA::ORB_ptr orb,
-   PortableServer::POA_ptr poa)
-  : lock_ (0),
-    allocator_ (0),
-    index_ (0),
-    index_file_ (0),
-    base_address_ (0),
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK>
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::~TAO_Persistent_Context_Index (void)
-{
-  delete lock_;
-  delete allocator_;
-  ACE_OS::free (ACE_reinterpret_cast (void*, ACE_const_cast (LPTSTR, index_file_)));
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> ACE_Allocator*
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::allocator (void)
-{
-  return allocator_;
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> char*
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::root_ior (void)
-{
-  return CORBA::string_dup (root_ior_.in ());
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> CORBA::ORB_ptr
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::orb (void)
-{
-  return orb_.in ();
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::open (LPCTSTR file_name,
-                                                              void *base_address)
-{
-  this->base_address_ = base_address;
-
-  index_file_ = ACE_OS::strdup (file_name);
-  if (index_file_ == 0)
-    return -1;
-
-  return create_index ();
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
-{
-  // Return value of this function (necessary to keep compilers quiet).
-  int status = 0;
-
-  if (index_->current_size () == 0)
-    // CASE 1:there are no Naming Contexts registered.  We need to create
-    // one.
-    {
-      TAO_Persistent_Naming_Context *c_impl = 0;
-      TAO_Naming_Context *c = 0;
-      CosNaming::NamingContext_var result;
-
-      ACE_NEW_RETURN (c,
-                      TAO_Naming_Context,
-                      -1);
-
-      // Put c into the auto pointer temporarily, in case next
-      // allocation fails.
-      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
-
-      ACE_NEW_RETURN (c_impl,
-                      TAO_Persistent_Naming_Context (c,
-                                                     this,
-                                                     poa_.in (),
-                                                     "NameService"),
-                      -1);
-
-      if (c_impl->init () == -1)
-        {
-          delete c_impl;
-          return -1;
-        }
-      // Allocation succeeded, get rid of auto pointer.
-      temp.release ();
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId ("NameService");
-
-          this->poa_->activate_object_with_id (id.in (),
-                                               c,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          result = c->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          this->root_ior_=
-            orb_->object_to_string (result.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // register with the index @@need to roll back in case this fails.
-          this->bind ("NameService",
-                      c_impl->counter_,
-                      c_impl->context_.map ());
-
-          // Everything went successfully.
-          status = 0;
-            }
-      ACE_CATCHANY
-        {
-          delete c;
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
-    }
-
-  else
-    // CASE 2:Recreate all Naming Contexts.
-    status = recreate_all ();
-
-  return status;
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::recreate_all (void)
-{
-  // We can't use our INDEX typedef here because of the broken old g++!
-
-  ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
-    TAO_Persistent_Index_IntId>::ITERATOR * index_iter = 0;
-
-  ACE_NEW_RETURN (index_iter,
-                  (ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>::ITERATOR) (*index_),
-                  -1);
-
-  ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
-    TAO_Persistent_Index_IntId>::ITERATOR> it (index_iter);
-
-  ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
-    TAO_Persistent_Index_IntId>::ENTRY *entry = 0;
-
-   if (TAO_debug_level > 0)
-     ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
-
-  do
-    {
-      index_iter->next (entry);
-
-      TAO_Persistent_Naming_Context *c_impl = 0;
-      TAO_Naming_Context *c = 0;
-      CosNaming::NamingContext_var result;
-
-      ACE_NEW_RETURN (c,
-                      TAO_Naming_Context,
-                      -1);
-
-      // Put c into the auto pointer temporarily, in case next
-      // allocation fails.
-      ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
-
-      ACE_NEW_RETURN (c_impl,
-                      TAO_Persistent_Naming_Context (c,
-                                                     this,
-                                                     poa_.in (),
-                                                     entry->ext_id_.poa_id_,
-                                                     entry->int_id_.hash_map_,
-                                                     entry->int_id_.counter_),
-                  -1);
-
-      // Allocation succeeded, get rid of auto pointer.
-      temp.release ();
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId (entry->ext_id_.poa_id_);
-
-          this->poa_->activate_object_with_id (id.in (),
-                                               c,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          result = c->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (ACE_OS::strcmp ("NameService", entry->ext_id_.poa_id_) == 0)
-            this->root_ior_=
-              orb_->object_to_string (result.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Recreating Naming Context with poa_id %s and counter %d\n",
-                        entry->ext_id_.poa_id_,
-                        (*(c_impl->counter_))));
-        }
-      ACE_CATCHANY
-        {
-          delete c;
-          return -1;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
-
-    } while (index_iter->advance ());
-
-  return 0;
-}
-
-template <ACE_MEM_POOL_1, class ACE_LOCK> int
-TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::create_index (void)
-{
-  if (ACE_OS::strlen (index_file_) >= MAXNAMELEN + MAXPATHLEN)
-    {
-      errno = ENAMETOOLONG;
-      return -1;
-    }
-
-#if !defined (CHORUS)
-  ACE_MEM_POOL_OPTIONS options (base_address_);
-#else
-  // Use base address == 0, don't use a fixed address.
-  ACE_MEM_POOL_OPTIONS options (0,
-                                0,
-                                0,
-                                ACE_CHORUS_LOCAL_NAME_SPACE_T_SIZE);
-#endif /* CHORUS */
-
-  // Create the allocator with the appropriate options.  The name used
-  // for  the lock is the same one as used for the file.
-  ACE_NEW_RETURN (this->allocator_,
-                  ALLOCATOR (this->index_file_,
-                             this->index_file_,
-                             &options),
-                  -1);
-
-  ACE_NEW_RETURN (this->lock_, ACE_LOCK, -1);
-
-#if !defined (ACE_LACKS_ACCESS)
-  // Now check if the backing store has been created successfully
-  if (ACE_OS::access (this->index_file_, F_OK) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "create_index\n"),
-                      -1);
-#endif /* ACE_LACKS_ACCESS */
-
-  void *context_index = 0;
-
-  // This is the easy case since if we find the Context Index Map
-  // we know it's already initialized.
-  if (this->allocator_->find (TAO_NAME_CONTEXTS_INDEX, context_index) == 0)
-    this->index_ = (INDEX *) context_index;
-
-  else
-    {
-      size_t index_size = sizeof (INDEX);
-      context_index = this->allocator_->malloc (index_size);
-
-      // Initialize the map into its memory location (e.g., shared memory).
-      ACE_NEW_RETURN (this->index_,
-                      (context_index) INDEX (this->allocator_),
-                      -1);
-
-      if (this->allocator_->bind (TAO_NAME_CONTEXTS_INDEX, context_index) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "create_index\n"), -1);
-    }
-
-  return 0;
-}
-
-#endif /* TAO_PERSISTENT_CONTEXT_INDEX_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h
deleted file mode 100644
index b3df8a6bbae..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Persistent_Context_Index_T.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PERSISTENT_CONTEXT_INDEX_T_H
-#define TAO_PERSISTENT_CONTEXT_INDEX_T_H
-
-#include "Persistent_Context_Index.h"
-
-template <ACE_MEM_POOL_1, class ACE_LOCK>
-class TAO_Persistent_Context_Index : public TAO_Index
-{
-  // = TITLE
-  //
-  //
-  // = DESCRIPTION
-  //   ACE_LOCK should either be ACE_Null_Mutex or ACE_Thread_Mutex.
-  //   ACE_MEM_POOL_1 for now is ACE_MMAP_Memory_Pool, later may make
-  //   sense with other pools.
-public:
-  // = Initialization and termination methods.
-  TAO_Persistent_Context_Index (CORBA::ORB_ptr orb,
-                                PortableServer::POA_ptr poa);
-  // "Do-nothing" constructor.
-
-  int open (LPCTSTR file_name,
-            void * base_address = ACE_DEFAULT_BASE_ADDR);
-  //
-
-  int init (void);
-  // go through the index of contexts and create a servant of each,
-  // and register it with POA.  If no contexts are present, create one.
-
-  ~TAO_Persistent_Context_Index (void);
-  // destructor, do some cleanup :TBD: last dtor should "compress"
-  // file
-
-  virtual int bind (const char *poa_id,
-                    ACE_UINT32 *&counter,
-                    CONTEXT *hash_map);
-  // Create an entry - new context is created.
-
-  virtual int unbind (const char * poa_id);
-  // Unbind an entry - a context is destroyed.
-
-  virtual ACE_Allocator *allocator (void);
-  // accessor.
-
-  virtual CORBA::ORB_ptr orb (void);
-  //
-
-  char * root_ior (void);
-  //
-
-  typedef ACE_Allocator_Adapter <ACE_Malloc <ACE_MEM_POOL_2, ACE_LOCK>
-  > ALLOCATOR;
-
-private:
-
-  int recreate_all (void);
-  //
-
-  int create_index (void);
-  // Allocate the appropriate type of map manager that stores the
-  // key/value binding.
-
-  ACE_LOCK *lock_;
-  // Lock to prevent multiple threads from modifying entries in the
-  // hash map simultanneously.
-
-  ALLOCATOR *allocator_;
-  // Pointer to the allocator
-
-  INDEX *index_;
-  // Pointer to the allocated map manager.
-
-  LPCTSTR index_file_;
-  // Name of the file used for storage.
-
-  void *base_address_;
-
-  CORBA::ORB_var orb_;
-  //
-
-  PortableServer::POA_var poa_;
-  //
-
-  CORBA::String_var root_ior_;
-  //
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Persistent_Context_Index_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Persistent_Context_Index_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* TAO_PERSISTENT_CONTEXT_INDEX_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
deleted file mode 100644
index f9d2d86b142..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//    Persistent_Entries.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "Persistent_Entries.h"
-#include "ace/SString.h"
-
-TAO_Persistent_IntId::TAO_Persistent_IntId (void)
-  : ref_ (0),
-    type_ (CosNaming::nobject)
-{
-}
-
-TAO_Persistent_IntId::TAO_Persistent_IntId (char * obj_ref,
-                                            CosNaming::BindingType type)
-  : ref_ (obj_ref),
-    type_ (type)
-{
-}
-
-TAO_Persistent_IntId::TAO_Persistent_IntId (const TAO_Persistent_IntId &rhs)
-{
-  ref_ = rhs.ref_;
-  type_ = rhs.type_;
-}
-
-TAO_Persistent_IntId::~TAO_Persistent_IntId (void)
-{
-}
-
-void
-TAO_Persistent_IntId::operator= (const TAO_Persistent_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  type_ = rhs.type_;
-  ref_ = rhs.ref_;
-}
-
-CosNaming::BindingType
-TAO_Persistent_IntId::type (void)
-{
-  return type_;
-}
-
-TAO_Persistent_ExtId::TAO_Persistent_ExtId (void)
-  : id_ (0),
-    kind_ (0)
-{
-}
-
-TAO_Persistent_ExtId::TAO_Persistent_ExtId (const char *id,
-                                            const char *kind)
-  : id_ (id),
-    kind_ (kind)
-
-{
-}
-
-TAO_Persistent_ExtId::TAO_Persistent_ExtId (const TAO_Persistent_ExtId &rhs)
-{
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-TAO_Persistent_ExtId::~TAO_Persistent_ExtId (void)
-{
-}
-
-void
-TAO_Persistent_ExtId::operator= (const TAO_Persistent_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  id_ = rhs.id_;
-  kind_ = rhs.kind_;
-}
-
-int
-TAO_Persistent_ExtId::operator== (const TAO_Persistent_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (id_, rhs.id_) == 0)
-    && (ACE_OS::strcmp (kind_, rhs.kind_) == 0);
-}
-
-int
-TAO_Persistent_ExtId::operator!= (const TAO_Persistent_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (id_, rhs.id_) != 0)
-    || (ACE_OS::strcmp (kind_, rhs.kind_) != 0);
-}
-
-u_long
-TAO_Persistent_ExtId::hash (void) const
-{
-  ACE_CString temp (id_);
-  temp += kind_;
-
-  return temp.hash ();
-}
-
-TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (void)
-  : counter_ (0),
-    hash_map_ (0)
-{
-}
-
-TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
-                                                        ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
-                                                        TAO_Persistent_IntId> * hash_map)
-  : counter_ (counter),
-    hash_map_ (hash_map)
-{
-}
-
-TAO_Persistent_Index_IntId::TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId &rhs)
-{
-  counter_ = rhs.counter_;
-  hash_map_ = rhs.hash_map_;
-}
-
-TAO_Persistent_Index_IntId::~TAO_Persistent_Index_IntId (void)
-{
-}
-
-void
-TAO_Persistent_Index_IntId::operator= (const TAO_Persistent_Index_IntId &rhs)
-{
-  // check for self assignment.
-  if (&rhs == this)
-    return;
-
-  counter_ = rhs.counter_;
-  hash_map_ = rhs.hash_map_;
-}
-
-TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (void)
-  : poa_id_ (0)
-{
-}
-
-TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (const char *poa_id)
-  : poa_id_ (poa_id)
-{
-}
-
-TAO_Persistent_Index_ExtId::TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId &rhs)
-{
-  poa_id_ = rhs.poa_id_;
-}
-
-TAO_Persistent_Index_ExtId::~TAO_Persistent_Index_ExtId (void)
-{
-}
-
-void
-TAO_Persistent_Index_ExtId::operator= (const TAO_Persistent_Index_ExtId &rhs)
-{
-  // Check for self assignment.
-  if (&rhs == this)
-    return;
-
-  poa_id_ = rhs.poa_id_;
-}
-
-int
-TAO_Persistent_Index_ExtId::operator== (const TAO_Persistent_Index_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (poa_id_, rhs.poa_id_) == 0);
-}
-
-int
-TAO_Persistent_Index_ExtId::operator!= (const TAO_Persistent_Index_ExtId &rhs) const
-{
-  return (ACE_OS::strcmp (poa_id_, rhs.poa_id_) != 0);
-}
-
-u_long
-TAO_Persistent_Index_ExtId::hash (void) const
-{
-  ACE_CString temp (poa_id_);
-  return temp.hash ();
-}
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
deleted file mode 100644
index 300cda47958..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Persistent_Entries.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PERSISTENT_ENTRIES_H
-#define TAO_PERSISTENT_ENTRIES_H
-
-#include "tao/corba.h"
-#include "orbsvcs/CosNamingC.h"
-#include "Shared_Hash_Map_T.h"
-
-class TAO_ORBSVCS_Export TAO_Persistent_IntId
-{
-  // = TITLE
-  //     Stores information a context keeps for each bound name.
-  //
-  // = DESCRIPTION
-  //     Each bound name is associated with an object reference and
-  //     the type of binding.
-public:
-  // = Initialization and termination methods.
-  TAO_Persistent_IntId (void);
-  // Constructor.
-
-  TAO_Persistent_IntId (char * obj_ref,
-                        CosNaming::BindingType type /* = CosNaming::nobject */);
-  // Constructor.
-
-  TAO_Persistent_IntId (const TAO_Persistent_IntId & rhs);
-  // Copy constructor.
-
-  ~TAO_Persistent_IntId (void);
-  // Destructor.
-
-  void operator= (const TAO_Persistent_IntId & rhs);
-  // Assignment operator (does copy memory).
-
-  CosNaming::BindingType type (void);
-  //
-
-  const char * ref_;
-  // This should be allocated from shared/mmap memory.
-
-  CosNaming::BindingType type_;
-  // Indicator of whether the object is a NamingContext that should
-  // participate in name resolution when compound names are used.
-};
-
-class TAO_ORBSVCS_Export TAO_Persistent_ExtId
-{
-  // = TITLE
-  //    Stores the name to which an object is bound.
-  //
-  // = DESCRIPTION
-  //    This class is used as the External ID for the
-  //    <ACE_Hash_Map_Manager>.  We do not allocate memory for <id>
-  //    and <kind>, we do not deallocate it.
-public:
-  // = Initialization and termination methods.
-
-  TAO_Persistent_ExtId (void);
-  // Constructor.
-
-  TAO_Persistent_ExtId (const char *id,
-                        const char *kind);
-  // Constructor.
-
-  TAO_Persistent_ExtId (const TAO_Persistent_ExtId & rhs);
-  // Copy constructor.
-
-  ~TAO_Persistent_ExtId (void);
-  // Destructor.
-
-  void operator= (const TAO_Persistent_ExtId & rhs);
-  // Assignment operator (does copy memory).
-
-  int operator== (const TAO_Persistent_ExtId &rhs) const;
-  // Equality comparison operator (must match both id_ and kind_).
-
-  int operator!= (const TAO_Persistent_ExtId &rhs) const;
-  // Inequality comparison operator.
-
-  u_long hash (void) const;
-  // This class has to have a hash for use with ACE_Hash_Map_Manager.
-
-  const char * id_;
-  const char * kind_;
-  // These point into shared/mmaped memory.
-
-};
-
-class TAO_ORBSVCS_Export TAO_Persistent_Index_IntId
-{
-  // = TITLE
-  //     Stores information about a context.
-  //
-  // = DESCRIPTION
-  //     Each context
-  //     the type of binding.
-public:
-  // = Initialization and termination methods.
-  TAO_Persistent_Index_IntId (void);
-  // Constructor.
-
-  TAO_Persistent_Index_IntId (ACE_UINT32 *counter,
-                              ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
-                              TAO_Persistent_IntId> * hash_map);
-  // Constructor.
-
-  TAO_Persistent_Index_IntId (const TAO_Persistent_Index_IntId & rhs);
-  // Copy constructor.
-
-  ~TAO_Persistent_Index_IntId (void);
-  // Destructor.
-
-  void operator= (const TAO_Persistent_Index_IntId & rhs);
-  // Assignment operator (does copy memory).
-
-  ACE_UINT32 *counter_;
-  //
-
-  ACE_Shared_Hash_Map<TAO_Persistent_ExtId,
-    TAO_Persistent_IntId> * hash_map_;
-  // The pointer to the context's bindings hash map.
-};
-
-class TAO_ORBSVCS_Export TAO_Persistent_Index_ExtId
-{
-  // = TITLE
-  //    Stores the poa_id of a context.
-  //
-  // = DESCRIPTION
-  //    This class is used as the External ID for the
-  //    <ACE_Hash_Map_Manager>.  We do not allocate memory for
-  //    <poa_id>, we do not deallocate it.
-public:
-  // = Initialization and termination methods.
-
-  TAO_Persistent_Index_ExtId (void);
-  // Constructor.
-
-  TAO_Persistent_Index_ExtId (const char *poa_id);
-  // Constructor.
-
-  TAO_Persistent_Index_ExtId (const TAO_Persistent_Index_ExtId & rhs);
-  // Copy constructor.
-
-  ~TAO_Persistent_Index_ExtId (void);
-  // Destructor.
-
-  void operator= (const TAO_Persistent_Index_ExtId & rhs);
-  // Assignment operator (does copy memory).
-
-  int operator== (const TAO_Persistent_Index_ExtId &rhs) const;
-  // Equality comparison operator (must match both id_ and kind_).
-
-  int operator!= (const TAO_Persistent_Index_ExtId &rhs) const;
-  // Inequality comparison operator.
-
-  u_long hash (void) const;
-  // This class has to have a hash for use with ACE_Hash_Map_Manager.
-
-  const char * poa_id_;
-  // These point into shared/mmaped memory.
-
-};
-
-#endif /* TAO_PERSISTENT_ENTRIES_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
deleted file mode 100644
index b2cbe4e6b28..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ /dev/null
@@ -1,906 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Persistent_Naming_Context.cpp
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-#include "ace/Auto_Ptr.h"
-#include "Persistent_Naming_Context.h"
-#include "Persistent_Context_Index.h"
-
-ACE_RCSID(Naming, Persistent_Naming_Context, "$Id:")
-
-TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context(TAO_Naming_Context *interface,
-                                                             TAO_Index *context_index,
-                                                             PortableServer::POA_ptr poa,
-                                                             const char *poa_id,
-                                                             size_t default_hash_table_size)
-  : counter_ (0),
-    context_ (context_index->orb ()),
-    index_ (context_index),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    poa_id_ (poa_id),
-    lock_ (0),
-    hash_table_size_ (default_hash_table_size),
-    interface_ (interface)
-{
-  // Get the lock from the ORB, which knows what type is appropriate.
-  // This method must be called AFTER the ORB has been initialized via
-  // <CORBA::ORB_init> since otherwise <TAO_ORB_Core_instance> won't
-  // work correctly...
-  ACE_ALLOCATOR (this->lock_,
-                 TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
-
-  interface_->impl (this);
-}
-
-TAO_Persistent_Naming_Context::TAO_Persistent_Naming_Context(TAO_Naming_Context *interface,
-                                                             TAO_Index *context_index,
-                                                             PortableServer::POA_ptr poa,
-                                                             const char *poa_id,
-                                                             HASH_MAP *map,
-                                                             ACE_UINT32 *counter)
-  : counter_ (counter),
-    context_ (context_index->orb ()),
-    index_ (context_index),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    poa_id_ (poa_id),
-    lock_ (0),
-    hash_table_size_ (map->total_size ()),
-    interface_ (interface)
-{
-  // Get the lock from the ORB, which knows what type is appropriate.
-  // This method must be called AFTER the ORB has been initialized via
-  // <CORBA::ORB_init> since otherwise <TAO_ORB_Core_instance> won't
-  // work correctly...
-  ACE_ALLOCATOR (this->lock_,
-                 TAO_ORB_Core_instance ()->server_factory ()->create_servant_lock ());
-
-  interface_->impl (this);
-  context_.set (map, index_->allocator ());
-}
-
-int
-TAO_Persistent_Naming_Context::init (void)
-{
-  return context_.open (hash_table_size_, index_->allocator ());
-}
-
-TAO_Persistent_Naming_Context::~TAO_Persistent_Naming_Context (void)
-{
-  delete this->lock_;
-
-  // This should only get called if we are destroyed, i.e., we don't
-  // want persistent state.
-  // remove index entry.
-  index_->unbind (poa_id_.c_str ());
-  // clean up the map
-  context_.destroy ();
-}
-
-PortableServer::POA_ptr
-TAO_Persistent_Naming_Context::_default_POA (void)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::get_context (const CosNaming::Name &name,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // The naming context we will return.
-  CosNaming::NamingContext_var result =
-    CosNaming::NamingContext::_nil ();
-
-  // Create compound name to be resolved (<name> - last component).
-  // To avoid copying (and thus memory allocations), we can just reuse
-  // <name>'s buffer, since we will not be modifying it.
-  CORBA::ULong len = name.length ();
-  CosNaming::Name comp_name (name.maximum (),
-                             len - 1,
-                             ACE_const_cast
-                             (CosNaming::NameComponent*,
-                              name.get_buffer ()));
-  ACE_TRY
-    {
-      // Resolve the name.
-      CORBA::Object_var context = resolve (comp_name,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Try narrowing object reference to a context type.
-      result = CosNaming::NamingContext::_narrow (context.in (),
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
-    {
-      // Add the last component of the name, which was stripped before
-      // the call to resolve.
-      CORBA::ULong rest_len = ex.rest_of_name.length ();
-      ex.rest_of_name.length (rest_len + 1);
-      ex.rest_of_name[rest_len] = name[len - 1];
-
-      if (ex.why == CosNaming::NamingContext::not_object)
-        ex.why = CosNaming::NamingContext::missing_node;
-
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result._retn ());
-
-  // This has to be outside the TRY block, othewise we'll catch our
-  // own exception.
-  if (CORBA::is_nil (result.in ()))
-    {
-      CosNaming::Name rest;
-      rest.length (2);
-      rest[0] = name[len - 2];
-      rest[1] = name[len - 1];
-      ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                        (CosNaming::NamingContext::not_context,
-                         rest),
-                        result._retn());
-    }
-  // Finally, if everything went smoothly, just return the resolved
-  // context.
-  return result._retn ();
-}
-
-void
-TAO_Persistent_Naming_Context::bind (const CosNaming::Name& n,
-                                     CORBA::Object_ptr obj,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        this->get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->bind (simple_name, obj, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // If we received a simple name, we need to bind it in this context.
-  else
-    {
-      // Try binding the name.
-      int result = this->context_.bind (n[0].id,
-                                        n[0].kind,
-                                        obj,
-                                        CosNaming::nobject);
-      if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
-
-      // Something went wrong with the internal structure
-      else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-TAO_Persistent_Naming_Context::rebind (const CosNaming::Name& n,
-                                       CORBA::Object_ptr obj,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->rebind (simple_name, obj, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  else
-    {
-      // If we received a simple name, we need to rebind it in this
-      // context.
-      // Try rebinding the name.
-      int result = this->context_.rebind (n[0].id,
-                                          n[0].kind,
-                                          obj,
-                                          CosNaming::nobject);
-      // Something went wrong with the internal structure
-      if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-TAO_Persistent_Naming_Context::bind_context (const CosNaming::Name &n,
-                                             CosNaming::NamingContext_ptr nc,
-                                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
-
-  // If we received compound name, resolve it to get the context in
-  // which the binding should take place, then perform the binding on
-  // target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->bind_context (simple_name, nc, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  // If we received a simple name, we need to bind it in this context.
-  else
-    {
-      // Try binding the name.
-      int result = this->context_.bind (n[0].id,
-                                        n[0].kind,
-                                        nc,
-                                        CosNaming::ncontext);
-      if (result == 1)
-        ACE_THROW (CosNaming::NamingContext::AlreadyBound());
-
-      // Something went wrong with the internal structure
-      else if (result == -1)
-        ACE_THROW (CORBA::INTERNAL ());
-    }
-}
-
-void
-TAO_Persistent_Naming_Context::rebind_context (const CosNaming::Name &n,
-                                               CosNaming::NamingContext_ptr nc,
-                                               CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
-
-  // If we received compound name, resolve it to get the context in
-  // which the rebinding should take place, then perform the rebinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->rebind_context (simple_name, nc, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // If we received a simple name, we need to rebind it in this
-  // context.
-  else
-    // Try rebinding the name.
-    if (this->context_.rebind (n[0].id,
-                               n[0].kind,
-                               nc,
-                               CosNaming::ncontext) < 0)
-      ACE_THROW (CORBA::INTERNAL ());
-}
-
-CORBA::Object_ptr
-TAO_Persistent_Naming_Context::resolve (const CosNaming::Name& n,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_ptr result = CORBA::Object::_nil ();
-  CosNaming::BindingType type;
-
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon, *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (result);
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW_RETURN (CosNaming::NamingContext::InvalidName(),
-                      result);
-
-  // Resolve the first component of the name.
-  if (this->context_.find (n[0].id,
-                           n[0].kind,
-                           result,
-                           type) == -1)
-    ACE_THROW_RETURN (CosNaming::NamingContext::NotFound
-                      (CosNaming::NamingContext::not_object,
-                       n),
-                      result);
-  //@@ Once TAO_TRY_THROW is implemented, the whole if (len > 1) can be put in a try block
-  //with rethrow in CATCHANY.
-
-  // If the name we have to resolve is a compound name we need to
-  // recursively resolve it.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        CosNaming::NamingContext::_nil ();
-      if (type == CosNaming::ncontext)
-        {
-          context = CosNaming::NamingContext::_narrow (result,
-                                                       ACE_TRY_ENV);
-          ACE_CHECK_RETURN (context._retn ());
-        }
-      else
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
-                                                              n),
-                          context._retn ());
-      if (CORBA::is_nil (context.in ()))
-        ACE_THROW_RETURN (CosNaming::NamingContext::NotFound (CosNaming::NamingContext::not_context,
-                                                              n),
-                          context._retn ());
-      else
-        {
-          // Recursively call resolve on <n> without the first component.
-
-          // We need a name just like <n> but without the first
-          // component.  Instead of copying data we can reuse <n>'s
-          // buffer since we will only be using it for 'in' parameters
-          // (no modifications).
-          CosNaming::Name rest_of_name
-            (n.maximum () - 1,
-             n.length () - 1,
-             ACE_const_cast (CosNaming::NameComponent*,
-                             n.get_buffer ())
-             + 1);
-          // If there are any exceptions, they will propagate up.
-          return context->resolve (rest_of_name,
-                                   ACE_TRY_ENV);
-        }
-    }
-  // If the name we had to resolve was simple, we just need to return
-  // the result.  Since we don't want the result to be destroyed when
-  // this method returns we need to duplicate it.
-  return CORBA::Object::_duplicate (result);
-}
-
-void
-TAO_Persistent_Naming_Context::unbind (const CosNaming::Name& n,
-                                       CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock, ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Get the length of the name.
-  CORBA::ULong len = n.length ();
-
-  // Check for invalid name.
-  if (len == 0)
-    ACE_THROW (CosNaming::NamingContext::InvalidName());
-
-  // If we received compound name, resolve it to get the context in
-  // which the unbinding should take place, then perform the unbinding
-  // on target context.
-  if (len > 1)
-    {
-      CosNaming::NamingContext_var context =
-        get_context (n, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      CosNaming::Name simple_name;
-      simple_name.length (1);
-      simple_name[0] = n[len - 1];
-      context->unbind (simple_name, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  // If we received a simple name, we need to unbind it in this
-  // context.
-  else
-    // Try unbinding the name.
-    if (this->context_.unbind (n[0].id, n[0].kind) == -1)
-      ACE_THROW (CosNaming::NamingContext::NotFound
-                 (CosNaming::NamingContext::not_object,
-                  n));
-}
-
-CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::new_context (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  TAO_Persistent_Naming_Context *c_impl = 0;
-  TAO_Naming_Context *c = 0;
-  CosNaming::NamingContext_var result;
-  char poa_id[BUFSIZ];
-  ACE_OS::sprintf (poa_id,
-                   "%s_%ld",
-                   this->poa_id_.c_str (),
-                   (*this->counter_)++);
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Created a new Naming Context with poa_id %s and counter %d\n",
-                poa_id,
-                (*counter_)));
-
-  ACE_NEW_THROW_EX (c,
-                    TAO_Naming_Context,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // Put c into the auto pointer temporarily, in case next
-  // allocation fails.
-  ACE_Auto_Basic_Ptr<TAO_Naming_Context> temp (c);
-
-  ACE_NEW_THROW_EX (c_impl,
-                    TAO_Persistent_Naming_Context (c,
-                                                   index_,
-                                                   poa_.in (),
-                                                   poa_id,
-                                                   this->hash_table_size_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (result._retn ());
-
-  // Allocation succeeded, get rid of auto pointer.
-  if (c_impl->init () == -1)
-    {
-      delete c_impl;
-      return result._retn ();
-    }
-
-  temp.release ();
-
-  ACE_TRY
-    {
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId (poa_id);
-
-      this->poa_->activate_object_with_id (id.in (),
-                                           c,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      result = c->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // register with the index @@need to roll back in case this fails.
-      index_->bind (c_impl->poa_id_.c_str (),
-                    c_impl->counter_,
-                    c_impl->context_.map ());
-    }
-  ACE_CATCHANY
-    {
-      delete c;
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (result._retn ());
-
-  return result._retn ();
-}
-
-CosNaming::NamingContext_ptr
-TAO_Persistent_Naming_Context::bind_new_context (const CosNaming::Name& n,
-                                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  CosNaming::NamingContext_var result =
-    CosNaming::NamingContext::_nil ();
-
-  result = new_context (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  ACE_TRY
-    {
-      bind_context (n,
-                    result.in (),
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        result->destroy (ACE_TRY_ENV);
-      }
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  return result._retn ();
-}
-
-void
-TAO_Persistent_Naming_Context::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock,
-                        ace_mon,
-                        *this->lock_,
-                        CORBA::INTERNAL ());
-    ACE_CHECK;
-
-    if (this->context_.current_size () != 0)
-      ACE_THROW (CosNaming::NamingContext::NotEmpty());
-
-    PortableServer::POA_var poa =
-      this->_default_POA ();
-
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (interface_,
-                          ACE_TRY_ENV);
-    ACE_CHECK;
-
-    poa->deactivate_object (id.in (),
-                            ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  // Let go of the lock and kill the interface, which will, in turn,
-  // invoke our destructor.  We *must* be dynamically allocated for this to work right...
-  // The code below, and in <destroy> in general, should NOT be
-  // factored into the TAO_Naming_Context, because only the *concrete
-  // implementation* knows how to clean up appropriately, e.g., we may
-  // have one servant serving many objects and will not want to delete
-  // the servant in <destroy>.
-
-  //@@ Now that the POA has been fixed to work right, this is no
-  // longer a correct approach to disposing off the servants.  This is
-  // a temporary fix to avoid crashing (but with the memory leak), a
-  // proper fix will be in the next release.
-  //  delete interface_;
-}
-
-void
-TAO_Persistent_Naming_Context::list (CORBA::ULong how_many,
-                                     CosNaming::BindingList_out &bl,
-                                     CosNaming::BindingIterator_out &bi,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Allocate nil out parameters in case we won't be able to complete
-  // the operation.
-  bi = CosNaming::BindingIterator::_nil ();
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Obtain a lock before we proceed with the operation.
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  // Dynamically allocate hash map iterator.
-  TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter = 0;
-  ACE_NEW_THROW_EX (hash_iter,
-                    TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR
-                    (*(context_.map ())),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Number of bindings that will go into the BindingList.
-  CORBA::ULong n;
-
-  // A pointer to BindingIterator servant.
-  TAO_Persistent_Binding_Iterator *bind_iter = 0;
-
-  // Calculate number of bindings that will go into bl.
-  if (this->context_.current_size () > how_many)
-    n = how_many;
-  else
-    n = this->context_.current_size ();
-
-  // Use hash iterator to populate a BindingList with bindings.
-  bl->length (n);
-
-  TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
-
-  for (CORBA::ULong i = 0; i < n; i++)
-    {
-      hash_iter->next (hash_entry);
-      hash_iter->advance ();
-
-      if (populate_binding (hash_entry, bl[i]) == 0)
-        {
-          delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY());
-        }
-    }
-
-  // Now we are done with the BindingsList, and we can follow up on
-  // the iterator business.
-
-  // If we do not need to pass back BindingIterator.
-  if (this->context_.current_size () <= how_many)
-    delete hash_iter;
-  else
-    {
-      // Create a BindingIterator for return.
-
-      bind_iter = new TAO_Persistent_Binding_Iterator (hash_iter, this->poa_.in (), this->lock_);
-      if (bind_iter == 0)
-        {
-          delete hash_iter;
-          ACE_THROW (CORBA::NO_MEMORY ());
-        }
-
-      ACE_TRY
-        {
-          char poa_id[BUFSIZ];
-          ACE_OS::sprintf (poa_id,
-                           "%s_%ld",
-                           this->poa_id_.c_str (),
-                           (*this->counter_)++);
-
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId (poa_id);
-
-          this->poa_->activate_object_with_id (id.in (),
-                                               bind_iter,
-                                               ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          bi = bind_iter->_this (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-        }
-      ACE_CATCHANY
-        {
-          delete bind_iter;
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-TAO_Persistent_Binding_Iterator::TAO_Persistent_Binding_Iterator (TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
-                                                                  PortableServer::POA_ptr poa,
-                                                                  ACE_Lock *lock)
-  : hash_iter_ (hash_iter),
-    lock_ (lock),
-    poa_ (PortableServer::POA::_duplicate (poa))
-
-{
-}
-
-TAO_Persistent_Binding_Iterator::~TAO_Persistent_Binding_Iterator (void)
-{
-  delete hash_iter_;
-}
-
-// Return the Default POA of this Servant
-PortableServer::POA_ptr
-TAO_Persistent_Binding_Iterator::_default_POA (CORBA::Environment &/*env*/)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-CORBA::Boolean
-TAO_Persistent_Binding_Iterator::next_one (CosNaming::Binding_out b,
-                                           CORBA::Environment &ACE_TRY_ENV)
-{
-  CosNaming::Binding *binding;
-
-  // Allocate a binding to be returned (even if there no more
-  // bindings, we need to allocate an out parameter.)
-  ACE_NEW_THROW_EX (binding,
-                    CosNaming::Binding,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  b = binding;
-
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-  // If there are no more bindings.
-  if (hash_iter_->done ())
-    return 0;
-  else
-    {
-      TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
-      hash_iter_->next (hash_entry);
-
-      if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, *binding) == 0)
-        ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
-
-      hash_iter_->advance ();
-      return 1;
-    }
-}
-
-int
-TAO_Persistent_Naming_Context::populate_binding (TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry,
-                                                 CosNaming::Binding &b)
-{
-  b.binding_type = hash_entry->int_id_.type_;
-  b.binding_name.length (1);
-
-  // Here we perform a check before assignment to make sure
-  // CORBA::string_dup is not called on 0 pointer, since the spec does
-  // not say what should happen in that case.
-  if (hash_entry->ext_id_.id_ != 0)
-    {
-      b.binding_name[0].id =
-        CORBA::string_dup (hash_entry->ext_id_.id_);
-      if (b.binding_name[0].id.in () == 0)
-        return 0;
-    }
-  if (hash_entry->ext_id_.kind_ != 0)
-    {
-      b.binding_name[0].kind =
-        CORBA::string_dup (hash_entry->ext_id_.kind_);
-      if (b.binding_name[0].kind.in () == 0)
-        return 0;
-    }
-  return 1;
-}
-
-CORBA::Boolean
-TAO_Persistent_Binding_Iterator::next_n (CORBA::ULong how_many,
-                                         CosNaming::BindingList_out bl,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // We perform an allocation before obtaining the lock so that an out
-  // parameter is allocated in case we fail to obtain the lock.
-  ACE_NEW_THROW_EX (bl,
-                    CosNaming::BindingList (0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // Obtain a lock.
-  ACE_GUARD_THROW_EX (ACE_Lock,
-                      ace_mon,
-                      *this->lock_,
-                      CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (0);
-
-  // If there are no more bindings...
-  if (hash_iter_->done ())
-      return 0;
-  else
-    {
-      // Initially assume that iterator has the requested number of
-      // bindings.
-      bl->length (how_many);
-
-      TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry;
-
-      // Iterate and populate the BindingList.
-
-      for (CORBA::ULong i = 0; i < how_many; i++)
-        {
-          hash_iter_->next (hash_entry);
-
-          if (TAO_Persistent_Naming_Context::populate_binding (hash_entry, bl[i]) == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (), 0);
-
-          if (hash_iter_->advance () == 0)
-            {
-              // If no more bindings left, reset length to the actual
-              // number of bindings populated and get out of the loop.
-              bl->length (i + 1);
-              break;
-            }
-        }
-      return 1;
-    }
-}
-
-void
-TAO_Persistent_Binding_Iterator::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  {
-    ACE_GUARD_THROW_EX (ACE_Lock,
-                        ace_mon,
-                        *this->lock_,
-                        CORBA::INTERNAL ());
-    ACE_CHECK;
-
-    PortableServer::POA_var poa =
-      this->_default_POA (ACE_TRY_ENV);
-    ACE_CHECK;
-
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (this,
-                          ACE_TRY_ENV);
-    ACE_CHECK;
-
-    poa->deactivate_object (id.in (),
-                            ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  // Let go of the lock and commit suicide: must have been dynamically allocated
-  //@@ Now that the POA has been fixed to work right, this is no
-  // longer a correct approach to disposing off the servants.  This is
-  // a temporary fix to avoid crashing (but with the memory leak), a
-  // proper fix will be in the next release.
-  //  delete this;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context>;
-template class ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Persistent_Naming_Context>
-#pragma instantiate ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,  TAO_Persistent_Index_IntId>::ITERATOR>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
deleted file mode 100644
index 42145b8e3c1..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Persistent_Naming_Context.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_PERSISTENT_NAMING_CONTEXT_H
-#define TAO_PERSISTENT_NAMING_CONTEXT_H
-
-#include "Naming_Context.h"
-#include "Persistent_Bindings_Map.h"
-
-class TAO_Index;
-
-class TAO_ORBSVCS_Export TAO_Persistent_Naming_Context : public TAO_Naming_Context_Impl
-{
-  // = TITLE
-  //     This class plays a role of a 'ConcreteImplementor' in the
-  //     Bridge pattern architecture of the Naming Service
-  //     implementation.  This implementation of the NamingContext
-  //     uses ACE_Hash_Map_Manager to store name bindings.
-  //
-  // = DESCRIPTION
-  //     Extensive idl method descriptions can be found in Naming_Context.h
-
-public:
-  typedef TAO_Persistent_Bindings_Map::HASH_MAP HASH_MAP;
-
-  // = Initialization and termination methods.
-  TAO_Persistent_Naming_Context (TAO_Naming_Context *interface,
-                                 TAO_Index *context_index,
-                                 PortableServer::POA_ptr poa,
-                                 const char *poa_id,
-                                 size_t default_hash_table_size = ACE_DEFAULT_MAP_SIZE);
-  // Default constructor.  Sets the implementation pointer of the interface.
-
-  TAO_Persistent_Naming_Context (TAO_Naming_Context *interface,
-                                 TAO_Index *context_index,
-                                 PortableServer::POA_ptr poa,
-                                 const char *poa_id,
-                                 HASH_MAP * map,
-                                 ACE_UINT32 *counter);
-  // Constructor for recreation.
-
-  virtual ~TAO_Persistent_Naming_Context (void);
-  // destructor.
-
-  int init (void);
-  // Allocate the map.
-
-  // = CosNaming::NamingContext idl interface methods.
-  virtual void bind (const CosNaming::Name &n,
-                     CORBA::Object_ptr obj,
-                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void rebind (const CosNaming::Name &n,
-                       CORBA::Object_ptr obj,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void bind_context (const CosNaming::Name &n,
-                             CosNaming::NamingContext_ptr nc,
-                             CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void rebind_context (const CosNaming::Name &n,
-                               CosNaming::NamingContext_ptr nc,
-                               CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CORBA::Object_ptr resolve (const CosNaming::Name &n,
-                                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void unbind (const CosNaming::Name &n,
-                       CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CosNaming::NamingContext_ptr new_context (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual CosNaming::NamingContext_ptr bind_new_context (const CosNaming::Name &n,
-                                                         CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void destroy (CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void list (CORBA::ULong how_many,
-                     CosNaming::BindingList_out &bl,
-                     CosNaming::BindingIterator_out &bi,
-                     CORBA::Environment &ACE_TRY_ENV);
-
-  virtual PortableServer::POA_ptr _default_POA (void);
-  // Returns the Default POA of this Servant object
-
-  // = Helper functions.
-  static int populate_binding (TAO_Persistent_Naming_Context::HASH_MAP::ENTRY *hash_entry,
-                               CosNaming::Binding &b);
-  // Helper function used by TAO_Persistent_Naming_Context and
-  // TAO_BindingIterator: populate a binding <b> with info contained
-  // in <hash_entry>.  Return 1 if everything went smoothly, 0 if an
-  // allocation failed.
-
-  ACE_UINT32 *counter_;
-  // Counter used for generation of POA ids for objects created by
-  // this context.
-
-  TAO_Persistent_Bindings_Map context_;
-  // This implementation of <NamingContext> uses <ACE_Hash_Map> for
-  // storage and manipulation of name-object bindings.
-
-protected:
-  // = These are the helper methods used by other methods.
-
-  CosNaming::NamingContext_ptr get_context (const CosNaming::Name &name,
-                                            CORBA::Environment &_env);
-  // This is used by methods that need to resolve a compound name to
-  // get the reference to the target context before performing the
-  // actual operation (e.g. bind, unbind, etc.)  Takes a full name
-  // (including the last component that doesn't need to be resolved)
-  // Returns a pointer to the target context.
-
-  TAO_Index *index_;
-  // A pointer to the index object of this naming service: it keeps
-  // track of all the naming contexts created.  Every time we make a
-  // new context or destroy one, we need to make an entry there.
-  // Also, we get the allocator needed to initialize us from this guy.
-
-  PortableServer::POA_var poa_;
-  // POA we are registered with.
-
-  ACE_CString poa_id_;
-  // ID with which we are registered with <poa_>.
-
-  ACE_Lock *lock_;
-  // Lock to serialize access to the underlying data structure.  This
-  // is a lock adapter that hides the type of lock, which may be a
-  // null lock if the ORB decides threading is not necessary.
-
-  size_t hash_table_size_;
-  // Hash table size.
-
-  TAO_Naming_Context *interface_;
-  // Pointer to the 'Abstraction' in the bridge pattern.  We need this
-  // pointer so that we can clean up the Abstraction as necessary when <destroy>
-  // method is called.  The reason we need to clean up as opposed to
-  // the Abstraction itself is that we, the concrete implementation,  have the *knowledge* of how
-  // to do this, e.g., we may have one servant serving many objects
-  // and would not want to delete the servant in the <destroy> operation.
-};
-
-class TAO_ORBSVCS_Export TAO_Persistent_Binding_Iterator :
-  public POA_CosNaming::BindingIterator
-{
-  // = TITLE
-  //     This class implements the <BindingIterator> interface that is
-  //     part of the <CosNaming> idl module based on the Hash_Map
-  //     implementation for CosNaming::NamingContext.
-  //
-  // = DESCRIPTION
-  //     <TAO_Persistent_Binding_Iterator> constructor expects a pointer to a
-  //     dynamically allocated hash map iterator. Destructor
-  //     deallocates hash map iterator.
-public:
-  // = Intialization and termination methods.
-  TAO_Persistent_Binding_Iterator (TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter,
-                                   PortableServer::POA_ptr poa,
-                                   ACE_Lock *lock);
-  // Constructor.
-
-  ~TAO_Persistent_Binding_Iterator (void);
-  // Destructor.
-
-  // Returns the Default POA of this Servant object
-  virtual PortableServer::POA_ptr _default_POA (CORBA::Environment &env);
-
-  CORBA::Boolean next_one (CosNaming::Binding_out b,
-                           CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns the next binding.  If there are no more
-  // bindings false is returned.
-
-  CORBA::Boolean next_n (CORBA::ULong how_many,
-                         CosNaming::BindingList_out bl,
-                         CORBA::Environment &ACE_TRY_ENV);
-  // This operation returns at most the requested number of bindings.
-
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
-  // This operation destroys the iterator.
-
-private:
-  TAO_Persistent_Naming_Context::HASH_MAP::ITERATOR *hash_iter_;
-  // A pointer to the hash map iterator.
-
-  ACE_Lock *lock_;
-  // Lock passed on from <TAO_NamingContext> to serialize access to the
-  // internal data structure.
-
-  PortableServer::POA_var poa_;
-  // Implement a different _default_POA()
-};
-
-#endif /* TAO_PERSISTENT_NAMING_CONTEXT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/README b/TAO/orbsvcs/orbsvcs/Naming/README
deleted file mode 100644
index ecec41946a3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/README
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id:
-
-CONTENT
-
-This directory contains files implementing CosNaming idl interface
-from CORBA COSS, as well as a few utilities.
-
-
-ARCHITECTURE
-
-The architecture of the Naming Service (i.e., CosNaming)
-implementation follows the Bridge pattern.
-Below is the list of player classes:
-
- * TAO_Naming_Context (in Naming_Context.h) - this class inherits from
-   POA skeleton, and plays the role of 'Abstraction' (aka 'Interface') -
-   it forwards all client requests to a 'ConcreteImplementor' through an
-   'Implementor' pointer.
-
- * TAO_Naming_Context_Impl (in Naming_Context.h) - this is an abstract base class for all
-   concrete implementations of NamingContext functionality (i.e., 'Implementor').
-
- * TAO_Hash_Naming_Context (in Hash_Naming_Context.h) - this
-   class inherits from TAO_Naming_Context_Impl.  It is a
-   'ConcreteImplementor' which uses ACE_Hash_Map_Manager to implement
-   NamingContext functionality.
-
- * A set of classes implementing a persistent version of the Naming
-   Context functionality.  These are the classes in
-   Shared_Hash_Map_T.{h, cpp}, and Persistent* files.
-
-The class structure described above makes it easy to:
-
-1) Create and plug different Naming Service implementations by
-   subclassing TAO_Naming_Context_Impl.
-
-2) Dynamically load an appropriate Naming Service implementation at
-   run-time based on the config file entry by making TAO_Naming_Context_Impl
-   inherit from ACE_Service_Object, etc.
-
-
-PERSISTENCE
-
-The first version of Persistent Naming implementation is here!
-It is based on the memory-mapped files.  Directions on how to use the
-Persistent version of the Naming Service can be found in
-TAO/orbsvcs/Naming_Service/README (by using a command-line option).
-
-The current set of classes implementing persistent version of the
-Naming Service will be restructured for one of the upcoming releases
-(to factor out commonality, get rid of unnecessary generality, etc.),
-at which time more documentation will be available in this README file
-and in the source code.
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp
deleted file mode 100644
index a94b17a1e0a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#ifndef ACE_SHARED_HASH_MAP_T_CPP
-#define ACE_SHARED_HASH_MAP_T_CPP
-
-#include "Shared_Hash_Map_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <class EXT_ID, class INT_ID>
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::ACE_Shared_Hash_Map (ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (alloc)
-{
-}
-
-template <class EXT_ID, class INT_ID>
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::ACE_Shared_Hash_Map (size_t size,
-                                                          ACE_Allocator *alloc)
-  : ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex> (size, alloc)
-{
-}
-
-template <class EXT_ID, class INT_ID> int
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::close (ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-  return this->close_i ();
-}
-
-template <class EXT_ID, class INT_ID> int
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::bind (const EXT_ID &ext_id,
-                                           const INT_ID &int_id,
-                                           ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-  return this->bind_i (ext_id, int_id);
-}
-
-template <class EXT_ID, class INT_ID> int
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::unbind (const EXT_ID &ext_id,
-                                             INT_ID &int_id,
-                                             ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-  return this->unbind_i (ext_id, int_id);
-}
-
-template <class EXT_ID, class INT_ID> int
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::rebind (const EXT_ID &ext_id,
-                                             const INT_ID &int_id,
-                                             EXT_ID &old_ext_id,
-                                             INT_ID &old_int_id,
-                                             ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-  return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id);
-}
-
-template <class EXT_ID, class INT_ID> int
-ACE_Shared_Hash_Map<EXT_ID, INT_ID>::find (const EXT_ID &ext_id,
-                                           INT_ID &int_id,
-                                           ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-  return this->find_i (ext_id, int_id);
-}
-
-#endif /* ACE_SHARED_HASH_MAP_T_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h b/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h
deleted file mode 100644
index f7617026f2e..00000000000
--- a/TAO/orbsvcs/orbsvcs/Naming/Shared_Hash_Map_T.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    cos
-//
-// = FILENAME
-//   Shared_Hash_Map_T.h
-//
-// = AUTHOR
-//    Marina Spivak <marina@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_SHARED_HASH_MAP_T_H
-#define ACE_SHARED_HASH_MAP_T_H
-
-#include "ace/Hash_Map_Manager.h"
-
-template <class EXT_ID, class INT_ID>
-class ACE_Shared_Hash_Map : public ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_Null_Mutex>
-{
-  // = TITLE
-  //     This class serves as a Proxy that ensures our process always
-  //     has the appropriate allocator in place for every operation
-  //     that accesses or updates the Map Manager.
-  //
-  // = DESCRIPTION
-  //     We need this class because otherwise the ALLOCATOR
-  //     pointer will be stored in the Map_Manager that resides within
-  //     shared memory.  Naturally, this will cause horrible problems
-  //     since only the first process to set that pointer will be
-  //     guaranteed the address of the ALLOCATOR is meaningful!
-public:
-  ACE_Shared_Hash_Map (ACE_Allocator *alloc);
-  // Constructor.
-
-  ACE_Shared_Hash_Map (size_t size,
-                       ACE_Allocator *alloc);
-  // Constructor.
-
-  // = The following methods are Proxies to the underlying methods
-  // provided by <ACE_Hash_Map_Manager>.  When they are called, they
-  // acquire the lock, set the allocator to the one specific to this
-  // process, and then call down to perform the intended operation.
-  int bind (const EXT_ID &,
-            const INT_ID &,
-            ACE_Allocator *alloc);
-
-  int unbind (const EXT_ID &,
-              INT_ID &,
-              ACE_Allocator *alloc);
-
-  int rebind (const EXT_ID &,
-              const INT_ID &,
-              EXT_ID &,
-              INT_ID &,
-              ACE_Allocator *alloc);
-
-  int find (const EXT_ID &,
-            INT_ID &,
-            ACE_Allocator *alloc);
-
-  int close (ACE_Allocator *alloc);
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Shared_Hash_Map_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Shared_Hash_Map_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#endif /* ACE_SHARED_HASH_MAP_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Ping.idl b/TAO/orbsvcs/orbsvcs/Ping.idl
index 50be83c601a..96abb0b32de 100644
--- a/TAO/orbsvcs/orbsvcs/Ping.idl
+++ b/TAO/orbsvcs/orbsvcs/Ping.idl
@@ -1,16 +1,10 @@
 // $Id$
 
-#ifndef TAO_PING_IDL
-#define TAO_PING_IDL
-
 interface Ping_Object
 {
   void ping ();
-  // Used for checking for liveness of a server.  When the server
-  // receives this, it should send back a response indicating it is
-  // sill alive.  Depending on the policy specified, a timeout can be
-  // reached where the Implementation Repository will restart the
-  // server.
+  // Used for checking for liveness of a server.  When the server receives
+  // this, it should send back a response indicating it is sill alive.
+  // Depending on the policy specified, a timeout can be reached where the
+  // Implementation Repository will restart the server.
 };
-
-#endif /*TAO_PING_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index ec8ae6a5581..90e1507aec5 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -41,14 +41,14 @@ CosProperty_Hash_Key::CosProperty_Hash_Key (const CosProperty_Hash_Key &src)
 int
 CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const
 {
-  return (ACE_OS::strcmp (this->pname_,
-                          hash_key.pname_) == 0);
+  return ACE_OS::strcmp (this->pname_.in (),
+                         hash_key.pname_.in ()) == 0;
 }
 
 u_long
 CosProperty_Hash_Key::hash (void) const
 {
-  u_long ret = ACE::hash_pjw (this->pname_);
+  u_long ret = ACE::hash_pjw (this->pname_.in ());
 
   return ret;
 }
@@ -57,15 +57,13 @@ CosProperty_Hash_Key::~CosProperty_Hash_Key (void)
 {
 }
 
-//======================================================================
-
 CosProperty_Hash_Value::CosProperty_Hash_Value (void)
 {
 }
 
 CosProperty_Hash_Value::CosProperty_Hash_Value (const CORBA::Any &any,
                                                 const CosPropertyService::PropertyModeType &mode)
-  : pvalue_ (any),
+  : pvalue_ (new CORBA::Any (any)),
     pmode_ (mode)
 {
 }
@@ -98,7 +96,7 @@ TAO_PropertySetFactory::~TAO_PropertySetFactory (void)
 // things.
 
 CosPropertyService::PropertySet_ptr
-TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetFactory::create_propertyset (CORBA::Environment &TAO_IN_ENV)
 {
   // New a TAO_PropertySet.
   TAO_PropertySet *new_set;
@@ -108,7 +106,7 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
   size_t cur_len = this->propertyset_products_.length ();
   this->propertyset_products_.length (cur_len + 1);
   this->propertyset_products_[cur_len] = new_set;
-  return new_set->_this (ACE_TRY_ENV);
+  return new_set->_this (TAO_IN_ENV);
 }
 
 // Allows a client to create a new TAO_PropertySet with specific
@@ -117,50 +115,56 @@ TAO_PropertySetFactory::create_propertyset (CORBA::Environment &ACE_TRY_ENV)
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                         const CosPropertyService::Properties &allowed_properties,
-                                                        CORBA::Environment &ACE_TRY_ENV)
+                                                        CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "create_constrained_propertyset\n"));
   TAO_PropertySet *new_set = 0;
-  CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
       // New a TAO_PropertySet using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (allowed_property_types,
-									    allowed_properties,
-									    ACE_TRY_ENV),
+                                       allowed_properties,
+                                       TAO_TRY_ENV),
                       0);
-      ACE_TRY_CHECK;
-      
+      TAO_CHECK_ENV;
+
       // Successful, store this in the products sequence.
       size_t products_len = this->propertyset_products_.length ();
       this->propertyset_products_.length (products_len + 1);
       this->propertyset_products_[products_len] = new_set;
 
-      // All done.
-      propset_ptr = new_set->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // All done. Return the pointer.
+      return new_set->_this (TAO_IN_ENV);
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  TAO_CATCH (CORBA::UserException, ex)
     {
+      // Should be the Multiple exception raised by the PropertySet
+      // constructor, which got that from define_properties method.
+      // Throw ConstraintNotSupported exception for this, because that
+      // is the only exception that this method can throw.
+      TAO_TRY_ENV.print_exception ("User exception");
+
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported(),
+                        0);
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  TAO_CATCH (CORBA::SystemException, ex)
     {
+      TAO_TRY_ENV.print_exception ("System Exception");
+
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  
-  return propset_ptr;
+  TAO_ENDTRY_RETURN (0);
 }
 
 // Allows a client to create a new TAO_PropertySet with specific
@@ -168,49 +172,51 @@ TAO_PropertySetFactory::create_constrained_propertyset (const CosPropertyService
 
 CosPropertyService::PropertySet_ptr
 TAO_PropertySetFactory::create_initial_propertyset (const CosPropertyService::Properties &initial_properties,
-                                                    CORBA::Environment &ACE_TRY_ENV)
+                                                    CORBA::Environment &TAO_IN_ENV)
 {
   TAO_PropertySet *new_set = 0;
-  CosPropertyService::PropertySet_ptr propset_ptr = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
       // New a TAO_PropertySet.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySet (initial_properties,
-                                       ACE_TRY_ENV),
+                                       TAO_TRY_ENV),
                       0);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Successful, store this in the products sequence.
       size_t products_len = this->propertyset_products_.length ();
       this->propertyset_products_.length (products_len + 1);
       this->propertyset_products_[products_len] = new_set;
 
-      // All done.
-      propset_ptr = new_set->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // All done. Return the pointer.
+      return new_set->_this (TAO_IN_ENV);
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  TAO_CATCH (CosPropertyService::MultipleExceptions, ex)
     {
+      // This is the only user exception the constructor can give, and
+      // this is the only thing I can throw.
+      TAO_TRY_ENV.print_exception ("MultipleExceptions");
+
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  TAO_CATCH (CORBA::SystemException, ex)
     {
+      // Should be some system exceptions.
+      TAO_TRY_ENV.print_exception ("System Exception");
+
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return propset_ptr;
+  TAO_ENDTRY_RETURN (0);
 }
 
 // Destructor.
@@ -234,7 +240,7 @@ TAO_PropertySetDefFactory::TAO_PropertySetDefFactory (void)
 // delete all these New'ed things.
 
 CosPropertyService::PropertySetDef_ptr
-TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &TAO_IN_ENV)
 {
   // New a TAO_PropertySetDef.
   TAO_PropertySetDef *new_set;
@@ -244,31 +250,27 @@ TAO_PropertySetDefFactory::create_propertysetdef (CORBA::Environment &ACE_TRY_EN
   size_t cur_len = this->propertysetdef_products_.length ();
   this->propertysetdef_products_.length (cur_len + 1);
   this->propertysetdef_products_[cur_len] = new_set;
-  
-  CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 
-    new_set->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  return propsetdef_ptr;
+  return new_set->_this (TAO_IN_ENV);
 }
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyService::PropertyTypes &allowed_property_types,
                                                               const CosPropertyService::PropertyDefs &allowed_property_defs,
-                                                              CORBA::Environment &ACE_TRY_ENV)
+                                                              CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "create_constrained_propertysetdef\n"));
+
   TAO_PropertySetDef *new_set = 0;
-  CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
-  
-  ACE_TRY
+
+  TAO_TRY
     {
       // New a TAO_PropertySetDef using these constraints.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (allowed_property_types,
                                           allowed_property_defs,
-                                          ACE_TRY_ENV),
+                                          TAO_TRY_ENV),
                       0);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Successful, store this in the products sequence.
       size_t products_len = this->propertysetdef_products_.length ();
@@ -276,29 +278,35 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
       this->propertysetdef_products_[products_len] = new_set;
 
       // All done. Return the pointer.
-      propsetdef_ptr = new_set->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      return new_set->_this (TAO_IN_ENV);
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  TAO_CATCH (CORBA::UserException, ex)
     {
+      // Should be the Multiple exception raised by the PropertySetDef
+      // constructor, which got that from define_properties_with_modes
+      // method.  Throw ConstraintNotSupported exception for this,
+      // because that is the only exception that this method can
+      // throw.
+      TAO_TRY_ENV.print_exception ("User exception");
+
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_TRY_THROW (CosPropertyService::ConstraintNotSupported());
+      TAO_THROW_RETURN (CosPropertyService::ConstraintNotSupported(),
+                        0);
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  TAO_CATCH (CORBA::SystemException, ex)
     {
+      TAO_TRY_ENV.print_exception ("System Exception");
+
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  
-  return propsetdef_ptr;
+  TAO_ENDTRY_RETURN (0);
 }
 
 // Allows the client to create a new TAO_PropertySetDef with specific
@@ -306,49 +314,884 @@ TAO_PropertySetDefFactory::create_constrained_propertysetdef (const CosPropertyS
 
 CosPropertyService::PropertySetDef_ptr
 TAO_PropertySetDefFactory::create_initial_propertysetdef (const CosPropertyService::PropertyDefs &initial_property_defs,
-                                                          CORBA::Environment &ACE_TRY_ENV)
+                                                          CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "create_initial_propertysetdef\n"));
+
   TAO_PropertySetDef *new_set = 0;
-  CosPropertyService::PropertySetDef_ptr propsetdef_ptr = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
       // New a TAO_PropertySet using these lengths.
       ACE_NEW_RETURN (new_set,
                       TAO_PropertySetDef (initial_property_defs,
-                                          ACE_TRY_ENV),
+                                          TAO_TRY_ENV),
                       0);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Successful, store this in the products sequence.
       size_t products_len = this->propertysetdef_products_.length ();
       this->propertysetdef_products_.length (products_len + 1);
       this->propertysetdef_products_[products_len] = new_set;
 
-      // All done.
-      propsetdef_ptr = new_set->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      // All done. Return the pointer.
+      return new_set->_this (TAO_IN_ENV);
     }
-  ACE_CATCH (CosPropertyService::MultipleExceptions, ex)
+  TAO_CATCH (CosPropertyService::MultipleExceptions, ex)
     {
+      // This is the only user exception the constructor can give, and
+      // this is the only thing I can throw.
+      TAO_TRY_ENV.print_exception ("MultipleExceptions");
+
       // Release memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
     }
-  ACE_CATCH (CORBA::SystemException, ex)
+  TAO_CATCH (CORBA::SystemException, ex)
     {
+      // Should be some system exceptions.
+      TAO_TRY_ENV.print_exception ("System Exception");
+
       // Release the memory.
       delete new_set;
 
       // Throw the exception.
-      ACE_RETHROW;
+      TAO_RETHROW_RETURN (0);
+    }
+  TAO_ENDTRY_RETURN (0);
+}
+
+// Makes default sized hash_table_. All the sequences are set the max
+// length as 0.
+
+TAO_PropertySet::TAO_PropertySet (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "TAO_PropertySet Constructor-Hash_Table created, current_size %d, total_size %d \n",
+              this->hash_table_.current_size (),
+              this->hash_table_.total_size ()));
+}
+
+// Init values that the PropertySetFactory will want to specify. Write
+// the allowed properties in the Hash Table with *fixed-normal* mode.
+// @@ Need to check for duplicate properties and raise exceptions.
+
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
+                                  const CosPropertyService::Properties allowed_properties,
+                                  CORBA::Environment &TAO_IN_ENV)
+  : allowed_property_types_ (allowed_property_types),
+    allowed_property_names_ (allowed_properties.length ())
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "TAO_PropertySet Constructor-Hash_Table:-current_size %d, total_size %d \n",
+              this->hash_table_.current_size (),
+              this->hash_table_.total_size ()));
+
+  // Set the length for the sequence.
+  this->allowed_property_names_.length (allowed_properties.length ());
+
+  ACE_DEBUG ((LM_DEBUG,
+              "Allowed property types size %d\nAllowed properties size%d\n",
+              this->allowed_property_types_.length (),
+              allowed_properties.length ()));
+
+  // Keep the allowed property names in the sequence..
+  for (size_t ni = 0;
+       ni < allowed_properties.length ();
+       ni++)
+    this->allowed_property_names_[ni] =
+      allowed_properties[ni].property_name;
+
+  // Define the allowed properties in the hash table.
+  TAO_TRY
+    {
+      this->define_properties (allowed_properties,
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("TAO_PropertySet-Constructor");
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
+}
+
+#if 0
+  // Keep all the allowed properties in the Hash_Table and keep their
+  // names in the allowed_property_names_.
+  for (size_t pi = 0; pi < allowed_properties.length (); pi++)
+    {
+      // Put it in the hash table.
+      CosProperty_Hash_Key hash_key (allowed_properties[pi].property_name);
+      CosProperty_Hash_Value hash_value (allowed_properties[pi].property_value,
+                                         CosPropertyService::fixed_normal);
+      CosProperty_Hash_Entry_ptr entry_ptr;
+      CosProperty_Hash_Key old_key;
+      CosProperty_Hash_Value old_value;
+
+      int ret = this->hash_table_.bind (hash_key,
+                                        hash_value,
+                                        entry_ptr);
+
+      // @@ Check the return value.
+
+      // Store the property name in the sequence.
+      this->allowed_property_names_[pi] = allowed_properties[pi].property_name;
+    }
+#endif /* 0 */
+
+// TAO_PropertySetDef's constructor needs this, for initializing the
+// allowed properties' sequence withe just the maximum length.
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
+                                  const CORBA::ULong number_of_allowed_properties,
+                                  CORBA::Environment &TAO_IN_ENV)
+  : allowed_property_types_ (allowed_property_types),
+    allowed_property_names_ (number_of_allowed_properties)
+{
+}
+// PropertySetFactory needs this constructor. Store all the initial
+// properies with *normal* modes.
+
+TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties,
+                                  CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "TAO_PropertySet Hash_Table:-current_size %d\ntotal_size %d\nInitialProps %d\n",
+              this->hash_table_.current_size (),
+              this->hash_table_.total_size (),
+              initial_properties.length ()));
+
+  // Define all the initial properties in the Property Set. All take
+  // *normal* modes.
+  TAO_TRY
+    {
+      this->define_properties (initial_properties,
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("TAO_PropertySet-Constructor");
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
+}
+#if 0
+  // Store all the initial properties in the Hash Table with *normal* mode.
+  for (pi = 0; pi < initial_properties.length (); pi++)
+    {
+      // Put it in the hash table.
+      CosProperty_Hash_Key hash_key (initial_properties[pi].property_name);
+      CosProperty_Hash_Value hash_value (initial_properties[pi].property_value,
+                                         CosPropertyService::normal);
+      CosProperty_Hash_Entry_ptr entry_ptr;
+      CosProperty_Hash_Key old_key;
+      CosProperty_Hash_Value old_value;
+
+      int ret = this->hash_table_.bind (hash_key,
+                                        hash_value,
+                                        entry_ptr);
+      // @@ Check the return value.
+    }
+#endif /* 0 */
+
+// Destructor. All sequences will be deleted.
+
+TAO_PropertySet::~TAO_PropertySet (void)
+{
+}
+
+// Function to modify or add a property to the PropertySet alex: Just
+// adds the name value to the set... Doesn't check for Typecode
+// overwriting, duplicate names, void names etc, yet.  @@ Using Normal
+// mode as the default mode of properties, I need to change this based
+// on the Initial set of allowed modes, if there is anything like that
+// set by the client.
+
+void
+TAO_PropertySet::define_property (const char *property_name,
+                                  const CORBA::Any &property_value,
+                                  CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "define_property : property_name %s \n",
+              property_name));
+
+  // Check the name's validity.
+  if (property_name == 0)
+    TAO_THROW (CosPropertyService::InvalidPropertyName());
+
+  // Is this type allowed?
+  if (is_type_allowed (property_value.type ()) != 1)
+    TAO_THROW (CosPropertyService::UnsupportedTypeCode());
+
+  // Is this property allowed?
+  if (is_property_allowed (property_name) != 1)
+    TAO_THROW (CosPropertyService::UnsupportedProperty());
+
+  // Try to bind the property. (*normal* mode is used).
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Value hash_value (property_value,
+                                     CosPropertyService::normal);
+  CosProperty_Hash_Entry_ptr entry_ptr;
+  CosProperty_Hash_Key old_key;
+  CosProperty_Hash_Value old_value;
+
+  int ret = this->hash_table_.bind (hash_key,
+                                    hash_value,
+                                    entry_ptr);
+  switch (ret)
+    {
+    case 0:
+      // Bind succesful.
+      ACE_DEBUG ((LM_DEBUG,
+                  "define_property: Successful\n"));
+      break;
+    case 1:
+      // Property already exists.
+
+      // Is the pointer valid?
+      if (entry_ptr == 0)
+        TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+
+      // If type is not the same, raise exception.
+      if (entry_ptr->int_id_.pvalue_->type () != property_value.type ())
+        TAO_THROW (CosPropertyService::ConflictingProperty());
+
+      // If mode is read only, raise exception.
+      if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
+          (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
+        TAO_THROW (CosPropertyService::ReadOnlyProperty());
+
+      // Use the mode that is already there.
+      hash_value.pmode_ = entry_ptr->int_id_.pmode_;
+
+      // Everything is fine. Overwrite the value.
+      if (this->hash_table_.rebind (hash_key,
+                                    hash_value,
+                                    old_key,
+                                    old_value) > 0)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Property Defined\n"));
+          break;
+        }
+    default:
+      // Error. ret is -1 or rebid returned other than 1.
+      TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+    }
+
+  return;
+}
+
+// Tells whether this type is allowed in this property set or no.
+CORBA::Boolean
+TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
+{
+  ACE_TRACE ("is_type_allowed\n");
+
+  // If the sequence is empty, no constraints.
+  if (this->allowed_property_types_.length () == 0)
+    return 1;
+
+  // Check in the allowed_property_types sequence.
+  CORBA::Boolean ret_val = 0;
+  for (size_t ti = 0;
+       ti < this->allowed_property_types_.length ();
+       ti++)
+    {
+      TAO_TRY
+        {
+          ret_val = ((const CORBA::TypeCode *)this->allowed_property_types_[ti])->equal (type,
+                                                                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          if (ret_val == 1)
+            return 1;
+        }
+      TAO_CATCHANY
+        {
+          TAO_TRY_ENV.print_exception ("TAO_PropertySet::is_type_allowed");
+          return ret_val;
+        }
+      TAO_ENDTRY;
+    }
+
+  // Type not found.
+  return ret_val;
+}
+
+// Tells whether this property is allowed in this property or no.
+CORBA::Boolean
+TAO_PropertySet::is_property_allowed (const char* property_name)
+{
+  ACE_TRACE ("is_property_allowed\n");
+
+  // If  the sequence is empty, no constraints.
+  if (this->allowed_property_names_.length() == 0)
+    return 1;
+
+  // Check in the allowed_property_names.
+  for (size_t ni = 0;
+       ni < this->allowed_property_names_.length ();
+       ni++)
+    if ((const char *) this->allowed_property_names_[ni] == property_name)
+      return 1;
+
+  // Name not found.
+  return 0;
+}
+
+// Defining a sequence of properties
+//
+// Check for overwriting, duplicate names, void names etc and raise
+// appropriate exceptions.
+
+void
+TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties,
+                                    CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "define_properties\n"));
+
+  // Get the length.
+  size_t sequence_length = nproperties.length ();
+
+  // Define multiple exceptions object.
+  CosPropertyService::MultipleExceptions multi_ex;
+
+  for (size_t pi = 0; pi < sequence_length; pi++)
+    {
+      TAO_TRY
+        {
+          // Define this property.
+          this->define_property (nproperties [pi].property_name.in (),
+                                 nproperties [pi].property_value,
+                                 TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCH (CosPropertyService::InvalidPropertyName, ex)
+        {
+          TAO_TRY_ENV.print_exception ("InvalidPropertyName");
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::invalid_property_name;
+          multi_ex.exceptions[len].failing_property_name =
+            nproperties[pi].property_name;
+        }
+      TAO_CATCH (CosPropertyService::ConflictingProperty, ex)
+        {
+          TAO_TRY_ENV.print_exception ("ConflictingProperty");
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::conflicting_property;
+          multi_ex.exceptions[len].failing_property_name =
+            nproperties[pi].property_name;
+        }
+      TAO_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+        {
+          TAO_TRY_ENV.print_exception ("ReadOnlyProperty");
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::read_only_property;
+          multi_ex.exceptions[len].failing_property_name =
+            nproperties[pi].property_name;
+        }
+      TAO_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+        {
+          TAO_TRY_ENV.print_exception ("UnsupportedTypeCode");
+          size_t len = multi_ex.exceptions.length ();
+          multi_ex.exceptions.length (len + 1);
+          multi_ex.exceptions[len].reason =
+            CosPropertyService::unsupported_type_code;
+          multi_ex.exceptions[len].failing_property_name =
+            nproperties[pi].property_name;
+        }
+       TAO_CATCH (CosPropertyService::UnsupportedProperty, ex)
+         {
+           TAO_TRY_ENV.print_exception ("UnsupportedProperty");
+           size_t len = multi_ex.exceptions.length ();
+           multi_ex.exceptions.length (len + 1);
+           multi_ex.exceptions[len].reason =
+             CosPropertyService::unsupported_property;
+           multi_ex.exceptions[len].failing_property_name =
+             nproperties[pi].property_name;
+         }
+       TAO_CATCH (CORBA::SystemException, sysex)
+         {
+           // Print it and throw it again.
+           TAO_TRY_ENV.print_exception ("Unknown Exception");
+           TAO_RETHROW;
+         }
+       TAO_ENDTRY;
+    }
+
+  // Raise the multi exception if needed.
+  if (multi_ex.exceptions.length () > 0)
+    TAO_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+}
+
+// Returns the current number of properties associated with this
+// PropertySet.
+
+CORBA::ULong
+TAO_PropertySet::get_number_of_properties ( CORBA::Environment &TAO_IN_ENV)
+{
+  return this->hash_table_.current_size ();
+}
+
+//  Returns all of the property names currently defined in the
+//  PropertySet. If the PropertySet contains more than how_many
+//  property names, then the remaining property names are put into the
+//  PropertyNamesIterator.
+
+void
+TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
+                                         CosPropertyService::PropertyNames_out property_names,
+                                         CosPropertyService::PropertyNamesIterator_out rest,
+                                         CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "get_all_property_names\n"));
+
+  size_t num_of_properties =
+    this->get_number_of_properties (TAO_IN_ENV);
+
+  if (num_of_properties == 0)
+    // Nothing to do.
+    return;
+
+  // Set the length of the property_names appropriately.
+  CORBA::ULong sequence_length = 0;
+
+  if (how_many > 0)
+    {
+      ACE_NEW (property_names,
+               CosPropertyService::PropertyNames);
+      if (how_many >= num_of_properties)
+        sequence_length = num_of_properties;
+      else
+        sequence_length = how_many;
+      property_names->length (sequence_length);
+    }
+
+  // Iterate thru names and put them in the property_names.
+
+  CosProperty_Hash_Entry_ptr entry_ptr;
+  CosProperty_Hash_Iterator iterator (this->hash_table_);
+
+  for (size_t ni = 0;
+       ni < sequence_length;
+       ni++, iterator.advance ())
+    if (iterator.next (entry_ptr) != 0)
+      property_names [ni] =
+        CORBA::string_dup (entry_ptr->ext_id_.pname_.in ());
+
+  // If there are some more properties, put them in the
+  // iterator. How?? Make a new PropertSet and use that to create
+  // propertyNames Iterator.
+
+  if (num_of_properties > how_many)
+    {
+      TAO_PropertySet *property_set;
+
+      ACE_NEW (property_set, TAO_PropertySet);
+
+      for (size_t i = how_many;
+           i < num_of_properties;
+           i++, iterator.advance ())
+        if (iterator.next (entry_ptr) != 0)
+          if (property_set->hash_table_.bind (entry_ptr->ext_id_,
+                                              entry_ptr->int_id_) < 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "Err: get_all_property_names\n"));
+
+      // Make the NamesIterator out of this TAO_PropertySet.
+      TAO_PropertyNamesIterator *names_iterator;
+      ACE_NEW (names_iterator, TAO_PropertyNamesIterator (*property_set));
+
+      rest = CosPropertyService::PropertyNamesIterator::_duplicate (names_iterator->_this (TAO_IN_ENV));
+    }
+}
+
+// Returns the value of a property in the PropertySet.
+
+CORBA::Any *
+TAO_PropertySet::get_property_value (const char *property_name,
+                                     CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "get_property_value\n"));
+
+  // Check the name's validity.
+  if (property_name == 0)
+    TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
+                      0);
+
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Value hash_value;
+
+  if (this->hash_table_.find (hash_key, hash_value) != 0)
+    TAO_THROW_RETURN (CosPropertyService::PropertyNotFound(),
+                      0);
+  else
+    ACE_DEBUG ((LM_DEBUG,
+                "Find succeeded \n"));
+
+  // Dump the value got.
+  CORBA::Any::dump (hash_value.pvalue_.in ());
+
+  // Return the pointer.
+  return hash_value.pvalue_._retn ();
+}
+
+// Returns the values of the properties listed in property_names. When
+// the boolean flag is true, the Properties parameter contains valid
+// values for all requested property names. If false, then all
+// properties with a value of type tk_void may have failed due to
+// PropertyNotFound or InvalidPropertyName.
+
+CORBA::Boolean
+TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
+                                 CosPropertyService::Properties_out nproperties,
+                                 CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "get_properties\n"));
+
+  size_t n = property_names.length ();
+
+  if (n == 0)
+    return 0;
+
+  CORBA::Any_ptr any_ptr = 0;
+
+  ACE_NEW_RETURN (nproperties,
+                  CosPropertyService::Properties (n),
+                  0);
+
+  nproperties->length (n);
+
+  CORBA::Boolean ret_val = 1;
+
+  for (size_t i = 0; i < n; i++)
+    {
+      TAO_IN_ENV.clear ();
+      any_ptr = get_property_value (property_names [i],
+                                    TAO_IN_ENV);
+
+      if (any_ptr != 0)
+        {
+          // Property is found.
+          nproperties [i].property_name = property_names [i];
+          nproperties [i].property_value = *any_ptr;
+          CORBA::Any::dump (nproperties [i].property_value);
+        }
+      else
+        {
+          // Invalid name. Ret value is False.
+          ret_val = 0;
+
+          // Assign void type to this name in the out parameter.
+          nproperties [i].property_name =
+            property_names [i];
+
+          // @@ Make an any value with tk_void type. Using replace
+          // method, <<= operator doesnot exist yet for this.
+          nproperties [i].property_value.replace (CORBA::_tc_void,
+                                                  0,
+                                                  0,
+                                                  TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
+        }
+    }
+
+  return ret_val;
+}
+
+void
+TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
+                                     CosPropertyService::Properties_out nproperties,
+                                     CosPropertyService::PropertiesIterator_out rest,
+                                     CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "get_all_properties\n"));
+
+  size_t num_of_properties =
+    hash_table_.current_size ();
+
+  if (num_of_properties == 0)
+    return;
+
+  // Alloc memory for nproperties if how_many > 0.
+  CORBA::ULong sequence_length = 0;
+
+  if (how_many > 0)
+    {
+      ACE_NEW (nproperties,
+               CosPropertyService::Properties);
+      if (how_many >= num_of_properties)
+        sequence_length = num_of_properties;
+      else
+        sequence_length = how_many;
+      nproperties->length (sequence_length);
+    }
+  ACE_DEBUG ((LM_DEBUG,
+              "PropertySet::get_all_properties -seq-length :%d\n",
+              sequence_length));
+
+  // Prepare an iterator and iterate thru the PropertySet. Retrive the
+  // values.
+  CosProperty_Hash_Iterator iterator (this->hash_table_);
+  CosProperty_Hash_Entry_ptr entry_ptr = 0;
+
+  for (CORBA::ULong i = 0;
+       i < sequence_length;
+       i++, iterator.advance ())
+    if (iterator.next (entry_ptr) != 0)
+      {
+        nproperties[i].property_name =
+          CORBA::string_dup (entry_ptr->ext_id_.pname_.in ());
+        nproperties[i].property_value =
+          entry_ptr->int_id_.pvalue_.in ();
+      }
+
+  // If there are more properties, put them in the PropertiesIterator.
+  // Make a new TAO_PropertySet and use that to create an Properties
+  // iterator.  put that in a iterator and assign that to the out
+  // paramerter.
+
+  if (num_of_properties > how_many)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "DB:TAO_PropertySet-Creating PropertySet iterator\n"));
+      TAO_PropertySet *prop_set;
+
+      ACE_NEW (prop_set, TAO_PropertySet);
+
+      for (size_t i = sequence_length;
+           i < num_of_properties;
+           i++, iterator.advance ())
+        if (iterator.next (entry_ptr) != 0
+            && prop_set->hash_table_.bind (entry_ptr->ext_id_,
+                                           entry_ptr->int_id_) < 0)
+          ACE_DEBUG ((LM_DEBUG, "Err: get_all_properties\n"));
+
+      ACE_DEBUG ((LM_DEBUG,
+                  "DB:New PropertySet created--size %d\n",
+                  prop_set->get_number_of_properties (TAO_IN_ENV)));
+
+      // Make the iterator out of the new TAO_Propset.
+      TAO_PropertiesIterator *iterator = 0;
+      ACE_NEW (iterator,
+               TAO_PropertiesIterator (*prop_set));
+
+      rest = CosPropertyService::PropertiesIterator::_duplicate (iterator->_this (TAO_IN_ENV));
+      TAO_CHECK_ENV_PRINT_RETURN_VOID (TAO_IN_ENV,
+                                       "CosPropertyService::PropertiesIterator::_duplicate");
+
+      ACE_DEBUG ((LM_DEBUG, "DB:TAO_PropSet::get_all_properties-Done\n"));
+    }
+}
+
+// Deletes the specified property if it exists from a PropertySet.
+
+void
+TAO_PropertySet::delete_property (const char *property_name,
+                                  CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "delete_property\n"));
+
+  // Check the name's validity.
+  if (property_name == 0)
+    TAO_THROW (CosPropertyService::InvalidPropertyName());
+
+  CosProperty_Hash_Key hash_key (property_name);
+  CosProperty_Hash_Entry_ptr entry_ptr = 0;
+
+  // Get the entry_ptr and delete it.
+  if (this->hash_table_.find (hash_key,
+                              entry_ptr) < 0)
+    TAO_THROW (CosPropertyService::PropertyNotFound());
+
+  ACE_DEBUG ((LM_DEBUG, "Property found\n"));
+
+  // If property is fixed, then raise exception.
+  if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal)
+      || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
+    TAO_THROW (CosPropertyService::FixedProperty());
+
+  // Unbind this property.
+  if (this->hash_table_.unbind (entry_ptr) != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Unbind failed\n"));
+      TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+    }
+
+  // @@ Purify this and check. Deallocate the memory.
+  // delete entry_ptr;
+
+  ACE_DEBUG ((LM_DEBUG, "delete_property done\n"));
+
+  return;
+}
+
+// Deletes the properties defined in the property_names
+// parameter. This is a batch operation that returns the
+// MultipleExceptions exception if any delete failed.
+
+void
+TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names,
+                                    CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "delete_properties\n"));
+
+  // Get the length.
+  size_t sequence_length = property_names.length ();
+
+  // Declare multiple exceptions' objecct.
+  CosPropertyService::MultipleExceptions *multi_ex = 0;
+  ACE_NEW (multi_ex,
+           CosPropertyService::MultipleExceptions);
+
+  for (size_t pi = 0; pi < sequence_length; pi++)
+    {
+      TAO_TRY
+        {
+          // Delete this property.
+          this->delete_property (property_names[pi],
+                                 TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCH (CosPropertyService::InvalidPropertyName, ex)
+        {
+          TAO_TRY_ENV.print_exception ("InvalidPropertyName");
+
+          // Put this exception in the multiple exception.
+          size_t len = multi_ex->exceptions.length ();
+          multi_ex->exceptions.length (len + 1);
+          multi_ex->exceptions[len].reason =
+            CosPropertyService::invalid_property_name;
+          multi_ex->exceptions[len].failing_property_name =
+            property_names[pi];
+        }
+      TAO_CATCH (CosPropertyService::PropertyNotFound, ex)
+        {
+          TAO_TRY_ENV.print_exception ("PropertyNotFound");
+
+          // Put this exception in the multiple exception.
+          size_t len = multi_ex->exceptions.length ();
+          multi_ex->exceptions.length (len + 1);
+          multi_ex->exceptions[len].reason =
+            CosPropertyService::property_not_found;
+          multi_ex->exceptions[len].failing_property_name =
+            property_names[pi];
+        }
+      TAO_CATCH (CosPropertyService::FixedProperty, ex)
+        {
+          TAO_TRY_ENV.print_exception ("FixedProperty");
+
+          // Put this exception in the multiple exception.
+          size_t len = multi_ex->exceptions.length ();
+          multi_ex->exceptions.length (len + 1);
+          multi_ex->exceptions[len].reason =
+            CosPropertyService::fixed_property;
+          multi_ex->exceptions[len].failing_property_name =
+            property_names[pi];
+        }
+      TAO_CATCH (CORBA::SystemException, sysex)
+        {
+          TAO_TRY_ENV.print_exception ("SystemException");
+
+          // We cant afford to get this. Throw this.
+          TAO_RETHROW;
+        }
+      TAO_ENDTRY;
+    }
+
+  // Raise the multiple exceptions if there are any.
+  if (multi_ex->exceptions.length () > 0)
+    TAO_THROW (CosPropertyService::MultipleExceptions (*multi_ex));
+
+  ACE_DEBUG ((LM_DEBUG, "delete_properties done\n"));
+
+  return;
+}
+
+// Delete all the properties in the current ProperySet : Delete the
+// properties one by
+// one.
+
+CORBA::Boolean
+TAO_PropertySet::delete_all_properties (CORBA::Environment &TAO_IN_ENV)
+{
+  TAO_TRY
+    {
+      // Get all the property names in a names' sequence.
+      CosPropertyService::PropertyNames_ptr names_ptr = 0;
+      CosPropertyService::PropertyNames_out names_out (names_ptr);
+      CosPropertyService::PropertyNames_var names;
+
+      CosPropertyService::PropertyNamesIterator_ptr iter_ptr = 0;
+      CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
+      CosPropertyService::PropertyNamesIterator_var iter;
+
+      CORBA::ULong size = this->get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->get_all_property_names (size,
+                                    names_out,
+                                    iter_out,
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Get the out values on to the var varibles.
+      names = names_out.ptr ();
+      iter = iter_out.ptr ();
+
+      // Delete all these properties.
+      this->delete_properties (names.in (),
+                               TAO_TRY_ENV);
+
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      // All properties didnt get deleted.
+      TAO_TRY_ENV.print_exception ("delete_all_properties");
+
+      return 0;
+    }
+  TAO_ENDTRY;
+
+  // All properties deleted.
+  return 1;
+}
+
+// Returns TRUE if the property is defined in the PropertySet.
+
+CORBA::Boolean
+TAO_PropertySet::is_property_defined (const char *property_name,  CORBA::Environment &TAO_IN_ENV)
+{
+  ACE_DEBUG ((LM_DEBUG, "is_property_defined\n"));
+
+  CosProperty_Hash_Key hash_key (property_name);
+
+  if (this->hash_table_.find (hash_key) == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                "find successfull\n"));
+      return 1;
+    }
+  else
+    {
+      ACE_DEBUG ((LM_ERROR,
+                  "find failed\n"));
+      return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-  
-  return propsetdef_ptr;
 }
 
 // Makes default sized hash_table_.
@@ -361,42 +1204,68 @@ TAO_PropertySetDef::TAO_PropertySetDef (void)
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyTypes allowed_property_types,
                                         const CosPropertyService::PropertyDefs allowed_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
-  : TAO_PropertySet(allowed_property_types,
-                    allowed_property_defs.length (),
-                    ACE_TRY_ENV)
+                                        CORBA::Environment &TAO_IN_ENV)
+  : TAO_PropertySet (allowed_property_types,
+                     allowed_property_defs.length (),
+                     TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "TAO_PropertySetDef Hash_Table:-current_size %d\ntotal_size %d\n",
+              this->hash_table_.current_size (),
+              this->hash_table_.total_size ()));
+
   // Set the length of the allowed property names.
   this->allowed_property_names_.length (allowed_property_defs.length ());
 
+  ACE_DEBUG ((LM_DEBUG,
+              "Allowed property types size %d\nAllowed propertydefs' names size%d\n",
+              this->allowed_property_types_.length (),
+              this->allowed_property_names_.length ()));
+
   // Copy the allowed properties' names to the sequence.
   for (size_t ni = 0; ni < allowed_property_defs.length (); ni++)
     this->allowed_property_names_[ni] =
       allowed_property_defs[ni].property_name;
-  
+
   // Define the allowed properties in the hash table.
-  ACE_TRY
+  TAO_TRY
     {
       this->define_properties_with_modes (allowed_property_defs,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("TAO_PropertySetDef");
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 // Constructor that the factory uses.
 
 TAO_PropertySetDef::TAO_PropertySetDef (const CosPropertyService::PropertyDefs initial_property_defs,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &TAO_IN_ENV)
 {
-  this->define_properties_with_modes (initial_property_defs,
-                                      ACE_TRY_ENV);
-  ACE_CHECK;
+  ACE_DEBUG ((LM_DEBUG,
+              "TAO_PropertySetDef Hash_Table:-current_size %d\ntotal_size %d\nInitialProps %d\n",
+              this->hash_table_.current_size (),
+              this->hash_table_.total_size (),
+              initial_property_defs.length ()));
+
+  // Define the initial properties in this property set def.
+  TAO_TRY
+    {
+      this->define_properties_with_modes (initial_property_defs,
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("TAO_PropertySetDef-Constructor");
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 // Destructor.
@@ -440,72 +1309,82 @@ void
 TAO_PropertySetDef::define_property_with_mode (const char *property_name,
                                                const CORBA::Any &property_value,
                                                CosPropertyService::PropertyModeType property_mode,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG,
+              "define_property with mode : property_name %s \n",
+              property_name));
+
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    TAO_THROW (CosPropertyService::InvalidPropertyName());
 
   // Is this type allowed?
   if (is_type_allowed (property_value.type ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
+    TAO_THROW (CosPropertyService::UnsupportedTypeCode());
 
   // Is this property allowed?
   if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
-  
+    TAO_THROW (CosPropertyService::UnsupportedProperty());
+
   // Is this a valid mode.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    TAO_THROW (CosPropertyService::UnsupportedMode());
 
   // Try to bind the Property.
   CosProperty_Hash_Key hash_key (property_name);
   CosProperty_Hash_Value hash_value (property_value,
                                      property_mode);
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
+  CosProperty_Hash_Entry_ptr entry_ptr;
+
 
-  
   int ret = this->hash_table_.bind (hash_key, hash_value, entry_ptr);
 
-  //CosProperty_Hash_Value old_value;
-  //CosProperty_Hash_Key old_key;
+  CosProperty_Hash_Value old_value;
+  CosProperty_Hash_Key old_key;
 
   switch (ret)
     {
     case 0:
+      // Bind successful.
+      ACE_DEBUG ((LM_DEBUG,
+                  "define_property_with_mode successful\n"));
       break;
     case 1:
       // Property name exists.
-      
+
       // Is the pointer valid.
       if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
-      
+        TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+
       // If type is not the same, raise exception.
-      if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
-        ACE_THROW (CosPropertyService::ConflictingProperty());
+      if (entry_ptr->int_id_.pvalue_->type () != property_value.type ())
+        TAO_THROW (CosPropertyService::ConflictingProperty());
 
       // If mode is read only, raise exception.
       if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
           (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
+        TAO_THROW (CosPropertyService::ReadOnlyProperty());
 
       // If current mode is fixed_normal, but the new mode is not
       // fixed, reject it.
       if ((entry_ptr->int_id_.pmode_ ==
            CosPropertyService::fixed_normal) &&
           (property_mode < CosPropertyService::fixed_normal))
-        ACE_THROW (CosPropertyService::UnsupportedMode());
-      
+        TAO_THROW (CosPropertyService::UnsupportedMode());
+
       // Everything is fine. Overwrite the value.
       if (this->hash_table_.rebind (hash_key,
-                                    hash_value) > 0)
+                                    hash_value,
+                                    old_key,
+                                    old_value) > 0)
         {
+          ACE_DEBUG ((LM_DEBUG, "Property Defined\n"));
           break;
         }
     default:
       // Error. ret is -1 or rebind returned other than 1.
-      ACE_THROW (CORBA::UNKNOWN ());
+      TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
     }
 
   return;
@@ -515,8 +1394,10 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
 // MultipleExceptions sequence and raise that.
 void
 TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::PropertyDefs &property_defs,
-                                                  CORBA::Environment &ACE_TRY_ENV)
+                                                  CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "define_properties_with_modes\n"));
+
   // Get the length.
   size_t sequence_length = property_defs.length ();
 
@@ -526,17 +1407,18 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
   // Try defining the propdefs one by one.
   for (size_t i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      TAO_TRY
         {
           // Define the property.
           this->define_property_with_mode (property_defs[i].property_name,
                                            property_defs[i].property_value,
                                            property_defs[i].property_mode,
-                                           ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      TAO_CATCH (CosPropertyService::InvalidPropertyName, ex)
         {
+          TAO_TRY_ENV.print_exception ("InvalidPropertyName");
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
           multi_ex.exceptions[len].reason =
@@ -544,8 +1426,9 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
+      TAO_CATCH (CosPropertyService::ConflictingProperty, ex)
         {
+          TAO_TRY_ENV.print_exception ("ConflictingProperty");
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
           multi_ex.exceptions[len].reason =
@@ -553,8 +1436,9 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
+      TAO_CATCH (CosPropertyService::ReadOnlyProperty, ex)
         {
+          TAO_TRY_ENV.print_exception ("ReadOnlyProperty");
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
           multi_ex.exceptions[len].reason =
@@ -562,8 +1446,9 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
+      TAO_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
         {
+          TAO_TRY_ENV.print_exception ("UnsupportedTypeCode");
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
           multi_ex.exceptions[len].reason =
@@ -571,8 +1456,9 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
           multi_ex.exceptions[len].failing_property_name =
             property_defs[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
+       TAO_CATCH (CosPropertyService::UnsupportedProperty, ex)
          {
+           TAO_TRY_ENV.print_exception ("UnsupportedProperty");
            size_t len = multi_ex.exceptions.length ();
            multi_ex.exceptions.length (len + 1);
            multi_ex.exceptions[len].reason =
@@ -580,40 +1466,43 @@ TAO_PropertySetDef::define_properties_with_modes (const CosPropertyService::Prop
            multi_ex.exceptions[len].failing_property_name =
              property_defs[i].property_name;
          }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
-        {
-          ACE_TRY_ENV.print_exception ("UnsupportedMode");
+        TAO_CATCH (CosPropertyService::UnsupportedMode, ex)
+          {
+            TAO_TRY_ENV.print_exception ("UnsupportedMode");
             size_t len = multi_ex.exceptions.length ();
             multi_ex.exceptions.length (len + 1);
             multi_ex.exceptions[len].reason =
               CosPropertyService::unsupported_mode;
             multi_ex.exceptions[len].failing_property_name =
               property_defs[i].property_name;
-        }
-      ACE_CATCH (CORBA::SystemException, sysex)
-        {
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
+          }
+        TAO_CATCH (CORBA::SystemException, sysex)
+          {
+            // Print it and throw it again.
+            TAO_TRY_ENV.print_exception ("SystemException");
+            TAO_RETHROW;
+          }
+        TAO_ENDTRY;
     }
 
   // Raise the multi exception if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    TAO_THROW (CosPropertyService::MultipleExceptions (multi_ex));
 }
 
 // Get the mode of a property. Raises InvalidpropertyName,
 // PropertyNotFound exceptions.
 CosPropertyService::PropertyModeType
 TAO_PropertySetDef::get_property_mode (const char *property_name,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "get_property_mode\n"));
+
   // Check for the name's validity.
   if (property_name == 0)
-    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
+    TAO_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
                       CosPropertyService::undefined);
-  
+
   // Find the property in the hash table.
   CosProperty_Hash_Key hash_key (property_name);
   CosProperty_Hash_Value hash_value;
@@ -627,7 +1516,7 @@ TAO_PropertySetDef::get_property_mode (const char *property_name,
       return hash_value.pmode_;
     default:
       // Error or property is not found.
-      ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
+      TAO_THROW_RETURN (CosPropertyService::PropertyNotFound(),
                         CosPropertyService::undefined);
     }
 }
@@ -642,20 +1531,18 @@ TAO_PropertySetDef::get_property_mode (const char *property_name,
 CORBA::Boolean
 TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames &property_names,
                                         CosPropertyService::PropertyModes_out property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &)
 {
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (property_modes,
-                  CosPropertyService::PropertyModes,
-                  1);
-
-  // Validate the length of names sequence.
+  // Get the length of names sequence.
   size_t sequence_length = property_names.length ();
 
   if (sequence_length == 0)
     return 1;
 
-  // Set the length of the sequence.
+  // Allocate memory for the out parameter.
+  ACE_NEW_RETURN (property_modes,
+                  CosPropertyService::PropertyModes (sequence_length),
+                  1);
   property_modes->length (sequence_length);
 
   // Intialize thre return value.
@@ -665,19 +1552,22 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
   CosPropertyService::PropertyModeType mode;
   for (size_t i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      TAO_TRY
         {
           // Invoke get_property_mode for this name.
           mode = this->get_property_mode (property_names[i],
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Store the mode in the out sequence.
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = mode;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
+          // DEBUG.
+          TAO_TRY_ENV.print_exception ("Some exception");
+
           // Return value becomes false.
           ret = 1;
 
@@ -686,8 +1576,7 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
           property_modes[i].property_name = property_names[i];
           property_modes[i].property_mode = CosPropertyService::undefined;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
+      TAO_ENDTRY;
     }
 
   return ret;
@@ -701,24 +1590,26 @@ TAO_PropertySetDef::get_property_modes (const CosPropertyService::PropertyNames
 void
 TAO_PropertySetDef::set_property_mode (const char *property_name,
                                        CosPropertyService::PropertyModeType property_mode,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "set-property_mode"));
+
   // Check the names validity.
   if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
+    TAO_THROW (CosPropertyService::InvalidPropertyName());
 
   // Trying to set to undefined mode is not allowed.
   if (property_mode == CosPropertyService::undefined)
-    ACE_THROW (CosPropertyService::UnsupportedMode());
+    TAO_THROW (CosPropertyService::UnsupportedMode());
 
   // Find the property from the Hash Table.
   CosProperty_Hash_Key hash_key (property_name);
   CosProperty_Hash_Value hash_value;
 
   int ret = this->hash_table_.find (hash_key, hash_value);
-  
-  //CosProperty_Hash_Value old_value;
-  //CosProperty_Hash_Key old_key;
+
+  CosProperty_Hash_Value old_value;
+  CosProperty_Hash_Key old_key;
 
   // Act acc to the ret value.
   switch (ret)
@@ -737,50 +1628,63 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
           // Set the new mode and update the hash table.
           hash_value.pmode_ = property_mode;
           if (this->hash_table_.rebind (hash_key,
-                                        hash_value) != 1)
+                                        hash_value,
+                                        old_key,
+                                        old_value) != 1)
             // Return values 0 and -1 are not possible.
-            ACE_THROW (CORBA::UNKNOWN ());
+            TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+          else
+            ACE_DEBUG ((LM_DEBUG,
+                        "Mode set succesful\n"));
           break;
-          
+
         case CosPropertyService::read_only:
           // Read_only to fixed read only alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            TAO_THROW (CosPropertyService::UnsupportedMode());
           else
             {
               // Change the mode and update hash table.
               hash_value.pmode_ = property_mode;
               if (this->hash_table_.rebind (hash_key,
-                                            hash_value) != 1)
+                                            hash_value,
+                                            old_key,
+                                            old_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+              else
+                ACE_DEBUG ((LM_DEBUG, "Mode set successful\n"));
             }
           break;
 
         case CosPropertyService::fixed_normal:
           // Fixed_normal to fixed_readonly alone is possible.
           if (property_mode != CosPropertyService::fixed_readonly)
-            ACE_THROW (CosPropertyService::UnsupportedMode());
+            TAO_THROW (CosPropertyService::UnsupportedMode());
           else
             {
               // Change the mode and update the hash table.
               hash_value.pmode_ = property_mode;
               if (this->hash_table_.rebind (hash_key,
+                                            hash_value,
+                                            hash_key,
                                             hash_value) != 1)
                 // Return values 0 and -1 are not possible.
-                ACE_THROW (CORBA::UNKNOWN ());
+                TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
+              else
+                ACE_DEBUG ((LM_DEBUG, "Mode set successful\n"));
             }
           break;
 
         default:
           // Fixed_readonly to any mode is not possible.
-          ACE_THROW (CosPropertyService::UnsupportedMode());
+          TAO_THROW (CosPropertyService::UnsupportedMode());
         }
       break;
     case -1:
     default:
       // Error or property not found in the Hash Table.
-      ACE_THROW (CosPropertyService::PropertyNotFound());
+      TAO_THROW (CosPropertyService::PropertyNotFound());
     }
 }
 
@@ -791,8 +1695,10 @@ TAO_PropertySetDef::set_property_mode (const char *property_name,
 
 void
 TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes &property_modes,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &TAO_IN_ENV)
 {
+  ACE_DEBUG ((LM_DEBUG, "set_property_modes\n"));
+
   // Get the length of the sequence.
   size_t sequence_length = property_modes.length ();
 
@@ -802,15 +1708,18 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
   // Set  modes one by one.
   for (size_t i = 0; i < sequence_length; i++)
     {
-      ACE_TRY
+      TAO_TRY
         {
           this->set_property_mode (property_modes[i].property_name,
                                    property_modes[i].property_mode,
-                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
+      TAO_CATCH (CosPropertyService::PropertyNotFound, ex)
         {
+          // DEBUG.
+          TAO_TRY_ENV.print_exception ("PropertyNotFound");
+
           // Put this exception in the multiple exception.
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -819,8 +1728,11 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
+      TAO_CATCH (CosPropertyService::InvalidPropertyName, ex)
         {
+          // DEBUG.
+          TAO_TRY_ENV.print_exception ("InvalidPropertyName");
+
           // Put this exception in the multiple exception.
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -829,8 +1741,11 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CosPropertyService::UnsupportedMode, ex)
+      TAO_CATCH (CosPropertyService::UnsupportedMode, ex)
         {
+          // DEBUG.
+          TAO_TRY_ENV.print_exception ("UnsupportedMode");
+
           // Put this exception in the multiple exception.
           size_t len = multi_ex.exceptions.length ();
           multi_ex.exceptions.length (len + 1);
@@ -839,17 +1754,23 @@ TAO_PropertySetDef::set_property_modes (const CosPropertyService::PropertyModes
           multi_ex.exceptions[len].failing_property_name =
             property_modes[i].property_name;
         }
-      ACE_CATCH (CORBA::SystemException, systex)
+      TAO_CATCH (CORBA::SystemException, systex)
         {
-          ACE_RETHROW;
+          // DEBUG.
+          TAO_TRY_ENV.print_exception ("Unknown");
+
+          // We cant afford to get this. Throw this.
+          TAO_RETHROW;
         }
-      ACE_ENDTRY;
-      ACE_CHECK;
+      TAO_ENDTRY;
     }
 
   // Raise the multi_ex, if needed.
   if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    {
+      ACE_DEBUG ((LM_DEBUG, "set_property_modes:- Raising multi_ex\n"));
+      TAO_THROW (CosPropertyService::MultipleExceptions (multi_ex));
+    }
 }
 
 // Constructor. Construct the iterator from the PropertySet object.
@@ -883,12 +1804,12 @@ CORBA::Boolean
 TAO_PropertyNamesIterator::next_one (CORBA::String_out property_name,
                                      CORBA::Environment &)
 {
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
+  CosProperty_Hash_Entry_ptr entry_ptr;
 
   if (this->iterator_.next (entry_ptr) != 0)
     {
       property_name =
-        CORBA::string_dup (entry_ptr->ext_id_.pname_);
+        CORBA::string_dup (entry_ptr->ext_id_.pname_.in ());
       this->iterator_.advance ();
       return 1;
     }
@@ -901,52 +1822,32 @@ TAO_PropertyNamesIterator::next_n (CORBA::ULong how_many,
                                    CosPropertyService::PropertyNames_out property_names,
                                    CORBA::Environment &)
 {
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (property_names,
-                  CosPropertyService::PropertyNames,
-                  0);
-
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
+  CosProperty_Hash_Entry_ptr entry_ptr = 0;
 
   if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
     return 0;
 
+  ACE_NEW_RETURN (property_names,
+                  CosPropertyService::PropertyNames,
+                  0);
+
   size_t size = this->iterator_.map ().current_size ();
-  
-  size_t len = 0;
-  if (how_many <= size)
-    len = how_many;
-  else
-    len = size;
-  property_names->length (len);
+
+  property_names->length (how_many <= size ? how_many : size);
 
   for (size_t ni = 0;
        ni < property_names->length ();
        ni++, this->iterator_.advance ())
     if (this->iterator_.next (entry_ptr) != 0)
       property_names [ni] =
-        CORBA::string_dup (entry_ptr->ext_id_.pname_);
+        CORBA::string_dup (entry_ptr->ext_id_.pname_.in ());
 
   return 1;
 }
 
 void
-TAO_PropertyNamesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator::destroy (CORBA::Environment &)
 {
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
 }
 
 TAO_PropertiesIterator::TAO_PropertiesIterator (TAO_PropertySet &property_set)
@@ -968,13 +1869,13 @@ CORBA::Boolean
 TAO_PropertiesIterator::next_one (CosPropertyService::Property_out aproperty,
                                   CORBA::Environment &)
 {
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-  
+  CosProperty_Hash_Entry_ptr entry_ptr;
+
   if (this->iterator_.next (entry_ptr) != 0)
     {
       aproperty = new CosPropertyService::Property;
       aproperty->property_name = entry_ptr->ext_id_.pname_;
-      aproperty->property_value = entry_ptr->int_id_.pvalue_;
+      aproperty->property_value = entry_ptr->int_id_.pvalue_.in ();
       this->iterator_.advance ();
       return 1;
     }
@@ -990,822 +1891,39 @@ TAO_PropertiesIterator::next_n (CORBA::ULong how_many,
                                 CosPropertyService::Properties_out nproperties,
                                 CORBA::Environment &)
 {
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (nproperties,
-                  CosPropertyService::Properties,
-                  0);
-
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
+  CosProperty_Hash_Entry_ptr entry_ptr = 0;
 
   if (this->iterator_.next (entry_ptr) == 0 || how_many == 0)
     return 0;
 
+  ACE_NEW_RETURN (nproperties,
+                  CosPropertyService::Properties,
+                  0);
+
   size_t size = this->iterator_.map ().current_size ();
 
-  size_t len;
-  if (how_many <= size)
-    len = how_many;
-  else
-    len = size;
-  nproperties->length (len);
+  nproperties->length (how_many <= size ? how_many : size);
 
   for (size_t ni = 0;
        ni < nproperties->length ();
        ni++,
          this->iterator_.advance ())
-    {
-      if (this->iterator_.next (entry_ptr) != 0)
-        {
-          nproperties [ni].property_name = entry_ptr->ext_id_.pname_;
-          nproperties [ni].property_value =
-            entry_ptr->int_id_.pvalue_;
-        }
-      else
-        break;
-    }
-  
-  return 1;
-}
-
-void
-TAO_PropertiesIterator::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-// Makes default sized hash_table_. All the sequences are set the max
-// length as 0.
-
-TAO_PropertySet::TAO_PropertySet (void)
-{
-}
-
-// Init values that the PropertySetFactory will want to specify. Write
-// the allowed properties in the Hash Table with *fixed-normal* mode.
-// @@ Need to check for duplicate properties and raise exceptions.
-
-
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CosPropertyService::Properties allowed_properties,
-                                      CORBA::Environment &ACE_TRY_ENV)
-  : allowed_property_types_ (allowed_property_types),
-    allowed_property_names_ (allowed_properties.length ())
-{
-  // Set the length for the sequence, just to make sure.
-  this->allowed_property_names_.length (allowed_properties.length ());
-
-  // Keep the allowed property names in the sequence..
-  for (size_t ni = 0;
-       ni < allowed_properties.length ();
-       ni++)
-    this->allowed_property_names_[ni] =
-      allowed_properties[ni].property_name;
-
-  // Define the allowed properties in the hash table.
-  ACE_TRY
-    {
-      this->define_properties (allowed_properties,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// TAO_PropertySetDef's constructor needs this, for initializing the
-// allowed properties' sequence withe just the maximum length.
-
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::PropertyTypes allowed_property_types,
-                                      const CORBA::ULong number_of_allowed_properties,
-                                      CORBA::Environment &)
-  : allowed_property_types_ (allowed_property_types),
-    allowed_property_names_ (number_of_allowed_properties)
-{
-}
-
-// PropertySetFactory needs this constructor. Store all the initial
-// properies with *normal* modes.
-
-
-TAO_PropertySet::TAO_PropertySet (const CosPropertyService::Properties initial_properties,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Define all the initial properties in the Property Set. All take
-  // *normal* modes.
-  ACE_TRY
-    {
-      this->define_properties (initial_properties,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_PropertySet-Constructor");
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-
-// Destructor. All sequences will be deleted.
-
-TAO_PropertySet::~TAO_PropertySet (void)
-{
-}
-
-// Function to modify or add a property to the PropertySet:
-// Adds the name and the value to the set... Doesn't check for Typecode
-// overwriting, duplicate names, void names etc, yet. 
-// @@ Uses Normal mode as the default mode of properties, We can
-// change this behavior based on the Initial set of allowed modes, if
-// there is anything like that set by the client.
-
-
-void
-TAO_PropertySet::define_property (const char *property_name,
-                                      const CORBA::Any &property_value,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Check the name's validity.
-  if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
-
-  // Is this type allowed?
-  if (is_type_allowed (property_value.type ()) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedTypeCode());
-
-  // Is this property allowed?
-  if (is_property_allowed (property_name) != 1)
-    ACE_THROW (CosPropertyService::UnsupportedProperty());
-
-  // Try to bind the property. Use normal mode.
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value (property_value,
-                                     CosPropertyService::normal);
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-  //CosProperty_Hash_Key old_key;
-  //CosProperty_Hash_Value old_value;
-
-  int ret = this->hash_table_.bind (hash_key,
-                                    hash_value,
-                                    entry_ptr);
-  switch (ret)
-    {
-    case 0:
-      break;
-    case 1:
-      // Property already exists.
-
-      // Is the pointer valid?
-      if (entry_ptr == 0)
-        ACE_THROW (CORBA::UNKNOWN ());
-
-      // If type is not the same, raise exception.
-      if (entry_ptr->int_id_.pvalue_.type () != property_value.type ())
-        ACE_THROW (CosPropertyService::ConflictingProperty());
-
-      // If mode is read only, raise exception.
-      if ((entry_ptr->int_id_.pmode_ == CosPropertyService::read_only) ||
-          (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-        ACE_THROW (CosPropertyService::ReadOnlyProperty());
-
-      // Use the mode that is already there.
-      hash_value.pmode_ = entry_ptr->int_id_.pmode_;
-
-      // Everything is fine. Overwrite the value.
-      if (this->hash_table_.rebind (hash_key,
-                                    hash_value) != 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO_PropertySet::Define Property failed\n"));
-          TAO_THROW (CORBA::UNKNOWN ());
-        }
-      break;
-    default:
-      // Error. ret is -1.
-      TAO_THROW (CORBA::UNKNOWN ());
-    }
-
-  return;
-}
-
-// Tells whether this type is allowed in this property set or no.
-
-CORBA::Boolean
-TAO_PropertySet::is_type_allowed (CORBA::TypeCode_ptr type)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  // If the sequence is empty, no constraints.
-  if (this->allowed_property_types_.length () == 0)
-    return 1;
-
-  // Check in the allowed_property_types sequence.
-  CORBA::Boolean ret_val = 0;
-  for (size_t ti = 0;
-       ti < this->allowed_property_types_.length ();
-       ti++)
-    {
-      ACE_TRY
-        {
-          ret_val = ((const CORBA::TypeCode *)this->allowed_property_types_[ti])->equal (type,
-                                                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (ret_val == 1)
-            return 1;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "TAO_PropertySet::is_type_allowed failed");
-          return ret_val;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (0);
-    }
-
-  // Type not found.
-  return ret_val;
-}
-
-// Tells whether this property is allowed in this property or no.
-
-CORBA::Boolean
-TAO_PropertySet::is_property_allowed (const char* property_name)
-{
-  // If  the sequence is empty, no constraints.
-  if (this->allowed_property_names_.length() == 0)
-    return 1;
-
-  // Check in the allowed_property_names.
-  for (size_t ni = 0;
-       ni < this->allowed_property_names_.length ();
-       ni++)
-    if (ACE_OS::strcmp ((const char *) this->allowed_property_names_[ni],
-                        property_name) == 0)
-      return 1;
-
-  // Name not found in the sequence.
-  return 0;
-}
-
-// Defining a sequence of properties
-//
-// Check for overwriting, duplicate names, void names etc and raise
-// appropriate exceptions.
-
-
-void
-TAO_PropertySet::define_properties (const CosPropertyService::Properties &nproperties,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Get the length.
-  size_t sequence_length = nproperties.length ();
-
-  // Define multiple exceptions object.
-  CosPropertyService::MultipleExceptions multi_ex;
-
-  for (size_t pi = 0; pi < sequence_length; pi++)
-    {
-      ACE_TRY
-        {
-          // Define this property.
-          this->define_property (nproperties [pi].property_name.in (),
-                                 nproperties [pi].property_value,
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::invalid_property_name;
-          multi_ex.exceptions[len].failing_property_name =
-            nproperties[pi].property_name;
-        }
-      ACE_CATCH (CosPropertyService::ConflictingProperty, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::conflicting_property;
-          multi_ex.exceptions[len].failing_property_name =
-            nproperties[pi].property_name;
-        }
-      ACE_CATCH (CosPropertyService::ReadOnlyProperty, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::read_only_property;
-          multi_ex.exceptions[len].failing_property_name =
-            nproperties[pi].property_name;
-        }
-      ACE_CATCH (CosPropertyService::UnsupportedTypeCode, ex)
-        {
-          size_t len = multi_ex.exceptions.length ();
-          multi_ex.exceptions.length (len + 1);
-          multi_ex.exceptions[len].reason =
-            CosPropertyService::unsupported_type_code;
-          multi_ex.exceptions[len].failing_property_name =
-            nproperties[pi].property_name;
-        }
-      ACE_CATCH (CosPropertyService::UnsupportedProperty, ex)
-         {
-           size_t len = multi_ex.exceptions.length ();
-           multi_ex.exceptions.length (len + 1);
-           multi_ex.exceptions[len].reason =
-             CosPropertyService::unsupported_property;
-           multi_ex.exceptions[len].failing_property_name =
-             nproperties[pi].property_name;
-         }
-       ACE_CATCH (CORBA::SystemException, sysex)
-         {
-           ACE_RETHROW;
-         }
-       ACE_ENDTRY;
-       ACE_CHECK;
-    }
-
-  // Raise the multi exception if needed.
-  if (multi_ex.exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (multi_ex));
-}
-
-// Returns the current number of properties associated with this
-// PropertySet.
-
-
-CORBA::ULong
-TAO_PropertySet::get_number_of_properties (CORBA::Environment &)
-{
-  return this->hash_table_.current_size ();
-}
-
-//  Returns all of the property names currently defined in the
-//  PropertySet. If the PropertySet contains more than <how_many>
-//  property names, then the remaining property names are put into the
-//  PropertyNamesIterator.
-
-
-void
-TAO_PropertySet::get_all_property_names (CORBA::ULong how_many,
-                                             CosPropertyService::PropertyNames_out property_names,
-                                             CosPropertyService::PropertyNamesIterator_out rest,
-                                             CORBA::Environment &ACE_TRY_ENV)
-{
-  // Allocating storage is a must.
-  ACE_NEW (property_names,
-           CosPropertyService::PropertyNames);
-
-  size_t num_of_properties =
-    this->get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK;
-  
-  if (num_of_properties == 0)
-    // Nothing to do.
-    return;
-
-  // Set the length of the property_names appropriately.
-  CORBA::ULong sequence_length = 0;
-
-  if (how_many > 0)
-    {
-      if (how_many >= num_of_properties)
-        sequence_length = num_of_properties;
-      else
-        sequence_length = how_many;
-      property_names->length (sequence_length);
-    }
-
-  // Iterate thru names and put them in the property_names.
-
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-  COSPROPERTY_HASH_ITERATOR iterator (this->hash_table_);
-
-  for (size_t ni = 0;
-       ni < sequence_length;
-       ni++, iterator.advance ())
-    if (iterator.next (entry_ptr) != 0)
-      property_names [ni] =
-        CORBA::string_dup (entry_ptr->ext_id_.pname_);
-
-  // If there are some more properties, put them in the
-  // iterator. How?? Make a new PropertySet and use that to create
-  // propertyNames Iterator.
-
-  if (num_of_properties > how_many)
-    {
-      TAO_PropertySet *property_set;
-
-      ACE_NEW (property_set, TAO_PropertySet);
-
-      for (size_t i = how_many;
-           i < num_of_properties;
-           i++, iterator.advance ())
-        if (iterator.next (entry_ptr) != 0)
-          if (property_set->hash_table_.bind (entry_ptr->ext_id_,
-                                              entry_ptr->int_id_) < 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Error:TAO_PropertySet::get_all_property_names\n"));
-      
-      // Make the NamesIterator out of this TAO_PropertySet.
-      TAO_PropertyNamesIterator *names_iterator;
-      ACE_NEW (names_iterator, TAO_PropertyNamesIterator (*property_set));
-      
-      // Init the out parameter.
-
-      // Get the Interface ptr.
-      CosPropertyService::PropertyNamesIterator_ptr iterator_ptr =
-        names_iterator->_this (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // POA stuff todo here, since we have <destroy> method in the
-      // <NamesIterator> interface.
-      // Give ownership of this servant to the POA.
-      names_iterator->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Init the out parameter.
-      rest = iterator_ptr;
-    }
-}
-
-// Returns the value of a property in the PropertySet.
-
-
-CORBA::Any *
-TAO_PropertySet::get_property_value (const char *property_name,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Check the name's validity.
-  if (property_name == 0)
-    ACE_THROW_RETURN (CosPropertyService::InvalidPropertyName(),
-                      0);
-
-  // Get the value out of the hash table.
-
-  CosProperty_Hash_Key hash_key (property_name);
-  CosProperty_Hash_Value hash_value;
-
-  if (this->hash_table_.find (hash_key, hash_value) != 0)
-    ACE_THROW_RETURN (CosPropertyService::PropertyNotFound(),
-                      0);
-
-  // Return the any value got.
-  CORBA::Any *any_ptr =0;
-  ACE_NEW_RETURN (any_ptr,
-                  CORBA::Any (hash_value.pvalue_),
-                  0);
-  return any_ptr;
-}
-
-// Returns the values of the properties listed in property_names. When
-// the boolean return value is true, the Properties parameter contains
-// valid values for all requested property names. If false, then all 
-// properties with a value of type tk_void may have failed due to
-// <PropertyNotFound> or <InvalidPropertyName>.
-
-
-CORBA::Boolean
-TAO_PropertySet::get_properties (const CosPropertyService::PropertyNames &property_names,
-                                     CosPropertyService::Properties_out nproperties,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // Allocate memory for the out parameter.
-  ACE_NEW_RETURN (nproperties,
-                  CosPropertyService::Properties,
-                  0);
-
-  // Validate the length.
-  size_t n = property_names.length ();
-  if (n == 0)
-    return 0;
-
-  // Set the length for the out parameter.
-  nproperties->length (n);
-
-  // Get values for all the names.
-
-  CORBA::Any_ptr any_ptr = 0;
-  CORBA::Boolean ret_val = 1;
-
-  for (size_t i = 0; i < n; i++)
-    {
-      ACE_TRY_ENV.clear ();
-      any_ptr = get_property_value (property_names [i],
-                                    ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      
-      if (any_ptr != 0)
-        {
-          // Property is found.
-          nproperties [i].property_name = property_names [i];
-          nproperties [i].property_value = *any_ptr;
-        }
-      else
-        {
-          // Invalid name. Ret value is False.
-          ret_val = 0;
-          
-          // Assign void type to this name in the out parameter.
-          nproperties [i].property_name =
-            property_names [i];
-
-          // Make an any value with tk_void type.
-          // @@ Using replace method, <<= operator does not exist yet 
-          // for this.  
-          nproperties [i].property_value.replace (CORBA::_tc_void,
-                                                  0,
-                                                  0,
-                                                  ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-        }
-    }
-
-  return ret_val;
-}
-
-
-void
-TAO_PropertySet::get_all_properties (CORBA::ULong how_many,
-                                         CosPropertyService::Properties_out nproperties,
-                                         CosPropertyService::PropertiesIterator_out rest,
-                                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Allocate memory for the out parameter.
-  ACE_NEW (nproperties,
-           CosPropertyService::Properties);
-
-  // Validate the length.
-  size_t num_of_properties =
-    hash_table_.current_size ();
-
-  if (num_of_properties == 0)
-    return;
-
-  // Set the length for the nproperties if how_many > 0.
-  CORBA::ULong sequence_length = 0;
-
-  if (how_many > 0)
-    {
-      if (how_many >= num_of_properties)
-        sequence_length = num_of_properties;
-      else
-        sequence_length = how_many;
-      
-      nproperties->length (sequence_length);
-    }
-
-  // Prepare an iterator and iterate through the PropertySet. Retrive
-  // the values.
-
-  COSPROPERTY_HASH_ITERATOR iterator (this->hash_table_);
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
-
-  for (CORBA::ULong i = 0;
-       i < sequence_length;
-       i++, iterator.advance ())
-    if (iterator.next (entry_ptr) != 0)
+    if (this->iterator_.next (entry_ptr) != 0)
       {
-        nproperties[i].property_name =
-          CORBA::string_dup (entry_ptr->ext_id_.pname_);
-        nproperties[i].property_value =
-          entry_ptr->int_id_.pvalue_;
+        nproperties [ni].property_name = entry_ptr->ext_id_.pname_;
+        nproperties [ni].property_value =
+          entry_ptr->int_id_.pvalue_.in ();
       }
-
-  // If there are more properties, put them in the <PropertiesIterator>.
-  // Make a new <TAO_PropertySet> and use that to create an Properties 
-  // iterator.  put that in a iterator and assign that to the out
-  // paramerter.
-
-  if (num_of_properties > how_many)
-    {
-      TAO_PropertySet *prop_set;
-
-      ACE_NEW (prop_set, TAO_PropertySet);
-
-      for (size_t i = sequence_length;
-           i < num_of_properties;
-           i++, iterator.advance ())
-        {
-          if (iterator.next (entry_ptr) != 0
-              && prop_set->hash_table_.bind (entry_ptr->ext_id_,
-                                             entry_ptr->int_id_) < 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Error:TAO_PropertySet::get_all_properties\n"));
-        }
-      
-      // Make the iterator out of the new TAO_Propset.
-      TAO_PropertiesIterator *iterator = 0;
-      ACE_NEW (iterator,
-               TAO_PropertiesIterator (*prop_set));
-      
-      // Init the out parameter.
-      
-      // Get the interface ptr.
-      CosPropertyService::PropertiesIterator_ptr iterator_ptr = 
-        iterator->_this (ACE_TRY_ENV);
-      ACE_CHECK;
-      
-      // POA stuff todo here, since we have <destroy> method in the
-      // <NamesIterator> interface.
-      // Give ownership of this servant to the POA.
-      iterator->_remove_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-      
-      // Init the out parameter.
-      rest = iterator_ptr;
-    }
-}
-
-// Deletes the specified property if it exists from a PropertySet.
-
-
-void
-TAO_PropertySet::delete_property (const char *property_name,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  // Check the name's validity.
-  if (property_name == 0)
-    ACE_THROW (CosPropertyService::InvalidPropertyName());
-
-  // Get the entry from the Hash Table.
-
-  CosProperty_Hash_Key hash_key (property_name);
-  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
-
-  if (this->hash_table_.find (hash_key,
-                              entry_ptr) == -1)
-    ACE_THROW (CosPropertyService::PropertyNotFound());
-
-  // If property is fixed, then raise exception.
-  if ((entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_normal)
-      || (entry_ptr->int_id_.pmode_ == CosPropertyService::fixed_readonly))
-    ACE_THROW (CosPropertyService::FixedProperty());
-  
-  // Unbind this property.
-  if (this->hash_table_.unbind (entry_ptr) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Unbind failed\n"));
-      TAO_THROW (CORBA::UNKNOWN ());
-    }
-
-  return;
-}
-
-// Deletes the properties defined in the property_names
-// parameter. This is a batch operation that returns the
-// MultipleExceptions exception if any delete failed.
-
-
-void
-TAO_PropertySet::delete_properties (const CosPropertyService::PropertyNames &property_names,
-                                        CORBA::Environment &ACE_TRY_ENV)
-{
-  // Get the length.
-  size_t sequence_length = property_names.length ();
-
-  // Declare multiple exceptions' object.
-  CosPropertyService::MultipleExceptions *multi_ex = 0;
-  ACE_NEW (multi_ex,
-           CosPropertyService::MultipleExceptions);
-
-  for (size_t pi = 0; pi < sequence_length; pi++)
-    {
-      ACE_TRY
-        {
-          // Delete this property.
-          this->delete_property (property_names[pi],
-                                 ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CosPropertyService::InvalidPropertyName, ex)
-        {
-          // Put this exception in the multiple exception.
-          size_t len = multi_ex->exceptions.length ();
-          multi_ex->exceptions.length (len + 1);
-          multi_ex->exceptions[len].reason =
-            CosPropertyService::invalid_property_name;
-          multi_ex->exceptions[len].failing_property_name =
-            property_names[pi];
-        }
-      ACE_CATCH (CosPropertyService::PropertyNotFound, ex)
-        {
-          // Put this exception in the multiple exception.
-          size_t len = multi_ex->exceptions.length ();
-          multi_ex->exceptions.length (len + 1);
-          multi_ex->exceptions[len].reason =
-            CosPropertyService::property_not_found;
-          multi_ex->exceptions[len].failing_property_name =
-            property_names[pi];
-        }
-      ACE_CATCH (CosPropertyService::FixedProperty, ex)
-        {
-          // Put this exception in the multiple exception.
-          size_t len = multi_ex->exceptions.length ();
-          multi_ex->exceptions.length (len + 1);
-          multi_ex->exceptions[len].reason =
-            CosPropertyService::fixed_property;
-          multi_ex->exceptions[len].failing_property_name =
-            property_names[pi];
-        }
-      ACE_CATCH (CORBA::SystemException, sysex)
-        {
-          // We cant afford to get this. Throw this.
-          ACE_RETHROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-
-  // Raise the multiple exceptions if there are any.
-  if (multi_ex->exceptions.length () > 0)
-    ACE_THROW (CosPropertyService::MultipleExceptions (*multi_ex));
-}
-
-// Delete all the properties in the current ProperySet : Delete the
-// properties one by one.
-
-
-CORBA::Boolean
-TAO_PropertySet::delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Get all the property names in a names' sequence.
-  CosPropertyService::PropertyNames_ptr names_ptr = 0;
-  CosPropertyService::PropertyNames_out names_out (names_ptr);
-  CosPropertyService::PropertyNames_var names;
-
-  CosPropertyService::PropertyNamesIterator_ptr iter_ptr = 0;
-  CosPropertyService::PropertyNamesIterator_out iter_out (iter_ptr);
-  CosPropertyService::PropertyNamesIterator_var iter;
-      
-  CORBA::ULong size = this->get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  this->get_all_property_names (size,
-                                names_out,
-                                iter_out,
-                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  // Get the out values on to the var varibles.
-  names = names_out.ptr ();
-  iter = iter_out.ptr ();
-  
-  // Delete all these properties.
-  this->delete_properties (names.in (),
-                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  
-  // All properties deleted.
+    else
+      break;
   return 1;
 }
 
-// Returns TRUE if the property is defined in the PropertySet.
-
-
-CORBA::Boolean
-TAO_PropertySet::is_property_defined (const char *property_name,
-                                          CORBA::Environment &)
-{
-  CosProperty_Hash_Key hash_key (property_name);
-  
-  if (this->hash_table_.find (hash_key) == 0)
-    return 1;
-  else
-    return 0;
-}
-
-
 void
-TAO_PropertySet::operator= (const TAO_PropertySet &)
+TAO_PropertiesIterator::destroy (CORBA::Environment &)
 {
-  // Empty.
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>;
 template class ACE_Hash<CosProperty_Hash_Key>;
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
index 7e4c73939e8..560a5b08231 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.h
@@ -26,10 +26,8 @@
 #include "orbsvcs/orbsvcs_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
+#if defined(_MSC_VER)
+#pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
 // =  Classes to deal with the ACE_Hash_Map_Manager.
@@ -41,7 +39,6 @@ class TAO_ORBSVCS_Export CosProperty_Hash_Key
   //     ACE_Hash_Map_Manager.
 public:
   // = Initialization and termination methods.
-
   CosProperty_Hash_Key (void);
   // Default constructor.
 
@@ -63,10 +60,8 @@ public:
   virtual u_long hash (void) const;
   // The function that computes a hash value.
 
-// private:
-
-  CosPropertyService::PropertyName pname_;
-  // Storage pointer.
+  CosPropertyService::PropertyName_var pname_;
+  // This is still the public variable.
 };
 
 class TAO_ORBSVCS_Export CosProperty_Hash_Value
@@ -90,15 +85,15 @@ public:
   virtual ~CosProperty_Hash_Value (void);
   // Destructor.
 
-//private:
-  
-  CORBA::Any pvalue_;
+  CORBA::Any_var pvalue_;
   // property value.
 
   CosPropertyService::PropertyModeType pmode_;
   // Property Mode.
 };
 
+// = Implementation classes for the PropertyService interfaces.
+
 class TAO_ORBSVCS_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
 {
   // = TITLE
@@ -189,11 +184,13 @@ public:
 
 protected:
   typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_MAP;
+          CosProperty_Hash_Map;
   typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          COSPROPERTY_HASH_ENTRY;
+          CosProperty_Hash_Entry;
+  typedef CosProperty_Hash_Entry *
+          CosProperty_Hash_Entry_ptr;
   typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_ITERATOR;
+          CosProperty_Hash_Iterator;
   // Typedefs are useful.
 
   CORBA::Boolean is_type_allowed (CORBA::TypeCode_ptr type);
@@ -203,15 +200,9 @@ protected:
   // Tells  whether this property is allowed in this property set or
   // no.
 
-  void operator= (const TAO_PropertySet &);
-  // hack to avoid strange undefined symbol errors for operator= for PropertyTypes.
-
-  // XXX:This public: is a hack to keep the compiler complain about access violation.
-public:
-  COSPROPERTY_HASH_MAP hash_table_;
+  CosProperty_Hash_Map hash_table_;
   // This Hash_Table manages storage for our properties.
 
-protected:
   CosPropertyService::PropertyTypes allowed_property_types_;
   // Stores the property types that can be allowed in this property
   // set.
@@ -225,62 +216,6 @@ protected:
   // can be defined.
 };
 
-class TAO_ORBSVCS_Export TAO_PropertyNamesIterator : public virtual PortableServer::RefCountServantBase,
-                                                     public virtual POA_CosPropertyService::PropertyNamesIterator
-{
-  // = TITLE
-  //     The PropertyNamesIterator interface allows a client to
-  //     iterate through the names using the next_one or next_n operations.
-  //
-  // = DESCRIPTION
-  //     A PropertySet maintains a set of name-value pairs. The
-  //     get_all_property_names operation returns a sequence of names
-  //     (PropertyNames). If there are additional names, the
-  //     get_all_property_names operation returns an object supporting
-  //     the PropertyNamesIterator interface with the additional names.
-public:
-  // = Initialization and termination methods.
-  TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
-  // Constructor.
-
-  virtual ~TAO_PropertyNamesIterator (void);
-  // Destructor.
-
-  virtual void reset (CORBA::Environment &env);
-  // The reset operation resets the position in an iterator to the
-  // first property name, if one exists.
-
-  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
-                                   CORBA::Environment &env);
-  // The next_one operation returns true if an item exists at the
-  // current position in the iterator with an output parameter of a
-  // property name. A return of false signifies no more items in the iterator.
-
-
-  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
-                                 CosPropertyService::PropertyNames_out property_names,
-                                 CORBA::Environment &env);
-  // The next_n operation returns true if an item exists at the
-  // current position in the iterator and the how_many parameter was
-  // set greater than zero. The output is a PropertyNames sequence
-  // with at most the how_many number of names. A return of false
-  // signifies no more items in the iterator.
-
-  virtual void destroy (CORBA::Environment &env);
-  // Destroys the iterator.
-private:
-  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_MAP;
-  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_ITERATOR;
-  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          COSPROPERTY_HASH_ENTRY;
-
-  COSPROPERTY_HASH_ITERATOR iterator_;
-  // The Iterator object.
-};
-
-
 class TAO_ORBSVCS_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
                                               public virtual TAO_PropertySet
 {
@@ -459,8 +394,62 @@ private:
   // keep track all of them so that we can delete them at the end.
 };
 
-class TAO_ORBSVCS_Export TAO_PropertiesIterator : public virtual PortableServer::RefCountServantBase,
-                                                  public virtual POA_CosPropertyService::PropertiesIterator
+class TAO_ORBSVCS_Export TAO_PropertyNamesIterator :  public virtual POA_CosPropertyService::PropertyNamesIterator
+{
+  // = TITLE
+  //     The PropertyNamesIterator interface allows a client to
+  //     iterate through the names using the next_one or next_n operations.
+  //
+  // = DESCRIPTION
+  //     A PropertySet maintains a set of name-value pairs. The
+  //     get_all_property_names operation returns a sequence of names
+  //     (PropertyNames). If there are additional names, the
+  //     get_all_property_names operation returns an object supporting
+  //     the PropertyNamesIterator interface with the additional names.
+public:
+  // = Initialization and termination methods.
+  TAO_PropertyNamesIterator (TAO_PropertySet &property_set);
+  // Constructor.
+
+  virtual ~TAO_PropertyNamesIterator (void);
+  // Destructor.
+
+  virtual void reset (CORBA::Environment &env);
+  // The reset operation resets the position in an iterator to the
+  // first property name, if one exists.
+
+  virtual CORBA::Boolean next_one (CORBA::String_out property_name,
+                                   CORBA::Environment &env);
+  // The next_one operation returns true if an item exists at the
+  // current position in the iterator with an output parameter of a
+  // property name. A return of false signifies no more items in the iterator.
+
+
+  virtual CORBA::Boolean next_n (CORBA::ULong how_many,
+                                 CosPropertyService::PropertyNames_out property_names,
+                                 CORBA::Environment &env);
+  // The next_n operation returns true if an item exists at the
+  // current position in the iterator and the how_many parameter was
+  // set greater than zero. The output is a PropertyNames sequence
+  // with at most the how_many number of names. A return of false
+  // signifies no more items in the iterator.
+
+  virtual void destroy (CORBA::Environment &env);
+  // Destroys the iterator.
+private:
+  typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
+          CosProperty_Hash_Map;
+  typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
+          CosProperty_Hash_Iterator;
+  typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
+          CosProperty_Hash_Entry;
+  typedef CosProperty_Hash_Entry * CosProperty_Hash_Entry_ptr;
+
+  CosProperty_Hash_Iterator iterator_;
+  // The Iterator object.
+};
+
+class TAO_ORBSVCS_Export TAO_PropertiesIterator :  public virtual POA_CosPropertyService::PropertiesIterator
 {
   // = TITLE
   //     Thid class implements PropertiesIterator interface allows a client to
@@ -506,17 +495,17 @@ public:
 
 private:
   typedef ACE_Hash_Map_Manager<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_MAP;
+          CosProperty_Hash_Map;
   typedef ACE_Hash_Map_Iterator<CosProperty_Hash_Key, CosProperty_Hash_Value, ACE_Null_Mutex>
-          COSPROPERTY_HASH_ITERATOR;
+          CosProperty_Hash_Iterator;
   typedef ACE_Hash_Map_Entry<CosProperty_Hash_Key, CosProperty_Hash_Value>
-          COSPROPERTY_HASH_ENTRY;
+          CosProperty_Hash_Entry;
+  typedef CosProperty_Hash_Entry * CosProperty_Hash_Entry_ptr;
 
-  COSPROPERTY_HASH_ITERATOR iterator_;
+  CosProperty_Hash_Iterator iterator_;
   // The iterator object.
 };
 
-
 #if defined(_MSC_VER)
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
diff --git a/TAO/orbsvcs/orbsvcs/Property/Makefile.am b/TAO/orbsvcs/orbsvcs/Property/Makefile.am
deleted file mode 100644
index b8235d16383..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Property Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Property.la
-
-libTAO_Property_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Property_la_SOURCES = \
-        CosPropertyService_i.cpp
-
-noinst_HEADERS = \
-        CosPropertyService_i.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
index 13cda1da364..8b662cd7141 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventChannelAdmin.idl
@@ -1,180 +1,168 @@
+//
 // $Id$
-
-#ifndef TAO_RTEC_EVENTCHANNELADMIN_IDL
-#define TAO_RTEC_EVENTCHANNELADMIN_IDL
-
+//
 #include "RtecEventComm.idl"
 #include "RtecScheduler.idl"
 
-module RtecEventChannelAdmin
-{
+module RtecEventChannelAdmin {
+
   exception AlreadyConnected {};
   exception TypeError {};
 
-  struct Dependency
-  {
+  struct Dependency {
     RtecEventComm::Event event;
     RtecScheduler::handle_t rt_info;
   };
   typedef sequence<Dependency> DependencySet;
 
-  struct ConsumerQOS
-  {
+  struct ConsumerQOS {
     DependencySet dependencies;
     boolean is_gateway;
   };
 
-  struct Publication
-  {
+  struct Publication {
     RtecEventComm::Event event;
     RtecScheduler::Dependency_Info dependency_info;
   };
   typedef sequence<Publication> PublicationSet;
 
-  struct SupplierQOS
-  {
+  struct SupplierQOS {
     PublicationSet publications;
     boolean is_gateway;
   };
 
-  interface ProxyPushSupplier: RtecEventComm::PushSupplier
-    {
-      // = TITLE
-      //   The Proxy Supplier
-      //
-      // = DESCRIPTION
-      //   Consumers receive their events from objects of this type. See
-      //   the interfaces below to see how to gain access to an object
-      //   reference of this type.
-
-      void connect_push_consumer(in RtecEventComm::PushConsumer push_consumer,
-                                 in ConsumerQOS qos)
-        raises(AlreadyConnected, TypeError);
-      // Before receiving any events the consumer must provide its
-      // publication list and QoS information to the Event Channel
-      // through this method.
-
-      void suspend_connection ();
-      // Temporarly suspend reception of events from the Event
-      // Channel. Calling this method is more efficient than dropping
-      // them on the receiving end and less expensive than disconnecting
-      // and connecting again (but it is not free!!)
-
-      void resume_connection ();
-      // Resume the reception of events.
-    };
-
-  interface ProxyPushConsumer: RtecEventComm::PushConsumer
-    {
-      // = TITLE
-      //   The Proxy Consumer
-      //
-      // = DESCRIPTION
-      //   Suppliers push their events to objects of this type. See the
-      //   interfaces below to see how to gain access to an object
-      //   reference of this type.
-
-      void connect_push_supplier (in RtecEventComm::PushSupplier push_supplier,
-                                  in SupplierQOS qos)
-        raises (AlreadyConnected);
-      // Before pushing events the supplier must provide its
-      // publication list and QoS information to the Event Channel
-      // through this method.
-    };
+  interface ProxyPushSupplier: RtecEventComm::PushSupplier {
+    // = TITLE
+    //   The Proxy Supplier
+    //
+    // = DESCRIPTION
+    //   Consumers receive their events from objects of this type. See
+    //   the interfaces below to see how to gain access to an object
+    //   reference of this type.
+
+    void connect_push_consumer(
+		in RtecEventComm::PushConsumer push_consumer,
+		in ConsumerQOS qos)
+      raises(AlreadyConnected, TypeError);
+    // Before receiving any events the consumer must provide its
+    // publication list and QoS information to the Event Channel
+    // through this method.
+
+    void suspend_connection ();
+    // Temporarly suspend reception of events from the Event
+    // Channel. Calling this method is more efficient than dropping
+    // them on the receiving end and less expensive than disconnecting
+    // and connecting again (but it is not free!!)
+
+    void resume_connection ();
+    // Resume the reception of events.
+  };
+
+  interface ProxyPushConsumer: RtecEventComm::PushConsumer {
+    // = TITLE
+    //   The Proxy Consumer
+    //
+    // = DESCRIPTION
+    //   Suppliers push their events to objects of this type. See the
+    //   interfaces below to see how to gain access to an object
+    //   reference of this type.
+
+    void connect_push_supplier(
+		in RtecEventComm::PushSupplier push_supplier,
+		in SupplierQOS qos)
+      raises(AlreadyConnected);
+    // Before pushing events the supplier must provide its publication
+    // list and QoS information to the Event Channel through this
+    // method.
+  };
 
   // @@ TODO: Find out the exception specs for the following interface's
   // methods.
-  interface ConsumerAdmin
-    {
-      // = TITLE
-      //   The Supplier factory
-      //
-      // = DESCRIPTION
-      //   Consumers use this interface to create suppliers they can
-      //   connect to.
-
-      ProxyPushSupplier obtain_push_supplier ();
-      // Obtain a supplier
-    };
-
-  interface SupplierAdmin
-    {
-      // = TITLE
-      //   The Consumer factory
-      //
-      // = DESCRIPTION
-      //   Suppliers use this interface to create consumers they can
-      //   connect to.
-
-      ProxyPushConsumer obtain_push_consumer ();
-      // Obtain a consumer
-    };
-
-  interface Observer
-    {
-      // = TITLE
-      //   Observes any changes in the consumer or supplier sets for an
-      //   Event Channel
-      //
-      // = DESCRIPTION
-      //   This object receives updates from Event Channels with any
-      //   changes on set of consumer and or suppliers registered with
-      //   the Event Channel.
-
-      void update_consumer (in ConsumerQOS sub);
-      // A change in the list of consumers has ocurred. The disjunction
-      // of the subscriptions is passed to the observer.
-
-      void update_supplier (in SupplierQOS pub);
-      // A change in the list of suppliers has ocurred. The disjunction
-      // of the publications is passed to the observer.
-    };
+  interface ConsumerAdmin {
+    // = TITLE
+    //   The Supplier factory
+    //
+    // = DESCRIPTION
+    //   Consumers use this interface to create suppliers they can
+    //   connect to.
+
+    ProxyPushSupplier obtain_push_supplier();
+    // Obtain a supplier
+  };
+  interface SupplierAdmin {
+    // = TITLE
+    //   The Consumer factory
+    //
+    // = DESCRIPTION
+    //   Suppliers use this interface to create consumers they can
+    //   connect to.
+
+    ProxyPushConsumer obtain_push_consumer();
+    // Obtain a consumer
+  };
+
+  interface Observer {
+    // = TITLE
+    //   Observes any changes in the consumer or supplier sets for an
+    //   Event Channel
+    //
+    // = DESCRIPTION
+    //   This object receives updates from Event Channels with any
+    //   changes on set of consumer and or suppliers registered with
+    //   the Event Channel.
+    
+    void update_consumer (in ConsumerQOS sub);
+    // A change in the list of consumers has ocurred. The disjunction
+    // of the subscriptions (and its equivalent form ) is
+    // passed to the observer.
+
+    void update_supplier (in SupplierQOS pub);
+    // A change in the list of consumers has ocurred. The disjunction
+    // of the publications (and its equivalent form for suppliers).
+  };
 
   typedef unsigned long Observer_Handle;
   // This is used as an opaque ID to control the addition and removal
   // of handles from an event channel.
 
-  interface EventChannel
-    {
-      // = TITLE
-      //   The Event Channel class
-      //
-      // = DESCRIPTION
-      //   This class provides the main entry point for the Event
-      //   Channel.  The class follows a protocol similar to the
-      //   COS Event Service as described in the CORBAservices spec.
-      //
-      exception SYNCHRONIZATION_ERROR {};
-      exception QOS_ERROR {};
-      exception SUBSCRIPTION_ERROR {};
-      exception CORRELATION_ERROR {};
-      exception DISPATCH_ERROR {};
-      exception CANT_APPEND_OBSERVER {};
-      exception CANT_REMOVE_OBSERVER {};
-
-      ConsumerAdmin for_consumers ();
-      // Consumers call this method to gain access to the
-      // ProxyPushSupplier factory.
-
-      SupplierAdmin for_suppliers ();
-      // Suppliers call this method to gain access to the
-      // ProxyPushConsumer factory.
-
-      void destroy ();
-      // This method shutdown the Event Channel, destroy any resources
-      // for it and actually shutdown the server where the Event Channel
-      // is running.
-
-      Observer_Handle append_observer (in Observer gw)
-        raises (SYNCHRONIZATION_ERROR,CANT_APPEND_OBSERVER);
-      // Add a gateway to the Event Channel, the handle returned must be
-      // used to remove the gateway from the ORB.
-
-      void remove_observer (in Observer_Handle gw)
-        raises (SYNCHRONIZATION_ERROR,CANT_REMOVE_OBSERVER);
-      // Remove the observer.
-      // @@ TODO: We should raise something if the handle is invalid.
-    };
+  interface EventChannel {
+    // = TITLE
+    //   The Event Channel class
+    //
+    // = DESCRIPTION
+    //   This class provides the main entry point for the Event
+    //   Channel.  The class follows a protocol similar to the
+    //   COS Event Service as described in the CORBAservices spec.
+    //
+    exception SYNCHRONIZATION_ERROR {};
+    exception QOS_ERROR {};
+    exception SUBSCRIPTION_ERROR {};
+    exception CORRELATION_ERROR {};
+    exception DISPATCH_ERROR {};
+    exception CANT_APPEND_OBSERVER {};
+    exception CANT_REMOVE_OBSERVER {};
+
+    ConsumerAdmin for_consumers();
+    // Consumers call this method to gain access to the
+    // ProxyPushSupplier factory.
+
+    SupplierAdmin for_suppliers();
+    // Suppliers call this method to gain access to the
+    // ProxyPushConsumer factory.
+
+    void destroy ();
+    // This method shutdown the Event Channel, destroy any resources
+    // for it and actually shutdown the server where the Event Channel
+    // is running.
+
+    Observer_Handle append_observer (in Observer gw)
+      raises (SYNCHRONIZATION_ERROR,CANT_APPEND_OBSERVER);
+    // Add a gateway to the Event Channel, the handle returned must be
+    // used to remove the gateway from the ORB.
+
+    void remove_observer (in Observer_Handle gw)
+      raises (CANT_REMOVE_OBSERVER);
+    // Remove the observer.
+    // @@ TODO: We should raise something if the handle is invalid.
+  };
 };
-
-#endif /* TAO_RTEC_EVENTCHANNELADMIN_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
index 69c50b6409c..6e6e4282171 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
@@ -1,17 +1,16 @@
+//
 // $Id$
+//
 
-#ifndef TAO_RTEC_EVENTCOMM_IDL
-#define TAO_RTEC_EVENTCOMM_IDL
-
-#include "TimeBase.idl"
+#include "CosTimeBase.idl"
 
 // Remove the prefix definition...
 // @@ TODO Is this the "Right Thing"? AFAIK the spec does not mention
 // if pragmas should survive the file scope...
 #pragma prefix ""
 
-module RtecEventComm
-{
+module RtecEventComm {
+
   // = TITLE
   //   User defined Event Data.
   //
@@ -25,13 +24,12 @@ module RtecEventComm
   //   sequence of octet.
 
   typedef sequence<octet> EventPayload;
-  struct EventData
-  {
+  struct EventData {
     long x;
     long y;
 
     double pad0;
-    long pad1;
+    long   pad1;
     // This two objects ensure that the encapsulated stream below is
     // properly aligned; this makes the decoding of the payload more
     // efficient because we can use the usual demarshalling code
@@ -86,8 +84,8 @@ module RtecEventComm
     //
     // = DESCRIPTION
     //   Events are represented by this structure, it is simply a
-    //   header,data pair.
-    //
+    //   header,data pair. 
+    // 
     EventHeader header;
 
     EventData data;
@@ -95,17 +93,15 @@ module RtecEventComm
   };
   typedef sequence<Event> EventSet;
 
-  interface PushConsumer
-    {
-      oneway void push (in EventSet data);
-      void disconnect_push_consumer ();
-    };
+  interface PushConsumer {
+    oneway void push (in EventSet data);
+    void disconnect_push_consumer(); 
+  };
 
-  interface PushSupplier
-    {
-      void disconnect_push_supplier ();
-    };
+  interface PushSupplier {
+    void disconnect_push_supplier();
+  };
 
 };
 
-#endif /* TAO_RTEC_EVENTCOMM_IDL */
+
diff --git a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
index 0bbaeadc059..f6513556613 100644
--- a/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecScheduler.idl
@@ -1,9 +1,6 @@
 // $Id$
 
-#ifndef TAO_RTEC_SCHEDULER_IDL
-#define TAO_RTEC_SCHEDULER_IDL
-
-#include "TimeBase.idl"
+#include "CosTimeBase.idl"
 #pragma prefix ""
 
 module RtecScheduler
@@ -123,7 +120,7 @@ module RtecScheduler
     // The operations we depend upon.
     Dependency_Set dependencies;
 
-    // The OS thread priority for processing the
+    // The OS thread priority for processing the 
     // events generated from this RT_Info.
     OS_Priority priority;
 
@@ -167,7 +164,7 @@ module RtecScheduler
     // OS priority of the dispatching thread associated with the queue
     OS_Priority thread_priority;
 
-    // type of dispatching queue
+    // type of dispatching queue 
     Dispatching_Type_t dispatching_type;
   };
 
@@ -344,7 +341,7 @@ module RtecScheduler
     // If the schedule has not been computed:
     //    raises (NOT_SCHEDULED);
     //
-    // If the schedule has been computed, but the passed
+    // If the schedule has been computed, but the passed 
     // priority level is outside those assigned:
     //    raises (UNKNOWN_PRIORITY_LEVEL);
 
@@ -353,11 +350,11 @@ module RtecScheduler
       raises (NOT_SCHEDULED);
     // Returns the last priority number assigned to an operation in the schedule.
     // The number returned is one less than the total number of scheduled priorities.
-    // All scheduled priorities range from 0 to the number returned, inclusive.
+    // All scheduled priorities range from 0 to the number returned, inclusive. 
     //
     // If the schedule has not been computed:
     //    raises (NOT_SCHEDULED);
   };
 };
 
-#endif /* TAO_RTEC_SCHEDULER_IDL */
+
diff --git a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
index 68525f07d2d..6f5d043d5c5 100644
--- a/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecUDPAdmin.idl
@@ -1,12 +1,9 @@
+//
 // $Id$
-
-#ifndef TAO_RTEC_UDP_ADMIN_IDL
-#define TAO_RTEC_UDP_ADMIN_IDL
-
+//
 #include "RtecEventComm.idl"
 
-module RtecUDPAdmin 
-{
+module RtecUDPAdmin {
   // = TITLE
   //   Multicast Administration module
   //
@@ -15,19 +12,17 @@ module RtecUDPAdmin
   //   a mapping between event types and multicast addresses must be
   //   stablished.
 
-  struct UDP_Addr 
-  {
+  struct UDP_Addr {
     unsigned long ipaddr;
     unsigned short port;
   };
 
-  interface AddrServer 
-    {
-      void get_addr (in RtecEventComm::EventHeader header,
-                     out UDP_Addr addr);
-      // Get the addr and port given the event header.
-    };
+  interface AddrServer {
+    void get_addr (in RtecEventComm::EventHeader header,
+		   out UDP_Addr addr);
+    // Get the addr and port given the event header.
+  };
 
 };
 
-#endif /* TAO_RTEC_UDP_ADMIN_IDL */
+
diff --git a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index 2d95a6afdb8..0277379c6d2 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -59,12 +59,12 @@ ACE_Runtime_Scheduler::lookup (const char * entry_point,
 
 RtecScheduler::RT_Info *
 ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &TAO_IN_ENV)
      TAO_THROW_SPEC((CORBA::SystemException,
                      RtecScheduler::UNKNOWN_TASK))
 {
   if (handle <= 0 || handle > entry_count_)
-    ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (),
+    TAO_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (),
                       0);
   // Note: there is no memory leak here, according to the CORBA spec,
   // we are supposed to allocate an structure and return it, the
@@ -72,10 +72,10 @@ ACE_Runtime_Scheduler::get (RtecScheduler::handle_t handle,
 
   // Allocate a new RT_Info
   RtecScheduler::RT_Info* info;
-  ACE_NEW_THROW_EX (info,
-                    RtecScheduler::RT_Info,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (info,
+                        RtecScheduler::RT_Info,
+                        CORBA::NO_MEMORY (),
+                        0);
 
 
   info->entry_point = rt_info_[handle - 1].entry_point;
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
index e900916243e..21339ce271b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -46,19 +46,16 @@ ACE_Config_Scheduler::create (const char * entry_point,
 
   rt_info[0]->entry_point = CORBA::string_dup(entry_point);
   rt_info[0]->handle = -1;
-  rt_info[0]->worst_case_execution_time = ORBSVCS_Time::zero ();
-  rt_info[0]->typical_execution_time = ORBSVCS_Time::zero ();
-  rt_info[0]->cached_execution_time = ORBSVCS_Time::zero ();
+  rt_info[0]->worst_case_execution_time = ORBSVCS_Time::zero;
+  rt_info[0]->typical_execution_time = ORBSVCS_Time::zero;
+  rt_info[0]->cached_execution_time = ORBSVCS_Time::zero;
   rt_info[0]->period = 0;
-  rt_info[0]->criticality = RtecScheduler::VERY_LOW_CRITICALITY;
   rt_info[0]->importance = RtecScheduler::VERY_LOW_IMPORTANCE;
-  rt_info[0]->quantum = ORBSVCS_Time::zero ();
+  rt_info[0]->quantum = ORBSVCS_Time::zero;
   rt_info[0]->threads = 0;
   rt_info[0]->priority = 0;
   rt_info[0]->preemption_subpriority = 0;
   rt_info[0]->preemption_priority = 0;
-  rt_info[0]->info_type = RtecScheduler::OPERATION;
-  rt_info[0]->volatile_token = 0;
 
   RtecScheduler::handle_t handle = -1;
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
@@ -135,9 +132,9 @@ ACE_Config_Scheduler::get (RtecScheduler::handle_t handle,
 
 void ACE_Config_Scheduler::set (RtecScheduler::handle_t handle,
                                 RtecScheduler::Criticality_t criticality,
-                                RtecScheduler::Time time,
-                                RtecScheduler::Time typical_time,
-                                RtecScheduler::Time cached_time,
+				RtecScheduler::Time time,
+				RtecScheduler::Time typical_time,
+				RtecScheduler::Time cached_time,
                                 RtecScheduler::Period_t period,
                                 RtecScheduler::Importance_t importance,
                                 RtecScheduler::Quantum_t quantum,
@@ -274,19 +271,19 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   CORBA::ULong anomaly_index = 0;
   if (anomalies.ptr () == 0)
     {
-      anomalies =
+      anomalies = 
         new RtecScheduler::Scheduling_Anomaly_Set (anomaly_set.size ());
     }
   anomalies->length (anomaly_set.size ());
-  ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *>
+  ACE_Unbounded_Set_Iterator<RtecScheduler::Scheduling_Anomaly *> 
     anomaly_iter (anomaly_set);
-  for (anomaly_iter.first (), anomaly_index = 0;
-       anomaly_iter.next (anomaly);
+  for (anomaly_iter.first (), anomaly_index = 0; 
+       anomaly_iter.next (anomaly); 
        anomaly_iter.advance (), ++anomaly_index)
     {
       if (0 == *anomaly)
         {
-          // if for some reason we stored a null anomaly pointer,
+          // if for some reason we stored a null anomaly pointer, 
           // just give default values to that entry in the sequence.
           anomalies[anomaly_index].severity = RtecScheduler::ANOMALY_NONE;
           anomalies[anomaly_index].description = "";
@@ -322,9 +319,9 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
             anomaly_severity_msg = "UNKNOWN";
             break;
         }
-
+ 
         // Output the anomaly message
-        ACE_DEBUG ((LM_DEBUG,
+        ACE_DEBUG ((LM_DEBUG, 
                     "%s: %s\n",
                     anomaly_severity_msg,
                     (const char*) ((*anomaly)->description)));
@@ -338,37 +335,37 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 
   switch (severity)
     {
-      // On a fatal anomaly abort without generating a schedule.
+      // On a fatal anomaly abort without generating a schedule. 
       case RtecScheduler::ANOMALY_FATAL:
         // TODO: throw something.
         ACE_ERROR ((LM_ERROR, "Schedule failed due to FATAL anomaly.\n"));
         return;
 
-      // Otherwise, make sure we didn't get a fatal return type.
+      // Otherwise, make sure we didn't get a fatal return type.      
       default:
         switch (schedule_status)
         {
           case BaseSchedImplType::ST_BAD_INTERNAL_POINTER :
             // TODO: throw something.
-            ACE_ERROR ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR, 
                         "Schedule failed due to bad internal pointer.\n"));
             return;
 
           case BaseSchedImplType::ST_VIRTUAL_MEMORY_EXHAUSTED :
             // TODO: throw something.
-            ACE_ERROR ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR, 
                         "Schedule failed due to insufficient memory.\n"));
             return;
 
           case BaseSchedImplType::THREAD_COUNT_MISMATCH :
             // TODO: throw something.
-            ACE_ERROR ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR, 
                         "Schedule failed due to thread count mismatch.\n"));
             return;
 
           case BaseSchedImplType::TASK_COUNT_MISMATCH :
             // TODO: throw something.
-            ACE_ERROR ((LM_ERROR,
+            ACE_ERROR ((LM_ERROR, 
                         "Schedule failed due to task count mismatch.\n"));
             return;
 
@@ -409,12 +406,12 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
   // return the set of scheduled Config_Infos
   if (configs.ptr () == 0)
     {
-      configs =
+      configs = 
         new RtecScheduler::Config_Info_Set(impl->minimum_priority_queue () + 1);
     }
   configs->length (impl->minimum_priority_queue () + 1);
   for (RtecScheduler::Preemption_Priority_t priority = 0;
-       priority <=
+       priority <= 
          (RtecScheduler::Preemption_Priority_t) impl->minimum_priority_queue ();
        ++priority)
     {
@@ -438,15 +435,15 @@ void ACE_Config_Scheduler::compute_scheduling (CORBA::Long minimum_priority,
 
   ACE_DEBUG ((LM_DEBUG, "Schedule prepared.\n"));
   ACE_DEBUG ((LM_DEBUG, "Dumping to stdout.\n"));
-  ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), *(configs.ptr()),
-                                            *(anomalies.ptr()), 0);
+  ACE_Scheduler_Factory::dump_schedule (*(infos.ptr()), *(configs.ptr()), 
+	                                    *(anomalies.ptr()), 0);
   ACE_DEBUG ((LM_DEBUG, "Dump done.\n"));
 }
 
 
 void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
                                                    RtecScheduler::OS_Priority& priority,
-                                                   RtecScheduler::Dispatching_Type_t & d_type,
+				                   RtecScheduler::Dispatching_Type_t & d_type,
                                                    CORBA::Environment &TAO_IN_ENV)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED,
@@ -465,7 +462,7 @@ void ACE_Config_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Pri
   // provide the thread priority and queue type for the given priority level
 
 
-RtecScheduler::Preemption_Priority_t
+RtecScheduler::Preemption_Priority_t 
 ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     RtecScheduler::NOT_SCHEDULED))
@@ -485,4 +482,4 @@ ACE_Config_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
 }
   // Returns the last priority number assigned to an operation in the schedule.
   // The number returned is one less than the total number of scheduled priorities.
-  // All scheduled priorities range from 0 to the number returned, inclusive.
+  // All scheduled priorities range from 0 to the number returned, inclusive. 
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 04eeae5f4dd..0b246fd7487 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -137,7 +137,7 @@ ACE_DynScheduler::status_message (ACE_DynScheduler::status_t status)
 
 // = Utility function for creating an entry for determining
 //   the severity of an anomaly detected during scheduling.
-ACE_DynScheduler::Anomaly_Severity
+ACE_DynScheduler::Anomaly_Severity 
 ACE_DynScheduler::anomaly_severity (ACE_DynScheduler::status_t status)
 {
   // Determine severity of the anomaly
@@ -180,12 +180,12 @@ ACE_DynScheduler::anomaly_severity (ACE_DynScheduler::status_t status)
 
 // = Utility function for creating an entry for the
 //   log of anomalies detected during scheduling.
-ACE_DynScheduler::Scheduling_Anomaly *
+ACE_DynScheduler::Scheduling_Anomaly * 
 ACE_DynScheduler::create_anomaly (ACE_DynScheduler::status_t status)
 {
   ACE_DynScheduler::Scheduling_Anomaly * anomaly;
   ACE_NEW_RETURN (anomaly, ACE_DynScheduler::Scheduling_Anomaly, 0);
-
+  
   anomaly->severity = anomaly_severity (status);
   anomaly->description = status_message (status);
 
@@ -749,7 +749,7 @@ ACE_DynScheduler::schedule (
           return ST_VIRTUAL_MEMORY_EXHAUSTED;
         }
 
-      switch (anomaly->severity)
+      switch (anomaly->severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -779,7 +779,7 @@ ACE_DynScheduler::schedule (
   if (temp_status != SUCCEEDED)
     {
       temp_severity = anomaly_severity (temp_status);
-      switch (temp_severity)
+      switch (temp_severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -808,7 +808,7 @@ ACE_DynScheduler::schedule (
   if (temp_status != SUCCEEDED)
     {
       temp_severity = anomaly_severity (temp_status);
-      switch (temp_severity)
+      switch (temp_severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -834,13 +834,13 @@ ACE_DynScheduler::schedule (
 
   // propagate the dispatch information from the
   // threads throughout the call graph
-  temp_status = propagate_dispatches (anomaly_set,
-                                      unresolved_locals,
+  temp_status = propagate_dispatches (anomaly_set, 
+                                      unresolved_locals, 
                                       unresolved_remotes);
   if (temp_status != SUCCEEDED)
     {
       temp_severity = anomaly_severity (temp_status);
-      switch (temp_severity)
+      switch (temp_severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -864,7 +864,7 @@ ACE_DynScheduler::schedule (
         }
     }
 
-    // log anomalies for unresolved local dependencies
+    // log anomalies for unresolved local dependencies 
     if (unresolved_locals.length () > 0)
       {
         // Create an anomaly, add it to anomaly set
@@ -878,20 +878,20 @@ ACE_DynScheduler::schedule (
             return ST_VIRTUAL_MEMORY_EXHAUSTED;
           }
 
-        ACE_NEW_RETURN (anomaly, ACE_DynScheduler::Scheduling_Anomaly,
+        ACE_NEW_RETURN (anomaly, ACE_DynScheduler::Scheduling_Anomaly, 
                         ST_VIRTUAL_MEMORY_EXHAUSTED);
-
+    
         ACE_CString temp_str ("The following entry points have "
                             "unresolved local dependencies:\n");
-        temp_str += unresolved_locals;
+        temp_str += unresolved_locals; 
 
-        anomaly->severity =
+        anomaly->severity = 
           anomaly_severity (ST_UNRESOLVED_LOCAL_DEPENDENCIES);
         anomaly->description = temp_str.c_str ();
         anomaly_set.insert (anomaly);
       }
 
-    // log anomalies for unresolved remote dependencies
+    // log anomalies for unresolved remote dependencies 
     if (unresolved_remotes.length () > 0)
       {
         // Create an anomaly, add it to anomaly set
@@ -905,14 +905,14 @@ ACE_DynScheduler::schedule (
             return ST_VIRTUAL_MEMORY_EXHAUSTED;
           }
 
-        ACE_NEW_RETURN (anomaly, ACE_DynScheduler::Scheduling_Anomaly,
+        ACE_NEW_RETURN (anomaly, ACE_DynScheduler::Scheduling_Anomaly, 
                         ST_VIRTUAL_MEMORY_EXHAUSTED);
-
+    
         ACE_CString temp_str ("The following entry points have "
                               "unresolved remote dependencies:\n");
-        temp_str += unresolved_remotes;
+        temp_str += unresolved_remotes; 
 
-        anomaly->severity =
+        anomaly->severity = 
           anomaly_severity (ST_UNRESOLVED_REMOTE_DEPENDENCIES);
         anomaly->description = temp_str.c_str ();
         anomaly_set.insert (anomaly);
@@ -923,7 +923,7 @@ ACE_DynScheduler::schedule (
   if (temp_status != SUCCEEDED)
     {
       temp_severity = anomaly_severity (temp_status);
-      switch (temp_severity)
+      switch (temp_severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -962,7 +962,7 @@ ACE_DynScheduler::schedule (
           return ST_VIRTUAL_MEMORY_EXHAUSTED;
         }
 
-      switch (anomaly->severity)
+      switch (anomaly->severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -1001,7 +1001,7 @@ ACE_DynScheduler::schedule (
           return ST_VIRTUAL_MEMORY_EXHAUSTED;
         }
 
-      switch (anomaly->severity)
+      switch (anomaly->severity) 
         {
           case RtecScheduler::ANOMALY_FATAL :
             status_ = temp_status;
@@ -1043,7 +1043,7 @@ ACE_DynScheduler::schedule (
               return ST_VIRTUAL_MEMORY_EXHAUSTED;
             }
 
-          switch (anomaly->severity)
+          switch (anomaly->severity) 
             {
               case RtecScheduler::ANOMALY_FATAL :
                 status_ = temp_status;
@@ -1082,7 +1082,7 @@ ACE_DynScheduler::schedule (
               return ST_VIRTUAL_MEMORY_EXHAUSTED;
             }
 
-          switch (anomaly->severity)
+          switch (anomaly->severity) 
             {
               case RtecScheduler::ANOMALY_FATAL :
                 status_ = temp_status;
@@ -1150,7 +1150,7 @@ ACE_DynScheduler::propagate_dispatches (
     switch (ordered_task_entries_ [i]->merge_dispatches (*dispatch_entries_,
                                                          unresolved_locals,
                                                          unresolved_remotes))
-    {
+    {                      
       case Task_Entry::INTERNAL_ERROR :
         // Create an anomaly, add it to anomaly set
         anomaly = create_anomaly (ST_BAD_INTERNAL_POINTER);
@@ -1490,7 +1490,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
         u_int thread_count = (task_entries_ [i].rt_info ()->threads > 0)
                              ? task_entries_ [i].rt_info ()->threads : 1;
         // Just use low 32 bits of effective_period.  This will
-        // have to change when TimeBase.idl is finalized.
+        // have to change when CosTimeBase.idl is finalized.
         const TimeBase::TimeT zero = 0;
         for (j = 0; j < thread_count; j++)
         {
@@ -1687,7 +1687,7 @@ ACE_DynScheduler::schedule_threads (ACE_Unbounded_Set<RtecScheduler::Scheduling_
   if (status == SUCCEEDED)
   {
     // assign priorities to the thread dispatch entries
-    status = assign_priorities (ordered_thread_dispatch_entries_,
+    status = assign_priorities (ordered_thread_dispatch_entries_, 
                                 threads_, anomaly_set);
   }
 
@@ -1724,7 +1724,7 @@ ACE_DynScheduler::schedule_dispatches (ACE_Unbounded_Set<RtecScheduler::Scheduli
   sort_dispatches (ordered_dispatch_entries_, dispatch_entry_count_);
 
   // assign dynamic and static subpriorities to the thread dispatch entries
-  return assign_subpriorities (ordered_dispatch_entries_,
+  return assign_subpriorities (ordered_dispatch_entries_, 
                                dispatch_entry_count_, anomaly_set);
 }
   // dispatch scheduling method: sets up an array of dispatch entries,
@@ -1841,7 +1841,7 @@ ACE_DynScheduler::create_timeline ()
 
       // create a new dispatch entry at the current sub-frame offset
       // Just use low 32 bits of arrival and deadline.  This will
-      // have to change when TimeBase.idl is finalized.
+      // have to change when CosTimeBase.idl is finalized.
       const TimeBase::TimeT arrival =
         ordered_dispatch_entries_[i]->arrival () + current_frame_offset;
       const TimeBase::TimeT deadline=
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am b/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
deleted file mode 100644
index 1adfc0f5e39..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Scheduling Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Sched.la
-
-libTAO_Sched_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Sched_la_SOURCES = \
-        Config_Scheduler.cpp \
-        DynSched.cpp \
-        SchedEntry.cpp \
-        Scheduler.cpp \
-        Scheduler_Generic.cpp \
-        Strategy_Scheduler.cpp
-
-noinst_HEADERS = \
-        Config_Scheduler.h \
-        DynSched.h \
-        SchedEntry.h \
-        Scheduler.h \
-        Scheduler_Generic.h \
-        Strategy_Scheduler.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
deleted file mode 100644
index 199401af658..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-// $Id$
-
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Reconfig_Scheduler.h"
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(orbsvcs, Reconfig_Scheduler, "$Id$")
-
-// Default constructor.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_Reconfig_Scheduler::ACE_Reconfig_Scheduler ()
-  : config_info_count_ (0),
-    rt_info_count_ (0),
-    is_stable_ (0)
-{
-}
-
-// Constructor. Initialize the scheduler from the POD_Config_Info, POD_RT_Info, 
-// and POD_Dependency arrays, plus stability flag.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-ACE_Reconfig_Scheduler::
-ACE_Reconfig_Scheduler (int config_count,
-                        ACE_Scheduler_Factory::POD_Config_Info config_infos[],
-                        int rt_info_count,
-                        ACE_Scheduler_Factory::POD_RT_Info rt_infos[],
-                        int dependency_count,
-                        ACE_Scheduler_Factory::POD_Dependency_Info dependency_infos[],
-                        int is_stable)
-  : config_info_count_ (0),
-    rt_info_count_ (0),
-    is_stable_ (0)
-{
-  if (this->init (config_count, config_infos,
-                  rt_info_count, rt_infos,
-                  dependency_count, dependency_infos,
-                  is_stable) 
-      == -1)
-    {
-      // CDG - TBD - complain
-    }
-}
-
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK> int
-ACE_Reconfig_Scheduler::init (int config_count,
-                              ACE_Scheduler_Factory::POD_Config_Info config_info[],
-                              int rt_info_count,
-                              ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-                              int dependency_count,
-                              ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-                              int is_stable)
-  : config_info_count_ (0),
-    rt_info_count_ (rt_info_count),
-    is_stable_ (is_stable)
-{
-  // CDG - TBD - clear out the previous entries, if any.
-
-  // CDG - TBD - (re)initialize using the new settings.
-
-  return 0;
-}
-
-
-// Create an RT_Info.  If the RT_Info already exists, is handle is simply
-// returned.  If it does not exist, a new RT_Info is created and inserted
-// into the schedule, and the handle of the new RT_Info is returned.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::handle_t
-ACE_Reconfig_Scheduler::create (const char *entry_point,
-                               CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::DUPLICATE_NAME))
-{
-  // CDG - TBD rework this to be very efficient - 
-  //           bind in the RB_Tree, and throw if it's already there.
-
-  // Just make sure it's there and return its handle.
-  for (int i = 0; i < rt_info_count_; ++i)
-      if (ACE_OS::strcmp (entry_point,
-                          rt_info_[i].entry_point) == 0)
-        return i + 1;
-
-  // TODO: throw an exception or print an error.
-  return -1;
-}
-
-// Lookup a handle for an RT_Info, and return its handle, or an error
-// value if it's not present.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::handle_t
-ACE_Reconfig_Scheduler::lookup (const char * entry_point,
-                               CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException))
-{
-  // CDG - TBD - find in the tree.
-
-  return create (entry_point, TAO_IN_ENV);
-}
-
-
-// Return a pointer to the RT_Info corresponding to the passed handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::RT_Info *
-ACE_Reconfig_Scheduler::get (RtecScheduler::handle_t handle,
-                            CORBA::Environment &ACE_TRY_ENV)
-     TAO_THROW_SPEC((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK))
-{
-  // CDG - TBD - just find in the hash map and copy it.
-
-  if (handle <= 0 || handle > rt_info_count_)
-    ACE_THROW_RETURN (RtecScheduler::UNKNOWN_TASK (),
-                      0);
-  // Note: there is no memory leak here, according to the CORBA spec,
-  // we are supposed to allocate an structure and return it, the
-  // caller owns it from then on.
-
-  // Allocate a new RT_Info
-  RtecScheduler::RT_Info* info;
-  ACE_NEW_THROW_EX (info,
-                    RtecScheduler::RT_Info,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-
-  info->entry_point = rt_info_[handle - 1].entry_point;
-  info->handle = rt_info_[handle - 1].handle;
-  info->worst_case_execution_time = rt_info_[handle - 1].worst_case_execution_time;
-  info->typical_execution_time = rt_info_[handle - 1].typical_execution_time;
-  info->cached_execution_time = rt_info_[handle - 1].cached_execution_time;
-  info->period = rt_info_[handle - 1].period;
-  info->criticality = RtecScheduler::Criticality_t(rt_info_[handle - 1].criticality);
-  info->importance = RtecScheduler::Importance_t(rt_info_[handle - 1].importance);
-  info->quantum = rt_info_[handle - 1].quantum;
-  info->threads = rt_info_[handle - 1].threads;
-  info->priority = rt_info_[handle - 1].priority;
-  info->preemption_subpriority = rt_info_[handle - 1].static_subpriority;
-  info->preemption_priority = rt_info_[handle - 1].preemption_priority;
-  info->info_type = RtecScheduler::Info_Type_t(rt_info_[handle - 1].info_type);
-
-  return info;
-}
-
-
-// Set characteristics of the RT_Info corresponding to the passed handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::set (RtecScheduler::handle_t handle,
-                                 RtecScheduler::Criticality_t criticality,
-                                 RtecScheduler::Time time,
-                                 RtecScheduler::Time typical_time,
-                                 RtecScheduler::Time cached_time,
-                                 RtecScheduler::Period_t period,
-                                 RtecScheduler::Importance_t importance,
-                                 RtecScheduler::Quantum_t quantum,
-                                 CORBA::Long threads,
-                                 RtecScheduler::Info_Type_t info_type,
-                                 CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  // CDG - TBD - redo this - should actually update, and set flags accordingly
-  //             (find in the hash map)
-
-  // We compare the values with the ones stored and print a message on
-  // any differences.
-  if (handle <= 0 || handle > rt_info_count_)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Unknown task: no entry for handle %d\n",
-                  handle));
-      TAO_THROW (RtecScheduler::UNKNOWN_TASK());
-      // NOTREACHED
-    }
-  if (rt_info_[handle - 1].worst_case_execution_time != time
-      || rt_info_[handle - 1].typical_execution_time != typical_time
-      || rt_info_[handle - 1].cached_execution_time != cached_time
-      || rt_info_[handle - 1].period != period
-      || rt_info_[handle - 1].criticality != criticality
-      || rt_info_[handle - 1].importance != importance
-      || rt_info_[handle - 1].quantum != quantum
-      || rt_info_[handle - 1].info_type != info_type
-      || rt_info_[handle - 1].threads != threads)
-    ACE_ERROR ((LM_ERROR,
-                "invalid data for RT_Info: %s\n",
-                (const char*)rt_info_[handle - 1].entry_point));
-  // TODO: throw something here.
-}
-
-
-// Returns the priority and subpriority values assigned to an RT_Info,
-// based on its handle.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::priority (RtecScheduler::handle_t handle,
-                                 RtecScheduler::OS_Priority& o_priority,
-                                 RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                 RtecScheduler::Preemption_Priority_t& p_priority,
-                                 CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  // CDG - TBD - redo this
-
-  if (handle <= 0 || handle > rt_info_count_)
-    TAO_THROW (RtecScheduler::UNKNOWN_TASK ());
-    // NOTREACHED
-
-  o_priority = rt_info_[handle - 1].priority;
-  subpriority = rt_info_[handle - 1].static_subpriority;
-  p_priority = rt_info_[handle - 1].preemption_priority;
-}
-
-
-// Returns the priority and subpriority values assigned to an RT_Info,
-// based on its entry point name.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::entry_point_priority (const char * entry_point,
-                                             RtecScheduler::OS_Priority& priority,
-                                             RtecScheduler::Preemption_Subpriority_t& subpriority,
-                                             RtecScheduler::Preemption_Priority_t& p_priority,
-                                             CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK,
-                      RtecScheduler::NOT_SCHEDULED))
-{
-  // CDG - TBD - redo this
-
-  RtecScheduler::handle_t handle = lookup (entry_point, TAO_IN_ENV);
-  if (handle < -1)
-    // The exception was thrown or is in TAO_IN_ENV already.
-    return;
-  this->priority (handle,
-                  priority,
-                  subpriority,
-                  p_priority,
-                  TAO_IN_ENV);
-}
-
-
-// This method registers a dependency between two RT_Infos.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::add_dependency (RtecScheduler::handle_t handle,
-                                       RtecScheduler::handle_t /* dependency */,
-                                       CORBA::Long /* number_of_calls */,
-                                       RtecScheduler::Dependency_Type_t /* dependency_type */,
-                                       CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UNKNOWN_TASK))
-{
-  // CDG - TBD - redo this
-
-  if (handle <= 0 || handle > rt_info_count_)
-    TAO_THROW (RtecScheduler::UNKNOWN_TASK ());
-    // NOTREACHED
-
-
-#if 0
-  // Just check that the information is consistent.
-  RtecScheduler::Dependency_Set& deps = rt_info_[handle - 1]->dependencies;
-  for (CORBA::ULong i = 0; i < deps.length (); ++i)
-    {
-      if (deps[i].rt_info == dependency
-          && deps[i].number_of_calls == number_of_calls
-          && deps[i].dependency_type == dependency_type)
-        {
-          return;
-        }
-    }
-  ACE_ERROR ((LM_ERROR, "unmatched dependency on %s\n",
-              (const char*)rt_info_[handle - 1]->entry_point));
-#endif
-}
-
-
-// If information has been added or changed since the last stable
-// schedule was computed, this method causes scheduling information
-// to be computed for all registered RT_Infos.  If the schedule is
-// already stable, this is a no-op
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::compute_scheduling (CORBA::Long /* minimum_priority */,
-                                           CORBA::Long /* maximum_priority */,
-                                           RtecScheduler::RT_Info_Set_out /* infos */,
-                                           RtecScheduler::Config_Info_Set_out /* configs */,
-                                           RtecScheduler::Scheduling_Anomaly_Set_out /* anomalies */,
-                                           CORBA::Environment &)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                      RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                      RtecScheduler::TASK_COUNT_MISMATCH))
-{
-  // CDG - TBD - redo this
-
-  // TODO: Right now just do nothing, later we could validate the
-  // priorities (without recomputing).
-  // TODO: fill up the infos.
-  return;
-}
-
-
-// Provides the thread priority and queue type for the given priority
-// level.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-void
-ACE_Reconfig_Scheduler::dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
-                                               RtecScheduler::OS_Priority& priority,
-                                               RtecScheduler::Dispatching_Type_t & d_type,
-                                               CORBA::Environment &TAO_IN_ENV)
-     TAO_THROW_SPEC ((CORBA::SystemException,
-                      RtecScheduler::NOT_SCHEDULED,
-                      RtecScheduler::UNKNOWN_PRIORITY_LEVEL))
-{
-  // CDG - TBD - redo this
-
-  // Throw an exception if a valid schedule has not been loaded
-  if (config_count_ <= 0
-      || config_info_ [p_priority].preemption_priority != p_priority)
-    {
-      TAO_THROW (RtecScheduler::NOT_SCHEDULED ());
-      ACE_NOTREACHED (return);
-    }
-  // throw an exception if an invalid priority was passed
-  else if (p_priority < 0 || p_priority >= config_count_)
-    {
-      TAO_THROW (RtecScheduler::UNKNOWN_PRIORITY_LEVEL());
-      ACE_NOTREACHED (return);
-    }
-  else
-    {
-      priority = config_info_ [p_priority].thread_priority;
-      d_type = config_info_ [p_priority].dispatching_type;
-      return;
-    }
-}
-
-
-// Returns the last priority number assigned to an operation in the
-// schedule.  The number returned is one less than the total number
-// of scheduled priorities.  All scheduled priorities range from 0
-// to the number returned, inclusive.
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-RtecScheduler::Preemption_Priority_t
-ACE_Reconfig_Scheduler::last_scheduled_priority (CORBA::Environment &TAO_IN_ENV)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED))
-{
-  // CDG - TBD - redo this
-
-  // throw an exception if a valid schedule has not been loaded
-  if (config_count_ <= 0)
-    TAO_THROW_RETURN (RtecScheduler::NOT_SCHEDULED(),
-                      (RtecScheduler::Preemption_Priority_t) -1);
-  else
-    return (RtecScheduler::Preemption_Priority_t) (config_count_ - 1);
-}
-
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
deleted file mode 100644
index 813f53faca4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    orbsvcs
-//
-// = FILENAME
-//    Reconfig_Scheduler.h
-//
-// = AUTHOR
-//     Chris Gill <cdgill@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_RECONFIG_SCHEDULER_H
-#define ACE_RECONFIG_SCHEDULER_H
-
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/RtecSchedulerS.h"
-
-template <class RECONFIG_SCHED_STRATEGY, class ACE_LOCK>
-class TAO_ORBSVCS_Export ACE_Reconfig_Scheduler : 
-  public POA_RtecScheduler::Scheduler
-{
-  // = TITLE
-  //   A servant for RtecScheduler::Scheduler that can be initialized 
-  //   and run solely with precomputed scheduling information, but is also
-  //   designed to perform efficient recomputation of scheduling info
-  //   in the face of run-time changes to RT_Infos in the schedule.
-  //
-  // = DESCRIPTION
-  //   This class implements the TAO scheduling service.  It has
-  //   the ability to accept and use precomputed scheduling information
-  //   with deterministic performance once the schedule is fully configured.
-  //   It also provides efficient and flexible lookup and computation
-  //   during schedule configuration, so that it can be used during
-  //   both schedule configuration and run-time phases of operation.
-  //
-public:
-
-  ACE_Reconfig_Scheduler ();
-  // Default constructor.
-
-  ACE_Reconfig_Scheduler (int config_count,
-                          ACE_Scheduler_Factory::POD_Config_Info config_info[],
-                          int entry_count,
-                          ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-                          int dependency_count,
-                          ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-                          int is_stable);
-  // Constructor. Initialize the scheduler from the POD_Config_Info, POD_RT_Info, 
-  // and POD_Dependency arrays, plus stability flag.
-
-  int init (int config_count,
-            ACE_Scheduler_Factory::POD_Config_Info config_info[],
-            int entry_count,
-            ACE_Scheduler_Factory::POD_RT_Info rt_info[],
-            int dependency_count,
-            ACE_Scheduler_Factory::POD_Dependency_Info dependency_info[],
-            int is_stable);
-  // Initializes the scheduler with the passed information.
-
-  virtual RtecScheduler::handle_t create (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::DUPLICATE_NAME));
-  // Create an RT_Info.  If the RT_Info already exists, is handle is simply
-  // returned.  If it does not exist, a new RT_Info is created and inserted
-  // into the schedule, and the handle of the new RT_Info is returned.
-
-  virtual RtecScheduler::handle_t lookup (const char * entry_point,
-                                          CORBA::Environment &_env)
-    TAO_THROW_SPEC((CORBA::SystemException));
-  // Lookup a handle for an RT_Info, and return its handle, or an error
-  // value if it's not present.
-
-  virtual RtecScheduler::RT_Info* get (RtecScheduler::handle_t handle,
-                                       CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Return a pointer to the RT_Info corresponding to the passed handle.
-
-  virtual void set (RtecScheduler::handle_t handle,
-                    RtecScheduler::Criticality_t criticality,
-                    RtecScheduler::Time time,
-                    RtecScheduler::Time typical_time,
-                    RtecScheduler::Time cached_time,
-                    RtecScheduler::Period_t period,
-                    RtecScheduler::Importance_t importance,
-                    RtecScheduler::Quantum_t quantum,
-                    CORBA::Long threads,
-                    RtecScheduler::Info_Type_t info_type,
-                    CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // Set characteristics of the RT_Info corresponding to the passed handle.
-
-  virtual void priority (RtecScheduler::handle_t handle,
-                         RtecScheduler::OS_Priority& o_priority,
-                         RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                         RtecScheduler::Preemption_Priority_t& p_priority,
-                         CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its handle.
-
-  virtual void entry_point_priority (const char * entry_point,
-                                     RtecScheduler::OS_Priority& o_priority,
-                                     RtecScheduler::Preemption_Subpriority_t& p_subpriority,
-                                     RtecScheduler::Preemption_Priority_t& p_priority,
-                                     CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK,
-                     RtecScheduler::NOT_SCHEDULED));
-  // Returns the priority and subpriority values assigned to an RT_Info,
-  // based on its entry point name.
-
-  virtual void add_dependency (RtecScheduler::handle_t handle,
-                               RtecScheduler::handle_t dependency,
-                               CORBA::Long number_of_calls,
-                               RtecScheduler::Dependency_Type_t dependency_type,
-                               CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UNKNOWN_TASK));
-  // This method registers a dependency between two RT_Infos.
-
-  virtual void compute_scheduling (CORBA::Long minimum_priority,
-                                   CORBA::Long maximum_priority,
-                                   RtecScheduler::RT_Info_Set_out infos,
-                                   RtecScheduler::Config_Info_Set_out configs,
-                                   RtecScheduler::Scheduling_Anomaly_Set_out anomalies,
-                                   CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                     RtecScheduler::UTILIZATION_BOUND_EXCEEDED,
-                     RtecScheduler::INSUFFICIENT_THREAD_PRIORITY_LEVELS,
-                     RtecScheduler::TASK_COUNT_MISMATCH));
-  // If information has been added or changed since the last stable
-  // schedule was computed, this method causes scheduling information
-  // to be computed for all registered RT_Infos.  If the schedule is
-  // already stable, this is a no-op
-
-  virtual void dispatch_configuration (RtecScheduler::Preemption_Priority_t p_priority,
-                                       RtecScheduler::OS_Priority& o_priority,
-                                       RtecScheduler::Dispatching_Type_t & d_type,
-                                       CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED,
-                    RtecScheduler::UNKNOWN_PRIORITY_LEVEL));
-  // Provides the thread priority and queue type for the given priority level.
-
-  virtual RtecScheduler::Preemption_Priority_t last_scheduled_priority (CORBA::Environment &_env)
-    TAO_THROW_SPEC ((CORBA::SystemException,
-                    RtecScheduler::NOT_SCHEDULED));
-  // Returns the last priority number assigned to an operation in the
-  // schedule.  The number returned is one less than the total number
-  // of scheduled priorities.  All scheduled priorities range from 0
-  // to the number returned, inclusive.
-
-private:
-
-  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<char *,
-                      RtecScheduler::RT_Info*,
-                      ACE_Less_Than<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.
-
-  RECONFIG_SCHED_STRATEGY sched_strategy_;
-  // Scheduling strategy for the reconfig scheduler.
-
-  CONFIG_INFO_MAP config_info_map_;
-  // Map for O(1) lookup of Config_Infos by priority level.
-
-  int config_info_count_;
-  // The number of elements in the config map.
-
-  RT_INFO_MAP rt_info_map_;
-  // Map for O(1) lookup of RT_Infos by handle.
-
-  RT_INFO_TREE rt_info_tree_;
-  // Map for O(1) lookup of RT_Infos by handle.
-
-  int rt_info_count_;
-  // The number of elements in the config map.
-
-  int is_stable_;
-  // Flag indicating whether a stable schedule has been computed
-  // since the last addition or modification of information.
-};
-
-#if defined (__ACE_INLINE__)
-#include "orbsvcs/Reconfig_Scheduler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_RECONFIG_SCHEDULER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
deleted file mode 100644
index a21ea7f9897..00000000000
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.i
+++ /dev/null
@@ -1,5 +0,0 @@
-// ============================================================================
-//
-// $Id$
-//
-// ============================================================================
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 8d082e333e0..abd70c0422a 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -83,14 +83,14 @@ Task_Entry::merge_dispatches (
       //       is problematic: how do we map the dispatches for this ?
       if (prohibit_dispatches (RtecScheduler::TWO_WAY_CALL) < 0)
         {
-          result = TWO_WAY_DISJUNCTION;
+          result = TWO_WAY_DISJUNCTION; 
         }
-      if (disjunctive_merge (RtecScheduler::ONE_WAY_CALL,
+      if (disjunctive_merge (RtecScheduler::ONE_WAY_CALL, 
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
         {
-          result = INTERNAL_ERROR;
+          result = INTERNAL_ERROR; 
         }
       break;
 
@@ -106,14 +106,14 @@ Task_Entry::merge_dispatches (
       //       buy us anything, anyway).
       if (prohibit_dispatches (RtecScheduler::TWO_WAY_CALL) < 0)
         {
-          result = TWO_WAY_CONJUNCTION;
+          result = TWO_WAY_CONJUNCTION; 
         }
-      if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL,
+      if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL, 
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
         {
-          result = INTERNAL_ERROR;
+          result = INTERNAL_ERROR; 
         }
       break;
 
@@ -122,19 +122,19 @@ Task_Entry::merge_dispatches (
 
       // Disjunctively merge the operation's two-way dispatches,
       // and conjunctively merge its one-way dispatches.
-      if (disjunctive_merge (RtecScheduler::TWO_WAY_CALL,
+      if (disjunctive_merge (RtecScheduler::TWO_WAY_CALL, 
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
         {
-          result = INTERNAL_ERROR;
+          result = INTERNAL_ERROR; 
         }
-      if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL,
+      if (conjunctive_merge (RtecScheduler::ONE_WAY_CALL, 
                              dispatch_entries,
                              unresolved_locals,
                              unresolved_remotes) < 0)
         {
-          result = INTERNAL_ERROR;
+          result = INTERNAL_ERROR; 
         }
       break;
 
@@ -142,7 +142,7 @@ Task_Entry::merge_dispatches (
 
       // There should not be any other kind of RT_Info, or if
       // there is, the above switch logic is in need of repair.
-      result = UNRECOGNIZED_INFO_TYPE;
+      result = UNRECOGNIZED_INFO_TYPE; 
       break;
   }
 
@@ -204,7 +204,7 @@ Task_Entry::disjunctive_merge (
     // the link matches the dependency type given
     if ((*link)->dependency_type () == dt)
     {
-      // Check for and warn about unresolved remote
+      // Check for and warn about unresolved remote 
       // dependencies in the ONE_WAY call graph.
       if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
           (*link)->caller ().has_unresolved_remote_dependencies () &&
@@ -296,7 +296,7 @@ Task_Entry::conjunctive_merge (
     // The link matches the dependency type given.
     if ((*link)->dependency_type () == dt)
     {
-      // Check for and warn about unresolved remote
+      // Check for and warn about unresolved remote 
       // dependencies in the ONE_WAY call graph.
       if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
           (*link)->caller ().has_unresolved_remote_dependencies () &&
@@ -318,7 +318,7 @@ Task_Entry::conjunctive_merge (
             ACE_CString (string_buffer);
         }
 
-      // Check for and warn about unresolved local
+      // Check for and warn about unresolved local 
       // dependencies in the ONE_WAY call graph.
       if ((*link)->dependency_type () == RtecScheduler::ONE_WAY_CALL &&
           (*link)->caller ().has_unresolved_local_dependencies () &&
@@ -500,7 +500,7 @@ Task_Entry::reframe (
 {
   int result = 0;
 
-  // if the set period is zero, treat it as uninitialized,
+  // if the set period is zero, treat it as uninitialized, 
   // and simply value the set period with the new period
   if (set_period)
   {
@@ -530,7 +530,7 @@ Task_Entry::reframe (
       {
         return -1;
       }
-
+  
       if (new_set.insert (*link, new_iter) < 0)
       {
         return -1;
@@ -601,9 +601,9 @@ Task_Entry::merge_frames (
     ACE_NEW_RETURN (entry_ptr,
                     Dispatch_Entry (src_iter.arrival (),
                                     src_iter.deadline (),
-                                    src_iter.priority (),
-                                    src_iter.OS_priority (),
-                                    owner),
+                                    src_iter.priority (), 
+				    src_iter.OS_priority (),
+				    owner),
                     -1);
 
     // if even one new dispatch was inserted, status is "something happened".
@@ -709,7 +709,7 @@ Dispatch_Entry::operator < (const Dispatch_Entry &d) const
 
   // lowest laxity (highest dynamic sub-priority) third
   // Just use low 32 bits of worst_case_execution_time.  This will
-  // have to change when TimeBase.idl is finalized.
+  // have to change when CosTimeBase.idl is finalized.
   Time this_laxity = deadline_ -
                      task_entry ().rt_info ()->worst_case_execution_time;
   Time that_laxity = d.deadline_ -
@@ -902,7 +902,7 @@ Dispatch_Proxy_Iterator::arrival () const
   }
 
   // Just use low 32 bits of arrival.  This will
-  // have to change when TimeBase.idl is finalized.
+  // have to change when CosTimeBase.idl is finalized.
   return link->dispatch_entry ().arrival () + current_frame_offset_;
 }
   // returns the adjusted arrival time of the virtual entry
@@ -917,7 +917,7 @@ Dispatch_Proxy_Iterator::deadline () const
   }
 
   // Just use low 32 bits of deadline.  This will
-  // have to change when TimeBase.idl is finalized.
+  // have to change when CosTimeBase.idl is finalized.
   return link->dispatch_entry ().deadline () + current_frame_offset_;
 }
   // returns the adjusted deadline time of the virtual entry
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
index 0aa1b64a9eb..5603dc6537b 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
@@ -170,7 +170,7 @@ Task_Entry::info_type () const
 ACE_INLINE u_long
 Task_Entry::effective_execution_time () const
 {
-  // Just use low 32 bits.  This will have to change when TimeBase.idl
+  // Just use low 32 bits.  This will have to change when CosTimeBase.idl
   // is finalized.
   ACE_UINT32 worst_case_execution_time =
     ACE_U64_TO_U32 (rt_info_->worst_case_execution_time);
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
index 0fdd8c767be..1daaeb423f6 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -220,8 +220,6 @@ Scheduler::status_t
 Scheduler_Generic::schedule (ACE_Unbounded_Set<Scheduling_Anomaly *> 
                                &anomaly_set)
 {
-  ACE_UNUSED_ARG (anomaly_set);
-
   ACE_Guard<LOCK> ace_mon (lock_);
 
   // here goes . . .
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index b9f9f1e86ec..5f08c90a8f1 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -45,12 +45,10 @@ public:
     //
     // = DESCRIPTION
     //   This type enumerates the possible states of the factory:
-    //   uninitialized, or in a configuration, runtime, or 
-    //   reconfigurable mode of operation.
+    //   uninitialized, or in a config or runtime mode of operation.
 
     UNINITIALIZED,
     CONFIG,
-    RECONFIG,
     RUNTIME
   };
 
@@ -61,7 +59,7 @@ public:
     //
     // = DESCRIPTION
     //   This class provide us with a plain old data version of
-    //   RT_Info, this is useful for implementing arrays of
+    //   RT_Info, this is useful for implementing static arrays or  of
     //   those.
 
     const char *entry_point;
@@ -80,23 +78,6 @@ public:
     CORBA::Long info_type;
   };
 
-
-  struct POD_Dependency_Info
-  {
-    // = TITLE
-    //   Plain Old Data for RT_Info Dependencies.
-    //
-    // = DESCRIPTION
-    //   This class provide us with a plain old data version of
-    //   dependencies between RT_Infos.  This is useful for implementing
-    //   arrays of those.
-
-    RtecScheduler::handle_t info_that_depends;
-    RtecScheduler::handle_t info_depended_on;
-    RtecScheduler::Dependency_Type_t dependency_type;
-    CORBA::Long number_of_calls;
-  };
-
   struct POD_Config_Info
   {
     // = TITLE
diff --git a/TAO/orbsvcs/orbsvcs/Time/Makefile.am b/TAO/orbsvcs/orbsvcs/Time/Makefile.am
deleted file mode 100644
index 7b1f4668c1a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Time/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Time Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Time.la
-
-libTAO_Time_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Time_la_SOURCES = \
-        TAO_TIO.cpp \
-        TAO_Time_Service_Clerk.cpp \
-        TAO_Time_Service_Server.cpp \
-        TAO_UTO.cpp \
-        Timer_Helper.cpp
-
-noinst_HEADERS = \
-        TAO_TIO.h \
-        TAO_Time_Service_Clerk.h \
-        TAO_Time_Service_Server.h \
-        TAO_UTO.h \
-        Timer_Helper.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 53af7791ed0..eca24247b4e 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -33,35 +33,30 @@ TAO_TIO::time_interval (CORBA::Environment &)
 CosTime::OverlapType
 TAO_TIO::spans (CosTime::UTO_ptr uto,
 		CosTime::TIO_out overlap,
-		CORBA::Environment &ACE_TRY_ENV)
+		CORBA::Environment &)
 {
   TAO_TIO *tio = 0;
-  
-  ACE_TRY
+
+  TAO_TRY
     {
       TimeBase::TimeT lb1 =
-	this->time_interval (ACE_TRY_ENV).lower_bound;
-      ACE_TRY_CHECK;
-      
+	this->time_interval (TAO_TRY_ENV).lower_bound;
       TimeBase::TimeT up1 =
-	this->time_interval (ACE_TRY_ENV).upper_bound;
-      ACE_TRY_CHECK;
-      
+	this->time_interval (TAO_TRY_ENV).upper_bound;
       TimeBase::TimeT lb2 =
-	uto->time (ACE_TRY_ENV) - uto->inaccuracy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
+	uto->time (TAO_TRY_ENV) - uto->inaccuracy (TAO_TRY_ENV);
       TimeBase::TimeT up2 =
-	uto->time (ACE_TRY_ENV) + uto->inaccuracy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
+	uto->time (TAO_TRY_ENV) + uto->inaccuracy (TAO_TRY_ENV);
+
+      TAO_CHECK_ENV;
+
       if (lb1 == lb2 && up1 == up2)
 	{
 	  ACE_NEW_RETURN (tio,
 			  TAO_TIO (lb1, up1),
 			  CosTime::OTNoOverlap);
 	  overlap = tio->_this ();
-	  
+
 	  return CosTime::OTOverlap;
 	}
       else if (lb1 > lb2 && up1 < up2)
@@ -69,7 +64,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 	  ACE_NEW_RETURN (tio,
 			  TAO_TIO (lb1, up1),
 			  CosTime::OTNoOverlap);
-	  
+
 	  overlap = tio->_this ();
 
 	  return CosTime::OTContained;
@@ -127,13 +122,12 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 
 	}
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-  
+  TAO_ENDTRY;
+
   return CosTime::OTNoOverlap;
 }
 
@@ -146,22 +140,22 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
 CosTime::OverlapType
 TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 		   CosTime::TIO_out overlap,
-		   CORBA::Environment &ACE_TRY_ENV)
+		   CORBA::Environment &)
 {
   TAO_TIO *tio_i = 0;
-  
-  ACE_TRY
+
+  TAO_TRY
     {
       TimeBase::TimeT lb1 =
-	this->time_interval (ACE_TRY_ENV).lower_bound;
+	this->time_interval (TAO_TRY_ENV).lower_bound;
       TimeBase::TimeT up1 =
-	this->time_interval (ACE_TRY_ENV).upper_bound;
+	this->time_interval (TAO_TRY_ENV).upper_bound;
       TimeBase::TimeT lb2 =
-	tio->time_interval (ACE_TRY_ENV).lower_bound;
+	tio->time_interval (TAO_TRY_ENV).lower_bound;
       TimeBase::TimeT up2 =
-	tio->time_interval (ACE_TRY_ENV).upper_bound;
+	tio->time_interval (TAO_TRY_ENV).upper_bound;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       if (lb1 == lb2 && up1 == up2)
 	{
@@ -170,7 +164,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 			  CosTime::OTNoOverlap);
 
 	  overlap = tio_i->_this ();
-	  
+
 	  return CosTime::OTOverlap;
 	}
       else if (lb1 > lb2 && up1 < up2)
@@ -180,7 +174,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 			  CosTime::OTNoOverlap);
 
 	  overlap = tio_i->_this ();
-	  
+
 	  return CosTime::OTContained;
 	}
       else if (lb1 < lb2 && up1 > up2)
@@ -236,31 +230,37 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 
 	}
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-  
+  TAO_ENDTRY;
+
   return CosTime::OTNoOverlap;
 }
 
 CosTime::UTO_ptr
-TAO_TIO::time (CORBA::Environment &ACE_TRY_ENV)
+TAO_TIO::time (CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
-  
-  ACE_NEW_THROW_EX (uto,
-		    TAO_UTO ((this->time_interval (ACE_TRY_ENV).upper_bound -
-			      this->time_interval (ACE_TRY_ENV).lower_bound) / 2,
-			     this->time_interval (ACE_TRY_ENV).upper_bound -
-			     this->time_interval (ACE_TRY_ENV).lower_bound,
-			     0),
-		    CORBA::NO_MEMORY ());
-  
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
-  
+
+  TAO_TRY
+    {
+      ACE_NEW_THROW_RETURN (uto,
+			    TAO_UTO ((this->time_interval (TAO_TRY_ENV).upper_bound -
+				      this->time_interval (TAO_TRY_ENV).lower_bound) / 2,
+				     this->time_interval (TAO_TRY_ENV).upper_bound -
+				     this->time_interval (TAO_TRY_ENV).lower_bound,
+				     0),
+			    CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			    CosTime::UTO::_nil ());
+      TAO_CHECK_ENV;
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Exception:");
+      return CosTime::UTO::_nil ();
+    }
+  TAO_ENDTRY;
   return uto->_this ();
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
index 9242d81009d..c4e3ffe3b0a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -34,16 +34,16 @@ TAO_Time_Service_Clerk::~TAO_Time_Service_Clerk (void)
 // in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Clerk::universal_time (CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (this->get_time (),
-                             this->inaccuracy (),
-                             this->time_displacement_factor ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (this->get_time (),
+				 0,
+				 0),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
   // Return the global time as a UTO.
 
   return uto->_this ();
@@ -56,7 +56,7 @@ TAO_Time_Service_Clerk::universal_time (CORBA::Environment &ACE_TRY_ENV)
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::secure_universal_time (CORBA::Environment &env)
 {
-  env.exception (new CORBA::NO_IMPLEMENT ());
+  env.exception (new CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO));
   return 0;
 }
 
@@ -66,16 +66,16 @@ CosTime::UTO_ptr
 TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 					    TimeBase::InaccuracyT inaccuracy,
 					    TimeBase::TdfT tdf,
-					    CORBA::Environment &ACE_TRY_ENV)
+					    CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (time,
-                             inaccuracy,
-                             tdf),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (time,
+				 inaccuracy,
+				 tdf),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
   return uto->_this ();
 }
 
@@ -83,23 +83,16 @@ TAO_Time_Service_Clerk::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
-				      CORBA::Environment &ACE_TRY_ENV)
+				      CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
-  // Use the low and high values of inaccuracy
-  // to calculate the total inaccuracy.
-
-  TimeBase::InaccuracyT inaccuracy = utc.inacchi;
-  inaccuracy <<= 32;
-  inaccuracy |= utc.inacclo;
-
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (utc.time,
-                             inaccuracy,
-                             utc.tdf),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (utc.time,
+				 utc.inacclo + utc.inacchi,
+				 utc.tdf),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
   return uto->_this ();
 }
 
@@ -108,15 +101,15 @@ TAO_Time_Service_Clerk::uto_from_utc (const TimeBase::UtcT &utc,
 CosTime::TIO_ptr
 TAO_Time_Service_Clerk::new_interval (TimeBase::TimeT lower,
 				      TimeBase::TimeT upper,
-				      CORBA::Environment &ACE_TRY_ENV)
+				      CORBA::Environment &TAO_IN_ENV)
 {
   TAO_TIO *tio = 0;
 
-  ACE_NEW_THROW_EX (tio,
-                    TAO_TIO (lower,
-                             upper),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
+  ACE_NEW_THROW_RETURN (tio,
+			TAO_TIO (lower,
+				 upper),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::TIO::_nil ());
   return tio->_this ();
 }
 
@@ -133,32 +126,3 @@ TAO_Time_Service_Clerk::get_time (void)
 
   return time;
 }
-
-// Returns the time displacement factor in minutes.
-// This is displacement from the GMT.
-CORBA::Short
-TAO_Time_Service_Clerk::time_displacement_factor (void)
-{
-  return time_displacement_factor_;
-}
-
-// Sets the TDF.
-void
-TAO_Time_Service_Clerk::time_displacement_factor (CORBA::Short tdf)
-{
-  this->time_displacement_factor_ = tdf;
-}
-
-// GET method for inaccuracy.
-TimeBase::InaccuracyT
-TAO_Time_Service_Clerk::inaccuracy (void)
-{
-  return this->inaccuracy_;
-}
-
-// SET method for inaccuracy.
-void
-TAO_Time_Service_Clerk::inaccuracy (TimeBase::InaccuracyT inaccuracy)
-{
-  this->inaccuracy_ = inaccuracy;
-}
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
index bf1dc48e071..0c7d9f7f766 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -85,30 +85,12 @@ public:
   void name_server (TAO_Naming_Server &server);
   // This method is called by the driver program to set the Naming
   // Server instance.
-  
-  CORBA::Short time_displacement_factor (void);
-  // Returns the time displacement factor.
-  
-  void time_displacement_factor (CORBA::Short);
-  // Set the TDF.
-  
-  TimeBase::InaccuracyT inaccuracy (void);
-  // GET method for inaccuracy.   
-  
-  void inaccuracy (TimeBase::InaccuracyT inaccuracy);
-  // SET method for inaccuracy.    
-  
+
   CORBA::ULongLong time_;
   // Clerk's notion of time.
 
 private:
 
-  CORBA::Short time_displacement_factor_;
-  // Time displacement factor in minutes.
-
-  TimeBase::InaccuracyT inaccuracy_;
-  // Inaccuracy in the time.
-
   IORS server_;
   // Set of server Time Server IORs.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
index ef145723be2..ff89a23ce7f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.cpp
@@ -20,18 +20,18 @@ TAO_Time_Service_Server::~TAO_Time_Service_Server (void)
 // inaccuracy in a UTO.
 
 CosTime::UTO_ptr
-TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
+TAO_Time_Service_Server::universal_time (CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
   // Return the local time of the system as a UTO.
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (CORBA::ULongLong (ACE_OS::gettimeofday ().sec () * 10000000
-                                               + ACE_OS::gettimeofday ().usec () * 10),
-                             0,
-                             0),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (CORBA::ULongLong (ACE_OS::gettimeofday ().sec () * 10000000
+                                                   + ACE_OS::gettimeofday ().usec () * 10),
+				 0,
+				 0),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
 
   ACE_DEBUG ((LM_DEBUG,
 	      "Returning a UTO\n"));
@@ -56,7 +56,7 @@ TAO_Time_Service_Server::universal_time (CORBA::Environment &ACE_TRY_ENV)
 CosTime::UTO_ptr
 TAO_Time_Service_Server::secure_universal_time (CORBA::Environment &env)
 {
-  env.exception (new CORBA::NO_IMPLEMENT ());
+  env.exception (new CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO));
   return 0;
 }
 
@@ -66,16 +66,16 @@ CosTime::UTO_ptr
 TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 					     TimeBase::InaccuracyT inaccuracy,
 					     TimeBase::TdfT tdf,
-					     CORBA::Environment &ACE_TRY_ENV)
+					     CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (time,
-                             inaccuracy,
-                             tdf),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (time,
+				 inaccuracy,
+				 tdf),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
 
   return uto->_this ();
 
@@ -85,16 +85,16 @@ TAO_Time_Service_Server::new_universal_time (TimeBase::TimeT time,
 
 CosTime::UTO_ptr
 TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
-				       CORBA::Environment &ACE_TRY_ENV)
+				       CORBA::Environment &TAO_IN_ENV)
 {
   TAO_UTO *uto = 0;
 
-  ACE_NEW_THROW_EX (uto,
-                    TAO_UTO (utc.time,
-                             utc.inacclo + utc.inacchi,
-                             utc.tdf),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::UTO::_nil ());
+  ACE_NEW_THROW_RETURN (uto,
+			TAO_UTO (utc.time,
+				 utc.inacclo + utc.inacchi,
+				 utc.tdf),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::UTO::_nil ());
   return uto->_this ();
 }
 
@@ -103,14 +103,14 @@ TAO_Time_Service_Server::uto_from_utc (const TimeBase::UtcT &utc,
 CosTime::TIO_ptr
 TAO_Time_Service_Server::new_interval (TimeBase::TimeT lower,
 				       TimeBase::TimeT upper,
-				       CORBA::Environment &ACE_TRY_ENV)
+				       CORBA::Environment &TAO_IN_ENV)
 {
   TAO_TIO *tio = 0;
 
-  ACE_NEW_THROW_EX (tio,
-                    TAO_TIO (lower,
-                             upper),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
+  ACE_NEW_THROW_RETURN (tio,
+			TAO_TIO (lower,
+				 upper),
+			CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+			CosTime::TIO::_nil ());
   return tio->_this ();
 }
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
index 6a00579ab62..a6381267c65 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -3,7 +3,6 @@
 
 #include "TAO_UTO.h"
 #include "TAO_TIO.h"
-#include "ace/OS.h"
 
 // Constructor.
 
@@ -11,24 +10,10 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time,
                   TimeBase::InaccuracyT inaccuracy,
                   TimeBase::TdfT tdf)
 {
-
   this->attr_utc_time_.time = time;
-
-  // Extract the lower 32 bits in the inacclo.
-  this->attr_utc_time_.inacclo = (CORBA::ULong) ACE_U64_TO_U32 (inaccuracy);
-
-  // Extract the lower 16 bits of the remaining bits. 'And'ing with 0xFFFF
-  // is only a sanity check.
-
-#if defined (ACE_LACKS_U_LONGLONG_T)
-  this->attr_utc_time_.inacchi = 0;
-#else
-  this->attr_utc_time_.inacchi = ACE_static_cast (CORBA::UShort, (inaccuracy >> 32) & 0xFFFF);
-
-#endif /* ACE_LACKS_U_LONGLONG_T */
-
+  this->attr_utc_time_.inacchi = ACE_U64_TO_U32 (inaccuracy) / 2;
+  this->attr_utc_time_.inacclo = ACE_U64_TO_U32 (inaccuracy - (inaccuracy/2));
   this->attr_utc_time_.tdf = tdf;
-
 }
 
 // Destructor.
@@ -50,13 +35,7 @@ TAO_UTO::time (CORBA::Environment &)
 TimeBase::InaccuracyT
 TAO_UTO::inaccuracy (CORBA::Environment &)
 {
-  // Construct the Inaccuracy from the
-  // inacchi and inacclo.
-
-  TimeBase::InaccuracyT inaccuracy = attr_utc_time_.inacchi;
-  inaccuracy <<= 32;
-  inaccuracy |= attr_utc_time_.inacclo;
-  return inaccuracy;
+  return attr_utc_time_.inacclo + attr_utc_time_.inacchi;
 }
 
 // Get method for the readonly attribute tdf.
@@ -90,63 +69,62 @@ TAO_UTO::absolute_time (CORBA::Environment &)
 CosTime::TimeComparison
 TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
                        CosTime::UTO_ptr uto,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &)
 {
-  ACE_TRY
+  TAO_TRY
     {
       if (comparison_type == CosTime::MidC)
         {
-          if (this->time (ACE_TRY_ENV) == uto->time (ACE_TRY_ENV))
+          if (this->time (TAO_TRY_ENV) == uto->time (TAO_TRY_ENV))
             {
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
               return CosTime::TCEqualTo;
             }
-          else if (this->time (ACE_TRY_ENV) > uto->time (ACE_TRY_ENV))
+          else if (this->time (TAO_TRY_ENV) > uto->time (TAO_TRY_ENV))
             {
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
               return CosTime::TCGreaterThan;
             }
           else
             return CosTime::TCLessThan;
         }
-      else if (this->time (ACE_TRY_ENV) == uto->time (ACE_TRY_ENV))
+      else if (this->time (TAO_TRY_ENV) == uto->time (TAO_TRY_ENV))
         {
-          ACE_TRY_CHECK;
-          if (this->inaccuracy (ACE_TRY_ENV) == 0 && uto->inaccuracy (ACE_TRY_ENV) == 0)
+          TAO_CHECK_ENV;
+          if (this->inaccuracy (TAO_TRY_ENV) == 0 && uto->inaccuracy (TAO_TRY_ENV) == 0)
             {
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
               return CosTime::TCEqualTo;
             }
         }
       else
         {
-          if (this->time (ACE_TRY_ENV) > uto->time (ACE_TRY_ENV))
+          if (this->time (TAO_TRY_ENV) > uto->time (TAO_TRY_ENV))
             {
-              ACE_TRY_CHECK;
-              if (this->time (ACE_TRY_ENV) - this->inaccuracy (ACE_TRY_ENV)
-                  > uto->time (ACE_TRY_ENV) - uto->inaccuracy (ACE_TRY_ENV))
+              TAO_CHECK_ENV;
+              if (this->time (TAO_TRY_ENV) - this->inaccuracy (TAO_TRY_ENV)
+                  > uto->time (TAO_TRY_ENV) - uto->inaccuracy (TAO_TRY_ENV))
                 {
-                  ACE_TRY_CHECK;
+                  TAO_CHECK_ENV;
                   return CosTime::TCGreaterThan;
                 }
             }
-          else if (this->time (ACE_TRY_ENV) + this->inaccuracy (ACE_TRY_ENV)
-                   < uto->time (ACE_TRY_ENV) - uto->inaccuracy (ACE_TRY_ENV))
+          else if (this->time (TAO_TRY_ENV) + this->inaccuracy (TAO_TRY_ENV)
+                   < uto->time (TAO_TRY_ENV) - uto->inaccuracy (TAO_TRY_ENV))
 
             {
-              ACE_TRY_CHECK;
+              TAO_CHECK_ENV;
               return CosTime::TCLessThan;
             }
         }
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::TCIndeterminate);
-  
+  TAO_ENDTRY;
+
   return CosTime::TCIndeterminate;
 }
 
@@ -158,74 +136,68 @@ TAO_UTO::compare_time (CosTime::ComparisonType comparison_type,
 
 CosTime::TIO_ptr
 TAO_UTO::time_to_interval (CosTime::UTO_ptr uto,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_IN_ENV)
 {
   TAO_TIO *tio = 0;
 
-  ACE_TRY
+  TAO_TRY
     {
-      if (this->time (ACE_TRY_ENV) > uto->time (ACE_TRY_ENV))
-        {
-	  ACE_NEW_THROW_EX (tio,
-			    TAO_TIO (uto->time (ACE_TRY_ENV),
-				     this->time (ACE_TRY_ENV)),
-			    CORBA::NO_MEMORY ());
-	  
-	  ACE_TRY_CHECK;
-	}
+      if (this->time (TAO_TRY_ENV) > uto->time (TAO_TRY_ENV))
+        ACE_NEW_THROW_RETURN (tio,
+                              TAO_TIO (uto->time (TAO_TRY_ENV),
+                                       this->time (TAO_TRY_ENV)),
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              CosTime::TIO::_nil ());
       else
-        {
-	  ACE_NEW_THROW_EX (tio,
-			    TAO_TIO (this->time (ACE_TRY_ENV),
-				     uto->time (ACE_TRY_ENV)),
-			    CORBA::NO_MEMORY ());
-	  
-	  ACE_TRY_CHECK;
-	}
+        ACE_NEW_THROW_RETURN (tio,
+                              TAO_TIO (this->time (TAO_TRY_ENV),
+                                       uto->time (TAO_TRY_ENV)),
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              CosTime::TIO::_nil ());
+      TAO_CHECK_ENV;
+
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
-  
+  TAO_ENDTRY;
+
   return tio->_this ();
 }
 
-// Returns a TIO object representing the error interval around the
-// time value in the UTO.
+  // Returns a TIO object representing the error interval around the
+  // time value in the UTO.
 
 CosTime::TIO_ptr
-TAO_UTO::interval (CORBA::Environment &ACE_TRY_ENV)
+TAO_UTO::interval (CORBA::Environment &TAO_IN_ENV)
 {
   TAO_TIO *tio = 0;
-  
-  ACE_TRY
+
+  TAO_TRY
     {
       TimeBase::TimeT lower =
-        this->time (ACE_TRY_ENV) - this->inaccuracy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->time (TAO_TRY_ENV) - this->inaccuracy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       TimeBase::TimeT upper =
-        this->time (ACE_TRY_ENV) + this->inaccuracy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_NEW_THROW_EX (tio,
-			TAO_TIO (lower,
-				 upper),
-			CORBA::NO_MEMORY ());
-      ACE_TRY_CHECK;      
+        this->time (TAO_TRY_ENV) + this->inaccuracy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      ACE_NEW_THROW_RETURN (tio,
+                            TAO_TIO (lower,
+                                     upper),
+                            CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                            CosTime::TIO::_nil ());
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception:");
+      TAO_TRY_ENV.print_exception ("Exception:");
       return CosTime::TIO::_nil ();
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (CosTime::TIO::_nil ());
-  
+  TAO_ENDTRY;
+
   return tio->_this ();
 }
-
diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 2da2b708e98..5e25f40c2eb 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -3,7 +3,6 @@
 
 #include "Timer_Helper.h"
 #include "TAO_Time_Service_Clerk.h"
-#include "ace/OS.h"
 
 // Constructor.
 Timer_Helper::Timer_Helper (void)
@@ -29,113 +28,76 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 {
   int no_of_servers = 0;
   CORBA::ULongLong sum = 0;
-  
-  // The following are used to keep a track of the inaccuracy
-  // in synchronization.
-
-#if defined (ACE_LACKS_LONGLONG_T)
-  CORBA::ULongLong lowest_time (0xFFFFFFFF, 0xFFFFFFFF);
-#else
-  CORBA::ULongLong lowest_time = ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF);
-#endif
-  
-  CORBA::ULongLong highest_time  = 0;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+
+  TAO_TRY
     {
       IORS::TYPE* value;
       for (IORS::ITERATOR server_iterator (this->clerk_->server_);
 	   server_iterator.next (value) != 0;
 	   server_iterator.advance ())
 	{
-	  
+
+	  printf("Making a remote Call\n");
 	  // This is a remote call.
 	  CosTime::UTO_var UTO_server =
-	    (*value)->universal_time (ACE_TRY_ENV);
-	  
-	  ACE_TRY_CHECK;
-	  
-          #if defined (ACE_LACKS_LONGLONG_T)
-	  
+	    (*value)->universal_time (TAO_TRY_ENV);
+
+	  TAO_CHECK_ENV;
+
+	  #if defined (ACE_LACKS_LONGLONG_T)
+
 	  ACE_DEBUG ((LM_DEBUG,
 		      "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
 		      "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
-		      ACE_U64_TO_U32 (UTO_server->time (ACE_TRY_ENV)),
-		      ACE_U64_TO_U32 (UTO_server->inaccuracy (ACE_TRY_ENV)),
-		      UTO_server->tdf (ACE_TRY_ENV),
+		      ACE_U64_TO_U32 (UTO_server->time (TAO_TRY_ENV)),
+		      ACE_U64_TO_U32 (UTO_server->inaccuracy (TAO_TRY_ENV)),
+		      UTO_server->tdf (TAO_TRY_ENV),
 		      ACE_U64_TO_U32 ((UTO_server->utc_time ()).time),
 		      (UTO_server->utc_time ()).inacclo,
 		      (UTO_server->utc_time ()).inacchi,
 		      (UTO_server->utc_time ()).tdf));
-	  
+
           #else
 
 	  ACE_DEBUG ((LM_DEBUG,
 		      "\nTime = %Q\nInaccuracy = %Q\nTimeDiff = %d\nstruct.time = %Q\n"
 		      "struct.inacclo = %d\nstruct.inacchi = %d\nstruct.Tdf = %d\n",
-		      UTO_server->time (ACE_TRY_ENV),
-		      UTO_server->inaccuracy (ACE_TRY_ENV),
-		      UTO_server->tdf (ACE_TRY_ENV),
+		      UTO_server->time (TAO_TRY_ENV),
+		      UTO_server->inaccuracy (TAO_TRY_ENV),
+		      UTO_server->tdf (TAO_TRY_ENV),
 		      (UTO_server->utc_time ()).time,
 		      (UTO_server->utc_time ()).inacclo,
 		      (UTO_server->utc_time ()).inacchi,
 		      (UTO_server->utc_time ()).tdf));
           #endif
-	  
-	  CORBA::ULongLong curr_server_time = UTO_server->time (ACE_TRY_ENV);
-	  
-	  ACE_TRY_CHECK;
 
-	  sum += curr_server_time;
-	  
+	  // This is a remote call.
+	  sum += (CORBA::ULongLong) UTO_server->time (TAO_TRY_ENV);
+
 	  ++no_of_servers;
-	  
-	  // Set the highest time to the largest time seen so far.
-	  if (curr_server_time > highest_time)
-	    highest_time = curr_server_time;
-	  
-	  // Set the lowest time to the smallest time seen so far.
-	  if (curr_server_time < lowest_time)
-	    lowest_time = curr_server_time;
-	  
 	}
 
       ACE_DEBUG ((LM_DEBUG,
 		  "\nUpdated time from %d servers in the network",
 		  no_of_servers));
-      
+
       // Return the average of the times retrieved from the various
       // servers.
       clerk_->time_ = sum / no_of_servers ;
 
-      // Set the Time Displacement Factor. The TZ environment variable is 
-      // read to set the time zone. We convert the timezone value from seconds 
-      // to minutes.
-
-      ACE_OS::tzset();
-      clerk_->time_displacement_factor (ACE_OS::timezone () / 60);
-
-      // Set the inaccuracy.
-      if (highest_time > lowest_time)
-	clerk_->inaccuracy (highest_time - lowest_time);
-      else
-	clerk_->inaccuracy (0);
-      
       // Record the current time in a timestamp to know when global
       // updation of time was done.
       clerk_->update_timestamp_ = ACE_OS::gettimeofday ().sec () * 10000000
         + ACE_OS::gettimeofday ().usec () * 10;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception in the handle_timeout ()\n");
+      TAO_TRY_ENV.print_exception ("Exception in the handle_timeout ()\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  
+  TAO_ENDTRY;
+
   return 0;
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/TimeBase.idl b/TAO/orbsvcs/orbsvcs/TimeBase.idl
deleted file mode 100644
index 40a51d7de8a..00000000000
--- a/TAO/orbsvcs/orbsvcs/TimeBase.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef _TIME_BASE_IDL_
-#define _TIME_BASE_IDL_
-
-// Force the IDL compiler to include this file [it does not include
-// empty files]
-#pragma prefix "omg.org"
-
-#include "tao/TimeBase.pidl"
-
-#pragma prefix ""
-
-#endif /* _TIME_BASE_IDL_ */
diff --git a/TAO/orbsvcs/orbsvcs/TimeService.idl b/TAO/orbsvcs/orbsvcs/TimeService.idl
index 1955431b5e2..ce8568941d9 100644
--- a/TAO/orbsvcs/orbsvcs/TimeService.idl
+++ b/TAO/orbsvcs/orbsvcs/TimeService.idl
@@ -1,10 +1,7 @@
 // -*- C++ -*-
 // $Id$
 
-#ifndef TAO_TIME_IDL
-#define TAO_TIME_IDL
-
-#include "TimeBase.idl"
+#include "CosTimeBase.idl"
 
 #pragma prefix "omg.org"
 
@@ -68,7 +65,7 @@ module CosTime
       // = DESCRIPTION
       //   This interface provides the following
       //   operations on basic time :
-      //        - Construction of a UTO from piece parts, and extraction of the
+      //	- Construction of a UTO from piece parts, and extraction of the
       //          piece parts from a UTO. The piece parts are the readonly
       //          attributes :
       //                      time
@@ -99,7 +96,7 @@ module CosTime
       // relative time in the object.
 
       TimeComparison compare_time (in ComparisonType comparison_type,
-                                   in UTO uto);
+				   in UTO uto);
       // Compares the time contained in the object with the time in
       // the supplied uto according to the supplied comparison type.
 
@@ -130,13 +127,13 @@ module CosTime
       // Consists of a lower and an upper bound for the time interval.
 
       CosTime::OverlapType spans (in UTO time,
-                                  out TIO overlap);
+				  out TIO overlap);
       // This operation compares the time in this interface with the time
       // in the supplied UTO and returns the overlap type as well as the
       // interval of overlap in the form of a TIO.
 
       CosTime::OverlapType overlaps (in TIO interval,
-                                     out TIO overlap);
+				     out TIO overlap);
       // This operation compares the time in this interface with the time
       // in the supplied TIO and returns the overlap type as well as the
       // interval of overlap in the form of a TIO.
@@ -163,17 +160,15 @@ module CosTime
       // time can be guaranteed to have been obtained securely.
 
       UTO new_universal_time (in TimeBase::TimeT time,
-                              in TimeBase::InaccuracyT inaccuracy,
-                              in TimeBase::TdfT tdf);
+			      in TimeBase::InaccuracyT inaccuracy,
+			      in TimeBase::TdfT tdf);
       // This creates a new UTO based on the given parameters.
 
       UTO uto_from_utc (in TimeBase::UtcT utc);
       // This creates a new UTO given a time in the UtcT form.
 
       TIO new_interval (in TimeBase::TimeT lower,
-                        in TimeBase::TimeT upper );
+			in TimeBase::TimeT upper );
       // This creates a new TIO with the given parameters.
     };
 };
-
-#endif /* TAO_TIME_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index b0ee99afdbb..5772940664e 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -7,3 +7,5 @@
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
+
+TimeBase::TimeT ORBSVCS_Time::zero = 0;
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 89fe036aa66..04fa099fb5b 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -17,7 +17,7 @@
 #ifndef ORBSVCS_TIME_UTILITIES_H
 #define ORBSVCS_TIME_UTILITIES_H
 
-#include "orbsvcs/TimeBaseC.h"
+#include "orbsvcs/CosTimeBaseC.h"
 #include "orbsvcs/orbsvcs_export.h"
 
 class TAO_ORBSVCS_Export ORBSVCS_Time
@@ -34,7 +34,7 @@ class TAO_ORBSVCS_Export ORBSVCS_Time
   //   nanoseconds as time units (i.e. 1 second is 10^7 TimeT units).
 public:
   // = A helper constant, IDL does not have constant for structures.
-  static TimeBase::TimeT zero ();
+  static TimeBase::TimeT zero;
 
   // = ACE_hrtime_t conversion routines.
 
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
index 6f4dea5f231..d219bd202d4 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -1,11 +1,5 @@
 // $Id$
 
-ACE_INLINE TimeBase::TimeT
-ORBSVCS_Time::zero ()
-{
-  return 0;
-}
-
 ACE_INLINE void
 ORBSVCS_Time::TimeT_to_hrtime (ACE_hrtime_t &lhs,
                                const TimeBase::TimeT& rhs)
@@ -34,10 +28,7 @@ ACE_INLINE void
 ORBSVCS_Time::Time_Value_to_TimeT (TimeBase::TimeT& lhs,
                                    const ACE_Time_Value& rhs)
 {
-  ACE_hrtime_t t =
-    ACE_static_cast (ACE_hrtime_t, rhs.sec ()) * ACE_U_ONE_SECOND_IN_NSECS +
-    ACE_static_cast (ACE_hrtime_t, rhs.usec ()) * 1000u;
-
+  ACE_hrtime_t t = rhs.sec () * ACE_ONE_SECOND_IN_NSECS + rhs.usec () * 1000;
   ORBSVCS_Time::hrtime_to_TimeT (lhs, t);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Locking.h b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
index 4db78119f9b..0c79088727e 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Locking.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Locking.h
@@ -27,21 +27,22 @@
 #define TAO_WRITE_GUARD(MUTEX,OBJ,LOCK) \
 ACE_Write_Guard<MUTEX> OBJ (LOCK); \
 if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
+  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
 
 #define TAO_READ_GUARD(MUTEX,OBJ,LOCK) \
 ACE_Read_Guard<MUTEX> OBJ (LOCK); \
 if (OBJ.locked () == 0) \
-  TAO_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
+  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
 
 #define TAO_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
 ACE_Write_Guard<MUTEX> OBJ (LOCK); \
 if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), RETURN);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), RETURN);
 
 #define TAO_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
 ACE_Read_Guard<MUTEX> OBJ (LOCK); \
 if (OBJ.locked () == 0) \
-  TAO_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), RETURN);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), RETURN);
 
 #endif /* TAO_LOCKING_H */
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am b/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
deleted file mode 100644
index 7c906d9aef0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Trader/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's Trading Service library
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libTAO_Trader.la
-
-libTAO_Trader_la_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libTAO_Trader_la_SOURCES = \
-        Constraint_Interpreter.cpp \
-        Constraint_Nodes.cpp \
-        Constraint_Visitors.cpp \
-        Constraint_l.cpp \
-        Constraint_y.cpp \
-        Offer_Database.cpp \
-        Offer_Iterators.cpp \
-        Offer_Iterators_T.cpp \
-        Service_Type_Repository.cpp \
-        Trader.cpp \
-        Trader_Interfaces.cpp \
-        Trader_T.cpp \
-        Trader_Utils.cpp
-
-noinst_HEADERS = \
-        Constraint_Interpreter.h \
-        Constraint_Nodes.h \
-        Constraint_Tokens.h \
-        Constraint_Visitors.h \
-        Locking.h \
-        Offer_Database.h \
-        Offer_Iterators.h \
-        Offer_Iterators_T.h \
-        Service_Type_Repository.h \
-        Trader.h \
-        Trader_Interfaces.h \
-        Trader_T.h \
-        Trader_Utils.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
index 4aa178f59ac..caa2c2c2a3c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.cpp
@@ -22,12 +22,12 @@ TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void)
        type_iter++)
     {
       Offer_Map_Entry* offer_map_entry = (*type_iter).int_id_;
-
+      
       {
         // Artificial scope, so the guard will release the lock before
         // we delete the lock along with the offer_map_entry.
         ACE_WRITE_GUARD (LOCK_TYPE, ace_mon, offer_map_entry->lock_);
-
+        
         for (TAO_Offer_Map::iterator offer_iter (*offer_map_entry->offer_map_);
              ! offer_iter.done ();
              offer_iter++)
@@ -47,13 +47,13 @@ TAO_Offer_Database<LOCK_TYPE>::~TAO_Offer_Database (void)
 template <class LOCK_TYPE> CosTrading::OfferId
 TAO_Offer_Database<LOCK_TYPE>::
 insert_offer (const char* type, CosTrading::Offer* offer)
-{
+{ 
   CosTrading::OfferId return_value = 0;
   ACE_TYPENAME Offer_Database::ENTRY* database_entry = 0;
-  TAO_String_Hash_Key service_type (type);
+  TAO_String_Hash_Key service_type (type); 
 
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
-
+  
   if (this->offer_db_.find (service_type, database_entry) == -1)
     {
       // If there's no entry for the service type, create one.
@@ -71,14 +71,14 @@ insert_offer (const char* type, CosTrading::Offer* offer)
           ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
           this->offer_db_.bind (service_type, new_offer_map_entry, database_entry);
         }
-
+      
       if (this->db_lock_.acquire_read () == -1)
         return 0;
     }
 
   Offer_Map_Entry* offer_map_entry = database_entry->int_id_;
   ACE_WRITE_GUARD_RETURN (LOCK_TYPE, ace_mon2, offer_map_entry->lock_, 0);
-
+  
   // Add the offer to the service offer table for this service type.
   offer_map_entry->offer_map_->bind (offer_map_entry->counter_, offer);
   return_value = this->generate_offer_id (type, offer_map_entry->counter_);
@@ -92,11 +92,11 @@ TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const char* type, CORBA::ULong id)
 {
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, -1);
-
+  
   int return_value = -1;
   ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
-  TAO_String_Hash_Key service_type (type);
-
+  TAO_String_Hash_Key service_type (type); 
+  
   if (this->offer_db_.find (service_type, db_entry) == 0)
     {
       CosTrading::Offer* offer = 0;
@@ -104,7 +104,7 @@ remove_offer (const char* type, CORBA::ULong id)
 
       if (offer_map_entry->lock_.acquire_write () == -1)
         return -1;
-
+      
       return_value = offer_map_entry->offer_map_->unbind (id, offer);
       delete offer;
 
@@ -117,7 +117,7 @@ remove_offer (const char* type, CORBA::ULong id)
           else
             {
               // Promote the database lock. Will be released by
-              // guard.
+              // guard. 
               if (this->db_lock_.acquire_write () == -1)
                 return -1;
 
@@ -132,7 +132,7 @@ remove_offer (const char* type, CORBA::ULong id)
               // Delete the database resources for this type.
               delete offer_map_entry->offer_map_;
               delete offer_map_entry;
-            }
+            }          
         }
       else if (offer_map_entry->lock_.release () == -1)
         return -1;
@@ -140,13 +140,13 @@ remove_offer (const char* type, CORBA::ULong id)
 
   return return_value;
 }
-
+  
 template <class LOCK_TYPE> int
 TAO_Offer_Database<LOCK_TYPE>::
 remove_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& TAO_IN_ENV)
+	      CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
+		  CosTrading::UnknownOfferId))
 {
   char* stype = 0;
   CORBA::ULong index;
@@ -163,10 +163,10 @@ remove_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              char*& type_name,
-              CORBA::Environment& TAO_IN_ENV)
+	      char*& type_name,
+	      CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
+		  CosTrading::UnknownOfferId))
 {
   CORBA::ULong index;
   CosTrading::Offer* offer = 0;
@@ -183,9 +183,9 @@ lookup_offer (const CosTrading::OfferId offer_id,
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const CosTrading::OfferId offer_id,
-              CORBA::Environment& TAO_IN_ENV)
+	      CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CosTrading::IllegalOfferId,
-                  CosTrading::UnknownOfferId))
+		  CosTrading::UnknownOfferId))
 {
   char* type_name;
   CORBA::ULong index;
@@ -199,7 +199,7 @@ lookup_offer (const CosTrading::OfferId offer_id,
 
   return offer;
 }
-
+  
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Offer_Database<LOCK_TYPE>::
 lookup_offer (const char* type, CORBA::ULong id)
@@ -208,11 +208,11 @@ lookup_offer (const char* type, CORBA::ULong id)
 
   CosTrading::Offer* return_value = 0;
   ACE_TYPENAME Offer_Database::ENTRY* db_entry = 0;
-  TAO_String_Hash_Key service_type (type);
-
+  TAO_String_Hash_Key service_type (type); 
+  
   if (this->offer_db_.find (service_type, db_entry) == 0)
     {
-      Offer_Map_Entry* offer_map_entry = db_entry->int_id_;
+      Offer_Map_Entry* offer_map_entry = db_entry->int_id_;      
       ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map_entry->lock_, 0);
 
       TAO_Offer_Map::ENTRY* offer_entry_ptr = 0;
@@ -228,12 +228,12 @@ template <class LOCK_TYPE> TAO_Offer_Id_Iterator*
 TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void)
 {
   // Fill an TAO_Offer_Id_Iterator with the offer_ids of all offers
-  // exported to the TAO_Offer_Database. Iterates through the entire
+  // exported to the TAO_Offer_Database. Iterates through the entire 
   // map, cramming offer_id strings into a newly constructed
-  // TAO_Offer_Id_Iterator.
+  // TAO_Offer_Id_Iterator. 
   TAO_Offer_Id_Iterator* id_iterator = new TAO_Offer_Id_Iterator ();
   ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, this->db_lock_, 0);
-
+  
   for (ACE_TYPENAME Offer_Database::iterator type_iter (this->offer_db_);
        ! type_iter.done ();
        type_iter++)
@@ -242,34 +242,34 @@ TAO_Offer_Database<LOCK_TYPE>::retrieve_all_offer_ids (void)
       Offer_Map_Entry* offer_map_entry = (*type_iter).int_id_;
 
       ACE_READ_GUARD_RETURN (LOCK_TYPE, ace_mon, offer_map_entry->lock_, 0);
-
+      
       for (TAO_Offer_Map::iterator offer_iter (*offer_map_entry->offer_map_);
-           ! offer_iter.done ();
-           offer_iter++)
-        {
-          CORBA::ULong offer_index = (*offer_iter).ext_id_;
-          CosTrading::OfferId offer_id =
-            this->generate_offer_id (type_name, offer_index);
-
-          id_iterator->insert_id (offer_id);
-        }
-    }
-
+	   ! offer_iter.done ();
+	   offer_iter++)
+	{
+	  CORBA::ULong offer_index = (*offer_iter).ext_id_;
+	  CosTrading::OfferId offer_id = 
+	    this->generate_offer_id (type_name, offer_index); 
+
+	  id_iterator->insert_id (offer_id);
+	}
+    }      
+  
   return id_iterator;
 }
 
 template <class LOCK_TYPE> void
 TAO_Offer_Database<LOCK_TYPE>::
 parse_offer_id (const CosTrading::OfferId offer_id,
-                char*&service_type,
-                CORBA::ULong& id,
-                CORBA::Environment& TAO_IN_ENV)
+		char*&service_type,
+		CORBA::ULong& id,
+		CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CosTrading::IllegalOfferId))
 {
   // Get service type: it is everything from 17th character to the end.
   service_type = (char *) offer_id + 16;
-
-  // Get id: temporarily put the end of string character where the service
+  
+  // Get id: temporarily put the end of string character where the service 
   // type starts, convert to number, replace the character back.
   char* start_of_type =  (char *) (offer_id + 16);
   char temp = *start_of_type;
@@ -288,7 +288,7 @@ generate_offer_id (const char *service_type_name, CORBA::ULong id)
 {
   // holds final id string.
   int total_size = 16 + ACE_OS::strlen (service_type_name);
-
+  
   // hold portions of id string.
   CosTrading::OfferId offer_id = CORBA::string_alloc (total_size);
   char* return_value = 0;
@@ -304,14 +304,14 @@ generate_offer_id (const char *service_type_name, CORBA::ULong id)
 template <class LOCK_TYPE>
 TAO_Service_Offer_Iterator<LOCK_TYPE>::
 TAO_Service_Offer_Iterator (const char* type,
-                            TAO_Offer_Database<LOCK_TYPE>& offer_database)
+			    TAO_Offer_Database<LOCK_TYPE>& offer_database)
   : stm_ (offer_database),
     lock_ (0),
     offer_iter_ (0),
     type_ (type)
 {
   TAO_String_Hash_Key service_type (type);
-
+  
   if (this->stm_.db_lock_.acquire_read () == -1)
     return;
 
@@ -322,18 +322,18 @@ TAO_Service_Offer_Iterator (const char* type,
     {
       this->lock_ = &entry->lock_;
       if (this->lock_->acquire_read () == -1)
-        return;
-
+	return;
+      
       ACE_NEW (offer_iter_,
-               TAO_Offer_Map::iterator (*entry->offer_map_));
+	       TAO_Offer_Map::iterator (*entry->offer_map_));
     }
 }
 
 template <class LOCK_TYPE>
 TAO_Service_Offer_Iterator<LOCK_TYPE>::~TAO_Service_Offer_Iterator (void)
-{
+{  
   this->stm_.db_lock_.release ();
-
+  
   if (this->lock_ != 0)
     {
       this->lock_->release ();
@@ -346,7 +346,7 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::get_id (void)
 {
   return (this->offer_iter_ != 0)
     ? TAO_Offer_Database<LOCK_TYPE>::generate_offer_id (this->type_, (**this->offer_iter_).ext_id_)
-    : 0;
+    : 0;  
 }
 
 template <class LOCK_TYPE> int
@@ -355,7 +355,7 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::has_more_offers (void)
   return (this->offer_iter_ != 0) ? ! this->offer_iter_->done () : 0;
 }
 
-
+  
 template <class LOCK_TYPE> CosTrading::Offer*
 TAO_Service_Offer_Iterator<LOCK_TYPE>::get_offer (void)
 {
@@ -370,3 +370,4 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void)
 }
 
 #endif /* TAO_OFFER_DATABASE_C */
+
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index 653d6d553bf..b79ecffe98a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -95,12 +95,10 @@ public:
     LOCK_TYPE lock_;
   };
 
-  typedef ACE_Hash_Map_Manager_Ex
+  typedef ACE_Hash_Map_Manager
     <
     TAO_String_Hash_Key,
     Offer_Map_Entry*,
-    ACE_Hash<TAO_String_Hash_Key>,
-    ACE_Equal_To<TAO_String_Hash_Key>,
     ACE_Null_Mutex
     >
     Offer_Database;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
index 0c5357eacb9..e96619bcf75 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -49,12 +49,13 @@ TAO_Offer_Iterator::destroy (CORBA::Environment &)
       TAO_CHECK_ENV;
       
       poa->deactivate_object (id.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;      
     }
   TAO_CATCHANY
     {      
     }
   TAO_ENDTRY;
+  
+  delete this;  
 }
 
   // *************************************************************
@@ -241,6 +242,8 @@ TAO_Offer_Iterator_Collection::destroy (CORBA::Environment& TAO_IN_ENV)
     {      
     }
   TAO_ENDTRY;
+  
+  delete this;  
 }
 
 CORBA::ULong
@@ -302,18 +305,19 @@ TAO_Offer_Id_Iterator::destroy (CORBA::Environment &)
       TAO_CHECK_ENV;
       
       poa->deactivate_object (id.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV;
     }
   TAO_CATCHANY
     {      
     }
   TAO_ENDTRY;
+  
+  delete this;  
 }
 
 CORBA::Boolean
 TAO_Offer_Id_Iterator::next_n (CORBA::ULong n,
-                               CosTrading::OfferIdSeq_out _ids,
-                               CORBA::Environment &)
+			                         CosTrading::OfferIdSeq_out _ids,
+			                         CORBA::Environment &)
   TAO_THROW_SPEC ((CORBA::SystemException))
 {
   // Calculate the number of Ids to be returned in this.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
index 5bf84a97100..64a080a00e7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -24,9 +24,7 @@
   // TAO_Offer_Iterator
   // *************************************************************
 
-class TAO_Offer_Iterator : 
-  public virtual POA_CosTrading::OfferIterator,
-  public virtual PortableServer::RefCountServantBase
+class TAO_Offer_Iterator : public POA_CosTrading::OfferIterator
 {
   // = TITLE
   //     This class implements CosTrading::OfferIterator IDL
@@ -155,9 +153,7 @@ private:
   // TAO_Offer_Iterator_Collection
   // *************************************************************
 
-class TAO_Offer_Iterator_Collection : 
-  public virtual POA_CosTrading::OfferIterator,
-  public virtual PortableServer::RefCountServantBase
+class TAO_Offer_Iterator_Collection : public POA_CosTrading::OfferIterator
 // = TITLE
 //   A collection of offer iterator to query in turn.
 //
@@ -214,9 +210,7 @@ private:
   // TAO_Offer_Id_Iterator
   // *************************************************************
 
-class TAO_Offer_Id_Iterator : 
-  public virtual POA_CosTrading::OfferIdIterator,
-  public virtual PortableServer::RefCountServantBase
+class TAO_Offer_Id_Iterator : public POA_CosTrading::OfferIdIterator
 // = TITLE
 //   Silly little iterator that contains the overflow of offer ids
 //   from the Admin list_offers method.
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
index be883ab595b..6ef9a11c184 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.cpp
@@ -1,5 +1,4 @@
 // ========================================================================
-//
 // $Id$
 //
 // = LIBRARY
@@ -29,8 +28,7 @@ TAO_Service_Type_Repository (ACE_Lock* lock)
   // If a lock wasn't provided, let's assume the user doesn't want any
   // kind of lock at all.
   if (this->lock_ == 0)
-    ACE_NEW (this->lock_,
-             ACE_Lock_Adapter<ACE_Null_Mutex> ());
+    ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_Null_Mutex> ());
 }
 
 
@@ -39,7 +37,7 @@ 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_);
+    for (Service_Type_Map::iterator service_map_iterator (this->type_map_);
          ! service_map_iterator.done ();
          service_map_iterator++)
       {
@@ -203,9 +201,9 @@ list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes&
 
   int all = (which_types._d () == CosTradingRepos::ServiceTypeRepository::all);
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber num =
-    which_types.incarnation ();
+    which_types.incarnation ();    
 
-  for (Service_Type_Map_Iterator itr (this->type_map_);
+  for (Service_Type_Map::iterator itr (this->type_map_);
        ! itr.done ();
        itr++)
     {
@@ -445,7 +443,7 @@ collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::Typ
 
           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);
         }
     }
@@ -490,7 +488,7 @@ validate_supertypes (Service_Type_Map& super_map,
     {
       const char* type =  super_types[i];
       //      ACE_DEBUG ((LM_DEBUG, "%s\n", type));
-
+      
       if (! TAO_Trader_Base::is_valid_identifier_name (type))
         TAO_THROW (CosTrading::IllegalServiceType (type));
       else
@@ -577,7 +575,7 @@ update_type_map (const char* name,
   // 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);
+  for (Service_Type_Map::iterator super_map_iterator (super_map);
        ! super_map_iterator.done ();
        super_map_iterator++)
     {
@@ -617,24 +615,36 @@ update_type_map (const char* name,
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTradingRepos::ServiceTypeRepository::PropStruct*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Service_Type_Repository::Type_Info*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
index ee482f6a643..62ab4388ae2 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Service_Type_Repository.h
@@ -1,4 +1,5 @@
 /* -*- C++ -*- */
+
 // ========================================================================
 // $Id$
 //
@@ -18,15 +19,17 @@
 #define TAO_SERVICE_TYPE_REPOSITORY_H
 
 #include "Trader.h"
-#include "ace/Hash_Map_Manager.h"
 
-class TAO_ORBSVCS_Export TAO_Service_Type_Repository : public POA_CosTradingRepos::ServiceTypeRepository
-{
+class TAO_ORBSVCS_Export TAO_Service_Type_Repository :
+  public POA_CosTradingRepos::ServiceTypeRepository
+  //
   // = TITLE
   //     This class implements CosTradingRepos::ServiceTypeRepository
   //     IDL interface.
+{
 public:
-  TAO_Service_Type_Repository (ACE_Lock *lock = 0);
+
+  TAO_Service_Type_Repository (ACE_Lock* lock = 0);
   // Parameterize the Service_Type_Repository with a lock to serialize
   // access to the type repository map. A reader/writer lock is
   // probably best. The Service_Type_Repository assumes control of the
@@ -35,23 +38,24 @@ public:
   ~TAO_Service_Type_Repository (void);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-  incarnation (CORBA::Environment &_env);
+    incarnation (CORBA::Environment& _env);
 
   virtual CosTradingRepos::ServiceTypeRepository::IncarnationNumber
-  add_type (const char *name,
-            const char *if_name,
-            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-            CORBA::Environment &_env)
+    add_type (const char * name,
+              const char * if_name,
+              const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+              const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
-                     CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
-                     CosTrading::IllegalPropertyName,
-                     CosTrading::DuplicatePropertyName,
-                     CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+                    CosTrading::IllegalServiceType,
+                    CosTradingRepos::ServiceTypeRepository::ServiceTypeExists,
+                    CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch,
+                    CosTrading::IllegalPropertyName,
+                    CosTrading::DuplicatePropertyName,
+                    CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::DuplicateServiceTypeName));
+
   // BEGIN SPEC
   // The add_type operation enables the creation of new service types
   // in the service type repository. The caller supplies the "name"
@@ -72,77 +76,80 @@ public:
   // when CORBA systems support IDL 64-bit integers.)
 
   // If the "name" parameter is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised.  If the type
+  // CosTrading::IllegalServiceType exception is raised. ° If the type
   // already exists, then the ServiceTypeExists exception is raised. °
   // If the "if_name" parameter is not a sub-type of the interface
   // associated with a service type from which this service type is
   // derived, such that substitutability would be violated, then the
-  // InterfaceTypeMismatch exception is raised.  If a property name
+  // InterfaceTypeMismatch exception is raised. ° If a property name
   // supplied in the "props" parameter is malformed, the
-  // CosTrading::IllegalPropertyName exception is raised.  If the
+  // CosTrading::IllegalPropertyName exception is raised. ° If the
   // same property name appears two or more times in the "props"
   // parameter, the CosTrading::DuplicatePropertyName exception is
-  // raised.  If a property value type associated with this service
+  // raised. ° If a property value type associated with this service
   // type illegally modifies the value type of a super-type's
   // property, or if two super-types incompatibly declare value types
   // for the same property name, then the ValueTypeRedefinition
-  // exception is raised.  If one of the ServiceTypeNames in
+  // exception is raised. ° If one of the ServiceTypeNames in
   // "super_types" is malformed, then the
   // CosTrading::IllegalServiceType exception is raised. If one of the
   // ServiceTypeNames in "super_types" does not exist, then the
-  // CosTrading::UnknownServiceType exception is raised.  If the same
+  // CosTrading::UnknownServiceType exception is raised. ° If the same
   // service type name is included two or more times in this
   // parameter, the DuplicateServiceTypeName exception is raised.
   // END SPEC
 
-  virtual void remove_type (const char  *name,
-                            CORBA::Environment &_env)
+
+  virtual void remove_type (const char * name,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::HasSubTypes));
+
   // BEGIN SPEC
   // The remove_type operation removes the named type from the service
-  // type repository. If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised.  If
-  // "name" does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised.  If
-  // "name" has a service type which has been derived from it, then
-  // the HasSubTypes exception is raised.  END SPEC
+  // type repository. ° If "name" is malformed, then the
+  // CosTrading::IllegalServiceType exception is raised. ° If "name"
+  // does not exist within the repository, then the
+  // CosTrading::UnknownServiceType exception is raised. ° If "name"
+  // has a service type which has been derived from it, then the
+  // HasSubTypes exception is raised.
+  // END SPEC
 
-  virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq *
-  list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes &which_types,
-              CORBA::Environment &_env)
+  virtual CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq*
+    list_types (const CosTradingRepos::ServiceTypeRepository::SpecifiedServiceTypes& which_types,
+                CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException));
 
   // BEGIN SPEC
   // The list_types operation permits a client to obtain the names of
   // service types which are in the repository. The "which_types"
   // parameter permits the client to specify one of two possible
-  // values:  all types known to the repository  all types
+  // values: ° all types known to the repository ° all types
   // added/modified since a particular incarnation number The names of
   // the requested types are returned by the operation for subsequent
   // querying via the describe_type or the fully_describe_type
   // operation.
   // END SPEC
 
-  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  describe_type (const char *name,
-                 CORBA::Environment &_env)
+  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct*
+    describe_type (const char * name,
+                   CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
   // BEGIN SPEC
   // The describe_type operation permits a client to obtain the
-  // details for a particular service type. If "name" is malformed,
-  // then the CosTrading::IllegalServiceType exception is raised.  If
+  // details for a particular service type. ° If "name" is malformed,
+  // then the CosTrading::IllegalServiceType exception is raised. ° If
   // "name" does not exist within the repository, then the
   // CosTrading::UnknownServiceType exception is raised.
   // END SPEC
 
-  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct *
-  fully_describe_type (const char *name,
-                       CORBA::Environment &_env)
+  virtual CosTradingRepos::ServiceTypeRepository::TypeStruct*
+    fully_describe_type (const char * name,
+                         CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType));
@@ -152,14 +159,14 @@ public:
   // returned in the TypeStruct includes all properties inherited from
   // the transitive closure of its super types; the sequence of super
   // types in the TypeStruct contains the names of the types in the
-  // transitive closure of the super type relation.  If "name" is
+  // transitive closure of the super type relation. ° If "name" is
   // malformed, then the CosTrading::IllegalServiceType exception is
-  // raised.  If "name" does not exist within the repository, then
+  // raised. ° If "name" does not exist within the repository, then
   // the CosTrading::UnknownServiceType exception is raised.
   // END SPEC
 
-  virtual void mask_type (const char *name,
-                          CORBA::Environment &_env)
+  virtual void mask_type (const char * name,
+                          CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
                      CosTrading::UnknownServiceType,
@@ -169,128 +176,123 @@ public:
   // type (i.e., after being masked, exporters will no longer be able
   // to advertise offers of that particular type). The type continues
   // to exist in the service repository due to other service types
-  // being derived from it.  If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised.  If "name"
+  // being derived from it. ° If "name" is malformed, then the
+  // CosTrading::IllegalServiceType exception is raised. ° If "name"
   // does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised.  If the type
+  // CosTrading::UnknownServiceType exception is raised. ° If the type
   // is currently in the masked state, then the AlreadyMasked
   // exception is raised.
   // END SPEC
 
-  virtual void unmask_type (const char  *name,
-                            CORBA::Environment &_env)
+  virtual void unmask_type (const char * name,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
-                     CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTradingRepos::ServiceTypeRepository::NotMasked));
+                    CosTrading::IllegalServiceType,
+                    CosTrading::UnknownServiceType,
+                    CosTradingRepos::ServiceTypeRepository::NotMasked));
   // BEGIN SPEC
   // The unmask_type undeprecates a type (i.e., after being unmasked,
   // exporters will be able to resume advertisement of offers of that
-  // particular type).  If "name" is malformed, then the
-  // CosTrading::IllegalServiceType exception is raised.  If "name"
+  // particular type). ° If "name" is malformed, then the
+  // CosTrading::IllegalServiceType exception is raised. ° If "name"
   // does not exist within the repository, then the
-  // CosTrading::UnknownServiceType exception is raised.  If the type
+  // CosTrading::UnknownServiceType exception is raised. ° If the type
   // is not currently in the masked state, then the NotMasked
   // exception is raised.
   // END SPEC
 
 public:
 
-  class Type_Info
+  struct Type_Info
   {
-    // = TITLE
-    //   Storage structure for information pertinent to the type.
-  public:
+    // storage structure for information pertinent to the type.
     CosTradingRepos::ServiceTypeRepository::TypeStruct type_struct_;
-    // Standard type info.
+    // standard type info.
 
     CORBA::Boolean has_subtypes_;
-    // Names of subtypes.
+    // names of subtypes.
   };
 
-  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
-                                  CosTradingRepos::ServiceTypeRepository::PropStruct *,
-                                  ACE_Hash<TAO_String_Hash_Key>,
-                                  ACE_Equal_To<TAO_String_Hash_Key>,
-                                  ACE_Null_Mutex>
-                                  Prop_Map;
-
-  typedef ACE_Hash_Map_Manager_Ex <TAO_String_Hash_Key,
-                                   Type_Info *,
-                                   ACE_Hash<TAO_String_Hash_Key>,
-                                   ACE_Equal_To<TAO_String_Hash_Key>,
-                                   ACE_Null_Mutex>
-                                   Service_Type_Map;
-
-  typedef ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key,
-                                   Type_Info *,
-                                   ACE_Hash<TAO_String_Hash_Key>,
-                                   ACE_Equal_To<TAO_String_Hash_Key>,
-                                   ACE_Null_Mutex>
-                                   Service_Type_Map_Iterator;
-  
-  void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct,
-                              CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                              CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types);
+  typedef ACE_Hash_Map_Manager
+    <
+    TAO_String_Hash_Key,
+    CosTradingRepos::ServiceTypeRepository::PropStruct*,
+    ACE_Null_Mutex
+    >
+    Prop_Map;
+
+  typedef ACE_Hash_Map_Manager
+    <
+    TAO_String_Hash_Key,
+    Type_Info*,
+    ACE_Null_Mutex
+    >
+    Service_Type_Map;
+
+  void fully_describe_type_i (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
+                              CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                              CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types);
   // Build a sequence aggregating the property names from all
   // supertypes of the type, and a sequence representing the
   // transitive closure of the super type relation.
 
-  void collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct &type_struct,
-                                      TAO_String_Queue &target);
+  void collect_inheritance_hierarchy (const CosTradingRepos::ServiceTypeRepository::TypeStruct& type_struct,
+                                      TAO_String_Queue& target);
 
-  void validate_properties (Prop_Map &prop_map,
-                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                            CORBA::Environment &_env)
+  void validate_properties (Prop_Map& prop_map,
+                            const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalPropertyName,
                      CosTrading::DuplicatePropertyName));
   // Confirm that the properties in props have valid names, and aren't
   // duplicated. Cram those properties into the prop_map.
 
-  void validate_supertypes (Service_Type_Map &super_map,
-                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                            CORBA::Environment &_env)
+  void validate_supertypes (Service_Type_Map& super_map,
+                            const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                            CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTrading::IllegalServiceType,
-                     CosTrading::UnknownServiceType,
-                     CosTrading::DuplicatePropertyName));
+                    CosTrading::UnknownServiceType,
+                    CosTrading::DuplicatePropertyName));
   // Confirm that the each super type exists, and cram them into super_map.
 
-  void validate_inheritance (Prop_Map &prop_map,
-                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                             CORBA::Environment &_env)
+  void validate_inheritance (Prop_Map& prop_map,
+                             const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                             CORBA::Environment& _env)
     TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::ValueTypeRedefinition));
   // Ensure that properties of a super_type aren't having their types
   // or retstrictions redefined.
 
-  //  void validate_interface (const char *if_name,
-  //                       Service_Type_Map &super_map,
-  //                       CORBA::Environment &_env)
+  //  void validate_interface (const char* if_name,
+  //                       Service_Type_Map& super_map,
+  //                       CORBA::Environment& _env)
   //    TAO_THROW_SPEC ((CosTradingRepos::ServiceTypeRepository::InterfaceTypeMismatch));
   // Ensure that the interface type derives from its superclasses'.
 
-  void update_type_map (const char *name,
-                        const char  *if_name,
-                        const CosTradingRepos::ServiceTypeRepository::PropStructSeq &props,
-                        const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq &super_types,
-                        Prop_Map &prop_map,
-                        Service_Type_Map &super_map);
+  void update_type_map (const char* name,
+                        const char * if_name,
+                        const CosTradingRepos::ServiceTypeRepository::PropStructSeq& props,
+                        const CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq& super_types,
+                        Prop_Map& prop_map,
+                        Service_Type_Map& super_map);
   // Update the type map with the information contained in the
   // TypeStruct, prop_map, and super_map.
 
-  TAO_Service_Type_Repository (const TAO_Service_Type_Repository &);
-  TAO_Service_Type_Repository &operator= (const TAO_Service_Type_Repository &);
+  TAO_Service_Type_Repository (const TAO_Service_Type_Repository&);
+  TAO_Service_Type_Repository& operator= (const TAO_Service_Type_Repository&);
 
-  ACE_Lock *lock_;
+  ACE_Lock* lock_;
   // Lock with which to serialize access to the service type map.
 
   Service_Type_Map type_map_;
-  // Stores information for each service type in the repository.  This
-  // is a mapping from service type name to a Type_Info struct which
-  // serves as a storage for various information for the given type.
+  // Stores information for each service type in the repository.
+  // This is a mapping from service type name to a Type_Info struct
+  // which serves as a storage for various information for the given type.
 
   CosTradingRepos::ServiceTypeRepository::IncarnationNumber incarnation_;
-  // Incarnation number to be used for the next modification to the
-  // repository.
+  // incarnation number to be used for the next modification to the repository.
 };
 
+// This are temporary functions, until the format of the incarnation number
+// will be changed in the spec.
+
 #endif /* TAO_SERVICE_TYPE_REPOSITORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
index 7e843698b02..4c51b257702 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -893,7 +893,6 @@ sequence_type (CORBA::TypeCode* type_code,
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 template class TAO_Offer_Database<ACE_RW_Thread_Mutex>;
 template class TAO_Service_Offer_Iterator<ACE_RW_Thread_Mutex>;
@@ -904,13 +903,19 @@ template class TAO_Admin<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>;
 template class TAO_Link<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>;
 template class TAO_Proxy<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>;
 template class TAO_Register_Offer_Iterator<ACE_RW_Thread_Mutex>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 #endif /* ACE_MT_SAFE */
@@ -950,36 +955,47 @@ template class ACE_Unbounded_Queue_Iterator<CosTrading::Admin::OctetSeq *>;
 template class ACE_Node<TAO_String_Hash_Key>;
 template class ACE_Unbounded_Set<TAO_String_Hash_Key>;
 template class ACE_Unbounded_Set_Iterator<TAO_String_Hash_Key>;
-template class ACE_Hash<TAO_String_Hash_Key>;
-template class ACE_Equal_To<TAO_String_Hash_Key>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key, int>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, int, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, int, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key, CORBA::TypeCode_ptr>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<CORBA::ULong, CosTrading::Offer*>;
-template class ACE_Hash_Map_Manager_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<TAO_Hashable_ULong, CosTrading::Offer*>;
+template class ACE_Hash_Map_Manager<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key, CosTrading::Link::LinkInfo>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*>;
+template class ACE_Hash_Map_Manager<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
 template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 #pragma instantiate TAO_Register_Offer_Iterator<ACE_RW_Thread_Mutex>
 #pragma instantiate TAO_Offer_Database<ACE_RW_Thread_Mutex>
@@ -990,14 +1006,21 @@ template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Data
 #pragma instantiate TAO_Admin<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>
 #pragma instantiate TAO_Link<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>
 #pragma instantiate TAO_Proxy<ACE_Thread_Mutex, ACE_RW_Thread_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, CosTrading::Link::LinkInfo>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_RW_Thread_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #endif /* ACE_MT_SAFE */
 #pragma instantiate TAO_Offer_Database<ACE_Null_Mutex>
@@ -1036,32 +1059,44 @@ template class ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Data
 #pragma instantiate ACE_Node<TAO_String_Hash_Key>
 #pragma instantiate ACE_Unbounded_Set<TAO_String_Hash_Key>
 #pragma instantiate ACE_Unbounded_Set_Iterator<TAO_String_Hash_Key>
-#pragma instantiate ACE_Hash<TAO_String_Hash_Key>
-#pragma instantiate ACE_Equal_To<TAO_String_Hash_Key>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, int>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, int, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, int, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, CORBA::TypeCode_ptr>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<CORBA::ULong, CosTrading::Offer*>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<TAO_Hashable_ULong, CosTrading::Offer*>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_Hashable_ULong, CosTrading::Offer*, ACE_Hash<TAO_Hashable_ULong>, ACE_Equal_To<TAO_Hashable_ULong>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key, CosTrading::Link::LinkInfo>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, CosTrading::Link::LinkInfo, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Entry<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*>
+#pragma instantiate ACE_Hash_Map_Manager<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<TAO_String_Hash_Key,TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*,ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<TAO_String_Hash_Key, TAO_Offer_Database<ACE_Null_Mutex>::Offer_Map_Entry*, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex>
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader.h b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
index f3f04c54948..03dae79a92c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.h
@@ -38,8 +38,6 @@
 #include "ace/Containers.h"
 
 #include "orbsvcs/CosTradingS.h"
-#include "orbsvcs/CosTradingReposS.h"
-#include "orbsvcs/CosTradingDynamicS.h"
 #include "orbsvcs/orbsvcs_export.h"
 
 #if defined(_MSC_VER)
@@ -459,7 +457,7 @@ protected:
 
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
-class TAO_ORBSVCS_Export TAO_String_Hash_Key : public CORBA::String_var
+class TAO_String_Hash_Key : public CORBA::String_var
 {
   // = TITLE
   //     Key for the Hash Table. The EXT_ID of the
@@ -492,13 +490,47 @@ public:
   // The function that computes a hash value.
 };
 
+class TAO_Hashable_ULong
+// = TITLE
+// Helper class using hashable integers in the
+// ACE_Hash_Map_Manager. The right way to do this would probably be
+// template specialization of the Hash Map Manager, but compilers have
+// a difficult enough time with the Trading Service as it is.
+{
+public:
+
+  TAO_Hashable_ULong (void)
+    : number_ (0) {}
+
+  TAO_Hashable_ULong (CORBA::ULong number)
+    : number_ (number) {}
+
+  u_long hash (void) const { return number_; }
+
+  TAO_Hashable_ULong& operator= (const TAO_Hashable_ULong& number)
+    {
+      this->number_ = number.number_;
+      return *this;
+    }
+
+  operator CORBA::ULong (void) const { return number_; }
+
+  friend int operator== (const TAO_Hashable_ULong& left,
+                         const TAO_Hashable_ULong& right)
+    { return left.number_ == right.number_; }
+
+private:
+
+  CORBA::ULong number_;
+};
+
 // Helpful typedefs
 // Should probably be private to TAO_Offer_Database, but g++ has a
 // hard time with it like that when compiling TAO_Service_Offer_Iterator.
-typedef ACE_Hash_Map_Manager_Ex<CORBA::ULong, CosTrading::Offer*, ACE_Hash<CORBA::ULong>, ACE_Equal_To<CORBA::ULong>, ACE_Null_Mutex> TAO_Offer_Map;
-typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, int, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> TAO_Lookup_Table;
-typedef ACE_Hash_Map_Manager_Ex<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Hash<TAO_String_Hash_Key>, ACE_Equal_To<TAO_String_Hash_Key>, ACE_Null_Mutex> TAO_Typecode_Table;
+typedef ACE_Hash_Map_Manager<TAO_Hashable_ULong,CosTrading::Offer*,ACE_Null_Mutex> TAO_Offer_Map;
+typedef ACE_Hash_Map_Manager<TAO_String_Hash_Key, int, ACE_Null_Mutex> TAO_Lookup_Table;
 typedef ACE_Unbounded_Set<TAO_String_Hash_Key> TAO_String_Set;
+typedef ACE_Hash_Map_Manager<TAO_String_Hash_Key, CORBA::TypeCode_ptr, ACE_Null_Mutex> TAO_Typecode_Table;
 typedef ACE_Unbounded_Queue<char*> TAO_String_Queue;
 
   // *************************************************************
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
index 6f38f462f7a..d39c7815ff9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -82,11 +82,7 @@ query (const char *type,
   // redundant results and infinite loops.
   CosTrading::Admin::OctetSeq* request_id = 0;
   if (this->seen_request_id (policies, request_id, env))
-    {
-      returned_offers = new CosTrading::OfferSeq;
-      returned_limits_applied = new CosTrading::PolicyNameSeq;
-      return;
-    }
+    return;
   TAO_CHECK_ENV_RETURN_VOID (env);
 
   // The presence of a link interface determines whether we should
@@ -433,7 +429,6 @@ fill_receptacles (const char* type,
 
       // Register it with the POA.
       offer_itr = oi->_this (env);
-      oi->_remove_ref (env);
       TAO_CHECK_ENV_RETURN (env, total_offers - offers_in_iterator);
 
       // Add to the iterator
@@ -690,7 +685,6 @@ federated_query (const CosTrading::LinkNameSeq& links,
 
   // Return the collection of offer iterators.
   offer_iter = offer_iter_collection->_this (TAO_IN_ENV);
-  offer_iter_collection->_remove_ref (TAO_IN_ENV);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -847,7 +841,7 @@ seen_request_id (TAO_Policies& policies,
     }
 
   if (seq == 0)
-    TAO_THROW_RETURN (CORBA::NO_MEMORY (), 1);
+    TAO_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), 1);
 
   ACE_GUARD_RETURN (TRADER_LOCK_TYPE, trader_mon, this->lock_, 1);
   for (Request_Ids::ITERATOR riter (this->request_ids_);
@@ -899,10 +893,10 @@ TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::~TAO_Register (void)
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 CosTrading::OfferId
 TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-_cxx_export (CORBA::Object_ptr reference,
-             const char *type,
-             const CosTrading::PropertySeq &properties,
-             CORBA::Environment& TAO_IN_ENV)
+export (CORBA::Object_ptr reference,
+        const char *type,
+        const CosTrading::PropertySeq &properties,
+        CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CORBA::SystemException,
                   CosTrading::Register::InvalidObjectRef,
                   CosTrading::IllegalServiceType,
@@ -974,9 +968,8 @@ _cxx_export (CORBA::Object_ptr reference,
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 void
-TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::
-withdraw (const char *id,
-          CORBA::Environment& TAO_IN_ENV)
+TAO_Register<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::withdraw (const char *id,
+                                CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalOfferId,
                    CosTrading::UnknownOfferId,
@@ -1285,47 +1278,14 @@ TAO_Admin (TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &trader)
   // trader, making it extremely unlikely that the sequence spaces for
   // two traders will over lap.
   // @@ TODO: This is a bad way to generate pseudo random numbers.
-
-  // Ok, then, Carlos, we'll do it a different way: ip addr + pid.
-  ACE_UINT32 ip_addr = 0;
-  ASYS_TCHAR host_name[BUFSIZ];
-  
-  if (ACE_OS::hostname (host_name, BUFSIZ) != -1)
-    {
-      ACE_INET_Addr addr ((u_short) 0, host_name);
-      ip_addr = addr.get_ip_address ();
-    }
-  // The better way to do unique stem identifiers.
-  this->stem_id_.length (12);
-
-  if (ip_addr != 0)
-    {
-      pid_t pid = ACE_OS::getpid ();
-      this->stem_id_[0] = ACE_static_cast (CORBA::Octet, (ip_addr >> 24) & 0xff);
-      this->stem_id_[1] = ACE_static_cast (CORBA::Octet, (ip_addr >> 16) & 0xff);
-      this->stem_id_[2] = ACE_static_cast (CORBA::Octet, (ip_addr >> 8) & 0xff);
-      this->stem_id_[3] = ACE_static_cast (CORBA::Octet, ip_addr & 0xff);
-      this->stem_id_[4] = ACE_static_cast (CORBA::Octet, (pid >> 24) & 0xff);
-      this->stem_id_[5] = ACE_static_cast (CORBA::Octet, (pid >> 16) & 0xff);
-      this->stem_id_[6] = ACE_static_cast (CORBA::Octet, (pid >> 8) & 0xff);
-      this->stem_id_[7] = ACE_static_cast (CORBA::Octet, pid & 0xff);
-    }
-
-  // The default way -- eight random integers.
-  else
-    {
-      size_t time_value = ACE_OS::time ();
-      ACE_OS::srand (ACE_static_cast (u_int, time_value));
-      
-      this->stem_id_[0] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[1] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[2] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[3] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[4] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[5] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[6] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-      this->stem_id_[7] = ACE_static_cast (CORBA::Octet, ACE_OS::rand () %  256);
-    }
+  size_t time_value = ACE_OS::time ();
+  ACE_RANDR_TYPE seed = ACE_static_cast(ACE_RANDR_TYPE, time_value);
+
+  this->stem_id_.length (8);
+  this->stem_id_[0] = ACE_static_cast (CORBA::Octet, ACE_OS::rand_r (seed) %  256);
+  this->stem_id_[1] = ACE_static_cast (CORBA::Octet, ACE_OS::rand_r (seed) %  256);
+  this->stem_id_[2] = ACE_static_cast (CORBA::Octet, ACE_OS::rand_r (seed) %  256);
+  this->stem_id_[3] = ACE_static_cast (CORBA::Octet, ACE_OS::rand_r (seed) %  256);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1344,10 +1304,10 @@ TAO_Admin<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>::request_id_stem (CORBA::Environment&
   // prefix. The sequence number is four octets long, the unique
   // prefix, also 4 bytes long.
 
-  this->stem_id_[8] = this->sequence_number_ & 0xff;
-  this->stem_id_[9] = (this->sequence_number_ >> 8) & 0xff;
-  this->stem_id_[10] = (this->sequence_number_ >> 16) & 0xff;
-  this->stem_id_[11] = (this->sequence_number_ >> 24) & 0xff;
+  this->stem_id_[4] = this->sequence_number_ & 0xff;
+  this->stem_id_[5] = (this->sequence_number_ >> 8) & 0xff;
+  this->stem_id_[6] = (this->sequence_number_ >> 16) & 0xff;
+  this->stem_id_[7] = (this->sequence_number_ >> 24) & 0xff;
 
   // Increment the sequence number and return a copy of the stem_id.
   this->sequence_number_++;
@@ -1612,7 +1572,6 @@ list_offers (CORBA::ULong how_many,
       if (offer_id_iter->next_n (how_many, ids, TAO_IN_ENV) == 1)
         {
           id_itr = offer_id_iter->_this (TAO_IN_ENV);
-          offer_id_iter->_remove_ref (TAO_IN_ENV);
           TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
       else
@@ -1868,7 +1827,7 @@ export_proxy (CosTrading::Lookup_ptr target,
                   CosTrading::DuplicatePropertyName,
                   CosTrading::DuplicatePolicyName))
 {
-  TAO_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), 0);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1881,7 +1840,7 @@ withdraw_proxy (const char *id,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  TAO_THROW (CORBA::UNKNOWN ());
+  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1894,7 +1853,7 @@ describe_proxy (const char *id,
                   CosTrading::UnknownOfferId,
                   CosTrading::Proxy::NotProxyOfferId))
 {
-  TAO_THROW_RETURN (CORBA::UNKNOWN (), 0);
+  TAO_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), 0);
 }
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
@@ -1907,7 +1866,7 @@ list_proxies (CORBA::ULong how_many,
   TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::NotImplemented))
 {
-  TAO_THROW (CORBA::UNKNOWN ());
+  TAO_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_NO));
 }
 
 #endif /* TAO_TRADER_INTERFACES_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 6faa9fbc600..4e8086f8d96 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -310,10 +310,10 @@ public:
 
   virtual ~TAO_Register (void);
 
-  virtual CosTrading::OfferId _cxx_export (CORBA::Object_ptr reference,
-                                           const char *type,
-                                           const CosTrading::PropertySeq& properties,
-                                           CORBA::Environment& _env)
+  virtual CosTrading::OfferId export (CORBA::Object_ptr reference,
+                                      const char *type,
+                                      const CosTrading::PropertySeq& properties,
+                                      CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                     CosTrading::Register::InvalidObjectRef,
                     CosTrading::IllegalServiceType,
@@ -909,12 +909,10 @@ private:
   ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
   ACE_UNIMPLEMENTED_FUNC (TAO_Link (const TAO_Link<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> &))
 
-  typedef ACE_Hash_Map_Manager_Ex
+  typedef ACE_Hash_Map_Manager
   <
   TAO_String_Hash_Key,
   CosTrading::Link::LinkInfo,
-  ACE_Hash<TAO_String_Hash_Key>,
-  ACE_Equal_To<TAO_String_Hash_Key>,
   MAP_LOCK_TYPE
   >
   Links;
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
index cdebf4d772f..d00d2767c9b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.cpp
@@ -39,7 +39,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       TAO_Lookup<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* lookup =
         new TAO_Lookup<TRADER_LOCK_TYPE,MAP_LOCK_TYPE> (*this);
       this->trading_components ().lookup_if (lookup->_this (env));
-      lookup->_remove_ref (env);
       this->ifs_[LOOKUP_IF] = lookup;
     }
   if (ACE_BIT_ENABLED (components, REGISTER))
@@ -47,7 +46,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* reg =
         new TAO_Register<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
       this->trading_components ().register_if (reg->_this (env));
-      reg->_remove_ref (env);
       this->ifs_[REGISTER_IF] = reg;
     }
   if (ACE_BIT_ENABLED (components, ADMIN))
@@ -55,7 +53,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* admin =
         new TAO_Admin<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
       this->trading_components ().admin_if (admin->_this (env));
-      admin->_remove_ref (env);
       this->ifs_[ADMIN_IF] = admin;
     }
   if (ACE_BIT_ENABLED (components, PROXY))
@@ -63,7 +60,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* proxy =
         new TAO_Proxy<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
       this->trading_components ().proxy_if (proxy->_this (env));
-      proxy->_remove_ref (env);
       this->ifs_[PROXY_IF] = proxy;
     }
   if (ACE_BIT_ENABLED (components, LINK))
@@ -71,7 +67,6 @@ TAO_Trader (TAO_Trader_Base::Trader_Components components)
       TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>* link =
         new TAO_Link<TRADER_LOCK_TYPE, MAP_LOCK_TYPE> (*this);
       this->trading_components ().link_if (link->_this (env));
-      link->_remove_ref (env);
       this->ifs_[LINK_IF] = link;
     }
 }
@@ -94,18 +89,17 @@ TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::~TAO_Trader (void)
               PortableServer::POA_var poa =
                 this->ifs_[i]->_default_POA (TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
               PortableServer::ObjectId_var id =
                 poa->servant_to_id (this->ifs_[i], TAO_TRY_ENV);
               TAO_CHECK_ENV;
-
               poa->deactivate_object (id.in (), TAO_TRY_ENV);
-              TAO_CHECK_ENV;              
             }
           TAO_CATCHANY
             {
             }
           TAO_ENDTRY;
+
+          delete this->ifs_[i];
         }
     }
 }
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index d91fc18542a..9e2b672755d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -94,9 +94,7 @@ private:
   // *************************************************************
 
 template <class IF>
-class TAO_Trader_Components : 
-  public virtual IF,
-  public virtual PortableServer::RefCountServantBase
+class TAO_Trader_Components : public virtual IF
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
index 04899637bdf..992eb84de2c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -5,10 +5,10 @@
 ACE_RCSID(Trader, Trader_Utils, "$Id$")
 
   // *************************************************************
-  // TAO_Policy_Creator
+  // TAO_Policy_Manager
   // *************************************************************
 
-TAO_Policy_Creator::TAO_Policy_Creator (int num_policies)
+TAO_Policy_Manager::TAO_Policy_Manager (int num_policies)
   : policies_ (num_policies),
     num_policies_ (0)
 {
@@ -17,7 +17,7 @@ TAO_Policy_Creator::TAO_Policy_Creator (int num_policies)
 }
 
 void
-TAO_Policy_Creator::search_card (CORBA::ULong scard)
+TAO_Policy_Manager::search_card (CORBA::ULong scard)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::SEARCH_CARD);
@@ -25,7 +25,7 @@ TAO_Policy_Creator::search_card (CORBA::ULong scard)
 }
 
 void
-TAO_Policy_Creator::match_card (CORBA::ULong mcard)
+TAO_Policy_Manager::match_card (CORBA::ULong mcard)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::MATCH_CARD);
@@ -33,7 +33,7 @@ TAO_Policy_Creator::match_card (CORBA::ULong mcard)
 }
 
 void
-TAO_Policy_Creator::return_card (CORBA::ULong rcard)
+TAO_Policy_Manager::return_card (CORBA::ULong rcard)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::RETURN_CARD);
@@ -41,7 +41,7 @@ TAO_Policy_Creator::return_card (CORBA::ULong rcard)
 }
 
 void
-TAO_Policy_Creator::use_modifiable_properties (CORBA::Boolean mod_props)
+TAO_Policy_Manager::use_modifiable_properties (CORBA::Boolean mod_props)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::USE_MODIFIABLE_PROPERTIES);
@@ -49,7 +49,7 @@ TAO_Policy_Creator::use_modifiable_properties (CORBA::Boolean mod_props)
 }
 
 void
-TAO_Policy_Creator::use_dynamic_properties (CORBA::Boolean dyn_props)
+TAO_Policy_Manager::use_dynamic_properties (CORBA::Boolean dyn_props)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::USE_DYNAMIC_PROPERTIES);
@@ -57,7 +57,7 @@ TAO_Policy_Creator::use_dynamic_properties (CORBA::Boolean dyn_props)
 }
 
 void
-TAO_Policy_Creator::use_proxy_offers (CORBA::Boolean prox_offs)
+TAO_Policy_Manager::use_proxy_offers (CORBA::Boolean prox_offs)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::USE_PROXY_OFFERS);
@@ -65,7 +65,7 @@ TAO_Policy_Creator::use_proxy_offers (CORBA::Boolean prox_offs)
 }
 
 void
-TAO_Policy_Creator::starting_trader (const CosTrading::TraderName& name)
+TAO_Policy_Manager::starting_trader (const CosTrading::TraderName& name)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::STARTING_TRADER);
@@ -73,7 +73,7 @@ TAO_Policy_Creator::starting_trader (const CosTrading::TraderName& name)
 }
 
 void
-TAO_Policy_Creator::starting_trader (CosTrading::TraderName* name)
+TAO_Policy_Manager::starting_trader (CosTrading::TraderName* name)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::STARTING_TRADER);
@@ -81,7 +81,7 @@ TAO_Policy_Creator::starting_trader (CosTrading::TraderName* name)
 }
 
 void
-TAO_Policy_Creator::
+TAO_Policy_Manager::
 link_follow_rule (CosTrading::FollowOption follow_option)
 {
   CosTrading::Policy& policy =
@@ -90,7 +90,7 @@ link_follow_rule (CosTrading::FollowOption follow_option)
 }
 
 void
-TAO_Policy_Creator::hop_count (CORBA::ULong hop_count)
+TAO_Policy_Manager::hop_count (CORBA::ULong hop_count)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::HOP_COUNT);
@@ -98,7 +98,7 @@ TAO_Policy_Creator::hop_count (CORBA::ULong hop_count)
 }
 
 void
-TAO_Policy_Creator::exact_type_match (CORBA::Boolean exact_type)
+TAO_Policy_Manager::exact_type_match (CORBA::Boolean exact_type)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::EXACT_TYPE_MATCH);
@@ -106,26 +106,26 @@ TAO_Policy_Creator::exact_type_match (CORBA::Boolean exact_type)
 }
 
 void
-TAO_Policy_Creator::request_id (const CosTrading::Admin::OctetSeq& request_id)
+TAO_Policy_Manager::request_id (const CosTrading::Admin::OctetSeq& request_id)
 {
   CosTrading::Policy& policy =
     this->fetch_next_policy (TAO_Policies::REQUEST_ID);
   policy.value <<= request_id;
 }
 
-TAO_Policy_Creator::operator const CosTrading::PolicySeq& (void) const
+TAO_Policy_Manager::operator const CosTrading::PolicySeq& (void) const
 {
   return this->policies_;
 }
 
 const CosTrading::PolicySeq&
-TAO_Policy_Creator::policy_seq (void) const
+TAO_Policy_Manager::policy_seq (void) const
 {
   return this->policies_;
 }
 
 CosTrading::Policy&
-TAO_Policy_Creator::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type)
+TAO_Policy_Manager::fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type)
 {
   CORBA::ULong index = 0;
 
@@ -449,27 +449,14 @@ construct_dynamic_prop (const char* name,
                         CORBA::TypeCode_ptr returned_type,
                         const CORBA::Any& extra_info)
 {
-  ACE_UNUSED_ARG (name);
-
   CosTradingDynamic::DynamicProp* dp_struct = 0;
 
   ACE_NEW_RETURN (dp_struct, CosTradingDynamic::DynamicProp, 0);
 
   TAO_TRY
     {
-      if (this->prop_.in () == CosTradingDynamic::DynamicPropEval::_nil ())
-        {
-          this->prop_ = this->_this (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          this->_remove_ref (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-      
-      dp_struct->eval_if =
-        CosTradingDynamic::DynamicPropEval::_duplicate (this->prop_.in ());
+      dp_struct->eval_if = this->_this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-      
       dp_struct->returned_type = CORBA::TypeCode::_duplicate (returned_type);
       dp_struct->extra_info = extra_info;
     }
@@ -482,30 +469,6 @@ construct_dynamic_prop (const char* name,
   return dp_struct;
 }
 
-void
-TAO_Dynamic_Property::destroy (void)
-{
-  TAO_TRY
-    {
-      if (this->prop_.in () != CosTradingDynamic::DynamicPropEval::_nil ())
-        {
-          PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-          
-          PortableServer::ObjectId_var id =
-            poa->servant_to_id (this, TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-          
-          poa->deactivate_object (id.in (), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCHANY
-    {
-    }
-  TAO_ENDTRY;  
-}
-
   // *************************************************************
   // TAO_Policies
   // *************************************************************
@@ -871,8 +834,6 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
   TAO_THROW_SPEC ((CosTrading::Lookup::PolicyTypeMismatch,
                    CosTrading::Lookup::InvalidPolicyValue))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   CosTrading::FollowOption follow_option = CosTrading::local_only;
   CosTrading::FollowOption trader_max_follow_policy =
     this->trader_.import_attributes ().max_follow_policy ();
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
index ead8aa6c008..dcb170e9e3b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -14,7 +14,7 @@
 //
 // Client Utils:
 //   TAO_Dynamic_Property
-//   TAO_Policy_Creator
+//   TAO_Policy_Manager
 //   TAO_Property_Evaluator
 //   TAO_Property_Evaluator_By_Name
 //
@@ -179,8 +179,7 @@ private:
   // *************************************************************
 
 class TAO_ORBSVCS_Export TAO_Dynamic_Property :
-  public virtual POA_CosTradingDynamic::DynamicPropEval,
-  public virtual PortableServer::RefCountServantBase
+  public POA_CosTradingDynamic::DynamicPropEval
 // = TITLE
 //   Little helper class that you can extend to have your dynamic
 //   property handler construct CosTradingDynamic::DynamicProp structs.
@@ -193,8 +192,6 @@ public:
 
   virtual ~TAO_Dynamic_Property (void);
 
-  void destroy (void);
-  
   virtual CORBA::Any* evalDP(const char* name,
                              CORBA::TypeCode_ptr returned_type,
                              const CORBA::Any& extra_info,
@@ -209,10 +206,6 @@ public:
                             const CORBA::Any& extra_info);
   // Method to construct a dynamic property structure suitable for
   // exporting in a CosTrading::PropertyStruct to the Trading Service.
-
- private:
-
-  CosTradingDynamic::DynamicPropEval_var prop_;
 };
 
 
@@ -488,19 +481,19 @@ private:
 };
 
   // *************************************************************
-  // TAO_Policy_Creator
+  // TAO_Policy_Manager
   // *************************************************************
 
-class TAO_ORBSVCS_Export TAO_Policy_Creator
+class TAO_ORBSVCS_Export TAO_Policy_Manager
+// = TITLE
+//
+// This class is a utility for clients using the CosTrading::Lookup
+// interface that helps them build a policy sequence without violating
+// syntax rules and having to mess with typecodes.
 {
-  // = TITLE
-  //
-  // This class is a utility for clients using the CosTrading::Lookup
-  // interface that helps them build a policy sequence without violating
-  // syntax rules and having to mess with typecodes.
 public:
 
-  TAO_Policy_Creator (int num_policies = 0);
+  TAO_Policy_Manager (int num_policies = 0);
 
   // = Routines to set policies.
 
@@ -554,8 +547,8 @@ public:
 
 private:
 
-  TAO_Policy_Creator (const TAO_Policy_Creator&);
-  TAO_Policy_Creator& operator= (const TAO_Policy_Creator&);
+  TAO_Policy_Manager (const TAO_Policy_Manager&);
+  TAO_Policy_Manager& operator= (const TAO_Policy_Manager&);
 
   CosTrading::Policy& fetch_next_policy (TAO_Policies::POLICY_TYPE pol_type);
   // Method to prepare the next slot in the policies_ sequence for
@@ -621,12 +614,10 @@ private:
   TAO_Offer_Modifier (const TAO_Offer_Modifier&);
   TAO_Offer_Modifier& operator= (const TAO_Offer_Modifier&);
 
-  typedef ACE_Hash_Map_Manager_Ex
+  typedef ACE_Hash_Map_Manager
     <
     TAO_String_Hash_Key,
     CosTrading::Property*,
-    ACE_Hash<TAO_String_Hash_Key>,
-    ACE_Equal_To<TAO_String_Hash_Key>,
     ACE_Null_Mutex
     >
     Property_Table;
diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
index 66913227fcf..41510915863 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs.dsp
@@ -29,7 +29,7 @@ CFG=orbsvcs - Win32 Debug
 

 # Begin Project

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 

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

 

@@ -109,8 +109,10 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

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

 CPP=cl.exe

-# ADD BASE CPP /Gt0 Gt0 nologo MT Gt0 W3 GX O2 I "..\\ /I" I "..\..\..\\ /D" D "WIN32" D "..\..\\ NDEBUG"

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

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

@@ -139,8 +141,10 @@ MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

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

 CPP=cl.exe

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

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

+# ADD BASE CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D "WIN32" /FD /c

+# SUBTRACT BASE CPP /WX /YX

+# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "_DEBUG" /D "_WINDOWS" /D TAO_ORBSVCS_HAS_DLL=1 /D "TAO_ORBSVCS_BUILD_DLL" /D "WIN32" /FD /c

+# SUBTRACT CPP /WX /YX

 RSC=rc.exe

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

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

@@ -164,7 +168,7 @@ LINK32=link.exe
 # PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\AV\AVStreams_i.cpp

+SOURCE=.\Event\BCU.cpp

 

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

 

@@ -172,44 +176,143 @@ SOURCE=.\AV\AVStreams_i.cpp
 

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

 

-DEP_CPP_AVSTR=\

+DEP_CPP_BCU_C=\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\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\streams.h"\

+	"..\..\..\ace\Trace.h"\

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

+	".\Event\BCU.h"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_BCU_C=\

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

+	

+

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

+

+DEP_CPP_BCU_C=\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\Log_Msg.h"\

+	"..\..\..\ace\Log_Priority.h"\

+	"..\..\..\ace\Log_Record.h"\

+	"..\..\..\ace\Log_Record.i"\

+	"..\..\..\ace\Malloc_Base.h"\

+	"..\..\..\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\streams.h"\

+	"..\..\..\ace\Trace.h"\

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

+	".\Event\BCU.h"\

+	".\orbsvcs_export.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\Concurrency\CC_LockSet.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

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

+

+DEP_CPP_CC_LO=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

-	"..\..\..\ace\CDR_Stream.h"\

-	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

-	"..\..\..\ace\Containers_T.cpp"\

-	"..\..\..\ace\Containers_T.h"\

-	"..\..\..\ace\Containers_T.i"\

-	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Functor.h"\

-	"..\..\..\ace\Functor.i"\

-	"..\..\..\ace\Functor_T.cpp"\

-	"..\..\..\ace\Functor_T.h"\

-	"..\..\..\ace\Functor_T.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\Hash_Map_Manager.i"\

-	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

-	"..\..\..\ace\Hash_Map_Manager_T.h"\

-	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -223,21 +326,27 @@ DEP_CPP_AVSTR=\
 	"..\..\..\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_Block_T.cpp"\

-	"..\..\..\ace\Message_Block_T.h"\

-	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Process.h"\

-	"..\..\..\ace\Process.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -245,171 +354,438 @@ DEP_CPP_AVSTR=\
 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

 	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

 	"..\..\..\ace\Shared_Object.h"\

 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\Token.h"\

+	"..\..\..\ace\Token.i"\

 	"..\..\..\ace\Trace.h"\

+	"..\..\..\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\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

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

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

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

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

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

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

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Managed_Types.h"\

-	"..\..\tao\Managed_Types.i"\

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

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

+	"..\..\tao\IIOP_Interpreter.h"\

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

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

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

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

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

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

-	"..\..\tao\TAO.h"\

-	"..\..\tao\try_macros.h"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

-	".\AV\AVStreams_i.h"\

-	".\AV\Endpoint_Strategy.h"\

-	".\AV\Endpoint_Strategy_T.cpp"\

-	".\AV\Endpoint_Strategy_T.h"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSet.h"\

 	".\orbsvcs_export.h"\

-	".\Trader\Trader.h"\

 	

-NODEP_CPP_AVSTR=\

-	"..\..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

-	".\AV\AVStreams_i_T.cpp"\

-	".\AV\AVStreams_i_T.h"\

+NODEP_CPP_CC_LO=\

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

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

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

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

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	

 

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

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsC.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsS.cpp

-

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

-

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

-

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

-

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

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\BCU.cpp

-

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

-

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

-

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

-

-DEP_CPP_BCU_C=\

+DEP_CPP_CC_LO=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Token.h"\

+	"..\..\..\ace\Token.i"\

 	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

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

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

-	".\Event\BCU.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

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

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

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

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

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

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

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

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

+	"..\..\tao\corbafwd.h"\

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

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

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSet.h"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_BCU_C=\

-	"..\..\..\ace\sys_conf.h"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Concurrency\CC_LockSet.cpp

+SOURCE=.\Concurrency\CC_LockSetFactory.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -417,7 +793,7 @@ SOURCE=.\Concurrency\CC_LockSet.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_CC_LO=\

+DEP_CPP_CC_LOC=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -572,11 +948,11 @@ DEP_CPP_CC_LO=\
 	"..\..\..\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"\

@@ -594,6 +970,9 @@ DEP_CPP_CC_LO=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -648,15 +1027,13 @@ DEP_CPP_CC_LO=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\Concurrency\CC_LockSet.h"\

+	".\Concurrency\CC_LockSetFactory.h"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_CC_LO=\

+NODEP_CPP_CC_LOC=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosConcurrencyControlC.h"\

 	".\CosConcurrencyControlC.i"\

@@ -669,19 +1046,6 @@ NODEP_CPP_CC_LO=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Concurrency\CC_LockSetFactory.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

 DEP_CPP_CC_LOC=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

@@ -696,6 +1060,8 @@ DEP_CPP_CC_LOC=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -704,9 +1070,12 @@ DEP_CPP_CC_LOC=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -716,12 +1085,18 @@ DEP_CPP_CC_LOC=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -751,6 +1126,9 @@ DEP_CPP_CC_LOC=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -837,32 +1215,39 @@ DEP_CPP_CC_LOC=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -874,12 +1259,10 @@ DEP_CPP_CC_LOC=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -900,12 +1283,14 @@ DEP_CPP_CC_LOC=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

@@ -914,16 +1299,6 @@ DEP_CPP_CC_LOC=\
 	"..\..\tao\varout.i"\

 	".\Concurrency\CC_LockSet.h"\

 	".\Concurrency\CC_LockSetFactory.h"\

-	".\orbsvcs_export.h"\

-	

-NODEP_CPP_CC_LOC=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

 	".\CosConcurrencyControlC.h"\

 	".\CosConcurrencyControlC.i"\

 	".\CosConcurrencyControlS.h"\

@@ -931,10 +1306,9 @@ NODEP_CPP_CC_LOC=\
 	".\CosConcurrencyControlS_T.cpp"\

 	".\CosConcurrencyControlS_T.h"\

 	".\CosConcurrencyControlS_T.i"\

+	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -1101,11 +1475,11 @@ DEP_CPP_CONCU=\
 	"..\..\..\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"\

@@ -1123,6 +1497,9 @@ DEP_CPP_CONCU=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -1182,11 +1559,8 @@ DEP_CPP_CONCU=\
 	

 NODEP_CPP_CONCU=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosConcurrencyControlC.h"\

 	".\CosConcurrencyControlC.i"\

@@ -1199,6 +1573,267 @@ NODEP_CPP_CONCU=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_CONCU=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Concurrency\CC_LockSetFactory.h"\

+	".\Concurrency\Concurrency_Utils.h"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1365,11 +2000,11 @@ DEP_CPP_CONFI=\
 	"..\..\..\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"\

@@ -1387,6 +2022,9 @@ DEP_CPP_CONFI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -1461,14 +2099,18 @@ DEP_CPP_CONFI=\
 	

 NODEP_CPP_CONFI=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

 	".\RtecSchedulerS.h"\

@@ -1476,31 +2118,11 @@ NODEP_CPP_CONFI=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Trader\Constraint_Interpreter.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_CONST=\

+DEP_CPP_CONFI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -1514,6 +2136,8 @@ DEP_CPP_CONST=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -1522,9 +2146,12 @@ DEP_CPP_CONST=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -1534,12 +2161,18 @@ DEP_CPP_CONST=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -1569,6 +2202,9 @@ DEP_CPP_CONST=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -1653,32 +2289,39 @@ DEP_CPP_CONST=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -1690,12 +2333,10 @@ DEP_CPP_CONST=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -1716,51 +2357,62 @@ DEP_CPP_CONST=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

-	".\Trader\Constraint_Interpreter.h"\

-	".\Trader\Constraint_Nodes.h"\

-	".\Trader\Constraint_Tokens.h"\

-	".\Trader\Constraint_Visitors.h"\

-	".\Trader\Trader.h"\

-	".\Trader\Trader_Utils.h"\

-	

-NODEP_CPP_CONST=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosTradingC.h"\

-	".\CosTradingC.i"\

-	".\CosTradingS.h"\

-	".\CosTradingS.i"\

-	".\CosTradingS_T.cpp"\

-	".\CosTradingS_T.h"\

-	".\CosTradingS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Sched\Config_Scheduler.h"\

+	".\Sched\Config_Scheduler.i"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Sched\Scheduler_Generic.h"\

+	".\Sched\Scheduler_Generic.i"\

+	".\Sched\Strategy_Scheduler.h"\

+	".\Sched\Strategy_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Trader\Constraint_l.cpp

+SOURCE=.\Trader\Constraint_Interpreter.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -1768,7 +2420,7 @@ SOURCE=.\Trader\Constraint_l.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_CONSTR=\

+DEP_CPP_CONST=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -1921,11 +2573,11 @@ DEP_CPP_CONSTR=\
 	"..\..\..\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"\

@@ -1943,6 +2595,9 @@ DEP_CPP_CONSTR=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -2004,13 +2659,10 @@ DEP_CPP_CONSTR=\
 	".\Trader\Trader.h"\

 	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_CONSTR=\

+NODEP_CPP_CONST=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -2023,20 +2675,7 @@ NODEP_CPP_CONSTR=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Trader\Constraint_Nodes.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_CONSTRA=\

+DEP_CPP_CONST=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -2050,6 +2689,8 @@ DEP_CPP_CONSTRA=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -2058,9 +2699,12 @@ DEP_CPP_CONSTRA=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -2070,12 +2714,18 @@ DEP_CPP_CONSTRA=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -2105,6 +2755,9 @@ DEP_CPP_CONSTRA=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -2189,32 +2842,40 @@ DEP_CPP_CONSTRA=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -2226,12 +2887,10 @@ DEP_CPP_CONSTRA=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -2252,33 +2911,20 @@ DEP_CPP_CONSTRA=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\orbsvcs_export.h"\

-	".\Trader\Constraint_Nodes.h"\

-	".\Trader\Constraint_Tokens.h"\

-	".\Trader\Constraint_Visitors.h"\

-	".\Trader\Trader.h"\

-	".\Trader\Trader_Utils.h"\

-	

-NODEP_CPP_CONSTRA=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

 	".\CosTradingS.h"\

@@ -2286,16 +2932,21 @@ NODEP_CPP_CONSTRA=\
 	".\CosTradingS_T.cpp"\

 	".\CosTradingS_T.h"\

 	".\CosTradingS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Trader\Constraint_Visitors.cpp

+SOURCE=.\Trader\Constraint_l.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -2303,7 +2954,7 @@ SOURCE=.\Trader\Constraint_Visitors.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_CONSTRAI=\

+DEP_CPP_CONSTR=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -2456,11 +3107,11 @@ DEP_CPP_CONSTRAI=\
 	"..\..\..\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"\

@@ -2478,6 +3129,9 @@ DEP_CPP_CONSTRAI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -2536,25 +3190,13 @@ DEP_CPP_CONSTRAI=\
 	".\Trader\Constraint_Nodes.h"\

 	".\Trader\Constraint_Tokens.h"\

 	".\Trader\Constraint_Visitors.h"\

-	".\Trader\Offer_Database.cpp"\

-	".\Trader\Offer_Database.h"\

-	".\Trader\Offer_Iterators.h"\

-	".\Trader\Offer_Iterators_T.cpp"\

-	".\Trader\Offer_Iterators_T.h"\

 	".\Trader\Trader.h"\

-	".\Trader\Trader_Interfaces.cpp"\

-	".\Trader\Trader_Interfaces.h"\

-	".\Trader\Trader_T.cpp"\

-	".\Trader\Trader_T.h"\

 	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_CONSTRAI=\

+NODEP_CPP_CONSTR=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -2567,20 +3209,7 @@ NODEP_CPP_CONSTRAI=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Trader\Constraint_y.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_CONSTRAIN=\

+DEP_CPP_CONSTR=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -2594,6 +3223,8 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -2602,9 +3233,12 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -2614,12 +3248,18 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -2649,6 +3289,9 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -2733,32 +3376,40 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -2770,12 +3421,10 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -2796,34 +3445,20 @@ DEP_CPP_CONSTRAIN=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\orbsvcs_export.h"\

-	".\Trader\Constraint_Interpreter.h"\

-	".\Trader\Constraint_Nodes.h"\

-	".\Trader\Constraint_Tokens.h"\

-	".\Trader\Constraint_Visitors.h"\

-	".\Trader\Trader.h"\

-	".\Trader\Trader_Utils.h"\

-	

-NODEP_CPP_CONSTRAIN=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

 	".\CosTradingS.h"\

@@ -2831,64 +3466,21 @@ NODEP_CPP_CONSTRAIN=\
 	".\CosTradingS_T.cpp"\

 	".\CosTradingS_T.h"\

 	".\CosTradingS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_CONSU=\

-	"..\..\..\ace\ACE.h"\

-	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Auto_Ptr.cpp"\

-	"..\..\..\ace\Auto_Ptr.h"\

-	"..\..\..\ace\Auto_Ptr.i"\

-	"..\..\..\ace\Basic_Types.h"\

-	"..\..\..\ace\Basic_Types.i"\

-	"..\..\..\ace\config-win32-borland.h"\

-	"..\..\..\ace\config-win32-common.h"\

-	"..\..\..\ace\config-win32.h"\

-	"..\..\..\ace\config-WinCE.h"\

-	"..\..\..\ace\config.h"\

-	"..\..\..\ace\inc_user_config.h"\

-	"..\..\..\ace\iosfwd.h"\

-	"..\..\..\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\streams.h"\

-	"..\..\..\ace\Trace.h"\

-	"..\..\..\ace\ws2tcpip.h"\

-	".\CosEvent\ConsumerAdmin_i.h"\

-	".\CosEvent\ProxyPushSupplier_i.h"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosConcurrencyControlC.cpp

+SOURCE=.\Trader\Constraint_Nodes.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -2896,7 +3488,7 @@ SOURCE=.\CosConcurrencyControlC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_COSCO=\

+DEP_CPP_CONSTRA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -3049,11 +3641,11 @@ DEP_CPP_COSCO=\
 	"..\..\..\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"\

@@ -3071,6 +3663,9 @@ DEP_CPP_COSCO=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -3125,40 +3720,29 @@ DEP_CPP_COSCO=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_COSCO=\

+NODEP_CPP_CONSTRA=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\CosConcurrencyControlC.h"\

-	".\CosConcurrencyControlC.i"\

-	".\CosConcurrencyControlS.h"\

-	".\CosConcurrencyControlS.i"\

-	".\CosConcurrencyControlS_T.cpp"\

-	".\CosConcurrencyControlS_T.h"\

-	".\CosConcurrencyControlS_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosConcurrencyControlS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_COSCON=\

+DEP_CPP_CONSTRA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -3172,6 +3756,8 @@ DEP_CPP_COSCON=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -3180,9 +3766,12 @@ DEP_CPP_COSCON=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -3192,12 +3781,18 @@ DEP_CPP_COSCON=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -3227,6 +3822,9 @@ DEP_CPP_COSCON=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -3311,32 +3909,40 @@ DEP_CPP_COSCON=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -3348,12 +3954,10 @@ DEP_CPP_COSCON=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -3374,120 +3978,41 @@ DEP_CPP_COSCON=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

-	

-NODEP_CPP_COSCON=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosConcurrencyControlC.h"\

-	".\CosConcurrencyControlC.i"\

-	".\CosConcurrencyControlS.h"\

-	".\CosConcurrencyControlS.i"\

-	".\CosConcurrencyControlS_T.cpp"\

-	".\CosConcurrencyControlS_T.h"\

-	".\CosConcurrencyControlS_T.i"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent_Utilities.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelAdminC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelAdminS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventCommC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventCommS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleC.cpp

+SOURCE=.\Trader\Constraint_Visitors.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -3495,7 +4020,7 @@ SOURCE=.\CosLifeCycleC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_COSLI=\

+DEP_CPP_CONSTRAI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -3648,11 +4173,11 @@ DEP_CPP_COSLI=\
 	"..\..\..\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"\

@@ -3670,6 +4195,9 @@ DEP_CPP_COSLI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -3724,47 +4252,39 @@ DEP_CPP_COSLI=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Offer_Database.cpp"\

+	".\Trader\Offer_Database.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Offer_Iterators_T.cpp"\

+	".\Trader\Offer_Iterators_T.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Interfaces.cpp"\

+	".\Trader\Trader_Interfaces.h"\

+	".\Trader\Trader_T.cpp"\

+	".\Trader\Trader_T.h"\

+	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_COSLI=\

+NODEP_CPP_CONSTRAI=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\CosLifeCycleC.h"\

-	".\CosLifeCycleC.i"\

-	".\CosLifeCycleS.h"\

-	".\CosLifeCycleS.i"\

-	".\CosLifeCycleS_T.cpp"\

-	".\CosLifeCycleS_T.h"\

-	".\CosLifeCycleS_T.i"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\CosNamingS.h"\

-	".\CosNamingS.i"\

-	".\CosNamingS_T.cpp"\

-	".\CosNamingS_T.h"\

-	".\CosNamingS_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosLifeCycleS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_COSLIF=\

+DEP_CPP_CONSTRAI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -3778,6 +4298,8 @@ DEP_CPP_COSLIF=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -3786,9 +4308,12 @@ DEP_CPP_COSLIF=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -3798,12 +4323,18 @@ DEP_CPP_COSLIF=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -3833,6 +4364,9 @@ DEP_CPP_COSLIF=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -3917,32 +4451,40 @@ DEP_CPP_COSLIF=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -3954,12 +4496,10 @@ DEP_CPP_COSLIF=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -3980,52 +4520,51 @@ DEP_CPP_COSLIF=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

-	

-NODEP_CPP_COSLIF=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosLifeCycleC.h"\

-	".\CosLifeCycleC.i"\

-	".\CosLifeCycleS.h"\

-	".\CosLifeCycleS.i"\

-	".\CosLifeCycleS_T.cpp"\

-	".\CosLifeCycleS_T.h"\

-	".\CosLifeCycleS_T.i"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\CosNamingS.h"\

-	".\CosNamingS.i"\

-	".\CosNamingS_T.cpp"\

-	".\CosNamingS_T.h"\

-	".\CosNamingS_T.i"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Offer_Database.cpp"\

+	".\Trader\Offer_Database.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Offer_Iterators_T.cpp"\

+	".\Trader\Offer_Iterators_T.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Interfaces.cpp"\

+	".\Trader\Trader_Interfaces.h"\

+	".\Trader\Trader_T.cpp"\

+	".\Trader\Trader_T.h"\

+	".\Trader\Trader_Utils.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosNamingC.cpp

+SOURCE=.\Trader\Constraint_y.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -4033,7 +4572,7 @@ SOURCE=.\CosNamingC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_COSNA=\

+DEP_CPP_CONSTRAIN=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -4186,11 +4725,11 @@ DEP_CPP_COSNA=\
 	"..\..\..\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"\

@@ -4208,6 +4747,9 @@ DEP_CPP_COSNA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -4262,40 +4804,30 @@ DEP_CPP_COSNA=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_COSNA=\

+NODEP_CPP_CONSTRAIN=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\CosNamingS.h"\

-	".\CosNamingS.i"\

-	".\CosNamingS_T.cpp"\

-	".\CosNamingS_T.h"\

-	".\CosNamingS_T.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_COSNAM=\

+DEP_CPP_CONSTRAIN=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -4309,6 +4841,8 @@ DEP_CPP_COSNAM=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -4317,9 +4851,12 @@ DEP_CPP_COSNAM=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -4329,12 +4866,18 @@ DEP_CPP_COSNAM=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -4364,6 +4907,9 @@ DEP_CPP_COSNAM=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -4448,32 +4994,40 @@ DEP_CPP_COSNAM=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -4485,12 +5039,10 @@ DEP_CPP_COSNAM=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -4511,109 +5063,42 @@ DEP_CPP_COSNAM=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

-NODEP_CPP_COSNAM=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\CosNamingS.h"\

-	".\CosNamingS.i"\

-	".\CosNamingS_T.cpp"\

-	".\CosNamingS_T.h"\

-	".\CosNamingS_T.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Property\CosPropertyService_i.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_COSPR=\

-	"..\..\..\ace\ACE.h"\

-	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Basic_Types.h"\

-	"..\..\..\ace\Basic_Types.i"\

-	"..\..\..\ace\config-win32-borland.h"\

-	"..\..\..\ace\config-win32-common.h"\

-	"..\..\..\ace\config-win32.h"\

-	"..\..\..\ace\config-WinCE.h"\

-	"..\..\..\ace\config.h"\

-	"..\..\..\ace\inc_user_config.h"\

-	"..\..\..\ace\iosfwd.h"\

-	"..\..\..\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\streams.h"\

-	"..\..\..\ace\Trace.h"\

-	"..\..\..\ace\ws2tcpip.h"\

-	".\orbsvcs_export.h"\

-	

-NODEP_CPP_COSPR=\

-	"..\..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosPropertyServiceC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosPropertyServiceS.cpp

+SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -4623,20 +5108,7 @@ SOURCE=.\CosPropertyServiceS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_COSTR=\

+DEP_CPP_CONSU=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -4650,6 +5122,8 @@ DEP_CPP_COSTR=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -4658,9 +5132,12 @@ DEP_CPP_COSTR=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -4670,12 +5147,18 @@ DEP_CPP_COSTR=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -4705,6 +5188,9 @@ DEP_CPP_COSTR=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -4789,32 +5275,39 @@ DEP_CPP_COSTR=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -4826,12 +5319,10 @@ DEP_CPP_COSTR=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -4852,105 +5343,53 @@ DEP_CPP_COSTR=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosEvent\ConsumerAdmin_i.h"\

+	".\CosEvent\ProxyPushSupplier_i.h"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\orbsvcs_export.h"\

-	

-NODEP_CPP_COSTR=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosTradingC.h"\

-	".\CosTradingC.i"\

-	".\CosTradingS.h"\

-	".\CosTradingS.i"\

-	".\CosTradingS_T.cpp"\

-	".\CosTradingS_T.h"\

-	".\CosTradingS_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingS.cpp

+SOURCE=.\CosConcurrencyControlC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -4958,7 +5397,7 @@ SOURCE=.\CosTradingS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_COSTRA=\

+DEP_CPP_COSCO=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -5111,11 +5550,11 @@ DEP_CPP_COSTRA=\
 	"..\..\..\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"\

@@ -5133,6 +5572,9 @@ DEP_CPP_COSTRA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -5188,39 +5630,23 @@ DEP_CPP_COSTRA=\
 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_COSTRA=\

+NODEP_CPP_COSCO=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\CosTradingC.h"\

-	".\CosTradingC.i"\

-	".\CosTradingS.h"\

-	".\CosTradingS.i"\

-	".\CosTradingS_T.cpp"\

-	".\CosTradingS_T.h"\

-	".\CosTradingS_T.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Dispatching_Modules.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_DISPA=\

+DEP_CPP_COSCO=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -5234,6 +5660,8 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -5242,9 +5670,12 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -5254,14 +5685,18 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

-	"..\..\..\ace\High_Res_Timer.h"\

-	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -5269,8 +5704,6 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\iosfwd.h"\

 	"..\..\..\ace\IPC_SAP.h"\

 	"..\..\..\ace\IPC_SAP.i"\

-	"..\..\..\ace\Local_Tokens.h"\

-	"..\..\..\ace\Local_Tokens.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -5293,6 +5726,9 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -5305,15 +5741,9 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pipe.h"\

-	"..\..\..\ace\Pipe.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

-	"..\..\..\ace\Sched_Params.h"\

-	"..\..\..\ace\Sched_Params.i"\

-	"..\..\..\ace\Select_Reactor.h"\

-	"..\..\..\ace\Select_Reactor.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -5375,52 +5805,47 @@ DEP_CPP_DISPA=\
 	"..\..\..\ace\Thread_Manager.h"\

 	"..\..\..\ace\Thread_Manager.i"\

 	"..\..\..\ace\Time_Value.h"\

-	"..\..\..\ace\Timeprobe.h"\

-	"..\..\..\ace\Timeprobe.i"\

-	"..\..\..\ace\Timeprobe_T.cpp"\

-	"..\..\..\ace\Timeprobe_T.h"\

-	"..\..\..\ace\Timer_Heap.h"\

-	"..\..\..\ace\Timer_Heap_T.cpp"\

-	"..\..\..\ace\Timer_Heap_T.h"\

-	"..\..\..\ace\Timer_List.h"\

-	"..\..\..\ace\Timer_List_T.cpp"\

-	"..\..\..\ace\Timer_List_T.h"\

 	"..\..\..\ace\Timer_Queue.h"\

 	"..\..\..\ace\Timer_Queue_T.cpp"\

 	"..\..\..\ace\Timer_Queue_T.h"\

 	"..\..\..\ace\Timer_Queue_T.i"\

-	"..\..\..\ace\Token.h"\

-	"..\..\..\ace\Token.i"\

 	"..\..\..\ace\Trace.h"\

 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -5432,12 +5857,10 @@ DEP_CPP_DISPA=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -5458,92 +5881,36 @@ DEP_CPP_DISPA=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

-	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\Event\Dispatching_Modules.h"\

-	".\Event\Dispatching_Modules.i"\

-	".\Event\Event_Channel.h"\

-	".\Event\Event_Channel.i"\

-	".\Event\Fast_Reactor.h"\

-	".\Event\Local_ESTypes.h"\

-	".\Event\Local_ESTypes.i"\

-	".\Event\Memory_Pools.h"\

-	".\Event\Memory_Pools.i"\

-	".\Event\ReactorTask.h"\

-	".\Event\RT_Task.h"\

-	".\Event\RT_Task.i"\

-	".\Event_Service_Constants.h"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Scheduler_Factory.h"\

-	".\Scheduler_Factory.i"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

-	

-NODEP_CPP_DISPA=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\Event\ace\ReactorEx.h"\

-	".\Event\CORBA_Utils_T.cpp"\

-	".\Event\CORBA_Utils_T.h"\

-	".\Event\CORBA_Utils_T.i"\

-	".\Event\Task_Manager.h"\

-	".\Event\Task_Manager.i"\

-	".\RtecEventChannelAdminC.h"\

-	".\RtecEventChannelAdminC.i"\

-	".\RtecEventChannelAdminS.h"\

-	".\RtecEventChannelAdminS.i"\

-	".\RtecEventChannelAdminS_T.cpp"\

-	".\RtecEventChannelAdminS_T.h"\

-	".\RtecEventChannelAdminS_T.i"\

-	".\RtecEventCommC.h"\

-	".\RtecEventCommC.i"\

-	".\RtecEventCommS.h"\

-	".\RtecEventCommS.i"\

-	".\RtecEventCommS_T.cpp"\

-	".\RtecEventCommS_T.h"\

-	".\RtecEventCommS_T.i"\

-	".\RtecSchedulerC.h"\

-	".\RtecSchedulerC.i"\

-	".\RtecSchedulerS.h"\

-	".\RtecSchedulerS.i"\

-	".\RtecSchedulerS_T.cpp"\

-	".\RtecSchedulerS_T.h"\

-	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Sched\DynSched.cpp

+SOURCE=.\CosConcurrencyControlS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -5551,7 +5918,7 @@ SOURCE=.\Sched\DynSched.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_DYNSC=\

+DEP_CPP_COSCON=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -5635,8 +6002,6 @@ DEP_CPP_DYNSC=\
 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

-	"..\..\..\ace\Sched_Params.h"\

-	"..\..\..\ace\Sched_Params.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -5706,11 +6071,11 @@ DEP_CPP_DYNSC=\
 	"..\..\..\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"\

@@ -5728,6 +6093,9 @@ DEP_CPP_DYNSC=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -5781,58 +6149,36 @@ DEP_CPP_DYNSC=\
 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

-	".\Sched\DynSched.h"\

-	".\Sched\DynSched.i"\

-	".\Sched\SchedEntry.h"\

-	".\Sched\SchedEntry.i"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-NODEP_CPP_DYNSC=\

+NODEP_CPP_COSCON=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\RtecSchedulerC.h"\

-	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Basic_Factory.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_BA=\

+DEP_CPP_COSCON=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -5892,14 +6238,9 @@ DEP_CPP_EC_BA=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -5921,14 +6262,6 @@ DEP_CPP_EC_BA=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

-	"..\..\..\ace\RB_Tree.cpp"\

-	"..\..\..\ace\RB_Tree.h"\

-	"..\..\..\ace\RB_Tree.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -6010,16 +6343,11 @@ DEP_CPP_EC_BA=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -6029,29 +6357,22 @@ DEP_CPP_EC_BA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -6061,28 +6382,20 @@ DEP_CPP_EC_BA=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -6093,8 +6406,6 @@ DEP_CPP_EC_BA=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -6102,76 +6413,25 @@ DEP_CPP_EC_BA=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Basic_Factory.h"\

-	".\Event\EC_Basic_Factory.i"\

-	".\Event\EC_Basic_Filter_Builder.h"\

-	".\Event\EC_Basic_Filter_Builder.i"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_Null_Scheduling.h"\

-	".\Event\EC_Null_Scheduling.i"\

-	".\Event\EC_ObserverStrategy.h"\

-	".\Event\EC_ObserverStrategy.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

-	".\Event\EC_ProxyPushSupplier_Set_T.h"\

-	".\Event\EC_ProxyPushSupplier_Set_T.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Reactive_Timeout_Generator.h"\

-	".\Event\EC_Reactive_Timeout_Generator.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

-	".\Event\EC_Trivial_Supplier_Filter.h"\

-	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\CosConcurrencyControlC.h"\

+	".\CosConcurrencyControlC.i"\

+	".\CosConcurrencyControlS.h"\

+	".\CosConcurrencyControlS.i"\

+	".\CosConcurrencyControlS_T.cpp"\

+	".\CosConcurrencyControlS_T.h"\

+	".\CosConcurrencyControlS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Filter_Builder.cpp

+SOURCE=.\CosEventChannelAdminC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -6179,29 +6439,66 @@ SOURCE=.\Event\EC_Basic_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_BAS=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSEV=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -6215,6 +6512,9 @@ DEP_CPP_EC_BAS=\
 	"..\..\..\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"\

@@ -6224,56 +6524,195 @@ DEP_CPP_EC_BAS=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\Event\EC_Basic_Filter_Builder.h"\

-	".\Event\EC_Basic_Filter_Builder.i"\

-	".\Event\EC_Conjunction_Filter.h"\

-	".\Event\EC_Conjunction_Filter.i"\

-	".\Event\EC_Disjunction_Filter.h"\

-	".\Event\EC_Disjunction_Filter.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Type_Filter.h"\

-	".\Event\EC_Type_Filter.i"\

-	".\Event_Service_Constants.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Busy_Lock.cpp

+SOURCE=.\CosEventChannelAdminS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -6281,44 +6720,280 @@ SOURCE=.\Event\EC_Busy_Lock.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_BU=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSEVE=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Conjunction_Filter.cpp

+SOURCE=.\CosEventCommC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -6326,42 +7001,20 @@ SOURCE=.\Event\EC_Conjunction_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_CO=\

-	".\Event\EC_Conjunction_Filter.h"\

-	".\Event\EC_Conjunction_Filter.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	

-

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ConsumerAdmin.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_CON=\

+DEP_CPP_COSEVEN=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -6421,14 +7074,9 @@ DEP_CPP_EC_CON=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -6450,11 +7098,6 @@ DEP_CPP_EC_CON=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -6536,16 +7179,11 @@ DEP_CPP_EC_CON=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -6555,29 +7193,22 @@ DEP_CPP_EC_CON=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -6587,28 +7218,20 @@ DEP_CPP_EC_CON=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -6619,8 +7242,6 @@ DEP_CPP_EC_CON=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -6628,45 +7249,25 @@ DEP_CPP_EC_CON=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Default_Factory.cpp

+SOURCE=.\CosEventCommS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -6674,21 +7275,20 @@ SOURCE=.\Event\EC_Default_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_DE=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSEVENT=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

-	"..\..\..\ace\Arg_Shifter.h"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -6748,14 +7348,9 @@ DEP_CPP_EC_DE=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -6777,14 +7372,6 @@ DEP_CPP_EC_DE=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

-	"..\..\..\ace\RB_Tree.cpp"\

-	"..\..\..\ace\RB_Tree.h"\

-	"..\..\..\ace\RB_Tree.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -6866,16 +7453,11 @@ DEP_CPP_EC_DE=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -6885,29 +7467,22 @@ DEP_CPP_EC_DE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -6917,28 +7492,20 @@ DEP_CPP_EC_DE=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -6949,8 +7516,6 @@ DEP_CPP_EC_DE=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -6958,132 +7523,25 @@ DEP_CPP_EC_DE=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Basic_Filter_Builder.h"\

-	".\Event\EC_Basic_Filter_Builder.i"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Default_Factory.h"\

-	".\Event\EC_Default_Factory.i"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_Null_Scheduling.h"\

-	".\Event\EC_Null_Scheduling.i"\

-	".\Event\EC_ObserverStrategy.h"\

-	".\Event\EC_ObserverStrategy.i"\

-	".\Event\EC_Per_Supplier_Filter.h"\

-	".\Event\EC_Per_Supplier_Filter.i"\

-	".\Event\EC_Priority_Dispatching.h"\

-	".\Event\EC_Priority_Dispatching.i"\

-	".\Event\EC_Priority_Scheduling.h"\

-	".\Event\EC_Priority_Scheduling.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

-	".\Event\EC_ProxyPushSupplier_Set_T.h"\

-	".\Event\EC_ProxyPushSupplier_Set_T.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Reactive_Timeout_Generator.h"\

-	".\Event\EC_Reactive_Timeout_Generator.i"\

-	".\Event\EC_Sched_Filter_Builder.h"\

-	".\Event\EC_Sched_Filter_Builder.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

-	".\Event\EC_Trivial_Supplier_Filter.h"\

-	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Disjunction_Filter.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_DI=\

-	".\Event\EC_Disjunction_Filter.h"\

-	".\Event\EC_Disjunction_Filter.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_DIS=\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.cpp

+SOURCE=.\CosLifeCycleC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -7091,10 +7549,18 @@ SOURCE=.\Event\EC_Dispatching_Task.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_DISP=\

+DEP_CPP_COSLI=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\config-win32-borland.h"\

@@ -7102,31 +7568,34 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

-	"..\..\..\ace\Containers_T.cpp"\

-	"..\..\..\ace\Containers_T.h"\

-	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Functor.h"\

-	"..\..\..\ace\Functor.i"\

-	"..\..\..\ace\Functor_T.cpp"\

-	"..\..\..\ace\Functor_T.h"\

-	"..\..\..\ace\Functor_T.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\Hash_Map_Manager.i"\

-	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

-	"..\..\..\ace\Hash_Map_Manager_T.h"\

-	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

 	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -7140,15 +7609,15 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\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_Block_T.cpp"\

-	"..\..\..\ace\Message_Block_T.h"\

-	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -7176,6 +7645,19 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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"\

@@ -7192,6 +7674,9 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\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"\

@@ -7208,6 +7693,7 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\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"\

@@ -7216,43 +7702,121 @@ DEP_CPP_EC_DISP=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\Event\EC_Dispatching_Task.h"\

-	".\Event\EC_Dispatching_Task.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

+	"..\..\tao\align.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSLI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Event_Channel.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_EV=\

+DEP_CPP_COSLI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -7312,14 +7876,9 @@ DEP_CPP_EC_EV=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -7341,14 +7900,6 @@ DEP_CPP_EC_EV=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

-	"..\..\..\ace\RB_Tree.cpp"\

-	"..\..\..\ace\RB_Tree.h"\

-	"..\..\..\ace\RB_Tree.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -7430,16 +7981,11 @@ DEP_CPP_EC_EV=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -7449,29 +7995,22 @@ DEP_CPP_EC_EV=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -7481,28 +8020,20 @@ DEP_CPP_EC_EV=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -7513,8 +8044,6 @@ DEP_CPP_EC_EV=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -7522,55 +8051,32 @@ DEP_CPP_EC_EV=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Default_Factory.h"\

-	".\Event\EC_Default_Factory.i"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ObserverStrategy.h"\

-	".\Event\EC_ObserverStrategy.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Factory.cpp

+SOURCE=.\CosLifeCycleS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -7578,20 +8084,274 @@ SOURCE=.\Event\EC_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_FA=\

+DEP_CPP_COSLIF=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSLIF=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSLIF=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -7651,14 +8411,9 @@ DEP_CPP_EC_FA=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -7680,11 +8435,6 @@ DEP_CPP_EC_FA=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -7766,16 +8516,11 @@ DEP_CPP_EC_FA=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -7785,29 +8530,22 @@ DEP_CPP_EC_FA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -7817,28 +8555,20 @@ DEP_CPP_EC_FA=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -7849,8 +8579,6 @@ DEP_CPP_EC_FA=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -7858,47 +8586,32 @@ DEP_CPP_EC_FA=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_FI=\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Filter_Builder.cpp

+SOURCE=.\Naming\CosNaming_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -7906,29 +8619,7 @@ SOURCE=.\Event\EC_Filter_Builder.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_FIL=\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Gateway.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_GA=\

+DEP_CPP_COSNA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -8081,11 +8772,11 @@ DEP_CPP_EC_GA=\
 	"..\..\..\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"\

@@ -8103,6 +8794,9 @@ DEP_CPP_EC_GA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -8156,53 +8850,293 @@ DEP_CPP_EC_GA=\
 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\Channel_Clients_T.cpp"\

-	".\Channel_Clients_T.h"\

-	".\Channel_Clients_T.i"\

-	".\Event\EC_Gateway.h"\

-	".\Event_Service_Constants.h"\

-	".\Event_Utilities.h"\

-	".\Event_Utilities.i"\

+	".\Naming\CosNaming_i.h"\

+	".\Naming\Entries.h"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-NODEP_CPP_EC_GA=\

+NODEP_CPP_COSNA=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\RtecEventChannelAdminC.h"\

-	".\RtecEventChannelAdminC.i"\

-	".\RtecEventCommC.h"\

-	".\RtecEventCommC.i"\

-	".\RtecEventCommS.h"\

-	".\RtecEventCommS.i"\

-	".\RtecEventCommS_T.cpp"\

-	".\RtecEventCommS_T.h"\

-	".\RtecEventCommS_T.i"\

-	".\RtecSchedulerC.h"\

-	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_COSNA=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\Naming\CosNaming_i.h"\

+	".\Naming\Entries.h"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Gateway_UDP.cpp

+SOURCE=.\CosNamingC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -8210,7 +9144,7 @@ SOURCE=.\Event\EC_Gateway_UDP.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_GAT=\

+DEP_CPP_COSNAM=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -8313,14 +9247,8 @@ DEP_CPP_EC_GAT=\
 	"..\..\..\ace\SOCK.i"\

 	"..\..\..\ace\SOCK_Acceptor.h"\

 	"..\..\..\ace\SOCK_Acceptor.i"\

-	"..\..\..\ace\SOCK_CODgram.h"\

-	"..\..\..\ace\SOCK_CODgram.i"\

 	"..\..\..\ace\SOCK_Connector.h"\

 	"..\..\..\ace\SOCK_Connector.i"\

-	"..\..\..\ace\SOCK_Dgram.h"\

-	"..\..\..\ace\SOCK_Dgram.i"\

-	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

-	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

 	"..\..\..\ace\SOCK_IO.h"\

 	"..\..\..\ace\SOCK_IO.i"\

 	"..\..\..\ace\SOCK_Stream.h"\

@@ -8369,11 +9297,11 @@ DEP_CPP_EC_GAT=\
 	"..\..\..\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"\

@@ -8391,6 +9319,9 @@ DEP_CPP_EC_GAT=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -8444,81 +9375,36 @@ DEP_CPP_EC_GAT=\
 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	".\Event\EC_Gateway_UDP.h"\

-	".\Event_Service_Constants.h"\

-	".\Event_Utilities.h"\

-	".\Event_Utilities.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

-NODEP_CPP_EC_GAT=\

+NODEP_CPP_COSNAM=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\RtecEventChannelAdminC.h"\

-	".\RtecEventChannelAdminC.i"\

-	".\RtecEventChannelAdminS.h"\

-	".\RtecEventChannelAdminS.i"\

-	".\RtecEventChannelAdminS_T.cpp"\

-	".\RtecEventChannelAdminS_T.h"\

-	".\RtecEventChannelAdminS_T.i"\

-	".\RtecEventCommC.h"\

-	".\RtecEventCommC.i"\

-	".\RtecEventCommS.h"\

-	".\RtecEventCommS.i"\

-	".\RtecEventCommS_T.cpp"\

-	".\RtecEventCommS_T.h"\

-	".\RtecEventCommS_T.i"\

-	".\RtecSchedulerC.h"\

-	".\RtecSchedulerC.i"\

-	".\RtecSchedulerS.h"\

-	".\RtecSchedulerS.i"\

-	".\RtecSchedulerS_T.cpp"\

-	".\RtecSchedulerS_T.h"\

-	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Factory.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_NU=\

+DEP_CPP_COSNAM=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -8578,14 +9464,9 @@ DEP_CPP_EC_NU=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -8607,14 +9488,6 @@ DEP_CPP_EC_NU=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

-	"..\..\..\ace\RB_Tree.cpp"\

-	"..\..\..\ace\RB_Tree.h"\

-	"..\..\..\ace\RB_Tree.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -8696,16 +9569,11 @@ DEP_CPP_EC_NU=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -8715,29 +9583,22 @@ DEP_CPP_EC_NU=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -8747,28 +9608,20 @@ DEP_CPP_EC_NU=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -8779,8 +9632,6 @@ DEP_CPP_EC_NU=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -8788,74 +9639,25 @@ DEP_CPP_EC_NU=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_Null_Factory.h"\

-	".\Event\EC_Null_Factory.i"\

-	".\Event\EC_Null_Scheduling.h"\

-	".\Event\EC_Null_Scheduling.i"\

-	".\Event\EC_ObserverStrategy.h"\

-	".\Event\EC_ObserverStrategy.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxyPushSupplier_Set_T.cpp"\

-	".\Event\EC_ProxyPushSupplier_Set_T.h"\

-	".\Event\EC_ProxyPushSupplier_Set_T.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Reactive_Timeout_Generator.h"\

-	".\Event\EC_Reactive_Timeout_Generator.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

-	".\Event\EC_Trivial_Supplier_Filter.h"\

-	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Null_Scheduling.cpp

+SOURCE=.\CosNamingS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -8863,41 +9665,261 @@ SOURCE=.\Event\EC_Null_Scheduling.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_NUL=\

-	".\Event\EC_Null_Scheduling.h"\

-	".\Event\EC_Null_Scheduling.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

+DEP_CPP_COSNAMI=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSNAMI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ObserverStrategy.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_OB=\

+DEP_CPP_COSNAMI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

@@ -8963,14 +9985,9 @@ DEP_CPP_EC_OB=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -8992,14 +10009,6 @@ DEP_CPP_EC_OB=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

-	"..\..\..\ace\RB_Tree.cpp"\

-	"..\..\..\ace\RB_Tree.h"\

-	"..\..\..\ace\RB_Tree.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -9081,16 +10090,11 @@ DEP_CPP_EC_OB=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -9100,29 +10104,22 @@ DEP_CPP_EC_OB=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -9132,28 +10129,20 @@ DEP_CPP_EC_OB=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -9164,8 +10153,6 @@ DEP_CPP_EC_OB=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -9173,52 +10160,25 @@ DEP_CPP_EC_OB=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ObserverStrategy.h"\

-	".\Event\EC_ObserverStrategy.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

-	".\Event_Service_Constants.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Per_Supplier_Filter.cpp

+SOURCE=.\Property\CosPropertyService_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -9226,20 +10186,20 @@ SOURCE=.\Event\EC_Per_Supplier_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_PE=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSPR=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -9299,14 +10259,9 @@ DEP_CPP_EC_PE=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -9328,11 +10283,6 @@ DEP_CPP_EC_PE=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -9414,16 +10364,11 @@ DEP_CPP_EC_PE=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -9433,29 +10378,22 @@ DEP_CPP_EC_PE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -9465,28 +10403,20 @@ DEP_CPP_EC_PE=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -9497,8 +10427,6 @@ DEP_CPP_EC_PE=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -9506,56 +10434,26 @@ DEP_CPP_EC_PE=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Per_Supplier_Filter.h"\

-	".\Event\EC_Per_Supplier_Filter.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

-	".\Event_Service_Constants.h"\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

+	".\Property\CosPropertyService_i.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Priority_Dispatching.cpp

+SOURCE=.\CosPropertyServiceC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -9563,20 +10461,20 @@ SOURCE=.\Event\EC_Priority_Dispatching.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_PR=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSPRO=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -9636,14 +10534,9 @@ DEP_CPP_EC_PR=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -9665,16 +10558,9 @@ DEP_CPP_EC_PR=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

-	"..\..\..\ace\Sched_Params.h"\

-	"..\..\..\ace\Sched_Params.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -9753,16 +10639,11 @@ DEP_CPP_EC_PR=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -9772,29 +10653,22 @@ DEP_CPP_EC_PR=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -9804,28 +10678,20 @@ DEP_CPP_EC_PR=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -9836,8 +10702,6 @@ DEP_CPP_EC_PR=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -9845,40 +10709,25 @@ DEP_CPP_EC_PR=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Dispatching_Task.h"\

-	".\Event\EC_Dispatching_Task.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Priority_Dispatching.h"\

-	".\Event\EC_Priority_Dispatching.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event_Service_Constants.h"\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Priority_Scheduling.cpp

+SOURCE=.\CosPropertyServiceS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -9886,50 +10735,20 @@ SOURCE=.\Event\EC_Priority_Scheduling.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_PRI=\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Priority_Scheduling.h"\

-	".\Event\EC_Priority_Scheduling.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

-	

-

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyConsumer.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_PRO=\

+DEP_CPP_COSPROP=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -9989,14 +10808,9 @@ DEP_CPP_EC_PRO=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -10018,11 +10832,6 @@ DEP_CPP_EC_PRO=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -10104,16 +10913,11 @@ DEP_CPP_EC_PRO=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -10123,29 +10927,22 @@ DEP_CPP_EC_PRO=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -10155,28 +10952,20 @@ DEP_CPP_EC_PRO=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -10187,8 +10976,6 @@ DEP_CPP_EC_PRO=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -10196,37 +10983,25 @@ DEP_CPP_EC_PRO=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

+	".\CosPropertyServiceC.h"\

+	".\CosPropertyServiceC.i"\

+	".\CosPropertyServiceS.h"\

+	".\CosPropertyServiceS.i"\

+	".\CosPropertyServiceS_T.cpp"\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp

+SOURCE=.\CosTimeBaseC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -10234,20 +11009,267 @@ SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_PROX=\

+DEP_CPP_COSTI=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTI=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSTI=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -10307,14 +11329,9 @@ DEP_CPP_EC_PROX=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -10336,11 +11353,6 @@ DEP_CPP_EC_PROX=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -10422,16 +11434,11 @@ DEP_CPP_EC_PROX=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -10441,29 +11448,22 @@ DEP_CPP_EC_PROX=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -10473,28 +11473,20 @@ DEP_CPP_EC_PROX=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -10505,8 +11497,6 @@ DEP_CPP_EC_PROX=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -10514,37 +11504,25 @@ DEP_CPP_EC_PROX=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_ProxySupplier.cpp

+SOURCE=.\CosTimeBaseS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -10552,20 +11530,267 @@ SOURCE=.\Event\EC_ProxySupplier.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_PROXY=\

+DEP_CPP_COSTIM=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTIM=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_COSTIM=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -10625,14 +11850,9 @@ DEP_CPP_EC_PROXY=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -10654,11 +11874,6 @@ DEP_CPP_EC_PROXY=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -10740,16 +11955,11 @@ DEP_CPP_EC_PROXY=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -10759,29 +11969,22 @@ DEP_CPP_EC_PROXY=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -10791,28 +11994,20 @@ DEP_CPP_EC_PROXY=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -10823,8 +12018,6 @@ DEP_CPP_EC_PROXY=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -10832,39 +12025,25 @@ DEP_CPP_EC_PROXY=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Dispatching.h"\

-	".\Event\EC_Dispatching.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_QOS_Info.cpp

+SOURCE=.\CosTradingC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -10872,40 +12051,267 @@ SOURCE=.\Event\EC_QOS_Info.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_QO=\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

+DEP_CPP_COSTR=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTR=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Reactive_Timeout_Generator.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_RE=\

+DEP_CPP_COSTR=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -10965,14 +12371,9 @@ DEP_CPP_EC_RE=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -10994,11 +12395,6 @@ DEP_CPP_EC_RE=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -11080,16 +12476,11 @@ DEP_CPP_EC_RE=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -11099,29 +12490,22 @@ DEP_CPP_EC_RE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -11131,28 +12515,20 @@ DEP_CPP_EC_RE=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -11163,8 +12539,6 @@ DEP_CPP_EC_RE=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -11172,35 +12546,25 @@ DEP_CPP_EC_RE=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Reactive_Timeout_Generator.h"\

-	".\Event\EC_Reactive_Timeout_Generator.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Sched_Filter.cpp

+SOURCE=.\CosTradingS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -11208,44 +12572,267 @@ SOURCE=.\Event\EC_Sched_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_SC=\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Sched_Filter.h"\

-	".\Event\EC_Sched_Filter.i"\

+DEP_CPP_COSTRA=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\orbsvcs_export.h"\

+	

+NODEP_CPP_COSTRA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_SCH=\

+DEP_CPP_COSTRA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -11305,14 +12892,9 @@ DEP_CPP_EC_SCH=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -11334,11 +12916,6 @@ DEP_CPP_EC_SCH=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -11420,16 +12997,11 @@ DEP_CPP_EC_SCH=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -11439,29 +13011,22 @@ DEP_CPP_EC_SCH=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -11471,28 +13036,20 @@ DEP_CPP_EC_SCH=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -11503,8 +13060,6 @@ DEP_CPP_EC_SCH=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -11512,50 +13067,25 @@ DEP_CPP_EC_SCH=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Conjunction_Filter.h"\

-	".\Event\EC_Conjunction_Filter.i"\

-	".\Event\EC_Disjunction_Filter.h"\

-	".\Event\EC_Disjunction_Filter.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Filter_Builder.h"\

-	".\Event\EC_Filter_Builder.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Sched_Filter.h"\

-	".\Event\EC_Sched_Filter.i"\

-	".\Event\EC_Sched_Filter_Builder.h"\

-	".\Event\EC_Sched_Filter_Builder.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Type_Filter.h"\

-	".\Event\EC_Type_Filter.i"\

-	".\Event_Service_Constants.h"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Scheduling_Strategy.cpp

+SOURCE=.\Event\Dispatching_Modules.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -11563,62 +13093,336 @@ SOURCE=.\Event\EC_Scheduling_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_SCHE=\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Scheduling_Strategy.h"\

-	".\Event\EC_Scheduling_Strategy.i"\

+DEP_CPP_DISPA=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_SU=\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

+NODEP_CPP_DISPA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\Event\CORBA_Utils_T.cpp"\

+	".\Event\CORBA_Utils_T.h"\

+	".\Event\CORBA_Utils_T.i"\

+	".\Event\Task_Manager.h"\

+	".\Event\Task_Manager.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierAdmin.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_SUP=\

+DEP_CPP_DISPA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -11658,6 +13462,8 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

 	"..\..\..\ace\Hash_Map_Manager_T.h"\

 	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -11665,6 +13471,8 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\ace\iosfwd.h"\

 	"..\..\..\ace\IPC_SAP.h"\

 	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -11678,14 +13486,9 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -11707,14 +13510,20 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

+	"..\..\..\ace\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -11776,10 +13585,22 @@ DEP_CPP_EC_SUP=\
 	"..\..\..\ace\Thread_Manager.h"\

 	"..\..\..\ace\Thread_Manager.i"\

 	"..\..\..\ace\Time_Value.h"\

+	"..\..\..\ace\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

 	"..\..\..\ace\Timer_Queue.h"\

 	"..\..\..\ace\Timer_Queue_T.cpp"\

 	"..\..\..\ace\Timer_Queue_T.h"\

 	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

 	"..\..\..\ace\Trace.h"\

 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

@@ -11793,16 +13614,11 @@ DEP_CPP_EC_SUP=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -11812,29 +13628,22 @@ DEP_CPP_EC_SUP=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -11844,28 +13653,20 @@ DEP_CPP_EC_SUP=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -11876,46 +13677,77 @@ DEP_CPP_EC_SUP=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxyConsumer.h"\

-	".\Event\EC_ProxyConsumer.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_SupplierAdmin.h"\

-	".\Event\EC_SupplierAdmin.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_SupplierFiltering.cpp

+SOURCE=.\Sched\DynSched.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -11923,40 +13755,273 @@ SOURCE=.\Event\EC_SupplierFiltering.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_SUPP=\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

+DEP_CPP_DYNSC=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_DYNSC=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Filter.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_TI=\

+DEP_CPP_DYNSC=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -12016,14 +14081,9 @@ DEP_CPP_EC_TI=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -12045,14 +14105,11 @@ DEP_CPP_EC_TI=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -12131,16 +14188,11 @@ DEP_CPP_EC_TI=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -12150,29 +14202,22 @@ DEP_CPP_EC_TI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -12182,28 +14227,20 @@ DEP_CPP_EC_TI=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -12214,8 +14251,6 @@ DEP_CPP_EC_TI=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -12223,42 +14258,29 @@ DEP_CPP_EC_TI=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

 	".\Time_Utilities.h"\

 	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Timeout_Generator.cpp

+SOURCE=.\Event\EC_Gateway.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -12266,10 +14288,18 @@ SOURCE=.\Event\EC_Timeout_Generator.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_TIM=\

+DEP_CPP_EC_GA=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\config-win32-borland.h"\

@@ -12277,18 +14307,34 @@ DEP_CPP_EC_TIM=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

-	"..\..\..\ace\Containers_T.cpp"\

-	"..\..\..\ace\Containers_T.h"\

-	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -12302,78 +14348,227 @@ DEP_CPP_EC_TIM=\
 	"..\..\..\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_Block_T.cpp"\

-	"..\..\..\ace\Message_Block_T.h"\

-	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Timeout_Filter.h"\

-	".\Event\EC_Timeout_Filter.i"\

-	".\Event\EC_Timeout_Generator.h"\

-	".\Event\EC_Timeout_Generator.i"\

+	"..\..\tao\align.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Channel_Clients_T.cpp"\

+	".\Channel_Clients_T.h"\

+	".\Channel_Clients_T.i"\

+	".\Event\EC_Gateway.h"\

 	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

 	".\orbsvcs_export.h"\

 	".\Time_Utilities.h"\

 	".\Time_Utilities.i"\

 	

+NODEP_CPP_EC_GA=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_TR=\

+DEP_CPP_EC_GA=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -12433,14 +14628,9 @@ DEP_CPP_EC_TR=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -12462,11 +14652,6 @@ DEP_CPP_EC_TR=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -12548,16 +14733,11 @@ DEP_CPP_EC_TR=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -12567,29 +14747,22 @@ DEP_CPP_EC_TR=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -12599,28 +14772,20 @@ DEP_CPP_EC_TR=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -12631,8 +14796,6 @@ DEP_CPP_EC_TR=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -12640,51 +14803,55 @@ DEP_CPP_EC_TR=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Event\EC_Busy_Lock.cpp"\

-	".\Event\EC_Busy_Lock.h"\

-	".\Event\EC_Busy_Lock.i"\

-	".\Event\EC_Command.cpp"\

-	".\Event\EC_Command.h"\

-	".\Event\EC_Command.i"\

-	".\Event\EC_ConsumerAdmin.h"\

-	".\Event\EC_ConsumerAdmin.i"\

-	".\Event\EC_Event_Channel.h"\

-	".\Event\EC_Event_Channel.i"\

-	".\Event\EC_Factory.h"\

-	".\Event\EC_Factory.i"\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_ProxyPushSupplier_Set.h"\

-	".\Event\EC_ProxyPushSupplier_Set.i"\

-	".\Event\EC_ProxySupplier.h"\

-	".\Event\EC_ProxySupplier.i"\

-	".\Event\EC_QOS_Info.h"\

-	".\Event\EC_QOS_Info.i"\

-	".\Event\EC_Supplier_Filter_Builder.h"\

-	".\Event\EC_Supplier_Filter_Builder.i"\

-	".\Event\EC_SupplierFiltering.h"\

-	".\Event\EC_SupplierFiltering.i"\

-	".\Event\EC_Trivial_Supplier_Filter.h"\

-	".\Event\EC_Trivial_Supplier_Filter.i"\

+	".\Channel_Clients_T.cpp"\

+	".\Channel_Clients_T.h"\

+	".\Channel_Clients_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\EC_Gateway.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

 	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Type_Filter.cpp

+SOURCE=.\Event\EC_Gateway_UDP.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -12692,66 +14859,594 @@ SOURCE=.\Event\EC_Type_Filter.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_EC_TY=\

-	".\Event\EC_Filter.h"\

-	".\Event\EC_Filter.i"\

-	".\Event\EC_Type_Filter.h"\

-	".\Event\EC_Type_Filter.i"\

+DEP_CPP_EC_GAT=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_CODgram.h"\

+	"..\..\..\ace\SOCK_CODgram.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\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\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\EC_Gateway_UDP.h"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_EC_GAT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_UDP_Admin.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_EC_UD=\

+DEP_CPP_EC_GAT=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_CODgram.h"\

+	"..\..\..\ace\SOCK_CODgram.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\Event\EC_UDP_Admin.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\EC_Gateway_UDP.h"\

+	".\Event\EC_Gateway_UDP.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

 	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\RtecUDPAdminC.h"\

+	".\RtecUDPAdminC.i"\

+	".\RtecUDPAdminS.h"\

+	".\RtecUDPAdminS.i"\

+	".\RtecUDPAdminS_T.cpp"\

+	".\RtecUDPAdminS_T.h"\

+	".\RtecUDPAdminS_T.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\AV\Endpoint_Strategy.cpp

+SOURCE=.\Event\EC_UDP_Admin.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -12759,10 +15454,20 @@ SOURCE=.\AV\Endpoint_Strategy.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_ENDPO=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_EC_UD=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -12772,12 +15477,19 @@ DEP_CPP_ENDPO=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

 	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

@@ -12796,7 +15508,12 @@ DEP_CPP_ENDPO=\
 	"..\..\..\ace\Hash_Map_Manager_T.h"\

 	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -12810,6 +15527,9 @@ DEP_CPP_ENDPO=\
 	"..\..\..\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"\

@@ -12819,12 +15539,18 @@ DEP_CPP_ENDPO=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Process.h"\

-	"..\..\..\ace\Process.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -12832,81 +15558,178 @@ DEP_CPP_ENDPO=\
 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

 	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

 	"..\..\..\ace\Shared_Object.h"\

 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

 	"..\..\tao\cdr.h"\

 	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

-	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

 	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

-	"..\..\tao\TAO.h"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

-	".\AV\AVStreams_i.h"\

-	".\AV\Endpoint_Strategy.h"\

-	".\AV\Endpoint_Strategy_T.cpp"\

-	".\AV\Endpoint_Strategy_T.h"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\EC_UDP_Admin.h"\

 	".\orbsvcs_export.h"\

-	".\Trader\Trader.h"\

-	

-NODEP_CPP_ENDPO=\

-	"..\..\..\..\..\Property\CosPropertyService_i.h"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.cpp"\

-	"..\..\..\..\..\Property\CosPropertyService_i_T.h"\

-	".\AV\AVStreams_i_T.cpp"\

-	".\AV\AVStreams_i_T.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecUDPAdminC.h"\

+	".\RtecUDPAdminC.i"\

+	".\RtecUDPAdminS.h"\

+	".\RtecUDPAdminS.i"\

+	".\RtecUDPAdminS_T.cpp"\

+	".\RtecUDPAdminS_T.h"\

+	".\RtecUDPAdminS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -13073,11 +15896,11 @@ DEP_CPP_ENTRI=\
 	"..\..\..\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"\

@@ -13095,6 +15918,9 @@ DEP_CPP_ENTRI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -13153,11 +15979,8 @@ DEP_CPP_ENTRI=\
 	

 NODEP_CPP_ENTRI=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

@@ -13165,6 +15988,261 @@ NODEP_CPP_ENTRI=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_ENTRI=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\Naming\Entries.h"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -13351,11 +16429,11 @@ DEP_CPP_EVENT=\
 	"..\..\..\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"\

@@ -13373,6 +16451,9 @@ DEP_CPP_EVENT=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -13455,14 +16536,18 @@ DEP_CPP_EVENT=\
 	

 NODEP_CPP_EVENT=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\ace\ReactorEx.h"\

 	".\Event\CORBA_Utils_T.cpp"\

 	".\Event\CORBA_Utils_T.h"\

@@ -13490,17 +16575,346 @@ NODEP_CPP_EVENT=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_EVENT=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Channel_Clients_T.cpp"\

+	".\Channel_Clients_T.h"\

+	".\Channel_Clients_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\EC_Gateway.h"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\Module_Factory.h"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -13514,13 +16928,266 @@ SOURCE=.\Event\Event_Manip.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

 DEP_CPP_EVENT_=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\Event\Event_Manip.h"\

 	".\Event\Event_Manip.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -13687,11 +17354,11 @@ DEP_CPP_EVENT_U=\
 	"..\..\..\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"\

@@ -13709,6 +17376,9 @@ DEP_CPP_EVENT_U=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -13771,24 +17441,286 @@ DEP_CPP_EVENT_U=\
 	

 NODEP_CPP_EVENT_U=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecEventChannelAdminC.h"\

 	".\RtecEventChannelAdminC.i"\

 	".\RtecEventCommC.h"\

 	".\RtecEventCommC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_EVENT_U=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -13802,50 +17734,313 @@ SOURCE=.\CosEvent\EventChannel_i.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

 DEP_CPP_EVENTC=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

 	".\CosEvent\ConsumerAdmin_i.h"\

 	".\CosEvent\EventChannel_i.h"\

 	".\CosEvent\ProxyPushConsumer_i.h"\

 	".\CosEvent\ProxyPushSupplier_i.h"\

 	".\CosEvent\SupplierAdmin_i.h"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Hash_Naming_Context.cpp

+SOURCE=.\ImplRepoC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -13853,17 +18048,14 @@ SOURCE=.\Naming\Hash_Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_HASH_=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_IMPLR=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

@@ -13929,14 +18121,9 @@ DEP_CPP_HASH_=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -13958,11 +18145,6 @@ DEP_CPP_HASH_=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -14044,16 +18226,11 @@ DEP_CPP_HASH_=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -14063,29 +18240,22 @@ DEP_CPP_HASH_=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -14095,28 +18265,20 @@ DEP_CPP_HASH_=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -14127,8 +18289,6 @@ DEP_CPP_HASH_=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -14136,38 +18296,26 @@ DEP_CPP_HASH_=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Entries.h"\

-	".\Naming\Hash_Naming_Context.h"\

-	

-NODEP_CPP_HASH_=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+	".\ImplRepoC.h"\

+	".\ImplRepoC.i"\

+	".\ImplRepoS.h"\

+	".\ImplRepoS.i"\

+	".\ImplRepoS_T.cpp"\

+	".\ImplRepoS_T.h"\

+	".\ImplRepoS_T.i"\

+	".\orbsvcs_export.h"\

+	".\PingC.h"\

+	".\PingC.i"\

+	".\PingS.h"\

+	".\PingS.i"\

+	".\PingS_T.cpp"\

+	".\PingS_T.h"\

+	".\PingS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -14183,6 +18331,272 @@ SOURCE=.\ImplRepoS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_IMPLRE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\ImplRepoC.h"\

+	".\ImplRepoC.i"\

+	".\ImplRepoS.h"\

+	".\ImplRepoS.i"\

+	".\ImplRepoS_T.cpp"\

+	".\ImplRepoS_T.h"\

+	".\ImplRepoS_T.i"\

+	".\orbsvcs_export.h"\

+	".\PingC.h"\

+	".\PingC.i"\

+	".\PingS.h"\

+	".\PingS.i"\

+	".\PingS_T.cpp"\

+	".\PingS_T.h"\

+	".\PingS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -14353,11 +18767,11 @@ DEP_CPP_IOR_M=\
 	"..\..\..\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"\

@@ -14375,6 +18789,9 @@ DEP_CPP_IOR_M=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -14433,16 +18850,270 @@ DEP_CPP_IOR_M=\
 	

 NODEP_CPP_IOR_M=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_IOR_M=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\IOR_Multicast.h"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -14609,11 +19280,11 @@ DEP_CPP_LIFEC=\
 	"..\..\..\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"\

@@ -14631,6 +19302,9 @@ DEP_CPP_LIFEC=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -14688,11 +19362,8 @@ DEP_CPP_LIFEC=\
 	

 NODEP_CPP_LIFEC=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosLifeCycleC.h"\

 	".\CosLifeCycleC.i"\

@@ -14719,6 +19390,279 @@ NODEP_CPP_LIFEC=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LIFEC=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\LifeCycleServiceC.h"\

+	".\LifeCycleServiceC.i"\

+	".\LifeCycleServiceS.h"\

+	".\LifeCycleServiceS.i"\

+	".\LifeCycleServiceS_T.cpp"\

+	".\LifeCycleServiceS_T.h"\

+	".\LifeCycleServiceS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -14885,11 +19829,11 @@ DEP_CPP_LIFECY=\
 	"..\..\..\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"\

@@ -14907,6 +19851,9 @@ DEP_CPP_LIFECY=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -14964,11 +19911,8 @@ DEP_CPP_LIFECY=\
 	

 NODEP_CPP_LIFECY=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosLifeCycleC.h"\

 	".\CosLifeCycleC.i"\

@@ -14995,6 +19939,279 @@ NODEP_CPP_LIFECY=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LIFECY=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosLifeCycleC.h"\

+	".\CosLifeCycleC.i"\

+	".\CosLifeCycleS.h"\

+	".\CosLifeCycleS.i"\

+	".\CosLifeCycleS_T.cpp"\

+	".\CosLifeCycleS_T.h"\

+	".\CosLifeCycleS_T.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\LifeCycleServiceC.h"\

+	".\LifeCycleServiceC.i"\

+	".\LifeCycleServiceS.h"\

+	".\LifeCycleServiceS.i"\

+	".\LifeCycleServiceS_T.cpp"\

+	".\LifeCycleServiceS_T.h"\

+	".\LifeCycleServiceS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -15161,11 +20378,11 @@ DEP_CPP_LOCAL=\
 	"..\..\..\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"\

@@ -15183,6 +20400,9 @@ DEP_CPP_LOCAL=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -15245,14 +20465,18 @@ DEP_CPP_LOCAL=\
 	

 NODEP_CPP_LOCAL=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecEventChannelAdminC.h"\

 	".\RtecEventChannelAdminC.i"\

 	".\RtecEventChannelAdminS.h"\

@@ -15274,17 +20498,297 @@ NODEP_CPP_LOCAL=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LOCAL=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -15451,11 +20955,11 @@ DEP_CPP_LOGGE=\
 	"..\..\..\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"\

@@ -15473,6 +20977,9 @@ DEP_CPP_LOGGE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -15531,11 +21038,8 @@ DEP_CPP_LOGGE=\
 	

 NODEP_CPP_LOGGE=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\LoggerC.h"\

 	".\LoggerC.i"\

@@ -15548,6 +21052,266 @@ NODEP_CPP_LOGGE=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LOGGE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Log\Logger_i.h"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -15714,11 +21478,11 @@ DEP_CPP_LOGGER=\
 	"..\..\..\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"\

@@ -15736,6 +21500,9 @@ DEP_CPP_LOGGER=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -15793,11 +21560,8 @@ DEP_CPP_LOGGER=\
 	

 NODEP_CPP_LOGGER=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\LoggerC.h"\

 	".\LoggerC.i"\

@@ -15810,6 +21574,265 @@ NODEP_CPP_LOGGER=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LOGGER=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -15976,11 +21999,11 @@ DEP_CPP_LOGGERS=\
 	"..\..\..\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"\

@@ -15998,6 +22021,9 @@ DEP_CPP_LOGGERS=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -16055,11 +22081,8 @@ DEP_CPP_LOGGERS=\
 	

 NODEP_CPP_LOGGERS=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\LoggerC.h"\

 	".\LoggerC.i"\

@@ -16072,6 +22095,265 @@ NODEP_CPP_LOGGERS=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_LOGGERS=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\LoggerC.h"\

+	".\LoggerC.i"\

+	".\LoggerS.h"\

+	".\LoggerS.i"\

+	".\LoggerS_T.cpp"\

+	".\LoggerS_T.h"\

+	".\LoggerS_T.i"\

+	".\orbsvcs_export.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -16258,11 +22540,11 @@ DEP_CPP_MEMOR=\
 	"..\..\..\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"\

@@ -16280,6 +22562,9 @@ DEP_CPP_MEMOR=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -16353,14 +22638,18 @@ DEP_CPP_MEMOR=\
 	

 NODEP_CPP_MEMOR=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\ace\ReactorEx.h"\

 	".\Event\CORBA_Utils_T.cpp"\

 	".\Event\CORBA_Utils_T.h"\

@@ -16388,17 +22677,339 @@ NODEP_CPP_MEMOR=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_MEMOR=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -16585,11 +23196,11 @@ DEP_CPP_MODUL=\
 	"..\..\..\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"\

@@ -16607,6 +23218,9 @@ DEP_CPP_MODUL=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -16679,14 +23293,18 @@ DEP_CPP_MODUL=\
 	

 NODEP_CPP_MODUL=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\ace\ReactorEx.h"\

 	".\Event\CORBA_Utils_T.cpp"\

 	".\Event\CORBA_Utils_T.h"\

@@ -16714,36 +23332,338 @@ NODEP_CPP_MODUL=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Naming_Context.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_NAMIN=\

-	".\Naming\Naming_Context.h"\

+DEP_CPP_MODUL=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Module_Factory.h"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -16757,7 +23677,7 @@ SOURCE=.\Naming\Naming_Utils.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_NAMING=\

+DEP_CPP_NAMIN=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -16915,11 +23835,11 @@ DEP_CPP_NAMING=\
 	"..\..\..\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"\

@@ -16937,6 +23857,9 @@ DEP_CPP_NAMING=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -16991,17 +23914,15 @@ DEP_CPP_NAMING=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\IOR_Multicast.h"\

+	".\Naming\CosNaming_i.h"\

 	".\Naming\Entries.h"\

 	".\Naming\Naming_Utils.h"\

 	".\orbsvcs_export.h"\

 	

-NODEP_CPP_NAMING=\

+NODEP_CPP_NAMIN=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

@@ -17010,40 +23931,277 @@ NODEP_CPP_NAMING=\
 	".\CosNamingS_T.cpp"\

 	".\CosNamingS_T.h"\

 	".\CosNamingS_T.i"\

-	".\Naming\CosNaming_i.h"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrlC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrlS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+DEP_CPP_NAMIN=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Arg_Shifter.h"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\IOR_Multicast.h"\

+	".\Naming\CosNaming_i.h"\

+	".\Naming\Entries.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	

 

 !ENDIF 

 

@@ -17211,11 +24369,11 @@ DEP_CPP_OFFER=\
 	"..\..\..\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"\

@@ -17233,6 +24391,9 @@ DEP_CPP_OFFER=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -17293,11 +24454,8 @@ DEP_CPP_OFFER=\
 	

 NODEP_CPP_OFFER=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -17310,33 +24468,18 @@ NODEP_CPP_OFFER=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Bindings_Map.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_PERSI=\

+DEP_CPP_OFFER=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -17396,14 +24539,9 @@ DEP_CPP_PERSI=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -17425,11 +24563,6 @@ DEP_CPP_PERSI=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -17511,16 +24644,11 @@ DEP_CPP_PERSI=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -17530,29 +24658,22 @@ DEP_CPP_PERSI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -17562,28 +24683,20 @@ DEP_CPP_PERSI=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -17594,8 +24707,6 @@ DEP_CPP_PERSI=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -17603,28 +24714,28 @@ DEP_CPP_PERSI=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Persistent_Bindings_Map.h"\

-	".\Naming\Persistent_Entries.h"\

-	".\Naming\Shared_Hash_Map_T.cpp"\

-	".\Naming\Shared_Hash_Map_T.h"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Context_Index.cpp

+SOURCE=.\PingC.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -17632,20 +24743,20 @@ SOURCE=.\Naming\Persistent_Context_Index.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_PERSIS=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_PINGC=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -17705,14 +24816,9 @@ DEP_CPP_PERSIS=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -17734,11 +24840,6 @@ DEP_CPP_PERSIS=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -17820,16 +24921,11 @@ DEP_CPP_PERSIS=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -17839,29 +24935,22 @@ DEP_CPP_PERSIS=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -17871,28 +24960,20 @@ DEP_CPP_PERSIS=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -17903,8 +24984,6 @@ DEP_CPP_PERSIS=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -17912,28 +24991,25 @@ DEP_CPP_PERSIS=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Persistent_Context_Index.h"\

-	".\Naming\Persistent_Entries.h"\

-	".\Naming\Shared_Hash_Map_T.cpp"\

-	".\Naming\Shared_Hash_Map_T.h"\

+	".\orbsvcs_export.h"\

+	".\PingC.h"\

+	".\PingC.i"\

+	".\PingS.h"\

+	".\PingS.i"\

+	".\PingS_T.cpp"\

+	".\PingS_T.h"\

+	".\PingS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Entries.cpp

+SOURCE=.\PingS.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -17941,20 +25017,20 @@ SOURCE=.\Naming\Persistent_Entries.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_PERSIST=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_PINGS=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -18014,14 +25090,9 @@ DEP_CPP_PERSIST=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -18043,11 +25114,6 @@ DEP_CPP_PERSIST=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -18129,16 +25195,11 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -18148,29 +25209,22 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -18180,28 +25234,20 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -18212,8 +25258,6 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -18221,27 +25265,25 @@ DEP_CPP_PERSIST=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Persistent_Entries.h"\

-	".\Naming\Shared_Hash_Map_T.cpp"\

-	".\Naming\Shared_Hash_Map_T.h"\

+	".\orbsvcs_export.h"\

+	".\PingC.h"\

+	".\PingC.i"\

+	".\PingS.h"\

+	".\PingS.i"\

+	".\PingS_T.cpp"\

+	".\PingS_T.h"\

+	".\PingS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Naming_Context.cpp

+SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -18249,17 +25291,14 @@ SOURCE=.\Naming\Persistent_Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_PERSISTE=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_PROXY=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

@@ -18325,14 +25364,9 @@ DEP_CPP_PERSISTE=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -18354,11 +25388,6 @@ DEP_CPP_PERSISTE=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -18440,16 +25469,11 @@ DEP_CPP_PERSISTE=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -18459,29 +25483,22 @@ DEP_CPP_PERSISTE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -18491,28 +25508,20 @@ DEP_CPP_PERSISTE=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -18523,8 +25532,6 @@ DEP_CPP_PERSISTE=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -18532,48 +25539,66 @@ DEP_CPP_PERSISTE=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\Naming\Persistent_Bindings_Map.h"\

-	".\Naming\Persistent_Context_Index.h"\

-	".\Naming\Persistent_Entries.h"\

-	".\Naming\Persistent_Naming_Context.h"\

-	".\Naming\Shared_Hash_Map_T.cpp"\

-	".\Naming\Shared_Hash_Map_T.h"\

-	

-NODEP_CPP_PERSISTE=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event_Service_Constants.h"\

+	".\Event_Utilities.h"\

+	".\Event_Utilities.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\PingC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS.cpp

+SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -18583,45 +25608,64 @@ SOURCE=.\PingS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_PROXY=\

+DEP_CPP_PROXYP=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -18635,6 +25679,9 @@ DEP_CPP_PROXY=\
 	"..\..\..\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"\

@@ -18644,43 +25691,214 @@ DEP_CPP_PROXY=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\CosEvent\ProxyPushConsumer_i.h"\

-	".\Event_Service_Constants.h"\

-	".\Event_Utilities.h"\

-	".\Event_Utilities.i"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosEvent\ProxyPushSupplier_i.h"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

+SOURCE=.\Event\ReactorTask.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -18688,9 +25906,15 @@ SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_PROXYP=\

+DEP_CPP_REACT=\

+	"..\..\..\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"\

@@ -18701,40 +25925,292 @@ DEP_CPP_PROXYP=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.cpp"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\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\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

 	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\CosEvent\ProxyPushSupplier_i.h"\

+	"..\..\tao\align.h"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\default_client.h"\

+	"..\..\tao\default_client.i"\

+	"..\..\tao\default_server.h"\

+	"..\..\tao\default_server.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\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"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+NODEP_CPP_REACT=\

+	"..\..\..\ace\sys_conf.h"\

+	"..\..\tao\IIOP_Object.h"\

+	"..\..\tao\IIOP_Object.i"\

+	"..\..\tao\Object_Table.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\ace\ReactorEx.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\ReactorTask.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

 DEP_CPP_REACT=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

@@ -18749,6 +26225,8 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -18757,9 +26235,12 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -18769,12 +26250,18 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\High_Res_Timer.h"\

 	"..\..\..\ace\High_Res_Timer.i"\

 	"..\..\..\ace\inc_user_config.h"\

@@ -18808,6 +26295,9 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -18827,6 +26317,11 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\Reactor_Impl.h"\

 	"..\..\..\ace\Select_Reactor.h"\

 	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

 	"..\..\..\ace\Service_Config.h"\

 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

@@ -18908,32 +26403,39 @@ DEP_CPP_REACT=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -18945,12 +26447,10 @@ DEP_CPP_REACT=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -18971,6 +26471,7 @@ DEP_CPP_REACT=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

@@ -18978,12 +26479,22 @@ DEP_CPP_REACT=\
 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

 	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\Fast_Reactor.h"\

 	".\Event\Local_ESTypes.h"\

 	".\Event\Local_ESTypes.i"\

@@ -18992,22 +26503,6 @@ DEP_CPP_REACT=\
 	".\Event\RT_Task.i"\

 	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

-	".\Scheduler_Factory.h"\

-	".\Scheduler_Factory.i"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

-	

-NODEP_CPP_REACT=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\CosNamingC.h"\

-	".\CosNamingC.i"\

-	".\Event\ace\ReactorEx.h"\

 	".\RtecEventChannelAdminC.h"\

 	".\RtecEventChannelAdminC.i"\

 	".\RtecEventChannelAdminS.h"\

@@ -19029,17 +26524,12 @@ NODEP_CPP_REACT=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -19228,11 +26718,11 @@ DEP_CPP_RT_TA=\
 	"..\..\..\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"\

@@ -19250,6 +26740,9 @@ DEP_CPP_RT_TA=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -19326,14 +26819,18 @@ DEP_CPP_RT_TA=\
 	

 NODEP_CPP_RT_TA=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\ace\ReactorEx.h"\

 	".\Event\CORBA_Utils_T.cpp"\

 	".\Event\CORBA_Utils_T.h"\

@@ -19361,17 +26858,342 @@ NODEP_CPP_RT_TA=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RT_TA=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\High_Res_Timer.h"\

+	"..\..\..\ace\High_Res_Timer.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

+	"..\..\..\ace\Local_Tokens.h"\

+	"..\..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\..\ace\Pipe.i"\

+	"..\..\..\ace\Reactor.h"\

+	"..\..\..\ace\Reactor.i"\

+	"..\..\..\ace\Reactor_Impl.h"\

+	"..\..\..\ace\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Select_Reactor.h"\

+	"..\..\..\ace\Select_Reactor.i"\

+	"..\..\..\ace\Select_Reactor_Base.h"\

+	"..\..\..\ace\Select_Reactor_Base.i"\

+	"..\..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\..\ace\Select_Reactor_T.h"\

+	"..\..\..\ace\Select_Reactor_T.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\Timeprobe.h"\

+	"..\..\..\ace\Timeprobe.i"\

+	"..\..\..\ace\Timeprobe_T.cpp"\

+	"..\..\..\ace\Timeprobe_T.h"\

+	"..\..\..\ace\Timer_Heap.h"\

+	"..\..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\..\ace\Timer_Heap_T.h"\

+	"..\..\..\ace\Timer_List.h"\

+	"..\..\..\ace\Timer_List_T.cpp"\

+	"..\..\..\ace\Timer_List_T.h"\

+	"..\..\..\ace\Timer_Queue.h"\

+	"..\..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\..\ace\Timer_Queue_T.h"\

+	"..\..\..\ace\Timer_Queue_T.i"\

+	"..\..\..\ace\Token.h"\

+	"..\..\..\ace\Token.i"\

+	"..\..\..\ace\Trace.h"\

+	"..\..\..\ace\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\Timeprobe.h"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\Event\Debug_Macros.h"\

+	".\Event\Dispatching_Modules.h"\

+	".\Event\Dispatching_Modules.i"\

+	".\Event\Event_Channel.h"\

+	".\Event\Event_Channel.i"\

+	".\Event\Event_Manip.h"\

+	".\Event\Event_Manip.i"\

+	".\Event\Fast_Reactor.h"\

+	".\Event\Local_ESTypes.h"\

+	".\Event\Local_ESTypes.i"\

+	".\Event\Memory_Pools.h"\

+	".\Event\Memory_Pools.i"\

+	".\Event\ReactorTask.h"\

+	".\Event\RT_Task.h"\

+	".\Event\RT_Task.i"\

+	".\Event\Timer_Module.h"\

+	".\Event\Timer_Module.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -19538,11 +27360,11 @@ DEP_CPP_RTECE=\
 	"..\..\..\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"\

@@ -19560,6 +27382,9 @@ DEP_CPP_RTECE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -19617,12 +27442,16 @@ DEP_CPP_RTECE=\
 	

 NODEP_CPP_RTECE=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecEventChannelAdminC.h"\

 	".\RtecEventChannelAdminC.i"\

 	".\RtecEventChannelAdminS.h"\

@@ -19644,17 +27473,290 @@ NODEP_CPP_RTECE=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -19821,11 +27923,11 @@ DEP_CPP_RTECEV=\
 	"..\..\..\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"\

@@ -19843,6 +27945,9 @@ DEP_CPP_RTECEV=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -19900,12 +28005,16 @@ DEP_CPP_RTECEV=\
 	

 NODEP_CPP_RTECEV=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecEventChannelAdminC.h"\

 	".\RtecEventChannelAdminC.i"\

 	".\RtecEventChannelAdminS.h"\

@@ -19927,17 +28036,290 @@ NODEP_CPP_RTECEV=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECEV=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -20104,11 +28486,11 @@ DEP_CPP_RTECEVE=\
 	"..\..\..\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"\

@@ -20126,6 +28508,9 @@ DEP_CPP_RTECEVE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -20183,12 +28568,16 @@ DEP_CPP_RTECEVE=\
 	

 NODEP_CPP_RTECEVE=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecEventCommC.h"\

 	".\RtecEventCommC.i"\

 	".\RtecEventCommS.h"\

@@ -20196,17 +28585,276 @@ NODEP_CPP_RTECEVE=\
 	".\RtecEventCommS_T.cpp"\

 	".\RtecEventCommS_T.h"\

 	".\RtecEventCommS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECEVE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -20373,11 +29021,11 @@ DEP_CPP_RTECEVEN=\
 	"..\..\..\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"\

@@ -20395,6 +29043,9 @@ DEP_CPP_RTECEVEN=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -20452,12 +29103,16 @@ DEP_CPP_RTECEVEN=\
 	

 NODEP_CPP_RTECEVEN=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecEventCommC.h"\

 	".\RtecEventCommC.i"\

 	".\RtecEventCommS.h"\

@@ -20465,17 +29120,276 @@ NODEP_CPP_RTECEVEN=\
 	".\RtecEventCommS_T.cpp"\

 	".\RtecEventCommS_T.h"\

 	".\RtecEventCommS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECEVEN=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -20642,11 +29556,11 @@ DEP_CPP_RTECS=\
 	"..\..\..\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"\

@@ -20664,6 +29578,9 @@ DEP_CPP_RTECS=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -20721,12 +29638,16 @@ DEP_CPP_RTECS=\
 	

 NODEP_CPP_RTECS=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

 	".\RtecSchedulerS.h"\

@@ -20734,17 +29655,276 @@ NODEP_CPP_RTECS=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECS=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -20911,11 +30091,11 @@ DEP_CPP_RTECSC=\
 	"..\..\..\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"\

@@ -20933,6 +30113,9 @@ DEP_CPP_RTECSC=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -20990,12 +30173,16 @@ DEP_CPP_RTECSC=\
 	

 NODEP_CPP_RTECSC=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

 	".\RtecSchedulerS.h"\

@@ -21003,17 +30190,276 @@ NODEP_CPP_RTECSC=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECSC=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21029,6 +30475,279 @@ SOURCE=.\RtecUDPAdminC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECU=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecUDPAdminC.h"\

+	".\RtecUDPAdminC.i"\

+	".\RtecUDPAdminS.h"\

+	".\RtecUDPAdminS.i"\

+	".\RtecUDPAdminS_T.cpp"\

+	".\RtecUDPAdminS_T.h"\

+	".\RtecUDPAdminS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21044,6 +30763,279 @@ SOURCE=.\RtecUDPAdminS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RTECUD=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecUDPAdminC.h"\

+	".\RtecUDPAdminC.i"\

+	".\RtecUDPAdminS.h"\

+	".\RtecUDPAdminS.i"\

+	".\RtecUDPAdminS_T.cpp"\

+	".\RtecUDPAdminS_T.h"\

+	".\RtecUDPAdminS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21210,11 +31202,11 @@ DEP_CPP_RUNTI=\
 	"..\..\..\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"\

@@ -21232,6 +31224,9 @@ DEP_CPP_RUNTI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -21295,14 +31290,18 @@ DEP_CPP_RUNTI=\
 	

 NODEP_CPP_RUNTI=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

 	".\RtecSchedulerS.h"\

@@ -21310,17 +31309,284 @@ NODEP_CPP_RUNTI=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_RUNTI=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21487,11 +31753,11 @@ DEP_CPP_SCHED=\
 	"..\..\..\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"\

@@ -21509,6 +31775,9 @@ DEP_CPP_SCHED=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -21571,20 +31840,278 @@ DEP_CPP_SCHED=\
 	

 NODEP_CPP_SCHED=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_SCHED=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -21753,11 +32280,11 @@ DEP_CPP_SCHEDU=\
 	"..\..\..\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"\

@@ -21775,6 +32302,9 @@ DEP_CPP_SCHEDU=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -21837,20 +32367,280 @@ DEP_CPP_SCHEDU=\
 	

 NODEP_CPP_SCHEDU=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_SCHEDU=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22017,11 +32807,11 @@ DEP_CPP_SCHEDUL=\
 	"..\..\..\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"\

@@ -22039,6 +32829,9 @@ DEP_CPP_SCHEDUL=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -22100,14 +32893,18 @@ DEP_CPP_SCHEDUL=\
 	

 NODEP_CPP_SCHEDUL=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosNamingC.h"\

 	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

 	".\RtecSchedulerS.h"\

@@ -22115,17 +32912,282 @@ NODEP_CPP_SCHEDUL=\
 	".\RtecSchedulerS_T.cpp"\

 	".\RtecSchedulerS_T.h"\

 	".\RtecSchedulerS_T.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_SCHEDUL=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

+	".\Runtime_Scheduler.h"\

+	".\Runtime_Scheduler.i"\

+	".\Scheduler_Factory.h"\

+	".\Scheduler_Factory.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22294,11 +33356,11 @@ DEP_CPP_SCHEDULE=\
 	"..\..\..\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"\

@@ -22316,6 +33378,9 @@ DEP_CPP_SCHEDULE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -22380,20 +33445,282 @@ DEP_CPP_SCHEDULE=\
 	

 NODEP_CPP_SCHEDULE=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_SCHEDULE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Sched\Scheduler.h"\

+	".\Sched\Scheduler.i"\

+	".\Sched\Scheduler_Generic.h"\

+	".\Sched\Scheduler_Generic.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22560,11 +33887,11 @@ DEP_CPP_SCHEDULER=\
 	"..\..\..\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"\

@@ -22582,6 +33909,9 @@ DEP_CPP_SCHEDULER=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -22641,20 +33971,275 @@ DEP_CPP_SCHEDULER=\
 	

 NODEP_CPP_SCHEDULER=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_SCHEDULER=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Scheduler_Utilities.h"\

+	".\Scheduler_Utilities.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -22821,11 +34406,11 @@ DEP_CPP_SERVI=\
 	"..\..\..\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"\

@@ -22843,6 +34428,9 @@ DEP_CPP_SERVI=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -22902,11 +34490,8 @@ DEP_CPP_SERVI=\
 	

 NODEP_CPP_SERVI=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -22919,45 +34504,61 @@ NODEP_CPP_SERVI=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\AV\sfp.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_SFP_C=\

+DEP_CPP_SERVI=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

-	"..\..\..\ace\ARGV.h"\

-	"..\..\..\ace\ARGV.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

 	"..\..\..\ace\IPC_SAP.h"\

 	"..\..\..\ace\IPC_SAP.i"\

@@ -22974,70 +34575,196 @@ DEP_CPP_SFP_C=\
 	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

 	"..\..\..\ace\SOCK.h"\

 	"..\..\..\ace\SOCK.i"\

-	"..\..\..\ace\SOCK_Dgram.h"\

-	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\AV\sfp.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

 	".\orbsvcs_export.h"\

+	".\Trader\Service_Type_Repository.h"\

+	".\Trader\Trader.h"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpC.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -23206,11 +34933,11 @@ DEP_CPP_STRAT=\
 	"..\..\..\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"\

@@ -23228,6 +34955,9 @@ DEP_CPP_STRAT=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -23294,74 +35024,290 @@ DEP_CPP_STRAT=\
 	

 NODEP_CPP_STRAT=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\RtecSchedulerC.h"\

 	".\RtecSchedulerC.i"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\SupplierAdmin_i.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_SUPPL=\

+DEP_CPP_STRAT=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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\Sched_Params.h"\

+	"..\..\..\ace\Sched_Params.i"\

+	"..\..\..\ace\Service_Config.h"\

+	"..\..\..\ace\Service_Config.i"\

+	"..\..\..\ace\Service_Object.h"\

+	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

-	".\CosEvent\ProxyPushConsumer_i.h"\

-	".\CosEvent\SupplierAdmin_i.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\Event_Service_Constants.h"\

+	".\orbsvcs_export.h"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\Sched\DynSched.h"\

+	".\Sched\DynSched.i"\

+	".\Sched\SchedEntry.h"\

+	".\Sched\SchedEntry.i"\

+	".\Sched\Strategy_Scheduler.h"\

+	".\Sched\Strategy_Scheduler.i"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\TAO_Time_Service_Clerk.cpp

+SOURCE=.\CosEvent\SupplierAdmin_i.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -23369,20 +35315,20 @@ SOURCE=.\Time\TAO_Time_Service_Clerk.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TAO_T=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_SUPPL=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -23442,14 +35388,9 @@ DEP_CPP_TAO_T=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -23471,11 +35412,6 @@ DEP_CPP_TAO_T=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -23500,10 +35436,6 @@ DEP_CPP_TAO_T=\
 	"..\..\..\ace\SOCK_Acceptor.i"\

 	"..\..\..\ace\SOCK_Connector.h"\

 	"..\..\..\ace\SOCK_Connector.i"\

-	"..\..\..\ace\SOCK_Dgram.h"\

-	"..\..\..\ace\SOCK_Dgram.i"\

-	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

-	"..\..\..\ace\SOCK_Dgram_Mcast.i"\

 	"..\..\..\ace\SOCK_IO.h"\

 	"..\..\..\ace\SOCK_IO.i"\

 	"..\..\..\ace\SOCK_Stream.h"\

@@ -23561,16 +35493,11 @@ DEP_CPP_TAO_T=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -23580,29 +35507,22 @@ DEP_CPP_TAO_T=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -23612,28 +35532,20 @@ DEP_CPP_TAO_T=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -23644,44 +35556,69 @@ DEP_CPP_TAO_T=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

-	"..\..\tao\TAO.h"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

-	".\IOR_Multicast.h"\

-	".\Naming\Naming_Utils.h"\

+	".\CosEvent\ProxyPushConsumer_i.h"\

+	".\CosEvent\SupplierAdmin_i.h"\

+	".\CosEventChannelAdminC.h"\

+	".\CosEventChannelAdminC.i"\

+	".\CosEventChannelAdminS.h"\

+	".\CosEventChannelAdminS.i"\

+	".\CosEventChannelAdminS_T.cpp"\

+	".\CosEventChannelAdminS_T.h"\

+	".\CosEventChannelAdminS_T.i"\

+	".\CosEventCommC.h"\

+	".\CosEventCommC.i"\

+	".\CosEventCommS.h"\

+	".\CosEventCommS.i"\

+	".\CosEventCommS_T.cpp"\

+	".\CosEventCommS_T.h"\

+	".\CosEventCommS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time\TAO_Time_Service_Clerk.h"\

-	".\Time\TAO_TIO.h"\

-	".\Time\TAO_UTO.h"\

-	".\Time\Timer_Helper.h"\

-	

-NODEP_CPP_TAO_T=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\TAO_Time_Service_Server.cpp

+SOURCE=.\Time\TAO_Time_Service_Clerk.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -23689,10 +35626,20 @@ SOURCE=.\Time\TAO_Time_Service_Server.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TAO_TI=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_TAO_T=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -23702,12 +35649,19 @@ DEP_CPP_TAO_TI=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

 	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

@@ -23726,7 +35680,12 @@ DEP_CPP_TAO_TI=\
 	"..\..\..\ace\Hash_Map_Manager_T.h"\

 	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -23740,6 +35699,9 @@ DEP_CPP_TAO_TI=\
 	"..\..\..\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"\

@@ -23749,6 +35711,14 @@ DEP_CPP_TAO_TI=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

 	"..\..\..\ace\Object_Manager.h"\

 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

@@ -23760,77 +35730,196 @@ DEP_CPP_TAO_TI=\
 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

 	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

 	"..\..\..\ace\Shared_Object.h"\

 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_Connector.i"\

+	"..\..\..\ace\SOCK_Dgram.h"\

+	"..\..\..\ace\SOCK_Dgram.i"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

 	"..\..\tao\cdr.h"\

 	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

-	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

 	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

 	"..\..\tao\TAO.h"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

-	".\Time\TAO_Time_Service_Server.h"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\IOR_Multicast.h"\

+	".\Naming\CosNaming_i.h"\

+	".\Naming\Entries.h"\

+	".\Naming\Naming_Utils.h"\

+	".\orbsvcs_export.h"\

+	".\Time\TAO_Time_Service_Clerk.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

+	".\Time\Timer_Helper.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\TAO_TIO.cpp

+SOURCE=.\Time\TAO_Time_Service_Server.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -23838,10 +35927,20 @@ SOURCE=.\Time\TAO_TIO.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TAO_TIO=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_TAO_TI=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -23851,12 +35950,19 @@ DEP_CPP_TAO_TIO=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

 	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

@@ -23875,7 +35981,12 @@ DEP_CPP_TAO_TIO=\
 	"..\..\..\ace\Hash_Map_Manager_T.h"\

 	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -23889,6 +36000,9 @@ DEP_CPP_TAO_TIO=\
 	"..\..\..\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"\

@@ -23898,6 +36012,14 @@ DEP_CPP_TAO_TIO=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

 	"..\..\..\ace\Object_Manager.h"\

 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

@@ -23909,76 +36031,180 @@ DEP_CPP_TAO_TIO=\
 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

 	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

 	"..\..\..\ace\Shared_Object.h"\

 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

 	"..\..\tao\cdr.h"\

 	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

-	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

 	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

 	"..\..\tao\TAO.h"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Time\TAO_Time_Service_Server.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\TAO_UTO.cpp

+SOURCE=.\Time\TAO_TIO.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -23986,10 +36212,20 @@ SOURCE=.\Time\TAO_UTO.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TAO_U=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_TAO_TIO=\

+	"..\..\..\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\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -23999,12 +36235,19 @@ DEP_CPP_TAO_U=\
 	"..\..\..\ace\config-win32.h"\

 	"..\..\..\ace\config-WinCE.h"\

 	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

 	"..\..\..\ace\Containers_T.cpp"\

 	"..\..\..\ace\Containers_T.h"\

 	"..\..\..\ace\Containers_T.i"\

 	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

 	"..\..\..\ace\Event_Handler.h"\

 	"..\..\..\ace\Event_Handler.i"\

 	"..\..\..\ace\Free_List.cpp"\

@@ -24023,7 +36266,12 @@ DEP_CPP_TAO_U=\
 	"..\..\..\ace\Hash_Map_Manager_T.h"\

 	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\..\ace\iosfwd.h"\

+	"..\..\..\ace\IPC_SAP.h"\

+	"..\..\..\ace\IPC_SAP.i"\

 	"..\..\..\ace\Log_Msg.h"\

 	"..\..\..\ace\Log_Priority.h"\

 	"..\..\..\ace\Log_Record.h"\

@@ -24037,6 +36285,9 @@ DEP_CPP_TAO_U=\
 	"..\..\..\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"\

@@ -24046,6 +36297,14 @@ DEP_CPP_TAO_U=\
 	"..\..\..\ace\Message_Block_T.cpp"\

 	"..\..\..\ace\Message_Block_T.h"\

 	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.i"\

+	"..\..\..\ace\Module.cpp"\

+	"..\..\..\ace\Module.h"\

+	"..\..\..\ace\Module.i"\

 	"..\..\..\ace\Object_Manager.h"\

 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

@@ -24057,76 +36316,179 @@ DEP_CPP_TAO_U=\
 	"..\..\..\ace\Service_Config.i"\

 	"..\..\..\ace\Service_Object.h"\

 	"..\..\..\ace\Service_Object.i"\

+	"..\..\..\ace\Service_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

 	"..\..\..\ace\Shared_Object.h"\

 	"..\..\..\ace\Shared_Object.i"\

 	"..\..\..\ace\Signal.h"\

 	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

 	"..\..\..\ace\streams.h"\

 	"..\..\..\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_Options.i"\

 	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

 	"..\..\tao\cdr.h"\

 	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

-	"..\..\tao\IOR_LookupTable.h"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

 	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

 	"..\..\tao\TAO.h"\

 	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

 	".\Time\TAO_TIO.h"\

 	".\Time\TAO_UTO.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time_Utilities.cpp

+SOURCE=.\Time\TAO_UTO.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -24134,7 +36496,9 @@ SOURCE=.\Time_Utilities.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TIME_=\

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

+DEP_CPP_TAO_U=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -24148,6 +36512,8 @@ DEP_CPP_TIME_=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -24156,9 +36522,12 @@ DEP_CPP_TIME_=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -24168,12 +36537,18 @@ DEP_CPP_TIME_=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -24203,6 +36578,9 @@ DEP_CPP_TIME_=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -24287,32 +36665,39 @@ DEP_CPP_TIME_=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -24324,12 +36709,10 @@ DEP_CPP_TIME_=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -24350,42 +36733,46 @@ DEP_CPP_TIME_=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\TAO.h"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\orbsvcs_export.h"\

-	".\Time_Utilities.h"\

-	".\Time_Utilities.i"\

-	

-NODEP_CPP_TIME_=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

+	".\Time\TAO_TIO.h"\

+	".\Time\TAO_UTO.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.cpp

+SOURCE=.\Time_Utilities.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -24393,7 +36780,7 @@ SOURCE=.\TimeBaseC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

-DEP_CPP_TIMEB=\

+DEP_CPP_TIME_=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -24546,11 +36933,11 @@ DEP_CPP_TIMEB=\
 	"..\..\..\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"\

@@ -24568,6 +36955,9 @@ DEP_CPP_TIMEB=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -24622,40 +37012,21 @@ DEP_CPP_TIMEB=\
 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

 	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

-NODEP_CPP_TIMEB=\

+NODEP_CPP_TIME_=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	

 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

-

-DEP_CPP_TIMEBA=\

+DEP_CPP_TIME_=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

@@ -24669,6 +37040,8 @@ DEP_CPP_TIMEBA=\
 	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

 	"..\..\..\ace\config-win32-borland.h"\

 	"..\..\..\ace\config-win32-common.h"\

 	"..\..\..\ace\config-win32.h"\

@@ -24677,9 +37050,12 @@ DEP_CPP_TIMEBA=\
 	"..\..\..\ace\Connector.cpp"\

 	"..\..\..\ace\Connector.h"\

 	"..\..\..\ace\Connector.i"\

-	"..\..\..\ace\Containers.cpp"\

 	"..\..\..\ace\Containers.h"\

 	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

 	"..\..\..\ace\Dynamic.h"\

 	"..\..\..\ace\Dynamic.i"\

 	"..\..\..\ace\Dynamic_Service.cpp"\

@@ -24689,12 +37065,18 @@ DEP_CPP_TIMEBA=\
 	"..\..\..\ace\Free_List.cpp"\

 	"..\..\..\ace\Free_List.h"\

 	"..\..\..\ace\Free_List.i"\

-	"..\..\..\ace\Get_Opt.h"\

-	"..\..\..\ace\Get_Opt.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

 	"..\..\..\ace\Handle_Set.h"\

 	"..\..\..\ace\Handle_Set.i"\

-	"..\..\..\ace\Hash_Map_Manager.cpp"\

 	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

 	"..\..\..\ace\inc_user_config.h"\

 	"..\..\..\ace\INET_Addr.h"\

 	"..\..\..\ace\INET_Addr.i"\

@@ -24724,6 +37106,9 @@ DEP_CPP_TIMEBA=\
 	"..\..\..\ace\Memory_Pool.i"\

 	"..\..\..\ace\Message_Block.h"\

 	"..\..\..\ace\Message_Block.i"\

+	"..\..\..\ace\Message_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

 	"..\..\..\ace\Message_Queue.h"\

 	"..\..\..\ace\Message_Queue.i"\

 	"..\..\..\ace\Message_Queue_T.cpp"\

@@ -24808,32 +37193,39 @@ DEP_CPP_TIMEBA=\
 	"..\..\..\ace\WFMO_Reactor.h"\

 	"..\..\..\ace\WFMO_Reactor.i"\

 	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

 	"..\..\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\corbafwd.h"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\default_client.h"\

-	"..\..\tao\default_client.i"\

-	"..\..\tao\default_server.h"\

-	"..\..\tao\default_server.i"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

 	"..\..\tao\Environment.h"\

 	"..\..\tao\Environment.i"\

 	"..\..\tao\Exception.h"\

 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

@@ -24845,12 +37237,10 @@ DEP_CPP_TIMEBA=\
 	"..\..\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"\

+	"..\..\tao\Pluggable.h"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

@@ -24871,38 +37261,26 @@ DEP_CPP_TIMEBA=\
 	"..\..\tao\Sequence_T.h"\

 	"..\..\tao\Sequence_T.i"\

 	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

 	".\orbsvcs_export.h"\

+	".\Time_Utilities.h"\

+	".\Time_Utilities.i"\

 	

-NODEP_CPP_TIMEBA=\

-	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

-	"..\..\tao\IIOP_Object.h"\

-	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

-	"..\..\tao\Object_Table.h"\

-	".\TimeBaseC.h"\

-	".\TimeBaseC.i"\

-	".\TimeBaseS.h"\

-	".\TimeBaseS.i"\

-	".\TimeBaseS_T.cpp"\

-	".\TimeBaseS_T.h"\

-	".\TimeBaseS_T.i"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -24917,20 +37295,20 @@ SOURCE=.\Time\Timer_Helper.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

 DEP_CPP_TIMER=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -24990,14 +37368,9 @@ DEP_CPP_TIMER=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -25019,11 +37392,6 @@ DEP_CPP_TIMER=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Reactor.h"\

 	"..\..\..\ace\Reactor.i"\

 	"..\..\..\ace\Reactor_Impl.h"\

@@ -25109,16 +37477,11 @@ DEP_CPP_TIMER=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -25128,29 +37491,22 @@ DEP_CPP_TIMER=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -25160,28 +37516,20 @@ DEP_CPP_TIMER=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -25192,8 +37540,6 @@ DEP_CPP_TIMER=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -25201,26 +37547,39 @@ DEP_CPP_TIMER=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosNamingS.h"\

+	".\CosNamingS.i"\

+	".\CosNamingS_T.cpp"\

+	".\CosNamingS_T.h"\

+	".\CosNamingS_T.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\IOR_Multicast.h"\

+	".\Naming\CosNaming_i.h"\

+	".\Naming\Entries.h"\

 	".\Naming\Naming_Utils.h"\

 	".\orbsvcs_export.h"\

 	".\Time\TAO_Time_Service_Clerk.h"\

 	".\Time\Timer_Helper.h"\

-	

-NODEP_CPP_TIMER=\

-	"..\..\..\..\..\Naming\Naming_Context.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

 	

 

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

-

 !ENDIF 

 

 # End Source File

@@ -25234,20 +37593,20 @@ SOURCE=.\Event\Timer_Module.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

 DEP_CPP_TIMER_=\

 	"..\..\..\ace\Acceptor.cpp"\

 	"..\..\..\ace\Acceptor.h"\

 	"..\..\..\ace\Acceptor.i"\

 	"..\..\..\ace\ACE.h"\

 	"..\..\..\ace\ACE.i"\

-	"..\..\..\ace\Active_Map_Manager.h"\

-	"..\..\..\ace\Active_Map_Manager.i"\

-	"..\..\..\ace\Active_Map_Manager_T.cpp"\

-	"..\..\..\ace\Active_Map_Manager_T.h"\

-	"..\..\..\ace\Active_Map_Manager_T.i"\

 	"..\..\..\ace\Addr.h"\

 	"..\..\..\ace\Addr.i"\

 	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

 	"..\..\..\ace\Basic_Types.h"\

 	"..\..\..\ace\Basic_Types.i"\

 	"..\..\..\ace\CDR_Stream.h"\

@@ -25311,14 +37670,9 @@ DEP_CPP_TIMER_=\
 	"..\..\..\ace\Managed_Object.cpp"\

 	"..\..\..\ace\Managed_Object.h"\

 	"..\..\..\ace\Managed_Object.i"\

-	"..\..\..\ace\Map.h"\

-	"..\..\..\ace\Map.i"\

 	"..\..\..\ace\Map_Manager.cpp"\

 	"..\..\..\ace\Map_Manager.h"\

 	"..\..\..\ace\Map_Manager.i"\

-	"..\..\..\ace\Map_T.cpp"\

-	"..\..\..\ace\Map_T.h"\

-	"..\..\..\ace\Map_T.i"\

 	"..\..\..\ace\Mem_Map.h"\

 	"..\..\..\ace\Mem_Map.i"\

 	"..\..\..\ace\Memory_Pool.h"\

@@ -25340,11 +37694,6 @@ DEP_CPP_TIMER_=\
 	"..\..\..\ace\Object_Manager.i"\

 	"..\..\..\ace\OS.h"\

 	"..\..\..\ace\OS.i"\

-	"..\..\..\ace\Pair.h"\

-	"..\..\..\ace\Pair.i"\

-	"..\..\..\ace\Pair_T.cpp"\

-	"..\..\..\ace\Pair_T.h"\

-	"..\..\..\ace\Pair_T.i"\

 	"..\..\..\ace\Pipe.h"\

 	"..\..\..\ace\Pipe.i"\

 	"..\..\..\ace\Reactor.h"\

@@ -25447,16 +37796,11 @@ DEP_CPP_TIMER_=\
 	"..\..\tao\Client_Strategy_Factory.h"\

 	"..\..\tao\connect.h"\

 	"..\..\tao\connect.i"\

-	"..\..\tao\Context.h"\

-	"..\..\tao\Context.i"\

 	"..\..\tao\corba.h"\

 	"..\..\tao\corbafwd.h"\

-	"..\..\tao\corbafwd.i"\

 	"..\..\tao\CurrentC.h"\

 	"..\..\tao\CurrentC.i"\

 	"..\..\tao\debug.h"\

-	"..\..\tao\DomainC.h"\

-	"..\..\tao\DomainC.i"\

 	"..\..\tao\DynAny_i.h"\

 	"..\..\tao\DynAnyC.h"\

 	"..\..\tao\DynAnyC.i"\

@@ -25466,29 +37810,22 @@ DEP_CPP_TIMER_=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

 	"..\..\tao\IIOP_Connector.h"\

 	"..\..\tao\InconsistentTypeCodeC.h"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

-	"..\..\tao\IOR_LookupTable.h"\

-	"..\..\tao\Key_Adapters.h"\

-	"..\..\tao\Key_Adapters.i"\

 	"..\..\tao\Managed_Types.h"\

 	"..\..\tao\Managed_Types.i"\

 	"..\..\tao\marshal.h"\

 	"..\..\tao\marshal.i"\

 	"..\..\tao\MProfile.h"\

-	"..\..\tao\MProfile.i"\

 	"..\..\tao\nvlist.h"\

 	"..\..\tao\NVList.i"\

 	"..\..\tao\object.h"\

 	"..\..\tao\object.i"\

-	"..\..\tao\Object_Adapter.h"\

-	"..\..\tao\Object_Adapter.i"\

 	"..\..\tao\Object_KeyC.h"\

 	"..\..\tao\Object_KeyC.i"\

-	"..\..\tao\ObjectIDList.h"\

-	"..\..\tao\ObjectIDList.i"\

 	"..\..\tao\Operation_Table.h"\

 	"..\..\tao\orb.h"\

 	"..\..\tao\ORB.i"\

@@ -25498,28 +37835,20 @@ DEP_CPP_TIMER_=\
 	"..\..\tao\params.h"\

 	"..\..\tao\params.i"\

 	"..\..\tao\Pluggable.h"\

-	"..\..\tao\Pluggable.i"\

 	"..\..\tao\poa.h"\

 	"..\..\tao\POA.i"\

 	"..\..\tao\POA_CORBA.h"\

 	"..\..\tao\poa_macros.h"\

 	"..\..\tao\poaC.h"\

 	"..\..\tao\poaC.i"\

-	"..\..\tao\POAManager.h"\

-	"..\..\tao\POAManager.i"\

 	"..\..\tao\poaS.h"\

 	"..\..\tao\poaS.i"\

-	"..\..\tao\Policy_Manager.h"\

-	"..\..\tao\Policy_Manager.i"\

 	"..\..\tao\PolicyC.h"\

 	"..\..\tao\PolicyC.i"\

-	"..\..\tao\PollableC.h"\

-	"..\..\tao\PollableC.i"\

 	"..\..\tao\Principal.h"\

 	"..\..\tao\Principal.i"\

 	"..\..\tao\request.h"\

 	"..\..\tao\Request.i"\

-	"..\..\tao\Resource_Factory.h"\

 	"..\..\tao\sequence.h"\

 	"..\..\tao\sequence.i"\

 	"..\..\tao\Sequence_T.cpp"\

@@ -25530,8 +37859,6 @@ DEP_CPP_TIMER_=\
 	"..\..\tao\Server_Request.h"\

 	"..\..\tao\Server_Request.i"\

 	"..\..\tao\Server_Strategy_Factory.h"\

-	"..\..\tao\Services.h"\

-	"..\..\tao\Services.i"\

 	"..\..\tao\singletons.h"\

 	"..\..\tao\stub.h"\

 	"..\..\tao\stub.i"\

@@ -25540,14 +37867,18 @@ DEP_CPP_TIMER_=\
 	"..\..\tao\typecode.h"\

 	"..\..\tao\typecode.i"\

 	"..\..\tao\Union.h"\

-	"..\..\tao\ValueBase.h"\

-	"..\..\tao\ValueBase.i"\

-	"..\..\tao\ValueFactory.h"\

-	"..\..\tao\ValueFactory.i"\

 	"..\..\tao\varout.cpp"\

 	"..\..\tao\varout.h"\

 	"..\..\tao\varout.i"\

-	"..\..\tao\WrongTransactionC.h"\

+	".\CosNamingC.h"\

+	".\CosNamingC.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

 	".\Event\Fast_Reactor.h"\

 	".\Event\Local_ESTypes.h"\

 	".\Event\Local_ESTypes.i"\

@@ -25558,16 +37889,32 @@ DEP_CPP_TIMER_=\
 	".\Event\Timer_Module.i"\

 	".\Event_Service_Constants.h"\

 	".\orbsvcs_export.h"\

+	".\RtecEventChannelAdminC.h"\

+	".\RtecEventChannelAdminC.i"\

+	".\RtecEventChannelAdminS.h"\

+	".\RtecEventChannelAdminS.i"\

+	".\RtecEventChannelAdminS_T.cpp"\

+	".\RtecEventChannelAdminS_T.h"\

+	".\RtecEventChannelAdminS_T.i"\

+	".\RtecEventCommC.h"\

+	".\RtecEventCommC.i"\

+	".\RtecEventCommS.h"\

+	".\RtecEventCommS.i"\

+	".\RtecEventCommS_T.cpp"\

+	".\RtecEventCommS_T.h"\

+	".\RtecEventCommS_T.i"\

+	".\RtecSchedulerC.h"\

+	".\RtecSchedulerC.i"\

+	".\RtecSchedulerS.h"\

+	".\RtecSchedulerS.i"\

+	".\RtecSchedulerS_T.cpp"\

+	".\RtecSchedulerS_T.h"\

+	".\RtecSchedulerS_T.i"\

 	".\Scheduler_Factory.h"\

 	".\Scheduler_Factory.i"\

 	".\Time_Utilities.h"\

 	".\Time_Utilities.i"\

 	

-NODEP_CPP_TIMER_=\

-	".\Event\ace\ReactorEx.h"\

-	

-

-!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 !ENDIF 

 

@@ -25584,6 +37931,272 @@ SOURCE=.\TimeServiceC.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_TIMES=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -25599,6 +38212,272 @@ SOURCE=.\TimeServiceS.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_TIMESE=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTimeBaseC.h"\

+	".\CosTimeBaseC.i"\

+	".\CosTimeBaseS.h"\

+	".\CosTimeBaseS.i"\

+	".\CosTimeBaseS_T.cpp"\

+	".\CosTimeBaseS_T.h"\

+	".\CosTimeBaseS_T.i"\

+	".\orbsvcs_export.h"\

+	".\TimeServiceC.h"\

+	".\TimeServiceC.i"\

+	".\TimeServiceS.h"\

+	".\TimeServiceS.i"\

+	".\TimeServiceS_T.cpp"\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -25766,11 +38645,11 @@ DEP_CPP_TRADE=\
 	"..\..\..\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"\

@@ -25788,6 +38667,9 @@ DEP_CPP_TRADE=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -25860,11 +38742,8 @@ DEP_CPP_TRADE=\
 	

 NODEP_CPP_TRADE=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -25877,6 +38756,282 @@ NODEP_CPP_TRADE=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_TRADE=\

+	"..\..\..\ace\Acceptor.cpp"\

+	"..\..\..\ace\Acceptor.h"\

+	"..\..\..\ace\Acceptor.i"\

+	"..\..\..\ace\ACE.h"\

+	"..\..\..\ace\ACE.i"\

+	"..\..\..\ace\Addr.h"\

+	"..\..\..\ace\Addr.i"\

+	"..\..\..\ace\Arg_Shifter.h"\

+	"..\..\..\ace\Atomic_Op.i"\

+	"..\..\..\ace\Auto_Ptr.cpp"\

+	"..\..\..\ace\Auto_Ptr.h"\

+	"..\..\..\ace\Auto_Ptr.i"\

+	"..\..\..\ace\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\DynSequence_i.h"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Constraint_Interpreter.h"\

+	".\Trader\Constraint_Nodes.h"\

+	".\Trader\Constraint_Tokens.h"\

+	".\Trader\Constraint_Visitors.h"\

+	".\Trader\Offer_Database.cpp"\

+	".\Trader\Offer_Database.h"\

+	".\Trader\Offer_Iterators.h"\

+	".\Trader\Offer_Iterators_T.cpp"\

+	".\Trader\Offer_Iterators_T.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Interfaces.cpp"\

+	".\Trader\Trader_Interfaces.h"\

+	".\Trader\Trader_T.cpp"\

+	".\Trader\Trader_T.h"\

+	".\Trader\Trader_Utils.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -26043,11 +39198,11 @@ DEP_CPP_TRADER=\
 	"..\..\..\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"\

@@ -26065,6 +39220,9 @@ DEP_CPP_TRADER=\
 	"..\..\tao\Exception.i"\

 	"..\..\tao\giop.h"\

 	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Interpreter.h"\

+	"..\..\tao\IIOP_ORB.h"\

+	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Invocation.h"\

 	"..\..\tao\Invocation.i"\

 	"..\..\tao\marshal.h"\

@@ -26124,11 +39282,8 @@ DEP_CPP_TRADER=\
 	

 NODEP_CPP_TRADER=\

 	"..\..\..\ace\sys_conf.h"\

-	"..\..\tao\align.h"\

 	"..\..\tao\IIOP_Object.h"\

 	"..\..\tao\IIOP_Object.i"\

-	"..\..\tao\IIOP_ORB.h"\

-	"..\..\tao\IIOP_ORB.i"\

 	"..\..\tao\Object_Table.h"\

 	".\CosTradingC.h"\

 	".\CosTradingC.i"\

@@ -26141,6 +39296,267 @@ NODEP_CPP_TRADER=\
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+DEP_CPP_TRADER=\

+	"..\..\..\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\Basic_Types.h"\

+	"..\..\..\ace\Basic_Types.i"\

+	"..\..\..\ace\CDR_Stream.h"\

+	"..\..\..\ace\CDR_Stream.i"\

+	"..\..\..\ace\config-win32-borland.h"\

+	"..\..\..\ace\config-win32-common.h"\

+	"..\..\..\ace\config-win32.h"\

+	"..\..\..\ace\config-WinCE.h"\

+	"..\..\..\ace\config.h"\

+	"..\..\..\ace\Connector.cpp"\

+	"..\..\..\ace\Connector.h"\

+	"..\..\..\ace\Connector.i"\

+	"..\..\..\ace\Containers.h"\

+	"..\..\..\ace\Containers.i"\

+	"..\..\..\ace\Containers_T.cpp"\

+	"..\..\..\ace\Containers_T.h"\

+	"..\..\..\ace\Containers_T.i"\

+	"..\..\..\ace\CORBA_macros.h"\

+	"..\..\..\ace\Dynamic.h"\

+	"..\..\..\ace\Dynamic.i"\

+	"..\..\..\ace\Dynamic_Service.cpp"\

+	"..\..\..\ace\Dynamic_Service.h"\

+	"..\..\..\ace\Event_Handler.h"\

+	"..\..\..\ace\Event_Handler.i"\

+	"..\..\..\ace\Free_List.cpp"\

+	"..\..\..\ace\Free_List.h"\

+	"..\..\..\ace\Free_List.i"\

+	"..\..\..\ace\Functor.h"\

+	"..\..\..\ace\Functor.i"\

+	"..\..\..\ace\Functor_T.cpp"\

+	"..\..\..\ace\Functor_T.h"\

+	"..\..\..\ace\Functor_T.i"\

+	"..\..\..\ace\Handle_Set.h"\

+	"..\..\..\ace\Handle_Set.i"\

+	"..\..\..\ace\Hash_Map_Manager.h"\

+	"..\..\..\ace\Hash_Map_Manager.i"\

+	"..\..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\..\ace\inc_user_config.h"\

+	"..\..\..\ace\INET_Addr.h"\

+	"..\..\..\ace\INET_Addr.i"\

+	"..\..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\..\ace\iosfwd.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_Base.h"\

+	"..\..\..\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_Block_T.cpp"\

+	"..\..\..\ace\Message_Block_T.h"\

+	"..\..\..\ace\Message_Block_T.i"\

+	"..\..\..\ace\Message_Queue.h"\

+	"..\..\..\ace\Message_Queue.i"\

+	"..\..\..\ace\Message_Queue_T.cpp"\

+	"..\..\..\ace\Message_Queue_T.h"\

+	"..\..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\..\ace\Service_Repository.i"\

+	"..\..\..\ace\Service_Types.h"\

+	"..\..\..\ace\Service_Types.i"\

+	"..\..\..\ace\Shared_Object.h"\

+	"..\..\..\ace\Shared_Object.i"\

+	"..\..\..\ace\Signal.h"\

+	"..\..\..\ace\Signal.i"\

+	"..\..\..\ace\Singleton.cpp"\

+	"..\..\..\ace\Singleton.h"\

+	"..\..\..\ace\Singleton.i"\

+	"..\..\..\ace\SOCK.h"\

+	"..\..\..\ace\SOCK.i"\

+	"..\..\..\ace\SOCK_Acceptor.h"\

+	"..\..\..\ace\SOCK_Acceptor.i"\

+	"..\..\..\ace\SOCK_Connector.h"\

+	"..\..\..\ace\SOCK_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.i"\

+	"..\..\..\ace\Strategies_T.cpp"\

+	"..\..\..\ace\Strategies_T.h"\

+	"..\..\..\ace\Strategies_T.i"\

+	"..\..\..\ace\Stream_Modules.cpp"\

+	"..\..\..\ace\Stream_Modules.h"\

+	"..\..\..\ace\Stream_Modules.i"\

+	"..\..\..\ace\streams.h"\

+	"..\..\..\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_Options.i"\

+	"..\..\..\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\WFMO_Reactor.h"\

+	"..\..\..\ace\WFMO_Reactor.i"\

+	"..\..\..\ace\ws2tcpip.h"\

+	"..\..\tao\Active_Object_Map.h"\

+	"..\..\tao\Active_Object_Map.i"\

+	"..\..\tao\any.h"\

+	"..\..\tao\any.i"\

+	"..\..\tao\cdr.h"\

+	"..\..\tao\cdr.i"\

+	"..\..\tao\Client_Strategy_Factory.h"\

+	"..\..\tao\connect.h"\

+	"..\..\tao\connect.i"\

+	"..\..\tao\corba.h"\

+	"..\..\tao\corbafwd.h"\

+	"..\..\tao\CurrentC.h"\

+	"..\..\tao\CurrentC.i"\

+	"..\..\tao\debug.h"\

+	"..\..\tao\DynAny_i.h"\

+	"..\..\tao\DynAnyC.h"\

+	"..\..\tao\DynAnyC.i"\

+	"..\..\tao\Environment.h"\

+	"..\..\tao\Environment.i"\

+	"..\..\tao\Exception.h"\

+	"..\..\tao\Exception.i"\

+	"..\..\tao\giop.h"\

+	"..\..\tao\giop.i"\

+	"..\..\tao\IIOP_Acceptor.h"\

+	"..\..\tao\IIOP_Connector.h"\

+	"..\..\tao\InconsistentTypeCodeC.h"\

+	"..\..\tao\Invocation.h"\

+	"..\..\tao\Invocation.i"\

+	"..\..\tao\Managed_Types.h"\

+	"..\..\tao\Managed_Types.i"\

+	"..\..\tao\marshal.h"\

+	"..\..\tao\marshal.i"\

+	"..\..\tao\MProfile.h"\

+	"..\..\tao\nvlist.h"\

+	"..\..\tao\NVList.i"\

+	"..\..\tao\object.h"\

+	"..\..\tao\object.i"\

+	"..\..\tao\Object_KeyC.h"\

+	"..\..\tao\Object_KeyC.i"\

+	"..\..\tao\Operation_Table.h"\

+	"..\..\tao\orb.h"\

+	"..\..\tao\ORB.i"\

+	"..\..\tao\orb_core.h"\

+	"..\..\tao\orb_core.i"\

+	"..\..\tao\orbconf.h"\

+	"..\..\tao\params.h"\

+	"..\..\tao\params.i"\

+	"..\..\tao\Pluggable.h"\

+	"..\..\tao\poa.h"\

+	"..\..\tao\POA.i"\

+	"..\..\tao\POA_CORBA.h"\

+	"..\..\tao\poa_macros.h"\

+	"..\..\tao\poaC.h"\

+	"..\..\tao\poaC.i"\

+	"..\..\tao\poaS.h"\

+	"..\..\tao\poaS.i"\

+	"..\..\tao\PolicyC.h"\

+	"..\..\tao\PolicyC.i"\

+	"..\..\tao\Principal.h"\

+	"..\..\tao\Principal.i"\

+	"..\..\tao\request.h"\

+	"..\..\tao\Request.i"\

+	"..\..\tao\sequence.h"\

+	"..\..\tao\sequence.i"\

+	"..\..\tao\Sequence_T.cpp"\

+	"..\..\tao\Sequence_T.h"\

+	"..\..\tao\Sequence_T.i"\

+	"..\..\tao\servant_base.h"\

+	"..\..\tao\Servant_Base.i"\

+	"..\..\tao\Server_Request.h"\

+	"..\..\tao\Server_Request.i"\

+	"..\..\tao\Server_Strategy_Factory.h"\

+	"..\..\tao\singletons.h"\

+	"..\..\tao\stub.h"\

+	"..\..\tao\stub.i"\

+	"..\..\tao\try_macros.h"\

+	"..\..\tao\typecode.h"\

+	"..\..\tao\typecode.i"\

+	"..\..\tao\Union.h"\

+	"..\..\tao\varout.cpp"\

+	"..\..\tao\varout.h"\

+	"..\..\tao\varout.i"\

+	".\CosTradingC.h"\

+	".\CosTradingC.i"\

+	".\CosTradingS.h"\

+	".\CosTradingS.i"\

+	".\CosTradingS_T.cpp"\

+	".\CosTradingS_T.h"\

+	".\CosTradingS_T.i"\

+	".\orbsvcs_export.h"\

+	".\Trader\Trader.h"\

+	".\Trader\Trader_Utils.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -26150,26 +39566,6 @@ NODEP_CPP_TRADER=\
 # PROP Default_Filter ".h"

 # Begin Source File

 

-SOURCE=.\AV\AVStreams_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AV\AVStreams_i_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\BCU.h

 # End Source File

 # Begin Source File

@@ -26214,15 +39610,15 @@ SOURCE=.\CosConcurrencyControlS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent_Utilities.h

+SOURCE=.\CosLifeCycleC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosLifeCycleC.h

+SOURCE=.\CosLifeCycleS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosLifeCycleS.h

+SOURCE=.\Naming\CosNaming_i.h

 # End Source File

 # Begin Source File

 

@@ -26238,10 +39634,6 @@ SOURCE=.\Property\CosPropertyService_i.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Property\CosPropertyService_i_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosPropertyServiceC.h

 # End Source File

 # Begin Source File

@@ -26250,31 +39642,15 @@ SOURCE=.\CosPropertyServiceS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingC.h

+SOURCE=.\CosTimeBaseC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.h

+SOURCE=.\CosTimeBaseS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS_T.h

+SOURCE=.\CosTradingC.h

 # End Source File

 # Begin Source File

 

@@ -26294,58 +39670,6 @@ SOURCE=.\Sched\DynSched.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Basic_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Busy_Lock.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Conjunction_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ConsumerAdmin.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Default_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Disjunction_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Event_Channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter_Builder.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Gateway.h

 # End Source File

 # Begin Source File

@@ -26354,98 +39678,6 @@ SOURCE=.\Event\EC_Gateway_UDP.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Null_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Scheduling.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ObserverStrategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Per_Supplier_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Dispatching.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Scheduling.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyConsumer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxySupplier.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_QOS_Info.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Reactive_Timeout_Generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Scheduling_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierAdmin.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierFiltering.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Type_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AV\Endpoint_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\AV\Endpoint_Strategy_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Entries.h

 # End Source File

 # Begin Source File

@@ -26462,10 +39694,6 @@ SOURCE=.\Event_Utilities.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Hash_Naming_Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ImplRepoC.h

 # End Source File

 # Begin Source File

@@ -26514,26 +39742,10 @@ SOURCE=.\Event\Module_Factory.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Naming_Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Naming_Utils.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Null_MediaCtrlC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrlS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrlS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trader\Offer_Database.h

 # End Source File

 # Begin Source File

@@ -26546,26 +39758,6 @@ SOURCE=.\Trader\Offer_Iterators_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Bindings_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Context_Index.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Context_Index_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Entries.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Naming_Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\PingC.h

 # End Source File

 # Begin Source File

@@ -26638,22 +39830,6 @@ SOURCE=.\Trader\Service_Type_Repository.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\AV\sfp.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Shared_Hash_Map_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Sched\Strategy_Scheduler.h

 # End Source File

 # Begin Source File

@@ -26678,14 +39854,6 @@ SOURCE=.\Time_Utilities.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Time\Timer_Helper.h

 # End Source File

 # Begin Source File

@@ -26750,31 +39918,15 @@ SOURCE=.\CosNamingS.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingC.i

+SOURCE=.\CosTimeBaseC.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.i

+SOURCE=.\CosTimeBaseS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS_T.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS_T.i

+SOURCE=.\CosTradingC.i

 # End Source File

 # Begin Source File

 

@@ -26794,142 +39946,6 @@ SOURCE=.\Sched\DynSched.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Basic_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Busy_Lock.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Conjunction_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ConsumerAdmin.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Default_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Disjunction_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Event_Channel.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Scheduling.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ObserverStrategy.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Per_Supplier_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Dispatching.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Scheduling.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyConsumer.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxySupplier.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_QOS_Info.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Reactive_Timeout_Generator.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Scheduling_Strategy.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierAdmin.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierFiltering.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Generator.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Type_Filter.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\Event_Channel.i

 # End Source File

 # Begin Source File

@@ -26982,14 +39998,6 @@ SOURCE=.\Sched\Strategy_Scheduler.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\Timer_Module.i

 # End Source File

 # Begin Source File

@@ -27010,173 +40018,6 @@ SOURCE=.\TimeServiceS_T.i
 # PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\AVStreams.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTRE="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTRE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTRE="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTRE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

 SOURCE=.\CosConcurrencyControl.idl

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

@@ -27188,8 +40029,8 @@ InputPath=.\CosConcurrencyControl.idl
 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27223,13 +40064,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSCONC="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosConcurrencyControl.idl

 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27268,8 +40109,8 @@ InputPath=.\CosConcurrencyControl.idl
 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27308,8 +40149,8 @@ InputPath=.\CosConcurrencyControl.idl
 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27349,14 +40190,14 @@ SOURCE=.\CosEventChannelAdmin.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSEVENTC="..\..\..\bin\Release\tao_idl.exe"	"CosEventCommC.h"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventChannelAdmin.idl

 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27389,14 +40230,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__COSEVENTC="..\..\..\bin\tao_idl.exe"	"CosEventCommC.h"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventChannelAdmin.idl

 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27429,14 +40270,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSEVENTC="..\..\..\bin\Release\tao_idl.exe"	"CosEventCommC.h"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventChannelAdmin.idl

 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27469,14 +40310,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSEVENTC="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventChannelAdmin.idl

 InputName=CosEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27516,14 +40357,14 @@ SOURCE=.\CosEventComm.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSEVENTCO="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventComm.idl

 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27556,14 +40397,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__COSEVENTCO="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventComm.idl

 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27596,14 +40437,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSEVENTCO="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventComm.idl

 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27636,14 +40477,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSEVENTCO="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosEventComm.idl

 InputName=CosEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27689,8 +40530,8 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27724,13 +40565,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__COSLIFE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27769,8 +40610,8 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27809,8 +40650,8 @@ InputPath=.\CosLifeCycle.idl
 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27850,14 +40691,14 @@ SOURCE=.\CosNaming.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMI="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSNAMIN="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27890,14 +40731,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMI="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__COSNAMIN="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27930,14 +40771,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMI="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSNAMIN="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -27970,14 +40811,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNAMI="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSNAMIN="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28017,14 +40858,14 @@ SOURCE=.\CosPropertyService.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPRO="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSPROPE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28057,14 +40898,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPRO="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__COSPROPE="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28097,14 +40938,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPRO="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSPROPE="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28137,14 +40978,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSPRO="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSPROPE="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28179,19 +41020,19 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTrading.idl

+SOURCE=.\CosTimeBase.idl

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTIME="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTrading.idl

-InputName=CosTrading

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28224,179 +41065,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\CosTrading.idl

-InputName=CosTrading

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTrading.idl

-InputName=CosTrading

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTrading.idl

-InputName=CosTrading

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\CosTradingDynamic.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

+USERDEP__COSTIME="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28429,14 +41105,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRADI="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTIME="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28469,14 +41145,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRADI="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTIME="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28511,18 +41187,19 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingRepos.idl

+SOURCE=.\CosTrading.idl

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28555,13 +41232,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28594,14 +41272,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRADIN="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28634,14 +41312,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRADIN="..\..\..\bin\tao_idl.exe"	

+USERDEP__COSTRAD="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28681,14 +41359,13 @@ SOURCE=.\ImplRepo.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\ImplRepo.idl

 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28721,14 +41398,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\ImplRepo.idl

 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28761,14 +41437,12 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\ImplRepo.idl

 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	Invoking TAO_IDL Compiler

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28800,15 +41474,14 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-# PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\tao_idl.exe"	

+USERDEP__IMPLREP="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\ImplRepo.idl

 InputName=ImplRepo

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28854,8 +41527,8 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28889,13 +41562,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__LIFECYC="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28934,8 +41607,8 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -28974,8 +41647,8 @@ InputPath=.\LifeCycleService.idl
 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29021,8 +41694,8 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29056,13 +41729,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__LOGGER_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Logger.idl

 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29101,8 +41774,8 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29141,175 +41814,8 @@ InputPath=.\Logger.idl
 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrl.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29349,14 +41855,13 @@ SOURCE=.\Ping.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__PING_="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Ping.idl

 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29389,14 +41894,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__PING_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Ping.idl

 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29429,40 +41933,39 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__PING_="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

+# Begin Custom Build - Running the TAO IDL Compiler on $(InputPath)...

 InputPath=.\Ping.idl

 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	%ACE_ROOT%\bin\tao_idl.exe -ci C.inl -si S.inl -st S_T.inl\

+ D:\brunsch\ACE_wrappers\TAO\orbsvcs\orbsvcs\Ping.idl

+

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.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)"

+"$(InputName)S_T.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

@@ -29475,8 +41978,8 @@ InputPath=.\Ping.idl
 InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29522,8 +42025,8 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29557,13 +42060,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECEVENT="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29602,8 +42105,8 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29642,8 +42145,8 @@ InputPath=.\RtecEventChannelAdmin.idl
 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29689,8 +42192,8 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29724,13 +42227,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECEVENTC="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29769,8 +42272,8 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29809,8 +42312,8 @@ InputPath=.\RtecEventComm.idl
 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29856,8 +42359,8 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29891,13 +42394,13 @@ BuildCmds= \
 

 # PROP Ignore_Default_Tool 1

 USERDEP__RTECSCH="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29936,8 +42439,8 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -29976,8 +42479,8 @@ InputPath=.\RtecScheduler.idl
 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30017,14 +42520,14 @@ SOURCE=.\RtecUDPAdmin.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECUDP="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30057,14 +42560,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__RTECUDP="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30097,14 +42600,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__RTECUDP="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30137,350 +42640,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\tao_idl.exe"	

+USERDEP__RTECUDP="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecUDPAdmin.idl

 InputName=RtecUDPAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\sfp.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\sfp.idl

-InputName=sfp

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

-InputPath=.\sfp.idl

-InputName=sfp

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\sfp.idl

-InputName=sfp

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\sfp.idl

-InputName=sfp

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\TimeBase.idl

-

-!IF  "$(CFG)" == "orbsvcs - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMEBAS="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\TimeBase.idl

-InputName=TimeBase

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMEBAS="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on TimeBase.idl

-InputPath=.\TimeBase.idl

-InputName=TimeBase

-

-BuildCmds= \

-	..\..\..\bin\tao_idl              -I../../ \

-               -Wb,export_macro=TAO_ORBSVCS_Export \

-                                                          -Wb,export_include=orbsvcs_export.h              $(InputName).idl \

-             -I..\..\ 

-

-"$(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)" == "orbsvcs - Win32 Alpha Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMEBAS="..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\TimeBase.idl

-InputName=TimeBase

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(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)" == "orbsvcs - Win32 Alpha Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMEBAS="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\TimeBase.idl

-InputName=TimeBase

-

-BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30520,14 +42687,14 @@ SOURCE=.\TimeService.idl
 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TIMESER="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeService.idl

 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-       -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30560,14 +42727,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler on $(InputName)

+USERDEP__TIMESER="..\..\..\bin\tao_idl.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeService.idl

 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30600,14 +42767,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__TIMESER="..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeService.idl

 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl -i../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\Release\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30640,14 +42807,14 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\tao_idl.exe"	

+USERDEP__TIMESER="..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\TimeService.idl

 InputName=TimeService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-                                              -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\..\bin\tao_idl -Wb,export_macro=TAO_ORBSVCS_Export\

+                                    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -30686,52 +42853,58 @@ BuildCmds= \
 # PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\AV\AVStreams_i_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Property\CosPropertyService_i_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosPropertyServiceS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS_T.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+# PROP Exclude_From_Build 1

+DEP_CPP_COSPROPER=\

+	".\CosPropertyServiceS_T.h"\

+	".\CosPropertyServiceS_T.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingReposS_T.cpp

+SOURCE=.\CosTradingS_T.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

 

+# PROP Exclude_From_Build 1

+

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingS_T.cpp

+SOURCE=.\ImplRepoS_T.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

 

@@ -30747,24 +42920,17 @@ SOURCE=.\CosTradingS_T.cpp
 

 !ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

 

-# PROP BASE Exclude_From_Build 1

 # PROP Exclude_From_Build 1

+DEP_CPP_IMPLREPO=\

+	".\ImplRepoS_T.h"\

+	".\ImplRepoS_T.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\AV\Endpoint_Strategy_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trader\Offer_Database.cpp

 

 !IF  "$(CFG)" == "orbsvcs - Win32 Release"

@@ -30813,18 +42979,30 @@ SOURCE=.\Trader\Offer_Iterators_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Context_Index_T.cpp

+SOURCE=.\TimeServiceS_T.cpp

+

+!IF  "$(CFG)" == "orbsvcs - Win32 Release"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\Naming\Shared_Hash_Map_T.cpp

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Debug"

+

 # PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\TimeServiceS_T.cpp

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Release"

+

+# PROP Exclude_From_Build 1

+

+!ELSEIF  "$(CFG)" == "orbsvcs - Win32 Alpha Debug"

+

 # PROP Exclude_From_Build 1

+DEP_CPP_TIMESERV=\

+	".\TimeServiceS_T.h"\

+	".\TimeServiceS_T.i"\

+	

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
index 789dfae4649..7a32b55691c 100644
--- a/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
+++ b/TAO/orbsvcs/orbsvcs/orbsvcs_static.dsp
@@ -17,16 +17,16 @@ CFG=ORB Services Static - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ORB Services Static - Win32 Release" (based on\

- "Win32 (x86) Static Library")

-!MESSAGE "ORB Services Static - Win32 Debug" (based on\

- "Win32 (x86) Static Library")

+!MESSAGE "ORB Services Static - Win32 Release" (based on "Win32 (x86) Static Library")

+!MESSAGE "ORB Services Static - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 CPP=cl.exe

+RSC=rc.exe

 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

@@ -40,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 "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\\" /I "..\..\\" /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409

+# ADD RSC /l 0x409

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -65,11 +64,10 @@ LIB32=link.exe -lib
 # PROP Output_Dir ""

 # PROP Intermediate_Dir "LIB\Debug"

 # PROP Target_Dir ""

-RSC=rc.exe

+# 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 "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # 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 "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D TAO_HAS_DLL=0 /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D TAO_ORBSVCS_HAS_DLL=0 /YX /FD /c

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

@@ -85,19 +83,7 @@ LIB32=link.exe -lib
 # Name "ORB Services Static - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp"

-# Begin Source File

-

-SOURCE=.\AV\AVStreams_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AVStreamsS.cpp

-# End Source File

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Event\BCU.cpp

@@ -140,10 +126,6 @@ SOURCE=.\Trader\Constraint_y.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\ConsumerAdmin_i.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosConcurrencyControlC.cpp

 # End Source File

 # Begin Source File

@@ -152,31 +134,15 @@ SOURCE=.\CosConcurrencyControlS.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent_Utilities.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelAdminC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventChannelAdminS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventCommC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEventCommS.cpp

+SOURCE=.\CosLifeCycleC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosLifeCycleC.cpp

+SOURCE=.\CosLifeCycleS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosLifeCycleS.cpp

+SOURCE=.\Naming\CosNaming_i.cpp

 # End Source File

 # Begin Source File

 

@@ -200,23 +166,15 @@ SOURCE=.\CosPropertyServiceS.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingC.cpp

+SOURCE=.\CosTimeBaseC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.cpp

+SOURCE=.\CosTimeBaseS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.cpp

+SOURCE=.\CosTradingC.cpp

 # End Source File

 # Begin Source File

 

@@ -232,58 +190,6 @@ SOURCE=.\Sched\DynSched.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Basic_Filter_Builder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Busy_Lock.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Conjunction_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ConsumerAdmin.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Default_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Disjunction_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Event_Channel.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter_Builder.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Gateway.cpp

 # End Source File

 # Begin Source File

@@ -292,98 +198,6 @@ SOURCE=.\Event\EC_Gateway_UDP.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Null_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Scheduling.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ObserverStrategy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Per_Supplier_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Dispatching.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Scheduling.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyConsumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxySupplier.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_QOS_Info.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Reactive_Timeout_Generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Scheduling_Strategy.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierAdmin.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierFiltering.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Generator.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Type_Filter.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_UDP_Admin.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\AV\Endpoint_Strategy.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Entries.cpp

 # End Source File

 # Begin Source File

@@ -400,22 +214,6 @@ SOURCE=.\Event_Utilities.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\EventChannel_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Hash_Naming_Context.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\IOR_Multicast.cpp

 # End Source File

 # Begin Source File

@@ -452,58 +250,14 @@ SOURCE=.\Event\Module_Factory.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Naming_Context.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Naming_Utils.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Null_MediaCtrlC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrlS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trader\Offer_Iterators.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Bindings_Map.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Context_Index.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Entries.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Naming_Context.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushConsumer_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosEvent\ProxyPushSupplier_i.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\ReactorTask.cpp

 # End Source File

 # Begin Source File

@@ -536,14 +290,6 @@ SOURCE=.\RtecSchedulerS.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\RtecUDPAdminC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\RtecUDPAdminS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Runtime_Scheduler.cpp

 # End Source File

 # Begin Source File

@@ -572,39 +318,11 @@ SOURCE=.\Trader\Service_Type_Repository.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\AV\sfp.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\sfpS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Sched\Strategy_Scheduler.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent\SupplierAdmin_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_Time_Service_Clerk.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_Time_Service_Server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_TIO.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_UTO.cpp

+SOURCE=.\Event\Task_Manager.cpp

 # End Source File

 # Begin Source File

 

@@ -612,30 +330,6 @@ SOURCE=.\Time_Utilities.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\Timer_Helper.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Timer_Module.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trader\Trader.cpp

 # End Source File

 # Begin Source File

@@ -645,7 +339,7 @@ SOURCE=.\Trader\Trader_Utils.cpp
 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Event\BCU.h

@@ -692,10 +386,6 @@ SOURCE=.\CosConcurrencyControlS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosEvent_Utilities.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosLifeCycleC.h

 # End Source File

 # Begin Source File

@@ -704,23 +394,15 @@ SOURCE=.\CosLifeCycleS.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosNamingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosNamingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Property\CosPropertyService_i.h

+SOURCE=.\Naming\CosNaming_i.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosPropertyServiceC.h

+SOURCE=.\CosNamingC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CosPropertyServiceS.h

+SOURCE=.\CosNamingS.h

 # End Source File

 # Begin Source File

 

@@ -736,22 +418,6 @@ SOURCE=.\CosTradingC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosTradingS.h

 # End Source File

 # Begin Source File

@@ -760,10 +426,6 @@ SOURCE=.\CosTradingS_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\Debug_Macros.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\Dispatching_Modules.h

 # End Source File

 # Begin Source File

@@ -772,62 +434,6 @@ SOURCE=.\Sched\DynSched.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Basic_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Basic_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Busy_Lock.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Command.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Conjunction_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ConsumerAdmin.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Default_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Disjunction_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Event_Channel.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Filter_Builder.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\EC_Gateway.h

 # End Source File

 # Begin Source File

@@ -836,98 +442,6 @@ SOURCE=.\Event\EC_Gateway_UDP.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Null_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Scheduling.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ObserverStrategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Per_Supplier_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Dispatching.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Scheduling.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyConsumer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxySupplier.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_QOS_Info.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Reactive_Timeout_Generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Scheduling_Strategy.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierAdmin.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_SupplierFiltering.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Timeout_Generator.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Type_Filter.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_UDP_Admin.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Entries.h

 # End Source File

 # Begin Source File

@@ -936,10 +450,6 @@ SOURCE=.\Event\Event_Channel.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\Event_Manip.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event_Service_Constants.h

 # End Source File

 # Begin Source File

@@ -948,30 +458,6 @@ SOURCE=.\Event_Utilities.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\Fast_Reactor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\GPlot_File.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Hash_Naming_Context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IOR_Multicast.h

 # End Source File

 # Begin Source File

@@ -1008,10 +494,6 @@ SOURCE=.\Event\Module_Factory.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Naming_Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Naming\Naming_Utils.h

 # End Source File

 # Begin Source File

@@ -1028,38 +510,6 @@ SOURCE=.\Trader\Offer_Iterators_T.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Bindings_Map.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Context_Index.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Context_Index_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Entries.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Persistent_Naming_Context.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\ReactorTask.h

 # End Source File

 # Begin Source File

@@ -1120,30 +570,10 @@ SOURCE=.\Trader\Service_Type_Repository.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Shared_Hash_Map_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Sched\Strategy_Scheduler.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\TAO_Time_Service_Clerk.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_Time_Service_Server.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_TIO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Time\TAO_UTO.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\Task_Manager.h

 # End Source File

 # Begin Source File

@@ -1152,26 +582,6 @@ SOURCE=.\Time_Utilities.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Time\Timer_Helper.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\Timer_Module.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceS.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceS_T.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Trader\Trader.h

 # End Source File

 # Begin Source File

@@ -1189,7 +599,7 @@ SOURCE=.\Trader\Trader_Utils.h
 # End Group

 # Begin Group "Inline Files"

 

-# PROP Default_Filter "i"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\CosConcurrencyControlC.i

@@ -1228,22 +638,6 @@ SOURCE=.\CosTradingC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingDynamicC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingDynamicS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingReposS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CosTradingS.i

 # End Source File

 # Begin Source File

@@ -1260,46 +654,6 @@ SOURCE=.\Sched\DynSched.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Event\EC_Default_Factory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Dispatching_Task.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Null_Scheduling.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Dispatching.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Priority_Scheduling.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Sched_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Scheduling_Strategy.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Supplier_Filter_Builder.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_Trivial_Supplier_Filter.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Event\Event_Channel.i

 # End Source File

 # Begin Source File

@@ -1308,18 +662,6 @@ SOURCE=.\Event_Utilities.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ImplRepoS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\LifeCycleServiceC.i

 # End Source File

 # Begin Source File

@@ -1332,132 +674,16 @@ SOURCE=.\Event\Memory_Pools.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\PingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\PingS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Sched\SchedEntry.i

 # End Source File

 # Begin Source File

 

 SOURCE=.\Sched\Strategy_Scheduler.i

 # End Source File

-# Begin Source File

-

-SOURCE=.\Event\Timer_Module.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceS.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeServiceS_T.i

-# End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter "idl"

-# Begin Source File

-

-SOURCE=.\AVStreams.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AVSTR="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\AVStreams.idl

-InputName=AVStreams

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\CosConcurrencyControl.idl

@@ -1465,15 +691,13 @@ SOURCE=.\CosConcurrencyControl.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSCO="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSCO="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosConcurrencyControl.idl

 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1506,190 +730,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSCO="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSCO="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosConcurrencyControl.idl

 InputName=CosConcurrencyControl

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\CosEventChannelAdmin.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosEventChannelAdmin.idl

-InputName=CosEventChannelAdmin

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSEV="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosEventChannelAdmin.idl

-InputName=CosEventChannelAdmin

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\CosEventComm.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosEventComm.idl

-InputName=CosEventComm

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSEVE="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosEventComm.idl

-InputName=CosEventComm

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1729,15 +776,13 @@ SOURCE=.\CosLifeCycle.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSLI="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1770,14 +815,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSLI="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSLI="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosLifeCycle.idl

 InputName=CosLifeCycle

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1817,15 +861,13 @@ SOURCE=.\CosNaming.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSNA="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1858,14 +900,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSNA="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__COSNA="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosNaming.idl

 InputName=CosNaming

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1904,16 +945,12 @@ SOURCE=.\CosPropertyService.idl
 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

-# PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -1945,190 +982,12 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

-# PROP Ignore_Default_Tool 1

-USERDEP__COSPR="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\CosPropertyService.idl

 InputName=CosPropertyService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\CosTrading.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTrading.idl

-InputName=CosTrading

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSTR="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTrading.idl

-InputName=CosTrading

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\CosTradingDynamic.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__COSTRA="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTradingDynamic.idl

-InputName=CosTradingDynamic

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2163,20 +1022,18 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=.\CosTradingRepos.idl

+SOURCE=.\CosTimeBase.idl

 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__COSTRAD="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+USERDEP__COSTI="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2209,13 +1066,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\CosTradingRepos.idl

-InputName=CosTradingRepos

+USERDEP__COSTI="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosTimeBase.idl

+InputName=CosTimeBase

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2250,20 +1107,18 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepo.idl

+SOURCE=.\CosTrading.idl

 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\ImplRepo.idl

-InputName=ImplRepo

+USERDEP__COSTR="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2296,14 +1151,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__IMPLR="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\ImplRepo.idl

-InputName=ImplRepo

+USERDEP__COSTR="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

+InputPath=.\CosTrading.idl

+InputName=CosTrading

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2343,15 +1197,13 @@ SOURCE=.\LifeCycleService.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__LIFEC="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2384,14 +1236,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LIFEC="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__LIFEC="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\LifeCycleService.idl

 InputName=LifeCycleService

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2431,15 +1282,13 @@ SOURCE=.\Logger.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LOGGE="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__LOGGE="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Logger.idl

 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2472,190 +1321,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__LOGGE="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__LOGGE="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\Logger.idl

 InputName=Logger

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\Null_MediaCtrl.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__NULL_="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\Null_MediaCtrl.idl

-InputName=Null_MediaCtrl

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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

-# Begin Source File

-

-SOURCE=.\Ping.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__PING_="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\Ping.idl

-InputName=Ping

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__PING_="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\Ping.idl

-InputName=Ping

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2695,15 +1367,13 @@ SOURCE=.\RtecEventChannelAdmin.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECE="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2736,14 +1406,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECE="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECE="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventChannelAdmin.idl

 InputName=RtecEventChannelAdmin

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2783,15 +1452,13 @@ SOURCE=.\RtecEventComm.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECEV="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2824,14 +1491,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECEV="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECEV="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecEventComm.idl

 InputName=RtecEventComm

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2871,15 +1537,13 @@ SOURCE=.\RtecScheduler.idl
 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECS="..\..\tao_idl\Release\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

+	..\..\tao_idl\Release\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2912,14 +1576,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__RTECS="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

+USERDEP__RTECS="..\..\tao_idl\tao_idl_static.exe"	

+# Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\RtecScheduler.idl

 InputName=RtecScheduler

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

+	..\..\tao_idl\tao_idl_static -Wb,export_macro=TAO_ORBSVCS_Export    -Wb,export_include=orbsvcs_export.h $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2952,420 +1615,141 @@ BuildCmds= \
 !ENDIF 

 

 # End Source File

-# Begin Source File

-

-SOURCE=.\RtecUDPAdmin.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\RtecUDPAdmin.idl

-InputName=RtecUDPAdmin

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__RTECU="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\RtecUDPAdmin.idl

-InputName=RtecUDPAdmin

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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)

+# End Group

+# Begin Group "Template Files"

 

-"$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+# PROP Default_Filter ""

+# Begin Source File

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+SOURCE=.\CosTradingS_T.cpp

+# End Source File

+# Begin Source File

 

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+SOURCE=.\Trader\Offer_Database.cpp

+# End Source File

+# Begin Source File

 

-"$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+SOURCE=.\Trader\Offer_Iterators_T.cpp

+# End Source File

+# Begin Source File

 

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

+SOURCE=.\Trader\Trader_Interfaces.cpp

+# End Source File

+# Begin Source File

 

-!ENDIF 

+SOURCE=.\Trader\Trader_T.cpp

+# End Source File

+# End Group

+# Begin Source File

 

+SOURCE=.\Event\EC_UDP_Admin.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\sfp.idl

+SOURCE=.\Ping.idl

 

 !IF  "$(CFG)" == "ORB Services Static - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\sfp.idl

-InputName=sfp

+# Begin Custom Build - Running the TAO IDL Compiler on $(InputPath)...

+InputPath=.\Ping.idl

+InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+	%ACE_ROOT%\bin\tao_idl.exe -ci C.inl -si S.inl -st S_T.inl D:\brunsch\ACE_wrappers\TAO\orbsvcs\orbsvcs\Ping.idl

 

 "$(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__SFP_I="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\sfp.idl

-InputName=sfp

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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)"

+"$(InputName)C.inl" : $(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

-# Begin Source File

-

-SOURCE=.\TimeBase.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\TimeBase.idl

-InputName=TimeBase

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)"

+"$(InputName)S.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.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)"

+"$(InputName)S_T.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

 !ELSEIF  "$(CFG)" == "ORB Services Static - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__TIMEB="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\TimeBase.idl

-InputName=TimeBase

+# Begin Custom Build - Running the TAO IDL Compiler on $(InputPath)...

+InputPath=.\Ping.idl

+InputName=Ping

 

 BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(InputName).idl

-

-"$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

+	%ACE_ROOT%\bin\tao_idl.exe -ci C.inl -si S.inl -st S_T.inl D:\brunsch\ACE_wrappers\TAO\orbsvcs\orbsvcs\Ping.idl

 

 "$(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

-# Begin Source File

-

-SOURCE=.\TimeService.idl

-

-!IF  "$(CFG)" == "ORB Services Static - Win32 Release"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\Release\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\TimeService.idl

-InputName=TimeService

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl_static -I../../\

-      -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h\

-      $(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)"

+"$(InputName)C.inl" : $(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)" == "ORB Services Static - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__TIMES="..\..\..\bin\tao_idl_static.exe"	

-# Begin Custom Build - Invoking TAO_IDL

-InputPath=.\TimeService.idl

-InputName=TimeService

-

-BuildCmds= \

-	..\..\..\bin\tao_idl_static -I../../ -Wb,export_macro=TAO_ORBSVCS_Export\

-      -Wb,export_include=orbsvcs_export.h $(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)"

+"$(InputName)S.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.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)"

+"$(InputName)S_T.inl" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

 !ENDIF 

 

 # End Source File

-# End Group

-# Begin Group "Template Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\CosPropertyServiceS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\CosTradingS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Event\EC_ProxyPushSupplier_Set_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

 # Begin Source File

 

-SOURCE=.\ImplRepoS_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\PingC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Trader\Offer_Database.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\PingC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Trader\Offer_Iterators_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\PingS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Naming\Persistent_Context_Index_T.cpp

+SOURCE=.\PingS.h

 # End Source File

 # Begin Source File

 

 SOURCE=.\PingS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Naming\Shared_Hash_Map_T.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeServiceS_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Trader\Trader_Interfaces.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Trader\Trader_T.cpp

-# PROP Exclude_From_Build 1

+SOURCE=.\PingS_T.h

 # End Source File

-# End Group

 # End Target

 # End Project

diff --git a/TAO/orbsvcs/orbsvcs/sfp.idl b/TAO/orbsvcs/orbsvcs/sfp.idl
index 9a378719a9b..ba1ffbce866 100644
--- a/TAO/orbsvcs/orbsvcs/sfp.idl
+++ b/TAO/orbsvcs/orbsvcs/sfp.idl
@@ -1,8 +1,5 @@
 /* -*- C++ -*- */
-// $Id$
-
-#ifndef TAO_SFP_IDL
-#define TAO_SFP_IDL
+/* $Id$ */
 
 module flowProtocol
 {
@@ -47,9 +44,9 @@ module flowProtocol
     char magic_number[4];
     // 'F', 'R', 'A', 'G' 
     octet flags; 
-    // bit 1 = more fragments, %%bit 0 = byteorder 
+    // bit 1 = more fragments 
     unsigned long frag_number; 
-    // 1,..,n 
+    // 0,..,n 
     unsigned long sequence_num;
     unsigned long frag_sz; 
     unsigned long source_id; 
@@ -114,7 +111,6 @@ module flowProtocol
     // "=",'C','R','E'
     unsigned long cred_num;
   };
+
   
 };
-
-#endif /* TAO_SFP_IDL */
diff --git a/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp b/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp
new file mode 100644
index 00000000000..e9d059c4a8f
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/tmplinst-orbsvcs.cpp
@@ -0,0 +1,80 @@
+// $Id$
+
+#include "orbsvcs/CosLifeCycleC.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/CosPropertyServiceC.h"
+#include "orbsvcs/RtecEventCommC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecSchedulerC.h"
+
+ACE_RCSID(orbsvcs, tmplinst_orbsvcs, "$Id$")
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class TAO_Object_Manager<CORBA_Object>;
+template class TAO_Object_Manager<CORBA_TypeCode>;
+template class TAO_Unbounded_Object_Sequence<CORBA_Object>;
+template class TAO_Unbounded_Pseudo_Sequence<CORBA_TypeCode>;
+
+#if defined(TAO_ORBSVCS_HAS_LifeCycle)
+template class TAO_Unbounded_Sequence<CosLifeCycle::NVP>;
+#endif /* TAO_ORBSVCS_HAS_LifeCycle */
+
+#if defined(TAO_ORBSVCS_HAS_Naming)
+template class TAO_Unbounded_Sequence<CosNaming::NameComponent>;
+template class TAO_Unbounded_Sequence<CosNaming::Binding>;
+#endif /* TAO_ORBSVCS_HAS_Naming */
+
+#if defined(TAO_ORBSVCS_HAS_Property)
+template class TAO_Unbounded_Sequence<CosPropertyService::Property>;
+template class TAO_Unbounded_Sequence<CosPropertyService::PropertyDef>;
+template class TAO_Unbounded_Sequence<CosPropertyService::PropertyException>;
+template class TAO_Unbounded_Sequence<CosPropertyService::PropertyMode>;
+#endif /* TAO_ORBSVCS_HAS_Property */
+
+#if defined(TAO_ORBSVCS_HAS_Event)
+template class TAO_Unbounded_Sequence<RtecEventComm::Event>;
+template class TAO_Unbounded_Sequence<RtecEventChannelAdmin::Dependency>;
+template class TAO_Unbounded_Sequence<RtecEventChannelAdmin::Publication>;
+#endif /* TAO_ORBSVCS_HAS_Event */
+
+#if defined(TAO_ORBSVCS_HAS_Sched)
+template class TAO_Unbounded_Sequence<RtecScheduler::Dependency_Info>;
+template class TAO_Unbounded_Sequence<RtecScheduler::RT_Info>;
+#endif /* TAO_ORBSVCS_HAS_Sched */
+
+#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate TAO_Object_Manager<CORBA_Object>
+#pragma instantiate TAO_Object_Manager<CORBA_TypeCode>
+#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Object>
+#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_TypeCode>
+
+#if defined(TAO_ORBSVCS_HAS_LifeCycle)
+#pragma instantiate TAO_Unbounded_Sequence<CosLifeCycle::NVP>
+#endif /* TAO_ORBSVCS_HAS_LifeCycle */
+
+#if defined(TAO_ORBSVCS_HAS_Naming)
+#pragma instantiate TAO_Unbounded_Sequence<CosNaming::NameComponent>
+#pragma instantiate TAO_Unbounded_Sequence<CosNaming::Binding>
+#endif /* TAO_ORBSVCS_HAS_Naming */
+
+#if defined(TAO_ORBSVCS_HAS_Property)
+#pragma instantiate TAO_Unbounded_Sequence<CosPropertyService::Property>
+#pragma instantiate TAO_Unbounded_Sequence<CosPropertyService::PropertyDef>
+#pragma instantiate TAO_Unbounded_Sequence<CosPropertyService::PropertyException>
+#pragma instantiate TAO_Unbounded_Sequence<CosPropertyService::PropertyMode>
+#endif /* TAO_ORBSVCS_HAS_Property */
+
+#if defined(TAO_ORBSVCS_HAS_Event)
+#pragma instantiate TAO_Unbounded_Sequence<RtecEventComm::Event>
+#pragma instantiate TAO_Unbounded_Sequence<RtecEventChannelAdmin::Dependency>
+#pragma instantiate TAO_Unbounded_Sequence<RtecEventChannelAdmin::Publication>
+#endif /* TAO_ORBSVCS_HAS_Event */
+
+#if defined(TAO_ORBSVCS_HAS_Sched)
+#pragma instantiate TAO_Unbounded_Sequence<RtecScheduler::Dependency_Info>
+#pragma instantiate TAO_Unbounded_Sequence<RtecScheduler::RT_Info>
+#endif /* TAO_ORBSVCS_HAS_Sched */
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Makefile.am
deleted file mode 100644
index 78c1bdc6b4f..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for TAO's AVStreams Tests
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        benchmark \
-        mpeg \
-        server_discovery \
-        sfp
-
-EXTRA_DIST = README
-
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/AV_benchmark.dsw b/TAO/orbsvcs/tests/AVStreams/benchmark/AV_benchmark.dsw
deleted file mode 100644
index effaa04dffb..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/AV_benchmark.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "av_benchmark_child"=.\av_benchmark_child.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "av_benchmark_client"=.\av_benchmark_client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "av_benchmark_server"=.\av_benchmark_server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
index 14ec4ce5e14..1f53f15bdb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile
@@ -13,26 +13,20 @@ LDLIBS     = -lorbsvcs -lTAO
 
 SERVER_OBJS = server.o child.o
 CLIENT_OBJS = client.o
-CHILD_PROCESS_OBJS = child.o child_process.o
+CHILD_OBJS = child.o
 
+BIN = server client #child
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-FILES = client server child child_process
+FILES = client server child
 DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
 
-BIN2 = server client child_process
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # AV
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -57,9 +51,12 @@ server:$(addprefix $(VDIR),$(SERVER_OBJS))
 client:$(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
+child:$(addprefix $(VDIR),$(CHILD_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+realclean: clean
+	-/bin/rm -rf 
+
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -70,11 +67,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -104,12 +104,10 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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/Containers.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/Malloc_T.i \
@@ -128,169 +126,11 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
  $(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/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/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/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -303,235 +143,53 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(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/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
- $(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/Acceptor.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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 \
- $(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/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/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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Task.h \
+ $(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/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
+ $(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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.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/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -540,199 +198,99 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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/Align.h \
  $(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 \
- $(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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.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/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
@@ -748,10 +306,9 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -759,47 +316,21 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
- client.h $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- child.h $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/child.o .obj/child.so .shobj/child.o .shobj/child.so: child.cpp child.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -828,12 +359,10 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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/Containers.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 \
@@ -875,9 +404,6 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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 \
@@ -885,15 +411,7 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -912,13 +430,13 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
@@ -939,153 +457,97 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/SOCK_CODgram.h \
  $(ACE_ROOT)/ace/SOCK_CODgram.i \
  $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
  $(ACE_ROOT)/ace/Token.h \
  $(ACE_ROOT)/ace/Token.i \
  $(ACE_ROOT)/ace/Pipe.h \
  $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
  $(ACE_ROOT)/ace/Select_Reactor.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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 \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(TAO_ROOT)/tao/Align.h \
  $(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 \
- $(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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1094,17 +556,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
@@ -1120,10 +579,10 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1131,45 +590,24 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
  client.h $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
-.obj/child_process.o .obj/child_process.so .shobj/child_process.o .shobj/child_process.so: child_process.cpp child.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ child.h
+.obj/child.o .obj/child.so .shobj/child.o .shobj/child.so: child.cpp child.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -1198,12 +636,10 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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/Containers.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 \
@@ -1245,9 +681,6 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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 \
@@ -1255,15 +688,7 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1282,13 +707,13 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(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/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
@@ -1309,153 +734,97 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/SOCK_CODgram.h \
  $(ACE_ROOT)/ace/SOCK_CODgram.i \
  $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
  $(ACE_ROOT)/ace/Token.h \
  $(ACE_ROOT)/ace/Token.i \
  $(ACE_ROOT)/ace/Pipe.h \
  $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
  $(ACE_ROOT)/ace/Select_Reactor.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.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 \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(TAO_ROOT)/tao/Align.h \
  $(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 \
- $(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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -1464,17 +833,14 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
@@ -1490,10 +856,10 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1501,31 +867,6 @@ child_process:$(addprefix $(VDIR),$(CHILD_PROCESS_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/sfp.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/sfpC.i \
  client.h $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am b/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
deleted file mode 100644
index 4177c191865..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Service -- benchmark directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = server client #child
-
-server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-server_SOURCES = \
-        server.cpp \
-        child.cpp
-
-client_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-client_SOURCES = \
-        client.cpp
-
-## chile_LDADD = \
-## 	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-##
-## child_SOURCES = \
-##         child.cpp
-
-noinst_HEADERS = \
-        child.h \
-        client.h \
-        server.h
-
-noinst_DATA = svc.conf clnt.conf
-
-EXTRA_DIST = $(noinst_DATA)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/README b/TAO/orbsvcs/tests/AVStreams/benchmark/README
deleted file mode 100644
index 8f4bf8eb5d8..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This directory contains a Audio/Video Streaming 
-service client and server to measure the throughput achieved and also
-the stream establishment time. 
-
-server options:
-=============
-
--p : Use Process strategy.
-
--r : Use reactive strategy.
-
-Other standard orb options.
-
-client options:
-==============
-
--b block_size to be used.
-
--t No. of threads on the client side (to measure stream establishment
-        time for different threads.)
-
--s Use the Datagram reactive strategy and streamendpoint.Default is
-   TTCP reactive strategy.
-
--p Port number to listen on.
-
--h hostname to bind to.
-
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp
deleted file mode 100644
index ede99df49bd..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_child.dsp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Microsoft Developer Studio Project File - Name="av_benchmark_child" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=av_benchmark_child - 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 "av_benchmark_child.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 "av_benchmark_child.mak"\

- CFG="av_benchmark_child - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "av_benchmark_child - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "av_benchmark_child - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "av_benchmark_child - 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 /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 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "av_benchmark_child - 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 ""

-# 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 "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"child.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "av_benchmark_child - Win32 Release"

-# Name "av_benchmark_child - Win32 Debug"

-# Begin Source File

-

-SOURCE=..\child.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\child.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\child_process.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp
deleted file mode 100644
index 14897a9ce9e..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_client.dsp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Microsoft Developer Studio Project File - Name="av_benchmark_client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=av_benchmark_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 NMAKE /f "av_benchmark_client.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 "av_benchmark_client.mak"\

- CFG="av_benchmark_client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "av_benchmark_client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "av_benchmark_client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "av_benchmark_client - 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 /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 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "av_benchmark_client - 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 "Debug"

-# 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 /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcsd.lib TAOd.lib aced.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 /out:"client.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "av_benchmark_client - Win32 Release"

-# Name "av_benchmark_client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\client.h

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp b/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp
deleted file mode 100644
index 1675d403341..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/av_benchmark_server.dsp
+++ /dev/null
@@ -1,104 +0,0 @@
-# Microsoft Developer Studio Project File - Name="av_benchmark_server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=av_benchmark_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 NMAKE /f "av_benchmark_server.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 "av_benchmark_server.mak"\

- CFG="av_benchmark_server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "av_benchmark_server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "av_benchmark_server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "av_benchmark_server - 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 /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 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "av_benchmark_server - 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 ""

-# 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 "..\..\..\.." /I "..\..\..\..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "av_benchmark_server - Win32 Release"

-# Name "av_benchmark_server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\child.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\child.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.h

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
index 924c1046a04..564aa586bd3 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.cpp
@@ -51,9 +51,11 @@ Bench_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &t
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Bench_Server_StreamEndPoint::handle_connection_requested:() length =%d\n",
               the_spec.length ()));
 
+  return 1;
+
   ACE_INET_Addr client_addr (the_spec [0]);
   u_short local_port = 0;
-  ACE_INET_Addr local_addr (local_port);
+  ACE_INET_Addr local_addr (local_port,"merengue-atm.cs.wustl.edu");
   
   if (this->connector_.connect (this->tcp_stream_,
                                 client_addr,
@@ -73,20 +75,20 @@ Bench_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &t
                                 (void *) &sndbufsize,
                                 sizeof (sndbufsize)) == -1
       && errno != ENOTSUP)
-    return 0;
+    return -1;
   else if (this->tcp_stream_.set_option (SOL_SOCKET,
                                          SO_RCVBUF,
                                      (void *) &rcvbufsize,
                                      sizeof (rcvbufsize)) == -1
            && errno != ENOTSUP)
-    return 0;
+    return -1;
   
   int one = 1;
   if (this->tcp_stream_.set_option (SOL_SOCKET,
                                     TCP_NODELAY,
                                 (char *)& one,
                                 sizeof (one)) == -1 )
-    return 0;
+    return -1;
 
   ACE_NEW_RETURN (this->stream_handler_,
                   ttcp_Stream_Handler (this->tcp_stream_.get_handle ()),
@@ -102,7 +104,7 @@ Bench_Server_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &t
   return 1;
 }
 
-ttcp_Stream_Handler::ttcp_Stream_Handler (ACE_HANDLE control_fd)
+ttcp_Stream_Handler::ttcp_Stream_Handler (int control_fd)
   : control_handle_ (control_fd)
 {
 }
@@ -134,3 +136,18 @@ ttcp_Stream_Handler::handle_input (ACE_HANDLE handle)
 }
 
 
+// --------------------------------------------------------------------------------
+
+
+// int
+// main (int argc, char **argv)
+// {
+//   TAO_AV_Child_Process_B<Bench_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> bench_child;
+  
+//    if (bench_child.init (argc,argv) == -1)
+//      return 1;
+//    if (bench_child.run () == -1)
+//      return 2;
+   
+//    return 0;
+// }
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
index 2e06d225380..3baf5852d47 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/child.h
@@ -31,7 +31,7 @@ class ttcp_Stream_Handler : public virtual ACE_Event_Handler
   //   the current state which is implemented using the state pattern.
 public:
 
-  ttcp_Stream_Handler (ACE_HANDLE ttcp_Stream_fd);
+  ttcp_Stream_Handler (int ttcp_Stream_fd);
   // Construct this handler with a control (TCP) fd
   // %% use sock stream instead of fd
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp
deleted file mode 100644
index 0470a59e528..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/child_process.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-#include "child.h"
-
-int
-main (int argc, char **argv)
-{
-  TAO_AV_Child_Process_B<Bench_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> bench_child;
-
-   if (bench_child.init (argc,argv) == -1)
-     return 1;
-   if (bench_child.run () == -1)
-     return 2;
-
-   return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_AV_Child_Process_B<Bench_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
-template class TAO_AV_Child_Process<Bench_Server_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_AV_Child_Process_B<Bench_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
-#pragma instantiate TAO_AV_Child_Process<Bench_Server_StreamEndPoint, TAO_VDev, AV_Null_MediaCtrl>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
index 2bfd8c9d7b8..08494218d07 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.cpp
@@ -2,7 +2,6 @@
 
 #include "client.h"
 
-
 ACE_RCSID(benchmark, client, "$Id$")
 
 Client_StreamEndPoint::Client_StreamEndPoint (void)
@@ -103,17 +102,17 @@ ttcp_Client_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &the_spec)
 
   if (this->acceptor_.open (tcp_addr,
                             TAO_ORB_Core_instance ()->reactor ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"%p\n","open"),0);
+    ACE_ERROR_RETURN ((LM_ERROR,"%p\n","open"),-1);
   ACE_INET_Addr local_addr;
 
   if (this->acceptor_.acceptor ().get_local_addr (local_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)acceptor get local addr failed %p"),0);
+    ACE_ERROR_RETURN ((LM_ERROR,"(%P|%t)acceptor get local addr failed %p"),-1);
 
   char client_address_string [BUFSIZ];
   ::sprintf (client_address_string,
              "%s:%d",
-             local_addr.get_host_name (),
-             //             "mambo-atm.cs.wustl.edu",
+             //             local_addr.get_host_name (),
+             "mambo-atm.cs.wustl.edu",
              local_addr.get_port_number ());
   the_spec.length (1);
   the_spec [0] = CORBA::string_dup (client_address_string);
@@ -140,14 +139,15 @@ ttcp_Client_StreamEndPoint::open (void *)
   return 0;
 }
 
-Client::Client (int argc, char **argv,int task_id)
-  :ttcp_reactive_strategy_ (&orb_manager_,this),
-   reactive_strategy_ (&orb_manager_),
-   client_mmdevice_ (0),
-   argc_ (argc),
-   argv_ (argv),
-   task_id_ (task_id)
-
+Client::Client (int argc, char **argv, ACE_Barrier *barrier)
+   : reactive_strategy_ (&orb_manager_),
+     //  :reactive_strategy_ (&orb_manager_,this),
+    client_mmdevice_ (&reactive_strategy_),
+    argc_ (argc),
+    argv_ (argv),
+    block_size_ (1),
+    number_ (10),
+    barrier_ (barrier)
 {
 }
 
@@ -157,48 +157,25 @@ Client::set_stream (ACE_SOCK_Stream & control)
   this->stream_ = control;
 }
 
-Globals::Globals (void)
-  :ready_cond_ (ready_mtx_),
-   hostname_ (""),
-   port_ (0)
-{
-}
-
 int
-Globals::parse_args (int argc,
-                     char **argv)
+Client::parse_args (int argc,
+                    char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"b:n:h:p:ts");
+  ACE_Get_Opt opts (argc,argv,"b:");
 
   int c;
-  this->strategy_ = TTCP_REACTIVE;
-  this->block_size_ = 1;
-  this->number_ = 10;
+
   while ((c = opts ()) != -1)
     switch (c)
       {
       case 'b':
         this->block_size_ = ACE_OS::atoi (opts.optarg);
         break;
-      case 'n':
-        this->number_ = ACE_OS::atoi (opts.optarg);
-        break;
-      case 'h':
-        this->hostname_ = ACE_OS::strdup (opts.optarg);
-        break;
-      case 'p':
-        this->port_ = ACE_OS::atoi (opts.optarg);
-        break;
-      case 't':
-        this->thread_count_ = ACE_OS::atoi (opts.optarg);
-        break;
-      case 's':
-        // use ttcp strategy.        
-        this->strategy_ = TTCP_REACTIVE;
-        break;
+//       case 'n':
+//         this->number_ = ACE_OS::atoi (opts.optarg);
+//         break;
       case '?':
-        ACE_DEBUG ((LM_DEBUG,"Usage %s [-b block_size] [-n number_of times]"
-                    "[-h hostname] [-p port_number] [-t]",
+        ACE_DEBUG ((LM_DEBUG,"Usage %s [-b block_size] [-n number_of times]",
                     argv[0]));
         break;
       }
@@ -215,7 +192,8 @@ Client::svc (void)
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) Thread created\n"));
 
-  if (GLOBALS::instance ()->parse_args (this->argc_,this->argv_) == -1)
+  if (this->parse_args (this->argc_,
+                        this->argv_) == -1)
     return -1;
   TAO_TRY
     {
@@ -223,42 +201,8 @@ Client::svc (void)
                                this->argv_,
                                TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
-      if (this->task_id_ == 0)
-        {
-          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1));
-          if (GLOBALS::instance ()->parse_args (this->argc_,
-                                                this->argv_) == -1)
-            return -1;
-
-          ACE_NEW_RETURN (GLOBALS::instance ()->barrier_,
-                          ACE_Barrier (GLOBALS::instance ()->thread_count_),
-                          -1);
-          GLOBALS::instance ()->ready_ = 1;
-          GLOBALS::instance ()->ready_cond_.broadcast ();
-        }
-      else
-        {
-          ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ready_mon, GLOBALS::instance ()->ready_mtx_, 1));
-          GLOBALS::instance ()->ready_cond_.wait ();
-        }
-
-      switch (GLOBALS::instance ()->strategy_)
-        {
-        case Globals::TTCP_REACTIVE:
-          ACE_NEW_RETURN  (this->client_mmdevice_,
-                           TAO_MMDevice (&ttcp_reactive_strategy_),
-                           -1);
-          break;
-        case Globals::DGRAM_REACTIVE:
-          ACE_NEW_RETURN (this->client_mmdevice_,
-                          TAO_MMDevice (&reactive_strategy_),
-                          -1);
-          break;
-        }
-
       // activate the client MMDevice with the ORB
-      this->orb_manager_.activate (this->client_mmdevice_,
+      this->orb_manager_.activate (&this->client_mmdevice_,
                                    TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -268,7 +212,7 @@ Client::svc (void)
                           -1);
       
       // wait for the other clients to finish binding
-      GLOBALS::instance ()->barrier_->wait ();
+      this->barrier_->wait ();
       
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) All threads finished, starting tests.\n"));
 
@@ -281,7 +225,7 @@ Client::svc (void)
 
       timer.start ();
       this->streamctrl_.bind_devs
-        (this->client_mmdevice_->_this (TAO_TRY_ENV),
+        (this->client_mmdevice_._this (TAO_TRY_ENV),
          this->server_mmdevice_.in (),
          the_qos.inout (),
          the_flows.in (),
@@ -292,53 +236,48 @@ Client::svc (void)
       timer.elapsed_time (tv1);
       long time_taken = tv1.sec () + tv1.usec () /1000000;
       tv1.dump ();
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)time taken for stream setup is %ld \n",
-                  time_taken ));
+      //ACE_DEBUG ((LM_DEBUG,"(%P|%t)time taken is %ld \n",
+      //                  time_taken ));
       
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
+      return 0;
+
       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));
-      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,
+  
+      if (this->stream_.set_option (SOL_SOCKET,
+                                    SO_SNDBUF,
+                                    (void *) &sndbufsize,
+                                    sizeof (sndbufsize)) == -1
+          && errno != ENOTSUP)
+        return -1;
+      else if (this->stream_.set_option (SOL_SOCKET,
                                          SO_RCVBUF,
                                          (void *) &rcvbufsize,
-                                         sizeof (rcvbufsize));
-      if ((result == -1)&& (errno != ENOTSUP))
-        ACE_ERROR_RETURN ((LM_ERROR,"set_option failed for rcvbufsize:%p\n",""),-1);
-#endif /* ACE_LACKS_SOCKET_BUFSIZ */
-#if defined (TCP_NODELAY)
+                                         sizeof (rcvbufsize)) == -1
+               && errno != ENOTSUP)
+        return -1;
+
       int one = 1;
-      result = this->stream_.set_option (SOL_SOCKET,
-					 TCP_NODELAY,
-					 (char *)& one,
-					 sizeof (one));
-      if (result == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,"set_option failed TCP_NODELAY:%p\n",""),-1);
-#endif
+      if (this->stream_.set_option (SOL_SOCKET,
+                                    TCP_NODELAY,
+                                    (char *)& one,
+                                    sizeof (one)) == -1 )
+        return -1;
 
       char *buffer;
-      long buffer_siz = GLOBALS::instance ()->block_size_*1024;
+      long buffer_siz = this->block_size_*1024;
       
       ACE_NEW_RETURN (buffer,
                       char [buffer_siz],
                       -1);
-      long number = 64 *1024/(GLOBALS::instance ()->block_size_);
       timer.start ();
+      long number = 64 *1024/this->block_size_;
       for (int i=0;i<number;i++)
-	{
-          this->stream_.send_n (buffer,buffer_siz);
-	}
+        this->stream_.send_n (buffer,buffer_siz);
       timer.stop ();
       timer.elapsed_time (tv2);
       double total_time = tv2.sec ()+tv2.usec ()/1000000.0;
-      double total_data = 64*1024*1024*8.0;
+      double total_data = 64*1024*1024;
       ACE_DEBUG ((LM_DEBUG,"Total data = %f , Total time = %f \n",
                   total_data,total_time));
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) Thruput for block size is:%d\t%f Mb/s \n",
@@ -420,7 +359,7 @@ Client::establish_stream (void)
   TAO_TRY
     {
       this->streamctrl_.bind_devs
-        (this->client_mmdevice_->_this (TAO_TRY_ENV),
+        (this->client_mmdevice_._this (TAO_TRY_ENV),
          this->server_mmdevice_.in (),
          the_qos.inout (),
          the_flows.in (),
@@ -438,51 +377,39 @@ Client::establish_stream (void)
   return 0;
 }
 
-
-// -----------------------------------------------------------
-// Video_Endpoint_Reactive_Strategy_A methods
-
-ttcp_Endpoint_Reactive_Strategy_A::ttcp_Endpoint_Reactive_Strategy_A (TAO_ORB_Manager *orb_manager,
-                                                                        Client *client)
-  : TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>  (orb_manager),
-    client_ (client)
-{
-}
-
-int
-ttcp_Endpoint_Reactive_Strategy_A::make_stream_endpoint (ttcp_Client_StreamEndPoint *&endpoint)
-{
-  ACE_NEW_RETURN (endpoint,
-                  ttcp_Client_StreamEndPoint (this->client_),
-                  -1);
-
-  return 0;
-}
-
 // ----------------------------------------------------------------------
 
 int
 main (int argc, char **argv)
-{  
-
-  GLOBALS::instance ()->thread_count_ = 1;
-  // Preliminary argument processing.
-  int i;
-  for (i=0;i< argc;i++)
+{
+  ACE_Get_Opt opts (argc, argv, "T:");
+  int thread_count = 1;
+  
+int c;
+while ((c = opts ()) != -1)
+  switch (c)
     {
-      if (ACE_OS::strcmp (argv[i],"-t") == 0
-          && (i - 1 < argc))
-        GLOBALS::instance ()->thread_count_ =
-          ACE_OS::atoi (argv[i+1]);
+    case 'T':
+    thread_count = (u_int) ACE_OS::atoi (opts.optarg);
+    continue;
+    default:
+//          ACE_DEBUG ((LM_DEBUG, 
+//                      "Usage: %s -t number_of_threads\n",
+//                      argv [0]));
+      break;
     }
 
-  for (i = 0; i < GLOBALS::instance ()->thread_count_; i++)
+  ACE_Barrier *barrier;
+  ACE_NEW_RETURN (barrier,
+                  ACE_Barrier (thread_count + 1),
+                  -1);
+  for (int i = 0; i < thread_count; i++)
     {
       Client *client;
       ACE_NEW_RETURN (client,
                       Client (argc,
                               argv,
-                              i),
+                              barrier),
                       -1);
 
       if (client->activate (THR_BOUND) == -1)
@@ -492,7 +419,32 @@ main (int argc, char **argv)
                           -1);
     }
 
+  // wait for all the threads to finish starting up
+  barrier->wait ();
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t) All threads started, waiting for test completion\n"));
+  
   ACE_Thread_Manager::instance ()->wait ();
+
+}
+
+// -----------------------------------------------------------
+// Video_Endpoint_Reactive_Strategy_A methods
+
+ttcp_Endpoint_Reactive_Strategy_A::ttcp_Endpoint_Reactive_Strategy_A (TAO_ORB_Manager *orb_manager,
+                                                                        Client *client)
+  : TAO_AV_Endpoint_Reactive_Strategy_A<ttcp_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>  (orb_manager),
+    client_ (client)
+{
+}
+
+int
+ttcp_Endpoint_Reactive_Strategy_A::make_stream_endpoint (ttcp_Client_StreamEndPoint *&endpoint)
+{
+  ACE_NEW_RETURN (endpoint,
+                  ttcp_Client_StreamEndPoint (this->client_),
+                  -1);
+
   return 0;
 }
 
@@ -504,8 +456,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDe
 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>
@@ -514,6 +464,4 @@ template class ACE_Singleton<Globals,ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_Acceptor <ttcp_Client_StreamEndPoint,ACE_SOCK_ACCEPTOR>
 #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/client.h b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
index 43640396ed2..6d4b8cdbc7a 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/client.h
@@ -15,7 +15,6 @@
 
 #include "ace/Event_Handler.h"
 #include "ace/ARGV.h"
-#include "ace/Get_Opt.h"
 #include "tao/TAO.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/SOCK_Dgram.h"
@@ -113,92 +112,49 @@ private:
 };
 
 
-class Globals
-{
-  // = TITLE
-  //     Globals class to be used as a singleton.
-  //
-  // = DESCRIPTION
-  //     This is used both by the client.
-public:
-  Globals (void);
-  // constructor.
-
-  int parse_args (int argc,char **argv);
-  //parse the arguments.
-
-  ACE_Barrier *barrier_;
-  //  barrier for the client threads.
-
-  int ready_;
-  // ready flag used by the high priority thread to wake up the low
-  // priority threads after it's parsed the arguments.
-
-  ACE_SYNCH_MUTEX ready_mtx_;
-  // mutex for the condition variable.
-
-  ACE_Condition<ACE_SYNCH_MUTEX> ready_cond_;
-  // condition variable for the low priority threads to wait
-  //until the high priority thread is done with the arguments parsing.
-
-
-  int block_size_;
-  // size of the block to be sent in Kilobytes.
-
-  int number_;
-  // number of times to send the block
-
-  char *hostname_;
-  // hostname to bind to.
-
-  u_short port_;
-  //  port number to bind to.
-
-  enum strategy {TTCP_REACTIVE=0,DGRAM_REACTIVE =1};
-  strategy strategy_;
-  // strategy to be used for MMDevice.
-
-  int thread_count_;
-  // No. of threads.
-};
-
-typedef ACE_Singleton <Globals,ACE_SYNCH_MUTEX> GLOBALS;
-
 class Client : public ACE_Task<ACE_SYNCH>
 // one of these per client thread
 {
 public:
-  Client (int argc, char **argv, int task_id);
+  Client (int argc, char **argv, ACE_Barrier *barrier);
 
   virtual int svc (void);
 
   void set_stream (ACE_SOCK_Stream & stream);
-
 private:
+
+  int parse_args (int argc,char **argv);
   int bind_to_server (void);
 
   int establish_stream (void);
 
+
   TAO_ORB_Manager orb_manager_;
 
   TAO_Naming_Client my_name_client_;
 
-  ttcp_Endpoint_Reactive_Strategy_A ttcp_reactive_strategy_;
+  //  ttcp_Endpoint_Reactive_Strategy_A reactive_strategy_;
 
   TAO_AV_Endpoint_Reactive_Strategy_A<Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
 
   AVStreams::MMDevice_var server_mmdevice_;
 
-  TAO_MMDevice *client_mmdevice_;
+  TAO_MMDevice client_mmdevice_;
 
   TAO_StreamCtrl streamctrl_;
   // Video stream controller
 
   int argc_;
+
   char **argv_;
 
-  int task_id_;
-  // id of this task.
+  int block_size_;
+  // size of the block to be sent in Kilobytes.
+
+  int number_;
+  // number of times to send the block
+
+  ACE_Barrier *barrier_;
 
   ACE_SOCK_Stream stream_;
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
index fe09c7a6f3c..a3c6547f2cf 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/clnt.conf
@@ -1,6 +1,49 @@
-# $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl b/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
deleted file mode 100755
index fd49af4e915..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/run_test.pl
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-# -*- perl -*-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-$tao_root = $ENV{TAO_ROOT};
-# This is a Perl script that runs the Naming Service, client and servers
-
-unshift @INC, '../../../../../bin';
-require Process;
-require Uniqueid;
-
-# amount of delay between running the servers
-
-$sleeptime = 6;
-
-# variables for parameters
-
-$nsport = 20000 + uniqueid ();
-sub name_server
-{
-    my $args = "-ORBnameserviceport $nsport";
-    my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service"
-	.$Process::EXE_EXT;
-    print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n");
-    $NS = Process::Create ($prog, $args);
-}
-
-
-sub server
-{
-    my $args = "-ORBnameserviceport $nsport";
-    print ("\nServer: server$Process::EXE_EXT $args\n");
-    $SV = Process::Create ($EXEPREFIX."server$Process::EXE_EXT", $args);
-}
-
-
-sub client
-{
-    my $args = "-ORBnameserviceport $nsport";
-    print ("\nclient: client $args\n");
-    $CL = Process::Create ($EXEPREFIX."client$Process::EXE_EXT", $args);
-}
-
-name_server ();
-sleep $sleeptime;
-
-server ();
-sleep $sleeptime;
-
-client ();
-sleep $sleeptime;
-
-$NS->Kill ();
-$SV->Kill ();
-
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
index 6e58bc77123..2a785294dd2 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.cpp
@@ -5,120 +5,120 @@
 
 ACE_RCSID(benchmark, server, "$Id$")
 
-//  // AV_Server_Sig_Handler routines
-
-//  AV_Server_Sig_Handler::AV_Server_Sig_Handler (void)
-//  {
-//  }
-
-//  int
-//  AV_Server_Sig_Handler::register_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);
-//    //  ACE_DEBUG ((LM_DEBUG,"(%P|%t) sig_handler == %d\n",this->handle_));
-
-//    // 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 (TAO_ORB_Core_instance ()->reactor ()->register_handler
-//         (this, ACE_Event_Handler::NULL_MASK) == -1)
-//       ACE_ERROR_RETURN ((LM_ERROR, 
-//                          "%p\n", 
-//                          "register_handler"),
-//                         -1);
-
-//    // handles these signals.
-//     //   this->sig_set.fill_set ();
-//  //     this->sig_set.sig_add (SIGCHLD);  
-//  //     this->sig_set.sig_add (SIGBUS); 
-//  //     this->sig_set.sig_add (SIGINT); 
-//  //     this->sig_set.sig_add (SIGTERM);
+// AV_Server_Sig_Handler routines
+
+AV_Server_Sig_Handler::AV_Server_Sig_Handler (void)
+{
+}
+
+int
+AV_Server_Sig_Handler::register_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);
+  //  ACE_DEBUG ((LM_DEBUG,"(%P|%t) sig_handler == %d\n",this->handle_));
+
+  // 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 (TAO_ORB_Core_instance ()->reactor ()->register_handler
+       (this, ACE_Event_Handler::NULL_MASK) == -1)
+     ACE_ERROR_RETURN ((LM_ERROR, 
+                        "%p\n", 
+                        "register_handler"),
+                       -1);
+
+  // handles these signals.
+   //   this->sig_set.fill_set ();
+   this->sig_set.sig_add (SIGCHLD);  
+   this->sig_set.sig_add (SIGBUS); 
+   this->sig_set.sig_add (SIGINT); 
+   this->sig_set.sig_add (SIGTERM);
    
-//    // Register the signal handler object to catch the signals.  if
-//  //    if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
-//  //        (this->sig_set, this) == -1)
-//  //      ACE_ERROR_RETURN ((LM_ERROR, 
-//  //                         "%p\n", 
-//  //                         "register_handler"),
-//  //                      -1);
-//    return 0;
-//  }
-
-//  // Called by the ACE_Reactor to extract the fd.
-//  ACE_HANDLE
-//  AV_Server_Sig_Handler::get_handle (void) const
-//  {
-//    return this->handle_;
-//  }
-
-//  int 
-//  AV_Server_Sig_Handler::handle_input (ACE_HANDLE)
-//  {
-//    ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
-//    return 0;
-//  }
-
-//  int 
-//  AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
-//  {
-//    ACE_DEBUG ((LM_DEBUG, "(%t) 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
-//  //  AV_Server_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
-//  //  {
-//  //    ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
-
-//  //    // switch (signum)
-//  //  //     {
-//  //  //     case SIGCHLD:
-//  //  //       // Handle the death of child signal.
-//  //  //       this->clear_child (SIGCHLD);
-//  //  //       break;
-//  //  //     case SIGBUS:
-//  //  //       // Handle the Bus error signal
-//  //  //     case SIGINT:
-//  //  //       // Handle the interrupt signal
-//  //  //     case SIGTERM:
-//  //  //       // Handle the process termination signal.
-//  //  //       this->int_handler (signum);
-//  //  //       break;
-//  //  //     default:
-//  //  //       //      ACE_DEBUG ((LM_DEBUG, "(%P|%t) %S: not handled, returning to program\n", signum));
-//  //  //       break;
-//  //  //     }
-//  //    return 0;
-//  //  }
-
-//  AV_Server_Sig_Handler::~AV_Server_Sig_Handler (void)
-//  {
-//    TAO_ORB_Core_instance ()->reactor ()->remove_handler (this->sig_set);
-//  }
+  // Register the signal handler object to catch the signals.  if
+  if (TAO_ORB_Core_instance ()->reactor ()->register_handler 
+      (this->sig_set, this) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "%p\n", 
+                       "register_handler"),
+                      -1);
+  return 0;
+}
+
+// Called by the ACE_Reactor to extract the fd.
+ACE_HANDLE
+AV_Server_Sig_Handler::get_handle (void) const
+{
+  return this->handle_;
+}
+
+int 
+AV_Server_Sig_Handler::handle_input (ACE_HANDLE)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%t) handling asynchonrous input...\n"));
+  return 0;
+}
+
+int 
+AV_Server_Sig_Handler::shutdown (ACE_HANDLE, ACE_Reactor_Mask)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%t) 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
+AV_Server_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
+{
+  ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
+
+  // switch (signum)
+//     {
+//     case SIGCHLD:
+//       // Handle the death of child signal.
+//       this->clear_child (SIGCHLD);
+//       break;
+//     case SIGBUS:
+//       // Handle the Bus error signal
+//     case SIGINT:
+//       // Handle the interrupt signal
+//     case SIGTERM:
+//       // Handle the process termination signal.
+//       this->int_handler (signum);
+//       break;
+//     default:
+//       //      ACE_DEBUG ((LM_DEBUG, "(%P|%t) %S: not handled, returning to program\n", signum));
+//       break;
+//     }
+  return 0;
+}
+
+AV_Server_Sig_Handler::~AV_Server_Sig_Handler (void)
+{
+  TAO_ORB_Core_instance ()->reactor ()->remove_handler (this->sig_set);
+}
 
 
 //------------------------------------------------------------
 Server::Server (void)
-  :process_strategy_ (&process_options_),
-   reactive_strategy_(&orb_manager_),
-   mmdevice_ (0)
+  //  :process_strategy_ (&process_options_)
+  :reactive_strategy_(&orb_manager_)
 {
+  this->process_options_.command_line ("./child -ORBport 0 -ORBobjrefstyle url");
 }
 
         
@@ -128,6 +128,8 @@ Server::init (int argc,
               char *argv[],
               CORBA::Environment& env)
 {
+  int result;
+  
   // Initialize the orb_manager
   this->orb_manager_.init_child_poa (argc,
                                      argv,
@@ -142,10 +144,6 @@ Server::init (int argc,
   PortableServer::POA_var child_poa = 
     this->orb_manager_.child_poa ();
 
-
-  int result = this->parse_args (argc,argv);
-  if (result == -1)
-    ACE_ERROR_RETURN  ((LM_ERROR,"parse args failed\n"),-1);
   // Initialize the naming services
 
   if (my_name_client_.init (orb.in ()) != 0)
@@ -155,21 +153,10 @@ Server::init (int argc,
 		      -1);  
   
   // Register the video mmdevice object with the ORB
-  switch (this->strategy_)
-    {
-    case REACTIVE_STRATEGY:
-      ACE_NEW_RETURN (this->mmdevice_,
-                      TAO_MMDevice (&this->reactive_strategy_),
-                      -1);
-      break;
-    case PROCESS_STRATEGY:
-      ACE_NEW_RETURN (this->mmdevice_,
-                      TAO_MMDevice (&this->process_strategy_),
-                      -1);
-      break;
-    default:
-      ACE_ERROR_RETURN ((LM_ERROR,"Invalid strategy\n"),-1);
-    }
+  ACE_NEW_RETURN (this->mmdevice_,
+                  //                  TAO_MMDevice (&this->process_strategy_),
+                  TAO_MMDevice (&this->reactive_strategy_),
+                  -1);
 
   // create the video server mmdevice with the naming service pointer.
   this->orb_manager_.activate_under_child_poa ("Bench_Server_MMDevice",
@@ -204,43 +191,11 @@ Server::init (int argc,
   return 0;
 }
 
-int
-Server::parse_args (int argc,char **argv)
-{
-  ACE_Get_Opt opts (argc,argv,"pr");
-
-  char child_name [BUFSIZ], buf[BUFSIZ];
-  ACE_OS::strcpy (child_name,"child_process");
-  this->strategy_ = REACTIVE_STRATEGY;
-  char c;
-  while ((c = opts ()) != -1)
-    {
-      switch (c)
-        {
-        case 'p':
-          // process based strategy
-          this->strategy_  = PROCESS_STRATEGY;
-          break;
-        case 'r':
-          this->strategy_  = REACTIVE_STRATEGY;
-          break;
-        case 'c':
-          ACE_OS::strcpy (child_name,opts.optarg);
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,"Usage: server [-p/-r]"),-1);
-          break;
-        }
-    }
-  ACE_OS::sprintf (buf,"%s -ORBport 0 -ORBobjrefstyle url",child_name);
-  this->process_options_.command_line (buf);
-  return 0;
-}
-
-// Runs the server
+// Runs the mpeg server
 int
 Server::run (CORBA::Environment& env)
 {
+  int result;
   // Run the ORB event loop
   while (1)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/server.h b/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
index df3e11256ec..d311a84a357 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/server.h
@@ -74,11 +74,6 @@ public:
 
   ~Server (void);
 private:
-
-  enum strategy {PROCESS_STRATEGY=0,REACTIVE_STRATEGY=1};
-  int parse_args (int argc, char **argv);
-  // parses the arguments.
-
   TAO_ORB_Manager orb_manager_;
   // the TAO ORB manager.
 
@@ -93,7 +88,7 @@ private:
   ACE_Process_Options process_options_;
   // The process options for the process to be spawned by the process strategy
 
-  TAO_AV_Endpoint_Process_Strategy_B process_strategy_;
+  //  TAO_AV_Endpoint_Process_Strategy_B process_strategy_;
   // The proces strategy for the video.
 
   TAO_AV_Endpoint_Reactive_Strategy_B <Bench_Server_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> reactive_strategy_;
@@ -101,9 +96,6 @@ private:
 
   TAO_MMDevice *mmdevice_;
   // The video server multimedia device
-
-  strategy strategy_;
-  // flag indicating strategy.
 };
 
 #endif /* TAO_AV_BENCH_SERVER_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
index 52fbde787d4..8b10c3c7e53 100644
--- a/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/benchmark/svc.conf
@@ -1,6 +1,50 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am
deleted file mode 100644
index 1a6e6484914..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- mpeg directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        source
-
-EXTRA_DIST = \
-        INSTALL.UCB \
-        PatchLevel \
-        README \
-        README.MI \
-        README.OGI \
-        README.UCB \
-        vcr.1 \
-        vcrs.1
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
deleted file mode 100644
index bdcffaba0c7..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- mpeg/source directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        client \
-        mpeg_client \
-        mpeg_mib \
-        mpeg_server \
-        mpeg_shared \
-        server
-
-EXTRA_DIST = TODO
-
-dist-hook:
-        $(mkinstalldirs) $(distdir)/$(subdir)
-        tar cf - ./include | (cd $(distdir)/$(subdir); tar xfBp -)
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
index f7a4dea4ec8..95436fd25e1 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile
@@ -4,29 +4,27 @@
 #
 #----------------------------------------------------------------------------
 
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
+MAKEFILE = Makefile
+BIN = vcr
+
+BUILD = $(BIN)
 
 # On non-Windows environment, we should at least define
 # the export_include IDL flag.
-FILES = vcr
+FILES= vcr
 
 DEFS    = $(addsuffix .h,$(FILES))
 LSRC	= $(addsuffix .cpp,$(FILES))
 
+
 LIBS 	+= -lTAO -lACE -lorbsvcs
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT)
 
-BIN2 = vcr
+ifndef TAO_ROOT
+TAO_ROOT = $(ACE_ROOT)/TAO
+endif
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # AV
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -48,8 +46,11 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -lmpeg_shared -lmpeg_mib -lmpeg_client -lXm  -lXext -lXt -lSM -lICE  -lX11  -lsocket -lnsl -ldl
 CPPFLAGS += -i -DSH_MEM -DNDEBUG -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -59,6 +60,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -70,9 +72,6 @@ realclean: clean
  $(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 \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/proto.h \
@@ -80,58 +79,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/global.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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/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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(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/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 \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.h
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/dither.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
deleted file mode 100644
index a795144da28..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- mpeg/source/client directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = vcr
-
-vcr_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-vcr_SOURCES = \
-        vcr.cpp
-
-noinst_DATA = svc.conf
-
-EXTRA_DIST = $(noinst_DATA)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
index a5a704c4cdc..43c6a486c92 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/svc.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
index 728d3c5103b..d231869cbc8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/client/vcr.cpp
@@ -78,7 +78,6 @@
 #include "mpeg_client/dither.h"
 
 #include "mpeg_shared/routine.h"
-#include "mpeg_client/ab.h"
 
 ACE_RCSID(client, vcr, "$Id$")
 
@@ -140,54 +139,50 @@ usage(char *s)	/* program name */
  */
 
 static int on_exit_tag = 1;
-extern AudioBuffer *abuffer;
-extern VideoBuffer *vbuffer;
 
 void set_exit_routine_tag(int tag)
 {
   on_exit_tag = tag;
 }
-
 void on_exit_routine(void)
 {
-  ACE_DEBUG ((LM_DEBUG,"(%P)on_exit_routine"));
   if (!on_exit_tag)
     return;
-  if (mainPid ==ACE_OS::getpid ())
+  if (mainPid == getpid())
   {
     extern void delete_semaphore();
-    abuffer->ABdeleteSem ();
-    vbuffer->VBdeleteSem ();
+    ABdeleteSem();
+    VBdeleteSem();
     VDdeleteSem();
     delete_semaphore();
     if (getuid() != DEVELOPER_UID)
     {
       FILE * fp;
-      char *buf = (char *)ACE_OS::malloc(100);
+      char *buf = (char *)malloc(100);
       char *tbuf;
       if (buf != NULL) {
 	sprintf(buf, "%s%s", LOG_DIR, "vcrSession.log");
 	if ((fp = fopen(buf, "a")) != NULL) {
-	  time_t val =ACE_OS::time (NULL);
+	  time_t val = time(NULL);
 	  get_hostname(buf, 100);
 	  buf[99] = 0;
-	  tbuf = ACE_OS::ctime (&start_time);
+	  tbuf = ctime(&start_time);
 	  tbuf[strlen(tbuf) - 1] = 0;
-	  fprintf(fp, "User %d on %s at %s %dm%ds\n", ACE_OS::getuid (), buf,
+	  fprintf(fp, "User %d on %s at %s %dm%ds\n", getuid(), buf,
 		  tbuf, (val - start_time) / 60, (val - start_time) % 60);
 	}
-	ACE_OS::free (buf);
+	free(buf);
       }
     }
   }
   on_exit_tag = 0;
   cerr << "Main process sending SIGINT\n";
-  ACE_OS::kill (0, SIGINT);
+  kill(0, SIGINT);
 }
 
 static void int_handler(int sig)
 {
-  ACE_OS::exit (0);
+  exit(0);
 }
 
 static void clear_child(int sig)
@@ -195,7 +190,7 @@ static void clear_child(int sig)
   int pid;
   int status;
   
-  while ((pid = ACE_OS::waitpid (-1, &status, WNOHANG)) > 0)
+  while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
   {
     if (status == 0) {
       continue;
@@ -259,100 +254,113 @@ int main(int argc, char ** argv)
   shmemFlag = 0;
 #endif
 
+//   if (getenv("DISPLAY")!= NULL)
+//   {
+//     char * disp = getenv("DISPLAY");
+//     if (strncmp(disp, "anquetil:0", 10) == 0 ||
+// 	strncmp(disp, "helix:0", 7) == 0 ||
+// 	strncmp(disp, "hinault:0", 9) == 0 ||
+// 	strncmp(disp, "lemond:0", 8) == 0 ||
+// 	strncmp(disp, "indurain:0", 10) == 0)
+//       ditherType = ORDERED_DITHER;
+//     else
+//       ditherType = ORDERED_DITHER;
+//   }
+
   while (argc) {
-    if (ACE_OS::strcmp (argv[mark], "-rt") == 0) {
+    if (strcmp(argv[mark], "-rt") == 0) {
       realTimeFlag = 1;
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-rt1") == 0) {
+    else if (strcmp(argv[mark], "-rt1") == 0) {
       realTimeFlag = 2;
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-rt2") == 0) {
+    else if (strcmp(argv[mark], "-rt2") == 0) {
       realTimeFlag = 3;
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-shmem") == 0) {
+    else if (strcmp(argv[mark], "-shmem") == 0) {
       argc--; mark++;
       shmemFlag = 1;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-rmsem") == 0) {
+    else if (strcmp(argv[mark], "-rmsem") == 0) {
       argc--; mark++;
       rmsemFlag = 1;
     }
 #if 0
-    else if (ACE_OS::strcmp (argv[mark], "-nop") == 0) {
+    else if (strcmp(argv[mark], "-nop") == 0) {
       TogglePFlag();
       argc--; mark++;
-    } else if (ACE_OS::strcmp (argv[mark], "-nob") == 0) {
+    } else if (strcmp(argv[mark], "-nob") == 0) {
       ToggleBFlag();
       argc--; mark++;
     }
 #endif
-    else if (ACE_OS::strcmp (argv[mark], "-l") == 0) {   /* program list file name */
+    else if (strcmp(argv[mark], "-l") == 0) {   /* program list file name */
       strcpy(proglistName, argv[++mark]);
       argc -= 2; mark++;
       
-    } else if (ACE_OS::strcmp (argv[mark], "-display") == 0) {
+    } else if (strcmp(argv[mark], "-display") == 0) {
       strcpy(displayName,argv[++mark]);
       argc -= 2; mark++;
-    } else if (ACE_OS::strcmp (argv[mark], "-dither") == 0) {
+    } else if (strcmp(argv[mark], "-dither") == 0) {
       argc--; mark++;
       if (argc < 1) {
 	perror("Must specify dither option after -dither flag");
 	usage(argv[0]);
       }
-      if (ACE_OS::strcmp (argv[mark], "hybrid") == 0) {
+      if (strcmp(argv[mark], "hybrid") == 0) {
 	argc--; mark++;
 	ditherType = HYBRID_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "hybrid2") == 0) {
+      } else if (strcmp(argv[mark], "hybrid2") == 0) {
 	argc--; mark++;
 	ditherType = HYBRID2_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "fs4") == 0) {
+      } else if (strcmp(argv[mark], "fs4") == 0) {
 	argc--; mark++;
 	ditherType = FS4_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "fs2") == 0) {
+      } else if (strcmp(argv[mark], "fs2") == 0) {
 	argc--; mark++;
 	ditherType = FS2_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "fs2fast") == 0) {
+      } else if (strcmp(argv[mark], "fs2fast") == 0) {
 	argc--; mark++;
 	ditherType = FS2FAST_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "hybrid2") == 0) {
+      } else if (strcmp(argv[mark], "hybrid2") == 0) {
 	argc--; mark++;
 	ditherType = HYBRID2_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "2x2") == 0) {
+      } else if (strcmp(argv[mark], "2x2") == 0) {
 	argc--; mark++;
 	ditherType = Twox2_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "gray") == 0) {
+      } else if (strcmp(argv[mark], "gray") == 0) {
 	argc--; mark++;
 	ditherType = GRAY_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "color") == 0) {
+      } else if (strcmp(argv[mark], "color") == 0) {
 	argc--; mark++;
 	ditherType = FULL_COLOR_DITHER;
       }
       /*
-      else if (ACE_OS::strcmp (argv[mark], "none") == 0) {
+      else if (strcmp(argv[mark], "none") == 0) {
 	argc--; mark++;
 	ditherType = NO_DITHER;
       }
       */
-      else if (ACE_OS::strcmp (argv[mark], "ordered") == 0) {
+      else if (strcmp(argv[mark], "ordered") == 0) {
 	argc--; mark++;
 	ditherType = ORDERED_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "ordered2") == 0) {
+      } else if (strcmp(argv[mark], "ordered2") == 0) {
 	argc--; mark++;
 	ditherType = ORDERED2_DITHER;
       }
       /*
-      else if (ACE_OS::strcmp (argv[mark], "mbordered") == 0) {
+      else if (strcmp(argv[mark], "mbordered") == 0) {
 	argc--; mark++;
 	ditherType = MBORDERED_DITHER;
       }
       */
-      else if (ACE_OS::strcmp (argv[mark], "mono") == 0) {
+      else if (strcmp(argv[mark], "mono") == 0) {
 	argc--; mark++;
 	ditherType = MONO_DITHER;
-      } else if (ACE_OS::strcmp (argv[mark], "threshold") == 0) {
+      } else if (strcmp(argv[mark], "threshold") == 0) {
 	argc--; mark++;
 	ditherType = MONO_THRESHOLD;
       } else {
@@ -360,38 +368,38 @@ int main(int argc, char ** argv)
 	usage(argv[0]);
       }
     }
-    else if (ACE_OS::strcmp (argv[mark], "-quiet") == 0) {
+    else if (strcmp(argv[mark], "-quiet") == 0) {
       argc--; mark++;
       quietFlag = 1;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-l_range") == 0) {
+    else if (strcmp(argv[mark], "-l_range") == 0) {
       argc--; mark++;
-      LUM_RANGE =ACE_OS::atoi (argv[mark]);
+      LUM_RANGE = atoi(argv[mark]);
       if (LUM_RANGE < 1) {
 	fprintf(stderr, "Illegal luminance range value: %d\n", LUM_RANGE);
 	exit(1);
       }
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-cr_range") == 0) {
+    else if (strcmp(argv[mark], "-cr_range") == 0) {
       argc--; mark++;
-      CR_RANGE =ACE_OS::atoi (argv[mark]);
+      CR_RANGE = atoi(argv[mark]);
       if (CR_RANGE < 1) {
 	fprintf(stderr, "Illegal cr range value: %d\n", CR_RANGE);
 	exit(1);
       }
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-cb_range") == 0) {
+    else if (strcmp(argv[mark], "-cb_range") == 0) {
       argc--; mark++;
-      CB_RANGE =ACE_OS::atoi (argv[mark]);
+      CB_RANGE = atoi(argv[mark]);
       if (CB_RANGE < 1) {
 	fprintf(stderr, "Illegal cb range value: %d\n", CB_RANGE);
 	exit(1);
       }
       argc--; mark++;
     }
-    else if (ACE_OS::strcmp (argv[mark], "-help") == 0) {
+    else if (strcmp(argv[mark], "-help") == 0) {
       usage(argv[0]);
     }
     else {
@@ -409,9 +417,21 @@ int main(int argc, char ** argv)
   if (ditherType == MBORDERED_DITHER)
   {
     fprintf(stderr, "Sorry, mbordered dithertype no longer supported.\n");
-    ACE_OS::exit (1);
+    exit(1);
   }
+  //  setsignal(SIGCHLD, clear_child);
+  //  setsignal(SIGINT, int_handler);
+  //  setsignal(SIGHUP, int_handler);
+  /*
+  setsignal(SIGKILL, int_handler);
+  setsignal(SIGSEGV, int_handler);
+  */
+  //  setsignal(SIGQUIT, int_handler);
+  //  setsignal(SIGTERM, int_handler);
+  //  setsignal(SIGALRM, SIG_IGN);
   setsignal(SIGPIPE, SIG_IGN);
+
+
   atexit (on_exit_routine);
   
   if (rmsemFlag) {
@@ -430,18 +450,16 @@ int main(int argc, char ** argv)
 	    int id;
 	    sscanf(&buf[1], "%d", &id);
 	    if (buf[0] == 'm') {
-	     ACE_OS::shmctl (id, IPC_RMID, NULL);
+	      shmctl(id, IPC_RMID, NULL);
 	    }
 	    else if (buf[0] == 's') {
-              union semun sem_union;
-              sem_union.val = 0;
-	      ACE_OS::semctl (id, 0, IPC_RMID, sem_union);
+	      semctl(id, 0, IPC_RMID, 0);
 	    }
 	  }
 	  fclose(fp);
-	  ACE_OS::unlink (tmpf);
+	  unlink(tmpf);
 	}
-	ACE_OS::free (tmpf);
+	free(tmpf);
       }
     }
   }
@@ -449,15 +467,15 @@ int main(int argc, char ** argv)
   if (quietFlag) {
     if ((freopen("/dev/null", "w", stdout) == NULL) ||
 	(freopen("/dev/null", "w", stderr) == NULL)) {
-      ACE_OS::exit (10);
+      exit(10);
     }
   }
   
-  start_time = ACE_OS::time (NULL);
+  start_time = time(NULL);
 
-  ACE_OS::setsid ();  /* break controlling terminal and creat a new session */
+  setsid();  /* break controlling terminal and creat a new session */
 
-  mainPid = ACE_OS::getpid ();
+  mainPid = getpid();
 
   CTRmain(orig_argc,orig_argv);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
index a2fbb40b4e2..140ba26e82c 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/include/common.h
@@ -357,13 +357,9 @@ typedef struct
 // to terminate the event loop
 #define CmdExit  34
 
-
 // cmd sent by Java GUI to Controller process
 #define CmdJINIT 35
 
-#define EXIT 36
-#define DECODED 37
-
 /* CTR-VS */
 
 /* CmdINITvideo: followd by parameters of a fixed structure of 3 integers
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp
index 87931de7f58..6ec8d2bc06d 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/24bit.cpp
@@ -80,10 +80,10 @@ InitColorDither()
 {
     int CR, CB, i;
 
-    Cr_b_tab = (int *)ACE_OS::malloc(256*sizeof(int));
-    Cr_g_tab = (int *)ACE_OS::malloc(256*sizeof(int));
-    Cb_g_tab = (int *)ACE_OS::malloc(256*sizeof(int));
-    Cb_r_tab = (int *)ACE_OS::malloc(256*sizeof(int));
+    Cr_b_tab = (int *)malloc(256*sizeof(int));
+    Cr_g_tab = (int *)malloc(256*sizeof(int));
+    Cb_g_tab = (int *)malloc(256*sizeof(int));
+    Cb_r_tab = (int *)malloc(256*sizeof(int));
 
     for (i=0; i<256; i++) {
 	CB = CR = i;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp
index 06bf6ab7fac..f12a0e070e5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/2x2.cpp
@@ -91,7 +91,7 @@ Init2x2Dither()
 
   numcodes =  l_range * cr_range * cb_range;
 
-  dith_a = (unsigned char *) ACE_OS::malloc(numcodes*4);
+  dith_a = (unsigned char *) malloc(numcodes*4);
 
   dith_ca =  dith_a;
 
@@ -183,8 +183,8 @@ void RandInit(int h, int w)
 {
   int i;
 
-  randval_a = (int *) ACE_OS::malloc(w*5*sizeof(int));
-  randptr_a = (int **) ACE_OS::malloc(h*sizeof(int *));
+  randval_a = (int *) malloc(w*5*sizeof(int));
+  randptr_a = (int **) malloc(h*sizeof(int *));
 
 #ifdef NO_LRAND48
   for (i=0; i<w*5; i++) {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
index dfd21ba020e..c2f7ee71f77 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.cpp
@@ -29,16 +29,15 @@ Command_Handler::Command_Handler (ACE_HANDLE command_handle)
    audio_streamctrl_ (0),
    receiver_ (this),
    data_host_ (0),
-   client_sig_handler_ (this),
-   notification_handler_ (this)
+   client_sig_handler_ (this)
 {
 }
 
 Command_Handler::~Command_Handler (void)
 {
-  //  this->remove_handlers ();
-  if (ACE_OS::getpid () == CTRpid)
-    ::remove_all_semaphores ();
+  TAO_ORB_Core_instance ()->reactor ()->remove_handler (this,
+                                                        ACE_Event_Handler::READ_MASK);
+  ::remove_all_semaphores ();
 }
 
 int
@@ -95,6 +94,16 @@ Command_Handler::init (int argc,
                                          TAO_TRY_ENV);
       TAO_CHECK_ENV;
       // activate the client video mmdevice under the child poa.
+//       this->orb_manager_.activate_under_child_poa ("Video_Client_MMDevice",
+//                                                     &this->video_client_mmdevice_,
+//                                                     TAO_TRY_ENV);
+//       TAO_CHECK_ENV;
+//       // activate the client audio mmdevice under the child poa.
+//       this->orb_manager_.activate_under_child_poa ("Audio_Client_MMDevice",
+//                                                    &this->audio_client_mmdevice_,
+//                                                    TAO_TRY_ENV);
+//       TAO_CHECK_ENV;
+
       ior = this->orb_manager_.activate (&this->receiver_,
                                          TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -125,11 +134,6 @@ Command_Handler::init (int argc,
                            "(%P|%t) register_handler for sig_handler failed\n"),
                           -1);
 
-      if (TAO_ORB_Core_instance ()->reactor ()->register_handler (&this->notification_handler_,
-                                                                  ACE_Event_Handler::READ_MASK) < 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) register_handler for notification handler failed\n"),
-                          -1);
     }
   TAO_CATCHANY
     {
@@ -188,6 +192,23 @@ Command_Handler::resolve_audio_reference (void)
           this->audio_mmdevice_ior_ = (char *)0;
           return 0;
         }
+//       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);
+//       CORBA::String_var naming_ior =
+//         this->orb_manager_.orb ()->object_to_string (naming_obj,
+//                                                      TAO_TRY_ENV);
+//       TAO_CHECK_ENV;
+
+//       if (TAO_debug_level)
+//         ACE_DEBUG ((LM_DEBUG,"Naming service is :%s\n",naming_ior.in ()));
+//       CosNaming::NamingContext_var naming_context =
+//         CosNaming::NamingContext::_narrow (naming_obj.in (),
+//                                            TAO_TRY_ENV);
+//       TAO_CHECK_ENV;
 
       CosNaming::Name audio_server_mmdevice_name (1);
 
@@ -287,6 +308,7 @@ Command_Handler::get_handle (void) const
 int
 Command_Handler::handle_input (ACE_HANDLE fd)
 {
+  //  cerr << "(" << getpid () << " Command_Handler::handle_input:busy_ = " << this->busy_ << endl;
   unsigned char cmd;
   int val;
 
@@ -371,7 +393,7 @@ Command_Handler::handle_input (ACE_HANDLE fd)
               }
             default:
               fprintf(stderr, "CTR: unexpected command from UI: cmd = %d.\n", cmd);
-              ACE_OS::exit (1);
+              exit(1);
               break;
             }
           this->busy_ = 0;
@@ -407,10 +429,7 @@ Command_Handler::init_av (void)
       if (audioSocket >= 0)
          {
            if (ABpid > 0) {
-             ACE_DEBUG ((LM_DEBUG,"killing the abprocess\n"));
-             char message[BUFSIZ];
-             message [0] = EXIT;
-             ACE_OS::write (asp[0],&message,BUFSIZ);
+             kill(ABpid, SIGUSR1);
              ABpid = -1;
            }
            usleep(10000);
@@ -418,15 +437,13 @@ Command_Handler::init_av (void)
        if (videoSocket >= 0)
          {
            if (VBpid > 0) {
-             char message[BUFSIZ];
-             message [0] = EXIT;
-             ACE_OS::write (vsp[0],&message,BUFSIZ);
+             kill(VBpid, SIGUSR1);
              VBpid = -1;
            }
            usleep(10000);
 
            videoSocket = -1;
-           while ((!vbuffer->VBbufEmpty()) || !VDbufEmpty()) {
+           while ((!VBbufEmpty()) || !VDbufEmpty()) {
              while (VDpeekMsg() != NULL) {
                VDreclaimMsg(VDgetMsg());
              }
@@ -444,7 +461,6 @@ Command_Handler::init_av (void)
   af [0]=0;
 
   NewCmd(CmdINIT);
-
   i = 0;
   result = OurCmdRead((char*)&i, 4);
   result = OurCmdRead(vf, i);
@@ -462,9 +478,7 @@ Command_Handler::init_av (void)
 
   if (af[0] != 0)
     {
-      if ((result =init_audio_channel(af)) > 0)
-        return result;
-      else if (result < 0)
+      if (init_audio_channel(af) != 0)
         {
           audioSocket = -1;
           shared->totalSamples = 0;
@@ -485,9 +499,7 @@ Command_Handler::init_av (void)
   if (vf[0] != 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) Initializing video\n"));
-      if ((result = this->init_video_channel(vf)) > 0)
-        return result;
-      else if (result < 0)
+      if (this->init_video_channel(vf))
         {
           shared->totalFrames = 0;      /* disable video channel */
           videoSocket = -1;
@@ -524,14 +536,13 @@ Command_Handler::init_av (void)
       set_speed();
       if (videoSocket >= 0)
         this->wait_for_display (INIT);
-      CmdWrite(&tmp, 1);
-      if (videoSocket < 0)
-        {
-          tmp = CmdVPclearScreen;
-          CmdWrite(&tmp, 1);
-        }
-      cerr << "returning from init_av \n";
-      return 0;
+//       CmdWrite(&tmp, 1);
+//       if (videoSocket < 0)
+//         {
+//           tmp = CmdVPclearScreen;
+//           CmdWrite(&tmp, 1);
+//         }
+//       return 0;
     }
   cerr << "returning from init_av \n";
   return 0;
@@ -566,9 +577,7 @@ Command_Handler::init_java_av (char *audio_ior,
         {
           if (ABpid > 0) {
             ACE_DEBUG ((LM_DEBUG,"Killing AB Process\n"));
-            char message[BUFSIZ];
-            message [0] = EXIT;
-            ACE_OS::write (asp[0],&message,BUFSIZ);
+            kill(ABpid, SIGUSR1);
             ABpid = -1;
           }
           usleep(10000);
@@ -577,15 +586,13 @@ Command_Handler::init_java_av (char *audio_ior,
       if (videoSocket >= 0)
         {
           if (VBpid > 0) {
-            char message[BUFSIZ];
-            message [0] = EXIT;
-            ACE_OS::write (vsp[0],&message,BUFSIZ);
+            kill(VBpid, SIGUSR1);
             VBpid = -1;
           }
           usleep(10000);
 
           videoSocket = -1;
-          while ((!vbuffer->VBbufEmpty()) || !VDbufEmpty()) {
+          while ((!VBbufEmpty()) || !VDbufEmpty()) {
             while (VDpeekMsg() != NULL) {
               VDreclaimMsg(VDgetMsg());
             }
@@ -605,10 +612,7 @@ Command_Handler::init_java_av (char *audio_ior,
 
   if (audio_file!= 0)
     {
-      int result;
-      if ((result = init_audio_channel(audio_file)) > 0)
-        return result;
-      else if (result < 0)
+      if (init_audio_channel(audio_file))
         {
           audioSocket = -1;
           shared->totalSamples = 0;
@@ -629,9 +633,7 @@ Command_Handler::init_java_av (char *audio_ior,
   if (video_file!= 0)
     {
       ACE_DEBUG ((LM_DEBUG,"(%P|%t) Initializing video\n"));
-      if ((result = this->init_video_channel(video_file)) > 0)
-        return result;
-      else if (result < 0)
+      if (this->init_video_channel(video_file))
         {
           shared->totalFrames = 0;      /* disable video channel */
           videoSocket = -1;
@@ -710,7 +712,7 @@ Command_Handler::init_audio_channel (char *audiofile)
     para->para.channels = shared->AFPara.channels;
     para->para.samplesPerSecond = shared->AFPara.samplesPerSecond;
     para->para.bytesPerSample = shared->AFPara.bytesPerSample;
-    para->nameLength =ACE_OS::strlen (audiofile)+1;
+    para->nameLength = strlen(audiofile)+1;
 
     para->audiofile.length (strlen(audiofile));
 
@@ -766,43 +768,35 @@ Command_Handler::init_audio_channel (char *audiofile)
     {
       if (ABpid == -1)
         {
-          switch (ABpid = ACE_OS::fork ())
+          switch (ABpid = fork())
             {
             case -1:
-             ACE_OS::perror ("CTR error on forking AB process");
-              ACE_OS::exit (1);
+              perror("CTR error on forking AB process");
+              exit(1);
               break;
             case 0:
-              {
-                if (realTimeFlag) {
-                  SetRTpriority("AB", -1);
-                }
-                ACE_OS::free (vh);
-                ACE_OS::free (vf);
-                ACE_OS::free (ah);
-                ACE_OS::free (audiofile);
-                vbuffer->VBdeleteBuf();
-                VDdeleteBuf();
-                if (cmdSocket >= 0)
-                  ACE_OS::close(cmdSocket);
-                if (realTimeFlag >= 2) {
+              if (realTimeFlag) {
+                SetRTpriority("AB", -1);
+              }
+              free(vh);
+              free(vf);
+              free(ah);
+              free(audiofile);
+              VBdeleteBuf();
+              VDdeleteBuf();
+              if (cmdSocket >= 0)
+                ::close(cmdSocket);
+              if (realTimeFlag >= 2) {
 #ifdef __svr4__
-                  if (SetRTpriority("AB", 0)) realTimeFlag = 0;
+                if (SetRTpriority("AB", 0)) realTimeFlag = 0;
 #elif defined(_HPUX_SOURCE)
-                  if (SetRTpriority("AB", 1)) realTimeFlag = 0;
+                if (SetRTpriority("AB", 1)) realTimeFlag = 0;
 #endif
-                }
-                abuffer->ABprocess(this->audio_data_handle_);
-                //                this->remove_handlers ();
-                // Before shutting down the orb remove all the handlers registered with it.
-                ACE_DEBUG ((LM_DEBUG,"(%P|%t) Before shutdown"));
-                this->orb_manager_.orb ()->shutdown ();
-                ACE_DEBUG ((LM_DEBUG,"(%P|%t) After shutdown"));
-                return 1;
               }
+              ABprocess(this->audio_data_handle_);
               break;
             default:
-              abuffer->ABflushBuf(0);
+              ABflushBuf(0);
               break;
             }
         }
@@ -812,11 +806,15 @@ Command_Handler::init_audio_channel (char *audiofile)
   return 0;
 }
 
-int
-Command_Handler::remove_handlers (void)
-{
-  return 0;
-}
+// void
+// Command_Handler::stop_timer (void)
+// {
+//   ACE_Time_Value tv;
+//   this->timer_.stop ();
+//   this->timer_.elapsed_time (tv);
+//   //  tv.dump ();
+//   //  this->timer_.dump ();
+// }
 
 void
 Command_Handler::set_mmdevice (CORBA::Object_ptr audio_mmdevice,
@@ -957,7 +955,7 @@ Command_Handler::init_video_channel (char *videofile)
         for (i=0;i<shared->patternSize;i++)
           shared->pattern[i] = reply->pattern [i];
         for (i = 1; i < PATTERN_SIZE / shared->patternSize; i ++) {
-          //         ACE_OS::memcpy (ptr, shared->pattern, shared->patternSize);
+          //         memcpy(ptr, shared->pattern, shared->patternSize);
           for (int j=0; j < shared->patternSize ;j++)
             ptr [j] = shared->pattern [j];
           ptr += shared->patternSize;
@@ -975,7 +973,7 @@ Command_Handler::init_video_channel (char *videofile)
       {
         fprintf(stderr, "CTR Error: patternSize %d greater than PATTERN_SIZE %d.\n",
                 shared->patternSize, PATTERN_SIZE);
-        ACE_OS::exit (1);
+        exit(1);
       }
     fprintf(stderr, "Video: %s, %s\n",
             shared->videoFormat == VIDEO_SIF ? "SIF" :
@@ -1020,33 +1018,33 @@ Command_Handler::init_video_channel (char *videofile)
                          shared->videoMaxPktSize >= 0 ? SOCK_STREAM :
                          SOCK_DGRAM, 0, sp) == -1)
             {
-             ACE_OS::perror ("CTR error on open CTR-VB socketpair");
-              ACE_OS::exit (1);
+              perror("CTR error on open CTR-VB socketpair");
+              exit(1);
             }
     
       if (VBpid == -1)
         {
-          switch (VBpid = ACE_OS::fork ())
+          switch (VBpid = fork())
             {
             case -1:
-             ACE_OS::perror ("CTR error on forking VB process");
-              ACE_OS::exit (1);
+              perror("CTR error on forking VB process");
+              exit(1);
               break;
             case 0:
               ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
               if (realTimeFlag) {
                 SetRTpriority("VB", -1);
               }
-              ACE_OS::free (vh);
-              ACE_OS::free (videofile);
-              ACE_OS::free (ah);
-              ACE_OS::free (af);
+              free(vh);
+              free(videofile);
+              free(ah);
+              free(af);
               ::close(sp[0]);
               //::close (videoSocket);
               //          if (audioSocket >= 0)
               //            ComCloseFd(audioSocket);
               ::close (audioSocket);
-              abuffer->ABdeleteBuf();
+              ABdeleteBuf();
               VDdeleteBuf();
               if (cmdSocket >= 0)
                 ::close(cmdSocket);
@@ -1057,17 +1055,7 @@ Command_Handler::init_video_channel (char *videofile)
                 if (SetRTpriority("VB", 1)) realTimeFlag = 0;
 #endif
               }
-              if (vbuffer->VBprocess(sp[1], this->video_data_handle_) == -1)
-                {
-                  ACE_DEBUG ((LM_DEBUG,"VBprocess exiting as init failed\n"));
-                  ACE_OS::exit (2);
-                }
-              else
-                {
-                  //                  this->remove_handlers ();
-                  this->orb_manager_.orb ()->shutdown ();
-                  return 1;
-                }
+              VBprocess(sp[1], this->video_data_handle_);
               break;
             default:
               ::close(sp[1]);
@@ -1075,13 +1063,13 @@ Command_Handler::init_video_channel (char *videofile)
               {
                 int bytes, res;
                 /* passing all messages of INIT frame to VB here. */
-                char * buf = (char *)ACE_OS::malloc(INET_SOCKET_BUFFER_SIZE);
+                char * buf = (char *)malloc(INET_SOCKET_BUFFER_SIZE);
                 VideoMessage *msg = (VideoMessage *)buf;
                 int pkts = 1, msgo = 0, msgs = 0;
 
                 if (buf == NULL) {
-                 ACE_OS::perror ("CTR error on ACE_OS::malloc() for INIT frame");
-                  ACE_OS::exit (1);
+                  perror("CTR error on malloc() for INIT frame");
+                  exit(1);
                 }
                 while (msgo + msgs < pkts) {
                   //              ACE_DEBUG ((LM_DEBUG, "(%P|%t) Reached line %d in %s\n", __LINE__, __FILE__));
@@ -1111,10 +1099,10 @@ Command_Handler::init_video_channel (char *videofile)
 
                     VideoRead(buf + sizeof(*msg), msgs);
                     bytes = sizeof(*msg) + msgs;
-                    while ((res = ACE_OS::write (sp[0], buf, bytes)) == -1) {
+                    while ((res = write(sp[0], buf, bytes)) == -1) {
                       if (errno == EINTR || errno == ENOBUFS) continue;
-                     ACE_OS::perror ("CTR error on sending INIT frame to VB");
-                      ACE_OS::exit (1);
+                      perror("CTR error on sending INIT frame to VB");
+                      exit(1);
                     }
                     if (res < bytes) {
                       fprintf(stderr, "CTR warn: send() res %dB < bytes %dB\n", res, bytes);
@@ -1126,10 +1114,9 @@ Command_Handler::init_video_channel (char *videofile)
                     */
                   }
                 }
-                ACE_OS::read (sp[0], buf, 1); /* read a garbage byte, to sync with VB */
-                ACE_DEBUG ((LM_DEBUG,"(%P|%t) Command process read a garbage bytes\n"));
+                read(sp[0], buf, 1); /* read a garbage byte, to sync with VB */
                 ::close(sp[0]);
-                ACE_OS::free (buf);
+                free(buf);
               }
               break;
             }
@@ -1151,66 +1138,62 @@ Command_Handler::stat_stream (CORBA::Char_out ch,
 int
 Command_Handler::close (void)
 {
-  TAO_TRY
-    {
-      if (CORBA::is_nil (this->audio_control_) == 0)
+      TAO_TRY
         {
-          // one way function call.
-          this->audio_control_->close (TAO_TRY_ENV);
+          if (CORBA::is_nil (this->audio_control_) == 0)
+            {
+              // one way function call.
+              this->audio_control_->close (TAO_TRY_ENV);
 
+              TAO_CHECK_ENV;
+              if (ABpid > 0) {
+                kill(ABpid, SIGUSR1);
+                ABpid = -1;
+              }
+              ACE_DEBUG ((LM_DEBUG,"(%P|%t) audio close done \n"));
+            }
+
+          if (CORBA::is_nil (this->video_control_) == 0)
+            {
+              // one way function call.
+              this->video_control_->close (TAO_TRY_ENV);
+              TAO_CHECK_ENV;
+              if (VBpid > 0) {
+                kill(VBpid, SIGUSR1);
+                VBpid = -1;
+              }
+              ACE_DEBUG ((LM_DEBUG,"(%P|%t) video close done \n"));
+            }
+          this->orb_manager_.child_poa ()->destroy (1,0,TAO_TRY_ENV);
           TAO_CHECK_ENV;
-          if (ABpid > 0) {
-            char message[BUFSIZ];
-            message [0] = EXIT;
-            ACE_OS::write (asp[0],&message,BUFSIZ);
-            ABpid = -1;
-          }
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) audio close done \n"));
-        }
+          ACE_DEBUG ((LM_DEBUG,"(%P|%t)destroy childpoa done\n"));
 
-      if (CORBA::is_nil (this->video_control_) == 0)
-        {
-          // one way function call.
-          this->video_control_->close (TAO_TRY_ENV);
+          this->orb_manager_.init_child_poa (argc_,
+                                             argv_,
+                                             "child_poa",
+                                             TAO_TRY_ENV);
           TAO_CHECK_ENV;
-          if (VBpid > 0) {
-            char message[BUFSIZ];
-            message [0] = EXIT;
-            ACE_OS::write (vsp[0],&message,BUFSIZ);
-            VBpid = -1;
-          }
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t) video close done \n"));
+          ACE_DEBUG ((LM_DEBUG,"(%P)New child poa initialized\n"));
         }
-      this->orb_manager_.child_poa ()->destroy (1,0,TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG,"(%P|%t)destroy childpoa done\n"));
-
-      this->orb_manager_.init_child_poa (argc_,
-                                         argv_,
-                                         "child_poa",
-                                         TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-      ACE_DEBUG ((LM_DEBUG,"(%P)New child poa initialized\n"));
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("video_control_->close (..)");
-      return -1;
-    }
-  TAO_ENDTRY;
-  delete this->audio_reactive_strategy_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  delete this->audio_client_mmdevice_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  //      delete this->audio_streamctrl_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  delete this->video_reactive_strategy_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  delete this->video_client_mmdevice_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  //      delete this->video_streamctrl_;
-  ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
-  return 0;
+      TAO_CATCHANY
+        {
+          TAO_TRY_ENV.print_exception ("video_control_->close (..)");
+          return -1;
+        }
+      TAO_ENDTRY;
+      delete this->audio_reactive_strategy_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      delete this->audio_client_mmdevice_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      //      delete this->audio_streamctrl_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      delete this->video_reactive_strategy_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      delete this->video_client_mmdevice_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      //      delete this->video_streamctrl_;
+      ACE_DEBUG ((LM_DEBUG,"(%P)%N,%l"));
+      return 0;
 }
 
 
@@ -1451,7 +1434,7 @@ Command_Handler::play (int auto_exp,
           shared->nextSample = shared->totalSamples - 1;
       }
 
-      abuffer->ABflushBuf (shared->nextSample);
+      ABflushBuf (shared->nextSample);
 
       para->sn = shared->cmdsn;
       para->nextSample = shared->nextSample;
@@ -1580,12 +1563,12 @@ Command_Handler::play (int auto_exp,
     else {
       int skipped = gap * shared->audioPara.samplesPerSecond / 1000000;
       skipped += shared->config.audioOffset;
-      abuffer->ABskipSamples (skipped);
+      ABskipSamples (skipped);
       Fprintf (stderr, "Live source: skipped %d audio samples\n", skipped);
     }
   }
   else if (stuffsamples) {
-    abuffer->ABskipSamples (-stuffsamples);
+    ABskipSamples (-stuffsamples);
   }
   if (cmdstarted)
     start_timer ();
@@ -1599,7 +1582,7 @@ Command_Handler::position_action (int operation_tag)
 {
   int val;
   unsigned char tmp = CmdDONE;
-  OurCmdRead ((char*)&val, 4);
+  CmdRead ((char*)&val, 4);
 
   this->operation_tag_ = operation_tag;
   this->position_val_ = val;
@@ -1680,7 +1663,7 @@ int
 Command_Handler::volume (void)
 
 {
-  OurCmdRead((char *)&shared->volumePosition, 4);
+  CmdRead((char *)&shared->volumePosition, 4);
   if (audioSocket >= 0) {
     SetAudioGain();
   }
@@ -1696,7 +1679,7 @@ int
 Command_Handler::balance (void)
 
 {
-  OurCmdRead((char *)&shared->balancePosition, 4);
+  CmdRead((char *)&shared->balancePosition, 4);
   /*
   unsigned char tmp = CmdDONE;
   tmp = CmdDONE;
@@ -1712,7 +1695,7 @@ Command_Handler::speed (void)
   ACE_DEBUG ((LM_DEBUG,"COmmand_Handler::speed ()\n"));
   unsigned char tmp;
   CORBA::Boolean result;
-  OurCmdRead((char *)&shared->speedPosition, 4);
+  CmdRead((char *)&shared->speedPosition, 4);
   set_speed();
   TAO_TRY
     {
@@ -1734,6 +1717,8 @@ Command_Handler::speed (void)
               }
               compute_sendPattern();
               para->sendPatternGops = shared->sendPatternGops;
+
+              //        memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
               para->sendPattern.length (PATTERN_SIZE);
               for (int i=0; i< PATTERN_SIZE ; i++)
                 para->sendPattern[i]=shared->sendPattern[i];
@@ -1782,6 +1767,10 @@ int
 Command_Handler::stop (void)
 
 {
+  /*
+  ::stop ();
+  return 0;
+  */
 #ifdef STAT
   unsigned char preCmd = shared->cmd;
 #endif
@@ -1985,81 +1974,6 @@ Command_Handler::connect_to_audio_server (void)
   return 0;
 }
 
-// ========================================
-// Decode_Notification_Handler methods.
-
-Decode_Notification_Handler::Decode_Notification_Handler (Command_Handler *command_handler)
-  :command_handler_ (command_handler)
-{
-}
-
-ACE_HANDLE
-Decode_Notification_Handler::get_handle (void) const
-{
-  return vdsp[0];
-}
-
-int
-Decode_Notification_Handler::handle_input (ACE_HANDLE fd) 
-{
-  ACE_DEBUG ((LM_DEBUG,"Decode_Notification_Handler::handle_input \n"));
-  char message[BUFSIZ];
-  int result =
-    ACE_OS::read (fd,&message,BUFSIZ);
-  if (result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"Decode_Notification_Handler::handle_input read failed\n"),0);
-  if (result == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,"Decode_Notification_Handler::handle_input socket closed\n"),0);
-
-  if (message[0] != DECODED)
-    ACE_ERROR_RETURN ((LM_ERROR,"Decode_Notification_Handler:: Not a decoded message\n"),0);
-
-  // Resume the command handler.
-  if (this->command_handler_->command_suspended_ != UNSUSPENDED)
-    {
-      unsigned char tmp;
-      switch (this->command_handler_->command_suspended_)
-        {
-        case INIT:
-          tmp = CmdDONE;
-          CmdWrite(&tmp, 1);
-          if (videoSocket < 0)
-            {
-              tmp = CmdVPclearScreen;
-              CmdWrite(&tmp, 1);
-            }
-          break;
-        case STEP:
-          tmp = CmdDONE;
-          CmdWrite(&tmp, 1);
-          break;
-        case POSITION:
-          if (this->command_handler_->operation_tag_ && audioSocket >= 0) /* needs to adjust audio position */
-            {
-
-              shared->nextSample = (int)((double)shared->audioPara.samplesPerSecond *
-                                         ((double)shared->nextFrame / shared->pictureRate));
-              //        ACE_DEBUG ((LM_DEBUG,"shared->nextsample = %d\n",shared->nextSample));
-            }
-          if (audioSocket >= 0)
-            shared->nextSample  = (shared->totalSamples-1) * (this->command_handler_->position_val_) / POSITION_RANGE;
-          tmp = CmdDONE;
-          CmdWrite(&tmp, 1);
-          break;
-        default:
-          ACE_DEBUG ((LM_DEBUG,"INVALID STATE for command suspension\n"));
-          break;
-        }
-      TAO_ORB_Core_instance ()->reactor ()->resume_handler (this->command_handler_->get_handle ());
-    }
-  ::usr1_handler (0);
-  return 0;
-}
-
-
-// ----------------------------------------------------------------------
-// Client_Sig_Handler methods
-
 void
 Client_Sig_Handler::PlayAudioOnly(void)
 {
@@ -2107,7 +2021,7 @@ Client_Sig_Handler::PlayAudioOnly(void)
               shared->audioPara.samplesPerSecond;
   for (;;)
   {
-    size = abuffer->ABgetSamples(rawBuf, maxSize);
+    size = ABgetSamples(rawBuf, maxSize);
     csize = AudioConvert(size);
     AFtime = PlayAudioSamples(nextAFtime, convBuf, csize);
     nextASSample += size;
@@ -2133,6 +2047,9 @@ Client_Sig_Handler::PlayAudioOnly(void)
   }
 }
 
+// ----------------------------------------------------------------------
+
+// Client_Sig_Handler methods
 // handles the timeout SIGALRM signal
 Client_Sig_Handler::Client_Sig_Handler (Command_Handler *command_handler)
   : command_handler_ (command_handler)
@@ -2142,7 +2059,7 @@ Client_Sig_Handler::Client_Sig_Handler (Command_Handler *command_handler)
 Client_Sig_Handler::~Client_Sig_Handler (void)
 {
   TAO_ORB_Core_instance ()->reactor ()->remove_handler (this,
-                                                        ACE_Event_Handler::NULL_MASK);
+                                            ACE_Event_Handler::NULL_MASK);
 
   TAO_ORB_Core_instance ()->reactor ()->remove_handler (this->sig_set);
 }
@@ -2172,6 +2089,7 @@ Client_Sig_Handler::register_handler (void)
   this->sig_set.sig_add (SIGINT);
   this->sig_set.sig_add (SIGQUIT);
   this->sig_set.sig_add (SIGALRM);
+  this->sig_set.sig_add (SIGUSR1);
   this->sig_set.sig_add (SIGUSR2);
   this->sig_set.sig_add (SIGSEGV);
 
@@ -2184,20 +2102,8 @@ Client_Sig_Handler::register_handler (void)
                       -1);
   return 0;
 }
-
-int
-Client_Sig_Handler::remove_handler (void)
-{
-  if (TAO_ORB_Core_instance ()->reactor ()->remove_handler (this,
-                                                            ACE_Event_Handler::NULL_MASK) == -1)
-    ACE_DEBUG ((LM_DEBUG,"(%P)remove_handler failed for client_sig handler for null mask\n"));
-
-  if (TAO_ORB_Core_instance ()->reactor ()->remove_handler (sig_set) == -1)
-    ACE_DEBUG ((LM_DEBUG,"(%P)remove_handler failed for client_sig handler for sig set\n"));
-  return 0;
-}
-
 // Called by the ACE_Reactor to extract the fd.
+
 ACE_HANDLE
 Client_Sig_Handler::get_handle (void) const
 {
@@ -2245,6 +2151,50 @@ Client_Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
       this->TimerHandler (signum);
       // %% ??!!!
       break;
+    case SIGUSR1:
+      // Resume the command handler.
+      if (this->command_handler_->command_suspended_ != UNSUSPENDED)
+        {
+          unsigned char tmp;
+          switch (this->command_handler_->command_suspended_)
+            {
+            case INIT:
+              tmp = CmdDONE;
+              CmdWrite(&tmp, 1);
+              if (videoSocket < 0)
+                {
+                  tmp = CmdVPclearScreen;
+                  CmdWrite(&tmp, 1);
+                }
+              break;
+            case STEP:
+              tmp = CmdDONE;
+              CmdWrite(&tmp, 1);
+              break;
+            case POSITION:
+              if (this->command_handler_->operation_tag_ && audioSocket >= 0) /* needs to adjust audio position */
+                {
+
+                  shared->nextSample = (int)((double)shared->audioPara.samplesPerSecond *
+                                             ((double)shared->nextFrame / shared->pictureRate));
+                  //        ACE_DEBUG ((LM_DEBUG,"shared->nextsample = %d\n",shared->nextSample));
+                }
+              if (audioSocket >= 0)
+                shared->nextSample  = (shared->totalSamples-1) * (this->command_handler_->position_val_) / POSITION_RANGE;
+              tmp = CmdDONE;
+              CmdWrite(&tmp, 1);
+              break;
+            default:
+              ACE_DEBUG ((LM_DEBUG,"INVALID STATE for command suspension\n"));
+              break;
+            }
+          TAO_ORB_Core_instance ()->reactor ()->resume_handler (this->command_handler_->get_handle ());
+        }
+      ::usr1_handler (signum);
+      break;
+    case SIGUSR2:
+      ::default_usr2_handler (signum);
+      break;
     case SIGCHLD:
       //      ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
       pid = ACE_OS::wait (&status);
@@ -2719,7 +2669,7 @@ Client_Sig_Handler::DisplayPicture(void)
                             shared->config.filterPara : 100);
           }
           if (fr == NULL) {
-           ACE_OS::perror ("CTR failed to allocate space for fr filter");
+            perror("CTR failed to allocate space for fr filter");
             fbstate = 0;
           }
           vr = DoFilter(fr, (double)shared->usecPerFrame);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
index a6ec7b1d646..41f437b3ab5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Command_Handler.h
@@ -66,9 +66,7 @@
 #include "ace/Acceptor.h"
 #include "orbsvcs/Naming/Naming_Utils.h"
 #include "mpeg_shared/ReceiverS.h"
-#include "ace/Get_Opt.h"
-#include "ab.h"
-#include "vb.h"
+
 
 class Command_Handler;
 
@@ -327,9 +325,6 @@ public:
   // this will register this sig_handler
   // with the reactor for SIGCHLD,SIGTERM,SIGINT
 
-  int remove_handler (void);
-  // removes the handlers.
-
   virtual int shutdown (ACE_HANDLE,
                         ACE_Reactor_Mask);
   // handles the reactor shutdown
@@ -365,21 +360,6 @@ private:
 
 };
 
-class Decode_Notification_Handler :public ACE_Event_Handler
-{
-public:
-  Decode_Notification_Handler (Command_Handler *command_handler);
-  // constructor.
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // Get the Notification handle.
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // called when input events occur.
-private:
-  Command_Handler *command_handler_;
-};
-
 enum Suspended
 {
   UNSUSPENDED = 0,INIT=1,STEP=2,POSITION=3
@@ -532,9 +512,6 @@ private:
   int parse_args (int argc,char **argv);
   // parses the arguments.
 
-  int remove_handlers (void);
-  // removes all the handlers.
-
   int busy_;
   // flag to indicate the state of the command handler
 
@@ -605,9 +582,6 @@ private:
   Client_Sig_Handler client_sig_handler_;
   // Handler for the signals.
 
-  Decode_Notification_Handler notification_handler_;
-  // handler for the decode signals from VD process.
-
   int argc_;
   char **argv_;
 };
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
index 4fadaab1df6..48413d733ea 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile
@@ -6,8 +6,8 @@
 
 MAKEFILE = Makefile
 LIBNAME  = libmpeg_client
-LIB2     = $(LIBNAME).a
-SHLIB2   = $(LIBNAME).$(SOEXT)
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
@@ -55,16 +55,6 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 ##LIBS 	+= -lTAO -lACE
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else  # ! AV
-  override INSTALL =
-endif # ! AV
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -85,12 +75,555 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
 CPPFLAGS += -i -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include -L/project/doc/pkg/X11/lib
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/24bit.o .obj/24bit.so .shobj/24bit.o .shobj/24bit.so: 24bit.cpp video.h dither.h proto.h
+.obj/2x2.o .obj/2x2.so .shobj/2x2.o .shobj/2x2.so: 2x2.cpp video.h dither.h proto.h
+.obj/ab.o .obj/ab.so .shobj/ab.o .shobj/ab.so: ab.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
+.obj/audio.o .obj/audio.so .shobj/audio.o .shobj/audio.so: audio.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h
+.obj/decoders.o .obj/decoders.so .shobj/decoders.o .shobj/decoders.so: decoders.cpp decoders.h util.h video.h proto.h
+.obj/file.o .obj/file.so .shobj/file.o .shobj/file.so: file.cpp video.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h
+.obj/fs2.o .obj/fs2.so .shobj/fs2.o .shobj/fs2.so: fs2.cpp video.h dither.h fs2.h proto.h
+.obj/fs2fast.o .obj/fs2fast.so .shobj/fs2fast.o .shobj/fs2fast.so: fs2fast.cpp video.h proto.h dither.h
+.obj/fs4.o .obj/fs4.so .shobj/fs4.o .shobj/fs4.so: fs4.cpp fs4.h video.h proto.h dither.h
+.obj/global.o .obj/global.so .shobj/global.o .shobj/global.so: global.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/gray.o .obj/gray.so .shobj/gray.o .shobj/gray.so: gray.cpp video.h proto.h dither.h
+.obj/hybrid.o .obj/hybrid.so .shobj/hybrid.o .shobj/hybrid.so: hybrid.cpp video.h proto.h dither.h
+.obj/hybriderr.o .obj/hybriderr.so .shobj/hybriderr.o .shobj/hybriderr.so: hybriderr.cpp video.h proto.h dither.h
+.obj/info.o .obj/info.so .shobj/info.o .shobj/info.so: info.cpp
+.obj/jrevdct.o .obj/jrevdct.so .shobj/jrevdct.o .shobj/jrevdct.so: jrevdct.cpp video.h proto.h
+.obj/mb_ordered.o .obj/mb_ordered.so .shobj/mb_ordered.o .shobj/mb_ordered.so: mb_ordered.cpp video.h proto.h dither.h
+.obj/mono.o .obj/mono.so .shobj/mono.o .shobj/mono.so: mono.cpp video.h proto.h dither.h
+.obj/motionvector.o .obj/motionvector.so .shobj/motionvector.o .shobj/motionvector.so: motionvector.cpp video.h proto.h util.h
+.obj/ordered.o .obj/ordered.so .shobj/ordered.o .shobj/ordered.so: ordered.cpp video.h proto.h dither.h
+.obj/ordered2.o .obj/ordered2.so .shobj/ordered2.o .shobj/ordered2.so: ordered2.cpp video.h proto.h dither.h
+.obj/para.o .obj/para.so .shobj/para.o .shobj/para.so: para.cpp video.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h
+.obj/parseblock.o .obj/parseblock.so .shobj/parseblock.o .shobj/parseblock.so: parseblock.cpp video.h proto.h decoders.h util.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/prog.o .obj/prog.so .shobj/prog.o .shobj/prog.so: prog.cpp video.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h
+.obj/ui.o .obj/ui.so .shobj/ui.o .shobj/ui.so: ui.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ interface/fb.xbm interface/play.xbm interface/step.xbm \
+ interface/stop.xbm interface/loop.xbm interface/ff.xbm \
+ interface/MainWindow.mib interface/Info.mib video.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h
+.obj/util.o .obj/util.so .shobj/util.o .shobj/util.so: util.cpp video.h proto.h util.h
+.obj/util32.o .obj/util32.so .shobj/util32.o .shobj/util32.so: util32.cpp video.h proto.h ui.h
+.obj/vb.o .obj/vb.so .shobj/vb.o .shobj/vb.so: vb.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
+.obj/vd.o .obj/vd.so .shobj/vd.o .shobj/vd.so: vd.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h dither.h video.h proto.h
+.obj/video.o .obj/video.so .shobj/video.o .shobj/video.so: video.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ decoders.h util.h video.h proto.h global.h ui.h
+.obj/vp.o .obj/vp.so .shobj/vp.o .shobj/vp.so: vp.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h dither.h video.h proto.h ui.h
+.obj/Command_Handler.o .obj/Command_Handler.so .shobj/Command_Handler.o .shobj/Command_Handler.so: Command_Handler.cpp Command_Handler.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.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/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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/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/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/ARGV.h \
+ $(ACE_ROOT)/ace/ARGV.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ ctr.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ newproto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ global.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
deleted file mode 100644
index c473df5ddfa..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- 
-##                    mpeg/source/mpeg_client directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libmpeg_client
-
-libmpeg_client_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libmpeg_client_SOURCES = \
-        24bit.cpp \
-        2x2.cpp \
-        Command_Handler.cpp \
-        ab.cpp \
-        audio.cpp \
-        ctr.cpp \
-        decoders.cpp \
-        file.cpp \
-        fs2.cpp \
-        fs2fast.cpp \
-        fs4.cpp \
-        global.cpp \
-        gray.cpp \
-        hybrid.cpp \
-        hybriderr.cpp \
-        info.cpp \
-        jrevdct.cpp \
-        mb_ordered.cpp \
-        mono.cpp \
-        motionvector.cpp \
-        ordered.cpp \
-        ordered2.cpp \
-        para.cpp \
-        parseblock.cpp \
-        prog.cpp \
-        ui.cpp \
-        util.cpp \
-        util32.cpp \
-        vb.cpp \
-        vd.cpp \
-        video.cpp \
-        vp.cpp
-
-noinst_HEADERS = \
-        Command_Handler.h \
-        ab.h \
-        decoders.h \
-        dither.h \
-        fs2.h \
-        fs4.h \
-        global.h \
-        mibload.h \
-        newproto.h \
-        proto.h \
-        ui.h \
-        util.h \
-        vb.h \
-        video.h
-
-dist-hook:
-        $(mkinstalldirs) $(distdir)/$(subdir)
-        tar cf - ./interface | (cd $(distdir)/$(subdir); tar xfBp -)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp
index 2887981ee52..7cbccea9cc1 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.cpp
@@ -25,51 +25,62 @@
  *         Department of Computer Science and Engineering
  *         email: scen@cse.ogi.edu
  */
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Intrinsic.h>
+#ifdef __svr4__
+#include <stropts.h>
+#include <sys/conf.h>
+#endif
 
-extern int asp[2];
-extern void set_exit_routine_tag(int tag);
-
-#include "ab.h"
+#include "include/common.h"
+#include "newproto.h"
+#include "global.h"
+#include "mpeg_shared/filters.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/com.h"
 
 ACE_RCSID(mpeg_client, ab, "$Id$")
 
-AudioBuffer::AudioBuffer (void)
-  :temp (0),
-   bytes (-1),
-   abuf (0),
-   sid (-1),
-   exit_tag (0),
-   savedSocket (-1),
-   packet (0),
-   pkt_data (0),
-   conn_tag (-1),
-   fbstate (0),
-   waketime (0),
-   pcmdsn (-1),
-   mode_ (INVALID)
-{
-}
-
-//destructor.
-AudioBuffer::~AudioBuffer (void)
-{
-  if (ACE_Reactor::instance ()->remove_handler (this->handler_,ACE_Event_Handler::READ_MASK) == -1)
-    ACE_DEBUG ((LM_ERROR,"(%P)remove handler failed for Video_Notification_Handler\n"));
-
-  delete this->handler_;
-  if (ACE_Reactor::instance ()->remove_handler (this,ACE_Event_Handler::READ_MASK) == -1)
-    ACE_DEBUG ((LM_ERROR,"(%P)remove handler failed for VideoBuffer\n"));
-
-}
-
-void 
-AudioBuffer::set_silence (char *buf, int samples)
+/* magic number -- deviation is considered
+   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
+   */
+#define MAX_CLOCK_DRIFT 50
+
+#define max(a,b) ((a)>(b) ? (a) : (b))
+#define min(a,b) ((a)<(b) ? (a) : (b))
+
+typedef struct {
+  int bufsize; /* number of bytes for the buffer pointed by 'buf' */
+  char * buf;  /* pointer to the data buffer area */
+  int bps; /* current byte-per-sample */
+  int size;  /* number of samples the buffer can hold */
+  int samples; /* number of samples in the buffer; */
+  int stuff; /* number of stuff samples to be read by ABgetSamples() */
+  int ts;  /* tail-sample: the next sample to be comsumed by CTR */
+  int hs;  /* head-sample: the next sample to be expected from the network */
+  int tind; /* index of the ts-sample in the buf */
+} ABBuffer;
+
+static ABBuffer * abuf;
+static int sid;
+static int exit_tag = 0;
+static int savedSocket;
+
+static void set_silence(char *buf, int samples)
 {
   memset(buf, 0xff, samples * shared->audioPara.bytesPerSample);
 }
 
-void 
-AudioBuffer::ABinitBuf (int size) /* size in bytes */
+void ABinitBuf(int size) /* size in bytes */
 {
   abuf = (ABBuffer *)creat_shared_mem(size);
   abuf->bufsize = size - sizeof(*abuf);
@@ -77,8 +88,7 @@ AudioBuffer::ABinitBuf (int size) /* size in bytes */
   sid = creat_semaphore();
 }
 
-void
-AudioBuffer::ABflushBuf (int nextSample)  /* flush the whole buffer */
+void ABflushBuf(int nextSample)  /* flush the whole buffer */
 {
   enter_cs(sid);
   abuf->bps = shared->audioPara.bytesPerSample;
@@ -91,14 +101,12 @@ AudioBuffer::ABflushBuf (int nextSample)  /* flush the whole buffer */
   leave_cs(sid);
 }
 
-int 
-AudioBuffer::ABcheckSamples (void) /* returns # of samples in ABbuf */
+int ABcheckSamples(void) /* returns # of samples in ABbuf */
 {
   return abuf->samples;
 }
 
-int
-AudioBuffer::ABgetSamples (char * buf, int samples)
+int ABgetSamples(char * buf, int samples)
     /* read at most given number of samples from AB to buf, returns
        number of sample actually read */
 {
@@ -117,12 +125,12 @@ AudioBuffer::ABgetSamples (char * buf, int samples)
 	 /* there may be fewer samples in abuf */
     if (as > 0) {
       int part1 = min(as, abuf->size - abuf->tind);
-      ACE_OS::memcpy (buf, abuf->buf + (abuf->bps * abuf->tind), part1 * abuf->bps);
+      memcpy(buf, abuf->buf + (abuf->bps * abuf->tind), part1 * abuf->bps);
       set_silence(abuf->buf + (abuf->bps * abuf->tind), part1);
       if (part1 < as) {  /* This read cross the boundary of abuf */
-	ACE_OS::memcpy (buf + (part1 * abuf->bps),
-                        abuf->buf,
-                        (as - part1) * abuf->bps);
+	memcpy(buf + (part1 * abuf->bps),
+	       abuf->buf,
+	       (as - part1) * abuf->bps);
 	set_silence(abuf->buf, as - part1);
       }
     }
@@ -137,8 +145,7 @@ AudioBuffer::ABgetSamples (char * buf, int samples)
 
 /* if samples < 0; then stuff |samples| silient samples to ABgetSamples(),
    otherwise wipe out this number of samples from AB */
-int 
-AudioBuffer::ABskipSamples (int samples)
+int ABskipSamples(int samples)
 {
   enter_cs(sid);
   if (samples <= 0) {
@@ -153,423 +160,327 @@ AudioBuffer::ABskipSamples (int samples)
   return samples;
 }
 
-void 
-AudioBuffer::ABdeleteBuf (void)
+void ABdeleteBuf(void)
 {
   remove_shared_mem((char *)abuf);
 }
 
-void 
-AudioBuffer::ABdeleteSem (void)
+void ABdeleteSem(void)
 {
   remove_semaphore(sid);
 }
 
 /* SIGUSR1 from CTR is for killing this process, without affecting any other ones. */
 
-void 
-AudioBuffer::exit_on_kill (void)
+static void exit_on_kill(void)
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) ABprocess killed \n"));
   extern void set_exit_routine_tag(int tag);
   set_exit_routine_tag(0);
   //  ComCloseConn(savedSocket);
-  vbuffer->VBdeleteBuf();
-  ACE_OS::exit (0);
+  VBdeleteBuf();
+  exit(0);
 }
 
-ACE_HANDLE
-AudioBuffer::get_handle (void) const
+static void usr1_handler(int sig)
 {
-  return this->dataSocket;
+  cerr << "ABprocess got sigusr1\n";
+  exit_on_kill ();
 }
 
-int
-AudioBuffer::handle_input (ACE_HANDLE fd)
+
+static void usr2_handler(int sig)
 {
-  //  ACE_DEBUG ((LM_DEBUG,"handle_input:mode = %d\n",this->mode_));
-  int len;
-  switch (this->mode_)
-    {
-    case READ_HEADER:
-      {
-        int len;
-        if (conn_tag >= 0) 
-          {
-            //            ACE_DEBUG ((LM_DEBUG,"non discard mode: "));
-            if (bytes < 0)
-              bytes = sizeof(*packet);
-            len = ACE_OS::read (dataSocket, (char *)temp, bytes);
-          }
-        else
-          {  /* discard mode packet stream, read all bytes */
-            //            ACE_DEBUG ((LM_DEBUG,"discard mode: "));
-            if (bytes <  0)
-              bytes = PACKET_SIZE;
-            len = ACE_OS::read (dataSocket, (char *)packet, bytes);
-            //      ACE_DEBUG ((LM_DEBUG,"(%P|%t) ABprocess: got a %d sized packet\n",len));
-          }
-        if (len == -1) 
-          {
-            if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN)
-              {
-                return 0;
-              }
-            perror("AB ACE_OS::read () audio packet from discard-mode packet stream");
-            ACE_Reactor::instance ()->end_event_loop ();
-            return -1;
-          }
+  Fprintf(stderr, "VB void usr2_handler (supposed for stat).\n");
+}
+
+#define PACKET_SIZE 8192
+#define STARTUP_WAIT 10000000
+#define ACTION_WAIT 5000000
+
+void ABprocess(int dataSocket)
+{
+  
+  AudioPacket * packet;
+  char * pkt_data;
+  int conn_tag = shared->audioMaxPktSize;
+
+  /* following are for feedback */
+  int fbstate = 0;
+  unsigned waketime;
+  int pcmdsn = -1; /* previous cmdsn */
+  
+  exit_tag = 0;
+  
+  savedSocket = dataSocket;
+  
+  setsignal(SIGUSR1, usr1_handler);
+  setsignal(SIGUSR2, usr2_handler);
+
+  packet = (AudioPacket *)malloc(PACKET_SIZE);
+  if (packet == NULL) {
+    perror("AB failed to allocate mem for packet buffer");
+    exit(1);
+  }
+  pkt_data = (char *)packet + sizeof(*packet);
 
-        if (len == 0)
-          {
-            fprintf(stderr, "Error: AB found dataSocket broken\n");
-            ACE_Reactor::instance ()->end_event_loop (); return -1;
-          }
-        //        ACE_DEBUG ((LM_DEBUG,"packet: bytes = %d,len = %d\n",bytes,len));
-        if (conn_tag >= 0)
-          {
-            temp += len;
-            bytes -= len;
-            if (bytes == 0)
-              {
-                // header reading is done.
-                this->mode_ = READ_DATA;
-                bytes = -1;
-                len = sizeof (*packet);
-              }
-            else
-              return 0;
-          }
-        if (len < sizeof (*packet))
-          {
-            fprintf(stderr, "Warn: AB discard len = %d bytes of supposed header.\n", len);
-            return 0;
-          }
-        // process the header.
+  for (;;) {
+    int len;
+    int bytes;
+    if (conn_tag >= 0) {
+      bytes = sizeof(*packet);
+
+
+      len = wait_read_bytes(dataSocket, (char *)packet, bytes);
+      if (exit_tag) exit_on_kill();
+    }
+    else {  /* discard mode packet stream, read all bytes */
+      bytes = PACKET_SIZE;
+      len = read(dataSocket, (char *)packet, bytes);
+      //      ACE_DEBUG ((LM_DEBUG,"(%P|%t) ABprocess: got a %d sized packet\n",len));
+      if (exit_tag) exit_on_kill();
+      if (len == -1) {
+	if (errno == EINTR || errno == EWOULDBLOCK || errno == EAGAIN) {
+	  usleep(10000);
+	  if (exit_tag) exit_on_kill();
+	  continue;
+	}
+	perror("AB read() audio packet from discard-mode packet stream");
+	exit(1);
+      }
+    }
+    if (len == 0) {
+      fprintf(stderr, "Error: AB found dataSocket broken\n");
+      exit(1);
+    }
+    if (len < sizeof(*packet)) { /* unknown packet */
+      fprintf(stderr, "Warn: AB discard len = %d bytes of supposed header.\n", len);
+      continue;
+    }
 #ifdef NeedByteOrderConversion
-        packet->dataBytes = ntohl(packet->dataBytes);
+    packet->dataBytes = ntohl(packet->dataBytes);
 #endif
 
-        //    ACE_DEBUG ((LM_DEBUG,"(%P|%t) ABprocess: Received  %d sized packet\n",len));
-        if (packet->dataBytes <= 0)
-          {
-            fprintf(stderr, "AB Error: pkt->dataBytes %d, len %d\n",
-                    packet->dataBytes,
-                    len);
-            ACE_Reactor::instance ()->end_event_loop (); return -1;
-          }
-        bytes = packet->dataBytes + sizeof(*packet);
+    //    ACE_DEBUG ((LM_DEBUG,"(%P|%t) ABprocess: Received  %d sized packet\n",len));
+    if (packet->dataBytes <= 0) {
+      fprintf(stderr, "AB Error: pkt->dataBytes %d, len %d\n",
+	      packet->dataBytes,
+	      len);
+      exit(1);
+    }
+    bytes = packet->dataBytes + sizeof(*packet);
     
-        if (bytes > PACKET_SIZE)
-          {
-            Fprintf(stderr, "Fatal error: AB packet buf (%dB) too small (%d)\n",
-                    PACKET_SIZE, bytes);
-            ACE_Reactor::instance ()->end_event_loop (); return -1;
-          }
-        if (conn_tag > 0)
-          {
-            temp = (char *)packet + sizeof(*packet);
-            bytes = bytes - sizeof(*packet);
-            ACE_DEBUG ((LM_DEBUG,"(%P) Ready to read the data part of the packet\n"));
-            break;
-          }
+    if (bytes > PACKET_SIZE) {
+      Fprintf(stderr, "Fatal error: AB packet buf (%dB) too small (%d)\n",
+	      PACKET_SIZE, bytes);
+      exit(1);
+    }
+    if (conn_tag >= 0) {
+      len = wait_read_bytes(dataSocket, (char *)packet + sizeof(*packet),
+			    bytes - sizeof(*packet));
+      if (len <= 0) {
+	if (len == -1) perror("AB encounter error on wait_read_bytes()");
+	else fprintf(stderr, "AB encounter EOF on wait_read_bytes()\n");
       }
-      // fall through and process the header.
-    case READ_DATA:
-      {
-        // code to read the audio packet and buffer it.
-        if (conn_tag >= 0)
-          {
-            len = ACE_OS::read (dataSocket,temp,bytes);
-
-            if (len <= 0) 
-              {
-                if (len == -1)ACE_OS::perror ("AB encounter error on wait_read_bytes()");
-                else fprintf(stderr, "AB encounter EOF on wait_read_bytes()\n");
-              }
-            temp +=len;
-            bytes -= len;
-            if (bytes != 0)
-              return 0;
-          }
-        // set the parameters for the header reading.
-        this->mode_ = READ_HEADER;
-        bytes = -1;
-        temp = (char *)packet;
+    }
 #ifdef NeedByteOrderConversion
-        packet->cmdsn = ntohl(packet->cmdsn);
-        packet->samplesPerSecond = ntohl(packet->samplesPerSecond);
-        packet->resend = ntohl(packet->resend);
-        packet->firstSample = ntohl(packet->firstSample);
-        packet->samples = ntohl(packet->samples);
-        packet->actualSamples = ntohl(packet->actualSamples);
-        /* dataBytes already byte-reordered */
+    packet->cmdsn = ntohl(packet->cmdsn);
+    packet->samplesPerSecond = ntohl(packet->samplesPerSecond);
+    packet->resend = ntohl(packet->resend);
+    packet->firstSample = ntohl(packet->firstSample);
+    packet->samples = ntohl(packet->samples);
+    packet->actualSamples = ntohl(packet->actualSamples);
+    /* dataBytes already byte-reordered */
 #endif
-        /*
-          Fprintf(stderr, "AB got a packet: %d(%d)\n",
-          packet->firstSample, packet->samples);
-        */
-        /*
-          if (packet->firstSample % 10240 && !packet->resend) continue;
-        */
-        if (packet->samples * abuf->bps > PACKET_SIZE - sizeof(*packet)) {
-          fprintf(stderr, "Fatal error: AB has too small packet buffer, %d out of %d\n",
-                  PACKET_SIZE, packet->samples * abuf->bps + sizeof(*packet));
-          ACE_Reactor::instance ()->end_event_loop (); return -1;
-        }
-
-        if (packet->cmdsn != shared->cmdsn) { /* outdated packet */
-          /*
-            Fprintf(stderr, "AB discarded an outdated packet\n");
-          */
-          return 0;
-        }
-        enter_cs(sid);
-        if (packet->firstSample + packet->samples <= abuf->ts)
-          {
-            /* all samples too late, discard it */
-            abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-            abuf->samples = abuf->hs - abuf->ts;
-            leave_cs(sid);
-            /*
-              Fprintf(stderr, "AB all sample in packet %d(%d) too late\n",
-              packet->firstSample, packet->samples);
-            */
-            feedback ();
-          }
-        else if (packet->firstSample >= abuf->ts + abuf->size) {
-          /* all samples too early, discard the packet */
-          abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-          abuf->samples = abuf->hs - abuf->ts;
-          leave_cs(sid);
-          /*
-            Fprintf(stderr, "AB all sample in packet %d(%d) too early\n",
-            packet->firstSample, packet->samples);
-          */
-          feedback ();
-        }
-        else if (packet->samples > packet->actualSamples) {
-          leave_cs(sid);
-          fprintf(stderr, "Error: AB interpolation not available yet.\n");
-          ACE_Reactor::instance ()->end_event_loop (); return -1;
-        }
-        else
-          {
-            int oldhs = abuf->hs;
-            int firstSample = max(packet->firstSample, abuf->ts);
-            int samples = min(packet->samples -
-                              (firstSample - packet->firstSample),
-                              (abuf->ts + abuf->size) - packet->firstSample);
-            char * data = pkt_data +
-              (firstSample - packet->firstSample) * abuf->bps;
-            int dstart = (abuf->tind + (firstSample - abuf->ts)) % abuf->size;
-            int part1 = min(samples, abuf->size - dstart);
-            ACE_OS::memcpy (abuf->buf + (dstart * abuf->bps), data, part1 * abuf->bps);
-            if (part1 < samples) {
-              memcpy(abuf->buf, data + part1 * abuf->bps,
-                     (samples - part1) * abuf->bps);
-            }
-            abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
-            abuf->samples = abuf->hs - abuf->ts;
-            dstart =max(oldhs, abuf->ts);
-      
-            leave_cs(sid);
-      
-            part1 = firstSample - dstart;
-            if (packet->resend) {
-              Fprintf(stderr, "AB got resent %d(%d)\n",
-                      packet->firstSample, packet->samples);
-            }
-            else if (part1 > 0) {
-              int res;
-              AudioFeedBackPara para;
-              Fprintf(stderr, "AB found gap %d(%d)\n", dstart, part1);
-              para.cmdsn = htonl(shared->cmdsn);
-              para.type = htonl(1);
-              para.data.ap.firstSample = htonl(dstart);
-              para.data.ap.samples = htonl(part1);
-              // register ourself for the write handler.
-              int result;
-              result = ACE_Reactor::instance ()->register_handler (this,ACE_Event_Handler::WRITE_MASK);
-              if (result != 0)
-                return result;
-              this->mode_ = WRITE_FEEDBACK2;
-              temp = (char *)&para;
-              bytes = sizeof (para);
-            }
-          }
-      }
-      break;
-    default:
-      break;
+    /*
+    Fprintf(stderr, "AB got a packet: %d(%d)\n",
+	packet->firstSample, packet->samples);
+    */
+    /*
+    if (packet->firstSample % 10240 && !packet->resend) continue;
+    */
+    if (packet->samples * abuf->bps > PACKET_SIZE - sizeof(*packet)) {
+      fprintf(stderr, "Fatal error: AB has too small packet buffer, %d out of %d\n",
+	      PACKET_SIZE, packet->samples * abuf->bps + sizeof(*packet));
+      exit(1);
     }
-  return 0;
-}
 
-int
-AudioBuffer::handle_output (ACE_HANDLE fd)
-{
-  ACE_DEBUG ((LM_DEBUG,"handle_output:mode = %d\n",this->mode_));
-  int res;
-  if ((this->mode_ == WRITE_FEEDBACK1) || (this->mode_ == WRITE_FEEDBACK2))
-    {
-      // send feedback.
-
-      if (conn_tag != 0)
-        { /* packet stream */
-          res = ACE_OS::write (dataSocket, temp, bytes);
-          if (res == -1)
-            {
-              if (errno == ENOBUFS) {
-                ACE_OS::perror ("AB Warning, resend-req packet discarded for");
-                return 0;
-              }
-              ACE_OS::perror ("AB error, resend-req  packet sending failed");
-              ACE_Reactor::instance ()->end_event_loop (); return -1;
-            }
-        }
-      else 
-        {
-          res = ACE_OS::write (dataSocket, temp, bytes);
-          if (res == -1) {
-            ACE_OS::perror ("AB error, resend-req  packet sending failed");
-            ACE_Reactor::instance ()->end_event_loop (); return -1;
-          }
-        }
-      if (res == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,"(%P|%t)AudioBuffer::handle_output:write failed\n"));
-          ACE_Reactor::instance ()->end_event_loop (); return -1;
-        }
-      temp += res;
-      bytes -= res;
-      if (bytes != 0)
-          return 0;
-      else
-        {
-          // remove the write handler.
-          int result;
-          result = ACE_Reactor::instance ()->remove_handler (this,
-                                                             ACE_Event_Handler::WRITE_MASK);
-          if (result != 0)
-            return result;
-          
-          this->mode_ = READ_HEADER;
-          temp = (char *)packet;
-          bytes == -1;
-        }
+    if (packet->cmdsn != shared->cmdsn) { /* outdated packet */
+      /*
+      Fprintf(stderr, "AB discarded an outdated packet\n");
+      */
+      continue;
+    }
+    enter_cs(sid);
+    if (packet->firstSample + packet->samples <= abuf->ts) {
+      /* all samples too late, discard it */
+      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
+      abuf->samples = abuf->hs - abuf->ts;
+      leave_cs(sid);
+      /*
+      Fprintf(stderr, "AB all sample in packet %d(%d) too late\n",
+	      packet->firstSample, packet->samples);
+      */
+      goto feedback_code;
+    }
+    if (packet->firstSample >= abuf->ts + abuf->size) {
+      /* all samples too early, discard the packet */
+      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
+      abuf->samples = abuf->hs - abuf->ts;
+      leave_cs(sid);
+      /*
+      Fprintf(stderr, "AB all sample in packet %d(%d) too early\n",
+	      packet->firstSample, packet->samples);
+      */
+      goto feedback_code;
     }
-  if (this->mode_ == WRITE_FEEDBACK1)
+    
+    if (packet->samples > packet->actualSamples) {
+      leave_cs(sid);
+      fprintf(stderr, "Error: AB interpolation not available yet.\n");
+      exit(1);
+    }
+    
     {
-      // adjust the wakeup time and feedback state.
-        waketime = get_usec() + STARTUP_WAIT;
-        fbstate = 1;
+      int oldhs = abuf->hs;
+      int firstSample = max(packet->firstSample, abuf->ts);
+      int samples = min(packet->samples -
+			  (firstSample - packet->firstSample),
+			(abuf->ts + abuf->size) - packet->firstSample);
+      char * data = pkt_data +
+                    (firstSample - packet->firstSample) * abuf->bps;
+      int dstart = (abuf->tind + (firstSample - abuf->ts)) % abuf->size;
+      int part1 = min(samples, abuf->size - dstart);
+      memcpy(abuf->buf + (dstart * abuf->bps), data, part1 * abuf->bps);
+      if (part1 < samples) {
+	memcpy(abuf->buf, data + part1 * abuf->bps,
+	       (samples - part1) * abuf->bps);
+      }
+      abuf->hs = max(abuf->hs, packet->firstSample + packet->samples);
+      abuf->samples = abuf->hs - abuf->ts;
+      dstart =max(oldhs, abuf->ts);
+      
+      leave_cs(sid);
+      
+      part1 = firstSample - dstart;
+      if (packet->resend) {
+	Fprintf(stderr, "AB got resent %d(%d)\n",
+		packet->firstSample, packet->samples);
+      }
+      else if (part1 > 0) {
+	int res;
+	AudioFeedBackPara para;
+	Fprintf(stderr, "AB found gap %d(%d)\n", dstart, part1);
+	para.cmdsn = htonl(shared->cmdsn);
+	para.type = htonl(1);
+	para.data.ap.firstSample = htonl(dstart);
+	para.data.ap.samples = htonl(part1);
+	if (conn_tag != 0) { /* packet stream */
+	  while ((res = write(dataSocket, (char *)&para, sizeof(para))) == -1)
+	  {
+	    if (errno == EINTR)
+	      continue;
+	    if (errno == ENOBUFS) {
+	      perror("AB Warning, resend-req packet discarded for");
+	      break;
+	    }
+	    perror("AB error, resend-req  packet sending failed");
+	    exit(1);
+	  }
+	}
+	else {
+	  res = wait_write_bytes(dataSocket, (char *)&para, sizeof(para));
+	  if (res == -1) {
+	    perror("AB error, resend-req  packet sending failed");
+	    exit(1);
+	  }
+	}
+	if (res < sizeof(para)) {
+	  fprintf(stderr, "AB warn: send() for gap res %dB < sizeof(para) %dB\n",
+		  res, sizeof(para));
+	}
+      }
     }
-  return 0;
-}
-
-int
-AudioBuffer::ABprocess (int socket)
-{
-  int result;
-  ACE_DEBUG ((LM_DEBUG,"(%P|%t)AudioBuffer::ABprocess ()\n"));
-  packet = (AudioPacket *)ACE_OS::malloc(PACKET_SIZE);
-  if (packet == NULL) {
-   ACE_OS::perror ("AB failed to allocate mem for packet buffer");
-    ACE_Reactor::instance ()->end_event_loop (); return -1;
-  }
-
-  this->dataSocket = socket;
-  ACE_NEW_RETURN (this->handler_,
-                  Audio_Notification_Handler,
-                  -1);
-  // Register the notification handler with the reactor.
-  result = ACE_Reactor::instance ()->register_handler (this->handler_,
-                                                       ACE_Event_Handler::READ_MASK);
-  if (result != 0)
-    return result;
-
-  result = ACE_Reactor::instance ()->register_handler (this,
-                                                       ACE_Event_Handler::READ_MASK);
-
-  if (result != 0)
-    return result;
-
-  conn_tag = shared->audioMaxPktSize;
-  exit_tag = 0;
-
-  this->mode_ = READ_HEADER; 
-  pkt_data = (char *)packet + sizeof(*packet);
-  temp = (char *)packet;
-  bytes = -1;
-  return 0;
-}  
-
-// following is feedback algorithm.
-void 
-AudioBuffer::feedback (void)
-{
-  if (shared->live || (!shared->config.syncEffective)) return;
-  /*
+	
+    /* following is feedback algorithm */
+    
+  feedback_code:
+    
+    if (shared->live || (!shared->config.syncEffective)) continue;
+    /*
     fprintf(stderr, "AB fbstate = %d\n", fbstate);
     */
-  switch (fbstate) {
-  case 0: /* startup init */
-    if (pcmdsn != packet->cmdsn) {
-      fbstate = 0;
-      pcmdsn = packet->cmdsn;
-    }
-    else {
-      fbstate = 1;
-      waketime = get_usec() + STARTUP_WAIT;
-    }
-    break;
-  case 1: /* startup wait */
-    if (pcmdsn != packet->cmdsn) {
-      fbstate = 0;
+    switch (fbstate) {
+    case 0: /* startup init */
+      if (pcmdsn != packet->cmdsn) {
+	fbstate = 0;
+	pcmdsn = packet->cmdsn;
+      }
+      else {
+	fbstate = 1;
+	waketime = get_usec() + STARTUP_WAIT;
+      }
       break;
-    }
-    if (get_usec() >= waketime) {
-      fbstate = 2;
-    }
-    break;
-  case 2: /* monitoring */
-    if (pcmdsn != packet->cmdsn) {
-      fbstate = 0;
+    case 1: /* startup wait */
+      if (pcmdsn != packet->cmdsn) {
+	fbstate = 0;
+	break;
+      }
+      if (get_usec() >= waketime) {
+	fbstate = 2;
+      }
       break;
-    }
-    if (abuf->samples < abuf->size >>2 ||
-        abuf->samples > (abuf->size * 3) >> 2) 
-      {
-        /* feedback action needed */
-        AudioFeedBackPara para;
-        int res;
-        para.data.fb.addsps = 0;
-        para.data.fb.addSamples = (abuf->size >> 2) - abuf->samples;
+    case 2: /* monitoring */
+      if (pcmdsn != packet->cmdsn) {
+	fbstate = 0;
+	break;
+      }
+      if (abuf->samples < abuf->size >>2 ||
+	  abuf->samples > (abuf->size * 3) >> 2) {
+	/* feedback action needed */
+	AudioFeedBackPara para;
+	int res;
+	para.data.fb.addsps = 0;
+	para.data.fb.addSamples = (abuf->size >> 2) - abuf->samples;
+	
+	Fprintf(stderr, "AB sends fb: %dsps, %dsamples\n",
+		para.data.fb.addsps,
+		para.data.fb.addSamples);
+	para.cmdsn = htonl(shared->cmdsn);
+	para.type = htonl(0);
+	para.data.fb.addsps = htonl(para.data.fb.addsps);
+	para.data.fb.addSamples = htonl(para.data.fb.addSamples);
+	if (conn_tag != 0) {
+	  while ((res = write(dataSocket, (char *)&para, sizeof(para))) == -1)
+	  {
+	    if (errno == EINTR)
+	    continue;
+	    if (errno == ENOBUFS) {
+	      perror("AB Warning, fb packet discarded for");
+	      break;
+	    }
+	    perror("AB error, fb  packet sending failed");
+	    exit(1);
+	  }
+	}
+	else {
+	  res = wait_write_bytes(dataSocket, (char *)&para, sizeof(para));
+	  if (res == -1) {
+	    perror("AB error, fb  packet sending failed");
+	    exit(1);
+	  }
+	}
+	if (res < sizeof(para)) {
+	  fprintf(stderr, "AB warn: send() for sync res %dB < sizeof(para) %dB\n",
+		  res, sizeof(para));
+	}
 	
-        Fprintf(stderr, "AB sends fb: %dsps, %dsamples\n",
-                para.data.fb.addsps,
-                para.data.fb.addSamples);
-        para.cmdsn = htonl(shared->cmdsn);
-        para.type = htonl(0);
-        para.data.fb.addsps = htonl(para.data.fb.addsps);
-        para.data.fb.addSamples = htonl(para.data.fb.addSamples);
-        int result = ACE_Reactor::instance ()->register_handler (this,ACE_Event_Handler::WRITE_MASK);
-        if (result != 0)
-          ACE_DEBUG ((LM_DEBUG,"register_hanlder for write failed\n"));
-        this->mode_ = WRITE_FEEDBACK1;
-        temp = (char *)&para;
-        bytes = sizeof (para);
-        return;
+	waketime = get_usec() + STARTUP_WAIT;
+	fbstate = 1;
       }
-    break;
-  default:
-    break;
+      break;
+    default:
+      break;
+    }
   }
-}
-
-ACE_HANDLE
-Audio_Notification_Handler::get_handle (void) const
-{
-  return asp[1];
-}
+}  
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.h
deleted file mode 100644
index e1397665998..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ab.h
+++ /dev/null
@@ -1,161 +0,0 @@
-//  $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    mpeg_client
-//
-// = FILENAME
-//    ab.h
-//
-// = DESCRIPTION
-//     Defines the audio packet buffering process.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (AV_AB_H)
-#define AV_AB_H
-
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-#ifdef __svr4__
-#include <stropts.h>
-#include <sys/conf.h>
-#endif
-
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "mpeg_shared/filters.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"
-#include "ace/OS.h"
-#include "ace/Event_Handler.h"
-#include "ace/Reactor.h"
-#include "vb.h"
-
-extern VideoBuffer *vbuffer;
-
-/* magic number -- deviation is considered
-   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
-   */
-#define MAX_CLOCK_DRIFT 50
-
-#define max(a,b) ((a)>(b) ? (a) : (b))
-#define min(a,b) ((a)<(b) ? (a) : (b))
-#define PACKET_SIZE 8192
-#define STARTUP_WAIT 10000000
-#define ACTION_WAIT 5000000
-
-typedef struct {
-  int bufsize; /* number of bytes for the buffer pointed by 'buf' */
-  char * buf;  /* pointer to the data buffer area */
-  int bps; /* current byte-per-sample */
-  int size;  /* number of samples the buffer can hold */
-  int samples; /* number of samples in the buffer; */
-  int stuff; /* number of stuff samples to be read by ABgetSamples() */
-  int ts;  /* tail-sample: the next sample to be comsumed by CTR */
-  int hs;  /* head-sample: the next sample to be expected from the network */
-  int tind; /* index of the ts-sample in the buf */
-} ABBuffer;
-
-
-class Notification_Handler;
-
-class AudioBuffer :public ACE_Event_Handler
-{
-public:  
-  AudioBuffer (void);
-  // constructor.
-
-  int ABprocess (int dataSocket);
-  // start the buffering process.
-
-  ~AudioBuffer (void);
-  // destructor.
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // get the underlying I/O handle.
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // called when input arrives on the datasocket.
-
-  virtual int handle_output (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // Called to send feedback.
-
-  void set_silence(char *buf, int samples);
-
-  void ABinitBuf(int size);
-
-  void ABflushBuf(int nextSample);
-  // flush the whole buffer 
-
-  int ABcheckSamples(void);
-  // returns # of samples in ABbuf
-
-  int ABgetSamples(char * buf, int samples);
-  // read at most given number of samples from AB to buf, returns
-  // number of sample actually read 
-
-  int ABskipSamples(int samples);
-  // if samples < 0; then stuff |samples| silient samples to ABgetSamples(),
-  //   otherwise wipe out this number of samples from AB. 
-
-  void ABdeleteBuf(void);
-
-  void ABdeleteSem(void);
-
-  static void exit_on_kill(void);
-
-  static void usr1_handler(int sig);
-
-  static void usr2_handler(int sig);
-
-  void feedback (void);
-
-private:
-  char *temp;
-  // temporary pointer.
-  int bytes;
-  // temporary placeholder for no.of bytes to be read.
-  ABBuffer *abuf;
-  int sid;
-  int exit_tag;
-  int savedSocket;
-  AudioPacket *packet;
-  char *pkt_data;
-  int conn_tag;
-  /* following are for feedback */
-  int fbstate;
-  unsigned waketime;
-  int pcmdsn;
-
-  int dataSocket;
-  // data socket handle.
-
-  Notification_Handler *handler_;
-  
-  enum MODE {INVALID = -1,READ_HEADER,READ_DATA,WRITE_FEEDBACK1,WRITE_FEEDBACK2};
-  int mode_;
-};
-
-class Audio_Notification_Handler :public Notification_Handler
-{
-public:
-  virtual ACE_HANDLE get_handle (void) const;
-  // Returns the audio notification handle.
-};
-
-#endif /* AV_AB_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
index b99c7d35cba..e981ecc0e71 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/audio.cpp
@@ -167,7 +167,7 @@ int InitAudioDevice(void)
                BytesPerUnit(attributes.type) / SampsPerUnit(attributes.type);
   shared->AFPara.samplesPerSecond = ac->device->playSampleFreq;
   /*
-  ACE_OS::memcpy (&(shared->AFPara), &(shared->config.audioPara), sizeof(AudioParameter));
+  memcpy(&(shared->AFPara), &(shared->config.audioPara), sizeof(AudioParameter));
   */
   useAF = 1;
   fprintf(stderr, "Using default AudioFile.\n");
@@ -188,14 +188,14 @@ int InitAudioDevice(void)
   afd = open(AUDIO_DEVICE, O_WRONLY | O_NDELAY);
   if (afd == -1) {
     fprintf(stderr, "%s", AUDIO_DEVICE);
-   ACE_OS::perror (" can't be opened for write");
+    perror(" can't be opened for write");
     return -1;
   }
   cfd = open(AUDIO_CONTROL, O_WRONLY | O_NDELAY);
   if (cfd == -1) {
     fprintf(stderr, "%s", AUDIO_DEVICE);
-   ACE_OS::perror (" can't be opened for write");
-    ACE_OS::close (afd);
+    perror(" can't be opened for write");
+    close(afd);
     afd = -1;
     return -1;
   }
@@ -203,43 +203,43 @@ int InitAudioDevice(void)
   
   if (ioctl(cfd, AUDIO_SET_DATA_FORMAT, AUDIO_FORMAT_ULAW) < 0) {
     fprintf(stderr, "%s" AUDIO_DEVICE);
-   ACE_OS::perror ("can't be set to u-law");
-    ACE_OS::close (afd);
-    ACE_OS::close (cfd);
+    perror("can't be set to u-law");
+    close(afd);
+    close(cfd);
     afd = -1;
     return -1;
   }
   if (ioctl(cfd, AUDIO_SET_CHANNELS, 1) < 0) {
     fprintf(stderr, "%s" AUDIO_DEVICE);
-   ACE_OS::perror ("can't be set to have single channel");
-    ACE_OS::close (afd);
-    ACE_OS::close (cfd);
+    perror("can't be set to have single channel");
+    close(afd);
+    close(cfd);
     afd = -1;
     return -1;
   }
   if (ioctl(cfd, AUDIO_SET_SAMPLE_RATE, 8000) < 0) {
     fprintf(stderr, "%s" AUDIO_DEVICE);
-   ACE_OS::perror ("can't be set to 8000sps");
-    ACE_OS::close (afd);
-    ACE_OS::close (cfd);
+    perror("can't be set to 8000sps");
+    close(afd);
+    close(cfd);
     afd = -1;
     return -1;
   }
   if (ioctl(cfd, AUDIO_SET_OUTPUT, AUDIO_OUT_SPEAKER | AUDIO_OUT_HEADPHONE))
   {
     fprintf(stderr, "%s" AUDIO_DEVICE);
-   ACE_OS::perror ("can't be set output to both internal speaker and headphone");
-    ACE_OS::close (afd);
-    ACE_OS::close (cfd);
+    perror("can't be set output to both internal speaker and headphone");
+    close(afd);
+    close(cfd);
     afd = -1;
     return -1;
   }
   if(ioctl(cfd, AUDIO_SET_TXBUFSIZE, 1024*64) < 0)
   {
     fprintf(stderr, "%s" AUDIO_DEVICE);
-   ACE_OS::perror ("can't be set output buffer size to 64K");
-    ACE_OS::close (afd);
-    ACE_OS::close (cfd);
+    perror("can't be set output buffer size to 64K");
+    close(afd);
+    close(cfd);
     afd = -1;
     return -1;
   }
@@ -276,7 +276,7 @@ int InitAudioDevice(void)
   afd = open(AUDIO_DEVICE, O_WRONLY);
   if (afd == -1) {
     fprintf(stderr, "%s", AUDIO_DEVICE);
-   ACE_OS::perror (" can't be opened for write");
+    perror(" can't be opened for write");
     return -1;
   }
   
@@ -380,7 +380,7 @@ unsigned int PlayAudioSamples(unsigned int time, char * buf, int size)
     }
   }
 #else
-  ACE_OS::write (afd, buf, size);
+  write(afd, buf, size);
 #endif
 
   current_time += size;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
index 80fa1cedf07..7e4de09bfa8 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ctr.cpp
@@ -58,21 +58,14 @@ ACE_RCSID(mpeg_client, ctr, "$Id$")
 
 #define SPEEDHIST_SIZE 20
 
-#if defined max
-#undef max
-#endif
 #define max(a,b) (a>b ? a : b)
-
-#if defined min
-#undef min
-#endif
 #define min(a,b) (a<b ? a : b)
 
 static int usr1_flag = 0;
 static int rtplay = 1;
 static int cmdSocket = -1;
-
 static int writeSocket = -1;
+static int javaSocket = -1;
 static int CTRpid = -1, VBpid = -1, VDpid = -1, UIpid = -1;
 static int ABpid = -1;
 static int videoSocket = -1;
@@ -120,12 +113,6 @@ static int fb_startup = 0; /* Indicate the first feedback action. The first feed
 			      feedback action would then adjust server fps linearly
 			      adjstep each time */
 
-AudioBuffer *abuffer;
-VideoBuffer *vbuffer;
-int asp[2];
-int vsp[2];
-int vdsp[2];
-
 #define max(a,b) (a>b ? a : b)
 #define min(a,b) (a<b ? a : b)
 
@@ -140,21 +127,91 @@ OurCmdRead(char *buf, int size)
   if (size == 0) return 0;
   if (cmdBytes > 0)
   {
-    ACE_OS::memcpy (buf, cmdBuffer, size);
+    memcpy(buf, cmdBuffer, size);
     cmdBytes -= size;
     cmdBuffer += size;
     return 0;
   }
-  while ((val = ACE_OS::read (cmdSocket, (buf), (size))) <= 0)
+  while ((val = read(cmdSocket, (buf), (size))) <= 0)
     {
     if (val == -1 && errno == EINTR) return 1;
     if (!val) {
-     ACE_OS::perror ("CTR error, EOF reached unexpected within CmdRead()");
+      perror("CTR error, EOF reached unexpected within CmdRead()");
     }
     else {
-     ACE_OS::perror ("CTR CmdRead() from UI through CmdSocket");
+      perror("CTR CmdRead() from UI through CmdSocket");
     }
-    ACE_OS::exit (1);
+    exit(1);
+  }
+  return 0;
+}
+
+void CmdRead(char *buf, int size)
+{
+  int val;
+  if (size == 0) return;
+  if (cmdBytes > 0)
+  {
+    memcpy(buf, cmdBuffer, size);
+    cmdBytes -= size;
+    cmdBuffer += size;
+    return;
+  }
+  while ((val = read(cmdSocket, (buf), (size))) <= 0)
+    {
+    if (val == -1 && errno == EINTR) continue;
+    if (!val) {
+      perror("CTR error, EOF reached unexpected within CmdRead()");
+    }
+    else {
+      perror("CTR CmdRead() from UI through CmdSocket");
+    }
+    exit(1);
+  }
+  return;
+}
+
+static int CmdReadNW(char *buf, int size)
+{
+  struct fd_set read_mask;
+  int nfds = cmdSocket+1;
+  int val;
+
+  if (size == 0) return 0;
+
+  if (cmdBytes > 0)
+  {
+    memcpy(buf, cmdBuffer, size);
+    cmdBytes -= size;
+    cmdBuffer += size;
+    return 0;
+  }
+
+  FD_ZERO(&read_mask);
+  FD_SET(cmdSocket, &read_mask);
+#ifdef _HPUX_SOURCE
+  if (select(nfds, (int *)&read_mask, NULL, NULL, NULL) == -1)
+#else
+  if (select(nfds, &read_mask, NULL, NULL, NULL) == -1)
+#endif
+  {
+    if (errno == EINTR)
+      return -1;
+    perror("CTR CmdReadNW by select");
+    exit(1);
+  }
+  if ((val = read(cmdSocket, (buf), (size))) < 0)
+  {
+    if (errno == EINTR)
+      return -1;
+
+    perror("CTR CmdReadNW by read");
+    exit(1);
+  }
+  if (val == 0)
+  {
+    fprintf(stderr, "Error: EOF reached unexpectedly within CmdReadNW().");
+    exit(1);
   }
   return 0;
 }
@@ -171,8 +228,8 @@ static void CmdWrite(unsigned char * buf, int size)
   {
     if (errno == EINTR)
       continue;
-    ACE_OS::perror ("CTR writes to UI through cmdSocket");
-    ACE_OS::exit (1);
+    perror("CTR writes to UI through cmdSocket");
+    exit(1);
   }
 }
 
@@ -185,7 +242,7 @@ static void SocketRead(int s, char *buf, int size)
   //  fprintf (stderr, "SocketRead: videoSocket = %d\n",videoSocket);
   for (;;)
   {
-    val = ACE_OS::read (s, ptr, remain);
+    val = read(s, ptr, remain);
 
     //    fprintf(stderr, "CTR got from %sSocket %d of %d.\n",s == videoSocket ? "video" : "audio", val, remain);
 
@@ -198,14 +255,14 @@ static void SocketRead(int s, char *buf, int size)
     {
       fprintf(stderr, "CTR error read %sSocket, ret=%d(size=%d)",
 	      s == videoSocket ? "video" : "audio", size-remain, size);
-      ACE_OS::perror ("");
-      ACE_OS::exit (1);
+      perror("");
+      exit(1);
     }
     if (val == 0)
     {
       fprintf(stderr, "CTR error read %sSocket, EOF met, ret=%d(size=%d).\n",
 	      s == videoSocket ? "video" : "audio", size-remain, size);
-      ACE_OS::exit (1);
+      exit(1);
     }
     ptr += val;
     remain -= val;
@@ -213,23 +270,66 @@ static void SocketRead(int s, char *buf, int size)
     {
       fprintf(stderr, "CTR error read %sSocket, read too much, ret=%d(size=%d).\n",
 	      s == videoSocket ? "video" : "audio", size-remain, size);
-      ACE_OS::exit (1);
+      exit(1);
     }
     if (remain == 0)
       break;
   }
 }
 
+#if 0
+static void SocketRecv(int s, char *buf, int size)
+{ int val, remain = size;
+  char * ptr = buf;
+  for (;;)
+  {
+    val = read(s, ptr, remain);
+    /*
+    fprintf(stderr, "CTR got from %sSocket %d of %d.\n",
+	    s == videoSocket ? "video" : "audio", val, remain);
+    */
+    if (val == -1 && errno == EINTR)
+    {
+      errno = 0;
+      continue;
+    }
+    if (val == -1)
+    {
+      fprintf(stderr, "CTR error read %sSocket, ret=%d(size=%d)",
+	      s == videoSocket ? "video" : "audio", size-remain, size);
+      perror("");
+      exit(1);
+    }
+    if (val == 0)
+    {
+      fprintf(stderr, "CTR error read %sSocket, EOF met, ret=%d(size=%d).\n",
+	      s == videoSocket ? "video" : "audio", size-remain, size);
+      exit(1);
+    }
+    ptr += val;
+    remain -= val;
+    if (remain < 0)
+    {
+      fprintf(stderr, "CTR error read %sSocket, read too much, ret=%d(size=%d).\n",
+	      s == videoSocket ? "video" : "audio", size-remain, size);
+      exit(1);
+    }
+    if (remain == 0)
+      break;
+  }
+}
+#endif
+
 #define VideoRead(buf, size) SocketRead(videoSocket, buf, size)
 
 #define VideoWrite(buf, psize) \
-  { int val; while ((val = ACE_OS::write (videoSocket, (buf), (psize))) == -1) \
+  { int val; while ((val = write(videoSocket, (buf), (psize))) == -1) \
     { if (errno == EINTR) continue; \
-     ACE_OS::perror ("CTR writes to VS through videoSocket");\
-      ACE_OS::exit (1); \
+      perror("CTR writes to VS through videoSocket");\
+      exit(1); \
     } \
     if (val < (int)(psize)) { \
-      fprintf(stderr, "CTR bad VideoWrite, size %d, val %d", psize, val);ACE_OS::perror (""); }\
+      fprintf(stderr, "CTR bad VideoWrite, size %d, val %d", psize, val); perror(""); }\
   }
 
 #define AudioRead(buf, size) SocketRead(audioSocket, buf, size)
@@ -237,8 +337,8 @@ static void SocketRead(int s, char *buf, int size)
 #define AudioWrite(buf, size) \
   { while (write(audioSocket, (buf), (size)) == -1) \
     { if (errno == EINTR) continue; \
-     ACE_OS::perror ("CTR writes to AS through audioSocket"); \
-      ACE_OS::exit (1); \
+      perror("CTR writes to AS through audioSocket"); \
+      exit(1); \
     } \
   }
 
@@ -369,15 +469,15 @@ static void PlayAudioInit(void)
                     * (double)shared->audioPara.samplesPerSecond / 1000.0);
   if (rawBuf == NULL)
   {
-    if ((rawBuf = (char *)ACE_OS::malloc(AUDIO_BUFSIZE)) == NULL)
+    if ((rawBuf = (char *)malloc(AUDIO_BUFSIZE)) == NULL)
     {
-     ACE_OS::perror ("CTR fails to allocate rawBuf for audio channel");
-      ACE_OS::exit (1);
+      perror("CTR fails to allocate rawBuf for audio channel");
+      exit(1);
     }
-     if ((workBuf = (char *)ACE_OS::malloc(AUDIO_BUFSIZE)) == NULL)
+     if ((workBuf = (char *)malloc(AUDIO_BUFSIZE)) == NULL)
     {
-     ACE_OS::perror ("CTR fails to allocate workBuf for audio channel");
-      ACE_OS::exit (1);
+      perror("CTR fails to allocate workBuf for audio channel");
+      exit(1);
     }
   }
   AudioBufSize = (AUDIO_BUFSIZE / shared->audioPara.bytesPerSample) *
@@ -441,7 +541,7 @@ static int PlayAudio(void)
                       ((double)timer_count / shared->pictureRate) *
                       shared->audioPara.samplesPerSecond);
     int skip_samples = next_sample - nextASSample;
-    abuffer->ABskipSamples(skip_samples);
+    ABskipSamples(skip_samples);
     nextAFtime += (unsigned int)(((double)skip_samples *
                    (double)shared->audioPara.samplesPerSecond) /
                   (double)shared->samplesPerSecond);
@@ -471,10 +571,10 @@ static int PlayAudio(void)
   please reduce value of parameter 'Audio timer interval',\n\
   or 'Audio buffered intervals' or Frames per audio play',\n\
   and try again.\n");
-      ACE_OS::exit (1);
+      exit(1);
     }
 
-    read_samples = abuffer->ABgetSamples(ptr, frame_samples);
+    read_samples = ABgetSamples(ptr, frame_samples);
 
     /* convert and play to AF */
     {
@@ -497,7 +597,7 @@ static int PlayAudio(void)
           break;
         else
         {
-          ACE_OS::memcpy (rawBuf, rawBuf + samples * shared->audioPara.bytesPerSample,
+          memcpy(rawBuf, rawBuf + samples * shared->audioPara.bytesPerSample,
                  left_samples * shared->audioPara.bytesPerSample);
         }
       }
@@ -549,7 +649,7 @@ static void start_timer (void)
       if (shared->nextSample < shared->totalSamples)
         {
           int samples = videoSocket >= 0 ? 1200 : 1200;
-          while (abuffer->ABcheckSamples() <= samples)
+          while (ABcheckSamples() <= samples)
             {
               if (get_duration(val1, get_usec()) >= MAX_WAIT_USEC)
                 {
@@ -721,6 +821,11 @@ static void usr1_handler(int sig)
   }
 }
 
+static void default_usr2_handler(int sig)
+{
+  Fprintf(stderr, "CTR warning: void SIGUSR2 handler.\n");
+}
+
 static void compute_sendPattern(void)
 {
   char buf[PATTERN_SIZE];
@@ -747,7 +852,7 @@ static void compute_sendPattern(void)
   ComputeSendPattern(pat, buf, len, f);
   shared->qosRecomputes ++;
 
-  ACE_OS::memcpy (shared->sendPattern, buf, PATTERN_SIZE);
+  memcpy(shared->sendPattern, buf, PATTERN_SIZE);
 
   f = len - f;
   if (shared->config.verbose) {
@@ -763,6 +868,32 @@ static void compute_sendPattern(void)
   }
 }
 
+/* about automatic experiment plan by software developers or specific users:
+   to be able to conduct experiment plan, the user need to have a uid defined
+   by DEVELOPER_UID in "../include/common.h", and he/she needs to prepare a file
+   EXP_PLAN_FILE, with following format:
+
+   {Delay #seconds |
+    Expriment } *
+   EndExpriment
+
+   An experiment command is followed by one or more of following parameters:
+
+   playSpeed 	#float
+   frameRateLimit #float
+   maxSPframes 	#int
+   filterPara	#int
+   collectStat 	0/1
+   qosEffective 0/1
+   syncEffective 0/1
+
+   and the parameter is terminated by an empty line.
+
+   The automatic experiment plan file is opened after init() and experiment
+   setting read just before calling play(). The Player will be terminated
+   after all experiments are done.
+
+   */
 
 static void on_exit_routine(void)
 {
@@ -776,30 +907,26 @@ static void on_exit_routine(void)
 
   if (audioSocket >= 0)
   {
-    char message[BUFSIZ];
-    message [0] = EXIT;
-    ACE_OS::write (asp[0],&message,BUFSIZ);
-    //    ACE_OS::write (audioSocket, &tmp, 1);
-    //    ComCloseConn(audioSocket);
+    write(audioSocket, &tmp, 1);
+    ComCloseConn(audioSocket);
     audioSocket = -1;
   }
 
   if (videoSocket >= 0)
   {
-    //   ACE_OS::write (videoSocket, &tmp, 1);
+    //   write(videoSocket, &tmp, 1);
     //    ComCloseConn(videoSocket);
     videoSocket = -1;
     if (VBpid > 0) {
-      char message[BUFSIZ];
-      message [0] = EXIT;
-      ACE_OS::write (vsp[0],&message,BUFSIZ);
-      //      ACE_OS::kill (VBpid, SIGUSR1);
+      kill(VBpid, SIGUSR1);
       VBpid = -1;
     }
   }
   ComCloseClient();
 }
 
+#define EXP_PLAN_FILE "experiment_plan"
+
 int CTRmain(int argc,
             char **argv)
 {
@@ -809,6 +936,7 @@ int CTRmain(int argc,
   FILE * fp = NULL;   /* file pointer for experiment plan */
 
   set_exit_routine_tag(0);
+  //  setsignal(SIGUSR2, default_usr2_handler);
 
   /* allocate shared data structure and initialize it */
   shared = (SharedData *) creat_shared_mem(sizeof(*shared));
@@ -850,72 +978,50 @@ int CTRmain(int argc,
   shared->config.maxSPframes = DEFAULT_maxSPframes;
   shared->config.audioConn = 0;
   shared->config.videoConn = 0;
-  shared->config.verbose = (!getuid()) || ACE_OS::getuid () == DEVELOPER_UID;
-
-  ACE_NEW_RETURN (vbuffer,
-                  VideoBuffer (),
-                  -1);
-
-  ACE_NEW_RETURN (abuffer,
-                  AudioBuffer (),
-                  -1);
+  shared->config.verbose = (!getuid()) || getuid() == DEVELOPER_UID;
 
   /* create all shared buffers: AB-CTR, VB-VD, VD-VP */
-  abuffer->ABinitBuf(AB_BUF_SIZE);
-  vbuffer->VBinitBuf(VB_BUF_SIZE);
+  ABinitBuf(AB_BUF_SIZE);
+  VBinitBuf(VB_BUF_SIZE);
   VDinitBuf(VD_BUF_SIZE);
 
-  CTRpid =ACE_OS::getpid ();
+  CTRpid = getpid();
   set_exit_routine_tag(1);
 
-
-  // create the notification socket pair.
-  if (ACE_OS::socketpair (AF_UNIX,SOCK_STREAM,0,asp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"Error in opening notification socket:%p",
-                       "notification socket"),-1);
-
-  // create the notification socket pair.
-  if (ACE_OS::socketpair (AF_UNIX,SOCK_STREAM,0,vsp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"Error in opening notification socket:%p",
-                       "notification socket"),-1);
-
-  if (ACE_OS::socketpair (AF_UNIX,SOCK_STREAM,0,vdsp) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,"Error in opening notification socket:%p",
-                       "notification socket"),-1);
-
   /* create command socket pair */
   if (ACE_OS::socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == -1)
   {
-   ACE_OS::perror ("CTR error on open cmd socketpair");
-    ACE_OS::exit (1);
+    perror("CTR error on open cmd socketpair");
+    exit(1);
   }
   cmdSocket = sv[0];
+  cerr << "cmdsocket = " << cmdSocket << endl;
   /* fork processes: VD, GUI */
 
-  if ((VDpid = ACE_OS::fork ()) == -1)
+  if ((VDpid = fork()) == -1)
   {
-   ACE_OS::perror ("CTR error on fork VD");
-    ACE_OS::exit (1);
+    perror("CTR error on fork VD");
+    exit(1);
   } else if (VDpid == 0)
   {
-    abuffer->ABdeleteBuf();
-    ACE_OS::close (sv[0]);
-    ACE_OS::close (sv[1]);
+    ABdeleteBuf();
+    close(sv[0]);
+    close(sv[1]);
     if (realTimeFlag >= 3) {
       if (SetRTpriority("VD", 0)) realTimeFlag = 0;
     }
     VDprocess(CTRpid);
   }
 
-  if ((UIpid = ACE_OS::fork ()) == -1)
+  if ((UIpid = fork()) == -1)
   {
-   ACE_OS::perror ("CTR error on fork UI");
-    ACE_OS::exit (1);
+    perror("CTR error on fork UI");
+    exit(1);
   } else if (UIpid == 0)
   {
-    vbuffer->VBdeleteBuf();
-    abuffer->ABdeleteBuf();
-    ACE_OS::close (sv[0]);
+    VBdeleteBuf();
+    ABdeleteBuf();
+    close(sv[0]);
     if (realTimeFlag >= 2) {
 #ifdef __svr4__
       if (SetRTpriority("VB", 0)) realTimeFlag = 0;
@@ -925,7 +1031,8 @@ int CTRmain(int argc,
     }
     UIprocess(sv[1]);
   }
-  ACE_OS::close (sv[1]);
+  close(sv[1]);
+  //  setsignal(SIGUSR1, usr1_handler);
 
   /* initialize Audio device */
   if (InitAudioDevice() == 0)
@@ -935,30 +1042,32 @@ int CTRmain(int argc,
 
   //  ComInitClient(VCR_TCP_PORT, VCR_UNIX_PORT, VCR_ATM_PORT);
 
-  if ((vh = (char *)ACE_OS::malloc(PATH_SIZE)) == NULL)
+  if ((vh = (char *)malloc(PATH_SIZE)) == NULL)
   {
-   ACE_OS::perror ("CTR failed to allocate space for vh");
-    ACE_OS::exit (1);
+    perror("CTR failed to allocate space for vh");
+    exit(1);
   }
-  if ((vf = (char *)ACE_OS::malloc(PATH_SIZE)) == NULL)
+  if ((vf = (char *)malloc(PATH_SIZE)) == NULL)
   {
-   ACE_OS::perror ("CTR failed to allocate space for vf");
-    ACE_OS::exit (1);
+    perror("CTR failed to allocate space for vf");
+    exit(1);
   }
-  if ((ah = (char *)ACE_OS::malloc(PATH_SIZE)) == NULL)
+  if ((ah = (char *)malloc(PATH_SIZE)) == NULL)
   {
-   ACE_OS::perror ("CTR failed to allocate space for ah");
-    ACE_OS::exit (1);
+    perror("CTR failed to allocate space for ah");
+    exit(1);
   }
-  if ((af = (char *)ACE_OS::malloc(PATH_SIZE)) == NULL)
+  if ((af = (char *)malloc(PATH_SIZE)) == NULL)
   {
-   ACE_OS::perror ("CTR failed to allocate space for af");
-    ACE_OS::exit (1);
+    perror("CTR failed to allocate space for af");
+    exit(1);
   }
   if (realTimeFlag) {
     if (SetRTpriority("CTR", 4)) realTimeFlag = 0;
   }
 
+  //  atexit(on_exit_routine);
+
   // instantiate our command handler
   Command_Handler command_handler (cmdSocket);
   if (command_handler.init (argc,argv) == -1)
@@ -973,27 +1082,36 @@ int CTRmain(int argc,
                          "(%P|%t) register_handler for command_handler failed\n"),
                         -1);
 
-      int result = command_handler.run ();
-      if (ABpid == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()\n",ACE_OS::getpid ()));
-          ACE_Reactor::instance ()->run_event_loop ();
-          int result = TAO_ORB_Core_instance ()->reactor ()->remove_handler (&command_handler,
-                                                                             ACE_Event_Handler::READ_MASK);
-          if (result == -1)
-            ACE_DEBUG ((LM_DEBUG,"(%P)Remove handler for Command Handler failed\n"));
-        }
+//   // and now instantiate the sig_handler
+//   Client_Sig_Handler client_sig_handler (&command_handler);
 
-      if (VBpid == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,"(%d) Restarting the ACE_Reactor::instance ()\n",ACE_OS::getpid ()));
-          ACE_Reactor::instance ()->run_event_loop ();
-        }
-      
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) Exited the client command handler event loop\n"
-                  "%p\n",
-                  "run_event_loop"));
+//   // .. and ask it to register itself with the reactor
+//   if (client_sig_handler.register_handler () < 0)
+//     ACE_ERROR_RETURN ((LM_ERROR,
+//                        "(%P|%t) register_handler for sig_handler failed\n"),
+//                       -1);
+
+  // and run the event loop
+  //  TAO_ORB_Core_instance ()->reactor ()->run_event_loop ();
+  //  int result;
+//   while (1)
+//     {
+      int result = command_handler.run ();
+//       cerr << "result " << result << " ";
+//       //      ACE_DEBUG ((LM_DEBUG,"Command_Handler::run result is %s\n",result));
+//       if (errno == EINTR)
+//         {
+//           cerr << "Interrupted run ";
+//           continue;
+//         }
+//       else
+//         break;
+//     }
+
+  ACE_DEBUG ((LM_DEBUG,
+              "(%P|%t) Exited the client command handler event loop\n"
+              "%p\n",
+              "run_event_loop"));
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
index 7caa4bb8621..b73150396aa 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/file.cpp
@@ -75,7 +75,7 @@ void StartLocalServer(void)
 /* hostname == "" defaults to local host */
 static void StartFile(char *hostname, char *filename)
 {
-  char *title = (char *)ACE_OS::malloc(strlen(hostname) +ACE_OS::strlen (filename) + 10);
+  char *title = (char *)malloc(strlen(hostname) + strlen(filename) + 10);
   char buf[BUFSIZE];
   int len;
 
@@ -88,7 +88,7 @@ static void StartFile(char *hostname, char *filename)
     strncpy(buf, filename, BUFSIZE);
     buf[BUFSIZE-1] = 0;
   }
-  len =ACE_OS::strlen (buf);
+  len = strlen(buf);
 
   if (title == NULL) title = filename;
   else sprintf(title, "%s:%s", hostname, filename);
@@ -100,7 +100,7 @@ static void StartFile(char *hostname, char *filename)
   else
     fprintf(stderr, "Error: type of file %s not known (know only .mpeg .mpg, .au).\n",
 	    filename);
-  if (title != filename) ACE_OS::free (title);
+  if (title != filename) free(title);
 }
 
 static void dismissCB(Widget W, XtPointer closure, XtPointer call_data)
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp
index b5d07070aa1..d5c3bb52e88 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2.cpp
@@ -130,8 +130,8 @@ void FS2DitherImage(unsigned char *lum, unsigned char *cr,
   /* Allocate error arrays. */
 
   if (first) {
-    cur_row_error = (char *) ACE_OS::malloc(cols+2);
-    next_row_error = (char *) ACE_OS::malloc(cols+2);
+    cur_row_error = (char *) malloc(cols+2);
+    next_row_error = (char *) malloc(cols+2);
     first = 0;
   }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp
index f5eb87c236f..616ffd7bcbe 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs2fast.cpp
@@ -140,12 +140,12 @@ FS2FastDitherImage (
 
     if (first) {
       first = 0;
-      yerr1 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-      yerr2 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-      uerr1 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-      uerr2 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-      verr1 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-      verr2 = (int *) ACE_OS::malloc((w+5)*sizeof(int));
+      yerr1 = (int *) malloc((w+5)*sizeof(int));
+      yerr2 = (int *) malloc((w+5)*sizeof(int));
+      uerr1 = (int *) malloc((w+5)*sizeof(int));
+      uerr2 = (int *) malloc((w+5)*sizeof(int));
+      verr1 = (int *) malloc((w+5)*sizeof(int));
+      verr2 = (int *) malloc((w+5)*sizeof(int));
     }
 
     /*
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp
index 79174685246..800aca3905d 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/fs4.cpp
@@ -128,8 +128,8 @@ FS4DitherImage(unsigned char *lum, unsigned char *cr,
   FS4Dither *chan_index;
 
   if (first) {
-    cur_row_error = (char *) ACE_OS::malloc(cols+2);
-    next_row_error = (char *) ACE_OS::malloc(cols+2);
+    cur_row_error = (char *) malloc(cols+2);
+    next_row_error = (char *) malloc(cols+2);
     first = 0;
   }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp
index 11b969be3a2..b6e469d38e9 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybrid.cpp
@@ -69,7 +69,7 @@ InitHybridDither()
   unsigned char *lmark;
 
   for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) ACE_OS::malloc(256);
+    lmark = l_darrays[i] = (unsigned char *) malloc(256);
 
     for (j=0; j<lum_values[0]; j++) {
       *lmark++ = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp
index b07d19ea14b..274ef24cd2f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/hybriderr.cpp
@@ -73,7 +73,7 @@ InitHybridErrorDither()
 
 
   for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) ACE_OS::malloc(256);
+    lmark = l_darrays[i] = (unsigned char *) malloc(256);
 
     for (j=0; j<lum_values[0]; j++) {
       *lmark++ = 0;
@@ -248,8 +248,8 @@ HybridErrorDitherImage (unsigned char *lum, unsigned char *cr,
   /* If first time called, allocate error arrays. */
 
   if (first) {
-    cr_row_errs = (int *) ACE_OS::malloc((w+5)*sizeof(int));
-    cb_row_errs = (int *) ACE_OS::malloc((w+5)*sizeof(int));
+    cr_row_errs = (int *) malloc((w+5)*sizeof(int));
+    cb_row_errs = (int *) malloc((w+5)*sizeof(int));
     first = 0;
   }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp
index 716648959b6..c1a69ad2041 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mb_ordered.cpp
@@ -67,16 +67,16 @@ InitMBOrderedDither()
   int i, j, pos;
   int err_range, threshval;
 
-  pos_2_cb = (unsigned char ****) ACE_OS::malloc (DITH_SIZE*sizeof(unsigned char ***));
-  cb_2_cr = (unsigned char ***) ACE_OS::malloc(CB_RANGE*sizeof(unsigned char **));
-  cr_2_l = (unsigned char **) ACE_OS::malloc(CR_RANGE*sizeof(unsigned char *));
+  pos_2_cb = (unsigned char ****) malloc (DITH_SIZE*sizeof(unsigned char ***));
+  cb_2_cr = (unsigned char ***) malloc(CB_RANGE*sizeof(unsigned char **));
+  cr_2_l = (unsigned char **) malloc(CR_RANGE*sizeof(unsigned char *));
 
   for (pos=0; pos<DITH_SIZE; pos++) {
     
-    pos_2_cb[pos] = (unsigned char ***) ACE_OS::malloc(256*(sizeof(unsigned char **)));
+    pos_2_cb[pos] = (unsigned char ***) malloc(256*(sizeof(unsigned char **)));
 
     for (j=0; j<CB_RANGE; j++) {
-      cb_2_cr[j] = (unsigned char **) ACE_OS::malloc(256*(sizeof(unsigned char *)));
+      cb_2_cr[j] = (unsigned char **) malloc(256*(sizeof(unsigned char *)));
     }
 
     for (cb_val=0; cb_val<cb_values[0]; cb_val++) {
@@ -100,7 +100,7 @@ InitMBOrderedDither()
     for (cb_rval=0; cb_rval<CB_RANGE; cb_rval++) {
       
       for (j=0; j<CR_RANGE; j++) {
-	cr_2_l[j] = (unsigned char *) ACE_OS::malloc(256*(sizeof(unsigned char)));
+	cr_2_l[j] = (unsigned char *) malloc(256*(sizeof(unsigned char)));
       }
 
       for (cr_val=0; cr_val < cr_values[0]; cr_val++) {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp
index 879de356059..27e8c83a592 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/mono.cpp
@@ -86,11 +86,11 @@ MonoDitherImage(register unsigned char *lum, unsigned char *cr,
   register int next2;
 
   if(curr == NULL) {
-    curr = (int *)ACE_OS::malloc(sizeof(int) * (w + 2));
+    curr = (int *)malloc(sizeof(int) * (w + 2));
     curr += 1;
   }
   if(next == NULL) {
-    next = (int *)ACE_OS::malloc(sizeof(int) * (w + 2));
+    next = (int *)malloc(sizeof(int) * (w + 2));
     next += 1;
   }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp
index e62806771b2..5306f742242 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered.cpp
@@ -65,7 +65,7 @@ InitOrderedDither()
   unsigned char *lmark, *cmark;
 
   for (i=0; i<DITH_SIZE; i++) {
-    lmark = l_darrays[i] = (unsigned char *) ACE_OS::malloc(256);
+    lmark = l_darrays[i] = (unsigned char *) malloc(256);
 
     for (j=0; j<lum_values[0]; j++) {
       *lmark++ = 0;
@@ -87,7 +87,7 @@ InitOrderedDither()
   }
 
   for (i=0; i<DITH_SIZE; i++) {
-    cmark = cr_darrays[i] = (unsigned char *) ACE_OS::malloc(256);
+    cmark = cr_darrays[i] = (unsigned char *) malloc(256);
 
     for (j=0; j<cr_values[0]; j++) {
       *cmark++ = 0;
@@ -109,7 +109,7 @@ InitOrderedDither()
   }
 
   for (i=0; i<DITH_SIZE; i++) {
-    cmark = cb_darrays[i] = (unsigned char *) ACE_OS::malloc(256);
+    cmark = cb_darrays[i] = (unsigned char *) malloc(256);
 
     for (j=0; j<cb_values[0]; j++) {
       *cmark++ = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp
index c57d2ba21e1..5f8adb7da50 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ordered2.cpp
@@ -67,16 +67,16 @@ InitOrdered2Dither()
   int i, j, pos;
   int err_range, threshval;
 
-  pos_2_cb = (unsigned char ****) ACE_OS::malloc (DITH_SIZE*sizeof(unsigned char ***));
-  cb_2_cr = (unsigned char ***) ACE_OS::malloc(CB_RANGE*sizeof(unsigned char **));
-  cr_2_l = (unsigned char **) ACE_OS::malloc(CR_RANGE*sizeof(unsigned char *));
+  pos_2_cb = (unsigned char ****) malloc (DITH_SIZE*sizeof(unsigned char ***));
+  cb_2_cr = (unsigned char ***) malloc(CB_RANGE*sizeof(unsigned char **));
+  cr_2_l = (unsigned char **) malloc(CR_RANGE*sizeof(unsigned char *));
 
   for (pos=0; pos<DITH_SIZE; pos++) {
     
-    pos_2_cb[pos] = (unsigned char ***) ACE_OS::malloc(256*(sizeof(unsigned char **)));
+    pos_2_cb[pos] = (unsigned char ***) malloc(256*(sizeof(unsigned char **)));
 
     for (j=0; j<CB_RANGE; j++) {
-      cb_2_cr[j] = (unsigned char **) ACE_OS::malloc(256*(sizeof(unsigned char *)));
+      cb_2_cr[j] = (unsigned char **) malloc(256*(sizeof(unsigned char *)));
     }
 
     for (cb_val=0; cb_val<cb_values[0]; cb_val++) {
@@ -100,7 +100,7 @@ InitOrdered2Dither()
     for (cb_rval=0; cb_rval<CB_RANGE; cb_rval++) {
       
       for (j=0; j<CR_RANGE; j++) {
-	cr_2_l[j] = (unsigned char *) ACE_OS::malloc(256*(sizeof(unsigned char)));
+	cr_2_l[j] = (unsigned char *) malloc(256*(sizeof(unsigned char)));
       }
 
       for (cr_val=0; cr_val < cr_values[0]; cr_val++) {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp
index de3e5a358f5..40307c30f9b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/para.cpp
@@ -125,7 +125,7 @@ static void InitBuf(void)
     goto InitBuf_exit1;
   }
   buf[strlen(buf)-1] = 0;
-  if (ACE_OS::strcmp (buf, BANNER))
+  if (strcmp(buf, BANNER))
   {
     fprintf(stderr, "BANNER in %s not expected, use default parameter value\n",
 	    PARAMETER_FILE);
@@ -153,7 +153,7 @@ static void SaveBuf(void)
   if (fp == NULL)
   {
     fprintf(stderr, "Fail to open %s for saving para", buf);
-   ACE_OS::perror ("");
+    perror("");
     return;
   }
   Fputs(BANNER);
@@ -318,13 +318,13 @@ Widget CreateParameterWindow(Widget parent)
     {
       fprintf(stderr, "Error in para.c: fewer titles than parameters, %d out of %d.\n",
 	      items, ITEMS);
-      ACE_OS::exit (1);
+      exit(1);
     }
-    item = (XmString *)ACE_OS::malloc(sizeof(*item) * items);
+    item = (XmString *)malloc(sizeof(*item) * items);
     if (item == NULL)
     {
-     ACE_OS::perror ("UI allocate parameter list item(XmString)");
-      ACE_OS::exit (1);
+      perror("UI allocate parameter list item(XmString)");
+      exit(1);
     }
     for (i = 0; i < items; i ++)
     {
@@ -343,7 +343,7 @@ Widget CreateParameterWindow(Widget parent)
     XtManageChild(wparalist);
     for (i = 0; i < items; i++)
       XmStringFree(item[i]);
-    ACE_OS::free (item);
+    free(item);
   }
   XmFontListFree(fontlist);
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp
index 1469e13ac6f..679c8178430 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/prog.cpp
@@ -101,17 +101,17 @@ static void InitBuf(void)
 
   deletedprog.title[0] = 0;
   
-  item = (XmString *)ACE_OS::malloc(sizeof(*item) * ITEMS);
+  item = (XmString *)malloc(sizeof(*item) * ITEMS);
   if (item == NULL)
   {
-   ACE_OS::perror ("UI allocate proglist item(XmString)");
-    ACE_OS::exit (1);
+    perror("UI allocate proglist item(XmString)");
+    exit(1);
   }
-  prog = (struct ProgramList *) ACE_OS::malloc(sizeof(*prog) * ITEMS);
+  prog = (struct ProgramList *) malloc(sizeof(*prog) * ITEMS);
   if (prog == NULL)
   {
-   ACE_OS::perror ("UI allocate prog");
-    ACE_OS::exit (1);
+    perror("UI allocate prog");
+    exit(1);
   }
   fp = NULL;
   if (proglistName[0] != 0) { /* file name given in command line */
@@ -120,7 +120,7 @@ static void InitBuf(void)
     fp = fopen(buf, "r");
     if (fp == NULL) {
       fprintf(stderr,"PROG.C error opening %s:", proglistName);
-     ACE_OS::perror ("");
+      perror("");
     }
   }
   if (fp == NULL) {
@@ -149,7 +149,7 @@ static void InitBuf(void)
 	fname = tmpnam(NULL);
 	if (ptr != NULL) {
 	  strncpy(fname, ptr, L_tmpnam);
-	  ACE_OS::free (ptr);
+	  free(ptr);
 	}
 	strcpy(buf, fname);
 	fp = tmpfile();
@@ -226,7 +226,7 @@ lemond.cse.ogi.edu\n\
 	}
 	else {
 	  fprintf(stderr, "Warning: failed to read newly created %s:", buf);
-	 ACE_OS::perror ("");
+	  perror("");
 	}
 	*/
       }
@@ -244,7 +244,7 @@ lemond.cse.ogi.edu\n\
     goto InitBuf_exit1;
   }
   buf[strlen(buf)-1] = 0;
-  if (strncmp(buf, BANNER,ACE_OS::strlen (BANNER)))
+  if (strncmp(buf, BANNER, strlen(BANNER)))
   {
     fprintf(stderr, "BANNER in %s not expected\n", fname);
     fprintf(stderr, "    Expected: %s\n", BANNER);
@@ -288,7 +288,7 @@ static void SaveBuf(void)
   if (fp == NULL)
   {
     fprintf(stderr, "Fail to open %s for saving programs", buf);
-   ACE_OS::perror ("");
+    perror("");
     return;
   }
   Fputs(BANNER);
@@ -309,8 +309,8 @@ static void CmdWrite(char * buf, int size)
   while (write(cmdSocket, (buf), (size)) == -1)
   {
     if (errno == EINTR) continue;
-   ACE_OS::perror ("UI write to cmdSocket");
-    ACE_OS::exit (1);
+    perror("UI write to cmdSocket");
+    exit(1);
   }
 }
 
@@ -321,39 +321,39 @@ void StartProgram(char * title, char * vh, char * vf, char * ah, char * af)
   int len;
   if (!cmdBusy) {
     char *str = title;
-    len =ACE_OS::strlen (str);
+    len = strlen(str);
 //     if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
 //     str = vh;
-    //    len =ACE_OS::strlen (str);
+    //    len = strlen(str);
     if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
     str = vf;
-    //    len =ACE_OS::strlen (str);
+    //    len = strlen(str);
     //    if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
     //    str = ah;
-    len =ACE_OS::strlen (str);
+    len = strlen(str);
     if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
     str = af;
-    len =ACE_OS::strlen (str);
+    len = strlen(str);
     if (len > 0 && str[len-1] == 0x0d) str[len - 1] = 0;
     XmTextFieldSetString(titlewidget, title);
     cmdBusy = 1;
     CmdWrite(&tmp, 1);
-//     len =ACE_OS::strlen (vh);
+//     len = strlen(vh);
 //     CmdWrite((char *)&len, 4);
 //     cerr << "StartProgram: len =" << len;
 //     CmdWrite(vh, len);
 //     cerr << " StartProgram: vh =" << vh << endl;
-    len =ACE_OS::strlen (vf);
+    len = strlen(vf);
     CmdWrite((char *)&len, 4);
     cerr << "StartProgram: len =" << len;
     CmdWrite(vf, len);
     cerr << " StartProgram: vf =" << vf << endl;
-//     len =ACE_OS::strlen (ah);
+//     len = strlen(ah);
 //     CmdWrite((char *)&len, 4);
 //     cerr << "StartProgram: len =" << len;
 //     CmdWrite(ah, len);
 //     cerr << " StartProgram: ah =" << ah << endl;
-    len =ACE_OS::strlen (af);
+    len = strlen(af);
     CmdWrite((char *)&len, 4);
     cerr << "StartProgram: len =" << len;
     CmdWrite(af, len);
@@ -392,7 +392,7 @@ static void modifyprog(struct ProgramList *p)
   XmListReplaceItemsPos(wproglist, &item, 1, progid+1);
   XmListSelectPos(wproglist, progid+1, 0);
   XmStringFree(item);
-  ACE_OS::memcpy (&(prog[progid]), p, sizeof(*p));
+  memcpy(&(prog[progid]), p, sizeof(*p));
   SaveBuf();
 }
 
@@ -401,7 +401,7 @@ static void insertprog(struct ProgramList *p)
   XmString item;
   
   if (items <= 0 || items >= ITEMS) return;
-  ACE_OS::memcpy ((char*)&(prog[items]), (char *)p, sizeof(*p));
+  memcpy((char*)&(prog[items]), (char *)p, sizeof(*p));
   item = (XmString)XmStringCreateLtoR(p->title, XmStringTag);
   XmListAddItemUnselected(wproglist, item, items+1);
   XmStringFree(item);
@@ -423,9 +423,9 @@ static void deleteCB(Widget w, XtPointer closure, XtPointer call_data)
   if (items <= 0) { beep(); return; }
   j = curListPos();
   if (j == -1) return;
-  ACE_OS::memcpy (&deletedprog, &prog[j], sizeof(deletedprog));
+  memcpy(&deletedprog, &prog[j], sizeof(deletedprog));
   for (i = j+1; i < items; i++)
-    ACE_OS::memcpy (&prog[i-1], &prog[i], sizeof(*prog));
+    memcpy(&prog[i-1], &prog[i], sizeof(*prog));
   XmListDeletePos(wproglist, j+1);
   items --;
   SaveBuf();
@@ -734,7 +734,7 @@ static void CreateModifyWindow(Widget parent)
   XtManageChild(wcancel);
   XtAddCallback (wcancel, XmNactivateCallback, (XtCallbackProc)modifydismissCB, NULL);
 
-  titleSize =ACE_OS::strlen (LINE1);
+  titleSize = strlen(LINE1);
   
   n=0;
   XtSetArg (args[n], XmNleftOffset, 5); n++;
@@ -901,7 +901,7 @@ Widget CreateProgramWindow(Widget parent, int cmdSock, int * playflag, Widget fr
   wproglist = wlist;
   for (n = 0; n < items; n++)
     XmStringFree(item[n]);
-  ACE_OS::free (item);
+  free(item);
   
   n=0;
   XtSetArg (args[n], XmNtopOffset, 2); n++;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp
index 734029da118..08f2ef0d030 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/ui.cpp
@@ -103,8 +103,8 @@ static void CmdWrite(char * buf, int size)
   while (ACE_OS::write(cmdSocket, (buf), (size)) == -1)
   {
     if (errno == EINTR) continue;
-   ACE_OS::perror ("UI write to cmdSocket");
-    ACE_OS::exit (1);
+    perror("UI write to cmdSocket");
+    exit(1);
   }
   //  ACE_DEBUG ((LM_DEBUG,"(%P|%t)After writing cmd\n"));
 }
@@ -529,7 +529,7 @@ void UIMinsize(int x, int y)
 
 static void exit_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cbs)
 {
-  ACE_OS::exit (0);
+  exit(0);
 }
 
 
@@ -778,8 +778,8 @@ static void cmdSocket_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cb
   while (read(cmdSocket, &cmd, 1) <= 0) 
   {
     if (errno == EINTR) return;
-   ACE_OS::perror ("UI by callback read from CmdSocket");
-    ACE_OS::exit (1);
+    perror("UI by callback read from CmdSocket");
+    exit(1);
   }
   //  ACE_DEBUG ((LM_DEBUG,"(%P)cmdSocket_callback:cmd= %d",cmd));
   if (cmd == CmdDONE || cmd == CmdFAIL)
@@ -824,7 +824,7 @@ static void cmdSocket_callback(Widget w, XtPointer data, XmAnyCallbackStruct *cb
     char * ptr;
 
     if (cmd == CmdVPdisplayFrame) {
-      ACE_OS::read (cmdSocket, (char *)&ptr, sizeof(char *));
+      read(cmdSocket, (char *)&ptr, sizeof(char *));
     }
     VPcommand((int)cmd, ptr);
 
@@ -877,7 +877,7 @@ void UIprocess(int cmdSock)
   title = vh = vf = vb = ah = af = ab = NULL;
 
   for (i = 1; i < argc_share; i++) {
-    if (ACE_OS::strcmp (argv_share[i], "-v") == 0) {
+    if (strcmp(argv_share[i], "-v") == 0) {
       if (argc_share > i + 1) {
 	i ++;
 	vh = argv_share[i];
@@ -885,7 +885,7 @@ void UIprocess(int cmdSock)
       }
       else break;
     }
-    else if (ACE_OS::strcmp (argv_share[i], "-a") == 0) {
+    else if (strcmp(argv_share[i], "-a") == 0) {
       if (argc_share > i + 1) {
 	i ++;
 	ah = argv_share[i];
@@ -893,7 +893,7 @@ void UIprocess(int cmdSock)
       }
       else break;
     }
-    else if (ACE_OS::strcmp (argv_share[i], "-p") == 0) {
+    else if (strcmp(argv_share[i], "-p") == 0) {
       if (argc_share > i + 1) {
 	i ++;
 	title = argv_share[i];
@@ -945,13 +945,13 @@ void UIprocess(int cmdSock)
 
     /* form the title */
     if (vh != NULL) {
-      title = (char *)ACE_OS::malloc(strlen(vh) + 1);
+      title = (char *)malloc(strlen(vh) + 1);
       if (title != NULL) {
 	strcpy(title, vh);
       }
     }
     else {
-      title = (char *)ACE_OS::malloc(strlen(ah) + 1);
+      title = (char *)malloc(strlen(ah) + 1);
       if (title != NULL) {
 	strcpy(title, ah);
       }
@@ -969,6 +969,11 @@ void UIprocess(int cmdSock)
       else {
 	vf = vh;
 	vh = "";
+	// vb = (char *)malloc(BUFSIZE);
+// 	if (vb != NULL) {
+// 	  get_full_path(vf, vb, BUFSIZE);
+// 	  vf = vb;
+//	}
       }
     }
     else vh = vf = "";
@@ -982,6 +987,11 @@ void UIprocess(int cmdSock)
       else {
 	af = ah;
 	ah = "";
+// 	ab = (char *)malloc(BUFSIZE);
+// 	if (ab != NULL) {
+// 	  get_full_path(af, ab, BUFSIZE);
+// 	  af = ab;
+// 	}
       }
     }
     else ah = af = "";
@@ -989,9 +999,9 @@ void UIprocess(int cmdSock)
     fprintf(stderr, "Init program: title %s, vh %s, vf %s, ah %s, af %s\n",
 	    title, vh, vf, ah, af);
     StartProgram(title, vh, vf, ah, af);
-    ACE_OS::free (title);
-    if (ab != NULL) ACE_OS::free (ab);
-    if (vb != NULL) ACE_OS::free (vb);
+    free(title);
+    if (ab != NULL) free(ab);
+    if (vb != NULL) free(vb);
   }
   
   XtAppMainLoop(App);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
index 8fc6ac680b6..c266190b7fd 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/util.cpp
@@ -110,9 +110,9 @@ correct_underflow() {
   if (status  < 0) {
     if (!quietFlag) {
       fprintf (stderr, "\n");
-     ACE_OS::perror ("Unexpected read error.");
+      perror("Unexpected read error.");
     }
-    ACE_OS::exit (1);
+    exit(1);
   }
   else if ((status == 0) && (bufLength < 1)) {
     if (!quietFlag) {
@@ -128,7 +128,7 @@ correct_underflow() {
     if (loopFlag) longjmp(env, 1);
     DestroyVidStream(curVidStream);
 */
-    ACE_OS::exit (0);
+    exit(0);
   }
 #ifdef UTIL2
   curBits = *bitBuffer << bitOffset;
@@ -215,7 +215,7 @@ char *get_ext_data ()
 
   /* Allocate ext data buffer. */
 
-  dataPtr = (char *) ACE_OS::malloc(size);
+  dataPtr = (char *) malloc(size);
 
   /* Initialize marker to keep place in ext data buffer. */
 
@@ -421,7 +421,7 @@ char *get_extra_bit_info ()
   /* Initialize size of extra bit info buffer and allocate. */
 
   size = EXT_BUF_SIZE;
-  dataPtr = (char *) ACE_OS::malloc(size);
+  dataPtr = (char *) malloc(size);
 
   /* Reset marker to hold place in buffer. */
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
index d8b42ba1f42..372c4fef3c5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.cpp
@@ -25,59 +25,60 @@
  *         email: scen@cse.ogi.edu
  */
 
-extern int vsp[2];
-extern void set_exit_routine_tag(int tag);
-
-#include "vb.h"
+#include <stdio.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Intrinsic.h>
+#if defined(__svr4__) || defined(IRIX)
+#include <stropts.h>
+#include <sys/conf.h>
+#endif
+#include "include/common.h"
+#include "newproto.h"
+#include "global.h"
+#include "mpeg_shared/filters.h"
+#include "mpeg_shared/fileio.h"
+#include "mpeg_shared/com.h"
 
 ACE_RCSID(mpeg_client, vb, "$Id$")
 
-block ** VideoBuffer::head = 0;
-block ** VideoBuffer::tail = 0;
-char * VideoBuffer::buf = 0;
-int VideoBuffer::bufsize = -1;
-int VideoBuffer::sid = -1;
-int VideoBuffer::countid = -1;
-int VideoBuffer::exit_tag = -1;
-int VideoBuffer::conn_tag = -1;
-int VideoBuffer::savedSocket = -1;
-
-//constructor.
-VideoBuffer::VideoBuffer (void)
-  :msg (0),
-   packet (0),
-   msgsn (-1),
-   ptr (0),
-   ptr1 (0),
-   tmp_buf (0),
-   cmdsn (-1),
-   fb_state (0),
-   qosRecomputes (0),
-   f (0),
-   fa (0),
-   reach_limit (0),
-   not_action (1)
-#ifdef STAT
-  ,to_count (1),
-  gap_msgsn (-1)
-#endif
+/* magic number -- deviation is considered
+   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
+   */
+#define MAX_CLOCK_DRIFT 50
+
+#define SHCODE 0x000001b3
+
+#define max(a,b) ((a)>(b) ? (a) : (b))
+
+static struct block
 {
-}
+  unsigned shcode;
+  struct block * next;
+  int full;
+} ** head, ** tail;
 
-// Destructor.
-VideoBuffer::~VideoBuffer (void)
+struct header
 {
-  if (ACE_Reactor::instance ()->remove_handler (this->handler_,ACE_Event_Handler::READ_MASK) == -1)
-    ACE_DEBUG ((LM_ERROR,"(%P)remove handler failed for Video_Notification_Handler\n"));
+  struct block *h, *t;
+};
 
-  delete this->handler_;
-  if (ACE_Reactor::instance ()->remove_handler (this,ACE_Event_Handler::READ_MASK) == -1)
-    ACE_DEBUG ((LM_ERROR,"(%P)remove handler failed for VideoBuffer\n"));
-}
+static char * buf;
+static int bufsize;
+static int sid, countid;
+static exit_tag = 0;
+static int conn_tag;
+static int savedSocket;
 
+void VBinitBuf(int size)
 /* size in byte */
-void 
-VideoBuffer::VBinitBuf (int size)
 {
   bufsize = size - sizeof(struct header);
   buf = creat_shared_mem(size);
@@ -93,36 +94,28 @@ VideoBuffer::VBinitBuf (int size)
   (*tail)->shcode = SHCODE;
 }
 
-/* block version */
-char* 
-VideoBuffer::VBgetBuf (int size) 
+char * VBgetBuf(int size)  /* block version */
 {
   return 0;
 }
 
-/* non-block check, return True/False*/
-int
-VideoBuffer::VBcheckBuf (int size) 
+int VBcheckBuf(int size) /* non-block check, return True/False*/
 {
   return 0;
 }
 
-void
-VideoBuffer::VBputMsg (char * msgPtr)
+void VBputMsg(char * msgPtr)
 {
 }
 
-/* block version */
-char * 
-VideoBuffer::VBgetMsg ()
+char * VBgetMsg()          /* block version */
 {
-  char *vb_ptr;
+  char *ptr;
 
 #ifdef STAT
   if (shared->collectStat && *head == *tail)
     shared->stat.VBemptyTimes ++;
 #endif
-  //  ACE_DEBUG ((LM_DEBUG,"(%P)waiting for countid\n"));
   enter_cs(countid);
   enter_cs(sid);
   while (*tail != *head && (*tail)->full == 0)
@@ -131,24 +124,21 @@ VideoBuffer::VBgetMsg ()
   if (*head == *tail)
   {
     fprintf(stderr, "VB: getMsg run out of msg unexpectedly.\n");
-    ACE_OS::exit (1);
+    exit(1);
   }
-  vb_ptr = ((char*)*tail)+sizeof(**tail)+sizeof(VideoMessage);
+  ptr = ((char*)*tail)+sizeof(**tail)+sizeof(VideoMessage);
 
-  //  fprintf(stderr,"VBgetMsg: buf:%x, msg:%x\n", (int)buf, (int)vb_ptr);
+  //  fprintf(stderr,"VBgetMsg: buf:%x, msg:%x\n", (int)buf, (int)ptr);
 
-  return vb_ptr;
+  return ptr;
 }
 
-/* non-block check, return Number of Msgs in buffer */
-int
-VideoBuffer::VBcheckMsg ()
+int  VBcheckMsg()        /* non-block check, return Number of Msgs in buffer */
 {
   return get_semval(countid);
 }
 
-int
-VideoBuffer::VBbufEmpty (void)
+int VBbufEmpty(void)
 {
   /*
   Fprintf(stderr, "VB countid %d\n", get_semval(countid));
@@ -156,974 +146,1663 @@ VideoBuffer::VBbufEmpty (void)
   return get_semval(countid) <= 0;
 }
 
-void 
-VideoBuffer::VBreclaimMsg (char * msgPtr)
+void VBreclaimMsg(char * msgPtr)
 {
   enter_cs(sid);
   *tail = (*tail)->next;
   leave_cs(sid);
 }
 
-void 
-VideoBuffer::VBdeleteBuf (void)
+void VBdeleteBuf(void)
 {
-  remove_shared_mem (buf - sizeof(struct header));
+  remove_shared_mem(buf - sizeof(struct header));
 }
-
-void 
-VideoBuffer::VBdeleteSem (void)
+void VBdeleteSem(void)
 {
   remove_semaphore(sid);
   remove_semaphore(countid);
 }
+  
+/* SIGUSR1 from CTR is for killing this process, without affecting any other ones. */
 
-int
-VideoBuffer::VBprocess (int init_socket, int normal_socket)
+static void exit_on_kill(void)
 {
-  this->initSocket = init_socket;
-  this->normalSocket = normal_socket;
-  msgsn = -1;
-  dataSocket = initSocket;
-  exit_tag = 0;
-  conn_tag = shared->videoMaxPktSize;
-  savedSocket = normalSocket;
-
-  //  ACE_DEBUG ((LM_DEBUG,"VideoBuffer::VBProcess ()\n"));
-  /* buffer big enough for discard mode packet stream */
-  if (conn_tag < 0)
-    {  
-      tmp_buf = (char *)ACE_OS::malloc(-conn_tag);
-      if (tmp_buf == NULL) {
-        fprintf(stderr, "AB failed to allocate %d bytes");
-        ACE_OS::perror ("of tmp_buf");
-        ACE_Reactor::instance ()->end_event_loop (); return -1;
-      }
-    }
-
-  ACE_NEW_RETURN (this->handler_,
-                  Video_Notification_Handler (),
-                  -1);
+  ACE_DEBUG ((LM_DEBUG,"(%P|%t) VBProcess killed\n"));
+  extern void set_exit_routine_tag(int tag);
+  set_exit_routine_tag(0);
+  ComCloseConn(savedSocket);
+  VBdeleteBuf();
+  exit(0);
+}
 
-  // Register the notification handler with the reactor.
-  int result = ACE_Reactor::instance ()->register_handler (this->handler_,
-                                                           ACE_Event_Handler::READ_MASK);
-  if (result != 0)
-    return result;
+static void usr1_handler(int sig)
+{
+  cerr << "VBProcess got sigusr1\n";
+  exit_on_kill ();
+  exit_tag = 1;
+}
 
-  result = ACE_Reactor::instance ()->register_handler (this,
-                                                       ACE_Event_Handler::READ_MASK);
 
-  if (result != 0)
-    return result;
+static void usr2_handler(int sig)
+{
+  /*
+  fprintf(stderr, "VB void usr2_handler (supposed for stat).\n");
+  */
+}
 
-  this->state_ = READ_HEADER;
-  temp = (char *)&msghd;
-  bytes = sizeof (msghd);
+static int send_feedback(int sock, int addupf, int addf, int advance)
+{
+  int res;
+  VideoFeedBackPara para;
+  para.cmdsn = htonl(shared->cmdsn);
+  para.addUsecPerFrame = htonl(addupf);
+  para.addFrames = htonl(addf);
+  para.needHeader = htonl(shared->needHeader);
+  shared->needHeader = 0;
+  para.frameRateLimit1000 =
+      htonl((long)(shared->frameRateLimit * 1000.0));
+  para.sendPatternGops = htonl(shared->sendPatternGops);
+  memcpy(para.sendPattern, shared->sendPattern, PATTERN_SIZE);
+  /*
+  fprintf(stderr, "VB to send a fb packet...");
+  */
+  if (conn_tag != 0) { /* packet stream */
+    while ((res = write(sock, (char *)&para, sizeof(para))) == -1) {
+      if (errno == EINTR)
+	continue;
+      if (errno == ENOBUFS) {
+	perror("VB Warning, fb packet discarded for");
+	return -1;
+      }
+      perror("VB error, fb packet sending failed");
+      exit(1);
+    }
+  }
+  else {
+    res = write(sock, (char *)&para, sizeof(para));
+    if (res == -1) {
+      perror("VB error, fb packet sending failed");
+      exit(1);
+    }
+  }
+  if (res < sizeof(para)) {
+    fprintf(stderr, "VB send_feedback() warn: res %dB < sizeof(para) %dB\n",
+	    res, sizeof(para));
+  }
+#ifdef STAT
+  {
+    int i;
+    if ((i = shared->stat.fbPacketNumber) < MAX_FB_PACKETS) {
+      shared->stat.fbPackets[i].frameId = shared->nextFrame;
+      shared->stat.fbPackets[i].addUsecPerFrame = addupf;
+      shared->stat.fbPackets[i].addFrames = addf;
+      shared->stat.fbPackets[i].frames = shared->sendPatternGops *
+                                         shared->patternSize;
+      shared->stat.fbPackets[i].framesDropped = shared->framesDropped;
+      shared->stat.fbPackets[i].frameRateLimit = shared->frameRateLimit;
+      shared->stat.fbPackets[i].advance = advance;
+    }
+    shared->stat.fbPacketNumber ++;
+  }
+#endif
+  Fprintf(stderr, "VB sent fb pkt frame%d gop%d addf%d addupf%d frate%5.2f.\n",
+	  shared->nextFrame, shared->nextGroup,
+	  addf, addupf, shared->frameRateLimit);
   return 0;
 }
 
-ACE_HANDLE
-VideoBuffer::get_handle (void) const
+static void skip_message(int fd, VideoMessage * msg)
 {
-  if (this->socket_flag_)
-    return this->normalSocket;
-  else
-    return this->initSocket;
+  char buf[1024];
+  if (conn_tag >= 0) {
+    int size = msg->msgSize;
+    while (size > 0) {
+      int res;
+      int bytes = size > 1024 ? 1024 : size;
+      read_bytes(fd, buf, bytes);
+      /*
+      if ((res = read(fd, buf, bytes)) < bytes) {
+	fprintf(stderr, "VB Error skip_message: try read %dB, got %dB\n",
+		bytes, res);
+      }
+      */
+      size -= bytes;
+    }
+  }
+  else { /* discard mode packet stream packet has been read */
+  }
+  if (exit_tag) exit_on_kill();
 }
 
-int
-VideoBuffer::handle_input (ACE_HANDLE fd)
+void VBprocess(int initSocket, int normalSocket)
 {
-  //  ACE_DEBUG ((LM_DEBUG,"VideoBuffer::handle_input:state = %d\n",this->state_));
-  switch (this->state_)
-    {
-    case READ_NEXT_HEADER:
-    case READ_HEADER:
-      {
-        if (conn_tag >= 0)
-          len = ACE_OS::read (dataSocket,temp,bytes);
-        else
-          {
-            len = ACE_OS::read (dataSocket,tmp_buf,-conn_tag);
-            //            fprintf (stderr,"VB read packet len = %d\n",len);
-            ACE_OS::memcpy ((char *)&msghd, tmp_buf, sizeof(msghd));
-          }
-        if (len == -1) {
-          if (errno == EWOULDBLOCK || errno == EAGAIN) {
-            perror("VB sleep for 10ms");
-            usleep(10000);
-            // set the pointers before going into the next loop.
-            temp = (char *)&msghd;
-            bytes = sizeof (msghd);
-            return 0;
-          }
-          ACE_OS::perror ("VB ACE_OS::read () data");
-          ACE_Reactor::instance ()->end_event_loop (); return -1;
-        }
-        if (len == 0) {  /* EOF, connection closed by peer */
-          fprintf(stderr, "Error: VB found dataSocket broken\n");
-          for (;;) {
-            usleep(1000000);
-          }
-        }
-        if (conn_tag >= 0)
-          {
-            temp += len;
-            bytes -= len;
-            if (bytes != 0)
-              return 0;
-            else
-              len = sizeof (msghd);
-          }
-        if (len < sizeof(msghd))
-          {
-            // go back to reading the next header.
-            temp = (char *)&msghd;
-            bytes = sizeof (msghd);
-            fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",len, sizeof(msghd));
-            //            continue;
-          }
-#ifdef NeedByteOrderConversion
-        msghd.packetsn = ntohl(msghd.packetsn);
-        msghd.packetSize = ntohl(msghd.packetSize);
-        msghd.msgsn = ntohl(msghd.msgsn);
-        msghd.msgOffset = ntohl(msghd.msgOffset);
-        msghd.msgSize = ntohl(msghd.msgSize);
-#endif
+  VideoMessage * msg, msghd;
+  VideoPacket * packet;
+  int len, bsize, msgsn = -1;
+  int psize, poffset;
+  char * ptr, *ptr1;
+  char *tmp_buf = NULL;
+  int dataSocket = initSocket;
+
+  /* INIT frame is received from CTR through initSocket */
 
-        if (this->state_ == READ_NEXT_HEADER)
-          {
 #ifdef STAT
-            {
-              int gap = msghd.msgsn - gap_msgsn;
-              gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-              shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-              if (gap >0) gap_msgsn = msghd.msgsn;
-            }
+  int to_count = 1;
+  int gap_msgsn = -1;
 #endif
-            if (msghd.msgsn <= msgsn) 
-              { /* outdated message, wait for next one */
-            
-                fprintf(stderr, "VB discard outdated or dup msgsn %d, pktsn %d\n",
-                        msghd.msgsn, msghd.packetsn);
-            
-                this->state_ = SKIP_NEXT_MESSAGE;
-                bytes = msghd.msgSize;
-                //	  skip_message(dataSocket, &msghd);
-                //	  continue;
-                return 0;
-              }
-      
-            if ((msghd.msgsn > msgsn + 1) || (msghd.msgOffset == 0))
-              {
-                /* message out of order, abandon current packet */
-                /*
-	fprintf(stderr, "VB msg out of order for current packet, discard it.\n");
-	*/
-#ifdef STAT
-                to_count = 0;
+  
+  /* following variables are for feedback */
+  int pcmdsn, pcmd;  /* to store the cmdsn and cmd of previous frame,
+			to detect new commands */
+  int pfid, pgop;    /* frame-id of gopid of previous frame */
+  int cmdsn = -1;    /* cmdsn of previous command */
+  int state = 0;     /* state of the control law/regulator */
+  int startpos;      /* gopid or frameid when the regulator is in 'start' state 1 */
+  int delay;	     /* #frames to delay after 'start' */
+  int qosRecomputes = 0; /* indicate if qos has been recomputed recently */
+  int action_delay;	/* microseconds to delay after feedback action */
+  int action_time;     /* the time when feedback action is taken, used to enforce
+			  action_delay */
+  int upf, cupf;	/* upf -- currentUPF as carried in all frames,
+			   cupf -- real current UPF, being adjusted by FB */
+  double fv;		/* current buffer fill level in term of #frames */	
+  double init_fv;	/* init_fv and init_pos record the fv value and position
+			   (frameid or gopid) when fv is very close to med */
+  double init_pos;
+  int high, low, med;	/* median, high and low water marks, in term of #frames */
+  int period;		/* interms of #frames, (high-med, period) defined the max
+			   buffer fill drift which can be assumed as caused by
+			   clock drift */
+  Filter * f = NULL;	/* buffer fill level filter */
+
+  int advance, min_advance; /* in microseconds, advance holds the
+			       current target buffer-fill-level as
+			       determined by jitter level
+			       estimate. min_advance sets a absolute
+			       minimun level, no matter how low jitter
+			       level is.
+			       'advance' does not change when
+			       play-speed changes, but med/high/low
+			       will be updated upon speed change */
+  double fav;		/* #frames, jitter level output by the filter */
+  Filter * fa = NULL;	/* jitter filter */
+  int reach_limit = 0;	/* indicate that the target 'advance' has reached client VB
+			   buffer limit, and can not further increase, even if
+			   jitter increases */
+  int not_action = 1;	/* indicates entering state=3 is not caused by
+			   feedback action. If not_action = 1 entering state=3
+			   is caused either by 'start' or speed change, and
+			   the jitter filter needs to be reset */
+
+  exit_tag = 0;
+  conn_tag = shared->videoMaxPktSize;
+
+  savedSocket = normalSocket;
+#if 0  
+#ifdef __svr4__
+  
+  /* On solaris 2.x for i86pc, a datagram socket may not discard the
+     remaining of a message if recv() fails to read the whole
+     thing. Following systems are tried but seems doesn't work. So for
+     this platform, This causes problem with skip_message() defined
+     above, which tries to discard whole packets by reading only a few
+     bytes. An alternative here is to allocate a big enough buffer,
+     read and discard the whole packet, this is less efficient because
+     of more data copy.
+
+     But if we call read(2) instead of recv(), then it works.
+     */
+  if (!conn_tag) {
+    len = ioctl(dataSocket, I_SRDOPT, RMSGD);  /* discard unread part of the message */
+    if (len) perror("error message");
+  }
+#endif
+#endif
+  
+  setsignal(SIGUSR1, usr1_handler);
+  setsignal(SIGUSR2, usr2_handler);
+
+  if (conn_tag < 0) {  /* buffer big enough for discard mode packet stream */
+    tmp_buf = (char *)malloc(-conn_tag);
+    if (tmp_buf == NULL) {
+      fprintf(stderr, "AB failed to allocate %d bytes");
+      perror("of tmp_buf");
+      exit(1);
+    }
+  }
+
+  for (;;)
+  {
+    //    fprintf(stderr, "VB wait for a new packet.\n");
+    if (conn_tag >= 0) {
+      len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
+    }
+    else {  /* discard mode packet stream, read all bytes */
+      len = read(dataSocket, tmp_buf, -conn_tag);
+      memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
+    }
+    //    ACE_DEBUG ((LM_DEBUG, "(%P|%t) vb: Got a packet of length = %d\n", len));
+    if (exit_tag) exit_on_kill();
+    if (len == -1) {
+      if (errno == EWOULDBLOCK || errno == EAGAIN) {
+	perror("VB sleep for 10ms");
+	usleep(10000);
+	if (exit_tag) exit_on_kill();
+	continue;
+      }
+      perror("VB read() data");
+      exit(1);
+    }
+    if (len == 0) {  /* EOF, connection closed by peer */
+      fprintf(stderr, "Error: VB found dataSocket broken\n");
+      for (;;) {
+	usleep(1000000);
+	if (exit_tag) exit_on_kill();
+      }
+    }
+    if (len < sizeof(msghd)) {
+      fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
+	      len, sizeof(msghd));
+      continue;
+    }
+#ifdef NeedByteOrderConversion
+    msghd.packetsn = ntohl(msghd.packetsn);
+    msghd.packetSize = ntohl(msghd.packetSize);
+    msghd.msgsn = ntohl(msghd.msgsn);
+    msghd.msgOffset = ntohl(msghd.msgOffset);
+    msghd.msgSize = ntohl(msghd.msgSize);
 #endif
-              }
-            else
-              {
-                //                ACE_DEBUG ((LM_DEBUG,"assigning next msgsn %d\n",msghd.msgsn));
-                msgsn = msghd.msgsn;
-                this->state_ = READ_MESSAGE;
-                temp = ptr +sizeof (msghd);
-                bytes = msghd.msgSize;
-                // make a recursive call as we just have to do a memcpy from the buffer.
-                this->handle_input (dataSocket);
-                return 0;
-              }
-          } 
-
-        //    fprintf(stderr, "VB PEEK1 a msg sn-%d, size-%d, pkt-%d, pktsize-%d\n",msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
+    
+    /*
+    fprintf(stderr, "VB PEEK1 a msg sn-%d, size-%d, pkt-%d, pktsize-%d\n",
+	    msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
+    */
+  start_new_packet:
 
+    
 #ifdef STAT
-        if (to_count) {
-          int gap = msghd.msgsn - gap_msgsn;
-          gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
-          shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
-          if (gap >0) gap_msgsn = msghd.msgsn;
-        }
-        to_count = 1;
+    if (to_count) {
+      int gap = msghd.msgsn - gap_msgsn;
+      gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
+      shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
+      if (gap >0) gap_msgsn = msghd.msgsn;
+    }
+    to_count = 1;
 #endif
-        if (msghd.msgsn <= msgsn)  /* outdated msg */
-          {
-            fprintf(stderr, "VB discard outdated msgsn %d, pktsn %d when expecting first %d\n",
-                    msghd.msgsn, msghd.packetsn,msgsn);
-            this->state_ = SKIP_MESSAGE;
-            bytes = msghd.msgSize;
-            //            skip_message(dataSocket, &msghd);
-            //          continue;
-            return 0;
-          }
-        else if (msghd.msgOffset != 0)  /* not first msg of a packet */
-          {
+    if (msghd.msgsn <= msgsn)  /* outdated msg */
+    {
     
-            /*
-              Fprintf(stderr, "VB discard non-first msg msgsn %d, pktsn %d\n",
-              msghd.msgsn, msghd.packetsn);
-            */
-            this->state_ = SKIP_MESSAGE;
-            bytes = msghd.msgSize;
-            //            skip_message(dataSocket, &msghd);
-            //          continue;
-            return 0;
-          }
-        else
-          {
-            //            ACE_DEBUG ((LM_DEBUG,"assigning msgsn %d\n",msghd.msgsn));
-            msgsn = msghd.msgsn;
-          }
+      fprintf(stderr, "VB discard outdated msgsn %d, pktsn %d when expecting first\n",
+	      msghd.msgsn, msghd.packetsn);
     
-        /* allocate packet for the incoming msg */
-        bsize =  msghd.packetSize + sizeof(**head)*2 + sizeof(msghd);
-        bsize = ((bsize+3)>>2)<<2;
-        enter_cs(sid);
-        if (*head >= *tail)
-          {
-            if (bufsize - (int)((char*)*head - buf) >= bsize )
-              msg =(VideoMessage *)((char*)*head + sizeof(**head));
-            else if ((int)((char*)*tail - buf) >= bsize)
-              {
-                (*head)->next = (struct block *)buf;
-                (*head)->full = 0;
-                *head = (struct block *)buf;
-                msg = (VideoMessage *)(buf + sizeof(**head));
-                *head = (struct block *)buf;
-                (*head)->shcode = SHCODE;
-              }
-            else /* not enough buffer, discard current message */
-              {
-                leave_cs(sid);
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    else if (msghd.msgOffset != 0)  /* not first msg of a packet */
+    {
+    
+      /*
+      Fprintf(stderr, "VB discard non-first msg msgsn %d, pktsn %d\n",
+	      msghd.msgsn, msghd.packetsn);
+      */
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    else
+      msgsn = msghd.msgsn;
+    
+    /* allocate packet for the incoming msg */
+    bsize =  msghd.packetSize + sizeof(**head)*2 + sizeof(msghd);
+    bsize = ((bsize+3)>>2)<<2;
+    enter_cs(sid);
+    if (*head >= *tail)
+    {
+      if (bufsize - (int)((char*)*head - buf) >= bsize )
+        msg =(VideoMessage *)((char*)*head + sizeof(**head));
+      else if ((int)((char*)*tail - buf) >= bsize)
+      {
+	(*head)->next = (struct block *)buf;
+	(*head)->full = 0;
+	*head = (struct block *)buf;
+	msg = (VideoMessage *)(buf + sizeof(**head));
+	*head = (struct block *)buf;
+	(*head)->shcode = SHCODE;
+      }
+      else /* not enough buffer, discard current message */
+      {
+	leave_cs(sid);
 #ifdef STAT
-                if (shared->collectStat)
-                  shared->stat.VBdroppedFrames ++;
+	if (shared->collectStat)
+  	  shared->stat.VBdroppedFrames ++;
 #endif
-                /*
-                  Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-                  msghd.msgsn, msghd.packetsn);
-                */
-                this->state_ = SKIP_MESSAGE;
-                bytes = msghd.msgSize;
-                //                skip_message(dataSocket, &msghd);
-                //      continue;
-                return 0;
-              }
-          }
-        else /* *head < *tail */
-          if ((char*)*tail - (char*)*head >= bsize)
-            msg = (VideoMessage *)((char*)*head + sizeof(**head));
-          else   /* not enough buffer, abandon current message */
-            {
-              leave_cs(sid);
+	/*
+	Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
+		msghd.msgsn, msghd.packetsn);
+        */
+                
+        skip_message(dataSocket, &msghd);
+	continue;
+      }
+    }
+    else /* *head < *tail */
+    if ((char*)*tail - (char*)*head >= bsize)
+      msg = (VideoMessage *)((char*)*head + sizeof(**head));
+    else   /* not enough buffer, abandon current message */
+    {
+      leave_cs(sid);
 #ifdef STAT
-              if (shared->collectStat)
-                shared->stat.VBdroppedFrames ++;
+      if (shared->collectStat)
+	shared->stat.VBdroppedFrames ++;
 #endif
-              /*
-                Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
-                msghd.msgsn, msghd.packetsn);
-
-              */
-              this->state_ = SKIP_MESSAGE;
-              bytes = msghd.msgSize;
-              //              skip_message(dataSocket, &msghd);
-              //            continue;
-              return 0;
-            }
-        leave_cs(sid);
-
-        //fprintf(stderr, "VB allocated a buffer for comming packet.\n");
-
-        psize = msghd.packetSize;
-        poffset = 0;
-        packet = (VideoPacket *)((char*)msg + sizeof(msghd));
-        *(((int*)packet)+(msghd.packetSize>>2)) = 0;
-        /* clear the last no more than three bytes, for
-           proper detecting the end of packet by VD */
-        ptr = (char*)msg;
-        this->state_ = READ_MESSAGE;
-        temp = ptr +sizeof (msghd);
-        bytes = msghd.msgSize;
+      /*
+      Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
+	      msghd.msgsn, msghd.packetsn);
+
+      */
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    leave_cs(sid);
+
+    //    fprintf(stderr, "VB allocated a buffer for comming packet.\n");
+
+    psize = msghd.packetSize;
+    poffset = 0;
+    packet = (VideoPacket *)((char*)msg + sizeof(msghd));
+    *(((int*)packet)+(msghd.packetSize>>2)) = 0;
+                             /* clear the last no more than three bytes, for
+				proper detecting the end of packet by VD */
+    ptr = (char*)msg;
+    for (;;)
+    {
+      int bytes;
+      bytes = sizeof(msghd) + msghd.msgSize;
+      if (conn_tag >= 0) {
+	len = bytes;
+	read_bytes(dataSocket, ptr + sizeof(msghd), bytes - sizeof(msghd));
       }
-      break;
-    case SKIP_NEXT_MESSAGE:
-    case SKIP_MESSAGE:
+      else {
+	len = bytes;
+	memcpy(ptr + sizeof(msghd), tmp_buf + sizeof(msghd), bytes - sizeof(msghd));
+      }
+      if (exit_tag) exit_on_kill();
+      if (len == -1) {
+	perror("VB fails to recv data");
+	exit(1);
+      }
+      if (len < bytes) {
+	fprintf(stderr, "VB warn: recv() len %dB < bytes %dB\n", len, bytes);
+      }
+      /* because message header is already PEEKed to msghd before recv(), so we can
+	 use info in msghd instead of *(VideoMessage*)ptr   */
+      if (len != sizeof(msghd)+msghd.msgSize)
+        /* some of msg contents not successfully received, abandon current packet */
       {
-        char buffer[BUFSIZ];
-          if (conn_tag >= 0) 
-            {
-              int size = bytes > BUFSIZ ? BUFSIZ : bytes;
-              int res =ACE_OS::read (dataSocket, buffer, size);
-              bytes -= res;
-
-              if (bytes != 0)
-                return 0;
-            }
-          if (this->state_ == SKIP_MESSAGE)
-            this->state_ = READ_HEADER;
-          else if (this->state_ == SKIP_NEXT_MESSAGE)
-            this->state_ = READ_NEXT_HEADER;
-          temp = (char *)&msghd;
-          bytes = sizeof (msghd);
-          break;
+        /*
+	fprintf(stderr, "VB got corrupted msg, len=%d, supposed len=%d\n",
+		len, sizeof(msghd)+msghd.msgSize);
+        */
+        break;
       }
-    case READ_MESSAGE:
+      poffset += msghd.msgSize;
+      psize -= msghd.msgSize;
+      ptr += msghd.msgSize;
+
+      //      fprintf(stderr, "VB packet remain size %d\n", psize);
+
+      if (psize == 0)
       {
-        if (conn_tag >= 0)
-          {
-            int val;
-            val = ACE_OS::read (dataSocket,temp,bytes);
-
-            if (val == -1 && (errno == EINTR || errno == EAGAIN | errno == EWOULDBLOCK))
-              {   /* interrupted or need to wait, try again */
-                if (errno == EAGAIN | errno == EWOULDBLOCK) usleep(10000);
-                errno = 0;
-                return 0;
-              }
-            if (val == -1)
-              {
-                ACE_OS::perror ("Error -- Read from socket");
-                ACE_Reactor::instance ()->end_event_loop (); return -1;
-              }
-            if (val == 0) /* EOF encountered */
-              {
-                ACE_DEBUG ((LM_DEBUG, "Error -- EOF reached while trying to read %d bytes.\n"));
-                ACE_Reactor::instance ()->end_event_loop (); return -1;
-              }
-            temp += val;
-            bytes -= val;
-            if (bytes < 0)  /* weird thing is happening */
-              {
-                ACE_DEBUG ((LM_DEBUG, "Error: read too much from socket, %d out of %d bytes.\n"));
-                ACE_Reactor::instance ()->end_event_loop (); return -1;
-              }
-            if (bytes != 0)
-              return 0;
-          }
-        else
-          memcpy(temp, tmp_buf + sizeof(msghd), bytes);
-        poffset += msghd.msgSize;
-        psize -= msghd.msgSize;
-        ptr += msghd.msgSize;
-
-        //        fprintf(stderr, "VB packet remain size %d\n", psize);
-
-        if (psize == 0)
-          {
-            //            ACE_DEBUG ((LM_DEBUG,"finished receiving current packet\n"));
-            /* finished receiving the current packet */
+	/* finished receiving the current packet */
 #ifdef NeedByteOrderConversion
-            packet->cmd = ntohl(packet->cmd);
-            packet->cmdsn = ntohl(packet->cmdsn);
-            packet->sh = ntohl(packet->sh);
-            packet->gop = ntohl(packet->gop);
-            packet->frame = ntohl(packet->frame);
-            packet->display = ntohl(packet->display);
-            packet->future = ntohl(packet->future);
-            packet->past = ntohl(packet->past);
-            packet->currentUPF = ntohl(packet->currentUPF);
-            packet->dataBytes = ntohl(packet->dataBytes);
+	packet->cmd = ntohl(packet->cmd);
+	packet->cmdsn = ntohl(packet->cmdsn);
+	packet->sh = ntohl(packet->sh);
+	packet->gop = ntohl(packet->gop);
+	packet->frame = ntohl(packet->frame);
+	packet->display = ntohl(packet->display);
+	packet->future = ntohl(packet->future);
+	packet->past = ntohl(packet->past);
+	packet->currentUPF = ntohl(packet->currentUPF);
+	packet->dataBytes = ntohl(packet->dataBytes);
 #endif
-            pcmdsn = packet->cmdsn;
-            pcmd = packet->cmd;
-            pfid = packet->frame;
-            pgop = packet->gop;
-            shared->VBheadFrame = (pcmd == CmdPLAY) ? pfid : pgop;
+	pcmdsn = packet->cmdsn;
+	pcmd = packet->cmd;
+	pfid = packet->frame;
+	pgop = packet->gop;
+	shared->VBheadFrame = (pcmd == CmdPLAY) ? pfid : pgop;
 	
-            shared->currentUPF = packet->currentUPF;
-            enter_cs(sid);
-            (*head)->full = 1;
-            psize = sizeof(**head) + sizeof(*msg) + msghd.packetSize;
-            psize = ((psize+3)>>2)<<2;
-            ptr = (char*)*head + psize;
-            (*head)->next = (struct block *) ptr;
-            (*head) = (struct block *)ptr;
-            (*head)->shcode = SHCODE;
-            leave_cs(countid);
-            leave_cs(sid);
-
-            /* VB receives all frame except for the INIT one through normalSocket */
-            if (dataSocket != normalSocket) 
-              {
-                this->socket_flag_ = 1;
-                fprintf(stderr, "VB got INIT frame.\n");
-                ACE_OS::write (initSocket, (char *)&initSocket, 1);  /* write a garbage byte */
-                //                ACE_OS::close (initSocket);
-                //                dataSocket = normalSocket;
-                //                int result = ACE_Reactor::instance ()->remove_handler (this,ACE_Event_Handler::READ_MASK);
-                //                if (result != 0)
-                //                  ACE_DEBUG ((LM_DEBUG,"remove handler failed for read_mask\n"));
-                
-              }
+	shared->currentUPF = packet->currentUPF;
+	enter_cs(sid);
+	(*head)->full = 1;
+	psize = sizeof(**head) + sizeof(*msg) + msghd.packetSize;
+	psize = ((psize+3)>>2)<<2;
+	ptr = (char*)*head + psize;
+	(*head)->next = (struct block *) ptr;
+	(*head) = (struct block *)ptr;
+	(*head)->shcode = SHCODE;
+	leave_cs(countid);
+	leave_cs(sid);
+
+	/* VB receives all frame except for the INIT one through normalSocket */
+	if (dataSocket != normalSocket) {
+	  /*
+	  Fprintf(stderr, "VB got INIT frame.\n");
+	  */
+	  write(initSocket, (char *)&initSocket, 1);  /* write a garbage byte */
+	  close(initSocket);
+	  dataSocket = normalSocket;
+	}
 	
-            /* following is synchronization feedback algorithm */
-            this->sync_feedback ();
-            if (dataSocket != normalSocket)
-              {
-                dataSocket = normalSocket;
-                int result = ACE_Reactor::instance ()->register_handler (this,ACE_Event_Handler::READ_MASK);
-                if (result != 0)
-                  ACE_DEBUG ((LM_DEBUG,"register handler failed for read_mask after datasocket change\n"));
-                return -1;
-              }
-            //            return 0;
-            break;  /* got the whole packet, break to the out-most loop for next packet */
-          }  /* end if (psize == 0) */
-        else if (psize < 0)
-          {
-            fprintf(stderr, "VB error: received too many msgs for a packet.\n");
-            ACE_Reactor::instance ()->end_event_loop ();
-            return -1;
-          }
-        this->state_ = READ_NEXT_HEADER;
-        temp = (char *)&msghd;
-        bytes = sizeof (msghd);
-        break;
-      }
-    }
-  return 0;
-}
+	/* following is synchronization feedback algorithm */
+	
+	if (shared->config.syncEffective) {
+	  if (state > 1 && state != 4 && (len = shared->qosRecomputes) != qosRecomputes) {
+	    /* QoS feedback packet is sent if at any time send pattern is
+	       recomputed, and sync feedback is not in active state*/
+	    send_feedback(dataSocket, 0, 0, advance);
+	    qosRecomputes = len;
+	  }
+	  switch (state) {
+	  case 4:  /* active */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
+	      /* jump to state 5 if speed changes */
+	      state = 5;
+	      break;
+	    }
+	    {
+	      int interval = shared->usecPerFrame;
+	      double val = (double)(pcmd == CmdPLAY ?
+			           pfid - shared->nextFrame :
+			           (pcmd == CmdFF ?
+			            pgop - shared->nextGroup :
+			            shared->nextGroup - pgop));
+	      fv = DoFilter(f, val); /* get average #frames in the whole client
+					pipeline, including all stages */
+	      val = val - fv;
+	      fav = DoFilter(fa, val >= 0.0 ? val : -val);
+	      /* get average #frames jitter in the whole client pipeline */
+							      
+	      val = fav * interval * 6;
+	      /* convert deviation in frame into microseconds, 6 is a magic number */
 
-int
-VideoBuffer::handle_output (ACE_HANDLE fd)
-{
-  if ((this->state_ == WRITE_FEEDBACK1) || (this->state_ == WRITE_FEEDBACK2))
-    {
-      // send the feedback to the server.
-      VideoFeedBackPara para;
-      para.cmdsn = htonl(shared->cmdsn);
-      para.addUsecPerFrame = htonl(fb_addupf);
-      para.addFrames = htonl(fb_addf);
-      para.needHeader = htonl(shared->needHeader);
-      shared->needHeader = 0;
-      para.frameRateLimit1000 =
-        htonl((long)(shared->frameRateLimit * 1000.0));
-      para.sendPatternGops = htonl(shared->sendPatternGops);
-      ACE_OS::memcpy (para.sendPattern, shared->sendPattern, PATTERN_SIZE);
-      
-      // fprintf(stderr, "VB to send a fb packet...");
+	      /* tries to recompute advance (in microseconds), and med/high/low
+		 in adaptation to current jitter level */
+	      if ((val > advance && !reach_limit) ||
+		  (advance > min_advance && val < advance >> 3)) {
+		advance = (int) max(2 * val, min_advance);
+		med = advance / interval;
+		/*
+		if (pcmd == CmdPLAY) {
+		  if (med < shared->VDframeNumber) {
+		    med = shared->VDframeNumber;
+		  }
+		}
+		else
+		*/
+		if (med < 2 ) { /* but keep minimum buffer fill level */
+		  med = 2;
+		}
+		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
+		  reach_limit = 1;
+		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
+		  Fprintf(stderr,
+			  "VB VSadvance control: VBbuf limit reached, med %d.\n", med);
+		}
+		else reach_limit = 0;
+		high = med + med / 2;
+		low = med - med / 2;
+		period = med * MAX_CLOCK_DRIFT;
+		Fprintf(stderr,
+		  "VB: VS advance control: fav %5.2f, med %d, advance %d at nextFrame %d\n",
+			fav, med, advance, shared->nextFrame);
+	      }
+	    }
+	    /* record the current time (fid or gopid) if buffer fill level drift
+	       only very little */
+	    if ((int)fv == med) {
+	      init_fv = fv;
+	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
+	      break;
+	    }
+	    /*
+	    fprintf(stderr, "VB fb: fv %lf\n", fv);
+	    */
+	    /* try send action if low/high water mark is passed, or qos recomputed */
+	    /* There is problem here, the deltas of upf are sent, instead of upf
+	       and frame themself. This scheme is not robust in case case feedback
+	       packets are lost, and get resent */
+	    len = shared->qosRecomputes;
+	    if (fv >= high || fv <= low || len != qosRecomputes) {
+	      int addupf, addf;
+	      int pos = pcmd == CmdPLAY ? pfid : pgop;
+	      int dist = (int)(pcmd == CmdFB ? init_pos - pos : pos - init_pos);
+	      if (fv >= high || fv <= low) {
+		if (dist < period) { /* try skip or stall */
+		  addf =  (int)(med - fv);
+		  addupf = 0;
+		}
+		else { /* try adjust VS clock rate */
+		  int added = (int)((double)cupf * (fv - (double)med) / (double) dist);
+		  addf = (int)(med - fv);
+		  addupf = added;
+		  cupf += added;
+		}
+		state = 6;
+	      }
+	      else {  /* fb only recomputed sendpattern, no state change */
+		addupf = 0;
+		addf = 0;
+	      }
 
-      int res;
-      if (conn_tag != 0) 
-        { /* packet stream */
-          if (temp == 0)
-            {
-              temp = (char *)&para;
-              bytes = sizeof (para);
-            }
-          res = ACE_OS::write (dataSocket, temp, bytes);
-          if (res == -1)
-            {
-              if (errno == EINTR)
-                return 0;
-              if (errno == ENOBUFS) {
-                perror("VB Warning, fb packet discarded for");
-                // Here we should handle the return -1 case!
-                fb_state = 4;
-              }
-              else
-                {
-                  ACE_OS::perror ("VB error, fb packet sending failed");
-                  ACE_Reactor::instance ()->end_event_loop (); return -1;
-                }
-            }
-          else if (res == 0)
-            {
-              ACE_OS::perror ("VB error, sending fb,socket closed");
-              ACE_Reactor::instance ()->end_event_loop (); return -1;
-            }
-          else
-            {
-              temp += res;
-              bytes -= res;
-              if (bytes != 0)
-                return 0;
-            }
-        }
-      else
-        {
-          res = ACE_OS::write (dataSocket, (char *)&para, sizeof(para));
-          if (res == -1)
-            {
-              ACE_OS::perror ("VB error, fb packet sending failed");
-              ACE_Reactor::instance ()->end_event_loop (); return -1;
-            }
-          if (res < sizeof(para))
-            {
-              fprintf(stderr, "VB send_feedback() warn: res %dB < sizeof(para) %dB\n",
-                      res, sizeof(para));
-            }
-        }
-      if (errno != ENOBUFS) // fb_state == 4;
-        qosRecomputes = len;
-      ACE_Reactor::instance ()->remove_handler (this,
-                                                ACE_Event_Handler::WRITE_MASK);
-      if (this->state_ == WRITE_FEEDBACK2)
-        {
-          if (fb_state == 6) 
-            { /* record the time if an action packet is
-                 successfully send, and indicate that an
-                 feedback action leads to state 6, which after
-                 delay sometime leads to state 3.
-                 The action_delay should have been related
-                 to round-trip time. */
-              action_time = get_usec();
-              action_delay = shared->usecPerFrame * 100;
-              not_action = 0;
-            }
-        }
-      else if (this->state_ == WRITE_FEEDBACK2)
-        {
-          this->feedback_action ();
-        }
+	      /* tries to send a feedback packet. */
+	      if (shared->live) {  /* no sync feedback with live video */
+		qosRecomputes = len;
+	      }
+	      else if (send_feedback(dataSocket, addupf, addf, advance) == -1) {
+		/* Keep trying action repeatedly if failed to send the action
+		   packet (by keeping in state 4).
+		   An action packet can also be lost in the network */
+		state = 4;
+	      }
+	      else {
+		qosRecomputes = len;
+	      }
+	      if (state == 6) { /* record the time if an action packet is
+				   successfully send, and indicate that an
+				   feedback action leads to state 6, which after
+				   delay sometime leads to state 3.
+				   The action_delay should have been related
+				   to round-trip time. */
+		action_time = get_usec();
+		action_delay = shared->usecPerFrame * 100;
+		not_action = 0;
+	      }
+	    }
+	    break;
+	  case 6:  /* reset after action */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
+	      state = 5;
+	      break;
+	    }
+	    /* Jump to transition state 3 only after delay for some
+	       time, when feedback action has been taken, and the
+	       effect has been propogated back to the client */
+	    if (get_duration(action_time, get_usec()) >= action_delay) {
+	      state = 3;
+	    }
+	    break;
+	  case 5:  /* reset after speed change, feedback stays in this
+		      state as long as play speed is changing */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    /* Jump to transition state 3, indicating that the transition
+	       is not caused by feedback action */
+	    if (shared->currentUPF == shared->usecPerFrame) {
+	      not_action = 1;
+	      state = 3;
+	    }
+	    break;
+	  case 2:  /* delay after start, this delay is for avoiding feedback
+		      action during server fast start-up. */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY) {
+	      if (pfid - startpos >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    else if (pcmd == CmdFF) {
+	      if (pgop - startpos >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    else {  /* CmdFB */
+	      if (startpos - pgop >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    break;
+	  case 3:  /* transient state, entered after start-up delay,
+		      action-delay, or play-speed change */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    /* Initialize both buffer-fill-level and jitter filters */
+	    if (f == NULL) {
+	      f = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
+			    shared->config.filterPara : 100);
+	    }
+	    else {
+	      f = ResetFilter(f, shared->config.filterPara >= 1 ?
+			      shared->config.filterPara : 100);
+	    }
+	    if (fa == NULL) {
+	      fa = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
+			    shared->config.filterPara : 100);
+	      DoFilter(fa, 0.0);
+	    }
+	    else if (not_action) { /* reset jitter level filter only
+				      if entering this state is not
+				      cause by feedback action */
+	      fa = ResetFilter(fa, shared->config.filterPara >= 1 ?
+			      shared->config.filterPara : 100);
+	    }
+	    if (f == NULL || fa == NULL) {
+	      perror("VB failed to allocate space for filters");
+	      state = 0;
+	    }
+	    else {
+	      init_fv =
+	        DoFilter(f, (double)(pcmd == CmdPLAY ?
+			    pfid - shared->nextFrame :
+			    (pcmd == CmdFF ?
+			     pgop - shared->nextGroup :
+			     shared->nextGroup - pgop)));
+	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
+	      upf = shared->currentUPF;
+	      cupf = upf;
+	      {
+		int interval = shared->usecPerFrame;
+
+		/* upon speed change, 'advance', in microseconds, will
+                   not change, but med/high/low will be updated. This
+                   may suggest that in the new toolkit version of the
+                   same feedback systems, the buffer-fill level and
+                   jitter is measured directly in microseconds, not in
+                   #frames then converting to microseconds. */
+		med = advance / interval;
+		/*
+		if (pcmd == CmdPLAY) {
+		  if (med < shared->VDframeNumber) {
+		    med = shared->VDframeNumber;
+		    min_advance = advance = med * interval;
+		  }
+		}
+		else
+		*/
+		if (med < 2 ) {
+		  med = 2;
+		  advance = med * interval;
+		  min_advance = max(advance, shared->VStimeAdvance);
+		}
+		else min_advance = shared->VStimeAdvance;
+		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
+		  reach_limit = 1;
+		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
+		  if (not_action) {
+		    Fprintf(stderr,
+		       "VB start/speed-change: VBbuf limit reached, med %d.\n", med);
+		  }
+		}
+		else reach_limit = 0;
+	      }
+	      high = med + med / 2;
+	      low = med - med / 2;
+	      delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
+							feedback when VS is in
+							fast-start period */
+	      period = med * MAX_CLOCK_DRIFT;
+	      if (not_action) {
+		Fprintf(stderr,
+			"VB start/speed-change: med %d, advance %d at nextFrame %d\n",
+			med, advance, shared->nextFrame);
+	      }
+	      state = 4;
+	    }
+	    break;
+	  case 0:  /* idle */
+	    if (pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB) {
+	      cmdsn = pcmdsn;
+	      state = 1;
+	    }
+	    break;
+	  case 1:  /* start */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      break;
+	    }
+	    startpos = pcmd == CmdPLAY ? pfid : pgop;
+	    advance = shared->VStimeAdvance;
+
+	    /*  following from vs.c:
+		timerAdjust = (VStimeAdvance * SPEEDUP_INV_SCALE) / currentUPF;
+	        */
+	    med = advance / shared->usecPerFrame;
+	    /*
+	    if (pcmd != CmdPLAY) med /= shared->patternSize;
+	    */
+	    delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
+						      feedback when VS is in
+						      fast-start period */
+	    not_action = 1;
+	    state = 2;
+	    break;
+	  default:
+	    fprintf(stderr, "VB: unknown Feedback state %d reached.\n", state);
+	    state = 0;
+	    break;
+	  }
+	}   /* end if (shared->config.syncEffective) */
+	else {
+	  state = 0;
+	}
 #ifdef STAT
+	if (shared->collectStat && packet->cmd != CmdREF)
+	{
+	  char * val, * val1;
+	  int size;
+	  size = packet->frame;
+	  shared->stat.VBframesReceived[size >>3] |= 1 << (size % 8);
+	  val = (char *)*head;
+	  val1 = (char *)*tail;
+	  if (val >= val1)  /* *head >= *tail */
+	    size = val - val1;
+	  else
+	    size = bufsize - (val1 - val);
+	  shared->stat.VBmaxBytes = max(shared->stat.VBmaxBytes, size);
+	}
+#endif
+	/*
+        fprintf(stderr, "VB: Packet(%x, buf:%x)=cmd-%d, cmdsn-%d sh-%d, gop-%d\n",
+	        (int)packet, (int)buf, packet->cmd, packet->cmdsn, packet->sh, packet->gop);
+        fprintf(stderr, "           frame-%d, display-%d, future-%d, past-%d, bytes-%d\n",
+	        packet->frame, packet->display, packet->future,
+		packet->past, packet->dataBytes);
+	*/
+	break;  /* got the whole packet, break to the out-most loop for next packet */
+      }  /* end if (psize == 0) */
+      else if (psize < 0)
       {
-        int i;
-        if ((i = shared->stat.fbPacketNumber) < MAX_FB_PACKETS) {
-          shared->stat.fbPackets[i].frameId = shared->nextFrame;
-          shared->stat.fbPackets[i].addUsecPerFrame = addupf;
-          shared->stat.fbPackets[i].addFrames = addf;
-          shared->stat.fbPackets[i].frames = shared->sendPatternGops *
-            shared->patternSize;
-          shared->stat.fbPackets[i].framesDropped = shared->framesDropped;
-          shared->stat.fbPackets[i].frameRateLimit = shared->frameRateLimit;
-          shared->stat.fbPackets[i].advance = advance;
-        }
-        shared->stat.fbPacketNumber ++;
+	fprintf(stderr, "VB error: received too many msgs for a packet.\n");
+	exit(1);
       }
+
+      /* try get another message for current packet */
+      for (;;)
+      {
+	if (conn_tag >= 0) {
+	  len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
+	}
+	else {
+	  len = read(dataSocket, tmp_buf, -conn_tag);
+	  memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
+	}
+	if (exit_tag) exit_on_kill();
+        //        ACE_DEBUG ((LM_DEBUG, "(%P|%t) vb: Got a packet of length = %d\n", len));
+	if (len <= 0)
+	{
+	  if (errno == EWOULDBLOCK || errno == EAGAIN) {
+	    perror("VB sleep2 for 10ms");
+	    usleep(10000);
+	    if (exit_tag) exit_on_kill();
+	    continue;
+	  }
+          perror("VB recv data(MSG_PEEK)");
+          exit(1);
+	}
+	if (len < sizeof(msghd)) {
+	  fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
+		  len, sizeof(msghd));
+	  continue;
+	}
+#ifdef NeedByteOrderConversion
+	msghd.packetsn = ntohl(msghd.packetsn);
+	msghd.packetSize = ntohl(msghd.packetSize);
+	msghd.msgsn = ntohl(msghd.msgsn);
+	msghd.msgOffset = ntohl(msghd.msgOffset);
+	msghd.msgSize = ntohl(msghd.msgSize);
 #endif
-      //  Now return to the reading header position.
-      this->state_ = READ_HEADER;
-      temp = (char *)&msghd;
-      bytes = sizeof (msghd);
-      int result = ACE_Reactor::instance ()->remove_handler (this,
-                                                             ACE_Event_Handler::WRITE_MASK);
-      if (result != 0)
-        ACE_DEBUG ((LM_DEBUG,"remove_handler failed for write"));
+	/*
+        fprintf(stderr, "VB PEEK2 a msg: sn-%d, size-%d, pkt-%d, pktsize-%d\n",
+	        msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
+	*/
+#ifdef STAT
+	{
+	  int gap = msghd.msgsn - gap_msgsn;
+	  gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
+	  shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
+	  if (gap >0) gap_msgsn = msghd.msgsn;
+	}
+#endif
+	if (msghd.msgsn <= msgsn) { /* outdated message, wait for next one */
+	  /*
+	  fprintf(stderr, "VB discard outdated or dup msgsn %d, pktsn %d\n",
+		  msghd.msgsn, msghd.packetsn);
+	  */
+	  skip_message(dataSocket, &msghd);
+	  continue;
+	}
+	break;  /* got a message for current packet */
+      }  /* end for (;;) */
+      
+      if (msghd.msgsn > msgsn + 1 || msghd.msgOffset == 0)
+      {
+        /* message out of order, abandon current packet */
+	/*
+	fprintf(stderr, "VB msg out of order for current packet, discard it.\n");
+	*/
+#ifdef STAT
+	to_count = 0;
+#endif
+        goto start_new_packet;
+      }
+      else {
+        msgsn = msghd.msgsn;
+      }
     }
-  return 0;
+  }
 }
 
-int
-VideoBuffer::sync_feedback (void)
-{
-  int result;
-  if (shared->config.syncEffective) 
-    {
-      if (fb_state > 1 && fb_state != 4 && (len = shared->qosRecomputes) != qosRecomputes)
-        {
-          /* QoS feedback packet is sent if at any time send pattern is
-           recomputed, and sync feedback is not in active fb_state*/
-          this->state_ = WRITE_FEEDBACK1;
-          result = ACE_Reactor::instance ()->register_handler (this,ACE_Event_Handler::WRITE_MASK);
-          if (result != 0)
-            return result;
-          fb_addupf = 0;
-          fb_addf = 0;
-          fb_advance = advance;
-          temp = 0;
-          return 0;
-        }
-      this->feedback_action ();
-    }  /* end if (shared->config.syncEffective) */
-  else 
-    fb_state = 0;
-  return 0;
-}
 
-int
-VideoBuffer::feedback_action (void)
+void MyVBprocess(int initSocket, int normalSocket)
 {
-  switch (fb_state)
-    {
-    case 4:  /* active */
-      if (pcmdsn != cmdsn)
-        {
-          cmdsn = pcmdsn;
-          if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) 
-            fb_state = 0;
-          else
-            fb_state = 1;
-          break;
-        }
-      if (pcmd == CmdPLAY && shared->usecPerFrame != upf)
-        {
-          /* jump to fb_state 5 if speed changes */
-          fb_state = 5;
-          break;
-        }
-      {
-        int interval = shared->usecPerFrame;
-        double val = (double)(pcmd == CmdPLAY ?
-                              pfid - shared->nextFrame :
-                              (pcmd == CmdFF ?
-                               pgop - shared->nextGroup :
-                               shared->nextGroup - pgop));
-        fv = DoFilter(f, val); /* get average #frames in the whole client
-                                  pipeline, including all stages */
-        val = val - fv;
-        fav = DoFilter(fa, val >= 0.0 ? val : -val);
-        /* get average #frames jitter in the whole client pipeline */
-							      
-        val = fav * interval * 6;
-        /* convert deviation in frame into microseconds, 6 is a magic number */
-
-        /* tries to recompute advance (in microseconds), and med/high/low
-           in adaptation to current jitter level */
-        if ((val > advance && !reach_limit) ||
-            (advance > min_advance && val < advance >> 3)) {
-          advance = (int) max(2 * val, min_advance);
-          med = advance / interval;
-          /*
-            if (pcmd == CmdPLAY) {
-            if (med < shared->VDframeNumber) {
-            med = shared->VDframeNumber;
-            }
-            }
-            else
-          */
-          if (med < 2 ) { /* but keep minimum buffer fill level */
-            med = 2;
-          }
-          if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-            reach_limit = 1;
-            med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-            Fprintf(stderr,
-                    "VB VSadvance control: VBbuf limit reached, med %d.\n", med);
-          }
-          else reach_limit = 0;
-          high = med + med / 2;
-          low = med - med / 2;
-          period = med * MAX_CLOCK_DRIFT;
-          Fprintf(stderr,
-                  "VB: VS advance control: fav %5.2f, med %d, advance %d at nextFrame %d\n",
-                  fav, med, advance, shared->nextFrame);
-        }
+  VideoMessage * msg, msghd;
+  VideoPacket * packet;
+  int len, bsize, msgsn = -1;
+  int psize, poffset;
+  char * ptr, *ptr1;
+  char *tmp_buf = NULL;
+  int dataSocket = initSocket;
+
+  /* INIT frame is received from CTR through initSocket */
+
+#ifdef STAT
+  int to_count = 1;
+  int gap_msgsn = -1;
+#endif
+  
+  /* following variables are for feedback */
+  int pcmdsn, pcmd;  /* to store the cmdsn and cmd of previous frame,
+			to detect new commands */
+  int pfid, pgop;    /* frame-id of gopid of previous frame */
+  int cmdsn = -1;    /* cmdsn of previous command */
+  int state = 0;     /* state of the control law/regulator */
+  int startpos;      /* gopid or frameid when the regulator is in 'start' state 1 */
+  int delay;	     /* #frames to delay after 'start' */
+  int qosRecomputes = 0; /* indicate if qos has been recomputed recently */
+  int action_delay;	/* microseconds to delay after feedback action */
+  int action_time;     /* the time when feedback action is taken, used to enforce
+			  action_delay */
+  int upf, cupf;	/* upf -- currentUPF as carried in all frames,
+			   cupf -- real current UPF, being adjusted by FB */
+  double fv;		/* current buffer fill level in term of #frames */	
+  double init_fv;	/* init_fv and init_pos record the fv value and position
+			   (frameid or gopid) when fv is very close to med */
+  double init_pos;
+  int high, low, med;	/* median, high and low water marks, in term of #frames */
+  int period;		/* interms of #frames, (high-med, period) defined the max
+			   buffer fill drift which can be assumed as caused by
+			   clock drift */
+  Filter * f = NULL;	/* buffer fill level filter */
+
+  int advance, min_advance; /* in microseconds, advance holds the
+			       current target buffer-fill-level as
+			       determined by jitter level
+			       estimate. min_advance sets a absolute
+			       minimun level, no matter how low jitter
+			       level is.
+			       'advance' does not change when
+			       play-speed changes, but med/high/low
+			       will be updated upon speed change */
+  double fav;		/* #frames, jitter level output by the filter */
+  Filter * fa = NULL;	/* jitter filter */
+  int reach_limit = 0;	/* indicate that the target 'advance' has reached client VB
+			   buffer limit, and can not further increase, even if
+			   jitter increases */
+  int not_action = 1;	/* indicates entering state=3 is not caused by
+			   feedback action. If not_action = 1 entering state=3
+			   is caused either by 'start' or speed change, and
+			   the jitter filter needs to be reset */
+
+  exit_tag = 0;
+  conn_tag = shared->videoMaxPktSize;
+
+  savedSocket = normalSocket;
+#if 0  
+#ifdef __svr4__
+  
+  /* On solaris 2.x for i86pc, a datagram socket may not discard the
+     remaining of a message if recv() fails to read the whole
+     thing. Following systems are tried but seems doesn't work. So for
+     this platform, This causes problem with skip_message() defined
+     above, which tries to discard whole packets by reading only a few
+     bytes. An alternative here is to allocate a big enough buffer,
+     read and discard the whole packet, this is less efficient because
+     of more data copy.
+
+     But if we call read(2) instead of recv(), then it works.
+     */
+  if (!conn_tag) {
+    len = ioctl(dataSocket, I_SRDOPT, RMSGD);  /* discard unread part of the message */
+    if (len) perror("error message");
+  }
+#endif
+#endif
+  
+  setsignal(SIGUSR1, usr1_handler);
+  setsignal(SIGUSR2, usr2_handler);
+
+  if (conn_tag < 0) {  /* buffer big enough for discard mode packet stream */
+    tmp_buf = (char *)malloc(-conn_tag);
+    if (tmp_buf == NULL) {
+      fprintf(stderr, "AB failed to allocate %d bytes");
+      perror("of tmp_buf");
+      exit(1);
+    }
+  }
+
+  for (;;)
+  {
+    //    fprintf(stderr, "VB wait for a new packet.\n");
+    if (conn_tag >= 0) {
+      len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
+    }
+    else {  /* discard mode packet stream, read all bytes */
+      len = read(dataSocket, tmp_buf, -conn_tag);
+      memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
+    }
+    if (exit_tag) exit_on_kill();
+    if (len == -1) {
+      if (errno == EWOULDBLOCK || errno == EAGAIN) {
+	perror("VB sleep for 10ms");
+	usleep(10000);
+	if (exit_tag) exit_on_kill();
+	continue;
+      }
+      perror("VB read() data");
+      exit(1);
+    }
+    if (len == 0) {  /* EOF, connection closed by peer */
+      fprintf(stderr, "Error: VB found dataSocket broken\n");
+      for (;;) {
+	usleep(1000000);
+	if (exit_tag) exit_on_kill();
       }
-      /* record the current time (fid or gopid) if buffer fill level drift
-         only very little */
-      if ((int)fv == med)
-        {
-          init_fv = fv;
-          init_pos = pcmd == CmdPLAY ? pfid : pgop;
-          break;
-        }
+    }
+    if (len < sizeof(msghd)) {
+      fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
+	      len, sizeof(msghd));
+      continue;
+    }
+#ifdef NeedByteOrderConversion
+    msghd.packetsn = ntohl(msghd.packetsn);
+    msghd.packetSize = ntohl(msghd.packetSize);
+    msghd.msgsn = ntohl(msghd.msgsn);
+    msghd.msgOffset = ntohl(msghd.msgOffset);
+    msghd.msgSize = ntohl(msghd.msgSize);
+#endif
+    /*
+    fprintf(stderr, "VB PEEK1 a msg sn-%d, size-%d, pkt-%d, pktsize-%d\n",
+	    msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
+    */
+
+    
+  start_new_packet:
+
+    
+#ifdef STAT
+    if (to_count) {
+      int gap = msghd.msgsn - gap_msgsn;
+      gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
+      shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
+      if (gap >0) gap_msgsn = msghd.msgsn;
+    }
+    to_count = 1;
+#endif
+    if (msghd.msgsn <= msgsn)  /* outdated msg */
+    {
       /*
-        fprintf(stderr, "VB fb: fv %lf\n", fv);
+      fprintf(stderr, "VB discard outdated msgsn %d, pktsn %d when expecting first\n",
+	      msghd.msgsn, msghd.packetsn);
       */
-      /* try send action if low/high water mark is passed, or qos recomputed */
-      /* There is problem here, the deltas of upf are sent, instead of upf
-         and frame themself. This scheme is not robust in case case feedback
-         packets are lost, and get resent */
-      len = shared->qosRecomputes;
-      if (fv >= high || fv <= low || len != qosRecomputes)
-        {
-          int addupf, addf;
-          int pos = pcmd == CmdPLAY ? pfid : pgop;
-          int dist = (int)(pcmd == CmdFB ? init_pos - pos : pos - init_pos);
-          if (fv >= high || fv <= low)
-            {
-              if (dist < period)
-                { /* try skip or stall */
-                  addf =  (int)(med - fv);
-                  addupf = 0;
-                }
-              else
-                { /* try adjust VS clock rate */
-                  int added = (int)((double)cupf * (fv - (double)med) / (double) dist);
-                  addf = (int)(med - fv);
-                  addupf = added;
-                  cupf += added;
-                }
-              fb_state = 6;
-            }
-          else
-            {  /* fb only recomputed sendpattern, no fb_state change */
-              addupf = 0;
-              addf = 0;
-            }
-
-          /* tries to send a feedback packet. */
-          if (shared->live)
-            /* no sync feedback with live video */
-            qosRecomputes = len;
-          else 
-            {
-              this->state_ = WRITE_FEEDBACK2;
-              int result = ACE_Reactor::instance ()->register_handler (this,ACE_Event_Handler::WRITE_MASK);
-              if (result != 0)
-                return result;
-              fb_addupf = addupf;
-              fb_addf = addf;
-              fb_advance = advance;
-              return 0;
-            }
-          if (fb_state == 6)
-            { /* record the time if an action packet is
-                 successfully send, and indicate that an
-                 feedback action leads to fb_state 6, which after
-                 delay sometime leads to fb_state 3.
-                 The action_delay should have been related
-                 to round-trip time. */
-              action_time = get_usec();
-              action_delay = shared->usecPerFrame * 100;
-              not_action = 0;
-            }
-        }
-      break;
-    case 6:  /* reset after action */
-      if (pcmdsn != cmdsn)
-        {
-          cmdsn = pcmdsn;
-          if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) 
-            fb_state = 0;
-          else
-            fb_state = 1;
-          break;
-        }
-      if (pcmd == CmdPLAY && shared->usecPerFrame != upf)
-        {
-          fb_state = 5;
-          break;
-        }
-      /* Jump to transition fb_state 3 only after delay for some
-         time, when feedback action has been taken, and the
-         effect has been propogated back to the client */
-      if (get_duration(action_time, get_usec()) >= action_delay) 
-        fb_state = 3;
-      break;
-    case 5:  /* reset after speed change, feedback stays in this
-                fb_state as long as play speed is changing */
-      if (pcmdsn != cmdsn)
-        {
-          cmdsn = pcmdsn;
-          if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) 
-            fb_state = 0;
-          else 
-            fb_state = 1;
-          break;
-        }
-      /* Jump to transition fb_state 3, indicating that the transition
-         is not caused by feedback action */
-      if (shared->currentUPF == shared->usecPerFrame)
-        {
-          not_action = 1;
-          fb_state = 3;
-        }
-      break;
-    case 2:  /* delay after start, this delay is for avoiding feedback
-                action during server fast start-up. */
-      if (pcmdsn != cmdsn) {
-        cmdsn = pcmdsn;
-        if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-          fb_state = 0;
-        }
-        else {
-          fb_state = 1;
-        }
-        break;
-      }
-      if (pcmd == CmdPLAY) {
-        if (pfid - startpos >= delay) {
-          advance = shared->VStimeAdvance;
-          fb_state = 3;
-        }
-      }
-      else if (pcmd == CmdFF) {
-        if (pgop - startpos >= delay) {
-          advance = shared->VStimeAdvance;
-          fb_state = 3;
-        }
-      }
-      else {  /* CmdFB */
-        if (startpos - pgop >= delay) {
-          advance = shared->VStimeAdvance;
-          fb_state = 3;
-        }
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    else if (msghd.msgOffset != 0)  /* not first msg of a packet */
+    {
+      /*
+      Fprintf(stderr, "VB discard non-first msg msgsn %d, pktsn %d\n",
+	      msghd.msgsn, msghd.packetsn);
+      */
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    else
+      msgsn = msghd.msgsn;
+    
+    /* allocate packet for the incoming msg */
+    bsize =  msghd.packetSize + sizeof(**head)*2 + sizeof(msghd);
+    bsize = ((bsize+3)>>2)<<2;
+    enter_cs(sid);
+    if (*head >= *tail)
+    {
+      if (bufsize - (int)((char*)*head - buf) >= bsize )
+        msg =(VideoMessage *)((char*)*head + sizeof(**head));
+      else if ((int)((char*)*tail - buf) >= bsize)
+      {
+	(*head)->next = (struct block *)buf;
+	(*head)->full = 0;
+	*head = (struct block *)buf;
+	msg = (VideoMessage *)(buf + sizeof(**head));
+	*head = (struct block *)buf;
+	(*head)->shcode = SHCODE;
       }
-      break;
-    case 3:  /* transient fb_state, entered after start-up delay,
-                action-delay, or play-speed change */
-      if (pcmdsn != cmdsn) {
-        cmdsn = pcmdsn;
-        if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-          fb_state = 0;
-        }
-        else {
-          fb_state = 1;
-        }
-        break;
+      else /* not enough buffer, discard current message */
+      {
+	leave_cs(sid);
+#ifdef STAT
+	if (shared->collectStat)
+  	  shared->stat.VBdroppedFrames ++;
+#endif
+	/*
+	Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
+		msghd.msgsn, msghd.packetsn);
+	*/
+        skip_message(dataSocket, &msghd);
+	continue;
       }
-      /* Initialize both buffer-fill-level and jitter filters */
-      if (f == NULL) {
-        f = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-                      shared->config.filterPara : 100);
+    }
+    else /* *head < *tail */
+    if ((char*)*tail - (char*)*head >= bsize)
+      msg = (VideoMessage *)((char*)*head + sizeof(**head));
+    else   /* not enough buffer, abandon current message */
+    {
+      leave_cs(sid);
+#ifdef STAT
+      if (shared->collectStat)
+	shared->stat.VBdroppedFrames ++;
+#endif
+      /*
+      Fprintf(stderr, "VB not enough space 1, drop msg.sn %d pktsn %d\n",
+	      msghd.msgsn, msghd.packetsn);
+      */
+      skip_message(dataSocket, &msghd);
+      continue;
+    }
+    leave_cs(sid);
+    /*
+    fprintf(stderr, "VB allocated a buffer for comming packet.\n");
+    */
+    psize = msghd.packetSize;
+    poffset = 0;
+    packet = (VideoPacket *)((char*)msg + sizeof(msghd));
+    *(((int*)packet)+(msghd.packetSize>>2)) = 0;
+                             /* clear the last no more than three bytes, for
+				proper detecting the end of packet by VD */
+    ptr = (char*)msg;
+    for (;;)
+    {
+      int bytes;
+      bytes = sizeof(msghd) + msghd.msgSize;
+      if (conn_tag >= 0) {
+	len = bytes;
+	read_bytes(dataSocket, ptr + sizeof(msghd), bytes - sizeof(msghd));
       }
       else {
-        f = ResetFilter(f, shared->config.filterPara >= 1 ?
-                        shared->config.filterPara : 100);
+	len = bytes;
+	memcpy(ptr + sizeof(msghd), tmp_buf + sizeof(msghd), bytes - sizeof(msghd));
       }
-      if (fa == NULL) {
-        fa = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
-                       shared->config.filterPara : 100);
-        DoFilter(fa, 0.0);
-      }
-      else if (not_action) { /* reset jitter level filter only
-                                if entering this fb_state is not
-                                cause by feedback action */
-        fa = ResetFilter(fa, shared->config.filterPara >= 1 ?
-                         shared->config.filterPara : 100);
-      }
-      if (f == NULL || fa == NULL) {
-        ACE_OS::perror ("VB failed to allocate space for filters");
-        fb_state = 0;
-      }
-      else {
-        init_fv =
-          DoFilter(f, (double)(pcmd == CmdPLAY ?
-                               pfid - shared->nextFrame :
-                               (pcmd == CmdFF ?
-                                pgop - shared->nextGroup :
-                                shared->nextGroup - pgop)));
-        init_pos = pcmd == CmdPLAY ? pfid : pgop;
-        upf = shared->currentUPF;
-        cupf = upf;
-        {
-          int interval = shared->usecPerFrame;
-
-          /* upon speed change, 'advance', in microseconds, will
-             not change, but med/high/low will be updated. This
-             may suggest that in the new toolkit version of the
-             same feedback systems, the buffer-fill level and
-             jitter is measured directly in microseconds, not in
-             #frames then converting to microseconds. */
-          med = advance / interval;
-          /*
-            if (pcmd == CmdPLAY) {
-            if (med < shared->VDframeNumber) {
-            med = shared->VDframeNumber;
-            min_advance = advance = med * interval;
-            }
-            }
-            else
-          */
-          if (med < 2 ) {
-            med = 2;
-            advance = med * interval;
-            min_advance = max(advance, shared->VStimeAdvance);
-          }
-          else min_advance = shared->VStimeAdvance;
-          if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
-            reach_limit = 1;
-            med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
-            if (not_action) {
-              Fprintf(stderr,
-                      "VB start/speed-change: VBbuf limit reached, med %d.\n", med);
-            }
-          }
-          else reach_limit = 0;
-        }
-        high = med + med / 2;
-        low = med - med / 2;
-        delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-                                                  feedback when VS is in
-                                                  fast-start period */
-        period = med * MAX_CLOCK_DRIFT;
-        if (not_action) {
-          Fprintf(stderr,
-                  "VB start/speed-change: med %d, advance %d at nextFrame %d\n",
-                  med, advance, shared->nextFrame);
-        }
-        fb_state = 4;
+      if (exit_tag) exit_on_kill();
+      if (len == -1) {
+	perror("VB fails to recv data");
+	exit(1);
       }
-      break;
-    case 0:  /* idle */
-      if (pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB) {
-        cmdsn = pcmdsn;
-        fb_state = 1;
+      if (len < bytes) {
+	fprintf(stderr, "VB warn: recv() len %dB < bytes %dB\n", len, bytes);
       }
-      break;
-    case 1:  /* start */
-      if (pcmdsn != cmdsn) {
-        cmdsn = pcmdsn;
-        if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
-          fb_state = 0;
-        }
+      /* because message header is already PEEKed to msghd before recv(), so we can
+	 use info in msghd instead of *(VideoMessage*)ptr   */
+      if (len != sizeof(msghd)+msghd.msgSize)
+        /* some of msg contents not successfully received, abandon current packet */
+      {
+	/*
+	fprintf(stderr, "VB got corrupted msg, len=%d, supposed len=%d\n",
+		len, sizeof(msghd)+msghd.msgSize);
+	 */
         break;
       }
-      startpos = pcmd == CmdPLAY ? pfid : pgop;
-      advance = shared->VStimeAdvance;
-
-      /*  following from vs.c:
-          timerAdjust = (VStimeAdvance * SPEEDUP_INV_SCALE) / currentUPF;
-      */
-      med = advance / shared->usecPerFrame;
+      poffset += msghd.msgSize;
+      psize -= msghd.msgSize;
+      ptr += msghd.msgSize;
       /*
-        if (pcmd != CmdPLAY) med /= shared->patternSize;
+      fprintf(stderr, "VB packet remain size %d\n", psize);
       */
-      delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
-                                                feedback when VS is in
-                                                fast-start period */
-      not_action = 1;
-      fb_state = 2;
-      break;
-    default:
-      fprintf(stderr, "VB: unknown Feedback fb_state %d reached.\n", fb_state);
-      fb_state = 0;
-      break;
-    }
-}
+      if (psize == 0)
+      {
+	/* finished receiving the current packet */
+#ifdef NeedByteOrderConversion
+	packet->cmd = ntohl(packet->cmd);
+	packet->cmdsn = ntohl(packet->cmdsn);
+	packet->sh = ntohl(packet->sh);
+	packet->gop = ntohl(packet->gop);
+	packet->frame = ntohl(packet->frame);
+	packet->display = ntohl(packet->display);
+	packet->future = ntohl(packet->future);
+	packet->past = ntohl(packet->past);
+	packet->currentUPF = ntohl(packet->currentUPF);
+	packet->dataBytes = ntohl(packet->dataBytes);
+#endif
+	pcmdsn = packet->cmdsn;
+	pcmd = packet->cmd;
+	pfid = packet->frame;
+	pgop = packet->gop;
+	shared->VBheadFrame = (pcmd == CmdPLAY) ? pfid : pgop;
+	
+	shared->currentUPF = packet->currentUPF;
+	enter_cs(sid);
+	(*head)->full = 1;
+	psize = sizeof(**head) + sizeof(*msg) + msghd.packetSize;
+	psize = ((psize+3)>>2)<<2;
+	ptr = (char*)*head + psize;
+	(*head)->next = (struct block *) ptr;
+	(*head) = (struct block *)ptr;
+	(*head)->shcode = SHCODE;
+	leave_cs(countid);
+	leave_cs(sid);
 
-ACE_HANDLE
-Notification_Handler::get_handle (void) const
-{
-  return -1;
-}
+	/* VB receives all frame except for the INIT one through normalSocket */
+	if (dataSocket != normalSocket) {
+	  /*
+	  Fprintf(stderr, "VB got INIT frame.\n");
+	  */
+	  write(initSocket, (char *)&initSocket, 1);  /* write a garbage byte */
+	  close(initSocket);
+	  dataSocket = normalSocket;
+	}
+	
+	/* following is synchronization feedback algorithm */
+	
+	if (shared->config.syncEffective) {
+	  if (state > 1 && state != 4 && (len = shared->qosRecomputes) != qosRecomputes) {
+	    /* QoS feedback packet is sent if at any time send pattern is
+	       recomputed, and sync feedback is not in active state*/
+	    send_feedback(dataSocket, 0, 0, advance);
+	    qosRecomputes = len;
+	  }
+	  switch (state) {
+	  case 4:  /* active */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
+	      /* jump to state 5 if speed changes */
+	      state = 5;
+	      break;
+	    }
+	    {
+	      int interval = shared->usecPerFrame;
+	      double val = (double)(pcmd == CmdPLAY ?
+			           pfid - shared->nextFrame :
+			           (pcmd == CmdFF ?
+			            pgop - shared->nextGroup :
+			            shared->nextGroup - pgop));
+	      fv = DoFilter(f, val); /* get average #frames in the whole client
+					pipeline, including all stages */
+	      val = val - fv;
+	      fav = DoFilter(fa, val >= 0.0 ? val : -val);
+	      /* get average #frames jitter in the whole client pipeline */
+							      
+	      val = fav * interval * 6;
+	      /* convert deviation in frame into microseconds, 6 is a magic number */
 
-int
-Notification_Handler::handle_input (ACE_HANDLE fd)
-{
-  ACE_DEBUG ((LM_DEBUG,"Notification_Handler::handle_input"));
-  char message[BUFSIZ];
-  message [0] = 0;
-  // used to indicate that we should exit.
-  int result =
-    ACE_OS::read (fd,message,BUFSIZ);
-
-  ACE_DEBUG ((LM_DEBUG,"result:%d,message[0]:%d\n",result,message[0]));
-  if (result == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,"AB process exiting, notification socket eof while reading\n"));
-      ACE_Reactor::instance ()->end_event_loop (); 
-      return -1;
-    }
-  if (result == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,"AB process exiting, notification socket error while reading\n"));
-      ACE_Reactor::instance ()->end_event_loop (); 
-      return -1;
-    }
-  ACE_DEBUG ((LM_DEBUG," %d %d\n",result,message[0]));
+	      /* tries to recompute advance (in microseconds), and med/high/low
+		 in adaptation to current jitter level */
+	      if ((val > advance && !reach_limit) ||
+		  (advance > min_advance && val < advance >> 3)) {
+		advance = (int) max(2 * val, min_advance);
+		med = advance / interval;
+		/*
+		if (pcmd == CmdPLAY) {
+		  if (med < shared->VDframeNumber) {
+		    med = shared->VDframeNumber;
+		  }
+		}
+		else
+		*/
+		if (med < 2 ) { /* but keep minimum buffer fill level */
+		  med = 2;
+		}
+		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
+		  reach_limit = 1;
+		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
+		  Fprintf(stderr,
+			  "VB VSadvance control: VBbuf limit reached, med %d.\n", med);
+		}
+		else reach_limit = 0;
+		high = med + med / 2;
+		low = med - med / 2;
+		period = med * MAX_CLOCK_DRIFT;
+		Fprintf(stderr,
+		  "VB: VS advance control: fav %5.2f, med %d, advance %d at nextFrame %d\n",
+			fav, med, advance, shared->nextFrame);
+	      }
+	    }
+	    /* record the current time (fid or gopid) if buffer fill level drift
+	       only very little */
+	    if ((int)fv == med) {
+	      init_fv = fv;
+	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
+	      break;
+	    }
+	    /*
+	    fprintf(stderr, "VB fb: fv %lf\n", fv);
+	    */
+	    /* try send action if low/high water mark is passed, or qos recomputed */
+	    /* There is problem here, the deltas of upf are sent, instead of upf
+	       and frame themself. This scheme is not robust in case case feedback
+	       packets are lost, and get resent */
+	    len = shared->qosRecomputes;
+	    if (fv >= high || fv <= low || len != qosRecomputes) {
+	      int addupf, addf;
+	      int pos = pcmd == CmdPLAY ? pfid : pgop;
+	      int dist = (int)(pcmd == CmdFB ? init_pos - pos : pos - init_pos);
+	      if (fv >= high || fv <= low) {
+		if (dist < period) { /* try skip or stall */
+		  addf =  (int)(med - fv);
+		  addupf = 0;
+		}
+		else { /* try adjust VS clock rate */
+		  int added = (int)((double)cupf * (fv - (double)med) / (double) dist);
+		  addf = (int)(med - fv);
+		  addupf = added;
+		  cupf += added;
+		}
+		state = 6;
+	      }
+	      else {  /* fb only recomputed sendpattern, no state change */
+		addupf = 0;
+		addf = 0;
+	      }
 
-  switch (message[0])
-    {
-    case EXIT:
-      ACE_DEBUG ((LM_DEBUG,"VB process exiting because of exit signal\n"));
-      set_exit_routine_tag(0);
-      VideoBuffer::VBdeleteBuf();
-      ACE_Reactor::instance ()->end_event_loop (); 
-      return -1;
-    default:
-      break;
-    }
-  return 0;
-}
+	      /* tries to send a feedback packet. */
+	      if (shared->live) {  /* no sync feedback with live video */
+		qosRecomputes = len;
+	      }
+	      else if (send_feedback(dataSocket, addupf, addf, advance) == -1) {
+		/* Keep trying action repeatedly if failed to send the action
+		   packet (by keeping in state 4).
+		   An action packet can also be lost in the network */
+		state = 4;
+	      }
+	      else {
+		qosRecomputes = len;
+	      }
+	      if (state == 6) { /* record the time if an action packet is
+				   successfully send, and indicate that an
+				   feedback action leads to state 6, which after
+				   delay sometime leads to state 3.
+				   The action_delay should have been related
+				   to round-trip time. */
+		action_time = get_usec();
+		action_delay = shared->usecPerFrame * 100;
+		not_action = 0;
+	      }
+	    }
+	    break;
+	  case 6:  /* reset after action */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY && shared->usecPerFrame != upf) {
+	      state = 5;
+	      break;
+	    }
+	    /* Jump to transition state 3 only after delay for some
+	       time, when feedback action has been taken, and the
+	       effect has been propogated back to the client */
+	    if (get_duration(action_time, get_usec()) >= action_delay) {
+	      state = 3;
+	    }
+	    break;
+	  case 5:  /* reset after speed change, feedback stays in this
+		      state as long as play speed is changing */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    /* Jump to transition state 3, indicating that the transition
+	       is not caused by feedback action */
+	    if (shared->currentUPF == shared->usecPerFrame) {
+	      not_action = 1;
+	      state = 3;
+	    }
+	    break;
+	  case 2:  /* delay after start, this delay is for avoiding feedback
+		      action during server fast start-up. */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    if (pcmd == CmdPLAY) {
+	      if (pfid - startpos >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    else if (pcmd == CmdFF) {
+	      if (pgop - startpos >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    else {  /* CmdFB */
+	      if (startpos - pgop >= delay) {
+		advance = shared->VStimeAdvance;
+		state = 3;
+	      }
+	    }
+	    break;
+	  case 3:  /* transient state, entered after start-up delay,
+		      action-delay, or play-speed change */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      else {
+		state = 1;
+	      }
+	      break;
+	    }
+	    /* Initialize both buffer-fill-level and jitter filters */
+	    if (f == NULL) {
+	      f = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
+			    shared->config.filterPara : 100);
+	    }
+	    else {
+	      f = ResetFilter(f, shared->config.filterPara >= 1 ?
+			      shared->config.filterPara : 100);
+	    }
+	    if (fa == NULL) {
+	      fa = NewFilter(FILTER_LOWPASS, shared->config.filterPara >= 1 ?
+			    shared->config.filterPara : 100);
+	      DoFilter(fa, 0.0);
+	    }
+	    else if (not_action) { /* reset jitter level filter only
+				      if entering this state is not
+				      cause by feedback action */
+	      fa = ResetFilter(fa, shared->config.filterPara >= 1 ?
+			      shared->config.filterPara : 100);
+	    }
+	    if (f == NULL || fa == NULL) {
+	      perror("VB failed to allocate space for filters");
+	      state = 0;
+	    }
+	    else {
+	      init_fv =
+	        DoFilter(f, (double)(pcmd == CmdPLAY ?
+			    pfid - shared->nextFrame :
+			    (pcmd == CmdFF ?
+			     pgop - shared->nextGroup :
+			     shared->nextGroup - pgop)));
+	      init_pos = pcmd == CmdPLAY ? pfid : pgop;
+	      upf = shared->currentUPF;
+	      cupf = upf;
+	      {
+		int interval = shared->usecPerFrame;
 
-ACE_HANDLE
-Video_Notification_Handler::get_handle (void) const
-{
-  return vsp[1];
+		/* upon speed change, 'advance', in microseconds, will
+                   not change, but med/high/low will be updated. This
+                   may suggest that in the new toolkit version of the
+                   same feedback systems, the buffer-fill level and
+                   jitter is measured directly in microseconds, not in
+                   #frames then converting to microseconds. */
+		med = advance / interval;
+		/*
+		if (pcmd == CmdPLAY) {
+		  if (med < shared->VDframeNumber) {
+		    med = shared->VDframeNumber;
+		    min_advance = advance = med * interval;
+		  }
+		}
+		else
+		*/
+		if (med < 2 ) {
+		  med = 2;
+		  advance = med * interval;
+		  min_advance = max(advance, shared->VStimeAdvance);
+		}
+		else min_advance = shared->VStimeAdvance;
+		if (med > (VB_BUF_SIZE / shared->averageFrameSize) / 2) {
+		  reach_limit = 1;
+		  med = (VB_BUF_SIZE / shared->averageFrameSize) / 2;
+		  if (not_action) {
+		    Fprintf(stderr,
+		       "VB start/speed-change: VBbuf limit reached, med %d.\n", med);
+		  }
+		}
+		else reach_limit = 0;
+	      }
+	      high = med + med / 2;
+	      low = med - med / 2;
+	      delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
+							feedback when VS is in
+							fast-start period */
+	      period = med * MAX_CLOCK_DRIFT;
+	      if (not_action) {
+		Fprintf(stderr,
+			"VB start/speed-change: med %d, advance %d at nextFrame %d\n",
+			med, advance, shared->nextFrame);
+	      }
+	      state = 4;
+	    }
+	    break;
+	  case 0:  /* idle */
+	    if (pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB) {
+	      cmdsn = pcmdsn;
+	      state = 1;
+	    }
+	    break;
+	  case 1:  /* start */
+	    if (pcmdsn != cmdsn) {
+	      cmdsn = pcmdsn;
+	      if (!(pcmd == CmdPLAY || pcmd == CmdFF || pcmd == CmdFB)) {
+		state = 0;
+	      }
+	      break;
+	    }
+	    startpos = pcmd == CmdPLAY ? pfid : pgop;
+	    advance = shared->VStimeAdvance;
+
+	    /*  following from vs.c:
+		timerAdjust = (VStimeAdvance * SPEEDUP_INV_SCALE) / currentUPF;
+	        */
+	    med = advance / shared->usecPerFrame;
+	    /*
+	    if (pcmd != CmdPLAY) med /= shared->patternSize;
+	    */
+	    delay = med * (SPEEDUP_INV_SCALE - 1); /* this delay is to avoid
+						      feedback when VS is in
+						      fast-start period */
+	    not_action = 1;
+	    state = 2;
+	    break;
+	  default:
+	    fprintf(stderr, "VB: unknown Feedback state %d reached.\n", state);
+	    state = 0;
+	    break;
+	  }
+	}   /* end if (shared->config.syncEffective) */
+	else {
+	  state = 0;
+	}
+#ifdef STAT
+	if (shared->collectStat && packet->cmd != CmdREF)
+	{
+	  char * val, * val1;
+	  int size;
+	  size = packet->frame;
+	  shared->stat.VBframesReceived[size >>3] |= 1 << (size % 8);
+	  val = (char *)*head;
+	  val1 = (char *)*tail;
+	  if (val >= val1)  /* *head >= *tail */
+	    size = val - val1;
+	  else
+	    size = bufsize - (val1 - val);
+	  shared->stat.VBmaxBytes = max(shared->stat.VBmaxBytes, size);
+	}
+#endif
+	/*
+        fprintf(stderr, "VB: Packet(%x, buf:%x)=cmd-%d, cmdsn-%d sh-%d, gop-%d\n",
+	        (int)packet, (int)buf, packet->cmd, packet->cmdsn, packet->sh, packet->gop);
+        fprintf(stderr, "           frame-%d, display-%d, future-%d, past-%d, bytes-%d\n",
+	        packet->frame, packet->display, packet->future,
+		packet->past, packet->dataBytes);
+	*/
+	break;  /* got the whole packet, break to the out-most loop for next packet */
+      }  /* end if (psize == 0) */
+      else if (psize < 0)
+      {
+	fprintf(stderr, "VB error: received too many msgs for a packet.\n");
+	exit(1);
+      }
+
+      /* try get another message for current packet */
+      for (;;)
+      {
+	if (conn_tag >= 0) {
+	  len = wait_read_bytes(dataSocket, (char *)&msghd, sizeof(msghd));
+	}
+	else {
+	  len = read(dataSocket, tmp_buf, -conn_tag);
+	  memcpy((char *)&msghd, tmp_buf, sizeof(msghd));
+	}
+	if (exit_tag) exit_on_kill();
+	if (len <= 0)
+	{
+	  if (errno == EWOULDBLOCK || errno == EAGAIN) {
+	    perror("VB sleep2 for 10ms");
+	    usleep(10000);
+	    if (exit_tag) exit_on_kill();
+	    continue;
+	  }
+          perror("VB recv data(MSG_PEEK)");
+          exit(1);
+	}
+	if (len < sizeof(msghd)) {
+	  fprintf(stderr, "VD warn: PEEK1ed %dB < expected %dB\n",
+		  len, sizeof(msghd));
+	  continue;
+	}
+#ifdef NeedByteOrderConversion
+	msghd.packetsn = ntohl(msghd.packetsn);
+	msghd.packetSize = ntohl(msghd.packetSize);
+	msghd.msgsn = ntohl(msghd.msgsn);
+	msghd.msgOffset = ntohl(msghd.msgOffset);
+	msghd.msgSize = ntohl(msghd.msgSize);
+#endif
+	/*
+        fprintf(stderr, "VB PEEK2 a msg: sn-%d, size-%d, pkt-%d, pktsize-%d\n",
+	        msghd.msgsn, msghd.msgSize, msghd.packetsn, msghd.packetSize);
+	*/
+#ifdef STAT
+	{
+	  int gap = msghd.msgsn - gap_msgsn;
+	  gap = (gap >MSGGAP_MAX) ? MSGGAP_MAX : gap < MSGGAP_MIN ? MSGGAP_MIN : gap;
+	  shared->stat.VBmsgGaps[gap - MSGGAP_MIN] ++;
+	  if (gap >0) gap_msgsn = msghd.msgsn;
+	}
+#endif
+	if (msghd.msgsn <= msgsn) { /* outdated message, wait for next one */
+	  /*
+	  fprintf(stderr, "VB discard outdated or dup msgsn %d, pktsn %d\n",
+		  msghd.msgsn, msghd.packetsn);
+	  */
+	  skip_message(dataSocket, &msghd);
+	  continue;
+	}
+	break;  /* got a message for current packet */
+      }  /* end for (;;) */
+      
+      if (msghd.msgsn > msgsn + 1 || msghd.msgOffset == 0)
+      {
+        /* message out of order, abandon current packet */
+	/*
+	fprintf(stderr, "VB msg out of order for current packet, discard it.\n");
+	*/
+#ifdef STAT
+	to_count = 0;
+#endif
+        goto start_new_packet;
+      }
+      else {
+        msgsn = msghd.msgsn;
+      }
+    }
+  }
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.h
deleted file mode 100644
index 6c0e4e69a86..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vb.h
+++ /dev/null
@@ -1,265 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    mpeg_client
-//
-// = FILENAME
-//    vb.h
-//
-// = DESCRIPTION
-//     Defines the video packet buffering process.
-//
-// = AUTHORS
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#if !defined (AV_VB_H)
-#define AV_VB_H
-
-#include <stdio.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <netinet/in.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Intrinsic.h>
-#if defined(__svr4__) || defined(IRIX)
-#include <stropts.h>
-#include <sys/conf.h>
-#endif
-#include "include/common.h"
-#include "newproto.h"
-#include "global.h"
-#include "mpeg_shared/filters.h"
-#include "mpeg_shared/fileio.h"
-#include "mpeg_shared/com.h"
-#include "ace/Event_Handler.h"
-#include "ace/Reactor.h"
-
-/* magic number -- deviation is considered
-   caused by clock drift only if rate <= 1/MAX_CLOCK_DRIFT.
-   */
-#define MAX_CLOCK_DRIFT 50
-#define SHCODE 0x000001b3
-#define max(a,b) ((a)>(b) ? (a) : (b))
-
-struct block
-{
-  unsigned shcode;
-  struct block * next;
-  int full;
-};
-
-struct header
-{
-  struct block *h, *t;
-};
-
-class Notification_Handler;
-
-class VideoBuffer :public ACE_Event_Handler
-{
-public:
-  VideoBuffer (void);
-  // constructor.
-
-  virtual ~VideoBuffer (void);
-  // destructor.
-
-  virtual int handle_input (ACE_HANDLE fd);
-  // callback when data arrives on the video socket.
-
-  virtual int handle_output (ACE_HANDLE fd);
-  // callback when data can be written on the video socket.
-
-  ACE_HANDLE get_handle (void) const;
-  // gets the video socket.
- 
-  void VBinitBuf (int size);
-  // size in byte.
-
-  char * VBgetBuf (int size);
-  // block version.
-
-  int VBcheckBuf (int size);
-  // non-block check, return True/False
-
-  void VBputMsg (char * msgPtr);
-
-  char * VBgetMsg ();
-  // block version.
-
-  int  VBcheckMsg();
-  // non-block check, return Number of Msgs in buffer.
-
-  int VBbufEmpty(void);
-
-  void VBreclaimMsg(char * msgPtr);
-
-  static void VBdeleteBuf(void);
-
-  static void VBdeleteSem(void);
-
-  static void exit_on_kill(void);
-
-  int  VBprocess(int initSocket, int normalSocket);
-
-private:
-
-  int sync_feedback (void);
-  int feedback_action (void);
-
-  static block ** head;
-  static block ** tail;
-  static char * buf;
-  static int bufsize;
-  static int sid, countid;
-  static int exit_tag;
-  static int conn_tag;
-  static int savedSocket;
-
-  VideoMessage *msg, msghd;
-  VideoPacket *packet;
-  int len, bsize, msgsn;
-  int psize, poffset;
-  char * ptr, *ptr1;
-  char *tmp_buf;
-  int dataSocket;
-  int initSocket,normalSocket;
-  
-  // following variables are for feedback 
-  int pcmdsn, pcmd; 
-  // to store the cmdsn and cmd of previous frame,
-  // to detect new commands 
-
-  int pfid, pgop;
-  // frame-id of gopid of previous frame 
-
-  int cmdsn;
-  // cmdsn of previous command 
-
-  int fb_state;
-  // state of the control law/regulator 
-
-  int startpos;
-  // gopid or frameid when the regulator is in 'start' state 1 
-
-  int delay;
-  // #frames to delay after 'start' 
-
-  int qosRecomputes;
-  // indicate if qos has been recomputed recently 
-
-  int action_delay;
-  // microseconds to delay after feedback action 
-
-  int action_time;
-  // the time when feedback action is taken, used to enforce
-  // action_delay 
-
-  int upf, cupf;
-  // upf -- currentUPF as carried in all frames,
-  // cupf -- real current UPF, being adjusted by FB 
-
-  double fv;
-  // current buffer fill level in term of #frames 	
-
-  double init_fv;
-  // init_fv and init_pos record the fv value and position
-  // (frameid or gopid) when fv is very close to med 
-
-  double init_pos;
-  int high, low, med;
-  // median, high and low water marks, in term of #frames 
-
-  int period;
-  // interms of #frames, (high-med, period) defined the max
-  // buffer fill drift which can be assumed as caused by
-  // clock drift 
-
-  Filter * f;
-  // buffer fill level filter 
-
-  int advance, min_advance;
-  // in microseconds, advance holds the
-  // current target buffer-fill-level as
-  // determined by jitter level
-  // estimate. min_advance sets a absolute
-  // minimun level, no matter how low jitter
-  // level is.'advance' does not change when
-  // play-speed changes, but med/high/low
-  // will be updated upon speed change 
-
-  double fav;
-  // #frames, jitter level output by the filter.
- 
-  Filter * fa;
-  // jitter filter.
- 
-  int reach_limit;
-  // indicate that the target 'advance' has reached client VB
-  // buffer limit, and can not further increase, even if
-  // jitter increases. 
-
-  int not_action;
-  // indicates entering state=3 is not caused by
-  // feedback action. If not_action = 1 entering state=3
-  // is caused either by 'start' or speed change, and
-  // the jitter filter needs to be reset. 
-
-#ifdef STAT
-  int to_count;
-  int gap_msgsn;
-#endif
-
-  Notification_Handler *handler_;
-  // handler to be used for exit notification.
-
-  enum state {INVALID = -1,
-              READ_HEADER = 0,
-              READ_NEXT_HEADER = 1,
-              READ_MESSAGE = 2,
-              SKIP_MESSAGE = 3,
-              SKIP_NEXT_MESSAGE = 4,
-              WRITE_FEEDBACK1 = 5,
-              WRITE_FEEDBACK2 = 6};
-  state state_;
-
-  char *temp;
-  // temporary pointer.
-  int bytes;
-  // temporary placeholder for no.of bytes to be read.
-
-  int fb_addupf;
-  int fb_addf;
-  int fb_advance;
-  
-  int socket_flag_;
-  // flag to indicate which socket to be used.
-};
-
-class Notification_Handler :public ACE_Event_Handler
-{
-public:
-  virtual ACE_HANDLE get_handle (void) const;
-  // Get the Notification handle.
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // called when input events occur.
-
-};  
-
-class Video_Notification_Handler :public Notification_Handler
-{
-public:
-  virtual ACE_HANDLE get_handle (void) const;
-  // Returns the video notification handle.
-};
-#endif /* AV_VB_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp
index 9eb3e6e1c57..4ae1860f12f 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vd.cpp
@@ -25,8 +25,6 @@
  *         email: scen@cse.ogi.edu
  */
 
-extern int vdsp[2];
-
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
@@ -45,7 +43,6 @@ extern int vdsp[2];
 #include "dither.h"
 #include "video.h"
 #include "proto.h"
-#include "vb.h"
 
 ACE_RCSID(mpeg_client, vd, "$Id$")
 
@@ -59,7 +56,6 @@ static int ecountid, ccountid;
 static int sid;
 
 extern VidStream * curVidStream;
-extern VideoBuffer *vbuffer;
 
 static struct shared_mem_block
 {
@@ -100,7 +96,7 @@ static void put_block(FrameBlock * bptr, int tag)
     if (shm->sptr > MAX_VDBLOCK_NUM)
     {
       fprintf(stderr, "VD weird error: ESTACK full.\n");
-      ACE_OS::exit (1);
+      exit(1);
     }
   }
   else
@@ -169,8 +165,8 @@ void VDresizeBuf(int height, int width)
 
   if (get_semval(ecountid) < 0) {
     fprintf(stderr, "Error<weird>: pid %d get (ecountid) = %d < 0\n",
-	   ACE_OS::getpid (), get_semval(ecountid));
-    ACE_OS::exit (1);
+	    getpid(), get_semval(ecountid));
+    exit(1);
   }
   /*
   fprintf(stderr, "VD before resizeBuf(): get_semval(ecountid) = %d\n",
@@ -199,7 +195,7 @@ void VDresizeBuf(int height, int width)
   {
     fprintf(stderr,
 	    "VD error: VDbuf fails to hold at least 3(three) block.\n");
-    ACE_OS::exit (1);
+    exit(1);
   }
   shm->sptr = 0;  /* empty stack */
   shm->qhead = shm->qtail = 0;  /* empty cqueue */
@@ -232,7 +228,7 @@ FrameBlock * VDgetBuf(void)     /* block version, return with interrupt */
     fprintf(stderr, "VD error: VDgetBuf should not return NULL.\n");
   /*
   fprintf(stderr, "pid %d VDgetBuf() %u, ref %d, ecount %d\n",
-	 ACE_OS::getpid (), (unsigned)ptr, ptr->refcount, get_semval(ecountid));
+	  getpid(), (unsigned)ptr, ptr->refcount, get_semval(ecountid));
   */
   return ptr;
 }
@@ -253,7 +249,7 @@ void VDputMsg(FrameBlock * msgPtr)
   leave_cs(sid);
   /*
   fprintf(stderr, "pid %d VDputMsg() %u, ref %d, ccount %d\n",
-	 ACE_OS::getpid (), (unsigned)msgPtr, msgPtr->refcount, get_semval(ccountid));
+	  getpid(), (unsigned)msgPtr, msgPtr->refcount, get_semval(ccountid));
   */
 }
 
@@ -268,7 +264,7 @@ FrameBlock * VDgetMsg(void)     /* block version, return with interrupt */
     fprintf(stderr, "VD error: VDgetMsg should not return NULL.\n");
   /*
   fprintf(stderr, "pid %d VDgetMsg() %u, ref %d, ccount %d\n",
-	 ACE_OS::getpid (), (unsigned)ptr, ptr->refcount, get_semval(ccountid));
+	  getpid(), (unsigned)ptr, ptr->refcount, get_semval(ccountid));
   */
   return ptr;
 }
@@ -301,7 +297,7 @@ FrameBlock * VDpeekMsg(void)
   /*
   if (ptr != NULL) {
     fprintf(stderr, "pid %d VDpeekMsg() = %u, ref=%d\n",
-	   ACE_OS::getpid (), (unsigned)ptr, ptr->refcount);
+	    getpid(), (unsigned)ptr, ptr->refcount);
   }
   */
   return ptr;
@@ -314,7 +310,7 @@ void VDreferMsg(FrameBlock * msgPtr)
   leave_cs(sid);
   /*
   fprintf(stderr, "pid %d VDreferMsg() %u, ccount %d\n",
-	 ACE_OS::getpid (), (unsigned)msgPtr, get_semval(ccountid));
+	  getpid(), (unsigned)msgPtr, get_semval(ccountid));
   */
 }
 
@@ -333,11 +329,11 @@ void VDreclaimMsg(FrameBlock * msgPtr)
   leave_cs(sid);
   /*
   fprintf(stderr, "pid %d VDreclaimMsg() %u, ref %d, ecount %d\n",
-	 ACE_OS::getpid (), (unsigned)msgPtr, ref, get_semval(ecountid));
+	  getpid(), (unsigned)msgPtr, ref, get_semval(ecountid));
   */
   if (ref <= 0) {
     Fprintf(stderr, "pid %d VDreclaimMsg() %u WEIRD, :ref %d:, ecount %d\n",
-	   ACE_OS::getpid (), (unsigned)msgPtr, ref, get_semval(ecountid));
+	    getpid(), (unsigned)msgPtr, ref, get_semval(ecountid));
   }
 }
 
@@ -361,7 +357,7 @@ get_more_data(unsigned int *buf_start, int max_length,
 	  "Fatel error: vd.c get_more_data() should not be called, bufLength = %d.!\n",
 	  *length_ptr);
   fprintf(stderr, "  **** Please report this bug. ****\n");
-  //  ACE_OS::exit (1);
+  //  exit(1);
   return 0;
 }
 
@@ -374,8 +370,17 @@ static void printPacket(VideoPacket *p)
           p->past, p->dataBytes);
 }
 
+static void usr1_handler(int sig)
+{
+  fprintf(stderr, "VD void usr1_handler.\n");
+}
+
+static void usr2_handler(int sig)
+{
+  fprintf(stderr, "VD void usr2_handler\n");
+}
 
-void VDprocess (int CTRpid)
+void VDprocess(int CTRpid)
 {
   FrameBlock * curBlk = NULL;
   PictImage * curPict = NULL;
@@ -386,9 +391,11 @@ void VDprocess (int CTRpid)
   if (curVidStream == NULL)
   {
     fprintf(stderr, "VD: unable to allocat curVidStream.\n");
-    ACE_OS::exit (1);
+    exit(1);
   }
-
+  setsignal(SIGUSR1, usr1_handler);
+  setsignal(SIGUSR2, usr2_handler);
+  
   for(;;)
   {
     int curcmd, curcmdsn;
@@ -400,21 +407,24 @@ void VDprocess (int CTRpid)
       VDreclaimMsg(curBlk);
       curBlk = NULL;
     }
-    p = (VideoPacket*)vbuffer->VBgetMsg();   /* guarranteed to get a Packet */
+    p = (VideoPacket*)VBgetMsg();   /* guarranteed to get a Packet */
+
+    //printPacket(p);
+
 
-    //    printPacket(p);
     //    fprintf(stderr, "VD: got frame %d\n", p->frame);
 
     curcmd = shared->cmd;
     curcmdsn = shared->cmdsn;
-    if (p->cmdsn != shared->cmdsn)
+    if (p->cmdsn != shared->cmdsn || p->cmdsn != curcmdsn)
     {
+      
       /*
-      fprintf(stderr, "VD: frame not for current Cmd, discard it:p->cmdsn:%d,shared->cmdsn:%d\n",
-              p->cmdsn,shared->cmdsn);
+      fprintf(stderr, "VD: frame not for current Cmd, discard it\n");
+      
       printPacket(p);
       */
-      vbuffer->VBreclaimMsg((char*)p);
+      VBreclaimMsg((char*)p);
       continue;
     }
     if (curcmd == CmdINIT)
@@ -467,24 +477,18 @@ void VDprocess (int CTRpid)
 	fprintf(stderr,
 	        "VD: unable to decode packet -- future and/or past frame no available.\n");
 	printPacket(p);
-        */
+	*/
 	if (curcmd == CmdSTEP && curcmdsn == shared->cmdsn) {
 	  /*
 	  Fprintf(stderr, "VD failed to decode f%d, USR1 to CTR for STEP\n", p->frame);
 	  */
-          char message[BUFSIZ];
-          message [0]= DECODED;
-          int result = ACE_OS::write (vdsp[1],&message,BUFSIZ);
-          if (result == -1)
-              perror ("VD:Decode Notify");
-          if (result == 0)
-            perror ("VD:Socket Closed");
+	  kill(getppid(), SIGUSR1);  /* notify CTR anyway if STEP */
 	}
 #ifdef STAT
 	else if (shared->collectStat && curcmd == CmdPLAY)
 	  shared->stat.VDnoRef ++;
 #endif
-	vbuffer->VBreclaimMsg((char*)p);
+	VBreclaimMsg((char*)p);
 	continue;
       }
     }
@@ -506,7 +510,7 @@ void VDprocess (int CTRpid)
 	        (shared->patternSize * shared->sendPatternGops);
 	if (shared->sendPattern[i] == 0)
 	{
-	  vbuffer->VBreclaimMsg((char*)p);
+	  VBreclaimMsg((char*)p);
 #ifdef STAT
 	  if (shared->collectStat)
 	    shared->stat.VDagainstSendPattern ++;
@@ -516,7 +520,7 @@ void VDprocess (int CTRpid)
       }
 #endif
 
-      if (vbuffer->VBcheckMsg() > 0) { /* a frame is to be dropped only if
+      if (VBcheckMsg() > 0) { /* a frame is to be dropped only if
 				 there are more frames in VB */
 	if (p->past >= 0) { /* 'B' */
 	  if (p->display <= shared->nextFrame) {
@@ -547,7 +551,7 @@ void VDprocess (int CTRpid)
 	    frameTooLate:
 	      if (shared->rtplay)  /* too late, drop the frame */
 	      {
-		vbuffer->VBreclaimMsg((char*)p);
+		VBreclaimMsg((char*)p);
 		/*
 		Fprintf(stderr, "VD: frame %d too late, shared->nextFrame %d.\n",
 			p->frame, shared->nextFrame);
@@ -558,7 +562,7 @@ void VDprocess (int CTRpid)
 	  }
 	  else {  /* live video */
 	    if (p->display < shared->nextFrame) {
-	      vbuffer->VBreclaimMsg((char*)p);
+	      VBreclaimMsg((char*)p);
 	      /*
 	      Fprintf(stderr, "VD live video frame %d too late, nextFrame=%d\n",
 		      p->frame, shared->nextFrame);
@@ -577,7 +581,7 @@ void VDprocess (int CTRpid)
 	fprintf(stderr, "VD: a frame too late and dropped when FF.\n");
 	printPacket(p);
 	*/
-	vbuffer->VBreclaimMsg((char*)p);
+	VBreclaimMsg((char*)p);
 	continue;
       }
     }
@@ -589,7 +593,7 @@ void VDprocess (int CTRpid)
 	fprintf(stderr, "VD: a frame too late and dropped when FB.\n");
 	printPacket(p);
 	*/
-	vbuffer->VBreclaimMsg((char*)p);
+	VBreclaimMsg((char*)p);
 	continue;
       }
     }
@@ -745,9 +749,10 @@ void VDprocess (int CTRpid)
     }
     else  /* decoding failed */
     {
-      
+      /*
       fprintf(stderr, "VD error -- tried but failed decoding the packet.\n");
       printPacket(p);
+      */
     }
 
   end_decode_loop:
@@ -755,32 +760,27 @@ void VDprocess (int CTRpid)
     /* signal CTR for singlular operation: STEP, POSITION, INIT */
     if (single_tag && p->cmd != CmdREF && curcmdsn == shared->cmdsn)
     {
-      
-      fprintf(stderr, "VD decoded f%d, USR1 to CTR\n", p->frame);
-      char message[BUFSIZ];
-      message[0]= DECODED;
-      int result = ACE_OS::write (vdsp[1],&message,BUFSIZ);
-      if (result == -1)
-        perror ("VD:Decode Notify");
-      if (result == 0)
-        perror ("VD:Socket Closed");
+      /*
+      Fprintf(stderr, "VD decoded f%d, USR1 to CTR\n", p->frame);
+      */
+      kill(getppid(), SIGUSR1);
     }
-    vbuffer->VBreclaimMsg((char*)p);
+    VBreclaimMsg((char*)p);
   }
 }
 
 
 static void InitDitherEnv(void)
 {
-  lum_values = (int *) ACE_OS::malloc(LUM_RANGE*sizeof(int));
-  cr_values = (int *) ACE_OS::malloc(CR_RANGE*sizeof(int));
-  cb_values = (int *) ACE_OS::malloc(CB_RANGE*sizeof(int));
+  lum_values = (int *) malloc(LUM_RANGE*sizeof(int));
+  cr_values = (int *) malloc(CR_RANGE*sizeof(int));
+  cb_values = (int *) malloc(CB_RANGE*sizeof(int));
   init_tables();
 
   while (!shared->pixelValid) {
     usleep(10000);
   }
-  ACE_OS::memcpy (pixel, shared->pixel, 256);
+  memcpy(pixel, shared->pixel, 256);
 
   switch (ditherType) {
     
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp
index 31666f570e2..b96cc8297b5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.cpp
@@ -606,7 +606,7 @@ VidStream * NewVidStream(void)
   
   /* Allocate memory for new structure. */
 
-  new_stream = (VidStream *) ACE_OS::malloc(sizeof(VidStream));
+  new_stream = (VidStream *) malloc(sizeof(VidStream));
 
   /* Initialize pointers to extension and user data. */
 
@@ -687,31 +687,31 @@ DestroyVidStream(VidStream *astream)
   int i;
 
   if (astream->ext_data != NULL)
-    ACE_OS::free (astream->ext_data);
+    free(astream->ext_data);
 
   if (astream->user_data != NULL)
-    ACE_OS::free (astream->user_data);
+    free(astream->user_data);
 
   if (astream->group.ext_data != NULL)
-    ACE_OS::free (astream->group.ext_data);
+    free(astream->group.ext_data);
 
   if (astream->group.user_data != NULL)
-    ACE_OS::free (astream->group.user_data);
+    free(astream->group.user_data);
 
   if (astream->picture.extra_info != NULL)
-    ACE_OS::free (astream->picture.extra_info);
+    free(astream->picture.extra_info);
 
   if (astream->picture.ext_data != NULL)
-    ACE_OS::free (astream->picture.ext_data);
+    free(astream->picture.ext_data);
 
   if (astream->picture.user_data != NULL)
-    ACE_OS::free (astream->picture.user_data);
+    free(astream->picture.user_data);
 
   if (astream->slice.extra_info != NULL)
-    ACE_OS::free (astream->slice.extra_info);
+    free(astream->slice.extra_info);
 
   if (astream->buf_start != NULL)
-    ACE_OS::free (astream->buf_start);
+    free(astream->buf_start);
 
   for (i = 0; i < RING_BUF_SIZE; i++) {
     if (astream->ring[i] != NULL) {
@@ -720,7 +720,7 @@ DestroyVidStream(VidStream *astream)
     }
   }
 
-  ACE_OS::free ((char *) astream);
+  free((char *) astream);
 }
 
 
@@ -751,10 +751,10 @@ NewPictImage(unsigned int width, unsigned int height)
 
   /* Allocate memory space for new structure. */
 
-  new_pi = (PictImage *) ACE_OS::malloc(sizeof(PictImage));
-  new_pi->luminance = (unsigned char *) ACE_OS::malloc(width * height);
-  new_pi->Cr = (unsigned char *) ACE_OS::malloc(width * height / 4);
-  new_pi->Cb = (unsigned char *) ACE_OS::malloc(width * height / 4);
+  new_pi = (PictImage *) malloc(sizeof(PictImage));
+  new_pi->luminance = (unsigned char *) malloc(width * height);
+  new_pi->Cr = (unsigned char *) malloc(width * height / 4);
+  new_pi->Cb = (unsigned char *) malloc(width * height / 4);
   
   /* Reset locked flag. */
 
@@ -786,15 +786,15 @@ void
 DestroyPictImage(PictImage *apictimage)
 {
   if (apictimage->luminance != NULL) {
-    ACE_OS::free (apictimage->luminance);
+    free(apictimage->luminance);
   }
   if (apictimage->Cr != NULL) {
-    ACE_OS::free (apictimage->Cr);
+    free(apictimage->Cr);
   }
   if (apictimage->Cb != NULL) {
-    ACE_OS::free (apictimage->Cb);
+    free(apictimage->Cb);
   }
-  ACE_OS::free (apictimage);
+  free(apictimage);
 }
 
 
@@ -832,8 +832,8 @@ int mpegVidRsrc(char *packet)
   i = 0;
   while (curVidStream->ring[i]->locked != 0)
   if (++i >= RING_BUF_SIZE) {
-   ACE_OS::perror ("VD fatal error. Ring buffer full.");
-    ACE_OS::exit (1);
+    perror("VD fatal error. Ring buffer full.");
+    exit(1);
   }
   curVidStream->current = curVidStream->ring[i];
   curVidStream->current->sh = p->sh;
@@ -863,7 +863,7 @@ int mpegVidRsrc(char *packet)
     if (data != SEQ_START_CODE) {
       fprintf(stderr, "VD error: This is not first packet of the an MPEG stream, data %u.", data);
       DestroyVidStream(curVidStream);
-      ACE_OS::exit (1);
+      exit(1);
     }
   }
   /* Get next 32 bits (size of start codes). */
@@ -1040,7 +1040,7 @@ ParseSeqHead(VidStream *vid_stream)
   /* If dither type is MBORDERED allocate ditherFlags. */
 
   if (ditherType == MBORDERED_DITHER) {
-    ditherFlags = (char *) ACE_OS::malloc(vid_stream->mb_width*vid_stream->mb_height);
+    ditherFlags = (char *) malloc(vid_stream->mb_width*vid_stream->mb_height);
   }
 
   /* Initialize lmaxx, lmaxy, cmaxx, cmaxy. */
@@ -1120,7 +1120,7 @@ ParseSeqHead(VidStream *vid_stream)
   if (next_bits(32, EXT_START_CODE)) {
     flush_bits32;
     if (vid_stream->ext_data != NULL) {
-      ACE_OS::free (vid_stream->ext_data);
+      free(vid_stream->ext_data);
       vid_stream->ext_data = NULL;
     }
     vid_stream->ext_data = get_ext_data();
@@ -1130,7 +1130,7 @@ ParseSeqHead(VidStream *vid_stream)
   if (next_bits(32, USER_START_CODE)) {
     flush_bits32;
     if (vid_stream->user_data != NULL) {
-      ACE_OS::free (vid_stream->user_data);
+      free(vid_stream->user_data);
       vid_stream->user_data = NULL;
     }
     vid_stream->user_data = get_ext_data();
@@ -1230,7 +1230,7 @@ ParseGOP(VidStream *vid_stream)
   if (next_bits(32, EXT_START_CODE)) {
     flush_bits32;
     if (vid_stream->group.ext_data != NULL) {
-      ACE_OS::free (vid_stream->group.ext_data);
+      free(vid_stream->group.ext_data);
       vid_stream->group.ext_data = NULL;
     }
     vid_stream->group.ext_data = get_ext_data();
@@ -1240,7 +1240,7 @@ ParseGOP(VidStream *vid_stream)
   if (next_bits(32, USER_START_CODE)) {
     flush_bits32;
     if (vid_stream->group.user_data != NULL) {
-      ACE_OS::free (vid_stream->group.user_data);
+      free(vid_stream->group.user_data);
       vid_stream->group.user_data = NULL;
     }
     vid_stream->group.user_data = get_ext_data();
@@ -1341,7 +1341,7 @@ ParsePicture(VidStream *vid_stream,TimeStamp time_stamp)
   /* Get extra bit picture info. */
 
   if (vid_stream->picture.extra_info != NULL) {
-    ACE_OS::free (vid_stream->picture.extra_info);
+    free(vid_stream->picture.extra_info);
     vid_stream->picture.extra_info = NULL;
   }
   vid_stream->picture.extra_info = get_extra_bit_info();
@@ -1355,7 +1355,7 @@ ParsePicture(VidStream *vid_stream,TimeStamp time_stamp)
     flush_bits32;
 
     if (vid_stream->picture.ext_data != NULL) {
-      ACE_OS::free (vid_stream->picture.ext_data);
+      free(vid_stream->picture.ext_data);
       vid_stream->picture.ext_data = NULL;
     }
     vid_stream->picture.ext_data = get_ext_data();
@@ -1366,7 +1366,7 @@ ParsePicture(VidStream *vid_stream,TimeStamp time_stamp)
     flush_bits32;
 
     if (vid_stream->picture.user_data != NULL) {
-      ACE_OS::free (vid_stream->picture.user_data);
+      free(vid_stream->picture.user_data);
       vid_stream->picture.user_data = NULL;
     }
     vid_stream->picture.user_data = get_ext_data();
@@ -1417,7 +1417,7 @@ ParseSlice(VidStream *vid_stream)
   /* Parse off extra bit slice info. */
 
   if (vid_stream->slice.extra_info != NULL) {
-    ACE_OS::free (vid_stream->slice.extra_info);
+    free(vid_stream->slice.extra_info);
     vid_stream->slice.extra_info = NULL;
   }
   vid_stream->slice.extra_info = get_extra_bit_info();
@@ -3398,7 +3398,7 @@ ProcessSkippedBFrameMBlocks(VidStream *vid_stream)
       
       for (rr = 0; rr < 16; rr++) {
 	
-	/* ACE_OS::memcpy (dest, forw_lum+(rr<<4), 16);  */
+	/* memcpy(dest, forw_lum+(rr<<4), 16);  */
 	dest[0] = src[0];
 	dest[1] = src[1];
 	dest[2] = src[2];
@@ -3414,7 +3414,7 @@ ProcessSkippedBFrameMBlocks(VidStream *vid_stream)
       
       for (rr = 0; rr < 8; rr++) {
 	/*
-	 * ACE_OS::memcpy (dest, forw_cr+(rr<<3), 8); ACE_OS::memcpy (dest1, forw_cb+(rr<<3),
+	 * memcpy(dest, forw_cr+(rr<<3), 8); memcpy(dest1, forw_cb+(rr<<3),
 	 * 8);
 	 */
 	
@@ -3454,7 +3454,7 @@ ProcessSkippedBFrameMBlocks(VidStream *vid_stream)
       
       for (rr = 0; rr < 8; rr++) {
 	/*
-	 * ACE_OS::memcpy (dest, back_cr+(rr<<3), 8); ACE_OS::memcpy (dest1, back_cb+(rr<<3),
+	 * memcpy(dest, back_cr+(rr<<3), 8); memcpy(dest1, back_cb+(rr<<3),
 	 * 8);
 	 */
 	
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
index 9e2a9336f14..9e51780de20 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/video.h
@@ -191,7 +191,7 @@ typedef struct macroblock {
 
 /* Block structure. */
 
-typedef struct {
+typedef struct block {
   short int dct_recon[8][8];             /* Reconstructed dct coeff matrix. */
   short int dct_dc_y_past;               /* Past lum. dc dct coefficient.   */
   short int dct_dc_cr_past;              /* Past cr dc dct coefficient.     */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp
index e7e75e08e06..ffdc3aac81b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_client/vp.cpp
@@ -260,7 +260,7 @@ MakeWindow(void)
   else if (shmemFlag)
   {
     fprintf(stderr, "VP unexpected: display is NULL.\n");
-    ACE_OS::exit (1);
+    exit(1);
   }
   if(shmemFlag)
     CompletionType = /*XShmGetEventBase(display) +*/ ShmCompletion;
@@ -562,7 +562,7 @@ static void ClearWindow(void)
     size = win_width * win_height * 4;
   else
     size = win_width * win_height;
-  data = (char *)ACE_OS::malloc(size);
+  data = (char *)malloc(size);
   if (data != NULL) {
     memset(data, 0, size);
     ximage->data = data;
@@ -570,7 +570,7 @@ static void ClearWindow(void)
 	      ximage->width, ximage->height);
     XFlush(display);
     ximage->data = NULL;
-    ACE_OS::free (data);
+    free(data);
   }
 }
 
@@ -713,8 +713,8 @@ shmemerror:
     }
     if (ximage == NULL)
     {
-     ACE_OS::perror ("VP error: fails to XCreateImage ximage");
-      ACE_OS::exit (1);
+      perror("VP error: fails to XCreateImage ximage");
+      exit(1);
     }
   }
 #ifdef SH_MEM
@@ -884,17 +884,17 @@ static void DisplayInitialization(void)
 void VPinitWindow(Widget shell, Window monitorWindow, int cmdSock)
 {
   cmdSocket = cmdSock;
-  lum_values = (int *) ACE_OS::malloc(LUM_RANGE*sizeof(int));
-  cr_values = (int *) ACE_OS::malloc(CR_RANGE*sizeof(int));
-  cb_values = (int *) ACE_OS::malloc(CB_RANGE*sizeof(int));
+  lum_values = (int *) malloc(LUM_RANGE*sizeof(int));
+  cr_values = (int *) malloc(CR_RANGE*sizeof(int));
+  cb_values = (int *) malloc(CB_RANGE*sizeof(int));
 
   DisplayInitialization();
-  ACE_OS::memcpy (shared->pixel, pixel, 256);
+  memcpy(shared->pixel, pixel, 256);
   shared->pixelValid = 1;
   
-  ACE_OS::free (lum_values);
-  ACE_OS::free (cr_values);
-  ACE_OS::free (cb_values);
+  free(lum_values);
+  free(cr_values);
+  free(cb_values);
 #ifdef SH_MEM
   if (shmemFlag && display != NULL)
   {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
index 8c14d8a0851..70206b0d54e 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile
@@ -6,11 +6,11 @@
 
 MAKEFILE = Makefile
 LIBNAME  = libmpeg_mib
-LIB2     = $(LIBNAME).a
-SHLIB2   = $(LIBNAME).$(SOEXT)
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 # On non-Windows environment, we should at least define
@@ -34,16 +34,6 @@ LSRC	= $(addsuffix .cpp,$(FILES))
 
 ##LIBS 	+= -lTAO -lACE
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
-  override INSTALL =
-endif # ! AV
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -64,8 +54,11 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 LDFLAGS +=  -L/project/doc/pkg/X11/lib/ -lXm -lXt -lXext -lSM -lICE -lX11 -L/project/doc/pkg/X11/lib -lsocket -lnsl -ldl
 CPPFLAGS += -DSH_MEM -DNDEBUG  -I/project/doc/pkg/X11/include
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -74,6 +67,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -85,14 +79,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibDrawArea.o .obj/mibDrawArea.so .shobj/mibDrawArea.o .shobj/mibDrawArea.so: mibDrawArea.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -104,14 +97,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibFrame.o .obj/mibFrame.so .shobj/mibFrame.o .shobj/mibFrame.so: mibFrame.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -123,14 +115,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibLabel.o .obj/mibLabel.so .shobj/mibLabel.o .shobj/mibLabel.so: mibLabel.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -142,14 +133,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibList.o .obj/mibList.so .shobj/mibList.o .shobj/mibList.so: mibList.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -161,14 +151,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibMenu.o .obj/mibMenu.so .shobj/mibMenu.o .shobj/mibMenu.so: mibMenu.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -180,14 +169,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibRadioBox.o .obj/mibRadioBox.so .shobj/mibRadioBox.o .shobj/mibRadioBox.so: mibRadioBox.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -199,14 +187,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibScale.o .obj/mibScale.so .shobj/mibScale.o .shobj/mibScale.so: mibScale.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -218,14 +205,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibScrollBar.o .obj/mibScrollBar.so .shobj/mibScrollBar.o .shobj/mibScrollBar.so: mibScrollBar.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -237,14 +223,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibTextBig.o .obj/mibTextBig.so .shobj/mibTextBig.o .shobj/mibTextBig.so: mibTextBig.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -256,14 +241,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibTextBox.o .obj/mibTextBox.so .shobj/mibTextBox.o .shobj/mibTextBox.so: mibTextBox.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -275,14 +259,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibToggle.o .obj/mibToggle.so .shobj/mibToggle.o .shobj/mibToggle.so: mibToggle.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -294,14 +277,13 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 .obj/mibload.o .obj/mibload.so .shobj/mibload.o .shobj/mibload.so: mibload.cpp mibload.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -313,9 +295,7 @@ realclean: clean
  $(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 mibwidgets.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ mibwidgets.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
deleted file mode 100644
index 5f8b621bfdd..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- 
-##                    mpeg/source/mpeg_mib directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libmpeg_mib
-
-libmpeg_mib_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libmpeg_mib_SOURCES = \
-        mibButton.cpp \
-        mibDrawArea.cpp \
-        mibFrame.cpp \
-        mibLabel.cpp \
-        mibList.cpp \
-        mibMenu.cpp \
-        mibRadioBox.cpp \
-        mibScale.cpp \
-        mibScrollBar.cpp \
-        mibTextBig.cpp \
-        mibTextBox.cpp \
-        mibToggle.cpp \
-        mibload.cpp
-
-noinst_HEADERS = \
-        mibload.h \
-        mibwidgets.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp
index 74193bc62db..af68054c6a0 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibButton.cpp
@@ -26,8 +26,7 @@ mib_Widget *mib_create_Button(mib_Widget *parent, char *name, char *label,
 {
   mib_Widget *temp;
   mib_Button *myres;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   Arg     args[20];
   int     n;
 
@@ -131,8 +130,7 @@ void mib_code_gen_Button(mib_Widget *thisw, FILE *fout)
 int mib_load_Button(mib_Widget *thisw, mib_Buffer *fin)
 {
   mib_Button	*myres;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   char          res[MI_MAXSTRLEN];
   char          val[MI_MAXSTRLEN];
   Arg		args[20];
@@ -146,7 +144,7 @@ int mib_load_Button(mib_Widget *thisw, mib_Buffer *fin)
 
   if (!strcmp(res,"label"))
   {
-    vallen =ACE_OS::strlen (val);
+    vallen = strlen(val);
     if (vallen < 2)
       return 0;
     val[vallen-1] = '\0';
@@ -169,7 +167,7 @@ int mib_load_Button(mib_Widget *thisw, mib_Buffer *fin)
   if (!got_line)
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp
index c9e47b61e65..255656ff129 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibDrawArea.cpp
@@ -114,7 +114,7 @@ int mib_load_DrawingArea(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp
index 0323daba556..d0cd795186b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibFrame.cpp
@@ -175,7 +175,7 @@ int mib_load_Frame(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp
index 5746937ccad..7effa19a519 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibLabel.cpp
@@ -26,8 +26,7 @@ mib_Widget *mib_create_Label(mib_Widget *parent, char *name, char *label,
 {
   mib_Widget *temp;
   mib_Label *myres;
-  //unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   Arg     args[20];
   int     n;
 
@@ -127,8 +126,7 @@ void mib_save_Label(mib_Widget *thisw, FILE *fout)
 int mib_load_Label(mib_Widget *thisw, mib_Buffer *fin)
 {
   mib_Label    *myres;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   char          res[MI_MAXSTRLEN];
   char          val[MI_MAXSTRLEN];
   Arg           args[5];
@@ -141,7 +139,7 @@ int mib_load_Label(mib_Widget *thisw, mib_Buffer *fin)
 
   if (!strcmp(res,"label"))
   {
-    vallen =ACE_OS::strlen (val);
+    vallen = strlen(val);
     if (vallen < 2)
       return 0;
     val[vallen-1] = '\0';
@@ -161,7 +159,7 @@ int mib_load_Label(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp
index 16252137352..142be49a634 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibList.cpp
@@ -28,8 +28,7 @@ mib_Widget *mib_create_List(mib_Widget *parent, char *name, char *label,
   mib_Widget	*temp;
   mib_List	*myres;
   Widget	 wtemp;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   char		 ttext[30];
   Arg		 args[20];
   String	 myname;
@@ -160,7 +159,7 @@ int mib_load_List(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp
index ae5d4490305..395010a7df3 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibMenu.cpp
@@ -202,7 +202,7 @@ int mib_load_Menu(mib_Widget *thisw, mib_Buffer *fin)
     {
       if (!mib_read_line(fin, res, val))
 	return 0;
-      vallen =ACE_OS::strlen (val);
+      vallen = strlen(val);
       if (vallen < 2)
 	return 0;
       val[vallen-1] = '\0';
@@ -243,7 +243,7 @@ int mib_load_Menu(mib_Widget *thisw, mib_Buffer *fin)
 
   if (!mib_read_line(fin, res, val))
     return 0;
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp
index a341abf2667..f18deef164e 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibRadioBox.cpp
@@ -183,7 +183,7 @@ int mib_load_RadioBox(mib_Widget *thisw, mib_Buffer *fin)
     {
       if (!mib_read_line(fin, res, val))
 	return 0;
-      vallen =ACE_OS::strlen (val);
+      vallen = strlen(val);
       if (vallen < 2)
 	return 0;
       val[vallen-1] = '\0';
@@ -203,7 +203,7 @@ int mib_load_RadioBox(mib_Widget *thisw, mib_Buffer *fin)
 
   if (!mib_read_line(fin, res, val))
     return 0;
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp
index 68a4d125c58..e912cf0b298 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScale.cpp
@@ -197,7 +197,7 @@ int mib_load_Scale(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp
index 168f86ae391..246c425679e 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibScrollBar.cpp
@@ -157,7 +157,7 @@ int mib_load_ScrollBar(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp
index 26a085371cd..7d20d0329e5 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibTextBig.cpp
@@ -140,7 +140,7 @@ int mib_load_TextBig(mib_Widget *thisw, mib_Buffer *fin)
   if (!mib_read_line(fin, res, val))
     return 0;
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp
index b8470e9d2f3..70b2bc1e12a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibToggle.cpp
@@ -26,8 +26,7 @@ mib_Widget *mib_create_Toggle(mib_Widget *parent, char *name, char *label,
 {
   mib_Widget *temp;
   mib_Toggle *myres;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   Arg     args[20];
   int     n;
 
@@ -134,8 +133,7 @@ void mib_save_Toggle(mib_Widget *thisw, FILE *fout)
 int mib_load_Toggle(mib_Widget *thisw, mib_Buffer *fin)
 {
   mib_Toggle    *myres;
-  //  unsigned char *label_text;
-  XmString label_text;
+  unsigned char *label_text;
   char          res[MI_MAXSTRLEN];
   char          val[MI_MAXSTRLEN];
   Arg           args[20];
@@ -149,7 +147,7 @@ int mib_load_Toggle(mib_Widget *thisw, mib_Buffer *fin)
 
   if (!strcmp(res,"label"))
   {
-    vallen =ACE_OS::strlen (val);
+    vallen = strlen(val);
     if (vallen < 2)
       return 0;
     val[vallen-1] = '\0';
@@ -187,7 +185,7 @@ int mib_load_Toggle(mib_Widget *thisw, mib_Buffer *fin)
       return 0;
   }
 
-  if (ACE_OS::strcmp (res,"EndWidget"))
+  if (strcmp(res,"EndWidget"))
     return 0;
 
   return 1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp
index 39b27581451..d0e99533a08 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_mib/mibload.cpp
@@ -370,7 +370,7 @@ mib_Widget *mib_load_interface(Widget parent, char *from, int file_type)
       return NULL;
 
     thiswfile.buffer = (void *)instring;
-    thiswfile.buflen =ACE_OS::strlen (instring);
+    thiswfile.buflen = strlen(instring);
     thiswfile.point = 0;
 
     if (!mib_load_Root(parent, &thisw, &thiswfile))
@@ -399,7 +399,7 @@ int mib_load_mib_class(mib_Widget **thisw, mib_Widget *parent, char *name,
   else
     editstate = WEMPTY;
 
-  namelen =ACE_OS::strlen (name);
+  namelen = strlen(name);
   if (namelen < 2)
     return 0;
 
@@ -619,7 +619,7 @@ int mib_load_Root(Widget parent, mib_Widget **thisw, mib_Buffer *fin)
   /* we don't expect any private resources for the root widget */
 
   got_line = mib_read_line(fin, res, val);
-  if (ACE_OS::strcmp (res,"EndWidget."))
+  if (strcmp(res,"EndWidget."))
     return 0;
 
 /*   XtManageChild((*thisw)->me);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
index 63a3be6a005..04583da7909 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.cpp
@@ -40,14 +40,14 @@ Audio_Control_i::init_audio (const Audio_Control::INITaudioPara & para,
   if (Mpeg_Global::session_num > Mpeg_Global::session_limit || para.version != VERSION) 
     return 0; // failure
 
-  ACE_OS::memcpy (&(this->audio_global_->audioPara), &para.para, sizeof(this->audio_global_->audioPara));
+  memcpy(&(this->audio_global_->audioPara), &para.para, sizeof(this->audio_global_->audioPara));
   /*
   fprintf(stderr, "Client Audio para: encode %d, ch %d, sps %d, bps %d.\n",
 	  para.para.encodeType, para.para.channels,
 	  para.para.samplesPerSecond, para.para.bytesPerSample);
    */
   {
-    int len =ACE_OS::strlen (this->audio_global_->audioFile);
+    int len = strlen(this->audio_global_->audioFile);
     if (strncasecmp("LiveAudio", this->audio_global_->audioFile, 9) &&
 	strcasecmp(".au", this->audio_global_->audioFile+len-3))
       {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp
index 51cdd49362d..3c0add20ee2 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.cpp
@@ -129,7 +129,7 @@ Audio_Data_Handler::handle_input (ACE_HANDLE fd)
       len = wait_read_bytes(this->audio_global_->audioSocket, (char *)this->audio_global_->fbpara, sizeof(*(this->audio_global_->fbpara)));
       if (len == 0) return(1); /* connection broken */
       else if (len < 0) { /* unexpected error */
-       ACE_OS::perror ("AS read1 FB");
+        perror("AS read1 FB");
         return(-1);
       }
     }
@@ -139,7 +139,7 @@ Audio_Data_Handler::handle_input (ACE_HANDLE fd)
     if (len == -1) {
       if (errno == EINTR) continue; /* interrupt */
       else {
-        if (errno != EPIPE && errno != ECONNRESET)ACE_OS::perror ("AS failed to ACE_OS::read () fbmsg header");
+        if (errno != EPIPE && errno != ECONNRESET) perror("AS failed to read() fbmsg header");
         break;
       }
     }
@@ -155,7 +155,7 @@ Audio_Data_Handler::handle_input (ACE_HANDLE fd)
 
   if (len < sizeof(*this->audio_global_->fbpara)) {
     if (len > 0) fprintf(stderr,
-			 "AS warn ACE_OS::read () len %dB < sizeof(*this->audio_global_->fbpara) %dB\n",
+			 "AS warn read() len %dB < sizeof(*this->audio_global_->fbpara) %dB\n",
 			 len, sizeof(*this->audio_global_->fbpara));
     // continue;
     // simulate the continue ??
@@ -175,7 +175,7 @@ Audio_Data_Handler::handle_input (ACE_HANDLE fd)
                             bytes);
       if (len == 0) return(1); /* connection broken */
       else if (len < 0) { /* unexpected error */
-       ACE_OS::perror ("AS read2 FB");
+        perror("AS read2 FB");
         return(-1);
       }
       len += sizeof(*this->audio_global_->fbpara);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
index faa30df58a7..b9da3ff63ef 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.cpp
@@ -691,7 +691,7 @@ Video_Global::ComputeFirstSendPattern (float limit)
 {
   char * buf = this->firstSendPattern;
   int len = this->firstPatternSize;
-  char * pat = (char *)ACE_OS::malloc (len);
+  char * pat = (char *)malloc (len);
   int f;
 
   if (pat == NULL) {
@@ -913,7 +913,7 @@ Video_Global::ReadInfoFromFile (void)
   memset (this->pattern, 0, PATTERN_SIZE);
   read_bytes (fd, this->pattern, this->patternSize);
 #ifdef STAT
-  this->framesSent = (char *)ACE_OS::malloc ((this->numF + 7)>>3);
+  this->framesSent = (char *)malloc ((this->numF + 7)>>3);
   if (this->framesSent == NULL)
     {
       fprintf (stderr, "Error: VS fails to alloc mem for this->framesSent for %d frames", this->numF);
@@ -921,30 +921,30 @@ Video_Global::ReadInfoFromFile (void)
       exit (1);
     }
 #endif
-  this->systemHeader = (struct Video_Global::SystemHeader *)ACE_OS::malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
+  this->systemHeader = (struct Video_Global::SystemHeader *)malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
   if (this->systemHeader == NULL)
     {
-      perror ("Error: VS error on ACE_OS::malloc this->SystemHeader");
+      perror ("Error: VS error on malloc this->SystemHeader");
       exit (1);
     }
-  this->gopTable = (struct Video_Global::GopTable *)ACE_OS::malloc (sizeof (struct Video_Global::GopTable) * this->numG);
+  this->gopTable = (struct Video_Global::GopTable *)malloc (sizeof (struct Video_Global::GopTable) * this->numG);
   if (this->gopTable == NULL)
     {
-      perror ("Error: VS error on ACE_OS::malloc GopHeader");
+      perror ("Error: VS error on malloc GopHeader");
       exit (1);
     }
-  this->frameTable = (struct Video_Global::FrameTable *)ACE_OS::malloc (sizeof (Video_Global::FrameTable) * this->numF);
+  this->frameTable = (struct Video_Global::FrameTable *)malloc (sizeof (Video_Global::FrameTable) * this->numF);
   if (this->frameTable == NULL)
     {
-      perror ("Error: VS error on ACE_OS::malloc this->frameTable");
+      perror ("Error: VS error on malloc this->frameTable");
       exit (1);
     }
   this->packetBufSize = this->maxS + this->maxG + max (this->maxI, max (this->maxP, this->maxB));
-  this->packet = (VideoPacket *)ACE_OS::malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
+  this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
                                         this->packetBufSize);
   if (this->packet == NULL)	
     {	
-      perror ("Error: VS error on ACE_OS::malloc this->packet buffer");
+      perror ("Error: VS error on malloc this->packet buffer");
       exit (1);
     }
   this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
@@ -1184,7 +1184,7 @@ you need to update the constant definition in common.h and recompile.\n",
         }
 
 #ifdef STAT
-      this->framesSent = (char *)ACE_OS::malloc ((this->numF + 7)>>3);
+      this->framesSent = (char *)malloc ((this->numF + 7)>>3);
       if (this->framesSent == NULL)
         {
           fprintf (stderr, "VS fails to alloc mem for this->framesSent for %d frames", this->numF);
@@ -1193,22 +1193,22 @@ you need to update the constant definition in common.h and recompile.\n",
         }
 #endif
 
-      this->systemHeader = (struct Video_Global::SystemHeader *)ACE_OS::malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
+      this->systemHeader = (struct Video_Global::SystemHeader *)malloc (sizeof (struct Video_Global::SystemHeader) * this->numS);
       if (this->systemHeader == NULL)
         {
-          perror ("VS error on ACE_OS::malloc this->SystemHeader");
+          perror ("VS error on malloc this->SystemHeader");
           return 7;
         }
-      this->gopTable = (struct Video_Global::GopTable *)ACE_OS::malloc (sizeof (struct Video_Global::GopTable) * this->numG);
+      this->gopTable = (struct Video_Global::GopTable *)malloc (sizeof (struct Video_Global::GopTable) * this->numG);
       if (this->gopTable == NULL)
         {
-          perror ("VS error on ACE_OS::malloc GopHeader");
+          perror ("VS error on malloc GopHeader");
           return 8;
         }
-      this->frameTable = (struct Video_Global::FrameTable *)ACE_OS::malloc (sizeof (Video_Global::FrameTable) * this->numF);
+      this->frameTable = (struct Video_Global::FrameTable *)malloc (sizeof (Video_Global::FrameTable) * this->numF);
       if (this->frameTable == NULL)
         {
-          perror ("VS error on ACE_OS::malloc this->frameTable");
+          perror ("VS error on malloc this->frameTable");
           return 9;
         }
 
@@ -1311,11 +1311,11 @@ you need to update the constant definition in common.h and recompile.\n",
           this->minG = min (this->minG, this->gopTable[gopptr].headerSize);
         }
       this->packetBufSize = this->maxS + this->maxG + max (this->maxI, max (this->maxP, this->maxB));
-      this->packet = (VideoPacket *)ACE_OS::malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
+      this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
                                             this->packetBufSize);
       if (this->packet == NULL)
         {
-          perror ("VS error on ACE_OS::malloc this->packet buffer");
+          perror ("VS error on malloc this->packet buffer");
           return 10;
         }
       this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
@@ -1401,7 +1401,7 @@ you need to update the constant definition in common.h and recompile.\n",
 #endif
   {
     this->firstPatternSize = this->gopTable[0].totalFrames;
-    this->firstSendPattern = (char *)ACE_OS::malloc (this->firstPatternSize);
+    this->firstSendPattern = (char *)malloc (this->firstPatternSize);
     if (this->firstSendPattern == NULL)
       {
         fprintf (stderr, "VS failed to allocate this->firstthis->Sendthis->Pattern for %d frames",
@@ -1831,11 +1831,11 @@ Video_Global::init_video (void)
     this->pattern[0] = 'I';
     this->pattern[1] = 0;
     this->packetBufSize = this->verticalSize * this->horizontalSize * 3;
-    this->packet = (VideoPacket *)ACE_OS::malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
+    this->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
                                           this->packetBufSize);
     if (this->packet == NULL)	
       {
-        perror ("Error: VS error on ACE_OS::malloc this->packet buffer");
+        perror ("Error: VS error on malloc this->packet buffer");
         exit (1);
       }
     this->packet = (VideoPacket *) ((char *)this->packet + sizeof (VideoMessage));
@@ -2276,7 +2276,7 @@ Audio_Global::CmdRead(char *buf, int psize)
   if (res == 0) return (1);
   if (res == -1) {
     fprintf(stderr, "AS error on read cmdSocket, size %d", psize);
-   ACE_OS::perror ("");
+    perror("");
     return (-1);
   }
   return 0;
@@ -2287,8 +2287,8 @@ Audio_Global::CmdWrite(char *buf, int size)
 {
   int res = wait_write_bytes(serviceSocket, buf, size);
   if (res == -1) {
-    if (errno != EPIPE)ACE_OS::perror ("AS writes to serviceSocket");
-    ACE_OS::exit (errno != EPIPE);
+    if (errno != EPIPE) perror("AS writes to serviceSocket");
+    exit(errno != EPIPE);
   }
 }
 
@@ -2331,7 +2331,7 @@ Audio_Global::INITaudio(void)
     write_string(serviceSocket, errmsg);
     return(1);
   }
-  ACE_OS::memcpy (&audioPara, &para.para, sizeof(audioPara));
+  memcpy(&audioPara, &para.para, sizeof(audioPara));
   /*
   fprintf(stderr, "Client Audio para: encode %d, ch %d, sps %d, bps %d.\n",
 	  para.para.encodeType, para.para.channels,
@@ -2339,7 +2339,7 @@ Audio_Global::INITaudio(void)
    */
   audioFile[para.nameLength] = 0;
   {
-    int len =ACE_OS::strlen (audioFile);
+    int len = strlen(audioFile);
     if (strncasecmp("LiveAudio", audioFile, 9) &&
 	strcasecmp(".au", audioFile+len-3)) {
       char errmsg[128];
@@ -2370,7 +2370,7 @@ Audio_Global::INITaudio(void)
     if (fd == -1)
     {
       fprintf(stderr, "AS error on opening audio file %s", audioFile);
-     ACE_OS::perror ("");
+      perror("");
       failureType = 0;
       goto failure;
     }
@@ -2436,10 +2436,10 @@ Audio_Global::send_packet (int firstSample, int samples)
   }
   else {
     lseek(fd, offset, SEEK_SET);
-    while ((len = ACE_OS::read (fd, buf, size)) == -1) {
+    while ((len = read(fd, buf, size)) == -1) {
       if (errno == EINTR)
 	continue;   /* interrupted */
-     ACE_OS::perror ("AS error on read audio file");
+      perror("AS error on read audio file");
       return(-1);
     }
     if (len < audioPara.bytesPerSample) {
@@ -2459,12 +2459,12 @@ Audio_Global::send_packet (int firstSample, int samples)
   }
   segsize = sizeof(*pktbuf) + len;
   if (conn_tag != 0) {
-    while ((sentsize = ACE_OS::write (audioSocket, (char *)pktbuf, segsize)) == -1) {
+    while ((sentsize = write(audioSocket, (char *)pktbuf, segsize)) == -1) {
       if (errno == EINTR) /* interrupted */
 	continue;
       if (errno == ENOBUFS) {
 	if (resent) {
-	 ACE_OS::perror ("AS Warning, pkt discarded because");
+	  perror("AS Warning, pkt discarded because");
 	  break;
 	}
 	else {
@@ -2478,7 +2478,7 @@ Audio_Global::send_packet (int firstSample, int samples)
 		firstSample, samples);
 	perror("");
       }
-      ACE_OS::exit ((errno != EPIPE));
+      exit((errno != EPIPE));
     }
   }
   else {
@@ -2489,7 +2489,7 @@ Audio_Global::send_packet (int firstSample, int samples)
 		firstSample, samples);
 	perror("");
       }
-      ACE_OS::exit ((errno != EPIPE));
+      exit((errno != EPIPE));
      }
   }
   if (sentsize < segsize) {
@@ -2636,7 +2636,7 @@ Audio_Global::PLAYaudio(void)
     {
       if (errno == EINTR)
         continue;
-     ACE_OS::perror ("AS error on select reading or writing");
+      perror("AS error on select reading or writing");
       return(-1);
     }
     if (FD_ISSET(serviceSocket, &read_mask)){  /* STOP, SPEED, or CLOSE*/
@@ -2682,7 +2682,7 @@ Audio_Global::PLAYaudio(void)
           if (result != 0)
             return result;
 	  /*
-	  CmdWrite(AUDIO_STOP_PATTERN,ACE_OS::strlen (AUDIO_STOP_PATTERN));
+	  CmdWrite(AUDIO_STOP_PATTERN, strlen(AUDIO_STOP_PATTERN));
 	  */
 	  if (live_source) {
 	    StopPlayLiveAudio();
@@ -2710,17 +2710,17 @@ Audio_Global::PLAYaudio(void)
 	  len = wait_read_bytes(audioSocket, (char *)fbpara, sizeof(*fbpara));
 	  if (len == 0) return(1); /* connection broken */
 	  else if (len < 0) { /* unexpected error */
-	   ACE_OS::perror ("AS read1 FB");
+	    perror("AS read1 FB");
 	    return(-1);
 	  }
 	}
 	else { /* discard mode packet stream, read the whole packet */
-	  len = ACE_OS::read (audioSocket, (char *)fbpara,  FBBUF_SIZE);
+	  len = read(audioSocket, (char *)fbpara,  FBBUF_SIZE);
 	}
 	if (len == -1) {
 	  if (errno == EINTR) continue; /* interrupt */
 	  else {
-	    if (errno != EPIPE && errno != ECONNRESET)ACE_OS::perror ("AS failed to ACE_OS::read () fbmsg header");
+	    if (errno != EPIPE && errno != ECONNRESET) perror("AS failed to read() fbmsg header");
 	    break;
 	  }
 	}
@@ -2728,7 +2728,7 @@ Audio_Global::PLAYaudio(void)
       }
       if (len < sizeof(*fbpara)) {
 	if (len > 0) fprintf(stderr,
-			 "AS warn ACE_OS::read () len %dB < sizeof(*fbpara) %dB\n",
+			 "AS warn read() len %dB < sizeof(*fbpara) %dB\n",
 			 len, sizeof(*fbpara));
 	continue;
       }
@@ -2746,7 +2746,7 @@ Audio_Global::PLAYaudio(void)
 				bytes);
 	  if (len == 0) return(1); /* connection broken */
 	  else if (len < 0) { /* unexpected error */
-	   ACE_OS::perror ("AS read2 FB");
+	    perror("AS read2 FB");
 	    return(-1);
 	  }
 	  len += sizeof(*fbpara);
@@ -2918,8 +2918,8 @@ Audio_Global::on_exit_routine(void)
       peeraddr_in.sin_family == AF_INET) {
     if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
       struct hostent *hp;
-      time_t val =ACE_OS::time (NULL);
-      char * buf = ACE_OS::ctime (&start_time);
+      time_t val = time(NULL);
+      char * buf = ctime(&start_time);
 
       hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
       buf[strlen(buf)-1] = 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
index 76c34372e40..a08428bf25a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile
@@ -6,11 +6,11 @@
 
 MAKEFILE = Makefile
 LIBNAME  = libmpeg_server
-LIB2     = $(LIBNAME).a
-SHLIB2   = $(LIBNAME).$(SOEXT)
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 # On non-Windows environment, we should at least define
@@ -25,16 +25,6 @@ LIBS 	+= -lTAO -lACE -lorbsvcs
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
-  override INSTALL =
-endif # ! AV
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -57,8 +47,11 @@ LDFLAGS +=  -lsocket -lnsl -ldl
 CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
 CPPFLAGS += -DSH_MEM  -I/project/doc/pkg/X11/include
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -68,6 +61,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -79,9 +73,6 @@ realclean: clean
  $(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 \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
@@ -136,10 +127,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -152,36 +142,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -213,8 +320,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -222,14 +327,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -242,6 +339,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -253,9 +351,6 @@ realclean: clean
  $(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 \
  server_proto.h Globals.h \
  $(ACE_ROOT)/ace/SOCK_CODgram.h \
@@ -310,10 +405,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -326,36 +420,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -387,8 +598,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -396,14 +605,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -416,6 +617,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -427,9 +629,6 @@ realclean: clean
  $(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 \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
  server_proto.h Globals.h \
@@ -484,10 +683,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -500,36 +698,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -561,8 +876,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -570,14 +883,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -590,6 +895,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -601,9 +907,6 @@ realclean: clean
  $(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 \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
@@ -658,10 +961,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -674,36 +976,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -735,8 +1154,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -744,14 +1161,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -767,6 +1176,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -777,9 +1187,6 @@ realclean: clean
  $(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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -831,10 +1238,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -847,36 +1253,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -908,8 +1431,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -917,14 +1438,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -939,6 +1452,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -949,9 +1463,6 @@ realclean: clean
  $(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/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -978,10 +1489,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -999,36 +1509,164 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
@@ -1077,23 +1715,13 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i
 .obj/Video_Control_State.o .obj/Video_Control_State.so .shobj/Video_Control_State.o .shobj/Video_Control_State.so: Video_Control_State.cpp Video_Control_State.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1101,6 +1729,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1111,9 +1740,6 @@ realclean: clean
  $(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 \
@@ -1137,6 +1763,188 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
+ $(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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
@@ -1184,8 +1992,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1193,24 +1999,237 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  Video_Server.h
 .obj/Video_Control_i.o .obj/Video_Control_i.so .shobj/Video_Control_i.o .shobj/Video_Control_i.so: Video_Control_i.cpp Video_Control_i.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
+ $(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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
- Video_Server.h $(TAO_ROOT)/tao/TAO.h \
+ Video_Server.h \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
@@ -1252,28 +2271,19 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i
 .obj/Audio_Server.o .obj/Audio_Server.so .shobj/Audio_Server.o .shobj/Audio_Server.so: Audio_Server.cpp Audio_Server.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1285,9 +2295,6 @@ realclean: clean
  $(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 \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
@@ -1342,10 +2349,9 @@ realclean: clean
  $(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/Containers.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/Malloc_T.i \
@@ -1358,36 +2364,153 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(TAO_ROOT)/tao/TAO.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
  $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.h \
  $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
@@ -1419,8 +2542,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1428,14 +2549,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
@@ -1451,6 +2564,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1461,9 +2575,6 @@ realclean: clean
  $(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 \
@@ -1487,12 +2598,195 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
+ $(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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
- Globals.h $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ Globals.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
  $(ACE_ROOT)/ace/SOCK_CODgram.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
@@ -1534,8 +2828,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1543,14 +2835,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  Audio_Control_i.h Audio_Server.h server_proto.h
 .obj/Audio_Control_i.o .obj/Audio_Control_i.so .shobj/Audio_Control_i.o .shobj/Audio_Control_i.so: Audio_Control_i.cpp Audio_Control_State.h \
  $(ACE_ROOT)/ace/Singleton.h \
@@ -1559,6 +2843,7 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1569,9 +2854,6 @@ realclean: clean
  $(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 \
@@ -1595,12 +2877,195 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
+ $(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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
- Globals.h $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ Globals.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
  $(ACE_ROOT)/ace/SOCK_CODgram.i \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
@@ -1642,8 +3107,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
@@ -1651,14 +3114,6 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
  Audio_Control_i.h Audio_Server.h server_proto.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
deleted file mode 100644
index 34b5e2dd2ca..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- 
-##                    mpeg/source/mpeg_server directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libmpeg_server
-
-libmpeg_server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libmpeg_server_SOURCES = \
-        Audio_Control_State.cpp \
-        Audio_Control_i.cpp \
-        Audio_Server.cpp \
-        Globals.cpp \
-        Video_Control_State.cpp \
-        Video_Control_i.cpp \
-        Video_Server.cpp \
-        as.cpp \
-        las.cpp \
-        lvs.cpp \
-        vs.cpp
-
-noinst_HEADERS = \
-        Audio_Control_State.h \
-        Audio_Control_i.h \
-        Audio_Server.h \
-        Globals.h \
-        Video_Control_State.h \
-        Video_Control_i.h \
-        Video_Server.h \
-        server_proto.h
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
index 866f24f1122..dd3f44afa2b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.cpp
@@ -61,11 +61,11 @@ Video_Control_State::init_video (const Video_Control::INITvideoPara &init_para,
     VIDEO_SINGLETON::instance ()->pattern[0] = 'I';
     VIDEO_SINGLETON::instance ()->pattern[1] = 0;
     VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->verticalSize * VIDEO_SINGLETON::instance ()->horizontalSize * 3;
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)ACE_OS::malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
+    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc (sizeof (VideoMessage) + sizeof (VideoPacket) +
                                           VIDEO_SINGLETON::instance ()->packetBufSize);
     if (VIDEO_SINGLETON::instance ()->packet == NULL)	
       {
-        perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->packet buffer");
+        perror ("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
         exit (1);
       }
     VIDEO_SINGLETON::instance ()->packet = (VideoPacket *) ((char *)VIDEO_SINGLETON::instance ()->packet + sizeof (VideoMessage));
@@ -426,7 +426,7 @@ Video_Control_Play_State::speed (const Video_Control::SPEEDpara &para)
 
   for (int i=0; i<para.sendPattern.length (); i++)
     VIDEO_SINGLETON::instance ()->sendPattern [i] = para.sendPattern [i];
-  //  ACE_OS::memcpy (VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
+  //  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
 
   Video_Timer_Global::TimerSpeed ();
   VIDEO_SINGLETON::instance ()->play_send ();
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp
index d631fbfda6a..2a6cf7a49d3 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/as.cpp
@@ -73,7 +73,7 @@ static int CmdRead(char *buf, int psize)
   if (res == 0) return (1);
   if (res == -1) {
     fprintf(stderr, "AS error on read cmdSocket, size %d", psize);
-   ACE_OS::perror ("");
+    perror("");
     return (-1);
   }
   return 0;
@@ -83,8 +83,8 @@ static void CmdWrite(char *buf, int size)
 {
   int res = wait_write_bytes(serviceSocket, buf, size);
   if (res == -1) {
-    if (errno != EPIPE)ACE_OS::perror ("AS writes to serviceSocket");
-    ACE_OS::exit (errno != EPIPE);
+    if (errno != EPIPE) perror("AS writes to serviceSocket");
+    exit(errno != EPIPE);
   }
 }
 
@@ -126,7 +126,7 @@ static int INITaudio(void)
     write_string(serviceSocket, errmsg);
     return(1);
   }
-  ACE_OS::memcpy (&audioPara, &para.para, sizeof(audioPara));
+  memcpy(&audioPara, &para.para, sizeof(audioPara));
   /*
   fprintf(stderr, "Client Audio para: encode %d, ch %d, sps %d, bps %d.\n",
 	  para.para.encodeType, para.para.channels,
@@ -134,7 +134,7 @@ static int INITaudio(void)
    */
   audioFile[para.nameLength] = 0;
   {
-    int len =ACE_OS::strlen (audioFile);
+    int len = strlen(audioFile);
     if (strncasecmp("LiveAudio", audioFile, 9) &&
 	strcasecmp(".au", audioFile+len-3)) {
       char errmsg[128];
@@ -165,7 +165,7 @@ static int INITaudio(void)
     if (fd == -1)
     {
       fprintf(stderr, "AS error on opening audio file %s", audioFile);
-     ACE_OS::perror ("");
+      perror("");
       failureType = 0;
       goto failure;
     }
@@ -239,10 +239,10 @@ static int send_packet(int firstSample, int samples)
   }
   else {
     lseek(fd, offset, SEEK_SET);
-    while ((len = ACE_OS::read (fd, buf, size)) == -1) {
+    while ((len = read(fd, buf, size)) == -1) {
       if (errno == EINTR)
 	continue;   /* interrupted */
-     ACE_OS::perror ("AS error on read audio file");
+      perror("AS error on read audio file");
       return(-1);
     }
     if (len < audioPara.bytesPerSample) {
@@ -262,12 +262,12 @@ static int send_packet(int firstSample, int samples)
   }
   segsize = sizeof(*pktbuf) + len;
   if (conn_tag != 0) {
-    while ((sentsize = ACE_OS::write (audioSocket, (char *)pktbuf, segsize)) == -1) {
+    while ((sentsize = write(audioSocket, (char *)pktbuf, segsize)) == -1) {
       if (errno == EINTR) /* interrupted */
 	continue;
       if (errno == ENOBUFS) {
 	if (resent) {
-	 ACE_OS::perror ("AS Warning, pkt discarded because");
+	  perror("AS Warning, pkt discarded because");
 	  break;
 	}
 	else {
@@ -281,7 +281,7 @@ static int send_packet(int firstSample, int samples)
 		firstSample, samples);
 	perror("");
       }
-      ACE_OS::exit ((errno != EPIPE));
+      exit((errno != EPIPE));
     }
   }
   else {
@@ -292,7 +292,7 @@ static int send_packet(int firstSample, int samples)
 		firstSample, samples);
 	perror("");
       }
-      ACE_OS::exit ((errno != EPIPE));
+      exit((errno != EPIPE));
      }
   }
   if (sentsize < segsize) {
@@ -441,7 +441,7 @@ static int PLAYaudio(void)
     {
       if (errno == EINTR)
         continue;
-     ACE_OS::perror ("AS error on select reading or writing");
+      perror("AS error on select reading or writing");
       return(-1);
     }
     if (FD_ISSET(serviceSocket, &read_mask)){  /* STOP, SPEED, or CLOSE*/
@@ -487,7 +487,7 @@ static int PLAYaudio(void)
           if (result != 0)
             return result;
 	  /*
-	  CmdWrite(AUDIO_STOP_PATTERN,ACE_OS::strlen (AUDIO_STOP_PATTERN));
+	  CmdWrite(AUDIO_STOP_PATTERN, strlen(AUDIO_STOP_PATTERN));
 	  */
 	  if (live_source) {
 	    StopPlayLiveAudio();
@@ -515,17 +515,17 @@ static int PLAYaudio(void)
 	  len = wait_read_bytes(audioSocket, (char *)fbpara, sizeof(*fbpara));
 	  if (len == 0) return(1); /* connection broken */
 	  else if (len < 0) { /* unexpected error */
-	   ACE_OS::perror ("AS read1 FB");
+	    perror("AS read1 FB");
 	    return(-1);
 	  }
 	}
 	else { /* discard mode packet stream, read the whole packet */
-	  len = ACE_OS::read (audioSocket, (char *)fbpara,  FBBUF_SIZE);
+	  len = read(audioSocket, (char *)fbpara,  FBBUF_SIZE);
 	}
 	if (len == -1) {
 	  if (errno == EINTR) continue; /* interrupt */
 	  else {
-	    if (errno != EPIPE && errno != ECONNRESET)ACE_OS::perror ("AS failed to ACE_OS::read () fbmsg header");
+	    if (errno != EPIPE && errno != ECONNRESET) perror("AS failed to read() fbmsg header");
 	    break;
 	  }
 	}
@@ -533,7 +533,7 @@ static int PLAYaudio(void)
       }
       if (len < sizeof(*fbpara)) {
 	if (len > 0) fprintf(stderr,
-			 "AS warn ACE_OS::read () len %dB < sizeof(*fbpara) %dB\n",
+			 "AS warn read() len %dB < sizeof(*fbpara) %dB\n",
 			 len, sizeof(*fbpara));
 	continue;
       }
@@ -551,7 +551,7 @@ static int PLAYaudio(void)
 				bytes);
 	  if (len == 0) return(1); /* connection broken */
 	  else if (len < 0) { /* unexpected error */
-	   ACE_OS::perror ("AS read2 FB");
+	    perror("AS read2 FB");
 	    return(-1);
 	  }
 	  len += sizeof(*fbpara);
@@ -626,8 +626,8 @@ static void on_exit_routine(void)
       peeraddr_in.sin_family == AF_INET) {
     if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
       struct hostent *hp;
-      time_t val =ACE_OS::time (NULL);
-      char * buf = ACE_OS::ctime (&start_time);
+      time_t val = time(NULL);
+      char * buf = ctime(&start_time);
 
       hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
       buf[strlen(buf)-1] = 0;
@@ -653,7 +653,7 @@ int AudioServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
   if (max_pkt_size < 0) max_pkt_size = -max_pkt_size;
   else if (max_pkt_size == 0) max_pkt_size = 1024 * 1024;
   
-  start_time =ACE_OS::time (NULL);
+  start_time = time(NULL);
   
   atexit(on_exit_routine);
 
@@ -664,18 +664,18 @@ int AudioServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
                        "(%P|%t) AudioServer: "),
                       result);
 
-  fbpara = (AudioFeedBackPara *)ACE_OS::malloc(FBBUF_SIZE);
+  fbpara = (AudioFeedBackPara *)malloc(FBBUF_SIZE);
   if (fbpara == NULL) {
-   ACE_OS::perror ("AS failed to allocate mem for fbpara");
+    perror("AS failed to allocate mem for fbpara");
     return (-1);
   }
 
   databuf_size = max_pkt_size - sizeof(*pktbuf);
   if (databuf_size > DATABUF_SIZE) databuf_size = DATABUF_SIZE;
   
-  pktbuf = (AudioPacket *)ACE_OS::malloc(sizeof(*pktbuf) + databuf_size);
+  pktbuf = (AudioPacket *)malloc(sizeof(*pktbuf) + databuf_size);
   if (pktbuf == NULL) {
-   ACE_OS::perror ("AS failed to allocate mem for pktbuf");
+    perror("AS failed to allocate mem for pktbuf");
     return(-1);
   }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp
index 4a707e68cbf..2e501f9d949 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/las.cpp
@@ -105,7 +105,7 @@ int OpenLiveAudio(AudioParameter * ap)
 		  &attributes);
   if (ac == NULL)
   {
-   ACE_OS::perror ("AS error: failed to create ac");
+    perror("AS error: failed to create ac");
     AFCloseAudioConn(aud);
     return -1;
   }
@@ -219,7 +219,7 @@ void StopPlayLiveAudio(void)
 int ReadLiveAudioSamples(char * buf, int samples)
 {
   int bytes = samples * bps;
-  int len = ACE_OS::read (sunfd1, buf, bytes);
+  int len = read(sunfd1, buf, bytes);
   if (len != bytes) {
     fprintf(stderr, "ReadLive: need %d samples (%dB), read %dB\n",
 	    samples, bytes, len);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp
index c40d6749bc2..f95d52befee 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/lvs.cpp
@@ -67,7 +67,7 @@ static void on_exit_routine(void)
   char buf[256];
   if (getpid() != curpid) return;
   get_full_path(PID_FILE, buf, 256);
-  ACE_OS::unlink (buf);
+  unlink(buf);
 }
 
 static void register_pid(void)
@@ -76,7 +76,7 @@ static void register_pid(void)
   FILE *fp;
   get_full_path(PID_FILE, buf, 256);
   fp = fopen(buf, "w");
-  fprintf(fp, "%d -- pid of current VS process\n",ACE_OS::getpid ());
+  fprintf(fp, "%d -- pid of current VS process\n", getpid());
   fclose(fp);
 }
 
@@ -135,18 +135,18 @@ int InitLiveVideo(int argc, char ** argv)  /* -1 -- failed, 0 - succ */
   
   /* all other fields to be initialized by LVS process */
 
-  while ((lvspid = ACE_OS::fork ()) == -1);
+  while ((lvspid = fork()) == -1);
 
   if (lvspid == 0) { /* child process, reading from camera */
     LiveVideoProcess(argc, argv);
-    ACE_OS::exit (1);
+    exit(1);
   }
 
   while (shared->initState == 0) usleep(100000);  /* wait for SunVideo to init */
 
   if (shared->initState == -1) {
     fprintf(stderr, "LVS error: init of child process failed\n");
-    ACE_OS::kill (lvspid, SIGINT);
+    kill(lvspid, SIGINT);
     remove_shared_mem(buf);
     remove_semaphore(sid);
     remove_semaphore(susid);
@@ -157,7 +157,7 @@ int InitLiveVideo(int argc, char ** argv)  /* -1 -- failed, 0 - succ */
     
     fprintf(stderr, "LVS initialized.\n");
 
-    curpid =ACE_OS::getpid ();
+    curpid = getpid();
     
     atexit(on_exit_routine);
 
@@ -185,7 +185,7 @@ void ExitLiveVideo(void)
   return;
 #else
   if (lvspid == -1) return;
-  ACE_OS::kill (lvspid, SIGINT);
+  kill(lvspid, SIGINT);
   remove_semaphore(shared->sid);
   remove_semaphore(shared->susid);
   remove_shared_mem((char *)shared);
@@ -212,7 +212,7 @@ int OpenLiveVideo(int * format,
   *fps = shared->fps;
   *pelAspectRatio = shared->pelAspectRatio;
   
-  fprintf(stderr, "LVS session %d opened.\n",ACE_OS::getpid ());
+  fprintf(stderr, "LVS session %d opened.\n", getpid());
   
   return 0;
 #endif
@@ -247,7 +247,7 @@ void StartPlayLiveVideo(void)
     usleep(10000);
   }
   
-  fprintf(stderr, "LVS session %d started\n",ACE_OS::getpid ());
+  fprintf(stderr, "LVS session %d started\n", getpid());
   
   return;
 #endif
@@ -263,7 +263,7 @@ void StopPlayLiveVideo(void)
   shared->activeSessions --;
   leave_cs(shared->sid);
   
-  fprintf(stderr, "LVS session %d stopped, at %5.2f fps.\n",ACE_OS::getpid (),
+  fprintf(stderr, "LVS session %d stopped, at %5.2f fps.\n", getpid(),
 	  ((double)count * 1000.0) / get_duration(session_time, get_msec()));
   
   return;
@@ -324,7 +324,7 @@ int ReadLiveVideoPicture(int * frame, char * buf, int size) /* ret # bytes */
   ssize = shared->buf[bufptr].size;
 
   ssize = (ssize < size ? ssize : size);
-  ACE_OS::memcpy (buf, shared->buf[bufptr].data, ssize);
+  memcpy(buf, shared->buf[bufptr].data, ssize);
 
   enter_cs(shared->sid);
 
@@ -341,7 +341,7 @@ int ReadLiveVideoPicture(int * frame, char * buf, int size) /* ret # bytes */
   /*
   fprintf(stderr,
 	  "LVS session %d read curbuf %d fid %d, frame %d size %d (ffid %d, fframe %d)\n",
-	 ACE_OS::getpid (), curbuf, prefid, *frame, ssize, first_fid, first_frame);
+	  getpid(), curbuf, prefid, *frame, ssize, first_fid, first_frame);
   */
   /*
   fprintf(stderr, "LVS read fid %d, frame %d\n", prefid, *frame);
@@ -397,7 +397,7 @@ int ReadLiveVideoPicture(int * frame, char * buf, int size) /* ret # bytes */
   ssize = shared->buf[shared->curbuf].size;
 
   ssize = (ssize < size ? ssize : size);
-  ACE_OS::memcpy (buf, sbuf, ssize);
+  memcpy(buf, sbuf, ssize);
   /*
   leave_cs(shared->sid);
   */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
index 23566f19744..673fd288329 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/vs.cpp
@@ -48,7 +48,6 @@
 #include "mpeg_shared/com.h"   
 #include "mpeg_shared/sendpt.h"
 #include "server_proto.h"
-#include "Globals.h"
 
 ACE_RCSID(mpeg_server, vs, "$Id$")
 
@@ -62,7 +61,7 @@ static int CmdRead(char *buf, int psize)
   if (res == 0) return(1);
   if (res == -1) {
     fprintf(stderr, "VS error on read VIDEO_SINGLETON::instance ()->cmdSocket, size %d", psize);
-   ACE_OS::perror ("");
+    perror("");
     return(-1);
   }
   return 0;
@@ -72,19 +71,19 @@ static void CmdWrite(char *buf, int size)
 {
   int res = wait_write_bytes(VIDEO_SINGLETON::instance ()->serviceSocket, buf, size);
   if (res == -1) {
-    if (errno != EPIPE)ACE_OS::perror ("VS writes to VIDEO_SINGLETON::instance ()->serviceSocket");
-    ACE_OS::exit (errno != EPIPE);
+    if (errno != EPIPE) perror("VS writes to VIDEO_SINGLETON::instance ()->serviceSocket");
+    exit(errno != EPIPE);
   }
 }
 
 int FBread(char * buf, int size)
 { int res;
   while ((res = (VIDEO_SINGLETON::instance ()->conn_tag >= 0 ? wait_read_bytes(VIDEO_SINGLETON::instance ()->videoSocket, buf, size) :
-		 ACE_OS::read (VIDEO_SINGLETON::instance ()->videoSocket, buf, size))) == -1)
+		 read(VIDEO_SINGLETON::instance ()->videoSocket, buf, size))) == -1)
   {
     if (errno == EINTR) {errno = 0; continue; }
-    if (errno == EPIPE || errno == ECONNRESET) ACE_OS::exit (0);
-   ACE_OS::perror ("VS reads Feedback VIDEO_SINGLETON::instance ()->packet");
+    if (errno == EPIPE || errno == ECONNRESET) exit(0);
+    perror("VS reads Feedback VIDEO_SINGLETON::instance ()->packet");
     return -1;
   }
   if (res < size) {
@@ -175,18 +174,18 @@ int send_to_network(int timeToUse)
 
       segsize = min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg);
       if (VIDEO_SINGLETON::instance ()->conn_tag != 0) {  /* VIDEO_SINGLETON::instance ()->packet stream */
-	while ((sentsize = ACE_OS::write (VIDEO_SINGLETON::instance ()->videoSocket, (char *)msg, segsize)) == -1) {
+	while ((sentsize = write(VIDEO_SINGLETON::instance ()->videoSocket, (char *)msg, segsize)) == -1) {
 	  if (errno == EINTR)
 	    continue;
 	  if (errno == ENOBUFS) {
 	    if (resent) {
-	     ACE_OS::perror ("Warning, pkt discarded because");
+	      perror("Warning, pkt discarded because");
 	      sent = -1;
 	      break;
 	    }
 	    else {
 	      resent = 1;
-	     ACE_OS::perror ("VS to sleep 5ms");
+	      perror("VS to sleep 5ms");
 	      usleep(5000);
 	      continue;
 	    }
@@ -194,9 +193,9 @@ int send_to_network(int timeToUse)
 	  if (errno != EPIPE) {
 	    fprintf(stderr, "VS error on send VIDEO_SINGLETON::instance ()->packet %d of size %d ",
 		    VIDEO_SINGLETON::instance ()->msgsn-1, min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg));
-	   ACE_OS::perror ("");
+	    perror("");
 	  }
-	  ACE_OS::exit (errno != EPIPE);
+	  exit(errno != EPIPE);
 	}
       }
       else {
@@ -205,9 +204,9 @@ int send_to_network(int timeToUse)
 	  if (errno != EPIPE) {
 	    fprintf(stderr, "VS error on send VIDEO_SINGLETON::instance ()->packet %d of size %d ",
 		    VIDEO_SINGLETON::instance ()->msgsn-1, min(size, VIDEO_SINGLETON::instance ()->msgsize)+sizeof(*msg));
-	   ACE_OS::perror ("");
+	    perror("");
 	  }
-	  ACE_OS::exit (errno != EPIPE);
+	  exit(errno != EPIPE);
 	}
       }
       if (sentsize < segsize) {
@@ -463,14 +462,14 @@ int SendPicture(int * frame)
 static int ReadInfoFromFile(void)
 {
   int fd = -1, i;
-  int fnlen =ACE_OS::strlen (VIDEO_SINGLETON::instance ()->videoFile);
+  int fnlen = strlen(VIDEO_SINGLETON::instance ()->videoFile);
 
   strcpy(&VIDEO_SINGLETON::instance ()->videoFile[fnlen], ".Info");
   fd = open(VIDEO_SINGLETON::instance ()->videoFile, O_RDONLY);
   if (fd == -1)
   {
     fprintf(stderr, "Reminder: VS fails to open %s for read, ", VIDEO_SINGLETON::instance ()->videoFile);
-   ACE_OS::perror ("try create one");
+    perror("try create one");
     goto fail_ReadInfoFromFile;
   }
   read_int(fd, &i);
@@ -508,39 +507,39 @@ static int ReadInfoFromFile(void)
   memset(VIDEO_SINGLETON::instance ()->pattern, 0, PATTERN_SIZE);
   read_bytes(fd, VIDEO_SINGLETON::instance ()->pattern, VIDEO_SINGLETON::instance ()->patternSize);
 #ifdef STAT
-  VIDEO_SINGLETON::instance ()->framesSent = (char *)ACE_OS::malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
+  VIDEO_SINGLETON::instance ()->framesSent = (char *)malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
   if (VIDEO_SINGLETON::instance ()->framesSent == NULL)
   {
     fprintf(stderr, "Error: VS fails to alloc mem for VIDEO_SINGLETON::instance ()->framesSent for %d frames", VIDEO_SINGLETON::instance ()->numF);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
 #endif
-  VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)ACE_OS::malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
+  VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
   if (VIDEO_SINGLETON::instance ()->systemHeader == NULL)
   {
-   ACE_OS::perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->SystemHeader");
-    ACE_OS::exit (1);
+    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->SystemHeader");
+    exit(1);
   }
-  VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)ACE_OS::malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
+  VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
   if (VIDEO_SINGLETON::instance ()->gopTable == NULL)
   {
-   ACE_OS::perror ("Error: VS error on ACE_OS::malloc GopHeader");
-    ACE_OS::exit (1);
+    perror("Error: VS error on malloc GopHeader");
+    exit(1);
   }
-  VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)ACE_OS::malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
+  VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
   if (VIDEO_SINGLETON::instance ()->frameTable == NULL)
   {
-   ACE_OS::perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->frameTable");
-    ACE_OS::exit (1);
+    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->frameTable");
+    exit(1);
   }
   VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->maxS + VIDEO_SINGLETON::instance ()->maxG + max(VIDEO_SINGLETON::instance ()->maxI, max(VIDEO_SINGLETON::instance ()->maxP, VIDEO_SINGLETON::instance ()->maxB));
-  VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)ACE_OS::malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
+  VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
 				 VIDEO_SINGLETON::instance ()->packetBufSize);
   if (VIDEO_SINGLETON::instance ()->packet == NULL)	
   {	
-   ACE_OS::perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->packet buffer");
-    ACE_OS::exit (1);
+    perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
+    exit(1);
   }
   VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
 
@@ -565,7 +564,7 @@ static int ReadInfoFromFile(void)
     read_short(fd, (short *)&VIDEO_SINGLETON::instance ()->frameTable[i].size);
   }
 
-  ACE_OS::close (fd);
+  close(fd);
   /*
   fprintf(stderr, "Read Info from %s\n", VIDEO_SINGLETON::instance ()->videoFile);
   */
@@ -573,7 +572,7 @@ static int ReadInfoFromFile(void)
   return 0;
  fail_ReadInfoFromFile:
   if (fd >= 0)
-    ACE_OS::close (fd);
+    close(fd);
   VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
   /*
   fprintf(stderr, "To scan Info from %s\n", VIDEO_SINGLETON::instance ()->videoFile);
@@ -584,14 +583,14 @@ static int ReadInfoFromFile(void)
 static void WriteInfoToFile(void)
 {
   int fd = -1, i;
-  int fnlen =ACE_OS::strlen (VIDEO_SINGLETON::instance ()->videoFile);
+  int fnlen = strlen(VIDEO_SINGLETON::instance ()->videoFile);
 
   strcpy(&VIDEO_SINGLETON::instance ()->videoFile[fnlen], ".Info");
   fd = open(VIDEO_SINGLETON::instance ()->videoFile, O_WRONLY | O_CREAT, 0444);
   if (fd == -1)
   {
     fprintf(stderr, "VS fails to open %s for write", VIDEO_SINGLETON::instance ()->videoFile);
-   ACE_OS::perror ("");
+    perror("");
     goto fail_WriteInfoToFile;
   }
   write_int(fd, VIDEO_SINGLETON::instance ()->fileSize);
@@ -642,16 +641,56 @@ static void WriteInfoToFile(void)
     write_short(fd, VIDEO_SINGLETON::instance ()->frameTable[i].size);
   }
 
-  ACE_OS::close (fd);
+  close(fd);
   VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
   return;
  fail_WriteInfoToFile:
   if (fd >= 0)
-    ACE_OS::close (fd);
+    close(fd);
   VIDEO_SINGLETON::instance ()->videoFile[fnlen] = 0;
   return;
 }
 
+/*
+#define nextByte  {fileptr ++; \
+		   if (fread(&nb, 1, 1, fp) == 0) \
+		   { \
+		     perror("VS Crossed EOF or error while scanning"); \
+		     return 1; \
+		   } }
+
+*/
+
+#define nextByte  {int val; fileptr ++; \
+		   if ((val = getc(VIDEO_SINGLETON::instance ()->fp)) == EOF) \
+		   {\
+		     perror("Crossed EOF or error while scanning"); \
+		     return 1; \
+		   } nb = val;}
+
+#define computePicSize \
+	if (inpic) \
+	{ \
+	  if (pictype == 'I') \
+	  { \
+	    VIDEO_SINGLETON::instance ()->maxI = max(VIDEO_SINGLETON::instance ()->maxI, (int)(fileptr - picptr - 4)); \
+	    VIDEO_SINGLETON::instance ()->minI = min(VIDEO_SINGLETON::instance ()->minI, (int)(fileptr - picptr - 4)); \
+	  } \
+	  else if (pictype == 'P') \
+	  { \
+	    VIDEO_SINGLETON::instance ()->maxP = max(VIDEO_SINGLETON::instance ()->maxP, (int)(fileptr - picptr - 4)); \
+	    VIDEO_SINGLETON::instance ()->minP = min(VIDEO_SINGLETON::instance ()->minP, (int)(fileptr - picptr - 4)); \
+	  } \
+	  else \
+	  { \
+	    VIDEO_SINGLETON::instance ()->maxB = max(VIDEO_SINGLETON::instance ()->maxB, (int)(fileptr - picptr - 4)); \
+	    VIDEO_SINGLETON::instance ()->minB = min(VIDEO_SINGLETON::instance ()->minB, (int)(fileptr - picptr - 4)); \
+	  } \
+	  VIDEO_SINGLETON::instance ()->frameTable[ftptr].type = pictype; \
+	  VIDEO_SINGLETON::instance ()->frameTable[ftptr++].size = (int)(fileptr - picptr - 4); \
+	  inpic = 0; \
+	}
+
 static int init_MPEG1_video_file(void)
 {
   unsigned char nb;
@@ -669,13 +708,13 @@ static int init_MPEG1_video_file(void)
   if (VIDEO_SINGLETON::instance ()->fp == NULL)
   {
     fprintf(stderr, "error on opening video file %s", VIDEO_SINGLETON::instance ()->videoFile);
-   ACE_OS::perror ("");
+    perror("");
     return 2;
   }
   if (fseek(VIDEO_SINGLETON::instance ()->fp, 0, 2) == -1)
   {
     fprintf(stderr, "File %s not seekable", VIDEO_SINGLETON::instance ()->videoFile);
-   ACE_OS::perror ("");
+    perror("");
     return 3;
   }
   VIDEO_SINGLETON::instance ()->fileSize = ftell(VIDEO_SINGLETON::instance ()->fp);
@@ -777,31 +816,31 @@ static int init_MPEG1_video_file(void)
     }
 
 #ifdef STAT
-    VIDEO_SINGLETON::instance ()->framesSent = (char *)ACE_OS::malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
+    VIDEO_SINGLETON::instance ()->framesSent = (char *)malloc((VIDEO_SINGLETON::instance ()->numF + 7)>>3);
     if (VIDEO_SINGLETON::instance ()->framesSent == NULL)
     {
       fprintf(stderr, "VS fails to alloc mem for VIDEO_SINGLETON::instance ()->framesSent for %d frames", VIDEO_SINGLETON::instance ()->numF);
-     ACE_OS::perror ("");
+      perror("");
       return 6;
     }
 #endif
 
-    VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)ACE_OS::malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
+    VIDEO_SINGLETON::instance ()->systemHeader = (struct Video_Global::SystemHeader *)malloc(sizeof(struct Video_Global::SystemHeader) * VIDEO_SINGLETON::instance ()->numS);
     if (VIDEO_SINGLETON::instance ()->systemHeader == NULL)
     {
-     ACE_OS::perror ("VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->SystemHeader");
+      perror("VS error on malloc VIDEO_SINGLETON::instance ()->SystemHeader");
       return 7;
     }
-    VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)ACE_OS::malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
+    VIDEO_SINGLETON::instance ()->gopTable = (struct Video_Global::GopTable *)malloc(sizeof(struct Video_Global::GopTable) * VIDEO_SINGLETON::instance ()->numG);
     if (VIDEO_SINGLETON::instance ()->gopTable == NULL)
     {
-     ACE_OS::perror ("VS error on ACE_OS::malloc GopHeader");
+      perror("VS error on malloc GopHeader");
       return 8;
     }
-    VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)ACE_OS::malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
+    VIDEO_SINGLETON::instance ()->frameTable = (struct Video_Global::FrameTable *)malloc(sizeof(Video_Global::FrameTable) * VIDEO_SINGLETON::instance ()->numF);
     if (VIDEO_SINGLETON::instance ()->frameTable == NULL)
     {
-     ACE_OS::perror ("VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->frameTable");
+      perror("VS error on malloc VIDEO_SINGLETON::instance ()->frameTable");
       return 9;
     }
 
@@ -904,11 +943,11 @@ static int init_MPEG1_video_file(void)
       VIDEO_SINGLETON::instance ()->minG = min(VIDEO_SINGLETON::instance ()->minG, VIDEO_SINGLETON::instance ()->gopTable[gopptr].headerSize);
     }
     VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->maxS + VIDEO_SINGLETON::instance ()->maxG + max(VIDEO_SINGLETON::instance ()->maxI, max(VIDEO_SINGLETON::instance ()->maxP, VIDEO_SINGLETON::instance ()->maxB));
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)ACE_OS::malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
+    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
 				   VIDEO_SINGLETON::instance ()->packetBufSize);
     if (VIDEO_SINGLETON::instance ()->packet == NULL)
     {
-     ACE_OS::perror ("VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->packet buffer");
+      perror("VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
       return 10;
     }
     VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
@@ -994,12 +1033,12 @@ static int init_MPEG1_video_file(void)
 #endif
   {
     VIDEO_SINGLETON::instance ()->firstPatternSize = VIDEO_SINGLETON::instance ()->gopTable[0].totalFrames;
-    VIDEO_SINGLETON::instance ()->firstSendPattern = (char *)ACE_OS::malloc(VIDEO_SINGLETON::instance ()->firstPatternSize);
+    VIDEO_SINGLETON::instance ()->firstSendPattern = (char *)malloc(VIDEO_SINGLETON::instance ()->firstPatternSize);
     if (VIDEO_SINGLETON::instance ()->firstSendPattern == NULL)
     {
       fprintf(stderr, "VS failed to allocate VIDEO_SINGLETON::instance ()->firstVIDEO_SINGLETON::instance ()->SendVIDEO_SINGLETON::Instance ()->Pattern for %d frames",
 	      VIDEO_SINGLETON::instance ()->firstPatternSize);
-     ACE_OS::perror ("");
+      perror("");
       return 11;
     }
   }
@@ -1043,7 +1082,7 @@ static int init_MPEG1_video_file(void)
 	      para.version / 100, para.version % 100);
     }
     write_string(VIDEO_SINGLETON::instance ()->serviceSocket, errmsg);
-    ACE_OS::exit (0);
+    exit(0);
   }
   VIDEO_SINGLETON::instance ()->cmdsn = para.sn;
   /*
@@ -1074,12 +1113,12 @@ static int init_MPEG1_video_file(void)
     VIDEO_SINGLETON::instance ()->pattern[0] = 'I';
     VIDEO_SINGLETON::instance ()->pattern[1] = 0;
     VIDEO_SINGLETON::instance ()->packetBufSize = VIDEO_SINGLETON::instance ()->verticalSize * VIDEO_SINGLETON::instance ()->horizontalSize * 3;
-    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)ACE_OS::malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
+    VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)malloc(sizeof(VideoMessage) + sizeof(VideoPacket) +
 				   VIDEO_SINGLETON::instance ()->packetBufSize);
     if (VIDEO_SINGLETON::instance ()->packet == NULL)	
     {
-     ACE_OS::perror ("Error: VS error on ACE_OS::malloc VIDEO_SINGLETON::instance ()->packet buffer");
-      ACE_OS::exit (1);
+      perror("Error: VS error on malloc VIDEO_SINGLETON::instance ()->packet buffer");
+      exit(1);
     }
     VIDEO_SINGLETON::instance ()->packet = (VideoPacket *)((char *)VIDEO_SINGLETON::instance ()->packet + sizeof(VideoMessage));
 
@@ -1166,7 +1205,7 @@ static int init_MPEG1_video_file(void)
 	  failureType == 101 ? "live MPEG2 not supported" :
           errmsg;
     write_string(VIDEO_SINGLETON::instance ()->serviceSocket, msg);
-    ACE_OS::exit (0);
+    exit(0);
   }
 }
 
@@ -1462,7 +1501,7 @@ void GetFeedBack()
   if (!timerOn) return;
 
   VIDEO_SINGLETON::instance ()->needHeader = para.needHeader;
-  ACE_OS::memcpy (VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
+  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
   if (para.addFrames <= 0 || timerAdjust < MAX_TIMER_ADJUST)
   {
     timerAdjust += para.addFrames * SPEEDUP_INV_SCALE;
@@ -1542,8 +1581,8 @@ static int FastVideoPlay(void)
                       "PLAYVIDEO:select EINTR signal \n"));
           continue;
         }
-     ACE_OS::perror ("Error - VS select between service and video sockets");
-      ACE_OS::exit (1);
+      perror("Error - VS select between service and video sockets");
+      exit(1);
       
     }
     if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop */
@@ -1600,13 +1639,13 @@ void ComputeFirstSendPattern(float limit)
 {
   char * buf = VIDEO_SINGLETON::instance ()->firstSendPattern;
   int len = VIDEO_SINGLETON::instance ()->firstPatternSize;
-  char * pat = (char *)ACE_OS::malloc(len);
+  char * pat = (char *)malloc(len);
   int f;
 
   if (pat == NULL) {
     fprintf(stderr, "VS error on allocating %d bytes for computing first SP", len);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
   for (f = 0; f < len; f ++) {
     pat[f] = VIDEO_SINGLETON::instance ()->frameTable[f].type;
@@ -1636,7 +1675,7 @@ void ComputeFirstSendPattern(float limit)
   }
   fputc('\n', stderr);
   */
-  ACE_OS::free (pat);
+  free(pat);
 }
 
  int PLAYliveVideo(PLAYpara * para)
@@ -1688,9 +1727,9 @@ void ComputeFirstSendPattern(float limit)
     {
       if (errno == EINTR)
         continue;
-     ACE_OS::perror ("Error - VS select between service and video sockets");
+      perror("Error - VS select between service and video sockets");
       StopPlayLiveVideo();
-      ACE_OS::exit (1);
+      exit(1);
       
     }
     if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop */
@@ -1820,7 +1859,7 @@ static int PLAYvideo()
   timerFrame = para.nextFrame;
   timerGroup = FrameToGroup(&timerFrame);
   timerHeader = VIDEO_SINGLETON::instance ()->gopTable[timerGroup].systemHeader;
-  ACE_OS::memcpy (VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
+  memcpy(VIDEO_SINGLETON::instance ()->sendPattern, para.sendPattern, PATTERN_SIZE);
   result = SendReferences(timerGroup, timerFrame);
   if (result < 0)
     return result;
@@ -1933,8 +1972,8 @@ static int PLAYvideo()
                       "PLAYVideo:Select interrupted coninuing..\n"));
           continue;
         }
-     ACE_OS::perror ("Error - VS select between service and video sockets");
-      ACE_OS::exit (1);
+      perror("Error - VS select between service and video sockets");
+      exit(1);
       
     }
     if (FD_ISSET(VIDEO_SINGLETON::instance ()->serviceSocket, &read_mask))   /* stop, speed change, loop swap */
@@ -2043,7 +2082,7 @@ static void on_exit_routine(void)
   /*
   if (!VIDEO_SINGLETON::instance ()->normalExit) {
     fprintf(stderr, "VS exitting abnormally, dump core...\n");
-    ACE_OS::kill (getpid(), SIGSEGV);
+    kill(getpid(), SIGSEGV);
     usleep(2000000);
   }
   */
@@ -2055,8 +2094,8 @@ static void on_exit_routine(void)
       peeraddr_in.sin_family == AF_INET) {
     if (strncmp(inet_ntoa(peeraddr_in.sin_addr), "129.95.50", 9)) {
       struct hostent *hp;
-      time_t val =ACE_OS::time (NULL);
-      char * buf = ACE_OS::ctime (&VIDEO_SINGLETON::instance ()->start_time);
+      time_t val = time(NULL);
+      char * buf = ctime(&VIDEO_SINGLETON::instance ()->start_time);
       
       hp = gethostbyaddr((char *)&(peeraddr_in.sin_addr), 4, AF_INET);
       buf[strlen(buf)-1] = 0;
@@ -2087,7 +2126,7 @@ int VideoServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
   */
   VIDEO_SINGLETON::instance ()->msgsize -= sizeof(VideoMessage);
   
-  VIDEO_SINGLETON::instance ()->start_time =ACE_OS::time (NULL);
+  VIDEO_SINGLETON::instance ()->start_time = time(NULL);
 
   atexit(on_exit_routine);
 
@@ -2148,7 +2187,7 @@ int VideoServer(int ctr_fd, int data_fd, int rttag, int max_pkt_size)
       fprintf(stderr, "a session closed.\n");
       VIDEO_SINGLETON::instance ()->normalExit =1;
       */
-      //      ACE_OS::exit (0);
+      //      exit(0);
       return 0;
       break;
     case CmdSTATstream:
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
index f756a1d14fa..603b5a18423 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile
@@ -6,11 +6,11 @@
 
 MAKEFILE = Makefile
 LIBNAME  = libmpeg_shared
-LIB2     = $(LIBNAME).a
-SHLIB2   = $(LIBNAME).$(SOEXT)
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 #TAO_IDLFLAGS = -Wb,export_macro=TAO_ORBSVCS_Export -Wb,export_include=orbsvcs_export.h
@@ -37,16 +37,6 @@ CPPFLAGS += -I$(MPEG_ROOT)
 
 LIBS 	+= -lTAO -lACE
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-else
-  override INSTALL =
-endif # ! AV
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -72,14 +62,18 @@ CPPFLAGS += -DSH_MEM -DNDEBUG
 
 idl_stubs: $(addsuffix .h, $(IDL_FILES))
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/com.o .obj/com.so .shobj/com.o .shobj/com.so: com.cpp \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+.obj/Video_ControlS.o .obj/Video_ControlS.so .shobj/Video_ControlS.o .shobj/Video_ControlS.so: Video_ControlS.cpp Video_ControlS.h Video_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
@@ -94,13 +88,470 @@ realclean: clean
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Video_ControlC.i \
+ Video_ControlS_T.h Video_ControlS_T.i Video_ControlS_T.cpp \
+ Video_ControlS.i
+.obj/Video_ControlC.o .obj/Video_ControlC.so .shobj/Video_ControlC.o .shobj/Video_ControlC.so: Video_ControlC.cpp Video_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i fileio.h \
- routine.h com.h
-.obj/fileio.o .obj/fileio.so .shobj/fileio.o .shobj/fileio.so: fileio.cpp routine.h \
- $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Video_ControlC.i \
+ Video_ControlS.h Video_ControlS_T.h Video_ControlS_T.i \
+ Video_ControlS_T.cpp Video_ControlS.i
+.obj/Audio_ControlS.o .obj/Audio_ControlS.so .shobj/Audio_ControlS.o .shobj/Audio_ControlS.so: Audio_ControlS.cpp Audio_ControlS.h Audio_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
@@ -115,11 +566,708 @@ realclean: clean
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Audio_ControlC.i \
+ Audio_ControlS_T.h Audio_ControlS_T.i Audio_ControlS_T.cpp \
+ Audio_ControlS.i
+.obj/Audio_ControlC.o .obj/Audio_ControlC.so .shobj/Audio_ControlC.o .shobj/Audio_ControlC.so: Audio_ControlC.cpp Audio_ControlC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i fileio.h
-.obj/filters.o .obj/filters.so .shobj/filters.o .shobj/filters.so: filters.cpp filters.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Audio_ControlC.i \
+ Audio_ControlS.h Audio_ControlS_T.h Audio_ControlS_T.i \
+ Audio_ControlS_T.cpp Audio_ControlS.i
+.obj/ReceiverS.o .obj/ReceiverS.so .shobj/ReceiverS.o .shobj/ReceiverS.so: ReceiverS.cpp ReceiverS.h ReceiverC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h ReceiverC.i \
+ ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+.obj/ReceiverC.o .obj/ReceiverC.so .shobj/ReceiverC.o .shobj/ReceiverC.so: ReceiverC.cpp ReceiverC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
@@ -134,9 +1282,524 @@ realclean: clean
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h ReceiverC.i \
+ ReceiverS.h ReceiverS_T.h ReceiverS_T.i ReceiverS_T.cpp ReceiverS.i
+.obj/MMDevice_ExporterS.o .obj/MMDevice_ExporterS.so .shobj/MMDevice_ExporterS.o .shobj/MMDevice_ExporterS.so: MMDevice_ExporterS.cpp MMDevice_ExporterS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ MMDevice_ExporterC.h MMDevice_ExporterC.i MMDevice_ExporterS_T.h \
+ MMDevice_ExporterS_T.i MMDevice_ExporterS_T.cpp MMDevice_ExporterS.i
+.obj/com.o .obj/com.so .shobj/com.o .shobj/com.so: com.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i fileio.h routine.h \
+ com.h
+.obj/fileio.o .obj/fileio.so .shobj/fileio.o .shobj/fileio.so: fileio.cpp routine.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i fileio.h
+.obj/filters.o .obj/filters.so .shobj/filters.o .shobj/filters.so: filters.cpp filters.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i
 .obj/routine.o .obj/routine.so .shobj/routine.o .shobj/routine.so: routine.cpp routine.h \
  $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
@@ -154,9 +1817,6 @@ realclean: clean
  $(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
 .obj/sendpt.o .obj/sendpt.so .shobj/sendpt.o .shobj/sendpt.so: sendpt.cpp sendpt.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -173,9 +1833,6 @@ realclean: clean
  $(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
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
deleted file mode 100644
index 77a59176d2b..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Makefile.am
+++ /dev/null
@@ -1,85 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- 
-##                    mpeg/source/mpeg_shared directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libmpeg_shared
-
-libmpeg_shared_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libmpeg_shared_SOURCES = \
-        com.cpp \
-        fileio.cpp \
-        filters.cpp \
-        routine.cpp \
-        sendpt.cpp \
-        Video_ControlS.cpp \
-        Video_ControlC.cpp \
-        Audio_ControlS.cpp \
-        Audio_ControlC.cpp \
-        ReceiverS.cpp \
-        ReceiverC.cpp \
-        MMDevice_ExporterC.cpp \
-        MMDevice_ExporterS.cpp
-
-noinst_HEADERS = \
-        com.h \
-        fileio.h \
-        filters.h \
-        routine.h \
-        sendpt.h \
-        Video_ControlS.h \
-        Video_ControlC.h \
-        Audio_ControlS.h \
-        Audio_ControlC.h \
-        ReceiverS.h \
-        ReceiverC.h \
-        MMDevice_ExporterC.h \
-        MMDevice_ExporterS.h
-
-IDL_SOURCES = \
-        Audio_Control.idl \
-        MMDevice_Exporter.idl \
-        Receiver.idl \
-        Video_Control.idl
-
-BUILT_SOURCES = \
-        Video_ControlS.cpp \
-        Video_ControlS.h \
-        Video_ControlC.cpp \
-        Video_ControlC.h \
-        Audio_ControlS.cpp \
-        Audio_ControlS.h \
-        Audio_ControlC.cpp \
-        Audio_ControlC.h \
-        ReceiverS.cpp \
-        ReceiverS.h \
-        ReceiverC.cpp \
-        ReceiverC.h \
-        MMDevice_ExporterC.cpp \
-        MMDevice_ExporterC.h \
-        MMDevice_ExporterS.cpp \
-        MMDevice_ExporterS.h
-
-EXTRA_DIST = $(IDL_SOURCES)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp
index df6bb1229a1..e64a8f43b00 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.cpp
@@ -87,7 +87,7 @@ int ComInitClient(int pinet_port, char * punix_port, char * patm_port)
   if (size) {
     fprintf(stderr,
 	    "Error ComInitClient: pid %d already done ComInitClient/Server\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   size = CLIENT_FDTABLE_SIZE;
@@ -95,8 +95,8 @@ int ComInitClient(int pinet_port, char * punix_port, char * patm_port)
   if (fdTable == NULL) {
     fprintf(stderr,
 	    "Error ComInitClient: pid %d failed to allocated fdTable space:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   for (i = 0; i < size; i ++) {
@@ -127,7 +127,7 @@ int ComCloseFd(int fd)
   if (!size) {
     fprintf(stderr,
 	    "Error ComCloseFd: pid %d not done ComInitClient/Server yet.\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   for (i = 0; i < size; i ++) {
@@ -141,19 +141,19 @@ int ComCloseFd(int fd)
 #else
       fprintf(stderr,
 	      "Error ComCloseFd: pid %d CONN_ATM not supported.\n",
-	     ACE_OS::getpid ());
+	      getpid());
       return -1;
 #endif
     }
     else {
-      ACE_OS::close (fd);
+      close(fd);
     }
     return 0;
   }
   else {
     fprintf(stderr,
 	    "Error ComCloseFd: pid %d can't find fd %d in table\n",
-	   ACE_OS::getpid (), fd);
+	    getpid(), fd);
     return -1;
   }
 }
@@ -164,7 +164,7 @@ int ComCloseConn(int fd)
   if (!size) {
     fprintf(stderr,
 	    "Error ComCloseConn: pid %d not done ComInitClient/Server yet.\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   for (i = 0; i < size; i ++) {
@@ -178,19 +178,19 @@ int ComCloseConn(int fd)
 #else
       fprintf(stderr,
 	      "Error ComCloseConn: pid %d CONN_ATM not supported.\n",
-	     ACE_OS::getpid ());
+	      getpid());
       return -1;
 #endif
     }
     else {
-      ACE_OS::close (fd);
+      close(fd);
     }
     return 0;
   }
   else {
     fprintf(stderr,
 	    "Error ComCloseConn: pid %d can't find fd %d in table\n",
-	   ACE_OS::getpid (), fd);
+	    getpid(), fd);
     return -1;
   }
 }
@@ -210,7 +210,7 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
   if (!size) {
     fprintf(stderr,
 	    "Error ComOpenConnPair: pid %d not done ComInitClient/Server yet.\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
 
@@ -221,7 +221,7 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
   if (cfd < 2) {
     fprintf(stderr,
 	    "Error ComOpenConnPair: pid %d no faTable entry for the pair",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   
@@ -268,7 +268,7 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
 		getpid(), address);
         return -1;
       }
-      ACE_OS::memcpy ((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
+      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
 	    sizeof(addressIn.sin_addr.s_addr));
       /*
       bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
@@ -277,21 +277,21 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     }
     if (get_hostname(hostname, 100)) {
       fprintf(stderr, "Error ComOpenConnPair: pid %d failed to get_hostname:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if ((hp = gethostbyname(hostname)) == NULL) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to its own IP address:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if (hp->h_addrtype != AF_INET) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d own address is not INET type",
-	     ACE_OS::getpid ());
+	      getpid());
       return -1;
     }
     
@@ -312,8 +312,8 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (cfd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to open UNIX cfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     usleep(10000); /* this is for waiting for the uncaught signal mentioned
@@ -321,21 +321,21 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (connect(cfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to conn UNIX cfd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       i = -3;  /* I don't understand why when connect() returns EINTR, the connection
 		  is still built, and the other end can still get what written at
 		  this end, 'i = -3' is a garbage to be written. */
-      ACE_OS::write (cfd, &i, 4);
-      ACE_OS::close (cfd);
+      write(cfd, &i, 4);
+      close(cfd);
       return -1;
     }
     if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to write -1 to UNIX cfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (cfd);
+	      getpid());
+      perror("");
+      close(cfd);
       return -1;
     }
     
@@ -343,30 +343,30 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (dfd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to open UNIX dfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (cfd);
+	      getpid());
+      perror("");
+      close(cfd);
       return -1;
     }
     usleep(10000);
     if (connect(dfd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
        fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to conn UNIX dfd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       i = -3;
-      ACE_OS::write (dfd, &i, 4);
-      ACE_OS::close (cfd);
-      ACE_OS::close (dfd);
+      write(dfd, &i, 4);
+      close(cfd);
+      close(dfd);
       return -1;
     }
     if (time_write_int(dfd, i) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to write (cfd) to UNIX dfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (cfd);
-      ACE_OS::close (dfd);
+	      getpid());
+      perror("");
+      close(cfd);
+      close(dfd);
       return -1;
     }
     *max_pkt_size = 0;
@@ -378,19 +378,19 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (cfd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to open TCP cfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     usleep(10000);
     if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
        fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to conn TCP cfd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       i = -3;
-      ACE_OS::write (cfd, &i, 4);
-      ACE_OS::close (cfd);
+      write(cfd, &i, 4);
+      close(cfd);
       return -1;
     }
     if (conn_tag) { /* create a second connection with server */
@@ -576,10 +576,10 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
 	if (setsockopt(dfd, SOL_SOCKET, SO_SNDBUF, (char *)&len, sizeof(len)) == -1) {
 	  fprintf(stderr,
 		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-snd to size %d:",
-		 ACE_OS::getpid (), len);
-	 ACE_OS::perror ("");
-	  ACE_OS::close (dfd);
-	  ACE_OS::close (cfd);
+		  getpid(), len);
+	  perror("");
+	  close(dfd);
+	  close(cfd);
 	  return -1;
 	}
 	*/
@@ -590,10 +590,10 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
 	  /*
 	  fprintf(stderr,
 		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-rcv to size %d:",
-		 ACE_OS::getpid (), len);
-	 ACE_OS::perror ("");
-	  ACE_OS::close (dfd);
-	  ACE_OS::close (cfd);
+		  getpid(), len);
+	  perror("");
+	  close(dfd);
+	  close(cfd);
 	  return -1;
 	  */
 	}
@@ -608,10 +608,10 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
 		   (const char *)&i, sizeof(i)) == -1) {
       fprintf(stderr,
     "Error ComOpenConnPair: pid %d failed to setsockopt on TCP cfd with TCP_NODELAY:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (dfd);
-      ACE_OS::close (cfd);
+	      getpid());
+      perror("");
+      close(dfd);
+      close(cfd);
       return -1;
     }
   }
@@ -682,12 +682,12 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to write -1 to %s cfd:",
-	     ACE_OS::getpid (),
+	      getpid(),
 	      (csocktype == CONN_UNIX) ? "UNIX1" :
 	      (csocktype == CONN_INET) ? "INET1" : "ATM");
-     ACE_OS::perror ("");
+      perror("");
       if (csocktype == CONN_ATM) ATMcloseConn(cfd);
-      else ACE_OS::close (cfd);
+      else close(cfd);
       return -1;
     }
 
@@ -695,8 +695,8 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (dfd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to open ATM dfd conn:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       ATMcloseConn(cfd);
       return -1;
     }
@@ -704,8 +704,8 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
     if (time_write_int(dfd, i) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to write (cfd) to ATM dfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       ATMcloseConn(cfd);
       ATMcloseConn(dfd);
       return -1;
@@ -713,7 +713,7 @@ int ComOpenConnPair(char * address, int *ctr_fd, int *data_fd, int *max_pkt_size
 #else
     fprintf(stderr,
 	    "Error ComOpenConnPair: pid %d addresstype %d not supported\n",
-	   ACE_OS::getpid (), dsocktype);
+	    getpid(), dsocktype);
     return -1;
 #endif
   }
@@ -788,7 +788,7 @@ int VideoComOpenConnPair (char * address,
   if (!size) {
     fprintf(stderr,
 	    "Error ComOpenConnPair: pid %d not done ComInitClient/Server yet.\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
 
@@ -799,7 +799,7 @@ int VideoComOpenConnPair (char * address,
   if (cfd < 2) {
     fprintf(stderr,
 	    "Error ComOpenConnPair: pid %d no faTable entry for the pair",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   
@@ -846,7 +846,7 @@ int VideoComOpenConnPair (char * address,
 		getpid(), address);
         return -1;
       }
-      ACE_OS::memcpy ((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
+      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
 	    sizeof(addressIn.sin_addr.s_addr));
       /*
       bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
@@ -855,21 +855,21 @@ int VideoComOpenConnPair (char * address,
     }
     if (get_hostname(hostname, 100)) {
       fprintf(stderr, "Error ComOpenConnPair: pid %d failed to get_hostname:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if ((hp = gethostbyname(hostname)) == NULL) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to its own IP address:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if (hp->h_addrtype != AF_INET) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d own address is not INET type",
-	     ACE_OS::getpid ());
+	      getpid());
       return -1;
     }
     
@@ -889,19 +889,19 @@ int VideoComOpenConnPair (char * address,
     if (cfd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to open TCP cfd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     usleep(10000);
     if (connect(cfd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
        fprintf(stderr,
 	      "Error ComOpenConnPair: pid %d failed to conn TCP cfd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       i = -3;
-      ACE_OS::write (cfd, &i, 4);
-      ACE_OS::close (cfd);
+      write(cfd, &i, 4);
+      close(cfd);
       return -1;
     }
 //     if (conn_tag) { /* create a second connection with server */
@@ -1077,10 +1077,10 @@ int VideoComOpenConnPair (char * address,
 	if (setsockopt(dfd, SOL_SOCKET, SO_SNDBUF, (char *)&len, sizeof(len)) == -1) {
 	  fprintf(stderr,
 		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-snd to size %d:",
-		 ACE_OS::getpid (), len);
-	 ACE_OS::perror ("");
-	  ACE_OS::close (dfd);
-	  ACE_OS::close (cfd);
+		  getpid(), len);
+	  perror("");
+	  close(dfd);
+	  close(cfd);
 	  return -1;
 	}
 	*/
@@ -1091,10 +1091,10 @@ int VideoComOpenConnPair (char * address,
 	  /*
 	  fprintf(stderr,
 		  "Warning ComOpenConnPair: pid %d failed to set UDP dfd-rcv to size %d:",
-		 ACE_OS::getpid (), len);
-	 ACE_OS::perror ("");
-	  ACE_OS::close (dfd);
-	  ACE_OS::close (cfd);
+		  getpid(), len);
+	  perror("");
+	  close(dfd);
+	  close(cfd);
 	  return -1;
 	  */
 	}
@@ -1109,10 +1109,10 @@ int VideoComOpenConnPair (char * address,
 		   (const char *)&i, sizeof(i)) == -1) {
       fprintf(stderr,
     "Error ComOpenConnPair: pid %d failed to setsockopt on TCP cfd with TCP_NODELAY:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (dfd);
-      ACE_OS::close (cfd);
+	      getpid());
+      perror("");
+      close(dfd);
+      close(cfd);
       return -1;
     }
     //  }
@@ -1183,12 +1183,12 @@ int VideoComOpenConnPair (char * address,
 //     if (time_write_int(cfd, -1) == -1 || time_read_int(cfd, &i) == -1) {
 //       fprintf(stderr,
 // 	      "Error ComOpenConnPair: pid %d failed to write -1 to %s cfd:",
-// 	     ACE_OS::getpid (),
+// 	      getpid(),
 // 	      (csocktype == CONN_UNIX) ? "UNIX1" :
 // 	      (csocktype == CONN_INET) ? "INET1" : "ATM");
-//      ACE_OS::perror ("");
+//       perror("");
 //       if (csocktype == CONN_ATM) ATMcloseConn(cfd);
-//       else ACE_OS::close (cfd);
+//       else close(cfd);
 //       return -1;
 //     }
 
@@ -1196,8 +1196,8 @@ int VideoComOpenConnPair (char * address,
 //     if (dfd == -1) {
 //       fprintf(stderr,
 // 	      "Error ComOpenConnPair: pid %d failed to open ATM dfd conn:",
-// 	     ACE_OS::getpid ());
-//      ACE_OS::perror ("");
+// 	      getpid());
+//       perror("");
 //       ATMcloseConn(cfd);
 //       return -1;
 //     }
@@ -1205,8 +1205,8 @@ int VideoComOpenConnPair (char * address,
 //     if (time_write_int(dfd, i) == -1) {
 //       fprintf(stderr,
 // 	      "Error ComOpenConnPair: pid %d failed to write (cfd) to ATM dfd:",
-// 	     ACE_OS::getpid ());
-//      ACE_OS::perror ("");
+// 	      getpid());
+//       perror("");
 //       ATMcloseConn(cfd);
 //       ATMcloseConn(dfd);
 //       return -1;
@@ -1214,7 +1214,7 @@ int VideoComOpenConnPair (char * address,
 // #else
 //     fprintf(stderr,
 // 	    "Error ComOpenConnPair: pid %d addresstype %d not supported\n",
-// 	   ACE_OS::getpid (), dsocktype);
+// 	    getpid(), dsocktype);
 //     return -1;
 // #endif
 //   }
@@ -1261,7 +1261,7 @@ int ComOpenConn(char * address, int *max_pkt_size)
   if (!size) {
     fprintf(stderr,
 	    "Error ComOpenConn: pid %d not done ComInitClient/Server yet.\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
 
@@ -1272,7 +1272,7 @@ int ComOpenConn(char * address, int *max_pkt_size)
   if (fd < 1) {
     fprintf(stderr,
 	    "Error ComOpenConn: pid %d no faTable entry for the pair",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   
@@ -1315,7 +1315,7 @@ int ComOpenConn(char * address, int *max_pkt_size)
 		getpid(), address);
         return -1;
       }
-      ACE_OS::memcpy ((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
+      memcpy((char *)&addressIn.sin_addr.s_addr, (char *)hp->h_addr,
 	    sizeof(addressIn.sin_addr.s_addr));
       /*
       bcopy((char *)hp->h_addr, (char *)&addressIn.sin_addr.s_addr,
@@ -1324,21 +1324,21 @@ int ComOpenConn(char * address, int *max_pkt_size)
     }
     if (get_hostname(hostname, 100)) {
       fprintf(stderr, "Error ComOpenConn: pid %d failed to get_hostname:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if ((hp = gethostbyname(hostname)) == NULL) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to its own IP address:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if (hp->h_addrtype != AF_INET) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d own address is not INET type",
-	     ACE_OS::getpid ());
+	      getpid());
       return -1;
     }
     
@@ -1358,16 +1358,16 @@ int ComOpenConn(char * address, int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to open UNIX fd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if (connect(fd, (struct sockaddr *)&addressUn, sizeof(addressUn)) == -1) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to conn UNIX fd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (fd);
+	      getpid());
+      perror("");
+      close(fd);
       return -1;
     }
     *max_pkt_size = 0;
@@ -1379,25 +1379,25 @@ int ComOpenConn(char * address, int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to open TCP fd:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
     if (connect(fd, (struct sockaddr *)&addressIn, sizeof(addressIn)) == -1) {
        fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to conn TCP fd to server:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (fd);
+	      getpid());
+      perror("");
+      close(fd);
       return -1;
     }
     if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
 		   (const char *)&i, sizeof(i)) == -1) {
       fprintf(stderr,
     "Error ComOpenConn: pid %d failed to setsockopt on TCP fd with TCP_NODELAY:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
-      ACE_OS::close (fd);
+	      getpid());
+      perror("");
+      close(fd);
       return -1;
     }
     *max_pkt_size = 0;
@@ -1409,14 +1409,14 @@ int ComOpenConn(char * address, int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComOpenConn: pid %d failed to open ATM fd conn:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       return -1;
     }
 #else
     fprintf(stderr,
 	    "Error ComOpenConn: pid %d addresstype %d not supported\n",
-	   ACE_OS::getpid (), socktype);
+	    getpid(), socktype);
     return -1;
 #endif
   }
@@ -1454,7 +1454,7 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
   if (size) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d already done ComInitServer/Server\n",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   size = CLIENT_FDTABLE_SIZE;
@@ -1463,8 +1463,8 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
   if (fdTable == NULL) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to allocated fdTable space:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   for (i = 0; i < size; i ++) {
@@ -1486,8 +1486,8 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
   if (fd_inet == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to open fd_inet:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     goto open_fd_unix;
   }
   
@@ -1496,9 +1496,9 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
 		 (const char *)&i, sizeof(i)) == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to setsockopt fd_inet with REUSEADDR:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::close (fd_inet);
+	    getpid());
+    perror("");
+    close(fd_inet);
     fd_inet = -1;
     goto open_fd_unix;
   }
@@ -1506,18 +1506,18 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
   if (bind(fd_inet, (struct sockaddr *)&myaddr_in, sizeof(struct sockaddr_in)) == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to bind fd_inet:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::close (fd_inet);
+	    getpid());
+    perror("");
+    close(fd_inet);
     fd_inet = -1;
     goto open_fd_unix;
   }
   if (listen(fd_inet, 2) == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to listen on fd_inet:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::close (fd_inet);
+	    getpid());
+    perror("");
+    close(fd_inet);
     fd_inet = -1;
     goto open_fd_unix;
   }
@@ -1531,26 +1531,26 @@ int ComInitServer(int pinet_port, char * punix_port, char * patm_port)
   if (fd_unix == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to open fd_unix:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     goto open_fd_atm;
   }
   if ((bind(fd_unix, (struct sockaddr *)&myaddr_un,
 	    sizeof(struct sockaddr_un))) == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to bind fd_unix:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::close (fd_unix);
+	    getpid());
+    perror("");
+    close(fd_unix);
     fd_unix = -1;
     goto open_fd_atm;
   }
   if ((listen(fd_unix, 2)) == -1) {
     fprintf(stderr,
 	    "Error ComInitServer: pid %d failed to liston on fd_unix:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::close (fd_unix);
+	    getpid());
+    perror("");
+    close(fd_unix);
     fd_unix = -1;
     goto open_fd_atm;
   }
@@ -1572,18 +1572,18 @@ void ComCloseListen(void)
     /* fd_atm is not connected to a user_plane, ignore 
     ATMcloseFd(fd_atm);
     */
-    ACE_OS::close (fd_atm);
+    close(fd_atm);
     fd_atm = -1;
 #else
     fprintf(stderr, "Error ComCloseListen: CONN_ATM not supported.\n");
 #endif
   }
   if (fd_unix >= 0) {
-    ACE_OS::close (fd_unix);
+    close(fd_unix);
     fd_unix = -1;
   }
   if (fd_inet >= 0) {
-    ACE_OS::close (fd_inet);
+    close(fd_inet);
     fd_inet = -1;
   }
   return;
@@ -1600,19 +1600,19 @@ void ComCloseServer(void)
     /* fd_atm not connected to a user-plane, igore it 
     ATMcloseConn(fd_atm);
     */
-    ACE_OS::close (fd_atm);
+    close(fd_atm);
     fd_atm = -1;
 #else
     fprintf(stderr, "Error ComCloseServer: CONN_ATM not supported.\n");
 #endif
   }
   if (fd_unix >= 0) {
-    ACE_OS::close (fd_unix);
+    close(fd_unix);
     fd_unix = -1;
-    ACE_OS::unlink (unix_port);
+    unlink(unix_port);
   }
   if (fd_inet >= 0) {
-    ACE_OS::close (fd_inet);
+    close(fd_inet);
     fd_inet = -1;
   }
 #ifdef NATIVE_ATM
@@ -1629,8 +1629,8 @@ static int change_option(int fd)
 		 (const char *)&i, sizeof(i)) == -1) {
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d failed to setsockopt on fd_inet:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   /* data socket also NODELAY */
@@ -1638,8 +1638,8 @@ static int change_option(int fd)
 		 sizeof(linger)) == -1) {
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d failed to linger on fd_inet:",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   return 0;
@@ -1665,7 +1665,7 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
 		     get_duration(fdTable[i].stime, addrlen) > 10) {
       fprintf(stderr,
 	      "ComGetConnPair: pid %d closed fd %d (PENDING >= 10 sec)\n",
-	     ACE_OS::getpid (), fdTable[i].fd);
+	      getpid(), fdTable[i].fd);
       ComCloseConn(fdTable[i].fd);
       fdTable[i].fd = -1;
       fd ++;
@@ -1674,7 +1674,7 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
   if (fd < 2) {
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d no faTable entry for the pair",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   
@@ -1706,8 +1706,8 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d failed on select():",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   if (fd == 0) return -1; /* time expire */
@@ -1724,8 +1724,8 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComGetConnPair: pid %d failed to accpet on fd_unix:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
     }
     else fdType = CONN_UNIX;
     *max_pkt_size = 0;
@@ -1742,8 +1742,8 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComGetConnPair: pid %d failed to accpet on fd_inet:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
     }
     else fdType = CONN_INET;
     *max_pkt_size = 0;
@@ -1755,7 +1755,7 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
 #else
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d CONN_ATM not supported.\n",
-	   ACE_OS::getpid ());
+	    getpid());
 #endif
   }
   // fd = -1 implies accept failed in any of the active connections
@@ -1779,10 +1779,10 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
   if (time_read_int(fd, &nfds) == -1) {
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d failed to read int from %s fd:",
-	   ACE_OS::getpid (),
+	    getpid(),
 	    fdType == CONN_ATM ? "ATM" :
 	    fdType == CONN_INET ? "INET" : "UNIX");
-   ACE_OS::perror ("");
+    perror("");
     ComCloseConn(fd);
     return -1;
   }
@@ -1824,10 +1824,10 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (time_write_int(fd, fd) == -1) {
       fprintf(stderr,
 	      "Error ComGetConnPair: pid %d failed to write (fd) to %s fd:",
-	     ACE_OS::getpid (),
+	      getpid(),
 	      fdType == CONN_ATM ? "ATM" :
 	      fdType == CONN_INET ? "INET" : "UNIX");
-     ACE_OS::perror ("");
+      perror("");
       ComCloseConn(fd);
       return -1;
     }
@@ -1845,7 +1845,7 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (fdType == CONN_INET && change_option(fd) == -1) {
       fprintf(stderr,
 	      "Error ComGetConnPair: pid %d failed to change options of TCP cfd:",
-	     ACE_OS::getpid ());
+	      getpid());
       ComCloseConn(fd);
       return -1;
     }
@@ -1854,8 +1854,8 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (dfd == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to open dfd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
       return -1;
     }
@@ -1865,10 +1865,10 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (getsockname(fd, (struct sockaddr *)in, &addrlen) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to getsockname of fd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     
@@ -1880,29 +1880,29 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (bind(dfd, (struct sockaddr *)in, sizeof(* in)) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to bind dfd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     addrlen = sizeof(*in);
     if (getsockname(dfd, (struct sockaddr *)in, &addrlen) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to getsockname of dfd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     if (time_write_bytes(fd, (char *)&in->sin_port, sizeof(short)) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to write (dfd.port) to fd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     /*
@@ -1910,20 +1910,20 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
     if (getsockname(fd, (struct sockaddr *)in, &addrlen) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to getsockname of fd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     */
     if (time_write_bytes(fd, (char *)&in->sin_addr.s_addr, sizeof(int)) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to write (dfd.IPaddr) to fd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
 
@@ -1934,20 +1934,20 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
 	time_read_bytes(fd, (char *)&in->sin_addr.s_addr, sizeof(int)) == -1) {
       fprintf(stderr,
 	  "Error ComGetConnPair: pid %d failed to read (port, IPaddr) from fd:",
-	 ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	  getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
     usleep(10000);
     if (connect(dfd, (struct sockaddr *)in, sizeof(*in)) == -1) {
       fprintf(stderr,
 	      "Error ComGetConnPair: pid %d failed conn UDP dfd to peer:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
       ComCloseConn(fd);
-      ACE_OS::close (dfd);
+      close(dfd);
       return -1;
     }
 #if 0
@@ -2013,7 +2013,7 @@ int ComGetConnPair(int *ctr_fd, int *data_fd, int *max_pkt_size)
   else {
     fprintf(stderr,
 	    "Error ComGetConnPair: pid %d get invalid value %d from fd\n",
-	   ACE_OS::getpid (), nfds);
+	    getpid(), nfds);
     ComCloseConn(fd);
   }
   return -1;
@@ -2038,7 +2038,7 @@ int ComGetConn(int *max_pkt_size)
   if (fd < 1) {
     fprintf(stderr,
 	    "Error ComGetConn: pid %d no faTable entry for the pair",
-	   ACE_OS::getpid ());
+	    getpid());
     return -1;
   }
   
@@ -2066,8 +2066,8 @@ int ComGetConn(int *max_pkt_size)
     
     fprintf(stderr,
 	    "Error ComGetConn: pid %d failed on select():",
-	   ACE_OS::getpid ());
-   ACE_OS::perror ("");
+	    getpid());
+    perror("");
     return -1;
   }
   if (fd == 0) return -1; /* time expire */
@@ -2084,8 +2084,8 @@ int ComGetConn(int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComGetConn: pid %d failed to accpet on fd_unix:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
     }
     else fdType = CONN_UNIX;
     *max_pkt_size = 0;
@@ -2100,8 +2100,8 @@ int ComGetConn(int *max_pkt_size)
     if (fd == -1) {
       fprintf(stderr,
 	      "Error ComGetConn: pid %d failed to accpet on fd_inet:",
-	     ACE_OS::getpid ());
-     ACE_OS::perror ("");
+	      getpid());
+      perror("");
     }
     else fdType = CONN_INET;
     *max_pkt_size = 0;
@@ -2113,7 +2113,7 @@ int ComGetConn(int *max_pkt_size)
 #else
     fprintf(stderr,
 	    "Error ComGetConn: pid %d CONN_ATM not supported.\n",
-	   ACE_OS::getpid ());
+	    getpid());
 #endif
   }
   if (fd == -1) return -1;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp
index 2506186cdb8..b08b0bd3187 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.cpp
@@ -59,7 +59,7 @@ int StatFile(char *filename, struct StatBuf * sb)
   sb->mode = statbuf.st_mode;
   sb->size = statbuf.st_size;
   
-  strcpy(sb->ctime, ACE_OS::ctime (&(statbuf.st_ctime)));
+  strcpy(sb->ctime, ctime(&(statbuf.st_ctime)));
   sb->ctime[strlen(sb->ctime)-1] = 0;  /* remove CR */
 
   if ((pw = getpwuid(statbuf.st_uid)) == NULL)
@@ -91,7 +91,7 @@ void read_bytes(int s, char * buf, int size)
   
   for (;;)
   {
-    val = ACE_OS::read (s, ptr, remain);
+    val = read(s, ptr, remain);
     
     if (val == -1 && (errno == EINTR || errno == EAGAIN | errno == EWOULDBLOCK))
     {   /* interrupted or need to wait, try again */
@@ -101,13 +101,13 @@ void read_bytes(int s, char * buf, int size)
     }
     if (val == -1)
     {
-     ACE_OS::perror ("Error -- Read from socket");
-      ACE_OS::exit (1);
+      perror("Error -- Read from socket");
+      exit(1);
     }
     if (val == 0) /* EOF encountered */
     {
       fprintf(stderr, "Error -- EOF reached while trying to read %d bytes.\n", size);
-      ACE_OS::exit (1);
+      exit(1);
     }
     ptr += val;
     remain -= val;
@@ -115,14 +115,14 @@ void read_bytes(int s, char * buf, int size)
     {
       fprintf(stderr, "Error: read too much from socket, %d out of %d bytes.\n",
 	      size-remain, size);
-      ACE_OS::exit (1);
+      exit(1);
     }
     if (remain == 0)
       break;
   }
 }
 
-int wait_read_bytes (int s, char *buf, int size)
+int wait_read_bytes(int s, char *buf, int size)
 {
   int val, remain = size;
   char * ptr = buf;
@@ -131,7 +131,7 @@ int wait_read_bytes (int s, char *buf, int size)
   
   for (;;)
   {
-    val = ACE_OS::read (s, ptr, remain);
+    val = read(s, ptr, remain);
     
     if (val == -1 && (errno == EINTR || errno == EAGAIN | errno == EWOULDBLOCK))
     {   /* interrupted or need to wait, try again */
@@ -142,7 +142,7 @@ int wait_read_bytes (int s, char *buf, int size)
     if (val == -1)
     {
       /*
-     ACE_OS::perror ("Error -- wait_read from socket");
+      perror("Error -- wait_read from socket");
       */
       return -1;
     }
@@ -150,7 +150,7 @@ int wait_read_bytes (int s, char *buf, int size)
     {
       /*
       fprintf(stderr, "Warn pid %d -- EOF on wait_read %d bytes.\n",
-	     ACE_OS::getpid (), size);
+	      getpid(), size);
       */
       return 0;
     }
@@ -213,7 +213,7 @@ int time_read_bytes(int s, char * buf, int size)
 
     if (!(FD_ISSET(s, &read_mask))) continue;
     
-    val = ACE_OS::read (s, ptr, 1);
+    val = read(s, ptr, 1);
     
     if (val == -1 && (errno == EINTR))
     {   /* interrupted or need to wait, try again */
@@ -222,7 +222,7 @@ int time_read_bytes(int s, char * buf, int size)
     }
     if (val == -1)
     {
-     ACE_OS::perror ("Error -- time_read_bytes() from socket");
+      perror("Error -- time_read_bytes() from socket");
       return -1;
     }
     if (val == 0) /* EOF encountered */
@@ -250,12 +250,12 @@ int time_read_bytes(int s, char * buf, int size)
 void write_bytes(int sock, char * data, int len)
 {
   while (len > 0) {
-    int res = ACE_OS::write (sock, data, len);
+    int res = write(sock, data, len);
     if (res == -1) {
       if (errno == EINTR || errno == EAGAIN) continue;
-      fprintf(stderr, "Error pid %d",ACE_OS::getpid ());
-     ACE_OS::perror (" -- failed to write all bytes to socket");
-      ACE_OS::exit (1);
+      fprintf(stderr, "Error pid %d", getpid());
+      perror(" -- failed to write all bytes to socket");
+      exit(1);
     }
     len -= res;
     data += res;
@@ -266,11 +266,11 @@ int time_write_bytes(int sock, char * data, int plen)
 {
   int len = plen;
   while (len > 0) {
-    int res = ACE_OS::write (sock, data, len);
+    int res = write(sock, data, len);
     if (res == -1) {
       if (errno == EINTR || errno == EAGAIN) continue;
-      fprintf(stderr, "Error pid %d",ACE_OS::getpid ());
-     ACE_OS::perror (" -- failed to time_write all bytes to socket");
+      fprintf(stderr, "Error pid %d", getpid());
+      perror(" -- failed to time_write all bytes to socket");
       return -1;
     }
     len -= res;
@@ -283,12 +283,12 @@ int wait_write_bytes(int sock, char * data, int plen)
 {
   int len = plen;
   while (len > 0) {
-    int res = ACE_OS::write (sock, data, len);
+    int res = write(sock, data, len);
     if (res == -1) {
       if (errno == EINTR || errno == EAGAIN) continue;
       /*
-      fprintf(stderr, "Error pid %d",ACE_OS::getpid ());
-     ACE_OS::perror (" -- failed to wait_write all bytes to socket");
+      fprintf(stderr, "Error pid %d", getpid());
+      perror(" -- failed to wait_write all bytes to socket");
       */
       return -1;
     }
@@ -402,7 +402,7 @@ int time_write_int(int sock, int data)
 
 void write_string(int sock, char *data)
 {
-  int len =ACE_OS::strlen (data);
+  int len = strlen(data);
   
   write_int(sock, len);
   write_bytes(sock, data, len);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp
index 7458bb9ea02..dec5c3d394a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.cpp
@@ -231,12 +231,12 @@ double DoMedianFilter(MedianFilter *f, double pvalue)
     if (f->stat == NULL) {
       fprintf(stderr, "MedianFilter Failed to extend up stat to % items",
 	      f->statsize);
-     ACE_OS::perror ("");
-      ACE_OS::exit (1);
+      perror("");
+      exit(1);
     }
     memset((char *)(f->stat) + sizeof(int) * oldsize, 0,
 	   sizeof(int) * (f->statsize - oldsize));
-    ACE_OS::memcpy (f->stat, oldstat, oldsize * sizeof(int));
+    memcpy(f->stat, oldstat, oldsize * sizeof(int));
   }
   else if (value < f->min) {
     int * oldstat = f->stat;
@@ -247,11 +247,11 @@ double DoMedianFilter(MedianFilter *f, double pvalue)
     if (f->stat == NULL) {
       fprintf(stderr, "MedianFilter Failed to extend down stat to % items",
 	      f->statsize);
-     ACE_OS::perror ("");
-      ACE_OS::exit (1);
+      perror("");
+      exit(1);
     }
     memset(f->stat, 0, sizeof(int) * (f->statsize - oldsize));
-    ACE_OS::memcpy ((char *)(f->stat) + sizeof(int) * (f->statsize - oldsize),
+    memcpy((char *)(f->stat) + sizeof(int) * (f->statsize - oldsize),
 	   oldstat, sizeof(int) * oldsize);
     f->med += f->statsize - oldsize;
   }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
index 50950277478..673cf5a6804 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/filters.h
@@ -23,10 +23,6 @@
  *         Department of Computer Science and Engineering
  *         email: scen@cse.ogi.edu
  */
-
-#if !defined (AV_FILTERS_H)
-#define AV_FILTERS_H
-
 #define FILTER_LOWPASS  0
 #define FILTER_MEDIAN   1
 #define FILTER_AVERAGE  2
@@ -87,5 +83,3 @@ LowPassFilter * NewLowPassFilter(double R);
 LowPassFilter * ResetLowPassFilter(LowPassFilter * f, double R);
 void FreeLowPassFilter(LowPassFilter * f);
 double DoLowPassFilter(LowPassFilter *f, double value);
-
-#endif /* AV_FILTERS_H */
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
index 254daea63ae..546b8bc5b3c 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.cpp
@@ -61,8 +61,6 @@ ACE_RCSID(mpeg_shared, routine, "$Id$")
 #define BLOCK_NUM 5
 #define DELTA_MSEC 20
 
-union semun sem_union;
-
 int get_hostname(char *name, int len)
 {
 #ifdef __svr4__
@@ -132,19 +130,18 @@ long get_duration(long val1, long val2)
 
 #ifdef LINUX
 #else
-int usleep(unsigned int usec)
+void usleep(unsigned int usec)
 {
   struct timeval val;
 
-  if (usec <= 0) return -1;
+  if (usec <= 0) return;
   val.tv_sec = usec / 1000000;
   val.tv_usec = usec % 1000000;
   if (select(0, NULL, NULL, NULL, &val) == -1 && errno != 4)
   {
-   ACE_OS::perror ("sleep with select");
-    ACE_OS::exit (1);
+    perror("sleep with select");
+    exit(1);
   }
-  return 0;
 }
 #endif
 
@@ -160,14 +157,14 @@ void beep(void)
 
 void remove_shmem_id(int id)
 {
- ACE_OS::shmctl (id, IPC_RMID, NULL);
+  shmctl(id, IPC_RMID, NULL);
 #if 0
   /* weird also on some sunOs4 machines */
   /* weird, HPUX always report error on this operation */
   if (errno)
   {
     fprintf(stderr, "shmctl shm_id:%d to IPC_RMID error:", id);
-   ACE_OS::perror ("");
+    perror("");
   }
 #endif
 }
@@ -177,35 +174,35 @@ char * creat_shared_mem_id(int size, int * id)
   char * shm;
   int shm_id;
   
-  shm_id = ACE_OS::shmget (IPC_PRIVATE, size, IPC_CREAT | 0666);
+  shm_id = shmget(IPC_PRIVATE, size, IPC_CREAT | 0666);
   if (shm_id == -1)
   {
-    shm_id = ACE_OS::shmget (IPC_PRIVATE, 0, IPC_CREAT | 0666);
+    shm_id = shmget(IPC_PRIVATE, 0, IPC_CREAT | 0666);
     if (shm_id == -1)
     {
-     ACE_OS::perror ("Shared MEM shmget1 error");
-      ACE_OS::exit (1);
+      perror("Shared MEM shmget1 error");
+      exit(1);
     }
     else
     {
       if (shmctl(shm_id, IPC_RMID, NULL) == -1)
       {
-       ACE_OS::perror ("Shared MEM shmctl error");
-        ACE_OS::exit (1);
+        perror("Shared MEM shmctl error");
+        exit(1);
       }
-      shm_id = ACE_OS::shmget (IPC_PRIVATE, 0, IPC_CREAT | 0666);
+      shm_id = shmget(IPC_PRIVATE, 0, IPC_CREAT | 0666);
       if (shm_id == -1)
       {
-       ACE_OS::perror ("Shared MEM shmget2 error");
-        ACE_OS::exit (1);
+        perror("Shared MEM shmget2 error");
+        exit(1);
       }
     }
   }
   shm = (char *)shmat(shm_id, (char *)0, 0);
   if ((int)shm == -1)
   {
-   ACE_OS::perror ("Shared MEM shmat error");
-    ACE_OS::exit (1);
+    perror("Shared MEM shmat error");
+    exit(1);
   }
   *id = shm_id;
   return shm;
@@ -221,7 +218,7 @@ char * creat_shared_mem(int size)
 
 void remove_shared_mem(char *ptr)
 {
-  ACE_OS::shmdt (ptr);
+  shmdt(ptr);
 }
 
 #define SEM_NUM 6
@@ -235,13 +232,13 @@ void enter_cs(int semaphore_id)
   sop.sem_num = semaphore_id;
   sop.sem_op = -1;
   sop.sem_flg = 0;
-  while (ACE_OS::semop(semId, &sop, 1) == -1)
+  while (semop(semId, &sop, 1) == -1)
   {
     if (errno == EINTR)
       continue;
-    fprintf(stderr, "semop(enter_cs) error: pid=%d",ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    fprintf(stderr, "semop(enter_cs) error: pid=%d", getpid());
+    perror("");
+    exit(1);
   }
 }
 
@@ -251,13 +248,13 @@ void leave_cs(int semaphore_id)
   sop.sem_num = semaphore_id;
   sop.sem_op = 1;
   sop.sem_flg = 0;
-  while (ACE_OS::semop(semId, &sop, 1) == -1)
+  while (semop(semId, &sop, 1) == -1)
   {
     if (errno == EINTR)
       continue;
-    fprintf(stderr, "semop(leave_cs) error, pid=%d",ACE_OS::getpid ());
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    fprintf(stderr, "semop(leave_cs) error, pid=%d", getpid());
+    perror("");
+    exit(1);
   }
 }
 
@@ -267,26 +264,26 @@ int creat_semaphore(void)
   int sem_val;
   int semaphore_id;
   if (semId == -1) {
-    semId = ACE_OS::semget (IPC_PRIVATE, SEM_NUM, IPC_CREAT | 0666);
+    semId = semget(IPC_PRIVATE, SEM_NUM, IPC_CREAT | 0666);
     if (semId == -1) {
-     ACE_OS::perror ("Semaphore semget error");
-      ACE_OS::exit (1);
+      perror("Semaphore semget error");
+      exit(1);
     }
-    masterPid =ACE_OS::getpid ();
+    masterPid = getpid();
     nextSem = 0;
   }
-  else if (masterPid !=ACE_OS::getpid ()) {
+  else if (masterPid != getpid()) {
     fprintf(stderr, "Error: this creat_semaphore() assumes semaphores are allocated\n");
     fprintf(stderr, "  only in single process %d, while current pid=%d\n",
-	    masterPid,ACE_OS::getpid ());
-    ACE_OS::exit (1);
+	    masterPid, getpid());
+    exit(1);
   }
   semaphore_id = nextSem ++;
   if (semaphore_id >= SEM_NUM) {
     fprintf(stderr, "Error: all of %d semaphores used up.\n", SEM_NUM);
-    ACE_OS::exit (1);
+    exit(1);
   }
-  sem_val = ACE_OS::semctl (semId, semaphore_id, GETVAL, sem_union);
+  sem_val = semctl(semId, semaphore_id, GETVAL, 0);
 /*
    fprintf(stderr, "Initial semaphore value: %d\n", sem_val);
 */
@@ -297,13 +294,12 @@ int creat_semaphore(void)
 
 void delete_semaphore()
 {
-  if (masterPid ==ACE_OS::getpid () && semId >= 0) {
-	sem_union.val = 0;
-    ACE_OS::semctl (semId, 0, IPC_RMID, sem_union);
+  if (masterPid == getpid() && semId >= 0) {
+    semctl(semId, 0, IPC_RMID, 0);
   } else {
-    if (masterPid !=ACE_OS::getpid ())
+    if (masterPid != getpid())
     fprintf(stderr, "Pid %d not supposed to remove semId created by pid %d\n",
-	   ACE_OS::getpid (), masterPid);
+	    getpid(), masterPid);
     else
     fprintf(stderr, "The semaphore has been deleted.\n");
   }
@@ -313,13 +309,12 @@ void delete_semaphore()
 void remove_semaphore(int sid)
 {
   return;
-  //  ACE_OS::semctl (semId, semaphore_id, IPC_RMID, 0);
+  //  semctl(semId, semaphore_id, IPC_RMID, 0);
 }
 
 void remove_all_semaphores (void)
 {
-	sem_union.val = 0;
-  ACE_OS::semctl (semId,0, IPC_RMID, sem_union);
+  semctl(semId,0, IPC_RMID, 0);
   return;
 }
 
@@ -327,30 +322,27 @@ int get_semval(int sid)
 {
   int val, val1 = 0;
   errno = 0;
-	sem_union.val = 0;
-  val = ACE_OS::semctl (semId, sid, GETVAL, sem_union);
+  val = semctl(semId, sid, GETVAL, 0);
   if (val == -1) {
-   ACE_OS::perror ("getting value of a semaphore");
-    ACE_OS::exit (1);
+    perror("getting value of a semaphore");
+    exit(1);
   }
   /*
   if (val == 0) {
-    fprintf(stderr, "pid %d to call ACE_OS::semctl (%d, 0, GETZCNT)\n",ACE_OS::getpid (), sid);
-	sem_union.val = 0;
-    val = ACE_OS::semctl (semId, 0, GETZCNT, 0);
+    fprintf(stderr, "pid %d to call semctl(%d, 0, GETZCNT)\n", getpid(), sid);
+    val = semctl(semId, 0, GETZCNT, 0);
     if (val == -1) {
-     ACE_OS::perror ("getting semzcnt of a semaphore");
-      ACE_OS::exit (1);
+      perror("getting semzcnt of a semaphore");
+      exit(1);
     }
     
-    fprintf(stderr, "pid %d to call ACE_OS::semctl (%d, 0, GETNCNT)\n",ACE_OS::getpid (), sid);
+    fprintf(stderr, "pid %d to call semctl(%d, 0, GETNCNT)\n", getpid(), sid);
     usleep(10000000);
-	sem_union.val = 0;
-    val1 = ACE_OS::semctl (semId, sid, GETNCNT, sem_union);
+    val1 = semctl(semId, sid, GETNCNT, 0);
     if (val1 == -1) {
-     ACE_OS::perror ("getting semncnt of a semaphore");
+      perror("getting semncnt of a semaphore");
     }
-    fprintf(stderr, "pid %d to called ACE_OS::semctl (GETNCNT)\n",ACE_OS::getpid ());
+    fprintf(stderr, "pid %d to called semctl(GETNCNT)\n", getpid());
     
     fprintf(stderr, "Semval val %d, val1 %d\n", val, val1);
     return (0-(val + val1));
@@ -374,7 +366,7 @@ void get_full_path(char *filename, char * buffer, int bufsize)
     if (env != NULL)
     {
       strncpy(path, env, MAXPATHLEN);
-      strncat(path, filename+1, MAXPATHLEN -ACE_OS::strlen (path));
+      strncat(path, filename+1, MAXPATHLEN - strlen(path));
     }
     else
       strncpy(path, filename, MAXPATHLEN);
@@ -388,7 +380,7 @@ void get_full_path(char *filename, char * buffer, int bufsize)
     {
       path[MAXPATHLEN-4] = 0;
       strcat(path, "/");
-      strncat(path, filename, MAXPATHLEN -ACE_OS::strlen (path));
+      strncat(path, filename, MAXPATHLEN - strlen(path));
     }
   }
   path[MAXPATHLEN-1] = 0;
@@ -409,14 +401,14 @@ void setsignal(int sig, void (func)(int))
   sv.sv_flags   = 0;
   if (sigvector (sig, &sv, (struct sigvec *) NULL) == -1) {
     fprintf(stderr, "sigvector(%d) error", sig);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
 #elif defined(__svr4__) || defined(IRIX)
   if (sigset(sig, func) == SIG_ERR)  {
     fprintf(stderr, "sigset(%d,func) error", sig);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
 #elif defined(sun) || defined(FreeBSD) || defined(ULTRIX) || defined(LINUX)
   {
@@ -431,21 +423,21 @@ void setsignal(int sig, void (func)(int))
     //    act.sa_mask = 0;
     if (!sigaction(sig, &act, NULL)) return;
     fprintf(stderr, "sigaction(%d,...) error", sig);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
   /*
   if (signal(sig, func) == SIG_ERR) {
     fprintf(stderr, "signal(%d,func) error", sig);
-   ACE_OS::perror ("");
-    ACE_OS::exit (1);
+    perror("");
+    exit(1);
   }
   */
 #else
   fprintf(stderr,
 	  "Error: code for setsignal(%d,func) is missing in source/mpeg_shared/routine.cpp\n",
 	  sig);
-  ACE_OS::exit (1);
+  exit(1);
 #endif
 }
 
@@ -462,7 +454,7 @@ int SetRTpriority(char *msg, int pri)
     if (rtprio(0, 127 - pri) == -1)
     {
       fprintf(stderr, "%s fails to be set to RT priority %d", msg, 127 - pri);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     return 0;
@@ -473,7 +465,7 @@ int SetRTpriority(char *msg, int pri)
     strcpy(pci.pc_clname, "RT");
     if (priocntl(P_PID, P_MYID, PC_GETCID, (char *)&pci) == -1) {
       fprintf(stderr, "%s priocntl(PC_GETCID) failed for RT pri %d", msg, pri);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     pcp.pc_cid = pci.pc_cid;
@@ -482,7 +474,7 @@ int SetRTpriority(char *msg, int pri)
     rtp->rt_tqnsecs = 10000000;  /* 10 (ten) milliseconds */
     if (priocntl(P_PID, P_MYID, PC_SETPARMS, (char *)&pcp) == -1) {
       fprintf(stderr, "%s priocntl(PC_SETPARMS) failed for RT pri %d", msg, pri);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     return 0;
@@ -495,7 +487,7 @@ int SetRTpriority(char *msg, int pri)
 #ifdef _HPUX_SOURCE
     if (rtprio(0, RTPRIO_RTOFF) == -1) {
       fprintf(stderr, "%s fails to be set to RTPRIO_RTOFF", msg);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     return 0;
@@ -506,7 +498,7 @@ int SetRTpriority(char *msg, int pri)
     strcpy(pci.pc_clname, "TS");
     if (priocntl(P_PID, P_MYID, PC_GETCID, (char *)&pci) == -1) {
       fprintf(stderr, "%s priocntl(PC_GETCID) failed for TS priority", msg);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     pcp.pc_cid = pci.pc_cid;
@@ -514,7 +506,7 @@ int SetRTpriority(char *msg, int pri)
     tsp->ts_upri = 0;
     if (priocntl(P_PID, P_MYID, PC_SETPARMS, (char *)&pcp) == -1) {
       fprintf(stderr, "%s priocntl(PC_SETPARMS) failed for TS priority", msg);
-     ACE_OS::perror ("");
+      perror("");
       return -1;
     }
     return 0;
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
index 6afb41a69ee..fa55050458b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h
@@ -30,7 +30,7 @@
 #include "include/common.h"
 #ifdef LINUX
 #else
-int usleep(unsigned int usec);
+void usleep(unsigned int usec);
 #endif
 void beep(void);
 int get_hostname(char *name, int len);
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp
index 9b0685ecf89..1862a44a28a 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Machine_Properties.cpp
@@ -9,9 +9,9 @@ const int TAO_Machine_Properties::NUM_PROPERTIES = 10;
 const int DEFAULT_TIMEOUT_SEC = 1;
 const int DEFAULT_TIMEOUT_USEC = 0;
 
-const char* TAO_Machine_Properties::PROP_NAMES[] =
+const char* TAO_Machine_Properties::PROP_NAMES[] = 
 {
-  "CPU",
+  "CPU", 
   "Disk",
   "Pages",
   "Swaps",
@@ -23,15 +23,8 @@ const char* TAO_Machine_Properties::PROP_NAMES[] =
   "Load"
 };
 
-// XXX:hack to avoid CC errors. 
-// Redefine xdr_void. Always return true.
-int xdr_void (XDR *,void *)
-{
-  return 1;
-}
-
-
-TAO_Machine_Properties::TAO_Machine_Properties (void)
+TAO_Machine_Properties::
+TAO_Machine_Properties (void)
   : timeout_ (ACE_Time_Value (DEFAULT_TIMEOUT_SEC, DEFAULT_TIMEOUT_USEC)),
     timestamp_ (0),
     sample_time_ (0)
@@ -59,7 +52,7 @@ TAO_Machine_Properties::init (void)
   if (this->rstat_client_ == 0)
     {
       ACE_ERROR ((LM_ERROR, "(%P|%t) %s\n",
-                  ::clnt_spcreateerror ("localhost")));
+		  ::clnt_spcreateerror ("localhost")));
     }
 
   ::memset (&this->old_stats_, 0, sizeof (statstime));
@@ -77,27 +70,27 @@ TAO_Machine_Properties::retrieve_stats (void)
   if (this->rstat_client_ == 0)
     {
       ACE_ERROR ((LM_ERROR, "(%P|%t) %s\n",
-                  ::clnt_spcreateerror ("localhost")));
+		  ::clnt_spcreateerror ("localhost")));
     }
 
   ::memset (&this->old_stats_, 0, sizeof (statstime));
 
   //  if (this->rstat_client_ == 0)
   //    return -1;
-
+  
   static struct timeval timeout = {25, 0};
   u_int result;
   if ((result =clnt_call (this->rstat_client_,
-                 RSTATPROC_STATS,
-                 xdr_void,
-                 0,
-                 (xdrproc_t) xdr_statstime,
-                 (caddr_t) &this->stats_,
-                 timeout)) != RPC_SUCCESS)
+		 RSTATPROC_STATS,
+		 xdr_void,
+		 0,
+		 (xdrproc_t) xdr_statstime,
+		 (caddr_t) &this->stats_,
+		 timeout)) != RPC_SUCCESS)
     {
       ACE_DEBUG ((LM_DEBUG,"rpc-error:%d\n",result));
       ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) %s\n",
-                         ::clnt_sperror (this->rstat_client_, "localhost")), -1);
+			 ::clnt_sperror (this->rstat_client_, "localhost")), -1);
     }
   else
       ACE_DEBUG ((LM_DEBUG,"rpc client call worked\n"));
@@ -117,19 +110,19 @@ TAO_Machine_Properties::evalDP (const char* prop_name,
   CORBA::Any* return_value;
 
   ACE_DEBUG ((LM_DEBUG, "Evaluating machine properties.\n"));
-
+  
   ACE_NEW_RETURN (return_value, CORBA::Any, 0);
-
+  
   if (ACE_OS::gettimeofday () - this->timestamp_ > this->timeout_)
     {
       if (this->retrieve_stats () == -1)
-        return return_value;
+	return return_value;
     }
-
+  
   CORBA::String_var prop_name_var (prop_name);
   int elapsed_seconds = this->sample_time_.sec () +
     (this->sample_time_.usec () > 500000) ? 1 : 0;
-
+  
   if (ACE_OS::strcmp (prop_name, PROP_NAMES[CPU]) == 0)
     this->compute_cpu (*return_value, elapsed_seconds);
   else if (ACE_OS::strcmp (prop_name, PROP_NAMES[DISK]) == 0)
@@ -167,9 +160,9 @@ export_properties (TAO_Property_Exporter& prop_exporter)
       const char* name = PROP_NAMES[i];
       const CORBA::TypeCode_ptr prop_type = CORBA::_tc_float;
 
-      CosTradingDynamic::DynamicProp* dp_struct =
-        this->construct_dynamic_prop (name, prop_type, extra_info);
-
+      CosTradingDynamic::DynamicProp* dp_struct = 
+	this->construct_dynamic_prop (name, prop_type, extra_info);
+     
       prop_exporter.add_dynamic_property (name, dp_struct);
     }
 }
@@ -177,7 +170,7 @@ export_properties (TAO_Property_Exporter& prop_exporter)
 int
 TAO_Machine_Properties::
 define_properties (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
-                   CORBA::ULong offset) const
+		   CORBA::ULong offset) const
 {
   prop_seq.length (NUM_PROPERTIES + offset);
   for (int j = prop_seq.length () - offset - 1, i = offset; j >= 0; j--, i++)
@@ -198,12 +191,12 @@ TAO_Machine_Properties::compute_cpu (CORBA::Any& value, int elapsed_seconds)
   CORBA::ULong used = 0.0;
   for (int i = 0; i < RSTAT_CPUSTATES - 1; i++)
     used += (this->stats_.cp_time[i] - this->old_stats_.cp_time[i]);
-
+  
   // The last is the amount idle.
   CORBA::ULong idle =
     this->stats_.cp_time[RSTAT_CPUSTATES - 1] -
     this->old_stats_.cp_time[RSTAT_CPUSTATES - 1];
-
+  
   // The CPU usage is the amount used over the total available.
   value <<= (CORBA::Float) ((((CORBA::Float) used) / (used + idle)) * 100.0);
 }
@@ -214,7 +207,7 @@ TAO_Machine_Properties::compute_disk (CORBA::Any& value, int elapsed_seconds)
   CORBA::Float used = 0.0;
   for (int i = 0; i < RSTAT_DK_NDRIVE; i++)
     used += (this->stats_.dk_xfer[i] - this->old_stats_.dk_xfer[i]);
-
+  
   value <<= (CORBA::Float)(used / (float) elapsed_seconds);
 }
 
@@ -224,7 +217,7 @@ TAO_Machine_Properties::compute_pages (CORBA::Any& value, int elapsed_seconds)
   CORBA::Float pages =
     (this->stats_.v_pgpgin - this->old_stats_.v_pgpgin) +
     (this->stats_.v_pgpgout - this->old_stats_.v_pgpgout);
-
+  
   value <<= (CORBA::Float) (pages / elapsed_seconds);
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
index caa8796b159..067f4eada51 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile
@@ -5,6 +5,9 @@
 #----------------------------------------------------------------------------
 
 MAKEFILE = Makefile
+BIN =  augmented_server server vs as 
+
+BUILD = $(BIN)
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
@@ -35,15 +38,6 @@ LIBS 	+= -lTAO -lACE -lorbsvcs -lmpeg_server -lmpeg_shared -lrpcsvc
 MPEG_ROOT = $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source
 CPPFLAGS += -I$(MPEG_ROOT) -I$(TAO_ROOT)/orbsvcs/orbsvcs
 
-BIN2 = augmented_server server vs as
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # AV
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -85,13 +79,2065 @@ vs:$(addprefix $(VDIR),$(AV_VS_OBJS))
 as:$(addprefix $(VDIR),$(AV_AS_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
 	$(addsuffix _T.h, $(IDL_FILES)) $(addsuffix _T.i, $(IDL_FILES)) $(addsuffix _T.cpp, $(IDL_FILES))
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/augmented_server.o .obj/augmented_server.so .shobj/augmented_server.o .shobj/augmented_server.so: augmented_server.cpp augmented_server.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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 \
+ $(ACE_ROOT)/ace/Acceptor.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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.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_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/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_Base.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/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/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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h \
+ vs.h Property_Exporter.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Machine_Properties.h Video_Repository.h Video_RepositoryC.h \
+ Video_RepositoryC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/MMDevice_ExporterS.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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 \
+ $(ACE_ROOT)/ace/Acceptor.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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.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_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/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_Base.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/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/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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h \
+ vs.h
+.obj/vs.o .obj/vs.so .shobj/vs.o .shobj/vs.so: vs.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.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/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/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 \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ vs.h $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/as.o .obj/as.so .shobj/as.o .shobj/as.so: as.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Server.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/include/common.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/fileio.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/routine.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/com.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/server_proto.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Globals.h \
+ $(ACE_ROOT)/ace/SOCK_CODgram.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/SOCK_CODgram.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 \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/sendpt.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Server.h \
+ $(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/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Video_ControlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_State.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Video_Control_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/AVStreams_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AVStreamsS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Null_MediaCtrlS.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlC.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.h \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_shared/Audio_ControlS.i \
+ as.h $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(TAO_ROOT)/orbsvcs/tests/AVStreams/mpeg/source/mpeg_server/Audio_Control_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/Property_Exporter.o .obj/Property_Exporter.so .shobj/Property_Exporter.o .shobj/Property_Exporter.so: Property_Exporter.cpp Property_Exporter.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
+.obj/Machine_Properties.o .obj/Machine_Properties.so .shobj/Machine_Properties.o .shobj/Machine_Properties.so: Machine_Properties.cpp Machine_Properties.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(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/Hash_Map_Manager.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/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_Base.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/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/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)/orbsvcs/orbsvcs/CosTradingS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
+ Property_Exporter.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i
+.obj/Video_RepositoryC.o .obj/Video_RepositoryC.so .shobj/Video_RepositoryC.o .shobj/Video_RepositoryC.so: Video_RepositoryC.cpp Video_RepositoryC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Hash_Map_Manager.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/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_Base.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/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/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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Connector.h \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.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/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ Video_RepositoryC.i Video_RepositoryS.h Video_RepositoryS_T.h \
+ Video_RepositoryS_T.i Video_RepositoryS_T.cpp Video_RepositoryS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
deleted file mode 100644
index 1241d67df59..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Makefile.am
+++ /dev/null
@@ -1,73 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- mpeg/source/server directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = augmented_server server vs as
-
-augmented_server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-augmented_server_SOURCES = \
-        Video_RepositoryC.cpp \
-        augmented_server.cpp \
-        Property_Exporter.cpp \
-        Machine_Properties.cpp \
-        Video_Repository.cpp
-
-server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-server_SOURCES = \
-        server.cpp
-
-vs_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-vs_SOURCES = \
-        vs.cpp
-
-as_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-as_SOURCES = \
-        as.cpp
-
-noinst_HEADERS = \
-        Machine_Properties.h \
-        Property_Exporter.h \
-        Video_Repository.h \
-        as.h \
-        augmented_server.h \
-        server.h \
-        vs.h
-
-IDL_SOURCES = \
-        Video_Repository.idl
-
-BUILT_SOURCES = \
-        Video_RepositoryS.cpp
-        Video_RepositoryS.h
-        Video_RepositoryC.cpp
-        Video_RepositoryC.h
-
-EXTRA_DIST = $(IDL_SOURCES)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp
index 6209778f37c..d3b5c62b869 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.cpp
@@ -16,27 +16,27 @@ class DP_Adapter : public TAO_Dynamic_Property
 public:
 
   DP_Adapter (const char* prop_name,
-              CosPropertyService::PropertySet_ptr prop_set);
+	      CosPropertyService::PropertySet_ptr prop_set);
 
   ~DP_Adapter (void);
-
+  
   virtual CORBA::Any* evalDP (const char* name,
                               CORBA::TypeCode_ptr returned_type,
                               const CORBA::Any& extra_info,
-                              CORBA::Environment& TAO_IN_ENV)
+			      CORBA::Environment& TAO_IN_ENV)
     TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure));
   // Call back to the Property Service interface. The Property
   // Service reference is contained in the extra_info -- an
   // Asynchronous Completion Token.
-
+  
 private:
-
+  
   const char* prop_name_;
   CosPropertyService::PropertySet_var prop_set_;
 };
 
 DP_Adapter::DP_Adapter (const char* prop_name,
-                        CosPropertyService::PropertySet_ptr prop_set)
+			CosPropertyService::PropertySet_ptr prop_set)
   : prop_name_ (prop_name),
     prop_set_ (prop_set)
 {
@@ -50,23 +50,23 @@ CORBA::Any*
 DP_Adapter::evalDP (const char* name,
                     CORBA::TypeCode_ptr returned_type,
                     const CORBA::Any& extra_info,
-                    CORBA::Environment& TAO_IN_ENV)
+		    CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CosTradingDynamic::DPEvalFailure))
 {
   TAO_TRY
     {
       CORBA::Any* return_value =
-        this->prop_set_->get_property_value (this->prop_name_,
-                                             TAO_TRY_ENV);
+	this->prop_set_->get_property_value (this->prop_name_,
+					     TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       return return_value;
     }
   TAO_CATCHANY
     {
       TAO_THROW_RETURN (CosTradingDynamic::DPEvalFailure
-                        (this->prop_name_, returned_type, extra_info),
-                        0);
+			(this->prop_name_, returned_type, extra_info),
+			0);
     }
   TAO_ENDTRY;
 }
@@ -77,8 +77,8 @@ DP_Adapter::evalDP (const char* name,
 
 TAO_Property_Exporter::
 TAO_Property_Exporter (CosTrading::Lookup_var lookup_if,
-                       CosPropertyService::PropertySet_ptr prop_set,
-                       CORBA::ULong initial_size)
+		       CosPropertyService::PropertySet_ptr prop_set,
+		       CORBA::ULong initial_size)
   : increment_ (initial_size),
     lookup_ (lookup_if),
     prop_set_ (prop_set),
@@ -95,11 +95,11 @@ TAO_Property_Exporter::~TAO_Property_Exporter (void)
 
 void
 TAO_Property_Exporter::add_static_property (const char* name,
-                                            const CORBA::Any& value)
+					    const CORBA::Any& value)
 {
   CORBA::ULong plength = this->pprops_.length (),
     tlength = this->tprops_.length ();
-
+  
   if (tlength == this->tcount_)
     this->tprops_.length (tlength + this->increment_);
 
@@ -121,8 +121,8 @@ TAO_Property_Exporter::add_static_property (const char* name,
 void
 TAO_Property_Exporter::
 add_dynamic_property (const char* name,
-                      const CORBA::Any& value,
-                      TAO_Dynamic_Property& dynamic_prop)
+		      const CORBA::Any& value,
+		      TAO_Dynamic_Property& dynamic_prop)
 {
   // Add a property to the PropSet and a dynamic property to the
   // Offer. Have the dynamic property connect to the PropSet accessor
@@ -132,7 +132,7 @@ add_dynamic_property (const char* name,
 
   CORBA::ULong plength = this->pprops_.length (),
     tlength = this->tprops_.length ();
-
+  
   if (tlength == this->tcount_)
     this->tprops_.length (tlength + this->increment_);
 
@@ -143,12 +143,12 @@ add_dynamic_property (const char* name,
 
   CosTradingDynamic::DynamicProp_var dp_struct =
     dynamic_prop.construct_dynamic_prop (name, value.type (), extra_info);
-
+  
   // Copy the dynamic property struct into the property value
   this->tprops_[this->tcount_].name = name;
   this->tprops_[this->tcount_].value <<= dp_struct.in ();
   this->tcount_++;
-
+  
   this->pprops_[this->pcount_].property_name = name;
   this->pprops_[this->pcount_].property_value = value;
   this->pcount_++;
@@ -157,10 +157,10 @@ add_dynamic_property (const char* name,
 void
 TAO_Property_Exporter::
 add_dynamic_property (const char* name,
-                      CosTradingDynamic::DynamicProp& dp_struct)
+		      CosTradingDynamic::DynamicProp& dp_struct)
 {
   CORBA::ULong tlength = this->tprops_.length ();
-
+  
   if (tlength == this->tcount_)
     this->tprops_.length (tlength + this->increment_);
 
@@ -172,10 +172,10 @@ add_dynamic_property (const char* name,
 void
 TAO_Property_Exporter::
 add_dynamic_property (const char* name,
-                      CosTradingDynamic::DynamicProp* dp_struct)
+ 		      CosTradingDynamic::DynamicProp* dp_struct)
 {
   CORBA::ULong tlength = this->tprops_.length ();
-
+  
   if (tlength == this->tcount_)
     this->tprops_.length (tlength + this->increment_);
 
@@ -186,19 +186,19 @@ add_dynamic_property (const char* name,
 
 
 CosTrading::OfferId
-TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
-                                    const CosTrading::ServiceTypeName type,
-                                    CORBA::Environment& TAO_IN_ENV)
-  TAO_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::Register::InvalidObjectRef,
-                   CosTrading::IllegalServiceType,
-                   CosTrading::UnknownServiceType,
-                   CosTrading::Register::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::MissingMandatoryProperty,
-                   CosTrading::DuplicatePropertyName))
+TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref,
+			       const CosTrading::ServiceTypeName type,
+			       CORBA::Environment& TAO_IN_ENV)
+  TAO_THROW_SPEC ((CORBA::SystemException, 
+		   CosTrading::Register::InvalidObjectRef, 
+		   CosTrading::IllegalServiceType, 
+		   CosTrading::UnknownServiceType, 
+		   CosTrading::Register::InterfaceTypeMismatch, 
+		   CosTrading::IllegalPropertyName, 
+		   CosTrading::PropertyTypeMismatch, 
+		   CosTrading::ReadonlyDynamicProperty, 
+		   CosTrading::MissingMandatoryProperty, 
+		   CosTrading::DuplicatePropertyName))
 {
   CosTrading::Register_var reg = this->lookup_->register_if (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
@@ -206,39 +206,39 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
   // Export the offer to the trader under the given type.
   CosTrading::OfferId offer_id = 0;
   this->tprops_.length (this->tcount_);
-  offer_id = reg->_cxx_export (object_ref, type, this->tprops_, TAO_IN_ENV);
+  offer_id = reg->export (object_ref, type, this->tprops_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
   this->pprops_.length (this->pcount_);
   this->prop_set_->define_properties (this->pprops_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV, offer_id);
-
+  
   return offer_id;
 }
-
+  
 CosTrading::OfferId
-TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
-                                    const CosTrading::ServiceTypeName type,
-                                    const TRADING_REPOS::PropStructSeq& props,
-                                    const TRADING_REPOS::ServiceTypeNameSeq& stypes,
-                                    CORBA::Environment& TAO_IN_ENV)
+TAO_Property_Exporter::export (const CORBA::Object_ptr object_ref,
+			       const CosTrading::ServiceTypeName type,
+			       const TRADING_REPOS::PropStructSeq& props,
+			       const TRADING_REPOS::ServiceTypeNameSeq& stypes,
+			       CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CORBA::SystemException,
-                   CosTrading::IllegalServiceType,
-                   TRADING_REPOS::ServiceTypeExists,
-                   TRADING_REPOS::InterfaceTypeMismatch,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::DuplicatePropertyName,
-                   TRADING_REPOS::ValueTypeRedefinition,
-                   TRADING_REPOS::DuplicateServiceTypeName,
-                   CosTrading::Register::InvalidObjectRef,
-                   CosTrading::Register::InterfaceTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::MissingMandatoryProperty,
-                   CosTrading::DuplicatePropertyName))
+		   CosTrading::IllegalServiceType, 
+		   TRADING_REPOS::ServiceTypeExists, 
+		   TRADING_REPOS::InterfaceTypeMismatch, 
+		   CosTrading::IllegalPropertyName, 
+		   CosTrading::DuplicatePropertyName, 
+		   TRADING_REPOS::ValueTypeRedefinition, 
+		   TRADING_REPOS::DuplicateServiceTypeName,
+		   CosTrading::Register::InvalidObjectRef, 
+		   CosTrading::Register::InterfaceTypeMismatch, 
+		   CosTrading::ReadonlyDynamicProperty, 
+		   CosTrading::MissingMandatoryProperty, 
+		   CosTrading::DuplicatePropertyName))
 {
   CosTrading::Register_var reg;
   CosTrading::OfferId offer_id = 0;
-
+  
   TAO_TRY
     {
       reg = this->lookup_->register_if (TAO_TRY_ENV);
@@ -249,38 +249,35 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
       TAO_CHECK_ENV;
 
 
-
+      
       /***************** UTTER HACK: REMOVE WHEN EXCEPTIONS WORK! ****
       CosTrading::TypeRepository_ptr obj = this->lookup_->type_repos (_env);
 
       ACE_DEBUG ((LM_DEBUG, "Attempting add_type.\n"));
       CosTradingRepos::ServiceTypeRepository_var str =
 
-        CosTradingRepos::ServiceTypeRepository::_narrow (obj, _env);
+	CosTradingRepos::ServiceTypeRepository::_narrow (obj, _env);
       TAO_CHECK_ENV_RETURN (_env, 0);
-
+      
        str->add_type (type,
 
-                     object_ref->_interface_repository_id (),
-                     props,
-                     stypes,
+		     object_ref->_interface_repository_id (),
+		     props,
+		     stypes,
 
-                     _env);
-      TAO_CHECK_ENV_RETURN (_env, 0);
+		     _env);
+      TAO_CHECK_ENV_RETURN (_env, 0);      
       ***************** UTTER HACK: REMOVE WHEN EXCEPTIONS WORK! ****/
 
-
+      
       // Attempt to export the offer.
       ACE_DEBUG ((LM_DEBUG, "Attempting export.\n"));
       this->tprops_.length (this->tcount_);
-      offer_id = reg->_cxx_export (object_ref,
-                                   type,
-                                   this->tprops_,
-                                   TAO_TRY_ENV);
+      offer_id = reg->export (object_ref, type, this->tprops_, TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
-  TAO_CATCH (CosTrading::UnknownServiceType, excp)
-    {
+  TAO_CATCH (CosTrading::UnknownServiceType, excp)    
+    {      
 
 
       cout<<"Within the UnknownServiceType exception"<<endl;
@@ -289,26 +286,23 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
 
       ACE_DEBUG ((LM_DEBUG, "Export failed. Attempting add_type.\n"));
       CosTradingRepos::ServiceTypeRepository_var str =
-        CosTradingRepos::ServiceTypeRepository::_narrow (obj, TAO_IN_ENV);
+	CosTradingRepos::ServiceTypeRepository::_narrow (obj, TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
-
+      
       // If the ServiceTypeName wasn't found, we'll have to add the
       // type to the Service Type repository ourselves.
       str->add_type (type,
-                     object_ref->_interface_repository_id (),
-                     props,
-                     stypes,
-                     TAO_IN_ENV);
+		     object_ref->_interface_repository_id (),
+		     props,
+		     stypes,
+		     TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
 
       // Now we'll try again to register the offer.
       ACE_DEBUG ((LM_DEBUG, "Attempting export again.\n"));
 
       this->tprops_.length (this->tcount_);
-      offer_id = reg->_cxx_export (object_ref,
-                                   type,
-                                   this->tprops_,
-                                   TAO_IN_ENV);
+      offer_id = reg->export (object_ref, type, this->tprops_, TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN (TAO_IN_ENV, 0);
       cout<<"It reached here"<<endl;
 
@@ -318,7 +312,7 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
     {
       // Sigh, all our efforts were for naight.
       TAO_RETHROW_RETURN (0);
-    }
+    }  
   */
   TAO_ENDTRY;
 
@@ -331,8 +325,8 @@ TAO_Property_Exporter::_cxx_export (const CORBA::Object_ptr object_ref,
 
 TAO_Property_Modifier::
 TAO_Property_Modifier (CosTrading::Lookup_var lookup_if,
-                       CosPropertyService::PropertySet_ptr prop_set,
-                       CORBA::ULong initial_size)
+		       CosPropertyService::PropertySet_ptr prop_set,
+		       CORBA::ULong initial_size)
   : increment_ (initial_size),
     lookup_ (lookup_if),
     prop_set_ (prop_set),
@@ -352,7 +346,7 @@ TAO_Property_Modifier::delete_property (const char* name)
 {
   CORBA::ULong plength = this->pdelete_.length (),
     tlength = this->tdelete_.length ();
-
+  
   if (tlength == this->tdcount_)
     this->tdelete_.length (tlength + this->increment_);
 
@@ -371,7 +365,7 @@ TAO_Property_Modifier::modify_property (const char* name, const Any& value)
 {
   CORBA::ULong plength = this->pmodify_.length (),
     tlength = this->tmodify_.length ();
-
+  
   if (tlength == this->tmcount_)
     this->tmodify_.length (tlength + this->increment_);
 
@@ -389,20 +383,20 @@ TAO_Property_Modifier::modify_property (const char* name, const Any& value)
 
 void
 TAO_Property_Modifier::commit (CosTrading::OfferId id,
-                               CORBA::Environment& TAO_IN_ENV)
+			       CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CORBA::SystemException,
-                   CosPropertyService::MultipleExceptions,
-                   CosTrading::NotImplemented,
-                   CosTrading::IllegalOfferId,
-                   CosTrading::UnknownOfferId,
-                   CosTrading::Register::ProxyOfferId,
-                   CosTrading::IllegalPropertyName,
-                   CosTrading::Register::UnknownPropertyName,
-                   CosTrading::PropertyTypeMismatch,
-                   CosTrading::ReadonlyDynamicProperty,
-                   CosTrading::Register::MandatoryProperty,
-                   CosTrading::Register::ReadonlyProperty,
-                   CosTrading::DuplicatePropertyName))
+		   CosPropertyService::MultipleExceptions,
+		   CosTrading::NotImplemented, 
+		   CosTrading::IllegalOfferId, 
+		   CosTrading::UnknownOfferId, 
+		   CosTrading::Register::ProxyOfferId, 
+		   CosTrading::IllegalPropertyName, 
+		   CosTrading::Register::UnknownPropertyName, 
+		   CosTrading::PropertyTypeMismatch, 
+		   CosTrading::ReadonlyDynamicProperty, 
+		   CosTrading::Register::MandatoryProperty, 
+		   CosTrading::Register::ReadonlyProperty, 
+		   CosTrading::DuplicatePropertyName))
 {
   this->tdelete_.length (this->tdcount_);
   this->tmodify_.length (this->tmcount_);
@@ -411,7 +405,7 @@ TAO_Property_Modifier::commit (CosTrading::OfferId id,
 
   CosTrading::Register_var reg = this->lookup_->register_if (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV,);
-
+  
   reg->modify (id, this->tdelete_, this->tmodify_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV,);
 
@@ -421,3 +415,6 @@ TAO_Property_Modifier::commit (CosTrading::OfferId id,
   this->prop_set_->delete_properties (this->pdelete_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN (TAO_IN_ENV,);
 }
+
+
+
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
index 273461d4bd5..4c236f3e8bb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/Property_Exporter.h
@@ -86,9 +86,9 @@ class TAO_Property_Exporter
   void add_dynamic_property (const char* name,
                              CosTradingDynamic::DynamicProp* dp_struct);
 
-  CosTrading::OfferId _cxx_export (const CORBA::Object_ptr object_ref,
-                                   const CosTrading::ServiceTypeName type,
-                                   CORBA::Environment& _env)
+  CosTrading::OfferId export (const CORBA::Object_ptr object_ref,
+                              const CosTrading::ServiceTypeName type,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions,
                      CosTrading::Register::InvalidObjectRef,
@@ -103,11 +103,11 @@ class TAO_Property_Exporter
   // Export the offer to the trader under the given type.
 
   typedef CosTradingRepos::ServiceTypeRepository TRADING_REPOS;
-  CosTrading::OfferId _cxx_export (const CORBA::Object_ptr object_ref,
-                                   const CosTrading::ServiceTypeName type,
-                                   const TRADING_REPOS::PropStructSeq& props,
-                                   const TRADING_REPOS::ServiceTypeNameSeq& stypes,
-                                   CORBA::Environment& _env)
+  CosTrading::OfferId export (const CORBA::Object_ptr object_ref,
+                              const CosTrading::ServiceTypeName type,
+                              const TRADING_REPOS::PropStructSeq& props,
+                              const TRADING_REPOS::ServiceTypeNameSeq& stypes,
+                              CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosPropertyService::MultipleExceptions,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp
index 9e14f732d28..39d4808e002 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/as.cpp
@@ -22,11 +22,11 @@ Audio_Child_Process::init (int argc,
   else if (max_pkt_size == 0)
     max_pkt_size = 1024 * 1024;
     
-  AUDIO_GLOBAL::instance ()->start_time =ACE_OS::time (NULL);
+  AUDIO_GLOBAL::instance ()->start_time = time(NULL);
 
-  AUDIO_GLOBAL::instance ()->fbpara = (AudioFeedBackPara *)ACE_OS::malloc(FBBUF_SIZE);
+  AUDIO_GLOBAL::instance ()->fbpara = (AudioFeedBackPara *)malloc(FBBUF_SIZE);
   if (AUDIO_GLOBAL::instance ()->fbpara == NULL) {
-   ACE_OS::perror ("AS failed to allocate mem for fbpara");
+    perror("AS failed to allocate mem for fbpara");
     return (-1);
   }
 
@@ -34,10 +34,10 @@ Audio_Child_Process::init (int argc,
   if (AUDIO_GLOBAL::instance ()->databuf_size > DATABUF_SIZE)
     AUDIO_GLOBAL::instance ()->databuf_size = DATABUF_SIZE;
   
-  AUDIO_GLOBAL::instance ()->pktbuf = (AudioPacket *)ACE_OS::malloc(sizeof(AudioPacket) + 
+  AUDIO_GLOBAL::instance ()->pktbuf = (AudioPacket *)malloc(sizeof(AudioPacket) + 
                                                      AUDIO_GLOBAL::instance ()->databuf_size);
   if (AUDIO_GLOBAL::instance ()->pktbuf == NULL) {
-   ACE_OS::perror ("AS failed to allocate mem for pktbuf");
+    perror("AS failed to allocate mem for pktbuf");
     return(-1);
   }
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
index f89e174b869..659348337e2 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.cpp
@@ -40,13 +40,13 @@ MMDevice_Exporter_i::connections (void) const
 //   return this->video_mmdevice_;
 // }
 
- CORBA::Object_ptr
+ CORBA::Object_ptr 
 MMDevice_Exporter_i::get_audio_mmdevice (CORBA_Environment &TAO_IN_ENV)
 {
   return CORBA::Object::_duplicate (this->audio_mmdevice_);
 }
 
-CORBA::Object_ptr
+CORBA::Object_ptr 
 MMDevice_Exporter_i::get_video_mmdevice (CORBA_Environment &TAO_IN_ENV)
 {
   return CORBA::Object::_duplicate (this->video_mmdevice_);
@@ -72,7 +72,7 @@ export_properties (TAO_Property_Exporter& prop_exporter)
 int
 MMDevice_Exporter_i::
 define_properties (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
-                   CORBA::ULong offset) const
+		   CORBA::ULong offset) const
 {
   CORBA::ULong num_props = prop_seq.length ();
 
@@ -95,19 +95,19 @@ define_properties (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_s
 AV_Audio_MMDevice::
 AV_Audio_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strategy)
   :TAO_MMDevice (endpoint_strategy)
-
+  
 {
 }
 
 AVStreams::StreamEndPoint_B_ptr
 AV_Audio_MMDevice::
 create_B (AVStreams::StreamCtrl_ptr the_requester,
-          AVStreams::VDev_out the_vdev,
-          AVStreams::streamQoS &the_qos,
-          CORBA::Boolean_out met_qos,
-          char *&named_vdev,
-          const AVStreams::flowSpec &the_spec,
-          CORBA::Environment &env)
+	  AVStreams::VDev_out the_vdev,
+	  AVStreams::streamQoS &the_qos,
+	  CORBA::Boolean_out met_qos,
+	  char *&named_vdev,
+	  const AVStreams::flowSpec &the_spec,
+	  CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Audio_MMDevice::create_B called \n"));
   AVStreams::StreamEndPoint_B_ptr stream_ptr;
@@ -124,7 +124,7 @@ create_B (AVStreams::StreamCtrl_ptr the_requester,
     this->connections_;
   */
   return stream_ptr;
-
+  
 }
 
 
@@ -138,12 +138,12 @@ AV_Video_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strategy)
 AVStreams::StreamEndPoint_B_ptr
 AV_Video_MMDevice::
 create_B (AVStreams::StreamCtrl_ptr the_requester,
-          AVStreams::VDev_out the_vdev,
-          AVStreams::streamQoS &the_qos,
-          CORBA::Boolean_out met_qos,
-          char *&named_vdev,
-          const AVStreams::flowSpec &the_spec,
-          CORBA::Environment &env)
+	  AVStreams::VDev_out the_vdev,
+	  AVStreams::streamQoS &the_qos,
+	  CORBA::Boolean_out met_qos,
+	  char *&named_vdev,
+	  const AVStreams::flowSpec &the_spec,
+	  CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,"(%P|%t) Video_MMDevice::create_B called \n"));
   AVStreams::StreamEndPoint_B_ptr stream_ptr;
@@ -297,13 +297,13 @@ AV_Server_Sig_Handler::remove_names (void)
       /*
       CORBA::Object_var naming_obj = TAO_ORB_Core_instance ()->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);
+	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 (),
-                                           TAO_TRY_ENV);
+	CosNaming::NamingContext::_narrow (naming_obj.in (),
+					   TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Unregister the video_mmdevice with the naming service.
@@ -314,7 +314,7 @@ AV_Server_Sig_Handler::remove_names (void)
 
       // Register the video control object with the naming server.
       naming_context->unbind (video_server_mmdevice_name,
-                              TAO_TRY_ENV);
+			      TAO_TRY_ENV);
       // Unregister the audio_mmdevice with the naming service.
 
       CosNaming::Name audio_server_mmdevice_name (1);
@@ -323,7 +323,7 @@ AV_Server_Sig_Handler::remove_names (void)
 
       // Register the audio control object with the naming server.
       naming_context->unbind (audio_server_mmdevice_name,
-                              TAO_TRY_ENV);
+			      TAO_TRY_ENV);
       */
       this->av_server_.shutdown ();
     }
@@ -396,7 +396,7 @@ AV_Server::on_exit_routine (void)
 // Parses the command line arguments
 int
 AV_Server::parse_args (int argc,
-                       char **argv)
+		       char **argv)
 {
   ACE_Get_Opt get_opts (argc, argv, "rd:s:vamh");
   int c;
@@ -503,8 +503,8 @@ AV_Server::init (int argc,
     {
       env.clear ();
       this->naming_context_->rebind (video_server_mmdevice_name,
-                                     this->video_mmdevice_->_this (env),
-                                     env);
+				     this->video_mmdevice_->_this (env),
+				     env);
       TAO_CHECK_ENV_RETURN (env,-1);
     }
 
@@ -565,7 +565,7 @@ AV_Server::init (int argc,
   // service type.
 
 
-
+ 
   if (this->resolve_trader (env) != -1)
     {
       // Invoke this for each offer.
@@ -621,14 +621,14 @@ AV_Server::export_properties (CORBA::Environment& TAO_IN_ENV)
 
   CosTradingRepos::ServiceTypeRepository::ServiceTypeNameSeq mmdevice_super_types;
   this->mmdevice_offer_id_ =
-    mmdevice_prop_exporter._cxx_export (mmdevice_object_ptr,
-                          (CosTrading::ServiceTypeName) MMDEVICE_SERVICE_TYPE,
+    mmdevice_prop_exporter.export (mmdevice_object_ptr,
+			  (CosTrading::ServiceTypeName) MMDEVICE_SERVICE_TYPE,
                           this->prop_seq_,
                           mmdevice_super_types,
-                          TAO_IN_ENV);
+			  TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-
+ 
 
 }
 
@@ -640,14 +640,14 @@ AV_Server::resolve_trader (CORBA::Environment& TAO_IN_ENV)
       // Bootstrap to the Lookup interface.
       ACE_DEBUG ((LM_ERROR, "Bootstrap to the Lookup interface.\n"));
       CORBA::Object_var trading_obj =
-        this->orb_manager_.orb ()->resolve_initial_references ("TradingService");
+	this->orb_manager_.orb ()->resolve_initial_references ("TradingService");
 
       if (CORBA::is_nil (trading_obj.in ()))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      " (%P|%t) Unable to bootstrap to the Trading Service.\n"));
-          return -1;
-        }
+	{
+	  ACE_ERROR ((LM_ERROR,
+		      " (%P|%t) Unable to bootstrap to the Trading Service.\n"));
+	  return -1;
+	}
 
       // Narrow the lookup interface.
       ACE_DEBUG ((LM_DEBUG, "Narrowing the lookup interface.\n"));
@@ -662,7 +662,7 @@ AV_Server::resolve_trader (CORBA::Environment& TAO_IN_ENV)
     }
   ACE_DEBUG ((LM_DEBUG,"Trader IOR: %s\n",
               this->orb_manager_.orb ()->object_to_string (this->trader_.in (),TAO_IN_ENV)));
-
+              
 }
 
 AV_Server::~AV_Server (void)
@@ -683,14 +683,14 @@ AV_Server::shutdown (void) const
   TAO_TRY
     {
       if (this->trader_.ptr () != 0)
-        {
-          CosTrading::Register_var reg = this->trader_->register_if (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          ACE_DEBUG ((LM_DEBUG, "Withdrawing offer...\n"));
-          reg->withdraw (this->mmdevice_offer_id_.in (), TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
+	{
+	  CosTrading::Register_var reg = this->trader_->register_if (TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+
+	  ACE_DEBUG ((LM_DEBUG, "Withdrawing offer...\n"));
+	  reg->withdraw (this->mmdevice_offer_id_.in (), TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+	}
     }
   TAO_CATCHANY
     {
@@ -705,14 +705,14 @@ main (int argc, char **argv)
   TAO_TRY
     {
       int return_value =
-        AV_SERVER::instance ()->init (argc, argv, TAO_TRY_ENV);
+	AV_SERVER::instance ()->init (argc, argv, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       if (return_value != -1)
-        {
-          AV_SERVER::instance ()->run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
+	{
+	  AV_SERVER::instance ()->run (TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
+	}
     }
   TAO_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
index 48062e494c4..fc2fe1aadeb 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/augmented_server.h
@@ -68,26 +68,26 @@ public:
   static const char* NUMBER_OF_CONNECTIONS;
   static const char* MAX_CONNECTIONS;
   static const char* SERVER_NAME;
-
+  
   AV_Audio_MMDevice (TAO_AV_Endpoint_Process_Strategy *endpoint_strategy);
   // Default constructor
 
   virtual AVStreams::StreamEndPoint_B_ptr
-  create_B (AVStreams::StreamCtrl_ptr the_requester,
-            AVStreams::VDev_out the_vdev,
-            AVStreams::streamQoS &the_qos,
-            CORBA::Boolean_out met_qos,
-            char *&named_vdev,
-            const AVStreams::flowSpec &the_spec,
-            CORBA::Environment &env);
+  create_B (AVStreams::StreamCtrl_ptr the_requester, 
+	    AVStreams::VDev_out the_vdev, 
+	    AVStreams::streamQoS &the_qos, 
+	    CORBA::Boolean_out met_qos, 
+	    char *&named_vdev, 
+	    const AVStreams::flowSpec &the_spec,  
+	    CORBA::Environment &env);
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
-
+ 
 };
 
 class AV_Video_MMDevice
   : public TAO_MMDevice//,
-  //    public TAO_Exportable
+  //    public TAO_Exportable   
 {
 public:
 
@@ -104,15 +104,16 @@ public:
             CORBA::Environment &env);
   // Called by StreamCtrl to create a "B" type streamandpoint and vdev
 
-
+  
 };
 
-class MMDevice_Exporter_i
+class MMDevice_Exporter_i 
   : public POA_MMDevice_Exporter,
     public TAO_Exportable,
     public TAO_PropertySet
 {
-public:
+  
+  public:
   CORBA_Object_ptr audio_mmdevice_;
   CORBA_Object_ptr video_mmdevice_;
 
@@ -125,24 +126,25 @@ public:
   CORBA::ULong connections (void) const;
   // Retrieve the number of connections.
 
-  //   virtual CORBA::Object_ptr audio_mmdevice_reference_ (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
+//   virtual CORBA::Object_ptr audio_mmdevice_reference_ (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
 
-  //   virtual CORBA::Object_ptr video_mmdevice_reference_ (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
+//   virtual CORBA::Object_ptr video_mmdevice_reference_ (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
 
-  virtual CORBA::Object_ptr get_audio_mmdevice (CORBA_Environment &_env = CORBA_Environment::default_environment ());
-  virtual CORBA::Object_ptr get_video_mmdevice (CORBA_Environment &_env = CORBA_Environment::default_environment ());
+  virtual CORBA::Object_ptr get_audio_mmdevice (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
+  virtual CORBA::Object_ptr get_video_mmdevice (CORBA_Environment &_env = CORBA_Environment::default_environment ()); 
 
   virtual void export_properties (TAO_Property_Exporter& prop_exporter);
-
+  
   virtual int define_properties (CosTradingRepos::ServiceTypeRepository::PropStructSeq& prop_seq,
                                  CORBA::ULong offset = 0) const;
-private:
+  
+  private:
   
   CORBA::ULong connections_;
   // Number of active connections
-
-  CORBA::ULong max_connections_;
-
+  
+  CORBA::ULong max_connections_; 
+  
 };
 
 class AV_Server;
@@ -203,7 +205,7 @@ class AV_Server
 public:
 
   static const char* MMDEVICE_SERVICE_TYPE;
-
+  
   AV_Server (void);
   // constructor
 
@@ -250,7 +252,7 @@ private:
 
   CosTrading::Lookup_var trader_;
   // Reference to the Lookup interface of the trading service.
-
+  
   //  CosTrading::OfferId_var audio_offer_id_;
   // Server offer id.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
index e25db66486f..0dc3a36726b 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/svc.conf
@@ -1,6 +1,50 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-###static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+###dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp
index c9f12cc847f..e7440dffe13 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vcrs.cpp
@@ -62,16 +62,16 @@ int session_num = 0;
 static void int_handler(int sig)
 {
   /*
-  fprintf(stderr, "process %d killed by sig %d\n",ACE_OS::getpid (), sig);
+  fprintf(stderr, "process %d killed by sig %d\n", getpid(), sig);
   */
-  ACE_OS::exit (0);
+  exit(0);
 }
 
 static void on_exit_routine(void)
 {
-  if (parentpid !=ACE_OS::getpid ()) {
+  if (parentpid != getpid()) {
     /*
-    fprintf(stderr, "process %d exiting...\n",ACE_OS::getpid ());
+    fprintf(stderr, "process %d exiting...\n", getpid());
     */
     return;
   }
@@ -88,7 +88,7 @@ static void clear_child(int sig)
   int pid;
   int status;
   
-  while ((pid = ACE_OS::waitpid (-1, &status, WNOHANG)) > 0)
+  while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
   {
     session_num --;
     
@@ -141,13 +141,13 @@ main(int argc, char *argv[])
       live_audio = 1;
     }
     else if (!strcmp(argv[i], "-rm")) {
-      ACE_OS::unlink (VCR_UNIX_PORT);
+      unlink(VCR_UNIX_PORT);
     }
     else if (!strncmp(argv[i], "-he", 3)) {
       fprintf(stderr, "Usage: %s [-rt] [-nrt] [-rm]\n", argv[0]);
       fprintf(stderr, "          [-d#int(clock drift in ppm)]\n");
       fprintf(stderr, "          [-s#int(limit on number of sessions)]\n");
-      ACE_OS::exit (1);
+      exit(1);
     }
   }
   if (drift_ppm) {
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
   setsignal(SIGTERM, int_handler);
   setsignal(SIGALRM, SIG_IGN);
   
-  parentpid =ACE_OS::getpid ();
+  parentpid = getpid();
 
   atexit(on_exit_routine);
 
@@ -203,10 +203,10 @@ main(int argc, char *argv[])
 
     if (ComGetConnPair(&cfd, &dfd, &max_pkt_size) == -1) continue;
     
-    if ((serverpid = ACE_OS::fork ()) == -1)
+    if ((serverpid = fork()) == -1)
     {
-     ACE_OS::perror ("VCRS error on creating service process");
-      ACE_OS::exit (1);
+      perror("VCRS error on creating service process");
+      exit(1);
     }
     session_num ++;
     if (serverpid > 0)  /* parent process for forking servers */
@@ -220,17 +220,17 @@ main(int argc, char *argv[])
       if (session_num > session_limit) {
 	time_t t;
 	char *buf;
-	t =ACE_OS::time (NULL);
-	buf = ACE_OS::ctime (&t);
+	t = time(NULL);
+	buf = ctime(&t);
 	buf[strlen(buf) - 1] = 0;
         fprintf(stderr, "VCRS: %s, session_limit %d, session_number %d\n",
 		buf, session_limit, session_num);
       }
       
-      if ((val = ACE_OS::read (cfd, &cmd, 1)) < 0)
+      if ((val = read(cfd, &cmd, 1)) < 0)
       {
-       ACE_OS::perror ("VCRS fails to read command from service socket");
-        ACE_OS::exit (1);
+        perror("VCRS fails to read command from service socket");
+        exit(1);
       }
       if (val == 0) {
 	fprintf(stderr, "Remote client has closed connection.\n");
@@ -258,7 +258,7 @@ main(int argc, char *argv[])
         AudioServer(cfd, dfd, rttag, max_pkt_size);
 	fprintf(stderr, "Weird: audio server returned.\n");
       }
-      ACE_OS::exit (1);
+      exit(1);
     }
   }
 }
diff --git a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp
index ea6f1a82ff2..cb000b9d7a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/mpeg/source/server/vs.cpp
@@ -32,7 +32,7 @@ Video_Child_Process::init (int argc,
   */
   VIDEO_SINGLETON::instance ()->msgsize -= sizeof(VideoMessage);
   
-  VIDEO_SINGLETON::instance ()->start_time =ACE_OS::time (NULL);
+  VIDEO_SINGLETON::instance ()->start_time = time(NULL);
 
   VIDEO_SINGLETON::instance ()->lastRef [0] 
     = VIDEO_SINGLETON::instance ()->lastRef[1] 
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
index c25b22626e2..f0ed402e3f8 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile
@@ -6,7 +6,9 @@
 shared_libs_only=1
 MAKEFILE = Makefile
 LIBNAME  = libavdemo
-SHLIB2   = $(LIBNAME).$(SOEXT)
+SHLIB    = $(LIBNAME).$(SOEXT)
+
+BIN = main
 
 IDL_SRCS= Video_Repository
 
@@ -35,26 +37,13 @@ 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
 
-BIN2 = main
+BUILD	= TAO_VR.module $(VSHLIB) $(VLIB) $(VBIN) 
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
 
 include	$(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  BUILD := TAO_VR.module $(BUILD)
-  BIN = $(BIN2)
-  SHLIB = $(SHLIB2)
-else  # ! AV
-  BUILD =
-  override INSTALL =
-endif # ! AV
-
 include	$(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include	$(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -77,8 +66,11 @@ TAO_VR.module: Video_Repository.idl
 	$(JAVA_ROOT)/bin/idltojava Video_Repository.idl
 	touch TAO_VR.module
 
+clean:
+	-/bin/rm -rf *.o Log $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) Video_Repository.idl $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) \
 	$(addsuffix _T.h, $(IDL_FILES)) $(addsuffix _T.i, $(IDL_FILES)) $(addsuffix _T.cpp, $(IDL_FILES)) 
 
 IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
@@ -320,7 +312,7 @@ IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -559,7 +551,7 @@ IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -799,7 +791,7 @@ IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1055,7 +1047,7 @@ IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am b/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
deleted file mode 100644
index 9a082671544..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- server_discovery directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LTLIBRARIES = libavdemo
-
-libavdemo_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-libavdemo_shared_SOURCES = \
-        Server_Discovery.cpp \
-        Trader_Client.cpp \
-        main.cpp
-
-noinst_HEADERS = \
-        Server_0005fDiscovery_0005fUtil.h \
-        Trader_Client.h
-
-IDL_SOURCES = \
-        Video_Repository.idl
-
-JAVA_SOURCES = \
-        Queue.java \
-        Server_Discovery.java \
-        Server_Discovery_Browser.java \
-        Server_Discovery_Perf.java \
-        Server_Discovery_Selection.java \
-        Server_Discovery_Util.java \
-        Strip_Chart.java
-
-noinst_DATA = \
-        graph02.gif \
-        graph09.gif \
-        mmedia3.gif \
-        server01.gif \
-        server02.gif \
-        www1.gif
-
-EXTRA_DIST = AV_Demo README $(IDL_SOURCES) $(JAVA_SOURCES) $(noinst_DATA)
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
index c40ecf43afb..26c77f8ba3d 100644
--- a/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/server_discovery/Trader_Client.cpp
@@ -107,7 +107,7 @@ Trader_Client::query_trader (void)
 
 
       // Set the query-specific policies.
-      TAO_Policy_Creator policies;
+      TAO_Policy_Manager policies;
       policies.exact_type_match (0);
       policies.search_card (16);
       policies.match_card (16);
@@ -132,7 +132,7 @@ Trader_Client::query_trader (void)
                             TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-
+      
       CosTrading::OfferSeq_var mmdevice_offer_seq (mmdevice_offer_seq_ptr);
       CosTrading::OfferIterator_var mmdevice_offer_iterator (mmdevice_offer_iterator_ptr);
       CosTrading::PolicyNameSeq_var mmdevice_limits_applied (mmdevice_limits_applied_ptr);
@@ -145,7 +145,7 @@ Trader_Client::query_trader (void)
             {
               this->create_hash_table_entry (mmdevice_offer_seq[i]);
             }
-        }
+        } 
 
       if (! CORBA::is_nil (mmdevice_offer_iterator_ptr))
         {
@@ -172,7 +172,7 @@ Trader_Client::query_trader (void)
           TAO_CHECK_ENV;
         }
 
-
+            
     }
 
   TAO_CATCHANY {}
@@ -180,7 +180,7 @@ Trader_Client::query_trader (void)
 }
 
 void
-Trader_Client::load_movie (const char* mmdevice_server_name,
+Trader_Client::load_movie (const char* mmdevice_server_name, 
                            TAO_VR::Movie* selected_movie_info)
 {
   // Open a unix socket to the controller process of the AV client,
@@ -203,7 +203,7 @@ Trader_Client::load_movie (const char* mmdevice_server_name,
 
           CORBA::Object_ptr mmdevice_reference = mmdevice_entry->int_id_;
           CORBA::String_var server_ior = this->orb_manager_.orb ()->object_to_string (mmdevice_reference,
-                                                                                      TAO_TRY_ENV);
+                                                                                      TAO_TRY_ENV); 
           cout<<"The audio file name "<<selected_movie_info->audio_filename_<<endl;
           cout<<"The video file name "<<selected_movie_info->video_filename_<<endl;
           ACE_DEBUG ((LM_DEBUG,"mmdevice ior is :%s\n",server_ior.in ()));
@@ -216,11 +216,11 @@ Trader_Client::load_movie (const char* mmdevice_server_name,
           TAO_CHECK_ENV;
 
           CORBA::String_var audio_ior = this->orb_manager_.orb ()->object_to_string (audio_object_ptr,
-                                                                                      TAO_TRY_ENV);
+                                                                                      TAO_TRY_ENV); 
           TAO_CHECK_ENV;
           ACE_DEBUG ((LM_DEBUG,"AUDIO mmdevice ior is :%s\n",audio_ior.in ()));
           CORBA::String_var video_ior = this->orb_manager_.orb ()->object_to_string (video_object_ptr,
-                                                                                      TAO_TRY_ENV);
+                                                                                      TAO_TRY_ENV); 
           TAO_CHECK_ENV;
           ACE_DEBUG ((LM_DEBUG,"VIDEO mmdevice ior is :%s\n",video_ior.in ()));
 
@@ -229,11 +229,11 @@ Trader_Client::load_movie (const char* mmdevice_server_name,
                                           video_object_ptr,
                                           selected_movie_info->video_filename_,
                                           TAO_TRY_ENV);
-
+         
           TAO_CHECK_ENV;
         }
 
-
+      
     }
   TAO_CATCHANY
     {
@@ -378,7 +378,7 @@ Trader_Client::create_hash_table_entry (CosTrading::Offer& offer)
 //   CosTrading::Offer *offer;
 //   ACE_NEW (offer,
 //            CosTrading::Offer (offer_src));
-
+      
   Property_Map* prop_map = 0;
   ACE_NEW (prop_map, Property_Map);
   TAO_TRY
@@ -404,7 +404,7 @@ Trader_Client::create_hash_table_entry (CosTrading::Offer& offer)
             }
             else cout<<"Movie Info not found"<<endl;
           }
-          */
+          */  
         }
 
       Property_Map::ENTRY* entry = 0;
@@ -414,12 +414,12 @@ Trader_Client::create_hash_table_entry (CosTrading::Offer& offer)
         {
           entry->int_id_.value >>= server_name_string;
           this->mmdevice_map_.bind (server_name_string, prop_map);
-
+          
           TAO_String_Hash_Key server_reference_key (server_name_string);
           CORBA::String_var server_ior = this->orb_manager_.orb ()->object_to_string (offer.reference,
                                                                                       TAO_TRY_ENV);
           TAO_CHECK_ENV;
-
+         
           this->mmdevice_reference_map_.bind (server_reference_key,
                                               CORBA::Object::_duplicate (offer.reference));
         }
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
deleted file mode 100644
index 9f72c4e7fc4..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Top-level Makefile for the SFP test of the TAO ORB
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-LDLIBS    =  -lorbsvcs -lTAO -lACE
-
-PROG_SRCS =  client.cpp server.cpp
-
-LSRC = $(PROG_SRCS)
-
-AVStreams_SERVER_OBJS = server.o
-AVStreams_CLIENT_OBJS = client.o
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = client server
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (AV,$(findstring AV,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # AV
-
-#----------------------------------------------------------------------------
-#       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.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-DCFLAGS = -g
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
-
-server:$(addprefix $(VDIR),$(AVStreams_SERVER_OBJS))
-	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS)
-
-client:$(addprefix $(VDIR),$(AVStreams_CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@@ $^ $(VLDLIBS)
-
-#main: $(addprefix $(VDIR), $(COSPROPERTY_OBJS))
-#	$(LINK.cc) $(LDFAGS) -o $@@ $^ $(VLDLIBS)
-
-# realclean: clean
-#	-$(RM)
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am b/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
deleted file mode 100644
index 26680175d8c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for TAO's AVStreams Tests -- sfp directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = client server
-
-client_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-server_LDADD = \
-	$(top_builddir)/ace/libACE.la $(top_builddir)/TAO/tao/libTAO.la
-
-client_SOURCES = \
-        client.cpp
-
-server_SOURCES = \
-        server.cpp
-
-noinst_HEADERS = \
-        common.h
-
-EXTRA_DIST = README
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/README b/TAO/orbsvcs/tests/AVStreams/sfp/README
deleted file mode 100644
index 50c0583395c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/README
+++ /dev/null
@@ -1,16 +0,0 @@
-This directory contains the test server and client for 
-the SFP implementation in
-
-$TAO_ROOT/orbsvcs/orbsvcs/AV/
-
-To test a simple frame transfer:
-================================
-
-just run the server and client 
-
-To test a large frame transfer with fragmentation:
-==================================================
-
-Run the server 
-
-Run the client with the -f option.
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp b/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
index d0aeb51d306..1973003e689 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/client.cpp
@@ -4,17 +4,13 @@
 #include "ace/Event_Handler.h"
 
 char *data = "Hello how are you";
-int fragment = 0;
 
 class frame_handler: public ACE_Event_Handler
 {
   public:
 
-  frame_handler (TAO_SFP *sfp,
-                 CORBA_ORB_ptr orb,
-                 ACE_Reactor *reactor)
-    :sfp_ (sfp),
-     orb_ (orb)
+  frame_handler (ACE_Reactor* reactor,SFP *sfp)
+    :sfp_ (sfp)
     {
       reactor->schedule_timer (this,
                                0,
@@ -26,42 +22,38 @@ class frame_handler: public ACE_Event_Handler
                       const void *arg = 0)
     {
        ACE_DEBUG ((LM_DEBUG,"frame_handler:handle_timeout\n"));
-       if (fragment)
-         {
-           size_t mb_len = SFP_MAX_PACKET_SIZE*2;
-           ACE_DEBUG ((LM_DEBUG,"message block size = %d\n",mb_len));
-           ACE_Message_Block mb (mb_len);
-           int i =0;
-           char c = 'a';
-           for (char *ptr = mb.rd_ptr ();i<2;i++,c++,ptr+=SFP_MAX_PACKET_SIZE)
-             ACE_OS::memset (ptr,c,SFP_MAX_PACKET_SIZE);
-           
-           mb.wr_ptr (mb_len);
-           int result = this->sfp_->send_frame (&mb);
-           if (result != -1)
-             ACE_DEBUG ((LM_DEBUG,"simple_frame sent\n"));
-           else
-             ACE_DEBUG ((LM_DEBUG,"simple_frame send failed\n"));
-         }
+       ACE_Message_Block mb (data,
+                              ACE_OS::strlen (data),
+                              -1);
+       mb.wr_ptr (ACE_OS::strlen (data));
+       int result = this->sfp_->send_simple_frame (&mb);
+       if (result != -1)
+         ACE_DEBUG ((LM_DEBUG,"simple_frame sent\n"));
        else
-         {
-           ACE_Message_Block mb (data,
-                                 ACE_OS::strlen (data));
-           mb.wr_ptr (ACE_OS::strlen (data));
-           int result = this->sfp_->send_frame (&mb);
-           if (result != -1)
-             ACE_DEBUG ((LM_DEBUG,"simple_frame sent\n"));
-           else
-             ACE_DEBUG ((LM_DEBUG,"simple_frame send failed\n"));
-         }
-       this->sfp_->end_stream ();
-       this->orb_->shutdown ();
+         ACE_DEBUG ((LM_DEBUG,"simple_frame send failed\n"));
        return 0;
+//        ACE_DEBUG ((LM_DEBUG,"frame_handler:handle_timeout\n"));
+//        char *buf;
+//        ACE_NEW_RETURN (buf,
+//                        char [4*ACE_MAX_DGRAM_SIZE],
+//                        -1);
+//        ACE_Message_Block mb (buf,
+//                              4*ACE_MAX_DGRAM_SIZE);
+//        //       mb.wr_ptr (ACE_OS::strlen (data));
+//        mb.wr_ptr (4*ACE_MAX_DGRAM_SIZE);
+//        //       int result = this->sfp_->send_simple_frame (&mb);
+//        int result = this->sfp_->send_frame (&mb);
+//        if (result != -1)
+//          ACE_DEBUG ((LM_DEBUG,"simple_frame sent\n"));
+//        else
+//          ACE_DEBUG ((LM_DEBUG,"simple_frame send failed\n"));
+//        return 0;
+
     }
 
-private:
-  TAO_SFP *sfp_;
-  CORBA_ORB_ptr orb_;
+  private:
+  
+  SFP *sfp_;
 };
 
 int
@@ -71,13 +63,9 @@ main (int argc, char **argv)
   
   orb_manager.init (argc,argv);
 
-  if (argc > 1)
-    if (ACE_OS::strcmp (argv[1],"-f") == 0)
-      fragment = 1;
-    
   ACE_Time_Value timeout1 (5),timeout2 (50);
 
-  TAO_SFP sfp (orb_manager.orb (),
+  SFP sfp (orb_manager.orb (),
            TAO_ORB_Core_instance ()->reactor (),
            timeout1,
            timeout2,
@@ -89,9 +77,8 @@ main (int argc, char **argv)
   if (result != 0)
     ACE_ERROR_RETURN ((LM_ERROR,"sfp start failed\n"),1);
 
-  frame_handler handler (&sfp,
-                         orb_manager.orb (),
-                         TAO_ORB_Core_instance ()->reactor ());
+  frame_handler handler (TAO_ORB_Core_instance ()->reactor (),
+                         &sfp);
 
   result = orb_manager.run ();
   if (result == 0)
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/common.h b/TAO/orbsvcs/tests/AVStreams/sfp/common.h
index dbbdc597fb6..8fdabdedafd 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/common.h
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/common.h
@@ -7,6 +7,6 @@
 #include "orbsvcs/AV/sfp.h"
 #include "tao/TAO.h"
 
-const char *server_addr = "calypso.cs.wustl.edu:10000";
+const char *server_addr = "tango.cs.wustl.edu:10000";
 
 #endif /* _COMMON_H_ */
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp b/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
index d0053a0e8fc..454ba126a3b 100644
--- a/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/sfp/server.cpp
@@ -5,10 +5,6 @@
 class mySFP_Callback: public SFP_Callback
 {
   public:
-  mySFP_Callback (CORBA_ORB_ptr orb)
-    :orb_ (orb)
-    {
-    }
   // This is called for both active and passive start.
   virtual int start_failed (void) 
     {
@@ -22,28 +18,16 @@ class mySFP_Callback: public SFP_Callback
       return 0;
     }  
 
-  virtual void end_stream (void)
-    {
-      this->orb_->shutdown ();
-    }
-
   virtual int receive_frame (ACE_Message_Block *frame)
     {
       ACE_DEBUG ((LM_DEBUG,"mySFP_Callback:receive_frame\n"));
-      ACE_Message_Block *block = frame;
-      while (block != 0)
-        {
-          char *buf =block->rd_ptr ();
-          ACE_DEBUG ((LM_DEBUG,"length of buf = %d\n",block->length ()));
-          for (u_int i=0;i<block->length ();i++)
-            ACE_DEBUG ((LM_DEBUG,"%c ",buf[i]));
-          ACE_DEBUG ((LM_DEBUG,"\n"));
-          block = block->cont ();
-        }
+      char *buf =frame->rd_ptr ();
+      ACE_DEBUG ((LM_DEBUG,"length of buf = %d\n",frame->length ()));
+      for (int i=0;i<frame->length ();i++)
+        ACE_DEBUG ((LM_DEBUG,"%c ",buf[i]));
+      ACE_DEBUG ((LM_DEBUG,"\n"));
       return 0;
     }
-    private:
-      CORBA_ORB_ptr orb_;
 };
 
 int
@@ -55,12 +39,12 @@ main (int argc, char **argv)
 
   ACE_Time_Value timeout1 (5),timeout2 (50);
 
-  mySFP_Callback callback (orb_manager.orb ());
-  TAO_SFP sfp (orb_manager.orb (),
-               TAO_ORB_Core_instance ()->reactor (),
-               timeout1,
-               timeout2,
-               &callback);
+  mySFP_Callback callback;
+  SFP sfp (orb_manager.orb (),
+           TAO_ORB_Core_instance ()->reactor (),
+           timeout1,
+           timeout2,
+           &callback);
 
   int result;
   // passive start.
diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_client.dsp b/TAO/orbsvcs/tests/AVStreams/sfp/sfp_client.dsp
deleted file mode 100644
index 31d05de103c..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_client.dsp
+++ /dev/null
@@ -1,95 +0,0 @@
-# Microsoft Developer Studio Project File - Name="sfp_client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=sfp_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 NMAKE /f "sfp_client.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 "sfp_client.mak" CFG="sfp_client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "sfp_client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "sfp_client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "sfp_client - 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 /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 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "sfp_client - 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 "..\..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "sfp_client - Win32 Release"

-# Name "sfp_client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\common.h

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_tests.dsw b/TAO/orbsvcs/tests/AVStreams/sfp/sfp_tests.dsw
deleted file mode 100644
index 8473e5ba184..00000000000
--- a/TAO/orbsvcs/tests/AVStreams/sfp/sfp_tests.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "sfp_client"=.\sfp_client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "sfp_server"=.\sfp_server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/AVStreams/svc.conf b/TAO/orbsvcs/tests/AVStreams/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/AVStreams/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
index c43f62fd4ad..b34f36d88df 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp
@@ -63,7 +63,7 @@ CC_Command::GetLockSet(char *lock_set_name, CORBA::Environment &TAO_IN_ENV)
           if(cc_lockset_.in()==0)
             {
               TAO_TRY_ENV.clear();
-              TAO_TRY_ENV.exception (new CORBA::UNKNOWN ());
+              TAO_TRY_ENV.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_NO));
             }
           else
             return cc_lockset_;
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
index 31fe4279211..f0d9a7ff46e 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp
@@ -44,7 +44,7 @@ CC_naming_service::Init(CORBA::ORB_var orb, CORBA::Environment &TAO_IN_ENV)
 
   int success = init_naming_service ();
   if(success<0)
-    TAO_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
 }
 
 CC_naming_service::~CC_naming_service (void)
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile b/TAO/orbsvcs/tests/Concurrency/Makefile
index 04bf89ff10d..012f78eb0ce 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile
@@ -1,13 +1,13 @@
 #----------------------------------------------------------------------------
 #
-#       $Id$
+#	$Id$
 #
-#       Makefile for the concurrency service test.
+#	Makefile for the concurrency service test.
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -17,29 +17,22 @@ endif # ! TAO_ROOT
 LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = CC_client.cpp CC_tests.cpp CC_naming_service.cpp \
-                tmplinst.cpp CC_command.tab.cpp \
-                lex.CC_command.cpp CC_command.cpp CC_test_utils.cpp
+		tmplinst.cpp CC_command.tab.cpp \
+		lex.CC_command.cpp CC_command.cpp CC_test_utils.cpp
 
 LSRC = $(PROG_SRCS)
 
 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
+		CC_command.tab.o lex.CC_command.o \
+		CC_command.o CC_test_utils.o
 
+BIN = CC_client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
-BIN2 = CC_client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Concurrency,$(findstring Concurrency,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Concurrency
-
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -51,13 +44,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
-lex.CC_command.cpp:     CC_command.l CC_command.tab.h
+lex.CC_command.cpp:	CC_command.l CC_command.tab.h
 	@echo "WARNING: Potentially outdated lex.CC_command.cpp"
 	@echo "         either touch(1) the file or explicitly"
 	@echo "         generate it using:"
@@ -68,7 +61,6 @@ lex.CC_command.cpp:     CC_command.l CC_command.tab.h
 lex.CC_command.cpp.target:
 		$(LEX) -t -I CC_command.l > /tmp/$(USER).CC_L1
 		sed -e "s/unistd/stdio/g" \
-	        -e "s/\\$$\(Header[^$$]*\) \\$$/\\1/" \
 		-e "s/yy/ace_cc_yy/g" \
 		-e "s/YY/ACE_CC_YY/g" \
 		-e "s/free( ptr );/free( ACE_MALLOC_T (ptr) );/g" \
@@ -81,7 +73,7 @@ lex.CC_command.cpp.target:
 		patch < lex.CC_command.cpp.diff
 		$(RM) -f /tmp/$(USER).CC_L1 /tmp/$(USER).CC_L2
 
-CC_command.tab.cpp CC_command.tab.h: CC_command.y
+CC_command.tab.cpp CC_command.tab.h:	CC_command.y
 	@echo "WARNING: Potentially outdated CC_command.tab.cpp"
 	@echo "         either touch(1) the file or explicitly "
 	@echo "         generate it using:"
@@ -103,12 +95,9 @@ CC_command.tab: CC_command.y
 		cp /tmp/$(USER).CC_YH CC_command.tab.h
 		$(RM) -f /tmp/$(USER).CC_Y  /tmp/$(USER).CC_YH y.tab.c y.tab.h
 
-CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
+CC_client:	$(addprefix $(VDIR),$(CC_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -118,6 +107,9 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -170,8 +162,7 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- CC_client.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ CC_client.h $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -185,309 +176,53 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosConcurrencyControlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- CC_tests.h CC_naming_service.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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 \
- CC_command.h CC_command.tab.h
-.obj/CC_tests.o .obj/CC_tests.so .shobj/CC_tests.o .shobj/CC_tests.so: CC_tests.cpp CC_tests.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/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/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 \
- $(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.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/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 \
@@ -514,52 +249,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -568,31 +257,22 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -614,8 +294,11 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -632,87 +315,66 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- CC_naming_service.h \
+ CC_tests.h CC_naming_service.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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/CC_naming_service.o .obj/CC_naming_service.so .shobj/CC_naming_service.o .shobj/CC_naming_service.so: CC_naming_service.cpp CC_naming_service.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ CC_command.h CC_command.tab.h
+.obj/CC_tests.o .obj/CC_tests.so .shobj/CC_tests.o .shobj/CC_tests.so: CC_tests.cpp CC_tests.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -776,308 +438,53 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/CosConcurrencyControlC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.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/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/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 \
- $(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.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/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 \
@@ -1104,52 +511,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1158,31 +519,22 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1204,8 +556,11 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1222,72 +577,65 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
-.obj/CC_command.tab.o .obj/CC_command.tab.so .shobj/CC_command.tab.o .shobj/CC_command.tab.so: CC_command.tab.cpp CC_command.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ CC_naming_service.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/CC_naming_service.o .obj/CC_naming_service.so .shobj/CC_naming_service.o .shobj/CC_naming_service.so: CC_naming_service.cpp CC_naming_service.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1351,294 +699,53 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
-.obj/lex.CC_command.o .obj/lex.CC_command.so .shobj/lex.CC_command.o .shobj/lex.CC_command.so: lex.CC_command.cpp \
- $(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/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/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 \
- CC_command.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.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/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/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/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 \
@@ -1665,52 +772,6 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1719,312 +780,22 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- CC_command.tab.h
-.obj/CC_command.o .obj/CC_command.so .shobj/CC_command.o .shobj/CC_command.so: CC_command.cpp CC_command.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2046,8 +817,11 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2064,68 +838,42 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
- CC_test_utils.h CC_naming_service.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
@@ -2134,19 +882,27 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
- $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/Process.i
-.obj/CC_test_utils.o .obj/CC_test_utils.so .shobj/CC_test_utils.o .shobj/CC_test_utils.so: CC_test_utils.cpp CC_test_utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
+.obj/CC_command.tab.o .obj/CC_command.tab.so .shobj/CC_command.tab.o .shobj/CC_command.tab.so: CC_command.tab.cpp CC_command.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i
+.obj/lex.CC_command.o .obj/lex.CC_command.so .shobj/lex.CC_command.o .shobj/lex.CC_command.so: lex.CC_command.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2161,265 +917,35 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ CC_command.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ CC_command.tab.h
+.obj/CC_command.o .obj/CC_command.so .shobj/CC_command.o .shobj/CC_command.so: CC_command.cpp CC_command.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
+ CC_test_utils.h CC_naming_service.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.i
+.obj/CC_test_utils.o .obj/CC_test_utils.so .shobj/CC_test_utils.o .shobj/CC_test_utils.so: CC_test_utils.cpp CC_test_utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosConcurrencyControlC.i \
  CC_naming_service.h \
@@ -2431,11 +957,12 @@ CC_client: $(addprefix $(VDIR),$(CC_CLT_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index f7f038d703e..ccbf30b8145 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -220,13 +220,10 @@ static char *ace_cc_yy_c_buf_p = (char *) 0;
 static int ace_cc_yy_init = 1;		/* whether we need to initialize */
 static int ace_cc_yy_start = 0;	/* start state number */
 
-#define ace_cc_yywrap() 1
 /* Flag which is used to allow ace_cc_yywrap()'s to do buffer switches
  * instead of setting up a fresh ace_cc_yyin.  A bit of a hack ...
  */
-#if (ace_cc_yywrap() != 1)
 static int ace_cc_yy_did_buffer_switch_on_eof;
-#endif
 
 void ace_cc_yyrestart ACE_CC_YY_PROTO(( FILE *input_file ));
 
@@ -265,6 +262,7 @@ static void ace_cc_yy_flex_free ACE_CC_YY_PROTO(( void * ));
 #define ACE_CC_YY_AT_BOL() (ace_cc_yy_current_buffer->ace_cc_yy_at_bol)
 
 
+#define ace_cc_yywrap() 1
 #define ACE_CC_YY_SKIP_ACE_CC_YYWRAP
 typedef unsigned char ACE_CC_YY_CHAR;
 FILE *ace_cc_yyin = (FILE *) 0, *ace_cc_yyout = (FILE *) 0;
@@ -912,9 +910,7 @@ case ACE_CC_YY_STATE_EOF(INITIAL):
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-#if (ace_cc_yywrap() != 1)
 				ace_cc_yy_did_buffer_switch_on_eof = 0;
-#endif
 
 				if ( ace_cc_yywrap() )
 					{
@@ -935,10 +931,8 @@ case ACE_CC_YY_STATE_EOF(INITIAL):
 
 				else
 					{
-#if (ace_cc_yywrap() != 1)
 					if ( ! ace_cc_yy_did_buffer_switch_on_eof )
 						ACE_CC_YY_NEW_FILE;
-#endif
 					}
 				break;
 				}
@@ -1339,9 +1333,7 @@ ACE_CC_YY_BUFFER_STATE new_buffer;
 	 * is looked at is after ace_cc_yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-#if (ace_cc_yywrap() != 1)
 	ace_cc_yy_did_buffer_switch_on_eof = 1;
-#endif
 	}
 
 
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
index 452fa41b389..b6693643ce7 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp.diff
@@ -1,35 +1,6 @@
---- lex.CC_command.cpp.orig	Fri May 14 07:09:18 1999
-+++ lex.CC_command.cpp	Fri May 14 06:45:48 1999
-@@ -1,5 +1,5 @@
- /* A lexical scanner generated by flex */
--
-+// $Id$
- /* Scanner skeleton version:
-  * Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp
-  */
-@@ -220,10 +220,13 @@
- static int ace_cc_yy_init = 1;		/* whether we need to initialize */
- static int ace_cc_yy_start = 0;	/* start state number */
-
-+#define ace_cc_yywrap() 1
- /* Flag which is used to allow ace_cc_yywrap()'s to do buffer switches
-  * instead of setting up a fresh ace_cc_yyin.  A bit of a hack ...
-  */
-+#if (ace_cc_yywrap() != 1)
- static int ace_cc_yy_did_buffer_switch_on_eof;
-+#endif
-
- void ace_cc_yyrestart ACE_CC_YY_PROTO(( FILE *input_file ));
-
-@@ -262,7 +265,6 @@
- #define ACE_CC_YY_AT_BOL() (ace_cc_yy_current_buffer->ace_cc_yy_at_bol)
-
-
--#define ace_cc_yywrap() 1
- #define ACE_CC_YY_SKIP_ACE_CC_YYWRAP
- typedef unsigned char ACE_CC_YY_CHAR;
- FILE *ace_cc_yyin = (FILE *) 0, *ace_cc_yyout = (FILE *) 0;
-@@ -709,110 +711,110 @@
+--- lex.CC_command.cpp.orig	Fri Jun 19 16:04:06 1998
++++ lex.CC_command.cpp	Fri Jun 19 16:04:24 1998
+@@ -709,110 +709,110 @@
  ACE_CC_YY_RULE_SETUP
  #line 30 "CC_command.l"
  return T_TERM;
@@ -161,40 +132,19 @@
  case 22:
  ACE_CC_YY_RULE_SETUP
  #line 54 "CC_command.l"
-@@ -910,7 +912,9 @@
- 			{
- 			case EOB_ACT_END_OF_FILE:
- 				{
-+#if (ace_cc_yywrap() != 1)
- 				ace_cc_yy_did_buffer_switch_on_eof = 0;
-+#endif
-
- 				if ( ace_cc_yywrap() )
- 					{
-@@ -931,8 +935,10 @@
-
- 				else
- 					{
-+#if (ace_cc_yywrap() != 1)
- 					if ( ! ace_cc_yy_did_buffer_switch_on_eof )
- 						ACE_CC_YY_NEW_FILE;
-+#endif
- 					}
- 				break;
- 				}
-@@ -1216,7 +1222,7 @@
+@@ -1216,7 +1216,7 @@
  	}
  #endif	/* ifndef ACE_CC_YY_NO_UNPUT */
-
+ 
 -
 +#ifndef ACE_CC_YY_NO_INPUT
  #ifdef __cplusplus
  static int ace_cc_yyinput()
  #else
-@@ -1265,13 +1271,13 @@
+@@ -1265,13 +1265,13 @@
  					if ( ace_cc_yywrap() )
  						return EOF;
-
+ 
 -					if ( ! ace_cc_yy_did_buffer_switch_on_eof )
 +                                        /*					if ( ! ace_cc_yy_did_buffer_switch_on_eof )
  						ACE_CC_YY_NEW_FILE;
@@ -205,21 +155,13 @@
 -#endif
 +                                        #endif */
  					}
-
+ 
  				case EOB_ACT_CONTINUE_SCAN:
-@@ -1289,6 +1295,7 @@
-
+@@ -1289,6 +1289,7 @@
+ 
  	return c;
  	}
 +#endif /* ! ACE_CC_YY_NO_INPUT */
-
-
+ 
+ 
  #ifdef ACE_CC_YY_USE_PROTOS
-@@ -1332,7 +1339,9 @@
- 	 * is looked at is after ace_cc_yywrap() is called, so it's safe
- 	 * to go ahead and always set it.
- 	 */
-+#if (ace_cc_yywrap() != 1)
- 	ace_cc_yy_did_buffer_switch_on_eof = 1;
-+#endif
- 	}
diff --git a/TAO/orbsvcs/tests/Concurrency/svc.conf b/TAO/orbsvcs/tests/Concurrency/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/Concurrency/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp b/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp
index 175a5fda746..a3b69b11354 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.cpp
@@ -5,84 +5,78 @@
 
 void
 CosECConsumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::ORB_var orb,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_TRY_ENV)
 {
-  this->orb_ = orb;
-
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    event_channel->for_consumers (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECConsumer::close (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::close (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->disconnect (TAO_TRY_ENV);
   this->consumer_admin_ =
     CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-CosECConsumer::connect (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::connect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_this (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::disconnect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 }
 
 void
-CosECConsumer::push (const CORBA::Any &,
-                     CORBA::Environment &)
+CosECConsumer::push (const CORBA::Any &data,
+                     CORBA::Environment &TAO_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "in CosECConsumer::push\n"));
-  this->orb_->shutdown ();
 }
 
 void
-CosECConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
 {
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.h b/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.h
index d7e76f1a4fd..ff9fefb9092 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.h
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosECConsumer.h
@@ -33,31 +33,27 @@ class CosECConsumer : public POA_CosEventComm::PushConsumer
 
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::ORB_var orb,
-             CORBA::Environment& ACE_TRY_ENV);
+             CORBA::Environment& TAO_TRY_ENV);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CORBA::Environment &TAO_TRY_ENV);
   // Connect the CosECConsumer to the EventChannel.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_TRY_ENV);
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
   // disconnect the consumer from the EC.
 
 private:
-  CORBA::ORB_var orb_;
-  // The orb that we as using.
-
   CosEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC using this proxy.
 
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp b/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp
index e85157ac68f..30731b04f33 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.cpp
@@ -5,51 +5,49 @@
 
 void
 CosECSupplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_TRY_ENV)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    event_channel->for_suppliers (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::close (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::close (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->disconnect (TAO_TRY_ENV);
   this->supplier_admin_ =
     CosEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
-CosECSupplier::connect (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::connect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosEventComm::PushSupplier_var objref = this->_this (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::disconnect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -57,27 +55,26 @@ CosECSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
 void
 CosECSupplier::send_event (const CORBA::Any & data,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_TRY_ENV)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->push (data, TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
 {
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.h b/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.h
index 620ae70c8bc..f7a6d4339bf 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.h
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosECSupplier.h
@@ -32,22 +32,22 @@ class CosECSupplier : public POA_CosEventComm::PushSupplier
   //   the CosEC and sends events to it.
 public:
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment &ACE_TRY_ENV);
+             CORBA::Environment &TAO_TRY_ENV);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CORBA::Environment &TAO_TRY_ENV);
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC, but do not forget about it or close it.
 
   void send_event (const CORBA::Any &data,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_TRY_ENV);
   // Send one event.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // The POA_CosEventComm::PushSupplier method.
 
 private:
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
index 5cde9839a46..17358a94bb1 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.cpp
@@ -18,7 +18,9 @@ main (int argc, char *argv [])
 }
 
 CosEC_Basic::CosEC_Basic (void)
-  : ec_impl_ (0)
+  : ec_impl_ (0,
+             ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+             &module_factory_)
 {
   // No-Op.
 }
@@ -31,20 +33,17 @@ CosEC_Basic::~CosEC_Basic (void)
 int
 CosEC_Basic::init_ORB  (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     "",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       CORBA::Object_var poa_object  =
         this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                               TAO_TRY_ENV);
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
@@ -52,44 +51,39 @@ CosEC_Basic::init_ORB  (int argc, char *argv [])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                            "Exception in CosEC_Basic::init_ORB");
+      TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_ORB");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+  TAO_ENDTRY;
 }
 
 int
 CosEC_Basic::init_RtEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+  TAO_TRY
     {
       this->scheduler_ =
-        this->scheduler_impl_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->scheduler_impl_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       CORBA::String_var str =
         this->orb_->object_to_string (this->scheduler_.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The (local) scheduler IOR is <%s>\n",
@@ -98,55 +92,46 @@ CosEC_Basic::init_RtEC (void)
       if (ACE_Scheduler_Factory::server (this->scheduler_.in ()) == -1)
         return -1;
 
-      ACE_NEW_RETURN(this->ec_impl_, ACE_EventChannel (0,
-                                                       ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-                                                       &module_factory_), -1);
-      this->rtec_ = this->ec_impl_->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->rtec_ = this->ec_impl_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       str = this->orb_->object_to_string (this->rtec_.in (),
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       ACE_DEBUG ((LM_DEBUG,
                   "EC_Basic: The RTEC IOR is <%s>\n",
                   str.in ()));
 
-      this->ec_impl_->activate ();
+      this->ec_impl_.activate ();
 
       return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Basic::init_RtEC");
+      TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_RtEC");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+  TAO_ENDTRY;
 }
 
 int
 CosEC_Basic::init_CosEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-    ACE_TRY
+  TAO_TRY
     {
       // Setup the QOS params..
       this->supplier_qos_.insert (1,
                                   ACE_ES_EVENT_ANY,
                                   this->scheduler_->create ("supplier",
-                                                            ACE_TRY_ENV),
+                                                            TAO_TRY_ENV),
                                   1);
-      ACE_TRY_CHECK;
 
       this->consumer_qos_.start_disjunction_group ();
       this->consumer_qos_.insert_source (1,
                                          this->scheduler_->create ("consumer",
-                                                                   ACE_TRY_ENV));
-      ACE_TRY_CHECK;
+                                                                   TAO_TRY_ENV));
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       const RtecEventChannelAdmin::ConsumerQOS &consumerqos =
         this->consumer_qos_.get_ConsumerQOS ();
@@ -156,34 +141,30 @@ CosEC_Basic::init_CosEC (void)
 
       if (this->ec_i_.init (consumerqos,
                             supplierqos,
-                            this->rtec_.in (),
-                            ACE_TRY_ENV) != 0)
+                            this->rtec_,
+                            TAO_TRY_ENV) != 0)
         return -1;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
-      this->cos_ec_ = this->ec_i_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->cos_ec_ = this->ec_i_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Basic::init_CosEC");
+      TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_CosEC");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+  TAO_ENDTRY;
 }
 
 int
 CosEC_Basic::init  (int argc, char *argv [])
 {
-  if (init_ORB (argc, argv) == -1
-      || init_RtEC () == -1
+  if (init_ORB (argc, argv) == -1 
+      || init_RtEC () == -1 
       || init_CosEC () == -1)
     return -1;
   else
@@ -193,35 +174,25 @@ CosEC_Basic::init  (int argc, char *argv [])
 void
 CosEC_Basic::shutdown (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      this->supplier_.close (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->supplier_.close (TAO_TRY_ENV);
+      this->consumer_.close (TAO_TRY_ENV);
 
-      this->consumer_.close (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->cos_ec_->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->ec_impl_->shutdown ();
-      delete this->ec_impl_;
+      this->cos_ec_->destroy (TAO_TRY_ENV);
+      this->ec_impl_.shutdown ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Basic::shutdown");
+      TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::finish");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 CosEC_Basic::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Create an Any type to pass to the Cos EC.
       CORBA_Any cany;
@@ -230,34 +201,26 @@ CosEC_Basic::run (void)
       cany >>= any;
 
       this->consumer_.open (this->cos_ec_,
-                            this->orb_,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
-      this->consumer_.connect (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->consumer_.connect (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
       this->supplier_.open (this->cos_ec_,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
-      this->supplier_.connect (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->supplier_.connect (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
       this->supplier_.send_event (any,
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "exception in CosEC_Basic::runtest\n");
+      TAO_TRY_ENV.print_exception ("exception in CosEC_Basic::runtest\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  this->orb_->run ();
-  // wait here.
-  // When the consumer gets the event we pushed, it will shutdown the ORB.
-  // We will return from <run> then.
+  TAO_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.h b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.h
index a5b4e472bfc..8a7fad78d7b 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.h
+++ b/TAO/orbsvcs/tests/CosEC_Basic/CosEC_Basic.h
@@ -82,7 +82,7 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
   // Reference to the Scheduler after activating it in the ORB.
 
-  ACE_EventChannel *ec_impl_;
+  ACE_EventChannel ec_impl_;
   // The servant object of the Rtec.
 
   RtecEventChannelAdmin::EventChannel_var rtec_;
diff --git a/TAO/orbsvcs/tests/CosEC_Basic/Makefile b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
index 142f262f775..977c8ad430d 100644
--- a/TAO/orbsvcs/tests/CosEC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Basic/Makefile
@@ -1,27 +1,20 @@
 # $Id$
 
+BIN = CosEC_Basic
+
 SRC = $(BIN:%=%$(VAR).cpp) \
-      CosECConsumer.cpp \
-      CosECSupplier.cpp
+	CosECConsumer.cpp \
+	CosECSupplier.cpp
 
-LDLIBS = -lorbsvcs -lTAO
+LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN2 = CosEC_Basic
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # CosEvent
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -33,982 +26,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
+#### Local rules and variables...
 
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/CosEC_Basic.o .obj/CosEC_Basic.so .shobj/CosEC_Basic.o .shobj/CosEC_Basic.so: CosEC_Basic.cpp CosEC_Basic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Timer_List.h \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h \
- CosECConsumer.h CosECSupplier.h
-.obj/CosECConsumer.o .obj/CosECConsumer.so .shobj/CosECConsumer.o .shobj/CosECConsumer.so: CosECConsumer.cpp CosECConsumer.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i
-.obj/CosECSupplier.o .obj/CosECSupplier.so .shobj/CosECSupplier.o .shobj/CosECSupplier.so: CosECSupplier.cpp CosECSupplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
index 496eb0ec714..911f265bc30 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.cpp
@@ -2,7 +2,6 @@
 // $Id$
 
 #include "CosECConsumer.h"
-#include <ace/Get_Opt.h>
 
 CosECConsumer::CosECConsumer ()
   :event_count_ (1)
@@ -45,52 +44,50 @@ CosECConsumer::parse_args (int argc, char *argv [])
 
 void
 CosECConsumer::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_TRY_ENV)
 {
   // = Connect as a consumer.
   this->consumer_admin_ =
-    event_channel->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
+    event_channel->for_consumers (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECConsumer::close (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::close (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->disconnect (TAO_TRY_ENV);
   this->consumer_admin_ =
     CosEventChannelAdmin::ConsumerAdmin::_nil ();
 }
 
 void
-CosECConsumer::connect (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::connect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
   CosEventComm::PushConsumer_var objref =
-    this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_this (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_ =
-    this->consumer_admin_->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->consumer_admin_->obtain_push_supplier (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::disconnect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->supplier_proxy_.in ())
       || CORBA::is_nil (this->consumer_admin_.in ()))
     return;
 
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->supplier_proxy_->disconnect_push_supplier (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->supplier_proxy_ =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
@@ -98,7 +95,7 @@ CosECConsumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
 void
 CosECConsumer::push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &TAO_TRY_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "(%P):%s\n",
@@ -108,66 +105,58 @@ CosECConsumer::push (const CORBA::Any &data,
               "Event count = %d\n",
               this->event_count_));
 
-  this->event_count_ = this->event_count_ - 1;
-  // decrement the count
-
-  if (this->event_count_ == 0)
+  if (--this->event_count_ == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):%s\n",
                   "exiting the consumer."));
 
-      this->close (ACE_TRY_ENV);
-      ACE_CHECK;
+      this->close (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
       this->shutdown ();
     }
 }
 
 void
-CosECConsumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+CosECConsumer::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
 {
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 int
 CosECConsumer::init_Consumer (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
    {
       this->open (this->cos_ec_,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                  TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
-      this->connect (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       return 0;
     }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosECConsumer::connect (void)\n");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+ TAO_CATCHANY
+   {
+     TAO_TRY_ENV.print_exception ("CosECConsumer::connect (void)\n");
+     return -1;
+   }
+ TAO_ENDTRY;
 }
 
 int
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.h b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.h
index a25d598be92..0cccd8e368c 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.h
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECConsumer.h
@@ -42,24 +42,24 @@ public:
   // Initialize the Consumer.
 
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment& ACE_TRY_ENV);
+             CORBA::Environment& TAO_TRY_ENV);
   // This method connects the consumer to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CORBA::Environment &TAO_TRY_ENV);
   // Connect the CosECConsumer to the EventChannel.
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the supplier, but do not forget about it or close
   // it.
 
   virtual void push (const CORBA::Any &data,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_TRY_ENV);
   // push the event to the consumer.
 
-  virtual void disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
   // disconnect the consumer from the EC.
 
   // = CosEC_Multiple methods.
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp
index c4aac034686..4327013cebc 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.cpp
@@ -2,7 +2,6 @@
 // $Id$
 
 #include "CosECSupplier.h"
-#include <ace/Get_Opt.h>
 
 CosECSupplier::CosECSupplier ()
   : event_count_ (1)
@@ -44,51 +43,49 @@ CosECSupplier::parse_args (int argc, char *argv [])
 
 void
 CosECSupplier::open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-                     CORBA::Environment& ACE_TRY_ENV)
+                     CORBA::Environment& TAO_TRY_ENV)
 {
   // = Connect as a consumer.
   this->supplier_admin_ =
-    event_channel->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
+    event_channel->for_suppliers (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::close (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::close (CORBA::Environment &TAO_TRY_ENV)
 {
-  this->disconnect (ACE_TRY_ENV);
-  ACE_CHECK;
-
+  this->disconnect (TAO_TRY_ENV);
   this->supplier_admin_ =
     CosEventChannelAdmin::SupplierAdmin::_nil ();
 }
 
 void
-CosECSupplier::connect (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::connect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
   this->consumer_proxy_ =
-    this->supplier_admin_->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->supplier_admin_->obtain_push_consumer (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
-  CosEventComm::PushSupplier_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
+  CosEventComm::PushSupplier_var objref = this->_this (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
+                                                TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::disconnect (CORBA::Environment &TAO_TRY_ENV)
 {
   if (CORBA::is_nil (this->consumer_proxy_.in ())
       || CORBA::is_nil (this->supplier_admin_.in ()))
     return;
 
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->disconnect_push_consumer (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   this->consumer_proxy_ =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
@@ -96,36 +93,34 @@ CosECSupplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
 
 void
 CosECSupplier::send_event (const CORBA::Any & data,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &TAO_TRY_ENV)
 {
-  this->consumer_proxy_->push (data, ACE_TRY_ENV);
-  ACE_CHECK;
+  this->consumer_proxy_->push (data, TAO_TRY_ENV);
 }
 
 void
-CosECSupplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+CosECSupplier::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
 {
   // Deactivate this object.
 
   PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
+    this->_default_POA (TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   PortableServer::ObjectId_var id =
     poa->servant_to_id (this,
-                        ACE_TRY_ENV);
-  ACE_CHECK;
+                        TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
   poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
+                          TAO_TRY_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 }
 
 void
 CosECSupplier::run (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Create an Any type to pass to the Cos EC.
       CORBA_Any cany;
@@ -134,11 +129,11 @@ CosECSupplier::run (void)
       cany >>= any;
 
       this->open (this->cos_ec_,
-                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                  TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
-      this->connect (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->connect (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):sending %d events...\n",
@@ -149,23 +144,21 @@ CosECSupplier::run (void)
            count--)
         {
           this->send_event (any,
-                            ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
         }
 
       ACE_DEBUG ((LM_DEBUG,
                   "(%P):Done!. exiting now..\n"));
 
-      this->close (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->close (TAO_TRY_ENV);
+      TAO_TRY_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Multiple::run\n");
+      TAO_TRY_ENV.print_exception ("exception in CosEC_Multiple::run\n");
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 int
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.h b/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.h
index 284b67e3b69..43253f8f7a8 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.h
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosECSupplier.h
@@ -38,22 +38,22 @@ public:
   // Constructor.
 
   void open (CosEventChannelAdmin::EventChannel_ptr event_channel,
-             CORBA::Environment &ACE_TRY_ENV);
+             CORBA::Environment &TAO_TRY_ENV);
   // This method connects the supplier to the EC.
 
-  void close (CORBA::Environment &ACE_TRY_ENV);
+  void close (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC.
 
-  void connect (CORBA::Environment &ACE_TRY_ENV);
+  void connect (CORBA::Environment &TAO_TRY_ENV);
 
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
+  void disconnect (CORBA::Environment &TAO_TRY_ENV);
   // Disconnect from the EC, but do not forget about it or close it.
 
   void send_event (const CORBA::Any &data,
-                   CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_TRY_ENV);
   // Send one event.
 
-  virtual void disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV);
+  virtual void disconnect_push_supplier (CORBA::Environment &);
   // The POA_CosEventComm::PushSupplier method.
 
   void run (void);
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
index 75fff7f1707..db1327c9415 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.cpp
@@ -39,20 +39,17 @@ CosEC_Multiple::init (int argc, char *argv[])
 int
 CosEC_Multiple::init_ORB  (int argc, char *argv [])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     "",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       CORBA::Object_var poa_object  =
         this->orb_->resolve_initial_references("RootPOA",
-                                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                               TAO_TRY_ENV);
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " (%P|%t) Unable to initialize the POA.\n"),
@@ -60,35 +57,30 @@ CosEC_Multiple::init_ORB  (int argc, char *argv [])
 
       PortableServer::POA_var root_poa =
         PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_poa->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
 
       return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Basic::init_ORB\n");
+      TAO_TRY_ENV.print_exception ("Exception in CosEC_Basic::init_ORB\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+  TAO_ENDTRY;
 }
 
 int
 CosEC_Multiple::init_CosEC (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialization of the naming service.
       if (this->naming_client_.init (this->orb_.in ()) != 0)
@@ -104,29 +96,25 @@ CosEC_Multiple::init_CosEC (void)
 
       CORBA::Object_var EC_obj =
         this->naming_client_->resolve (ec_ref_name,
-				      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+				      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // The CORBA::Object_var object is downcast to
       // CosEventChannelAdmin::EventChannel
       // using the <_narrow> method.
       this->cos_ec_ =
         CosEventChannelAdmin::EventChannel::_narrow (EC_obj.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception in CosEC_Basic::init_ORB\n");
+      TAO_TRY_ENV.print_exception ("Exception in init_CosEC\n");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  ACE_NOTREACHED (return 0;)
+  TAO_ENDTRY;
 }
 
 int
@@ -141,6 +129,8 @@ CosEC_Multiple::runORB (void)
 void
 CosEC_Multiple::shutdown (void)
 {
-  if (!this->orb_->_nil ())
+  if (this->orb_ != CORBA::ORB::_nil ())
     this->orb_->shutdown ();
+
+  this->orb_ == CORBA::ORB::_nil ();
 }
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.h b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.h
index 685b18ad3bb..46769c3f5ef 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.h
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/CosEC_Multiple.h
@@ -35,7 +35,7 @@ class CosEC_Multiple
   CosEC_Multiple (void);
   // Constructor.
 
-  virtual ~CosEC_Multiple (void);
+  ~CosEC_Multiple (void);
   // Destructor.
 
   int init (int argc, char *argv[]);
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
index e86fb2caa80..9d1db6a65e8 100644
--- a/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 #
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -14,34 +14,28 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
 LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = \
-        CosEC_Multiple.cpp \
-        CosECConsumer.cpp \
-        CosECSupplier.cpp
+	CosEC_Multiple.cpp \
+	CosECConsumer.cpp \
+	CosECSupplier.cpp
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_CON_OBJS = \
-        CosEC_Multiple.o \
-        CosECConsumer.o
+	CosEC_Multiple.o \
+	CosECConsumer.o
 
 SIMPLE_SUP_OBJS = \
-        CosEC_Multiple.o \
-        CosECSupplier.o
+	CosEC_Multiple.o \
+	CosECSupplier.o
 
+BIN = supplier \
+      consumer
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = supplier \
-       consumer
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (CosEvent,$(findstring CosEvent,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # CosEvent
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -53,7 +47,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS +=  -L$(TAO_ROOT)/tao
@@ -65,9 +59,6 @@ supplier:$(addprefix $(VDIR),$(SIMPLE_SUP_OBJS))
 consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -75,8 +66,11 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
 .obj/CosEC_Multiple.o .obj/CosEC_Multiple.so .shobj/CosEC_Multiple.o .shobj/CosEC_Multiple.so: CosEC_Multiple.cpp CosEC_Multiple.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -91,69 +85,40 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
@@ -162,6 +127,30 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -173,88 +162,14 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -267,14 +182,22 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -290,66 +213,103 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
@@ -358,12 +318,13 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
@@ -371,8 +332,11 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
 .obj/CosECConsumer.o .obj/CosECConsumer.so .shobj/CosECConsumer.o .shobj/CosECConsumer.so: CosECConsumer.cpp CosECConsumer.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -387,69 +351,40 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
@@ -458,6 +393,30 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -469,88 +428,14 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -563,14 +448,22 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -586,66 +479,103 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
@@ -659,27 +589,15 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEC_Multiple.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i
 .obj/CosECSupplier.o .obj/CosECSupplier.so .shobj/CosECSupplier.o .shobj/CosECSupplier.so: CosECSupplier.cpp CosECSupplier.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -694,69 +612,40 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
@@ -765,6 +654,30 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -776,88 +689,14 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -870,14 +709,22 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -893,66 +740,103 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.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/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminC.h \
@@ -966,21 +850,6 @@ consumer:$(addprefix $(VDIR),$(SIMPLE_CON_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i \
- CosEC_Multiple.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosEventChannelAdminS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
index cfc7baacc2c..63a6701aa35 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 
 require ACEutils;
diff --git a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
index 1e9f2e36c40..a748182fe12 100755
--- a/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
+++ b/TAO/orbsvcs/tests/CosEC_Multiple/run_test2.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 
 require ACEutils;
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
index 1a7ed58db81..09696ba2c55 100644
--- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
+++ b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp
@@ -493,8 +493,8 @@ ECB_SupplierID_Test::run (CORBA::ORB_ptr orb,
 
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
-  e.header.ec_recv_time = ORBSVCS_Time::zero ();
-  e.header.ec_send_time = ORBSVCS_Time::zero ();
+  e.header.ec_recv_time = ORBSVCS_Time::zero;
+  e.header.ec_send_time = ORBSVCS_Time::zero;
 
   e.data.x = 0;
   e.data.y = 0;
@@ -831,8 +831,8 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
 
     ACE_hrtime_t t = ACE_OS::gethrtime ();
     ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
-    e.header.ec_recv_time = ORBSVCS_Time::zero ();
-    e.header.ec_send_time = ORBSVCS_Time::zero ();
+    e.header.ec_recv_time = ORBSVCS_Time::zero;
+    e.header.ec_send_time = ORBSVCS_Time::zero;
 
     e.data.x = 0;
     e.data.y = 0;
@@ -848,8 +848,8 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
 
     ACE_hrtime_t t = ACE_OS::gethrtime ();
     ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
-    e.header.ec_recv_time = ORBSVCS_Time::zero ();
-    e.header.ec_send_time = ORBSVCS_Time::zero ();
+    e.header.ec_recv_time = ORBSVCS_Time::zero;
+    e.header.ec_send_time = ORBSVCS_Time::zero;
 
     e.data.x = 0;
     e.data.y = 0;
@@ -865,8 +865,8 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
 
     ACE_hrtime_t t = ACE_OS::gethrtime ();
     ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
-    e.header.ec_recv_time = ORBSVCS_Time::zero ();
-    e.header.ec_send_time = ORBSVCS_Time::zero ();
+    e.header.ec_recv_time = ORBSVCS_Time::zero;
+    e.header.ec_send_time = ORBSVCS_Time::zero;
 
     e.data.x = 0;
     e.data.y = 0;
@@ -879,8 +879,8 @@ ECB_Correlation_Test::run (CORBA::ORB_ptr orb,
 
     ACE_hrtime_t t = ACE_OS::gethrtime ();
     ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
-    e.header.ec_recv_time = ORBSVCS_Time::zero ();
-    e.header.ec_send_time = ORBSVCS_Time::zero ();
+    e.header.ec_recv_time = ORBSVCS_Time::zero;
+    e.header.ec_send_time = ORBSVCS_Time::zero;
 
     e.data.x = 0;
     e.data.y = 0;
diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile
index ba00ceaa1ab..14302e476fd 100644
--- a/TAO/orbsvcs/tests/EC_Basic/Makefile
+++ b/TAO/orbsvcs/tests/EC_Basic/Makefile
@@ -1,24 +1,17 @@
 # $Id$
 
+BIN = EC_Basic
+
 SRC = $(BIN:%=%$(VAR).cpp)
 LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN2 = EC_Basic
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -44,6 +37,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -65,272 +61,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Sched_Params.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -341,16 +75,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
index f0b88f24d2c..50a65b5d6e3 100755
--- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Basic/run_test.pl
@@ -1,10 +1,9 @@
+# -*- perl -*-
+# $Id$
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 $status = system ($EXEPREFIX."EC_Basic".$Process::EXE_EXT, "");
 
 # @@ Capture any errors from the server too.
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 081c9c805de..e380b16a026 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -356,7 +356,7 @@ Driver::parse_args (int argc, char *argv [])
 
   if (this->n_consumers_ <= 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of consumers or "
                          "suppliers out of range\n", argv[0]), -1);
     }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 0255d64c8f4..bab65ca9f33 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -197,12 +197,12 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
       CORBA::ULong n = this->event_size_;
 
       ECM_IDLData::Info info;
-      info.mobile_name = CORBA::string_dup ("test");
+      info.mobile_name = CORBA::string_copy ("test");
       info.mobile_speed = 1;
       info.trajectory.length (n);
 
       ECM_Data other;
-      other.description = CORBA::string_dup ("some data");
+      other.description = CORBA::string_copy ("some data");
 
       for (CORBA::ULong j = 0; j < n; ++j)
         {
@@ -251,8 +251,8 @@ ECMS_Driver::supplier_task (Test_Supplier *supplier,
 
           ACE_hrtime_t t = ACE_OS::gethrtime ();
           ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
-          event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
-          event[0].header.ec_send_time = ORBSVCS_Time::zero ();
+          event[0].header.ec_recv_time = ORBSVCS_Time::zero;
+          event[0].header.ec_send_time = ORBSVCS_Time::zero;
 
           if (i == ACE_static_cast (CORBA::Long, this->event_count_) - 1)
             event[0].header.type = ACE_ES_EVENT_SHUTDOWN;
@@ -408,7 +408,7 @@ ECMS_Driver::parse_args (int argc, char *argv [])
   if (this->n_suppliers_ <= 0)
     {
       this->n_suppliers_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of suppliers out of range, "
                          "reset to default (%d)\n",
                          argv[0], 1), -1);
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
index f69025fcf67..7cd025f8b98 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile
@@ -1,32 +1,25 @@
 # $Id$
 
+BIN = ECM_Supplier ECM_Consumer
+
 LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-IDL_HDR = dataC dataS
-IDL_SRC = dataC dataS
+IDL_HDR	= dataC dataS
+IDL_SRC	= dataC dataS
 
 ECM_Supplier_OBJS=$(addsuffix .o,$(IDL_SRC) ECM_Supplier ECM_Data)
 ECM_Consumer_OBJS=$(addsuffix .o,$(IDL_SRC) ECM_Consumer ECM_Data)
 
-SRC =  $(addsuffix .cpp, $(BIN)) \
-        $(addsuffix .cpp, $(IDL_SRC)) \
-        ECM_Data.cpp
-
-BIN2 = ECM_Supplier ECM_Consumer
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event
+SRC =   $(addsuffix .cpp, $(BIN)) \
+	$(addsuffix .cpp, $(IDL_SRC)) \
+	ECM_Data.cpp
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -51,7 +44,8 @@ ECM_Consumer: $(addprefix $(VDIR),$(ECM_Consumer_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean:
-	$(RM) dataC.* dataS.* dataS_T.*
+	$(RM) -f dataC.* dataS.* dataS_T.*
+	$(RM) -f $(BIN)
 
 #----------------------------------------------------------------------------
 #       Dependencies
@@ -65,6 +59,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -88,272 +85,10 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -368,16 +103,11 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -436,6 +166,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -459,272 +192,10 @@ realclean:
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -739,16 +210,11 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -802,566 +268,17 @@ realclean:
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
  ECM_Data.h dataC.h dataC.i
-.obj/dataC.o .obj/dataC.so .shobj/dataC.o .shobj/dataC.so: dataC.cpp dataC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- dataC.i dataS.h dataS_T.h dataS_T.i dataS_T.cpp dataS.i
-.obj/dataS.o .obj/dataS.so .shobj/dataS.o .shobj/dataS.so: dataS.cpp dataS.h dataC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- dataC.i dataS_T.h dataS_T.i dataS_T.cpp dataS.i
+.obj/dataC.o .obj/dataC.so .shobj/dataC.o .shobj/dataC.so: dataC.cpp dataC.h dataC.i dataS.h dataS_T.h dataS_T.i \
+ dataS_T.cpp dataS.i
+.obj/dataS.o .obj/dataS.so .shobj/dataS.o .shobj/dataS.so: dataS.cpp dataS.h dataC.h dataC.i dataS_T.h dataS_T.i \
+ dataS_T.cpp dataS.i
 .obj/ECM_Data.o .obj/ECM_Data.so .shobj/ECM_Data.o .shobj/ECM_Data.so: ECM_Data.cpp ECM_Data.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1432,210 +349,6 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- dataC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- dataC.i
+ dataC.h dataC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
index abee5c67c57..130dcd43ac0 100755
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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;
 
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf b/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf
new file mode 100644
index 00000000000..f3362851751
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/svc.conf
@@ -0,0 +1,7 @@
+# $Id$
+#
+# The options are described in $TAO_ROOT/docs/Options.html
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global -ORBinputcdrallocator global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index cd524449573..482856f1cc3 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -7,11 +7,13 @@
 
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
-
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-
+#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "orbsvcs/Runtime_Scheduler.h"
+#include "orbsvcs/Event/Event_Channel.h"
+#include "orbsvcs/Event/Module_Factory.h"
 #include "EC_Mcast.h"
 
 #if !defined (__ACE_INLINE__)
@@ -118,17 +120,57 @@ ECM_Driver::run (int argc, char* argv[])
             }
         }
 
-      TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
-                                            root_poa.in ());
-      TAO_EC_Event_Channel ec_impl (attr);
+#if 0
+      int min_priority =
+        ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
+        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+      if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
+                                                  min_priority,
+                                                  ACE_SCOPE_PROCESS)) != 0)
+        {
+          if (ACE_OS::last_error () == EPERM)
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s: user is not superuser, "
+                        "so remain in time-sharing class\n", argv[0]));
+          else
+            ACE_ERROR ((LM_ERROR,
+                        "%s: ACE_OS::sched_params failed\n", argv[0]));
+        }
+
+      if (ACE_OS::thr_setprio (min_priority) == -1)
+        {
+          ACE_DEBUG ((LM_DEBUG, "(%P|%t) main thr_setprio failed\n"));
+        }
+#endif /* 0 */
+
+      ACE_Config_Scheduler scheduler_impl;
+      RtecScheduler::Scheduler_var scheduler =
+        scheduler_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      CORBA::String_var str =
+        this->orb_->object_to_string (scheduler.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      ACE_DEBUG ((LM_DEBUG, "The (local) scheduler IOR is <%s>\n",
+                  str.in ()));
+
+      if (ACE_Scheduler_Factory::server (scheduler.in ()) == -1)
+        return -1;
+
+      // Create the EventService implementation, but don't start its
+      // internal threads.
+      TAO_Reactive_Module_Factory module_factory;
+      ACE_EventChannel ec_impl (0,
+                                ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                                &module_factory);
 
       // Register Event_Service with the Naming Service.
       RtecEventChannelAdmin::EventChannel_var ec =
         ec_impl._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      CORBA::String_var str =
-        this->orb_->object_to_string (ec.in (), TAO_TRY_ENV);
+      str = this->orb_->object_to_string (ec.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "The (local) EC IOR is <%s>\n", str.in ()));
@@ -136,35 +178,45 @@ ECM_Driver::run (int argc, char* argv[])
       poa_manager->activate (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ec_impl.activate (TAO_TRY_ENV);
+      RtecEventChannelAdmin::EventChannel_var local_ec =
+        ec_impl._this (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: local EC objref ready\n"));
 
-      this->open_federations (ec.in (),
+      this->open_federations (local_ec.in (),
+                              scheduler.in (),
                               TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_federations done\n"));
 
-      this->open_senders (ec.in (),
+      this->open_senders (local_ec.in (),
+                          scheduler.in (),
                           TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_senders done\n"));
 
-      this->open_receivers (ec.in (),
+      this->open_receivers (local_ec.in (),
+                            scheduler.in (),
                             TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: open_receivers done\n"));
 
-      this->activate_federations (ec.in (),
+      this->activate_federations (local_ec.in (),
+                                  scheduler.in (),
                                   TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate_federations done\n"));
 
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: activate the  EC\n"));
+
+      // Create the EC internal threads
+      ec_impl.activate ();
+
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: running the test\n"));
       if (this->orb_->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
@@ -180,9 +232,14 @@ ECM_Driver::run (int argc, char* argv[])
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown the EC\n"));
+      ec_impl.shutdown ();
+
+      ACE_DEBUG ((LM_DEBUG, "EC_Mcast: shutdown grace period\n"));
+
+      ACE_Time_Value tv (5, 0);
+      if (this->orb_->run (&tv) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
 
-      ec_impl.shutdown (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
     }
   TAO_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -209,28 +266,28 @@ ECM_Driver::federation_has_shutdown (ECM_Local_Federation *federation,
 
 void
 ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
+                              RtecScheduler::Scheduler_ptr scheduler,
                               CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open (this->event_count_,
-                                         ec, TAO_IN_ENV);
+                                         this->event_period_,
+                                         ec, scheduler, TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
 
 void
 ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
+                                  RtecScheduler::Scheduler_ptr scheduler,
                                   CORBA::Environment &TAO_IN_ENV)
 {
   this->federations_running_ = this->local_federations_count_;
-  RtecEventComm::Time interval = this->event_period_;
-  interval *= 10;
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->activate (ec,
-                                             interval,
-                                             TAO_IN_ENV);
+      this->local_federations_[i]->activate (this->event_period_,
+                                             ec, scheduler, TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
 }
@@ -247,12 +304,13 @@ ECM_Driver::close_federations (CORBA::Environment &TAO_IN_ENV)
 
 void
 ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
+                          RtecScheduler::Scheduler_ptr scheduler,
                           CORBA::Environment &TAO_IN_ENV)
 {
   if (this->endpoint_.dgram ().open (ACE_Addr::sap_any) == -1)
     {
       // @@ TODO throw an application specific exception.
-      TAO_IN_ENV.exception (new CORBA::COMM_FAILURE ());
+      TAO_IN_ENV.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
       return;
     }
   ACE_INET_Addr ignore_from;
@@ -265,6 +323,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       this->all_federations_[i]->open (&this->endpoint_,
                                        ec,
+                                       scheduler,
                                        TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
     }
@@ -283,11 +342,13 @@ ECM_Driver::close_senders (CORBA::Environment &TAO_IN_ENV)
 
 void
 ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
+                            RtecScheduler::Scheduler_ptr scheduler,
                             CORBA::Environment &TAO_IN_ENV)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
       this->local_federations_[i]->open_receiver (ec,
+                                                  scheduler,
                                                   &this->endpoint_,
                                                   TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -575,13 +636,20 @@ ECM_Federation::ECM_Federation (char* name,
 void
 ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
                       RtecEventChannelAdmin::EventChannel_ptr ec,
+                      RtecScheduler::Scheduler_ptr scheduler,
                       CORBA::Environment &TAO_IN_ENV)
 {
+  const int bufsize = 512;
+  char buf[bufsize];
+  ACE_OS::strcpy (buf, this->name ());
+  ACE_OS::strcat (buf, "/sender");
+
   RtecUDPAdmin::AddrServer_var addr_server =
     this->addr_server (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  this->sender_.init (ec,
+  this->sender_.init (ec, scheduler,
+                      buf,
                       addr_server.in (),
                       endpoint,
                       TAO_IN_ENV);
@@ -590,17 +658,31 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint,
   // @@ TODO Make this a parameter....
   this->sender_.mtu (64);
 
+  RtecScheduler::handle_t rt_info =
+    scheduler->create (buf, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
+
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
   ACE_Time_Value tv (0, 2000);
   TimeBase::TimeT time;
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  scheduler->set (rt_info,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  0,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  0,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
   for (int i = 0; i < this->consumer_types (); ++i)
     {
-      qos.insert_type (this->consumer_ipaddr (i), 0);
+      qos.insert_type (this->consumer_ipaddr (i), rt_info);
     }
   RtecEventChannelAdmin::ConsumerQOS qos_copy = qos.get_ConsumerQOS ();
   this->sender_.open (qos_copy, TAO_IN_ENV);
@@ -632,9 +714,34 @@ ECM_Supplier::ECM_Supplier (ECM_Local_Federation* federation)
 
 void
 ECM_Supplier::open (const char* name,
+                    RtecScheduler::Period_t period,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
+                    RtecScheduler::Scheduler_ptr scheduler,
                     CORBA::Environment &TAO_IN_ENV)
 {
+  RtecScheduler::handle_t rt_info =
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+  // The execution times are set to reasonable values, but
+  // actually they are changed on the real execution, i.e. we
+  // lie to the scheduler to obtain right priorities; but we
+  // don't care if the set is schedulable.
+  ACE_Time_Value tv (0, 2000);
+  TimeBase::TimeT time;
+  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+
+  scheduler->set (rt_info,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  period,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  1,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
   this->supplier_id_ = ACE::crc32 (name);
   ACE_DEBUG ((LM_DEBUG, "ID for <%s> is %04.4x\n", name,
               this->supplier_id_));
@@ -644,11 +751,11 @@ ECM_Supplier::open (const char* name,
     {
       qos.insert (this->supplier_id_,
                   this->federation_->supplier_ipaddr (i),
-                  0, 1);
+                  rt_info, 1);
     }
   qos.insert (this->supplier_id_,
               ACE_ES_EVENT_SHUTDOWN,
-              0, 1);
+              rt_info, 1);
 
   RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
     ec->for_suppliers (TAO_IN_ENV);
@@ -680,15 +787,50 @@ ECM_Supplier::close (CORBA::Environment &TAO_IN_ENV)
 }
 
 void
-ECM_Supplier::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        RtecEventComm::Time interval,
+ECM_Supplier::activate (const char* name,
+                        RtecScheduler::Period_t period,
+                        RtecEventChannelAdmin::EventChannel_ptr ec,
+                        RtecScheduler::Scheduler_ptr scheduler,
                         CORBA::Environment &TAO_IN_ENV)
 {
+  const int bufsize = 512;
+  char buf[bufsize];
+  ACE_OS::strcpy (buf, "consumer_");
+  ACE_OS::strcat (buf, name);
+  RtecScheduler::handle_t rt_info =
+    scheduler->create (buf, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+  // The execution times are set to reasonable values, but
+  // actually they are changed on the real execution, i.e. we
+  // lie to the scheduler to obtain right priorities; but we
+  // don't care if the set is schedulable.
+  ACE_Time_Value tv (0, 2000);
+  TimeBase::TimeT time;
+  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  scheduler->set (rt_info,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  period,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  1,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+  // Also connect our consumer for timeout events from the EC.
+  int interval = period / 10;
+  ACE_Time_Value tv_timeout (interval / ACE_ONE_SECOND_IN_USECS,
+                             interval % ACE_ONE_SECOND_IN_USECS);
+  TimeBase::TimeT timeout;
+  ORBSVCS_Time::Time_Value_to_TimeT (timeout, tv_timeout);
+
   ACE_ConsumerQOS_Factory consumer_qos;
   consumer_qos.start_disjunction_group ();
   consumer_qos.insert_time (ACE_ES_EVENT_INTERVAL_TIMEOUT,
-                            interval,
-                            0);
+                            timeout,
+                            rt_info);
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -754,16 +896,31 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 }
 
 void
-ECM_Consumer::open (const char*,
+ECM_Consumer::open (const char* name,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
+                    RtecScheduler::Scheduler_ptr scheduler,
                     ACE_RANDR_TYPE &seed,
                     CORBA::Environment& TAO_IN_ENV)
 {
+  this->rt_info_ =
+    scheduler->create (name, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
+
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
   ACE_Time_Value tv (0, 2000);
   TimeBase::TimeT time;
   ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  scheduler->set (this->rt_info_,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  0,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  0,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   // = Connect as a consumer.
   this->consumer_admin_ = ec->for_consumers (TAO_IN_ENV);
@@ -785,12 +942,12 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
 
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
-  qos.insert_type (ACE_ES_EVENT_SHUTDOWN, 0);
+  qos.insert_type (ACE_ES_EVENT_SHUTDOWN,
+                   this->rt_info_);
   const ECM_Federation* federation = this->federation_->federation ();
   for (int i = 0; i < federation->consumer_types (); ++i)
     {
-      unsigned int x = ACE_OS::rand_r (seed);
-      if (x < RAND_MAX / 2)
+      if (ACE_OS::rand_r (seed) < RAND_MAX / 2)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Federation %s leaves group %s\n",
@@ -804,7 +961,8 @@ ECM_Consumer::connect (ACE_RANDR_TYPE &seed,
                   federation->name (),
                   federation->consumer_name (i)));
       this->federation_->subscribed_bit (i, 1);
-      qos.insert_type (federation->consumer_ipaddr (i), 0);
+      qos.insert_type (federation->consumer_ipaddr (i),
+                       this->rt_info_);
     }
 
   RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV);
@@ -881,7 +1039,9 @@ ECM_Local_Federation::~ECM_Local_Federation (void)
 
 void
 ECM_Local_Federation::open (int event_count,
+                            RtecScheduler::Period_t period,
                             RtecEventChannelAdmin::EventChannel_ptr ec,
+                            RtecScheduler::Scheduler_ptr scheduler,
                             CORBA::Environment& TAO_IN_ENV)
 {
   this->event_count_ = event_count;
@@ -891,12 +1051,12 @@ ECM_Local_Federation::open (int event_count,
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/supplier");
 
-  this->supplier_.open (buf, ec, TAO_IN_ENV);
+  this->supplier_.open (buf, period, ec, scheduler, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_, TAO_IN_ENV);
+  this->consumer_.open (buf, ec, scheduler, this->seed_, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
@@ -913,11 +1073,14 @@ ECM_Local_Federation::close (CORBA::Environment &TAO_IN_ENV)
 }
 
 void
-ECM_Local_Federation::activate (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                RtecEventComm::Time interval,
+ECM_Local_Federation::activate (RtecScheduler::Period_t period,
+                                RtecEventChannelAdmin::EventChannel_ptr ec,
+                                RtecScheduler::Scheduler_ptr scheduler,
                                 CORBA::Environment& TAO_IN_ENV)
 {
-  this->supplier_.activate (ec, interval, TAO_IN_ENV);
+  this->supplier_.activate (this->federation_->name (),
+                            period,
+                            ec, scheduler, TAO_IN_ENV);
 }
 
 void
@@ -933,8 +1096,8 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
 
   ACE_hrtime_t t = ACE_OS::gethrtime ();
   ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
-  s.header.ec_recv_time = ORBSVCS_Time::zero ();
-  s.header.ec_send_time = ORBSVCS_Time::zero ();
+  s.header.ec_recv_time = ORBSVCS_Time::zero;
+  s.header.ec_send_time = ORBSVCS_Time::zero;
 
   s.data.x = 0;
   s.data.y = 0;
@@ -960,15 +1123,14 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
   ACE_Time_Value delta = ACE_OS::gettimeofday () -
     this->last_subscription_change_;
 
-  unsigned int x = ACE_OS::rand_r (this->seed_);
-  double p = double (x) / RAND_MAX;
+  double p = double (ACE_OS::rand_r (this->seed_)) / RAND_MAX;
   double maxp = double (delta.msec ()) / this->subscription_change_period_;
 
   if (4 * p < maxp)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Reconfiguring federation %s: %f %f [%d]\n",
-                  this->name (), p, maxp, x));
+                  "Reconfiguring federation %s: %f %f\n",
+                  this->name (), p, maxp));
       this->consumer_.disconnect (TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
       this->consumer_.connect (this->seed_, TAO_IN_ENV);
@@ -1013,9 +1175,15 @@ ECM_Local_Federation::consumer_push (ACE_hrtime_t,
 
 void
 ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
+                                     RtecScheduler::Scheduler_ptr scheduler,
                                      TAO_ECG_UDP_Out_Endpoint* ignore_from,
                                      CORBA::Environment &TAO_IN_ENV)
 {
+  const int bufsize = 512;
+  char buf[bufsize];
+  ACE_OS::strcpy (buf, this->name ());
+  ACE_OS::strcat (buf, "/receiver");
+
   RtecUDPAdmin::AddrServer_var addr_server =
     this->federation_->addr_server (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -1025,19 +1193,33 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
   // @@ This should be parameters...
   ACE_Time_Value expire_interval (1, 0);
   const int max_timeouts = 5;
-  this->receiver_.init (ec,
+  this->receiver_.init (ec, scheduler,
+                        buf,
                         ignore_from,
                         addr_server.in (),
-                        reactor,
-                        expire_interval,
-                        max_timeouts,
+                        reactor, expire_interval, max_timeouts,
                         TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-  const int bufsize = 512;
-  char buf[bufsize];
-  ACE_OS::strcpy (buf, this->name ());
-  ACE_OS::strcat (buf, "/receiver");
+  RtecScheduler::handle_t rt_info =
+    scheduler->create (buf, TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV);
+
+  // The worst case execution time is far less than 2
+  // milliseconds, but that is a safe estimate....
+  ACE_Time_Value tv (0, 2000);
+  TimeBase::TimeT time;
+  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
+  scheduler->set (rt_info,
+                  RtecScheduler::VERY_HIGH_CRITICALITY,
+                  time, time, time,
+                  0,
+                  RtecScheduler::VERY_LOW_IMPORTANCE,
+                  time,
+                  1,
+                  RtecScheduler::OPERATION,
+                  TAO_IN_ENV);
+  TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
   RtecEventComm::EventSourceID source = ACE::crc32 (buf);
 
@@ -1051,7 +1233,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
     {
       qos.insert (source,
                   this->consumer_ipaddr (i),
-                  0, 1);
+                  rt_info, 1);
     }
 
   RtecEventChannelAdmin::SupplierQOS qos_copy =
@@ -1122,8 +1304,6 @@ ECM_Local_Federation::subscribed_bit (int i) const
 int
 main (int argc, char *argv [])
 {
-  TAO_EC_Default_Factory::init_svcs ();
-
   ECM_Driver driver;
   return driver.run (argc, argv);
 }
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index 8d021e57381..b05aa7aedb2 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -111,6 +111,7 @@ public:
 
   void open (TAO_ECG_UDP_Out_Endpoint *endoint,
              RtecEventChannelAdmin::EventChannel_ptr ec,
+             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment &_env);
   // Connect the UDP sender to the EC.
 
@@ -163,15 +164,19 @@ public:
   ECM_Supplier (ECM_Local_Federation* federation);
 
   void open (const char* name,
+             RtecScheduler::Period_t period,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment& _env);
   // This method connects the supplier to the EC.
 
   void close (CORBA::Environment &_env);
   // Disconnect from the EC.
 
-  void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval,
+  void activate (const char* name,
+                 RtecScheduler::Period_t period,
+                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecScheduler::Scheduler_ptr scheduler,
                  CORBA::Environment& _env);
   // Connect as a consumer to start receiving events.
 
@@ -219,6 +224,7 @@ public:
 
   void open (const char* name,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
              ACE_RANDR_TYPE &seed,
              CORBA::Environment& _env);
   // This method connects the consumer to the EC.
@@ -241,6 +247,9 @@ private:
   ECM_Local_Federation* federation_;
   // To callback.
 
+  RtecScheduler::handle_t rt_info_;
+  // The handle for our RT_Info description.
+
   RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
   // We talk to the EC using this proxy.
 
@@ -262,15 +271,18 @@ public:
   // Destructor
 
   void open (int event_count,
+             RtecScheduler::Period_t period,
              RtecEventChannelAdmin::EventChannel_ptr event_channel,
+             RtecScheduler::Scheduler_ptr scheduler,
              CORBA::Environment& _env);
   // Connect both the supplier and the consumer.
 
   void close (CORBA::Environment& _env);
   // Disconnect everybody from the EC
 
-  void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel,
-                 RtecEventComm::Time interval,
+  void activate (RtecScheduler::Period_t period,
+                 RtecEventChannelAdmin::EventChannel_ptr event_channel,
+                 RtecScheduler::Scheduler_ptr scheduler,
                  CORBA::Environment& _env);
   // Activate the supplier
 
@@ -287,6 +299,7 @@ public:
   // The federation description.
 
   void open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec,
+                      RtecScheduler::Scheduler_ptr scheduler,
                       TAO_ECG_UDP_Out_Endpoint* ignore_from,
                       CORBA::Environment &_env);
   // Connect the UDP receiver to the EC.
@@ -418,10 +431,12 @@ public:
 
 private:
   void open_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
+                         RtecScheduler::Scheduler_ptr scheduler,
                          CORBA::Environment &_env);
   // Connect the federations to the EC.
 
   void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec,
+                             RtecScheduler::Scheduler_ptr scheduler,
                              CORBA::Environment &_env);
   // Activate all the federations
 
@@ -430,10 +445,12 @@ private:
   // the objects, etc.
 
   void open_senders (RtecEventChannelAdmin::EventChannel_ptr ec,
+                     RtecScheduler::Scheduler_ptr scheduler,
                      CORBA::Environment &_env);
   // Connect all the senders, so we can start multicasting events.
 
   void open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec,
+                       RtecScheduler::Scheduler_ptr scheduler,
                        CORBA::Environment &_env);
   // Connect all the receivers, thus we accept events arriving through
   // multicast.
@@ -466,7 +483,7 @@ private:
 
 private:
   int event_period_;
-  // The events are generated using this interval, in microseconds.
+  // The events are generated using this interval.
 
   int event_count_;
   // How many events will the suppliers send
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile
index 7764d2db564..d6c65ac260c 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile
@@ -1,24 +1,17 @@
 # $Id$
 
+BIN = EC_Mcast
+
 SRC = $(BIN:%=%$(VAR).cpp)
 LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN2 = EC_Mcast
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event2
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -44,6 +37,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -105,234 +101,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -341,37 +113,70 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h \
  EC_Mcast.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
diff --git a/TAO/orbsvcs/tests/EC_Mcast/svc.conf b/TAO/orbsvcs/tests/EC_Mcast/svc.conf
index 925d535e41b..b1cddc490d4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf
+++ b/TAO/orbsvcs/tests/EC_Mcast/svc.conf
@@ -1,2 +1,7 @@
 # $Id$
-static EC_Factory "-ECfiltering basic -ECpushsupplierset delayed -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier -ECobserver basic"
+#
+# The options are described in $TAO_ROOT/docs/Options.html
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global -ORBinputcdrallocator global -ORBreactorlock null"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread"
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 3eba6826489..da410dc5e04 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -264,12 +264,10 @@ Test_ECG::run (int argc, char* argv[])
           break;
 
         case Test_ECG::ss_local:
-          {
-            auto_ptr<POA_RtecScheduler::Scheduler> auto_scheduler_impl (new ACE_Config_Scheduler);
-            scheduler_impl = auto_scheduler_impl;
-          }
+          scheduler_impl =
+            auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler);
           if (scheduler_impl.get () == 0)
-            return -1;
+                return -1;
           scheduler = scheduler_impl->_this (TAO_TRY_ENV);
           TAO_CHECK_ENV;
           break;
@@ -284,13 +282,12 @@ Test_ECG::run (int argc, char* argv[])
                 sizeof (runtime_infos_1)/sizeof (runtime_infos_1[0]),
                 runtime_infos_1);
 
-              auto_ptr<POA_RtecScheduler::Scheduler> auto_scheduler_impl
-                (new ACE_Runtime_Scheduler (runtime_configs_1_size,
-                                            runtime_configs_1,
-                                            runtime_infos_1_size,
-                                            runtime_infos_1));
-              scheduler_impl = auto_scheduler_impl;
-
+              scheduler_impl =
+                auto_ptr<POA_RtecScheduler::Scheduler>
+                    (new ACE_Runtime_Scheduler (runtime_configs_1_size,
+                                                runtime_configs_1,
+                                                runtime_infos_1_size,
+                                                runtime_infos_1));
               if (scheduler_impl.get () == 0)
                 return -1;
               scheduler = scheduler_impl->_this (TAO_TRY_ENV);
@@ -305,13 +302,12 @@ Test_ECG::run (int argc, char* argv[])
                 sizeof (runtime_infos_2)/sizeof (runtime_infos_2[0]),
                 runtime_infos_2);
 
-              auto_ptr<POA_RtecScheduler::Scheduler> auto_scheduler_impl
-                (new ACE_Runtime_Scheduler (runtime_configs_2_size,
-                                            runtime_configs_2,
-                                            runtime_infos_2_size,
-                                            runtime_infos_2));
-              scheduler_impl = auto_scheduler_impl;
-
+              scheduler_impl =
+                auto_ptr<POA_RtecScheduler::Scheduler>
+                    (new ACE_Runtime_Scheduler (runtime_configs_2_size,
+                                                runtime_configs_2,
+                                                                                                runtime_infos_2_size,
+                                                runtime_infos_2));
               if (scheduler_impl.get () == 0)
                 return -1;
               scheduler = scheduler_impl->_this (TAO_TRY_ENV);
@@ -326,13 +322,12 @@ Test_ECG::run (int argc, char* argv[])
                 sizeof (runtime_infos_3)/sizeof (runtime_infos_3[0]),
                 runtime_infos_3);
 
-              auto_ptr<POA_RtecScheduler::Scheduler> auto_scheduler_impl
-                (new ACE_Runtime_Scheduler (runtime_configs_3_size,
-                                            runtime_configs_3,
-                                            runtime_infos_3_size,
-                                            runtime_infos_3));
-              scheduler_impl = auto_scheduler_impl;
-
+              scheduler_impl =
+                auto_ptr<POA_RtecScheduler::Scheduler>
+                    (new ACE_Runtime_Scheduler (runtime_configs_3_size,
+                                                runtime_configs_3,
+                                                                                                runtime_infos_3_size,
+                                                runtime_infos_3));
               if (scheduler_impl.get () == 0)
                 return -1;
               scheduler = scheduler_impl->_this (TAO_TRY_ENV);
@@ -343,10 +338,8 @@ Test_ECG::run (int argc, char* argv[])
               ACE_ERROR ((LM_WARNING,
                           "Unknown name <%s> defaulting to "
                           "config scheduler\n", this->lcl_name_));
-
-              auto_ptr<POA_RtecScheduler::Scheduler> auto_scheduler_impl (new ACE_Config_Scheduler);
-              scheduler_impl = auto_scheduler_impl;
-
+              scheduler_impl =
+                auto_ptr<POA_RtecScheduler::Scheduler>(new ACE_Config_Scheduler);
               if (scheduler_impl.get () == 0)
                 return -1;
               scheduler = scheduler_impl->_this (TAO_TRY_ENV);
@@ -1026,8 +1019,8 @@ Test_ECG::shutdown_supplier (void* /* supplier_cookie */,
 
       ACE_hrtime_t t = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
-      s.header.ec_recv_time = ORBSVCS_Time::zero ();
-      s.header.ec_send_time = ORBSVCS_Time::zero ();
+      s.header.ec_recv_time = ORBSVCS_Time::zero;
+      s.header.ec_send_time = ORBSVCS_Time::zero;
       s.header.type = ACE_ES_EVENT_SHUTDOWN;
       consumer->push (shutdown, TAO_IN_ENV);
     }
@@ -1508,8 +1501,8 @@ Test_Supplier::push (const RtecEventComm::EventSet& events,
 
       ACE_hrtime_t t = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (s.header.creation_time, t);
-      s.header.ec_recv_time = ORBSVCS_Time::zero ();
-      s.header.ec_send_time = ORBSVCS_Time::zero ();
+      s.header.ec_recv_time = ORBSVCS_Time::zero;
+      s.header.ec_send_time = ORBSVCS_Time::zero;
 
       s.data.x = 0;
       s.data.y = 0;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile b/TAO/orbsvcs/tests/EC_Multiple/Makefile
index 15150a34ac5..e305c8bae33 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile
@@ -1,5 +1,7 @@
 # $Id$
 
+BIN = EC_Multiple
+
 SRC = $(BIN:%=%$(VAR).cpp)
 LDLIBS= -lorbsvcs -lTAO
 
@@ -10,15 +12,6 @@ endif
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN2 = EC_Multiple
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -44,6 +37,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -65,272 +61,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Sched_Params.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -345,16 +79,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
diff --git a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
index 6a80cf9cf88..df3183f0c3f 100755
--- a/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Multiple/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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;
 
@@ -12,13 +11,13 @@ $NS_ior = "NameService.ior";
 $sleeptime = 3;
 
 $NS = Process::Create ("../../Naming_Service/Naming_Service".
-                       $Process::EXE_EXT." -o $NS_ior ");
+		       $Process::EXE_EXT." -o $NS_ior ");
 
 sleep $sleeptime;
 
 # This is a very simple test, no multiple consumers and no gateways.
 $status = system ($EXEPREFIX."EC_Multiple".$Process::EXE_EXT.
-                  " -s local");
+		  " -s local");
 
 $NS->Kill ();
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/svc.conf b/TAO/orbsvcs/tests/EC_Multiple/svc.conf
new file mode 100644
index 00000000000..272f088b3dd
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Multiple/svc.conf
@@ -0,0 +1,7 @@
+# $Id$
+#
+# The options are described in $TAO_ROOT/docs/Options.html
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index 235306bb1ca..dfac0802a25 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -26,8 +26,7 @@ Test_Consumer::Test_Consumer (ECT_Driver *driver,
 void
 Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
                         const char* name,
-                        int type_start,
-                        int type_count,
+                        int event_a, int event_b,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
                         CORBA::Environment& TAO_IN_ENV)
 {
@@ -54,10 +53,8 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler,
   ACE_ConsumerQOS_Factory qos;
   qos.start_disjunction_group ();
   qos.insert_type (ACE_ES_EVENT_SHUTDOWN, rt_info);
-  for (int i = 0; i != type_count; ++i)
-    {
-      qos.insert_type (type_start + i, rt_info);
-    }
+  qos.insert_type (event_a, rt_info);
+  qos.insert_type (event_b, rt_info);
 
   // = Connect as a consumer.
   RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
@@ -90,7 +87,7 @@ Test_Consumer::disconnect (CORBA::Environment &TAO_IN_ENV)
     RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   // Deactivate the servant
-  PortableServer::POA_var poa =
+  PortableServer::POA_var poa = 
     this->_default_POA (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   PortableServer::ObjectId_var id =
@@ -103,20 +100,20 @@ Test_Consumer::disconnect (CORBA::Environment &TAO_IN_ENV)
 void
 Test_Consumer::dump_results (const char* name)
 {
-  this->throughput_.dump_results ("ECT_Consumers", name);
-  this->latency_.dump_results ("ECT_Consumers", name);
-}
-
-void
-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_);
+  ACE_Time_Value tv;
+  this->timer_.elapsed_time (tv);
+  double f = 1.0 / (tv.sec () + tv.usec () / 1000000.0);
+  double eps = this->recv_count_ * f;
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "ECT_Consumer (%s):\n"
+              "    Total time: %d.%08.8d (secs.usecs)\n"
+              "    Total events: %d\n"
+              "    Events per second: %.3f\n",
+              name,
+              tv.sec (), tv.usec (),
+              this->recv_count_,
+              eps));
 }
 
 void
@@ -125,8 +122,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
 {
   if (events.length () == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "ECT_Consumer (%P|%t) no events\n"));
+      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
       return;
     }
 
@@ -134,18 +130,16 @@ 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->throughput_.start ();
-
-  this->throughput_.sample ();
+    this->timer_.start ();
 
   this->recv_count_ += events.length ();
 
   if (TAO_debug_level > 0
-      && this->recv_count_ % 100 == 0)
+      && this->recv_count_ % 1000 == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "ECT_Consumer (%P|%t): %d events received\n",
-                  this->recv_count_));
+		  this->recv_count_));
     }
 
   // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
@@ -154,6 +148,11 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
     {
       const RtecEventComm::Event& e = events[i];
 
+      if (e.data.payload.mb () == 0)
+        {
+          // ACE_DEBUG ((LM_DEBUG, "No data in event[%d]\n", i));
+          // continue;
+        }
       if (e.header.type == ACE_ES_EVENT_SHUTDOWN)
         {
           this->shutdown_count_++;
@@ -161,7 +160,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->timer_.stop ();
               this->driver_->shutdown_consumer (this->cookie_, TAO_IN_ENV);
             }
         }
@@ -170,10 +169,21 @@ Test_Consumer::push (const RtecEventComm::EventSet& events,
           ACE_hrtime_t creation;
           ORBSVCS_Time::TimeT_to_hrtime (creation,
                                          e.header.creation_time);
+          
+          ACE_hrtime_t ec_recv;
+          ORBSVCS_Time::TimeT_to_hrtime (ec_recv,
+                                         e.header.ec_recv_time);
+
+          ACE_hrtime_t ec_send;
+          ORBSVCS_Time::TimeT_to_hrtime (ec_send,
+                                         e.header.ec_send_time);
 
           const ACE_hrtime_t now = ACE_OS::gethrtime ();
           const ACE_hrtime_t elapsed = now - creation;
-          this->latency_.sample (elapsed);
+          this->driver_->end_to_end (elapsed);
+          this->driver_->supplier_to_ec (ec_recv - creation);
+          this->driver_->inside_ec (ec_send - ec_recv);
+          this->driver_->ec_to_consumer (now - ec_send);
         }
     }
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
index e66f3185cbc..c59cee0a4dd 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h
@@ -13,26 +13,24 @@
 #ifndef ECT_CONSUMER_H
 #define ECT_CONSUMER_H
 
-#include "ECT_Driver.h"
+#include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/High_Res_Timer.h"
 #include "orbsvcs/Channel_Clients_T.h"
-#include "ace/Task.h"
+
+#include "ECT_Driver.h"
 
 class Test_Consumer : public POA_RtecEventComm::PushConsumer
 {
+  //
   // = TITLE
   //   Receive the events.
   //
   // = DESCRIPTION
-  //   This class is a consumer of events. It subscribes for a
-  //   continous ranges of event types, this permits studying the
-  //   effect of the number of subscriptions for each particular kind
-  //   of event on the EC.
-  //
 public:
   Test_Consumer (ECT_Driver* driver,
                  void* cookie,
@@ -40,8 +38,8 @@ public:
 
   void connect (RtecScheduler::Scheduler_ptr scheduler,
                 const char* name,
-                int type_start,
-                int type_count,
+                int event_a,
+                int event_b,
                 RtecEventChannelAdmin::EventChannel_ptr ec,
                 CORBA::Environment& _env);
   // This method connects the consumer to the EC.
@@ -52,12 +50,6 @@ public:
   void dump_results (const char* name);
   // Print out the results
 
-  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);
   virtual void disconnect_push_consumer (CORBA::Environment &);
@@ -80,14 +72,9 @@ private:
 
   ACE_SYNCH_MUTEX lock_;
   int recv_count_;
+  ACE_High_Res_Timer timer_;
   // How many events we have received.
 
-  ECT_Driver::Throughput_Stats throughput_;
-  // Used for reporting stats.
-
-  ECT_Driver::Latency_Stats latency_;
-  // Used for reporting stats.
-
   int shutdown_count_;
   // How many shutdown events we have received.
 };
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 912c35b0ddf..b8e68020b14 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -25,9 +25,8 @@ main (int argc, char *argv [])
 ECT_Consumer_Driver::ECT_Consumer_Driver (void)
   : n_consumers_ (1),
     n_suppliers_ (1),
-    type_start_ (ACE_ES_EVENT_UNDEFINED),
-    type_count_ (1),
-    shutdown_event_channel_ (1),
+    event_a_ (ACE_ES_EVENT_UNDEFINED),
+    event_b_ (ACE_ES_EVENT_UNDEFINED + 1),
     pid_file_name_ (0),
     active_count_ (0)
 {
@@ -68,14 +67,14 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
                   "Execution parameters:\n"
                   "  consumers = <%d>\n"
                   "  suppliers = <%d>\n"
-                  "  type_start = <%d>\n"
-                  "  type count = <%d>\n"
+                  "  supplier Event A = <%d>\n"
+                  "  supplier Event B = <%d>\n"
                   "  pid file name = <%s>\n",
 
                   this->n_consumers_,
                   this->n_suppliers_,
-                  this->type_start_,
-                  this->type_start_,
+                  this->event_a_,
+                  this->event_b_,
 
                   this->pid_file_name_?this->pid_file_name_:"nil") );
 
@@ -132,7 +131,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       TAO_CHECK_ENV;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
-      RtecScheduler::Scheduler_var scheduler =
+      RtecScheduler::Scheduler_var scheduler = 
         RtecScheduler::Scheduler::_narrow (sched_obj.in (),
                                            TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -171,11 +170,8 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
       this->disconnect_consumers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      if (this->shutdown_event_channel_ != 0)
-        {
-          channel->destroy (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
+      channel->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
   TAO_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -227,8 +223,8 @@ ECT_Consumer_Driver::connect_consumers
 
       this->consumers_[i]->connect (scheduler,
                                     buf,
-                                    this->type_start_,
-                                    this->type_count_,
+                                    this->event_a_,
+                                    this->event_b_,
                                     channel,
                                     TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -238,20 +234,14 @@ ECT_Consumer_Driver::connect_consumers
 void
 ECT_Consumer_Driver::dump_results (void)
 {
-  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);
-      this->consumers_[i]->accumulate (throughput);
-      this->consumers_[i]->accumulate (latency);
     }
-  throughput.dump_results ("ECT_Consumer", "accumulated");
-  latency.dump_results ("ECT_Consumer", "accumulated");
-  // this->dump_latency_results ("Latency");
+  this->dump_latency_results ("Latency");
 }
 
 void
@@ -267,17 +257,13 @@ ECT_Consumer_Driver::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 int
 ECT_Consumer_Driver::parse_args (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:");
+  ACE_Get_Opt get_opt (argc, argv, "dc:s:h:p:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
     {
       switch (opt)
         {
-        case 'x':
-          this->shutdown_event_channel_ = 0;
-          break;
-
         case 'c':
           this->n_consumers_ = ACE_OS::atoi (get_opt.optarg);
           break;
@@ -291,9 +277,9 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
             char* aux;
                 char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
 
-            this->type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
+            this->event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->type_count_ = ACE_OS::atoi (arg);
+            this->event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
           }
           break;
 
@@ -306,10 +292,9 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
                       "[ORB options] "
-                      "-d -x "
                       "-c <n_consumers> "
                       "-s <n_suppliers> "
-                      "-h <type_start,type_count> "
+                      "-h <event_a,event_b> "
                       "-p <pid file name> "
                       "\n",
                       argv[0]));
@@ -329,19 +314,10 @@ ECT_Consumer_Driver::parse_args (int argc, char *argv [])
 
   if (this->n_consumers_ <= 0)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of consumers or "
                          "suppliers out of range\n", argv[0]), -1);
     }
 
-  if (this->type_count_ <= 0)
-    {
-      this->type_count_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%s: number of event types "
-                         "suppliers out of range, reset to default (1)\n",
-                         argv[0]), -1);
-    }
-
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
index a05a822a151..36827c86218 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h
@@ -74,13 +74,9 @@ private:
   // supplier sends a shutdown message after it finishes, the consumer
   // finishes when all the suppliers do.
 
-  int type_start_;
-  int type_count_;
-  // We receive the events whose type is in the range
-  // [type_start,type_start+type_count)
-
-  int shutdown_event_channel_;
-  // If not zero it will shutdown the event channel upon exit.
+  int event_a_;
+  int event_b_;
+  // We send two types of events, with different contents.
 
   const char* pid_file_name_;
   // The name of a file where the process stores its pid
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
index 262338fe9be..56d9044432d 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "ECT_Driver.h"
-#include "ace/High_Res_Timer.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ECT_Driver.i"
@@ -17,121 +16,32 @@ 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)
+ECT_Driver::Latency_Stats::dump_results (const char *description,
+                                         const char *desc2)
 {
   if (this->n_ <= 1)
     return;
 
   ACE_hrtime_t avg = this->sum_ / this->n_;
   ACE_hrtime_t dev =
-    this->sum2_ / this->n_ - avg*avg;
+    this->sum2_ / (this->n_ - 1)
+    - (this->sum_ / this->n_) * (this->sum_ / (this->n_ - 1));
 
-  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);
+  double min_usec = ACE_CU64_TO_CU32 (this->min_ / 1000);
+  double max_usec = ACE_CU64_TO_CU32 (this->max_ / 1000);
+  double avg_usec = ACE_CU64_TO_CU32 (avg / 1000);
+  double dev_usec = ACE_CU64_TO_CU32 (dev / 1000);
   ACE_DEBUG ((LM_DEBUG,
-              "%s/%s: %.2f/%.2f/%.2f/%.2f (min/avg/max/var^2) [usecs]\n",
-              test_name, sub_test,
+              "%s (%s): %.2f/%.2f/%.2f/%.2f (min/avg/max/dev2) [usecs]\n",
+              description, desc2,
               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 0a5b96dbc92..0124a535ba1 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -52,14 +52,11 @@ public:
   public:
     Latency_Stats (void);
 
-    void dump_results (const char* test_name,
-                       const char* sub_test);
+    void dump_results (const char* description,
+                       const char* description2);
 
     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_;
@@ -68,41 +65,6 @@ public:
     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_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
index c4481a2da3d..a0fabf450c8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.i
@@ -31,28 +31,6 @@ void ECT_Driver::Latency_Stats::sample (ACE_hrtime_t sample)
 
 // ****************************************************************
 
-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)
 {
@@ -76,4 +54,3 @@ 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_Scheduler_Info.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
index 591904a2129..93b22e16916 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Scheduler_Info.h
@@ -6,68 +6,68 @@
 
 static ACE_Scheduler_Factory::POD_RT_Info runtime_infos[] = {
 { "Reactor_Task-25000.us", 1, 0, 0, 0, 250000,
-   4, 0, 0, 1, 127, 0, 0, 0 },
+   4, 0, 0, 1, 8, 0, 0, 0 },
 { "Reactor_Task-50000.us", 2, 0, 0, 0, 500000,
-   4, 0, 0, 1, 125, 0, 0, 0 },
+   4, 0, 0, 1, 6, 0, 0, 0 },
 { "Reactor_Task-100000.us", 3, 0, 0, 0, 1000000,
-   4, 0, 0, 1, 123, 0, 0, 0 },
+   4, 0, 0, 1, 4, 0, 0, 0 },
 { "Reactor_Task-200000.us", 4, 0, 0, 0, 2000000,
-   4, 0, 0, 1, 121, 0, 0, 0 },
+   4, 0, 0, 1, 2, 0, 0, 0 },
 { "Reactor_Task-1000000.us", 5, 0, 0, 0, 10000000,
-   4, 0, 0, 1, 119, 0, 0, 0 },
+   4, 0, 0, 1, 0, 0, 0, 0 },
 
 { "ACE_ES_Dispatch_Queue-25000.us", 6, 0, 0, 0, 0,
-   4, 0, 0, 1, 128, 0, 0, 0 },
+   4, 0, 0, 1, 9, 0, 0, 0 },
 { "ACE_ES_Dispatch_Queue-50000.us", 7, 0, 0, 0, 0,
-   4, 0, 0, 1, 126, 0, 0, 0 },
+   4, 0, 0, 1, 7, 0, 0, 0 },
 { "ACE_ES_Dispatch_Queue-100000.us", 8, 0, 0, 0, 0,
-   4, 0, 0, 1, 124, 0, 0, 0 },
+   4, 0, 0, 1, 5, 0, 0, 0 },
 { "ACE_ES_Dispatch_Queue-200000.us", 9, 0, 0, 0, 0,
-   4, 0, 0, 1, 122, 0, 0, 0 },
+   4, 0, 0, 1, 3, 0, 0, 0 },
 { "ACE_ES_Dispatch_Queue-1000000.us", 10, 0, 0, 0, 0,
-   4, 0, 0, 1, 120, 0, 0, 0 },
+   4, 0, 0, 1, 1, 0, 0, 0 },
 
 { "supplier_00", 11, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_01", 12, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_02", 13, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_03", 14, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_04", 15, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_05", 16, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_06", 17, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_07", 18, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_08", 19, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 { "supplier_09", 20, 20000, 20000, 20000, 250000,
-   4, 0, 20000, 1, 127, 0, 0, 0 },
+   4, 0, 20000, 1, 8, 0, 0, 0 },
 
 { "consumer_00", 28, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_01", 29, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_02", 30, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_03", 31, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_04", 32, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_05", 33, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_06", 34, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_07", 35, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_08", 36, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 },
+   4, 0, 20000, 0, 9, 0, 0, 0 },
 { "consumer_09", 37, 20000, 20000, 20000, 0,
-   4, 0, 20000, 0, 128, 0, 0, 0 }
+   4, 0, 20000, 0, 9, 0, 0, 0 }
 };
 
 static int runtime_infos_size = sizeof(runtime_infos)/sizeof(runtime_infos[0]);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 80eca900ec1..09c2097252f 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -18,9 +18,7 @@ Test_Supplier::Test_Supplier (ECT_Driver *driver)
      burst_count_ (0),
      burst_size_ (0),
      event_size_ (0),
-     burst_pause_ (0),
-     type_start_ (ACE_ES_EVENT_UNDEFINED),
-     type_count_ (1)
+     burst_pause_ (0)
 {
 }
 
@@ -31,8 +29,8 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
                         int burst_size,
                         int event_size,
                         int burst_pause,
-                        int type_start,
-                        int type_count,
+                        int event_a,
+                        int event_b,
                         RtecEventChannelAdmin::EventChannel_ptr ec,
                         CORBA::Environment &TAO_IN_ENV)
 {
@@ -40,9 +38,9 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
   this->burst_size_ = burst_size;
   this->event_size_ = event_size;
   this->burst_pause_ = burst_pause;
-  this->type_start_ = type_start;
-  this->type_count_ = type_count;
-
+  this->event_a_ = event_a;
+  this->event_b_ = event_b;
+    
   RtecScheduler::handle_t rt_info =
     scheduler->create (name, TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -73,12 +71,12 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler,
               this->supplier_id_));
 
   ACE_SupplierQOS_Factory qos;
-  for (int i = 0; i != type_count; ++i)
-    {
-      qos.insert (this->supplier_id_,
-                  type_start + i,
-                  rt_info, 1);
-    }
+  qos.insert (this->supplier_id_,
+              event_a,
+              rt_info, 1);
+  qos.insert (this->supplier_id_,
+              event_b,
+              rt_info, 1);
   qos.insert (this->supplier_id_,
               ACE_ES_EVENT_SHUTDOWN,
               rt_info, 1);
@@ -114,7 +112,7 @@ Test_Supplier::disconnect (CORBA::Environment &TAO_IN_ENV)
     RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   // Deactivate the servant
-  PortableServer::POA_var poa =
+  PortableServer::POA_var poa = 
     this->supplier_._default_POA (TAO_IN_ENV);
   TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
   PortableServer::ObjectId_var id =
@@ -128,12 +126,20 @@ Test_Supplier::disconnect (CORBA::Environment &TAO_IN_ENV)
 int
 Test_Supplier::svc ()
 {
+  int min_priority =
+    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
+  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+
+  if (ACE_OS::thr_setprio (min_priority) == -1)
+    {
+      ACE_ERROR ((LM_ERROR, "Test_Supplier::svc (%P|%t) "
+                  "thr_setprio failed\n"));
+    }
+
   TAO_TRY
     {
-      // Initialize a time value to pace the test
       ACE_Time_Value tv (0, this->burst_pause_);
 
-      // Pre-allocate a message to send
       ACE_Message_Block mb (this->event_size_);
       mb.wr_ptr (this->event_size_);
 
@@ -144,8 +150,8 @@ Test_Supplier::svc ()
 
       ACE_hrtime_t t = ACE_OS::gethrtime ();
       ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
-      event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
-      event[0].header.ec_send_time = ORBSVCS_Time::zero ();
+      event[0].header.ec_recv_time = ORBSVCS_Time::zero;
+      event[0].header.ec_send_time = ORBSVCS_Time::zero;
 
       event[0].data.x = 0;
       event[0].data.y = 0;
@@ -155,13 +161,15 @@ Test_Supplier::svc ()
       event[0].data.payload.replace (this->event_size_,
                                      &mb);
 
-      this->throughput_.start ();
+      this->timer_.start ();
       for (int i = 0; i < this->burst_count_; ++i)
         {
           for (int j = 0; j < this->burst_size_; ++j)
             {
-              event[0].header.type =
-                this->type_start_ + j % this->type_count_;
+              if (j % 2 == 0)
+                event[0].header.type = this->event_a_;
+              else
+                event[0].header.type = this->event_b_;
 
               ACE_hrtime_t now = ACE_OS::gethrtime ();
               ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
@@ -171,29 +179,15 @@ Test_Supplier::svc ()
 
               TAO_CHECK_ENV;
             }
-          this->throughput_.sample ();
-
-          if (TAO_debug_level > 0
-              && i % 100 == 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "ECT_Supplier (%P|%t): %d bursts sent\n",
-                          i));
-            }
-
           ACE_OS::sleep (tv);
         }
 
       // Send one event shutdown from each supplier
       event[0].header.type = ACE_ES_EVENT_SHUTDOWN;
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
-                                     now);
       this->consumer_proxy ()->push(event, TAO_TRY_ENV);
       TAO_CHECK_ENV;
-      this->throughput_.sample ();
-      this->throughput_.stop ();
-
+      this->timer_.stop ();
+      
     }
   TAO_CATCH (CORBA::SystemException, sys_ex)
     {
@@ -204,10 +198,6 @@ Test_Supplier::svc ()
       TAO_TRY_ENV.print_exception ("NON SYS EX");
     }
   TAO_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier %4.4x completed\n",
-              this->supplier_id_));
   return 0;
 }
 
@@ -230,13 +220,22 @@ Test_Supplier::consumer_proxy (void)
 void
 Test_Supplier::dump_results (const char* name)
 {
-  this->throughput_.dump_results ("ECT_Supplier", name);
-}
+  ACE_Time_Value tv;
+  this->timer_.elapsed_time (tv);
 
-void
-Test_Supplier::accumulate (ECT_Driver::Throughput_Stats& stats) const
-{
-  stats.accumulate (this->throughput_);
+  int event_count = this->burst_count_ * this->burst_size_ + 1;
+  double f = 1.0 / (tv.sec () + tv.usec () / 1000000.0);
+  double eps = event_count * f;
+  
+  ACE_DEBUG ((LM_DEBUG,
+              "ECT_Supplier (%s):\n"
+              "    Total time: %d.%08.8d (secs.usecs)\n"
+              "    Total events: %d\n"
+              "    Events per second: %.3f\n",
+              name,
+              tv.sec (), tv.usec (),
+              event_count,
+              eps));
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
index 4c1326497fb..a694b13fb2e 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h
@@ -4,22 +4,24 @@
 // ============================================================================
 //
 // = DESCRIPTION
-//   This is a helper class for the throughput tests of the Event
-//   Channel.
+//   This test to measure how many events per minute can the EC
+//   process, it also serves as an example how how to encode complex
+//   data types in a octet sequence.
 //
 // ============================================================================
 
 #ifndef ECT_SUPPLIER_H
 #define ECT_SUPPLIER_H
 
-#include "ECT_Driver.h"
+#include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/High_Res_Timer.h"
 #include "orbsvcs/Channel_Clients_T.h"
-#include "ace/Task.h"
+#include "ECT_Driver.h"
 
 class Test_Supplier : public ACE_Task<ACE_SYNCH>
 {
@@ -41,8 +43,8 @@ public:
                 int burst_size,
                 int event_size,
                 int burst_pause,
-                int type_start,
-                int type_count,
+                int event_a,
+                int event_b,
                 RtecEventChannelAdmin::EventChannel_ptr ec,
                 CORBA::Environment& _env);
   // This method connects the supplier to the EC.
@@ -63,9 +65,6 @@ public:
   void dump_results (const char* name);
   // Dump the results...
 
-  void accumulate (ECT_Driver::Throughput_Stats& stats) const;
-  // Add our statistics to <stats>
-
 private:
   ECT_Driver *driver_;
   // Class we forward to.
@@ -83,15 +82,15 @@ private:
   // We also connect to the EC as a consumer so we can receive the
   // timeout events.
 
-  ECT_Driver::Throughput_Stats throughput_;
+  ACE_High_Res_Timer timer_;
   // Measure the elapsed time spent while sending the events.
 
   int burst_count_;
   int burst_size_;
   int event_size_;
   int burst_pause_;
-  int type_start_;
-  int type_count_;
+  int event_a_;
+  int event_b_;
   // The test data.
 };
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 7ccdb843f82..7444b067e0b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -28,8 +28,8 @@ ECT_Supplier_Driver::ECT_Supplier_Driver (void)
     burst_size_ (100),
     event_size_ (128),
     burst_pause_ (100),
-    type_start_ (ACE_ES_EVENT_UNDEFINED),
-    type_count_ (1),
+    event_a_ (ACE_ES_EVENT_UNDEFINED),
+    event_b_ (ACE_ES_EVENT_UNDEFINED + 1),
     pid_file_name_ (0)
 {
 }
@@ -77,9 +77,9 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                   "  burst count = <%d>\n"
                   "  burst size = <%d>\n"
                   "  event size = <%d>\n"
-                  "  burst pause = <%d>\n"
-                  "  type start = <%d>\n"
-                  "  type count = <%d>\n"
+                  "  burst size = <%d>\n"
+                  "  supplier Event A = <%d>\n"
+                  "  supplier Event B = <%d>\n"
                   "  pid file name = <%s>\n",
 
                   this->n_suppliers_,
@@ -87,8 +87,8 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
                   this->burst_size_,
                   this->event_size_,
                   this->burst_pause_,
-                  this->type_start_,
-                  this->type_count_,
+                  this->event_a_,
+                  this->event_b_,
 
                   this->pid_file_name_?this->pid_file_name_:"nil") );
 
@@ -145,7 +145,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       TAO_CHECK_ENV;
       if (CORBA::is_nil (sched_obj.in ()))
         return 1;
-      RtecScheduler::Scheduler_var scheduler =
+      RtecScheduler::Scheduler_var scheduler = 
         RtecScheduler::Scheduler::_narrow (sched_obj.in (),
                                            TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -168,7 +168,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
       poa_manager->activate (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      this->connect_suppliers (scheduler.in (),
+      this->connect_suppliers (scheduler.in (), 
                                channel.in (),
                                TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -227,8 +227,8 @@ ECT_Supplier_Driver::connect_suppliers
                                     this->burst_size_,
                                     this->event_size_,
                                     this->burst_pause_,
-                                    this->type_start_,
-                                    this->type_count_,
+                                    this->event_a_,
+                                    this->event_b_,
                                     channel,
                                     TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
@@ -257,16 +257,13 @@ ECT_Supplier_Driver::disconnect_suppliers (CORBA::Environment &TAO_IN_ENV)
 void
 ECT_Supplier_Driver::dump_results (void)
 {
-  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);
-      this->suppliers_[i]->accumulate (throughput);
     }
-  throughput.dump_results ("ECT_Supplier", "accumulated");
 }
 
 int
@@ -304,9 +301,9 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
             char* aux;
                 char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
 
-            this->type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
+            this->event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->type_count_ = ACE_OS::atoi (arg);
+            this->event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
           }
           break;
 
@@ -323,8 +320,8 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
                       "-u <burst count> "
                       "-n <burst size> "
                       "-b <event payload size> "
-                      "-t <burst pause (usecs)> "
-                      "-h <type_start,type_count> "
+                      "-T <burst pause (usecs)> "
+                      "-h <eventa,eventb> "
                       "-p <pid file name> "
                       "\n",
                       argv[0]));
@@ -365,7 +362,7 @@ ECT_Supplier_Driver::parse_args (int argc, char *argv [])
   if (this->n_suppliers_ <= 0)
     {
       this->n_suppliers_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of suppliers out of range, "
                          "reset to default (%d)\n",
                          argv[0], 1), -1);
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
index a4294e0e929..7db63600626 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h
@@ -4,8 +4,9 @@
 // ============================================================================
 //
 // = DESCRIPTION
-//   This is a helper class for the throughput tests of the Event
-//   Channel.
+//   This test to measure how many events per minute can the EC
+//   process, it also serves as an example how how to encode complex
+//   data types in a octet sequence.
 //
 // ============================================================================
 
@@ -81,8 +82,8 @@ private:
   int burst_pause_;
   // The time between each event burst, in microseconds.
 
-  int type_start_;
-  int type_count_;
+  int event_a_;
+  int event_b_;
   // We send two types of events, with different contents.
 
   const char* pid_file_name_;
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 3381064c357..9fac6231604 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -3,7 +3,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
-#include "ace/High_Res_Timer.h"
 
 #include "tao/Timeprobe.h"
 #include "orbsvcs/Event_Utilities.h"
@@ -15,8 +14,7 @@
 #include "orbsvcs/Event/Event_Channel.h"
 #include "orbsvcs/Event/Module_Factory.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_ConsumerAdmin.h"
+#include "orbsvcs/Event/EC_Basic_Factory.h"
 #include "ECT_Throughput.h"
 
 ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$")
@@ -24,8 +22,6 @@ ACE_RCSID(EC_Throughput, ECT_Throughput, "$Id$")
 int
 main (int argc, char *argv [])
 {
-  TAO_EC_Default_Factory::init_svcs ();
-
   ECT_Throughput driver;
   return driver.run (argc, argv);
 }
@@ -39,18 +35,12 @@ ECT_Throughput::ECT_Throughput (void)
     burst_size_ (100),
     event_size_ (128),
     burst_pause_ (100),
-    consumer_type_start_ (ACE_ES_EVENT_UNDEFINED),
-    consumer_type_count_ (1),
-    consumer_type_shift_ (0),
-    supplier_type_start_ (ACE_ES_EVENT_UNDEFINED),
-    supplier_type_count_ (1),
-    supplier_type_shift_ (0),
+    event_a_ (ACE_ES_EVENT_UNDEFINED),
+    event_b_ (ACE_ES_EVENT_UNDEFINED + 1),
     pid_file_name_ (0),
     active_count_ (0),
     reactive_ec_ (0),
-    new_ec_ (1),
-    ec_concurrency_hwm_ (1),
-    thr_create_flags_ (THR_NEW_LWP|THR_BOUND|THR_SCHED_FIFO)
+    new_ec_ (0)
 {
 }
 
@@ -63,10 +53,6 @@ ECT_Throughput::run (int argc, char* argv[])
 {
   TAO_TRY
     {
-      // Calibrate the high resolution timer *before* starting the
-      // test.
-      ACE_High_Res_Timer::calibrate ();
-
       this->orb_ =
         CORBA::ORB_init (argc, argv, "", TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -96,17 +82,12 @@ ECT_Throughput::run (int argc, char* argv[])
                   "  burst count = <%d>\n"
                   "  burst size = <%d>\n"
                   "  event size = <%d>\n"
-                  "  burst pause = <%d>\n"
-                  "  consumer type start = <%d>\n"
-                  "  consumer type count = <%d>\n"
-                  "  consumer type shift = <%d>\n"
-                  "  supplier type start = <%d>\n"
-                  "  supplier type count = <%d>\n"
-                  "  supplier type shift = <%d>\n"
+                  "  burst size = <%d>\n"
+                  "  supplier Event A = <%d>\n"
+                  "  supplier Event B = <%d>\n"
                   "  pid file name = <%s>\n"
                   "  remote EC = <%d>\n"
-                  "  new EC = <%d>\n"
-                  "  concurrency HWM = <%d>\n",
+                  "  new EC = <%d>\n",
 
                   this->n_consumers_,
                   this->n_suppliers_,
@@ -114,17 +95,12 @@ ECT_Throughput::run (int argc, char* argv[])
                   this->burst_size_,
                   this->event_size_,
                   this->burst_pause_,
-                  this->consumer_type_start_,
-                  this->consumer_type_count_,
-                  this->consumer_type_shift_,
-                  this->supplier_type_start_,
-                  this->supplier_type_count_,
-                  this->supplier_type_shift_,
+                  this->event_a_,
+                  this->event_b_,
 
                   this->pid_file_name_?this->pid_file_name_:"nil",
                   this->reactive_ec_,
-                  this->new_ec_,
-                  this->ec_concurrency_hwm_
+                  this->new_ec_
                   ) );
 
       if (this->pid_file_name_ != 0)
@@ -137,30 +113,24 @@ ECT_Throughput::run (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.
+      int min_priority =
+        ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
+        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                                  priority,
+                                                  min_priority,
                                                   ACE_SCOPE_PROCESS)) != 0)
         {
           if (ACE_OS::last_error () == EPERM)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "%s: user is not superuser, "
-                          "so remain in time-sharing class\n", argv[0]));
-              this->thr_create_flags_ = THR_NEW_LWP;
-            }
+            ACE_DEBUG ((LM_DEBUG,
+                        "%s: user is not superuser, "
+                        "so remain in time-sharing class\n", argv[0]));
           else
             ACE_ERROR ((LM_ERROR,
                         "%s: ACE_OS::sched_params failed\n", argv[0]));
         }
 
-      if (ACE_OS::thr_setprio (priority) == -1)
+      if (ACE_OS::thr_setprio (min_priority) == -1)
         {
           ACE_ERROR ((LM_ERROR, "(%P|%t) main thr_setprio failed,"
                       "no real-time features\n"));
@@ -188,7 +158,7 @@ ECT_Throughput::run (int argc, char* argv[])
 #else
 #include "ECT_Scheduler_Info.h"
       ACE_Runtime_Scheduler scheduler_impl (
-        runtime_configs_size,
+	runtime_configs_size,
         runtime_configs,
         runtime_infos_size,
         runtime_infos);
@@ -205,7 +175,7 @@ ECT_Throughput::run (int argc, char* argv[])
                   str.in ()));
 
       // Register the servant with the Naming Context....
-      naming_context->rebind (schedule_name, scheduler.in (), TAO_TRY_ENV);
+      naming_context->bind (schedule_name, scheduler.in (), TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
@@ -214,6 +184,7 @@ ECT_Throughput::run (int argc, char* argv[])
       // The factories must be destroyed *after* the EC, hence the
       // auto_ptr declarations must go first....
       auto_ptr<TAO_Module_Factory> module_factory;
+      auto_ptr<TAO_EC_Factory> ec_factory;
 
       auto_ptr<POA_RtecEventChannelAdmin::EventChannel> ec_impl;
       if (this->new_ec_ == 0)
@@ -221,38 +192,41 @@ ECT_Throughput::run (int argc, char* argv[])
 
           if (this->reactive_ec_ == 1)
             {
-              auto_ptr<TAO_Module_Factory> auto_module_factory (new TAO_Reactive_Module_Factory);
-              module_factory = auto_module_factory;
+              module_factory =
+                auto_ptr<TAO_Module_Factory> (new TAO_Reactive_Module_Factory);
             }
           else
             {
-              auto_ptr<TAO_Module_Factory> auto_module_factory (new TAO_Default_Module_Factory);
-              module_factory = auto_module_factory;
+              module_factory =
+                auto_ptr<TAO_Module_Factory> (new TAO_Default_Module_Factory);
             }
 
           // Create the EC
-          auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl
-            (new ACE_EventChannel (scheduler.in (),
-                                   1,
-                                   ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-                                   module_factory.get ()));
-          ec_impl = auto_ec_impl;
+          ec_impl =
+            auto_ptr<POA_RtecEventChannelAdmin::EventChannel>
+                (new ACE_EventChannel (scheduler.in (),
+                                       1,
+                                       ACE_DEFAULT_EVENT_CHANNEL_TYPE,
+                                       module_factory.get ()));
         }
       else
         {
-          TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
-                                                root_poa.in ());
-          attr.busy_hwm = this->ec_concurrency_hwm_;
-          attr.max_write_delay = this->ec_concurrency_hwm_;
-
-          TAO_EC_Event_Channel *ec =
-            new TAO_EC_Event_Channel (attr);
+#if defined (TAO_ORBSVCS_HAS_Event2)
+          ec_factory =
+            auto_ptr<TAO_EC_Factory>(new TAO_EC_Basic_Factory (root_poa.in ()));
 
+          TAO_EC_Event_Channel* ec =
+            new TAO_EC_Event_Channel (ec_factory.get ());
           ec->activate (TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
-          auto_ptr<POA_RtecEventChannelAdmin::EventChannel> auto_ec_impl (ec);
-          ec_impl = auto_ec_impl;
+          ec_impl =
+            auto_ptr<POA_RtecEventChannelAdmin::EventChannel> (ec);
+#else
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "The new event channel is not supported "
+                             "please recompile\n"), 1);
+#endif /* TAO_ORBSVCS_HAS_Event2 */
         }
 
       RtecEventChannelAdmin::EventChannel_var channel =
@@ -279,6 +253,16 @@ ECT_Throughput::run (int argc, char* argv[])
 
       ACE_DEBUG ((LM_DEBUG, "suppliers are active\n"));
 
+      ACE_DEBUG ((LM_DEBUG, "running the event loop\n"));
+      if (this->orb_->run () == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
+      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
+
+#if 0
+      naming_context->unbind (schedule_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+#endif
+
       // Wait for the supplier threads...
       if (ACE_Thread_Manager::instance ()->wait () == -1)
         {
@@ -302,8 +286,6 @@ ECT_Throughput::run (int argc, char* argv[])
         TAO_CHECK_ENV;
       }
 
-      ACE_DEBUG ((LM_DEBUG, "EC deactivated\n"));
-
       {
         // Deactivate the Scheduler
         PortableServer::POA_var poa =
@@ -316,22 +298,14 @@ ECT_Throughput::run (int argc, char* argv[])
         TAO_CHECK_ENV;
       }
 
-      ACE_DEBUG ((LM_DEBUG, "scheduler deactivated\n"));
-
       this->disconnect_consumers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, "consumers disconnected\n"));
-
       this->disconnect_suppliers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      ACE_DEBUG ((LM_DEBUG, "suppliers disconnected\n"));
-
       channel->destroy (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
-      ACE_DEBUG ((LM_DEBUG, "channel destroyed\n"));
     }
   TAO_CATCHANY
     {
@@ -347,7 +321,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
 void
 ECT_Throughput::shutdown_consumer (void*,
-                                   CORBA::Environment &)
+                               CORBA::Environment &)
 {
   // int ID =
   //   (ACE_reinterpret_cast(Test_Consumer**,consumer_cookie)
@@ -358,10 +332,7 @@ ECT_Throughput::shutdown_consumer (void*,
   ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
   this->active_count_--;
   if (this->active_count_ <= 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) shutting down the ORB\n"));
-      this->orb_->shutdown ();
-    }
+    this->orb_->shutdown ();
 }
 
 void
@@ -384,13 +355,10 @@ ECT_Throughput::connect_consumers
                               this->consumers_ + i,
                               this->n_suppliers_));
 
-      int start = this->consumer_type_start_
-        + i * this->consumer_type_shift_;
-
       this->consumers_[i]->connect (scheduler,
                                     buf,
-                                    start,
-                                    this->consumer_type_count_,
+                                    this->event_a_,
+                                    this->event_b_,
                                     channel,
                                     TAO_IN_ENV);
       if (TAO_IN_ENV.exception () != 0) return;
@@ -410,15 +378,14 @@ ECT_Throughput::connect_suppliers
 
       ACE_NEW (this->suppliers_[i], Test_Supplier (this));
 
-      int start = this->supplier_type_start_ + i*this->supplier_type_shift_;
       this->suppliers_[i]->connect (scheduler,
                                     buf,
                                     this->burst_count_,
                                     this->burst_size_,
                                     this->event_size_,
                                     this->burst_pause_,
-                                    start,
-                                    this->supplier_type_count_,
+                                    this->event_a_,
+                                    this->event_b_,
                                     channel,
                                     TAO_IN_ENV);
       if (TAO_IN_ENV.exception () != 0) return;
@@ -428,19 +395,9 @@ ECT_Throughput::connect_suppliers
 void
 ECT_Throughput::activate_suppliers (CORBA::Environment &)
 {
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
   for (int i = 0; i < this->n_suppliers_; ++i)
     {
-      if (this->suppliers_[i]->activate (this->thr_create_flags_,
-                                         1, 0, priority) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Cannot activate thread for supplier %d\n",
-                      i));
-        }
+      this->suppliers_[i]->activate ();
     }
 }
 
@@ -467,37 +424,27 @@ ECT_Throughput::disconnect_consumers (CORBA::Environment &TAO_IN_ENV)
 void
 ECT_Throughput::dump_results (void)
 {
-  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);
-      this->consumers_[j]->accumulate (consumers);
-      this->consumers_[j]->accumulate (latency);
     }
-  consumers.dump_results ("ECT_Consumer", "throughput");
-  latency.dump_results ("ECT_Consumer", "latency");
-
-  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);
-      this->suppliers_[i]->accumulate (suppliers);
     }
-  suppliers.dump_results ("ECT_Supplier", "accumulated");
   this->dump_latency_results ("Latency");
 }
 
 int
 ECT_Throughput::parse_args (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "rdc:s:u:n:t:b:h:l:p:m:w:");
+  ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:p:m:r");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -565,24 +512,9 @@ ECT_Throughput::parse_args (int argc, char *argv [])
             char* aux;
                 char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
 
-            this->consumer_type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-                arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->consumer_type_count_ = ACE_OS::atoi (arg);
+            this->event_a_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
                 arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->consumer_type_shift_ = ACE_OS::atoi (arg);
-          }
-          break;
-
-        case 'l':
-          {
-            char* aux;
-                char* arg = ACE_OS::strtok_r (get_opt.optarg, ",", &aux);
-
-            this->supplier_type_start_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
-                arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->supplier_type_count_ = ACE_OS::atoi (arg);
-                arg = ACE_OS::strtok_r (0, ",", &aux);
-            this->supplier_type_shift_ = ACE_OS::atoi (arg);
+            this->event_b_ = ACE_ES_EVENT_UNDEFINED + ACE_OS::atoi (arg);
           }
           break;
 
@@ -590,26 +522,19 @@ ECT_Throughput::parse_args (int argc, char *argv [])
           this->pid_file_name_ = get_opt.optarg;
           break;
 
-        case 'w':
-          this->ec_concurrency_hwm_ = ACE_OS::atoi (get_opt.optarg);
-          break;
-
         case '?':
         default:
           ACE_DEBUG ((LM_DEBUG,
                       "Usage: %s "
                       "[ORB options] "
-                      "-r -d -x "
                       "-c <n_consumers> "
                       "-s <n_suppliers> "
                       "-u <burst count> "
                       "-n <burst size> "
                       "-b <event payload size> "
                       "-t <burst pause (usecs)> "
-                      "-h <consumer_start,consumer_count,consumer_shift> "
-                      "-l <supplier_start,supplier_count,supplier_shift> "
+                      "-h <eventa,eventb> "
                       "-p <pid file name> "
-                      "-w <concurrency HWM> "
                       "-r "
                       "\n",
                       argv[0]));
@@ -651,7 +576,7 @@ ECT_Throughput::parse_args (int argc, char *argv [])
       || this->n_consumers_ >= ECT_Throughput::MAX_CONSUMERS)
     {
       this->n_consumers_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of consumers or "
                          "suppliers out of range, "
                          "reset to default (%d)\n",
@@ -662,7 +587,7 @@ ECT_Throughput::parse_args (int argc, char *argv [])
       || this->n_suppliers_ >= ECT_Throughput::MAX_SUPPLIERS)
     {
       this->n_suppliers_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: number of suppliers out of range, "
                          "reset to default (%d)\n",
                          argv[0], 1), -1);
@@ -672,21 +597,12 @@ ECT_Throughput::parse_args (int argc, char *argv [])
     {
       this->n_suppliers_ = 1;
       this->n_consumers_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
+      ACE_ERROR_RETURN ((LM_DEBUG,
                          "%s: no suppliers or consumers, "
                          "reset to default (%d of each)\n",
                          argv[0], 1), -1);
     }
 
-  if (this->ec_concurrency_hwm_ <= 0)
-    {
-      this->ec_concurrency_hwm_ = 1;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%s: invalid concurrency HWM, "
-                         "reset to default (%d)\n",
-                         argv[0], 1), -1);
-    }
-
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
index 8cf8380cda0..a37826e2543 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h
@@ -4,9 +4,6 @@
 // ============================================================================
 //
 // = DESCRIPTION
-//   This is a helper class for the throughput tests of the Event
-//   Channel.
-//   Used for the collocated test.
 //
 // ============================================================================
 
@@ -96,23 +93,9 @@ private:
   int burst_pause_;
   // The time between each event burst, in microseconds.
 
-  int consumer_type_start_;
-  int consumer_type_count_;
-  int consumer_type_shift_;
-  // The consumers subscribe to different sets of events, as follows:
-  // Consumer0: [start          , start           + count)
-  // Consumer1: [start + 1*shift, start + 1*shift + count)
-  // Consumer2: [start + 2*shift, start + 2*shift + count)
-  // And so on.
-
-  int supplier_type_start_;
-  int supplier_type_count_;
-  int supplier_type_shift_;
-  // The suppliers generate different sets of events, as follows:
-  // Supplier0: [start          , start           + count)
-  // Supplier1: [start + 1*shift, start + 1*shift + count)
-  // Supplier2: [start + 2*shift, start + 2*shift + count)
-  // And so on.
+  int event_a_;
+  int event_b_;
+  // We send two types of events, with different contents.
 
   const char* pid_file_name_;
   // The name of a file where the process stores its pid
@@ -129,12 +112,6 @@ private:
 
   int new_ec_;
   // If not zero then we use the new EC implementation
-
-  int ec_concurrency_hwm_;
-  // Set the HWM for the concurrency in the EC.
-
-  int thr_create_flags_;
-  // The thread creation flags
 };
 
 #endif /* ECT_TRHOUGHPUT_H */
diff --git a/TAO/orbsvcs/tests/EC_Throughput/Makefile b/TAO/orbsvcs/tests/EC_Throughput/Makefile
index c4cdb88ad03..d4c7d73651a 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile
@@ -1,34 +1,23 @@
 # $Id$
 
-LDLIBS = -lorbsvcs -lTAO
+BIN = ECT_Supplier ECT_Consumer ECT_Throughput
+
+LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
-            -I$(TAO_ROOT)
+            -I$(TAO_ROOT) \
+	    $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
+
 
 ECT_Supplier_OBJS=$(addsuffix .o,ECT_Supplier ECT_Driver ECT_Supplier_Driver)
 ECT_Consumer_OBJS=$(addsuffix .o,ECT_Consumer ECT_Driver ECT_Consumer_Driver)
 ECT_Throughput_OBJS=$(addsuffix .o,ECT_Throughput ECT_Driver ECT_Consumer ECT_Supplier)
 
-SRC = $(addsuffix .cpp, $(BIN)) \
-      ECT_Supplier_Driver.cpp \
-      ECT_Consumer_Driver.cpp
-
-BIN2 = ECT_Supplier ECT_Consumer ECT_Throughput
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-    ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-      BIN = $(BIN2)
-    endif # Naming
-  endif # Event
-endif # Event2
+SRC =   $(addsuffix .cpp, $(BIN))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -53,6 +42,9 @@ ECT_Consumer: $(addprefix $(VDIR),$(ECT_Consumer_OBJS))
 ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+realclean:
+	$(RM) -f $(BIN)
+
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
@@ -65,6 +57,9 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -88,272 +83,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -362,30 +95,31 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Supplier.h ECT_Driver.h ECT_Driver.i \
+ ECT_Supplier.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
+ ECT_Driver.h ECT_Driver.i
 .obj/ECT_Consumer.o .obj/ECT_Consumer.so .shobj/ECT_Consumer.o .shobj/ECT_Consumer.so: ECT_Consumer.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -409,272 +143,10 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -683,30 +155,31 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Consumer.h ECT_Driver.h ECT_Driver.i \
+ ECT_Consumer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
+ ECT_Driver.h ECT_Driver.i
 .obj/ECT_Throughput.o .obj/ECT_Throughput.so .shobj/ECT_Throughput.o .shobj/ECT_Throughput.so: ECT_Throughput.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -726,278 +199,14 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -1012,16 +221,11 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
@@ -1077,671 +281,14 @@ ECT_Throughput: $(addprefix $(VDIR),$(ECT_Throughput_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ProxyPushSupplier_Set.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
  ECT_Throughput.h ECT_Driver.h ECT_Driver.i ECT_Consumer.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECT_Supplier.h
-.obj/ECT_Supplier_Driver.o .obj/ECT_Supplier_Driver.so .shobj/ECT_Supplier_Driver.o .shobj/ECT_Supplier_Driver.so: ECT_Supplier_Driver.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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Supplier_Driver.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECT_Driver.h ECT_Driver.i ECT_Supplier.h
-.obj/ECT_Consumer_Driver.o .obj/ECT_Consumer_Driver.so .shobj/ECT_Consumer_Driver.o .shobj/ECT_Consumer_Driver.so: ECT_Consumer_Driver.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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- ECT_Consumer_Driver.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ECT_Driver.h ECT_Driver.i ECT_Consumer.h
+ ECT_Supplier.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.conf b/TAO/orbsvcs/tests/EC_Throughput/ec.conf
deleted file mode 100644
index 912f4912166..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ec.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset delayed -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf b/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf
deleted file mode 100644
index 121ac0a5c5d..00000000000
--- a/TAO/orbsvcs/tests/EC_Throughput/ec.mt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset immediate  -ECdispatching priority -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
index b5e952dd4d8..6a2a01a8bd8 100755
--- a/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Throughput/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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;
 
@@ -12,15 +11,14 @@ $NS_ior = "NameService.ior";
 $sleeptime = 5;
 
 $NS = Process::Create ("..".$DIR_SEPARATOR.
-                       "..".$DIR_SEPARATOR.
-                       "Naming_Service".$DIR_SEPARATOR.
-                       "Naming_Service".$Process::EXE_EXT.
-                       " -o $NS_ior ");
+		       "..".$DIR_SEPARATOR.
+		       "Naming_Service".$DIR_SEPARATOR.
+		       "Naming_Service".$Process::EXE_EXT.
+		       " -o $NS_ior ");
 
 sleep $sleeptime;
 
-$T = Process::Create ($EXEPREFIX."ECT_Throughput".$Process::EXE_EXT
-                     . " -ORBsvcconf ec.conf -m new -n 1000 ");
+$T = Process::Create ($EXEPREFIX."ECT_Throughput".$Process::EXE_EXT);
 
 sleep $sleeptime;
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/svc.conf b/TAO/orbsvcs/tests/EC_Throughput/svc.conf
new file mode 100644
index 00000000000..272f088b3dd
--- /dev/null
+++ b/TAO/orbsvcs/tests/EC_Throughput/svc.conf
@@ -0,0 +1,7 @@
+# $Id$
+#
+# The options are described in $TAO_ROOT/docs/Options.html
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread"
diff --git a/TAO/orbsvcs/tests/Event/Basic/Basic.dsw b/TAO/orbsvcs/tests/Event/Basic/Basic.dsw
deleted file mode 100644
index b731389ca68..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Basic.dsw
+++ /dev/null
@@ -1,65 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Observer"=.\Observer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Reconnect"=.\Reconnect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Schedule"=.\Schedule.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Shutdown"=.\Shutdown.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile b/TAO/orbsvcs/tests/Event/Basic/Makefile
deleted file mode 100644
index 226402cd41d..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile
+++ /dev/null
@@ -1,1365 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-BIN2 =   Reconnect \
-	Shutdown \
-	Schedule \
-	Observer
-
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event2
-
-PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lECTests -lorbsvcs -lTAO
-CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-
-#----------------------------------------------------------------------------
-#       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.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)
-endif
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Reconnect.o .obj/Reconnect.so .shobj/Reconnect.o .shobj/Reconnect.so: Reconnect.cpp Reconnect.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/Shutdown.o .obj/Shutdown.so .shobj/Shutdown.o .shobj/Shutdown.so: Shutdown.cpp Shutdown.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h
-.obj/Schedule.o .obj/Schedule.so .shobj/Schedule.o .shobj/Schedule.so: Schedule.cpp Schedule.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.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/Observer.o .obj/Observer.so .shobj/Observer.o .shobj/Observer.so: Observer.cpp Observer.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Gateway.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \
- ../lib/Consumer.h ../lib/Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
deleted file mode 100644
index 3cdd72a624d..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ /dev/null
@@ -1,369 +0,0 @@
-// $Id$
-
-#include "Observer.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/High_Res_Timer.h"
-
-ACE_RCSID(EC_Tests_Basic, Observer, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  TAO_EC_Default_Factory::init_svcs ();
-  EC_Master master;
-  return master.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Master::EC_Master (void)
-  :  seed_ (0),
-     n_channels_ (4),
-     channels_ (0)
-{
-}
-
-EC_Master::~EC_Master (void)
-{
-  if (this->channels_ != 0)
-    {
-      for (int i = 0; i < this->n_channels_; ++i)
-        delete this->channels_[i];
-      delete[] this->channels_;
-    }
-}
-
-int
-EC_Master::run (int argc, char* argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Calibrate the high resolution timer *before* starting the
-      // test.
-      ACE_High_Res_Timer::calibrate ();
-
-      this->seed_ = ACE_OS::time (0);
-
-      this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->parse_args (argc, argv))
-        return 1;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The seed value is %d\n", this->seed_));
-
-      ACE_NEW_RETURN (this->channels_,
-                      EC_Observer*[this->n_channels_],
-                      1);
-
-      {
-        for (int i = 0; i != this->n_channels_; ++i)
-          {
-            ACE_OS::rand_r (this->seed_);
-            ACE_NEW_RETURN (this->channels_[i],
-                            EC_Observer (this,
-                                         this->seed_,
-                                         this->orb_.in (),
-                                         this->root_poa_.in (),
-                                         i),
-                            1);
-          }
-      }
-
-      {
-        char** targv;
-        ACE_NEW_RETURN (targv, char*[argc], 1);
-
-        for (int i = 0; i != this->n_channels_; ++i)
-          {
-            int targc = argc;
-            for (int j = 0; j < targc; ++j)
-              targv[j] = argv[j];
-            this->channels_[i]->run_init (targc, targv, ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-          }
-        delete[] targv;
-      }
-
-      {
-        for (int i = 0; i != this->n_channels_; ++i)
-          {
-            this->channels_[i]->execute_test (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-          }
-      }
-
-      if (ACE_Thread_Manager::instance ()->wait () == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "EC_Master (%P|%t) thread manager wait failed\n"));
-          return 1;
-        }
-
-      {
-        for (int i = 0; i != this->n_channels_; ++i)
-          {
-            this->channels_[i]->dump_results ();
-          }
-      }
-
-      {
-        for (int i = 0; i != this->n_channels_; ++i)
-          {
-            this->channels_[i]->run_cleanup (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-          }
-      }
-
-   }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
-    }
-  ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-EC_Master::initialize_orb_and_poa (int &argc, char* argv[],
-                                   CORBA::Environment& ACE_TRY_ENV)
-{
-  this->orb_ =
-    CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA");
-  if (CORBA::is_nil (poa_object.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "EC_Driver (%P|%t) Unable to initialize the POA.\n"));
-      return;
-    }
-
-  this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-int
-EC_Master::parse_args (int &argc, char *argv [])
-{
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-channels") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->n_channels_ = ACE_OS::atoi (arg_shifter.get_current ());
-        }
-      else if (ACE_OS::strcmp (arg, "-seed") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->seed_ = ACE_OS::atoi (arg_shifter.get_current ());
-        }
-
-      arg_shifter.ignore_arg ();
-    }
-  return 0;
-}
-
-int
-EC_Master::channel_count (void) const
-{
-  return this->n_channels_;
-}
-
-EC_Observer*
-EC_Master::channel (int i) const
-{
-  return this->channels_[i];
-}
-
-// ****************************************************************
-
-EC_Observer::EC_Observer (EC_Master *master,
-                          ACE_RANDR_TYPE seed,
-                          CORBA::ORB_ptr orb,
-                          PortableServer::POA_ptr root_poa,
-                          int id)
-  : master_ (master),
-    seed_ (seed),
-    id_ (id)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-  this->root_poa_ = PortableServer::POA::_duplicate (root_poa);
-}
-
-void
-EC_Observer::initialize_orb_and_poa (int&, char*[],
-                                     CORBA::Environment&)
-{
-}
-
-int
-EC_Observer::parse_args (int& argc, char* argv[])
-{
-  return this->EC_Driver::parse_args (argc, argv);
-}
-
-void
-EC_Observer::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-}
-
-void
-EC_Observer::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-}
-
-void
-EC_Observer::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  int peer_count = this->master_->channel_count ();
-  ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]);
-
-  for (int i = 0; i != peer_count; ++i)
-    {
-      if (i == this->id_)
-        continue;
-
-      RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
-        this->master_->channel (i)->event_channel_;
-
-      this->gwys_[i].init (rmt_ec,
-                           this->event_channel_.in (),
-                           RtecScheduler::Scheduler::_nil (),
-                           RtecScheduler::Scheduler::_nil (),
-                           0, 0,
-                           ACE_TRY_ENV);
-
-      RtecEventChannelAdmin::Observer_var obs =
-        this->gwys_[i]._this (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      RtecEventChannelAdmin::Observer_Handle h =
-        rmt_ec->append_observer (obs.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->gwys_[i].observer_handle (h);
-
-      ACE_CHECK;
-    }
-
-  if (this->allocate_tasks () == -1)
-    return;
-
-  this->activate_tasks (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Observer[%d] (%P|%t) suppliers are active\n",
-                this->id_));
-}
-
-void
-EC_Observer::run_cleanup (CORBA::Environment& ACE_TRY_ENV)
-{
-  for (int j = 0; j != this->master_->channel_count (); ++j)
-    {
-      if (j == this->id_)
-        continue;
-
-      RtecEventChannelAdmin::EventChannel_ptr rmt_ec =
-        this->master_->channel (j)->event_channel_;
-      rmt_ec->remove_observer (this->gwys_[j].observer_handle (),
-                               ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->gwys_[j].shutdown (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-EC_Observer::dump_results (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_));
-  this->EC_Driver::dump_results ();
-}
-
-void
-EC_Observer::connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (i == 0)
-    {
-      this->EC_Driver::connect_consumer (consumer_admin, i,
-                                         ACE_TRY_ENV);
-      return;
-    }
-  unsigned int x = ACE_OS::rand_r (this->seed_);
-  if (x < RAND_MAX / 8)
-    this->EC_Driver::connect_consumer (consumer_admin, i,
-                                       ACE_TRY_ENV);
-}
-
-void
-EC_Observer::consumer_push (void*,
-                            const RtecEventComm::EventSet&,
-                            CORBA::Environment& ACE_TRY_ENV)
-{
-  unsigned int x = ACE_OS::rand_r (this->seed_);
-  if (x < (RAND_MAX / 64))
-    {
-      if (this->verbose ())
-        ACE_DEBUG ((LM_DEBUG,
-                    "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_));
-
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (int i = 1; i < this->n_consumers_; ++i)
-        {
-          ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-          if (this->consumers_[i]->connected ())
-            {
-              this->consumers_[i]->disconnect (ACE_TRY_ENV);
-            }
-          else
-            {
-              this->EC_Driver::connect_consumer (consumer_admin.in (),
-                                                 i, ACE_TRY_ENV);
-            }
-          ACE_CHECK;
-        }
-    }
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.dsp b/TAO/orbsvcs/tests/Event/Basic/Observer.dsp
deleted file mode 100644
index e595f9c847d..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Observer" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Observer - 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 "Observer.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 "Observer.mak" CFG="Observer - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Observer - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Observer - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Observer - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Observer - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Observer"

-# PROP BASE Intermediate_Dir "Observer"

-# 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# 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 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Observer - Win32 Release"

-# Name "Observer - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Observer.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Observer.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
deleted file mode 100644
index 8b4d7ce5a9f..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Observer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_OBSERVER_H
-#define EC_OBSERVER_H
-
-#include "Driver.h"
-#include "orbsvcs/Event/EC_Gateway.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Observer;
-
-class EC_Master
-{
-  // = TITLE
-  //   Run multiple events channels
-  //
-  // = DESCRIPTION
-  //   This test runs multiple event channels, all connected using
-  //   gateways.
-  //
-public:
-  EC_Master (void);
-
-  virtual ~EC_Master (void);
-
-  virtual int run (int argc, char* argv[]);
-  // Execute the test.
-
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
-  // Obtain the orb and the poa pointers
-
-  int channel_count (void) const;
-  EC_Observer* channel (int i) const;
-  // Accessors
-
-private:
-  int parse_args (int &argc, char *argv []);
-
-private:
-  ACE_RANDR_TYPE seed_;
-  // The seed
-
-  int n_channels_;
-  EC_Observer** channels_;
-  // The driver programs
-
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  PortableServer::POA_var root_poa_;
-  // The Root POA
-};
-
-class EC_Observer : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC observers
-  //
-  // = DESCRIPTION
-  //
-public:
-  EC_Observer (EC_Master *master,
-               ACE_RANDR_TYPE seed,
-               CORBA::ORB_ptr orb,
-               PortableServer::POA_ptr root_poa,
-               int id);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_args (void) const;
-  virtual void print_usage (void);
-  // add some command line args to enable/disable observerions
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  void run_cleanup (CORBA::Environment& ACE_TRY_ENV);
-  // Run the suppliers, using the <thread_manager> parameter
-
-  void dump_results (void);
-  void connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  void consumer_push (void*,
-                      const RtecEventComm::EventSet&,
-                      CORBA::Environment& ACE_TRY_ENV);
-
-private:
-  EC_Master *master_;
-  ACE_RANDR_TYPE seed_;
-  int id_;
-
-  TAO_EC_Gateway_IIOP *gwys_;
-
-  ACE_SYNCH_MUTEX lock_;
-  // lock internal state
-};
-
-#endif /* EC_OBSERVER_H */
diff --git a/TAO/orbsvcs/tests/Event/Basic/README b/TAO/orbsvcs/tests/Event/Basic/README
deleted file mode 100644
index 26408823b69..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/README
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-	Basic tests for the real-time event channel.
-
-This directory contains several tests to exercise the real-time event
-channel features, debug it and stress test it. The tests are as simple 
-as possible, but not simpler.
-
-	Here are some canonical test configurations:
-
-# Connect 100 suppliers, 100 consumers. Then disconnect and connect
-# one particular consumer, 100. Then do the same for one supplier
-
-$ Reconnect -verbose -suppliers 100 -consumers 100 -d 100
-
-# Same as above, but instead of disconnecting and connecting again
-# simply reconnect. Should be faster
-$ Reconnect -verbose -suppliers 100 -consumers 100 -d 100 -c -s
-
-# Connect 10 suppliers, 10 consumers and then shutdown the EC
-$ Shutdown -verbose -suppliers 5 -consumer 5
-
-# Create 4 event channels, connect all of them using IIOP gateways,
-# then attach 5 consumers and 2 supplier to each, next generate 10000
-# events (each supplier on its own thread).  It randomly connect and
-# disconnects the consumers, hence the gateways also do.
-
-$ Observer -ORBsvcconf observer.conf \
-  -consumer_tshift 0 -supplier_tshift 0 \
-  -suppliers 2 -consumers 5 \
-  -channels 4 -burstsize 1000 -burstcount 10 \
-  -burstpause 0 -busyhwm 1024 -maxwritedelay 1024
-
-# Create an event channel in a configuration that informs the
-# scheduler of the dependencies between consumers and suppliers.
-# THIS IS WORK IN PROGRESS
-
-$ Schedule -ORBsvcconf sched.conf -suppliers 5 -consumers 5
-
-NOTES
-
-	Don't worry about the "incomplete data" warning, it is a
-deffect in the test.
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
deleted file mode 100644
index 7fa81ad13d2..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-// $Id$
-
-#include "Reconnect.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(EC_Tests_Basic, Reconnect, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_Reconnect driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Reconnect::EC_Reconnect (void)
-  : allow_consumer_reconnect_ (0),
-    allow_supplier_reconnect_ (0),
-    disconnections_ (1000)
-{
-}
-
-int
-EC_Reconnect::parse_args (int& argc, char* argv[])
-{
-  if (this->EC_Driver::parse_args (argc, argv) != 0)
-    return -1;
-
-  ACE_Get_Opt get_opt (argc, argv, "scd:");
-  int opt;
-
-  while ((opt = get_opt ()) != EOF)
-    {
-      switch (opt)
-        {
-        case 'c':
-          this->allow_consumer_reconnect_ = 1;
-          break;
-        case 's':
-          this->allow_supplier_reconnect_ = 1;
-          break;
-        case 'd':
-          this->disconnections_ = ACE_OS::atoi (get_opt.optarg);
-          break;
-
-        case '?':
-        default:
-          this->print_usage ();
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-void
-EC_Reconnect::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-
-  ACE_DEBUG ((LM_DEBUG, "EC_Reconnect: \n"
-              " consumer_reconnect = %d\n"
-              " supplier_reconnect = %d\n"
-              " disconnect_count = %d\n",
-              this->allow_consumer_reconnect_,
-              this->allow_supplier_reconnect_,
-              this->disconnections_));
-}
-
-void
-EC_Reconnect::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-
-  ACE_DEBUG ((LM_DEBUG, "EC_Reconnect usage: [-s] [-c] [-d disc]\n"));
-}
-
-void
-EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-  attr.consumer_reconnect = this->allow_consumer_reconnect_;
-  attr.supplier_reconnect = this->allow_supplier_reconnect_;
-}
-
-void
-EC_Reconnect::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  this->execute_consumer_test (ACE_TRY_ENV);
-
-  this->execute_supplier_test (ACE_TRY_ENV);
-
-  this->consumer_reconnect_.dump_results ("Reconnect", "consumer");
-
-  this->supplier_reconnect_.dump_results ("Reconnect", "supplier");
-
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
-}
-
-void
-EC_Reconnect::dump_results (void)
-{
-}
-
-void
-EC_Reconnect::execute_consumer_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::ConsumerQOS qos;
-  int shutdown_event_type;
-  this->build_consumer_qos (0, qos, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->allow_consumer_reconnect_)
-    {
-      for (int i = 0; i < this->disconnections_; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->consumers_[0]->connect (qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_CHECK;
-          ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->consumer_reconnect_.sample (stop - start);
-        }
-    }
-  else
-    {
-      ACE_TRY
-        {
-          this->consumers_[0]->connect (qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
-        }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
-        {
-          /* do nothing */
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
-        }
-      ACE_ENDTRY;
-      ACE_TRY_ENV.clear ();
-
-      RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-        this->event_channel_->for_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (int i = 0; i < this->disconnections_; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->consumers_[0]->disconnect (ACE_TRY_ENV);
-          ACE_CHECK;
-          this->consumers_[0]->connect (consumer_admin.in (),
-                                        qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_CHECK;
-          ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->consumer_reconnect_.sample (stop - start);
-        }
-    }
-}
-
-void
-EC_Reconnect::execute_supplier_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::SupplierQOS qos;
-  int shutdown_event_type;
-  this->build_supplier_qos (0, qos, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->allow_supplier_reconnect_)
-    {
-      for (int i = 0; i < this->disconnections_; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->connect (qos, shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_CHECK;
-          ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->supplier_reconnect_.sample (stop - start);
-        }
-    }
-  else
-    {
-      ACE_TRY
-        {
-          this->suppliers_[0]->connect (qos, shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_ERROR, "Expected exception\n"));
-        }
-      ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex)
-        {
-          /* do nothing */
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Expected AlreadyConnected exception");
-        }
-      ACE_ENDTRY;
-      ACE_TRY_ENV.clear ();
-
-      RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-        this->event_channel_->for_suppliers (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      for (int i = 0; i < this->disconnections_; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-          this->suppliers_[0]->disconnect (ACE_TRY_ENV);
-          ACE_CHECK;
-          this->suppliers_[0]->connect (supplier_admin.in (),
-                                        qos,
-                                        shutdown_event_type,
-                                        ACE_TRY_ENV);
-          ACE_CHECK;
-          ACE_hrtime_t stop = ACE_OS::gethrtime ();
-          this->supplier_reconnect_.sample (stop - start);
-        }
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.dsp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.dsp
deleted file mode 100644
index 804053ab319..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Reconnect" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Reconnect - 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 "Reconnect.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 "Reconnect.mak" CFG="Reconnect - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Reconnect - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Reconnect - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Reconnect - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reconnect - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Reconnect - Win32 Release"

-# Name "Reconnect - Win32 Debug"

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Reconnect.h

-# End Source File

-# End Group

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Reconnect.cpp

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
deleted file mode 100644
index 9e98eee77df..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Reconnect
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_RECONNECT_H
-#define EC_RECONNECT_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Reconnect : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC reconnection feature
-  //
-  // = DESCRIPTION
-  //   The EC can be configured to allow re-connection of suppliers
-  //   and consumers, this test verifies that:
-  //   + The EC does *not* allow reconnections if the feature is
-  //     disabled (the default)
-  //   + The EC does allow reconnections if the feature is enabled
-  //     and:
-  //     - There are no memory leaks
-  //     - Compares the time required for a reconnection vs a complete
-  //       connect/disconnect cycle, specially as the number of
-  //       suppliers and consumers increases.
-  //
-public:
-  EC_Reconnect (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_args (void) const;
-  virtual void print_usage (void);
-  // add some command line args to enable/disable reconnections
-
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // set the reconnection flags
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers, just test connect and disconnect calls.
-
-  void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
-
-  void execute_consumer_test (CORBA::Environment& ACE_TRY_ENV);
-  void execute_supplier_test (CORBA::Environment& ACE_TRY_ENV);
-  // Separate the suppliers and consumers.
-
-private:
-  int allow_consumer_reconnect_;
-  int allow_supplier_reconnect_;
-  // What aspect of reconnection are we going to test?
-
-  int disconnections_;
-  // The number of disconnections
-
-  EC_Driver::Latency_Stats consumer_reconnect_;
-  EC_Driver::Latency_Stats supplier_reconnect_;
-};
-
-#endif /* EC_RECONNECT_H */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
deleted file mode 100644
index 6624eb52451..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// $Id$
-
-#include "Schedule.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Sched/Config_Scheduler.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Scheduler_Factory.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_Schedule driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Schedule::EC_Schedule (void)
-{
-}
-
-int
-EC_Schedule::parse_args (int& argc, char* argv[])
-{
-  if (this->EC_Driver::parse_args (argc, argv) != 0)
-    return -1;
-
-  return 0;
-}
-
-void
-EC_Schedule::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-}
-
-void
-EC_Schedule::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-}
-
-void
-EC_Schedule::initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->scheduler_impl_ = new ACE_Config_Scheduler;
-  this->scheduler_ = this->scheduler_impl_->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->EC_Driver::initialize_ec_impl (ACE_TRY_ENV);
-}
-
-void
-EC_Schedule::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-  attr.scheduler = this->scheduler_.in (); // no need to dup
-}
-
-void
-EC_Schedule::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  CORBA::Long min_priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  CORBA::Long max_priority =
-    ACE_Sched_Params::priority_max (ACE_SCHED_FIFO);
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG,
-                "EC_Schedule (%P|%t) computing schedule\n"));
-
-  RtecScheduler::RT_Info_Set_var infos;
-  RtecScheduler::Config_Info_Set_var configs;
-  RtecScheduler::Scheduling_Anomaly_Set_var anomalies;
-  this->scheduler_->compute_scheduling (min_priority, max_priority,
-                                        infos.out (),
-                                        configs.out (),
-                                        anomalies.out (),
-                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG,
-                "EC_Schedule (%P|%t) schedule prepared\n"));
-
-  ACE_Scheduler_Factory::dump_schedule (infos.in (),
-                                        configs.in (),
-                                        anomalies.in ());
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG,
-                "EC_Schedule (%P|%t) schedule dumped\n"));
-
-}
-
-void
-EC_Schedule::build_consumer_qos (
-  int i,
-  RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type,
-  CORBA::Environment &ACE_TRY_ENV)
-{
-  char name[128];
-  ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04.4x", i);
-
-  RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // The worst case execution time is far less than 2
-  // milliseconds, but that is a safe estimate....
-  ACE_Time_Value tv (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  this->scheduler_->set (rt_info,
-                         RtecScheduler::VERY_HIGH_CRITICALITY,
-                         time, time, time,
-                         0,
-                         RtecScheduler::VERY_LOW_IMPORTANCE,
-                         time,
-                         0,
-                         RtecScheduler::OPERATION,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int type_start =
-    this->consumer_type_start_
-    + i * this->consumer_type_shift_;
-
-  shutdown_event_type = type_start + this->consumer_type_count_;
-
-  ACE_ConsumerQOS_Factory qos_factory;
-  qos_factory.start_disjunction_group ();
-  qos_factory.insert_type (shutdown_event_type, rt_info);
-
-  for (int j = 0; j != this->consumer_type_count_; ++j)
-    qos_factory.insert_type (type_start + j, rt_info);
-
-  qos = qos_factory.get_ConsumerQOS ();
-}
-
-void
-EC_Schedule::build_supplier_qos (
-      int i,
-      RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  char name[128];
-  ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04.4x", i);
-
-  RtecScheduler::handle_t rt_info =
-    this->scheduler_->create (name, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_Time_Value tv (0, this->burst_pause_);
-  RtecScheduler::Period_t rate = tv.usec () * 10;
-
-  // The execution times are set to reasonable values, but
-  // actually they are changed on the real execution, i.e. we
-  // lie to the scheduler to obtain right priorities; but we
-  // don't care if the set is schedulable.
-  tv.set (0, 2000);
-  TimeBase::TimeT time;
-  ORBSVCS_Time::Time_Value_to_TimeT (time, tv);
-  this->scheduler_->set (rt_info,
-                         RtecScheduler::VERY_HIGH_CRITICALITY,
-                         time, time, time,
-                         rate,
-                         RtecScheduler::VERY_LOW_IMPORTANCE,
-                         time,
-                         1,
-                         RtecScheduler::OPERATION,
-                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
-  int supplier_id = i + 1;
-  shutdown_event_type = type_start + this->supplier_type_count_;
-
-  ACE_SupplierQOS_Factory qos_factory;
-  for (int j = 0; j != this->supplier_type_count_; ++j)
-    qos_factory.insert (supplier_id,
-                        type_start + j,
-                        rt_info, 1);
-
-  qos_factory.insert (supplier_id,
-                      shutdown_event_type,
-                      rt_info, 1);
-
-  qos = qos_factory.get_SupplierQOS ();
-}
-
-void
-EC_Schedule::dump_results (void)
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.dsp b/TAO/orbsvcs/tests/Event/Basic/Schedule.dsp
deleted file mode 100644
index 7b334d81b81..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Schedule" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Schedule - 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 "Schedule.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 "Schedule.mak" CFG="Schedule - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Schedule - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Schedule - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Schedule - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Schedule - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Schedule"

-# PROP BASE Intermediate_Dir "Schedule"

-# 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Schedule - Win32 Release"

-# Name "Schedule - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Schedule.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Schedule.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
deleted file mode 100644
index ed5cd78d0aa..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Schedule
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_SCHEDULE_H
-#define EC_SCHEDULE_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Schedule : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC scheduling test
-  //
-  // = DESCRIPTION
-  //   The EC can be used in conjunction with the scheduling service
-  //   to analyze the schedulabity of a system and compute priority
-  //   assignments that guarantee the correct behavior of it.
-  //
-  //   Most of the work is actually done by the scheduler (as it
-  //   should be), the event channel simply plays two roles:
-  //
-  //   1) Feed the scheduler with the dependency information between
-  //      consumers and suppliers based on their QoS requirements,
-  //      subscriptions and publications.
-  //
-  //   2) At run-time use the scheduler information to dispatch the
-  //      events at the right priority.
-  //
-  //   The current version only verifies the first role.
-  //
-public:
-  EC_Schedule (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_args (void) const;
-  virtual void print_usage (void);
-  // add some command line args to change the scheduling service to
-  // use.
-
-  void initialize_ec_impl (CORBA::Environment &ACE_TRY_ENV);
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // Set the scheduling service attribute
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers, just compute the schedule.
-
-  void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
-
-  virtual void build_consumer_qos (
-      int i,
-      RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
-  virtual void build_supplier_qos (
-      int i,
-      RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
-  // This time really connect to the scheduler
-
-private:
-};
-
-#endif /* EC_SCHEDULE_H */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
deleted file mode 100644
index a48b369219d..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-
-#include "Shutdown.h"
-#include "Consumer.h"
-#include "Supplier.h"
-
-ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_Shutdown driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Shutdown::EC_Shutdown (void)
-{
-}
-
-void
-EC_Shutdown::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n"));
-
-  this->destroy_ec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n"));
-
-  this->deactivate_ec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec deactivated\n"));
-
-  this->cleanup_ec ();
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n"));
-
-  this->initialize_ec_impl (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->connect_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-  this->connect_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n"));
-
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
-}
-
-void
-EC_Shutdown::dump_results (void)
-{
-}
-
-void
-EC_Shutdown::consumer_disconnect (void* cookie,
-                                  CORBA::Environment&)
-{
-  ACE_DEBUG ((LM_DEBUG, "Consumer %x has been disconnected\n", cookie));
-}
-
-void
-EC_Shutdown::supplier_disconnect (void* cookie,
-                                  CORBA::Environment&)
-{
-  ACE_DEBUG ((LM_DEBUG, "Supplier %x has been disconnected\n", cookie));
-}
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.dsp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.dsp
deleted file mode 100644
index 9bc1f919eef..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.dsp
+++ /dev/null
@@ -1,102 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Shutdown" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Shutdown - 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 "Shutdown.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 "Shutdown.mak" CFG="Shutdown - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Shutdown - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Shutdown - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Shutdown - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTest.lib orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Shutdown - 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Shutdown - Win32 Release"

-# Name "Shutdown - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Shutdown.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Shutdown.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
deleted file mode 100644
index 0da5b0b5a38..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Shutdown
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_SHUTDOWN_H
-#define EC_SHUTDOWN_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Shutdown : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC shutdown features
-  //
-  // = DESCRIPTION
-  //   The EC must inform its suppliers and consumers on the event of
-  //   its destruction.
-  //   This test exercises that feature of the EC.
-  //
-public:
-  EC_Shutdown (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers just create the EC and then destroy it.
-
-  void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
-
-  virtual void consumer_disconnect (void* consumer_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // One of the consumers in the test has been disconnected from the EC
-
-  virtual void supplier_disconnect (void* supplier_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // One of the suppliers in the test has been disconnected from the EC
-
-
-private:
-};
-
-#endif /* EC_SHUTDOWN_H */
diff --git a/TAO/orbsvcs/tests/Event/Basic/observer.conf b/TAO/orbsvcs/tests/Event/Basic/observer.conf
deleted file mode 100644
index 202afba1e2e..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/observer.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECobserver basic -ECpushsupplierset delayed  -ECdispatching reactive -ECscheduling null -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
deleted file mode 100755
index 94e0e3ec45b..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl script that runs the client and all the other servers that
-# are needed
-
-unshift @INC, '../../../../../bin';
-require Process;
-require Uniqueid;
-
-print STDERR "\n\nReconnect suppliers and consumers,",
-  " using disconnect/connect calls\n";
-system ("Reconnect -suppliers 100 -consumers 100 -d 100");
-
-print STDERR "\n\nReconnect suppliers and consumers, using connect calls\n";
-system ("Reconnect -suppliers 100 -consumers 100 -d 100 -s -c");
-
-print STDERR "\n\nShutdown EC with clients still attached\n";
-system ("Shutdown -verbose -suppliers 5 -consumers 5");
-
-print STDERR "\n\nComplex event channel test,",
-  "multiple ECs connected through gateways\n";
-system ("Observer -ORBsvcconf observer.conf"
-	." -consumer_tshift 0 -consumers 5"
-	." -supplier_tshift 0 -suppliers 2"
-	." -burstsize 10 -burstcount 10 -burstpause 0"
-	." -busyhwm 1024 -maxwritedelay 1024");
-
-exit 0;
diff --git a/TAO/orbsvcs/tests/Event/Basic/sched.conf b/TAO/orbsvcs/tests/Event/Basic/sched.conf
deleted file mode 100644
index db2f45bb610..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/sched.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset immediate  -ECdispatching priority -ECscheduling priority -ECfiltering priority -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Basic/svc.conf b/TAO/orbsvcs/tests/Event/Basic/svc.conf
deleted file mode 100644
index cd1a374e3f1..00000000000
--- a/TAO/orbsvcs/tests/Event/Basic/svc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset delayed -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering null"
diff --git a/TAO/orbsvcs/tests/Event/Event.dsw b/TAO/orbsvcs/tests/Event/Event.dsw
deleted file mode 100644
index 36f9e5e4d8d..00000000000
--- a/TAO/orbsvcs/tests/Event/Event.dsw
+++ /dev/null
@@ -1,119 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Connect"=.\Performance\Connect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "ECTest"=.\lib\ECTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Observer"=.\Basic\Observer.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Reconnect"=.\Basic\Reconnect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Schedule"=.\Basic\Schedule.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Shutdown"=.\Basic\Shutdown.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Throughput"=.\Performance\Throughput.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name ECTest

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Event/Makefile b/TAO/orbsvcs/tests/Event/Makefile
deleted file mode 100644
index 56d5b8967f0..00000000000
--- a/TAO/orbsvcs/tests/Event/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-DIRS  =	lib \
-	Basic \
-	Performance
-
-#----------------------------------------------------------------------------
-#	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/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
deleted file mode 100644
index 45cc9c58330..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// $Id$
-
-#include "Connect.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "ace/Arg_Shifter.h"
-
-ACE_RCSID(EC_Tests_Performance, Connect, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_Connect driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Connect::EC_Connect (void)
-  : order_ (0)
-{
-}
-
-void
-EC_Connect::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  // this->EC_Driver::execute_test (ACE_TRY_ENV);
-}
-
-int
-EC_Connect::parse_args (int& argc, char* argv[])
-{
-  if (this->EC_Driver::parse_args (argc, argv) != 0)
-    return -1;
-
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-connection_order") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              char* opt = arg_shifter.get_current ();
-              if (ACE_OS::strcasecmp (opt, "consumers") == 0)
-                this->order_ = 0;
-              else if (ACE_OS::strcasecmp (opt, "suppliers") == 0)
-                this->order_ = 1;
-              else if (ACE_OS::strcasecmp (opt, "interleaved") == 0)
-                this->order_ = 2;
-              else
-                ACE_ERROR ((LM_ERROR,
-                            "EC_Connect - invalid choice <%s> for"
-                            " connection order\n",
-                            opt));
-
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else
-        {
-          arg_shifter.ignore_arg ();
-        }
-    }
-  return 0;
-}
-
-void
-EC_Connect::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "EC_Connect Usage:\n"
-              "  -connection_order [consumers|suppliers|interleaved]\n"
-              ));
-}
-
-void
-EC_Connect::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "EC_Connect parameters:\n"
-              "  order = <%d>\n",
-              this->order_));
-}
-
-void
-EC_Connect::dump_results (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "\nConnect time:\n"));
-  this->consumer_connect_.dump_results ("Consumer", "connect");
-  this->supplier_connect_.dump_results ("Supplier", "connect");
-
-  ACE_DEBUG ((LM_DEBUG, "\nDisconnect time:\n"));
-}
-
-void
-EC_Connect::connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_hrtime_t start = ACE_OS::gethrtime ();
-  this->EC_Driver::connect_consumer (consumer_admin,
-                                     i,
-                                     ACE_TRY_ENV);
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->consumer_connect_.sample (now - start);
-}
-
-void
-EC_Connect::connect_supplier (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_hrtime_t start = ACE_OS::gethrtime ();
-  this->EC_Driver::connect_supplier (supplier_admin,
-                                     i,
-                                     ACE_TRY_ENV);
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->supplier_connect_.sample (now - start);
-}
-
-EC_Consumer*
-EC_Connect::allocate_consumer (int i)
-{
-  return new ECC_Consumer (this, this->consumers_ + i);
-}
-
-EC_Supplier*
-EC_Connect::allocate_supplier (int i)
-{
-  return new ECC_Supplier (this, this->consumers_ + i);
-}
-
-void
-EC_Connect::connect_clients (CORBA::Environment &ACE_TRY_ENV)
-{
-  switch (this->order_)
-    {
-    default:
-    case 0:
-      this->connect_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-      this->connect_suppliers (ACE_TRY_ENV);
-      ACE_CHECK;
-      return;
-
-    case 1:
-      this->connect_suppliers (ACE_TRY_ENV);
-      ACE_CHECK;
-      this->connect_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-      return;
-
-    case 2:
-      break;
-    }
-
-  int max = this->n_consumers_;
-  if (max < this->n_suppliers_)
-    max = this->n_suppliers_;
-
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (int i = 0; i != max; ++i)
-    {
-      if (i < this->n_consumers_)
-        {
-          this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-      if (i < this->n_suppliers_)
-        {
-          this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-    }
-
-}
-
-void
-EC_Connect::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
-{
-  switch (this->order_)
-    {
-    default:
-    case 0:
-      this->disconnect_suppliers (ACE_TRY_ENV);
-      ACE_CHECK;
-      this->disconnect_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-      return;
-
-    case 1:
-      this->disconnect_consumers (ACE_TRY_ENV);
-      ACE_CHECK;
-      this->disconnect_suppliers (ACE_TRY_ENV);
-      ACE_CHECK;
-      return;
-
-    case 2:
-      break;
-    }
-
-  int max = this->n_consumers_;
-  if (max < this->n_suppliers_)
-    max = this->n_suppliers_;
-
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (int i = 0; i != max; ++i)
-    {
-      if (i < this->n_suppliers_)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->supplier_disconnect_.sample (now - start);
-        }
-      if (i < this->n_consumers_)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          this->consumers_[i]->disconnect (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->consumer_disconnect_.sample (now - start);
-        }
-    }
-  this->consumer_disconnect_.dump_results ("Consumer", "disconnect");
-  this->supplier_disconnect_.dump_results ("Supplier", "disconnect");
-}
-
-void
-EC_Connect::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->consumer_disconnect_.sample (now - start);
-    }
-  this->consumer_disconnect_.dump_results ("Consumer", "disconnect");
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Connect (%P|%t) consumers disconnected\n"));
-}
-
-void
-EC_Connect::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      this->supplier_disconnect_.sample (now - start);
-    }
-  this->supplier_disconnect_.dump_results ("Supplier", "disconnect");
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Connect (%P|%t) suppliers disconnected\n"));
-}
-
-
-// ****************************************************************
-
-ECC_Consumer::ECC_Consumer (EC_Driver* driver, void* cookie)
-  :  EC_Consumer (driver, cookie)
-{
-}
-
-void
-ECC_Consumer::connect (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  this->EC_Consumer::connect (consumer_admin,
-                              qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
-}
-
-void
-ECC_Consumer::connect (
-    const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_hrtime_t start = ACE_OS::gethrtime ();
-  this->EC_Consumer::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->connect_time_.sample (now - start);
-}
-
-void
-ECC_Consumer::dump_results (const char* name)
-{
-  this->connect_time_.dump_results ("EC_Consumers/connect", name);
-  this->EC_Consumer::dump_results (name);
-}
-
-// ****************************************************************
-
-ECC_Supplier::ECC_Supplier (EC_Driver* driver, void* cookie)
-  :  EC_Supplier (driver, cookie)
-{
-}
-
-void
-ECC_Supplier::connect (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  this->EC_Supplier::connect (supplier_admin,
-                              qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
-}
-
-void
-ECC_Supplier::connect (
-    const RtecEventChannelAdmin::SupplierQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_hrtime_t start = ACE_OS::gethrtime ();
-  this->EC_Supplier::connect (qos,
-                              shutdown_event_type,
-                              ACE_TRY_ENV);
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->connect_time_.sample (now - start);
-}
-
-void
-ECC_Supplier::dump_results (const char* name)
-{
-  this->connect_time_.dump_results ("EC_Suppliers/connect", name);
-  this->EC_Supplier::dump_results (name);
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.dsp b/TAO/orbsvcs/tests/Event/Performance/Connect.dsp
deleted file mode 100644
index 2d7a24bbcbe..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Connect" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Connect - 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 "Connect.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 "Connect.mak" CFG="Connect - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Connect - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Connect - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Connect - 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 /MD /W3 /GX /O2 /I "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Connect - 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 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Connect - Win32 Release"

-# Name "Connect - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Connect.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Connect.h

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h
deleted file mode 100644
index e69412ec32f..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Connect
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_CONNECT_H
-#define EC_CONNECT_H
-
-#include "Consumer.h"
-#include "Supplier.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Connect : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC connection feature
-  //
-  // = DESCRIPTION
-  //   The EC can be configured to allow re-connection of suppliers
-  //   and consumers, this test verifies that:
-  //   + The EC does *not* allow connections if the feature is
-  //     disabled (the default)
-  //   + The EC does allow connections if the feature is enabled
-  //     and:
-  //     - There are no memory leaks
-  //     - Compares the time required for a connection vs a complete
-  //       connect/disconnect cycle, specially as the number of
-  //       suppliers and consumers increases.
-  //
-public:
-  EC_Connect (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_usage (void);
-  virtual void print_args (void) const;
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers, just test connect and disconnect calls.
-
-  virtual void dump_results (void);
-
-  virtual void connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  virtual void connect_supplier (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  virtual void disconnect_consumers (CORBA::Environment& env);
-  virtual void disconnect_suppliers (CORBA::Environment& env);
-
-  virtual EC_Consumer* allocate_consumer (int i);
-  virtual EC_Supplier* allocate_supplier (int i);
-
-  virtual void connect_clients (CORBA::Environment&);
-  virtual void disconnect_clients (CORBA::Environment&);
-
-private:
-  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?
-};
-
-// ****************************************************************
-
-class ECC_Consumer : public EC_Consumer
-{
-public:
-  ECC_Consumer (EC_Driver *driver, void* cookie);
-
-  virtual void connect (
-      RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-      const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
-  virtual void connect (
-      const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
-  virtual void dump_results (const char* name);
-
-private:
-  EC_Driver::Latency_Stats connect_time_;
-};
-
-// ****************************************************************
-
-class ECC_Supplier : public EC_Supplier
-{
-public:
-  ECC_Supplier (EC_Driver *driver, void* cookie);
-
-  virtual void connect (
-        RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-        const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
-  virtual void connect (
-      const RtecEventChannelAdmin::SupplierQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
-  virtual void dump_results (const char* name);
-
-private:
-  EC_Driver::Latency_Stats connect_time_;
-};
-
-#endif /* EC_CONNECT_H */
diff --git a/TAO/orbsvcs/tests/Event/Performance/ECPerformance.dsw b/TAO/orbsvcs/tests/Event/Performance/ECPerformance.dsw
deleted file mode 100644
index 451125d4714..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/ECPerformance.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Connect"=.\Connect.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Throughput"=.\Throughput.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile b/TAO/orbsvcs/tests/Event/Performance/Makefile
deleted file mode 100644
index 2e9ce57faef..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile
+++ /dev/null
@@ -1,702 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-BIN2 =  Throughput \
-	Connect
-
-#### If the orbsvcs library wasn't built with all components, don't
-#### try to build certain tests.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event2
-
-PSRC=$(addsuffix .cpp,$(BIN))
-LDLIBS = -lECTests -lorbsvcs -lTAO
-CPPFLAGS += -I../lib -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs \
-        $(foreach svc, $(TAO_ORBSVCS), -DTAO_ORBSVCS_HAS_$(svc))
-
-
-#----------------------------------------------------------------------------
-#       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.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)
-endif
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Throughput.o .obj/Throughput.so .shobj/Throughput.o .shobj/Throughput.so: Throughput.cpp Throughput.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i ../lib/Consumer.h ../lib/Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
-.obj/Connect.o .obj/Connect.so .shobj/Connect.o .shobj/Connect.so: Connect.cpp Connect.h ../lib/Consumer.h ../lib/Driver.h \
- ../lib/ectest_export.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)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- ../lib/Driver.i ../lib/Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(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/orbsvcs/tests/Event/Performance/README b/TAO/orbsvcs/tests/Event/Performance/README
deleted file mode 100644
index 2a62f56080a..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/README
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id$
-
-	Performance tests for the real-time event channel.
-
-This directory contains several tests to measure the performance of
-the real-time event channel.  Remember to compile ACE and TAO with
-optimizations enabled when running this tests.
-
-	Here are some canonical test configurations:
-
-# Measure throughput and latency, in a configuration suitable for
-# single threaded systems.  This is probably the best case scenario,
-# one supplier, one consumer and no locking.
-
-$ Throughput -burstsize 100000 -burstcount 1
-
-# Same test as above, but with a configuration that is MT-safe
-
-$ Throughput -ORBsvcconf ec.st.conf -burstsize 100000 -burstcount 1
-
-# Increase the number of consumers, but only the first one receives
-# events.
-
-$ Throughput -ORBsvcconf ec.st.conf -burstsize 100000 -burstcount 1 \
-  -consumers 4
-
-# Now increase the number of suppliers, only one consumer receives
-# events from each supplier.
-
-$ Throughput -ORBsvcconf ec.st.conf -burstsize 100000 -burstcount 1 \
-  -consumers 4 -suppliers 4
-
-# Now a test where all consumers receive events from all suppliers
-
-$ Throughput -ORBsvcconf ec.st.conf -burstsize 100000 -burstcount 1 \
-  -consumers 4 -suppliers 4 -consumers_tshift 0 -suppliers_tshift 0
-
-
-# Measure the time required to connect the 100 consumers and 100
-# suppliers, inserting one supplier first and then one supplier.
-# Try -connection_order "consumers" or "suppliers"
-
-$ Connect -ORBsvcconf ec.st.conf -consumers 100 -suppliers 100 \
-  -connection_order interleaved
-
-
-NOTES
-
-	Don't worry about the "incomplete data" warning, it is a
-deffect in the test.
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
deleted file mode 100644
index 4a6af0f246d..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-
-#include "Throughput.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(EC_Tests_Performance, Throughput, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-  EC_Throughput driver;
-  return driver.run (argc, argv);
-}
-
-// ****************************************************************
-
-EC_Throughput::EC_Throughput (void)
-{
-}
-
-int
-EC_Throughput::parse_args (int& argc, char* argv[])
-{
-  if (this->EC_Driver::parse_args (argc, argv) != 0)
-    return -1;
-  return 0;
-}
-
-void
-EC_Throughput::print_args (void) const
-{
-  this->EC_Driver::print_args ();
-}
-
-void
-EC_Throughput::print_usage (void)
-{
-  this->EC_Driver::print_usage ();
-}
-
-void
-EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-}
-
-void
-EC_Throughput::execute_test (CORBA::Environment& ACE_TRY_ENV)
-{
-  this->EC_Driver::execute_test (ACE_TRY_ENV);
-}
-
-void
-EC_Throughput::dump_results (void)
-{
-  this->EC_Driver::dump_results ();
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.dsp b/TAO/orbsvcs/tests/Event/Performance/Throughput.dsp
deleted file mode 100644
index 180b1c01d5a..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.dsp
+++ /dev/null
@@ -1,101 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Throughput" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Throughput - 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 "Throughput.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 "Throughput.mak" CFG="Throughput - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Throughput - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Throughput - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Throughput - 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 /MD /W3 /GX /O2 /I "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /machine:I386 /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Throughput - 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 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 "..\lib" /I "..\..\.." /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 ECTestd.lib orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\lib" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Throughput - Win32 Release"

-# Name "Throughput - Win32 Debug"

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Throughput.h

-# End Source File

-# End Group

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Throughput.cpp

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
deleted file mode 100644
index fc1cfeac8b8..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Throughput
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_THROUGHPUT_H
-#define EC_THROUGHPUT_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class EC_Throughput : public EC_Driver
-{
-  //
-  // = TITLE
-  //   Test the EC throughput
-  //
-  // = DESCRIPTION
-  //
-public:
-  EC_Throughput (void);
-  // Constructor
-
-  // = The EC_Driver methods
-  virtual int parse_args (int& argc, char* argv[]);
-  virtual void print_args (void) const;
-  virtual void print_usage (void);
-  // add some command line args to enable/disable throughputions
-
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // set the throughpution flags
-
-  void execute_test (CORBA::Environment& ACE_TRY_ENV);
-  // Don't run the suppliers, just test connect and disconnect calls.
-
-  void dump_results (void);
-  // Don't dump the EC_Driver results, they are meaningless.
-
-private:
-};
-
-#endif /* EC_THROUGHPUT_H */
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf b/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf
deleted file mode 100644
index db2f45bb610..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/ec.mt.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset immediate  -ECdispatching priority -ECscheduling priority -ECfiltering priority -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf b/TAO/orbsvcs/tests/Event/Performance/ec.st.conf
deleted file mode 100644
index 912f4912166..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/ec.st.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Id$
-static EC_Factory "-ECpushsupplierset delayed -ECdispatching reactive -ECfiltering basic -ECproxyconsumerlock thread -ECproxysupplierlock thread -ECconsumeradminlock null -ECsupplieradminlock thread -ECsupplierfiltering per-supplier"
diff --git a/TAO/orbsvcs/tests/Event/Performance/run_test.pl b/TAO/orbsvcs/tests/Event/Performance/run_test.pl
deleted file mode 100755
index 72c68d126a3..00000000000
--- a/TAO/orbsvcs/tests/Event/Performance/run_test.pl
+++ /dev/null
@@ -1,47 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl script that runs the client and all the other servers that
-# are needed
-
-unshift @INC, '../../../../../bin';
-require Process;
-require Uniqueid;
-
-print STDERR "\n\nThroughput/Latency single threaded configuration\n";
-system ("Throughput -burstsize 100000 -burstcount 1");
-
-print STDERR "\n\nThroughput/Latency MT-safe configuration\n";
-system ("Throughput -ORBsvcconf ec.st.conf -burstsize 100000"
-	." -burstcount 1");
-
-print STDERR "\n\nThroughput/Latency MT-safe configuration, 4 consumers\n";
-system ("Throughput -ORBsvcconf ec.st.conf -burstsize 100000"
-	." -burstcount 1 -consumers 4");
-
-print STDERR "\n\nThroughput/Latency MT-safe configuration,",
-  " 4 consumers 4 suppliers\n";
-system ("Throughput -ORBsvcconf ec.st.conf -burstsize 100000"
-	." -burstcount 1 -consumers 4 -suppliers 4");
-
-print STDERR "\n\nThroughput/Latency MT-safe configuration,",
-  " 4 consumers 4 suppliers\n";
-system ("Throughput -ORBsvcconf ec.st.conf -burstsize 100000"
-	." -burstcount 1 -consumers 4 -suppliers 4"
-	." -consumers_tshift 0 -suppliers_tshift 0");
-
-print STDERR "\n\nConnection and disconnection time,",
-  " 100 consumers 100 suppliers\n";
-system ("Connect -ORBsvcconf ec.st.conf -consumers 100 -suppliers 100"
-	." -connection_order interleaved");
-
-print STDERR "\n\nConnection and disconnection time,",
-  " 500 consumers 500 suppliers\n";
-system ("Connect -ORBsvcconf ec.st.conf -consumers 500 -suppliers 500"
-	." -connection_order interleaved");
-
-exit 0;
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
deleted file mode 100644
index f95b415b310..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "Consumer.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Time_Utilities.h"
-
-ACE_RCSID(EC_Tests, EC_Consumer, "$Id$")
-
-EC_Consumer::EC_Consumer (EC_Driver *driver,
-                          void *cookie)
-  : driver_ (driver),
-    cookie_ (cookie),
-    push_count_ (0),
-    shutdown_event_type_ (ACE_ES_EVENT_SHUTDOWN)
-{
-}
-
-void
-EC_Consumer::connect (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  this->supplier_proxy_ =
-    consumer_admin->obtain_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->connect (qos, shutdown_event_type, ACE_TRY_ENV);
-}
-
-void
-EC_Consumer::connect (
-    const RtecEventChannelAdmin::ConsumerQOS& qos,
-    int shutdown_event_type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->supplier_proxy_.in ()))
-    return; // @@ Throw?
-
-  this->shutdown_event_type_ = shutdown_event_type;
-
-  RtecEventComm::PushConsumer_var objref = this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_proxy_->connect_push_consumer (objref.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-int
-EC_Consumer::connected (void) const
-{
-  return !CORBA::is_nil (this->supplier_proxy_.in ());
-}
-
-void
-EC_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->supplier_proxy_.in ()))
-    return;
-
-  this->supplier_proxy_->disconnect_push_supplier (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->supplier_proxy_ =
-    RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-
-  // Deactivate the servant
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Consumer::dump_results (const char* name)
-{
-  this->throughput_.dump_results ("EC_Consumers", name);
-  this->latency_.dump_results ("EC_Consumers", name);
-}
-
-void
-EC_Consumer::accumulate (EC_Driver::Throughput_Stats& throughput,
-                           EC_Driver::Latency_Stats& latency) const
-{
-  throughput.accumulate (this->throughput_);
-  latency.accumulate (this->latency_);
-}
-
-void
-EC_Consumer::push (const RtecEventComm::EventSet& events,
-                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->driver_->consumer_push (this->cookie_, events, ACE_TRY_ENV);
-
-  if (events.length () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "EC_Consumer (%P|%t) no events\n"));
-      return;
-    }
-
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-  if (this->push_count_ == 0)
-    this->throughput_.start ();
-
-  // We start the timer as soon as we receive the first event...
-  this->throughput_.sample ();
-
-  this->push_count_ += events.length ();
-
-  if (TAO_debug_level > 0
-      && this->push_count_ % 100 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "EC_Consumer (%P|%t): %d events received\n",
-                  this->push_count_));
-    }
-
-  for (u_int i = 0; i < events.length (); ++i)
-    {
-      const RtecEventComm::Event& e = events[i];
-
-      ACE_hrtime_t creation;
-      ORBSVCS_Time::TimeT_to_hrtime (creation,
-                                     e.header.creation_time);
-
-      const ACE_hrtime_t now = ACE_OS::gethrtime ();
-      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);
-    }
-}
-
-void
-EC_Consumer::disconnect_push_consumer (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->driver_->consumer_disconnect (this->cookie_, ACE_TRY_ENV);
-  this->supplier_proxy_ =
-    RtecEventChannelAdmin::ProxyPushSupplier::_nil ();
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h
deleted file mode 100644
index ce1ac9be637..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Consumer.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Consumer
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_CONSUMER_H
-#define EC_CONSUMER_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-
-class EC_Test_Export EC_Consumer : public POA_RtecEventComm::PushConsumer
-{
-  // = TITLE
-  //   Simple consumer object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This class is a consumer of events.
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
-public:
-  EC_Consumer (EC_Driver* driver, void* cookie);
-  // Constructor
-
-  virtual void connect (
-      RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-      const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
-  // The driver program can build the QoS attributes and obtain the
-  // ConsumerAdmin, we do the rest.
-
-  virtual void connect (
-      const RtecEventChannelAdmin::ConsumerQOS& qos,
-      int shutdown_event_type,
-      CORBA::Environment &ACE_TRY_ENV);
-  // The driver program can build the QoS attributes and we use
-  // whatevet supplier_proxy we already have (useful for reconnection
-  // tests).
-
-  virtual int connected (void) const;
-  // returns 0 if it is not connected
-
-  void disconnect (CORBA::Environment& ACE_TRY_ENV);
-  // The application can invoke this method to disconnect from the EC
-  // and deactivate this class.
-
-  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);
-  // Printout the statistics
-
-  // = The RtecEventComm::PushConsumer methods
-
-  virtual void push (const RtecEventComm::EventSet& events,
-                     CORBA::Environment &_env);
-  virtual void disconnect_push_consumer (CORBA::Environment &);
-  // The skeleton methods.
-
-private:
-  EC_Driver* driver_;
-  // The main driver for the test.
-
-  void* cookie_;
-  // A magic cookie passed by the driver that we pass back in our
-  // callbacks.
-
-  RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_;
-  // We talk to the EC using this proxy.
-
-  ACE_SYNCH_MUTEX lock_;
-  // Protect internal state
-
-  EC_Driver::Throughput_Stats throughput_;
-  // Used for reporting stats
-
-  EC_Driver::Latency_Stats latency_;
-  // Used for reporting stats
-
-  int push_count_;
-  // The number of push() calls
-
-  int shutdown_event_type_;
-  // The type used to indicate shutdown
-};
-
-#endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
deleted file mode 100644
index e86c03dd7bf..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ /dev/null
@@ -1,1186 +0,0 @@
-// $Id$
-
-#include "Driver.h"
-#include "Consumer.h"
-#include "Supplier.h"
-#include "orbsvcs/Event_Service_Constants.h"
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "ace/Sched_Params.h"
-#include "ace/Arg_Shifter.h"
-#include "ace/High_Res_Timer.h"
-
-#if !defined(EC_DISABLE_OLD_EC)
-#include "EC_Scheduler_Info.h"
-#endif
-
-#if !defined (__ACE_INLINE__)
-#include "Driver.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
-
-EC_Driver::EC_Driver (void)
-  :  n_consumers_ (1),
-     consumers_ (0),
-     n_suppliers_ (1),
-     suppliers_ (0),
-     tasks_ (0),
-     burst_count_  (100),
-     burst_size_   (100),
-     payload_size_ (0),
-     burst_pause_  (10000),
-     consumer_type_start_ (ACE_ES_EVENT_UNDEFINED),
-     consumer_type_count_ (1),
-     consumer_type_shift_ (2),
-     supplier_type_start_ (ACE_ES_EVENT_UNDEFINED),
-     supplier_type_count_ (1),
-     supplier_type_shift_ (2),
-     pid_file_name_ (0),
-     verbose_ (0),
-     thr_create_flags_ (THR_NEW_LWP|THR_BOUND|THR_SCHED_FIFO),
-     use_remote_ec_ (0),
-     event_service_name_ ("EventService"),
-     use_old_ec_ (0),
-#if !defined(TAO_EC_DISABLE_OLD_EC)
-     module_factory_ (0),
-#endif
-     scheduler_impl_ (0),
-     ec_impl_ (0)
-{
-  TAO_EC_Default_Factory::init_svcs ();
-}
-
-EC_Driver::~EC_Driver (void)
-{
-}
-
-int
-EC_Driver::run (int argc, char* argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Calibrate the high resolution timer *before* starting the
-      // test.
-      ACE_High_Res_Timer::calibrate ();
-
-      this->run_init (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->execute_test (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->dump_results ();
-
-      this->run_cleanup (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run");
-    }
-  ACE_CATCHALL
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n"));
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-EC_Driver::run_init (int &argc, char* argv[],
-                     CORBA::Environment& ACE_TRY_ENV)
-{
-  this->initialize_orb_and_poa (argc, argv, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->parse_args (argc, argv))
-    ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                CORBA::COMPLETED_NO));
-
-  if (this->verbose ())
-    this->print_args ();
-
-  if (this->pid_file_name_ != 0)
-    {
-      FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
-      if (pid != 0)
-        {
-          ACE_OS::fprintf (pid, "%d\n", ACE_OS::getpid ());
-          ACE_OS::fclose (pid);
-        }
-    }
-
-  if (this->move_to_rt_class () == -1)
-    ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
-                                CORBA::COMPLETED_NO));
-
-  this->initialize_ec_impl (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->allocate_consumers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                 CORBA::COMPLETED_NO));
-
-  if (this->allocate_suppliers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                 CORBA::COMPLETED_NO));
-
-  this->connect_clients (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::run_cleanup (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->disconnect_clients (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->destroy_ec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n"));
-
-  this->deactivate_ec (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel deactivated\n"));
-
-  this->cleanup_tasks ();
-  this->cleanup_suppliers ();
-  this->cleanup_consumers ();
-  this->cleanup_ec ();
-}
-
-void
-EC_Driver::initialize_orb_and_poa (int &argc, char* argv[],
-                                   CORBA::Environment& ACE_TRY_ENV)
-{
-  this->orb_ =
-    CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var poa_object =
-    this->orb_->resolve_initial_references("RootPOA");
-  if (CORBA::is_nil (poa_object.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "EC_Driver (%P|%t) Unable to initialize the POA.\n"));
-      return;
-    }
-
-  this->root_poa_ =
-    PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa_manager->activate (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::print_args (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Execution parameters:\n"
-              "  consumers = <%d>\n"
-              "  suppliers = <%d>\n"
-              "  burst count = <%d>\n"
-              "  burst size = <%d>\n"
-              "  event size = <%d>\n"
-              "  burst pause = <%d>\n"
-              "  consumer type start = <%d>\n"
-              "  consumer type count = <%d>\n"
-              "  consumer type shift = <%d>\n"
-              "  supplier type start = <%d>\n"
-              "  supplier type count = <%d>\n"
-              "  supplier type shift = <%d>\n"
-              "  pid file name = <%s>\n",
-
-              this->n_consumers_,
-              this->n_suppliers_,
-              this->burst_count_,
-              this->burst_size_,
-              this->payload_size_,
-              this->burst_pause_,
-
-              this->consumer_type_start_,
-              this->consumer_type_count_,
-              this->consumer_type_shift_,
-              this->supplier_type_start_,
-              this->supplier_type_count_,
-              this->supplier_type_shift_,
-
-              this->pid_file_name_?this->pid_file_name_:"nil"
-              ) );
-}
-
-int
-EC_Driver::move_to_rt_class (void)
-{
-  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,
-                      "EC_Driver (%P|%t): user is not superuser, "
-                      "so remain in time-sharing class\n"));
-          this->thr_create_flags_ = THR_NEW_LWP;
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "EC_Driver (%P|%t): sched_params failed\n"));
-    }
-
-  if (ACE_OS::thr_setprio (priority) == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) main thr_setprio failed,"
-                  "no real-time features\n"));
-    }
-  return 0;
-}
-
-void
-EC_Driver::initialize_ec_impl (CORBA::Environment& ACE_TRY_ENV)
-{
-#if !defined(EC_DISABLE_REMOTE_EC)
-  if (this->use_remote_ec_ == 1)
-    {
-      this->obtain_remote_ec (ACE_TRY_ENV);
-      return;
-    }
-#endif
-
-#if !defined(EC_DISABLE_OLD_EC)
-  if (this->use_old_ec_ == 1)
-    {
-      this->initialize_old_ec (ACE_TRY_ENV);
-      return;
-    }
-#endif
-
-  this->initialize_new_ec (ACE_TRY_ENV);
-}
-
-#if !defined(EC_DISABLE_REMOTE_EC)
-void
-EC_Driver::obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV)
-{
-  CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CosNaming::Name channel_name (1);
-  channel_name.length (1);
-  channel_name[0].id = CORBA::string_dup (this->event_service_name_);
-
-  CORBA::Object_var tmp =
-    naming_context->resolve (channel_name, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->event_channel_ =
-    RtecEventChannelAdmin::EventChannel::_narrow (tmp, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CosNaming::NamingContext_ptr
-EC_Driver::get_naming_context (CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var naming_obj =
-    this->orb_->resolve_initial_references ("NameService", ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
-
-  if (CORBA::is_nil (naming_obj.in ()))
-    ACE_ERROR ((LM_ERROR,
-                "EC_Driver (%P|%t) Unable to obtain the "
-                "Naming Service.\n"));
-
-  return CosNaming::NamingContext::_narrow (naming_obj.in (), ACE_TRY_ENV);
-}
-#endif
-
-#if !defined(EC_DISABLE_OLD_EC)
-int
-EC_Driver::initialize_old_ec (CORBA::Environment& ACE_TRY_ENV)
-{
-  CosNaming::NamingContext_var naming_context =
-    this->get_naming_context (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // This is the name we (potentially) register the Scheduling
-  // Service in the Naming Service.
-  CosNaming::Name schedule_name (1);
-  schedule_name.length (1);
-  schedule_name[0].id = CORBA::string_dup ("ScheduleService");
-
-  if (this->use_runtime_scheduler_ == 1)
-    ACE_NEW (this->scheduler_impl_,
-             ACE_Runtime_Scheduler (runtime_configs_size,
-                                    runtime_configs,
-                                    runtime_infos_size,
-                                    runtime_infos));
-  else
-    ACE_NEW (this->scheduler_impl_,
-             ACE_Config_Scheduler ());
-
-
-  this->scheduler_ =
-    this->scheduler_impl_._this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::String_var str =
-    this->orb_->object_to_string (scheduler.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  ACE_DEBUG ((LM_DEBUG,
-              "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n",
-              str.in ()));
-
-
-  if (this->reactive_ec_ == 1)
-    ACE_NEW_RETURN (this->module_factory_,
-                    TAO_Reactive_Module_Factory,
-                    -1);
-  else
-    ACE_NEW_RETURN (this->module_factory_,
-                    TAO_Default_Module_Factory,
-                    -1);
-
-  ACE_NEW_RETURN (this->ec_impl_,
-                  ACE_EventChannel (scheduler.in (), 1,
-                                    ACE_DEFAULT_EVENT_CHANNEL_TYPE,
-                                    this->module_factory_),
-                  -1);
-
-  this->event_channel_ =
-    this->ec_impl_->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-}
-#endif /* */
-
-void
-EC_Driver::initialize_new_ec (CORBA::Environment& ACE_TRY_ENV)
-{
-  TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (),
-                                        this->root_poa_.in ());
-  this->modify_attributes (attr);
-
-  TAO_EC_Event_Channel *ec =
-    new TAO_EC_Event_Channel (attr);
-  this->ec_impl_ = ec;
-
-  ec->activate (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->event_channel_ =
-    this->ec_impl_->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::deactivate_ec (CORBA::Environment& ACE_TRY_ENV)
-{
-#if !defined(EC_DISABLE_REMOTE_EC)
-  if (this->use_remote_ec_ == 1)
-    return;
-#endif
-
-  {
-    // Deactivate the EC
-    PortableServer::POA_var poa =
-      this->ec_impl_->_default_POA (ACE_TRY_ENV);
-    ACE_CHECK;
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id (this->ec_impl_, ACE_TRY_ENV);
-    ACE_CHECK;
-    poa->deactivate_object (id.in (), ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) EC deactivated\n"));
-
-#if !defined(EC_DISABLE_OLD_EC)
-  if (this->use_old_ec_ == 1)
-    {
-      // Deactivate the Scheduler
-      PortableServer::POA_var poa =
-        scheduler_impl._default_POA (ACE_TRY_ENV);
-      ACE_CHECK;
-      PortableServer::ObjectId_var id =
-        poa->servant_to_id (&scheduler_impl, ACE_TRY_ENV);
-      ACE_CHECK;
-      poa->deactivate_object (id.in (), ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (this->verbose ())
-        ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) scheduler deactivated\n"));
-    }
-#endif
-}
-
-void
-EC_Driver::destroy_ec (CORBA::Environment& ACE_TRY_ENV)
-{
-  this->event_channel_->destroy (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-int
-EC_Driver::allocate_consumers (void)
-{
-  ACE_NEW_RETURN (this->consumers_,
-                  EC_Consumer*[this->n_consumers_],
-                  -1);
-  for (int i = 0; i < this->n_consumers_; ++i)
-    this->consumers_[i] =
-      this->allocate_consumer (i);
-  return 0;
-}
-
-int
-EC_Driver::allocate_suppliers (void)
-{
-  ACE_NEW_RETURN (this->suppliers_,
-                  EC_Supplier*[this->n_suppliers_],
-                  -1);
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    this->suppliers_[i] =
-      this->allocate_supplier (i);
-  return 0;
-}
-
-EC_Consumer*
-EC_Driver::allocate_consumer (int i)
-{
-  return new EC_Consumer (this,
-                          this->consumers_ + i);
-}
-
-EC_Supplier*
-EC_Driver::allocate_supplier (int i)
-{
-  return new EC_Supplier (this,
-                          this->suppliers_ + i);
-}
-
-void
-EC_Driver::connect_clients (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->connect_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->connect_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::disconnect_clients (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->disconnect_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->disconnect_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Driver::connect_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-    this->event_channel_->for_consumers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->connect_consumer (consumer_admin.in (), i, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n"));
-}
-
-void
-EC_Driver::connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::ConsumerQOS qos;
-  int shutdown_event_type;
-  this->build_consumer_qos (i, qos, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumers_[i]->connect (consumer_admin,
-                                qos,
-                                shutdown_event_type,
-                                ACE_TRY_ENV);
-}
-
-void
-EC_Driver::build_consumer_qos (
-  int i,
-  RtecEventChannelAdmin::ConsumerQOS& qos,
-  int& shutdown_event_type,
-  CORBA::Environment&)
-{
-  RtecScheduler::handle_t rt_info = 0;
-
-  int type_start =
-    this->consumer_type_start_
-    + i * this->consumer_type_shift_;
-
-  shutdown_event_type = type_start + this->consumer_type_count_;
-
-  ACE_ConsumerQOS_Factory qos_factory;
-  qos_factory.start_disjunction_group ();
-  qos_factory.insert_type (shutdown_event_type, rt_info);
-
-  for (int j = 0; j != this->consumer_type_count_; ++j)
-    qos_factory.insert_type (type_start + j, rt_info);
-
-  qos = qos_factory.get_ConsumerQOS ();
-}
-
-void
-EC_Driver::connect_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-    this->event_channel_->for_suppliers (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->connect_supplier (supplier_admin.in (), i, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected supplier(s)\n"));
-}
-
-void
-EC_Driver::connect_supplier (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  RtecEventChannelAdmin::SupplierQOS qos;
-  int shutdown_event_type;
-  this->build_supplier_qos (i, qos, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->suppliers_[i]->connect (supplier_admin,
-                                qos,
-                                shutdown_event_type,
-                                ACE_TRY_ENV);
-}
-
-void
-EC_Driver::build_supplier_qos (
-      int i,
-      RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&)
-{
-  int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_;
-  int supplier_id = i + 1;
-  shutdown_event_type = type_start + this->supplier_type_count_;
-
-  RtecScheduler::handle_t rt_info = 0;
-
-  ACE_SupplierQOS_Factory qos_factory;
-  for (int j = 0; j != this->supplier_type_count_; ++j)
-    qos_factory.insert (supplier_id,
-                        type_start + j,
-                        rt_info, 1);
-
-  qos_factory.insert (supplier_id,
-                      shutdown_event_type,
-                      rt_info, 1);
-
-  qos = qos_factory.get_SupplierQOS ();
-}
-
-void
-EC_Driver::execute_test (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->allocate_tasks () == -1)
-    return;
-
-  this->activate_tasks (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers are active\n"));
-
-  // Wait for the supplier threads...
-  if (ACE_Thread_Manager::instance ()->wait () == -1)
-    {
-      ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) Thread_Manager wait failed\n"));
-    }
-
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers finished\n"));
-}
-
-int
-EC_Driver::allocate_tasks (void)
-{
-  ACE_NEW_RETURN (this->tasks_,
-                  ACE_Task_Base*[this->n_suppliers_],
-                  -1);
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    this->tasks_[i] =
-      this->allocate_task (i);
-  return 0;
-}
-
-ACE_Task_Base*
-EC_Driver::allocate_task (int i)
-{
-  int start = this->supplier_type_start_ + i*this->supplier_type_shift_;
-  return new EC_Supplier_Task (this->suppliers_[i],
-                               this,
-                               this->suppliers_ + i,
-                               this->burst_count_,
-                               this->burst_size_,
-                               this->burst_pause_,
-                               this->payload_size_,
-                               start + this->supplier_type_count_);
-}
-
-void
-EC_Driver::activate_tasks (CORBA::Environment &)
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->tasks_[i] = this->allocate_task (i);
-
-      if (this->tasks_[i]->activate (this->thr_create_flags_,
-                                     1, 0, priority) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Cannot activate thread for supplier %d\n",
-                      i));
-        }
-    }
-}
-
-void
-EC_Driver::disconnect_suppliers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_suppliers_; ++i)
-    {
-      this->suppliers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) suppliers disconnected\n"));
-}
-
-void
-EC_Driver::disconnect_consumers (CORBA::Environment &ACE_TRY_ENV)
-{
-  for (int i = 0; i < this->n_consumers_; ++i)
-    {
-      this->consumers_[i]->disconnect (ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  if (this->verbose ())
-    ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) consumers disconnected\n"));
-}
-
-void
-EC_Driver::dump_results (void)
-{
-  EC_Driver::Throughput_Stats throughput;
-  EC_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);
-      this->consumers_[j]->accumulate (throughput, latency);
-    }
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-
-  EC_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);
-      this->suppliers_[i]->accumulate (suppliers);
-    }
-
-  ACE_DEBUG ((LM_DEBUG, "\nTotals:\n"));
-  throughput.dump_results ("EC_Consumer", "throughput");
-  latency.dump_results ("EC_Consumer", "latency");
-
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-  suppliers.dump_results ("EC_Supplier", "accumulated");
-}
-
-int
-EC_Driver::parse_args (int &argc, char *argv [])
-{
-  ACE_Arg_Shifter arg_shifter (argc, argv);
-
-  while (arg_shifter.is_anything_left ())
-    {
-      char *arg = arg_shifter.get_current ();
-
-      if (ACE_OS::strcmp (arg, "-verbose") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->verbose_ = 1;
-        }
-
-      else if (ACE_OS::strcmp (arg, "-remote") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          this->use_remote_ec_ = 1;
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->event_service_name_ = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-old_reactive") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->use_old_ec_ = 1;
-        }
-
-      else if (ACE_OS::strcmp (arg, "-old_threaded") == 0)
-        {
-          arg_shifter.consume_arg ();
-          this->use_old_ec_ = 1;
-        }
-
-      else if (ACE_OS::strcmp (arg, "-suppliers") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->n_suppliers_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumers") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->n_consumers_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_count_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstsize") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_size_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-payloadsize") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->payload_size_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-burstpause") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->burst_pause_ = ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tstart") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_start_ =
-                ACE_ES_EVENT_UNDEFINED
-                + ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_count_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-consumer_tshift") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->consumer_type_shift_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tstart") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_start_ =
-                ACE_ES_EVENT_UNDEFINED
-                + ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tcount") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_count_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-supplier_tshift") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->supplier_type_shift_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-busyhwm") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->busy_hwm_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else if (ACE_OS::strcmp (arg, "-maxwritedelay") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next ())
-            {
-              this->max_write_delay_ =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
-
-      else
-        {
-          arg_shifter.ignore_arg ();
-        }
-
-    }
-  return 0;
-}
-
-void
-EC_Driver::print_usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "EC_Driver Usage:\n"
-              "  -verbose\n"
-              "  -remote <ec_name>\n"
-              "  -old_reactive\n"
-              "  -old_threaded\n"
-              "  -suppliers <nsuppliers>\n"
-              "  -consumers <nsuppliers>\n"
-              "  -burstcount <bursts>\n"
-              "  -burstsize <size>\n"
-              "  -payloadsize <size>\n"
-              "  -burstpause <usecs>\n"
-              "  -consumer_tstart <type>\n"
-              "  -consumer_tcount <count>\n"
-              "  -consumer_tshift <shift>\n"
-              "  -supplier_tstart <type>\n"
-              "  -supplier_tcount <count>\n"
-              "  -supplier_tshift <shift>\n"
-              "  -busy_hwm <value>\n"
-              "  -max_write_delay <value>\n"
-              ));
-}
-
-void
-EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr)
-{
-  attr.busy_hwm = this->busy_hwm_;
-  attr.max_write_delay = this->max_write_delay_;
-}
-
-void
-EC_Driver::cleanup_tasks (void)
-{
-  if (this->tasks_ != 0)
-    {
-      for (int i = 0; i != this->n_suppliers_; ++i)
-        {
-          delete this->tasks_[i];
-          this->tasks_[i] = 0;
-        }
-      delete[] this->tasks_;
-      this->tasks_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_suppliers (void)
-{
-  if (this->suppliers_ != 0)
-    {
-      for (int i = 0; i != this->n_suppliers_; ++i)
-        {
-          delete this->suppliers_[i];
-          this->suppliers_[i] = 0;
-        }
-      delete[] this->suppliers_;
-      this->suppliers_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_consumers (void)
-{
-  if (this->consumers_ != 0)
-    {
-      for (int i = 0; i != this->n_consumers_; ++i)
-        {
-          delete this->consumers_[i];
-          this->consumers_[i] = 0;
-        }
-      delete[] this->consumers_;
-      this->consumers_ = 0;
-    }
-}
-
-void
-EC_Driver::cleanup_ec (void)
-{
-  delete this->ec_impl_;
-  delete this->scheduler_impl_;
-#if !defined(EC_DISABLE_OLD_EC)
-  delete this->module_factory_;
-#endif
-}
-
-int
-EC_Driver::decode_consumer_cookie (void* cookie) const
-{
-  return ACE_static_cast(EC_Consumer**,cookie) - this->consumers_;
-}
-
-int
-EC_Driver::decode_supplier_cookie (void* cookie) const
-{
-  return ACE_static_cast(EC_Supplier**,cookie) - this->suppliers_;
-}
-
-void
-EC_Driver::consumer_push (void*,
-                          const RtecEventComm::EventSet&,
-                          CORBA::Environment&)
-{
-}
-
-void
-EC_Driver::consumer_shutdown (void*,
-                              CORBA::Environment&)
-{
-}
-
-void
-EC_Driver::consumer_disconnect (void*,
-                                CORBA::Environment&)
-{
-}
-
-void
-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
deleted file mode 100644
index f64ea4d7398..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Driver
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_DRIVER_H
-#define EC_DRIVER_H
-
-#include "ectest_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/RtecEventChannelAdminS.h"
-
-class TAO_EC_Event_Channel_Attributes;
-class TAO_Module_Factory;
-class EC_Consumer;
-class EC_Supplier;
-
-#define EC_DISABLE_REMOTE_EC
-#define EC_DISABLE_OLD_EC
-
-#if !defined(EC_DISABLE_REMOTE_EC)
-#include "orbsvcs/CosNamingC.h"
-#endif
-
-class EC_Test_Export EC_Driver
-{
-  //
-  // = TITLE
-  //   Defines the interface of a test driver
-  //
-  // = DESCRIPTION
-  //   Abstract base class for the test driver, this let us implement a
-  //   collocated and a non-collocated test, and to write generic
-  //   consumers and suppliers that can call back the driver.
-  //
-public:
-  EC_Driver (void);
-  // Constructor
-
-  virtual ~EC_Driver (void);
-  // Destructor
-
-  int verbose (void) const;
-  // Flag to indicate in the test should be verbose.
-
-  virtual int run (int argc, char* argv[]);
-  // Execute the test.
-
-  virtual void run_init (int& argc, char* argv[],
-                         CORBA::Environment& ACE_TRY_ENV);
-  // The initialization section
-
-  virtual void run_cleanup (CORBA::Environment& ACE_TRY_ENV);
-  // The cleanup section
-
-  virtual void initialize_orb_and_poa (int& argc, char* argv[],
-                                       CORBA::Environment& env);
-  // Initialize the ORB and obtain the RootPOA object
-
-  virtual int parse_args (int& argc, char* argv[]);
-  // Parse the common command-line arguments for all tests
-
-  virtual void print_usage (void);
-  // Print the usage method
-
-  virtual void print_args (void) const;
-  // Print out the arguments
-
-  virtual int move_to_rt_class (void);
-  // Run the test in the real-time class, return -1 on error.
-
-  virtual void initialize_ec_impl (CORBA::Environment& env);
-  // Construct the EC and its helper objects, also activates the EC in
-  // the RootPOA.
-
-  virtual void connect_clients (CORBA::Environment& env);
-  // By default connect the consumers and then the suppliers, other
-  // orders should work too.
-
-  virtual void disconnect_clients (CORBA::Environment &env);
-  // By default disconnect the suppliers and then the consumers, other
-  // orders should work too.
-
-  virtual void connect_consumers (CORBA::Environment& env);
-  // Connect all the consumers, by default it lets each consumer
-  // connect itself.
-
-  virtual void connect_consumer (
-    RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  // Connect consumer number <i> using the consumer_admin provided.
-
-  virtual void build_consumer_qos (
-      int i,
-      RtecEventChannelAdmin::ConsumerQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
-  // Build the QoS requirements for consumer <i>
-
-  virtual void connect_suppliers (CORBA::Environment& env);
-  // Connect all the suppliers, by default it lets each supplier
-  // connect itself.
-
-  virtual void connect_supplier (
-    RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-    int i,
-    CORBA::Environment &ACE_TRY_ENV);
-  // Connect supplier number <i> using the supplier_admin provided.
-
-  virtual void build_supplier_qos (
-      int i,
-      RtecEventChannelAdmin::SupplierQOS& qos,
-      int& shutdown_event_type,
-      CORBA::Environment&);
-  // Build the QoS requirements for supplier <i>
-
-  virtual void execute_test (CORBA::Environment &env);
-  // Execute the test, by default simply call activate_suppliers()
-
-  virtual void dump_results (void);
-  // Dump the results, i.e. invoke dump_results on all the suppliers
-  // and consumers, collect the latency and throughput results for
-  // each and print the totals too.
-
-  virtual void disconnect_consumers (CORBA::Environment& env);
-  // Disconnect all the consumers.
-
-  virtual void disconnect_suppliers (CORBA::Environment& env);
-  // Disconnect all the suppliers.
-
-  virtual void destroy_ec (CORBA::Environment& env);
-  // Call EC->destroy
-
-  virtual void deactivate_ec (CORBA::Environment& env);
-  // De-activate the EC (and its helper classes).
-
-  virtual void cleanup_ec (void);
-  virtual void cleanup_tasks (void);
-  virtual void cleanup_consumers (void);
-  virtual void cleanup_suppliers (void);
-  // Cleanup the resources
-
-  virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
-  // Allow modifications of the default EC attributes
-
-  virtual int decode_consumer_cookie (void* cookie) const;
-  // Returns the index of the consumer for <cookie>
-
-  virtual int decode_supplier_cookie (void* cookie) const;
-  // Returns the index of the supplier for <cookie>
-
-  virtual void consumer_push (void* consumer_cookie,
-                              const RtecEventComm::EventSet& event,
-                              CORBA::Environment& ACE_TRY_ENV);
-  // One of the consumers in the test has received an event
-
-  virtual void consumer_shutdown (void* consumer_cookie,
-                                  CORBA::Environment& ACE_TRY_ENV);
-  // One of the consumers has received a shutdown event
-
-  virtual void consumer_disconnect (void* consumer_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // One of the consumers in the test has been disconnected from the EC
-
-  virtual void supplier_disconnect (void* supplier_cookie,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // One of the suppliers in the test has been disconnected from the EC
-
-#if !defined(EC_DISABLE_REMOTE_EC)
-  virtual void obtain_remote_ec (CORBA::Environment& ACE_TRY_ENV);
-  // Obtain the EC from the Naming service
-
-  virtual CosNaming::NamingContext_var
-       get_naming_context (CORBA::Environment &ACE_TRY_ENV);
-#endif
-
-#if !defined(EC_DISABLE_OLD_EC)
-  virtual void initialize_old_ec (CORBA::Environment& ACE_TRY_ENV);
-  // Initialize the EC using the old implementation
-#endif
-
-  virtual void initialize_new_ec (CORBA::Environment& ACE_TRY_ENV);
-  // Initialize the EC using the old implementation
-
-  virtual int allocate_consumers (void);
-  virtual int allocate_suppliers (void);
-  // Allocate the suppliers and the consumers
-
-  virtual EC_Consumer* allocate_consumer (int i);
-  virtual EC_Supplier* allocate_supplier (int i);
-  // Allocate one consumer or supplier
-
-  virtual int allocate_tasks (void);
-  virtual ACE_Task_Base* allocate_task (int i);
-  // Allocate one task for supplier number <i>
-
-  virtual void activate_tasks (CORBA::Environment& env);
-  // 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
-
-  PortableServer::POA_var root_poa_;
-  // The Root POA
-
-  int n_consumers_;
-  // The number of consumers
-
-  EC_Consumer** consumers_;
-  // The consumers
-
-  int n_suppliers_;
-  // The number of suppliers
-
-  EC_Supplier** suppliers_;
-  // The suppliers
-
-  ACE_Task_Base** tasks_;
-  // The tasks for each supplier
-
-  int burst_count_;
-  // How many bursts we will send from each supplier.
-
-  int burst_size_;
-  // The number of events
-
-  int payload_size_;
-  // The size of the payload on each event.
-
-  int burst_pause_;
-  // The time between each event burst, in microseconds.
-
-  int consumer_type_start_;
-  int consumer_type_count_;
-  int consumer_type_shift_;
-  // The consumers subscribe to different sets of events, as follows:
-  //
-  // Consumer0: [start          , start           + count)
-  // Consumer1: [start + 1*shift, start + 1*shift + count)
-  // Consumer2: [start + 2*shift, start + 2*shift + count)
-  // .....
-  // ....
-  // .
-  // Some sub-tests may choose other configurations, but this is good
-  // for many cases.
-
-  int supplier_type_start_;
-  int supplier_type_count_;
-  int supplier_type_shift_;
-  // The suppliers generate different sets of events, as follows:
-  //
-  // Supplier0: [start          , start           + count)
-  // Supplier1: [start + 1*shift, start + 1*shift + count)
-  // Supplier2: [start + 2*shift, start + 2*shift + count)
-  // .....
-  // ....
-  // .
-  // Some sub-tests may choose other configurations, but this is good
-  // for many cases.
-
-  const char* pid_file_name_;
-  // The name of a file where the process stores its pid
-
-  int verbose_;
-  // Verbosity flag
-
-  int thr_create_flags_;
-  // The flags used to create threads, by default we attempt:
-  //
-  // THR_SCHED_FIFO|THR_BOUND|THR_NEW_LWP
-  //
-  // but if we don't have enough privileges we fall back to
-  //
-  // THR_NEW_LWP
-  //
-
-  int use_remote_ec_;
-  // Use a remote event channel.  If this flag is enabled it
-  // superseedes any options for the event channel implementation.
-
-  const char* event_service_name_;
-  // The name of the remote event service
-
-  int use_old_ec_;
-  // Use the old implementation of the event channel.
-
-#if !defined(TAO_EC_DISABLE_OLD_EC)
-  TAO_Module_Factory* module_factory_;
-  // The module factory for the OLD ec
-#endif
-
-  POA_RtecScheduler::Scheduler *scheduler_impl_;
-  // The scheduler implementation
-
-  RtecScheduler::Scheduler_var scheduler_;
-  // The scheduler object reference
-
-  POA_RtecEventChannelAdmin::EventChannel *ec_impl_;
-  // The event channel implementation
-
-  RtecEventChannelAdmin::EventChannel_var event_channel_;
-  // The event channel object reference
-
-  int busy_hwm_;
-  int max_write_delay_;
-  // Control the concurrency inside the EC.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Driver.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.i b/TAO/orbsvcs/tests/Event/lib/Driver.i
deleted file mode 100644
index b93a23fdbd2..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Driver.i
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-
-ACE_INLINE int
-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/ECTest.dsp b/TAO/orbsvcs/tests/Event/lib/ECTest.dsp
deleted file mode 100644
index a31a964c503..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/ECTest.dsp
+++ /dev/null
@@ -1,134 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ECTest" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

-

-CFG=ECTest - 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 "ECTest.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 "ECTest.mak" CFG="ECTest - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ECTest - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "ECTest - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "ECTest - 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 /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D EC_Test_HAS_DLL=1 /D "EC_Test_BUILD_DLL" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# 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 /nologo /subsystem:windows /dll /machine:I386

-# ADD LINK32 orbsvcs.lib TAO.lib ace.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\..\bin\ECTest.dll" /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "ECTest - 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 /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\.." /I "..\..\..\.." /I "..\..\..\..\.." /D EC_Test_HAS_DLL=1 /D "EC_Test_BUILD_DLL" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 orbsvcsd.lib TAOd.lib aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\bin\ECTestd.dll" /pdbtype:sept /libpath:"..\..\..\orbsvcs" /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ECTest - Win32 Release"

-# Name "ECTest - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Consumer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Driver.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Consumer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Driver.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ectest_export.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Supplier.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\Driver.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Event/lib/ECTest.dsw b/TAO/orbsvcs/tests/Event/lib/ECTest.dsw
deleted file mode 100644
index 731efb78ec9..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/ECTest.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: "ECTest"=.\ECTest.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Event/lib/Makefile b/TAO/orbsvcs/tests/Event/lib/Makefile
deleted file mode 100644
index 26a57d0bcc2..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Makefile
+++ /dev/null
@@ -1,1024 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-MAKEFILE = Makefile
-LIBNAME  = libECTests
-LIB2      = $(LIBNAME).a
-SHLIB2    = $(LIBNAME).$(SOEXT)
-
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event2,$(findstring Event2,$(TAO_ORBSVCS)))
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-endif # Event2
-
-LIBS    += -lorbsvcs -lTAO -lACE
-
-SRCS = Driver Consumer Supplier
-FILES = $(SRCS)
-DEFS  = $(addsuffix .h,$(FILES))
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-
-#----------------------------------------------------------------------------
-#       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.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#       Local targets (and local hacks)
-#----------------------------------------------------------------------------
-
-LDFLAGS  += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Driver.o .obj/Driver.so .shobj/Driver.o .shobj/Driver.so: Driver.cpp Driver.h ectest_export.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/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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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.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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Driver.i Consumer.h Supplier.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Default_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i
-.obj/Consumer.o .obj/Consumer.so .shobj/Consumer.o .shobj/Consumer.so: Consumer.cpp Consumer.h Driver.h ectest_export.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/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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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.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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Driver.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i
-.obj/Supplier.o .obj/Supplier.so .shobj/Supplier.o .shobj/Supplier.so: Supplier.cpp Supplier.h Driver.h ectest_export.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/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/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 \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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.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/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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- Driver.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Event/lib/README b/TAO/orbsvcs/tests/Event/lib/README
deleted file mode 100644
index ead5bcaaacc..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/README
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-This directory contains a small framework to write tests for the
-real-time event service.  Check the Basic or Performance directories
-for examples of its use.
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
deleted file mode 100644
index 827ded8acff..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// $Id$
-
-#include "Supplier.h"
-#include "orbsvcs/Time_Utilities.h"
-#include "orbsvcs/Event_Utilities.h"
-
-ACE_RCSID(EC_Tests, EC_Supplier, "$Id$")
-
-EC_Supplier::EC_Supplier (EC_Driver *driver,
-                          void* cookie)
-  :  driver_ (driver),
-     cookie_ (cookie),
-     push_count_ (0),
-     burst_count_ (0),
-     burst_size_ (0),
-     payload_size_ (0),
-     burst_pause_ (0),
-     shutdown_event_type_ (0)
-{
-}
-
-void
-EC_Supplier::send_event (int event_number,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->consumer_proxy_.in ()))
-    return;
-
-  // Create the event...
-
-  RtecEventComm::EventSet event (1);
-  event.length (1);
-
-  event[0].header.ttl = 1;
-
-  ACE_hrtime_t t = ACE_OS::gethrtime ();
-  ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
-  event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
-  event[0].header.ec_send_time = ORBSVCS_Time::zero ();
-
-  event[0].data.x = 0;
-  event[0].data.y = 0;
-
-  // We use replace to minimize the copies, this should result
-  // in just one memory allocation:
-  event[0].data.payload.length (this->payload_size_);
-
-  this->event_type (event_number, event[0]);
-
-  this->send_event (event, ACE_TRY_ENV);
-}
-
-void
-EC_Supplier::send_event (const RtecEventComm::EventSet& event,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->push_count_ == 0)
-    this->throughput_.start ();
-
-  // We start the timer as soon as we receive the first event...
-  this->throughput_.sample ();
-
-  this->push_count_ += event.length ();
-
-  if (TAO_debug_level > 0
-      && this->push_count_ % 100 == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "EC_Consumer (%P|%t): %d events received\n",
-                  this->push_count_));
-    }
-  this->consumer_proxy_->push (event, ACE_TRY_ENV);
-}
-
-void
-EC_Supplier::event_type (int event_number,
-                         RtecEventComm::Event &event)
-{
-  CORBA::ULong l = this->qos_.publications.length ();
-
-  if (l == 0)
-    {
-      event.header.source = 0;
-      event.header.type = this->shutdown_event_type_;
-    }
-  else
-    {
-      int i = event_number % l;
-      int type = this->qos_.publications[i].event.header.type;
-      if (type == this->shutdown_event_type_)
-        i = 0;
-
-      RtecEventComm::EventHeader& header =
-        this->qos_.publications[i].event.header;
-
-      event.header.source = header.source;
-      event.header.type = header.type;
-    }
-}
-
-void
-EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-                      const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  this->consumer_proxy_ =
-    supplier_admin->obtain_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->connect (qos, shutdown_event_type, ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos,
-                      int shutdown_event_type,
-                      CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->consumer_proxy_.in ()))
-    return; // @@ Throw?
-
-  this->qos_ = qos;
-  this->shutdown_event_type_ = shutdown_event_type;
-
-  RtecEventComm::PushSupplier_var objref =
-    this->_this (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumer_proxy_->connect_push_supplier (objref.in (),
-                                                qos,
-                                                ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
-{
-  if (CORBA::is_nil (this->consumer_proxy_.in ()))
-    return;
-
-  this->consumer_proxy_->disconnect_push_consumer (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->consumer_proxy_ =
-    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-
-  // Deactivate the servant
-  PortableServer::POA_var poa =
-    this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-  PortableServer::ObjectId_var id =
-    poa->servant_to_id (this, ACE_TRY_ENV);
-  ACE_CHECK;
-  poa->deactivate_object (id.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-void
-EC_Supplier::disconnect_push_supplier (CORBA::Environment &ACE_TRY_ENV)
-{
-  this->driver_->supplier_disconnect (this->cookie_, ACE_TRY_ENV);
-  this->consumer_proxy_ =
-    RtecEventChannelAdmin::ProxyPushConsumer::_nil ();
-}
-
-void
-EC_Supplier::dump_results (const char* name)
-{
-  this->throughput_.dump_results ("EC_Supplier", name);
-}
-
-void
-EC_Supplier::accumulate (EC_Driver::Throughput_Stats& stats) const
-{
-  stats.accumulate (this->throughput_);
-}
-
-// ****************************************************************
-
-EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier,
-                                    EC_Driver* driver,
-                                    void* cookie,
-                                    int burst_count,
-                                    int burst_size,
-                                    int burst_pause,
-                                    int payload_size,
-                                    int shutdown_event_type,
-                                    ACE_Thread_Manager* thr_mgr)
-  :  ACE_Task_Base (thr_mgr),
-     supplier_ (supplier),
-     driver_ (driver),
-     cookie_ (cookie),
-     burst_count_ (burst_count),
-     burst_size_ (burst_size),
-     burst_pause_ (burst_pause),
-     payload_size_ (payload_size),
-     shutdown_event_type_ (shutdown_event_type)
-{
-}
-
-int
-EC_Supplier_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize a time value to pace the test
-      ACE_Time_Value tv (0, this->burst_pause_);
-
-      RtecEventComm::EventSet event (1);
-      event.length (1);
-
-      event[0].header.ttl = 1;
-
-      ACE_hrtime_t t = ACE_OS::gethrtime ();
-      ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, t);
-      event[0].header.ec_recv_time = ORBSVCS_Time::zero ();
-      event[0].header.ec_send_time = ORBSVCS_Time::zero ();
-
-      event[0].data.x = 0;
-      event[0].data.y = 0;
-
-      // We use replace to minimize the copies, this should result
-      // in just one memory allocation;
-      event[0].data.payload.length (this->payload_size_);
-
-      for (int i = 0; i < this->burst_count_; ++i)
-        {
-          for (int j = 0; j < this->burst_size_; ++j)
-            {
-              this->supplier_->event_type (j, event[0]);
-
-              ACE_hrtime_t now = ACE_OS::gethrtime ();
-              ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
-                                             now);
-              // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n"));
-
-              this->supplier_->send_event (event, ACE_TRY_ENV);
-
-              ACE_TRY_CHECK;
-            }
-
-          ACE_OS::sleep (tv);
-        }
-
-      // Send one event shutdown from each supplier
-      event[0].header.type = this->shutdown_event_type_;
-      ACE_hrtime_t now = ACE_OS::gethrtime ();
-      ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time,
-                                     now);
-      this->supplier_->send_event (event, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sys_ex)
-    {
-      ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX");
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX");
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Supplier task finished\n"));
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h
deleted file mode 100644
index d13d6bd2819..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/Supplier.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//   ORBSVCS Real-time Event Channel testsuite
-//
-// = FILENAME
-//   Supplier
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef EC_SUPPLIER_H
-#define EC_SUPPLIER_H
-
-#include "Driver.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "ace/Task.h"
-
-class EC_Test_Export EC_Supplier : public POA_RtecEventComm::PushSupplier
-{
-  //
-  // = TITLE
-  //   Simple supplier object to implement EC tests.
-  //
-  // = DESCRIPTION
-  //   This class is a supplier of events.
-  //   The class is just a helper to simplify common tasks in EC
-  //   tests, such as subscribing for a range of events, disconnecting
-  //   from the EC, informing the driver of shutdown messages, etc.
-  //
-  //   There are several ways to connect and disconnect this class,
-  //   and it is up to the driver program to use the right one.
-  //
-  //   The driver can request that to this class to send a new event,
-  //   a new shutdown event or to become "active" and send a number of
-  //   events at a certain rate.
-  //
-public:
-  EC_Supplier (EC_Driver *driver,
-               void* supplier_cookie);
-  // Constructor, specifies the types of events to send.
-  // Notice that the user can connect to the EC using other
-  // publications, this is useful for filtering tests.
-
-  void send_event (int event_number,
-                   CORBA::Environment& ACE_TRY_ENV);
-  // The types of the event is chosen by the driver, based on the
-  // cookie and the <event_number>
-
-  void send_event (const RtecEventComm::EventSet& event,
-                   CORBA::Environment& ACE_TRY_ENV);
-  // Send <event> to the EC.
-
-  void send_event (int event_number,
-                   const RtecEventComm::Event& event);
-  // Set the event type and source in <event>
-
-  void send_shutdown (CORBA::Environment& ACE_TRY_ENV);
-  // Send a shutdown event.
-
-  virtual void connect (
-        RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin,
-        const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
-  // Connect using a <supplier_admin> and publications (<qos>)
-  // computed by the user
-
-  virtual void connect (
-        const RtecEventChannelAdmin::SupplierQOS& qos,
-        int shutdown_event_type,
-        CORBA::Environment& ACE_TRY_ENV);
-  // Connect using the current consumer_proxy (useful for reconnect test)
-
-  void disconnect (CORBA::Environment &ACE_TRY_ENV);
-  // Disconnect from the EC, also deactivates the object
-
-  virtual void dump_results (const char* name);
-  // Dump the results...
-
-  void accumulate (EC_Driver::Throughput_Stats& stats) const;
-  // Add our statistics to <stats>
-
-  void event_type (int event_number,
-                   RtecEventComm::Event& event);
-  // Return an event type to push....
-
-  // = The PushSupplier methods
-  virtual void disconnect_push_supplier (CORBA::Environment &);
-
-private:
-  EC_Driver *driver_;
-  // Class we forward to.
-
-  void* cookie_;
-  // Magic cookie provided by the supplier to identify ourselves
-
-  ACE_SYNCH_MUTEX lock_;
-  // Protect the internal state
-
-  int push_count_;
-  // Count the number of push() calls
-
-  RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
-  // We talk to the EC (as a supplier) using this proxy.
-
-  EC_Driver::Throughput_Stats throughput_;
-  // Measure the elapsed time spent while sending the events.
-
-  int burst_count_;
-  int burst_size_;
-  int payload_size_;
-  int burst_pause_;
-
-  int shutdown_event_type_;
-  // The test data.
-
-  RtecEventChannelAdmin::SupplierQOS qos_;
-  // The publications, used to select the events.
-};
-
-// ****************************************************************
-
-class EC_Supplier_Task : public ACE_Task_Base
-{
-  //
-public:
-  EC_Supplier_Task (EC_Supplier* supplier,
-                    EC_Driver* driver,
-                    void* cookie,
-                    int burst_count,
-                    int burst_size,
-                    int burst_pause,
-                    int payload_size,
-                    int shutdown_event_type,
-                    ACE_Thread_Manager* thr_mgr = 0);
-  // Constructor
-
-  virtual int svc (void);
-  // The svc call
-
-private:
-  EC_Supplier* supplier_;
-  // The supplier
-
-  EC_Driver* driver_;
-  // The driver program
-
-  void* cookie_;
-  // The magic cookie assigned to the supplier
-
-  int burst_count_;
-  // Number of events "bursts"
-
-  int burst_size_;
-  // The number of events in a "burst", i.e. between two calls to
-  // sleep.
-
-  int burst_pause_;
-  // The sleep time (in usecs) between each burst
-
-  int payload_size_;
-  // The size of the payload in each event.
-
-  int shutdown_event_type_;
-  // Define the shutdown event, invoked at the end of the loop.
-};
-
-#endif /* EC_SUPPLIER_H */
diff --git a/TAO/orbsvcs/tests/Event/lib/ectest_export.h b/TAO/orbsvcs/tests/Event/lib/ectest_export.h
deleted file mode 100644
index ea17ac4db88..00000000000
--- a/TAO/orbsvcs/tests/Event/lib/ectest_export.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// ${ACE_ROOT}/GenExportH.BAT
-// ------------------------------
-#if !defined (EC_Test_EXPORT_H)
-#define EC_Test_EXPORT_H
-
-#include "ace/OS.h"
-
-#if !defined (EC_Test_HAS_DLL)
-#define EC_Test_HAS_DLL 1
-#endif /* ! EC_Test_HAS_DLL */
-
-#if defined (EC_Test_HAS_DLL)
-#  if (EC_Test_HAS_DLL == 1)
-#    if defined (EC_Test_BUILD_DLL)
-#      define EC_Test_Export ACE_Proper_Export_Flag
-#      define EC_Test_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    else
-#      define EC_Test_Export ACE_Proper_Import_Flag
-#      define EC_Test_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    endif /* EC_Test_BUILD_DLL */
-#  else
-#    define EC_Test_Export
-#    define EC_Test_SINGLETON_DECLARATION(T)
-#  endif   /* ! EC_Test_HAS_DLL == 1 */
-#else
-#  define EC_Test_Export
-#  define EC_Test_SINGLETON_DECLARATION(T)
-#endif     /* EC_Test_HAS_DLL */
-
-#endif     /* EC_Test_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
index a8378f7aa59..5cf5c6138ef 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
+++ b/TAO/orbsvcs/tests/Event_Latency/Event_Latency.cpp
@@ -13,8 +13,6 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Basic_Factory.h"
 #include "Event_Latency.h"
 
 #include "tao/Timeprobe.h"
@@ -109,10 +107,10 @@ Latency_Consumer::open_consumer (RtecEventChannelAdmin::EventChannel_ptr ec,
                    RtecScheduler::VERY_HIGH_CRITICALITY,
                    wcet,
                    wcet,
-                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero,
                    0,
                    RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero,
                    1,
                    RtecScheduler::OPERATION,
                    TAO_TRY_ENV);
@@ -174,11 +172,12 @@ Latency_Consumer::push (const RtecEventComm::EventSet &events,
   // ACE_DEBUG ((LM_DEBUG, "Latency_Consumer:push - "));
   ACE_TIMEPROBE (EVENT_LATENCY_PUSH_EVENT_TO_CONSUMER);
 
-  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
   if (events.length () == 0)
     {
+      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
       return;
     }
+  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
 
 #if defined (ACE_HAS_QUANTIFY)
   // If measuring jitter, just Quantify the supplier-consumer path.
@@ -416,12 +415,12 @@ Latency_Supplier::open_supplier (RtecEventChannelAdmin::EventChannel_ptr ec,
 
       server->set (rt_info_,
                    RtecScheduler::VERY_HIGH_CRITICALITY,
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
-                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero,
+                   ORBSVCS_Time::zero,
+                   ORBSVCS_Time::zero,
                    period,
                    RtecScheduler::VERY_LOW_IMPORTANCE,
-                   ORBSVCS_Time::zero (),
+                   ORBSVCS_Time::zero,
                    1,
                    RtecScheduler::OPERATION,
                    TAO_TRY_ENV);
@@ -543,12 +542,14 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
   // ACE_DEBUG ((LM_DEBUG, "Latency_Supplier::push - "));
   ACE_UNUSED_ARG (TAO_IN_ENV);
 
-  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
   if (events.length () == 0)
     {
+      // ACE_DEBUG ((LM_DEBUG, "no events\n"));
       return;
     }
 
+  // ACE_DEBUG ((LM_DEBUG, "%d event(s)\n", events.length ()));
+
   for (CORBA::ULong i = 0; i < events.length (); ++i)
     {
       if (!master_ && events[i].header.type == ACE_ES_EVENT_SHUTDOWN)
@@ -622,8 +623,8 @@ Latency_Supplier::push (const RtecEventComm::EventSet &events,
         }
       else
         {
-          ACE_ERROR ((LM_ERROR, "(%t) %s received unexpected events: %d\n",
-                      entry_point (), events[i].header.type));
+          ACE_ERROR ((LM_ERROR, "(%t) %s received unexpected events: ",
+                      entry_point ()));
           // ::dump_sequence (events);
           return;
         }
@@ -886,7 +887,6 @@ main (int argc, char *argv [])
       // the cost of doing it later.
       ACE_TIMEPROBE_RESET;
 
-#if 0
       CosNaming::Name channel_name (1);
       channel_name.length (1);
       channel_name[0].id = CORBA::string_dup ("EventService");
@@ -899,17 +899,6 @@ main (int argc, char *argv [])
         RtecEventChannelAdmin::EventChannel::_narrow (ec_obj.in (),
                                                       TAO_TRY_ENV);
       TAO_CHECK_ENV;
-#else
-      TAO_EC_Event_Channel_Attributes attr(root_poa.in (),
-                                           root_poa.in ());
-      TAO_EC_Event_Channel ec_impl  (attr);
-      ec_impl.activate (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      RtecEventChannelAdmin::EventChannel_var ec =
-        ec_impl._this (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-#endif /* 0 */
 
       // Create supplier(s).
       Latency_Supplier **supplier;
diff --git a/TAO/orbsvcs/tests/Event_Latency/Makefile b/TAO/orbsvcs/tests/Event_Latency/Makefile
index 1a340a46a83..b6a4c705a90 100644
--- a/TAO/orbsvcs/tests/Event_Latency/Makefile
+++ b/TAO/orbsvcs/tests/Event_Latency/Makefile
@@ -1,34 +1,32 @@
 # $Id$
 
-EVENT_LATENCY_SRCS = Event_Latency.cpp
-LSRC = $(EVENT_LATENCY_SRCS)
-EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o)
+BIN = Event_Latency
+
+
+EVENT_LATENCY_SRCS= \
+	Event_Latency.cpp
 
-LDLIBS = -lorbsvcs -lTAO
+LSRC= \
+	$(EVENT_LATENCY_SRCS) \
 
-BIN2 = Event_Latency
+EVENT_LATENCY_OBJS = $(EVENT_LATENCY_SRCS:.cpp=.o)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Event,$(findstring Event,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Event
+LDLIBS= -lorbsvcs -lTAO
 
 #----------------------------------------------------------------------------
-#       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.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.local.GNU
 
 #### Local rules and variables...
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -43,7 +41,7 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -54,6 +52,9 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -77,271 +78,10 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(ACE_ROOT)/ace/Profile_Timer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
@@ -354,38 +94,17 @@ Event_Latency: $(addprefix $(VDIR),$(EVENT_LATENCY_OBJS) $(EVENT_LATENCY_CONFIG_
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \
+ Event_Latency.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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)/orbsvcs/orbsvcs/TimeBaseS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Event_Channel.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Event/EC_Basic_Factory.i \
- Event_Latency.h \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_test.pl b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
index 0004b4229f5..1c0506f887c 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_test.pl
+++ b/TAO/orbsvcs/tests/Event_Latency/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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;
 
@@ -12,7 +11,7 @@ $NS_ior = "NameService.ior";
 $sleeptime = 3;
 
 $NS = Process::Create ("../../Naming_Service/Naming_Service".
-                       $Process::EXE_EXT." -o $NS_ior ");
+		       $Process::EXE_EXT." -o $NS_ior ");
 
 sleep $sleeptime;
 
@@ -21,7 +20,7 @@ $ES = Process::Create ("../../Event_Service/Event_Service".$Process::EXE_EXT);
 sleep $sleeptime;
 
 $status = system ($EXEPREFIX."Event_Latency".$Process::EXE_EXT.
-                  " -j -m 100");
+		  " -j -m 100");
 
 $NS->Kill ();
 $ES->Kill ();
diff --git a/TAO/orbsvcs/tests/Event_Latency/run_tests.sh b/TAO/orbsvcs/tests/Event_Latency/run_tests.sh
index 483261ba02f..545a634dd1b 100755
--- a/TAO/orbsvcs/tests/Event_Latency/run_tests.sh
+++ b/TAO/orbsvcs/tests/Event_Latency/run_tests.sh
@@ -36,15 +36,6 @@ done
 
 whoami=`whoami`
 
-#### Get the user name
-if [ "$LOGNAME" ]; then
-  #### LOGNAME is preserved across su
-  login=$LOGNAME
-else
-  #### whoami returns the users login, which changes across su
-  login=$whoami
-fi
-
 run ()
 #### Run the process in the RT class, if root on Solaris.
 {
@@ -66,7 +57,7 @@ trap '../start_services clean' 0 1 2 3 15
 ######## Start NameService, etc.
 ########
 run ../start_services
-NameService=`cat /tmp/nameserviceior_$login`
+NameService=`cat /tmp/nameserviceior_levine`
 export NameService
 
 
diff --git a/TAO/orbsvcs/tests/Event_Latency/svc.conf b/TAO/orbsvcs/tests/Event_Latency/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/Event_Latency/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
index 47c193db6ea..1a08977c5e4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/IR_Helper.cpp
@@ -4,7 +4,6 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "orbsvcs/PingS.h"
-#include "tao/IIOP_Profile.h"
 
 class Ping_i: public POA_Ping_Object
   // = TITLE
@@ -17,17 +16,20 @@ class Ping_i: public POA_Ping_Object
 public:
   Ping_i (int debug = 0) : debug_ (debug) {}
 
-  virtual void ping (CORBA::Environment &)
+  virtual void ping (CORBA::Environment &env = CORBA_Environment::default_environment ())
     {
       if (this->debug_)
         ACE_DEBUG ((LM_DEBUG, "Pong!\n"));
+
+      ACE_UNUSED_ARG (env);
+      // Does nothing, just returns.
     }
 private:
   int debug_;
 };
 
-IR_Helper::IR_Helper (char *server_name,
-                      PortableServer::POA_ptr poa,
+IR_Helper::IR_Helper (char *server_name, 
+                      PortableServer::POA_ptr poa, 
                       CORBA::ORB_ptr orb,
                       int debug)
   : name_ (ACE::strnew (server_name)),
@@ -39,54 +41,46 @@ IR_Helper::IR_Helper (char *server_name,
     orb_ (orb),
     debug_ (debug)
 {
-  const char *exception_message = "Null Message";
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  
+  TAO_TRY
     {
-      exception_message = "While read_ir_ior";
-      this->read_ir_ior (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->read_ir_ior (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Resolve the IR.
-      exception_message = "While string_to_object of ImplRepo";
       CORBA::Object_var implrepo_object =
-        this->orb_->string_to_object (this->ir_key_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;;
+        this->orb_->string_to_object (this->ir_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (implrepo_object.in ()))
         ACE_ERROR ((LM_ERROR,
                     "invalid implrepo key <%s>\n",
                     this->ir_key_));
 
-      exception_message = "While narrowing ImplRepo";
-      this->implrepo_ =
-        Implementation_Repository::_narrow (implrepo_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->implrepo_ = 
+        Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Now register the Ping Object
        PortableServer::ObjectId_var ping_id =
       PortableServer::string_to_ObjectId ("ping");
 
-      exception_message = "While activating ping object";
       this->poa_->activate_object_with_id (ping_id.in (),
                                            this->ping_,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      exception_message = "While creating reference to ping object";
-      this->ping_ptr_ =
+      this->ping_ptr_ = 
         this->poa_->id_to_reference (ping_id.in (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_ERROR ((LM_ERROR, "IR_Helper::IR_Helper - %s\n", exception_message));
-      ACE_TRY_ENV.print_exception ("SYS_EX");
+      TAO_TRY_ENV.print_exception ("IR_Helper::IR_Helper");
       return;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 IR_Helper::~IR_Helper ()
@@ -98,20 +92,20 @@ IR_Helper::~IR_Helper ()
 }
 
 int
-IR_Helper::register_server (const char *comm_line,
-                            const char *environment,
-                            const char *working_dir,
-                            CORBA_Environment &ACE_TRY_ENV)
+IR_Helper::register_server (const char *comm_line, 
+                            const char *environment, 
+                            const char *working_dir, 
+                            CORBA_Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY 
     {
       CORBA::Object_var implrepo_object =
-        this->orb_->string_to_object (this->ir_key_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->ir_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      Implementation_Repository *ImplRepo =
-        Implementation_Repository::_narrow (implrepo_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      Implementation_Repository *ImplRepo = 
+        Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (implrepo_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -125,22 +119,22 @@ IR_Helper::register_server (const char *comm_line,
       proc_opts.environment_ = CORBA::string_dup (environment);
       proc_opts.working_directory_ = CORBA::string_dup (working_dir);
 
-      ImplRepo->reregister_server (this->name_, proc_opts, ACE_TRY_ENV);
+      ImplRepo->reregister_server (this->name_, proc_opts, TAO_TRY_ENV);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("IR_Helper::register_server");
+      TAO_TRY_ENV.print_exception ("IR_Helper::register_server");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 int
-IR_Helper::read_ir_ior (CORBA_Environment &ACE_TRY_ENV)
+IR_Helper::read_ir_ior (CORBA_Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
+  ACE_UNUSED_ARG (TAO_IN_ENV);
+  
   // Open the file for reading.
   // @@ Hard-coded name is bad.  Need to fix.
   ACE_HANDLE f_handle_ = ACE_OS::open ("implrepo.ior", 0);
@@ -164,7 +158,7 @@ IR_Helper::read_ir_ior (CORBA_Environment &ACE_TRY_ENV)
 
 
 void
-IR_Helper::notify_startup (CORBA_Environment &ACE_TRY_ENV)
+IR_Helper::notify_startup (CORBA_Environment &TAO_IN_ENV)
 {
   // Get our host and port and convert it to something we can use.
   ACE_INET_Addr my_addr = TAO_ORB_Core_instance ()->orb_params ()->addr ();
@@ -172,56 +166,56 @@ IR_Helper::notify_startup (CORBA_Environment &ACE_TRY_ENV)
   my_ir_addr.port_ = my_addr.get_port_number ();
   my_ir_addr.host_ = CORBA::string_dup (my_addr.get_host_name ());
 
-  ACE_TRY
+  TAO_TRY 
     {
       delete this->ir_addr_;
-      this->ir_addr_ = this->implrepo_->server_is_running (this->name_,
+      this->ir_addr_ = this->implrepo_->server_is_running (this->name_, 
                                                            my_ir_addr,
                                                            this->ping_ptr_,
-                                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 
 // Notify the IR that the server has been shut down.
-void
-IR_Helper::notify_shutdown (CORBA_Environment &ACE_TRY_ENV)
+void 
+IR_Helper::notify_shutdown (CORBA_Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
-      this->implrepo_->server_is_shutting_down (this->name_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->implrepo_->server_is_shutting_down (this->name_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 }
 
 void
-IR_Helper::change_object (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV)
+IR_Helper::change_object (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV)
 {
-  if ( obj
-    && obj->_stubobj ()
+  if ( obj 
+    && obj->_stubobj () 
     && obj->_stubobj ()->profile_in_use ()
-    && this->implrepo_
-    && this->implrepo_->_stubobj ()
+    && this->implrepo_ 
+    && this->implrepo_->_stubobj () 
     && this->implrepo_->_stubobj ()->profile_in_use ()  )
     {
       TAO_IIOP_Profile *implrepo_pfile =
-          ACE_dynamic_cast (TAO_IIOP_Profile *,
+          ACE_dynamic_cast (TAO_IIOP_Profile *, 
                             this->implrepo_->_stubobj ()->profile_in_use ());
       TAO_IIOP_Profile *iiop_pfile =
-          ACE_dynamic_cast (TAO_IIOP_Profile *,
+          ACE_dynamic_cast (TAO_IIOP_Profile *, 
                             obj->_stubobj ()->profile_in_use ());
-
+    
       // @@ Only same host for now
       iiop_pfile->port (implrepo_pfile->port ());
     }
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
index c60198ae4fd..ae08856c366 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.dsw
@@ -27,42 +27,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "ImplRepo_Service"=..\..\ImplRepo_Service\implrepo.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Nestea Client"=.\nestea_client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Nestea Server"=.\nestea_server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Repository_Test"=.\Repository_Test.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile b/TAO/orbsvcs/tests/ImplRepo/Makefile
index c08aa8fdea8..240dd1fd861 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile
@@ -5,133 +5,137 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lorbsvcs -lTAO
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \
-            -I$(TAO_ROOT)
+# Make sure the directory we depend on is up-to-date.
+DIRS = ../../ImplRepo_Service
 
-IDL_SRC = AirplaneS.cpp AirplaneC.cpp NesteaS.cpp NesteaC.cpp
-PROG_SRCS = \
-            Repository_Test.cpp \
-            airplane_client.cpp \
-            airplane_server.cpp \
-            airplane_client_i.cpp \
-            airplane_server_i.cpp \
-            airplane_i.cpp \
-            nestea_client.cpp \
-            nestea_server.cpp \
-            nestea_client_i.cpp \
-            nestea_server_i.cpp \
-            nestea_i.cpp \
-            IR_Helper.cpp
+LDLIBS = -lTAO
 
-SRC=$(IDL_SRC) $(PROG_SRCS)
+IDL_SRC	= AirplaneS.cpp AirplaneC.cpp
+PROG_SRCS = Repository.cpp \
+	    Repository_Test.cpp \
+	    airplane_client.cpp \
+	    airplane_server.cpp \
+	    airplane_client_i.cpp \
+	    airplane_server_i.cpp \
+	    airplane_i.cpp \
+            IR_Helper.cpp \
+	    client.cpp \
+	    client_impl.cpp \
+	    server.cpp \
+	    server_impl.cpp \
+	    simple_object_impl.cpp
+
+LSRC = $(IDL_SRC) $(PROG_SRCS)
+
+IMPLREPO_SERVICE_FILES = PingC.cpp \
+			 PingS.cpp \
+			 ImplRepoC.cpp \
+			 ImplRepoS.cpp
+
+IMPLREPO_SERVICE_OBJS = $(addprefix ../../ImplRepo_Service/$(VDIR), $(patsubst %.cpp,%.o,$(IMPLREPO_SERVICE_FILES)))
+
+#IMPLREPO_SERVICE_OBJS = ../../ImplRepo_Service/$(VDIR)/PingC.o \
+#                        ../../ImplRepo_Service/$(VDIR)/PingS.o \
+#                        ../../ImplRepo_Service/$(VDIR)/ImplRepoC.o \
+#                        ../../ImplRepo_Service/$(VDIR)/ImplRepoS.o
+
+
+
+IMPLREPO_CLIENT_OBJS =  Simple_ObjectC.o \
+			Simple_ObjectS.o \
+			client.o \
+			client_impl.o
+
+IMPLREPO_SERVER_OBJS =  Simple_ObjectC.o \
+			Simple_ObjectS.o \
+			server.o \
+			server_impl.o \
+			simple_object_impl.o
 
 AIRPLANE_CLIENT_OBJS =  AirplaneC.o \
-                        AirplaneS.o \
-                        airplane_client.o \
-                        airplane_client_i.o
+		        AirplaneS.o \
+		        airplane_client.o \
+		        airplane_client_i.o
 
 AIRPLANE_SERVER_OBJS =  AirplaneC.o \
-                        AirplaneS.o \
-                        airplane_server.o \
-                        airplane_server_i.o \
-                        airplane_i.o \
+		        AirplaneS.o \
+		        airplane_server.o \
+		        airplane_server_i.o \
+		        airplane_i.o \
                         IR_Helper.o
 
-NESTEA_CLIENT_OBJS =  NesteaC.o \
-                      NesteaS.o \
-                      nestea_client.o \
-                      nestea_client_i.o
-
-NESTEA_SERVER_OBJS =  NesteaC.o \
-                      NesteaS.o \
-                      nestea_server.o \
-                      nestea_server_i.o \
-                      nestea_i.o \
-                      IR_Helper.o
+REPOSITORY_TEST_OBJS =	../../../ImplRepo_Service/$(VDIR)/Repository.o \
+			Repository_Test.o
 
-REPOSITORY_TEST_OBJS =  Repository_Test.o \
-                        Repository.o \
-                        Options.o
+BIN = airplane_server \
+      airplane_client \
+      Repository_Test
 
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = airplane_server \
-       airplane_client \
-       nestea_server \
-       nestea_client \
-       Repository_Test
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (ImplRepo,$(findstring ImplRepo,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # ImplRepo
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	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.nested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
-IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
+LDFLAGS += -L$(TAO_ROOT)/tao
 
-.PRECIOUS: $(foreach ext, $(IDL_EXT), Airplane$(ext))
+.PRECIOUS: Simple_ObjectC.cpp Simple_ObjectS.cpp Simple_ObjectC.h Simple_ObjectS.h
+.SECONDARY: $(IMPLREPO_SERVICE_OBJS)
+#$(IDL_SRC): cubit.idl
+#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
 
-airplane_server: $(addprefix $(VDIR),$(AIRPLANE_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+server:	$(addprefix $(VDIR),$(IMPLREPO_SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(IMPLREPO_SERVICE_OBJS) $(POSTLINK)
 
-airplane_client: $(addprefix $(VDIR),$(AIRPLANE_CLIENT_OBJS))
+client:	$(addprefix $(VDIR),$(IMPLREPO_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-nestea_server: $(addprefix $(VDIR),$(NESTEA_SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
+airplane_server:	$(addprefix $(VDIR),$(AIRPLANE_SERVER_OBJS))
+	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(IMPLREPO_SERVICE_OBJS) $(POSTLINK)
 
-nestea_client: $(addprefix $(VDIR),$(NESTEA_CLIENT_OBJS))
+airplane_client:	$(addprefix $(VDIR),$(AIRPLANE_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 Repository_Test: $(addprefix $(VDIR),$(REPOSITORY_TEST_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) $(foreach ext, $(IDL_EXT), Airplane$(ext)) \
-               $(foreach ext, $(IDL_EXT), Nestea$(ext))
-
-$(VDIR)Repository.$(OBJEXT): ../../ImplRepo_Service/Repository.cpp
-	$(COMPILE.cc) -o $@ $<
-	${MVCMD}
-
-$(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
-	$(COMPILE.cc) -o $@ $<
-	${MVCMD}
-
+	-/bin/rm -rf Simple_ObjectC* Simple_ObjectS*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/AirplaneS.o .obj/AirplaneS.so .shobj/AirplaneS.o .shobj/AirplaneS.so: AirplaneS.cpp AirplaneS.h AirplaneC.h \
+.obj/Simple_ObjectC.o .obj/Simple_ObjectC.so .shobj/Simple_ObjectC.o .shobj/Simple_ObjectC.so: Simple_ObjectC.cpp Simple_ObjectC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -143,80 +147,68 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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 \
@@ -228,88 +220,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -322,14 +239,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -345,350 +270,113 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i
-.obj/AirplaneC.o .obj/AirplaneC.so .shobj/AirplaneC.o .shobj/AirplaneC.so: AirplaneC.cpp AirplaneC.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/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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.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/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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- AirplaneC.i AirplaneS.h AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp \
- AirplaneS.i
-.obj/NesteaS.o .obj/NesteaS.so .shobj/NesteaS.o .shobj/NesteaS.so: NesteaS.cpp NesteaS.h NesteaC.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ Simple_ObjectS.h Simple_ObjectS_T.h Simple_ObjectS_T.i \
+ Simple_ObjectS_T.cpp Simple_ObjectS.i
+.obj/Simple_ObjectS.o .obj/Simple_ObjectS.so .shobj/Simple_ObjectS.o .shobj/Simple_ObjectS.so: Simple_ObjectS.cpp Simple_ObjectS.h Simple_ObjectC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -700,80 +388,68 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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 \
@@ -785,88 +461,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -879,14 +480,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -902,350 +511,113 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i
-.obj/NesteaC.o .obj/NesteaC.so .shobj/NesteaC.o .shobj/NesteaC.so: NesteaC.cpp NesteaC.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/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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.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/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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- NesteaC.i NesteaS.h NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i
-.obj/Repository_Test.o .obj/Repository_Test.so .shobj/Repository_Test.o .shobj/Repository_Test.so: Repository_Test.cpp \
- ../../ImplRepo_Service/Repository.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \
+ Simple_ObjectS.i
+.obj/Repository.o .obj/Repository.so .shobj/Repository.o .shobj/Repository.so: Repository.cpp Repository.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1253,18 +625,20 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.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/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 \
@@ -1279,39 +653,43 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(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.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(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/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1322,11 +700,21 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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
-.obj/airplane_client.o .obj/airplane_client.so .shobj/airplane_client.o .shobj/airplane_client.so: airplane_client.cpp airplane_client_i.h AirplaneC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h
+.obj/Repository_Test.o .obj/Repository_Test.so .shobj/Repository_Test.o .shobj/Repository_Test.so: Repository_Test.cpp \
+ ../../ImplRepo_Service/Repository.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1334,15 +722,18 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1366,11 +757,6 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
@@ -1380,38 +766,27 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -1423,192 +798,19 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- AirplaneC.i
-.obj/airplane_server.o .obj/airplane_server.so .shobj/airplane_server.o .shobj/airplane_server.so: airplane_server.cpp airplane_server_i.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/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client_impl.h Simple_ObjectC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1616,99 +818,72 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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/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 \
@@ -1720,71 +895,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/ORB.i \
- airplane_i.h AirplaneS.h AirplaneC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -1797,14 +914,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1820,364 +945,111 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
- IR_Helper.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
-.obj/airplane_client_i.o .obj/airplane_client_i.so .shobj/airplane_client_i.o .shobj/airplane_client_i.so: airplane_client_i.cpp airplane_client_i.h \
- AirplaneC.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/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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.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/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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- AirplaneC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i
-.obj/airplane_server_i.o .obj/airplane_server_i.so .shobj/airplane_server_i.o .shobj/airplane_server_i.so: airplane_server_i.cpp airplane_server_i.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 \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i
+.obj/client_impl.o .obj/client_impl.so .shobj/client_impl.o .shobj/client_impl.so: client_impl.cpp client_impl.h Simple_ObjectC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2185,99 +1057,72 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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/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 \
@@ -2289,71 +1134,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/ORB.i \
- airplane_i.h AirplaneS.h AirplaneC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -2366,14 +1153,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2389,359 +1184,114 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i \
- IR_Helper.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i
-.obj/airplane_i.o .obj/airplane_i.so .shobj/airplane_i.o .shobj/airplane_i.so: airplane_i.cpp airplane_i.h AirplaneS.h AirplaneC.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/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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.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/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/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- AirplaneC.i AirplaneS_T.h AirplaneS_T.i AirplaneS_T.cpp AirplaneS.i
-.obj/nestea_client.o .obj/nestea_client.so .shobj/nestea_client.o .shobj/nestea_client.so: nestea_client.cpp nestea_client_i.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server_impl.h simple_object_impl.h \
+ Simple_ObjectS.h Simple_ObjectC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2753,80 +1303,68 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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 \
@@ -2838,88 +1376,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -2932,14 +1395,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2955,191 +1426,31 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- NesteaC.h NesteaC.i
-.obj/nestea_server.o .obj/nestea_server.so .shobj/nestea_server.o .shobj/nestea_server.so: nestea_server.cpp nestea_server_i.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
- nestea_i.h NesteaS.h NesteaC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -3147,164 +1458,86 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i
-.obj/nestea_client_i.o .obj/nestea_client_i.so .shobj/nestea_client_i.o .shobj/nestea_client_i.so: nestea_client_i.cpp nestea_client_i.h \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \
+ Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \
+ ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \
+ ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \
+ ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i \
+ $(TAO_ROOT)/tao/TAO.h
+.obj/server_impl.o .obj/server_impl.so .shobj/server_impl.o .shobj/server_impl.so: server_impl.cpp server_impl.h simple_object_impl.h \
+ Simple_ObjectS.h Simple_ObjectC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3316,80 +1549,68 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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 \
@@ -3401,88 +1622,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -3495,14 +1641,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -3518,195 +1672,31 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- NesteaC.h NesteaC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i
-.obj/nestea_server_i.o .obj/nestea_server_i.so .shobj/nestea_server_i.o .shobj/nestea_server_i.so: nestea_server_i.cpp nestea_server_i.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
- nestea_i.h NesteaS.h NesteaC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -3714,168 +1704,89 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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 \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i IR_Helper.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \
+ Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \
+ ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \
+ ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \
+ ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i \
+ $(TAO_ROOT)/tao/TAO.h \
+ ../../ImplRepo_Service/ImplRepoC.h ../../ImplRepo_Service/ImplRepoC.i \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i
-.obj/nestea_i.o .obj/nestea_i.so .shobj/nestea_i.o .shobj/nestea_i.so: nestea_i.cpp nestea_i.h NesteaS.h NesteaC.h \
+.obj/simple_object_impl.o .obj/simple_object_impl.so .shobj/simple_object_impl.o .shobj/simple_object_impl.so: simple_object_impl.cpp simple_object_impl.h \
+ Simple_ObjectS.h Simple_ObjectC.h \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3887,80 +1798,68 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/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_Base.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/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 \
@@ -3972,88 +1871,13 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
@@ -4066,14 +1890,22 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -4089,201 +1921,31 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- NesteaC.i NesteaS_T.h NesteaS_T.i NesteaS_T.cpp NesteaS.i \
- $(ACE_ROOT)/ace/FILE_Connector.h \
- $(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/FILE_Addr.i \
- $(ACE_ROOT)/ace/FILE.i \
- $(ACE_ROOT)/ace/FILE_IO.i \
- $(ACE_ROOT)/ace/FILE_Connector.i
-.obj/IR_Helper.o .obj/IR_Helper.so .shobj/IR_Helper.o .shobj/IR_Helper.so: IR_Helper.cpp IR_Helper.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/ORB.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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
@@ -4291,168 +1953,74 @@ $(VDIR)Options.$(OBJEXT): ../../ImplRepo_Service/Options.cpp
  $(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/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
  $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/ImplRepoC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/PingS.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/IIOP_Profile.i
+ $(TAO_ROOT)/tao/DynAny_i.h Simple_ObjectC.i \
+ Simple_ObjectS_T.h Simple_ObjectS_T.i Simple_ObjectS_T.cpp \
+ Simple_ObjectS.i ../../ImplRepo_Service/PingS.h \
+ ../../ImplRepo_Service/PingC.h ../../ImplRepo_Service/PingC.i \
+ ../../ImplRepo_Service/PingS_T.h ../../ImplRepo_Service/PingS_T.i \
+ ../../ImplRepo_Service/PingS_T.cpp ../../ImplRepo_Service/PingS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl b/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
deleted file mode 100644
index 150c1bd52f3..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/Nestea.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-// Just implements a nice little Nestea server
-interface Nestea_Bookshelf
-{
-  void drink (in long cans);
-  // Add a number of cans to the bookshelf.
-
-  void crush (in long cans);
-  // Crush some of those cans. 
-
-  long bookshelf_size ();
-  // How many cans are in the collection?
-
-  string get_praise ();
-  // What does the server think of your collection?
-};
diff --git a/TAO/orbsvcs/tests/ImplRepo/README b/TAO/orbsvcs/tests/ImplRepo/README
index 30ab7f2e5ff..d1b16ebf92e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/README
+++ b/TAO/orbsvcs/tests/ImplRepo/README
@@ -1,8 +1,7 @@
 $Id$
 
-Here are a few tests for the ImplRepo.  The best way to test is to
-use the run_test.pl passing it either airplane or airplane_ir to
-test out the airplane server.
+In short, stay away for now.  This is all work in progress and really
+rough around the edges.  
 
 More information about the Implementation Repository can be found in 
 TAO/docs.
diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository.cpp b/TAO/orbsvcs/tests/ImplRepo/Repository.cpp
new file mode 100644
index 00000000000..0c243356b0c
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository.cpp
@@ -0,0 +1,208 @@
+// $Id$
+#include "Repository.h"
+
+// Default Constructor
+Repository::Repository ()
+{
+  this->repository_.open (ACE_Naming_Context::PROC_LOCAL);
+}
+
+// Add a new server to the Repository
+int 
+Repository::add (const char *key, const char *comm_line, const char *env, const char *wdir)
+{
+  char *temp; // Temporary string to hold all the variables in.
+
+  // Needs to be as long as all the lengths plus the 2 separators and the 
+  // null character.
+  ACE_NEW_RETURN (temp, char [ACE_OS::strlen (comm_line) + ACE_OS::strlen (env) 
+                              + ACE_OS::strlen (wdir) + 10], -1);
+  
+  ACE_OS::sprintf (temp, "%s\n%s\n%s", comm_line, env, wdir);
+  
+  // Store the record in the repository.
+  int retval = this->repository_.bind (key, temp);
+  
+  // Clean up and exit.
+  delete [] temp;
+  
+  return retval;
+}
+  
+// Removes the server from the Repository
+int 
+Repository::remove (const char *key)
+{
+  return this->repository_.unbind (key);
+}
+
+
+// Find the key record in the Repository
+int 
+Repository::resolve (const char *key, char *&comm_line, char *&env, char *&wdir)
+{
+  char *value, *type; // Temp variables needed for resolve
+  char *last, *temp ; // For fields
+  int retval = this->repository_.resolve (key, value, type);
+  
+  // If successful, return what we need.
+  while (retval == 0)
+  {
+    temp = value;
+    last = ACE_OS::strstr (temp, "\n");
+    if (last != 0 && *last == '\n')
+    {
+      *last = '\0';
+      ACE_NEW_RETURN (comm_line, char [strlen (temp) + 1], -1);
+    
+      // Copy to the comm_line argument
+      strcpy (comm_line, temp);
+    }
+    else
+    {
+      retval = -1;
+      break;
+    }
+
+    temp = last + 1;
+    last = ACE_OS::strstr (temp, "\n");
+    if (last != 0 && *last == '\n')
+    {
+      *last = '\0';
+      ACE_NEW_RETURN (env, char [strlen (temp) + 1], -1);
+    
+      // Copy to the env argument
+      strcpy (env, temp);
+    }
+    else
+    {
+      retval = -1;
+      break;
+    }
+
+    temp = last + 1;
+    if (last != 0)
+    {
+      ACE_NEW_RETURN (wdir, char [strlen (temp) + 1], -1);
+    
+      // Copy to the env argument
+      strcpy (wdir, temp);
+    }
+    else 
+    {
+      retval = -1;
+      break;
+    }
+
+    // Now exit out.
+    break;
+  }
+
+  delete [] value;
+  delete [] type;
+  return retval;
+}
+// = Accessor methods
+
+int 
+Repository::get_comm_line (const char *key, char *&comm_line)
+{
+  char *value, *type;  // Temp variables needed for resolve
+  char *last, *temp; // For fields
+  int retval = this->repository_.resolve (key, value, type);
+  
+  // If successful, return what we need.
+  if (retval == 0)
+  {
+    temp = value;
+    // Null terminate the first field
+    last = ACE_OS::strstr (value, "\n");
+    if (last != 0 && *last == '\n')
+    {
+      *last = '\0';
+      ACE_NEW_RETURN (comm_line, char [strlen (temp) + 1], -1);
+    
+      // Copy to the comm_line argument
+      strcpy (comm_line, temp);
+
+      delete [] value;
+      delete [] type;
+      return 0;
+    }
+    else
+    {
+      delete [] value;
+      delete [] type;
+      return -1;
+    }
+  }
+  
+  return retval;
+}
+
+
+int 
+Repository::get_env (const char *key, char *&env)
+{
+  char *value, *type;  // Temp variables needed for resolve
+  char *last, *temp; // For field position
+  int retval = this->repository_.resolve (key, value, type);
+  
+  // If successful, return what we need.
+  if (retval == 0)
+  {
+    last = ACE_OS::strstr (value, "\n");
+    temp = last + 1;
+    last = ACE_OS::strstr (temp, "\n");
+    
+    if (last != 0 && *last == '\n')
+    {
+      *last = '\0';
+      ACE_NEW_RETURN (env, char [strlen (temp) + 1], -1);
+    
+      // Copy to the env argument
+      strcpy (env, temp);
+      delete [] value;
+      delete [] type;
+      return 0;
+    }
+    else
+    {
+      delete [] value;
+      delete [] type;
+      return -1;
+    }
+  }
+  
+  return retval;
+}
+
+int 
+Repository::get_wdir (const char *key, char *&wdir)
+{
+  char *value, *type;  // Temp variables needed for resolve
+  char *last, *temp ; // For fields
+  int retval = this->repository_.resolve (key, value, type);
+  
+  // If successful, return what we need.
+  if (retval == 0)
+  {
+    last = ACE_OS::strstr (value, "\n");
+    last = ACE_OS::strstr (last + 1, "\n");
+    temp = last + 1;
+
+    ACE_NEW_RETURN (wdir, char [strlen (temp) + 1], -1);
+    
+    // Copy to the wdir argument
+    strcpy (wdir, temp);
+    delete [] value;
+    delete [] type;
+  }
+  return retval;
+}
+
+void
+Repository::dump (void)
+{
+  this->repository_.dump ();
+}
diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository.h b/TAO/orbsvcs/tests/ImplRepo/Repository.h
new file mode 100644
index 00000000000..aa8467e2d2c
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository.h
@@ -0,0 +1,35 @@
+// $Id$
+#if !defined (REPOSITORY_H)
+#define REPOSITORY_H
+
+#include "ace/Naming_Context.h"
+
+class Repository
+{
+public:
+  Repository ();
+  // Default Constructor
+
+  int add (const char *key, const char *comm_line, const char *env, const char *wdir);
+  // Add a new server to the Repository
+  
+  int remove (const char *key);
+  // Removes the server from the Repository
+
+  int resolve (const char *key, char *&comm_line, char *&env, char *&wdir);
+  // Find the key record in the Repository
+
+  // = Accessor methods
+  int get_comm_line (const char *key, char *&comm_line);
+  int get_env (const char *key, char *&env);
+  int get_wdir (const char *key, char *&wdir);
+
+  // Dump method
+  void dump (void);
+
+private:
+  ACE_Naming_Context repository_;
+};
+
+
+#endif /* REPOSITORY_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp
index ecf7ec436e8..31f3b2fa3ed 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.cpp
@@ -3,14 +3,13 @@
 
 #include "../../ImplRepo_Service/Repository.h"
 
-ASYS_TCHAR *NAME_VALUE = ASYS_TEXT ("server");
-ASYS_TCHAR *NAME_VALUE2 = ASYS_TEXT ("server");
-ASYS_TCHAR *COMM_LINE_VALUE = ASYS_TEXT ("server -i");
-ASYS_TCHAR *ENV_VALUE = ASYS_TEXT ("null environment");
-ASYS_TCHAR *HOST_VALUE = ASYS_TEXT ("maxixe.cs.wustl.edu");
+const char *NAME_VALUE = "server";
+const char *COMM_LINE_VALUE = "server -i";
+const char *ENV_VALUE = "null environment";
+const char *HOST_VALUE = "maxixe.cs.wustl.edu";
 const int PORT_VALUE = 20000;
-ASYS_TCHAR *PING_IOR_VALUE = ASYS_TEXT ("iiop://maxixe/ping");
-ASYS_TCHAR *WDIR_VALUE = ASYS_TEXT (".");
+const char *PING_IOR_VALUE = "iiop://maxixe/ping";
+const char *WDIR_VALUE = ".";
 
 // Just tests the functionality of the Repository
 
@@ -18,7 +17,7 @@ int main (int argc, char *argv[])
 {
   int test_success = 1;
   Repository rep;
-  Repository_Record new_rec, rec;
+  Repository::Record new_rec, rec;
 
   new_rec.comm_line = ACE::strnew (COMM_LINE_VALUE);
   new_rec.env = ACE::strnew (ENV_VALUE);
@@ -100,7 +99,7 @@ int main (int argc, char *argv[])
 
   // Try some of the single accessors
 
-  ASYS_TCHAR *cl, *env, *ping_ior;
+  char *cl, *env, *ping_ior;
 
   ACE_DEBUG ((LM_DEBUG, "=Performing Single Accessor Test\n"));
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp
index c0db7558226..17c1df0a9cb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/Repository_Test.dsp
@@ -89,10 +89,6 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=..\..\ImplRepo_Service\Options.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\ImplRepo_Service\Repository.cpp

 # End Source File

 # Begin Source File

@@ -105,10 +101,6 @@ SOURCE=.\Repository_Test.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=..\..\ImplRepo_Service\Options.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\ImplRepo_Service\Repository.h

 # End Source File

 # End Group

diff --git a/TAO/orbsvcs/tests/ImplRepo/Simple_Object.idl b/TAO/orbsvcs/tests/ImplRepo/Simple_Object.idl
new file mode 100644
index 00000000000..34fffdef395
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/Simple_Object.idl
@@ -0,0 +1,16 @@
+// $Id$
+
+interface simple_object
+  // = TITLE
+  //    Defines an interface that encapsulates operations that cube
+  //    numbers.
+  //
+  // = DESCRIPTION
+  //    This interface encapsulates an operation that cubes a long.
+{
+  long simple_method (in long l);
+  // cube a long
+
+  void shutdown ();
+  // shutdown the application.
+};
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 70f5f4e7f6f..21e63c52b10 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -44,8 +44,9 @@ Airplane_Client_i::read_ior (char *filename)
 int
 Airplane_Client_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:k:");
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:");
   int c;
+  int result;
 
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -56,16 +57,21 @@ Airplane_Client_i::parse_args (void)
       case 'n':  // loop count
         this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
         break;
-      case 'k':  // ior provide on command line
-        this->server_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;  
+      case 'f': // read the IOR from the file.
+        result = this->read_ior (get_opts.optarg);
+        if (result < 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to read ior from %s : %p\n",
+                             get_opts.optarg),
+                            -1);
+            break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-d]"
                            " [-n loopcount]"
-                           " [-k server-obj-key]"
+                           " [-f server-obj-ref-key-file]"
                            "\n",
                            this->argv_ [0]),
                           -1);
@@ -82,23 +88,19 @@ Airplane_Client_i::get_planes (size_t count)
 {
   for (size_t i = 0; i < count; i++)
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
+      TAO_TRY 
         {
-          ACE_TRY_ENV.clear ();
-          CORBA::String_var response =
-            this->server_->get_plane (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          ACE_OS::sleep (1);
+          char *response = this->server_->get_plane (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-          ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response.in ()));
+          ACE_DEBUG ((LM_DEBUG, "Plane %d is %s\n", i, response));
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_ERROR ((LM_ERROR, "Plane %d exception:\n", i));
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "get_planes");
+          TAO_TRY_ENV.print_exception ("get_planes");
+          return;
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
     }
 }
 
@@ -130,15 +132,14 @@ Airplane_Client_i::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -151,11 +152,11 @@ Airplane_Client_i::init (int argc, char **argv)
                           -1);
 
       CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->orb_->string_to_object (this->server_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      this->server_ = Paper_Airplane_Server::_narrow (server_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->server_ = Paper_Airplane_Server::_narrow (server_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -163,12 +164,12 @@ Airplane_Client_i::init (int argc, char **argv)
                            this->server_key_),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Client_i::init");
+      TAO_TRY_ENV.print_exception ("Airplane_Client_i::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index e41db375bb6..dbf2c5a2f9b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "time.h"
 #include "airplane_i.h"
 #include "tao/corba.h"
 
@@ -28,9 +29,9 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (CORBA::Environment &ACE_TRY_ENV)
+Airplane_i::get_plane (CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (TAO_IN_ENV);
 
   if (TAO_debug_level)
     ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n"));
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 70a08709f33..05398af6b86 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -49,7 +49,7 @@ public:
   ~Airplane_i (void);
   // Destructor
 
-  virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV);
+  virtual char *get_plane (CORBA::Environment &_env);
   // Returns a random plane.
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 164daf342b9..290770b24f2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -10,28 +10,28 @@ main (int argc, char *argv[])
   Airplane_Server_i server;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
-  
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
-      if (server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
         return -1;
       else
         {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 36a01002ef3..3a6ec2909d1 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -59,18 +59,18 @@ Airplane_Server_i::parse_args (void)
 }
 
 int
-Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
+Airplane_Server_i::init (int argc, char** argv, CORBA::Environment& TAO_IN_ENV)
 {
   char poa_name[] = "plane";
 
-  ACE_TRY 
+  TAO_TRY 
     {
       // 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, argv, poa_name, ACE_TRY_ENV) == -1)
+      if (this->orb_manager_.init_child_poa (argc, argv, poa_name, TAO_TRY_ENV) == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     
       this->argc_ = argc;
       this->argv_ = argv;
@@ -85,8 +85,8 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
       CORBA::String_var server_str  =
         this->orb_manager_.activate_under_child_poa ("server",
                                                      this->server_impl_,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->use_ir_ == 1)
         {
@@ -105,19 +105,19 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
 
       CORBA::Object_var server_obj =
         this->orb_manager_.child_poa ()->id_to_reference (id.in (),
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->use_ir_ == 1)
         {
-          this->ir_helper_->change_object (server_obj.inout (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ir_helper_->change_object (server_obj, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
        
       server_str =
         this->orb_manager_.orb ()->object_to_string (server_obj.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ()));
@@ -128,46 +128,42 @@ Airplane_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
           ACE_OS::fclose (this->ior_output_file_);
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_i::init");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("Airplane_i::init");
+      TAO_RETHROW_RETURN (-1);
     }
-  ACE_ENDTRY;
-  
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
 
 int
-Airplane_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
+Airplane_Server_i::run (CORBA::Environment& env)
 {
-  ACE_TRY
+  TAO_TRY
     {
       if (this->use_ir_ == 1)
         {
-          this->ir_helper_->notify_startup (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ir_helper_->notify_startup (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
 
-      this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->orb_manager_.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (this->use_ir_ == 1)
         {
-          this->ir_helper_->notify_shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->ir_helper_->notify_shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Airplane_Server_i::run");
-      ACE_RETHROW;
+      TAO_TRY_ENV.print_exception ("Airplane_Server_i::run");
+      return -1;
     }
-  ACE_ENDTRY;
-  
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
index 28e36c7a7a4..351ea8133a2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h
@@ -42,10 +42,10 @@ public:
   ~Airplane_Server_i (void);
   // Destructor
 
-  int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV);
+  int init (int argc, char **argv, CORBA::Environment& env);
   // Initialize the Server state - parsing arguments and waiting
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (CORBA::Environment& env);
   // Run the orb 
 
 private:
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/client.cpp
index 03e00c6bdd6..b0bb4f77765 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/client.cpp
@@ -1,17 +1,18 @@
 // $Id$
 
-#include "nestea_client_i.h"
+#include "client_impl.h"
 
-ACE_RCSID(ImplRepo, nestea_client, "$Id$")
+ACE_RCSID(ImplRepo, client, "$Id$")
 
 // This function runs the test.
 
 int
 main (int argc, char **argv)
 {
-  Nestea_Client_i client;
+  Client_i client;
 
-  ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Client\n\n"));
+  ACE_DEBUG ((LM_DEBUG,
+              "\n\tSimple_Client\n\n"));
 
   if (client.init (argc, argv) == -1)
     return 1;
diff --git a/TAO/examples/Simple/bank/client.dsp b/TAO/orbsvcs/tests/ImplRepo/client.dsp
index 60af1d9ed5d..0b09c6ff220 100644
--- a/TAO/examples/Simple/bank/client.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Simple Bank Client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ImplRepoTest Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Simple Bank Client - Win32 Debug

+CFG=ImplRepoTest Client - Win32 Release

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=Simple Bank Client - Win32 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 "client.mak" CFG="Simple Bank Client - Win32 Debug"

+!MESSAGE NMAKE /f "client.mak" CFG="ImplRepoTest Client - Win32 Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Bank Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple Bank Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "ImplRepoTest Client - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "ImplRepoTest Client - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,21 +28,22 @@ CFG=Simple Bank Client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Simple Bank Client - Win32 Release"

+!IF  "$(CFG)" == "ImplRepoTest Client - 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 BASE Output_Dir ".\client\Release"

+# PROP BASE Intermediate_Dir ".\client\Release"

+# PROP BASE Target_Dir ".\client"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# 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 "..\..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\client"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -50,92 +51,80 @@ BSC32=bscmake.exe
 # 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 /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "Simple Bank Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ImplRepoTest Client - 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 BASE Output_Dir ".\client\Debug"

+# PROP BASE Intermediate_Dir ".\client\Debug"

+# PROP BASE Target_Dir ".\client"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# 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 "..\..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\client"

+# 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

+# 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 TAOd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Simple Bank Client - Win32 Release"

-# Name "Simple Bank Client - Win32 Debug"

+# Name "ImplRepoTest Client - Win32 Release"

+# Name "ImplRepoTest Client - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

-SOURCE=.\Bank_Client_i.cpp

+SOURCE=.\client.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\BankC.cpp

+SOURCE=.\client_impl.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\BankS.cpp

+SOURCE=.\Simple_ObjectC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\client.cpp

+SOURCE=.\Simple_ObjectS.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Bank_Client_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BankC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\BankS.h

-# End Source File

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

-SOURCE=.\BankS_T.h

+SOURCE=.\client_impl.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\Bank.idl

+SOURCE=.\Simple_Object.idl

 

-!IF  "$(CFG)" == "Simple Bank Client - Win32 Release"

+!IF  "$(CFG)" == "ImplRepoTest Client - Win32 Release"

 

+USERDEP__SIMPL="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Bank.idl

-InputName=Bank

+InputPath=.\Simple_Object.idl

+InputName=Simple_Object

 

 BuildCmds= \

 	..\..\..\..\bin\Release\tao_idl $(InputName).idl

@@ -143,37 +132,38 @@ BuildCmds= \
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Simple Bank Client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ImplRepoTest Client - Win32 Debug"

 

-USERDEP__BANK_="..\..\..\..\bin\tao_idl.exe"	

+# PROP Ignore_Default_Tool 1

+USERDEP__SIMPL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Bank.idl

-InputName=Bank

+InputPath=.\Simple_Object.idl

+InputName=Simple_Object

 

 BuildCmds= \

 	..\..\..\..\bin\tao_idl $(InputName).idl

@@ -181,28 +171,28 @@ BuildCmds= \
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/orbsvcs/tests/ImplRepo/client_impl.cpp b/TAO/orbsvcs/tests/ImplRepo/client_impl.cpp
new file mode 100644
index 00000000000..7d8b4a32c09
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/client_impl.cpp
@@ -0,0 +1,197 @@
+// $Id$
+
+#include "client_impl.h"
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+
+ACE_RCSID(ImplRepo, client_impl, "$Id$")
+
+// Constructor.
+Client_i::Client_i (void)
+  : server_key_ (ACE_OS::strdup ("key0")),
+    loop_count_ (10),
+    shutdown_ (0),
+    server_ (simple_object::_nil ())
+{
+}
+
+// Reads the Server factory ior from a file
+
+int
+Client_i::read_ior (char *filename)
+{
+  // Open the file for reading.
+  ACE_HANDLE f_handle_ = ACE_OS::open (filename, 0);
+
+  if (f_handle_ == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: %p\n",
+                       filename),
+                      -1);
+  ACE_Read_Buffer ior_buffer (f_handle_);
+  this->server_key_ = ior_buffer.read ();
+
+  if (this->server_key_ == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
+
+  ACE_OS::close (f_handle_);
+  return 0;
+}
+
+// Parses the command line arguments and returns an error status.
+
+int
+Client_i::parse_args (void)
+{
+  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:x");
+  int c;
+  int result;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag
+        TAO_debug_level++;
+        break;
+      case 'n':  // loop count
+        this->loop_count_ = (u_int) ACE_OS::atoi (get_opts.optarg);
+        break;
+      case 'f': // read the IOR from the file.
+        result = this->read_ior (get_opts.optarg);
+        if (result < 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to read ior from %s : %p\n",
+                             get_opts.optarg),
+                            -1);
+            break;
+      case 'x':
+        this->shutdown_ = 1;
+        break;
+      case '?':
+      default:
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-n loopcount]"
+                           " [-f server-obj-ref-key-file]"
+                           " [-x]"
+                           "\n",
+                           this->argv_ [0]),
+                          -1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+// calculate the cube from a long
+
+void
+Client_i::cube_long (int i)
+{
+  // Cube a long.
+  CORBA::Long ret_long;
+  ACE_OS::sleep (2);
+
+  TAO_TRY 
+  {
+    ret_long = this->server_->simple_method (i, TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    ACE_DEBUG ((LM_DEBUG, "The cube of %d is %d\n", i, ret_long));
+  }
+  TAO_CATCHANY
+  {
+      TAO_TRY_ENV.print_exception ("from cube_long");
+      return;
+  }
+  TAO_ENDTRY;
+
+  CORBA::Long arg_long = i * i * i;
+
+  if (arg_long != ret_long)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "** cube_long (%ld) ERROR (--> %ld)\n",
+                ret_long,
+                arg_long));
+  }
+}
+
+
+// Execute client example code.
+
+int
+Client_i::run ()
+{
+  u_int i;
+
+  for (i = 1; i <= this->loop_count_; i++)
+    this->cube_long (i);
+
+  if (this->shutdown_)
+    this->server_->shutdown (this->env_);
+
+  return 0;
+}
+
+Client_i::~Client_i (void)
+{
+  // Free resources
+  // Close the ior files
+  CORBA::release (this->server_);
+
+  if (this->server_key_ != 0)
+    ACE_OS::free (this->server_key_);
+}
+
+
+int
+Client_i::init (int argc, char **argv)
+{
+  this->argc_ = argc;
+  this->argv_ = argv;
+
+  TAO_TRY
+    {
+      // Retrieve the ORB.
+      this->orb_ = CORBA::ORB_init (this->argc_,
+                                    this->argv_,
+                                    "internet",
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      // Parse command line and verify parameters.
+      if (this->parse_args () == -1)
+        return -1;
+
+      if (this->server_key_ == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%s: no server key specified\n",
+                           this->argv_[0]),
+                          -1);
+
+      CORBA::Object_var server_object =
+        this->orb_->string_to_object (this->server_key_, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      this->server_ = simple_object::_narrow (server_object.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (CORBA::is_nil (server_object.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "invalid server key <%s>\n",
+                           this->server_key_),
+                          -1);
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Client_i::init");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/client_impl.h
index 9b23cf6be44..cd207856036 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/client_impl.h
@@ -4,38 +4,34 @@
 // ============================================================================
 //
 // = LIBRARY
-//    TAO/orbsvcs/tests/ImplRepo
+//    TAO/tests/Simple
 //
 // = FILENAME
-//    nestea_client_i.h
+//    client_impl.h
 //
 // = DESCRIPTION
-//    This class implements a simple CORBA client which controls a Nestea
-//    can database
+//    This class implements a simple CORBA client.
 //
 // = AUTHORS
 //    Darrell Brunsch <brunsch@cs.wustl.edu>
 //
 // ============================================================================
 
-#if !defined (NESTEA_CLIENT_I_H)
-#define NESTEA_CLIENT_I_H
-
+#include "Simple_ObjectC.h"
 #include "tao/corba.h"
-#include "NesteaC.h"
 
-class Nestea_Client_i
+class Client_i
 {
   // = TITLE
-  //     Nestea Bookshelf Client Implementation
+  //     Simple Client Implementation
   //
   // = DESCRIPTION
   //     Class wrapper for a client which gets the server IOR and then makes
-  //     a couple of calls to the server.
+  //     several calls to the server before optionally shutting it down.
 public:
   // = Constructor and destructor.
-  Nestea_Client_i (void);
-  ~Nestea_Client_i (void);
+  Client_i (void);
+  ~Client_i (void);
 
   int run ();
   // Execute client example code.
@@ -44,9 +40,15 @@ public:
   // Initialize the client communication endpoint with server.
 
 private:
+  int read_ior (char *filename);
+  // Function to read the server ior from a file.
+
   int parse_args (void);
   // Parses the arguments passed on the command line.
 
+  void cube_long (int i);
+  // calculate the cube from a long.
+
   int argc_;
   // # of arguments on the command line.
 
@@ -56,11 +58,18 @@ private:
   char *server_key_;
   // Key of the obj ref of the server.
 
-  Nestea_Bookshelf_ptr server_;
+  u_int loop_count_;
+  // Number of times to do the cube operations.
+
+  int shutdown_;
+  // Flag for server shutdown.
+
+  CORBA::Environment env_;
+  // Environment variable.
+
+  simple_object_ptr server_;
   // Server object ptr.
 
   CORBA::ORB_var orb_;
   // Remember our orb.
 };
-
-#endif /* NESTEA_CLIENT_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
index f90601df906..622df28e10e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/implrepo.conf
@@ -1,4 +1,49 @@
 # $Id$
-static Resource_Factory "-ORBresources tss"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null"
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBpoalock null -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
deleted file mode 100644
index 88780a43145..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.dsp
+++ /dev/null
@@ -1,208 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Nestea Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Nestea 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 NMAKE /f "nestea_client.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 "nestea_client.mak" CFG="Nestea Client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Nestea Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Nestea Client - 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)" == "Nestea Client - 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" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "Nestea Client - 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" /FD /c

-# SUBTRACT CPP /YX

-# 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 "Nestea Client - Win32 Release"

-# Name "Nestea Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\nestea_client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\nestea_client_i.cpp

-# End Source File

-# End Group

-# Begin Group "Generated Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\NesteaC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NesteaS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\nestea_client_i.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Nestea.idl

-

-!IF  "$(CFG)" == "Nestea Client - Win32 Release"

-

-USERDEP__AIRPL="..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Nestea.idl

-InputName=Nestea

-

-BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl $(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)" == "Nestea Client - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AIRPL="..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Nestea.idl

-InputName=Nestea

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gi $(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/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
deleted file mode 100644
index 4ed1a895e0e..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-
-#include "nestea_client_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-ACE_RCSID(ImplRepo, nestea_client_i, "$Id$")
-
-// Constructor.
-Nestea_Client_i::Nestea_Client_i (void)
-  : server_key_ (ACE_OS::strdup ("key0")),
-    server_ (Nestea_Bookshelf::_nil ())
-{
-}
-
-
-// Parses the command line arguments and returns an error status.
-
-int
-Nestea_Client_i::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'k':  // ior provide on command line
-        this->server_key_ = ACE_OS::strdup (get_opts.optarg);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-k server-object-key]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Execute client example code.
-
-int
-Nestea_Client_i::run ()
-{
-  this->server_->drink (40);
-  this->server_->drink (100);
-  
-  ACE_DEBUG ((LM_DEBUG, "Cans: %d\n"
-                        "Praise: %s\n", 
-                        this->server_->bookshelf_size (),
-                        this->server_->get_praise ()));
-
-  this->server_->drink (500);
-  this->server_->crush (200);
-
-  ACE_DEBUG ((LM_DEBUG, "Cans: %d\n"
-                        "Praise: %s\n", 
-                        this->server_->bookshelf_size (),
-                        this->server_->get_praise ()));
-
-  return 0;
-}
-
-Nestea_Client_i::~Nestea_Client_i (void)
-{
-  // Free resources
-  // Close the ior files
-  CORBA::release (this->server_);
-
-  if (this->server_key_ != 0)
-    delete this->server_key_;
-}
-
-
-int
-Nestea_Client_i::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      if (this->server_key_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: no server key specified\n",
-                           this->argv_[0]),
-                          -1);
-
-      CORBA::Object_var server_object =
-        this->orb_->string_to_object (this->server_key_, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->server_ = Nestea_Bookshelf::_narrow (server_object.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "invalid server key <%s>\n",
-                           this->server_key_),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("Nestea_Client_i::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
deleted file mode 100644
index 2ed96b25d38..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id$
-
-#include "nestea_i.h"
-#include "tao/corba.h"
-#include "ace/FILE_Connector.h"
-
-const size_t MAX_UINT32_STR_LEN = 11;  // Largest UINT32 is 8589934591 + NUL is 11 characters
-
-ACE_RCSID(ImplRepo, nestea_i, "$Id$")
-
-// Constructor
-
-Nestea_i::Nestea_i (const char *filename, int shutdown)
-: shutdown_ (shutdown),
-  cans_ (0)
-{
-  this->data_filename_ = ACE::strnew (filename);
-  
-  // @@ This should probably be called from somewhere else
-  this->load_data ();
-}
-
-
-// Destructor
-
-Nestea_i::~Nestea_i (void)
-{
-  delete this->data_filename_;
-}
-
-
-// Add <cans> number of cans to the bookshelf.
-
-void 
-Nestea_i::drink (CORBA::Long cans,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Nestea_i::drink %d cans\n", cans));
-
-  this->cans_ += cans;
-
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
-  this->save_data ();
-}
-
-
-// Removes <cans> number of cans from the bookshelf.
-
-void 
-Nestea_i::crush (CORBA::Long cans,
-                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Nestea_i::crush %d cans\n", cans));
-
-  if (ACE_static_cast (ACE_UINT32, cans) > this->cans_)
-    this->cans_ = 0;
-  else
-    this->cans_ -= cans;
-  
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
-  this->save_data ();
-}
-
-
-// Returns the number of cans in the bookshelf.
-
-CORBA::Long 
-Nestea_i::bookshelf_size (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n"));
-
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
-  return this->cans_;
-}
-
-// Returns comments about your collection.
-
-char *
-Nestea_i::get_praise (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
-  if (TAO_debug_level)
-    ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n"));
-
-  if (this->shutdown_ != 0)
-    TAO_ORB_Core_instance ()->orb ()->shutdown ();
-
-  if (this->cans_ > 500)
-    return CORBA::string_dup ("Man, that is one excellent Nestea Collection!");
-  else if (this->cans_ > 250)
-    return CORBA::string_dup ("We are getting into the big leagues now!");
-  else if (this->cans_ > 100)
-    return CORBA::string_dup ("Things are looking up!");
-  else if (this->cans_ > 0)
-    return CORBA::string_dup ("Well, it is a start. Drink more Nestea!");
-  else
-    return CORBA::string_dup ("No cans, no praise.");
-}
-
-
-// Saves bookshelf data to a file.
-
-int 
-Nestea_i::save_data (void)
-{
-  ACE_FILE_IO file;
-  ACE_FILE_Addr filename (this->data_filename_);
-
-  char str[MAX_UINT32_STR_LEN];
-
-  ACE_OS::sprintf (str, "%d", this->cans_);
-
-  return file.send_n (str, ACE_OS::strlen (str) + 1);
-}
-
-
-// Loads bookshelf data from a file.
-
-int 
-Nestea_i::load_data (void)
-{
-  ACE_FILE_IO file;
-  ACE_FILE_Addr filename ("nestea.dat");
-
-  char str[12];
-
-  int len = file.recv (str, ACE_OS::strlen (str) + 1);
-  str[len] = 0;
-
-  if (len > 0)
-    this->cans_ = ACE_OS::atoi (str);
-  else
-    this->cans_ = 0;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
deleted file mode 100644
index 78361d1e19b..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/ImplRepo
-// 
-// = FILENAME
-//    nestea_i.h
-//
-// = DESCRIPTION
-//    This class is an implementation of the Nestea Bookshelf interface.
-//
-// = AUTHOR
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-// 
-// ============================================================================
-
-#if !defined (NESTEA_I_H)
-#define	NESTEA_I_H
-
-#include "NesteaS.h"
-
-// Forward declarations.
-class Nestea_i;
-
-// Typedefs.
-typedef Nestea_i *Nestea_i_ptr;
-typedef Nestea_i_ptr Nestea_i_ref;
-
-class Nestea_i: public POA_Nestea_Bookshelf
-{
-  // = TITLE
-  //    Nestea Bookshelf Implementation
-  //
-  // = DESCRIPTION
-  //    Implements the Nestea Bookshelf server, which keeps track of the
-  //    number of nestea cans in a bookshelf.  You can drink Nestea to add
-  //    it to the bookshelf or crush the cans to remove them.
-public:
-  Nestea_i (const char *filename = "nestea.dat", int shutdown = 0);
-  // Constructor that takes in an optional shutdown parameter which, if nonzero,
-  // will shutdown the server after each call.
-
-  virtual ~Nestea_i (void);
-  // Destructor
-
-  virtual void drink (CORBA::Long cans,
-                      CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-  // Add <cans> number of cans to the bookshelf.
-
-  virtual void crush (CORBA::Long cans,
-                      CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-  // Removes <cans> number of cans from the bookshelf.
-
-  virtual CORBA::Long bookshelf_size (CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-  // Returns the number of cans in the bookshelf.
-
-  virtual char *get_praise (CORBA::Environment &ACE_TRY_ENV = 
-                              CORBA::Environment::default_environment ());
-  // Returns comments about your collection.
-
-private:
-  int save_data (void);
-  // Saves bookshelf data to a file.
-
-  int load_data (void);
-  // Loads bookshelf data from a file.
-
-  char *data_filename_;
-  // The name of the file to store the data in.
-
-  int shutdown_;
-  // Shutdown flag.
-
-  ACE_UINT32 cans_;
-  // Number of cans in the bookshelf.
-};
-
-#endif /* NESTEA_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
deleted file mode 100644
index e5673015ac2..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "nestea_server_i.h"
-
-ACE_RCSID(ImplRepo, nestea_server, "$Id$")
-
-int
-main (int argc, char *argv[])
-{
-  Nestea_Server_i server;
-
-  ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      if (server.init (argc, argv, ACE_TRY_ENV) == -1)
-        return -1;
-      else
-        {
-          server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
deleted file mode 100644
index 72be10ec8c5..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.dsp
+++ /dev/null
@@ -1,224 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Nestea Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Nestea 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 NMAKE /f "nestea_server.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 "nestea_server.mak" CFG="Nestea Server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Nestea Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Nestea Server - 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)" == "Nestea Server - 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 "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Nestea Server - 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 "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Nestea Server - Win32 Release"

-# Name "Nestea Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\nestea_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\nestea_server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\nestea_server_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\IR_Helper.cpp

-# End Source File

-# End Group

-# Begin Group "Generated Source Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\NesteaC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\NesteaS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\nestea_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\nestea_server_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IR_Helper.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Nestea.idl

-

-!IF  "$(CFG)" == "Nestea Server - Win32 Release"

-

-USERDEP__AIRPL="..\..\..\..\bin\Release\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Nestea.idl

-InputName=Nestea

-

-BuildCmds= \

-	..\..\..\..\bin\Release\tao_idl $(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)" == "Nestea Server - Win32 Debug"

-

-# PROP Ignore_Default_Tool 1

-USERDEP__AIRPL="..\..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Nestea.idl

-InputName=Nestea

-

-BuildCmds= \

-	..\..\..\..\bin\tao_idl -Gi  $(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/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
deleted file mode 100644
index 330ba2e4587..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// $Id$
-
-#include "nestea_server_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Read_Buffer.h"
-
-ACE_RCSID(ImplRepo, nestea_server_i, "$Id$")
-
-const char *NESTEA_DATA_FILENAME = "nestea.dat";
-
-Nestea_Server_i::Nestea_Server_i (const char *filename)
-  : server_impl_ (0),
-    ior_output_file_ (0),
-    ir_helper_ (0),
-    register_with_ir_ (0),
-    use_ir_ (0)
-{
-  // Nothing
-}
-
-Nestea_Server_i::~Nestea_Server_i (void)
-{
-  delete this->ir_helper_;
-  delete this->server_impl_;
-}
-
-int
-Nestea_Server_i::parse_args (void)
-{
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ir");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      case 'r':  // Register restart information with the IR.
-        this->register_with_ir_ = 1;
-        break;
-      case 'i':  // Use the IR
-        this->use_ir_ = 1;
-        break;
-      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,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-i]"
-                           " [-r]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-Nestea_Server_i::init (int argc, char** argv, CORBA::Environment &ACE_TRY_ENV)
-{
-  char poa_name[] = "nestea_server";
-
-  ACE_TRY 
-    {
-      // 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, argv, poa_name, ACE_TRY_ENV) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1);
-
-      ACE_TRY_CHECK;
-    
-      this->argc_ = argc;
-      this->argv_ = argv;
-
-      int retval = this->parse_args ();
-
-      if (retval != 0)
-        return retval;
-
-      ACE_NEW_RETURN (this->server_impl_, Nestea_i (NESTEA_DATA_FILENAME, this->use_ir_), -1);
-
-      CORBA::String_var server_str  =
-        this->orb_manager_.activate_under_child_poa ("server",
-                                                     this->server_impl_,
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->use_ir_ == 1)
-        {
-          ACE_NEW_RETURN (this->ir_helper_, IR_Helper (poa_name,
-                                                       this->orb_manager_.child_poa (),
-                                                       this->orb_manager_.orb (),
-                                                       TAO_debug_level),
-                          -1);
-
-          if (this->register_with_ir_ == 1)
-            this->ir_helper_->register_server ("nestea_server -i");
-        }
-
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("server");
-
-      CORBA::Object_var server_obj =
-        this->orb_manager_.child_poa ()->id_to_reference (id.in (),
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->use_ir_ == 1)
-        {
-          this->ir_helper_->change_object (server_obj.inout (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-       
-      server_str =
-        this->orb_manager_.orb ()->object_to_string (server_obj.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in ()));
-
-      if (this->ior_output_file_)
-        {
-          ACE_OS::fprintf (this->ior_output_file_, "%s", server_str.in ());
-          ACE_OS::fclose (this->ior_output_file_);
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::init");
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-Nestea_Server_i::run (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      if (this->use_ir_ == 1)
-        {
-          this->ir_helper_->notify_startup (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-
-      this->orb_manager_.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (this->use_ir_ == 1)
-        {
-          this->ir_helper_->notify_shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Nestea_i::run");
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-  
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
deleted file mode 100644
index f6b1280f190..00000000000
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/orbsvcs/tests/ImplRepo
-//
-// = FILENAME
-//    nestea_server_i.h
-//
-// = DESCRIPTION
-//    Server that sets up the ORB and handles the registration and execution
-//    of the Nestea Bookshelf Server.
-//
-// = AUTHORS
-//    Darrell Brunsch <brunsch@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (NESTEA_SERVER_I_H)
-#define NESTEA_SERVER_I_H
-
-#include "tao/TAO.h"
-#include "nestea_i.h"
-#include "IR_Helper.h"
-
-class Nestea_Server_i
-{
-  // = TITLE
-  //   Nestea Bookshelf Server Implementation Class
-  //
-  // = DESCRIPTION
-  //   Sets up everything necessary to get the Nestea Bookshelf Server 
-  //   running.
-  //   
-public:
-  // = Initialization and termination methods.
-  Nestea_Server_i (const char *filename = "nestea.dat");
-  // Default constructor
-
-  ~Nestea_Server_i (void);
-  // Destructor
-
-  int init (int argc, char **argv, CORBA::Environment &ACE_TRY_ENV);
-  // Initialize the Server state - parsing arguments and waiting
-
-  int run (CORBA::Environment &ACE_TRY_ENV);
-  // Run the orb 
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  int argc_;
-  // Number of command line arguments.
-
-  char **argv_;
-  // The command line arguments.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
-  Nestea_i *server_impl_;
-  // The Nestea Bookshelf Server Implementation.  
-
-  FILE *ior_output_file_;
-  // File where the IOR of the server object is stored.
-
-  IR_Helper *ir_helper_;
-  // Helper class for using the IR.
-
-  int register_with_ir_;
-  // Flag for whether or not to register startup with the IR.
-
-  int use_ir_;
-  // Flag for whether or not to use the IR.
-};
-
-#endif /* NESTEA_SERVER_I_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index b37cd2b6179..47eda1fa345 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -1,21 +1,20 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 
 require ACEutils;
 
 $airplane_ior = "airplane.ior";
-$nestea_ior = "nestea.ior";
+$simple_ior = "simple.ior";
 $implrepo_ior = "implrepo.ior";
 
 # Make sure the files are gone, so we can wait on them.
 unlink $airplane_ior;
-unlink $nestea_ior;
+unlink $simple_ior;
 unlink $implrepo_ior;
 
 # The Tests
@@ -23,12 +22,12 @@ unlink $implrepo_ior;
 sub airplane_test
 {
   $SV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
-                         "-o $airplane_ior");
+                         "-o $airplane_ior -r");
 
   ACE::waitforfile ($airplane_ior);
 
   $status = system ($EXEPREFIX."airplane_client".$Process::EXE_EXT.
-                    " -k file://$airplane_ior");
+                    " -f $airplane_ior");
 
   $SV->Kill (); $SV->Wait ();
   unlink $airplane_ior;
@@ -36,7 +35,7 @@ sub airplane_test
 
 sub airplane_ir_test
 {
-  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
                          "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
 
   ACE::waitforfile ($implrepo_ior);
@@ -46,70 +45,80 @@ sub airplane_ir_test
 
   ACE::waitforfile ($airplane_ior);
 
-  system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
+  system($EXEPREFIX."airplane_client -f $airplane_ior -ORBobjrefstyle url");
 
   $IR->Kill (); $IR->Wait ();
 }
 
-sub nestea_test
+sub simple_test
 {
-  $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
-                         "-o $nestea_ior");
+  $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
+                         "-o $simple_ior");
 
-  ACE::waitforfile ($nestea_ior);
+  ACE::waitforfile ($simple_ior);
 
-  $status = system ($EXEPREFIX."nestea_client".$Process::EXE_EXT.
-                    " -k file://$nestea_ior");
+  $status = system ($EXEPREFIX."client".$Process::EXE_EXT.
+                    " -f $simple_ior");
 
   $SV->Kill (); $SV->Wait ();
 
-  unlink $nestea_ior;
+  unlink $simple_ior;
 }
 
-sub nestea_ir_test
+sub implrepo_test
 {
-  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
+                         "-ORBsvcconf implrepo.conf");
 
-  ACE::waitforfile ($implrepo_ior);
+  ACE::waitforfile ("implrepo.ior");
+
+  system ($EXEPREFIX."server -r -o svr.ior");
 
-  $SV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
-                         "-o $nestea_ior -i -r -ORBobjrefstyle url");
+  $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, "");
 
-  ACE::waitforfile ($nestea_ior);
+  sleep $ACE::sleeptime;
 
-  system($EXEPREFIX."nestea_client -k file://$nestea_ior -ORBobjrefstyle url");
+  $PSV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
+                          "-o $airplane_ior -i -r");
+
+  ACE::waitforfile ($airplane_ior);
+
+  $PCL = Process::Create ($EXEPREFIX."airplane_client".$Process::EXE_EXT,
+                          " -f $airplane_ior");
+
+  system ($EXEPREFIX."client -f svr.ior");
 
   $IR->Kill (); $IR->Wait ();
 }
 
-sub both_ir_test
+sub implrepo2_test
 {
-  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT,
-                         "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 0");
+  $IR = Process::Create ("..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR."ImplRepo_Service".$Process::EXE_EXT, 
+                         "-ORBsvcconf implrepo.conf");
 
-  ACE::waitforfile ($implrepo_ior);
+  ACE::waitforfile ("implrepo.ior");
 
-  $ASV = Process::Create ($EXEPREFIX."nestea_server".$Process::EXE_EXT,
-                         "-o $nestea_ior -i -r -ORBobjrefstyle url");
+  system ($EXEPREFIX."server -r -o svr.ior");
 
-  $NSV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
-                         "-o $airplane_ior -i -r -ORBobjrefstyle url");
+  $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, "");
 
-  ACE::waitforfile ($nestea_ior);
+  sleep $ACE::sleeptime;
 
-  $NCL = Process::Create ($EXEPREFIX."nestea_client".$Process::EXE_EXT,
-                          "-k file://$nestea_ior -ORBobjrefstyle url");
+  $PSV = Process::Create ($EXEPREFIX."airplane_server".$Process::EXE_EXT,
+                          "-o $airplane_ior -i -r");
 
   ACE::waitforfile ($airplane_ior);
 
-  system($EXEPREFIX."airplane_client -k file://$airplane_ior -ORBobjrefstyle url");
+  $PCL = Process::Create ($EXEPREFIX."client".$Process::EXE_EXT,
+                          " -f $svr_ior");
+
+  system ($EXEPREFIX."airplane_client -f $airplane_ior");
 
-  $NCL->Kill (); $NCL->Kill ();
   $IR->Kill (); $IR->Wait ();
 }
 
 
+
 # Parse the arguments
 
 for ($i = 0; $i <= $#ARGV; $i++)
@@ -126,27 +135,27 @@ for ($i = 0; $i <= $#ARGV; $i++)
     }
     if ($ARGV[$i] eq "airplane")
     {
-      airplane_test ();
+      airplane_test ();    
       exit;
     }
     if ($ARGV[$i] eq "airplane_ir")
     {
-      airplane_ir_test ();
+      airplane_ir_test ();    
       exit;
     }
-    if ($ARGV[$i] eq "nestea")
+    if ($ARGV[$i] eq "simple")
     {
-      nestea_test ();
+      simple_test ();    
       exit;
     }
-    if ($ARGV[$i] eq "nestea_ir")
+    if ($ARGV[$i] eq "implrepo")
     {
-      nestea_ir_test ();
+      implrepo_test ();    
       exit;
     }
-    if ($ARGV[$i] eq "both_ir")
+    if ($ARGV[$i] eq "implrepo2")
     {
-      both_ir_test ();
+      implrepo2_test ();    
       exit;
     }
 
@@ -154,4 +163,4 @@ for ($i = 0; $i <= $#ARGV; $i++)
   }
 }
 
-print "Specify airplane, airplane_ir, nestea, nestea_ir, or both_ir\n"
+print "Specify airplane, airplane_ir\n"
diff --git a/TAO/orbsvcs/tests/ImplRepo/server.cpp b/TAO/orbsvcs/tests/ImplRepo/server.cpp
new file mode 100644
index 00000000000..741e14b9996
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/server.cpp
@@ -0,0 +1,37 @@
+// $Id$
+
+#include "server_impl.h"
+
+ACE_RCSID(ImplRepo, server, "$Id$")
+
+int
+main (int argc, char *argv[])
+{
+  Server_i server;
+
+  ACE_DEBUG ((LM_DEBUG, "\n\tSimple_Server\n\n"));
+  TAO_TRY
+    {
+      if (server.init (argc, argv, TAO_TRY_ENV) == -1)
+        return 1;
+      else
+        {
+          server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
+    }
+  TAO_CATCH (CORBA::SystemException, sysex)
+    {
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
+      return -1;
+    }
+  TAO_CATCH (CORBA::UserException, userex)
+    {
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
+      return -1;
+    }
+  TAO_ENDTRY;
+  return 0;
+}
diff --git a/TAO/examples/Simple/bank/server.dsp b/TAO/orbsvcs/tests/ImplRepo/server.dsp
index 38c289d29dc..2683f99e63f 100644
--- a/TAO/examples/Simple/bank/server.dsp
+++ b/TAO/orbsvcs/tests/ImplRepo/server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Simple Bank Server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="ImplRepoTest Server" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Simple Bank Server - Win32 Debug

+CFG=ImplRepoTest Server - Win32 Release

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=Simple Bank Server - Win32 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 "server.mak" CFG="Simple Bank Server - Win32 Debug"

+!MESSAGE NMAKE /f "server.mak" CFG="ImplRepoTest Server - Win32 Release"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Simple Bank Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Simple Bank Server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "ImplRepoTest Server - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "ImplRepoTest Server - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,21 +28,22 @@ CFG=Simple Bank Server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Simple Bank Server - Win32 Release"

+!IF  "$(CFG)" == "ImplRepoTest Server - 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 BASE Output_Dir ".\server\Release"

+# PROP BASE Intermediate_Dir ".\server\Release"

+# PROP BASE Target_Dir ".\server"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# 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 "..\..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\server"

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /I "..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -50,100 +51,108 @@ BSC32=bscmake.exe
 # 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 /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

+# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "Simple Bank Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ImplRepoTest Server - 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 BASE Output_Dir ".\server\Debug"

+# PROP BASE Intermediate_Dir ".\server\Debug"

+# PROP BASE Target_Dir ".\server"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir "Debug"

+# 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 "..\..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\server"

+# 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 "..\..\..\\" /I "..\..\..\..\\" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 # 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 TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\orbsvcs\orbsvcs"

-# SUBTRACT LINK32 /pdb:none

+# 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 TAOd.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Simple Bank Server - Win32 Release"

-# Name "Simple Bank Server - Win32 Debug"

+# Name "ImplRepoTest Server - Win32 Release"

+# Name "ImplRepoTest Server - Win32 Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

-SOURCE=.\Account_i.cpp

+SOURCE=.\server.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\AccountManager_i.cpp

+SOURCE=.\server_impl.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\BankC.cpp

+SOURCE=.\simple_object_impl.cpp

 # End Source File

+# End Group

+# Begin Group "Generated Source Files"

+

+# PROP Default_Filter ""

 # Begin Source File

 

-SOURCE=.\BankS.cpp

+SOURCE=..\..\ImplRepo_Service\ImplRepoC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\server.cpp

+SOURCE=..\..\ImplRepo_Service\ImplRepoS.cpp

 # End Source File

-# End Group

-# Begin Group "Header Files"

+# Begin Source File

 

-# PROP Default_Filter ""

+SOURCE=..\..\ImplRepo_Service\PingC.cpp

+# End Source File

 # Begin Source File

 

-SOURCE=.\Account_i.h

+SOURCE=..\..\ImplRepo_Service\PingS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\AccountManager_i.h

+SOURCE=.\Simple_ObjectC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\BankC.h

+SOURCE=.\Simple_ObjectS.cpp

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

-SOURCE=.\BankS.h

+SOURCE=.\server_impl.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\BankS_T.h

+SOURCE=.\simple_object_impl.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"

 

-# PROP Default_Filter ""

+# PROP Default_Filter ".idl"

 # Begin Source File

 

-SOURCE=.\Bank.idl

+SOURCE=.\Simple_Object.idl

 

-!IF  "$(CFG)" == "Simple Bank Server - Win32 Release"

+!IF  "$(CFG)" == "ImplRepoTest Server - Win32 Release"

 

+USERDEP__SIMPL="..\..\..\..\bin\Release\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Bank.idl

-InputName=Bank

+InputPath=.\Simple_Object.idl

+InputName=Simple_Object

 

 BuildCmds= \

 	..\..\..\..\bin\Release\tao_idl $(InputName).idl

@@ -151,37 +160,38 @@ BuildCmds= \
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Simple Bank Server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "ImplRepoTest Server - Win32 Debug"

 

-USERDEP__BANK_="..\..\..\..\bin\tao_idl.exe"	

+# PROP Ignore_Default_Tool 1

+USERDEP__SIMPL="..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\Bank.idl

-InputName=Bank

+InputPath=.\Simple_Object.idl

+InputName=Simple_Object

 

 BuildCmds= \

 	..\..\..\..\bin\tao_idl $(InputName).idl

@@ -189,28 +199,28 @@ BuildCmds= \
 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)C.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)C.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

 "$(InputName)S_T.i" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"$(InputName)S_T.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"$(InputName)S_T.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

diff --git a/TAO/orbsvcs/tests/ImplRepo/server_impl.cpp b/TAO/orbsvcs/tests/ImplRepo/server_impl.cpp
new file mode 100644
index 00000000000..29192f73845
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/server_impl.cpp
@@ -0,0 +1,237 @@
+// $Id$
+
+#include "server_impl.h"
+#include "../../ImplRepo_Service/ImplRepoC.h"
+#include "ace/Get_Opt.h"
+#include "ace/Read_Buffer.h"
+
+ACE_RCSID(ImplRepo, server_impl, "$Id$")
+
+Server_i::Server_i (void)
+  : ior_output_file_ (0),
+    register_ (0),
+    use_ir_ (1)
+{
+}
+
+int
+Server_i::parse_args (void)
+{
+  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:f:ri");
+  int c;
+
+  while ((c = get_opts ()) != -1)
+    switch (c)
+      {
+      case 'd':  // debug flag.
+        TAO_debug_level++;
+        break;
+      case 'r':
+        this->register_ = 1;
+        break;
+      case 'i':
+        this->use_ir_ = 0;
+        this->server_impl.use_ir_ = 0;
+        break;
+      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,
+                             "Unable to open %s for writing: %p\n",
+                             get_opts.optarg), -1);
+        break;
+      case '?':  // display help for use of the server.
+      default:
+        // @@ Update me.
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "usage:  %s"
+                           " [-d]"
+                           " [-o] <ior_output_file>"
+                           "\n",
+                           argv_ [0]),
+                          1);
+      }
+
+  // Indicates successful parsing of command line.
+  return 0;
+}
+
+int
+Server_i::init (int argc, char** argv, CORBA::Environment& env)
+{
+  TAO_TRY 
+    {
+      // 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, argv, "simpserv", TAO_TRY_ENV) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "init_child_poa"), -1);
+
+      TAO_CHECK_ENV;
+    
+      this->argc_ = argc;
+      this->argv_ = argv;
+
+      int retval = this->parse_args ();
+
+      if (retval != 0)
+        return retval;
+   
+      CORBA::String_var server_str  =
+        this->orb_manager_.activate_under_child_poa ("server",
+                                                     &this->server_impl,
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      CORBA::String_var ping_str =
+        this->orb_manager_.activate_under_child_poa ("ping",
+                                                     &this->ping_impl,
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (this->use_ir_)
+        {
+          this->read_ir_ior ();
+
+          if (this->register_ == 1)
+            this->register_with_ir ();
+
+          CORBA::Object_var server_object =  
+            this->orb_manager_.orb ()->string_to_object (server_str, env);
+
+          Implementation_Repository::INET_Addr server_addr;
+          ACE_INET_Addr my_addr = TAO_ORB_Core_instance ()->addr ();
+          server_addr.port_ = my_addr.get_port_number ();
+
+          CORBA::Object_var ping_object = 
+            this->orb_manager_.orb ()->string_to_object (ping_str, env);
+
+          // Talk to the Implementation Repository if we are already registered
+          CORBA::Object_var implrepo_object =
+            this->orb_manager_.orb ()->string_to_object (this->ir_server_key_, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          Implementation_Repository *ImplRepo = 
+            Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          if (CORBA::is_nil (implrepo_object.in ()))
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "invalid implrepo key <%s>\n",
+                               this->ir_server_key_),
+                              -1);
+          
+
+          Implementation_Repository::INET_Addr new_addr = 
+            ImplRepo->server_is_running ("simpserv", 
+                                         server_addr,
+                                         ping_object, 
+                                         TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          IIOP_Object *iiop_obj = ACE_dynamic_cast (IIOP_Object *, server_object->_stubobj ());
+          // @@ Only same host for now
+          iiop_obj->profile.port = new_addr.port_;
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", this->orb_manager_.orb ()->object_to_string (server_object, TAO_TRY_ENV)));
+
+          if (this->ior_output_file_)
+            {
+              ACE_OS::fprintf (this->ior_output_file_, "%s", this->orb_manager_.orb ()->object_to_string (server_object, TAO_TRY_ENV));
+              ACE_OS::fclose (this->ior_output_file_);
+            }
+        }
+      else
+      {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "The IOR is: <%s>\n", server_str.in()));
+
+          if (this->ior_output_file_)
+            {
+              ACE_OS::fprintf (this->ior_output_file_, "%s", server_str.in());
+              ACE_OS::fclose (this->ior_output_file_);
+            }
+      }
+
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("Server_i::init");
+      return -1;
+    }
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+int
+Server_i::run (CORBA::Environment& env)
+{
+  if (this->register_ != 1)
+    if (this->orb_manager_.run (env) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "Server_i::run"), -1);
+  return 0;
+}
+
+int 
+Server_i::register_with_ir (void)
+{
+  TAO_TRY 
+  {
+    CORBA::Object_var implrepo_object =
+      this->orb_manager_.orb ()->string_to_object (this->ir_server_key_, TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    Implementation_Repository *ImplRepo = 
+      Implementation_Repository::_narrow (implrepo_object.in(), TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+
+    if (CORBA::is_nil (implrepo_object.in ()))
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "invalid implrepo key <%s>\n",
+                         this->ir_server_key_),
+                        -1);
+
+    Implementation_Repository::Process_Options proc_opts;
+
+    proc_opts.command_line_ = CORBA::string_dup ("server -o svr.ior -ORBobjrefstyle url");
+    proc_opts.environment_ = CORBA::string_dup ("");
+    proc_opts.working_directory_ = CORBA::string_dup ("");
+
+    ImplRepo->register_server ("simpserv", proc_opts, TAO_TRY_ENV);
+    TAO_CHECK_ENV;
+  }
+  TAO_CATCHANY
+  {
+    TAO_TRY_ENV.print_exception ("Server_i::register_with_ir");
+    return -1;
+  }
+  TAO_ENDTRY;
+  return 0;
+}
+
+Server_i::~Server_i (void)
+{
+}
+
+int
+Server_i::read_ir_ior (void)
+{
+  // Open the file for reading.
+  ACE_HANDLE f_handle_ = ACE_OS::open ("implrepo.ior", 0);
+
+  if (f_handle_ == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to open %s for writing: implrepo.ior\n"),
+                      -1);
+  ACE_Read_Buffer ior_buffer (f_handle_);
+  this->ir_server_key_ = ior_buffer.read ();
+
+  if (this->ir_server_key_ == 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Unable to allocate memory to read ior: %p\n"),
+                      -1);
+
+  ACE_OS::close (f_handle_);
+  return 0;
+}
diff --git a/TAO/orbsvcs/tests/ImplRepo/server_impl.h b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
new file mode 100644
index 00000000000..e105379504c
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/server_impl.h
@@ -0,0 +1,81 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/Simple
+//
+// = FILENAME
+//    server_impl.h
+//
+// = DESCRIPTION
+//    Class which implements a CORBA server which sets up the simple object
+//    implementation and the orb.
+//
+// = AUTHORS
+//    Darrell Brunsch <brunsch@cs.wustl.edu>
+//
+// ============================================================================
+
+#if !defined (SERVER_IMPL_H)
+#define SERVER_IMPL_H
+
+#include "simple_object_impl.h"
+#include "tao/TAO.h"
+
+class Server_i
+{
+  // = TITLE
+  //   CORBA Server Implementation
+  //
+  // = DESCRIPTION
+  //   
+public:
+  // = Initialization and termination methods.
+  Server_i (void);
+  // Default constructor
+
+  ~Server_i (void);
+  // Destructor
+
+  int init (int argc, char **argv, CORBA::Environment& env);
+  // Initialize the Server state - parsing arguments and waiting
+
+  int run (CORBA::Environment& env);
+  // Run the orb 
+
+private:
+  Simple_i server_impl;
+  Ping_i ping_impl;
+
+  int read_ir_ior (void);
+
+  int register_with_ir (void);
+
+  int parse_args (void);
+  // Parses the commandline arguments.
+
+  TAO_ORB_Manager orb_manager_;
+  // The ORB manager.
+
+  char *ir_server_key_;
+  
+  FILE *ior_output_file_;
+  // File where the IOR of the server object is stored.
+
+  int register_;
+  // Flag to indicate whether ImplRepo registration should take 
+  // place
+
+  int use_ir_;
+  // Flag to indicate whether the IR should be used or not.
+
+  int argc_;
+  // Number of command line arguments.
+
+  char **argv_;
+  // The command line arguments.
+};
+
+#endif /* SERVER_IMPL_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.cpp b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.cpp
new file mode 100644
index 00000000000..e98291a19ee
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.cpp
@@ -0,0 +1,51 @@
+// $Id$
+
+#include "simple_object_impl.h"
+#include "tao/corba.h"
+
+ACE_RCSID(ImplRepo, simple_object_impl, "$Id$")
+
+// Constructor
+
+Simple_i::Simple_i (const char *)
+: use_ir_ (1)
+{
+}
+
+
+// Destructor
+
+Simple_i::~Simple_i (void)
+{
+}
+
+// Cube a long
+
+CORBA::Long
+Simple_i::simple_method (CORBA::Long l, CORBA::Environment &env)
+{
+  ACE_DEBUG ((LM_DEBUG, "Simple Method\n"));
+  ACE_UNUSED_ARG (env);
+  TAO_ORB_Core_instance ()->orb ()->shutdown ();
+  return l * l * l;
+}
+
+// Shutdown.
+
+void Simple_i::shutdown (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+
+  ACE_DEBUG ((LM_DEBUG, "%s\n", "Simple_i is shutting down"));
+
+//  if (this->use_ir_ == 1)
+ //   TAO_ORB_Core_instance ()->orb ()->shutdown ();
+}
+
+void Ping_i::ping (CORBA::Environment &env)
+{
+  ACE_DEBUG ((LM_DEBUG, "Pinged!\n"));
+
+  ACE_UNUSED_ARG (env);
+  // Does nothing, just returns.
+}
diff --git a/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
new file mode 100644
index 00000000000..126fa02b25c
--- /dev/null
+++ b/TAO/orbsvcs/tests/ImplRepo/simple_object_impl.h
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/Simple
+// 
+// = FILENAME
+//    simple_object_impl.h
+//
+// = DESCRIPTION
+//    This class implements the Simple Object object.
+//
+// = AUTHOR
+//    Darrell Brunsch <brunsch@cs.wustl.edu>
+// 
+// ============================================================================
+
+#if !defined (SIMPLE_OBJECT_IMPL_H)
+#define	SIMPLE_OBJECT_IMPL_H
+
+#include "Simple_ObjectS.h"
+#include "../../ImplRepo_Service/PingS.h"
+
+// Forward declarations.
+class Simple_i;
+
+// Typedefs.
+typedef Simple_i *Simple_i_ptr;
+typedef Simple_i_ptr Simple_i_ref;
+
+class Simple_i: public POA_simple_object
+{
+  // = TITLE
+  //    Simple Object Implementation
+  //
+  // = DESCRIPTION
+  //    Implementation of a simple object that has two methods, one that 
+  //    returns the cube of a long, another that shuts down the server.
+public:
+  Simple_i (const char *obj_name = 0);
+  // Constructor
+
+  ~Simple_i (void);
+  // Destructor
+
+  virtual CORBA::Long simple_method (CORBA::Long l,
+                                     CORBA::Environment &env);
+  // Just cubes the long parameter
+
+  virtual void shutdown (CORBA::Environment &env);
+  // Shutdown routine.
+
+  int use_ir_;
+  // Should we shutdown after each call?  If using the Impl Repo, then yes.
+
+};
+
+// Forward declarations.
+class Ping_i;
+
+// Typedefs.
+typedef Ping_i *Ping_i_ptr;
+typedef Ping_i_ptr Ping_i_ref;
+
+class Ping_i: public POA_Ping_Object
+  // = TITLE
+  //    Ping Object Implementation
+  //
+  // = DESCRIPTION
+  //    Implementation Repository uses this to check to see if the server
+  //    is still running.
+{
+public:
+  virtual void ping (CORBA::Environment &env);
+};
+
+#endif /* SIMPLE_OBJECT_IMPL_H */
diff --git a/TAO/orbsvcs/tests/ImplRepo/svc.conf b/TAO/orbsvcs/tests/ImplRepo/svc.conf
index d5e0059859d..43c6a486c92 100644
--- a/TAO/orbsvcs/tests/ImplRepo/svc.conf
+++ b/TAO/orbsvcs/tests/ImplRepo/svc.conf
@@ -1,4 +1,49 @@
 # $Id$
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
index bf084d19dd3..38c37f2f803 100644
--- a/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/Logging_Test_i.cpp
@@ -134,15 +134,15 @@ Logger_Client::init_loggers (CORBA::Environment &env)
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
   this->logger_1_ = factory_->make_logger ("key1",
-                                           env);
+					   env);
   if (env.exception () != 0)
     return -1;
-
+  
   this->logger_2_ = factory_->make_logger ("key2",
                                            env);
   if (env.exception () != 0)
     return -1;
-
+  
   if (CORBA::is_nil (this->logger_1_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "nil logger1"),
@@ -244,14 +244,14 @@ Logger_Client::run (void)
       this->logger_2_->log (rec2, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
-      // Change the verbosity again
+      // Change the verbosity again 
       this->logger_2_->verbosity (Logger::SILENT, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       // Log the third log record using logv() (this shows if the
       // verbosity level overrides the logger's verbosity level)
       this->logger_2_->logv (rec3, Logger::VERBOSE, TAO_TRY_ENV);
-
+      
       // Change the verbosity again (so that regular log msgs can be
       // seen again)
       this->logger_2_->verbosity (Logger::VERBOSE, TAO_TRY_ENV);
@@ -306,7 +306,7 @@ Logger_Client::init_record (Logger::Log_Record &newrec,
                             const char *msg)
 {
   // Copy the message data into newrec.
-  newrec.msg_data = CORBA::string_dup (msg);
+  newrec.msg_data = CORBA::string_copy (msg);
 
   // Assign the log priority.
   newrec.type = lp;
diff --git a/TAO/orbsvcs/tests/Logger/Makefile b/TAO/orbsvcs/tests/Logger/Makefile
index 361899243e4..11bf1c8c936 100644
--- a/TAO/orbsvcs/tests/Logger/Makefile
+++ b/TAO/orbsvcs/tests/Logger/Makefile
@@ -1,38 +1,31 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Top-level Makefile for the Logging Service test
+#	Top-level Makefile for the Logging Service test
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lorbsvcs -lTAO
+LDLIBS     =  -lorbsvcs -lTAO
 
-SRC = Logging_Test.cpp \
-      Logging_Test_i.cpp
+SRC = 	Logging_Test.cpp \
+	Logging_Test_i.cpp
 
 LOGGING_TEST_OBJS = Logging_Test_i.o Logging_Test.o
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = Logging_Test
+BIN = Logging_Test
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Log,$(findstring Log,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Log
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -47,12 +40,8 @@ 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)#-H
 
-Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+Logging_Test:	$(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
+		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -62,6 +51,9 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -126,85 +118,79 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -213,31 +199,22 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -259,8 +236,11 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -277,65 +257,39 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
@@ -347,17 +301,21 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/Logging_Test_i.o .obj/Logging_Test_i.so .shobj/Logging_Test_i.o .shobj/Logging_Test_i.so: Logging_Test_i.cpp \
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -383,258 +341,6 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/LoggerC.h \
@@ -644,11 +350,12 @@ Logging_Test:   $(addprefix $(VDIR),$(LOGGING_TEST_OBJS))
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Context.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Logger/README b/TAO/orbsvcs/tests/Logger/README
index 64a11da2ede..430e9d3442d 100644
--- a/TAO/orbsvcs/tests/Logger/README
+++ b/TAO/orbsvcs/tests/Logger/README
@@ -14,12 +14,13 @@ server.
 The test demonstrates the functionality of the logging service. The
 client program will generate 4 logging messages which will be logged
 to the screen. The first message will be in the "verbose_lite"
-format. The rest will be fully verbose messages. Successful output is:
+format. The rest will be fully verbose messages. Successful output is
 
 LM_DEBUG@::log() test (1) 
-Mar  8 16:31:06.000 1999@128.252.165.142@822@LM_EMERGENCY@::log() test (2) 
-Mar  8 16:31:06.000 1999@128.252.165.142@822@LM_INFO@::logv() test (3) 
-Mar  8 16:31:06.000 1999@128.252.165.142@822@LM_EMERGENCY@::log2() test (4) 
+Nov 12 14:20:02.0 1998@lambada-hme0@13670@LM_EMERGENCY@::log() test (2) 
+Nov 12 14:20:02.0 1998@lambada-hme0@13670@LM_INFO@::logv() test (3) 
+Nov 12 14:20:02.0 1998@lambada-hme0@13670@LM_EMERGENCY@::log2() test (4) 
+
 
 server: ------
 
diff --git a/TAO/orbsvcs/tests/Logger/client_i.cpp b/TAO/orbsvcs/tests/Logger/client_i.cpp
index d5d275ef890..02003a5f608 100644
--- a/TAO/orbsvcs/tests/Logger/client_i.cpp
+++ b/TAO/orbsvcs/tests/Logger/client_i.cpp
@@ -31,34 +31,34 @@ Logger_Client::init (int argc, char *argv[])
     {
       // Initialize the ORB
       orb_ = CORBA::ORB_init (argc,
-                              argv,
-                              "internet",
-                              TAO_TRY_ENV);
+			      argv,
+			      "internet",
+			      TAO_TRY_ENV);
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "\nTrying to initialize orb\n"));
-
+	ACE_DEBUG ((LM_DEBUG,
+		    "\nTrying to initialize orb\n"));
+      
       TAO_CHECK_ENV;
       if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "\nOrb initialized successfully\n"));
-
+	ACE_DEBUG ((LM_DEBUG,
+		    "\nOrb initialized successfully\n"));
+    
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
         return -1;
 
       // Initialize the naming service
       if (this->init_naming_service (TAO_TRY_ENV) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize naming"
-                           "services.\n"),
-                          -1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   " (%P|%t) Unable to initialize naming"
+			   "services.\n"),
+			  -1);
       // Create the logger instances
       if (this->init_loggers (TAO_TRY_ENV) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize logger"
-                           "instances.\n"),
-                          -1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   " (%P|%t) Unable to initialize logger"
+			   "instances.\n"),
+			  -1);
     }
   TAO_CATCHANY
     {
@@ -66,9 +66,9 @@ Logger_Client::init (int argc, char *argv[])
       return -1;
     }
   TAO_ENDTRY;
-
+  
   return 0;
-
+  
 }
 
 int
@@ -77,54 +77,54 @@ Logger_Client::init_naming_service (CORBA::Environment &env)
   // Initialize the naming services
   if (my_name_client_.init (orb_) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
-                      -1);
-
+		       " (%P|%t) Unable to initialize "
+		       "the TAO_Naming_Client. \n"),
+		      -1);
+  
   // Resolve an instance of the Logger_Factory
   CosNaming::Name factory_name (1);
   factory_name.length (1);
   factory_name[0].id = CORBA::string_dup ("logger_factory");
-
+  
   CORBA::Object_var factory_ref =
     my_name_client_->resolve (factory_name,
-                              env);
+			      env);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "\nFactory_ref resolved\n"));
-
+		"\nFactory_ref resolved\n"));
+      
   if (CORBA::is_nil (factory_ref.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "resolved to nil object"),
-                      -1);
+		       "resolved to nil object"),
+		      -1);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "\nLogger_Factory resolved\n"));
+		"\nLogger_Factory resolved\n"));
 
   // Narrow the factory and check the success
   factory_ =
     Logger_Factory::_narrow (factory_ref.in (),
-                             env);
+			     env);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "\nFactory narrowed\n"));
+		"\nFactory narrowed\n"));
   if (CORBA::is_nil (factory_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "narrow returned nil"),
-                      -1);
+		       "narrow returned nil"),
+		      -1);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "\nLogger_Factory narrowed\n"));
+		"\nLogger_Factory narrowed\n"));
 
-  // If debugging, get the factory's IOR
+  // If debugging, get the factory's IOR 
   CORBA::String_var str =
     orb_->object_to_string (factory_.in (),
-                            env);
+			    env);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "The factory IOR is <%s>\n",
-                str.in ()));
+		"The factory IOR is <%s>\n",
+		str.in ()));   
   return 0;
 }
 
@@ -134,23 +134,23 @@ Logger_Client::init_loggers (CORBA::Environment &env)
   // Retrieve the Logger obj ref corresponding to key1 and
   // key2.
   this->logger_1_ = factory_->make_logger ("key1",
-                                           env);
+					   env);
   this->logger_2_ = factory_->make_logger ("key2",
-                                           env);
-
+					   env);
+  
   if (CORBA::is_nil (this->logger_1_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "nil logger1"),
-                      -1);
-
+		       "nil logger1"),
+		      -1);
+  
   if (CORBA::is_nil (this->logger_2_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "nil logger2"),
-                      -1);
+		       "nil logger2"),
+		      -1);
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                "Created two loggers\n"));
+		"Created two loggers\n"));      
   return 0;
 }
 
@@ -191,7 +191,7 @@ Logger_Client::run (void)
       // Change the verbosity.
       this->logger_1_->verbosity (Logger::VERBOSE_LITE, TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       // Log the first Log_Record
       this->logger_1_->log (rec1, TAO_TRY_ENV);
       TAO_CHECK_ENV;
@@ -232,7 +232,7 @@ Logger_Client::parse_args (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s"
                            " [-d]"
-                           "\n"
+			   "\n"
                            "    -d: increase debug level\n",
                            this->argv_ [0]),
                           -1);
@@ -249,7 +249,7 @@ Logger_Client::init_record (Logger::Log_Record &newrec,
                             const char *msg)
 {
   // Copy the message data into newrec.
-  newrec.msg_data = CORBA::string_dup (msg);
+  newrec.msg_data = CORBA::string_copy (msg);
 
   // Assign the log priority.
   newrec.type = lp;
diff --git a/TAO/orbsvcs/tests/Logger/run_test.pl b/TAO/orbsvcs/tests/Logger/run_test.pl
index bf052ebdb58..bbacd0be9ee 100755
--- a/TAO/orbsvcs/tests/Logger/run_test.pl
+++ b/TAO/orbsvcs/tests/Logger/run_test.pl
@@ -1,10 +1,8 @@
+# $Id$
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 $tao_root = $ENV{TAO_ROOT};
 # This is a Perl script that runs the Logger client and server
 
@@ -19,7 +17,7 @@ sub service
 {
   my $args = "";
   my $prog = $EXEPREFIX."$tao_root/orbsvcs/Logging_Service/Logging_Service"
-      .$Process::EXE_EXT;
+      .$Process::EXE_EXT;    
   $SV = Process::Create ($prog, $args);
 }
 
@@ -28,7 +26,7 @@ sub test
 {
   my $args = "";
   my $prog = $EXEPREFIX."Logging_Test".$Process::EXE_EXT;
-
+    
   system ("$prog $args");
 }
 
diff --git a/TAO/orbsvcs/tests/Logger/svc.conf b/TAO/orbsvcs/tests/Logger/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/Logger/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Makefile b/TAO/orbsvcs/tests/Makefile
index cb6c4e9d3a3..4108f7de43f 100644
--- a/TAO/orbsvcs/tests/Makefile
+++ b/TAO/orbsvcs/tests/Makefile
@@ -17,14 +17,13 @@ DIRS  =	Simple_Naming \
 	EC_Custom_Marshal \
 	EC_Basic \
 	Concurrency \
-	Trading \
-	Property \
-	CosEC_Basic \
-	CosEC_Multiple \
-	ImplRepo \
-	Sched_Conf \
-	Time \
-	Event
+	Trading
+
+ifdef av
+## Add the implementation files 
+DIRS += AVStreams\
+	CosPropertyService
+endif
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
deleted file mode 100644
index 4683ba2c7c2..00000000000
--- a/TAO/orbsvcs/tests/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for TAO's ORB Services Tests
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        AVStreams \
-        Concurrency \
-        CosEC_Basic \
-        CosEC_Multiple \
-        EC_Basic \
-        EC_Custom_Marshal \
-        EC_Mcast \
-        EC_Multiple \
-        EC_Throughput \
-        Event_Latency \
-        ImplRepo \
-        Logger \
-        Property \
-        Sched \
-        Sched_Conf \
-        Simple_Naming \
-        Simulator \
-        Time \
-        Trading
-
-noinst_SCRIPTS = start_services
-
-EXTRA_DIST = $(noinst_SCRIPTS)
-
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index 2186d9f72b0..b757539febb 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -1,12 +1,12 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Top-level Makefile for the CosPropertyService Demo.
+#	Top-level Makefile for the CosPropertyService Demo.
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 LDLIBS     = -lorbsvcs -lTAO
@@ -15,19 +15,13 @@ CosProperty_SERVER_OBJS = server.o
 CosProperty_CLIENT_OBJS = client.o
 SRC=server.cpp client.cpp
 
+BIN = server client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2 = server client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Property,$(findstring Property,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Property
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -49,121 +43,93 @@ server:$(addprefix $(VDIR),$(CosProperty_SERVER_OBJS))
 client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
+realclean: clean
+	-/bin/rm -rf
+
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.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 \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
  $(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/Mem_Map.h \
+ $(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/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/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 \
@@ -175,94 +141,38 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -275,69 +185,97 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -351,22 +289,26 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
@@ -392,12 +334,10 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/Containers.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 \
@@ -422,9 +362,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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 \
@@ -448,15 +385,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -478,169 +407,121 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(TAO_ROOT)/tao/TAO.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/corba.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 \
+ $(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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.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/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 \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.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/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
@@ -654,11 +535,12 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Property/PropertyTest.dsw b/TAO/orbsvcs/tests/Property/PropertyTest.dsw
deleted file mode 100644
index d17cf7c9604..00000000000
--- a/TAO/orbsvcs/tests/Property/PropertyTest.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/orbsvcs/tests/Property/README b/TAO/orbsvcs/tests/Property/README
index 6ff16d26744..77be4c63db3 100644
--- a/TAO/orbsvcs/tests/Property/README
+++ b/TAO/orbsvcs/tests/Property/README
@@ -1,7 +1,7 @@
 This tests TAO's CosPropertyService implementation.
 
 Please report bugs/comments to <alex@cs.wustl.edu> and
-                               <ace-users@cs.wustl.edu>        
+                                <ace-users@cs.wustl.edu>        
 
 To compile:
 ==========
@@ -23,7 +23,7 @@ same host.
 Naming Service:
 --------------
 
-% $TAO_ROOT/orbsvcs/Naming_Service/Naming_Service [-ORBnameserviceport <portnum>]
+% $TAO_ROOT/orbsvcs/NamingService/NamingService [-ORBnameserviceport <portnum>]
 
 Server:
 -----
@@ -35,8 +35,3 @@ Client:
 % client        [-ORBnameserviceport <portnum>]
         
 <portnum> is same everywhere.
-
-
-Expected Result:
-----------------
-If everything goes well, client prints "Test Succeeded". 
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 2a564b1e9dc..e669856bdcb 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -1,4 +1,4 @@
- // $Id$
+// $Id$
 
 // ============================================================================
 //
@@ -27,13 +27,13 @@ ACE_RCSID(CosPropertyService, client, "$Id$")
 int
 Client::init (int argc,
               char *argv[],
-              CORBA::Environment &ACE_TRY_ENV)
+              CORBA::Environment &env)
 {
   // Init the ORB.
   manager_.init (argc,
                  argv,
-                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                 env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Open the ORB.
   manager_.orb ()->open ();
@@ -51,91 +51,91 @@ Client::init (int argc,
   propsetdef_name.length (1);
   propsetdef_name [0].id = CORBA::string_dup ("PropertySetDef");
   CORBA::Object_var propsetdef_obj = my_name_client_->resolve (propsetdef_name,
-                                                               ACE_TRY_ENV);
-  ACE_CHECK_RETURN (1);
+							       env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   ACE_DEBUG ((LM_DEBUG, "Naming resolve done\n"));
 
   this->propsetdef_ = CosPropertyService::PropertySetDef::_narrow (propsetdef_obj.in (),
-                                                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+                                                                   env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   if (CORBA::is_nil (this->propsetdef_.in ()))
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Couldnot resolve propsetdef in Naming server"),
                       -1);
-
+  
   return 0;
 }
 
 // Testing the methods of the property service.
 
 int
-Client::property_tester (CORBA::Environment &ACE_TRY_ENV)
+Client::property_tester (CORBA::Environment &env)
 {
   // = Testing PropertySet & Iterators.
 
   // Testing define_property () of PropertySet interface.
-  this->test_define_property (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_define_property (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_property_names (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Test get_property_value.
-  this->test_get_property_value (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_property_value (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing delete property.
-  this->test_delete_property ("no_property",ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_delete_property ("no_property",env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing get_properties.
-  this->test_get_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing delete_properties.
-  this->test_delete_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_delete_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing define_properties.
-  this->test_define_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_define_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Test the number of properties.
-  this->test_get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_number_of_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing get_all_property_names.
-  this->test_get_all_property_names (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_property_names (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Testing get_all_properties.
-  this->test_get_all_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+  this->test_get_all_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // = Testing PropertySetDef & Iterators.
 
   // Testing define_property_with_mode.
-  this->test_define_property_with_mode (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+  this->test_define_property_with_mode (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  
   return 0;
 }
 
 // Testing define_property.
 
 int
-Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_property (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
@@ -152,15 +152,15 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Char ch = %c\n",
               ch));
   this->propsetdef_->define_property ("char_property",
-                                      anyval,
-                                      ACE_TRY_ENV);
+				      anyval,
+				      env);
 
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -173,15 +173,15 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Short s = %d\n",
               s));
   propsetdef_->define_property ("short_property",
-                                anyval,
-                                ACE_TRY_ENV);
+				anyval,
+				env);
 
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -194,15 +194,15 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property ("long_property",
-                                anyval,
-                                ACE_TRY_ENV);
+				anyval,
+				env);
 
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -214,15 +214,15 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Float f = %f\n",
               f));
   propsetdef_->define_property ("float_property",
-                                anyval,
-                                ACE_TRY_ENV);
+				anyval,
+				env);
 
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a String and "define" that in the PropertySet.
@@ -237,15 +237,15 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               strvar.in (),
               newstr));
   propsetdef_->define_property ("string_property",
-                                anyval,
-                                ACE_TRY_ENV);
+				anyval,
+				env);
 
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("string_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("string_property");
+      env.clear ();
     }
 
   return 0;
@@ -254,39 +254,39 @@ Client::test_define_property (CORBA::Environment &ACE_TRY_ENV)
 // Testing get_all_property_names of the PropertySet.
 
 int
-Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_all_property_names (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting get_all_property_names ()\n"));
 
   // Get the size.
   CORBA::ULong num_of_properties =
-    propsetdef_->get_number_of_properties (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
+    propsetdef_->get_number_of_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Get half on the names and half of on the iterator.
   CORBA::ULong how_many = num_of_properties / 2;
-
+  
   // The extra ptr's and out's required to avoind SunnCC's warning
   // when foo.out () is passed to a funtion.
   CosPropertyService::PropertyNames_var names_var;
   CosPropertyService::PropertyNames_ptr names_ptr = 0;
   CosPropertyService::PropertyNames_out names_out (names_ptr);
-
+  
   CosPropertyService::PropertyNamesIterator_var iterator_var;
   CosPropertyService::PropertyNamesIterator_ptr iterator_ptr;
   CosPropertyService::PropertyNamesIterator_out iterator_out (iterator_ptr);
-
+  
   propsetdef_->get_all_property_names (how_many,
                                        names_out,
                                        iterator_out,
-                                       ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                       env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  
   // Get the values back to var.
   names_var = names_out.ptr ();
   iterator_var = iterator_out.ptr ();
-
+  
   // Print out the names in the names-sequence.
   if (names_var.ptr () != 0)
     {
@@ -302,31 +302,31 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
   if (iterator_var.ptr () != 0)
     {
       // Helper variables to stop the SunCC warnings on on foo.out
-      // ().
+      // (). 
       CosPropertyService::PropertyName  name_ptr = 0;
       CosPropertyService::PropertyName_out name_out (name_ptr);
-
+      
       // Call the function.
-      CORBA::Boolean next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
-
+      CORBA::Boolean next_one_result = iterator_var->next_one (name_out, env);
+      
       // Get the values back on a _var variable.
       CosPropertyService::PropertyName_var name_var = name_out.ptr ();
-
+      
       while (next_one_result == 1)
         {
-          ACE_CHECK_RETURN (-1);
+          TAO_CHECK_ENV_RETURN (env, -1);
           ACE_DEBUG ((LM_DEBUG, "%s\n", name_var.in ()));
-
+          
           // Call the function to iterate again.
-          next_one_result = iterator_var->next_one (name_out, ACE_TRY_ENV);
-
+          next_one_result = iterator_var->next_one (name_out, env);
+          
           // Get the values back on a _var variable.
           name_var = name_out.ptr ();
         }
 
-      ACE_CHECK_RETURN (-1);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-
+  
   return 0;
 }
 
@@ -334,7 +334,7 @@ Client::test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV)
 // properties.
 
 int
-Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_properties (CORBA::Environment &env)
 {
   // Get float_property, string_property and no_property. If return
   // value is false and type is tc_void then that name is not there in
@@ -362,13 +362,12 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
   // Get the properties.
   CORBA::Boolean return_val = propsetdef_->get_properties (names.in (),
                                                            properties_out,
-                                                           ACE_TRY_ENV);
-  ACE_UNUSED_ARG (return_val);
-  ACE_CHECK_RETURN (-1);
-
+                                                           env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  
   // Get the value to the _var.
   CosPropertyService::Properties_var properties = properties_out.ptr ();
-
+  
   if (properties.ptr () != 0)
     {
       // Go thru the properties and print them out, if they are not
@@ -392,12 +391,12 @@ Client::test_get_properties (CORBA::Environment &ACE_TRY_ENV)
 // Testing, get_number_of_properties.
 
 int
-Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_number_of_properties (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nNumber of props : %d\n",
-              this->propsetdef_->get_number_of_properties (ACE_TRY_ENV)));
-  ACE_CHECK_RETURN (-1);
+              this->propsetdef_->get_number_of_properties (env)));
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   return 0;
 }
@@ -406,29 +405,26 @@ Client::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
 
 int
 Client::test_delete_property (CORBA::String property_name,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   ACE_DEBUG ((LM_DEBUG, "\nDeleting %s\n",property_name));
 
-  ACE_TRY
+  TAO_TRY
     {
-      this->propsetdef_->delete_property (property_name,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->propsetdef_->delete_property (property_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::UserException, ex)
+  TAO_CATCH (CORBA::UserException, ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "User exception");
+      TAO_TRY_ENV.print_exception ("User exception");
       return -1;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ex, "Not an user exception");
+      TAO_TRY_ENV.print_exception ("Not an user exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -439,7 +435,7 @@ Client::test_delete_property (CORBA::String property_name,
 // properties.
 
 int
-Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_delete_properties (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties\n"));
@@ -454,8 +450,8 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
               prop_names.length (),
               prop_names.maximum ()));
   this->propsetdef_->delete_properties (prop_names,
-                                        ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 0);
+					env);
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   return 0;
 }
@@ -464,7 +460,7 @@ Client::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
 // float in the property set.
 
 int
-Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_properties (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties\n"));
@@ -476,7 +472,7 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   anyval <<= CORBA::Any::from_char (ch);
   ch = '*';
   anyval >>= CORBA::Any::to_char (ch);
-  nproperties[0].property_name  = CORBA::string_dup ("char_property");
+  nproperties[0].property_name  = CORBA::string_copy ("char_property");
   nproperties[0].property_value <<= CORBA::Any::from_char (ch);
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -484,7 +480,7 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   anyval <<= s;
   s = 7;
   anyval >>= s;
-  nproperties[1].property_name  = CORBA::string_dup ("short_property");
+  nproperties[1].property_name  = CORBA::string_copy ("short_property");
   nproperties[1].property_value <<= s;
 
   // Prepare a Long and "define" that in the PropertySet.
@@ -492,7 +488,7 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   anyval <<= l;
   l = 931233;
   anyval >>= l;
-  nproperties[2].property_name  = CORBA::string_dup ("long_property");
+  nproperties[2].property_name  = CORBA::string_copy ("long_property");
   nproperties[2].property_value <<= l;
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -500,12 +496,12 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   anyval <<= f;
   f = 4.14F;
   anyval >>= f;
-  nproperties[3].property_name  = CORBA::string_dup ("float_property");
+  nproperties[3].property_name  = CORBA::string_copy ("float_property");
   nproperties[3].property_value <<= f;
 
   // Define this sequence of properties now.
-  this->propsetdef_->define_properties (nproperties, ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( -1);
+  this->propsetdef_->define_properties (nproperties, env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   return 0;
 }
@@ -513,15 +509,14 @@ Client::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
 // Test get_all_properties.
 
 int
-Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_all_properties (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting get_all_properties\n"));
   // Get the number of current properties.
   CORBA::ULong num_of_properties =
-    this->propsetdef_->get_number_of_properties (ACE_TRY_ENV);
-  ACE_UNUSED_ARG (num_of_properties);
-  ACE_CHECK_RETURN ( -1);
+    this->propsetdef_->get_number_of_properties (env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Get half on the properties and half of on the iterator.
   CORBA::ULong how_many = 1;
@@ -531,17 +526,17 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
   CosPropertyService::Properties_out properties_out (properties_ptr);
   CosPropertyService::PropertiesIterator_ptr iterator_ptr = 0;
   CosPropertyService::PropertiesIterator_out iterator_out (iterator_ptr);
-
+  
   propsetdef_->get_all_properties (how_many,
                                    properties_out,
                                    iterator_out,
-                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( -1);
-
+                                   env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  
   // Get these values to the _var's.
   CosPropertyService::Properties_var properties = properties_out.ptr ();
   CosPropertyService::PropertiesIterator_var iterator = iterator_out.ptr ();
-
+  
   // Print out the properties now.
   if (properties.ptr () != 0)
     {
@@ -587,18 +582,18 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
       // Helper variables to avoid warnings with .out () in SunCC.
       CosPropertyService::Property* property_ptr = 0;
       CosPropertyService::Property_out property_out (property_ptr);
-
+      
       // Call the funtion.
       CORBA::Boolean next_one_result = iterator->next_one (property_out,
-                                                           ACE_TRY_ENV);
-
+                                                           env); 
+      
       // Get the value to the _var variable.
       CosPropertyService::Property_var property = property_out.ptr ();
 
       while (next_one_result != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Iteration over PropertyIterartor"));
-          ACE_CHECK_RETURN ( -1);
+          TAO_CHECK_ENV_RETURN (env, -1);
           ACE_DEBUG ((LM_DEBUG,
                       "%s : ",
                       property->property_name.in ()));
@@ -638,23 +633,22 @@ Client::test_get_all_properties (CORBA::Environment &ACE_TRY_ENV)
               property->property_value >>= l;
               ACE_DEBUG ((LM_DEBUG,"%d\n", l));
             }
-
+          
           // Call the function for the next iteraton.
           next_one_result = iterator->next_one (property_out,
-                                                ACE_TRY_ENV);
-
+                                                env); 
+      
           // Get the value to the _var variable.
           property = property_out.ptr ();
         }
-      ACE_CHECK_RETURN ( -1);
+      TAO_CHECK_ENV_RETURN (env, -1);
     }
-  return 0;
 }
 
 // Testing define property with mode.
 // Defines char, short, long and float properties with different modes.
 int
-Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
+Client::test_define_property_with_mode (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property_with_mode\n"));
@@ -673,13 +667,13 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
                                                 CosPropertyService::normal,
-                                                ACE_TRY_ENV);
+                                                env);
   // Check if that is an user exception, if so, print it out.
-  if ((ACE_TRY_ENV.exception () != 0) &&
-      (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0))
+  if ((env.exception () != 0) &&
+      (CORBA::UserException::_narrow (env.exception ()) != 0))
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      env.clear ();
     }
 
   // Prepare a Short and "define" that in the PropertySet.
@@ -694,13 +688,13 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
   propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
                                           CosPropertyService::read_only,
-                                          ACE_TRY_ENV);
+                                          env);
   // Check if that is an user exception, if so, print it out.
-  if (ACE_TRY_ENV.exception () != 0)
+  if (env.exception () != 0)
     {
-      ACE_TRY_ENV.print_exception ("char_property");
-      if (CORBA::UserException::_narrow (ACE_TRY_ENV.exception ()) != 0)
-        ACE_TRY_ENV.clear ();
+      env.print_exception ("char_property");
+      if (CORBA::UserException::_narrow (env.exception ()) != 0)
+        env.clear ();
       else
         return -1;
     }
@@ -716,10 +710,10 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
               l));
   CORBA::Any newany(anyval);
   propsetdef_->define_property_with_mode ("long_property",
-                                          anyval,
-                                          CosPropertyService::fixed_normal,
-                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( -1);
+					  anyval,
+					  CosPropertyService::fixed_normal,
+					  env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
 
   // Prepare a Float and "define" that in the PropertySet.
@@ -731,10 +725,10 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
               "Main : Float f = %f\n",
               f));
   propsetdef_->define_property_with_mode ("float_property",
-                                          anyval,
-                                          CosPropertyService::fixed_readonly,
-                                          ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( -1);
+					  anyval,
+					  CosPropertyService::fixed_readonly,
+					  env);
+  TAO_CHECK_ENV_RETURN (env, -1);
 
   // Prepare a String and "define" that in the PropertySet.
   ACE_DEBUG ((LM_DEBUG,
@@ -750,36 +744,34 @@ Client::test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV)
               newstr));
   propsetdef_->define_property  ("string_property",
                                  anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( -1);
-
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, -1);
+  
   return 0;
 }
 
 int
-Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
+Client::test_get_property_value (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   ACE_DEBUG ((LM_DEBUG, "Testing get_property_value\n"));
 
-  ACE_TRY
+  TAO_TRY
     {
       // Get the ior property.
       CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR",
-                                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+                                                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       ACE_DEBUG ((LM_DEBUG, "Property value received successfully\n"));
 
       // Check whether the IOR is fine.
       CORBA::Object_var propsetdef_object;
-      (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object.out ());
-
+      (*any_ptr) >>= CORBA::Any::to_object (propsetdef_object);
+      
       CosPropertyService::PropertySetDef_var propsetdef =
         CosPropertyService::PropertySetDef::_narrow (propsetdef_object.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (propsetdef.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -788,46 +780,38 @@ Client::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
 
       ACE_DEBUG ((LM_DEBUG, "IOR retrieved\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "get_property_value");
+      TAO_TRY_ENV.print_exception ("get_property_value");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (1);
-  return 0;
+  TAO_ENDTRY;
 }
 
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  ACE_TRY
+  TAO_TRY
     {
       Client client;
 
       if (client.init (argc,
                        argv,
-                       ACE_TRY_ENV) == -1)
+                       TAO_TRY_ENV) == -1)
         return 1;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      //  client.run (ACE_TRY_ENV);
-      if (client.property_tester (ACE_TRY_ENV) != 0)
+      //  client.run (TAO_TRY_ENV);
+      if (client.property_tester (TAO_TRY_ENV) != 0)
         ACE_DEBUG ((LM_DEBUG, "Test failed\n"));
       else
         ACE_DEBUG ((LM_DEBUG, "Test succeeded\n"));
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "PropertyService Test : client");
+      TAO_TRY_ENV.print_exception ("PropertyService Test : client");
       return -1;
     }
- ACE_ENDTRY;
-
-  return 0;
+  TAO_ENDTRY;
 }
diff --git a/TAO/orbsvcs/tests/Property/client.dsp b/TAO/orbsvcs/tests/Property/client.dsp
deleted file mode 100644
index d70b11282fd..00000000000
--- a/TAO/orbsvcs/tests/Property/client.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=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 NMAKE /f "client.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 "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "client - 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 ""

-# PROP Intermediate_Dir ""

-# 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 "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "client - 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 "Debug"

-# 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 "..\..\..\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\client.h

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 9abb9bd0ca5..dab07813f50 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -46,52 +46,52 @@ public:
 
   int init (int argc,
             char **argv,
-            CORBA::Environment &ACE_TRY_ENV);
+            CORBA::Environment &env);
   // Initialize the ORB etc, and bind the MMDevices.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (CORBA::Environment &env);
   // Run the client.  This will call StreamCtrl::bind_devs.
 
-  int property_tester (CORBA::Environment &ACE_TRY_ENV);
+  int property_tester (CORBA::Environment &env);
   // Testing  the property service methods.
 
 protected:
   int bind_to_remote_mmdevice (int argc,
                                char *argv[],
-                               CORBA::Environment &ACE_TRY_ENV);
+                               CORBA::Environment &env);
   // Bind to the remote MMDevice.
 
   // = Property Testing.
 
-  int test_define_property (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_property (CORBA::Environment &env);
   // Testing the define property method.
 
-  int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_number_of_properties (CORBA::Environment &env);
   // Testing the number of properties, currently in the Property Set.
 
-  int test_get_all_property_names (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_all_property_names (CORBA::Environment &env);
   //Testing get_all_property_names.
 
-  int test_get_property_value (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_property_value (CORBA::Environment &env);
   // Testing get_property_value.
 
-  int test_get_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_properties (CORBA::Environment &env);
   //Testing get_properties.  Give the names and get their properties.
 
-  int test_get_all_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_get_all_properties (CORBA::Environment &env);
   // Testing get_all_properties.
 
   int test_delete_property (CORBA::String property_name,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &env);
   // Testing delete_property.
 
-  int test_delete_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_delete_properties (CORBA::Environment &env);
   // Testing delete_properties.
 
-  int test_define_properties (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_properties (CORBA::Environment &env);
   // Defining a sequence of properties.
 
-  int test_define_property_with_mode (CORBA::Environment &ACE_TRY_ENV);
+  int test_define_property_with_mode (CORBA::Environment &env);
   // Defines properties with various modes.
 
   TAO_ORB_Manager manager_;
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index 639cfc6c116..eb739fae1d6 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -2,18 +2,18 @@
 
 // ========================================================================
 //
-// = FILE
+// = FILE  
 //     Program to test the property services.
 //
 // = DESCRIPTION
 //     Here all the objects are at one address space. See the
 //     client.cpp and server.cpp to see property calls on remote
-//     objects.
+//     objects. 
 //
 // = AUTHOR
 //     Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
-// ========================================================================
+// ======================================================================== 
 
 #include "orbsvcs/CosPropertyServiceS.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
@@ -36,35 +36,35 @@ public:
 
   TAO_PropertySet_Tester (void);
   // Constructor.
-
+  
   ~TAO_PropertySet_Tester (void);
   // Destructor.
-
-  int test_define_property (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_define_property (CORBA::Environment &env);
   // Defines a char,a short, a long, a float and a string property.
-
-  int test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_get_number_of_properties (CORBA::Environment &env);
   // Gets the number of properties currently defined in the PropertySet.
-
+  
   int test_delete_property (const char *property_name,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &env);
   // Delete a given property.
-
-  int test_is_property_defined (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_is_property_defined (CORBA::Environment &env);
   // Check the following properties are defined or
   // no. "char_property", "short_property" and a "string_property".
-
-  int test_get_property_value (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_get_property_value (CORBA::Environment &env);
   // Get the "float_property" and "string_property" and print them
   // out.
-
-  int test_delete_properties (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_delete_properties (CORBA::Environment &env);
   // Delete char, short,long, and string properties.
-
-  int test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_delete_all_properties (CORBA::Environment &env);
   // Delete all the properties.
-
-  int test_define_properties (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_define_properties (CORBA::Environment &env);
   // Define a sequence of properties. a char, a short, a long, a float
   // and a string.
 
@@ -73,7 +73,7 @@ private:
   // The PropertySet.
 };
 
-class TAO_PropertyNamesIterator_Tester
+class TAO_PropertyNamesIterator_Tester 
 {
   // = TITLE
   //     The testing code for the PropertyNamesIterator interface are grouped
@@ -85,18 +85,18 @@ class TAO_PropertyNamesIterator_Tester
 public:
   TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester);
   // Constructor. To make names iterator from the property set object.
-
+  
   ~TAO_PropertyNamesIterator_Tester (void);
   // Destructor.
 
-  int test_next_one (CORBA::Environment &ACE_TRY_ENV);
+  int test_next_one (CORBA::Environment &env);
   // Test next one method. Iterate thru all the names in the
   // PropertySet and print them out.
-
-  int test_reset (CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_reset (CORBA::Environment &env);
   // Test the reset method.
-
-  int test_next_n (size_t n, CORBA::Environment &ACE_TRY_ENV);
+  
+  int test_next_n (size_t n, CORBA::Environment &env);
   // Test the next_n method.
 private:
   TAO_PropertyNamesIterator iterator_;
@@ -116,13 +116,13 @@ TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void)
 
 // Defines a char, a short, a long, a float and a string.
 int
-TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_define_property (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_property\n"));
-
+  
   CORBA::Any anyval;
-
+  
   // Prepare a char and "define" that in the PropertySet.
   CORBA::Char ch = '#';
   anyval <<= from_char (ch);
@@ -133,23 +133,23 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               ch));
   property_set_.define_property ("char_property",
                                  anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
-
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
+  
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
-  anyval <<= s;
-  s = 7;
+  anyval <<= s; 
+  s = 7; 
   anyval >>= s;
   ACE_DEBUG ((LM_DEBUG,
               "Main : Short s = %d\n",
               s));
   property_set_.define_property ("short_property",
                                  anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
-
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
+  
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
   anyval <<= l;
@@ -159,12 +159,12 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               "Main : Long l = %d\n",
               l));
   CORBA::Any newany(anyval);
-
+  
   property_set_.define_property ("long_property",
                                  anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
-
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
+  
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14;
   anyval <<= f;
@@ -173,11 +173,11 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
   ACE_DEBUG ((LM_DEBUG,
               "Main : Float f = %f\n",
               f));
-  property_set_.define_property ("float_property",
-                                 anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
-
+  property_set_.define_property ("float_property", 
+                                 anyval, 
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
+  
   // Prepare a String and "define" that in the PropertySet.
   ACE_DEBUG ((LM_DEBUG,
               "Main: Any holding String\n"));
@@ -191,20 +191,20 @@ TAO_PropertySet_Tester::test_define_property (CORBA::Environment &ACE_TRY_ENV)
               newstr));
   property_set_.define_property ("string_property",
                                  anyval,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   return 0;
 }
 
 // Testing, get_number_of_properties.
 int
-TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &env)
 {
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               "Main : Number of props : %d\n",
-              property_set_.get_number_of_properties (ACE_TRY_ENV)));
-  ACE_CHECK_RETURN ( 1);
+              property_set_.get_number_of_properties (env)));
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   return 0;
 }
@@ -213,12 +213,12 @@ TAO_PropertySet_Tester::test_get_number_of_properties (CORBA::Environment &ACE_T
 // if that exsists.
 int
 TAO_PropertySet_Tester::test_delete_property (const char *property_name,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                              CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG, "\nChecking delete_property\n"));
   property_set_.delete_property (property_name,
-                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
+                                 env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   return 0;
 }
@@ -226,15 +226,15 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name,
 // Gets the value of "short_property" and "string_property".
 
 int
-TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking get_property_value\n"));
-
+  
   CORBA::Any_ptr anyptr = property_set_.get_property_value ("short_property",
-                                                            ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
-
+                                                            env);
+  TAO_CHECK_ENV_RETURN (env, 1);
+  
   // Get the short value.
   if (anyptr != 0)
     {
@@ -249,8 +249,8 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV
                 "Short property not found\n"));
   // Get the string.
   anyptr = property_set_.get_property_value ("string_property",
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
+                                             env);
+  TAO_CHECK_ENV_RETURN (env, 1);
   if (anyptr != 0)
     {
       CORBA::String str;
@@ -258,7 +258,7 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV
       ACE_DEBUG ((LM_DEBUG,
                   "Str %s\n", str));
     }
-  else
+  else 
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not found\n"));
   return 0;
@@ -268,34 +268,34 @@ TAO_PropertySet_Tester::test_get_property_value (CORBA::Environment &ACE_TRY_ENV
 // "string_property" and "char_property".
 
 int
-TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking is_property_defined ()\n"));
   if (property_set_.is_property_defined ("short_property",
-                                         ACE_TRY_ENV) == 0)
+                                         env) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "short_property not defined\n"));
-  else
+  else 
     ACE_DEBUG ((LM_DEBUG,
                 "short_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
+  TAO_CHECK_ENV_RETURN (env, 1);
   if (property_set_.is_property_defined ("string_property",
-                                         ACE_TRY_ENV) == 0)
+                                         env) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "string_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "string_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
+  TAO_CHECK_ENV_RETURN (env, 1);
   if (property_set_.is_property_defined ("char_property",
-                                         ACE_TRY_ENV) == 0)
+                                         env) == 0)
     ACE_DEBUG ((LM_DEBUG,
                 "char_property not defined\n"));
   else
     ACE_DEBUG ((LM_DEBUG,
                 "char_property defined\n"));
-  ACE_CHECK_RETURN ( 1);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   return 0;
 }
@@ -304,7 +304,7 @@ TAO_PropertySet_Tester::test_is_property_defined (CORBA::Environment &ACE_TRY_EN
 // PropertySet.  Deleting char, short, long, float and string
 // properties.
 int
-TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_properties == Deleting a sequence of Properties\n"));
@@ -319,17 +319,17 @@ TAO_PropertySet_Tester::test_delete_properties (CORBA::Environment &ACE_TRY_ENV)
               prop_names.length (),
               prop_names.maximum ()));
   property_set_.delete_properties (prop_names,
-                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 0);
-
+                                   env);
+  TAO_CHECK_ENV_RETURN (env, 0);
+  
   return 0;
 }
 
 // Defines a sequnce of properties containing, char, short, long,
 // float and string property in the property set.
 int
-TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
-{
+TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &env)
+{  
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking define_properties == Defining sequence of properties\n"));
   //  TAO_TRY
@@ -341,55 +341,55 @@ TAO_PropertySet_Tester::test_define_properties (CORBA::Environment &ACE_TRY_ENV)
   CORBA::Char ch = '#';
   anyval <<= from_char (ch);
   ch = '*';
-  anyval >>= to_char (ch);
-  nproperties[0].property_name  = CORBA::string_dup ("char_property");
+  anyval >>= to_char (ch);  
+  nproperties[0].property_name  = CORBA::string_copy ("char_property");
   nproperties[0].property_value <<= from_char (ch);
-
+ 
   // Prepare a Short and "define" that in the PropertySet.
   CORBA::Short s = 3;
-  anyval <<= s;
-  s = 7;
+  anyval <<= s; 
+  s = 7; 
   anyval >>= s;
-  nproperties[1].property_name  = CORBA::string_dup ("short_property");
+  nproperties[1].property_name  = CORBA::string_copy ("short_property");
   nproperties[1].property_value <<= s;
-
+  
   // Prepare a Long and "define" that in the PropertySet.
   CORBA::Long l = 931232;
   anyval <<= l;
   l = 931233;
   anyval >>= l;
-  nproperties[2].property_name  = CORBA::string_dup ("long_property");
+  nproperties[2].property_name  = CORBA::string_copy ("long_property");
   nproperties[2].property_value <<= l;
-
+  
   // Prepare a Float and "define" that in the PropertySet.
   CORBA::Float f = 3.14;
   anyval <<= f;
   f = 4.14;
   anyval >>= f;
-  nproperties[3].property_name  = CORBA::string_dup ("float_property");
+  nproperties[3].property_name  = CORBA::string_copy ("float_property");
   nproperties[3].property_value <<= f;
-
+  
   // Prepare a String and "define" that in the PropertySet.
   CORBA::String_var strvar (CORBA::string_dup ("Test_String"));
   anyval <<= strvar.in ();
-  nproperties[4].property_name  = CORBA::string_dup ("string_property");
+  nproperties[4].property_name  = CORBA::string_copy ("string_property");
   nproperties[4].property_value <<= strvar.in ();
-
+  
   // Define this sequence of properties now.
-  property_set_.define_properties (nproperties, ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
+  property_set_.define_properties (nproperties, env);
+  TAO_CHECK_ENV_RETURN (env, 1);
 
   return 0;
 }
 
 // Delete all the properties.
 int
-TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &env)
 {
-  // Deleting all the properties
+  // Deleting all the properties 
   ACE_DEBUG ((LM_DEBUG,
               "\nChecking delete_all_properties\n"));
-  if (property_set_.delete_all_properties (ACE_TRY_ENV) == 1)
+  if (property_set_.delete_all_properties (env) == 1)
     ACE_DEBUG ((LM_DEBUG,
                 "All properties deleted, I guess\n"));
   else
@@ -402,7 +402,7 @@ TAO_PropertySet_Tester::test_delete_all_properties (CORBA::Environment &ACE_TRY_
 TAO_PropertyNamesIterator_Tester::TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester)
   : iterator_ (propertyset_tester.property_set_)
 {
-}
+}  
 
 // Destructor.
 TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
@@ -411,16 +411,16 @@ TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void)
 
 // Test next one method. Iterate thru all the names in the
 // PropertySet and print them out.
-int
-TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV)
+int 
+TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &env)
 {
   CORBA::String_var strvar;
   ACE_DEBUG ((LM_DEBUG,
               "\nTesting next_one of NamesIterator, Iterating thru names.\n"));
   // Let us iterate, now.
-  while (iterator_.next_one (strvar.out (), ACE_TRY_ENV) != 0)
-    {
-      ACE_CHECK_RETURN ( 1);
+  while (iterator_.next_one (strvar.out (), env) != 0)
+    { 
+      TAO_CHECK_ENV_RETURN (env, 1);
       ACE_DEBUG ((LM_DEBUG, "Str : %s\n", strvar.in ()));
     }
   return 0;
@@ -428,33 +428,33 @@ TAO_PropertyNamesIterator_Tester::test_next_one (CORBA::Environment &ACE_TRY_ENV
 
 // Reset the names iterator.
 int
-TAO_PropertyNamesIterator_Tester::test_reset (CORBA::Environment &ACE_TRY_ENV)
+TAO_PropertyNamesIterator_Tester::test_reset (CORBA::Environment &env)
 {
   ACE_DEBUG ((LM_DEBUG,
               "Resetting (reset ()) the NamesIterator."));
-  iterator_.reset (ACE_TRY_ENV);
-  ACE_CHECK_RETURN ( 1);
+  iterator_.reset (env);
+  TAO_CHECK_ENV_RETURN (env, 1);
   return 0;
 }
 
 // Test the next_n method. Get the next n names and print them all.
 int
 TAO_PropertyNamesIterator_Tester::test_next_n (size_t n,
-                                               CORBA::Environment &ACE_TRY_ENV)
+                                               CORBA::Environment &env)
 {
   CosPropertyService::PropertyNames_var pnames_var;
   ACE_DEBUG ((LM_DEBUG,
-              "Checking next_n (), next %d\n",
+              "Checking next_n (), next %d\n", 
               n));
-  if (iterator_.next_n (n, pnames_var.out (), ACE_TRY_ENV) == 0)
+  if (iterator_.next_n (n, pnames_var.out (), env) == 0)
     {
       // Return if no more items in the iterator.
-      ACE_CHECK_RETURN ( 1);
+      TAO_CHECK_ENV_RETURN (env, 1);
       ACE_DEBUG ((LM_DEBUG,
                   "Iterator has no more items\n"));
       return 0;
     }
-  ACE_CHECK_RETURN ( 1);
+  TAO_CHECK_ENV_RETURN (env, 1);
   for (size_t i = 0; i < pnames_var.in ().length (); i++)
     ACE_DEBUG ((LM_DEBUG,
                 "str %s \n",
@@ -462,120 +462,130 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n,
   return 0;
 }
 
-int
-main (int argc, char *argv [])
+int 
+main (int argc, char *argv []) 
 {
-  ACE_TRY
+  TAO_TRY
     {
       CORBA::ORB_var orb_var = CORBA::ORB_init (argc,
                                                 argv,
                                                 "internet",
-                                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // = Checking PropertySet interface.
-
+      
       ACE_DEBUG ((LM_DEBUG,
                   "\nTAO_PropertySet Testing\n"));
       TAO_PropertySet_Tester propertyset_tester;
-
+      
       // Checking define_property. define a char, a short,a long, a float
       // and a string.
-      propertyset_tester.test_define_property (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_define_property (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Test delete property. Delete "string_property"
-      propertyset_tester.test_delete_property ("string_property", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_delete_property ("string_property", TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+  
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Test delete_properties. Delete char, short, long and float.
-      propertyset_tester.test_delete_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_delete_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_define_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Checking get_property_value. get the value of short and string.
-      propertyset_tester.test_get_property_value (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_get_property_value (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Checking delete_all_properties.
-      propertyset_tester.test_delete_all_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_delete_all_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Define a sequence of properties. char, short, long, float and
       // string.
-      propertyset_tester.test_define_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_define_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Test the number of properties and print it out.
-      propertyset_tester.test_get_number_of_properties (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      propertyset_tester.test_get_number_of_properties (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // = Checking the PropertyNamesIterator interface.
-
+      
       ACE_DEBUG ((LM_DEBUG,
                   "\nTAO_PropertyNamesIterator Testing\n"));
-
+  
       // Construct the names iterator from the PropertySet object.
       TAO_PropertyNamesIterator_Tester names_iterator_tester (propertyset_tester);
-
+      
       // Checking next_one. Iterate thru the property names.
-      names_iterator_tester.test_next_one (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      names_iterator_tester.test_next_one (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Checking the reset () method.
-      names_iterator_tester.test_reset (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      names_iterator_tester.test_reset (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+  
       // Iterating again thru the property names.
-      names_iterator_tester.test_next_one (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      names_iterator_tester.test_next_one (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Reset again.
-      names_iterator_tester.test_reset (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      names_iterator_tester.test_reset (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Checking next_n. Prints out all the names it has got.
-      names_iterator_tester.test_next_n (6, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      names_iterator_tester.test_next_n (6, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      
       // Try next_n without resetting.
-      names_iterator_tester.test_next_n (6, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      names_iterator_tester.test_next_n (6, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
-}
+}  
+
+
+
+
+
+
+
+
+
+
diff --git a/TAO/orbsvcs/tests/Property/run_test.pl b/TAO/orbsvcs/tests/Property/run_test.pl
index c287ed68236..50292c6c72a 100755
--- a/TAO/orbsvcs/tests/Property/run_test.pl
+++ b/TAO/orbsvcs/tests/Property/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 $tao_root = $ENV{TAO_ROOT};
 # This is a Perl script that runs the Naming Service, client and servers
 
@@ -23,7 +22,7 @@ sub name_server
 {
     my $args = "-ORBnameserviceport $nsport";
     my $prog = "$tao_root/orbsvcs/Naming_Service/Naming_Service"
-        .$Process::EXE_EXT;
+	.$Process::EXE_EXT;
     print ("\nNaming_Service: $prog$Process::EXE_EXT $args\n");
     $NS = Process::Create ($prog, $args);
 }
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index b23ecdb1fea..8e9cc712b23 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -25,9 +25,7 @@ ACE_RCSID(CosPropertyService, server, "$Id$")
 int
 main (int argc, char ** argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  
-  ACE_TRY
+  TAO_TRY
     {
       TAO_ORB_Manager m;
 
@@ -35,51 +33,53 @@ main (int argc, char ** argv)
       m.init_child_poa (argc,
                         argv,
                         "child_poa",
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Using naming server.
       TAO_Naming_Client my_name_client;
       if (my_name_client.init (m.orb ()) < 0)
         return 1;
-      
+
+      ACE_DEBUG ((LM_DEBUG, "Name init done\n"));
+
       // Create PropertySetDef object and register.
       TAO_PropertySetDef *propsetdef_impl;
       ACE_NEW_RETURN (propsetdef_impl,
                       TAO_PropertySetDef,
                       -1);
       CosPropertyService::PropertySetDef_var propsetdef =
-        propsetdef_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        propsetdef_impl->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosNaming::Name propsetdef_name (1);
       propsetdef_name.length (1);
       propsetdef_name[0].id = CORBA::string_dup ("PropertySetDef");
       my_name_client->bind (propsetdef_name,
                             propsetdef.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::Any any_val;
 
       // Make this IOR as one of the properties in there.
-      any_val <<= propsetdef_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      any_val <<= propsetdef_impl->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      CORBA::Object_var ior = propsetdef_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::Object_var ior = propsetdef_impl->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::Object_ptr ior_ptr = ior.in ();
       any_val <<= ior_ptr;
       // any_val.replace (CORBA::_tc_Object,
       //                  &ior_ptr,
       //                  1,
-      //                  ACE_TRY_ENV);
-      // ACE_TRY_CHECK;
+      //                  TAO_TRY_ENV);
+      // TAO_CHECK_ENV;
       
       propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
                                                   CosPropertyService::fixed_readonly,
-                                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       
       // Create PropertySet factory and then register.
       TAO_PropertySetFactory *propset_factory_impl;
@@ -87,34 +87,32 @@ main (int argc, char ** argv)
                       TAO_PropertySetFactory,
                       -1);
       CosPropertyService::PropertySetFactory_var propset_factory =
-        propset_factory_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        propset_factory_impl->_this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CosNaming::Name propset_factory_name (1);
       propset_factory_name.length (1);
       propset_factory_name[0].id = CORBA::string_dup ("PropertySetFactory");
       my_name_client->bind (propset_factory_name,
                             propset_factory.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run the ORB Event loop.
-      m.run (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      m.run (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return 1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex,
-                           "User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
               "\nServer is terminating"));
   return 0;
diff --git a/TAO/orbsvcs/tests/Property/server.dsp b/TAO/orbsvcs/tests/Property/server.dsp
deleted file mode 100644
index b3d48390b27..00000000000
--- a/TAO/orbsvcs/tests/Property/server.dsp
+++ /dev/null
@@ -1,93 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=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 NMAKE /f "server.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 "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "server - 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 /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ELSEIF  "$(CFG)" == "server - 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 "Debug"

-# 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 "..\..\..\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.h

-# End Source File

-# End Target

-# End Project

diff --git a/TAO/orbsvcs/tests/Sched/Makefile b/TAO/orbsvcs/tests/Sched/Makefile
index f833c678ac6..a9e885ffbe8 100644
--- a/TAO/orbsvcs/tests/Sched/Makefile
+++ b/TAO/orbsvcs/tests/Sched/Makefile
@@ -1,7 +1,9 @@
 # $Id$
 
+BIN = DynSched_Test
+BUILD = $(BIN)
 SRC = $(BIN:%=%$(VAR).cpp)
-LDLIBS = -lorbsvcs -lTAO
+LDLIBS= -lorbsvcs -lTAO
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
@@ -11,15 +13,6 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs/orbsvcs/Sched \
             -I$(TAO_ROOT)/orbsvcs \
             -I$(TAO_ROOT)
 
-BIN2 = DynSched_Test
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Sched
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -56,11 +49,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -75,9 +67,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -89,9 +80,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(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/Containers.cpp \
  $(ACE_ROOT)/ace/Signal.i \
  $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/Object_Manager.i \
@@ -106,6 +95,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.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 \
@@ -119,11 +110,152 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.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 \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/SchedEntry.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.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/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/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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 \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/ORB_Core.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/debug.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index 6038aad2fe3..6d4b901f88b 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -1,22 +1,18 @@
 # $Id$
 
-DUMP_SRCS = Sched_Conf.cpp
-LSRC = $(DUMP_SRCS)
+BIN = Sched_Conf
+BUILD = $(BIN)
 
-SCHEDULE_OBJS = $(SCHEDULE_SRCS:.cpp=.o)
-DUMP_OBJS = $(DUMP_SRCS:.cpp=.o)
+DUMP_SRCS = \
+        Sched_Conf.cpp
 
-LDLIBS  = -lorbsvcs -lTAO
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+LSRC =  $(DUMP_SRCS)
 
-BIN2 = Sched_Conf
+SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
+DUMP_OBJS=$(DUMP_SRCS:.cpp=.o)
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Sched,$(findstring Sched,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Sched
+LDLIBS     =  -lorbsvcs -lTAO
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -30,7 +26,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
@@ -47,6 +43,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -57,85 +56,70 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/Sched_Params.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(TAO_ROOT)/tao/orbconf.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/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Hash_Map_Manager.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/Containers.i \
+ $(ACE_ROOT)/ace/Containers.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 \
  $(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/Mem_Map.h \
+ $(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/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/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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -147,108 +131,38 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -261,91 +175,101 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
  $(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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/Align.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.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/Request.h \
+ $(TAO_ROOT)/tao/Request.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/Stub.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/IIOP_Object.h \
+ $(TAO_ROOT)/tao/IIOP_Object.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Server_Request.h \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/singletons.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Makefile b/TAO/orbsvcs/tests/Simple_Naming/Makefile
index 3af4409a25f..ffd51d785df 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Makefile
+++ b/TAO/orbsvcs/tests/Simple_Naming/Makefile
@@ -5,16 +5,16 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 LDLIBS =  -lorbsvcs -lTAO
 
-IDL_SRC = test_objectC.cpp test_objectS.cpp
+IDL_SRC	= test_objectC.cpp test_objectS.cpp
 CLIENT_SRC = client.cpp
 
 LSRC = $(IDL_SRC) $(CLIENT_SRC)
@@ -22,22 +22,16 @@ LSRC = $(IDL_SRC) $(CLIENT_SRC)
 CLIENT_OBJS = $(IDL_SRC:.cpp=.o) $(CLIENT_SRC:.cpp=.o)
 
 TEST_OBJECT_OBJS = test_objectC.o \
-                   test_objectS.o \
-                   client.o
+		   test_objectS.o \
+		   client.o
 
+BIN = client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -51,23 +45,28 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)#-H
 
-client: $(addprefix $(VDIR),$(TEST_OBJECT_OBJS))
+client:	$(addprefix $(VDIR),$(TEST_OBJECT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean:
-	-$(RM) test_objectC.* test_objectS* client
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf test_objectC.* test_objectS* client
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/test_objectC.o .obj/test_objectC.so .shobj/test_objectC.o .shobj/test_objectC.so: test_objectC.cpp test_objectC.h \
+.obj/test_objectC.o .obj/test_objectC.so .shobj/test_objectC.o .shobj/test_objectC.so: test_objectC.cpp test_objectC.h test_objectC.i \
+ test_objectS.h test_objectS_T.h test_objectS_T.i test_objectS_T.cpp \
+ test_objectS.i
+.obj/test_objectS.o .obj/test_objectS.so .shobj/test_objectS.o .shobj/test_objectS.so: test_objectS.cpp test_objectS.h test_objectC.h \
+ test_objectC.i test_objectS_T.h test_objectS_T.i test_objectS_T.cpp \
+ test_objectS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -131,292 +130,53 @@ realclean:
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- test_objectC.i test_objectS.h test_objectS_T.h test_objectS_T.i \
- test_objectS_T.cpp test_objectS.i
-.obj/test_objectS.o .obj/test_objectS.so .shobj/test_objectS.o .shobj/test_objectS.so: test_objectS.cpp test_objectS.h test_objectC.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/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/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 \
- $(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.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/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 \
@@ -443,52 +203,6 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -497,310 +211,22 @@ realclean:
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- test_objectC.i test_objectS_T.h test_objectS_T.i test_objectS_T.cpp \
- test_objectS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp client.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -822,8 +248,11 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -840,65 +269,39 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/TAO.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
@@ -909,12 +312,13 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  test_objectS.h test_objectC.h test_objectC.i test_objectS_T.h \
  test_objectS_T.i test_objectS_T.cpp test_objectS.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 1fbb81dbfc9..d639a016b22 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -23,13 +23,7 @@
 
 ACE_RCSID(Simple_Naming, client, "$Id$")
 
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
-class My_Test_Object : 
-  public virtual PortableServer::RefCountServantBase,
-  public virtual POA_Test_Object
+class My_Test_Object : public POA_Test_Object
 {
 public:
   // = Initialization and termination methods.
@@ -41,10 +35,10 @@ public:
 
   // = Interface implementation accessor methods.
 
-  void id (CORBA::Short id, CORBA::Environment &ACE_TRY_ENV);
+  void id (CORBA::Short id, CORBA::Environment &TAO_IN_ENV);
   // Sets id.
 
-  CORBA::Short id (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short id (CORBA::Environment &TAO_IN_ENV);
   // Gets id.
 
 private:
@@ -146,11 +140,10 @@ CosNaming_Client::parse_args (void)
         break;
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "Argument %c \n usage:  %s"
+                           "usage:  %s"
                            " [-d]"
                            " [-s or -e or -t or -i or -y]"
                            "\n",
-                           c,
                            this->argv_ [0]),
                           -1);
       }
@@ -183,14 +176,13 @@ CosNaming_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Initialize ORB.
-      this->orbmgr_.init (this->argc_,
-                          this->argv_,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->orbmgr_.init (argc,
+                          argv,
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -198,14 +190,12 @@ CosNaming_Client::init (int argc, char **argv)
 
       return this->naming_client_.init (this->orbmgr_.orb ());
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "init");
+      TAO_TRY_ENV.print_exception ("init");
       return -1;
     }
-  ACE_ENDTRY;
-
-  return -1;
+  TAO_ENDTRY_RETURN (0);
 }
 
 MT_Test::MT_Test (CORBA::ORB_ptr orb,
@@ -223,118 +213,109 @@ MT_Test::svc (void)
 
   CosNaming::NamingContext_var name_service;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  TAO_TRY_EX (SETUP)
     {
       CORBA::Object_var name_service_obj =
-        orb_->string_to_object (name_service_ior_, ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (SETUP);
+        orb_->string_to_object (name_service_ior_, TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (SETUP);
 
       name_service =
         CosNaming::NamingContext::_narrow (name_service_obj.in (),
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (SETUP);
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (SETUP);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in MT test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   // Bind the object.
-  ACE_TRY_EX (BIND)
+  TAO_TRY_EX (BIND)
     {
       name_service->bind (test_name_,
                           test_ref_.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (BIND);
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (BIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK in thread %8.8x \n",
                   ACE_OS::thr_self ()));
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+  TAO_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to bind in thread %8.8x \n",
                   ACE_OS::thr_self ()));
 
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in MT test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   // Resolve the object from the Naming Context.
-  ACE_TRY_EX (RESOLVE)
+  TAO_TRY_EX (RESOLVE)
     {
       CORBA::Object_var result_obj_ref =
         name_service->resolve (test_name_,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (RESOLVE);
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (RESOLVE);
 
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (RESOLVE);
-
-      if (!CORBA::is_nil (result_object.in ()))
-        {
-          CORBA::Short id = result_object->id (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (RESOLVE);
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (RESOLVE);
 
-          if (id == CosNaming_Client::OBJ1_ID)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Resolved name OK in thread %8.8x \n",
-                        ACE_OS::thr_self ()));
-        }
+      if (!CORBA::is_nil (result_object.in ())
+          && result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID)
+      TAO_CHECK_ENV_EX (RESOLVE);
+      ACE_DEBUG ((LM_DEBUG,
+                  "Resolved name OK in thread %8.8x \n",
+                  ACE_OS::thr_self ()));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to resolve in thread %8.8x \n",
                   ACE_OS::thr_self ()));
 
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in MT test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   // Unbind the object from the Naming Context.
-  ACE_TRY_EX (UNBIND)
+  TAO_TRY_EX (UNBIND)
     {
       name_service->unbind (test_name_,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (UNBIND);
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (UNBIND);
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK in thread %8.8x \n",
                   ACE_OS::thr_self ()));
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Unable to unbind in thread %8.8x \n",
                   ACE_OS::thr_self ()));
 
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in MT test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in MT test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -349,18 +330,13 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   // Create data which will be used by all threads.
 
   // Dummy object instantiation.
-  My_Test_Object *test_obj_impl =
-    new My_Test_Object (CosNaming_Client::OBJ1_ID);
+  My_Test_Object test_obj_impl (CosNaming_Client::OBJ1_ID);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       test_ref_ =
-        test_obj_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        test_obj_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Get the IOR for the Naming Service.  Each thread
       // can use it in <string_to_object> to create its own stub for
@@ -370,17 +346,16 @@ MT_Test::execute (TAO_Naming_Client &root_context)
 
       name_service_ior_ =
         orb_->object_to_string (root_context.get_context (),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      TAO_TRY_ENV.print_exception ("Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   // Create a name for dummy.
   test_name_.length (1);
@@ -389,38 +364,32 @@ MT_Test::execute (TAO_Naming_Client &root_context)
   // Spawn threads, each of which will be executing svc ().
   int status = this->activate (THR_NEW_LWP | THR_JOINABLE,
                                size_);
-
   if (status == -1)
     return -1;
   else
     return this->wait ();
 }
 
+
 int
 Loop_Test::execute (TAO_Naming_Client &root_context)
 {
   // Create a dummy object.
-  My_Test_Object * test_obj_impl = 
-    new My_Test_Object (CosNaming_Client::OBJ1_ID);
+  My_Test_Object test_obj_impl (CosNaming_Client::OBJ1_ID);
   Test_Object_var test_ref;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY_EX (SETUP)
+  TAO_TRY_EX (SETUP)
     {
       test_ref =
-        test_obj_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (SETUP);
-
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK_EX (SETUP);      
+        test_obj_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV_EX (SETUP);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception while instantiating dummy");
+      TAO_TRY_ENV.print_exception ("Unexpected exception while instantiating dummy");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   // Create a name for dummy.
   CosNaming::Name test_name;
@@ -434,97 +403,90 @@ Loop_Test::execute (TAO_Naming_Client &root_context)
   for (int i = 0; i < 200; i++)
     {
       // Bind the object.
-      ACE_TRY_EX (BIND)
+      TAO_TRY_EX (BIND)
         {
           root_context->bind (test_name,
                               test_ref.in (),
-                              ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (BIND);
+                              TAO_TRY_ENV);
+          TAO_CHECK_ENV_EX (BIND);
           ACE_DEBUG ((LM_DEBUG,
                       "Bound name OK in process %8.8x \n",
                       ACE_OS::getpid ()));
         }
-      ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+      TAO_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Unable to bind in process %8.8x \n",
                       ACE_OS::getpid ()));
 
-          ACE_TRY_ENV.clear ();
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          TAO_TRY_ENV.print_exception ("Unexpected exception in Loop test");
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      TAO_ENDTRY;
 
       // Resolve the object from the Naming Context.
-      ACE_TRY_EX (RESOLVE)
+      TAO_TRY_EX (RESOLVE)
         {
           CORBA::Object_var result_obj_ref =
             root_context->resolve (test_name,
-                                   ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (RESOLVE);
+                                   TAO_TRY_ENV);
+          TAO_CHECK_ENV_EX (RESOLVE);
 
           Test_Object_var result_object =
             Test_Object::_narrow (result_obj_ref.in (),
-                                  ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (RESOLVE);
+                                  TAO_TRY_ENV);
+          TAO_CHECK_ENV_EX (RESOLVE);
 
-
-          if (!CORBA::is_nil (result_object.in ()))
-            {
-              CORBA::Short id = result_object->id (ACE_TRY_ENV);
-              ACE_TRY_CHECK_EX (RESOLVE);
-
-              if (id == CosNaming_Client::OBJ1_ID)
-                ACE_DEBUG ((LM_DEBUG,
-                            "Resolved name OK in process %8.8x \n",
-                            ACE_OS::getpid ()));
-            }
+          if (!CORBA::is_nil (result_object.in ())
+              && result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID)
+            TAO_CHECK_ENV_EX (RESOLVE);
+          ACE_DEBUG ((LM_DEBUG,
+                      "Resolved name OK in process %8.8x \n",
+                      ACE_OS::getpid ()));
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+      TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Unable to resolve in process %8.8x \n",
                       ACE_OS::getpid ()));
-          ACE_TRY_ENV.clear ();
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          TAO_TRY_ENV.print_exception ("Unexpected exception in Loop test");
           return -1;
         }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      TAO_ENDTRY;
+
 
       // Unbind the object from the Naming Context.
-      ACE_TRY_EX (UNBIND)
+      TAO_TRY_EX (UNBIND)
         {
           root_context->unbind (test_name,
-                                ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (UNBIND);
+                                TAO_TRY_ENV);
+          TAO_CHECK_ENV_EX (UNBIND);
           ACE_DEBUG ((LM_DEBUG,
                       "Unbound name OK in process %8.8x \n",
                       ACE_OS::getpid ()));
         }
-      ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+      TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Unable to unbind in process %8.8x \n",
                       ACE_OS::getpid ()));
-          ACE_TRY_ENV.clear ();
+          TAO_TRY_ENV.clear ();
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Loop test");
+          TAO_TRY_ENV.print_exception ("Unexpected exception in Loop test");
           return -1;
         }
 
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
+      TAO_ENDTRY;
     }
   return 0;
 }
@@ -532,18 +494,13 @@ Loop_Test::execute (TAO_Naming_Client &root_context)
 int
 Simple_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Dummy object instantiation.
-      My_Test_Object *test_obj_impl = new My_Test_Object (CosNaming_Client::OBJ1_ID);
+      My_Test_Object test_obj_impl (CosNaming_Client::OBJ1_ID);
       Test_Object_var test_obj_ref =
-        test_obj_impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      // Give ownership of this object to POA.
-      test_obj_impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        test_obj_impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind an object to the Naming Context.
       CosNaming::Name test_name;
@@ -551,40 +508,39 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
       test_name[0].id = CORBA::string_dup ("Foo");
       root_context->bind (test_name,
                           test_obj_ref.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Bound name OK\n"));
 
       // Resolve the object from the Naming Context.
       CORBA::Object_var result_obj_ref =
         root_context->resolve (test_name,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (!CORBA::is_nil (result_object.in ())
-          && result_object->id (ACE_TRY_ENV) == CosNaming_Client::OBJ1_ID)
+          && result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID)
         ACE_DEBUG ((LM_DEBUG,
                     "Resolved name OK\n"));
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Unbind the object from the Naming Context.
       root_context->unbind (test_name,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
                   "Unbound name OK\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Simple test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in Simple test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -592,8 +548,7 @@ Simple_Test::execute (TAO_Naming_Client &root_context)
 int
 Tree_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Create a tree of contexts: root->level1->level2.  Bind object
       // foo under context level2.
@@ -604,28 +559,24 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level1[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
       level1_context = root_context->bind_new_context (level1,
-                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Create a new context.
       CosNaming::NamingContext_var level2_context;
-      level2_context = root_context->new_context (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      level2_context = root_context->new_context (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Instantiate a dummy object and bind it under the new context.
-      My_Test_Object *impl1 = 
-        new My_Test_Object (CosNaming_Client::OBJ1_ID);
-      Test_Object_var obj1 = impl1->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl1->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      My_Test_Object impl1 (CosNaming_Client::OBJ1_ID);
+      Test_Object_var obj1 = impl1._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CosNaming::Name obj_name;
       obj_name.length (1);
       obj_name[0].id = CORBA::string_dup ("foo");
       level2_context->bind (obj_name, obj1.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind the context we just created under level1.
       CosNaming::Name level2 (level1);
@@ -633,8 +584,8 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       level2[1].id = CORBA::string_dup ("level2_context");
       root_context->bind_context (level2,
                                   level2_context.in (),
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Resolve and unbind level1/level2/foo, and bind it back.
       CosNaming::Name test_name (level2);
@@ -642,92 +593,85 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
       test_name[2].id = obj_name[0].id;
       CORBA::Object_var result_obj_ref =
         root_context->resolve (test_name,
-                               ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                               TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       Test_Object_var result_object =
         Test_Object::_narrow (result_obj_ref.in (),
-                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (result_object.in ())
-          || !(result_object->id (ACE_TRY_ENV) == CosNaming_Client::OBJ1_ID))
+          || !(result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Problems with resolving foo in Tree Test\n"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Unbind the object from the Naming Context and bind it back
       // in.
       root_context->unbind (test_name,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (test_name,
                           obj1.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Create new context and rebind under the name level1/level2.
       CosNaming::NamingContext_var new_level2_context;
       new_level2_context =
-        root_context->new_context (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        root_context->new_context (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->rebind_context (level2,
                                   new_level2_context.in (),
-                                  ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                  TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind, resolve, rebind, and resolve foo under level1/level2.
       root_context->bind (test_name,
                           obj1.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       result_obj_ref = root_context->resolve (test_name,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       result_object = Test_Object::_narrow (result_obj_ref.in (),
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (result_object.in ())
-          || !(result_object->id (ACE_TRY_ENV) == CosNaming_Client::OBJ1_ID))
+          || !(result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ1_ID))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Problems in the Tree Test\n"),
                           -1);
-      ACE_TRY_CHECK;
-
-      My_Test_Object *impl2 =
-        new My_Test_Object (CosNaming_Client::OBJ2_ID);
-      Test_Object_var obj2 = impl2->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      impl2->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
+      My_Test_Object impl2 (CosNaming_Client::OBJ2_ID);
+      Test_Object_var obj2 = impl2._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->rebind (test_name,
                             obj2.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       result_obj_ref = root_context->resolve (test_name,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       result_object = Test_Object::_narrow (result_obj_ref.in (),
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (result_object.in ())
-          || !(result_object->id (ACE_TRY_ENV) == CosNaming_Client::OBJ2_ID))
+          || !(result_object->id (TAO_TRY_ENV) == CosNaming_Client::OBJ2_ID))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Problems with rebind in Tree Test\n"),
                           -1);
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
     }
 
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Tree test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in Tree test");
       return -1;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
+  TAO_ENDTRY;
   ACE_DEBUG ((LM_DEBUG,
               "All functions work properly \n"));
   return 0;
@@ -736,8 +680,7 @@ Tree_Test::execute (TAO_Naming_Client &root_context)
 int
 Exceptions_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Set things up.
 
@@ -747,178 +690,159 @@ Exceptions_Test::execute (TAO_Naming_Client &root_context)
       context_name[0].id = CORBA::string_dup ("level1_context");
       CosNaming::NamingContext_var level1_context;
       level1_context = root_context->bind_new_context (context_name,
-                                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       context_name[0].id = CORBA::string_dup ("level2_context");
       CosNaming::NamingContext_var level2_context;
       level2_context = level1_context->bind_new_context (context_name,
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind a dummy object foo under each context.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       root_context->bind (object_name,
                           obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       level1_context->bind (object_name,
                             obj.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       level2_context->bind (object_name,
                             obj.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Setup ready\n"));
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Run exceptions tests.
       invalid_name_test (root_context,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       already_bound_test (root_context,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       already_bound_test2 (root_context,
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       not_found_test (root_context,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       not_found_test2 (root_context,
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       not_found_test3 (root_context,
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
+  TAO_ENDTRY;
   return 0;
 }
 
 void
 Exceptions_Test::invalid_name_test (TAO_Naming_Client &root_context,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (0);
 
       root_context->resolve (test_name,
-                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-    }
-  ACE_CATCH (CosNaming::NamingContext::InvalidName, ex)
+                             TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      }
+
+  TAO_CATCH (CosNaming::NamingContext::InvalidName, ex)
     {
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "InvalidName exception works properly\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Invalid name test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Exceptions_Test::already_bound_test (TAO_Naming_Client &root_context,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (1);
       test_name[0].id = CORBA::string_dup ("foo");
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (test_name,
                           obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+
+  TAO_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound exception (case 1) works properly\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 1) test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Exceptions_Test::already_bound_test2 (TAO_Naming_Client &root_context,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (2);
       test_name[0].id = CORBA::string_dup ("level1_context");
       test_name[1].id = CORBA::string_dup ("foo");
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (test_name,
                           obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
+
+  TAO_CATCH (CosNaming::NamingContext::AlreadyBound, ex)
     {
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "AlreadyBound  exception (case 2) works properly\n"));
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Already bound (case 2) test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -927,11 +851,11 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
       test_name[2].id = CORBA::string_dup ("bar");
 
       root_context->unbind (test_name,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       if (ex.why == CosNaming::NamingContext::not_object &&
           ex.rest_of_name.length () == 1
@@ -943,22 +867,20 @@ Exceptions_Test::not_found_test (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 1)"
                     " - parameters aren't set correctly\n"));
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Not found test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -967,11 +889,11 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
       test_name[2].id = CORBA::string_dup ("foo");
 
       root_context->unbind (test_name,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       if (ex.why == CosNaming::NamingContext::missing_node
           && ex.rest_of_name.length () == 2
@@ -985,23 +907,21 @@ Exceptions_Test::not_found_test2 (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 2)"
                     " - parameters aren't set correctly\n"));
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Unbind test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
 
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 void
 Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       CosNaming::Name test_name;
       test_name.length (3);
@@ -1009,11 +929,11 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
       test_name[1].id = CORBA::string_dup ("foo");
       test_name[2].id = CORBA::string_dup ("foo");
 
-      root_context->unbind (test_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
+      root_context->unbind (test_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
+
+  TAO_CATCH (CosNaming::NamingContext::NotFound, ex)
     {
       if (ex.why == CosNaming::NamingContext::not_context
           && ex.rest_of_name.length () == 2
@@ -1027,29 +947,33 @@ Exceptions_Test::not_found_test3 (TAO_Naming_Client &root_context,
         ACE_DEBUG ((LM_DEBUG,
                     "NotFound  exception (case 3)"
                     " - parameters aren't set correctly\n"));
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_DEBUG ((LM_DEBUG, "Not found (case 3) test failed\n"));
-      ACE_RETHROW;
+      TAO_RETHROW;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 int
 Iterator_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Instantiate four dummy objects.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      My_Test_Object impl1;
+      Test_Object_var obj1 = impl1._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      My_Test_Object impl2;
+      Test_Object_var obj2 = impl2._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      My_Test_Object impl3;
+      Test_Object_var obj3 = impl3._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      My_Test_Object impl4;
+      Test_Object_var obj4 = impl4._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind objects to the naming context.
       CosNaming::Name name1;
@@ -1065,21 +989,21 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       name4.length (1);
       name4[0].id = CORBA::string_dup ("foo4");
       root_context->bind (name1,
-                          obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          obj1.in (),
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (name2,
-                          obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          obj2.in (),
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (name3,
-                          obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          obj3.in (),
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       root_context->bind (name4,
-                          obj.in (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          obj4.in (),
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // List the content of the Naming Context.
       CosNaming::BindingIterator_var iter;
@@ -1087,8 +1011,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       root_context->list (1,
                           bindings_list.out (),
                           iter.out (),
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (CORBA::is_nil (iter.in ())
           || bindings_list->length () != 1
           || bindings_list[0].binding_type != CosNaming::nobject)
@@ -1102,8 +1026,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       // Invoke operations on the iterator.
       CosNaming::Binding_var binding;
       iter->next_one (binding.out (),
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (binding->binding_type != CosNaming::nobject)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::next_one does not function properly\n"),
@@ -1112,8 +1036,8 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
                   "Second binding: %s\n",
                   binding->binding_name[0].id.in ()));
 
-      iter->next_n (2, bindings_list.out (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      iter->next_n (2, bindings_list.out (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (bindings_list->length () != 2
           || bindings_list[0].binding_type != CosNaming::nobject
           || bindings_list[1].binding_type != CosNaming::nobject)
@@ -1129,117 +1053,114 @@ Iterator_Test::execute (TAO_Naming_Client &root_context)
       // We already iterated over all the bindings, so the following
       // should return false.
       CORBA::Boolean result = iter->next_one (binding.out (),
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (result)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "CosNaming::BindingIterator does not function properly\n"),
                           -1);
-      iter->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      iter->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Iterator test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in Iterator test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
+  TAO_ENDTRY;
   return 0;
 }
 
 int
 Destroy_Test::execute (TAO_Naming_Client &root_context)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       // Create a context and bind an object under it.
 
       CosNaming::NamingContext_var my_context;
-      my_context = root_context->new_context (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      my_context = root_context->new_context (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Bind a dummy object foo under my_context.
-      My_Test_Object *impl = new My_Test_Object;
-      Test_Object_var obj = impl->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      impl->_remove_ref (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
+      My_Test_Object impl;
+      Test_Object_var obj = impl._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CosNaming::Name object_name;
       object_name.length (1);
       object_name[0].id = CORBA::string_dup ("foo");
       my_context->bind (object_name,
                             obj.in (),
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Do the testing.
       not_empty_test (my_context,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
-      my_context->unbind (object_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      my_context->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      my_context->unbind (object_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      my_context->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       not_exist_test (my_context,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Unexpected exception in Exceptions test");
+      TAO_TRY_ENV.print_exception ("Unexpected exception in Exceptions test");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
+  TAO_ENDTRY;
   return 0;
 }
 
 void
 Destroy_Test::not_empty_test (CosNaming::NamingContext_var &ref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
-      ref->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ref->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
 
-  ACE_CATCH (CosNaming::NamingContext::NotEmpty, ex)
+  TAO_CATCH (CosNaming::NamingContext::NotEmpty, ex)
     {
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "NotEmpty exception works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 void
 Destroy_Test::not_exist_test (CosNaming::NamingContext_var &ref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
-      ref->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ref->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
 
-  ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+  TAO_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
     {
-      ACE_TRY_ENV.clear ();
+      TAO_TRY_ENV.clear ();
       ACE_DEBUG ((LM_DEBUG,
                   "Destroy works properly\n"));
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_CATCHANY
+    {
+      TAO_RETHROW;
+    }
+  TAO_ENDTRY;
 }
 
 // This function runs the test.
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index f3450cbb297..744035f99c6 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -187,17 +187,17 @@ private:
   // limitation of only 1 TAO_TRY being allowed per function.
 
   void invalid_name_test (TAO_Naming_Client &root_context,
-                          CORBA::Environment &ACE_TRY_ENV);
+                          CORBA::Environment &_env);
   void already_bound_test (TAO_Naming_Client &root_context,
-                           CORBA::Environment &ACE_TRY_ENV);
+                           CORBA::Environment &_env);
   void already_bound_test2 (TAO_Naming_Client &root_context,
-                            CORBA::Environment &ACE_TRY_ENV);
+                            CORBA::Environment &_env);
   void not_found_test (TAO_Naming_Client &root_context,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &_env);
   void not_found_test2 (TAO_Naming_Client &root_context,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &_env);
   void not_found_test3 (TAO_Naming_Client &root_context,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &_env);
 };
 
 class Destroy_Test : public Naming_Test
@@ -221,9 +221,9 @@ public:
 private:
   // = The following functions isolate specific tests.
   void not_empty_test (CosNaming::NamingContext_var &ref,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &_env);
   void not_exist_test (CosNaming::NamingContext_var &ref,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &_env);
 };
 
 class CosNaming_Client
@@ -254,7 +254,7 @@ public:
   // Initialize the client communication endpoint with server.
 
   // = Symbolic ids.
-  enum OBJ_ID
+  enum
   {
     OBJ1_ID = 5,
     OBJ2_ID = 6
diff --git a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
index 1068b4866cd..e837dfcf91c 100755
--- a/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
+++ b/TAO/orbsvcs/tests/Simple_Naming/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 # This is a Perl script that runs the client and all the other servers that
 # are needed
 
@@ -41,10 +40,10 @@ sub client
 @opts = ("-s", "-t", "-i", "-e", "-y");
 
 @comments = ("Simple Test: \n",
-             "Tree Test: \n",
-             "Iterator Test: \n",
-             "Exceptions Test: \n",
-             "Destroy Test: \n");
+	     "Tree Test: \n",
+	     "Iterator Test: \n",
+	     "Exceptions Test: \n",
+	     "Destroy Test: \n");
 
 $test_number = 0;
 
diff --git a/TAO/orbsvcs/tests/Simple_Naming/svc.conf b/TAO/orbsvcs/tests/Simple_Naming/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/Simple_Naming/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 39625ec11dd..b431b4cebfe 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -102,10 +102,10 @@ Client_i::test_for_new_universal_time (void)
       ACE_ASSERT (UTO_server->inaccuracy (TAO_TRY_ENV) == 9999);
       ACE_ASSERT (UTO_server->tdf (TAO_TRY_ENV) == 99);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).time == 999999999);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacchi == 0);
-      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacclo == 9999);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacchi == 9999 / 2);
+      ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacclo == 9999 - 9999 / 2);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).tdf == 99);
-		  
+
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -133,19 +133,15 @@ Client_i::test_for_uto_from_utc (void)
     {
       CosTime::UTO_var UTO_server = this->clerk_->uto_from_utc (utc_struct,
                                                                 TAO_TRY_ENV);
-      
-      TimeBase::InaccuracyT inaccuracy = utc_struct.inacchi;
-      inaccuracy <<= 32;
-      inaccuracy |= utc_struct.inacclo;
-      
+
       ACE_ASSERT (UTO_server->time (TAO_TRY_ENV) == 999999999);
-      ACE_ASSERT (UTO_server->inaccuracy (TAO_TRY_ENV) == inaccuracy);
+      ACE_ASSERT (UTO_server->inaccuracy (TAO_TRY_ENV) == 100);
       ACE_ASSERT (UTO_server->tdf (TAO_TRY_ENV) == 99);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).time == 999999999);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacclo == 50);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).inacchi == 50);
       ACE_ASSERT ((UTO_server->utc_time (TAO_TRY_ENV)).tdf == 99);
-      
+
       TAO_CHECK_ENV;
     }
   TAO_CATCHANY
@@ -182,7 +178,7 @@ Client_i::test_for_new_interval (void)
                   "[CLIENT] Process/Thread Id : (%P/%t) Test new_interval () fails.\n"));
     }
   TAO_ENDTRY;
-  
+
   return;
 }
 
diff --git a/TAO/orbsvcs/tests/Time/Makefile b/TAO/orbsvcs/tests/Time/Makefile
index 61f5348c462..fd882c63c86 100644
--- a/TAO/orbsvcs/tests/Time/Makefile
+++ b/TAO/orbsvcs/tests/Time/Makefile
@@ -5,7 +5,7 @@
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -15,27 +15,22 @@ endif
 LDLIBS = -lorbsvcs -lTAO
 
 PROG_SRCS = \
-        client.cpp \
-        Client_i.cpp \
+	client.cpp \
+	Client_i.cpp \
 
 SRC = $(PROG_SRCS)
 
 SIMPLE_CLT_OBJS = Client_i.o \
-        client.o
+	client.o
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = client
+BIN = client \
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Time,$(findstring Time,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Time
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -47,7 +42,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 
@@ -58,615 +53,11 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 .PRECIOUS: TimeServiceS.cpp TimeServiceS.i TimeServiceS.h
 .PRECIOUS: TimeServiceS_T.cpp TimeServiceS_T.i TimeServiceS_T.h
 
-client: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) TimeServiceC.* TimeServiceS.* TimeServiceS_T.*
+	-/bin/rm -rf TimeServiceC.* TimeServiceS.* TimeServiceS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Client_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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/Client_i.o .obj/Client_i.so .shobj/Client_i.o .shobj/Client_i.so: Client_i.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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Read_Buffer.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/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/Read_Buffer.i \
- Client_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeBaseC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/TimeServiceC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(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
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Time/implrepo.conf b/TAO/orbsvcs/tests/Time/implrepo.conf
index 40da4ea1084..622df28e10e 100644
--- a/TAO/orbsvcs/tests/Time/implrepo.conf
+++ b/TAO/orbsvcs/tests/Time/implrepo.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBpoalock null -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBpoalock null -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/Time/run_test.pl b/TAO/orbsvcs/tests/Time/run_test.pl
index 6e7183b63f9..7a0138e8b4f 100755
--- a/TAO/orbsvcs/tests/Time/run_test.pl
+++ b/TAO/orbsvcs/tests/Time/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../../bin";
 
 require ACEutils;
@@ -32,7 +31,7 @@ sub time_service_test_using_naming_service
     sleep 10;
 
     $status = system ($EXEPREFIX."client".$Process::EXE_EXT.
-                      "");
+		      "");
 
     $SV1->Kill ();
     $SV2->Kill ();
@@ -43,20 +42,20 @@ sub time_service_test_using_naming_service
 sub time_service_test_using_files
 {
     $SV1 = Process::Create ($time_dir."server".$Process::EXE_EXT,
-                            "-o $server_ior");
+			    "-o $server_ior");
 
     ACE::waitforfile ($server_ior);
     sleep 5;
 
     $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT,
-                            "-f $server_ior -o clerk_ior -t 2");
+			    "-f $server_ior -o clerk_ior -t 2");
 
     ACE::waitforfile ($clerk_ior);
 
     sleep 10;
 
     $status = system ($EXEPREFIX."client".$Process::EXE_EXT.
-                      " -f clerk_ior");
+		      " -f clerk_ior");
 
     $SV1->Kill ();
     $SV2->Kill ();
@@ -70,7 +69,7 @@ sub time_service_test_using_files
 sub time_service_test_using_ir
 {
   $ir_dir = "..".$DIR_SEPARATOR."..".$DIR_SEPARATOR."ImplRepo_Service".$DIR_SEPARATOR;
-  $IR = Process::Create ($ir_dir."ImplRepo_Service".$Process::EXE_EXT,
+  $IR = Process::Create ($ir_dir."ImplRepo_Service".$Process::EXE_EXT, 
                          "-ORBsvcconf implrepo.conf -ORBobjrefstyle url -d 1");
 
   ACE::waitforfile ($implrepo_ior);
@@ -83,7 +82,7 @@ sub time_service_test_using_ir
   sleep 10;
 
   $SV2 = Process::Create ($time_dir."clerk".$Process::EXE_EXT,
-                          "-f $server_ior -o clerk_ior -ORBobjrefstyle url");
+			  "-f $server_ior -o clerk_ior -ORBobjrefstyle url");
 
   sleep 10;
 
diff --git a/TAO/orbsvcs/tests/Trading/Makefile b/TAO/orbsvcs/tests/Trading/Makefile
index 86357b8ee93..ab1bbcc863b 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile
+++ b/TAO/orbsvcs/tests/Trading/Makefile
@@ -8,16 +8,15 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
-MAKEFILE = Makefile
-
-BIN2 = export_test import_test colocated_test
+BIN     = export_test import_test colocated_test
 
+MAKEFILE = Makefile
 LIBNAME  = libTTest
-LIB2 = $(LIBNAME).a
-SHLIB2 = $(LIBNAME).$(SOEXT)
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
 
 ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
+TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
 IDL_FILES = TTestC \
@@ -35,18 +34,9 @@ CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 LSRC    = $(addsuffix .cpp,$(FILES))
 LIBS    = -lorbsvcs -lTAO
-LDLIBS  = -lorbsvcs -lTAO
+LDLIBS  = -lTTest -lorbsvcs -lTAO
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Trader,$(findstring Trader,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-endif # Trader
-
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -62,1464 +52,52 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 .PRECIOUS: TTestS.cpp TTestS.h TTestC.cpp TTestC.h
 
-ifneq ($(BIN),)
-  ifeq ($(SHLIB), $(findstring $(SHLIB), $(BUILD)))
-    $(BIN): $(SHLIB)
-  endif
-  ifeq ($(LIB), $(findstring $(LIB), $(BUILD)))
-    $(BIN): $(LIB)
-  endif
-endif # BIN
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
 
 realclean: clean
-	-$(RM) $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) TTestS_T.*
+	-/bin/rm -rf $(addsuffix .h, $(IDL_FILES)) $(addsuffix .i, $(IDL_FILES)) $(addsuffix .cpp, $(IDL_FILES)) TTestS_T.*
 
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/TTestC.o .obj/TTestC.so .shobj/TTestC.o .shobj/TTestC.so: TTestC.cpp TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS.h TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i
-.obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i
-.obj/TT_Info.o .obj/TT_Info.so .shobj/TT_Info.o .shobj/TT_Info.so: TT_Info.cpp TT_Info.h TTestS.h TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
+.obj/TTestC.o .obj/TTestC.so .shobj/TTestC.o .shobj/TTestC.so: TTestC.cpp TTestC.h TTestC.i TTestS.h TTestS_T.h TTestS_T.i \
+ TTestS_T.cpp TTestS.i
+.obj/TTestS.o .obj/TTestS.so .shobj/TTestS.o .shobj/TTestS.so: TTestS.cpp TTestS.h TTestC.h TTestC.i TTestS_T.h TTestS_T.i \
+ TTestS_T.cpp TTestS.i
+.obj/TT_Info.o .obj/TT_Info.so .shobj/TT_Info.o .shobj/TT_Info.so: TT_Info.cpp TT_Info.h TTestS.h TTestC.h TTestC.i TTestS_T.h \
+ TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
 .obj/Service_Type_Exporter.o .obj/Service_Type_Exporter.so .shobj/Service_Type_Exporter.o .shobj/Service_Type_Exporter.so: Service_Type_Exporter.cpp \
- Service_Type_Exporter.h TT_Info.h TTestS.h TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
+ Service_Type_Exporter.h TT_Info.h TTestS.h TTestC.h TTestC.i \
+ TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
  $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i
 .obj/Offer_Exporter.o .obj/Offer_Exporter.so .shobj/Offer_Exporter.o .shobj/Offer_Exporter.so: Offer_Exporter.cpp Offer_Exporter.h TT_Info.h \
- TTestS.h TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
+ TTestS.h TTestC.h TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp \
+ TTestS.i $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  Simple_Dynamic.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
@@ -1528,329 +106,31 @@ realclean: clean
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Simple_Dynamic.cpp
 .obj/Offer_Importer.o .obj/Offer_Importer.so .shobj/Offer_Importer.o .shobj/Offer_Importer.so: Offer_Importer.cpp Offer_Importer.h TT_Info.h \
- TTestS.h TTestC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp TTestS.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
+ TTestS.h TTestC.h TTestC.i TTestS_T.h TTestS_T.i TTestS_T.cpp \
+ TTestS.i $(ACE_ROOT)/ace/Arg_Shifter.h \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i
 .obj/Simple_Dynamic.o .obj/Simple_Dynamic.so .shobj/Simple_Dynamic.o .shobj/Simple_Dynamic.so: Simple_Dynamic.cpp Simple_Dynamic.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Trader/Trader.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1930,222 +210,12 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingC.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingReposS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicC.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS_T.cpp \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosTradingDynamicS.i \
  Simple_Dynamic.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index 0c2cb50c2da..b3fb7b84373 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -27,7 +27,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void)
     {
       TAO_Dynamic_Property* dp = 0;
       this->clean_up_.dequeue_head (dp);
-      dp->destroy ();
+      delete dp;
     }
 }
 
@@ -66,10 +66,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
       for (int i = 0; i < NUM_OFFERS; i++)
         {
           CosTrading::OfferId_var offer_id =
-            reg->_cxx_export (this->plotter_[i]._this (TAO_TRY_ENV),
-                              TT_Info::INTERFACE_NAMES[1],
-                              this->props_plotters_[i],
-                              TAO_TRY_ENV);
+            reg->export (this->plotter_[i]._this (TAO_TRY_ENV),
+                         TT_Info::INTERFACE_NAMES[1],
+                         this->props_plotters_[i],
+                         TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
           if (this->verbose_)
@@ -77,10 +77,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_id = reg->_cxx_export (this->printer_[i]._this (TAO_TRY_ENV),
-                                       TT_Info::INTERFACE_NAMES[2],
-                                       this->props_printers_[i],
-                                       TAO_TRY_ENV);
+          offer_id = reg->export (this->printer_[i]._this (TAO_TRY_ENV),
+                                  TT_Info::INTERFACE_NAMES[2],
+                                  this->props_printers_[i],
+                                  TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
           if (this->verbose_)
@@ -88,10 +88,10 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg,
               ACE_DEBUG ((LM_DEBUG, "Registered offer id: %s.\n", offer_id.in ()));
             }
 
-          offer_id = reg->_cxx_export (this->fs_[i]._this (TAO_TRY_ENV),
-                                       TT_Info::INTERFACE_NAMES[3],
-                                       this->props_fs_[i],
-                                       TAO_TRY_ENV);
+          offer_id = reg->export (this->fs_[i]._this (TAO_TRY_ENV),
+                                  TT_Info::INTERFACE_NAMES[3],
+                                  this->props_fs_[i],
+                                  TAO_TRY_ENV);
           TAO_CHECK_ENV;
 
           if (this->verbose_)
@@ -172,8 +172,20 @@ TAO_Offer_Exporter::export_offers_to_all (CORBA::Environment& TAO_IN_ENV)
                           ACE_static_cast (const char*, link_name_seq[i])));
             }
 
-          this->export_to (link_info->target_reg.in (), TAO_TRY_ENV);
+          CosTrading::Register_var remote_reg;
+#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
+          CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
+          CORBA::Object_var obj = orb->string_to_object (link_info->target_reg, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+          remote_reg = CosTrading::Register::_narrow (obj.in (), TAO_TRY_ENV);
           TAO_CHECK_ENV;
+#else
+          TAO_CHECK_ENV;
+          remote_reg = link_info->target_reg.in ();
+#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
+
+          this->export_to (remote_reg.in (), TAO_IN_ENV);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
         }
       TAO_CATCHANY
         {
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index b433c70c21d..dec7312c051 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -27,7 +27,7 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n"));
 
-  TAO_Policy_Creator policies;
+  TAO_Policy_Manager policies;
   policies.exact_type_match (0);
   policies.search_card (16*NUM_OFFERS);
   policies.match_card (16*NUM_OFFERS);
@@ -54,7 +54,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n"));
 
-  TAO_Policy_Creator policies;
+  TAO_Policy_Manager policies;
   policies.exact_type_match (0);
   policies.search_card (16*NUM_OFFERS);
   policies.match_card (16*NUM_OFFERS);
@@ -86,7 +86,17 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
         link_if->describe_link (link_name_seq[0], TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-      CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
+      CosTrading::Lookup_var lookup_if;
+#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
+      CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
+      CORBA::Object_var obj = orb->string_to_object (link_info->target, TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+      lookup_if = CosTrading::Lookup::_narrow (obj.in (), TAO_IN_ENV);
+      TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+#else
+      lookup_if = CosTrading::Lookup::_duplicate (link_info->target.in ());
+#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
+
       CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_IN_ENV);
       TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
@@ -137,7 +147,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& TAO_IN_ENV)
 
 void
 TAO_Offer_Importer::
-perform_queries_with_policies (const TAO_Policy_Creator& policies,
+perform_queries_with_policies (const TAO_Policy_Manager& policies,
                                CORBA::Environment& TAO_IN_ENV)
   TAO_THROW_SPEC ((CORBA::SystemException,
                    CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
index 06ff84848c1..759c434ef5c 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h
@@ -63,7 +63,7 @@ public:
 
 private:
 
-  void perform_queries_with_policies (const TAO_Policy_Creator& policy_manager,
+  void perform_queries_with_policies (const TAO_Policy_Manager& policy_manager,
                                       CORBA::Environment& _env)
     TAO_THROW_SPEC ((CORBA::SystemException,
                      CosTrading::IllegalServiceType,
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 0074451d717..66f88d250a3 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -30,8 +30,6 @@ TAO_Service_Type_Exporter::remove_all_types (CORBA::Environment& TAO_IN_ENV)
                    CosTrading::UnknownServiceType,
                    CosTradingRepos::ServiceTypeRepository::HasSubTypes))
 {
-  ACE_UNUSED_ARG (TAO_IN_ENV);
-
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all"
               " types from the Repository.\n"));
 
@@ -117,9 +115,22 @@ TAO_Service_Type_Exporter::add_all_types_to_all (CORBA::Environment& TAO_IN_ENV)
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
 
-          CosTrading::TypeRepository_var remote_repos = 
-            link_info->target->type_repos (TAO_TRY_ENV);
+          CosTrading::TypeRepository_var remote_repos;
+#ifdef TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG
+          CORBA::ORB_ptr orb = TAO_ORB_Core_instance ()-> orb ();
+          CORBA::Object_var obj = orb->string_to_object (link_info->target, TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          CosTrading::Lookup_ptr remote_lookup =
+            CosTrading::Lookup::_narrow (obj.in (), TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+
+          remote_repos = remote_lookup->type_repos (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+#else
+          remote_repos = link_info->target->type_repos (TAO_TRY_ENV);
           TAO_CHECK_ENV;
+#endif /* TAO_HAS_OBJECT_IN_STRUCT_MARSHAL_BUG */
 
           CosTradingRepos::ServiceTypeRepository_ptr str =
             CosTradingRepos::ServiceTypeRepository::_narrow (remote_repos.in (), TAO_TRY_ENV);
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index 91f5d65619f..5bbd2885fe9 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -7,8 +7,6 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/Read_Buffer.h"
 #include "orbsvcs/CosTradingC.h"
-#include "orbsvcs/CosTradingReposC.h"
-#include "orbsvcs/CosTradingDynamicC.h"
 
 class TT_Info
 {
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index fa078177a5c..53df58a217e 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -38,13 +38,14 @@ main (int argc, char** argv)
       // Command line argument interpretation.
       CORBA::Boolean verbose = 0;
       ::parse_args (argc, argv, verbose);
-
+        
       // Initialize ORB.
       CORBA::ORB_var orb = orb_manager.orb ();
 
       // Create a Service Type Repository and a Trader Object.
       TAO_Service_Type_Repository type_repos;
-      auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader (TAO_Trader_Factory::create_trader (argc, argv));
+      auto_ptr<TAO_Trader_Factory::TAO_TRADER> trader =
+	auto_ptr<TAO_Trader_Factory::TAO_TRADER>(TAO_Trader_Factory::create_trader (argc, argv));
       TAO_Support_Attributes_i& sup_attr = trader->support_attributes ();
       TAO_Trading_Components_i& trd_comp = trader->trading_components ();
 
@@ -62,16 +63,16 @@ main (int argc, char** argv)
 
       type_exporter.remove_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       type_exporter.add_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       type_exporter.list_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       type_exporter.describe_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       type_exporter.fully_describe_all_types (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -91,7 +92,7 @@ main (int argc, char** argv)
 
       offer_exporter.describe_offers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
-
+      
       offer_exporter.modify_offers (TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
@@ -102,16 +103,16 @@ main (int argc, char** argv)
       TAO_CHECK_ENV;
 
       offer_exporter.describe_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      TAO_CHECK_ENV;      
 
       offer_exporter.withdraw_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      TAO_CHECK_ENV;      
 
       offer_exporter.export_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      TAO_CHECK_ENV;      
 
       offer_exporter.describe_offers (TAO_TRY_ENV);
-      TAO_CHECK_ENV;
+      TAO_CHECK_ENV;      
 
       // Run the Offer Importer tests
       ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n"));
diff --git a/TAO/orbsvcs/tests/Trading/svc.conf b/TAO/orbsvcs/tests/Trading/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/orbsvcs/tests/Trading/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/orbsvcs/tests/start_services b/TAO/orbsvcs/tests/start_services
index d5573d16ebf..e91f0162194 100755
--- a/TAO/orbsvcs/tests/start_services
+++ b/TAO/orbsvcs/tests/start_services
@@ -104,5 +104,5 @@ ps $ps_opts | grep Service | grep -v grep
 echo
 echo Note: if you will be running an application that uses the Naming Service,
 echo you might want to set the NameService environment variable, like this:
-echo 't/csh: % setenv NameServiceIOR `cat /tmp/nameserviceior_'$login'`'
-echo 'bash:  $ export NameServiceIOR=`cat /tmp/nameserviceior_'$login'`'
+echo 't/csh: % setenv NameService `cat /tmp/nameserviceior_'$login'`'
+echo 'bash:  $ export NameService=`cat /tmp/nameserviceior_'$login'`'
diff --git a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
index df519b251bb..8a1b18e7113 100644
--- a/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/IDL_Cubit/Makefile
@@ -56,7 +56,7 @@ all: $(IDL_SRC) server client
 
 $(IDL_SRC): cubit.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-mv cubit.C cubit.cpp
+	-/bin/mv cubit.C cubit.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -65,7 +65,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
+	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
index cee1a38d81a..d605120ca98 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/Makefile
@@ -70,7 +70,7 @@ all: $(IDL_SRC) server client
 
 $(IDL_SRC): cubit.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) cubit.idl
-	-mv cubit.C cubit.cpp
+	-/bin/mv cubit.C cubit.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -79,7 +79,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
+	-/bin/rm -rf cubit.cpp cubit.H sk_cubit.C sk_cubit.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.cpp
index a3c9e5c8c59..0a1dbcc474c 100644
--- a/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/COOL/MT_Cubit/client.cpp
@@ -46,14 +46,14 @@ do_priority_inversion_test (Task_State &ts)
   // Create the clients
   Client high_priority_client (&ts);
   Client low_priority_client (&ts);
-
+  
   // Create the daemon thread in its own <ACE_Thread_Manager>.
   ACE_Thread_Manager thr_mgr;
-
+  
   Util_Thread util_thread (&ts, &thr_mgr);
-
-  ACE_Sched_Priority priority =
-    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
+      
+  ACE_Sched_Priority priority = 
+    ACE_Sched_Params::priority_min (ACE_SCHED_FIFO, 
                                     ACE_SCOPE_THREAD);
 
   // First activate the Utilization thread.  It will wait until all
@@ -66,14 +66,14 @@ do_priority_inversion_test (Task_State &ts)
   // Now activate the high priority client.
   priority = ACE_THR_PRI_FIFO_DEF;
 
-  if (high_priority_client.activate (THR_BOUND | THR_SCHED_FIFO,
+  if (high_priority_client.activate (THR_BOUND | ACE_SCHED_FIFO,
                                      1,
                                      0,
                                      priority) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 "activate failed"));
-
+  
   // Drop the priority, so that the priority of clients will increase
   // with increasing client number.
   for (i = 0; i < ts.thread_count_; i++)
@@ -90,7 +90,7 @@ do_priority_inversion_test (Task_State &ts)
     {
       // The first thread starts at min + 1, since the minimum
       // priority thread is the utilization thread.
-
+      
       if (low_priority_client.activate (THR_BOUND,
                                         1,
                                         1,
@@ -126,35 +126,35 @@ do_priority_inversion_test (Task_State &ts)
   FILE *latency_file_handle = 0;
   char latency_file[BUFSIZ];
   char buffer[BUFSIZ];
-
-  ACE_OS::sprintf (latency_file,
-		   "cb__%d.txt",
+  
+  ACE_OS::sprintf (latency_file, 
+		   "cb__%d.txt", 
 		   ts.thread_count_);
 
-  ACE_OS::fprintf(stderr,
+  ACE_OS::fprintf(stderr, 
 		  "--->Output file for latency data is \"%s\"\n",
 		  latency_file);
-
+  
   latency_file_handle = ACE_OS::fopen (latency_file, "w");
-
+  
   for (u_int j = 0; j < ts.start_count_; j ++)
     {
-      ACE_OS::sprintf(buffer,
-		      "%s #%d",
-		      j==0? "High Priority": "Low Priority",
+      ACE_OS::sprintf(buffer, 
+		      "%s #%d", 
+		      j==0? "High Priority": "Low Priority", 
 		      j);
       for (u_int i = 0; i < ts.loop_count_; i ++)
 	{
-	  ACE_OS::sprintf(buffer+strlen(buffer),
-			  "\t%u\n",
+	  ACE_OS::sprintf(buffer+strlen(buffer), 
+			  "\t%u\n", 
 			  ts.global_jitter_array_[j][i]);
 	  fputs (buffer, latency_file_handle);
 	  buffer[0]=0;
 	}
     }
-
+  
   ACE_OS::fclose (latency_file_handle);
-#else
+#else 
     ACE_DEBUG ((LM_DEBUG, "Test done.\n"
                 "High priority client latency : %f msec, jitter: %f msec\n"
                 "Low priority client latency : %f msec, jitter: %f msec\n",
@@ -166,10 +166,10 @@ do_priority_inversion_test (Task_State &ts)
 
     // signal the utilization thread to finish with its work..
     util_thread.done_ = 1;
-
+    
     // This will wait for the utilization thread to finish.
     thr_mgr.wait ();
-
+    
 #if defined (ACE_LACKS_FLOATING_POINT)
     ACE_DEBUG ((LM_DEBUG,
 		"(%t) utilization task performed %u computations\n",
@@ -179,9 +179,9 @@ do_priority_inversion_test (Task_State &ts)
 		"(%t) utilization task performed %g computations\n",
 		util_thread.get_number_of_computations ()));
 #endif /* ! ACE_LACKS_FLOATING_POINT */
-
+    
  return 0;
-
+    
 }
 
 int
@@ -193,9 +193,9 @@ do_thread_per_rate_test (Task_State &ts)
     Client CB_10Hz_client (&ts);
     Client CB_5Hz_client (&ts);
     Client CB_1Hz_client (&ts);
-
-    ACE_Sched_Priority priority =
-      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
+    
+    ACE_Sched_Priority priority = 
+      ACE_Sched_Params::priority_max (ACE_SCHED_FIFO, 
                                       ACE_SCOPE_THREAD);
 
     // VxWorks priority of 0 causes problems.
@@ -203,19 +203,19 @@ do_thread_per_rate_test (Task_State &ts)
     ACE_DEBUG ((LM_DEBUG, "Creating 40 Hz client with priority %d\n", priority));
     if (CB_40Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
       ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
+    
     ACE_DEBUG ((LM_DEBUG, "Creating 20 Hz client with priority %d\n", priority));
     if (CB_20Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
       ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
+    
     ACE_DEBUG ((LM_DEBUG, "Creating 10 Hz client with priority %d\n", priority));
     if (CB_10Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
       ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
+    
     ACE_DEBUG ((LM_DEBUG, "Creating 5 Hz client with priority %d\n", priority));
     if (CB_5Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
       ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
-
+    
     ACE_DEBUG ((LM_DEBUG, "Creating 1 Hz client with priority %d\n", priority));
     if (CB_1Hz_client.activate (THR_BOUND, 1, 0, priority++) == -1)
       ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
@@ -266,10 +266,10 @@ main (int argc, char *argv [])
   // Initialize the PCC timer Chip
   pccTimerInit();
 
-  if(pccTimer(PCC2_TIMER1_START,&pTime) !=K_OK)
-    {
-      printf("pccTimer has a pending bench mark\n");
-    }
+  if(pccTimer(PCC2_TIMER1_START,&pTime) !=K_OK) 
+    { 
+      printf("pccTimer has a pending bench mark\n"); 
+    } 
 #endif
 
   if (ts.thread_per_rate_ == 0)
@@ -279,10 +279,10 @@ main (int argc, char *argv [])
 
 #if defined (CHORUS)
   // stop the pccTimer for chorus ClassiX
-  if(pccTimer(PCC2_TIMER1_STOP,&pTime) !=K_OK)
-    {
-      printf("pccTimer has a pending benchmark\n");
-    }
+  if(pccTimer(PCC2_TIMER1_STOP,&pTime) !=K_OK) 
+    { 
+      printf("pccTimer has a pending benchmark\n"); 
+    } 
 #endif
 
   return 0;
diff --git a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
index f89dc1b2eb2..48238fd831b 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/IDL_Cubit/Makefile
@@ -45,8 +45,8 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-mv cubit.C cubit.cpp
-	-mv cubit_s.C cubit_s.cpp
+	-/bin/mv cubit.C cubit.cpp
+	-/bin/mv cubit_s.C cubit_s.cpp
 
 svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -82,6 +82,8 @@ check:	$(TESTS)
 	@./clnt -n250 -O `cat obj.5` -x
 	@echo ''
 
-realclean:
-	-$(RM) *.o cubit.cpp cubit.h cubit_s.cpp cubit_s.h $(CUBIT_SVR_OBJS) $(CUBIT_CLT_OBJS) $(BIN) core
+clean:
+	-/bin/rm -rf *.o cubit.cpp cubit.h cubit_s.cpp cubit_s.h $(CUBIT_SVR_OBJS) $(CUBIT_CLT_OBJS) $(BIN) core
+ 
+realclean: clean
 
diff --git a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
index d6834f2d40a..9441697f2d5 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/client/Makefile
@@ -42,13 +42,17 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-mv cubit.C cubit.cpp
+	-/bin/mv cubit.C cubit.cpp
 
 client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/mtiiop_s.o $(VLDLIBS) $(POSTLINK)
 
+clean:	
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) cubit.cpp cubit.h cubit_s.*
+	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
+
 
 # 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/CORBAplus/MT_Cubit/server/Makefile b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
index 4a73e39f1a8..58841d4d552 100644
--- a/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
+++ b/TAO/performance-tests/Cubit/CORBAplus/MT_Cubit/server/Makefile
@@ -44,15 +44,17 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): cubit.idl
 	$(PBHOME)/bin/idlc cubit.idl
-	-mv cubit.C cubit.cpp
-	-mv cubit_s.C cubit_s.cpp
+	-/bin/mv cubit.C cubit.cpp
+	-/bin/mv cubit_s.C cubit_s.cpp
 
 svr:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
 
-realclean: clean
-	-$(RM) cubit.cpp cubit.h cubit_s.*
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
 
+realclean: clean
+	-/bin/rm -rf cubit.cpp cubit.h cubit_s.*
 # 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/Orbix/base_server/Makefile b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
index 47e25193c7b..534ba4a20bb 100644
--- a/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/base_server/Makefile
@@ -55,14 +55,19 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) server cubitC.* cubitS.* cubit.hh
-
+	-/bin/rm -rf server cubitC.* cubitS.* cubit.hh
 #----------------------------------------------------------------------------
 #	Dependencies
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-
+.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.hh cubitC.cpp
+.obj/cubit_impl.o .obj/cubit_impl.so .shobj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.hh
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h cubit_impl.h \
+ cubit.hh
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/Orbix/client/Makefile b/TAO/performance-tests/Cubit/Orbix/client/Makefile
index 4600f50b145..f6de04f712b 100644
--- a/TAO/performance-tests/Cubit/Orbix/client/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/client/Makefile
@@ -58,15 +58,11 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitC.o .obj/cubitC.so .shobj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
+.obj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubit.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -74,19 +70,11 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
  $(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
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
+.obj/client.o .shobj/client.so: client.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -94,9 +82,6 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
  $(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/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i cubit.h
diff --git a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
index addb29d130c..b7703c51956 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tpool/Makefile
@@ -59,15 +59,11 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h \
+.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -75,40 +71,12 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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 \
- cubitC.cpp
-.obj/cubit_impl.o .obj/cubit_impl.so .shobj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
+.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -116,232 +84,6 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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 \
- tpool.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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.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 \
- $(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/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
-.obj/tpool.o .obj/tpool.so .shobj/tpool.o .shobj/tpool.so: tpool.cpp tpool.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Service_Config.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/Signal.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_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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.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 \
- $(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/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/Log_Record.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
index 96fe70563a7..74a5517d664 100644
--- a/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tpr/Makefile
@@ -59,15 +59,11 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h \
+.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -75,40 +71,12 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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 \
- cubitC.cpp
-.obj/cubit_impl.o .obj/cubit_impl.so .shobj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
+.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
@@ -116,85 +84,6 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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
-.obj/tpr.o .obj/tpr.so .shobj/tpr.o .shobj/tpr.so: tpr.cpp tpr.h cubit.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Service_Config.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/Signal.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_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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/Orbix/tps/Makefile b/TAO/performance-tests/Cubit/Orbix/tps/Makefile
index ff12f24622d..5130d054a5d 100644
--- a/TAO/performance-tests/Cubit/Orbix/tps/Makefile
+++ b/TAO/performance-tests/Cubit/Orbix/tps/Makefile
@@ -59,30 +59,23 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
-.obj/cubit_impl.o .obj/cubit_impl.so .shobj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
+.obj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubit.h cubitC.cpp
+.obj/cubit_impl.o .shobj/cubit_impl.so: cubit_impl.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
@@ -98,45 +91,25 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(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/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/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 \
@@ -146,64 +119,58 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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/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/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/ReactorEx.h \
+ $(ACE_ROOT)/ace/ReactorEx.i \
  $(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
-.obj/tps.o .obj/tps.so .shobj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
+ $(ACE_ROOT)/ace/Task_T.i
+.obj/server.o .shobj/server.so: server.cpp cubit_impl.h cubit.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
  $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/ACE.i \
  $(ACE_ROOT)/ace/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
@@ -219,45 +186,120 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(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/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(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/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/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/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(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/Time_Value.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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/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/Reactor.i \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/ReactorEx.h \
+ $(ACE_ROOT)/ace/ReactorEx.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Task_T.i
+.obj/tps.o .shobj/tps.so: tps.cpp tps.h cubit.h cubit_impl.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5-sunc++-4.x.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(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/Log_Priority.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/ACE.i \
+ $(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/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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Signal.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Containers.i \
+ $(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/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 \
@@ -267,40 +309,41 @@ server: $(addprefix $(VDIR),$(SVR_OBJS))
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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/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/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Timer_List.h \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/ReactorEx.h \
+ $(ACE_ROOT)/ace/ReactorEx.i \
  $(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/Task_T.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
index 91ec2f6bf1b..1c59abf512c 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile
@@ -16,7 +16,7 @@ DIRS    = ../IDL_Cubit
 
 LDLIBS = ../IDL_Cubit/.obj/cubitC.o \
          ../IDL_Cubit/.obj/cubitS.o \
-         -lTAO
+         -lorbsvcs -lTAO
 
 PROG_SRCS = client.cpp
 
@@ -27,16 +27,15 @@ CUBIT_CLT_OBJS = client.o
 CFLAGS += -I../IDL_Cubit
 
 BIN = client
+BUILD = $(BIN) ../IDL_Cubit/server
 VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-BUILD := ../IDL_Cubit/server $(BUILD)
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(TAO_ROOT)/rules.tao.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
@@ -48,7 +47,9 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs \
+           -L$(TAO_ROOT)/tao \
+           -L$(TAO_ROOT)/orbsvcs/Naming_Service
 
 ifeq ($(CXX),cxx)
   ifeq ($(findstring ptrepository,$(CCFLAGS)),ptrepository)
@@ -62,6 +63,8 @@ ifeq (-xildoff,$(findstring -xildoff,$(LDFLAGS)))
 endif # Sun CC
 endif # cxx
 
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
+
 .PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h
 
 client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
@@ -71,7 +74,7 @@ client: $(addprefix $(VDIR),$(CUBIT_CLT_OBJS))
 	cd ../IDL_Cubit; $(MAKE) BUILD=server
 
 realclean: clean
-	-$(RM) cubitC.* cubitS.* cubitS_T.*
+	-/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -80,6 +83,9 @@ realclean: clean
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -143,85 +149,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -230,31 +230,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -276,8 +267,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -294,73 +288,66 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Env_Value_T.h \
+ $(ACE_ROOT)/ace/Env_Value_T.i \
+ $(ACE_ROOT)/ace/Env_Value_T.cpp \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/IOR_Multicast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/CosNaming_i.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 \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h \
  ../IDL_Cubit/cubitC.h ../IDL_Cubit/cubitC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README b/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
index f7afda6d95c..278a8fd42eb 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/README
@@ -1,16 +1,11 @@
 // $Id$
 
 This is the cubit example that does everything using DII requests. 
-It uses the server in IDL_Cubit. Getting a reference
+It uses the server in IDL_Cubit. The initial call to resolve the 
+nameservice is made on the orb. After that, getting a reference
 to the Cubit object, making the Cubit operation calls, 
 and shutting down the server are all done with DII requests.
 
-NOTES: The IDL_Cubit server used to run a Naming Service so the client
-        could easily locate it.  This proved too problematic, the test
-        required a complete compilation of the orbsvcs library and was
-        not reliable. The preferred method is to use a file to pass
-        the factory IOR between the server and the client.
-
 To run the tests with one "button-push", execute the perl script run_test.pl
 in this directory. It will start up the server and client. The client will
 shut down the server when the tests are finished.
@@ -34,7 +29,8 @@ the following args:
 
 If using the -i option, you might want to run the server with the option 
 [-ORBobjrefstyle url]. This will cause the server to display its IOR in a 
-more human-readable form. The server can be run in the same window in the 
+more human-readable form. Make sure you use the factory IOR, NOT the nameservice 
+IOR. The server displays both. The server can be run in the same window in the 
 background, or in a different window.
 
 The command line options, default calls per loop, order and display format of the 
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 6e6afc04eca..294b2da1c52 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -14,14 +14,18 @@
 //      interface using DII functionality.
 //
 // = AUTHOR
-//	Jeff Parsons <parsons@cs.wustl.edu>
+//	Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ============================================================================
 
 #include "tao/corba.h"
+#include "ace/streams.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Env_Value_T.h"
 #include "ace/Read_Buffer.h"
+#include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/Naming/Naming_Utils.h"
 
 // Since we don't yet have an interface repository or dynamic-Any, we
 // just get the info from the IDL-generated files, since we're mainly
@@ -48,6 +52,24 @@ if (this->env_.exception () != 0) \
  return; \
 }
 
+#define CUBIT_CHECK_ENV_RELEASE_RETURN_VOID(REQ, PRINT_STRING) \
+if (this->env_.exception () != 0) \
+{ \
+    this->error_count_++; \
+ this->env_.print_exception (PRINT_STRING); \
+ CORBA::release (REQ); \
+ return; \
+}
+
+#define REQUEST_CHECK_ENV_RETURN_VOID(REQ, PRINT_STRING) \
+if (REQ->env ()->exception () != 0) \
+{ \
+    this->error_count_++; \
+ REQ->env ()->print_exception (PRINT_STRING); \
+ CORBA::release (REQ); \
+ return; \
+}
+
 class DII_Cubit_Client 
 {
   // = TITLE
@@ -124,6 +146,9 @@ private:
   int shutdown_;
   // Flag to tell server to exit.
 
+  int use_naming_service_;
+  // Flag toggling use of naming service to get IOR.
+
   CORBA::Environment env_;
   // Environment variable.
 
@@ -150,13 +175,17 @@ private:
 
   ACE_HANDLE f_handle_;
   // File handle to read the IOR.
+
+  TAO_Naming_Client my_name_client_;
+  // An instance of the name client used for resolving the factory
+  // objects.
 };
 
 // Constructor
 DII_Cubit_Client::DII_Cubit_Client (void)
   : loop_count_ (DEFAULT_LOOP_COUNT),			
     shutdown_ (0),
-    env_ (CORBA::default_environment ()),
+    use_naming_service_ (1),
     orb_var_ (0),
     factory_var_ (CORBA::Object::_nil ()),
     obj_var_ (CORBA::Object::_nil ()),
@@ -206,64 +235,161 @@ DII_Cubit_Client::init (int argc, char **argv)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY_NEW_ENV
+  // Exits gracefully when no IOR is provided and use_naming_service_
+  // is toggled off.
+  if (!ACE_OS::strcmp (this->factory_IOR_,
+		       DEFAULT_FACTORY_IOR) 
+      && !this->use_naming_service_)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%s: Must supply IOR, read it from a file, or use naming service."
+                       "\n",
+                       this->argv_ [0]),
+                      -1);
+
+  TAO_TRY
     {
       // Initialize the ORB.
       this->orb_var_ = CORBA::ORB_init (this->argc_,
                                         this->argv_,
                                         "internet",
-                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "DII_Cubit_Client::parse_args failed"),
-                          -1);
+        return -1;
 
-      // Get a factory object reference from the factory IOR.
-      this->factory_var_ = 
-        this->orb_var_->string_to_object (this->factory_IOR_, 
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (this->use_naming_service_)
+        {
+          // Get a factory object reference from the naming service.
+          if (this->init_naming_service () == -1)
+            return -1;
+        }
+      else
+        {
+          // Get a factory object reference from the factory IOR.
+          this->factory_var_ = 
+            this->orb_var_->string_to_object (this->factory_IOR_, 
+                                              TAO_TRY_ENV);
+          TAO_CHECK_ENV;
+        }
 
       // Get a Cubit object with a DII request on the Cubit factory.
-      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit", ACE_TRY_ENV));
+      CORBA::Request_ptr mc_req =
+        this->factory_var_->_request ("make_cubit", TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 	
       // make_cubit takes a char* arg that it doesn't use, but we must
       // still include it in the request.
       CORBA::String dummy = "";
 
-      mc_req->add_in_arg () <<= dummy;
-
-      mc_req->set_return_type (CORBA::_tc_Object);
+      CORBA::Any string_arg (CORBA::_tc_string,
+                             &dummy,
+                             0);
+   
+      // @@ Jeff, is it possible to use the operator<< for this in
+      // order to simplify the code?
+      mc_req->arguments ()->add_value (0,
+				       string_arg,
+				       CORBA::ARG_IN,
+				       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Insert the result-holding variable into the request.
       mc_req->result ()->value ()->replace (CORBA::_tc_Object, 
                                             &this->obj_var_,
                                             0, 
-                                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Invoke the <make_cubit> operation to ask the Cubit factory
       // for a Cubit object.
-      mc_req->invoke (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      mc_req->invoke ();
+
+      CORBA::release (mc_req);
 
       if (CORBA::is_nil (this->obj_var_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            " could not obtain Cubit object from Cubit factory <%s>\n"),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("DII_Cubit_Client::init");
+      TAO_TRY_ENV.print_exception ("DII_Cubit_Client::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
+
+  return 0;
+}
+
+// Get the factory IOR via a DII request on the naming service.
+
+int
+DII_Cubit_Client::init_naming_service (void)
+{
+  TAO_TRY
+    {
+      // Initialize the naming services
+      if (my_name_client_.init (orb_var_.in ()) != 0)
+	ACE_ERROR_RETURN ((LM_ERROR,
+			   " (%P|%t) Unable to initialize "
+			   "the TAO_Naming_Client. \n"),
+			  -1);
+      /*
+	// Get the naming service from the orb.
+	CORBA::Object_var naming_obj =
+	this->orb_var_->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);
+      */
+      
+      // Build a Name object.
+      CosNaming::Name cubit_factory_name (2);
+      cubit_factory_name.length (2);
+      cubit_factory_name[0].id = CORBA::string_dup ("IDL_Cubit");
+      cubit_factory_name[1].id = CORBA::string_dup ("cubit_factory");
+
+      // Build up the <resolve> operation using the DII!
+      CORBA::Request_ptr req =
+        my_name_client_->_request ("resolve", TAO_TRY_ENV);
+
+      TAO_CHECK_ENV;
+
+      CORBA::Any name_arg (CosNaming::_tc_Name,
+                           &cubit_factory_name,
+                           0);
+  
+      req->arguments ()->add_value (0,
+				    name_arg,
+				    CORBA::ARG_IN,
+				    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      req->result ()->value ()->replace (CORBA::_tc_Object, 
+                                         &this->factory_var_,
+                                         0, 
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      req->invoke ();
+      CORBA::release (req);
+
+      if (CORBA::is_nil (this->factory_var_.in ()))
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           " could not resolve cubit factory in Naming service <%s>\n"),
+                          -1);
+    }
+  TAO_CATCHANY
+    {
+      TAO_TRY_ENV.print_exception ("DII_Cubit_Client::init_naming_service");
+      return -1;
+    }
+  TAO_ENDTRY;
 
   return 0;
 }
@@ -287,9 +413,11 @@ DII_Cubit_Client::parse_args (void)
         this->loop_count_ = ACE_OS::atoi (opts.optarg);
         break;        
       case 'i':	  // Get the IOR from the command line.	
+	this->use_naming_service_ = 0;
         this->factory_IOR_ = opts.optarg;
         break;
       case 'f':   // Read the IOR from the file.
+	this->use_naming_service_ = 0;
         result = this->read_ior (opts.optarg);
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -396,113 +524,174 @@ void
 DII_Cubit_Client::cube_short_dii (void)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_short",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_short",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_short_dii request create");
 
   CORBA::Short ret_short = 0;
   CORBA::Short arg_short = -3;
 
-  // Add the short to the request arg list.
-  req->add_in_arg () <<= arg_short;
+  // Make an Any out of the short and add it to the request arg list.
+  CORBA::Any arg_holder (CORBA::_tc_short,
+                         &arg_short, 
+			 0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_short_dii request arg add");
 
-  req->set_return_type (CORBA::_tc_short);
+  // Initialize the result variable.
+  req->result ()->value ()->replace (CORBA::_tc_short, 
+                                     &ret_short, 
+                                     0, 
+                                     this->env_);
 
-  this->call_count_++;
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_short_dii result type");
+
+  // Invoke, check for an exception and verify the result.
 
-  req->invoke (this->env_);
+  this->call_count_++;
 
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_short_dii invoke");
+  req->invoke ();
 
-  req->return_value () >>= ret_short;
+  REQUEST_CHECK_ENV_RETURN_VOID (req, 
+                                 "cube_short_dii invoke");
 
   if (ret_short != arg_short * arg_short * arg_short) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_short_dii -- bad results\n"));
-
       this->error_count_++;
     }
+
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_long_dii (void)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_long",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_long",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_dii request create");
 
   CORBA::Long ret_long = 0;
   CORBA::Long arg_long = -7;
 
-  // Add the long to the request arg list.
-  req->add_in_arg () <<= arg_long;
+  // Make an Any out of the long and add it to the request arg list.
+  CORBA::Any arg_holder (CORBA::_tc_long,
+                         &arg_long,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
 
-  req->set_return_type (CORBA::_tc_long);
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_long_dii request arg add");
 
-  this->call_count_++;
+  // Insert the result variable.
+  req->result ()->value ()->replace (CORBA::_tc_long, 
+                                     &ret_long, 
+                                     0, 
+                                     this->env_);
 
-  req->invoke (this->env_);
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_long_dii result type");
 
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_dii invoke");
+  // Invoke, check for an exception and verify the result.
+
+  this->call_count_++;
 
-  req->return_value () >>= ret_long;
+  req->invoke ();
+
+  REQUEST_CHECK_ENV_RETURN_VOID (req, 
+                                 "cube_long_dii invoke");
 
   if (ret_long != arg_long * arg_long * arg_long) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_long_dii -- bad results\n"));
-
       this->error_count_++;
     }
+   
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_octet_dii (void)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_octet",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_octet",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_dii request create");
 
   CORBA::Octet ret_octet = 0;
   CORBA::Octet arg_octet = 5;
 
-  // Add the octet to the request arg list.
-  CORBA::Any::from_octet from_arg_octet (arg_octet);
-  req->add_in_arg () <<= from_arg_octet;
+  // Make an Any out of the octet and add it to the request arg list.
+  CORBA::Any arg_holder (CORBA::_tc_octet,
+                         &arg_octet,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_octet_dii request arg add");
 
-  req->set_return_type (CORBA::_tc_octet);
+  // Insert the result variable.
+  req->result ()->value ()->replace (CORBA::_tc_octet, 
+                                     &ret_octet, 
+                                     0, 
+                                     this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_octet_dii result type");
 
   // Invoke, check for an exception and verify the result.
   this->call_count_++;
 
-  req->invoke (this->env_);
-
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_dii invoke");
+  req->invoke ();
 
-  CORBA::Any::to_octet to_ret_octet (ret_octet);
-  req->return_value () >>= to_ret_octet;
+  REQUEST_CHECK_ENV_RETURN_VOID (req, 
+                                 "cube_octet_dii invoke");
 
   if (ret_octet != arg_octet * arg_octet * arg_octet) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_octet_dii -- bad results\n"));
-
       this->error_count_++;
     }
+   
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_union_dii (void)
-{ 
+{
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_union",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_union",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_union_dii request create");
 
@@ -517,22 +706,35 @@ DII_Cubit_Client::cube_union_dii (void)
   ret_union._d(Cubit::e_1st);
   ret_union.s (0);
    
-  // Add the union to the request arg list and set the return type.
-  req->add_in_arg () <<= arg_union;
+  // Make an Any out of the union and add it to the request arg list.
+  CORBA::Any arg_holder (Cubit::_tc_oneof,
+                         &arg_union,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_union_dii request arg add");
+
+  // Insert the result variable.
+  req->result ()->value ()->replace (Cubit::_tc_oneof, 
+                                     &ret_union, 
+                                     0, 
+                                     this->env_);
 
-  req->set_return_type (Cubit::_tc_oneof);
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_union_dii result type");
 
   // Invoke, check for an exception and verify the result
 
   this->call_count_++;
 
-  req->invoke (this->env_);
+  req->invoke ();
 
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_union_dii invoke");
-
-  // Extract the result and check validity.
-  Cubit::oneof* ret_ptr = &ret_union;
-  req->return_value () >>= ret_ptr;
+  REQUEST_CHECK_ENV_RETURN_VOID (req, "cube_union_dii invoke");
 
   if (ret_union.cm ().l != arg_union.cm ().l * arg_union.cm ().l * arg_union.cm ().l 
       || ret_union.cm ().s != arg_union.cm ().s * arg_union.cm ().s * arg_union.cm ().s 
@@ -540,151 +742,212 @@ DII_Cubit_Client::cube_union_dii (void)
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_union_dii -- bad results\n"));
-
       this->error_count_++;
-    } 
+    }
+   
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_struct_dii (void)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_struct",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_struct",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_struct_dii request create");
 
-  Cubit::Many arg_struct, *ret_struct_ptr;
+  Cubit::Many arg_struct, ret_struct;
 
+  ret_struct.l = 0;
+  ret_struct.s = 0;
+  ret_struct.o = 0;
+  
   arg_struct.l = 5;
   arg_struct.s = -7;
   arg_struct.o = 3;
 
-  // Add struct to the request arg list.
-  req->add_in_arg () <<= arg_struct;
+  // Make an Any out of the struct and add it to the request arg list.
+  CORBA::Any arg_holder (Cubit::_tc_Many,
+                         &arg_struct,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
 
-  req->set_return_type (Cubit::_tc_Many);
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_struct_dii request arg add");
+
+  // Insert the result variable.
+  req->result ()->value ()->replace (Cubit::_tc_Many, 
+                                     &ret_struct, 
+                                     0, 
+                                     this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_struct_dii result type");
 
   // Invoke, check for an exception and verify the result.
 
   this->call_count_++;
 
-  req->invoke (this->env_);
-
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_struct_dii invoke");
+  req->invoke ();
 
-  req->return_value () >>= ret_struct_ptr;
+  REQUEST_CHECK_ENV_RETURN_VOID (req, "cube_struct_dii invoke");
 
-  if (ret_struct_ptr->l != arg_struct.l * arg_struct.l * arg_struct.l 
-      || ret_struct_ptr->s != arg_struct.s * arg_struct.s * arg_struct.s 
-      || ret_struct_ptr->o != arg_struct.o * arg_struct.o * arg_struct.o) 
+  if (ret_struct.l != arg_struct.l * arg_struct.l * arg_struct.l 
+      || ret_struct.s != arg_struct.s * arg_struct.s * arg_struct.s 
+      || ret_struct.o != arg_struct.o * arg_struct.o * arg_struct.o) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_struct_dii -- bad results\n"));
-
       this->error_count_++;
     }
+   
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_octet_seq_dii (int length)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_octet_sequence",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_seq_dii request create");
 
   // Same length as in IDL_Cubit tests so timings can be compared.
   // Return value holder is set to a different length to test resizing.
-  Cubit::octet_seq arg_octet_seq (length), *ret_octet_seq_ptr;
+  Cubit::octet_seq ret_octet_seq (1), arg_octet_seq (length);
   arg_octet_seq.length (length);
   arg_octet_seq[0] = 4;  
+  ret_octet_seq[0] = 0;
 
-  // Add octet sequence to the request arg list
+  // Make an Any out of the octet_seq and add it to the request arg list
+  CORBA::Any arg_holder (Cubit::_tc_octet_seq,
+                         &arg_octet_seq,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_octet_seq_dii request arg add");
 
-  req->add_in_arg () <<= arg_octet_seq;
+  // Insert the result variable.
+  req->result ()->value ()->replace (Cubit::_tc_octet_seq, 
+                                     &ret_octet_seq, 
+                                     0, 
+                                     this->env_);
 
-  req->set_return_type (Cubit::_tc_octet_seq);
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_octet_seq_dii result type");
 
   // Invoke, check for an exception and verify the result.
 
   this->call_count_++;
 
-  req->invoke (this->env_);
-
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_octet_seq_dii invoke");
+  req->invoke ();
 
-  req->return_value () >>= ret_octet_seq_ptr;
+  REQUEST_CHECK_ENV_RETURN_VOID (req, 
+                                 "cube_octet_seq_dii invoke");
 
   // Check for correct length.
-  if (ret_octet_seq_ptr->length () != arg_octet_seq.length ()) 
+  if (ret_octet_seq.length () != arg_octet_seq.length ()) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_octet_seq_dii -- bad length\n"));
-
       this->error_count_++;
     }
 
   // Check for correct value(s).
-  if ((*ret_octet_seq_ptr)[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0]) 
+  if (ret_octet_seq[0] != arg_octet_seq[0] * arg_octet_seq[0] * arg_octet_seq[0]) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_octet_seq_dii -- bad results\n"));
-
       this->error_count_++;
     }
+   
+  CORBA::release (req);
 }
 
 void
 DII_Cubit_Client::cube_long_seq_dii (int length)
 {
   // Create the request ...
-  CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence",
-                                                    this->env_));
+  CORBA::Request_ptr req;
+
+  req = this->obj_var_->_request ("cube_long_sequence",
+                                  this->env_);
 
   CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_seq_dii request create");
 
   // Same length as in IDL_Cubit tests so timings can be compared.
   // Return value holder is set to a different length to test
   // resizing.
-  Cubit::long_seq *ret_long_seq_ptr;
+  Cubit::long_seq ret_long_seq (1);
   Cubit::long_seq arg_long_seq (length);
   arg_long_seq.length (length);
   arg_long_seq[0] = 4;
+  ret_long_seq[0] = 0;
+
+  // Make an Any out of the long_seq and add it to the request arg
+  // list.
+  CORBA::Any arg_holder (Cubit::_tc_long_seq,
+                         &arg_long_seq,
+                         0);
+   
+  req->arguments ()->add_value (0,
+                                arg_holder,
+                                CORBA::ARG_IN,
+                                this->env_);
 
-  // Add the long_seq to the request arg list.
-  req->add_in_arg () <<= arg_long_seq;
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_long_seq_dii request arg add");
 
-  req->set_return_type (Cubit::_tc_long_seq);
+  // Insert the result variable.
+  req->result ()->value ()->replace (Cubit::_tc_long_seq, 
+                                     &ret_long_seq, 
+                                     0, 
+                                     this->env_);
+
+  CUBIT_CHECK_ENV_RELEASE_RETURN_VOID (req,
+                                       "cube_long_seq_dii result type");
 
   // Invoke, check for an exception and verify the result.
 
   this->call_count_++;
 
-  req->invoke (this->env_);
-
-  CUBIT_CHECK_ENV_RETURN_VOID ("cube_long_seq_dii invoke");
+  req->invoke ();
 
-  req->return_value () >>= ret_long_seq_ptr;
+  REQUEST_CHECK_ENV_RETURN_VOID (req,
+                                 "cube_long_seq_dii invoke");
 
   // Check for correct length.
-  if (ret_long_seq_ptr->length () != arg_long_seq.length ()) 
+  if (ret_long_seq.length () != arg_long_seq.length ()) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_long_seq_dii -- bad length\n"));
-
       this->error_count_++;
     }
 
   // Check for correct value(s).
-  if ((*ret_long_seq_ptr)[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0]) 
+  if (ret_long_seq[0] != arg_long_seq[0] * arg_long_seq[0] * arg_long_seq[0]) 
     {
       ACE_ERROR ((LM_ERROR,
                   "cube_long_seq_dii -- bad results\n"));
-
       this->error_count_++;
     }
+   
+  CORBA::release (req);
 }
 
 // Wrappers for operations with non-void arg lists and the 3-in-1
@@ -750,30 +1013,32 @@ DII_Cubit_Client::run (void)
       this->print_stats (this->stats_messages_[j], dii_elapsed_time);
     }
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Shut down server via a DII request.
       if (this->shutdown_)
         {
-          CORBA::Request_var req (this->obj_var_->_request ("shutdown",
-                                                            ACE_TRY_ENV));
+          CORBA::Request_ptr req;
 
-          ACE_TRY_CHECK;
+          req = this->obj_var_->_request ("shutdown",
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           // Cubit::shutdown () is a oneway operation.
-          req->send_oneway (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          req->send_oneway ();
+
+          CORBA::release (req);
 
           ACE_DEBUG ((LM_DEBUG,
                       "\n\t Shutting down IDL_Cubit server \n\n"));
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("DII_Cubit_Client: server shutdown");
+      TAO_TRY_ENV.print_exception ("DII_Cubit_Client: server shutdown");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return this->error_count_ == 0 ? 0 : 1;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
index 5b91266bb1d..4ab257a8507 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.dsp
@@ -17,12 +17,13 @@ CFG=DII_Cubit Client - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "DII_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DII_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "DII_Cubit Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "DII_Cubit Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -76,7 +77,7 @@ BSC32=bscmake.exe
 # 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 TAOd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

+# ADD LINK32 TAOd.lib aced.lib orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\orbsvcs\orbsvcs"

 

 !ENDIF 

 

@@ -105,6 +106,10 @@ SOURCE=..\IDL_Cubit\cubitS.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

+SOURCE=.\client.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\IDL_Cubit\cubitC.h

 # End Source File

 # Begin Source File

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
index 850b05d6503..bb1241bfd7e 100755
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 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;
 
@@ -14,17 +13,17 @@ $iorfile = "theior";
 $sleeptime = 5;
 
 $SV = Process::Create ("..$DIR_SEPARATOR"
-                       ."IDL_Cubit".$DIR_SEPARATOR.
-                       "server".$Process::EXE_EXT,
+		       ."IDL_Cubit".$DIR_SEPARATOR.
+		       "server".$Process::EXE_EXT,
                        " -ORBport ".$server_port.
-                       " -ORBobjrefstyle url".
-                       " -o $iorfile");
+		       " -ORBobjrefstyle url".
+		       " -o $iorfile");
 
 sleep $sleeptime;
 
 $status = system ("client".$Process::EXE_EXT.
-                  " -ORBport $client_port".
-                  " -f $iorfile -x");
+		  " -ORBport $client_port".
+		  " -f $iorfile -x");
 
 # @@ TODO change to Wait() once the -x option works.
 $SV->Kill (); $SV->Wait ();
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 17a27e5b1e5..ed8f0590f1c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -667,7 +667,7 @@ Cubit_Client::cube_many_sequence (int, int l)
 
   // Cube the sequence
   {
-    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
 
     this->cubit_->cube_many_sequence (input, vout, this->env_);
   }
@@ -770,7 +770,7 @@ Cubit_Client::cube_rti_data (int, int numUpdates, int numAttrs)
     }
 
   {
-    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
+    ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_RTI_DATA_START);
 
     this->cubit_->cube_rti_data (input, vout, this->env_);
   }
@@ -900,6 +900,8 @@ Cubit_Client::run ()
   timer.elapsed_time (elapsed_time);
   this->print_stats ("cube_struct", elapsed_time);
 
+#if 0 /* ASG - temporarily commented out since <<, >> operators for unions are
+         not supported yet */
   // UNION
   this->call_count_ = 0;
   this->error_count_ = 0;
@@ -909,6 +911,7 @@ Cubit_Client::run ()
   timer.stop ();
   timer.elapsed_time (elapsed_time);
   this->print_stats ("cube_union_stub call", elapsed_time);
+#endif /* ASG */
 
   // SMALL LONG SEQUENCES
   this->call_count_ = 0;
@@ -984,6 +987,8 @@ Cubit_Client::run ()
   timer.elapsed_time (elapsed_time);
   this->print_stats ("cube mixin (short/octet/long)", elapsed_time);
 
+#if 0 /* ASG - temporarily commented out since <<, >> operators for unions are
+         not supported yet */
   // RTI
   this->call_count_ = 0;
   this->error_count_ = 0;
@@ -993,6 +998,7 @@ Cubit_Client::run ()
   timer.stop ();
   timer.elapsed_time (elapsed_time);
   this->print_stats ("cube_rti_data", elapsed_time);
+#endif /* ASG */
 
   // ONEWAY
   this->call_count_ = 0;
@@ -1004,6 +1010,7 @@ Cubit_Client::run ()
   timer.elapsed_time (elapsed_time);
   this->print_stats ("cube_oneway", elapsed_time);
 
+  // This causes a memPartFree on VxWorks.
   this->shutdown_server (this->shutdown_);
 
   return this->error_count_ == 0 ? 0 : 1;
@@ -1018,7 +1025,7 @@ Cubit_Client::shutdown_server (int do_shutdown)
       // Make sure we call the following method "remotely" so
       // the right ORB could be used.
 
-      ACE_TRY_NEW_ENV
+      TAO_TRY
         {
           if (this->cubit_factory_key_ == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -1028,13 +1035,13 @@ Cubit_Client::shutdown_server (int do_shutdown)
 
           CORBA::Object_var factory_object =
             this->orb_->string_to_object (this->cubit_factory_key_,
-                                          ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           this->factory_ =
             Cubit_Factory::_narrow (factory_object.in(),
-                                    ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           if (CORBA::is_nil (this->factory_.in ()))
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -1043,22 +1050,22 @@ Cubit_Client::shutdown_server (int do_shutdown)
                               -1);
 
           this->cubit_ =
-            this->factory_->make_cubit (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+            this->factory_->make_cubit (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
-          this->cubit_->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->cubit_->shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
 
           ACE_DEBUG ((LM_DEBUG, "shutdown on shutdown object\n"));
 
           this->env_.print_exception ("server, please ACE_OS::exit");
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
-          ACE_TRY_ENV.print_exception ("Cubit::init");
+          TAO_TRY_ENV.print_exception ("Cubit::init");
           return -1;
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
 
     }
   else if (do_shutdown)
@@ -1149,14 +1156,14 @@ Cubit_Client::init (int argc, char **argv, char *collocation_test_ior)
   this->argc_ = argc;
   this->argv_ = argv;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
                                     "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (this->testing_collocation_ == 0)
         // turn off collocation if directed to do so.
         TAO_ORB_Core_instance ()->using_collocation (0);
@@ -1176,13 +1183,13 @@ Cubit_Client::init (int argc, char **argv, char *collocation_test_ior)
 
       CORBA::Object_var factory_object =
         this->orb_->string_to_object (this->cubit_factory_key_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       this->factory_ =
         Cubit_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->factory_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -1195,20 +1202,20 @@ Cubit_Client::init (int argc, char **argv, char *collocation_test_ior)
 
       // Now retrieve the Cubit obj ref corresponding to the key.
       this->cubit_ =
-        this->factory_->make_cubit (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        this->factory_->make_cubit (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (CORBA::is_nil (this->cubit_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
                            "null cubit objref returned by factory\n"),
                           -1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Cubit::init");
+      TAO_TRY_ENV.print_exception ("Cubit::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
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 180d44c13b5..9ddc9cf6c08 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -47,19 +47,19 @@ Cubit_Server::parse_args (void)
 int
 Cubit_Server::init (int argc,
                     char** argv,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    CORBA::Environment& env)
 {
   // 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,
                                          argv,
                                          "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
                       -1);
-  ACE_CHECK_RETURN (-1);
+  TAO_CHECK_ENV_RETURN (env,-1);
   this->argc_ = argc;
   this->argv_ = argv;
 
@@ -72,21 +72,19 @@ Cubit_Server::init (int argc,
   // Now create the implementations
   this->factory_impl_ = new Cubit_Factory_i (orb.in ());
 
-  this->factory_id_ =
+  CORBA::String_var str  =
     this->orb_manager_.activate_under_child_poa ("factory",
                                                  this->factory_impl_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
+                                                 env);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
-              this->factory_id_.in ()));
+              str.in ()));
 
   if (this->ior_output_file_)
     {
       ACE_OS::fprintf (this->ior_output_file_,
                        "%s",
-                       this->factory_id_.in ());
+                       str.in ());
       ACE_OS::fclose (this->ior_output_file_);
     }
 
@@ -105,8 +103,5 @@ Cubit_Server::run (CORBA::Environment& env)
 
 Cubit_Server::~Cubit_Server (void)
 {
-  if (this->factory_id_.in ())
-    this->orb_manager_.deactivate_under_child_poa (this->factory_id_.in ());
-
   delete this->factory_impl_;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index eb10eea456d..361cf838b46 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -71,9 +71,6 @@ private:
   Cubit_Factory_i *factory_impl_;
   // Implementation object of the cubit factory.
 
-  CORBA::String_var factory_id_;
-  // Id of the factory.
-
   int argc_;
   // Number of commandline arguments.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index e0920978178..3d8d8891f0a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -60,7 +60,7 @@ static const char *Cubit_i_Timeprobe_Description[] =
 
 enum
 {
-  // Timeprobe description table start key
+  // Timeprobe description table start key 
   CUBIT_I_CUBE_ONEWAY_START = 10100,
   CUBIT_I_CUBE_ONEWAY_END,
 
@@ -101,8 +101,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (Cubit_i_Timeprobe_Description,
 // Constructor
 
 Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
-  : my_cubit_ (orb),
-    cubit_registered_ (0)
+  : my_cubit_ (orb)
 {
 }
 
@@ -110,34 +109,11 @@ Cubit_Factory_i::Cubit_Factory_i (CORBA::ORB_ptr orb)
 
 Cubit_Factory_i::~Cubit_Factory_i (void)
 {
-  if (this->cubit_registered_)
-    {
-      ACE_TRY_NEW_ENV
-        {
-          PortableServer::POA_var poa = this->my_cubit_._default_POA (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          PortableServer::ObjectId_var id = poa->servant_to_id (&this->my_cubit_,
-                                                                ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          poa->deactivate_object (id.in (),
-                                  ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught and ignored");
-        }
-      ACE_ENDTRY;
-    }
 }
 
 Cubit_ptr
 Cubit_Factory_i::make_cubit (CORBA::Environment &env)
 {
-  this->cubit_registered_ = 1;
-
   return my_cubit_._this (env);
 }
 
@@ -318,7 +294,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 #endif
 }
 
-void
+void 
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
                              Cubit::many_seq_out output,
                              CORBA::Environment &)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index a1d1b3b2a0d..318d821af33 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -111,8 +111,6 @@ public:
 
 private:
   Cubit_i my_cubit_;
-
-  int cubit_registered_;
 };
 
 #endif /* _CUBIT_I_H */
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
index a4c96203935..dc2f9b4f6de 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile
@@ -76,6 +76,8 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/tao
 
 .PRECIOUS: cubitC.cpp cubitS.cpp cubitC.h cubitS.h
+#$(IDL_SRC): cubit.idl
+#	$(TAO_ROOT)/TAO_IDL/tao_idl cubit.idl
 
 server:	$(addprefix $(VDIR),$(CUBIT_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -87,15 +89,23 @@ collocation/collocation_test: $(addprefix $(VDIR),$(COLLOCATION_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) cubitC.* cubitS.* cubitS_T.*
+	-/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitC.o .obj/cubitC.so .shobj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubitC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/cubitC.o .obj/cubitC.so .shobj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubitC.h cubitC.i cubitS.h cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i
+.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i
+.obj/Cubit_Server.o .obj/Cubit_Server.so .shobj/Cubit_Server.o .shobj/Cubit_Server.so: Cubit_Server.cpp Cubit_Server.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -103,13 +113,14 @@ realclean: clean
  $(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/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/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -159,64 +170,47 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ Cubit_Client.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
+ $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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 \
@@ -227,223 +221,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.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/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/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 \
- $(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.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/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 \
@@ -470,85 +252,28 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -570,8 +295,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -588,71 +316,49 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
-.obj/Cubit_Server.o .obj/Cubit_Server.so .shobj/Cubit_Server.o .shobj/Cubit_Server.so: Cubit_Server.cpp Cubit_Server.h \
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i \
+ $(TAO_ROOT)/tao/TAO_Internal.h
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Cubit_Server.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -717,61 +423,25 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  Cubit_Client.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
@@ -779,15 +449,21 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i \
  $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(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 \
@@ -798,239 +474,11 @@ realclean: clean
  $(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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.h cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
- cubitS_T.cpp cubitS.i \
- $(TAO_ROOT)/tao/TAO_Internal.h
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Cubit_Server.h \
- $(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/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/Get_Opt.i \
- $(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/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/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/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/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 \
@@ -1057,73 +505,28 @@ realclean: clean
  $(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/ORB.i \
- Cubit_Client.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1145,8 +548,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1163,72 +569,49 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.h cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
- cubitS_T.cpp cubitS.i \
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 .obj/Cubit_Client.o .obj/Cubit_Client.so .shobj/Cubit_Client.o .shobj/Cubit_Client.so: Cubit_Client.cpp \
  $(ACE_ROOT)/ace/Env_Value_T.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1305,85 +688,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1392,31 +769,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1438,8 +806,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1456,65 +827,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.h cubitC.i \
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/TAO_Internal.h \
@@ -1524,6 +869,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1594,85 +942,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1681,31 +1023,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1727,8 +1060,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1745,72 +1081,49 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.h cubitC.i Cubit_Server.h \
- $(TAO_ROOT)/tao/TAO.h \
- Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i Cubit_Server.h \
+ $(TAO_ROOT)/tao/TAO.h Cubit_i.h \
+ cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp Cubit_Client.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1880,85 +1193,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1967,31 +1274,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2013,8 +1311,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2031,71 +1332,48 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.h cubitC.i \
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h
 .obj/Cubit_Client.o .obj/Cubit_Client.so .shobj/Cubit_Client.o .shobj/Cubit_Client.so: Cubit_Client.cpp \
  $(ACE_ROOT)/ace/Env_Value_T.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2172,294 +1450,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.h cubitC.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- RTI_IO.h
-.obj/RTI_IO.o .obj/RTI_IO.so .shobj/RTI_IO.o .shobj/RTI_IO.so: RTI_IO.cpp RTI_IO.h cubitC.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/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/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 \
- $(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.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/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 \
@@ -2486,52 +1523,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -2540,31 +1531,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -2586,8 +1568,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2604,70 +1589,52 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.i
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.h \
+ $(TAO_ROOT)/tao/Union.h cubitC.h \
+ cubitC.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/TAO_Internal.h \
+ RTI_IO.h
+.obj/RTI_IO.o .obj/RTI_IO.so .shobj/RTI_IO.o .shobj/RTI_IO.so: RTI_IO.cpp RTI_IO.h cubitC.h cubitC.i
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.h cubitC.i
+.obj/Cubit_i.o .obj/Cubit_i.so .shobj/Cubit_i.o .shobj/Cubit_i.so: Cubit_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2731,291 +1698,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i
-.obj/Cubit_i.o .obj/Cubit_i.so .shobj/Cubit_i.o .shobj/Cubit_i.so: Cubit_i.cpp \
- $(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/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/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 \
- $(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.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/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 \
@@ -3042,52 +1771,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -3096,31 +1779,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -3142,8 +1816,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -3160,65 +1837,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
@@ -3232,7 +1883,6 @@ realclean: clean
  cubitC.h cubitC.i Cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
  cubitS_T.cpp cubitS.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- RTI_IO.h
+ $(ACE_ROOT)/ace/Timeprobe.h RTI_IO.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
index 12ef244c163..3e7f7791977 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -10,8 +10,6 @@ ACE_RCSID(IDL_Cubit, client, "$Id$")
 int
 main (int argc, char **argv)
 {
-//  ACE_START_TEST (ASYS_TEXT ("Cubit_Client"));
-
   Cubit_Client cubit_client;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -24,7 +22,8 @@ main (int argc, char **argv)
 
   ACE_TIMEPROBE_PRINT;
 
-//  ACE_END_TEST;
+  int status;
+  ACE_OS::thr_exit (&status);
 
   return retval;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
index ea72cca898f..3e35cff7d7a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.dsp
@@ -7,27 +7,29 @@
 CFG=IDL_Cubit Client - Win32 static 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="IDL_Cubit Client - Win32 static Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IDL_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Client - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "IDL_Cubit Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Client - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Client - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -124,7 +126,7 @@ LINK32=link.exe
 # PROP Target_Dir "client"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -135,7 +137,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 # ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -193,13 +195,13 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "IDL_Cubit Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -231,7 +233,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Client - Win32 Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

@@ -269,13 +271,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Client - Win32 static Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -309,13 +311,13 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl_static.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -345,7 +347,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

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 bfd02fa013d..82cadfeb87f 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 "-ORBresources tss -ORBreactorlock null"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss -ORBreactorlock null"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -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 21d866108c8..e2e3bd0bb5a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -17,30 +17,30 @@ svr_worker (void *arg)
   ACE_Barrier *barrier = (ACE_Barrier *) arg;
   char *fake[] = {"server", "-o", THE_IOR_FILE };
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      if (cubit_server.init (3, fake, ACE_TRY_ENV) == -1)
+      if (cubit_server.init (3, fake, TAO_TRY_ENV) == -1)
         return (void *) 1;
       else
         {
           barrier->wait ();
-          cubit_server.run (ACE_TRY_ENV);
+          cubit_server.run (TAO_TRY_ENV);
         }
-        ACE_TRY_CHECK;
+        TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return (void *) 1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return (void *) 1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp
index e0624781841..f663ba73643 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.dsp
@@ -24,8 +24,7 @@ CFG=IDL_Cubit Collocation Test - Win32 Debug
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -126,7 +125,7 @@ SOURCE=.\Cubit_Client.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Cubit_i.h

+SOURCE=.\Cubit_Client.h

 # End Source File

 # Begin Source File

 

@@ -157,7 +156,7 @@ InputPath=.\cubit.idl
 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

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 5bf3b72a8b6..ffb4202e962 100755
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/run_test.pl
@@ -3,7 +3,6 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     if 0;
 
 # $Id$
-# -*- perl -*-
 
 # 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.
@@ -79,18 +78,14 @@ for ($i = 0; $i <= $#ARGV; $i++)
     }
     if ($ARGV[$i] eq "-orblite")
     {
-      $clargs .= " -ORBgioplite";
-      $svargs .= " -ORBgioplite";
+      $clargs .= " -ORBiioplite";
+      $svargs .= " -ORBiioplite";
       last SWITCH;
     }
     print "run_test: Unknown Option: ".$ARGV[$i]."\n";
   }
 }
 
-(-f $exepref."server".$Process::EXE_EXT  &&
- -f $exepref."client".$Process::EXE_EXT)  ||
-  die "$0: server and/or client need to be built!\n";
-
 $SV = Process::Create ($exepref."server".$Process::EXE_EXT,
                        $svflags.
                        $svnsflags);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index f1e812d02b6..55a8793f0a5 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -10,41 +10,36 @@ ACE_RCSID(IDL_Cubit, server, "$Id$")
 int
 main (int argc, char *argv[])
 {
-//  ACE_START_TEST (ASYS_TEXT ("Cubit_Server"));
-
   Cubit_Server cubit_server;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tIDL_Cubit: server\n\n"));
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
-      if (cubit_server.init (argc, argv, ACE_TRY_ENV) == -1)
+      if (cubit_server.init (argc, argv, TAO_TRY_ENV) == -1)
         {
-          ACE_TRY_ENV.print_exception ("Initialization Exception");
+          TAO_TRY_ENV.print_exception ("Initialization Exception");
           return -1;
         }
       else
         {
-          cubit_server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          cubit_server.run (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
       ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
       ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   ACE_TIMEPROBE_PRINT;
-
-//  ACE_END_TEST;
-
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
index c3864a27b35..eb1175dada3 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.dsp
@@ -7,27 +7,29 @@
 CFG=IDL_Cubit Server - Win32 static 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="IDL_Cubit Server - Win32 static Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "IDL_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Server - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "IDL_Cubit Server - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "IDL_Cubit Server - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Server - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Server - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "IDL_Cubit Server - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -124,7 +126,7 @@ LINK32=link.exe
 # PROP Target_Dir "server"

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /I "..\..\..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -135,7 +137,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 # ADD LINK32 aces.lib TAOs.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\tao" /libpath:"..\..\..\..\..\ace"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -180,10 +182,6 @@ SOURCE=.\Cubit_Client.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Cubit_i.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Cubit_Server.h

 # End Source File

 # Begin Source File

@@ -205,13 +203,13 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "IDL_Cubit Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -243,7 +241,7 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

@@ -281,13 +279,13 @@ BuildCmds= \
 

 !ELSEIF  "$(CFG)" == "IDL_Cubit Server - Win32 static Debug"

 

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -321,13 +319,13 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl_static.exe"	

+USERDEP__CUBIT="..\..\..\..\..\bin\Release\tao_idl.exe"

 # Begin Custom Build - Invoking TAO_IDL Compiler

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -357,7 +355,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
index 3e062048b55..e6a422538c4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf
@@ -3,6 +3,6 @@
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
 #
 
-static Resource_Factory "-ORBresources global -ORBreactortype select_st -ORBinputcdrallocator tss"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBreactorlock null"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null"
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 bbfeb53120f..d85f83d105a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/svc.conf.dynamic
@@ -1,8 +1,9 @@
 # $Id$
 #
 # Please see $TAO_ROOT/docs/Options.html for details on these options.
-#
+# You must build TAO with TAO_USES_STATIC_SERVICE defined in order
+# to use this file.
 
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources global -ORBreactorlock null -ORBinputcdrallocator tss"
-dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBiiopprofilelock 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"
+static TAO_Resource_Factory "-ORBresources global -ORBreactorlock null"
+static TAO_Default_Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler ST"
+static TAO_Default_Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index b9145aca919..2283394924c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -15,7 +15,7 @@ Cubit_Task::Cubit_Task (const char *args,
                         u_int num_of_objs,
                         ACE_Thread_Manager *thr_mgr,
                         u_int task_id)
-  : ACE_Task<ACE_SYNCH> (thr_mgr),
+  : ACE_Task<ACE_MT_SYNCH> (thr_mgr),
     key_ ("Cubit"),
     orbname_ ((char *) orbname),
     orbargs_ ((char *) args),
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 50e58f33f4f..e08c85d7af9 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -28,7 +28,7 @@
 #include "cubit_i.h"
 #include "Globals.h"
 
-class Cubit_Task : public ACE_Task<ACE_SYNCH>
+class Cubit_Task : public ACE_Task<ACE_MT_SYNCH>
 {
   // = TITLE
   //    Encapsulates an ORB for the Cubit application.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index 714f7ac2bc9..1c79674ea33 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -3,9 +3,7 @@
 #include "Globals.h"
 
 Globals::Globals (void)
-  : thr_create_flags (0),
-    default_priority (0),
-    ior_file (0),
+  : ior_file (0),
     base_port (0),
     num_of_objs (2),
     thread_per_rate (0),
@@ -78,21 +76,16 @@ Globals::parse_args (int argc, char *argv[])
 int
 Globals::sched_fifo_init (void)
 {
+  int result;
 #if defined (ACE_HAS_THREADS)
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              SCHED_PRIORITY,
-                                              ACE_SCOPE_PROCESS)))
+  result = SCHED_PARAMS_FIFO;
+  if (result != 0)
     {
       if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_MAX,
-                      "User is not superuser, "
-                      "so remain in time-sharing class\n"));
-          ACE_SET_BITS (GLOBALS::instance ()->thr_create_flags, THR_NEW_LWP);
-          GLOBALS::instance ()->default_priority = ACE_THR_PRI_OTHER_DEF;
-          return 1;
-        }
+        ACE_DEBUG ((LM_MAX,
+                    "preempt: user is not superuser, "
+                    "so remain in time-sharing class\n"));
       else
         ACE_ERROR_RETURN ((LM_ERROR,
                            "%n: ACE_OS::sched_params failed\n%a"),
@@ -103,11 +96,6 @@ Globals::sched_fifo_init (void)
                      "Test will not run.  This platform doesn't seem to have threads.\n"),
                     -1);
 #endif /* ACE_HAS_THREADS */
-
-  ACE_SET_BITS (GLOBALS::instance ()->thr_create_flags, THR_BOUND);
-  ACE_SET_BITS (GLOBALS::instance ()->thr_create_flags, THR_SCHED_FIFO);
-  GLOBALS::instance ()->default_priority = ACE_THR_PRI_FIFO_DEF;
-
   return 0;
 }
 
@@ -123,13 +111,13 @@ MT_Priority::get_high_priority (void)
   ACE_Sched_Priority high_priority;
 
 #if defined (VXWORKS)
-  high_priority = GLOBALS::instance ()->default_priority;
+  high_priority = ACE_THR_PRI_FIFO_DEF;
 #elif defined (ACE_WIN32)
   high_priority =
     ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                     ACE_SCOPE_THREAD);
 #else
-  high_priority = GLOBALS::instance ()->default_priority;
+  high_priority = ACE_THR_PRI_FIFO_DEF + PRIORITY_INCR;
 #endif /* VXWORKS */
   return high_priority;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index 304920edeb7..b6704189d39 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -49,7 +49,7 @@ if (status != OK)\
 #define SCHED_PRIORITY 30
 #elif defined (VXWORKS)
 #define SCHED_PRIORITY 6
-#elif defined (ACE_WIN32) || defined (__FreeBSD__)
+#elif defined (ACE_WIN32)
 #define SCHED_PRIORITY \
 ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD)
 #else
@@ -57,6 +57,12 @@ ACE_Sched_Params::priority_max(ACE_SCHED_FIFO,ACE_SCOPE_THREAD)
 ACE_THR_PRI_FIFO_DEF + 25
 #endif /* ! __Lynx__ */
 
+// Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+#define SCHED_PARAMS_FIFO \
+ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,\
+                                        SCHED_PRIORITY,\
+                                        ACE_SCOPE_PROCESS))
+
 #if defined (CHORUS)
 #define PCCTIMER_INIT {int pTime;/*Initialize the PCC timer chip */pccTimerInit ();\
 if (pccTimer (PCC2_TIMER1_START, &pTime) != K_OK)\
@@ -92,6 +98,9 @@ argv = force_argv;
 #define TASK_ID_LEN 32
 // length of the task id ,used in vxworks.
 
+#define PRIORITY_INCR 25
+// added to ACE_THR_PRI_FIFO_DEF for non vxworks and non win32 platforms.
+
 #define TASKNAME_LEN 14
 // Length of the task name in the task control block for vxworks.
 
@@ -114,19 +123,7 @@ public:
   // parse the arguments.
 
   static int sched_fifo_init (void);
-  // Enables fifo scheduling eg., RT scheduling class on solaris.
-  // Returns 0 on success, 1 if insufficient permission, or -1
-  // for other failure.  As a side effect, sets thr_create_flags
-  // appropriately.
-
-  long thr_create_flags;
-  // Thread creation flags.  Must call sched_fifo_init () before
-  // accessing.
-
-  int default_priority;
-  // Default thread priority, used for the high thread priority.
-  // Must call sched_fifo_init () before accessing.
-
+  // enables fifo scheduling eg.RT scheduling class on solaris.
   char hostname[BUFSIZ];
   // hostname to be used for ORB_init.
 
@@ -156,7 +153,7 @@ public:
   ACE_SYNCH_MUTEX ready_mtx_;
   // mutex for the condition variable.
 
-  ACE_Condition <ACE_SYNCH_MUTEX> ready_cnd_;
+  ACE_Condition<ACE_SYNCH_MUTEX> ready_cnd_;
   // condition variable for the low priority threads to wait
   //until the high priority thread is done with the arguments parsing.
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
index b7cf303ed43..dd08914f44b 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
@@ -4,13 +4,13 @@
 # Spawns MT_Cubit server and client executables on a single host.
 
 usage="usage: $0 [-n <iterations>] [-r <host>] [-t] [-l] <# low priority threads>"
-usage2="    [-l] suppresses use of -ORBgioplite, [-r runs client on <host>], [-t] uses /tmp"
+usage2="    [-l] suppresses use of -ORBiioplite, [-r runs client on <host>], [-t] uses /tmp"
 
 user=`whoami`
 ior_file=/tmp/MT_Cubit-ior.${user}
 iterations=1000
 client_exec_prefix=time
-gioplite=-ORBgioplite
+iiop_lite=-ORBiioplite
 remote_host=
 
 if [ "$HOSTTYPE" = "lynxos" ]; then
@@ -30,7 +30,7 @@ fi
 ########
 while getopts ?ln:r:t arg; do
   case $arg in
-      l   ) gioplite= ;;
+      l   ) iiop_lite= ;;
       n   ) iterations=$OPTARG ;;
       r   ) remote_host=$OPTARG
             ior_file=MT_Cubit-ior ;;
@@ -38,46 +38,25 @@ while getopts ?ln:r:t arg; do
       '?' ) echo $usage; echo $usage2; exit 0 ;;
   esac
 done
+shift `expr $OPTIND - 1`
 
-if [ "$OPTIND" ]; then
-  shift `expr $OPTIND - 1`
-
-  if [ $# -ne 1 ]; then
-    echo $usage; echo $usage2
-    exit 1
-  fi
-else
-  #### sh does not support $OPTIND.  Arg error checking isn't as good.
-  if [ $# -lt 1 ]; then
-    echo $usage; echo $usage2
-    exit 1
-  fi
-
-  shift `expr $# - 1`
+if [ $# -ne 1 ]; then
+  echo $usage; echo $usage2
+  exit 1
 fi
-
 threads=`expr $1 + 1`
 
 
 ########
-######## Make sure that the executables have been built.
-########
-if [ ! -f ./server  -o  ! -f ./client ]; then
-  echo $0: 'server and/or client need to be built!'
-  exit -1
-fi
-
-
-########
 ######## Enable signal handler.
 ########
-trap 'kill -15 $server_pid; /bin/rm -f $ior_file; exit 0' 0 1 2 15
+trap 'kill -15 $server_pid; /bin/rm -f $ior_file' 0 1 2 15
 
 
 ########
 ######## Start server and save its pid.
 ########
-$server_exec_prefix ./server -f $ior_file -t $threads $gioplite > \
+$server_exec_prefix ./server -f $ior_file -t $threads $iiop_lite > \
   ${tmp}server.log 2>&1 &
 server_pid=$!
 
@@ -92,10 +71,10 @@ done
 if [ "$remote_host" ]; then
   rsh $remote_host \
     "cd $PWD; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $client_exec_prefix \
-    ./client -f $ior_file -t $threads -n $iterations $gioplite" > \
+    ./client -f $ior_file -t $threads -n $iterations $iiop_lite" > \
     ${tmp}client-${threads}.log 2>&1
 else
   $client_exec_prefix \
-    ./client -f $ior_file -t $threads -n $iterations $gioplite  > \
+    ./client -f $ior_file -t $threads -n $iterations $iiop_lite  > \
     ${tmp}client-${threads}.log 2>&1
 fi
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
index 877e58936eb..e95418219ae 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile
@@ -70,7 +70,7 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 CPPFLAGS += -DDEBUG
 
 LDFLAGS += -L$(TAO_ROOT)/tao
-CPPFLAGS += -I$(TAO_ROOT)
+CPPFLAGS += -I$(TAO_ROOT) 
 
 # pccTimer will eventually get integrated into ACE.  It is specific for ClassiX on VME
 ifdef CHORUS
@@ -95,16 +95,25 @@ client:	$(addprefix $(VDIR),$(CUBIT_CLIENT_OBJS))
 .obj/pccTimer.o .obj/pccTimer.so .shobj/pccTimer.o .shobj/pccTimer.so: /project/doc/mvme/pccTimer.cpp
 	@$(COMPILE.cc) -o $@ $<
 
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) cubitC.* cubitS.* cubitS_T.*
+	-/bin/rm -rf cubitC.* cubitS.* cubitS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/cubitC.o .obj/cubitC.so .shobj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubitC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/cubitC.o .obj/cubitC.so .shobj/cubitC.o .shobj/cubitC.so: cubitC.cpp cubitC.h cubitC.i cubitS.h cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i
+.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -119,9 +128,14 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/ARGV.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -146,11 +160,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 \
@@ -160,6 +169,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/ARGV.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i \
+ $(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 \
@@ -168,291 +184,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
-.obj/cubitS.o .obj/cubitS.so .shobj/cubitS.o .shobj/cubitS.so: cubitS.cpp cubitS.h cubitC.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/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/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 \
- $(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.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/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 \
@@ -479,52 +257,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -533,31 +265,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -579,8 +302,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -597,69 +323,54 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i
-.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
+ $(TAO_ROOT)/tao/TAO.h cubit_i.h \
+ cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i Task_Client.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
+ Globals.h Timer.h Util_Thread.h Cubit_Task.h
+.obj/cubit_i.o .obj/cubit_i.so .shobj/cubit_i.o .shobj/cubit_i.so: cubit_i.cpp \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -674,14 +385,9 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/ARGV.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 \
+ $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -706,6 +412,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 \
@@ -715,13 +426,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/ARGV.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- $(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 \
@@ -730,298 +434,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/TAO.h \
- cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
- cubitS_T.cpp cubitS.i Task_Client.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- Globals.h Timer.h Util_Thread.h Cubit_Task.h
-.obj/cubit_i.o .obj/cubit_i.so .shobj/cubit_i.o .shobj/cubit_i.so: cubit_i.cpp \
- $(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/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/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 \
- $(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.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/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 \
@@ -1048,52 +507,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1102,31 +515,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1148,8 +552,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1166,67 +573,41 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
- cubitS_T.cpp cubitS.i Task_Client.h \
+ $(TAO_ROOT)/tao/Union.h cubit_i.h \
+ cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i Task_Client.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
@@ -1243,6 +624,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1367,167 +751,8 @@ realclean: clean
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i \
- cubitC.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
- cubitS.i Globals.h Timer.h \
+ cubitC.h cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i Globals.h Timer.h \
  $(ACE_ROOT)/ace/Stats.h \
  $(ACE_ROOT)/ace/Stats.i \
  $(TAO_ROOT)/tao/TAO_Internal.h
@@ -1535,6 +760,9 @@ realclean: clean
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1550,8 +778,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Sched_Params.i \
- server.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ server.h $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/Containers.h \
@@ -1605,85 +832,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1692,31 +913,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1738,8 +950,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1756,68 +971,42 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/TAO.h \
- cubit_i.h cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i \
- cubitS_T.cpp cubitS.i Task_Client.h \
+ $(TAO_ROOT)/tao/TAO.h cubit_i.h \
+ cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i Task_Client.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -1828,6 +1017,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1952,449 +1144,16 @@ realclean: clean
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i \
- cubitC.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
- cubitS.i Globals.h Timer.h
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i
+ cubitC.h cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i Globals.h Timer.h
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp cubitC.h cubitC.i
 .obj/Cubit_Task.o .obj/Cubit_Task.so .shobj/Cubit_Task.o .shobj/Cubit_Task.so: Cubit_Task.cpp \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2410,8 +1169,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Sched_Params.i \
- Globals.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ Globals.h $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -2435,8 +1193,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- Cubit_Task.h \
- $(ACE_ROOT)/ace/Task.h \
+ Cubit_Task.h $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -2527,162 +1284,34 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/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 \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- cubit_i.h cubitS.h cubitC.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/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 \
- $(TAO_ROOT)/tao/POA.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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp cubitS.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i cubit_i.h \
+ cubitS.h cubitC.h cubitC.i cubitS_T.h cubitS_T.i cubitS_T.cpp \
+ cubitS.i \
  $(TAO_ROOT)/tao/TAO_Internal.h
 .obj/Globals.o .obj/Globals.so .shobj/Globals.o .shobj/Globals.so: Globals.cpp Globals.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2726,6 +1355,9 @@ realclean: clean
 .obj/Timer.o .obj/Timer.so .shobj/Timer.o .shobj/Timer.so: Timer.cpp Timer.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2742,8 +1374,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
- Task_Client.h \
- $(ACE_ROOT)/ace/Synch.h \
+ Task_Client.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 \
@@ -2853,166 +1484,7 @@ realclean: clean
  $(ACE_ROOT)/ace/ARGV.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
  $(ACE_ROOT)/ace/Sched_Params.i \
- cubitC.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i cubitS_T.cpp \
- cubitS.i Globals.h
+ cubitC.h cubitC.i cubit_i.h cubitS.h cubitS_T.h cubitS_T.i \
+ cubitS_T.cpp cubitS.i Globals.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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 8c811be3f94..d114e37ecf2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -262,7 +262,7 @@ Client::Client (ACE_Thread_Manager *thread_manager,
                 int argc,
                 char **argv,
                 u_int id)
-  : ACE_Task<ACE_SYNCH> (thread_manager),
+  : ACE_Task<ACE_MT_SYNCH> (thread_manager),
     cubit_impl_ (0),
     ts_ (ts),
     num_ (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 55277688f16..c3aaff2a8f7 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -188,7 +188,7 @@ public:
   // maintain high priority traffic as long as low priority traffic is
   // going through.
 
-  ACE_SYNCH_SEMAPHORE *semaphore_;
+  ACE_Thread_Semaphore *semaphore_;
   // semaphore in order for the high priority client to keep running
   // as long as the low priority clients are running.  See explanation
   // of "high_priority_loop_count_" member in this class.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index fdf3e82b503..83d19e659e3 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -22,7 +22,7 @@ typedef struct
   INSTR *pc;
 } task_info;
 
-const u_int SWITCHES = 25000;
+const int SWITCHES=25000;
 task_info tInfo[SWITCHES];
 
 extern "C"
@@ -30,8 +30,6 @@ int
 switchHook (WIND_TCB *pOldTcb,    // pointer to old task's WIND_TCB.
             WIND_TCB *pNewTcb)   // pointer to new task's WIND_TCB.
 {
-  ACE_UNUSED_ARG (pOldTcb);
-
   // We create the client threads with names starting with "@".
   if (pNewTcb->name[0] == '@')
     ctx++;
@@ -92,7 +90,7 @@ Client_i::init (int argc, char *argv[])
 
   int result;
   result = GLOBALS::instance ()->sched_fifo_init ();
-  if (result == -1)
+  if (result != 0)
     return result;
   VX_VME_INIT;
   FORCE_ARGV (this->argc_,this->argv_);
@@ -322,17 +320,16 @@ Client_i::activate_high_client (void)
   ACE_DEBUG ((LM_DEBUG,
               "Creating 1 client with high priority of %d\n",
               this->high_priority_));
-  if (this->high_priority_client_->activate (
-      GLOBALS::instance ()->thr_create_flags,
-      1,
-      0,
-      this->high_priority_,
-      -1,
-      0,
-      0,
-      0,
-      0,
-    (ACE_thread_t *) &this->task_id_) == -1)
+  if (this->high_priority_client_->activate (THR_BOUND | ACE_SCHED_FIFO,
+                                             1,
+                                             0,
+                                             this->high_priority_,
+                                             -1,
+                                             0,
+                                             0,
+                                             0,
+                                             0,           //  size_t stack_size[] = 0,
+                                             (ACE_thread_t *) &this->task_id_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p; priority is %d\n",
                        "activate failed",
@@ -391,17 +388,17 @@ Client_i::activate_low_client (void)
                   this->low_priority_));
       // The first thread starts at the lowest priority of all the low
       // priority clients.
-      if (this->low_priority_client_[i - 1]->activate (
-          GLOBALS::instance ()->thr_create_flags,
-          1,
-          0,
-          this->low_priority_, // These are constructor defaults.
-          -1,                  // int grp_id = -1,
-          0,                   // ACE_Task_Base *task = 0,
-          0,                   // ACE_hthread_t thread_handles[] = 0,
-          0,                   // void *stack[] = 0,
-          0,                   // size_t stack_size[] = 0,
-            (ACE_thread_t *) &this->task_id_) == -1)
+      if (this->low_priority_client_[i - 1]->activate
+          (THR_BOUND | ACE_SCHED_FIFO,
+           1,
+           0,
+           this->low_priority_, // These are constructor defaults.
+           -1,                  // int grp_id = -1,
+           0,                   // ACE_Task_Base *task = 0,
+           0,                   // ACE_hthread_t thread_handles[] = 0,
+           0,                   // void *stack[] = 0,
+           0,                   // size_t stack_size[] = 0,
+           (ACE_thread_t *) &this->task_id_) == -1)
         ACE_ERROR ((LM_ERROR,
                     "%p; priority is %d\n",
                     "activate failed",
@@ -449,11 +446,11 @@ Client_i::activate_util_thread (void)
 
       // Activate the Utilization thread.  It will wait until all
       // threads have finished binding.
-      this->util_thread_->activate (
-        GLOBALS::instance ()->thr_create_flags,
-        1,
-        0,
-        this->low_priority_);
+      this->util_thread_->activate
+        (THR_BOUND | ACE_SCHED_FIFO,
+         1,
+         0,
+         this->low_priority_);
     }
   else
     this->util_thread_->close ();
@@ -605,13 +602,13 @@ Client_i::start_servant (void)
               this->high_priority_));
 
   // Make the high priority task an active object.
-   if (high_priority_task->activate (
-       GLOBALS::instance ()->thr_create_flags,
-       1,
-       0,
-       this->high_priority_) == -1)
+   if (high_priority_task->activate
+       (THR_BOUND | ACE_SCHED_FIFO,
+        1,
+        0,
+        this->high_priority_) == -1)
      ACE_ERROR ((LM_ERROR,
-                 "(%P|%t) %p\n",
+                 "(%P|%t) %p\n"
                  "\thigh_priority_task->activate failed"));
 
    ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ready_mon, GLOBALS::instance ()->ready_mtx_,-1));
@@ -740,11 +737,10 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 20 Hz client with priority %d\n",
               priority));
 
-  if (CB_20Hz_client.activate (
-       GLOBALS::instance ()->thr_create_flags,
-       1,
-       1,
-       priority) == -1)
+  if (CB_20Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+                               1,
+                               1,
+                               priority) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) errno = %p: activate failed\n"));
   // The high priority thread is parsing the arguments, so wait on the
@@ -770,11 +766,10 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 10 Hz client with priority %d\n",
               priority));
 
-  if (CB_10Hz_client.activate (
-       GLOBALS::instance ()->thr_create_flags,
-       1,
-       1,
-       priority) == -1)
+  if (CB_10Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+                               1,
+                               1,
+                               priority) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) errno = %p: activate failed\n"));
 
@@ -785,11 +780,10 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 5 Hz client with priority %d\n",
               priority));
 
-  if (CB_5Hz_client.activate (
-       GLOBALS::instance ()->thr_create_flags,
-       1,
-       1,
-       priority) == -1)
+  if (CB_5Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+                              1,
+                              1,
+                              priority) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) errno = %p: activate failed\n"));
 
@@ -800,11 +794,10 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 1 Hz client with priority %d\n",
               priority));
 
-  if (CB_1Hz_client.activate (
-       GLOBALS::instance ()->thr_create_flags,
-       1,
-       1,
-       priority) == -1)
+  if (CB_1Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+                              1,
+                              1,
+                              priority) == -1)
     ACE_ERROR ((LM_ERROR,
                 "(%P|%t) errno = %p: activate failed\n"));
 
@@ -863,6 +856,12 @@ main (int argc, char *argv[])
                 &pTime) != K_OK)
     ACE_DEBUG ((LM_DEBUG,
                 "pccTimer has a pending bench mark\n"));
+#elif defined (VXWORKS)
+  // Shoot myself.  Otherwise, there's a General Protection Fault.
+  // This will leak memory, but that's preferable.  It looks like the
+  // problem might be due to static objects in libTAO.
+  int status;
+  ACE_OS::thr_exit (&status);
 #endif /* CHORUS */
   return 0;
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
index 3e7b2cfc365..2640cb00784 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.dsp
@@ -7,27 +7,29 @@
 CFG=MT_Cubit Client - Win32 static 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="MT_Cubit Client - Win32 static Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MT_Cubit Client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Client - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Client - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Client - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "MT_Cubit Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Client - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Client - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -95,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /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" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -132,7 +134,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -234,13 +236,12 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "MT_Cubit Client - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -273,7 +274,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "MT_Cubit Client - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

@@ -313,13 +313,12 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl_static.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -353,13 +352,12 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -389,7 +387,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
index 2e0c01f8db4..3ae33859ce4 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/run_test.pl
@@ -1,11 +1,10 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
-$usage = "run_tests.pl [-l suppress -ORBgioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
+$usage = "run_tests.pl [-l suppress -ORBiioplite] [-n iterations] [-r, for thread-per-rate] [-t low priority threads]\n";
 
 unshift @INC, '../../../../../bin';
 require Process;
@@ -13,7 +12,7 @@ require Process;
 $server_port = 0;
 $iorfile = "theior";
 $sleeptime = 3;
-$gioplite = '-ORBgioplite';
+$iiop_lite = '-ORBiioplite';
 $iterations = 1000;
 $low_priority_threads = 1;
 $thread_per_rate = '';
@@ -23,7 +22,7 @@ $thread_per_rate = '';
 ####
 while ($#ARGV >= $[  &&  $ARGV[0] =~ /^-/) {
     if ($ARGV[0] eq '-l') {
-        $gioplite = '';
+        $iiop_lite = '';
     } elsif ($ARGV[0] eq '-n') {
         if ($ARGV[1] =~ /^[\da-zA-Z]+$/) {
             $iterations = $ARGV[1]; shift;
@@ -54,12 +53,12 @@ $threads = $low_priority_threads + 1;
 
 $SV = Process::Create ('.' . $DIR_SEPARATOR . "server" . $Process::EXE_EXT,
                        " -ORBport " . $server_port .
-                       " $gioplite $thread_per_rate -f $iorfile -t $threads");
+                       " $iiop_lite $thread_per_rate -f $iorfile -t $threads");
 
 sleep $sleeptime;
 
 $status = system ('.' . $DIR_SEPARATOR . "client" . $Process::EXE_EXT .
-                  " $gioplite $thread_per_rate " .
+                  " $iiop_lite $thread_per_rate " .
                   "-f $iorfile -n $iterations -t $threads");
 
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 4eb1187d7b3..c8229136215 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -42,7 +42,7 @@ Server::init (int argc, char **argv)
   int result;
 
   result = GLOBALS::instance ()->sched_fifo_init ();
-  if (result == -1)
+  if (result != 0)
     return result;
 
   this->argc_ = argc;
@@ -199,15 +199,13 @@ Server::activate_high_servant (void)
 
   // Make the high priority task an active object.
   if (this->high_priority_task_->activate
-      (GLOBALS::instance ()->thr_create_flags,
+      (THR_BOUND | ACE_SCHED_FIFO,
        1,
        0,
        this->high_priority_) == -1)
-    ACE_DEBUG ((LM_ERROR,
-                ASYS_TEXT ("(%P|%t) task activation at priority %d ")
-                ASYS_TEXT (" failed, exiting!\n%a"),
-                this->high_priority_,
-                -1));
+    ACE_ERROR ((LM_ERROR,
+                "(%P|%t) %p\n"
+                "\thigh_priority_task->activate failed"));
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex,
                             ready_mon,
@@ -232,20 +230,14 @@ Server::activate_low_servants (void)
   ACE_OS::sprintf (orbhost,
                    "-ORBhost %s ",
                    GLOBALS::instance ()->hostname);
-
-  if (ACE_static_cast (int, this->num_low_priority_) > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Creating %d servants starting at priority %d\n",
-                  this->num_low_priority_,
-                  this->low_priority_));
-
-      // Create the low priority servants.
-      ACE_NEW_RETURN (this->low_priority_tasks_,
-                      Cubit_Task *[GLOBALS::instance ()->num_of_objs],
-                      -1);
-    }
-
+  ACE_DEBUG ((LM_DEBUG,
+              "Creating %d servants starting at priority %d\n",
+              this->num_low_priority_,
+              this->low_priority_));
+  // Create the low priority servants.
+  ACE_NEW_RETURN (this->low_priority_tasks_,
+                  Cubit_Task *[GLOBALS::instance ()->num_of_objs],
+                  -1);
   for (int i = this->num_low_priority_;
        i > 0;
        i--)
@@ -277,17 +269,14 @@ Server::activate_low_servants (void)
                       -1);
 
       // Make the low priority task an active object.
-      if (this->low_priority_tasks_[i - 1]->activate
-          (GLOBALS::instance ()->thr_create_flags,
+      if (this->low_priority_tasks_ [i - 1]->activate
+          (THR_BOUND | ACE_SCHED_FIFO,
            1,
            0,
            this->low_priority_) == -1)
-        ACE_DEBUG ((LM_ERROR,
-                    ASYS_TEXT ("(%P|%t) task activation at priority %d ")
-                    ASYS_TEXT (" failed, exiting!\n%a"),
-                    this->low_priority_,
-                    -1));
-
+        ACE_ERROR ((LM_ERROR,
+                    "(%P|%t) %p\n"
+                    "\tthis->low_priority_tasks_[i]->activate"));
       ACE_DEBUG ((LM_DEBUG,
                   "Created servant %d with priority %d\n",
                   i,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
index 59d5fbe01a7..72c9ad270da 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.dsp
@@ -7,27 +7,29 @@
 CFG=MT_Cubit Server - Win32 static 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="MT_Cubit Server - Win32 static Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "MT_Cubit Server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Server - Win32 Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Server - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "MT_Cubit Server - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

+!MESSAGE "MT_Cubit Server - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Server - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Server - Win32 static Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "MT_Cubit Server - Win32 static Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -95,7 +97,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /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" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D ACE_HAS_DLL=0 /D TAO_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -132,7 +134,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib TAOd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 # ADD LINK32 acesd.lib TAOsd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\ace" /libpath:"..\..\..\..\tao"

 

-!ENDIF 

+!ENDIF

 

 # Begin Target

 

@@ -218,13 +220,12 @@ SOURCE=.\cubit.idl
 !IF  "$(CFG)" == "MT_Cubit Server - Win32 Release"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -257,7 +258,6 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "MT_Cubit Server - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

@@ -297,13 +297,12 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\release\tao_idl_static.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	..\..\..\..\..\bin\release\tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -337,13 +336,12 @@ BuildCmds= \
 

 # PROP BASE Ignore_Default_Tool 1

 # PROP Ignore_Default_Tool 1

-USERDEP__CUBIT="..\..\..\..\..\bin\tao_idl_static.exe"	

 # Begin Custom Build - Invoking tao_idl

 InputPath=.\cubit.idl

 InputName=cubit

 

 BuildCmds= \

-	tao_idl_static $(InputName).idl

+	tao_idl $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -373,7 +371,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ENDIF 

+!ENDIF

 

 # End Source File

 # End Group

diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize b/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize
index 3fb8cf24cc8..3a4f7f43bd9 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/summarize
@@ -7,7 +7,7 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 # Summarizes results from a series of runs of MT_Cubit_Test, with
 # different numbers of clients.  Example usage:
 #
-# $ for i in 0 1 2 5 10 15 20 25 30 35 40 45 50; do ./MT_Cubit_Test $i; done
+# $ for i in 1 2 5 10 15 20 25 30 35 40 45 50; do ./MT_Cubit_Test $i; done
 # $ ./summarize
 #
 # The first three lines above let this script run without specifying the
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
index bc5a4a453fa..234541c0ed0 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf
@@ -1,8 +1,48 @@
 # $Id$
 #
-# Please see $TAO_ROOT/docs/Options.html for details on these options.
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
 #
-
-static Resource_Factory "-ORBresources tss -ORBinputcdrallocator tss"
-static Client_Strategy_Factory "-ORBiiopprofilelock null -ORBclientconnectionhandler RW"
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBpoalock null -ORBconnectorlock null -ORBallowreactivationofsystemids 0"
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() ""
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static
new file mode 100644
index 00000000000..52b0074d666
--- /dev/null
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/svc.conf.static
@@ -0,0 +1,8 @@
+# $Id$
+#
+# See svc.conf in the same directory for more information.
+# You must build TAO with TAO_USES_STATIC_SERVICE defined
+# to use this file.
+static TAO_Resource_Factory "-ORBresources tss"
+static TAO_Default_Client_Strategy_Factory ""
+static TAO_Default_Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/performance-tests/Demux/Makefile b/TAO/performance-tests/Demux/Makefile
index fd61711b077..cdb0bdd991d 100644
--- a/TAO/performance-tests/Demux/Makefile
+++ b/TAO/performance-tests/Demux/Makefile
@@ -1,11 +1,11 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Top-level Makefile for the Demux_Test test example
+#	Top-level Makefile for the Demux_Test test example
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -15,38 +15,32 @@ endif # ! TAO_ROOT
 LDLIBS   = -lTAO -lorbsvcs
 LDFLAGS += -L$(TAO_ROOT)/tao
 
-IDL_HDR = demux_testC.h demux_testS.h
-IDL_SRC = demux_testC.cpp demux_testS.cpp
+IDL_HDR	= demux_testC.h demux_testS.h
+IDL_SRC	= demux_testC.cpp demux_testS.cpp
 
-SVR_FILES = demux_testC       \
-            demux_testS       \
-            demux_test_server \
-            demux_test_i      \
-            server
+SVR_FILES =	demux_testC	\
+		demux_testS	\
+		demux_test_server		\
+		demux_test_i	\
+		server
 
-CLI_FILES = demux_testC       \
-            demux_testS       \
-            demux_test_client \
-            client
+CLI_FILES =	demux_testC	\
+		demux_testS	\
+		demux_test_client \
+		client
 
 DEMUX_TEST_SVR_OBJS = $(addsuffix .o,$(SVR_FILES))
 DEMUX_TEST_CLT_OBJS = $(addsuffix .o,$(CLI_FILES))
-SRC = $(addsuffix .cpp,$(SVR_FILES)) \
-      $(addsuffix .cpp,$(CLI_FILES))
+SRC	= $(addsuffix .cpp,$(SVR_FILES)) \
+	  $(addsuffix .cpp,$(CLI_FILES))
 
+BIN = server client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -62,24 +56,20 @@ CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
 
 .PRECIOUS: $(IDL_HDR) $(IDL_SRC)
 
-server: $(addprefix $(VDIR),$(DEMUX_TEST_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(DEMUX_TEST_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(DEMUX_TEST_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(DEMUX_TEST_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 clean:
-	-$(RM) -r $(VDIR)/*.o obj.* core Templates.DB .make.state
+	-/bin/rm -rf $(VDIR)/*.o $(BIN) obj.* core Templates.DB .make.state
 
 realclean: clean
 	cd CodeGen; $(MAKE) realclean
-	-$(RM) demux_testC.* demux_testS.* demux_testS_T.* \
-               demux_test_i.* demux_test.idl *.dat \
-               demux_test_client.i
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf demux_testC.* demux_testS.* demux_testS_T.* \
+		     demux_test_i.* demux_test.idl *.dat \
+		     demux_test_client.i
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -313,7 +303,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -553,7 +543,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -794,7 +784,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1052,7 +1042,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1293,7 +1283,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1550,7 +1540,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -1790,7 +1780,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -2031,7 +2021,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -2270,7 +2260,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
diff --git a/TAO/performance-tests/Demux/operation_demux2d.xls b/TAO/performance-tests/Demux/operation_demux2d.xls
deleted file mode 100644
index bc163cd7e3b..00000000000
--- a/TAO/performance-tests/Demux/operation_demux2d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/Demux/operation_demux3d.xls b/TAO/performance-tests/Demux/operation_demux3d.xls
deleted file mode 100644
index 807a62ede96..00000000000
--- a/TAO/performance-tests/Demux/operation_demux3d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/Demux/poa_lookup2d.xls b/TAO/performance-tests/Demux/poa_lookup2d.xls
deleted file mode 100644
index 004fa9a5587..00000000000
--- a/TAO/performance-tests/Demux/poa_lookup2d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/Demux/poa_lookup3d.xls b/TAO/performance-tests/Demux/poa_lookup3d.xls
deleted file mode 100644
index 92aa1880da6..00000000000
--- a/TAO/performance-tests/Demux/poa_lookup3d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/Demux/servant_dispatch2d.xls b/TAO/performance-tests/Demux/servant_dispatch2d.xls
deleted file mode 100644
index eb72788a999..00000000000
--- a/TAO/performance-tests/Demux/servant_dispatch2d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/Demux/servant_dispatch3d.xls b/TAO/performance-tests/Demux/servant_dispatch3d.xls
deleted file mode 100644
index 2e43e8023ce..00000000000
--- a/TAO/performance-tests/Demux/servant_dispatch3d.xls
+++ /dev/null
diff --git a/TAO/performance-tests/POA/Demux/Makefile b/TAO/performance-tests/POA/Demux/Makefile
deleted file mode 100644
index 6364a3070ec..00000000000
--- a/TAO/performance-tests/POA/Demux/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Top-level Makefile for the Demux_Test test example
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-#override TAO_IDLFLAGS += \
-#               -H linear_search \
-
-LDLIBS   = -lTAO -lorbsvcs
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-IDL_HDR = demux_testC.h demux_testS.h
-IDL_SRC = demux_testC.cpp demux_testS.cpp
-
-SVR_FILES =     demux_testC     \
-                demux_testS     \
-                demux_test_server \
-                demux_test_i    \
-                server
-
-CLI_FILES =     demux_testC     \
-                demux_testS     \
-                demux_test_client \
-                client
-
-STAT_FILE =     demux_stats
-
-DEMUX_TEST_SVR_OBJS = $(addsuffix .o,$(SVR_FILES))
-DEMUX_TEST_CLT_OBJS = $(addsuffix .o,$(CLI_FILES))
-DEMUX_TEST_STAT_OBJS = $(addsuffix .o,$(STAT_FILE))
-
-SRC     = $(addsuffix .cpp,$(SVR_FILES)) \
-          $(addsuffix .cpp,$(CLI_FILES)) \
-          $(addsuffix .cpp,$(STAT_FILE))
-
-BIN2 = server client
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
-
-#----------------------------------------------------------------------------
-#       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) -I$(TAO_ROOT)/orbsvcs $(TSS_ORB_FLAG)
-
-.PRECIOUS: $(IDL_HDR) $(IDL_SRC)
-
-server: $(addprefix $(VDIR),$(DEMUX_TEST_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(DEMUX_TEST_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-demux_stat: $(addprefix $(VDIR),$(DEMUX_TEST_STAT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) demux_testC.* demux_testS.* demux_testS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/POA/Demux/README b/TAO/performance-tests/POA/Demux/README
deleted file mode 100644
index c0bcaf94755..00000000000
--- a/TAO/performance-tests/POA/Demux/README
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    README
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-This test directory tests various demultiplexing strategies used in
-TAO for POA, object, and operation name lookups
-
-Description of various files:
-
-CodeGen		Directory containing the code generator
-
-server.cpp	server main program
-demux_test_server.{h, cpp}: Server-side implementation details
-
-client.cpp	client main program
-demux_test_client.{h, cpp}: Client-side implementation details
-demux_test_macros.h: Some constants used by both the client and the server
-
-
-Generated Files: 
-----------------
-
-Must run ./CodeGen/demux tool to generate the following files. See
-CodeGen/README for command line options.
-
-
-demux_test.idl: The Demux_Test IDL interface
-demux_test_i.{h, cpp}: Implementation of the Interface
-demux_test_client.i: Code to be included with the client
-poa_names.dat: Names for all the POAs to be used
-
-
-Command Line options
---------------------
-
-server -d  (for debugging)
-       -p <num POAs>
-       -o <num objects>
-       -f <IOR file>  default is ior.dat
-
-client -d  (for debugging)
-       -p <num POAs>
-       -o <num objs>
-       -m <num methods>
-       -f <IOR file>  default is ior.dat
-       -n <loop count>
-       -i <invoke strategy> (L = linear
-                             R = random
-                             B = best w.r.t linear
-                             W = worst w.r.t linear)
-
-
-------
-*NOTE* 
-------
-The num_POAs, num_objs, and num_ops must match on the client
-and server side.
-
-Use the svc.conf file and change the -ORBsystemidpolicydemuxstrategy
-option to use the desired object lookup strategy. For system ID
-policy, active demuxing in the default.
-
-Use the desired options to the TAO_IDL compiler so that it will
-generate the right lookup strategy for operation name
-demultiplexing.
-
-
-THE POA LATENCY TEST
---------------------
-
-Make the following changes in Object_Adapter.cpp :
-
-#define ACE_ENABLE_TIMEPROBES
-
-Comment out all ACE_FUNCTION_TIMEPROBE calls except the one 
-in  locate_poa  ACE_FUNCTION_TIMEPROBE
-(TAO_OBJECT_ADAPTER_FIND_POA_START);
-
-
-In the demux_test_client : The object loop increments by one.
-In gen_names.cpp : 
-> Codegen/demux -p 25
-> make
-> ./server -p 25
-> ./client -p 25
-
-The results will reveal themselves !!
-
-
-THE SERVANT DEMUX TEST :
-------------------------
-
-In the demux_test_client : The object loop increments by 5.
-
-
-
-
-
-
-
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
deleted file mode 100644
index 3a740495532..00000000000
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    client.cpp
-//
-//    client side main program
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include "demux_test_client.h"
-
-ACE_RCSID(CodeGen, client, "$Id$")
-
-int
-main (int argc, char *argv [])
-{
-
-  // Set TAO_debug_level to 0 to ensure silent running unless
-  // debugging is explicitly invoked
-  TAO_debug_level = 0;
-
-  Demux_Test_Client demux_test_client;
-
-  TAO_TRY
-    {
-      if (demux_test_client.init (argc, argv, TAO_TRY_ENV) == -1)
-        return -1;
-      else
-        {
-          TAO_CHECK_ENV;
-
-          demux_test_client.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-
-}
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
deleted file mode 100644
index 6b96b76692b..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_stats.cpp
-//
-// = AUTHOR
-//
-//    Vishal Kachroo
-//
-// ============================================================================
-
-#include <math.h>
-#include <ace/Get_Opt.h>
-#include <tao/corba.h>
-
-class Demux_Stats
-{
-
-public:
-
-  int
-  calculate_avg_latency (void);
-  // Calculates the average latency and Standard deviation.
-  // Expects the input data in my_results.dat.
-
-  int
-  Demux_Stats::parse_args (int argc_, char * argv_ []);
-  // parses args.
-
-private :
-
-  FILE *result_fp_;
-  // temporary results file.
-
-  int iterations;
-};
-
-
-// parse command line arguments (if any).
-int
-Demux_Stats::parse_args (int argc_, char * argv_ [])
-{
-
-  ACE_Get_Opt get_opts (argc_, argv_, "i:");
-  int c;
-
-  iterations = 0;
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'i':
-	iterations = atoi (get_opts.optarg);
-	break;
-      }
-
-  return 0;
-}
-
-
-int
-Demux_Stats::calculate_avg_latency ()
-{
-
-  CORBA::ULong i, time;
-  char str1[50], str2[50], str3[50];
-
-  double temp, mean_poa, mean_servant, mean_dispatch, mean_perfect, mean_dynamic, mean_binary, mean_linear, mean_parse;
-  double deviation_poa, deviation_servant, deviation_dispatch;
-  double std_deviation_poa, std_deviation_servant, std_deviation_dispatch;
-  double sum_poa_temp, sum_servant_temp, sum_dispatch_temp;
-  double time_temp, items_temp;
-
-  double items;
-  CORBA::ULong sum_poa, sum_servant, sum_dispatch, last_poa_time=0, last_servant_time=0, last_dispatch_time=0;
-  CORBA::ULong sum_linear, sum_dynamic, sum_binary, sum_perfect, sum_parse;
-  CORBA::ULong last_dynamic_time=0, last_linear_time=0, last_perfect_time=0, last_binary_time=0, last_parse_time = 0;
-
-  int counter;
-
-  if ((this->result_fp_ = ACE_OS::fopen ("my_results.dat", "r")) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demux_Test_Client::print_results - "
-                         "Failed to open the results file for reading\n"),
-                        -1);
-    }
-
-  sum_poa = 0;
-  sum_servant = 0;
-  sum_dispatch = 0;
-  sum_dynamic = 0;
-  sum_linear = 0;
-  sum_perfect = 0;
-  sum_binary = 0;
-  sum_parse = 0;
-
-  items = 0;
-  counter = 0;
-
-  while (fscanf (this->result_fp_, "%s %s %s %ld %ld", &str1, &str2, &str3, &i, &time) != EOF)
-    {
-
-    	  if(strcmp (str1,"POA::locate_poa_i")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items = items + 1; counter++; }
-	      else
-		{
-		  sum_poa += time;
-		  last_poa_time = time;
-		  items = items + 1;
-		  ++counter;
-		}
-	    }
-
-	  if(strcmp (str1,"POA::find_servant")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items = items + 1; counter++; }
-	      else
-		{
-		  sum_servant += time;
-		  last_servant_time = time;
-		  items = items + 1;
-		  counter++;
-		}
-	    }
-
-	  if(strcmp (str1,"Servant::_dispatch")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { ++items; counter++; }
-	      else
-		{
-		  sum_dispatch += time;
-		  last_dispatch_time = time;
-		  ++items;items++;
-		  counter++;
-		}
-	    }
-	  if(strcmp (str1,"TAO_Dynamic_Hash_OpTable::find")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { ++items; counter++; }
-	      else
-		{
-		  sum_dynamic += time;
-		  last_dynamic_time = time;
-		  ++items;
-		  counter++;
-		}
-	    }
-
-	  if(strcmp (str1,"TAO_Linear_Search_OpTable::find")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items++; counter++; }
-	      else
-		{
-		  sum_linear += time;
-		  last_linear_time = time;
-		  items++;
-		  counter++;
-		}
-	    }
-	  if(strcmp (str1,"TAO_Perfect_Hash_OpTable::find")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items++; counter++; }
-	      else
-		{
-		  sum_perfect += time;
-		  last_perfect_time = time;
-		  items++;
-		  counter++;
-		}
-	    }
-	  if(strcmp (str1,"TAO_Binary_Search_OpTable::find")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items++; counter++; }
-	      else
-		{
-		  sum_binary += time;
-		  last_binary_time = time;
-		  items++;
-		  counter++;
-		}
-	    }
-	  if(strcmp (str1,"POA::parse_key")==0 && (strcmp (str3,"end") == 0))
-	    {
-	      if (items < 1) { items++; counter++; }
-	      else
-		{
-		  sum_parse += time;
-		  last_parse_time = time;
-		  items++;
-		  counter++;
-		}
-	    }
-
-	  if (iterations !=0 )
-	  {
-	    if (counter == iterations)
-	    {
-
-	      mean_poa = sum_poa/items;
-	      mean_servant = sum_servant/items;
-	      mean_dispatch = sum_dispatch/items;
-	      mean_dynamic = sum_dynamic/items;
-	      mean_linear = sum_linear/items;
-	      mean_binary = sum_binary/items;
-	      mean_perfect = sum_perfect/items;
-	      printf("Average response times = POA = %lf SERVANT = %lf DISPATCH = %lf PERFECT = %lf DYNAMIC = %lf BINARY = %lf LINEAR = %lf microsec\n", mean_poa,
-		     mean_servant,
-		     mean_dispatch,
-		     mean_perfect,
-		     mean_dynamic,
-		     mean_binary,
-		     mean_linear
-		     );
-	      sum_poa = 0;
-	      sum_servant = 0;
-	      sum_dispatch = 0;
-	      sum_dynamic = 0;
-	      sum_linear = 0;
-	      sum_perfect = 0;
-	      sum_binary = 0;
-
-	      items = 0;
-	      counter = 0;
-	    }
-	  }
-    }
-
-  ACE_OS::fclose (this->result_fp_);
-
-if (iterations == 0)
-  {
-    sum_poa -= last_poa_time;
-    sum_servant -= last_servant_time;
-    sum_dispatch -= last_dispatch_time;
-    sum_dynamic -= last_dynamic_time;
-    sum_linear -= last_linear_time;
-    sum_perfect -= last_perfect_time;
-    sum_binary -= last_binary_time;
-    sum_parse -= last_parse_time;
-
-  //items = items - 4;
-
-  items = items - 2;
-
-  mean_poa = sum_poa/items;
-  mean_servant = sum_servant/items;
-  mean_dispatch = sum_dispatch/items;
-  mean_dynamic = sum_dynamic/items;
-  mean_linear = sum_linear/items;
-  mean_binary = sum_binary/items;
-  mean_perfect = sum_perfect/items;
-  mean_parse = sum_parse/items;
-  }
-
-  // now compute standard deviation
-
-
-  if ((this->result_fp_ = ACE_OS::fopen ("my_results.dat", "r")) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demux_Test_Client::print_results - "
-                         "Failed to open the results file for reading\n"),
-                        -1);
-    }
-
-
-  sum_poa_temp = 0;
-  sum_servant_temp = 0;
-  sum_dispatch_temp = 0;
-
-  deviation_poa = 0.0;
-  deviation_servant = 0.0;
-  deviation_dispatch = 0.0;
-
-  while (fscanf (this->result_fp_, "%s %s %s %ld %ld", &str1, &str2, &str3, &i, &time) != EOF)
-    {
-      time_temp = (double) time;
-
-      if(strcmp (str1,"POA::locate_poa_i")==0 && (strcmp (str3,"end") == 0))
-	{
-	  deviation_poa = time_temp - mean_poa;
-	  sum_poa_temp += deviation_poa * deviation_poa;
-	}
-
-      if(strcmp (str1,"POA::find_servant")==0 && (strcmp (str3,"end") == 0))
-	{
-	  deviation_servant = time_temp - mean_servant;
-	  sum_servant_temp += deviation_servant * deviation_servant;
-	}
-
-      if(strcmp (str1,"Servant::_dispatch")==0 && (strcmp (str3,"end") == 0))
-	{
-	  deviation_dispatch = time_temp - mean_dispatch;
-	  sum_dispatch_temp += deviation_dispatch * deviation_dispatch;
-	}
-    }
-
-  items_temp = (double) items;
-
-  if (items == 1)
-    {
-      std_deviation_poa = 0;
-      std_deviation_servant = 0;
-      std_deviation_dispatch = 0;
-    }
-  else
-    {
-      std_deviation_poa = sqrt (sum_poa_temp/(items_temp - 1));
-      std_deviation_servant = sqrt (sum_servant_temp/(items_temp - 1));
-      std_deviation_dispatch = sqrt (sum_dispatch_temp/(items_temp - 1));
-    }
-
-  // ACE_OS::unlink ("my_results.dat");
-  ACE_OS::fclose (this->result_fp_);
-
-  if (iterations == 0)
-    {
-
-      printf("Average response times = POA = %lf SERVANT = %lf DISPATCH = %lf PERFECT = %lf DYNAMIC = %lf BINARY = %lf LINEAR = %lf PARSE = %lf microsec\n", mean_poa, mean_servant,
-		       mean_dispatch,
-		       mean_perfect,
-		       mean_dynamic,
-		       mean_binary,
-		       mean_linear,
-	               mean_parse
-		       );
-
-    }
-
-      return 0;
-    }
-
-int
-main (int argc, char *argv [])
-{
-  Demux_Stats demux_stats;
-
-  demux_stats.parse_args (argc, argv);
-  demux_stats.calculate_avg_latency ();
-
-}
diff --git a/TAO/performance-tests/POA/Demux/demux_test.idl b/TAO/performance-tests/POA/Demux/demux_test.idl
deleted file mode 100644
index 104bd97091c..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-// Interface for TAO's Demux_Test
-
-interface Demux_Test
-{
-   void M302 ();
-   oneway void shutdown ();
-};
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
deleted file mode 100644
index ce6bbc2cfc6..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ /dev/null
@@ -1,402 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_client.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "demux_test_client.h"
-
-// Constructor
-Demux_Test_Client::Demux_Test_Client (void)
-  : argc_ (0),
-    argv_ (0),
-    is_ (Demux_Test_Client::LINEAR),
-    num_POAs_ (1),
-    // default number of child POAs is 1 and each one will always have 1 object
-    num_objs_ (1),
-    num_ops_ (1),
-    loop_count_ (1),
-    ior_fp_ (0),
-    result_fp_ (0),
-    step_ (5)
-{
-}
-
-// destructor
-Demux_Test_Client::~Demux_Test_Client (void)
-{
-  ACE_OS::fclose (this->ior_fp_);
-  ACE_OS::fclose (this->result_fp_);
-}
-
-//
-// initialize the Demux_Test_Client
-//
-
-int
-Demux_Test_Client::init (int argc, char *argv [], CORBA::Environment &env)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Grab the ORB
-  TAO_TRY_EX (GET_ORB)
-    {
-      char *orb_name = "internet"; // unused by TAO
-
-      // get the underlying ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, orb_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV_EX (GET_ORB);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("ORB_init");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  // now parse the rest of the arguments to determine the POA depth, the number
-  // of objects with each POA and other info
-
-  if (this->parse_args () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) Demux_Test_Client::init - "
-                       "parse_args failed\n"),
-                      -1);
-
-  if (this->init_operation_db () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) Demux_Test_Client::init - "
-                       "init_operation_db failed\n"),
-                      -1);
-
-  // now read all the IORS
-  CORBA::ULong i, j;
-
-  for (i = 0; i < this->num_POAs_; ++i)
-    for (j = 0; j < this->num_objs_; ++j)
-      {
-        char str [1024 * 10];
-        ACE_OS::memset (str, 0, sizeof (str));
-        
-        if (fscanf (this->ior_fp_, "%s", str) == EOF)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "IOR database has less entries than required\n"),
-                              -1);
-          }
-        
-        // Get the IOR and output it to the file
-        TAO_TRY_EX (IOR)
-          {
-            CORBA::Object_var objref = this->orb_->string_to_object (str,
-                                                                     TAO_TRY_ENV);
-            TAO_CHECK_ENV_EX (IOR);
-            
-            // now narrow to Demux_Test object
-            
-            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in (),
-                                                           TAO_TRY_ENV);
-            
-            TAO_CHECK_ENV_EX (IOR);
-            
-            if (CORBA::is_nil (this->demux_test_[i][j].in ()))
-              {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "ObjRef for IOR %s (POA %d, OBJ %d) is NULL\n",
-                                   str, i, j),
-                                  -1);
-              }
-            }
-        TAO_CATCHANY
-          {
-            TAO_TRY_ENV.print_exception ("object_to_string");
-            env.exception (TAO_TRY_ENV.exception ());
-            return -1;
-          }
-        TAO_ENDTRY;
-      } // j and i loop
-
-  ACE_OS::fclose (this->ior_fp_);
-
-  // success
-  return 0;
-
-}
-
-// parse command line arguments (if any).
-int
-Demux_Test_Client::parse_args (void)
-{
-
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'f':
-        this->ior_fp_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_fp_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case 'm':
-        this->num_ops_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->num_ops_ > TAO_DEMUX_TEST_MAX_OPS)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%d exceeds the maximum of "
-                               "%d objects per POA\n",
-                               this->num_objs_,
-                               TAO_DEMUX_TEST_MAX_OPS),
-                              -1);
-          }
-        break;
-      case 'n':
-        this->loop_count_ = ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'o':
-        this->num_objs_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->num_objs_ > TAO_DEMUX_TEST_MAX_OBJS)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%d exceeds the maximum of "
-                               "%d objects per POA\n",
-                               this->num_objs_,
-                               TAO_DEMUX_TEST_MAX_OBJS),
-                              -1);
-          }
-        break;
-      case 'p':
-        this->num_POAs_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->num_POAs_ > TAO_DEMUX_TEST_MAX_POAS)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%d exceeds the maximum of "
-                               "%d POAs\n",
-                               this->num_objs_,
-                               TAO_DEMUX_TEST_MAX_POAS),
-                              -1);
-          }
-        break;
-      case 'i':
-        switch (*get_opts.optarg)
-          {
-          case 'L':
-            this->is_ = Demux_Test_Client::LINEAR;
-            break;
-          case 'R':
-            this->is_ = Demux_Test_Client::RANDOM;
-            break;
-          case 'B':
-            this->is_ = Demux_Test_Client::BEST;
-            break;
-          case 'W':
-            this->is_ = Demux_Test_Client::WORST;
-            break;
-          }
-        break;
-      case 's':
-        this->step_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->step_ > this->num_objs_)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "%d exceeds the no. of Objs specified"),
-                            this->step_);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-m <num ops>]"
-                           " [-o <num objs>]"
-                           " [-p <num POAs]"
-                           " [-i <invoke strategy>"
-                           " [-f <IOR file>]"
-                           " [-n <loop count>]"
-                           "\n"
-                           "Invocation Strategy: L(linear), R(random)"
-                           "B(best), W(worst)\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  if (!this->ior_fp_)
-    {
-      // open default IOR file
-      this->ior_fp_ = ACE_OS::fopen ("ior.dat", "r");
-      if (this->ior_fp_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to open file ior.dat for reading\n"), -1);
-    }
-  return 0;
-}
-
-// The main program for Demux_Test
-int
-Demux_Test_Client::run (CORBA::Environment &env)
-{
-  // open a temporary results file
-  if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demux_Test_Client::run - "
-                         "Failed to open the results file for writing\n"),
-                        -1);
-    }
-  TAO_TRY_EX (RUN)
-    {
-      switch (this->is_)
-        {
-        case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (TAO_TRY_ENV);
-          break;
-        case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (TAO_TRY_ENV);
-          break;
-        case Demux_Test_Client::BEST:
-          (void) this->run_best_test (TAO_TRY_ENV);
-          break;
-        case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (TAO_TRY_ENV);
-          break;
-        }
-      TAO_CHECK_ENV_EX (RUN);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("run failed");
-      env.exception (TAO_TRY_ENV.exception ());
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) Demux_Test_Client::run - "
-                         "Error running the Client\n"),
-                        -1);
-    }
-  TAO_ENDTRY;
-
-  ACE_OS::fclose (this->result_fp_);
-
-  TAO_TRY_EX (SHUTDOWN)
-    {
-      // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (TAO_TRY_ENV);
-      TAO_CHECK_ENV_EX (SHUTDOWN);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("shutdown failed");
-      env.exception (TAO_TRY_ENV.exception ());
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) Demux_Test_Client::run - "
-                         "Error running the Client\n"),
-                        -1);
-    }
-  TAO_ENDTRY;
-
-      // now print the results
-  if (this->print_results () == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Demux_Test_Client::run - "
-                         "Print results failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-Demux_Test_Client::run_linear_test (CORBA::Environment &env)
-{
-  CORBA::ULong j, k, l, m;
-  ACE_hrtime_t start, end;
-
-  m = 0;
-  for (j = 0; j < this->num_POAs_; ++j)
-    for (k = 0; k < this->num_objs_; k+=this->step_)
-      for (l = 0; l < this->num_ops_; ++l)
-          {
-            start = ACE_OS::gethrtime ();
-            
-            // invoke the method
-            this->op_db_[l].op_ (this->demux_test_[j][k].in (), env);
-            
-            end = ACE_OS::gethrtime ();
-
-            m++;
-            ACE_OS::fprintf (this->result_fp_, "%d %f\n", m,
-                             1.0 * ACE_UINT64_DBLCAST_ADAPTER (end - start));
-          }
-
-  return 0;
-}
-
-int
-Demux_Test_Client::run_random_test (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "ERROR : Random test\n"));
-  return 0;
-}
-
-int
-Demux_Test_Client::run_best_test (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "ERROR : Best Test\n"));
-  return 0;
-}
-
-int
-Demux_Test_Client::run_worst_test (CORBA::Environment &env)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "ERROR : Worst test\n"));
-  return 0;
-}
-
-int
-Demux_Test_Client::print_results (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "******** "));
-  switch (this->is_)
-    {
-    case Demux_Test_Client::LINEAR:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Linear Strategy ******\n"));
-      break;
-    case Demux_Test_Client::RANDOM:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Random Strategy ******\n"));
-      break;
-    case Demux_Test_Client::BEST:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Best Strategy ******\n"));
-      break;
-    case Demux_Test_Client::WORST:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Worst Strategy ******\n"));
-      break;
-    }
-
-  return 0;
-}
-
-// include the generated code
-#include "demux_test_client.i"
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
deleted file mode 100644
index 6acfb68d4c0..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#ifndef TAO_DEMUX_TEST_CLIENT_H
-#define TAO_DEMUX_TEST_CLIENT_H
-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_client.h
-//
-//    Definition of the client-side demux_test class
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include "ace/Get_Opt.h"
-#include "demux_testC.h"
-#include "demux_test_macros.h"
-#include <math.h>
-
-class Demux_Test_Client
-{
-public:
-
-  // Request invocation strategies
-  enum INVOKE_STRATEGY
-  {
-    LINEAR,
-    RANDOM,
-    BEST,
-    WORST
-  };
-
-  typedef void (*OP_PTR) (Demux_Test_ptr, CORBA::Environment &);
-
-  struct Operation_DB_Entry
-  {
-    OP_PTR op_;
-  };
-
-  Demux_Test_Client (void);
-  // CTOR
-
-  ~Demux_Test_Client (void);
-  // DTOR
-
-  int init (int argc, char *argv [], CORBA::Environment &env
-            = CORBA::Environment::default_environment ());
-  // initialize the client test bed
-
-  int run (CORBA::Environment &env
-           = CORBA::Environment::default_environment ());
-  // run the tests
-
-private:
-
-  int parse_args (void);
-  // parse command line arguments
-
-  int init_operation_db (void);
-  // initialize the operation database
-
-  int run_linear_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
-  // run linear strategy
-
-  int run_random_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
-  // run random strategy
-
-  int run_best_test (CORBA::Environment &env
-                     = CORBA::Environment::default_environment ());
-  // run best strategy (w.r.t to linear)
-
-  int run_worst_test (CORBA::Environment &env
-                      = CORBA::Environment::default_environment ());
-  // run worst strategy (w.r.t to linear)
-
-  int print_results (void);
-  // print results
-
-  int argc_;
-  // number of command line arguments
-
-  char **argv_;
-  // the actual command line arguments
-
-  CORBA::ORB_var orb_;
-  // The underlying ORB
-
-  INVOKE_STRATEGY is_;
-  // invocation strategy (default linear)
-
-  CORBA::ULong num_POAs_;
-  // number of POAs
-
-  CORBA::ULong num_objs_;
-  // number of objects
-
-  CORBA::ULong num_ops_;
-  // number of operations
-
-  Demux_Test_var demux_test_[TAO_DEMUX_TEST_MAX_POAS][TAO_DEMUX_TEST_MAX_OBJS];
-  // object references to the Demux_Test objects
-
-  CORBA::ULong loop_count_;
-  // number of times to invoke the request
-
-  FILE *ior_fp_;
-  // IOR database
-
-  FILE *result_fp_;
-  // temporary results file
-
-  CORBA::ULong step_;
-  // Step for the no. of objects to be skipped while making remote calls
-  // on the given no. of objects. 
-  // If the step is 100, a call will be made to every 100th Object.
-  
-  Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
-  // database of operations
-
-};
-
-
-#endif /* TAO_DEMUX_TEST_CLIENT_H */
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.i b/TAO/performance-tests/POA/Demux/demux_test_client.i
deleted file mode 100644
index e1788341625..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_client.i
+++ /dev/null
@@ -1,20 +0,0 @@
-//$Id$
-static void M302 (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
-{
-  objref->M302 (env);
-}
-
-static void shutdown (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
-{
-  objref->shutdown (env);
-}
-
-int Demux_Test_Client::init_operation_db (void)
-{
-   this->op_db_[0].op_ = M302;
-   this->op_db_[1].op_ = shutdown;
-   return 0;
-}
-
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
deleted file mode 100644
index f9158d6bcc2..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//$Id$
-// Implementation of TAO's Demux_Test interface
-
-#include "demux_test_i.h"
-
-// ctor
-Demux_Test_i::Demux_Test_i (void)
-{}
-
-// dtor
-Demux_Test_i::~Demux_Test_i (void)
-{}
-
-void Demux_Test_i::M302 (CORBA::Environment &env)
-{
-   ACE_UNUSED_ARG (env);
-}
-
-void Demux_Test_i::shutdown (CORBA::Environment &env)
-{
-   ACE_UNUSED_ARG (env);
-  TAO_ORB_Core_instance ()->orb ()->shutdown ();
-}
-
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
deleted file mode 100644
index 8b89b87fa39..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//$Id$
-
-#if !defined (TAO_DEMUX_TEST_I_H)
-#define TAO_DEMUX_TEST_I_H
-
-// Implementation of TAO's Demux_Test interface
-
-#include "demux_testS.h"
-
-class Demux_Test_i : public POA_Demux_Test
-{
-public:
-
-  Demux_Test_i (void);
-  //ctor.
-  
-  Demux_Test_i (PortableServer::POA_ptr poa)
-    : poa_ (PortableServer::POA::_duplicate (poa))
-    {
-    };
-  // ctor 
-  
-  ~Demux_Test_i (void);
-  // dtor 
-  
-  // Return the Default POA of this Servant
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &/*env*/)
-    {
-      return PortableServer::POA::_duplicate (this->poa_.in ());
-    };
-  
-  void M302 (CORBA::Environment &env = 
-             CORBA::Environment::default_environment ());
-  
-  void shutdown (CORBA::Environment &env = 
-                 CORBA::Environment::default_environment ());
-  
-private: 
-  PortableServer::POA_var poa_;
-  // Implement a different _default_POA()
-  
-};
-
-#endif /* TAO_DEMUX_TEST_I_H */
-
-
diff --git a/TAO/performance-tests/POA/Demux/demux_test_macros.h b/TAO/performance-tests/POA/Demux/demux_test_macros.h
deleted file mode 100644
index 31bb42ebe80..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_macros.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef TAO_DEMUX_TEST_MACROS_H
-#define TAO_DEMUX_TEST_MACROS_H
-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_macros.h
-//
-//    constants used by both the server and client
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#define TAO_DEMUX_TEST_MAX_POAS  100
-#define TAO_DEMUX_TEST_MAX_OBJS  1000
-#define TAO_DEMUX_TEST_MAX_OPS  1000
-
-#endif /* TAO_DEMUX_TEST_MACROS_H */
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
deleted file mode 100644
index cf412600eb1..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ /dev/null
@@ -1,513 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_server.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "demux_test_server.h"
-
-ACE_RCSID(CodeGen, demux_test_server, "$Id$")
-
-// Constructor
-Demux_Test_Server::Demux_Test_Server (void)
-  : argc_ (0),
-    argv_ (0),
-    num_POAs_ (1),
-    num_objs_ (1),
-    poa_fp_ (0),
-    ior_fp_ (0),
-    servant_fp_ (0),
-    use_user_id_ (0),
-    use_transient_poas_ (0)
-{
-}
-
-// destructor
-Demux_Test_Server::~Demux_Test_Server (void)
-{
-  ACE_OS::fclose (this->poa_fp_);
-  ACE_OS::fclose (this->ior_fp_);
-}
-
-
-//
-// initialize the Demux_Test_Server
-//
-
-int
-Demux_Test_Server::init (int argc, char *argv [], CORBA::Environment &env)
-{
-
-printf ("here\n");
-
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  // Grab the ORB
-  TAO_TRY_EX (GET_ORB)
-    {
-      char *orb_name = "internet"; // unused by TAO
-
-      // get the underlying ORB
-      this->orb_ = CORBA::ORB_init (argc, argv, orb_name, TAO_TRY_ENV);
-      TAO_CHECK_ENV_EX (GET_ORB);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("ORB_init");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  // Grab the ROOT POA
-  TAO_TRY_EX (GET_ROOT_POA)
-    {
-      CORBA::Object_var temp;      // holder for the myriad of times we get
-                                   // an object which we then have to narrow.
-      // Get the Root POA
-      
-      temp = this->orb_->resolve_initial_references ("RootPOA");
-      if (CORBA::is_nil (temp.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) Unable to get root poa reference.\n"),
-                          1);
-
-      this->root_poa_ = PortableServer::POA::_narrow (temp.in (), TAO_TRY_ENV);
-      TAO_CHECK_ENV_EX (GET_ROOT_POA);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("PortableServer::POA::_narrow");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  // grab the POA Manager
-  TAO_TRY_EX (GET_POA_MGR)
-    {
-      
-      this->poa_mgr_ = this->root_poa_->the_POAManager (TAO_TRY_ENV);
-      TAO_CHECK_ENV_EX (GET_POA_MGR);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("RootPOA->the_POAManager");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  // now parse the rest of the arguments to determine the POA depth, the number
-  // of objects with each POA and other info
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Before Parse Args\n"));
- 
-  if (this->parse_args () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%N:%l) Demux_Test_Server::init - "
-                       "parse_args failed\n"),
-                      -1);
-  
-  // init the Policies used by all the POAs
-  CORBA::PolicyList policies (2);
-  
-  TAO_TRY_EX (POLICY)
-    {
-      // The id_uniqueness_policy by default is UNIQUE_ID. So each of our servants
-      // will have a unique name
-      
-      policies.length (2);
-      
-      // Choose the ID Policy for servants.
-      
-      if (this->use_user_id_)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Using the USER_ID policy ... \n"));
-                      
-          policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                          TAO_TRY_ENV);
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Using the SYSTEM_ID policy ... \n"));
-          
-          policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                          TAO_TRY_ENV);        
-        }
-
-      TAO_CHECK_ENV_EX (POLICY);
-      
-      // Choose the LifeSpan Policy. Default is PERSISTENT.
-      if (this->use_transient_poas_)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Using the TRANSIENT Lifespan policy for the POAs\n")); 
-          
-          policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT,
-                                                     TAO_TRY_ENV);
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Using the PERSISTENT Lifespan policy for the POAs\n")); 
-
-          policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                     TAO_TRY_ENV);
-        }
-
-      TAO_CHECK_ENV_EX (POLICY);
-
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("creating policy");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  // now create a POA hierarchy of the desired depth and populate each POA with
-  // the specified number of objects. Finally, activate these objects.
-  
-  char poa_file [128];
-  
-  // open the file that has all the POA names in it
-  if ((this->poa_fp_ = ACE_OS::fopen ("poa_names_100.dat", "r")) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         " (%P|%t) Unable to open POA file %s\n", poa_file),
-                        -1);
-    }
-  
-  // Open the file that has the servant names in it.  
-  if ((this->servant_fp_ = ACE_OS::fopen ("names_file", "r")) == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         " (%P|%t) Unable to open POA file %s\n", poa_file),
-                        -1);
-    }
-  
-  // loop indices
-  CORBA::ULong i, j;
-  
-  PortableServer::POA *prev_poa = this->root_poa_.in ();
-  for (i = 0; i < this->num_POAs_; i++)
-    {
-      char poa_name [128];
-      
-      ACE_OS::memset (poa_name, 0, 128);
-      (void) fscanf (this->poa_fp_, "%s", poa_name);
-      
-      TAO_TRY_EX (CREATE_POA)
-        {
-          this->child_poa_[i] = prev_poa->create_POA (poa_name,
-                                                      this->poa_mgr_.in (),
-                                                      policies,
-                                                      TAO_TRY_ENV);
-          TAO_CHECK_ENV_EX (CREATE_POA);
-        }
-      TAO_CATCHANY
-        {
-          TAO_TRY_ENV.print_exception ("create_POA");
-          env.exception (TAO_TRY_ENV.exception ());
-          return -1;
-        }
-      TAO_ENDTRY;
-      
-      for (j = 0; j < this->num_objs_; j++)
-        {
-	  PortableServer::ObjectId_var id;
-          
-          if (!use_user_id_)
-            {
-              // activate the object
-              TAO_TRY_EX (ACTIVATE_OBJ)
-                {
-                  Demux_Test_i * demux_test_i_ptr;
-                  ACE_NEW_RETURN (demux_test_i_ptr,
-                                  Demux_Test_i,
-                                  -1);
-                  
-                  //id = this->child_poa_[i]->activate_object (&this->demux_test_[j],
-                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr,
-                                                             TAO_TRY_ENV);
-                  TAO_CHECK_ENV_EX (ACTIVATE_OBJ);
-                }
-              TAO_CATCHANY
-                {
-                  TAO_TRY_ENV.print_exception ("poa->activate_obj");
-                  env.exception (TAO_TRY_ENV.exception ());
-                  return -1;
-                }
-              TAO_ENDTRY;
-              
-              // Get the IOR and output it to the file
-              TAO_TRY_EX (IOR)
-                {
-                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in (),
-                                                                                      TAO_TRY_ENV);
-                  TAO_CHECK_ENV_EX (IOR);
-                  
-                  CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), TAO_TRY_ENV);
-                  
-                  TAO_CHECK_ENV_EX (IOR);
-                  
-                  ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
-                }
-              TAO_CATCHANY
-                {
-                  TAO_TRY_ENV.print_exception ("object_to_string");
-                  env.exception (TAO_TRY_ENV.exception ());
-                  return -1;
-                }
-              TAO_ENDTRY;
-            }
-          else
-            { 
-              // Use the USER_ID policy.
-
-              char servant_name [128];
-              
-              TAO_TRY
-                {
-                  Demux_Test_i * demux_test_i_ptr;
-                  ACE_NEW_RETURN (demux_test_i_ptr,
-                                  Demux_Test_i (this->child_poa_[i].in ()),
-                                  -1);
-                  
-                  ACE_OS::memset (servant_name, 0, 128);
-                  
-                  (void) fscanf (this->servant_fp_, "%s", servant_name);
-                  
-                  ACE_DEBUG ((LM_DEBUG,
-                              "Activating Servant with Name : %s\n",
-                              servant_name));
-                  
-                  PortableServer::ObjectId_var oid =
-                    PortableServer::string_to_ObjectId (servant_name);
-                  
-                  this->child_poa_[i]->activate_object_with_id (oid.in (),
-                                                                demux_test_i_ptr,
-                                                                TAO_TRY_ENV);
-                  TAO_CHECK_ENV;
-                  
-                  // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (TAO_TRY_ENV);
-                  
-                  TAO_CHECK_ENV;
-                  
-                  CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), TAO_TRY_ENV);
-                  
-                  TAO_CHECK_ENV;
-                  
-                  ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
-                  
-                }
-              TAO_CATCHANY
-                {
-                  TAO_TRY_ENV.print_exception ("object_to_string");
-                  env.exception (TAO_TRY_ENV.exception ());
-                  return -1;
-                }
-              TAO_ENDTRY;
-            
-            }// end of if (!use_user_id_) 
-              
-        } // j loop
-      
-      prev_poa = this->child_poa_[i].in ();
-      
-    } // i loop
-  
-  ACE_OS::fclose (this->ior_fp_);
-  ACE_OS::fclose (this->servant_fp_);
-  
-  // now activate the POAs
-  
-  TAO_TRY_EX (ACTIVATE)
-    {
-      this->poa_mgr_->activate (TAO_TRY_ENV);
-      
-      TAO_CHECK_ENV_EX (ACTIVATE);
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("poa_mgr->activate");
-      env.exception (TAO_TRY_ENV.exception ());
-      return -1;
-    }
-  TAO_ENDTRY;
-  
-  // success
-  return 0;
-
-}
-
-// parse command line arguments (if any).
-int
-Demux_Test_Server::parse_args (void)
-{
-
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'f':
-        this->ior_fp_ = ACE_OS::fopen (get_opts.optarg, "w");
-        if (this->ior_fp_ == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case 'o':
-        this->num_objs_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->num_objs_ > TAO_DEMUX_TEST_MAX_OBJS)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%d exceeds the maximum of "
-                               "%d objects per POA\n",
-                               this->num_objs_,
-                               TAO_DEMUX_TEST_MAX_OBJS),
-                              -1);
-          }
-        break;
-      case 'p':
-        this->num_POAs_ = ACE_OS::atoi (get_opts.optarg);
-        if (this->num_POAs_ > TAO_DEMUX_TEST_MAX_POAS)
-          {
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%d exceeds the maximum of "
-                               "%d POAs\n",
-                               this->num_objs_,
-                               TAO_DEMUX_TEST_MAX_POAS),
-                              -1);
-          }
-        break;
-      case 'u':
-        this->use_user_id_ = 1;
-        break;
-      case 't':
-        this->use_transient_poas_ = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o <num objects>]"
-                           " [-p <num POAs>]"
-                           " [-f <IOR file>]"
-                           "\n", this->argv_ [0]),
-                          -1);
-      }
-
-  if (!this->ior_fp_)
-    {
-      // open default IOR file
-      this->ior_fp_ = ACE_OS::fopen ("ior.dat", "w");
-      if (this->ior_fp_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to open file ior.dat for writing\n"), -1);
-    }
-  return 0;
-}
-
-// grab a reference to the naming service so that we can register with it.
-int
-Demux_Test_Server::init_naming_service (void)
-{
-  // Initialize the naming services
-  if (this->my_name_client_.init (this->orb_.in ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) Unable to initialize "
-                       "the TAO_Naming_Client. \n"),
-                      -1);
-
-  // success
-  return 0;
-}
-
-// The main program for Demux_Test
-int
-Demux_Test_Server::run (CORBA::Environment &env)
-{
-  TAO_TRY
-    {
-
-      if (this->orb_->run () == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) Demux_Test_Server::run - "
-                             "orb run failed\n"),
-                            -1);
-        }
-      TAO_CHECK_ENV;
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("run failed");
-      env.exception (TAO_TRY_ENV.exception ());
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) Demux_Test_Server::run - "
-                         "Error running the server\n"),
-                        -1);
-    }
-  TAO_ENDTRY;
-
-  ACE_TIMEPROBE_PRINT;
-  
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex> >;
-template class ACE_Unbounded_Set<ACE_Event_Descriptions>;
-template class ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>;
-template class ACE_Node<ACE_Event_Descriptions>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Function_Timeprobe<ACE_Timeprobe<ACE_Null_Mutex> >
-#pragma instantiate ACE_Unbounded_Set<ACE_Event_Descriptions>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_Event_Descriptions>
-#pragma instantiate ACE_Node<ACE_Event_Descriptions>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
deleted file mode 100644
index 786a6c92f70..00000000000
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ /dev/null
@@ -1,110 +0,0 @@
-
-#ifndef DOORS_DEMUX_TEST_SERVER_H
-#define DOORS_DEMUX_TEST_SERVER_H
-
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    demux_test_server.h
-//
-//    Server-side demux_test class
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-#define ACE_ENABLE_TIMEPROBES
-
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-#include "tao/Timeprobe.h"
-#include "tao/TAO.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-
-#include "demux_test_i.h"
-#include "demux_test_macros.h"
-
-class Demux_Test_Server
-{
-public:
-  Demux_Test_Server (void);
-  // ctor
-
-  ~Demux_Test_Server (void);
-  // dtor
-
-  int run (CORBA::Environment &);
-  // Execute client code.
-
-  int init (int argc, char **argv, CORBA::Environment &);
-  // Initialize the communication endpoint with server.
-
-  int calculate_avg_latency (void);
-  // Calculates the statistics by reading different data values from results.dat.
-
-private:
-
-  int parse_args (void);
-  // parse command line arguments (if any)
-
-  int init_naming_service (void);
-  // initialize the naming service
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  CORBA::ORB_var orb_;
-  // the ORB
-
-  PortableServer::POA_var root_poa_;
-  // the root POA (we will not have any objects registerd with this)
-
-  PortableServer::POAManager_var poa_mgr_;
-  // The POA manager
-
-  PortableServer::POA_var child_poa_ [TAO_DEMUX_TEST_MAX_POAS];
-  // An array of child POAs with the next one being the child of the previous
-  // one
-
-  TAO_Naming_Client my_name_client_;
-  // An instance of the name client used for resolving the factory
-  // objects.
-
-  //  Demux_Test_i demux_test_[TAO_DEMUX_TEST_MAX_POAS * TAO_DEMUX_TEST_MAX_OBJS];
-  // The actual demux_test objects
-
-  CORBA::ULong num_POAs_;
-  // number of POAs
-
-  CORBA::ULong  num_objs_;
-  // number of objects
-
-  FILE *poa_fp_;
-  // file storing POA names
-
-  FILE *ior_fp_;
-  // file for storing IORs
-
-  FILE *servant_fp_;
-  // file for storing Servant Names.
-
-  int use_user_id_;
-  // Use the USER_ID policy for servants as opposed to System ID.
-
-  int use_transient_poas_;
-  // Use the Transient POAs for servant activation as opposed
-  // to persistent POAs.
-
-};
-
-
-#endif /* DOORS_DEMUX_TEST_SERVER_H */
diff --git a/TAO/performance-tests/POA/Demux/names_file b/TAO/performance-tests/POA/Demux/names_file
deleted file mode 100644
index a8aecf47034..00000000000
--- a/TAO/performance-tests/POA/Demux/names_file
+++ /dev/null
@@ -1,1000 +0,0 @@
-000000000
-000000001
-000000002
-000000003
-000000004
-000000005
-000000006
-000000007
-000000008
-000000009
-000000010
-000000011
-000000012
-000000013
-000000014
-000000015
-000000016
-000000017
-000000018
-000000019
-000000020
-000000021
-000000022
-000000023
-000000024
-000000025
-000000026
-000000027
-000000028
-000000029
-000000030
-000000031
-000000032
-000000033
-000000034
-000000035
-000000036
-000000037
-000000038
-000000039
-000000040
-000000041
-000000042
-000000043
-000000044
-000000045
-000000046
-000000047
-000000048
-000000049
-000000050
-000000051
-000000052
-000000053
-000000054
-000000055
-000000056
-000000057
-000000058
-000000059
-000000060
-000000061
-000000062
-000000063
-000000064
-000000065
-000000066
-000000067
-000000068
-000000069
-000000070
-000000071
-000000072
-000000073
-000000074
-000000075
-000000076
-000000077
-000000078
-000000079
-000000080
-000000081
-000000082
-000000083
-000000084
-000000085
-000000086
-000000087
-000000088
-000000089
-000000090
-000000091
-000000092
-000000093
-000000094
-000000095
-000000096
-000000097
-000000098
-000000099
-000000100
-000000101
-000000102
-000000103
-000000104
-000000105
-000000106
-000000107
-000000108
-000000109
-000000110
-000000111
-000000112
-000000113
-000000114
-000000115
-000000116
-000000117
-000000118
-000000119
-000000120
-000000121
-000000122
-000000123
-000000124
-000000125
-000000126
-000000127
-000000128
-000000129
-000000130
-000000131
-000000132
-000000133
-000000134
-000000135
-000000136
-000000137
-000000138
-000000139
-000000140
-000000141
-000000142
-000000143
-000000144
-000000145
-000000146
-000000147
-000000148
-000000149
-000000150
-000000151
-000000152
-000000153
-000000154
-000000155
-000000156
-000000157
-000000158
-000000159
-000000160
-000000161
-000000162
-000000163
-000000164
-000000165
-000000166
-000000167
-000000168
-000000169
-000000170
-000000171
-000000172
-000000173
-000000174
-000000175
-000000176
-000000177
-000000178
-000000179
-000000180
-000000181
-000000182
-000000183
-000000184
-000000185
-000000186
-000000187
-000000188
-000000189
-000000190
-000000191
-000000192
-000000193
-000000194
-000000195
-000000196
-000000197
-000000198
-000000199
-000000200
-000000201
-000000202
-000000203
-000000204
-000000205
-000000206
-000000207
-000000208
-000000209
-000000210
-000000211
-000000212
-000000213
-000000214
-000000215
-000000216
-000000217
-000000218
-000000219
-000000220
-000000221
-000000222
-000000223
-000000224
-000000225
-000000226
-000000227
-000000228
-000000229
-000000230
-000000231
-000000232
-000000233
-000000234
-000000235
-000000236
-000000237
-000000238
-000000239
-000000240
-000000241
-000000242
-000000243
-000000244
-000000245
-000000246
-000000247
-000000248
-000000249
-000000250
-000000251
-000000252
-000000253
-000000254
-000000255
-000000256
-000000257
-000000258
-000000259
-000000260
-000000261
-000000262
-000000263
-000000264
-000000265
-000000266
-000000267
-000000268
-000000269
-000000270
-000000271
-000000272
-000000273
-000000274
-000000275
-000000276
-000000277
-000000278
-000000279
-000000280
-000000281
-000000282
-000000283
-000000284
-000000285
-000000286
-000000287
-000000288
-000000289
-000000290
-000000291
-000000292
-000000293
-000000294
-000000295
-000000296
-000000297
-000000298
-000000299
-000000300
-000000301
-000000302
-000000303
-000000304
-000000305
-000000306
-000000307
-000000308
-000000309
-000000310
-000000311
-000000312
-000000313
-000000314
-000000315
-000000316
-000000317
-000000318
-000000319
-000000320
-000000321
-000000322
-000000323
-000000324
-000000325
-000000326
-000000327
-000000328
-000000329
-000000330
-000000331
-000000332
-000000333
-000000334
-000000335
-000000336
-000000337
-000000338
-000000339
-000000340
-000000341
-000000342
-000000343
-000000344
-000000345
-000000346
-000000347
-000000348
-000000349
-000000350
-000000351
-000000352
-000000353
-000000354
-000000355
-000000356
-000000357
-000000358
-000000359
-000000360
-000000361
-000000362
-000000363
-000000364
-000000365
-000000366
-000000367
-000000368
-000000369
-000000370
-000000371
-000000372
-000000373
-000000374
-000000375
-000000376
-000000377
-000000378
-000000379
-000000380
-000000381
-000000382
-000000383
-000000384
-000000385
-000000386
-000000387
-000000388
-000000389
-000000390
-000000391
-000000392
-000000393
-000000394
-000000395
-000000396
-000000397
-000000398
-000000399
-000000400
-000000401
-000000402
-000000403
-000000404
-000000405
-000000406
-000000407
-000000408
-000000409
-000000410
-000000411
-000000412
-000000413
-000000414
-000000415
-000000416
-000000417
-000000418
-000000419
-000000420
-000000421
-000000422
-000000423
-000000424
-000000425
-000000426
-000000427
-000000428
-000000429
-000000430
-000000431
-000000432
-000000433
-000000434
-000000435
-000000436
-000000437
-000000438
-000000439
-000000440
-000000441
-000000442
-000000443
-000000444
-000000445
-000000446
-000000447
-000000448
-000000449
-000000450
-000000451
-000000452
-000000453
-000000454
-000000455
-000000456
-000000457
-000000458
-000000459
-000000460
-000000461
-000000462
-000000463
-000000464
-000000465
-000000466
-000000467
-000000468
-000000469
-000000470
-000000471
-000000472
-000000473
-000000474
-000000475
-000000476
-000000477
-000000478
-000000479
-000000480
-000000481
-000000482
-000000483
-000000484
-000000485
-000000486
-000000487
-000000488
-000000489
-000000490
-000000491
-000000492
-000000493
-000000494
-000000495
-000000496
-000000497
-000000498
-000000499
-000000500
-000000501
-000000502
-000000503
-000000504
-000000505
-000000506
-000000507
-000000508
-000000509
-000000510
-000000511
-000000512
-000000513
-000000514
-000000515
-000000516
-000000517
-000000518
-000000519
-000000520
-000000521
-000000522
-000000523
-000000524
-000000525
-000000526
-000000527
-000000528
-000000529
-000000530
-000000531
-000000532
-000000533
-000000534
-000000535
-000000536
-000000537
-000000538
-000000539
-000000540
-000000541
-000000542
-000000543
-000000544
-000000545
-000000546
-000000547
-000000548
-000000549
-000000550
-000000551
-000000552
-000000553
-000000554
-000000555
-000000556
-000000557
-000000558
-000000559
-000000560
-000000561
-000000562
-000000563
-000000564
-000000565
-000000566
-000000567
-000000568
-000000569
-000000570
-000000571
-000000572
-000000573
-000000574
-000000575
-000000576
-000000577
-000000578
-000000579
-000000580
-000000581
-000000582
-000000583
-000000584
-000000585
-000000586
-000000587
-000000588
-000000589
-000000590
-000000591
-000000592
-000000593
-000000594
-000000595
-000000596
-000000597
-000000598
-000000599
-000000600
-000000601
-000000602
-000000603
-000000604
-000000605
-000000606
-000000607
-000000608
-000000609
-000000610
-000000611
-000000612
-000000613
-000000614
-000000615
-000000616
-000000617
-000000618
-000000619
-000000620
-000000621
-000000622
-000000623
-000000624
-000000625
-000000626
-000000627
-000000628
-000000629
-000000630
-000000631
-000000632
-000000633
-000000634
-000000635
-000000636
-000000637
-000000638
-000000639
-000000640
-000000641
-000000642
-000000643
-000000644
-000000645
-000000646
-000000647
-000000648
-000000649
-000000650
-000000651
-000000652
-000000653
-000000654
-000000655
-000000656
-000000657
-000000658
-000000659
-000000660
-000000661
-000000662
-000000663
-000000664
-000000665
-000000666
-000000667
-000000668
-000000669
-000000670
-000000671
-000000672
-000000673
-000000674
-000000675
-000000676
-000000677
-000000678
-000000679
-000000680
-000000681
-000000682
-000000683
-000000684
-000000685
-000000686
-000000687
-000000688
-000000689
-000000690
-000000691
-000000692
-000000693
-000000694
-000000695
-000000696
-000000697
-000000698
-000000699
-000000700
-000000701
-000000702
-000000703
-000000704
-000000705
-000000706
-000000707
-000000708
-000000709
-000000710
-000000711
-000000712
-000000713
-000000714
-000000715
-000000716
-000000717
-000000718
-000000719
-000000720
-000000721
-000000722
-000000723
-000000724
-000000725
-000000726
-000000727
-000000728
-000000729
-000000730
-000000731
-000000732
-000000733
-000000734
-000000735
-000000736
-000000737
-000000738
-000000739
-000000740
-000000741
-000000742
-000000743
-000000744
-000000745
-000000746
-000000747
-000000748
-000000749
-000000750
-000000751
-000000752
-000000753
-000000754
-000000755
-000000756
-000000757
-000000758
-000000759
-000000760
-000000761
-000000762
-000000763
-000000764
-000000765
-000000766
-000000767
-000000768
-000000769
-000000770
-000000771
-000000772
-000000773
-000000774
-000000775
-000000776
-000000777
-000000778
-000000779
-000000780
-000000781
-000000782
-000000783
-000000784
-000000785
-000000786
-000000787
-000000788
-000000789
-000000790
-000000791
-000000792
-000000793
-000000794
-000000795
-000000796
-000000797
-000000798
-000000799
-000000800
-000000801
-000000802
-000000803
-000000804
-000000805
-000000806
-000000807
-000000808
-000000809
-000000810
-000000811
-000000812
-000000813
-000000814
-000000815
-000000816
-000000817
-000000818
-000000819
-000000820
-000000821
-000000822
-000000823
-000000824
-000000825
-000000826
-000000827
-000000828
-000000829
-000000830
-000000831
-000000832
-000000833
-000000834
-000000835
-000000836
-000000837
-000000838
-000000839
-000000840
-000000841
-000000842
-000000843
-000000844
-000000845
-000000846
-000000847
-000000848
-000000849
-000000850
-000000851
-000000852
-000000853
-000000854
-000000855
-000000856
-000000857
-000000858
-000000859
-000000860
-000000861
-000000862
-000000863
-000000864
-000000865
-000000866
-000000867
-000000868
-000000869
-000000870
-000000871
-000000872
-000000873
-000000874
-000000875
-000000876
-000000877
-000000878
-000000879
-000000880
-000000881
-000000882
-000000883
-000000884
-000000885
-000000886
-000000887
-000000888
-000000889
-000000890
-000000891
-000000892
-000000893
-000000894
-000000895
-000000896
-000000897
-000000898
-000000899
-000000900
-000000901
-000000902
-000000903
-000000904
-000000905
-000000906
-000000907
-000000908
-000000909
-000000910
-000000911
-000000912
-000000913
-000000914
-000000915
-000000916
-000000917
-000000918
-000000919
-000000920
-000000921
-000000922
-000000923
-000000924
-000000925
-000000926
-000000927
-000000928
-000000929
-000000930
-000000931
-000000932
-000000933
-000000934
-000000935
-000000936
-000000937
-000000938
-000000939
-000000940
-000000941
-000000942
-000000943
-000000944
-000000945
-000000946
-000000947
-000000948
-000000949
-000000950
-000000951
-000000952
-000000953
-000000954
-000000955
-000000956
-000000957
-000000958
-000000959
-000000960
-000000961
-000000962
-000000963
-000000964
-000000965
-000000966
-000000967
-000000968
-000000969
-000000970
-000000971
-000000972
-000000973
-000000974
-000000975
-000000976
-000000977
-000000978
-000000979
-000000980
-000000981
-000000982
-000000983
-000000984
-000000985
-000000986
-000000987
-000000988
-000000989
-000000990
-000000991
-000000992
-000000993
-000000994
-000000995
-000000996
-000000997
-000000998
-000000999
diff --git a/TAO/performance-tests/POA/Demux/poa_names_100.dat b/TAO/performance-tests/POA/Demux/poa_names_100.dat
deleted file mode 100644
index 5f8d72cc5c9..00000000000
--- a/TAO/performance-tests/POA/Demux/poa_names_100.dat
+++ /dev/null
@@ -1,10000 +0,0 @@
-P00000
-P00001
-P00002
-P00003
-P00004
-P00005
-P00006
-P00007
-P00008
-P00009
-P00010
-P00011
-P00012
-P00013
-P00014
-P00015
-P00016
-P00017
-P00018
-P00019
-P00020
-P00021
-P00022
-P00023
-P00024
-P00025
-P00026
-P00027
-P00028
-P00029
-P00030
-P00031
-P00032
-P00033
-P00034
-P00035
-P00036
-P00037
-P00038
-P00039
-P00040
-P00041
-P00042
-P00043
-P00044
-P00045
-P00046
-P00047
-P00048
-P00049
-P00050
-P00051
-P00052
-P00053
-P00054
-P00055
-P00056
-P00057
-P00058
-P00059
-P00060
-P00061
-P00062
-P00063
-P00064
-P00065
-P00066
-P00067
-P00068
-P00069
-P00070
-P00071
-P00072
-P00073
-P00074
-P00075
-P00076
-P00077
-P00078
-P00079
-P00080
-P00081
-P00082
-P00083
-P00084
-P00085
-P00086
-P00087
-P00088
-P00089
-P00090
-P00091
-P00092
-P00093
-P00094
-P00095
-P00096
-P00097
-P00098
-P00099
-P00100
-P00101
-P00102
-P00103
-P00104
-P00105
-P00106
-P00107
-P00108
-P00109
-P00110
-P00111
-P00112
-P00113
-P00114
-P00115
-P00116
-P00117
-P00118
-P00119
-P00120
-P00121
-P00122
-P00123
-P00124
-P00125
-P00126
-P00127
-P00128
-P00129
-P00130
-P00131
-P00132
-P00133
-P00134
-P00135
-P00136
-P00137
-P00138
-P00139
-P00140
-P00141
-P00142
-P00143
-P00144
-P00145
-P00146
-P00147
-P00148
-P00149
-P00150
-P00151
-P00152
-P00153
-P00154
-P00155
-P00156
-P00157
-P00158
-P00159
-P00160
-P00161
-P00162
-P00163
-P00164
-P00165
-P00166
-P00167
-P00168
-P00169
-P00170
-P00171
-P00172
-P00173
-P00174
-P00175
-P00176
-P00177
-P00178
-P00179
-P00180
-P00181
-P00182
-P00183
-P00184
-P00185
-P00186
-P00187
-P00188
-P00189
-P00190
-P00191
-P00192
-P00193
-P00194
-P00195
-P00196
-P00197
-P00198
-P00199
-P00200
-P00201
-P00202
-P00203
-P00204
-P00205
-P00206
-P00207
-P00208
-P00209
-P00210
-P00211
-P00212
-P00213
-P00214
-P00215
-P00216
-P00217
-P00218
-P00219
-P00220
-P00221
-P00222
-P00223
-P00224
-P00225
-P00226
-P00227
-P00228
-P00229
-P00230
-P00231
-P00232
-P00233
-P00234
-P00235
-P00236
-P00237
-P00238
-P00239
-P00240
-P00241
-P00242
-P00243
-P00244
-P00245
-P00246
-P00247
-P00248
-P00249
-P00250
-P00251
-P00252
-P00253
-P00254
-P00255
-P00256
-P00257
-P00258
-P00259
-P00260
-P00261
-P00262
-P00263
-P00264
-P00265
-P00266
-P00267
-P00268
-P00269
-P00270
-P00271
-P00272
-P00273
-P00274
-P00275
-P00276
-P00277
-P00278
-P00279
-P00280
-P00281
-P00282
-P00283
-P00284
-P00285
-P00286
-P00287
-P00288
-P00289
-P00290
-P00291
-P00292
-P00293
-P00294
-P00295
-P00296
-P00297
-P00298
-P00299
-P00300
-P00301
-P00302
-P00303
-P00304
-P00305
-P00306
-P00307
-P00308
-P00309
-P00310
-P00311
-P00312
-P00313
-P00314
-P00315
-P00316
-P00317
-P00318
-P00319
-P00320
-P00321
-P00322
-P00323
-P00324
-P00325
-P00326
-P00327
-P00328
-P00329
-P00330
-P00331
-P00332
-P00333
-P00334
-P00335
-P00336
-P00337
-P00338
-P00339
-P00340
-P00341
-P00342
-P00343
-P00344
-P00345
-P00346
-P00347
-P00348
-P00349
-P00350
-P00351
-P00352
-P00353
-P00354
-P00355
-P00356
-P00357
-P00358
-P00359
-P00360
-P00361
-P00362
-P00363
-P00364
-P00365
-P00366
-P00367
-P00368
-P00369
-P00370
-P00371
-P00372
-P00373
-P00374
-P00375
-P00376
-P00377
-P00378
-P00379
-P00380
-P00381
-P00382
-P00383
-P00384
-P00385
-P00386
-P00387
-P00388
-P00389
-P00390
-P00391
-P00392
-P00393
-P00394
-P00395
-P00396
-P00397
-P00398
-P00399
-P00400
-P00401
-P00402
-P00403
-P00404
-P00405
-P00406
-P00407
-P00408
-P00409
-P00410
-P00411
-P00412
-P00413
-P00414
-P00415
-P00416
-P00417
-P00418
-P00419
-P00420
-P00421
-P00422
-P00423
-P00424
-P00425
-P00426
-P00427
-P00428
-P00429
-P00430
-P00431
-P00432
-P00433
-P00434
-P00435
-P00436
-P00437
-P00438
-P00439
-P00440
-P00441
-P00442
-P00443
-P00444
-P00445
-P00446
-P00447
-P00448
-P00449
-P00450
-P00451
-P00452
-P00453
-P00454
-P00455
-P00456
-P00457
-P00458
-P00459
-P00460
-P00461
-P00462
-P00463
-P00464
-P00465
-P00466
-P00467
-P00468
-P00469
-P00470
-P00471
-P00472
-P00473
-P00474
-P00475
-P00476
-P00477
-P00478
-P00479
-P00480
-P00481
-P00482
-P00483
-P00484
-P00485
-P00486
-P00487
-P00488
-P00489
-P00490
-P00491
-P00492
-P00493
-P00494
-P00495
-P00496
-P00497
-P00498
-P00499
-P00500
-P00501
-P00502
-P00503
-P00504
-P00505
-P00506
-P00507
-P00508
-P00509
-P00510
-P00511
-P00512
-P00513
-P00514
-P00515
-P00516
-P00517
-P00518
-P00519
-P00520
-P00521
-P00522
-P00523
-P00524
-P00525
-P00526
-P00527
-P00528
-P00529
-P00530
-P00531
-P00532
-P00533
-P00534
-P00535
-P00536
-P00537
-P00538
-P00539
-P00540
-P00541
-P00542
-P00543
-P00544
-P00545
-P00546
-P00547
-P00548
-P00549
-P00550
-P00551
-P00552
-P00553
-P00554
-P00555
-P00556
-P00557
-P00558
-P00559
-P00560
-P00561
-P00562
-P00563
-P00564
-P00565
-P00566
-P00567
-P00568
-P00569
-P00570
-P00571
-P00572
-P00573
-P00574
-P00575
-P00576
-P00577
-P00578
-P00579
-P00580
-P00581
-P00582
-P00583
-P00584
-P00585
-P00586
-P00587
-P00588
-P00589
-P00590
-P00591
-P00592
-P00593
-P00594
-P00595
-P00596
-P00597
-P00598
-P00599
-P00600
-P00601
-P00602
-P00603
-P00604
-P00605
-P00606
-P00607
-P00608
-P00609
-P00610
-P00611
-P00612
-P00613
-P00614
-P00615
-P00616
-P00617
-P00618
-P00619
-P00620
-P00621
-P00622
-P00623
-P00624
-P00625
-P00626
-P00627
-P00628
-P00629
-P00630
-P00631
-P00632
-P00633
-P00634
-P00635
-P00636
-P00637
-P00638
-P00639
-P00640
-P00641
-P00642
-P00643
-P00644
-P00645
-P00646
-P00647
-P00648
-P00649
-P00650
-P00651
-P00652
-P00653
-P00654
-P00655
-P00656
-P00657
-P00658
-P00659
-P00660
-P00661
-P00662
-P00663
-P00664
-P00665
-P00666
-P00667
-P00668
-P00669
-P00670
-P00671
-P00672
-P00673
-P00674
-P00675
-P00676
-P00677
-P00678
-P00679
-P00680
-P00681
-P00682
-P00683
-P00684
-P00685
-P00686
-P00687
-P00688
-P00689
-P00690
-P00691
-P00692
-P00693
-P00694
-P00695
-P00696
-P00697
-P00698
-P00699
-P00700
-P00701
-P00702
-P00703
-P00704
-P00705
-P00706
-P00707
-P00708
-P00709
-P00710
-P00711
-P00712
-P00713
-P00714
-P00715
-P00716
-P00717
-P00718
-P00719
-P00720
-P00721
-P00722
-P00723
-P00724
-P00725
-P00726
-P00727
-P00728
-P00729
-P00730
-P00731
-P00732
-P00733
-P00734
-P00735
-P00736
-P00737
-P00738
-P00739
-P00740
-P00741
-P00742
-P00743
-P00744
-P00745
-P00746
-P00747
-P00748
-P00749
-P00750
-P00751
-P00752
-P00753
-P00754
-P00755
-P00756
-P00757
-P00758
-P00759
-P00760
-P00761
-P00762
-P00763
-P00764
-P00765
-P00766
-P00767
-P00768
-P00769
-P00770
-P00771
-P00772
-P00773
-P00774
-P00775
-P00776
-P00777
-P00778
-P00779
-P00780
-P00781
-P00782
-P00783
-P00784
-P00785
-P00786
-P00787
-P00788
-P00789
-P00790
-P00791
-P00792
-P00793
-P00794
-P00795
-P00796
-P00797
-P00798
-P00799
-P00800
-P00801
-P00802
-P00803
-P00804
-P00805
-P00806
-P00807
-P00808
-P00809
-P00810
-P00811
-P00812
-P00813
-P00814
-P00815
-P00816
-P00817
-P00818
-P00819
-P00820
-P00821
-P00822
-P00823
-P00824
-P00825
-P00826
-P00827
-P00828
-P00829
-P00830
-P00831
-P00832
-P00833
-P00834
-P00835
-P00836
-P00837
-P00838
-P00839
-P00840
-P00841
-P00842
-P00843
-P00844
-P00845
-P00846
-P00847
-P00848
-P00849
-P00850
-P00851
-P00852
-P00853
-P00854
-P00855
-P00856
-P00857
-P00858
-P00859
-P00860
-P00861
-P00862
-P00863
-P00864
-P00865
-P00866
-P00867
-P00868
-P00869
-P00870
-P00871
-P00872
-P00873
-P00874
-P00875
-P00876
-P00877
-P00878
-P00879
-P00880
-P00881
-P00882
-P00883
-P00884
-P00885
-P00886
-P00887
-P00888
-P00889
-P00890
-P00891
-P00892
-P00893
-P00894
-P00895
-P00896
-P00897
-P00898
-P00899
-P00900
-P00901
-P00902
-P00903
-P00904
-P00905
-P00906
-P00907
-P00908
-P00909
-P00910
-P00911
-P00912
-P00913
-P00914
-P00915
-P00916
-P00917
-P00918
-P00919
-P00920
-P00921
-P00922
-P00923
-P00924
-P00925
-P00926
-P00927
-P00928
-P00929
-P00930
-P00931
-P00932
-P00933
-P00934
-P00935
-P00936
-P00937
-P00938
-P00939
-P00940
-P00941
-P00942
-P00943
-P00944
-P00945
-P00946
-P00947
-P00948
-P00949
-P00950
-P00951
-P00952
-P00953
-P00954
-P00955
-P00956
-P00957
-P00958
-P00959
-P00960
-P00961
-P00962
-P00963
-P00964
-P00965
-P00966
-P00967
-P00968
-P00969
-P00970
-P00971
-P00972
-P00973
-P00974
-P00975
-P00976
-P00977
-P00978
-P00979
-P00980
-P00981
-P00982
-P00983
-P00984
-P00985
-P00986
-P00987
-P00988
-P00989
-P00990
-P00991
-P00992
-P00993
-P00994
-P00995
-P00996
-P00997
-P00998
-P00999
-P01000
-P01001
-P01002
-P01003
-P01004
-P01005
-P01006
-P01007
-P01008
-P01009
-P01010
-P01011
-P01012
-P01013
-P01014
-P01015
-P01016
-P01017
-P01018
-P01019
-P01020
-P01021
-P01022
-P01023
-P01024
-P01025
-P01026
-P01027
-P01028
-P01029
-P01030
-P01031
-P01032
-P01033
-P01034
-P01035
-P01036
-P01037
-P01038
-P01039
-P01040
-P01041
-P01042
-P01043
-P01044
-P01045
-P01046
-P01047
-P01048
-P01049
-P01050
-P01051
-P01052
-P01053
-P01054
-P01055
-P01056
-P01057
-P01058
-P01059
-P01060
-P01061
-P01062
-P01063
-P01064
-P01065
-P01066
-P01067
-P01068
-P01069
-P01070
-P01071
-P01072
-P01073
-P01074
-P01075
-P01076
-P01077
-P01078
-P01079
-P01080
-P01081
-P01082
-P01083
-P01084
-P01085
-P01086
-P01087
-P01088
-P01089
-P01090
-P01091
-P01092
-P01093
-P01094
-P01095
-P01096
-P01097
-P01098
-P01099
-P01100
-P01101
-P01102
-P01103
-P01104
-P01105
-P01106
-P01107
-P01108
-P01109
-P01110
-P01111
-P01112
-P01113
-P01114
-P01115
-P01116
-P01117
-P01118
-P01119
-P01120
-P01121
-P01122
-P01123
-P01124
-P01125
-P01126
-P01127
-P01128
-P01129
-P01130
-P01131
-P01132
-P01133
-P01134
-P01135
-P01136
-P01137
-P01138
-P01139
-P01140
-P01141
-P01142
-P01143
-P01144
-P01145
-P01146
-P01147
-P01148
-P01149
-P01150
-P01151
-P01152
-P01153
-P01154
-P01155
-P01156
-P01157
-P01158
-P01159
-P01160
-P01161
-P01162
-P01163
-P01164
-P01165
-P01166
-P01167
-P01168
-P01169
-P01170
-P01171
-P01172
-P01173
-P01174
-P01175
-P01176
-P01177
-P01178
-P01179
-P01180
-P01181
-P01182
-P01183
-P01184
-P01185
-P01186
-P01187
-P01188
-P01189
-P01190
-P01191
-P01192
-P01193
-P01194
-P01195
-P01196
-P01197
-P01198
-P01199
-P01200
-P01201
-P01202
-P01203
-P01204
-P01205
-P01206
-P01207
-P01208
-P01209
-P01210
-P01211
-P01212
-P01213
-P01214
-P01215
-P01216
-P01217
-P01218
-P01219
-P01220
-P01221
-P01222
-P01223
-P01224
-P01225
-P01226
-P01227
-P01228
-P01229
-P01230
-P01231
-P01232
-P01233
-P01234
-P01235
-P01236
-P01237
-P01238
-P01239
-P01240
-P01241
-P01242
-P01243
-P01244
-P01245
-P01246
-P01247
-P01248
-P01249
-P01250
-P01251
-P01252
-P01253
-P01254
-P01255
-P01256
-P01257
-P01258
-P01259
-P01260
-P01261
-P01262
-P01263
-P01264
-P01265
-P01266
-P01267
-P01268
-P01269
-P01270
-P01271
-P01272
-P01273
-P01274
-P01275
-P01276
-P01277
-P01278
-P01279
-P01280
-P01281
-P01282
-P01283
-P01284
-P01285
-P01286
-P01287
-P01288
-P01289
-P01290
-P01291
-P01292
-P01293
-P01294
-P01295
-P01296
-P01297
-P01298
-P01299
-P01300
-P01301
-P01302
-P01303
-P01304
-P01305
-P01306
-P01307
-P01308
-P01309
-P01310
-P01311
-P01312
-P01313
-P01314
-P01315
-P01316
-P01317
-P01318
-P01319
-P01320
-P01321
-P01322
-P01323
-P01324
-P01325
-P01326
-P01327
-P01328
-P01329
-P01330
-P01331
-P01332
-P01333
-P01334
-P01335
-P01336
-P01337
-P01338
-P01339
-P01340
-P01341
-P01342
-P01343
-P01344
-P01345
-P01346
-P01347
-P01348
-P01349
-P01350
-P01351
-P01352
-P01353
-P01354
-P01355
-P01356
-P01357
-P01358
-P01359
-P01360
-P01361
-P01362
-P01363
-P01364
-P01365
-P01366
-P01367
-P01368
-P01369
-P01370
-P01371
-P01372
-P01373
-P01374
-P01375
-P01376
-P01377
-P01378
-P01379
-P01380
-P01381
-P01382
-P01383
-P01384
-P01385
-P01386
-P01387
-P01388
-P01389
-P01390
-P01391
-P01392
-P01393
-P01394
-P01395
-P01396
-P01397
-P01398
-P01399
-P01400
-P01401
-P01402
-P01403
-P01404
-P01405
-P01406
-P01407
-P01408
-P01409
-P01410
-P01411
-P01412
-P01413
-P01414
-P01415
-P01416
-P01417
-P01418
-P01419
-P01420
-P01421
-P01422
-P01423
-P01424
-P01425
-P01426
-P01427
-P01428
-P01429
-P01430
-P01431
-P01432
-P01433
-P01434
-P01435
-P01436
-P01437
-P01438
-P01439
-P01440
-P01441
-P01442
-P01443
-P01444
-P01445
-P01446
-P01447
-P01448
-P01449
-P01450
-P01451
-P01452
-P01453
-P01454
-P01455
-P01456
-P01457
-P01458
-P01459
-P01460
-P01461
-P01462
-P01463
-P01464
-P01465
-P01466
-P01467
-P01468
-P01469
-P01470
-P01471
-P01472
-P01473
-P01474
-P01475
-P01476
-P01477
-P01478
-P01479
-P01480
-P01481
-P01482
-P01483
-P01484
-P01485
-P01486
-P01487
-P01488
-P01489
-P01490
-P01491
-P01492
-P01493
-P01494
-P01495
-P01496
-P01497
-P01498
-P01499
-P01500
-P01501
-P01502
-P01503
-P01504
-P01505
-P01506
-P01507
-P01508
-P01509
-P01510
-P01511
-P01512
-P01513
-P01514
-P01515
-P01516
-P01517
-P01518
-P01519
-P01520
-P01521
-P01522
-P01523
-P01524
-P01525
-P01526
-P01527
-P01528
-P01529
-P01530
-P01531
-P01532
-P01533
-P01534
-P01535
-P01536
-P01537
-P01538
-P01539
-P01540
-P01541
-P01542
-P01543
-P01544
-P01545
-P01546
-P01547
-P01548
-P01549
-P01550
-P01551
-P01552
-P01553
-P01554
-P01555
-P01556
-P01557
-P01558
-P01559
-P01560
-P01561
-P01562
-P01563
-P01564
-P01565
-P01566
-P01567
-P01568
-P01569
-P01570
-P01571
-P01572
-P01573
-P01574
-P01575
-P01576
-P01577
-P01578
-P01579
-P01580
-P01581
-P01582
-P01583
-P01584
-P01585
-P01586
-P01587
-P01588
-P01589
-P01590
-P01591
-P01592
-P01593
-P01594
-P01595
-P01596
-P01597
-P01598
-P01599
-P01600
-P01601
-P01602
-P01603
-P01604
-P01605
-P01606
-P01607
-P01608
-P01609
-P01610
-P01611
-P01612
-P01613
-P01614
-P01615
-P01616
-P01617
-P01618
-P01619
-P01620
-P01621
-P01622
-P01623
-P01624
-P01625
-P01626
-P01627
-P01628
-P01629
-P01630
-P01631
-P01632
-P01633
-P01634
-P01635
-P01636
-P01637
-P01638
-P01639
-P01640
-P01641
-P01642
-P01643
-P01644
-P01645
-P01646
-P01647
-P01648
-P01649
-P01650
-P01651
-P01652
-P01653
-P01654
-P01655
-P01656
-P01657
-P01658
-P01659
-P01660
-P01661
-P01662
-P01663
-P01664
-P01665
-P01666
-P01667
-P01668
-P01669
-P01670
-P01671
-P01672
-P01673
-P01674
-P01675
-P01676
-P01677
-P01678
-P01679
-P01680
-P01681
-P01682
-P01683
-P01684
-P01685
-P01686
-P01687
-P01688
-P01689
-P01690
-P01691
-P01692
-P01693
-P01694
-P01695
-P01696
-P01697
-P01698
-P01699
-P01700
-P01701
-P01702
-P01703
-P01704
-P01705
-P01706
-P01707
-P01708
-P01709
-P01710
-P01711
-P01712
-P01713
-P01714
-P01715
-P01716
-P01717
-P01718
-P01719
-P01720
-P01721
-P01722
-P01723
-P01724
-P01725
-P01726
-P01727
-P01728
-P01729
-P01730
-P01731
-P01732
-P01733
-P01734
-P01735
-P01736
-P01737
-P01738
-P01739
-P01740
-P01741
-P01742
-P01743
-P01744
-P01745
-P01746
-P01747
-P01748
-P01749
-P01750
-P01751
-P01752
-P01753
-P01754
-P01755
-P01756
-P01757
-P01758
-P01759
-P01760
-P01761
-P01762
-P01763
-P01764
-P01765
-P01766
-P01767
-P01768
-P01769
-P01770
-P01771
-P01772
-P01773
-P01774
-P01775
-P01776
-P01777
-P01778
-P01779
-P01780
-P01781
-P01782
-P01783
-P01784
-P01785
-P01786
-P01787
-P01788
-P01789
-P01790
-P01791
-P01792
-P01793
-P01794
-P01795
-P01796
-P01797
-P01798
-P01799
-P01800
-P01801
-P01802
-P01803
-P01804
-P01805
-P01806
-P01807
-P01808
-P01809
-P01810
-P01811
-P01812
-P01813
-P01814
-P01815
-P01816
-P01817
-P01818
-P01819
-P01820
-P01821
-P01822
-P01823
-P01824
-P01825
-P01826
-P01827
-P01828
-P01829
-P01830
-P01831
-P01832
-P01833
-P01834
-P01835
-P01836
-P01837
-P01838
-P01839
-P01840
-P01841
-P01842
-P01843
-P01844
-P01845
-P01846
-P01847
-P01848
-P01849
-P01850
-P01851
-P01852
-P01853
-P01854
-P01855
-P01856
-P01857
-P01858
-P01859
-P01860
-P01861
-P01862
-P01863
-P01864
-P01865
-P01866
-P01867
-P01868
-P01869
-P01870
-P01871
-P01872
-P01873
-P01874
-P01875
-P01876
-P01877
-P01878
-P01879
-P01880
-P01881
-P01882
-P01883
-P01884
-P01885
-P01886
-P01887
-P01888
-P01889
-P01890
-P01891
-P01892
-P01893
-P01894
-P01895
-P01896
-P01897
-P01898
-P01899
-P01900
-P01901
-P01902
-P01903
-P01904
-P01905
-P01906
-P01907
-P01908
-P01909
-P01910
-P01911
-P01912
-P01913
-P01914
-P01915
-P01916
-P01917
-P01918
-P01919
-P01920
-P01921
-P01922
-P01923
-P01924
-P01925
-P01926
-P01927
-P01928
-P01929
-P01930
-P01931
-P01932
-P01933
-P01934
-P01935
-P01936
-P01937
-P01938
-P01939
-P01940
-P01941
-P01942
-P01943
-P01944
-P01945
-P01946
-P01947
-P01948
-P01949
-P01950
-P01951
-P01952
-P01953
-P01954
-P01955
-P01956
-P01957
-P01958
-P01959
-P01960
-P01961
-P01962
-P01963
-P01964
-P01965
-P01966
-P01967
-P01968
-P01969
-P01970
-P01971
-P01972
-P01973
-P01974
-P01975
-P01976
-P01977
-P01978
-P01979
-P01980
-P01981
-P01982
-P01983
-P01984
-P01985
-P01986
-P01987
-P01988
-P01989
-P01990
-P01991
-P01992
-P01993
-P01994
-P01995
-P01996
-P01997
-P01998
-P01999
-P02000
-P02001
-P02002
-P02003
-P02004
-P02005
-P02006
-P02007
-P02008
-P02009
-P02010
-P02011
-P02012
-P02013
-P02014
-P02015
-P02016
-P02017
-P02018
-P02019
-P02020
-P02021
-P02022
-P02023
-P02024
-P02025
-P02026
-P02027
-P02028
-P02029
-P02030
-P02031
-P02032
-P02033
-P02034
-P02035
-P02036
-P02037
-P02038
-P02039
-P02040
-P02041
-P02042
-P02043
-P02044
-P02045
-P02046
-P02047
-P02048
-P02049
-P02050
-P02051
-P02052
-P02053
-P02054
-P02055
-P02056
-P02057
-P02058
-P02059
-P02060
-P02061
-P02062
-P02063
-P02064
-P02065
-P02066
-P02067
-P02068
-P02069
-P02070
-P02071
-P02072
-P02073
-P02074
-P02075
-P02076
-P02077
-P02078
-P02079
-P02080
-P02081
-P02082
-P02083
-P02084
-P02085
-P02086
-P02087
-P02088
-P02089
-P02090
-P02091
-P02092
-P02093
-P02094
-P02095
-P02096
-P02097
-P02098
-P02099
-P02100
-P02101
-P02102
-P02103
-P02104
-P02105
-P02106
-P02107
-P02108
-P02109
-P02110
-P02111
-P02112
-P02113
-P02114
-P02115
-P02116
-P02117
-P02118
-P02119
-P02120
-P02121
-P02122
-P02123
-P02124
-P02125
-P02126
-P02127
-P02128
-P02129
-P02130
-P02131
-P02132
-P02133
-P02134
-P02135
-P02136
-P02137
-P02138
-P02139
-P02140
-P02141
-P02142
-P02143
-P02144
-P02145
-P02146
-P02147
-P02148
-P02149
-P02150
-P02151
-P02152
-P02153
-P02154
-P02155
-P02156
-P02157
-P02158
-P02159
-P02160
-P02161
-P02162
-P02163
-P02164
-P02165
-P02166
-P02167
-P02168
-P02169
-P02170
-P02171
-P02172
-P02173
-P02174
-P02175
-P02176
-P02177
-P02178
-P02179
-P02180
-P02181
-P02182
-P02183
-P02184
-P02185
-P02186
-P02187
-P02188
-P02189
-P02190
-P02191
-P02192
-P02193
-P02194
-P02195
-P02196
-P02197
-P02198
-P02199
-P02200
-P02201
-P02202
-P02203
-P02204
-P02205
-P02206
-P02207
-P02208
-P02209
-P02210
-P02211
-P02212
-P02213
-P02214
-P02215
-P02216
-P02217
-P02218
-P02219
-P02220
-P02221
-P02222
-P02223
-P02224
-P02225
-P02226
-P02227
-P02228
-P02229
-P02230
-P02231
-P02232
-P02233
-P02234
-P02235
-P02236
-P02237
-P02238
-P02239
-P02240
-P02241
-P02242
-P02243
-P02244
-P02245
-P02246
-P02247
-P02248
-P02249
-P02250
-P02251
-P02252
-P02253
-P02254
-P02255
-P02256
-P02257
-P02258
-P02259
-P02260
-P02261
-P02262
-P02263
-P02264
-P02265
-P02266
-P02267
-P02268
-P02269
-P02270
-P02271
-P02272
-P02273
-P02274
-P02275
-P02276
-P02277
-P02278
-P02279
-P02280
-P02281
-P02282
-P02283
-P02284
-P02285
-P02286
-P02287
-P02288
-P02289
-P02290
-P02291
-P02292
-P02293
-P02294
-P02295
-P02296
-P02297
-P02298
-P02299
-P02300
-P02301
-P02302
-P02303
-P02304
-P02305
-P02306
-P02307
-P02308
-P02309
-P02310
-P02311
-P02312
-P02313
-P02314
-P02315
-P02316
-P02317
-P02318
-P02319
-P02320
-P02321
-P02322
-P02323
-P02324
-P02325
-P02326
-P02327
-P02328
-P02329
-P02330
-P02331
-P02332
-P02333
-P02334
-P02335
-P02336
-P02337
-P02338
-P02339
-P02340
-P02341
-P02342
-P02343
-P02344
-P02345
-P02346
-P02347
-P02348
-P02349
-P02350
-P02351
-P02352
-P02353
-P02354
-P02355
-P02356
-P02357
-P02358
-P02359
-P02360
-P02361
-P02362
-P02363
-P02364
-P02365
-P02366
-P02367
-P02368
-P02369
-P02370
-P02371
-P02372
-P02373
-P02374
-P02375
-P02376
-P02377
-P02378
-P02379
-P02380
-P02381
-P02382
-P02383
-P02384
-P02385
-P02386
-P02387
-P02388
-P02389
-P02390
-P02391
-P02392
-P02393
-P02394
-P02395
-P02396
-P02397
-P02398
-P02399
-P02400
-P02401
-P02402
-P02403
-P02404
-P02405
-P02406
-P02407
-P02408
-P02409
-P02410
-P02411
-P02412
-P02413
-P02414
-P02415
-P02416
-P02417
-P02418
-P02419
-P02420
-P02421
-P02422
-P02423
-P02424
-P02425
-P02426
-P02427
-P02428
-P02429
-P02430
-P02431
-P02432
-P02433
-P02434
-P02435
-P02436
-P02437
-P02438
-P02439
-P02440
-P02441
-P02442
-P02443
-P02444
-P02445
-P02446
-P02447
-P02448
-P02449
-P02450
-P02451
-P02452
-P02453
-P02454
-P02455
-P02456
-P02457
-P02458
-P02459
-P02460
-P02461
-P02462
-P02463
-P02464
-P02465
-P02466
-P02467
-P02468
-P02469
-P02470
-P02471
-P02472
-P02473
-P02474
-P02475
-P02476
-P02477
-P02478
-P02479
-P02480
-P02481
-P02482
-P02483
-P02484
-P02485
-P02486
-P02487
-P02488
-P02489
-P02490
-P02491
-P02492
-P02493
-P02494
-P02495
-P02496
-P02497
-P02498
-P02499
-P02500
-P02501
-P02502
-P02503
-P02504
-P02505
-P02506
-P02507
-P02508
-P02509
-P02510
-P02511
-P02512
-P02513
-P02514
-P02515
-P02516
-P02517
-P02518
-P02519
-P02520
-P02521
-P02522
-P02523
-P02524
-P02525
-P02526
-P02527
-P02528
-P02529
-P02530
-P02531
-P02532
-P02533
-P02534
-P02535
-P02536
-P02537
-P02538
-P02539
-P02540
-P02541
-P02542
-P02543
-P02544
-P02545
-P02546
-P02547
-P02548
-P02549
-P02550
-P02551
-P02552
-P02553
-P02554
-P02555
-P02556
-P02557
-P02558
-P02559
-P02560
-P02561
-P02562
-P02563
-P02564
-P02565
-P02566
-P02567
-P02568
-P02569
-P02570
-P02571
-P02572
-P02573
-P02574
-P02575
-P02576
-P02577
-P02578
-P02579
-P02580
-P02581
-P02582
-P02583
-P02584
-P02585
-P02586
-P02587
-P02588
-P02589
-P02590
-P02591
-P02592
-P02593
-P02594
-P02595
-P02596
-P02597
-P02598
-P02599
-P02600
-P02601
-P02602
-P02603
-P02604
-P02605
-P02606
-P02607
-P02608
-P02609
-P02610
-P02611
-P02612
-P02613
-P02614
-P02615
-P02616
-P02617
-P02618
-P02619
-P02620
-P02621
-P02622
-P02623
-P02624
-P02625
-P02626
-P02627
-P02628
-P02629
-P02630
-P02631
-P02632
-P02633
-P02634
-P02635
-P02636
-P02637
-P02638
-P02639
-P02640
-P02641
-P02642
-P02643
-P02644
-P02645
-P02646
-P02647
-P02648
-P02649
-P02650
-P02651
-P02652
-P02653
-P02654
-P02655
-P02656
-P02657
-P02658
-P02659
-P02660
-P02661
-P02662
-P02663
-P02664
-P02665
-P02666
-P02667
-P02668
-P02669
-P02670
-P02671
-P02672
-P02673
-P02674
-P02675
-P02676
-P02677
-P02678
-P02679
-P02680
-P02681
-P02682
-P02683
-P02684
-P02685
-P02686
-P02687
-P02688
-P02689
-P02690
-P02691
-P02692
-P02693
-P02694
-P02695
-P02696
-P02697
-P02698
-P02699
-P02700
-P02701
-P02702
-P02703
-P02704
-P02705
-P02706
-P02707
-P02708
-P02709
-P02710
-P02711
-P02712
-P02713
-P02714
-P02715
-P02716
-P02717
-P02718
-P02719
-P02720
-P02721
-P02722
-P02723
-P02724
-P02725
-P02726
-P02727
-P02728
-P02729
-P02730
-P02731
-P02732
-P02733
-P02734
-P02735
-P02736
-P02737
-P02738
-P02739
-P02740
-P02741
-P02742
-P02743
-P02744
-P02745
-P02746
-P02747
-P02748
-P02749
-P02750
-P02751
-P02752
-P02753
-P02754
-P02755
-P02756
-P02757
-P02758
-P02759
-P02760
-P02761
-P02762
-P02763
-P02764
-P02765
-P02766
-P02767
-P02768
-P02769
-P02770
-P02771
-P02772
-P02773
-P02774
-P02775
-P02776
-P02777
-P02778
-P02779
-P02780
-P02781
-P02782
-P02783
-P02784
-P02785
-P02786
-P02787
-P02788
-P02789
-P02790
-P02791
-P02792
-P02793
-P02794
-P02795
-P02796
-P02797
-P02798
-P02799
-P02800
-P02801
-P02802
-P02803
-P02804
-P02805
-P02806
-P02807
-P02808
-P02809
-P02810
-P02811
-P02812
-P02813
-P02814
-P02815
-P02816
-P02817
-P02818
-P02819
-P02820
-P02821
-P02822
-P02823
-P02824
-P02825
-P02826
-P02827
-P02828
-P02829
-P02830
-P02831
-P02832
-P02833
-P02834
-P02835
-P02836
-P02837
-P02838
-P02839
-P02840
-P02841
-P02842
-P02843
-P02844
-P02845
-P02846
-P02847
-P02848
-P02849
-P02850
-P02851
-P02852
-P02853
-P02854
-P02855
-P02856
-P02857
-P02858
-P02859
-P02860
-P02861
-P02862
-P02863
-P02864
-P02865
-P02866
-P02867
-P02868
-P02869
-P02870
-P02871
-P02872
-P02873
-P02874
-P02875
-P02876
-P02877
-P02878
-P02879
-P02880
-P02881
-P02882
-P02883
-P02884
-P02885
-P02886
-P02887
-P02888
-P02889
-P02890
-P02891
-P02892
-P02893
-P02894
-P02895
-P02896
-P02897
-P02898
-P02899
-P02900
-P02901
-P02902
-P02903
-P02904
-P02905
-P02906
-P02907
-P02908
-P02909
-P02910
-P02911
-P02912
-P02913
-P02914
-P02915
-P02916
-P02917
-P02918
-P02919
-P02920
-P02921
-P02922
-P02923
-P02924
-P02925
-P02926
-P02927
-P02928
-P02929
-P02930
-P02931
-P02932
-P02933
-P02934
-P02935
-P02936
-P02937
-P02938
-P02939
-P02940
-P02941
-P02942
-P02943
-P02944
-P02945
-P02946
-P02947
-P02948
-P02949
-P02950
-P02951
-P02952
-P02953
-P02954
-P02955
-P02956
-P02957
-P02958
-P02959
-P02960
-P02961
-P02962
-P02963
-P02964
-P02965
-P02966
-P02967
-P02968
-P02969
-P02970
-P02971
-P02972
-P02973
-P02974
-P02975
-P02976
-P02977
-P02978
-P02979
-P02980
-P02981
-P02982
-P02983
-P02984
-P02985
-P02986
-P02987
-P02988
-P02989
-P02990
-P02991
-P02992
-P02993
-P02994
-P02995
-P02996
-P02997
-P02998
-P02999
-P03000
-P03001
-P03002
-P03003
-P03004
-P03005
-P03006
-P03007
-P03008
-P03009
-P03010
-P03011
-P03012
-P03013
-P03014
-P03015
-P03016
-P03017
-P03018
-P03019
-P03020
-P03021
-P03022
-P03023
-P03024
-P03025
-P03026
-P03027
-P03028
-P03029
-P03030
-P03031
-P03032
-P03033
-P03034
-P03035
-P03036
-P03037
-P03038
-P03039
-P03040
-P03041
-P03042
-P03043
-P03044
-P03045
-P03046
-P03047
-P03048
-P03049
-P03050
-P03051
-P03052
-P03053
-P03054
-P03055
-P03056
-P03057
-P03058
-P03059
-P03060
-P03061
-P03062
-P03063
-P03064
-P03065
-P03066
-P03067
-P03068
-P03069
-P03070
-P03071
-P03072
-P03073
-P03074
-P03075
-P03076
-P03077
-P03078
-P03079
-P03080
-P03081
-P03082
-P03083
-P03084
-P03085
-P03086
-P03087
-P03088
-P03089
-P03090
-P03091
-P03092
-P03093
-P03094
-P03095
-P03096
-P03097
-P03098
-P03099
-P03100
-P03101
-P03102
-P03103
-P03104
-P03105
-P03106
-P03107
-P03108
-P03109
-P03110
-P03111
-P03112
-P03113
-P03114
-P03115
-P03116
-P03117
-P03118
-P03119
-P03120
-P03121
-P03122
-P03123
-P03124
-P03125
-P03126
-P03127
-P03128
-P03129
-P03130
-P03131
-P03132
-P03133
-P03134
-P03135
-P03136
-P03137
-P03138
-P03139
-P03140
-P03141
-P03142
-P03143
-P03144
-P03145
-P03146
-P03147
-P03148
-P03149
-P03150
-P03151
-P03152
-P03153
-P03154
-P03155
-P03156
-P03157
-P03158
-P03159
-P03160
-P03161
-P03162
-P03163
-P03164
-P03165
-P03166
-P03167
-P03168
-P03169
-P03170
-P03171
-P03172
-P03173
-P03174
-P03175
-P03176
-P03177
-P03178
-P03179
-P03180
-P03181
-P03182
-P03183
-P03184
-P03185
-P03186
-P03187
-P03188
-P03189
-P03190
-P03191
-P03192
-P03193
-P03194
-P03195
-P03196
-P03197
-P03198
-P03199
-P03200
-P03201
-P03202
-P03203
-P03204
-P03205
-P03206
-P03207
-P03208
-P03209
-P03210
-P03211
-P03212
-P03213
-P03214
-P03215
-P03216
-P03217
-P03218
-P03219
-P03220
-P03221
-P03222
-P03223
-P03224
-P03225
-P03226
-P03227
-P03228
-P03229
-P03230
-P03231
-P03232
-P03233
-P03234
-P03235
-P03236
-P03237
-P03238
-P03239
-P03240
-P03241
-P03242
-P03243
-P03244
-P03245
-P03246
-P03247
-P03248
-P03249
-P03250
-P03251
-P03252
-P03253
-P03254
-P03255
-P03256
-P03257
-P03258
-P03259
-P03260
-P03261
-P03262
-P03263
-P03264
-P03265
-P03266
-P03267
-P03268
-P03269
-P03270
-P03271
-P03272
-P03273
-P03274
-P03275
-P03276
-P03277
-P03278
-P03279
-P03280
-P03281
-P03282
-P03283
-P03284
-P03285
-P03286
-P03287
-P03288
-P03289
-P03290
-P03291
-P03292
-P03293
-P03294
-P03295
-P03296
-P03297
-P03298
-P03299
-P03300
-P03301
-P03302
-P03303
-P03304
-P03305
-P03306
-P03307
-P03308
-P03309
-P03310
-P03311
-P03312
-P03313
-P03314
-P03315
-P03316
-P03317
-P03318
-P03319
-P03320
-P03321
-P03322
-P03323
-P03324
-P03325
-P03326
-P03327
-P03328
-P03329
-P03330
-P03331
-P03332
-P03333
-P03334
-P03335
-P03336
-P03337
-P03338
-P03339
-P03340
-P03341
-P03342
-P03343
-P03344
-P03345
-P03346
-P03347
-P03348
-P03349
-P03350
-P03351
-P03352
-P03353
-P03354
-P03355
-P03356
-P03357
-P03358
-P03359
-P03360
-P03361
-P03362
-P03363
-P03364
-P03365
-P03366
-P03367
-P03368
-P03369
-P03370
-P03371
-P03372
-P03373
-P03374
-P03375
-P03376
-P03377
-P03378
-P03379
-P03380
-P03381
-P03382
-P03383
-P03384
-P03385
-P03386
-P03387
-P03388
-P03389
-P03390
-P03391
-P03392
-P03393
-P03394
-P03395
-P03396
-P03397
-P03398
-P03399
-P03400
-P03401
-P03402
-P03403
-P03404
-P03405
-P03406
-P03407
-P03408
-P03409
-P03410
-P03411
-P03412
-P03413
-P03414
-P03415
-P03416
-P03417
-P03418
-P03419
-P03420
-P03421
-P03422
-P03423
-P03424
-P03425
-P03426
-P03427
-P03428
-P03429
-P03430
-P03431
-P03432
-P03433
-P03434
-P03435
-P03436
-P03437
-P03438
-P03439
-P03440
-P03441
-P03442
-P03443
-P03444
-P03445
-P03446
-P03447
-P03448
-P03449
-P03450
-P03451
-P03452
-P03453
-P03454
-P03455
-P03456
-P03457
-P03458
-P03459
-P03460
-P03461
-P03462
-P03463
-P03464
-P03465
-P03466
-P03467
-P03468
-P03469
-P03470
-P03471
-P03472
-P03473
-P03474
-P03475
-P03476
-P03477
-P03478
-P03479
-P03480
-P03481
-P03482
-P03483
-P03484
-P03485
-P03486
-P03487
-P03488
-P03489
-P03490
-P03491
-P03492
-P03493
-P03494
-P03495
-P03496
-P03497
-P03498
-P03499
-P03500
-P03501
-P03502
-P03503
-P03504
-P03505
-P03506
-P03507
-P03508
-P03509
-P03510
-P03511
-P03512
-P03513
-P03514
-P03515
-P03516
-P03517
-P03518
-P03519
-P03520
-P03521
-P03522
-P03523
-P03524
-P03525
-P03526
-P03527
-P03528
-P03529
-P03530
-P03531
-P03532
-P03533
-P03534
-P03535
-P03536
-P03537
-P03538
-P03539
-P03540
-P03541
-P03542
-P03543
-P03544
-P03545
-P03546
-P03547
-P03548
-P03549
-P03550
-P03551
-P03552
-P03553
-P03554
-P03555
-P03556
-P03557
-P03558
-P03559
-P03560
-P03561
-P03562
-P03563
-P03564
-P03565
-P03566
-P03567
-P03568
-P03569
-P03570
-P03571
-P03572
-P03573
-P03574
-P03575
-P03576
-P03577
-P03578
-P03579
-P03580
-P03581
-P03582
-P03583
-P03584
-P03585
-P03586
-P03587
-P03588
-P03589
-P03590
-P03591
-P03592
-P03593
-P03594
-P03595
-P03596
-P03597
-P03598
-P03599
-P03600
-P03601
-P03602
-P03603
-P03604
-P03605
-P03606
-P03607
-P03608
-P03609
-P03610
-P03611
-P03612
-P03613
-P03614
-P03615
-P03616
-P03617
-P03618
-P03619
-P03620
-P03621
-P03622
-P03623
-P03624
-P03625
-P03626
-P03627
-P03628
-P03629
-P03630
-P03631
-P03632
-P03633
-P03634
-P03635
-P03636
-P03637
-P03638
-P03639
-P03640
-P03641
-P03642
-P03643
-P03644
-P03645
-P03646
-P03647
-P03648
-P03649
-P03650
-P03651
-P03652
-P03653
-P03654
-P03655
-P03656
-P03657
-P03658
-P03659
-P03660
-P03661
-P03662
-P03663
-P03664
-P03665
-P03666
-P03667
-P03668
-P03669
-P03670
-P03671
-P03672
-P03673
-P03674
-P03675
-P03676
-P03677
-P03678
-P03679
-P03680
-P03681
-P03682
-P03683
-P03684
-P03685
-P03686
-P03687
-P03688
-P03689
-P03690
-P03691
-P03692
-P03693
-P03694
-P03695
-P03696
-P03697
-P03698
-P03699
-P03700
-P03701
-P03702
-P03703
-P03704
-P03705
-P03706
-P03707
-P03708
-P03709
-P03710
-P03711
-P03712
-P03713
-P03714
-P03715
-P03716
-P03717
-P03718
-P03719
-P03720
-P03721
-P03722
-P03723
-P03724
-P03725
-P03726
-P03727
-P03728
-P03729
-P03730
-P03731
-P03732
-P03733
-P03734
-P03735
-P03736
-P03737
-P03738
-P03739
-P03740
-P03741
-P03742
-P03743
-P03744
-P03745
-P03746
-P03747
-P03748
-P03749
-P03750
-P03751
-P03752
-P03753
-P03754
-P03755
-P03756
-P03757
-P03758
-P03759
-P03760
-P03761
-P03762
-P03763
-P03764
-P03765
-P03766
-P03767
-P03768
-P03769
-P03770
-P03771
-P03772
-P03773
-P03774
-P03775
-P03776
-P03777
-P03778
-P03779
-P03780
-P03781
-P03782
-P03783
-P03784
-P03785
-P03786
-P03787
-P03788
-P03789
-P03790
-P03791
-P03792
-P03793
-P03794
-P03795
-P03796
-P03797
-P03798
-P03799
-P03800
-P03801
-P03802
-P03803
-P03804
-P03805
-P03806
-P03807
-P03808
-P03809
-P03810
-P03811
-P03812
-P03813
-P03814
-P03815
-P03816
-P03817
-P03818
-P03819
-P03820
-P03821
-P03822
-P03823
-P03824
-P03825
-P03826
-P03827
-P03828
-P03829
-P03830
-P03831
-P03832
-P03833
-P03834
-P03835
-P03836
-P03837
-P03838
-P03839
-P03840
-P03841
-P03842
-P03843
-P03844
-P03845
-P03846
-P03847
-P03848
-P03849
-P03850
-P03851
-P03852
-P03853
-P03854
-P03855
-P03856
-P03857
-P03858
-P03859
-P03860
-P03861
-P03862
-P03863
-P03864
-P03865
-P03866
-P03867
-P03868
-P03869
-P03870
-P03871
-P03872
-P03873
-P03874
-P03875
-P03876
-P03877
-P03878
-P03879
-P03880
-P03881
-P03882
-P03883
-P03884
-P03885
-P03886
-P03887
-P03888
-P03889
-P03890
-P03891
-P03892
-P03893
-P03894
-P03895
-P03896
-P03897
-P03898
-P03899
-P03900
-P03901
-P03902
-P03903
-P03904
-P03905
-P03906
-P03907
-P03908
-P03909
-P03910
-P03911
-P03912
-P03913
-P03914
-P03915
-P03916
-P03917
-P03918
-P03919
-P03920
-P03921
-P03922
-P03923
-P03924
-P03925
-P03926
-P03927
-P03928
-P03929
-P03930
-P03931
-P03932
-P03933
-P03934
-P03935
-P03936
-P03937
-P03938
-P03939
-P03940
-P03941
-P03942
-P03943
-P03944
-P03945
-P03946
-P03947
-P03948
-P03949
-P03950
-P03951
-P03952
-P03953
-P03954
-P03955
-P03956
-P03957
-P03958
-P03959
-P03960
-P03961
-P03962
-P03963
-P03964
-P03965
-P03966
-P03967
-P03968
-P03969
-P03970
-P03971
-P03972
-P03973
-P03974
-P03975
-P03976
-P03977
-P03978
-P03979
-P03980
-P03981
-P03982
-P03983
-P03984
-P03985
-P03986
-P03987
-P03988
-P03989
-P03990
-P03991
-P03992
-P03993
-P03994
-P03995
-P03996
-P03997
-P03998
-P03999
-P04000
-P04001
-P04002
-P04003
-P04004
-P04005
-P04006
-P04007
-P04008
-P04009
-P04010
-P04011
-P04012
-P04013
-P04014
-P04015
-P04016
-P04017
-P04018
-P04019
-P04020
-P04021
-P04022
-P04023
-P04024
-P04025
-P04026
-P04027
-P04028
-P04029
-P04030
-P04031
-P04032
-P04033
-P04034
-P04035
-P04036
-P04037
-P04038
-P04039
-P04040
-P04041
-P04042
-P04043
-P04044
-P04045
-P04046
-P04047
-P04048
-P04049
-P04050
-P04051
-P04052
-P04053
-P04054
-P04055
-P04056
-P04057
-P04058
-P04059
-P04060
-P04061
-P04062
-P04063
-P04064
-P04065
-P04066
-P04067
-P04068
-P04069
-P04070
-P04071
-P04072
-P04073
-P04074
-P04075
-P04076
-P04077
-P04078
-P04079
-P04080
-P04081
-P04082
-P04083
-P04084
-P04085
-P04086
-P04087
-P04088
-P04089
-P04090
-P04091
-P04092
-P04093
-P04094
-P04095
-P04096
-P04097
-P04098
-P04099
-P04100
-P04101
-P04102
-P04103
-P04104
-P04105
-P04106
-P04107
-P04108
-P04109
-P04110
-P04111
-P04112
-P04113
-P04114
-P04115
-P04116
-P04117
-P04118
-P04119
-P04120
-P04121
-P04122
-P04123
-P04124
-P04125
-P04126
-P04127
-P04128
-P04129
-P04130
-P04131
-P04132
-P04133
-P04134
-P04135
-P04136
-P04137
-P04138
-P04139
-P04140
-P04141
-P04142
-P04143
-P04144
-P04145
-P04146
-P04147
-P04148
-P04149
-P04150
-P04151
-P04152
-P04153
-P04154
-P04155
-P04156
-P04157
-P04158
-P04159
-P04160
-P04161
-P04162
-P04163
-P04164
-P04165
-P04166
-P04167
-P04168
-P04169
-P04170
-P04171
-P04172
-P04173
-P04174
-P04175
-P04176
-P04177
-P04178
-P04179
-P04180
-P04181
-P04182
-P04183
-P04184
-P04185
-P04186
-P04187
-P04188
-P04189
-P04190
-P04191
-P04192
-P04193
-P04194
-P04195
-P04196
-P04197
-P04198
-P04199
-P04200
-P04201
-P04202
-P04203
-P04204
-P04205
-P04206
-P04207
-P04208
-P04209
-P04210
-P04211
-P04212
-P04213
-P04214
-P04215
-P04216
-P04217
-P04218
-P04219
-P04220
-P04221
-P04222
-P04223
-P04224
-P04225
-P04226
-P04227
-P04228
-P04229
-P04230
-P04231
-P04232
-P04233
-P04234
-P04235
-P04236
-P04237
-P04238
-P04239
-P04240
-P04241
-P04242
-P04243
-P04244
-P04245
-P04246
-P04247
-P04248
-P04249
-P04250
-P04251
-P04252
-P04253
-P04254
-P04255
-P04256
-P04257
-P04258
-P04259
-P04260
-P04261
-P04262
-P04263
-P04264
-P04265
-P04266
-P04267
-P04268
-P04269
-P04270
-P04271
-P04272
-P04273
-P04274
-P04275
-P04276
-P04277
-P04278
-P04279
-P04280
-P04281
-P04282
-P04283
-P04284
-P04285
-P04286
-P04287
-P04288
-P04289
-P04290
-P04291
-P04292
-P04293
-P04294
-P04295
-P04296
-P04297
-P04298
-P04299
-P04300
-P04301
-P04302
-P04303
-P04304
-P04305
-P04306
-P04307
-P04308
-P04309
-P04310
-P04311
-P04312
-P04313
-P04314
-P04315
-P04316
-P04317
-P04318
-P04319
-P04320
-P04321
-P04322
-P04323
-P04324
-P04325
-P04326
-P04327
-P04328
-P04329
-P04330
-P04331
-P04332
-P04333
-P04334
-P04335
-P04336
-P04337
-P04338
-P04339
-P04340
-P04341
-P04342
-P04343
-P04344
-P04345
-P04346
-P04347
-P04348
-P04349
-P04350
-P04351
-P04352
-P04353
-P04354
-P04355
-P04356
-P04357
-P04358
-P04359
-P04360
-P04361
-P04362
-P04363
-P04364
-P04365
-P04366
-P04367
-P04368
-P04369
-P04370
-P04371
-P04372
-P04373
-P04374
-P04375
-P04376
-P04377
-P04378
-P04379
-P04380
-P04381
-P04382
-P04383
-P04384
-P04385
-P04386
-P04387
-P04388
-P04389
-P04390
-P04391
-P04392
-P04393
-P04394
-P04395
-P04396
-P04397
-P04398
-P04399
-P04400
-P04401
-P04402
-P04403
-P04404
-P04405
-P04406
-P04407
-P04408
-P04409
-P04410
-P04411
-P04412
-P04413
-P04414
-P04415
-P04416
-P04417
-P04418
-P04419
-P04420
-P04421
-P04422
-P04423
-P04424
-P04425
-P04426
-P04427
-P04428
-P04429
-P04430
-P04431
-P04432
-P04433
-P04434
-P04435
-P04436
-P04437
-P04438
-P04439
-P04440
-P04441
-P04442
-P04443
-P04444
-P04445
-P04446
-P04447
-P04448
-P04449
-P04450
-P04451
-P04452
-P04453
-P04454
-P04455
-P04456
-P04457
-P04458
-P04459
-P04460
-P04461
-P04462
-P04463
-P04464
-P04465
-P04466
-P04467
-P04468
-P04469
-P04470
-P04471
-P04472
-P04473
-P04474
-P04475
-P04476
-P04477
-P04478
-P04479
-P04480
-P04481
-P04482
-P04483
-P04484
-P04485
-P04486
-P04487
-P04488
-P04489
-P04490
-P04491
-P04492
-P04493
-P04494
-P04495
-P04496
-P04497
-P04498
-P04499
-P04500
-P04501
-P04502
-P04503
-P04504
-P04505
-P04506
-P04507
-P04508
-P04509
-P04510
-P04511
-P04512
-P04513
-P04514
-P04515
-P04516
-P04517
-P04518
-P04519
-P04520
-P04521
-P04522
-P04523
-P04524
-P04525
-P04526
-P04527
-P04528
-P04529
-P04530
-P04531
-P04532
-P04533
-P04534
-P04535
-P04536
-P04537
-P04538
-P04539
-P04540
-P04541
-P04542
-P04543
-P04544
-P04545
-P04546
-P04547
-P04548
-P04549
-P04550
-P04551
-P04552
-P04553
-P04554
-P04555
-P04556
-P04557
-P04558
-P04559
-P04560
-P04561
-P04562
-P04563
-P04564
-P04565
-P04566
-P04567
-P04568
-P04569
-P04570
-P04571
-P04572
-P04573
-P04574
-P04575
-P04576
-P04577
-P04578
-P04579
-P04580
-P04581
-P04582
-P04583
-P04584
-P04585
-P04586
-P04587
-P04588
-P04589
-P04590
-P04591
-P04592
-P04593
-P04594
-P04595
-P04596
-P04597
-P04598
-P04599
-P04600
-P04601
-P04602
-P04603
-P04604
-P04605
-P04606
-P04607
-P04608
-P04609
-P04610
-P04611
-P04612
-P04613
-P04614
-P04615
-P04616
-P04617
-P04618
-P04619
-P04620
-P04621
-P04622
-P04623
-P04624
-P04625
-P04626
-P04627
-P04628
-P04629
-P04630
-P04631
-P04632
-P04633
-P04634
-P04635
-P04636
-P04637
-P04638
-P04639
-P04640
-P04641
-P04642
-P04643
-P04644
-P04645
-P04646
-P04647
-P04648
-P04649
-P04650
-P04651
-P04652
-P04653
-P04654
-P04655
-P04656
-P04657
-P04658
-P04659
-P04660
-P04661
-P04662
-P04663
-P04664
-P04665
-P04666
-P04667
-P04668
-P04669
-P04670
-P04671
-P04672
-P04673
-P04674
-P04675
-P04676
-P04677
-P04678
-P04679
-P04680
-P04681
-P04682
-P04683
-P04684
-P04685
-P04686
-P04687
-P04688
-P04689
-P04690
-P04691
-P04692
-P04693
-P04694
-P04695
-P04696
-P04697
-P04698
-P04699
-P04700
-P04701
-P04702
-P04703
-P04704
-P04705
-P04706
-P04707
-P04708
-P04709
-P04710
-P04711
-P04712
-P04713
-P04714
-P04715
-P04716
-P04717
-P04718
-P04719
-P04720
-P04721
-P04722
-P04723
-P04724
-P04725
-P04726
-P04727
-P04728
-P04729
-P04730
-P04731
-P04732
-P04733
-P04734
-P04735
-P04736
-P04737
-P04738
-P04739
-P04740
-P04741
-P04742
-P04743
-P04744
-P04745
-P04746
-P04747
-P04748
-P04749
-P04750
-P04751
-P04752
-P04753
-P04754
-P04755
-P04756
-P04757
-P04758
-P04759
-P04760
-P04761
-P04762
-P04763
-P04764
-P04765
-P04766
-P04767
-P04768
-P04769
-P04770
-P04771
-P04772
-P04773
-P04774
-P04775
-P04776
-P04777
-P04778
-P04779
-P04780
-P04781
-P04782
-P04783
-P04784
-P04785
-P04786
-P04787
-P04788
-P04789
-P04790
-P04791
-P04792
-P04793
-P04794
-P04795
-P04796
-P04797
-P04798
-P04799
-P04800
-P04801
-P04802
-P04803
-P04804
-P04805
-P04806
-P04807
-P04808
-P04809
-P04810
-P04811
-P04812
-P04813
-P04814
-P04815
-P04816
-P04817
-P04818
-P04819
-P04820
-P04821
-P04822
-P04823
-P04824
-P04825
-P04826
-P04827
-P04828
-P04829
-P04830
-P04831
-P04832
-P04833
-P04834
-P04835
-P04836
-P04837
-P04838
-P04839
-P04840
-P04841
-P04842
-P04843
-P04844
-P04845
-P04846
-P04847
-P04848
-P04849
-P04850
-P04851
-P04852
-P04853
-P04854
-P04855
-P04856
-P04857
-P04858
-P04859
-P04860
-P04861
-P04862
-P04863
-P04864
-P04865
-P04866
-P04867
-P04868
-P04869
-P04870
-P04871
-P04872
-P04873
-P04874
-P04875
-P04876
-P04877
-P04878
-P04879
-P04880
-P04881
-P04882
-P04883
-P04884
-P04885
-P04886
-P04887
-P04888
-P04889
-P04890
-P04891
-P04892
-P04893
-P04894
-P04895
-P04896
-P04897
-P04898
-P04899
-P04900
-P04901
-P04902
-P04903
-P04904
-P04905
-P04906
-P04907
-P04908
-P04909
-P04910
-P04911
-P04912
-P04913
-P04914
-P04915
-P04916
-P04917
-P04918
-P04919
-P04920
-P04921
-P04922
-P04923
-P04924
-P04925
-P04926
-P04927
-P04928
-P04929
-P04930
-P04931
-P04932
-P04933
-P04934
-P04935
-P04936
-P04937
-P04938
-P04939
-P04940
-P04941
-P04942
-P04943
-P04944
-P04945
-P04946
-P04947
-P04948
-P04949
-P04950
-P04951
-P04952
-P04953
-P04954
-P04955
-P04956
-P04957
-P04958
-P04959
-P04960
-P04961
-P04962
-P04963
-P04964
-P04965
-P04966
-P04967
-P04968
-P04969
-P04970
-P04971
-P04972
-P04973
-P04974
-P04975
-P04976
-P04977
-P04978
-P04979
-P04980
-P04981
-P04982
-P04983
-P04984
-P04985
-P04986
-P04987
-P04988
-P04989
-P04990
-P04991
-P04992
-P04993
-P04994
-P04995
-P04996
-P04997
-P04998
-P04999
-P05000
-P05001
-P05002
-P05003
-P05004
-P05005
-P05006
-P05007
-P05008
-P05009
-P05010
-P05011
-P05012
-P05013
-P05014
-P05015
-P05016
-P05017
-P05018
-P05019
-P05020
-P05021
-P05022
-P05023
-P05024
-P05025
-P05026
-P05027
-P05028
-P05029
-P05030
-P05031
-P05032
-P05033
-P05034
-P05035
-P05036
-P05037
-P05038
-P05039
-P05040
-P05041
-P05042
-P05043
-P05044
-P05045
-P05046
-P05047
-P05048
-P05049
-P05050
-P05051
-P05052
-P05053
-P05054
-P05055
-P05056
-P05057
-P05058
-P05059
-P05060
-P05061
-P05062
-P05063
-P05064
-P05065
-P05066
-P05067
-P05068
-P05069
-P05070
-P05071
-P05072
-P05073
-P05074
-P05075
-P05076
-P05077
-P05078
-P05079
-P05080
-P05081
-P05082
-P05083
-P05084
-P05085
-P05086
-P05087
-P05088
-P05089
-P05090
-P05091
-P05092
-P05093
-P05094
-P05095
-P05096
-P05097
-P05098
-P05099
-P05100
-P05101
-P05102
-P05103
-P05104
-P05105
-P05106
-P05107
-P05108
-P05109
-P05110
-P05111
-P05112
-P05113
-P05114
-P05115
-P05116
-P05117
-P05118
-P05119
-P05120
-P05121
-P05122
-P05123
-P05124
-P05125
-P05126
-P05127
-P05128
-P05129
-P05130
-P05131
-P05132
-P05133
-P05134
-P05135
-P05136
-P05137
-P05138
-P05139
-P05140
-P05141
-P05142
-P05143
-P05144
-P05145
-P05146
-P05147
-P05148
-P05149
-P05150
-P05151
-P05152
-P05153
-P05154
-P05155
-P05156
-P05157
-P05158
-P05159
-P05160
-P05161
-P05162
-P05163
-P05164
-P05165
-P05166
-P05167
-P05168
-P05169
-P05170
-P05171
-P05172
-P05173
-P05174
-P05175
-P05176
-P05177
-P05178
-P05179
-P05180
-P05181
-P05182
-P05183
-P05184
-P05185
-P05186
-P05187
-P05188
-P05189
-P05190
-P05191
-P05192
-P05193
-P05194
-P05195
-P05196
-P05197
-P05198
-P05199
-P05200
-P05201
-P05202
-P05203
-P05204
-P05205
-P05206
-P05207
-P05208
-P05209
-P05210
-P05211
-P05212
-P05213
-P05214
-P05215
-P05216
-P05217
-P05218
-P05219
-P05220
-P05221
-P05222
-P05223
-P05224
-P05225
-P05226
-P05227
-P05228
-P05229
-P05230
-P05231
-P05232
-P05233
-P05234
-P05235
-P05236
-P05237
-P05238
-P05239
-P05240
-P05241
-P05242
-P05243
-P05244
-P05245
-P05246
-P05247
-P05248
-P05249
-P05250
-P05251
-P05252
-P05253
-P05254
-P05255
-P05256
-P05257
-P05258
-P05259
-P05260
-P05261
-P05262
-P05263
-P05264
-P05265
-P05266
-P05267
-P05268
-P05269
-P05270
-P05271
-P05272
-P05273
-P05274
-P05275
-P05276
-P05277
-P05278
-P05279
-P05280
-P05281
-P05282
-P05283
-P05284
-P05285
-P05286
-P05287
-P05288
-P05289
-P05290
-P05291
-P05292
-P05293
-P05294
-P05295
-P05296
-P05297
-P05298
-P05299
-P05300
-P05301
-P05302
-P05303
-P05304
-P05305
-P05306
-P05307
-P05308
-P05309
-P05310
-P05311
-P05312
-P05313
-P05314
-P05315
-P05316
-P05317
-P05318
-P05319
-P05320
-P05321
-P05322
-P05323
-P05324
-P05325
-P05326
-P05327
-P05328
-P05329
-P05330
-P05331
-P05332
-P05333
-P05334
-P05335
-P05336
-P05337
-P05338
-P05339
-P05340
-P05341
-P05342
-P05343
-P05344
-P05345
-P05346
-P05347
-P05348
-P05349
-P05350
-P05351
-P05352
-P05353
-P05354
-P05355
-P05356
-P05357
-P05358
-P05359
-P05360
-P05361
-P05362
-P05363
-P05364
-P05365
-P05366
-P05367
-P05368
-P05369
-P05370
-P05371
-P05372
-P05373
-P05374
-P05375
-P05376
-P05377
-P05378
-P05379
-P05380
-P05381
-P05382
-P05383
-P05384
-P05385
-P05386
-P05387
-P05388
-P05389
-P05390
-P05391
-P05392
-P05393
-P05394
-P05395
-P05396
-P05397
-P05398
-P05399
-P05400
-P05401
-P05402
-P05403
-P05404
-P05405
-P05406
-P05407
-P05408
-P05409
-P05410
-P05411
-P05412
-P05413
-P05414
-P05415
-P05416
-P05417
-P05418
-P05419
-P05420
-P05421
-P05422
-P05423
-P05424
-P05425
-P05426
-P05427
-P05428
-P05429
-P05430
-P05431
-P05432
-P05433
-P05434
-P05435
-P05436
-P05437
-P05438
-P05439
-P05440
-P05441
-P05442
-P05443
-P05444
-P05445
-P05446
-P05447
-P05448
-P05449
-P05450
-P05451
-P05452
-P05453
-P05454
-P05455
-P05456
-P05457
-P05458
-P05459
-P05460
-P05461
-P05462
-P05463
-P05464
-P05465
-P05466
-P05467
-P05468
-P05469
-P05470
-P05471
-P05472
-P05473
-P05474
-P05475
-P05476
-P05477
-P05478
-P05479
-P05480
-P05481
-P05482
-P05483
-P05484
-P05485
-P05486
-P05487
-P05488
-P05489
-P05490
-P05491
-P05492
-P05493
-P05494
-P05495
-P05496
-P05497
-P05498
-P05499
-P05500
-P05501
-P05502
-P05503
-P05504
-P05505
-P05506
-P05507
-P05508
-P05509
-P05510
-P05511
-P05512
-P05513
-P05514
-P05515
-P05516
-P05517
-P05518
-P05519
-P05520
-P05521
-P05522
-P05523
-P05524
-P05525
-P05526
-P05527
-P05528
-P05529
-P05530
-P05531
-P05532
-P05533
-P05534
-P05535
-P05536
-P05537
-P05538
-P05539
-P05540
-P05541
-P05542
-P05543
-P05544
-P05545
-P05546
-P05547
-P05548
-P05549
-P05550
-P05551
-P05552
-P05553
-P05554
-P05555
-P05556
-P05557
-P05558
-P05559
-P05560
-P05561
-P05562
-P05563
-P05564
-P05565
-P05566
-P05567
-P05568
-P05569
-P05570
-P05571
-P05572
-P05573
-P05574
-P05575
-P05576
-P05577
-P05578
-P05579
-P05580
-P05581
-P05582
-P05583
-P05584
-P05585
-P05586
-P05587
-P05588
-P05589
-P05590
-P05591
-P05592
-P05593
-P05594
-P05595
-P05596
-P05597
-P05598
-P05599
-P05600
-P05601
-P05602
-P05603
-P05604
-P05605
-P05606
-P05607
-P05608
-P05609
-P05610
-P05611
-P05612
-P05613
-P05614
-P05615
-P05616
-P05617
-P05618
-P05619
-P05620
-P05621
-P05622
-P05623
-P05624
-P05625
-P05626
-P05627
-P05628
-P05629
-P05630
-P05631
-P05632
-P05633
-P05634
-P05635
-P05636
-P05637
-P05638
-P05639
-P05640
-P05641
-P05642
-P05643
-P05644
-P05645
-P05646
-P05647
-P05648
-P05649
-P05650
-P05651
-P05652
-P05653
-P05654
-P05655
-P05656
-P05657
-P05658
-P05659
-P05660
-P05661
-P05662
-P05663
-P05664
-P05665
-P05666
-P05667
-P05668
-P05669
-P05670
-P05671
-P05672
-P05673
-P05674
-P05675
-P05676
-P05677
-P05678
-P05679
-P05680
-P05681
-P05682
-P05683
-P05684
-P05685
-P05686
-P05687
-P05688
-P05689
-P05690
-P05691
-P05692
-P05693
-P05694
-P05695
-P05696
-P05697
-P05698
-P05699
-P05700
-P05701
-P05702
-P05703
-P05704
-P05705
-P05706
-P05707
-P05708
-P05709
-P05710
-P05711
-P05712
-P05713
-P05714
-P05715
-P05716
-P05717
-P05718
-P05719
-P05720
-P05721
-P05722
-P05723
-P05724
-P05725
-P05726
-P05727
-P05728
-P05729
-P05730
-P05731
-P05732
-P05733
-P05734
-P05735
-P05736
-P05737
-P05738
-P05739
-P05740
-P05741
-P05742
-P05743
-P05744
-P05745
-P05746
-P05747
-P05748
-P05749
-P05750
-P05751
-P05752
-P05753
-P05754
-P05755
-P05756
-P05757
-P05758
-P05759
-P05760
-P05761
-P05762
-P05763
-P05764
-P05765
-P05766
-P05767
-P05768
-P05769
-P05770
-P05771
-P05772
-P05773
-P05774
-P05775
-P05776
-P05777
-P05778
-P05779
-P05780
-P05781
-P05782
-P05783
-P05784
-P05785
-P05786
-P05787
-P05788
-P05789
-P05790
-P05791
-P05792
-P05793
-P05794
-P05795
-P05796
-P05797
-P05798
-P05799
-P05800
-P05801
-P05802
-P05803
-P05804
-P05805
-P05806
-P05807
-P05808
-P05809
-P05810
-P05811
-P05812
-P05813
-P05814
-P05815
-P05816
-P05817
-P05818
-P05819
-P05820
-P05821
-P05822
-P05823
-P05824
-P05825
-P05826
-P05827
-P05828
-P05829
-P05830
-P05831
-P05832
-P05833
-P05834
-P05835
-P05836
-P05837
-P05838
-P05839
-P05840
-P05841
-P05842
-P05843
-P05844
-P05845
-P05846
-P05847
-P05848
-P05849
-P05850
-P05851
-P05852
-P05853
-P05854
-P05855
-P05856
-P05857
-P05858
-P05859
-P05860
-P05861
-P05862
-P05863
-P05864
-P05865
-P05866
-P05867
-P05868
-P05869
-P05870
-P05871
-P05872
-P05873
-P05874
-P05875
-P05876
-P05877
-P05878
-P05879
-P05880
-P05881
-P05882
-P05883
-P05884
-P05885
-P05886
-P05887
-P05888
-P05889
-P05890
-P05891
-P05892
-P05893
-P05894
-P05895
-P05896
-P05897
-P05898
-P05899
-P05900
-P05901
-P05902
-P05903
-P05904
-P05905
-P05906
-P05907
-P05908
-P05909
-P05910
-P05911
-P05912
-P05913
-P05914
-P05915
-P05916
-P05917
-P05918
-P05919
-P05920
-P05921
-P05922
-P05923
-P05924
-P05925
-P05926
-P05927
-P05928
-P05929
-P05930
-P05931
-P05932
-P05933
-P05934
-P05935
-P05936
-P05937
-P05938
-P05939
-P05940
-P05941
-P05942
-P05943
-P05944
-P05945
-P05946
-P05947
-P05948
-P05949
-P05950
-P05951
-P05952
-P05953
-P05954
-P05955
-P05956
-P05957
-P05958
-P05959
-P05960
-P05961
-P05962
-P05963
-P05964
-P05965
-P05966
-P05967
-P05968
-P05969
-P05970
-P05971
-P05972
-P05973
-P05974
-P05975
-P05976
-P05977
-P05978
-P05979
-P05980
-P05981
-P05982
-P05983
-P05984
-P05985
-P05986
-P05987
-P05988
-P05989
-P05990
-P05991
-P05992
-P05993
-P05994
-P05995
-P05996
-P05997
-P05998
-P05999
-P06000
-P06001
-P06002
-P06003
-P06004
-P06005
-P06006
-P06007
-P06008
-P06009
-P06010
-P06011
-P06012
-P06013
-P06014
-P06015
-P06016
-P06017
-P06018
-P06019
-P06020
-P06021
-P06022
-P06023
-P06024
-P06025
-P06026
-P06027
-P06028
-P06029
-P06030
-P06031
-P06032
-P06033
-P06034
-P06035
-P06036
-P06037
-P06038
-P06039
-P06040
-P06041
-P06042
-P06043
-P06044
-P06045
-P06046
-P06047
-P06048
-P06049
-P06050
-P06051
-P06052
-P06053
-P06054
-P06055
-P06056
-P06057
-P06058
-P06059
-P06060
-P06061
-P06062
-P06063
-P06064
-P06065
-P06066
-P06067
-P06068
-P06069
-P06070
-P06071
-P06072
-P06073
-P06074
-P06075
-P06076
-P06077
-P06078
-P06079
-P06080
-P06081
-P06082
-P06083
-P06084
-P06085
-P06086
-P06087
-P06088
-P06089
-P06090
-P06091
-P06092
-P06093
-P06094
-P06095
-P06096
-P06097
-P06098
-P06099
-P06100
-P06101
-P06102
-P06103
-P06104
-P06105
-P06106
-P06107
-P06108
-P06109
-P06110
-P06111
-P06112
-P06113
-P06114
-P06115
-P06116
-P06117
-P06118
-P06119
-P06120
-P06121
-P06122
-P06123
-P06124
-P06125
-P06126
-P06127
-P06128
-P06129
-P06130
-P06131
-P06132
-P06133
-P06134
-P06135
-P06136
-P06137
-P06138
-P06139
-P06140
-P06141
-P06142
-P06143
-P06144
-P06145
-P06146
-P06147
-P06148
-P06149
-P06150
-P06151
-P06152
-P06153
-P06154
-P06155
-P06156
-P06157
-P06158
-P06159
-P06160
-P06161
-P06162
-P06163
-P06164
-P06165
-P06166
-P06167
-P06168
-P06169
-P06170
-P06171
-P06172
-P06173
-P06174
-P06175
-P06176
-P06177
-P06178
-P06179
-P06180
-P06181
-P06182
-P06183
-P06184
-P06185
-P06186
-P06187
-P06188
-P06189
-P06190
-P06191
-P06192
-P06193
-P06194
-P06195
-P06196
-P06197
-P06198
-P06199
-P06200
-P06201
-P06202
-P06203
-P06204
-P06205
-P06206
-P06207
-P06208
-P06209
-P06210
-P06211
-P06212
-P06213
-P06214
-P06215
-P06216
-P06217
-P06218
-P06219
-P06220
-P06221
-P06222
-P06223
-P06224
-P06225
-P06226
-P06227
-P06228
-P06229
-P06230
-P06231
-P06232
-P06233
-P06234
-P06235
-P06236
-P06237
-P06238
-P06239
-P06240
-P06241
-P06242
-P06243
-P06244
-P06245
-P06246
-P06247
-P06248
-P06249
-P06250
-P06251
-P06252
-P06253
-P06254
-P06255
-P06256
-P06257
-P06258
-P06259
-P06260
-P06261
-P06262
-P06263
-P06264
-P06265
-P06266
-P06267
-P06268
-P06269
-P06270
-P06271
-P06272
-P06273
-P06274
-P06275
-P06276
-P06277
-P06278
-P06279
-P06280
-P06281
-P06282
-P06283
-P06284
-P06285
-P06286
-P06287
-P06288
-P06289
-P06290
-P06291
-P06292
-P06293
-P06294
-P06295
-P06296
-P06297
-P06298
-P06299
-P06300
-P06301
-P06302
-P06303
-P06304
-P06305
-P06306
-P06307
-P06308
-P06309
-P06310
-P06311
-P06312
-P06313
-P06314
-P06315
-P06316
-P06317
-P06318
-P06319
-P06320
-P06321
-P06322
-P06323
-P06324
-P06325
-P06326
-P06327
-P06328
-P06329
-P06330
-P06331
-P06332
-P06333
-P06334
-P06335
-P06336
-P06337
-P06338
-P06339
-P06340
-P06341
-P06342
-P06343
-P06344
-P06345
-P06346
-P06347
-P06348
-P06349
-P06350
-P06351
-P06352
-P06353
-P06354
-P06355
-P06356
-P06357
-P06358
-P06359
-P06360
-P06361
-P06362
-P06363
-P06364
-P06365
-P06366
-P06367
-P06368
-P06369
-P06370
-P06371
-P06372
-P06373
-P06374
-P06375
-P06376
-P06377
-P06378
-P06379
-P06380
-P06381
-P06382
-P06383
-P06384
-P06385
-P06386
-P06387
-P06388
-P06389
-P06390
-P06391
-P06392
-P06393
-P06394
-P06395
-P06396
-P06397
-P06398
-P06399
-P06400
-P06401
-P06402
-P06403
-P06404
-P06405
-P06406
-P06407
-P06408
-P06409
-P06410
-P06411
-P06412
-P06413
-P06414
-P06415
-P06416
-P06417
-P06418
-P06419
-P06420
-P06421
-P06422
-P06423
-P06424
-P06425
-P06426
-P06427
-P06428
-P06429
-P06430
-P06431
-P06432
-P06433
-P06434
-P06435
-P06436
-P06437
-P06438
-P06439
-P06440
-P06441
-P06442
-P06443
-P06444
-P06445
-P06446
-P06447
-P06448
-P06449
-P06450
-P06451
-P06452
-P06453
-P06454
-P06455
-P06456
-P06457
-P06458
-P06459
-P06460
-P06461
-P06462
-P06463
-P06464
-P06465
-P06466
-P06467
-P06468
-P06469
-P06470
-P06471
-P06472
-P06473
-P06474
-P06475
-P06476
-P06477
-P06478
-P06479
-P06480
-P06481
-P06482
-P06483
-P06484
-P06485
-P06486
-P06487
-P06488
-P06489
-P06490
-P06491
-P06492
-P06493
-P06494
-P06495
-P06496
-P06497
-P06498
-P06499
-P06500
-P06501
-P06502
-P06503
-P06504
-P06505
-P06506
-P06507
-P06508
-P06509
-P06510
-P06511
-P06512
-P06513
-P06514
-P06515
-P06516
-P06517
-P06518
-P06519
-P06520
-P06521
-P06522
-P06523
-P06524
-P06525
-P06526
-P06527
-P06528
-P06529
-P06530
-P06531
-P06532
-P06533
-P06534
-P06535
-P06536
-P06537
-P06538
-P06539
-P06540
-P06541
-P06542
-P06543
-P06544
-P06545
-P06546
-P06547
-P06548
-P06549
-P06550
-P06551
-P06552
-P06553
-P06554
-P06555
-P06556
-P06557
-P06558
-P06559
-P06560
-P06561
-P06562
-P06563
-P06564
-P06565
-P06566
-P06567
-P06568
-P06569
-P06570
-P06571
-P06572
-P06573
-P06574
-P06575
-P06576
-P06577
-P06578
-P06579
-P06580
-P06581
-P06582
-P06583
-P06584
-P06585
-P06586
-P06587
-P06588
-P06589
-P06590
-P06591
-P06592
-P06593
-P06594
-P06595
-P06596
-P06597
-P06598
-P06599
-P06600
-P06601
-P06602
-P06603
-P06604
-P06605
-P06606
-P06607
-P06608
-P06609
-P06610
-P06611
-P06612
-P06613
-P06614
-P06615
-P06616
-P06617
-P06618
-P06619
-P06620
-P06621
-P06622
-P06623
-P06624
-P06625
-P06626
-P06627
-P06628
-P06629
-P06630
-P06631
-P06632
-P06633
-P06634
-P06635
-P06636
-P06637
-P06638
-P06639
-P06640
-P06641
-P06642
-P06643
-P06644
-P06645
-P06646
-P06647
-P06648
-P06649
-P06650
-P06651
-P06652
-P06653
-P06654
-P06655
-P06656
-P06657
-P06658
-P06659
-P06660
-P06661
-P06662
-P06663
-P06664
-P06665
-P06666
-P06667
-P06668
-P06669
-P06670
-P06671
-P06672
-P06673
-P06674
-P06675
-P06676
-P06677
-P06678
-P06679
-P06680
-P06681
-P06682
-P06683
-P06684
-P06685
-P06686
-P06687
-P06688
-P06689
-P06690
-P06691
-P06692
-P06693
-P06694
-P06695
-P06696
-P06697
-P06698
-P06699
-P06700
-P06701
-P06702
-P06703
-P06704
-P06705
-P06706
-P06707
-P06708
-P06709
-P06710
-P06711
-P06712
-P06713
-P06714
-P06715
-P06716
-P06717
-P06718
-P06719
-P06720
-P06721
-P06722
-P06723
-P06724
-P06725
-P06726
-P06727
-P06728
-P06729
-P06730
-P06731
-P06732
-P06733
-P06734
-P06735
-P06736
-P06737
-P06738
-P06739
-P06740
-P06741
-P06742
-P06743
-P06744
-P06745
-P06746
-P06747
-P06748
-P06749
-P06750
-P06751
-P06752
-P06753
-P06754
-P06755
-P06756
-P06757
-P06758
-P06759
-P06760
-P06761
-P06762
-P06763
-P06764
-P06765
-P06766
-P06767
-P06768
-P06769
-P06770
-P06771
-P06772
-P06773
-P06774
-P06775
-P06776
-P06777
-P06778
-P06779
-P06780
-P06781
-P06782
-P06783
-P06784
-P06785
-P06786
-P06787
-P06788
-P06789
-P06790
-P06791
-P06792
-P06793
-P06794
-P06795
-P06796
-P06797
-P06798
-P06799
-P06800
-P06801
-P06802
-P06803
-P06804
-P06805
-P06806
-P06807
-P06808
-P06809
-P06810
-P06811
-P06812
-P06813
-P06814
-P06815
-P06816
-P06817
-P06818
-P06819
-P06820
-P06821
-P06822
-P06823
-P06824
-P06825
-P06826
-P06827
-P06828
-P06829
-P06830
-P06831
-P06832
-P06833
-P06834
-P06835
-P06836
-P06837
-P06838
-P06839
-P06840
-P06841
-P06842
-P06843
-P06844
-P06845
-P06846
-P06847
-P06848
-P06849
-P06850
-P06851
-P06852
-P06853
-P06854
-P06855
-P06856
-P06857
-P06858
-P06859
-P06860
-P06861
-P06862
-P06863
-P06864
-P06865
-P06866
-P06867
-P06868
-P06869
-P06870
-P06871
-P06872
-P06873
-P06874
-P06875
-P06876
-P06877
-P06878
-P06879
-P06880
-P06881
-P06882
-P06883
-P06884
-P06885
-P06886
-P06887
-P06888
-P06889
-P06890
-P06891
-P06892
-P06893
-P06894
-P06895
-P06896
-P06897
-P06898
-P06899
-P06900
-P06901
-P06902
-P06903
-P06904
-P06905
-P06906
-P06907
-P06908
-P06909
-P06910
-P06911
-P06912
-P06913
-P06914
-P06915
-P06916
-P06917
-P06918
-P06919
-P06920
-P06921
-P06922
-P06923
-P06924
-P06925
-P06926
-P06927
-P06928
-P06929
-P06930
-P06931
-P06932
-P06933
-P06934
-P06935
-P06936
-P06937
-P06938
-P06939
-P06940
-P06941
-P06942
-P06943
-P06944
-P06945
-P06946
-P06947
-P06948
-P06949
-P06950
-P06951
-P06952
-P06953
-P06954
-P06955
-P06956
-P06957
-P06958
-P06959
-P06960
-P06961
-P06962
-P06963
-P06964
-P06965
-P06966
-P06967
-P06968
-P06969
-P06970
-P06971
-P06972
-P06973
-P06974
-P06975
-P06976
-P06977
-P06978
-P06979
-P06980
-P06981
-P06982
-P06983
-P06984
-P06985
-P06986
-P06987
-P06988
-P06989
-P06990
-P06991
-P06992
-P06993
-P06994
-P06995
-P06996
-P06997
-P06998
-P06999
-P07000
-P07001
-P07002
-P07003
-P07004
-P07005
-P07006
-P07007
-P07008
-P07009
-P07010
-P07011
-P07012
-P07013
-P07014
-P07015
-P07016
-P07017
-P07018
-P07019
-P07020
-P07021
-P07022
-P07023
-P07024
-P07025
-P07026
-P07027
-P07028
-P07029
-P07030
-P07031
-P07032
-P07033
-P07034
-P07035
-P07036
-P07037
-P07038
-P07039
-P07040
-P07041
-P07042
-P07043
-P07044
-P07045
-P07046
-P07047
-P07048
-P07049
-P07050
-P07051
-P07052
-P07053
-P07054
-P07055
-P07056
-P07057
-P07058
-P07059
-P07060
-P07061
-P07062
-P07063
-P07064
-P07065
-P07066
-P07067
-P07068
-P07069
-P07070
-P07071
-P07072
-P07073
-P07074
-P07075
-P07076
-P07077
-P07078
-P07079
-P07080
-P07081
-P07082
-P07083
-P07084
-P07085
-P07086
-P07087
-P07088
-P07089
-P07090
-P07091
-P07092
-P07093
-P07094
-P07095
-P07096
-P07097
-P07098
-P07099
-P07100
-P07101
-P07102
-P07103
-P07104
-P07105
-P07106
-P07107
-P07108
-P07109
-P07110
-P07111
-P07112
-P07113
-P07114
-P07115
-P07116
-P07117
-P07118
-P07119
-P07120
-P07121
-P07122
-P07123
-P07124
-P07125
-P07126
-P07127
-P07128
-P07129
-P07130
-P07131
-P07132
-P07133
-P07134
-P07135
-P07136
-P07137
-P07138
-P07139
-P07140
-P07141
-P07142
-P07143
-P07144
-P07145
-P07146
-P07147
-P07148
-P07149
-P07150
-P07151
-P07152
-P07153
-P07154
-P07155
-P07156
-P07157
-P07158
-P07159
-P07160
-P07161
-P07162
-P07163
-P07164
-P07165
-P07166
-P07167
-P07168
-P07169
-P07170
-P07171
-P07172
-P07173
-P07174
-P07175
-P07176
-P07177
-P07178
-P07179
-P07180
-P07181
-P07182
-P07183
-P07184
-P07185
-P07186
-P07187
-P07188
-P07189
-P07190
-P07191
-P07192
-P07193
-P07194
-P07195
-P07196
-P07197
-P07198
-P07199
-P07200
-P07201
-P07202
-P07203
-P07204
-P07205
-P07206
-P07207
-P07208
-P07209
-P07210
-P07211
-P07212
-P07213
-P07214
-P07215
-P07216
-P07217
-P07218
-P07219
-P07220
-P07221
-P07222
-P07223
-P07224
-P07225
-P07226
-P07227
-P07228
-P07229
-P07230
-P07231
-P07232
-P07233
-P07234
-P07235
-P07236
-P07237
-P07238
-P07239
-P07240
-P07241
-P07242
-P07243
-P07244
-P07245
-P07246
-P07247
-P07248
-P07249
-P07250
-P07251
-P07252
-P07253
-P07254
-P07255
-P07256
-P07257
-P07258
-P07259
-P07260
-P07261
-P07262
-P07263
-P07264
-P07265
-P07266
-P07267
-P07268
-P07269
-P07270
-P07271
-P07272
-P07273
-P07274
-P07275
-P07276
-P07277
-P07278
-P07279
-P07280
-P07281
-P07282
-P07283
-P07284
-P07285
-P07286
-P07287
-P07288
-P07289
-P07290
-P07291
-P07292
-P07293
-P07294
-P07295
-P07296
-P07297
-P07298
-P07299
-P07300
-P07301
-P07302
-P07303
-P07304
-P07305
-P07306
-P07307
-P07308
-P07309
-P07310
-P07311
-P07312
-P07313
-P07314
-P07315
-P07316
-P07317
-P07318
-P07319
-P07320
-P07321
-P07322
-P07323
-P07324
-P07325
-P07326
-P07327
-P07328
-P07329
-P07330
-P07331
-P07332
-P07333
-P07334
-P07335
-P07336
-P07337
-P07338
-P07339
-P07340
-P07341
-P07342
-P07343
-P07344
-P07345
-P07346
-P07347
-P07348
-P07349
-P07350
-P07351
-P07352
-P07353
-P07354
-P07355
-P07356
-P07357
-P07358
-P07359
-P07360
-P07361
-P07362
-P07363
-P07364
-P07365
-P07366
-P07367
-P07368
-P07369
-P07370
-P07371
-P07372
-P07373
-P07374
-P07375
-P07376
-P07377
-P07378
-P07379
-P07380
-P07381
-P07382
-P07383
-P07384
-P07385
-P07386
-P07387
-P07388
-P07389
-P07390
-P07391
-P07392
-P07393
-P07394
-P07395
-P07396
-P07397
-P07398
-P07399
-P07400
-P07401
-P07402
-P07403
-P07404
-P07405
-P07406
-P07407
-P07408
-P07409
-P07410
-P07411
-P07412
-P07413
-P07414
-P07415
-P07416
-P07417
-P07418
-P07419
-P07420
-P07421
-P07422
-P07423
-P07424
-P07425
-P07426
-P07427
-P07428
-P07429
-P07430
-P07431
-P07432
-P07433
-P07434
-P07435
-P07436
-P07437
-P07438
-P07439
-P07440
-P07441
-P07442
-P07443
-P07444
-P07445
-P07446
-P07447
-P07448
-P07449
-P07450
-P07451
-P07452
-P07453
-P07454
-P07455
-P07456
-P07457
-P07458
-P07459
-P07460
-P07461
-P07462
-P07463
-P07464
-P07465
-P07466
-P07467
-P07468
-P07469
-P07470
-P07471
-P07472
-P07473
-P07474
-P07475
-P07476
-P07477
-P07478
-P07479
-P07480
-P07481
-P07482
-P07483
-P07484
-P07485
-P07486
-P07487
-P07488
-P07489
-P07490
-P07491
-P07492
-P07493
-P07494
-P07495
-P07496
-P07497
-P07498
-P07499
-P07500
-P07501
-P07502
-P07503
-P07504
-P07505
-P07506
-P07507
-P07508
-P07509
-P07510
-P07511
-P07512
-P07513
-P07514
-P07515
-P07516
-P07517
-P07518
-P07519
-P07520
-P07521
-P07522
-P07523
-P07524
-P07525
-P07526
-P07527
-P07528
-P07529
-P07530
-P07531
-P07532
-P07533
-P07534
-P07535
-P07536
-P07537
-P07538
-P07539
-P07540
-P07541
-P07542
-P07543
-P07544
-P07545
-P07546
-P07547
-P07548
-P07549
-P07550
-P07551
-P07552
-P07553
-P07554
-P07555
-P07556
-P07557
-P07558
-P07559
-P07560
-P07561
-P07562
-P07563
-P07564
-P07565
-P07566
-P07567
-P07568
-P07569
-P07570
-P07571
-P07572
-P07573
-P07574
-P07575
-P07576
-P07577
-P07578
-P07579
-P07580
-P07581
-P07582
-P07583
-P07584
-P07585
-P07586
-P07587
-P07588
-P07589
-P07590
-P07591
-P07592
-P07593
-P07594
-P07595
-P07596
-P07597
-P07598
-P07599
-P07600
-P07601
-P07602
-P07603
-P07604
-P07605
-P07606
-P07607
-P07608
-P07609
-P07610
-P07611
-P07612
-P07613
-P07614
-P07615
-P07616
-P07617
-P07618
-P07619
-P07620
-P07621
-P07622
-P07623
-P07624
-P07625
-P07626
-P07627
-P07628
-P07629
-P07630
-P07631
-P07632
-P07633
-P07634
-P07635
-P07636
-P07637
-P07638
-P07639
-P07640
-P07641
-P07642
-P07643
-P07644
-P07645
-P07646
-P07647
-P07648
-P07649
-P07650
-P07651
-P07652
-P07653
-P07654
-P07655
-P07656
-P07657
-P07658
-P07659
-P07660
-P07661
-P07662
-P07663
-P07664
-P07665
-P07666
-P07667
-P07668
-P07669
-P07670
-P07671
-P07672
-P07673
-P07674
-P07675
-P07676
-P07677
-P07678
-P07679
-P07680
-P07681
-P07682
-P07683
-P07684
-P07685
-P07686
-P07687
-P07688
-P07689
-P07690
-P07691
-P07692
-P07693
-P07694
-P07695
-P07696
-P07697
-P07698
-P07699
-P07700
-P07701
-P07702
-P07703
-P07704
-P07705
-P07706
-P07707
-P07708
-P07709
-P07710
-P07711
-P07712
-P07713
-P07714
-P07715
-P07716
-P07717
-P07718
-P07719
-P07720
-P07721
-P07722
-P07723
-P07724
-P07725
-P07726
-P07727
-P07728
-P07729
-P07730
-P07731
-P07732
-P07733
-P07734
-P07735
-P07736
-P07737
-P07738
-P07739
-P07740
-P07741
-P07742
-P07743
-P07744
-P07745
-P07746
-P07747
-P07748
-P07749
-P07750
-P07751
-P07752
-P07753
-P07754
-P07755
-P07756
-P07757
-P07758
-P07759
-P07760
-P07761
-P07762
-P07763
-P07764
-P07765
-P07766
-P07767
-P07768
-P07769
-P07770
-P07771
-P07772
-P07773
-P07774
-P07775
-P07776
-P07777
-P07778
-P07779
-P07780
-P07781
-P07782
-P07783
-P07784
-P07785
-P07786
-P07787
-P07788
-P07789
-P07790
-P07791
-P07792
-P07793
-P07794
-P07795
-P07796
-P07797
-P07798
-P07799
-P07800
-P07801
-P07802
-P07803
-P07804
-P07805
-P07806
-P07807
-P07808
-P07809
-P07810
-P07811
-P07812
-P07813
-P07814
-P07815
-P07816
-P07817
-P07818
-P07819
-P07820
-P07821
-P07822
-P07823
-P07824
-P07825
-P07826
-P07827
-P07828
-P07829
-P07830
-P07831
-P07832
-P07833
-P07834
-P07835
-P07836
-P07837
-P07838
-P07839
-P07840
-P07841
-P07842
-P07843
-P07844
-P07845
-P07846
-P07847
-P07848
-P07849
-P07850
-P07851
-P07852
-P07853
-P07854
-P07855
-P07856
-P07857
-P07858
-P07859
-P07860
-P07861
-P07862
-P07863
-P07864
-P07865
-P07866
-P07867
-P07868
-P07869
-P07870
-P07871
-P07872
-P07873
-P07874
-P07875
-P07876
-P07877
-P07878
-P07879
-P07880
-P07881
-P07882
-P07883
-P07884
-P07885
-P07886
-P07887
-P07888
-P07889
-P07890
-P07891
-P07892
-P07893
-P07894
-P07895
-P07896
-P07897
-P07898
-P07899
-P07900
-P07901
-P07902
-P07903
-P07904
-P07905
-P07906
-P07907
-P07908
-P07909
-P07910
-P07911
-P07912
-P07913
-P07914
-P07915
-P07916
-P07917
-P07918
-P07919
-P07920
-P07921
-P07922
-P07923
-P07924
-P07925
-P07926
-P07927
-P07928
-P07929
-P07930
-P07931
-P07932
-P07933
-P07934
-P07935
-P07936
-P07937
-P07938
-P07939
-P07940
-P07941
-P07942
-P07943
-P07944
-P07945
-P07946
-P07947
-P07948
-P07949
-P07950
-P07951
-P07952
-P07953
-P07954
-P07955
-P07956
-P07957
-P07958
-P07959
-P07960
-P07961
-P07962
-P07963
-P07964
-P07965
-P07966
-P07967
-P07968
-P07969
-P07970
-P07971
-P07972
-P07973
-P07974
-P07975
-P07976
-P07977
-P07978
-P07979
-P07980
-P07981
-P07982
-P07983
-P07984
-P07985
-P07986
-P07987
-P07988
-P07989
-P07990
-P07991
-P07992
-P07993
-P07994
-P07995
-P07996
-P07997
-P07998
-P07999
-P08000
-P08001
-P08002
-P08003
-P08004
-P08005
-P08006
-P08007
-P08008
-P08009
-P08010
-P08011
-P08012
-P08013
-P08014
-P08015
-P08016
-P08017
-P08018
-P08019
-P08020
-P08021
-P08022
-P08023
-P08024
-P08025
-P08026
-P08027
-P08028
-P08029
-P08030
-P08031
-P08032
-P08033
-P08034
-P08035
-P08036
-P08037
-P08038
-P08039
-P08040
-P08041
-P08042
-P08043
-P08044
-P08045
-P08046
-P08047
-P08048
-P08049
-P08050
-P08051
-P08052
-P08053
-P08054
-P08055
-P08056
-P08057
-P08058
-P08059
-P08060
-P08061
-P08062
-P08063
-P08064
-P08065
-P08066
-P08067
-P08068
-P08069
-P08070
-P08071
-P08072
-P08073
-P08074
-P08075
-P08076
-P08077
-P08078
-P08079
-P08080
-P08081
-P08082
-P08083
-P08084
-P08085
-P08086
-P08087
-P08088
-P08089
-P08090
-P08091
-P08092
-P08093
-P08094
-P08095
-P08096
-P08097
-P08098
-P08099
-P08100
-P08101
-P08102
-P08103
-P08104
-P08105
-P08106
-P08107
-P08108
-P08109
-P08110
-P08111
-P08112
-P08113
-P08114
-P08115
-P08116
-P08117
-P08118
-P08119
-P08120
-P08121
-P08122
-P08123
-P08124
-P08125
-P08126
-P08127
-P08128
-P08129
-P08130
-P08131
-P08132
-P08133
-P08134
-P08135
-P08136
-P08137
-P08138
-P08139
-P08140
-P08141
-P08142
-P08143
-P08144
-P08145
-P08146
-P08147
-P08148
-P08149
-P08150
-P08151
-P08152
-P08153
-P08154
-P08155
-P08156
-P08157
-P08158
-P08159
-P08160
-P08161
-P08162
-P08163
-P08164
-P08165
-P08166
-P08167
-P08168
-P08169
-P08170
-P08171
-P08172
-P08173
-P08174
-P08175
-P08176
-P08177
-P08178
-P08179
-P08180
-P08181
-P08182
-P08183
-P08184
-P08185
-P08186
-P08187
-P08188
-P08189
-P08190
-P08191
-P08192
-P08193
-P08194
-P08195
-P08196
-P08197
-P08198
-P08199
-P08200
-P08201
-P08202
-P08203
-P08204
-P08205
-P08206
-P08207
-P08208
-P08209
-P08210
-P08211
-P08212
-P08213
-P08214
-P08215
-P08216
-P08217
-P08218
-P08219
-P08220
-P08221
-P08222
-P08223
-P08224
-P08225
-P08226
-P08227
-P08228
-P08229
-P08230
-P08231
-P08232
-P08233
-P08234
-P08235
-P08236
-P08237
-P08238
-P08239
-P08240
-P08241
-P08242
-P08243
-P08244
-P08245
-P08246
-P08247
-P08248
-P08249
-P08250
-P08251
-P08252
-P08253
-P08254
-P08255
-P08256
-P08257
-P08258
-P08259
-P08260
-P08261
-P08262
-P08263
-P08264
-P08265
-P08266
-P08267
-P08268
-P08269
-P08270
-P08271
-P08272
-P08273
-P08274
-P08275
-P08276
-P08277
-P08278
-P08279
-P08280
-P08281
-P08282
-P08283
-P08284
-P08285
-P08286
-P08287
-P08288
-P08289
-P08290
-P08291
-P08292
-P08293
-P08294
-P08295
-P08296
-P08297
-P08298
-P08299
-P08300
-P08301
-P08302
-P08303
-P08304
-P08305
-P08306
-P08307
-P08308
-P08309
-P08310
-P08311
-P08312
-P08313
-P08314
-P08315
-P08316
-P08317
-P08318
-P08319
-P08320
-P08321
-P08322
-P08323
-P08324
-P08325
-P08326
-P08327
-P08328
-P08329
-P08330
-P08331
-P08332
-P08333
-P08334
-P08335
-P08336
-P08337
-P08338
-P08339
-P08340
-P08341
-P08342
-P08343
-P08344
-P08345
-P08346
-P08347
-P08348
-P08349
-P08350
-P08351
-P08352
-P08353
-P08354
-P08355
-P08356
-P08357
-P08358
-P08359
-P08360
-P08361
-P08362
-P08363
-P08364
-P08365
-P08366
-P08367
-P08368
-P08369
-P08370
-P08371
-P08372
-P08373
-P08374
-P08375
-P08376
-P08377
-P08378
-P08379
-P08380
-P08381
-P08382
-P08383
-P08384
-P08385
-P08386
-P08387
-P08388
-P08389
-P08390
-P08391
-P08392
-P08393
-P08394
-P08395
-P08396
-P08397
-P08398
-P08399
-P08400
-P08401
-P08402
-P08403
-P08404
-P08405
-P08406
-P08407
-P08408
-P08409
-P08410
-P08411
-P08412
-P08413
-P08414
-P08415
-P08416
-P08417
-P08418
-P08419
-P08420
-P08421
-P08422
-P08423
-P08424
-P08425
-P08426
-P08427
-P08428
-P08429
-P08430
-P08431
-P08432
-P08433
-P08434
-P08435
-P08436
-P08437
-P08438
-P08439
-P08440
-P08441
-P08442
-P08443
-P08444
-P08445
-P08446
-P08447
-P08448
-P08449
-P08450
-P08451
-P08452
-P08453
-P08454
-P08455
-P08456
-P08457
-P08458
-P08459
-P08460
-P08461
-P08462
-P08463
-P08464
-P08465
-P08466
-P08467
-P08468
-P08469
-P08470
-P08471
-P08472
-P08473
-P08474
-P08475
-P08476
-P08477
-P08478
-P08479
-P08480
-P08481
-P08482
-P08483
-P08484
-P08485
-P08486
-P08487
-P08488
-P08489
-P08490
-P08491
-P08492
-P08493
-P08494
-P08495
-P08496
-P08497
-P08498
-P08499
-P08500
-P08501
-P08502
-P08503
-P08504
-P08505
-P08506
-P08507
-P08508
-P08509
-P08510
-P08511
-P08512
-P08513
-P08514
-P08515
-P08516
-P08517
-P08518
-P08519
-P08520
-P08521
-P08522
-P08523
-P08524
-P08525
-P08526
-P08527
-P08528
-P08529
-P08530
-P08531
-P08532
-P08533
-P08534
-P08535
-P08536
-P08537
-P08538
-P08539
-P08540
-P08541
-P08542
-P08543
-P08544
-P08545
-P08546
-P08547
-P08548
-P08549
-P08550
-P08551
-P08552
-P08553
-P08554
-P08555
-P08556
-P08557
-P08558
-P08559
-P08560
-P08561
-P08562
-P08563
-P08564
-P08565
-P08566
-P08567
-P08568
-P08569
-P08570
-P08571
-P08572
-P08573
-P08574
-P08575
-P08576
-P08577
-P08578
-P08579
-P08580
-P08581
-P08582
-P08583
-P08584
-P08585
-P08586
-P08587
-P08588
-P08589
-P08590
-P08591
-P08592
-P08593
-P08594
-P08595
-P08596
-P08597
-P08598
-P08599
-P08600
-P08601
-P08602
-P08603
-P08604
-P08605
-P08606
-P08607
-P08608
-P08609
-P08610
-P08611
-P08612
-P08613
-P08614
-P08615
-P08616
-P08617
-P08618
-P08619
-P08620
-P08621
-P08622
-P08623
-P08624
-P08625
-P08626
-P08627
-P08628
-P08629
-P08630
-P08631
-P08632
-P08633
-P08634
-P08635
-P08636
-P08637
-P08638
-P08639
-P08640
-P08641
-P08642
-P08643
-P08644
-P08645
-P08646
-P08647
-P08648
-P08649
-P08650
-P08651
-P08652
-P08653
-P08654
-P08655
-P08656
-P08657
-P08658
-P08659
-P08660
-P08661
-P08662
-P08663
-P08664
-P08665
-P08666
-P08667
-P08668
-P08669
-P08670
-P08671
-P08672
-P08673
-P08674
-P08675
-P08676
-P08677
-P08678
-P08679
-P08680
-P08681
-P08682
-P08683
-P08684
-P08685
-P08686
-P08687
-P08688
-P08689
-P08690
-P08691
-P08692
-P08693
-P08694
-P08695
-P08696
-P08697
-P08698
-P08699
-P08700
-P08701
-P08702
-P08703
-P08704
-P08705
-P08706
-P08707
-P08708
-P08709
-P08710
-P08711
-P08712
-P08713
-P08714
-P08715
-P08716
-P08717
-P08718
-P08719
-P08720
-P08721
-P08722
-P08723
-P08724
-P08725
-P08726
-P08727
-P08728
-P08729
-P08730
-P08731
-P08732
-P08733
-P08734
-P08735
-P08736
-P08737
-P08738
-P08739
-P08740
-P08741
-P08742
-P08743
-P08744
-P08745
-P08746
-P08747
-P08748
-P08749
-P08750
-P08751
-P08752
-P08753
-P08754
-P08755
-P08756
-P08757
-P08758
-P08759
-P08760
-P08761
-P08762
-P08763
-P08764
-P08765
-P08766
-P08767
-P08768
-P08769
-P08770
-P08771
-P08772
-P08773
-P08774
-P08775
-P08776
-P08777
-P08778
-P08779
-P08780
-P08781
-P08782
-P08783
-P08784
-P08785
-P08786
-P08787
-P08788
-P08789
-P08790
-P08791
-P08792
-P08793
-P08794
-P08795
-P08796
-P08797
-P08798
-P08799
-P08800
-P08801
-P08802
-P08803
-P08804
-P08805
-P08806
-P08807
-P08808
-P08809
-P08810
-P08811
-P08812
-P08813
-P08814
-P08815
-P08816
-P08817
-P08818
-P08819
-P08820
-P08821
-P08822
-P08823
-P08824
-P08825
-P08826
-P08827
-P08828
-P08829
-P08830
-P08831
-P08832
-P08833
-P08834
-P08835
-P08836
-P08837
-P08838
-P08839
-P08840
-P08841
-P08842
-P08843
-P08844
-P08845
-P08846
-P08847
-P08848
-P08849
-P08850
-P08851
-P08852
-P08853
-P08854
-P08855
-P08856
-P08857
-P08858
-P08859
-P08860
-P08861
-P08862
-P08863
-P08864
-P08865
-P08866
-P08867
-P08868
-P08869
-P08870
-P08871
-P08872
-P08873
-P08874
-P08875
-P08876
-P08877
-P08878
-P08879
-P08880
-P08881
-P08882
-P08883
-P08884
-P08885
-P08886
-P08887
-P08888
-P08889
-P08890
-P08891
-P08892
-P08893
-P08894
-P08895
-P08896
-P08897
-P08898
-P08899
-P08900
-P08901
-P08902
-P08903
-P08904
-P08905
-P08906
-P08907
-P08908
-P08909
-P08910
-P08911
-P08912
-P08913
-P08914
-P08915
-P08916
-P08917
-P08918
-P08919
-P08920
-P08921
-P08922
-P08923
-P08924
-P08925
-P08926
-P08927
-P08928
-P08929
-P08930
-P08931
-P08932
-P08933
-P08934
-P08935
-P08936
-P08937
-P08938
-P08939
-P08940
-P08941
-P08942
-P08943
-P08944
-P08945
-P08946
-P08947
-P08948
-P08949
-P08950
-P08951
-P08952
-P08953
-P08954
-P08955
-P08956
-P08957
-P08958
-P08959
-P08960
-P08961
-P08962
-P08963
-P08964
-P08965
-P08966
-P08967
-P08968
-P08969
-P08970
-P08971
-P08972
-P08973
-P08974
-P08975
-P08976
-P08977
-P08978
-P08979
-P08980
-P08981
-P08982
-P08983
-P08984
-P08985
-P08986
-P08987
-P08988
-P08989
-P08990
-P08991
-P08992
-P08993
-P08994
-P08995
-P08996
-P08997
-P08998
-P08999
-P09000
-P09001
-P09002
-P09003
-P09004
-P09005
-P09006
-P09007
-P09008
-P09009
-P09010
-P09011
-P09012
-P09013
-P09014
-P09015
-P09016
-P09017
-P09018
-P09019
-P09020
-P09021
-P09022
-P09023
-P09024
-P09025
-P09026
-P09027
-P09028
-P09029
-P09030
-P09031
-P09032
-P09033
-P09034
-P09035
-P09036
-P09037
-P09038
-P09039
-P09040
-P09041
-P09042
-P09043
-P09044
-P09045
-P09046
-P09047
-P09048
-P09049
-P09050
-P09051
-P09052
-P09053
-P09054
-P09055
-P09056
-P09057
-P09058
-P09059
-P09060
-P09061
-P09062
-P09063
-P09064
-P09065
-P09066
-P09067
-P09068
-P09069
-P09070
-P09071
-P09072
-P09073
-P09074
-P09075
-P09076
-P09077
-P09078
-P09079
-P09080
-P09081
-P09082
-P09083
-P09084
-P09085
-P09086
-P09087
-P09088
-P09089
-P09090
-P09091
-P09092
-P09093
-P09094
-P09095
-P09096
-P09097
-P09098
-P09099
-P09100
-P09101
-P09102
-P09103
-P09104
-P09105
-P09106
-P09107
-P09108
-P09109
-P09110
-P09111
-P09112
-P09113
-P09114
-P09115
-P09116
-P09117
-P09118
-P09119
-P09120
-P09121
-P09122
-P09123
-P09124
-P09125
-P09126
-P09127
-P09128
-P09129
-P09130
-P09131
-P09132
-P09133
-P09134
-P09135
-P09136
-P09137
-P09138
-P09139
-P09140
-P09141
-P09142
-P09143
-P09144
-P09145
-P09146
-P09147
-P09148
-P09149
-P09150
-P09151
-P09152
-P09153
-P09154
-P09155
-P09156
-P09157
-P09158
-P09159
-P09160
-P09161
-P09162
-P09163
-P09164
-P09165
-P09166
-P09167
-P09168
-P09169
-P09170
-P09171
-P09172
-P09173
-P09174
-P09175
-P09176
-P09177
-P09178
-P09179
-P09180
-P09181
-P09182
-P09183
-P09184
-P09185
-P09186
-P09187
-P09188
-P09189
-P09190
-P09191
-P09192
-P09193
-P09194
-P09195
-P09196
-P09197
-P09198
-P09199
-P09200
-P09201
-P09202
-P09203
-P09204
-P09205
-P09206
-P09207
-P09208
-P09209
-P09210
-P09211
-P09212
-P09213
-P09214
-P09215
-P09216
-P09217
-P09218
-P09219
-P09220
-P09221
-P09222
-P09223
-P09224
-P09225
-P09226
-P09227
-P09228
-P09229
-P09230
-P09231
-P09232
-P09233
-P09234
-P09235
-P09236
-P09237
-P09238
-P09239
-P09240
-P09241
-P09242
-P09243
-P09244
-P09245
-P09246
-P09247
-P09248
-P09249
-P09250
-P09251
-P09252
-P09253
-P09254
-P09255
-P09256
-P09257
-P09258
-P09259
-P09260
-P09261
-P09262
-P09263
-P09264
-P09265
-P09266
-P09267
-P09268
-P09269
-P09270
-P09271
-P09272
-P09273
-P09274
-P09275
-P09276
-P09277
-P09278
-P09279
-P09280
-P09281
-P09282
-P09283
-P09284
-P09285
-P09286
-P09287
-P09288
-P09289
-P09290
-P09291
-P09292
-P09293
-P09294
-P09295
-P09296
-P09297
-P09298
-P09299
-P09300
-P09301
-P09302
-P09303
-P09304
-P09305
-P09306
-P09307
-P09308
-P09309
-P09310
-P09311
-P09312
-P09313
-P09314
-P09315
-P09316
-P09317
-P09318
-P09319
-P09320
-P09321
-P09322
-P09323
-P09324
-P09325
-P09326
-P09327
-P09328
-P09329
-P09330
-P09331
-P09332
-P09333
-P09334
-P09335
-P09336
-P09337
-P09338
-P09339
-P09340
-P09341
-P09342
-P09343
-P09344
-P09345
-P09346
-P09347
-P09348
-P09349
-P09350
-P09351
-P09352
-P09353
-P09354
-P09355
-P09356
-P09357
-P09358
-P09359
-P09360
-P09361
-P09362
-P09363
-P09364
-P09365
-P09366
-P09367
-P09368
-P09369
-P09370
-P09371
-P09372
-P09373
-P09374
-P09375
-P09376
-P09377
-P09378
-P09379
-P09380
-P09381
-P09382
-P09383
-P09384
-P09385
-P09386
-P09387
-P09388
-P09389
-P09390
-P09391
-P09392
-P09393
-P09394
-P09395
-P09396
-P09397
-P09398
-P09399
-P09400
-P09401
-P09402
-P09403
-P09404
-P09405
-P09406
-P09407
-P09408
-P09409
-P09410
-P09411
-P09412
-P09413
-P09414
-P09415
-P09416
-P09417
-P09418
-P09419
-P09420
-P09421
-P09422
-P09423
-P09424
-P09425
-P09426
-P09427
-P09428
-P09429
-P09430
-P09431
-P09432
-P09433
-P09434
-P09435
-P09436
-P09437
-P09438
-P09439
-P09440
-P09441
-P09442
-P09443
-P09444
-P09445
-P09446
-P09447
-P09448
-P09449
-P09450
-P09451
-P09452
-P09453
-P09454
-P09455
-P09456
-P09457
-P09458
-P09459
-P09460
-P09461
-P09462
-P09463
-P09464
-P09465
-P09466
-P09467
-P09468
-P09469
-P09470
-P09471
-P09472
-P09473
-P09474
-P09475
-P09476
-P09477
-P09478
-P09479
-P09480
-P09481
-P09482
-P09483
-P09484
-P09485
-P09486
-P09487
-P09488
-P09489
-P09490
-P09491
-P09492
-P09493
-P09494
-P09495
-P09496
-P09497
-P09498
-P09499
-P09500
-P09501
-P09502
-P09503
-P09504
-P09505
-P09506
-P09507
-P09508
-P09509
-P09510
-P09511
-P09512
-P09513
-P09514
-P09515
-P09516
-P09517
-P09518
-P09519
-P09520
-P09521
-P09522
-P09523
-P09524
-P09525
-P09526
-P09527
-P09528
-P09529
-P09530
-P09531
-P09532
-P09533
-P09534
-P09535
-P09536
-P09537
-P09538
-P09539
-P09540
-P09541
-P09542
-P09543
-P09544
-P09545
-P09546
-P09547
-P09548
-P09549
-P09550
-P09551
-P09552
-P09553
-P09554
-P09555
-P09556
-P09557
-P09558
-P09559
-P09560
-P09561
-P09562
-P09563
-P09564
-P09565
-P09566
-P09567
-P09568
-P09569
-P09570
-P09571
-P09572
-P09573
-P09574
-P09575
-P09576
-P09577
-P09578
-P09579
-P09580
-P09581
-P09582
-P09583
-P09584
-P09585
-P09586
-P09587
-P09588
-P09589
-P09590
-P09591
-P09592
-P09593
-P09594
-P09595
-P09596
-P09597
-P09598
-P09599
-P09600
-P09601
-P09602
-P09603
-P09604
-P09605
-P09606
-P09607
-P09608
-P09609
-P09610
-P09611
-P09612
-P09613
-P09614
-P09615
-P09616
-P09617
-P09618
-P09619
-P09620
-P09621
-P09622
-P09623
-P09624
-P09625
-P09626
-P09627
-P09628
-P09629
-P09630
-P09631
-P09632
-P09633
-P09634
-P09635
-P09636
-P09637
-P09638
-P09639
-P09640
-P09641
-P09642
-P09643
-P09644
-P09645
-P09646
-P09647
-P09648
-P09649
-P09650
-P09651
-P09652
-P09653
-P09654
-P09655
-P09656
-P09657
-P09658
-P09659
-P09660
-P09661
-P09662
-P09663
-P09664
-P09665
-P09666
-P09667
-P09668
-P09669
-P09670
-P09671
-P09672
-P09673
-P09674
-P09675
-P09676
-P09677
-P09678
-P09679
-P09680
-P09681
-P09682
-P09683
-P09684
-P09685
-P09686
-P09687
-P09688
-P09689
-P09690
-P09691
-P09692
-P09693
-P09694
-P09695
-P09696
-P09697
-P09698
-P09699
-P09700
-P09701
-P09702
-P09703
-P09704
-P09705
-P09706
-P09707
-P09708
-P09709
-P09710
-P09711
-P09712
-P09713
-P09714
-P09715
-P09716
-P09717
-P09718
-P09719
-P09720
-P09721
-P09722
-P09723
-P09724
-P09725
-P09726
-P09727
-P09728
-P09729
-P09730
-P09731
-P09732
-P09733
-P09734
-P09735
-P09736
-P09737
-P09738
-P09739
-P09740
-P09741
-P09742
-P09743
-P09744
-P09745
-P09746
-P09747
-P09748
-P09749
-P09750
-P09751
-P09752
-P09753
-P09754
-P09755
-P09756
-P09757
-P09758
-P09759
-P09760
-P09761
-P09762
-P09763
-P09764
-P09765
-P09766
-P09767
-P09768
-P09769
-P09770
-P09771
-P09772
-P09773
-P09774
-P09775
-P09776
-P09777
-P09778
-P09779
-P09780
-P09781
-P09782
-P09783
-P09784
-P09785
-P09786
-P09787
-P09788
-P09789
-P09790
-P09791
-P09792
-P09793
-P09794
-P09795
-P09796
-P09797
-P09798
-P09799
-P09800
-P09801
-P09802
-P09803
-P09804
-P09805
-P09806
-P09807
-P09808
-P09809
-P09810
-P09811
-P09812
-P09813
-P09814
-P09815
-P09816
-P09817
-P09818
-P09819
-P09820
-P09821
-P09822
-P09823
-P09824
-P09825
-P09826
-P09827
-P09828
-P09829
-P09830
-P09831
-P09832
-P09833
-P09834
-P09835
-P09836
-P09837
-P09838
-P09839
-P09840
-P09841
-P09842
-P09843
-P09844
-P09845
-P09846
-P09847
-P09848
-P09849
-P09850
-P09851
-P09852
-P09853
-P09854
-P09855
-P09856
-P09857
-P09858
-P09859
-P09860
-P09861
-P09862
-P09863
-P09864
-P09865
-P09866
-P09867
-P09868
-P09869
-P09870
-P09871
-P09872
-P09873
-P09874
-P09875
-P09876
-P09877
-P09878
-P09879
-P09880
-P09881
-P09882
-P09883
-P09884
-P09885
-P09886
-P09887
-P09888
-P09889
-P09890
-P09891
-P09892
-P09893
-P09894
-P09895
-P09896
-P09897
-P09898
-P09899
-P09900
-P09901
-P09902
-P09903
-P09904
-P09905
-P09906
-P09907
-P09908
-P09909
-P09910
-P09911
-P09912
-P09913
-P09914
-P09915
-P09916
-P09917
-P09918
-P09919
-P09920
-P09921
-P09922
-P09923
-P09924
-P09925
-P09926
-P09927
-P09928
-P09929
-P09930
-P09931
-P09932
-P09933
-P09934
-P09935
-P09936
-P09937
-P09938
-P09939
-P09940
-P09941
-P09942
-P09943
-P09944
-P09945
-P09946
-P09947
-P09948
-P09949
-P09950
-P09951
-P09952
-P09953
-P09954
-P09955
-P09956
-P09957
-P09958
-P09959
-P09960
-P09961
-P09962
-P09963
-P09964
-P09965
-P09966
-P09967
-P09968
-P09969
-P09970
-P09971
-P09972
-P09973
-P09974
-P09975
-P09976
-P09977
-P09978
-P09979
-P09980
-P09981
-P09982
-P09983
-P09984
-P09985
-P09986
-P09987
-P09988
-P09989
-P09990
-P09991
-P09992
-P09993
-P09994
-P09995
-P09996
-P09997
-P09998
-P09999
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
deleted file mode 100644
index 6ffcd980f67..00000000000
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Demux
-//
-// = FILENAME
-//    server.cpp
-//
-//    Server-side driver program
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale
-//
-// ============================================================================
-
-
-#include "demux_test_server.h"
-
-ACE_RCSID(CodeGen, server, "$Id$")
-
-
-int main (int argc, char *argv [])
-{
-  // Set TAO_debug_level to 0 to ensure silent running unless
-  // debugging is explicitly invoked
-  
-  TAO_debug_level = 0;
-  
-  Demux_Test_Server demux_test_server; 
-  
-  TAO_TRY
-    {
-      if (demux_test_server.init (argc, argv, TAO_TRY_ENV) == -1)
-        return -1;
-      else
-        {
-          TAO_CHECK_ENV;
-          
-          demux_test_server.run (TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-        }
-    }
-  TAO_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      TAO_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  TAO_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      TAO_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  TAO_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
deleted file mode 100644
index c5c9c8bfc77..00000000000
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-//$Id$
-#include <stdio.h>
-
-int
-main(int argc, char* argv[])
-{
-
-  for(int i=0; i<1000; i++)
-    printf ("%09d\n",i);
-}
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
index 793cf941b7a..c324d59bf29 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile
@@ -45,7 +45,7 @@ registration: $(addprefix $(VDIR),$(TEST_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
+	-/bin/rm -rf testC.* testS.* testS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -283,7 +283,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -526,7 +526,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
@@ -769,7 +769,7 @@ realclean: clean
  $(TAO_ROOT)/tao/IIOP_Object.i \
  $(TAO_ROOT)/tao/IIOP_ORB.h \
  $(TAO_ROOT)/tao/IIOP_ORB.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Invocation.h \
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
index 3b74c04dbcc..129bde02b76 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/svc.conf
@@ -1,2 +1,2 @@
-static Server_Strategy_Factory "-ORBpoalock null -ORBtablesize 1001"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBpoalock null -ORBtablesize 1001"
 
diff --git a/TAO/performance-tests/Pluggable/Makefile b/TAO/performance-tests/Pluggable/Makefile
deleted file mode 100644
index 0369a6b783a..00000000000
--- a/TAO/performance-tests/Pluggable/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDL_SRC	= PP_TestC.cpp PP_TestS.cpp
-PROG_SRCS = PP_Test_Server.cpp \
-	    server.cpp \
-            PP_Test_Client.cpp \
-	    client.cpp \
-	    PP_Test_i.cpp
-
-LSRC = $(IDL_SRC) $(PROG_SRCS)
-
-PP_TEST_SVR_OBJS = PP_TestC.o \
-		 PP_TestS.o \
-		 PP_Test_Server.o \
-		 PP_Test_i.o \
-		 server.o
-PP_TEST_CLT_OBJS = PP_TestC.o \
-		 PP_TestS.o \
-		 PP_Test_Client.o \
-		 client.o
-
-BIN = server \
-      client
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	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
-#----------------------------------------------------------------------------
-
-LDFLAGS += -L$(TAO_ROOT)/tao
-
-.PRECIOUS: PP_TestC.cpp PP_TestS.cpp PP_TestC.h PP_TestS.h
-
-server:	$(addprefix $(VDIR),$(PP_TEST_SVR_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client:	$(addprefix $(VDIR),$(PP_TEST_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-	-$(RM) PP_TestC.* PP_TestS.* PP_TestS_T.*
-
-# 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/Pluggable/PP_Test.idl b/TAO/performance-tests/Pluggable/PP_Test.idl
deleted file mode 100644
index ed5301c4781..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-interface Pluggable_Test
-{
-  // = TITLE
-  //    Defines an interface that encapsulates operations designed to
-  //    test the TAO Pluggable Protocols implementation.
-  //
-  // = DESCRIPTION
-  //    This interface encapsulates operations that send
-  //    octets, voids, and octet sequences.
-
-  oneway void send_oneway ();
-  // Test the basic latency of a nil oneway operation.
-
-  void send_void ();
-  // Test the basic latency of a nil operation.
-
-  oneway void shutdown ();
-  // shutdown the application.
-
-};
-
-interface Pluggable_Test_Factory
-{
-  // = TITLE
-  //    Creates Pluggable_Test objects.
-
-  Pluggable_Test make_pluggable_test ();
-};
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
deleted file mode 100644
index 92fdd6581fe..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-// $Id$
-
-#include "ace/Read_Buffer.h"
-#include "PP_Test_Client.h"
-
-#include "tao/Timeprobe.h"
-#include "tao/TAO_Internal.h"
-
-ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-  static const char *PP_Test_Client_Timeprobe_Description[] =
-{
-  "PP_Test_Client::send_oneway - start",
-  "PP_Test_Client::send_oneway - end",
-
-  "PP_Test_Client::send_void - start",
-  "PP_Test_Client::send_void - end",
-
-  "PP_Test_Client::make_pluggable - start",
-  "PP_Test_Client::make_pluggable - end",
-
-  "PP_Test_Client::server_shutdown - start",
-  "PP_Test_Client::server_shutdown - end"
-};
-
-enum
-{
-  // Timeprobe description table start key
-  PP_TEST_CLIENT_SEND_ONEWAY_START = 10000,
-  PP_TEST_CLIENT_SEND_ONEWAY_END,
-
-  PP_TEST_CLIENT_SEND_VOID_START,
-  PP_TEST_CLIENT_SEND_VOID_END,
-
-  PP_TEST_CLIENT_MAKE_PLUGGABLE_START,
-  PP_TEST_CLIENT_MAKE_PLUGGABLE_END,
-
-  PP_TEST_CLIENT_SERVER_SHUTDOWN_START,
-  PP_TEST_CLIENT_SERVER_SHUTDOWN_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (PP_Test_Client_Timeprobe_Description,
-                                  PP_TEST_CLIENT_SEND_ONEWAY_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// Constructor.
-PP_Test_Client::PP_Test_Client (int shutdown)
-  : factory_key_ (0),
-    loop_count_ (1),
-    shutdown_ (shutdown),
-    objref_ (Pluggable_Test::_nil ()),
-    call_count_ (0),
-    error_count_ (0),
-    factory_ior_file_ (0),
-    f_handle_ (ACE_INVALID_HANDLE),
-    only_void_ (0),
-    only_oneway_ (0)
-{
-}
-
-// Reads the Cubit factory ior from a file
-
-int
-PP_Test_Client::read_ior (char *filename)
-{
-  // Open the file for reading.
-  this->f_handle_ = ACE_OS::open (filename,0);
-
-  if (this->f_handle_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
-                       filename),
-                      -1);
-  ACE_Read_Buffer ior_buffer (this->f_handle_);
-  char *data = ior_buffer.read ();
-
-  if (data == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to allocate memory to read ior: %p\n"),
-                      -1);
-
-  this->factory_key_ = ACE_OS::strdup (data);
-  ior_buffer.alloc ()->free (data);
-
-  return 0;
-}
-
-// Parses the command line arguments and returns an error status.
-
-int
-PP_Test_Client::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:x");
-  int c;
-  int result;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'v':
-        this->only_void_ = 1;
-        break;
-      case 'o':
-        this->only_oneway_ = 1;
-        break;
-      case 'd':  // debug flag
-        TAO_debug_level++;
-        break;
-      case 'n':                 // loop count
-        this->loop_count_ =
-          (u_int) ACE_OS::atoi (get_opts.optarg);
-        break;
-      case 'f': // read the IOR from the file.
-        result = this->read_ior (get_opts.optarg);
-        if (result < 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
-                             get_opts.optarg),
-                            -1);
-        break;
-      case 'k': // read the cubit IOR from the command-line.
-        this->factory_key_ =
-          ACE_OS::strdup (get_opts.optarg);
-        break;
-      case 'x':
-        ACE_DEBUG ((LM_DEBUG, "We will shutdown the server\n"));
-        this->shutdown_ = 1;
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-v]"
-                           " [-o]"
-                           " [-d]"
-                           " [-n loopcount]"
-                           " [-f factory-obj-ref-key-file]"
-                           " [-k obj-ref-key]"
-                           " [-x]"
-                           "\n",
-                           this->argv_ [0]),
-                          -1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-// Oneway test.
-
-void
-PP_Test_Client::send_oneway (void)
-{
-  {
-    ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-
-    this->objref_->send_oneway (this->env_);
-  }
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from send_oneway");
-      this->error_count_++;
-    }
-}
-
-// Twoway test.
-
-void
-PP_Test_Client::send_void (void)
-{
-  {
-    ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
-
-    this->objref_->send_void (this->env_);
-  }
-
-  this->call_count_++;
-
-  if (this->env_.exception () != 0)
-    {
-      this->env_.print_exception ("from send_void");
-      this->error_count_++;
-    }
-}
-
-// Send an octet
-
-// Execute client example code.
-
-int
-PP_Test_Client::run ()
-{
-  if (this->only_void_)
-    return this->run_void ();
-
-  if (this->only_oneway_)
-    return this->run_oneway ();
-
-  u_int i;
-
-  // Show the results one type at a time.
-
-  // VOID
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  for (i = 0; i < this->loop_count_; i++)
-    this->send_void ();
-
-  // ONEWAY
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  for (i = 0; i < this->loop_count_; i++)
-    this->send_oneway ();
-
-  // This causes a memPartFree on VxWorks.
-  ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
-  this->shutdown_server (this->shutdown_);
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-int
-PP_Test_Client::shutdown_server (int do_shutdown)
-{
-  if (do_shutdown)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
-      this->objref_->shutdown (this->env_);
-      this->env_.print_exception ("server, please ACE_OS::exit");
-    }
-
-  return 0;
-}
-
-int
-PP_Test_Client::run_oneway (void)
-{
-  u_int i;
-
-  // ONEWAY
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  for (i = 0; i < this->loop_count_; i++)
-    this->send_oneway ();
-  if (this->shutdown_)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
-      ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
-      this->objref_->shutdown (this->env_);
-      this->env_.print_exception ("server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-int
-PP_Test_Client::run_void (void)
-{
-  u_int i;
-
-  // VOID
-  this->call_count_ = 0;
-  this->error_count_ = 0;
-  for (i = 0; i < this->loop_count_; i++)
-    this->send_void ();
-
-  if (this->shutdown_)
-    {
-      ACE_DEBUG ((LM_DEBUG, "shutdown on Pluggable_Test object\n"));
-      ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
-      this->objref_->shutdown (this->env_);
-      this->env_.print_exception ("server, please ACE_OS::exit");
-    }
-
-  return this->error_count_ == 0 ? 0 : 1;
-}
-
-PP_Test_Client::~PP_Test_Client (void)
-{
-  // Free resources and close the IOR files.
-  if (this->factory_ior_file_)
-    ACE_OS::fclose (this->factory_ior_file_);
-
-  if (this->f_handle_ != ACE_INVALID_HANDLE)
-    ACE_OS::close (this->f_handle_);
-
-  if (this->factory_key_ != 0)
-    ACE_OS::free (this->factory_key_);
-}
-
-int
-PP_Test_Client::init (int argc, char **argv)
-{
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  ACE_TRY_NEW_ENV
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_,
-                                    this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
-
-      if (this->factory_key_ == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: no factory key specified\n",
-                           this->argv_[0]),
-                          -1);
-
-      CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->factory_key_,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->factory_ =
-        Pluggable_Test_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->factory_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "invalid factory key <%s>\n",
-                           this->factory_key_),
-                          -1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Factory received OK\n"));
-
-      // Now retrieve the Pluggable_Test obj ref corresponding to the key.
-      {
-        ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_MAKE_PLUGGABLE_START);
-
-        this->objref_ =
-          this->factory_->make_pluggable_test (ACE_TRY_ENV);
-      }
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (this->objref_.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "null objref returned by factory\n"),
-                          -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_ENV.print_exception ("Pluggable_Test::init");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.h b/TAO/performance-tests/Pluggable/PP_Test_Client.h
deleted file mode 100644
index e7761c348c1..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.h
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_Client.h
-//
-// = DESCRIPTION
-//      This class implements some basic no-op twoway and oneway requests
-//      to time the latency of the pluggable protocol implementation.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _PP_TEST_CLIENT_H
-#define _PP_TEST_CLIENT_H
-
-#include "ace/Get_Opt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/corba.h"
-#include "PP_TestC.h"
-
-class PP_Test_Client
-{
-  // = TITLE
-  //    Defines a class that encapsulates behaviour of the PP_Test client
-  //    example.  Provides a better understanding of the logic in an
-  //    object oriented way.
-  //
-  // = DESCRIPTION
-  //    This class declares an interface to run the example client for
-  //    PP_Teset CORBA server.  All the complexity for initializing the
-  //    server is hidden in the class.  Just the run() interface is needed.
-public:
-  // = Constructor and destructor.
-  PP_Test_Client (int shutdown = 0);
-  // Use <testing_collocation> to control some client's behaviors.
-
-  ~PP_Test_Client (void);
-
-  int run (void);
-  // Execute client example code.
-
-  int init (int argc, char **argv);
-  // Initialize the client communication endpoint with server.
-  // <collocation_test_ior> is used to pass in the ior file name.
-
-private:
-  int read_ior (char *filename);
-  // Function to read the cubit factory ior from a file.
-
-  int parse_args (void);
-  // Parses the arguments passed on the command line.
-
-  void send_oneway (void);
-  // Oneway operation test.
-
-  void send_void (void);
-  // Twoway operation test.
-
-  int run_void (void);
-  // This method runs only the send_void() test.
-
-  int run_oneway (void);
-  // This method runs only the send_oneway() test.
-
-  int shutdown_server (int do_shutdown);
-  // Invoke the method with <do_shutdown> != 0 to shutdown the server.
-
-  int argc_;
-  // # of arguments on the command line.
-
-  char **argv_;
-  // arguments from command line.
-
-  char *factory_key_;
-  // Key of factory obj ref.
-
-  u_int loop_count_;
-  // Number of times to do the send operations.
-
-  int shutdown_;
-  // Flag to tell server to shutdown.
-
-  Pluggable_Test_Factory_var factory_;
-  // factory pointer for cubit.
-
-  CORBA::Environment env_;
-  // Environment variable.
-
-  Pluggable_Test_var objref_;
-  // Pluggable_Test obj ref.
-
-  CORBA::ORB_var orb_;
-  // Remember our orb.
-
-  u_int call_count_;
-  // # of calls made to functions.
-
-  u_int error_count_;
-  // # of errors incurred in the lifetime of the application.
-
-  FILE *factory_ior_file_;
-  // File from which to obtain the IOR.
-
-  ACE_HANDLE f_handle_;
-  // File handle to read the IOR.
-
-  int only_void_;
-  // Run only the cube_void() test.
-
-  int only_oneway_;
-  // Run only the cube_oneway() test.
-};
-
-#endif /* _PP_TEST_CLIENT_H */
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
deleted file mode 100644
index 84c09c6b6a1..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-
-#include "PP_Test_Server.h"
-#include "tao/TAO_Internal.h"
-
-ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
-
-PP_Test_Server::PP_Test_Server (void)
-  : ior_output_file_ (0)
-{
-}
-
-int
-PP_Test_Server::parse_args (void)
-{
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'd':  // debug flag.
-        TAO_debug_level++;
-        break;
-      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,
-                             "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), -1);
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s"
-                           " [-d]"
-                           " [-o] <ior_output_file>"
-                           "\n",
-                           argv_ [0]),
-                          1);
-      }
-
-  // Indicates successful parsing of command line.
-  return 0;
-}
-
-int
-PP_Test_Server::init (int argc,
-                      char** argv,
-                      CORBA::Environment& ACE_TRY_ENV)
-{
-  // 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,
-                                         argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "init_child_poa"),
-                      -1);
-  ACE_CHECK_RETURN (-1);
-  this->argc_ = argc;
-  this->argv_ = argv;
-
-  this->parse_args ();
-  // @@ Check for the return value here.
-
-  // Get the orb
-  CORBA::ORB_var orb = this->orb_manager_.orb ();
-
-  // Now create the implementations
-  this->factory_impl_ = new Pluggable_Test_Factory_i (orb.in ());
-
-  this->factory_id_ =
-    this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_,
-                                                 ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
-              this->factory_id_.in ()));
-
-  if (this->ior_output_file_)
-    {
-      ACE_OS::fprintf (this->ior_output_file_,
-                       "%s",
-                       this->factory_id_.in ());
-      ACE_OS::fclose (this->ior_output_file_);
-    }
-
-  return 0;
-}
-
-int
-PP_Test_Server::run (CORBA::Environment& ACE_TRY_ENV)
-{
-  if (this->orb_manager_.run (ACE_TRY_ENV) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "PP_Test_Server::run"),
-                      -1);
-  return 0;
-}
-
-PP_Test_Server::~PP_Test_Server (void)
-{
-  if (this->factory_id_.in ())
-    this->orb_manager_.deactivate_under_child_poa (this->factory_id_.in ());
-
-  delete this->factory_impl_;
-}
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
deleted file mode 100644
index 762e8e67d55..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- c++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_Server.h
-//
-// = DESCRIPTION
-//      This class implements simple oneway and twoway no-op requests
-//      to time latency and overhead of the pluggable protocol functionality.
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _PP_TEST_SERVER_H
-#define _PP_TEST_SERVER_H
-
-#include "ace/Get_Opt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO.h"
-#include "PP_Test_i.h"
-
-class PP_Test_Server
-{
-  // = TITLE
-  //   Defines a server class that implements the functionality
-  //   of a server process as an object.
-  //
-  // = DESCRIPTION
-  //   The interface is quite simple. A server program has to call
-  //   init to initialize the server's state and then call run
-  //   to run the orb.
-public:
-  // = Initialization and termination methods.
-  PP_Test_Server (void);
-  // Default constructor
-
-  ~PP_Test_Server (void);
-  // Destructor
-
-  int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
-  // Initialize the server state - parsing arguments, etc.
-
-  int run (CORBA::Environment& env);
-  // Run the orb
-
-private:
-  int parse_args (void);
-  // Parses the commandline arguments.
-
-  FILE* ior_output_file_;
-  // File to output the cubit factory IOR.
-
-  TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
-  Pluggable_Test_Factory_i *factory_impl_;
-  // Implementation object of the Pluggable Test factory.
-
-  CORBA::String_var factory_id_;
-  // ID of the factory.
-
-  int argc_;
-  // Number of commandline arguments.
-
-  char **argv_;
-  // commandline arguments.
-};
-
-#endif /* _PP_TEST_SERVER_H */
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
deleted file mode 100644
index e53c0b48dfd..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ /dev/null
@@ -1,121 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_i.cpp
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "tao/corba.h"
-#include "tao/Timeprobe.h"
-#include "PP_Test_i.h"
-
-ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *PP_Test_i_Timeprobe_Description[] =
-{
-  "PP_Test_i::send_oneway - start",
-  "PP_Test_i::send_oneway - end",
-
-  "PP_Test_i::send_void - start",
-  "PP_Test_i::send_void - end",
-
-  "PP_Test_i::make_pluggable - start",
-  "PP_Test_i::make_pluggable - end",
-
-  "PP_Test_i::server_shutdown - start",
-  "PP_Test_i::server_shutdown - end"
-};
-
-enum
-{
-  // Timeprobe description table start key 
-  PP_TEST_I_SEND_ONEWAY_START = 10100,
-  PP_TEST_I_SEND_ONEWAY_END,
-
-  PP_TEST_I_SEND_VOID_START,
-  PP_TEST_I_SEND_VOID_END,
-
-  PP_TEST_I_MAKE_PLUGGABLE_START,
-  PP_TEST_I_MAKE_PLUGGABLE_END,
-
-  PP_TEST_I_SERVER_SHUTDOWN_START,
-  PP_TEST_I_SERVER_SHUTDOWN_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (PP_Test_i_Timeprobe_Description,
-                                  PP_TEST_I_SEND_ONEWAY_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-// Factory Constructor
-
-Pluggable_Test_Factory_i::Pluggable_Test_Factory_i (CORBA::ORB_ptr orb)
-  : my_pluggable_test_ (orb)
-{
-}
-
-// Factory Destructor
-
-Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
-{
-}
-
-Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (CORBA::Environment &env)
-{
-  ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
-  return my_pluggable_test_._this (env);
-}
-
-// Constructor
-
-PP_Test_i::PP_Test_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-// Destructor
-
-PP_Test_i::~PP_Test_i (void)
-{
-}
-
-// Oneway send
-
-void
-PP_Test_i::send_oneway (CORBA::Environment &)
-{
-  ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
-}
-
-// Twoway send
-
-void
-PP_Test_i::send_void (CORBA::Environment &)
-{
-  ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
-}
-
-// Shutdown.
-
-void PP_Test_i::shutdown (CORBA::Environment &)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "%s\n",
-              "PP_Test_i is shutting down"));
-
-  ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SERVER_SHUTDOWN_START);
-
-  this->orb_->shutdown ();
-}
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
deleted file mode 100644
index 02687f34a64..00000000000
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/performance-tests/Pluggable
-//
-// = FILENAME
-//    PP_Test_i.h
-//
-// = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _PP_TEST_I_H
-#define _PP_TEST_I_H
-
-#include "PP_TestS.h"
-
-class PP_Test_i : public POA_Pluggable_Test
-{
-  // = TITLE
-  //    Illustrates how to integrate a servant with the generated
-  //    skeleton.
-  //
-  // = DESCRIPTION
-  //    Implementation of the example at the servant side.
-  //    Sends a no-op oneway and twoway request.
-public:
-  PP_Test_i (CORBA::ORB_ptr orb);
-  // Constructor
-
-  ~PP_Test_i (void);
-  // Destructor
-
-  virtual void send_oneway (CORBA::Environment &env);
-  // Test a oneway call.
-
-  virtual void send_void (CORBA::Environment &env);
-  // Test a twoway call.
-
-  virtual void shutdown (CORBA::Environment &env);
-  // Shutdown routine.
-
-protected:
-  CORBA::ORB_var orb_;
-  // Keep a pointer to the ORB so we can shut it down.
-};
-
-class Pluggable_Test_Factory_i: public POA_Pluggable_Test_Factory
-{
-  // = TITLE
-  //   Pluggable_Test_Factory_i
-  //
-  // = DESCRIPTION
-  //   Factory object returning the Pluggable_Test objrefs
-public:
-  Pluggable_Test_Factory_i (CORBA::ORB_ptr orb);
-  // Constructor.
-
-  ~Pluggable_Test_Factory_i (void);
-  // Destructor.
-
-  virtual Pluggable_Test_ptr make_pluggable_test (CORBA::Environment &env);
-  // Make a Pluggable Test object.
-
-private:
-  PP_Test_i my_pluggable_test_;
-};
-
-#endif /* _PP_TEST_I_H */
diff --git a/TAO/performance-tests/Pluggable/Pluggable.dsw b/TAO/performance-tests/Pluggable/Pluggable.dsw
deleted file mode 100644
index c44ab14c480..00000000000
--- a/TAO/performance-tests/Pluggable/Pluggable.dsw
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "client"=".\client\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "server"=".\server\server.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/performance-tests/Pluggable/README b/TAO/performance-tests/Pluggable/README
deleted file mode 100644
index 302fa470914..00000000000
--- a/TAO/performance-tests/Pluggable/README
+++ /dev/null
@@ -1,46 +0,0 @@
-$Id$
-
-The tests in this directory time the latency contributed by
-various parts of the ORB, but mostly the emphasis is on the
-contribution due to the pluggable protocols code. So far, the
-output is only to the screen, and is created using the ACE
-Timeprobe class. At various points in the ORB code and in this
-test code, an ACE Timeprobe is inserted. When this point is 
-passed in the execution, a timestamp is taken and added to a 
-table. When the test finishes, the relative times are output,
-START being the first, or zero, entry, and the following
-values are the offset in microseconds. Each value has a label
-associated with it when the timeprobes are inserted.
-
-There are currently two tests. Either or both can be executed
-in a single run by using the appropriate command line options
-listed below. Since we are not interested in the time spent
-in the actual operation, but only in the framework overhead,
-we have code for a oneway and a twoway request that neither
-pass nor return any values.
-
-Usage:
-The client command line options are:
-	[-v]		run only the 2-way void test
-	[-o]		run only the 1-way void test
-	[-d]		increment the TAO debug level
-	[-n loopcount]	# of executions (defaults to 1)
-	[-f <filename>]	read IOR from <filename>
-	[-k <string>]	read IOR from command line
-	[-x]		shut down server when finished
-
-NOTE: Unless the server is shut down,  it will not
-display its timeprobe information. If the client runs
-twice, for example, and then the server is shut down,
-it will then display the results from both runs.
-
-The server command line options are:
-	[-d]		increment the TAO debug level
-	[-o] <filename>	write the IOR to <filename>
-
-
-NOTE: To display the timeprobe info, ACE must be built with
-the macro ACE_COMPILE_TIMEPROBES defined somewhere, usually
-in config.h. Otherwise the individual timeprobe macros are
-ignored.
-
diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp
deleted file mode 100644
index 40dabed1023..00000000000
--- a/TAO/performance-tests/Pluggable/client.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-#include "PP_Test_Client.h"
-#include "tao/Timeprobe.h"
-
-ACE_RCSID(IDL_Cubit, client, "$Id$")
-
-// This function runs the client test.
-
-int
-main (int argc, char **argv)
-{
-  PP_Test_Client pp_test_client;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tPluggable_Test: client\n\n"));
-
-  if (pp_test_client.init (argc, argv) == -1)
-    return 1;
-
-  int retval = pp_test_client.run ();
-
-  ACE_TIMEPROBE_PRINT;
-
-  return retval;
-}
diff --git a/TAO/performance-tests/Pluggable/client.dsp b/TAO/performance-tests/Pluggable/client.dsp
deleted file mode 100644
index 491eb9bed18..00000000000
--- a/TAO/performance-tests/Pluggable/client.dsp
+++ /dev/null
@@ -1,150 +0,0 @@
-# Microsoft Developer Studio Project File - Name="client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=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 NMAKE /f "client.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 "client.mak" CFG="client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "client - 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)" == "client - 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)" == "client - 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 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "client - Win32 Release"

-# Name "client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_Test_Client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestS.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\PP_Test_Client.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestC.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\PP_TestC.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\PP_Test.idl

-

-!IF  "$(CFG)" == "client - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "client - Win32 Debug"

-

-USERDEP__PP_TE="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO IDL Compiler

-InputPath=.\PP_Test.idl

-InputName=PP_Test

-

-"$(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/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
deleted file mode 100644
index 7885abab562..00000000000
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// $Id$
-
-#include "PP_Test_Server.h"
-#include "tao/Timeprobe.h"
-
-ACE_RCSID(IDL_Cubit, server, "$Id$")
-
-// This runs the server test.
-
-int
-main (int argc, char *argv[])
-{
-  PP_Test_Server pp_test_server;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "\n\tPluggable_Test: server\n\n"));
-  ACE_TRY_NEW_ENV
-    {
-      int status = pp_test_server.init (argc, argv, ACE_TRY_ENV);
-
-      if (status == -1)
-        {
-          ACE_TRY_ENV.print_exception ("Initialization Exception");
-          return -1;
-        }
-      else
-        {
-          pp_test_server.run (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_UNUSED_ARG (sysex);
-      ACE_TRY_ENV.print_exception ("System Exception");
-      return -1;
-    }
-  ACE_CATCH (CORBA::UserException, userex)
-    {
-      ACE_UNUSED_ARG (userex);
-      ACE_TRY_ENV.print_exception ("User Exception");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_TIMEPROBE_PRINT;
-  return 0;
-}
diff --git a/TAO/performance-tests/Pluggable/server.dsp b/TAO/performance-tests/Pluggable/server.dsp
deleted file mode 100644
index d1ca3ffd7a0..00000000000
--- a/TAO/performance-tests/Pluggable/server.dsp
+++ /dev/null
@@ -1,141 +0,0 @@
-# Microsoft Developer Studio Project File - Name="server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=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 NMAKE /f "server.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 "server.mak" CFG="server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "server - 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)" == "server - 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)" == "server - 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 /pdbtype:sept

-

-!ENDIF 

-

-# Begin Target

-

-# Name "server - Win32 Release"

-# Name "server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\PP_Test_i.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_Test_Server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\PP_Test_i.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_Test_Server.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\PP_TestS.h

-# End Source File

-# End Group

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\PP_TestS.i

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\PP_Test.idl

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/performance-tests/Thruput/COOL/Makefile b/TAO/performance-tests/Thruput/COOL/Makefile
index 1ffc61fd6cb..08735a2d8fd 100644
--- a/TAO/performance-tests/Thruput/COOL/Makefile
+++ b/TAO/performance-tests/Thruput/COOL/Makefile
@@ -52,7 +52,7 @@ all:	$(IDL_SRC) server client
 
 $(IDL_SRC): ttcp.idl
 	$(CHORUS_BINDIR)/chic $(IDLFLAGS) ttcp.idl
-	-mv ttcp.C ttcp.cpp
+	-/bin/mv ttcp.C ttcp.cpp
 
 server: $(addprefix $(VDIR),$(SVR_OBJS))
 	$(LINK.cc) -o server $(addprefix $(VDIR),$(SVR_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITSRV) $(VLDLIBS) $(POSTLINK)
@@ -61,7 +61,7 @@ client: $(addprefix $(VDIR),$(CLT_OBJS))
 	$(LINK.cc) -o client $(addprefix $(VDIR),$(CLT_OBJS)) $(LDFLAGS) $(ITIIOP) $(ITCLT) $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H server client
+	-/bin/rm -rf ttcp.cpp ttcp.H sk_ttcp.C sk_ttcp.H server client
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/TAO/performance-tests/Thruput/CORBAplus/Makefile b/TAO/performance-tests/Thruput/CORBAplus/Makefile
index 8bad8861b30..cc6db955b9a 100644
--- a/TAO/performance-tests/Thruput/CORBAplus/Makefile
+++ b/TAO/performance-tests/Thruput/CORBAplus/Makefile
@@ -49,8 +49,8 @@ CPPFLAGS += -I$(PBHOME)/include
 
 $(IDL_SRC): ttcp.idl
 	$(PBHOME)/bin/idlc ttcp.idl
-	-mv ttcp.C ttcp.cpp
-	-mv ttcp_s.C ttcp_s.cpp
+	-/bin/mv ttcp.C ttcp.cpp
+	-/bin/mv ttcp_s.C ttcp_s.cpp
 
 server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(PBHOME)/lib/iiop_s.o $(VLDLIBS) $(POSTLINK)
@@ -61,5 +61,8 @@ server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
 client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) ttcp.cpp ttcp.h ttcp_s.cpp ttcp_s.h
+	-/bin/rm -rf ttcp.cpp ttcp.h ttcp_s.cpp ttcp_s.h
diff --git a/TAO/performance-tests/Thruput/TAO/Makefile b/TAO/performance-tests/Thruput/TAO/Makefile
index 435f225f86d..b74723302a1 100644
--- a/TAO/performance-tests/Thruput/TAO/Makefile
+++ b/TAO/performance-tests/Thruput/TAO/Makefile
@@ -51,6 +51,9 @@ include $(TAO_ROOT)/taoconfig.mk
 LDFLAGS += -L$(TAO_ROOT)/tao
 CPPFLAGS += -I$(TAO_ROOT)
 
+$(IDL_SRC): ttcp.idl
+	$(TAO_ROOT)/TAO_IDL/tao_idl ttcp.idl
+
 server:	$(addprefix $(VDIR),$(TTCP_SERVER_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
@@ -58,571 +61,21 @@ client:	$(addprefix $(VDIR),$(TTCP_CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) ttcpC.* ttcpS.* ttcpS_T.*
-
+	-/bin/rm -rf ttcpC.* ttcpS.* ttcpS_T.*
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/ttcpC.o .obj/ttcpC.so .shobj/ttcpC.o .shobj/ttcpC.so: ttcpC.cpp ttcpC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i ttcpS.h ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
-.obj/ttcpS.o .obj/ttcpS.so .shobj/ttcpS.o .shobj/ttcpS.so: ttcpS.cpp ttcpS.h ttcpC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
+.obj/ttcpC.o .obj/ttcpC.so .shobj/ttcpC.o .shobj/ttcpC.so: ttcpC.cpp ttcpC.h ttcpC.i ttcpS.h ttcpS_T.h ttcpS_T.i \
+ ttcpS_T.cpp ttcpS.i
+.obj/ttcpS.o .obj/ttcpS.so .shobj/ttcpS.o .shobj/ttcpS.so: ttcpS.cpp ttcpS.h ttcpC.h ttcpC.i ttcpS_T.h ttcpS_T.i \
+ ttcpS_T.cpp ttcpS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -675,232 +128,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- ttcpC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
+ $(ACE_ROOT)/ace/Read_Buffer.i ttcpC.h \
  ttcpC.i ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -910,6 +138,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -922,269 +153,9 @@ realclean: clean
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- ttcp_i.h ttcpS.h ttcpC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i ttcp_decl.h \
+ $(ACE_ROOT)/ace/Log_Record.i ttcp_i.h \
+ ttcpS.h ttcpC.h ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i \
+ ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -1193,6 +164,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1207,828 +181,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- ttcp_i.h ttcpS.h ttcpC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
-.obj/utils.o .obj/utils.so .shobj/utils.o .shobj/utils.so: utils.cpp ttcpC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i ttcp_decl.h \
+ $(ACE_ROOT)/ace/Get_Opt.i ttcp_i.h \
+ ttcpS.h ttcpC.h ttcpC.i ttcpS_T.h ttcpS_T.i ttcpS_T.cpp ttcpS.i
+.obj/utils.o .obj/utils.so .shobj/utils.o .shobj/utils.so: utils.cpp ttcpC.h ttcpC.i ttcp_decl.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp ttcpC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ttcpC.i
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp ttcpC.h ttcpC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/performance-tests/Thruput/TAO/svc.conf b/TAO/performance-tests/Thruput/TAO/svc.conf
index 4f71ac35709..df32a6c3b41 100644
--- a/TAO/performance-tests/Thruput/TAO/svc.conf
+++ b/TAO/performance-tests/Thruput/TAO/svc.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency thread-per-connection -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() ""
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp b/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp
index 53cb4bd5bd0..a117c4bc48d 100644
--- a/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp
+++ b/TAO/performance-tests/Thruput/TAO/ttcp_i.cpp
@@ -89,7 +89,7 @@ ttcp_sequence_i::sendStructSeq(const ttcp_sequence::StructSeq& ttcp_seq, CORBA::
   ACE_UNUSED_ARG (IT_env);
   numCalls++;
   this->nbytes_ += ttcp_seq.length()*sizeof(BinStruct) ;
-#if !defined (ACE_NDEBUG)
+#ifdef DEBUG
   ACE_DEBUG ((LM_DEBUG,
               "Bytes received so far = %d\n", this->nbytes_));
 #endif
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index 46bdb3323db..6c1237b4942 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -19,15 +19,33 @@ endif
 
 
 ####
+#### Build customization.
+####
+ifndef TAO_ORBSVCS
+  #### Please see docs/configurations.html#orbsvcs for documentation of
+  #### TAO_ORBSVCS.
+  TAO_ORBSVCS = Naming \
+                Time \
+                Log \
+                Concurrency \
+                LifeCycle \
+                ImplRepo \
+                Property \
+                Trader \
+                Sched \
+                Event \
+                CosEvent \
+                AV \
+		#Event2
+endif # TAO_ORBSVCS
+
+
+####
 #### Macro customization.
 ####
 ifeq ($(findstring g++,$(CXX)),g++)
-  ifeq ($(ACE_HAS_GNUG_PRE_2_8),1)
-    #### g++ < 2.8 complains about unused parameters in generated code.
-    CCFLAGS += -Wno-unused
-  endif # g++ < 2.8
-
   ifneq ($(findstring egcs-2.91,$(shell $(CXX) --version)),)
+
     #### egcs 2.91.57 seems to go overboard:
     ####   DynAny_i.cpp:565: warning: `class TAO_DynAny_i * this' might be
     ####   used uninitialized in this function
@@ -39,41 +57,7 @@ endif # g++
 ####
 #### Build rules.
 ####
-IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
-IDL_EXT2=Cli.h Cli.i Cli.cpp Ser.h Ser.i Ser.cpp Ser_T.h Ser_T.i Ser_T.cpp
+.SUFFIXES:      S.h C.h S.i C.i S.cpp C.cpp
 
-.SUFFIXES: $(IDL_EXT)
-
-ifneq ($(use_flick),1)
-$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl $(TAO_IDL)
+%S.h %Ser.h %C.h %Cli.h %S.i %Ser.i  %C.i %Cli.i %S.cpp %Ser.cpp %C.cpp %Cli.cpp:       %.idl $(TAO_IDL)
 	$(TAO_IDL) $(TAO_IDLFLAGS) $<
-else
-#### You can redefine the following in your platform_macros.GNU
-
-ifndef FLICK_SRCDIR
-  FLICK_SRCDIR  =       /project/doc/nanbor/mom
-endif
-ifndef FLICK_OBJDIR
-  FLICK_OBJDIR  =       /project/doc/nanbor/dad
-endif
-
-CCFLAGS += -I$(FLICK_OBJDIR)/runtime/headers -I$(FLICK_SRCDIR)/runtime/headers
-
-CORBA_FE=$(FLICK_OBJDIR)/bin/flick-fe-newcorba
-CORBA_PG=$(FLICK_OBJDIR)/bin/flick-c-pfe-corbaxx
-CORBA_BE=$(FLICK_OBJDIR)/bin/flick-c-pbe-iiopxx
-
-$(foreach ext, $(IDL_EXT) $(IDL_EXT2), %$(ext)): %.idl
-	$(CORBA_FE) $< && \
-	$(CORBA_PG) -c -o $*-client.prc $*.aoi && \
-	$(CORBA_BE) $*-client.prc -o $*C.cpp -h $*C.h -f $*S.h --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
-	echo > $*C.i
-	$(CORBA_FE) $< && \
-	$(CORBA_PG) -s -o $*-server.prc $*.aoi && \
-	$(CORBA_BE) $*-server.prc --no_mu_stubs -o $*S.cpp -h $*S.h -F $*C.h --presentation_implementation $(FLICK_SRCDIR)/runtime/headers/flick/pres/tao_cxx.scml && \
-	echo > $*S.i && \
-        echo > $*S_T.h && \
-        echo > $*S_T.i && \
-        echo > $*S_T.cpp
-
-endif
diff --git a/TAO/tao-config.1.in b/TAO/tao-config.1.in
deleted file mode 100644
index 6dad8e66486..00000000000
--- a/TAO/tao-config.1.in
+++ /dev/null
@@ -1,56 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii tao-config.1
-.\"
-.TH tao-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
-.SH NAME
-tao-config \- Display TAO Library Configuration
-.SH SYNOPSIS
-.B tao-config 
-.I OPTION 
-.B [
-.I OPTION
-.B ... ] 
-.B [
-.I LIBRARY
-.B ]
-.SH DESCRIPTION
-.B tao-config
-is a script that is used to display what compiler flags and libraries were
-used when TAO was built.
-.SH OPTIONS
-.IP --version
-TAO version information
-.IP --help
-display help message and exit
-.IP --cxx
-C++ compiler used for compiling
-.IP --cxxflags
-C++ pre-processor and compiler flags
-.IP --libs
-library linking information
-.IP --libs-only-L
-the -L/-R part of
-.I --libs
-.IP --libs-only-l
-the -l part of 
-.I --libs
-.SH LIBRARY
-.I LIBRARY
-refers to the library for which the specified configuration is desired.  Valid
-libraries are:
-.IP orbsvcs
-the TAO ORB services library
-.IP tao
-the TAO library
-.SH FILES
-.I @libdir@/taoConf.sh
-.RS
-Additional TAO related library configuration information.
-.RE
-.SH BUGS
-No option to display which C++ compiler was used to compile TAO currently
-exists.
-.SH AUTHOR
-Ossama Othman <othman@astrosun.tn.cornell.edu>
-.SH "SEE ALSO"
-.BR ace-config (1)
diff --git a/TAO/tao-config.in b/TAO/tao-config.in
deleted file mode 100644
index 53c654e8565..00000000000
--- a/TAO/tao-config.in
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/bin/sh
-#
-# $Id$
-
-set -e
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-
-bindir=@bindir@
-sbindir=@sbindir@
-libexecdir=@libexecdir@
-datadir=@datadir@
-sysconfdir=@sysconfdir@
-sharedstatedir=@sharedstatedir@
-localstatedir=@localstatedir@
-libdir=@libdir@
-infodir=@infodir@
-mandir=@mandir@
-includedir=@includedir@
-
-pkgdatadir=${datadir}/@PACKAGE@
-pkglibdir=${libdir}/@PACKAGE@
-pkgincludedir=${includedir}/@PACKAGE@
-
-usage()
-{
-    cat <<EOF
-Usage: tao-config [OPTIONS]... [LIBRARY]...
-
-Generic options
-  --version	output TAO version information
-  --help	display this help and exit
-
-Compilation support options
-  --cxx         print C++ compiler used for compiling
-  --cxxflags	print C++ pre-processor and compiler flags
-  --libs	print library linking information
-  --libs-only-L	only print the -L/-R part of --libs
-  --libs-only-l only print the -l part of --libs
-
-Install directories ace-libs was configured to
-  --prefix  --exec-prefix  --bindir  --sbindir  --libexecdir  --datadir
-  --sysconfdir  --sharedstatedir  --localstatedir  --libdir  --infodir
-  --mandir  --includedir
-
-Known values for LIBRARY are:
-
-    ace         (calls ace-config)
-    orbsvcs
-    tao
-
-If LIBRARY is none of these,
-    
-    ${libdir}/<LIBRARY>Conf.sh
-
-is looked in for the necessary information. 
-EOF
-
-    exit $1
-}
-
-if test $# -eq 0; then
-    usage 1
-fi
-
-cxx=false
-cxxflags=false
-libs_L=false
-libs_l=false
-
-while test $# -gt 0; do
-    case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-    *) optarg= ;;
-    esac
-
-    case $1 in
-    --version)
-	echo @PACKAGE@ @VERSION@
-	exit 0
-	;;
-    --exec-prefix)
-	echo $exec_prefix
-	exit 0
-	;;
-    --prefix)
-	echo $prefix
-	exit 0
-	;;
-    --*dir)
-	dirname=\$`echo $1 | sed -e 's,^--,,'`
-	dirname=`eval echo $dirname`
-	test -z "$dirname" && exit 1
-	echo $dirname
-	exit 0
-	;;
-    --help)
-	usage 0
-	;;
-    --cxx)
-        cxx=true
-        ;;
-    --cxxflags)
-       	cxxflags=true
-       	;;
-    --libs)
-       	libs_L=true
-	libs_l=true
-       	;;
-    --libs-only-L)
-	libs_L=true
-	;;
-    --libs-only-l)
-	libs_l=true
-	;;
-    --*)
-	usage 1
-	;;
-    ace)
-        # The ACE compiler should be the same as TAO's compiler!
-        the_compiler="`ace-config --cxx tao`"
-        the_libs="$the_libs `ace-config --libs ace`"
-        the_flags="$the_flags `ace-config --cxxflags ace`"
-	;;
-    tao)
-        the_compiler="@CXX@"
-       	the_libs="$the_libs @TAO_LIBDIR@ @TAO_LIBS@"
-  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    orbsvcs)
-        echo "Currently unsupported."
-        exit 1
-#      	the_libs="$the_libs @TAO_LIBDIR@ @ORBSVCS_LIBS@"
-#  	the_flags="$the_flags @TAO_INCLUDEDIR@ @CXXFLAGS@"
-	;;
-    *)
-	cnf_sh=${libdir}/${1}Conf.sh
-	if test -f ${cnf_sh}; then
-	    . ${cnf_sh}
-	    up_name=`echo $1 | tr a-z A-Z`
-            cnf_compiler=\$${up_name}_COMPILER
-	    cnf_libdir=\$${up_name}_LIBDIR
-	    cnf_libs=\$${up_name}_LIBS
-	    cnf_flags=\$${up_name}_INCLUDEDIR
-            the_compiler="`eval echo $cnf_compiler`"
-	    the_libs="$the_libs `eval echo $cnf_libdir` `eval echo $cnf_libs`"
-	    the_flags="$the_flags `eval echo $cnf_flags`"
-	else
-	    echo Unknown library \`$1\' 1>&2
-	fi
-	;;
-    esac
-    shift
-done
-
-if $cxx; then
-    all_flags="$the_compiler"
-fi
-
-if $cxxflags; then
-    all_flags="$all_flags $the_flags"
-fi
-
-if $libs_L || $libs_l; then
-    all_flags="$all_flags $the_libs"
-fi
-
-if test -z "$all_flags" || test "x$all_flags" = "x "; then
-    exit 1
-fi
-
-# Straight out any possible duplicates, but be careful to
-# get `-lfoo -lbar -lbaz' for `-lfoo -lbaz -lbar -lbaz'
-other_flags=
-lib_L_flags=
-rev_libs=
-for i in $all_flags; do
-    case "$i" in
-    # a library, save it for later, in reverse order
-    -l*) rev_libs="$i $rev_libs" ;;
-    -L*|-R*)
-	if $libs_L; then
-	    case " $lib_L_flags " in
-	    *\ $i\ *) ;;			# already there
-	    *) lib_L_flags="$lib_L_flags $i" ;;	# add it to output
-	    esac 
-	fi;;
-    *)
-	case " $other_flags " in
-	*\ $i\ *) ;;				# already there
-	*) other_flags="$other_flags $i" ;;	# add it to output
-        esac ;;
-    esac
-done
-
-ord_libs=
-if $libs_l; then
-    for i in $rev_libs; do
-	case " $ord_libs " in
-	*\ $i\ *) ;;			# already there
-	*) ord_libs="$i $ord_libs" ;;	# add it to output in reverse order
-	esac
-    done
-fi
-
-echo $other_flags $lib_L_flags $ord_libs
-
-exit 0
diff --git a/TAO/tao/Active_Object_Map.cpp b/TAO/tao/Active_Object_Map.cpp
index 2bc90fe9095..02189a35914 100644
--- a/TAO/tao/Active_Object_Map.cpp
+++ b/TAO/tao/Active_Object_Map.cpp
@@ -1,1119 +1,344 @@
 // $Id$
 
+#include "ace/Auto_Ptr.h"
 #include "tao/Active_Object_Map.h"
+#include "tao/ORB_Core.h"
+#include "tao/POA.h"
+#include "tao/Server_Strategy_Factory.h"
+
+ACE_RCSID(tao, Active_Object_Map, "$Id$")
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
-
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID(tao, POA, "$Id$")
-
-////////////////////////////////////////////////////////////////////////////////
+#endif /* ! __ACE_INLINE__ */
 
-TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
-  : user_id_ (),
-    system_id_ (),
-    servant_ (0),
-    reference_count_ (1),
-    deactivated_ (0)
+u_long 
+TAO_ObjectId_Hash::operator () (const PortableServer::ObjectId &id) const
 {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/* static */
-size_t TAO_Active_Object_Map::system_id_size_ (0);
-
-void
-TAO_Active_Object_Map::set_system_id_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Active_Object_Map::system_id_size_ == 0)
-    {
-      if (creation_parameters.allow_reactivation_of_system_ids_)
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-            case TAO_LINEAR:
-
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-
-            case TAO_DYNAMIC_HASH:
-            default:
-
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-            }
-
-          size_t hint_size;
-          if (creation_parameters.use_active_hint_in_ids_)
-            {
-              hint_size = ACE_Active_Map_Manager_Key::size ();
-            }
-          else
-            {
-              hint_size = 0;
-            }
-
-          TAO_Active_Object_Map::system_id_size_ += hint_size;
-        }
-      else
-        {
-          switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-            {
-            case TAO_LINEAR:
-
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-
-            case TAO_DYNAMIC_HASH:
-
-              TAO_Active_Object_Map::system_id_size_ = sizeof (CORBA::ULong);
-              break;
-
-            case TAO_ACTIVE_DEMUX:
-            default:
-
-              TAO_Active_Object_Map::system_id_size_ = ACE_Active_Map_Manager_Key::size ();
-              break;
-            }
-        }
-    }
+  return ACE::hash_pjw ((const char *) id.get_buffer (),
+                        id.length ());
 }
 
 TAO_Active_Object_Map::TAO_Active_Object_Map (int user_id_policy,
-                                              int unique_id_policy,
-                                              int persistent_id_policy,
-                                              const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                              CORBA_Environment &ACE_TRY_ENV)
-  : user_id_map_ (0),
-    servant_map_ (0),
-    id_uniqueness_strategy_ (0),
-    lifespan_strategy_ (0),
-    id_assignment_strategy_ (0),
-    id_hint_strategy_ (0)
+                                              int unique_id_policy)
+  : unique_id_policy_ (unique_id_policy)
 {
-  TAO_Active_Object_Map::set_system_id_size (creation_parameters);
-
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy = 0;
-  if (unique_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Unique_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_uniqueness_strategy,
-                        TAO_Multiple_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Strategy> new_id_uniqueness_strategy (id_uniqueness_strategy);
-
-  TAO_Lifespan_Strategy *lifespan_strategy = 0;
-  if (persistent_id_policy)
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Persistent_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (lifespan_strategy,
-                        TAO_Transient_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Lifespan_Strategy> new_lifespan_strategy (lifespan_strategy);
-
-  TAO_Id_Assignment_Strategy *id_assignment_strategy = 0;
-  if (user_id_policy)
-    {
-      ACE_NEW_THROW_EX (id_assignment_strategy,
-                        TAO_User_Id_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      if (unique_id_policy)
-        {
-          ACE_NEW_THROW_EX (id_assignment_strategy,
-                            TAO_System_Id_With_Unique_Id_Strategy,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-        }
-      else
-        {
-          ACE_NEW_THROW_EX (id_assignment_strategy,
-                            TAO_System_Id_With_Multiple_Id_Strategy,
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-        }
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Strategy> new_id_assignment_strategy (id_assignment_strategy);
-
-  TAO_Id_Hint_Strategy *id_hint_strategy = 0;
-  if ((user_id_policy ||
-       creation_parameters.allow_reactivation_of_system_ids_) &&
-      creation_parameters.use_active_hint_in_ids_)
-    {
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_Active_Hint_Strategy (creation_parameters.active_object_map_size_),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (id_hint_strategy,
-                        TAO_No_Hint_Strategy,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Id_Hint_Strategy> new_id_hint_strategy (id_hint_strategy);
-
-  servant_map *sm = 0;
-  if (unique_id_policy)
-    {
-      switch (creation_parameters.reverse_object_lookup_strategy_for_unique_id_policy_)
-        {
-        case TAO_LINEAR:
-          ACE_NEW_THROW_EX (sm,
-                            servant_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-        default:
-          ACE_NEW_THROW_EX (sm,
-                            servant_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<servant_map> new_servant_map (sm);
-
-  user_id_map *uim = 0;
-  if (user_id_policy ||
-      creation_parameters.allow_reactivation_of_system_ids_)
-    {
-      switch (creation_parameters.object_lookup_strategy_for_user_id_policy_)
-        {
-        case TAO_LINEAR:
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-        default:
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-  else
-    {
-      switch (creation_parameters.object_lookup_strategy_for_system_id_policy_)
-        {
-        case TAO_LINEAR:
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_linear_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_DYNAMIC_HASH:
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_hash_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-
-        case TAO_ACTIVE_DEMUX:
-        default:
-
-          ACE_NEW_THROW_EX (uim,
-                            user_id_active_map (creation_parameters.active_object_map_size_),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK;
-          break;
-        }
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<user_id_map> new_user_id_map (uim);
-
-  id_uniqueness_strategy->set_active_object_map (this);
-  lifespan_strategy->set_active_object_map (this);
-  id_assignment_strategy->set_active_object_map (this);
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->id_uniqueness_strategy_ = new_id_uniqueness_strategy.release ();
-  this->lifespan_strategy_ = new_lifespan_strategy.release ();
-  this->id_assignment_strategy_ = new_id_assignment_strategy.release ();
-  this->id_hint_strategy_ = new_id_hint_strategy.release ();
-  this->servant_map_ = new_servant_map.release ();
-  this->user_id_map_ = new_user_id_map.release ();
+  this->impl_ = 
+    TAO_ORB_Core_instance ()->server_factory ()->create_active_object_map (user_id_policy);
+  this->reverse_impl_ = 
+    TAO_ORB_Core_instance ()->server_factory ()->create_reverse_active_object_map (unique_id_policy);
 }
 
-TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
-{
-  user_id_map::iterator iterator = this->user_id_map_->begin ();
-  user_id_map::iterator end = this->user_id_map_->end ();
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      user_id_map::value_type map_entry = *iterator;
-      delete map_entry.second ();
-    }
-
-  delete this->id_uniqueness_strategy_;
-  delete this->lifespan_strategy_;
-  delete this->id_assignment_strategy_;
-  delete this->id_hint_strategy_;
-  delete this->servant_map_;
-  delete this->user_id_map_;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Uniqueness_Strategy::~TAO_Id_Uniqueness_Strategy (void)
-{
-}
-
-void
-TAO_Id_Uniqueness_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 int
-TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant)
+TAO_Active_Object_Map_Impl::find (const PortableServer::Servant servant,
+                                  PortableServer::ObjectId &id)
 {
-  int result = this->active_object_map_->servant_map_->find (servant);
-  if (result == 0)
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
+  auto_ptr<TAO_Active_Object_Map_Iterator_Impl> end (this->end ());
 
-int
-TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                            const PortableServer::ObjectId &user_id,
-                                            TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-
-  if (result == 0)
+  for (auto_ptr<TAO_Active_Object_Map_Iterator_Impl> i (this->begin ());
+       !i->done (end.get ());
+       i->advance ())
     {
-      if (servant != 0)
-        {
-          entry->servant_ = servant;
+      const TAO_Active_Object_Map_Entry &item = i->item ();
 
-          result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                 entry);
-        }
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
-                      -1);
-
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
+      if (!this->is_free (item))
         {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
-
-          if (result == 0)
-            {
-              if (servant != 0)
-                {
-                  result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                         entry);
-                }
-
-              if (result != 0)
-                {
-                  this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-                  this->active_object_map_->id_hint_strategy_->unbind (*entry);
-                  delete entry;
-                }
-            }
-          else
+          if (item.servant_ == servant)
             {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
+              // Store the match....
+              id = item.id_;
+              return 0;
             }
         }
-      else
-        {
-          delete entry;
-        }
     }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-
-  if (result == 0)
-    {
-      if (entry->servant_ != 0)
-        {
-          result = this->active_object_map_->servant_map_->unbind (entry->servant_);
-        }
-
-      if (result == 0)
-        {
-          result = this->active_object_map_->id_hint_strategy_->unbind (*entry);
-        }
-
-      if (result == 0)
-        {
-          delete entry;
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                    PortableServer::ObjectId_out user_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else
-        {
-          ACE_NEW_RETURN (user_id,
-                          PortableServer::ObjectId (entry->user_id_),
-                          -1);
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Unique_Id_Strategy::find_system_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out system_id)
-{
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->servant_map_->find (servant,
-                                                             entry);
-
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else
-        {
-          result = this->active_object_map_->id_hint_strategy_->system_id (system_id,
-                                                                           *entry);
-        }
-    }
-
-  return result;
-}
-
-CORBA::Boolean
-TAO_Unique_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  // Since servant are always unique here, return false.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Multiple_Id_Strategy::is_servant_in_map (PortableServer::Servant servant)
-{
+  
   return -1;
 }
 
-int
-TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
-                                              const PortableServer::ObjectId &user_id,
-                                              TAO_Active_Object_Map::Map_Entry *&entry)
+PortableServer::ObjectId *
+TAO_Dynamic_Hash_Active_Object_Map::create_object_id (PortableServer::Servant,
+                                                      CORBA::Environment &)
 {
-  int result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-
-  if (result == 0)
-    {
-      if (servant != 0)
-        {
-          entry->servant_ = servant;
-        }
-    }
-  else
-    {
-      ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
-                      -1);
+  // This method assumes that locks are held when it is called
+  PortableServer::ObjectId *id;
+  CORBA::ULong size = sizeof (CORBA::ULong);
+  ACE_NEW_RETURN (id,
+                  PortableServer::ObjectId (size),
+                  0);
 
-      entry->user_id_ = user_id;
-      entry->servant_ = servant;
+  id->length (size);
 
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
+  ACE_OS::memcpy (id->get_buffer (),
+                  &this->counter_,
+                  size);
 
-      if (result == 0)
-        {
-          result = this->active_object_map_->user_id_map_->bind (entry->user_id_,
-                                                                 entry);
+  this->counter_++;
 
-          if (result != 0)
-            {
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        {
-          delete entry;
-        }
-    }
-
-  return result;
+  return id;  
 }
 
 int
-TAO_Multiple_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
+TAO_Linear_Active_Object_Map::bind (const PortableServer::ObjectId &id,
+                                    PortableServer::Servant servant)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
-  int result = this->active_object_map_->user_id_map_->unbind (user_id,
-                                                               entry);
-
-  if (result == 0)
+  // Check existing entries
+  for (TAO_Active_Object_Map_Entry *i = this->map_;
+       i != this->map_ + this->next_;
+       ++i)
     {
-      result = this->active_object_map_->id_hint_strategy_->unbind (*entry);
-
-      if (result == 0)
+      if (i->is_free_)
         {
-          delete entry;
+          i->id_ = id;
+          i->servant_ = servant;
+          i->is_free_ = 0;
+          return 0;
         }
     }
 
-  return result;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
-                                                      PortableServer::ObjectId_out user_id)
-{
-  return -1;
-}
-
-int
-TAO_Multiple_Id_Strategy::find_system_id_using_servant (PortableServer::Servant servant,
-                                                        PortableServer::ObjectId_out system_id)
-{
-  return -1;
-}
-
-CORBA::Boolean
-TAO_Multiple_Id_Strategy::remaining_activations (PortableServer::Servant servant)
-{
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map_->user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map_->user_id_map_->begin ();
-       iter != end;
-       ++iter)
+  // Resize
+  if (this->next_ == this->mapsize_)
     {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *entry = map_pair.second ();
-
-      if (entry->servant_ == servant)
-        {
-          return 1;
-        }
+      int result = this->resize ();
+      if (result != 0)
+        return result;
     }
-  return 0;
-}
 
-////////////////////////////////////////////////////////////////////////////////
+  // Put the entry at the end of the new section
+  this->map_[this->next_].id_ = id;
+  this->map_[this->next_].servant_ = servant;
+  this->map_[this->next_].is_free_ = 0;
 
-TAO_Lifespan_Strategy::~TAO_Lifespan_Strategy (void)
-{
-}
+  // Increment next
+  this->next_++;
 
-void
-TAO_Lifespan_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
+  return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
 int
-TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                  const PortableServer::ObjectId &user_id,
-                                                                  PortableServer::Servant &servant,
-                                                                  TAO_Active_Object_Map::Map_Entry *&entry)
+TAO_Linear_Active_Object_Map::find (const PortableServer::ObjectId &id,
+                                    PortableServer::Servant &servant)
 {
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0)
-    {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
-        {
-          result = -1;
-        }
-      else
-        {
-          servant = entry->servant_;
-        }
-    }
-  else
+  for (TAO_Active_Object_Map_Entry *i = this->map_;
+       i != this->map_ + this->next_;
+       ++i)
     {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
+      if (i->is_free_)
+        continue;
+      else if (i->id_ == id)
         {
-          if (entry->deactivated_)
-            {
-              result = -1;
-            }
-          else if (entry->servant_ == 0)
-            {
-              result = -1;
-            }
-          else
-            {
-              servant = entry->servant_;
-            }
+          servant = i->servant_;
+          return 0;
         }
     }
-
-  return result;
+  return -1;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
 int
-TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                   const PortableServer::ObjectId &user_id,
-                                                                   PortableServer::Servant &servant,
-                                                                   TAO_Active_Object_Map::Map_Entry *&entry)
+TAO_Linear_Active_Object_Map::unbind (const PortableServer::ObjectId &id,
+                                      PortableServer::Servant &servant)
 {
-  int result = this->active_object_map_->id_hint_strategy_->find (system_id,
-                                                                  entry);
-  if (result == 0 &&
-      user_id == entry->user_id_)
+  for (TAO_Active_Object_Map_Entry *i = this->map_;
+       i != this->map_ + this->next_;
+       ++i)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
+      if (i->is_free_)
+        continue;
+      else if (i->id_ == id)
         {
-          result = -1;
-        }
-      else
-        {
-          servant = entry->servant_;
+          servant = i->servant_;
+          i->is_free_ = 1;
+          return 0;
         }
     }
-  else
-    {
-      result = this->active_object_map_->user_id_map_->find (user_id,
-                                                             entry);
-      if (result == 0)
-        {
-          if (entry->deactivated_)
-            {
-              result = -1;
-            }
-          else if (entry->servant_ == 0)
-            {
-              result = -1;
-            }
-          else
-            {
-              servant = entry->servant_;
-            }
-        }
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Assignment_Strategy::~TAO_Id_Assignment_Strategy (void)
-{
-}
-
-void
-TAO_Id_Assignment_Strategy::set_active_object_map (TAO_Active_Object_Map *active_object_map)
-{
-  this->active_object_map_ = active_object_map;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                            TAO_Active_Object_Map::Map_Entry *&entry)
-{
   return -1;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
 int
-TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                             TAO_Active_Object_Map::Map_Entry *&entry)
+TAO_Linear_Active_Object_Map::resize (void)
 {
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
-                  -1);
-
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
-
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
-
-      if (result == 0)
-        {
-          if (servant != 0)
-            {
-              result = this->active_object_map_->servant_map_->bind (entry->servant_,
-                                                                     entry);
-            }
-
-          if (result != 0)
-            {
-              this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-              this->active_object_map_->id_hint_strategy_->unbind (*entry);
-              delete entry;
-            }
-        }
-      else
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
+  if (this->mapsize_ < TAO_Linear_Active_Object_Map::MAX_EXPONENTIAL)
+    this->mapsize_ *= 2;
   else
-    {
-      delete entry;
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
+    this->mapsize_ += TAO_Linear_Active_Object_Map::LINEAR_INCREASE;
 
-int
-TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
-                                                               TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
+  TAO_Active_Object_Map_Entry *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Active_Object_Map_Entry[this->mapsize_],
                   -1);
 
-  int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
-                                                                        entry->user_id_);
-  if (result == 0)
-    {
-      entry->servant_ = servant;
+  // Copy old stuff
+  for (TAO_Active_Object_Map_Entry *i = this->map_, *j = tmp;
+       i != this->map_ + this->next_;
+       ++i, ++j)
+    *j = *i;
 
-      result = this->active_object_map_->id_hint_strategy_->bind (*entry);
+  delete [] this->map_;
 
-      if (result != 0)
-        {
-          this->active_object_map_->user_id_map_->unbind (entry->user_id_);
-          delete entry;
-        }
-    }
-  else
-    {
-      delete entry;
-    }
-
-  return result;
+  this->map_ = tmp;
+  return 0;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Hint_Strategy::~TAO_Id_Hint_Strategy (void)
+PortableServer::ObjectId *
+TAO_Linear_Active_Object_Map::create_object_id (PortableServer::Servant,
+                                                CORBA::Environment &)
 {
-}
-
-////////////////////////////////////////////////////////////////////////////////
+  PortableServer::ObjectId *id;
+  CORBA::ULong size = sizeof (CORBA::ULong);
+  ACE_NEW_RETURN (id,
+                  PortableServer::ObjectId (size),
+                  0);
 
-TAO_Active_Hint_Strategy::TAO_Active_Hint_Strategy (CORBA::ULong map_size)
-  : system_id_map_ (map_size)
-{
-}
+  id->length (size);
 
-TAO_Active_Hint_Strategy::~TAO_Active_Hint_Strategy (void)
-{
-}
+  ACE_OS::memcpy (id->get_buffer (),
+                  &this->counter_,
+                  size);
 
-int
-TAO_Active_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                       PortableServer::ObjectId &user_id)
-{
-  return this->system_id_map_.recover_key (system_id,
-                                           user_id);
+  this->counter_++;
+  
+  return id;  
 }
 
 int
-TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_Active_Demux_Active_Object_Map::bind (const PortableServer::ObjectId &id,
+                                          PortableServer::Servant servant)
 {
-  entry.system_id_ = entry.user_id_;
+  CORBA::ULong index = 0;
+  CORBA::ULong generation = 0;
+  int result = this->parse_object_id (id, index, generation);
 
-  return this->system_id_map_.bind_modify_key (&entry,
-                                               entry.system_id_);
-}
+  if (result != 0 ||
+      index > this->mapsize_ ||
+      this->map_[index].generation_ != generation ||
+      this->map_[index].is_free_ != 0)
+    return -1;
 
-int
-TAO_Active_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  return this->system_id_map_.unbind (entry.system_id_);
-}
+  this->map_[index].servant_ = servant;
 
-int
-TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                                TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  return this->system_id_map_.find (system_id,
-                                    entry);
-}
-
-size_t
-TAO_Active_Hint_Strategy::hint_size (void)
-{
-  return ACE_Active_Map_Manager_Key::size ();
+  return 0;
 }
 
 int
-TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                     TAO_Active_Object_Map::Map_Entry &entry)
+TAO_Active_Demux_Active_Object_Map::find (const PortableServer::ObjectId &id,
+                                          PortableServer::Servant &servant)
 {
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.system_id_),
-                  -1);
-  return 0;
-}
+  CORBA::ULong index = 0;
+  CORBA::ULong generation = 0;
+  int result = this->parse_object_id (id, index, generation);
 
-////////////////////////////////////////////////////////////////////////////////
+  if (result != 0 
+      || index > this->mapsize_ 
+      || this->map_[index].generation_ != generation 
+      || this->map_[index].is_free_ != 0)
+    return -1;
 
-TAO_No_Hint_Strategy::~TAO_No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
-                                   PortableServer::ObjectId &user_id)
-{
-  // Smartly copy all the data; <user_id does not own the data>.
-  user_id.replace (system_id.maximum (),
-                   system_id.length (),
-                   ACE_const_cast (CORBA::Octet *,
-                                   system_id.get_buffer ()),
-                   0);
+  servant = this->map_[index].servant_;
 
   return 0;
 }
 
 int
-TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_Active_Demux_Active_Object_Map::unbind (const PortableServer::ObjectId &id,
+                                            PortableServer::Servant &servant)
 {
-  return 0;
-}
+  CORBA::ULong index = 0;
+  CORBA::ULong generation = 0;
+  int result = this->parse_object_id (id, index, generation);
 
-int
-TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
-{
-  return 0;
-}
+  if (result != 0 || 
+      index > this->mapsize_ || 
+      this->map_[index].generation_ != generation ||
+      this->map_[index].is_free_ != 0)
+    return -1;
 
-int
-TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                            TAO_Active_Object_Map::Map_Entry *&entry)
-{
-  return -1;
-}
+  servant = this->map_[index].servant_;
+  this->map_[index].is_free_ = 1;
 
-size_t
-TAO_No_Hint_Strategy::hint_size (void)
-{
   return 0;
 }
 
-int
-TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                 TAO_Active_Object_Map::Map_Entry &entry)
+PortableServer::ObjectId *
+TAO_Active_Demux_Active_Object_Map::create_object_id (PortableServer::Servant servant,
+                                                      CORBA::Environment &)
 {
-  ACE_NEW_RETURN (system_id,
-                  PortableServer::ObjectId (entry.user_id_),
-                  -1);
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
+  // This method assumes that locks are held when it is called
+  CORBA::ULong id_data[2];
+  CORBA::ULong index = this->next_free ();
+  id_data[TAO_Active_Demux_Active_Object_Map::INDEX_FIELD] = index;
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+  // Increment generation count.
+  id_data[TAO_Active_Demux_Active_Object_Map::GENERATION_FIELD] =
+    ++this->map_[index].generation_;
 
-template class auto_ptr<TAO_Id_Uniqueness_Strategy>;
-template class auto_ptr<TAO_Lifespan_Strategy>;
-template class auto_ptr<TAO_Id_Assignment_Strategy>;
-template class auto_ptr<TAO_Id_Hint_Strategy>;
-template class auto_ptr<TAO_Active_Object_Map::servant_map>;
-template class auto_ptr<TAO_Active_Object_Map::user_id_map>;
+  // Move next along if index is not reused
+  if (index == this->next_)
+    this->next_++;
 
-template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
+  PortableServer::ObjectId *id;
+  CORBA::ULong size = 2 * sizeof (CORBA::ULong);
+  ACE_NEW_RETURN (id,
+                  PortableServer::ObjectId (size),
+                  0);
 
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry *value;
+  id->length (size);
 
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
+  ACE_OS::memcpy (id->get_buffer (),
+                  &id_data,
+                  size);
 
-template class ACE_Noop_Key_Generator<servant>;
+  // Set the new values
+  this->map_[index].id_ = *id;
+  this->map_[index].servant_ = servant;
+  this->map_[index].is_free_ = 0;
 
-// Common
-template class ACE_Reference_Pair<const id, value>;
-template class ACE_Reference_Pair<const servant, value>;
+  return id;
+}
 
-// Map and iterator classes.
-template class ACE_Map<id, value>;
-template class ACE_Map<servant, value>;
-template class ACE_Iterator<id_value_type>;
-template class ACE_Iterator<servant_value_type>;
-template class ACE_Reverse_Iterator<id_value_type>;
-template class ACE_Reverse_Iterator<servant_value_type>;
+CORBA::ULong
+TAO_Active_Demux_Active_Object_Map::next_free (void)
+{
+  for (;;)
+    {
+      for (TAO_Active_Object_Map_Entry *i = this->map_;
+           i != this->map_ + this->mapsize_;
+           ++i)
+        if (i->is_free_)
+          return i - this->map_;
 
-// Iterator base classes.
-template class ACE_Iterator_Impl<id_value_type>;
-template class ACE_Iterator_Impl<servant_value_type>;
-template class ACE_Reverse_Iterator_Impl<id_value_type>;
-template class ACE_Reverse_Iterator_Impl<servant_value_type>;
+      this->resize ();
+    }
+}
 
-// Active Map Manager related.
-template class ACE_Pair<id, value>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>;
-template class ACE_Active_Map_Manager<id_expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>;
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-// Hash Map Manager related.
-template class ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<id, value>;
-template class ACE_Hash_Map_Entry<servant, value>;
-template class ACE_Equal_To<id>;
-template class ACE_Equal_To<servant>;
+template class ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<PortableServer::ObjectId, PortableServer::Servant>;
+template class ACE_Equal_To<PortableServer::ObjectId>;
 
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>;
-template class ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>;
-template class ACE_Map_Manager<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Manager<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<id, value>;
-template class ACE_Map_Entry<servant, value>;
+template class ACE_Hash_Map_Iterator_Base_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Entry<PortableServer::Servant, PortableServer::ObjectId>;
+template class ACE_Equal_To<PortableServer::Servant>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate auto_ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate auto_ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map::user_id_map>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::servant_map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>
-
-// Common typedefs.
-typedef PortableServer::ObjectId id;
-typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry * value;
-
-typedef ACE_Pair<id, value> id_expanded_value;
-typedef ACE_Reference_Pair<const id, value> id_value_type;
-typedef ACE_Reference_Pair<const servant, value> servant_value_type;
-typedef ACE_Equal_To<id> id_compare_keys;
-typedef ACE_Equal_To<servant> servant_compare_keys;
-typedef TAO_ObjectId_Hash id_hash;
-typedef TAO_Servant_Hash servant_hash;
-typedef ACE_Noop_Key_Generator<servant> noop_servant_key_generator;
-
-#pragma instantiate ACE_Noop_Key_Generator<servant>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const id, value>
-#pragma instantiate ACE_Reference_Pair<const servant, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<id, value>
-#pragma instantiate ACE_Map<servant, value>
-#pragma instantiate ACE_Iterator<id_value_type>
-#pragma instantiate ACE_Iterator<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator<servant_value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Iterator_Impl<servant_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<id_value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<servant_value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<id, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<id, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id_expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<id_expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, id_expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, id_expanded_value>
-
-// Hash Map Manager related.
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<id, value, id_hash, id_compare_keys, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<servant, value, servant_hash, servant_compare_keys, noop_servant_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<id_value_type, id, value, id_hash, id_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<servant_value_type, servant, value, servant_hash, servant_compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<id, value, id_hash, id_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<servant, value, servant_hash, servant_compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<id, value>
-#pragma instantiate ACE_Hash_Map_Entry<servant, value>
-#pragma instantiate ACE_Equal_To<id>
-#pragma instantiate ACE_Equal_To<servant>
-
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<id_value_type, id, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<servant_value_type, servant, value>
-#pragma instantiate ACE_Map_Manager_Adapter<id, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<servant, value, noop_servant_key_generator>
-#pragma instantiate ACE_Map_Manager<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Manager<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<id, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<servant, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<id, value>
-#pragma instantiate ACE_Map_Entry<servant, value>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId, PortableServer::Servant, TAO_ObjectId_Hash, ACE_Equal_To<PortableServer::ObjectId>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<PortableServer::ObjectId, PortableServer::Servant>
+#pragma instantiate ACE_Equal_To<PortableServer::ObjectId>
+
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<PortableServer::Servant, PortableServer::ObjectId, TAO_Servant_Hash, ACE_Equal_To<PortableServer::Servant>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Entry<PortableServer::Servant, PortableServer::ObjectId>
+#pragma instantiate ACE_Equal_To<PortableServer::Servant>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Active_Object_Map.h b/TAO/tao/Active_Object_Map.h
index 825d4477a2b..5e696f67189 100644
--- a/TAO/tao/Active_Object_Map.h
+++ b/TAO/tao/Active_Object_Map.h
@@ -1,4 +1,3 @@
-/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -10,601 +9,581 @@
 //    Active_Object_Map.h
 //
 // = AUTHOR
+//    Aniruddha Gokhale
 //    Irfan Pyarali
+//    Carlos O'Ryan
 //
 // ============================================================================
 
 #ifndef TAO_ACTIVE_OBJECT_MAP_H
 #define TAO_ACTIVE_OBJECT_MAP_H
 
-#include "tao/Key_Adapters.h"
-#include "tao/Server_Strategy_Factory.h"
+#include "ace/Hash_Map_Manager_T.h"
+#include "tao/corbafwd.h"
 #include "tao/Servant_Base.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-////////////////////////////////////////////////////////////////////////////////
+class TAO_Export TAO_ObjectId_Hash
+{
+public:
+  u_long operator () (const PortableServer::ObjectId &id) const;
+  // Returns hash value.
+};
 
-// Forward declarations.
-class TAO_Id_Uniqueness_Strategy;
-class TAO_Lifespan_Strategy;
-class TAO_Id_Assignment_Strategy;
-class TAO_Id_Hint_Strategy;
+// Defined in Stub.cpp for TAO_opaque (an alias of
+// PortableServer::ObjectId).
+extern TAO_Export int operator== (const PortableServer::ObjectId &l,
+                                  const PortableServer::ObjectId &r);
 
-class TAO_Active_Object_Map
+class TAO_Export TAO_Active_Object_Map_Entry
 {
   // = TITLE
-  //     Map of object ids to servants.
   //
-  // = DESCRIPTION
-  //     Implementation to be used by the POA.
+  //     Common entry for all maps
+  //
 public:
+  TAO_Active_Object_Map_Entry (void);
+  // Constructor
 
-  struct Map_Entry
-  {
-    // = TITLE
-    //     Value field of the active object map.
-    //
-    // = DESCRIPTION
-    //
-    //     We need a mapping from and to all of the following fields:
-    //     <user_id>, <system_id>, and <servant>.  Therefore, we keep
-    //     all the fields together in the map.
-
-    Map_Entry (void);
-    // Default constructor.
-
-    PortableServer::ObjectId user_id_;
-    PortableServer::ObjectId system_id_;
-    PortableServer::Servant servant_;
-    CORBA::UShort reference_count_;
-    CORBA::Boolean deactivated_;
-  };
+  PortableServer::ObjectId id_;
+  // Object id
 
-  TAO_Active_Object_Map (int user_id_policy,
-                         int unique_id_policy,
-                         int persistent_id_policy,
-                         const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                         CORBA_Environment &ACE_TRY_ENV);
-  // Constructor.
+  CORBA::ULong generation_;
+  // Generation count
 
-  ~TAO_Active_Object_Map (void);
-  // Destructor.
+  PortableServer::Servant servant_;
+  // Servant pointer
 
-  int is_servant_in_map (PortableServer::Servant servant);
-  // Must be used with UNIQUE_ID policy.
-
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                PortableServer::ObjectId_out system_id);
-  // Must be used with SYSTEM_ID policy.
-
-  int bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                              PortableServer::ObjectId_out user_id);
-  // Must be used with SYSTEM_ID policy.
-
-  int bind_using_user_id (PortableServer::Servant servant,
-                          const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                    PortableServer::ObjectId_out system_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                          const PortableServer::ObjectId &user_id,
-                                          const PortableServer::ObjectId &system_id,
-                                          TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-
-  int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_user_id_using_servant (PortableServer::Servant servant,
-                                  PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_system_id_using_servant (PortableServer::Servant servant,
-                                    PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                  PortableServer::Servant &servant);
-  // Can be used with any policy. With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
-
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                PortableServer::Servant &servant,
-                                                PortableServer::ObjectId_out system_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is identical to <system_id>.
-
-  int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is identical to <system_id>.
-
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId_out user_id);
-  // Can be used with any policy.  When the SYSTEM_ID policy is used,
-  // the <system_id> is identical to <user_id>.
-
-  int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                    PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  When the SYSTEM_ID policy is used,
-  // the <system_id> is identical to <user_id>.
-
-  CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-
-  size_t current_size (void);
-  // Size of the map.
-
-  static size_t system_id_size (void);
-  // Can be used with any policy.
-
-  static void set_system_id_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-  // Set the system id size.
-
-  typedef ACE_Map<
-  PortableServer::ObjectId,
-    Map_Entry *> user_id_map;
-  // Base class of the id map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    TAO_Incremental_Key_Generator> user_id_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_Incremental_Key_Generator> user_id_linear_map;
-  // Id linear map.
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    Map_Entry *,
-    TAO_Ignore_Original_Key_Adapter> user_id_active_map;
-  // Id active map.
-
-  typedef ACE_Map<
-  PortableServer::Servant,
-    Map_Entry *> servant_map;
-  // Base class of the servant map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  PortableServer::Servant,
-    Map_Entry *,
-    TAO_Servant_Hash,
-    ACE_Equal_To<PortableServer::Servant>,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_hash_map;
-  // Servant hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  PortableServer::Servant,
-    Map_Entry *,
-    ACE_Noop_Key_Generator<PortableServer::Servant> > servant_linear_map;
-  // Servant linear map.
-
-  user_id_map *user_id_map_;
-  // Id map.
-
-  servant_map *servant_map_;
-  // Servant map.
-
-  TAO_Id_Uniqueness_Strategy *id_uniqueness_strategy_;
-  // Id uniqueness strategy.
-
-  TAO_Lifespan_Strategy *lifespan_strategy_;
-  // Lifespan strategy.
-
-  TAO_Id_Assignment_Strategy *id_assignment_strategy_;
-  // Id assignment strategy.
-
-  TAO_Id_Hint_Strategy *id_hint_strategy_;
-  // Id hint strategy.
-
-  static size_t system_id_size_;
-  // Size of the system id produced by the map.
+  int is_free_;
+  // Is the entry currently in use
 };
 
-////////////////////////////////////////////////////////////////////////////////
+// Forward declaration
+class TAO_Active_Object_Map_Iterator_Impl;
 
-class TAO_Id_Uniqueness_Strategy
+class TAO_Export TAO_Active_Object_Map_Iterator
 {
   // = TITLE
-  //     Id uniqueness strategy.
+  //
+  //   Bridge for abstract iterator.
   //
   // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     UNIQUE_ID and the MULTIPLE_ID policies.
+  //
+  //   This class provides the "abstraction" for iteration over the
+  //   active object maps.
+  //
 public:
+  TAO_Active_Object_Map_Iterator (TAO_Active_Object_Map_Iterator_Impl *impl);
+  // Constructor taking an implementation.
 
-  virtual ~TAO_Id_Uniqueness_Strategy (void);
-  // Virtual destructor.
-
-  virtual int is_servant_in_map (PortableServer::Servant servant) = 0;
-  // Must be used with UNIQUE_ID policy.
+  TAO_Active_Object_Map_Iterator (const TAO_Active_Object_Map_Iterator &x);
+  TAO_Active_Object_Map_Iterator &operator= (const TAO_Active_Object_Map_Iterator &x);
+  virtual ~TAO_Active_Object_Map_Iterator (void);
+  // This is a well behaved class
 
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id) = 0;
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  const TAO_Active_Object_Map_Entry &operator *(void) const;
+  // Return the current item.
 
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id) = 0;
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  TAO_Active_Object_Map_Iterator operator++ (void);
+  TAO_Active_Object_Map_Iterator operator++ (int);
+  // Increase the current position.
 
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id) = 0;
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
-
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant) = 0;
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
+  friend int operator== (const TAO_Active_Object_Map_Iterator &l,
+                         const TAO_Active_Object_Map_Iterator &r);
+  friend int operator!= (const TAO_Active_Object_Map_Iterator &l,
+                         const TAO_Active_Object_Map_Iterator &r);
+  // Compare two iterators.
 
 protected:
-
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
+  TAO_Active_Object_Map_Iterator_Impl *impl_;
 };
 
-////////////////////////////////////////////////////////////////////////////////
+// Forward declaration
+class TAO_Active_Object_Map_Impl;
+class TAO_Reverse_Active_Object_Map_Impl;
 
-class TAO_Unique_Id_Strategy : public TAO_Id_Uniqueness_Strategy
+class TAO_Export TAO_Active_Object_Map
 {
   // = TITLE
-  //     Unique id strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for the UNIQUE_ID policy.
+  //     Interface class for maintaining a mapping of object ids to
+  //     pointers to servants.
+  //
 public:
+  TAO_Active_Object_Map (int user_id_policy,
+                         int unique_id_policy);
+  // System creates map based on <user_id_policy> and
+  // <unique_id_policy>
 
-  virtual int is_servant_in_map (PortableServer::Servant servant);
-  // Must be used with UNIQUE_ID policy.
+  virtual ~TAO_Active_Object_Map (void);
+  // Destructor.
 
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  int bind (const PortableServer::ObjectId &id,
+            PortableServer::Servant servant);
+  // Associate <id> with <servant>, returning 0 if object is
+  // registered successfully, 1 if it's already registered, and -1 if
+  // a failure occurs during registration.
 
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  int unbind (const PortableServer::ObjectId &id,
+              PortableServer::Servant &servant);
+  // Remove any association among <id> and <servant>.  Returns 0 if
+  // the operation was succesful, <-1> otherwise.
 
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  int find (const PortableServer::ObjectId &id);
+  // Returns 0 if there is a servant for <id> in the map, <-1>
+  // otherwise.
 
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  int find (const PortableServer::ObjectId &id,
+            PortableServer::Servant &servant);
+  // Find object associated with <id>.  If the <id> is found it sets
+  // <servant> and returns 0.  If not found, <servant> is unchanged
+  // and the value <-1> is returned.
 
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
-};
+  int find (const PortableServer::Servant servant);
+  // Returns 0 if <servant> is in the map, <-1> otherwise.
 
-////////////////////////////////////////////////////////////////////////////////
+  int find (const PortableServer::Servant servant,
+            PortableServer::ObjectId &id);
+  // This method is only used with unique ids.  Find the <id> for
+  // <servant>.  Returns <-1> if <servant> is not found, returns <0>
+  // if <servant> is found.
 
-class TAO_Multiple_Id_Strategy : public TAO_Id_Uniqueness_Strategy
-{
-  // = TITLE
-  //     Multiple id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the MULTIPLE_ID policy.
-public:
+  PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                              CORBA::Environment &TAO_IN_ENV);
+  // Create an object id
 
-  virtual int is_servant_in_map (PortableServer::Servant servant);
-  // Must be used with UNIQUE_ID policy.
+  virtual CORBA::ULong system_id_size (void) const;
+  // Size of the system generated id.
 
-  virtual int unbind_using_user_id (const PortableServer::ObjectId &user_id);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  typedef TAO_Active_Object_Map_Iterator iterator;
+  iterator begin (void) const;
+  iterator end (void) const;
 
-  virtual int find_user_id_using_servant (PortableServer::Servant servant,
-                                          PortableServer::ObjectId_out user_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+protected:
+  TAO_Active_Object_Map (const TAO_Active_Object_Map &);
+  TAO_Active_Object_Map &operator= (const TAO_Active_Object_Map &);
+  // Disallow copying.
 
-  virtual int find_system_id_using_servant (PortableServer::Servant servant,
-                                            PortableServer::ObjectId_out system_id);
-  // Must be used with UNIQUE_ID policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+protected:
+  TAO_Active_Object_Map_Impl *impl_;
+  // Implementation pointer
 
-  virtual int bind_using_user_id (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId &user_id,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.  With the SYSTEM_ID policy,
-  // <user_id> is actually <system_id>.
+  TAO_Reverse_Active_Object_Map_Impl *reverse_impl_;
+  // Reverse implementation pointer
 
-  virtual CORBA::Boolean remaining_activations (PortableServer::Servant servant);
-  // Are there any remaining activations of <servant> in the active
-  // object map?  Can be used with any policy.
+  int unique_id_policy_;
+  // Flag to indicate whether we have the UNIQUE_ID policy or the
+  // SYSTEM_ID policy
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Lifespan_Strategy
+class TAO_Export TAO_Active_Object_Map_Iterator_Impl
 {
   // = TITLE
-  //     Lifespan strategy.
+  //
+  //   Abstract iterator for all active object maps.
   //
   // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     TRANSIENT and the PERSISTENT policies.
+  //
+  //   We want to provide an common interface for the different active
+  //   object maps and their iterators.  Active object maps are
+  //   handled using base classes and virtual methods; but we must
+  //   provide a "by value" interface for iterators.
+  //
+  //   To do this we use several well know patterns:
+  //
+  //     TAO_Active_Object_Map::iterator uses the Bridge pattern to
+  //     give a consistent and "by-value" interface to all the
+  //     iterators.  The base class for all the iterators is
+  //     TAO_Active_Object_Map_Iterator, here we use external
+  //     polymorphism to adapt all the iterators to this common
+  //     interface.
+  //
 public:
+  virtual ~TAO_Active_Object_Map_Iterator_Impl (void);
+  // Dtor
 
-  virtual ~TAO_Lifespan_Strategy (void);
-  // Virtual destructor.
-
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Can be used with any policy.
+  virtual TAO_Active_Object_Map_Iterator_Impl *clone (void) const = 0;
+  // Make a copy of the iterator, pointing to the current position.
 
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
+  virtual const TAO_Active_Object_Map_Entry &item (void) const = 0;
+  // Obtain the current item
 
-protected:
+  virtual void advance (void) = 0;
+  // Advance to the next element.
 
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
+  virtual int done (const TAO_Active_Object_Map_Iterator_Impl *end) const = 0;
+  // Returns 1 if "this" points to the same position as <end>, returns
+  // 0 otherwise.
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Transient_Strategy : public TAO_Lifespan_Strategy
+class TAO_Export TAO_Active_Object_Map_Impl
 {
   // = TITLE
-  //     Transient strategy.
+  //
+  //   Abstract class for maintaining a mapping from object ids to
+  //   servants.
   //
   // = DESCRIPTION
-  //     Strategy for the TRANSIENT policy.
+  //
+  // = NOTES
+  //
+  //   Iterators may return free entries, whose "int_id" (the servant)
+  //   is 0.
+  //
 public:
+  virtual ~TAO_Active_Object_Map_Impl (void);
+  // Destructor.
 
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
+  virtual TAO_Active_Object_Map_Iterator_Impl *begin () const = 0;
+  virtual TAO_Active_Object_Map_Iterator_Impl *end () const = 0;
+  // Iterator interface
+
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant) = 0;
+  virtual int unbind (const PortableServer::ObjectId &id,
+                      PortableServer::Servant &servant) = 0;
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant) = 0;
+  virtual int find (const PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::Servant servant);
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                                      CORBA::Environment &TAO_IN_ENV) = 0;
+  virtual CORBA::ULong system_id_size (void) const = 0;
+  virtual int is_free (const TAO_Active_Object_Map_Entry &item) const = 0;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Persistent_Strategy : public TAO_Lifespan_Strategy
+class TAO_Export TAO_Reverse_Active_Object_Map_Impl
 {
   // = TITLE
-  //     Persistent strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for the PERSISTENT policy.
+  //     Abstract base class for maintaining a mapping of servant to
+  //     object ids.
 public:
+  TAO_Reverse_Active_Object_Map_Impl (void);
+  // Constructor
 
-  virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                        const PortableServer::ObjectId &user_id,
-                                                        PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
-  // Can be used with any policy.
+  virtual ~TAO_Reverse_Active_Object_Map_Impl (void);
+  // Destructor.
 
-};
+  virtual int bind (PortableServer::Servant servant,
+                    const PortableServer::ObjectId &id) = 0;
+  // Associate <servant> with <id>.
+
+  virtual int unbind (PortableServer::Servant servant) = 0;
+  // Remote <servant> from table.
 
-////////////////////////////////////////////////////////////////////////////////
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id) = 0;
+  // Find <id> of <servant>.
 
-class TAO_Id_Assignment_Strategy
+  virtual int find (PortableServer::Servant servant) = 0;
+  // Find <servant> in the table.
+
+private:
+  TAO_Reverse_Active_Object_Map_Impl (const TAO_Reverse_Active_Object_Map_Impl &);
+  TAO_Reverse_Active_Object_Map_Impl &operator= (const TAO_Reverse_Active_Object_Map_Impl &);
+  // Disallow copying.
+};
+
+class TAO_Export TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy : public TAO_Reverse_Active_Object_Map_Impl
 {
   // = TITLE
-  //     Id uniqueness strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     USER_ID and the SYSTEM_ID policies.
+  //     Table for maintaining a mapping of servant to object ids (for
+  //     the UNIQUE_ID POA_Policy)
 public:
+  TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (size_t size);
+  // Constructor
+
+  virtual ~TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (void);
+  // Destructor
+
+  virtual int bind (PortableServer::Servant servant,
+                    const PortableServer::ObjectId &id);
+  // Associate <servant> with <id>.
 
-  virtual ~TAO_Id_Assignment_Strategy (void);
-  // Virtual destructor.
+  virtual int unbind (PortableServer::Servant servant);
+  // Remote <servant> from table.
 
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-  // Must be used with SYSTEM_ID policy.
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  // Find <id> of <servant>.
 
-  void set_active_object_map (TAO_Active_Object_Map *active_object_map);
-  // Set the active map.
+  virtual int find (PortableServer::Servant servant);
+  // Find <servant> in the table.
 
 protected:
 
-  TAO_Active_Object_Map *active_object_map_;
-  // Pointer to the active map.
-};
+  // = Typedef for the hash map
+  typedef ACE_Hash_Map_Manager_Ex<PortableServer::Servant,
+                                  PortableServer::ObjectId,
+                                  TAO_Servant_Hash,
+                                  ACE_Equal_To<PortableServer::Servant>,
+                                  ACE_Null_Mutex>
+          REVERSE_MAP;
 
-////////////////////////////////////////////////////////////////////////////////
+  REVERSE_MAP map_;
+  // Hash map instance
+};
 
-class TAO_User_Id_Strategy : public TAO_Id_Assignment_Strategy
+class TAO_Export TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy : public TAO_Reverse_Active_Object_Map_Impl
 {
   // = TITLE
-  //     User id strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for the USER_ID policy.
+  //     Table for maintaining a mapping of servant to object ids (for
+  //     the MULTIPLE_ID POA_Policy)
 public:
+  TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void);
+  // Constructor
 
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
-};
+  virtual ~TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void);
+  // Destructor
 
-////////////////////////////////////////////////////////////////////////////////
+  virtual int bind (PortableServer::Servant servant,
+                    const PortableServer::ObjectId &id);
+  // Associate <servant> with <id>.
 
-class TAO_System_Id_With_Unique_Id_Strategy : public TAO_Id_Assignment_Strategy
-{
-  // = TITLE
-  //     System id strategy.
-  //
-  // = DESCRIPTION
-  //     Strategy for the SYSTEM_ID policy (with UNIQUE_ID policy).
-public:
+  virtual int unbind (PortableServer::Servant servant);
+  // Remote <servant> from table.
 
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  // Find <id> of <servant>.
+
+  virtual int find (PortableServer::Servant servant);
+  // Find <servant> in the table.
 };
 
-////////////////////////////////////////////////////////////////////////////////
+/*******************************************************************/
+
+// In the next section we implement a few concrete active object map
+// implementations, namely:
+//
+//   TAO_Dynamic_Hash_Active_Object_Map, based on dynamic hashing
+//   (ACE_Hash_Map_Manager).
+//
+//   TAO_Linear_Active_Object_Map, using linear search and a simple
+//   dynamically growing array.
+//
+//   TAO_Active_Demux_Active_Object_Map, using also a dynamically
+//   allocated array, but using active demultiplexing to do the
+//   lookups.
 
-class TAO_System_Id_With_Multiple_Id_Strategy : public TAO_Id_Assignment_Strategy
+/*******************************************************************/
+
+class TAO_Export TAO_Dynamic_Hash_Active_Object_Map : public TAO_Active_Object_Map_Impl
 {
   // = TITLE
-  //     System id strategy.
+  //
+  //   Lookup strategy based on dynamic hashing.
   //
   // = DESCRIPTION
-  //     Strategy for the SYSTEM_ID policy (with MULTIPLE_ID policy).
+  //
+  //   The active object map is implemented using a ACE_Hash_Map_Manager,
+  //   the iterators are implemented using the ACE_Hash_Map_Iterator
+  //   class.
+  //
 public:
+  TAO_Dynamic_Hash_Active_Object_Map (CORBA::ULong size);
+
+  virtual ~TAO_Dynamic_Hash_Active_Object_Map (void);
+
+  virtual TAO_Active_Object_Map_Iterator_Impl *begin (void) const;
+  virtual TAO_Active_Object_Map_Iterator_Impl *end (void) const;
+
+  virtual int find (const PortableServer::Servant servant);
+  virtual int find (const PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
+  virtual int unbind (const PortableServer::ObjectId &id,
+                      PortableServer::Servant &servant);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                                      CORBA::Environment &TAO_IN_ENV);
+  virtual CORBA::ULong system_id_size (void) const;
+  virtual int is_free (const TAO_Active_Object_Map_Entry &item) const;
+
+  typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
+                                  PortableServer::Servant,
+                                  TAO_ObjectId_Hash,
+                                  ACE_Equal_To<PortableServer::ObjectId>,
+                                  ACE_Null_Mutex>
+          Hash_Map;
+
+  typedef Hash_Map::iterator iterator;
 
-  virtual int bind_using_system_id (PortableServer::Servant servant,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
-  // Must be used with SYSTEM_ID policy.
-};
+protected:
+  Hash_Map hash_map_;
+  // Internal hash map.
 
-////////////////////////////////////////////////////////////////////////////////
+  CORBA::ULong counter_;
+  // Internal counter for generating unique ids
+};
 
-class TAO_Id_Hint_Strategy
+class TAO_Export TAO_Dynamic_Hash_Active_Object_Map_Iterator : public TAO_Active_Object_Map_Iterator_Impl
 {
   // = TITLE
-  //     Id uniqueness strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for implementing points of variation between the
-  //     active hint and the no hint policies.
+  //   Iterator for TAO_Dynamic_Hash_Active_Object_Map.
+  //
 public:
+  typedef TAO_Dynamic_Hash_Active_Object_Map::iterator Impl;
 
-  virtual ~TAO_Id_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id) = 0;
+  TAO_Dynamic_Hash_Active_Object_Map_Iterator (const Impl &impl);
+  virtual ~TAO_Dynamic_Hash_Active_Object_Map_Iterator (void);
+  // default copy ctor and dtor
 
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
+  // TAO_Active_Object_Map_Impl methods...
+  virtual TAO_Active_Object_Map_Iterator_Impl *clone (void) const;
+  virtual const TAO_Active_Object_Map_Entry &item (void) const;
+  virtual void advance (void);
+  virtual int done (const TAO_Active_Object_Map_Iterator_Impl *end) const;
 
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
-
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
-
-  virtual size_t hint_size (void) = 0;
+protected:
+  Impl impl_;
 
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry) = 0;
+  TAO_Active_Object_Map_Entry entry_;
 };
 
-////////////////////////////////////////////////////////////////////////////////
+/****************************************************************/
 
-class TAO_Active_Hint_Strategy : public TAO_Id_Hint_Strategy
+class TAO_Export TAO_Array_Active_Object_Map_Iterator : public TAO_Active_Object_Map_Iterator_Impl
 {
   // = TITLE
-  //     Active hint strategy.
   //
-  // = DESCRIPTION
-  //     Strategy for adding active hints to ids.
+  //   Iterator for TAO_Linear_Active_Object_Map and
+  //   TAO_Active_Demux_Active_Object_Map
+  //
 public:
+  TAO_Array_Active_Object_Map_Iterator (TAO_Active_Object_Map_Entry *pos);
+  virtual ~TAO_Array_Active_Object_Map_Iterator (void);
+  // default copy ctor and dtor
 
-  TAO_Active_Hint_Strategy (CORBA::ULong map_size);
+  // TAO_Active_Object_Map_Impl methods...
+  virtual TAO_Active_Object_Map_Iterator_Impl *clone (void) const;
+  virtual const TAO_Active_Object_Map_Entry &item (void) const;
+  virtual void advance (void);
+  virtual int done (const TAO_Active_Object_Map_Iterator_Impl *end) const;
 
-  virtual ~TAO_Active_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
+protected:
+  TAO_Active_Object_Map_Entry *pos_;
+};
 
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
+/****************************************************************/
 
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
+class TAO_Export TAO_Linear_Active_Object_Map : public TAO_Active_Object_Map_Impl
+{
+  // = TITLE
+  //
+  //    Lookup strategy based on a simple linear search.  Not
+  //    efficient, but most likely will always work.
+  //
+  // = DESCRIPTION
+  //
+  //   Uses a dynamic array to store the objects and linear search for
+  //   the lookups.
+  //
+public:
+  TAO_Linear_Active_Object_Map (CORBA::ULong size);
+  virtual ~TAO_Linear_Active_Object_Map (void);
+
+  virtual int find (const PortableServer::Servant servant);
+  virtual int find (const PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
+  virtual int unbind (const PortableServer::ObjectId &id,
+                      PortableServer::Servant &servant);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                                      CORBA::Environment &TAO_IN_ENV);
+  virtual CORBA::ULong system_id_size (void) const;
+  virtual int is_free (const TAO_Active_Object_Map_Entry &item) const;
+  virtual TAO_Active_Object_Map_Iterator_Impl *begin () const;
+  virtual TAO_Active_Object_Map_Iterator_Impl *end () const;
 
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
+protected:
 
-  virtual size_t hint_size (void);
+  enum
+  {
+    // Grow map exponentially up to 64K
+    MAX_EXPONENTIAL = 64 *1024,
 
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
+    // Afterwards grow in chunks of 32K
+    LINEAR_INCREASE = 32 * 1024
+  };
 
-  typedef ACE_Active_Map_Manager_Adapter<
-  PortableServer::ObjectId,
-    TAO_Active_Object_Map::Map_Entry *,
-    TAO_Preserve_Original_Key_Adapter> system_id_map;
+  virtual int resize (void);
 
-  system_id_map system_id_map_;
+  CORBA::ULong next_;
+  CORBA::ULong mapsize_;
+  TAO_Active_Object_Map_Entry *map_;
+  PortableServer::ObjectId empty_id_;
+  CORBA::ULong counter_;
 };
 
-////////////////////////////////////////////////////////////////////////////////
+/****************************************************************/
 
-class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy
+class TAO_Export TAO_Active_Demux_Active_Object_Map : public TAO_Linear_Active_Object_Map
 {
   // = TITLE
-  //     No hint strategy.
+  //
+  //   An active object map lookup strategy based on active
+  //   demultiplexing strategy.
   //
   // = DESCRIPTION
-  //     Strategy for not adding active hints to ids.
+  //
+  //   Use the linear active object map as the base; keys must be the
+  //   string representation of the indices into the array and a
+  //   generation count, so lookups can be done in O(1).
+  //
+  //   Iterators are implemented using pointers on the array.
+  //
 public:
+  TAO_Active_Demux_Active_Object_Map (CORBA::ULong size);
+  // Constructor, including an initial size.
+
+  virtual ~TAO_Active_Demux_Active_Object_Map (void);
+  // Destructor
+
+  // Implement TAO_Dynamic_Hash_Active_Object_Map....
+  virtual int find (const PortableServer::Servant servant);
+  virtual int find (const PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::Servant servant,
+                    PortableServer::ObjectId &id);
+  virtual int find (const PortableServer::ObjectId &id,
+                    PortableServer::Servant &servant);
+  virtual int bind (const PortableServer::ObjectId &id,
+                    PortableServer::Servant servant);
+  virtual int unbind (const PortableServer::ObjectId &id,
+                      PortableServer::Servant &servant);
+  virtual CORBA::ULong system_id_size (void) const;
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                                      CORBA::Environment &TAO_IN_ENV);
 
-  virtual ~TAO_No_Hint_Strategy (void);
-  // Virtual destructor.
-
-  virtual int recover_key (const PortableServer::ObjectId &system_id,
-                           PortableServer::ObjectId &user_id);
-
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
-
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
+protected:
 
-  virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
+  enum
+  {
+    INDEX_FIELD = 0,
+    GENERATION_FIELD = 1
+  };
 
-  virtual size_t hint_size (void);
+  virtual CORBA::ULong next_free (void);
 
-  virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
+  virtual int parse_object_id (const PortableServer::ObjectId &id,
+                               CORBA::ULong &index,
+                               CORBA::ULong &generation);
 };
 
-////////////////////////////////////////////////////////////////////////////////
-
 #if defined (__ACE_INLINE__)
 # include "tao/Active_Object_Map.i"
-#endif /* __ACE_INLINE__ */
+#endif /* ! __ACE_INLINE__ */
 
 #endif /* TAO_ACTIVE_OBJECT_MAP_H */
diff --git a/TAO/tao/Active_Object_Map.i b/TAO/tao/Active_Object_Map.i
index 82d7191f512..73b5edd8f60 100644
--- a/TAO/tao/Active_Object_Map.i
+++ b/TAO/tao/Active_Object_Map.i
@@ -1,252 +1,601 @@
 // $Id$
 
+ACE_INLINE
+TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
+  : id_ (),
+    generation_ (0),
+    servant_ (0),
+    is_free_ (1)
+{
+}
+
+ACE_INLINE
+TAO_Active_Object_Map_Iterator_Impl::~TAO_Active_Object_Map_Iterator_Impl (void)
+{
+}
+
+ACE_INLINE
+TAO_Active_Object_Map_Impl::~TAO_Active_Object_Map_Impl (void)
+{
+}
+
 ACE_INLINE int
-TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant)
+TAO_Active_Object_Map_Impl::find (const PortableServer::ObjectId &id)
 {
-  return this->id_uniqueness_strategy_->is_servant_in_map (servant);
+  PortableServer::Servant servant;
+  return this->find (id, servant);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_id)
+TAO_Active_Object_Map_Impl::find (const PortableServer::Servant servant)
 {
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
-    {
-      if (entry->servant_ == 0)
-        {
-          result = 0;
-        }
-      else
-        {
-          result = 1;
-        }
-    }
-  else
-    {
-      result = 0;
-    }
+  PortableServer::ObjectId id;
+  return this->find (servant, id);
+}
 
-  return result;
+ACE_INLINE
+TAO_Dynamic_Hash_Active_Object_Map::TAO_Dynamic_Hash_Active_Object_Map (CORBA::ULong size)
+  : hash_map_ (size),
+    counter_ (0)
+{
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_system_id (PortableServer::Servant servant,
-                                                                 PortableServer::ObjectId_out system_id)
+TAO_Dynamic_Hash_Active_Object_Map::find (const PortableServer::ObjectId &id,
+                                          PortableServer::Servant &servant)
 {
-  Map_Entry *entry = 0;
+  return this->hash_map_.find (id, servant);
+}
 
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    entry);
+ACE_INLINE int
+TAO_Dynamic_Hash_Active_Object_Map::bind (const PortableServer::ObjectId &id,
+                                          PortableServer::Servant servant)
+{
+  return this->hash_map_.bind (id, servant);
+}
 
-  if (result == 0)
-    {
-      result = this->id_hint_strategy_->system_id (system_id,
-                                                   *entry);
-    }
+ACE_INLINE int
+TAO_Dynamic_Hash_Active_Object_Map::unbind (const PortableServer::ObjectId &id,
+                                            PortableServer::Servant &servant)
+{
+  return this->hash_map_.unbind (id, servant);
+}
 
-  return result;
+ACE_INLINE int
+TAO_Dynamic_Hash_Active_Object_Map::find (const PortableServer::Servant servant)
+{
+  return this->TAO_Active_Object_Map_Impl::find (servant);
+}
+
+ACE_INLINE int
+TAO_Dynamic_Hash_Active_Object_Map::find (const PortableServer::ObjectId &id)
+{
+  return this->TAO_Active_Object_Map_Impl::find (id);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::bind_using_system_id_returning_user_id (PortableServer::Servant servant,
-                                                               PortableServer::ObjectId_out user_id)
+TAO_Dynamic_Hash_Active_Object_Map::find (const PortableServer::Servant servant,
+                                          PortableServer::ObjectId &id)
 {
-  Map_Entry *entry = 0;
+  return this->TAO_Active_Object_Map_Impl::find (servant, id);
+}
 
-  int result = this->id_assignment_strategy_->bind_using_system_id (servant,
-                                                                    entry);
+ACE_INLINE CORBA::ULong
+TAO_Dynamic_Hash_Active_Object_Map::system_id_size (void) const
+{
+  return sizeof (CORBA::ULong);
+}
 
-  if (result == 0)
+ACE_INLINE int
+TAO_Dynamic_Hash_Active_Object_Map::is_free (const TAO_Active_Object_Map_Entry &item) const
+{
+  ACE_UNUSED_ARG (item);
+  return 0;
+}
+
+ACE_INLINE
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::TAO_Dynamic_Hash_Active_Object_Map_Iterator (const Impl &impl)
+  : impl_ (impl)
+{
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl *
+TAO_Dynamic_Hash_Active_Object_Map::begin (void) const
+{
+  TAO_Dynamic_Hash_Active_Object_Map *non_const =
+    ACE_const_cast (TAO_Dynamic_Hash_Active_Object_Map *,
+                    this);
+
+  TAO_Active_Object_Map_Iterator_Impl *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Dynamic_Hash_Active_Object_Map_Iterator (iterator (non_const->hash_map_)),
+                  0);
+  return tmp;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl *
+TAO_Dynamic_Hash_Active_Object_Map::end (void) const
+{
+  return 0;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl*
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::clone (void) const
+{
+  TAO_Active_Object_Map_Iterator_Impl *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Dynamic_Hash_Active_Object_Map_Iterator (*this),
+                  0);
+  return tmp;
+}
+
+ACE_INLINE const TAO_Active_Object_Map_Entry &
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::item (void) const
+{
+  TAO_Active_Object_Map_Entry &entry =
+    ACE_const_cast (TAO_Active_Object_Map_Entry &,
+                    this->entry_);
+  ACE_Hash_Map_Entry<PortableServer::ObjectId, PortableServer::Servant> *tmp;
+
+  if (ACE_const_cast (TAO_Dynamic_Hash_Active_Object_Map_Iterator*,
+                      this)->impl_.next (tmp) == 1)
     {
-      ACE_NEW_RETURN (user_id,
-                      PortableServer::ObjectId (entry->user_id_),
-                      -1);
+      entry.servant_ = tmp->int_id_;
+      entry.id_ = tmp->ext_id_;
     }
 
-  return result;
+  return entry;
+}
+
+ACE_INLINE void
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::advance (void)
+{
+  this->impl_.advance ();
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::bind_using_user_id (PortableServer::Servant servant,
-                                           const PortableServer::ObjectId &user_id)
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::done (const TAO_Active_Object_Map_Iterator_Impl *) const
+{
+  return this->impl_.done ();
+}
+
+ACE_INLINE
+TAO_Array_Active_Object_Map_Iterator::TAO_Array_Active_Object_Map_Iterator (TAO_Active_Object_Map_Entry *pos)
+  : pos_ (pos)
+{
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl *
+TAO_Array_Active_Object_Map_Iterator::clone (void) const
+{
+  TAO_Active_Object_Map_Iterator_Impl *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Array_Active_Object_Map_Iterator (*this),
+                  0);
+  return tmp;
+}
+
+ACE_INLINE const TAO_Active_Object_Map_Entry &
+TAO_Array_Active_Object_Map_Iterator::item (void) const
+{
+  return *this->pos_;
+}
+
+ACE_INLINE void
+TAO_Array_Active_Object_Map_Iterator::advance (void)
 {
-  Map_Entry *entry = 0;
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            entry);
+  ++this->pos_;
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                     PortableServer::ObjectId_out system_id)
+TAO_Array_Active_Object_Map_Iterator::done (const TAO_Active_Object_Map_Iterator_Impl *end) const
 {
-  Map_Entry *entry = 0;
-  int result = this->id_uniqueness_strategy_->bind_using_user_id (0,
-                                                                  user_id,
-                                                                  entry);
-  if (result == 0)
-    {
-      result = this->id_hint_strategy_->system_id (system_id,
-                                                   *entry);
-    }
+  const TAO_Array_Active_Object_Map_Iterator *tmp =
+    ACE_dynamic_cast (const TAO_Array_Active_Object_Map_Iterator*, end);
+  return this->pos_ == tmp->pos_;
+}
 
-  return result;
+ACE_INLINE
+TAO_Linear_Active_Object_Map::TAO_Linear_Active_Object_Map (CORBA::ULong size)
+  : next_ (0),
+    mapsize_ (size),
+    counter_ (0)
+{
+  ACE_NEW (map_,
+           TAO_Active_Object_Map_Entry[this->mapsize_]);
+}
+
+ACE_INLINE
+TAO_Linear_Active_Object_Map::~TAO_Linear_Active_Object_Map (void)
+{
+  delete [] this->map_;
+}
+
+ACE_INLINE int
+TAO_Linear_Active_Object_Map::find (const PortableServer::Servant servant)
+{
+  return this->TAO_Active_Object_Map_Impl::find (servant);
+}
+
+ACE_INLINE int
+TAO_Linear_Active_Object_Map::find (const PortableServer::ObjectId &id)
+{
+  return this->TAO_Active_Object_Map_Impl::find (id);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::rebind_using_user_id_and_system_id (PortableServer::Servant servant,
-                                                           const PortableServer::ObjectId &user_id,
-                                                           const PortableServer::ObjectId &system_id,
-                                                           TAO_Active_Object_Map::Map_Entry *&entry)
+TAO_Linear_Active_Object_Map::find (const PortableServer::Servant servant,
+                                    PortableServer::ObjectId &id)
 {
-  ACE_UNUSED_ARG (system_id);
+  return this->TAO_Active_Object_Map_Impl::find (servant, id);
+}
 
-  return this->id_uniqueness_strategy_->bind_using_user_id (servant,
-                                                            user_id,
-                                                            entry);
+ACE_INLINE CORBA::ULong
+TAO_Linear_Active_Object_Map::system_id_size (void) const
+{
+  return sizeof (CORBA::ULong);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::unbind_using_user_id (const PortableServer::ObjectId &user_id)
+TAO_Linear_Active_Object_Map::is_free (const TAO_Active_Object_Map_Entry &item) const
+{
+  return item.is_free_;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl *
+TAO_Linear_Active_Object_Map::begin (void) const
+{
+  TAO_Active_Object_Map_Iterator_Impl *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Array_Active_Object_Map_Iterator (this->map_),
+                  0);
+  return tmp;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator_Impl *
+TAO_Linear_Active_Object_Map::end (void) const
+{
+  TAO_Active_Object_Map_Iterator_Impl *tmp;
+  ACE_NEW_RETURN (tmp,
+                  TAO_Array_Active_Object_Map_Iterator (this->map_ + this->next_),
+                  0);
+  return tmp;
+}
+
+ACE_INLINE
+TAO_Active_Demux_Active_Object_Map::TAO_Active_Demux_Active_Object_Map (CORBA::ULong size)
+  : TAO_Linear_Active_Object_Map (size)
+{
+}
+
+ACE_INLINE
+TAO_Active_Demux_Active_Object_Map::~TAO_Active_Demux_Active_Object_Map (void)
 {
-  return this->id_uniqueness_strategy_->unbind_using_user_id (user_id);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_servant (PortableServer::Servant servant,
-                                                   PortableServer::ObjectId_out user_id)
+TAO_Active_Demux_Active_Object_Map::find (const PortableServer::Servant servant)
 {
-  return this->id_uniqueness_strategy_->find_user_id_using_servant (servant,
-                                                                    user_id);
+  return this->TAO_Active_Object_Map_Impl::find (servant);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_system_id_using_servant (PortableServer::Servant servant,
-                                                     PortableServer::ObjectId_out system_id)
+TAO_Active_Demux_Active_Object_Map::find (const PortableServer::ObjectId &id)
 {
-  return this->id_uniqueness_strategy_->find_system_id_using_servant (servant,
-                                                                      system_id);
+  return this->TAO_Active_Object_Map_Impl::find (id);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectId &user_id,
-                                                   PortableServer::Servant &servant)
+TAO_Active_Demux_Active_Object_Map::find (const PortableServer::Servant servant,
+                                          PortableServer::ObjectId &id)
+{
+  return this->TAO_Active_Object_Map_Impl::find (servant, id);
+}
+
+ACE_INLINE int
+TAO_Active_Demux_Active_Object_Map::parse_object_id (const PortableServer::ObjectId &id,
+                                                     CORBA::ULong &index,
+                                                     CORBA::ULong &generation)
+{
+  CORBA::ULong id_data[2];
+
+  ACE_OS::memcpy (&id_data,
+                  id.get_buffer (),
+                  sizeof id_data);
+
+  index =
+    id_data[TAO_Active_Demux_Active_Object_Map::INDEX_FIELD];
+  generation =
+    id_data[TAO_Active_Demux_Active_Object_Map::GENERATION_FIELD];
+
+  return 0;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Active_Demux_Active_Object_Map::system_id_size (void) const
 {
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
-  if (result == 0)
+  return 2 * sizeof (CORBA::ULong);
+}
+
+ACE_INLINE
+TAO_Dynamic_Hash_Active_Object_Map::~TAO_Dynamic_Hash_Active_Object_Map (void)
+{
+}
+
+ACE_INLINE
+TAO_Dynamic_Hash_Active_Object_Map_Iterator::~TAO_Dynamic_Hash_Active_Object_Map_Iterator (void)
+{
+}
+
+ACE_INLINE
+TAO_Array_Active_Object_Map_Iterator::~TAO_Array_Active_Object_Map_Iterator (void)
+{
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_Impl::TAO_Reverse_Active_Object_Map_Impl (void)
+{
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_Impl::~TAO_Reverse_Active_Object_Map_Impl (void)
+{
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (size_t size)
+  : map_ (size)
+{
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::~TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (void)
+{
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::bind (PortableServer::Servant servant,
+                                                          const PortableServer::ObjectId &id)
+{
+  return this->map_.bind (servant, id);
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::unbind (PortableServer::Servant servant)
+{
+  return this->map_.unbind (servant);
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::find (const PortableServer::Servant servant,
+                                                          PortableServer::ObjectId &id)
+{
+  return this->map_.find (servant, id);
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy::find (PortableServer::Servant servant)
+{
+  return this->map_.find (servant);
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void)
+{
+}
+
+ACE_INLINE
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::~TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (void)
+{
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::bind (PortableServer::Servant servant,
+                                                            const PortableServer::ObjectId &id)
+{
+  ACE_UNUSED_ARG (servant);
+  ACE_UNUSED_ARG (id);
+
+  // Successful no-op
+  return 0;
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::unbind (PortableServer::Servant servant)
+{
+  ACE_UNUSED_ARG (servant);
+
+  // Successful no-op
+  return 0;
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (const PortableServer::Servant servant,
+                                                            PortableServer::ObjectId &id)
+{
+  ACE_UNUSED_ARG (servant);
+  ACE_UNUSED_ARG (id);
+
+  // Unsuccessful no-op
+  return -1;
+}
+
+ACE_INLINE int
+TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy::find (PortableServer::Servant servant)
+{
+  ACE_UNUSED_ARG (servant);
+
+  // Unsuccessful no-op
+  return -1;
+}
+
+ACE_INLINE
+TAO_Active_Object_Map_Iterator::TAO_Active_Object_Map_Iterator (TAO_Active_Object_Map_Iterator_Impl *impl)
+  : impl_ (impl)
+{
+}
+
+ACE_INLINE
+TAO_Active_Object_Map_Iterator::TAO_Active_Object_Map_Iterator (const TAO_Active_Object_Map_Iterator &x)
+  : impl_ (0)
+{
+  if (x.impl_ != 0)
+    this->impl_ = x.impl_->clone ();
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator &
+TAO_Active_Object_Map_Iterator::operator= (const TAO_Active_Object_Map_Iterator &x)
+{
+  if (this != &x)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
-        {
-          result = -1;
-        }
+      delete this->impl_;
+      if (x.impl_ == 0)
+        this->impl_ = 0;
       else
-        {
-          servant = entry->servant_;
-        }
+        this->impl_ = x.impl_->clone ();
     }
+  return *this;
+}
 
-  return result;
+ACE_INLINE
+TAO_Active_Object_Map_Iterator::~TAO_Active_Object_Map_Iterator (void)
+{
+  delete this->impl_;
+}
+
+ACE_INLINE const TAO_Active_Object_Map_Entry &
+TAO_Active_Object_Map_Iterator::operator *(void) const
+{
+  return this->impl_->item ();
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator
+TAO_Active_Object_Map_Iterator::operator++ (void)
+{
+  TAO_Active_Object_Map_Iterator tmp = *this;
+  this->impl_->advance ();
+  return tmp;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Iterator
+TAO_Active_Object_Map_Iterator::operator++ (int)
+{
+  this->impl_->advance ();
+  return *this;
+}
+
+ACE_INLINE int
+operator== (const TAO_Active_Object_Map_Iterator &l,
+            const TAO_Active_Object_Map_Iterator &r)
+{
+  return l.impl_->done (r.impl_);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
-                                                                 const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
+operator!= (const TAO_Active_Object_Map_Iterator &l,
+            const TAO_Active_Object_Map_Iterator &r)
+{
+  return !(l == r);
+}
+
+ACE_INLINE
+TAO_Active_Object_Map::~TAO_Active_Object_Map (void)
 {
-  return this->lifespan_strategy_->find_servant_using_system_id_and_user_id (system_id,
-                                                                             user_id,
-                                                                             servant,
-                                                                             entry);
+  delete this->impl_;
+  delete this->reverse_impl_;
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 PortableServer::Servant &servant,
-                                                                 PortableServer::ObjectId_out system_id)
+TAO_Active_Object_Map::bind (const PortableServer::ObjectId &id,
+                             PortableServer::Servant servant)
 {
-  Map_Entry *entry = 0;
-  int result = this->user_id_map_->find (user_id,
-                                         entry);
+  int result = this->impl_->bind (id, servant);
+  if (result != 0)
+    {
+      return result;
+    }
 
-  if (result == 0)
+  result = this->reverse_impl_->bind (servant, id);
+  if (result != 0)
     {
-      if (entry->deactivated_)
-        {
-          result = -1;
-        }
-      else if (entry->servant_ == 0)
-        {
-          result = -1;
-        }
-      else
-        {
-          servant = entry->servant_;
-          result = this->id_hint_strategy_->system_id (system_id,
-                                                       *entry);
-        }
+      this->impl_->unbind (id, servant);
     }
 
   return result;
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
+TAO_Active_Object_Map::unbind (const PortableServer::ObjectId &id,
+                               PortableServer::Servant &servant)
 {
-  return this->user_id_map_->find (user_id,
-                                   entry);
+  int result = this->impl_->unbind (id, servant);
+  if (result != 0)
+    return result;
+
+  return this->reverse_impl_->unbind (servant);
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId_out user_id)
+TAO_Active_Object_Map::find (const PortableServer::ObjectId &id,
+                             PortableServer::Servant &servant)
 {
-  PortableServer::ObjectId id;
-  int result = this->id_hint_strategy_->recover_key (system_id,
-                                                     id);
+  return this->impl_->find (id, servant);
+}
 
-  if (result == 0)
+ACE_INLINE int
+TAO_Active_Object_Map::find (const PortableServer::ObjectId &id)
+{
+  return this->impl_->find (id);
+}
+
+ACE_INLINE int
+TAO_Active_Object_Map::find (const PortableServer::Servant servant)
+{
+  if (this->unique_id_policy_)
     {
-      ACE_NEW_RETURN (user_id,
-                      PortableServer::ObjectId (id),
-                      -1);
+      return this->reverse_impl_->find (servant);
+    }
+  else
+    {
+      return this->impl_->find (servant);
     }
-
-  return 0;
 }
 
 ACE_INLINE int
-TAO_Active_Object_Map::find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
-                                                     PortableServer::ObjectId &user_id)
+TAO_Active_Object_Map::find (const PortableServer::Servant servant,
+                             PortableServer::ObjectId &id)
+{
+  if (this->unique_id_policy_)
+    {
+      return this->reverse_impl_->find (servant, id);
+    }
+  else
+    {
+      return this->impl_->find (servant, id);
+    }
+}
+
+ACE_INLINE TAO_Active_Object_Map::iterator
+TAO_Active_Object_Map::begin (void) const
 {
-  return this->id_hint_strategy_->recover_key (system_id,
-                                               user_id);
+  return TAO_Active_Object_Map::iterator (this->impl_->begin ());
 }
 
-ACE_INLINE CORBA::Boolean
-TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant)
+ACE_INLINE TAO_Active_Object_Map::iterator
+TAO_Active_Object_Map::end (void) const
 {
-  return this->id_uniqueness_strategy_->remaining_activations (servant);
+  return TAO_Active_Object_Map::iterator (this->impl_->end ());
 }
 
-ACE_INLINE size_t
-TAO_Active_Object_Map::current_size (void)
+ACE_INLINE PortableServer::ObjectId *
+TAO_Active_Object_Map::create_object_id (PortableServer::Servant servant,
+                                         CORBA::Environment &TAO_IN_ENV)
 {
-  return this->user_id_map_->current_size ();
+  return this->impl_->create_object_id (servant, TAO_IN_ENV);
 }
 
-/* static */
-ACE_INLINE size_t
-TAO_Active_Object_Map::system_id_size (void)
+ACE_INLINE CORBA::ULong
+TAO_Active_Object_Map::system_id_size (void) const
 {
-  return TAO_Active_Object_Map::system_id_size_;
+  return this->impl_->system_id_size ();
 }
diff --git a/TAO/tao/Align.h b/TAO/tao/Align.h
new file mode 100644
index 00000000000..f1b75a7c0b5
--- /dev/null
+++ b/TAO/tao/Align.h
@@ -0,0 +1,84 @@
+// This may look like C, but it's really -*- C++ -*-
+// @(#) $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    Align.h
+//
+// = DESCRIPTION
+//    Pointer alignment utilities
+//
+//    A "ptr_arith_t" type is defined for doing numerical operations
+//    on pointers, such as aligning them.  Pointer sizes vary from 2
+//    to 8 bytes in today's environments; a portable data type is much
+//    needed.
+//
+// = AUTHOR
+//     Copyright 1994-1995 by Sun Microsystems, Inc.
+//
+// ============================================================================
+
+#ifndef TAO_ALIGN_H
+#define TAO_ALIGN_H
+
+// Type for doing arithmetic on pointers ... as elsewhere, we assume
+// that "unsigned" versions of a type are the same size as the
+// "signed" version of the same type.
+
+#if     ACE_SIZEOF_VOID_P == ACE_SIZEOF_INT
+typedef u_int ptr_arith_t;
+
+#elif   ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG
+typedef u_long ptr_arith_t;
+
+#elif   ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
+typedef u_long long ptr_arith_t;
+
+#else
+#       error "Can't find a suitable type for doing pointer arithmetic."
+#endif /* error */
+
+// Efficiently align "value" up to "alignment", knowing that all such
+// boundaries are binary powers and that we're using two's complement
+// arithmetic.
+
+// Since the alignment is a power of two its binary representation is:
+//    alignment      = 0...010...0
+//
+// hence
+//
+//    alignment - 1  = 0...001...1 = T1
+//
+// so the complement is:
+//
+//  ~(alignment - 1) = 1...110...0 = T2
+//
+// Notice that there is a multiple of <alignment> in the range
+// [<value>,<value> + T1], also notice that if
+//
+// X = ( <value> + T1 ) & T2
+//
+// then
+//
+// <value> <= X <= <value> + T1
+//
+// because the & operator only changes the last bits, and since X is a
+// multiple of <alignment> (its last bits are zero) we have found the
+// multiple we wanted.
+//
+
+#define align_binary(ptr, alignment) \
+    ((ptr + ((ptr_arith_t)((alignment)-1))) & (~((ptr_arith_t)((alignment)-1))))
+
+// Efficiently round "ptr" up to an "alignment" boundary, knowing that
+// all such boundaries are binary powers and that we're using two's
+// complement arithmetic.
+//
+#define ptr_align_binary(ptr, alignment) \
+        ((char *) align_binary (((ptr_arith_t) (ptr)), (alignment)))
+
+#endif /* TAO_ALIGN_H */
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index a620a4a57c0..d41dc48b301 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -60,7 +60,7 @@ CORBA_Any::type (CORBA::TypeCode_ptr tc,
     }
   else
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
     }
 }
 
@@ -70,7 +70,10 @@ CORBA_Any::type (CORBA::TypeCode_ptr tc,
 const void *
 CORBA_Any::value (void) const
 {
-  return this->value_;
+  if (this->any_owns_data_)
+    return this->value_;
+  else
+    return this->cdr_;
 }
 
 // Default "Any" constructor -- initializes to nulls per the
@@ -114,12 +117,11 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr tc,
 
 // Constructor using a message block.
 CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr type,
-                      CORBA::UShort,
                       const ACE_Message_Block* mb)
   : type_ (CORBA::TypeCode::_duplicate (type)),
     value_ (0),
     cdr_ (ACE_Message_Block::duplicate (mb)),
-    any_owns_data_ (0)
+    any_owns_data_ (1)
 {
 }
 
@@ -127,7 +129,7 @@ CORBA_Any::CORBA_Any (CORBA::TypeCode_ptr type,
 CORBA_Any::CORBA_Any (const CORBA_Any &src)
   : value_ (0),
     cdr_ (0),
-    any_owns_data_ (0)
+    any_owns_data_ (1)
 {
   if (src.type_ != 0)
     this->type_ = CORBA::TypeCode::_duplicate (src.type_);
@@ -169,7 +171,7 @@ CORBA_Any::operator= (const CORBA_Any &src)
     this->type_ = CORBA::TypeCode::_duplicate (src.type_);
   else
     this->type_ = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-  this->any_owns_data_ = 0;
+  this->any_owns_data_ = 1;
 
   this->cdr_ = ACE_Message_Block::duplicate (src.cdr_);
   // Simply duplicate the cdr string here.  We can save the decode operation
@@ -203,16 +205,14 @@ void
 CORBA_Any::replace (CORBA::TypeCode_ptr tc,
                     const void *value,
                     CORBA::Boolean any_owns_data,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &env)
 {
   // Decrement the refcount on the Message_Block we hold, it does not
   // matter if we own the data or not, because we always own the
   // message block (i.e. it is always cloned or duplicated).
   ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
 
- this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
+  this->free_value (env);
 
   // Duplicate tc and then release this->type_, just in case tc and
   // type_ are the same thing.
@@ -220,18 +220,17 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
   CORBA::release (this->type_);
   this->type_ = tmp;
 
+  this->value_ = ACE_const_cast(void *, value);
+  this->any_owns_data_ = any_owns_data;
+  this->cdr_ = 0;
+
   // NW: I think an Any should alway owns the CDR stream, so I removed the
   //     check here.
   // if the Any owns the data, we encode the "value" into a CDR stream and
   // store it. We also destroy the "value" since we own it.
   TAO_OutputCDR stream;
-  stream.encode (tc, value, 0, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = ACE_const_cast(void *, value);
-  this->any_owns_data_ = any_owns_data;
-  this->cdr_ = 0;
 
+  stream.encode (tc, value, 0, env);
   // retrieve the start of the message block chain and duplicate it
   this->cdr_ = ACE_Message_Block::duplicate (stream.begin ());
 }
@@ -239,6 +238,7 @@ CORBA_Any::replace (CORBA::TypeCode_ptr tc,
 void
 CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
                          const ACE_Message_Block *mb,
+                         CORBA::Boolean any_owns_data,
                          CORBA::Environment &env)
 {
   // Decrement the refcount on the Message_Block we hold, it does not
@@ -255,63 +255,12 @@ CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
   CORBA::release (this->type_);
   this->type_ = tmp;
 
-  this->any_owns_data_ = 0;
-
-  this->cdr_ = ACE_Message_Block::duplicate (mb);
-  // We can save the decode operation
-  // if there's no need to extract the object.
- }
-
-void
-CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                         const ACE_Message_Block *mb,
-                         CORBA::Boolean any_owns_data,
-                         void* value,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  // Decrement the refcount on the Message_Block we hold, it does not
-  // matter if we own the data or not, because we always own the
-  // message block (i.e. it is always cloned or duplicated).
-  ACE_Message_Block::release (this->cdr_);
-  this->cdr_ = 0;
-
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = value;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
   this->any_owns_data_ = any_owns_data;
-
-  this->cdr_ = ACE_Message_Block::duplicate (mb);
+  
+  this->cdr_ = mb->duplicate ();
   // We can save the decode operation
   // if there's no need to extract the object.
-}
-
-void
-CORBA_Any::_tao_replace (CORBA::TypeCode_ptr tc,
-                         CORBA::Boolean any_owns_data,
-                         void* value,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  this->free_value (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->value_ = value;
-
-  // Duplicate tc and then release this->type_, just in case tc and
-  // type_ are the same thing.
-  CORBA::TypeCode_ptr tmp = CORBA::TypeCode::_duplicate (tc);
-  CORBA::release (this->type_);
-  this->type_ = tmp;
-
-  this->any_owns_data_ = any_owns_data;
-}
+ }
 
 // Free internal data.
 void
@@ -340,7 +289,7 @@ CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc)
                  env);
 }
 
-// insertion of CORBA object - copying
+// insertion of CORBA object
 void
 CORBA::Any::operator<<= (const CORBA::Object_ptr obj)
 {
@@ -348,7 +297,6 @@ CORBA::Any::operator<<= (const CORBA::Object_ptr obj)
   (*this) <<= &objptr;
 }
 
-// insertion of CORBA object - non-copying
 void
 CORBA::Any::operator<<= (CORBA::Object_ptr *objptr)
 {
@@ -814,16 +762,6 @@ CORBA_Any::operator>>= (to_object obj) const
   return 0;
 }
 
-// this is a copying version for unbounded strings
-// Not inline, to avoid use in Any.i before definition in ORB.i.
-void
-CORBA_Any::operator<<= (const char* s)
-{
-  CORBA::Environment env;
-  this->replace (CORBA::_tc_string, new char* (CORBA::string_dup (s)),
-                 1, env);
-}
-
 // ----------------------------------------------------------------------
 // Any_var type
 // ----------------------------------------------------------------------
@@ -845,7 +783,7 @@ CORBA::Any_var &
 CORBA_Any_var::operator= (const CORBA::Any_var& r)
 {
   if (this->ptr_ != 0)
-    delete this->ptr_;
+  delete this->ptr_;
 
   this->ptr_ = new CORBA::Any (*r.ptr_);
   return *this;
@@ -857,7 +795,7 @@ CORBA_Any_var::operator= (const CORBA::Any_var& r)
 // supported only for standard data types.
 
 void
-CORBA_Any::dump (const CORBA::Any &any_value)
+CORBA_Any::dump (const CORBA::Any any_value)
 {
   CORBA::Environment env;
 
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 4401d05fd27..e4e6318527b 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -20,7 +20,6 @@
 
 #include "tao/CDR.h"
 #include "tao/Environment.h"
-#include "tao/Object.h"
 
 class TAO_Export CORBA_Any
 {
@@ -75,12 +74,9 @@ public:
 
   // = TAO extension
   CORBA_Any (CORBA::TypeCode_ptr type,
-             CORBA::UShort dummy,
              const ACE_Message_Block* mb);
-  // Constructor. Used by DynAny and others to optimize Any
-  // activities by using CDR. The dummy arg is to keep calls
-  // like CORBA_Any foo (CORBA::TypeCode_ptr bar (NULL), NULL) from
-  // being confused with the constructor above.
+  // Constructor. Used by DynAny to compose/decompose 
+  // complex types using a CDR.
 
   CORBA_Any (const CORBA_Any &a);
   // Copy constructor.
@@ -121,10 +117,7 @@ public:
   // insert a double
 
   void operator<<= (const CORBA_Any&);
-  // insert an Any, copying
-
-  void operator<<= (CORBA_Any_ptr);
-  // insert an Any, non-copying
+  // insert an Any
 
   void operator<<= (const char*);
   // insert unbounded strings
@@ -136,7 +129,7 @@ public:
   // insert an object reference, copying.
 
   void operator<<= (CORBA::Object_ptr *);
-  // insert an object reference, non-copying.  Any assumes the ownership
+  // insert an object reference, non-copying.  Any assume the ownership
   // of the object.
 
   // =type safe extraction
@@ -177,11 +170,11 @@ public:
   // = Special types.
 
   // These are needed for insertion and extraction of booleans,
-  // octets, chars, and bounded strings. CORBA spec requires
+  // octets, chars, and bounded strings. CORBA spec requires 
   // that they be here, we just typedef to the already-defined
   // ACE_OutputCDR types.
 
-  typedef ACE_OutputCDR::from_boolean from_boolean;
+  typedef ACE_OutputCDR::from_boolean from_boolean;  
   typedef ACE_OutputCDR::from_octet from_octet;
   typedef ACE_OutputCDR::from_char from_char;
   typedef ACE_OutputCDR::from_wchar from_wchar;
@@ -216,9 +209,7 @@ public:
   // This one's not in ACE.
   struct TAO_Export to_object
   {
-    // This signature reflects the change seet out in
-    // issue 154 of the 1.3 RTF.
-    to_object (CORBA_Object_out obj);
+    to_object (CORBA::Object_ptr &obj);
     CORBA::Object_ptr &ref_;
   };
 
@@ -249,14 +240,14 @@ public:
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
                 CORBA::Boolean any_owns_data,
-                CORBA_Environment &TAO_IN_ENV =
+                CORBA_Environment &TAO_IN_ENV = 
                   CORBA::default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe.
 
   void replace (CORBA::TypeCode_ptr type,
                 const void *value,
-                CORBA_Environment &TAO_IN_ENV =
+                CORBA_Environment &TAO_IN_ENV = 
                   CORBA::default_environment ());
   // Replace the current typecode and data with the specified one -
   // unsafe. This uses a default value for the "any_owns_data" parameter
@@ -265,7 +256,7 @@ public:
   // Return TypeCode of the element stored in the Any.
 
   void type (CORBA::TypeCode_ptr type,
-             CORBA_Environment &TAO_IN_ENV =
+             CORBA_Environment &TAO_IN_ENV = 
                CORBA::default_environment ());
   // For use along with <<= of a value of aliased type when the alias must
   // be preserved.
@@ -278,7 +269,7 @@ public:
 
   // = Debugging method.
 
-  static void dump (const CORBA::Any &any_value);
+  static void dump (const CORBA::Any any_value);
   // Prints the type and the value of the any value. Dumping is
   // supported only for standard data types.
 
@@ -295,30 +286,10 @@ public:
 
   void _tao_replace (CORBA::TypeCode_ptr,
                      const ACE_Message_Block *mb,
-                     CORBA::Environment &TAO_IN_ENV =
-                       CORBA::default_environment ());
-  // Replace via message block instead of <value_>.
-
-  void _tao_replace (CORBA::TypeCode_ptr type,
-                     const ACE_Message_Block *mb,
                      CORBA::Boolean any_owns_data,
-                     void* value,
-                     CORBA::Environment &TAO_IN_ENV =
+                     CORBA::Environment &TAO_IN_ENV = 
                        CORBA::default_environment ());
-  // Replace all the contents of the any, used in the <<= operators.
-
-  void _tao_replace (CORBA::TypeCode_ptr type,
-                     CORBA::Boolean any_owns_data,
-                     void* value,
-                     CORBA::Environment &TAO_IN_ENV =
-                       CORBA::default_environment ());
-  // Replace the value of the Any, used in the >>= operators.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Any_ptr _ptr_type;
-  typedef CORBA_Any_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
+  // Replace via message block instead of <value_>.
 
 protected:
   void free_value (CORBA::Environment &TAO_IN_ENV);
@@ -341,7 +312,7 @@ private:
   void operator<<= (unsigned char);
   CORBA::Boolean operator>>= (unsigned char&) const;
 
-  friend class TAO_Stub;
+  friend class STUB_Object;
   friend class TAO_Marshal_Any;
   friend class CORBA_NVList;
 };
@@ -402,7 +373,7 @@ class TAO_Export CORBA_Any_out
   //   CORBA_Any_out
   //
   // = DESCRIPTION
-  //   The _out class for CORBA_Any. This is used to help in
+  //   The _out class for CORBA_Any. This is used to help in 
   //   managing the out parameters.
 public:
   // = operations.
@@ -431,8 +402,6 @@ public:
   CORBA_Any *& ptr (void);
   // return underlying instance
 
-  CORBA_Any *operator-> (void);
-
 private:
   CORBA_Any *&ptr_;
   // Instance
@@ -443,83 +412,6 @@ private:
 
 #if defined (__ACE_INLINE__)
 # include "tao/Any.i"
-#else
-
-// Copying versions of insertion 
-// operators which are defined as members of the Any class
-// must also be defined for Any_var.
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Short);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::UShort);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Long);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::ULong);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::LongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::ULongLong);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Float);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Double);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    const CORBA_Any&);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    const char*);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::TypeCode_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    const CORBA::Object_ptr);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Any::from_boolean);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Any::from_char);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Any::from_wchar);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Any::from_octet);
-extern TAO_Export void operator<<= (CORBA_Any_var, 
-                                    CORBA::Any::from_string);
-
-// These are not required by the spec, but will make users
-// of other ORBs that are used to them more comfortable.
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Short&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::UShort&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Long&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::ULong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::LongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::ULongLong&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Float&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Double&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA_Any&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::TypeCode_ptr&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              char*&);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_boolean);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_octet);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_char);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_wchar);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_string);
-extern TAO_Export CORBA::Boolean operator>>= (CORBA_Any_var, 
-                                              CORBA::Any::to_object);
-
 #endif /* __ACE_INLINE__ */
 
 #endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
index e90463f0307..132b7e81123 100644
--- a/TAO/tao/Any.i
+++ b/TAO/tao/Any.i
@@ -1,5 +1,5 @@
-// This may look like C, but it's really -*- C++ -*-
 // $Id$
+// This may look like C, but it's really -*- C++ -*-
 
 // Insertion from special types.
 
@@ -13,18 +13,6 @@ CORBA_Any::replace (CORBA::TypeCode_ptr type,
   this->replace (type, value, 0, TAO_IN_ENV);
 }
 
-ACE_INLINE CORBA::Boolean
-CORBA_Any::any_owns_data (void) const
-{
-  return (this->any_owns_data_ != 0 && this->value_ != 0);
-}
-
-ACE_INLINE ACE_Message_Block*
-CORBA_Any::_tao_get_cdr (void) const
-{
-  return this->cdr_;
-}
-
 // insertion operators
 
 ACE_INLINE void
@@ -83,7 +71,6 @@ CORBA_Any::operator<<= (CORBA::Double d)
   this->replace (CORBA::_tc_double, new CORBA::Double (d), 1, env);
 }
 
-// insertion of Any - copying
 ACE_INLINE void
 CORBA_Any::operator<<= (const CORBA_Any& a)
 {
@@ -91,18 +78,19 @@ CORBA_Any::operator<<= (const CORBA_Any& a)
   this->replace (CORBA::_tc_any, new CORBA_Any (a), 1, env);
 }
 
-// insertion of Any - non-copying
+// this is a copying version for unbounded strings
 ACE_INLINE void
-CORBA::Any::operator<<= (CORBA::Any_ptr anyptr)
+CORBA_Any::operator<<= (const char* s)
 {
   CORBA::Environment env;
-  this->replace (CORBA::_tc_any, anyptr, 1, env);
+  this->replace (CORBA::_tc_string, new char* (CORBA::string_dup (s)),
+                 1, env);
 }
 
 // implementing the special types
 ACE_INLINE
-CORBA_Any::to_object::to_object (CORBA_Object_out obj)
-  : ref_ (obj.ptr ())
+CORBA_Any::to_object::to_object (CORBA::Object_ptr &obj)
+  : ref_ (obj)
 {
 }
 
@@ -138,9 +126,9 @@ CORBA_Any::operator<<= (from_wchar wc)
                  1, env);
 }
 
-// *************************************************************
-// Inline operations for class CORBA_Any_var
-// *************************************************************
+// ----------------------------------------------------------------------
+// CORBA_Any_var type
+// ----------------------------------------------------------------------
 
 ACE_INLINE
 CORBA_Any_var::CORBA_Any_var (void)
@@ -212,221 +200,9 @@ CORBA_Any_var::_retn (void)
   return temp;
 }
 
-// *************************************************************
-// CORBA_Any_var insertion operators
-// *************************************************************
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Short rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::UShort rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Long rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::ULong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::LongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::ULongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Float rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Double rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, const CORBA_Any& rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, const char* rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::TypeCode_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, const CORBA::Object_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Any::from_boolean rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Any::from_char rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Any::from_wchar rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Any::from_octet rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA_Any_var lhs, CORBA::Any::from_string rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-// *************************************************************
-// CORBA_Any_var extraction operators
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Short &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::UShort &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Long &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::ULong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::LongLong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::ULongLong &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Float &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Double &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA_Any &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::TypeCode_ptr &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, char* &rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_boolean rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_octet rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_char rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_wchar rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_string rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (CORBA_Any_var lhs, CORBA::Any::to_object rhs)
-{
-  return lhs.inout () >>= rhs;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Any_out
-// *************************************************************
+// ----------------------------------------------------------------------
+// CORBA_Any_out type
+// ----------------------------------------------------------------------
 
 ACE_INLINE
 CORBA_Any_out::CORBA_Any_out (CORBA_Any *&s)
@@ -480,8 +256,14 @@ CORBA_Any_out::ptr (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_Any *
-CORBA_Any_out::operator-> (void)
+ACE_INLINE CORBA::Boolean
+CORBA_Any::any_owns_data (void) const
 {
-  return this->ptr_;
+  return (this->any_owns_data_ != 0 && this->value_ != 0);
+}
+
+ACE_INLINE ACE_Message_Block*
+CORBA_Any::_tao_get_cdr (void) const
+{
+  return this->cdr_;
 }
diff --git a/TAO/tao/CDR.cpp b/TAO/tao/CDR.cpp
index cff14316911..407d04cbbcc 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -31,7 +31,7 @@
 // THREADING NOTE: "CDR" is a data structure which must be protected
 // by external critical sections.
 
-#include "tao/Timeprobe.h"
+#include "ace/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/singletons.h"
@@ -46,24 +46,24 @@ ACE_RCSID(tao, CDR, "$Id$")
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_CDR_Timeprobe_Description[] =
-  {
-    "OutputCDR::ctor[1] - enter",
-    "OutputCDR::ctor[1] - leave",
-    "OutputCDR::ctor[2] - enter",
-    "OutputCDR::ctor[2] - leave",
-    "OutputCDR::ctor[3] - enter",
-    "OutputCDR::ctor[3] - leave"
-  };
+{
+  "OutputCDR::ctor[1] - enter",
+  "OutputCDR::ctor[1] - leave",
+  "OutputCDR::ctor[2] - enter",
+  "OutputCDR::ctor[2] - leave",
+  "OutputCDR::ctor[3] - enter",
+  "OutputCDR::ctor[3] - leave"
+};
 
 enum
-  {
-    TAO_OUTPUT_CDR_CTOR1_ENTER = 2000,
-    TAO_OUTPUT_CDR_CTOR1_LEAVE,
-    TAO_OUTPUT_CDR_CTOR2_ENTER,
-    TAO_OUTPUT_CDR_CTOR2_LEAVE,
-    TAO_OUTPUT_CDR_CTOR3_ENTER,
-    TAO_OUTPUT_CDR_CTOR3_LEAVE
-  };
+{
+  TAO_OUTPUT_CDR_CTOR1_ENTER = 2000,
+  TAO_OUTPUT_CDR_CTOR1_LEAVE,
+  TAO_OUTPUT_CDR_CTOR2_ENTER,
+  TAO_OUTPUT_CDR_CTOR2_LEAVE,
+  TAO_OUTPUT_CDR_CTOR3_ENTER,
+  TAO_OUTPUT_CDR_CTOR3_LEAVE
+};
 
 
 // Setup Timeprobes
@@ -78,13 +78,13 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_CDR_Timeprobe_Description,
 
 TAO_OutputCDR::TAO_OutputCDR (size_t size,
                               int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
+			                        ACE_Allocator *buffer_allocator,
+			                        ACE_Allocator *data_block_allocator,
                               size_t memcpy_tradeoff)
   :  ACE_OutputCDR (size,
         byte_order,
-        buffer_allocator
-          ? buffer_allocator
+        buffer_allocator 
+          ? buffer_allocator 
           : TAO_ORB_Core_instance ()->output_cdr_buffer_allocator (),
         data_block_allocator
           ? data_block_allocator
@@ -96,17 +96,17 @@ TAO_OutputCDR::TAO_OutputCDR (size_t size,
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR1_ENTER);
 }
 
-TAO_OutputCDR::TAO_OutputCDR (char *data,
+TAO_OutputCDR::TAO_OutputCDR (char *data, 
                               size_t size,
                               int byte_order,
-                              ACE_Allocator *buffer_allocator,
-                              ACE_Allocator *data_block_allocator,
+			                        ACE_Allocator *buffer_allocator,
+			                        ACE_Allocator *data_block_allocator,
                               size_t memcpy_tradeoff)
   :  ACE_OutputCDR (data,
         size,
         byte_order,
-        buffer_allocator
-          ? buffer_allocator
+        buffer_allocator 
+          ? buffer_allocator 
           : TAO_ORB_Core_instance ()->output_cdr_buffer_allocator (),
         data_block_allocator
           ? data_block_allocator
@@ -126,25 +126,29 @@ TAO_OutputCDR::TAO_OutputCDR (ACE_Message_Block *data,
         memcpy_tradeoff
           ? memcpy_tradeoff
           : TAO_ORB_Core_instance ()->orb_params ()->cdr_memcpy_tradeoff ())
-{
+{ 
   ACE_FUNCTION_TIMEPROBE (TAO_OUTPUT_CDR_CTOR3_ENTER);
 }
 
+TAO_OutputCDR::~TAO_OutputCDR (void)
+{
+}
+
 CORBA::TypeCode::traverse_status
 TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc,
                        const void *data,
                        const void *data2,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_IN_ENV)
 {
   TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc, 
+                                                           TAO_IN_ENV);
+  TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (!mobj)
     return CORBA::TypeCode::TRAVERSE_STOP;
 
-  return mobj->encode (tc, data, data2, this, ACE_TRY_ENV);
+  return mobj->encode (tc, data, data2, this, TAO_IN_ENV);
 }
 
 CORBA::Boolean
@@ -152,80 +156,157 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Any &x)
 {
   // @@ This function should *not* use the interpreter, there must be
   // a way to do this with just CDR operations!!!!
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->encode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        TAO_MARSHAL_ANY::instance ()->encode (0, 
+                                              &x, 
+                                              0, 
+                                              &cdr, 
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (status== CORBA::TypeCode::TRAVERSE_CONTINUE)
         return 1;
       // else return 0 at the end of the function
     }
-  ACE_CATCH (CORBA_Exception, ex)
+  TAO_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  TAO_ENDTRY;
+  return 0;
+}
+
+CORBA::Boolean
+operator<< (TAO_OutputCDR& cdr, const CORBA::Object *x)
+{
+  TAO_TRY
+    {
+      // @@ This function should *not* use the interpreter, there must
+      // be a way to do this with just CDR operations!!!!
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_OBJREF::instance ()->encode (0, 
+                                                 &x, 
+                                                 0, 
+                                                 &cdr, 
+                                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 1;
+      // else return 0 at the end of the function
+    }
+  TAO_CATCH (CORBA_Exception, ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 CORBA::Boolean
 operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // @@ This function should *not* use the interpreter, there must
       // be a way to do this with just CDR operations!!!!
       CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->encode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        TAO_MARSHAL_TYPECODE::instance ()->encode (0, 
+                                                   &x, 
+                                                   0, 
+                                                   &cdr, 
+                                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (status == CORBA::TypeCode::TRAVERSE_CONTINUE)
         return 1;
       // else return 0 at the end of the function
     }
-  ACE_CATCH (CORBA_Exception, ex)
+  TAO_CATCH (CORBA_Exception, ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
   return 0;
 }
 
 CORBA::TypeCode::traverse_status
 TAO_OutputCDR::append (CORBA::TypeCode_ptr tc,
                        TAO_InputCDR *src,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &TAO_IN_ENV)
 {
   TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc, 
+                                                           TAO_IN_ENV);
+  TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (mobj == 0)
     return CORBA::TypeCode::TRAVERSE_STOP;
 
-  return mobj->append (tc, src, this, ACE_TRY_ENV);
+  return mobj->append (tc, src, this, TAO_IN_ENV);
 }
 
 // ****************************************************************
 
+TAO_InputCDR::TAO_InputCDR (const char *buf, 
+                            size_t bufsiz,
+                            int byte_order)
+  : ACE_InputCDR (buf,
+                  bufsiz,
+                  byte_order)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
+                            int byte_order)
+  : ACE_InputCDR (bufsiz,
+                  byte_order)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (ACE_Message_Block *data,
+                            int byte_order)
+  : ACE_InputCDR (data,
+                  byte_order)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
+                            int byte_order)
+  : ACE_InputCDR (data,
+                  byte_order)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
+                            size_t size,
+                            CDR::Long offset)
+  : ACE_InputCDR (rhs,
+                  size,
+                  offset)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
+                            size_t size)
+  : ACE_InputCDR (rhs,
+                  size)
+{
+}
+
+TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs)
+  : ACE_InputCDR (rhs)
+{
+}
+
 TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
                             ACE_Allocator* buffer_allocator,
-                            ACE_Allocator* data_block_allocator,
-                            TAO_ORB_Core* orb_core)
+                            ACE_Allocator* data_block_allocator)
   : ACE_InputCDR (rhs,
         buffer_allocator
-          ? buffer_allocator
+          ? buffer_allocator 
           : TAO_ORB_Core_instance ()->output_cdr_buffer_allocator (),
         data_block_allocator
           ? data_block_allocator
@@ -233,59 +314,88 @@ TAO_InputCDR::TAO_InputCDR (const TAO_OutputCDR& rhs,
 {
 }
 
+TAO_InputCDR::~TAO_InputCDR (void)
+{
+}
+
 CORBA::TypeCode::traverse_status
 TAO_InputCDR::decode (CORBA::TypeCode_ptr tc,
                       const void *data,
                       const void *data2,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &TAO_IN_ENV)
 {
   TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc, 
+                                                           TAO_IN_ENV);
+  TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (!mobj)
     return CORBA::TypeCode::TRAVERSE_STOP;
 
-  return mobj->decode (tc, data, data2, this, ACE_TRY_ENV);
+  return mobj->decode (tc, data, data2, this, TAO_IN_ENV);
 }
 
 CORBA::TypeCode::traverse_status
 TAO_InputCDR::skip (CORBA::TypeCode_ptr tc,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &TAO_IN_ENV)
 {
   TAO_Marshal_Object *mobj =
-    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+    TAO_MARSHAL_FACTORY::instance ()->make_marshal_object (tc, 
+                                                           TAO_IN_ENV);
+  TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
 
   if (mobj == 0)
     return CORBA::TypeCode::TRAVERSE_STOP;
 
-  return mobj->skip (tc, this, ACE_TRY_ENV);
+  return mobj->skip (tc, this, TAO_IN_ENV);
 }
 
 CORBA::Boolean
 operator>> (TAO_InputCDR& cdr, CORBA::Any &x)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_ANY::instance ()->decode (0,
-                                              &x,
-                                              0,
-                                              &cdr,
-                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        TAO_MARSHAL_ANY::instance ()->decode (0, 
+                                              &x, 
+                                              0, 
+                                              &cdr, 
+                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
         return 0;
     }
-  ACE_CATCH (CORBA_Exception, ex)
+  TAO_CATCH (CORBA_Exception, ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
+
+  return 1;
+}
+
+CORBA::Boolean
+operator>> (TAO_InputCDR& cdr, CORBA::Object *&x)
+{
+  TAO_TRY
+    {
+      CORBA::TypeCode::traverse_status status =
+        TAO_MARSHAL_OBJREF::instance ()->decode (0, 
+                                                 &x, 
+                                                 0, 
+                                                 &cdr, 
+                                                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 0;
+    }
+  TAO_CATCH (CORBA_Exception, ex)
+    {
+      return 0;
+    }
+  TAO_ENDTRY;
 
   return 1;
 }
@@ -293,24 +403,25 @@ operator>> (TAO_InputCDR& cdr, CORBA::Any &x)
 CORBA::Boolean
 operator>> (TAO_InputCDR& cdr, CORBA::TypeCode *&x)
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::TypeCode::traverse_status status =
-        TAO_MARSHAL_TYPECODE::instance ()->decode (0,
-                                                   &x,
-                                                   0,
-                                                   &cdr,
-                                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        TAO_MARSHAL_TYPECODE::instance ()->decode (0, 
+                                                   &x, 
+                                                   0, 
+                                                   &cdr, 
+                                                   TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
         return 0;
     }
-  ACE_CATCH (CORBA_Exception, ex)
+  TAO_CATCH (CORBA_Exception, ex)
     {
       return 0;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 1;
 }
+
diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h
index 0a100768379..4d7721a6b66 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -47,8 +47,6 @@
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
 
-class TAO_ORB_Core;
-
 class TAO_Export TAO_OutputCDR : public ACE_OutputCDR
 {
   //
@@ -87,7 +85,7 @@ public:
   // Default constructor, allocates <size> bytes in the internal
   // buffer, if <size> == 0 it allocates the default size.
 
-  TAO_OutputCDR (char *data,
+  TAO_OutputCDR (char *data, 
                  size_t size,
                  int byte_order = ACE_CDR_BYTE_ORDER,
                  ACE_Allocator* buffer_allocator = 0,
@@ -107,7 +105,7 @@ public:
 
   CORBA::TypeCode::traverse_status append (CORBA::TypeCode_ptr tc,
       TAO_InputCDR *src,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV = 
         CORBA::default_environment ());
   // Append the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <TAO_IN_ENV>.
@@ -120,7 +118,7 @@ public:
   CORBA::TypeCode::traverse_status encode (CORBA::TypeCode_ptr tc,
       const void *data,
       const void *,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV = 
         CORBA::default_environment ());
   // Marshalls the contents of <data> as described by the TypeCode in
   // <tc>. Any errors are reported though the <TAO_IN_ENV> parameter.
@@ -157,28 +155,24 @@ public:
   friend class TAO_GIOP;
   // This class is able to "read" an InputCDR from a socket.
 
-  TAO_InputCDR (const char* buf,
+  TAO_InputCDR (const char* buf, 
                 size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
+                int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an input stream from an arbitrary buffer, care must be
   // exercised wrt alignment, because this contructor will *not* work
   // if the buffer is unproperly aligned.
 
   TAO_InputCDR (size_t bufsiz,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
+                int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an empty input stream. The caller is responsible for
   // putting the right data and providing the right alignment.
 
-  TAO_InputCDR (const ACE_Message_Block *data,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
+  TAO_InputCDR (ACE_Message_Block *data,
+                int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an input stream from an ACE_Message_Block
 
   TAO_InputCDR (ACE_Data_Block *data,
-                int byte_order = ACE_CDR_BYTE_ORDER,
-                TAO_ORB_Core* orb_core = 0);
+                int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an input stream from an ACE_Data_Block
 
   TAO_InputCDR (const TAO_InputCDR& rhs);
@@ -188,7 +182,7 @@ public:
 
   TAO_InputCDR (const TAO_InputCDR& rhs,
                 size_t size,
-                ACE_CDR::Long offset);
+                CDR::Long offset);
   // When interpreting indirected TypeCodes it is useful to make a
   // "copy" of the stream starting in the new position.
 
@@ -197,15 +191,14 @@ public:
   // This creates an encapsulated stream, the first byte must be (per
   // the spec) the byte order of the encapsulation.
 
-  // The default values for the allocators
+  // The default values for the allocators 
   // in this constructor are not 0, but are generated by the
   // ORB. Refer to the constructor body in CDR.cpp for the
   // code that supplies these values to the base class constructor.
 
   TAO_InputCDR (const TAO_OutputCDR& rhs,
                 ACE_Allocator* buffer_allocator = 0,
-                ACE_Allocator* data_block_allocator = 0,
-                TAO_ORB_Core* orb_core = 0);
+                ACE_Allocator* data_block_allocator = 0);
   // Create an input CDR from an output CDR.
 
   ~TAO_InputCDR (void);
@@ -217,35 +210,32 @@ public:
       CORBA::TypeCode_ptr tc,
       const void *data,
       const void *,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV = 
         CORBA::default_environment ());
   // Demarshall the contents of the CDR stream into <data> as
   // described by <tc>; returning any errors in <TAO_IN_ENV>.
 
   CORBA::TypeCode::traverse_status skip (
       CORBA::TypeCode_ptr tc,
-      CORBA_Environment &ACE_TRY_ENV =
+      CORBA_Environment &TAO_IN_ENV = 
         CORBA::default_environment ());
   // Skip the contents of the CDR stream based on information
   // described by <tc>; returning any errors in <TAO_IN_ENV>.
-
-  TAO_ORB_Core* orb_core (void) const;
-  // Accessor
-
-private:
-  TAO_ORB_Core* orb_core_;
-  // The ORB_Core, required to extract object references.
 };
 
 // This operators are too complex to be inline....
 extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
                                              const CORBA::Any &x);
 extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
+                                             const CORBA::Object *x);
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& cdr,
                                              const CORBA::TypeCode *x);
 
 extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
                                              CORBA::Any &x);
 extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
+                                             CORBA::Object *&x);
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
                                              CORBA::TypeCode *&x);
 
 #if defined(__ACE_INLINE__)
@@ -254,13 +244,13 @@ extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR& cdr,
 
 // CDR output operators for CORBA types
 
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::Short x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::UShort x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::Long x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::ULong x);
 extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::LongLong x);
@@ -268,22 +258,22 @@ extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                              CORBA::ULongLong x);
 extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR& os,
                                              CORBA::LongDouble x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::Float x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              CORBA::Double x);
-extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+extern TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                              const CORBA::Char* x);
 
 // CDR input operators for CORBA types
 
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::Short &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::UShort &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::Long &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::ULong &x);
 extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::LongLong &x);
@@ -291,11 +281,11 @@ extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::ULongLong &x);
 extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
                                              CORBA::LongDouble &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::Float &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::Double &x);
-extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is,
+extern TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                              CORBA::Char* &x);
 
 #endif /* __ACE_INLINE */
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i
index 4b65cc2478f..832d27cfec0 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -1,114 +1,29 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-ACE_INLINE
-TAO_OutputCDR::~TAO_OutputCDR (void)
-{
-}
-
 // ****************************************************************
 
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const char *buf,
-                            size_t bufsiz,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (buf,
-                  bufsiz,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (size_t bufsiz,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (bufsiz,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const ACE_Message_Block *data,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (ACE_Data_Block *data,
-                            int byte_order,
-                            TAO_ORB_Core* orb_core)
-  : ACE_InputCDR (data,
-                  byte_order),
-    orb_core_ (orb_core)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size,
-                            ACE_CDR::Long offset)
-  : ACE_InputCDR (rhs,
-                  size,
-                  offset),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs,
-                            size_t size)
-  : ACE_InputCDR (rhs,
-                  size),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::TAO_InputCDR (const TAO_InputCDR& rhs)
-  : ACE_InputCDR (rhs),
-    orb_core_ (rhs.orb_core_)
-{
-}
-
-ACE_INLINE
-TAO_InputCDR::~TAO_InputCDR (void)
-{
-}
-
-ACE_INLINE TAO_ORB_Core*
-TAO_InputCDR::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
 // ****************************************************************
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::Short x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::UShort x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::Long x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::ULong x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
@@ -132,19 +47,19 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR& os,
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::Float x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       CORBA::Double x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os, 
                                       const CORBA::Char* x)
 {
   return ACE_static_cast(ACE_OutputCDR&,os) << x;
@@ -152,25 +67,25 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
 
 // ****************************************************************
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::Short &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::UShort &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::Long &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::ULong &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
@@ -194,19 +109,19 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::Float &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::Double &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
 }
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is, 
                                       CORBA::Char* &x)
 {
   return ACE_static_cast(ACE_InputCDR&,is) >> x;
diff --git a/TAO/tao/CORBA.pidl b/TAO/tao/CORBA.pidl
deleted file mode 100644
index c9264902975..00000000000
--- a/TAO/tao/CORBA.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-// This will have all nwe definitions that will go in to 
-// CORBA from now onwards.
-
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef string  ORBid;
-
-  interface NamedValue
-    {
-      readonly attribute Identifier name;
-      readonly attribute any value;
-      readonly attribute Flags flags;
-    };
-
-  enum exception_type
-  {
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION
-  };
-
-  typedef sequence<Request_ptr> RequestSeq;
-  
-  typedef string ObjectId; 
-  typedef sequence <ObjectId> ObjectIdList;
-
-  typedef unsigned short ServiceType; 
-  typedef unsigned long ServiceOption; 
-  typedef unsigned long ServiceDetailType;
-
-  struct ServiceDetail 
-  { 
-    ServiceDetailType service_detail_type;
-    sequence <octet> service_detail; 
-  }; 
-   
-   struct ServiceInformation 
-   { 
-     sequence <ServiceOption> service_options; 
-     sequence <ServiceDetail> service_details; 
-   };
-
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp
index e7ae32cee81..7d705035abc 100644
--- a/TAO/tao/Connect.cpp
+++ b/TAO/tao/Connect.cpp
@@ -5,11 +5,8 @@
 #include "tao/IIOP_Transport.h"
 #include "tao/debug.h"
 #include "tao/GIOP.h"
-#include "tao/GIOP_Server_Request.h"
+#include "tao/Server_Request.h"
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/POA.h"
-#include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Connect.i"
@@ -20,43 +17,29 @@ ACE_RCSID(tao, Connect, "$Id$")
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Connect_Timeprobe_Description[] =
-  {
-    "Server_Connection_Handler::send_response - start",
-    "Server_Connection_Handler::send_response - end",
-
-    "Server_Connection_Handler::handle_input - start",
-    "Server_Connection_Handler::handle_input - end",
-
-    "Server_Connection_Handler::handle_locate - start",
-    "Server_Connection_Handler::handle_locate - end",
-
-    "Server_Connection_Handler::receive_request - end",
+{
+  "Server_Connection_Handler::send_response - start",
+  "Server_Connection_Handler::send_response - end",
 
-    "Client_Connection_Handler::send_request - start",
-    "Client_Connection_Handler::send_request - end",
+  "Server_Connection_Handler::handle_input - start",
+  "Server_Connection_Handler::handle_input - end",
 
-    "GIOP::Send_Request - return"
-  };
+  "Client_Connection_Handler::send_request - start",
+  "Client_Connection_Handler::send_request - end",
+};
 
 enum
-  {
-    // Timeprobe description table start key
-    TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START = 300,
-    TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_END,
-
-    TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START,
-    TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
-
-    TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START,
-    TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_END,
-
-    TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END,
+{
+  // Timeprobe description table start key
+  TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START = 300,
+  TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_END,
 
-    TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
-    TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START,
+  TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END,
 
-    GIOP_SEND_REQUEST_RETURN
-  };
+  TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START,
+  TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_END
+};
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Connect_Timeprobe_Description,
@@ -74,18 +57,10 @@ TAO_IIOP_Handler_Base::TAO_IIOP_Handler_Base (ACE_Thread_Manager *t)
 {
 }
 
-int
-TAO_IIOP_Handler_Base::resume_handler (ACE_Reactor *)
-{
-  errno = ENOTSUP;
-  return -1;
-}
-
 // @@ For pluggable protocols, added a reference to the corresponding transport obj.
 TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_Handler_Base (t ? t : TAO_ORB_Core_instance()->thr_mgr ()),
-    orb_core_ (TAO_ORB_Core_instance ()),
-    tss_resources_ (TAO_ORB_CORE_TSS_RESOURCES::instance ())
+    orb_core_ (TAO_ORB_Core_instance ())
 {
   iiop_transport_ = new TAO_IIOP_Server_Transport(this);
 }
@@ -93,8 +68,7 @@ TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (ACE_Thread_Manager
 // @@ For pluggable protocols, added a reference to the corresponding transport obj.
 TAO_Server_Connection_Handler::TAO_Server_Connection_Handler (TAO_ORB_Core *orb_core)
   : TAO_IIOP_Handler_Base (orb_core),
-    orb_core_ (orb_core),
-    tss_resources_ (TAO_ORB_CORE_TSS_RESOURCES::instance ())
+    orb_core_ (orb_core)
 {
   iiop_transport_ = new TAO_IIOP_Server_Transport(this);
 }
@@ -175,11 +149,11 @@ TAO_Server_Connection_Handler::activate (long flags,
                                          ACE_thread_t  thread_names[])
 {
   if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_Server_Connection_Handler::activate %d threads, flags = %d\n",
-                 n_threads,
-                 flags,
-                 THR_BOUND));
+    {
+      ACE_DEBUG  ((LM_DEBUG,
+                   "(%P|%t) TAO_Server_Connection_Handler::activate %d threads, flags = %d\n",
+                   n_threads, flags, THR_BOUND));
+    }
 
   return TAO_SVC_HANDLER::activate (flags,
                                     n_threads,
@@ -214,8 +188,19 @@ TAO_Server_Connection_Handler::svc (void)
   // thread with this method as the "worker function".
   int result = 0;
 
-  // Inheriting the ORB_Core tss stuff from the parent thread.
-  this->orb_core_->inherit_from_parent_thread (this->tss_resources_);
+  // Inheriting the ORB_Core stuff from the parent thread.  WARNING:
+  // this->orb_core_ is *not* the same as TAO_ORB_Core_instance(),
+  // this thread was just created and we are in fact *initializing*
+  // the ORB_Core based on the resources of the ORB that created
+  // us....
+
+  TAO_ORB_Core *tss_orb_core = TAO_ORB_Core_instance ();
+  tss_orb_core->inherit_from_parent_thread (this->orb_core_);
+
+  // We need to change this->orb_core_ so it points to the TSS ORB
+  // Core, but we must preserve the old value
+  TAO_ORB_Core* old_orb_core = this->orb_core_;
+  this->orb_core_ = tss_orb_core;
 
   if (TAO_orbdebug)
     ACE_DEBUG ((LM_DEBUG,
@@ -232,6 +217,8 @@ TAO_Server_Connection_Handler::svc (void)
     ACE_DEBUG  ((LM_DEBUG,
                  "(%P|%t) TAO_Server_Connection_Handler::svc end\n"));
 
+  this->orb_core_ = old_orb_core;
+
   return result;
 }
 
@@ -252,7 +239,7 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
 {
   // This will extract the request header, set <response_required> as
   // appropriate.
-  GIOP_ServerRequest request (input,
+  IIOP_ServerRequest request (input,
                               output,
                               this->orb_core_,
                               ACE_TRY_ENV);
@@ -264,45 +251,6 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
 
   response_required = request.response_expected ();
 
-  const CORBA::Octet *object_key = request.object_key ().get_buffer ();
-
-#if !defined (TAO_NO_IOR_TABLE)
-  if (ACE_OS::memcmp (object_key,
-                      &TAO_POA::objectkey_prefix[0],
-                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-    {
-      ACE_CString object_id (ACE_reinterpret_cast (const char *, object_key),
-                             request.object_key ().length (),
-                             0,
-                             0);
-
-      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;
-
-      // Do the Table Lookup.
-      int status =
-        this->orb_core_->orb ()->_tao_find_in_IOR_table (object_id,
-                                                         object_reference);
-
-      // If ObjectID not in table or reference is nil raise OBJECT_NOT_EXIST.
-
-      if (CORBA::is_nil (object_reference) || status == -1)
-        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), -1);
-
-      // ObjectID present in the table with an associated NON-NULL reference.
-      // Throw a forward request exception.
-
-      CORBA::Object_ptr dup = CORBA::Object::_duplicate (object_reference);
-
-      ACE_THROW_RETURN (PortableServer::ForwardRequest (dup), -1);
-    }
-
-#endif
-
   // So, we read a request, now handle it using something more
   // primitive than a CORBA2 ServerRequest pseudo-object.
 
@@ -315,10 +263,11 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
   // with a single write so that they're not accidentally interleaved
   // over the transport (as could happen using TCP).
 
-  this->orb_core_->object_adapter ()->dispatch_servant (request.object_key (),
-                                                        request,
-                                                        0,
-                                                        ACE_TRY_ENV);
+  this->orb_core_->root_poa ()->dispatch_servant (request.object_key (),
+                                                  request,
+                                                  0,
+                                                  this->orb_core_,
+                                                  ACE_TRY_ENV);
   // NEED TO CHECK FOR any errors present in <env> and set the return
   // code appropriately.
   ACE_CHECK_RETURN (-1);
@@ -333,8 +282,6 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
                                               CORBA::ULong &request_id,
                                               CORBA::Environment &env)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START);
-
   // This will extract the request header, set <response_required> as
   // appropriate.
   TAO_GIOP_LocateRequestHeader locateRequestHeader;
@@ -352,7 +299,9 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
   request_id = locateRequestHeader.request_id;
   response_required = 1;
 
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
+  TAO_POA *the_poa = this->orb_core_->root_poa ();
+
+  char repbuf[CDR::DEFAULT_BUFSIZE];
   TAO_OutputCDR dummy_output (repbuf, sizeof(repbuf));
   // This output CDR is not used!
 
@@ -360,44 +309,7 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
                          locateRequestHeader.object_key.length (),
                          locateRequestHeader.object_key.get_buffer (),
                          0);
-
-  CORBA::Object_var forward_location_var;
-  TAO_GIOP_LocateStatusType status;
-
-// #if !defined (TAO_NO_IOR_TABLE)
-//   if (ACE_OS::memcmp (tmp_key.get_buffer (),
-//                    &TAO_POA::objectkey_prefix[0],
-//                    TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) == 0)
-//     {
-//       ACE_DEBUG ((LM_DEBUG,
-//                "TAO Object Key Prefix found in the object key.\n"));
-
-
-//       // Do the Table Lookup. Raise a location forward exception or
-//       // a non-exist exception.
-
-//       // CORBA::Object_ptr object_reference;
-//       // int s =
-//       //     table->lookup (request.object_key (),
-//       //                    object_reference);
-//       // if (s == -1)
-//       //   {
-//       //      status = TAO_GIOP_UNKNOWN_OBJECT;
-//       //   }
-//       // else
-//       //   {
-//       //      status = TAO_GIOP_OBJECT_FORWARD;
-//       //      forward_location_var =
-//       //          CORBA::Object::_duplicate (object_reference);
-//       //    }
-//     }
-//   // else
-//   //   {
-// #endif
-
-  // this->handle_locate_i (....);
-
-  GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
+  IIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
                                     response_required,
                                     tmp_key,
                                     "_non_existent",
@@ -405,19 +317,23 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
                                     this->orb_core_,
                                     env);
 
-  this->orb_core_->object_adapter ()->dispatch_servant (serverRequest.object_key (),
-                                                        serverRequest,
-                                                        0,
-                                                        env);
+  the_poa->dispatch_servant (serverRequest.object_key (),
+                             serverRequest,
+                             0,
+                             this->orb_core_,
+                             env);
+
+
+  CORBA::Object_var forward_location_var;
+  TAO_GIOP_LocateStatusType status;
 
   if (serverRequest.exception_type () == TAO_GIOP_NO_EXCEPTION
       && env.exception () == 0)
     {
       // we got no exception, so the object is here
       status = TAO_GIOP_OBJECT_HERE;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) handle_locate() : found\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "handle_locate has been called: found\n"));
     }
   else if (serverRequest.exception_type () != TAO_GIOP_NO_EXCEPTION)
     {
@@ -473,10 +389,6 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
       env.clear ();
     }
 
-#if !defined (TAO_NO_IOR_TABLE)
-  //  }
-#endif
-
   // Create the response.
   TAO_GIOP::start_message (TAO_GIOP::LocateReply, output,
                            this->orb_core_);
@@ -486,14 +398,16 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
   if (status == TAO_GIOP_OBJECT_FORWARD)
     {
       CORBA::Object_ptr object_ptr = forward_location_var.in ();
-      if ((output << object_ptr) == 0)
+      output.encode (CORBA::_tc_Object,
+                     &object_ptr,
+                     0,
+                     env);
+
+      // If encoding went fine
+      if (env.exception () != 0)
         {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Server_Connection_Handler::handle_locate - "
-                          "error marshaling forwarded reference\n"));
-            }
+          env.print_exception ("TAO_Server_Connection_Handler::handle_locate:"
+                               " forwarding parameter encode failed");
           response_required = 0;
           return -1;
         }
@@ -505,7 +419,7 @@ TAO_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
 void
 TAO_Server_Connection_Handler::send_response (TAO_OutputCDR &output)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
 
   TAO_GIOP::send_request (this->iiop_transport_,
                           output,
@@ -518,7 +432,7 @@ void
 TAO_Server_Connection_Handler::send_error (CORBA::ULong request_id,
                                            CORBA::Exception *x)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
 
   // The request_id is going to be not 0, if it was sucessfully read
   if (request_id != 0)
@@ -537,7 +451,11 @@ TAO_Server_Connection_Handler::send_error (CORBA::ULong request_id,
           // create and write a dummy context
           TAO_GIOP_ServiceContextList resp_ctx;
           resp_ctx.length (0);
-          output << resp_ctx;
+          output.encode (TC_ServiceContextList,
+                         &resp_ctx,
+                         0,
+                         ACE_TRY_ENV);
+          ACE_TRY_CHECK;
 
           // Write the request ID
           output.write_ulong (request_id);
@@ -564,7 +482,11 @@ TAO_Server_Connection_Handler::send_error (CORBA::ULong request_id,
               CORBA::Object_ptr object_ptr =
                 forward_request_ptr->forward_reference.in();
 
-              output << object_ptr;
+              output.encode (CORBA::_tc_Object,
+                             &object_ptr,
+                             0,
+                             ACE_TRY_ENV);
+              ACE_TRY_CHECK;
             }
           // end of the forwarding code ****************************
           else
@@ -572,7 +494,7 @@ TAO_Server_Connection_Handler::send_error (CORBA::ULong request_id,
               // Write the exception
               CORBA::TypeCode_ptr except_tc = x->_type ();
 
-              CORBA::exception_type extype = CORBA::USER_EXCEPTION;
+              CORBA::ExceptionType extype = CORBA::USER_EXCEPTION;
               if (CORBA::SystemException::_narrow (x) != 0)
                 extype = CORBA::SYSTEM_EXCEPTION;
 
@@ -613,23 +535,22 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   // 2. construct a complete request
   // 3. dispatch that request and return any required reply and errors
 
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
 
   // @@ TODO This should take its memory from a specialized
   // allocator. It is better to use a message block than a on stack
   // buffer because we cannot minimize memory copies in that case.
-  TAO_InputCDR input (this->orb_core_->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
+  TAO_InputCDR input (this->orb_core_->create_input_cdr_data_block (CDR::DEFAULT_BUFSIZE),
                       TAO_ENCAP_BYTE_ORDER);
 
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
+  char repbuf[CDR::DEFAULT_BUFSIZE];
 #if defined(ACE_HAS_PURIFY)
   (void) ACE_OS::memset (repbuf, '\0', sizeof (repbuf));
 #endif /* ACE_HAS_PURIFY */
   TAO_OutputCDR output (repbuf, sizeof(repbuf),
                         TAO_ENCAP_BYTE_ORDER,
                         this->orb_core_->output_cdr_buffer_allocator (),
-                        this->orb_core_->output_cdr_dblock_allocator (),
-                        this->orb_core_->orb_params ()->cdr_memcpy_tradeoff ());
+                        this->orb_core_->output_cdr_buffer_allocator ());
 
   int result = 0;
   int error_encountered = 0;
@@ -642,8 +563,6 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
       TAO_GIOP::Message_Type type =
         TAO_GIOP::recv_request (this->iiop_transport_, input, this->orb_core_);
 
-      TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
-
       // Check to see if we've been cancelled cooperatively.
       if (this->orb_core_->orb ()->should_shutdown () != 0)
         error_encountered = 1;
@@ -690,8 +609,8 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
             default:                                    // Unknown message
               ACE_DEBUG ((LM_DEBUG,
                           "(%P|%t) Illegal message received by server\n"));
-              ACE_TRY_THROW (CORBA::COMM_FAILURE ());
-              // NOTREACHED
+              ACE_TRY_ENV.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
+              // FALLTHROUGH
 
             case TAO_GIOP::CommunicationError:
             case TAO_GIOP::MessageError:
@@ -731,13 +650,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
   ACE_CATCHALL
     {
       // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.
-      //   If we have native exceptions but no support for them
-      //   in the ORB we should still be able to catch it.
-      //   If we don't have native exceptions it couldn't have been
-      //   raised in the first place!
+      // it? BTW, this cannot be detected if using the <env> mapping.
 
       ACE_ERROR ((LM_ERROR,
                   "(%P|%t) closing conn %d after fault %p\n",
@@ -759,7 +672,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
           // required.
           if (TAO_orbdebug)
             ACE_ERROR ((LM_ERROR,
-                        "TAO: (%P|%t) %s: closing conn, no exception, "
+                        "(%P|%t) %s: closing conn, no exception, "
                         "but expecting response\n",
                         "TAO_Server_Connection_Handler::handle_input"));
           //          this->handle_close ();
@@ -772,20 +685,17 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE)
       // close the socket.
       if (TAO_orbdebug)
         ACE_ERROR ((LM_ERROR,
-                    "TAO: (%P|%t) %s: closing conn, no exception, "
+                    "(%P|%t) %s: closing conn, no exception, "
                     "but expecting response\n",
                     "TAO_Server_Connection_Handler::handle_input"));
       //      this->handle_close ();
       return -1;
     }
 
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
-
   return result;
 }
 
-// @@ For pluggable protocols, added a reference to the corresponding
-//    transport obj.
+// @@ For pluggable protocols, added a reference to the corresponding transport obj.
 TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_IIOP_Handler_Base (t == 0 ? TAO_ORB_Core_instance ()->thr_mgr () : t),
     expecting_response_ (0),
@@ -794,6 +704,19 @@ TAO_Client_Connection_Handler::TAO_Client_Connection_Handler (ACE_Thread_Manager
   iiop_transport_ = new TAO_IIOP_Client_Transport(this);
 }
 
+TAO_ST_Client_Connection_Handler::TAO_ST_Client_Connection_Handler (ACE_Thread_Manager *t)
+  : TAO_Client_Connection_Handler (t)
+{
+}
+
+TAO_MT_Client_Connection_Handler::TAO_MT_Client_Connection_Handler (ACE_Thread_Manager *t)
+  : TAO_Client_Connection_Handler (t),
+    calling_thread_ (ACE_OS::NULL_thread)
+{
+  ACE_NEW (this->cond_response_available_,
+           ACE_SYNCH_CONDITION (TAO_ORB_Core_instance ()->leader_follower_lock ()));
+}
+
 // @@ Need to get rid of the Transport Objects!
 TAO_Client_Connection_Handler::~TAO_Client_Connection_Handler (void)
 {
@@ -807,6 +730,19 @@ TAO_Client_Connection_Handler::transport (void)
   return this->iiop_transport_;
 }
 
+TAO_ST_Client_Connection_Handler::~TAO_ST_Client_Connection_Handler (void)
+{
+  delete this->iiop_transport_;
+  this->iiop_transport_ = 0;
+}
+
+TAO_MT_Client_Connection_Handler::~TAO_MT_Client_Connection_Handler (void)
+{
+  delete this->cond_response_available_;
+  delete this->iiop_transport_;
+  this->iiop_transport_ = 0;
+}
+
 int
 TAO_Client_Connection_Handler::open (void *)
 {
@@ -850,6 +786,13 @@ TAO_Client_Connection_Handler::open (void *)
   // operation fails we are out of luck (some platforms do not support
   // it and return -1).
 
+  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
+
+  // Now we must register ourselves with the reactor for input events
+  // which will detect GIOP Reply messages and EOF conditions.
+  r->register_handler (this,
+                       ACE_Event_Handler::READ_MASK);
+
   // For now, we just return success
   return 0;
 }
@@ -886,13 +829,11 @@ TAO_Client_Connection_Handler::check_unexpected_data (void)
       // 0 is a graceful shutdown
       // -1 is a somewhat ugly shutdown
       //
-      // Both will result in us returning -1 and this connection
-      // getting closed
+      // Both will result in us returning -1 and this connection getting closed
       //
       if (TAO_orbdebug)
         ACE_DEBUG ((LM_WARNING,
-                    "Client_Connection_Handler::handle_input: "
-                    "closing connection on fd %d\n",
+                    "Client_Connection_Handler::handle_input: closing connection on fd %d\n",
                     this->peer().get_handle ()));
       break;
 
@@ -904,8 +845,7 @@ TAO_Client_Connection_Handler::check_unexpected_data (void)
       // handle this yet, log an error, and close the connection.
       ACE_ERROR ((LM_WARNING,
                   "Client_Connection_Handler::handle_input received "
-                  "input while not expecting a response; "
-                  "closing connection on fd %d\n",
+                  "input while not expecting a response; closing connection on fd %d\n",
                   this->peer().get_handle ()));
       break;
     }
@@ -915,119 +855,6 @@ TAO_Client_Connection_Handler::check_unexpected_data (void)
   return -1;
 }
 
-int
-TAO_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                             ACE_Reactor_Mask rm)
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_Client_Connection_Handler::handle_close (%d, %d)\n",
-                 handle,
-                 rm));
-
-  if (this->recycler ())
-    this->recycler ()->mark_as_closed (this->recycling_act ());
-
-  // Deregister this handler with the ACE_Reactor.
-  if (this->reactor ())
-    {
-      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK |
-        ACE_Event_Handler::DONT_CALL;
-
-      // Make sure there are no timers.
-      this->reactor ()->cancel_timer (this);
-
-      // Remove self from reactor.
-      this->reactor ()->remove_handler (this, mask);
-    }
-
-  this->peer ().close ();
-
-  return 0;
-}
-
-int
-TAO_Client_Connection_Handler::close (u_long)
-{
-  this->destroy ();
-
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_RW_Client_Connection_Handler::TAO_RW_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_Client_Connection_Handler (t)
-{
-}
-
-TAO_RW_Client_Connection_Handler::~TAO_RW_Client_Connection_Handler (void)
-{
-}
-
-int
-TAO_RW_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
-                                                TAO_OutputCDR &stream,
-                                                int is_twoway)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-  //
-  // We could call a template method to do all this stuff, and if the
-  // connection handler were obtained from a factory, then this could
-  // be dynamically linked in (wouldn't that be cool/freaky?)
-
-  // Send the request
-  int success  = (int) TAO_GIOP::send_request (this->iiop_transport_,
-                                               stream,
-                                               orb_core);
-  TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
-  if (!success)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_RW_Client_Connection_Handler::resume_handler (ACE_Reactor *)
-{
-  // Since we don't suspend, we don't have to resume.
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_ST_Client_Connection_Handler::TAO_ST_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_Client_Connection_Handler (t)
-{
-}
-
-TAO_ST_Client_Connection_Handler::~TAO_ST_Client_Connection_Handler (void)
-{
-}
-
-int
-TAO_ST_Client_Connection_Handler::open (void *something)
-{
-  int result = TAO_Client_Connection_Handler::open (something);
-
-  if (result != 0)
-    return result;
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-  return r->register_handler (this,
-                              ACE_Event_Handler::READ_MASK);
-}
-
 // @@ this seems odd that the connection handler would call methods in the
 //    GIOP object.  Some of this mothod's functionality should be moved
 //    to GIOP. fredk
@@ -1036,7 +863,7 @@ TAO_ST_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
                                                 TAO_OutputCDR &stream,
                                                 int is_twoway)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
 
   // NOTE: Here would also be a fine place to calculate a digital
   // signature for the message and place it into a preallocated slot
@@ -1053,8 +880,6 @@ TAO_ST_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
   int success  = (int) TAO_GIOP::send_request (this->iiop_transport_,
                                                stream,
                                                orb_core);
-  TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
   if (!success)
     return -1;
 
@@ -1080,7 +905,7 @@ TAO_ST_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
 
       this->input_available_ = 0;
       // We can get events now, b/c we want them!
-
+      r->resume_handler (this);
       // We're no longer expecting a response!
       this->expecting_response_ = 0;
     }
@@ -1108,65 +933,11 @@ TAO_ST_Client_Connection_Handler::handle_input (ACE_HANDLE)
 }
 
 int
-TAO_ST_Client_Connection_Handler::resume_handler (ACE_Reactor *reactor)
-{
-  return reactor->resume_handler (this);
-}
-
-// ****************************************************************
-
-TAO_MT_Client_Connection_Handler::TAO_MT_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_Client_Connection_Handler (t),
-    calling_thread_ (ACE_OS::NULL_thread),
-    cond_response_available_ (0),
-    orb_core_ (0)
-{
-}
-
-TAO_MT_Client_Connection_Handler::~TAO_MT_Client_Connection_Handler (void)
-{
-  delete this->cond_response_available_;
-}
-
-int
-TAO_MT_Client_Connection_Handler::open (void *something)
-{
-  int result = TAO_Client_Connection_Handler::open (something);
-
-  if (result != 0)
-    return result;
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-  return r->register_handler (this,
-                              ACE_Event_Handler::READ_MASK);
-}
-
-ACE_SYNCH_CONDITION*
-TAO_MT_Client_Connection_Handler::cond_response_available (TAO_ORB_Core* orb_core)
-{
-  // @@ TODO This condition variable should per-ORB-per-thread, not
-  // per-connection, it is a waste to have more than one of this in
-  // the same thread.
-  if (this->cond_response_available_ == 0)
-    {
-      ACE_NEW_RETURN (this->cond_response_available_,
-                      ACE_SYNCH_CONDITION (orb_core->leader_follower_lock ()),
-                      0);
-    }
-  return this->cond_response_available_;
-}
-
-int
 TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
                                                 TAO_OutputCDR &stream,
                                                 int is_twoway)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
-
-  // Save the ORB_Core for the handle_input callback...
-  this->orb_core_ = orb_core;
+  ACE_FUNCTION_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
 
   // NOTE: Here would also be a fine place to calculate a digital
   // signature for the message and place it into a preallocated slot
@@ -1184,28 +955,14 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
       // Send the request
       int success  = (int) TAO_GIOP::send_request (this->iiop_transport_,
                                                    stream,
-                                                   this->orb_core_);
-
-      TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
+                                                   orb_core);
 
       if (!success)
         return -1;
     }
   else // is_twoway
     {
-      ACE_Reactor *r = this->orb_core_->reactor ();
-
-      if (this->reactor () != r)
-        {
-          ACE_Reactor_Mask mask =
-            ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
-          this->reactor ()->remove_handler (this, mask);
-
-          r->register_handler (this,
-                               ACE_Event_Handler::READ_MASK);
-        }
-
-      if (this->orb_core_->leader_follower_lock ().acquire() == -1)
+      if (orb_core->leader_follower_lock ().acquire() == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::send_request: "
                            "Failed to get the lock.\n"),
@@ -1221,37 +978,33 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
                                                   stream,
                                                   orb_core);
 
-      TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
       if (!success)
         {
-          this->orb_core_->leader_follower_lock ().release ();
+          orb_core->leader_follower_lock ().release ();
           return -1;
         }
 
       // check if there is a leader, but the leader is not us
-      if (this->orb_core_->leader_available () &&
-          !this->orb_core_->I_am_the_leader_thread ())
+      if (orb_core->leader_available () &&
+          !orb_core->I_am_the_leader_thread ())
         {
           // wait as long as no input is available and/or
           // no leader is available
           while (!this->input_available_ &&
-                 this->orb_core_->leader_available ())
+                 orb_core->leader_available ())
             {
-              ACE_SYNCH_CONDITION* cond =
-                this->cond_response_available (orb_core);
-              if (this->orb_core_->add_follower (cond) == -1)
+              if (orb_core->add_follower (this->cond_response_available_) == -1)
                 ACE_ERROR ((LM_ERROR,
                             "(%P|%t) TAO_Client_Connection_Handler::send_request: "
                             "Failed to add a follower thread\n"));
-              cond->wait ();
+              this->cond_response_available_->wait ();
             }
           // now somebody woke us up to become a leader or to handle
           // our input. We are already removed from the follower queue
           if (this->input_available_)
             {
               // there is input waiting for me
-              if (this->orb_core_->leader_follower_lock ().release () == -1)
+              if (orb_core->leader_follower_lock ().release () == -1)
                 ACE_ERROR_RETURN ((LM_ERROR,
                                    "(%P|%t) TAO_Client_Connection_Handler::send_request: "
                                    "Failed to release the lock.\n"),
@@ -1270,15 +1023,16 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
       // case we do increase the refcount on the leader in
       // TAO_ORB_Core.
 
-      this->orb_core_->set_leader_thread ();
+      orb_core->set_leader_thread ();
       // this might increase the recount of the leader
 
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
+      if (orb_core->leader_follower_lock ().release () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::send_request: "
                            "Failed to release the lock.\n"),
                           -1);
 
+      ACE_Reactor *r = orb_core->reactor ();
       r->owner (ACE_Thread::self ());
 
       int ret = 0;
@@ -1297,7 +1051,7 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
       // handle_events, which is at the time in handle_input still
       // occupied.
 
-      if (this->orb_core_->unset_leader_wake_up_follower () == -1)
+      if (orb_core->unset_leader_wake_up_follower () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::send_request: "
                            "Failed to unset the leader and wake up a new follower.\n"),
@@ -1314,10 +1068,9 @@ TAO_MT_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
 int
 TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
 {
-  if (this->orb_core_ == 0)
-    this->orb_core_ = TAO_ORB_Core_instance ();
+  TAO_ORB_Core *orb_Core_ptr = TAO_ORB_Core_instance ();
 
-  if (this->orb_core_->leader_follower_lock ().acquire () == -1)
+  if (orb_Core_ptr->leader_follower_lock ().acquire () == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                        "Failed to get the lock.\n"),
@@ -1328,7 +1081,7 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
       // we got something, but did not want
       // @@ wake up an other thread, we are lost
 
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
+      if (orb_Core_ptr->leader_follower_lock ().release () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                            "Failed to release the lock.\n"),
@@ -1342,12 +1095,12 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
       // We are now a leader getting its response.
       this->input_available_ = 1;
 
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
+      if (orb_Core_ptr->leader_follower_lock ().release () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                            "Failed to release the lock.\n"),
                           -1);
-      this->orb_core_->reactor ()->suspend_handler (this);
+      orb_Core_ptr->reactor ()->suspend_handler (this);
       // resume_handler is called in TAO_GIOP_Invocation::invoke
       return 0;
     }
@@ -1360,18 +1113,15 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
       // At this point we might fail to remove the follower, because
       // it has been already chosen to become the leader, so it is
       // awake and will get this too.
-      ACE_SYNCH_CONDITION* cond =
-        this->cond_response_available (this->orb_core_);
-
-      this->orb_core_->remove_follower (cond);
+      orb_Core_ptr->remove_follower (this->cond_response_available_);
 
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
+      if (orb_Core_ptr->leader_follower_lock ().release () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                            "Failed to release the lock.\n"),
                           -1);
 
-      this->orb_core_->reactor ()->suspend_handler (this);
+      orb_Core_ptr->reactor ()->suspend_handler (this);
       // We should wake suspend the thread before we wake him up.
       // resume_handler is called in TAO_GIOP_Invocation::invoke
 
@@ -1379,7 +1129,7 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
       // doing the suspend_handler as last thing, but I am not sure
       // if a race condition would occur.
 
-      if (this->orb_core_->leader_follower_lock ().acquire () == -1)
+      if (orb_Core_ptr->leader_follower_lock ().acquire () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                            "Failed to acquire the lock.\n"),
@@ -1387,9 +1137,9 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
       // The thread was already selected to become a leader, so we
       // will be called again.
       this->input_available_ = 1;
-      cond->signal ();
+      this->cond_response_available_->signal ();
 
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
+      if (orb_Core_ptr->leader_follower_lock ().release () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) TAO_Client_Connection_Handler::handle_input: "
                            "Failed to release the lock.\n"),
@@ -1399,12 +1149,43 @@ TAO_MT_Client_Connection_Handler::handle_input (ACE_HANDLE)
 }
 
 int
-TAO_MT_Client_Connection_Handler::resume_handler (ACE_Reactor *reactor)
+TAO_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
+                                             ACE_Reactor_Mask rm)
 {
-  return reactor->resume_handler (this);
+  if (TAO_orbdebug)
+    ACE_DEBUG  ((LM_DEBUG,
+                 "(%P|%t) TAO_Client_Connection_Handler::handle_close (%d, %d)\n",
+                 handle,
+                 rm));
+
+  if (this->recycler ())
+    this->recycler ()->mark_as_closed (this->recycling_act ());
+
+  // Deregister this handler with the ACE_Reactor.
+  if (this->reactor ())
+    {
+      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK |
+        ACE_Event_Handler::DONT_CALL;
+
+      // Make sure there are no timers.
+      this->reactor ()->cancel_timer (this);
+
+      // Remove self from reactor.
+      this->reactor ()->remove_handler (this, mask);
+    }
+
+  this->peer ().close ();
+
+  return 0;
 }
 
-// ****************************************************************
+int
+TAO_Client_Connection_Handler::close (u_long)
+{
+  this->destroy ();
+
+  return 0;
+}
 
 #define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_Client_Connection_Handler>
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
diff --git a/TAO/tao/Connect.h b/TAO/tao/Connect.h
index 17be311cb51..adf52abc8a2 100644
--- a/TAO/tao/Connect.h
+++ b/TAO/tao/Connect.h
@@ -31,12 +31,12 @@
 #  include "tao/corbafwd.h"
 
 // Forward Decls
+class TAO_OA_Parameters;
 class TAO_Transport;
 class TAO_IIOP_Transport;
 class TAO_IIOP_Client_Transport;
 class TAO_IIOP_Server_Transport;
 class TAO_ORB_Core;
-class TAO_ORB_Core_TSS_Resources;
 
 typedef ACE_Svc_Handler<TAO_SOCK_STREAM, ACE_NULL_SYNCH>
         TAO_SVC_HANDLER;
@@ -48,9 +48,6 @@ public:
   TAO_IIOP_Handler_Base (TAO_ORB_Core *orb_core);
 
   virtual TAO_Transport *transport (void) = 0;
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
 };
 
 class TAO_Export TAO_Client_Connection_Handler : public TAO_IIOP_Handler_Base
@@ -111,27 +108,6 @@ protected:
   // when <expecting_response_> is non-zero.
 };
 
-class TAO_Export TAO_RW_Client_Connection_Handler : public TAO_Client_Connection_Handler
-{
-public:
-  TAO_RW_Client_Connection_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual ~TAO_RW_Client_Connection_Handler (void);
-
-  virtual int send_request (TAO_ORB_Core* orb_core,
-                            TAO_OutputCDR &stream,
-                            int is_twoway);
-  // Send the request in <stream>.  Since this class simply
-  // reads/writes from a socket (and does not handle nested upcalls),
-  // there is no need to register with a reactor.
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
-protected:
-
-};
-
 class TAO_Export TAO_ST_Client_Connection_Handler : public TAO_Client_Connection_Handler
 {
 public:
@@ -139,9 +115,6 @@ public:
 
   virtual ~TAO_ST_Client_Connection_Handler (void);
 
-  virtual int open (void *);
-  // Initialize the handler.
-
   virtual int send_request (TAO_ORB_Core* orb_core,
                             TAO_OutputCDR &stream,
                             int is_twoway);
@@ -154,9 +127,6 @@ public:
   virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
   // Called when a a response from a twoway invocation is available.
 
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
 protected:
 
 };
@@ -168,9 +138,6 @@ public:
 
   virtual ~TAO_MT_Client_Connection_Handler (void);
 
-  virtual int open (void *);
-  // Initialize the handler.
-
   virtual int send_request (TAO_ORB_Core* orb_core,
                             TAO_OutputCDR &stream,
                             int is_twoway);
@@ -183,21 +150,13 @@ public:
   virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
   // Called when a a response from a twoway invocation is available.
 
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
 protected:
-  ACE_SYNCH_CONDITION* cond_response_available (TAO_ORB_Core* orb_core);
-  // Return the cond_response_available, initializing it if necessary.
 
   ACE_thread_t calling_thread_;
   // the thread ID of the thread we were running in.
 
   ACE_SYNCH_CONDITION* cond_response_available_;
   // wait on reponse if the leader-follower model is active
-
-  TAO_ORB_Core* orb_core_;
-  // The ORB core where we are executing a request.
 };
 
 // ****************************************************************
@@ -283,10 +242,7 @@ protected:
   // Perform appropriate closing.
 
   TAO_ORB_Core *orb_core_;
-  // Cached ORB Core.
-
-  TAO_ORB_Core_TSS_Resources *tss_resources_;
-  // Cached tss resources of the ORB that activated this object.
+  // Cache the ORB Core to minimize
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Context.cpp b/TAO/tao/Context.cpp
deleted file mode 100644
index 486ab584d3f..00000000000
--- a/TAO/tao/Context.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-
-
-#include "tao/Context.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/Typecode.h"
-#include "tao/Environment.h"
-#include "tao/NVList.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Context.i"
-#endif /* ! __ACE_INLINE__ */
-
-CORBA_Context::CORBA_Context (void)
-{
-}
-
-CORBA_Context::~CORBA_Context (void)
-{
-}
-
-CORBA::ULong
-CORBA_Context::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Context::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
-const char *
-CORBA_Context::context_name (CORBA::Environment &ACE_TRY_ENV) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-CORBA_Context_ptr
-CORBA_Context::parent (CORBA::Environment &ACE_TRY_ENV) const
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-void
-CORBA_Context::create_child (const char *child_ctx_name,
-                             CORBA_Context_out child_ctx,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::set_one_value (const char *propname,
-                              const CORBA_Any &propvalue,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::set_values (CORBA::NVList_ptr values,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::delete_values (const char *propname,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Context::get_values (const char *start_scope,
-                           CORBA::Flags op_flags,
-                           const char *pattern,
-                           CORBA::NVList_ptr &values,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA_ContextList::CORBA_ContextList (CORBA::ULong len,
-                                      char* *ctx_list)
-  : ref_count_ (1)
-{
-  for (CORBA::ULong i=0; i < len; i++)
-    this->add (ctx_list [i]);
-}
-
-CORBA_ContextList::~CORBA_ContextList (void)
-{
-  for (CORBA::ULong i = 0; i < this->count (); ++i)
-    {
-      char* *ctx;
-      if (this->ctx_list_.get (ctx, i) == -1)
-        return;
-      CORBA::string_free (*ctx);
-    }
-}
-
-void
-CORBA_ContextList::add (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (CORBA::string_dup (ctx));
-}
-
-void
-CORBA_ContextList::add_consume (char *ctx)
-{
-  this->ctx_list_.enqueue_tail (ctx);
-}
-
-char *
-CORBA_ContextList::item (CORBA::ULong index,
-                         CORBA::Environment &ACE_TRY_ENV)
-{
-  char* *ctx;
-  ACE_TRY_ENV.clear ();
-  if (this->ctx_list_.get (ctx, index) == -1)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-  else
-    {
-      return CORBA::string_dup (*ctx);
-    }
-}
-
-void
-CORBA_ContextList::remove (CORBA::ULong,
-                           CORBA::Environment &ACE_TRY_ENV)
-{
-  // unimplemented
-  ACE_TRY_ENV.clear ();
-}
-
-CORBA_ContextList_ptr
-CORBA_ContextList::_duplicate (void)
-{
-  ++this->ref_count_;
-  return this;
-}
-
-void
-CORBA_ContextList::_destroy (void)
-{
-  CORBA::ULong current = --this->ref_count_;
-  if (current == 0)
-    delete this;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Context.h b/TAO/tao/Context.h
deleted file mode 100644
index f24fd9d4939..00000000000
--- a/TAO/tao/Context.h
+++ /dev/null
@@ -1,295 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Context.h
-//
-// = DESCRIPTION
-//    Header file for CORBA Context class.
-//
-// = AUTHOR
-//     Jeff Parsons <parsons@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_CONTEXT_H
-#define TAO_CONTEXT_H
-
-#include "tao/corbafwd.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export CORBA_Context
-{
-  // = TITLE
-  //   CORBA_Context
-  //
-  // = DESCRIPTION
-  //   TAO's minimal implementation of the Context interface.
-  //   Since Contexts are inherently un-typesafe, there use
-  //   is deprecated and the feature may eventaully disappear
-  //   from CORBA. It is implemented only to make the arg list
-  //   of CORBA_Object::_create_request() compliant. The only
-  //   (pointer) value that should be passed is 0.
-  //
-public:
-  // Default ctor and dtor.
-  CORBA_Context (void);
-  ~CORBA_Context (void);
-
-  // Pseudo object methods
-  static CORBA_Context* _duplicate (CORBA_Context*);
-  static CORBA_Context* _nil (void);
-
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-// All the spec-required functions below will just throw
-// a CORBA::NO_IMPLEMENT exception and do nothing else.
-
-  const char *context_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::default_environment ()
-      ) const;
-
-  CORBA_Context_ptr parent (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::default_environment ()
-      ) const;
-
-  void create_child (const char *child_ctx_name,
-                     CORBA_Context_out child_ctx,
-                     CORBA::Environment &ACE_TRY_ENV =
-                       CORBA::default_environment ());
-
-  void set_one_value (const char *propname,
-                      const CORBA_Any &propvalue,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        CORBA::default_environment ());
-
-  void set_values (CORBA::NVList_ptr values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     CORBA::default_environment ());
-
-  void delete_values (const char *propname,
-                      CORBA::Environment &ACE_TRY_ENV =
-                        CORBA::default_environment ());
-
-  void get_values (const char *start_scope,
-                   CORBA::Flags op_flags,
-                   const char *pattern,
-                   CORBA::NVList_ptr &values,
-                   CORBA::Environment &ACE_TRY_ENV =
-                     CORBA::default_environment ());
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Context_ptr _ptr_type;
-  typedef CORBA_Context_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  CORBA::ULong refcount_;
-  // reference counting
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // protect the reference count
-};
-
-typedef CORBA_Context* CORBA_Context_ptr;
-
-class TAO_Export CORBA_Context_var
-{
-  // = TITLE
-  //   The T_var class for Context
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Context must have a T_var class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Context_ptr as the _ptr type instead of
-  //   CORBA::Context_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Context_var (void);
-  CORBA_Context_var (CORBA_Context_ptr);
-  CORBA_Context_var (const CORBA_Context_var &);
-  ~CORBA_Context_var (void);
-
-  CORBA_Context_var &operator= (CORBA_Context_ptr);
-  CORBA_Context_var &operator= (const CORBA_Context_var &);
-  CORBA_Context_ptr operator-> (void) const;
-
-  operator const CORBA_Context_ptr &() const;
-  operator CORBA_Context_ptr &();
-  // in, inout, out, _retn
-  CORBA_Context_ptr in (void) const;
-  CORBA_Context_ptr &inout (void);
-  CORBA_Context_ptr &out (void);
-  CORBA_Context_ptr _retn (void);
-  CORBA_Context_ptr ptr (void) const;
-
-private:
-  CORBA_Context_ptr ptr_;
-};
-
-class TAO_Export CORBA_Context_out
-{
-  // = TITLE
-  //   The T_out class for Context
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object Context must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_Context_ptr as the _ptr type instead of
-  //   CORBA::Context_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_Context_out (CORBA_Context_ptr &);
-  CORBA_Context_out (CORBA_Context_var &);
-  CORBA_Context_out (CORBA_Context_out &);
-  CORBA_Context_out &operator= (CORBA_Context_out &);
-  CORBA_Context_out &operator= (const CORBA_Context_var &);
-  CORBA_Context_out &operator= (CORBA_Context_ptr);
-  operator CORBA_Context_ptr &();
-  CORBA_Context_ptr &ptr (void);
-  CORBA_Context_ptr operator-> (void);
-
-private:
-  CORBA_Context_ptr &ptr_;
-};
-
-class CORBA_ContextList
-{
-  // = TITLE
-  //   ContextList definition taken from CORBA v2.3a Dec 1998
-  //
-  // = DESCRIPTION
-  //   Maintains a list of strings for Contexts.
-public:
-  CORBA_ContextList (void);
-  // constructor
-
-  CORBA_ContextList (CORBA::ULong len,
-                     char* *ctx_list);
-  // Constructor - initialize given a length and an array of
-  // strings.
-
-  ~CORBA_ContextList (void);
-  // destructor
-
-  CORBA::ULong count ();
-  // return the number of elements
-
-  CORBA_ContextList_ptr _duplicate (void);
-
-  void _destroy (void);
-
-  static CORBA_ContextList_ptr _nil ();
-
-  void add (char *ctx);
-  // add a string to the list
-
-  void add_consume (char *ctx);
-  // add and consume a string to the list
-
-  char *item (CORBA::ULong index,
-              CORBA_Environment &ACE_TRY_ENV =
-                CORBA::default_environment ());
-  // return the typecode at index i. Raises the "Bounds" exception
-
-  void remove (CORBA::ULong index,
-               CORBA_Environment &ACE_TRY_ENV =
-                CORBA::default_environment ());
-  // remove the typecode at index i. Raises the "Bounds" exception
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ContextList_ptr _ptr_type;
-  typedef CORBA::ContextList_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-private:
-  // not allowed
-  CORBA_ContextList (const CORBA_ContextList &);
-  CORBA_ContextList &operator= (const CORBA_ContextList &);
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-  // Reference counter.
-
-  ACE_Unbounded_Queue<char *> ctx_list_;
-  // internal list of typecodes
-};
-
-class TAO_Export CORBA_ContextList_var
-{
-public:
-  CORBA_ContextList_var (void); // default constructor
-  CORBA_ContextList_var (CORBA_ContextList_ptr);
-  CORBA_ContextList_var (const CORBA_ContextList_var &); // copy constructor
-  ~CORBA_ContextList_var (void); // destructor
-
-  CORBA_ContextList_var &operator= (CORBA_ContextList_ptr);
-  CORBA_ContextList_var &operator= (const CORBA_ContextList_var &);
-  CORBA_ContextList_ptr operator-> (void) const;
-
-  operator const CORBA_ContextList_ptr &() const;
-  operator CORBA_ContextList_ptr &();
-  // in, inout, out, _retn
-  CORBA_ContextList_ptr in (void) const;
-  CORBA_ContextList_ptr &inout (void);
-  CORBA_ContextList_ptr &out (void);
-  CORBA_ContextList_ptr _retn (void);
-  CORBA_ContextList_ptr ptr (void) const;
-
-private:
-  CORBA_ContextList_ptr ptr_;
-};
-
-class TAO_Export CORBA_ContextList_out
-{
-  // = TITLE
-  //   The T_out class for ContextList
-  //
-  // = DESCRIPTION
-  //   As any other pseudo object ContextList must have a T_out class,
-  //   the interface an semantics are specified in the CORBA spec.
-  //
-  // = NOTE
-  //   We use CORBA_ContextList_ptr as the _ptr type instead of
-  //   CORBA::ContextList_ptr, this is an attempt to reduced the cyclic
-  //   dependencies in TAO.
-  //
-public:
-  CORBA_ContextList_out (CORBA_ContextList_ptr &);
-  CORBA_ContextList_out (CORBA_ContextList_var &);
-  CORBA_ContextList_out (CORBA_ContextList_out &);
-  CORBA_ContextList_out &operator= (CORBA_ContextList_out &);
-  CORBA_ContextList_out &operator= (const CORBA_ContextList_var &);
-  CORBA_ContextList_out &operator= (CORBA_ContextList_ptr);
-  operator CORBA_ContextList_ptr &();
-  CORBA_ContextList_ptr &ptr (void);
-  CORBA_ContextList_ptr operator-> (void);
-
-private:
-  CORBA_ContextList_ptr &ptr_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Context.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* TAO_CONTEXT_H */
diff --git a/TAO/tao/Context.i b/TAO/tao/Context.i
deleted file mode 100644
index d2ee3370ac1..00000000000
--- a/TAO/tao/Context.i
+++ /dev/null
@@ -1,375 +0,0 @@
-// $Id$
-
-// This may look like C, but it's really -*- C++ -*-
-
-// These should never be non-NULL, but the method
-// is required of pseudo objects.
-ACE_INLINE void
-CORBA::release (CORBA::Context_ptr ctx)
-{
-  if (ctx)
-    ctx->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA_Context*
-CORBA_Context::_duplicate (CORBA_Context* x)
-{
-  if (x != 0)
-    x->_incr_refcnt ();
-  return x;
-}
-
-ACE_INLINE CORBA_Context*
-CORBA_Context::_nil (void)
-{
-  return (CORBA::Context*)0;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Context_ptr ctx)
-{
-  return ctx == 0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Context_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (void)
-  : ptr_ (CORBA_Context::_nil ())
-{
-}
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (CORBA_Context_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_Context_var::~CORBA_Context_var (void)
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Context_var::CORBA_Context_var (const CORBA_Context_var &p)
-  : ptr_ (CORBA_Context::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE CORBA_Context_var &
-CORBA_Context_var::operator= (CORBA_Context_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_var &
-CORBA_Context_var::operator= (const CORBA_Context_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Context::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Context_var::operator const CORBA_Context_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Context_var::operator CORBA_Context_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Context::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_var::_retn (void)
-{
-  // yield ownership
-  CORBA_Context_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Context::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Context_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_Context::_nil ();
-}
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_var &p)
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Context::_nil ();
-}
-
-ACE_INLINE
-CORBA_Context_out::CORBA_Context_out (CORBA_Context_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (CORBA_Context_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (const CORBA_Context_var &p)
-{
-  this->ptr_ = CORBA_Context::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Context_out &
-CORBA_Context_out::operator= (CORBA_Context_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Context_out::operator CORBA_Context_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr &
-CORBA_Context_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Context_ptr
-CORBA_Context_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList
-// *************************************************************
-
-ACE_INLINE
-CORBA_ContextList::CORBA_ContextList (void)
-{
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_ContextList::count (void)
-{
-  return (CORBA::ULong) this->ctx_list_.size ();
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList::_nil (void)
-{
-  return (CORBA_ContextList_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (void) // default constructor
-  : ptr_ (CORBA_ContextList::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (CORBA_ContextList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ContextList_var::CORBA_ContextList_var (const CORBA_ContextList_var &p) // copy constructor
-  : ptr_ (p.ptr_->_duplicate ())
-{}
-
-ACE_INLINE
-CORBA_ContextList_var::~CORBA_ContextList_var (void) // destructor
-{
-  this->ptr_->_destroy ();
-}
-
-ACE_INLINE CORBA_ContextList_var &
-CORBA_ContextList_var::operator= (CORBA_ContextList_ptr p)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_var &
-CORBA_ContextList_var::operator= (const CORBA_ContextList_var &p)
-{
-  if (this != &p)
-    {
-      this->ptr_->_destroy ();
-      this->ptr_ = p.ptr_->_duplicate ();
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ContextList_var::operator const CORBA_ContextList_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ContextList_var::operator CORBA_ContextList_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_var::out (void)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ContextList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ContextList_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ContextList::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ContextList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_ptr &p)
-        : ptr_ (p)
-{
-  this->ptr_ = CORBA_ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_var &p)
-  : ptr_ (p.out ())
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ContextList::_nil ();
-}
-
-ACE_INLINE
-CORBA_ContextList_out::CORBA_ContextList_out (CORBA_ContextList_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (CORBA_ContextList_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (const CORBA_ContextList_var &p)
-{
-  this->ptr_ = p.ptr ()->_duplicate ();
-  return *this;
-}
-
-ACE_INLINE CORBA_ContextList_out &
-CORBA_ContextList_out::operator= (CORBA_ContextList_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ContextList_out::operator CORBA_ContextList_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr &
-CORBA_ContextList_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ContextList_ptr
-CORBA_ContextList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
diff --git a/TAO/tao/Current.pidl b/TAO/tao/Current.pidl
index f6e6498be41..586d7e97db2 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -1,10 +1,5 @@
 // $Id$
-
-#pragma prefix "omg.org"
-
 module CORBA
 {
   interface Current {};
 };
-
-#pragma prefix ""
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 806197250e0..c2a2e5e4728 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -38,7 +38,7 @@ CORBA_Current_ptr CORBA_Current::_narrow (
     return CORBA_Current::_nil ();
   if (!obj->_is_a ("IDL:CORBA/Current:1.0", env))
     return CORBA_Current::_nil ();
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
          || !obj->_servant()
@@ -89,7 +89,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_Current_ptr &_tao_
   _tao_elem = CORBA_Current::_nil ();
   CORBA::TypeCode_var type = _tao_any.type ();
   if (!type->equal (CORBA::_tc_Current, _tao_env)) return 0; // not equal
-  TAO_InputCDR stream (_tao_any._tao_get_cdr ());
+  TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
   CORBA::Object_ptr *_tao_obj_ptr;
   ACE_NEW_RETURN (_tao_obj_ptr, CORBA::Object_ptr, 0);
   if (stream.decode (CORBA::_tc_Current, _tao_obj_ptr, 0, _tao_env)
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index 065c65cf8e1..12a84b682a8 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -107,11 +107,6 @@ private:
 class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
 {
  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_Current_ptr _ptr_type;
-    typedef CORBA_Current_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_Current_ptr _duplicate (CORBA_Current_ptr obj);
   static CORBA_Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -123,7 +118,7 @@ class  CORBA_Current : public virtual ACE_CORBA_1 (Object)
   virtual const char* _interface_repository_id (void) const;
  protected:
   CORBA_Current (void); // default constructor
-  CORBA_Current (TAO_Stub *objref,
+  CORBA_Current (STUB_Object *objref,
            TAO_ServantBase *_tao_servant = 0,
            CORBA::Boolean _tao_collocated = 0
            );
diff --git a/TAO/tao/CurrentC.i b/TAO/tao/CurrentC.i
index e4232c052e2..2040384c0b8 100644
--- a/TAO/tao/CurrentC.i
+++ b/TAO/tao/CurrentC.i
@@ -12,7 +12,7 @@ CORBA_Current::CORBA_Current (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_Current::CORBA_Current (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_Current::CORBA_Current (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp
index faa403a31aa..f2daf95fdb5 100644
--- a/TAO/tao/CurrentS.cpp
+++ b/TAO/tao/CurrentS.cpp
@@ -11,19 +11,62 @@
 #include "tao/Operation_Table.h"
 #include "tao/POA_CORBA.h"
 #include "tao/Server_Request.h"
-#include "tao/Environment.h"
-#include "tao/Typecode.h"
 
 ACE_RCSID(tao, CurrentS, "$Id$")
 
+static const TAO_operation_db_entry CORBA_Current_operations [] = {
+  {"_is_a", &POA_CORBA::Current::_is_a_skel}
+};
+
+static const CORBA::Long _tao_CORBA_Current_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (3);
+static char _tao_CORBA_Current_optable_pool [_tao_CORBA_Current_optable_size];
+static ACE_Static_Allocator_Base _tao_CORBA_Current_allocator (_tao_CORBA_Current_optable_pool, _tao_CORBA_Current_optable_size);
+TAO_Dynamic_Hash_OpTable tao_CORBA_Current_optable (CORBA_Current_operations, 1, 2, &_tao_CORBA_Current_allocator);
+// skeleton constructor
 POA_CORBA::Current::Current (void)
 {
+  this->optable_ = &tao_CORBA_Current_optable;
 }
 
 // skeleton destructor
 POA_CORBA::Current::~Current (void)
 {
 }
+void POA_CORBA::Current::_is_a_skel (
+    CORBA::ServerRequest &_tao_server_request,
+    void * _tao_object_reference,
+    void * /*context*/,
+    CORBA::Environment &_tao_environment
+  )
+{
+  static const TAO_Param_Data_Skel CORBA_Current_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel CORBA_Current_is_a_calldata =
+  {"_is_a", 1, 2, CORBA_Current_is_a_paramdata};
+  //  CORBA::Environment _tao_skel_environment;
+  POA_CORBA::Current_ptr  _tao_impl = (POA_CORBA::Current_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+    _tao_environment,
+    &CORBA_Current_is_a_calldata,
+    &_tao_retval,
+    &_tao_value
+  );
+  if (_tao_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_environment);
+  _tao_server_request.marshal (
+    _tao_environment,
+    //    _tao_skel_environment,
+    &CORBA_Current_is_a_calldata,
+    &_tao_retval,
+    &_tao_value
+  );
+  CORBA::string_free (_tao_value);
+}
 
 CORBA::Boolean POA_CORBA::Current::_is_a (
     const char* value,
@@ -56,7 +99,7 @@ void POA_CORBA::Current::_dispatch (CORBA::ServerRequest &req, void *context, CO
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
   {
-    env.exception (new CORBA_BAD_OPERATION ());
+    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
   }
 else
@@ -70,7 +113,7 @@ const char* POA_CORBA::Current::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_Current::_tao_collocated_Current (
     POA_CORBA::Current_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_Current (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -98,7 +141,7 @@ CORBA::Boolean POA_CORBA::_tao_collocated_Current::_is_a (
 CORBA::Current*
 POA_CORBA::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_CORBA::_tao_collocated_Current (this, stub);
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
deleted file mode 100644
index 6e20883b2cf..00000000000
--- a/TAO/tao/Domain.pidl
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Domain.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Domain{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#if !defined POLICY_DOMAIN_IDL
-#define POLICY_DOMAIN_IDL
-
-
-
-#pragma prefix "omg.org"
-
-#include "Policy.pidl"
-
-module CORBA
-{
-  interface DomainManager
-  {
-    Policy get_domain_policy (
-      in PolicyType policy_type);
-  };
-
-  const PolicyType SecConstruction = 11;
-
-  interface ConstructionPolicy : Policy
-  {
-    void make_domain_manager (
-      in InterfaceDef object_type,
-      in boolean constr_policy);
-  };
-
-  typedef sequence <DomainManager> DomainManagerList;
-};
-
-#endif /* !defined POLICY_DOMAIN_IDL */
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
deleted file mode 100644
index a65736ba3a1..00000000000
--- a/TAO/tao/DomainC.cpp
+++ /dev/null
@@ -1,478 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
-//
-// And later modified by Jeff Parsons
-//
-// 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 "tao/DomainC.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/varout.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DomainC.i"
-#endif /* !defined INLINE */
-
-const CORBA::PolicyType CORBA::SecConstruction = 11;
-
-CORBA::DomainManager_ptr
-CORBA_DomainManager::_nil (void)
-{
-  return (CORBA::DomainManager_ptr)0;
-}
-
-CORBA_DomainManager_ptr CORBA_DomainManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DomainManager::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/DomainManager:1.0", env))
-    return CORBA_DomainManager::_nil ();
-  return CORBA_DomainManager::_unchecked_narrow (obj, env);
-}
-
-CORBA_DomainManager_ptr CORBA_DomainManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_DomainManager::_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/DomainManager:1.0");
-  if (servant == 0)
-    return new CORBA_DomainManager(stub);
-  return new POA_CORBA::_tao_collocated_DomainManager(
-      ACE_reinterpret_cast(POA_CORBA::DomainManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_DomainManager_ptr
-CORBA_DomainManager::_duplicate (CORBA_DomainManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-CORBA::Policy_ptr CORBA_DomainManager::get_domain_policy (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Policy_ptr _tao_retval = CORBA::Policy::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_domain_policy",
-      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 << policy_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::Boolean CORBA_DomainManager::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager: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);
-}
-
-const char* CORBA_DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstructionPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/ConstructionPolicy:1.0", env))
-    return CORBA::ConstructionPolicy::_nil ();
-  return CORBA::ConstructionPolicy::_unchecked_narrow (obj, env);
-}
-
-CORBA::ConstructionPolicy_ptr CORBA::ConstructionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::ConstructionPolicy::_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/ConstructionPolicy:1.0");
-  if (servant == 0)
-    return new CORBA::ConstructionPolicy(stub);
-  return new POA_CORBA::_tao_collocated_ConstructionPolicy(
-      ACE_reinterpret_cast(POA_CORBA::ConstructionPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::ConstructionPolicy_ptr
-CORBA::ConstructionPolicy::_duplicate (CORBA::ConstructionPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-void CORBA::ConstructionPolicy::make_domain_manager (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments.
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "make_domain_manager",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-#if 0
-    TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-  // @@ The insertion operation (<<) for InterfaceDef will be
-  // defined, and thus this code will work.
-    if (!(
-          (_tao_out << object_type) &&
-          (_tao_out << CORBA::Any::from_boolean (constr_policy))
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-#endif /* 0 */
-
-    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::ConstructionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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);
-}
-
-const char* CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-// *************************************************************
-// CORBA_DomainManagerList
-// *************************************************************
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (void)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (max)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (CORBA::ULong max,
-                                                  CORBA::ULong length,
-                                                  CORBA_DomainManager_ptr *buffer,
-                                                  CORBA::Boolean release)
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (max,
-                                                        length,
-                                                        buffer,
-                                                        release)
-{}
-
-CORBA_DomainManagerList::CORBA_DomainManagerList (const CORBA_DomainManagerList &seq) // copy ctor
-  : TAO_Unbounded_Object_Sequence<CORBA_DomainManager> (seq)
-{}
-
-CORBA_DomainManagerList::~CORBA_DomainManagerList (void) // dtor
-{}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_DomainManager_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_DomainManager::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_DomainManager, _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_DomainManager_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_DomainManager::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DomainManager, 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_DomainManager, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_DomainManager::_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_DomainManager, 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_DomainManager>;
-  template class TAO_Unbounded_Object_Sequence<CORBA_DomainManager>;
-  template class TAO_Object_Manager<CORBA_DomainManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Field_T<CORBA_DomainManager>
-# pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_DomainManager>
-# pragma instantiate TAO_Object_Manager<CORBA_DomainManager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_ConstructionPolicy_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_ConstructionPolicy::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_ConstructionPolicy, _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_ConstructionPolicy_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_ConstructionPolicy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ConstructionPolicy, 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_ConstructionPolicy, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_ConstructionPolicy::_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_ConstructionPolicy, 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_ConstructionPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Field_T<CORBA_ConstructionPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_DomainManagerList &_tao_elem
-  ) // copying
-{
-  CORBA_DomainManagerList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_DomainManagerList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_DomainManagerList, _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_DomainManagerList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_DomainManagerList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_DomainManagerList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DomainManagerList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_DomainManagerList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_DomainManagerList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_DomainManagerList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_DomainManagerList, _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;
-}
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
deleted file mode 100644
index 4b82e22e0e6..00000000000
--- a/TAO/tao/DomainC.h
+++ /dev/null
@@ -1,338 +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_DOMAINC_H
-#define TAO_IDL_DOMAINC_H
-
-#include "tao/corbafwd.h"
-#include "tao/PolicyC.h"
-#include "tao/Environment.h"
-#include "tao/Any.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 TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export CORBA_DomainManager_var
-{
-public:
-  CORBA_DomainManager_var (void); // default constructor
-  CORBA_DomainManager_var (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var (const CORBA_DomainManager_var &); // copy constructor
-  ~CORBA_DomainManager_var (void); // destructor
-    
-  CORBA_DomainManager_var &operator= (CORBA_DomainManager_ptr);
-  CORBA_DomainManager_var &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_ptr operator-> (void) const;
-    
-  operator const CORBA_DomainManager_ptr &() const;
-  operator CORBA_DomainManager_ptr &();
-  // in, inout, out, _retn 
-  CORBA_DomainManager_ptr in (void) const;
-  CORBA_DomainManager_ptr &inout (void);
-  CORBA_DomainManager_ptr &out (void);
-  CORBA_DomainManager_ptr _retn (void);
-  CORBA_DomainManager_ptr ptr (void) const;
-
-private:
-  CORBA_DomainManager_ptr ptr_;
-};
-
-class TAO_Export CORBA_DomainManager_out
-{
-public:
-  CORBA_DomainManager_out (CORBA_DomainManager_ptr &);
-  CORBA_DomainManager_out (CORBA_DomainManager_var &);
-  CORBA_DomainManager_out (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_out &);
-  CORBA_DomainManager_out &operator= (const CORBA_DomainManager_var &);
-  CORBA_DomainManager_out &operator= (CORBA_DomainManager_ptr);
-  operator CORBA_DomainManager_ptr &();
-  CORBA_DomainManager_ptr &ptr (void);
-  CORBA_DomainManager_ptr operator-> (void);
-    
-private:
-  CORBA_DomainManager_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DomainManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_DomainManager_ptr _ptr_type;
-  typedef CORBA_DomainManager_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DomainManager_ptr _duplicate (CORBA_DomainManager_ptr obj);
-  static CORBA_DomainManager_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  static CORBA_DomainManager_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  static CORBA_DomainManager_ptr _nil (void);
-
-  virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        CORBA::default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  CORBA_DomainManager (void);
-  CORBA_DomainManager (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DomainManager (void);
-private:
-  CORBA_DomainManager (const CORBA_DomainManager &);
-  void operator= (const CORBA_DomainManager &);
-};
-
-// *************************************************************
-// DomainManagerList
-// *************************************************************
-  
-class TAO_Export CORBA_DomainManagerList : public TAO_Unbounded_Object_Sequence<CORBA_DomainManager>
-{
-public:
-  CORBA_DomainManagerList (void); // default ctor
-  CORBA_DomainManagerList (CORBA::ULong max); // uses max size
-  CORBA_DomainManagerList (
-    CORBA::ULong max, 
-    CORBA::ULong length, 
-    CORBA_DomainManager_ptr *buffer, 
-    CORBA::Boolean release=0
-  );
-  CORBA_DomainManagerList (const CORBA_DomainManagerList &); // copy ctor
-  ~CORBA_DomainManagerList (void); // dtor
-};
-
-typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr;
-
-// *************************************************************
-// class CORBA::DomainManagerList_var
-// *************************************************************
-
-class TAO_Export CORBA_DomainManagerList_var
-{
-public:
-  CORBA_DomainManagerList_var (void); // default constructor
-  CORBA_DomainManagerList_var (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &); // copy constructor
-  ~CORBA_DomainManagerList_var (void); // destructor
-    
-  CORBA_DomainManagerList_var &operator= (CORBA_DomainManagerList *);
-  CORBA_DomainManagerList_var &operator= (const CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList *operator-> (void);
-  const CORBA_DomainManagerList *operator-> (void) const;
-    
-  operator const CORBA_DomainManagerList &() const;
-  operator CORBA_DomainManagerList &();
-  operator CORBA_DomainManagerList &() const;
-    
-  TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong index);
-  // in, inout, out, _retn 
-  const CORBA_DomainManagerList &in (void) const;
-  CORBA_DomainManagerList &inout (void);
-  CORBA_DomainManagerList *&out (void);
-  CORBA_DomainManagerList *_retn (void);
-  CORBA_DomainManagerList *ptr (void) const;
-
-private:
-  CORBA_DomainManagerList *ptr_;
-};
-
-class TAO_Export CORBA_DomainManagerList_out
-{
-public:
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList *&);
-  CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &);
-  CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (const CORBA_DomainManagerList_out &);
-  CORBA_DomainManagerList_out &operator= (CORBA_DomainManagerList *);
-  operator CORBA_DomainManagerList *&();
-  CORBA_DomainManagerList *&ptr (void);
-  CORBA_DomainManagerList *operator-> (void);
-    
-  TAO_Object_Manager<CORBA_DomainManager> operator[] (CORBA::ULong index);
-    
-private:
-  CORBA_DomainManagerList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_DomainManagerList_var &);
-};
-
-// *************************************************************
-// ConstructionPolicy
-// *************************************************************
-  
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export CORBA_ConstructionPolicy_var
-{
-public:
-  CORBA_ConstructionPolicy_var (void); // default constructor
-  CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr);
-  CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &); // copy constructor
-  ~CORBA_ConstructionPolicy_var (void); // destructor
-    
-  CORBA_ConstructionPolicy_var &operator= (CORBA_ConstructionPolicy_ptr);
-  CORBA_ConstructionPolicy_var &operator= (const CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_ptr operator-> (void) const;
-    
-  operator const CORBA_ConstructionPolicy_ptr &() const;
-  operator CORBA_ConstructionPolicy_ptr &();
-  // in, inout, out, _retn 
-  CORBA_ConstructionPolicy_ptr in (void) const;
-  CORBA_ConstructionPolicy_ptr &inout (void);
-  CORBA_ConstructionPolicy_ptr &out (void);
-  CORBA_ConstructionPolicy_ptr _retn (void);
-  CORBA_ConstructionPolicy_ptr ptr (void) const;
-
-private:
-  CORBA_ConstructionPolicy_ptr ptr_;
-};
-
-class TAO_Export CORBA_ConstructionPolicy_out
-{
-public:
-  CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &);
-  CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &);
-  CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_out &);
-  CORBA_ConstructionPolicy_out &operator= (const CORBA_ConstructionPolicy_var &);
-  CORBA_ConstructionPolicy_out &operator= (CORBA_ConstructionPolicy_ptr);
-  operator CORBA_ConstructionPolicy_ptr &();
-  CORBA_ConstructionPolicy_ptr &ptr (void);
-  CORBA_ConstructionPolicy_ptr operator-> (void);
-    
-private:
-  CORBA_ConstructionPolicy_ptr &ptr_;
-};
-
-class TAO_Export CORBA_ConstructionPolicy: public virtual CORBA_Policy
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ConstructionPolicy_ptr _ptr_type;
-  typedef CORBA_ConstructionPolicy_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_ConstructionPolicy_ptr _duplicate (CORBA_ConstructionPolicy_ptr obj);
-  static CORBA_ConstructionPolicy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  static CORBA_ConstructionPolicy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  static CORBA_ConstructionPolicy_ptr _nil (void);
-
-  virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV = 
-        CORBA::default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id, 
-      CORBA::Environment &env = 
-        CORBA::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-
-protected:
-  CORBA_ConstructionPolicy (void);
-  CORBA_ConstructionPolicy (TAO_Stub *objref, 
-      TAO_ServantBase *_tao_servant = 0, 
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_ConstructionPolicy (void);
-private:
-  CORBA_ConstructionPolicy (const CORBA_ConstructionPolicy &);
-  void operator= (const CORBA_ConstructionPolicy &);
-};
-
-// Any operators for interface CORBA_ConstructionPolicy
-void TAO_Export operator<<= (CORBA::Any &, 
-                             CORBA_ConstructionPolicy_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, 
-                                       CORBA_ConstructionPolicy *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, 
-                                      const CORBA_ConstructionPolicy_ptr );
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, 
-                                      CORBA_ConstructionPolicy_ptr &);
-
-#endif /* __ACE_INLINE__ */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-
-
-
-// Any operators for interface CORBA_DomainManager
-void TAO_Export operator<<= (CORBA::Any &, 
-                             CORBA_DomainManager_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, 
-                                       CORBA_DomainManager *&);
-
-// Any operators for interface CORBA_DomainManagerList
-void TAO_Export operator<<= (CORBA::Any &, 
-                             const CORBA_DomainManagerList &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, 
-                             CORBA_DomainManagerList*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, 
-                                       CORBA_DomainManagerList *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, 
-                                      const CORBA_DomainManager_ptr );
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, 
-                                      CORBA_DomainManager_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, 
-                                      const CORBA_DomainManagerList &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, 
-                                      CORBA_DomainManagerList &);
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#include "DomainC.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_IDL_DOMAINC_H */
diff --git a/TAO/tao/DomainC.i b/TAO/tao/DomainC.i
deleted file mode 100644
index 853a222192e..00000000000
--- a/TAO/tao/DomainC.i
+++ /dev/null
@@ -1,685 +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_DomainManager::CORBA_DomainManager (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DomainManager::CORBA_DomainManager (TAO_Stub *objref, 
-                                     TAO_ServantBase *_tao_servant, 
-				     CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DomainManager::~CORBA_DomainManager (void) // destructor
-{}
-
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (void) // default constructor
-  : ptr_ (CORBA::DomainManager::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (CORBA::DomainManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA::DomainManager_ptr 
-CORBA_DomainManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DomainManager_var::CORBA_DomainManager_var (const CORBA::DomainManager_var &p) // copy constructor
-  : ptr_ (CORBA::DomainManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DomainManager_var::~CORBA_DomainManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (CORBA::DomainManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA::DomainManager_var &
-CORBA_DomainManager_var::operator= (const CORBA::DomainManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DomainManager_var::operator const CORBA::DomainManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DomainManager_var::operator CORBA::DomainManager_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr 
-CORBA_DomainManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr
-CORBA_DomainManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr &
-CORBA_DomainManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr &
-CORBA_DomainManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::DomainManager_ptr 
-CORBA_DomainManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DomainManager_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DomainManager::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA::DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (CORBA_DomainManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DomainManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_DomainManager_out::CORBA_DomainManager_out (const CORBA_DomainManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManager_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA::DomainManager_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (const CORBA_DomainManager_var &p)
-{
-  this->ptr_ = CORBA::DomainManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManager_out &
-CORBA_DomainManager_out::operator= (CORBA_DomainManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DomainManager_out::operator CORBA_DomainManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManager_ptr &
-CORBA_DomainManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManager_ptr 
-CORBA_DomainManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy::CORBA_ConstructionPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy::~CORBA_ConstructionPolicy (void) // destructor
-{}
-
-ACE_INLINE CORBA::ConstructionPolicy_ptr
-CORBA_ConstructionPolicy::_nil (void)
-{
-  return (CORBA_ConstructionPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (void) // default constructor
-  : ptr_ (CORBA_ConstructionPolicy::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (CORBA_ConstructionPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr 
-CORBA_ConstructionPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::CORBA_ConstructionPolicy_var (const CORBA_ConstructionPolicy_var &p) // copy constructor
-  : ptr_ (CORBA_ConstructionPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_var::~CORBA_ConstructionPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_var &
-CORBA_ConstructionPolicy_var::operator= (const CORBA_ConstructionPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_ConstructionPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ConstructionPolicy_var::operator const CORBA_ConstructionPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ConstructionPolicy_var::operator CORBA_ConstructionPolicy_ptr &() // cast 
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr 
-CORBA_ConstructionPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr
-CORBA_ConstructionPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr 
-CORBA_ConstructionPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ConstructionPolicy_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ConstructionPolicy_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (CORBA_ConstructionPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_ConstructionPolicy::_nil ();
-}
-
-ACE_INLINE
-CORBA_ConstructionPolicy_out::CORBA_ConstructionPolicy_out (const CORBA_ConstructionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ConstructionPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (const CORBA_ConstructionPolicy_var &p)
-{
-  this->ptr_ = CORBA::ConstructionPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_out &
-CORBA_ConstructionPolicy_out::operator= (CORBA_ConstructionPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ConstructionPolicy_out::operator CORBA_ConstructionPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr &
-CORBA_ConstructionPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ConstructionPolicy_ptr 
-CORBA_ConstructionPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (CORBA_DomainManagerList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::CORBA_DomainManagerList_var (const CORBA_DomainManagerList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_DomainManagerList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_var::~CORBA_DomainManagerList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList_var &
-CORBA_DomainManagerList_var::operator= (CORBA_DomainManagerList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManagerList_var &
-CORBA_DomainManagerList_var::operator= (const CORBA_DomainManagerList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_DomainManagerList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DomainManagerList_var::operator const CORBA_DomainManagerList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_DomainManagerList_var::operator CORBA_DomainManagerList &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager> 
-CORBA_DomainManagerList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_DomainManagerList &
-CORBA_DomainManagerList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList &
-CORBA_DomainManagerList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_DomainManagerList *&
-CORBA_DomainManagerList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_var::_retn (void)
-{
-  CORBA_DomainManagerList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA::DomainManagerList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::DomainManagerList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (CORBA_DomainManagerList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_DomainManagerList_out::CORBA_DomainManagerList_out (const CORBA_DomainManagerList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DomainManagerList_out &
-CORBA_DomainManagerList_out::operator= (const CORBA_DomainManagerList_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DomainManagerList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DomainManagerList_out &
-CORBA_DomainManagerList_out::operator= (CORBA_DomainManagerList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_DomainManagerList_out::operator CORBA_DomainManagerList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *&
-CORBA_DomainManagerList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DomainManagerList *
-CORBA_DomainManagerList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_Object_Manager<CORBA_DomainManager> 
-CORBA_DomainManagerList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_DomainManager_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA_DomainManager_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManager_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_DomainManager_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_DomainManager::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_ConstructionPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    CORBA::ConstructionPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ConstructionPolicy_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_ConstructionPolicy_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_ConstructionPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DomainManagerList &_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_DomainManagerList &_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/DomainS.cpp b/TAO/tao/DomainS.cpp
deleted file mode 100644
index 9e9c01aeccb..00000000000
--- a/TAO/tao/DomainS.cpp
+++ /dev/null
@@ -1,526 +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 "DomainC.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-#include "tao/POA_CORBA.h"
-#include "tao/ORB.h"
-
-class TAO_CORBA_DomainManager_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 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DomainManager_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18,  0, 18,  0, 18, 18,
-     18, 18, 18,  0, 18, 18, 18, 18, 18, 18,
-     18, 18, 18, 18, 18, 18,  0, 18, 18, 18,
-     18,  0, 18, 18, 18, 18, 18, 18,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_DomainManager_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 17,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_is_a",  &POA_CORBA::DomainManager::_is_a_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_non_existent",  &POA_CORBA::DomainManager::_non_existent_skel},
-      {"",}, {"",}, {"",},
-      {"get_domain_policy", 	&POA_CORBA::DomainManager::get_domain_policy_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_DomainManager_Perfect_Hash_OpTable tao_CORBA_DomainManager_optable;
-
-// skeleton constructor
-POA_CORBA::DomainManager::DomainManager (void)
-{
-  this->optable_ = &tao_CORBA_DomainManager_optable;
-}
-
-// copy ctor
-POA_CORBA::DomainManager::DomainManager (const DomainManager& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::DomainManager::~DomainManager (void)
-{
-}
-
-void POA_CORBA::DomainManager::get_domain_policy_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_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *)_tao_object_reference;
-  CORBA::Policy_var _tao_retval;
-  CORBA::PolicyType policy_type;
-  if (!(
-    (_tao_in >> policy_type)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::DomainManager::_is_a_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_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  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 ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::DomainManager::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::DomainManager *_tao_impl = (POA_CORBA::DomainManager *) _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 ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::DomainManager::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DomainManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::DomainManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DomainManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::DomainManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DomainManager:1.0";
-}
-
-
-CORBA::DomainManager*
-POA_CORBA::DomainManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_DomainManager (this, stub);
-}
-
-POA_CORBA::_tao_collocated_DomainManager::_tao_collocated_DomainManager (
-    POA_CORBA::DomainManager_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (DomainManager) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DomainManager_ptr POA_CORBA::_tao_collocated_DomainManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Policy_ptr POA_CORBA::_tao_collocated_DomainManager::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-}
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_CORBA_ConstructionPolicy_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 20:54:02 */
-/* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20,  0,
-     20, 20, 20, 20,  0, 20,  0, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 3,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_is_a",  &POA_CORBA::ConstructionPolicy::_is_a_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_non_existent",  &POA_CORBA::ConstructionPolicy::_non_existent_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"make_domain_manager", 	&POA_CORBA::ConstructionPolicy::make_domain_manager_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 20:54:02 */
-static TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable tao_CORBA_ConstructionPolicy_optable;
-
-// skeleton constructor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
-{
-  this->optable_ = &tao_CORBA_ConstructionPolicy_optable;
-}
-
-// copy ctor
-POA_CORBA::ConstructionPolicy::ConstructionPolicy (const ConstructionPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-// skeleton destructor
-POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
-{
-}
-
-void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments. Right now we raise a
-  // MARSHAL exception....
-
-  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *)_tao_object_reference;
-
-// @@ Needs implementation of InterfaceDef_var and >> operator
-#if 0
-  CORBA::InterfaceDef_var object_type;
-
-  CORBA::Boolean constr_policy;
-  if (!(
-    (_tao_in >> object_type.out ()) &&
-    (_tao_in >> CORBA::Any::to_boolean (constr_policy))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->make_domain_manager (
-    object_type.in (),
-    constr_policy,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-#else /* 0 */
-  ACE_UNUSED_ARG (_tao_in);
-  ACE_UNUSED_ARG (_tao_impl);
-  ACE_THROW (CORBA::MARSHAL ());
-#endif /* 0 */
-}
-
-void POA_CORBA::ConstructionPolicy::_is_a_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_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  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 ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  POA_CORBA::ConstructionPolicy *_tao_impl = (POA_CORBA::ConstructionPolicy *) _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 ();
-  if (!((_tao_out << CORBA::Any::from_boolean (_tao_retval))))
-    ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstructionPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::ConstructionPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel, req.operation_length ()) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/ConstructionPolicy:1.0";
-}
-
-
-CORBA::ConstructionPolicy*
-POA_CORBA::ConstructionPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_ConstructionPolicy (this, stub);
-}
-
-POA_CORBA::_tao_collocated_ConstructionPolicy::_tao_collocated_ConstructionPolicy (
-    POA_CORBA::ConstructionPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (ConstructionPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::ConstructionPolicy_ptr POA_CORBA::_tao_collocated_ConstructionPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-void POA_CORBA::_tao_collocated_ConstructionPolicy::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->make_domain_manager (
-    object_type,
-    constr_policy,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_ConstructionPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
diff --git a/TAO/tao/DomainS_T.cpp b/TAO/tao/DomainS_T.cpp
deleted file mode 100644
index 83f26cd625b..00000000000
--- a/TAO/tao/DomainS_T.cpp
+++ /dev/null
@@ -1,25 +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_DOMAINS_T_CPP_
-#define _TAO_IDL_DOMAINS_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "DomainS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "DomainS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/DomainS_T.h b/TAO/tao/DomainS_T.h
deleted file mode 100644
index 5e7874a77fb..00000000000
--- a/TAO/tao/DomainS_T.h
+++ /dev/null
@@ -1,37 +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_DOMAINS_T_H_
-#define _TAO_IDL_DOMAINS_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "DomainS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "DomainS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("DomainS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/DomainS_T.i b/TAO/tao/DomainS_T.i
deleted file mode 100644
index fdb9a68330d..00000000000
--- a/TAO/tao/DomainS_T.i
+++ /dev/null
@@ -1,214 +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
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DomainManager_tie<T>::~DomainManager_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::DomainManager_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DomainManager_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DomainManager_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DomainManager_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
-    CORBA::PolicyType policy_type,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->get_domain_policy (
-    policy_type,
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::ConstructionPolicy_tie<T>::~ConstructionPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::ConstructionPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::ConstructionPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->make_domain_manager (
-    object_type,
-    constr_policy,
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA)
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index cdac0673f3e..95c82aa53d3 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -18,14 +18,11 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 //
 //
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
+// Modified by Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ======================================================================
 
 #include "tao/DynAnyC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Stub.h"
 #include "tao/Servant_Base.h"
 #include "tao/varout.h"
@@ -35,8 +32,6 @@
 #include "DynAnyC.i"
 #endif /* !defined INLINE */
 
-ACE_RCSID(tao, DynAnyC, "$Id$")
-
 CORBA_DynAny_ptr CORBA_DynAny::_duplicate (CORBA_DynAny_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -54,7 +49,7 @@ CORBA_DynAny_ptr CORBA_DynAny::_narrow (CORBA::Object_ptr obj,
   if (!obj->_is_a ("IDL:/CORBA_DynAny:1.0", env))
     return CORBA_DynAny::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -714,7 +709,7 @@ CORBA_DynEnum_ptr CORBA_DynEnum::_narrow (CORBA::Object_ptr obj,
   if (!obj->_is_a ("IDL:/CORBA_DynEnum:1.0", env))
     return CORBA_DynEnum::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -801,56 +796,197 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DynEnum (CORBA::tk_objref,
 
 CORBA::TypeCode_ptr _tc_CORBA_DynEnum = &_tc_TAO_tc_CORBA_DynEnum;
 
-#if !defined (_CORBA_NAME_VALUE_PAIR_SEQ_CS_)
-#define _CORBA_NAME_VALUE_PAIR_SEQ_CS_
+static const CORBA::Long _oc_FieldName[] =
+{
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  19,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f466965),
+  ACE_NTOHL (0x6c644e61),
+  ACE_NTOHL (0x6d653a31),
+  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/FieldName:1.0
+  10,
+  ACE_NTOHL (0x4669656c),
+  ACE_NTOHL (0x644e616d),
+  ACE_NTOHL (0x6500fdfd),   // name = FieldName
+  CORBA::tk_string,
+  0,                        // string length
+};
+static CORBA::TypeCode _tc_TAO_tc_FieldName (CORBA::tk_alias,
+                                          sizeof (_oc_FieldName),
+                                          (char *) &_oc_FieldName,
+                                          0,
+                                          sizeof (FieldName));
+
+CORBA::TypeCode_ptr _tc_FieldName = &_tc_TAO_tc_FieldName;
+
+static const CORBA::Long _oc_NameValuePair[] =
+{
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  23,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f4e616d),
+  ACE_NTOHL (0x6556616c),
+  ACE_NTOHL (0x75655061),
+  ACE_NTOHL (0x69723a31),
+  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/NameValuePair:1.0
+  14,
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65506169),
+  ACE_NTOHL (0x7200fdfd),   // name = NameValuePair
+  2,                        // member count
+  3,
+  ACE_NTOHL (0x696400fd),   // name = id
+  CORBA::tk_alias,          // typecode kind for typedefs
+  52,                       // encapsulation length
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  19,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f466965),
+  ACE_NTOHL (0x6c644e61),
+  ACE_NTOHL (0x6d653a31),
+  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/FieldName:1.0
+  10,
+  ACE_NTOHL (0x4669656c),
+  ACE_NTOHL (0x644e616d),
+  ACE_NTOHL (0x6500fdfd),   // name = FieldName
+  CORBA::tk_string,
+  0,                        // string length
+  6,
+  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x6500fdfd),   // name = value
+  CORBA::tk_any,
+};
+
+static CORBA::TypeCode _tc_TAO_tc_NameValuePair (CORBA::tk_struct,
+                                              sizeof (_oc_NameValuePair),
+                                              (char *) &_oc_NameValuePair,
+                                              0,
+                                              sizeof (NameValuePair));
+
+CORBA::TypeCode_ptr _tc_NameValuePair = &_tc_TAO_tc_NameValuePair;
+
+
+#if !defined (_NAMEVALUEPAIRSEQ_CS_)
+#define _NAMEVALUEPAIRSEQ_CS_
 
 // *************************************************************
-// CORBA_NameValuePairSeq
+// NameValuePairSeq
 // *************************************************************
 
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (void)
+NameValuePairSeq::NameValuePairSeq (void)
 {}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max) // uses max size
+NameValuePairSeq::NameValuePairSeq (CORBA::ULong max) // uses max size
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
+  _TAO_Unbounded_Sequence_NameValuePairSeq
 #else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::NameValuePair>
+  TAO_Unbounded_Sequence<NameValuePair>
 #endif /* AHETI */
  (max)
 {}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (CORBA::ULong max,
+NameValuePairSeq::NameValuePairSeq (CORBA::ULong max,
                                     CORBA::ULong length,
-                                    CORBA::NameValuePair *buffer,
+                                    NameValuePair *buffer,
                                     CORBA::Boolean release)
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
+  _TAO_Unbounded_Sequence_NameValuePairSeq
 #else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA::NameValuePair>
+  TAO_Unbounded_Sequence<NameValuePair>
 #endif /* AHETI */
  (max, length, buffer, release)
 {}
-CORBA_NameValuePairSeq::CORBA_NameValuePairSeq (
-    const CORBA_NameValuePairSeq &seq
+NameValuePairSeq::NameValuePairSeq (
+    const NameValuePairSeq &seq
   ) // copy ctor
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
+  _TAO_Unbounded_Sequence_NameValuePairSeq
 #else /* AHETI */
-  TAO_Unbounded_Sequence< CORBA::NameValuePair>
+  TAO_Unbounded_Sequence<NameValuePair>
 #endif /* AHETI */
  (seq)
 {}
-CORBA_NameValuePairSeq::~CORBA_NameValuePairSeq (void) // dtor
+NameValuePairSeq::~NameValuePairSeq (void) // dtor
 {}
 
 
 #endif /* end #if !defined */
 
+static const CORBA::Long _oc_NameValuePairSeq[] =
+{
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  26,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f4e616d),
+  ACE_NTOHL (0x6556616c),
+  ACE_NTOHL (0x75655061),
+  ACE_NTOHL (0x69725365),
+  ACE_NTOHL (0x713a312e),
+  ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:/NameValuePairSeq:1.0
+  17,
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65506169),
+  ACE_NTOHL (0x72536571),
+  ACE_NTOHL (0xfdfdfd),     // name = NameValuePairSeq
+  CORBA::tk_sequence,       // typecode kind
+  156,                      // encapsulation length
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  CORBA::tk_struct,         // typecode kind
+  140,                      // encapsulation length
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  23,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f4e616d),
+  ACE_NTOHL (0x6556616c),
+  ACE_NTOHL (0x75655061),
+  ACE_NTOHL (0x69723a31),
+  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/NameValuePair:1.0
+  14,
+  ACE_NTOHL (0x4e616d65),
+  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x65506169),
+  ACE_NTOHL (0x7200fdfd),   // name = NameValuePair
+  2,                        // member count
+  3,
+  ACE_NTOHL (0x696400fd),   // name = id
+  CORBA::tk_alias,          // typecode kind for typedefs
+  52,                       // encapsulation length
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  19,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f466965),
+  ACE_NTOHL (0x6c644e61),
+  ACE_NTOHL (0x6d653a31),
+  ACE_NTOHL (0x2e3000fd),   // repository ID = IDL:/FieldName:1.0
+  10,
+  ACE_NTOHL (0x4669656c),
+  ACE_NTOHL (0x644e616d),
+  ACE_NTOHL (0x6500fdfd),   // name = FieldName
+  CORBA::tk_string,
+  0,                        // string length
+  6,
+  ACE_NTOHL (0x76616c75),
+  ACE_NTOHL (0x6500fdfd),   // name = value
+  CORBA::tk_any,
+  0,
+};
+
+static CORBA::TypeCode _tc_TAO_tc_NameValuePairSeq (
+    CORBA::tk_alias,
+    sizeof (_oc_NameValuePairSeq),
+    (char *) &_oc_NameValuePairSeq,
+    0,
+    sizeof (NameValuePairSeq));
+
+CORBA::TypeCode_ptr _tc_NameValuePairSeq = &_tc_TAO_tc_NameValuePairSeq;
+
 CORBA_DynStruct_ptr CORBA_DynStruct::_duplicate (CORBA_DynStruct_ptr obj)
 {
   if (!CORBA::is_nil (obj))
@@ -868,7 +1004,7 @@ CORBA_DynStruct_ptr CORBA_DynStruct::_narrow (CORBA::Object_ptr obj,
   if (!obj->_is_a ("IDL:/CORBA_DynStruct:1.0", env))
     return CORBA_DynStruct::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -891,7 +1027,7 @@ CORBA_DynStruct_ptr CORBA_DynStruct::_nil (void)
   return (CORBA_DynStruct_ptr) NULL;
 } // end of _nil
 
-CORBA::FieldName
+FieldName
 CORBA_DynStruct::current_member_name (CORBA::Environment  &)
 {
   return 0;
@@ -903,14 +1039,14 @@ CORBA_DynStruct::current_member_kind (CORBA::Environment &)
   return CORBA::tk_null;
 }
 
-CORBA_NameValuePairSeq*
+NameValuePairSeq*
 CORBA_DynStruct::get_members (CORBA::Environment &)
 {
   return 0;
 }
 
 void
-CORBA_DynStruct::set_members (const CORBA_NameValuePairSeq &,
+CORBA_DynStruct::set_members (const NameValuePairSeq &,
                               CORBA::Environment &)
 {
 }
@@ -977,7 +1113,7 @@ CORBA_DynUnion_ptr CORBA_DynUnion::_narrow (CORBA::Object_ptr obj,
                    env))
     return CORBA_DynUnion::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -1093,54 +1229,80 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_DynUnion (
 CORBA::TypeCode_ptr _tc_CORBA_DynUnion = &_tc_TAO_tc_CORBA_DynUnion;
 
 
-#if !defined (_CORBA_ANYSEQ_CS_)
-#define _CORBA_ANYSEQ_CS_
+#if !defined (_ANYSEQ_CS_)
+#define _ANYSEQ_CS_
 
 // *************************************************************
-// CORBA_AnySeq
+// AnySeq
 // *************************************************************
 
-CORBA_AnySeq::CORBA_AnySeq (void)
+AnySeq::AnySeq (void)
 {}
-CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max) // uses max size
+AnySeq::AnySeq (CORBA::ULong max) // uses max size
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
        || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
+  _TAO_Unbounded_Sequence_AnySeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<CORBA::Any>
 #endif /* AHETI */
  (max)
 {}
-CORBA_AnySeq::CORBA_AnySeq (CORBA::ULong max,
+AnySeq::AnySeq (CORBA::ULong max,
                 CORBA::ULong length,
                 CORBA::Any *buffer,
                 CORBA::Boolean release)
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
+  _TAO_Unbounded_Sequence_AnySeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<CORBA::Any>
 #endif /* AHETI */
  (max, length, buffer, release)
 {}
-CORBA_AnySeq::CORBA_AnySeq (const CORBA_AnySeq &seq) // copy ctor
+AnySeq::AnySeq (const AnySeq &seq) // copy ctor
   :
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
              || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
+  _TAO_Unbounded_Sequence_AnySeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<CORBA::Any>
 #endif /* AHETI */
  (seq)
 {}
-CORBA_AnySeq::~CORBA_AnySeq (void) // dtor
+AnySeq::~AnySeq (void) // dtor
 {}
 
 
 #endif /* end #if !defined */
 
+static const CORBA::Long _oc_AnySeq[] =
+{
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  16,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x2f416e79),
+  ACE_NTOHL (0x5365713a),
+  ACE_NTOHL (0x312e3000),   // repository ID = IDL:/AnySeq:1.0
+  7,
+  ACE_NTOHL (0x416e7953),
+  ACE_NTOHL (0x657100fd),   // name = AnySeq
+  CORBA::tk_sequence,       // typecode kind
+  12,                       // encapsulation length
+  TAO_ENCAP_BYTE_ORDER,     // byte order
+  CORBA::tk_any,
+  0,
+};
+
+static CORBA::TypeCode _tc_TAO_tc_AnySeq (CORBA::tk_alias,
+                                       sizeof (_oc_AnySeq),
+                                       (char *) &_oc_AnySeq,
+                                       0,
+                                       sizeof (AnySeq));
+
+CORBA::TypeCode_ptr _tc_AnySeq = &_tc_TAO_tc_AnySeq;
+
 CORBA_DynSequence_ptr CORBA_DynSequence::_duplicate (
     CORBA_DynSequence_ptr obj
   )
@@ -1161,7 +1323,7 @@ CORBA_DynSequence_ptr CORBA_DynSequence::_narrow (CORBA::Object_ptr obj,
                    env))
     return CORBA_DynSequence::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -1194,14 +1356,14 @@ CORBA_DynSequence::length (CORBA::ULong,
 {
 }
 
-CORBA_AnySeq_ptr
+AnySeq_ptr
 CORBA_DynSequence::get_elements (CORBA::Environment &)
 {
   return 0;
 }
 
 void
-CORBA_DynSequence::set_elements (const CORBA_AnySeq &,
+CORBA_DynSequence::set_elements (const AnySeq &,
                                  CORBA::Environment &)
 {
 }
@@ -1270,7 +1432,7 @@ CORBA_DynArray_ptr CORBA_DynArray::_narrow (CORBA::Object_ptr obj,
                    env))
     return CORBA_DynArray::_nil ();
 
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object* stub = obj->_stubobj ();
   stub->_incr_refcnt ();
   if (!obj->_is_collocated ()
       || !obj->_servant ()
@@ -1292,14 +1454,14 @@ CORBA_DynArray_ptr CORBA_DynArray::_nil (void)
   return (CORBA_DynArray_ptr) NULL;
 } // end of _nil
 
-CORBA_AnySeq_ptr
+AnySeq_ptr
 CORBA_DynArray::get_elements (CORBA::Environment &)
 {
   return 0;
 }
 
 void
-CORBA_DynArray::set_elements (const CORBA_AnySeq &,
+CORBA_DynArray::set_elements (const AnySeq &,
                               CORBA::Environment &)
 {
 }
@@ -1365,4 +1527,3 @@ CORBA::TypeCode_ptr _tc_CORBA_DynArray =
 #  pragma instantiate TAO_Object_Field_T<CORBA_DynArray>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index d2b1120d485..adbf0860674 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -18,17 +18,13 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 //
 //
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
+// Modified by Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ============================================================================
 
 #ifndef TAO_IDL_CORBA_DYNANYC_H_
 #define TAO_IDL_CORBA_DYNANYC_H_
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/corbafwd.h"
 #include "tao/Any.h"
 #include "tao/ORB.h"
@@ -45,9 +41,18 @@
 #endif /* _MSC_VER */
 
 
+#if !defined (_CORBA_DYNANY___PTR_CH_)
+#define _CORBA_DYNANY___PTR_CH_
+
 class CORBA_DynAny;
 typedef CORBA_DynAny *CORBA_DynAny_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY___VAR_CH_)
+#define _CORBA_DYNANY___VAR_CH_
+
 class  CORBA_DynAny_var
 {
 public:
@@ -74,6 +79,13 @@ private:
   CORBA_DynAny_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY___OUT_CH_)
+#define _CORBA_DYNANY___OUT_CH_
+
 class  CORBA_DynAny_out
 {
 public:
@@ -91,26 +103,38 @@ private:
   CORBA_DynAny_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_CH_)
+#define _CORBA_DYNANY_CH_
+
 class TAO_Export CORBA_DynAny : public virtual ACE_CORBA_1 (Object)
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynAny_ptr _ptr_type;
-    typedef CORBA_DynAny_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynAny_ptr _duplicate (CORBA_DynAny_ptr obj);
   static CORBA_DynAny_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynAny_ptr _nil (void);
 
+
+#if !defined (_CORBA_DYNANY_INVALID___PTR_CH_)
+#define _CORBA_DYNANY_INVALID___PTR_CH_
+
   class Invalid;
   typedef Invalid *Invalid_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_INVALID_CH_)
+#define _CORBA_DYNANY_INVALID_CH_
+
   class TAO_Export Invalid : public CORBA::UserException
   {
   public:
@@ -128,18 +152,26 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Invalid_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::Invalid
 
     static CORBA::TypeCode_ptr _tc_Invalid;
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_INVALIDVALUE___PTR_CH_)
+#define _CORBA_DYNANY_INVALIDVALUE___PTR_CH_
+
   class InvalidValue;
   typedef InvalidValue *InvalidValue_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_INVALIDVALUE_CH_)
+#define _CORBA_DYNANY_INVALIDVALUE_CH_
+
   class TAO_Export InvalidValue : public CORBA::UserException
   {
   public:
@@ -157,18 +189,26 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidValue_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::InvalidValue
 
     static CORBA::TypeCode_ptr _tc_InvalidValue;
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_TYPEMISMATCH___PTR_CH_)
+#define _CORBA_DYNANY_TYPEMISMATCH___PTR_CH_
+
   class TypeMismatch;
   typedef TypeMismatch *TypeMismatch_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_TYPEMISMATCH_CH_)
+#define _CORBA_DYNANY_TYPEMISMATCH_CH_
+
   class TAO_Export TypeMismatch : public CORBA::UserException
   {
   public:
@@ -186,18 +226,26 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef TypeMismatch_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::TypeMismatch
 
     static CORBA::TypeCode_ptr _tc_TypeMismatch;
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_INVALIDSEQ___PTR_CH_)
+#define _CORBA_DYNANY_INVALIDSEQ___PTR_CH_
+
   class InvalidSeq;
   typedef InvalidSeq *InvalidSeq_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNANY_INVALIDSEQ_CH_)
+#define _CORBA_DYNANY_INVALIDSEQ_CH_
+
   class TAO_Export InvalidSeq : public CORBA::UserException
   {
   public:
@@ -215,15 +263,13 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidSeq_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::InvalidSeq
 
     static CORBA::TypeCode_ptr _tc_InvalidSeq;
 
+
+#endif /* end #if !defined */
+
   virtual CORBA::TypeCode_ptr type (
       CORBA::Environment &_tao_environment =
       CORBA::Environment::default_environment ()
@@ -413,13 +459,13 @@ public:
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynAny (void); // default constructor
-  CORBA_DynAny (TAO_Stub *objref,
+  CORBA_DynAny (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -429,11 +475,24 @@ private:
   void operator= (const CORBA_DynAny &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynAny;
 
+
+#if !defined (_CORBA_DYNENUM___PTR_CH_)
+#define _CORBA_DYNENUM___PTR_CH_
+
 class CORBA_DynEnum;
 typedef CORBA_DynEnum *CORBA_DynEnum_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNENUM___VAR_CH_)
+#define _CORBA_DYNENUM___VAR_CH_
+
 class  CORBA_DynEnum_var
 {
 public:
@@ -459,6 +518,13 @@ private:
   CORBA_DynEnum_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNENUM___OUT_CH_)
+#define _CORBA_DYNENUM___OUT_CH_
+
 class  CORBA_DynEnum_out
 {
 public:
@@ -476,19 +542,21 @@ private:
   CORBA_DynEnum_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNENUM_CH_)
+#define _CORBA_DYNENUM_CH_
+
 class TAO_Export CORBA_DynEnum: public virtual CORBA_DynAny
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynEnum_ptr _ptr_type;
-    typedef CORBA_DynEnum_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynEnum_ptr _duplicate (CORBA_DynEnum_ptr obj);
   static CORBA_DynEnum_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynEnum_ptr _nil (void);
@@ -513,13 +581,13 @@ public:
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynEnum (void); // default constructor
-  CORBA_DynEnum (TAO_Stub *objref,
+  CORBA_DynEnum (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -529,97 +597,101 @@ private:
   void operator= (const CORBA_DynEnum &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynEnum;
 
-// Forward declaration.
-struct CORBA_NameValuePair;
+typedef char * FieldName;
+typedef CORBA::String_var FieldName_var;
+typedef CORBA::String_out FieldName_out;
+extern  CORBA::TypeCode_ptr  _tc_FieldName;
+
+struct  NameValuePair
+{
+  FieldName_var id;
+  CORBA::Any value;
+};
 
-class  CORBA_NameValuePair_var
+class  NameValuePair_var
 {
 public:
-  CORBA_NameValuePair_var (void); // default constructor
-  CORBA_NameValuePair_var (CORBA_NameValuePair *);
-  CORBA_NameValuePair_var (const CORBA_NameValuePair_var &); // copy constructor
-  ~CORBA_NameValuePair_var (void); // destructor
-
-  CORBA_NameValuePair_var &operator= (CORBA_NameValuePair *);
-  CORBA_NameValuePair_var &operator= (const CORBA_NameValuePair_var &);
-  CORBA_NameValuePair *operator-> (void);
-  const CORBA_NameValuePair *operator-> (void) const;
-
-  operator const CORBA_NameValuePair &() const;
-  operator CORBA_NameValuePair &();
-  operator CORBA_NameValuePair &() const;
+  NameValuePair_var (void); // default constructor
+  NameValuePair_var (NameValuePair *);
+  NameValuePair_var (const NameValuePair_var &); // copy constructor
+  ~NameValuePair_var (void); // destructor
+
+  NameValuePair_var &operator= (NameValuePair *);
+  NameValuePair_var &operator= (const NameValuePair_var &);
+  NameValuePair *operator-> (void);
+  const NameValuePair *operator-> (void) const;
+
+  operator const NameValuePair &() const;
+  operator NameValuePair &();
+  operator NameValuePair &() const;
   // in, inout, out, _retn
-  const CORBA_NameValuePair &in (void) const;
-  CORBA_NameValuePair &inout (void);
-  CORBA_NameValuePair *&out (void);
-  CORBA_NameValuePair *_retn (void);
-  CORBA_NameValuePair *ptr (void) const;
+  const NameValuePair &in (void) const;
+  NameValuePair &inout (void);
+  NameValuePair *&out (void);
+  NameValuePair *_retn (void);
+  NameValuePair *ptr (void) const;
 
 private:
-  CORBA_NameValuePair *ptr_;
+  NameValuePair *ptr_;
 };
 
-class  CORBA_NameValuePair_out
+class  NameValuePair_out
 {
 public:
-  CORBA_NameValuePair_out (CORBA_NameValuePair *&);
-  CORBA_NameValuePair_out (CORBA_NameValuePair_var &);
-  CORBA_NameValuePair_out (const CORBA_NameValuePair_out &);
-  CORBA_NameValuePair_out &operator= (const CORBA_NameValuePair_out &);
-  CORBA_NameValuePair_out &operator= (CORBA_NameValuePair *);
-  operator CORBA_NameValuePair *&();
-  CORBA_NameValuePair *&ptr (void);
-  CORBA_NameValuePair *operator-> (void);
+  NameValuePair_out (NameValuePair *&);
+  NameValuePair_out (NameValuePair_var &);
+  NameValuePair_out (const NameValuePair_out &);
+  NameValuePair_out &operator= (const NameValuePair_out &);
+  NameValuePair_out &operator= (NameValuePair *);
+  operator NameValuePair *&();
+  NameValuePair *&ptr (void);
+  NameValuePair *operator-> (void);
 
 private:
-  CORBA_NameValuePair *&ptr_;
+  NameValuePair *&ptr_;
   // assignment from T_var not allowed
-  void operator= (const CORBA_NameValuePair_var &);
+  void operator= (const NameValuePair_var &);
 };
 
-struct  CORBA_NameValuePair
-{
-  TAO_String_Manager id;
-  CORBA::Any value;
+extern  CORBA::TypeCode_ptr  _tc_NameValuePair;
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePair_ptr _ptr_type;
-  typedef CORBA_NameValuePair_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_NAMEVALUEPAIRSEQ_CH_
 
-class _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq : public TAO_Unbounded_Base_Sequence
+class _TAO_Unbounded_Sequence_NameValuePairSeq : public TAO_Unbounded_Base_Sequence
 {
 public:
   // = Initialization and termination methods.
 
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (void) // Default constructor.
+  _TAO_Unbounded_Sequence_NameValuePairSeq (void) // Default constructor.
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (CORBA::ULong maximum,
+  _TAO_Unbounded_Sequence_NameValuePairSeq (CORBA::ULong maximum,
     CORBA::ULong length,
-    CORBA_NameValuePair *data,
+    NameValuePair *data,
     CORBA::Boolean release = 0)
   : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (const _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &rhs)
+  _TAO_Unbounded_Sequence_NameValuePairSeq (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
-    CORBA_NameValuePair *tmp1 = allocbuf (this->maximum_);
-    CORBA_NameValuePair * const tmp2 = ACE_reinterpret_cast (CORBA_NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+    NameValuePair *tmp1 = allocbuf (this->maximum_);
+    NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_);
 
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -627,7 +699,7 @@ public:
     this->buffer_ = tmp1;
   }
 
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq &rhs)
+  _TAO_Unbounded_Sequence_NameValuePairSeq &operator= (const _TAO_Unbounded_Sequence_NameValuePairSeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
@@ -638,7 +710,7 @@ public:
       if (this->maximum_ < rhs.maximum_)
       {
         // free the old buffer
-        CORBA_NameValuePair *tmp = ACE_reinterpret_cast (CORBA_NameValuePair *, this->buffer_);
+        NameValuePair *tmp = ACE_reinterpret_cast (NameValuePair *, this->buffer_);
         freebuf (tmp);
         this->buffer_ = allocbuf (rhs.maximum_);
       }
@@ -648,8 +720,8 @@ public:
 
     TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-    CORBA_NameValuePair *tmp1 = ACE_reinterpret_cast (CORBA_NameValuePair *, this->buffer_);
-    CORBA_NameValuePair * const tmp2 = ACE_reinterpret_cast (CORBA_NameValuePair * ACE_CAST_CONST, rhs.buffer_);
+    NameValuePair *tmp1 = ACE_reinterpret_cast (NameValuePair *, this->buffer_);
+    NameValuePair * const tmp2 = ACE_reinterpret_cast (NameValuePair * ACE_CAST_CONST, rhs.buffer_);
 
     for (CORBA::ULong i = 0; i < this->length_; ++i)
       tmp1[i] = tmp2[i];
@@ -657,36 +729,36 @@ public:
     return *this;
   }
 
-  ~_TAO_Unbounded_Sequence_CORBA_NameValuePairSeq (void) // Dtor.
+  ~_TAO_Unbounded_Sequence_NameValuePairSeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
 
   // = Accessors.
-  CORBA_NameValuePair &operator[] (CORBA::ULong i)
+  NameValuePair &operator[] (CORBA::ULong i)
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA_NameValuePair* tmp = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
+    NameValuePair* tmp = ACE_reinterpret_cast(NameValuePair*,this->buffer_);
     return tmp[i];
   }
 
-  const CORBA_NameValuePair &operator[] (CORBA::ULong i) const
+  const NameValuePair &operator[] (CORBA::ULong i) const
   // operator []
   {
     ACE_ASSERT (i < this->maximum_);
-    CORBA_NameValuePair * const tmp = ACE_reinterpret_cast (CORBA_NameValuePair* ACE_CAST_CONST, this->buffer_);
+    NameValuePair * const tmp = ACE_reinterpret_cast (NameValuePair* ACE_CAST_CONST, this->buffer_);
     return tmp[i];
   }
 
   // = Static operations.
-  static CORBA_NameValuePair *allocbuf (CORBA::ULong size)
+  static NameValuePair *allocbuf (CORBA::ULong size)
   // Allocate storage for the sequence.
   {
-    return new CORBA_NameValuePair[size];
+    return new NameValuePair[size];
   }
 
-  static void freebuf (CORBA_NameValuePair *buffer)
+  static void freebuf (NameValuePair *buffer)
   // Free the sequence.
   {
     delete [] buffer;
@@ -694,11 +766,11 @@ public:
 
   virtual void _allocate_buffer (CORBA::ULong length)
   {
-    CORBA_NameValuePair* tmp = allocbuf (length);
+    NameValuePair* tmp = allocbuf (length);
 
     if (this->buffer_ != 0)
     {
-      CORBA_NameValuePair *old = ACE_reinterpret_cast (CORBA_NameValuePair *,this->buffer_);
+      NameValuePair *old = ACE_reinterpret_cast (NameValuePair *,this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         tmp[i] = old[i];
@@ -715,7 +787,7 @@ public:
     if (this->buffer_ == 0 || this->release_ == 0)
       return;
 
-    CORBA_NameValuePair *tmp = ACE_reinterpret_cast (CORBA_NameValuePair *,this->buffer_);
+    NameValuePair *tmp = ACE_reinterpret_cast (NameValuePair *,this->buffer_);
 
     freebuf (tmp);
     this->buffer_ = 0;
@@ -723,9 +795,9 @@ public:
 
   // Implement the TAO_Base_Sequence methods (see Sequence.h)
 
-  CORBA_NameValuePair *get_buffer (CORBA::Boolean orphan = 0)
+  NameValuePair *get_buffer (CORBA::Boolean orphan = 0)
   {
-    CORBA_NameValuePair *result = 0;
+    NameValuePair *result = 0;
     if (orphan == 0)
     {
       // We retain ownership.
@@ -736,7 +808,7 @@ public:
       }
       else
       {
-        result = ACE_reinterpret_cast (CORBA_NameValuePair*, this->buffer_);
+        result = ACE_reinterpret_cast (NameValuePair*, this->buffer_);
       }
     }
     else // if (orphan == 1)
@@ -745,7 +817,7 @@ public:
       {
         // We set the state back to default and relinquish
         // ownership.
-        result = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
+        result = ACE_reinterpret_cast(NameValuePair*,this->buffer_);
         this->maximum_ = 0;
         this->length_ = 0;
         this->buffer_ = 0;
@@ -755,21 +827,21 @@ public:
     return result;
   }
 
-  const CORBA_NameValuePair *get_buffer (void) const
+  const NameValuePair *get_buffer (void) const
   {
-    return ACE_reinterpret_cast(const CORBA_NameValuePair * ACE_CAST_CONST, this->buffer_);
+    return ACE_reinterpret_cast(const NameValuePair * ACE_CAST_CONST, this->buffer_);
   }
 
   void replace (CORBA::ULong max,
   CORBA::ULong length,
-  CORBA_NameValuePair *data,
+  NameValuePair *data,
   CORBA::Boolean release)
   {
     this->maximum_ = max;
     this->length_ = length;
     if (this->buffer_ && this->release_ == 1)
     {
-      CORBA_NameValuePair *tmp = ACE_reinterpret_cast(CORBA_NameValuePair*,this->buffer_);
+      NameValuePair *tmp = ACE_reinterpret_cast(NameValuePair*,this->buffer_);
       freebuf (tmp);
     }
     this->buffer_ = data;
@@ -778,91 +850,120 @@ public:
 
 };
 
+#endif /* end #if !defined */
+
+
+#if !defined (_NAMEVALUEPAIRSEQ_CH_)
+#define _NAMEVALUEPAIRSEQ_CH_
+
 // *************************************************************
-// class CORBA::NameValuePairSeq_var
+// NameValuePairSeq
 // *************************************************************
 
-class  CORBA_NameValuePairSeq_var
+class TAO_Export NameValuePairSeq : public
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
+       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
+  _TAO_Unbounded_Sequence_NameValuePairSeq
+#else /* AHETI */
+  TAO_Unbounded_Sequence<NameValuePair>
+#endif /* AHETI */
 {
 public:
-  CORBA_NameValuePairSeq_var (void); // default constructor
-  CORBA_NameValuePairSeq_var (CORBA_NameValuePairSeq *);
-  CORBA_NameValuePairSeq_var (const CORBA_NameValuePairSeq_var &); // copy constructor
-  ~CORBA_NameValuePairSeq_var (void); // destructor
-
-  CORBA_NameValuePairSeq_var &operator= (CORBA_NameValuePairSeq *);
-  CORBA_NameValuePairSeq_var &operator= (const CORBA_NameValuePairSeq_var &);
-  CORBA_NameValuePairSeq *operator-> (void);
-  const CORBA_NameValuePairSeq *operator-> (void) const;
-
-  operator const CORBA_NameValuePairSeq &() const;
-  operator CORBA_NameValuePairSeq &();
-  operator CORBA_NameValuePairSeq &() const;
-  CORBA_NameValuePair &operator[] (CORBA::ULong index);
+  NameValuePairSeq (void); // default ctor
+  NameValuePairSeq (CORBA::ULong max); // uses max size
+  NameValuePairSeq (
+    CORBA::ULong max,
+    CORBA::ULong length,
+    NameValuePair *buffer,
+    CORBA::Boolean release=0
+  );
+  NameValuePairSeq (const NameValuePairSeq &); // copy ctor
+  ~NameValuePairSeq (void); // dtor
+};
+typedef NameValuePairSeq *NameValuePairSeq_ptr;
+
+#endif /* end #if !defined */
+
+
+#if !defined (_NAMEVALUEPAIRSEQ___VAR_CH_)
+#define _NAMEVALUEPAIRSEQ___VAR_CH_
+
+// *************************************************************
+// class NameValuePairSeq_var
+// *************************************************************
+
+class  NameValuePairSeq_var
+{
+public:
+  NameValuePairSeq_var (void); // default constructor
+  NameValuePairSeq_var (NameValuePairSeq *);
+  NameValuePairSeq_var (const NameValuePairSeq_var &); // copy constructor
+  ~NameValuePairSeq_var (void); // destructor
+
+  NameValuePairSeq_var &operator= (NameValuePairSeq *);
+  NameValuePairSeq_var &operator= (const NameValuePairSeq_var &);
+  NameValuePairSeq *operator-> (void);
+  const NameValuePairSeq *operator-> (void) const;
+
+  operator const NameValuePairSeq &() const;
+  operator NameValuePairSeq &();
+  operator NameValuePairSeq &() const;
+  NameValuePair &operator[] (CORBA::ULong index);
   // in, inout, out, _retn
-  const CORBA_NameValuePairSeq &in (void) const;
-  CORBA_NameValuePairSeq &inout (void);
-  CORBA_NameValuePairSeq *&out (void);
-  CORBA_NameValuePairSeq *_retn (void);
-  CORBA_NameValuePairSeq *ptr (void) const;
+  const NameValuePairSeq &in (void) const;
+  NameValuePairSeq &inout (void);
+  NameValuePairSeq *&out (void);
+  NameValuePairSeq *_retn (void);
+  NameValuePairSeq *ptr (void) const;
 
 private:
-  CORBA_NameValuePairSeq *ptr_;
+  NameValuePairSeq *ptr_;
 };
 
-class  CORBA_NameValuePairSeq_out
+
+#endif /* end #if !defined */
+
+
+#if !defined (_NAMEVALUEPAIRSEQ___OUT_CH_)
+#define _NAMEVALUEPAIRSEQ___OUT_CH_
+
+class  NameValuePairSeq_out
 {
 public:
-  CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq *&);
-  CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq_var &);
-  CORBA_NameValuePairSeq_out (const CORBA_NameValuePairSeq_out &);
-  CORBA_NameValuePairSeq_out &operator= (const CORBA_NameValuePairSeq_out &);
-  CORBA_NameValuePairSeq_out &operator= (CORBA_NameValuePairSeq *);
-  operator CORBA_NameValuePairSeq *&();
-  CORBA_NameValuePairSeq *&ptr (void);
-  CORBA_NameValuePairSeq *operator-> (void);
-  CORBA_NameValuePair &operator[] (CORBA::ULong index);
+  NameValuePairSeq_out (NameValuePairSeq *&);
+  NameValuePairSeq_out (NameValuePairSeq_var &);
+  NameValuePairSeq_out (const NameValuePairSeq_out &);
+  NameValuePairSeq_out &operator= (const NameValuePairSeq_out &);
+  NameValuePairSeq_out &operator= (NameValuePairSeq *);
+  operator NameValuePairSeq *&();
+  NameValuePairSeq *&ptr (void);
+  NameValuePairSeq *operator-> (void);
+  NameValuePair &operator[] (CORBA::ULong index);
 
 private:
-  CORBA_NameValuePairSeq *&ptr_;
+  NameValuePairSeq *&ptr_;
   // assignment from T_var not allowed
-  void operator= (const CORBA_NameValuePairSeq_var &);
+  void operator= (const NameValuePairSeq_var &);
 };
 
-// *************************************************************
-// CORBA::NameValuePairSeq
-// *************************************************************
-class TAO_Export CORBA_NameValuePairSeq : public
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-       || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_NameValuePairSeq
-#else /* AHETI */
-  TAO_Unbounded_Sequence<CORBA_NameValuePair>
-#endif /* AHETI */
-{
-public:
-  CORBA_NameValuePairSeq (void); // default ctor
-  CORBA_NameValuePairSeq (CORBA::ULong max); // uses max size
-  CORBA_NameValuePairSeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA_NameValuePair *buffer,
-    CORBA::Boolean release=0
-  );
-  CORBA_NameValuePairSeq (const CORBA_NameValuePairSeq &); // copy ctor
-  ~CORBA_NameValuePairSeq (void); // dtor
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePairSeq_ptr _ptr_type;
-  typedef CORBA_NameValuePairSeq_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
+#endif /* end #if !defined */
 
-};
+extern  CORBA::TypeCode_ptr  _tc_NameValuePairSeq;
+
+
+#if !defined (_CORBA_DYNSTRUCT___PTR_CH_)
+#define _CORBA_DYNSTRUCT___PTR_CH_
 
 class CORBA_DynStruct;
 typedef CORBA_DynStruct *CORBA_DynStruct_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSTRUCT___VAR_CH_)
+#define _CORBA_DYNSTRUCT___VAR_CH_
+
 class  CORBA_DynStruct_var
 {
 public:
@@ -888,6 +989,13 @@ private:
   CORBA_DynStruct_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSTRUCT___OUT_CH_)
+#define _CORBA_DYNSTRUCT___OUT_CH_
+
 class  CORBA_DynStruct_out
 {
 public:
@@ -905,19 +1013,21 @@ private:
   CORBA_DynStruct_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSTRUCT_CH_)
+#define _CORBA_DYNSTRUCT_CH_
+
 class TAO_Export CORBA_DynStruct: public virtual CORBA_DynAny
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynStruct_ptr _ptr_type;
-    typedef CORBA_DynStruct_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynStruct_ptr _duplicate (CORBA_DynStruct_ptr obj);
   static CORBA_DynStruct_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynStruct_ptr _nil (void);
@@ -930,24 +1040,24 @@ public:
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
-  virtual CORBA_NameValuePairSeq * get_members (
+  virtual NameValuePairSeq * get_members (
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
-      const CORBA_NameValuePairSeq & value,
+      const NameValuePairSeq & value,
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynStruct (void); // default constructor
-  CORBA_DynStruct (TAO_Stub *objref,
+  CORBA_DynStruct (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -957,11 +1067,24 @@ private:
   void operator= (const CORBA_DynStruct &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynStruct;
 
+
+#if !defined (_CORBA_DYNUNION___PTR_CH_)
+#define _CORBA_DYNUNION___PTR_CH_
+
 class CORBA_DynUnion;
 typedef CORBA_DynUnion *CORBA_DynUnion_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNUNION___VAR_CH_)
+#define _CORBA_DYNUNION___VAR_CH_
+
 class  CORBA_DynUnion_var
 {
 public:
@@ -987,6 +1110,13 @@ private:
   CORBA_DynUnion_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNUNION___OUT_CH_)
+#define _CORBA_DYNUNION___OUT_CH_
+
 class  CORBA_DynUnion_out
 {
 public:
@@ -1004,19 +1134,21 @@ private:
   CORBA_DynUnion_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNUNION_CH_)
+#define _CORBA_DYNUNION_CH_
+
 class TAO_Export CORBA_DynUnion: public virtual CORBA_DynAny
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynUnion_ptr _ptr_type;
-    typedef CORBA_DynUnion_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynUnion_ptr _duplicate (CORBA_DynUnion_ptr obj);
   static CORBA_DynUnion_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynUnion_ptr _nil (void);
@@ -1057,13 +1189,13 @@ public:
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynUnion (void); // default constructor
-  CORBA_DynUnion (TAO_Stub *objref,
+  CORBA_DynUnion (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -1073,23 +1205,30 @@ private:
   void operator= (const CORBA_DynUnion &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynUnion;
 
-class _TAO_Unbounded_Sequence_CORBA_AnySeq : public TAO_Unbounded_Base_Sequence
+
+#if !defined (__TAO_UNBOUNDED_SEQUENCE_ANYSEQ_CH_)
+#define __TAO_UNBOUNDED_SEQUENCE_ANYSEQ_CH_
+
+class _TAO_Unbounded_Sequence_AnySeq : public TAO_Unbounded_Base_Sequence
 {
 public:
   // = Initialization and termination methods.
 
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (void) // Default constructor.
+  _TAO_Unbounded_Sequence_AnySeq (void) // Default constructor.
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+  _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum) // Constructor using a maximum length value.
     : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (CORBA::ULong maximum,
+  _TAO_Unbounded_Sequence_AnySeq (CORBA::ULong maximum,
     CORBA::ULong length,
     CORBA::Any *data,
     CORBA::Boolean release = 0)
@@ -1097,7 +1236,7 @@ public:
   {
   }
 
-  _TAO_Unbounded_Sequence_CORBA_AnySeq (const _TAO_Unbounded_Sequence_CORBA_AnySeq &rhs)
+  _TAO_Unbounded_Sequence_AnySeq (const _TAO_Unbounded_Sequence_AnySeq &rhs)
   // Copy constructor.
     : TAO_Unbounded_Base_Sequence (rhs)
   {
@@ -1110,7 +1249,7 @@ public:
     this->buffer_ = tmp1;
   }
 
-  _TAO_Unbounded_Sequence_CORBA_AnySeq &operator= (const _TAO_Unbounded_Sequence_CORBA_AnySeq &rhs)
+  _TAO_Unbounded_Sequence_AnySeq &operator= (const _TAO_Unbounded_Sequence_AnySeq &rhs)
   // Assignment operator.
   {
     if (this == &rhs)
@@ -1140,7 +1279,7 @@ public:
     return *this;
   }
 
-  ~_TAO_Unbounded_Sequence_CORBA_AnySeq (void) // Dtor.
+  ~_TAO_Unbounded_Sequence_AnySeq (void) // Dtor.
   {
     this->_deallocate_buffer ();
   }
@@ -1261,93 +1400,120 @@ public:
 
 };
 
-// *************************************************************
-// class CORBA::AnySeq_var
-// *************************************************************
+#endif /* end #if !defined */
 
-class  CORBA_AnySeq_var
-{
-public:
-  CORBA_AnySeq_var (void); // default constructor
-  CORBA_AnySeq_var (CORBA_AnySeq *);
-  CORBA_AnySeq_var (const CORBA_AnySeq_var &); // copy constructor
-  ~CORBA_AnySeq_var (void); // destructor
-
-  CORBA_AnySeq_var &operator= (CORBA_AnySeq *);
-  CORBA_AnySeq_var &operator= (const CORBA_AnySeq_var &);
-  CORBA_AnySeq *operator-> (void);
-  const CORBA_AnySeq *operator-> (void) const;
-
-  operator const CORBA_AnySeq &() const;
-  operator CORBA_AnySeq &();
-  operator CORBA_AnySeq &() const;
-  CORBA::Any &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const CORBA_AnySeq &in (void) const;
-  CORBA_AnySeq &inout (void);
-  CORBA_AnySeq *&out (void);
-  CORBA_AnySeq *_retn (void);
-  CORBA_AnySeq *ptr (void) const;
 
-private:
-  CORBA_AnySeq *ptr_;
-};
-
-class  CORBA_AnySeq_out
-{
-public:
-  CORBA_AnySeq_out (CORBA_AnySeq *&);
-  CORBA_AnySeq_out (CORBA_AnySeq_var &);
-  CORBA_AnySeq_out (const CORBA_AnySeq_out &);
-  CORBA_AnySeq_out &operator= (const CORBA_AnySeq_out &);
-  CORBA_AnySeq_out &operator= (CORBA_AnySeq *);
-  operator CORBA_AnySeq *&();
-  CORBA_AnySeq *&ptr (void);
-  CORBA_AnySeq *operator-> (void);
-  CORBA::Any &operator[] (CORBA::ULong index);
-
-private:
-  CORBA_AnySeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_AnySeq_var &);
-};
+#if !defined (_ANYSEQ_CH_)
+#define _ANYSEQ_CH_
 
 // *************************************************************
-// CORBA::AnySeq
+// AnySeq
 // *************************************************************
 
-class TAO_Export CORBA_AnySeq : public
+class TAO_Export AnySeq : public
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
        || !defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-  _TAO_Unbounded_Sequence_CORBA_AnySeq
+  _TAO_Unbounded_Sequence_AnySeq
 #else /* AHETI */
   TAO_Unbounded_Sequence<CORBA::Any>
 #endif /* AHETI */
 {
 public:
-  CORBA_AnySeq (void); // default ctor
-  CORBA_AnySeq (CORBA::ULong max); // uses max size
-  CORBA_AnySeq (
+  AnySeq (void); // default ctor
+  AnySeq (CORBA::ULong max); // uses max size
+  AnySeq (
     CORBA::ULong max,
     CORBA::ULong length,
     CORBA::Any *buffer,
     CORBA::Boolean release=0
   );
-  CORBA_AnySeq (const CORBA_AnySeq &); // copy ctor
-  ~CORBA_AnySeq (void); // dtor
+  AnySeq (const AnySeq &); // copy ctor
+  ~AnySeq (void); // dtor
+};
+typedef AnySeq *AnySeq_ptr;
+
+#endif /* end #if !defined */
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_AnySeq_ptr _ptr_type;
-  typedef CORBA_AnySeq_var _var_type;
-#endif /* __GNUC__ */
 
+#if !defined (_ANYSEQ___VAR_CH_)
+#define _ANYSEQ___VAR_CH_
+
+// *************************************************************
+// class AnySeq_var
+// *************************************************************
+
+class  AnySeq_var
+{
+public:
+  AnySeq_var (void); // default constructor
+  AnySeq_var (AnySeq *);
+  AnySeq_var (const AnySeq_var &); // copy constructor
+  ~AnySeq_var (void); // destructor
+
+  AnySeq_var &operator= (AnySeq *);
+  AnySeq_var &operator= (const AnySeq_var &);
+  AnySeq *operator-> (void);
+  const AnySeq *operator-> (void) const;
+
+  operator const AnySeq &() const;
+  operator AnySeq &();
+  operator AnySeq &() const;
+  CORBA::Any &operator[] (CORBA::ULong index);
+  // in, inout, out, _retn
+  const AnySeq &in (void) const;
+  AnySeq &inout (void);
+  AnySeq *&out (void);
+  AnySeq *_retn (void);
+  AnySeq *ptr (void) const;
+
+private:
+  AnySeq *ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_ANYSEQ___OUT_CH_)
+#define _ANYSEQ___OUT_CH_
+
+class  AnySeq_out
+{
+public:
+  AnySeq_out (AnySeq *&);
+  AnySeq_out (AnySeq_var &);
+  AnySeq_out (const AnySeq_out &);
+  AnySeq_out &operator= (const AnySeq_out &);
+  AnySeq_out &operator= (AnySeq *);
+  operator AnySeq *&();
+  AnySeq *&ptr (void);
+  AnySeq *operator-> (void);
+  CORBA::Any &operator[] (CORBA::ULong index);
+
+private:
+  AnySeq *&ptr_;
+  // assignment from T_var not allowed
+  void operator= (const AnySeq_var &);
+};
+
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_AnySeq;
 
+
+#if !defined (_CORBA_DYNSEQUENCE___PTR_CH_)
+#define _CORBA_DYNSEQUENCE___PTR_CH_
+
 class CORBA_DynSequence;
 typedef CORBA_DynSequence *CORBA_DynSequence_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSEQUENCE___VAR_CH_)
+#define _CORBA_DYNSEQUENCE___VAR_CH_
+
 class  CORBA_DynSequence_var
 {
 public:
@@ -1373,6 +1539,13 @@ private:
   CORBA_DynSequence_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSEQUENCE___OUT_CH_)
+#define _CORBA_DYNSEQUENCE___OUT_CH_
+
 class  CORBA_DynSequence_out
 {
 public:
@@ -1390,19 +1563,21 @@ private:
   CORBA_DynSequence_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNSEQUENCE_CH_)
+#define _CORBA_DYNSEQUENCE_CH_
+
 class TAO_Export CORBA_DynSequence: public virtual CORBA_DynAny
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynSequence_ptr _ptr_type;
-    typedef CORBA_DynSequence_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynSequence_ptr _duplicate (CORBA_DynSequence_ptr obj);
   static CORBA_DynSequence_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynSequence_ptr _nil (void);
@@ -1416,24 +1591,24 @@ public:
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynSequence (void); // default constructor
-  CORBA_DynSequence (TAO_Stub *objref,
+  CORBA_DynSequence (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -1443,11 +1618,24 @@ private:
   void operator= (const CORBA_DynSequence &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynSequence;
 
+
+#if !defined (_CORBA_DYNARRAY___PTR_CH_)
+#define _CORBA_DYNARRAY___PTR_CH_
+
 class CORBA_DynArray;
 typedef CORBA_DynArray *CORBA_DynArray_ptr;
 
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNARRAY___VAR_CH_)
+#define _CORBA_DYNARRAY___VAR_CH_
+
 class  CORBA_DynArray_var
 {
 public:
@@ -1473,6 +1661,13 @@ private:
   CORBA_DynArray_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNARRAY___OUT_CH_)
+#define _CORBA_DYNARRAY___OUT_CH_
+
 class  CORBA_DynArray_out
 {
 public:
@@ -1490,41 +1685,43 @@ private:
   CORBA_DynArray_ptr &ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_DYNARRAY_CH_)
+#define _CORBA_DYNARRAY_CH_
+
 class TAO_Export CORBA_DynArray: public virtual CORBA_DynAny
 {
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef CORBA_DynArray_ptr _ptr_type;
-    typedef CORBA_DynArray_var _var_type;
-  #endif /* __GNUC__ */
-
   // the static operations
   static CORBA_DynArray_ptr _duplicate (CORBA_DynArray_ptr obj);
   static CORBA_DynArray_ptr _narrow (
       CORBA::Object_ptr obj,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   static CORBA_DynArray_ptr _nil (void);
 
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &_tao_environment =
         CORBA::Environment::default_environment ()
      );
   virtual CORBA::Boolean _is_a (
       const CORBA::Char *type_id,
-      CORBA::Environment &ACE_TRY_ENV =
+      CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_DynArray (void); // default constructor
-  CORBA_DynArray (TAO_Stub *objref,
+  CORBA_DynArray (STUB_Object *objref,
       TAO_ServantBase *_tao_servant = 0,
       CORBA::Boolean _tao_collocated = 0
     );
@@ -1534,6 +1731,9 @@ private:
   void operator= (const CORBA_DynArray &);
 };
 
+
+#endif /* end #if !defined */
+
 extern  CORBA::TypeCode_ptr  _tc_CORBA_DynArray;
 
 #if defined (__ACE_INLINE__)
@@ -1544,6 +1744,4 @@ extern  CORBA::TypeCode_ptr  _tc_CORBA_DynArray;
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* if !defined */
diff --git a/TAO/tao/DynAnyC.i b/TAO/tao/DynAnyC.i
index d9edfe734ec..8ba97ca7955 100644
--- a/TAO/tao/DynAnyC.i
+++ b/TAO/tao/DynAnyC.i
@@ -18,7 +18,7 @@
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 //
 //
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
+// Modified by Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ======================================================================
 
@@ -27,7 +27,7 @@ CORBA_DynAny::CORBA_DynAny (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynAny::CORBA_DynAny (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynAny::CORBA_DynAny (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
@@ -230,7 +230,7 @@ CORBA_DynEnum::CORBA_DynEnum (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynEnum::CORBA_DynEnum (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynEnum::CORBA_DynEnum (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
@@ -413,131 +413,131 @@ CORBA_DynEnum_out::operator-> (void)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA_NameValuePair_var
+// Inline operations for class NameValuePair_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (void) // default constructor
+NameValuePair_var::NameValuePair_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (CORBA_NameValuePair *p)
+NameValuePair_var::NameValuePair_var (NameValuePair *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_NameValuePair_var::CORBA_NameValuePair_var (const CORBA_NameValuePair_var &p) // copy constructor
+NameValuePair_var::NameValuePair_var (const NameValuePair_var &p) // copy constructor
 {
   if (p.ptr_)
-    this->ptr_ = new CORBA_NameValuePair(*p.ptr_);
+    this->ptr_ = new NameValuePair(*p.ptr_);
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_NameValuePair_var::~CORBA_NameValuePair_var (void) // destructor
+NameValuePair_var::~NameValuePair_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair_var &
-CORBA_NameValuePair_var::operator= (CORBA_NameValuePair *p)
+ACE_INLINE NameValuePair_var &
+NameValuePair_var::operator= (NameValuePair *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_NameValuePair_var &
-CORBA_NameValuePair_var::operator= (const CORBA_NameValuePair_var &p)
+ACE_INLINE NameValuePair_var &
+NameValuePair_var::operator= (const NameValuePair_var &p)
 {
   if (this != &p)
   {
     delete this->ptr_;
-    this->ptr_ = new CORBA_NameValuePair (*p.ptr_);
+    this->ptr_ = new NameValuePair (*p.ptr_);
   }
   return *this;
 }
 
-ACE_INLINE const CORBA_NameValuePair *
-CORBA_NameValuePair_var::operator-> (void) const
+ACE_INLINE const NameValuePair *
+NameValuePair_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::operator-> (void)
+ACE_INLINE NameValuePair *
+NameValuePair_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePair_var::operator const CORBA_NameValuePair &() const // cast
+NameValuePair_var::operator const NameValuePair &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePair_var::operator CORBA_NameValuePair &() // cast 
+NameValuePair_var::operator NameValuePair &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePair_var::operator CORBA_NameValuePair &() const// cast 
+NameValuePair_var::operator NameValuePair &() const// cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE const CORBA_NameValuePair &
-CORBA_NameValuePair_var::in (void) const
+ACE_INLINE const NameValuePair &
+NameValuePair_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePair_var::inout (void)
+ACE_INLINE NameValuePair &
+NameValuePair_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE CORBA_NameValuePair *&
-CORBA_NameValuePair_var::out (void)
+ACE_INLINE NameValuePair *&
+NameValuePair_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::_retn (void)
+ACE_INLINE NameValuePair *
+NameValuePair_var::_retn (void)
 {
-  CORBA_NameValuePair *tmp = this->ptr_;
+  NameValuePair *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_var::ptr (void) const
+ACE_INLINE NameValuePair *
+NameValuePair_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_NameValuePair_out
+// Inline operations for class NameValuePair_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (CORBA_NameValuePair *&p)
+NameValuePair_out::NameValuePair_out (NameValuePair *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (CORBA_NameValuePair_var &p) // constructor from _var
+NameValuePair_out::NameValuePair_out (NameValuePair_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -545,174 +545,174 @@ CORBA_NameValuePair_out::CORBA_NameValuePair_out (CORBA_NameValuePair_var &p) //
 }
 
 ACE_INLINE
-CORBA_NameValuePair_out::CORBA_NameValuePair_out (const CORBA_NameValuePair_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_NameValuePair_out&,p).ptr_)
+NameValuePair_out::NameValuePair_out (const NameValuePair_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (NameValuePair_out&,p).ptr_)
 {}
 
-ACE_INLINE CORBA_NameValuePair_out &
-CORBA_NameValuePair_out::operator= (const CORBA_NameValuePair_out &p)
+ACE_INLINE NameValuePair_out &
+NameValuePair_out::operator= (const NameValuePair_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_NameValuePair_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (NameValuePair_out&,p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_NameValuePair_out &
-CORBA_NameValuePair_out::operator= (CORBA_NameValuePair *p)
+ACE_INLINE NameValuePair_out &
+NameValuePair_out::operator= (NameValuePair *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_NameValuePair_out::operator CORBA_NameValuePair *&() // cast
+NameValuePair_out::operator NameValuePair *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair *&
-CORBA_NameValuePair_out::ptr (void) // ptr
+ACE_INLINE NameValuePair *&
+NameValuePair_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair *
-CORBA_NameValuePair_out::operator-> (void)
+ACE_INLINE NameValuePair *
+NameValuePair_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_NameValuePairSeq_var
+// Inline operations for class NameValuePairSeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (void) // default constructor
+NameValuePairSeq_var::NameValuePairSeq_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (CORBA_NameValuePairSeq *p)
+NameValuePairSeq_var::NameValuePairSeq_var (NameValuePairSeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_NameValuePairSeq_var::CORBA_NameValuePairSeq_var (const CORBA_NameValuePairSeq_var &p) // copy constructor
+NameValuePairSeq_var::NameValuePairSeq_var (const NameValuePairSeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    this->ptr_ = new CORBA_NameValuePairSeq(*p.ptr_);
+    this->ptr_ = new NameValuePairSeq(*p.ptr_);
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_NameValuePairSeq_var::~CORBA_NameValuePairSeq_var (void) // destructor
+NameValuePairSeq_var::~NameValuePairSeq_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq_var &
-CORBA_NameValuePairSeq_var::operator= (CORBA_NameValuePairSeq *p)
+ACE_INLINE NameValuePairSeq_var &
+NameValuePairSeq_var::operator= (NameValuePairSeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq_var &
-CORBA_NameValuePairSeq_var::operator= (const CORBA_NameValuePairSeq_var &p) // deep copy
+ACE_INLINE NameValuePairSeq_var &
+NameValuePairSeq_var::operator= (const NameValuePairSeq_var &p) // deep copy
 {
   if (this != &p)
   {
     delete this->ptr_;
-    this->ptr_ = new CORBA_NameValuePairSeq (*p.ptr_);
+    this->ptr_ = new NameValuePairSeq (*p.ptr_);
   }
   return *this;
 }
 
-ACE_INLINE const CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::operator-> (void) const
+ACE_INLINE const NameValuePairSeq *
+NameValuePairSeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::operator-> (void)
+ACE_INLINE NameValuePairSeq *
+NameValuePairSeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator const CORBA_NameValuePairSeq &() const // cast
+NameValuePairSeq_var::operator const NameValuePairSeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator CORBA_NameValuePairSeq &() // cast 
+NameValuePairSeq_var::operator NameValuePairSeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_NameValuePairSeq_var::operator CORBA_NameValuePairSeq &() const// cast 
+NameValuePairSeq_var::operator NameValuePairSeq &() const// cast 
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePairSeq_var::operator[] (CORBA::ULong index)
+ACE_INLINE NameValuePair &
+NameValuePairSeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA_NameValuePairSeq &
-CORBA_NameValuePairSeq_var::in (void) const
+ACE_INLINE const NameValuePairSeq &
+NameValuePairSeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq &
-CORBA_NameValuePairSeq_var::inout (void)
+ACE_INLINE NameValuePairSeq &
+NameValuePairSeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE CORBA_NameValuePairSeq *&
-CORBA_NameValuePairSeq_var::out (void)
+ACE_INLINE NameValuePairSeq *&
+NameValuePairSeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::_retn (void)
+ACE_INLINE NameValuePairSeq *
+NameValuePairSeq_var::_retn (void)
 {
-  CORBA_NameValuePairSeq *tmp = this->ptr_;
+  NameValuePairSeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_var::ptr (void) const
+ACE_INLINE NameValuePairSeq *
+NameValuePairSeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_NameValuePairSeq_out
+// Inline operations for class NameValuePairSeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq *&p)
+NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq_var &p) // constructor from _var
+NameValuePairSeq_out::NameValuePairSeq_out (NameValuePairSeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -720,44 +720,44 @@ CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (CORBA_NameValuePairSeq_v
 }
 
 ACE_INLINE
-CORBA_NameValuePairSeq_out::CORBA_NameValuePairSeq_out (const CORBA_NameValuePairSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_NameValuePairSeq_out&,p).ptr_)
+NameValuePairSeq_out::NameValuePairSeq_out (const NameValuePairSeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (NameValuePairSeq_out&,p).ptr_)
 {}
 
-ACE_INLINE CORBA_NameValuePairSeq_out &
-CORBA_NameValuePairSeq_out::operator= (const CORBA_NameValuePairSeq_out &p)
+ACE_INLINE NameValuePairSeq_out &
+NameValuePairSeq_out::operator= (const NameValuePairSeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_NameValuePairSeq_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (NameValuePairSeq_out&,p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq_out &
-CORBA_NameValuePairSeq_out::operator= (CORBA_NameValuePairSeq *p)
+ACE_INLINE NameValuePairSeq_out &
+NameValuePairSeq_out::operator= (NameValuePairSeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_NameValuePairSeq_out::operator CORBA_NameValuePairSeq *&() // cast
+NameValuePairSeq_out::operator NameValuePairSeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq *&
-CORBA_NameValuePairSeq_out::ptr (void) // ptr
+ACE_INLINE NameValuePairSeq *&
+NameValuePairSeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePairSeq *
-CORBA_NameValuePairSeq_out::operator-> (void)
+ACE_INLINE NameValuePairSeq *
+NameValuePairSeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_NameValuePair &
-CORBA_NameValuePairSeq_out::operator[] (CORBA::ULong index)
+ACE_INLINE NameValuePair &
+NameValuePairSeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -767,7 +767,7 @@ CORBA_DynStruct::CORBA_DynStruct (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynStruct::CORBA_DynStruct (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynStruct::CORBA_DynStruct (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
@@ -954,7 +954,7 @@ CORBA_DynUnion::CORBA_DynUnion (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynUnion::CORBA_DynUnion (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynUnion::CORBA_DynUnion (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
@@ -1137,137 +1137,137 @@ CORBA_DynUnion_out::operator-> (void)
 #endif /* end #if !defined */
 
 // *************************************************************
-// Inline operations for class CORBA_AnySeq_var
+// Inline operations for class AnySeq_var
 // *************************************************************
 
 ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (void) // default constructor
+AnySeq_var::AnySeq_var (void) // default constructor
   : ptr_ (0)
 {}
 
 ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (CORBA_AnySeq *p)
+AnySeq_var::AnySeq_var (AnySeq *p)
   : ptr_ (p)
 {}
 
 ACE_INLINE
-CORBA_AnySeq_var::CORBA_AnySeq_var (const CORBA_AnySeq_var &p) // copy constructor
+AnySeq_var::AnySeq_var (const AnySeq_var &p) // copy constructor
 {
   if (p.ptr_)
-    this->ptr_ = new CORBA_AnySeq(*p.ptr_);
+    this->ptr_ = new AnySeq(*p.ptr_);
   else
     this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_AnySeq_var::~CORBA_AnySeq_var (void) // destructor
+AnySeq_var::~AnySeq_var (void) // destructor
 {
   delete this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq_var &
-CORBA_AnySeq_var::operator= (CORBA_AnySeq *p)
+ACE_INLINE AnySeq_var &
+AnySeq_var::operator= (AnySeq *p)
 {
   delete this->ptr_;
   this->ptr_ = p;
   return *this;
 }
 
-ACE_INLINE CORBA_AnySeq_var &
-CORBA_AnySeq_var::operator= (const CORBA_AnySeq_var &p) // deep copy
+ACE_INLINE AnySeq_var &
+AnySeq_var::operator= (const AnySeq_var &p) // deep copy
 {
   if (this != &p)
   {
     delete this->ptr_;
-    this->ptr_ = new CORBA_AnySeq (*p.ptr_);
+    this->ptr_ = new AnySeq (*p.ptr_);
   }
   return *this;
 }
 
-ACE_INLINE const CORBA_AnySeq *
-CORBA_AnySeq_var::operator-> (void) const
+ACE_INLINE const AnySeq *
+AnySeq_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::operator-> (void)
+ACE_INLINE AnySeq *
+AnySeq_var::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_AnySeq_var::operator const CORBA_AnySeq &() const // cast
+AnySeq_var::operator const AnySeq &() const // cast
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_AnySeq_var::operator CORBA_AnySeq &() // cast 
+AnySeq_var::operator AnySeq &() // cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE 
-CORBA_AnySeq_var::operator CORBA_AnySeq &() const// cast 
+AnySeq_var::operator AnySeq &() const// cast 
 {
   return *this->ptr_;
 }
 
 ACE_INLINE CORBA::Any &
-CORBA_AnySeq_var::operator[] (CORBA::ULong index)
+AnySeq_var::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
 
-ACE_INLINE const CORBA_AnySeq &
-CORBA_AnySeq_var::in (void) const
+ACE_INLINE const AnySeq &
+AnySeq_var::in (void) const
 {
   return *this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq &
-CORBA_AnySeq_var::inout (void)
+ACE_INLINE AnySeq &
+AnySeq_var::inout (void)
 {
   return *this->ptr_;
 }
 
 // mapping for variable size 
-ACE_INLINE CORBA_AnySeq *&
-CORBA_AnySeq_var::out (void)
+ACE_INLINE AnySeq *&
+AnySeq_var::out (void)
 {
   delete this->ptr_;
   this->ptr_ = 0;
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::_retn (void)
+ACE_INLINE AnySeq *
+AnySeq_var::_retn (void)
 {
-  CORBA_AnySeq *tmp = this->ptr_;
+  AnySeq *tmp = this->ptr_;
   this->ptr_ = 0;
   return tmp;
 }
 
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_var::ptr (void) const
+ACE_INLINE AnySeq *
+AnySeq_var::ptr (void) const
 {
   return this->ptr_;
 }
 
 // *************************************************************
-// Inline operations for class CORBA_AnySeq_out
+// Inline operations for class AnySeq_out
 // *************************************************************
 
 ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (CORBA_AnySeq *&p)
+AnySeq_out::AnySeq_out (AnySeq *&p)
   : ptr_ (p)
 {
   this->ptr_ = 0;
 }
 
 ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (CORBA_AnySeq_var &p) // constructor from _var
+AnySeq_out::AnySeq_out (AnySeq_var &p) // constructor from _var
   : ptr_ (p.out ())
 {
   delete this->ptr_;
@@ -1275,44 +1275,44 @@ CORBA_AnySeq_out::CORBA_AnySeq_out (CORBA_AnySeq_var &p) // constructor from _va
 }
 
 ACE_INLINE
-CORBA_AnySeq_out::CORBA_AnySeq_out (const CORBA_AnySeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_AnySeq_out&,p).ptr_)
+AnySeq_out::AnySeq_out (const AnySeq_out &p) // copy constructor
+  : ptr_ (ACE_const_cast (AnySeq_out&,p).ptr_)
 {}
 
-ACE_INLINE CORBA_AnySeq_out &
-CORBA_AnySeq_out::operator= (const CORBA_AnySeq_out &p)
+ACE_INLINE AnySeq_out &
+AnySeq_out::operator= (const AnySeq_out &p)
 {
-  this->ptr_ = ACE_const_cast (CORBA_AnySeq_out&,p).ptr_;
+  this->ptr_ = ACE_const_cast (AnySeq_out&,p).ptr_;
   return *this;
 }
 
-ACE_INLINE CORBA_AnySeq_out &
-CORBA_AnySeq_out::operator= (CORBA_AnySeq *p)
+ACE_INLINE AnySeq_out &
+AnySeq_out::operator= (AnySeq *p)
 {
   this->ptr_ = p;
   return *this;
 }
 
 ACE_INLINE 
-CORBA_AnySeq_out::operator CORBA_AnySeq *&() // cast
+AnySeq_out::operator AnySeq *&() // cast
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq *&
-CORBA_AnySeq_out::ptr (void) // ptr
+ACE_INLINE AnySeq *&
+AnySeq_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-ACE_INLINE CORBA_AnySeq *
-CORBA_AnySeq_out::operator-> (void)
+ACE_INLINE AnySeq *
+AnySeq_out::operator-> (void)
 {
   return this->ptr_;
 }
 
 ACE_INLINE CORBA::Any &
-CORBA_AnySeq_out::operator[] (CORBA::ULong index)
+AnySeq_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
@@ -1322,7 +1322,7 @@ CORBA_DynSequence::CORBA_DynSequence (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynSequence::CORBA_DynSequence (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynSequence::CORBA_DynSequence (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
@@ -1509,7 +1509,7 @@ CORBA_DynArray::CORBA_DynArray (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_DynArray::CORBA_DynArray (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
+CORBA_DynArray::CORBA_DynArray (STUB_Object *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
 {}
 
diff --git a/TAO/tao/DynAnyS.cpp b/TAO/tao/DynAnyS.cpp
index 5ea22e3b1cf..c65c7f56229 100644
--- a/TAO/tao/DynAnyS.cpp
+++ b/TAO/tao/DynAnyS.cpp
@@ -23,15 +23,10 @@
 // ======================================================================
 
 #include "tao/DynAnyC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/POA_CORBA.h"
 #include "tao/Servant_Base.h"
 #include "tao/POAC.h"
 
-ACE_RCSID(tao, DynAnyS, "$Id$")
-
 // constructor
 POA_CORBA::DynAny::DynAny (void)
 {
@@ -46,40 +41,40 @@ POA_CORBA::DynAny::~DynAny (void)
 {
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynAny::_is_a (const char* value,
                           CORBA::Environment &_tao_environment)
 {
-  if ((!ACE_OS::strcmp ((char *) value,
-                        "IDL:/CORBA_DynAny:1.0"))
-      || (!ACE_OS::strcmp ((char *) value,
+  if ((!ACE_OS::strcmp ((char *) value, 
+                        "IDL:/CORBA_DynAny:1.0")) 
+      || (!ACE_OS::strcmp ((char *) value, 
                            CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynAny::_downcast (const char* logical_type_id)
 {
-  if (ACE_OS::strcmp (logical_type_id,
+  if (ACE_OS::strcmp (logical_type_id, 
                       "IDL:/CORBA_DynAny:1.0") == 0)
     return ACE_static_cast (POA_CORBA::DynAny_ptr, this);
 
-  if (ACE_OS::strcmp (logical_type_id,
+  if (ACE_OS::strcmp (logical_type_id, 
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
 
   return 0;
 }
 
-void POA_CORBA::DynAny::_dispatch (CORBA::ServerRequest &,
-                                   void *,
+void POA_CORBA::DynAny::_dispatch (CORBA::ServerRequest &, 
+                                   void *, 
                                    CORBA::Environment &)
 {
 }
 
-const char*
+const char* 
 POA_CORBA::DynAny::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynAny:1.0";
@@ -87,23 +82,23 @@ POA_CORBA::DynAny::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynAny::_tao_collocated_DynAny (
     POA_CORBA::DynAny_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynAny (),
-    CORBA_Object (stub,
-                  servant,
+    CORBA_Object (stub, 
+                  servant, 
                   1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynAny_ptr
+POA_CORBA::DynAny_ptr 
 POA_CORBA::_tao_collocated_DynAny::_get_servant (void) const
 {
   return this->servant_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynAny::_is_a (
     const char* logical_type_id,
     CORBA::Environment &_tao_environment
@@ -115,7 +110,7 @@ POA_CORBA::_tao_collocated_DynAny::_is_a (
     );
 }
 
-CORBA::TypeCode_ptr
+CORBA::TypeCode_ptr 
 POA_CORBA::_tao_collocated_DynAny::type (
     CORBA::Environment &_tao_environment
    )
@@ -125,7 +120,7 @@ POA_CORBA::_tao_collocated_DynAny::type (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::assign (
     CORBA_DynAny_ptr CORBA_Dyn_any,
     CORBA::Environment &_tao_environment
@@ -137,7 +132,7 @@ POA_CORBA::_tao_collocated_DynAny::assign (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::from_any (
     const CORBA::Any & value,
     CORBA::Environment &_tao_environment
@@ -149,7 +144,7 @@ POA_CORBA::_tao_collocated_DynAny::from_any (
   );
 }
 
-CORBA::Any *
+CORBA::Any * 
 POA_CORBA::_tao_collocated_DynAny::to_any (
     CORBA::Environment &_tao_environment
    )
@@ -159,7 +154,7 @@ POA_CORBA::_tao_collocated_DynAny::to_any (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::destroy (
     CORBA::Environment &_tao_environment
    )
@@ -169,7 +164,7 @@ POA_CORBA::_tao_collocated_DynAny::destroy (
   );
 }
 
-CORBA_DynAny_ptr
+CORBA_DynAny_ptr 
 POA_CORBA::_tao_collocated_DynAny::copy (
     CORBA::Environment &_tao_environment
    )
@@ -179,7 +174,7 @@ POA_CORBA::_tao_collocated_DynAny::copy (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_boolean (
     CORBA::Boolean value,
     CORBA::Environment &_tao_environment
@@ -191,7 +186,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_boolean (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_octet (
     CORBA::Octet value,
     CORBA::Environment &_tao_environment
@@ -203,7 +198,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_octet (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_char (
     CORBA::Char value,
     CORBA::Environment &_tao_environment
@@ -215,7 +210,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_char (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_short (
     CORBA::Short value,
     CORBA::Environment &_tao_environment
@@ -227,7 +222,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_short (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_ushort (
     CORBA::UShort value,
     CORBA::Environment &_tao_environment
@@ -239,7 +234,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_ushort (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_long (
     CORBA::Long value,
     CORBA::Environment &_tao_environment
@@ -251,7 +246,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_long (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_ulong (
     CORBA::ULong value,
     CORBA::Environment &_tao_environment
@@ -263,7 +258,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_ulong (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_float (
     CORBA::Float value,
     CORBA::Environment &_tao_environment
@@ -275,7 +270,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_float (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_double (
     CORBA::Double value,
     CORBA::Environment &_tao_environment
@@ -287,7 +282,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_double (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_string (
     const char * value,
     CORBA::Environment &_tao_environment
@@ -299,7 +294,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_string (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_reference (
     CORBA::Object_ptr value,
     CORBA::Environment &_tao_environment
@@ -311,7 +306,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_reference (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_typecode (
     CORBA::TypeCode_ptr value,
     CORBA::Environment &_tao_environment
@@ -323,7 +318,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_typecode (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_longlong (
     CORBA::LongLong value,
     CORBA::Environment &_tao_environment
@@ -335,7 +330,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_longlong (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_ulonglong (
     CORBA::ULongLong value,
     CORBA::Environment &_tao_environment
@@ -347,7 +342,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_ulonglong (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_wchar (
     CORBA::WChar value,
     CORBA::Environment &_tao_environment
@@ -359,7 +354,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_wchar (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::insert_any (
     const CORBA::Any & value,
     CORBA::Environment &_tao_environment
@@ -371,7 +366,7 @@ POA_CORBA::_tao_collocated_DynAny::insert_any (
   );
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynAny::get_boolean (
     CORBA::Environment &_tao_environment
    )
@@ -381,7 +376,7 @@ POA_CORBA::_tao_collocated_DynAny::get_boolean (
   );
 }
 
-CORBA::Octet
+CORBA::Octet 
 POA_CORBA::_tao_collocated_DynAny::get_octet (
     CORBA::Environment &_tao_environment
    )
@@ -391,7 +386,7 @@ POA_CORBA::_tao_collocated_DynAny::get_octet (
   );
 }
 
-CORBA::Char
+CORBA::Char 
 POA_CORBA::_tao_collocated_DynAny::get_char (
     CORBA::Environment &_tao_environment
    )
@@ -401,7 +396,7 @@ POA_CORBA::_tao_collocated_DynAny::get_char (
   );
 }
 
-CORBA::Short
+CORBA::Short 
 POA_CORBA::_tao_collocated_DynAny::get_short (
     CORBA::Environment &_tao_environment
    )
@@ -411,7 +406,7 @@ POA_CORBA::_tao_collocated_DynAny::get_short (
   );
 }
 
-CORBA::UShort
+CORBA::UShort 
 POA_CORBA::_tao_collocated_DynAny::get_ushort (
     CORBA::Environment &_tao_environment
    )
@@ -421,7 +416,7 @@ POA_CORBA::_tao_collocated_DynAny::get_ushort (
   );
 }
 
-CORBA::Long
+CORBA::Long 
 POA_CORBA::_tao_collocated_DynAny::get_long (
     CORBA::Environment &_tao_environment
    )
@@ -431,7 +426,7 @@ POA_CORBA::_tao_collocated_DynAny::get_long (
   );
 }
 
-CORBA::ULong
+CORBA::ULong 
 POA_CORBA::_tao_collocated_DynAny::get_ulong (
     CORBA::Environment &_tao_environment
    )
@@ -441,7 +436,7 @@ POA_CORBA::_tao_collocated_DynAny::get_ulong (
   );
 }
 
-CORBA::Float
+CORBA::Float 
 POA_CORBA::_tao_collocated_DynAny::get_float (
     CORBA::Environment &_tao_environment
    )
@@ -451,7 +446,7 @@ POA_CORBA::_tao_collocated_DynAny::get_float (
   );
 }
 
-CORBA::Double
+CORBA::Double 
 POA_CORBA::_tao_collocated_DynAny::get_double (
     CORBA::Environment &_tao_environment
    )
@@ -461,7 +456,7 @@ POA_CORBA::_tao_collocated_DynAny::get_double (
   );
 }
 
-char *
+char * 
 POA_CORBA::_tao_collocated_DynAny::get_string (
     CORBA::Environment &_tao_environment
    )
@@ -471,7 +466,7 @@ POA_CORBA::_tao_collocated_DynAny::get_string (
   );
 }
 
-CORBA::Object_ptr
+CORBA::Object_ptr 
 POA_CORBA::_tao_collocated_DynAny::get_reference (
     CORBA::Environment &_tao_environment
    )
@@ -481,7 +476,7 @@ POA_CORBA::_tao_collocated_DynAny::get_reference (
   );
 }
 
-CORBA::TypeCode_ptr
+CORBA::TypeCode_ptr 
 POA_CORBA::_tao_collocated_DynAny::get_typecode (
     CORBA::Environment &_tao_environment
    )
@@ -491,7 +486,7 @@ POA_CORBA::_tao_collocated_DynAny::get_typecode (
   );
 }
 
-CORBA::LongLong
+CORBA::LongLong 
 POA_CORBA::_tao_collocated_DynAny::get_longlong (
     CORBA::Environment &_tao_environment
    )
@@ -501,7 +496,7 @@ POA_CORBA::_tao_collocated_DynAny::get_longlong (
   );
 }
 
-CORBA::ULongLong
+CORBA::ULongLong 
 POA_CORBA::_tao_collocated_DynAny::get_ulonglong (
     CORBA::Environment &_tao_environment
    )
@@ -511,7 +506,7 @@ POA_CORBA::_tao_collocated_DynAny::get_ulonglong (
   );
 }
 
-CORBA::WChar
+CORBA::WChar 
 POA_CORBA::_tao_collocated_DynAny::get_wchar (
     CORBA::Environment &_tao_environment
    )
@@ -521,7 +516,7 @@ POA_CORBA::_tao_collocated_DynAny::get_wchar (
   );
 }
 
-CORBA::Any *
+CORBA::Any * 
 POA_CORBA::_tao_collocated_DynAny::get_any (
     CORBA::Environment &_tao_environment
    )
@@ -531,7 +526,7 @@ POA_CORBA::_tao_collocated_DynAny::get_any (
   );
 }
 
-CORBA_DynAny_ptr
+CORBA_DynAny_ptr 
 POA_CORBA::_tao_collocated_DynAny::current_component (
     CORBA::Environment &_tao_environment
    )
@@ -541,7 +536,7 @@ POA_CORBA::_tao_collocated_DynAny::current_component (
   );
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynAny::next (
     CORBA::Environment &_tao_environment
    )
@@ -551,7 +546,7 @@ POA_CORBA::_tao_collocated_DynAny::next (
   );
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynAny::seek (
     CORBA::Long index,
     CORBA::Environment &_tao_environment
@@ -563,7 +558,7 @@ POA_CORBA::_tao_collocated_DynAny::seek (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynAny::rewind (
     CORBA::Environment &_tao_environment
    )
@@ -577,7 +572,7 @@ POA_CORBA::_tao_collocated_DynAny::rewind (
 CORBA_DynAny*
 POA_CORBA::DynAny::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
@@ -600,16 +595,16 @@ POA_CORBA::DynEnum::~DynEnum (void)
 {
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynEnum::_is_a (
     const char* value,
     CORBA::Environment &_tao_environment
   )
 {
-  if ((!ACE_OS::strcmp ((char *) value,
-                        "IDL:/CORBA_DynEnum:1.0"))
-      || (!ACE_OS::strcmp ((char *) value,
-                           "IDL:/CORBA_DynAny:1.0"))
+  if ((!ACE_OS::strcmp ((char *) value, 
+                        "IDL:/CORBA_DynEnum:1.0")) 
+      || (!ACE_OS::strcmp ((char *) value, 
+                           "IDL:/CORBA_DynAny:1.0")) 
       || (!ACE_OS::strcmp ((char *) value,
                            CORBA::_tc_Object->id (_tao_environment))))
       return 1;
@@ -617,37 +612,37 @@ POA_CORBA::DynEnum::_is_a (
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynEnum::_downcast (
     const char* logical_type_id
   )
 {
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynEnum:1.0"))
-    return ACE_static_cast (POA_CORBA::DynEnum_ptr,
+    return ACE_static_cast (POA_CORBA::DynEnum_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
+    return ACE_static_cast (POA_CORBA::DynAny_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
+    return ACE_static_cast(PortableServer::Servant, 
                            this);
 
   return 0;
 }
 
-void
-POA_CORBA::DynEnum::_dispatch (CORBA::ServerRequest &,
-                               void *,
+void 
+POA_CORBA::DynEnum::_dispatch (CORBA::ServerRequest &, 
+                               void *, 
                                CORBA::Environment &)
 {
 }
 
-const char*
+const char* 
 POA_CORBA::DynEnum::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynEnum:1.0";
@@ -655,25 +650,25 @@ POA_CORBA::DynEnum::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynEnum::_tao_collocated_DynEnum (
     POA_CORBA::DynEnum_ptr servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynEnum (),
-    _tao_collocated_DynAny (servant,
+    _tao_collocated_DynAny (servant, 
                                        stub),
-    CORBA_Object (stub,
-                  servant,
+    CORBA_Object (stub, 
+                  servant, 
                   1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynEnum_ptr
+POA_CORBA::DynEnum_ptr 
 POA_CORBA::_tao_collocated_DynEnum::_get_servant (void) const
 {
   return this->servant_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynEnum::_is_a (
     const char* logical_type_id,
     CORBA::Environment &_tao_environment
@@ -685,7 +680,7 @@ POA_CORBA::_tao_collocated_DynEnum::_is_a (
     );
 }
 
-char *
+char * 
 POA_CORBA::_tao_collocated_DynEnum::value_as_string (
     CORBA::Environment &_tao_environment
    )
@@ -695,7 +690,7 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_string (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynEnum::value_as_string (
     const char * value_as_string,
     CORBA::Environment &_tao_environment
@@ -707,7 +702,7 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_string (
   );
 }
 
-CORBA::ULong
+CORBA::ULong 
 POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
     CORBA::Environment &_tao_environment
    )
@@ -717,7 +712,7 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
     CORBA::ULong value_as_ulong,
     CORBA::Environment &_tao_environment
@@ -733,12 +728,12 @@ POA_CORBA::_tao_collocated_DynEnum::value_as_ulong (
 CORBA_DynEnum*
 POA_CORBA::DynEnum::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
 
-  return new POA_CORBA::_tao_collocated_DynEnum (this,
+  return new POA_CORBA::_tao_collocated_DynEnum (this, 
                                                  stub);
 }
 
@@ -756,51 +751,51 @@ POA_CORBA::DynStruct::DynStruct (POA_CORBA::DynStruct& rhs)
 POA_CORBA::DynStruct::~DynStruct (void)
 {
 }
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynStruct::_is_a (
     const char* value,
     CORBA::Environment &_tao_environment
   )
 {
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynStruct:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
+  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynStruct:1.0")) 
+      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0")) 
       || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynStruct::_downcast (
     const char* logical_type_id
   )
 {
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynStruct:1.0"))
-    return ACE_static_cast (POA_CORBA::DynStruct_ptr,
+    return ACE_static_cast (POA_CORBA::DynStruct_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
+    return ACE_static_cast (POA_CORBA::DynAny_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
+    return ACE_static_cast(PortableServer::Servant, 
                            this);
 
   return 0;
 }
 
-void
-POA_CORBA::DynStruct::_dispatch (CORBA::ServerRequest &,
-                                 void *,
+void 
+POA_CORBA::DynStruct::_dispatch (CORBA::ServerRequest &, 
+                                 void *, 
                                  CORBA::Environment &)
 {
 }
 
-const char*
+const char* 
 POA_CORBA::DynStruct::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynStruct:1.0";
@@ -808,25 +803,25 @@ POA_CORBA::DynStruct::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynStruct::_tao_collocated_DynStruct (
     POA_CORBA::DynStruct_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynStruct (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
+    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, 
                                                          stub)),
-    CORBA_Object (stub,
-                  servant,
+    CORBA_Object (stub, 
+                  servant, 
                   1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynStruct_ptr
+POA_CORBA::DynStruct_ptr 
 POA_CORBA::_tao_collocated_DynStruct::_get_servant (void) const
 {
   return this->servant_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynStruct::_is_a (
     const char* logical_type_id,
     CORBA::Environment &_tao_environment
@@ -838,7 +833,7 @@ POA_CORBA::_tao_collocated_DynStruct::_is_a (
     );
 }
 
-char *
+char * 
 POA_CORBA::_tao_collocated_DynStruct::current_member_name (
     CORBA::Environment &_tao_environment
    )
@@ -848,7 +843,7 @@ POA_CORBA::_tao_collocated_DynStruct::current_member_name (
   );
 }
 
-CORBA::TCKind
+CORBA::TCKind 
 POA_CORBA::_tao_collocated_DynStruct::current_member_kind (
     CORBA::Environment &_tao_environment
    )
@@ -858,7 +853,7 @@ POA_CORBA::_tao_collocated_DynStruct::current_member_kind (
   );
 }
 
-CORBA::NameValuePairSeq *
+NameValuePairSeq * 
 POA_CORBA::_tao_collocated_DynStruct::get_members (
     CORBA::Environment &_tao_environment
    )
@@ -868,9 +863,9 @@ POA_CORBA::_tao_collocated_DynStruct::get_members (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynStruct::set_members (
-    const CORBA::NameValuePairSeq & value,
+    const NameValuePairSeq & value,
     CORBA::Environment &_tao_environment
    )
 {
@@ -884,12 +879,12 @@ POA_CORBA::_tao_collocated_DynStruct::set_members (
 CORBA_DynStruct*
 POA_CORBA::DynStruct::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
 
-  return new POA_CORBA::_tao_collocated_DynStruct (this,
+  return new POA_CORBA::_tao_collocated_DynStruct (this, 
                                                    stub);
 }
 
@@ -907,36 +902,36 @@ POA_CORBA::DynUnion::DynUnion (POA_CORBA::DynUnion& rhs)
 POA_CORBA::DynUnion::~DynUnion (void)
 {
 }
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynUnion::_is_a (
     const char* value,
     CORBA::Environment &_tao_environment
   )
 {
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynUnion:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
+  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynUnion:1.0")) 
+      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0")) 
       || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynUnion::_downcast (
     const char* logical_type_id
   )
 {
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynUnion:1.0"))
-    return ACE_static_cast (POA_CORBA::DynUnion_ptr,
+    return ACE_static_cast (POA_CORBA::DynUnion_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
+    return ACE_static_cast (POA_CORBA::DynAny_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:omg.org/CORBA/Object:1.0"))
     return ACE_static_cast(PortableServer::Servant,
                            this);
@@ -944,8 +939,8 @@ POA_CORBA::DynUnion::_downcast (
   return 0;
 }
 
-void POA_CORBA::DynUnion::_dispatch (CORBA::ServerRequest &,
-                                    void *,
+void POA_CORBA::DynUnion::_dispatch (CORBA::ServerRequest &, 
+                                    void *, 
                                     CORBA::Environment &)
 {
 }
@@ -957,23 +952,23 @@ const char* POA_CORBA::DynUnion::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynUnion::_tao_collocated_DynUnion (
     POA_CORBA::DynUnion_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynUnion (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
+    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, 
                                                          stub)),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynUnion_ptr
+POA_CORBA::DynUnion_ptr 
 POA_CORBA::_tao_collocated_DynUnion::_get_servant (void) const
 {
   return this->servant_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynUnion::_is_a (
     const char* logical_type_id,
     CORBA::Environment &_tao_environment
@@ -985,7 +980,7 @@ POA_CORBA::_tao_collocated_DynUnion::_is_a (
     );
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynUnion::set_as_default (
     CORBA::Environment &_tao_environment
    )
@@ -995,7 +990,7 @@ POA_CORBA::_tao_collocated_DynUnion::set_as_default (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynUnion::set_as_default (
     CORBA::Boolean set_as_default,
     CORBA::Environment &_tao_environment
@@ -1007,7 +1002,7 @@ POA_CORBA::_tao_collocated_DynUnion::set_as_default (
   );
 }
 
-CORBA_DynAny_ptr
+CORBA_DynAny_ptr 
 POA_CORBA::_tao_collocated_DynUnion::discriminator (
     CORBA::Environment &_tao_environment
    )
@@ -1017,7 +1012,7 @@ POA_CORBA::_tao_collocated_DynUnion::discriminator (
   );
 }
 
-CORBA::TCKind
+CORBA::TCKind 
 POA_CORBA::_tao_collocated_DynUnion::discriminator_kind (
     CORBA::Environment &_tao_environment
    )
@@ -1027,7 +1022,7 @@ POA_CORBA::_tao_collocated_DynUnion::discriminator_kind (
   );
 }
 
-CORBA_DynAny_ptr
+CORBA_DynAny_ptr 
 POA_CORBA::_tao_collocated_DynUnion::member (
     CORBA::Environment &_tao_environment
    )
@@ -1037,7 +1032,7 @@ POA_CORBA::_tao_collocated_DynUnion::member (
   );
 }
 
-char *
+char * 
 POA_CORBA::_tao_collocated_DynUnion::member_name (
     CORBA::Environment &_tao_environment
    )
@@ -1047,7 +1042,7 @@ POA_CORBA::_tao_collocated_DynUnion::member_name (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynUnion::member_name (
     const char * member_name,
     CORBA::Environment &_tao_environment
@@ -1059,7 +1054,7 @@ POA_CORBA::_tao_collocated_DynUnion::member_name (
   );
 }
 
-CORBA::TCKind
+CORBA::TCKind 
 POA_CORBA::_tao_collocated_DynUnion::member_kind (
     CORBA::Environment &_tao_environment
    )
@@ -1073,12 +1068,12 @@ POA_CORBA::_tao_collocated_DynUnion::member_kind (
 CORBA_DynUnion*
 POA_CORBA::DynUnion::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
 
-  return new POA_CORBA::_tao_collocated_DynUnion (this,
+  return new POA_CORBA::_tao_collocated_DynUnion (this, 
                                              stub);
 }
 
@@ -1096,51 +1091,51 @@ POA_CORBA::DynSequence::DynSequence (POA_CORBA::DynSequence& rhs)
 POA_CORBA::DynSequence::~DynSequence (void)
 {
 }
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynSequence::_is_a (
     const char* value,
     CORBA::Environment &_tao_environment
   )
 {
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynSequence:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
+  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynSequence:1.0")) 
+      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0")) 
       || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynSequence::_downcast (
     const char* logical_type_id
   )
 {
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynSequence:1.0"))
-    return ACE_static_cast (POA_CORBA::DynSequence_ptr,
+    return ACE_static_cast (POA_CORBA::DynSequence_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
+    return ACE_static_cast (POA_CORBA::DynAny_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
+    return ACE_static_cast(PortableServer::Servant, 
                            this);
 
   return 0;
 }
 
-void
-POA_CORBA::DynSequence::_dispatch (CORBA::ServerRequest &,
-                                   void *,
+void 
+POA_CORBA::DynSequence::_dispatch (CORBA::ServerRequest &, 
+                                   void *, 
                                    CORBA::Environment &)
 {
 }
 
-const char*
+const char* 
 POA_CORBA::DynSequence::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynSequence:1.0";
@@ -1148,23 +1143,23 @@ POA_CORBA::DynSequence::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynSequence::_tao_collocated_DynSequence (
     POA_CORBA::DynSequence_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynSequence (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
+    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, 
                                                          stub)),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynSequence_ptr
+POA_CORBA::DynSequence_ptr 
 POA_CORBA::_tao_collocated_DynSequence::_get_servant (void) const
 {
   return this->servant_;
 }
 
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::_tao_collocated_DynSequence::_is_a (
     const char* logical_type_id,
     CORBA::Environment &_tao_environment
@@ -1176,7 +1171,7 @@ POA_CORBA::_tao_collocated_DynSequence::_is_a (
     );
 }
 
-CORBA::ULong
+CORBA::ULong 
 POA_CORBA::_tao_collocated_DynSequence::length (
     CORBA::Environment &_tao_environment
    )
@@ -1186,7 +1181,7 @@ POA_CORBA::_tao_collocated_DynSequence::length (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynSequence::length (
     CORBA::ULong length,
     CORBA::Environment &_tao_environment
@@ -1198,7 +1193,7 @@ POA_CORBA::_tao_collocated_DynSequence::length (
   );
 }
 
-CORBA_AnySeq *
+AnySeq * 
 POA_CORBA::_tao_collocated_DynSequence::get_elements (
     CORBA::Environment &_tao_environment
    )
@@ -1208,9 +1203,9 @@ POA_CORBA::_tao_collocated_DynSequence::get_elements (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynSequence::set_elements (
-    const CORBA_AnySeq & value,
+    const AnySeq & value,
     CORBA::Environment &_tao_environment
    )
 {
@@ -1224,12 +1219,12 @@ POA_CORBA::_tao_collocated_DynSequence::set_elements (
 CORBA_DynSequence*
 POA_CORBA::DynSequence::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
 
-  return new POA_CORBA::_tao_collocated_DynSequence (this,
+  return new POA_CORBA::_tao_collocated_DynSequence (this, 
                                                      stub);
 }
 
@@ -1247,51 +1242,51 @@ POA_CORBA::DynArray::DynArray (POA_CORBA::DynArray& rhs)
 POA_CORBA::DynArray::~DynArray (void)
 {
 }
-CORBA::Boolean
+CORBA::Boolean 
 POA_CORBA::DynArray::_is_a (
     const char* value,
     CORBA::Environment &_tao_environment
   )
 {
-  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynArray:1.0"))
-      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0"))
+  if ((!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynArray:1.0")) 
+      || (!ACE_OS::strcmp ((char *)value, "IDL:/CORBA_DynAny:1.0")) 
       || (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
       return 1;
     else
       return 0;
 }
 
-void*
+void* 
 POA_CORBA::DynArray::_downcast (
     const char* logical_type_id
   )
 {
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynArray:1.0"))
-    return ACE_static_cast (POA_CORBA::DynArray_ptr,
+    return ACE_static_cast (POA_CORBA::DynArray_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:/CORBA_DynAny:1.0"))
-    return ACE_static_cast (POA_CORBA::DynAny_ptr,
+    return ACE_static_cast (POA_CORBA::DynAny_ptr, 
                             this);
 
-  if (!ACE_OS::strcmp (logical_type_id,
+  if (!ACE_OS::strcmp (logical_type_id, 
                        "IDL:omg.org/CORBA/Object:1.0"))
-    return ACE_static_cast(PortableServer::Servant,
+    return ACE_static_cast(PortableServer::Servant, 
                            this);
 
   return 0;
 }
 
-void
-POA_CORBA::DynArray::_dispatch (CORBA::ServerRequest &,
-                                void *,
+void 
+POA_CORBA::DynArray::_dispatch (CORBA::ServerRequest &, 
+                                void *, 
                                 CORBA::Environment &)
 {
 }
 
-const char*
+const char* 
 POA_CORBA::DynArray::_interface_repository_id (void) const
 {
   return "IDL:/CORBA_DynArray:1.0";
@@ -1299,17 +1294,17 @@ POA_CORBA::DynArray::_interface_repository_id (void) const
 
 POA_CORBA::_tao_collocated_DynArray::_tao_collocated_DynArray (
     POA_CORBA::DynArray_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_DynArray (),
-    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant,
+    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_DynAny (servant, 
                                                          stub)),
     CORBA_Object (stub, servant, 1),
     servant_ (servant)
 {
 }
 
-POA_CORBA::DynArray_ptr
+POA_CORBA::DynArray_ptr 
 POA_CORBA::_tao_collocated_DynArray::_get_servant (void) const
 {
   return this->servant_;
@@ -1326,7 +1321,7 @@ CORBA::Boolean POA_CORBA::_tao_collocated_DynArray::_is_a (
     );
 }
 
-CORBA_AnySeq *
+AnySeq * 
 POA_CORBA::_tao_collocated_DynArray::get_elements (
     CORBA::Environment &_tao_environment
    )
@@ -1336,9 +1331,9 @@ POA_CORBA::_tao_collocated_DynArray::get_elements (
   );
 }
 
-void
+void 
 POA_CORBA::_tao_collocated_DynArray::set_elements (
-    const CORBA_AnySeq & value,
+    const AnySeq & value,
     CORBA::Environment &_tao_environment
    )
 {
@@ -1352,13 +1347,12 @@ POA_CORBA::_tao_collocated_DynArray::set_elements (
 CORBA_DynArray*
 POA_CORBA::DynArray::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
 
   if (TAO_IN_ENV.exception () != 0)
     return 0;
 
-  return new POA_CORBA::_tao_collocated_DynArray (this,
+  return new POA_CORBA::_tao_collocated_DynArray (this, 
                                                   stub);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAny_i.cpp b/TAO/tao/DynAny_i.cpp
index b6418e1b9d1..a05f533e8dc 100644
--- a/TAO/tao/DynAny_i.cpp
+++ b/TAO/tao/DynAny_i.cpp
@@ -9,14 +9,11 @@
 //    DynAny_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // =================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynStruct_i.h"
 #include "tao/DynSequence_i.h"
 #include "tao/DynEnum_i.h"
@@ -518,22 +515,23 @@ TAO_DynAny_i::get_wchar (CORBA::Environment &env)
 }
 
 CORBA::Any_ptr
-TAO_DynAny_i::get_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynAny_i::get_any (CORBA::Environment& TAO_IN_ENV)
 {
-  CORBA_Any_var val;
+  CORBA_Any_ptr val;
 
-  ACE_NEW_THROW_EX (val.out (),
-                    CORBA_Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (val,
+                        CORBA_Any,
+                        CORBA::NO_MEMORY (),
+                        0);
 
-  if (!(this->value_ >>= *val.out ()))
+  if (!(this->value_ >>= *val))
     {
+      delete val;
       val = 0;
-      ACE_THROW_RETURN (CORBA_DynAny::TypeMismatch (), 0);
+      TAO_IN_ENV.exception (new CORBA_DynAny::TypeMismatch);
     }
 
-  return val._retn ();
+  return val;
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -541,9 +539,9 @@ TAO_DynAny_i::get_any (CORBA::Environment& ACE_TRY_ENV)
 
 CORBA_DynAny_ptr
 TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
-                              CORBA::Environment& ACE_TRY_ENV)
+                              CORBA::Environment& TAO_IN_ENV)
 {
-  switch (TAO_DynAny_i::unalias (any.type (), ACE_TRY_ENV))
+  switch (TAO_DynAny_i::unalias (any.type (), TAO_IN_ENV))
     {
       case CORBA::tk_null:
       case CORBA::tk_void:
@@ -565,57 +563,57 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
       case CORBA::tk_string:
         {
           TAO_DynAny_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynAny_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynAny_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynAny::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_struct:
       case CORBA::tk_except:
         {
           TAO_DynStruct_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynStruct_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynStruct::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynStruct_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynStruct::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_sequence:
         {
           TAO_DynSequence_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynSequence_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynSequence::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynSequence_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynSequence::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_union:
         {
           TAO_DynUnion_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynUnion_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynUnion::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynUnion_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynUnion::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_enum:
         {
           TAO_DynEnum_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynEnum_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynEnum::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynEnum_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynEnum::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       case CORBA::tk_array:
         {
           TAO_DynArray_i* dp;
-          ACE_NEW_THROW_EX (dp,
-                            TAO_DynArray_i (any),
-                            CORBA::NO_MEMORY ());
-          ACE_CHECK_RETURN (CORBA_DynArray::_nil ());
-          return dp->_this (ACE_TRY_ENV);
+          ACE_NEW_THROW_RETURN (dp,
+                                TAO_DynArray_i (any),
+                                CORBA::NO_MEMORY (),
+                                CORBA_DynArray::_nil ());
+          return dp->_this (TAO_IN_ENV);
         }
       default:
         break;
@@ -626,74 +624,74 @@ TAO_DynAny_i::create_dyn_any (const CORBA_Any& any,
 
 CORBA_DynAny_ptr
 TAO_DynAny_i::create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                    CORBA::Environment& ACE_TRY_ENV)
+                                    CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynAny_i* dp;
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynAny_i (tc),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynAny::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+  ACE_NEW_THROW_RETURN (dp,
+                        TAO_DynAny_i (tc),
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynAny::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynStruct_ptr
 TAO_DynAny_i::create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynStruct_i* dp;
-  ACE_NEW_THROW_EX (dp,
-                    TAO_DynStruct_i (tc),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynStruct::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+  ACE_NEW_THROW_RETURN (dp,
+                        TAO_DynStruct_i (tc),
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynStruct::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynSequence_ptr
 TAO_DynAny_i::create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                   CORBA::Environment& ACE_TRY_ENV)
+                                   CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynSequence_i* dp;
-  ACE_NEW_THROW_EX (dp,
+  ACE_NEW_THROW_RETURN (dp,
                         TAO_DynSequence_i (tc),
-                        CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynSequence::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynSequence::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynArray_ptr
 TAO_DynAny_i::create_dyn_array (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynArray_i* dp;
-  ACE_NEW_THROW_EX (dp,
+  ACE_NEW_THROW_RETURN (dp,
                         TAO_DynArray_i (tc),
-                        CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynArray::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynArray::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynUnion_ptr
 TAO_DynAny_i::create_dyn_union (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment& ACE_TRY_ENV)
+                                CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynUnion_i* dp;
-  ACE_NEW_THROW_EX (dp,
+  ACE_NEW_THROW_RETURN (dp,
                         TAO_DynUnion_i (tc),
-                        CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynUnion::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynUnion::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynEnum_ptr
 TAO_DynAny_i::create_dyn_enum (CORBA_TypeCode_ptr tc,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
 {
   TAO_DynEnum_i* dp;
-  ACE_NEW_THROW_EX (dp,
+  ACE_NEW_THROW_RETURN (dp,
                         TAO_DynEnum_i (tc),
-                        CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA_DynEnum::_nil ());
-  return dp->_this (ACE_TRY_ENV);
+                        CORBA::NO_MEMORY (),
+                        CORBA_DynEnum::_nil ());
+  return dp->_this (TAO_IN_ENV);
 }
 
 CORBA_DynAny_ptr
@@ -754,5 +752,3 @@ TAO_DynAny_i::unalias (CORBA_TypeCode_ptr tc,
 
   return tck;
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynAny_i.h b/TAO/tao/DynAny_i.h
index 394b21fff78..dfc16ba6a8d 100644
--- a/TAO/tao/DynAny_i.h
+++ b/TAO/tao/DynAny_i.h
@@ -9,17 +9,13 @@
 //    DynAny_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // =========================================================================
 
 #ifndef TAO_DYNANY_I_H
 #define TAO_DYNANY_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/corbafwd.h"
 #include "tao/POA_CORBA.h"
 
@@ -44,26 +40,26 @@ public:
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
   CORBA::TypeCode_ptr type (CORBA::Environment &);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // In this class, there is only one
 
   CORBA::Boolean next (CORBA::Environment &);
@@ -79,102 +75,102 @@ public:
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 // The ORB DynAny-factory functions will call these so we don't need to
 // keep an orb pointer in each DynAny object.
 
   static CORBA_DynAny_ptr create_dyn_any (const CORBA_Any& any,
-                                          CORBA::Environment &ACE_TRY_ENV);
+                                           CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynAny_ptr create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV);
+                                                CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynStruct_ptr create_dyn_struct (CORBA_TypeCode_ptr tc,
-                                                CORBA::Environment &ACE_TRY_ENV);
+                                                CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynSequence_ptr create_dyn_sequence (CORBA_TypeCode_ptr tc,
-                                                    CORBA::Environment &ACE_TRY_ENV);
+                                                    CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynArray_ptr create_dyn_array (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV);
+                                              CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynUnion_ptr create_dyn_union (CORBA_TypeCode_ptr tc,
-                                              CORBA::Environment &ACE_TRY_ENV);
+                                              CORBA::Environment &TAO_IN_ENV);
 
   static CORBA_DynEnum_ptr create_dyn_enum (CORBA_TypeCode_ptr tc,
-                                            CORBA::Environment &ACE_TRY_ENV);
+                                            CORBA::Environment &TAO_IN_ENV);
 
   // And an extra generic one (not required in the spec)
   // that calls one of the above passing a typecode.
   // Comes in handy in implementing some versions of current_component().
   static CORBA_DynAny_ptr create_dyn_any (CORBA_TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV);
+                                          CORBA::Environment &TAO_IN_ENV);
 
 
   static CORBA::TCKind unalias (CORBA_TypeCode_ptr tc,
-                                CORBA::Environment &ACE_TRY_ENV);
+                                CORBA::Environment &TAO_IN_ENV);
   // Utility, in case we have tk_alias.
 
 private:
@@ -189,6 +185,4 @@ private:
   TAO_DynAny_i &operator= (const TAO_DynAny_i &src);
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNANY_I_H */
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index 40ad77f82d9..823f45a4218 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -9,14 +9,11 @@
 //    DynArray_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ====================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynArray_i.h"
 #include "tao/InconsistentTypeCodeC.h"
 
@@ -53,7 +50,6 @@ TAO_DynArray_i::TAO_DynArray_i (const CORBA_Any& any)
         {
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           // This recursive step will call the correct constructor
@@ -104,8 +100,8 @@ TAO_DynArray_i::~TAO_DynArray_i (void)
 ///////////////////////////////////////////////////////////////////////
 // Functions specific to DynArray
 
-CORBA_AnySeq_ptr
-TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
+AnySeq_ptr
+TAO_DynArray_i::get_elements (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
@@ -113,12 +109,12 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
     return 0;
 
   // Arg only sets maximum, so...
-  CORBA_AnySeq_ptr elements;
+  AnySeq_ptr elements;
 
-  ACE_NEW_THROW_EX (elements,
-                    CORBA_AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (elements,
+                        AnySeq (length),
+                        CORBA::NO_MEMORY (),
+                        0);
 
   // ...we must do this explicitly.
   elements->length (length);
@@ -126,15 +122,16 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      (*elements)[i] = temp.in ();
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
+      (*elements)[i] = *temp;
+      delete temp;
     }
 
   return elements;
 }
 
 void
-TAO_DynArray_i::set_elements (const CORBA_AnySeq& value,
+TAO_DynArray_i::set_elements (const AnySeq& value,
                               CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
@@ -231,13 +228,12 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
         {
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
             this->da_members_[i]->destroy (env);
 
-          this->da_members_[i] =
+          this->da_members_[i] = 
             TAO_DynAny_i::create_dyn_any (field_any,
                                           env);
 
@@ -250,42 +246,43 @@ TAO_DynArray_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynArray_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynArray_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
+  CORBA_TypeCode_ptr field_tc = this->get_element_type (TAO_IN_ENV);
 
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
     {
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
       // Recursive step
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
       TAO_InputCDR field_cdr (field_mb);
 
-      out_cdr.append (field_tc,
-                      &field_cdr,
-                      ACE_TRY_ENV);
+      out_cdr.append (field_tc, 
+                      &field_cdr, 
+                      TAO_IN_ENV);
+
+      delete field_any;
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any* retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type (ACE_TRY_ENV),
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (retval,
+                        CORBA_Any (this->type (TAO_IN_ENV),
+                                   in_cdr.start ()),
+                        CORBA::NO_MEMORY (),
+                        0);
   return retval;
 }
 
@@ -973,4 +970,3 @@ template class ACE_Array_Base<CORBA_DynAny_var>;
 #pragma instantiate ACE_Array_Base<CORBA_DynAny_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index e7ea518d0cc..7c7f848ccd4 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -10,17 +10,13 @@
 //    DynArray_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ===================================================================
 
 #ifndef TAO_DYNARRAY_I_H
 #define TAO_DYNARRAY_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -49,118 +45,118 @@ public:
 
   // Assign/dump elements using IDL defined type AnySeq
 
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV);
+  AnySeq_ptr get_elements (CORBA::Environment &TAO_IN_ENV);
 
-  void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void set_elements (const AnySeq& value,
+                     CORBA::Environment &TAO_IN_ENV);
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long index,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   // Jump to component at <index>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV);
+  void rewind (CORBA::Environment &TAO_IN_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &TAO_IN_ENV);
   // Returns the type of elements contained in the array.
 
   CORBA::ULong get_arg_length (CORBA::TypeCode_ptr tc,
-                               CORBA::Environment &ACE_TRY_ENV);
+                               CORBA::Environment &TAO_IN_ENV);
   // Gets the length of the array from the typecode
 
   CORBA::TypeCode_var type_;
@@ -180,6 +176,4 @@ private:
   TAO_DynArray_i &operator= (const TAO_DynArray_i &src);
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNARRAY_I_H */
diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp
index fc9f81daa26..92f4674c9cd 100644
--- a/TAO/tao/DynEnum_i.cpp
+++ b/TAO/tao/DynEnum_i.cpp
@@ -9,14 +9,11 @@
 //    DynEnum_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ===================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynEnum_i.h"
 #include "tao/InconsistentTypeCodeC.h"
 
@@ -158,19 +155,18 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynEnum_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynEnum_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
   out_cdr.write_ulong (this->value_);
 
   CORBA_Any* retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type_.in (),
-                               0,
-                               out_cdr.begin ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (retval,
+                        CORBA_Any (this->type_.in (),
+                                   out_cdr.begin ()),
+                        CORBA::NO_MEMORY (),
+                        0);
   return retval;
 }
 
@@ -219,202 +215,202 @@ void
 TAO_DynEnum_i::insert_boolean (CORBA::Boolean,
                                CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_octet (CORBA::Octet,
                              CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_char (CORBA::Char,
                             CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_short (CORBA::Short,
                              CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_ushort (CORBA::UShort,
                               CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_long (CORBA::Long,
                             CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_ulong (CORBA::ULong,
                              CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_float (CORBA::Float,
                              CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_double (CORBA::Double,
                               CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_string (const char *,
                               CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_reference (CORBA::Object_ptr,
                                  CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr,
                                 CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_longlong (CORBA::LongLong,
                                CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong,
                                  CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_wchar (CORBA::WChar,
                              CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 void
 TAO_DynEnum_i::insert_any (const CORBA::Any&,
                            CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 }
 
 CORBA::Boolean
 TAO_DynEnum_i::get_boolean (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Octet
 TAO_DynEnum_i::get_octet (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Char
 TAO_DynEnum_i::get_char (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Short
 TAO_DynEnum_i::get_short (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::UShort
 TAO_DynEnum_i::get_ushort (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Long
 TAO_DynEnum_i::get_long (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::ULong
 TAO_DynEnum_i::get_ulong (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Float
 TAO_DynEnum_i::get_float (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Double
 TAO_DynEnum_i::get_double (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 char *
 TAO_DynEnum_i::get_string (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Object_ptr
 TAO_DynEnum_i::get_reference (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::TypeCode_ptr
 TAO_DynEnum_i::get_typecode (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::LongLong
 TAO_DynEnum_i::get_longlong (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
 
 #if defined (ACE_LACKS_LONGLONG_T)
   CORBA::LongLong tmp = {0, 0};
@@ -427,22 +423,22 @@ TAO_DynEnum_i::get_longlong (CORBA::Environment &env)
 CORBA::ULongLong
 TAO_DynEnum_i::get_ulonglong (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::WChar
 TAO_DynEnum_i::get_wchar (CORBA::Environment &env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
 CORBA::Any_ptr
 TAO_DynEnum_i::get_any (CORBA::Environment& env)
 {
-  env.exception (new CORBA::BAD_OPERATION ());
+  env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO));
   return 0;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+
diff --git a/TAO/tao/DynEnum_i.h b/TAO/tao/DynEnum_i.h
index 5253f22187e..e270b951d0d 100644
--- a/TAO/tao/DynEnum_i.h
+++ b/TAO/tao/DynEnum_i.h
@@ -10,17 +10,13 @@
 //    DynEnum_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ========================================================================
 
 #ifndef TAO_DYNENUM_I_H
 #define TAO_DYNENUM_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -48,49 +44,49 @@ public:
   // Functions specific to DynEnum
   // Get and set methods for enum's string and numeric value
 
-  char* value_as_string (CORBA::Environment &ACE_TRY_ENV);
+  char* value_as_string (CORBA::Environment &TAO_IN_ENV);
 
   void value_as_string (const char* value_as_string,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
 
   CORBA::ULong value_as_ulong (CORBA::Environment&);
 
   void value_as_ulong (CORBA::ULong value_as_ulong,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long index,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   // Jump to component at <index>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV);
+  void rewind (CORBA::Environment &TAO_IN_ENV);
   // Makes first component the current one
 
   // Insert and get functions
@@ -99,68 +95,68 @@ public:
   // their presence, they will just throw an exception
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 private:
   CORBA::TypeCode_var type_;
@@ -177,6 +173,4 @@ private:
   TAO_DynEnum_i &operator= (const TAO_DynEnum_i &src);
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNENUM_I_H */
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index 27b8f39ac25..6795db51afc 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -9,14 +9,11 @@
 //    DynSequence_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ===================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynSequence_i.h"
 #include "tao/InconsistentTypeCodeC.h"
 
@@ -57,7 +54,6 @@ TAO_DynSequence_i::TAO_DynSequence_i (const CORBA_Any& any)
         {
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           // This recursive step will call the correct constructor
@@ -113,19 +109,19 @@ TAO_DynSequence_i::length (CORBA::ULong length,
   this->da_members_.size (length);
 }
 
-CORBA_AnySeq_ptr
-TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
+AnySeq_ptr
+TAO_DynSequence_i::get_elements (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
   if (length == 0)
     return 0;
 
-  CORBA_AnySeq_ptr elements;
-  ACE_NEW_THROW_EX (elements,
-                    CORBA_AnySeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  AnySeq_ptr elements;
+  ACE_NEW_THROW_RETURN (elements,
+                        AnySeq (length),
+                        CORBA::NO_MEMORY (),
+                        0);
 
   // We must do this explicitly.
   elements->length (length);
@@ -133,15 +129,16 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
   // Initialize each Any.
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      (*elements)[i] = temp.in ();
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
+      (*elements)[i] = *temp;
+      delete temp;
     }
 
   return elements;
 }
 
 void
-TAO_DynSequence_i::set_elements (const CORBA_AnySeq& value,
+TAO_DynSequence_i::set_elements (const AnySeq& value,
                                  CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
@@ -248,7 +245,6 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
         {
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
@@ -267,25 +263,25 @@ TAO_DynSequence_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynSequence_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
   out_cdr.write_ulong (this->da_members_.size ());
 
-  CORBA_TypeCode_ptr field_tc = this->get_element_type (ACE_TRY_ENV);
+  CORBA_TypeCode_ptr field_tc = this->get_element_type (TAO_IN_ENV);
 
   for (CORBA::ULong i = 0; i < this->da_members_.size (); i++)
     {
       // Each component must have been initialized.
       if (!this->da_members_[i].in ())
         {
-          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
       // Recursive step
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -293,18 +289,19 @@ TAO_DynSequence_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       out_cdr.append (field_tc,
                       &field_cdr,
-                      ACE_TRY_ENV);
+                      TAO_IN_ENV);
+
+      delete field_any;
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any* retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type (ACE_TRY_ENV),
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (retval,
+                        CORBA_Any (this->type (TAO_IN_ENV),
+                                   in_cdr.start ()),
+                        CORBA::NO_MEMORY (),
+                        0);
   return retval;
 }
 
@@ -972,4 +969,3 @@ TAO_DynSequence_i::get_element_type (CORBA::Environment& env)
   return element_type->content_type (env);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index 3305fa14839..7552a1bee69 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -10,17 +10,13 @@
 //    DynSequence_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ===================================================================
 
 #ifndef TAO_DYNSEQUENCE_I_H
 #define TAO_DYNSEQUENCE_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -49,121 +45,121 @@ public:
 
   // Get and set length of sequence
 
-  CORBA::ULong length (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong length (CORBA::Environment &TAO_IN_ENV);
 
   void length (CORBA::ULong length,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
 
   // Assign and dump elements using IDL defined type AnySeq
 
-  CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV);
+  AnySeq_ptr get_elements (CORBA::Environment &TAO_IN_ENV);
 
-  void set_elements (const CORBA_AnySeq& value,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void set_elements (const AnySeq& value,
+                     CORBA::Environment &TAO_IN_ENV);
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long index,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   // Jump to component at <index>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV);
+  void rewind (CORBA::Environment &TAO_IN_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 private:
-  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_element_type (CORBA::Environment &TAO_IN_ENV);
   // Utility, turns the type of elements contained in the sequence.
 
   CORBA::TypeCode_var type_;
@@ -183,6 +179,4 @@ private:
   TAO_DynSequence_i &operator= (const TAO_DynSequence_i &src);
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNSEQUENCE_I_H */
diff --git a/TAO/tao/DynStruct_i.cpp b/TAO/tao/DynStruct_i.cpp
index 668c4e9597d..4d6f334571a 100644
--- a/TAO/tao/DynStruct_i.cpp
+++ b/TAO/tao/DynStruct_i.cpp
@@ -9,14 +9,11 @@
 //    DynStruct_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ====================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynStruct_i.h"
 #include "tao/InconsistentTypeCodeC.h"
 
@@ -53,7 +50,6 @@ TAO_DynStruct_i::TAO_DynStruct_i (const CORBA_Any& any)
 
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           // This recursive step will call the correct constructor
@@ -101,7 +97,7 @@ TAO_DynStruct_i::~TAO_DynStruct_i (void)
 //////////////////////////////////////////////////////////////////////////
 // Functions specific to DynStruct
 
-CORBA::FieldName
+FieldName
 TAO_DynStruct_i::current_member_name (CORBA::Environment &)
 {
   return CORBA::string_dup (this->type_.in ()->member_name (this->index_));
@@ -116,16 +112,16 @@ TAO_DynStruct_i::current_member_kind (CORBA::Environment& env)
                                 env);
 }
 
-CORBA::NameValuePairSeq*
-TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
+NameValuePairSeq*
+TAO_DynStruct_i::get_members (CORBA::Environment& TAO_IN_ENV)
 {
   CORBA::ULong length = this->da_members_.size ();
 
-  CORBA::NameValuePairSeq* members;
-  ACE_NEW_THROW_EX (members,
-                    CORBA::NameValuePairSeq (length),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  NameValuePairSeq* members;
+  ACE_NEW_THROW_RETURN (members,
+                        NameValuePairSeq (length),
+                        CORBA::NO_MEMORY (),
+                        0);
 
   // We must do this explicitly.
   members->length (length);
@@ -136,15 +132,16 @@ TAO_DynStruct_i::get_members (CORBA::Environment& ACE_TRY_ENV)
       (*members)[i].id =
         CORBA::string_dup (this->type_.in ()->member_name (i));
 
-      CORBA::Any_var temp = this->da_members_[i]->to_any (ACE_TRY_ENV);
-      (*members)[i].value = temp.in ();
+      CORBA::Any_ptr temp = this->da_members_[i]->to_any (TAO_IN_ENV);
+      (*members)[i].value = *temp;
+      delete temp;
     }
 
   return members;
 }
 
 void
-TAO_DynStruct_i::set_members (const CORBA::NameValuePairSeq& value,
+TAO_DynStruct_i::set_members (const NameValuePairSeq& value,
                               CORBA::Environment& env)
 {
   CORBA::ULong length = value.length ();
@@ -233,7 +230,6 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
 
           // This Any constructor is a TAO extension.
           CORBA_Any field_any (field_tc,
-                               0,
                                cdr.start ());
 
           if (!CORBA::is_nil (this->da_members_[i].in ()))
@@ -252,7 +248,7 @@ TAO_DynStruct_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynStruct_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   TAO_OutputCDR out_cdr;
 
@@ -261,14 +257,14 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
       // Each component must have been initialied.
       if (!this->da_members_[i].in ())
         {
-          ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+          TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
           return 0;
         }
 
-      CORBA_TypeCode_ptr field_tc = this->da_members_[i]->type (ACE_TRY_ENV);
+      CORBA_TypeCode_ptr field_tc = this->da_members_[i]->type (TAO_IN_ENV);
 
       // Recursive step
-      CORBA_Any_var field_any = this->da_members_[i]->to_any (ACE_TRY_ENV);
+      CORBA_Any_ptr field_any = this->da_members_[i]->to_any (TAO_IN_ENV);
 
       ACE_Message_Block* field_mb = field_any->_tao_get_cdr ();
 
@@ -276,18 +272,19 @@ TAO_DynStruct_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
       out_cdr.append (field_tc,
                       &field_cdr,
-                      ACE_TRY_ENV);
+                      TAO_IN_ENV);
+
+      delete field_any;
     }
 
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any* retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type (ACE_TRY_ENV),
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (retval,
+                        CORBA_Any (this->type (TAO_IN_ENV),
+                                   in_cdr.start ()),
+                        CORBA::NO_MEMORY (),
+                        0);
   return retval;
 }
 
@@ -1002,4 +999,4 @@ TAO_DynStruct_i::get_any (CORBA::Environment &env)
   return val;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+//**********************************************************
diff --git a/TAO/tao/DynStruct_i.h b/TAO/tao/DynStruct_i.h
index e0d4d8758db..23cb0fa4e0e 100644
--- a/TAO/tao/DynStruct_i.h
+++ b/TAO/tao/DynStruct_i.h
@@ -10,17 +10,13 @@
 //    DynStruct_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ========================================================================
 
 #ifndef TAO_DYNSTRUCT_I_H
 #define TAO_DYNSTRUCT_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -47,118 +43,118 @@ public:
 
   // Functions specific to DynStruct
 
-  CORBA::FieldName current_member_name (CORBA::Environment &ACE_TRY_ENV);
+  FieldName current_member_name (CORBA::Environment &TAO_IN_ENV);
   // FieldName is IDL typedef for string
 
-  CORBA::TCKind current_member_kind (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TCKind current_member_kind (CORBA::Environment &TAO_IN_ENV);
 
   // Assign and dump elements using IDL defined type NameValuePairSeq
 
-  CORBA::NameValuePairSeq* get_members (CORBA::Environment &ACE_TRY_ENV);
+  NameValuePairSeq* get_members (CORBA::Environment &TAO_IN_ENV);
 
-  void set_members (const CORBA::NameValuePairSeq& value,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void set_members (const NameValuePairSeq& value,
+                    CORBA::Environment &TAO_IN_ENV);
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long index,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   // Jump to component at <index>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV);
+  void rewind (CORBA::Environment &TAO_IN_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 private:
   CORBA::TypeCode_var type_;
@@ -178,6 +174,4 @@ private:
   TAO_DynStruct_i &operator= (const TAO_DynStruct_i &src);
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNSTRUCT_I_H */
diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp
index 36e8d7ad937..6f84aa1e02f 100644
--- a/TAO/tao/DynUnion_i.cpp
+++ b/TAO/tao/DynUnion_i.cpp
@@ -9,14 +9,11 @@
 //    DynUnion_i.cpp
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ====================================================================
 
 #include "tao/DynAny_i.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynUnion_i.h"
 #include "tao/InconsistentTypeCodeC.h"
 
@@ -211,12 +208,12 @@ TAO_DynUnion_i::from_any (const CORBA_Any& any,
 }
 
 CORBA::Any_ptr
-TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
+TAO_DynUnion_i::to_any (CORBA::Environment& TAO_IN_ENV)
 {
   // Both Dynanys must have been initialied.
   if (this->member_.in () == 0 || this->discriminator_.in () == 0)
     {
-      ACE_TRY_ENV.exception (new CORBA_DynAny::Invalid);
+      TAO_IN_ENV.exception (new CORBA_DynAny::Invalid);
       return 0;
     }
 
@@ -224,9 +221,9 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA_TypeCode_ptr disc_tc = this->discriminator_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_ptr disc_tc = this->discriminator_->type (TAO_IN_ENV);
 
-  CORBA_Any_var disc_any = this->discriminator_->to_any (ACE_TRY_ENV);
+  CORBA_Any_ptr disc_any = this->discriminator_->to_any (TAO_IN_ENV);
 
   ACE_Message_Block* disc_mb = disc_any->_tao_get_cdr ();
 
@@ -234,13 +231,15 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   out_cdr.append (disc_tc,
                   &disc_cdr,
-                  ACE_TRY_ENV);
+                  TAO_IN_ENV);
+
+  delete disc_any;
 
   // Add the member to the CDR stream.
 
-  CORBA_TypeCode_ptr member_tc = this->member_->type (ACE_TRY_ENV);
+  CORBA_TypeCode_ptr member_tc = this->member_->type (TAO_IN_ENV);
 
-  CORBA_Any_var member_any = this->member_->to_any (ACE_TRY_ENV);
+  CORBA_Any_ptr member_any = this->member_->to_any (TAO_IN_ENV);
 
   ACE_Message_Block* member_mb = member_any->_tao_get_cdr ();
 
@@ -248,18 +247,19 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV)
 
   out_cdr.append (member_tc,
                   &member_cdr,
-                  ACE_TRY_ENV);
+                  TAO_IN_ENV);
+
+  delete member_any;
 
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
 
   CORBA_Any* retval;
-  ACE_NEW_THROW_EX (retval,
-                    CORBA_Any (this->type (ACE_TRY_ENV),
-                               0,
-                               in_cdr.start ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
+  ACE_NEW_THROW_RETURN (retval,
+                        CORBA_Any (this->type (TAO_IN_ENV),
+                                   in_cdr.start ()),
+                        CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                        0);
   return retval;
 }
 
@@ -1261,77 +1261,77 @@ TAO_DynUnion_i::Enum_extractor::check_match (const CORBA_Any& inside_any,
 // Functor factory.
 DU_Extractor_base*
 TAO_DynUnion_i::get_extractor (CORBA::TCKind kind,
-                               CORBA::Environment& ACE_TRY_ENV)
+                               CORBA::Environment& TAO_IN_ENV)
 {
   DU_Extractor_base* retval;
 
   switch (kind)
     {
       case CORBA::tk_short:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::Short>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::Short>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_long:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::Long>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::Long>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_ushort:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::UShort>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::UShort>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_ulong:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::ULong>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::ULong>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_boolean:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::Boolean>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::Boolean>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_char:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::Char>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::Char>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
 
 // For platforms without native 64-bit ints . . .
 #if !defined (ACE_LACKS_LONGLONG_T)
       case CORBA::tk_longlong:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::LongLong>,
-                          CORBA::NO_MEMORY ());
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::LongLong>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
 
-        ACE_CHECK_RETURN (0);
         return retval;
 #endif /* ACE_LACKS_LONGLONG_T */
 
       case CORBA::tk_ulonglong:
-        ACE_NEW_THROW_EX (retval,
-                          DU_Extractor<CORBA::ULongLong>,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              DU_Extractor<CORBA::ULongLong>,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_wchar:
-        ACE_NEW_THROW_EX (retval,
-                          WChar_extractor,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              WChar_extractor,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       case CORBA::tk_enum:
-        ACE_NEW_THROW_EX (retval,
-                          Enum_extractor,
-                          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (0);
+        ACE_NEW_THROW_RETURN (retval,
+                              Enum_extractor,
+                              CORBA::NO_MEMORY (CORBA::COMPLETED_NO),
+                              0);
         return retval;
       default:
         return 0;
@@ -1352,7 +1352,6 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
   CORBA_TypeCode_ptr disc_tc = any.type ()->discriminator_type (env);
 
   CORBA_Any disc_any (disc_tc,
-                      0,
                       cdr.start ());
 
   if (!CORBA::is_nil (this->discriminator_.in()))
@@ -1409,7 +1408,6 @@ TAO_DynUnion_i::set_from_any (const CORBA_Any& any,
 
       CORBA_Any member_any (any.type ()->member_type (this->index_,
                                                       env),
-                            0,
                             cdr.start ());
 
       if (!CORBA::is_nil (this->member_.in ()))
@@ -1450,5 +1448,3 @@ template class DU_Extractor<CORBA::ULongLong>;
 
 #pragma instantiate DU_Extractor<CORBA::ULongLong>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/DynUnion_i.h b/TAO/tao/DynUnion_i.h
index 744021ad40e..7edde848a9a 100644
--- a/TAO/tao/DynUnion_i.h
+++ b/TAO/tao/DynUnion_i.h
@@ -10,17 +10,13 @@
 //    DynUnion_i.h
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ========================================================================
 
 #ifndef TAO_DYNUNION_I_H
 #define TAO_DYNUNION_I_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/DynUnion_i_T.h"
 
 class TAO_Export TAO_DynUnion_i : public POA_CORBA::DynUnion
@@ -43,7 +39,7 @@ public:
 
   // Functions specific to DynUnion
 
-  CORBA::Boolean set_as_default (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean set_as_default (CORBA::Environment &TAO_IN_ENV);
   // Does union have a default member?
 
   void set_as_default (CORBA::Boolean set_as_default,
@@ -53,122 +49,122 @@ public:
   CORBA_DynAny_ptr discriminator (CORBA::Environment&);
   // Returns the discriminator (which is a DynAny)
 
-  CORBA::TCKind discriminator_kind (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TCKind discriminator_kind (CORBA::Environment &TAO_IN_ENV);
   // Returns TCKind of discriminator
 
-  CORBA_DynAny_ptr member (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr member (CORBA::Environment &TAO_IN_ENV);
   // Returns active member
 
   // Get and set for member name
 
-  char* member_name (CORBA::Environment &ACE_TRY_ENV);
+  char* member_name (CORBA::Environment &TAO_IN_ENV);
 
   void member_name (const char* member_name,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TCKind member_kind (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TCKind member_kind (CORBA::Environment &TAO_IN_ENV);
   // Returns TCKind of active member
 
   // Functions common to all Dynamic Any types
 
   void assign (CORBA_DynAny_ptr dyn_any,
-               CORBA::Environment &ACE_TRY_ENV);
+               CORBA::Environment &TAO_IN_ENV);
   // Sets the value of the receiver to the value of the argument
 
-  CORBA_DynAny_ptr copy (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr copy (CORBA::Environment &TAO_IN_ENV);
   // Creates a copy
 
-  void destroy (CORBA::Environment &ACE_TRY_ENV);
+  void destroy (CORBA::Environment &TAO_IN_ENV);
   // Makes sure the contents are disposed of correctly
 
   void from_any (const CORBA::Any& any,
-                 CORBA::Environment &ACE_TRY_ENV);
+                 CORBA::Environment &TAO_IN_ENV);
   // Assigns value from an Any argument
 
-  CORBA::Any_ptr to_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr to_any (CORBA::Environment &TAO_IN_ENV);
   // Outputs contents as an Any
 
-  CORBA::TypeCode_ptr type (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr type (CORBA::Environment &TAO_IN_ENV);
   // Returns the (constant) type
 
-  CORBA_DynAny_ptr current_component (CORBA::Environment &ACE_TRY_ENV);
+  CORBA_DynAny_ptr current_component (CORBA::Environment &TAO_IN_ENV);
   // Used in iterating through the contents
 
-  CORBA::Boolean next (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Boolean next (CORBA::Environment &TAO_IN_ENV);
   // Returns next component
 
   CORBA::Boolean seek (CORBA::Long index,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   // Jump to component at <index>
 
-  void rewind (CORBA::Environment &ACE_TRY_ENV);
+  void rewind (CORBA::Environment &TAO_IN_ENV);
   // Makes first component the current one
 
   // Insert and get functions
 
   void insert_boolean (CORBA::Boolean value,
-                       CORBA::Environment &ACE_TRY_ENV);
+                       CORBA::Environment &TAO_IN_ENV);
   void insert_octet (CORBA::Octet value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_char (CORBA::Char value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_short (CORBA::Short value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_ushort (CORBA::UShort value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_long (CORBA::Long value,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   void insert_ulong (CORBA::ULong value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_float (CORBA::Float value,
-                     CORBA::Environment &ACE_TRY_ENV);
+                     CORBA::Environment &TAO_IN_ENV);
   void insert_double (CORBA::Double value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_string (const char * value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_reference (CORBA::Object_ptr value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_typecode (CORBA::TypeCode_ptr value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_longlong (CORBA::LongLong value,
-                        CORBA::Environment &ACE_TRY_ENV);
+                        CORBA::Environment &TAO_IN_ENV);
   void insert_ulonglong (CORBA::ULongLong value,
-                         CORBA::Environment &ACE_TRY_ENV);
+                         CORBA::Environment &TAO_IN_ENV);
   void insert_wchar (CORBA::WChar value,
-                      CORBA::Environment &ACE_TRY_ENV);
+                      CORBA::Environment &TAO_IN_ENV);
   void insert_any (const CORBA::Any& value,
-                   CORBA::Environment &ACE_TRY_ENV);
-  CORBA::Boolean get_boolean (CORBA::Environment &ACE_TRY_ENV);
+                   CORBA::Environment &TAO_IN_ENV);
+  CORBA::Boolean get_boolean (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Octet get_octet (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Octet get_octet (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Char get_char (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Char get_char (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Short get_short (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Short get_short (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::UShort get_ushort (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::UShort get_ushort (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Long get_long (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Long get_long (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULong get_ulong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULong get_ulong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Float get_float (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Float get_float (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Double get_double (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Double get_double (CORBA::Environment &TAO_IN_ENV);
 
-  char * get_string (CORBA::Environment &ACE_TRY_ENV);
+  char * get_string (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Object_ptr get_reference (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Object_ptr get_reference (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::TypeCode_ptr get_typecode (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::LongLong get_longlong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::LongLong get_longlong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::ULongLong get_ulonglong (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ULongLong get_ulonglong (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::WChar get_wchar (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::WChar get_wchar (CORBA::Environment &TAO_IN_ENV);
 
-  CORBA::Any_ptr get_any (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::Any_ptr get_any (CORBA::Environment &TAO_IN_ENV);
 
 private:
   CORBA_DynAny_var member_;
@@ -212,15 +208,13 @@ private:
   };
 
   DU_Extractor_base* get_extractor (CORBA::TCKind kind,
-                                    CORBA::Environment &ACE_TRY_ENV);
+                                      CORBA::Environment &TAO_IN_ENV);
   // Returns a pointer to the correct extractor class.
 
   void set_from_any(const CORBA_Any& any,
-                    CORBA::Environment &ACE_TRY_ENV);
+                    CORBA::Environment &TAO_IN_ENV);
   // Code common to the constructor from an Any arg and the member
   // function from_any().
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_DYNUNION_I_H */
diff --git a/TAO/tao/DynUnion_i_T.cpp b/TAO/tao/DynUnion_i_T.cpp
index 68250e3d093..242e41b9d5b 100644
--- a/TAO/tao/DynUnion_i_T.cpp
+++ b/TAO/tao/DynUnion_i_T.cpp
@@ -23,11 +23,6 @@
 // types - some are specifically defined in DynUnion_i.cpp.
 
 template <class Type>
-DU_Extractor<Type>::~DU_Extractor ()
-{
-}
-
-template <class Type>
 CORBA::Boolean
 DU_Extractor<Type>::check_match (const CORBA_Any& inside_any,
                                  const CORBA_Any& outside_any)
diff --git a/TAO/tao/DynUnion_i_T.h b/TAO/tao/DynUnion_i_T.h
index 1a89483f1d0..ea20b31f06e 100644
--- a/TAO/tao/DynUnion_i_T.h
+++ b/TAO/tao/DynUnion_i_T.h
@@ -27,8 +27,9 @@ class DU_Extractor_base
   //    Base class of template class below
   //
 public:
-  virtual CORBA::Boolean check_match (const CORBA_Any& inside_any,
-                                      const CORBA_Any& outside_any) = 0;
+  virtual
+  CORBA::Boolean check_match (const CORBA_Any& inside_any,
+                              const CORBA_Any& outside_any) = 0;
 };
 
 template <class Type>
@@ -44,10 +45,8 @@ class DU_Extractor : public DU_Extractor_base
   //    TAO_DynUnion_i or even at global scope in the same file.
   //
 public:
-  virtual ~DU_Extractor ();
-
-  virtual CORBA::Boolean check_match (const CORBA_Any& inside_any,
-                                      const CORBA_Any& outside_any);
+  CORBA::Boolean check_match (const CORBA_Any& inside_any,
+                              const CORBA_Any& outside_any);
 private:
   Type arg_index_;
   Type member_index_;
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index cf0713126d3..677345ae6ad 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -37,7 +37,12 @@ CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
 
 CORBA_Environment::CORBA_Environment (void)
   : exception_ (0),
+#if !defined (TAO_USES_FLICK)
     previous_ (0)
+#else
+    previous_ (0),
+    _major(CORBA::NO_EXCEPTION)
+#endif /* TAO_USES_FLICK */
 {
   //  TAO_ORB_Core_instance ()->default_environment (this);
 }
@@ -47,8 +52,7 @@ CORBA_Environment::CORBA_Environment (const CORBA_Environment& rhs)
     previous_ (0)
 {
   //  TAO_ORB_Core_instance ()->default_environment (this);
-  if (this->exception_)
-    this->exception_->_incr_refcnt ();
+  exception_->_incr_refcnt ();
 }
 
 CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
@@ -59,27 +63,6 @@ CORBA_Environment::CORBA_Environment (TAO_ORB_Core* orb_core)
 }
 #endif
 
-CORBA::ULong
-CORBA_Environment::_incr_refcnt (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-  return refcount_++;
-}
-
-CORBA::ULong
-CORBA_Environment::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  delete this;
-  return 0;
-}
-
 CORBA_Environment&
 CORBA_Environment::operator= (const CORBA_Environment& rhs)
 {
@@ -113,6 +96,9 @@ CORBA_Environment::exception (CORBA_Exception *ex)
   if (this->exception_ != 0)
     {
       this->exception_->_incr_refcnt ();
+#if defined (TAO_USES_FLICK)
+      this->_major = this->exception_type();
+#endif /* TAO_USES_FLICK */
 #if defined (TAO_HAS_EXCEPTIONS)
       this->exception_->_raise ();
 #endif /* TAO_HAS_EXCEPTIONS */
@@ -149,7 +135,13 @@ CORBA_Environment::default_environment ()
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
 #endif /* TAO_HAS_EXCEPTIONS */
 
-  return CORBA::default_environment ();
+  return *TAO_ORB_Core_instance ()->default_environment ();
+}
+
+CORBA_Environment&
+CORBA::default_environment ()
+{
+  return CORBA_Environment::default_environment ();
 }
 
 // Convenience -- say if the exception is a system exception or not.
@@ -199,13 +191,15 @@ CORBA::Environment::print_exception (const char *info,
     {
       const char *id = this->exception_->_id ();
 
-      ACE_DEBUG ((LM_ERROR, "TAO: (%P|%t) EXCEPTION, %s\n", info));
+      ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info));
 
-      CORBA::SystemException *x2 =
-        CORBA_SystemException::_narrow (this->exception_);
+      // @@ get rid of this logic, and rely on some member function on
+      // Exception to say if it's user or system exception.
 
-      if (x2 != 0)
+      if (this->exception_type () == CORBA::SYSTEM_EXCEPTION)
         {
+          CORBA::SystemException *x2 =
+            CORBA_SystemException::_narrow (this->exception_);
 
           // @@ there are a other few "user exceptions" in the CORBA
           // scope, they're not all standard/system exceptions ... really
@@ -214,10 +208,10 @@ CORBA::Environment::print_exception (const char *info,
           // directly in the exception value so it can be queried.
 
           ACE_DEBUG ((LM_ERROR,
-                      "TAO: (%P|%t) system exception, ID '%s'\n",
+                      "(%P|%t) system exception, ID '%s'\n",
                       id));
           ACE_DEBUG ((LM_ERROR,
-                      "TAO: (%P|%t) minor code = %x, completed = %s\n",
+                      "(%P|%t) minor code = %x, completed = %s\n",
                       x2->minor (),
                       (x2->completed () == CORBA::COMPLETED_YES) ? "YES" :
                       (x2->completed () == CORBA::COMPLETED_NO) ? "NO" :
@@ -229,38 +223,10 @@ CORBA::Environment::print_exception (const char *info,
         // held within it ...
 
         ACE_DEBUG ((LM_ERROR,
-                    "TAO: (%P|%t) user exception, ID '%s'\n",
+                    "(%P|%t) user exception, ID '%s'\n",
                     id));
     }
   else
     ACE_DEBUG ((LM_ERROR,
-                "TAO: (%P|%t) no exception\n"));
+                "(%P|%t) no exception\n"));
 }
-
-// *********************************************************
-
-CORBA_Environment_var &
-CORBA_Environment_var::operator= (CORBA_Environment_ptr p)
-{
-  if (this->ptr_ != p)
-  {
-    if (this->ptr_ != 0)
-    delete (this->ptr_);
-
-    this->ptr_ = p;
-  }
-  return *this;
-}
-
-CORBA_Environment_var &
-CORBA_Environment_var::operator= (const CORBA_Environment_var &r)
-{
-  if (this->ptr_ != 0)
-    delete this->ptr_;
-
-  this->ptr_ = new CORBA::Environment (*r.ptr_);
-  return *this;
-}
-
-
-
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index baeef4f8ec9..532f2b1f3c1 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -89,30 +89,21 @@ public:
   // exception.
 
   const char* exception_id (void) const;
-  // return the repository ID for the exception.
+  // return the repository ID for the exception
 
   void clear (void);
   // Clear the exception.
 
   void print_exception (const char *info,
                         FILE *f=stdout) const;
-  // Print the exception to output determined by f.
-  // This function is not CORBA compliant.
+  // print the exception to output determined by f
 
   // = Obtain a default environment to use with TAO.
   static CORBA_Environment &default_environment (void);
 
-  // = Reference counting.
-  CORBA::ULong _incr_refcnt (void);
-  CORBA::ULong _decr_refcnt (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Environment_ptr _ptr_type;
-  typedef CORBA_Environment_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
+#if defined (TAO_USES_FLICK)
 private:
+#endif /* TAO_USES_FLICK */
 
   friend class TAO_ORB_Core;
   CORBA_Environment (TAO_ORB_Core *orb_core);
@@ -125,67 +116,10 @@ private:
   CORBA_Environment* previous_;
   // The previous environment on the "default environment stack".
 
-  CORBA::ULong refcount_;
-  // reference counting
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // protect the reference count
-};
-
-class TAO_Export CORBA_Environment_var
-{
-  // = TITLE
-  //   CORBA_Environment_var
-  //
-  // = DESCRIPTION
-  //   Provide for automatic storage deallocation on going out of
-  //   scope.
-public:
-  CORBA_Environment_var (void); // default constructor
-  CORBA_Environment_var (CORBA_Environment_ptr);
-  CORBA_Environment_var (const CORBA_Environment_var &); // copy constructor
-  ~CORBA_Environment_var (void); // destructor
-
-  CORBA_Environment_var &operator= (CORBA_Environment_ptr);
-  CORBA_Environment_var &operator= (const CORBA_Environment_var &);
-  CORBA_Environment_ptr operator-> (void) const;
-
-  operator const CORBA_Environment_ptr &() const;
-  operator CORBA_Environment_ptr &();
-  // in, inout, out, _retn
-  CORBA_Environment_ptr in (void) const;
-  CORBA_Environment_ptr &inout (void);
-  CORBA_Environment_ptr &out (void);
-  CORBA_Environment_ptr _retn (void);
-  CORBA_Environment_ptr ptr (void) const;
-
-private:
-  CORBA_Environment_ptr ptr_;
-};
-
-class TAO_Export CORBA_Environment_out
-{
-  // = TITLE
-  //   CORBA_Environment_out
-  //
-  // = DESCRIPTION
-  //   The _out class for CORBA_Environment. This is used to help in
-  //   managing the out parameters.
-public:
-  CORBA_Environment_out (CORBA_Environment_ptr &);
-  CORBA_Environment_out (CORBA_Environment_var &);
-  CORBA_Environment_out (const CORBA_Environment_out &);
-  CORBA_Environment_out &operator= (const CORBA_Environment_out &);
-  CORBA_Environment_out &operator= (CORBA_Environment_ptr);
-  operator CORBA_Environment_ptr &();
-  CORBA_Environment_ptr &ptr (void);
-  CORBA_Environment_ptr operator-> (void);
-
-private:
-  CORBA_Environment_ptr &ptr_;
-
-  CORBA_Environment_out &operator= (const CORBA_Environment_var &);
-  // Assignment from _var not allowed.
+#if defined (TAO_USES_FLICK)
+  int _major;
+  char *_id;
+#endif /* TAO_USES_FLICK */
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index 83b618b4413..2411dde95ea 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -7,149 +7,3 @@ CORBA_Environment::exception (void) const
   return this->exception_;
 }
 
-ACE_INLINE void
-CORBA::release (CORBA::Environment_ptr env)
-{
-  if (env)
-    env->_decr_refcnt ();
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::Environment_ptr env)
-{
-  return env == 0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Environment_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (void)
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (CORBA_Environment_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::CORBA_Environment_var (const CORBA_Environment_var &p)
-  : ptr_ (new CORBA_Environment (*p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Environment_var::~CORBA_Environment_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::operator const CORBA_Environment_ptr &() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Environment_var::operator CORBA_Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Environment_ptr val = this->ptr_;
-  this->ptr_ = 0;
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Environment_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (CORBA_Environment_var &p)
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_Environment_out::CORBA_Environment_out (const CORBA_Environment_out &p)
-  : ptr_ (p.ptr_)
-{}
-
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (const CORBA_Environment_out &p)
-{
-  this->ptr_ = p.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Environment_out &
-CORBA_Environment_out::operator= (CORBA_Environment_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Environment_out::operator CORBA_Environment_ptr &()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr &
-CORBA_Environment_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Environment_ptr
-CORBA_Environment_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 2fdfabc06fe..0a0649ac240 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -13,6 +13,7 @@
 #include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/CDR.h"
+#include "tao/POAC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Exception.i"
@@ -93,46 +94,6 @@ CORBA_Exception::_is_a (const char* repository_id) const
   return (ACE_OS::strcmp (repository_id, "IDL:omg.org/CORBA/Exception:1.0")==0);
 }
 
-void
-CORBA_Exception::print_exception (const char *info,
-                                  FILE *) const
-{
-  const char *id = this->_id ();
-
-  ACE_DEBUG ((LM_ERROR, "(%P|%t) EXCEPTION, %s\n", info));
-
-  CORBA::SystemException *x2 =
-    CORBA_SystemException::_narrow (ACE_const_cast (CORBA_Exception *,this));
-
-  if (x2 != 0)
-    {
-
-      // @@ there are a other few "user exceptions" in the CORBA
-      // scope, they're not all standard/system exceptions ... really
-      // need to either compare exhaustively against all those IDs
-      // (yeech) or (preferably) to represent the exception type
-      // directly in the exception value so it can be queried.
-
-      ACE_DEBUG ((LM_ERROR,
-                  "(%P|%t) system exception, ID '%s'\n",
-                  id));
-      ACE_DEBUG ((LM_ERROR,
-                  "(%P|%t) minor code = %x, completed = %s\n",
-                  x2->minor (),
-                  (x2->completed () == CORBA::COMPLETED_YES) ? "YES" :
-                  (x2->completed () == CORBA::COMPLETED_NO) ? "NO" :
-                  (x2->completed () == CORBA::COMPLETED_MAYBE) ? "MAYBE" :
-                  "garbage"));
-    }
-  else
-    // @@ we can use the exception's typecode to dump all the data
-    // held within it ...
-
-    ACE_DEBUG ((LM_ERROR,
-                "(%P|%t) user exception, ID '%s'\n",
-                id));
-}
-
 CORBA::ULong
 CORBA_Exception::_incr_refcnt (void)
 {
@@ -277,8 +238,8 @@ int
 CORBA_UnknownUserException::_is_a (const char* interface_id) const
 {
   return ((ACE_OS::strcmp (interface_id,
-                           "IDL:omg.org/CORBA/UnknownUserException:1.0") == 0)
-          || CORBA_UserException::_is_a (interface_id));
+			   "IDL:omg.org/CORBA/UnknownUserException:1.0") == 0)
+	  || CORBA_UserException::_is_a (interface_id));
 }
 
 CORBA_UnknownUserException*
@@ -300,7 +261,7 @@ CORBA_UnknownUserException::_raise (void)
 
 void
 TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
-                                            CORBA::Environment &TAO_IN_ENV)
+					    CORBA::Environment &TAO_IN_ENV)
 {
   // Create the TypeCode for the CORBA_UnknownUserException
   TAO_OutputCDR stream;
@@ -310,15 +271,21 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp,
   const char* name = "UnknownUserException";
   const char* field_name = "exception";
 
-  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-      || stream.write_string (interface_id) == 0
-      || stream.write_string (name) == 0
-      || stream.write_ulong (1L) == 0
-      || stream.write_string (field_name) == 0
+  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) != 1
+      || stream.encode (CORBA::_tc_string,
+			&interface_id, 0,
+			TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || stream.encode (CORBA::_tc_string,
+			&name, 0,
+			TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || stream.write_ulong (1L) != 1
+      || stream.encode (CORBA::_tc_string,
+			&field_name, 0,
+			TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
       || stream.encode (CORBA::_tc_TypeCode,
-                        &CORBA::_tc_any, 0,
-                        TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW (CORBA_INITIALIZE ());
+			&CORBA::_tc_any, 0,
+			TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO));
 
   tcp = new CORBA::TypeCode (CORBA::tk_except,
                              stream.length (),
@@ -362,19 +329,27 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
   // exceptions?
   assert (ACE_OS::strlen (full_id) <= sizeof full_id);
 
-  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) == 0
-      || stream.write_string (strptr) == 0
-      || stream.write_string (name) == 0
+  if (stream.write_octet (TAO_ENCAP_BYTE_ORDER) != 1
+      || stream.encode (CORBA::_tc_string,
+                       &strptr, 0,
+                       TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || stream.encode (CORBA::_tc_string,
+                       &name, 0,
+                       TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
       || stream.write_ulong (2L) != 1
-      || stream.write_string (minor) == 0
+      || stream.encode (CORBA::_tc_string,
+                       &minor, 0,
+                       TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
       || stream.encode (CORBA::_tc_TypeCode,
                        &CORBA::_tc_ulong, 0,
                        TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
-      || stream.write_string (completed) == 0
+      || stream.encode (CORBA::_tc_string,
+                       &completed, 0,
+                       TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE
       || stream.encode (CORBA::_tc_TypeCode,
-                        &TC_completion_status, 0,
-                        TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW (CORBA_INITIALIZE ());
+                       &TC_completion_status, 0,
+                       TAO_IN_ENV) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    TAO_THROW (CORBA_INITIALIZE (CORBA::COMPLETED_NO));
 
   // OK, we stuffed the buffer we were given (or grew a bigger one;
   // hope to avoid that during initialization).  Now build and return
@@ -423,15 +398,7 @@ TAO_Exceptions::make_standard_typecode (CORBA::TypeCode_ptr &tcp,
     TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
     TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
     TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION)
+    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION)
 
 // Declare static storage for these ... the buffer is "naturally"
 // aligned and overwritten.
@@ -450,6 +417,19 @@ CORBA::TypeCode_ptr CORBA::_tc_UnknownUserException = 0;
 //    static CORBA::TypeCode tc_std_ ## name (CORBA::tk_except);
 //    CORBA::TypeCode_ptr CORBA::_tc_ ## name = &tc_std_ ## name;
 
+#define POA_EXCEPTION_LIST \
+  POA_EXCEPTION (AdapterAlreadyExists) \
+  POA_EXCEPTION (AdapterInactive) \
+  POA_EXCEPTION (AdapterNonExistent) \
+  POA_EXCEPTION (InvalidPolicy) \
+  POA_EXCEPTION (NoServant) \
+  POA_EXCEPTION (ObjectAlreadyActive) \
+  POA_EXCEPTION (ObjectNotActive) \
+  POA_EXCEPTION (ServantAlreadyActive) \
+  POA_EXCEPTION (ServantNotActive) \
+  POA_EXCEPTION (WrongAdapter) \
+  POA_EXCEPTION (WrongPolicy ) \
+
 void
 TAO_Exceptions::init (CORBA::Environment &env)
 {
@@ -464,14 +444,24 @@ TAO_Exceptions::init (CORBA::Environment &env)
   STANDARD_EXCEPTION_LIST
 #undef  TAO_SYSTEM_EXCEPTION
 
+  // Register POA exceptions as system exceptions
+  TAO_Exceptions::system_exceptions->add (PortableServer::_tc_ForwardRequest);
+  TAO_Exceptions::system_exceptions->add (PortableServer::POAManager::_tc_AdapterInactive);
+  TAO_Exceptions::system_exceptions->add (PortableServer::Current::_tc_NoContext);
+
+#define POA_EXCEPTION(name) \
+  TAO_Exceptions::system_exceptions->add (PortableServer::POA::_tc_ ## name);
+POA_EXCEPTION_LIST
+#undef POA_EXCEPTION
+
   if (env.exception () == 0)
     TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException,
-                                                env);
+						env);
 }
 
 CORBA_Exception*
 TAO_Exceptions::create_system_exception (const char* id,
-                                         CORBA::Environment& env)
+					 CORBA::Environment& env)
 {
 #define TAO_SYSTEM_EXCEPTION(name) \
   { \
@@ -481,6 +471,34 @@ TAO_Exceptions::create_system_exception (const char* id,
   }
   STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
+#define POA_EXCEPTION(name) \
+  { \
+    env.clear (); \
+    const char* xid = PortableServer::POA::_tc_ ## name ->id (env); \
+    if (env.exception () == 0 && ACE_OS::strcmp (id, xid) == 0) \
+      return new PortableServer::POA:: name; \
+  }
+POA_EXCEPTION_LIST
+#undef POA_EXCEPTION
+
+  {
+    env.clear ();
+    const char* xid = PortableServer::_tc_ForwardRequest->id (env);
+    if (env.exception () == 0 && ACE_OS::strcmp (id, xid) == 0)
+      return new PortableServer::ForwardRequest;
+  }
+  {
+    env.clear ();
+    const char* xid = PortableServer::POAManager::_tc_AdapterInactive->id (env);
+    if (env.exception () == 0 && ACE_OS::strcmp (id, xid) == 0)
+      return new PortableServer::POAManager::AdapterInactive;
+  }
+  {
+    env.clear ();
+    const char* xid = PortableServer::Current::_tc_NoContext->id (env);
+    if (env.exception () == 0 && ACE_OS::strcmp (id, xid) == 0)
+      return new PortableServer::Current::NoContext;
+  }
 
   return 0;
 }
@@ -531,18 +549,18 @@ STANDARD_EXCEPTION_LIST
 #define TAO_SYSTEM_EXCEPTION(name) \
 CORBA_##name :: CORBA_##name (void) \
   :  CORBA_SystemException (CORBA::_tc_ ## name, \
-                            TAO_DEFAULT_MINOR_CODE, \
-                            CORBA::COMPLETED_NO) \
+			    0xffff0000L, \
+			    CORBA::COMPLETED_NO) \
 { \
 }
 STANDARD_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
+#undef POA_EXCEPTION_LIST
 #undef STANDARD_EXCEPTION_LIST
 
 CORBA_ExceptionList::CORBA_ExceptionList (CORBA::ULong len,
                                           CORBA::TypeCode_ptr *tc_list)
-  : ref_count_ (1)
 {
   for (CORBA::ULong i=0; i < len; i++)
     this->add (tc_list [i]);
@@ -555,7 +573,7 @@ CORBA_ExceptionList::~CORBA_ExceptionList (void)
     {
       CORBA::TypeCode_ptr *tc;
       if (this->tc_list_.get (tc, i) == -1)
-        return;
+	return;
       CORBA::release (*tc);
     }
 #endif
@@ -586,7 +604,6 @@ CORBA_ExceptionList::item (CORBA::ULong index,
       return CORBA::TypeCode::_duplicate (*tc);
     }
 }
-
 void
 CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env)
 {
@@ -594,38 +611,17 @@ CORBA_ExceptionList::remove (CORBA::ULong, CORBA::Environment &env)
   env.clear ();
 }
 
-CORBA_ExceptionList_ptr
-CORBA_ExceptionList::_duplicate (void)
-{
-  ++this->ref_count_;
-  return this;
-}
-
-void
-CORBA_ExceptionList::_destroy (void)
-{
-  CORBA::ULong current = --this->ref_count_;
-  if (current == 0)
-    delete this;
-}
-
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
 TAO_DONT_CATCH::TAO_DONT_CATCH ()
 {}
 #endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 template class ACE_Node<CORBA::TypeCode_ptr>;
 template class ACE_Unbounded_Queue<CORBA::TypeCode_ptr>;
 template class ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>;
-template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
 #pragma instantiate ACE_Node<CORBA::TypeCode_ptr>
 #pragma instantiate ACE_Unbounded_Queue<CORBA::TypeCode_ptr>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::TypeCode_ptr>
-#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong>
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index 7f722292a58..787b70c6451 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -67,11 +67,6 @@ public:
   // = TAO extension. It makes it easier to write generic code.
   static CORBA_Exception* _narrow (CORBA_Exception* x);
 
-  void print_exception (const char *info,
-                        FILE *f=stdout) const;
-  // Print the exception <ex> to output determined by f.
-  // This function is not CORBA compliant.
-
   // = Methods required for memory management support.
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
@@ -174,7 +169,9 @@ public:
 
   virtual void _raise (void);
 
+#if defined (TAO_USES_FLICK)
 private:
+#endif /* TAO_USES_FLICK */
 
   CORBA::ULong minor_;
   // minor code
@@ -193,8 +190,8 @@ private:
 class TAO_Export CORBA_ ## name : public CORBA_SystemException { \
 public: \
   CORBA_ ## name (void); \
-  CORBA_ ## name (CORBA::ULong code, \
-                  CORBA::CompletionStatus completed) \
+  CORBA_ ## name (CORBA::CompletionStatus completed, \
+                  CORBA::ULong code = 0xffff0000L) \
     : CORBA_SystemException (CORBA::_tc_ ## name, code, completed) \
     { } \
   virtual void _raise (void); \
@@ -228,14 +225,6 @@ TAO_SYSTEM_EXCEPTION(INTF_REPOS);
 TAO_SYSTEM_EXCEPTION(BAD_CONTEXT);
 TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER);
 TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
-TAO_SYSTEM_EXCEPTION(INV_POLICY);
-TAO_SYSTEM_EXCEPTION(REBIND);
-TAO_SYSTEM_EXCEPTION(TIMEOUT);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED);
-TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK);
-TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);
 
 #undef TAO_SYSTEM_EXCEPTION
 
@@ -310,10 +299,6 @@ public:
   // list of system exceptions
 };
 
-
-class CORBA_ExceptionList;
-typedef CORBA_ExceptionList* CORBA_ExceptionList_ptr;
-
 class CORBA_ExceptionList
 {
   // = TITLE
@@ -336,12 +321,6 @@ public:
   CORBA::ULong count ();
   // return the number of elements
 
-  CORBA_ExceptionList_ptr _duplicate (void);
-
-  void _destroy (void);
-
-  static CORBA_ExceptionList_ptr _nil ();
-
   void add (CORBA::TypeCode_ptr tc);
   // add a TypeCode to the list
 
@@ -354,49 +333,15 @@ public:
   void remove (CORBA::ULong index, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // remove the typecode at index i. Raises the "Bounds" exception
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ExceptionList_ptr _ptr_type;
-  typedef CORBA::ExceptionList_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
 private:
   // not allowed
   CORBA_ExceptionList (const CORBA_ExceptionList &);
   CORBA_ExceptionList &operator= (const CORBA_ExceptionList &);
 
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-  // Reference counter.
-
   ACE_Unbounded_Queue<CORBA::TypeCode_ptr> tc_list_;
   // internal list of typecodes
 };
 
-class TAO_Export CORBA_ExceptionList_var
-{
-public:
-  CORBA_ExceptionList_var (void); // default constructor
-  CORBA_ExceptionList_var (CORBA_ExceptionList_ptr);
-  CORBA_ExceptionList_var (const CORBA_ExceptionList_var &); // copy constructor
-  ~CORBA_ExceptionList_var (void); // destructor
-
-  CORBA_ExceptionList_var &operator= (CORBA_ExceptionList_ptr);
-  CORBA_ExceptionList_var &operator= (const CORBA_ExceptionList_var &);
-  CORBA_ExceptionList_ptr operator-> (void) const;
-
-  operator const CORBA_ExceptionList_ptr &() const;
-  operator CORBA_ExceptionList_ptr &();
-  // in, inout, out, _retn
-  CORBA_ExceptionList_ptr in (void) const;
-  CORBA_ExceptionList_ptr &inout (void);
-  CORBA_ExceptionList_ptr &out (void);
-  CORBA_ExceptionList_ptr _retn (void);
-  CORBA_ExceptionList_ptr ptr (void) const;
-
-private:
-  CORBA_ExceptionList_ptr ptr_;
-};
-
 #if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
 class TAO_Export TAO_DONT_CATCH
 // This class is only used internally in TAO as an exception
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index d9280d9f383..57a7d180608 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -47,102 +47,3 @@ CORBA_ExceptionList::count (void)
 {
   return (CORBA::ULong) this->tc_list_.size ();
 }
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList::_nil (void)
-{
-  return (CORBA_ExceptionList_ptr)0;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (void) // default constructor
-  : ptr_ (CORBA_ExceptionList::_nil ())
-{}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (CORBA_ExceptionList_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::CORBA_ExceptionList_var (const CORBA_ExceptionList_var &p) // copy constructor
-  : ptr_ (p.ptr_->_duplicate ())
-{}
-
-ACE_INLINE
-CORBA_ExceptionList_var::~CORBA_ExceptionList_var (void) // destructor
-{
-  this->ptr_->_destroy ();
-}
-
-ACE_INLINE CORBA_ExceptionList_var &
-CORBA_ExceptionList_var::operator= (CORBA_ExceptionList_ptr p)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ExceptionList_var &
-CORBA_ExceptionList_var::operator= (const CORBA_ExceptionList_var &p)
-{
-  if (this != &p)
-    {
-      this->ptr_->_destroy ();
-      this->ptr_ = p.ptr_->_duplicate ();
-    }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::operator const CORBA_ExceptionList_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ExceptionList_var::operator CORBA_ExceptionList_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr &
-CORBA_ExceptionList_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr &
-CORBA_ExceptionList_var::out (void)
-{
-  this->ptr_->_destroy ();
-  this->ptr_ = CORBA_ExceptionList::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ExceptionList_ptr
-CORBA_ExceptionList_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_ExceptionList_ptr val = this->ptr_;
-  this->ptr_ = CORBA_ExceptionList::_nil ();
-  return val;
-}
diff --git a/TAO/tao/Forwarding_Servant.cpp b/TAO/tao/Forwarding_Servant.cpp
index a5a7bd4a140..86faf571e38 100644
--- a/TAO/tao/Forwarding_Servant.cpp
+++ b/TAO/tao/Forwarding_Servant.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "tao/Forwarding_Servant.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Object.h"
 #include "tao/POAC.h"
 #include "tao/Any.h"
@@ -28,7 +25,7 @@ TAO_Forwarding_Servant::invoke (CORBA::ServerRequest_ptr request,
   CORBA::Exception *exception
     = new PortableServer::ForwardRequest (this->forward_to_.in ());
 
-  CORBA::Any any (exception->_type (), exception, 1);
+  CORBA::Any any (exception->_type (), exception);
 
   request->set_exception (any, env);
 
@@ -46,5 +43,3 @@ TAO_Forwarding_Servant::_primary_interface (const PortableServer::ObjectId &oid,
 
   return CORBA::string_dup (this->interface_repository_id_.in ());
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Forwarding_Servant.h b/TAO/tao/Forwarding_Servant.h
index df49b095c36..e3ad6b1fbd8 100644
--- a/TAO/tao/Forwarding_Servant.h
+++ b/TAO/tao/Forwarding_Servant.h
@@ -21,10 +21,6 @@
 #ifndef TAO_FORWARDING_SERVANT_H
 #define TAO_FORWARDING_SERVANT_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Servant_Base.h"
 #include "tao/ORB.h"
 
@@ -58,6 +54,4 @@ protected:
   // Here is the interface we support
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_FORWARDING_SERVANT_H */
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index e6ac6fd445a..ed04e369ec8 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -64,35 +64,35 @@ ACE_RCSID(tao, GIOP, "$Id$")
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_GIOP_Timeprobe_Description[] =
-  {
-    "GIOP::send_request - start",
-    "GIOP::send_request - end",
+{
+  "GIOP::send_request - start",
+  "GIOP::send_request - end",
 
-    "GIOP::recv_request - start",
-    "GIOP::recv_request - end",
+  "GIOP::recv_request - start",
+  "GIOP::recv_request - end",
 
-    "GIOP::read_buffer - start",
-    "GIOP::read_buffer - end",
+  "GIOP::read_buffer - start",
+  "GIOP::read_buffer - end",
 
-    "GIOP::LocateRequestHeader_init - start",
-    "GIOP::LocateRequestHeader_init - end"
-  };
+  "GIOP::LocateRequestHeader_init - start",
+  "GIOP::LocateRequestHeader_init - end"
+};
 
 enum
-  {
-    // Timeprobe description table start key
-    TAO_GIOP_SEND_REQUEST_START = 100,
-    TAO_GIOP_SEND_REQUEST_END,
+{
+  // Timeprobe description table start key
+  TAO_GIOP_SEND_REQUEST_START = 100,
+  TAO_GIOP_SEND_REQUEST_END,
 
-    TAO_GIOP_RECV_REQUEST_START,
-    TAO_GIOP_RECV_REQUEST_END,
+  TAO_GIOP_RECV_REQUEST_START,
+  TAO_GIOP_RECV_REQUEST_END,
 
-    TAO_GIOP_READ_BUFFER_START,
-    TAO_GIOP_READ_BUFFER_END,
+  TAO_GIOP_READ_BUFFER_START,
+  TAO_GIOP_READ_BUFFER_END,
 
-    TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START,
-    TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_END
-  };
+  TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START,
+  TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_END
+};
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_GIOP_Timeprobe_Description,
@@ -133,7 +133,7 @@ TAO_GIOP::dump_msg (const char *label,
         ACE_HEX_DUMP ((LM_DEBUG,
                        (const char*)ptr,
                        len,
-                       "\n"));
+                       "(%P|%t) data bytes\n"));
     }
 }
 
@@ -201,7 +201,7 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
                         TAO_ORB_Core *orb_core)
 {
 
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_SEND_REQUEST_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_GIOP_SEND_REQUEST_START);
 
   char *buf = (char *) stream.buffer (); // ptr to first buffer
   size_t total_len = stream.total_length ();  // length of all buffers
@@ -219,6 +219,13 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
   // networking infrastructure (e.g., IPSEC).
 
   size_t header_len = TAO_GIOP_HEADER_LEN;
+  // @@ Ug, not sure what to do with this IIOP specific code!
+  //    An idea would be to change this to ->use_lite_protocol
+  //    that way it is not IIOP specific.  fredk
+  //
+  // Fred: actually this is not IIOP specific; a better name would be
+  // "GIOP lite".... Carlos
+  //
   // Fred: this is actually a good start to think about pluggable
   //       "messaging protocols" (maybe this is a bad name, but I want
   //       to stress the difference with the pluggable "transport
@@ -232,8 +239,8 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
   size_t offset = TAO_GIOP_MESSAGE_SIZE_OFFSET;
   if (orb_core->orb_params ()->use_lite_protocol ())
     {
-      header_len = TAO_GIOP_LITE_HEADER_LEN;
-      offset = TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET;
+      header_len = TAO_IIOP_LITE_HEADER_LEN;
+      offset = TAO_IIOP_LITE_MESSAGE_SIZE_OFFSET;
     }
 
   CORBA::ULong bodylen = total_len - header_len;
@@ -245,48 +252,45 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
     *ACE_reinterpret_cast (CORBA::ULong *,
                            buf + offset) = bodylen;
   else
-    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                           &bodylen),
-                     buf + offset);
+    CDR::swap_4 (ACE_reinterpret_cast (char *,
+                                       &bodylen),
+                 buf + offset);
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
 
   // Strictly speaking, should not need to loop here because the
   // socket never gets set to a nonblocking mode ... some Linux
   // versions seem to need it though.  Leaving it costs little.
 
+#if 0
   TAO_GIOP::dump_msg ("send",
                       ACE_reinterpret_cast (u_char *, buf),
-                      stream.length ());
+                      total_len);
+#endif
 
   // this guarantees to send all data (bytes) or return an error
   ssize_t n = transport->send (stream.begin ());
 
-  if (n == -1)
-    {
-      if (TAO_orbdebug)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO: (%P|%t) closing conn %d after fault %p\n",
-                      transport->handle (),
-                      "GIOP::send_request ()"));
-      }
-    transport->close_connection ();
-    return 0;
+  if (n == -1) {
+    if (TAO_orbdebug) {
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) closing conn %d after fault %p\n",
+                  transport->handle (), "GIOP::send_request ()"));
+    }
+    transport->close_conn ();
+    return 0 ;
   }
 
-  // @@ Don't know about this one, when will we get a 0 from the write
-  //    if we assume that there is data to write.  I would only expect
-  //    a 0 if there was nothing to send or if nonblocking.
+  // @@ Don't know about this one, when will we get a 0 from the write if we
+  //    assume that there is data to write.  I would only expect a 0 if there
+  //    was nothing to send or if nonblocking.
   if (n == 0)
   {
     if (TAO_orbdebug)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO: (%P|%t) GIOP::send_request () "
-                  "EOF, closing conn %d\n",
-                  transport->handle()));
+                  "(%P|%t) GIOP::send_request (): ",
+                  "EOF, closing conn %d\n", transport->handle()));
     }
-    transport->close_connection ();
+    transport->close_conn();
     return 0;
   }
 
@@ -311,8 +315,7 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
 // static CORBA::Octet
 static const char close_message [TAO_GIOP_HEADER_LEN] =
 {
-  // 'G', 'I', 'O', 'P',
-  0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+  'G', 'I', 'O', 'P',
   TAO_GIOP_MessageHeader::MY_MAJOR,
   TAO_GIOP_MessageHeader::MY_MINOR,
   TAO_ENCAP_BYTE_ORDER,
@@ -343,7 +346,7 @@ TAO_GIOP::close_connection (TAO_Transport *transport, void *)
                     which));
   }
 
-  transport->close_connection ();
+  transport->close_conn ();
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) shut down transport, handle %d\n", which));
 }
@@ -357,8 +360,7 @@ TAO_GIOP::close_connection (TAO_Transport *transport, void *)
 static const char
 error_message [TAO_GIOP_HEADER_LEN] =
 {
-  // 'G', 'I', 'O', 'P',
-  0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+  'G', 'I', 'O', 'P',
   TAO_GIOP_MessageHeader::MY_MAJOR,
   TAO_GIOP_MessageHeader::MY_MINOR,
   TAO_ENCAP_BYTE_ORDER,
@@ -369,18 +371,13 @@ error_message [TAO_GIOP_HEADER_LEN] =
 void
 TAO_GIOP::send_error (TAO_Transport *transport)
 {
-  // @@ How does this works with GIOP lite?
-
   TAO_GIOP::dump_msg ("send_error",
                       (const u_char *) error_message,
                       TAO_GIOP_HEADER_LEN);
-
   ACE_HANDLE which = transport->handle ();
-
   // @@ Carlos, can you please check to see if <send_n> should have
   // it's reply checked?
-  if (transport->send ((const u_char *)error_message,
-                       TAO_GIOP_HEADER_LEN) == -1)
+  if (transport->send ((const u_char *)error_message, TAO_GIOP_HEADER_LEN) == -1)
   {
     if (TAO_orbdebug != 0)
       ACE_DEBUG ((LM_DEBUG,
@@ -389,12 +386,11 @@ TAO_GIOP::send_error (TAO_Transport *transport)
   }
 
   if (TAO_orbdebug) {
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) aborted transport handle %d\n",
-                transport->handle ()));
+    ACE_DEBUG ((LM_DEBUG, "(%P|%t) aborted transport handle %d\n", transport->handle ()));
   }
-  // @@ Why do we close the connection at this point?
-  transport->close_connection ();
+  // @@
+  transport->close_conn ();
+  transport = 0;
 }
 
 ssize_t
@@ -404,7 +400,7 @@ TAO_GIOP::read_buffer (TAO_Transport *transport,
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_READ_BUFFER_START);
 
-  ssize_t bytes_read = transport->recv (buf, len);
+  ssize_t bytes_read = transport->receive (buf, len);
 
   if (bytes_read == -1 && errno == ECONNRESET)
     {
@@ -443,7 +439,10 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
                         TAO_InputCDR &msg,
                         TAO_ORB_Core* orb_core)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_RECV_REQUEST_START);
+  ACE_FUNCTION_TIMEPROBE (TAO_GIOP_RECV_REQUEST_START);
+
+  TAO_GIOP::Message_Type retval;
+  CORBA::ULong message_size;
 
   // Read the message header off the wire.
   //
@@ -455,15 +454,16 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
   // as the "duty factor" goes down because of either long calls or
   // bursty contention during numerous short calls to the same server.
 
-  ACE_CDR::mb_align (&msg.start_);
+  CDR::mb_align (&msg.start_);
 
   ssize_t header_len = TAO_GIOP_HEADER_LEN;
 
+  // @@ would like to use use_lite_protocol, fredk
   if (orb_core->orb_params ()->use_lite_protocol ())
-    header_len = TAO_GIOP_LITE_HEADER_LEN;
+    header_len = 5;
 
-  if (ACE_CDR::grow (&msg.start_,
-                     header_len) == -1)
+  if (CDR::grow (&msg.start_,
+                 header_len) == -1)
     // This should probably be an exception.
     return TAO_GIOP::CommunicationError;
 
@@ -487,20 +487,17 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
           // an exception, since for most servers it's not an error.
           // Is it _never_ an error?  Not sure ...
           /* NOTREACHED */
-
         case -1: // error
           if (TAO_orbdebug)
             ACE_DEBUG ((LM_ERROR,
-                        "(%P|%t) GIOP::recv_request header %p\n",
+                        "(%P|%t) GIOP::recv_request header socket error %p\n",
                         "read_buffer"));
           break;
           /* NOTREACHED */
-
         default:
           if (TAO_orbdebug)
             ACE_DEBUG ((LM_ERROR,
-                        "(%P|%t) GIOP::recv_request header read failed, "
-                        "only %d of %d bytes\n",
+                        "(%P|%t) GIOP::recv_request header read failed, only %d of %d bytes\n",
                         len,
                         header_len));
           break;
@@ -510,24 +507,21 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
       return TAO_GIOP::CommunicationError;
     }
 
-  // NOTE: if message headers, or whole messages, get encrypted in
+  // NOTE: if message headers, or whome messages, get encrypted in
   // application software (rather than by the network infrastructure)
   // they should be decrypted here ...
 
   // First make sure it's a GIOP message of any version.
 
-  TAO_GIOP::Message_Type retval;
-  CORBA::ULong message_size;
   if (TAO_GIOP::parse_header (msg,
-                              msg.do_byte_swap_,
-                              retval,
-                              message_size,
-                              orb_core) == -1)
+			      msg.do_byte_swap_,
+			      retval,
+			      message_size,
+			      orb_core) == -1)
     {
       TAO_GIOP::send_error (transport);
-       // We didn't really receive anything useful here.
-      return TAO_GIOP::CommunicationError;
-
+      return TAO_GIOP::EndOfFile; // We didn't really receive
+                                  // anything useful here.
     }
 
   // Make sure we have the full length in memory, growing the buffer
@@ -538,13 +532,13 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
 
   assert (message_size <= UINT_MAX);
 
-  if (ACE_CDR::grow (&msg.start_,
-                     header_len + message_size) == -1)
+  if (CDR::grow (&msg.start_,
+                 header_len + message_size) == -1)
     return TAO_GIOP::CommunicationError;
 
   // Growing the buffer may have reset the rd_ptr(), but we want to
   // leave it just after the GIOP header (that was parsed already);
-  ACE_CDR::mb_align (&msg.start_);
+  CDR::mb_align (&msg.start_);
   msg.start_.wr_ptr (header_len);
   msg.start_.wr_ptr (message_size);
   msg.start_.rd_ptr (header_len);
@@ -564,58 +558,55 @@ TAO_GIOP::recv_request (TAO_Transport *transport,
         case 0:
           if (TAO_orbdebug)
             ACE_DEBUG ((LM_DEBUG,
-                        "(%t) End of connection, transport handle %d\n",
+                        "(%P|%t) TAO_GIOP::recv_request body, EOF on transport handle %d\n",
                         transport->handle ()));
-          return TAO_GIOP::EndOfFile;
+          break;
           /* NOTREACHED */
-
         case -1:
           if (TAO_orbdebug)
             ACE_DEBUG ((LM_ERROR,
-                        "(%P|%t) TAO_GIOP::recv_request - body %p\n",
+                        "(%P|%t) TAO_GIOP::recv_request () body %p\n",
                         "read_buffer"));
           break;
           /* NOTREACHED */
-
         default:
           if (TAO_orbdebug)
             ACE_DEBUG ((LM_ERROR,
-                        "TAO: (%P|%t) GIOP::recv_request body read failed, "
-                        "only %d of %d bytes\n",
+                        "(%P|%t) short read, only %d of %d bytes\n",
                         len,
                         message_size));
           break;
           /* NOTREACHED */
         }
 
+      // clean up, and ...
+      if (TAO_orbdebug)
+        ACE_DEBUG ((LM_DEBUG, "couldn't read rest of message\n"));
       return TAO_GIOP::CommunicationError;
     }
 
   TAO_GIOP::dump_msg ("recv",
-                      ACE_reinterpret_cast (u_char *, header),
+                      ACE_reinterpret_cast (u_char *,
+                                            header),
                       message_size + header_len);
-
   return retval;
 }
 
 int
 TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
-                            int &do_byte_swap,
-                            TAO_GIOP::Message_Type &message_type,
-                            CORBA::ULong &message_size)
+			    int &do_byte_swap,
+			    TAO_GIOP::Message_Type &message_type,
+			    CORBA::ULong &message_size)
 {
   char *header = cdr.start_.rd_ptr ();
 
-  // The values are hard-coded to support non-ASCII platforms
-  if (!(header [0] == 0x47    // 'G'
-        && header [1] == 0x49 // 'I'
-        && header [2] == 0x4f // 'O'
-        && header [3] == 0x50 // 'P'
-        ))
+  if (!(header [0] == 'G'
+        && header [1] == 'I'
+        && header [2] == 'O'
+        && header [3] == 'P'))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO: (%P|%t) bad header, magic word [%c%c%c%c]\n",
-                  header[0], header[1], header[2], header[3]));
+                  "bad header, magic word\n"));
       return -1;
     }
 
@@ -626,8 +617,7 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
         && header [5] <= TAO_GIOP_MessageHeader::MY_MINOR))
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO: (%P|%t) bad header, version [%c%c]\n",
-                  header[4], header[5]));
+                  "bad header, version\n"));
       return -1;
     }
 
@@ -649,9 +639,9 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
 
 int
 TAO_GIOP::parse_header_lite (TAO_InputCDR &cdr,
-                             int &do_byte_swap,
-                             TAO_GIOP::Message_Type &message_type,
-                             CORBA::ULong &message_size)
+			     int &do_byte_swap,
+			     TAO_GIOP::Message_Type &message_type,
+			     CORBA::ULong &message_size)
 {
   do_byte_swap = 0;
 
@@ -670,36 +660,39 @@ TAO_GIOP::parse_header_lite (TAO_InputCDR &cdr,
 
 int
 TAO_GIOP::parse_header (TAO_InputCDR &cdr,
-                        int &do_byte_swap,
-                        TAO_GIOP::Message_Type &message_type,
-                        CORBA::ULong &message_size,
-                        TAO_ORB_Core *orb_core)
+			int &do_byte_swap,
+			TAO_GIOP::Message_Type &message_type,
+			CORBA::ULong &message_size,
+			TAO_ORB_Core *orb_core)
 {
   if (orb_core->orb_params ()->use_lite_protocol ())
     return TAO_GIOP::parse_header_lite (cdr,
-                                        do_byte_swap,
-                                        message_type,
-                                        message_size);
+					do_byte_swap,
+					message_type,
+					message_size);
   else
     return TAO_GIOP::parse_header_std (cdr,
-                                       do_byte_swap,
-                                       message_type,
-                                       message_size);
+				       do_byte_swap,
+				       message_type,
+				       message_size);
 }
 
 CORBA::Boolean
 TAO_GIOP_LocateRequestHeader::init (TAO_InputCDR &msg,
-                                    CORBA::Environment &)
+                                    CORBA::Environment &ACE_TRY_ENV)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_LOCATE_REQUEST_HEADER_INIT_START);
 
   return (msg.read_ulong (this->request_id)
-          && (msg >> this->object_key) != 0);
+          && msg.decode (TC_opaque,
+                         &this->object_key,
+                         0,
+                         ACE_TRY_ENV));
 }
 
 CORBA::Boolean
 TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
-                             TAO_OutputCDR &msg)
+			     TAO_OutputCDR &msg)
 {
   msg.reset ();
 
@@ -708,8 +701,7 @@ TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
 
   static CORBA::Octet header[] =
   {
-    // 'G', 'I', 'O', 'P',
-    0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
+    'G', 'I', 'O', 'P',
     TAO_GIOP_MessageHeader::MY_MAJOR,
     TAO_GIOP_MessageHeader::MY_MINOR,
     TAO_ENCAP_BYTE_ORDER
@@ -731,7 +723,7 @@ TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
 
 CORBA::Boolean
 TAO_GIOP::start_message_lite (TAO_GIOP::Message_Type type,
-                              TAO_OutputCDR &msg)
+			      TAO_OutputCDR &msg)
 {
   msg.reset ();
 
@@ -747,8 +739,8 @@ TAO_GIOP::start_message_lite (TAO_GIOP::Message_Type type,
 
 CORBA::Boolean
 TAO_GIOP::start_message (TAO_GIOP::Message_Type type,
-                         TAO_OutputCDR &msg,
-                         TAO_ORB_Core* orb_core)
+			 TAO_OutputCDR &msg,
+			 TAO_ORB_Core* orb_core)
 {
   if (orb_core->orb_params ()->use_lite_protocol ())
     return TAO_GIOP::start_message_lite (type, msg);
@@ -781,7 +773,7 @@ TAO_GIOP::message_name (TAO_GIOP::Message_Type which)
 }
 
 TAO_GIOP_ReplyStatusType
-TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type)
+TAO_GIOP::convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type)
 {
   switch (corba_type)
     {
diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h
index 00e7d4f0686..d69d996a7a0 100644
--- a/TAO/tao/GIOP.h
+++ b/TAO/tao/GIOP.h
@@ -129,7 +129,7 @@ typedef TAO_Unbounded_Sequence<TAO_IOP_TaggedComponent>
 
 // namespace TAO_GIOP
 
-struct TAO_GIOP_Version
+struct TAO_Version
 {
   CORBA::Octet major;
   CORBA::Octet minor;
@@ -152,7 +152,7 @@ public:
   };
 
   CORBA::Char magic [4]; // "GIOP"
-  TAO_GIOP_Version giop_version;
+  TAO_Version giop_version;
   CORBA::Octet byte_order; // 0 = big, 1 = little
   CORBA::Octet message_type; // MsgType above
   CORBA::ULong message_size; // in byte_order!
@@ -171,8 +171,8 @@ public:
 
 // The IIOP Lite header length and the offset of the message size
 // field in it.
-#define TAO_GIOP_LITE_HEADER_LEN 5
-#define TAO_GIOP_LITE_MESSAGE_SIZE_OFFSET 0
+#define TAO_IIOP_LITE_HEADER_LEN 5
+#define TAO_IIOP_LITE_MESSAGE_SIZE_OFFSET 0
 
 // Support for Implicit ORB Service Context.
 typedef CORBA::ULong TAO_GIOP_ServiceID;
@@ -351,7 +351,7 @@ public:
   static const char *message_name (TAO_GIOP::Message_Type which);
   // Returns the stringified <MsgType>.
 
-  static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::exception_type corba_type);
+  static TAO_GIOP_ReplyStatusType convert_CORBA_to_GIOP_exception (CORBA::ExceptionType corba_type);
   // Convert the exception type from CORBA to GIOP
 
 
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
deleted file mode 100644
index f174c00b4b8..00000000000
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ /dev/null
@@ -1,627 +0,0 @@
-// $Id$
-
-// Implementation of the Dynamic Server Skeleton Interface  (for GIOP)
-
-#include "tao/GIOP_Server_Request.h"
-
-#include "tao/CDR.h"
-#include "tao/POAC.h"
-#include "tao/Environment.h"
-#include "tao/NVList.h"
-#include "tao/Principal.h"
-#include "tao/ORB_Core.h"
-#include "tao/Timeprobe.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/GIOP_Server_Request.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, GIOP_Server_Request, "$Id$")
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Server_Request_Timeprobe_Description[] =
-  {
-    "GIOP_Server_Request::GIOP_Server_Request - start",
-    "GIOP_Server_Request::GIOP_Server_Request - end",
-  };
-
-enum
-  {
-    // Timeprobe description table start key
-    TAO_SERVER_REQUEST_START = 400,
-    TAO_SERVER_REQUEST_END
-  };
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
-                                  TAO_SERVER_REQUEST_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-GIOP_ServerRequest::GIOP_ServerRequest (TAO_InputCDR &input,
-                                        TAO_OutputCDR &output,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Environment &env)
-  : incoming_ (&input),
-    outgoing_ (&output),
-    response_expected_ (0),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    params_ (0),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    retval_ (0),
-    exception_ (0),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    service_info_ (),
-    request_id_ (0),
-    object_key_ (),
-    requesting_principal_ (0)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
-
-  this->parse_header (env);
-}
-
-void
-GIOP_ServerRequest::parse_header_std (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Tear out the service context ... we currently ignore it, but it
-  // should probably be passed to each ORB service as appropriate
-  // (e.g. transactions, security).
-  //
-  // NOTE: As security support kicks in, this is a good place to
-  // verify a digital signature, if that is required in this security
-  // environment.  It may be required even when using IPSEC security
-  // infrastructure.
-
-  TAO_InputCDR& input = *this->incoming_;
-
-  input >> this->service_info_;
-  CORBA::Boolean hdr_status = input.good_bit ();
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && input.read_ulong (this->request_id_);
-  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
-
-  // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-
-  CORBA::Long key_length;
-  hdr_status = hdr_status && input.read_long (key_length);
-  if (hdr_status)
-    {
-      this->object_key_.replace (key_length, key_length,
-                                 (CORBA::Octet*)input.rd_ptr (),
-                                 0);
-      input.skip_bytes (key_length);
-    }
-
-  CORBA::Long length;
-  hdr_status = hdr_status && input.read_long (length);
-  if (hdr_status)
-    {
-      // Do not include NULL character at the end.
-      this->operation_.set (input.rd_ptr (),
-                            length - 1,
-                            0);
-      hdr_status = input.skip_bytes (length);
-    }
-
-  if (hdr_status)
-    {
-      input >> this->requesting_principal_;
-      hdr_status = input.good_bit ();
-    }
-
-  if (!hdr_status)
-    ACE_THROW (CORBA::COMM_FAILURE ());
-
-}
-
-void
-GIOP_ServerRequest::parse_header_lite (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_InputCDR& input = *this->incoming_;
-
-  CORBA::Boolean hdr_status = input.good_bit ();
-
-  // Get the rest of the request header ...
-
-  hdr_status = hdr_status && input.read_ulong (this->request_id_);
-  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
-
-  // We use ad-hoc demarshalling here: there is no need to increase
-  // the reference count on the CDR message block, because this key
-  // will not outlive the request (or the message block).
-
-  CORBA::Long key_length;
-  hdr_status = hdr_status && input.read_long (key_length);
-  if (hdr_status)
-    {
-      this->object_key_.replace (key_length, key_length,
-                                 (CORBA::Octet*)input.rd_ptr (),
-                                 0);
-      input.skip_bytes (key_length);
-    }
-
-  CORBA::Long length;
-  hdr_status = hdr_status && input.read_long (length);
-  if (hdr_status)
-    {     
-      // Do not include NULL character at the end.
-      this->operation_.set (input.rd_ptr (),
-                            length - 1,
-                            0);
-      hdr_status = input.skip_bytes (length);
-    }
-
-  if (!hdr_status)
-    ACE_THROW (CORBA::COMM_FAILURE ());
-}
-
-
-
-void
-GIOP_ServerRequest::parse_header (CORBA::Environment &env)
-{
-  if (this->orb_core_->orb_params ()->use_lite_protocol ())
-    this->parse_header_lite (env);
-  else
-    this->parse_header_std (env);
-}
-
-// This constructor is used, by the locate request code
-
-GIOP_ServerRequest::GIOP_ServerRequest (CORBA::ULong &request_id,
-                                        CORBA::Boolean &response_expected,
-                                        TAO_ObjectKey &object_key,
-                                        const ACE_CString &operation,
-                                        TAO_OutputCDR &output,
-                                        TAO_ORB_Core *orb_core,
-                                        CORBA::Environment &)
-  : operation_ (operation),
-    incoming_ (0),
-    outgoing_ (&output),
-    response_expected_ (response_expected),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    params_ (0),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    retval_ (0),
-    exception_ (0),
-    exception_type_ (TAO_GIOP_NO_EXCEPTION),
-    orb_core_ (orb_core),
-    service_info_ (0),
-    request_id_ (request_id),
-    object_key_ (object_key),
-    requesting_principal_ (0)
-{
-}
-
-GIOP_ServerRequest::~GIOP_ServerRequest (void)
-{
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  if (this->params_)
-    CORBA::release (this->params_);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  delete this->retval_;
-  delete this->exception_;
-}
-
-CORBA::ORB_ptr
-GIOP_ServerRequest::orb (void)
-{
-  return this->orb_core_->orb ();
-}
-
-TAO_POA *
-GIOP_ServerRequest::oa (void)
-{
-  return this->orb_core_->root_poa ();
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// Unmarshal in/inout params, and set up to marshal the appropriate
-// inout/out/return values later on.
-
-void
-GIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
-                               CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Save params for later use when marshaling the reply.
-  this->params_ = list;
-
-  // Then unmarshal each "in" and "inout" parameter.
-  for (u_int i = 0; i < list->count (); i++)
-    {
-      CORBA::NamedValue_ptr nv = list->item (i, env);
-
-      // check if it is an in or inout parameter
-      if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
-        continue;
-
-      CORBA::Any_ptr any = nv->value ();
-      CORBA::TypeCode_var tc = any->type ();
-
-      // @@ (JP) The following code depends on the fact that
-      // TO_InputCDR does not contain chained message blocks.
-      char *begin, *end;
-
-      // This will be the start of a new message block.
-      begin = this->incoming_->rd_ptr ();
-
-      // Skip over the next aregument.
-      CORBA::TypeCode::traverse_status status =
-        this->incoming_->skip (tc.in (), env);
-
-      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          const char* param_name = nv->name ();
-
-          if (param_name == 0)
-            param_name = "(no name given)";
-
-          ACE_ERROR ((LM_ERROR,
-                      "GIOP_ServerRequest::arguments - problem while"
-                      " decoding parameter %d <%s>\n", i, param_name));
-          return;
-        }
-
-      // This will be the end of the new message block.
-      end = this->incoming_->rd_ptr ();
-
-      // Allocate the new message block and set its endpoints.
-      ACE_Message_Block *cdr;
-
-      ACE_NEW (cdr,
-               ACE_Message_Block (end - begin));
-
-      cdr->rd_ptr (begin);
-
-      cdr->wr_ptr (end);
-
-      // Stick it into the Any. It gets duplicated there.
-      any->_tao_replace (tc.in (),
-                         cdr,
-                         env);
-
-      // Now we can release the original.
-      ACE_Message_Block::release (cdr);
-    }
-
-  // If any data is left over, it'd be context values ... else error.
-  // We don't support context values, so it's always an error.
-
-  // @@ (TAO) support for Contexts??
-  if (incoming_->length () != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "GIOP_ServerRequest::arguments - "
-                  "%d bytes left in buffer\n", incoming_->length ()));
-      env.exception (new CORBA::BAD_PARAM ());
-    }
-}
-
-// Store the result value.  There's either an exception, or a result,
-// but not both of them.  Results (and exceptions) can be reported
-// only after the parameter list has been provided (maybe empty).
-
-void
-GIOP_ServerRequest::set_result (const CORBA::Any &value,
-                                CORBA::Environment &env)
-{
-  env.clear ();
-
-  // setting a result when another result already exists or if an exception
-  // exists is an error
-  if (this->retval_ || this->exception_)
-    env.exception (new CORBA::BAD_INV_ORDER ());
-  else
-    {
-      this->retval_ = new CORBA::Any (value);
-    }
-}
-
-// Store the exception value.
-
-void
-GIOP_ServerRequest::set_exception (const CORBA::Any &value,
-                                   CORBA::Environment &env)
-{
-  if (this->retval_ || this->exception_)
-    env.exception (new CORBA::BAD_INV_ORDER ());
-  else
-  {
-    // Try to narrow to ForwardRequest
-    PortableServer::ForwardRequest_ptr forward_request =
-        PortableServer::ForwardRequest::_narrow ((CORBA::Exception *) value.value ());
-
-    // If narrowing of exception succeeded
-    if (forward_request != 0)
-      {
-        this->forward_location_ = forward_request->forward_reference;
-        this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
-      }
-    // Normal exception
-    else
-      {
-        this->exception_ = new CORBA::Any (value);
-
-        // @@ This cast is not safe, but we haven't implemented the >>=
-        // and <<= operators for base exceptions (yet).
-        CORBA_Exception* x = (CORBA_Exception*)value.value ();
-        if (CORBA_UserException::_narrow (x) != 0)
-          this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
-        else
-          this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
-      }
-   }
-}
-
-// this method will be utilized by the DSI servant to marshal outgoing
-// parameters
-
-void
-GIOP_ServerRequest::dsi_marshal (CORBA::Environment &env)
-{
-  // NOTE: if "env" is set, it takes precedence over exceptions
-  // reported using the mechanism of the ServerRequest.  Only system
-  // exceptions are reported that way ...
-  //
-  // XXX Exception reporting is ambiguous; it can be cleaner than
-  // this.  With both language-mapped and dynamic/explicit reporting
-  // mechanisms, one of must be tested "first" ... so an exception
-  // reported using the other mechanism could be "lost".  Perhaps only
-  // the language mapped one should be used for system exceptions.
-
-
-  // only if there wasn't any exception, we proceed
-  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION &&
-      CORBA::is_nil (this->forward_location_.in ()))
-    {
-      // ... then send any return value ...
-      if (this->retval_)
-        {
-          CORBA::TypeCode_var tc = this->retval_->type ();
-	        if (this->retval_->any_owns_data ())
-            {
-              (void) this->outgoing_->encode (tc.in (), retval_->value (), 0, env);
-            }
-          else
-            {
-              TAO_InputCDR cdr (retval_->_tao_get_cdr ());
-              (void) this->outgoing_->append (tc.in (), &cdr, env);
-            }
-        }
-
-      // ... Followed by "inout" and "out" parameters, left to right
-      if (this->params_)
-        {
-          for (u_int i = 0;
-               i < this->params_->count ();
-               i++)
-            {
-              CORBA::NamedValue_ptr nv = this->params_->item (i, env);
-              if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
-                continue;
-
-              CORBA::Any_ptr any = nv->value ();
-              CORBA::TypeCode_var tc = any->type ();
-              if (any->any_owns_data ())
-                {
-                  (void) this->outgoing_->encode (tc.in (), any->value (), 0, env);
-                }
-              else
-                {
-                  TAO_InputCDR cdr (any->_tao_get_cdr ());
-                  (void) this->outgoing_->append (tc.in (), &cdr, env);
-                }
-            }
-        }
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// Extension
-void
-GIOP_ServerRequest::demarshal (CORBA::Environment &orb_env,
-                               // ORB related exception reporting
-                               const TAO_Call_Data_Skel *info,
-                               // call description
-                               ...)
-{
-  CORBA::ULong i;
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  for (i = 0, pdp = info->params;
-       i < info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = va_arg (param_vector, void *);
-
-      if ((pdp->mode == CORBA::ARG_IN)
-          || (pdp->mode == CORBA::ARG_INOUT))
-        {
-          // Then just unmarshal the value.
-          (void) incoming_->decode (pdp->tc, ptr, 0, orb_env);
-        }
-
-      if (orb_env.exception ())
-        {
-          orb_env.print_exception ("GIOP_ServerRequest::demarshal - parameter decode failed");
-          return;
-        }
-    }
-  va_end (param_vector);
-}
-
-// Extension
-
-void
-GIOP_ServerRequest::marshal (CORBA::Environment &orb_env,
-                             // ORB related exception reporting
-                             //                             CORBA::Environment &skel_env,
-                             // skeleton related exception reporting
-                             const TAO_Call_Data_Skel *info,
-                             // call description
-                             ...)
-{
-  // what is "orb_env" and "skel_env"?
-  // "skel_env" holds the exception that got raised inside the operation
-  // implementation (upcall)
-  //
-  // "orb_env" is the exception that may have been raised due to things going
-  // wrong in the entire dispatch process. These are always system exceptions.
-
-  // check if we are inside with an exception. This may have happened
-  // since the upcall could have set some exception
-#if 0 /* ASG */
-  if (skel_env.exception ())
-    {
-      // We must increase the "refcnt" on the exception, because it is
-      // "owned" by both <skel_env> and (eventually) by the
-      // Server_Request.
-      CORBA::Exception_ptr exception = skel_env.exception ();
-      exception->_incr_refcnt ();
-
-      // The Any does not own the because ultimately it will be owned
-      // by the Server_Request via the call to "set_exception"
-      CORBA::Any any (skel_env.exception ()->_type (), exception);
-      this->set_exception (any, orb_env);
-    }
-#endif
-
-  // Setup a Reply message so that we can marshal all the outgoing parameters
-  // into it. If an exception was set, then that gets marshaled into the reply
-  // message and we don't do anything after that
-  this->init_reply (orb_env);
-
-#if 0 /* ASG */
-  // exception? nothing to do after this
-  if (orb_env.exception () || skel_env.exception ())
-    return;
-#endif
-  TAO_CHECK_ENV_RETURN_VOID (orb_env);
-
-  CORBA::ULong i;
-  const TAO_Param_Data_Skel *pdp;
-  va_list param_vector;
-  va_start (param_vector, info);
-
-  for (i = 0, pdp = info->params;
-       i < info->param_count;
-       i++, pdp++)
-    {
-      void *ptr = va_arg (param_vector, void *);
-
-      if (pdp->mode == 0)
-        {
-          // check if the return type is not void
-          if (pdp->tc->kind (orb_env) != CORBA::tk_void)
-            {
-              // Then just marshal the value.
-              (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
-            }
-        }
-      else if ((pdp->mode == CORBA::ARG_INOUT)
-          || (pdp->mode == CORBA::ARG_OUT))
-        {
-          // Then just marshal the value.
-          (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
-        }
-
-      if (orb_env.exception ())
-        {
-          orb_env.print_exception ("GIOP_ServerRequest::marshal - parameter encode failed");
-          return;
-        }
-    }
-  va_end (param_vector);
-
-}
-
-void
-GIOP_ServerRequest::init_reply (CORBA::Environment &env)
-{
-  // Construct a REPLY header.
-  TAO_GIOP::start_message (TAO_GIOP::Reply,
-			                     *this->outgoing_,
-			                     this->orb_core_);
-
-  TAO_GIOP_ServiceContextList resp_ctx;
-  resp_ctx.length (0);
-  *this->outgoing_ << resp_ctx;
-  this->outgoing_->write_ulong (this->request_id_);
-
-  // Standard exceptions are caught in Connect::handle_input
-
-  // Forward exception only.
-  if (!CORBA::is_nil (this->forward_location_.in ()))
-    {
-      this->outgoing_->write_ulong (TAO_GIOP_LOCATION_FORWARD);
-
-      CORBA::Object_ptr object_ptr = this->forward_location_.in ();
-      if ((*this->outgoing_ << object_ptr) == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "GIOP_ServerRequest::marshal - "
-                      "encoding forwarded objref failed\n"));
-          return;
-        }
-    }
-
-  // Any exception at all.
-  else if (this->exception_)
-    {
-      CORBA::TypeCode_ptr except_tc;
-
-      except_tc = this->exception_->type ();
-
-      // Finish the GIOP Reply header, then marshal the exception.
-      // XXX x->type () someday ...
-
-      this->outgoing_->write_ulong (this->exception_type_);
-
-      // we use the any's ACE_Message_Block
-      TAO_InputCDR cdr (this->exception_->_tao_get_cdr ());
-      (void) this->outgoing_->append (except_tc, &cdr, env);
-    }
-  else // Normal reply
-    // First finish the GIOP header ...
-    this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
-}
-
-CORBA::Object_ptr
-GIOP_ServerRequest::forward_location (void)
-// get the forward_location
-{
-  return CORBA::Object::_duplicate (this->forward_location_.in ());
-}
-
-CORBA::ULong
-GIOP_ServerRequest::exception_type (void)
-// get the exception type
-{
-  return this->exception_type_;
-}
diff --git a/TAO/tao/GIOP_Server_Request.h b/TAO/tao/GIOP_Server_Request.h
deleted file mode 100644
index 84d99c95c82..00000000000
--- a/TAO/tao/GIOP_Server_Request.h
+++ /dev/null
@@ -1,202 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    GIOP_Server_Request.h
-//
-// = DESCRIPTION
-//    Header file for CORBA's Dynamic Server Skeleton Interface's
-//    "Server Request" type.  (for GIOP)
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems, Inc. and Chris Cleeland.
-//     Modifications by Aniruddha Gokhale based on CORBAv2.2 Feb 98
-// ============================================================================
-
-#ifndef TAO_GIOP_SERVER_REQUEST_H
-#define TAO_GIOP_SERVER_REQUEST_H
-
-#include "tao/Server_Request.h"
-
-class TAO_Export GIOP_ServerRequest : public CORBA_ServerRequest
-{
-  // = TITLE
-  //    Class representing an GIOP ServerRequest object.
-public:
-  // = Initialization and termination methods.
-  GIOP_ServerRequest (TAO_InputCDR &input,
-                      TAO_OutputCDR &output,
-                      TAO_ORB_Core *orb_core,
-                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // Constructor
-  GIOP_ServerRequest (CORBA::ULong &request_id,
-                      CORBA::Boolean &response_expected,
-                      TAO_ObjectKey &object_key,
-                      const ACE_CString &operation,
-                      TAO_OutputCDR &output,
-                      TAO_ORB_Core *orb_core,
-                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
-  virtual ~GIOP_ServerRequest (void);
-  // Destructor.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // = General ServerRequest operations
-  void arguments (CORBA::NVList_ptr &list,
-                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
-  void set_result (const CORBA::Any &value,
-                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
-  void set_exception (const CORBA::Any &value,
-                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
-  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // does the marshaling of outgoing parameters and is used by the DSI based
-  // scheme
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // = Request attributes.
-
-  const char *operation (void) const;
-  // return the operation name
-
-  unsigned int operation_length (void) const;
-  // return the legnth of the operation
-
-  //  CORBA::Context_ptr ctx (void);
-  // return the context pointer
-
-  // = TAO extensions
-
-  CORBA::ORB_ptr  orb (void);
-  // return the underlying ORB
-
-  TAO_POA *oa (void);
-  // return the Object Adapter
-
-  //
-  // = TAO extensions
-  // meant to be used internally.
-  //
-
-  virtual void demarshal (CORBA_Environment &orb_env,
-                          const TAO_Call_Data_Skel *info,
-                          ...);
-  // demarshal incoming parameters. Used by the SII skeleton (i.e., the IDL
-  // compiler generated skeleton)
-
-  virtual void marshal (CORBA_Environment &orb_env,
-                        //                        CORBA_Environment &skel_env,
-                        const TAO_Call_Data_Skel *info,
-                        ...);
-  // marshal outgoing parameters and return value. This is used by the SSI
-  // i.e., by the IDL compiler generated skeletons.
-
-  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // start a Reply message
-
-  virtual TAO_InputCDR &incoming (void);
-  // Retrieve the incoming stream.
-
-  virtual TAO_OutputCDR &outgoing (void);
-  // Retrieve the outgoing stream.
-
-  virtual CORBA::Boolean response_expected (void) const;
-  // is the response expected
-
-  virtual CORBA::Principal_ptr principal (void) const;
-
-  virtual const TAO_ObjectKey &object_key (void) const;
-
-  virtual const TAO_GIOP_ServiceContextList &service_info (void) const;
-
-  // The pseudo object methods, not really needed because the class is
-  // not in the spec, but we add them for the sake of completeness.
-  static GIOP_ServerRequest* _duplicate (GIOP_ServerRequest*);
-  static GIOP_ServerRequest* _nil (void);
-
-  // To handle System Exceptions at the lowest level,
-  // a method returning the request_id_ is needed.
-
-  CORBA::ULong request_id (void);
-
-  CORBA::Object_ptr forward_location (void);
-  // get the forward_location
-
-  CORBA::ULong exception_type (void);
-  // get the exception type
-
-private:
-   void parse_header (CORBA::Environment &TAO_IN_ENV);
-  // Parse the request header and store the result on this object.
-
-  void parse_header_std (CORBA::Environment &TAO_IN_ENV);
-  // Parse the standard GIOP request header and store the result on
-  // this object.
-
-  void parse_header_lite (CORBA::Environment &TAO_IN_ENV);
-  // Parse the lightweight version of the GIOP request header and
-  // store the result on this object.
-
-private:
-  ACE_CString operation_;
-  // Operation name.
-
-  CORBA::Object_var forward_location_;
-
-  TAO_InputCDR *incoming_;
-  // Incoming stream.
-
-  TAO_OutputCDR *outgoing_;
-  // Outgoing stream.
-
-  CORBA::Boolean response_expected_;
-  // is it oneway or twoway
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  CORBA::NVList_ptr params_;
-  // Incoming parameters.
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  CORBA::Any_ptr retval_;
-  // Return value.
-
-  CORBA::Any_ptr exception_;
-  // Any exception which might be raised.
-
-  //  TAO_GIOP_ReplyStatusType exception_type_;
-  CORBA::ULong exception_type_;
-  // exception type (will be NO_EXCEPTION in the majority of the cases)
-
-  TAO_ORB_Core* orb_core_;
-  // A pointer to the ORB Core for the context where the request was
-  // created.
-
-  TAO_GIOP_ServiceContextList service_info_;
-  // The service context for the request (CORBA Reference?)
-
-  CORBA::ULong request_id_;
-  // Unique identifier for a request
-
-  TAO_ObjectKey object_key_;
-  // The object key of the destination object.
-
-  CORBA::Principal_ptr requesting_principal_;
-  // Identifies the requester
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/GIOP_Server_Request.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_GIOP_SERVER_REQUEST_H */
diff --git a/TAO/tao/GIOP_Server_Request.i b/TAO/tao/GIOP_Server_Request.i
deleted file mode 100644
index 7cc1f15cdc0..00000000000
--- a/TAO/tao/GIOP_Server_Request.i
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// @@ TODO TAO allocates its ServerRequest objects from the stack,
-// using reference counting wouldn't help much.  Using a _clone()
-// method would make the following methods really easy to implement,
-// but that's hard to implement for the extremely optimized
-// GIOP_ServerRequest.
-// Another solution would be to modify the class hierarchy, make
-// ServerRequest the "slow" version (with copies for each field) and
-// GIOP_ServerRequest the "fast" version (with no copies at all). The
-// first would be use for DII and the later for SII.
-
-ACE_INLINE TAO_InputCDR &
-GIOP_ServerRequest::incoming (void)
-{
-  return *this->incoming_;
-}
-
-ACE_INLINE TAO_OutputCDR &
-GIOP_ServerRequest::outgoing (void)
-{
-  return *this->outgoing_;
-}
-
-// Invocation attributes.
-
-ACE_INLINE const char *
-GIOP_ServerRequest::operation (void) const
-{
-  return this->operation_.c_str ();
-}
-
-// get the length of the operation name.
-ACE_INLINE unsigned int
-GIOP_ServerRequest::operation_length (void) const
-{
-  return this->operation_.length ();
-}
-
-#if 0
-//@@ (TAO) to do after Context is implemented
-ACE_INLINE CORBA::Context_ptr
-GIOP_ServerRequest::ctx (void)
-{
-  return 0;
-}
-#endif
-
-ACE_INLINE CORBA::Boolean
-GIOP_ServerRequest::response_expected (void) const
-{
-  return this->response_expected_;
-}
-
-ACE_INLINE CORBA::Principal_ptr
-GIOP_ServerRequest::principal (void) const
-{
-  return this->requesting_principal_;
-}
-
-ACE_INLINE const TAO_ObjectKey &
-GIOP_ServerRequest::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE const TAO_GIOP_ServiceContextList &
-GIOP_ServerRequest::service_info (void) const
-{
-  return this->service_info_;
-}
-
-ACE_INLINE CORBA::ULong
-GIOP_ServerRequest::request_id (void)
-{
-  return this->request_id_;
-}
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 394bc237bf8..9cc23fcacc3 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -23,8 +23,8 @@ TAO_IIOP_Acceptor::tag (void)
 }
 
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (void)
-  : base_acceptor_ (),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP)
+  :  base_acceptor_ (),
+     tag_(TAO_IOP_TAG_INTERNET_IOP)
 {
 }
 
@@ -34,14 +34,8 @@ TAO_IIOP_Acceptor::create_profile (TAO_ObjectKey &)
   return 0;
 }
 
-ACE_Event_Handler *
+ACE_Event_Handler*
 TAO_IIOP_Acceptor::acceptor (void)
 {
   return &base_acceptor_;
 }
-
-int
-TAO_IIOP_Acceptor::close (void)
-{
-  return this->base_acceptor_.close ();
-}
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index f376e223287..0648b9ff94e 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -34,11 +34,6 @@ typedef ACE_Strategy_Acceptor<TAO_Server_Connection_Handler,
 
 class TAO_Export TAO_IIOP_Acceptor : public TAO_Acceptor
 {
-  // = TITLE
-  //   The IIOP-specific bridge class for the concrete acceptor.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
 public:
   // TAO_IIOP_Acceptor (ACE_INET_Addr &addr);
   // Create Acceptor object using addr.
@@ -53,18 +48,15 @@ public:
   // create profile object for this Acceptor using the SAP
   // (service access point, Host and Port) and object_key.
 
-  virtual ACE_Event_Handler *acceptor (void);
+  virtual ACE_Event_Handler* acceptor (void);
   // Return the underlying acceptor object, ACE_Acceptor
 
-  virtual int close (void);
-  // Closes the acceptor
-
 private:
+
   TAO_IIOP_BASE_ACCEPTOR base_acceptor_;
-  // the concrete acceptor, as a pointer to it's base class.
 
   CORBA::ULong tag_;
-  //  the IOP specific tag.
+
 };
 
 #endif  /* TAO_IIOP_ACCEPTOR_H */
diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 871451d8ba2..60d9c548616 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -28,22 +28,22 @@ TAO_IIOP_Connector::tag (void)
 
 TAO_IIOP_Connector::TAO_IIOP_Connector (void)
   : tag_(TAO_IOP_TAG_INTERNET_IOP),
-    base_connector_ ()
+    base_connector_()
 {
 }
 
-int
-TAO_IIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport)
+TAO_Transport *
+TAO_IIOP_Connector::connect(TAO_Profile *profile, CORBA::Environment &env)
 {
   if (profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
-    return -1;
+    TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, 0);
 
   TAO_IIOP_Profile *iiop_profile =
-    ACE_dynamic_cast (TAO_IIOP_Profile *, profile);
+    ACE_dynamic_cast(TAO_IIOP_Profile*,profile);
 
   if (iiop_profile == 0)
-    return -1;
+    TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, 0);
+
 
 // Establish the connection and get back a <Client_Connection_Handler>.
 // @@ We do not have the ORB core
@@ -68,48 +68,37 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile,
 //                    iiop_profile->addr_to_string (),
 //                    "errno"));
 //
-//        TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (), env);
+//        TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env);
 //        }
 //    }
 //  else
 //#endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
-
-  const ACE_INET_Addr &oa = iiop_profile->object_addr ();
-
-  TAO_Client_Connection_Handler* result;
+  // @@ think about making this a friend class!  FRED
+  const ACE_INET_Addr &oa =
+    ACE_dynamic_cast (const ACE_INET_Addr &, iiop_profile->object_addr ());
+
+  if (base_connector_.connect (iiop_profile->hint (), oa) == -1)
+  { // Give users a clue to the problem.
+    if (TAO_orbdebug)
+      ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
+                  "%s failed (%p)\n",
+                  __FILE__,
+                  __LINE__,
+                  profile->addr_to_string (),
+                  "errno"));
+
+    TAO_THROW_ENV_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env, 0);
+  }
 
   // the connect call will set the hint () stored in the Profile
-  // object; but we obtain the transport in the <result>
-  // variable. Other threads may modify the hint, but we are not
-  // affected.
-  if (this->base_connector_.connect (iiop_profile->hint (),
-                                     result,
-                                     oa) == -1)
-    { // Give users a clue to the problem.
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                    "%s failed (%p)\n",
-                    __FILE__,
-                    __LINE__,
-                    profile->addr_to_string (),
-                    "errno"));
+  // object.
 
-      return -1;
-    }
-
-  transport = result->transport ();
-
-  return 0;
+  return iiop_profile->transport ();
 }
 
 int
-TAO_IIOP_Connector::open (TAO_Resource_Factory *trf,
-                          ACE_Reactor *reactor)
+TAO_IIOP_Connector::open(TAO_Resource_Factory *trf, ACE_Reactor *reactor)
 {
-  // @@ Fred: why not just
-  //
-  // return this->base_connector_.open (....); ????
-  //
   if (this->base_connector_.open (reactor,
                                   trf->get_null_creation_strategy (),
                                   trf->get_cached_connect_strategy (),
@@ -119,14 +108,14 @@ TAO_IIOP_Connector::open (TAO_Resource_Factory *trf,
 }
 
 int
-TAO_IIOP_Connector::close (void)
+TAO_IIOP_Connector::close ()
 {
   this->base_connector_.close ();
   return 0;
 }
 
 int
-TAO_IIOP_Connector::preconnect (char *preconnections)
+TAO_IIOP_Connector::preconnect(char* preconnections)
 {
 #if 0
   if (preconnections)
@@ -137,7 +126,6 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
 
       char *nextptr = 0;
       char *where = 0;
-
       for (where = ACE::strsplit_r (preconnections, ",", nextptr);
            where != 0;
            where = ACE::strsplit_r (0, ",", nextptr))
@@ -151,14 +139,15 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
               *sep = '\0';
               tport = sep + 1;
 
-              dest.set (ACE_OS::atoi (tport),
-                        thost);
+              dest.set (ACE_OS::atoi (tport), thost);
 
               // Try to establish the connection
               handler = 0;
               if (this->base_connector_.connect (handler, dest) == 0)
-                // Save it for later so we can mark it as idle
-                handlers.push (handler);
+                {
+                  // Save it for later so we can mark it as idle
+                  handlers.push (handler);
+                }
               else
                 ACE_ERROR ((LM_ERROR,
                             "(%P|%t) Unable to preconnect to host '%s', port %d.\n",
@@ -199,13 +188,12 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
               *sep = '\0';
               tport = sep + 1;
 
-              dest.set (ACE_OS::atoi (tport), thost);
+              dest.set (atoi(tport), thost);
               dests.push (dest);
             }
           else
             ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Yow!  Couldn't find a ':' separator in '%s' spec.\n",
-                        where));
+                        "(%P|%t) Yow!  Couldn't find a ':' separator in '%s' spec.\n", where));
         }
 
       // Create an array of addresses from the stack, as well as an
@@ -219,15 +207,14 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
                       ACE_INET_Addr[num_connections],
                       -1);
       ACE_NEW_RETURN (handlers,
-                      TAO_Client_Connection_Handler *[num_connections],
+                      TAO_Client_Connection_Handler*[num_connections],
                       -1);
       ACE_NEW_RETURN (failures,
                       char[num_connections],
                       -1);
 
-      size_t index = 0;
-
       // Fill in the remote address array
+      size_t index = 0;
       while (dests.pop (remote_addrs[index]) == 0)
         handlers[index++] = 0;
 
@@ -238,11 +225,9 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
                                        failures);
       // Loop over all the failures and set the handlers that
       // succeeded to idle state.
-      for (index = 0;
-           index < num_connections;
-           index++)
+      for (index = 0; index < num_connections; index++)
         {
-          if (!failures[index])
+          if (! failures[index])
             {
               handlers[index]->idle ();
               successes++;
@@ -252,17 +237,3 @@ TAO_IIOP_Connector::preconnect (char *preconnections)
 #endif /* 0 */
   return successes;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<ACE_INET_Addr>;
-template class ACE_Unbounded_Stack<ACE_INET_Addr>;
-template class ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Stack_Iterator<ACE_INET_Addr>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index bdddb9ea2da..3367bcd6b7d 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -13,7 +13,7 @@
 //    IIOP specific connector processing
 //
 // = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
+//    Fred Kuhns
 //
 // ============================================================================
 
@@ -30,44 +30,29 @@ typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR
 
 class TAO_Export TAO_IIOP_Connector : public TAO_Connector
 {
-  // = TITLE
-  //   IIOP-specific Connector bridge for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-public:
-  // = Initialization and termination methods.
-  TAO_IIOP_Connector (void);
-  // Constructor.
-  // @@ Do we want to pass in the tag here or should it be statically
-  // defined?
-
-  int open (TAO_Resource_Factory *trf, ACE_Reactor *reactor);
-  //  Initialize object and register with reactor.
-
-  int close (void);
-  // Shutdown Connector bridge and concreate Connector.
+  public:
 
-  int preconnect (char *preconnections);
-  // Initial set of connections to be established.
+  TAO_IIOP_Connector (void);
+  // Constructor.  Do we want to pass in the tag here or
+  // should it be statically defined?
 
+  int preconnect(char* preconnections);
+  int open(TAO_Resource_Factory *trf, ACE_Reactor *reactor);
+  int close(void);
   CORBA::ULong tag (void);
-  // The tag identifying the specific ORB transport layer protocol.
-  // For example TAO_IOP_TAG_INTERNET_IOP = 0.  The tag is used in the
-  // IOR to identify the type of profile included. IOR -> {{tag0,
-  // profile0} {tag1, profole1} ...}  GIOP.h defines typedef
-  // CORBA::ULong TAO_IOP_Profile_ID;
 
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport);
-  // Connect will be called from TAO_GIOP_Invocation::start
+  TAO_Transport* connect(TAO_Profile *profile,
+                         CORBA::Environment &env);
+  // connect will be called from TAO_GIOP_Invocation::start
 
 private:
+
   CORBA::ULong tag_;
   // IIOP tag.
 
   TAO_IIOP_BASE_CONNECTOR  base_connector_;
   // The connector initiating connection requests for IIOP.
+
 };
 
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/IIOP_Interpreter.cpp
index d484286be3e..3f0b3c24858 100644
--- a/TAO/tao/CDR_Interpreter.cpp
+++ b/TAO/tao/IIOP_Interpreter.cpp
@@ -5,11 +5,11 @@
 // All Rights Reserved
 
 // We need to include Sequence.h and Sequence_T.h before the
-// CDR_Interpreter to workaround a Greenhills (1.8.8 and 1.8.9)
+// IIOP_Interpreter to workaround a Greenhills (1.8.8 and 1.8.9)
 // compiler bug.
 #include "tao/Sequence.h"
 #include "tao/Sequence_T.h"
-#include "tao/CDR_Interpreter.h"
+#include "tao/IIOP_Interpreter.h"
 #include "tao/Any.h"
 #include "tao/varout.h"
 #include "tao/CDR.h"
@@ -17,10 +17,10 @@
 #include "tao/Environment.h"
 #include "tao/Union.h"
 
-ACE_RCSID(tao, CDR_Interpreter, "$Id$")
+ACE_RCSID(tao, IIOP_Interpreter, "$Id$")
 
-TAO_CDR_Interpreter::Table_Element
-TAO_CDR_Interpreter::table_[CORBA::TC_KIND_COUNT] =
+TAO_IIOP_Interpreter::Table_Element
+TAO_IIOP_Interpreter::table_[CORBA::TC_KIND_COUNT] =
 {
   { 0, 1, 0 },                            // CORBA::tk_null
   { 0, 1, 0 },                            // CORBA::tk_void
@@ -94,54 +94,54 @@ TAO_CDR_Interpreter::table_[CORBA::TC_KIND_COUNT] =
 // make sure that alignment of IDL-defined data types is consistent
 // (one byte).
 
-enum TCKIND
-{
-  tk_null               = 0,
-  tk_void               = 1,
-  tk_short              = 2,
-  tk_long               = 3,
-  tk_ushort             = 4,
-  tk_ulong              = 5,
-  tk_float              = 6,
-  tk_double             = 7,
-  tk_boolean            = 8,
-  tk_char               = 9,
-  tk_octet              = 10,
-  tk_any                = 11,
-  tk_TypeCode           = 12,
-  tk_Principal          = 13,
-  tk_objref             = 14,
-  tk_struct             = 15,
-  tk_union              = 16,
-  tk_enum               = 17,
-  tk_string             = 18,
-  tk_sequence           = 19,
-  tk_array              = 20,
-  tk_alias              = 21,           // 94-11-7
-  tk_except             = 22,           // 94-11-7
-
-  // these five are OMG-IDL data type extensions
-  tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
-  tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
-  tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
-  tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
-  tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
-
-  // 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
-  // just be table lookups.  It must always be the last enum value!!
-
-  TC_KIND_COUNT
-};
+  enum TCKIND
+  {
+    tk_null               = 0,
+    tk_void               = 1,
+    tk_short              = 2,
+    tk_long               = 3,
+    tk_ushort             = 4,
+    tk_ulong              = 5,
+    tk_float              = 6,
+    tk_double             = 7,
+    tk_boolean            = 8,
+    tk_char               = 9,
+    tk_octet              = 10,
+    tk_any                = 11,
+    tk_TypeCode           = 12,
+    tk_Principal          = 13,
+    tk_objref             = 14,
+    tk_struct             = 15,
+    tk_union              = 16,
+    tk_enum               = 17,
+    tk_string             = 18,
+    tk_sequence           = 19,
+    tk_array              = 20,
+    tk_alias              = 21,           // 94-11-7
+    tk_except             = 22,           // 94-11-7
+
+    // these five are OMG-IDL data type extensions
+    tk_longlong           = 23,           // 94-9-32 Appendix A (+ 2)
+    tk_ulonglong          = 24,           // 94-9-32 Appendix A (+ 2)
+    tk_longdouble         = 25,           // 94-9-32 Appendix A (+ 2)
+    tk_wchar              = 26,           // 94-9-32 Appendix A (+ 2)
+    tk_wstring            = 27,           // 94-9-32 Appendix A (+ 2)
+
+    // 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
+    // just be table lookups.  It must always be the last enum value!!
+
+    TC_KIND_COUNT
+  };
 
 #if defined (TAO_HAS_FIXED_BYTE_ALIGNMENT)
-// Have a bogus one
-#define declare_entry(x,t) struct align_struct_ ## t { }
+  // Have a bogus one
+  #define declare_entry(x,t) struct align_struct_ ## t { }
 
-#define setup_entry(x,t) \
+  #define setup_entry(x,t) \
     { \
-      TAO_CDR_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_CDR_Interpreter::table_ [t].alignment_ = 1; \
+      TAO_IIOP_Interpreter::table_ [t].size_ = sizeof (x); \
+      TAO_IIOP_Interpreter::table_ [t].alignment_ = 1; \
     }
 #else  /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
   // unix, ACE_WIN32, VXWORKS, __Lynx__, at least
@@ -156,8 +156,8 @@ enum TCKIND
   #define setup_entry(x,t) \
     { \
       align_struct_ ## t align; \
-      TAO_CDR_Interpreter::table_ [t].size_ = sizeof (x); \
-      TAO_CDR_Interpreter::table_ [t].alignment_ = \
+      TAO_IIOP_Interpreter::table_ [t].size_ = sizeof (x); \
+      TAO_IIOP_Interpreter::table_ [t].alignment_ = \
       (char *) &align.two - (char *) &align.one - TAO_MAXIMUM_NATIVE_TYPE_SIZE; \
     }
 #endif /* ! TAO_HAS_FIXED_BYTE_ALIGNMENT */
@@ -190,10 +190,10 @@ declare_entry (CORBA::LongLong, tk_longlong);
 declare_entry (CORBA::ULongLong, tk_ulonglong);
 declare_entry (CORBA::LongDouble, tk_longdouble);
 declare_entry (CORBA::WChar, tk_wchar);
-declare_entry (CORBA::WChar*, tk_wstring);
+declare_entry (CORBA::WString, tk_wstring);
 
 void
-TAO_CDR_Interpreter::init (void)
+TAO_IIOP_Interpreter::init (void)
 {
   setup_entry (CORBA::Short, tk_short);
   setup_entry (CORBA::Long, tk_long);
@@ -211,15 +211,14 @@ TAO_CDR_Interpreter::init (void)
   setup_entry (CORBA::TypeCode_ptr, tk_TypeCode);
   setup_entry (CORBA::Principal_ptr, tk_Principal);
   setup_entry (CORBA::Object_ptr, tk_objref);
-  setup_entry (TAO_Object_Field_T<CORBA_Object>, tk_objref);
 
   enum generic_enum {a, b, c, d};
 
   // XXX workaround for G++ 2.6.3 bug
   // setup_entry (generic_enum, CORBA::tk_enum);
-  TAO_CDR_Interpreter::table_ [CORBA::tk_enum].size_ =
+  TAO_IIOP_Interpreter::table_ [CORBA::tk_enum].size_ =
     sizeof (generic_enum);
-  TAO_CDR_Interpreter::table_ [CORBA::tk_enum].alignment_ =
+  TAO_IIOP_Interpreter::table_ [CORBA::tk_enum].alignment_ =
     sizeof (generic_enum);
 
   setup_entry (CORBA::String, tk_string);
@@ -231,19 +230,19 @@ TAO_CDR_Interpreter::init (void)
   setup_entry (CORBA::ULongLong, tk_ulonglong);
   setup_entry (CORBA::LongDouble, tk_longdouble);
   setup_entry (CORBA::WChar, tk_wchar);
-  setup_entry (CORBA::WChar*, tk_wstring);
+  setup_entry (CORBA::WString, tk_wstring);
 }
 
 #undef  setup
 
 CORBA::Boolean
-TAO_CDR_Interpreter::skip_encapsulation (TAO_InputCDR *stream)
+TAO_IIOP_Interpreter::skip_encapsulation (TAO_InputCDR *stream)
 {
   return stream->skip_string ();
 }
 
 CORBA::Boolean
-TAO_CDR_Interpreter::skip_long (TAO_InputCDR *stream)
+TAO_IIOP_Interpreter::skip_long (TAO_InputCDR *stream)
 {
   CORBA::ULong  scratch;
 
@@ -270,11 +269,11 @@ TAO_CDR_Interpreter::skip_long (TAO_InputCDR *stream)
 // traversal.
 
 size_t
-TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
-                                                        TAO_InputCDR *stream,
-                                                        CORBA::TCKind kind,
-                                                        size_t &alignment,
-                                                        CORBA::Environment &env)
+TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
+                                       TAO_InputCDR* stream,
+                                       CORBA::TCKind kind,
+                                       size_t &alignment,
+                                       CORBA::Environment &env)
 {
   CORBA::ULong temp;
   // Just a temporary to retrieve CORBA::TCKind variables as ULong's
@@ -287,7 +286,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       || kind <= CORBA::tk_void
       || kind == CORBA::tk_except)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -296,14 +295,14 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
   // lists that affect the size and alignment of "top level" memory
   // needed to hold an instance of this type.
 
-  if (TAO_CDR_Interpreter::table_[kind].calc_ != 0)
+  if (TAO_IIOP_Interpreter::table_[kind].calc_ != 0)
     {
-      assert (TAO_CDR_Interpreter::table_[kind].size_ == 0);
+      assert (TAO_IIOP_Interpreter::table_[kind].size_ == 0);
 
       // Pull encapsulation length out of the stream.
       if (stream->read_ulong (temp) == 0)
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           return 0;
         }
 
@@ -326,11 +325,11 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
 
       if (nested.good_bit () == 0)
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           return 0;
         }
 
-      size_t size = TAO_CDR_Interpreter::table_[kind].calc_ (&nested,
+      size_t size = TAO_IIOP_Interpreter::table_[kind].calc_ (&nested,
                                                               alignment,
                                                               env);
       if (env.exception () != 0)
@@ -345,12 +344,12 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
 
       if (stream->rd_ptr () != nested.rd_ptr ())
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           return 0;
         }
       return size;
     }
-  assert (TAO_CDR_Interpreter::table_[kind].size_ != 0);
+  assert (TAO_IIOP_Interpreter::table_[kind].size_ != 0);
 
   // Reinitialize the TypeCode if requested; this consumes any
   // TypeCode parameters in the stream.  They only exist for TCKind
@@ -366,14 +365,14 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       switch (kind)
         {
         default:
-          assert (TAO_CDR_Interpreter::table_[kind].skipper_ == 0);
+          assert (TAO_IIOP_Interpreter::table_[kind].skipper_ == 0);
           break;
 
         case CORBA::tk_string:
         case CORBA::tk_wstring:
           if (stream->read_ulong (len) == 0)
             {
-              env.exception (new CORBA::BAD_TYPECODE ());
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
               return 0;
             }
           tc->length_ = len;
@@ -384,7 +383,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
         case CORBA::tk_sequence:
           if (stream->read_ulong (len) == 0)
             {
-              env.exception (new CORBA::BAD_TYPECODE ());
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
               return 0;
             }
           tc->length_ = len;
@@ -398,20 +397,20 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc,
       // Otherwise, consume any parameters without stuffing them into
       // a temporary TypeCode.
     }
-  else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0
-           && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0)
+  else if (TAO_IIOP_Interpreter::table_[kind].skipper_ != 0
+           && TAO_IIOP_Interpreter::table_[kind].skipper_ (stream) == 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
   // Return statically known values.
-  alignment = TAO_CDR_Interpreter::table_[kind].alignment_;
-  return TAO_CDR_Interpreter::table_[kind].size_;
+  alignment = TAO_IIOP_Interpreter::table_[kind].alignment_;
+  return TAO_IIOP_Interpreter::table_[kind].size_;
 }
 
 size_t
-TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
+TAO_IIOP_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
                                             TAO_InputCDR *stream,
                                             size_t &alignment,
                                             CORBA::Environment &env)
@@ -421,7 +420,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
   CORBA::ULong temp;
   if (stream->read_ulong (temp) == 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -431,7 +430,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
 
   if (kind != (CORBA::TCKind) ~0u)
     {
-      return TAO_CDR_Interpreter::calc_nested_size_and_alignment_i
+      return TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i
         (tc,
          stream,
          kind,
@@ -453,33 +452,26 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
 
   CORBA::Long offset;
   if (!stream->read_long (offset)
-      || offset >= -4
+      || offset >= -8
       || ((-offset) & 0x03) != 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
   // Notice how we change the sign of the offset to estimate the
   // maximum size.
-  // Also note that the offset is computed starting from the offset
-  // field. However, by this time, we have already read the offset field i.e.,
-  // we have already moved ahead by 4 bytes (size of CORBA::Long). So we should
-  // increase our offset bythis much amount.
-  //  TAO_InputCDR indirected_stream (*stream, -1*(offset-4), offset-4);
-  ACE_Message_Block *mb = (ACE_Message_Block *)stream->start ();
-  TAO_InputCDR indirected_stream (mb->rd_ptr () + offset - 4,
-                                  -1 * (offset - 4));
+  TAO_InputCDR indirected_stream (*stream, -offset, offset);
 
   // Fetch indirected-to TCKind.
   if (!indirected_stream.read_ulong (temp))
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
   kind = (CORBA::TCKind) temp;
 
-  return TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (tc,
+  return TAO_IIOP_Interpreter::calc_nested_size_and_alignment_i (tc,
                                                 &indirected_stream,
                                                 kind,
                                                 alignment,
@@ -502,7 +494,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc,
 // "RTTI" data.
 
 size_t
-TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
                                                size_t &alignment,
                                                CORBA::Boolean is_exception,
                                                CORBA::Environment &env)
@@ -523,7 +515,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
   if (is_exception)
     {
       size = sizeof (CORBA::Exception);
-      alignment = TAO_CDR_Interpreter::table_[CORBA::tk_TypeCode].alignment_;
+      alignment = TAO_IIOP_Interpreter::table_[CORBA::tk_TypeCode].alignment_;
     }
   else
     {
@@ -538,7 +530,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
       || !stream->skip_string ()
       || !stream->read_ulong (members))
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -552,7 +544,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
     // Skip name of the member.
     if (!stream->skip_string ())
       {
-        env.exception (new CORBA::BAD_TYPECODE ());
+        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
         return 0;
       }
 
@@ -588,7 +580,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream,
 // Calculate size and alignment for a structure.
 
 size_t
-TAO_CDR_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
                                     size_t &alignment,
                                     CORBA::Environment &env)
 {
@@ -601,7 +593,7 @@ TAO_CDR_Interpreter::calc_struct_attributes (TAO_InputCDR *stream,
 // Calculate size and alignment for an exception.
 
 size_t
-TAO_CDR_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
                                        size_t &alignment,
                                        CORBA::Environment &env)
 {
@@ -619,7 +611,7 @@ TAO_CDR_Interpreter::calc_exception_attributes (TAO_InputCDR *stream,
 // the strictest alignment required by _any_ arm of the union.
 
 size_t
-TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
                                                  size_t &overall_alignment,
                                                  size_t &discrim_size_with_pad,
                                                  CORBA::Environment &env)
@@ -638,7 +630,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
     void *two;
   };
   align_ptr ap;
-
+  
   // the first member of the union internal representation is the VPTR
   // since every union inherits from TAO_Base_Union
   overall_alignment = (char *) &ap.two - (char *) &ap.one
@@ -652,7 +644,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
   if (!stream->skip_string ()                   // type ID
       || !stream->skip_string ())
     {   // typedef name
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -663,7 +655,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
   CORBA::TypeCode discrim_tc (CORBA::tk_void);
 
   discrim_and_base_size = sizeof (TAO_Base_Union) +
-    calc_nested_size_and_alignment (&discrim_tc,
+    calc_nested_size_and_alignment (&discrim_tc, 
                                     stream,
                                     value_alignment,
                                     env);
@@ -673,13 +665,13 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
   if (value_alignment > overall_alignment)
     overall_alignment = value_alignment;
 
-
+  
   // skip "default used" indicator, and save "member count"
 
   if (!stream->read_ulong (temp)                 // default used
       || !stream->read_ulong (members))
     {   // member count
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -708,7 +700,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_short (s))
             {
-              env.exception (new CORBA::BAD_TYPECODE ());
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
               return 0;
             }
         }
@@ -722,7 +714,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_long (l))
             {
-              env.exception (new CORBA::BAD_TYPECODE ());
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
               return 0;
             }
         }
@@ -735,14 +727,14 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
           if (!stream->read_char (c))
             {
-              env.exception (new CORBA::BAD_TYPECODE ());
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
               return 0;
             }
         }
       break;
 
       default:
-        env.exception (new CORBA::BAD_TYPECODE ());
+        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
         return 0;
       }
 
@@ -750,7 +742,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
     if (!stream->skip_string ())
       {
-        env.exception (new CORBA::BAD_TYPECODE ());
+        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
         return 0;
       }
 
@@ -763,7 +755,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
     TAO_InputCDR temp (*stream);
     if (calc_union_attr_is_var_sized_member (&temp, var_sized_member) == -1)
       {
-        env.exception (new CORBA::BAD_TYPECODE ());
+        env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
         return 0;
      }
 
@@ -797,9 +789,9 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 
   // Round up the discriminator's size to include padding it needs in
   // order to be followed by the value.
-  discrim_and_base_size_with_pad =
+  discrim_and_base_size_with_pad = 
     (size_t) align_binary (discrim_and_base_size, value_alignment);
-  discrim_size_with_pad = discrim_and_base_size_with_pad -
+  discrim_size_with_pad = discrim_and_base_size_with_pad - 
     sizeof (TAO_Base_Union);
   // Now calculate the overall size of the structure, which is the
   // discriminator, inter-element padding, value, and tail padding.
@@ -823,7 +815,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream,
 // any of the members).
 
 size_t
-TAO_CDR_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
                                    size_t &alignment,
                                    CORBA::Environment &env)
 {
@@ -835,7 +827,7 @@ TAO_CDR_Interpreter::calc_union_attributes (TAO_InputCDR *stream,
 // Calculate size and alignment for a typedeffed type.
 
 size_t
-TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
                                    size_t &alignment,
                                    CORBA::Environment &env)
 {
@@ -844,7 +836,7 @@ TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
   if (!stream->skip_string ()                   // type ID
       || !stream->skip_string ())               // typedef name
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -858,7 +850,7 @@ TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream,
 // nested single dimensional arrays.)
 
 size_t
-TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
                                    size_t &alignment,
                                    CORBA::Environment &env)
 {
@@ -876,7 +868,7 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
   if (stream->read_ulong (member_count) == 0
       || member_count > UINT_MAX)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -890,7 +882,7 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream,
 // sequences differ from the size of a regular sequence.
 
 size_t
-TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
+TAO_IIOP_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
                                            size_t &alignment,
                                            CORBA::Environment &env)
 {
@@ -901,7 +893,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
   CORBA::ULong temp;
   if (stream->read_ulong (temp) == 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -918,7 +910,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
           || offset >= -8
           || ((-offset) & 0x03) != 0)
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           return 0;
         }
       // Notice how we change the sign of the offset to estimate the
@@ -930,7 +922,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
       if (indirected_stream.read_ulong (temp) == 0
           || temp == ~0u)
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
           return 0;
         }
     }
@@ -940,7 +932,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
   // Skip the rest of the stream because we don't use it.
   if (stream->skip_bytes (stream->length ()) == 0)
     {
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -978,7 +970,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream,
 // Cast the discriminant values to the right type and compare them.
 
 CORBA::Boolean
-TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
+TAO_IIOP_Interpreter::match_value (CORBA::TCKind kind,
                          TAO_InputCDR *tc_stream,
                          const void *value,
                          CORBA::Environment &env)
@@ -995,7 +987,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ushort (discrim) != 0)
           retval = (discrim == *(CORBA::UShort *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
@@ -1007,7 +999,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ulong (discrim) != 0)
           retval = (discrim == *(CORBA::ULong *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
@@ -1018,7 +1010,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_ulong (discrim) != 0)
           retval = (discrim == *(unsigned *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
@@ -1029,7 +1021,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_boolean (discrim) != 0)
           retval = (discrim == *(CORBA::Boolean *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
@@ -1040,7 +1032,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_char (discrim) != 0)
           retval = (discrim == *(CORBA::Char *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
@@ -1051,19 +1043,19 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind,
         if (tc_stream->read_wchar (discrim) != 0)
           retval = (discrim == *(CORBA::WChar *)value);
         else
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
       }
     break;
 
     default:
-      env.exception (new CORBA::BAD_TYPECODE ());
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
     }
 
   return retval;
 }
 
 int
-TAO_CDR_Interpreter
+TAO_IIOP_Interpreter
 ::calc_union_attr_is_var_sized_member (TAO_InputCDR *stream,
                                        CORBA::Boolean &flag)
 {
diff --git a/TAO/tao/CDR_Interpreter.h b/TAO/tao/IIOP_Interpreter.h
index c28e40891a5..6025fcaa0d0 100644
--- a/TAO/tao/CDR_Interpreter.h
+++ b/TAO/tao/IIOP_Interpreter.h
@@ -7,18 +7,18 @@
 //    TAO
 //
 // = FILENAME
-//    CDR_Interpreter.h
+//    IIOP_Interpreter.h
 //
 // = DESCRIPTION
-//    Header file for TAO's CDR interpreter.
+//    Header file for TAO's IIOP interpreter.
 //
 // = AUTHOR
 //     Douglas C. Schmidt
 //
 // ============================================================================
 
-#ifndef TAO_CDR_INTERPRETER_H
-#define TAO_CDR_INTERPRETER_H
+#ifndef TAO_IIOP_INTERPRETER_H
+#define TAO_IIOP_INTERPRETER_H
 
 #include "tao/corbafwd.h"
 
@@ -28,10 +28,10 @@ typedef size_t TAO_attribute_calculator (TAO_InputCDR *stream,
                                          CORBA_Environment &TAO_IN_ENV);
 typedef CORBA::Boolean TAO_param_skip_rtn (TAO_InputCDR *);
 
-class TAO_Export TAO_CDR_Interpreter
+class TAO_Export TAO_IIOP_Interpreter
 {
   // = TITLE
-  //   TAO's CORBA TypeCode interpreter, which traverses GIOP/CDR
+  //   TAO's CORBA TypeCode interpreter, which traverses GIOP/IIOP
   //   data structures.
   //
   // = DESCRIPTION
@@ -258,4 +258,4 @@ public:
   // initialization time.
 };
 
-#endif /* TAO_CDR_INTERPRETER_H */
+#endif /* TAO_IIOP_INTERPRETER_H */
diff --git a/TAO/tao/IIOP_ORB.cpp b/TAO/tao/IIOP_ORB.cpp
new file mode 100644
index 00000000000..5afe478233f
--- /dev/null
+++ b/TAO/tao/IIOP_ORB.cpp
@@ -0,0 +1,353 @@
+// $Id$
+//
+// @(#)iioporb.cpp      1.8 95/09/19
+// Copyright 1994-1995 by Sun Microsystems Inc.
+// All Rights Reserved
+//
+// IIOP:                ORB pseudo-object
+//
+// This includes objref stringification/destringification for IIOP
+// object references.
+
+#include "tao/IIOP_ORB.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Stub.h"
+#include "tao/IIOP_Profile.h"
+#include "tao/GIOP.h"
+#include "tao/POA.h"
+#include "tao/ORB_Core.h"
+
+#if !defined (__ACE_INLINE__)
+# include "tao/IIOP_ORB.i"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID(tao, IIOP_ORB, "$Id$")
+
+static const char ior_prefix [] = "IOR:";
+
+// Objref stringification.
+
+CORBA::String
+IIOP_ORB::object_to_string (CORBA::Object_ptr obj,
+                            CORBA::Environment &env)
+{
+  env.clear ();
+
+  // Application writer controls what kind of objref strings they get,
+  // maybe along with other things, by how they initialize the ORB.
+
+  if (use_omg_ior_format_)
+    {
+      // By default, orbs use IOR strings; these are ugly (and error
+      // prone) but specified by CORBA.
+      //
+      // XXX there should be a simple way to reuse this code in other
+      // ORB implementations ...
+
+      // @@ Is BUFSIZ the right size here?
+      char buf [BUFSIZ];
+      TAO_OutputCDR cdr (buf,
+                         sizeof buf,
+                         TAO_ENCAP_BYTE_ORDER);
+
+      // support limited oref ACE_OS::strcmp.
+      (void) ACE_OS::memset (buf, 0, BUFSIZ);
+
+      // Marshal the objref into an encapsulation bytestream.
+      (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
+      if (cdr.encode (CORBA::_tc_Object,
+                        &obj, 0,
+                        env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        return 0;
+
+      // Now hexify the encapsulated CDR data into a string, and
+      // return that string.
+
+      CORBA::String cp;
+      size_t len = cdr.length ();
+
+      CORBA::String string;
+      ACE_ALLOCATOR_RETURN (string,
+                            CORBA::string_alloc (sizeof ior_prefix + 2 * len),
+                            0);
+
+      ACE_OS::strcpy ((char *) string,
+                      ior_prefix);
+
+      const char *bytes = cdr.buffer ();
+
+      for (cp = (CORBA::String) ACE_OS::strchr ((char *) string, ':') + 1;
+           len--;
+           bytes++)
+        {
+          *cp++ = ACE::nibble2hex ((*bytes) >> 4);
+          *cp++ = ACE::nibble2hex (*bytes);
+        }
+
+      *cp = 0;
+      return string;
+    }
+  else
+    {
+      // The "internet" ORB uses readable URL style objrefs, as used
+      // in the World Wide Web.
+      //
+      // This only works for IIOP objrefs.  If we're handed an objref
+      // that's not an IIOP objref, fail -- application must use an
+      // ORB that's configured differently.  @@ Is this true? FRED
+
+      if (obj->_stubobj () == 0)
+        return CORBA::string_copy ((CORBA::String) TAO_IIOP_Profile::prefix ());
+        // @@ This should be some sort of default prefix, not
+        // hardcoded to IIOP!! FRED
+
+      CORBA::String buf =
+        obj->_stubobj ()->profile_in_use ()->to_string (env);
+      return buf;
+    }
+}
+
+// Destringify OMG-specified "IOR" string.
+//
+// XXX there should be a simple way to reuse this code in other ORB
+// implementations ...
+
+static CORBA::Object_ptr
+ior_string_to_object (const char *str,
+                      CORBA::Environment &env)
+{
+  // Unhex the bytes, and make a CDR deencapsulation stream from the
+  // resulting data.
+  ACE_Message_Block mb (ACE_OS::strlen ((char *) str) / 2
+                        + 1 + CDR::MAX_ALIGNMENT);
+
+  CDR::mb_align (&mb);
+
+  char *buffer = mb.rd_ptr ();
+
+  const char *tmp = str;
+  size_t len = 0;
+
+  while (tmp [0] && tmp [1])
+    {
+      u_char byte;
+
+      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
+        break;
+
+      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
+      byte |= ACE::hex2byte (tmp [1]);
+
+      buffer [len++] = byte;
+      tmp += 2;
+    }
+
+  if (tmp [0] && !isspace (tmp [0]))
+    {
+      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
+      return CORBA::Object::_nil ();
+    }
+
+  // Create deencapsulation stream ... then unmarshal objref from that
+  // stream.
+
+  int byte_order = *(mb.rd_ptr ());
+  mb.rd_ptr (1);
+  mb.wr_ptr (len);
+  TAO_InputCDR stream (&mb, byte_order);
+
+  CORBA::Object_ptr objref=0;
+  if (stream.decode (CORBA::_tc_Object,
+		     &objref, 0,
+		     env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    objref = 0;
+
+  return objref;
+}
+
+// Destringify URL style IIOP objref.
+
+// @@ Fred, can you please put this into a class as a static method
+// rather than having it floating around as a stand-alone function?
+static CORBA::Object_ptr
+iiop_string_to_object (const char *string,
+                       CORBA::Environment &env)
+{
+  // NIL objref encodes as just "iiop:" ... which has already been
+  // removed, so we see it as an empty string.
+
+  if (!string || !*string)
+    return CORBA::Object::_nil ();
+
+  // type ID not encoded in this string ... makes narrowing rather
+  // expensive, though it does ensure that type-safe narrowing code
+  // gets thoroughly excercised/debugged!  Without a typeID, the
+  // _narrow will be required to make an expensive remote "is_a" call.
+
+  TAO_IIOP_Profile *pfile;
+
+  ACE_NEW_RETURN (pfile,
+                  TAO_IIOP_Profile (string,
+                                    env),
+                  CORBA::Object::_nil ());
+  // pfile refcount == 1
+
+  // Now make the STUB_Object ...
+  STUB_Object *data;
+  ACE_NEW_RETURN (data,
+                  STUB_Object ((char *) 0,
+                               pfile),
+                  CORBA::Object::_nil ());
+  // pfile refcount == 2
+
+  pfile->_decr_refcnt ();
+  // pfile refcount == 1
+
+  // Create the CORBA level proxy.
+  TAO_ServantBase *servant =
+    TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (data);
+
+  // This will increase the ref_count on data by one
+  CORBA_Object *obj;
+  ACE_NEW_RETURN (obj,
+                  CORBA_Object (data,
+                                servant,
+                                servant != 0),
+                  CORBA::Object::_nil ());
+
+  // Set the ref_count on data to 1, which is correct, because only
+  // obj has now a reference to it.
+  // data->_decr_refcnt ();
+
+  return obj;
+}
+
+// Destringify arbitrary objrefs.  called from resolve_name_service ()
+// with an IOR multicast_to_service ().
+CORBA::Object_ptr
+IIOP_ORB::string_to_object (const char *str,
+                            CORBA::Environment &env)
+{
+  env.clear ();
+
+  CORBA::Object_ptr obj = 0;
+
+  // Use the prefix code to choose which destringify algorithm to use.
+  const size_t iiop_prefix_len =
+    ACE_OS::strlen (TAO_IIOP_Profile::prefix ());
+  if (ACE_OS::strncmp (str,
+                       TAO_IIOP_Profile::prefix (),
+                       iiop_prefix_len) == 0)
+    obj = iiop_string_to_object (str + iiop_prefix_len, env);
+
+  else if (ACE_OS::strncmp (str,
+                            ior_prefix,
+                            sizeof ior_prefix - 1) == 0)
+    obj = ior_string_to_object (str + sizeof ior_prefix - 1, env);
+
+  // Return the object.
+  return obj;
+}
+
+TAO_ServantBase *
+IIOP_ORB::_get_collocated_servant (STUB_Object *sobj)
+{
+  // ACE_DEBUG ((LM_DEBUG, "IIOP_ORB: get_collocated_servant\n"));
+
+  if (this->optimize_collocation_objects_ && sobj != 0)
+    {
+
+      TAO_Profile *pfile = sobj->profile_in_use ();
+
+      // Make sure users passed in a valid STUB_Object otherwise, we
+      // don't know what to do next.
+      if (pfile == 0)
+        {
+          // @@ Fred, can you please either keep these debugging
+          // statements in or remove them, but please don't leave the
+          // #if 0's around!
+#if 0
+          ACE_ERROR ((LM_ERROR,
+		      "%p: Passing IIOP ORB and non-IIOP object\n",
+		      "_get_collocated_object"));
+#endif
+	  // Something must be wrong!
+          return 0;
+        }
+#if 0
+      ACE_DEBUG ((LM_DEBUG,
+                  "IIOP_ORB: checking collocation for <%s>\n",
+                  pfile->addr_to_string ()));
+#endif
+
+      CORBA::Environment env;
+      TAO_ObjectKey_var objkey = pfile->_key (env);
+
+      if (env.exception ())
+        {
+#if 0
+          ACE_DEBUG ((LM_DEBUG,
+                      "IIOP_ORB: cannot find key for <%s>\n",
+                      pfile->addr_to_string ()));
+#endif
+          return 0;
+        }
+
+      // Check if the object requested is a collocated object.
+      // @@ FRED - can we make this more generic!!
+      TAO_POA *poa = 0;
+      if (pfile->tag () == TAO_IOP_TAG_INTERNET_IOP)
+        {
+          ACE_INET_Addr &addr =
+            ACE_dynamic_cast (ACE_INET_Addr &,
+                              pfile->object_addr());
+
+          poa = TAO_ORB_Core_instance ()->get_collocated_poa (addr);
+        }
+      else
+        ACE_ERROR ((LM_ERROR,
+                    "get_collocated_poa NOT Supported for NON-IIOP profile!\n"));
+
+      if (poa != 0)
+        {
+          PortableServer::Servant servant =
+            poa->find_servant (objkey.in (), env);
+          if (env.exception ())
+            {
+#if 0
+              ACE_DEBUG ((LM_DEBUG,
+                          "IIOP_ORB: cannot find servant for <%s>\n",
+                          pfile->addr_to_string ()));
+#endif
+              return 0;
+            }
+
+#if 0
+          ACE_DEBUG ((LM_DEBUG,
+                      "IIOP_ORB: object at <%s> is collocated\n",
+                      pfile->addr_to_string ()));
+#endif
+          return servant;
+        }
+    }
+
+#if 0
+  ACE_DEBUG ((LM_DEBUG,
+	      "IIOP_ORB: collocation failed for \n"));
+#endif
+
+  return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Unbounded_Set<ACE_INET_Addr>;
+template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Singleton<IIOP_ORB, ACE_SYNCH_RECURSIVE_MUTEX>
+#pragma instantiate ACE_Unbounded_Set<ACE_INET_Addr>
+#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_INET_Addr>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IIOP_ORB.h b/TAO/tao/IIOP_ORB.h
new file mode 100644
index 00000000000..1e466d82581
--- /dev/null
+++ b/TAO/tao/IIOP_ORB.h
@@ -0,0 +1,84 @@
+// This may look like C, but it's really -*- C++ -*-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO
+//
+// = FILENAME
+//    iiopobj.h
+//
+// = AUTHOR
+//     Copyright 1994-1995 by Sun Microsystems Inc.
+//
+// ============================================================================
+
+#ifndef TAO_IIOPORB_H
+#define TAO_IIOPORB_H
+
+#include "ace/INET_Addr.h"
+
+#include "tao/ORB.h"
+
+// ORB pseudo-objref
+
+class TAO_Export IIOP_ORB : public CORBA_ORB
+{
+  // = TITLE
+  //    Bridge implementation of <IIOP_ORB>.
+  //
+  // = DESCRIPTION
+  //    This is one of the two main hooks into IIOP in this C/C++
+  //    based implementation; the other being <IIOP_Object>.
+public:
+  IIOP_ORB (void);
+  // constructor
+
+  ~IIOP_ORB (void);
+  // destructor
+
+  CORBA::Object_ptr string_to_object (const char *str,
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Get an object reference from the IOR string.
+
+  CORBA::String object_to_string (CORBA::Object_ptr obj,
+                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Convert an object reference to an IOR stringified form.
+
+  TAO_ServantBase *_get_collocated_servant (STUB_Object *sobj);
+  // Return the object pointer of an collocated object it there is
+  // one, otherwise, return 0.
+
+  // = ACCESSORS
+  void _use_omg_ior_format (CORBA::Boolean ior);
+  // Set the IOR flag.
+  CORBA::Boolean _use_omg_ior_format (void);
+  // Get the IOR flag.
+
+  void _optimize_collocation_objects (CORBA::Boolean opt);
+  // Set collocation optimization status.
+  CORBA::Boolean _optimize_collocation_objects (void);
+  // Get collocation optimization status.
+
+private:
+  CORBA::Boolean use_omg_ior_format_;
+  // Decides whether to use the URL notation or to use IOR notation.
+
+  CORBA::Boolean optimize_collocation_objects_;
+  // Decides whether to use the URL notation or to use IOR notation.
+
+  ACE_Unbounded_Set<ACE_INET_Addr> collocation_record_;
+
+  // = These are not provided.
+  IIOP_ORB (const IIOP_ORB &);
+  IIOP_ORB &operator = (const IIOP_ORB &);
+};
+
+typedef IIOP_ORB *IIOP_ORB_ptr;
+
+#if defined (__ACE_INLINE__)
+# include "tao/IIOP_ORB.i"
+#endif /* __ACE_INLINE__ */
+
+#endif  /* TAO_IIOPORB_H */
diff --git a/TAO/tao/IIOP_ORB.i b/TAO/tao/IIOP_ORB.i
new file mode 100644
index 00000000000..400fa7a4d47
--- /dev/null
+++ b/TAO/tao/IIOP_ORB.i
@@ -0,0 +1,38 @@
+// $Id$
+
+ACE_INLINE
+IIOP_ORB::IIOP_ORB(void)
+  : use_omg_ior_format_(0),
+    optimize_collocation_objects_ (1)
+{
+}
+
+ACE_INLINE
+IIOP_ORB::~IIOP_ORB(void)
+{
+}
+
+
+ACE_INLINE void
+IIOP_ORB::_use_omg_ior_format (CORBA::Boolean ior)
+{
+  use_omg_ior_format_ = ior;
+}
+
+ACE_INLINE CORBA::Boolean
+IIOP_ORB::_use_omg_ior_format (void)
+{
+  return use_omg_ior_format_;
+}
+
+ACE_INLINE void
+IIOP_ORB::_optimize_collocation_objects (CORBA::Boolean opt)
+{
+  optimize_collocation_objects_ = opt;
+}
+
+ACE_INLINE CORBA::Boolean
+IIOP_ORB::_optimize_collocation_objects (void)
+{
+  return optimize_collocation_objects_;
+}
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 4a767668f92..08379aa8eb2 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -1,6 +1,18 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+// ============================================================================
+//
+// = LIBRARY
+//
+// = FILENAME
+//
+// = DESCRIPTION
+//
+// = AUTHOR
+//
+// ============================================================================
+
 #include "tao/IIOP_Profile.h"
 #include "tao/GIOP.h"
 #include "tao/CDR.h"
@@ -8,15 +20,9 @@
 #include "tao/ORB.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, IIOP_Profile, "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "tao/IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
 static const char *prefix_ = "iiop:";
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
@@ -30,7 +36,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
   this->set(addr);
   int l = ACE_OS::strlen (object_key);
@@ -53,14 +60,15 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
   this->set(addr);
   this->create_body ();
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
-                                    const TAO_IOP_Version& version,
+                                    const Version& version,
                                     const char *object_key)
   : host_ (0),
     port_ (0),
@@ -71,7 +79,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
   this->set(addr);
   int l = ACE_OS::strlen (object_key);
@@ -84,7 +93,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
 }
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
-                                    const TAO_IOP_Version& version,
+                                    const Version& version,
                                     const TAO_ObjectKey& object_key)
   : host_ (0),
     port_ (0),
@@ -95,7 +104,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const ACE_INET_Addr& addr,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
   this->set(addr);
   this->create_body ();
@@ -113,7 +123,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (port, host),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 
   if (host)
@@ -139,7 +150,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (addr),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 
   if (host)
@@ -154,7 +166,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
 
 TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
                                     CORBA::UShort port,
-                                    const TAO_IOP_Version& version,
+                                    const Version& version,
                                     const TAO_ObjectKey& object_key)
   : host_ (0),
     port_ (port),
@@ -165,9 +177,9 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char* host,
     object_addr_ (port, host),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
-  ACE_UNUSED_ARG (version);
 
   ACE_NEW (this->host_,
            char[ACE_OS::strlen (host) + 1]);
@@ -186,7 +198,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile)
     object_addr_(pfile->object_addr_),
     hint_(0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 
   ACE_NEW (this->host_,
@@ -206,7 +219,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
     object_addr_(pfile.object_addr_),
     hint_(0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 
   ACE_NEW (this->host_,
@@ -216,7 +230,7 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile)
 
 }
 
-TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IOP_Version &version)
+TAO_IIOP_Profile::TAO_IIOP_Profile (const Version &version)
   : host_ (0),
     port_ (0),
     tag_ (TAO_IOP_TAG_INTERNET_IOP),
@@ -226,7 +240,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const TAO_IOP_Version &version)
     object_addr_ (),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 }
 
@@ -240,7 +255,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (const char *string, CORBA::Environment &env)
     object_addr_ (),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
   parse_string (string, env);
 }
@@ -255,7 +271,8 @@ TAO_IIOP_Profile::TAO_IIOP_Profile (void)
     object_addr_ (),
     hint_ (0),
     // what about refcount_lock_ (),
-    refcount_ (1)
+    refcount_ (1),
+    fwd_profiles_ (0)
 {
 }
 
@@ -268,19 +285,18 @@ TAO_IIOP_Profile::set (const ACE_INET_Addr& addr)
   this->port_ = addr.get_port_number();
 
   if (TAO_ORB_Core_instance ()->orb_params ()->use_dotted_decimal_addresses ())
-    {
-      temphost2 = addr.get_host_addr ();
-      if (temphost2 == 0)
-        return -1;
-    }
+  {
+    temphost2 = addr.get_host_addr ();
+    if (temphost2 == 0)
+      return -1;
+  }
   else
-    {
-      if (addr.get_host_name (temphost,
-                              sizeof temphost) != 0)
-        return -1;
+  {
+    if (addr.get_host_name (temphost, sizeof temphost) != 0)
+      return -1;
 
-      temphost2 = temphost;
-    }
+    temphost2 = temphost;
+  }
 
   ACE_NEW_RETURN (this->host_,
                   char[ACE_OS::strlen (temphost2) + 1],
@@ -291,12 +307,53 @@ TAO_IIOP_Profile::set (const ACE_INET_Addr& addr)
 
 }
 
-TAO_IIOP_Profile::~TAO_IIOP_Profile (void)
+TAO_IIOP_Profile:: ~TAO_IIOP_Profile ()
 {
   assert (this->refcount_ == 0);
 
   delete [] this->host_;
   this->host_ = 0;
+
+  if (fwd_profiles_)
+  {
+    delete fwd_profiles_;
+  }
+
+}
+
+CORBA::ULong
+TAO_IIOP_Profile::tag (void)
+{
+  return this->tag_;
+}
+
+TAO_Transport *
+TAO_IIOP_Profile::transport (void)
+{
+  // do I need to do a dynamic cast here?
+  if (hint_) {
+    return hint_->transport ();
+  }
+  return 0;
+}
+
+const TAO_ObjectKey &
+TAO_IIOP_Profile::object_key (void) const
+{
+  return this->object_key_;
+}
+
+TAO_ObjectKey &
+TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
+{
+  this->object_key_ = objkey;
+  return this->object_key_;
+}
+
+TAO_ObjectKey *
+TAO_IIOP_Profile::_key (CORBA::Environment &)
+{
+  return new TAO_ObjectKey (this->object_key_);
 }
 
 // return codes:
@@ -313,63 +370,65 @@ TAO_IIOP_Profile::parse (TAO_InputCDR& cdr,
   // Read and verify major, minor versions, ignoring IIOP
   // profiles whose versions we don't understand.
   //
-  // @@ Fred: if we find a version like 1.5 we are supposed to handle
-  // it, i.e. read the fields we know about and ignore the rest!
-  //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
   if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_IIOP_Profile::DEF_IIOP_MAJOR
-        && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_IIOP_Profile::DEF_IIOP_MINOR))
+      && this->version_.major == TAO_IIOP_Profile::DEF_IIOP_MAJOR
+      && cdr.read_octet (this->version_.minor)
+      && this->version_.minor <= TAO_IIOP_Profile::DEF_IIOP_MINOR))
   {
-    ACE_DEBUG ((LM_DEBUG,
-                "detected new v%d.%d IIOP profile",
-                this->version_.major,
-                this->version_.minor));
+    ACE_DEBUG ((LM_DEBUG, "detected new v%d.%d IIOP profile",
+                          this->version_.major,
+                          this->version_.minor));
     return 0;
   }
 
-  if (this->host_)
-    {
-      delete [] this->host_;
-      this->host_ = 0;
-    }
+  if (this->host_) {
+    delete [] this->host_;
+    this->host_ = 0;
+  }
 
   // Get host and port
-  if (cdr.read_string (this->host_) == 0
-      || cdr.read_ushort (this->port_) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "error decoding IIOP host/port"));
-      return -1;
-    }
+  if (cdr.decode (CORBA::_tc_string,
+                  &this->host_,
+                  0,
+                  env) != CORBA::TypeCode::TRAVERSE_CONTINUE
+      || !cdr.read_ushort (this->port_))
+  {
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+    ACE_DEBUG ((LM_DEBUG, "error decoding IIOP host/port"));
+    return -1;
+  }
 
   this->object_addr_.set (this->port_, this->host_);
 
   // ... and object key.
 
-  if ((cdr >> this->object_key_) == 0)
-    return -1;
+  // @@ This is a hack. This code was moved from encode.cpp
+  //    but it is not clear to me what is going on.  So I have
+  //    passed a reference to continue_decoding into this method
+  //    continue_decoding is used in STUB_Object::decode ()
+  continue_decoding = cdr.decode (TC_opaque,
+                                  &this->object_key_,
+                                  0,
+                                  env) == CORBA::TypeCode::TRAVERSE_CONTINUE;
 
-  if (cdr.length () != 0 && TAO_debug_level)
-    {
-      // If there is extra data in the profile we are supposed to
-      // ignore it, but print a warning just in case...
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d bytes out of %d left after IIOP profile data\n",
-                  cdr.length (),
-                  encap_len));
-    }
-  if (cdr.good_bit ())
-    return 1;
-
-  return -1;
+  if (cdr.length () != 0)
+  {
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+    ACE_DEBUG ((LM_DEBUG,
+                "%d bytes out of %d left after IIOP profile data\n",
+                cdr.length (), encap_len));
+    return -1;
+  }
+  return 1;
 }
 
 int
 TAO_IIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
+
   if (!string || !*string)
     return 0;
 
@@ -389,12 +448,20 @@ TAO_IIOP_Profile::parse_string (const char *string,
       string += 5;
     }
   else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
+    {
+      // @@ AFAIK the right kind of exception to raise here is
+      // CORBA_MARSHAL: CORBA_DATA_CONVERSION is reserved for failure
+      // to translate *values* (such as character set mismatches,
+      // fixed<> types, floats, etc.)
+      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
+    }
 
   if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR
-      || this->version_.minor  > TAO_IIOP_Profile::DEF_IIOP_MINOR)
+   || this->version_.minor  > TAO_IIOP_Profile::DEF_IIOP_MINOR)
     {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
+      // @@ Same thing here....
+      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
+      return -1;
     }
 
   // Pull off the "hostname:port/" part of the objref
@@ -405,24 +472,25 @@ TAO_IIOP_Profile::parse_string (const char *string,
   char *cp = ACE_OS::strchr (start, ':');
 
   if (cp == 0)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
-    }
+  {
+    env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
+    return -1;
+  }
 
   if (this->host_)
-    {
-      // @@ You are setting this->host_ using CORBA::string_alloc() a
-      // couple of lines below, you should then use CORBA::string_free()
-      // to release it!  In general use a single form of memory
-      // allocation for a field/variable to avoid new/free() and
-      // malloc/delete() mismatches.
-      // Ohh, and if you are going to use CORBA::string_alloc() &
-      // friends you may consider using CORBA::String_var to manage
-      // the memory automatically (though there may be forces that
-      // suggest otherwise).
-      delete [] this->host_;
-      this->host_ = 0;
-    }
+  {
+    // @@ You are setting this->host_ using CORBA::string_alloc() a
+    // couple of lines below, you should then use CORBA::string_free()
+    // to release it!  In general use a single form of memory
+    // allocation for a field/variable to avoid new/free() and
+    // malloc/delete() mismatches.
+    // Ohh, and if you are going to use CORBA::string_alloc() &
+    // friends you may consider using CORBA::String_var to manage
+    // the memory automatically (though there may be forces that
+    // suggest otherwise).
+    delete [] this->host_;
+    this->host_ = 0;
+  }
 
   this->host_ = CORBA::string_alloc (1 + cp - start);
   for (cp = this->host_; *start != ':'; *cp++ = *start++)
@@ -433,10 +501,11 @@ TAO_IIOP_Profile::parse_string (const char *string,
   cp = ACE_OS::strchr (start, '/');
 
   if (cp == 0)
-    {
-      CORBA::string_free (this->host_);
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
-    }
+  {
+    env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
+    CORBA::string_free (this->host_);
+    return -1;
+  }
 
   this->port_ = (CORBA::UShort) ACE_OS::atoi (start);
 
@@ -462,6 +531,12 @@ TAO_IIOP_Profile::parse_string (const char *string,
 //  this->object_addr_.set(this->port_, this->host_);
 // }
 
+const TAO_opaque&
+TAO_IIOP_Profile::body (void) const
+{
+  return this->body_;
+}
+
 void
 TAO_IIOP_Profile::create_body (void)
 {
@@ -494,14 +569,14 @@ TAO_IIOP_Profile::is_equivalent (TAO_Profile *other_profile,
     return 0;
 
   TAO_IIOP_Profile *op =
-    ACE_dynamic_cast (TAO_IIOP_Profile *, other_profile);
+                   ACE_dynamic_cast (TAO_IIOP_Profile *, other_profile);
 
   ACE_ASSERT (op->object_key_.length () < UINT_MAX);
 
-  return this->port_ == op->port_
-    && this->object_key_ == op->object_key_
-    && ACE_OS::strcmp (this->host_, op->host_) == 0
-    && this->version_ == op->version_;
+  return (  (this->port_       == op->port_)
+         && (this->object_key_ == op->object_key_)
+         && (ACE_OS::strcmp (this->host_, op->host_) == 0)
+         && (this->version_    == op->version_));
 }
 
 CORBA::ULong
@@ -528,6 +603,25 @@ TAO_IIOP_Profile::hash (CORBA::ULong max,
   return hashval % max;
 }
 
+ACE_Addr&
+TAO_IIOP_Profile::object_addr (const ACE_Addr *addr)
+{
+  const ACE_INET_Addr *inet_addr =
+    ACE_dynamic_cast (const ACE_INET_Addr *, addr);
+
+  if (inet_addr != 0)
+    this->object_addr_ = *inet_addr;
+  else if (this->host_)
+    this->object_addr_.set (this->port_, this->host_);
+  return this->object_addr_;
+}
+
+ACE_Addr&
+TAO_IIOP_Profile::object_addr (void)
+{
+  return this->object_addr_;
+}
+
 char *
 TAO_IIOP_Profile::addr_to_string(void)
 {
@@ -537,34 +631,77 @@ TAO_IIOP_Profile::addr_to_string(void)
   return s;
 }
 
-const char *
+char *
+TAO_IIOP_Profile::host (void)
+{
+  return this->host_;
+}
+
+char *
 TAO_IIOP_Profile::host (const char *h)
 {
   if (this->host_)
-    {
-      delete [] this->host_;
-      this->host_ = 0;
-    }
+  {
+    delete [] this->host_;
+    this->host_ = 0;
+  }
 
   if (h)
-    {
-      ACE_NEW_RETURN (this->host_,
-                      char[ACE_OS::strlen (h) + 1],
-                      0);
-      ACE_OS::strcpy (this->host_, h);
-    }
+  {
+    ACE_NEW_RETURN (this->host_,
+                    char[ACE_OS::strlen (h) + 1],
+                    0);
+    ACE_OS::strcpy (this->host_, h);
+  }
 
   return this->host_;
 }
 
+CORBA::UShort
+TAO_IIOP_Profile::port (void)
+{
+  return this->port_;
+}
+
+CORBA::UShort
+TAO_IIOP_Profile::port (CORBA::UShort p)
+{
+  return this->port_ = p;
+}
+
+Version *
+TAO_IIOP_Profile::version (void)
+{
+  return &this->version_;
+}
+
+Version *
+TAO_IIOP_Profile::version (Version *v)
+{
+  this->version_ = *v;
+  return &this->version_;
+}
+
 void
 TAO_IIOP_Profile::reset_hint (void)
 {
   if (this->hint_)
-    {
-      this->hint_->cleanup_hint ();
-      this->hint_ = 0;
-    }
+  {
+    this->hint_->cleanup_hint ();
+    this->hint_ = 0;
+  }
+}
+
+TAO_Client_Connection_Handler *&
+TAO_IIOP_Profile::hint(void)
+{
+  return this->hint_;
+}
+
+TAO_Profile *
+TAO_IIOP_Profile::_nil (void)
+{
+  return (TAO_IIOP_Profile *)0;
 }
 
 TAO_IIOP_Profile &
@@ -579,18 +716,18 @@ TAO_IIOP_Profile::operator= (const TAO_IIOP_Profile &src)
   this->port_ = src.port_;
 
   if (this->host_)
-    {
-      delete [] this->host_;
-      this->host_ = 0;
-    }
+  {
+    delete [] this->host_;
+    this->host_ = 0;
+  }
 
   if (src.host_)
-    {
-      ACE_NEW_RETURN (this->host_,
-                      char[ACE_OS::strlen (src.host_) + 1],
-                      *this);
-      ACE_OS::strcpy (this->host_, src.host_);
-    }
+  {
+    ACE_NEW_RETURN (this->host_,
+                    char[ACE_OS::strlen (src.host_) + 1],
+                    *this);
+    ACE_OS::strcpy (this->host_, src.host_);
+  }
 
   return *this;
 }
@@ -625,10 +762,33 @@ TAO_IIOP_Profile::_decr_refcnt (void)
   return 0;
 }
 
+
+void
+TAO_IIOP_Profile::fwd_profiles (TAO_MProfile *mprofiles)
+{
+  // we assume ownership of the profile list!!
+  if (fwd_profiles_)
+    delete this->fwd_profiles_;
+
+  this->fwd_profiles_ = new TAO_MProfile (mprofiles);
+
+}
+
+TAO_MProfile *
+TAO_IIOP_Profile::fwd_profiles (void)
+{
+  return this->fwd_profiles_;
+}
+
+TAO_MProfile *
+TAO_IIOP_Profile::get_fwd_profiles (void)
+{
+  return new TAO_MProfile (this->fwd_profiles_);
+}
+
 CORBA::String
 TAO_IIOP_Profile::to_string (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (env);
 
   CORBA::String_var key;
   TAO_POA::encode_sequence_to_string (key.inout(),
@@ -660,26 +820,25 @@ TAO_IIOP_Profile::to_string (CORBA::Environment &env)
 }
 
 const char *
-TAO_IIOP_Profile::prefix (void)
+TAO_IIOP_Profile::prefix ()
 {
   return ::prefix_;
 }
 
-int
-TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
+CORBA::TypeCode::traverse_status
+TAO_IIOP_Profile::encode (TAO_OutputCDR *&stream,
+                          CORBA::Environment &env)
 {
   // UNSIGNED LONG, tag for this protocol profile;
-  // @@ it seems like this is not a good separation of concerns, why
-  // do we write the TAG here? That's generic code and should be
-  // handled by the object reference writer (IMHO).
-  stream.write_ulong (TAO_IOP_TAG_INTERNET_IOP);
+  stream->write_ulong (TAO_IOP_TAG_INTERNET_IOP);
 
   // UNSIGNED LONG, number of succeeding bytes in the
   // encapsulation.  We don't actually need to make the
   // encapsulation, as nothing needs stronger alignment than
   // this longword; it guarantees the rest is aligned for us.
+  u_int hostlen;
 
-  CORBA::ULong hostlen = ACE_OS::strlen ((char *) this->host_);
+  hostlen = ACE_OS::strlen ((char *) this->host_);
   CORBA::ULong encap_len =
     1                              // byte order
     + 1                            // version major
@@ -692,23 +851,38 @@ TAO_IIOP_Profile::encode (TAO_OutputCDR &stream) const
     + ( hostlen & 02)              // optional pad short
     + 4                            // sizeof (key length)
     + this->object_key_.length (); // key length.
-  stream.write_ulong (encap_len);
+  stream->write_ulong (encap_len);
+
+#if 0
+  size_t current_len = stream->length ();
+#endif
 
   // CHAR describing byte order, starting the encapsulation
-  stream.write_octet (TAO_ENCAP_BYTE_ORDER);
+  stream->write_octet (TAO_ENCAP_BYTE_ORDER);
 
-  // IIOP::TAO_IOP_Version, two characters (version 1.0) padding
-  stream.write_char (this->version_.major);
-  stream.write_char (this->version_.minor);
+  // IIOP::Version, two characters (version 1.0) padding
+  stream->write_char (this->version_.major);
+  stream->write_char (this->version_.minor);
 
   // STRING hostname from profile
-  stream.write_string (this->host_);
+  stream->encode (CORBA::_tc_string, &this->host_, 0, env);
 
   // UNSIGNED SHORT port number
-  stream.write_ushort (this->port_);
+  stream->write_ushort (this->port_);
 
   // OCTET SEQUENCE for object key
-  stream << this->object_key_;
-
-  return 1;
+  stream->encode (TC_opaque, &this->object_key_, 0, env);
+
+#if 0
+      // This is good for debugging the computation of the key
+  // length.
+  size_t final_len = stream->length ();
+  ACE_DEBUG ((LM_DEBUG, "ObjRef::encode: "
+              "stored_len = %d, "
+              "real_len = %d\n",
+              encap_len,
+              final_len - current_len));
+#endif /* 0 */
+
+  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index 3a1081cb597..06f52bd7358 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -13,7 +13,7 @@
 //     IIOP profile specific processing
 //
 // = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
+//     Fred Kuhns
 //
 // ============================================================================
 
@@ -30,217 +30,173 @@ class TAO_Client_Connection_Handler;
 // TAO IIOP_Profile concrete Profile definitions
 class TAO_Export TAO_IIOP_Profile : public TAO_Profile
 {
-  // = TITLE
-  //   This class defines the protocol specific attributes required
-  //   for locating ORBs over a TCP/IP network.
-  //
-  // = DESCRIPTION
-  //   This class defines the IIOP profile as specified in the CORBA
-  //   specification.
 public:
-  // = Currently, TAO supports IIOP 1.0.
   enum
     {
       DEF_IIOP_MAJOR = 1,
       DEF_IIOP_MINOR = 0
     };
 
-  static const char *prefix (void);
-  // Return the char string prefix.
+  static const char *prefix ();
+  // return the char string prefix
 
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
+  TAO_IIOP_Profile (const ACE_INET_Addr& addr,
                     const char *object_key);
-  // Profile constructor, the port and host fileds are derived from
-  // addr.  This is not an efficient creator since a call to
-  // get_host_XX is required.
 
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor, same as above except the object_key has
-  // already been marshaled.
+  TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                    const TAO_ObjectKey& object_key);
 
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_IOP_Version &version,
+  TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                    const Version& version,
                     const char *object_key);
-  //  Profile constructor, explicitly define the protocol version.
 
-  TAO_IIOP_Profile (const ACE_INET_Addr &addr,
-                    const TAO_IOP_Version &version,
-                    const TAO_ObjectKey &object_key);
-  //  Profile constructor, explicitly define the protocol version.
+  TAO_IIOP_Profile (const ACE_INET_Addr& addr,
+                    const Version& version,
+                    const TAO_ObjectKey& object_key);
 
-  TAO_IIOP_Profile (const char *host,
+  TAO_IIOP_Profile (const char* host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key,
-		    const ACE_INET_Addr &addr);
-  //  Profile constructor, this is the most efficient since it
-  // doesn't require any address resolution processing.
+                    const TAO_ObjectKey& object_key,
+		    const ACE_INET_Addr& addr);
 
-  TAO_IIOP_Profile (const char *host,
+  TAO_IIOP_Profile (const char* host,
                     CORBA::UShort port,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor, the port and host fileds are specified
-  // but addr must be created rfom a call to get_host_byname which
-  // is expensive since it may go to DNS.
+                    const TAO_ObjectKey& object_key);
 
-  TAO_IIOP_Profile (const char *host,
+  TAO_IIOP_Profile (const char* host,
                     CORBA::UShort port,
-                    const TAO_IOP_Version &version,
-                    const TAO_ObjectKey &object_key);
-  //  Profile constructor, explicitly define the protocol version
+                    const Version& version,
+                    const TAO_ObjectKey& object_key);
 
-  TAO_IIOP_Profile (const char *string,
+  TAO_IIOP_Profile (const char* string,
                     CORBA::Environment &env);
-  // Create object using a string ior.
+  // crate object using string as ior
 
   TAO_IIOP_Profile (const TAO_IIOP_Profile *pfile);
-  // Profile copy constructor
 
   TAO_IIOP_Profile (const TAO_IIOP_Profile &pfile);
-  // Profile copy constructor
-
-  TAO_IIOP_Profile (const TAO_IOP_Version &version);
-  // Profile constructor, explicitly define the version.
+  
+  TAO_IIOP_Profile (const Version& version);
 
   TAO_IIOP_Profile (void);
-  // Profile constructor, default.
+  // All of the various creator methods ...
 
   ~TAO_IIOP_Profile (void);
-  // Destructor is to be called only through <_decr_refcnt>.
+  // Destructor is to be called only through _decr_refcnt()
+
+  CORBA::ULong tag (void);
+  // The tag, each concrete class will have a specific tag value.
+  // for example we are TAO_IOP_TAG_INTERNET_IOP
 
-  CORBA::ULong tag (void) const;
-  // The tag, each concrete class will have a specific tag value.  for
-  // example we are TAO_IOP_TAG_INTERNET_IOP.
+  TAO_Transport* transport (void);
+  // return a pointer to the underlying transport object.
+  // this will provide access to lower layer protocols
+  // and processing.
 
-  int parse (TAO_InputCDR& cdr,
-             CORBA::Boolean& continue_decoding,
+  int parse (TAO_InputCDR& cdr, 
+             CORBA::Boolean& continue_decoding, 
              CORBA::Environment &env);
-  // Initialize this object using the given CDR octet string.
+  // initialize this object using the given CDR octet string
 
-  int parse_string (const char *string,
-                    CORBA::Environment &env);
-  // Initialize this object using the given input string.
+  int parse_string (const char *string, CORBA::Environment &env);
+  // initialize this object using the given input string
 
   CORBA::String to_string (CORBA::Environment &env);
-  // Return a string representation for this profile.
+  // return a string representation for this profile.
   // client must deallocate memory.
 
   const TAO_opaque& body (void) const;
   // Create IIOP_Profile Object from marshalled data.
 
-  virtual int encode (TAO_OutputCDR &stream) const;
-  // Encode this profile in a stream, i.e. marshal it.
+  CORBA::TypeCode::traverse_status encode (TAO_OutputCDR *&stream,
+                                           CORBA::Environment &env);
 
   const TAO_ObjectKey &object_key (void) const;
-  // @@ deprecated, return a reference to the Object Key.
-
   TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-
+  // @@ depricated
   TAO_ObjectKey *_key (CORBA::Environment &env);
-  //  Return a pointer to the Object Key.
+
+  virtual void fwd_profiles (TAO_MProfile *mprofiles);
+  // object will assume ownership for this object!!
+
+  virtual TAO_MProfile *get_fwd_profiles (void);
+  // copy of MProfile, user must delete.
 
   CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
                                 CORBA::Environment &env);
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, port, host, object_key and
-  // version are the same.
+
 
   CORBA::ULong hash (CORBA::ULong max,
                      CORBA::Environment &env);
-  // Return a hash value for this object.
 
-  char *addr_to_string (void);
-  // Return a string representation for the address.
+  char *addr_to_string(void);
 
-  const ACE_INET_Addr &object_addr (void) const;
-  //  return a reference to the object_addr.
+  ACE_Addr &object_addr (const ACE_Addr *addr);
+  ACE_Addr &object_addr (void);
 
-  const char *host (void);
-  // Return a pointer to the host string.  This object maintains
-  // ownership of this string.
-
-  const char *host (const char *h);
-  // Copy the string h into host and return the resulting pointer.
-  // This object maintains ownership of this string.
+  char *host (void);
+  char *host (const char *h);
 
   CORBA::UShort port (void);
-  // Return the port number.
-
   CORBA::UShort port (CORBA::UShort p);
-  // Set the port number.
 
-  const TAO_IOP_Version *version (void);
-  // Return a pointer to this profile's version.  This object
-  // maintains ownership.
-
-  const TAO_IOP_Version *version (TAO_IOP_Version *v);
-  // First set the version then return a pointer to it.  This object
-  // maintains ownership.
+  Version *version (void);
+  Version *version (Version *v);
 
   TAO_Client_Connection_Handler *&hint (void);
-  //  This is a hint for which connection handler to use.
-
   void reset_hint (void);
-  //  Reset the hint's value.
 
   TAO_Profile *_nil (void);
-  // Return a null object pointer.
-
   TAO_IIOP_Profile &operator= (const TAO_IIOP_Profile &src);
-  // Copy operator.
 
   virtual CORBA::ULong _incr_refcnt (void);
-  // Increase the reference count by one on this object.
-
   virtual CORBA::ULong _decr_refcnt (void);
-  // Decrement the object's reference count.  When this count goes to
-  // 0 this object will be deleted.
+
+  // @@ Move these to privte when decode is done!
+  char *host_;
+  // Maybe just a <char*> to reduce memory allocation..
+  CORBA::UShort port_;
+  // TCP port number
 
 private:
-  int set (const ACE_INET_Addr &addr);
+  int set (const ACE_INET_Addr& addr);
   // helper method to set the INET_Addr.
 
+  virtual TAO_MProfile *fwd_profiles (void);
+  // this object keeps ownership of this object
+  // NOT THREAD SAFE
+
   void create_body (void);
-  // Does the work for <add_profile>.
+  // does the work for add_profile.
 
 private:
-
-  char *host_;
-  // String representing the hosts name.
-
-  CORBA::UShort port_;
-  // TCP port number
-
   CORBA::ULong tag_;
-  // The tag.
+  // The tag, 
 
   TAO_opaque body_;
-  // Marshaled profile (CDR).
+  // marshaled profile (CDR).
 
-  TAO_IOP_Version version_;
+  Version version_;
   // IIOP version number.
 
   TAO_ObjectKey object_key_;
   // object_key associated with this profile.
 
   ACE_INET_Addr object_addr_;
-  // Cached instance of <ACE_INET_Addr> for use in making
+  // Cached instance of <ACE_INET_Addr> for use in making 
   // invocations, etc.
-
+  
   TAO_Client_Connection_Handler *hint_;
-  // Pointer to a connection handler which we successfully used
-  // already.
 
   ACE_SYNCH_MUTEX refcount_lock_;
-  // Mutex to protect reference count.
+  // Mutex to protect reference count
 
   CORBA::ULong refcount_;
   // Number of outstanding references to this object.
-};
 
-#if defined (__ACE_INLINE__)
-# include "tao/IIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
+  TAO_MProfile *fwd_profiles_;
+  // list of profiles which we should try forwarding on.
+
+};
 
 #endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Profile.i b/TAO/tao/IIOP_Profile.i
deleted file mode 100644
index 4b14f5bf659..00000000000
--- a/TAO/tao/IIOP_Profile.i
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-
-ACE_INLINE CORBA::ULong
-TAO_IIOP_Profile::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_IIOP_Profile::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey &
-TAO_IIOP_Profile::object_key (TAO_ObjectKey& objkey)
-{
-  this->object_key_ = objkey;
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_IIOP_Profile::_key (CORBA::Environment &)
-{
-  return new TAO_ObjectKey (this->object_key_);
-}
-
-ACE_INLINE const TAO_opaque&
-TAO_IIOP_Profile::body (void) const
-{
-  return this->body_;
-}
-
-ACE_INLINE const ACE_INET_Addr&
-TAO_IIOP_Profile::object_addr (void) const
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE const char *
-TAO_IIOP_Profile::host (void)
-{
-  return this->host_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Profile::port (void)
-{
-  return this->port_;
-}
-
-ACE_INLINE CORBA::UShort
-TAO_IIOP_Profile::port (CORBA::UShort p)
-{
-  return this->port_ = p;
-}
-
-ACE_INLINE const TAO_IOP_Version *
-TAO_IIOP_Profile::version (void)
-{
-  return &this->version_;
-}
-
-ACE_INLINE const TAO_IOP_Version *
-TAO_IIOP_Profile::version (TAO_IOP_Version *v)
-{
-  this->version_ = *v;
-  return &this->version_;
-}
-
-ACE_INLINE TAO_Client_Connection_Handler *&
-TAO_IIOP_Profile::hint(void)
-{
-  return this->hint_;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_IIOP_Profile::_nil (void)
-{
-  return (TAO_IIOP_Profile *)0;
-}
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index fa7a726abb0..45a736fd93c 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -1,44 +1,21 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+// ============================================================================
+//
+// = LIBRARY
+//
+// = FILENAME
+//
+// = DESCRIPTION
+//
+// = AUTHOR
+//
+// ============================================================================
+
 #include "tao/IIOP_Transport.h"
 #include "tao/GIOP.h"
 #include "tao/Connect.h"
-#include "tao/Timeprobe.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Transport_Timeprobe_Description[] =
-  {
-    "IIOP_Transport::send - start",
-    "IIOP_Transport::send - end",
-
-    "IIOP_Transport::receive - start",
-    "IIOP_Transport::recieve - end",
-
-    "IIOP_Client_Transport::send_request - start",
-    "IIOP_Client_Transport::send_request - end"
-  };
-
-enum
-  {
-    TAO_IIOP_TRANSPORT_SEND_START = 1200,
-    TAO_IIOP_TRANSPORT_SEND_END,
-
-    TAO_IIOP_TRANSPORT_RECEIVE_START,
-    TAO_IIOP_TRANSPORT_RECEIVE_END,
-
-    TAO_IIOP_CLIENT_TRANSPORT_SEND_REQUEST_START,
-    TAO_IIOP_CLIENT_TRANSPORT_SEND_REQUEST_END
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description,
-                                  TAO_IIOP_TRANSPORT_SEND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
 
 TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Handler_Base* handler)
   : handler_(handler),
@@ -46,29 +23,29 @@ TAO_IIOP_Transport::TAO_IIOP_Transport (TAO_IIOP_Handler_Base* handler)
 {
 }
 
-TAO_IIOP_Transport::~TAO_IIOP_Transport (void)
+TAO_IIOP_Transport::~TAO_IIOP_Transport ()
 {
 }
 
 TAO_IIOP_Server_Transport::TAO_IIOP_Server_Transport (TAO_Server_Connection_Handler *handler)
-  : TAO_IIOP_Transport(handler),
-    server_handler_ (0)
+  :  TAO_IIOP_Transport(handler),
+     server_handler_ (0)
 {
-  server_handler_ = handler;
+     server_handler_ = handler;
 }
 
 TAO_IIOP_Client_Transport::TAO_IIOP_Client_Transport (TAO_Client_Connection_Handler *handler)
   :  TAO_IIOP_Transport(handler),
      client_handler_ (0)
 {
-  client_handler_ = handler;
+     client_handler_ = handler;
 }
 
-TAO_IIOP_Server_Transport::~TAO_IIOP_Server_Transport (void)
+TAO_IIOP_Server_Transport::~TAO_IIOP_Server_Transport ()
 {
 }
 
-TAO_IIOP_Client_Transport::~TAO_IIOP_Client_Transport (void)
+TAO_IIOP_Client_Transport::~TAO_IIOP_Client_Transport ()
 {
 }
 
@@ -115,19 +92,22 @@ TAO_IIOP_Transport::_nil (void)
 }
 
 void
-TAO_IIOP_Transport::resume_connection (ACE_Reactor *reactor)
+TAO_IIOP_Transport::resume_conn (ACE_Reactor *reactor)
 {
-  this->handler_->resume_handler (reactor);
+  int result = reactor->resume_handler (this->handler_);
+  // @@ Are these needed!!
+  ACE_UNUSED_ARG (result);
+  ACE_ASSERT (result == 0);
 }
 
 void
-TAO_IIOP_Transport::close_connection (void)
+TAO_IIOP_Transport::close_conn ()
 {
   this->handler_->handle_close ();
 }
 
 ACE_HANDLE
-TAO_IIOP_Transport::handle (void)
+TAO_IIOP_Transport::handle(void)
 {
   return this->handler_->get_handle ();
 }
@@ -137,8 +117,6 @@ TAO_IIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
                                          TAO_OutputCDR &stream,
                                          int twoway)
 {
-  ACE_FUNCTION_TIMEPROBE (TAO_IIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
-
   return this->client_handler_->send_request (orb_core, stream, twoway);
 }
 
@@ -149,122 +127,149 @@ TAO_IIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
 //   return 1;
 // }
 
+// @@ TODO: this is a good candidate for an ACE routine, even more,
+// all the code to write a Message_Block chain could be encapsulated
+// in ACE.
 ssize_t
-TAO_IIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
+TAO_IIOP_Transport::do_sendv (const iovec *iov, int iovcnt, int total_bytes)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
+  ssize_t writelen = 0;
+  ACE_HANDLE h = this->handler_->get_handle ();
 
-  ACE_UNUSED_ARG (s);
+  // @@ would using writev instead of readv affect performance
+  //    on WIN32?? fredk
+  ssize_t n = ACE_OS::sendv (h, iov, iovcnt);
 
-  // For the most part this was copied from GIOP::send_request and
-  // friends.
+  if (n == -1 || n == total_bytes)
+  {
+    // either an error occured or we sent all the bytes!
+    // in either case we are done.
+    return n;
+  }
+
+  // for some reason we didn't send all the data.  Keep trying.
+  // should be the exception ... we also copy the iovec to a temp
+  // var so it can be manipulated without violating the const'ness
+  // of iov.
+  iovec *tmp_iov = ACE_const_cast(iovec *, iov);
+  writelen = n;
+  int s = 0;
+  size_t offset = n;
+
+  // iovcnt > 0, iov{0] ... iov[iovcnt-1]
+  while ( writelen < total_bytes )
+  {
+    // if n < iov_len then not all the bytes were sent from the
+    // current iov buf.  NOTE, we do a ACE_static_cast so that we can
+    // have n = -1.  That is, iov_len is an unsigned long but n is a
+    // signed long.
+    while (s < iovcnt  &&
+           offset >= ACE_static_cast (size_t, tmp_iov[s].iov_len))
+    {
+      offset -= tmp_iov[s].iov_len;
+      s++;
+    } // while
 
-  // @@ Fred, this should NOT be a local constant...  It should use a
-  // macro defined in OS.h...
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-  ssize_t n = 0;
-  ssize_t nbytes = 0;
+    char* base = ACE_reinterpret_cast (char*, tmp_iov[s].iov_base);
+    size_t len = tmp_iov[s].iov_len;
 
-  for (const ACE_Message_Block *i = mblk;
-       i != 0;
-       i = i->cont ())
-    {
-      // Make sure there is something to send!
-      if (i->length () > 0)
-        {
-          iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = i->length ();
-          iovcnt++;
-
-          // The buffer is full make a OS call.  @@ TODO this should
-          // be optimized on a per-platform basis, for instance, some
-          // platforms do not implement writev() there we should copy
-          // the data into a buffer and call send_n(). In other cases
-          // there may be some limits on the size of the iovec, there
-          // we should set IOV_MAX to that limit.
-          if (iovcnt == IOV_MAX)
-            {
-              n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                   iovcnt);
-              if (n < 1)
-                return n;
-
-              nbytes += n;
-              iovcnt = 0;
-            }
-        }
-    }
-
-  // Check for remaining buffers to be sent!
-  if (iovcnt != 0)
-    {
-      n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                           iovcnt);
-      if (n < 1)
-        return n;
+    tmp_iov[s].iov_base = base + offset;
+    tmp_iov[s].iov_len  = len - offset;
+    n = ACE_OS::sendv (h, (const iovec *)(iov + s), iovcnt - s);
+    tmp_iov[s].iov_base = base;
+    tmp_iov[s].iov_len = len;
+
+    if ( n == -1 )
+      return n;
 
-      nbytes += n;
-    }
+    offset += n;
+    writelen += n;
 
-  return nbytes;
+  } // outer while (s < iovcnt), that is send *all* data!
+  return writelen;
 }
 
 ssize_t
-TAO_IIOP_Transport::send (const u_char *buf,
-                          size_t len,
-                          ACE_Time_Value *s)
+TAO_IIOP_Transport::send (const ACE_Message_Block *mblk)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
+//  if ( this->handler_ == 0)
+//    return -1;
+  // For the most part this was copied from GIOP::send_request
+  // and friends.
+  const int TAO_WRITEV_MAX = 16;
+  iovec iov[TAO_WRITEV_MAX];
+  int iovcnt = 0, totlen=0;
+  ssize_t n=0, nbytes=0;
+  for (const ACE_Message_Block *i = mblk; i ; i = i->cont ()) {
+    // Make sure there is something to send!
+    if (i->length () > 0) {
+      iov[iovcnt].iov_base = i->rd_ptr ();
+      iov[iovcnt].iov_len  = i->length ();
+      totlen += i->length ();
+      iovcnt++;
+
+
+      // The buffer is full make a OS call.
+      // @@ TODO this should be optimized on a per-platform basis, for
+      // instance, some platforms do not implement writev() there we
+      // should copy the data into a buffer and call send_n(). In
+      // other cases there may be some limits on the size of the
+      // iovec, there we should set TAO_WRITEV_MAX to that limit.
+      if (iovcnt == TAO_WRITEV_MAX)
+      {
+        if ( (n = do_sendv ((const iovec *) iov, iovcnt, totlen)) < 1)
+          return n;
+
+        nbytes += n;
+        iovcnt = totlen = 0;
+
+      } // iovcnt == TAO_WRITEV_MAX
+    } // i->length () > 0
+  } // for ( over message blocks, in groups of TAO_WRITEV_MAX )
+
+  // check for remaining buffers to be sent!
+  if (iovcnt != 0)
+  {
+    if ( (n = do_sendv ((const iovec *)iov, iovcnt, totlen)) < 0 )
+      return 0;
 
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().send_n (buf, len);
+    nbytes += n;
+
+  } // iovcnt != 0
+
+  return nbytes;  // success
 }
 
 ssize_t
-TAO_IIOP_Transport::send (const iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *s)
+TAO_IIOP_Transport::send (const u_char *buf, size_t len)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_SEND_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                          iovcnt);
+  // @@ could have used handler_->peer()->send_n()
+  return ACE::send_n (this->handler_->get_handle(), buf, len);
 }
 
 ssize_t
-TAO_IIOP_Transport::recv (char *buf,
-                          size_t len,
-                          ACE_Time_Value *s)
+TAO_IIOP_Transport::send (const iovec *iov, int iovcnt)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().recv_n (buf, len);
+  int totlen = 0;
+  for (int i = 0; i <= iovcnt  ; i++)
+    totlen += iov[i].iov_len;
+  return do_sendv (iov, iovcnt, totlen);
 }
 
 ssize_t
-TAO_IIOP_Transport::recv (char *buf,
-                          size_t len,
-                          int flags,
-                          ACE_Time_Value *s)
+TAO_IIOP_Transport::receive(char *buf, size_t len)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().recv_n (buf,
-                                         len,
-                                         flags);
+  return ACE::recv_n (this->handler_->get_handle (), buf, len);
 }
 
 ssize_t
-TAO_IIOP_Transport::recv (iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *s)
+TAO_IIOP_Transport::receive(char *buf, size_t len, int flags)
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_IIOP_TRANSPORT_RECEIVE_START);
+  return ACE::recv_n (this->handler_->get_handle (), buf, len, flags);
+}
 
-  ACE_UNUSED_ARG (s);
-  return handler_->peer ().recvv_n (iov, iovcnt);
+ssize_t
+TAO_IIOP_Transport::receive(iovec *iov, int iovcnt)
+{
+  return ACE_OS::readv(this->handler_->get_handle (), iov, iovcnt);
 }
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 5168c633cc8..7515d9446ba 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -13,7 +13,7 @@
 //     IIOP Transport specific processing
 //
 // = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
+//     Fred Kuhns
 //
 // ============================================================================
 
@@ -22,156 +22,92 @@
 
 #include "tao/Pluggable.h"
 
-// Forward decls.
 class TAO_IIOP_Handler_Base;
 class TAO_Client_Connection_Handler;
 class TAO_Server_Connection_Handler;
 class TAO_ORB_Core;
 
-class TAO_Export TAO_IIOP_Transport : public TAO_Transport
+class TAO_IIOP_Transport : public TAO_Transport
 {
-  // = TITLE
-  //   This class acts as a bridge class to the transport specific 
-  //   connection handler (handler_).  
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
 public:
-  TAO_IIOP_Transport (TAO_IIOP_Handler_Base *handler);
-  // Base object's creator method. 
 
-  ~TAO_IIOP_Transport (void);
-  // Default destructor.
+  TAO_IIOP_Transport (TAO_IIOP_Handler_Base* handler);
+  ~TAO_IIOP_Transport ();
 
   CORBA::ULong tag (void);
-  // Returns the specific IOP instance, in this case IIOP.
 
-  void close_connection (void);
-  // Call the corresponding connection handlers handle_close method.
-
-  void resume_connection (ACE_Reactor *reactor);
-  // Calls the reactors resume_handler on behalf of the corresponding
-  // connection handler.
+  void close_conn (void);
+  void resume_conn (ACE_Reactor *reactor);
 
   int idle (void);
-  // Idles the corresponding connection handler.
-
-  TAO_IIOP_Handler_Base *&handler (void);
-  // Return a reference to the corresponding connection handler.
-
-  int is_nil (TAO_Transport *obj);
-  // Returns 0 if the obj is 0, else 1.
-
-  TAO_Transport *_nil (void);
-  // Return a NULL pointer of type TAO_Transport *.
-
-  ACE_HANDLE handle (void);
-  // Return the underlying connection handle.
-
-  ssize_t send (const ACE_Message_Block *mblk,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the Message_Block to the connection.
-
-  ssize_t send (const u_char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the buffer of length len to the connection.
 
-  ssize_t send (const iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  // Write the contents of iovcnt iovec's to the connection.
+  TAO_IIOP_Handler_Base*& handler (void);
+  virtual int is_nil (TAO_Transport *obj);
+  virtual TAO_Transport *_nil (void);
 
-  ssize_t recv (char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf.
+  ACE_HANDLE handle(void);
 
-  ssize_t recv (char *buf,
-                size_t len,
-                int flags,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf using flags.
+  virtual ssize_t send (const ACE_Message_Block *mblk);
+  virtual ssize_t send (const u_char *buf, size_t len);
+  virtual ssize_t send (const iovec *iov, int iovcnt);
 
-  ssize_t recv (iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  //  Read received data into the iovec buffers.
+  virtual ssize_t receive (char *buf, size_t len);
+  virtual ssize_t receive (char *buf, size_t len, int flags);
+  virtual ssize_t receive (iovec *iov, int iovcnt);
 
-  // @@ Fred, why is this method defined inline?  It should be defined
-  // in the *.cpp file!
-  virtual int send_request (TAO_ORB_Core *  /* orb_core */,
-                            TAO_OutputCDR & /* stream   */,
-                            int             /* twoway   */) { return -1; };
-  // Default action to be taken for send request.
+  int send_request (TAO_ORB_Core * /* orb_core */,
+                    TAO_OutputCDR & /* stream */,
+                    int /* twoway */) { return -1; }
 
 protected:
+
   TAO_IIOP_Handler_Base *handler_;
-  // the connection service handler used for accessing lower layer
-  // communication protocols.
+  // the connection service handler used for accessing
+  // lower layer communication protocols.
 
   CORBA::ULong tag_;
   // IIOP tag.
+
+  ssize_t do_sendv (const iovec *iov, int iovcnt, int total_bytes);
+
 };
 
-class TAO_Export TAO_IIOP_Client_Transport : public TAO_IIOP_Transport
+class TAO_IIOP_Client_Transport : public TAO_IIOP_Transport
 {
-  // = TITLE
-  //   The Transport class used for Client side communication with a
-  //   server.
-  // 
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
 public:
+
   TAO_IIOP_Client_Transport (TAO_Client_Connection_Handler *handler);
-  // Constructor.  Note, TAO_IIOP_Handler_Base is the base class for
-  // both TAO_Client_Connection_Handler and
+  // constructor.  Note, TAO_IIOP_Handler_Base is the base
+  // class for both TAO_Client_Connection_Handler and
   // TAO_Server_Connection_Handler.
 
-  ~TAO_IIOP_Client_Transport (void);
+  ~TAO_IIOP_Client_Transport();
   // destructor
 
-  TAO_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
+  TAO_Client_Connection_Handler* client_handler (void);
 
   int send_request (TAO_ORB_Core *orb_core,
                     TAO_OutputCDR &stream,
                     int twoway);
-  // This is a bridge method for the connection handlers
-  // <send_request> method.  The connection handler is responsible for
-  // concurrency strategies, typically using the leader-follower
-  // pattern.
-
 private:
   TAO_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
 };
 
-class TAO_Export TAO_IIOP_Server_Transport : public TAO_IIOP_Transport
+class TAO_IIOP_Server_Transport : public TAO_IIOP_Transport
 {
-  // = TITLE
-  //   The Transport class used for server communication with a
-  //   connected client.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
 public:
 
   TAO_IIOP_Server_Transport (TAO_Server_Connection_Handler *handler);
-  //  Default creator method.
 
-  ~TAO_IIOP_Server_Transport (void);
-  // Default destructor
+  ~TAO_IIOP_Server_Transport ();
+  // destructor
 
-  TAO_Server_Connection_Handler *server_handler (void);
-  //  Return a pointer to the underlying connection handler. 
+  TAO_Server_Connection_Handler* server_handler (void);
 
 //  virtual int send_response (TAO_OutputCDR &response);
-  // @@ Fred, should this method be removed?
 
 private:
   TAO_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
 };
 
 #endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
deleted file mode 100644
index cbe469fbc53..00000000000
--- a/TAO/tao/IOP.pidl
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// $Id$
-//
-
-module IOP
-{
-  typedef unsigned long ComponentId;
-  typedef unsigned long ServiceId;
-};
diff --git a/TAO/tao/InconsistentTypeCodeC.cpp b/TAO/tao/InconsistentTypeCodeC.cpp
index a876b606ba3..54a189c1cf8 100644
--- a/TAO/tao/InconsistentTypeCodeC.cpp
+++ b/TAO/tao/InconsistentTypeCodeC.cpp
@@ -23,13 +23,8 @@
 // ======================================================================
 
 #include "tao/InconsistentTypeCodeC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/ORB.h"
 
-ACE_RCSID(tao, InconsistentTypeCodeC, "$Id$")
-
 // default constructor
 CORBA_ORB_InconsistentTypeCode::CORBA_ORB_InconsistentTypeCode (void)
   : CORBA_UserException (CORBA::ORB::_tc_InconsistentTypeCode)
@@ -60,12 +55,12 @@ CORBA_ORB_InconsistentTypeCode::operator= (
 }
 
 // narrow
-CORBA_ORB_InconsistentTypeCode*
+CORBA_ORB_InconsistentTypeCode* 
 CORBA_ORB_InconsistentTypeCode::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0",
+  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0", 
                        exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_ORB_InconsistentTypeCode*,
+    return ACE_dynamic_cast (CORBA_ORB_InconsistentTypeCode*, 
                              exc);
   else
     return 0;
@@ -83,4 +78,3 @@ CORBA::Exception *CORBA_ORB_InconsistentTypeCode::_alloc (void)
   return new CORBA_ORB_InconsistentTypeCode;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/InconsistentTypeCodeC.h b/TAO/tao/InconsistentTypeCodeC.h
index b826fd382eb..272828abbe6 100644
--- a/TAO/tao/InconsistentTypeCodeC.h
+++ b/TAO/tao/InconsistentTypeCodeC.h
@@ -1,6 +1,5 @@
 /* -*- C++ -*- */
 // $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -18,17 +17,14 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 //
-// Modified by Jeff Parsons <parsons@cs.wustl.edu>
+//
+// Modified by Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ============================================================================
 
 #ifndef TAO_IDL_INCONSISTENTTYPECODEC_H
 #define TAO_IDL_INCONSISTENTTYPECODEC_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Exception.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -42,33 +38,25 @@
 #if !defined (_CORBA_ORB_INCONSISTENTTYPECODE_CH_)
 #define _CORBA_ORB_INCONSISTENTTYPECODE_CH_
 
-class TAO_Export CORBA_ORB_InconsistentTypeCode : public CORBA::UserException
-{
-  // = TITLE
-  //   Exception class generated by the TAO IDL compiler.
-  //
-  // = DESCRIPTION
-  //   This exception is thrown in the ORB create_dyn_any(TypeCode) factory
-  //   function if the typecode argument is neither a basic type nor a
-  //   sequence, enum, array, struct or union.
-public:
-  CORBA_ORB_InconsistentTypeCode (void);
-  // default ctor
-  CORBA_ORB_InconsistentTypeCode (const CORBA_ORB_InconsistentTypeCode &);
-  // copy ctor
-  ~CORBA_ORB_InconsistentTypeCode (void);
-  // dtor
+  class TAO_Export CORBA_ORB_InconsistentTypeCode : public CORBA::UserException
+    {
+    public:
+      CORBA_ORB_InconsistentTypeCode (void); // default ctor
+      CORBA_ORB_InconsistentTypeCode (const CORBA_ORB_InconsistentTypeCode &); // copy ctor
+      ~CORBA_ORB_InconsistentTypeCode (void); // dtor
 
-  CORBA_ORB_InconsistentTypeCode &operator= (const CORBA_ORB_InconsistentTypeCode &);
+      CORBA_ORB_InconsistentTypeCode &operator= (const CORBA_ORB_InconsistentTypeCode &);
 
-  virtual void _raise (void);
+      virtual void _raise (void);
 
-  static CORBA_ORB_InconsistentTypeCode *_narrow (CORBA::Exception *);
+      static CORBA_ORB_InconsistentTypeCode *_narrow (CORBA::Exception *);
 
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
 
-};
+      // = TAO extension
+      static CORBA::Exception *_alloc (void);
+
+    }; // exception CORBA::ORB::InconsistentTypeCode
+
 
 #endif /* end #if !defined */
 
@@ -76,6 +64,4 @@ public:
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_IDL_INCONSISTENTTYPECODEC_H */
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index b103f7aebfb..501fd423365 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -5,8 +5,6 @@
 #include "tao/Principal.h"
 
 #include "tao/Timeprobe.h"
-#include "tao/Object_KeyC.h"
-#include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Invocation.i"
@@ -16,34 +14,28 @@ ACE_RCSID(tao, Invocation, "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_Invocation_Timeprobe_Description[] =
-  {
-    "GIOP_Invocation::invoke - start",
-    "GIOP_Invocation::invoke - end",
-
-    "GIOP_Invocation::start - enter",
-    "GIOP_Invocation::start - leave",
-    "GIOP_Invocation::start - connect",
-    "GIOP_Invocation::start - start_msg",
-    "GIOP_Invocation::start - request_hdr"
-  };
+  static const char *TAO_Invocation_Timeprobe_Description[] =
+{
+  "GIOP_Invocation::start - enter",
+  "GIOP_Invocation::start - leave",
+  "GIOP_Invocation::start - connect",
+  "GIOP_Invocation::start - start_msg",
+  "GIOP_Invocation::start - request_hdr"
+};
 
 enum
-  {
-    TAO_GIOP_INVOCATION_INVOKE_START = 1000,
-    TAO_GIOP_INVOCATION_INVOKE_END,
-
-    TAO_GIOP_INVOCATION_START_ENTER,
-    TAO_GIOP_INVOCATION_START_LEAVE,
-    TAO_GIOP_INVOCATION_START_CONNECT,
-    TAO_GIOP_INVOCATION_START_START_MSG,
-    TAO_GIOP_INVOCATION_START_REQUEST_HDR
-  };
+{
+  TAO_GIOP_INVOCATION_START_ENTER = 1000,
+  TAO_GIOP_INVOCATION_START_LEAVE,
+  TAO_GIOP_INVOCATION_START_CONNECT,
+  TAO_GIOP_INVOCATION_START_START_MSG,
+  TAO_GIOP_INVOCATION_START_REQUEST_HDR
+};
 
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Invocation_Timeprobe_Description,
-                                  TAO_GIOP_INVOCATION_INVOKE_START);
+                                  TAO_GIOP_INVOCATION_START_ENTER);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
@@ -63,18 +55,17 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Invocation_Timeprobe_Description,
 // call.  That is less disruptive (and error prone) in general than
 // restructuring an ORB core in terms of asynchrony.
 
-TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
+TAO_GIOP_Invocation::TAO_GIOP_Invocation (STUB_Object *data,
                                           const char *operation,
                                           TAO_ORB_Core* orb_core)
-  : stub_ (stub),
+  : data_ (data),
     opname_ (operation),
     my_request_id_ (0),
-    out_stream_ (buffer, sizeof buffer, /* ACE_CDR::DEFAULT_BUFSIZE */
+    out_stream_ (buffer, sizeof buffer, /* CDR::DEFAULT_BUFSIZE */
                  TAO_ENCAP_BYTE_ORDER,
                  orb_core->output_cdr_buffer_allocator (),
                  orb_core->output_cdr_dblock_allocator ()),
-    orb_core_ (orb_core),
-    transport_ (0)
+    orb_core_ (orb_core)
 {
   // @@ TODO The comments here are scary, can someone please give me a
   // warm fuzzy feeling about this (coryan).
@@ -96,8 +87,8 @@ TAO_GIOP_Invocation::TAO_GIOP_Invocation (TAO_Stub *stub,
 
 TAO_GIOP_Invocation::~TAO_GIOP_Invocation (void)
 {
-  if (this->transport_ != 0)
-    this->transport_->idle ();
+  if (this->data_->profile_in_use ()->transport () != 0)
+    this->data_->profile_in_use ()->transport ()->idle ();
 }
 
 // The public API involves creating an invocation, starting it, filling
@@ -109,10 +100,8 @@ void
 TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
                             TAO_GIOP::Message_Type message_type,
                             CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
-  TAO_MINIMAL_TIMEPROBE (TAO_GIOP_INVOCATION_START_ENTER);
 
   // First try to bind to the appropriate address.  We do that here
   // since we may get forwarded to a different objref in the course of
@@ -132,49 +121,23 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
 
   // @@ assert is evil, it crashes the program, changed to an
   // exception (coryan)
-  // assert (this->stub_ != 0);
+  // assert (this->data_ != 0);
 
-  if (this->stub_ == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
+  if (this->data_ == 0)
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
   // Get a pointer to the connector registry, which might be in
   // thread-specific storage, depending on the concurrency model.
   TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry ();
 
-  if (conn_reg == 0)
-    ACE_THROW (CORBA::INTERNAL ());
-
-  // @@ It seems like this is the right spot to re-order the profiles
-  // based on the policies in the ORB.
-  // The following text was here:
-  //     The connection registry is also responsible for selecting the
-  //     profile to use based on some policy or the current forwarding
-  //     state.
-  // IMHO this is not right, the connector registry only finds one
-  // connector for the given policies, if the connector is not
-  // available (say the user wants an ATM connection, but we don't
-  // have the protocol) then we give it another profile to try.
-
-  // Loop until a connection is established or there aren't any more
-  // profiles to try.
- for (;;)
-    {
-      // Get the current profile...
-      this->profile_ = this->stub_->profile_in_use ();
-
-      if (this->transport_ != 0)
-        this->transport_->idle ();
-      int result = conn_reg->connect (this->stub_, this->transport_);
-      if (result == 0)
-        break;
-
-      // Try moving to the next profile and starting over, if that
-      // fails then we must raise the TRANSIENT exception.
-      if (this->stub_->next_profile_retry () == 0)
-        ACE_THROW (CORBA::TRANSIENT ());
-    }
+  // The connection registry is also responsible for selecting the
+  // profile to use based on some policy or the current forwarding state.
+  // We will use the returned profile
+  // Note: data_->profile_in_use () == profile
+  TAO_Profile *profile = conn_reg->connect (this->data_, ACE_TRY_ENV);
+  ACE_CHECK;
 
-  const TAO_ObjectKey& key = this->profile_->object_key();
+  const TAO_ObjectKey *key = &profile->object_key();
 
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_CONNECT);
 
@@ -198,10 +161,13 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
 
   // Build the outgoing message, starting with generic GIOP header.
 
-  if (TAO_GIOP::start_message (message_type,
-                               this->out_stream_,
-                               this->orb_core_) == 0)
-    ACE_THROW (CORBA::MARSHAL ());
+  CORBA::Boolean bt =
+    TAO_GIOP::start_message (message_type,
+                             this->out_stream_,
+                             this->orb_core_);
+
+  if (bt != 1)
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG);
 
@@ -239,15 +205,14 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip,
 
     case TAO_GIOP::LocateRequest:
       this->out_stream_ << this->my_request_id_;
-      this->out_stream_ << key;
+      this->out_stream_ << *key;
       break;
 
     default:
-      ACE_THROW (CORBA::INTERNAL ());
+      ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO));
     }
-
   if (!this->out_stream_.good_bit ())
-    ACE_THROW (CORBA::MARSHAL ());
+    ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO));
 
   ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR);
 }
@@ -257,14 +222,14 @@ TAO_GIOP_Invocation::write_request_header_std
      (const TAO_GIOP_ServiceContextList& svc_ctx,
       CORBA::ULong request_id,
       CORBA::Boolean is_roundtrip,
-      const TAO_opaque& key,
+      const TAO_opaque* key,
       const char* opname,
       CORBA::Principal_ptr principal)
 {
   this->out_stream_ << svc_ctx;
   this->out_stream_ << request_id;
   this->out_stream_ << CORBA::Any::from_boolean (is_roundtrip);
-  this->out_stream_ << key;
+  this->out_stream_ << *key;
   this->out_stream_ << opname;
   this->out_stream_ << principal;
   return 1;
@@ -275,13 +240,13 @@ TAO_GIOP_Invocation::write_request_header_lite
      (const TAO_GIOP_ServiceContextList&,
       CORBA::ULong request_id,
       CORBA::Boolean is_roundtrip,
-      const TAO_opaque& key,
+      const TAO_opaque* key,
       const char* opname,
       CORBA::Principal_ptr)
 {
   this->out_stream_ << request_id;
   this->out_stream_ << CORBA::Any::from_boolean (is_roundtrip);
-  this->out_stream_ << key;
+  this->out_stream_ << *key;
   this->out_stream_ << opname;
   return 1;
 }
@@ -291,7 +256,7 @@ TAO_GIOP_Invocation::write_request_header
      (const TAO_GIOP_ServiceContextList& svc_ctx,
       CORBA::ULong request_id,
       CORBA::Boolean is_roundtrip,
-      const TAO_opaque& key,
+      const TAO_opaque* key,
       const char* opname,
       CORBA::Principal_ptr principal)
 {
@@ -315,54 +280,44 @@ TAO_GIOP_Invocation::write_request_header
 // Send request, block until any reply comes back, and unmarshal reply
 // parameters as appropriate.
 
-int
+TAO_GIOP_ReplyStatusType
 TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip,
                              CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // Send Request, return on error or if we're done
 
-  if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      TAO_INVOKE_EXCEPTION);
-
-  int result =
-    this->transport_->send_request (this->orb_core_,
-                                    this->out_stream_,
-                                    is_roundtrip);
-
-  //
-  // @@ highly desirable to know whether we wrote _any_ data; if
-  // we wrote none, then there's no chance the call completed and
-  // applications don't have to deal with those nasty
-  // indeterminate states where they can't immediatly tell if
-  // what's safe to do.
-  //
-  // @@ also, there might have been a GIOP::CloseConnection
-  // message in the input queue.  If so, this request should be
-  // treated as a (full) "rebind" case.  Can't do that from this
-  // point in the code however!  Some minor restructuring needs to
-  // happen.
-  //
-
-  if (result == -1)
+  TAO_Profile   *profile   = this->data_->profile_in_use ();
+  TAO_Transport *transport = profile->transport ();
+  if (transport == 0 ||
+      transport->send_request (this->orb_core_,
+                               this->out_stream_,
+                               is_roundtrip) == -1)
     {
-      // send_request () closed the connection, we just have to forget
-      // about the hint.
-      this->profile_->reset_hint ();
-
-      return TAO_INVOKE_RESTART;
+      // send_request () closed the connection; we just set the
+      // handler to 0 here.
+      profile->reset_hint ();
+
+      //
+      // @@ highly desirable to know whether we wrote _any_ data; if
+      // we wrote none, then there's no chance the call completed and
+      // applications don't have to deal with those nasty
+      // indeterminate states where they can't immediatly tell if
+      // what's safe to do.
+      //
+      // @@ also, there might have been a GIOP::CloseConnection
+      // message in the input queue.  If so, this request should be
+      // treated as a (full) "rebind" case.  Can't do that from this
+      // point in the code however!  Some minor restructuring needs to
+      // happen.
+      //
+      ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
     }
-
-  // @@ Maybe the right place to do this is once the reply is
-  //    received? But what about oneways?
-  this->stub_->set_valid_profile ();
-
-  return TAO_INVOKE_OK;
+  return TAO_GIOP_NO_EXCEPTION;
 }
 
 // ****************************************************************
 
-int
+TAO_GIOP_ReplyStatusType
 TAO_GIOP_Invocation::close_connection (void)
 {
   // Special case of forwarding -- server was closing the
@@ -375,67 +330,65 @@ TAO_GIOP_Invocation::close_connection (void)
   // not just the connection.  Without reinitializing, we'd give
   // false error reports to applications.
 
-  this->transport_->close_connection ();
-  this->transport_->idle ();
-  this->transport_ = 0;
-
-  this->profile_->reset_hint ();
-  this->profile_ = 0;
+  this->data_->profile_in_use ()->transport ()->close_conn ();
+  this->data_->profile_in_use ()->reset_hint ();
 
   // @@ Get rid of any forwarding profiles and reset
-  //    the profile list to point to the first profile!
-  // FRED For now we will not deal with recursive forwards!
+  // the profile list to point to the first profile! FRED
+  // For now we will not deal with recursive forwards!
+  // TAO_GIOP_SYSTEM_EXCEPTION;
 
-  this->stub_->reset_profiles ();
+  data_->reset_profiles ();
   // sets the forwarding profile to 0 and deletes the old one;
   // rewinds the profiles list back to the first one.
 
-  return TAO_INVOKE_RESTART;
+  return TAO_GIOP_LOCATION_FORWARD;
 }
 
+
 // Handle the GIOP Reply with status = LOCATION_FORWARD
 // Replace the IIOP Profile. The call is then automatically
-// reinvoked by the TAO_Stub::do_static_call method.
+// reinvoked by the STUB_Object::do_static_call method.
 
-int
+TAO_GIOP_ReplyStatusType
 TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
                                        CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // It can be assumed that the GIOP header and the reply header
   // are already handled. Further it can be assumed that the
   // reply body contains an object reference to the new object.
   // This object pointer will be now extracted.
 
-  CORBA::Object_var object = 0;
+  CORBA::Object_ptr object_ptr = 0;
+  TAO_Transport *transport = this->data_->profile_in_use ()->transport ();
 
-  if ( (inp_stream >> object.inout ()) == 0)
+  ACE_TRY
+    {
+      inp_stream.decode (CORBA::_tc_Object,
+                         &(object_ptr),
+                         0,
+                         ACE_TRY_ENV);
+      ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+    }
+  ACE_CATCH (CORBA_SystemException, ex)
     {
-      // @@ Why whould we want to close this connection?
-      //    this->transport_->close_connection ();
-
-      // @@ If a forward exception or a LOCATION_FORWARD reply is sent
-      //    then the request couldn't have completed. But we need to
-      //    re-validate this to ensure "at most once" semantics.
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO_INVOKE_EXCEPTION);
+      // Handle the exception for this level here and throw it out again.
+      ACE_TRY_ENV.print_exception ("invoke, location forward (decode)");
+      transport->close_conn ();
+      ACE_RETHROW;
     }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
 
-  // The object pointer has to be changed to a TAO_Stub pointer
+  // The object pointer has to be changed to a STUB_Object pointer
   // in order to extract the profile.
 
-  TAO_Stub *stubobj = object->_stubobj ();
+  STUB_Object *stubobj = object_ptr->_stubobj ();
 
   if (stubobj == 0)
     {
-      // @@ Why whould we want to close this connection?
-      //    this->transport_->close_connection ();
-
-      // @@ If a forward exception or a LOCATION_FORWARD reply is sent
-      //    then the request couldn't have completed. But we need to
-      //    re-validate this to ensure "at most once" semantics.
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        TAO_INVOKE_EXCEPTION);
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
   // Make a copy of the IIOP profile in the forwarded objref,
@@ -444,204 +397,327 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream,
   //
   // @@ add and use a "forward count", to prevent loss of data
   // in forwarding chains during concurrent calls -- only a
-  // forward that's a response to the current forward_profile should
+  // forward that's a response to the current fwd_profile should
   // be recorded here. (This is just an optimization, and is not
   // related to correctness.)
 
   // New for Multiple profile.  Get the MProfile list from the
-  // forwarded object refererence
+  // forwarded object refererence, and assign it to the current profile
+  // in use.  Note, it should not be the case that the current profile
+  // in use already has a forward profile defined!  That is, even if we
+  // were using a forward_profile in the request which resulted in this
+  // location_forward response, it will have a null fwd_mprofiles list.
 
-  this->stub_->add_forward_profiles (*stubobj->get_profiles ());
+  data_->set_fwd_profiles (stubobj->get_profiles ());
   // store the new profile list and set the first forwarding profile
-  // note: this has to be and is thread safe.  Also get_profiles returns
-  // a pointer to a new MProfile object which we give to our
-  // TAO_Stub.
+  // note: this has to be and is thread safe
+
+  // The object is no longer needed, because we have now the STUB_Object
+  // @@ Is this exception safe?
+  CORBA::release (object_ptr);
 
-  // @@ Why do we clear the environment?
-  // ACE_TRY_ENV.clear ();
+  ACE_TRY_ENV.clear ();
 
   // We may not need to do this since TAO_GIOP_Invocations
   // get created on a per-call basis. For now we'll play it safe.
 
-  if (this->stub_->next_profile () == 0)
-    ACE_THROW_RETURN (CORBA::TRANSIENT (),
-                      TAO_INVOKE_EXCEPTION);
-
-  return TAO_INVOKE_RESTART;
+  return TAO_GIOP_LOCATION_FORWARD;
 }
 
 // ****************************************************************
 
-int
+TAO_GIOP_ReplyStatusType
 TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions,
                                     CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException))
 {
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
-
-  int retval = this->invoke_i (ACE_TRY_ENV);
+  TAO_GIOP_ReplyStatusType retval =
+    TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
+  ACE_UNUSED_ARG (retval);
 
-  // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
-  // we have a user exception.
-  // @@ This is a bit brittle, think about a better implementation.
-  if (retval == TAO_INVOKE_EXCEPTION)
+  // This blocks until the response is read.  In the current version,
+  // there is only one client thread that ever uses this connection,
+  // so most response messages are illegal.
+  //
+  // THREADING NOTE: to make more efficient use of connection
+  // resources, we'd multiplex I/O on connections.  For example, one
+  // thread would write its GIOP::Request (or GIOP::LocateRequest etc)
+  // message and block for the response, then another would do the
+  // same thing.  When a response came back, it would be handed to the
+  // thread which requested it.
+  //
+  // Currently the connection manager doesn't support such fine
+  // grained connection locking, and also this server implementation
+  // wouldn't take advantage of that potential concurrency in requests
+  // either.  There are often performance losses coming from
+  // fine-grained locks being used inappropriately; there's some
+  // evidence that locking at the level of requests loses on at least
+  // some platforms.
+  //
+  // @@ In all MT environments, there's a cancellation point lurking
+  // here; need to investigate.  Client threads would frequently be
+  // canceled sometime during recv_request ... the correct action to
+  // take on being canceled is to issue a CancelRequest message to the
+  // server and then imediately let other client-side cancellation
+  // handlers do their jobs.
+  //
+  // In C++, that basically means to unwind the stack using almost
+  // normal procedures: all destructors should fire, and some "catch"
+  // blocks should probably be able to handle things like releasing
+  // pointers. (Without unwinding the C++ stack, resources that must
+  // be freed by thread cancellation won't be freed, and the process
+  // won't continue to function correctly.)  The tricky part is that
+  // according to POSIX, all C stack frames must also have their
+  // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
+  // environment.
+
+  TAO_Transport *transport = this->data_->profile_in_use ()->transport ();
+  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (transport,
+                                                     this->inp_stream_,
+                                                     this->orb_core_);
+
+  transport->resume_conn (this->orb_core_->reactor ());
+  // suspend was called in TAO_Client_Connection_Handler::handle_input
+
+  switch (m)
     {
-      // Match the exception interface repository id with the
-      // exception in the exception list.
-      // This is important to decode the exception.
+    case TAO_GIOP::Reply:
+      // handle reply ... must be right one etc
+      break;
 
-      CORBA::String_var buf;
+    case TAO_GIOP::CloseConnection:
+      return (TAO_GIOP_Invocation::close_connection ());
 
-      // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream_.read_string (buf.inout ()) == 0)
-        {
-          // @@ Why do we close the connection. Only the request
-          //    failed, but the connection seems to be still
-          //    valid!
-          // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                            TAO_INVOKE_EXCEPTION);
-        }
+    case TAO_GIOP::Request:
+    case TAO_GIOP::CancelRequest:
+    case TAO_GIOP::LocateRequest:
+    case TAO_GIOP::LocateReply:
+    default:
+      // These are all illegal messages to find.  If found, they could
+      // be indicative of client bugs (lost track of input stream) or
+      // server bugs; maybe the request was acted on, maybe not, we
+      // can't tell.
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) illegal GIOP message (%s) in response to my Request!\n",
+                  TAO_GIOP::message_name (m)));
+      // FALLTHROUGH ...
 
-      for (CORBA::ULong i = 0;
-           i < exceptions.count ();
-           i++)
-        {
-          CORBA::TypeCode_ptr tcp = exceptions.item (i, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          const char *xid = tcp->id (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (ACE_OS::strcmp (buf.in (), xid) != 0)
-            continue;
-
-          // @@ In the old days the exceptions where catched and the
-          // connection was closed, that doesn't make any sense:
-          // this is a client side problem, for one particular
-          // request.
-          // this->transport_->close_connection ();
-          // ACE_RETHROW;
-
-          const ACE_Message_Block* cdr =
-            this->inp_stream_.start ();
-          CORBA_Any any (tcp, 0, cdr);
-          CORBA_Exception *exception;
-          ACE_NEW_THROW_EX (exception,
-                            CORBA_UnknownUserException (any),
-                            CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          // @@ Think about a better way to raise the exception here,
-          // maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception);
-          return TAO_INVOKE_EXCEPTION;
-        }
+    case TAO_GIOP::CommunicationError:
+    case TAO_GIOP::MessageError:
+      // Couldn't read it for some reason ... exception's set already,
+      // so just tell the other end about the trouble (closing the
+      // connection) and return.
 
-      // If we couldn't find the right exception, report it as
-      // CORBA::UNKNOWN.
+      // FALLTHROUGH
 
-      // @@ It would seem like if the remote exception is a
-      //    UserException we can assume that the request was
-      //    completed.
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
+    case TAO_GIOP::EndOfFile:
+      // @@ This should only refer to "getting GIOP MessageError" message only.
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
-  return retval;
-}
+  // Process reply message.  Again, due to the single threading in
+  // this code, only the reply to this request is allowed to be coming
+  // back.
+  //
+  // NOTE: if the response really _isn't_ for this thread, it's now
+  // treated as an error in which synchronization can't be recovered.
+  // There might be cases where it _could_ be recovered ... e.g. maybe
+  // for some reason the previous call couldn't pick up its response.
+  // It'd be worth investigating (and handling) any such cases.
+  //
+  // NOTE: since this implementation supports no ORB services
+  // (notably, the transaction service, which is the only one that's
+  // currently defined), the reply context is discarded.  Normally
+  // it'd be fed, component at a time, to the relevant services.
+  //
+  // NOTE: As security support kicks in, this is the right place to
+  // verify a digital signature, if that is required in this
+  // particular runtime security environment.  How to know if that's
+  // the case?  It's likely that standard Internet IPSEC
+  // infrastructure (RFC 1825 through 1827, and successors) will be
+  // used to enforce many security policies; integrity and privacy
+  // guarantees may be provided by the network, and need no support
+  // here.
 
-// Send request, block until any reply comes back, and unmarshal reply
-// parameters as appropriate.
-//
-// This is used by the generated stubs.
+  TAO_GIOP_ServiceContextList reply_ctx;
+  CORBA::ULong request_id;
+  CORBA::ULong reply_status;            // TAO_GIOP_ReplyStatusType
 
-int
-TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
-                                    CORBA::ULong except_count,
-                                    CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::Exception))
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_GIOP_INVOCATION_INVOKE_START);
+  this->inp_stream_ >> reply_ctx;
+  if (!this->inp_stream_.good_bit ())
+    {
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
+    }
 
-  int retval = this->invoke_i (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (retval);
+  if (!this->inp_stream_.read_ulong (request_id)
+      || request_id != this->my_request_id_
+      || !this->inp_stream_.read_ulong (reply_status)
+      || reply_status > TAO_GIOP_LOCATION_FORWARD)
+    {
+      transport->close_conn ();
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
+    }
+
+  // If there was no exception, let the caller parse the normal
+  // response.  Otherwise parse and handle the response; we always
+  // know how to deal with the standard exceptions, and the caller
+  // provides a list of allowed user-defined exceptions so that we
+  // know how to unmarshal those too (without IFR consultation).
+  //
+  // When requests are forwarded, we just store the revised profile
+  // data in this objref structure.  The expectation is that the call
+  // will be reissued until someone gives up on a forwarding chain,
+  // and that other calls will reap the benefit of the forwarding work
+  // by this thread.
+  //
+  // NOTE: should ensure that from here on, all system exceptions
+  // return COMPLETED_YES status ... even ones reported by code which
+  // we call.
 
-  // A TAO_INVOKE_EXCEPTION status, but no exception raised means that
-  // we have a user exception.
-  // @@ This is a bit brittle, think about a better implementation.
-  if (retval == TAO_INVOKE_EXCEPTION)
+  switch (reply_status)
     {
-      // Match the exception interface repository id with the
-      // exception in the exception list.
-      // This is important to decode the exception.
+    case TAO_GIOP_NO_EXCEPTION:
+      break;
+
+    case TAO_GIOP_USER_EXCEPTION:
+    case TAO_GIOP_SYSTEM_EXCEPTION:
+      {
+        // @@ TODO This code is not exception safe. Notice how on
+        // every exit path we have to invoke TAO_GIOP::send_error,
+        // this should be handled by the destructor of some class;
+        // which is disabled on the normal exit paths.
+        // Plus <buf> should be stored in a CORBA::String_var
 
-      CORBA::String_var buf;
+        char* buf;
+        CORBA::String_var buf_holder; // Used to clean up dynamic allocated string
+                                      // in <buf>.
 
-      // Pull the exception ID out of the marshaling buffer.
-      if (this->inp_stream_.read_string (buf.inout ()) == 0)
+        // Pull the exception ID out of the marshaling buffer.
         {
-          // @@ Why do we close the connection. Only the request
-          //    failed, but the connection seems to be still
-          //    valid!
-          // this->transport_->close_connection ();
-          ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                            TAO_INVOKE_EXCEPTION);
+          if (this->inp_stream_.read_string (buf) == 0)
+            {
+              transport->close_conn ();
+              ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
+            }
         }
 
-      for (CORBA::ULong i = 0;
-           i < except_count;
-           i++)
-        {
-          CORBA::TypeCode_ptr tcp = excepts[i].tc;
-          const char *xid = tcp->id (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (ACE_OS::strcmp (buf.in (), xid) != 0)
-            continue;
-
-          // match
-          CORBA::Exception_ptr exception = excepts[i].alloc ();
-
-          if (exception == 0)
-            ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                              TAO_INVOKE_EXCEPTION);
-
-          this->inp_stream_.decode (exception->_type (),
-                                    exception, 0,
-                                    ACE_TRY_ENV);
-          ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-          if (TAO_debug_level > 5)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO: (%P|%t) Raising exception %s\n",
-                        buf.in ()));
-
-          // @@ Think about a better way to raise the exception here,
-          // maybe we need some more macros?
-          ACE_TRY_ENV.exception (exception);
-          return TAO_INVOKE_EXCEPTION;
-        }
+        buf_holder = buf;       // Assume ownership of <buf>
+
+        if (reply_status == TAO_GIOP_SYSTEM_EXCEPTION)
+          {
+            CORBA_Exception *exception =
+              TAO_Exceptions::create_system_exception (buf_holder.in (), ACE_TRY_ENV);
+            ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+            if (exception != 0)
+              {
+                this->inp_stream_.decode (exception->_type (),
+                                          &exception, 0,
+                                          ACE_TRY_ENV);
+                ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+                ACE_TRY_ENV.exception (exception);
+                return TAO_GIOP_SYSTEM_EXCEPTION;
+              }
+            else
+              {
+                // @@ TODO We should have policies to handle this
+                // error, for instance:
+                // + the spec requires us to silently raise a
+                // CORBA::UNKNOWN exception
+                // + Don't print a message and try
+                // + Print the message and try
+                // + Print the message and rasize CORBA::UNKNOWN
+                ACE_ERROR ((LM_ERROR,
+                            "Received Reply with SYSTEM_EXCEPTION "
+                            "status, but unknown or invalid "
+                            "exception.\n"
+                            "Trying to interpret as a user exception"));
+              }
+          }
+          {
+            // Find it in the operation description and then use that
+            // to get the typecode.
+            // This is important to decode the exception.
+
+            for (CORBA::ULong i = 0;
+                 i < exceptions.count ();
+                 i++)
+              {
+                CORBA::TypeCode_ptr tcp = 0;
+                int loop_continue = 0;
+                ACE_TRY
+                  {
+                    tcp = exceptions.item (i, ACE_TRY_ENV);
+                    ACE_TRY_CHECK;
+
+                    const char *xid = tcp->id (ACE_TRY_ENV);
+                    ACE_TRY_CHECK;
+
+                    if (ACE_OS::strcmp (buf_holder.in (), xid) != 0)
+                      loop_continue = 1;
+                  }
+                ACE_CATCH (CORBA_SystemException, ex)
+                  {
+                    transport->close_conn ();
+                    ACE_RETHROW;
+                  }
+                ACE_ENDTRY;
+                ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+                if (loop_continue)
+                  continue;
+
+                const ACE_Message_Block* cdr =
+                  this->inp_stream_.start ();
+                CORBA_Any any (tcp, cdr);
+                CORBA_Exception *exception =
+                  new CORBA_UnknownUserException (any);
+                ACE_TRY_ENV.exception (exception);
+                return TAO_GIOP_USER_EXCEPTION;
+              }
+          }
 
-      // If we couldn't find the right exception, report it as
-      // CORBA::UNKNOWN.
+        // If we couldn't find the right exception, report it as
+        // CORBA::UNKNOWN.
 
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
+        ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
+      }
+    // NOTREACHED
+
+    case TAO_GIOP_LOCATION_FORWARD:
+      return (this->location_forward (this->inp_stream_, ACE_TRY_ENV));
     }
 
-  return retval;
+  // All standard exceptions from here on in the call path know for
+  // certain that the call "completed" ... except in the case of
+  // system exceptions which say otherwise, and for
+  // TAO_GIOP_LOCATION_FORWARD responses.
+
+  return (TAO_GIOP_ReplyStatusType) reply_status;
 }
 
-int
-TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+// Send request, block until any reply comes back, and unmarshal reply
+// parameters as appropriate.
+//
+// This invoke method is for the stubs to use
+
+TAO_GIOP_ReplyStatusType
+TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
+                                    CORBA::ULong except_count,
+                                    CORBA::Environment &ACE_TRY_ENV)
 {
-  int retval = TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
+  TAO_GIOP_ReplyStatusType retval =
+    TAO_GIOP_Invocation::invoke (1, ACE_TRY_ENV);
   ACE_CHECK_RETURN (retval);
   ACE_UNUSED_ARG (retval);
 
+  TAO_Profile *profile = this->data_->profile_in_use ();
+  TAO_Transport *transport = profile->transport ();
+
   // This blocks until the response is read.  In the current version,
   // there is only one client thread that ever uses this connection,
   // so most response messages are illegal.
@@ -678,27 +754,21 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
   // (explicitly coded) handlers called.  We assume a POSIX.1c/C/C++
   // environment.
 
-  // @@ Fred: if it makes sense to have a wrapper for send_request on
-  //    the TAO_Transport class then it should also make sense to have
-  //    one for recv_request(), right?
-  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (this->transport_,
+  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (transport,
                                                      this->inp_stream_,
                                                      this->orb_core_);
 
   // suspend was called in TAO_Client_Connection_Handler::handle_input
-  this->transport_->resume_connection (this->orb_core_->reactor ());
+  transport->resume_conn (this->orb_core_->reactor ());
 
   switch (m)
     {
     case TAO_GIOP::Reply:
-      // The reply is handled at the end of this switch() statement.
+      // handle reply ... must be right one etc
       break;
 
     case TAO_GIOP::CloseConnection:
-      // Try the same profile again, but open a new connection.
-      // If that fails then we go to the next profile.
-      this->profile_->reset_hint ();
-      return TAO_INVOKE_RESTART;
+      return (TAO_GIOP_Invocation::close_connection ());
 
     case TAO_GIOP::Request:
     case TAO_GIOP::CancelRequest:
@@ -709,39 +779,25 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
       // be indicative of client bugs (lost track of input stream) or
       // server bugs; maybe the request was acted on, maybe not, we
       // can't tell.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) illegal GIOP message (%s) "
-                    "in response to my Request!\n",
-                    TAO_GIOP::message_name (m)));
-      // FALLTHROUGH
-
-    case TAO_GIOP::MessageError:
-      // @@ Maybe the transport should be closed by recv_request?
-      // FALLTHROUGH
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) illegal GIOP message (%s) in response to my Request!\n",
+                  TAO_GIOP::message_name (m)));
+      // FALLTHROUGH ...
 
     case TAO_GIOP::CommunicationError:
-      // Couldn't read it for some reason... exception's set already,
+    case TAO_GIOP::MessageError:
+      // Couldn't read it for some reason ... exception's set already,
       // so just tell the other end about the trouble (closing the
       // connection) and return.
+
       // FALLTHROUGH
 
     case TAO_GIOP::EndOfFile:
-      // In all those cases the message was (apparently) sent, but we
-      // couldn't read the reply. To satisfy the "at most once"
-      // semantics of CORBA we must raise an exception at this point
-      // and *not* try to transparently restart the request.
-
-      // We must also reset the state of this object, because the next
-      // invocation may perfectly work.
-      this->close_connection ();
-
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
+      // @@ This should only refer to "getting GIOP MessageError" message only.
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
-  // Note: we only get here if the status was TAO_GIOP::Reply...
-
   // Process reply message.  Again, due to the single threading in
   // this code, only the reply to this request is allowed to be coming
   // back.
@@ -766,23 +822,15 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
   // guarantees may be provided by the network, and need no support
   // here.
 
-
-  // @@ Here is a big difference between GIOP 1.[01] and GIOP 1.2, the
-  // order of the reply_ctx and the request_id fields!
-
   TAO_GIOP_ServiceContextList reply_ctx;
   CORBA::ULong request_id;
-  CORBA::ULong reply_status; // TAO_GIOP_ReplyStatusType
+  CORBA::ULong reply_status;            // TAO_GIOP_ReplyStatusType
 
   this->inp_stream_ >> reply_ctx;
   if (!this->inp_stream_.good_bit ())
     {
-      // @@ Fred: Do we really want to close the connection here? This
-      //    is a problem, but we haven't lost synchronization with the
-      //    server or anything.
-      this->transport_->close_connection ();
-      ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
   if (!this->inp_stream_.read_ulong (request_id)
@@ -790,14 +838,9 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
       || !this->inp_stream_.read_ulong (reply_status)
       || reply_status > TAO_GIOP_LOCATION_FORWARD)
     {
-      // @@ Fred: Do we really want to close the connection here? This
-      //    is a problem, but we haven't lost synchronization with the
-      //    server or anything.
-      this->transport_->close_connection ();
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "TAO: (%P|%t) bad Response header\n"));
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
+      transport->close_conn ();
+      ACE_DEBUG ((LM_DEBUG, "(%P|%t) bad Response header\n"));
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
   // If there was no exception, let the caller parse the normal
@@ -816,22 +859,12 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
   // return COMPLETED_YES status ... even ones reported by code which
   // we call.
 
-
-  // @@ We must validate the reply_status variable, if it is not one
-  // of the values listed in this switch statement we should:
-  //  1) The and MessageError message back to the server
-  //  2) Raise a COMM_FAILURE exception
-
   switch (reply_status)
     {
     case TAO_GIOP_NO_EXCEPTION:
-      return TAO_INVOKE_OK;
-      // NOTREACHED
+      break;
 
     case TAO_GIOP_USER_EXCEPTION:
-      return TAO_INVOKE_EXCEPTION;
-      // NOTREACHED
-
     case TAO_GIOP_SYSTEM_EXCEPTION:
       {
         // @@ TODO This code is not exception safe. Notice how on
@@ -840,190 +873,207 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV)
         // which is disabled on the normal exit paths.
         // Plus <buf> should be stored in a CORBA::String_var
 
-        CORBA::String_var buf;
+        char* buf;
+        CORBA::String_var buf_holder; // Used to clean up dynamically allocated
+                                      // <buf> upon exceptions or return
 
         // Pull the exception ID out of the marshaling buffer.
-        if (this->inp_stream_.read_string (buf.inout ()) == 0)
-          {
-            // @@ Why do we close the connection. Only the request
-            //    failed, but the connection seems to be still
-            //    valid!
-            this->transport_->close_connection ();
-            ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                              TAO_INVOKE_EXCEPTION);
-          }
+        {
+          if (this->inp_stream_.read_string (buf) == 0)
+            {
+              this->data_->profile_in_use ()->transport ()->close_conn ();
+              ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
+            }
+        }
+
+        buf_holder = buf;       // Assume ownership of <buf>
 
-        CORBA_Exception *exception =
-          TAO_Exceptions::create_system_exception (buf.in (),
-                                                   ACE_TRY_ENV);
-        ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
+        // Find it in the operation description and then use that to
+        // get the typecode.  Use it to unmarshal the exception's
+        // value; if that exception is not allowed by this operation,
+        // fail (next).
 
-        if (exception == 0)
+        // placeholder to decode the exception
+        CORBA::Exception *exception = 0;
+        CORBA::TypeCode_ptr tcp = 0;
+
+        if (reply_status == TAO_GIOP_SYSTEM_EXCEPTION)
+          {
+            exception =
+              TAO_Exceptions::create_system_exception (buf_holder.in (), ACE_TRY_ENV);
+            ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+            if (exception != 0)
+              {
+                this->inp_stream_.decode (exception->_type (),
+                                          exception, 0,
+                                          ACE_TRY_ENV);
+                ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+                // @@ What do we do if an exception is raised while
+                // demarshaling an exception????
+                ACE_TRY_ENV.exception (exception);
+                return TAO_GIOP_SYSTEM_EXCEPTION;
+              }
+          }
+        // else // this else is commented out, see the coment above
           {
-            if (TAO_debug_level > 0)
-              ACE_ERROR ((LM_ERROR,
-                          "TAO: (%P|%t) Received Reply "
-                          "with SYSTEM_EXCEPTION status."
-                          "But unknown or invalid exception.\n"));
-            ACE_NEW_RETURN (exception,
-                            CORBA::UNKNOWN,
-                            TAO_INVOKE_EXCEPTION);
+            // search the table of exceptions and see if there is a match
+            for (CORBA::ULong i = 0;
+                 i < except_count;
+                 i++)
+              {
+                int loop_continue = 0;
+                ACE_TRY
+                  {
+                    tcp = excepts[i].tc;
+                    const char *xid = tcp->id (ACE_TRY_ENV);
+                    ACE_TRY_CHECK;
+
+                    if (ACE_OS::strcmp (buf_holder.in (), (char *)xid) != 0)
+                      loop_continue = 1;
+                    else
+                      {
+                        // match
+                        exception = excepts[i].alloc ();
+
+                        this->inp_stream_.decode (exception->_type (),
+                                                  exception, 0,
+                                                  ACE_TRY_ENV);
+                        ACE_TRY_CHECK;
+                      }
+                  }
+                ACE_CATCH (CORBA_SystemException, ex)
+                  {
+                    this->data_->profile_in_use ()->transport ()->close_conn ();
+                    ACE_RETHROW;
+                  }
+                ACE_ENDTRY;
+                ACE_CHECK_RETURN (TAO_GIOP_SYSTEM_EXCEPTION);
+
+                if (loop_continue)
+                  continue;
+
+                ACE_TRY_ENV.exception (exception);
+                return TAO_GIOP_USER_EXCEPTION;
+              } // end of loop
           }
-        // @@ We can clearly use compiled marshaling in this
-        //    case. All system exceptions are guaranteed to
-        //    have the same fields (according to the spec).
-        this->inp_stream_.decode (exception->_type (),
-                                  &exception, 0,
-                                  ACE_TRY_ENV);
-        ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION);
-
-        // @@ Think about a better way to raise the exception here,
-        // maybe we need some more macros?
-        ACE_TRY_ENV.exception (exception);
-        return TAO_INVOKE_EXCEPTION;
+
+        // If we couldn't find the right exception, report it as
+        // CORBA::UNKNOWN.
+
+        ACE_TRY_ENV.exception (new CORBA::UNKNOWN (CORBA::COMPLETED_YES));
+        return TAO_GIOP_SYSTEM_EXCEPTION;
       }
-      // NOTREACHED
+    // NOTREACHED
 
     case TAO_GIOP_LOCATION_FORWARD:
-      return this->location_forward (this->inp_stream_, ACE_TRY_ENV);
+      return (this->location_forward (this->inp_stream_, ACE_TRY_ENV));
     }
 
-  return TAO_INVOKE_EXCEPTION;
+  // All standard exceptions from here on in the call path know for
+  // certain that the call "completed" ... except in the case of
+  // system exceptions which say otherwise, and for
+  // TAO_GIOP_LOCATION_FORWARD responses.
+
+  return (TAO_GIOP_ReplyStatusType) reply_status;
 }
 
+
 // ****************************************************************
 
+
 // Send request, block until any reply comes back
 
-int
+TAO_GIOP_ReplyStatusType
 TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // @@ TODO This method is very similar to invoke_i(), we should try
-  //    to refactor them.
-
-  if (this->transport_ == 0)
-    ACE_THROW_RETURN (CORBA::INTERNAL (),
-                      TAO_INVOKE_EXCEPTION);
-
-  int result =
-    this->transport_->send_request (this->orb_core_,
-                                    this->out_stream_,
-                                    1);
+  // Send Request, return on error or if we're done
 
+  TAO_Profile *profile = this->data_->profile_in_use ();
+  TAO_Transport *transport = profile->transport ();
 
-  if (result == -1)
+  // @@ This appears broken, the send_request returns -1
+  if (transport->send_request (this->orb_core_,
+                               this->out_stream_,
+                               1) == -1)
     {
       // send_request () closed the connection; we just set the
       // handler to 0 here.
-      this->profile_->reset_hint ();
-
-      // @@ This code abort if the connection for the currenct profile
-      //    fails.  Should we transparently try new profiles until one
-      //    works? Or is that something that a higher level component
-      //    should decide?  Remember that LocateRequests are part of
-      //    the strategy to establish a connection.
-      ACE_THROW_RETURN (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
+      profile->reset_hint ();
+      ACE_TRY_ENV.exception (new CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE));
+      return TAO_GIOP_SYSTEM_EXCEPTION;
     }
 
-  // @@ Maybe the right place to do this is once the reply is
-  //    received? But what about oneways?
-  this->stub_->set_valid_profile ();
-
-  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (this->transport_,
+  TAO_GIOP::Message_Type m = TAO_GIOP::recv_request (transport,
                                                      this->inp_stream_,
                                                      this->orb_core_);
 
-  this->transport_->resume_connection (this->orb_core_->reactor ());
+  transport->resume_conn (this->orb_core_->reactor ());
   // suspend was called in TAO_Client_Connection_Handler::handle_input
 
   switch (m)
     {
-    case TAO_GIOP::Reply:
-      // Thereply is handled at the end of this switch() statement.
-      break;
-
     case TAO_GIOP::CloseConnection:
-      // Try the same profile again, but open a new connection.
-      // If that fails then we go to the next profile.
-      this->profile_->reset_hint ();
-      return TAO_INVOKE_RESTART;
+      return (this->close_connection ());
+
+    case TAO_GIOP::LocateReply:
+      // Handle the reply
+      // Especially set the new location
+
+      CORBA::ULong request_id;
+      CORBA::ULong locate_status;      // TAO_GIOP_LocateStatusType
 
+      if (!this->inp_stream_.read_ulong (request_id)
+          || request_id != this->my_request_id_
+          || !this->inp_stream_.read_ulong (locate_status))
+        {
+          transport->close_conn ();
+          ACE_DEBUG ((LM_DEBUG,
+                      "(%P|%t) bad Response header\n"));
+          ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
+        }
+      switch (locate_status)
+        {
+        case TAO_GIOP_UNKNOWN_OBJECT:
+          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_YES), TAO_GIOP_SYSTEM_EXCEPTION);
+          /* not reached */
+        case TAO_GIOP_OBJECT_HERE:
+          return TAO_GIOP_NO_EXCEPTION;
+          /* not reached */
+        case TAO_GIOP_OBJECT_FORWARD:
+          return (this->location_forward (this->inp_stream_, ACE_TRY_ENV));
+          /* not reached */
+        }
+      /* not reached */
+    case TAO_GIOP::Reply:
     case TAO_GIOP::Request:
     case TAO_GIOP::CancelRequest:
     case TAO_GIOP::LocateRequest:
-    case TAO_GIOP::LocateReply:
     default:
       // These are all illegal messages to find.  If found, they could
       // be indicative of client bugs (lost track of input stream) or
       // server bugs; maybe the request was acted on, maybe not, we
       // can't tell.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) illegal GIOP message (%s) "
-                    "in response to my LocateRequest!\n",
-                    TAO_GIOP::message_name (m)));
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%P|%t) illegal GIOP message (%s) in response to my Request!\n",
+                  TAO_GIOP::message_name (m)));
       // FALLTHROUGH ...
 
-    case TAO_GIOP::MessageError:
-      // @@ Maybe the transport should be closed by recv_request?
-      // FALLTHROUGH
-
     case TAO_GIOP::CommunicationError:
+    case TAO_GIOP::MessageError:
       // Couldn't read it for some reason ... exception's set already,
       // so just tell the other end about the trouble (closing the
       // connection) and return.
       // FALLTHROUGH
 
     case TAO_GIOP::EndOfFile:
-      // In all those cases the message was (apparently) sent, but we
-      // couldn't read the reply. To satisfy the "at most once"
-      // semantics of CORBA we must raise an exception at this point
-      // and *not* try to transparently restart the request.
-      // FALLTHROUGH
-
-      this->close_connection ();
-
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  // Note: we only get here if the status was TAO_GIOP::LocateReply
-
-  CORBA::ULong request_id;
-  CORBA::ULong locate_status; // TAO_GIOP_LocateStatusType
-
-  if (!this->inp_stream_.read_ulong (request_id)
-      || request_id != this->my_request_id_
-      || !this->inp_stream_.read_ulong (locate_status))
-    {
-      // @@ Fred: Do we really want to close the connection here? This
-      //    is a problem, but we haven't lost synchronization with the
-      //    server or anything.
-      this->transport_->close_connection ();
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "TAO: (%P|%t) bad Response header\n"));
-      ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                        TAO_INVOKE_EXCEPTION);
-    }
-
-  switch (locate_status)
-    {
-    case TAO_GIOP_OBJECT_HERE:
-      break;
-
-    case TAO_GIOP_UNKNOWN_OBJECT:
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
-                        TAO_INVOKE_EXCEPTION);
-      // NOTREACHED
-
-    case TAO_GIOP_OBJECT_FORWARD:
-      return this->location_forward (this->inp_stream_, ACE_TRY_ENV);
-      // NOTREACHED
+      // @@ This should only refer to "getting GIOP MessageError" message only.
+      transport->close_conn ();
+      ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), TAO_GIOP_SYSTEM_EXCEPTION);
     }
 
-  return TAO_INVOKE_OK;
+  ACE_NOTREACHED (return TAO_GIOP_NO_EXCEPTION);
 }
 
 // ****************************************************************
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 90900bed917..321f7dc6754 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -30,23 +30,8 @@
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/GIOP.h"
-#include "tao/Any.h"
 
 struct TAO_Exception_Data;
-class TAO_Profile;
-class TAO_Transport;
-
-enum TAO_Invoke_Status
-{
-  TAO_INVOKE_OK,
-  // invoke() call successful.
-
-  TAO_INVOKE_RESTART,
-  // The request must be restarted, a temporary failure has ocurred.
-
-  TAO_INVOKE_EXCEPTION
-  // An exception was raised.
-};
 
 class TAO_Export TAO_GIOP_Invocation
 {
@@ -62,15 +47,14 @@ class TAO_Export TAO_GIOP_Invocation
   //
 public:
   // = Initialization and termination methods.
-  TAO_GIOP_Invocation (TAO_Stub *data,
+  TAO_GIOP_Invocation (STUB_Object *data,
                        const char *operation,
                        TAO_ORB_Core* orb_core);
   ~TAO_GIOP_Invocation (void);
 
   void put_param (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &TAO_IN_ENV =
-                        CORBA::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Encodes the value into the undelying CDR stream based on the
   // TypeCode parameter
 
@@ -80,41 +64,23 @@ public:
 protected:
   void start (CORBA::Boolean is_roundtrip,
               TAO_GIOP::Message_Type message_type,
-              CORBA_Environment &ACE_TRY_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Establishes a connection to the remote server, initializes
-  // the GIOP and Request headers in the output CDR.
-  // The <message_size> field of the GIOP header is left blank and
-  // must be filled later.
-  // The function only returns once a connection has been succesfully
-  // established *OR* all profiles have been tried.  In that case it
-  // raises the CORBA::TRANSIENT exception.
-
-  int invoke (CORBA::Boolean is_roundtrip,
-              CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Locates the right Client_Connection_Handler and initializes the
+  // CDR stream.
+  // The message_type tells how to initialize the output CDR stream
+
+  TAO_GIOP_ReplyStatusType invoke (CORBA::Boolean is_roundtrip,
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Sends the request, does not wait for the response.
-  // Returns TAO_INVOKE_RESTART if the write call failed and the
-  // request must be re-attempted.
-  // Notice that the same profile is tried again because it may be
-  // that the server closed the connection simply to release
-  // resources.
-
-  int close_connection (void);
-  // resets the forwarding profile and behaves like we are fowarded
-  // (to the same server)
-
-  int location_forward (TAO_InputCDR &inp_stream,
-                        CORBA_Environment &TAO_IN_ENV =
-                              CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Helper method, the response for a Request or LocateRequest was a
-  // LOCATION_FORWARD or TAO_GIOP_OBJECT_FORWARD.
-  // In any case we must demarshal the object reference and setup the
-  // profiles.
-  // It returns TAO_INVOKE_RESTART unless an exception is raised.
+
+  TAO_GIOP_ReplyStatusType close_connection (void);
+  // resets the forwarding profile and behaves like
+  // we are fowarded (to the same server)
+
+  TAO_GIOP_ReplyStatusType location_forward (TAO_InputCDR &inp_stream,
+                                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // do the location forwarding, which means exchanging the profile
+
 
 private:
 
@@ -122,21 +88,21 @@ private:
   write_request_header (const TAO_GIOP_ServiceContextList& svc_ctx,
                         CORBA::ULong request_id,
                         CORBA::Boolean is_roundtrip,
-                        const TAO_opaque& key,
+                        const TAO_opaque* key,
                         const char* opname,
                         CORBA::Principal_ptr principal);
   CORBA::Boolean
   write_request_header_std (const TAO_GIOP_ServiceContextList& svc_ctx,
                             CORBA::ULong request_id,
                             CORBA::Boolean is_roundtrip,
-                            const TAO_opaque& key,
+                            const TAO_opaque* key,
                             const char* opname,
                             CORBA::Principal_ptr principal);
   CORBA::Boolean
   write_request_header_lite (const TAO_GIOP_ServiceContextList& svc_ctx,
                              CORBA::ULong request_id,
                              CORBA::Boolean is_roundtrip,
-                             const TAO_opaque& key,
+                             const TAO_opaque* key,
                              const char* opname,
                              CORBA::Principal_ptr principal);
   // Encode the header for the Request, assuming that the GIOP header
@@ -145,7 +111,7 @@ private:
   // weight version.
 
 protected:
-  TAO_Stub *stub_;
+  STUB_Object *data_;
   // The object on which this invocation is going.
 
   const char *opname_;
@@ -154,7 +120,7 @@ protected:
   CORBA::ULong my_request_id_;
   // Request ID of this operation.
 
-  char buffer [ACE_CDR::DEFAULT_BUFSIZE];
+  char buffer [CDR::DEFAULT_BUFSIZE];
   // Buffer used for both the output and input CDR streams, this is
   // "safe" because we only one of the streams at a time.
 
@@ -163,12 +129,6 @@ protected:
 
   TAO_ORB_Core* orb_core_;
   // The orb_core context where we make this invocation.
-
-  TAO_Transport *transport_;
-  // This invocation is using this transport, may change...
-
-  TAO_Profile *profile_;
-  // This invocation is using this transport, may change...
 };
 
 class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation
@@ -184,48 +144,35 @@ class TAO_Export TAO_GIOP_Twoway_Invocation : public TAO_GIOP_Invocation
   //
 public:
   // = Initialization and termination methods.
-  TAO_GIOP_Twoway_Invocation (TAO_Stub *data,
+  TAO_GIOP_Twoway_Invocation (STUB_Object *data,
                               const char *operation,
                               TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Calls TAO_GIOP_Invocation::start.
 
-  int invoke (CORBA::ExceptionList &exceptions,
-              CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException,CORBA::UnknownUserException));
+  TAO_GIOP_ReplyStatusType invoke (CORBA::ExceptionList &exceptions,
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Send request, block until any reply comes back, and unmarshal
   // reply parameters as appropriate.
 
-  int invoke (TAO_Exception_Data *excepts,
-              CORBA::ULong except_count,
-              CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::Exception));
+  TAO_GIOP_ReplyStatusType invoke (TAO_Exception_Data *excepts,
+                                   CORBA::ULong except_count,
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Special purpose invoke method used by the interpretive stubs. This
   // accomplishes the same task as the normal invoke except that
-  // Exceptions are allocated and decoded here. This reduces the
-  // footprint of the generated stubs.
+  // Exceptions are allocated and decoded here. This keeps the size of
+  // the stubs small and abstracts all the common code here.
 
   void get_value (CORBA::TypeCode_ptr tc,
                   void *value,
-                  CORBA_Environment &TAO_IN_ENV =
-                        CORBA::default_environment ());
+                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // No CORBA::Context support (deprecated).
 
   TAO_InputCDR &inp_stream (void);
   // return the underlying input stream
 
 private:
-  int invoke_i (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Implementation of the invoke() methods, handles the basic
-  // send/reply code and the system exceptions.
-
-private:
   TAO_InputCDR inp_stream_;
   // Stream into which the request is placed.
 };
@@ -237,18 +184,14 @@ class TAO_Export TAO_GIOP_Oneway_Invocation : public TAO_GIOP_Invocation
   //
 public:
   // = Initialization and termination methods.
-  TAO_GIOP_Oneway_Invocation (TAO_Stub *data,
+  TAO_GIOP_Oneway_Invocation (STUB_Object *data,
                               const char *operation,
                               TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Call TAO_GIOP_Invocation::start()
 
-  int invoke (CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Send request, without blocking for any response.
 };
 
@@ -260,17 +203,13 @@ class TAO_Export TAO_GIOP_Locate_Request_Invocation : public TAO_GIOP_Invocation
   //
 public:
   // = Initialization and termination methods.
-  TAO_GIOP_Locate_Request_Invocation (TAO_Stub *data,
+  TAO_GIOP_Locate_Request_Invocation (STUB_Object *data,
                                       TAO_ORB_Core* orb_core);
 
-  void start (CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  void start (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Calls TAO_GIOP_Invocation::start.
 
-  int invoke (CORBA_Environment &TAO_IN_ENV =
-                    CORBA::default_environment ())
-    ACE_THROW_SPEC ((CORBA::SystemException));
+  TAO_GIOP_ReplyStatusType invoke (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Send request, without blocking for any response.
 
 private:
@@ -278,6 +217,7 @@ private:
   // Stream into which the request is placed.
 };
 
+
 #if defined (__ACE_INLINE__)
 # include "tao/Invocation.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 93d9a9ca9d6..83c295840cf 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -21,27 +21,25 @@ TAO_GIOP_Invocation::out_stream (void)
 
 ACE_INLINE
 TAO_GIOP_Twoway_Invocation::
-TAO_GIOP_Twoway_Invocation (TAO_Stub *stub,
+TAO_GIOP_Twoway_Invocation (STUB_Object *data,
 			    const char *operation,
 			    TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, operation, orb_core),
-    inp_stream_ (orb_core->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
-                 TAO_ENCAP_BYTE_ORDER,
-                 orb_core)
+  : TAO_GIOP_Invocation (data, operation, orb_core),
+    inp_stream_ (orb_core->create_input_cdr_data_block (CDR::DEFAULT_BUFSIZE),
+                 TAO_ENCAP_BYTE_ORDER)
 {
 }
 
 ACE_INLINE void
 TAO_GIOP_Twoway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (1, TAO_GIOP::Request, ACE_TRY_ENV);
 }
 
 ACE_INLINE void
 TAO_GIOP_Twoway_Invocation::get_value (CORBA::TypeCode_ptr tc,
-                                       void *value,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                void *value,
+                                CORBA::Environment &ACE_TRY_ENV)
 {
   (void) this->inp_stream_.decode (tc, value, 0, ACE_TRY_ENV);
 }
@@ -56,23 +54,21 @@ TAO_GIOP_Twoway_Invocation::inp_stream (void)
 
 ACE_INLINE
 TAO_GIOP_Oneway_Invocation::
-TAO_GIOP_Oneway_Invocation (TAO_Stub *stub,
+TAO_GIOP_Oneway_Invocation (STUB_Object *data,
 			    const char *operation,
 			    TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, operation, orb_core)
+  : TAO_GIOP_Invocation (data, operation, orb_core)
 {
 }
 
 ACE_INLINE void
 TAO_GIOP_Oneway_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (0, TAO_GIOP::Request, ACE_TRY_ENV);
 }
 
-ACE_INLINE int
+ACE_INLINE TAO_GIOP_ReplyStatusType
 TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return TAO_GIOP_Invocation::invoke (0, ACE_TRY_ENV);
 }
@@ -81,18 +77,15 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV)
 
 ACE_INLINE
 TAO_GIOP_Locate_Request_Invocation::
-TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub,
+TAO_GIOP_Locate_Request_Invocation (STUB_Object *data,
 				    TAO_ORB_Core *orb_core)
-  : TAO_GIOP_Invocation (stub, 0, orb_core),
-    inp_stream_ (orb_core->create_input_cdr_data_block(ACE_CDR::DEFAULT_BUFSIZE),
-                 TAO_ENCAP_BYTE_ORDER,
-                 orb_core)
+  : TAO_GIOP_Invocation (data, 0, orb_core),
+    inp_stream_ (orb_core->create_input_cdr_data_block (CDR::DEFAULT_BUFSIZE))
 {
 }
 
 ACE_INLINE void
 TAO_GIOP_Locate_Request_Invocation::start (CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_GIOP_Invocation::start (1, TAO_GIOP::LocateRequest, ACE_TRY_ENV);
 }
diff --git a/TAO/tao/Key_Adapters.cpp b/TAO/tao/Key_Adapters.cpp
deleted file mode 100644
index 427f7053231..00000000000
--- a/TAO/tao/Key_Adapters.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "tao/Key_Adapters.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
-  : counter_ (0)
-{
-}
-
-int
-TAO_Incremental_Key_Generator::operator() (PortableServer::ObjectId &id)
-{
-  // Resize to accommodate the counter.
-  id.length (sizeof this->counter_);
-
-  // Add new key data.
-  ACE_OS::memcpy (id.get_buffer (),
-                  &++this->counter_,
-                  sizeof this->counter_);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-u_long
-TAO_ObjectId_Hash::operator () (const PortableServer::ObjectId &id) const
-{
-  return ACE::hash_pjw ((const char *) id.get_buffer (),
-                        id.length ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Ignore_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                         const ACE_Active_Map_Manager_Key &active_key,
-                                         PortableServer::ObjectId &modified_key)
-{
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (active_key_size);
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                         PortableServer::ObjectId &original_key)
-{
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (modified_key.maximum (),
-                        modified_key.length (),
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()),
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-TAO_Preserve_Original_Key_Adapter::encode (const PortableServer::ObjectId &original_key,
-                                           const ACE_Active_Map_Manager_Key &active_key,
-                                           PortableServer::ObjectId &modified_key)
-{
-  // Size of active key.
-  size_t active_key_size = active_key.size ();
-
-  // Resize to accommodate both the original data and the new active key.
-  modified_key.length (active_key_size + original_key.length ());
-
-  // Copy active key data into user key.
-  active_key.encode (modified_key.get_buffer ());
-
-  // Copy the original key after the active key.
-  ACE_OS::memcpy (modified_key.get_buffer () + active_key_size,
-                  original_key.get_buffer (),
-                  original_key.length ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           ACE_Active_Map_Manager_Key &active_key)
-{
-  // Read off value of index and generation.
-  active_key.decode (modified_key.get_buffer ());
-
-  // Success.
-  return 0;
-}
-
-int
-TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modified_key,
-                                           PortableServer::ObjectId &original_key)
-{
-  // Size of active key.
-  size_t active_key_size = ACE_Active_Map_Manager_Key::size ();
-
-  // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (modified_key.maximum () - active_key_size,
-                        modified_key.length () - active_key_size,
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()) + active_key_size,
-                        0);
-
-  // Success.
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
diff --git a/TAO/tao/Key_Adapters.h b/TAO/tao/Key_Adapters.h
deleted file mode 100644
index 793dad8976a..00000000000
--- a/TAO/tao/Key_Adapters.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Key_Adapters.h
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_KEY_ADAPTERS_H
-#define TAO_KEY_ADAPTERS_H
-
-#include "tao/corbafwd.h"
-#include "ace/Map.h"
-#include "tao/POAC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Incremental_Key_Generator
-{
-  // = TITLE
-  //     Defines a key generator.
-  //
-  // = DESCRIPTION
-  //     This class is used in adapters of maps that do not produce keys.
-public:
-
-  TAO_Incremental_Key_Generator (void);
-
-  int operator() (PortableServer::ObjectId &id);
-
-protected:
-
-  CORBA::ULong counter_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Export TAO_ObjectId_Hash
-{
-  // = TITLE
-  //     Hashing class for Object Ids.
-  //
-  // = DESCRIPTION
-  //     Define the hash() method for Object Ids.
-public:
-
-  u_long operator () (const PortableServer::ObjectId &id) const;
-  // Returns hash value.
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Ignore_Original_Key_Adapter
-{
-  // = TITLE
-  //     A key adapter (encode/decode) class.
-  //
-  // = DESCRIPTION
-  //     Define the encoding and decoding methods for converting
-  //     between Object Ids and active keys.  This class ignores the
-  //     <original_key> passed to it.
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class TAO_Preserve_Original_Key_Adapter
-{
-  // = TITLE
-  //     A key adapter (encode/decode) class.
-  //
-  // = DESCRIPTION
-  //     Define the encoding and decoding methods for converting
-  //     between Object Ids and active keys.  This class remembers the
-  //     <original_key> passed to it.
-public:
-
-  int encode (const PortableServer::ObjectId &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              PortableServer::ObjectId &modified_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              ACE_Active_Map_Manager_Key &active_key);
-
-  int decode (const PortableServer::ObjectId &modified_key,
-              PortableServer::ObjectId &original_key);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (__ACE_INLINE__)
-# include "tao/Key_Adapters.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_KEY_ADAPTERS_H */
diff --git a/TAO/tao/Key_Adapters.i b/TAO/tao/Key_Adapters.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/Key_Adapters.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/MProfile.cpp b/TAO/tao/MProfile.cpp
index eaa6d0ca69e..58ce5f09406 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -6,26 +6,24 @@
 
 ACE_RCSID(tao, MProfile, "$Id$")
 
-#if !defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /* __ACE_INLINE__ */
-
-void
-TAO_MProfile::cleanup (void)
+TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
+  :  fwded_mprofile_(0),
+     pfiles_ (0),
+     current_ (0),
+     size_ (0),
+     last_ (0)
 {
-  if (this->pfiles_ != 0)
-    {
-      for (TAO_PHandle i = 0; i < this->last_; ++i)
-        if (this->pfiles_[i])
-          this->pfiles_[i]->_decr_refcnt ();
-    }
-
-  delete [] this->pfiles_;
-  this->pfiles_ = 0;
+  this->set (sz);
+}
 
-  this->current_ = 0;
-  this->size_ = 0;
-  this->last_ = 0;
+TAO_MProfile::TAO_MProfile (TAO_MProfile *mprofiles)
+  :  fwded_mprofile_(0),
+     pfiles_ (0),
+     current_ (0),
+     size_ (0),
+     last_ (0)
+{
+  this->set (mprofiles);
 }
 
 int
@@ -33,138 +31,308 @@ TAO_MProfile::set (CORBA::ULong sz)
 {
   if (sz == 0)
     {
-      this->cleanup ();
-      return 0;
-    }
+      // We do, so release all of our profiles.
+      for (TAO_PHandle h = 0; h < this->size_; h++ )
+        {
+          if (this->pfiles_[h]) 
+            {
+              this->pfiles_[h]->_decr_refcnt ();
+              this->pfiles_[h] = 0;
+            }
+        }
 
-  // See if we already have an existing profile list or if we need to
-  // get ridof what we have.  @@ Fred, please be consistent with your
-  // use of this-> as a prefix for data members.
-  if (this->size_ != 0)
+      if (size_)
+        delete [] this->pfiles_;
+  
+    if (fwded_mprofile_)
+      delete fwded_mprofile_;
+  
+    pfiles_ = 0;
+    current_ = 0;
+    size_ = 0;
+    last_= 0;
+
+    return  0;
+  }
+
+  // see if we already have an existing profile list
+  // or if we need to get ridof what we have
+  if (size_)
     {
-      // Release all of our profiles.
-
-      for (TAO_PHandle h = 0;
-           h < this->size_;
-           h++)
-        if (this->pfiles_[h])
-          {
-            this->pfiles_[h]->_decr_refcnt ();
-            this->pfiles_[h] = 0;
-          }
-
-      // Next see if we can reuse our profile list memory
+      
+      // We do, so release all of our profiles.
+      for (TAO_PHandle h = 0; h < size_; h++)
+        {
+          if (this->pfiles_[h]) 
+            {
+              this->pfiles_[h]->_decr_refcnt ();
+              this->pfiles_[h] = 0;
+            }
+        }
+  
+      // Next see if we can reuse our profile list memory Since
       if (this->size_ != sz)
         {
           // we cant reuse memory since the array sized are different!
-          // @@ Fred: if sz < this->size_ you could avoid this memory
-          //    allocation, you only need another flag to keep the
-          //    "capacity".
           delete [] this->pfiles_;
-
+  
           ACE_NEW_RETURN (this->pfiles_,
-                          TAO_Profile_ptr[sz],
+                          TAO_Profile_ptr [sz],
                           -1);
-        }
+        } 
     }
   else
-    // first time, initialize!
-    ACE_NEW_RETURN (this->pfiles_,
-                    TAO_Profile_ptr [sz],
-                    -1);
-
-  this->size_ = sz;
-  this->last_ = 0;
-  this->current_ = 0;
+    {
+      // first time, initialize!
+      ACE_NEW_RETURN (this->pfiles_,
+                      TAO_Profile_ptr [sz],
+                      -1);
+    } // this->pfiles_
 
-#if 0
-  // @@ Fred: this does *not* work, the literal 0 is the null pointer,
-  //    but the bit representation may be something else.
   ACE_OS::memset (this->pfiles_,
                   0,
                   sizeof (TAO_Profile_ptr) * sz);
-#else
-  for (TAO_PHandle i = 0; i != this->size_; ++i)
-    this->pfiles_[i] = 0;
-#endif
 
-  // @@ since we are being reset, get rid of forward references!
-  // if (forward_from_)
-  // delete forward_from_;
+  size_ = sz;
+  this->last_ = 0;
+  this->current_ = 0;
 
-  return this->size_;
-}
+  // @@ since we are being reset, get rid of fwd references!
+  if (fwded_mprofile_)
+    delete fwded_mprofile_;
 
+  return size_;
+}
+  
 int
-TAO_MProfile::set (const TAO_MProfile &mprofile)
+TAO_MProfile::set (TAO_MProfile *mprofile)
 {
   // NOTE: We use mprofile->last_ instead of mprofile->size_ to set
   // this->size_.  This is so we can use set () to trim a profile
   // list!!
 
-  this->set (mprofile.last_);
+  if (! mprofile)
+    return this->set ((CORBA::ULong) 0);
 
-  // set indexes ...
-  this->last_ = mprofile.last_;
+  this->set (mprofile->last_);
 
-  // These are set in set (ULong);
+  // set indexes ...
+  this->last_ = mprofile->last_;
+  
+  // these are set in set (ULong);
   // this->current_ = 0;
-  // this->forward_from_ = 0;
+  // this->fwded_mprofile_ = 0;
 
   // Now reference all profiles.
+  for (TAO_PHandle h = 0 ; h < this->size_ ; h++ )
+    {
+      if (mprofile->pfiles_[h]) 
+        {
+          this->pfiles_[h] = mprofile->pfiles_[h];
+          this->pfiles_[h]->_incr_refcnt ();
+        }
+    } // for (TAO_PHandle ...)
 
-  for (TAO_PHandle h = 0; h < this->size_; h++)
+  if (mprofile->fwded_mprofile_)
     {
-      this->pfiles_[h] = mprofile.pfiles_[h];
-      if (this->pfiles_[h] != 0)
-        this->pfiles_[h]->_incr_refcnt ();
+      this->fwded_mprofile_ = mprofile->fwded_mprofile_;
     }
 
-  //
-  // @@ Fred: here was a gross violation of the invariants for this
-  //    class: if the forward_from_ is owned by us (we call delete all
-  //    the time on it) we cannot share it with mprofile.
-  //
-  // if (mprofile->forward_from_)
-  // this->forward_from_ = mprofile->forward_from_;
-
   return 1;
 }
 
-int
+TAO_MProfile::~TAO_MProfile (void)
+ {
+  if (this->pfiles_)
+    for (TAO_PHandle h = 0; h < size_; h++)
+      {
+        if (this->pfiles_[h])
+          this->pfiles_[h]->_decr_refcnt ();
+      }
+
+  delete [] pfiles_;
+  pfiles_ = 0;
+
+}
+
+// cyclic get next.  It will simply cycle through the complete list.
+
+TAO_Profile *
+TAO_MProfile::get_cnext (void)
+{
+  if (last_ == 0)
+      return 0;
+
+  if (current_ == last_)
+      current_ = 0;
+
+  return pfiles_ [current_++];
+
+  // was 
+  // return last_ == 0 ? 0 : ((current_ < last_) ? pfiles_ [current_++] : 
+  //                          pfiles_ [(current_ = 1, 0)]);
+}
+
+// This will return the next element until either null is found or the
+// end of list.  It then continues to return NULL until rewind.
+
+TAO_Profile *
+TAO_MProfile::get_next (void)
+{
+  // Nolist or EndOfList
+  if (last_ == 0 || current_ == last_)
+    return 0;
+
+  return pfiles_ [current_++];
+
+  // was 
+  // return last_ == 0 ? 0 : ((current_ == last_) ? 0 : pfiles_ [current_++]);
+}
+
+TAO_Profile *
+TAO_MProfile::get_cprev (void)
+{
+  if (last_ == 0)
+    return 0;
+
+  if (last_ == 1)
+    current_=1;
+  else if (current_ > 1)
+    current_--;
+  else // current_ == 0 or 1, 0 => list never read before and == 1
+    current_ = last_;
+      
+  return pfiles_ [current_ - 1];
+
+  // was
+  // return last_ == 0 ? 0 : 
+  //             (last_ == 1 ? pfiles_ [current_=0] :
+  //                   (current_ > 1 ? pfiles_ [(--current_ - 1)] :
+  //                    pfiles_ [(current_ = last_, last_ - 1)]));
+}
+
+TAO_Profile *
+TAO_MProfile::get_prev (void)
+{
+  if (last_ == 0 || current_ <= 1)
+    // No List of BeginningOfList
+    return 0;
+
+  if (current_ > 1)
+    {
+      current_--;
+    }
+
+  return pfiles_ [current_ - 1];
+
+  // was 
+  // return last_ == 0 ? 0 :
+  //        (current_ > 1 ? pfiles_ [--current_ - 1] : 
+  //         (TAO_Profile *)(current_ = 0, 0));
+}
+
+// does not affect the current_ setting!
+TAO_Profile *
+TAO_MProfile::get_profile (TAO_PHandle handle)
+{
+  if (handle < last_)
+    return pfiles_ [handle];
+
+  return 0;
+}
+  
+TAO_Profile *
+TAO_MProfile::get_current_profile (void)
+{
+  if (last_ == 0) 
+    return 0;
+ 
+  if (current_ == 0)
+    // means list has not been read before.
+    current_ = 1;
+
+  return pfiles_ [current_-1];
+
+  // was 
+  //  return current_ == 0 ? pfiles_ [current_] : pfiles_ [current_-1];
+}
+
+TAO_PHandle 
+TAO_MProfile::get_current_handle (void)
+{
+  if (current_ > 0)
+    return current_ - 1;
+
+  return 0;
+
+  // was
+  // return current_ > 0 ? (current_ - 1) : 0;
+}
+
+void 
+TAO_MProfile::rewind (void)
+{
+  current_ = 0;
+}
+
+int 
 TAO_MProfile::add_profile (TAO_Profile *pfile)
 {
   // skip by the used slots
   if (last_ == size_) // full!
     return -1;
+   
+  pfiles_ [last_++] = pfile;
 
-  pfiles_[last_++] = pfile;
-
-  if (pfile && pfile->_incr_refcnt () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) Unable to increment reference count in add_profile!\n"),
+  if (pfile && pfile->_incr_refcnt () == 0) 
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "(%P|%t) Unable to increment reference count in add_profile!\n"), 
                       -1);
   return last_ - 1;
 }
 
+void
+TAO_MProfile::fwded_mprofile (TAO_MProfile *fwded)
+{
+  this->fwded_mprofile_ = fwded;
+}
+
+TAO_MProfile *
+TAO_MProfile::fwded_mprofile (void)
+{
+  return this->fwded_mprofile_;
+}
+
+CORBA::ULong
+TAO_MProfile::profile_count (void)
+{
+  return this->last_;
+}
+
+TAO_Profile_ptr *
+TAO_MProfile::pfiles (void) const
+{
+  return this->pfiles_;
+}
+
 CORBA::Boolean
-TAO_MProfile::is_equivalent (TAO_MProfile *first,
+TAO_MProfile::is_equivalent (TAO_MProfile *first, 
                              TAO_MProfile *second,
                              CORBA::Environment &env)
 {
-  // Two profile lists are equivalent iff at least one of the profiles
-  // form the first list is_equivalent to at least one of the profiles
-  // from the second list!!
+  // Two profile lists are equivalent iff at least one of the 
+  // profiles form the first list is_equivalent to at least one
+  // of the profiles from the second list!!
   TAO_Profile_ptr *pfiles1 = first->pfiles ();
   TAO_Profile_ptr *pfiles2 = second->pfiles ();
   TAO_PHandle first_cnt = first->profile_count ();
   TAO_PHandle second_cnt = second->profile_count ();
-
+  
   for (TAO_PHandle h1 = 0; h1 < first_cnt;h1++)
     for (TAO_PHandle h2 = 0; h2 < second_cnt; h2++ )
       if (pfiles1[h1]->is_equivalent (pfiles2[h2], env))
         return 1;
-
+  
   return 0;
 }
 
@@ -173,13 +341,13 @@ TAO_MProfile::hash (CORBA::ULong max, CORBA::Environment &env)
 {
   CORBA::ULong hashval = 0;
 
-  if (last_ == 0)
+  if (last_ == 0) 
     return 0;
 
-  for (TAO_PHandle h=0; h < last_ ; h++)
+  for (TAO_PHandle h=0; h < last_ ; h++) 
     hashval += pfiles_[h]->hash (max, env);
 
   // The above hash function return an ULong between 0 and max here we
-  // simply take the average value and round.
-  return hashval / last_;
+  // simply take the average value and round
+  return hashval / last_; 
 }
diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h
index 5222d785c63..776ec0e3745 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -21,50 +21,41 @@
 #define TAO_MPROFILE_H
 
 #include "tao/corbafwd.h"
-#include "tao/Pluggable.h"
 
-// @@ Fred, this definitions are of very little use, can you make them
-//    local to the Profile class so we don't pollute the global
-//    namespace
-typedef TAO_Profile *TAO_Profile_ptr;
-typedef CORBA::ULong TAO_PHandle;
+class TAO_Profile;
+typedef TAO_Profile * TAO_Profile_ptr;
+// @@ Fred, please don't create global typedefs that aren't prefixed
+// by TAO_.
+typedef CORBA::ULong TAO_PHandle; 
 
-class TAO_Export TAO_MProfile
+class TAO_Export TAO_MProfile 
 {
   // = TITLE
-  //   This class implements the basic interface for supporting
-  //   multiple profiles.
-  //
+  //   TAO_MProfile
+  // 
   // = DESCRIPTION
-  //   Multiple profiles can be treated either as a circular queue or
-  //   a linear array of profiles.
-  //
-  //   It is assumed that locking will only be required when a profile
-  //   list is associated with a TAO_Stub.  Thus when the
-  //   TAO_Stub accepts ownership of an MProfile it also assumes
-  //   responsibility for controling access (i.e. locking).
+  // this class implements the basic interface for supporting multiple
+  // profiles.  This can be treated either as a circular queue or a
+  // linear array of profiles.   
+  // 
+  // It is assumed that locking will only be required when a profile list
+  // is associated with a STUB_Object.  Thus when the STUB_Object accepts 
+  // ownership of an MProfile it also assumes responsibility for controling
+  // access (i.e. locking).
+  // 
 public:
   // = Initalization and termination methods.
   TAO_MProfile (CORBA::ULong sz);
 
-  TAO_MProfile (const TAO_MProfile &mprofiles);
-  // **NOTE:  IF mprofiles->last_ > 0, THEN this->size_ will be set to
+  TAO_MProfile (TAO_MProfile *mprofiles);
+  // **NOTE:  IF mprofiles->last_ > 0, THEN this->size_ will be set to 
   //          mprofiles->last_.  Otherwise this->size_ - mprofiles->size_.
   //          Furthermore, current_ is set back to 0!  i.e. rewound.
   // The reference count on any profiles in mprofiles is increment
   // when their references (i.e. pointers) are copied.
 
-  TAO_MProfile& operator= (const TAO_MProfile& mprofiles);
-  // Assigment operator.
-
-  ~TAO_MProfile (void);
-  // Destructor: decrements reference count on all references
-  // profiles!
-
   int set (CORBA::ULong sz);
-  // @@ Fred, what does this method do?
-
-  int set (const TAO_MProfile &mprofile);
+  int set (TAO_MProfile *mprofile);
   // Inits this to the values of mprofile.  NOTE: We use
   // mprofile->last_ instead of mprofile->size_ to set this->size_.
   // This is so we can use set () to trim a profile list!!
@@ -79,27 +70,23 @@ public:
   // Assume a circular list of profiles.
 
   TAO_Profile_ptr get_prev (void);
-  // Get previous profile, stop at beginning of list and return 0.
+  // Get previous profile, stop at beginning of list and return 0
 
   TAO_Profile_ptr get_current_profile (void);
-  // Return a pointer to the current profile, will not increment
-  // reference pointer.
+  // return a pointer to the current profile, will not increment
+  // referecne pointer.
 
   TAO_Profile_ptr get_profile (TAO_PHandle handle);
-  // Return a pointer to the profile referenced by handle void.
+  // Return a pointer to the profile referenced by handle void
 
   // rem_profile (TAO_PHandle handle); let's wait.
 
   TAO_PHandle get_current_handle (void);
   // Returns the index for the current profile.
 
-  CORBA::ULong profile_count (void) const;
+  CORBA::ULong profile_count (void);
   // Returns the number of profiles stored in the list (last_).
 
-  const TAO_Profile* get_profile (CORBA::ULong index) const;
-  // Return the profile at position <index>.
-  // If <index> is out of range it returns 0.
-
   void rewind (void);
   // Sets the current index back to 0.
 
@@ -107,16 +94,13 @@ public:
   // Return the index of this entry or -1 if it can not be added.
   // reference count on profile in incremented!
 
-  int give_profile (TAO_Profile_ptr pfile);
-  // Return the index of this entry or -1 if it can not be added.
-  // this object assumes ownership of this profile!!
-
-  void forward_from (TAO_MProfile *mprofiles);
-  // Set a pointer to the MProfile whose 'current' TAO_Profile was
-  // forwarded This object is the set of forwarding profiles.
+  void fwded_mprofile (TAO_MProfile *mprofiles);
+  // Set a pointer to the profile which was forwarded.  NOTE, the
+  // forwarding profile *MUST* be set at object creation.  And it can
+  // not be altered once it's set!
 
-  TAO_MProfile *forward_from (void);
-  // Returns a pointer to the profile which was forwarded.
+  TAO_MProfile *fwded_mprofile (void);
+  // Returns a pointer to the profile which was forwarded.  
 
   CORBA::Boolean is_equivalent (TAO_MProfile *first,
                                 TAO_MProfile *second,
@@ -125,45 +109,38 @@ public:
   // is_equivalent with at least one profile in second.  @@ FRED: The
   // lost should be locked for this!
 
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &env);
+  CORBA::ULong hash (CORBA::ULong max, CORBA::Environment &env);
   // @@ FRED: The list should be locked for this!
 
+  ~TAO_MProfile (void);
+  // Deletes this object and decrements reference count on all
+  // references profiles!
 protected:
   TAO_Profile_ptr *pfiles (void) const;
-  // return the complete list of profiles, this object retains
-  // ownership!
-
+  // return the complete list of profiles, this object retains ownership!
 
 private:
-  void cleanup (void);
-  // Helper method to implement the destructor
 
-private:
-
-  TAO_MProfile  *forward_from_;
-  // Used for chaning references when the current profile is
-  // forwarded.  Note, this will only be valid for an MProfile which
-  // contains a list of forward_profiles for some initial or base
-  // profile.  This is a backward reference to the profile list which
-  // received the relocate message.  The actual profile what was
-  // forwarded will be forward_from_->get_current_profile ()
+  TAO_MProfile  *fwded_mprofile_;
+  // Used for chaning references when the current profile is forwarded.
+  // Note, this will only be valid for an MProfile which contains a list of
+  // fwd_profiles for some initial or base profile.
+  // This is a backward reference to the profile list which received the 
+  // relocate message.  The actual profile what was forwarded will be
+  // fwded_mprofile_->get_current_profile ()
 
   TAO_Profile_ptr *pfiles_;
   // Actual list of profiles.
 
   TAO_PHandle current_;
-  // Points to the next profile to be used.  0 ... size_
+  // Points to the next prfoile to be used.
+  // 0 ... size_
 
   TAO_PHandle size_;
   // Max size of array
 
   TAO_PHandle last_;
-  // Index plus 1 of last valid entry!  May be < size_.
+  // Index plus 1 of last valid entry!  May be < size_
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/MProfile.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MPROFILE_H */
+#endif // TAO_MPROFILE_H
diff --git a/TAO/tao/MProfile.i b/TAO/tao/MProfile.i
deleted file mode 100644
index a4291144f82..00000000000
--- a/TAO/tao/MProfile.i
+++ /dev/null
@@ -1,178 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
-  :  forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (sz);
-}
-
-ACE_INLINE
-TAO_MProfile::TAO_MProfile (const TAO_MProfile &mprofiles)
-  :  forward_from_(0),
-     pfiles_ (0),
-     current_ (0),
-     size_ (0),
-     last_ (0)
-{
-  this->set (mprofiles);
-}
-
-ACE_INLINE TAO_MProfile&
-TAO_MProfile::operator= (const TAO_MProfile& rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  this->set (rhs);
-  return *this;
-}
-
-ACE_INLINE
-TAO_MProfile::~TAO_MProfile (void)
-{
-  this->cleanup ();
-}
-
-// Cyclic get next.  It will simply cycle through the complete list.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cnext (void)
-{
-  if (last_ == 0)
-      return 0;
-
-  if (current_ == last_)
-      current_ = 0;
-
-  return pfiles_[current_++];
-}
-
-// This will return the next element until either null is found or the
-// end of list.  It then continues to return NULL until rewind.
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_next (void)
-{
-  // Nolist or EndOfList
-  if (last_ == 0 || current_ == last_)
-    return 0;
-  else
-    return pfiles_[current_++];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_cprev (void)
-{
-  if (last_ == 0)
-    return 0;
-  else if (last_ == 1)
-    current_=1;
-  else if (current_ > 1)
-    current_--;
-  else // current_ == 0 or 1, 0 => list never read before and == 1
-    current_ = last_;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_prev (void)
-{
-  if (last_ == 0 || current_ <= 1)
-    // No List of BeginningOfList
-    return 0;
-  if (current_ > 1)
-    current_--;
-
-  return pfiles_[current_ - 1];
-}
-
-// does not affect the current_ setting!
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_profile (TAO_PHandle handle)
-{
-  if (handle < last_)
-    return pfiles_[handle];
-  else
-    return 0;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_MProfile::get_current_profile (void)
-{
-  if (last_ == 0)
-    return 0;
-  if (current_ == 0)
-    // means list has not been read before.
-    current_ = 1;
-
-  return pfiles_[current_ - 1];
-}
-
-ACE_INLINE TAO_PHandle
-TAO_MProfile::get_current_handle (void)
-{
-  if (current_ > 0)
-    return current_ - 1;
-  else
-    return 0;
-}
-
-ACE_INLINE void
-TAO_MProfile::rewind (void)
-{
-  current_ = 0;
-}
-
-ACE_INLINE int
-TAO_MProfile::give_profile (TAO_Profile *pfile)
-{
-  // skip by the used slots
-  if (last_ == size_) // full!
-    return -1;
-
-  pfiles_[last_++] = pfile;
-
-  return last_ - 1;
-}
-
-ACE_INLINE
-void
-TAO_MProfile::forward_from (TAO_MProfile *from)
-{
-  this->forward_from_ = from;
-}
-
-ACE_INLINE
-TAO_MProfile *
-TAO_MProfile::forward_from (void)
-{
-  return this->forward_from_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_MProfile::profile_count (void) const
-{
-  return this->last_;
-}
-
-ACE_INLINE const TAO_Profile*
-TAO_MProfile::get_profile (CORBA::ULong index) const
-{
-  if (index >= this->last_)
-    return 0;
-  return this->pfiles_[index];
-}
-
-ACE_INLINE TAO_Profile_ptr *
-TAO_MProfile::pfiles (void) const
-{
-  return this->pfiles_;
-}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 1fff6534950..a7912e85417 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -11,147 +11,79 @@ SHLIB    = $(LIBNAME).$(SOEXT)
 
 # These are headers for things which are exported and must be
 # installed.  (Currently not used).
-PUB_HDRS = \
-  Pluggable \
-  MProfile \
-  IIOP_Profile \
-  IIOP_Transport \
-  IIOP_Connector \
-  IIOP_Acceptor \
-  GIOP \
-  Invocation \
-  Connect \
-  Params \
-  Marshal \
-  Debug \
-  Default_Client \
-  Default_Server \
-  Server_Strategy_Factory \
-  Client_Strategy_Factory \
-  ORB_Core
+PUB_HDRS = Align CDR \
+	   Pluggable MProfile IIOP_Profile IIOP_Transport IIOP_Connector IIOP_Acceptor \
+	   GIOP Invocation IIOP_ORB Connect Params \
+	   Marshal Debug \
+	   Default_Client Default_Server \
+	   Server_Strategy_Factory Client_Strategy_Factory ORB_Core
 
-POA_FILES = \
-  Object_Adapter \
-  Key_Adapters \
-  POA \
-  POAC \
-  POAS \
-  POAManager \
-  Active_Object_Map \
-  Servant_Base
+ORBCORE_SRCS = \
+	Any \
+	CurrentC \
+	CurrentS \
+	DynAnyC \
+	DynAnyS \
+	DynAny_i \
+	DynArray_i \
+	DynEnum_i \
+	DynSequence_i \
+	DynStruct_i \
+	DynUnion_i \
+	Exception \
+	Environment \
+        Forwarding_Servant \
+	InconsistentTypeCodeC \
+	Managed_Types	\
+	NVList \
+	Object \
+	ORB \
+	POA \
+	POAC \
+	POAS \
+	PolicyC \
+	PolicyS \
+	Principal \
+	Request \
+	Sequence \
+	Server_Request \
+	Pluggable \
+	MProfile \
+	IIOP_Profile \
+	IIOP_Transport \
+	IIOP_Connector \
+	IIOP_Acceptor \
+	Stub \
+	Typecode \
+	Union \
+	CDR \
+	Client_Strategy_Factory \
+	Connect \
+	append \
+	debug \
+	decode \
+	deep_free \
+	default_client \
+	default_server \
+	Object_KeyC \
+	encode \
+	GIOP \
+	Invocation \
+	IIOP_ORB \
+	IIOP_Interpreter \
+	Marshal \
+	Active_Object_Map \
+	Operation_Table \
+	ORB_Core \
+	params \
+	Server_Strategy_Factory \
+	Servant_Base \
+	skip \
+	TAO_Internal \
+	Typecode_Constants \
+	TAO
 
-PLUGGABLE_PROTOCOLS_FILES = \
-  Pluggable \
-  IIOP_Profile \
-  IIOP_Transport \
-  IIOP_Connector \
-  IIOP_Acceptor
-
-DEFAULT_RESOURCES_FILES = \
-  default_client \
-  default_server \
-  default_resource
-
-INTERPRETIVE_MARSHALING_FILES = \
-  append \
-  decode \
-  deep_free \
-  encode \
-  CDR_Interpreter \
-  Marshal \
-  skip
-
-IDL_COMPILER_FILES = \
-  Managed_Types \
-  Union \
-  Operation_Table
-
-ORB_CORE_FILES = \
-  Any \
-  CurrentC \
-  CurrentS \
-  Exception \
-  WrongTransactionC \
-  Environment \
-  Object \
-  ORB \
-  corbafwd \
-  PolicyC \
-  PolicyS \
-  DomainC \
-  DomainS \
-  TimeBaseC \
-  TimeBaseS \
-  Principal \
-  Sequence \
-  Server_Request \
-  MProfile \
-  Stub \
-  Typecode \
-  ValueBase \
-  ValueFactory \
-  ValueFactory_Map \
-  CDR \
-  Client_Strategy_Factory \
-  Connect \
-  debug \
-  Object_KeyC \
-  GIOP \
-  GIOP_Server_Request \
-  Invocation \
-  ORB_Core \
-  params \
-  Resource_Factory \
-  Server_Strategy_Factory \
-  TAO_Internal \
-  Typecode_Constants \
-  IOR_LookupTable \
-  TAO
-
-DYNAMIC_ANY_FILES =
-
-ifndef minimum_corba
-  minimum_corba = 0
-endif # minimum_corba
-
-ifeq ($(minimum_corba),0)
-
-POA_FILES += \
-  Forwarding_Servant
-
-ORB_CORE_FILES += \
-  Context \
-  Request \
-  Services \
-  NVList \
-  ObjectIDList
-
-DYNAMIC_ANY_FILES += \
-  DynAnyC \
-  DynAnyS \
-  DynAny_i \
-  DynArray_i \
-  DynEnum_i \
-  DynSequence_i \
-  DynStruct_i \
-  DynUnion_i \
-  InconsistentTypeCodeC
-
-endif # minimum_corba
-
-ifndef corba_messaging
-  corba_messaging = 1
-endif # corba_messaging
-
-ifeq ($(corba_messaging),1)
-ORB_CORE_FILES += \
-  MessagingC \
-  MessagingS \
-  Policy_Manager
-
-CPPFLAGS += -DTAO_HAS_CORBA_MESSAGING
-
-endif # corba_messaging
+FILES    = $(ORBCORE_SRCS)
 
 ifndef TAO_ROOT
 TAO_ROOT = $(ACE_ROOT)/TAO
@@ -160,78 +92,35 @@ endif
 BIN = # t-sizes
 
 DEFS    = $(addsuffix .h,$(PUB_HDRS))
+LSRC    = $(addsuffix .cpp,$(FILES))
+LSRC2   = $(addsuffix .cpp,$(TEMPLATE_FILES))
 
 LDLIBS = -lACE
 LIBS = -lACE
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-
-####
-#### Build customization.
-####
-ifndef TAO_COMPONENTS
-  TAO_COMPONENTS = \
-    POA \
-    Pluggable_Protocols \
-    Default_Resources \
-    Interpretive_Marshaling \
-    IDL_Compiler \
-    ORB_Core \
-    Dynamic_Any
-endif # TAO_COMPONENTS
-
-####
-#### TAO_COMPONENTS support.
-####
-ifneq (,$(findstring POA,$(TAO_COMPONENTS)))
-  FILES += $(POA_FILES)
-endif # POA
-
-ifneq (,$(findstring Pluggable_Protocols,$(TAO_COMPONENTS)))
-  FILES += $(PLUGGABLE_PROTOCOLS_FILES)
-endif # Pluggable_Protocols
-
-ifneq (,$(findstring Default_Resources,$(TAO_COMPONENTS)))
-  FILES += $(DEFAULT_RESOURCES_FILES)
-endif # Default_Resources
-
-ifneq (,$(findstring Interpretive_Marshaling,$(TAO_COMPONENTS)))
-  FILES += $(INTERPRETIVE_MARSHALING_FILES)
-endif # Interpretive_Marshaling
-
-ifneq (,$(findstring IDL_Compiler,$(TAO_COMPONENTS)))
-  FILES += $(IDL_COMPILER_FILES)
-endif # IDL_Compiler
-
-ifneq (,$(findstring ORB_Core,$(TAO_COMPONENTS)))
-  FILES += $(ORB_CORE_FILES)
-endif # ORB_Core
-
-ifneq (,$(findstring Dynamic_Any,$(TAO_COMPONENTS)))
-  FILES += $(DYNAMIC_ANY_FILES)
-endif # Dynamic_Any
-
-LSRC    = $(addsuffix .cpp,$(FILES))
-BUILD   += TAO_COMPONENTS
-
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
+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.lib.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.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 $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets (and local hacks)
+#	Local targets (and local hacks)
 #----------------------------------------------------------------------------
 
+ifeq ($(shared_libs),)
+  override fakesvcconf = 1
+endif # ($(shared_libs),)
+
 ifeq ($(fakesvcconf),1)
   CPPFLAGS += -DTAO_PLATFORM_SVC_CONF_FILE_NOTSUP
 endif
@@ -242,29 +131,25 @@ LDFLAGS += $(RLDFLAGS)
 .PRECIOUS: Object_KeyC.h Object_KeyC.i Object_KeyC.cpp
 .PRECIOUS: POAS.h POAS.i POAS.cpp POAC.h POAC.i POAC.cpp
 
-.PHONY: TAO_COMPONENTS
-TAO_COMPONENTS:
-	@$(ACE_ROOT)/bin/ace_components --tao --set " $(TAO_COMPONENTS) "
-
-realclean:
-	@$(ACE_ROOT)/bin/ace_components --tao --remove
-
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Object_Adapter.o .obj/Object_Adapter.so .shobj/Object_Adapter.o .shobj/Object_Adapter.so: Object_Adapter.cpp \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Key_Adapters.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 \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -324,196 +209,32 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(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/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 \
- $(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/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/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.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/Object.h \
+ $(TAO_ROOT)/tao/Object.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/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/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.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/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(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/ORB.i
+.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -573,63 +294,21 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(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/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 \
- $(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/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/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.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/MProfile.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -638,258 +317,20 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.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
-.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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/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/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/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/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(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/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.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/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/Any.i \
  $(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/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/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.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/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Forwarding_Servant.h
-.obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i
+.obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -898,6 +339,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -957,35 +401,9 @@ realclean:
  $(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/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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(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/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1012,142 +430,56 @@ realclean:
  $(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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/ORB.i \
+ $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(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/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/POAS.o .obj/POAS.so .shobj/POAS.o .shobj/POAS.so: POAS.cpp \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Server_Request.i
+.obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp \
+ $(TAO_ROOT)/tao/DynAnyC.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1207,15 +539,22 @@ realclean:
  $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1223,151 +562,31 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(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 \
- $(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/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/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/Operation_Table.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/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/POAManager.o .obj/POAManager.so .shobj/POAManager.o .shobj/POAManager.so: POAManager.cpp \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h
+.obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \
+ $(TAO_ROOT)/tao/DynAnyC.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1427,15 +646,22 @@ realclean:
  $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -1443,153 +669,27 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(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 \
- $(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/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/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i
-.obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.cpp \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Key_Adapters.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i
+.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1649,152 +749,59 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(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/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 \
- $(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/POAC.h \
+ $(TAO_ROOT)/tao/POA_CORBA.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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp \
- $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/DynStruct_i.h \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ $(TAO_ROOT)/tao/DynEnum_i.h \
+ $(TAO_ROOT)/tao/DynArray_i.h \
+ $(TAO_ROOT)/tao/DynUnion_i.h \
+ $(TAO_ROOT)/tao/DynUnion_i_T.h \
+ $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1854,196 +861,53 @@ realclean:
  $(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/POA_CORBA.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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Operation_Table.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 \
- $(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 \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(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/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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/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/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Server_Request.h \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Server_Request.i
-.obj/Forwarding_Servant.o .obj/Forwarding_Servant.so .shobj/Forwarding_Servant.o .shobj/Forwarding_Servant.so: Forwarding_Servant.cpp \
- $(TAO_ROOT)/tao/Forwarding_Servant.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/DynArray_i.h \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2051,17 +915,12 @@ realclean:
  $(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/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 \
- $(TAO_ROOT)/tao/Servant_Base.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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -2106,79 +965,55 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/POA_CORBA.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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.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/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.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
-.obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
- $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/DynEnum_i.h \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2238,62 +1073,53 @@ realclean:
  $(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/Pluggable.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i
-.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/DynSequence_i.h \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2307,6 +1133,10 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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 \
@@ -2320,17 +1150,6 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/Pluggable.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.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 \
@@ -2360,191 +1179,53 @@ realclean:
  $(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/Pluggable.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.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/ORB.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.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/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/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
- $(TAO_ROOT)/tao/IIOP_Transport.h \
- $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/DynStruct_i.h \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp \
+ $(TAO_ROOT)/tao/DynAny_i.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2604,331 +1285,55 @@ realclean:
  $(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/Pluggable.i \
- $(TAO_ROOT)/tao/GIOP.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/GIOP.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(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/Acceptor.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/Service_Config.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(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/Thread_Manager.h \
- $(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/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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.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/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(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/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ $(TAO_ROOT)/tao/DynUnion_i.h \
+ $(TAO_ROOT)/tao/DynUnion_i_T.h \
+ $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
+.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
+ $(TAO_ROOT)/tao/Exception.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2942,11 +1347,9 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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/Signal.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 \
@@ -2954,358 +1357,81 @@ realclean:
  $(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/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/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/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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Pluggable.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/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/GIOP.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/GIOP.i
-.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/Message_Queue.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(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/Connect.i \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(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/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
- $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i
+.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
+ $(TAO_ROOT)/tao/Environment.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3365,219 +1491,16 @@ realclean:
  $(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/Server_Strategy_Factory.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/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/default_server.i
-.obj/default_resource.o .obj/default_resource.so .shobj/default_resource.o .shobj/default_resource.so: default_resource.cpp \
- $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Event_Handler.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/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/Event_Handler.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(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/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/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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -3611,11 +1534,6 @@ realclean:
  $(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 \
@@ -3625,7 +1543,6 @@ realclean:
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -3665,14 +1582,10 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/Pluggable.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/Pluggable.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -3681,107 +1594,60 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/POA.h \
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(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/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/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Active_Object_Map.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/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/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/default_resource.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
+.obj/Forwarding_Servant.o .obj/Forwarding_Servant.so .shobj/Forwarding_Servant.o .shobj/Forwarding_Servant.so: Forwarding_Servant.cpp \
+ $(TAO_ROOT)/tao/Forwarding_Servant.h \
+ $(TAO_ROOT)/tao/Servant_Base.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3841,69 +1707,54 @@ realclean:
  $(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/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.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/debug.h
-.obj/decode.o .obj/decode.so .shobj/decode.o .shobj/decode.so: decode.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Server_Request.i
+.obj/InconsistentTypeCodeC.o .obj/InconsistentTypeCodeC.so .shobj/InconsistentTypeCodeC.o .shobj/InconsistentTypeCodeC.so: InconsistentTypeCodeC.cpp \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/Exception.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -3963,171 +1814,20 @@ realclean:
  $(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/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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/Sequence.h \
+ $(TAO_ROOT)/tao/ORB.i
+.obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/deep_free.o .obj/deep_free.so .shobj/deep_free.o .shobj/deep_free.so: deep_free.cpp \
- $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4187,78 +1887,20 @@ realclean:
  $(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/Typecode.h \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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/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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.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/Stub.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Union.h
-.obj/encode.o .obj/encode.so .shobj/encode.o .shobj/encode.so: encode.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/Managed_Types.i
+.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4272,6 +1914,10 @@ realclean:
  $(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/Containers.i \
+ $(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 \
@@ -4296,11 +1942,6 @@ 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 \
@@ -4310,6 +1951,11 @@ realclean:
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(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 \
@@ -4318,78 +1964,30 @@ realclean:
  $(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/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.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/Stub.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Union.h
-.obj/CDR_Interpreter.o .obj/CDR_Interpreter.so .shobj/CDR_Interpreter.o .shobj/CDR_Interpreter.so: CDR_Interpreter.cpp \
- $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/ORB.i
+.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
+ $(TAO_ROOT)/tao/Object.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4449,38 +2047,56 @@ realclean:
  $(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/Object.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.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/CDR_Interpreter.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Request.h \
+ $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
  $(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/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/Union.h
-.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Request.i
+.obj/ORB.o .obj/ORB.so .shobj/ORB.o .shobj/ORB.so: ORB.cpp \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4494,9 +2110,10 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -4504,136 +2121,39 @@ realclean:
  $(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/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.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/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/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(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
-.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
- $(TAO_ROOT)/tao/Marshal.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.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_Dgram.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/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 \
@@ -4641,20 +2161,15 @@ 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 \
- $(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 \
+ $(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/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
@@ -4663,36 +2178,55 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
+ $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.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 \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(TAO_ROOT)/tao/Object_KeyC.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/Object_KeyC.i \
+ $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(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 \
@@ -4704,93 +2238,8 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/Managed_Types.o .obj/Managed_Types.so .shobj/Managed_Types.o .shobj/Managed_Types.so: Managed_Types.cpp \
- $(TAO_ROOT)/tao/Managed_Types.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Managed_Types.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/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 \
@@ -4801,38 +2250,81 @@ realclean:
  $(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/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Union.o .obj/Union.so .shobj/Union.o .shobj/Union.so: Union.cpp \
- $(TAO_ROOT)/tao/Union.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/TAO_Internal.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -4846,72 +2338,10 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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/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/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
-.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \
- $(TAO_ROOT)/tao/Operation_Table.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(TAO_ROOT)/tao/POA.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.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/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/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/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
@@ -4975,9 +2405,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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -4989,144 +2419,133 @@ realclean:
  $(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/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Any.o .obj/Any.so .shobj/Any.o .shobj/Any.so: Any.cpp \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/CDR.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Marshal.h \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Marshal.i
-.obj/CurrentC.o .obj/CurrentC.so .shobj/CurrentC.o .shobj/CurrentC.so: CurrentC.cpp \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/ORB_Core.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Forwarding_Servant.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h
+.obj/POAC.o .obj/POAC.so .shobj/POAC.o .shobj/POAC.so: POAC.cpp \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -5134,6 +2553,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5193,146 +2615,40 @@ realclean:
  $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.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/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.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
-.obj/CurrentS.o .obj/CurrentS.so .shobj/CurrentS.o .shobj/CurrentS.so: CurrentS.cpp \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/POA.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -5359,204 +2675,30 @@ 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/POA_CORBA.h \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.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
-.obj/Exception.o .obj/Exception.so .shobj/Exception.o .shobj/Exception.so: Exception.cpp \
- $(TAO_ROOT)/tao/Exception.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Exception.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i
+.obj/POAS.o .obj/POAS.so .shobj/POAS.o .shobj/POAS.so: POAS.cpp \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/WrongTransactionC.o .obj/WrongTransactionC.so .shobj/WrongTransactionC.o .shobj/WrongTransactionC.so: WrongTransactionC.cpp WrongTransactionC.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Exception.h \
- $(TAO_ROOT)/tao/Exception.i
-.obj/Environment.o .obj/Environment.so .shobj/Environment.o .shobj/Environment.so: Environment.cpp \
- $(TAO_ROOT)/tao/Environment.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5616,38 +2758,45 @@ realclean:
  $(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.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.h \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/DynAnyC.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.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/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -5674,38 +2823,17 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.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/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5713,9 +2841,22 @@ realclean:
  $(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.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/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -5746,7 +2887,6 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -5754,12 +2894,19 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/Object.o .obj/Object.so .shobj/Object.o .shobj/Object.so: Object.cpp \
+.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
@@ -5767,6 +2914,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5826,181 +2976,54 @@ realclean:
  $(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/Object.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/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Stub.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/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.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/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/Invocation.i \
- $(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 \
+ $(TAO_ROOT)/tao/DynAnyC.i
+.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6060,10 +3083,20 @@ realclean:
  $(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/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -6090,187 +3123,45 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.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/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.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_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.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/Stub.i \
- $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/IIOP_Profile.i \
- $(TAO_ROOT)/tao/DynAny_i.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/POA_CORBA.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.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/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/IIOP_Acceptor.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/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/poa_macros.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAS.h \
- $(TAO_ROOT)/tao/POAS.i \
- $(TAO_ROOT)/tao/Active_Object_Map.h \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.i \
- $(TAO_ROOT)/tao/Request.i \
- $(TAO_ROOT)/tao/ValueFactory_Map.h \
- $(TAO_ROOT)/tao/ValueFactory_Map.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h
-.obj/corbafwd.o .obj/corbafwd.so .shobj/corbafwd.o .shobj/corbafwd.so: corbafwd.cpp \
+ $(TAO_ROOT)/tao/Servant_Base.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 \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6330,17 +3221,32 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/PolicyC.o .obj/PolicyC.so .shobj/PolicyC.o .shobj/PolicyC.so: PolicyC.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i
+.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
+ $(TAO_ROOT)/tao/Request.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6400,165 +3306,40 @@ realclean:
  $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.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/PolicyC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Request.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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/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/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/PolicyS.o .obj/PolicyS.so .shobj/PolicyS.o .shobj/PolicyS.so: PolicyS.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Stub.i
+.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
+ $(TAO_ROOT)/tao/Sequence.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6618,85 +3399,24 @@ realclean:
  $(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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.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/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Operation_Table.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Sequence.i
+.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
  $(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/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i
-.obj/DomainC.o .obj/DomainC.so .shobj/DomainC.o .shobj/DomainC.so: DomainC.cpp \
- $(TAO_ROOT)/tao/DomainC.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6756,48 +3476,48 @@ realclean:
  $(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/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/Object_KeyC.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Server_Request.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DomainC.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/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 \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -6814,45 +3534,20 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -6860,9 +3555,25 @@ realclean:
  $(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.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -6892,6 +3603,7 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -6899,24 +3611,37 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp
-.obj/DomainS.o .obj/DomainS.so .shobj/DomainS.o .shobj/DomainS.so: DomainS.cpp DomainC.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h
+.obj/Pluggable.o .obj/Pluggable.so .shobj/Pluggable.o .shobj/Pluggable.so: Pluggable.cpp \
+ $(TAO_ROOT)/tao/Pluggable.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -6976,18 +3701,18 @@ realclean:
  $(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/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/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -6995,70 +3720,18 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(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/Operation_Table.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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(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/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i
-.obj/TimeBaseC.o .obj/TimeBaseC.so .shobj/TimeBaseC.o .shobj/TimeBaseC.so: TimeBaseC.cpp TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/GIOP.i
+.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
+ $(TAO_ROOT)/tao/MProfile.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7118,28 +3791,20 @@ realclean:
  $(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/Pluggable.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/Environment.h \
- $(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
-.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 \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/Typecode.i
+.obj/IIOP_Profile.o .obj/IIOP_Profile.so .shobj/IIOP_Profile.o .shobj/IIOP_Profile.so: IIOP_Profile.cpp \
+ $(TAO_ROOT)/tao/IIOP_Profile.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7153,10 +3818,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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 \
@@ -7170,6 +3831,17 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/Pluggable.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.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 \
@@ -7199,26 +3871,162 @@ realclean:
  $(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/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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 \
+ $(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/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/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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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 \
- 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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/IIOP_Transport.o .obj/IIOP_Transport.so .shobj/IIOP_Transport.o .shobj/IIOP_Transport.so: IIOP_Transport.cpp \
+ $(TAO_ROOT)/tao/IIOP_Transport.h \
+ $(TAO_ROOT)/tao/Pluggable.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7278,216 +4086,22 @@ realclean:
  $(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/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Principal.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
-.obj/Sequence.o .obj/Sequence.so .shobj/Sequence.o .shobj/Sequence.so: Sequence.cpp \
- $(TAO_ROOT)/tao/Sequence.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i
-.obj/Server_Request.o .obj/Server_Request.so .shobj/Server_Request.o .shobj/Server_Request.so: Server_Request.cpp \
- $(TAO_ROOT)/tao/Server_Request.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Object_KeyC.h \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.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/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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(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 \
+ $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
@@ -7497,22 +4111,14 @@ realclean:
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Acceptor.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/Service_Config.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
@@ -7528,6 +4134,16 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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 \
@@ -7549,10 +4165,13 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -7566,31 +4185,20 @@ realclean:
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(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
-.obj/MProfile.o .obj/MProfile.so .shobj/MProfile.o .shobj/MProfile.so: MProfile.cpp \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/Connect.i
+.obj/IIOP_Connector.o .obj/IIOP_Connector.so .shobj/IIOP_Connector.o .shobj/IIOP_Connector.so: IIOP_Connector.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7604,9 +4212,11 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -7614,137 +4224,34 @@ realclean:
  $(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/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/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.i
-.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/Pluggable.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/Mem_Map.h \
+ $(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/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/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/Pluggable.i \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.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 \
@@ -7756,54 +4263,6 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
@@ -7816,12 +4275,27 @@ realclean:
  $(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/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 \
@@ -7843,6 +4317,9 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
@@ -7861,6 +4338,17 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.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/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -7868,24 +4356,68 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(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/Dynamic_Service.cpp
+.obj/IIOP_Acceptor.o .obj/IIOP_Acceptor.so .shobj/IIOP_Acceptor.o .shobj/IIOP_Acceptor.so: IIOP_Acceptor.cpp \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -7899,23 +4431,28 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/Signal.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 \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -7925,56 +4462,134 @@ realclean:
  $(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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(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/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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Pluggable.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/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/CDR_Interpreter.h \
- $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Managed_Types.i \
  $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/ValueBase.o .obj/ValueBase.so .shobj/ValueBase.o .shobj/ValueBase.so: ValueBase.cpp \
- $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i
+.obj/Stub.o .obj/Stub.so .shobj/Stub.o .shobj/Stub.so: Stub.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8034,24 +4649,40 @@ realclean:
  $(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/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/MProfile.h \
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.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/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/NVList.i \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -8068,62 +4699,20 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -8131,9 +4720,25 @@ realclean:
  $(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.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -8163,8 +4768,6 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -8172,21 +4775,45 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i
-.obj/ValueFactory.o .obj/ValueFactory.so .shobj/ValueFactory.o .shobj/ValueFactory.so: ValueFactory.cpp \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8200,10 +4827,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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 \
@@ -8217,6 +4840,13 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(TAO_ROOT)/tao/Exception.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.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 \
@@ -8246,13 +4876,36 @@ realclean:
  $(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/ValueFactory.i
-.obj/ValueFactory_Map.o .obj/ValueFactory_Map.so .shobj/ValueFactory_Map.o .shobj/ValueFactory_Map.so: ValueFactory_Map.cpp \
- $(TAO_ROOT)/tao/ValueFactory_Map.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.h \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Principal.i
+.obj/Union.o .obj/Union.so .shobj/Union.o .shobj/Union.so: Union.cpp \
+ $(TAO_ROOT)/tao/Union.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8260,21 +4913,15 @@ realclean:
  $(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/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/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/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 \
@@ -8289,53 +4936,27 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(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/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.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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(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 \
@@ -8343,30 +4964,14 @@ realclean:
  $(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/ValueFactory_Map.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i
+ $(ACE_ROOT)/ace/CORBA_macros.h
 .obj/CDR.o .obj/CDR.so .shobj/CDR.o .shobj/CDR.so: CDR.cpp \
- $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8431,48 +5036,17 @@ realclean:
  $(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/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.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/PolicyC.i \
- $(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 \
- $(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.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -8489,38 +5063,20 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -8528,9 +5084,27 @@ realclean:
  $(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.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -8561,7 +5135,6 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -8569,14 +5142,46 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/singletons.h \
- $(TAO_ROOT)/tao/Marshal.h \
- $(TAO_ROOT)/tao/Marshal.i
+ $(TAO_ROOT)/tao/singletons.h
 .obj/Client_Strategy_Factory.o .obj/Client_Strategy_Factory.so .shobj/Client_Strategy_Factory.o .shobj/Client_Strategy_Factory.so: Client_Strategy_Factory.cpp \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -8584,6 +5189,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8685,52 +5293,12 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(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/Connect.i
+ $(ACE_ROOT)/ace/CORBA_macros.h
 .obj/Connect.o .obj/Connect.so .shobj/Connect.o .shobj/Connect.so: Connect.cpp \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -8738,6 +5306,9 @@ realclean:
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -8882,63 +5453,36 @@ realclean:
  $(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/Connect.i \
  $(TAO_ROOT)/tao/Timeprobe.h \
  $(ACE_ROOT)/ace/Timeprobe.h \
  $(TAO_ROOT)/tao/IIOP_Transport.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/GIOP.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
  $(TAO_ROOT)/tao/Server_Request.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
@@ -8948,48 +5492,47 @@ realclean:
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/POA.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/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Active_Object_Map.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/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/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
+ $(TAO_ROOT)/tao/POA.i \
  $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
- $(TAO_ROOT)/tao/POA.i
-.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
- $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/append.o .obj/append.so .shobj/append.o .shobj/append.so: append.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9049,15 +5592,38 @@ realclean:
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i
-.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
- $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/GIOP.i
+.obj/debug.o .obj/debug.so .shobj/debug.o .shobj/debug.so: debug.cpp \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9116,25 +5682,18 @@ realclean:
  $(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/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i
-.obj/GIOP.o .obj/GIOP.so .shobj/GIOP.o .shobj/GIOP.so: GIOP.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h
+.obj/decode.o .obj/decode.so .shobj/decode.o .shobj/decode.so: decode.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9194,55 +5753,51 @@ realclean:
  $(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/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/GIOP.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(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/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/debug.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(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 \
- $(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 \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Union.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -9259,38 +5814,20 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -9298,9 +5835,25 @@ realclean:
  $(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.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -9319,14 +5872,10 @@ realclean:
  $(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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
@@ -9337,20 +5886,41 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.obj/GIOP_Server_Request.o .obj/GIOP_Server_Request.so .shobj/GIOP_Server_Request.o .shobj/GIOP_Server_Request.so: GIOP_Server_Request.cpp \
- $(TAO_ROOT)/tao/GIOP_Server_Request.h \
- $(TAO_ROOT)/tao/Server_Request.h \
+.obj/deep_free.o .obj/deep_free.so .shobj/deep_free.o .shobj/deep_free.so: deep_free.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9410,171 +5980,36 @@ realclean:
  $(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/Object_KeyC.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/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Server_Request.i \
- $(TAO_ROOT)/tao/GIOP_Server_Request.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/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/Marshal.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/NVList.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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 \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i
+.obj/default_client.o .obj/default_client.so .shobj/default_client.o .shobj/default_client.so: default_client.cpp \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(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
-.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \
- $(TAO_ROOT)/tao/Invocation.h \
- $(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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9588,9 +6023,15 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -9598,89 +6039,34 @@ realclean:
  $(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/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/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/Mem_Map.h \
+ $(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/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/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/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/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.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/PolicyC.i \
- $(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 \
- $(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 \
@@ -9692,38 +6078,20 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -9731,9 +6099,40 @@ realclean:
  $(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.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 \
+ $(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/default_client.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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 \
@@ -9764,7 +6163,10 @@ realclean:
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -9772,31 +6174,60 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.i \
- $(TAO_ROOT)/tao/Stub.h \
- $(TAO_ROOT)/tao/MProfile.h \
- $(TAO_ROOT)/tao/MProfile.i \
- $(TAO_ROOT)/tao/Stub.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/Timeprobe.h \
- $(ACE_ROOT)/ace/Timeprobe.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i
-.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/default_server.o .obj/default_server.so .shobj/default_server.o .shobj/default_server.so: default_server.cpp \
+ $(TAO_ROOT)/tao/default_server.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -9810,6 +6241,10 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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 \
@@ -9823,19 +6258,6 @@ realclean:
  $(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 \
- $(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.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 \
@@ -9849,6 +6271,11 @@ realclean:
  $(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 \
@@ -9860,50 +6287,15 @@ realclean:
  $(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/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(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 \
- $(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/Server_Strategy_Factory.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/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -9915,38 +6307,20 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(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/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/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 \
@@ -9954,9 +6328,19 @@ realclean:
  $(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.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/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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 \
@@ -9968,10 +6352,13 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -9985,75 +6372,83 @@ realclean:
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i \
- $(ACE_ROOT)/ace/Env_Value_T.cpp \
- $(ACE_ROOT)/ace/Arg_Shifter.h \
- $(TAO_ROOT)/tao/TAO_Internal.h \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/ORB_Strategies_T.h \
  $(TAO_ROOT)/tao/ORB_Strategies_T.i \
  $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
  $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/default_resource.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/POA.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/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Active_Object_Map.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/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/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/debug.h
-.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
- $(TAO_ROOT)/tao/params.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/Object_KeyC.o .obj/Object_KeyC.so .shobj/Object_KeyC.o .shobj/Object_KeyC.so: Object_KeyC.cpp \
+ $(TAO_ROOT)/tao/Object_KeyC.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10067,12 +6462,6 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -10119,42 +6508,28 @@ realclean:
  $(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/params.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
-.obj/Resource_Factory.o .obj/Resource_Factory.so .shobj/Resource_Factory.o .shobj/Resource_Factory.so: Resource_Factory.cpp \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Managed_Types.i \
+ $(TAO_ROOT)/tao/Sequence.i \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i
+.obj/encode.o .obj/encode.so .shobj/encode.o .shobj/encode.so: encode.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10168,19 +6543,9 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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/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/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 \
@@ -10188,140 +6553,82 @@ realclean:
  $(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/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Service_Config.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/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.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/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/IIOP_Connector.h \
- $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.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/Pluggable.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp
-.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 \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Principal.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/Principal.i \
+ $(TAO_ROOT)/tao/varout.h \
+ $(TAO_ROOT)/tao/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Union.h
+.obj/GIOP.o .obj/GIOP.so .shobj/GIOP.o .shobj/GIOP.so: GIOP.cpp \
+ $(TAO_ROOT)/tao/GIOP.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10335,15 +6642,9 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Signal.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 \
@@ -10351,34 +6652,73 @@ realclean:
  $(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/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.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/CDR_Stream.i \
+ $(TAO_ROOT)/tao/try_macros.h \
+ $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/CORBA_macros.h \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(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/GIOP.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/debug.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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 \
@@ -10412,19 +6752,22 @@ realclean:
  $(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 \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -10440,13 +6783,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -10460,25 +6800,56 @@ realclean:
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(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/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i
-.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.cpp \
- $(TAO_ROOT)/tao/TAO_Internal.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/Invocation.o .obj/Invocation.so .shobj/Invocation.o .shobj/Invocation.so: Invocation.cpp \
+ $(TAO_ROOT)/tao/Invocation.h \
+ $(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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -10538,7 +6909,17 @@ realclean:
  $(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/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -10555,15 +6936,6 @@ realclean:
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(TAO_ROOT)/tao/default_server.h \
- $(TAO_ROOT)/tao/Server_Strategy_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 \
@@ -10580,6 +6952,10 @@ realclean:
  $(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/Message_Queue.h \
  $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
@@ -10588,8 +6964,16 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -10605,13 +6989,10 @@ realclean:
  $(ACE_ROOT)/ace/Svc_Handler.i \
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -10625,339 +7006,76 @@ realclean:
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.h \
- $(TAO_ROOT)/tao/ORB_Strategies_T.i \
- $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.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/ORB.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(ACE_ROOT)/ace/Dynamic_Service.h \
- $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/default_server.i \
- $(TAO_ROOT)/tao/default_client.h \
- $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
- $(TAO_ROOT)/tao/default_client.i \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/IIOP_Acceptor.h \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POAS.i \
  $(TAO_ROOT)/tao/Object_KeyC.h \
  $(TAO_ROOT)/tao/Object_KeyC.i \
  $(TAO_ROOT)/tao/Active_Object_Map.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/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/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
- $(TAO_ROOT)/tao/default_resource.i
-.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.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/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- $(TAO_ROOT)/tao/Exception.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.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/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/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/Exception.i \
- $(TAO_ROOT)/tao/Typecode.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
  $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i
-.obj/IOR_LookupTable.o .obj/IOR_LookupTable.so .shobj/IOR_LookupTable.o .shobj/IOR_LookupTable.so: IOR_LookupTable.cpp \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.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/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/Event_Handler.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.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/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/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/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/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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/debug.h
-.obj/TAO.o .obj/TAO.so .shobj/TAO.o .shobj/TAO.so: TAO.cpp \
- $(TAO_ROOT)/tao/TAO.h \
+ $(TAO_ROOT)/tao/Invocation.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Principal.h \
+ $(TAO_ROOT)/tao/Principal.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h
+.obj/IIOP_ORB.o .obj/IIOP_ORB.so .shobj/IIOP_ORB.o .shobj/IIOP_ORB.so: IIOP_ORB.cpp \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11017,32 +7135,41 @@ realclean:
  $(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/ORB.i \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/IIOP_Profile.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/Object_KeyC.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/Object_KeyC.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.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 \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/POA.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -11069,17 +7196,108 @@ realclean:
  $(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/ORB.i
-.obj/Context.o .obj/Context.so .shobj/Context.o .shobj/Context.so: Context.cpp \
- $(TAO_ROOT)/tao/Context.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(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/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/ORB_Core.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 \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/IIOP_Interpreter.o .obj/IIOP_Interpreter.so .shobj/IIOP_Interpreter.o .shobj/IIOP_Interpreter.so: IIOP_Interpreter.cpp \
+ $(TAO_ROOT)/tao/IIOP_Interpreter.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11139,65 +7357,44 @@ realclean:
  $(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/Context.i \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.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/varout.i \
+ $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/Union.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/Request.o .obj/Request.so .shobj/Request.o .shobj/Request.so: Request.cpp \
- $(TAO_ROOT)/tao/Request.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/Sequence_T.cpp
+.obj/Marshal.o .obj/Marshal.so .shobj/Marshal.o .shobj/Marshal.so: Marshal.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11205,16 +7402,12 @@ realclean:
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -11259,78 +7452,29 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/NVList.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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/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/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/Context.h \
- $(TAO_ROOT)/tao/Context.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/Request.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/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/ORB.i \
- $(TAO_ROOT)/tao/Stub.i
-.obj/Services.o .obj/Services.so .shobj/Services.o .shobj/Services.so: Services.cpp \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(TAO_ROOT)/tao/Environment.i
+.obj/Active_Object_Map.o .obj/Active_Object_Map.so .shobj/Active_Object_Map.o .shobj/Active_Object_Map.so: Active_Object_Map.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -11344,9 +7488,16 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(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/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.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_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -11361,153 +7512,36 @@ realclean:
  $(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/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/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/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/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/Services.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/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i
-.obj/NVList.o .obj/NVList.so .shobj/NVList.o .shobj/NVList.so: NVList.cpp \
- $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/orbconf.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/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/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_T.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(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/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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(TAO_ROOT)/tao/Any.h \
- $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.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 \
@@ -11519,75 +7553,9 @@ realclean:
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i
-.obj/ObjectIDList.o .obj/ObjectIDList.so .shobj/ObjectIDList.o .shobj/ObjectIDList.so: ObjectIDList.cpp ObjectIDList.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/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/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 \
  $(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.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 \
@@ -11596,118 +7564,29 @@ realclean:
  $(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/Servant_Base.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -11715,6 +7594,8 @@ realclean:
  $(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 \
@@ -11729,270 +7610,20 @@ realclean:
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.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/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/WrongTransactionC.h \
- ObjectIDList.i
-.obj/MessagingC.o .obj/MessagingC.so .shobj/MessagingC.o .shobj/MessagingC.so: MessagingC.cpp \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/orbconf.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/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/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 \
- $(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.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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Any.h \
- $(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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.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/PolicyC.i \
- $(TAO_ROOT)/tao/iopfwd.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(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/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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/MessagingS.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/Stub.i \
- $(TAO_ROOT)/tao/Invocation.h \
- $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
- $(TAO_ROOT)/tao/Resource_Factory.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
  $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/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 \
@@ -12022,6 +7653,9 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
@@ -12029,18 +7663,37 @@ realclean:
  $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.i \
  $(ACE_ROOT)/ace/Dynamic_Service.h \
  $(ACE_ROOT)/ace/Dynamic_Service.cpp \
- $(TAO_ROOT)/tao/GIOP.h \
- $(TAO_ROOT)/tao/GIOP.i \
- $(TAO_ROOT)/tao/Invocation.i
-.obj/MessagingS.o .obj/MessagingS.so .shobj/MessagingS.o .shobj/MessagingS.so: MessagingS.cpp \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h
+.obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \
+ $(TAO_ROOT)/tao/Operation_Table.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12055,17 +7708,14 @@ realclean:
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(TAO_ROOT)/tao/MessagingS.h \
- $(TAO_ROOT)/tao/TimeBaseS.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(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.i \
- $(ACE_ROOT)/ace/Malloc_T.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/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -12080,80 +7730,36 @@ realclean:
  $(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/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/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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(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 \
@@ -12165,167 +7771,38 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/iopfwd.h \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/MessagingS.i \
- $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(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
-.obj/Policy_Manager.o .obj/Policy_Manager.so .shobj/Policy_Manager.o .shobj/Policy_Manager.so: Policy_Manager.cpp \
- $(TAO_ROOT)/tao/orbconf.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/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/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 \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.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.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/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/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/ORB.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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.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 \
+ $(TAO_ROOT)/tao/ORB.i
+.obj/ORB_Core.o .obj/ORB_Core.so .shobj/ORB_Core.o .shobj/ORB_Core.so: ORB_Core.cpp \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/Policy_Manager.i
-.obj/DynAnyC.o .obj/DynAnyC.so .shobj/DynAnyC.o .shobj/DynAnyC.so: DynAnyC.cpp \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12333,19 +7810,16 @@ realclean:
  $(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/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 \
- $(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.i \
- $(ACE_ROOT)/ace/Malloc_T.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/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -12353,118 +7827,224 @@ realclean:
  $(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/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.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/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/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/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/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Env_Value_T.h \
+ $(ACE_ROOT)/ace/Env_Value_T.i \
+ $(ACE_ROOT)/ace/Env_Value_T.cpp \
+ $(ACE_ROOT)/ace/Arg_Shifter.h \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.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/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/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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(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/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.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/Stub.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/Servant_Base.h \
  $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/varout.h \
- $(TAO_ROOT)/tao/varout.i \
- $(TAO_ROOT)/tao/varout.cpp \
+ $(TAO_ROOT)/tao/POAS.h \
  $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i
-.obj/DynAnyS.o .obj/DynAnyS.so .shobj/DynAnyS.o .shobj/DynAnyS.so: DynAnyS.cpp \
  $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
+ $(TAO_ROOT)/tao/DynAnyC.i \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(TAO_ROOT)/tao/TAO_Internal.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.h \
+ $(TAO_ROOT)/tao/IIOP_ORB.i \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/default_server.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/debug.h
+.obj/params.o .obj/params.so .shobj/params.o .shobj/params.so: params.cpp \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12472,13 +8052,15 @@ realclean:
  $(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/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/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -12526,75 +8108,19 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/Any.h \
- $(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/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.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 \
+ $(TAO_ROOT)/tao/params.i
+.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 \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i
-.obj/DynAny_i.o .obj/DynAny_i.so .shobj/DynAny_i.o .shobj/DynAny_i.so: DynAny_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12602,19 +8128,21 @@ realclean:
  $(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/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 \
- $(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.i \
- $(ACE_ROOT)/ace/Malloc_T.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/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -12622,84 +8150,34 @@ realclean:
  $(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/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/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/Mem_Map.h \
+ $(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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.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 \
@@ -12711,29 +8189,95 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynStruct_i.h \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- $(TAO_ROOT)/tao/DynEnum_i.h \
- $(TAO_ROOT)/tao/DynArray_i.h \
- $(TAO_ROOT)/tao/DynUnion_i.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynArray_i.o .obj/DynArray_i.so .shobj/DynArray_i.o .shobj/DynArray_i.so: DynArray_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.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/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/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 \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(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/Connect.i
+.obj/Servant_Base.o .obj/Servant_Base.so .shobj/Servant_Base.o .shobj/Servant_Base.so: Servant_Base.cpp \
+ $(TAO_ROOT)/tao/Servant_Base.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12741,16 +8285,12 @@ realclean:
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -12795,35 +8335,31 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Servant_Base.i \
+ $(TAO_ROOT)/tao/Timeprobe.h \
+ $(ACE_ROOT)/ace/Timeprobe.h \
+ $(TAO_ROOT)/tao/Operation_Table.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -12850,23 +8386,123 @@ realclean:
  $(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/ORB.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(TAO_ROOT)/tao/ORB_Core.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/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Dynamic.h \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.h \
+ $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAS.h \
+ $(TAO_ROOT)/tao/POA_CORBA.h \
+ $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynArray_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynEnum_i.o .obj/DynEnum_i.so .shobj/DynEnum_i.o .shobj/DynEnum_i.so: DynEnum_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/POAS.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/Active_Object_Map.h \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/Server_Request.h \
+ $(TAO_ROOT)/tao/GIOP.h \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Server_Request.i
+.obj/skip.o .obj/skip.so .shobj/skip.o .shobj/skip.so: skip.cpp \
+ $(TAO_ROOT)/tao/Marshal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -12874,16 +8510,12 @@ realclean:
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -12928,78 +8560,40 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/Environment.h \
  $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.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 \
+ $(TAO_ROOT)/tao/Any.i
+.obj/TAO_Internal.o .obj/TAO_Internal.so .shobj/TAO_Internal.o .shobj/TAO_Internal.so: TAO_Internal.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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynEnum_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynSequence_i.o .obj/DynSequence_i.so .shobj/DynSequence_i.o .shobj/DynSequence_i.so: DynSequence_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13007,19 +8601,17 @@ realclean:
  $(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/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 \
- $(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.i \
- $(ACE_ROOT)/ace/Malloc_T.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/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -13027,84 +8619,34 @@ realclean:
  $(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/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/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/Mem_Map.h \
+ $(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/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/CDR_Stream.i \
- $(TAO_ROOT)/tao/try_macros.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.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 \
@@ -13116,113 +8658,30 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynSequence_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynStruct_i.o .obj/DynStruct_i.so .shobj/DynStruct_i.o .shobj/DynStruct_i.so: DynStruct_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.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/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/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/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(TAO_ROOT)/tao/default_server.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.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/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/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/IOR_LookupTable.h \
+ $(TAO_ROOT)/tao/Server_Strategy_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/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -13233,39 +8692,74 @@ realclean:
  $(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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynStruct_i.h \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/DynUnion_i.o .obj/DynUnion_i.so .shobj/DynUnion_i.o .shobj/DynUnion_i.so: DynUnion_i.cpp \
- $(TAO_ROOT)/tao/DynAny_i.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(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/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(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/Svc_Handler.i \
+ $(ACE_ROOT)/ace/Svc_Handler.cpp \
+ $(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/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(TAO_ROOT)/tao/Connect.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.h \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.i \
+ $(TAO_ROOT)/tao/ORB_Strategies_T.cpp \
+ $(TAO_ROOT)/tao/default_server.i \
+ $(TAO_ROOT)/tao/default_client.h \
+ $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/default_client.i \
+ $(TAO_ROOT)/tao/TAO_Internal.h
+.obj/Typecode_Constants.o .obj/Typecode_Constants.so .shobj/Typecode_Constants.o .shobj/Typecode_Constants.so: Typecode_Constants.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13273,20 +8767,12 @@ realclean:
  $(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/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 \
- $(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.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 \
@@ -13300,6 +8786,13 @@ realclean:
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(TAO_ROOT)/tao/Exception.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.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 \
@@ -13327,20 +8820,13 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/POA_CORBA.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(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/ORB.h \
+ $(TAO_ROOT)/tao/ORB.i \
+ $(TAO_ROOT)/tao/GIOP.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
  $(TAO_ROOT)/tao/Managed_Types.i \
@@ -13348,59 +8834,26 @@ realclean:
  $(TAO_ROOT)/tao/Sequence_T.h \
  $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
+ $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Object_KeyC.h \
+ $(TAO_ROOT)/tao/Object_KeyC.i \
+ $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/DynAnyC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Any.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/ORB.i \
- $(TAO_ROOT)/tao/DynAnyC.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/Servant_Base.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(TAO_ROOT)/tao/Servant_Base.i \
- $(TAO_ROOT)/tao/DynUnion_i.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.h \
- $(TAO_ROOT)/tao/DynUnion_i_T.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h
-.obj/InconsistentTypeCodeC.o .obj/InconsistentTypeCodeC.so .shobj/InconsistentTypeCodeC.o .shobj/InconsistentTypeCodeC.so: InconsistentTypeCodeC.cpp \
- $(TAO_ROOT)/tao/InconsistentTypeCodeC.h \
- $(TAO_ROOT)/tao/orbconf.h \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i
+.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -13408,17 +8861,12 @@ realclean:
  $(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/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 \
- $(TAO_ROOT)/tao/Exception.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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -13463,46 +8911,28 @@ realclean:
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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/Exception.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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
+ $(TAO_ROOT)/tao/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i
+ $(TAO_ROOT)/tao/PolicyC.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.i \
+ $(TAO_ROOT)/tao/POAC.i \
+ $(TAO_ROOT)/tao/Environment.h \
+ $(TAO_ROOT)/tao/Environment.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
deleted file mode 100644
index b6686185e46..00000000000
--- a/TAO/tao/Makefile.am
+++ /dev/null
@@ -1,251 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for TAO
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-# Build a libtool library, libTAO.la for installation in libdir.
-lib_LTLIBRARIES = libTAO.la
-libTAO_la_SOURCES = \
-         Active_Object_Map.cpp  \
-         Any.cpp  \
-         CDR.cpp  \
-         Client_Strategy_Factory.cpp  \
-         Connect.cpp  \
-         CurrentC.cpp  \
-         CurrentS.cpp  \
-         DynAnyC.cpp  \
-         DynAnyS.cpp  \
-         DynAny_i.cpp  \
-         DynArray_i.cpp  \
-         DynEnum_i.cpp  \
-         DynSequence_i.cpp  \
-         DynStruct_i.cpp  \
-         DynUnion_i.cpp  \
-         Environment.cpp  \
-         Exception.cpp  \
-         Forwarding_Servant.cpp  \
-         GIOP.cpp  \
-         IIOP_Interpreter.cpp  \
-         IIOP_ORB.cpp  \
-         IIOP_Object.cpp  \
-         InconsistentTypeCodeC.cpp  \
-         Invocation.cpp  \
-         Managed_Types.cpp  \
-         Marshal.cpp  \
-         NVList.cpp  \
-         ORB.cpp  \
-         ORB_Core.cpp  \
-         Object.cpp  \
-         Object_KeyC.cpp  \
-         Operation_Table.cpp  \
-         POA.cpp  \
-         POAC.cpp  \
-         POAS.cpp  \
-         PolicyC.cpp  \
-         PolicyS.cpp  \
-         Principal.cpp  \
-         Request.cpp  \
-         Sequence.cpp  \
-         Servant_Base.cpp  \
-         Server_Request.cpp  \
-         Server_Strategy_Factory.cpp  \
-         Stub.cpp  \
-         TAO.cpp  \
-         TAO_Internal.cpp  \
-         Typecode.cpp  \
-         Typecode_Constants.cpp  \
-         Union.cpp  \
-         append.cpp  \
-         debug.cpp  \
-         decode.cpp  \
-         deep_free.cpp  \
-         default_client.cpp  \
-         default_server.cpp  \
-         encode.cpp  \
-         params.cpp  \
-         skip.cpp
-
-## The following is an excerpt from the "libtool" manual, written by
-## Gordon Matzigkeit:
-##
-## This flag accepts an argument of the form `current[:revision[:age]]'. So,
-## passing `-version-info 3:12:1' sets current to 3, revision to 12, and age
-## to 1. 
-## If either revision or age are omitted, they default to 0. Also note that
-## age must be less than or equal to the current interface number. 
-##
-## Here are a set of rules to help you update your library version
-## information: 
-##
-##     1.Start with version information of `0:0:0' for each libtool library. 
-##     2.Update the version information only immediately before a public
-##       release of your software. More frequent updates are unnecessary, and
-##       only guarantee that the current interface number gets larger faster. 
-##     3.If the library source code has changed at all since the last update,
-##       then increment revision (`c:r:a' becomes `c:r+1:a'). 
-##     4.If any interfaces have been added, removed, or changed since the last
-##       update, increment current, and set revision to 0. 
-##     5.If any interfaces have been added since the last public release, then
-##       increment age. 
-##     6.If any interfaces have been removed since the last public release,
-##       then set age to 0. 
-##
-## Never try to set the interface numbers so that they correspond to the
-## release number of your package. This is an abuse that only fosters
-## misunderstanding of the purpose of library versions. Instead, use the
-## `-release' flag (see section 6.4 Managing release information), but be
-## warned that every release of your package will not be binary compatibility
-## with any other release. 
-
-## The below "-version-info" isn't being used the way libtool intends
-## it to be used but we do it that way to make the version numbers
-## that TAO uses match those created by libtool from "-version-info."
-##libTAO_la_LDFLAGS = -version-info 2:41:2   ## 2-2=0 --> libTAO.so.0.2.41
-libTAO_la_LDFLAGS = -version-info @TAO_CURRENT@:@TAO_REVISION@:@TAO_AGE@
-
-## These are source files that are needed by the header files if the
-## ACE_TEMPLATES_REQUIRE_SOURCE or ACE_TEMPLATES_REQUIRE_PRAGMA
-## macro is defined.
-if TEMPLATES_REQUIRE_SOURCE
-TEMPLATE_FILES = \
-         DynUnion_i_T.cpp  \
-         ORB_Strategies_T.cpp  \
-         Sequence_T.cpp  \
-         poa_T.cpp  \
-         varout.cpp
-else
-TEMPLATE_FILES = 
-endif
-
-pkgincludedir = $(prefix)/include/tao
-pkginclude_HEADERS = \
-         Active_Object_Map.h  \
-         Active_Object_Map.i  \
-         Align.h  \
-         Any.h  \
-         Any.i  \
-         CDR.h  \
-         CDR.i  \
-         Client_Strategy_Factory.h  \
-         Connect.h  \
-         Connect.i  \
-         CurrentC.h  \
-         CurrentC.i  \
-         DynAnyC.h  \
-         DynAnyC.i  \
-         DynAny_i.h  \
-         DynArray_i.h  \
-         DynEnum_i.h  \
-         DynSequence_i.h  \
-         DynStruct_i.h  \
-         DynUnion_i.h  \
-         DynUnion_i_T.h  \
-         Environment.h  \
-         Environment.i  \
-         Exception.h  \
-         Exception.i  \
-         Forwarding_Servant.h  \
-         GIOP.h  \
-         GIOP.i  \
-         IIOP_Interpreter.h  \
-         IIOP_ORB.h  \
-         IIOP_ORB.i  \
-         IIOP_Object.h  \
-         IIOP_Object.i  \
-         InconsistentTypeCodeC.h  \
-         Invocation.h  \
-         Invocation.i  \
-         Managed_Types.h  \
-         Managed_Types.i  \
-         Marshal.h  \
-         Marshal.i  \
-         NVList.h  \
-         NVList.i  \
-         ORB.h  \
-         ORB.i  \
-         ORB_Core.h  \
-         ORB_Core.i  \
-         ORB_Strategies_T.h  \
-         ORB_Strategies_T.i  \
-         Object.h  \
-         Object.i  \
-         Object_KeyC.h  \
-         Object_KeyC.i  \
-         Object_Table.h  \
-         Object_Table.i  \
-         Operation_Table.h  \
-         POA.h  \
-         POA.i  \
-         POAC.h  \
-         POAC.i  \
-         POAS.h  \
-         POAS.i  \
-         POA_CORBA.h  \
-         PolicyC.h  \
-         PolicyC.i  \
-         Principal.h  \
-         Principal.i  \
-         Request.h  \
-         Request.i  \
-         Sequence.h  \
-         Sequence.i  \
-         Sequence_T.h  \
-         Sequence_T.i  \
-         Servant_Base.h  \
-	 Servant_Base.i  \
-         Server_Request.h  \
-         Server_Request.i  \
-         Server_Strategy_Factory.h  \
-         Stub.h  \
-         Stub.i  \
-         TAO.h  \
-         TAO_Internal.h  \
-         TAO_Internal.i  \
-         Timeprobe.h  \
-         Typecode.h  \
-         Typecode.i  \
-         Union.h  \
-         config.h  \
-         corba.h  \
-         debug.h  \
-         default_client.h  \
-         default_client.i  \
-         default_server.h  \
-         default_server.i  \
-         orbconf.h  \
-         params.h  \
-         params.i  \
-         poa_T.h  \
-         poa_macros.h  \
-         singletons.h  \
-         try_macros.h  \
-         varout.h  \
-         varout.i  \
-         $(TEMPLATE_FILES)
-## Make sure $(TEMPLATE_FILES) is in the above header list!
-
-
-## noinst_PROGRAMS = t-sizes
-
-## t_sizes_SOURCES = t-sizes.cpp
-
-EXTRA_DIST = \
-         t-sizes.cpp
-
-## Clean up some additional files/directories possibly created during
-## the configure script tests.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
index 1510168df07..8f1d3f92aa7 100644
--- a/TAO/tao/Managed_Types.cpp
+++ b/TAO/tao/Managed_Types.cpp
@@ -28,22 +28,3 @@ TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
   return *this;
 }
 
-// ****************************************************************
-
-TAO_WString_Manager&
-TAO_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
-
-TAO_SeqElem_WString_Manager&
-TAO_SeqElem_WString_Manager::operator= (const CORBA::WString_var &var)
-{
-  if (this->release_)
-    CORBA::wstring_free (*this->ptr_);
-  *this->ptr_ = CORBA::wstring_dup (var.in ());
-  return *this;
-}
-
diff --git a/TAO/tao/Managed_Types.h b/TAO/tao/Managed_Types.h
index 72fd617f6c5..84f78bcbd5d 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -19,6 +19,7 @@
 #define TAO_MANAGED_TYPES_H
 
 #include "tao/corbafwd.h"
+#include "tao/ORB.h"
 
 /****************************************************************/
 
@@ -38,7 +39,7 @@ class TAO_Export TAO_String_Manager
 public:
 
   TAO_String_Manager (void);
-  // default CTOR will initialize the underlying ptr_ to empty string.
+  // default CTOR will initialize the underlying ptr_ to empty string. 
 
   TAO_String_Manager (const TAO_String_Manager &);
   // copy constructor
@@ -170,7 +171,8 @@ private:
 
 };
 
-// ****************************************************************
+#if 0 /* WString_var not implemented in TAO yet - 01/03/1999 */
+/****************************************************************/
 
 class TAO_Export TAO_WString_Manager
 {
@@ -179,18 +181,16 @@ class TAO_Export TAO_WString_Manager
   //
   // = DESCRIPTION
   //
-  //   This class implements the generic wstring manager and is used
-  //   in the C++ mapping of "struct" members that are of type
-  //   "wstring".
-  //   The difference between this class and the CORBA::WString_var
-  //   class is that the default constructor initializes the
-  //   underlying wstring to an empty string in this class whereas it
-  //   is a NUL wstring for the _var class.
+  //   This class implements the generic wstring manager and is used in the C++
+  //   mapping of "struct" members that are of type "wstring". The difference
+  //   between this class and the CORBA::WString_var class is that the default
+  //   conctructor initializes the underlying wstring to an empty string in this
+  //   class whereas it is a NUL wstring for the _var class.
   //
 public:
 
   TAO_WString_Manager (void);
-  // default CTOR will initialize the underlying ptr_ to empty string.
+  // default CTOR will initialize the underlying ptr_ to empty string. 
 
   TAO_WString_Manager (const TAO_WString_Manager &);
   // copy constructor
@@ -208,8 +208,8 @@ public:
   // assignment from a constant wchar* will make a copy
 
   TAO_WString_Manager &operator= (CORBA::WChar *);
-  // assignment from wchar* will not make a copy. The WString_Manager
-  // will now own the string.
+  // assignment from wchar* will not make a copy. The WString_Manager will now
+  // own the string.
 
   operator const CORBA::WChar*() const;
   // cast  (read-only)
@@ -256,10 +256,10 @@ class TAO_Export TAO_SeqElem_WString_Manager
   //   This class implements the generic string manager and is used to
   //   instantiate the proper sequence types.
   //
-  //   This class will have the same semantics as the string manager
-  //   classes defined earlier with respect to the various assignment
-  //   operators. However, the freeing of old storage will be
-  //   dependent on the "release" value of the parent sequence class.
+  //   This class will have the same semantics as the string manager classes
+  //   defined earlier with respect to the various assignment
+  //   operators. However, the freeing of old storage will be dependent on the
+  //   "release" value of the parent sequence class.
   //
 public:
   friend class TAO_Unbounded_WString_Sequence;
@@ -269,8 +269,7 @@ public:
   // friend template<CORBA::ULong MAX>
   //   class TAO_Bounded_WString_Sequence<TAO_SeqElem_WString_Manager,MAX>;
 
-  TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                               CORBA::Boolean release);
+  TAO_SeqElem_WString_Manager (char **buffer, CORBA::Boolean release);
   // constructor from address of an element
 
   ~TAO_SeqElem_WString_Manager (void);
@@ -282,30 +281,30 @@ public:
   TAO_SeqElem_WString_Manager &operator= (const CORBA::WString_var&);
   // assignment from var type will make a copy
 
-  TAO_SeqElem_WString_Manager &operator= (const CORBA::WChar *);
+  TAO_SeqElem_WString_Manager &operator= (const char *);
   // assignment from a constant char* will make a copy
 
-  TAO_SeqElem_WString_Manager &operator= (CORBA::WChar *);
-  // assignment from char* will not make a copy. The
-  // SeqElem_WString_Manager will now own the string.
+  TAO_SeqElem_WString_Manager &operator= (char *);
+  // assignment from char* will not make a copy. The SeqElem_WString_Manager will now
+  // own the string.
 
-  operator const CORBA::WChar*() const;
+  operator const char*() const;
   // cast  (read-only)
 
-  const CORBA::WChar *in (void) const;
+  const char *in (void) const;
   // for in parameter.
 
-  CORBA::WChar *&inout (void);
+  char *&inout (void);
   // for inout parameter.
 
-  CORBA::WChar *&out (void);
+  char *&out (void);
   // for out parameter.
 
-  CORBA::WChar *_retn (void);
+  char *_retn (void);
   // for string of return type.
 
 private:
-  CORBA::WChar **ptr_;
+  char **ptr_;
   // Address of string element from the parent's buffer.
 
   CORBA::Boolean release_;
@@ -322,6 +321,7 @@ private:
   // copy constructor
 
 };
+#endif /* 0 */
 
 #if defined (__ACE_INLINE__)
 #include "tao/Managed_Types.i"
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
index dc5eda08f2e..88aac12835e 100644
--- a/TAO/tao/Managed_Types.i
+++ b/TAO/tao/Managed_Types.i
@@ -19,7 +19,7 @@
 // default CTOR initializes to empty string
 ACE_INLINE
 TAO_String_Manager::TAO_String_Manager (void)
-  :  ptr_ (0) // @@ CORBA::string_dup (L""))
+  :  ptr_ (CORBA::string_dup (""))
 {
 }
 
@@ -192,12 +192,13 @@ TAO_SeqElem_String_Manager::_retn (void)
   return temp;
 }
 
+#if 0 /* To be included once we have support for WString_var */
 // ****************************************************************
 
 // default CTOR initializes to empty string
 ACE_INLINE
 TAO_WString_Manager::TAO_WString_Manager (void)
-  :  ptr_ (0) // @@ TODO CORBA::wstring_dup (""))
+  :  ptr_ (CORBA::wstring_dup (""))
 {
 }
 
@@ -227,6 +228,15 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
   return *this;
 }
 
+// assignment from CORBA::String_var makes a copy
+ACE_INLINE TAO_WString_Manager&
+TAO_WString_Manager::operator= (const CORBA::String_var &var)
+{
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = CORBA::wstring_dup (var.in ());
+  return *this;
+}
+
 // assignment from const CORBA::WChar* makes a copy
 ACE_INLINE TAO_WString_Manager &
 TAO_WString_Manager::operator= (const CORBA::WChar * p)
@@ -282,9 +292,8 @@ TAO_WString_Manager::_retn (void)
 // ****************************************************************
 
 ACE_INLINE
-TAO_SeqElem_WString_Manager::
-    TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
-                                 CORBA::Boolean release)
+TAO_SeqElem_WString_Manager::TAO_SeqElem_WString_Manager (CORBA::WChar **buffer,
+                                                          CORBA::Boolean release)
   :  ptr_ (buffer),
      release_ (release)
 {
@@ -308,6 +317,16 @@ TAO_SeqElem_WString_Manager::operator= (const TAO_SeqElem_WString_Manager &rhs)
   return *this;
 }
 
+// assignment from String_var
+ACE_INLINE TAO_SeqElem_WString_Manager&
+TAO_SeqElem_WString_Manager::operator= (const CORBA::wstring_var &var)
+{
+  if (this->release_)
+    CORBA::wstring_free (*this->ptr_);
+  *this->ptr_ = CORBA::wstring_dup (var.in ());
+  return *this;
+}
+
 // assignment from const CORBA::WChar* will make copy
 ACE_INLINE TAO_SeqElem_WString_Manager &
 TAO_SeqElem_WString_Manager::operator= (const CORBA::WChar *p)
@@ -361,3 +380,5 @@ TAO_SeqElem_WString_Manager::_retn (void)
   *this->ptr_ = 0;
   return temp;
 }
+
+#endif /* 0 */
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
index fd201da3141..45e6a3bd331 100644
--- a/TAO/tao/Marshal.cpp
+++ b/TAO/tao/Marshal.cpp
@@ -86,7 +86,7 @@ TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc,
 {
   if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT)
     return this->mobj_table_[tc->kind_].obj_;
-  TAO_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+  TAO_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), 0);
 }
 
 
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
index 469df69bf6b..df999fc1965 100644
--- a/TAO/tao/Marshal.h
+++ b/TAO/tao/Marshal.h
@@ -22,7 +22,6 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Typecode.h"
-#include "tao/Any.h"
 #include "tao/ORB.h"
 
 class TAO_OutputCDR;
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
index 1d95143e76d..bafab78b623 100644
--- a/TAO/tao/Marshal.i
+++ b/TAO/tao/Marshal.i
@@ -144,11 +144,11 @@ TAO_Marshal_WString::~TAO_Marshal_WString (void)
 // deep_free for Any
 ACE_INLINE CORBA::TypeCode::traverse_status
 TAO_Marshal_Any::deep_free (CORBA::TypeCode_ptr,
-                            const void *source,
+                            const void * /* source */,
                             const void *,
                             CORBA::Environment &)
 {
-  ((CORBA::Any *) source)->~CORBA_Any ();
+  // ((CORBA::Any *) source)->~CORBA_Any ();
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
@@ -193,8 +193,8 @@ TAO_Marshal_String::deep_free (CORBA::TypeCode_ptr,
                                const void *,
                                CORBA::Environment &)
 {
-  CORBA::string_free (*(CORBA::Char* *) source);
-  *(CORBA::Char* *)source = 0;
+  CORBA::string_free (*(CORBA::String *) source);
+  *(CORBA::String *)source = 0;
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
@@ -205,7 +205,7 @@ TAO_Marshal_WString::deep_free (CORBA::TypeCode_ptr,
                                 const void *,
                                 CORBA::Environment &)
 {
-  CORBA::wstring_free (*(CORBA::WChar* *) source);
-  *(CORBA::WChar* *)source = 0;
+  CORBA::wstring_free (*(CORBA::WString *) source);
+  *(CORBA::WString *)source = 0;
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
diff --git a/TAO/tao/Messaging.pidl b/TAO/tao/Messaging.pidl
deleted file mode 100644
index 71f05360ae6..00000000000
--- a/TAO/tao/Messaging.pidl
+++ /dev/null
@@ -1,203 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Messaging{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#pragma prefix "omg.org"
-
-#include "TimeBase.pidl"
-#include "IOP.pidl"
-#include "Policy.pidl"
-#include "Pollable.pidl"
-
-module Messaging
-{
-  //
-  // Messaging Quality of Service
-  //
-
-  typedef short RebindMode;
-  const RebindMode TRANSPARENT  = 0;
-  const RebindMode NO_REBIND    = 1;
-  const RebindMode NO_RECONNECT = 2;
-
-  typedef short SyncScope;
-  const SyncScope SYNC_NONE           = 0;
-  const SyncScope SYNC_WITH_TRANSPORT = 1;
-  const SyncScope SYNC_WITH_SERVER    = 2;
-  const SyncScope SYNC_WITH_TARGET    = 3;
-
-  typedef short RoutingType;
-  const RoutingType ROUTE_NONE              = 0;
-  const RoutingType ROUTE_FORWARD           = 1;
-  const RoutingType ROUTE_STORE_AND_FORWARD = 2;
-
-  typedef TimeBase::TimeT Timeout;
-
-  typedef short Priority;
-
-  typedef unsigned short Ordering;
-  const Ordering ORDER_ANY      = 0x01;
-  const Ordering ORDER_TEMPORAL = 0x02;
-  const Ordering ORDER_PRIORITY = 0x04;
-  const Ordering ORDER_DEADLINE = 0x08;
-
-  //
-  // Locally-Constrained Policy Objects
-  //
-
-  // Rebind Policy (default = TRANSPARENT)
-  const CORBA::PolicyType REBIND_POLICY_TYPE = 23;
-  interface RebindPolicy : CORBA::Policy {
-    readonly attribute RebindMode rebind_mode;
-  };
-
-  // Synchronization Policy (default = WITH_TRANSPORT)
-  const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
-  interface SyncScopePolicy : CORBA::Policy {
-    readonly attribute SyncScope synchronization;
-  };
-
-  // Priority Policies
-  const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
-  struct PriorityRange {
-    Priority min;
-    Priority max;
-  };
-  interface RequestPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-  const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
-  interface ReplyPriorityPolicy : CORBA::Policy {
-    readonly attribute PriorityRange priority_range;
-  };
-
-  // Timeout Policies
-  const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
-  interface RequestStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
-  interface RequestEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
-  interface ReplyStartTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT start_time;
-  };
-  const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
-  interface ReplyEndTimePolicy : CORBA::Policy {
-    readonly attribute TimeBase::UtcT end_time;
-  };
-
-  const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE = 31;
-  interface RelativeRequestTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-  const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
-  interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
-    readonly attribute TimeBase::TimeT relative_expiry;
-  };
-
-  const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
-  struct RoutingTypeRange {
-    RoutingType min;
-    RoutingType max;
-  };
-  interface RoutingPolicy : CORBA::Policy {
-    readonly attribute RoutingTypeRange routing_range;
-  };
-
-  const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
-  interface MaxHopsPolicy : CORBA::Policy {
-    readonly attribute unsigned short max_hops;
-  };
-
-  // Router Delivery-ordering Policy (default = ORDER_TEMPORAL)
-  const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35;
-  interface QueueOrderPolicy : CORBA::Policy {
-    readonly attribute Ordering allowed_orders;
-  };
-
-  //
-  // Propagation of QoS Policies
-  //
-
-  struct PolicyValue {
-    CORBA::PolicyType ptype;
-    sequence<octet>   pvalue;
-  };
-  typedef sequence<PolicyValue> PolicyValueSeq;
-
-  const IOP::ComponentId TAG_POLICIES      = 2;
-  const IOP::ServiceId INVOCATION_POLICIES = 2;
-
-  //
-  // Exception Delivery in the Callback Model
-  //
-#if defined(NO_VALUE)
-  struct ExceptionHolder {
-    boolean         is_system_exception;
-    boolean         byte_order;
-    sequence<octet> marshaled_exception;
-  };
-#else
-  value ExceptionHolder {
-    boolean         is_system_exception;
-    boolean         byte_order;
-    sequence<octet> marshaled_exception;
-  };
-#endif
-
-  //
-  // Base interface for the Callback model
-  //
-
-  interface ReplyHandler { };
-
-  //
-  // Base value for the Polling model
-  //
-
-#if defined(NO_VALUE)
-  interface Poller : CORBA::Pollable {
-    readonly attribute Object  operation_target;
-    readonly attribute string  operation_name;
-
-    attribute ReplyHandler     associated_handler;
-    readonly attribute boolean is_from_poller;
-
-    readonly attribute Object  target;
-    readonly attribute string  op_name;
-  };
-#else
-  value Poller supports CORBA::Pollable {
-    readonly attribute Object  operation_target;
-    readonly attribute string  operation_name;
-
-    attribute ReplyHandler     associated_handler;
-    readonly attribute boolean is_from_poller;
-
-    Object                     target;
-    string                     op_name;
-  };
-#endif
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
deleted file mode 100644
index e780ab7cbf6..00000000000
--- a/TAO/tao/MessagingC.cpp
+++ /dev/null
@@ -1,2290 +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 "tao/MessagingC.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/MessagingS.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/MessagingC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, MessagingC, "$Id$")
-
-static const CORBA::Long _oc_Messaging_RebindMode[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x4d6f6465), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RebindMode:1.0
-  11, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e644d6f), ACE_NTOHL (0x64650000),  // name = RebindMode
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindMode (CORBA::tk_alias, sizeof (_oc_Messaging_RebindMode), (char *) &_oc_Messaging_RebindMode, 0, sizeof (Messaging::RebindMode));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RebindMode, &_tc_TAO_tc_Messaging_RebindMode)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, TRANSPARENT, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NO_REBIND, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, NO_RECONNECT, 2)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_SyncScope[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f70653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/SyncScope:1.0
-  10, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65000000),  // name = SyncScope
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScope (CORBA::tk_alias, sizeof (_oc_Messaging_SyncScope), (char *) &_oc_Messaging_SyncScope, 0, sizeof (Messaging::SyncScope));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScope, &_tc_TAO_tc_Messaging_SyncScope)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TRANSPORT, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_SERVER, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, SYNC_WITH_TARGET, 3)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_RoutingType[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-  12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingType (CORBA::tk_alias, sizeof (_oc_Messaging_RoutingType), (char *) &_oc_Messaging_RoutingType, 0, sizeof (Messaging::RoutingType));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingType, &_tc_TAO_tc_Messaging_RoutingType)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_NONE, 0)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_FORWARD, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::Short)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::Short, ROUTE_STORE_AND_FORWARD, 2)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Timeout[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  26, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5469), ACE_NTOHL (0x6d656f75), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/Timeout:1.0
-  8, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x6f757400),  // name = Timeout
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Timeout (CORBA::tk_alias, sizeof (_oc_Messaging_Timeout), (char *) &_oc_Messaging_Timeout, 0, sizeof (Messaging::Timeout));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Timeout, &_tc_TAO_tc_Messaging_Timeout)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Priority[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-  9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Priority (CORBA::tk_alias, sizeof (_oc_Messaging_Priority), (char *) &_oc_Messaging_Priority, 0, sizeof (Messaging::Priority));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Priority, &_tc_TAO_tc_Messaging_Priority)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_Ordering[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4f72), ACE_NTOHL (0x64657269), ACE_NTOHL (0x6e673a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Ordering:1.0
-  9, ACE_NTOHL (0x4f726465), ACE_NTOHL (0x72696e67), ACE_NTOHL (0x0),  // name = Ordering
-  CORBA::tk_ushort,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Ordering (CORBA::tk_alias, sizeof (_oc_Messaging_Ordering), (char *) &_oc_Messaging_Ordering, 0, sizeof (Messaging::Ordering));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Ordering, &_tc_TAO_tc_Messaging_Ordering)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_ANY, 1)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_TEMPORAL, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_PRIORITY, 4)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::UShort)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::UShort, ORDER_DEADLINE, 8)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REBIND_POLICY_TYPE, 23)
-TAO_NAMESPACE_END
-Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RebindPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RebindPolicy:1.0", env))
-    return Messaging::RebindPolicy::_nil ();
-  return Messaging::RebindPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RebindPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RebindPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RebindPolicy(stub);
-  return new POA_Messaging::_tao_collocated_RebindPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RebindPolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::RebindMode Messaging::RebindPolicy::rebind_mode (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::RebindMode _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RebindPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RebindPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RebindPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x62696e64), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RebindPolicy:1.0
-  13, ACE_NTOHL (0x52656269), ACE_NTOHL (0x6e64506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RebindPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RebindPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RebindPolicy), (char *) &_oc_Messaging_RebindPolicy, 0, sizeof (Messaging::RebindPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RebindPolicy, &_tc_TAO_tc_Messaging_RebindPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SYNC_SCOPE_POLICY_TYPE, 24)
-TAO_NAMESPACE_END
-Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::SyncScopePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/SyncScopePolicy:1.0", env))
-    return Messaging::SyncScopePolicy::_nil ();
-  return Messaging::SyncScopePolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::SyncScopePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/SyncScopePolicy:1.0");
-  if (servant == 0)
-    return new Messaging::SyncScopePolicy(stub);
-  return new POA_Messaging::_tao_collocated_SyncScopePolicy(
-      ACE_reinterpret_cast(POA_Messaging::SyncScopePolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::SyncScope Messaging::SyncScopePolicy::synchronization (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::SyncScope _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::SyncScopePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/SyncScopePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_SyncScopePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5379), ACE_NTOHL (0x6e635363), ACE_NTOHL (0x6f706550), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/SyncScopePolicy:1.0
-  16, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65506f6c), ACE_NTOHL (0x69637900),  // name = SyncScopePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_SyncScopePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_SyncScopePolicy), (char *) &_oc_Messaging_SyncScopePolicy, 0, sizeof (Messaging::SyncScopePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SyncScopePolicy, &_tc_TAO_tc_Messaging_SyncScopePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PRIORITY_POLICY_TYPE, 25)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_PriorityRange[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74795261), ACE_NTOHL (0x6e67653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/PriorityRange:1.0
-  14, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x52616e67), ACE_NTOHL (0x65000000),  // name = PriorityRange
-  2, // member count
-    4, ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-      9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-      CORBA::tk_short,
-
-    4, ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5072), ACE_NTOHL (0x696f7269), ACE_NTOHL (0x74793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/Priority:1.0
-      9, ACE_NTOHL (0x5072696f), ACE_NTOHL (0x72697479), ACE_NTOHL (0x0),  // name = Priority
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PriorityRange (CORBA::tk_struct, sizeof (_oc_Messaging_PriorityRange), (char *) &_oc_Messaging_PriorityRange, 0, sizeof (Messaging::PriorityRange));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PriorityRange, &_tc_TAO_tc_Messaging_PriorityRange)
-TAO_NAMESPACE_END
-Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestPriorityPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestPriorityPolicy:1.0", env))
-    return Messaging::RequestPriorityPolicy::_nil ();
-  return Messaging::RequestPriorityPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestPriorityPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestPriorityPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RequestPriorityPolicy(stub);
-  return new POA_Messaging::_tao_collocated_RequestPriorityPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestPriorityPolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::PriorityRange Messaging::RequestPriorityPolicy::priority_range (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::PriorityRange _tao_retval;
-    _tao_retval.min = 0;
-    _tao_retval.max = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestPriorityPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestPriorityPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/RequestPriorityPolicy:1.0
-  22, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = RequestPriorityPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestPriorityPolicy), (char *) &_oc_Messaging_RequestPriorityPolicy, 0, sizeof (Messaging::RequestPriorityPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestPriorityPolicy, &_tc_TAO_tc_Messaging_RequestPriorityPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_PRIORITY_POLICY_TYPE, 26)
-TAO_NAMESPACE_END
-Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyPriorityPolicy:1.0", env))
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  return Messaging::ReplyPriorityPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyPriorityPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyPriorityPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::ReplyPriorityPolicy(stub);
-  return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyPriorityPolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::PriorityRange Messaging::ReplyPriorityPolicy::priority_range (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::PriorityRange _tao_retval;
-    _tao_retval.min = 0;
-    _tao_retval.max = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyPriorityPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyPriorityPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7950), ACE_NTOHL (0x72696f72), ACE_NTOHL (0x69747950), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/ReplyPriorityPolicy:1.0
-  20, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79507269), ACE_NTOHL (0x6f726974), ACE_NTOHL (0x79506f6c), ACE_NTOHL (0x69637900),  // name = ReplyPriorityPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyPriorityPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyPriorityPolicy), (char *) &_oc_Messaging_ReplyPriorityPolicy, 0, sizeof (Messaging::ReplyPriorityPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyPriorityPolicy, &_tc_TAO_tc_Messaging_ReplyPriorityPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_START_TIME_POLICY_TYPE, 27)
-TAO_NAMESPACE_END
-Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestStartTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestStartTimePolicy:1.0", env))
-    return Messaging::RequestStartTimePolicy::_nil ();
-  return Messaging::RequestStartTimePolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestStartTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestStartTimePolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RequestStartTimePolicy(stub);
-  return new POA_Messaging::_tao_collocated_RequestStartTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestStartTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::UtcT Messaging::RequestStartTimePolicy::start_time (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::UtcT _tao_retval;
-    _tao_retval.time = 0;
-    _tao_retval.inacclo = 0;
-    _tao_retval.inacchi = 0;
-    _tao_retval.tdf = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestStartTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestStartTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RequestStartTimePolicy:1.0
-  23, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737453), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = RequestStartTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestStartTimePolicy), (char *) &_oc_Messaging_RequestStartTimePolicy, 0, sizeof (Messaging::RequestStartTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestStartTimePolicy, &_tc_TAO_tc_Messaging_RequestStartTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_END_TIME_POLICY_TYPE, 28)
-TAO_NAMESPACE_END
-Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestEndTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RequestEndTimePolicy:1.0", env))
-    return Messaging::RequestEndTimePolicy::_nil ();
-  return Messaging::RequestEndTimePolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RequestEndTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RequestEndTimePolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RequestEndTimePolicy(stub);
-  return new POA_Messaging::_tao_collocated_RequestEndTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::RequestEndTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::UtcT Messaging::RequestEndTimePolicy::end_time (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::UtcT _tao_retval;
-    _tao_retval.time = 0;
-    _tao_retval.inacclo = 0;
-    _tao_retval.inacchi = 0;
-    _tao_retval.tdf = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestEndTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RequestEndTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x74456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RequestEndTimePolicy:1.0
-  21, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737445), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RequestEndTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RequestEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RequestEndTimePolicy), (char *) &_oc_Messaging_RequestEndTimePolicy, 0, sizeof (Messaging::RequestEndTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestEndTimePolicy, &_tc_TAO_tc_Messaging_RequestEndTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_START_TIME_POLICY_TYPE, 29)
-TAO_NAMESPACE_END
-Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyStartTimePolicy:1.0", env))
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  return Messaging::ReplyStartTimePolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyStartTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyStartTimePolicy:1.0");
-  if (servant == 0)
-    return new Messaging::ReplyStartTimePolicy(stub);
-  return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyStartTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::UtcT Messaging::ReplyStartTimePolicy::start_time (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::UtcT _tao_retval;
-    _tao_retval.time = 0;
-    _tao_retval.inacclo = 0;
-    _tao_retval.inacchi = 0;
-    _tao_retval.tdf = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyStartTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyStartTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7953), ACE_NTOHL (0x74617274), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/ReplyStartTimePolicy:1.0
-  21, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79537461), ACE_NTOHL (0x72745469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ReplyStartTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyStartTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyStartTimePolicy), (char *) &_oc_Messaging_ReplyStartTimePolicy, 0, sizeof (Messaging::ReplyStartTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyStartTimePolicy, &_tc_TAO_tc_Messaging_ReplyStartTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REPLY_END_TIME_POLICY_TYPE, 30)
-TAO_NAMESPACE_END
-Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyEndTimePolicy:1.0", env))
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  return Messaging::ReplyEndTimePolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyEndTimePolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyEndTimePolicy:1.0");
-  if (servant == 0)
-    return new Messaging::ReplyEndTimePolicy(stub);
-  return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy(
-      ACE_reinterpret_cast(POA_Messaging::ReplyEndTimePolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::UtcT Messaging::ReplyEndTimePolicy::end_time (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::UtcT _tao_retval;
-    _tao_retval.time = 0;
-    _tao_retval.inacclo = 0;
-    _tao_retval.inacchi = 0;
-    _tao_retval.tdf = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyEndTimePolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyEndTimePolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7945), ACE_NTOHL (0x6e645469), ACE_NTOHL (0x6d65506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/ReplyEndTimePolicy:1.0
-  19, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x79456e64), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = ReplyEndTimePolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyEndTimePolicy (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyEndTimePolicy), (char *) &_oc_Messaging_ReplyEndTimePolicy, 0, sizeof (Messaging::ReplyEndTimePolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyEndTimePolicy, &_tc_TAO_tc_Messaging_ReplyEndTimePolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_REQ_TIMEOUT_POLICY_TYPE, 31)
-TAO_NAMESPACE_END
-Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0", env))
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RelativeRequestTimeoutPolicy(stub);
-  return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RelativeRequestTimeoutPolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::TimeT Messaging::RelativeRequestTimeoutPolicy::relative_expiry (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::TimeT _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RelativeRequestTimeoutPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x76655265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x7454696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RelativeRequestTimeoutPolicy:1.0
-  29, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737454), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = RelativeRequestTimeoutPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRequestTimeoutPolicy), (char *) &_oc_Messaging_RelativeRequestTimeoutPolicy, 0, sizeof (Messaging::RelativeRequestTimeoutPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRequestTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRequestTimeoutPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, RELATIVE_RT_TIMEOUT_POLICY_TYPE, 32)
-TAO_NAMESPACE_END
-Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0", env))
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeoutPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RelativeRoundtripTimeoutPolicy(stub);
-  return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, servant),
-      stub
-    );
-}
-
-TimeBase::TimeT Messaging::RelativeRoundtripTimeoutPolicy::relative_expiry (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    TimeBase::TimeT _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RelativeRoundtripTimeoutPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x6c617469), ACE_NTOHL (0x7665526f), ACE_NTOHL (0x756e6474), ACE_NTOHL (0x72697054), ACE_NTOHL (0x696d656f), ACE_NTOHL (0x7574506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0
-  31, ACE_NTOHL (0x52656c61), ACE_NTOHL (0x74697665), ACE_NTOHL (0x526f756e), ACE_NTOHL (0x64747269), ACE_NTOHL (0x7054696d), ACE_NTOHL (0x656f7574), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = RelativeRoundtripTimeoutPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RelativeRoundtripTimeoutPolicy), (char *) &_oc_Messaging_RelativeRoundtripTimeoutPolicy, 0, sizeof (Messaging::RelativeRoundtripTimeoutPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RelativeRoundtripTimeoutPolicy, &_tc_TAO_tc_Messaging_RelativeRoundtripTimeoutPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ROUTING_POLICY_TYPE, 33)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_RoutingTypeRange[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x6552616e), ACE_NTOHL (0x67653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/RoutingTypeRange:1.0
-  17, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706552), ACE_NTOHL (0x616e6765), ACE_NTOHL (0x0),  // name = RoutingTypeRange
-  2, // member count
-    4, ACE_NTOHL (0x6d696e00),  // name = min
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-      12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-      CORBA::tk_short,
-
-    4, ACE_NTOHL (0x6d617800),  // name = max
-    CORBA::tk_alias, // typecode kind for typedefs
-    60, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67547970), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/RoutingType:1.0
-      12, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6754), ACE_NTOHL (0x79706500),  // name = RoutingType
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingTypeRange (CORBA::tk_struct, sizeof (_oc_Messaging_RoutingTypeRange), (char *) &_oc_Messaging_RoutingTypeRange, 0, sizeof (Messaging::RoutingTypeRange));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingTypeRange, &_tc_TAO_tc_Messaging_RoutingTypeRange)
-TAO_NAMESPACE_END
-Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RoutingPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/RoutingPolicy:1.0", env))
-    return Messaging::RoutingPolicy::_nil ();
-  return Messaging::RoutingPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::RoutingPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/RoutingPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::RoutingPolicy(stub);
-  return new POA_Messaging::_tao_collocated_RoutingPolicy(
-      ACE_reinterpret_cast(POA_Messaging::RoutingPolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::RoutingTypeRange Messaging::RoutingPolicy::routing_range (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::RoutingTypeRange _tao_retval;
-    _tao_retval.min = Messaging::ROUTE_NONE;
-    _tao_retval.max = Messaging::ROUTE_NONE;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::RoutingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RoutingPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_RoutingPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f526f), ACE_NTOHL (0x7574696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/RoutingPolicy:1.0
-  14, ACE_NTOHL (0x526f7574), ACE_NTOHL (0x696e6750), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = RoutingPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_RoutingPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_RoutingPolicy), (char *) &_oc_Messaging_RoutingPolicy, 0, sizeof (Messaging::RoutingPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RoutingPolicy, &_tc_TAO_tc_Messaging_RoutingPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, MAX_HOPS_POLICY_TYPE, 34)
-TAO_NAMESPACE_END
-Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::MaxHopsPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/MaxHopsPolicy:1.0", env))
-    return Messaging::MaxHopsPolicy::_nil ();
-  return Messaging::MaxHopsPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::MaxHopsPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/MaxHopsPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::MaxHopsPolicy(stub);
-  return new POA_Messaging::_tao_collocated_MaxHopsPolicy(
-      ACE_reinterpret_cast(POA_Messaging::MaxHopsPolicy_ptr, servant),
-      stub
-    );
-}
-
-CORBA::UShort Messaging::MaxHopsPolicy::max_hops (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::UShort _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::MaxHopsPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/MaxHopsPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_MaxHopsPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4d61), ACE_NTOHL (0x78486f70), ACE_NTOHL (0x73506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:Messaging/MaxHopsPolicy:1.0
-  14, ACE_NTOHL (0x4d617848), ACE_NTOHL (0x6f707350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = MaxHopsPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_MaxHopsPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_MaxHopsPolicy), (char *) &_oc_Messaging_MaxHopsPolicy, 0, sizeof (Messaging::MaxHopsPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_MaxHopsPolicy, &_tc_TAO_tc_Messaging_MaxHopsPolicy)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, QUEUE_ORDER_POLICY_TYPE, 35)
-TAO_NAMESPACE_END
-Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::QueueOrderPolicy::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/QueueOrderPolicy:1.0", env))
-    return Messaging::QueueOrderPolicy::_nil ();
-  return Messaging::QueueOrderPolicy::_unchecked_narrow (obj, env);
-}
-
-Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::QueueOrderPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/QueueOrderPolicy:1.0");
-  if (servant == 0)
-    return new Messaging::QueueOrderPolicy(stub);
-  return new POA_Messaging::_tao_collocated_QueueOrderPolicy(
-      ACE_reinterpret_cast(POA_Messaging::QueueOrderPolicy_ptr, servant),
-      stub
-    );
-}
-
-Messaging::Ordering Messaging::QueueOrderPolicy::allowed_orders (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::Ordering _tao_retval = 0;
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-}
-
-CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy: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); // remote call
-}
-
-const char* Messaging::QueueOrderPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/QueueOrderPolicy:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_QueueOrderPolicy[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5175), ACE_NTOHL (0x6575654f), ACE_NTOHL (0x72646572), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/QueueOrderPolicy:1.0
-  17, ACE_NTOHL (0x51756575), ACE_NTOHL (0x654f7264), ACE_NTOHL (0x6572506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = QueueOrderPolicy,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_QueueOrderPolicy (CORBA::tk_objref, sizeof (_oc_Messaging_QueueOrderPolicy), (char *) &_oc_Messaging_QueueOrderPolicy, 0, sizeof (Messaging::QueueOrderPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_QueueOrderPolicy, &_tc_TAO_tc_Messaging_QueueOrderPolicy)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_Messaging_PolicyValue[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/PolicyValue:1.0
-  12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = PolicyValue
-  2, // member count
-    6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000),  // name = ptype
-    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 (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-      11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000),  // name = PolicyType
-      CORBA::tk_ulong,
-
-    7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000),  // name = pvalue
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-    0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue (CORBA::tk_struct, sizeof (_oc_Messaging_PolicyValue), (char *) &_oc_Messaging_PolicyValue, 0, sizeof (Messaging::PolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValue, &_tc_TAO_tc_Messaging_PolicyValue)
-TAO_NAMESPACE_END
-
-#if !defined (_MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_)
-#define _MESSAGING_POLICYVALUE__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// Messaging::PolicyValue::_tao_seq_Octet
-// *************************************************************
-
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-Messaging::PolicyValue::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_Messaging_PolicyValue__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_PolicyValue__tao_seq_Octet), (char *) &_oc_Messaging_PolicyValue__tao_seq_Octet, 0, sizeof (Messaging::PolicyValue::_tao_seq_Octet));
-CORBA::TypeCode_ptr Messaging::PolicyValue::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_PolicyValue__tao_seq_Octet;
-
-// *************************************************************
-// Messaging::PolicyValueSeq
-// *************************************************************
-
-Messaging::PolicyValueSeq::PolicyValueSeq (void)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (CORBA::ULong max, CORBA::ULong length, Messaging::PolicyValue *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (max, length, buffer, release)
-{}
-Messaging::PolicyValueSeq::PolicyValueSeq (const PolicyValueSeq &seq) // copy ctor
-  : TAO_Unbounded_Sequence<Messaging::PolicyValue> (seq)
-{}
-Messaging::PolicyValueSeq::~PolicyValueSeq (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_Messaging_PolicyValueSeq[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/PolicyValueSeq:1.0
-  15, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756553), ACE_NTOHL (0x65710000),  // name = PolicyValueSeq
-  CORBA::tk_sequence, // typecode kind
-  192, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    176, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/PolicyValue:1.0
-      12, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = PolicyValue
-      2, // member count
-        6, ACE_NTOHL (0x70747970), ACE_NTOHL (0x65000000),  // name = ptype
-        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 (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PolicyType:1.0
-          11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x70650000),  // name = PolicyType
-          CORBA::tk_ulong,
-
-        7, ACE_NTOHL (0x7076616c), ACE_NTOHL (0x75650000),  // name = pvalue
-        CORBA::tk_sequence, // typecode kind
-        12, // encapsulation length
-          TAO_ENCAP_BYTE_ORDER, // byte order
-          CORBA::tk_octet,
-
-        0,
-      0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_PolicyValueSeq (CORBA::tk_alias, sizeof (_oc_Messaging_PolicyValueSeq), (char *) &_oc_Messaging_PolicyValueSeq, 0, sizeof (Messaging::PolicyValueSeq));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PolicyValueSeq, &_tc_TAO_tc_Messaging_PolicyValueSeq)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, TAG_POLICIES, 2)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, INVOCATION_POLICIES, 2)
-TAO_NAMESPACE_END
-
-// ****************************************************************
-
-#if defined(TAO_POLLER)
-static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f4578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e48), ACE_NTOHL (0x6f6c6465), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:Messaging/ExceptionHolder:1.0
-  16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e486f6c), ACE_NTOHL (0x64657200),  // name = ExceptionHolder
-  3, // member count
-    20, ACE_NTOHL (0x69735f73), ACE_NTOHL (0x79737465), ACE_NTOHL (0x6d5f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = is_system_exception
-    CORBA::tk_boolean,
-
-    11, ACE_NTOHL (0x62797465), ACE_NTOHL (0x5f6f7264), ACE_NTOHL (0x65720000),  // name = byte_order
-    CORBA::tk_boolean,
-
-    20, ACE_NTOHL (0x6d617273), ACE_NTOHL (0x68616c65), ACE_NTOHL (0x645f6578), ACE_NTOHL (0x63657074), ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_octet,
-
-    0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder (CORBA::tk_struct, sizeof (_oc_Messaging_ExceptionHolder), (char *) &_oc_Messaging_ExceptionHolder, 0, sizeof (Messaging::ExceptionHolder));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionHolder, &_tc_TAO_tc_Messaging_ExceptionHolder)
-TAO_NAMESPACE_END
-
-// *************************************************************
-// Messaging::ExceptionHolder::_tao_seq_Octet
-// *************************************************************
-
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::Octet> (max, length, buffer, release)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : TAO_Unbounded_Sequence<CORBA::Octet> (seq)
-{}
-Messaging::ExceptionHolder::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_Messaging_ExceptionHolder__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_ExceptionHolder__tao_seq_Octet), (char *) &_oc_Messaging_ExceptionHolder__tao_seq_Octet, 0, sizeof (Messaging::ExceptionHolder::_tao_seq_Octet));
-CORBA::TypeCode_ptr Messaging::ExceptionHolder::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet;
-
-// ****************************************************************
-
-Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyHandler::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/ReplyHandler:1.0", env))
-    return Messaging::ReplyHandler::_nil ();
-  return Messaging::ReplyHandler::_unchecked_narrow (obj, env);
-}
-
-Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::ReplyHandler::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyHandler:1.0");
-  if (servant == 0)
-    return new Messaging::ReplyHandler(stub);
-  return new POA_Messaging::_tao_collocated_ReplyHandler(
-      ACE_reinterpret_cast(POA_Messaging::ReplyHandler_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL: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); // remote call
-}
-
-const char* Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyHandler:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_ReplyHandler[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:Messaging/ReplyHandler:1.0
-  13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0),  // name = ReplyHandler,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler)
-TAO_NAMESPACE_END
-
-
-Messaging::Poller_ptr Messaging::Poller::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::Poller::_nil ();
-  if (!obj->_is_a ("IDL:Messaging/Poller:1.0", env))
-    return Messaging::Poller::_nil ();
-  return Messaging::Poller::_unchecked_narrow (obj, env);
-}
-
-Messaging::Poller_ptr Messaging::Poller::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return Messaging::Poller::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
-  stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:Messaging/Poller:1.0");
-  if (servant == 0)
-    return new Messaging::Poller(stub);
-  return new POA_Messaging::_tao_collocated_Poller(
-      ACE_reinterpret_cast(POA_Messaging::Poller_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Object_ptr Messaging::Poller::operation_target (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""operation_target",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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 * Messaging::Poller::operation_name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    char *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""operation_name",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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;
-}
-
-Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    Messaging::ReplyHandler_ptr _tao_retval = Messaging::ReplyHandler::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""associated_handler",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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 Messaging::Poller::associated_handler (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_set_""associated_handler",
-      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 << associated_handler)
-      ))
-      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 Messaging::Poller::is_from_poller (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""is_from_poller",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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;
-}
-
-CORBA::Object_ptr Messaging::Poller::target (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Object_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""target",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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 * Messaging::Poller::op_name (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    char *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""op_name",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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 Messaging::Poller::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable: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); // remote call
-}
-
-const char* Messaging::Poller::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/Poller:1.0";
-}
-
-static const CORBA::Long _oc_Messaging_Poller[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f506f), ACE_NTOHL (0x6c6c6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:Messaging/Poller:1.0
-  7, ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x65720000),  // name = Poller,
-};
-static CORBA::TypeCode _tc_TAO_tc_Messaging_Poller (CORBA::tk_objref, sizeof (_oc_Messaging_Poller), (char *) &_oc_Messaging_Poller, 0, sizeof (Messaging::Poller));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (Messaging)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Poller, &_tc_TAO_tc_Messaging_Poller)
-TAO_NAMESPACE_END
-#endif
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, const Messaging::PriorityRange &_tao_elem) // copying
-{
-  Messaging::PriorityRange *_any_val;
-  ACE_NEW (_any_val, Messaging::PriorityRange (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PriorityRange, _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, Messaging::PriorityRange *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PriorityRange, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PriorityRange *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PriorityRange, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PriorityRange *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PriorityRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PriorityRange, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PriorityRange, _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 Messaging::RoutingTypeRange &_tao_elem) // copying
-{
-  Messaging::RoutingTypeRange *_any_val;
-  ACE_NEW (_any_val, Messaging::RoutingTypeRange (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_RoutingTypeRange, _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, Messaging::RoutingTypeRange *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_RoutingTypeRange, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::RoutingTypeRange *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_RoutingTypeRange, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::RoutingTypeRange *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::RoutingTypeRange, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_RoutingTypeRange, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_RoutingTypeRange, _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 Messaging::PolicyValue &_tao_elem) // copying
-{
-  Messaging::PolicyValue *_any_val;
-  ACE_NEW (_any_val, Messaging::PolicyValue (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValue, _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, Messaging::PolicyValue *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValue, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValue *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PolicyValue, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PolicyValue *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValue, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PolicyValue, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PolicyValue, _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 Messaging::PolicyValueSeq &_tao_elem
-  ) // copying
-{
-  Messaging::PolicyValueSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, Messaging::PolicyValueSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValueSeq, _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, Messaging::PolicyValueSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_PolicyValueSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_PolicyValueSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::PolicyValueSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::PolicyValueSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_PolicyValueSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_PolicyValueSeq, _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;
-}
-
-// ****************************************************************
-
-#if defined(TAO_POLLER)
-void operator<<= (CORBA::Any &_tao_any, const Messaging::ExceptionHolder &_tao_elem) // copying
-{
-  Messaging::ExceptionHolder *_any_val;
-  ACE_NEW (_any_val, Messaging::ExceptionHolder (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_ExceptionHolder, _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, Messaging::ExceptionHolder *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (Messaging::_tc_ExceptionHolder, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::ExceptionHolder *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_ExceptionHolder, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (Messaging::ExceptionHolder *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, Messaging::ExceptionHolder, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (Messaging::_tc_ExceptionHolder, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (Messaging::_tc_ExceptionHolder, _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, Messaging::ReplyHandler_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 = Messaging::ReplyHandler::_duplicate (_tao_elem);
-    _tao_any.replace (Messaging::_tc_ReplyHandler, _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, Messaging::ReplyHandler_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::ReplyHandler::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_ReplyHandler, 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 (Messaging::_tc_ReplyHandler, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = Messaging::ReplyHandler::_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 (Messaging::_tc_ReplyHandler, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (CORBA::Any &_tao_any, Messaging::Poller_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 = Messaging::Poller::_duplicate (_tao_elem);
-    _tao_any.replace (Messaging::_tc_Poller, _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, Messaging::Poller_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = Messaging::Poller::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (Messaging::_tc_Poller, 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 (Messaging::_tc_Poller, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = Messaging::Poller::_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 (Messaging::_tc_Poller, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* TAO_POLLER */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class TAO_Unbounded_Sequence<Messaging::PolicyValue>;
-
-#if defined(TAO_POLLER)
-  template class TAO_Object_Field_T<Messaging::ReplyHandler>;
-  template class TAO_Object_Field_T<Messaging::Poller>;
-#endif /* TAO_POLLER */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue>
-
-#if defined(TAO_POLLER)
-#  pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler>
-#  pragma instantiate TAO_Object_Field_T<Messaging::Poller>
-#endif /* TAO_POLLER */
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
deleted file mode 100644
index c44e12642a4..00000000000
--- a/TAO/tao/MessagingC.h
+++ /dev/null
@@ -1,1911 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseC.h
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl, the common time representation for
-//   Time in CORBA.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_MESSAGINGC_H
-#define TAO_IDL_MESSAGINGC_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Any.h"
-#include "tao/CDR.h"
-#include "tao/TimeBaseC.h"
-#include "tao/PolicyC.h"
-#include "tao/iopfwd.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined(TRANSPARENT)
-// Some platforms define this macro for ioctl()
-#undef TRANSPARENT
-#endif
-
-TAO_NAMESPACE  Messaging
-{
-  typedef CORBA::Short RebindMode;
-  typedef CORBA::Short_out RebindMode_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RebindMode;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short TRANSPARENT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NO_REBIND;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short NO_RECONNECT;
-
-  typedef CORBA::Short SyncScope;
-  typedef CORBA::Short_out SyncScope_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScope;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TRANSPORT;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_SERVER;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short SYNC_WITH_TARGET;
-
-  typedef CORBA::Short RoutingType;
-  typedef CORBA::Short_out RoutingType_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingType;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_NONE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_FORWARD;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short ROUTE_STORE_AND_FORWARD;
-
-  typedef TimeBase::TimeT Timeout;
-  typedef TimeBase::TimeT_out Timeout_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Timeout;
-
-  typedef CORBA::Short Priority;
-  typedef CORBA::Short_out Priority_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Priority;
-
-  typedef CORBA::UShort Ordering;
-  typedef CORBA::UShort_out Ordering_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Ordering;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_ANY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_TEMPORAL;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_PRIORITY;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::UShort ORDER_DEADLINE;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REBIND_POLICY_TYPE;
-
-
-  class RebindPolicy;
-  typedef RebindPolicy *RebindPolicy_ptr;
-
-  class TAO_Export RebindPolicy_var
-  {
-  public:
-    RebindPolicy_var (void); // default constructor
-    RebindPolicy_var (RebindPolicy_ptr);
-    RebindPolicy_var (const RebindPolicy_var &); // copy constructor
-    ~RebindPolicy_var (void); // destructor
-
-    RebindPolicy_var &operator= (RebindPolicy_ptr);
-    RebindPolicy_var &operator= (const RebindPolicy_var &);
-    RebindPolicy_ptr operator-> (void) const;
-
-    operator const RebindPolicy_ptr &() const;
-    operator RebindPolicy_ptr &();
-    // in, inout, out, _retn
-    RebindPolicy_ptr in (void) const;
-    RebindPolicy_ptr &inout (void);
-    RebindPolicy_ptr &out (void);
-    RebindPolicy_ptr _retn (void);
-    RebindPolicy_ptr ptr (void) const;
-
-  private:
-    RebindPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RebindPolicy_out
-  {
-  public:
-    RebindPolicy_out (RebindPolicy_ptr &);
-    RebindPolicy_out (RebindPolicy_var &);
-    RebindPolicy_out (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_out &);
-    RebindPolicy_out &operator= (const RebindPolicy_var &);
-    RebindPolicy_out &operator= (RebindPolicy_ptr);
-    operator RebindPolicy_ptr &();
-    RebindPolicy_ptr &ptr (void);
-    RebindPolicy_ptr operator-> (void);
-
-  private:
-    RebindPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RebindPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RebindPolicy_ptr _ptr_type;
-    typedef RebindPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RebindPolicy_ptr _duplicate (RebindPolicy_ptr obj);
-    static RebindPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RebindPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RebindPolicy_ptr _nil (void);
-
-    virtual RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RebindPolicy (void); // default constructor
-    RebindPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RebindPolicy (void);
-  private:
-    RebindPolicy (const RebindPolicy &);
-    void operator= (const RebindPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RebindPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SYNC_SCOPE_POLICY_TYPE;
-
-  class SyncScopePolicy;
-  typedef SyncScopePolicy *SyncScopePolicy_ptr;
-
-  class TAO_Export SyncScopePolicy_var
-  {
-  public:
-    SyncScopePolicy_var (void); // default constructor
-    SyncScopePolicy_var (SyncScopePolicy_ptr);
-    SyncScopePolicy_var (const SyncScopePolicy_var &); // copy constructor
-    ~SyncScopePolicy_var (void); // destructor
-
-    SyncScopePolicy_var &operator= (SyncScopePolicy_ptr);
-    SyncScopePolicy_var &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_ptr operator-> (void) const;
-
-    operator const SyncScopePolicy_ptr &() const;
-    operator SyncScopePolicy_ptr &();
-    // in, inout, out, _retn
-    SyncScopePolicy_ptr in (void) const;
-    SyncScopePolicy_ptr &inout (void);
-    SyncScopePolicy_ptr &out (void);
-    SyncScopePolicy_ptr _retn (void);
-    SyncScopePolicy_ptr ptr (void) const;
-
-  private:
-    SyncScopePolicy_ptr ptr_;
-  };
-
-  class TAO_Export SyncScopePolicy_out
-  {
-  public:
-    SyncScopePolicy_out (SyncScopePolicy_ptr &);
-    SyncScopePolicy_out (SyncScopePolicy_var &);
-    SyncScopePolicy_out (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_out &);
-    SyncScopePolicy_out &operator= (const SyncScopePolicy_var &);
-    SyncScopePolicy_out &operator= (SyncScopePolicy_ptr);
-    operator SyncScopePolicy_ptr &();
-    SyncScopePolicy_ptr &ptr (void);
-    SyncScopePolicy_ptr operator-> (void);
-
-  private:
-    SyncScopePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export SyncScopePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef SyncScopePolicy_ptr _ptr_type;
-    typedef SyncScopePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static SyncScopePolicy_ptr _duplicate (SyncScopePolicy_ptr obj);
-    static SyncScopePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static SyncScopePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static SyncScopePolicy_ptr _nil (void);
-
-    virtual SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    SyncScopePolicy (void); // default constructor
-    SyncScopePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~SyncScopePolicy (void);
-  private:
-    SyncScopePolicy (const SyncScopePolicy &);
-    void operator= (const SyncScopePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SyncScopePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PRIORITY_POLICY_TYPE;
-
-  struct TAO_Export PriorityRange
-  {
-    Priority min;
-    Priority max;
-  };
-
-  class TAO_Export PriorityRange_var
-  {
-  public:
-    PriorityRange_var (void); // default constructor
-    PriorityRange_var (PriorityRange *);
-    PriorityRange_var (const PriorityRange_var &); // copy constructor
-    ~PriorityRange_var (void); // destructor
-
-    PriorityRange_var &operator= (PriorityRange *);
-    PriorityRange_var &operator= (const PriorityRange_var &);
-    PriorityRange *operator-> (void);
-    const PriorityRange *operator-> (void) const;
-
-    operator const PriorityRange &() const;
-    operator PriorityRange &();
-    operator PriorityRange &() const;
-    // in, inout, out, _retn
-    const PriorityRange &in (void) const;
-    PriorityRange &inout (void);
-    PriorityRange &out (void);
-    PriorityRange _retn (void);
-    PriorityRange *ptr (void) const;
-
-  private:
-    PriorityRange *ptr_;
-  };
-
-  typedef PriorityRange &PriorityRange_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PriorityRange;
-
-  class RequestPriorityPolicy;
-  typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-
-  class TAO_Export RequestPriorityPolicy_var
-  {
-  public:
-    RequestPriorityPolicy_var (void); // default constructor
-    RequestPriorityPolicy_var (RequestPriorityPolicy_ptr);
-    RequestPriorityPolicy_var (const RequestPriorityPolicy_var &); // copy constructor
-    ~RequestPriorityPolicy_var (void); // destructor
-
-    RequestPriorityPolicy_var &operator= (RequestPriorityPolicy_ptr);
-    RequestPriorityPolicy_var &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_ptr operator-> (void) const;
-
-    operator const RequestPriorityPolicy_ptr &() const;
-    operator RequestPriorityPolicy_ptr &();
-    // in, inout, out, _retn
-    RequestPriorityPolicy_ptr in (void) const;
-    RequestPriorityPolicy_ptr &inout (void);
-    RequestPriorityPolicy_ptr &out (void);
-    RequestPriorityPolicy_ptr _retn (void);
-    RequestPriorityPolicy_ptr ptr (void) const;
-
-  private:
-    RequestPriorityPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestPriorityPolicy_out
-  {
-  public:
-    RequestPriorityPolicy_out (RequestPriorityPolicy_ptr &);
-    RequestPriorityPolicy_out (RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_out &);
-    RequestPriorityPolicy_out &operator= (const RequestPriorityPolicy_var &);
-    RequestPriorityPolicy_out &operator= (RequestPriorityPolicy_ptr);
-    operator RequestPriorityPolicy_ptr &();
-    RequestPriorityPolicy_ptr &ptr (void);
-    RequestPriorityPolicy_ptr operator-> (void);
-
-  private:
-    RequestPriorityPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestPriorityPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestPriorityPolicy_ptr _ptr_type;
-    typedef RequestPriorityPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestPriorityPolicy_ptr _duplicate (RequestPriorityPolicy_ptr obj);
-    static RequestPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestPriorityPolicy_ptr _nil (void);
-
-    virtual PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestPriorityPolicy (void); // default constructor
-    RequestPriorityPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestPriorityPolicy (void);
-  private:
-    RequestPriorityPolicy (const RequestPriorityPolicy &);
-    void operator= (const RequestPriorityPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestPriorityPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_PRIORITY_POLICY_TYPE;
-
-  class ReplyPriorityPolicy;
-  typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-
-  class TAO_Export ReplyPriorityPolicy_var
-  {
-  public:
-    ReplyPriorityPolicy_var (void); // default constructor
-    ReplyPriorityPolicy_var (ReplyPriorityPolicy_ptr);
-    ReplyPriorityPolicy_var (const ReplyPriorityPolicy_var &); // copy constructor
-    ~ReplyPriorityPolicy_var (void); // destructor
-
-    ReplyPriorityPolicy_var &operator= (ReplyPriorityPolicy_ptr);
-    ReplyPriorityPolicy_var &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_ptr operator-> (void) const;
-
-    operator const ReplyPriorityPolicy_ptr &() const;
-    operator ReplyPriorityPolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyPriorityPolicy_ptr in (void) const;
-    ReplyPriorityPolicy_ptr &inout (void);
-    ReplyPriorityPolicy_ptr &out (void);
-    ReplyPriorityPolicy_ptr _retn (void);
-    ReplyPriorityPolicy_ptr ptr (void) const;
-
-  private:
-    ReplyPriorityPolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyPriorityPolicy_out
-  {
-  public:
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_ptr &);
-    ReplyPriorityPolicy_out (ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_out &);
-    ReplyPriorityPolicy_out &operator= (const ReplyPriorityPolicy_var &);
-    ReplyPriorityPolicy_out &operator= (ReplyPriorityPolicy_ptr);
-    operator ReplyPriorityPolicy_ptr &();
-    ReplyPriorityPolicy_ptr &ptr (void);
-    ReplyPriorityPolicy_ptr operator-> (void);
-
-  private:
-    ReplyPriorityPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyPriorityPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyPriorityPolicy_ptr _ptr_type;
-    typedef ReplyPriorityPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyPriorityPolicy_ptr _duplicate (ReplyPriorityPolicy_ptr obj);
-    static ReplyPriorityPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyPriorityPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyPriorityPolicy_ptr _nil (void);
-
-    virtual PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyPriorityPolicy (void); // default constructor
-    ReplyPriorityPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyPriorityPolicy (void);
-  private:
-    ReplyPriorityPolicy (const ReplyPriorityPolicy &);
-    void operator= (const ReplyPriorityPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyPriorityPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_START_TIME_POLICY_TYPE;
-
-  class RequestStartTimePolicy;
-  typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-
-  class TAO_Export RequestStartTimePolicy_var
-  {
-  public:
-    RequestStartTimePolicy_var (void); // default constructor
-    RequestStartTimePolicy_var (RequestStartTimePolicy_ptr);
-    RequestStartTimePolicy_var (const RequestStartTimePolicy_var &); // copy constructor
-    ~RequestStartTimePolicy_var (void); // destructor
-
-    RequestStartTimePolicy_var &operator= (RequestStartTimePolicy_ptr);
-    RequestStartTimePolicy_var &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_ptr operator-> (void) const;
-
-    operator const RequestStartTimePolicy_ptr &() const;
-    operator RequestStartTimePolicy_ptr &();
-    // in, inout, out, _retn
-    RequestStartTimePolicy_ptr in (void) const;
-    RequestStartTimePolicy_ptr &inout (void);
-    RequestStartTimePolicy_ptr &out (void);
-    RequestStartTimePolicy_ptr _retn (void);
-    RequestStartTimePolicy_ptr ptr (void) const;
-
-  private:
-    RequestStartTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestStartTimePolicy_out
-  {
-  public:
-    RequestStartTimePolicy_out (RequestStartTimePolicy_ptr &);
-    RequestStartTimePolicy_out (RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_out &);
-    RequestStartTimePolicy_out &operator= (const RequestStartTimePolicy_var &);
-    RequestStartTimePolicy_out &operator= (RequestStartTimePolicy_ptr);
-    operator RequestStartTimePolicy_ptr &();
-    RequestStartTimePolicy_ptr &ptr (void);
-    RequestStartTimePolicy_ptr operator-> (void);
-
-  private:
-    RequestStartTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestStartTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestStartTimePolicy_ptr _ptr_type;
-    typedef RequestStartTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestStartTimePolicy_ptr _duplicate (RequestStartTimePolicy_ptr obj);
-    static RequestStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestStartTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestStartTimePolicy (void); // default constructor
-    RequestStartTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestStartTimePolicy (void);
-  private:
-    RequestStartTimePolicy (const RequestStartTimePolicy &);
-    void operator= (const RequestStartTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestStartTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_END_TIME_POLICY_TYPE;
-
-  class RequestEndTimePolicy;
-  typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-
-  class TAO_Export RequestEndTimePolicy_var
-  {
-  public:
-    RequestEndTimePolicy_var (void); // default constructor
-    RequestEndTimePolicy_var (RequestEndTimePolicy_ptr);
-    RequestEndTimePolicy_var (const RequestEndTimePolicy_var &); // copy constructor
-    ~RequestEndTimePolicy_var (void); // destructor
-
-    RequestEndTimePolicy_var &operator= (RequestEndTimePolicy_ptr);
-    RequestEndTimePolicy_var &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_ptr operator-> (void) const;
-
-    operator const RequestEndTimePolicy_ptr &() const;
-    operator RequestEndTimePolicy_ptr &();
-    // in, inout, out, _retn
-    RequestEndTimePolicy_ptr in (void) const;
-    RequestEndTimePolicy_ptr &inout (void);
-    RequestEndTimePolicy_ptr &out (void);
-    RequestEndTimePolicy_ptr _retn (void);
-    RequestEndTimePolicy_ptr ptr (void) const;
-
-  private:
-    RequestEndTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export RequestEndTimePolicy_out
-  {
-  public:
-    RequestEndTimePolicy_out (RequestEndTimePolicy_ptr &);
-    RequestEndTimePolicy_out (RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_out &);
-    RequestEndTimePolicy_out &operator= (const RequestEndTimePolicy_var &);
-    RequestEndTimePolicy_out &operator= (RequestEndTimePolicy_ptr);
-    operator RequestEndTimePolicy_ptr &();
-    RequestEndTimePolicy_ptr &ptr (void);
-    RequestEndTimePolicy_ptr operator-> (void);
-
-  private:
-    RequestEndTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RequestEndTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestEndTimePolicy_ptr _ptr_type;
-    typedef RequestEndTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RequestEndTimePolicy_ptr _duplicate (RequestEndTimePolicy_ptr obj);
-    static RequestEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RequestEndTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RequestEndTimePolicy (void); // default constructor
-    RequestEndTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RequestEndTimePolicy (void);
-  private:
-    RequestEndTimePolicy (const RequestEndTimePolicy &);
-    void operator= (const RequestEndTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestEndTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_START_TIME_POLICY_TYPE;
-
-  class ReplyStartTimePolicy;
-  typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-
-  class TAO_Export ReplyStartTimePolicy_var
-  {
-  public:
-    ReplyStartTimePolicy_var (void); // default constructor
-    ReplyStartTimePolicy_var (ReplyStartTimePolicy_ptr);
-    ReplyStartTimePolicy_var (const ReplyStartTimePolicy_var &); // copy constructor
-    ~ReplyStartTimePolicy_var (void); // destructor
-
-    ReplyStartTimePolicy_var &operator= (ReplyStartTimePolicy_ptr);
-    ReplyStartTimePolicy_var &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_ptr operator-> (void) const;
-
-    operator const ReplyStartTimePolicy_ptr &() const;
-    operator ReplyStartTimePolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyStartTimePolicy_ptr in (void) const;
-    ReplyStartTimePolicy_ptr &inout (void);
-    ReplyStartTimePolicy_ptr &out (void);
-    ReplyStartTimePolicy_ptr _retn (void);
-    ReplyStartTimePolicy_ptr ptr (void) const;
-
-  private:
-    ReplyStartTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyStartTimePolicy_out
-  {
-  public:
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_ptr &);
-    ReplyStartTimePolicy_out (ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_out &);
-    ReplyStartTimePolicy_out &operator= (const ReplyStartTimePolicy_var &);
-    ReplyStartTimePolicy_out &operator= (ReplyStartTimePolicy_ptr);
-    operator ReplyStartTimePolicy_ptr &();
-    ReplyStartTimePolicy_ptr &ptr (void);
-    ReplyStartTimePolicy_ptr operator-> (void);
-
-  private:
-    ReplyStartTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyStartTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyStartTimePolicy_ptr _ptr_type;
-    typedef ReplyStartTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyStartTimePolicy_ptr _duplicate (ReplyStartTimePolicy_ptr obj);
-    static ReplyStartTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyStartTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyStartTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyStartTimePolicy (void); // default constructor
-    ReplyStartTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyStartTimePolicy (void);
-  private:
-    ReplyStartTimePolicy (const ReplyStartTimePolicy &);
-    void operator= (const ReplyStartTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyStartTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REPLY_END_TIME_POLICY_TYPE;
-
-  class ReplyEndTimePolicy;
-  typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-
-  class TAO_Export ReplyEndTimePolicy_var
-  {
-  public:
-    ReplyEndTimePolicy_var (void); // default constructor
-    ReplyEndTimePolicy_var (ReplyEndTimePolicy_ptr);
-    ReplyEndTimePolicy_var (const ReplyEndTimePolicy_var &); // copy constructor
-    ~ReplyEndTimePolicy_var (void); // destructor
-
-    ReplyEndTimePolicy_var &operator= (ReplyEndTimePolicy_ptr);
-    ReplyEndTimePolicy_var &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_ptr operator-> (void) const;
-
-    operator const ReplyEndTimePolicy_ptr &() const;
-    operator ReplyEndTimePolicy_ptr &();
-    // in, inout, out, _retn
-    ReplyEndTimePolicy_ptr in (void) const;
-    ReplyEndTimePolicy_ptr &inout (void);
-    ReplyEndTimePolicy_ptr &out (void);
-    ReplyEndTimePolicy_ptr _retn (void);
-    ReplyEndTimePolicy_ptr ptr (void) const;
-
-  private:
-    ReplyEndTimePolicy_ptr ptr_;
-  };
-
-  class TAO_Export ReplyEndTimePolicy_out
-  {
-  public:
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_ptr &);
-    ReplyEndTimePolicy_out (ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_out &);
-    ReplyEndTimePolicy_out &operator= (const ReplyEndTimePolicy_var &);
-    ReplyEndTimePolicy_out &operator= (ReplyEndTimePolicy_ptr);
-    operator ReplyEndTimePolicy_ptr &();
-    ReplyEndTimePolicy_ptr &ptr (void);
-    ReplyEndTimePolicy_ptr operator-> (void);
-
-  private:
-    ReplyEndTimePolicy_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyEndTimePolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyEndTimePolicy_ptr _ptr_type;
-    typedef ReplyEndTimePolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyEndTimePolicy_ptr _duplicate (ReplyEndTimePolicy_ptr obj);
-    static ReplyEndTimePolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyEndTimePolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyEndTimePolicy_ptr _nil (void);
-
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyEndTimePolicy (void); // default constructor
-    ReplyEndTimePolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyEndTimePolicy (void);
-  private:
-    ReplyEndTimePolicy (const ReplyEndTimePolicy &);
-    void operator= (const ReplyEndTimePolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyEndTimePolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_REQ_TIMEOUT_POLICY_TYPE;
-
-  class RelativeRequestTimeoutPolicy;
-  typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-
-  class TAO_Export RelativeRequestTimeoutPolicy_var
-  {
-  public:
-    RelativeRequestTimeoutPolicy_var (void); // default constructor
-    RelativeRequestTimeoutPolicy_var (RelativeRequestTimeoutPolicy_ptr);
-    RelativeRequestTimeoutPolicy_var (const RelativeRequestTimeoutPolicy_var &); // copy constructor
-    ~RelativeRequestTimeoutPolicy_var (void); // destructor
-
-    RelativeRequestTimeoutPolicy_var &operator= (RelativeRequestTimeoutPolicy_ptr);
-    RelativeRequestTimeoutPolicy_var &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void) const;
-
-    operator const RelativeRequestTimeoutPolicy_ptr &() const;
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
-    RelativeRequestTimeoutPolicy_ptr in (void) const;
-    RelativeRequestTimeoutPolicy_ptr &inout (void);
-    RelativeRequestTimeoutPolicy_ptr &out (void);
-    RelativeRequestTimeoutPolicy_ptr _retn (void);
-    RelativeRequestTimeoutPolicy_ptr ptr (void) const;
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RelativeRequestTimeoutPolicy_out
-  {
-  public:
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_ptr &);
-    RelativeRequestTimeoutPolicy_out (RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_out &);
-    RelativeRequestTimeoutPolicy_out &operator= (const RelativeRequestTimeoutPolicy_var &);
-    RelativeRequestTimeoutPolicy_out &operator= (RelativeRequestTimeoutPolicy_ptr);
-    operator RelativeRequestTimeoutPolicy_ptr &();
-    RelativeRequestTimeoutPolicy_ptr &ptr (void);
-    RelativeRequestTimeoutPolicy_ptr operator-> (void);
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RelativeRequestTimeoutPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RelativeRequestTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRequestTimeoutPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RelativeRequestTimeoutPolicy_ptr _duplicate (RelativeRequestTimeoutPolicy_ptr obj);
-    static RelativeRequestTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRequestTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRequestTimeoutPolicy_ptr _nil (void);
-
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RelativeRequestTimeoutPolicy (void); // default constructor
-    RelativeRequestTimeoutPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RelativeRequestTimeoutPolicy (void);
-  private:
-    RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy &);
-    void operator= (const RelativeRequestTimeoutPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRequestTimeoutPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong RELATIVE_RT_TIMEOUT_POLICY_TYPE;
-
-  class RelativeRoundtripTimeoutPolicy;
-  typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy_var
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_var (void); // default constructor
-    RelativeRoundtripTimeoutPolicy_var (RelativeRoundtripTimeoutPolicy_ptr);
-    RelativeRoundtripTimeoutPolicy_var (const RelativeRoundtripTimeoutPolicy_var &); // copy constructor
-    ~RelativeRoundtripTimeoutPolicy_var (void); // destructor
-
-    RelativeRoundtripTimeoutPolicy_var &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    RelativeRoundtripTimeoutPolicy_var &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void) const;
-
-    operator const RelativeRoundtripTimeoutPolicy_ptr &() const;
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    // in, inout, out, _retn
-    RelativeRoundtripTimeoutPolicy_ptr in (void) const;
-    RelativeRoundtripTimeoutPolicy_ptr &inout (void);
-    RelativeRoundtripTimeoutPolicy_ptr &out (void);
-    RelativeRoundtripTimeoutPolicy_ptr _retn (void);
-    RelativeRoundtripTimeoutPolicy_ptr ptr (void) const;
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy_out
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_ptr &);
-    RelativeRoundtripTimeoutPolicy_out (RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_out &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (const RelativeRoundtripTimeoutPolicy_var &);
-    RelativeRoundtripTimeoutPolicy_out &operator= (RelativeRoundtripTimeoutPolicy_ptr);
-    operator RelativeRoundtripTimeoutPolicy_ptr &();
-    RelativeRoundtripTimeoutPolicy_ptr &ptr (void);
-    RelativeRoundtripTimeoutPolicy_ptr operator-> (void);
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RelativeRoundtripTimeoutPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RelativeRoundtripTimeoutPolicy_ptr _ptr_type;
-    typedef RelativeRoundtripTimeoutPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RelativeRoundtripTimeoutPolicy_ptr _duplicate (RelativeRoundtripTimeoutPolicy_ptr obj);
-    static RelativeRoundtripTimeoutPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRoundtripTimeoutPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RelativeRoundtripTimeoutPolicy_ptr _nil (void);
-
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RelativeRoundtripTimeoutPolicy (void); // default constructor
-    RelativeRoundtripTimeoutPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RelativeRoundtripTimeoutPolicy (void);
-  private:
-    RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy &);
-    void operator= (const RelativeRoundtripTimeoutPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RelativeRoundtripTimeoutPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ROUTING_POLICY_TYPE;
-
-  struct TAO_Export RoutingTypeRange
-  {
-    RoutingType min;
-    RoutingType max;
-  };
-
-  class TAO_Export RoutingTypeRange_var
-  {
-  public:
-    RoutingTypeRange_var (void); // default constructor
-    RoutingTypeRange_var (RoutingTypeRange *);
-    RoutingTypeRange_var (const RoutingTypeRange_var &); // copy constructor
-    ~RoutingTypeRange_var (void); // destructor
-
-    RoutingTypeRange_var &operator= (RoutingTypeRange *);
-    RoutingTypeRange_var &operator= (const RoutingTypeRange_var &);
-    RoutingTypeRange *operator-> (void);
-    const RoutingTypeRange *operator-> (void) const;
-
-    operator const RoutingTypeRange &() const;
-    operator RoutingTypeRange &();
-    operator RoutingTypeRange &() const;
-    // in, inout, out, _retn
-    const RoutingTypeRange &in (void) const;
-    RoutingTypeRange &inout (void);
-    RoutingTypeRange &out (void);
-    RoutingTypeRange _retn (void);
-    RoutingTypeRange *ptr (void) const;
-
-  private:
-    RoutingTypeRange *ptr_;
-  };
-
-  typedef RoutingTypeRange &RoutingTypeRange_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingTypeRange;
-
-  class RoutingPolicy;
-  typedef RoutingPolicy *RoutingPolicy_ptr;
-
-  class TAO_Export RoutingPolicy_var
-  {
-  public:
-    RoutingPolicy_var (void); // default constructor
-    RoutingPolicy_var (RoutingPolicy_ptr);
-    RoutingPolicy_var (const RoutingPolicy_var &); // copy constructor
-    ~RoutingPolicy_var (void); // destructor
-
-    RoutingPolicy_var &operator= (RoutingPolicy_ptr);
-    RoutingPolicy_var &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_ptr operator-> (void) const;
-
-    operator const RoutingPolicy_ptr &() const;
-    operator RoutingPolicy_ptr &();
-    // in, inout, out, _retn
-    RoutingPolicy_ptr in (void) const;
-    RoutingPolicy_ptr &inout (void);
-    RoutingPolicy_ptr &out (void);
-    RoutingPolicy_ptr _retn (void);
-    RoutingPolicy_ptr ptr (void) const;
-
-  private:
-    RoutingPolicy_ptr ptr_;
-  };
-
-  class TAO_Export RoutingPolicy_out
-  {
-  public:
-    RoutingPolicy_out (RoutingPolicy_ptr &);
-    RoutingPolicy_out (RoutingPolicy_var &);
-    RoutingPolicy_out (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_out &);
-    RoutingPolicy_out &operator= (const RoutingPolicy_var &);
-    RoutingPolicy_out &operator= (RoutingPolicy_ptr);
-    operator RoutingPolicy_ptr &();
-    RoutingPolicy_ptr &ptr (void);
-    RoutingPolicy_ptr operator-> (void);
-
-  private:
-    RoutingPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export RoutingPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RoutingPolicy_ptr _ptr_type;
-    typedef RoutingPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static RoutingPolicy_ptr _duplicate (RoutingPolicy_ptr obj);
-    static RoutingPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RoutingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static RoutingPolicy_ptr _nil (void);
-
-    virtual RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    RoutingPolicy (void); // default constructor
-    RoutingPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~RoutingPolicy (void);
-  private:
-    RoutingPolicy (const RoutingPolicy &);
-    void operator= (const RoutingPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RoutingPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong MAX_HOPS_POLICY_TYPE;
-
-  class MaxHopsPolicy;
-  typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-
-  class TAO_Export MaxHopsPolicy_var
-  {
-  public:
-    MaxHopsPolicy_var (void); // default constructor
-    MaxHopsPolicy_var (MaxHopsPolicy_ptr);
-    MaxHopsPolicy_var (const MaxHopsPolicy_var &); // copy constructor
-    ~MaxHopsPolicy_var (void); // destructor
-
-    MaxHopsPolicy_var &operator= (MaxHopsPolicy_ptr);
-    MaxHopsPolicy_var &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_ptr operator-> (void) const;
-
-    operator const MaxHopsPolicy_ptr &() const;
-    operator MaxHopsPolicy_ptr &();
-    // in, inout, out, _retn
-    MaxHopsPolicy_ptr in (void) const;
-    MaxHopsPolicy_ptr &inout (void);
-    MaxHopsPolicy_ptr &out (void);
-    MaxHopsPolicy_ptr _retn (void);
-    MaxHopsPolicy_ptr ptr (void) const;
-
-  private:
-    MaxHopsPolicy_ptr ptr_;
-  };
-
-  class TAO_Export MaxHopsPolicy_out
-  {
-  public:
-    MaxHopsPolicy_out (MaxHopsPolicy_ptr &);
-    MaxHopsPolicy_out (MaxHopsPolicy_var &);
-    MaxHopsPolicy_out (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_out &);
-    MaxHopsPolicy_out &operator= (const MaxHopsPolicy_var &);
-    MaxHopsPolicy_out &operator= (MaxHopsPolicy_ptr);
-    operator MaxHopsPolicy_ptr &();
-    MaxHopsPolicy_ptr &ptr (void);
-    MaxHopsPolicy_ptr operator-> (void);
-
-  private:
-    MaxHopsPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export MaxHopsPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef MaxHopsPolicy_ptr _ptr_type;
-    typedef MaxHopsPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static MaxHopsPolicy_ptr _duplicate (MaxHopsPolicy_ptr obj);
-    static MaxHopsPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static MaxHopsPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static MaxHopsPolicy_ptr _nil (void);
-
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    MaxHopsPolicy (void); // default constructor
-    MaxHopsPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~MaxHopsPolicy (void);
-  private:
-    MaxHopsPolicy (const MaxHopsPolicy &);
-    void operator= (const MaxHopsPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_MaxHopsPolicy;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong QUEUE_ORDER_POLICY_TYPE;
-
-  class QueueOrderPolicy;
-  typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-
-  class TAO_Export QueueOrderPolicy_var
-  {
-  public:
-    QueueOrderPolicy_var (void); // default constructor
-    QueueOrderPolicy_var (QueueOrderPolicy_ptr);
-    QueueOrderPolicy_var (const QueueOrderPolicy_var &); // copy constructor
-    ~QueueOrderPolicy_var (void); // destructor
-
-    QueueOrderPolicy_var &operator= (QueueOrderPolicy_ptr);
-    QueueOrderPolicy_var &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_ptr operator-> (void) const;
-
-    operator const QueueOrderPolicy_ptr &() const;
-    operator QueueOrderPolicy_ptr &();
-    // in, inout, out, _retn
-    QueueOrderPolicy_ptr in (void) const;
-    QueueOrderPolicy_ptr &inout (void);
-    QueueOrderPolicy_ptr &out (void);
-    QueueOrderPolicy_ptr _retn (void);
-    QueueOrderPolicy_ptr ptr (void) const;
-
-  private:
-    QueueOrderPolicy_ptr ptr_;
-  };
-
-  class TAO_Export QueueOrderPolicy_out
-  {
-  public:
-    QueueOrderPolicy_out (QueueOrderPolicy_ptr &);
-    QueueOrderPolicy_out (QueueOrderPolicy_var &);
-    QueueOrderPolicy_out (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_out &);
-    QueueOrderPolicy_out &operator= (const QueueOrderPolicy_var &);
-    QueueOrderPolicy_out &operator= (QueueOrderPolicy_ptr);
-    operator QueueOrderPolicy_ptr &();
-    QueueOrderPolicy_ptr &ptr (void);
-    QueueOrderPolicy_ptr operator-> (void);
-
-  private:
-    QueueOrderPolicy_ptr &ptr_;
-  };
-
-  class TAO_Export QueueOrderPolicy: public virtual CORBA::Policy
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef QueueOrderPolicy_ptr _ptr_type;
-    typedef QueueOrderPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static QueueOrderPolicy_ptr _duplicate (QueueOrderPolicy_ptr obj);
-    static QueueOrderPolicy_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static QueueOrderPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static QueueOrderPolicy_ptr _nil (void);
-
-    virtual Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    QueueOrderPolicy (void); // default constructor
-    QueueOrderPolicy (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~QueueOrderPolicy (void);
-  private:
-    QueueOrderPolicy (const QueueOrderPolicy &);
-    void operator= (const QueueOrderPolicy &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_QueueOrderPolicy;
-
-  struct TAO_Export PolicyValue
-  {
-    CORBA::PolicyType ptype;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-    static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-    _tao_seq_Octet pvalue;
-  };
-
-  class TAO_Export PolicyValue_var
-  {
-  public:
-    PolicyValue_var (void); // default constructor
-    PolicyValue_var (PolicyValue *);
-    PolicyValue_var (const PolicyValue_var &); // copy constructor
-    ~PolicyValue_var (void); // destructor
-
-    PolicyValue_var &operator= (PolicyValue *);
-    PolicyValue_var &operator= (const PolicyValue_var &);
-    PolicyValue *operator-> (void);
-    const PolicyValue *operator-> (void) const;
-
-    operator const PolicyValue &() const;
-    operator PolicyValue &();
-    operator PolicyValue &() const;
-    // in, inout, out, _retn
-    const PolicyValue &in (void) const;
-    PolicyValue &inout (void);
-    PolicyValue *&out (void);
-    PolicyValue *_retn (void);
-    PolicyValue *ptr (void) const;
-
-  private:
-    PolicyValue *ptr_;
-  };
-
-  class TAO_Export PolicyValue_out
-  {
-  public:
-    PolicyValue_out (PolicyValue *&);
-    PolicyValue_out (PolicyValue_var &);
-    PolicyValue_out (const PolicyValue_out &);
-    PolicyValue_out &operator= (const PolicyValue_out &);
-    PolicyValue_out &operator= (PolicyValue *);
-    operator PolicyValue *&();
-    PolicyValue *&ptr (void);
-    PolicyValue *operator-> (void);
-
-  private:
-    PolicyValue *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const PolicyValue_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValue;
-
-  // *************************************************************
-  // PolicyValueSeq
-  // *************************************************************
-
-  class TAO_Export PolicyValueSeq : public TAO_Unbounded_Sequence<PolicyValue>
-  {
-  public:
-    PolicyValueSeq (void); // default ctor
-    PolicyValueSeq (CORBA::ULong max); // uses max size
-    PolicyValueSeq (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      PolicyValue *buffer,
-      CORBA::Boolean release=0
-    );
-    PolicyValueSeq (const PolicyValueSeq &); // copy ctor
-    ~PolicyValueSeq (void); // dtor
-  };
-  typedef PolicyValueSeq *PolicyValueSeq_ptr;
-
-  // *************************************************************
-  // class Messaging::PolicyValueSeq_var
-  // *************************************************************
-
-  class TAO_Export PolicyValueSeq_var
-  {
-  public:
-    PolicyValueSeq_var (void); // default constructor
-    PolicyValueSeq_var (PolicyValueSeq *);
-    PolicyValueSeq_var (const PolicyValueSeq_var &); // copy constructor
-    ~PolicyValueSeq_var (void); // destructor
-
-    PolicyValueSeq_var &operator= (PolicyValueSeq *);
-    PolicyValueSeq_var &operator= (const PolicyValueSeq_var &);
-    PolicyValueSeq *operator-> (void);
-    const PolicyValueSeq *operator-> (void) const;
-
-    operator const PolicyValueSeq &() const;
-    operator PolicyValueSeq &();
-    operator PolicyValueSeq &() const;
-    PolicyValue &operator[] (CORBA::ULong index);
-    // in, inout, out, _retn
-    const PolicyValueSeq &in (void) const;
-    PolicyValueSeq &inout (void);
-    PolicyValueSeq *&out (void);
-    PolicyValueSeq *_retn (void);
-    PolicyValueSeq *ptr (void) const;
-
-  private:
-    PolicyValueSeq *ptr_;
-  };
-
-  class TAO_Export PolicyValueSeq_out
-  {
-  public:
-    PolicyValueSeq_out (PolicyValueSeq *&);
-    PolicyValueSeq_out (PolicyValueSeq_var &);
-    PolicyValueSeq_out (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (const PolicyValueSeq_out &);
-    PolicyValueSeq_out &operator= (PolicyValueSeq *);
-    operator PolicyValueSeq *&();
-    PolicyValueSeq *&ptr (void);
-    PolicyValueSeq *operator-> (void);
-    PolicyValue &operator[] (CORBA::ULong index);
-
-  private:
-    PolicyValueSeq *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const PolicyValueSeq_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PolicyValueSeq;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong TAG_POLICIES;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong INVOCATION_POLICIES;
-
-#if defined (TAO_POLLER)
-  struct TAO_Export ExceptionHolder
-  {
-    CORBA::Boolean is_system_exception;
-    CORBA::Boolean byte_order;
-
-    // *************************************************************
-    // _tao_seq_Octet
-    // *************************************************************
-
-    class TAO_Export _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-    {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Octet *buffer,
-        CORBA::Boolean release=0
-      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-          CORBA::ULong length,
-          const ACE_Message_Block* mb
-        )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-
-    };
-    typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-    static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-
-    _tao_seq_Octet marshaled_exception;
-  };
-
-  class TAO_Export ExceptionHolder_var
-  {
-  public:
-    ExceptionHolder_var (void); // default constructor
-    ExceptionHolder_var (ExceptionHolder *);
-    ExceptionHolder_var (const ExceptionHolder_var &); // copy constructor
-    ~ExceptionHolder_var (void); // destructor
-
-    ExceptionHolder_var &operator= (ExceptionHolder *);
-    ExceptionHolder_var &operator= (const ExceptionHolder_var &);
-    ExceptionHolder *operator-> (void);
-    const ExceptionHolder *operator-> (void) const;
-
-    operator const ExceptionHolder &() const;
-    operator ExceptionHolder &();
-    operator ExceptionHolder &() const;
-    // in, inout, out, _retn
-    const ExceptionHolder &in (void) const;
-    ExceptionHolder &inout (void);
-    ExceptionHolder *&out (void);
-    ExceptionHolder *_retn (void);
-    ExceptionHolder *ptr (void) const;
-
-  private:
-    ExceptionHolder *ptr_;
-  };
-
-  class TAO_Export ExceptionHolder_out
-  {
-  public:
-    ExceptionHolder_out (ExceptionHolder *&);
-    ExceptionHolder_out (ExceptionHolder_var &);
-    ExceptionHolder_out (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (const ExceptionHolder_out &);
-    ExceptionHolder_out &operator= (ExceptionHolder *);
-    operator ExceptionHolder *&();
-    ExceptionHolder *&ptr (void);
-    ExceptionHolder *operator-> (void);
-
-  private:
-    ExceptionHolder *&ptr_;
-    // assignment from T_var not allowed
-    void operator= (const ExceptionHolder_var &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionHolder;
-
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-
-  class TAO_Export ReplyHandler_var
-  {
-  public:
-    ReplyHandler_var (void); // default constructor
-    ReplyHandler_var (ReplyHandler_ptr);
-    ReplyHandler_var (const ReplyHandler_var &); // copy constructor
-    ~ReplyHandler_var (void); // destructor
-
-    ReplyHandler_var &operator= (ReplyHandler_ptr);
-    ReplyHandler_var &operator= (const ReplyHandler_var &);
-    ReplyHandler_ptr operator-> (void) const;
-
-    operator const ReplyHandler_ptr &() const;
-    operator ReplyHandler_ptr &();
-    // in, inout, out, _retn
-    ReplyHandler_ptr in (void) const;
-    ReplyHandler_ptr &inout (void);
-    ReplyHandler_ptr &out (void);
-    ReplyHandler_ptr _retn (void);
-    ReplyHandler_ptr ptr (void) const;
-
-  private:
-    ReplyHandler_ptr ptr_;
-  };
-
-  class TAO_Export ReplyHandler_out
-  {
-  public:
-    ReplyHandler_out (ReplyHandler_ptr &);
-    ReplyHandler_out (ReplyHandler_var &);
-    ReplyHandler_out (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_out &);
-    ReplyHandler_out &operator= (const ReplyHandler_var &);
-    ReplyHandler_out &operator= (ReplyHandler_ptr);
-    operator ReplyHandler_ptr &();
-    ReplyHandler_ptr &ptr (void);
-    ReplyHandler_ptr operator-> (void);
-
-  private:
-    ReplyHandler_ptr &ptr_;
-  };
-
-  class TAO_Export ReplyHandler : public virtual ACE_CORBA_1 (Object)
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ReplyHandler_ptr _ptr_type;
-    typedef ReplyHandler_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static ReplyHandler_ptr _duplicate (ReplyHandler_ptr obj);
-    static ReplyHandler_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyHandler_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static ReplyHandler_ptr _nil (void);
-
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    ReplyHandler (void); // default constructor
-    ReplyHandler (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~ReplyHandler (void);
-  private:
-    ReplyHandler (const ReplyHandler &);
-    void operator= (const ReplyHandler &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler;
-
-  class Poller;
-  typedef Poller *Poller_ptr;
-
-  class TAO_Export Poller_var
-  {
-  public:
-    Poller_var (void); // default constructor
-    Poller_var (Poller_ptr);
-    Poller_var (const Poller_var &); // copy constructor
-    ~Poller_var (void); // destructor
-
-    Poller_var &operator= (Poller_ptr);
-    Poller_var &operator= (const Poller_var &);
-    Poller_ptr operator-> (void) const;
-
-    operator const Poller_ptr &() const;
-    operator Poller_ptr &();
-    // in, inout, out, _retn
-    Poller_ptr in (void) const;
-    Poller_ptr &inout (void);
-    Poller_ptr &out (void);
-    Poller_ptr _retn (void);
-    Poller_ptr ptr (void) const;
-
-  private:
-    Poller_ptr ptr_;
-  };
-
-  class TAO_Export Poller_out
-  {
-  public:
-    Poller_out (Poller_ptr &);
-    Poller_out (Poller_var &);
-    Poller_out (const Poller_out &);
-    Poller_out &operator= (const Poller_out &);
-    Poller_out &operator= (const Poller_var &);
-    Poller_out &operator= (Poller_ptr);
-    operator Poller_ptr &();
-    Poller_ptr &ptr (void);
-    Poller_ptr operator-> (void);
-
-  private:
-    Poller_ptr &ptr_;
-  };
-
-  class TAO_Export Poller: public virtual CORBA::Pollable
-  {
-  public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef Poller_ptr _ptr_type;
-    typedef Poller_var _var_type;
-  #endif /* __GNUC__ */
-
-    // the static operations
-    static Poller_ptr _duplicate (Poller_ptr obj);
-    static Poller_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static Poller_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    static Poller_ptr _nil (void);
-
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void associated_handler (
-        ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  protected:
-    Poller (void); // default constructor
-    Poller (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-    virtual ~Poller (void);
-  private:
-    Poller (const Poller &);
-    void operator= (const Poller &);
-  };
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Poller;
-#endif /* 0 */
-
-}; // module Messaging
-
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PriorityRange*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PriorityRange *&);
-
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::RoutingTypeRange &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::RoutingTypeRange*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::RoutingTypeRange *&);
-
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PolicyValue *&);
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&);
-
-#if defined (TAO_POLLER)
-void TAO_Export operator<<= (CORBA::Any &, const Messaging::ExceptionHolder &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, Messaging::ExceptionHolder*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ExceptionHolder *&);
-// Any operators for interface Messaging::ReplyHandler
-void TAO_Export operator<<= (CORBA::Any &, Messaging::ReplyHandler_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::ReplyHandler *&);
-// Any operators for interface Messaging::Poller
-void TAO_Export operator<<= (CORBA::Any &, Messaging::Poller_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, Messaging::Poller *&);
-#endif
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PriorityRange &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PriorityRange &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::RoutingTypeRange &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::RoutingTypeRange &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValue &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValue::_tao_seq_Octet &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValue::_tao_seq_Octet &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::PolicyValueSeq &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::PolicyValueSeq &);
-
-#if defined (TAO_POLLER)
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const Messaging::ExceptionHolder::_tao_seq_Octet &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, Messaging::ExceptionHolder::_tao_seq_Octet &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const Messaging::ReplyHandler_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, Messaging::ReplyHandler_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const Messaging::Poller_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, Messaging::Poller_ptr &);
-#endif
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "MessagingC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_IDL_MESSAGINGC_H */
diff --git a/TAO/tao/MessagingC.i b/TAO/tao/MessagingC.i
deleted file mode 100644
index 7d55bfffe5f..00000000000
--- a/TAO/tao/MessagingC.i
+++ /dev/null
@@ -1,3917 +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
-Messaging::RebindPolicy::RebindPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy::RebindPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy::~RebindPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_duplicate (Messaging::RebindPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy::_nil (void)
-{
-  return (Messaging::RebindPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RebindPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (Messaging::RebindPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::RebindPolicy_var (const Messaging::RebindPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RebindPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::~RebindPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (Messaging::RebindPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_var &
-Messaging::RebindPolicy_var::operator= (const Messaging::RebindPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator const Messaging::RebindPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_var::operator Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RebindPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RebindPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (Messaging::RebindPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RebindPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::RebindPolicy_out (const Messaging::RebindPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RebindPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (const Messaging::RebindPolicy_var &p)
-{
-  this->ptr_ = Messaging::RebindPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RebindPolicy_out &
-Messaging::RebindPolicy_out::operator= (Messaging::RebindPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RebindPolicy_out::operator Messaging::RebindPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr &
-Messaging::RebindPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RebindPolicy_ptr
-Messaging::RebindPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::SyncScopePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::SyncScopePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy::~SyncScopePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_duplicate (Messaging::SyncScopePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy::_nil (void)
-{
-  return (Messaging::SyncScopePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (void) // default constructor
-  : ptr_ (Messaging::SyncScopePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (Messaging::SyncScopePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::SyncScopePolicy_var (const Messaging::SyncScopePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::SyncScopePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::~SyncScopePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (Messaging::SyncScopePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_var &
-Messaging::SyncScopePolicy_var::operator= (const Messaging::SyncScopePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator const Messaging::SyncScopePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_var::operator Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::SyncScopePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::SyncScopePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (Messaging::SyncScopePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::SyncScopePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::SyncScopePolicy_out (const Messaging::SyncScopePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::SyncScopePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (const Messaging::SyncScopePolicy_var &p)
-{
-  this->ptr_ = Messaging::SyncScopePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_out &
-Messaging::SyncScopePolicy_out::operator= (Messaging::SyncScopePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::SyncScopePolicy_out::operator Messaging::SyncScopePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr &
-Messaging::SyncScopePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::SyncScopePolicy_ptr
-Messaging::SyncScopePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PriorityRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (Messaging::PriorityRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PriorityRange_var::PriorityRange_var (const Messaging::PriorityRange_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PriorityRange(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::~PriorityRange_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (Messaging::PriorityRange *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PriorityRange_var &
-Messaging::PriorityRange_var::operator= (const Messaging::PriorityRange_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PriorityRange (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange *
-Messaging::PriorityRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator const Messaging::PriorityRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator Messaging::PriorityRange &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PriorityRange_var::operator Messaging::PriorityRange &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::PriorityRange &
-Messaging::PriorityRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange &
-Messaging::PriorityRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE Messaging::PriorityRange &
-Messaging::PriorityRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange
-Messaging::PriorityRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PriorityRange *
-Messaging::PriorityRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::RequestPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_duplicate (Messaging::RequestPriorityPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy::_nil (void)
-{
-  return (Messaging::RequestPriorityPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (Messaging::RequestPriorityPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::RequestPriorityPolicy_var (const Messaging::RequestPriorityPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::~RequestPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (Messaging::RequestPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_var &
-Messaging::RequestPriorityPolicy_var::operator= (const Messaging::RequestPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator const Messaging::RequestPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_var::operator Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (Messaging::RequestPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::RequestPriorityPolicy_out (const Messaging::RequestPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestPriorityPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (const Messaging::RequestPriorityPolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_out &
-Messaging::RequestPriorityPolicy_out::operator= (Messaging::RequestPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestPriorityPolicy_out::operator Messaging::RequestPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr &
-Messaging::RequestPriorityPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestPriorityPolicy_ptr
-Messaging::RequestPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_duplicate (Messaging::ReplyPriorityPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy::_nil (void)
-{
-  return (Messaging::ReplyPriorityPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyPriorityPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (Messaging::ReplyPriorityPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::ReplyPriorityPolicy_var (const Messaging::ReplyPriorityPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::~ReplyPriorityPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (Messaging::ReplyPriorityPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_var &
-Messaging::ReplyPriorityPolicy_var::operator= (const Messaging::ReplyPriorityPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator const Messaging::ReplyPriorityPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_var::operator Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyPriorityPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyPriorityPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (Messaging::ReplyPriorityPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::ReplyPriorityPolicy_out (const Messaging::ReplyPriorityPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyPriorityPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (const Messaging::ReplyPriorityPolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyPriorityPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_out &
-Messaging::ReplyPriorityPolicy_out::operator= (Messaging::ReplyPriorityPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyPriorityPolicy_out::operator Messaging::ReplyPriorityPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr &
-Messaging::ReplyPriorityPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyPriorityPolicy_ptr
-Messaging::ReplyPriorityPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::RequestStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_duplicate (Messaging::RequestStartTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy::_nil (void)
-{
-  return (Messaging::RequestStartTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (Messaging::RequestStartTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::RequestStartTimePolicy_var (const Messaging::RequestStartTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::~RequestStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (Messaging::RequestStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_var &
-Messaging::RequestStartTimePolicy_var::operator= (const Messaging::RequestStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator const Messaging::RequestStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_var::operator Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (Messaging::RequestStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::RequestStartTimePolicy_out (const Messaging::RequestStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestStartTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (const Messaging::RequestStartTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_out &
-Messaging::RequestStartTimePolicy_out::operator= (Messaging::RequestStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestStartTimePolicy_out::operator Messaging::RequestStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr &
-Messaging::RequestStartTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestStartTimePolicy_ptr
-Messaging::RequestStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::RequestEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_duplicate (Messaging::RequestEndTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy::_nil (void)
-{
-  return (Messaging::RequestEndTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::RequestEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (Messaging::RequestEndTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::RequestEndTimePolicy_var (const Messaging::RequestEndTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RequestEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::~RequestEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (Messaging::RequestEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_var &
-Messaging::RequestEndTimePolicy_var::operator= (const Messaging::RequestEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator const Messaging::RequestEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_var::operator Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RequestEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RequestEndTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (Messaging::RequestEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RequestEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::RequestEndTimePolicy_out (const Messaging::RequestEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RequestEndTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (const Messaging::RequestEndTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::RequestEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_out &
-Messaging::RequestEndTimePolicy_out::operator= (Messaging::RequestEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RequestEndTimePolicy_out::operator Messaging::RequestEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr &
-Messaging::RequestEndTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RequestEndTimePolicy_ptr
-Messaging::RequestEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_duplicate (Messaging::ReplyStartTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy::_nil (void)
-{
-  return (Messaging::ReplyStartTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyStartTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (Messaging::ReplyStartTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::ReplyStartTimePolicy_var (const Messaging::ReplyStartTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::~ReplyStartTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (Messaging::ReplyStartTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_var &
-Messaging::ReplyStartTimePolicy_var::operator= (const Messaging::ReplyStartTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator const Messaging::ReplyStartTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_var::operator Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyStartTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyStartTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (Messaging::ReplyStartTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::ReplyStartTimePolicy_out (const Messaging::ReplyStartTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyStartTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (const Messaging::ReplyStartTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyStartTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_out &
-Messaging::ReplyStartTimePolicy_out::operator= (Messaging::ReplyStartTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyStartTimePolicy_out::operator Messaging::ReplyStartTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr &
-Messaging::ReplyStartTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyStartTimePolicy_ptr
-Messaging::ReplyStartTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_duplicate (Messaging::ReplyEndTimePolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy::_nil (void)
-{
-  return (Messaging::ReplyEndTimePolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (void) // default constructor
-  : ptr_ (Messaging::ReplyEndTimePolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (Messaging::ReplyEndTimePolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::ReplyEndTimePolicy_var (const Messaging::ReplyEndTimePolicy_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::~ReplyEndTimePolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (Messaging::ReplyEndTimePolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_var &
-Messaging::ReplyEndTimePolicy_var::operator= (const Messaging::ReplyEndTimePolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator const Messaging::ReplyEndTimePolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_var::operator Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyEndTimePolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyEndTimePolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (Messaging::ReplyEndTimePolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::ReplyEndTimePolicy_out (const Messaging::ReplyEndTimePolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyEndTimePolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (const Messaging::ReplyEndTimePolicy_var &p)
-{
-  this->ptr_ = Messaging::ReplyEndTimePolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_out &
-Messaging::ReplyEndTimePolicy_out::operator= (Messaging::ReplyEndTimePolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyEndTimePolicy_out::operator Messaging::ReplyEndTimePolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr &
-Messaging::ReplyEndTimePolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyEndTimePolicy_ptr
-Messaging::ReplyEndTimePolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_duplicate (Messaging::RelativeRequestTimeoutPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy::_nil (void)
-{
-  return (Messaging::RelativeRequestTimeoutPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::RelativeRequestTimeoutPolicy_var (const Messaging::RelativeRequestTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::~RelativeRequestTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_var &
-Messaging::RelativeRequestTimeoutPolicy_var::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator const Messaging::RelativeRequestTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_var::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RelativeRequestTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRequestTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (Messaging::RelativeRequestTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::RelativeRequestTimeoutPolicy_out (const Messaging::RelativeRequestTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RelativeRequestTimeoutPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (const Messaging::RelativeRequestTimeoutPolicy_var &p)
-{
-  this->ptr_ = Messaging::RelativeRequestTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_out &
-Messaging::RelativeRequestTimeoutPolicy_out::operator= (Messaging::RelativeRequestTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRequestTimeoutPolicy_out::operator Messaging::RelativeRequestTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr &
-Messaging::RelativeRequestTimeoutPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRequestTimeoutPolicy_ptr
-Messaging::RelativeRequestTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (Messaging::RelativeRoundtripTimeoutPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy::_nil (void)
-{
-  return (Messaging::RelativeRoundtripTimeoutPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::RelativeRoundtripTimeoutPolicy_var (const Messaging::RelativeRoundtripTimeoutPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::~RelativeRoundtripTimeoutPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_var &
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator const Messaging::RelativeRoundtripTimeoutPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RelativeRoundtripTimeoutPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RelativeRoundtripTimeoutPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (Messaging::RelativeRoundtripTimeoutPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::RelativeRoundtripTimeoutPolicy_out (const Messaging::RelativeRoundtripTimeoutPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RelativeRoundtripTimeoutPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (const Messaging::RelativeRoundtripTimeoutPolicy_var &p)
-{
-  this->ptr_ = Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_out &
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator= (Messaging::RelativeRoundtripTimeoutPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator Messaging::RelativeRoundtripTimeoutPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr &
-Messaging::RelativeRoundtripTimeoutPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RelativeRoundtripTimeoutPolicy_ptr
-Messaging::RelativeRoundtripTimeoutPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingTypeRange_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (Messaging::RoutingTypeRange *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::RoutingTypeRange_var (const Messaging::RoutingTypeRange_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::RoutingTypeRange(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::~RoutingTypeRange_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (Messaging::RoutingTypeRange *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange_var &
-Messaging::RoutingTypeRange_var::operator= (const Messaging::RoutingTypeRange_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::RoutingTypeRange (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator const Messaging::RoutingTypeRange &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingTypeRange_var::operator Messaging::RoutingTypeRange &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE Messaging::RoutingTypeRange &
-Messaging::RoutingTypeRange_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange
-Messaging::RoutingTypeRange_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingTypeRange *
-Messaging::RoutingTypeRange_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy::RoutingPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy::RoutingPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy::~RoutingPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_duplicate (Messaging::RoutingPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy::_nil (void)
-{
-  return (Messaging::RoutingPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (void) // default constructor
-  : ptr_ (Messaging::RoutingPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (Messaging::RoutingPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::RoutingPolicy_var (const Messaging::RoutingPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::RoutingPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::~RoutingPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (Messaging::RoutingPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_var &
-Messaging::RoutingPolicy_var::operator= (const Messaging::RoutingPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator const Messaging::RoutingPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_var::operator Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::RoutingPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::RoutingPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (Messaging::RoutingPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::RoutingPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::RoutingPolicy_out (const Messaging::RoutingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::RoutingPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (const Messaging::RoutingPolicy_var &p)
-{
-  this->ptr_ = Messaging::RoutingPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_out &
-Messaging::RoutingPolicy_out::operator= (Messaging::RoutingPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::RoutingPolicy_out::operator Messaging::RoutingPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr &
-Messaging::RoutingPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::RoutingPolicy_ptr
-Messaging::RoutingPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::MaxHopsPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::MaxHopsPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy::~MaxHopsPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_duplicate (Messaging::MaxHopsPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy::_nil (void)
-{
-  return (Messaging::MaxHopsPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (void) // default constructor
-  : ptr_ (Messaging::MaxHopsPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (Messaging::MaxHopsPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::MaxHopsPolicy_var (const Messaging::MaxHopsPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::MaxHopsPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::~MaxHopsPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (Messaging::MaxHopsPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_var &
-Messaging::MaxHopsPolicy_var::operator= (const Messaging::MaxHopsPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator const Messaging::MaxHopsPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_var::operator Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::MaxHopsPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::MaxHopsPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (Messaging::MaxHopsPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::MaxHopsPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::MaxHopsPolicy_out (const Messaging::MaxHopsPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::MaxHopsPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (const Messaging::MaxHopsPolicy_var &p)
-{
-  this->ptr_ = Messaging::MaxHopsPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_out &
-Messaging::MaxHopsPolicy_out::operator= (Messaging::MaxHopsPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::MaxHopsPolicy_out::operator Messaging::MaxHopsPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr &
-Messaging::MaxHopsPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::MaxHopsPolicy_ptr
-Messaging::MaxHopsPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::QueueOrderPolicy (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::QueueOrderPolicy (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy::~QueueOrderPolicy (void) // destructor
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_duplicate (Messaging::QueueOrderPolicy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy::_nil (void)
-{
-  return (Messaging::QueueOrderPolicy_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (void) // default constructor
-  : ptr_ (Messaging::QueueOrderPolicy::_nil ())
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (Messaging::QueueOrderPolicy_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::QueueOrderPolicy_var (const Messaging::QueueOrderPolicy_var &p) // copy constructor
-  : ptr_ (Messaging::QueueOrderPolicy::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::~QueueOrderPolicy_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (Messaging::QueueOrderPolicy_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_var &
-Messaging::QueueOrderPolicy_var::operator= (const Messaging::QueueOrderPolicy_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator const Messaging::QueueOrderPolicy_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_var::operator Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::QueueOrderPolicy_ptr val = this->ptr_;
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::QueueOrderPolicy_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (Messaging::QueueOrderPolicy_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::QueueOrderPolicy::_nil ();
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::QueueOrderPolicy_out (const Messaging::QueueOrderPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::QueueOrderPolicy_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (const Messaging::QueueOrderPolicy_var &p)
-{
-  this->ptr_ = Messaging::QueueOrderPolicy::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_out &
-Messaging::QueueOrderPolicy_out::operator= (Messaging::QueueOrderPolicy_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::QueueOrderPolicy_out::operator Messaging::QueueOrderPolicy_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr &
-Messaging::QueueOrderPolicy_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::QueueOrderPolicy_ptr
-Messaging::QueueOrderPolicy_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (Messaging::PolicyValue *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValue_var::PolicyValue_var (const Messaging::PolicyValue_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PolicyValue(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::~PolicyValue_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (Messaging::PolicyValue *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValue_var &
-Messaging::PolicyValue_var::operator= (const Messaging::PolicyValue_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PolicyValue (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator const Messaging::PolicyValue &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator Messaging::PolicyValue &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_var::operator Messaging::PolicyValue &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::PolicyValue &
-Messaging::PolicyValue_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValue_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::PolicyValue *&
-Messaging::PolicyValue_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::_retn (void)
-{
-  Messaging::PolicyValue *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValue_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (Messaging::PolicyValue_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::PolicyValue_out (const Messaging::PolicyValue_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (const Messaging::PolicyValue_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::PolicyValue_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValue_out &
-Messaging::PolicyValue_out::operator= (Messaging::PolicyValue *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValue_out::operator Messaging::PolicyValue *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *&
-Messaging::PolicyValue_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue *
-Messaging::PolicyValue_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (Messaging::PolicyValueSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::PolicyValueSeq_var (const Messaging::PolicyValueSeq_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::PolicyValueSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::~PolicyValueSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (Messaging::PolicyValueSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_var &
-Messaging::PolicyValueSeq_var::operator= (const Messaging::PolicyValueSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::PolicyValueSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator const Messaging::PolicyValueSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_var::operator Messaging::PolicyValueSeq &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValueSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq &
-Messaging::PolicyValueSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::_retn (void)
-{
-  Messaging::PolicyValueSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::PolicyValueSeq_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (Messaging::PolicyValueSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::PolicyValueSeq_out (const Messaging::PolicyValueSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (const Messaging::PolicyValueSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::PolicyValueSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq_out &
-Messaging::PolicyValueSeq_out::operator= (Messaging::PolicyValueSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::PolicyValueSeq_out::operator Messaging::PolicyValueSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *&
-Messaging::PolicyValueSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValueSeq *
-Messaging::PolicyValueSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::PolicyValue &
-Messaging::PolicyValueSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-#if defined(TAO_POLLER)
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (Messaging::ExceptionHolder *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::ExceptionHolder_var (const Messaging::ExceptionHolder_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new Messaging::ExceptionHolder(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::~ExceptionHolder_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (Messaging::ExceptionHolder *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_var &
-Messaging::ExceptionHolder_var::operator= (const Messaging::ExceptionHolder_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new Messaging::ExceptionHolder (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator const Messaging::ExceptionHolder &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_var::operator Messaging::ExceptionHolder &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const Messaging::ExceptionHolder &
-Messaging::ExceptionHolder_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder &
-Messaging::ExceptionHolder_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::_retn (void)
-{
-  Messaging::ExceptionHolder *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ExceptionHolder_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (Messaging::ExceptionHolder_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::ExceptionHolder_out (const Messaging::ExceptionHolder_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (const Messaging::ExceptionHolder_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ExceptionHolder_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ExceptionHolder_out &
-Messaging::ExceptionHolder_out::operator= (Messaging::ExceptionHolder *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ExceptionHolder_out::operator Messaging::ExceptionHolder *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *&
-Messaging::ExceptionHolder_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ExceptionHolder *
-Messaging::ExceptionHolder_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler::ReplyHandler (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler::~ReplyHandler (void) // destructor
-{}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_duplicate (Messaging::ReplyHandler_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler::_nil (void)
-{
-  return (Messaging::ReplyHandler_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (void) // default constructor
-  : ptr_ (Messaging::ReplyHandler::_nil ())
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (Messaging::ReplyHandler_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::ReplyHandler_var (const Messaging::ReplyHandler_var &p) // copy constructor
-  : ptr_ (Messaging::ReplyHandler::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::~ReplyHandler_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (Messaging::ReplyHandler_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_var &
-Messaging::ReplyHandler_var::operator= (const Messaging::ReplyHandler_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator const Messaging::ReplyHandler_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_var::operator Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::ReplyHandler_ptr val = this->ptr_;
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::ReplyHandler_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (Messaging::ReplyHandler_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::ReplyHandler::_nil ();
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::ReplyHandler_out (const Messaging::ReplyHandler_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::ReplyHandler_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (const Messaging::ReplyHandler_var &p)
-{
-  this->ptr_ = Messaging::ReplyHandler::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::ReplyHandler_out &
-Messaging::ReplyHandler_out::operator= (Messaging::ReplyHandler_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::ReplyHandler_out::operator Messaging::ReplyHandler_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr &
-Messaging::ReplyHandler_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::ReplyHandler_ptr
-Messaging::ReplyHandler_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-#if defined(TAO_POLLER)
-ACE_INLINE
-Messaging::Poller::Poller (void) // default constructor
-{}
-
-ACE_INLINE
-Messaging::Poller::Poller (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-Messaging::Poller::~Poller (void) // destructor
-{}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller::_duplicate (Messaging::Poller_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller::_nil (void)
-{
-  return (Messaging::Poller_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::Poller_var
-// *************************************************************
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (void) // default constructor
-  : ptr_ (Messaging::Poller::_nil ())
-{}
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (Messaging::Poller_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::Poller_var::Poller_var (const Messaging::Poller_var &p) // copy constructor
-  : ptr_ (Messaging::Poller::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-Messaging::Poller_var::~Poller_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE Messaging::Poller_var &
-Messaging::Poller_var::operator= (Messaging::Poller_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_var &
-Messaging::Poller_var::operator= (const Messaging::Poller_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = Messaging::Poller::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-Messaging::Poller_var::operator const Messaging::Poller_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-Messaging::Poller_var::operator Messaging::Poller_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::Poller::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  Messaging::Poller_ptr val = this->ptr_;
-  this->ptr_ = Messaging::Poller::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class Messaging::Poller_out
-// *************************************************************
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (Messaging::Poller_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = Messaging::Poller::_nil ();
-}
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (Messaging::Poller_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = Messaging::Poller::_nil ();
-}
-
-ACE_INLINE
-Messaging::Poller_out::Poller_out (const Messaging::Poller_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Messaging::Poller_out&,p).ptr_)
-{}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (const Messaging::Poller_out &p)
-{
-  this->ptr_ = ACE_const_cast (Messaging::Poller_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (const Messaging::Poller_var &p)
-{
-  this->ptr_ = Messaging::Poller::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE Messaging::Poller_out &
-Messaging::Poller_out::operator= (Messaging::Poller_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-Messaging::Poller_out::operator Messaging::Poller_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr &
-Messaging::Poller_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE Messaging::Poller_ptr
-Messaging::Poller_out::operator-> (void)
-{
-  return this->ptr_;
-}
-#endif
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PriorityRange &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PriorityRange &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::RoutingTypeRange &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.min) &&
-    (strm << _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::RoutingTypeRange &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.min) &&
-    (strm >> _tao_aggregate.max)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValue::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::PolicyValue::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue::_tao_seq_Octet &_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
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::PolicyValue &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.ptype) &&
-    (strm << _tao_aggregate.pvalue)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValue &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.ptype) &&
-    (strm >> _tao_aggregate.pvalue)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::PolicyValueSeq &_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
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::PolicyValueSeq &_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
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ExceptionHolder::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (Messaging::ExceptionHolder::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder::_tao_seq_Octet &_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
-
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const Messaging::ExceptionHolder &_tao_aggregate)
-{
-  if (
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_system_exception)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.byte_order)) &&
-    (strm << _tao_aggregate.marshaled_exception)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, Messaging::ExceptionHolder &_tao_aggregate)
-{
-  if (
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_system_exception)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.byte_order)) &&
-    (strm >> _tao_aggregate.marshaled_exception)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const Messaging::ReplyHandler_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    Messaging::ReplyHandler_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::ReplyHandler_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::ReplyHandler_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 =
-      Messaging::ReplyHandler::_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 Messaging::Poller_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    Messaging::Poller_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const Messaging::Poller_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    Messaging::Poller_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 =
-      Messaging::Poller::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif
diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp
deleted file mode 100644
index b77e56ae911..00000000000
--- a/TAO/tao/MessagingS.cpp
+++ /dev/null
@@ -1,1852 +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 "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/MessagingS.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, MessagingS, "$Id$")
-
-POA_Messaging::RebindPolicy::RebindPolicy (void)
-{
-}
-
-POA_Messaging::RebindPolicy::RebindPolicy (const RebindPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RebindPolicy::~RebindPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RebindPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RebindPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RebindPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RebindPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RebindPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RebindPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RebindPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RebindPolicy::_tao_collocated_RebindPolicy (
-    POA_Messaging::RebindPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RebindPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RebindPolicy_ptr POA_Messaging::_tao_collocated_RebindPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RebindPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::RebindMode POA_Messaging::_tao_collocated_RebindPolicy::rebind_mode  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->rebind_mode (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RebindPolicy*
-POA_Messaging::RebindPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RebindPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::SyncScopePolicy::SyncScopePolicy (void)
-{
-}
-
-POA_Messaging::SyncScopePolicy::SyncScopePolicy (const SyncScopePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::SyncScopePolicy::~SyncScopePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::SyncScopePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/SyncScopePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::SyncScopePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/SyncScopePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::SyncScopePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::SyncScopePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/SyncScopePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_SyncScopePolicy::_tao_collocated_SyncScopePolicy (
-    POA_Messaging::SyncScopePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,SyncScopePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::SyncScopePolicy_ptr POA_Messaging::_tao_collocated_SyncScopePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_SyncScopePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::SyncScope POA_Messaging::_tao_collocated_SyncScopePolicy::synchronization  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->synchronization (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::SyncScopePolicy*
-POA_Messaging::SyncScopePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_SyncScopePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (void)
-{
-}
-
-POA_Messaging::RequestPriorityPolicy::RequestPriorityPolicy (const RequestPriorityPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestPriorityPolicy::~RequestPriorityPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestPriorityPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestPriorityPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestPriorityPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestPriorityPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestPriorityPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestPriorityPolicy::_tao_collocated_RequestPriorityPolicy (
-    POA_Messaging::RequestPriorityPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestPriorityPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestPriorityPolicy_ptr POA_Messaging::_tao_collocated_RequestPriorityPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestPriorityPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::PriorityRange POA_Messaging::_tao_collocated_RequestPriorityPolicy::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestPriorityPolicy*
-POA_Messaging::RequestPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestPriorityPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (void)
-{
-}
-
-POA_Messaging::ReplyPriorityPolicy::ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyPriorityPolicy::~ReplyPriorityPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyPriorityPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyPriorityPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyPriorityPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyPriorityPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyPriorityPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyPriorityPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_tao_collocated_ReplyPriorityPolicy (
-    POA_Messaging::ReplyPriorityPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyPriorityPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyPriorityPolicy_ptr POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyPriorityPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::PriorityRange POA_Messaging::_tao_collocated_ReplyPriorityPolicy::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyPriorityPolicy*
-POA_Messaging::ReplyPriorityPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (void)
-{
-}
-
-POA_Messaging::RequestStartTimePolicy::RequestStartTimePolicy (const RequestStartTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestStartTimePolicy::~RequestStartTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestStartTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestStartTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestStartTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestStartTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestStartTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestStartTimePolicy::_tao_collocated_RequestStartTimePolicy (
-    POA_Messaging::RequestStartTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestStartTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestStartTimePolicy_ptr POA_Messaging::_tao_collocated_RequestStartTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestStartTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_RequestStartTimePolicy::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestStartTimePolicy*
-POA_Messaging::RequestStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestStartTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (void)
-{
-}
-
-POA_Messaging::RequestEndTimePolicy::RequestEndTimePolicy (const RequestEndTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RequestEndTimePolicy::~RequestEndTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RequestEndTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RequestEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RequestEndTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RequestEndTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RequestEndTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RequestEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RequestEndTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RequestEndTimePolicy::_tao_collocated_RequestEndTimePolicy (
-    POA_Messaging::RequestEndTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RequestEndTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RequestEndTimePolicy_ptr POA_Messaging::_tao_collocated_RequestEndTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RequestEndTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_RequestEndTimePolicy::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RequestEndTimePolicy*
-POA_Messaging::RequestEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RequestEndTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (void)
-{
-}
-
-POA_Messaging::ReplyStartTimePolicy::ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyStartTimePolicy::~ReplyStartTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyStartTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyStartTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyStartTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyStartTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyStartTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyStartTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_tao_collocated_ReplyStartTimePolicy (
-    POA_Messaging::ReplyStartTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyStartTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyStartTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyStartTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyStartTimePolicy::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyStartTimePolicy*
-POA_Messaging::ReplyStartTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (void)
-{
-}
-
-POA_Messaging::ReplyEndTimePolicy::ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyEndTimePolicy::~ReplyEndTimePolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyEndTimePolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyEndTimePolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyEndTimePolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyEndTimePolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyEndTimePolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyEndTimePolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_tao_collocated_ReplyEndTimePolicy (
-    POA_Messaging::ReplyEndTimePolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyEndTimePolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyEndTimePolicy_ptr POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyEndTimePolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::UtcT POA_Messaging::_tao_collocated_ReplyEndTimePolicy::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::ReplyEndTimePolicy*
-POA_Messaging::ReplyEndTimePolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (void)
-{
-}
-
-POA_Messaging::RelativeRequestTimeoutPolicy::RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RelativeRequestTimeoutPolicy::~RelativeRequestTimeoutPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RelativeRequestTimeoutPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RelativeRequestTimeoutPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRequestTimeoutPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_tao_collocated_RelativeRequestTimeoutPolicy (
-    POA_Messaging::RelativeRequestTimeoutPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RelativeRequestTimeoutPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RelativeRequestTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RelativeRequestTimeoutPolicy*
-POA_Messaging::RelativeRequestTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (void)
-{
-}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy::~RelativeRoundtripTimeoutPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RelativeRoundtripTimeoutPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_tao_collocated_RelativeRoundtripTimeoutPolicy (
-    POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RelativeRoundtripTimeoutPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-TimeBase::TimeT POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RelativeRoundtripTimeoutPolicy*
-POA_Messaging::RelativeRoundtripTimeoutPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::RoutingPolicy::RoutingPolicy (void)
-{
-}
-
-POA_Messaging::RoutingPolicy::RoutingPolicy (const RoutingPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::RoutingPolicy::~RoutingPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::RoutingPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/RoutingPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::RoutingPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/RoutingPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::RoutingPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::RoutingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/RoutingPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_RoutingPolicy::_tao_collocated_RoutingPolicy (
-    POA_Messaging::RoutingPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,RoutingPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::RoutingPolicy_ptr POA_Messaging::_tao_collocated_RoutingPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_RoutingPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::RoutingTypeRange POA_Messaging::_tao_collocated_RoutingPolicy::routing_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->routing_range (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::RoutingPolicy*
-POA_Messaging::RoutingPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_RoutingPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (void)
-{
-}
-
-POA_Messaging::MaxHopsPolicy::MaxHopsPolicy (const MaxHopsPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::MaxHopsPolicy::~MaxHopsPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::MaxHopsPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/MaxHopsPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::MaxHopsPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/MaxHopsPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::MaxHopsPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::MaxHopsPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/MaxHopsPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_MaxHopsPolicy::_tao_collocated_MaxHopsPolicy (
-    POA_Messaging::MaxHopsPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,MaxHopsPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::MaxHopsPolicy_ptr POA_Messaging::_tao_collocated_MaxHopsPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_MaxHopsPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::UShort POA_Messaging::_tao_collocated_MaxHopsPolicy::max_hops  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->max_hops (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::MaxHopsPolicy*
-POA_Messaging::MaxHopsPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_MaxHopsPolicy (this, stub);
-}
-
-// ****************************************************************
-
-POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (void)
-{
-}
-
-POA_Messaging::QueueOrderPolicy::QueueOrderPolicy (const QueueOrderPolicy& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Policy) (rhs),
-    TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::QueueOrderPolicy::~QueueOrderPolicy (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::QueueOrderPolicy::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/QueueOrderPolicy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::QueueOrderPolicy::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/QueueOrderPolicy:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::QueueOrderPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::QueueOrderPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/QueueOrderPolicy:1.0";
-}
-
-POA_Messaging::_tao_collocated_QueueOrderPolicy::_tao_collocated_QueueOrderPolicy (
-    POA_Messaging::QueueOrderPolicy_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,QueueOrderPolicy) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Policy) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::QueueOrderPolicy_ptr POA_Messaging::_tao_collocated_QueueOrderPolicy::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_QueueOrderPolicy::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-Messaging::Ordering POA_Messaging::_tao_collocated_QueueOrderPolicy::allowed_orders  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->allowed_orders (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::QueueOrderPolicy*
-POA_Messaging::QueueOrderPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_QueueOrderPolicy (this, stub);
-}
-
-// ****************************************************************
-
-#if defined (TAO_POLLER)
-POA_Messaging::ReplyHandler::ReplyHandler (void)
-{
-}
-
-POA_Messaging::ReplyHandler::ReplyHandler (const ReplyHandler& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-POA_Messaging::ReplyHandler::~ReplyHandler (void)
-{
-}
-
-CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/ReplyHandler:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_Messaging::ReplyHandler::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/ReplyHandler:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::ReplyHandler_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/ReplyHandler:1.0";
-}
-
-POA_Messaging::_tao_collocated_ReplyHandler::_tao_collocated_ReplyHandler (
-    POA_Messaging::ReplyHandler_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,ReplyHandler) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::ReplyHandler_ptr POA_Messaging::_tao_collocated_ReplyHandler::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_ReplyHandler::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-
-Messaging::ReplyHandler*
-POA_Messaging::ReplyHandler::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_ReplyHandler (this, stub);
-}
-
-// ****************************************************************
-
-class TAO_Messaging_Poller_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 12:37:20 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_Poller_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_Messaging_Poller_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30, 30, 30, 30, 30, 30,
-     30, 30, 30, 30, 30,  0, 30,  0, 30, 10,
-     30,  5, 30, 30, 30,  0, 30, 30, 30, 30,
-     30, 30, 30, 30,  0, 30,  0, 30, 30, 30,
-     30,  0, 30, 30, 30, 30, 30, 30,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_Messaging_Poller_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 11,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 23,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 29,
-      HASH_VALUE_RANGE = 25,
-      DUPLICATES = 2
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_is_a",  &POA_Messaging::Poller::_is_a_skel},
-      {"is_ready",      &POA_Messaging::Poller::is_ready_skel},
-      {"_get_target",   &POA_Messaging::Poller::_get_target_skel},
-      {"_non_existent",  &POA_Messaging::Poller::_non_existent_skel},
-      {"_get_op_name",  &POA_Messaging::Poller::_get_op_name_skel},
-      {"_get_is_from_poller",   &POA_Messaging::Poller::_get_is_from_poller_skel},
-      {"_get_operation_target",         &POA_Messaging::Poller::_get_operation_target_skel},
-      {"_get_associated_handler",       &POA_Messaging::Poller::_get_associated_handler_skel},
-      {"_set_associated_handler",       &POA_Messaging::Poller::_set_associated_handler_skel},
-      {"_get_operation_name",   &POA_Messaging::Poller::_get_operation_name_skel},
-      {"create_pollable_set",   &POA_Messaging::Poller::create_pollable_set_skel},
-    };
-
-  static const signed char lookup[] =
-    {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,  -1,   6,  -1,  -1,   7,  -1,   8,
-       -1, -12,  -2,   9,  -1,  10,  -1,  11,  -1, -37,  14,  -1,  -1,  -1,
-       -1,  15,
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      unsigned int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= MIN_HASH_VALUE)
-        {
-          int index = lookup[key];
-
-          if (index >= 0 && index < MAX_HASH_VALUE)
-            {
-              const char *s = wordlist[index].opname_;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1))
-                return &wordlist[index];
-            }
-          else if (index < 0 && index >= -MAX_HASH_VALUE)
-            return 0;
-          else
-            {
-              unsigned int offset = key + index + (index > 0 ? -MAX_HASH_VALUE : MAX_HASH_VALUE);
-              const class TAO_operation_db_entry  *base = &wordlist[-lookup[offset]];
-              const class TAO_operation_db_entry  *ptr = base + -lookup[offset + 1];
-
-              while (--ptr >= base)
-                if (*str == *ptr->opname_ && !strncmp (str + 1, ptr->opname_ + 1, len - 1))
-                  return ptr;
-            }
-        }
-    }
-  return 0;
-}
-/* ending time is 12:37:20 */
-TAO_Messaging_Poller_Perfect_Hash_OpTable tao_Messaging_Poller_optable;
-// skeleton constructor
-POA_Messaging::Poller::Poller (void)
-{
-  this->optable_ = &tao_Messaging_Poller_optable;
-}
-
-// copy ctor
-POA_Messaging::Poller::Poller (const Poller& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_Messaging::Poller::~Poller (void)
-{
-}
-void POA_Messaging::Poller::_get_operation_target_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Object_var _tao_retval;
-  _tao_retval = _tao_impl->operation_target (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_operation_name_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::String_var _tao_retval;
-  _tao_retval = _tao_impl->operation_name (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_associated_handler_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  Messaging::ReplyHandler_var _tao_retval;
-  _tao_retval = _tao_impl->associated_handler (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_set_associated_handler_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_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  Messaging::ReplyHandler_var associated_handler;
-  if (!(
-    (_tao_in >> associated_handler.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->associated_handler (
-    associated_handler.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_Messaging::Poller::_get_is_from_poller_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  _tao_retval = _tao_impl->is_from_poller (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_target_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::Object_var _tao_retval;
-  _tao_retval = _tao_impl->target (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_get_op_name_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_Messaging::Poller *_tao_impl = (POA_Messaging::Poller *)_tao_object_reference;
-  CORBA::String_var _tao_retval;
-  _tao_retval = _tao_impl->op_name (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_Messaging::Poller::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel Messaging_Poller_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel Messaging_Poller_is_a_calldata =
-  {"_is_a", 1, 2, Messaging_Poller_is_a_paramdata};
-  POA_Messaging::Poller_ptr  _tao_impl = (POA_Messaging::Poller_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_Messaging::Poller::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:Messaging/Poller:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_Messaging::Poller::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel Messaging_Poller_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel Messaging_Poller_non_existent_calldata =
-  {"_non_existent", 1, 1, Messaging_Poller_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &Messaging_Poller_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_Messaging::Poller::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:Messaging/Poller:1.0") == 0)
-    return ACE_static_cast (POA_Messaging::Poller_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_Messaging::Poller::_interface_repository_id (void) const
-{
-  return "IDL:Messaging/Poller:1.0";
-}
-
-POA_Messaging::_tao_collocated_Poller::_tao_collocated_Poller (
-    POA_Messaging::Poller_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (Messaging,Poller) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_Messaging::Poller_ptr POA_Messaging::_tao_collocated_Poller::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_Poller::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::operation_target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->operation_target (
-    ACE_TRY_ENV
-  );
-}
-
-char * POA_Messaging::_tao_collocated_Poller::operation_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->operation_name (
-    ACE_TRY_ENV
-  );
-}
-
-Messaging::ReplyHandler_ptr POA_Messaging::_tao_collocated_Poller::associated_handler  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->associated_handler (
-    ACE_TRY_ENV
-  );
-}
-
-void POA_Messaging::_tao_collocated_Poller::associated_handler  (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->associated_handler (
-    associated_handler,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Boolean POA_Messaging::_tao_collocated_Poller::is_from_poller  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->is_from_poller (
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Object_ptr POA_Messaging::_tao_collocated_Poller::target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->target (
-    ACE_TRY_ENV
-  );
-}
-
-char * POA_Messaging::_tao_collocated_Poller::op_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->op_name (
-    ACE_TRY_ENV
-  );
-}
-
-
-Messaging::Poller*
-POA_Messaging::Poller::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_Messaging::_tao_collocated_Poller (this, stub);
-}
-#endif /* TAO_POLLER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/MessagingS.h b/TAO/tao/MessagingS.h
deleted file mode 100644
index 970a839c7b9..00000000000
--- a/TAO/tao/MessagingS.h
+++ /dev/null
@@ -1,2653 +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_MESSAGINGS_H
-#define TAO_IDL_MESSAGINGS_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "TimeBaseS.h"
-#include "POA_CORBA.h"
-#include "MessagingC.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 */
-
-TAO_NAMESPACE  POA_Messaging
-{
-  class RebindPolicy;
-  typedef RebindPolicy *RebindPolicy_ptr;
-  class TAO_Export RebindPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RebindPolicy (void);
-  public:
-    RebindPolicy (const RebindPolicy& rhs);
-    virtual ~RebindPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_rebind_mode_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RebindPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RebindPolicy     : public virtual Messaging::RebindPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RebindPolicy (
-        RebindPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RebindPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RebindPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RebindPolicy_tie : public RebindPolicy
-  {
-  public:
-    RebindPolicy_tie (T &t);
-    // the T& ctor
-    RebindPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RebindPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RebindPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::RebindMode rebind_mode (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RebindPolicy_tie (const RebindPolicy_tie &);
-    void operator= (const RebindPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class SyncScopePolicy;
-  typedef SyncScopePolicy *SyncScopePolicy_ptr;
-  class TAO_Export SyncScopePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    SyncScopePolicy (void);
-  public:
-    SyncScopePolicy (const SyncScopePolicy& rhs);
-    virtual ~SyncScopePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_synchronization_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::SyncScopePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_SyncScopePolicy     : public virtual Messaging::SyncScopePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_SyncScopePolicy (
-        SyncScopePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    SyncScopePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    SyncScopePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export SyncScopePolicy_tie : public SyncScopePolicy
-  {
-  public:
-    SyncScopePolicy_tie (T &t);
-    // the T& ctor
-    SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    SyncScopePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~SyncScopePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::SyncScope synchronization (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    SyncScopePolicy_tie (const SyncScopePolicy_tie &);
-    void operator= (const SyncScopePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestPriorityPolicy;
-  typedef RequestPriorityPolicy *RequestPriorityPolicy_ptr;
-  class TAO_Export RequestPriorityPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestPriorityPolicy (void);
-  public:
-    RequestPriorityPolicy (const RequestPriorityPolicy& rhs);
-    virtual ~RequestPriorityPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_priority_range_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestPriorityPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestPriorityPolicy     : public virtual Messaging::RequestPriorityPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestPriorityPolicy (
-        RequestPriorityPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestPriorityPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestPriorityPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestPriorityPolicy_tie : public RequestPriorityPolicy
-  {
-  public:
-    RequestPriorityPolicy_tie (T &t);
-    // the T& ctor
-    RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestPriorityPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestPriorityPolicy_tie (const RequestPriorityPolicy_tie &);
-    void operator= (const RequestPriorityPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyPriorityPolicy;
-  typedef ReplyPriorityPolicy *ReplyPriorityPolicy_ptr;
-  class TAO_Export ReplyPriorityPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyPriorityPolicy (void);
-  public:
-    ReplyPriorityPolicy (const ReplyPriorityPolicy& rhs);
-    virtual ~ReplyPriorityPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_priority_range_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyPriorityPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyPriorityPolicy     : public virtual Messaging::ReplyPriorityPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyPriorityPolicy (
-        ReplyPriorityPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyPriorityPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyPriorityPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyPriorityPolicy_tie : public ReplyPriorityPolicy
-  {
-  public:
-    ReplyPriorityPolicy_tie (T &t);
-    // the T& ctor
-    ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyPriorityPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::PriorityRange priority_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyPriorityPolicy_tie (const ReplyPriorityPolicy_tie &);
-    void operator= (const ReplyPriorityPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestStartTimePolicy;
-  typedef RequestStartTimePolicy *RequestStartTimePolicy_ptr;
-  class TAO_Export RequestStartTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestStartTimePolicy (void);
-  public:
-    RequestStartTimePolicy (const RequestStartTimePolicy& rhs);
-    virtual ~RequestStartTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_start_time_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestStartTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestStartTimePolicy     : public virtual Messaging::RequestStartTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestStartTimePolicy (
-        RequestStartTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestStartTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestStartTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestStartTimePolicy_tie : public RequestStartTimePolicy
-  {
-  public:
-    RequestStartTimePolicy_tie (T &t);
-    // the T& ctor
-    RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestStartTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestStartTimePolicy_tie (const RequestStartTimePolicy_tie &);
-    void operator= (const RequestStartTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RequestEndTimePolicy;
-  typedef RequestEndTimePolicy *RequestEndTimePolicy_ptr;
-  class TAO_Export RequestEndTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RequestEndTimePolicy (void);
-  public:
-    RequestEndTimePolicy (const RequestEndTimePolicy& rhs);
-    virtual ~RequestEndTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_end_time_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RequestEndTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RequestEndTimePolicy     : public virtual Messaging::RequestEndTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RequestEndTimePolicy (
-        RequestEndTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RequestEndTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RequestEndTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RequestEndTimePolicy_tie : public RequestEndTimePolicy
-  {
-  public:
-    RequestEndTimePolicy_tie (T &t);
-    // the T& ctor
-    RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RequestEndTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RequestEndTimePolicy_tie (const RequestEndTimePolicy_tie &);
-    void operator= (const RequestEndTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyStartTimePolicy;
-  typedef ReplyStartTimePolicy *ReplyStartTimePolicy_ptr;
-  class TAO_Export ReplyStartTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyStartTimePolicy (void);
-  public:
-    ReplyStartTimePolicy (const ReplyStartTimePolicy& rhs);
-    virtual ~ReplyStartTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_start_time_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyStartTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyStartTimePolicy     : public virtual Messaging::ReplyStartTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyStartTimePolicy (
-        ReplyStartTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyStartTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyStartTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyStartTimePolicy_tie : public ReplyStartTimePolicy
-  {
-  public:
-    ReplyStartTimePolicy_tie (T &t);
-    // the T& ctor
-    ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyStartTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT start_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyStartTimePolicy_tie (const ReplyStartTimePolicy_tie &);
-    void operator= (const ReplyStartTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class ReplyEndTimePolicy;
-  typedef ReplyEndTimePolicy *ReplyEndTimePolicy_ptr;
-  class TAO_Export ReplyEndTimePolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    ReplyEndTimePolicy (void);
-  public:
-    ReplyEndTimePolicy (const ReplyEndTimePolicy& rhs);
-    virtual ~ReplyEndTimePolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_end_time_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyEndTimePolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyEndTimePolicy     : public virtual Messaging::ReplyEndTimePolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ReplyEndTimePolicy (
-        ReplyEndTimePolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyEndTimePolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyEndTimePolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyEndTimePolicy_tie : public ReplyEndTimePolicy
-  {
-  public:
-    ReplyEndTimePolicy_tie (T &t);
-    // the T& ctor
-    ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyEndTimePolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::UtcT end_time (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyEndTimePolicy_tie (const ReplyEndTimePolicy_tie &);
-    void operator= (const ReplyEndTimePolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RelativeRequestTimeoutPolicy;
-  typedef RelativeRequestTimeoutPolicy *RelativeRequestTimeoutPolicy_ptr;
-  class TAO_Export RelativeRequestTimeoutPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RelativeRequestTimeoutPolicy (void);
-  public:
-    RelativeRequestTimeoutPolicy (const RelativeRequestTimeoutPolicy& rhs);
-    virtual ~RelativeRequestTimeoutPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_relative_expiry_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RelativeRequestTimeoutPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RelativeRequestTimeoutPolicy     : public virtual Messaging::RelativeRequestTimeoutPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RelativeRequestTimeoutPolicy (
-        RelativeRequestTimeoutPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RelativeRequestTimeoutPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RelativeRequestTimeoutPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RelativeRequestTimeoutPolicy_tie : public RelativeRequestTimeoutPolicy
-  {
-  public:
-    RelativeRequestTimeoutPolicy_tie (T &t);
-    // the T& ctor
-    RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RelativeRequestTimeoutPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RelativeRequestTimeoutPolicy_tie (const RelativeRequestTimeoutPolicy_tie &);
-    void operator= (const RelativeRequestTimeoutPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RelativeRoundtripTimeoutPolicy;
-  typedef RelativeRoundtripTimeoutPolicy *RelativeRoundtripTimeoutPolicy_ptr;
-  class TAO_Export RelativeRoundtripTimeoutPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RelativeRoundtripTimeoutPolicy (void);
-  public:
-    RelativeRoundtripTimeoutPolicy (const RelativeRoundtripTimeoutPolicy& rhs);
-    virtual ~RelativeRoundtripTimeoutPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_relative_expiry_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RelativeRoundtripTimeoutPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RelativeRoundtripTimeoutPolicy     : public virtual Messaging::RelativeRoundtripTimeoutPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RelativeRoundtripTimeoutPolicy (
-        RelativeRoundtripTimeoutPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RelativeRoundtripTimeoutPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RelativeRoundtripTimeoutPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RelativeRoundtripTimeoutPolicy_tie : public RelativeRoundtripTimeoutPolicy
-  {
-  public:
-    RelativeRoundtripTimeoutPolicy_tie (T &t);
-    // the T& ctor
-    RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RelativeRoundtripTimeoutPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    TimeBase::TimeT relative_expiry (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RelativeRoundtripTimeoutPolicy_tie (const RelativeRoundtripTimeoutPolicy_tie &);
-    void operator= (const RelativeRoundtripTimeoutPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class RoutingPolicy;
-  typedef RoutingPolicy *RoutingPolicy_ptr;
-  class TAO_Export RoutingPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    RoutingPolicy (void);
-  public:
-    RoutingPolicy (const RoutingPolicy& rhs);
-    virtual ~RoutingPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_routing_range_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::RoutingPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_RoutingPolicy     : public virtual Messaging::RoutingPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_RoutingPolicy (
-        RoutingPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    RoutingPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    RoutingPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export RoutingPolicy_tie : public RoutingPolicy
-  {
-  public:
-    RoutingPolicy_tie (T &t);
-    // the T& ctor
-    RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    RoutingPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~RoutingPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::RoutingTypeRange routing_range (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    RoutingPolicy_tie (const RoutingPolicy_tie &);
-    void operator= (const RoutingPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class MaxHopsPolicy;
-  typedef MaxHopsPolicy *MaxHopsPolicy_ptr;
-  class TAO_Export MaxHopsPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    MaxHopsPolicy (void);
-  public:
-    MaxHopsPolicy (const MaxHopsPolicy& rhs);
-    virtual ~MaxHopsPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_max_hops_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::MaxHopsPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_MaxHopsPolicy     : public virtual Messaging::MaxHopsPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_MaxHopsPolicy (
-        MaxHopsPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    MaxHopsPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    MaxHopsPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export MaxHopsPolicy_tie : public MaxHopsPolicy
-  {
-  public:
-    MaxHopsPolicy_tie (T &t);
-    // the T& ctor
-    MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    MaxHopsPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~MaxHopsPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::UShort max_hops (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    MaxHopsPolicy_tie (const MaxHopsPolicy_tie &);
-    void operator= (const MaxHopsPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class QueueOrderPolicy;
-  typedef QueueOrderPolicy *QueueOrderPolicy_ptr;
-  class TAO_Export QueueOrderPolicy : public virtual POA_CORBA::Policy
-  {
-  protected:
-    QueueOrderPolicy (void);
-  public:
-    QueueOrderPolicy (const QueueOrderPolicy& rhs);
-    virtual ~QueueOrderPolicy (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_allowed_orders_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void _get_policy_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void copy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::QueueOrderPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_QueueOrderPolicy     : public virtual Messaging::QueueOrderPolicy,
-      public virtual POA_CORBA::_tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_QueueOrderPolicy (
-        QueueOrderPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    QueueOrderPolicy_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    QueueOrderPolicy_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export QueueOrderPolicy_tie : public QueueOrderPolicy
-  {
-  public:
-    QueueOrderPolicy_tie (T &t);
-    // the T& ctor
-    QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    QueueOrderPolicy_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~QueueOrderPolicy_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::Ordering allowed_orders (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PolicyType policy_type (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Policy_ptr copy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void destroy (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    QueueOrderPolicy_tie (const QueueOrderPolicy_tie &);
-    void operator= (const QueueOrderPolicy_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (TAO_POLLER)
-  class ReplyHandler;
-  typedef ReplyHandler *ReplyHandler_ptr;
-  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    ReplyHandler (void);
-  public:
-    ReplyHandler (const ReplyHandler& rhs);
-    virtual ~ReplyHandler (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::ReplyHandler *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_ReplyHandler     : public virtual Messaging::ReplyHandler
-  {
-  public:
-    _tao_collocated_ReplyHandler (
-        ReplyHandler_ptr  servant,
-        TAO_Stub *stub
-      );
-    ReplyHandler_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    ReplyHandler_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export ReplyHandler_tie : public ReplyHandler
-  {
-  public:
-    ReplyHandler_tie (T &t);
-    // the T& ctor
-    ReplyHandler_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    ReplyHandler_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~ReplyHandler_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    ReplyHandler_tie (const ReplyHandler_tie &);
-    void operator= (const ReplyHandler_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-  class Poller;
-  typedef Poller *Poller_ptr;
-  class TAO_Export Poller : public virtual POA_CORBA::Pollable
-  {
-  protected:
-    Poller (void);
-  public:
-    Poller (const Poller& rhs);
-    virtual ~Poller (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_operation_target_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_operation_name_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_associated_handler_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _set_associated_handler_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_is_from_poller_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_target_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void _get_op_name_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void is_ready_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    Messaging::Poller *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_Poller     : public virtual Messaging::Poller,
-      public virtual POA_CORBA::_tao_collocated_Pollable
-  {
-  public:
-    _tao_collocated_Poller (
-        Poller_ptr  servant,
-        TAO_Stub *stub
-      );
-    Poller_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    Poller_ptr servant_;
-  };
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export Poller_tie : public Poller
-  {
-  public:
-    Poller_tie (T &t);
-    // the T& ctor
-    Poller_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Poller_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~Poller_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Object_ptr operation_target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    char * operation_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    Messaging::ReplyHandler_ptr associated_handler (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void associated_handler (
-        Messaging::ReplyHandler_ptr associated_handler,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_from_poller (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Object_ptr target (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    char * op_name (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    Poller_tie (const Poller_tie &);
-    void operator= (const Poller_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_POLLER */
-
-};
-
-// #include "MessagingS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "MessagingS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_IDL_MESSAGINGS_H */
diff --git a/TAO/tao/MessagingS.i b/TAO/tao/MessagingS.i
deleted file mode 100644
index f5d5493117d..00000000000
--- a/TAO/tao/MessagingS.i
+++ /dev/null
@@ -1,42 +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
-
-#if defined (TAO_POLLER)
-ACE_INLINE void POA_Messaging::Poller::is_ready_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj;
-  POA_CORBA::Pollable::is_ready_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-ACE_INLINE void POA_Messaging::Poller::create_pollable_set_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_Messaging::Poller_ptr) obj;
-  POA_CORBA::Pollable::create_pollable_set_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-#endif /* TAO_POLLER */
diff --git a/TAO/tao/MessagingS_T.cpp b/TAO/tao/MessagingS_T.cpp
deleted file mode 100644
index 97db2c29473..00000000000
--- a/TAO/tao/MessagingS_T.cpp
+++ /dev/null
@@ -1,269 +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_MESSAGINGS_T_CPP_
-#define _TAO_IDL_MESSAGINGS_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "MessagingS_T.h"
-#include "tao/POA.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
-#endif /* !defined INLINE */
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RebindPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::SyncScopePolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RequestEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::RoutingPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::MaxHopsPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::QueueOrderPolicy_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-#if defined (TAO_POLLER)
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::ReplyHandler_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> PortableServer::POA_ptr
-POA_Messaging::Poller_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-#endif /* TAO_POLLER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/MessagingS_T.h b/TAO/tao/MessagingS_T.h
deleted file mode 100644
index 825a6d869da..00000000000
--- a/TAO/tao/MessagingS_T.h
+++ /dev/null
@@ -1,37 +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_MESSAGINGS_T_H_
-#define _TAO_IDL_MESSAGINGS_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "MessagingS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "MessagingS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("MessagingS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/MessagingS_T.i b/TAO/tao/MessagingS_T.i
deleted file mode 100644
index fd4a7cf99c9..00000000000
--- a/TAO/tao/MessagingS_T.i
+++ /dev/null
@@ -1,1691 +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
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::RebindPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RebindPolicy_tie<T>::~RebindPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RebindPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RebindPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::RebindMode POA_Messaging::RebindPolicy_tie<T>::rebind_mode  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->rebind_mode (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RebindPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RebindPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RebindPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::SyncScopePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::SyncScopePolicy_tie<T>::~SyncScopePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::SyncScopePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::SyncScope POA_Messaging::SyncScopePolicy_tie<T>::synchronization  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->synchronization (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::SyncScopePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::SyncScopePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::SyncScopePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::RequestPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestPriorityPolicy_tie<T>::~RequestPriorityPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::PriorityRange POA_Messaging::RequestPriorityPolicy_tie<T>::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestPriorityPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestPriorityPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestPriorityPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::ReplyPriorityPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyPriorityPolicy_tie<T>::~ReplyPriorityPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyPriorityPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::PriorityRange POA_Messaging::ReplyPriorityPolicy_tie<T>::priority_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->priority_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyPriorityPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyPriorityPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyPriorityPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::RequestStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestStartTimePolicy_tie<T>::~RequestStartTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::RequestStartTimePolicy_tie<T>::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestStartTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestStartTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestStartTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::RequestEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RequestEndTimePolicy_tie<T>::~RequestEndTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RequestEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::RequestEndTimePolicy_tie<T>::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RequestEndTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RequestEndTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RequestEndTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::ReplyStartTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyStartTimePolicy_tie<T>::~ReplyStartTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyStartTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::ReplyStartTimePolicy_tie<T>::start_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->start_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyStartTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyStartTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyStartTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::ReplyEndTimePolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyEndTimePolicy_tie<T>::~ReplyEndTimePolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyEndTimePolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::UtcT POA_Messaging::ReplyEndTimePolicy_tie<T>::end_time  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->end_time (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::ReplyEndTimePolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::ReplyEndTimePolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::ReplyEndTimePolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::RelativeRequestTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::~RelativeRequestTimeoutPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::TimeT POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RelativeRequestTimeoutPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::RelativeRoundtripTimeoutPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::~RelativeRoundtripTimeoutPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-TimeBase::TimeT POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::relative_expiry  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->relative_expiry (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RelativeRoundtripTimeoutPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::RoutingPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::RoutingPolicy_tie<T>::~RoutingPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::RoutingPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::RoutingPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::RoutingTypeRange POA_Messaging::RoutingPolicy_tie<T>::routing_range  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->routing_range (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::RoutingPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::RoutingPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::RoutingPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::MaxHopsPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::MaxHopsPolicy_tie<T>::~MaxHopsPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::MaxHopsPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-CORBA::UShort POA_Messaging::MaxHopsPolicy_tie<T>::max_hops  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->max_hops (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::MaxHopsPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::MaxHopsPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::MaxHopsPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::QueueOrderPolicy_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::QueueOrderPolicy_tie<T>::~QueueOrderPolicy_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::QueueOrderPolicy_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-Messaging::Ordering POA_Messaging::QueueOrderPolicy_tie<T>::allowed_orders  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->allowed_orders (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PolicyType POA_Messaging::QueueOrderPolicy_tie<T>::policy_type  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->policy_type (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Policy_ptr POA_Messaging::QueueOrderPolicy_tie<T>::copy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->copy (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::QueueOrderPolicy_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->destroy (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined(TAO_POLLER)
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::ReplyHandler_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::ReplyHandler_tie<T>::~ReplyHandler_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::ReplyHandler_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::Poller_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_Messaging::Poller_tie<T>::~Poller_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_Messaging::Poller_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_Messaging::Poller_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_Messaging::Poller_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE
-CORBA::Object_ptr POA_Messaging::Poller_tie<T>::operation_target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->operation_target (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-char * POA_Messaging::Poller_tie<T>::operation_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->operation_name (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-Messaging::ReplyHandler_ptr POA_Messaging::Poller_tie<T>::associated_handler  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->associated_handler (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_Messaging::Poller_tie<T>::associated_handler  (
-    Messaging::ReplyHandler_ptr associated_handler,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->associated_handler (
-    associated_handler,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_Messaging::Poller_tie<T>::is_from_poller  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_from_poller (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Object_ptr POA_Messaging::Poller_tie<T>::target  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->target (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-char * POA_Messaging::Poller_tie<T>::op_name  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->op_name (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_Messaging::Poller_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_Messaging::Poller_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* TAO_POLLER */
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
index 36306a455a2..861b3942212 100644
--- a/TAO/tao/NVList.cpp
+++ b/TAO/tao/NVList.cpp
@@ -3,9 +3,6 @@
 // Implementation of Named Value List and NamedValue classes
 
 #include "tao/NVList.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Exception.h"
 #include "tao/Environment.h"
 #include "tao/ORB.h"
@@ -153,6 +150,7 @@ CORBA_NVList::add_value (const char *name,
             {
               nv->any_._tao_replace (value.type_,
                                      value.cdr_,
+                                     0,
                                      env);
             }
         }
@@ -225,7 +223,7 @@ CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env)
   if (ACE_BIT_DISABLED (flags,
                         CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
     {
-      env.exception (new CORBA::BAD_PARAM ());
+      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -273,5 +271,3 @@ template class ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>;
 #pragma instantiate ACE_Unbounded_Queue<CORBA::NamedValue_ptr>
 #pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
index 9f410e58b57..25dc19a966d 100644
--- a/TAO/tao/NVList.h
+++ b/TAO/tao/NVList.h
@@ -19,10 +19,6 @@
 #ifndef TAO_NVLIST_H
 #define TAO_NVLIST_H
 
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "ace/Containers_T.h"
 #include "tao/Any.h"
 
@@ -58,12 +54,6 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-  // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NamedValue_ptr _ptr_type;
-  typedef CORBA_NamedValue_var _var_type;
-#endif /* __GNUC__ */
-
 private:
   CORBA::ULong refcount_;
   // maintains how many references exist to this object
@@ -89,6 +79,8 @@ private:
   friend class CORBA_Request;
 };
 
+typedef CORBA_NamedValue* CORBA_NamedValue_ptr;
+
 class TAO_Export CORBA_NamedValue_var
 {
   // = TITLE
@@ -221,12 +213,6 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-  // Useful for template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NVList_ptr _ptr_type;
-  typedef CORBA_NVList_var _var_type;
-#endif /* __GNUC__ */
-
 private:
   CORBA_NVList (void);
   // constructor - cannot be instantiated directly other than through the
@@ -252,6 +238,8 @@ private:
   friend class CORBA_Request;
 };
 
+typedef CORBA_NVList* CORBA_NVList_ptr;
+
 class TAO_Export CORBA_NVList_var
 {
   // = TITLE
@@ -324,6 +312,4 @@ private:
 # include "tao/NVList.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 0be668c7183..2a1942b833d 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -12,31 +12,20 @@
 #include "ace/Object_Manager.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 #include "ace/Thread_Manager.h"
-#include "ace/Read_Buffer.h"
 
 #include "tao/Object.h"
 #include "tao/Typecode.h"
+#include "tao/Marshal.h"
+#include "tao/InconsistentTypeCodeC.h"
 #include "tao/NVList.h"
 #include "tao/Stub.h"
 #include "tao/IIOP_Profile.h"
 #include "tao/DynAny_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/CDR_Interpreter.h"
+#include "tao/IIOP_Interpreter.h"
 #include "tao/debug.h"
 #include "tao/TAO_Internal.h"
-#include "tao/CDR.h"
-#include "tao/Marshal.h"
-#include "tao/IOR_LookupTable.h"
-#include "tao/GIOP.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
-#include "tao/Request.h"
-#ifdef TAO_HAS_VALUETYPE
-#  include "tao/ValueFactory_Map.h"
-#endif /* TAO_HAS_VALUETYPE */
-
 
 #if !defined (__ACE_INLINE__)
 # include "tao/ORB.i"
@@ -46,10 +35,6 @@
 
 ACE_RCSID(tao, ORB, "$Id$")
 
-static const char ior_prefix [] = "IOR:";
-static const char iioploc_prefix [] = "iioploc:";
-static const char file_prefix[] = "file://";
-
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_ORB_Timeprobe_Description[] =
@@ -71,6 +56,41 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_ORB_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
+// Typecode stuff for the InconsistentTypeCode exception
+static const CORBA::Long _oc_CORBA_ORB_InconsistentTypeCode[] =
+{
+  TAO_ENCAP_BYTE_ORDER,   // byte order
+  47,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x434f5242),
+  ACE_NTOHL (0x412f4f52),
+  ACE_NTOHL (0x422f496e),
+  ACE_NTOHL (0x636f6e73),
+  ACE_NTOHL (0x69737465),
+  ACE_NTOHL (0x6e745479),
+  ACE_NTOHL (0x7065436f),
+  ACE_NTOHL (0x64653a31),
+  ACE_NTOHL (0x2e3000fd), // repository ID =
+                          // IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0
+  21,
+  ACE_NTOHL (0x496e636f),
+  ACE_NTOHL (0x6e736973),
+  ACE_NTOHL (0x74656e74),
+  ACE_NTOHL (0x54797065),
+  ACE_NTOHL (0x436f6465),
+  ACE_NTOHL (0xfdfdfd),   // name = InconsistentTypeCode
+  0,                      // member count
+};
+
+static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_InconsistentTypeCode (
+    CORBA::tk_except,
+    sizeof (_oc_CORBA_ORB_InconsistentTypeCode),
+    (char *) &_oc_CORBA_ORB_InconsistentTypeCode,
+    0,
+    sizeof (CORBA_ORB_InconsistentTypeCode));
+
 // = Static initialization.
 
 // Count of the number of ORBs.
@@ -79,7 +99,37 @@ int CORBA_ORB::orb_init_count_ = 0;
 // Pointer to the "default ORB."
 CORBA::ORB_ptr CORBA::instance_ = 0;
 
-// ****************************************************************
+// ORB exception typecode initialization.
+CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode =
+  &_tc_TAO_tc_CORBA_ORB_InconsistentTypeCode;
+
+CORBA_String_var::CORBA_String_var (char *p)
+  : ptr_ (p)
+{
+  // NOTE: According to the CORBA spec this string must *not* be
+  // copied, but it is non-compliant to use it/release it in the
+  // calling code.  argument is consumed. p should never be NULL
+}
+
+CORBA_String_var::CORBA_String_var (const CORBA_String_var& r)
+{
+  this->ptr_ = CORBA::string_dup (r.ptr_);
+}
+
+CORBA_String_var::~CORBA_String_var (void)
+{
+  if (this->ptr_ != 0)
+    {
+      CORBA::string_free (this->ptr_);
+      this->ptr_ = 0;
+    }
+}
+
+TAO_Export CORBA::String
+CORBA::string_dup (const CORBA::Char *str)
+{
+  return CORBA::string_copy (str);
+}
 
 CORBA_ORB::InvalidName::InvalidName (void)
 {
@@ -108,7 +158,7 @@ CORBA_ORB::InvalidName::_is_a (const char* interface_id) const
           || CORBA_UserException::_is_a (interface_id));
 }
 
-CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
+CORBA_ORB::CORBA_ORB (void)
   : refcount_ (1),
     open_called_ (0),
     shutdown_lock_ (0),
@@ -116,27 +166,18 @@ CORBA_ORB::CORBA_ORB (TAO_ORB_Core *orb_core)
     name_service_ (CORBA_Object::_nil ()),
     schedule_service_ (CORBA_Object::_nil ()),
     event_service_ (CORBA_Object::_nil ()),
-    trading_service_ (CORBA_Object::_nil ()),
-    orb_core_ (orb_core),
-# ifdef TAO_HAS_VALUETYPE
-    valuetype_factory_map_ (0),
-# endif /* TAO_HAS_VALUETYPE */
-    use_omg_ior_format_ (1),
-    optimize_collocation_objects_ (1)
+    trading_service_ (CORBA_Object::_nil ())
 {
   leader_follower_info_.leaders_ = 0;
   leader_follower_info_.leader_thread_ID_ =
     ACE_OS::NULL_thread;
   ACE_NEW (this->cond_become_leader_,
            ACE_SYNCH_CONDITION (leader_follower_info_.leader_follower_lock_));
-
-  if (CORBA::instance_ == 0)
-    CORBA::instance_ = this;
 }
 
 CORBA_ORB::~CORBA_ORB (void)
 {
-  this->orb_core_->fini ();
+  TAO_ORB_Core_instance ()->fini ();
 
   ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, tao_mon, *ACE_Static_Object_Lock::instance ()));
 
@@ -167,10 +208,6 @@ CORBA_ORB::~CORBA_ORB (void)
     CORBA::release (this->event_service_);
   if (!CORBA::is_nil (this->trading_service_))
     CORBA::release (this->trading_service_);
-# ifdef TAO_HAS_VALUETYPE
-  // delete valuetype_factory_map_;
-  // not really, its a singleton
-# endif /* TAO_HAS_VALUETYPE */
 
   delete this->cond_become_leader_;
 }
@@ -191,25 +228,18 @@ CORBA_ORB::open (void)
 
   this->open_called_ = 1;
 
-  TAO_Server_Strategy_Factory *f =
-    this->orb_core_->server_factory ();
+  TAO_ORB_Core *ocp = TAO_ORB_Core_instance ();
+  TAO_Server_Strategy_Factory *f = ocp->server_factory ();
 
   // @@ For now we simple assume an IIOP handler, in the future
   // @@ this has to be more general
-  // @@ Fred: right, this is my idea for this stuff:
-  //    Using the Connector Registry try every endpoint listed in the
-  //    orb_params(), for each one create a TAO_Acceptor [check the
-  //    Pluggable.h file for a description on how to do that],
-  //    activate the acceptor with the reactor and insert it in the
-  //    Acceptor Registry.
   TAO_IIOP_BASE_ACCEPTOR *iiop_acceptor =
-    ACE_dynamic_cast (TAO_IIOP_BASE_ACCEPTOR *,
-                      this->orb_core_->acceptor ()->acceptor ());
+    ACE_dynamic_cast(TAO_IIOP_BASE_ACCEPTOR *, ocp->acceptor ()->acceptor ());
 
   // Initialize the endpoint ... or try!
 
-  if (iiop_acceptor->open (this->orb_core_->orb_params ()->addr (),
-                           this->orb_core_->reactor(),
+  if (iiop_acceptor->open (ocp->orb_params ()->addr (),
+                           ocp->reactor(),
                            f->creation_strategy (),
                            f->accept_strategy (),
                            f->concurrency_strategy (),
@@ -225,10 +255,10 @@ CORBA_ORB::open (void)
     return -1;
 
   // Reset the address
-  this->orb_core_->orb_params ()->addr (new_address);
+  ocp->orb_params ()->addr (new_address);
 
   iiop_acceptor->acceptor ().enable (ACE_CLOEXEC);
-  this->orb_core_->add_to_collocation_table ();
+  ocp->add_to_collocation_table ();
 
   return 0;
 }
@@ -240,13 +270,13 @@ CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
   this->should_shutdown (1);
 
   // Grab the thread manager
-  ACE_Thread_Manager *tm = this->orb_core_->thr_mgr ();
+  ACE_Thread_Manager *tm = TAO_ORB_Core_instance ()->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 ();
+  TAO_ORB_Core_instance ()->reactor ()->wakeup_all_threads ();
 
   // If <wait_for_completion> is set, wait for all threads to exit.
   if (wait_for_completion != 0)
@@ -255,27 +285,23 @@ CORBA_ORB::shutdown (CORBA::Boolean wait_for_completion)
   return;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 void
 CORBA_ORB::create_list (CORBA::Long count,
-                        CORBA::NVList_ptr &new_list,
-                        CORBA_Environment &)
+                        CORBA::NVList_ptr &retval)
 {
   assert (CORBA::ULong (count) <= UINT_MAX);
 
-  // Create an empty list
-  new_list = new CORBA::NVList;
+  // create an empty list
+  retval = new CORBA::NVList;
 
-  // If count is greater than 0, create a list of NamedValues.
+  // if count is greater than 0, create a list of NamedValues
   if (count != 0)
     {
-      new_list->max_ = (CORBA::ULong) count;
-
+      retval->max_ = (CORBA::ULong) count;
       for (CORBA::Long i=0; i < count; i++)
         {
           CORBA::NamedValue_ptr nv = new CORBA::NamedValue;
-          new_list->values_.enqueue_tail (nv);
+          retval->values_.enqueue_tail (nv);
         }
     }
 }
@@ -283,7 +309,7 @@ CORBA_ORB::create_list (CORBA::Long count,
 int
 CORBA_ORB::perform_work (const ACE_Time_Value &tv)
 {
-  ACE_Reactor *r = this->orb_core_->reactor ();
+  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
 
   // Set the owning thread of the Reactor to the one which we're
   // currently in.  This is necessary b/c it's possible that the
@@ -292,102 +318,9 @@ CORBA_ORB::perform_work (const ACE_Time_Value &tv)
   r->owner (ACE_Thread::self ());
 
   ACE_Time_Value tmp_tv (tv);
-
   return r->handle_events (tmp_tv);
 }
 
-CORBA::Boolean
-CORBA_ORB::work_pending (void)
-{
-  // There's ALWAYS work to do ;-)
-  return 1;
-}
-
-// The following functions are not implemented - they just throw
-// CORBA::NO_IMPLEMENT.
-
-void
-CORBA_ORB::create_exception_list (CORBA::ExceptionList_ptr &,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_environment (CORBA::Environment_ptr &,
-                               CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_ORB::get_service_information (CORBA::ServiceType service_type,
-                                    CORBA::ServiceInformation_out service_information,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  return 0;
-}
-
-void
-CORBA_ORB::create_named_value (CORBA::NamedValue_ptr &,
-                               CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::create_context_list (CORBA::ContextList_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_default_context (CORBA::Context_ptr &,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_oneway (const CORBA_ORB_RequestSeq,
-                                          CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::send_multiple_requests_deferred (const CORBA_ORB_RequestSeq,
-                                            CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_ORB::get_next_response (CORBA_Request_ptr &,
-                              CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_ORB::poll_next_response (CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 int
 CORBA_ORB::run (ACE_Time_Value *tv,
                 int break_on_timeouts)
@@ -395,21 +328,21 @@ CORBA_ORB::run (ACE_Time_Value *tv,
   ACE_FUNCTION_TIMEPROBE (TAO_CORBA_ORB_RUN_START);
 
   {
-    ACE_Guard<ACE_SYNCH_MUTEX> g (this->orb_core_->leader_follower_lock ());
+    ACE_Guard<ACE_SYNCH_MUTEX> g (TAO_ORB_Core_instance ()->leader_follower_lock ());
 
-    while (this->orb_core_->leader_available ())
+    while (TAO_ORB_Core_instance ()->leader_available ())
       {
         // @@ Why do this on every iteration, shouldn't this be done
         // just once?
-        if (this->orb_core_->add_follower (this->cond_become_leader_) == -1)
+        if (TAO_ORB_Core_instance ()->add_follower (this->cond_become_leader_) == -1)
           ACE_ERROR ((LM_ERROR,
                       "(%P|%t) ORB::run: Failed to add a follower thread\n"));
         this->cond_become_leader_->wait ();
       }
-    this->orb_core_->set_leader_thread ();
+    TAO_ORB_Core_instance ()->set_leader_thread ();
   }
 
-  ACE_Reactor *r = this->orb_core_->reactor ();
+  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
 
   // Set the owning thread of the Reactor to the one which we're
   // currently in.  This is necessary b/c it's possible that the
@@ -468,7 +401,7 @@ CORBA_ORB::run (ACE_Time_Value *tv,
 
   if (result != -1)
     {
-      if (this->orb_core_->unset_leader_wake_up_follower () == -1)
+      if (TAO_ORB_Core_instance ()->unset_leader_wake_up_follower () == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) ORB::run: Failed to add a follower thread\n"),
                           -1);
@@ -498,59 +431,70 @@ CORBA_ORB::run (void)
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_root_poa (CORBA::Environment &ACE_TRY_ENV,
-                             const char *adapter_name,
+CORBA_ORB::resolve_root_poa (const char *adapter_name,
                              TAO_POA_Manager *poa_manager,
                              const TAO_POA_Policies *policies)
 {
-  return this->orb_core_->root_poa_reference (ACE_TRY_ENV,
-                                              adapter_name,
-                                              poa_manager,
-                                              policies);
-}
+  CORBA::Environment env;
 
-CORBA_Object_ptr
-CORBA_ORB::resolve_poa_current (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Return the pointer to the POA Current.
-  return this->orb_core_->poa_current ()._this (ACE_TRY_ENV);
+  return TAO_ORB_Core_instance ()->root_poa_reference (env,
+                                                       adapter_name,
+                                                       poa_manager,
+                                                       policies);
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_manager (CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::resolve_poa_current (void)
 {
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager *policy_manager =
-    this->orb_core_->policy_manager ();
-  if (policy_manager == 0)
+  // Return the pointer to this thread's POACurrent.
+
+  CORBA::Environment env;
+
+  TAO_POA_Current *poa_current = TAO_ORB_Core_instance ()->poa_current ();
+  if (poa_current == 0)
     return CORBA_Object::_nil ();
 
-  return policy_manager->_this (ACE_TRY_ENV);
-#else
-  return CORBA_Object::_nil ();
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  PortableServer::Current_var result = poa_current->_this (env);
+  if (env.exception () != 0)
+    return CORBA_Object::_nil ();
+  else
+    return result._retn ();
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_policy_current (CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::resolve_commandline_ref (const char *& init_ref)
 {
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Current *policy_current =
-    this->orb_core_->policy_current ();
-  if (policy_current == 0)
-    return CORBA_Object::_nil ();
 
-  return policy_current->_this (ACE_TRY_ENV);
-#else
-  return CORBA_Object::_nil ();
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  // @@ Where are the exceptions caught ??
+  CORBA::Environment env;
+
+  // Initialize our return ptr.
+  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
+
+  // Get the commandline initial reference.
+  init_ref = TAO_ORB_Core_instance ()->orb_params ()->init_ref ();
+
+  // Parse the IOR from the given commandline mapping <ObjectId>=<IOR>.
+  char *ior = CORBA::string_dup (init_ref + ACE_OS::strcspn (init_ref,"=") + 1 );
+
+  // Convert the given IOR to object. Note the IOR could be of the form
+  // IOR: ...    / iiop: ...    / iioploc: ...    / iiopname: ...
+
+  return_value = this->string_to_object (ior, env);
+
+  // check for errors
+  if (env.exception () != 0)
+    return_value = CORBA_Object::_nil ();
+
+  CORBA::string_free (ior);
+  return CORBA_Object::_duplicate (return_value);
 }
 
+
 CORBA_Object_ptr
-CORBA_ORB::resolve_service (const char *service_name,
-                            ACE_Time_Value *timeout,
-                            CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::resolve_name_service (ACE_Time_Value *timeout)
 {
+  CORBA::Environment env;
   CORBA_Object_ptr return_value = CORBA_Object::_nil ();
 
   // First check to see if we've already initialized this.
@@ -562,7 +506,7 @@ CORBA_ORB::resolve_service (const char *service_name,
   else
     {
       ACE_CString name_service_ior =
-        this->orb_core_->orb_params ()->name_service_ior ();
+        TAO_ORB_Core_instance ()->orb_params ()->name_service_ior ();
 
       // Second, check to see if the user has give us a parameter on
       // the command-line.
@@ -573,18 +517,17 @@ CORBA_ORB::resolve_service (const char *service_name,
       if (name_service_ior.length () != 0)
         {
           this->name_service_ =
-            this->string_to_object (name_service_ior.c_str (),
-                                    ACE_TRY_ENV);
+            this->string_to_object (name_service_ior.c_str (), env);
 
           // check for errors
-          if (ACE_TRY_ENV.exception () != 0)
+          if (env.exception () != 0)
             this->name_service_ = CORBA_Object::_nil ();
         }
       else
         {
           // First, determine if the port was supplied on the command line
           u_short port =
-            this->orb_core_->orb_params ()->name_service_port ();
+            TAO_ORB_Core_instance ()->orb_params ()->name_service_port ();
 
           if (port == 0)
             {
@@ -599,10 +542,9 @@ CORBA_ORB::resolve_service (const char *service_name,
             }
 
           this->name_service_ =
-            this->multicast_to_service (service_name,
+            this->multicast_to_service (TAO_SERVICEID_NAMESERVICE,
                                         port,
-                                        timeout,
-                                        ACE_TRY_ENV);
+                                        timeout);
         }
     }
 
@@ -612,9 +554,9 @@ CORBA_ORB::resolve_service (const char *service_name,
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
-                                    CORBA::Environment& ACE_TRY_ENV)
+CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout)
 {
+  CORBA::Environment env;
   CORBA_Object_ptr return_value = CORBA_Object::_nil ();
 
   // First check to see if we've already initialized this.
@@ -626,7 +568,7 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
   else
     {
       ACE_CString trading_service_ior =
-        this->orb_core_->orb_params ()->trading_service_ior ();
+        TAO_ORB_Core_instance ()->orb_params ()->trading_service_ior ();
 
       // Second, check to see if the user has give us a parameter on
       // the command-line.
@@ -637,10 +579,10 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
       if (trading_service_ior.length () != 0)
         {
           this->trading_service_ =
-            this->string_to_object (trading_service_ior.c_str (), ACE_TRY_ENV);
+            this->string_to_object (trading_service_ior.c_str (), env);
 
           // check for errors
-          if (ACE_TRY_ENV.exception () != 0)
+          if (env.exception () != 0)
             this->trading_service_ = CORBA_Object::_nil ();
         }
       else
@@ -648,7 +590,7 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
           // First, determine if the port was supplied on the command line
           // @@ FRED: need a generic rep for this!
           u_short port =
-            this->orb_core_->orb_params ()->trading_service_port ();
+            TAO_ORB_Core_instance ()->orb_params ()->trading_service_port ();
 
           if (port == 0)
             {
@@ -662,10 +604,9 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
             }
 
           this->trading_service_ =
-            this->multicast_to_service ("TradingService",
+            this->multicast_to_service (TAO_SERVICEID_TRADINGSERVICE,
                                         port,
-                                        timeout,
-                                        ACE_TRY_ENV);
+                                        timeout);
         }
     }
 
@@ -673,142 +614,128 @@ CORBA_ORB::resolve_trading_service (ACE_Time_Value *timeout,
   return CORBA_Object::_duplicate (return_value);
 }
 
-int
-CORBA_ORB::multicast_query (char *buf,
-                            const char *service_name,
+char *
+CORBA_ORB::multicast_query (TAO_Service_ID service_id,
                             u_short port,
                             ACE_Time_Value *timeout)
 {
-  ACE_INET_Addr my_addr;
-  ACE_SOCK_Acceptor acceptor;
-  ACE_SOCK_Stream stream;
-  ACE_SOCK_Dgram dgram;
+    // This is the code that implements the multicast
+  // Naming Service locator.
+  ACE_SOCK_Dgram_Mcast multicast;
+  ACE_INET_Addr remote_addr;
+  // This starts out initialized to all zeros!
+  ACE_INET_Addr multicast_addr (port,
+                                ACE_DEFAULT_MULTICAST_ADDR);
 
-  ssize_t result = 0;
+  // Subscribe to multicast address.
+  if (multicast.subscribe (multicast_addr) == -1)
+  {
+    ACE_ERROR ((LM_ERROR, "Unable to perform IIOP multicast!\n"));
+    return 0;
+  }
 
-  // Bind listener to any port and then find out what the port was.
-  if (acceptor.open (ACE_Addr::sap_any) == -1
-      || acceptor.get_local_addr (my_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "acceptor.open () || "
-                  "acceptor.get_local_addr () failed"));
-      result = -1;
-    }
-  else
-    {
-      // This starts out initialized to all zeros!
-      ACE_INET_Addr multicast_addr (port,
-                                    ACE_DEFAULT_MULTICAST_ADDR);
-      // Open the datagram.
-      if (dgram.open (ACE_Addr::sap_any) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "Unable to open the Datagram!\n"));
-          result = -1;
-        }
-      else
-        {
-          // Convert the port we're listening on into network byte
-          // order.
-          ACE_UINT16 response_port =
-            ACE_HTONS (my_addr.get_port_number ());
-
-          // Length of data to be sent. This is sent as a header.
-          CORBA::Short data_len =
-            ACE_HTONS (sizeof (ACE_UINT16)
-                       + ACE_OS::strlen (service_name));
-
-          // Vector to be sent.
-          const int iovcnt = 3;
-          iovec iovp[iovcnt];
-
-          // The length of data to be sent.
-          iovp[0].iov_base = (char *) &data_len;
-          iovp[0].iov_len  = sizeof (CORBA::Short);
-
-          // The port at which we are listening.
-          iovp[1].iov_base = (char *) &response_port;
-          iovp[1].iov_len  = sizeof (ACE_UINT16);
-
-          // The service name string.
-          iovp[2].iov_base = (char *) service_name;
-          iovp[2].iov_len  = ACE_OS::strlen (service_name);
-
-          // Send the multicast.
-          result = dgram.send (iovp,
-                               iovcnt,
-                               multicast_addr);
-
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "\nsent multicast request."));
-
-          // Check for errors.
-          if (result == -1)
-            ACE_ERROR ((LM_ERROR,
-                        "%p\n",
-                        "error sending IIOP multicast"));
-          else
-            {
-              if (TAO_debug_level > 0)
-                ACE_DEBUG ((LM_DEBUG,
-                            "\n%s; Sent multicast."
-                            "# of bytes sent is %d.\n",
-                            __FILE__,
-                            result));
-              // Wait for response until
-              // TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT.
-              ACE_Time_Value tv (timeout == 0
-                                 ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-                                 : *timeout);
-              // Accept reply connection from server.
-              if (acceptor.accept (stream,
-                                   0,
-                                   &tv) == -1)
-                {
-                  ACE_ERROR ((LM_ERROR,
-                              "%p\n",
-                              "multicast_query: unable to accept"));
-                  result = -1;
-                }
-              else
-                {
-                  // Receive the IOR.
-                  result = stream.recv (buf,
-                                        BUFSIZ,
-                                        0,
-                                        timeout);
-                  // Close socket now.
-                  stream.close ();
-
-                  // Check for errors.
-                  if (result == -1)
-                    ACE_ERROR ((LM_ERROR,
-                                "%p\n",
-                                "error reading IIOP multicast response"));
-                  else
-                    {
-                      // Null terminate message.
-                      buf[result] = 0;
-
-                      if (TAO_debug_level > 0)
-                        ACE_DEBUG ((LM_DEBUG,
-                                    "%s: service resolved to IOR <%s>\n",
-                                    __FILE__,
-                                    buf));
-                    }
-                }
-            }
-        }
-    }
+  // Prepare connection for the reply.
+  ACE_INET_Addr response_addr;
+  ACE_SOCK_Dgram response;
+
+  // Choose any local port, we don't really care.
+  if (response.open (ACE_Addr::sap_any) == -1)
+  {
+    multicast.close ();
+    ACE_ERROR_RETURN ((LM_ERROR, "IIOP Multicast open failed.\n"), 0);
+  }
+
+  if (response.get_local_addr (response_addr) == -1)
+  {
+    multicast.close ();
+    response.close ();
+    ACE_ERROR_RETURN ((LM_ERROR,
+                      "IIOP get_local_addr failed.\n"), 0);
+  }
+
+  // @@ Vishal, please update this code and the server-side code in
+  // $TAO_ROOT/orbsvcs/Naming_Service/ so that it (1) sends a string
+  // rather than a u_short (the string should contain the name passed
+  // in by the user to resolve_initial_references()) and (2) the
+  // client doesn't explicitly send the port number, but instead the
+  // Naming_Service implementation will use the ACE_SOCK_Dgram::recv()
+  // method that returns the port number of the client, so we can use
+  // that to reply.
+
+  struct
+  {
+    u_short reply_port;
+    CORBA::Short service_id;
+  } mcast_info;
 
-  // We don't need the dgram or acceptor anymore.
-  dgram.close ();
-  acceptor.close ();
+  // Figure out what port to listen on for server replies,
+  // and convert to network byte order.
+  mcast_info.reply_port =
+    ACE_HTONS (response_addr.get_port_number ());
+  mcast_info.service_id =
+    ACE_HTONS (service_id);
 
-  return result == -1 ? -1 : 0;
+  // Send multicast of one byte, enough to wake up server.
+  ssize_t n_bytes = multicast.send (&mcast_info,
+                                    sizeof (mcast_info));
+
+  // close multicast socket now.
+  multicast.close ();
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG, "sent multicast request."));
+
+  // Check for errors.
+  if (n_bytes == -1)
+  {
+    response.close ();
+    ACE_ERROR_RETURN((LM_ERROR, "Error sending IIOP Multicast!\n"), 0);
+  }
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%s; Sent multicast.  Reply port is %u."
+                "# of bytes sent is %d.\n",
+                __FILE__,
+                response_addr.get_port_number (),
+                n_bytes));
+
+  // Wait for response until
+  // TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT.
+  ACE_Time_Value tv (timeout == 0
+                     ? ACE_Time_Value (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
+                     : *timeout);
+
+  // receive response message
+  char *buf = new char[ACE_MAX_DGRAM_SIZE + 1]; // add char for '\0'
+
+  n_bytes = response.recv (buf, BUFSIZ, remote_addr, 0, &tv);
+
+  // Close endpoint for response.
+  int retval = response.close ();
+
+  // Check for errors.
+  if (n_bytes == -1 || retval == -1)
+  {
+    delete [] buf;
+    if (TAO_debug_level > 0)
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "Error reading IIOP multicast response!\n"),
+                        0);
+  }
+
+  // Null terminate message.
+  buf[n_bytes] = 0;
+
+  if (TAO_debug_level > 0)
+    ACE_DEBUG ((LM_DEBUG,
+                "%s; Service resolved to ior: '%s'\n",
+                __FILE__,
+                buf));
+
+  return buf;
 }
+
 // @@ This will have to be sanitized of transport specific calls
 //    in order to support pluggable protocols!  But, it does use
 //    UDP and multicast.  Not all transport protocols may support
@@ -816,193 +743,138 @@ CORBA_ORB::multicast_query (char *buf,
 // @@ FRED: Should define a flag, something like Protocol_Has_Multicast
 //    If there is no multicast, then this functionality is not available
 //    and we return NULL.
-
 CORBA_Object_ptr
-CORBA_ORB::multicast_to_service (const char * service_name,
+CORBA_ORB::multicast_to_service (TAO_Service_ID service_id,
                                  u_short port,
-                                 ACE_Time_Value *timeout,
-                                 CORBA::Environment& ACE_TRY_ENV)
+                                 ACE_Time_Value *timeout)
 {
-  char buf[BUFSIZ + 1];
-
+  CORBA::Environment env;
   // Use UDP multicast to locate the  service.
-  CORBA_Object_ptr return_value =
-    CORBA_Object::_nil ();
+  CORBA_Object_ptr return_value = CORBA_Object::_nil ();
 
-  if (this->multicast_query (buf,
-                             service_name,
-                             port,
-                             timeout) == 0)
-    {
-      // Convert IOR to an object reference.
-      CORBA_Object_ptr objectified_ior =
-        this->string_to_object ((CORBA::String) buf,
-                                ACE_TRY_ENV);
-
-      // Check for errors.
-      if (ACE_TRY_ENV.exception () == 0)
-        return_value = objectified_ior;
-    }
+  char *buf = multicast_query (service_id, port, timeout);
 
+  if (buf)
+  {
+    // Convert ior to an object reference.
+    CORBA_Object_ptr objectified_ior = this->string_to_object ((CORBA::String) buf, env);
+
+    // Check for errors.
+    if (env.exception () == 0)
+      return_value = objectified_ior;
+  }
   // Return ior.
   return return_value;
 }
 
+
 CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (const char *name,
+CORBA_ORB::resolve_initial_references (CORBA::String name,
                                        CORBA_Environment &TAO_IN_ENV)
 {
-  return this->resolve_initial_references (name,
-                                           0,
-                                           TAO_IN_ENV);
+  return this->resolve_initial_references (name, 0, TAO_IN_ENV);
 }
 
 CORBA_Object_ptr
-CORBA_ORB::resolve_initial_references (const char *name,
+CORBA_ORB::resolve_initial_references (CORBA::String name,
                                        ACE_Time_Value *timeout,
-                                       CORBA_Environment &ACE_TRY_ENV)
+                                       CORBA_Environment &TAO_IN_ENV)
 {
-  // Get the table of initial references specified through
-  // -ORBInitRef.
-  TAO_IOR_LookupTable *table =
-    this->orb_core_->orb_params ()->ior_lookup_table ();
+  const char *init_ref = TAO_ORB_Core_instance ()->orb_params ()->init_ref ();
 
-  ACE_CString ior;
-  ACE_CString object_id ((const char *) name);
-
-  // Is the service name in the IOR Table.
-  if (table->find_ior (object_id, ior) == 0)
-    return this->string_to_object (ior.c_str (), ACE_TRY_ENV);
-  else
+  if (ACE_OS::strcmp (init_ref,"") != 0)
     {
-      // Get the list of initial reference prefixes specified through
-      // -ORBDefaultInitRef.
-      char * default_init_ref =
-        this->orb_core_->orb_params ()->default_init_ref ();
-
-      // Check if a DefaultInitRef was specified.
-      if (ACE_OS::strlen (default_init_ref) != 0)
-        {
-          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);
-              list_of_profiles += ACE_CString ("/");
-              list_of_profiles += object_id;
-              list_of_profiles += ACE_CString (",");
-            }
-
-          // Clean up.
-          delete [] default_init_ref;
-
-          // 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);
-        }
-
-      delete default_init_ref;
+      // A mapping <ObjectID>:<IOR> was specified through -ORBInitRef parameter.
+      // Are we looking for the same ObjectID.
+      if (ACE_OS::strncmp ((const char *) name,
+                           init_ref,
+                           ACE_OS::strcspn (init_ref,"=")) == 0)
+        return this->resolve_commandline_ref (init_ref);
     }
 
   if (ACE_OS::strcmp (name, TAO_OBJID_NAMESERVICE) == 0)
-    return this->resolve_service ("NameService", timeout, ACE_TRY_ENV);
-
+    return this->resolve_name_service (timeout);
   else if (ACE_OS::strcmp (name, TAO_OBJID_TRADINGSERVICE) == 0)
-    return this->resolve_trading_service (timeout, ACE_TRY_ENV);
-
+    return this->resolve_trading_service (timeout);
   else if (ACE_OS::strcmp (name, TAO_OBJID_ROOTPOA) == 0)
-    return this->resolve_root_poa (ACE_TRY_ENV);
-
+    return this->resolve_root_poa ();
   else if (ACE_OS::strcmp (name, TAO_OBJID_POACURRENT) == 0)
-    return this->resolve_poa_current (ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYMANAGER) == 0)
-    return this->resolve_policy_manager (ACE_TRY_ENV);
-
-  else if (ACE_OS::strcmp (name, TAO_OBJID_POLICYCURRENT) == 0)
-    return this->resolve_policy_current (ACE_TRY_ENV);
-
+    return this->resolve_poa_current ();
   else
-    return this->resolve_service (name, timeout, ACE_TRY_ENV);
+    TAO_THROW_RETURN (CORBA_ORB::InvalidName (), CORBA_Object::_nil ());
 }
 
-// Unimplemented at this time.
-CORBA_ORB_ObjectIdList_ptr
-CORBA_ORB::list_initial_services (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
+// Now defined in IIOP_Connector and Connector_Registry
+// int
+// CORBA_ORB::preconnect (CORBA::String connections)
+// {
+//   return TAO_ORB_Core_instance ()->preconnect (connections);
+// }
 
-TAO_Stub *
+
+STUB_Object *
 CORBA_ORB::create_stub_object (const TAO_ObjectKey &key,
                                const char *type_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   if (this->open () == -1)
-    ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+    {
+      env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
+      return 0;
+    }
 
-  CORBA::String id = 0;
+  CORBA::String id;
 
   if (type_id)
-    id = CORBA::string_dup (type_id);
+    id = CORBA::string_copy (type_id);
+  else
+    id = 0;
 
-  TAO_Stub *stub = 0;
+  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   // First we create a profile list, well actually a list of one!
   // @@ should go to the acceptor for this, the orb delegates to the acceptor
   // to create Profiles!
+  // We do not use ACE_NEW cause we want to return an exception if this
+  // fails.
+  TAO_IIOP_Profile *pfile =
+      new TAO_IIOP_Profile (orb_core->orb_params ()->host (),
+                            orb_core->orb_params ()->addr ().get_port_number (),
+                            key,
+                            TAO_ORB_Core_instance ()->orb_params ()->addr ());
 
-  // @@ Fred, please change this code to use auto_ptr<> and
-  //    automatically deallocate the temporary objects. Alternatively
-  //    consider about using references ;-)
-  TAO_MProfile mp (1);
+  STUB_Object *data =0;
 
-  TAO_ORB_Parameters *orb_params =
-    this->orb_core_->orb_params ();
+  if ( ! pfile )
+    {
+      env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
+      return 0;
+    }
+  else
+    {
+      // We do not use ACE_NEW_RETURN or ACE_NEW since we need
+      // to dealicate pfile
+      // Plus we want to return an exception.
+      data = new STUB_Object (id, pfile);
 
-  TAO_IIOP_Profile *pfile;
-  ACE_NEW_THROW_EX (pfile,
-                    TAO_IIOP_Profile (orb_params->host (),
-                                      orb_params->addr ().get_port_number (),
-                                      key,
-                                      orb_params->addr ()),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (stub);
+      if (data == 0)
+        env.exception (new CORBA::NO_MEMORY (CORBA::COMPLETED_NO));
 
-  mp.give_profile (pfile);
+    }
 
-  ACE_NEW_THROW_EX (stub,
-                    TAO_Stub (id, mp, this->orb_core_),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-  ACE_CHECK_RETURN (stub);
+  pfile->_decr_refcnt ();
+  // STUB_Object will increment the reference count.
 
-  return stub;
+  return data;
 }
 
 // Create an objref
-
 CORBA::Object_ptr
 CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
                           const char *type_id,
                           CORBA::Environment &env)
 {
-  TAO_Stub *data = this->create_stub_object (key, type_id, env);
-
+  STUB_Object *data = this->create_stub_object (key, type_id, env);
   if (env.exception () != 0)
     return CORBA::Object::_nil ();
 
@@ -1013,23 +885,20 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key,
   if (CORBA::is_nil (new_obj))
     {
       data->_decr_refcnt ();
-      env.exception (new CORBA::INTERNAL ());
+      env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO));
       return CORBA::Object::_nil ();
     }
 
   return new_obj;
 }
 
-// Get access to the leader_follower_info.
-
 TAO_Leader_Follower_Info &
 CORBA_ORB::leader_follower_info (void)
+// get access to the leader_follower_info
 {
   return leader_follower_info_;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // Dynamic Any factory functions.
 
 ACE_INLINE
@@ -1088,39 +957,22 @@ CORBA_ORB::create_dyn_enum      (CORBA_TypeCode_ptr tc,
   return TAO_DynAny_i::create_dyn_enum (tc, env);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-// String utility support; this needs to be integrated with the ORB's
-// own memory allocation subsystem.
+// String utility support; this can need to be integrated with the
+// ORB's own memory allocation subsystem.
 
-CORBA::Char*
+CORBA::String
 CORBA::string_copy (const CORBA::Char *str)
 {
-  return CORBA::string_dup (str);
-}
+  if (!str)
+    return 0;
 
-CORBA_String_var::CORBA_String_var (char *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
+  CORBA::String retval =
+    CORBA::string_alloc (ACE_OS::strlen (str));
 
-CORBA_String_var::CORBA_String_var (const CORBA_String_var& r)
-{
-  this->ptr_ = CORBA::string_dup (r.ptr_);
-}
+  // clear the contents of the allocated string
+  ACE_OS::memset(retval, '\0', ACE_OS::strlen (str));
 
-CORBA_String_var::~CORBA_String_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      CORBA::string_free (this->ptr_);
-      this->ptr_ = 0;
-    }
+  return ACE_OS::strcpy (retval, str);
 }
 
 CORBA_String_var &
@@ -1157,68 +1009,33 @@ CORBA_String_var::operator= (const CORBA_String_var& r)
   return *this;
 }
 
-// ****************************************************************
-
-CORBA_WString_var::CORBA_WString_var (CORBA::WChar *p)
-  : ptr_ (p)
-{
-  // NOTE: According to the CORBA spec this string must *not* be
-  // copied, but it is non-compliant to use it/release it in the
-  // calling code.  argument is consumed. p should never be NULL
-}
-
-CORBA_WString_var::CORBA_WString_var (const CORBA_WString_var& r)
-{
-  this->ptr_ = CORBA::wstring_dup (r.ptr_);
-}
-
-CORBA_WString_var::~CORBA_WString_var (void)
-{
-  if (this->ptr_ != 0)
-    {
-      CORBA::wstring_free (this->ptr_);
-      this->ptr_ = 0;
-    }
-}
+// Wide Character string utility support; this can need to be
+// integrated with the ORB's own memory allocation subsystem.
 
-CORBA_WString_var &
-CORBA_WString_var::operator= (CORBA::WChar *p)
+CORBA::WString
+CORBA::wstring_alloc (CORBA::ULong len)
 {
-  if (this->ptr_ != p)
-    {
-      if (this->ptr_ != 0)
-        CORBA::wstring_free (this->ptr_);
-      this->ptr_ = p;
-    }
-  return *this;
+  return new CORBA::WChar [(size_t) (len + 1)];
 }
 
-CORBA_WString_var &
-CORBA_WString_var::operator= (const CORBA::WChar *p)
+CORBA::WString
+CORBA::wstring_copy (const CORBA::WChar *const str)
 {
-  if (this->ptr_ != 0)
-    CORBA::wstring_free (this->ptr_);
+  if (!str)
+    return 0;
 
-  this->ptr_ = CORBA::wstring_dup (p);
-  return *this;
+  CORBA::WString retval = CORBA::wstring_alloc (ACE_OS::wslen (str));
+  return ACE_OS::wscpy (retval, str);
 }
 
-CORBA_WString_var &
-CORBA_WString_var::operator= (const CORBA_WString_var& r)
+void
+CORBA::wstring_free (CORBA::WChar *const str)
 {
-  if (this != &r)
-    {
-      if (this->ptr_ != 0)
-        CORBA::wstring_free (this->ptr_);
-      this->ptr_ = CORBA::wstring_dup (r.ptr_);
-    }
-  return *this;
+  delete [] str;
 }
 
-// ****************************************************************
-
 void
-CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ORB::init_orb_globals (CORBA::Environment &env)
 {
   ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, tao_mon, *ACE_Static_Object_Lock::instance ()));
 
@@ -1229,55 +1046,23 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV)
     {
       // initialize the system TypeCodes
       TAO_TypeCodes::init ();
-
       // initialize the factory for marshaling
       TAO_Marshal::init ();
-
       // initialize the interpreter
-      TAO_CDR_Interpreter::init ();
-
+      TAO_IIOP_Interpreter::init ();
       // initialize the system exceptions
-      TAO_Exceptions::init (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // Verify some of the basic implementation requirements.  This
-      // test gets optimized away by a decent compiler (or else the
-      // rest of the routine does).
-      //
-      // NOTE:  we still "just" assume that native floating point is
-      // IEEE.
-
-      if (sizeof (CORBA::Short) != 2
-          || sizeof (CORBA::Long) != 4
-          || sizeof (CORBA::LongLong) != 8
-          || sizeof (CORBA::Float) != 4
-          || sizeof (CORBA::Double) != 8
-          || sizeof (CORBA::LongDouble) != 16
-          || sizeof (CORBA::WChar) < 2
-          || sizeof (void *) != ACE_SIZEOF_VOID_P)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s; ERROR: unexpected basic type size; "
-                      "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n"
-                      "please reconfigure TAO\n",
-                      __FILE__,
-                      sizeof (CORBA::Short),
-                      sizeof (CORBA::Long),
-                      sizeof (CORBA::LongLong),
-                      sizeof (CORBA::Float),
-                      sizeof (CORBA::Double),
-                      sizeof (CORBA::LongDouble),
-                      sizeof (CORBA::WChar),
-                      sizeof (void *)));
-
-          ACE_THROW (CORBA::INITIALIZE ());
-        }
+      TAO_Exceptions::init (env);
     }
   CORBA_ORB::orb_init_count_++;
 }
 
 // ORB initialisation, per OMG document 94-9-46.
 //
+// XXX in addition to the "built in" Internet ORB, there will be ORBs
+// @@                                ^^^^^^^^ XXX
+// which are added separately, e.g. through a DLL listed in the
+// registry.  Registry will be used to assign orb names and to
+// establish which is the default.
 
 CORBA::ORB_ptr
 CORBA::ORB_init (int &argc,
@@ -1292,35 +1077,66 @@ CORBA::ORB_ptr
 CORBA::ORB_init (int &argc,
                  char *const *argv,
                  const char * /* orb_name */,
-                 CORBA::Environment &ACE_TRY_ENV)
+                 CORBA::Environment &env)
 {
   // Using ACE_Static_Object_Lock::instance() precludes <ORB_init>
   // from being called within a static object CTOR.
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
                             *ACE_Static_Object_Lock::instance (), 0));
+  // Verify some of the basic implementation requirements.  This test
+  // gets optimized away by a decent compiler (or else the rest of the
+  // routine does).
+  //
+  // NOTE:  we still "just" assume that native floating point is IEEE.
+
+  if (sizeof (CORBA::Short) != 2
+      || sizeof (CORBA::Long) != 4
+      || sizeof (CORBA::LongLong) != 8
+      || sizeof (CORBA::Float) != 4
+      || sizeof (CORBA::Double) != 8
+      || sizeof (CORBA::LongDouble) != 16
+      || sizeof (CORBA::WChar) < 2
+      || sizeof (void *) != ACE_SIZEOF_VOID_P)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s; ERROR: unexpected basic type size; "
+                  "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n"
+                  "please reconfigure TAO\n",
+                  __FILE__,
+                  sizeof (CORBA::Short),
+                  sizeof (CORBA::Long),
+                  sizeof (CORBA::LongLong),
+                  sizeof (CORBA::Float),
+                  sizeof (CORBA::Double),
+                  sizeof (CORBA::LongDouble),
+                  sizeof (CORBA::WChar),
+                  sizeof (void *)));
+
+      env.exception (new CORBA::INITIALIZE (CORBA::COMPLETED_NO));
+      return 0;
+    }
 
   // Get ORB Core
-  // @@ As part of the ORB re-architecture this will the point where
-  //    we locate the right ORB (from a table) and use that one
-  //    instead of just creating a new one every time.
-  TAO_ORB_Core *oc;
-
-  ACE_NEW_RETURN (oc, TAO_ORB_Core, CORBA::ORB::_nil ());
+  TAO_ORB_Core *oc = TAO_ORB_Core_instance ();
 
   // Initialize the ORB Core instance.
   int result = oc->init (argc, (char **) argv);
 
+  env.clear ();
+
+  // Make sure initialization of TAO globals only occurs once.
+  CORBA_ORB::init_orb_globals (env);
+
+  if (env.exception () != 0)
+    return 0;
+
   // Check for errors and return 0 if error.
   if (result == -1)
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (), 0);
+      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
+      return 0;
     }
 
-  // This (init_orb_globals) must come *after* ORB Core initialization.
-  // Make sure initialization of TAO globals only occurs once.
-  CORBA_ORB::init_orb_globals (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
   // @@ We may only want to set this if ORB_init() has 0 argc/argv
   // parameters.
   if (CORBA::instance_ == 0)
@@ -1329,530 +1145,20 @@ CORBA::ORB_init (int &argc,
   return oc->orb ();
 }
 
-// ****************************************************************
-
-// Objref stringification.
-CORBA::String
-CORBA_ORB::object_to_string (CORBA::Object_ptr obj,
-                             CORBA::Environment &env)
-{
-  env.clear ();
-
-  // Application writer controls what kind of objref strings they get,
-  // maybe along with other things, by how they initialize the ORB.
-
-  if (use_omg_ior_format_)
-    {
-      // By default, orbs use IOR strings; these are ugly (and error
-      // prone) but specified by CORBA.
-      //
-      // XXX there should be a simple way to reuse this code in other
-      // ORB implementations ...
-
-      // @@ Is BUFSIZ the right size here?
-      char buf [BUFSIZ];
-      TAO_OutputCDR cdr (buf,
-                         sizeof buf,
-                         TAO_ENCAP_BYTE_ORDER);
-
-      // support limited oref ACE_OS::strcmp.
-      (void) ACE_OS::memset (buf, 0, BUFSIZ);
-
-      // Marshal the objref into an encapsulation bytestream.
-      (void) cdr.write_octet (TAO_ENCAP_BYTE_ORDER);
-      if ((cdr << obj) == 0)
-        return 0;
-
-      // Now hexify the encapsulated CDR data into a string, and
-      // return that string.
-
-      CORBA::String cp;
-      size_t len = cdr.length ();
-
-      CORBA::String string;
-      ACE_ALLOCATOR_RETURN (string,
-                            CORBA::string_alloc (sizeof ior_prefix + 2 * len),
-                            0);
-
-      ACE_OS::strcpy ((char *) string,
-                      ior_prefix);
-
-      const char *bytes = cdr.buffer ();
-
-      for (cp = (CORBA::String) ACE_OS::strchr ((char *) string, ':') + 1;
-           len--;
-           bytes++)
-        {
-          *cp++ = ACE::nibble2hex ((*bytes) >> 4);
-          *cp++ = ACE::nibble2hex (*bytes);
-        }
-
-      *cp = 0;
-      return string;
-    }
-  else
-    {
-      // The "internet" ORB uses readable URL style objrefs, as used
-      // in the World Wide Web.
-      //
-      // This only works for IIOP objrefs.  If we're handed an objref
-      // that's not an IIOP objref, fail -- application must use an
-      // ORB that's configured differently.  @@ Is this true? FRED
-
-      if (obj->_stubobj () == 0)
-        return CORBA::string_copy ((CORBA::String) TAO_IIOP_Profile::prefix ());
-        // @@ This should be some sort of default prefix, not
-        // hardcoded to IIOP!! FRED
-
-      CORBA::String buf =
-        obj->_stubobj ()->profile_in_use ()->to_string (env);
-      return buf;
-    }
-}
-
-// Destringify arbitrary objrefs.  This method is called from
-// <resolve_name_service> with an IOR <multicast_to_service>.
-
-CORBA::Object_ptr
-CORBA_ORB::string_to_object (const char *str,
-                             CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  // Use the prefix code to choose which destringify algorithm to use.
-  const size_t iiop_prefix_len =
-    ACE_OS::strlen (TAO_IIOP_Profile::prefix ());
-  if (ACE_OS::strncmp (str,
-                       TAO_IIOP_Profile::prefix (),
-                       iiop_prefix_len) == 0)
-    obj = this->iiop_string_to_object (str + iiop_prefix_len,
-                                       ACE_TRY_ENV);
-
-  else if (ACE_OS::strncmp (str,
-                            file_prefix,
-                            sizeof file_prefix - 1) == 0)
-    obj = this->file_string_to_object (str + sizeof file_prefix -1,
-                                       ACE_TRY_ENV);
-
-  else if (ACE_OS::strncmp (str,
-                            ior_prefix,
-                            sizeof ior_prefix - 1) == 0)
-    obj = this->ior_string_to_object (str + sizeof ior_prefix - 1,
-                                      ACE_TRY_ENV);
-
-  else if (ACE_OS::strncmp (str,
-                            iioploc_prefix,
-                            sizeof iioploc_prefix - 1) == 0)
-    obj = this->iioploc_string_to_object (str + sizeof iioploc_prefix - 1,
-                                          ACE_TRY_ENV);
-
-  return obj;
-}
-
-// ****************************************************************
-
-// Destringify OMG-specified "IOR" string.
-//
-// XXX there should be a simple way to reuse this code in other ORB
-// implementations ...
-
-CORBA::Object_ptr
-CORBA_ORB::ior_string_to_object (const char *str,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // Unhex the bytes, and make a CDR deencapsulation stream from the
-  // resulting data.
-  ACE_Message_Block mb (ACE_OS::strlen ((char *) str) / 2 + 1
-                        + ACE_CDR::MAX_ALIGNMENT + 1);
-
-  ACE_CDR::mb_align (&mb);
-
-  char *buffer = mb.rd_ptr ();
-
-  const char *tmp = str;
-  size_t len = 0;
-
-  while (tmp [0] && tmp [1])
-    {
-      u_char byte;
-
-      if (!(isxdigit (tmp [0]) && isxdigit (tmp [1])))
-        break;
-
-      byte = (u_char) (ACE::hex2byte (tmp [0]) << 4);
-      byte |= ACE::hex2byte (tmp [1]);
-
-      buffer [len++] = byte;
-      tmp += 2;
-    }
-
-  if (tmp [0] && !isspace (tmp [0]))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create deencapsulation stream ... then unmarshal objref from that
-  // stream.
-
-  int byte_order = *(mb.rd_ptr ());
-  mb.rd_ptr (1);
-  mb.wr_ptr (len);
-  TAO_InputCDR stream (&mb, byte_order, this->orb_core_);
-
-  CORBA::Object_ptr objref = CORBA::Object::_nil ();
-  stream >> objref;
-
-  return objref;
-}
-
-// Destringify URL style IIOP objref.
-CORBA::Object_ptr
-CORBA_ORB::iiop_string_to_object (const char *string,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // NIL objref encodes as just "iiop:" ... which has already been
-  // removed, so we see it as an empty string.
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  if (!string || !*string)
-    return obj;
-
-  // type ID not encoded in this string ... makes narrowing rather
-  // expensive, though it does ensure that type-safe narrowing code
-  // gets thoroughly excercised/debugged!  Without a typeID, the
-  // _narrow will be required to make an expensive remote "is_a" call.
-
-  // Allocate a Multiple Profile with the given no. of profiles.
-  TAO_MProfile mp (1);
-
-  TAO_Profile* pfile;
-  ACE_NEW_RETURN (pfile,
-                  TAO_IIOP_Profile (string, ACE_TRY_ENV),
-                  obj);
-  ACE_CHECK_RETURN (obj);
-  // pfile refcount == 1
-
-  mp.give_profile (pfile);
-
-  // Now make the TAO_Stub ...
-  TAO_Stub *data;
-  ACE_NEW_RETURN (data,
-                  TAO_Stub ((char *) 0, mp, this->orb_core_),
-                  obj);
-  // pfile refcount == 2
-
-  // Create the CORBA level proxy.
-  TAO_ServantBase *servant =
-    this->_get_collocated_servant (data);
-
-  ACE_NEW_RETURN (obj,
-                  CORBA_Object (data,
-                                servant,
-                                servant != 0),
-                  obj);
-
-  // Set the ref_count on data to 1, which is correct, because only
-  // obj has now a reference to it.
-  // data->_decr_refcnt ();
-
-  return obj;
-}
-
-// DeStringifies the iioploc style IORs. This function creates a Stub
-// object with multiple profiles and then the object reference.
-CORBA::Object_ptr
-CORBA_ORB::iioploc_string_to_object (const char *string,
-                                     CORBA::Environment &env)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO (%P|%t) - iioploc_string_to_object <%s>\n",
-                string));
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  // NIL objref encodes as just "iioploc:" ... which has already been
-  // removed, so we see it as an empty string.
-
-  if (!string || !*string)
-    return CORBA::Object::_nil ();
-
-  // We want to modify list_of_profiles.
-  char *list_of_profiles = ACE_OS::strdup (string);
-
-  // Count the No. of profiles in the given list.
-  int profile_count = 1;
-
-  for (size_t i = 0;
-       i < ACE_OS::strlen (list_of_profiles);
-       i++)
-    {
-      if (*(list_of_profiles + i) == ',')
-        profile_count++;
-    }
-
-  TAO_MProfile mp (profile_count);
-
-  // Extract the comma separated profiles in the list and
-  // populate the Multiple Profile.
-  TAO_IIOP_Profile *pfile;
-  char *lasts = 0;
-
-  for (char *str = ACE_OS::strtok_r (list_of_profiles, ",", &lasts);
-       str != 0 ;
-       str = ACE_OS::strtok_r (0, ",",&lasts))
-
-    {
-      ACE_NEW_RETURN (pfile,
-                      TAO_IIOP_Profile (str,
-                                        env),
-                      CORBA::Object::_nil ());
-
-      // Give up ownership of the profile.
-      mp.give_profile (pfile);
-    }
-
-  // Dont need the list of profiles any more.
-  ACE_OS::free (list_of_profiles);
-
-  // Now make the TAO_Stub ...
-  TAO_Stub *data;
-  ACE_NEW_RETURN (data,
-                  TAO_Stub ((char *) 0, mp, this->orb_core_),
-                  CORBA::Object::_nil ());
-
-  // Create the CORBA level proxy.
-  TAO_ServantBase *servant =
-    this->_get_collocated_servant (data);
-
-  // This will increase the ref_count on data by one
-  ACE_NEW_RETURN (obj,
-                  CORBA_Object (data,
-                                servant,
-                                servant != 0),
-                  CORBA::Object::_nil ());
-
-  return obj;
-}
-
-CORBA::Object_ptr
-CORBA_ORB::file_string_to_object (const char* filename,
-                                  CORBA::Environment& ACE_TRY_ENV)
-{
-  FILE* file = ACE_OS::fopen (filename, "r");
-
-  if (file == 0)
-    return CORBA::Object::_nil ();
-
-  ACE_Read_Buffer reader (file, 1);
-
-  char* string = reader.read ();
-
-  if (string == 0)
-    return CORBA::Object::_nil ();
-
-  CORBA::Object_ptr object = CORBA::Object::_nil ();
-  ACE_TRY
-    {
-      object = this->string_to_object (string, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      reader.alloc ()->free (string);
-    }
-  ACE_CATCHANY
-    {
-      reader.alloc ()->free (string);
-      ACE_RETHROW;
-    }
-  ACE_ENDTRY;
-
-  return object;
-}
-
-// ****************************************************************
-
-TAO_ServantBase *
-CORBA_ORB::_get_collocated_servant (TAO_Stub *sobj)
-{
-  // ACE_DEBUG ((LM_DEBUG, "CORBA_ORB: get_collocated_servant\n"));
-
-  if (this->optimize_collocation_objects_ && sobj != 0)
-    {
-      TAO_Profile *pfile = sobj->profile_in_use ();
-
-      // Make sure users passed in a valid TAO_Stub otherwise, we
-      // don't know what to do next.
-      if (pfile == 0)
-        {
-          // @@ Fred, can you please either keep these debugging
-          // statements in or remove them, but please don't leave the
-          // #if 0's around!
-#if 0
-          ACE_ERROR ((LM_ERROR,
-                      "%p: Passing IIOP ORB and non-IIOP object\n",
-                      "_get_collocated_object"));
-#endif
-          // Something must be wrong!
-          return 0;
-        }
-#if 0
-      ACE_DEBUG ((LM_DEBUG,
-                  "CORBA_ORB: checking collocation for <%s>\n",
-                  pfile->addr_to_string ()));
-#endif
-
-      // @@EXC@@ We should receive the <env> from the command line.
-      // @@ Fred: why do we need an environment for the
-      // Profile::_key() method?
-
-      CORBA::Environment env;
-      TAO_ObjectKey_var objkey = pfile->_key (env);
-
-      if (env.exception ())
-        {
-#if 0
-          ACE_DEBUG ((LM_DEBUG,
-                      "CORBA_ORB: cannot find key for <%s>\n",
-                      pfile->addr_to_string ()));
-#endif
-          return 0;
-        }
-
-      // Check if the object requested is a collocated object.
-      // @@ FRED - can we make this more generic!!
-      // @@ Fred: this is a question that the Acceptor registry must
-      //    answer, in other words: we should go to the connector
-      //    registry with the Stub object and ask if that object is
-      //    collocated or not.  Then we simply lookup in the POA to
-      //    find the servant.
-      //    How does the Acceptor Registry answer the question:
-      //    - For each profile in the Stub it iterates over the
-      //      acceptors, if the profile and the acceptor have the same
-      //      protocol then we pass the profile to the acceptor.
-      //    - The acceptor downcast the profile, the derived class
-      //      contains a method that returns the address in the
-      //      favourite format for that protocol (i.e. this is not a
-      //      method of the base class); it uses that address to match
-      //      with the addresses it is accepting on.
-      //    - A policy question: do we return when the first acceptor
-      //      matches or if they all match?
-      //      Before answering: "only when they all match" think about
-      //      a server that is restarted with more endpoints (or
-      //      less), shouldn't old, persistent IORs, still be treated
-      //      as collocated?
-      TAO_Object_Adapter *object_adapter = 0;
-      if (pfile->tag () == TAO_IOP_TAG_INTERNET_IOP)
-        {
-          const ACE_INET_Addr &addr =
-            ACE_dynamic_cast (TAO_IIOP_Profile *, pfile)->object_addr ();
-
-          object_adapter = this->orb_core_->get_collocated_object_adapter (addr);
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "get_collocated_poa NOT Supported for NON-IIOP profile!\n"));
-
-      if (object_adapter != 0)
-        {
-          PortableServer::Servant servant =
-            object_adapter->find_servant (objkey.in (), env);
-          if (env.exception ())
-            {
-#if 0
-              ACE_DEBUG ((LM_DEBUG,
-                          "CORBA_ORB: cannot find servant for <%s>\n",
-                          pfile->addr_to_string ()));
-#endif
-              return 0;
-            }
-
-#if 0
-          ACE_DEBUG ((LM_DEBUG,
-                      "CORBA_ORB: object at <%s> is collocated\n",
-                      pfile->addr_to_string ()));
-#endif
-          return servant;
-        }
-    }
-
-#if 0
-  ACE_DEBUG ((LM_DEBUG,
-              "CORBA_ORB: collocation failed for \n"));
-#endif
-
-  return 0;
-}
-
-// ****************************************************************
-
-// Add a mapping ObjectID->IOR to the table.
-int
-CORBA_ORB::_tao_add_to_IOR_table (ACE_CString &object_id,
-                                  CORBA::Object_ptr obj)
-{
-  if (CORBA::is_nil (obj))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to add IOR to table\n"),
-                      -1);
-
-  CORBA::String_var string =
-    this->object_to_string (obj);
-
-  if (string.in () == 0 || string.in ()[0] == '\0')
-    return -1;
-
-  ACE_CString ior (string.in ());
-
-  if (this->lookup_table_.add_ior (object_id, ior) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to add IOR to table\n"),
-                      -1);
-
-  return 0;
-}
-
-// Find an IOR in the table for the given ObjectID.
-int
-CORBA_ORB::_tao_find_in_IOR_table (ACE_CString &object_id,
-                                   CORBA::Object_ptr &obj)
-{
-  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)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "No match for the given ObjectID\n"),
-                      -1);
-
-  obj = this->string_to_object (ior.c_str ());
-
-  return 0;
-}
-
-// ****************************************************************
-
 CORBA::ORB_ptr
 CORBA::instance (void)
 {
+  ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
+                            *ACE_Static_Object_Lock::instance (), 0));
   if (CORBA::instance_ == 0)
     {
-      ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard,
-                                *ACE_Static_Object_Lock::instance (), 0));
-      if (CORBA::instance_ == 0)
-        {
-          int argc = 0;
-          char *const *argv = 0;
-
-          // Note that CORBA::ORB_init() will also acquire the static
-          // lock, but that's ok since it's a recursive lock.
-          CORBA::Environment ACE_TRY_ENV;
-          CORBA::instance_ = CORBA::ORB_init (argc, argv, "",
-                                              ACE_TRY_ENV);
-        }
+      int argc = 0;
+      char *const *argv = 0;
+      // Note that CORBA::ORB_init() will also acquire the static
+      // lock, but that's ok since it's a recursive lock.
+      CORBA::instance_ = CORBA::ORB_init (argc, argv);
     }
+
   return CORBA::instance_;
 }
 
@@ -1899,74 +1205,6 @@ operator>>(TAO_InputCDR& cdr, TAO_opaque& x)
   return cdr.good_bit ();
 }
 
-// *************************************************************
-// Valuetype factory operations
-// *************************************************************
-
-#ifdef TAO_HAS_VALUETYPE
-
-CORBA::ValueFactory_ptr
-CORBA_ORB::register_value_factory (
-                            const char *repository_id,
-                            CORBA::ValueFactory_ptr factory,
-                            CORBA_Environment &ACE_TRY_ENV)
-{
-// %! guard, and ACE_Null_Mutex in the map
-// do _add_ref here not in map->rebind
-
-  if (valuetype_factory_map_ == 0)
-    {
-      // currently the ValueFactory_Map is a singleton and not per ORB
-      // as in the OMG specs
-      valuetype_factory_map_ = TAO_VALUEFACTORY_MAP::instance ();
-      if (valuetype_factory_map_ == 0)
-        ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  int result = valuetype_factory_map_->rebind (repository_id, factory);
-  if (result == -1)
-    {
-      // Error on bind.
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-  if (result == 1)
-    {
-      return factory;    // previous factory was found
-    }
-  return 0;
-}
-
-void
-CORBA_ORB::unregister_value_factory (const char * repository_id,
-                                     CORBA_Environment &ACE_TRY_ENV)
-{
-  ACE_ERROR((LM_ERROR, "(%N:%l) function not implemented\n"));
-  // %! TODO
-}
-
-CORBA::ValueFactory_ptr
-CORBA_ORB::lookup_value_factory (const char *repository_id,
-                                 CORBA_Environment &ACE_TRY_ENV)
-{
-// %! guard
-// do _add_ref here not in map->find
-  if (valuetype_factory_map_)
-    {
-      CORBA::ValueFactory_ptr factory;
-      int result = valuetype_factory_map_->find (repository_id, factory);
-      if (result == -1)
-        factory = 0;  // %! raise exception !
-      return factory;
-    }
-  else
-    {
-      return 0; // %! raise exception !
-    }
-}
-
-#endif /* TAO_HAS_VALUETYPE */
-
-
 // ****************************************************************
 
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR, TAO_Cached_Connector_Lock>
@@ -1982,6 +1220,7 @@ template class ACE_Dynamic_Service<TAO_Server_Strategy_Factory>;
 template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
 template class CACHED_CONNECT_STRATEGY;
 template class ACE_Guard<TAO_Cached_Connector_Lock>;
+template class ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>;
 template class ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *>;
 template class ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
 template class ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>;
@@ -2000,9 +1239,6 @@ template class ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Cli
 template class ACE_Hash_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>;
 template class ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>;
 
-template class ACE_Unbounded_Set<ACE_INET_Addr>;
-template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #if !defined (TAO_NO_COPY_OCTET_SEQUENCES)
@@ -2013,6 +1249,7 @@ template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
 #pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
 #pragma instantiate CACHED_CONNECT_STRATEGY
 #pragma instantiate ACE_Guard<TAO_Cached_Connector_Lock>
+#pragma instantiate ACE_Atomic_Op<ACE_SYNCH_MUTEX, u_int>
 #pragma instantiate ACE_Hash_Map_Entry<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *>
 #pragma instantiate ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>
 #pragma instantiate ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>
@@ -2030,8 +1267,4 @@ template class ACE_Unbounded_Set_Iterator<ACE_INET_Addr>;
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_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_Client_Connection_Handler *, ACE_SYNCH_NULL_MUTEX>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDR, TAO_Client_Connection_Handler *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDR>, ACE_SYNCH_NULL_MUTEX>
-
-#pragma instantiate ACE_Unbounded_Set<ACE_INET_Addr>
-#pragma instantiate ACE_Unbounded_Set_Iterator<ACE_INET_Addr>
-
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 4fde0587760..1b11bcc712e 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -22,8 +22,6 @@
 
 #include "tao/corbafwd.h"
 #include "tao/Exception.h"
-#include "tao/IOR_LookupTable.h"
-#include "tao/Services.h"
 
 typedef enum
 {
@@ -31,7 +29,6 @@ typedef enum
   TAO_SERVICEID_TRADINGSERVICE
 } TAO_Service_ID;
 
-
 // @@ NW: Disable messing with the alignment for now.
 // For some reason, PC compilers don't implement "natural" alignment,
 // but only use fixed alignment policies.  The following #pragmas
@@ -71,17 +68,6 @@ class TAO_ORB_Parameters;
 class TAO_InputCDR;
 class TAO_OutputCDR;
 
-// Forward declaration and typedefs for the exception thrown by
-// the ORB Dynamic Any factory functions.
-class CORBA_ORB_InconsistentTypeCode;
-typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
-typedef CORBA_ORB_InconsistentTypeCode *InconsistentTypeCode_ptr;
-
-#ifdef TAO_HAS_VALUETYPE
-class TAO_ValueFactory_Map;
-#endif /* TAO_HAS_VALUETYPE */
-
-
 // The new (POA) base class for servants.
 class TAO_ServantBase;
 
@@ -89,19 +75,19 @@ typedef struct TAO_Leader_Follower_Info_Struct
 {
   ACE_SYNCH_MUTEX leader_follower_lock_;
   // do protect the access to the following three members
-
+  
   ACE_Unbounded_Set<ACE_SYNCH_CONDITION *> follower_set_;
   // keep a set of followers around (protected)
 
   int leaders_;
   // 0 if no leader is around, 1 if there is a leader
   // > 1 if we do nested upcalls (protected)
-
+  
   ACE_thread_t leader_thread_ID_;
   // thread ID of the leader thread (protected)
 } TAO_Leader_Follower_Info;
 
-class TAO_Stub;
+class STUB_Object;
 // Forward declarations.
 
 class TAO_Export CORBA_String_var
@@ -206,115 +192,6 @@ private:
   void operator= (const CORBA_String_var &);
 };
 
-// ****************************************************************
-
-class TAO_Export CORBA_WString_var
-{
-  // = TITLE
-  //   CORBA_WString var class. Provides automatic deallocation of
-  //   storage for wide strings
-  //
-public:
-  CORBA_WString_var (void);
-  // default constructor.
-
-  CORBA_WString_var (CORBA::WChar *p);
-  // constructor, owns p.
-
-  CORBA_WString_var (const CORBA::WChar *p);
-  // constructor. Makes a copy of p.
-
-  CORBA_WString_var (const CORBA_WString_var &s);
-  // copy constructor.
-
-  ~CORBA_WString_var (void);
-  // destructor.
-
-  CORBA_WString_var &operator= (CORBA::WChar *p);
-  // assignment operator.
-
-  CORBA_WString_var &operator= (const CORBA::WChar *p);
-  // assignment to a const char*.  Makes a copy.
-
-  CORBA_WString_var &operator= (const CORBA_WString_var &s);
-  // assignment operator.
-
-  operator CORBA::WChar *();
-  // access and modify.
-
-  operator const CORBA::WChar *() const;
-  // only read privileges.
-
-  CORBA::WChar &operator[] (CORBA::ULong index);
-  // allows access and modification using an index.
-
-  CORBA::WChar operator[] (CORBA::ULong index) const;
-  // allows only accessing thru an index.
-
-    // = in, out, out, and _retn operations.
-    // ORBOS/97-05-15, Appendix C.2
-
-  const CORBA::WChar *in (void) const;
-  // for in parameter.
-
-  CORBA::WChar *&inout (void);
-  // for inout parameter.
-
-  CORBA::WChar *&out (void);
-  // for out parameter.
-
-  CORBA::WChar *_retn (void);
-  // for string of return type.
-
-private:
-  CORBA::WChar *ptr_;
-  // instance.
-};
-
-class TAO_Export CORBA_WString_out
-{
-  // = TITLE
-  //   CORBA_WString_out
-  //
-  // = DESCRIPTION
-  //   To support the memory management for "out" parameter passing
-  //   mode.  ORBOS/97-05-15, Appendix C.2 defines a CORBA_WString_out
-  //   class
-  //
-public:
-  // = operations.
-
-  CORBA_WString_out (CORBA::WChar *&p);
-  // Construction from a reference to a string.
-
-  CORBA_WString_out (CORBA_WString_var &p);
-  // Construction from a var.
-
-  CORBA_WString_out (const CORBA_WString_out &s);
-  // Copy constructor.
-
-  CORBA_WString_out &operator= (const CORBA_WString_out &s);
-  // Assignment from a string_out.
-
-  CORBA_WString_out &operator= (CORBA::WChar *p);
-  // Assignment from a string.
-
-  operator CORBA::WChar *&();
-  // Cast.
-
-  CORBA::WChar *&ptr (void);
-  // Return underlying instance.
-
-private:
-  CORBA::WChar *&ptr_;
-  // Instance.
-
-  // assignment from _var disallowed
-  void operator= (const CORBA_WString_var &);
-};
-
-// ****************************************************************
-
 class TAO_Export CORBA_ORB
 {
   // = TITLE
@@ -333,7 +210,6 @@ public:
 
   // ORB_Core has special privileges
   friend class TAO_ORB_Core;
-  friend TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
 
   class TAO_Export InvalidName : public CORBA_UserException
   {
@@ -345,17 +221,6 @@ public:
     virtual int _is_a (const char* interface_id) const;
   };
 
-  typedef char *ObjectId;
-  typedef CORBA::String_var ObjectId_var;
-  typedef CORBA::String_out ObjectId_out;
-  static CORBA::TypeCode_ptr _tc_ObjectId;
-
-  typedef CORBA_ORB_ObjectIdList ObjectIdList;
-  typedef CORBA_ORB_ObjectIdList_var ObjectIdList_var;
-  typedef CORBA_ORB_ObjectIdList_out ObjectIdList_out;
-  typedef CORBA_ORB_ObjectIdList *ObjectIdList_ptr;
-  static CORBA::TypeCode_ptr _tc_ObjectIdList;
-
   static CORBA::ORB_ptr _duplicate (CORBA::ORB_ptr orb);
   // Return a duplicate of <{orb}>.  When work with this duplicate is
   // complete, it should be freed up using <CORBA::release()>.
@@ -364,96 +229,27 @@ public:
   // Returns a pointer to a nil ORB, i.e., an non-existent ORB.  This
   // can be used for initialization or in comparisons.
 
-  virtual CORBA::Object_ptr string_to_object (
-                                              const char *str,
-                                              CORBA_Environment &ACE_TRY_ENV =
-                                              CORBA::default_environment ());
+  virtual CORBA::Object_ptr string_to_object (const char *str,
+                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Turn a string-ified object reference back into an object pointer.
-  // Typically these strings are created using <object_to_string()>,
-  // but not necessarily locally.
-
-  virtual CORBA::String object_to_string (
-                                          CORBA::Object_ptr obj,
-                                          CORBA_Environment &ACE_TRY_ENV =
-                                          CORBA::default_environment ());
+  // Each type of ORB, e.g. an IIOP ORB, must implement this.
+  // Typically these strings are created using <object_to_string()>.
+  virtual CORBA::String object_to_string (CORBA::Object_ptr obj,
+                                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Turn an object reference into a string.  Each type of ORB,
   // e.g. an IIOP ORB, must implement this.  This can be used by
   // servers to publish their whereabouts to clients.  The output of
   // this is typically eventually given to <string_to_object()> as an
   // argument.
 
-
-#ifdef TAO_HAS_VALUETYPE
-  // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
-  CORBA::ValueFactory_ptr register_value_factory (
-                                                  const char *repository_id,
-                                                  CORBA::ValueFactory_ptr factory,
-                                                  CORBA_Environment &ACE_TRY_ENV =
-                                                  CORBA::default_environment () );
-  void unregister_value_factory (const char * repository_id,
-                                 CORBA_Environment &ACE_TRY_ENV =
-                                 CORBA::default_environment () );
-  CORBA::ValueFactory_ptr lookup_value_factory (const char *repository_id,
-                                                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment () );
-#endif /* TAO_HAS_VALUETYPE */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // Typedefs for CORBA_ORB_RequestSeq,
-  // which is an argument of send_multiple_requests_*().
-  // See Request.{h,i,cpp} for definitions.
-  typedef CORBA_ORB_RequestSeq RequestSeq;
-  typedef CORBA_ORB_RequestSeq_ptr RequestSeq_ptr;
-  typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
-  typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
+  virtual TAO_ServantBase *_get_collocated_servant (STUB_Object *p) = 0;
+  // Return the object pointer of an collocated object it there is
+  // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
+  // must implement this and determine what is a collocated object
+  // based on information provided in the STUB_Object.
 
   void create_list (CORBA::Long count,
-                    CORBA::NVList_ptr &new_list,
-                    CORBA_Environment &ACE_TRY_ENV =
-                    CORBA::default_environment ());
-
-  // The following are not implemented and just throw
-  // CORBA::NO_IMPLEMENT.
-
-  void create_named_value (CORBA::NamedValue_ptr &nmval,
-                           CORBA_Environment &ACE_TRY_ENV =
-                           CORBA::default_environment ());
-
-  void create_exception_list (CORBA::ExceptionList_ptr &exclist,
-                              CORBA_Environment &ACE_TRY_ENV =
-                              CORBA::default_environment ());
-
-  void create_context_list (CORBA::ContextList_ptr &ctxtlist,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            CORBA::default_environment ());
-
-  void get_default_context (CORBA::Context_ptr &ctx,
-                            CORBA_Environment &ACE_TRY_ENV =
-                            CORBA::default_environment ());
-
-  void create_environment (CORBA::Environment_ptr &new_env,
-                           CORBA_Environment &ACE_TRY_ENV =
-                           CORBA::default_environment ());
-
-  CORBA::Boolean get_service_information (CORBA::ServiceType service_type,
-                                          CORBA::ServiceInformation_out service_information,
-                                          CORBA::Environment &ACE_TRY_ENV =
-                                          CORBA::default_environment ());
-
-  void send_multiple_requests_oneway (const CORBA_ORB_RequestSeq req,
-                                      CORBA_Environment &ACE_TRY_ENV =
-                                      CORBA::default_environment ());
-
-  void send_multiple_requests_deferred (const CORBA_ORB_RequestSeq req,
-                                        CORBA_Environment &ACE_TRY_ENV =
-                                        CORBA::default_environment ());
-
-  void get_next_response (CORBA_Request_ptr &req,
-                          CORBA_Environment &ACE_TRY_ENV =
-                          CORBA::default_environment ());
-
-  CORBA::Boolean poll_next_response (CORBA_Environment &ACE_TRY_ENV =
-                                     CORBA::default_environment ());
+                    CORBA::NVList_ptr &retval);
 
   // = New Things from the POA Specification
   //
@@ -462,42 +258,17 @@ public:
   // than is currently available.
 
   CORBA::Boolean work_pending (void);
-  // Returns an indication of whether the ORB needs to perform some
-  // work.
+  // Returns an indication of whether the ORB needs the <{main thread}> to
+  // perform some work.
 
   int perform_work (const ACE_Time_Value & = ACE_Time_Value::zero);
-  // This operation performs an implementation-defined unit of
-  // work. Note that the default behavior is not to block; this
-  // behavior can be modified by passing an appropriate
-  // <ACE_Time_Value>.
-
-  // Typecode for the above exception.
-  static CORBA::TypeCode_ptr _tc_InconsistentTypeCode;
-
-  // Dynamic Any factory functions.
-  // @@EXC@@ Add the ACE_THROW_SPEC for these functions...
-
-  CORBA_DynAny_ptr       create_dyn_any       (const CORBA_Any& any,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynAny_ptr       create_basic_dyn_any (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynStruct_ptr    create_dyn_struct    (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynSequence_ptr  create_dyn_sequence  (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynArray_ptr     create_dyn_array     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynUnion_ptr     create_dyn_union     (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-
-  CORBA_DynEnum_ptr      create_dyn_enum      (CORBA_TypeCode_ptr tc,
-                                               CORBA::Environment &TAO_IN_ENV);
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  // If called by the <{main thread}>, this operation performs an
+  // implementation-defined unit of work. Otherwise, it does nothing.
+  // Note that the default behavior is not to block; this behavior can
+  // be modified by passing an appropriate <ACE_Time_Value>.
+  //
+  // It is platform-specific how the application and ORB arrange to
+  // use compatible threading primitives.
 
   int run (void);
   int run (ACE_Time_Value &tv);
@@ -520,16 +291,12 @@ public:
   // has completed.  <[NOTE]> <wait_for_completion>=TRUE is not
   // currently supported.
 
-  // @@EXC@@ Add the ACE_THROW_SPEC for these two functions
+  CORBA_Object_ptr resolve_initial_references (CORBA::String name,
+                                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA_Object_ptr resolve_initial_references (const char *name,
-                                               CORBA_Environment &TAO_IN_ENV =
-                                               CORBA::default_environment ());
-
-  CORBA_Object_ptr resolve_initial_references (const char *name,
+  CORBA_Object_ptr resolve_initial_references (CORBA::String name,
                                                ACE_Time_Value *timeout,
-                                               CORBA_Environment &TAO_IN_ENV =
-                                               CORBA::default_environment ());
+                                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This method acts as a mini-bootstrapping Naming Service, which is
   // provided by the ORB for certain well-known object references.
   // TAO supports the "NameService", "TradingService", "RootPOA", and
@@ -543,35 +310,16 @@ public:
   // will remains compliant with the CORBA
   // <resolve_initial_references> specification.
 
-  // Unimplemented function - throws CORBA::NO_IMPLEMENT.
-  CORBA_ORB_ObjectIdList_ptr list_initial_services (CORBA_Environment &TAO_IN_ENV =
-                                                    CORBA::default_environment ());
-
   // = TAO-specific extensions to the CORBA specification.
 
-  virtual TAO_ServantBase *_get_collocated_servant (TAO_Stub *p);
-  // Return the object pointer of an collocated object it there is
-  // one, otherwise, return 0.  Each type of ORB, e. g., IIOP ORB,
-  // must implement this and determine what is a collocated object
-  // based on information provided in the TAO_Stub.
-
-  virtual int _tao_add_to_IOR_table (ACE_CString &object_id,
-                                     CORBA::Object_ptr obj);
-  // Add a mapping ObjectID->IOR to the table.
-
-  virtual int _tao_find_in_IOR_table (ACE_CString &object_id,
-                                      CORBA::Object_ptr &obj);
-  // Find the given ObjectID in the table.
-
-  CORBA_Object_ptr resolve_root_poa (CORBA_Environment &TAO_IN_ENV,
-                                     const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
+  CORBA_Object_ptr resolve_root_poa (const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
                                      TAO_POA_Manager *poa_manager = 0,
                                      const TAO_POA_Policies *policies = 0);
   // Resolve the POA.
 
-  TAO_Stub *create_stub_object (const TAO_ObjectKey &key,
-                                const char *type_id,
-                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  STUB_Object *create_stub_object (const TAO_ObjectKey &key,
+                                   const char *type_id,
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Makes sure that the ORB is open and then creates an IIOP object
   // based on the endpoint.
 
@@ -622,88 +370,73 @@ public:
   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);
-  // Get the IOR flag.
+  // Forward declaration and typedefs for the exception thrown by
+  // the ORB Dynamic Any factory functions.
+  class CORBA_ORB_InconsistentTypeCode;
+  typedef CORBA_ORB_InconsistentTypeCode InconsistentTypeCode;
+  typedef CORBA_ORB_InconsistentTypeCode *InconsistentTypeCode_ptr;
+
+  // Typecode for the above exception.
+  static CORBA::TypeCode_ptr _tc_InconsistentTypeCode;
+
+  // Dynamic Any factory functions.
+
+  CORBA_DynAny_ptr       create_dyn_any       (const CORBA_Any& any,
+                                               CORBA::Environment &TAO_IN_ENV);
+
+  CORBA_DynAny_ptr       create_basic_dyn_any (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
+
+  CORBA_DynStruct_ptr    create_dyn_struct    (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
+
+  CORBA_DynSequence_ptr  create_dyn_sequence  (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
 
-  void _optimize_collocation_objects (CORBA::Boolean opt);
-  // Set collocation optimization status.
-  CORBA::Boolean _optimize_collocation_objects (void);
-  // Get collocation optimization status.
+  CORBA_DynArray_ptr     create_dyn_array     (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
 
-  TAO_ORB_Core *orb_core (void) const;
-  // Get the ORB core.
+  CORBA_DynUnion_ptr     create_dyn_union     (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ORB_ptr _ptr_type;
-  typedef CORBA_ORB_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
+  CORBA_DynEnum_ptr      create_dyn_enum      (CORBA_TypeCode_ptr tc,
+                                               CORBA::Environment &TAO_IN_ENV);
 
 protected:
   // We must be created via the <ORB_init> call.
-  CORBA_ORB (TAO_ORB_Core *orb_core);
+  CORBA_ORB (void);
   virtual ~CORBA_ORB (void);
 
-  CORBA_Object_ptr resolve_poa_current (CORBA_Environment &TAO_IN_ENV);
+  CORBA_Object_ptr resolve_poa_current (void);
   // Resolve the POA current.
 
-  CORBA_Object_ptr resolve_policy_manager (CORBA::Environment&);
-  // Resolve the Policy Manager for this ORB.
-  CORBA_Object_ptr resolve_policy_current (CORBA::Environment&);
-  // Resolve the Policy Current for this thread.
-
   int run (ACE_Time_Value *tv,
            int break_on_timeouts);
   // Implements the run routine
 
 private:
 
-  CORBA_Object_ptr resolve_service (const char* service_name,
-                                    ACE_Time_Value *timeout,
-                                    CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the service name.
+  CORBA_Object_ptr resolve_commandline_ref (const char *& init_ref);
+  // Resolve the Initial reference according to the commandline
+  // option -ORBInitRef <ObjectID>:<IOR>
 
-  CORBA_Object_ptr resolve_trading_service (ACE_Time_Value *timeout,
-                                            CORBA::Environment& ACE_TRY_ENV);
-  // Resolve the trading object reference.
+  CORBA_Object_ptr resolve_name_service (ACE_Time_Value *timeout);
+  // Resolve the name service object reference.
 
-  int multicast_query (char *buf,
-                       const char *service_name,
-                       u_short port,
-                       ACE_Time_Value *timeout);
+  CORBA_Object_ptr resolve_trading_service (ACE_Time_Value *timeout);
+  // Resolve the trading object reference.
 
+  char *multicast_query (TAO_Service_ID service_id,
+                         u_short port,
+                         ACE_Time_Value *timeout);
   // returns and IOR string, the client is responsible for freeing
   // memory!
 
-  CORBA_Object_ptr multicast_to_service (const char *service_name,
+  CORBA_Object_ptr multicast_to_service (TAO_Service_ID service_id,
                                          u_short port,
-                                         ACE_Time_Value *timeout,
-                                         CORBA::Environment& ACE_TRY_ENV);
+                                         ACE_Time_Value *timeout);
   // Resolve the refernce of a service of type <name>.
 
-  CORBA::Object_ptr file_string_to_object (const char* filename,
-                                           CORBA::Environment& env);
-  // Read an IOR from a file and then parse it, returning the object
-  // reference.
-
-  CORBA::Object_ptr iiop_string_to_object (const char* url,
-                                           CORBA::Environment& env);
-  // Read an IOR from a file and then parse it, returning the object
-  // reference.
-
-  CORBA::Object_ptr ior_string_to_object (const char* ior,
-                                          CORBA::Environment& env);
-  // Read an IOR from a file and then parse it, returning the object
-  // reference.
-
-  CORBA::Object_ptr iioploc_string_to_object (const char* string,
-                                              CORBA::Environment& env);
-  // Read an IOR from a file and then parse it, returning the object
-  // reference.
-
-private:
   ACE_SYNCH_MUTEX lock_;
   // lock required for mutual exclusion between multiple threads.
 
@@ -750,23 +483,6 @@ private:
   TAO_Leader_Follower_Info  leader_follower_info_;
   // Information about the leader follower model
 
-  TAO_ORB_Core *orb_core_;
-  // The ORB_Core that created us....
-
-#ifdef TAO_HAS_VALUETYPE
-  TAO_ValueFactory_Map *valuetype_factory_map_;
-  // If non-0 then this is the Factory for OBV unmarshaling
-#endif /* TAO_HAS_VALUETYPE */
-
-  TAO_IOR_LookupTable lookup_table_;
-  // Table of ObjectID->IOR mappings.
-
-  CORBA::Boolean use_omg_ior_format_;
-  // Decides whether to use the URL notation or to use IOR notation.
-
-  CORBA::Boolean optimize_collocation_objects_;
-  // Decides whether to use the URL notation or to use IOR notation.
-
   // = NON-PROVIDED METHODS
   CORBA_ORB (const CORBA_ORB &);
   CORBA_ORB &operator= (const CORBA_ORB &);
diff --git a/TAO/tao/ORB.i b/TAO/tao/ORB.i
index f99fd2ee274..4169295ba32 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -1,6 +1,22 @@
 // -*- c++ -*-
 // $Id$
 
+// String utility support.  Since these are static methods we need to
+// explicitly export them from the DLL.
+
+ACE_INLINE TAO_Export CORBA::String
+CORBA::string_alloc (CORBA::ULong len)
+{
+  // Allocate 1 + strlen to accomodate the null terminating character.
+  return new CORBA::Char[size_t (len + 1)];
+}
+
+ACE_INLINE TAO_Export void
+CORBA::string_free (CORBA::Char *str)
+{
+  delete [] str;
+}
+
 // ----------------------------------------------------------------------
 // String_var type
 // ----------------------------------------------------------------------
@@ -13,7 +29,7 @@ CORBA_String_var::CORBA_String_var (void)
 
 ACE_INLINE
 CORBA_String_var::CORBA_String_var (const char *p)
-  : ptr_ (CORBA::string_dup (p))
+  : ptr_ (CORBA::string_dup ((char *) p))
 {
 }
 
@@ -120,129 +136,16 @@ CORBA_String_out::ptr (void)
   return this->ptr_;
 }
 
-// ****************************************************************
-
 // ----------------------------------------------------------------------
-// String_var type
+// Wide strings
 // ----------------------------------------------------------------------
 
-ACE_INLINE
-CORBA_WString_var::CORBA_WString_var (void)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_WString_var::CORBA_WString_var (const CORBA::WChar *p)
-  : ptr_ (CORBA::wstring_dup (p))
+ACE_INLINE TAO_Export CORBA::WString
+CORBA::wstring_dup (const WChar *const str)
 {
+  return CORBA::wstring_copy (str);
 }
 
-ACE_INLINE CORBA::WChar &
-CORBA_WString_var::operator[] (CORBA::ULong index)
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[index];
-}
-
-ACE_INLINE CORBA::WChar
-CORBA_WString_var::operator[] (CORBA::ULong index) const
-{
-  // We need to verify bounds else raise some exception.
-  return this->ptr_[index];
-}
-
-ACE_INLINE
-CORBA_WString_var::operator CORBA::WChar *()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_WString_var::operator const CORBA::WChar *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::WChar *
-CORBA_WString_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_var::out (void)
-{
-  CORBA::wstring_free (this->ptr_);
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *
-CORBA_WString_var::_retn (void)
-{
-  CORBA::WChar *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-// ----------------------------------------------------
-//  String_out type
-// ----------------------------------------------------
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (CORBA::WChar *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (CORBA_WString_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA_WString_out::CORBA_WString_out (const CORBA_WString_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA_WString_out &
-CORBA_WString_out::operator= (const CORBA_WString_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_WString_out &
-CORBA_WString_out::operator= (CORBA::WChar *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_WString_out::operator CORBA::WChar *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::WChar *&
-CORBA_WString_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
 // ---------------------------------------------------------------------------
 //  ORB specific
 // ---------------------------------------------------------------------------
@@ -312,39 +215,16 @@ CORBA::is_nil (CORBA::ORB_ptr obj)
 }
 
 ACE_INLINE CORBA::Boolean
-CORBA_ORB::orb_free_resources (void)
-{
-  return !CORBA_ORB::orb_init_count_;
-}
-
-ACE_INLINE void
-CORBA_ORB::_use_omg_ior_format (CORBA::Boolean ior)
-{
-  this->use_omg_ior_format_ = ior;
-}
-
-ACE_INLINE CORBA::Boolean
-CORBA_ORB::_use_omg_ior_format (void)
-{
-  return this->use_omg_ior_format_;
-}
-
-ACE_INLINE void
-CORBA_ORB::_optimize_collocation_objects (CORBA::Boolean opt)
+CORBA_ORB::work_pending (void)
 {
-  this->optimize_collocation_objects_ = opt;
+  // There's ALWAYS work to do ;-)
+  return 1;
 }
 
 ACE_INLINE CORBA::Boolean
-CORBA_ORB::_optimize_collocation_objects (void)
-{
-  return this->optimize_collocation_objects_;
-}
-
-ACE_INLINE TAO_ORB_Core *
-CORBA_ORB::orb_core (void) const
+CORBA_ORB::orb_free_resources (void)
 {
-  return this->orb_core_;
+  return !CORBA_ORB::orb_init_count_;
 }
 
 // *************************************************************
@@ -509,3 +389,4 @@ CORBA_ORB_out::operator-> (void)
 {
   return this->ptr_;
 }
+
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index a463d1adc8a..a8c175f2dd6 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,17 +1,18 @@
 // $Id$
 
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
 
+#include "ace/Dynamic_Service.h"
+#include "ace/Service_Repository.h"
+#include "ace/Select_Reactor.h"
 #include "ace/Env_Value_T.h"
 #include "ace/Arg_Shifter.h"
 
 #include "tao/TAO_Internal.h"
+#include "tao/IIOP_ORB.h"
 #include "tao/default_client.h"
 #include "tao/default_server.h"
-#include "tao/default_resource.h"
 #include "tao/debug.h"
-#include "tao/IOR_LookupTable.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/ORB_Core.i"
@@ -19,24 +20,33 @@
 
 ACE_RCSID(tao, ORB_Core, "$Id$")
 
-// ****************************************************************
+typedef ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>
+        TAO_ORB_CORE;
 
-CORBA_Environment&
-CORBA::default_environment ()
+TAO_Collocation_Table_Lock::TAO_Collocation_Table_Lock (void)
 {
-  // @@ This is a slight violation of layering, we should use
-  //    TAO_ORB_Core_instance(), but that breaks during startup.
-  return *TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_;
+  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_collocation_table_lock ();
+  // We don't need to worry about the race condition here because this
+  // is called from within the ctor of Hash_Map_Manager which is
+  // placed inside a ACE_Singleton.
 }
 
-// ****************************************************************
+TAO_Collocation_Table_Lock::~TAO_Collocation_Table_Lock (void)
+{
+  delete this->lock_;
+  this->lock_ = 0;
+}
 
 TAO_ORB_Core::TAO_ORB_Core (void)
-  : thr_mgr_ (0),
+  : reactor_ (0),
+    thr_mgr_ (0),
     connector_registry_ (0),
+    orb_ (0),
     root_poa_ (0),
+    oa_params_ (0),
     orb_params_ (0),
     acceptor_ (0),
+    poa_current_ (0),
     resource_factory_ (0),
     resource_factory_from_service_config_ (0),
     client_factory_ (0),
@@ -48,12 +58,14 @@ TAO_ORB_Core::TAO_ORB_Core (void)
     arl_same_port_connect_ (0),
 #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
     preconnections_ (0),
-    poa_current_ (0)
+    input_cdr_dblock_allocator_ (0),
+    input_cdr_buffer_allocator_ (0),
+    default_environment_ (0),
+    tss_environment_ (this)
 {
-  ACE_NEW (this->poa_current_,
-           TAO_POA_Current);
 }
 
+
 TAO_ORB_Core::~TAO_ORB_Core (void)
 {
   // This should probably be changed to use the allocator internal to
@@ -61,27 +73,21 @@ TAO_ORB_Core::~TAO_ORB_Core (void)
   if (preconnections_)
     ACE_OS::free (preconnections_);
 
-  // Allocated in init()
-  delete this->orb_params_;
-
-  delete this->poa_current_;
+  // Clean up memory pools
+  this->output_cdr_dblock_allocator_.remove ();
+  this->output_cdr_buffer_allocator_.remove ();
 }
 
-int
-TAO_ORB_Core::add_to_ior_table (ACE_CString init_ref, TAO_IOR_LookupTable &table)
+TAO_Default_Reactor::TAO_Default_Reactor (int nolock)
+  : ACE_Reactor ((nolock ?
+                  (ACE_Reactor_Impl*) new TAO_NULL_LOCK_REACTOR :
+                  (ACE_Reactor_Impl*) new TAO_REACTOR),
+                 1)
 {
-  int index = 0;
-  if ((index = init_ref.find ("=")) == ACE_CString::npos)
-    ACE_ERROR_RETURN ((LM_ERROR,
-		       "Unable to parse -ORBInitRef parameter\n"),
-		      -1);
-
-  ACE_CString object_id = init_ref.substr (0,index);
-  ACE_CString ior = init_ref.substr (index+1);
-
-  // Add the objectID-IOR to the table and return the status.
-  return table.add_ior (object_id, ior);
+}
 
+TAO_Default_Reactor::~TAO_Default_Reactor (void)
+{
 }
 
 int
@@ -111,10 +117,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // Be certain to copy the program name so that service configurator
   // has something to skip!
   ACE_Arg_Shifter arg_shifter (argc, argv);
-  const char* argv0 = "";
-  if (argc > 0 && argv != 0)
-    argv0 = argv[0];
-  svc_config_argv[svc_config_argc++] = CORBA::string_dup (argv0);
+  svc_config_argv[svc_config_argc++] = argv[0];
 
   ACE_Env_Value<int> defport ("TAO_DEFAULT_SERVER_PORT",
                               TAO_DEFAULT_SERVER_PORT);
@@ -123,7 +126,7 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   CORBA::Boolean use_ior = 1;
   int cdr_tradeoff = ACE_DEFAULT_CDR_MEMCPY_TRADEOFF;
 
-  int giop_lite = 0;
+  int iiop_lite = 0;
 
   // The following things should be changed to use the ACE_Env_Value<>
   // template sometime.
@@ -135,17 +138,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // resolve_initial_references ()
   ACE_CString init_ref;
 
-  // Table for <ObjectID>:<IOR> mapping specified on commandline
-  // using ORBInitRef.
-  TAO_IOR_LookupTable *ior_lookup_table;
-
-  ACE_NEW_RETURN (ior_lookup_table,
-		  TAO_IOR_LookupTable,
-		  -1);
-
-  // List of comma separated prefixes from ORBDefaultInitRef.
-  ACE_CString default_init_ref;
-
   // Name Service port #.
   u_short ns_port = 0;
 
@@ -210,17 +202,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           TAO_orbdebug = 1;
           arg_shifter.consume_arg ();
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBdebuglevel") == 0)
-        {
-          arg_shifter.consume_arg ();
-
-          if (arg_shifter.is_parameter_next())
-            {
-              TAO_debug_level =
-                ACE_OS::atoi (arg_shifter.get_current ());
-              arg_shifter.consume_arg ();
-            }
-        }
       else if (ACE_OS::strcmp (current_arg, "-ORBhost") == 0)
         {
           // Specify the name of the host (i.e., interface) on which
@@ -415,10 +396,10 @@ TAO_ORB_Core::init (int &argc, char *argv[])
             }
         }
 #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
-      else if (ACE_OS::strcmp (current_arg, "-ORBgioplite") == 0)
+      else if (ACE_OS::strcmp (current_arg, "-ORBiioplite") == 0)
         {
           arg_shifter.consume_arg ();
-          giop_lite = 1;
+          iiop_lite = 1;
         }
 
       // A new <ObjectID>:<IOR> mapping has been specified. This will be
@@ -430,25 +411,31 @@ TAO_ORB_Core::init (int &argc, char *argv[])
           if (arg_shifter.is_parameter_next ())
             {
               init_ref = arg_shifter.get_current ();
-              if (this->add_to_ior_table (init_ref,*ior_lookup_table) != 0)
-		ACE_ERROR_RETURN ((LM_ERROR,
-				   "Unable to add IOR to the Table\n"),
-				  -1);
               arg_shifter.consume_arg ();
             }
         }
-      else if (ACE_OS::strcmp (current_arg, "-ORBDefaultInitRef") == 0)
-	{
-	  arg_shifter.consume_arg ();
-          if (arg_shifter.is_parameter_next ())
-            {
-              default_init_ref = arg_shifter.get_current ();
-              arg_shifter.consume_arg ();
-            }
-	}
       else
         arg_shifter.ignore_arg ();
-    }
+   }
+
+#if defined (DEBUG)
+  // Make it a little easier to debug programs using this code.
+  {
+    // This should use ACE_Env_Value<>
+    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 */
 
   // Set the endpoint
   ACE_INET_Addr rendezvous;
@@ -512,6 +499,11 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // @@ Init acceptor ... This needs altering for Pluggable Protocols! fredk
   this->acceptor (trf->get_acceptor ());
 
+  this->input_cdr_dblock_allocator_ =
+    trf->input_cdr_dblock_allocator ();
+  this->input_cdr_buffer_allocator_ =
+    trf->input_cdr_buffer_allocator ();
+
   TAO_Server_Strategy_Factory *ssf = this->server_factory ();
 
   if (ssf == 0)
@@ -520,28 +512,30 @@ TAO_ORB_Core::init (int &argc, char *argv[])
                        "ORB Core unable to find a Server Strategy Factory instance"),
                       -1);
 
-  ssf->open (this);
+  ssf->open ();
 
   // Inititalize the "ORB" pseudo-object now.
-  ACE_NEW_RETURN (this->orb_, CORBA_ORB (this), 0);
+  IIOP_ORB_ptr this_orb = 0;
+  ACE_NEW_RETURN (this_orb, IIOP_ORB, 0);
+
+  // Install the ORB * into the ORB Core instance.  Note that if we're
+  // running with a "thread-per-rate" concurrency model this ORB *
+  // will be located in thread-specific storage.
+  this->orb (this_orb);
 
   // This should probably move into the ORB Core someday rather then
   // being done at this level.
-  this->orb_->_use_omg_ior_format (use_ior);
-  this->orb_->_optimize_collocation_objects (this->opt_for_collocation_);
+  this_orb->_use_omg_ior_format (use_ior);
+  this_orb->_optimize_collocation_objects (this->opt_for_collocation_);
 
   // Set the <shutdown_lock_> for the ORB.
-  this->orb_->shutdown_lock_ = ssf->create_event_loop_lock ();
+  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 ()
   //                                       ->create_leader_follower_lock ();
 
-  // Initialize the container for the ORB parameters.
-  if (this->orb_params_ == 0)
-    ACE_NEW_RETURN (this->orb_params_, TAO_ORB_Parameters, 0);
-
   // Set all kinds of orb parameters whose setting needed to be
   // deferred until after the service config entries had been
   // determined.
@@ -552,12 +546,6 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   // Set the init_ref.
   this->orb_params ()->init_ref (init_ref);
 
-  // Set the IOR Table.
-  this->orb_params ()->ior_lookup_table (ior_lookup_table);
-
-  // Set the list of prefixes from -ORBDefaultInitRef.
-  this->orb_params ()->default_init_ref (default_init_ref);
-
   this->orb_params ()->name_service_ior (ns_ior);
   this->orb_params ()->name_service_port (ns_port);
   this->orb_params ()->trading_service_ior (ts_ior);
@@ -566,11 +554,13 @@ TAO_ORB_Core::init (int &argc, char *argv[])
   if (rcv_sock_size != 0)
     this->orb_params ()->sock_rcvbuf_size (rcv_sock_size);
   if (snd_sock_size != 0)
-    this->orb_params ()->sock_sndbuf_size (snd_sock_size);
+    this->orb_params ()->sock_rcvbuf_size (snd_sock_size);
   if (cdr_tradeoff >= 0)
     this->orb_params ()->cdr_memcpy_tradeoff (cdr_tradeoff);
 
-  this->orb_params ()->use_lite_protocol (giop_lite);
+  this->orb_params ()->use_lite_protocol (iiop_lite);
+
+  this->orb_params ()->use_dotted_decimal_addresses (dotted_decimal_addresses);
 
   // tell the registry to open all registered interfaces! fredk
   if (this->connector_registry ()->open (trf, this->reactor ()) != 0)
@@ -595,11 +585,15 @@ TAO_ORB_Core::set_endpoint (int dotted_decimal_addresses,
     {
       char buffer[MAXHOSTNAMELEN + 1];
       if (rendezvous.get_host_name (buffer, sizeof (buffer)) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) failed to resolve local host %p.\n"),
-                          -1);
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%P|%t) failed to resolve local host %p.\n"),
+                            -1);
+        }
       else
-        host = buffer;
+        {
+          host = buffer;
+        }
     }
 
   // Set the host and port parameters in the address
@@ -650,7 +644,7 @@ int
 TAO_ORB_Core::fini (void)
 {
   // Ask the registry to close all registered connectors!
-  // this->connector_registry ()->close_all ();
+  this->connector_registry ()->close_all ();
 
   TAO_Internal::close_services ();
 
@@ -663,8 +657,6 @@ TAO_ORB_Core::fini (void)
   if (!this->server_factory_from_service_config_)
     delete server_factory_;
 
-  delete this;
-
   return 0;
 }
 
@@ -689,16 +681,15 @@ TAO_ORB_Core::resource_factory (void)
                     "(%P|%t) WARNING - No Resource Factory found in Service Repository."
                     "  Using default instance with GLOBAL resource source specifier.\n"));
 
-      TAO_Default_Resource_Factory* default_factory;
-      ACE_NEW_RETURN (default_factory,
-                      TAO_Default_Resource_Factory,
+      ACE_NEW_RETURN (this->resource_factory_,
+                      TAO_Resource_Factory,
                       0);
 
-      this->resource_factory_from_service_config_ = 0;
-      default_factory->resource_source (TAO_Default_Resource_Factory::TAO_GLOBAL);
-      this->resource_factory_ = default_factory;
+      this->resource_factory_from_service_config_ =
+        0;
+      this->resource_factory_->resource_source (TAO_Resource_Factory::TAO_GLOBAL);
 
-      // @@ At this point we need to register this with the
+      // At this point we need to register this with the
       // Service_Repository in order to get it cleaned up properly.
       // But, for now we let it leak.
     }
@@ -780,6 +771,7 @@ TAO_ORB_Core::orb (CORBA::ORB_ptr op)
 {
   // Shouldn't need to check for ptr validity at this point b/c we
   // already did in ::init()
+  this->resource_factory ()->set_orb (op);
   CORBA::ORB_ptr old_orb = this->orb_;
   this->orb_ = op;
   return old_orb;
@@ -790,30 +782,13 @@ TAO_ORB_Core::root_poa (TAO_POA *np)
 {
   // Shouldn't need to check for ptr validity at this point b/c
   // we already did in ::init()
+  this->resource_factory ()->set_root_poa (np);
   TAO_POA *old_poa = this->root_poa_;
   this->root_poa_ = np;
   this->root_poa_reference_ = PortableServer::POA::_nil ();
   return old_poa;
 }
 
-PortableServer::POA_ptr
-TAO_ORB_Core::root_poa_reference (CORBA::Environment &TAO_IN_ENV,
-                                  const char *adapter_name,
-                                  TAO_POA_Manager *poa_manager,
-                                  const TAO_POA_Policies *policies)
-{
-  if (CORBA::is_nil (this->root_poa_reference_.in ()))
-    {
-      TAO_POA *poa = this->root_poa (adapter_name,
-                                     poa_manager,
-                                     policies);
-
-      this->root_poa_reference_ = poa->_this (TAO_IN_ENV);
-      TAO_CHECK_RETURN (PortableServer::POA::_nil ());
-    }
-
-  return PortableServer::POA::_duplicate (this->root_poa_reference_.in ());
-}
 
 #if defined (TAO_ARL_USES_SAME_CONNECTOR_PORT)
 CORBA::Boolean
@@ -824,17 +799,46 @@ TAO_ORB_Core::arl_same_port_connect (void)
 #endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
 
 int
-TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources)
+TAO_ORB_Core::inherit_from_parent_thread (TAO_ORB_Core *p)
 {
   // Inherit properties/objects used in ORB_Core from the
   // parent thread.  Stuff inherited here must already exist
   // in the "parent" orbcore.
 
-  this->reactor (tss_resources->reactor_);
+  this->reactor (p->reactor ());
   // We'll use the spawning thread's reactor.
 
-  // this->connection_cache (tss_resources->connection_cache_);
-  // Inherit connection cache?
+  this->thr_mgr (p->thr_mgr ());
+  // We should use the same thread_manager.
+
+  this->connector_registry (p->connector_registry ());
+  // We'll use the spawning thread's connector.
+
+  this->orb (p->orb ());
+  // We'll use the spawning thread's ORB.
+
+  this->root_poa (p->root_poa ());
+  // And its root_poa.
+
+  this->oa_params_ = p->oa_params ();
+  // And, of course, the POA params.
+
+  this->orb_params_ = p->orb_params ();
+  // We also need its ORB_Params.
+
+  this->acceptor (p->acceptor ());
+  // Also grab the acceptor passively listening for connection
+  // requests.
+
+  this->using_collocation (p->using_collocation ());
+  // Use the same collocation settings
+
+  this->resource_factory_ = p->resource_factory ();
+  this->client_factory_ = p->client_factory ();
+  this->server_factory_ = p->server_factory ();
+  // Inherit the factories.  Notice that they will not be destroyed by
+  // this orb_core because *_factory_from_service_config_'s all
+  // default to FALSE.
 
   return 0;
 }
@@ -851,7 +855,7 @@ TAO_ORB_Core::create_and_set_root_poa (const char *adapter_name,
   // Need to do double-checked locking here to cover the case of
   // multiple threads using a global resource policy.
   if (poa_manager == 0)
-    poa_manager = new TAO_POA_Manager (this->object_adapter ()->lock ());
+    poa_manager = new TAO_POA_Manager;
 
   TAO_POA_Policies *root_poa_policies = 0;
   if (policies == 0)
@@ -869,9 +873,6 @@ TAO_ORB_Core::create_and_set_root_poa (const char *adapter_name,
                      *poa_manager,
                      *policies,
                      0,
-                     this->object_adapter ()->lock (),
-                     this->object_adapter ()->thread_lock (),
-                     *this,
                      env);
 
   if (delete_policies)
@@ -889,29 +890,27 @@ TAO_ORB_Core::add_to_collocation_table (void)
     {
       TAO_GLOBAL_Collocation_Table *collocation_table = this->resource_factory ()->get_global_collocation_table ();
       if (collocation_table != 0)
-        return collocation_table->bind (this->orb_params ()->addr (),
-                                        this->object_adapter ());
+        return collocation_table->bind (this->orb_params ()->addr (), this->root_poa ());
     }
   return 0;
 }
 
-TAO_Object_Adapter *
-TAO_ORB_Core::get_collocated_object_adapter (const ACE_INET_Addr &addr)
+TAO_POA *
+TAO_ORB_Core::get_collocated_poa (ACE_INET_Addr &addr)
 {
   if (this->using_collocation ())
     {
       TAO_GLOBAL_Collocation_Table *collocation_table = this->resource_factory ()->get_global_collocation_table ();
       if (collocation_table != 0)
         {
-          TAO_Object_Adapter *object_adapter;
-          if (collocation_table->find (addr,
-                                       object_adapter) == 0)
-            return object_adapter;
+          TAO_POA *poa;
+          if (collocation_table->find (addr, poa) == 0)
+            return poa;
         }
       else
         {
           if (addr == this->orb_params ()->addr ())
-            return this->object_adapter ();
+            return this->root_poa ();
         }
     }
   return 0;
@@ -956,15 +955,16 @@ int
 TAO_ORB_Core::unset_leader_wake_up_follower (void)
   // sets the leader_available flag to false and tries to wake up a follower
 {
-  ACE_Guard <ACE_SYNCH_MUTEX> g (this->leader_follower_lock ());
+  ACE_Guard <ACE_SYNCH_MUTEX> g (TAO_ORB_Core_instance ()->leader_follower_lock ());
 
   this->unset_leader_thread ();
 
-  if (this->follower_available () && !this->leader_available ())
+  if (TAO_ORB_Core_instance ()->follower_available ()
+      && !TAO_ORB_Core_instance ()->leader_available ())
     // do it only if a follower is available and no leader is available
     {
-      ACE_SYNCH_CONDITION* condition_ptr = this->get_next_follower ();
-      if (this->remove_follower (condition_ptr) == -1)
+      ACE_SYNCH_CONDITION* condition_ptr = TAO_ORB_Core_instance ()->get_next_follower ();
+      if (TAO_ORB_Core_instance ()->remove_follower (condition_ptr) == -1)
         return -1;
       condition_ptr->signal ();
     }
@@ -1035,138 +1035,429 @@ TAO_ORB_Core::get_next_follower (void)
 ACE_Allocator*
 TAO_ORB_Core::input_cdr_dblock_allocator (void)
 {
-#if 0
   if (this->input_cdr_dblock_allocator_ == 0)
     {
       this->input_cdr_dblock_allocator_ =
         this->resource_factory ()->input_cdr_dblock_allocator ();
     }
   return this->input_cdr_dblock_allocator_;
-#else
-  return this->resource_factory ()->input_cdr_dblock_allocator ();
-#endif
 }
 
 ACE_Allocator*
 TAO_ORB_Core::input_cdr_buffer_allocator (void)
 {
-#if 0
   if (this->input_cdr_buffer_allocator_ == 0)
     {
       this->input_cdr_buffer_allocator_ =
         this->resource_factory ()->input_cdr_buffer_allocator ();
     }
   return this->input_cdr_buffer_allocator_;
-#else
-  return this->resource_factory ()->input_cdr_buffer_allocator ();
-#endif
 }
 
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_dblock_allocator (void)
+// ****************************************************************
+
+
+TAO_Resource_Factory::TAO_Resource_Factory (void)
+  : resource_source_ (TAO_GLOBAL),
+    poa_source_ (TAO_GLOBAL),
+    collocation_table_source_ (TAO_GLOBAL),
+    reactor_lock_ (TAO_TOKEN),
+    cdr_allocator_source_ (TAO_GLOBAL)
 {
-  return this->resource_factory ()->output_cdr_dblock_allocator ();
 }
 
-ACE_Allocator*
-TAO_ORB_Core::output_cdr_buffer_allocator (void)
+TAO_Resource_Factory::~TAO_Resource_Factory (void)
 {
-  return this->resource_factory ()->output_cdr_buffer_allocator ();
 }
 
-ACE_Reactor *
-TAO_ORB_Core::reactor (ACE_Reactor *r)
+int
+TAO_Resource_Factory::parse_args (int argc, char **argv)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
+  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
+  // This table shows the arguments that are parsed with their valid
+  // combinations.
+  //
+  //   ORB      POA    comments
+  // +-------+-------+-----------------+
+  // | TSS   | TSS   | if ORB==TSS     |
+  // |       |       | then POA=TSS    |
+  // |       |       | as def.value.   |
+  // +-------+-------+-----------------+
+  // | TSS   | GLOBAL| ok.             |
+  // +-------+-------+-----------------+
+  // | GLOBAL| GLOBAL| if ORB==Global  |
+  // |       |       | then POA=Global |
+  // |       |       | as def.value.   |
+  // +-------+-------+-----------------+
+  // | GLOBAL| TSS   | *NOT VALID*     |
+  // +-------+-------+-----------------+
+
+  int local_poa_source      = -1;
+  int local_resource_source = -1;
+
+  for (int curarg = 0; curarg < argc; curarg++)
+    if (ACE_OS::strcmp (argv[curarg], "-ORBresources") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              local_resource_source = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+              local_resource_source = TAO_TSS;
+          }
+      }
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoa") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              local_poa_source = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+              local_poa_source = TAO_TSS;
+          }
+      }
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactorlock") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "null") == 0)
+              reactor_lock_ = TAO_NULL_LOCK;
+            else if (ACE_OS::strcasecmp (name, "token") == 0)
+              reactor_lock_= TAO_TOKEN;
+          }
+      }
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBcoltable") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              collocation_table_source_ = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "orb") == 0)
+              collocation_table_source_ = TAO_TSS;
+          }
+      }
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBinputcdrallocator") == 0)
+      {
+        curarg++;
+        if (curarg < argc)
+          {
+            char *name = argv[curarg];
+
+            if (ACE_OS::strcasecmp (name, "global") == 0)
+              this->cdr_allocator_source_ = TAO_GLOBAL;
+            else if (ACE_OS::strcasecmp (name, "tss") == 0)
+              this->cdr_allocator_source_ = TAO_TSS;
+          }
+      }
+
+  // Don't allow a global ORB and a tss POA.
+  if ( (local_resource_source == TAO_GLOBAL) &&
+       (local_poa_source == TAO_TSS) )
+    return -1;
 
-  ACE_Reactor *old_reactor = tss->reactor_;
-  tss->reactor_ = r;
-  return old_reactor;
-}
+  // make poa=tss the default, if ORB is tss and the user didn't
+  // specify a value.
+  if ( (local_resource_source == TAO_TSS) &&
+       (local_poa_source      == -1) )
+    local_poa_source = TAO_TSS;
+
+  // update the object data members.
+  if (local_resource_source != -1)
+    this->resource_source_ = local_resource_source;
+  if (local_poa_source != -1)
+    this->poa_source_      = local_poa_source;
+
+  // Don't allow a global ORB and a tss POA.
+  if ( (this->resource_source_ == TAO_GLOBAL) &&
+       (this->poa_source_      == TAO_TSS) )
+    return -1;
 
-ACE_Reactor *
-TAO_ORB_Core::reactor (void)
-{
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
+  return 0;
+}
 
-  if (tss->reactor_ == 0)
-    tss->reactor_ = this->resource_factory ()->get_reactor ();
+#define IMPLEMENT_PRE_GET_METHOD(methodname,rtype,membername)\
+rtype TAO_Resource_Factory::methodname(void)\
+{\
+  switch (resource_source_)\
+    {\
+    case TAO_GLOBAL:\
+      return &GLOBAL_PRE_ALLOCATED::instance ()->membername;\
+    case TAO_TSS:\
+      return &TSS_PRE_ALLOCATED::instance ()->membername;\
+    }\
+  return 0;\
+}
 
-  return tss->reactor_;
+#define IMPLEMENT_APP_GET_METHOD(methodname,rtype,membername)\
+rtype TAO_Resource_Factory::methodname(void)\
+{\
+  switch (resource_source_)\
+    {\
+    case TAO_GLOBAL:\
+      return GLOBAL_APP_ALLOCATED::instance ()->membername;\
+    case TAO_TSS:\
+      return TSS_APP_ALLOCATED::instance ()->membername;\
+    }\
+  return 0;\
 }
 
-TAO_POA_Current &
-TAO_ORB_Core::poa_current (void) const
+IMPLEMENT_PRE_GET_METHOD(get_reactor, ACE_Reactor *, r_)
+IMPLEMENT_PRE_GET_METHOD(get_thr_mgr, ACE_Thread_Manager *, tm_)
+IMPLEMENT_PRE_GET_METHOD(get_acceptor, TAO_Acceptor *, a_)
+// Added the default IIOP connector to the resource factor to take advantage
+// of these macros for storing this reference in TSS or global mem.
+IMPLEMENT_PRE_GET_METHOD(get_connector_registry, TAO_Connector_Registry *, cr_)
+IMPLEMENT_PRE_GET_METHOD(get_connector, TAO_Connector *, c_)
+IMPLEMENT_PRE_GET_METHOD(get_cached_connect_strategy, TAO_CACHED_CONNECT_STRATEGY *, cached_connect_strategy_)
+IMPLEMENT_PRE_GET_METHOD(get_null_creation_strategy, TAO_NULL_CREATION_STRATEGY *, null_creation_strategy_)
+IMPLEMENT_PRE_GET_METHOD(get_null_activation_strategy, TAO_NULL_ACTIVATION_STRATEGY *, null_activation_strategy_)
+IMPLEMENT_APP_GET_METHOD(get_orb, CORBA_ORB_ptr, orb_)
+IMPLEMENT_PRE_GET_METHOD(get_orb_params, TAO_ORB_Parameters *, orbparams_)
+IMPLEMENT_PRE_GET_METHOD(get_oa_params, TAO_OA_Parameters *, oaparams_)
+
+TAO_POA *
+TAO_Resource_Factory::get_root_poa (void)
 {
-  return *this->poa_current_;
+  switch (poa_source_)
+    {
+    case TAO_GLOBAL:
+      return GLOBAL_APP_ALLOCATED::instance ()->poa_;
+    case TAO_TSS:\
+      return TSS_APP_ALLOCATED::instance ()->poa_;
+    }
+  return 0;
 }
 
-CORBA_Environment*
-TAO_ORB_Core::default_environment (void) const
+void
+TAO_Resource_Factory::set_root_poa (TAO_POA *pp)
 {
-  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_;
+  switch (poa_source_)
+    {
+    case TAO_GLOBAL:
+      GLOBAL_APP_ALLOCATED::instance ()->poa_ = pp;
+      break;
+    case TAO_TSS:
+      TSS_APP_ALLOCATED::instance ()->poa_ = pp;
+      break;
+    }
 }
 
 void
-TAO_ORB_Core::default_environment (CORBA_Environment* env)
+TAO_Resource_Factory::set_orb (CORBA::ORB_ptr op)
 {
-  TAO_ORB_CORE_TSS_RESOURCES::instance ()->default_environment_ = env;
+  switch (resource_source_)
+    {
+    case TAO_GLOBAL:
+      GLOBAL_APP_ALLOCATED::instance ()->orb_ = op;
+      break;
+    case TAO_TSS:
+      TSS_APP_ALLOCATED::instance ()->orb_ = op;
+      break;
+    }
 }
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-TAO_Policy_Current*
-TAO_ORB_Core::policy_current (void) const
+void
+TAO_Resource_Factory::set_allocator (ACE_Allocator *alloc)
 {
-  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->policy_current_;
+  switch (resource_source_)
+    {
+    case TAO_GLOBAL:
+      GLOBAL_APP_ALLOCATED::instance ()->alloc_ = alloc;
+      break;
+    case TAO_TSS:
+      TSS_APP_ALLOCATED::instance ()->alloc_ = alloc;
+      break;
+    }
 }
 
-TAO_Policy_Current*
-TAO_ORB_Core::policy_current (TAO_Policy_Current* current)
+ACE_Allocator *
+TAO_Resource_Factory::get_allocator (void)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
-
-  TAO_Policy_Current *old = tss->policy_current_;
-  tss->policy_current_ = current;
-  return old;
+  switch (resource_source_)
+    {
+    case TAO_GLOBAL:
+      return GLOBAL_APP_ALLOCATED::instance ()->alloc_;
+    case TAO_TSS:
+      return TSS_APP_ALLOCATED::instance ()->alloc_;
+    }
+  return 0;
 }
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
+typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> TSS_MALLOC;
+typedef ACE_Allocator_Adapter<TSS_MALLOC> TSS_ALLOCATOR;
 
-// ****************************************************************
+typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> GBL_MALLOC;
+typedef ACE_Allocator_Adapter<GBL_MALLOC> GBL_ALLOCATOR;
 
-TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
-  :  reactor_ (0),
-     poa_current_impl_ (0),
-     default_environment_ (&this->tss_environment_),
-#if defined (TAO_HAS_CORBA_MESSAGING)
-     policy_current_ (&this->initial_policy_current_),
-#endif /* TAO_HAS_CORBA_MESSAGING */
-     output_cdr_dblock_allocator_ (0),
-     output_cdr_buffer_allocator_ (0),
-     connection_cache_ (0)
+// @@ TODO We may be changing the state of the global App_Allocated
+// structure, but without any locks? It seems to be done all over
+// the place.
+
+ACE_Allocator*
+TAO_Resource_Factory::input_cdr_dblock_allocator (void)
 {
+  switch (this->cdr_allocator_source_)
+    {
+    case TAO_GLOBAL:
+      if (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_,
+                          GBL_ALLOCATOR,
+                          0);
+        }
+      return GLOBAL_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_;
+      ACE_NOTREACHED (break);
+    case TAO_TSS:
+      if (TSS_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_,
+                          TSS_ALLOCATOR,
+                          0);
+        }
+      return TSS_APP_ALLOCATED::instance ()->input_cdr_dblock_allocator_;
+      ACE_NOTREACHED (break);
+    }
+  return 0;
 }
 
-TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
+ACE_Allocator *
+TAO_Resource_Factory::input_cdr_buffer_allocator (void)
 {
-  if (this->output_cdr_dblock_allocator_ != 0)
+  switch (this->cdr_allocator_source_)
     {
-      delete this->output_cdr_dblock_allocator_;
-      this->output_cdr_dblock_allocator_ = 0;
+    case TAO_GLOBAL:
+      if (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (GLOBAL_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_,
+                          GBL_ALLOCATOR,
+                          0);
+        }
+      return GLOBAL_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_;
+    case TAO_TSS:
+      if (TSS_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_ == 0)
+        {
+          ACE_NEW_RETURN (TSS_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_,
+                          TSS_ALLOCATOR,
+                          0);
+        }
+      return TSS_APP_ALLOCATED::instance ()->input_cdr_buffer_allocator_;
     }
-  if (this->output_cdr_buffer_allocator_ != 0)
+  return 0;
+}
+
+
+ACE_Data_Block*
+TAO_Resource_Factory::create_input_cdr_data_block (size_t size)
+{
+  switch (this->cdr_allocator_source_)
     {
-      delete this->output_cdr_buffer_allocator_;
-      this->output_cdr_buffer_allocator_ = 0;
+    case TAO_GLOBAL:
+      {
+        ACE_Allocator* buffer_alloc =
+          this->input_cdr_buffer_allocator ();
+        ACE_Allocator* dblock_alloc =
+          this->input_cdr_dblock_allocator ();
+
+        typedef
+          ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
+          Global_Data_Block;
+        Global_Data_Block *nb;
+
+        ACE_NEW_MALLOC_RETURN (
+            nb,
+            ACE_static_cast(Global_Data_Block*,
+                            dblock_alloc->malloc (sizeof (Global_Data_Block))),
+            Global_Data_Block (size,
+                               ACE_Message_Block::MB_DATA,
+                               0,
+                               buffer_alloc,
+                               0,
+                               dblock_alloc),
+            0);
+        return nb;
+      }
+
+    case TAO_TSS:
+      {
+        ACE_Allocator* buffer_alloc =
+          this->input_cdr_buffer_allocator ();
+        ACE_Allocator* dblock_alloc =
+          this->input_cdr_dblock_allocator ();
+
+        ACE_Data_Block *nb;
+
+        ACE_NEW_MALLOC_RETURN (
+            nb,
+            ACE_static_cast(ACE_Data_Block*,
+                            dblock_alloc->malloc (sizeof (ACE_Data_Block))),
+            ACE_Data_Block (size,
+                            ACE_Message_Block::MB_DATA,
+                            0,
+                            buffer_alloc,
+                            0,
+                            0,
+                            dblock_alloc),
+            0);
+        return nb;
+      }
     }
+  return 0;
+}
+
+TAO_GLOBAL_Collocation_Table *
+TAO_Resource_Factory::get_global_collocation_table (void)
+{
+  return (collocation_table_source_ == TAO_GLOBAL ? GLOBAL_Collocation_Table::instance () : 0);
+}
+
+TAO_Resource_Factory::Pre_Allocated::Pre_Allocated (void)
+  : r_ (TAO_ORB_CORE::instance ()->resource_factory ()->reactor_lock ()),
+    cached_connect_strategy_ (TAO_ORB_CORE::instance ()->client_factory ()->create_client_creation_strategy ())
+{
+  // Make sure that the thread manager does not wait for threads
+  this->tm_.wait_on_exit (0);
 }
 
 // ****************************************************************
 
+TAO_Resource_Factory::App_Allocated::App_Allocated (void)
+  : orb_(0),
+    poa_(0),
+    alloc_(0),
+    input_cdr_dblock_allocator_ (0),
+    input_cdr_buffer_allocator_ (0)
+{
+}
+
+TAO_Resource_Factory::App_Allocated::~App_Allocated (void)
+{
+  if (this->input_cdr_dblock_allocator_ != 0)
+    this->input_cdr_dblock_allocator_->remove ();
+  delete this->input_cdr_dblock_allocator_;
+
+  if (this->input_cdr_buffer_allocator_ != 0)
+    this->input_cdr_buffer_allocator_->remove ();
+  delete this->input_cdr_buffer_allocator_;
+}
+
+TAO_Resource_Factory::Pre_Allocated::~Pre_Allocated (void)
+{
+  // Zap the creation strategy that we created earlier
+  delete this->cached_connect_strategy_.creation_strategy ();
+}
+
 // This function exists because of Win32's proclivity for expanding
 // templates at link time.  Since DLLs are just executables, templates
 // get expanded and instantiated at link time.  Thus, if there are
@@ -1181,71 +1472,182 @@ TAO_ORB_Core_TSS_Resources::~TAO_ORB_Core_TSS_Resources (void)
 TAO_Export TAO_ORB_Core *
 TAO_ORB_Core_instance (void)
 {
-  return CORBA::instance ()->orb_core_;
+  // Depending on whether ACE_HAS_TSS_ORBCORE is defined or not, the
+  // instance() method call below either returns a pointer to the
+  // process-wide ORB Core Singleton or it returns a pointer to the
+  // thread-specific ORB Core Singleton.
+  return TAO_ORB_CORE::instance ();
+}
+
+
+TAO_Cached_Connector_Lock::TAO_Cached_Connector_Lock (void)
+{
+  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_cached_connector_lock ();
+}
+
+TAO_Cached_Connector_Lock::~TAO_Cached_Connector_Lock (void)
+{
+  delete this->lock_;
+  this->lock_ = 0;
+}
+
+TAO_ST_Connect_Creation_Strategy::TAO_ST_Connect_Creation_Strategy (ACE_Thread_Manager *t)
+  : ACE_Creation_Strategy<TAO_Client_Connection_Handler> (t)
+{
+}
+
+TAO_MT_Connect_Creation_Strategy::TAO_MT_Connect_Creation_Strategy (ACE_Thread_Manager *t)
+  : ACE_Creation_Strategy<TAO_Client_Connection_Handler> (t)
+{
+}
+
+int
+TAO_ST_Connect_Creation_Strategy::make_svc_handler (TAO_Client_Connection_Handler *&sh)
+{
+  if (sh == 0)
+    ACE_NEW_RETURN (sh, TAO_ST_Client_Connection_Handler (this->thr_mgr_), -1);
+
+  return 0;
+}
+
+int
+TAO_MT_Connect_Creation_Strategy::make_svc_handler (TAO_Client_Connection_Handler *&sh)
+{
+  if (sh == 0)
+    ACE_NEW_RETURN (sh, TAO_MT_Client_Connection_Handler (this->thr_mgr_), -1);
+
+  return 0;
 }
 
-// ****************************************************************
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>;
+template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >;
+template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
 
 template class ACE_Env_Value<int>;
 template class ACE_Env_Value<u_int>;
+template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
+template class ACE_Creation_Strategy<TAO_Client_Connection_Handler>;
+template class ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
+template class ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
+template class ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>;
+template class ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>;
+template class ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>;
+template class ACE_Recycling_Strategy<TAO_Client_Connection_Handler>;
+template class ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
 
-template class ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_ORB_Core_TSS_Resources>;
+#if 0
+template class ACE_Unbounded_Stack<TAO_Client_Connection_Handler *>;
+#else
+template class ACE_Unbounded_Stack<ACE_INET_Addr>;
+template class ACE_Node<ACE_INET_Addr>;
+#endif
 
-template class ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_Object_Adapter *>;
+template class ACE_Node<TAO_Client_Connection_Handler *>;
+template class ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>;
+template class ACE_TSS<TAO_ORB_Core>;
+template class ACE_Dynamic_Service<TAO_Resource_Factory>;
+
+template class ACE_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>;
+template class ACE_TSS_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>;
+template class ACE_TSS<TAO_Resource_Factory::Pre_Allocated>;
+template class ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
+template class ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
+template class ACE_TSS<TAO_Resource_Factory::App_Allocated>;
+template class ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_POA *>;
 template class ACE_Hash<ACE_INET_Addr>;
 template class ACE_Equal_To<ACE_INET_Addr>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
-
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>;
 template class ACE_Guard<TAO_Collocation_Table_Lock>;
 template class ACE_Read_Guard<TAO_Collocation_Table_Lock>;
 template class ACE_Write_Guard<TAO_Collocation_Table_Lock>;
+template class ACE_Guard<ACE_SYNCH_MUTEX>;
 template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
 template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-
 template class ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>;
-
 template class ACE_Node<ACE_SYNCH_CONDITION*>;
 template class ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>;
 template class ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>;
 
+template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
+template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
+template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
+
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
+#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
+#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
+
 #pragma instantiate ACE_Env_Value<int>
 #pragma instantiate ACE_Env_Value<u_int>
-
-#pragma instantiate ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_ORB_Core_TSS_Resources>
-
-#pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_Object_Adapter *>
+#pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
+#pragma instantiate ACE_Creation_Strategy<TAO_Client_Connection_Handler>
+#pragma instantiate ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
+#pragma instantiate ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
+#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
+#pragma instantiate ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>
+#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
+#pragma instantiate ACE_Recycling_Strategy<TAO_Client_Connection_Handler>
+#pragma instantiate ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
+#if 0
+#pragma instantiate ACE_Unbounded_Stack<TAO_Client_Connection_Handler *>
+#else
+#pragma instantiate ACE_Unbounded_Stack<ACE_INET_Addr>
+#pragma instantiate ACE_Node<ACE_INET_Addr>
+#endif
+#pragma instantiate ACE_Node<TAO_Client_Connection_Handler *>
+#pragma instantiate ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_TSS<TAO_ORB_Core>
+#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
+
+#pragma instantiate ACE_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::Pre_Allocated, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_TSS<TAO_Resource_Factory::Pre_Allocated>
+#pragma instantiate ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_TSS<TAO_Resource_Factory::App_Allocated>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_INET_Addr, TAO_POA *>
 #pragma instantiate ACE_Hash<ACE_INET_Addr>
 #pragma instantiate ACE_Equal_To<ACE_INET_Addr>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_Object_Adapter *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
-
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_INET_Addr, TAO_POA *, ACE_Hash<ACE_INET_Addr>, ACE_Equal_To<ACE_INET_Addr>, TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Guard<TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Read_Guard<TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Write_Guard<TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX>
-
 #pragma instantiate ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
-
 #pragma instantiate ACE_Node<ACE_SYNCH_CONDITION*>
 #pragma instantiate ACE_Unbounded_Set<ACE_SYNCH_CONDITION*>
 #pragma instantiate ACE_Unbounded_Set_Iterator<ACE_SYNCH_CONDITION*>
 
+#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token>
+#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
+#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+ACE_STATIC_SVC_DEFINE (TAO_Resource_Factory,
+                       ASYS_TEXT ("TAO_Resource_Factory"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_Resource_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+#endif /* TAO_USES_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
+ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 486ee1cf4eb..0d06f95e688 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -17,18 +17,21 @@
 #ifndef TAO_ORB_CORE_H
 #define TAO_ORB_CORE_H
 
+#include "ace/Strategies_T.h"
+#include "ace/Hash_Map_Manager.h"
 #include "ace/Singleton.h"
 #include "tao/corbafwd.h"
 #include "tao/Environment.h"
-#include "tao/Policy_Manager.h"
-#include "tao/Resource_Factory.h"
-#include "tao/params.h"
+#include "tao/IIOP_Connector.h"
+#include "tao/IIOP_Acceptor.h"
 #include "tao/POAC.h"
+#include "tao/POA.h"
+
+#include "tao/params.h"
 
 class TAO_Client_Connection_Handler;
 class TAO_POA;
 class TAO_POA_Current;
-class TAO_POA_Current_Impl;
 class TAO_POA_Manager;
 class TAO_POA_Policies;
 class TAO_Acceptor;
@@ -38,10 +41,64 @@ class TAO_Connector_Registry;
 class TAO_Resource_Factory;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
-class TAO_Connection_Cache;
-class TAO_ORB_Core_TSS_Resources;
 
-// ****************************************************************
+// @@ TODO Move the Resource Factory to its own file.
+
+class TAO_Collocation_Table_Lock : public ACE_Adaptive_Lock
+{
+  // TITLE
+  //   This lock class determines the type underlying lock
+  //   when it gets constructed.
+public:
+  TAO_Collocation_Table_Lock (void);
+  ~TAO_Collocation_Table_Lock (void);
+};
+
+// @@ Will this work, changing ACE_INET_Addr to ACE_Addr??
+typedef ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_POA *, TAO_Collocation_Table_Lock>
+        TAO_GLOBAL_Collocation_Table;
+
+class TAO_Cached_Connector_Lock : public ACE_Adaptive_Lock
+{
+  // TITLE
+  //   This lock class determines the type underlying lock
+  //   when it gets constructed.
+public:
+  TAO_Cached_Connector_Lock (void);
+  ~TAO_Cached_Connector_Lock (void);
+};
+
+typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler,
+                                    TAO_SOCK_CONNECTOR,
+                                    TAO_Cached_Connector_Lock>
+        TAO_CACHED_CONNECT_STRATEGY;
+
+typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
+        TAO_NULL_CREATION_STRATEGY;
+
+typedef ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
+        TAO_NULL_ACTIVATION_STRATEGY;
+
+// Forward decl.
+class TAO_Resource_Factory;
+
+class TAO_Export TAO_ST_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
+{
+public:
+  TAO_ST_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
+
+  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
+  // Makes TAO_ST_Client_Connection_Handlers
+};
+
+class TAO_Export TAO_MT_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
+{
+public:
+  TAO_MT_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
+
+  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
+  // Makes TAO_MT_Client_Connection_Handlers
+};
 
 class TAO_Export TAO_ORB_Core
 {
@@ -49,21 +106,18 @@ class TAO_Export TAO_ORB_Core
   //    Encapsulates the state of an ORB.
   //
   // = DESCRIPTION
-  //   This is the implementation class for the CORBA::ORB interface.
-  //   The class also encapsulates the access to the ORB resources and
-  //   its state.
-  //   Some resources can be TSS or global, those resources are always
-  //   accessed through a TSS interface, but are allocated using the
-  //   Resource_Factory.  If the resource is really global the
-  //   Resource_Factory will simply return a pointer to the global
-  //   instance.
-  //
+  //    This class encapsulates the state of an ORB.  The motivation for
+  //    this is so that the state can be accessed as a singleton.  The scope
+  //    of the state can be regulated by utilizing singletons of different
+  //    scope, e.g., <ACE_Singleton> will provide process-wide scope, while
+  //    <ACE_TSS_Singleton> will provide thread-specific scope (which
+  //    is useful for the "thread-per-rate" real-time concurrency
+  //    model).
   friend class CORBA_ORB;
   friend CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          char * const*,
                                          const char *,
                                          CORBA_Environment &);
-
 public:
   // = Initialization and termination methods.
   TAO_ORB_Core (void);
@@ -72,11 +126,19 @@ public:
   ~TAO_ORB_Core (void);
   // Destructor
 
+  TAO_OA_Parameters *oa_params (void);
+  // Accessor for the Object Adapter parameters.
+
   TAO_ORB_Parameters *orb_params (void);
   // Accessor for the ORB parameters.
 
-  TAO_POA_Current &poa_current (void) const;
-  // Accessor to the POA current.
+  TAO_POA_Current *poa_current (void);
+  // Accessor which returns a pointer to a structure containing
+  // context on the current POA upcall.
+
+  TAO_POA_Current *poa_current (TAO_POA_Current *new_current);
+  // Sets the thread-specific pointer to the new POA Current state,
+  // returning a pointer to the existing POA Current state.
 
   // = Set/get the connector registry - used to just be the connector.
   TAO_Connector_Registry *connector_registry (TAO_Connector_Registry *c);
@@ -99,7 +161,7 @@ public:
   ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *tm);
   ACE_Thread_Manager *thr_mgr (void);
 
-  // = Set/get <rootPOA>.
+  // = Set/get <Acceptor> for the POA.
   TAO_POA *root_poa (TAO_POA *np);
   TAO_POA *root_poa (const char *adapter_name = TAO_DEFAULT_ROOTPOA_NAME,
                      TAO_POA_Manager *poa_manager = 0,
@@ -109,10 +171,7 @@ public:
                                               TAO_POA_Manager *poa_manager = 0,
                                               const TAO_POA_Policies *policies = 0);
 
-  TAO_Object_Adapter *object_adapter (void);
-  // Get <Object Adapter>.
-
-  int inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources);
+  int inherit_from_parent_thread (TAO_ORB_Core *p);
   // A spawned thread needs to inherit some properties/objects from
   // the spawning thread in order to serve requests.  Return 0 if
   // it successfully inherits from the parent, -1 otherwise.
@@ -142,13 +201,10 @@ public:
   int add_to_collocation_table (void);
   // Added this ORB into collocation table.
 
-  TAO_Object_Adapter *get_collocated_object_adapter (const ACE_INET_Addr &addr);
+  TAO_POA *get_collocated_poa (ACE_INET_Addr &addr);
   // See if we have a collocated address, if yes, return the POA
   // associated with the address.
 
-  int add_to_ior_table (ACE_CString init_ref, TAO_IOR_LookupTable &table);
-  // Add the init_ref (objectID->IOR) to the Lookup Table.
-
 #if defined (TAO_ARL_USES_SAME_CONNECTOR_PORT)
   CORBA::Boolean arl_same_port_connect (void);
   // Access function to query whether we want this feature or not.
@@ -237,26 +293,7 @@ public:
   // usually created on the stack, but, the spec allows their creation
   // on the heap and/or as class members; we need to investigate the
   // tradeoffs and take a decision.
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager *policy_manager (void);
-  // Return the Policy_Manager for this ORB.
-
-  TAO_Policy_Current *policy_current (void) const;
-  TAO_Policy_Current *policy_current (TAO_Policy_Current *);
-  // Accesors to the policy current, this object should be kept in TSS
-  // storage.
-  // The POA has to reset the policy current object on every upcall.
-
-  CORBA::Policy_ptr get_default_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ());
-  // Accesor to obtain the default policy for a particular policy
-  // type.
-  // If there is no default policy it returns CORBA::Policy::_nil ()
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  //
 
 protected:
   int set_endpoint (int dotted_decimal_addresses,
@@ -283,19 +320,18 @@ protected:
                                 const TAO_POA_Policies *policies);
   // Initialize the root POA.
 
-protected:
   // = Data members.
+  ACE_Reactor *reactor_;
+  // Used for responding to I/O reactively
+
   ACE_Thread_Manager *thr_mgr_;
   // Used to manage threads within the ORB
 
   TAO_Connector_Registry *connector_registry_;
-  // The connector registry which all active connecters must register
-  // themselves with.
+  // The connector registry which all active connecters must register themselves
+  // with.
 
   CORBA::ORB_ptr orb_;
-  // @@ Should we keep a single ORB pointer? This is good because
-  //    multiple calls to ORB_init() with the same ORBid can use the
-  //    same object, but maybe don't want so much coupling.
   // Pointer to the ORB.
 
   TAO_POA *root_poa_;
@@ -306,6 +342,9 @@ protected:
   PortableServer::POA_var root_poa_reference_;
   // Cached POA reference
 
+  TAO_OA_Parameters *oa_params_;
+  // Parameters which should be used by OAs attached to this ORB.
+
   TAO_ORB_Parameters *orb_params_;
   // Parameters used by the ORB.
 
@@ -317,6 +356,15 @@ protected:
   TAO_Acceptor *acceptor_;
   // The acceptor passively listening for connection requests.
 
+  TAO_POA_Current *poa_current_;
+  // Points to structure containing state for the current upcall
+  // context in this thread.  Note that it does not come from the
+  // resource factory because it must always be held in
+  // thread-specific storage.  For now, since TAO_ORB_Core instances
+  // are TSS singletons, we simply ride along and don't allocate
+  // occupy another TSS slot since there are some platforms where
+  // those are precious commodities (e.g., NT).
+
   TAO_Resource_Factory *resource_factory_;
   // Handle to the factory for resource information..
 
@@ -353,84 +401,302 @@ protected:
   // A string of comma-separated <{host}>:<{port}> pairs used to
   // pre-establish connections using <preconnect>.
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager policy_manager_;
-  // The Policy_Manager for this ORB.
+  typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> TSS_MALLOC;
+  typedef ACE_Allocator_Adapter<TSS_MALLOC> TSS_ALLOCATOR;
 
-  TAO_Policy_Manager_Impl default_policies_;
-  // The default policies.
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  TSS_ALLOCATOR output_cdr_dblock_allocator_;
+  // The Allocator for the ACE_Data_Blocks used in the input CDRs.
 
-  TAO_POA_Current *poa_current_;
-  // POA current.
-  //
-  // Note that this is a pointer in order to reduce the include file
-  // dependencies.
-  //
+  TSS_ALLOCATOR output_cdr_buffer_allocator_;
+  // The Allocator for the input CDR buffers
+
+  ACE_Allocator *input_cdr_dblock_allocator_;
+  ACE_Allocator *input_cdr_buffer_allocator_;
+  // Cache the resource factory allocators.
+
+  CORBA_Environment* default_environment_;
+  // The default environment for the thread.
+
+  CORBA_Environment tss_environment_;
+  // If the user (or library) provides no environment the ORB_Core
+  // still holds one.
 };
 
-// ****************************************************************
+class TAO_Default_Reactor : public ACE_Reactor
+{
+  // = TITLE
+  //
+  //   Force TAO to use Select Reactor.
+public:
+  TAO_Default_Reactor (int nolock = 0);
+  virtual ~TAO_Default_Reactor (void);
+};
 
-class TAO_Export TAO_ORB_Core_TSS_Resources
+class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
 {
   // = TITLE
-  //   The TSS resoures of an ORB core.
+  //   Factory which manufacturers resources for use by the ORB Core.
   //
   // = DESCRIPTION
-  //   This class is used by the ORB_Core to store the resources
-  //   potentially bound to a thread in TSS storage.
-  //   The members are public because only the ORB Core is expected to
-  //   access them.
-  //
+  //   This class is a factory/repository for critical ORB Core
+  //   resources.  Using a <{resource source specifier}> as a
+  //   discriminator, the factory can return resource instances which
+  //   are, e.g., global, stored in thread-specific storage, stored in
+  //   shared memory, etc.
+
 public:
-  TAO_ORB_Core_TSS_Resources (void);
-  // constructor
+  // = Initialization and termination methods.
+  TAO_Resource_Factory ();
+  virtual ~TAO_Resource_Factory (void);
+
+  // = Service Configurator hooks.
+  virtual int init (int argc, char *argv[]);
+
+  virtual int parse_args (int argc, char *argv[]);
+  // Arguments are in the form of -ORBxxx.  Valid arguments are:
+  // <-ORBresources> <{which}> where <{which}> is one of <global> or
+  // <tss>.
+
+  // = Member Accessors
+  enum
+  {
+    TAO_GLOBAL,
+    TAO_TSS
+  };
+
+  // = Type of Reactor
+  enum
+  {
+    TAO_TOKEN,                  // Use ACE_Token as Select_Reactor's internal lock
+    TAO_NULL_LOCK               // Use ACE_Noop_Token as Select_Reactor's internal lock
+  };
+
+  // = Range of values for <{resource source specifier}>.
+  virtual void resource_source (int which_source);
+  // Set the resource source specifier.
+  virtual int resource_source (void);
+  // Get the resource source specifier.
+
+  virtual void poa_source (int which_source);
+  // Set the POA source specifier.
+  virtual int poa_source (void);
+  // Get the POA source specifier.
+
+  int cdr_allocator_source (void);
+  // Modify and get the source for the CDR allocators
+
+  // = Resource Retrieval
+  //
+  // Methods in this category return pointers to resources.  Based on
+  // the resource source specifier value, these resources may be
+  // either global, i.e., the same resource is used across all threads
+  // throughout the process, or thread-specific, i.e., different
+  // resources are used in each thread.  Currently, all resources are
+  // either global or thread-specific; choosing on a per-resource
+  // basis is not supported.
 
-  ~TAO_ORB_Core_TSS_Resources (void);
-  // destructor
+  virtual ACE_Reactor *get_reactor (void);
+  // Return an <ACE_Reactor> to be utilized.
 
-  ACE_Reactor *reactor_;
-  // Used for responding to I/O reactively
+  virtual ACE_Thread_Manager *get_thr_mgr (void);
+  // Return an <ACE_Thread_Manager> to be utilized.
 
-  TAO_POA_Current_Impl *poa_current_impl_;
-  // Points to structure containing state for the current upcall
-  // context in this thread.  Note that it does not come from the
-  // resource factory because it must always be held in
-  // thread-specific storage.  For now, since TAO_ORB_Core instances
-  // are TSS singletons, we simply ride along and don't allocate
-  // occupy another TSS slot since there are some platforms where
-  // those are precious commodities (e.g., NT).
+  virtual TAO_Connector *get_connector (void);
+  // Return an Connector to be utilized.
 
-  CORBA_Environment* default_environment_;
-  // The default environment for the thread.
+  virtual TAO_Connector_Registry *get_connector_registry (void);
+  // Return an Connector to be utilized.
 
-  CORBA_Environment tss_environment_;
-  // If the user (or library) provides no environment the ORB_Core
-  // still holds one.
+  virtual TAO_CACHED_CONNECT_STRATEGY *get_cached_connect_strategy (void);
+  // Return an Cached Connect Strategy to be utilized.
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Current initial_policy_current_;
-  // The initial PolicyCurrent for this thread. Should be a TSS
-  // resource.
+  virtual TAO_NULL_CREATION_STRATEGY *get_null_creation_strategy (void);
+  // This no-op creation strategy is necessary for using the
+  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
 
-  TAO_Policy_Current *policy_current_;
-  // This pointer is reset by the POA on each upcall.
-#endif /* TAO_HAS_CORBA_MESSAGING */
+  virtual TAO_NULL_ACTIVATION_STRATEGY *get_null_activation_strategy (void);
+  // This no-op activation strategy prevents the cached connector from
+  // calling the service handler's <open> method multiple times.
 
-  ACE_Allocator *output_cdr_dblock_allocator_;
-  ACE_Allocator *output_cdr_buffer_allocator_;
-  // The allocators for the output CDR streams.
+  virtual TAO_Acceptor *get_acceptor (void);
+  // Return an Acceptor to be utilized.
 
-  TAO_Connection_Cache *connection_cache_;
-  // This is is just a place holder, in the future the connection
-  // cache will be separated from the connectors and it will be a
-  // (potentially) TSS object.
-};
+  virtual TAO_ORB_Parameters *get_orb_params (void);
+  // Return ORB parameters to be utilized.
+
+  virtual TAO_OA_Parameters *get_oa_params (void);
+  // Return ORB parameters to be utilized.
+
+  virtual CORBA::ORB_ptr get_orb (void);
+  // Return an ORB ptr to be utilized.
+
+  virtual TAO_POA *get_root_poa (void);
+  // Return a root poa to be utilized.
+
+  virtual ACE_Allocator *get_allocator (void);
+  // Return a pointer to an ACE_Allocator used for allocating memory
+  // within the ORB.
+
+  virtual TAO_GLOBAL_Collocation_Table *get_global_collocation_table (void);
+  // Get the global collocation table.  Return the pointer to the
+  // global collocation table if we are using one, otherwise, return
+  // 0.
+
+  // = Modifiers
+
+  virtual void set_allocator (ACE_Allocator *alloc);
+  // Set the allocator pointer which will be returned by
+  // <get_allocator()>.
+
+  virtual void set_orb (CORBA::ORB_ptr op);
+  // Set the ORB pointer which will be returned by <get_orb()>.  This
+  // is necessary because the ORB is created in application space by
+  // <CORBA::ORB_init()>, but needs to be available to stubs and
+  // generated code.
+
+  virtual void set_root_poa (TAO_POA *pp);
+  // Set the Root POA pointer which will be returned by
+  // <get_root_poa()>.  This is necessary because the Root POA is
+  // created in application space by <CORBA::ORB_init()>, but needs to
+  // be available to stubs and generated code.
 
-// ****************************************************************
+  virtual int reactor_lock (void);
+  // Returns 0 if a reactor without locking was configured.
 
-typedef ACE_TSS_Singleton<TAO_ORB_Core_TSS_Resources, ACE_SYNCH_MUTEX>
-        TAO_ORB_CORE_TSS_RESOURCES;
+  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
+  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
+  // Access the input CDR allocators.
+
+  ACE_Data_Block *create_input_cdr_data_block (size_t size);
+  // The Message Blocks used for input CDRs must have appropiate
+  // locking strategies.
+
+  // @@ I suspect that putting these structs inside of this class is
+  // going to break some compilers (e.g., HP/YUX) when you try to use
+  // this stuff with the ACE_Singletons below.  I suggest you move
+  // them out and rename them as TAO_Pre_Allocated, etc.
+  //
+  // Let's do this after we merge the poa branch and the main back
+  // together.
+  struct Pre_Allocated
+    // = TITLE
+    //   Structure containing resources which can be pre-allocated by
+    //   the ORB Core without intervention from the application.
+  {
+    Pre_Allocated (void);
+    // Constructor
+
+    ~Pre_Allocated (void);
+    // Destructor
+
+    TAO_Default_Reactor r_;
+    // The Reactor.
+
+    ACE_Thread_Manager tm_;
+    // The Thread Manager
+
+    TAO_Connector_Registry cr_;
+    // The Connector Registry!
+
+    TAO_IIOP_Connector c_;
+    // The Connector, HACK to create the first connector which happens to be
+    // IIOP.  
+
+    TAO_CACHED_CONNECT_STRATEGY cached_connect_strategy_;
+    // The Cached Connect Strategy
+
+    TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
+    // This no-op creation strategy is necessary for using the
+    // <Strategy_Connector> with the <Cached_Connect_Strategy>.
+
+    TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
+    // This no-op activation strategy prevents the cached connector from
+    // calling the service handler's <open> method multiple times.
+
+    TAO_IIOP_Acceptor a_;
+    // The Acceptor
+
+    TAO_ORB_Parameters orbparams_;
+    // ORB Parameters
+
+    TAO_OA_Parameters oaparams_;
+    // OA Parameters (will go away with new POA impl)
+  };
+
+  struct App_Allocated
+    // = TITLE
+    //   Structure containing resources which can only be allocated
+    //   after obtaining information from the application such as
+    //   arguments, etc.
+  {
+    App_Allocated (void);
+    // Constructor necessary because we have pointers.  It's inlined
+    // here rather than in the .i file because it's easier than trying
+    // to re-order header files in corba.h to eliminate the "used
+    // before declared inline" warnings/errors on certain compilers.
+
+    ~App_Allocated (void);
+    // Destructor is also necessary because we now allocate some of
+    // the objects held here.
+
+    // = Resources
+
+    // Note:  These should change to _var types when they are available.
+    CORBA::ORB_ptr orb_;
+    // Pointer to application-created ORB.
+
+    TAO_POA *poa_;
+    // Pointer to application-created POA.
+
+    ACE_Allocator *alloc_;
+    // Pointer to application-created ACE_Allocator.
+
+    ACE_Allocator *input_cdr_dblock_allocator_;
+    ACE_Allocator *input_cdr_buffer_allocator_;
+    // The allocators for the input CDR streams.
+
+  };
+
+protected:
+
+  int resource_source_;
+  // Flag indicating whether resources should be global or
+  // thread-specific.
+
+  int poa_source_;
+  // Flag indicating whether the POA should be global or
+  // thread-specific.  If not set specifically, this takes on the
+  // value of <resource_source_>.
+
+  int collocation_table_source_;
+  // Flag indicating whether the collocation table should be global
+  // thread-specific.  It defaults to TAO_GLOBAL if not set
+  // specifically.
+
+  int reactor_lock_;
+  // Flag indicating wether we should provide a lock-freed reactor
+  // or not.
+
+  int cdr_allocator_source_;
+  // The source for the CDR allocator. Even with a TSS resource
+  // factory the user may be interested in global allocators for the
+  // CDR streams, for instance to keep the buffers around after the
+  // upcall and/or pass them to another thread.
+
+  // = Typedefs for the singleton types used to store our orb core
+  // information.
+  typedef ACE_Singleton<Pre_Allocated, ACE_SYNCH_MUTEX>
+          GLOBAL_PRE_ALLOCATED;
+  typedef ACE_TSS_Singleton<Pre_Allocated, ACE_SYNCH_MUTEX>
+          TSS_PRE_ALLOCATED;
+
+  typedef ACE_Singleton<App_Allocated, ACE_SYNCH_MUTEX>
+          GLOBAL_APP_ALLOCATED;
+  typedef ACE_TSS_Singleton<App_Allocated, ACE_SYNCH_MUTEX>
+          TSS_APP_ALLOCATED;
+  typedef ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
+          GLOBAL_Collocation_Table;
+};
 
 extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
 
@@ -438,4 +704,10 @@ extern TAO_Export TAO_ORB_Core *TAO_ORB_Core_instance (void);
 # include "tao/ORB_Core.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+ACE_STATIC_SVC_DECLARE (TAO_Resource_Factory)
+#endif /* TAO_USE_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
+ACE_FACTORY_DECLARE (TAO, TAO_Resource_Factory)
+
 #endif /* TAO_ORB_CORE_H */
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index a6ab79f5cac..3bda3cf324b 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -6,10 +6,18 @@
 #define TAO_OC_RETRIEVE(member) \
   ((this->member##_ == 0) ? (this->member##_ = this->resource_factory ()->get_##member ()) : (this->member##_) )
 
-ACE_INLINE TAO_Object_Adapter *
-TAO_ORB_Core::object_adapter (void)
+ACE_INLINE ACE_Reactor *
+TAO_ORB_Core::reactor (ACE_Reactor *r)
 {
-  return this->resource_factory ()->object_adapter ();
+  ACE_Reactor *old_reactor = this->reactor_;
+  this->reactor_ = r;
+  return old_reactor;
+}
+
+ACE_INLINE ACE_Reactor*
+TAO_ORB_Core::reactor (void)
+{
+  return TAO_OC_RETRIEVE (reactor);
 }
 
 ACE_INLINE ACE_Thread_Manager *
@@ -29,7 +37,7 @@ TAO_ORB_Core::thr_mgr (void)
 ACE_INLINE CORBA::ORB_ptr
 TAO_ORB_Core::orb (void)
 {
-  return this->orb_;
+  return TAO_OC_RETRIEVE (orb);
 }
 
 ACE_INLINE TAO_POA *
@@ -45,11 +53,36 @@ TAO_ORB_Core::root_poa (const char *adapter_name,
   return this->root_poa_;
 }
 
+ACE_INLINE PortableServer::POA_ptr
+TAO_ORB_Core::root_poa_reference (CORBA::Environment &TAO_IN_ENV,
+                                  const char *adapter_name,
+                                  TAO_POA_Manager *poa_manager,
+                                  const TAO_POA_Policies *policies)
+{
+  if (CORBA::is_nil (this->root_poa_reference_.in ()))
+    {
+      TAO_POA *poa = this->root_poa (adapter_name,
+                                     poa_manager,
+                                     policies);
+
+      this->root_poa_reference_ = poa->_this (TAO_IN_ENV);
+      TAO_CHECK_RETURN (PortableServer::POA::_nil ());
+    }
+
+  return PortableServer::POA::_duplicate (this->root_poa_reference_.in ());
+}
+
+ACE_INLINE TAO_OA_Parameters *
+TAO_ORB_Core::oa_params (void)
+{
+  return TAO_OC_RETRIEVE (oa_params);
+}
+
 ACE_INLINE
 TAO_ORB_Parameters *
 TAO_ORB_Core::orb_params(void)
 {
-  return this->orb_params_;
+  return TAO_OC_RETRIEVE (orb_params);
 }
 
 ACE_INLINE TAO_Connector_Registry *
@@ -83,6 +116,20 @@ TAO_ORB_Core::acceptor (void)
 #undef TAO_OC_RETRIEVE
 #undef TAO_TRF
 
+ACE_INLINE TAO_POA_Current *
+TAO_ORB_Core::poa_current (void)
+{
+  return poa_current_;
+}
+
+ACE_INLINE TAO_POA_Current *
+TAO_ORB_Core::poa_current (TAO_POA_Current *new_current)
+{
+  TAO_POA_Current *old = poa_current_;
+  poa_current_ = new_current;
+  return old;
+}
+
 ACE_INLINE CORBA::Boolean
 TAO_ORB_Core::using_collocation (void)
 {
@@ -97,27 +144,72 @@ TAO_ORB_Core::using_collocation (CORBA::Boolean use_col)
   return retv;
 }
 
+ACE_INLINE ACE_Allocator*
+TAO_ORB_Core::output_cdr_dblock_allocator (void)
+{
+  return &this->output_cdr_dblock_allocator_;
+}
+
+ACE_INLINE ACE_Allocator*
+TAO_ORB_Core::output_cdr_buffer_allocator (void)
+{
+  return &this->output_cdr_buffer_allocator_;
+}
+
+ACE_INLINE CORBA_Environment*
+TAO_ORB_Core::default_environment (void) const
+{
+  return this->default_environment_;
+}
+
+ACE_INLINE void
+TAO_ORB_Core::default_environment (CORBA_Environment* env)
+{
+  this->default_environment_ = env;
+}
+
 ACE_INLINE ACE_Data_Block*
 TAO_ORB_Core::create_input_cdr_data_block (size_t size)
 {
   return this->resource_factory ()->create_input_cdr_data_block (size);
 }
 
-#if defined (TAO_HAS_CORBA_MESSAGING)
-ACE_INLINE TAO_Policy_Manager*
-TAO_ORB_Core::policy_manager (void)
+// ****************************************************************
+
+ACE_INLINE void
+TAO_Resource_Factory::resource_source (int which_source)
 {
-  return &this->policy_manager_;
+  resource_source_ = which_source;
 }
 
-ACE_INLINE CORBA::Policy_ptr
-TAO_ORB_Core::get_default_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
+ACE_INLINE int
+TAO_Resource_Factory::resource_source (void)
 {
-  return this->default_policies_.get_policy (policy, ACE_TRY_ENV);
+  return resource_source_;
 }
 
-#endif /* TAO_HAS_CORBA_MESSAGING */
+ACE_INLINE void
+TAO_Resource_Factory::poa_source (int which_source)
+{
+  poa_source_ = which_source;
+}
+
+ACE_INLINE int
+TAO_Resource_Factory::poa_source (void)
+{
+  return poa_source_;
+}
+
+ACE_INLINE int
+TAO_Resource_Factory::reactor_lock (void)
+{
+  return reactor_lock_;
+}
+
+ACE_INLINE int
+TAO_Resource_Factory::init (int argc, char *argv[])
+{
+  return this->parse_args (argc, argv);
+}
 
 // ****************************************************************
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 2c6a78db69a..e1acb89e9c4 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -10,11 +10,6 @@
 #include "tao/Servant_Base.h"
 #include "tao/Request.h"
 #include "tao/varout.h"
-#include "tao/IIOP_Profile.h"
-#include "tao/GIOP.h"
-#include "tao/ORB_Core.h"
-#include "tao/Invocation.h"
-#include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Object.i"
@@ -34,7 +29,7 @@ CORBA_Object::~CORBA_Object (void)
   this->protocol_proxy_->_decr_refcnt ();
 }
 
-CORBA_Object::CORBA_Object (TAO_Stub *protocol_proxy,
+CORBA_Object::CORBA_Object (STUB_Object *protocol_proxy,
                             TAO_ServantBase *servant,
                             CORBA::Boolean collocated)
   : servant_ (servant),
@@ -47,16 +42,69 @@ CORBA_Object::CORBA_Object (TAO_Stub *protocol_proxy,
   // implicitly takes a reference.
 }
 
+CORBA::InterfaceDef_ptr
+CORBA_Object::_get_interface (CORBA::Environment &env)
+{
+  static const TAO_Param_Data Object_get_interface_params [] =
+  {
+    { CORBA::_tc_Object, PARAM_RETURN, 0 }
+    // XXX should be tc_InterfaceDef
+  };
+
+  static const TAO_Call_Data Object_get_interface_calldata =
+  {
+    "_interface",
+    1,
+    1,
+    &Object_get_interface_params [0],
+    0, 0
+  };
+
+  CORBA::InterfaceDef_ptr retval = 0;
+
+  // NOTE: If istub->type_id is nonzero, we could try asking a "local"
+  // interface repository and avoid costly network I/O.  (It's wrong
+  // to have different data associated with the same interface ID in
+  // different repositories; the interface is the interface, it
+  // doesn't change!)
+  //
+  // We need to be prepared to ask the object itself for this
+  // information though, since there's no guarantee that any local
+  // interface repository will really have records of this particular
+  // interface.
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env,
+				     &Object_get_interface_calldata,
+				     _tao_arguments);
+  return retval;
+}
+
 // IS_A ... ask the object if it's an instance of the type whose
 // logical type ID is passed as a parameter.
 
 CORBA::Boolean
 CORBA_Object::_is_a (const CORBA::Char *type_id,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &env)
 {
+  static const TAO_Param_Data Object_is_a_params [] =
+  {
+    { CORBA::_tc_boolean, PARAM_RETURN, 0 },
+    { CORBA::_tc_string, PARAM_IN, 0 }
+  };
+
+  static const TAO_Call_Data Object_is_a_calldata =
+  {
+    "_is_a", 1,
+    2, &Object_is_a_params [0],
+    0, 0
+  };
+
   // If the object is collocated then try locally....
   if (this->is_collocated_ && this->servant_ != 0)
-    return this->servant_->_is_a (type_id, ACE_TRY_ENV);
+    return this->servant_->_is_a (type_id, 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.
@@ -78,54 +126,21 @@ CORBA_Object::_is_a (const CORBA::Char *type_id,
       && ACE_OS::strcmp ((char *) type_id, (char *) this->_stubobj ()->type_id) == 0)
     return 1;
 
-  CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_is_a",
-      istub->orb_core ()
-    );
-
-
-  // Loop until we succeed or we raise an exception.
-  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 << type_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;
+  // Our local knowledge about this type is insufficient to say
+  // whether this reference is to an object of a type which "is_a"
+  // subtype of the type whose ID is passed as a parameter.  The
+  // implementation always knows the answer to that question, however!
+
+  CORBA::Boolean retval = 0;
+
+  void* _tao_arguments[2];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  *_tao_current_arg = &type_id; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env,
+				     &Object_is_a_calldata,
+				     _tao_arguments);
+  return retval;
 }
 
 const char*
@@ -146,60 +161,53 @@ CORBA_Object::_is_collocated (void) const
   return this->is_collocated_;
 }
 
+CORBA::ImplementationDef_ptr
+CORBA_Object::_get_implementation (CORBA::Environment &)
+{
+  return 0;
+}
+
 // NON_EXISTENT ... send a simple call to the object, which will
 // either elicit a FALSE response or a OBJECT_NOT_EXIST exception.  In
 // the latter case, return FALSE.
 
 CORBA::Boolean
-CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Object::_non_existent (CORBA::Environment &env)
 {
-  // If the object is collocated then try locally....
-  if (this->is_collocated_ && this->servant_ != 0)
-    return this->servant_->_non_existent (ACE_TRY_ENV);
-
-  CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+  static const TAO_Param_Data Object_non_existent_params [] =
+  {
+    { CORBA::_tc_boolean, PARAM_RETURN, 0 }
+  };
 
+  static const TAO_Call_Data Object_non_existent_calldata =
+  {
+    "_non_existent", 1,
+    1, &Object_non_existent_params [0],
+    0, 0
+  };
 
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_non_existent",
-      istub->orb_core ()
-    );
+  CORBA::Boolean retval = 0;
 
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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)
+  TAO_TRY_VAR (env)
     {
-      ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+      this->_stubobj ()->do_static_call (env,
+                                         &Object_non_existent_calldata,
+                                         _tao_arguments);
+      TAO_CHECK_ENV;
     }
-    break;
-
-  }
+  TAO_CATCH (CORBA::OBJECT_NOT_EXIST, ex)
+    {
+      ACE_UNUSED_ARG (ex);
+      env.clear ();
+      return 1;
+    }
+  TAO_ENDTRY;
 
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  if (!(
-        (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-  return _tao_retval;
+  return 0;
 }
 
 // Quickly hash an object reference's representation data.  Used to
@@ -244,7 +252,7 @@ CORBA::Object::_key (CORBA::Environment &env)
 
 
 // @@ This doesn't seemed to be used anyplace! It should go away!! FRED
-void
+void 
 CORBA::Object::_use_locate_requests (CORBA::Boolean use_it)
 {
   if ( this->_stubobj () )
@@ -253,54 +261,16 @@ CORBA::Object::_use_locate_requests (CORBA::Boolean use_it)
   return;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 void
-CORBA_Object::_create_request (CORBA::Context_ptr ctx,
-                               const CORBA::Char *operation,
+CORBA_Object::_create_request (const CORBA::Char *operation,
                                CORBA::NVList_ptr arg_list,
                                CORBA::NamedValue_ptr result,
                                CORBA::Request_ptr &request,
                                CORBA::Flags req_flags,
                                CORBA::Environment &TAO_IN_ENV)
 {
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  if (ctx)
-    {
-      TAO_THROW (CORBA::NO_IMPLEMENT ());
-    }
-  request = new CORBA::Request (this,
-                                operation,
-                                arg_list,
-                                result,
-                                req_flags,
-                                TAO_IN_ENV);
-}
-
-void
-CORBA_Object::_create_request (CORBA::Context_ptr ctx,
-                               const CORBA::Char *operation,
-                               CORBA::NVList_ptr arg_list,
-                               CORBA::NamedValue_ptr result,
-                               CORBA::ExceptionList_ptr,
-                               CORBA::ContextList_ptr,
-                               CORBA::Request_ptr &request,
-                               CORBA::Flags req_flags,
-                               CORBA::Environment &TAO_IN_ENV)
-{
-  // Since we don't really support Context, anything but a null pointer
-  // is a no-no.
-  if (ctx)
-    {
-      TAO_THROW (CORBA::NO_IMPLEMENT ());
-    }
-  request = new CORBA::Request (this,
-                                operation,
-                                arg_list,
-                                result,
-                                req_flags,
-                                TAO_IN_ENV);
+  TAO_IN_ENV.clear ();
+  request = new CORBA::Request (this, operation, arg_list, result, req_flags);
 }
 
 CORBA::Request_ptr
@@ -308,315 +278,9 @@ CORBA_Object::_request (const CORBA::Char *operation,
                         CORBA::Environment &TAO_IN_ENV)
 {
   TAO_IN_ENV.clear ();
-  return new CORBA::Request (this,
-                             operation,
-                             TAO_IN_ENV);
+  return new CORBA::Request (this, operation);
 }
 
-CORBA::InterfaceDef_ptr
-CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ TODO this method will require some modifications once the
-  // interface repository is implemented. The modifications are
-  // documented with @@ comments.
-
-  // @@ this should use the _nil() method...
-  CORBA::InterfaceDef_ptr _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_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;
-  }
-
-#if 0
-  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-  // @@ The extraction operation (>>) for InterfaceDef will be
-  // defined, and thus this code will work. Right now we raise a
-  // MARSHAL exception....
-  if (!(
-        (_tao_in >> _tao_retval)
-    ))
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-#else
-    ACE_UNUSED_ARG (_tao_retval);
-    ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-#endif
-}
-
-CORBA::ImplementationDef_ptr
-CORBA_Object::_get_implementation (CORBA::Environment &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-CORBA::Policy_ptr
-CORBA_Object::_get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Policy_ptr
-CORBA_Object::_get_client_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_client_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Object_ptr
-CORBA_Object::_set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Stub* stub =
-    this->_stubobj ()->set_policy_overrides (policies,
-                                             set_add,
-                                             ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  return new CORBA_Object (stub,
-                           this->servant_,
-                           this->is_collocated_);
-}
-
-CORBA::PolicyList *
-CORBA_Object::_get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->get_policy_overrides (types, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-CORBA_Object::_validate_connection (
-    CORBA::PolicyList_out inconsistent_policies,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->_stubobj ()->validate_connection (inconsistent_policies,
-                                                 ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-// ****************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR& cdr, const CORBA_Object* x)
-{
-  if (x == 0)
-    {
-      // NIL objrefs ... marshal as empty type hint, no elements.
-      cdr.write_ulong (1);
-      cdr.write_char ('\0');
-      cdr.write_ulong (0);
-      return cdr.good_bit ();
-    }
-
-  TAO_Stub *stubobj = x->_stubobj ();
-
-  if (stubobj == 0)
-    return 0;
-
-  // STRING, a type ID hint
-  if ((cdr << stubobj->type_id) == 0)
-    return 0;
-
-  const TAO_MProfile& mprofile =
-    stubobj->get_base_profiles ();
-
-  CORBA::ULong profile_count = mprofile.profile_count ();
-  if ((cdr << profile_count) == 0)
-    return 0;
-
-  // @@ The MProfile should be locked during this iteration, is there
-  // anyway to achieve that?
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      const TAO_Profile* p = mprofile.get_profile (i);
-      if (p->encode (cdr) == 0)
-        return 0;
-    }
-  return cdr.good_bit ();
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR& cdr, CORBA_Object*& x)
-{
-  CORBA::String_var type_hint;
-
-  if ((cdr >> type_hint.inout ()) == 0)
-    return 0;
-
-  CORBA::ULong profile_count;
-  if ((cdr >> profile_count) == 0)
-    return 0;
-
-  if (profile_count == 0)
-    {
-      x = CORBA::Object::_nil ();
-      return cdr.good_bit ();
-    }
-
-  // get a profile container to store all profiles in the IOR.
-  TAO_MProfile mp (profile_count);
-
-  while (profile_count-- != 0 && cdr.good_bit ())
-    {
-      CORBA::ULong tag;
-
-      // If there is an error we abort
-      if ((cdr >> tag) == 0)
-        continue;
-
-      // @@ For now we just take IIOP_Profiles,  FRED
-      // @@ fred: this is something that we *must* handle correctly,
-      //    the TAO_Profile class must be concrete (or we must have a
-      //    TAO_Generic_Profile class), any profile we don't anything
-      //    about should be converted in one of those
-      //    TAO_Generic_Profiles.
-      //    Also: the right component to decide if we can handle a
-      //    profile or not is the connector registry.
-      //                   Carlos.
-      //
-      if (tag != TAO_IOP_TAG_INTERNET_IOP)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "unknown profile tag %d skipping\n", tag));
-          cdr.skip_string ();
-          continue;
-        }
-
-      // OK, we've got an IIOP profile.  It's going to be
-      // encapsulated ProfileData.  Create a new decoding stream and
-      // context for it, and tell the "parent" stream that this data
-      // isn't part of it any more.
-
-      // ProfileData is encoded as a sequence of octet. So first get
-      // the length of the sequence.
-      CORBA::ULong encap_len;
-      if ((cdr >> encap_len) == 0)
-        continue;
-
-      // Create the decoding stream from the encapsulation in the
-      // buffer, and skip the encapsulation.
-      TAO_InputCDR str (cdr, encap_len);
-
-      if (str.good_bit () == 0
-          || cdr.skip_bytes (encap_len) == 0)
-        continue;
-
-      // get the default IIOP Profile and fill in the blanks
-      // with str.
-      // @@ use an auto_ptr<> here!
-      TAO_IIOP_Profile *pfile;
-      ACE_NEW_RETURN (pfile, TAO_IIOP_Profile, 0);
-
-      int r = 0;
-      ACE_TRY_NEW_ENV
-        {
-          CORBA::Boolean continue_decoding;
-          r = pfile->parse (str, continue_decoding, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "IIOP_Profile::parse raised exception!"
-                      " Shouldn't happen\n"));
-          ACE_TRY_ENV.print_exception ("IIOP_Profile::parse");
-          pfile->_decr_refcnt ();
-          return 0;
-        }
-      ACE_ENDTRY;
-
-      switch (r)
-        {
-          case -1:
-            pfile->_decr_refcnt ();
-            return 0;
-          case 0:
-            pfile->_decr_refcnt ();
-            break;
-          case 1:
-          default:
-            mp.give_profile (pfile);
-            // all other return values indicate success
-            // we do not decrement reference count on profile since we
-            // are giving it to the MProfile!
-            break;
-        } // switch
-
-    } // while loop
-
-  // make sure we got some profiles!
-  if (mp.profile_count () == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "no IIOP v%d.%d (or earlier) profile in IOR!\n",
-                  TAO_IIOP_Profile::DEF_IIOP_MAJOR,
-                  TAO_IIOP_Profile::DEF_IIOP_MINOR));
-      return 0;
-    }
-
-  // Ownership of type_hint is given to TAO_Stub
-  // TAO_Stub will make a copy of mp!
-  TAO_Stub *objdata;
-  ACE_NEW_RETURN (objdata, TAO_Stub (type_hint._retn (),
-                                     mp,
-                                     cdr.orb_core ()), 0);
-
-  if (objdata == 0)
-    return 0;
-
-  // Create a new CORBA_Object and give it the TAO_Stub just
-  // created.
-  TAO_ServantBase *servant =
-    objdata->orb_core ()->orb ()->_get_collocated_servant (objdata);
-
-  ACE_NEW_RETURN (x, CORBA_Object (objdata, servant, servant != 0), 0);
-
-  // the corba proxy would have already incremented the reference count on
-  // the objdata. So we decrement it here by 1 so that the objdata is now
-  // fully owned by the corba_proxy that was created.
-  // objdata->_decr_refcnt ();
-
-  return cdr.good_bit ();
-}
 
 // ****************************************************************
 
@@ -627,13 +291,9 @@ TAO_Object_Field::~TAO_Object_Field (void)
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class TAO_Object_Field_T<CORBA_Object>;
-template class auto_ptr<TAO_MProfile>;
-template class ACE_Auto_Basic_Ptr<TAO_MProfile>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate TAO_Object_Field_T<CORBA_Object>
-#pragma instantiate auto_ptr<TAO_MProfile>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_MProfile>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index e35974ef463..92d443b9bb2 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -28,14 +28,11 @@
 #include "tao/corbafwd.h"
 
 class TAO_ServantBase;
-class TAO_Stub;
+class STUB_Object;
 
 class TAO_Export CORBA_Object
 {
 public:
-  virtual ~CORBA_Object (void);
-  // destructor
-
   static CORBA_Object_ptr _duplicate (CORBA_Object_ptr obj);
   // increment the ref count
 
@@ -43,8 +40,7 @@ public:
   // return a NUL object
 
   static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj,
-                                   CORBA_Environment &TAO_IN_ENV = 
-                                     CORBA::default_environment ());
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // no-op it is just here to simplify some templates.
 
   // These calls correspond to over-the-wire operations, or at least
@@ -53,9 +49,11 @@ public:
   // making such calls, but may be overridden when it appears
   // appropriate.
 
+  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Interface repository related operation
+
   virtual CORBA::Boolean _is_a (const CORBA::Char *logical_type_id,
-                                CORBA_Environment &TAO_IN_ENV = 
-                                  CORBA::default_environment ());
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // determine if we are of the type specified by the "logical_type_id"
 
   virtual const char* _interface_repository_id (void) const;
@@ -68,91 +66,35 @@ public:
   virtual CORBA::Boolean _is_collocated (void) const;
   // are we collocated with the servant?
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = 
-                                          CORBA::default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   virtual CORBA::ImplementationDef_ptr
-      _get_implementation (CORBA_Environment &TAO_IN_ENV = 
-                             CORBA::default_environment ());
+      _get_implementation (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This method is deprecated in the CORBA 2.2 spec, we just return 0
   // every time.
 
-  virtual CORBA::InterfaceDef_ptr _get_interface (CORBA_Environment &TAO_IN_ENV = 
-                                                    CORBA::default_environment ());
-
-  // Interface repository related operations.
+  virtual CORBA::Boolean _non_existent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  // DII operations to create a request.
-  //
-  // The mapping for create_request is split into two forms,
-  // corresponding to the two usage styles described in CORBA section
-  // 6.2.1.
-
-  virtual void _create_request (CORBA::Context_ptr ctx,
-                                const CORBA::Char *operation,
+  virtual void _create_request (const CORBA::Char *operation,
                                 CORBA::NVList_ptr arg_list,
                                 CORBA::NamedValue_ptr result,
                                 CORBA::Request_ptr &request,
                                 CORBA::Flags req_flags,
-                                CORBA_Environment &TAO_IN_ENV = 
-                                  CORBA::default_environment ());
-
-  virtual void _create_request (CORBA::Context_ptr ctx,
-                                const CORBA::Char *operation,
-                                CORBA::NVList_ptr arg_list,
-                                CORBA::NamedValue_ptr result,
-                                CORBA::ExceptionList_ptr exclist,
-                                CORBA::ContextList_ptr ctxtlist,
-                                CORBA::Request_ptr &request,
-                                CORBA::Flags req_flags,
-                                CORBA_Environment &TAO_IN_ENV = 
-                                  CORBA::default_environment ());
-
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // DII operation to create a request.
+  //
+  // The mapping for create_request is split into two forms,
+  // corresponding to the two usage styles described in CORBA section
+  // 6.2.1.
+  //
   // The default implementation of this method uses the same simple,
   // multi-protocol remote invocation interface as is assumed by the
   // calls above ... that's how it can have a default implementation.
 
   virtual CORBA::Request_ptr _request (const CORBA::Char *operation,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                        CORBA::default_environment ());
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // DII operation to create a request.
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  CORBA::Policy_ptr _get_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::Policy_ptr _get_client_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::Object_ptr _set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::PolicyList * _get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::Boolean _validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
   virtual CORBA::ULong _hash (CORBA::ULong maximum,
-                              CORBA_Environment &TAO_IN_ENV = 
-                                CORBA::default_environment ());
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Return a (potentially non-unique) hash value for this object.
   // This method relies on the representation of the object
   // reference's private state.  Since that changes easily (when
@@ -160,26 +102,12 @@ public:
   // implementation.
 
   virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj,
-                                         CORBA_Environment &TAO_IN_ENV = 
-                                           CORBA::default_environment ());
+                                         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Try to determine if this object is the same as <other_obj>.  This
   // method relies on the representation of the object reference's
   // private state.  Since that changes easily (when different ORB
   // protocols are in use) there is no default implementation.
 
-  virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = 
-                                 CORBA::default_environment ());
-  // Return the object key as an out parameter.  Caller should release
-  // return value when finished with it.
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Object_ptr _ptr_type;
-  typedef CORBA_Object_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  // = TAO extensions
-
   // = Reference count managment.
   CORBA::ULong _incr_refcnt (void);
   // Increment the reference count.
@@ -187,12 +115,19 @@ public:
   CORBA::ULong _decr_refcnt (void);
   // Decrement the reference count.
 
-  CORBA_Object (TAO_Stub *p = 0,
+  CORBA_Object (STUB_Object *p = 0,
                 TAO_ServantBase *servant = 0,
                 CORBA::Boolean collocated = 0);
   // constructor
 
-  virtual TAO_Stub *_stubobj (void) const;
+  virtual ~CORBA_Object (void);
+  // destructor
+
+  virtual TAO_ObjectKey *_key (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Return the object key as an out parameter.  Caller should release
+  // return value when finished with it.
+
+  virtual STUB_Object *_stubobj (void);
   // get the underlying stub object
 
   virtual void _use_locate_requests (CORBA::Boolean use_it);
@@ -208,7 +143,7 @@ protected:
   // objects.
 
 private:
-  TAO_Stub *protocol_proxy_;
+  STUB_Object *protocol_proxy_;
   // Pointer to the protocol-specific "object" containing important
   // profiling information regarding this proxy.
   // The protocol proxy is (potentially) shared among several
@@ -292,18 +227,11 @@ public:
   // destructor
 
   virtual void _downcast (CORBA_Object* base_ptr,
-                          CORBA_Environment &TAO_IN_ENV = 
-                            CORBA::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   virtual CORBA_Object* _upcast (void) = 0;
   virtual void _release (void) = 0;
 };
 
-extern TAO_Export CORBA::Boolean
-operator<< (TAO_OutputCDR&, const CORBA_Object*);
-
-extern TAO_Export CORBA::Boolean
-operator>> (TAO_InputCDR&, CORBA_Object*&);
-
 #if defined (__ACE_INLINE__)
 # include "tao/Object.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Object.i b/TAO/tao/Object.i
index f06fdef545a..849345c2047 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -51,8 +51,8 @@ CORBA::is_nil (CORBA::Object_ptr obj)
   return obj == 0;
 }
 
-ACE_INLINE TAO_Stub *
-CORBA_Object::_stubobj (void) const
+ACE_INLINE STUB_Object *
+CORBA_Object::_stubobj (void)
 {
   return this->protocol_proxy_;
 }
diff --git a/TAO/tao/ObjectIDList.cpp b/TAO/tao/ObjectIDList.cpp
deleted file mode 100644
index a283fcd3fed..00000000000
--- a/TAO/tao/ObjectIDList.cpp
+++ /dev/null
@@ -1,148 +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
-//
-// Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#include "ObjectIDList.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ObjectIDList.i"
-#endif /* !defined INLINE */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CS_)
-#define _CORBA_ORB_OBJECTIDLIST_CS_
-
-// *************************************************************
-// CORBA_ORB_ObjectIdList
-// *************************************************************
-
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (void)
-{}
-CORBA_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (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_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (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_ORB_ObjectIdList::CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &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_ORB_ObjectIdList::~CORBA_ORB_ObjectIdList (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_CORBA_ORB_ObjectIdList[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49644c69), ACE_NTOHL (0x73743a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectIdList:1.0
-  13, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x0),  // name = ObjectIdList
-  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
-      35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f52), ACE_NTOHL (0x422f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ORB/ObjectId:1.0
-      9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
-      CORBA::tk_string,
-      0, // string length
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ORB_ObjectIdList (CORBA::tk_alias, sizeof (_oc_CORBA_ORB_ObjectIdList), (char *) &_oc_CORBA_ORB_ObjectIdList, 0, sizeof (CORBA_ORB_ObjectIdList));
-CORBA::TypeCode_ptr CORBA::ORB::_tc_ObjectIdList = &_tc_TAO_tc_CORBA_ORB_ObjectIdList;
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_ORB_ObjectIdList &_tao_elem
-  ) // copying
-{
-  CORBA_ORB_ObjectIdList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_ORB_ObjectIdList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ORB::_tc_ObjectIdList, _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_ORB_ObjectIdList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_ORB_ObjectIdList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::ORB::_tc_ObjectIdList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_ORB_ObjectIdList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_ORB_ObjectIdList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::ORB::_tc_ObjectIdList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::ORB::_tc_ObjectIdList, _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;
-}
diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h
deleted file mode 100644
index 3d9aad56281..00000000000
--- a/TAO/tao/ObjectIDList.h
+++ /dev/null
@@ -1,143 +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
-//
-//  Hand Modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#ifndef OBJECTIDLIST_H_
-#define OBJECTIDLIST_H_
-
-#include "tao/corba.h"
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.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(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
-#define _CORBA_ORB_OBJECTIDLIST_CH_
-
-// *************************************************************
-// ObjectIdList
-// *************************************************************
-
-class  CORBA_ORB_ObjectIdList : 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_ORB_ObjectIdList (void); // default ctor
- CORBA_ORB_ObjectIdList (CORBA::ULong max); // uses max size
- CORBA_ORB_ObjectIdList (
-               CORBA::ULong max,
-               CORBA::ULong length,
-               char * *buffer,
-               CORBA::Boolean release=0
-               );
- CORBA_ORB_ObjectIdList (const CORBA_ORB_ObjectIdList &); // copy ctor
- ~CORBA_ORB_ObjectIdList (void); // dtor
-};
-
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___VAR_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___VAR_CH_
-
-// *************************************************************
-// class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-class CORBA_ORB_ObjectIdList_var
-{
-public:
-  CORBA_ORB_ObjectIdList_var (void); // default constructor
-  CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &); // copy constructor
-  ~CORBA_ORB_ObjectIdList_var (void); // destructor
-
-  CORBA_ORB_ObjectIdList_var &operator= (CORBA_ORB_ObjectIdList *);
-  CORBA_ORB_ObjectIdList_var &operator= (const CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  const CORBA_ORB_ObjectIdList *operator-> (void) const;
-
-  operator const CORBA_ORB_ObjectIdList &() const;
-  operator CORBA_ORB_ObjectIdList &();
-  operator CORBA_ORB_ObjectIdList &() const;
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const CORBA_ORB_ObjectIdList &in (void) const;
-  CORBA_ORB_ObjectIdList &inout (void);
-  CORBA_ORB_ObjectIdList *&out (void);
-  CORBA_ORB_ObjectIdList *_retn (void);
-  CORBA_ORB_ObjectIdList *ptr (void) const;
-
-private:
-  CORBA_ORB_ObjectIdList *ptr_;
-};
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST___OUT_CH_)
-#define _CORBA_ORB_OBJECTIDLIST___OUT_CH_
-
-class CORBA_ORB_ObjectIdList_out
-{
-public:
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&);
-  CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &);
-  CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (const CORBA_ORB_ObjectIdList_out &);
-  CORBA_ORB_ObjectIdList_out &operator= (CORBA_ORB_ObjectIdList *);
-  operator CORBA_ORB_ObjectIdList *&();
-  CORBA_ORB_ObjectIdList *&ptr (void);
-  CORBA_ORB_ObjectIdList *operator-> (void);
-  TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
-private:
-  CORBA_ORB_ObjectIdList *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_ObjectIdList_var &);
-};
-
-#endif /* end #if !defined */
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ORB_ObjectIdList &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ORB_ObjectIdList &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "ObjectIDList.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/ObjectIDList.i b/TAO/tao/ObjectIDList.i
deleted file mode 100644
index 81f58ef39c9..00000000000
--- a/TAO/tao/ObjectIDList.i
+++ /dev/null
@@ -1,231 +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
-//
-// Hand modified by Vishal Kachroo <vishal@cs.wustl.edu>
-//
-
-#if !defined (_CORBA_ORB_OBJECTIDLIST_I_)
-#define _CORBA_ORB_OBJECTIDLIST_I_
-
-// *************************************************************
-// Inline operations for class CORBA::ORB::ObjectIdList_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (CORBA_ORB_ObjectIdList *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::CORBA_ORB_ObjectIdList_var (const CORBA_ORB_ObjectIdList_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ORB_ObjectIdList(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::~CORBA_ORB_ObjectIdList_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_var &
-CORBA_ORB_ObjectIdList_var::operator= (const CORBA_ORB_ObjectIdList_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ORB_ObjectIdList (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator const CORBA_ORB_ObjectIdList &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_var::operator CORBA_ORB_ObjectIdList &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList &
-CORBA_ORB_ObjectIdList_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::_retn (void)
-{
-  CORBA_ORB_ObjectIdList *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ORB_ObjectIdList_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (CORBA_ORB_ObjectIdList_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::CORBA_ORB_ObjectIdList_out (const CORBA_ORB_ObjectIdList_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (const CORBA_ORB_ObjectIdList_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ORB_ObjectIdList_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList_out &
-CORBA_ORB_ObjectIdList_out::operator= (CORBA_ORB_ObjectIdList *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_ORB_ObjectIdList_out::operator CORBA_ORB_ObjectIdList *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *&
-CORBA_ORB_ObjectIdList_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ORB_ObjectIdList *
-CORBA_ORB_ObjectIdList_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TAO_SeqElem_String_Manager
-CORBA_ORB_ObjectIdList_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#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
deleted file mode 100644
index d8daa7dbd11..00000000000
--- a/TAO/tao/Object_Adapter.cpp
+++ /dev/null
@@ -1,1020 +0,0 @@
-// $Id$
-
-#include "tao/Object_Adapter.h"
-#include "tao/POA.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/Server_Request.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, POA, "$Id$")
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Timeprobes class
-#include "tao/Timeprobe.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Object_Adapter_Timeprobe_Description[] =
-{
-  "Object_Adapter::dispatch_servant - start",
-  "Object_Adapter::dispatch_servant - end",
-
-  "POA::parse_key - start",
-  "POA::parse_key - end",
-
-  "Object_Adapter::find_poa - start",
-  "Object_Adapter::find_poa - end",
-
-  "POA::locate_servant - start",
-  "POA::locate_servant - end",
-
-  "Servant::_dispatch - start",
-  "Servant::_dispatch - end",
-};
-
-enum
-{
-  // Timeprobe description table start key
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START = 200,
-  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_END,
-
-  TAO_POA_PARSE_KEY_START,
-  TAO_POA_PARSE_KEY_END,
-
-  TAO_OBJECT_ADAPTER_FIND_POA_START,
-  TAO_OBJECT_ADAPTER_FIND_POA_END,
-
-  TAO_POA_LOCATE_SERVANT_START,
-  TAO_POA_LOCATE_SERVANT_END,
-
-  TAO_SERVANT_DISPATCH_START,
-  TAO_SERVANT_DISPATCH_END
-};
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Object_Adapter_Timeprobe_Description,
-                                  TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-////////////////////////////////////////////////////////////////////////////////
-
-/* static */
-size_t TAO_Object_Adapter::transient_poa_name_size_ (0);
-
-void
-TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters)
-{
-  if (TAO_Object_Adapter::transient_poa_name_size_ == 0)
-    {
-      switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-        {
-        case TAO_LINEAR:
-
-          TAO_Object_Adapter::transient_poa_name_size_ = sizeof (CORBA::ULong);
-          break;
-
-        case TAO_DYNAMIC_HASH:
-
-          TAO_Object_Adapter::transient_poa_name_size_ = sizeof (CORBA::ULong);
-          break;
-
-        case TAO_ACTIVE_DEMUX:
-        default:
-
-          TAO_Object_Adapter::transient_poa_name_size_ = ACE_Active_Map_Manager_Key::size ();
-          break;
-        }
-    }
-}
-
-TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                                        TAO_ORB_Core &orb_core)
-  : hint_strategy_ (0),
-    persistent_poa_name_map_ (0),
-    transient_poa_map_ (0),
-    orb_core_ (orb_core),
-    enable_locking_ (orb_core_.server_factory ()->enable_poa_locking ()),
-    thread_lock_ (),
-    lock_ (TAO_Object_Adapter::create_lock (enable_locking_,
-                                            thread_lock_)),
-    reverse_lock_ (*lock_),
-    non_servant_upcall_condition_ (thread_lock_),
-    non_servant_upcall_in_progress_ (0),
-    non_servant_upcall_thread_ (ACE_OS::NULL_thread)
-{
-  TAO_Object_Adapter::set_transient_poa_name_size (creation_parameters);
-
-  Hint_Strategy *hint_strategy = 0;
-  if (creation_parameters.use_active_hint_in_poa_names_)
-    {
-      ACE_NEW (hint_strategy,
-               Active_Hint_Strategy (creation_parameters.poa_map_size_));
-    }
-  else
-    {
-      ACE_NEW (hint_strategy,
-               No_Hint_Strategy);
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<Hint_Strategy> new_hint_strategy (hint_strategy);
-
-  new_hint_strategy->object_adapter (this);
-
-  persistent_poa_name_map *ppnm;
-  switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
-    {
-    case TAO_LINEAR:
-
-      ACE_NEW (ppnm,
-               persistent_poa_name_linear_map (creation_parameters.poa_map_size_));
-      break;
-
-    case TAO_DYNAMIC_HASH:
-    default:
-
-      ACE_NEW (ppnm,
-               persistent_poa_name_hash_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<persistent_poa_name_map> new_persistent_poa_name_map (ppnm);
-
-  transient_poa_map *tpm = 0;
-  switch (creation_parameters.poa_lookup_strategy_for_transient_id_policy_)
-    {
-    case TAO_LINEAR:
-
-      ACE_NEW (tpm,
-               transient_poa_linear_map (creation_parameters.poa_map_size_));
-      break;
-
-    case TAO_DYNAMIC_HASH:
-
-      ACE_NEW (tpm,
-               transient_poa_hash_map (creation_parameters.poa_map_size_));
-      break;
-
-    case TAO_ACTIVE_DEMUX:
-    default:
-
-      ACE_NEW (tpm,
-               transient_poa_active_map (creation_parameters.poa_map_size_));
-      break;
-    }
-  // Give ownership to the auto pointer.
-  auto_ptr<transient_poa_map> new_transient_poa_map (tpm);
-
-  this->hint_strategy_ = new_hint_strategy.release ();
-  this->persistent_poa_name_map_ = new_persistent_poa_name_map.release ();
-  this->transient_poa_map_ = new_transient_poa_map.release ();
-}
-
-TAO_Object_Adapter::~TAO_Object_Adapter (void)
-{
-  delete this->hint_strategy_;
-  delete this->persistent_poa_name_map_;
-  delete this->transient_poa_map_;
-
-  delete this->lock_;
-}
-
-/* static */
-ACE_Lock *
-TAO_Object_Adapter::create_lock (int enable_locking,
-                                 ACE_SYNCH_MUTEX &thread_lock)
-{
-#if defined (ACE_HAS_THREADS)
-  if (enable_locking)
-    {
-      ACE_Lock *the_lock = 0;
-
-      ACE_NEW_RETURN (the_lock,
-                      ACE_Lock_Adapter<ACE_SYNCH_MUTEX> (thread_lock),
-                      0);
-
-      return the_lock;
-    }
-#endif /* ACE_HAS_THREADS */
-
-  ACE_Lock *the_lock = 0;
-
-  ACE_NEW_RETURN (the_lock,
-                  ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
-                  0);
-
-  return the_lock;
-}
-
-void
-TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
-                                      CORBA::ServerRequest &req,
-                                      void *context,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_DISPATCH_SERVANT_START);
-
-  // Lock access to the POA for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
-
-  this->dispatch_servant_i (key,
-                            req,
-                            context,
-                            ACE_TRY_ENV);
-}
-
-void
-TAO_Object_Adapter::dispatch_servant_i (const TAO_ObjectKey &key,
-                                        CORBA::ServerRequest &req,
-                                        void *context,
-                                        CORBA_Environment &ACE_TRY_ENV)
-{
-  // Check if a non-servant upcall is in progress, and make sure it is
-  // not this thread which is making the upcall.
-  while (this->enable_locking_ &&
-         this->non_servant_upcall_in_progress_ &&
-         ! ACE_OS::thr_equal (this->non_servant_upcall_thread_,
-                              ACE_OS::thr_self ()))
-    {
-      // If so wait...
-      int result = this->non_servant_upcall_condition_.wait ();
-      if (result == -1)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-  PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa,
-                    ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Setup for POA Current
-  const char *operation = req.operation ();
-  TAO_POA_Current_Impl current_context (poa,
-                                        key,
-                                        0,
-                                        operation,
-                                        this->orb_core_);
-
-  PortableServer::Servant servant = 0;
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
-
-    servant = poa->locate_servant_i (operation,
-                                     id,
-                                     &current_context,
-                                     ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-
-  // Now that we know the servant.
-  current_context.servant (servant);
-
-  {
-    // Outstanding_Requests has a magic constructor and destructor.
-    // We increment <POA::outstanding_requests_> in the constructor.
-    // We decrement <POA::outstanding_requests_> in the destructor.
-    // Note that the lock is released after
-    // <POA::outstanding_requests_> is increased and
-    // <POA::outstanding_requests_> is decreased after the lock has
-    // been reacquired.
-    Outstanding_Requests outstanding_requests (*poa,
-                                               *this);
-    ACE_UNUSED_ARG (outstanding_requests);
-
-    // This class helps us by locking servants in a single threaded
-    // POA for the duration of the upcall.  Single_Threaded_POA_Lock
-    // has a magic constructor and destructor.  We acquire the servant
-    // lock in the constructor.  We release the servant lock in the
-    // destructor.
-    Single_Threaded_POA_Lock single_threaded_poa_lock (*poa,
-                                                       servant);
-    ACE_UNUSED_ARG (single_threaded_poa_lock);
-
-    // Unlock for the duration of the servant upcall.  Reacquire once
-    // the upcall completes. Even though we are releasing the lock,
-    // the servant entry in the active object map is reference counted
-    // and will not get removed/deleted prematurely.
-    TAO_POA_GUARD (ACE_Lock, monitor, this->reverse_lock (), ACE_TRY_ENV);
-
-    ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
-
-    // Upcall
-    servant->_dispatch (req,
-                        context,
-                        ACE_TRY_ENV);
-    ACE_CHECK;
-  }
-}
-
-void
-TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key,
-                                PortableServer::ObjectId &system_id,
-                                TAO_POA *&poa,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = 0;
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
-
-    result = TAO_POA::parse_key (key,
-                                 poa_system_name,
-                                 system_id,
-                                 is_root,
-                                 is_persistent,
-                                 is_system_id,
-                                 poa_creation_time);
-  }
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  {
-    ACE_FUNCTION_TIMEPROBE (TAO_OBJECT_ADAPTER_FIND_POA_START);
-
-    result = this->find_poa (poa_system_name,
-                             is_persistent,
-                             is_root,
-                             poa_creation_time,
-                             poa,
-                             ACE_TRY_ENV);
-  }
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST ());
-    }
-}
-
-int
-TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_POA *&poa,
-                                  CORBA_Environment &ACE_TRY_ENV)
-{
-  int result = -1;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the adapter
-  // activator(s) upcalls; reacquiring once the upcalls complete.
-  // Even though we are releasing the lock, other threads will not be
-  // able to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  Non_Servant_Upcall non_servant_upcall (*this);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  iteratable_poa_name ipn (folded_name);
-  iteratable_poa_name::iterator iterator = ipn.begin ();
-  iteratable_poa_name::iterator end = ipn.end ();
-
-  TAO_POA *parent = this->orb_core_.root_poa ();
-  if (parent->name () != *iterator)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        -1);
-    }
-  else
-    {
-      ++iterator;
-    }
-
-  for (;
-       iterator != end;
-       ++iterator)
-    {
-      TAO_POA *current = parent->find_POA_i (*iterator,
-                                             1,
-                                             ACE_TRY_ENV);
-      ACE_CHECK_RETURN (-1);
-
-      parent = current;
-    }
-
-  poa = parent;
-  result = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
-                                        CORBA::Boolean root,
-                                        const TAO_Temporary_Creation_Time &poa_creation_time,
-                                        TAO_POA *&poa)
-{
-  int result = 0;
-
-  if (root)
-    poa = this->orb_core_.root_poa ();
-  else
-    result = this->transient_poa_map_->find (system_name,
-                                             poa);
-  if (result == 0 && poa->creation_time () != poa_creation_time)
-    result = -1;
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
-                              TAO_POA *poa,
-                              poa_name_out system_name)
-{
-  if (poa->persistent ())
-    {
-      return this->bind_persistent_poa (folded_name,
-                                        poa,
-                                        system_name);
-    }
-  else
-    {
-      return this->bind_transient_poa (poa,
-                                       system_name);
-    }
-}
-
-int
-TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
-                                const poa_name &folded_name,
-                                const poa_name &system_name)
-{
-  if (poa->persistent ())
-    {
-      return this->unbind_persistent_poa (folded_name,
-                                          system_name);
-    }
-  else
-    {
-      return this->unbind_transient_poa (system_name);
-    }
-}
-
-int
-TAO_Object_Adapter::locate_servant_i (const TAO_ObjectKey &key,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::Servant servant = 0;
-  TAO_POA::LOCATION_RESULT result = poa->locate_servant_i (id,
-                                                           servant,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  switch (result)
-    {
-    case TAO_POA::FOUND:
-      // Optimistic attitude
-    case TAO_POA::DEFAULT_SERVANT:
-    case TAO_POA::SERVANT_MANAGER:
-      return 0;
-
-    case TAO_POA::NOT_FOUND:
-      return -1;
-    }
-
-  return -1;
-}
-
-PortableServer::Servant
-TAO_Object_Adapter::find_servant_i (const TAO_ObjectKey &key,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
-
-  this->locate_poa (key,
-                    id,
-                    poa,
-                    ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::Servant servant = 0;
-  TAO_POA::LOCATION_RESULT result = poa->locate_servant_i (id,
-                                                           servant,
-                                                           ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  switch (result)
-    {
-    case TAO_POA::FOUND:
-      return servant;
-
-    case TAO_POA::DEFAULT_SERVANT:
-    case TAO_POA::SERVANT_MANAGER:
-    case TAO_POA::NOT_FOUND:
-      return 0;
-    }
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void)
-{
-}
-
-void
-TAO_Object_Adapter::Hint_Strategy::object_adapter (TAO_Object_Adapter *oa)
-{
-  this->object_adapter_ = oa;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map_size)
-  : persistent_poa_system_map_ (map_size)
-{
-}
-
-TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                               TAO_POA *&poa,
-                                                               CORBA_Environment &ACE_TRY_ENV)
-{
-  poa_name folded_name;
-  int result = this->persistent_poa_system_map_.recover_key (system_name,
-                                                             folded_name);
-
-  if (result == 0)
-    {
-      result = this->persistent_poa_system_map_.find (system_name,
-                                                      poa);
-      if (result != 0 ||
-          folded_name != poa->folded_name ())
-        {
-          result = this->object_adapter_->persistent_poa_name_map_->find (folded_name,
-                                                                          poa);
-          if (result != 0)
-            {
-              result = this->object_adapter_->activate_poa (folded_name,
-                                                            poa,
-                                                            ACE_TRY_ENV);
-            }
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::bind_persistent_poa (const poa_name &folded_name,
-                                                               TAO_POA *poa,
-                                                               poa_name_out system_name)
-{
-  poa_name name = folded_name;
-  int result = this->persistent_poa_system_map_.bind_modify_key (poa,
-                                                                 name);
-
-  if (result == 0)
-    {
-      result = this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                                      poa);
-
-      if (result != 0)
-        {
-          this->persistent_poa_system_map_.unbind (name);
-        }
-      else
-        {
-          ACE_NEW_RETURN (system_name,
-                          poa_name (name),
-                          -1);
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa (const poa_name &folded_name,
-                                                                 const poa_name &system_name)
-{
-  int result = this->persistent_poa_system_map_.unbind (system_name);
-
-  if (result == 0)
-    {
-      result = this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-    }
-
-  return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
-{
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (const poa_name &system_name,
-                                                           TAO_POA *&poa,
-                                                           CORBA_Environment &ACE_TRY_ENV)
-{
-  int result = this->object_adapter_->persistent_poa_name_map_->find (system_name,
-                                                                      poa);
-  if (result != 0)
-    {
-      result = this->object_adapter_->activate_poa (system_name,
-                                                    poa,
-                                                    ACE_TRY_ENV);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (const poa_name &folded_name,
-                                                           TAO_POA *poa,
-                                                           poa_name_out system_name)
-{
-  int result = this->object_adapter_->persistent_poa_name_map_->bind (folded_name,
-                                                                      poa);
-  if (result == 0)
-    {
-      ACE_NEW_RETURN (system_name,
-                      poa_name (folded_name),
-                      -1);
-    }
-
-  return result;
-}
-
-int
-TAO_Object_Adapter::No_Hint_Strategy::unbind_persistent_poa (const poa_name &folded_name,
-                                                             const poa_name &system_name)
-{
-  ACE_UNUSED_ARG (system_name);
-
-  return this->object_adapter_->persistent_poa_name_map_->unbind (folded_name);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::poa_name_iterator::poa_name_iterator (int begin,
-                                                          CORBA::ULong size,
-                                                          const CORBA::Octet *folded_buffer)
-  : size_ (size),
-    folded_buffer_ (folded_buffer),
-    last_separator_ (~0)
-{
-  if (begin)
-    {
-      this->position_ = ~0;
-      this->operator++ ();
-    }
-  else
-    {
-      this->position_ = this->size_;
-    }
-}
-
-int
-TAO_Object_Adapter::poa_name_iterator::operator== (const poa_name_iterator &rhs) const
-{
-  return this->position_ == rhs.position_;
-}
-
-int
-TAO_Object_Adapter::poa_name_iterator::operator!= (const poa_name_iterator &rhs) const
-{
-  return !this->operator== (rhs);
-}
-
-ACE_CString
-TAO_Object_Adapter::poa_name_iterator::operator* () const
-{
-  CORBA::ULong start_at =
-    this->last_separator_ +
-    TAO_POA::name_separator_length ();
-
-  CORBA::ULong how_many =
-    this->position_ -
-    this->last_separator_ -
-    TAO_POA::name_separator_length ();
-
-  return ACE_CString (ACE_reinterpret_cast (const char *,
-                                            &this->folded_buffer_[start_at]),
-                      how_many);
-}
-
-TAO_Object_Adapter::poa_name_iterator &
-TAO_Object_Adapter::poa_name_iterator::operator++ (void)
-{
-  this->last_separator_ = this->position_;
-
-  while (1)
-    {
-      ++this->position_;
-      if (this->position_ < this->size_)
-        {
-          if (this->folded_buffer_[this->position_] == TAO_POA::name_separator ())
-            {
-              break;
-            }
-        }
-      else
-        {
-          break;
-        }
-    }
-
-  return *this;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name (const poa_name &folded_name)
-  : folded_name_ (folded_name)
-{
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::begin (void) const
-{
-  return iterator (1,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-TAO_Object_Adapter::iteratable_poa_name::iterator
-TAO_Object_Adapter::iteratable_poa_name::end (void) const
-{
-  return iterator (0,
-                   this->folded_name_.length (),
-                   this->folded_name_.get_buffer ());
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::Non_Servant_Upcall::Non_Servant_Upcall (TAO_Object_Adapter &object_adapter)
-  : object_adapter_ (object_adapter)
-{
-  // Mark the fact that a non-servant upcall is in progress.
-  this->object_adapter_.non_servant_upcall_in_progress_ = 1;
-
-  // Remember which thread is calling the adapter activators.
-  this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::thr_self ();
-
-  // Release the Object Adapter lock.
-  this->object_adapter_.lock ().release ();
-}
-
-TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
-{
-  // Reacquire the Object Adapter lock.
-  this->object_adapter_.lock ().acquire ();
-
-  // We are no longer in a non-servant upcall.
-  this->object_adapter_.non_servant_upcall_in_progress_ = 0;
-
-  // Reset thread id.
-  this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::NULL_thread;
-
-  // If locking is enabled.
-  if (this->object_adapter_.enable_locking_)
-    {
-      // Wakeup all waiting threads.
-      this->object_adapter_.non_servant_upcall_condition_.broadcast ();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::Outstanding_Requests::Outstanding_Requests (TAO_POA &poa,
-                                                                TAO_Object_Adapter &object_adapter)
-  : poa_ (poa),
-    object_adapter_ (object_adapter)
-{
-  // Increase <poa->outstanding_requests_>.
-  this->poa_.increment_outstanding_requests ();
-}
-
-TAO_Object_Adapter::Outstanding_Requests::~Outstanding_Requests (void)
-{
-  // Decrease <poa->outstanding_requests_>.
-  CORBA::ULong outstanding_requests = this->poa_.decrement_outstanding_requests ();
-
-  // If locking is enabled and some thread is waiting in POA::destroy.
-  if (this->object_adapter_.enable_locking_ &&
-      outstanding_requests == 0 &&
-      this->poa_.destroy_pending_)
-    {
-      // Wakeup all waiting threads.
-      this->poa_.outstanding_requests_condition_.broadcast ();
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-TAO_Object_Adapter::Single_Threaded_POA_Lock::Single_Threaded_POA_Lock (TAO_POA &poa,
-                                                                        PortableServer::Servant servant)
-  : poa_ (poa),
-    servant_ (servant)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->poa_.policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      this->servant_->_single_threaded_poa_lock ().acquire ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-TAO_Object_Adapter::Single_Threaded_POA_Lock::~Single_Threaded_POA_Lock (void)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->poa_.policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      this->servant_->_single_threaded_poa_lock ().release ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
-typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-template class ACE_Reverse_Lock<ACE_Lock>;
-template class ACE_Guard<REVERSE_LOCK>;
-
-template class auto_ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class auto_ptr<TAO_Object_Adapter::transient_poa_map>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>;
-template class ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>;
-
-template class ACE_Noop_Key_Generator<key>;
-
-// Common
-template class ACE_Reference_Pair<const key, value>;
-
-// Map and iterator classes.
-template class ACE_Map<key, value>;
-template class ACE_Iterator<value_type>;
-template class ACE_Reverse_Iterator<value_type>;
-
-// Iterator base classes.
-template class ACE_Iterator_Impl<value_type>;
-template class ACE_Reverse_Iterator_Impl<value_type>;
-
-// Active Map Manager related.
-template class ACE_Pair<key, value>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>;
-template class ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>;
-template class ACE_Active_Map_Manager<expanded_value>;
-template class ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>;
-
-// Hash Map Manager related.
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>;
-template class ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>;
-template class ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>;
-template class ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<key, value>;
-
-// Already in Active_Object_Map.cpp
-// template class ACE_Equal_To<key>;
-
-// Map Manager related.
-template class ACE_Map_Manager_Iterator_Adapter<value_type, key, value>;
-template class ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, key, value>;
-template class ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>;
-template class ACE_Map_Manager_Adapter<key, value, noop_key_generator>;
-template class ACE_Map_Manager<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>;
-template class ACE_Map_Entry<key, value>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// Common typedefs.
-typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
-typedef ACE_Reverse_Lock<ACE_Lock> REVERSE_LOCK;
-
-typedef ACE_Pair<key, value> expanded_value;
-typedef ACE_Reference_Pair<const key, value> value_type;
-typedef ACE_Equal_To<key> compare_keys;
-typedef TAO_ObjectId_Hash hash_key;
-typedef ACE_Noop_Key_Generator<key> noop_key_generator;
-
-#pragma instantiate ACE_Reverse_Lock<ACE_Lock>
-#pragma instantiate ACE_Guard<REVERSE_LOCK>
-
-#pragma instantiate auto_ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate auto_ptr<TAO_Object_Adapter::transient_poa_map>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::Hint_Strategy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Object_Adapter::transient_poa_map>
-
-#pragma instantiate ACE_Noop_Key_Generator<key>
-
-// Common
-#pragma instantiate ACE_Reference_Pair<const key, value>
-
-// Map and iterator classes.
-#pragma instantiate ACE_Map<key, value>
-#pragma instantiate ACE_Iterator<value_type>
-#pragma instantiate ACE_Reverse_Iterator<value_type>
-
-// Iterator base classes.
-#pragma instantiate ACE_Iterator_Impl<value_type>
-#pragma instantiate ACE_Reverse_Iterator_Impl<value_type>
-
-// Active Map Manager related.
-#pragma instantiate ACE_Pair<key, value>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Ignore_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Adapter<key, value, TAO_Preserve_Original_Key_Adapter>
-#pragma instantiate ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value>
-#pragma instantiate ACE_Active_Map_Manager<expanded_value>
-#pragma instantiate ACE_Map_Manager<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, expanded_value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, expanded_value>
-
-// Hash Map Manager related.
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Adapter<key, value, hash_key, compare_keys, noop_key_generator>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, key, value, hash_key, compare_keys>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<key, value, hash_key, compare_keys, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Entry<key, value>
-
-// Already in Active_Object_Map.cpp
-// #pragma instantiate ACE_Equal_To<key>
-
-// Map Manager related.
-#pragma instantiate ACE_Map_Manager_Iterator_Adapter<value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, key, value>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, TAO_Incremental_Key_Generator>
-#pragma instantiate ACE_Map_Manager_Adapter<key, value, noop_key_generator>
-#pragma instantiate ACE_Map_Manager<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator_Base<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Reverse_Iterator<key, value, ACE_Null_Mutex>
-#pragma instantiate ACE_Map_Entry<key, value>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h
deleted file mode 100644
index f41875430d4..00000000000
--- a/TAO/tao/Object_Adapter.h
+++ /dev/null
@@ -1,447 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Object_Adapter.h
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_OBJECT_ADAPTER_H
-#define TAO_OBJECT_ADAPTER_H
-
-#include "tao/Key_Adapters.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Forward declaration
-class TAO_POA;
-class TAO_Temporary_Creation_Time;
-
-class TAO_Object_Adapter
-{
-  // = TITLE
-  //     Defines the Object Adapter abstraction.
-  //
-  // = DESCRIPTION
-  //     This class will be used as a facade for the POAs in a server
-public:
-
-  typedef PortableServer::ObjectId poa_name;
-  typedef PortableServer::ObjectId_var poa_name_var;
-  typedef PortableServer::ObjectId_out poa_name_out;
-
-  TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                      TAO_ORB_Core &orb_core);
-  // Constructor.
-
-  ~TAO_Object_Adapter (void);
-  // Destructor.
-
-  void dispatch_servant (const TAO_ObjectKey &key,
-                         CORBA::ServerRequest &req,
-                         void *context,
-                         CORBA_Environment &ACE_TRY_ENV);
-
-  int locate_servant (const TAO_ObjectKey &key,
-                      CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::Servant find_servant (const TAO_ObjectKey &key,
-                                        CORBA_Environment &ACE_TRY_ENV);
-
-  int find_poa (const poa_name &system_name,
-                CORBA::Boolean activate_it,
-                CORBA::Boolean root,
-                const TAO_Temporary_Creation_Time &poa_creation_time,
-                TAO_POA *&poa,
-                CORBA_Environment &ACE_TRY_ENV);
-
-  int bind_poa (const poa_name &folded_name,
-                TAO_POA *poa,
-                poa_name_out system_name);
-
-  int unbind_poa (TAO_POA *poa,
-                  const poa_name &folded_name,
-                  const poa_name &system_name);
-
-  int activate_poa (const poa_name &folded_name,
-                    TAO_POA *&poa,
-                    CORBA_Environment &ACE_TRY_ENV);
-
-  ACE_Lock &lock (void);
-
-  ACE_SYNCH_MUTEX &thread_lock (void);
-
-  ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
-
-  static CORBA::ULong transient_poa_name_size (void);
-
-protected:
-
-  int locate_servant_i (const TAO_ObjectKey &key,
-                        CORBA_Environment &ACE_TRY_ENV);
-
-  PortableServer::Servant find_servant_i (const TAO_ObjectKey &key,
-                                          CORBA_Environment &ACE_TRY_ENV);
-
-  void dispatch_servant_i (const TAO_ObjectKey &key,
-                           CORBA::ServerRequest &req,
-                           void *context,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-  void locate_poa (const TAO_ObjectKey &key,
-                   PortableServer::ObjectId &id,
-                   TAO_POA *&poa,
-                   CORBA_Environment &ACE_TRY_ENV);
-
-  int find_transient_poa (const poa_name &system_name,
-                          CORBA::Boolean root,
-                          const TAO_Temporary_Creation_Time &poa_creation_time,
-                          TAO_POA *&poa);
-
-  int find_persistent_poa (const poa_name &system_name,
-                           TAO_POA *&poa,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-  int bind_transient_poa (TAO_POA *poa,
-                          poa_name_out system_name);
-
-  int bind_persistent_poa (const poa_name &folded_name,
-                           TAO_POA *poa,
-                           poa_name_out system_name);
-
-  int unbind_transient_poa (const poa_name &system_name);
-
-  int unbind_persistent_poa (const poa_name &folded_name,
-                             const poa_name &system_name);
-
-  static ACE_Lock *create_lock (int enable_locking,
-                                ACE_SYNCH_MUTEX &thread_lock);
-
-public:
-
-  class Hint_Strategy
-  {
-    // = TITLE
-    //     Base class for POA active hint strategy.
-    //
-    // = DESCRIPTION
-    //     This class also provides for common structures used by all
-    //     the derived classes.
-  public:
-
-    virtual ~Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV) = 0;
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name) = 0;
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name) = 0;
-
-    void object_adapter (TAO_Object_Adapter *oa);
-
-  protected:
-
-    TAO_Object_Adapter *object_adapter_;
-  };
-
-  class Active_Hint_Strategy : public Hint_Strategy
-  {
-    // = TITLE
-    //     This class uses active demux hint for POA active hint
-    //     strategy.
-    //
-    // = DESCRIPTION
-    //     This class will append an active hint to the POA name,
-    //     making the POA lookups fast and predictable.
-  public:
-
-    Active_Hint_Strategy (CORBA::ULong map_size);
-
-    virtual ~Active_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  protected:
-
-    typedef ACE_Active_Map_Manager_Adapter<
-    poa_name,
-      TAO_POA *,
-      TAO_Preserve_Original_Key_Adapter> persistent_poa_system_map;
-
-    persistent_poa_system_map persistent_poa_system_map_;
-  };
-
-  class No_Hint_Strategy : public Hint_Strategy
-  {
-    // = TITLE
-    //     This class doesn't use any hints for POA active hint
-    //     strategy.
-    //
-    // = DESCRIPTION
-    //     This class will simply use the POA names as is. And since
-    //     no hint is added, the IORs will be smaller.
-  public:
-
-    virtual ~No_Hint_Strategy (void);
-
-    virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa,
-                                     CORBA_Environment &ACE_TRY_ENV);
-
-    virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
-                                     poa_name_out system_name);
-
-    virtual int unbind_persistent_poa (const poa_name &folded_name,
-                                       const poa_name &system_name);
-
-  };
-
-protected:
-
-  Hint_Strategy *hint_strategy_;
-
-  typedef ACE_Map<
-  poa_name,
-    TAO_POA *> transient_poa_map;
-  // Base class of the id map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<poa_name>,
-    TAO_Incremental_Key_Generator> transient_poa_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_Incremental_Key_Generator> transient_poa_linear_map;
-  // Id linear map.
-
-  typedef ACE_Active_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_Ignore_Original_Key_Adapter> transient_poa_active_map;
-  // Id active map.
-
-  typedef ACE_Map<
-  poa_name,
-    TAO_POA *> persistent_poa_name_map;
-  // Base class of the name map.
-
-  typedef ACE_Hash_Map_Manager_Ex_Adapter<
-  poa_name,
-    TAO_POA *,
-    TAO_ObjectId_Hash,
-    ACE_Equal_To<PortableServer::ObjectId>,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_hash_map;
-  // Id hash map.
-
-  typedef ACE_Map_Manager_Adapter<
-  poa_name,
-    TAO_POA *,
-    ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_linear_map;
-  // Id linear map.
-
-public:
-
-  persistent_poa_name_map *persistent_poa_name_map_;
-  transient_poa_map *transient_poa_map_;
-
-protected:
-
-  static size_t transient_poa_name_size_;
-
-  static void set_transient_poa_name_size (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters);
-
-  TAO_ORB_Core &orb_core_;
-
-  int enable_locking_;
-
-  ACE_SYNCH_MUTEX thread_lock_;
-
-  ACE_Lock *lock_;
-
-  ACE_Reverse_Lock<ACE_Lock> reverse_lock_;
-
-  ACE_SYNCH_CONDITION non_servant_upcall_condition_;
-  // Condition variable for waiting on non-servant upcalls to end.
-
-  CORBA::Boolean non_servant_upcall_in_progress_;
-  // Flag for knowing when an non-servant upcall is in progress.
-
-  ACE_thread_t non_servant_upcall_thread_;
-  // Id of thread making the non-servant upcall.
-
-public:
-
-  class poa_name_iterator
-  {
-    // = TITLE
-    //     Iterator for a folded poa name.
-  public:
-
-    poa_name_iterator (int begin,
-                       CORBA::ULong size,
-                       const CORBA::Octet *folded_buffer);
-    // Constructor.
-
-    int operator== (const poa_name_iterator &rhs) const;
-    int operator!= (const poa_name_iterator &rhs) const;
-    // Comparison operators.
-
-    ACE_CString operator* () const;
-    // Dereference operator.
-
-    poa_name_iterator &operator++ (void);
-    // Prefix advance.
-
-  protected:
-
-    CORBA::ULong size_;
-    CORBA::ULong position_;
-    const CORBA::Octet *folded_buffer_;
-    CORBA::ULong last_separator_;
-  };
-
-  class iteratable_poa_name
-  {
-    // = TITLE
-    //     This class allows iteration over a folded poa name.
-  public:
-
-    typedef poa_name_iterator iterator;
-
-    iteratable_poa_name (const poa_name &folded_name);
-
-    iterator begin (void) const;
-    iterator end (void) const;
-
-  protected:
-
-    const poa_name &folded_name_;
-  };
-
-  class Non_Servant_Upcall
-  {
-    // = TITLE
-    //     This class helps us with a recursive thread lock without
-    //     using a recursive thread lock.  Non_Servant_Upcall has a
-    //     magic constructor and destructor.  We unlock the
-    //     Object_Adapter lock for the duration of the non-servant
-    //     (i.e., adapter activator and servant activator) upcalls;
-    //     reacquiring once the upcalls complete.  Even though we are
-    //     releasing the lock, other threads will not be able to make
-    //     progress since
-    //     <Object_Adapter::non_servant_upcall_in_progress_> has been
-    //     set.
-  public:
-
-    Non_Servant_Upcall (TAO_Object_Adapter &object_adapter);
-    // Constructor.
-
-    ~Non_Servant_Upcall (void);
-    // Destructor.
-
-  protected:
-
-    TAO_Object_Adapter &object_adapter_;
-  };
-
-  friend class Non_Servant_Upcall;
-
-  class Outstanding_Requests
-  {
-    // = TITLE
-    //     This class helps us by increasing
-    //     <POA::outstanding_requests_> for the duration of the
-    //     servant upcall. Outstanding_Requests has a magic
-    //     constructor and destructor.  We increment
-    //     <POA::outstanding_requests_> in the constructor.  We
-    //     decrement <POA::outstanding_requests_> in the destructor.
-    //     Note that the lock is released after
-    //     <POA::outstanding_requests_> is increased and
-    //     <POA::outstanding_requests_> is decreased after the lock
-    //     has been reacquired.
-  public:
-
-    Outstanding_Requests (TAO_POA &poa,
-                          TAO_Object_Adapter &object_adapter);
-    // Constructor.
-
-    ~Outstanding_Requests (void);
-    // Destructor.
-
-  protected:
-
-    TAO_POA &poa_;
-    TAO_Object_Adapter &object_adapter_;
-  };
-
-  friend class Outstanding_Requests;
-
-  class Single_Threaded_POA_Lock
-  {
-    // = TITLE
-    //     This class helps us by locking servants in a single
-    //     threaded POA for the duration of the upcall.
-    //     Single_Threaded_POA_Lock has a magic constructor and
-    //     destructor.  We acquire the servant lock in the
-    //     constructor.  We release the servant lock in the
-    //     destructor.
-  public:
-
-    Single_Threaded_POA_Lock (TAO_POA &poa,
-                              PortableServer::Servant servant);
-    // Constructor.
-
-    ~Single_Threaded_POA_Lock (void);
-    // Destructor.
-
-  protected:
-
-    TAO_POA &poa_;
-    PortableServer::Servant servant_;
-  };
-
-  friend class Single_Threaded_POA_Lock;
-
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-#if defined (__ACE_INLINE__)
-# include "tao/Object_Adapter.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i
deleted file mode 100644
index a769a92aaad..00000000000
--- a/TAO/tao/Object_Adapter.i
+++ /dev/null
@@ -1,123 +0,0 @@
-// $Id$
-
-ACE_INLINE ACE_Lock &
-TAO_Object_Adapter::lock (void)
-{
-  return *this->lock_;
-}
-
-ACE_INLINE ACE_SYNCH_MUTEX &
-TAO_Object_Adapter::thread_lock (void)
-{
-  return this->thread_lock_;
-}
-
-ACE_INLINE ACE_Reverse_Lock<ACE_Lock> &
-TAO_Object_Adapter::reverse_lock (void)
-{
-  return this->reverse_lock_;
-}
-
-/* static */
-ACE_INLINE CORBA::ULong
-TAO_Object_Adapter::transient_poa_name_size ()
-{
-  return TAO_Object_Adapter::transient_poa_name_size_;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::locate_servant (const TAO_ObjectKey &key,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1, ACE_TRY_ENV);
-
-  return this->locate_servant_i (key,
-                                 ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_Object_Adapter::find_servant (const TAO_ObjectKey &key,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
-
-  return this->find_servant_i (key,
-                               ACE_TRY_ENV);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_POA *&poa,
-                                         CORBA_Environment &ACE_TRY_ENV)
-{
-  return this->hint_strategy_->find_persistent_poa (system_name,
-                                                    poa,
-                                                    ACE_TRY_ENV);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::find_poa (const poa_name &system_name,
-                              CORBA::Boolean activate_it,
-                              CORBA::Boolean root,
-                              const TAO_Temporary_Creation_Time &poa_creation_time,
-                              TAO_POA *&poa,
-                              CORBA_Environment &ACE_TRY_ENV)
-{
-  if (activate_it)
-    {
-      return this->find_persistent_poa (system_name,
-                                        poa,
-                                        ACE_TRY_ENV);
-    }
-  else
-    {
-      return this->find_transient_poa (system_name,
-                                       root,
-                                       poa_creation_time,
-                                       poa);
-    }
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_transient_poa (TAO_POA *poa,
-                                        poa_name_out system_name)
-{
-  poa_name name;
-  int result = this->transient_poa_map_->bind_create_key (poa,
-                                                          name);
-
-  if (result == 0)
-    {
-      ACE_NEW_RETURN (system_name,
-                      poa_name (name),
-                      -1);
-    }
-
-  return result;
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::bind_persistent_poa (const poa_name &folded_name,
-                                         TAO_POA *poa,
-                                         poa_name_out system_name)
-{
-  return this->hint_strategy_->bind_persistent_poa (folded_name,
-                                                    poa,
-                                                    system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_transient_poa (const poa_name &system_name)
-{
-  return this->transient_poa_map_->unbind (system_name);
-}
-
-ACE_INLINE int
-TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name,
-                                           const poa_name &system_name)
-{
-  return this->hint_strategy_->unbind_persistent_poa (folded_name,
-                                                      system_name);
-}
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 7b6d0db4b97..82fbce47233 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -49,3 +49,19 @@ CORBA::TypeCode_ptr TAO_tc_ObjectKey = &_tc_TAO_tc_TAO_ObjectKey;
 
 
 // ****************************************************************
+
+int
+operator== (const TAO_ObjectKey &lhs,
+            const TAO_ObjectKey &rhs)
+{
+  if (rhs.length () != lhs.length ())
+    return 0;
+
+  for (CORBA::ULong i = 0;
+       i < rhs.length ();
+       ++i)
+    if (rhs[i] != lhs[i])
+      return 0;
+
+  return 1;
+}
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 3c66349b5ea..75063be9575 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -24,14 +24,9 @@ class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
   // = DESCRIPTION
   //   The object is basically a sequence of octets, but we derive
   //   from it to create a unique type; this is useful for
-  //   overloading.
+  //   overloading. 
   //
 public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef TAO_ObjectKey_ptr _ptr_type;
-    typedef TAO_ObjectKey_var _var_type;
-  #endif /* __GNUC__ */
-
   TAO_ObjectKey (void);
   TAO_ObjectKey (CORBA::ULong max);
   TAO_ObjectKey (CORBA::ULong max,
@@ -89,6 +84,9 @@ private:
   void operator= (const TAO_ObjectKey_var &);
 };
 
+extern TAO_Export int operator== (const TAO_ObjectKey &l,
+                                  const TAO_ObjectKey &r);
+
 #if defined (__ACE_INLINE__)
 #include "tao/Object_KeyC.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp
index ff9f257b841..61e1d054681 100644
--- a/TAO/tao/Operation_Table.cpp
+++ b/TAO/tao/Operation_Table.cpp
@@ -9,41 +9,41 @@ ACE_RCSID(tao, Operation_Table, "$Id$")
 #if defined (ACE_ENABLE_TIMEPROBES)
 
 static const char *TAO_Operation_Table_Timeprobe_Description[] =
-  {
-    "TAO_Dynamic_Hash_OpTable::find - start",
-    "TAO_Dynamic_Hash_OpTable::find - end",
-
-    "TAO_Linear_Search_OpTable::find - start",
-    "TAO_Linear_Search_OpTable::find - end",
-
-    "TAO_Active_Demux_OpTable::find - start",
-    "TAO_Active_Demux_OpTable::find - end",
-
-    "TAO_Perfect_Hash_OpTable::find - start",
-    "TAO_Perfect_Hash_OpTable::find - end",
-
-    "TAO_Binary_Search_OpTable::find - start",
-    "TAO_Binary_Search_OpTable::find - end"
-  };
+{
+  "TAO_Dynamic_Hash_OpTable::find - start",
+  "TAO_Dynamic_Hash_OpTable::find - end",
+  
+  "TAO_Linear_Search_OpTable::find - start",
+  "TAO_Linear_Search_OpTable::find - end",
+  
+  "TAO_Active_Demux_OpTable::find - start",
+  "TAO_Active_Demux_OpTable::find - end",
+  
+  "TAO_Perfect_Hash_OpTable::find - start",
+  "TAO_Perfect_Hash_OpTable::find - end",
+  
+  "TAO_Binary_Search_OpTable::find - start",
+  "TAO_Binary_Search_OpTable::find - end"
+};
 
 enum
-  {
-    // Timeprobe description table start key
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_START = 600,
-    TAO_DYNAMIC_HASH_OPTABLE_FIND_END,
-
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_START,
-    TAO_LINEAR_SEARCH_OPTABLE_FIND_END,
-
-    TAO_ACTIVE_DEMUX_OPTABLE_FIND_START,
-    TAO_ACTIVE_DEMUX_OPTABLE_FIND_END,
-
-    TAO_PERFECT_HASH_OPTABLE_FIND_START,
-    TAO_PERFECT_HASH_OPTABLE_FIND_END,
-
-    TAO_BINARY_SEARCH_OPTABLE_FIND_START,
-    TAO_BINARY_SEARCH_OPTABLE_FIND_END
-  };
+{
+  // Timeprobe description table start key
+  TAO_DYNAMIC_HASH_OPTABLE_FIND_START = 600,
+  TAO_DYNAMIC_HASH_OPTABLE_FIND_END,
+  
+  TAO_LINEAR_SEARCH_OPTABLE_FIND_START,
+  TAO_LINEAR_SEARCH_OPTABLE_FIND_END,
+  
+  TAO_ACTIVE_DEMUX_OPTABLE_FIND_START,
+  TAO_ACTIVE_DEMUX_OPTABLE_FIND_END,
+  
+  TAO_PERFECT_HASH_OPTABLE_FIND_START,
+  TAO_PERFECT_HASH_OPTABLE_FIND_END,
+  
+  TAO_BINARY_SEARCH_OPTABLE_FIND_START,
+  TAO_BINARY_SEARCH_OPTABLE_FIND_END
+};
 
 // Setup Timeprobes
 ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
@@ -69,7 +69,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry
   for (CORBA::ULong i = 0; i < dbsize; i++)
     // @@ (ASG): what happens if bind fails ???
     if (this->bind (db[i].opname_, db[i].skel_ptr_) == -1)
-      ACE_ERROR ((LM_ERROR,
+      ACE_ERROR ((LM_DEBUG,
                   "(%P|%t) %p\n",
                   "bind failed"));
 }
@@ -104,10 +104,8 @@ TAO_Dynamic_Hash_OpTable::bind (const char *opname,
 
 int
 TAO_Dynamic_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr,
-                                const unsigned int length)
+                                TAO_Skeleton& skel_ptr)
 {
-  ACE_UNUSED_ARG (length);
   ACE_FUNCTION_TIMEPROBE (TAO_DYNAMIC_HASH_OPTABLE_FIND_START);
 
   return this->hash_.find ((const char *)opname, skel_ptr);
@@ -134,10 +132,8 @@ TAO_Linear_Search_OpTable::bind (const char *opname,
 
 int
 TAO_Linear_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton& skelfunc,
-                                 const unsigned int length)
+                                 TAO_Skeleton& skelfunc)
 {
-  ACE_UNUSED_ARG (length);
   ACE_FUNCTION_TIMEPROBE (TAO_LINEAR_SEARCH_OPTABLE_FIND_START);
 
   const TAO_operation_db_entry *entry = lookup (opname);
@@ -198,11 +194,8 @@ TAO_Active_Demux_OpTable::bind (const char *opname,
 
 int
 TAO_Active_Demux_OpTable::find (const char *opname,
-                                TAO_Skeleton& skel_ptr,
-                                const unsigned int length)
+                                TAO_Skeleton& skel_ptr)
 {
-  ACE_UNUSED_ARG (length);
-
   ACE_FUNCTION_TIMEPROBE (TAO_ACTIVE_DEMUX_OPTABLE_FIND_START);
 
   CORBA::ULong i = ACE_OS::atoi (opname);
@@ -238,13 +231,12 @@ TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
 
 int
 TAO_Perfect_Hash_OpTable::find (const char *opname,
-                                TAO_Skeleton &skelfunc,
-                                const unsigned int length)
+                                TAO_Skeleton &skelfunc)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_PERFECT_HASH_OPTABLE_FIND_START);
 
   const TAO_operation_db_entry *entry = lookup (opname,
-                                                length);
+                                                ACE_OS::strlen (opname));
   if (entry == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "TAO_Perfect_Hash_Table:find failed\n"),
@@ -281,8 +273,7 @@ TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
 
 int
 TAO_Binary_Search_OpTable::find (const char *opname,
-                                 TAO_Skeleton &skelfunc,
-                                 const unsigned int length)
+                                 TAO_Skeleton &skelfunc)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_BINARY_SEARCH_OPTABLE_FIND_START);
 
diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h
index 916c74d0849..39fc644d3e7 100644
--- a/TAO/tao/Operation_Table.h
+++ b/TAO/tao/Operation_Table.h
@@ -43,8 +43,7 @@ class TAO_Export TAO_Operation_Table
   //     operation names.
 public:
   virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0) = 0;
+                   TAO_Skeleton &skelfunc) = 0;
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -142,8 +141,7 @@ public:
   // <{opname}>.  Returns -1 on failure, 0 on success, 1 on duplicate.
 
   virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+                    TAO_Skeleton &skelfunc);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -174,8 +172,7 @@ public:
   // Destructor.
 
   virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
+                    TAO_Skeleton &skel_ptr);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -221,8 +218,7 @@ public:
   // destructor.
 
   virtual int find (const char *opname,
-                    TAO_Skeleton &skel_ptr,
-                    const unsigned int length = 0);
+                    TAO_Skeleton &skel_ptr);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -263,8 +259,7 @@ public:
   // Do nothing destrctor.
 
   virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+                    TAO_Skeleton &skelfunc);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
@@ -302,8 +297,7 @@ public:
   // Do nothing destrctor.
 
   virtual int find (const char *opname,
-                    TAO_Skeleton &skelfunc,
-                    const unsigned int length = 0);
+                    TAO_Skeleton &skelfunc);
   // Uses <{opname}> to look up the skeleton function and pass it back
   // in <{skelfunc}>.  Returns non-negative integer on success, or -1
   // on failure.
diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp
index 12fe314d8b6..cddaec24079 100644
--- a/TAO/tao/POA.cpp
+++ b/TAO/tao/POA.cpp
@@ -5,10 +5,8 @@
 
 #include "tao/POA.h"
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
+#include "tao/Server_Request.h"
 #include "tao/Server_Strategy_Factory.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
 
 // Forwarding Servant class
 #include "tao/Forwarding_Servant.h"
@@ -17,123 +15,906 @@
 # include "tao/POA.i"
 #endif /* ! __ACE_INLINE__ */
 
+// Timeprobes class
+#include "tao/Timeprobe.h"
+
 ACE_RCSID(tao, POA, "$Id$")
 
-#if !defined (TAO_NO_IOR_TABLE)
-// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-// Its an array of octets representing ^t^a^o/0 in octal.
-CORBA::Octet
-TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
-  024, // octal for ^t
-  001, // octal for ^a
-  017, // octal for ^o
-  000
+#if defined (ACE_ENABLE_TIMEPROBES)
+
+static const char *TAO_POA_Timeprobe_Description[] =
+{
+  "POA::locate_poa_i - start",
+  "POA::locate_poa_i - end",
+
+  "POA::locate_poa_and_servant_i - start",
+  "POA::locate_poa_and_servant_i - end",
+
+  "POA::find_servant - start",
+  "POA::find_servant - end",
+
+  "POA::dispatch_servant - start",
+  "POA::dispatch_servant - end",
+
+  "POA::parse_key - start",
+  "POA::parse_key - end",
+
+  "Servant::_dispatch - start",
+  "Servant::_dispatch - end",
+};
+
+enum
+{
+  // Timeprobe description table start key
+  TAO_POA_LOCATE_POA_I_START = 200,
+  TAO_POA_LOCATE_POA_I_END,
+
+  TAO_POA_LOCATE_POA_AND_SERVANT_I_START,
+  TAO_POA_LOCATE_POA_AND_SERVANT_I_END,
+
+  TAO_POA_FIND_SERVANT_START,
+  TAO_POA_FIND_SERVANT_END,
+
+  TAO_POA_DISPATCH_SERVANT_START,
+  TAO_POA_DISPATCH_SERVANT_END,
+
+  TAO_POA_PARSE_KEY_START,
+  TAO_POA_PARSE_KEY_END,
+
+  TAO_SERVANT_DISPATCH_START,
+  TAO_SERVANT_DISPATCH_END
 };
-#endif /* TAO_NO_IOR_TABLE */
 
-TAO_POA::TAO_POA (const TAO_POA::String &name,
+// Setup Timeprobes
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_POA_Timeprobe_Description,
+                                  TAO_POA_LOCATE_POA_I_START);
+
+#endif /* ACE_ENABLE_TIMEPROBES */
+
+TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
+                                      PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Thread_Policy::TAO_Thread_Policy (const TAO_Thread_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::ThreadPolicyValue
+TAO_Thread_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Thread_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Thread_Policy> new_policy (new TAO_Thread_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Thread_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Thread_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Thread_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
+                                          PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Lifespan_Policy::TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::LifespanPolicyValue
+TAO_Lifespan_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Lifespan_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Lifespan_Policy> new_policy (new TAO_Lifespan_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Lifespan_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Lifespan_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Lifespan_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
+                                                    PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::IdUniquenessPolicyValue
+TAO_Id_Uniqueness_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Id_Uniqueness_Policy> new_policy (new TAO_Id_Uniqueness_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
+                                                    PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::IdAssignmentPolicyValue
+TAO_Id_Assignment_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Id_Assignment_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Id_Assignment_Policy> new_policy (new TAO_Id_Assignment_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Id_Assignment_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
+                                                                PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::ImplicitActivationPolicyValue
+TAO_Implicit_Activation_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Implicit_Activation_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Implicit_Activation_Policy> new_policy (new TAO_Implicit_Activation_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
+                                                            PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::ServantRetentionPolicyValue
+TAO_Servant_Retention_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Servant_Retention_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Servant_Retention_Policy> new_policy (new TAO_Servant_Retention_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Servant_Retention_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
+                                                              PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::RequestProcessingPolicyValue
+TAO_Request_Processing_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Request_Processing_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Request_Processing_Policy> new_policy (new TAO_Request_Processing_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Request_Processing_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Request_Processing_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Request_Processing_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+TAO_Synchronization_Policy::TAO_Synchronization_Policy (PortableServer::SynchronizationPolicyValue value,
+                                                        PortableServer::POA_ptr poa)
+  : value_ (value),
+    poa_ (PortableServer::POA::_duplicate (poa))
+{
+}
+
+TAO_Synchronization_Policy::TAO_Synchronization_Policy (const TAO_Synchronization_Policy &rhs)
+  : value_ (rhs.value_),
+    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
+{
+}
+
+PortableServer::SynchronizationPolicyValue
+TAO_Synchronization_Policy::value (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return this->value_;
+}
+
+CORBA::Policy_ptr
+TAO_Synchronization_Policy::copy (CORBA::Environment &env)
+{
+  auto_ptr<TAO_Synchronization_Policy> new_policy (new TAO_Synchronization_Policy (*this));
+
+  CORBA::Policy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return CORBA::Policy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation object
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+void
+TAO_Synchronization_Policy::destroy (CORBA::Environment &env)
+{
+  // Remove self from POA
+  //
+  // Note that there is no real error checking here as we can't do
+  // much about errors here anyway
+  //
+  PortableServer::POA_var poa = this->_default_POA (env);
+  if (env.exception () == 0)
+    {
+      PortableServer::ObjectId_var id = poa->servant_to_id (this, env);
+      if (env.exception () == 0)
+        poa->deactivate_object (id.in (), env);
+    }
+
+  // Commit suicide: must have been dynamically allocated
+  delete this;
+}
+
+CORBA::PolicyType
+TAO_Synchronization_Policy::policy_type (CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+  return 0;
+}
+
+/*
+PortableServer::POA_ptr
+TAO_Synchronization_Policy::_default_POA (CORBA::Environment &env)
+{
+  return PortableServer::POA::_duplicate (this->poa_.in ());
+}
+*/
+
+TAO_POA_Policies::TAO_POA_Policies (void)
+  :  thread_ (PortableServer::ORB_CTRL_MODEL),
+     lifespan_ (PortableServer::TRANSIENT),
+     id_uniqueness_ (PortableServer::UNIQUE_ID),
+     id_assignment_ (PortableServer::SYSTEM_ID),
+     implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
+     servant_retention_ (PortableServer::RETAIN),
+     request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
+     synchronization_ (PortableServer::DEFAULT_LOCK)
+{
+}
+
+void
+TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
+                                  CORBA::Environment &env)
+{
+  for (CORBA::ULong i = 0;
+       i < policies.length () && env.exception () == 0;
+       i++)
+    {
+      this->parse_policy (policies[i], env);
+    }
+
+  if (this->validity_check () == -1)
+    {
+      CORBA::Exception *exception = new PortableServer::POA::InvalidPolicy;
+      env.exception (exception);
+      return;
+    }
+}
+
+int
+TAO_POA_Policies::validity_check (void)
+{
+  // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
+  // USE_SERVANT_MANAGER policies.
+  if (this->servant_retention_ == PortableServer::NON_RETAIN)
+    if (this->request_processing_ != PortableServer::USE_SERVANT_MANAGER &&
+        this->request_processing_ != PortableServer::USE_DEFAULT_SERVANT)
+      return -1;
+
+  // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
+  if (this->request_processing_ == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
+    if (this->servant_retention_ != PortableServer::RETAIN)
+      return -1;
+
+  // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
+  if (this->request_processing_ == PortableServer::USE_DEFAULT_SERVANT)
+    if (this->id_uniqueness_ != PortableServer::MULTIPLE_ID)
+      return -1;
+
+  // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
+  if (this->implicit_activation_ == PortableServer::IMPLICIT_ACTIVATION)
+    if (this->servant_retention_ != PortableServer::RETAIN ||
+        this->id_assignment_ != PortableServer::SYSTEM_ID)
+      return -1;
+
+  return 0;
+}
+
+void
+TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
+                                CORBA::Environment &env)
+{
+  PortableServer::ThreadPolicy_var thread
+    = PortableServer::ThreadPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (thread.in ()))
+    {
+      this->thread_ = thread->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::LifespanPolicy_var lifespan
+    = PortableServer::LifespanPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (lifespan.in ()))
+    {
+      this->lifespan_ = lifespan->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::IdUniquenessPolicy_var id_uniqueness
+    = PortableServer::IdUniquenessPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (id_uniqueness.in ()))
+    {
+      this->id_uniqueness_ = id_uniqueness->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::IdAssignmentPolicy_var id_assignment
+    = PortableServer::IdAssignmentPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (id_assignment.in ()))
+    {
+      this->id_assignment_ = id_assignment->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::ImplicitActivationPolicy_var implicit_activation
+    = PortableServer::ImplicitActivationPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (implicit_activation.in ()))
+    {
+      this->implicit_activation_ = implicit_activation->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::ServantRetentionPolicy_var servant_retention
+    = PortableServer::ServantRetentionPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (servant_retention.in ()))
+    {
+      this->servant_retention_ = servant_retention->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::RequestProcessingPolicy_var request_processing
+    = PortableServer::RequestProcessingPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (request_processing.in ()))
+    {
+      this->request_processing_ = request_processing->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  PortableServer::SynchronizationPolicy_var synchronization
+    = PortableServer::SynchronizationPolicy::_narrow (policy, env);
+  if (!CORBA::is_nil (synchronization.in ()))
+    {
+      this->synchronization_ = synchronization->value (env);
+      return;
+    }
+  else
+    {
+      env.clear ();
+    }
+
+  CORBA::Exception *exception = new PortableServer::POA::InvalidPolicy;
+  env.exception (exception);
+  return;
+}
+
+TAO_POA::TAO_POA (const TAO_POA::String &adapter_name,
                   TAO_POA_Manager &poa_manager,
                   const TAO_POA_Policies &policies,
                   TAO_POA *parent,
-                  ACE_Lock &lock,
-                  ACE_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  CORBA::Environment &ACE_TRY_ENV)
-  : name_ (name),
+                  CORBA::Environment &env)
+  : name_ (adapter_name),
     poa_manager_ (poa_manager),
     policies_ (policies),
     parent_ (parent),
     active_object_map_ (0),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     adapter_activator_ (),
     servant_activator_ (),
     servant_locator_ (),
-    default_servant_ (),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
+    default_servant_ (0),
     children_ (),
-    lock_ (lock),
+    lock_ (0),
+    closing_down_ (0),
     persistent_ (policies.lifespan () == PortableServer::PERSISTENT),
     system_id_ (policies.id_assignment () == PortableServer::SYSTEM_ID),
-    creation_time_ (ACE_OS::gettimeofday ()),
-    orb_core_ (orb_core),
-    cleanup_in_progress_ (0),
-    etherealize_objects_ (1),
-    outstanding_requests_ (0),
-    outstanding_requests_condition_ (thread_lock),
-    destroy_pending_ (0)
-{
-  // Set the folded name of this POA.
-  this->set_folded_name ();
-
-  // Create the active object map.
-  TAO_Active_Object_Map *active_object_map = 0;
-  ACE_NEW_THROW_EX (active_object_map,
-                    TAO_Active_Object_Map (!this->system_id (),
-                                           this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID,
-                                           this->persistent (),
-                                           this->orb_core_.server_factory ()->active_object_map_creation_parameters (),
-                                           ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  // Give ownership of the new map to the auto pointer.  Note, that it
-  // is important for the auto pointer to take ownership before
-  // checking for exception since we may need to delete the new map.
-  auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
-
-  // Check for exception in construction of the active object map.
-  ACE_CHECK;
-
-  // Register self with manager.
-  int result = this->poa_manager_.register_poa (this);
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
+    creation_time_ (ACE_OS::gettimeofday ())
+{
+  // Create a lock for ourselves
+  this->create_internal_lock ();
 
-  // Add self to Object Adapter class.
-  result = this->orb_core_.object_adapter ()->bind_poa (this->folded_name_,
-                                                        this,
-                                                        this->system_name_.out ());
-  if (result != 0)
+  // Set the complete name of this POA
+  this->set_complete_name ();
+
+  // Register self with manager
+  this->poa_manager_.register_poa (this, env);
+
+  // Create the active object map
+  this->create_active_object_map ();
+}
+
+void
+TAO_POA::create_active_object_map (void)
+{
+  int user_id_policy = !this->system_id ();
+  int unique_id_policy = this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID;
+
+  // Create the active_object_map
+  ACE_NEW (this->active_object_map_,
+           TAO_Active_Object_Map (user_id_policy,
+                                  unique_id_policy));
+}
+
+void
+TAO_POA::create_internal_lock (void)
+{
+  switch (this->policies ().synchronization ())
     {
-      // Remove from POA Manager in case of errors. No checks of
-      // further errors...
-      this->poa_manager_.remove_poa (this);
+    case PortableServer::DEFAULT_LOCK:
+      // Ask the server factory to create the lock.  svc.conf will be
+      // consulted. If the user did not specify any preference in
+      // svc.conf, THREAD_LOCK will be the default.
+      this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_poa_lock ();
+      break;
 
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
+    case PortableServer::THREAD_LOCK:
+#if defined (ACE_HAS_THREADS)
+      // Thread lock
+      ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>);
+      break;
+#else
+      /* FALL THROUGH */
+#endif /* ACE_HAS_THREADS */
 
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->active_object_map_ = new_active_object_map.release ();
+    case PortableServer::NULL_LOCK:
+      // Null lock
+      ACE_NEW (this->lock_, ACE_Lock_Adapter<ACE_Null_Mutex>);
+      break;
+    }
 }
 
 TAO_POA::~TAO_POA (void)
 {
-  // Delete the active object map.
+  // Delete the active object map
   delete this->active_object_map_;
 
-  // Note: Errors are ignored here since there is nothing we can do
-  // about them.
-
-  // Remove POA from the POAManager.
-  this->poa_manager_.remove_poa (this);
+  // Delete the dynamically allocated lock
+  delete this->lock_;
 
-  // Remove POA from the Object Adapter.
-  this->orb_core_.object_adapter ()->unbind_poa (this,
-                                                 this->folded_name_,
-                                                 this->system_name_.in ());
+  // Remove POA from the POAManager
+  //
+  // Note: Errors are ignored here since there is nothing we can do
+  // about them
+  //
+  CORBA::Environment env;
+  this->poa_manager_.remove_poa (this, env);
 }
 
 PortableServer::POA_ptr
 TAO_POA::create_POA (const char *adapter_name,
                      PortableServer::POAManager_ptr poa_manager,
                      const CORBA::PolicyList &policies,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &env)
 {
   // If any of the policy objects specified are not valid for the ORB
   // implementation, if conflicting policy objects are specified, or
@@ -142,35 +923,27 @@ TAO_POA::create_POA (const char *adapter_name,
   // InvalidPolicy exception is raised containing the index in the
   // policies parameter value of the first offending policy object.
   TAO_POA_Policies tao_policies;
-  tao_policies.parse_policies (policies,
-                               ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+  tao_policies.parse_policies (policies, env);
+  if (env.exception () != 0)
+    return PortableServer::POA::_nil ();
 
   // If the poa_manager parameter is null, a new POAManager object is
   // created and associated with the new POA. Otherwise, the specified
   // POAManager object is associated with the new POA. The POAManager
   // object can be obtained using the attribute name the_POAManager.
-
-  auto_ptr<TAO_POA_Manager> new_poa_manager_impl;
   TAO_POA_Manager *poa_manager_impl = 0;
   if (CORBA::is_nil (poa_manager))
     {
-      ACE_NEW_THROW_EX (poa_manager_impl,
-                        TAO_POA_Manager (this->orb_core_.object_adapter ()->lock ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-      // Give ownership to auto pointer.
-      auto_ptr<TAO_POA_Manager> auto_new_poa_manager_impl (poa_manager_impl);
-      new_poa_manager_impl = auto_new_poa_manager_impl;
+      poa_manager_impl = this->poa_manager_.clone ();
     }
   else
     {
       PortableServer::Servant servant = poa_manager->_servant ();
       if (servant == 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            PortableServer::POA::_nil ());
+          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return PortableServer::POA::_nil ();
         }
 
       void *ptr = servant->_downcast (servant->_interface_repository_id ());
@@ -178,191 +951,247 @@ TAO_POA::create_POA (const char *adapter_name,
       poa_manager_impl = ACE_dynamic_cast (TAO_POA_Manager *, mgr);
     }
 
-  TAO_POA *poa = this->create_POA (adapter_name,
-                                   *poa_manager_impl,
-                                   tao_policies,
-                                   ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give ownership of the new poa to the auto pointer.
-  auto_ptr<TAO_POA> new_poa (poa);
-
-  PortableServer::POA_var result = new_poa->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointers.
-  new_poa.release ();
-  new_poa_manager_impl.release ();
+  TAO_POA *result = this->create_POA (adapter_name,
+                                      *poa_manager_impl,
+                                      tao_policies,
+                                      env);
+  if (env.exception () != 0)
+    return PortableServer::POA::_nil ();
 
-  return result._retn ();
+  return result->_this (env);
 }
 
 TAO_POA *
 TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
                        TAO_POA_Manager &poa_manager,
                        const TAO_POA_Policies &policies,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
-  // This operaton creates a new POA as a child of the target POA. The
-  // specified name identifies the new POA with respect to other POAs
-  // with the same parent POA. If the target POA already has a child
-  // POA with the specified name, the AdapterAlreadyExists exception
-  // is raised.
-  int result = this->children_.find (adapter_name);
-
-  // Child was found
-  if (result != -1)
+  // If this is the leaf POA name
+  if (this->leaf_poa_name (adapter_name, env))
     {
-      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
-                        0);
-    }
+      // This operaton creates a new POA as a child of the target POA. The
+      // specified name identifies the new POA with respect to other POAs
+      // with the same parent POA. If the target POA already has a child
+      // POA with the specified name, the AdapterAlreadyExists exception
+      // is raised.
+      int result = this->children_.find (adapter_name);
 
-  //
-  // Child was not found
-  //
+      // Child was found
+      if (result != -1)
+        {
+          CORBA::Exception *exception = new PortableServer::POA::AdapterAlreadyExists;
+          env.exception (exception);
+          return 0;
+        }
 
-  // The specified policy objects are associated with the POA and used
-  // to control its behavior. The policy objects are effectively
-  // copied before this operation returns, so the application is free
-  // to destroy them while the POA is in use. Policies are not
-  // inherited from the parent POA.
-  TAO_POA *poa = 0;
-  ACE_NEW_THROW_EX (poa,
-                    TAO_POA (adapter_name,
-                             poa_manager,
-                             policies,
-                             this,
-                             this->orb_core_.object_adapter ()->lock (),
-                             this->orb_core_.object_adapter ()->thread_lock (),
-                             this->orb_core_,
-                             ACE_TRY_ENV),
-                    CORBA::NO_MEMORY ());
-
-  // Give ownership of the new map to the auto pointer.  Note, that it
-  // is important for the auto pointer to take ownership before
-  // checking for exception since we may need to delete the new map.
-  auto_ptr<TAO_POA> new_poa (poa);
-
-  // Check for exception in construction of the POA.
-  ACE_CHECK_RETURN (0);
-
-  // Add to children map
-  result = this->children_.bind (adapter_name,
-                                 new_poa.get ());
-  if (result != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
+      //
+      // Child was not found
+      //
 
-  // Note: Creating a POA using a POA manager that is in the active
-  // state can lead to race conditions if the POA supports preexisting
-  // objects, because the new POA may receive a request before its
-  // adapter activator, servant manager, or default servant have been
-  // initialized. These problems do not occur if the POA is created by
-  // an adapter activator registered with a parent of the new POA,
-  // because requests are queued until the adapter activator
-  // returns. To avoid these problems when a POA must be explicitly
-  // initialized, the application can initialize the POA by invoking
-  // find_POA with a TRUE activate parameter.
+      // The specified policy objects are associated with the POA and used
+      // to control its behavior. The policy objects are effectively
+      // copied before this operation returns, so the application is free
+      // to destroy them while the POA is in use. Policies are not
+      // inherited from the parent POA.
+      auto_ptr<TAO_POA> new_poa (this->clone (adapter_name,
+                                              poa_manager,
+                                              policies,
+                                              this,
+                                              env));
+
+      if (env.exception () != 0)
+        return 0;
+
+      // Add to children map
+      if (this->children_.bind (adapter_name, new_poa.get ()) != 0)
+        {
+          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return 0;
+        }
 
-  // Everything is fine. Don't let the auto_ptr delete the
-  // implementation.
-  return new_poa.release ();
-}
+      // Note: Creating a POA using a POA manager that is in the active
+      // state can lead to race conditions if the POA supports preexisting
+      // objects, because the new POA may receive a request before its
+      // adapter activator, servant manager, or default servant have been
+      // initialized. These problems do not occur if the POA is created by
+      // an adapter activator registered with a parent of the new POA,
+      // because requests are queued until the adapter activator
+      // returns. To avoid these problems when a POA must be explicitly
+      // initialized, the application can initialize the POA by invoking
+      // find_POA with a TRUE activate parameter.
+
+      // Everything is fine
+      // Don't let the auto_ptr delete the implementation
+      return new_poa.release ();
+    }
+  // Not the leaf POA name
+  else
+    {
+      // Find the topmost name
+      TAO_POA::String topmost_poa_name;
+      TAO_POA::String tail_poa_name;
+      this->parse_poa_name (adapter_name,
+                            topmost_poa_name,
+                            tail_poa_name,
+                            env);
 
-PortableServer::POA_ptr
-TAO_POA::find_POA (const char *adapter_name,
-                   CORBA::Boolean activate_it,
-                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+      if (env.exception () != 0)
+        return 0;
 
-  TAO_POA *child = this->find_POA_i (adapter_name,
-                                     activate_it,
-                                     ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+      // If we are the topmost poa, let's create the tail
+      if (topmost_poa_name == this->name_)
+        {
+          return this->create_POA_i (tail_poa_name,
+                                     poa_manager,
+                                     policies,
+                                     env);
+        }
 
-  // Give ownership of the new poa to the auto pointer.
-  auto_ptr<TAO_POA> new_child (child);
+      //
+      // We are not the topmost POA
+      //
 
-  PortableServer::POA_var result = new_child->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+      // Try to find the topmost child
+      TAO_POA *child_poa = 0;
+      int result = this->children_.find (topmost_poa_name, child_poa);
 
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  new_child.release ();
+      // Child was not found or the topmost is us
+      if (result != 0)
+        {
+          child_poa = this->create_POA_i (topmost_poa_name,
+                                          poa_manager,
+                                          policies,
+                                          env);
+          if (env.exception () != 0)
+            return 0;
+        }
 
-  return result._retn ();
+      // At this point, the intermediate child POA was either found or
+      // created
+      return child_poa->create_POA (tail_poa_name,
+                                    poa_manager,
+                                    policies,
+                                    env);
+    }
 }
 
 TAO_POA *
-TAO_POA::find_POA_i (const ACE_CString &child_name,
-                     CORBA::Boolean activate_it,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::find_POA_i_optimized (const TAO_POA::String &adapter_name,
+                               CORBA::Boolean activate_it,
+                               CORBA::Environment &env)
 {
-  TAO_POA *child;
-  int result = this->children_.find (child_name,
-                                     child);
+  // If this is the leaf POA name
+  if (this->leaf_poa_name (adapter_name, env))
+    {
+      // If the target POA is the parent of a child POA with the
+      // specified name (relative to the target POA), that child POA
+      // is returned.
+      TAO_POA *child_poa = 0;
+      int result = this->children_.find (adapter_name, child_poa);
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+      // Child was found
+      if (result != -1)
+        return child_poa;
 
-  if (result != 0)
-    {
-      if (activate_it)
+      //
+      // Child was not found
+      //
+
+      // If a child POA with the specified name does not exist and the
+      // value of the activate_it parameter is TRUE, the target POA's
+      // AdapterActivator, if one exists, is invoked, and, if it
+      // successfully activates the child POA, that child POA is
+      // returned.
+      if (activate_it && !CORBA::is_nil (this->adapter_activator_.in ()))
         {
-          if (!CORBA::is_nil (this->adapter_activator_.in ()))
-            {
-              PortableServer::POA_var self = this->_this (ACE_TRY_ENV);
-              ACE_CHECK_RETURN (0);
-
-              CORBA::Boolean success =
-                this->adapter_activator_->unknown_adapter (self.in (),
-                                                           child_name.c_str (),
-                                                           ACE_TRY_ENV);
-              if (success)
-                {
-                  result = this->children_.find (child_name,
-                                                 child);
-                }
-              else
-                {
-                  result = -1;
-                }
-            }
-          else
+          PortableServer::POA_var self = this->_this (env);
+          // Check for exceptions
+          if (env.exception () != 0)
+            return 0;
+
+          ACE_CString null_terminated_adapter_name (adapter_name);
+
+          CORBA::Boolean success =
+            this->adapter_activator_->unknown_adapter (self.in (),
+                                                       null_terminated_adapter_name.c_str (),
+                                                       env);
+          // Check for exceptions
+          if (env.exception () != 0)
+            return 0;
+
+          // On success
+          if (success)
             {
-              result = -1;
+              // Search the children table again
+              result = this->children_.find (adapter_name, child_poa);
+
+              // Child was found
+              if (result != -1)
+                return child_poa;
             }
         }
-      else
-        {
-          result = -1;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
-  if (result == 0)
-    {
-      return child;
+      // Otherwise, the AdapterNonExistent exception is raised.
+      CORBA::Exception *exception = new PortableServer::POA::AdapterNonExistent;
+      env.exception (exception);
+      return 0;
     }
+  // Not the leaf POA name
   else
     {
-      // Otherwise, the AdapterNonExistent exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
-                        0);
+      // Find the topmost name
+      TAO_POA::String topmost_poa_name;
+      TAO_POA::String tail_poa_name;
+      this->parse_poa_name (adapter_name,
+                            topmost_poa_name,
+                            tail_poa_name,
+                            env);
+
+      if (env.exception () != 0)
+        return 0;
+
+      // If we are the topmost poa, let's create the tail
+      if (topmost_poa_name == this->name_)
+        {
+          return this->find_POA_i (tail_poa_name,
+                                   activate_it,
+                                   env);
+        }
+
+      //
+      // We are not the topmost POA
+      //
+
+      // Try to find the topmost child
+      TAO_POA *child_poa;
+      int result = this->children_.find (topmost_poa_name, child_poa);
+
+      // Child was not found
+      if (result != 0)
+        {
+          child_poa = this->find_POA_i_optimized (topmost_poa_name,
+                                                  activate_it,
+                                                  env);
+          if (env.exception () != 0)
+            return 0;
+        }
+
+      // At this point, the intermediate child POA was either found or
+      // created
+      return child_poa->find_POA (tail_poa_name,
+                                  activate_it,
+                                  env);
     }
 }
 
 void
 TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
                     CORBA::Boolean wait_for_completion,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &env)
 {
-  this->cleanup_in_progress_ = 1;
+  this->closing_down_ = 1;
 
   // This operation destroys the POA and all descendant POAs. The POA
   // so destroyed (that is, the POA with its name) may be re-created
@@ -372,86 +1201,139 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
 
   // Remove POA from the parent
   if (this->parent_ != 0)
-    {
-      int result = this->parent_->delete_child (this->name_);
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
+    this->parent_->delete_child (this->name_, env);
+
+  if (env.exception () != 0)
+    return;
 
   // Remove all children POAs
   for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
+       iterator != this->children_.end ()
+         && env.exception () == 0;
        ++iterator)
     {
       TAO_POA *child_poa = (*iterator).int_id_;
-      child_poa->destroy_i (etherealize_objects,
-                            wait_for_completion,
-                            ACE_TRY_ENV);
-      ACE_CHECK;
+      child_poa->destroy (etherealize_objects,
+                          wait_for_completion,
+                          env);
     }
 
+  if (env.exception () != 0)
+    return;
+
   // When a POA is destroyed, any requests that have started execution
   // continue to completion. Any requests that have not started
   // execution are processed as if they were newly arrived, that is,
   // the POA will attempt to cause recreation of the POA by invoking
   // one or more adapter activators as described in Section 3.3.3.
 
-  // If the wait_for_completion parameter is TRUE, the destroy
-  // operation will return only after all requests in process have
-  // completed and all invocations of etherealize have
-  // completed. Otherwise, the destroy operation returns after
-  // destroying the POAs.
-
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  ACE_TRY_ENV);
+  // If the etherealize_objects parameter is TRUE, the POA has the
+  // RETAIN policy, and a servant manager is registered with the POA,
+  // the etherealize operation on the servant manager will be called
+  // for each active object in the Active Object Map. The apparent
+  // destruction of the POA occurs before any calls to etherealize are
+  // made.  Thus, for example, an etherealize method that attempts to
+  // invoke operations on the POA will receive the OBJECT_NOT_EXIST
+  // exception.
 
-  while (wait_for_completion &&
-         this->outstanding_requests_ > 0)
+  // Remove the registered objects
+  if (etherealize_objects)
     {
-      this->destroy_pending_ = 1;
-      int result = this->outstanding_requests_condition_.wait ();
-      if (result == -1)
+      if (this->policies ().servant_retention () == PortableServer::RETAIN &&
+          this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER &&
+          !CORBA::is_nil (this->servant_activator_.in ()))
         {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
+          PortableServer::POA_var self = this->_this (env);
+          if (env.exception () != 0)
+            return;
+
+          while (1)
+            {
+              TAO_Active_Object_Map::iterator iterator = this->active_object_map ().begin ();
+              if (iterator == this->active_object_map ().end ()
+                  || env.exception () != 0)
+                break;
+
+              PortableServer::Servant servant = 0;
+              PortableServer::ObjectId id ((*iterator).id_);
+
+              // Remove from the active object map
+              int result = this->active_object_map ().unbind (id, servant);
+              if (result != 0)
+                {
+                  CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+                  env.exception (exception);
+                  return;
+                }
+
+              CORBA::Boolean remaining_activations = 0;
+
+              // Check for remaining activations
+              if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID &&
+                  this->active_object_map ().find (servant) != -1)
+                remaining_activations = 1;
+
+              this->servant_activator_->etherealize (id,
+                                                     self.in (),
+                                                     servant,
+                                                     1,
+                                                     remaining_activations,
+                                                     env);
+            }
         }
     }
 
-  // Commit suicide
-  delete this;
+  // If the wait_for_completion parameter is TRUE, the destroy
+  // operation will return only after all requests in process have
+  // completed and all invocations of etherealize have
+  // completed. Otherwise, the destroy operation returns after
+  // destroying the POAs.
+
+  ACE_UNUSED_ARG (wait_for_completion);
 }
 
-int
-TAO_POA::delete_child (const TAO_POA::String &child)
+void
+TAO_POA::delete_child (const TAO_POA::String &child,
+                       CORBA::Environment &env)
 {
-  int result = 0;
-
   // If we are not closing down, we must remove this child from our
   // collection.
-  if (!this->cleanup_in_progress_)
+  if (!this->closing_down_)
     {
-      result = this->children_.unbind (child);
+      // Lock access to the POA for the duration of this transaction
+      TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
+
+      this->delete_child_i (child,
+                            env);
     }
 
   // If we are closing down, we are currently iterating over our
   // children and there is not need to remove this child from our
   // collection.
-
-  return result;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+void
+TAO_POA::delete_child_i (const TAO_POA::String &child,
+                         CORBA::Environment &env)
+{
+  if (this->children_.unbind (child) != 0)
+    {
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return;
+    }
+}
 
 PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_manager_i (CORBA::Environment &env)
 {
   // This operation requires the USE_SERVANT_MANAGER policy; if not
   // present, the WrongPolicy exception is raised.
   if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return PortableServer::ServantManager::_nil ();
     }
 
   // This operation returns the servant manager associated with the
@@ -465,173 +1347,144 @@ TAO_POA::get_servant_manager_i (CORBA::Environment &ACE_TRY_ENV)
 
 void
 TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   // This operation requires the USE_SERVANT_MANAGER policy; if not
   // present, the WrongPolicy exception is raised.
   if (this->policies ().request_processing () != PortableServer::USE_SERVANT_MANAGER)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return;
     }
 
   // This operation sets the default servant manager associated with
   // the POA.
   if (this->policies ().servant_retention () == PortableServer::RETAIN)
     {
-      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr,
-                                                                            ACE_TRY_ENV);
-      ACE_CHECK;
-
+      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr, env);
       if (CORBA::is_nil (this->servant_activator_.in ()))
         {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
+          CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+          env.exception (exception);
+          return;
         }
     }
   else
     {
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr,
-                                                                        ACE_TRY_ENV);
-      ACE_CHECK;
-
+      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr, env);
       if (CORBA::is_nil (this->servant_locator_.in ()))
         {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
+          CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+          env.exception (exception);
+          return;
         }
     }
 }
 
 PortableServer::Servant
-TAO_POA::get_servant_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_i (CORBA::Environment &env)
 {
   // This operation requires the USE_DEFAULT_SERVANT policy; if not
   // present, the WrongPolicy exception is raised.
   if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // This operation returns the default servant associated with the
   // POA.
-  PortableServer::Servant result = this->default_servant_.in ();
-  if (result != 0)
+  if (this->default_servant_ != 0)
     {
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // get_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      result->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      return result;
+      return this->default_servant_;
     }
   else
     // If no servant has been associated with the POA, the NoServant
     // exception is raised.
     {
-      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::NoServant;
+      env.exception (exception);
+      return 0;
     }
 }
 
 void
 TAO_POA::set_servant_i (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // This operation requires the USE_DEFAULT_SERVANT policy; if not
   // present, the WrongPolicy exception is raised.
   if (this->policies ().request_processing () != PortableServer::USE_DEFAULT_SERVANT)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return;
     }
 
   // This operation registers the specified servant with the POA as
   // the default servant. This servant will be used for all requests
   // for which no servant is found in the Active Object Map.
   this->default_servant_ = servant;
-
-  // The implementation of set_servant will invoke _add_ref at least
-  // once on the Servant argument before returning. When the POA no
-  // longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  if (servant != 0)
-    {
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-    }
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 PortableServer::ObjectId *
 TAO_POA::activate_object_i (PortableServer::Servant servant,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   // This operation requires the SYSTEM_ID and RETAIN policy; if not
   // present, the WrongPolicy exception is raised.
   if (!(this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
         this->policies ().servant_retention () == PortableServer::RETAIN))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // If the POA has the UNIQUE_ID policy and the specified servant is
   // already in the Active Object Map, the ServantAlreadyActive
   // exception is raised.
   if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().is_servant_in_map (servant))
+      this->active_object_map ().find (servant) != -1)
     {
-      ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::ServantAlreadyActive;
+      env.exception (exception);
+      return 0;
     }
 
   // Otherwise, the activate_object operation generates an Object Id
   // and enters the Object Id and the specified servant in the Active
   // Object Map. The Object Id is returned.
-  PortableServer::ObjectId_var user_id;
-  if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                         user_id.out ()) == -1)
+  PortableServer::ObjectId_var new_id = this->create_object_id (servant, env);
+  if (env.exception () != 0)
+    return 0;
+
+  // Add to the active object map
+  if (this->active_object_map ().bind (new_id.in (), servant) == -1)
     {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
     }
 
-  //
   // Everything is finally ok
-  //
-
-  // The implementation of activate_object will invoke _add_ref at
-  // least once on the Servant argument before returning. When the POA
-  // no longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  // If we are a single threaded POA, set up the appropriate locking
-  // in the servant.
-  this->establish_servant_lock (servant);
-
-  return user_id._retn ();
+  return new_id._retn ();
 }
 
 void
 TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
                                     PortableServer::Servant servant,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   // This operation requires the RETAIN policy; if not present, the
   // WrongPolicy exception is raised.
   if (this->policies ().servant_retention () != PortableServer::RETAIN)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return;
     }
 
   // If the POA has the SYSTEM_ID policy and it detects that the
@@ -646,152 +1499,73 @@ TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
   if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
       !this->is_poa_generated_id (id))
     {
-      ACE_THROW (CORBA::BAD_PARAM ());
+      CORBA::Exception *exception = new CORBA::BAD_PARAM (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return;
     }
 
   // If the CORBA object denoted by the Object Id value is already
   // active in this POA (there is a servant bound to it in the Active
   // Object Map), the ObjectAlreadyActive exception is raised.
-  if (this->active_object_map ().is_user_id_in_map (id))
+  if (this->active_object_map ().find (id) != -1)
     {
-      ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
+      CORBA::Exception *exception = new PortableServer::POA::ObjectAlreadyActive;
+      env.exception (exception);
+      return;
     }
 
   // If the POA has the UNIQUE_ID policy and the servant is already in
   // the Active Object Map, the ServantAlreadyActive exception is
   // raised.
   if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().is_servant_in_map (servant))
+      this->active_object_map ().find (servant) != -1)
     {
-      ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
+      CORBA::Exception *exception = new PortableServer::POA::ServantAlreadyActive;
+      env.exception (exception);
+      return;
     }
 
   // Otherwise, the activate_object_with_id operation enters an
   // association between the specified Object Id and the specified
   // servant in the Active Object Map.
-  if (this->active_object_map ().bind_using_user_id (servant, id) == -1)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  //
-  // Everything is finally ok
-  //
-
-  // The implementation of activate_object_with_id will invoke
-  // _add_ref at least once on the Servant argument before
-  // returning. When the POA no longer needs the Servant, it will
-  // invoke _remove_ref on it the same number of times.
-  servant->_add_ref (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // If we are a single threaded POA, set up the appropriate locking
-  // in the servant.
-  this->establish_servant_lock (servant);
-}
-
-void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  this->etherealize_objects_ = etherealize_objects;
-
-  // This operation is a no-op for the non-RETAIN policy.
-  if (this->policies ().servant_retention () != PortableServer::RETAIN)
+  if (this->active_object_map ().bind (id, servant) == -1)
     {
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
       return;
     }
 
-  // If the etherealize_objects parameter is TRUE, the POA has the
-  // RETAIN policy, and a servant manager is registered with the POA,
-  // the etherealize operation on the servant manager will be called
-  // for each active object in the Active Object Map. The apparent
-  // destruction of the POA occurs before any calls to etherealize are
-  // made.  Thus, for example, an etherealize method that attempts to
-  // invoke operations on the POA will receive the OBJECT_NOT_EXIST
-  // exception.
-
-  // We must copy the user ids into a separate place since we cannot
-  // remove entries while iterating through the map.
-  ACE_Array<PortableServer::ObjectId> ids (this->active_object_map ().current_size ());
-
-  size_t counter = 0;
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map ().user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map ().user_id_map_->begin ();
-       iter != end;
-       ++iter, ++counter)
-    {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *active_object_map_entry = map_pair.second ();
-
-      ids[counter] = active_object_map_entry->user_id_;
-    }
-
-  for (size_t i = 0;
-       i < counter;
-       ++i)
-    {
-      this->deactivate_object_i (ids[i],
-                                 ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  // Everything is finally ok
 }
 
 void
-TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::deactivate_object_i (const PortableServer::ObjectId &oid,
+                              CORBA::Environment &env)
 {
   // This operation requires the RETAIN policy; if not present, the
   // WrongPolicy exception is raised.
   if (this->policies ().servant_retention () != PortableServer::RETAIN)
     {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return;
     }
 
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry = 0;
-  int result = this->active_object_map ().find_servant_and_system_id_using_user_id (id,
-                                                                                    active_object_map_entry);
+  // This operation causes the association of the Object Id specified
+  // by the oid parameter and its servant to be removed from the
+  // Active Object Map.
+  PortableServer::Servant servant = 0;
+  int result = this->active_object_map ().unbind (oid, servant);
 
   // If there is no active object associated with the specified Object
   // Id, the operation raises an ObjectNotActive exception.
   if (result != 0)
     {
-      ACE_THROW (PortableServer::POA::ObjectNotActive ());
-    }
-
-  // Decrement the reference count.
-  CORBA::UShort new_count = --active_object_map_entry->reference_count_;
-
-  if (new_count == 0)
-    {
-      this->cleanup_servant (active_object_map_entry,
-                             ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-  else
-    {
-      // It should be noted that there may be a period of time between
-      // an object's deactivation and the etherealization (during
-      // which outstanding requests are being processed) in which
-      // arriving requests on that object should not be passed to its
-      // servant. During this period, requests targeted for such an
-      // object act as if the POA were in holding state until
-      // etherealize completes. If etherealize is called as a
-      // consequence of a deactivate call with a etherealize_objects
-      // parameter of TRUE, incoming requests are rejected.
-
-      // Else mark entry as closed...
-      active_object_map_entry->deactivated_ = 1;
+      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
+      env.exception (exception);
+      return;
     }
-}
 
-void
-TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
   // If a servant manager is associated with the POA,
   // ServantLocator::etherealize will be invoked with the oid and the
   // servant. (The deactivate_object operation does not wait for the
@@ -804,77 +1578,39 @@ TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_en
   // deactivated. It is the responsibility of the object
   // implementation to refrain from destroying the servant while it is
   // active with any Id.
-
-  // If the POA has no ServantActivator associated with it, the POA
-  // implementation calls _remove_ref when all operation invocations
-  // have completed. If there is a ServantActivator, the Servant is
-  // consumed by the call to ServantActivator::etherealize instead.
-
-  // First check for a non-zero servant.
-  if (active_object_map_entry->servant_)
+  if (!CORBA::is_nil (this->servant_activator_.in ()))
     {
+      PortableServer::POA_var self = this->_this (env);
+      if (env.exception () != 0)
+        return;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+      CORBA::Boolean remaining_activations = 0;
 
-      if (this->etherealize_objects_ &&
-          this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER &&
-          !CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          PortableServer::POA_var self = this->_this (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::Boolean remaining_activations =
-            this->active_object_map ().remaining_activations (active_object_map_entry->servant_);
-
-          // If the cleanup_in_progress parameter is TRUE, the reason
-          // for the etherealize operation is that either the
-          // deactivate or destroy operation was called with an
-          // etherealize_objects parameter of TRUE. If the parameter
-          // is FALSE, the etherealize operation is called for other
-          // reasons.
-          this->servant_activator_->etherealize (active_object_map_entry->user_id_,
-                                                 self.in (),
-                                                 active_object_map_entry->servant_,
-                                                 this->cleanup_in_progress_,
-                                                 remaining_activations,
-                                                 ACE_TRY_ENV);
-          ACE_CHECK;
-        }
-      else
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-        {
-          active_object_map_entry->servant_->_remove_ref (ACE_TRY_ENV);
-          ACE_CHECK;
-        }
+      // Check for remaining activations
+      if (this->policies ().id_uniqueness () == PortableServer::MULTIPLE_ID &&
+          this->active_object_map ().find (servant) != -1)
+        remaining_activations = 1;
 
-      // If we are a single threaded POA, teardown the appropriate
-      // locking in the servant.
-      this->teardown_servant_lock (active_object_map_entry->servant_);
-    }
-
-  // This operation causes the association of the Object Id specified
-  // by the oid parameter and its servant to be removed from the
-  // Active Object Map.
-  int result = this->active_object_map ().unbind_using_user_id (active_object_map_entry->user_id_);
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
+      this->servant_activator_->etherealize (oid,
+                                             self.in (),
+                                             servant,
+                                             0,
+                                             remaining_activations,
+                                             env);
     }
 }
 
 CORBA::Object_ptr
 TAO_POA::create_reference_i (const char *intf,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   // This operation requires the SYSTEM_ID policy; if not present, the
   // WrongPolicy exception is raised.
   if (this->policies ().id_assignment () != PortableServer::SYSTEM_ID)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return CORBA::Object::_nil ();
     }
 
   // This operation creates an object reference that encapsulates a
@@ -885,27 +1621,20 @@ TAO_POA::create_reference_i (const char *intf,
   // appropriate servant manager to be invoked, if one is
   // available. The generated Object Id value may be obtained by
   // invoking POA::reference_to_id with the created reference.
-  PortableServer::ObjectId_var system_id;
-  if (this->active_object_map ().bind_using_system_id_returning_system_id (0,
-                                                                           system_id.out ()) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        CORBA::Object::_nil ());
-    }
+  PortableServer::ObjectId_var new_id = this->create_object_id (0, env);
+  if (env.exception () != 0)
+    return CORBA::Object::_nil ();
 
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+  TAO_ObjectKey_var new_key = this->create_object_key (new_id.in ());
 
   // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                intf,
-                                                ACE_TRY_ENV);
+  return TAO_ORB_Core_instance ()->orb ()->key_to_object (new_key.in (), intf, env);
 }
 
 CORBA::Object_ptr
-TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
-                                     const char *intf,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
+                                   const char *intf,
+                                   CORBA::Environment &env)
 {
   // If the POA has the SYSTEM_ID policy and it detects that the
   // Object Id value was not generated by the system or for this POA,
@@ -917,10 +1646,11 @@ TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
   // system for that POA, or, if the POA also has the PERSISTENT
   // policy, for a previous instantiation of the same POA.
   if (this->policies ().id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (user_id))
+      !this->is_poa_generated_id (oid))
     {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
+      CORBA::Exception *exception = new CORBA::BAD_PARAM (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return CORBA::Object::_nil ();
     }
 
   // This operation creates an object reference that encapsulates the
@@ -930,26 +1660,15 @@ 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::ObjectId_var system_id;
-  if (this->active_object_map ().find_system_id_using_user_id (user_id,
-                                                               system_id.out ()) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
+  TAO_ObjectKey_var new_key = this->create_object_key (oid);
 
   // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                intf,
-                                                ACE_TRY_ENV);
+  return TAO_ORB_Core_instance ()->orb ()->key_to_object (new_key.in (), intf, env);
 }
 
 PortableServer::ObjectId *
 TAO_POA::servant_to_id_i (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   // This operation requires the RETAIN and either the UNIQUE_ID or
   // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
@@ -958,20 +1677,20 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
         && (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID
             || this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // This operation has three possible behaviors.
 
   // If the POA has the UNIQUE_ID policy and the specified servant is
   // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var user_id;
+  PortableServer::ObjectId id;
   if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find_user_id_using_servant (servant,
-                                                             user_id.out ()) != -1)
+      this->active_object_map ().find (servant, id) != -1)
     {
-      return user_id._retn ();
+      return new PortableServer::ObjectId (id);
     }
 
   // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
@@ -982,110 +1701,32 @@ TAO_POA::servant_to_id_i (PortableServer::Servant servant,
   if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
     {
       // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we xhave the UNIQUE_ID policy and we are not in the active
+      // or we have the UNIQUE_ID policy and we are not in the active
       // object map.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map ().bind_using_system_id_returning_user_id (servant,
-                                                                             user_id.out ()) == -1)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-
-      return user_id._retn ();
-    }
-
-  // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-  // exception is raised.
-  if (!(this->policies ().servant_retention () == PortableServer::RETAIN
-        && (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID
-            || this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation has three possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var system_id;
-  if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().find_system_id_using_servant (servant,
-                                                               system_id.out ()) != -1)
-    {
-      return system_id._retn ();
-    }
+      PortableServer::ObjectId_var new_id = this->create_object_id (servant, env);
+      if (env.exception () != 0)
+        return 0;
 
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->policies ().implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we xhave the UNIQUE_ID policy and we are not in the active
-      // object map.
-      PortableServer::ObjectId_var system_id;
-      if (this->active_object_map ().bind_using_system_id_returning_system_id (servant,
-                                                                               system_id.out ()) == -1)
+      if (this->active_object_map ().bind (new_id.in (), servant) == -1)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return 0;
         }
 
-      //
       // Everything is finally ok
-      //
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      // If we are a single threaded POA, set up the appropriate
-      // locking in the servant.
-      this->establish_servant_lock (servant);
-
-      return system_id._retn ();
+      return new_id._retn ();
     }
 
   // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
+  CORBA::Exception *exception = new PortableServer::POA::ServantNotActive;
+  env.exception (exception);
+  return 0;
 }
 
 CORBA::Object_ptr
 TAO_POA::servant_to_reference (PortableServer::Servant servant,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // Note: The allocation of an Object Id value and installation in
   // the Active Object Map caused by implicit activation may actually
@@ -1093,22 +1734,20 @@ TAO_POA::servant_to_reference (PortableServer::Servant servant,
   // reference. The real requirement here is that a reference is
   // produced that will behave appropriately (that is, yield a
   // consistent Object Id value when asked politely).
-  PortableServer::ObjectId_var id = this->servant_to_system_id (servant,
-                                                                ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+  PortableServer::ObjectId_var oid = this->servant_to_id (servant,
+                                                          env);
 
-  // Create object key.
-  TAO_ObjectKey_var key = this->create_object_key (id.in ());
-
-  // Ask the ORB to create you a reference
-  return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                servant->_interface_repository_id (),
-                                                ACE_TRY_ENV);
+  if (env.exception () != 0)
+    return CORBA::Object::_nil ();
+  else
+    return this->create_reference_with_id (oid.in (),
+                                           servant->_interface_repository_id (),
+                                           env);
 }
 
 PortableServer::Servant
 TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   // This operation requires the RETAIN policy or the
   // USE_DEFAULT_SERVANT policy. If neither policy is present, the
@@ -1116,8 +1755,9 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
   if (!(this->policies ().servant_retention () == PortableServer::RETAIN
         || this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT))
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // If the POA has the RETAIN policy and the specified object is
@@ -1125,126 +1765,65 @@ TAO_POA::reference_to_servant (CORBA::Object_ptr reference,
   // servant associated with that object in the Active Object Map.
   if (this->policies ().servant_retention () == PortableServer::RETAIN)
     {
-      TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      TAO_ObjectKey_var key = reference->_key (env);
 
       // If the object reference was not created by this POA, the
       // WrongAdapter exception is raised.
-      PortableServer::ObjectId system_id;
-      TAO_Object_Adapter::poa_name poa_system_name;
-      CORBA::Boolean is_root = 0;
-      CORBA::Boolean is_persistent = 0;
-      CORBA::Boolean is_system_id = 0;
+      PortableServer::ObjectId id;
+      TAO_POA::String poa_name;
+      CORBA::Boolean persistent = 0;
+      CORBA::Boolean system_id = 0;
       TAO_Temporary_Creation_Time poa_creation_time;
 
       int result = this->parse_key (key.in (),
-                                    poa_system_name,
+                                    poa_name,
+                                    id,
+                                    persistent,
                                     system_id,
-                                    is_root,
-                                    is_persistent,
-                                    is_system_id,
                                     poa_creation_time);
-      if (result != 0 ||
-          !this->root () &&
-          poa_system_name != this->system_name () ||
-          is_root != this->root () ||
-          is_persistent != this->persistent () ||
-          is_system_id != this->system_id () ||
-          !this->persistent () &&
-          poa_creation_time != this->creation_time_)
+      if (result != 0
+          || poa_name != this->complete_name ()
+          || persistent != this->persistent ()
+          || system_id != this->system_id ()
+          || !this->persistent ()
+          && poa_creation_time != this->creation_time_)
         {
-          ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                            0);
+          CORBA::Exception *exception = new PortableServer::POA::WrongAdapter;
+          env.exception (exception);
+          return 0;
         }
 
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
-
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) == -1)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      // This operation returns the active servant associated with the
-      // specified system Object Id value.  If the Object Id value is
-      // not active in the POA, an ObjectNotActive exception is
-      // raised.
-      PortableServer::Servant servant = 0;
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-
-      if (this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                               user_id,
-                                                                               servant,
-                                                                               entry) != -1)
-        {
-          // The POA invokes _add_ref once on the Servant before
-          // returning it. If the application uses reference counting,
-          // the caller of reference_to_servant is responsible for
-          // invoking _remove_ref once on the returned Servant when it
-          // is finished with it.  A conforming caller need not invoke
-          // _remove_ref on the returned Servant if the type of the
-          // Servant uses the default reference counting inherited
-          // from ServantBase.
-          servant->_add_ref (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          return servant;
-        }
-      else
-        // Otherwise, the ObjectNotActive exception is raised.
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
-        }
+      return this->id_to_servant (id, env);
     }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   // Otherwise, if the POA has the USE_DEFAULT_SERVANT policy and a
   // default servant has been registered with the POA, this operation
   // returns the default servant.
   if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+      // Lock access to the POA for the duration of this transaction
+      TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result != 0)
+      if (this->default_servant_ != 0)
         {
-          // The POA invokes _add_ref once on the Servant before
-          // returning it. If the application uses reference counting,
-          // the caller of reference_to_servant is responsible for
-          // invoking _remove_ref once on the returned Servant when it
-          // is finished with it.  A conforming caller need not invoke
-          // _remove_ref on the returned Servant if the type of the
-          // Servant uses the default reference counting inherited
-          // from ServantBase.
-          result->_add_ref (ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          return result;
+          return this->default_servant_;
         }
       else
         // Otherwise, the ObjectNotActive exception is raised.
         {
-          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                            0);
+          CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
+          env.exception (exception);
+          return 0;
         }
     }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   // Not reached
   return 0;
 }
 
 PortableServer::ObjectId *
 TAO_POA::reference_to_id (CORBA::Object_ptr reference,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   // The WrongPolicy exception is declared to allow future extensions.
 
@@ -1255,196 +1834,232 @@ TAO_POA::reference_to_id (CORBA::Object_ptr reference,
   // POA on which the operation is being performed.  If the object
   // reference was not created by this POA, the WrongAdapter exception
   // is raised.
-  TAO_ObjectKey_var key = reference->_key (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ObjectId system_id;
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
+  TAO_ObjectKey_var key = reference->_key (env);
+  PortableServer::ObjectId id;
+  TAO_POA::String poa_name;
+  CORBA::Boolean persistent = 0;
+  CORBA::Boolean system_id = 0;
   TAO_Temporary_Creation_Time poa_creation_time;
 
   int result = this->parse_key (key.in (),
-                                poa_system_name,
+                                poa_name,
+                                id,
+                                persistent,
                                 system_id,
-                                is_root,
-                                is_persistent,
-                                is_system_id,
                                 poa_creation_time);
   if (result != 0 ||
-      !this->root () &&
-      poa_system_name != this->system_name () ||
-      is_root != this->root () ||
-      is_persistent != this->persistent () ||
-      is_system_id != this->system_id () ||
-      !this->persistent () &&
-      poa_creation_time != this->creation_time_)
+      poa_name != this->complete_name () ||
+      persistent != this->persistent () ||
+      system_id != this->system_id () ||
+      !this->persistent () && poa_creation_time != this->creation_time_)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongAdapter;
+      env.exception (exception);
+      return 0;
     }
 
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
-
   // The object denoted by the reference does not have to be active
   // for this operation to succeed.
-  PortableServer::ObjectId_var user_id;
-  if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               user_id.out ()) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  return user_id._retn ();
+  return new PortableServer::ObjectId (id);
 }
 
 PortableServer::Servant
-TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_servant_i (const PortableServer::ObjectId &oid,
+                          CORBA::Environment &env)
 {
   // This operation requires the RETAIN policy; if not present, the
   // WrongPolicy exception is raised.
   if (this->policies ().servant_retention () != PortableServer::RETAIN)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // This operation returns the active servant associated with the
   // specified Object Id value.  If the Object Id value is not active
   // in the POA, an ObjectNotActive exception is raised.
   PortableServer::Servant servant = 0;
-  if (this->active_object_map ().find_servant_using_user_id (id,
-                                                             servant) != -1)
-    {
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
+  if (this->active_object_map ().find (oid, servant) != -1)
+    {
       return servant;
     }
   else
     // Otherwise, the ObjectNotActive exception is raised.
     {
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
+      env.exception (exception);
+      return 0;
     }
 }
 
 CORBA::Object_ptr
-TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::id_to_reference_i (const PortableServer::ObjectId &oid,
+                            CORBA::Environment &env)
 {
   // This operation requires the RETAIN policy; if not present, the
   // WrongPolicy exception is raised.
   if (this->policies ().servant_retention () != PortableServer::RETAIN)
     {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
+      CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
+      env.exception (exception);
+      return 0;
     }
 
   // If an object with the specified Object Id value is currently
   // active, a reference encapsulating the information used to
   // activate the object is returned.
-  PortableServer::ObjectId_var system_id;
-  PortableServer::Servant servant;
-  if (this->active_object_map ().find_servant_and_system_id_using_user_id (id,
-                                                                           servant,
-                                                                           system_id.out ()) == 0)
-    {
-      // Create object key.
-      TAO_ObjectKey_var key = this->create_object_key (system_id.in ());
-
-      // Ask the ORB to create you a reference
-      return this->orb_core_.orb ()->key_to_object (key.in (),
-                                                    servant->_interface_repository_id (),
-                                                    ACE_TRY_ENV);
-    }
+  PortableServer::Servant servant = 0;
+  if (this->active_object_map ().find (oid, servant) != -1)
+    return this->create_reference_with_id (oid,
+                                           servant->_interface_repository_id (),
+                                           env);
   else
     // If the Object Id value is not active in the POA, an
     // ObjectNotActive exception is raised.
     {
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        CORBA::Object::_nil ());
+      CORBA::Exception *exception = new PortableServer::POA::ObjectNotActive;
+      env.exception (exception);
+      return 0;
     }
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 void
 TAO_POA::forward_object_i (const PortableServer::ObjectId &oid,
                            CORBA::Object_ptr forward_to,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   // First, deactivate the object
-  this->deactivate_object_i (oid,
-                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  // Create a forwarding servant
-  TAO_Forwarding_Servant *forwarding_servant = 0;
-  ACE_NEW_THROW_EX (forwarding_servant,
-                    TAO_Forwarding_Servant (forward_to,
-                                            forward_to->_interface_repository_id ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  // Give ownership to the auto pointer.
-  auto_ptr<TAO_Forwarding_Servant> new_forwarding_servant (forwarding_servant);
-
-  // Register the forwarding servant with the same object Id.
+  this->deactivate_object_i (oid, env);
+
+  // If failure
+  if (env.exception () != 0)
+    return;
+
+  // If success, create a forwarding servant
+  TAO_Forwarding_Servant *forwarding_servant
+    = new TAO_Forwarding_Servant (forward_to,
+                                  forward_to->_interface_repository_id ());
+
+  // Register the forwarding servant with the same object Id
   this->activate_object_with_id_i (oid,
                                    forwarding_servant,
-                                   ACE_TRY_ENV);
-  ACE_CHECK;
+                                   env);
+}
+
+TAO_POA *
+TAO_POA::locate_poa_i (const TAO_ObjectKey &key,
+                       PortableServer::ObjectId &id,
+                       CORBA::Environment &env)
+{
+  ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_POA_I_START);
+
+  TAO_POA::String poa_name;
+  CORBA::Boolean persistent = 0;
+  CORBA::Boolean system_id = 0;
+  TAO_Temporary_Creation_Time poa_creation_time;
 
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  new_forwarding_servant.release ();
+  int result = this->parse_key (key,
+                                poa_name,
+                                id,
+                                persistent,
+                                system_id,
+                                poa_creation_time);
+  if (result != 0)
+    {
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
+    }
+
+  TAO_POA *poa = this->find_POA_i (poa_name,
+                                   persistent,
+                                   env);
+  if (env.exception () != 0)
+    return 0;
+
+  // Make sure it is not an "old" objectId
+  if (!poa->persistent () &&
+      poa->creation_time () != poa_creation_time)
+    {
+      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
+    }
+
+  return poa;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+int
+TAO_POA::locate_servant (const TAO_ObjectKey &key,
+                         CORBA::Environment &env)
+{
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), -1, env);
+
+  PortableServer::Servant servant = 0;
+  TAO_POA::LOCATION_RESULT result = this->locate_servant_i (key, servant, env);
+
+  switch (result)
+    {
+    case TAO_POA::FOUND:
+      // Optimistic attitude
+    case TAO_POA::DEFAULT_SERVANT:
+    case TAO_POA::SERVANT_MANAGER:
+      return 0;
+
+    case TAO_POA::NOT_FOUND:
+      return -1;
+    }
+
+  return -1;
+}
+
+PortableServer::Servant
+TAO_POA::find_servant (const TAO_ObjectKey &key,
+                       CORBA::Environment &env)
+{
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
+
+  PortableServer::Servant servant = 0;
+  TAO_POA::LOCATION_RESULT result = this->locate_servant_i (key, servant, env);
+
+  switch (result)
+    {
+    case TAO_POA::FOUND:
+      return servant;
+
+    case TAO_POA::DEFAULT_SERVANT:
+    case TAO_POA::SERVANT_MANAGER:
+    case TAO_POA::NOT_FOUND:
+      return 0;
+    }
+
+  return 0;
+}
 
 TAO_POA::LOCATION_RESULT
-TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
+TAO_POA::locate_servant_i (const TAO_ObjectKey &key,
                            PortableServer::Servant &servant,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
+  PortableServer::ObjectId id;
+
+  TAO_POA *poa = this->locate_poa_i (key,
+                                     id,
+                                     env);
+  if (env.exception () != 0)
+    return TAO_POA::NOT_FOUND;
+
   // If the POA has the RETAIN policy, the POA looks in the Active
   // Object Map to find if there is a servant associated with the
   // Object Id value from the request. If such a servant exists,
   // return TAO_POA::FOUND.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
-    {
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                                   user_id) == -1)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_POA::NOT_FOUND);
-        }
-
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-      int result = this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                                        user_id,
-                                                                                        servant,
-                                                                                        entry);
-      if (result == 0)
-        {
-          // Success
-          return TAO_POA::FOUND;
-        }
-    }
+  if (poa->policies ().servant_retention () == PortableServer::RETAIN &&
+      poa->active_object_map ().find (id, servant) != -1)
+    // Success
+    return TAO_POA::FOUND;
 
   // If the POA has the NON_RETAIN policy or has the RETAIN policy but
   // didn't find a servant in the Active Object Map, the POA takes the
@@ -1452,87 +2067,71 @@ TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
 
   // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
   // the OBJECT_NOT_EXIST system exception.
-  if (this->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      return TAO_POA::NOT_FOUND;
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  if (poa->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
+    return TAO_POA::NOT_FOUND;
 
   // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
   // has been associated with the POA, return
   // TAO_POA::DEFAULT_SERVANT. If no servant has been associated with
   // the POA, return TAO_POA::NOT_FOUND.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
+  if (poa->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
-      if (this->default_servant_.in () == 0)
-        {
-          return TAO_POA::NOT_FOUND;
-        }
+      if (poa->default_servant_ == 0)
+        return TAO_POA::NOT_FOUND;
       else
-        {
-          // Success
-          return TAO_POA::DEFAULT_SERVANT;
-        }
+        // Success
+        return TAO_POA::DEFAULT_SERVANT;
     }
 
   // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
   // has been associated with the POA, return
   // TAO_POA::SERVANT_MANAGER. If no servant manager has been
   // associated with the POA, return TAO_POA::NOT_FOUND.
-  if (this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
+  if (poa->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
     {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          return TAO_POA::NOT_FOUND;
-        }
+      if (CORBA::is_nil (poa->servant_activator_.in ()) &&
+          CORBA::is_nil (poa->servant_locator_.in ()))
+        return TAO_POA::NOT_FOUND;
       else
-        {
-          // Success
-          return TAO_POA::SERVANT_MANAGER;
-        }
+        // Success
+        return TAO_POA::SERVANT_MANAGER;
     }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   // Failure
   return TAO_POA::NOT_FOUND;
 }
 
 PortableServer::Servant
-TAO_POA::locate_servant_i (const char *operation,
-                           const PortableServer::ObjectId &system_id,
-                           TAO_POA_Current_Impl *poa_current_impl,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::locate_poa_and_servant_i (const TAO_ObjectKey &key,
+                                   const char *operation,
+                                   PortableServer::ObjectId &id,
+                                   TAO_POA *&poa_impl,
+                                   TAO_ORB_Core *orb_core,
+                                   CORBA::Environment &env)
 {
-  if (this->active_object_map ().find_user_id_using_system_id (system_id,
-                                                               poa_current_impl->object_id_) == -1)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
+  ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_POA_AND_SERVANT_I_START);
+
+  poa_impl = this->locate_poa_i (key,
+                                 id,
+                                 env);
+  if (env.exception () != 0)
+    return 0;
 
   // If the POA has the RETAIN policy, the POA looks in the Active
   // Object Map to find if there is a servant associated with the
   // Object Id value from the request. If such a servant exists, the
   // POA invokes the appropriate method on the servant.
-  if (this->policies ().servant_retention () == PortableServer::RETAIN)
+  if (poa_impl->policies ().servant_retention () == PortableServer::RETAIN)
     {
       PortableServer::Servant servant = 0;
-      int result = this->active_object_map ().find_servant_using_system_id_and_user_id (system_id,
-                                                                                        poa_current_impl->object_id (),
-                                                                                        servant,
-                                                                                        poa_current_impl->active_object_map_entry_);
 
-      if (result == 0)
-        {
-          // Increment the reference count.
-          ++poa_current_impl->active_object_map_entry ()->reference_count_;
+      {
+        ACE_FUNCTION_TIMEPROBE (TAO_POA_FIND_SERVANT_START);
 
+        if (poa_impl->active_object_map ().find (id, servant) != -1)
           // Success
           return servant;
-        }
+      }
     }
 
   // If the POA has the NON_RETAIN policy or has the RETAIN policy but
@@ -1541,31 +2140,30 @@ TAO_POA::locate_servant_i (const char *operation,
 
   // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
   // the OBJECT_NOT_EXIST system exception.
-  if (this->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
+  if (poa_impl->policies ().request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
     {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
+      CORBA::Exception *exception = new CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return 0;
     }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
   // has been associated with the POA so the POA will invoke the
   // appropriate method on that servant. If no servant has been
   // associated with the POA, the POA raises the OBJ_ADAPTER system
   // exception.
-  if (this->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
+  if (poa_impl->policies ().request_processing () == PortableServer::USE_DEFAULT_SERVANT)
     {
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result == 0)
+      if (poa_impl->default_servant_ == 0)
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return 0;
         }
       else
         {
           // Success
-          return result;
+          return poa_impl->default_servant_;
         }
     }
 
@@ -1587,46 +2185,31 @@ TAO_POA::locate_servant_i (const char *operation,
   // ForwardRequest exception. This exception includes an object
   // reference.
   //
-  if (this->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
+  if (poa_impl->policies ().request_processing () == PortableServer::USE_SERVANT_MANAGER)
     {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
+      if (CORBA::is_nil (poa_impl->servant_activator_.in ()) &&
+          CORBA::is_nil (poa_impl->servant_locator_.in ()))
         {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
+          CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+          env.exception (exception);
+          return 0;
         }
 
-      PortableServer::POA_var poa = this->_this (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
+      PortableServer::POA_var poa = poa_impl->_this (env);
+      if (env.exception () != 0)
+        return 0;
 
-      PortableServer::Servant servant = 0;
-      if (this->policies ().servant_retention () == PortableServer::RETAIN)
+      if (poa_impl->policies ().servant_retention () == PortableServer::RETAIN)
         {
-          {
-            // A recursive thread lock without using a recursive
-            // thread lock.  Non_Servant_Upcall has a magic
-            // constructor and destructor.  We unlock the
-            // Object_Adapter lock for the duration of the servant
-            // activator upcalls; reacquiring once the upcalls
-            // complete.  Even though we are releasing the lock, other
-            // threads will not be able to make progress since
-            // <Object_Adapter::non_servant_upcall_in_progress_> has
-            // been set.
-            TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-            ACE_UNUSED_ARG (non_servant_upcall);
-
-            // @@
-            // Invocations of incarnate on the servant manager are serialized.
-            // Invocations of etherealize on the servant manager are serialized.
-            // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-            servant = this->servant_activator_->incarnate (poa_current_impl->object_id (),
-                                                           poa.in (),
-                                                           ACE_TRY_ENV);
-            ACE_CHECK_RETURN (0);
-
-            if (servant == 0)
-              return 0;
-          }
+          // @@
+          // Invocations of incarnate on the servant manager are serialized.
+          // Invocations of etherealize on the servant manager are serialized.
+          // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
+          PortableServer::Servant servant = poa_impl->servant_activator_->incarnate (id,
+                                                                                     poa.in (),
+                                                                                     env);
+          if (env.exception () != 0 || servant == 0)
+            return 0;
 
           // If the incarnate operation returns a servant that is
           // already active for a different Object Id and if the POA
@@ -1634,51 +2217,33 @@ TAO_POA::locate_servant_i (const char *operation,
           // the POA policy and is considered to be in error. The POA
           // will raise an OBJ_ADAPTER system exception for the
           // request.
-          if (this->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
-              this->active_object_map ().is_servant_in_map (servant))
+          if (poa_impl->policies ().id_uniqueness () == PortableServer::UNIQUE_ID &&
+              poa_impl->active_object_map ().find (servant) != -1)
             {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
+              CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+              env.exception (exception);
+              return 0;
             }
 
           // The POA enters the returned Servant value into the Active
           // Object Map so that subsequent requests with the same
           // ObjectId value will be delivered directly to that servant
           // without invoking the servant manager.
-          int result = this->active_object_map ().rebind_using_user_id_and_system_id (servant,
-                                                                                      poa_current_impl->object_id (),
-                                                                                      system_id,
-                                                                                      poa_current_impl->active_object_map_entry_);
-          if (result != 0)
+          if (poa_impl->active_object_map ().bind (id, servant) == -1)
             {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
+              CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+              env.exception (exception);
+              return 0;
             }
-          else
-            {
-              // Increment the reference count.
-              ++poa_current_impl->active_object_map_entry ()->reference_count_;
 
-              // Success
-              return servant;
-            }
+          // Success
+          return servant;
         }
       else
         //
         // Don't retain servant
         //
         {
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring
-          // once the upcalls complete.  Even though we are releasing
-          // the lock, other threads will not be able to make progress
-          // since <Object_Adapter::non_servant_upcall_in_progress_>
-          // has been set.
-          TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->orb_core_.object_adapter ());
-          ACE_UNUSED_ARG (non_servant_upcall);
-
           // No serialization of invocations of preinvoke or
           // postinvoke may be assumed; there may be multiple
           // concurrent invocations of preinvoke for the same
@@ -1688,164 +2253,230 @@ TAO_POA::locate_servant_i (const char *operation,
           // process the request, and postinvoke the object.
           //
           PortableServer::ServantLocator::Cookie cookie;
-          PortableServer::Servant servant = this->servant_locator_->preinvoke (poa_current_impl->object_id (),
-                                                                               poa.in (),
-                                                                               operation,
-                                                                               cookie,
-                                                                               ACE_TRY_ENV);
-          ACE_CHECK_RETURN (0);
-
-          if (servant == 0)
+          PortableServer::Servant servant = poa_impl->servant_locator_->preinvoke (id,
+                                                                                   poa.in (),
+                                                                                   operation,
+                                                                                   cookie,
+                                                                                   env);
+          if (env.exception () != 0 || servant == 0)
             return 0;
 
           // Remember the cookie
-          poa_current_impl->locator_cookie (cookie);
+          TAO_POA_Current *poa_current = orb_core->poa_current ();
+          poa_current->locator_cookie (cookie);
 
           // Success
           return servant;
         }
     }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   // Failure
-  ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                    0);
+  CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+  env.exception (exception);
+  return 0;
 }
 
-/* static */
-int
-TAO_POA::parse_key (const TAO_ObjectKey &key,
-                    TAO_Object_Adapter::poa_name &poa_system_name,
-                    PortableServer::ObjectId &system_id,
-                    CORBA::Boolean &is_root,
-                    CORBA::Boolean &is_persistent,
-                    CORBA::Boolean &is_system_id,
-                    TAO_Temporary_Creation_Time &poa_creation_time)
+void
+TAO_POA::dispatch_servant (const TAO_ObjectKey &key,
+                           CORBA::ServerRequest &req,
+                           void *context,
+                           TAO_ORB_Core *orb_core,
+                           CORBA::Environment &env)
 {
-  // Start at zero.
-  CORBA::ULong starting_at = 0;
+  ACE_FUNCTION_TIMEPROBE (TAO_POA_DISPATCH_SERVANT_START);
 
-  // Get the object key octets.
-  const CORBA::Octet *key_data = key.get_buffer ();
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-#if !defined (TAO_NO_IOR_TABLE)
-  // Skip the object key prefix since we have already checked for
-  // this.
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
+  this->dispatch_servant_i (key, req, context, orb_core, env);
+}
 
-  // Check the root indicator.
-  char root_key_type = key_data[starting_at];
-  if (root_key_type == TAO_POA::root_key_char ())
-    {
-      is_root = 1;
-    }
-  else if (root_key_type == TAO_POA::non_root_key_char ())
-    {
-      is_root = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
+void
+TAO_POA::dispatch_servant_i (const TAO_ObjectKey &key,
+                             CORBA::ServerRequest &req,
+                             void *context,
+                             TAO_ORB_Core *orb_core,
+                             CORBA::Environment &env)
+{
+  PortableServer::ObjectId id;
+  TAO_POA *poa = 0;
+  const char *operation = req.operation ();
 
-  // Skip past the system id indicator
-  starting_at += TAO_POA::root_key_type_length ();
+  // @@ Lots on non-exception safe code here!!
 
-  // Check the system id indicator.
-  char system_id_key_type = key_data[starting_at];
-  if (system_id_key_type == TAO_POA::system_id_key_char ())
-    {
-      is_system_id = 1;
-    }
-  else if (system_id_key_type == TAO_POA::user_id_key_char ())
+  // Setup for POA Current
+  TAO_POA_Current current_context;
+
+  // @@ This call changes the state, but if an exception is raised the
+  // context will not be reset, you need a helper class that can do
+  // that in the destructor, what about using the TAO_POA_Current
+  // class itself?
+
+  // Set the current context and remember the old one
+  TAO_POA_Current *previous_context = orb_core->poa_current (&current_context);
+
+  PortableServer::Servant servant = this->locate_poa_and_servant_i (key,
+                                                                    operation,
+                                                                    id,
+                                                                    poa,
+                                                                    orb_core,
+                                                                    env);
+
+  // @@ We should use the TRY macros here, notice that you detect the
+  // exception but you do not attempt to fix the problems above
+  if (env.exception () != 0 || servant == 0)
+    return;
+
+  // @@ Yet another place where you change the state without a class
+  // whose destructor will return things to normal....
+
+  // Setup for upcall
+  poa->pre_invoke (key,
+                   id,
+                   servant,
+                   &current_context,
+                   env);
+
+  {
+    ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
+
+    // Upcall
+    servant->_dispatch (req,
+                        context,
+                        env);
+  }
+
+  // @@ This shoul be done by a destructor....
+
+  // Cleanup from upcall
+  poa->post_invoke (servant,
+                    operation,
+                    &current_context,
+                    env);
+
+  // @@ this should also be done by a destructor....
+
+  // Reset old context
+  orb_core->poa_current (previous_context);
+
+}
+
+void
+TAO_POA::pre_invoke (const TAO_ObjectKey &key,
+                     const PortableServer::ObjectId &id,
+                     PortableServer::Servant servant,
+                     TAO_POA_Current *poa_current,
+                     CORBA::Environment &env)
+{
+  ACE_UNUSED_ARG (env);
+
+  poa_current->POA_impl (this);
+  poa_current->object_key (key);
+  poa_current->object_id (id);
+  poa_current->servant (servant);
+}
+
+void
+TAO_POA::post_invoke (PortableServer::Servant servant,
+                      const char *operation,
+                      TAO_POA_Current *poa_current,
+                      CORBA::Environment &env)
+{
+  PortableServer::ServantLocator::Cookie cookie = poa_current->locator_cookie ();
+
+  if (cookie != 0)
     {
-      is_system_id = 0;
+      PortableServer::POA_var poa = poa_current->get_POA (env);
+
+      this->servant_locator_->postinvoke (poa_current->object_id (),
+                                          poa.in (),
+                                          operation,
+                                          cookie,
+                                          servant,
+                                          env);
     }
+
+  // poa_current->clear ();
+
+}
+
+int
+TAO_POA::parse_key (const TAO_ObjectKey &key,
+                    TAO_POA::String &poa_name,
+                    PortableServer::ObjectId &id,
+                    CORBA::Boolean &persistent,
+                    CORBA::Boolean &system_id,
+                    TAO_Temporary_Creation_Time &poa_creation_time)
+{
+  ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
+
+  int starting_at = 0;
+
+  // Check the system id indicator
+  char system_id_key_type = key[starting_at];
+  if (system_id_key_type == this->system_id_key_char ())
+    system_id = 1;
+  else if (system_id_key_type == this->user_id_key_char ())
+    system_id = 0;
   else
-    {
-      // Incorrect key
-      return -1;
-    }
+    // Incorrect key
+    return -1;
 
   // Skip past the system id indicator
   starting_at += TAO_POA::system_id_key_type_length ();
 
-  // Check the persistence indicator
-  char persistent_key_type = key_data[starting_at];
-  if (persistent_key_type == TAO_POA::persistent_key_char ())
-    {
-      is_persistent = 1;
-    }
-  else if (persistent_key_type == TAO_POA::transient_key_char ())
-    {
-      is_persistent = 0;
-    }
+  // Try to find the last separator
+  int last_token_position = 0;
+  if (system_id)
+    // The minus one is because we want <last_token_position> to point
+    // to the separator
+    last_token_position = key.length () - this->system_id_size () - 1;
   else
-    {
-      // Incorrect key
-      return -1;
-    }
+    last_token_position = this->rfind (key, TAO_POA::name_separator ());
 
-  // Skip past the persistent indicator
-  starting_at += TAO_POA::persistent_key_type_length ();
+  // If not found, the name is not correct
+  if (last_token_position == TAO_POA::String::npos)
+    return -1;
 
 #if !defined (POA_NO_TIMESTAMP)
-  // Grab the timestamp for transient POAs.
-  if (!is_persistent)
-    {
-      // Take the creation time for the timestamp
-      poa_creation_time.creation_time (key_data + starting_at);
+  // Check the persistence indicator
+  char persistent_key_type = key[starting_at];
+  if (persistent_key_type == this->persistent_key_char ())
+    persistent = 1;
+  else if (persistent_key_type == this->transient_key_char ())
+    persistent = 0;
+  else
+    // Incorrect key
+    return -1;
 
-      // Skip past the timestamp
-      starting_at += TAO_Creation_Time::creation_time_length ();
-    }
-#endif /* POA_NO_TIMESTAMP */
+  // Skip past the persistent indicator
+  starting_at += TAO_POA::persistent_key_type_length ();
 
-  // Calculate the size of the POA name.
-  CORBA::ULong poa_name_size = 0;
-  if (!is_persistent)
-    {
-      // Transient POAs have fixed size.
-      poa_name_size = TAO_Object_Adapter::transient_poa_name_size ();
-    }
-  else if (is_system_id)
-    {
-      // System ids have fixed size.
-      poa_name_size = key.length () - starting_at - TAO_Active_Object_Map::system_id_size ();
-    }
-  else
-    {
-      // Get the size from the object key.
-      ACE_OS::memcpy (&poa_name_size,
-                      key_data + starting_at,
-                      sizeof (poa_name_size));
-      poa_name_size = ACE_NTOHL (poa_name_size);
+  // Take the creation time for the timestamp
+  poa_creation_time.creation_time (&key[starting_at]);
 
-      starting_at += sizeof (poa_name_size);
-    }
+  // Skip past the timestamp
+  starting_at += TAO_Creation_Time::creation_time_length ();
 
-  // For non-root POAs, grab their name.
-  if (!is_root)
-    {
-      poa_system_name.replace (poa_name_size,
-                               poa_name_size,
-                               (CORBA::Octet *) key_data + starting_at,
-                               0);
+#endif /* POA_NO_TIMESTAMP */
 
-      starting_at += poa_name_size;
-    }
+  // Take the substring from <starting_at> to last_token_position for
+  // the POA name
+  int how_many = last_token_position - starting_at;
+  poa_name.set ((const char *) &key[starting_at],
+                how_many,
+                0);
 
-  // The rest is the system id.
-  CORBA::ULong system_id_size = key.length () - starting_at;
+  // Take the substring from (last_token_position + separator_length)
+  // to length for the objectId
+  starting_at = last_token_position + TAO_POA::name_separator_length ();
+  how_many = key.length () - starting_at;
 
-  // Reset <system_id>.
-  system_id.replace (system_id_size,
-                     system_id_size,
-                     (CORBA::Octet *) key_data + starting_at,
-                     0);
+  // Reset the Id
+  id.replace (how_many,
+              how_many,
+              (CORBA::Octet *) &key[starting_at],
+              0);
 
   // Success
   return 0;
@@ -1854,130 +2485,60 @@ TAO_POA::parse_key (const TAO_ObjectKey &key,
 TAO_ObjectKey *
 TAO_POA::create_object_key (const PortableServer::ObjectId &id)
 {
-  // Calculate the prefix size.
-  CORBA::ULong prefix_size = 0;
-#if !defined (TAO_NO_IOR_TABLE)
-  prefix_size += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
-
-  // If we are dealing with a persistent POA and user ids are being
-  // used, then we need to add the POA name length field to the object
-  // key. Otherwise, the POA name length can be calculated by looking
-  // at the remainder after extracting other parts of the key.
-  int add_poa_name_length =
-    this->persistent_ &&
-    !this->system_id_;
-
-  // Size required by the POA name.
-  CORBA::ULong poa_name = 0;
-
-  // Calculate the space required for the POA name.
-  CORBA::ULong poa_name_length = this->system_name_->length ();
-  if (!this->root ())
-    {
-      poa_name += poa_name_length;
-    }
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name += sizeof (poa_name_length);
-    }
-
-  // Calculate the space required for the timestamp and the persistent
-  // byte.
-  CORBA::ULong creation_time = this->persistent_key_type_length ();
+  // Calculate the space required for the key
+  int buffer_size =
+    this->system_id_key_type_length () +
 #if !defined (POA_NO_TIMESTAMP)
-  // Calculate the space required for the timestamp.
-  CORBA::ULong creation_time_length = TAO_Creation_Time::creation_time_length ();
-  if (!this->persistent_)
-    {
-      creation_time += creation_time_length;
-    }
+    this->persistent_key_type_length () +
+    TAO_Creation_Time::creation_time_length () +
 #endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the space required for the key.
-  CORBA::ULong buffer_size =
-    prefix_size +
-    this->root_key_type_length () +
-    this->system_id_key_type_length () +
-    creation_time +
-    poa_name +
+    this->complete_name_.length () +
+    TAO_POA::name_separator_length () +
     id.length ();
 
-  // Create the buffer for the key.
+  // Create the buffer for the key
   CORBA::Octet *buffer = TAO_ObjectKey::allocbuf (buffer_size);
 
-  // Keeps track of where the next infomation goes; start at 0 byte.
-  CORBA::ULong starting_at = 0;
-
-#if !defined (TAO_NO_IOR_TABLE)
-  // Add the object key prefix.
-  ACE_OS::memcpy (&buffer[starting_at],
-                  &objectkey_prefix[0],
-                  TAO_OBJECTKEY_PREFIX_SIZE);
+  // Keeps track of where the next infomation goes; start at 0 byte
+  int starting_at = 0;
 
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-#endif /* TAO_NO_IOR_TABLE */
-
-  // Copy the root byte.
-  buffer[starting_at] = (CORBA::Octet) this->root_key_type ();
-  starting_at += this->root_key_type_length ();
-
-  // Copy the system id byte.
+  // Copy the system id bit
   buffer[starting_at] = (CORBA::Octet) this->system_id_key_type ();
   starting_at += this->system_id_key_type_length ();
 
-  // Copy the persistence byte.
+#if !defined (POA_NO_TIMESTAMP)
+  // Copy the persistence bit
   buffer[starting_at] = (CORBA::Octet) this->persistent_key_type ();
   starting_at += this->persistent_key_type_length ();
 
-#if !defined (POA_NO_TIMESTAMP)
-  // Then copy the timestamp for transient POAs.
-  if (!this->persistent ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->creation_time_.creation_time (),
-                      creation_time_length);
-      starting_at += creation_time_length;
-    }
+  // Then copy the timestamp
+  ACE_OS::memcpy (&buffer[starting_at],
+                  this->creation_time_.creation_time (),
+                  TAO_Creation_Time::creation_time_length ());
+  starting_at += TAO_Creation_Time::creation_time_length ();
 #endif /* POA_NO_TIMESTAMP */
 
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name_length = ACE_HTONL (poa_name_length);
-      ACE_OS::memcpy (&buffer[starting_at],
-                      &poa_name_length,
-                      sizeof (poa_name_length));
-      starting_at += sizeof (poa_name_length);
-    }
+  // Put the POA name into the buffer
+  ACE_OS::memcpy (&buffer[starting_at],
+                  this->complete_name_.c_str (),
+                  this->complete_name_.length ());
+  starting_at += this->complete_name_.length ();
 
-  // Put the POA name into the key (for non-root POAs).
-  if (!this->root ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->system_name_->get_buffer (),
-                      this->system_name_->length ());
-      starting_at += this->system_name_->length ();
-    }
+  // Add the name separator
+  buffer[starting_at] = (CORBA::Octet) TAO_POA::name_separator ();
+  starting_at += TAO_POA::name_separator_length ();
 
-  // Then copy the object id into the key.
+  // Then copy the ID into the key
   ACE_OS::memcpy (&buffer[starting_at],
                   id.get_buffer (),
                   id.length ());
 
   // Create the key, giving the ownership of the buffer to the
   // sequence.
-  TAO_ObjectKey *key = 0;
-  ACE_NEW_RETURN (key,
-                  TAO_ObjectKey (buffer_size,
-                                 buffer_size,
-                                 buffer,
-                                 1),
-                  0);
-
-  return key;
+  return new TAO_ObjectKey (buffer_size,
+                            buffer_size,
+                            buffer,
+                            1);
 }
 
 int
@@ -2004,36 +2565,81 @@ TAO_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
 #endif /* POA_NAME_IN_POA_GENERATED_ID */
 }
 
+int
+TAO_POA::is_poa_generated_key (const TAO_ObjectKey &key)
+{
+  // Grab the buffer
+  const char *key_buffer = (const char *) key.get_buffer ();
+
+  // Check to see if the complete POA name is the first part of the
+  // key
+  return
+    this->complete_name_.length () < key.length () &&
+    ACE_OS::strncmp (key_buffer,
+                     this->complete_name_.c_str (),
+                     this->complete_name_.length ()) == 0;
+}
+
+int
+TAO_POA::leaf_poa_name (const TAO_POA::String &adapter_name,
+                        CORBA::Environment &env)
+{
+  // This method does not throw any exceptions
+  ACE_UNUSED_ARG (env);
+
+  // Try to find the name separator
+  if (adapter_name.find (TAO_POA::name_separator ()) == TAO_POA::String::npos)
+    // If not found, the name was a leaf
+    return 1;
+  else
+    // If found, the name was not a leaf
+    return 0;
+}
+
 void
-TAO_POA::set_folded_name (void)
+TAO_POA::parse_poa_name (const TAO_POA::String &adapter_name,
+                         TAO_POA::String &topmost_poa_name,
+                         TAO_POA::String &tail_poa_name,
+                         CORBA::Environment &env)
 {
-  CORBA::ULong length = 0;
-  CORBA::ULong parent_length = 0;
+  // Try to find the name separator
+  int token_position = adapter_name.find (TAO_POA::name_separator ());
 
-  if (this->parent_ != 0)
+  // If not found, the name was a leaf, throw exception
+  if (token_position == TAO_POA::String::npos)
     {
-      parent_length = this->parent_->folded_name ().length ();
-      length += parent_length;
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return;
     }
+  else
+    {
+      // If found, take the substring from 0 to token_position
+      int starting_at = 0;
+      int how_many = token_position - starting_at;
+      topmost_poa_name.set (&adapter_name[starting_at],
+                            how_many,
+                            0);
 
-  length += this->name_.length ();
-  length += TAO_POA::name_separator_length ();
-
-  this->folded_name_.length (length);
-  CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
+      // Take the substring from (token_position + separator_length)
+      // to length
+      starting_at = token_position + TAO_POA::name_separator_length ();
+      how_many = adapter_name.length () - starting_at;
+      tail_poa_name.set (&adapter_name[starting_at],
+                         how_many,
+                         0);
+    }
+}
 
+void
+TAO_POA::set_complete_name (void)
+{
   if (this->parent_ != 0)
     {
-      ACE_OS::memcpy (folded_name_buffer,
-                      this->parent_->folded_name ().get_buffer (),
-                      parent_length);
+      this->complete_name_ += this->parent_->complete_name ();
+      this->complete_name_ += TAO_POA::name_separator ();
     }
-
-  ACE_OS::memcpy (&folded_name_buffer[parent_length],
-                  this->name_.c_str (),
-                  this->name_.length ());
-
-  folded_name_buffer[length - TAO_POA::name_separator_length ()] = TAO_POA::name_separator ();
+  this->complete_name_ += this->name_;
 }
 
 PortableServer::ObjectId *
@@ -2053,15 +2659,10 @@ TAO_POA::string_to_ObjectId (const char *string)
   ACE_OS::memcpy (buffer, string, buffer_size);
 
   // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
+  return new PortableServer::ObjectId (buffer_size,
+                                       buffer_size,
+                                       buffer,
+                                       1);
 }
 
 PortableServer::ObjectId *
@@ -2075,15 +2676,10 @@ TAO_POA::string_to_ObjectId (const char *string,
   ACE_OS::memcpy (buffer, string, size);
 
   // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (size,
-                                            size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
+  return new PortableServer::ObjectId (size,
+                                       size,
+                                       buffer,
+                                       1);
 }
 
 PortableServer::ObjectId *
@@ -2105,15 +2701,10 @@ TAO_POA::wstring_to_ObjectId (const CORBA::WChar *string)
   ACE_OS::memcpy (buffer, string, buffer_size);
 
   // Create a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
+  return new PortableServer::ObjectId (buffer_size,
+                                       buffer_size,
+                                       buffer,
+                                       1);
 }
 
 CORBA::String
@@ -2136,7 +2727,7 @@ CORBA::WChar *
 TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
 {
   // Create space
-  CORBA::WChar* string = CORBA::wstring_alloc (id.length ());
+  CORBA::WString string = CORBA::wstring_alloc (id.length ());
 
   // Copy the data
   ACE_OS::memcpy (string, id.get_buffer (), id.length () * sizeof (CORBA::WChar));
@@ -2148,6 +2739,188 @@ TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
   return string;
 }
 
+PortableServer::ThreadPolicy_ptr
+TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
+                               CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::ThreadPolicy::_nil ();
+
+  auto_ptr<TAO_Thread_Policy> new_policy (new TAO_Thread_Policy (value, self.in ()));
+  PortableServer::ThreadPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::ThreadPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::LifespanPolicy_ptr
+TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
+                                 CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::LifespanPolicy::_nil ();
+
+  auto_ptr<TAO_Lifespan_Policy> new_policy (new TAO_Lifespan_Policy (value, self.in ()));
+  PortableServer::LifespanPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::LifespanPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
+                                      CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::IdUniquenessPolicy::_nil ();
+
+  auto_ptr<TAO_Id_Uniqueness_Policy> new_policy (new TAO_Id_Uniqueness_Policy (value, self.in ()));
+  PortableServer::IdUniquenessPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::IdUniquenessPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
+                                      CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::IdAssignmentPolicy::_nil ();
+
+  auto_ptr<TAO_Id_Assignment_Policy> new_policy (new TAO_Id_Assignment_Policy (value, self.in ()));
+  PortableServer::IdAssignmentPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::IdAssignmentPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
+                                            CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::ImplicitActivationPolicy::_nil ();
+
+  auto_ptr<TAO_Implicit_Activation_Policy> new_policy (new TAO_Implicit_Activation_Policy (value, self.in ()));
+  PortableServer::ImplicitActivationPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::ImplicitActivationPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
+                                          CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::ServantRetentionPolicy::_nil ();
+
+  auto_ptr<TAO_Servant_Retention_Policy> new_policy (new TAO_Servant_Retention_Policy (value, self.in ()));
+  PortableServer::ServantRetentionPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::ServantRetentionPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
+                                           CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::RequestProcessingPolicy::_nil ();
+
+  auto_ptr<TAO_Request_Processing_Policy> new_policy (new TAO_Request_Processing_Policy (value, self.in ()));
+  PortableServer::RequestProcessingPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::RequestProcessingPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+PortableServer::SynchronizationPolicy_ptr
+TAO_POA::create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,
+                                        CORBA::Environment &env)
+{
+  PortableServer::POA_var self = this->_this (env);
+  // Check for exceptions
+  if (env.exception () != 0)
+    return PortableServer::SynchronizationPolicy::_nil ();
+
+  auto_ptr<TAO_Synchronization_Policy> new_policy (new TAO_Synchronization_Policy (value, self.in ()));
+  PortableServer::SynchronizationPolicy_var result = new_policy->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::SynchronizationPolicy::_nil ();
+  else
+    {
+      // Make sure that the auto_ptr does not delete the
+      // implementation
+      new_policy.release ();
+      return result._retn ();
+    }
+}
+
 void
 TAO_POA::encode_sequence_to_string (CORBA::String &str,
                                     const TAO_Unbounded_Sequence<CORBA::Octet> &seq)
@@ -2227,1170 +3000,352 @@ TAO_POA::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
   seq.length (i);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ThreadPolicy_ptr
-TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  TAO_Thread_Policy *thread_policy = 0;
-  ACE_NEW_THROW_EX (thread_policy,
-                    TAO_Thread_Policy (value,
-                                       rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Thread_Policy> new_thread_policy (thread_policy);
-
-  PortableServer::ThreadPolicy_var result = new_thread_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_thread_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_thread_policy.release ();
-  return result._retn ();
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::LifespanPolicy_ptr
-TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  TAO_Lifespan_Policy *lifespan_policy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy,
-                    TAO_Lifespan_Policy (value,
-                                         rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Lifespan_Policy> new_lifespan_policy (lifespan_policy);
-
-  PortableServer::LifespanPolicy_var result = new_lifespan_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_lifespan_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_lifespan_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy,
-                    TAO_Id_Uniqueness_Policy (value,
-                                              rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_id_uniqueness_policy (id_uniqueness_policy);
-
-  PortableServer::IdUniquenessPolicy_var result = new_id_uniqueness_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_uniqueness_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_uniqueness_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                      CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  TAO_Id_Assignment_Policy *id_assignment_policy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy,
-                    TAO_Id_Assignment_Policy (value,
-                                              rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Policy> new_id_assignment_policy (id_assignment_policy);
-
-  PortableServer::IdAssignmentPolicy_var result = new_id_assignment_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_assignment_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_assignment_policy.release ();
-  return result._retn ();
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  TAO_Implicit_Activation_Policy *implicit_activation_policy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy,
-                    TAO_Implicit_Activation_Policy (value,
-                                                    rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Implicit_Activation_Policy> new_implicit_activation_policy (implicit_activation_policy);
-
-  PortableServer::ImplicitActivationPolicy_var result = new_implicit_activation_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_implicit_activation_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_implicit_activation_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                          CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  TAO_Servant_Retention_Policy *servant_retention_policy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy,
-                    TAO_Servant_Retention_Policy (value,
-                                                  rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Servant_Retention_Policy> new_servant_retention_policy (servant_retention_policy);
-
-  PortableServer::ServantRetentionPolicy_var result = new_servant_retention_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_servant_retention_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_servant_retention_policy.release ();
-  return result._retn ();
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                           CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var rootPOA = this->orb_core_.root_poa_reference (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  TAO_Request_Processing_Policy *request_processing_policy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy,
-                    TAO_Request_Processing_Policy (value,
-                                                   rootPOA.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Request_Processing_Policy> new_request_processing_policy (request_processing_policy);
-
-  PortableServer::RequestProcessingPolicy_var result = new_request_processing_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_request_processing_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_request_processing_policy.release ();
-  return result._retn ();
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
-                                      PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Thread_Policy::TAO_Thread_Policy (const TAO_Thread_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::ThreadPolicyValue
-TAO_Thread_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Thread_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Thread_Policy *thread_policy_copy = 0;
-  ACE_NEW_THROW_EX (thread_policy_copy,
-                    TAO_Thread_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Thread_Policy> new_thread_policy (thread_policy_copy);
-
-  CORBA::Policy_var result = new_thread_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_thread_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_thread_policy.release ();
-  return result._retn ();
-}
-
-void
-TAO_Thread_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
+                                        const char *name,
+                                        CORBA::Environment &env)
 {
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
+  // Default policies
+  CORBA::PolicyList default_policies;
 
-CORBA::PolicyType
-TAO_Thread_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::THREAD_POLICY_ID;
-}
+  // This assumes that the lock on the parent is recursive
+  PortableServer::POA_var child = parent->create_POA (name,
+                                                      PortableServer::POAManager::_nil (),
+                                                      default_policies,
+                                                      env);
 
-PortableServer::POA_ptr
-TAO_Thread_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
+  if (env.exception () != 0)
+    return 0;
+  else
+    {
+      PortableServer::AdapterActivator_var activator = this->_this (env);
+      if (env.exception () != 0)
+        {
+          child->destroy (0,
+                          0,
+                          env);
+          return 0;
+        }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+      child->the_activator (activator.in (), env);
 
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
-                                          PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
+      if (env.exception () != 0)
+        {
+          child->destroy (0,
+                          0,
+                          env);
+          return 0;
+        }
 
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
+      // Finally everything is fine
+      return 1;
+    }
 }
 
-PortableServer::LifespanPolicyValue
-TAO_Lifespan_Policy::value (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::TAO_POA_Manager (void)
+  : state_ (TAO_POA_Manager::HOLDING),
+    closing_down_ (0),
+    lock_ (0),
+    poa_collection_ ()
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
+  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_poa_mgr_lock ();
 }
 
-CORBA::Policy_ptr
-TAO_Lifespan_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::~TAO_POA_Manager (void)
 {
-  TAO_Lifespan_Policy *lifespan_policy_copy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy_copy,
-                    TAO_Lifespan_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Lifespan_Policy> new_lifespan_policy (lifespan_policy_copy);
-
-  CORBA::Policy_var result = new_lifespan_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_lifespan_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_lifespan_policy.release ();
-  return result._retn ();
+  delete this->lock_;
 }
 
 void
-TAO_Lifespan_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::activate (CORBA::Environment &env)
 {
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
+  // This operation changes the state of the POA manager to active. If
+  // issued while the POA manager is in the inactive state, the
+  // AdapterInactive exception is raised.  Entering the active state
+  // enables the associated POAs to process requests.
 
-CORBA::PolicyType
-TAO_Lifespan_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::LIFESPAN_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Lifespan_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::IdUniquenessPolicyValue
-TAO_Id_Uniqueness_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Uniqueness_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy_copy,
-                    TAO_Id_Uniqueness_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Uniqueness_Policy> new_id_uniqueness_policy (id_uniqueness_policy_copy);
-
-  CORBA::Policy_var result = new_id_uniqueness_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_id_uniqueness_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_uniqueness_policy.release ();
-  return result._retn ();
+  if (this->state_ == TAO_POA_Manager::INACTIVE)
+    {
+      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
+      env.exception (exception);
+      return;
+    }
+  else
+    this->state_ = TAO_POA_Manager::ACTIVE;
 }
 
 void
-TAO_Id_Uniqueness_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Id_Uniqueness_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::ID_UNIQUENESS_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Id_Uniqueness_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
-                                                    PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::IdAssignmentPolicyValue
-TAO_Id_Assignment_Policy::value (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
+                                CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-CORBA::Policy_ptr
-TAO_Id_Assignment_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy_copy,
-                    TAO_Id_Assignment_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  // This operation changes the state of the POA manager to
+  // holding. If issued while the POA manager is in the inactive
+  // state, the AdapterInactive exception is raised.  Entering the
+  // holding state causes the associated POAs to queue incoming
+  // requests.  Any requests that have been queued but have not
+  // started executing will continue to be queued while in the holding
+  // state.
 
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Id_Assignment_Policy> new_id_assignment_policy (id_assignment_policy_copy);
-
-  CORBA::Policy_var result = new_id_assignment_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  if (this->state_ == TAO_POA_Manager::INACTIVE)
+    {
+      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
+      env.exception (exception);
+      return;
+    }
+  else
+    this->state_ = TAO_POA_Manager::HOLDING;
 
-  // Give ownership of this servant to the POA.
-  new_id_assignment_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  // If the wait_for_completion parameter is FALSE, this operation
+  // returns immediately after changing the state. If the parameter is
+  // TRUE, this operation does not return until either there are no
+  // actively executing requests in any of the POAs associated with
+  // this POA manager (that is, all requests that were started prior
+  // to the state change have completed) or the state of the POA
+  // manager is changed to a state other than holding.
 
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_id_assignment_policy.release ();
-  return result._retn ();
+  ACE_UNUSED_ARG (wait_for_completion);
 }
 
 void
-TAO_Id_Assignment_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
+                                   CORBA::Environment &env)
 {
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-CORBA::PolicyType
-TAO_Id_Assignment_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::ID_ASSIGNMENT_POLICY_ID;
-}
+  // This operation changes the state of the POA manager to
+  // discarding. If issued while the POA manager is in the inactive
+  // state, the AdapterInactive exception is raised.  Entering the
+  // discarding state causes the associated POAs to discard incoming
+  // requests.  In addition, any requests that have been queued but
+  // have not started executing are discarded. When a request is
+  // discarded, a TRANSIENT system exception is returned to the
+  // client.
 
-PortableServer::POA_ptr
-TAO_Id_Assignment_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
-
-PortableServer::ImplicitActivationPolicyValue
-TAO_Implicit_Activation_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Implicit_Activation_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy_copy,
-                    TAO_Implicit_Activation_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Implicit_Activation_Policy> new_implicit_activation_policy (implicit_activation_policy_copy);
-
-  CORBA::Policy_var result = new_implicit_activation_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  if (this->state_ == TAO_POA_Manager::INACTIVE)
+    {
+      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
+      env.exception (exception);
+      return;
+    }
+  else
+    this->state_ = TAO_POA_Manager::DISCARDING;
 
-  // Give ownership of this servant to the POA.
-  new_implicit_activation_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  // If the wait_for_completion parameter is FALSE, this operation
+  // returns immediately after changing the state. If the parameter is
+  // TRUE, this operation does not return until either there are no
+  // actively executing requests in any of the POAs associated with
+  // this POA manager (that is, all requests that were started prior
+  // to the state change have completed) or the state of the POA
+  // manager is changed to a state other than discarding.
 
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_implicit_activation_policy.release ();
-  return result._retn ();
+  ACE_UNUSED_ARG (wait_for_completion);
 }
 
 void
-TAO_Implicit_Activation_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Implicit_Activation_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Implicit_Activation_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
+                             CORBA::Boolean wait_for_completion,
+                             CORBA::Environment &env)
 {
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
-                                                            PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
+  this->closing_down_ = 1;
 
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
+  // This operation changes the state of the POA manager to
+  // inactive. If issued while the POA manager is in the inactive
+  // state, the AdapterInactive exception is raised.  Entering the
+  // inactive state causes the associated POAs to reject requests that
+  // have not begun to be executed as well as any new requests.
 
-PortableServer::ServantRetentionPolicyValue
-TAO_Servant_Retention_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Servant_Retention_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy_copy,
-                    TAO_Servant_Retention_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Servant_Retention_Policy> new_servant_retention_policy (servant_retention_policy_copy);
-
-  CORBA::Policy_var result = new_servant_retention_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_servant_retention_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_servant_retention_policy.release ();
-  return result._retn ();
-}
+  if (this->state_ == TAO_POA_Manager::INACTIVE)
+    {
+      CORBA::Exception *exception = new PortableServer::POAManager::AdapterInactive;
+      env.exception (exception);
+      return;
+    }
+  else
+    this->state_ = TAO_POA_Manager::INACTIVE;
 
-void
-TAO_Servant_Retention_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
-{
+  // After changing the state, if the etherealize_objects parameter is:
   //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
+  // a) TRUE - the POA manager will cause all associated POAs that
+  // have the RETAIN and USE_SERVANT_MANAGER policies to perform the
+  // etherealize operation on the associated servant manager for all
+  // active objects.
   //
+  // b) FALSE - the etherealize operation is not called. The purpose
+  // is to provide developers with a means to shut down POAs in a
+  // crisis (for example, unrecoverable error) situation.
 
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Servant_Retention_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::SERVANT_RETENTION_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Servant_Retention_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
-                                                              PortableServer::POA_ptr poa)
-  : value_ (value),
-    poa_ (PortableServer::POA::_duplicate (poa))
-{
-}
+  for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
+       iterator != this->poa_collection_.end ()
+         && env.exception () == 0;
+       ++iterator)
+    {
+      TAO_POA *poa = *iterator;
+      poa->destroy (etherealize_objects,
+                    wait_for_completion,
+                    env);
+    }
 
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs)
-  : value_ (rhs.value_),
-    poa_ (PortableServer::POA::_duplicate (rhs.poa_.in ()))
-{
-}
+  // If the wait_for_completion parameter is FALSE, this operation
+  // will return immediately after changing the state. If the
+  // parameter is TRUE, this operation does not return until there are
+  // no actively executing requests in any of the POAs associated with
+  // this POA manager (that is, all requests that were started prior
+  // to the state change have completed) and, in the case of a TRUE
+  // etherealize_objects, all invocations of etherealize have
+  // completed for POAs having the RETAIN and USE_SERVANT_MANAGER
+  // policies.
 
-PortableServer::RequestProcessingPolicyValue
-TAO_Request_Processing_Policy::value (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return this->value_;
+  // 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.
 }
 
-CORBA::Policy_ptr
-TAO_Request_Processing_Policy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::Processing_State
+TAO_POA_Manager::state (CORBA::Environment &env)
 {
-  TAO_Request_Processing_Policy *request_processing_policy_copy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy_copy,
-                    TAO_Request_Processing_Policy (*this),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of the copy to the auto pointer.
-  auto_ptr<TAO_Request_Processing_Policy> new_request_processing_policy (request_processing_policy_copy);
-
-  CORBA::Policy_var result = new_request_processing_policy->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  // Give ownership of this servant to the POA.
-  new_request_processing_policy->_remove_ref (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), TAO_POA_Manager::UNKNOWN, env);
 
-  // Make sure that the auto_ptr does not delete the implementation
-  // object.
-  new_request_processing_policy.release ();
-  return result._retn ();
+  return this->state_;
 }
 
 void
-TAO_Request_Processing_Policy::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::remove_poa (TAO_POA *poa,
+                             CORBA::Environment &env)
 {
-  //
-  // Remove self from POA.  Because of reference counting, the POA
-  // will automatically delete the servant when all pending requests
-  // on this servant are complete.
-  //
-
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var id = poa->servant_to_id (this,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  poa->deactivate_object (id.in (),
-                          ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
-CORBA::PolicyType
-TAO_Request_Processing_Policy::policy_type (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-  return PortableServer::REQUEST_PROCESSING_POLICY_ID;
-}
-
-PortableServer::POA_ptr
-TAO_Request_Processing_Policy::_default_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
+  // If we are not closing down, we must remove this poa from our
+  // collection.
+  if (!this->closing_down_)
+    {
+      // Lock access to the POAManager for the duration of this transaction
+      TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+      this->remove_poa_i (poa,
+                          env);
+    }
 
-TAO_POA_Policies::TAO_POA_Policies (void)
-  :  thread_ (PortableServer::ORB_CTRL_MODEL),
-     lifespan_ (PortableServer::TRANSIENT),
-     id_uniqueness_ (PortableServer::UNIQUE_ID),
-     id_assignment_ (PortableServer::SYSTEM_ID),
-     implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-     servant_retention_ (PortableServer::RETAIN),
-     request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-{
+  // If we are closing down, we are currently iterating over our poa
+  // collection and there is not need to remove this poa from our
+  // collection.
 }
 
 void
-TAO_POA_Policies::parse_policies (const CORBA::PolicyList &policies,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::remove_poa_i (TAO_POA *poa,
+                               CORBA::Environment &env)
 {
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       i++)
-    {
-      this->parse_policy (policies[i],
-                          ACE_TRY_ENV);
-      ACE_CHECK;
-    }
+  int result = this->poa_collection_.remove (poa);
 
-  if (this->validity_check () == -1)
+  if (result != 0)
     {
-      ACE_THROW (PortableServer::POA::InvalidPolicy ());
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
+      return;
     }
 }
 
-int
-TAO_POA_Policies::validity_check (void)
+void
+TAO_POA_Manager::register_poa (TAO_POA *poa,
+                               CORBA::Environment &env)
 {
-  // The NON_RETAIN policy requires either the USE_DEFAULT_SERVANT or
-  // USE_SERVANT_MANAGER policies.
-  if (this->servant_retention_ == PortableServer::NON_RETAIN)
-    if (this->request_processing_ != PortableServer::USE_SERVANT_MANAGER &&
-        this->request_processing_ != PortableServer::USE_DEFAULT_SERVANT)
-      return -1;
+  // Lock access to the POAManager for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
-  // USE_ACTIVE_OBJECT_MAP_ONLY requires the RETAIN policy.
-  if (this->request_processing_ == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    if (this->servant_retention_ != PortableServer::RETAIN)
-      return -1;
-
-  // USE_DEFAULT_SERVANT requires the MULTIPLE_ID policy.
-  if (this->request_processing_ == PortableServer::USE_DEFAULT_SERVANT)
-    if (this->id_uniqueness_ != PortableServer::MULTIPLE_ID)
-      return -1;
-
-  // IMPLICIT_ACTIVATION requires the SYSTEM_ID and RETAIN policies.
-  if (this->implicit_activation_ == PortableServer::IMPLICIT_ACTIVATION)
-    if (this->servant_retention_ != PortableServer::RETAIN ||
-        this->id_assignment_ != PortableServer::SYSTEM_ID)
-      return -1;
-
-  return 0;
+  this->register_poa_i (poa,
+                        env);
 }
 
 void
-TAO_POA_Policies::parse_policy (const CORBA::Policy_ptr policy,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Manager::register_poa_i (TAO_POA *poa,
+                                 CORBA::Environment &env)
 {
+  int result = this->poa_collection_.insert (poa);
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ThreadPolicy_var thread
-    = PortableServer::ThreadPolicy::_narrow (policy,
-                                             ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (thread.in ()))
-    {
-      this->thread_ = thread->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::LifespanPolicy_var lifespan
-    = PortableServer::LifespanPolicy::_narrow (policy,
-                                               ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (lifespan.in ()))
-    {
-      this->lifespan_ = lifespan->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::IdUniquenessPolicy_var id_uniqueness
-    = PortableServer::IdUniquenessPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (id_uniqueness.in ()))
-    {
-      this->id_uniqueness_ = id_uniqueness->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::IdAssignmentPolicy_var id_assignment
-    = PortableServer::IdAssignmentPolicy::_narrow (policy,
-                                                   ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (id_assignment.in ()))
-    {
-      this->id_assignment_ = id_assignment->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ImplicitActivationPolicy_var implicit_activation
-    = PortableServer::ImplicitActivationPolicy::_narrow (policy,
-                                                         ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (implicit_activation.in ()))
-    {
-      this->implicit_activation_ = implicit_activation->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::ServantRetentionPolicy_var servant_retention
-    = PortableServer::ServantRetentionPolicy::_narrow (policy,
-                                                       ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (servant_retention.in ()))
-    {
-      this->servant_retention_ = servant_retention->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      return;
-    }
-
-  PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy,
-                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  if (!CORBA::is_nil (request_processing.in ()))
+  if (result != 0)
     {
-      this->request_processing_ = request_processing->value (ACE_TRY_ENV);
-      ACE_CHECK;
-
+      CORBA::Exception *exception = new CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO);
+      env.exception (exception);
       return;
     }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  ACE_THROW (PortableServer::POA::InvalidPolicy ());
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Boolean
-TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name,
-                                        CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current::TAO_POA_Current (void)
+  : poa_impl_ (0),
+    object_id_ (0),
+    object_key_ (0),
+    cookie_ (0),
+    servant_ (0)
 {
-  // Default policies
-  CORBA::PolicyList default_policies;
-
-  // This assumes that the lock on the parent is recursive
-  PortableServer::POA_var child = parent->create_POA (name,
-                                                      PortableServer::POAManager::_nil (),
-                                                      default_policies,
-                                                      ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-
-  ACE_TRY
-    {
-      PortableServer::AdapterActivator_var activator = this->_this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      child->the_activator (activator.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      child->destroy (1,
-                      1,
-                      ACE_TRY_ENV);
-
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  // Finally everything is fine
-  return 1;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO_POA_Current_Impl::TAO_POA_Current_Impl (TAO_POA *impl,
-                                            const TAO_ObjectKey &key,
-                                            PortableServer::Servant servant,
-                                            const char *operation,
-                                            TAO_ORB_Core &orb_core)
+TAO_POA_Current::TAO_POA_Current (TAO_POA *impl,
+                                  const TAO_ObjectKey &key,
+                                  const PortableServer::ObjectId &id,
+                                  PortableServer::Servant servant)
   : poa_impl_ (impl),
-    object_id_ (),
+    object_id_ (&id),
     object_key_ (&key),
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     cookie_ (0),
+    servant_ (servant)
+{}
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    servant_ (servant),
-    operation_ (operation),
-    orb_core_ (&orb_core),
-    previous_current_impl_ (0),
-    active_object_map_entry_ (0)
+TAO_POA_Current::~TAO_POA_Current (void)
 {
-  // Set the current context and remember the old one.
-  this->previous_current_impl_ = this->orb_core_->poa_current ().implementation (this);
-}
-
-TAO_POA_Current_Impl::~TAO_POA_Current_Impl (void)
-{
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  if (this->cookie_ != 0)
-    {
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this->poa_impl_->orb_core_.object_adapter ());
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY_EX (LOCATOR)
-        {
-          PortableServer::POA_var poa = this->get_POA (ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (LOCATOR);
-
-          this->poa_impl_->servant_locator_->postinvoke (this->object_id (),
-                                                         poa.in (),
-                                                         this->operation_,
-                                                         this->cookie_,
-                                                         this->servant_,
-                                                         ACE_TRY_ENV);
-          ACE_TRY_CHECK_EX (LOCATOR);
-        }
-      ACE_CATCHANY
-        {
-          // Ignore errors from servant locator ....
-        }
-      ACE_ENDTRY;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // Cleanup servant related stuff.
-  if (this->active_object_map_entry_ != 0)
-    {
-      // Decrement the reference count.
-      CORBA::UShort new_count = --this->active_object_map_entry_->reference_count_;
-
-      if (new_count == 0)
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY_EX (SERVANT)
-            {
-              this->poa_impl_->cleanup_servant (this->active_object_map_entry_,
-                                                ACE_TRY_ENV);
-
-              ACE_TRY_CHECK_EX (SERVANT);
-            }
-          ACE_CATCHANY
-            {
-              // Ignore errors from servant cleanup ....
-            }
-          ACE_ENDTRY;
-        }
-    }
-
-  // Reset the old context.
-  this->orb_core_->poa_current ().implementation (this->previous_current_impl_);
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current_Impl::get_POA (CORBA::Environment &ACE_TRY_ENV)
-{
-  PortableServer::POA_var result = this->poa_impl_->_this (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return result._retn ();
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current_Impl::get_object_id (CORBA::Environment &)
-{
-  // Create a new one and pass it back
-  return new PortableServer::ObjectId (this->object_id_);
 }
 
 PortableServer::POA_ptr
-TAO_POA_Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current::get_POA (CORBA::Environment &env)
 {
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
+  if (!this->context_is_valid ())
     {
-      ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::Current::NoContext;
+      env.exception (exception);
+      return PortableServer::POA::_nil ();
     }
 
-  return impl->get_POA (ACE_TRY_ENV);
+  PortableServer::POA_var result = this->poa_impl_->_this (env);
+  if (env.exception () != 0)
+    return PortableServer::POA::_nil ();
+  else
+    return result._retn ();
 }
 
 PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA_Current::get_object_id (CORBA::Environment &env)
 {
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
+  if (!this->context_is_valid ())
     {
-      ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                        0);
+      CORBA::Exception *exception = new PortableServer::Current::NoContext;
+      env.exception (exception);
+      return 0;
     }
 
-  return impl->get_object_id (ACE_TRY_ENV);
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (void)
-{
-  return TAO_ORB_CORE_TSS_RESOURCES::instance ()->poa_current_impl_;
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
-{
-  TAO_ORB_Core_TSS_Resources *tss =
-    TAO_ORB_CORE_TSS_RESOURCES::instance ();
-
-  TAO_POA_Current_Impl *old = tss->poa_current_impl_;
-  tss->poa_current_impl_ = new_current;
-  return old;
+  // Create a new one and pass it back
+  return new PortableServer::ObjectId (*this->object_id_);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Array<PortableServer::ObjectId>;
-template class ACE_Array_Base<PortableServer::ObjectId>;
-
 template class ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>;
 template class ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-template class ACE_Auto_Basic_Ptr<TAO_Thread_Policy>;
 template class ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>;
-template class ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>;
-
-template class ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant>;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class ACE_Auto_Basic_Ptr<TAO_POA>;
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
-template class ACE_Auto_Basic_Ptr<TAO_POA_Manager>;
+template class ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Synchronization_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>;
+template class ACE_Auto_Basic_Ptr<TAO_Thread_Policy>;
 template class ACE_Lock_Adapter<ACE_Null_Mutex>;
 #if defined (ACE_HAS_THREADS)
 template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
@@ -3411,57 +3366,36 @@ template class ACE_Write_Guard<ACE_Lock>;
 template class ACE_Read_Guard<ACE_Lock>;
 template class ACE_Unbounded_Set<TAO_POA *>;
 template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
+template class TAO_Object_Manager<CORBA::Policy>;
+template class TAO_Unbounded_Object_Sequence<CORBA::Policy>;
 template class auto_ptr<TAO_Id_Assignment_Policy>;
 template class auto_ptr<TAO_Id_Uniqueness_Policy>;
-template class auto_ptr<TAO_Lifespan_Policy>;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-template class auto_ptr<TAO_Thread_Policy>;
 template class auto_ptr<TAO_Implicit_Activation_Policy>;
-template class auto_ptr<TAO_Servant_Retention_Policy>;
-template class auto_ptr<TAO_Request_Processing_Policy>;
-
-template class auto_ptr<TAO_Forwarding_Servant>;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
+template class auto_ptr<TAO_Lifespan_Policy>;
+template class auto_ptr<TAO_Active_Object_Map_Iterator_Impl>;
 template class auto_ptr<TAO_POA>;
-template class auto_ptr<TAO_Active_Object_Map>;
-template class auto_ptr<TAO_POA_Manager>;
+template class auto_ptr<TAO_Request_Processing_Policy>;
+template class auto_ptr<TAO_Synchronization_Policy>;
+template class auto_ptr<TAO_Servant_Retention_Policy>;
+template class auto_ptr<TAO_Thread_Policy>;
 template class ACE_Node<TAO_POA *>;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array<PortableServer::ObjectId>
-#pragma instantiate ACE_Array_Base<PortableServer::ObjectId>
-
+#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Assignment_Policy>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Policy>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Forwarding_Servant>
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Lifespan_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_POA_Manager>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Request_Processing_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Synchronization_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Servant_Retention_Policy>
+#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Thread_Policy>
 #pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
 #if defined (ACE_HAS_THREADS)
 #pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
 #pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
 #endif /* ACE_HAS_THREADS */
-#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
 #pragma instantiate ACE_Hash<ACE_CString>
 #pragma instantiate ACE_Equal_To<ACE_CString>
@@ -3476,24 +3410,17 @@ template class ACE_Node<TAO_POA *>;
 #pragma instantiate ACE_Read_Guard<ACE_Lock>
 #pragma instantiate ACE_Unbounded_Set<TAO_POA *>
 #pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
+#pragma instantiate TAO_Object_Manager<CORBA::Policy>
+#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA::Policy>
 #pragma instantiate auto_ptr<TAO_Id_Assignment_Policy>
 #pragma instantiate auto_ptr<TAO_Id_Uniqueness_Policy>
-#pragma instantiate auto_ptr<TAO_Lifespan_Policy>
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#pragma instantiate auto_ptr<TAO_Thread_Policy>
 #pragma instantiate auto_ptr<TAO_Implicit_Activation_Policy>
-#pragma instantiate auto_ptr<TAO_Servant_Retention_Policy>
-#pragma instantiate auto_ptr<TAO_Request_Processing_Policy>
-
-#pragma instantiate auto_ptr<TAO_Forwarding_Servant>
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-//#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
+#pragma instantiate auto_ptr<TAO_Lifespan_Policy>
+#pragma instantiate auto_ptr<TAO_Active_Object_Map_Iterator_Impl>
 #pragma instantiate auto_ptr<TAO_POA>
-#pragma instantiate auto_ptr<TAO_Active_Object_Map>
-#pragma instantiate auto_ptr<TAO_POA_Manager>
+#pragma instantiate auto_ptr<TAO_Request_Processing_Policy>
+#pragma instantiate auto_ptr<TAO_Synchronization_Policy>
+#pragma instantiate auto_ptr<TAO_Servant_Retention_Policy>
+#pragma instantiate auto_ptr<TAO_Thread_Policy>
 #pragma instantiate ACE_Node<TAO_POA *>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/POA.h b/TAO/tao/POA.h
index fdd7869cf80..78b5888260d 100644
--- a/TAO/tao/POA.h
+++ b/TAO/tao/POA.h
@@ -51,24 +51,10 @@
 // Active Object Table
 #include "tao/Active_Object_Map.h"
 
-// POA Manager
-#include "tao/POAManager.h"
-
-// Object Adapter
-#include "tao/Object_Adapter.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined (_MSC_VER)
-# pragma warning (disable : 4250)
-#endif /* _MSC_VER */
-
 class TAO_POA;
+class TAO_POA_Manager;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export TAO_Thread_Policy : public virtual PortableServer::RefCountServantBase,
-                                     public virtual POA_PortableServer::ThreadPolicy
+class TAO_Export TAO_Thread_Policy : public POA_PortableServer::ThreadPolicy
 {
 public:
   TAO_Thread_Policy (PortableServer::ThreadPolicyValue value,
@@ -76,15 +62,15 @@ public:
 
   TAO_Thread_Policy (const TAO_Thread_Policy &new_policy);
 
-  PortableServer::ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::ThreadPolicyValue value_;
@@ -92,10 +78,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-class TAO_Export TAO_Lifespan_Policy : public virtual PortableServer::RefCountServantBase,
-                                       public virtual POA_PortableServer::LifespanPolicy
+class TAO_Export TAO_Lifespan_Policy : public POA_PortableServer::LifespanPolicy
 {
 public:
   TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value,
@@ -103,15 +86,15 @@ public:
 
   TAO_Lifespan_Policy (const TAO_Lifespan_Policy &rhs);
 
-  PortableServer::LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::LifespanPolicyValue value_;
@@ -119,8 +102,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-class TAO_Export TAO_Id_Uniqueness_Policy : public virtual PortableServer::RefCountServantBase,
-                                            public virtual POA_PortableServer::IdUniquenessPolicy
+class TAO_Export TAO_Id_Uniqueness_Policy : public POA_PortableServer::IdUniquenessPolicy
 {
 public:
   TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value,
@@ -128,15 +110,15 @@ public:
 
   TAO_Id_Uniqueness_Policy (const TAO_Id_Uniqueness_Policy &rhs);
 
-  PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::IdUniquenessPolicyValue value_;
@@ -144,8 +126,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-class TAO_Export TAO_Id_Assignment_Policy : public virtual PortableServer::RefCountServantBase,
-                                            public virtual POA_PortableServer::IdAssignmentPolicy
+class TAO_Export TAO_Id_Assignment_Policy : public POA_PortableServer::IdAssignmentPolicy
 {
 public:
   TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value,
@@ -153,15 +134,15 @@ public:
 
   TAO_Id_Assignment_Policy (const TAO_Id_Assignment_Policy &rhs);
 
-  PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::IdAssignmentPolicyValue value_;
@@ -169,10 +150,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class TAO_Export TAO_Implicit_Activation_Policy : public virtual PortableServer::RefCountServantBase,
-                                                  public virtual POA_PortableServer::ImplicitActivationPolicy
+class TAO_Export TAO_Implicit_Activation_Policy : public POA_PortableServer::ImplicitActivationPolicy
 {
 public:
   TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value,
@@ -180,15 +158,15 @@ public:
 
   TAO_Implicit_Activation_Policy (const TAO_Implicit_Activation_Policy &rhs);
 
-  PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::ImplicitActivationPolicyValue value_;
@@ -196,8 +174,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-class TAO_Export TAO_Servant_Retention_Policy : public virtual PortableServer::RefCountServantBase,
-                                                public virtual POA_PortableServer::ServantRetentionPolicy
+class TAO_Export TAO_Servant_Retention_Policy : public POA_PortableServer::ServantRetentionPolicy
 {
 public:
   TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value,
@@ -205,15 +182,15 @@ public:
 
   TAO_Servant_Retention_Policy (const TAO_Servant_Retention_Policy &rhs);
 
-  PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::ServantRetentionPolicyValue value_;
@@ -221,8 +198,7 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-class TAO_Export TAO_Request_Processing_Policy : public virtual PortableServer::RefCountServantBase,
-                                                 public virtual POA_PortableServer::RequestProcessingPolicy
+class TAO_Export TAO_Request_Processing_Policy : public POA_PortableServer::RequestProcessingPolicy
 {
 public:
   TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value,
@@ -230,15 +206,15 @@ public:
 
   TAO_Request_Processing_Policy (const TAO_Request_Processing_Policy &rhs);
 
-  PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Policy_ptr copy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::PolicyType policy_type (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
   PortableServer::RequestProcessingPolicyValue value_;
@@ -246,7 +222,35 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+class TAO_Export TAO_Synchronization_Policy : public POA_PortableServer::SynchronizationPolicy
+{
+public:
+  TAO_Synchronization_Policy (PortableServer::SynchronizationPolicyValue value,
+                              PortableServer::POA_ptr poa);
+
+  TAO_Synchronization_Policy (const TAO_Synchronization_Policy &rhs);
+
+  virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual CORBA::Policy_ptr copy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual void destroy (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual CORBA::PolicyType policy_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  // virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+protected:
+  PortableServer::SynchronizationPolicyValue value_;
+
+  PortableServer::POA_var poa_;
+};
 
 class TAO_Export TAO_POA_Policies
 {
@@ -254,40 +258,45 @@ public:
 
   TAO_POA_Policies (void);
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual PortableServer::ThreadPolicyValue thread (void) const;
+  virtual void thread (PortableServer::ThreadPolicyValue value);
 
-  PortableServer::ThreadPolicyValue thread (void) const;
-  void thread (PortableServer::ThreadPolicyValue value);
+  virtual PortableServer::LifespanPolicyValue lifespan (void) const;
+  virtual void lifespan (PortableServer::LifespanPolicyValue value);
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
+  virtual void id_uniqueness (PortableServer::IdUniquenessPolicyValue value);
 
-  PortableServer::LifespanPolicyValue lifespan (void) const;
-  void lifespan (PortableServer::LifespanPolicyValue value);
+  virtual PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
+  virtual void id_assignment (PortableServer::IdAssignmentPolicyValue value);
 
-  PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-  void id_uniqueness (PortableServer::IdUniquenessPolicyValue value);
+  virtual PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
+  virtual void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
 
-  PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-  void id_assignment (PortableServer::IdAssignmentPolicyValue value);
+  virtual PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
+  virtual void servant_retention (PortableServer::ServantRetentionPolicyValue value);
 
-  PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-  void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
+  virtual PortableServer::RequestProcessingPolicyValue request_processing (void) const;
+  virtual void request_processing (PortableServer::RequestProcessingPolicyValue value);
 
-  PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-  void servant_retention (PortableServer::ServantRetentionPolicyValue value);
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
 
-  PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-  void request_processing (PortableServer::RequestProcessingPolicyValue value);
+  virtual PortableServer::SynchronizationPolicyValue synchronization (void) const;
+  virtual void synchronization (PortableServer::SynchronizationPolicyValue value);
 
-  void parse_policies (const CORBA::PolicyList &policies,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void parse_policies (const CORBA::PolicyList &policies,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
 protected:
 
-  void parse_policy (const CORBA::Policy_ptr policy,
-                     CORBA_Environment &ACE_TRY_ENV);
+  virtual void parse_policy (const CORBA::Policy_ptr policy,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  int validity_check (void);
+  virtual int validity_check (void);
 
   PortableServer::ThreadPolicyValue thread_;
 
@@ -302,6 +311,14 @@ protected:
   PortableServer::ServantRetentionPolicyValue servant_retention_;
 
   PortableServer::RequestProcessingPolicyValue request_processing_;
+
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
+
+  PortableServer::SynchronizationPolicyValue synchronization_;
 };
 
 class TAO_Temporary_Creation_Time;
@@ -314,11 +331,11 @@ public:
 
   TAO_Creation_Time (void);
 
-  void creation_time (const void *creation_time);
+  virtual void creation_time (const void *creation_time);
 
-  const void *creation_time (void) const;
+  virtual const void *creation_time (void) const;
 
-  static CORBA::ULong creation_time_length (void);
+  static int creation_time_length (void);
 
   int operator== (const TAO_Creation_Time &rhs) const;
 
@@ -348,7 +365,7 @@ public:
 
   TAO_Temporary_Creation_Time (void);
 
-  void creation_time (const void *creation_time);
+  virtual void creation_time (const void *creation_time);
 
   int operator== (const TAO_Creation_Time &rhs) const;
 
@@ -359,128 +376,115 @@ protected:
   void *time_stamp_;
 };
 
-class TAO_POA_Current_Impl;
+class TAO_POA_Current;
 
 class TAO_Export TAO_POA : public POA_PortableServer::POA
 {
 public:
 
-  friend class TAO_Object_Adapter;
-  friend class TAO_Object_Adapter::Outstanding_Requests;
-  friend class TAO_Object_Adapter::Single_Threaded_POA_Lock;
-  friend class TAO_POA_Current_Impl;
-  friend class TAO_POA_Manager;
-
   typedef ACE_CString String;
 
-  PortableServer::POA_ptr create_POA (const char *adapter_name,
-                                      PortableServer::POAManager_ptr poa_manager,
-                                      const CORBA::PolicyList &policies,
-                                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  PortableServer::POA_ptr find_POA (const char *adapter_name,
-                                    CORBA::Boolean activate_it,
-                                    CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  void destroy (CORBA::Boolean etherealize_objects,
-                CORBA::Boolean wait_for_completion,
-                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
-                                                         CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual PortableServer::POA_ptr create_POA (const char *adapter_name,
+                                              PortableServer::POAManager_ptr poa_manager,
+                                              const CORBA::PolicyList &policies,
+                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
-                                                             CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::POA_ptr find_POA (const char *adapter_name,
+                                            CORBA::Boolean activate_it,
+                                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void destroy (CORBA::Boolean etherealize_objects,
+                        CORBA::Boolean wait_for_completion,
+                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
-                                                                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value,
+                                                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value,
+                                                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
-                                                                                  CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,
+                                                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
-                                                                              CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,
+                                                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
-                                                                                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,
+                                                                                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,
+                                                                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::String the_name (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,
+                                                                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::POA_ptr the_parent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,
+                                                                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::String the_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::POA_ptr the_parent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::POAManager_ptr the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                            CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::AdapterActivator_ptr the_activator (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::Servant get_servant (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void set_servant (PortableServer::Servant servant,
-                    CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ServantManager_ptr get_servant_manager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual void set_servant_manager (PortableServer::ServantManager_ptr imgr,
+                                    CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
-                                             CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::Servant get_servant (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void activate_object_with_id (const PortableServer::ObjectId &id,
-                                PortableServer::Servant p_servant,
-                                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void set_servant (PortableServer::Servant servant,
+                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void deactivate_object (const PortableServer::ObjectId &oid,
-                          CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant,
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr create_reference (const char *intf,
-                                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void activate_object_with_id (const PortableServer::ObjectId &id,
+                                        PortableServer::Servant p_servant,
+                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
-                                              const char *intf,
-                                              CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
-                                           CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual void deactivate_object (const PortableServer::ObjectId &oid,
+                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
-                                          CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Object_ptr create_reference (const char *intf,
+                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
-                                                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
+                                                      const char *intf,
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  virtual PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant,
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
-                                             CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant,
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
-                                         CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference,
+                                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
-                                     CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference,
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid,
+                                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void forward_object (const PortableServer::ObjectId &oid,
-                       CORBA::Object_ptr forward_to,
-                       CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,
+                                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual void forward_object (const PortableServer::ObjectId &oid,
+                               CORBA::Object_ptr forward_to,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
   // Utility functions for the other
   static void encode_sequence_to_string (CORBA::String &str,
@@ -488,9 +492,9 @@ public:
   static void decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet> &seq,
                                          const char *str);
 
-  static char* ObjectId_to_string (const PortableServer::ObjectId &id);
+  static CORBA::String ObjectId_to_string (const PortableServer::ObjectId &id);
 
-  static CORBA::WChar* ObjectId_to_wstring (const PortableServer::ObjectId &id);
+  static CORBA::WString ObjectId_to_wstring (const PortableServer::ObjectId &id);
 
   static PortableServer::ObjectId *string_to_ObjectId (const char *id);
 
@@ -499,134 +503,149 @@ public:
 
   static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
 
-  TAO_POA (const String &name,
+  TAO_POA (const String &adapter_name,
            TAO_POA_Manager &poa_manager,
            const TAO_POA_Policies &policies,
            TAO_POA *parent,
-           ACE_Lock &lock,
-           ACE_SYNCH_MUTEX &thread_lock,
-           TAO_ORB_Core &orb_core,
-           CORBA_Environment &ACE_TRY_ENV);
+           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  ~TAO_POA (void);
+  virtual TAO_POA *clone (const String &adapter_name,
+                          TAO_POA_Manager &poa_manager,
+                          const TAO_POA_Policies &policies,
+                          TAO_POA *parent,
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  static char name_separator (void);
+  virtual ~TAO_POA (void);
 
-  static CORBA::ULong name_separator_length (void);
+  virtual void dispatch_servant (const TAO_ObjectKey &key,
+                                 CORBA::ServerRequest &req,
+                                 void *context,
+                                 TAO_ORB_Core *orb_core,
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  enum
-  {
-    TAO_OBJECTKEY_PREFIX_SIZE = 4
-  };
+  virtual int locate_servant (const TAO_ObjectKey &key,
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  static CORBA::Octet objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE];
+  virtual PortableServer::Servant find_servant (const TAO_ObjectKey &key,
+                                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  const TAO_Object_Adapter::poa_name &folded_name (void) const;
+  static char name_separator (void);
 
-  const TAO_Object_Adapter::poa_name &system_name (void) const;
+  static char id_separator (void);
+
+  static CORBA::ULong name_separator_length (void);
+
+  static CORBA::ULong id_separator_length (void);
 
 protected:
 
-  const ACE_CString &name (void) const;
+  virtual TAO_POA *create_POA (const String &adapter_name,
+                               TAO_POA_Manager &poa_manager,
+                               const TAO_POA_Policies &policies,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual TAO_POA *create_POA_i (const String &adapter_name,
+                                 TAO_POA_Manager &poa_manager,
+                                 const TAO_POA_Policies &policies,
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA *create_POA (const String &adapter_name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policies &policies,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_POA *find_POA (const String &adapter_name,
+                             CORBA::Boolean activate_it,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA *create_POA_i (const String &adapter_name,
-                         TAO_POA_Manager &poa_manager,
-                         const TAO_POA_Policies &policies,
-                         CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_POA *find_POA_i (const String &adapter_name,
+                               CORBA::Boolean activate_it,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA *find_POA_i (const ACE_CString &child_name,
-                       CORBA::Boolean activate_it,
-                       CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_POA *find_POA_i_optimized (const String &adapter_name,
+                                         CORBA::Boolean activate_it,
+                                         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void destroy_i (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion,
-                  CORBA_Environment &ACE_TRY_ENV);
+  virtual void destroy_i (CORBA::Boolean etherealize_objects,
+                          CORBA::Boolean wait_for_completion,
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ServantManager_ptr get_servant_manager_i (CORBA_Environment &ACE_TRY_ENV);
+  virtual void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void set_servant_manager_i (PortableServer::ServantManager_ptr imgr,
-                              CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::Servant get_servant_i (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::Servant get_servant_i (CORBA_Environment &ACE_TRY_ENV);
+  virtual void set_servant_i (PortableServer::Servant servant,
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void set_servant_i (PortableServer::Servant servant,
-                      CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
+                                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual void activate_object_with_id_i (const PortableServer::ObjectId &id,
+                                          PortableServer::Servant p_servant,
+                                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::ObjectId *activate_object_i (PortableServer::Servant p_servant,
-                                               CORBA_Environment &ACE_TRY_ENV);
+  virtual void deactivate_object_i (const PortableServer::ObjectId &oid,
+                                    CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant p_servant,
-                                  CORBA_Environment &ACE_TRY_ENV);
+  virtual CORBA::Object_ptr create_reference_i (const char *intf,
+                                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                 CORBA::Environment &ACE_TRY_ENV);
+  virtual PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
+                                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void deactivate_object_i (const PortableServer::ObjectId &oid,
-                            CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
+                                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  void cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry,
-                        CORBA::Environment &ACE_TRY_ENV);
+  virtual CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
+                                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr create_reference_i (const char *intf,
-                                        CORBA_Environment &ACE_TRY_ENV);
+  virtual void forward_object_i (const PortableServer::ObjectId &oid,
+                                 CORBA::Object_ptr forward_to,
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr create_reference_with_id_i (const PortableServer::ObjectId &oid,
-                                                const char *intf,
-                                                CORBA_Environment &ACE_TRY_ENV);
-  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant,
-                                             CORBA_Environment &ACE_TRY_ENV);
+  virtual ACE_Lock &lock (void);
 
-  PortableServer::ObjectId *servant_to_system_id (PortableServer::Servant p_servant,
-                                                  CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_POA_Policies &policies (void);
 
-  PortableServer::ObjectId *servant_to_system_id_i (PortableServer::Servant p_servant,
-                                                    CORBA_Environment &ACE_TRY_ENV);
+  virtual TAO_Active_Object_Map &active_object_map (void) const;
 
-  PortableServer::Servant id_to_servant_i (const PortableServer::ObjectId &oid,
-                                           CORBA_Environment &ACE_TRY_ENV);
+  virtual void delete_child (const String &child,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid,
-                                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void delete_child_i (const String &child,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual String complete_name (void);
 
-  void forward_object_i (const PortableServer::ObjectId &oid,
-                         CORBA::Object_ptr forward_to,
-                         CORBA_Environment &ACE_TRY_ENV);
+  virtual void set_complete_name (void);
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual int leaf_poa_name (const String &adapter_name,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  ACE_Lock &lock (void);
+  virtual void parse_poa_name (const TAO_POA::String &adapter_name,
+                               TAO_POA::String &topmost_poa_name,
+                               TAO_POA::String &tail_poa_name,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA_Policies &policies (void);
+  virtual PortableServer::ObjectId *create_object_id (PortableServer::Servant servant,
+                                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_Active_Object_Map &active_object_map (void) const;
+  virtual TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
 
-  int delete_child (const String &child);
+  virtual CORBA::ULong system_id_size (void) const;
 
-  void set_folded_name (void);
+  virtual int is_poa_generated_id (const PortableServer::ObjectId &id);
 
-  TAO_ObjectKey *create_object_key (const PortableServer::ObjectId &id);
+  virtual int is_poa_generated_key (const TAO_ObjectKey &key);
 
-  int is_poa_generated_id (const PortableServer::ObjectId &id);
+  virtual int parse_key (const TAO_ObjectKey &key,
+                         String &poa_name,
+                         PortableServer::ObjectId &id,
+                         CORBA::Boolean &persistent,
+                         CORBA::Boolean &system_id,
+                         TAO_Temporary_Creation_Time &poa_creation_time);
 
-  static int parse_key (const TAO_ObjectKey &key,
-                        TAO_Object_Adapter::poa_name &poa_system_name,
-                        PortableServer::ObjectId &system_id,
-                        CORBA::Boolean &is_root,
-                        CORBA::Boolean &is_persistent,
-                        CORBA::Boolean &is_system_id,
-                        TAO_Temporary_Creation_Time &poa_creation_time);
+  virtual int rfind (const TAO_ObjectKey &key,
+                     char c,
+                     int pos = TAO_POA::String::npos) const;
 
   // Should really be protected, but some compilers complain
 public:
@@ -639,20 +658,43 @@ public:
   };
 
 protected:
-  LOCATION_RESULT locate_servant_i (const PortableServer::ObjectId &id,
-                                    PortableServer::Servant &servant,
-                                    CORBA_Environment &ACE_TRY_ENV);
+  virtual LOCATION_RESULT locate_servant_i (const TAO_ObjectKey &key,
+                                            PortableServer::Servant &servant,
+                                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  PortableServer::Servant locate_servant_i (const char *operation,
-                                            const PortableServer::ObjectId &id,
-                                            TAO_POA_Current_Impl *poa_current_impl,
-                                            CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::Servant locate_poa_and_servant_i (const TAO_ObjectKey &key,
+                                                            const char *operation,
+                                                            PortableServer::ObjectId &id,
+                                                            TAO_POA *&poa_impl,
+                                                            TAO_ORB_Core *orb_core,
+                                                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  const TAO_Creation_Time &creation_time (void);
+  virtual TAO_POA *locate_poa_i (const TAO_ObjectKey &key,
+                                 PortableServer::ObjectId &id,
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Boolean persistent (void);
+  virtual void dispatch_servant_i (const TAO_ObjectKey &key,
+                                   CORBA::ServerRequest &req,
+                                   void *context,
+                                   TAO_ORB_Core *orb_core,
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  char persistent_key_type (void);
+  virtual void pre_invoke (const TAO_ObjectKey &key,
+                           const PortableServer::ObjectId &id,
+                           PortableServer::Servant servant,
+                           TAO_POA_Current *poa_current,
+                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual void post_invoke (PortableServer::Servant servant,
+                            const char *operation,
+                            TAO_POA_Current *poa_current,
+                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual const TAO_Creation_Time &creation_time (void);
+
+  virtual CORBA::Boolean persistent (void);
+
+  virtual char persistent_key_type (void);
 
   static char persistent_key_char (void);
 
@@ -660,9 +702,9 @@ protected:
 
   static CORBA::ULong persistent_key_type_length (void);
 
-  CORBA::Boolean system_id (void);
+  virtual CORBA::Boolean system_id (void);
 
-  char system_id_key_type (void);
+  virtual char system_id_key_type (void);
 
   static char system_id_key_char (void);
 
@@ -670,33 +712,13 @@ protected:
 
   static CORBA::ULong system_id_key_type_length (void);
 
-  CORBA::Boolean root (void);
-
-  char root_key_type (void);
-
-  static char root_key_char (void);
+  virtual void create_internal_lock (void);
 
-  static char non_root_key_char (void);
-
-  static CORBA::ULong root_key_type_length (void);
-
-  CORBA::ULong outstanding_requests (void) const;
-
-  void outstanding_requests (CORBA::ULong new_outstanding_requests);
-
-  CORBA::ULong increment_outstanding_requests (void);
-
-  CORBA::ULong decrement_outstanding_requests (void);
-
-  void establish_servant_lock (PortableServer::Servant servant);
-
-  void teardown_servant_lock (PortableServer::Servant servant);
+  virtual void create_active_object_map (void);
 
   String name_;
 
-  TAO_Object_Adapter::poa_name folded_name_;
-
-  TAO_Object_Adapter::poa_name_var system_name_;
+  String complete_name_;
 
   TAO_POA_Manager &poa_manager_;
 
@@ -708,202 +730,209 @@ protected:
 
   int delete_active_object_map_;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   PortableServer::AdapterActivator_var adapter_activator_;
 
   PortableServer::ServantActivator_var servant_activator_;
 
   PortableServer::ServantLocator_var servant_locator_;
 
-  PortableServer::ServantBase_var default_servant_;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  PortableServer::Servant default_servant_;
 
   typedef ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-  CHILDREN;
+          CHILDREN;
 
   CHILDREN children_;
 
-  ACE_Lock &lock_;
+  ACE_Lock *lock_;
+
+  int closing_down_;
 
   int persistent_;
 
   int system_id_;
 
   TAO_Creation_Time creation_time_;
+};
 
-  TAO_ORB_Core &orb_core_;
+class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager
+{
+  friend class TAO_POA;
 
-  CORBA::Boolean cleanup_in_progress_;
+public:
+  enum Processing_State
+  {
+    ACTIVE,
+    DISCARDING,
+    HOLDING,
+    INACTIVE,
+    UNKNOWN
+  };
 
-  CORBA::Boolean etherealize_objects_;
+  virtual void activate (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::ULong outstanding_requests_;
+  virtual void hold_requests (CORBA::Boolean wait_for_completion,
+                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  ACE_SYNCH_CONDITION outstanding_requests_condition_;
+  virtual void discard_requests (CORBA::Boolean wait_for_completion,
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  CORBA::Boolean destroy_pending_;
-};
+  virtual void deactivate (CORBA::Boolean etherealize_objects,
+                           CORBA::Boolean wait_for_completion,
+                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  TAO_POA_Manager (void);
 
-class TAO_Export TAO_Adapter_Activator : public POA_PortableServer::AdapterActivator
-{
-public:
+  virtual TAO_POA_Manager *clone (void);
 
-  CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name,
-                                  CORBA_Environment &ACE_TRY_ENV);
-};
+  virtual ~TAO_POA_Manager (void);
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  virtual Processing_State state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
-{
-public:
+protected:
 
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV);
-  // Returns the POA on which the current request is being invoked.
-  // Can raise the <CORBA::NoContext> exception if this function is
-  // not invoked in the context of an upcall.
+  virtual ACE_Lock &lock (void);
 
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV);
-  // Returns the object id of the current request being invoked.  Can
-  // raise the <CORBA::NoContext> exception if this function is not
-  // invoked in the context of an upcall.
+  virtual void remove_poa (TAO_POA *poa,
+                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA_Current_Impl *implementation (void);
-  // Returns the class that implements this interface.
+  virtual void remove_poa_i (TAO_POA *poa,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-  TAO_POA_Current_Impl *implementation (TAO_POA_Current_Impl *new_current);
-  // Sets the thread-specific pointer to the new POA Current state,
-  // returning a pointer to the existing POA Current state.
+  virtual void register_poa (TAO_POA *poa,
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual void register_poa_i (TAO_POA *poa,
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  Processing_State state_;
+
+  int closing_down_;
+
+  ACE_Lock *lock_;
+
+  typedef ACE_Unbounded_Set<TAO_POA *> POA_COLLECTION;
+
+  POA_COLLECTION poa_collection_;
 };
 
-class TAO_Export TAO_POA_Current_Impl
+class TAO_Export TAO_Adapter_Activator : public POA_PortableServer::AdapterActivator
+{
+public:
+
+  virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
+                                          const char *name,
+                                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+};
+
+class TAO_Export TAO_POA_Current : public POA_PortableServer::Current
 {
   // = TITLE
   //
-  //     Implementation of the PortableServer::Current object.
+  // Implementation of the PortableServer::Current object.
   //
   // = DESCRIPTION
   //
-  //     Objects of this class hold state information regarding the
-  //     current POA invocation.  Savvy readers will notice that this
-  //     contains substantially more methods than the POA spec shows;
-  //     they exist because the ORB either (a) needs them or (b) finds
-  //     them useful for implementing a more efficient ORB.
+  // Objects of this class hold state information regarding the
+  // current POA invocation.  Savvy readers will notice that this
+  // contains substantially more methods than the POA spec shows; they
+  // exist because the ORB either (a) needs them or (b) finds them
+  // useful for implementing a more efficient ORB.
   //
-  //     The intent is that instances of this class are held in
-  //     Thread-Specific Storage so that upcalls can get context
-  //     information regarding their invocation.  The POA itself must
-  //     insure that all <set_*> operations are performed in the
-  //     execution thread so that the proper <TAO_POA_Current> pointer
-  //     is obtained from TSS.
+  // The intent is that instances of this class are held in
+  // Thread-Specific Storage so that upcalls can get context
+  // information regarding their invocation.  The POA itself must
+  // insure that all <set_*> operations are performed in the execution
+  // thread so that the proper <TAO_POA_Current> pointer is obtained
+  // from TSS.
 
 public:
+  // = Specification-mandated methods
 
-  friend class TAO_POA;
-
-  PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::POA_ptr get_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Return pointer to the invoking POA.  Raises the
   // <CORBA::NoContext> exception.
 
-  PortableServer::ObjectId *get_object_id (CORBA_Environment &ACE_TRY_ENV);
+  virtual PortableServer::ObjectId *get_object_id (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Return pointer to the object id through which this was invoked.
   // This may be necessary in cases where a <Servant> is serving under
   // the guise of multiple object ids.  This has _out semantics Raises
   // the <CORBA::NoContext> exception.
 
-  void POA_impl (TAO_POA *impl);
+  // = TAO Extensions
+
+  virtual void clear (void);
+  // Clear any prior settings made.  This will make things which can
+  // throw the <CORBA::NoContext> exception raise it if invoked
+  // without a corresponding <set_*> operation.
+
+  virtual int context_is_valid (void);
+  // Returns non-zero if the context is valid, i.e., if it would be
+  // impossible for a <CORBA::NoContext> exception to be raised.
+
+  virtual void POA_impl (TAO_POA *impl);
   // Set the POA implementation.
 
-  TAO_POA *POA_impl (void) const;
+  virtual TAO_POA *POA_impl (void) const;
   // Get the POA imeplemantation
 
-  void object_id (const PortableServer::ObjectId &id);
+  virtual void object_id (const PortableServer::ObjectId &id);
   // Set the object ID.
 
-  const PortableServer::ObjectId &object_id (void) const;
+  virtual const PortableServer::ObjectId &object_id (void) const;
   // Get the object ID.
 
-  void object_key (const TAO_ObjectKey &key);
+  virtual void object_key (const TAO_ObjectKey &key);
   // Set the object key.
 
-  const TAO_ObjectKey &object_key (void) const;
+  virtual const TAO_ObjectKey &object_key (void) const;
   // Get the object key.
 
-  void servant (PortableServer::Servant servant);
+  virtual void servant (PortableServer::Servant servant);
   // Set the servant for the current upcall.
 
-  PortableServer::Servant servant (void) const;
+  virtual PortableServer::Servant servant (void) const;
   // Get the servant for the current upcall.
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+  virtual int in_upcall (void) const;
+  // Get whether we're in an upcall (non-zero is yes).
 
-  PortableServer::ServantLocator::Cookie locator_cookie (void) const;
+  virtual PortableServer::ServantLocator::Cookie locator_cookie (void) const;
   // Get the Servant Locator's cookie
 
-  void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
+  virtual void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
   // Set the Servant Locator's cookie
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
-  // Set the <active_object_map_entry>.
-
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
-  // Get the <active_object_map_entry>.
+  TAO_POA_Current (void);
+  // Constructor
 
-  TAO_POA_Current_Impl (TAO_POA *impl,
-                        const TAO_ObjectKey &key,
-                        PortableServer::Servant servant,
-                        const char *operation,
-                        TAO_ORB_Core &orb_core);
+  TAO_POA_Current (TAO_POA *impl,
+                   const TAO_ObjectKey &key,
+                   const PortableServer::ObjectId &id,
+                   PortableServer::Servant servant);
   // Convenience constructor combining construction & initialization.
 
-  ~TAO_POA_Current_Impl (void);
+  virtual ~TAO_POA_Current (void);
   // Destructor
 
 protected:
   TAO_POA *poa_impl_;
   // The POA implementation invoking an upcall
 
-  PortableServer::ObjectId object_id_;
-  // The object ID of the current context.  This is the user id and
-  // not the id the goes into the IOR.  Note also that unlike the
-  // <object_key>, this field is stored by value.
+  const PortableServer::ObjectId *object_id_;
+  // The object ID of the current context.
 
   const TAO_ObjectKey *object_key_;
   // The object key of the current context.
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   PortableServer::ServantLocator::Cookie cookie_;
   // Servant Locator's cookie
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   PortableServer::Servant servant_;
   // The servant for the current upcall.
 
-  const char *operation_;
-  // Operation name for this current.
-
-  TAO_ORB_Core *orb_core_;
-  // ORB Core for this current.
-
-  TAO_POA_Current_Impl *previous_current_impl_;
-  // Current previous from <this>.
-
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry_;
-  // Pointer to the entry in the TAO_Active_Object_Map corresponding
-  // to the servant for this request.
-
   // = Hidden because we don't allow these
-  TAO_POA_Current_Impl (const TAO_POA_Current_Impl &);
-  void operator= (const TAO_POA_Current_Impl &);
+  TAO_POA_Current (const TAO_POA_Current &);
+  void operator= (const TAO_POA_Current &);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/POA.i b/TAO/tao/POA.i
index 460c4a54dd0..eab85a53ee4 100644
--- a/TAO/tao/POA.i
+++ b/TAO/tao/POA.i
@@ -2,9 +2,6 @@
 
 // Exception macros
 #include "tao/poa_macros.h"
-#include "tao/Environment.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
 
 ACE_INLINE PortableServer::ThreadPolicyValue
 TAO_POA_Policies::thread (void) const
@@ -18,8 +15,6 @@ TAO_POA_Policies::thread (PortableServer::ThreadPolicyValue value)
   this->thread_ = value;
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE PortableServer::LifespanPolicyValue
 TAO_POA_Policies::lifespan (void) const
 {
@@ -92,7 +87,25 @@ TAO_POA_Policies::request_processing (PortableServer::RequestProcessingPolicyVal
   this->request_processing_ = value;
 }
 
-ACE_INLINE CORBA::ULong
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+ACE_INLINE PortableServer::SynchronizationPolicyValue
+TAO_POA_Policies::synchronization (void) const
+{
+  return this->synchronization_;
+}
+
+ACE_INLINE void
+TAO_POA_Policies::synchronization (PortableServer::SynchronizationPolicyValue value)
+{
+  this->synchronization_ = value;
+}
+
+ACE_INLINE int
 TAO_Creation_Time::creation_time_length (void)
 {
   return 2 * sizeof (CORBA::ULong);
@@ -202,38 +215,107 @@ TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
   this->time_stamp_ = (void *) creation_time;
 }
 
+ACE_INLINE TAO_POA *
+TAO_POA::clone (const TAO_POA::String &adapter_name,
+                TAO_POA_Manager &poa_manager,
+                const TAO_POA_Policies &policies,
+                TAO_POA *parent,
+                CORBA::Environment &env)
+{
+  return new TAO_POA (adapter_name,
+                      poa_manager,
+                      policies,
+                      parent,
+                      env);
+}
+
 ACE_INLINE ACE_Lock &
 TAO_POA::lock (void)
 {
-  return this->lock_;
+  return *this->lock_;
 }
 
 ACE_INLINE TAO_POA *
 TAO_POA::create_POA (const TAO_POA::String &adapter_name,
                      TAO_POA_Manager &poa_manager,
                      const TAO_POA_Policies &policies,
-                     CORBA::Environment &ACE_TRY_ENV)
+                     CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
   return this->create_POA_i (adapter_name,
                              poa_manager,
                              policies,
-                             ACE_TRY_ENV);
+                             env);
+}
+
+ACE_INLINE TAO_POA *
+TAO_POA::find_POA (const TAO_POA::String &adapter_name,
+                   CORBA::Boolean activate_it,
+                   CORBA::Environment &env)
+{
+  // Check if we are the POA the user is looking for
+  if (adapter_name == this->name_)
+    return this;
+
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
+
+  return this->find_POA_i_optimized (adapter_name,
+                                     activate_it,
+                                     env);
+
+}
+
+ACE_INLINE PortableServer::POA_ptr
+TAO_POA::find_POA (const char *adapter_name,
+                   CORBA::Boolean activate_it,
+                   CORBA::Environment &env)
+{
+  // Don't copy string
+  TAO_POA::String name (adapter_name, 0, 0);
+
+  TAO_POA *result = this->find_POA (name,
+                                    activate_it,
+                                    env);
+
+  if (env.exception () != 0)
+    return PortableServer::POA::_nil ();
+
+  return result->_this (env);
+}
+
+ACE_INLINE TAO_POA *
+TAO_POA::find_POA_i (const TAO_POA::String &adapter_name,
+                     CORBA::Boolean activate_it,
+                     CORBA::Environment &env)
+{
+  // Check if we are the POA the user is looking for
+  if (adapter_name == this->name_)
+    return this;
+
+  return this->find_POA_i_optimized (adapter_name,
+                                     activate_it,
+                                     env);
 }
 
 ACE_INLINE void
 TAO_POA::destroy (CORBA::Boolean etherealize_objects,
                   CORBA::Boolean wait_for_completion,
-                  CORBA::Environment &ACE_TRY_ENV)
+                  CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  {
+    // Lock access to the POA for the duration of this transaction
+    TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
+    
+    this->destroy_i (etherealize_objects,
+                     wait_for_completion,
+                     env);
+  }
 
-  this->destroy_i (etherealize_objects,
-                   wait_for_completion,
-                   ACE_TRY_ENV);
+  // Commit suicide
+  delete this;
 }
 
 ACE_INLINE TAO_POA_Policies &
@@ -248,209 +330,171 @@ TAO_POA::active_object_map (void) const
   return *this->active_object_map_;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant_manager (CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::ServantManager::_nil (), env);
 
-  return this->get_servant_manager_i (ACE_TRY_ENV);
+  return this->get_servant_manager_i (env);
 }
 
 ACE_INLINE void
 TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
   this->set_servant_manager_i (imgr,
-                               ACE_TRY_ENV);
+                               env);
 }
 
 ACE_INLINE PortableServer::Servant
-TAO_POA::get_servant (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::get_servant (CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
-  return this->get_servant_i (ACE_TRY_ENV);
+  return this->get_servant_i (env);
 }
 
 ACE_INLINE void
 TAO_POA::set_servant (PortableServer::Servant servant,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
   this->set_servant_i (servant,
-                       ACE_TRY_ENV);
+                       env);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::activate_object (PortableServer::Servant servant,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
   return this->activate_object_i (servant,
-                                  ACE_TRY_ENV);
+                                  env);
 }
 
 ACE_INLINE void
 TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                                   PortableServer::Servant servant,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
   this->activate_object_with_id_i (id,
                                    servant,
-                                   ACE_TRY_ENV);
+                                   env);
 }
 
 ACE_INLINE void
 TAO_POA::deactivate_object (const PortableServer::ObjectId &oid,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
   this->deactivate_object_i (oid,
-                             ACE_TRY_ENV);
+                             env);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::create_reference (const char *intf,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), env);
 
   return this->create_reference_i (intf,
-                                   ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                   const char *intf,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), CORBA::Object::_nil (), ACE_TRY_ENV);
-
-  return this->create_reference_with_id_i (id,
-                                           intf,
-                                           ACE_TRY_ENV);
+                                   env);
 }
 
 ACE_INLINE PortableServer::ObjectId *
 TAO_POA::servant_to_id (PortableServer::Servant servant,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   // If we had upgradeable locks, this would initially be a read lock
   //
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
   return this->servant_to_id_i (servant,
-                                ACE_TRY_ENV);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_system_id (PortableServer::Servant servant,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
-
-  return this->servant_to_system_id_i (servant,
-                                       ACE_TRY_ENV);
+                                env);
 }
 
 ACE_INLINE PortableServer::Servant
 TAO_POA::id_to_servant (const PortableServer::ObjectId &oid,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
   return this->id_to_servant_i (oid,
-                                ACE_TRY_ENV);
+                                env);
 }
 
 ACE_INLINE CORBA::Object_ptr
 TAO_POA::id_to_reference (const PortableServer::ObjectId &oid,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_READ_GUARD_RETURN (ACE_Lock, monitor, this->lock (), 0, env);
 
-  return this->id_to_reference_i (oid, ACE_TRY_ENV);
+  return this->id_to_reference_i (oid, env);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE void
 TAO_POA::forward_object (const PortableServer::ObjectId &oid,
                          CORBA::Object_ptr forward_to,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  // Lock access to the POA for the duration of this transaction
+  TAO_POA_WRITE_GUARD (ACE_Lock, monitor, this->lock (), env);
 
   this->forward_object_i (oid,
                           forward_to,
-                          ACE_TRY_ENV);
+                          env);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE PortableServer::POA_ptr
-TAO_POA::the_parent (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_parent (CORBA::Environment &env)
 {
   if (this->parent_ != 0)
-    return this->parent_->_this (ACE_TRY_ENV);
+    return this->parent_->_this (env);
   else
     return PortableServer::POA::_nil ();
 }
 
 ACE_INLINE PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_POAManager (CORBA::Environment &env)
 {
-  return this->poa_manager_._this (ACE_TRY_ENV);
+  return this->poa_manager_._this (env);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_activator (CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), PortableServer::AdapterActivator::_nil (), ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
 }
 
 ACE_INLINE void
 TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE const TAO_Creation_Time &
 TAO_POA::creation_time (void)
 {
@@ -465,48 +509,35 @@ TAO_POA::system_id (void)
 
 
 ACE_INLINE CORBA::Boolean
-TAO_POA::root (void)
-{
-  return this->parent_ == 0;
-}
-
-
-ACE_INLINE CORBA::Boolean
 TAO_POA::persistent (void)
 {
   return this->persistent_;
 }
 
-ACE_INLINE const ACE_CString &
-TAO_POA::name (void) const
-{
-  return this->name_;
-}
-
 ACE_INLINE CORBA::String
-TAO_POA::the_name (CORBA::Environment &ACE_TRY_ENV)
+TAO_POA::the_name (CORBA::Environment &env)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   return CORBA::string_dup (this->name_.c_str ());
 }
 
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::folded_name (void) const
+ACE_INLINE TAO_POA::String
+TAO_POA::complete_name (void)
 {
-  return this->folded_name_;
+  return this->complete_name_;
 }
 
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::system_name (void) const
+ACE_INLINE char
+TAO_POA::name_separator (void)
 {
-  return this->system_name_.in ();
+  return '/';
 }
 
 ACE_INLINE char
-TAO_POA::name_separator (void)
+TAO_POA::id_separator (void)
 {
-  return '\0';
+  return ':';
 }
 
 ACE_INLINE CORBA::ULong
@@ -515,6 +546,12 @@ TAO_POA::name_separator_length (void)
   return sizeof (char);
 }
 
+ACE_INLINE CORBA::ULong
+TAO_POA::id_separator_length (void)
+{
+  return sizeof (char);
+}
+
 ACE_INLINE char
 TAO_POA::persistent_key_char (void)
 {
@@ -569,151 +606,128 @@ TAO_POA::system_id_key_type_length (void)
   return sizeof (char);
 }
 
-ACE_INLINE char
-TAO_POA::root_key_char (void)
+ACE_INLINE int
+TAO_POA::rfind (const TAO_ObjectKey &key,
+                char c,
+                int pos) const
 {
-  return 'R';
-}
+  if (pos == ACE_CString::npos)
+    pos = key.length ();
 
-ACE_INLINE char
-TAO_POA::non_root_key_char (void)
-{
-  return 'N';
-}
+  for (int i = pos - 1; i >= 0; i--)
+    if (key[i] == c)
+      return i;
 
-ACE_INLINE char
-TAO_POA::root_key_type (void)
-{
-  if (this->root ())
-    return TAO_POA::root_key_char ();
-  else
-    return TAO_POA::non_root_key_char ();
+  return TAO_POA::String::npos;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_POA::root_key_type_length (void)
+ACE_INLINE PortableServer::ObjectId *
+TAO_POA::create_object_id (PortableServer::Servant servant, 
+                           CORBA::Environment &env)
 {
-  return sizeof (char);
+  return this->active_object_map ().create_object_id (servant, env);
 }
 
 ACE_INLINE CORBA::ULong
-TAO_POA::outstanding_requests (void) const
+TAO_POA::system_id_size (void) const
 {
-  return this->outstanding_requests_;
+  return this->active_object_map ().system_id_size ();
 }
 
-ACE_INLINE void
-TAO_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
-{
-  this->outstanding_requests_ = new_outstanding_requests;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::increment_outstanding_requests (void)
+ACE_INLINE ACE_Lock &
+TAO_POA_Manager::lock (void)
 {
-  return ++this->outstanding_requests_;
+  return *this->lock_;
 }
 
-ACE_INLINE CORBA::ULong
-TAO_POA::decrement_outstanding_requests (void)
+ACE_INLINE TAO_POA_Manager *
+TAO_POA_Manager::clone (void)
 {
-  return --this->outstanding_requests_;
+  return new TAO_POA_Manager;
 }
 
 ACE_INLINE void
-TAO_POA::establish_servant_lock (PortableServer::Servant servant)
+TAO_POA_Current::clear (void)
 {
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      servant->_increment_single_threaded_poa_lock_count ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  this->poa_impl_ = 0;
+  this->object_id_ = 0;
+  this->servant_ = 0;
+  this->object_key_ = 0;
+  this->cookie_ = 0;
 }
 
-ACE_INLINE void
-TAO_POA::teardown_servant_lock (PortableServer::Servant servant)
+ACE_INLINE int
+TAO_POA_Current::context_is_valid (void)
 {
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  if (this->policies ().thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      servant->_decrement_single_threaded_poa_lock_count ();
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  return
+    this->poa_impl_ != 0 &&
+    this->object_id_ != 0 &&
+    this->servant_ != 0 &&
+    this->object_key_ != 0;
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::POA_impl (TAO_POA *impl)
+TAO_POA_Current::POA_impl (TAO_POA *impl)
 {
   this->poa_impl_ = impl;
 }
 
 ACE_INLINE TAO_POA *
-TAO_POA_Current_Impl::POA_impl (void) const
+TAO_POA_Current::POA_impl (void) const
 {
   return this->poa_impl_;
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::object_id (const PortableServer::ObjectId &id)
+TAO_POA_Current::object_id (const PortableServer::ObjectId &id)
 {
-  this->object_id_ = id;
+  this->object_id_ = &id;
 }
 
 ACE_INLINE const PortableServer::ObjectId &
-TAO_POA_Current_Impl::object_id (void) const
+TAO_POA_Current::object_id (void) const
 {
-  return this->object_id_;
+  return *this->object_id_;
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::object_key (const TAO_ObjectKey &key)
+TAO_POA_Current::object_key (const TAO_ObjectKey &key)
 {
   this->object_key_ = &key;
 }
 
 ACE_INLINE const TAO_ObjectKey &
-TAO_POA_Current_Impl::object_key (void) const
+TAO_POA_Current::object_key (void) const
 {
   return *this->object_key_;
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::servant (PortableServer::Servant servant)
+TAO_POA_Current::servant (PortableServer::Servant servant)
 {
   this->servant_ = servant;
 }
 
 ACE_INLINE PortableServer::Servant
-TAO_POA_Current_Impl::servant (void) const
+TAO_POA_Current::servant (void) const
 {
   return this->servant_;
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+ACE_INLINE int
+TAO_POA_Current::in_upcall (void) const
+{
+  return (this->servant_ != 0);
+}
 
 ACE_INLINE PortableServer::ServantLocator::Cookie
-TAO_POA_Current_Impl::locator_cookie (void) const
+TAO_POA_Current::locator_cookie (void) const
 {
   return this->cookie_;
 }
 
 ACE_INLINE void
-TAO_POA_Current_Impl::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
+TAO_POA_Current::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
 {
   this->cookie_ = cookie;
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE void
-TAO_POA_Current_Impl::active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry)
-{
-  this->active_object_map_entry_ = entry;
-}
-
-ACE_INLINE TAO_Active_Object_Map::Map_Entry *
-TAO_POA_Current_Impl::active_object_map_entry (void) const
-{
-  return this->active_object_map_entry_;
-}
diff --git a/TAO/tao/POA.pidl b/TAO/tao/POA.pidl
index a02445c38db..5c9b8799086 100644
--- a/TAO/tao/POA.pidl
+++ b/TAO/tao/POA.pidl
@@ -50,27 +50,16 @@ module PortableServer
   native Servant;
   typedef sequence<octet> ObjectId;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
   exception ForwardRequest
     {
       Object forward_reference;
     };
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  const CORBA::PolicyType THREAD_POLICY_ID = 16;
-  const CORBA::PolicyType LIFESPAN_POLICY_ID = 17;
-  const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18;
-  const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19;
-  const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20;
-  const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21;
-  const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22;
 
   // **********************************************
   //
   // Policy interfaces
   //
   // **********************************************
-#if !defined (TAO_HAS_MINIMUM_CORBA)
   enum ThreadPolicyValue {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
@@ -79,7 +68,6 @@ module PortableServer
     {
       readonly attribute ThreadPolicyValue value;
     };
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
   enum LifespanPolicyValue {
     TRANSIENT,
@@ -108,7 +96,6 @@ module PortableServer
       readonly attribute IdAssignmentPolicyValue value;
     };
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
   enum ImplicitActivationPolicyValue {
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
@@ -136,7 +123,22 @@ module PortableServer
     {
       readonly attribute RequestProcessingPolicyValue value;
     };
-#endif /* TAO_HAS_MINIMUM_CORBA */
+
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
+
+  enum SynchronizationPolicyValue {
+    DEFAULT_LOCK,
+    NULL_LOCK,
+    THREAD_LOCK
+  };
+  interface SynchronizationPolicy : CORBA::Policy
+    {
+      readonly attribute SynchronizationPolicyValue value;
+    };
 
   // **************************************************
   //
@@ -146,27 +148,19 @@ module PortableServer
 
   interface POAManager
     {
-      enum State
-      {
-        HOLDING,
-        ACTIVE,
-        DISCARDING,
-        INACTIVE
-      };
       exception AdapterInactive{};
 
       void activate()
         raises(AdapterInactive);
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       void hold_requests(in boolean wait_for_completion)
         raises(AdapterInactive);
       void discard_requests(in boolean wait_for_completion)
         raises(AdapterInactive);
+      // ****change**** begin take out semi-colon after parameter list in 97-04-14
       void deactivate(  in boolean etherealize_objects,
                         in boolean wait_for_completion)
         raises(AdapterInactive);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-      State get_state ();
+      // ****change**** end   take out semi-colon after parameter list in 97-04-14
     };
 
   // **************************************************
@@ -175,7 +169,6 @@ module PortableServer
   //
   // **************************************************
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
   interface AdapterActivator
     {
       boolean unknown_adapter(in POA parent, in string name);
@@ -221,7 +214,6 @@ module PortableServer
                     in Cookie   the_cookie,
                     in Servant  the_servant     );
   };
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 
   // **************************************************
@@ -233,14 +225,10 @@ module PortableServer
   interface POA
     {
       exception AdapterAlreadyExists {};
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       exception AdapterInactive {};
-#endif /* TAO_HAS_MINIMUM_CORBA */
       exception AdapterNonExistent {};
       exception InvalidPolicy { unsigned short index; };
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       exception NoServant {};
-#endif /* TAO_HAS_MINIMUM_CORBA */
       exception ObjectAlreadyActive {};
       exception ObjectNotActive {};
       exception ServantAlreadyActive {};
@@ -270,10 +258,8 @@ module PortableServer
       // Factories for Policy objects
       //
       // **************************************************
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       ThreadPolicy
         create_thread_policy(in ThreadPolicyValue value);
-#endif /* TAO_HAS_MINIMUM_CORBA */
       LifespanPolicy
         create_lifespan_policy(in LifespanPolicyValue value);
       IdUniquenessPolicy
@@ -282,7 +268,6 @@ module PortableServer
       IdAssignmentPolicy
         create_id_assignment_policy
         (in IdAssignmentPolicyValue value);
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       ImplicitActivationPolicy
         create_implicit_activation_policy
         (in ImplicitActivationPolicyValue value);
@@ -292,7 +277,16 @@ module PortableServer
       RequestProcessingPolicy
         create_request_processing_policy
         (in RequestProcessingPolicyValue value);
-#endif /* TAO_HAS_MINIMUM_CORBA */
+
+      // **************************************************
+      //
+      // TAO spcific POA locking policy (non-standard)
+      //
+      // **************************************************
+
+      SynchronizationPolicy
+        create_synchronization_policy
+        (in SynchronizationPolicyValue value);
 
       //--------------------------------------------------
       //
@@ -303,9 +297,7 @@ module PortableServer
       readonly attribute string the_name;
       readonly attribute POA the_parent;
       readonly attribute POAManager the_POAManager;
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       attribute AdapterActivator the_activator;
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 
       //--------------------------------------------------
@@ -314,7 +306,6 @@ module PortableServer
       //
       //--------------------------------------------------
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
       ServantManager get_servant_manager()
         raises (WrongPolicy);
 
@@ -332,7 +323,6 @@ module PortableServer
 
       void set_servant( in Servant p_servant)
         raises (WrongPolicy);
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
       // **************************************************
       //
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index 0c01038e988..49bf68bf78d 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -16,7 +16,7 @@
 #include "tao/POA.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
-#include "tao/Invocation.h"
+#include "tao/Environment.h"
 #include "tao/Stub.h"
 
 #if !defined (__ACE_INLINE__)
@@ -38,37 +38,31 @@ static const CORBA::Long _oc_PortableServer__tao_seq_Octet[] =
 static CORBA::TypeCode _tc_TAO_tc_PortableServer__tao_seq_Octet
 (CORBA::tk_sequence, sizeof (_oc_PortableServer__tao_seq_Octet), (char *)
  &_oc_PortableServer__tao_seq_Octet, 0, sizeof (PortableServer::_tao_seq_Octet));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc__tao_seq_Octet, &_tc_TAO_tc_PortableServer__tao_seq_Octet)
-TAO_NAMESPACE_END
+CORBA::TypeCode_ptr PortableServer::_tc__tao_seq_Octet = &_tc_TAO_tc_PortableServer__tao_seq_Octet;
+
 
 #endif /* end #if !defined */
 
 static const CORBA::Long _oc_PortableServer_ObjectId[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ObjectId:1.0
-  9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0x0),  // name = ObjectId
+  32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x7449643a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ObjectId:1.0
+  9, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744964), ACE_NTOHL (0xfdfdfd),  // name = ObjectId
   CORBA::tk_sequence, // typecode kind
   12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  CORBA::tk_octet,
 
   0,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (CORBA::tk_alias, sizeof
-                                                           (_oc_PortableServer_ObjectId),
-                                                           (char *) &_oc_PortableServer_ObjectId,
-                                                           0, sizeof (PortableServer::ObjectId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
-TAO_NAMESPACE_END
+                                                        (_oc_PortableServer_ObjectId), (char *) &_oc_PortableServer_ObjectId,
+                                                        0, sizeof (PortableServer::ObjectId));
+CORBA::TypeCode_ptr PortableServer::_tc_ObjectId = &_tc_TAO_tc_PortableServer_ObjectId;
 
 // default constructor
 PortableServer::ForwardRequest::ForwardRequest (void)
-  : CORBA_UserException (PortableServer::_tc_ForwardRequest)
+  : CORBA_SystemException (PortableServer::_tc_ForwardRequest, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -79,7 +73,7 @@ PortableServer::ForwardRequest::~ForwardRequest (void)
 
 // copy constructor
 PortableServer::ForwardRequest::ForwardRequest (const PortableServer::ForwardRequest &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
 }
@@ -88,14 +82,14 @@ PortableServer::ForwardRequest::ForwardRequest (const PortableServer::ForwardReq
 PortableServer::ForwardRequest&
 PortableServer::ForwardRequest::operator= (const PortableServer::ForwardRequest &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
   return *this;
 }
 
 PortableServer::ForwardRequest::ForwardRequest(
                                                const CORBA::Object_ptr  _tao_forward_reference)
-  : CORBA_UserException  (PortableServer::_tc_ForwardRequest)
+  : CORBA_SystemException  (PortableServer::_tc_ForwardRequest, 0xffff0000L, CORBA::COMPLETED_NO)
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
@@ -109,7 +103,7 @@ void PortableServer::ForwardRequest::_raise (void)
 PortableServer::ForwardRequest_ptr
 PortableServer::ForwardRequest::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc);
   else
     return 0;
@@ -123,140 +117,78 @@ CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
 {
-  PortableServer::ForwardRequest *_tao_any_val = new PortableServer::ForwardRequest (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::_tc_ForwardRequest, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::ForwardRequest *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::_tc_ForwardRequest, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::ForwardRequest *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::_tc_ForwardRequest, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::_tc_ForwardRequest, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::ForwardRequest, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::_tc_ForwardRequest, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::_tc_ForwardRequest, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::_tc_ForwardRequest, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::_tc_ForwardRequest, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::ForwardRequest *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:1.0
-  15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73740000),  // name = ForwardRequest
+  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f46), ACE_NTOHL (0x6f727761), ACE_NTOHL (0x72645265), ACE_NTOHL (0x71756573), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ForwardRequest:1.0
+  15, ACE_NTOHL (0x466f7277), ACE_NTOHL (0x61726452), ACE_NTOHL (0x65717565), ACE_NTOHL (0x737400fd),  // name = ForwardRequest
   1, // member count
-    18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x65000000),  // name = forward_reference
-    CORBA::tk_objref,
-52, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-    7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63740000),  // name = Object,
+  18, ACE_NTOHL (0x666f7277), ACE_NTOHL (0x6172645f), ACE_NTOHL (0x72656665), ACE_NTOHL (0x72656e63), ACE_NTOHL (0x6500fdfd),  // name = forward_reference
+  CORBA::tk_objref,
+  44, // encapsulation length
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  21, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Object:1.0
+  7, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x637400fd),  // name = Object,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (CORBA::tk_except,
-                                                                 sizeof (_oc_PortableServer_ForwardRequest),
-                                                                 (char *) &_oc_PortableServer_ForwardRequest,
-                                                                 0,
-                                                                 sizeof (PortableServer::ForwardRequest));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ForwardRequest, &_tc_TAO_tc_PortableServer_ForwardRequest)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, LIFESPAN_POLICY_ID, 17)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_UNIQUENESS_POLICY_ID, 18)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, ID_ASSIGNMENT_POLICY_ID, 19)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, IMPLICIT_ACTIVATION_POLICY_ID, 20)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, SERVANT_RETENTION_POLICY_ID, 21)
-TAO_NAMESPACE_END
-TAO_NAMESPACE_TYPE (const CORBA::ULong)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+                                                              sizeof
+                                                              (_oc_PortableServer_ForwardRequest),
+                                                              (char *)
+                                                              &_oc_PortableServer_ForwardRequest, 0,
+                                                              sizeof (PortableServer::ForwardRequest));
+CORBA::TypeCode_ptr PortableServer::_tc_ForwardRequest = &_tc_TAO_tc_PortableServer_ForwardRequest;
+
 
 static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:1.0
-  18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
+  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/ThreadPolicyValue:1.0
+  18, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x6500fdfd),  // name = ThreadPolicyValue
   2, // member count
-    15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
-    20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
+  15, ACE_NTOHL (0x4f52425f), ACE_NTOHL (0x4354524c), ACE_NTOHL (0x5f4d4f44), ACE_NTOHL (0x454c00fd),  // name = ORB_CTRL_MODEL
+  20, ACE_NTOHL (0x53494e47), ACE_NTOHL (0x4c455f54), ACE_NTOHL (0x48524541), ACE_NTOHL (0x445f4d4f), ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (CORBA::tk_enum,
-                                                                    sizeof (_oc_PortableServer_ThreadPolicyValue),
-                                                                    (char *) &_oc_PortableServer_ThreadPolicyValue,
-                                                                    0,
-                                                                    sizeof (PortableServer::ThreadPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicyValue, &_tc_TAO_tc_PortableServer_ThreadPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ThreadPolicyValue), (char *)
+ &_oc_PortableServer_ThreadPolicyValue, 0,
+ sizeof (PortableServer::ThreadPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicyValue = &_tc_TAO_tc_PortableServer_ThreadPolicyValue;
 
 PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (PortableServer::ThreadPolicy_ptr obj)
 {
@@ -268,130 +200,88 @@ PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_duplicate (Porta
 
 PortableServer::ThreadPolicy_ptr PortableServer::ThreadPolicy::_narrow (
                                                                         CORBA::Object_ptr obj,
-                                                                        CORBA::Environment &ACE_TRY_ENV
+                                                                        CORBA::Environment &env
                                                                         )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ThreadPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ThreadPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ThreadPolicy:1.0", env))
     return PortableServer::ThreadPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ThreadPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ThreadPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ThreadPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::ThreadPolicy(stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ThreadPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_ThreadPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant),
-      stub
-    );
+                                                              ACE_reinterpret_cast(POA_PortableServer::ThreadPolicy_ptr, servant),
+                                                              stub
+                                                              );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::ThreadPolicyValue _tao_retval = (PortableServer::ThreadPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
-
-
-  for (;;)
+  static const TAO_Param_Data _get_PortableServer_ThreadPolicy_value_paramdata [] =
   {
-    ACE_TRY_ENV.clear ();
-    _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);
+    {PortableServer::_tc_ThreadPolicyValue, PARAM_RETURN, 0}};
 
-    }
-    break;
+  static const TAO_Call_Data _get_PortableServer_ThreadPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata, 0, 0};
+
+  PortableServer::ThreadPolicyValue retval =
+    ACE_static_cast (PortableServer::ThreadPolicyValue, -1);
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env,
+				     &_get_PortableServer_ThreadPolicy_value_calldata,
+				     _tao_arguments);
+  return retval;
 
-  }
-  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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::ThreadPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:1.0
-  13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ThreadPolicy,
+  36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f54), ACE_NTOHL (0x68726561), ACE_NTOHL (0x64506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ThreadPolicy:1.0
+  13, ACE_NTOHL (0x54687265), ACE_NTOHL (0x6164506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd),  // name = ThreadPolicy,
 };
-
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (CORBA::tk_objref,
-                                                               sizeof (_oc_PortableServer_ThreadPolicy),
-                                                               (char *) &_oc_PortableServer_ThreadPolicy,
-                                                               0,
-                                                               sizeof (PortableServer::ThreadPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ThreadPolicy, &_tc_TAO_tc_PortableServer_ThreadPolicy)
-TAO_NAMESPACE_END
+                                                            sizeof
+                                                            (_oc_PortableServer_ThreadPolicy),
+                                                            (char *)
+                                                            &_oc_PortableServer_ThreadPolicy, 0,
+                                                            sizeof (PortableServer::ThreadPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_ThreadPolicy = &_tc_TAO_tc_PortableServer_ThreadPolicy;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:1.0
+  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/LifespanPolicyValue:1.0
   20, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
   2, // member count
-    10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x54000000),  // name = TRANSIENT
-    11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e540000),  // name = PERSISTENT
+  10, ACE_NTOHL (0x5452414e), ACE_NTOHL (0x5349454e), ACE_NTOHL (0x5400fdfd),  // name = TRANSIENT
+  11, ACE_NTOHL (0x50455253), ACE_NTOHL (0x49535445), ACE_NTOHL (0x4e5400fd),  // name = PERSISTENT
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (CORBA::tk_enum,
-                                                                      sizeof (_oc_PortableServer_LifespanPolicyValue),
-                                                                      (char *) &_oc_PortableServer_LifespanPolicyValue,
-                                                                      0,
-                                                                      sizeof (PortableServer::LifespanPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicyValue, &_tc_TAO_tc_PortableServer_LifespanPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_LifespanPolicyValue), (char *)
+ &_oc_PortableServer_LifespanPolicyValue, 0,
+sizeof (PortableServer::LifespanPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicyValue = &_tc_TAO_tc_PortableServer_LifespanPolicyValue;
 
 PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (PortableServer::LifespanPolicy_ptr obj)
 {
@@ -403,130 +293,90 @@ PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_duplicate (P
 
 PortableServer::LifespanPolicy_ptr PortableServer::LifespanPolicy::_narrow (
                                                                             CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &env
                                                                             )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::LifespanPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/LifespanPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/LifespanPolicy:1.0", env))
     return PortableServer::LifespanPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/LifespanPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::LifespanPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::LifespanPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::LifespanPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/LifespanPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_LifespanPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant),
-      stub
-    );
+                                                                ACE_reinterpret_cast(POA_PortableServer::LifespanPolicy_ptr, servant),
+                                                                stub
+                                                                );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::LifespanPolicyValue _tao_retval = (PortableServer::LifespanPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
+  static const TAO_Param_Data _get_PortableServer_LifespanPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_LifespanPolicyValue, PARAM_RETURN, 0}};
 
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Call_Data _get_PortableServer_LifespanPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata, 0, 0};
 
+  PortableServer::LifespanPolicyValue retval =
+    ACE_static_cast (PortableServer::LifespanPolicyValue, -1);
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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);
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env,
+	&_get_PortableServer_LifespanPolicy_value_calldata,
+	_tao_arguments);
+  return 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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::LifespanPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:1.0
-  15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = LifespanPolicy,
+  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f4c), ACE_NTOHL (0x69666573), ACE_NTOHL (0x70616e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/LifespanPolicy:1.0
+  15, ACE_NTOHL (0x4c696665), ACE_NTOHL (0x7370616e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = LifespanPolicy,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_LifespanPolicy),
-                                                                 (char *) &_oc_PortableServer_LifespanPolicy,
-                                                                 0,
-                                                                 sizeof (PortableServer::LifespanPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_LifespanPolicy, &_tc_TAO_tc_PortableServer_LifespanPolicy)
-TAO_NAMESPACE_END
+                                                              sizeof
+                                                              (_oc_PortableServer_LifespanPolicy),
+                                                              (char *)
+                                                              &_oc_PortableServer_LifespanPolicy,
+                                                              0,
+                                                              sizeof (PortableServer::LifespanPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_LifespanPolicy = &_tc_TAO_tc_PortableServer_LifespanPolicy;
 
 
 static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:1.0
+  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/IdUniquenessPolicyValue:1.0
   24, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
   2, // member count
-    10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
-    12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
+  10, ACE_NTOHL (0x554e4951), ACE_NTOHL (0x55455f49), ACE_NTOHL (0x4400fdfd),  // name = UNIQUE_ID
+  12, ACE_NTOHL (0x4d554c54), ACE_NTOHL (0x49504c45), ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (CORBA::tk_enum,
-                                                                          sizeof (_oc_PortableServer_IdUniquenessPolicyValue),
-                                                                          (char *) &_oc_PortableServer_IdUniquenessPolicyValue,
-                                                                          0,
-                                                                          sizeof (PortableServer::IdUniquenessPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicyValue, &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_IdUniquenessPolicyValue), (char *)
+ &_oc_PortableServer_IdUniquenessPolicyValue, 0, sizeof
+ (PortableServer::IdUniquenessPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicyValue = &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue;
 
 PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_duplicate (PortableServer::IdUniquenessPolicy_ptr obj)
 {
@@ -538,129 +388,85 @@ PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_dupl
 
 PortableServer::IdUniquenessPolicy_ptr PortableServer::IdUniquenessPolicy::_narrow (
                                                                                     CORBA::Object_ptr obj,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                                    CORBA::Environment &env
                                                                                     )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::IdUniquenessPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/IdUniquenessPolicy:1.0", env))
     return PortableServer::IdUniquenessPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::IdUniquenessPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::IdUniquenessPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::IdUniquenessPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdUniquenessPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant),
-      stub
-    );
+                                                                    ACE_reinterpret_cast(POA_PortableServer::IdUniquenessPolicy_ptr, servant),
+                                                                    stub
+                                                                    );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::IdUniquenessPolicyValue _tao_retval = (PortableServer::IdUniquenessPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Param_Data _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdUniquenessPolicyValue, PARAM_RETURN, 0}};
 
+  static const TAO_Call_Data _get_PortableServer_IdUniquenessPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata, 0, 0};
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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);
+  PortableServer::IdUniquenessPolicyValue retval =
+    ACE_static_cast (PortableServer::IdUniquenessPolicyValue, -1);
 
-    }
-    break;
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdUniquenessPolicy_value_calldata, _tao_arguments);
+  return retval;
 
-  }
-  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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::IdUniquenessPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0
-  19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = IdUniquenessPolicy,
+  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64556e69), ACE_NTOHL (0x7175656e), ACE_NTOHL (0x65737350), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/IdUniquenessPolicy:1.0
+  19, ACE_NTOHL (0x4964556e), ACE_NTOHL (0x69717565), ACE_NTOHL (0x6e657373), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = IdUniquenessPolicy,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (CORBA::tk_objref,
-                                                                     sizeof (_oc_PortableServer_IdUniquenessPolicy),
-                                                                     (char *) &_oc_PortableServer_IdUniquenessPolicy,
-                                                                     0,
-                                                                     sizeof (PortableServer::IdUniquenessPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdUniquenessPolicy, &_tc_TAO_tc_PortableServer_IdUniquenessPolicy)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_IdUniquenessPolicy), (char *)
+ &_oc_PortableServer_IdUniquenessPolicy, 0,
+ sizeof (PortableServer::IdUniquenessPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_IdUniquenessPolicy = &_tc_TAO_tc_PortableServer_IdUniquenessPolicy;
+
 
 static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:1.0
+  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/IdAssignmentPolicyValue:1.0
   24, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
   2, // member count
-    8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400),  // name = USER_ID
-    10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
+  8, ACE_NTOHL (0x55534552), ACE_NTOHL (0x5f494400),  // name = USER_ID
+  10, ACE_NTOHL (0x53595354), ACE_NTOHL (0x454d5f49), ACE_NTOHL (0x4400fdfd),  // name = SYSTEM_ID
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (CORBA::tk_enum,
-                                                                          sizeof (_oc_PortableServer_IdAssignmentPolicyValue),
-                                                                          (char *) &_oc_PortableServer_IdAssignmentPolicyValue,
-                                                                          0,
-                                                                          sizeof (PortableServer::IdAssignmentPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicyValue, &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_IdAssignmentPolicyValue), (char *)
+ &_oc_PortableServer_IdAssignmentPolicyValue, 0,
+ sizeof (PortableServer::IdAssignmentPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicyValue = &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue;
 
 PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_duplicate (PortableServer::IdAssignmentPolicy_ptr obj)
 {
@@ -672,132 +478,86 @@ PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_dupl
 
 PortableServer::IdAssignmentPolicy_ptr PortableServer::IdAssignmentPolicy::_narrow (
                                                                                     CORBA::Object_ptr obj,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                                    CORBA::Environment &env
                                                                                     )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::IdAssignmentPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/IdAssignmentPolicy:1.0", env))
     return PortableServer::IdAssignmentPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::IdAssignmentPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::IdAssignmentPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::IdAssignmentPolicy (stub);
+    } // end of if
+
+ void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/IdAssignmentPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant),
-      stub
-    );
+                                                                    ACE_reinterpret_cast(POA_PortableServer::IdAssignmentPolicy_ptr, servant),
+                                                                    stub
+                                                                    );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::IdAssignmentPolicyValue _tao_retval = (PortableServer::IdAssignmentPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Param_Data _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdAssignmentPolicyValue, PARAM_RETURN, 0}};
 
+  static const TAO_Call_Data _get_PortableServer_IdAssignmentPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata, 0, 0};
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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);
+  PortableServer::IdAssignmentPolicyValue retval =
+    ACE_static_cast (PortableServer::IdAssignmentPolicyValue, -1);
 
-    }
-    break;
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_IdAssignmentPolicy_value_calldata, _tao_arguments);
+  return retval;
 
-  }
-  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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::IdAssignmentPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0
-  19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = IdAssignmentPolicy,
+  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x64417373), ACE_NTOHL (0x69676e6d), ACE_NTOHL (0x656e7450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/IdAssignmentPolicy:1.0
+  19, ACE_NTOHL (0x49644173), ACE_NTOHL (0x7369676e), ACE_NTOHL (0x6d656e74), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = IdAssignmentPolicy,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (CORBA::tk_objref,
-                                                                     sizeof (_oc_PortableServer_IdAssignmentPolicy),
-                                                                     (char *) &_oc_PortableServer_IdAssignmentPolicy,
-                                                                     0,
-                                                                     sizeof (PortableServer::IdAssignmentPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IdAssignmentPolicy, &_tc_TAO_tc_PortableServer_IdAssignmentPolicy)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_IdAssignmentPolicy), (char *)
+ &_oc_PortableServer_IdAssignmentPolicy,
+ 0,
+ sizeof (PortableServer::IdAssignmentPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_IdAssignmentPolicy = &_tc_TAO_tc_PortableServer_IdAssignmentPolicy;
 
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  61, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:1.0
-  30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
+  53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/ImplicitActivationPolicyValue:1.0
+  30, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x6500fdfd),  // name = ImplicitActivationPolicyValue
   2, // member count
-    20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
-    23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
+  20, ACE_NTOHL (0x494d504c), ACE_NTOHL (0x49434954), ACE_NTOHL (0x5f414354), ACE_NTOHL (0x49564154), ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
+  23, ACE_NTOHL (0x4e4f5f49), ACE_NTOHL (0x4d504c49), ACE_NTOHL (0x4349545f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56415449), ACE_NTOHL (0x4f4e00fd),  // name = NO_IMPLICIT_ACTIVATION
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (CORBA::tk_enum,
-                                                                                sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
-                                                                                (char *) &_oc_PortableServer_ImplicitActivationPolicyValue,
-                                                                                0,
-                                                                                sizeof (PortableServer::ImplicitActivationPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicyValue, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
+ (char *) &_oc_PortableServer_ImplicitActivationPolicyValue, 0,
+ sizeof (PortableServer::ImplicitActivationPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicyValue = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue;
 
 PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_duplicate (PortableServer::ImplicitActivationPolicy_ptr obj)
 {
@@ -809,130 +569,85 @@ PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationP
 
 PortableServer::ImplicitActivationPolicy_ptr PortableServer::ImplicitActivationPolicy::_narrow (
                                                                                                 CORBA::Object_ptr obj,
-                                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                                CORBA::Environment &env
                                                                                                 )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ImplicitActivationPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ImplicitActivationPolicy:1.0", env))
     return PortableServer::ImplicitActivationPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ImplicitActivationPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ImplicitActivationPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::ImplicitActivationPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ImplicitActivationPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant),
-      stub
-    );
+                                                                          ACE_reinterpret_cast(POA_PortableServer::ImplicitActivationPolicy_ptr, servant),
+                                                                          stub
+                                                                          );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivationPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::ImplicitActivationPolicyValue _tao_retval = (PortableServer::ImplicitActivationPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
+  static const TAO_Param_Data _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ImplicitActivationPolicyValue, PARAM_RETURN, 0}};
 
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Call_Data _get_PortableServer_ImplicitActivationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata, 0, 0};
 
+  PortableServer::ImplicitActivationPolicyValue retval =
+    ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, -1);
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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);
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_ImplicitActivationPolicy_value_calldata, _tao_arguments);
+  return 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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::ImplicitActivationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0
-  25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x0),  // name = ImplicitActivationPolicy,
+  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f49), ACE_NTOHL (0x6d706c69), ACE_NTOHL (0x63697441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6963793a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ImplicitActivationPolicy:1.0
+  25, ACE_NTOHL (0x496d706c), ACE_NTOHL (0x69636974), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0xfdfdfd),  // name = ImplicitActivationPolicy,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (CORBA::tk_objref,
-                                                                           sizeof (_oc_PortableServer_ImplicitActivationPolicy),
-                                                                           (char *) &_oc_PortableServer_ImplicitActivationPolicy,
-                                                                           0,
-                                                                           sizeof (PortableServer::ImplicitActivationPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ImplicitActivationPolicy, &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ImplicitActivationPolicy),
+ (char *)&_oc_PortableServer_ImplicitActivationPolicy, 0,
+ sizeof (PortableServer::ImplicitActivationPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_ImplicitActivationPolicy = &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy;
 
 
 static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  59, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:1.0
+  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x75653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/ServantRetentionPolicyValue:1.0
   28, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
   2, // member count
-    7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = RETAIN
-    11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
+  7, ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd),  // name = RETAIN
+  11, ACE_NTOHL (0x4e4f4e5f), ACE_NTOHL (0x52455441), ACE_NTOHL (0x494e00fd),  // name = NON_RETAIN
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (CORBA::tk_enum,
-                                                                              sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
-                                                                              (char *) &_oc_PortableServer_ServantRetentionPolicyValue,
-                                                                              0,
-                                                                              sizeof (PortableServer::ServantRetentionPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicyValue, &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
+ (char *) &_oc_PortableServer_ServantRetentionPolicyValue, 0,
+ sizeof (PortableServer::ServantRetentionPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicyValue = &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue;
 
 PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_duplicate (PortableServer::ServantRetentionPolicy_ptr obj)
 {
@@ -944,130 +659,86 @@ PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolic
 
 PortableServer::ServantRetentionPolicy_ptr PortableServer::ServantRetentionPolicy::_narrow (
                                                                                             CORBA::Object_ptr obj,
-                                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                                            CORBA::Environment &env
                                                                                             )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantRetentionPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ServantRetentionPolicy:1.0", env))
     return PortableServer::ServantRetentionPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantRetentionPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::ServantRetentionPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::ServantRetentionPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantRetentionPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant),
-      stub
-    );
+                                                                        ACE_reinterpret_cast(POA_PortableServer::ServantRetentionPolicy_ptr, servant),
+                                                                        stub
+                                                                        );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::ServantRetentionPolicyValue _tao_retval = (PortableServer::ServantRetentionPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Param_Data _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ServantRetentionPolicyValue, PARAM_RETURN, 0}};
 
+  static const TAO_Call_Data _get_PortableServer_ServantRetentionPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata, 0, 0};
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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);
+  PortableServer::ServantRetentionPolicyValue retval =
+    ACE_static_cast (PortableServer::ServantRetentionPolicyValue, -1);
 
-    }
-    break;
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_ServantRetentionPolicy_value_calldata, _tao_arguments);
+  return retval;
 
-  }
-  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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::ServantRetentionPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0
-  23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63790000),  // name = ServantRetentionPolicy,
+  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e745265), ACE_NTOHL (0x74656e74), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantRetentionPolicy:1.0
+  23, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7452), ACE_NTOHL (0x6574656e), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = ServantRetentionPolicy,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (CORBA::tk_objref,
-                                                                         sizeof (_oc_PortableServer_ServantRetentionPolicy),
-                                                                         (char *) &_oc_PortableServer_ServantRetentionPolicy,
-                                                                         0,
-                                                                         sizeof (PortableServer::ServantRetentionPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantRetentionPolicy, &_tc_TAO_tc_PortableServer_ServantRetentionPolicy)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantRetentionPolicy), (char *)
+ &_oc_PortableServer_ServantRetentionPolicy, 0, sizeof
+ (PortableServer::ServantRetentionPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_ServantRetentionPolicy = &_tc_TAO_tc_PortableServer_ServantRetentionPolicy;
+
 
 static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  60, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:1.0
-  29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
+  52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795661), ACE_NTOHL (0x6c75653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/RequestProcessingPolicyValue:1.0
+  29, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637956), ACE_NTOHL (0x616c7565), ACE_NTOHL (0xfdfdfd),  // name = RequestProcessingPolicyValue
   3, // member count
-    27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-    20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
-    20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
+  27, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x41435449), ACE_NTOHL (0x56455f4f), ACE_NTOHL (0x424a4543), ACE_NTOHL (0x545f4d41), ACE_NTOHL (0x505f4f4e), ACE_NTOHL (0x4c5900fd),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
+  20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
+  20, ACE_NTOHL (0x5553455f), ACE_NTOHL (0x53455256), ACE_NTOHL (0x414e545f), ACE_NTOHL (0x4d414e41), ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (CORBA::tk_enum,
-                                                                               sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
-                                                                               (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
-                                                                               0,
-                                                                               sizeof (PortableServer::RequestProcessingPolicyValue));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicyValue, &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
+ (char *) &_oc_PortableServer_RequestProcessingPolicyValue, 0, sizeof
+ (PortableServer::RequestProcessingPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicyValue = &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue;
 
 PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_duplicate (PortableServer::RequestProcessingPolicy_ptr obj)
 {
@@ -1079,112 +750,165 @@ PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPol
 
 PortableServer::RequestProcessingPolicy_ptr PortableServer::RequestProcessingPolicy::_narrow (
                                                                                               CORBA::Object_ptr obj,
-                                                                                              CORBA::Environment &ACE_TRY_ENV
+                                                                                              CORBA::Environment &env
                                                                                               )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::RequestProcessingPolicy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/RequestProcessingPolicy:1.0", env))
     return PortableServer::RequestProcessingPolicy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0");
-#if defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::RequestProcessingPolicy::_nil ());
-#else
-  if (servant == 0)
-    return new PortableServer::RequestProcessingPolicy(stub);
-#endif /* TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::RequestProcessingPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/RequestProcessingPolicy:1.0");
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy(
-      ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant),
-      stub
-    );
+                                                                         ACE_reinterpret_cast(POA_PortableServer::RequestProcessingPolicy_ptr, servant),
+                                                                         stub
+                                                                         );
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &ACE_TRY_ENV)
+PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPolicy::value(CORBA::Environment &env)
 {
-    PortableServer::RequestProcessingPolicyValue _tao_retval = (PortableServer::RequestProcessingPolicyValue)0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
+  static const TAO_Param_Data _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_RequestProcessingPolicyValue, PARAM_RETURN, 0}};
 
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""value",
-      TAO_ORB_Core_instance ()
-    );
+  static const TAO_Call_Data _get_PortableServer_RequestProcessingPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata, 0, 0};
 
+  PortableServer::RequestProcessingPolicyValue retval =
+    ACE_static_cast (PortableServer::RequestProcessingPolicyValue, -1);
 
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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;
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_RequestProcessingPolicy_value_calldata, _tao_arguments);
+  return retval;
 
-  }
-  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;
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean PortableServer::RequestProcessingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
+static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/RequestProcessingPolicy:1.0
+  24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy,
+};
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_RequestProcessingPolicy),
+ (char *) &_oc_PortableServer_RequestProcessingPolicy, 0, sizeof
+ (PortableServer::RequestProcessingPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_RequestProcessingPolicy = &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
+
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+static const CORBA::Long _oc_PortableServer_SynchronizationPolicyValue[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x796e6368), ACE_NTOHL (0x726f6e69), ACE_NTOHL (0x7a617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x56616c75), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/SynchronizationPolicyValue:1.0
+  27, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x68726f6e), ACE_NTOHL (0x697a6174), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7956616c), ACE_NTOHL (0x756500fd),  // name = SynchronizationPolicyValue
+  3, // member count
+    13, ACE_NTOHL (0x44454641), ACE_NTOHL (0x554c545f), ACE_NTOHL (0x4c4f434b), ACE_NTOHL (0xfdfdfd),  // name = DEFAULT_LOCK
+    10, ACE_NTOHL (0x4e554c4c), ACE_NTOHL (0x5f4c4f43), ACE_NTOHL (0x4b00fdfd),  // name = NULL_LOCK
+    12, ACE_NTOHL (0x54485245), ACE_NTOHL (0x41445f4c), ACE_NTOHL (0x4f434b00),  // name = THREAD_LOCK
+};
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_SynchronizationPolicyValue
+(CORBA::tk_enum, sizeof (_oc_PortableServer_SynchronizationPolicyValue),
+ (char *) &_oc_PortableServer_SynchronizationPolicyValue, 0, sizeof
+ (PortableServer::SynchronizationPolicyValue));
+CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicyValue = &_tc_TAO_tc_PortableServer_SynchronizationPolicyValue;
+
+PortableServer::SynchronizationPolicy_ptr PortableServer::SynchronizationPolicy::_duplicate (PortableServer::SynchronizationPolicy_ptr obj)
 {
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
+  if (!CORBA::is_nil (obj))
+    obj->_incr_refcnt ();
+
+  return obj;
+} // end of _duplicate
+
+PortableServer::SynchronizationPolicy_ptr PortableServer::SynchronizationPolicy::_narrow (
+                                                                                          CORBA::Object_ptr obj,
+                                                                                          CORBA::Environment &env
+                                                                                          )
+{
+  if (CORBA::is_nil (obj))
+    return PortableServer::SynchronizationPolicy::_nil ();
+  if (!obj->_is_a ("IDL:PortableServer/SynchronizationPolicy:1.0", env))
+    return PortableServer::SynchronizationPolicy::_nil ();
+  STUB_Object *stub = obj->_stubobj ();
+  stub->_incr_refcnt ();
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      return new PortableServer::SynchronizationPolicy (stub);
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/SynchronizationPolicy:1.0");
+  return new POA_PortableServer::_tao_collocated_SynchronizationPolicy(
+                                                                       ACE_reinterpret_cast(POA_PortableServer::SynchronizationPolicy_ptr, servant),
+                                                                       stub
+                                                                       );
 }
 
-static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
+PortableServer::SynchronizationPolicyValue PortableServer::SynchronizationPolicy::value(CORBA::Environment &env)
+{
+  static const TAO_Param_Data _get_PortableServer_SynchronizationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_SynchronizationPolicyValue, PARAM_RETURN, 0}};
+
+  static const TAO_Call_Data _get_PortableServer_SynchronizationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_SynchronizationPolicy_value_paramdata, 0, 0};
+
+  PortableServer::SynchronizationPolicyValue retval =
+    ACE_static_cast (PortableServer::SynchronizationPolicyValue, -1);
+
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &_get_PortableServer_SynchronizationPolicy_value_calldata, _tao_arguments);
+  return retval;
+
+}
+
+CORBA::Boolean PortableServer::SynchronizationPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
+{
+  if (
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/SynchronizationPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
+    return 1; // success using local knowledge
+  else
+    return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
+}
+
+static const CORBA::Long _oc_PortableServer_SynchronizationPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f52), ACE_NTOHL (0x65717565), ACE_NTOHL (0x73745072), ACE_NTOHL (0x6f636573), ACE_NTOHL (0x73696e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0
-  24, ACE_NTOHL (0x52657175), ACE_NTOHL (0x65737450), ACE_NTOHL (0x726f6365), ACE_NTOHL (0x7373696e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy,
+  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x796e6368), ACE_NTOHL (0x726f6e69), ACE_NTOHL (0x7a617469), ACE_NTOHL (0x6f6e506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/SynchronizationPolicy:1.0
+  22, ACE_NTOHL (0x53796e63), ACE_NTOHL (0x68726f6e), ACE_NTOHL (0x697a6174), ACE_NTOHL (0x696f6e50), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7900fdfd),  // name = SynchronizationPolicy,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (CORBA::tk_objref,
-                                                                          sizeof (_oc_PortableServer_RequestProcessingPolicy),
-                                                                          (char *) &_oc_PortableServer_RequestProcessingPolicy,
-                                                                          0,
-                                                                          sizeof (PortableServer::RequestProcessingPolicy));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RequestProcessingPolicy, &_tc_TAO_tc_PortableServer_RequestProcessingPolicy)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_SynchronizationPolicy
+(CORBA::tk_objref, sizeof (_oc_PortableServer_SynchronizationPolicy), (char *)
+ &_oc_PortableServer_SynchronizationPolicy, 0, sizeof
+ (PortableServer::SynchronizationPolicy));
+CORBA::TypeCode_ptr PortableServer::_tc_SynchronizationPolicy = &_tc_TAO_tc_PortableServer_SynchronizationPolicy;
 
 PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableServer::POAManager_ptr obj)
 {
@@ -1196,20 +920,23 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_duplicate (PortableS
 
 PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
                                                                     CORBA::Object_ptr obj,
-                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    CORBA::Environment &env
                                                                     )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::POAManager::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/POAManager:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/POAManager:1.0", env))
     return PortableServer::POAManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
+    {
       // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POAManager::_nil ());
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::POAManager::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POAManager:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POAManager:1.0");
   return new POA_PortableServer::_tao_collocated_POAManager(
                                                             ACE_reinterpret_cast(POA_PortableServer::POAManager_ptr, servant),
                                                             stub
@@ -1218,7 +945,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow (
 
 // default constructor
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-  : CORBA_UserException (PortableServer::POAManager::_tc_AdapterInactive)
+  : CORBA_SystemException (PortableServer::POAManager::_tc_AdapterInactive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -1229,7 +956,7 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
 
 // copy constructor
 PortableServer::POAManager::AdapterInactive::AdapterInactive (const PortableServer::POAManager::AdapterInactive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -1237,7 +964,7 @@ PortableServer::POAManager::AdapterInactive::AdapterInactive (const PortableServ
 PortableServer::POAManager::AdapterInactive&
 PortableServer::POAManager::AdapterInactive::operator= (const PortableServer::POAManager::AdapterInactive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1250,7 +977,7 @@ void PortableServer::POAManager::AdapterInactive::_raise (void)
 PortableServer::POAManager::AdapterInactive_ptr
 PortableServer::POAManager::AdapterInactive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc);
   else
     return 0;
@@ -1264,73 +991,46 @@ CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POAManager::AdapterInactive &_tao_elem) // copying
 {
-  PortableServer::POAManager::AdapterInactive *_tao_any_val = new PortableServer::POAManager::AdapterInactive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInactive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POAManager::AdapterInactive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POAManager::_tc_AdapterInactive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POAManager::AdapterInactive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POAManager::_tc_AdapterInactive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POAManager::AdapterInactive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POAManager::_tc_AdapterInactive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POAManager::AdapterInactive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  58, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x722f4164), ACE_NTOHL (0x61707465), ACE_NTOHL (0x72496e61), ACE_NTOHL (0x63746976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0
+  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x722f4164), ACE_NTOHL (0x61707465), ACE_NTOHL (0x72496e61), ACE_NTOHL (0x63746976), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/POAManager/AdapterInactive:1.0
   16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
   0, // member count
 };
@@ -1343,35 +1043,26 @@ CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc_TAO_t
 CORBA::Boolean PortableServer::POAManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POAManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_POAManager[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  42, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:1.0
-  11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000),  // name = POAManager,
+  34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f414d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/POAManager:1.0
+  11, ACE_NTOHL (0x504f414d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd),  // name = POAManager,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (CORBA::tk_objref,
-                                                             sizeof (_oc_PortableServer_POAManager),
-                                                             (char *) &_oc_PortableServer_POAManager,
-                                                             0,
-                                                             sizeof (PortableServer::POAManager));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POAManager, &_tc_TAO_tc_PortableServer_POAManager)
-TAO_NAMESPACE_END
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+                                                          sizeof
+                                                          (_oc_PortableServer_POAManager),
+                                                          (char *)
+                                                          &_oc_PortableServer_POAManager, 0,
+                                                          sizeof (PortableServer::POAManager));
+CORBA::TypeCode_ptr PortableServer::_tc_POAManager = &_tc_TAO_tc_PortableServer_POAManager;
 
 PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicate (PortableServer::AdapterActivator_ptr obj)
 {
@@ -1383,20 +1074,23 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_duplicat
 
 PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
                                                                                 CORBA::Object_ptr obj,
-                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                CORBA::Environment &env
                                                                                 )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::AdapterActivator::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/AdapterActivator:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/AdapterActivator:1.0", env))
     return PortableServer::AdapterActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
+    {
       // This can only be colocated
-      ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::AdapterActivator::_nil ());
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::AdapterActivator::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/AdapterActivator:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/AdapterActivator:1.0");
   return new POA_PortableServer::_tao_collocated_AdapterActivator(
                                                                   ACE_reinterpret_cast(POA_PortableServer::AdapterActivator_ptr, servant),
                                                                   stub
@@ -1406,33 +1100,24 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow (
 CORBA::Boolean PortableServer::AdapterActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:1.0
-  17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0),  // name = AdapterActivator,
+  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/AdapterActivator:1.0
+  17, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd),  // name = AdapterActivator,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (CORBA::tk_objref,
-                                                                   sizeof (_oc_PortableServer_AdapterActivator),
-                                                                   (char *) &_oc_PortableServer_AdapterActivator,
-                                                                   0,
-                                                                   sizeof (PortableServer::AdapterActivator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AdapterActivator, &_tc_TAO_tc_PortableServer_AdapterActivator)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator
+(CORBA::tk_objref, sizeof (_oc_PortableServer_AdapterActivator), (char *)
+ &_oc_PortableServer_AdapterActivator, 0, sizeof
+ (PortableServer::AdapterActivator));
+CORBA::TypeCode_ptr PortableServer::_tc_AdapterActivator = &_tc_TAO_tc_PortableServer_AdapterActivator;
 
 PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (PortableServer::ServantManager_ptr obj)
 {
@@ -1444,20 +1129,23 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_duplicate (P
 
 PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
                                                                             CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &env
                                                                             )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantManager::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantManager:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ServantManager:1.0", env))
     return PortableServer::ServantManager::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantManager::_nil ());
+    {
+      // This can only be colocated
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::ServantManager::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantManager:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantManager:1.0");
   return new POA_PortableServer::_tao_collocated_ServantManager(
                                                                 ACE_reinterpret_cast(POA_PortableServer::ServantManager_ptr, servant),
                                                                 stub
@@ -1467,33 +1155,27 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow (
 CORBA::Boolean PortableServer::ServantManager::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ServantManager[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x65720000),  // name = ServantManager,
+  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744d61), ACE_NTOHL (0x6e616765), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantManager:1.0
+  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744d), ACE_NTOHL (0x616e6167), ACE_NTOHL (0x657200fd),  // name = ServantManager,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_ServantManager),
-                                                                 (char *) &_oc_PortableServer_ServantManager,
-                                                                 0,
-                                                                 sizeof (PortableServer::ServantManager));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantManager, &_tc_TAO_tc_PortableServer_ServantManager)
-TAO_NAMESPACE_END
+                                                              sizeof
+                                                              (_oc_PortableServer_ServantManager),
+                                                              (char *)
+                                                              &_oc_PortableServer_ServantManager,
+                                                              0,
+                                                              sizeof (PortableServer::ServantManager));
+CORBA::TypeCode_ptr PortableServer::_tc_ServantManager = &_tc_TAO_tc_PortableServer_ServantManager;
 
 PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicate (PortableServer::ServantActivator_ptr obj)
 {
@@ -1505,20 +1187,23 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_duplicat
 
 PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
                                                                                 CORBA::Object_ptr obj,
-                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                CORBA::Environment &env
                                                                                 )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantActivator::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantActivator:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ServantActivator:1.0", env))
     return PortableServer::ServantActivator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
+    {
       // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantActivator::_nil ());
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::ServantActivator::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantActivator:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantActivator:1.0");
   return new POA_PortableServer::_tao_collocated_ServantActivator(
                                                                   ACE_reinterpret_cast(POA_PortableServer::ServantActivator_ptr, servant),
                                                                   stub
@@ -1528,34 +1213,25 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow (
 CORBA::Boolean PortableServer::ServantActivator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantActivator:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ServantActivator[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/ServantActivator:1.0
-  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0x0),  // name = ServantActivator,
+  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744163), ACE_NTOHL (0x74697661), ACE_NTOHL (0x746f723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/ServantActivator:1.0
+  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x63746976), ACE_NTOHL (0x61746f72), ACE_NTOHL (0xfdfdfd),  // name = ServantActivator,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (CORBA::tk_objref,
-                                                                   sizeof (_oc_PortableServer_ServantActivator),
-                                                                   (char *) &_oc_PortableServer_ServantActivator,
-                                                                   0,
-                                                                   sizeof (PortableServer::ServantActivator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantActivator, &_tc_TAO_tc_PortableServer_ServantActivator)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator
+(CORBA::tk_objref, sizeof (_oc_PortableServer_ServantActivator), (char *)
+ &_oc_PortableServer_ServantActivator, 0, sizeof
+ (PortableServer::ServantActivator));
+CORBA::TypeCode_ptr PortableServer::_tc_ServantActivator = &_tc_TAO_tc_PortableServer_ServantActivator;
 
 PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (PortableServer::ServantLocator_ptr obj)
 {
@@ -1567,20 +1243,23 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_duplicate (P
 
 PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
                                                                             CORBA::Object_ptr obj,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &env
                                                                             )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::ServantLocator::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/ServantLocator:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/ServantLocator:1.0", env))
     return PortableServer::ServantLocator::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::ServantLocator::_nil ());
+    {
+      // This can only be colocated
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::ServantLocator::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/ServantLocator:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/ServantLocator:1.0");
   return new POA_PortableServer::_tao_collocated_ServantLocator(
                                                                 ACE_reinterpret_cast(POA_PortableServer::ServantLocator_ptr, servant),
                                                                 stub
@@ -1590,36 +1269,28 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow (
 CORBA::Boolean PortableServer::ServantLocator::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantLocator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantLocator:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_ServantLocator[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:1.0
-  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f720000),  // name = ServantLocator,
+  38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744c6f), ACE_NTOHL (0x6361746f), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/ServantLocator:1.0
+  15, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744c), ACE_NTOHL (0x6f636174), ACE_NTOHL (0x6f7200fd),  // name = ServantLocator,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (CORBA::tk_objref,
-                                                                 sizeof (_oc_PortableServer_ServantLocator),
-                                                                 (char *) &_oc_PortableServer_ServantLocator,
-                                                                 0,
-                                                                 sizeof (PortableServer::ServantLocator));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ServantLocator, &_tc_TAO_tc_PortableServer_ServantLocator)
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+                                                              sizeof
+                                                              (_oc_PortableServer_ServantLocator),
+                                                              (char *)
+                                                              &_oc_PortableServer_ServantLocator,
+                                                              0,
+                                                              sizeof (PortableServer::ServantLocator));
+CORBA::TypeCode_ptr PortableServer::_tc_ServantLocator = &_tc_TAO_tc_PortableServer_ServantLocator;
 
 PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr obj)
 {
@@ -1631,20 +1302,23 @@ PortableServer::POA_ptr PortableServer::POA::_duplicate (PortableServer::POA_ptr
 
 PortableServer::POA_ptr PortableServer::POA::_narrow (
                                                       CORBA::Object_ptr obj,
-                                                      CORBA::Environment &ACE_TRY_ENV
+                                                      CORBA::Environment &env
                                                       )
 {
   if (CORBA::is_nil (obj))
     return PortableServer::POA::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/POA:1.0", ACE_TRY_ENV))
+  if (!obj->_is_a ("IDL:PortableServer/POA:1.0", env))
     return PortableServer::POA::_nil ();
   if (!obj->_is_collocated () || !obj->_servant())
-    // This can only be colocated
-    ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
+    {
+      // This can only be colocated
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+      return PortableServer::POA::_nil ();
+    } // end of if
 
-  TAO_Stub *stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = obj->_servant ()->_downcast ("IDL:omg.org/PortableServer/POA:1.0");
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/POA:1.0");
   return new POA_PortableServer::_tao_collocated_POA(
                                                      ACE_reinterpret_cast(POA_PortableServer::POA_ptr, servant),
                                                      stub
@@ -1653,7 +1327,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow (
 
 // default constructor
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterAlreadyExists)
+  : CORBA_SystemException (PortableServer::POA::_tc_AdapterAlreadyExists, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -1664,7 +1338,7 @@ PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void)
 
 // copy constructor
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -1672,7 +1346,7 @@ PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const PortableS
 PortableServer::POA::AdapterAlreadyExists&
 PortableServer::POA::AdapterAlreadyExists::operator= (const PortableServer::POA::AdapterAlreadyExists &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1685,7 +1359,7 @@ void PortableServer::POA::AdapterAlreadyExists::_raise (void)
 PortableServer::POA::AdapterAlreadyExists_ptr
 PortableServer::POA::AdapterAlreadyExists::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::AdapterAlreadyExists_ptr, exc);
   else
     return 0;
@@ -1699,75 +1373,47 @@ CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterAlreadyExists &_tao_elem) // copying
 {
-  PortableServer::POA::AdapterAlreadyExists *_tao_any_val = new PortableServer::POA::AdapterAlreadyExists (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterAlreadyExists *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterAlreadyExists *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterAlreadyExists, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterAlreadyExists *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterAlreadyExists, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterAlreadyExists, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::AdapterAlreadyExists *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0
-  21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
-  0, // member count
+  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79457869), ACE_NTOHL (0x7374733a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/POA/AdapterAlreadyExists:1.0
+  21, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657241), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794578), ACE_NTOHL (0x69737473), ACE_NTOHL (0xfdfdfd),  // name = AdapterAlreadyExists
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists
 (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
@@ -1775,11 +1421,9 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists
  (PortableServer::POA::AdapterAlreadyExists));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists = &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // default constructor
 PortableServer::POA::AdapterInactive::AdapterInactive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterInactive)
+  : CORBA_SystemException (PortableServer::POA::_tc_AdapterInactive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -1790,7 +1434,7 @@ PortableServer::POA::AdapterInactive::~AdapterInactive (void)
 
 // copy constructor
 PortableServer::POA::AdapterInactive::AdapterInactive (const PortableServer::POA::AdapterInactive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -1798,7 +1442,7 @@ PortableServer::POA::AdapterInactive::AdapterInactive (const PortableServer::POA
 PortableServer::POA::AdapterInactive&
 PortableServer::POA::AdapterInactive::operator= (const PortableServer::POA::AdapterInactive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1811,7 +1455,7 @@ void PortableServer::POA::AdapterInactive::_raise (void)
 PortableServer::POA::AdapterInactive_ptr
 PortableServer::POA::AdapterInactive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc);
   else
     return 0;
@@ -1825,75 +1469,47 @@ CORBA::Exception *PortableServer::POA::AdapterInactive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterInactive &_tao_elem) // copying
 {
-  PortableServer::POA::AdapterInactive *_tao_any_val = new PortableServer::POA::AdapterInactive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterInactive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterInactive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterInactive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterInactive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_AdapterInactive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterInactive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterInactive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::AdapterInactive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_AdapterInactive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterInactive:1.0
+  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x6572496e), ACE_NTOHL (0x61637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA/AdapterInactive:1.0
   16, ACE_NTOHL (0x41646170), ACE_NTOHL (0x74657249), ACE_NTOHL (0x6e616374), ACE_NTOHL (0x69766500),  // name = AdapterInactive
-  0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterInactive
 (CORBA::tk_except, sizeof (_oc_PortableServer_POA_AdapterInactive), (char *)
@@ -1901,11 +1517,9 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterInactive
  (PortableServer::POA::AdapterInactive));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterInactive = &_tc_TAO_tc_PortableServer_POA_AdapterInactive;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 // default constructor
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
-  : CORBA_UserException (PortableServer::POA::_tc_AdapterNonExistent)
+  : CORBA_SystemException (PortableServer::POA::_tc_AdapterNonExistent, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -1916,7 +1530,7 @@ PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void)
 
 // copy constructor
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const PortableServer::POA::AdapterNonExistent &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -1924,7 +1538,7 @@ PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const PortableServe
 PortableServer::POA::AdapterNonExistent&
 PortableServer::POA::AdapterNonExistent::operator= (const PortableServer::POA::AdapterNonExistent &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -1937,7 +1551,7 @@ void PortableServer::POA::AdapterNonExistent::_raise (void)
 PortableServer::POA::AdapterNonExistent_ptr
 PortableServer::POA::AdapterNonExistent::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc);
   else
     return 0;
@@ -1951,74 +1565,47 @@ CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::AdapterNonExistent &_tao_elem) // copying
 {
-  PortableServer::POA::AdapterNonExistent *_tao_any_val = new PortableServer::POA::AdapterNonExistent (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::AdapterNonExistent *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::AdapterNonExistent *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_AdapterNonExistent, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::AdapterNonExistent *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_AdapterNonExistent, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::AdapterNonExistent, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_AdapterNonExistent, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::AdapterNonExistent *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  54, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724e6f), ACE_NTOHL (0x6e457869), ACE_NTOHL (0x7374656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0
-  19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
+  46, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f41), ACE_NTOHL (0x64617074), ACE_NTOHL (0x65724e6f), ACE_NTOHL (0x6e457869), ACE_NTOHL (0x7374656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:PortableServer/POA/AdapterNonExistent:1.0
+  19, ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465724e), ACE_NTOHL (0x6f6e4578), ACE_NTOHL (0x69737465), ACE_NTOHL (0x6e7400fd),  // name = AdapterNonExistent
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent
@@ -2029,7 +1616,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent = &_tc_TAO_tc_Po
 
 // default constructor
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
-  : CORBA_UserException (PortableServer::POA::_tc_InvalidPolicy)
+  : CORBA_SystemException (PortableServer::POA::_tc_InvalidPolicy, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2040,7 +1627,7 @@ PortableServer::POA::InvalidPolicy::~InvalidPolicy (void)
 
 // copy constructor
 PortableServer::POA::InvalidPolicy::InvalidPolicy (const PortableServer::POA::InvalidPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
   this->index = _tao_excp.index;
 }
@@ -2049,14 +1636,14 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (const PortableServer::POA::In
 PortableServer::POA::InvalidPolicy&
 PortableServer::POA::InvalidPolicy::operator= (const PortableServer::POA::InvalidPolicy &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   this->index = _tao_excp.index;
   return *this;
 }
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy(
                                                   CORBA::UShort _tao_index)
-  : CORBA_UserException  (PortableServer::POA::_tc_InvalidPolicy)
+  : CORBA_SystemException  (PortableServer::POA::_tc_InvalidPolicy, 0xffff0000L, CORBA::COMPLETED_NO)
 {
   this->index = _tao_index;
 }
@@ -2070,7 +1657,7 @@ void PortableServer::POA::InvalidPolicy::_raise (void)
 PortableServer::POA::InvalidPolicy_ptr
 PortableServer::POA::InvalidPolicy::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc);
   else
     return 0;
@@ -2084,78 +1671,50 @@ CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::InvalidPolicy &_tao_elem) // copying
 {
-  PortableServer::POA::InvalidPolicy *_tao_any_val = new PortableServer::POA::InvalidPolicy (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::InvalidPolicy *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::InvalidPolicy *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_InvalidPolicy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::InvalidPolicy *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_InvalidPolicy, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::InvalidPolicy, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_InvalidPolicy, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::InvalidPolicy *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f49), ACE_NTOHL (0x6e76616c), ACE_NTOHL (0x6964506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0
-  14, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x79000000),  // name = InvalidPolicy
+  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f49), ACE_NTOHL (0x6e76616c), ACE_NTOHL (0x6964506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/POA/InvalidPolicy:1.0
+  14, ACE_NTOHL (0x496e7661), ACE_NTOHL (0x6c696450), ACE_NTOHL (0x6f6c6963), ACE_NTOHL (0x7900fdfd),  // name = InvalidPolicy
   1, // member count
-    6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x78000000),  // name = index
-    CORBA::tk_ushort,
-
+  6, ACE_NTOHL (0x696e6465), ACE_NTOHL (0x7800fdfd),  // name = index
+  CORBA::tk_ushort,
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy
 (CORBA::tk_except, sizeof (_oc_PortableServer_POA_InvalidPolicy), (char *)
@@ -2163,11 +1722,9 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy
  (PortableServer::POA::InvalidPolicy));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy = &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // default constructor
 PortableServer::POA::NoServant::NoServant (void)
-  : CORBA_UserException (PortableServer::POA::_tc_NoServant)
+  : CORBA_SystemException (PortableServer::POA::_tc_NoServant, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2178,7 +1735,7 @@ PortableServer::POA::NoServant::~NoServant (void)
 
 // copy constructor
 PortableServer::POA::NoServant::NoServant (const PortableServer::POA::NoServant &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2186,7 +1743,7 @@ PortableServer::POA::NoServant::NoServant (const PortableServer::POA::NoServant
 PortableServer::POA::NoServant&
 PortableServer::POA::NoServant::operator= (const PortableServer::POA::NoServant &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2199,7 +1756,7 @@ void PortableServer::POA::NoServant::_raise (void)
 PortableServer::POA::NoServant_ptr
 PortableServer::POA::NoServant::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc);
   else
     return 0;
@@ -2213,74 +1770,47 @@ CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::NoServant &_tao_elem) // copying
 {
-  PortableServer::POA::NoServant *_tao_any_val = new PortableServer::POA::NoServant (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_NoServant, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::NoServant *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_NoServant, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::NoServant *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_NoServant, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::NoServant *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_NoServant, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::NoServant, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_NoServant, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_NoServant, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_NoServant, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_NoServant, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::NoServant *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  45, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4e), ACE_NTOHL (0x6f536572), ACE_NTOHL (0x76616e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:1.0
-  10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x74000000),  // name = NoServant
+  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4e), ACE_NTOHL (0x6f536572), ACE_NTOHL (0x76616e74), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/POA/NoServant:1.0
+  10, ACE_NTOHL (0x4e6f5365), ACE_NTOHL (0x7276616e), ACE_NTOHL (0x7400fdfd),  // name = NoServant
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (CORBA::tk_except,
@@ -2291,11 +1821,9 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (CORBA::tk_except
                                                              sizeof (PortableServer::POA::NoServant));
 CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant = &_tc_TAO_tc_PortableServer_POA_NoServant;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 // default constructor
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ObjectAlreadyActive)
+  : CORBA_SystemException (PortableServer::POA::_tc_ObjectAlreadyActive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2306,7 +1834,7 @@ PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void)
 
 // copy constructor
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2314,7 +1842,7 @@ PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const PortableSer
 PortableServer::POA::ObjectAlreadyActive&
 PortableServer::POA::ObjectAlreadyActive::operator= (const PortableServer::POA::ObjectAlreadyActive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2327,7 +1855,7 @@ void PortableServer::POA::ObjectAlreadyActive::_raise (void)
 PortableServer::POA::ObjectAlreadyActive_ptr
 PortableServer::POA::ObjectAlreadyActive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc);
   else
     return 0;
@@ -2341,73 +1869,46 @@ CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectAlreadyActive &_tao_elem) // copying
 {
-  PortableServer::POA::ObjectAlreadyActive *_tao_any_val = new PortableServer::POA::ObjectAlreadyActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectAlreadyActive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ObjectAlreadyActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ObjectAlreadyActive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectAlreadyActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectAlreadyActive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::ObjectAlreadyActive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  55, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x74416c72), ACE_NTOHL (0x65616479), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0
+  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x74416c72), ACE_NTOHL (0x65616479), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA/ObjectAlreadyActive:1.0
   20, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x6374416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
   0, // member count
 };
@@ -2419,7 +1920,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive = &_tc_TAO_tc_P
 
 // default constructor
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ObjectNotActive)
+  : CORBA_SystemException (PortableServer::POA::_tc_ObjectNotActive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2430,7 +1931,7 @@ PortableServer::POA::ObjectNotActive::~ObjectNotActive (void)
 
 // copy constructor
 PortableServer::POA::ObjectNotActive::ObjectNotActive (const PortableServer::POA::ObjectNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2438,7 +1939,7 @@ PortableServer::POA::ObjectNotActive::ObjectNotActive (const PortableServer::POA
 PortableServer::POA::ObjectNotActive&
 PortableServer::POA::ObjectNotActive::operator= (const PortableServer::POA::ObjectNotActive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2451,7 +1952,7 @@ void PortableServer::POA::ObjectNotActive::_raise (void)
 PortableServer::POA::ObjectNotActive_ptr
 PortableServer::POA::ObjectNotActive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc);
   else
     return 0;
@@ -2465,73 +1966,46 @@ CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ObjectNotActive &_tao_elem) // copying
 {
-  PortableServer::POA::ObjectNotActive *_tao_any_val = new PortableServer::POA::ObjectNotActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ObjectNotActive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ObjectNotActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ObjectNotActive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_ObjectNotActive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ObjectNotActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ObjectNotActive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::ObjectNotActive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  51, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x744e6f74), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0
+  43, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f4f), ACE_NTOHL (0x626a6563), ACE_NTOHL (0x744e6f74), ACE_NTOHL (0x41637469), ACE_NTOHL (0x76653a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA/ObjectNotActive:1.0
   16, ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x69766500),  // name = ObjectNotActive
   0, // member count
 };
@@ -2543,7 +2017,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive = &_tc_TAO_tc_Porta
 
 // default constructor
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ServantAlreadyActive)
+  : CORBA_SystemException (PortableServer::POA::_tc_ServantAlreadyActive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2554,7 +2028,7 @@ PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void)
 
 // copy constructor
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2562,7 +2036,7 @@ PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const PortableS
 PortableServer::POA::ServantAlreadyActive&
 PortableServer::POA::ServantAlreadyActive::operator= (const PortableServer::POA::ServantAlreadyActive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2575,7 +2049,7 @@ void PortableServer::POA::ServantAlreadyActive::_raise (void)
 PortableServer::POA::ServantAlreadyActive_ptr
 PortableServer::POA::ServantAlreadyActive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc);
   else
     return 0;
@@ -2589,74 +2063,47 @@ CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantAlreadyActive &_tao_elem) // copying
 {
-  PortableServer::POA::ServantAlreadyActive *_tao_any_val = new PortableServer::POA::ServantAlreadyActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantAlreadyActive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ServantAlreadyActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ServantAlreadyActive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_ServantAlreadyActive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantAlreadyActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantAlreadyActive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::ServantAlreadyActive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  56, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e74416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0
-  21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = ServantAlreadyActive
+  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e74416c), ACE_NTOHL (0x72656164), ACE_NTOHL (0x79416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/POA/ServantAlreadyActive:1.0
+  21, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e7441), ACE_NTOHL (0x6c726561), ACE_NTOHL (0x64794163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd),  // name = ServantAlreadyActive
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive
@@ -2667,7 +2114,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive = &_tc_TAO_tc_
 
 // default constructor
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
-  : CORBA_UserException (PortableServer::POA::_tc_ServantNotActive)
+  : CORBA_SystemException (PortableServer::POA::_tc_ServantNotActive, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2678,7 +2125,7 @@ PortableServer::POA::ServantNotActive::~ServantNotActive (void)
 
 // copy constructor
 PortableServer::POA::ServantNotActive::ServantNotActive (const PortableServer::POA::ServantNotActive &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2686,7 +2133,7 @@ PortableServer::POA::ServantNotActive::ServantNotActive (const PortableServer::P
 PortableServer::POA::ServantNotActive&
 PortableServer::POA::ServantNotActive::operator= (const PortableServer::POA::ServantNotActive &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2699,7 +2146,7 @@ void PortableServer::POA::ServantNotActive::_raise (void)
 PortableServer::POA::ServantNotActive_ptr
 PortableServer::POA::ServantNotActive::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc);
   else
     return 0;
@@ -2713,74 +2160,47 @@ CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::ServantNotActive &_tao_elem) // copying
 {
-  PortableServer::POA::ServantNotActive *_tao_any_val = new PortableServer::POA::ServantNotActive (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::ServantNotActive *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_ServantNotActive, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::ServantNotActive *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_ServantNotActive, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::ServantNotActive, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_ServantNotActive, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::ServantNotActive *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  52, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:1.0
-  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0),  // name = ServantNotActive
+  44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f53), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6e744e6f), ACE_NTOHL (0x74416374), ACE_NTOHL (0x6976653a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/POA/ServantNotActive:1.0
+  17, ACE_NTOHL (0x53657276), ACE_NTOHL (0x616e744e), ACE_NTOHL (0x6f744163), ACE_NTOHL (0x74697665), ACE_NTOHL (0xfdfdfd),  // name = ServantNotActive
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive
@@ -2791,7 +2211,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive = &_tc_TAO_tc_Port
 
 // default constructor
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
-  : CORBA_UserException (PortableServer::POA::_tc_WrongAdapter)
+  : CORBA_SystemException (PortableServer::POA::_tc_WrongAdapter, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2802,7 +2222,7 @@ PortableServer::POA::WrongAdapter::~WrongAdapter (void)
 
 // copy constructor
 PortableServer::POA::WrongAdapter::WrongAdapter (const PortableServer::POA::WrongAdapter &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2810,7 +2230,7 @@ PortableServer::POA::WrongAdapter::WrongAdapter (const PortableServer::POA::Wron
 PortableServer::POA::WrongAdapter&
 PortableServer::POA::WrongAdapter::operator= (const PortableServer::POA::WrongAdapter &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2823,7 +2243,7 @@ void PortableServer::POA::WrongAdapter::_raise (void)
 PortableServer::POA::WrongAdapter_ptr
 PortableServer::POA::WrongAdapter::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc);
   else
     return 0;
@@ -2837,74 +2257,47 @@ CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongAdapter &_tao_elem) // copying
 {
-  PortableServer::POA::WrongAdapter *_tao_any_val = new PortableServer::POA::WrongAdapter (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongAdapter *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_WrongAdapter, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::WrongAdapter *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_WrongAdapter, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongAdapter, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongAdapter, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::WrongAdapter *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  48, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:1.0
-  13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0x0),  // name = WrongAdapter
+  40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x41646170), ACE_NTOHL (0x7465723a), ACE_NTOHL (0x312e3000),  // repository ID = IDL:PortableServer/POA/WrongAdapter:1.0
+  13, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67416461), ACE_NTOHL (0x70746572), ACE_NTOHL (0xfdfdfd),  // name = WrongAdapter
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter
@@ -2915,7 +2308,7 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter = &_tc_TAO_tc_Portable
 
 // default constructor
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
-  : CORBA_UserException (PortableServer::POA::_tc_WrongPolicy)
+  : CORBA_SystemException (PortableServer::POA::_tc_WrongPolicy, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -2926,7 +2319,7 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void)
 
 // copy constructor
 PortableServer::POA::WrongPolicy::WrongPolicy (const PortableServer::POA::WrongPolicy &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -2934,7 +2327,7 @@ PortableServer::POA::WrongPolicy::WrongPolicy (const PortableServer::POA::WrongP
 PortableServer::POA::WrongPolicy&
 PortableServer::POA::WrongPolicy::operator= (const PortableServer::POA::WrongPolicy &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -2947,7 +2340,7 @@ void PortableServer::POA::WrongPolicy::_raise (void)
 PortableServer::POA::WrongPolicy_ptr
 PortableServer::POA::WrongPolicy::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc);
   else
     return 0;
@@ -2961,73 +2354,46 @@ CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::POA::WrongPolicy &_tao_elem) // copying
 {
-  PortableServer::POA::WrongPolicy *_tao_any_val = new PortableServer::POA::WrongPolicy (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::POA::WrongPolicy *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::POA::_tc_WrongPolicy, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::POA::WrongPolicy *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::POA::_tc_WrongPolicy, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::POA::WrongPolicy, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::POA::_tc_WrongPolicy, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::POA::WrongPolicy *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  47, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:1.0
+  39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f412f57), ACE_NTOHL (0x726f6e67), ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63793a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA/WrongPolicy:1.0
   12, ACE_NTOHL (0x57726f6e), ACE_NTOHL (0x67506f6c), ACE_NTOHL (0x69637900),  // name = WrongPolicy
   0, // member count
 };
@@ -3040,33 +2406,27 @@ CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy = &_tc_TAO_tc_PortableS
 CORBA::Boolean PortableServer::POA::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POA:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POA:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_POA[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POA:1.0
+  27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f50), ACE_NTOHL (0x4f413a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:PortableServer/POA:1.0
   4, ACE_NTOHL (0x504f4100),  // name = POA,
 };
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (CORBA::tk_objref,
-                                                      sizeof (_oc_PortableServer_POA),
-                                                      (char *) &_oc_PortableServer_POA,
-                                                      0,
-                                                      sizeof (PortableServer::POA));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_POA, &_tc_TAO_tc_PortableServer_POA)
-TAO_NAMESPACE_END
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (CORBA::tk_objref, sizeof
+                                                   (_oc_PortableServer_POA),
+                                                   (char *)
+                                                   &_oc_PortableServer_POA,
+                                                   0,
+                                                   sizeof
+                                                   (PortableServer::POA));
+CORBA::TypeCode_ptr PortableServer::_tc_POA = &_tc_TAO_tc_PortableServer_POA;
 
 PortableServer::Current_ptr PortableServer::Current::_duplicate (PortableServer::Current_ptr obj)
 {
@@ -3083,24 +2443,26 @@ PortableServer::Current_ptr PortableServer::Current::_narrow (
 {
   if (CORBA::is_nil (obj))
     return PortableServer::Current::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/PortableServer/Current:1.0", env))
+  if (!obj->_is_a ("IDL:PortableServer/Current:1.0", env))
     return PortableServer::Current::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/PortableServer/Current:1.0");
-  if (servant == 0)
-    return new PortableServer::Current(stub);
+  if (!obj->_is_collocated () || !obj->_servant())
+    {
+      PortableServer::Current_ptr new_obj = new PortableServer::Current(stub);
+      return new_obj;
+    } // end of if
+
+  void* servant = obj->_servant ()->_downcast ("IDL:PortableServer/Current:1.0");
   return new POA_PortableServer::_tao_collocated_Current(
-      ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant),
-      stub
-    );
+                                                         ACE_reinterpret_cast(POA_PortableServer::Current_ptr, servant),
+                                                         stub
+                                                         );
 }
 
 // default constructor
 PortableServer::Current::NoContext::NoContext (void)
-  : CORBA_UserException (PortableServer::Current::_tc_NoContext)
+  : CORBA_SystemException (PortableServer::Current::_tc_NoContext, 0xffff0000L, CORBA::COMPLETED_NO)
 {
 }
 
@@ -3111,7 +2473,7 @@ PortableServer::Current::NoContext::~NoContext (void)
 
 // copy constructor
 PortableServer::Current::NoContext::NoContext (const PortableServer::Current::NoContext &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+  : CORBA_SystemException (_tao_excp._type (), _tao_excp.minor (), _tao_excp.completed ())
 {
 }
 
@@ -3119,7 +2481,7 @@ PortableServer::Current::NoContext::NoContext (const PortableServer::Current::No
 PortableServer::Current::NoContext&
 PortableServer::Current::NoContext::operator= (const PortableServer::Current::NoContext &_tao_excp)
 {
-  this->CORBA_UserException::operator= (_tao_excp);
+  this->CORBA_SystemException::operator= (_tao_excp);
   return *this;
 }
 
@@ -3132,7 +2494,7 @@ void PortableServer::Current::NoContext::_raise (void)
 PortableServer::Current::NoContext_ptr
 PortableServer::Current::NoContext::_narrow (CORBA::Exception *exc)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
+  if (!ACE_OS::strcmp ("IDL:PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
     return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc);
   else
     return 0;
@@ -3146,74 +2508,47 @@ CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
 
 void operator<<= (CORBA::Any &_tao_any, const PortableServer::Current::NoContext &_tao_elem) // copying
 {
-  PortableServer::Current::NoContext *_tao_any_val = new PortableServer::Current::NoContext (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::Current::_tc_NoContext, &_tao_elem, 1, _tao_env);
 }
-
 void operator<<= (CORBA::Any &_tao_any, PortableServer::Current::NoContext *_tao_elem) // non copying
 {
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
+  CORBA::Environment _tao_env;
+  _tao_any.replace (PortableServer::Current::_tc_NoContext, _tao_elem, 0, _tao_env);
 }
-
 CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, PortableServer::Current::NoContext *&_tao_elem)
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (PortableServer::Current::_tc_NoContext, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (PortableServer::Current::NoContext *)_tao_any.value ();
-      return 1;
-    }
-    else
+  CORBA::Environment _tao_env;
+  CORBA::TypeCode_var type = _tao_any.type ();
+  if (!type->equal (PortableServer::Current::_tc_NoContext, _tao_env)) return 0; // not equal
+  if (_tao_any.any_owns_data ())
     {
       ACE_NEW_RETURN (_tao_elem, PortableServer::Current::NoContext, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (PortableServer::Current::_tc_NoContext, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (PortableServer::Current::_tc_NoContext, _tao_elem, 1, ACE_TRY_ENV);
-        ACE_TRY_CHECK;
-        return 1;
-      }
+      TAO_InputCDR stream ((ACE_Message_Block *)_tao_any.value ());
+      if (stream.decode (PortableServer::Current::_tc_NoContext, _tao_elem, 0, _tao_env)
+          == CORBA::TypeCode::TRAVERSE_CONTINUE)
+        {
+          ((CORBA::Any *)&_tao_any)->replace (PortableServer::Current::_tc_NoContext, _tao_elem, 1, _tao_env);
+          return 1;
+        }
       else
-      {
-        delete _tao_elem;
-      }
+        {
+          delete _tao_elem;
+          return 0;
+        }
+    }
+  else
+    {
+      _tao_elem = (PortableServer::Current::NoContext *)_tao_any.value ();
+      return 1;
     }
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_elem;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
 }
 
 static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
-  49, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e742f4e), ACE_NTOHL (0x6f436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:1.0
-  10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x74000000),  // name = NoContext
+  41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x506f7274), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x53657276), ACE_NTOHL (0x65722f43), ACE_NTOHL (0x75727265), ACE_NTOHL (0x6e742f4e), ACE_NTOHL (0x6f436f6e), ACE_NTOHL (0x74657874), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:PortableServer/Current/NoContext:1.0
+  10, ACE_NTOHL (0x4e6f436f), ACE_NTOHL (0x6e746578), ACE_NTOHL (0x7400fdfd),  // name = NoContext
   0, // member count
 };
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext
@@ -3222,79 +2557,43 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext
  (PortableServer::Current::NoContext));
 CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_PortableServer_Current_NoContext;
 
-PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV)
+PortableServer::POA_ptr  PortableServer::Current::get_POA (CORBA::Environment &env)
 {
-  ACE_THROW_RETURN (CORBA::MARSHAL (), PortableServer::POA::_nil ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  return PortableServer::POA::_nil ();
 }
 
-PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV)
+PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &env)
 {
-    static TAO_Exception_Data _tao_PortableServer_Current_get_object_id_exceptiondata [] =
+  static const TAO_Param_Data PortableServer_Current_get_object_id_paramdata [] =
   {
-    {PortableServer::Current::_tc_NoContext, PortableServer::Current::NoContext::_alloc}
+    {PortableServer::_tc_ObjectId, PARAM_RETURN, sizeof (PortableServer::ObjectId)}
   };
 
-  PortableServer::ObjectId *_tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
+  static const TAO_Call_Data PortableServer_Current_get_object_id_calldata =
+  {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata, 0, 0};
 
+  PortableServer::ObjectId *retval = 0;
 
-  ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval);
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "get_object_id",
-      TAO_ORB_Core_instance ()
-    );
+  void* _tao_arguments[1];
+  void** _tao_current_arg = _tao_arguments;
+  *_tao_current_arg = &retval; _tao_current_arg++;
+  this->_stubobj ()->do_static_call (env, &PortableServer_Current_get_object_id_calldata, _tao_arguments);
+  return retval;
 
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK_RETURN (_tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_PortableServer_Current_get_object_id_exceptiondata, 1, 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 PortableServer::Current::_is_a (const CORBA::Char *value, CORBA::Environment &_tao_environment)
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Current:1.0")) ||
       (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_environment))))
     return 1; // success using local knowledge
   else
     return this->CORBA_Object::_is_a (value, _tao_environment); // remote call
 }
 
-const char* PortableServer::Current::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/Current:1.0";
-}
-
 static const CORBA::Long _oc_PortableServer_Current[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 24cc2967911..deb5cbd3ff1 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -21,28 +21,15 @@
 #include "tao/PolicyC.h"
 #include "tao/CurrentC.h"
 #include "tao/Exception.h"
-#include "tao/Environment.h"
-#include "tao/CDR.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
 
 class TAO_ServantBase;
-class TAO_ServantBase_var;
-class TAO_RefCountServantBase;
 class TAO_Local_ServantBase;
 class TAO_DynamicImplementation;
 
-TAO_NAMESPACE PortableServer{
+class TAO_Export PortableServer{
+public:
 
   typedef TAO_ServantBase ServantBase;
-  typedef TAO_ServantBase_var ServantBase_var;
-  typedef TAO_RefCountServantBase RefCountServantBase;
   typedef ServantBase *Servant;
 
   typedef TAO_Local_ServantBase LocalServantBase;
@@ -98,7 +85,7 @@ TAO_NAMESPACE PortableServer{
   public:
     POA_out (POA_ptr &);
     POA_out (POA_var &);
-    POA_out (const POA_out &);
+    POA_out (POA_out &);
     POA_out &operator= (POA_out &);
     POA_out &operator= (const POA_var &);
     POA_out &operator= (POA_ptr);
@@ -121,7 +108,7 @@ TAO_NAMESPACE PortableServer{
 
   typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet;
   typedef _tao_seq_Octet* _tao_seq_Octet_ptr;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc__tao_seq_Octet;
+  static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
 
 #endif /* end #if !defined */
 
@@ -170,7 +157,7 @@ TAO_NAMESPACE PortableServer{
   public:
     _tao_seq_Octet_out (_tao_seq_Octet *&);
     _tao_seq_Octet_out (_tao_seq_Octet_var &);
-    _tao_seq_Octet_out (const _tao_seq_Octet_out &);
+    _tao_seq_Octet_out (_tao_seq_Octet_out &);
     _tao_seq_Octet_out &operator= (_tao_seq_Octet_out &);
     _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
     operator _tao_seq_Octet *&();
@@ -190,7 +177,7 @@ TAO_NAMESPACE PortableServer{
   typedef _tao_seq_Octet_var ObjectId_var;
   typedef _tao_seq_Octet_out ObjectId_out;
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ObjectId;
+  static CORBA::TypeCode_ptr _tc_ObjectId;
 
 
 #if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_)
@@ -205,7 +192,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
 
-  class TAO_Export ForwardRequest : public CORBA_UserException
+  class TAO_Export ForwardRequest : public CORBA_SystemException
   {
   public:
     ForwardRequest (void); // default ctor
@@ -224,43 +211,23 @@ TAO_NAMESPACE PortableServer{
 
     // = TAO extension
     static CORBA::Exception *_alloc (void);
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef ForwardRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception PortableServer::ForwardRequest
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest;
+  friend void operator<<= (CORBA::Any &, const ForwardRequest &); // copying version
+  friend void operator<<= (CORBA::Any &, ForwardRequest*); // noncopying version
+  friend CORBA::Boolean operator>>= (const CORBA::Any &, ForwardRequest *&);
+  static CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_UNIQUENESS_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong ID_ASSIGNMENT_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong IMPLICIT_ACTIVATION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong SERVANT_RETENTION_POLICY_ID;
-
-  TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong REQUEST_PROCESSING_POLICY_ID;
-
   enum ThreadPolicyValue
   {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
+  static CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_THREADPOLICY___PTR_CH_)
@@ -309,7 +276,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ThreadPolicy_out (ThreadPolicy_ptr &);
     ThreadPolicy_out (ThreadPolicy_var &);
-    ThreadPolicy_out (const ThreadPolicy_out &);
+    ThreadPolicy_out (ThreadPolicy_out &);
     ThreadPolicy_out &operator= (ThreadPolicy_out &);
     ThreadPolicy_out &operator= (const ThreadPolicy_var &);
     ThreadPolicy_out &operator= (ThreadPolicy_ptr);
@@ -326,28 +293,18 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
 
-  class TAO_Export ThreadPolicy: public virtual CORBA::Policy
+  class TAO_Export ThreadPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ThreadPolicy_ptr _ptr_type;
-    typedef ThreadPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ThreadPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ThreadPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual ThreadPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
-    ThreadPolicy (TAO_Stub *objref = 0,
+    ThreadPolicy (STUB_Object *objref = 0,
                   TAO_ServantBase *servant = 0,
                   CORBA::Boolean collocated = 0);
   public:
@@ -359,9 +316,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ThreadPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  static CORBA::TypeCode_ptr _tc_ThreadPolicy;
 
   enum LifespanPolicyValue
   {
@@ -369,7 +324,7 @@ TAO_NAMESPACE PortableServer{
     PERSISTENT
   };
   typedef LifespanPolicyValue &LifespanPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
+  static CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY___PTR_CH_)
@@ -418,7 +373,7 @@ TAO_NAMESPACE PortableServer{
   public:
     LifespanPolicy_out (LifespanPolicy_ptr &);
     LifespanPolicy_out (LifespanPolicy_var &);
-    LifespanPolicy_out (const LifespanPolicy_out &);
+    LifespanPolicy_out (LifespanPolicy_out &);
     LifespanPolicy_out &operator= (LifespanPolicy_out &);
     LifespanPolicy_out &operator= (const LifespanPolicy_var &);
     LifespanPolicy_out &operator= (LifespanPolicy_ptr);
@@ -435,29 +390,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
 
-  class TAO_Export LifespanPolicy: public virtual CORBA::Policy
+  class TAO_Export LifespanPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef LifespanPolicy_ptr _ptr_type;
-    typedef LifespanPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static LifespanPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static LifespanPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual LifespanPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     LifespanPolicy (
-                    TAO_Stub *objref = 0,
+                    STUB_Object *objref = 0,
                     TAO_ServantBase *servant = 0,
                     CORBA::Boolean collocated = 0
                     );
@@ -470,7 +415,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_LifespanPolicy;
+  static CORBA::TypeCode_ptr _tc_LifespanPolicy;
 
   enum IdUniquenessPolicyValue
   {
@@ -478,7 +423,7 @@ TAO_NAMESPACE PortableServer{
     MULTIPLE_ID
   };
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
+  static CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___PTR_CH_)
@@ -527,7 +472,7 @@ TAO_NAMESPACE PortableServer{
   public:
     IdUniquenessPolicy_out (IdUniquenessPolicy_ptr &);
     IdUniquenessPolicy_out (IdUniquenessPolicy_var &);
-    IdUniquenessPolicy_out (const IdUniquenessPolicy_out &);
+    IdUniquenessPolicy_out (IdUniquenessPolicy_out &);
     IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_out &);
     IdUniquenessPolicy_out &operator= (const IdUniquenessPolicy_var &);
     IdUniquenessPolicy_out &operator= (IdUniquenessPolicy_ptr);
@@ -544,29 +489,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
 
-  class TAO_Export IdUniquenessPolicy: public virtual CORBA::Policy
+  class TAO_Export IdUniquenessPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef IdUniquenessPolicy_ptr _ptr_type;
-    typedef IdUniquenessPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static IdUniquenessPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static IdUniquenessPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual IdUniquenessPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     IdUniquenessPolicy (
-                        TAO_Stub *objref = 0,
+                        STUB_Object *objref = 0,
                         TAO_ServantBase *servant = 0,
                         CORBA::Boolean collocated = 0
                         );
@@ -579,7 +514,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
+  static CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
 
   enum IdAssignmentPolicyValue
   {
@@ -587,7 +522,7 @@ TAO_NAMESPACE PortableServer{
     SYSTEM_ID
   };
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
+  static CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___PTR_CH_)
@@ -636,7 +571,7 @@ TAO_NAMESPACE PortableServer{
   public:
     IdAssignmentPolicy_out (IdAssignmentPolicy_ptr &);
     IdAssignmentPolicy_out (IdAssignmentPolicy_var &);
-    IdAssignmentPolicy_out (const IdAssignmentPolicy_out &);
+    IdAssignmentPolicy_out (IdAssignmentPolicy_out &);
     IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_out &);
     IdAssignmentPolicy_out &operator= (const IdAssignmentPolicy_var &);
     IdAssignmentPolicy_out &operator= (IdAssignmentPolicy_ptr);
@@ -653,29 +588,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
 
-  class TAO_Export IdAssignmentPolicy: public virtual CORBA::Policy
+  class TAO_Export IdAssignmentPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef IdAssignmentPolicy_ptr _ptr_type;
-    typedef IdAssignmentPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static IdAssignmentPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static IdAssignmentPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual IdAssignmentPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     IdAssignmentPolicy (
-                        TAO_Stub *objref = 0,
+                        STUB_Object *objref = 0,
                         TAO_ServantBase *servant = 0,
                         CORBA::Boolean collocated = 0
                         );
@@ -688,18 +613,15 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
+  static CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
 
   enum ImplicitActivationPolicyValue
   {
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
   };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
+  static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___PTR_CH_)
@@ -748,7 +670,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ImplicitActivationPolicy_out (ImplicitActivationPolicy_ptr &);
     ImplicitActivationPolicy_out (ImplicitActivationPolicy_var &);
-    ImplicitActivationPolicy_out (const ImplicitActivationPolicy_out &);
+    ImplicitActivationPolicy_out (ImplicitActivationPolicy_out &);
     ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_out &);
     ImplicitActivationPolicy_out &operator= (const ImplicitActivationPolicy_var &);
     ImplicitActivationPolicy_out &operator= (ImplicitActivationPolicy_ptr);
@@ -765,29 +687,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
 
-  class TAO_Export ImplicitActivationPolicy: public virtual CORBA::Policy
+  class TAO_Export ImplicitActivationPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ImplicitActivationPolicy_ptr _ptr_type;
-    typedef ImplicitActivationPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ImplicitActivationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ImplicitActivationPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual ImplicitActivationPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     ImplicitActivationPolicy (
-                              TAO_Stub *objref = 0,
+                              STUB_Object *objref = 0,
                               TAO_ServantBase *servant = 0,
                               CORBA::Boolean collocated = 0
                               );
@@ -800,20 +712,15 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  static CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
 
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
+  static CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___PTR_CH_)
@@ -862,7 +769,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ServantRetentionPolicy_out (ServantRetentionPolicy_ptr &);
     ServantRetentionPolicy_out (ServantRetentionPolicy_var &);
-    ServantRetentionPolicy_out (const ServantRetentionPolicy_out &);
+    ServantRetentionPolicy_out (ServantRetentionPolicy_out &);
     ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_out &);
     ServantRetentionPolicy_out &operator= (const ServantRetentionPolicy_var &);
     ServantRetentionPolicy_out &operator= (ServantRetentionPolicy_ptr);
@@ -879,29 +786,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
 
-  class TAO_Export ServantRetentionPolicy: public virtual CORBA::Policy
+  class TAO_Export ServantRetentionPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantRetentionPolicy_ptr _ptr_type;
-    typedef ServantRetentionPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ServantRetentionPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ServantRetentionPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual ServantRetentionPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     ServantRetentionPolicy (
-                            TAO_Stub *objref = 0,
+                            STUB_Object *objref = 0,
                             TAO_ServantBase *servant = 0,
                             CORBA::Boolean collocated = 0
                             );
@@ -914,9 +811,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
+  static CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
 
   enum RequestProcessingPolicyValue
   {
@@ -924,11 +819,8 @@ TAO_NAMESPACE PortableServer{
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
+  static CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
 
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___PTR_CH_)
@@ -977,7 +869,7 @@ TAO_NAMESPACE PortableServer{
   public:
     RequestProcessingPolicy_out (RequestProcessingPolicy_ptr &);
     RequestProcessingPolicy_out (RequestProcessingPolicy_var &);
-    RequestProcessingPolicy_out (const RequestProcessingPolicy_out &);
+    RequestProcessingPolicy_out (RequestProcessingPolicy_out &);
     RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_out &);
     RequestProcessingPolicy_out &operator= (const RequestProcessingPolicy_var &);
     RequestProcessingPolicy_out &operator= (RequestProcessingPolicy_ptr);
@@ -994,29 +886,19 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
 
-  class TAO_Export RequestProcessingPolicy: public virtual CORBA::Policy
+  class TAO_Export RequestProcessingPolicy: public virtual ACE_CORBA_1(Policy)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef RequestProcessingPolicy_ptr _ptr_type;
-    typedef RequestProcessingPolicy_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static RequestProcessingPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static RequestProcessingPolicy_ptr _nil (void);
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-    virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-#else
-    virtual RequestProcessingPolicyValue value (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     RequestProcessingPolicy (
-                             TAO_Stub *objref = 0,
+                             STUB_Object *objref = 0,
                              TAO_ServantBase *servant = 0,
                              CORBA::Boolean collocated = 0
                              );
@@ -1029,9 +911,114 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
+  static CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
+
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
+
+  enum SynchronizationPolicyValue
+  {
+    DEFAULT_LOCK,
+    NULL_LOCK,
+    THREAD_LOCK
+  };
+  typedef SynchronizationPolicyValue &SynchronizationPolicyValue_out;
+  static CORBA::TypeCode_ptr _tc_SynchronizationPolicyValue;
+
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___PTR_CH_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___PTR_CH_
+
+  class SynchronizationPolicy;
+  typedef SynchronizationPolicy *SynchronizationPolicy_ptr;
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CH_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CH_
+
+  class TAO_Export SynchronizationPolicy_var
+  {
+  public:
+    SynchronizationPolicy_var (void); // default constructor
+    SynchronizationPolicy_var (SynchronizationPolicy_ptr);
+    SynchronizationPolicy_var (const SynchronizationPolicy_var &); // copy constructor
+    ~SynchronizationPolicy_var (void); // destructor
+
+    SynchronizationPolicy_var &operator= (SynchronizationPolicy_ptr);
+    SynchronizationPolicy_var &operator= (const SynchronizationPolicy_var &);
+    SynchronizationPolicy_ptr operator-> (void) const;
+
+    operator const SynchronizationPolicy_ptr &() const;
+    operator SynchronizationPolicy_ptr &();
+    // in, inout, out, _retn
+    SynchronizationPolicy_ptr in (void) const;
+    SynchronizationPolicy_ptr &inout (void);
+    SynchronizationPolicy_ptr &out (void);
+    SynchronizationPolicy_ptr _retn (void);
+    SynchronizationPolicy_ptr ptr (void) const;
+
+  private:
+    SynchronizationPolicy_ptr ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CH_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CH_
+
+  class TAO_Export SynchronizationPolicy_out
+  {
+  public:
+    SynchronizationPolicy_out (SynchronizationPolicy_ptr &);
+    SynchronizationPolicy_out (SynchronizationPolicy_var &);
+    SynchronizationPolicy_out (SynchronizationPolicy_out &);
+    SynchronizationPolicy_out &operator= (SynchronizationPolicy_out &);
+    SynchronizationPolicy_out &operator= (const SynchronizationPolicy_var &);
+    SynchronizationPolicy_out &operator= (SynchronizationPolicy_ptr);
+    operator SynchronizationPolicy_ptr &();
+    SynchronizationPolicy_ptr &ptr (void);
+    SynchronizationPolicy_ptr operator-> (void);
+
+  private:
+    SynchronizationPolicy_ptr &ptr_;
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY_CH_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY_CH_
+
+  class TAO_Export SynchronizationPolicy: public virtual ACE_CORBA_1 (Policy)
+  {
+  public:
+    // the static operations
+    static SynchronizationPolicy_ptr _duplicate (SynchronizationPolicy_ptr obj);
+    static SynchronizationPolicy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    static SynchronizationPolicy_ptr _nil (void);
+
+    virtual SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  protected:
+    SynchronizationPolicy (
+                           STUB_Object *objref = 0,
+                           TAO_ServantBase *servant = 0,
+                           CORBA::Boolean collocated = 0
+                           );
+  public:
+    virtual ~SynchronizationPolicy (void);
+  private:
+    SynchronizationPolicy (const SynchronizationPolicy&);
+    void operator= (const SynchronizationPolicy&);
+  };
+
+#endif /* end #if !defined */
+
+  static CORBA::TypeCode_ptr _tc_SynchronizationPolicy;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
 #define _PORTABLESERVER_POAMANAGER___PTR_CH_
@@ -1079,7 +1066,7 @@ TAO_NAMESPACE PortableServer{
   public:
     POAManager_out (POAManager_ptr &);
     POAManager_out (POAManager_var &);
-    POAManager_out (const POAManager_out &);
+    POAManager_out (POAManager_out &);
     POAManager_out &operator= (POAManager_out &);
     POAManager_out &operator= (const POAManager_var &);
     POAManager_out &operator= (POAManager_ptr);
@@ -1099,21 +1086,9 @@ TAO_NAMESPACE PortableServer{
   class TAO_Export POAManager: public virtual ACE_CORBA_1 (Object)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef POAManager_ptr _ptr_type;
-    typedef POAManager_var _var_type;
-  #endif /* __GNUC__ */
-
-    enum State {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-
     // the static operations
     static POAManager_ptr _duplicate (POAManager_ptr obj);
-    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static POAManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static POAManager_ptr _nil (void);
 
 
@@ -1128,7 +1103,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
 
-    class TAO_Export AdapterInactive : public CORBA_UserException
+    class TAO_Export AdapterInactive : public CORBA_SystemException
     {
     public:
       AdapterInactive (void); // default ctor
@@ -1149,22 +1124,14 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-    virtual void  activate (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual State get_state (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual void  activate (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  hold_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  discard_requests (CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     POAManager (
-                TAO_Stub *objref = 0,
+                STUB_Object *objref = 0,
                 TAO_ServantBase *servant = 0,
                 CORBA::Boolean collocated = 0
                 );
@@ -1177,9 +1144,8 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POAManager;
+  static CORBA::TypeCode_ptr _tc_POAManager;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
@@ -1227,7 +1193,7 @@ TAO_NAMESPACE PortableServer{
   public:
     AdapterActivator_out (AdapterActivator_ptr &);
     AdapterActivator_out (AdapterActivator_var &);
-    AdapterActivator_out (const AdapterActivator_out &);
+    AdapterActivator_out (AdapterActivator_out &);
     AdapterActivator_out &operator= (AdapterActivator_out &);
     AdapterActivator_out &operator= (const AdapterActivator_var &);
     AdapterActivator_out &operator= (AdapterActivator_ptr);
@@ -1247,22 +1213,16 @@ TAO_NAMESPACE PortableServer{
   class TAO_Export AdapterActivator: public virtual ACE_CORBA_1 (Object)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterActivator_ptr _ptr_type;
-    typedef AdapterActivator_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static AdapterActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static AdapterActivator_ptr _nil (void);
 
-    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean  unknown_adapter (POA_ptr parent, const char *name, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     AdapterActivator (
-                      TAO_Stub *objref = 0,
+                      STUB_Object *objref = 0,
                       TAO_ServantBase *servant = 0,
                       CORBA::Boolean collocated = 0
                       );
@@ -1275,7 +1235,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AdapterActivator;
+  static CORBA::TypeCode_ptr _tc_AdapterActivator;
 
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER___PTR_CH_)
@@ -1325,7 +1285,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ServantManager_out (ServantManager_ptr &);
     ServantManager_out (ServantManager_var &);
-    ServantManager_out (const ServantManager_out &);
+    ServantManager_out (ServantManager_out &);
     ServantManager_out &operator= (ServantManager_out &);
     ServantManager_out &operator= (const ServantManager_var &);
     ServantManager_out &operator= (ServantManager_ptr);
@@ -1345,21 +1305,15 @@ TAO_NAMESPACE PortableServer{
   class TAO_Export ServantManager: public virtual ACE_CORBA_1 (Object)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantManager_ptr _ptr_type;
-    typedef ServantManager_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ServantManager_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ServantManager_ptr _nil (void);
 
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     ServantManager (
-                    TAO_Stub *objref = 0,
+                    STUB_Object *objref = 0,
                     TAO_ServantBase *servant = 0,
                     CORBA::Boolean collocated = 0
                     );
@@ -1372,7 +1326,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantManager;
+  static CORBA::TypeCode_ptr _tc_ServantManager;
 
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR___PTR_CH_)
@@ -1421,7 +1375,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ServantActivator_out (ServantActivator_ptr &);
     ServantActivator_out (ServantActivator_var &);
-    ServantActivator_out (const ServantActivator_out &);
+    ServantActivator_out (ServantActivator_out &);
     ServantActivator_out &operator= (ServantActivator_out &);
     ServantActivator_out &operator= (const ServantActivator_var &);
     ServantActivator_out &operator= (ServantActivator_ptr);
@@ -1441,23 +1395,17 @@ TAO_NAMESPACE PortableServer{
   class TAO_Export ServantActivator: public virtual ServantManager
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantActivator_ptr _ptr_type;
-    typedef ServantActivator_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ServantActivator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ServantActivator_ptr _nil (void);
 
-    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual Servant  incarnate (const ObjectId &oid, POA_ptr adapter, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  etherealize (const ObjectId &oid, POA_ptr adapter, Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     ServantActivator (
-                      TAO_Stub *objref = 0,
+                      STUB_Object *objref = 0,
                       TAO_ServantBase *servant = 0,
                       CORBA::Boolean collocated = 0
                       );
@@ -1470,7 +1418,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantActivator;
+  static CORBA::TypeCode_ptr _tc_ServantActivator;
 
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR___PTR_CH_)
@@ -1519,7 +1467,7 @@ TAO_NAMESPACE PortableServer{
   public:
     ServantLocator_out (ServantLocator_ptr &);
     ServantLocator_out (ServantLocator_var &);
-    ServantLocator_out (const ServantLocator_out &);
+    ServantLocator_out (ServantLocator_out &);
     ServantLocator_out &operator= (ServantLocator_out &);
     ServantLocator_out &operator= (const ServantLocator_var &);
     ServantLocator_out &operator= (ServantLocator_ptr);
@@ -1542,23 +1490,17 @@ TAO_NAMESPACE PortableServer{
 
     typedef void *Cookie;
 
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantLocator_ptr _ptr_type;
-    typedef ServantLocator_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static ServantLocator_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static ServantLocator_ptr _nil (void);
 
-    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual Servant  preinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie & the_cookie, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  postinvoke (const ObjectId &oid, POA_ptr adapter, const char *operation, Cookie the_cookie, Servant the_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     ServantLocator (
-                    TAO_Stub *objref = 0,
+                    STUB_Object *objref = 0,
                     TAO_ServantBase *servant = 0,
                     CORBA::Boolean collocated = 0
                     );
@@ -1571,9 +1513,8 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServantLocator;
+  static CORBA::TypeCode_ptr _tc_ServantLocator;
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
 #if !defined (_PORTABLESERVER_POA___PTR_CH_)
 #define _PORTABLESERVER_POA___PTR_CH_
@@ -1621,7 +1562,7 @@ TAO_NAMESPACE PortableServer{
   public:
     POA_out (POA_ptr &);
     POA_out (POA_var &);
-    POA_out (const POA_out &);
+    POA_out (POA_out &);
     POA_out &operator= (POA_out &);
     POA_out &operator= (const POA_var &);
     POA_out &operator= (POA_ptr);
@@ -1641,14 +1582,9 @@ TAO_NAMESPACE PortableServer{
   class TAO_Export POA: public virtual ACE_CORBA_1 (Object)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef POA_ptr _ptr_type;
-    typedef POA_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static POA_ptr _duplicate (POA_ptr obj);
-    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static POA_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static POA_ptr _nil (void);
 
 
@@ -1663,7 +1599,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
 
-    class TAO_Export AdapterAlreadyExists : public CORBA_UserException
+    class TAO_Export AdapterAlreadyExists : public CORBA_SystemException
     {
     public:
       AdapterAlreadyExists (void); // default ctor
@@ -1684,8 +1620,6 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_)
 #define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_
 
@@ -1697,7 +1631,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POA_ADAPTERINACTIVE_CH_
 
-    class TAO_Export AdapterInactive : public CORBA_UserException
+    class TAO_Export AdapterInactive : public CORBA_SystemException
     {
     public:
       AdapterInactive (void); // default ctor
@@ -1709,11 +1643,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterInactive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::AdapterInactive
 
     friend void operator<<= (CORBA::Any &, const AdapterInactive &); // copying version
@@ -1723,8 +1652,6 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_
 
@@ -1736,7 +1663,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
 
-    class TAO_Export AdapterNonExistent : public CORBA_UserException
+    class TAO_Export AdapterNonExistent : public CORBA_SystemException
     {
     public:
       AdapterNonExistent (void); // default ctor
@@ -1748,11 +1675,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef AdapterNonExistent_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::AdapterNonExistent
 
     friend void operator<<= (CORBA::Any &, const AdapterNonExistent &); // copying version
@@ -1773,7 +1695,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
 
-    class TAO_Export InvalidPolicy : public CORBA_UserException
+    class TAO_Export InvalidPolicy : public CORBA_SystemException
     {
     public:
       InvalidPolicy (void); // default ctor
@@ -1791,11 +1713,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef InvalidPolicy_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::InvalidPolicy
 
     friend void operator<<= (CORBA::Any &, const InvalidPolicy &); // copying version
@@ -1805,8 +1722,6 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_
 
@@ -1818,7 +1733,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
 
-    class TAO_Export NoServant : public CORBA_UserException
+    class TAO_Export NoServant : public CORBA_SystemException
     {
     public:
       NoServant (void); // default ctor
@@ -1830,11 +1745,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef NoServant_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::NoServant
 
     friend void operator<<= (CORBA::Any &, const NoServant &); // copying version
@@ -1844,8 +1754,6 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_
 
@@ -1857,7 +1765,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
 
-    class TAO_Export ObjectAlreadyActive : public CORBA_UserException
+    class TAO_Export ObjectAlreadyActive : public CORBA_SystemException
     {
     public:
       ObjectAlreadyActive (void); // default ctor
@@ -1869,11 +1777,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ObjectAlreadyActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::ObjectAlreadyActive
 
     friend void operator<<= (CORBA::Any &, const ObjectAlreadyActive &); // copying version
@@ -1894,7 +1797,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
 
-    class TAO_Export ObjectNotActive : public CORBA_UserException
+    class TAO_Export ObjectNotActive : public CORBA_SystemException
     {
     public:
       ObjectNotActive (void); // default ctor
@@ -1906,11 +1809,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ObjectNotActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::ObjectNotActive
 
     friend void operator<<= (CORBA::Any &, const ObjectNotActive &); // copying version
@@ -1931,7 +1829,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
 
-    class TAO_Export ServantAlreadyActive : public CORBA_UserException
+    class TAO_Export ServantAlreadyActive : public CORBA_SystemException
     {
     public:
       ServantAlreadyActive (void); // default ctor
@@ -1943,11 +1841,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantAlreadyActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::ServantAlreadyActive
 
     friend void operator<<= (CORBA::Any &, const ServantAlreadyActive &); // copying version
@@ -1968,7 +1861,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
 
-    class TAO_Export ServantNotActive : public CORBA_UserException
+    class TAO_Export ServantNotActive : public CORBA_SystemException
     {
     public:
       ServantNotActive (void); // default ctor
@@ -1980,11 +1873,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef ServantNotActive_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::ServantNotActive
 
     friend void operator<<= (CORBA::Any &, const ServantNotActive &); // copying version
@@ -2005,7 +1893,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
 
-    class TAO_Export WrongAdapter : public CORBA_UserException
+    class TAO_Export WrongAdapter : public CORBA_SystemException
     {
     public:
       WrongAdapter (void); // default ctor
@@ -2017,11 +1905,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef WrongAdapter_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::WrongAdapter
 
     friend void operator<<= (CORBA::Any &, const WrongAdapter &); // copying version
@@ -2042,7 +1925,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
 
-    class TAO_Export WrongPolicy : public CORBA_UserException
+    class TAO_Export WrongPolicy : public CORBA_SystemException
     {
     public:
       WrongPolicy (void); // default ctor
@@ -2054,11 +1937,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef WrongPolicy_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::POA::WrongPolicy
 
     friend void operator<<= (CORBA::Any &, const WrongPolicy &); // copying version
@@ -2068,59 +1946,49 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual char * the_name (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual POA_ptr  the_parent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual POAManager_ptr  the_POAManager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-    virtual AdapterActivator_ptr  the_activator (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual ServantManager_ptr  get_servant_manager (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual Servant  get_servant (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  set_servant (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual void  deactivate_object (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual POA_ptr  create_POA (const char *adapter_name, POAManager_ptr a_POAManager, const CORBA::PolicyList &policies, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual POA_ptr  find_POA (const char *adapter_name, CORBA::Boolean activate_it, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ThreadPolicy_ptr  create_thread_policy (ThreadPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual LifespanPolicy_ptr  create_lifespan_policy (LifespanPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual IdUniquenessPolicy_ptr  create_id_uniqueness_policy (IdUniquenessPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual IdAssignmentPolicy_ptr  create_id_assignment_policy (IdAssignmentPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ImplicitActivationPolicy_ptr  create_implicit_activation_policy (ImplicitActivationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ServantRetentionPolicy_ptr  create_servant_retention_policy (ServantRetentionPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual RequestProcessingPolicy_ptr  create_request_processing_policy (RequestProcessingPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+
+    // **************************************************
+    //
+    // TAO spcific POA locking policy (non-standard)
+    //
+    // **************************************************
+
+    virtual SynchronizationPolicy_ptr  create_synchronization_policy (SynchronizationPolicyValue value, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+
+    virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual POA_ptr  the_parent (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual POAManager_ptr  the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual AdapterActivator_ptr  the_activator (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void the_activator(AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ServantManager_ptr  get_servant_manager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  set_servant_manager (ServantManager_ptr imgr, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual Servant  get_servant (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  set_servant (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ObjectId * activate_object (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  activate_object_with_id (const ObjectId &id, Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual void  deactivate_object (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  create_reference (const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  create_reference_with_id (const ObjectId &oid, const char *intf, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ObjectId * servant_to_id (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  servant_to_reference (Servant p_servant, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual Servant  reference_to_servant (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual ObjectId * reference_to_id (CORBA::Object_ptr reference, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual Servant  id_to_servant (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Object_ptr  id_to_reference (const ObjectId &oid, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     POA (
-         TAO_Stub *objref = 0,
+         STUB_Object *objref = 0,
          TAO_ServantBase *servant = 0,
          CORBA::Boolean collocated = 0
          );
@@ -2133,7 +2001,7 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_POA;
+  static CORBA::TypeCode_ptr _tc_POA;
 
 
 #if !defined (_PORTABLESERVER_CURRENT___PTR_CH_)
@@ -2182,7 +2050,7 @@ TAO_NAMESPACE PortableServer{
   public:
     Current_out (Current_ptr &);
     Current_out (Current_var &);
-    Current_out (const Current_out &);
+    Current_out (Current_out &);
     Current_out &operator= (Current_out &);
     Current_out &operator= (const Current_var &);
     Current_out &operator= (Current_ptr);
@@ -2199,17 +2067,12 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
 
-  class TAO_Export Current: public virtual CORBA::Current
+  class TAO_Export Current: public virtual ACE_CORBA_1(Current)
   {
   public:
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef Current_ptr _ptr_type;
-    typedef Current_var _var_type;
-  #endif /* __GNUC__ */
-
     // the static operations
     static Current_ptr _duplicate (Current_ptr obj);
-    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+    static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     static Current_ptr _nil (void);
 
 
@@ -2224,7 +2087,7 @@ TAO_NAMESPACE PortableServer{
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
 
-    class TAO_Export NoContext : public CORBA_UserException
+    class TAO_Export NoContext : public CORBA_SystemException
     {
     public:
       NoContext (void); // default ctor
@@ -2236,11 +2099,6 @@ TAO_NAMESPACE PortableServer{
 
       // = TAO extension
       static CORBA::Exception *_alloc (void);
-
-  #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-    typedef NoContext_ptr _ptr_type;
-  #endif /* __GNUC__ */
-
     }; // exception PortableServer::Current::NoContext
 
     friend void operator<<= (CORBA::Any &, const NoContext &); // copying version
@@ -2250,13 +2108,12 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-    virtual POA_ptr  get_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual ObjectId * get_object_id (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
+    virtual POA_ptr  get_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual ObjectId * get_object_id (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual CORBA::Boolean _is_a (const CORBA::Char *type_id, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   protected:
     Current (
-             TAO_Stub *objref = 0,
+             STUB_Object *objref = 0,
              TAO_ServantBase *servant = 0,
              CORBA::Boolean collocated = 0
              );
@@ -2269,131 +2126,17 @@ TAO_NAMESPACE PortableServer{
 
 #endif /* end #if !defined */
 
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Current;
+  static CORBA::TypeCode_ptr _tc_Current;
 
-  TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
-  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
+  static char *ObjectId_to_string (const PortableServer::ObjectId &id);
+  static CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
+  static PortableServer::ObjectId *string_to_ObjectId (const char *id);
+  static PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
 
 };
 
 #if defined (__ACE_INLINE__)
 #include "POAC.i"
-#else
-
-// POA's policies.
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ThreadPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::LifespanPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicy_ptr &);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicy_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// POA's exceptions.
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterAlreadyExists &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterAlreadyExists*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterAlreadyExists *&);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterInactive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterInactive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterInactive *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::AdapterNonExistent &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::AdapterNonExistent*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::AdapterNonExistent *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::InvalidPolicy &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::InvalidPolicy*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectAlreadyActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectAlreadyActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectAlreadyActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ObjectNotActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ObjectNotActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ObjectNotActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantAlreadyActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantAlreadyActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantAlreadyActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::ServantNotActive &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::ServantNotActive*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::ServantNotActive *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongAdapter &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongAdapter*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongAdapter *&);
-void TAO_Export operator<<= (CORBA::Any &, const PortableServer::POA::WrongPolicy &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, PortableServer::POA::WrongPolicy*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&);
-
-// POA::Current && its exception.
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const PortableServer::Current_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, PortableServer::Current_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const PortableServer::Current::NoContext &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, PortableServer::Current::NoContext &);
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
 #endif /* TAO_IDL_POAC_H */
diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i
index e5797af0bd8..58b8246b725 100644
--- a/TAO/tao/POAC.i
+++ b/TAO/tao/POAC.i
@@ -141,8 +141,8 @@ PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor fro
 }
 
 ACE_INLINE
-PortableServer::POA_out::POA_out (const PortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POA_out&,p).ptr_)
+PortableServer::POA_out::POA_out (PortableServer::POA_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::POA_out &
@@ -337,8 +337,8 @@ PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq
 }
 
 ACE_INLINE
-PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (const PortableServer::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (_tao_seq_Octet_out&,p).ptr_)
+PortableServer::_tao_seq_Octet_out::_tao_seq_Octet_out (PortableServer::_tao_seq_Octet_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::_tao_seq_Octet_out &
@@ -382,11 +382,9 @@ PortableServer::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
 
 #endif // end #if !defined
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE
 PortableServer::ThreadPolicy::ThreadPolicy(
-                                           TAO_Stub *objref,
+                                           STUB_Object *objref,
                                            TAO_ServantBase *servant,
                                            CORBA::Boolean collocated
                                            )
@@ -507,6 +505,7 @@ PortableServer::ThreadPolicy_var::_retn (void)
 
 #endif // end #if !defined
 
+
 #if !defined (_PORTABLESERVER_THREADPOLICY___OUT_CI_)
 #define _PORTABLESERVER_THREADPOLICY___OUT_CI_
 
@@ -530,8 +529,8 @@ PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy
 }
 
 ACE_INLINE
-PortableServer::ThreadPolicy_out::ThreadPolicy_out (const PortableServer::ThreadPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ThreadPolicy_out&,p).ptr_)
+PortableServer::ThreadPolicy_out::ThreadPolicy_out (PortableServer::ThreadPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ThreadPolicy_out &
@@ -576,11 +575,9 @@ PortableServer::ThreadPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE
 PortableServer::LifespanPolicy::LifespanPolicy(
-                                               TAO_Stub *objref,
+                                               STUB_Object *objref,
                                                TAO_ServantBase *servant,
                                                CORBA::Boolean collocated
                                                )
@@ -725,8 +722,8 @@ PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::Lifespan
 }
 
 ACE_INLINE
-PortableServer::LifespanPolicy_out::LifespanPolicy_out (const PortableServer::LifespanPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (LifespanPolicy_out&,p).ptr_)
+PortableServer::LifespanPolicy_out::LifespanPolicy_out (PortableServer::LifespanPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::LifespanPolicy_out &
@@ -773,7 +770,7 @@ PortableServer::LifespanPolicy_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::IdUniquenessPolicy::IdUniquenessPolicy(
-                                                       TAO_Stub *objref,
+                                                       STUB_Object *objref,
                                                        TAO_ServantBase *servant,
                                                        CORBA::Boolean collocated
                                                        )
@@ -918,8 +915,8 @@ PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::
 }
 
 ACE_INLINE
-PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (const PortableServer::IdUniquenessPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdUniquenessPolicy_out&,p).ptr_)
+PortableServer::IdUniquenessPolicy_out::IdUniquenessPolicy_out (PortableServer::IdUniquenessPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::IdUniquenessPolicy_out &
@@ -966,7 +963,7 @@ PortableServer::IdUniquenessPolicy_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::IdAssignmentPolicy::IdAssignmentPolicy(
-                                                       TAO_Stub *objref,
+                                                       STUB_Object *objref,
                                                        TAO_ServantBase *servant,
                                                        CORBA::Boolean collocated
                                                        )
@@ -1111,8 +1108,8 @@ PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::
 }
 
 ACE_INLINE
-PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (const PortableServer::IdAssignmentPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (IdAssignmentPolicy_out&,p).ptr_)
+PortableServer::IdAssignmentPolicy_out::IdAssignmentPolicy_out (PortableServer::IdAssignmentPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::IdAssignmentPolicy_out &
@@ -1157,11 +1154,9 @@ PortableServer::IdAssignmentPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy(
-                                                                   TAO_Stub *objref,
+                                                                   STUB_Object *objref,
                                                                    TAO_ServantBase *servant,
                                                                    CORBA::Boolean collocated
                                                                    )
@@ -1306,8 +1301,8 @@ PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (Port
 }
 
 ACE_INLINE
-PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (const PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ImplicitActivationPolicy_out&,p).ptr_)
+PortableServer::ImplicitActivationPolicy_out::ImplicitActivationPolicy_out (PortableServer::ImplicitActivationPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ImplicitActivationPolicy_out &
@@ -1354,7 +1349,7 @@ PortableServer::ImplicitActivationPolicy_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::ServantRetentionPolicy::ServantRetentionPolicy(
-                                                               TAO_Stub *objref,
+                                                               STUB_Object *objref,
                                                                TAO_ServantBase *servant,
                                                                CORBA::Boolean collocated
                                                                )
@@ -1499,8 +1494,8 @@ PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (Portable
 }
 
 ACE_INLINE
-PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (const PortableServer::ServantRetentionPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantRetentionPolicy_out&,p).ptr_)
+PortableServer::ServantRetentionPolicy_out::ServantRetentionPolicy_out (PortableServer::ServantRetentionPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ServantRetentionPolicy_out &
@@ -1547,7 +1542,7 @@ PortableServer::ServantRetentionPolicy_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::RequestProcessingPolicy::RequestProcessingPolicy(
-                                                                 TAO_Stub *objref,
+                                                                 STUB_Object *objref,
                                                                  TAO_ServantBase *servant,
                                                                  CORBA::Boolean collocated
                                                                  )
@@ -1692,8 +1687,8 @@ PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (Portab
 }
 
 ACE_INLINE
-PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (const PortableServer::RequestProcessingPolicy_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (RequestProcessingPolicy_out&,p).ptr_)
+PortableServer::RequestProcessingPolicy_out::RequestProcessingPolicy_out (PortableServer::RequestProcessingPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::RequestProcessingPolicy_out &
@@ -1738,11 +1733,208 @@ PortableServer::RequestProcessingPolicy_out::operator-> (void)
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy::SynchronizationPolicy(
+                                                             STUB_Object *objref,
+                                                             TAO_ServantBase *servant,
+                                                             CORBA::Boolean collocated
+                                                             )
+  : ACE_CORBA_1 (Object) (objref, servant, collocated)
+{}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy::~SynchronizationPolicy (void) // destructor
+{}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy::_nil (void)
+{
+  return (PortableServer::SynchronizationPolicy_ptr)0;
+}
+
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CI_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___VAR_CI_
+
+// *************************************************************
+// Inline operations for class PortableServer::SynchronizationPolicy_var
+// *************************************************************
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (void) // default constructor
+  : ptr_ (PortableServer::SynchronizationPolicy::_nil ())
+{}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (PortableServer::SynchronizationPolicy_ptr p)
+  : ptr_ (p)
+{}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy_var::ptr (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::SynchronizationPolicy_var (const PortableServer::SynchronizationPolicy_var &p) // copy constructor
+  : ptr_ (PortableServer::SynchronizationPolicy::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::~SynchronizationPolicy_var (void) // destructor
+{
+  CORBA::release (this->ptr_);
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_var &
+PortableServer::SynchronizationPolicy_var::operator= (PortableServer::SynchronizationPolicy_ptr p)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_var &
+PortableServer::SynchronizationPolicy_var::operator= (const PortableServer::SynchronizationPolicy_var &p)
+{
+  if (this != &p)
+    {
+      CORBA::release (this->ptr_);
+      this->ptr_ = PortableServer::SynchronizationPolicy::_duplicate (p.ptr ());
+    }
+  return *this;
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::operator const PortableServer::SynchronizationPolicy_ptr &() const // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_var::operator PortableServer::SynchronizationPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy_var::operator-> (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy_var::in (void) const
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
+PortableServer::SynchronizationPolicy_var::inout (void)
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
+PortableServer::SynchronizationPolicy_var::out (void)
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy_var::_retn (void)
+{
+  // yield ownership of managed obj reference
+  PortableServer::SynchronizationPolicy_ptr val = this->ptr_;
+  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
+  return val;
+}
+
+
+#endif // end #if !defined
+
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CI_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___OUT_CI_
+
+// *************************************************************
+// Inline operations for class PortableServer::SynchronizationPolicy_out
+// *************************************************************
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_ptr &p)
+  : ptr_ (p)
+{
+  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_var &p) // constructor from _var
+  : ptr_ (p.out ())
+{
+  CORBA::release (this->ptr_);
+  this->ptr_ = PortableServer::SynchronizationPolicy::_nil ();
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_out::SynchronizationPolicy_out (PortableServer::SynchronizationPolicy_out &p) // copy constructor
+  : ptr_ (p.ptr_)
+{}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_out &
+PortableServer::SynchronizationPolicy_out::operator= (PortableServer::SynchronizationPolicy_out &p)
+{
+  this->ptr_ = p.ptr_;
+  return *this;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_out &
+PortableServer::SynchronizationPolicy_out::operator= (const PortableServer::SynchronizationPolicy_var &p)
+{
+  this->ptr_ = PortableServer::SynchronizationPolicy::_duplicate (p.ptr ());
+  return *this;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_out &
+PortableServer::SynchronizationPolicy_out::operator= (PortableServer::SynchronizationPolicy_ptr p)
+{
+  this->ptr_ = p;
+  return *this;
+}
+
+ACE_INLINE
+PortableServer::SynchronizationPolicy_out::operator PortableServer::SynchronizationPolicy_ptr &() // cast
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr &
+PortableServer::SynchronizationPolicy_out::ptr (void) // ptr
+{
+  return this->ptr_;
+}
+
+ACE_INLINE PortableServer::SynchronizationPolicy_ptr
+PortableServer::SynchronizationPolicy_out::operator-> (void)
+{
+  return this->ptr_;
+}
+
+
+#endif // end #if !defined
 
 ACE_INLINE
 PortableServer::POAManager::POAManager(
-                                       TAO_Stub *objref,
+                                       STUB_Object *objref,
                                        TAO_ServantBase *servant,
                                        CORBA::Boolean collocated
                                        )
@@ -1887,8 +2079,8 @@ PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_var &
 }
 
 ACE_INLINE
-PortableServer::POAManager_out::POAManager_out (const PortableServer::POAManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POAManager_out&,p).ptr_)
+PortableServer::POAManager_out::POAManager_out (PortableServer::POAManager_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::POAManager_out &
@@ -1933,11 +2125,9 @@ PortableServer::POAManager_out::operator-> (void)
 
 #endif // end #if !defined
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 ACE_INLINE
 PortableServer::AdapterActivator::AdapterActivator(
-                                                   TAO_Stub *objref,
+                                                   STUB_Object *objref,
                                                    TAO_ServantBase *servant,
                                                    CORBA::Boolean collocated
                                                    )
@@ -2082,8 +2272,8 @@ PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::Adap
 }
 
 ACE_INLINE
-PortableServer::AdapterActivator_out::AdapterActivator_out (const PortableServer::AdapterActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (AdapterActivator_out&,p).ptr_)
+PortableServer::AdapterActivator_out::AdapterActivator_out (PortableServer::AdapterActivator_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::AdapterActivator_out &
@@ -2130,7 +2320,7 @@ PortableServer::AdapterActivator_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::ServantManager::ServantManager(
-                                               TAO_Stub *objref,
+                                               STUB_Object *objref,
                                                TAO_ServantBase *servant,
                                                CORBA::Boolean collocated
                                                )
@@ -2275,8 +2465,8 @@ PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantM
 }
 
 ACE_INLINE
-PortableServer::ServantManager_out::ServantManager_out (const PortableServer::ServantManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantManager_out&,p).ptr_)
+PortableServer::ServantManager_out::ServantManager_out (PortableServer::ServantManager_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ServantManager_out &
@@ -2323,7 +2513,7 @@ PortableServer::ServantManager_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::ServantActivator::ServantActivator(
-                                                   TAO_Stub *objref,
+                                                   STUB_Object *objref,
                                                    TAO_ServantBase *servant,
                                                    CORBA::Boolean collocated
                                                    )
@@ -2468,8 +2658,8 @@ PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::Serv
 }
 
 ACE_INLINE
-PortableServer::ServantActivator_out::ServantActivator_out (const PortableServer::ServantActivator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantActivator_out&,p).ptr_)
+PortableServer::ServantActivator_out::ServantActivator_out (PortableServer::ServantActivator_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ServantActivator_out &
@@ -2516,7 +2706,7 @@ PortableServer::ServantActivator_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::ServantLocator::ServantLocator(
-                                               TAO_Stub *objref,
+                                               STUB_Object *objref,
                                                TAO_ServantBase *servant,
                                                CORBA::Boolean collocated
                                                )
@@ -2661,8 +2851,8 @@ PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantL
 }
 
 ACE_INLINE
-PortableServer::ServantLocator_out::ServantLocator_out (const PortableServer::ServantLocator_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (ServantLocator_out&,p).ptr_)
+PortableServer::ServantLocator_out::ServantLocator_out (PortableServer::ServantLocator_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::ServantLocator_out &
@@ -2707,11 +2897,9 @@ PortableServer::ServantLocator_out::operator-> (void)
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 ACE_INLINE
 PortableServer::POA::POA(
-                         TAO_Stub *objref,
+                         STUB_Object *objref,
                          TAO_ServantBase *servant,
                          CORBA::Boolean collocated
                          )
@@ -2850,8 +3038,8 @@ PortableServer::POA_out::POA_out (PortableServer::POA_var &p) // constructor fro
 }
 
 ACE_INLINE
-PortableServer::POA_out::POA_out (const PortableServer::POA_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (POA_out&,p).ptr_)
+PortableServer::POA_out::POA_out (PortableServer::POA_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::POA_out &
@@ -2898,7 +3086,7 @@ PortableServer::POA_out::operator-> (void)
 
 ACE_INLINE
 PortableServer::Current::Current(
-                                 TAO_Stub *objref,
+                                 STUB_Object *objref,
                                  TAO_ServantBase *servant,
                                  CORBA::Boolean collocated
                                  )
@@ -3043,8 +3231,8 @@ PortableServer::Current_out::Current_out (PortableServer::Current_var &p) // con
 }
 
 ACE_INLINE
-PortableServer::Current_out::Current_out (const PortableServer::Current_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (Current_out&,p).ptr_)
+PortableServer::Current_out::Current_out (PortableServer::Current_out &p) // copy constructor
+  : ptr_ (p.ptr_)
 {}
 
 ACE_INLINE PortableServer::Current_out &
@@ -3086,813 +3274,5 @@ PortableServer::Current_out::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
 
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_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;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ThreadPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ThreadPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ThreadPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ThreadPolicy_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 =
-      PortableServer::ThreadPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* end #if !defined */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_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 PortableServer::LifespanPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::LifespanPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::LifespanPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::LifespanPolicy_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 =
-      PortableServer::LifespanPolicy::_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 PortableServer::IdUniquenessPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_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 PortableServer::IdUniquenessPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::IdUniquenessPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::IdUniquenessPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::IdUniquenessPolicy_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 =
-      PortableServer::IdUniquenessPolicy::_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 PortableServer::IdAssignmentPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_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 PortableServer::IdAssignmentPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::IdAssignmentPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::IdAssignmentPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::IdAssignmentPolicy_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 =
-      PortableServer::IdAssignmentPolicy::_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 PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_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;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ImplicitActivationPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ImplicitActivationPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ImplicitActivationPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ImplicitActivationPolicy_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 =
-      PortableServer::ImplicitActivationPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
-
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_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;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::ServantRetentionPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::ServantRetentionPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ServantRetentionPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ServantRetentionPolicy_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 =
-      PortableServer::ServantRetentionPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_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;
-}
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::RequestProcessingPolicy_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::RequestProcessingPolicy_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::RequestProcessingPolicy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::RequestProcessingPolicy_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 =
-      PortableServer::RequestProcessingPolicy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterAlreadyExists &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterInactive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterInactive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::AdapterNonExistent &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::AdapterNonExistent &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::InvalidPolicy &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.index)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::InvalidPolicy &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if (
-      (strm >> _tao_aggregate.index)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::NoServant &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::NoServant &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-#endif /* !defined (TAO_HAS_MINIMUM_CORBA) */
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectAlreadyActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ObjectNotActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ObjectNotActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantAlreadyActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantAlreadyActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::ServantNotActive &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::ServantNotActive &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongAdapter &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongAdapter &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POA::WrongPolicy &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::POA::WrongPolicy &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::Current_ptr
-  );
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &,
-    PortableServer::Current_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::Current::NoContext &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::Current::NoContext &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::Current_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-ACE_INLINE CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::Current_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 =
-      PortableServer::Current::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
 #endif // end #if !defined
diff --git a/TAO/tao/POAManager.cpp b/TAO/tao/POAManager.cpp
deleted file mode 100644
index c0c33655349..00000000000
--- a/TAO/tao/POAManager.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// $Id$
-
-#include "tao/POAManager.h"
-#include "tao/POA.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/poa_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_POA_Manager::TAO_POA_Manager (ACE_Lock &lock)
-  : state_ (PortableServer::POAManager::HOLDING),
-    lock_ (lock),
-    poa_collection_ ()
-{
-}
-
-TAO_POA_Manager::~TAO_POA_Manager (void)
-{
-}
-
-void
-TAO_POA_Manager::activate_i (CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation changes the state of the POA manager to active. If
-  // issued while the POA manager is in the inactive state, the
-  // AdapterInactive exception is raised.  Entering the active state
-  // enables the associated POAs to process requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::ACTIVE;
-    }
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-void
-TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation changes the state of the POA manager to
-  // holding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // holding state causes the associated POAs to queue incoming
-  // requests.  Any requests that have been queued but have not
-  // started executing will continue to be queued while in the holding
-  // state.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::HOLDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE, this operation does not return until either there are no
-  // actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) or the state of the POA
-  // manager is changed to a state other than holding.
-
-  ACE_UNUSED_ARG (wait_for_completion);
-}
-
-void
-TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion,
-                                     CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation changes the state of the POA manager to
-  // discarding. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // discarding state causes the associated POAs to discard incoming
-  // requests.  In addition, any requests that have been queued but
-  // have not started executing are discarded. When a request is
-  // discarded, a TRANSIENT system exception is returned to the
-  // client.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::DISCARDING;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // returns immediately after changing the state. If the parameter is
-  // TRUE, this operation does not return until either there are no
-  // actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) or the state of the POA
-  // manager is changed to a state other than discarding.
-
-  ACE_UNUSED_ARG (wait_for_completion);
-}
-
-void
-TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
-                               CORBA::Boolean wait_for_completion,
-                               CORBA::Environment &ACE_TRY_ENV)
-{
-  // This operation changes the state of the POA manager to
-  // inactive. If issued while the POA manager is in the inactive
-  // state, the AdapterInactive exception is raised.  Entering the
-  // inactive state causes the associated POAs to reject requests that
-  // have not begun to be executed as well as any new requests.
-
-  if (this->state_ == PortableServer::POAManager::INACTIVE)
-    {
-      ACE_THROW (PortableServer::POAManager::AdapterInactive ());
-    }
-  else
-    {
-      this->state_ = PortableServer::POAManager::INACTIVE;
-    }
-
-  // After changing the state, if the etherealize_objects parameter is:
-  //
-  // a) TRUE - the POA manager will cause all associated POAs that
-  // have the RETAIN and USE_SERVANT_MANAGER policies to perform the
-  // etherealize operation on the associated servant manager for all
-  // active objects.
-  //
-  // b) FALSE - the etherealize operation is not called. The purpose
-  // is to provide developers with a means to shut down POAs in a
-  // crisis (for example, unrecoverable error) situation.
-
-  for (POA_COLLECTION::iterator iterator = this->poa_collection_.begin ();
-       iterator != this->poa_collection_.end ();
-       ++iterator)
-    {
-      TAO_POA *poa = *iterator;
-      poa->deactivate_all_objects_i (etherealize_objects,
-                                     ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  // If the wait_for_completion parameter is FALSE, this operation
-  // will return immediately after changing the state. If the
-  // parameter is TRUE, this operation does not return until there are
-  // no actively executing requests in any of the POAs associated with
-  // this POA manager (that is, all requests that were started prior
-  // to the state change have completed) and, in the case of a TRUE
-  // etherealize_objects, all invocations of etherealize have
-  // completed for POAs having the RETAIN and USE_SERVANT_MANAGER
-  // policies.
-
-  // 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.
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-int
-TAO_POA_Manager::remove_poa (TAO_POA *poa)
-{
-  int result = this->poa_collection_.remove (poa);
-
-  if (result == 0)
-    {
-      if (this->poa_collection_.is_empty ())
-        {
-          // @@ This may cause segfault if another thread gets a hold
-          // at this POAManager but gets blocked on register POA
-          // waiting for remove_poa to complete.  I think we need to
-          // use the client side mapping to refcount this.
-          delete this;
-        }
-    }
-
-  return result;
-}
-
-int
-TAO_POA_Manager::register_poa (TAO_POA *poa)
-{
-  return this->poa_collection_.insert (poa);
-}
diff --git a/TAO/tao/POAManager.h b/TAO/tao/POAManager.h
deleted file mode 100644
index e3b71040452..00000000000
--- a/TAO/tao/POAManager.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    POAManager.h
-//
-// = DESCRIPTION
-//     POAManager
-//
-// = AUTHOR
-//     Irfan Pyarali
-//
-// ============================================================================
-
-#ifndef TAO_POAMANAGER_H
-#define TAO_POAMANAGER_H
-
-#include "tao/POAS.h"
-// for POA skeleton.
-
-#include "tao/poa_macros.h"
-
-class TAO_POA;
-// Forward decl.
-
-class TAO_Export TAO_POA_Manager : public POA_PortableServer::POAManager
-{
-  friend class TAO_POA;
-
-public:
-
-  void activate (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void hold_requests (CORBA::Boolean wait_for_completion,
-                      CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  void discard_requests (CORBA::Boolean wait_for_completion,
-                         CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  void deactivate (CORBA::Boolean etherealize_objects,
-                   CORBA::Boolean wait_for_completion,
-                   CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::POAManager::State get_state (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-
-  TAO_POA_Manager (ACE_Lock &lock);
-
-  ~TAO_POA_Manager (void);
-
-protected:
-
-  void activate_i (CORBA_Environment &ACE_TRY_ENV);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  void hold_requests_i (CORBA::Boolean wait_for_completion,
-                        CORBA_Environment &ACE_TRY_ENV);
-
-  void discard_requests_i (CORBA::Boolean wait_for_completion,
-                           CORBA_Environment &ACE_TRY_ENV);
-
-  void deactivate_i (CORBA::Boolean etherealize_objects,
-                     CORBA::Boolean wait_for_completion,
-                     CORBA_Environment &ACE_TRY_ENV);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  PortableServer::POAManager::State get_state_i ();
-
-  ACE_Lock &lock (void);
-
-  int remove_poa (TAO_POA *poa);
-
-  int register_poa (TAO_POA *poa);
-
-  PortableServer::POAManager::State state_;
-
-  ACE_Lock &lock_;
-
-  typedef ACE_Unbounded_Set<TAO_POA *> POA_COLLECTION;
-
-  POA_COLLECTION poa_collection_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/POAManager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_POAMANAGER_H */
diff --git a/TAO/tao/POAManager.i b/TAO/tao/POAManager.i
deleted file mode 100644
index c8ce24fe58a..00000000000
--- a/TAO/tao/POAManager.i
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-
-#include "tao/Environment.h"
-
-ACE_INLINE ACE_Lock &
-TAO_POA_Manager::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE void
-TAO_POA_Manager::activate (CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
-
-  this->activate_i (ACE_TRY_ENV);
-}
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-ACE_INLINE void
-TAO_POA_Manager::hold_requests (CORBA::Boolean wait_for_completion,
-                                CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
-
-  this->hold_requests_i (wait_for_completion, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::discard_requests (CORBA::Boolean wait_for_completion,
-                                   CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
-
-  this->discard_requests_i (wait_for_completion, ACE_TRY_ENV);
-}
-
-ACE_INLINE void
-TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects,
-                             CORBA::Boolean wait_for_completion,
-                             CORBA_Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD (ACE_Lock, monitor, this->lock (), ACE_TRY_ENV);
-
-  this->deactivate_i (etherealize_objects,
-                      wait_for_completion,
-                      ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state_i (void)
-{
-  return this->state_;
-}
-
-ACE_INLINE PortableServer::POAManager::State
-TAO_POA_Manager::get_state (CORBA::Environment &ACE_TRY_ENV)
-{
-  // Lock access to the POAManager for the duration of this transaction
-  TAO_POA_GUARD_RETURN (ACE_Lock, monitor, this->lock (), this->state_, ACE_TRY_ENV);
-
-  return this->get_state_i ();
-}
diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp
index a7b9ade3008..ea7794bdf09 100644
--- a/TAO/tao/POAS.cpp
+++ b/TAO/tao/POAS.cpp
@@ -11,7 +11,6 @@
 #include "tao/Server_Request.h"
 #include "tao/Operation_Table.h"
 #include "tao/ORB_Core.h"
-#include "tao/ORB.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/POAS.i"
@@ -19,126 +18,68 @@
 
 ACE_RCSID(tao, POAS, "$Id$")
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ThreadPolicy_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);
+static const TAO_operation_db_entry PortableServer_ThreadPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::ThreadPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::ThreadPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::ThreadPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ThreadPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::ThreadPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::ThreadPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ThreadPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::ThreadPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::ThreadPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::ThreadPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::ThreadPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ThreadPolicy_Perfect_Hash_OpTable tao_PortableServer_ThreadPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_ThreadPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_ThreadPolicy_optable_pool [_tao_PortableServer_ThreadPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ThreadPolicy_allocator (_tao_PortableServer_ThreadPolicy_optable_pool, _tao_PortableServer_ThreadPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ThreadPolicy_optable (PortableServer_ThreadPolicy_operations, 5, 10, &_tao_PortableServer_ThreadPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::ThreadPolicy::ThreadPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_ThreadPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ThreadPolicy::_get_value_skel (
                                                         CORBA::ServerRequest &_tao_server_request,
                                                         void *_tao_object_reference,
                                                         void * /* context */,
-                                                        CORBA::Environment &ACE_TRY_ENV
+                                                        CORBA::Environment &_tao_orb_environment
                                                         )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_ThreadPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ThreadPolicyValue, 0, 0}
+  }; // PortableServer_ThreadPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ThreadPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ThreadPolicy_value_paramdata};
+
   POA_PortableServer::ThreadPolicy *_tao_impl = (POA_PortableServer::ThreadPolicy *)_tao_object_reference;
   PortableServer::ThreadPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_ThreadPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_ThreadPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::ThreadPolicy::_is_a_skel (
                                                    CORBA::ServerRequest &_tao_server_request,
                                                    void * _tao_object_reference,
                                                    void * /*context*/,
-                                                   CORBA::Environment &ACE_TRY_ENV
+                                                   CORBA::Environment &_tao_orb_environment
                                                    )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -148,55 +89,34 @@ void POA_PortableServer::ThreadPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_ThreadPolicy_is_a_paramdata};
   POA_PortableServer::ThreadPolicy_ptr  _tao_impl = (POA_PortableServer::ThreadPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ThreadPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ThreadPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ThreadPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ThreadPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_ThreadPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ThreadPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ThreadPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::ThreadPolicy::_is_a (
                                                         const char* value,
-                                                        CORBA::Environment &ACE_TRY_ENV
+                                                        CORBA::Environment &_tao_orb_environment
                                                         )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ThreadPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ThreadPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -206,37 +126,37 @@ void* POA_PortableServer::ThreadPolicy::_downcast (
                                                    const char* logical_type_id
                                                    )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ThreadPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ThreadPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ThreadPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ThreadPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
+  return "IDL:PortableServer/ThreadPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ThreadPolicy::_tao_collocated_ThreadPolicy (
                                                                                 POA_PortableServer::ThreadPolicy_ptr  servant,
-                                                                                TAO_Stub *stub
+                                                                                STUB_Object *stub
                                                                                 )
   : ACE_NESTED_CLASS (PortableServer, ThreadPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -252,179 +172,120 @@ POA_PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_ThreadP
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ThreadPolicy::_is_a (
                                                                         const char* logical_type_id,
-                                                                        CORBA::Environment &ACE_TRY_ENV
+                                                                        CORBA::Environment &_tao_orb_environment
                                                                         )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ThreadPolicy::copy (
-                                                                          CORBA::Environment &ACE_TRY_ENV
+                                                                          CORBA::Environment &_tao_orb_environment
                                                                           )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_ThreadPolicy::destroy (
-                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                CORBA::Environment &_tao_orb_environment
                                                                 )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_ThreadPolicy::policy_type (
-                                                                                 CORBA::Environment &ACE_TRY_ENV
+                                                                                 CORBA::Environment &_tao_orb_environment
                                                                                  )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::ThreadPolicyValue
 POA_PortableServer::_tao_collocated_ThreadPolicy::value (
-                                                         CORBA::Environment &ACE_TRY_ENV
+                                                         CORBA::Environment &_tao_orb_environment
                                                          )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::ThreadPolicy*
 POA_PortableServer::ThreadPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ThreadPolicy (this, stub);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_LifespanPolicy_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);
+static const TAO_operation_db_entry PortableServer_LifespanPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::LifespanPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::LifespanPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::LifespanPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::LifespanPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::LifespanPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::LifespanPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::LifespanPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::LifespanPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::LifespanPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::LifespanPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::LifespanPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_LifespanPolicy_Perfect_Hash_OpTable tao_PortableServer_LifespanPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_LifespanPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_LifespanPolicy_optable_pool [_tao_PortableServer_LifespanPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_LifespanPolicy_allocator (_tao_PortableServer_LifespanPolicy_optable_pool, _tao_PortableServer_LifespanPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_LifespanPolicy_optable (PortableServer_LifespanPolicy_operations, 5, 10, &_tao_PortableServer_LifespanPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::LifespanPolicy::LifespanPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_LifespanPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::LifespanPolicy::_get_value_skel (
                                                           CORBA::ServerRequest &_tao_server_request,
                                                           void *_tao_object_reference,
                                                           void * /* context */,
-                                                          CORBA::Environment &ACE_TRY_ENV
+                                                          CORBA::Environment &_tao_orb_environment
                                                           )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_LifespanPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_LifespanPolicyValue, 0, 0}
+  }; // PortableServer_LifespanPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_LifespanPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_LifespanPolicy_value_paramdata};
+
   POA_PortableServer::LifespanPolicy *_tao_impl = (POA_PortableServer::LifespanPolicy *)_tao_object_reference;
   PortableServer::LifespanPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_LifespanPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_LifespanPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::LifespanPolicy::_is_a_skel (
                                                      CORBA::ServerRequest &_tao_server_request,
                                                      void * _tao_object_reference,
                                                      void * /*context*/,
-                                                     CORBA::Environment &ACE_TRY_ENV
+                                                     CORBA::Environment &_tao_orb_environment
                                                      )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -434,55 +295,34 @@ void POA_PortableServer::LifespanPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_LifespanPolicy_is_a_paramdata};
   POA_PortableServer::LifespanPolicy_ptr  _tao_impl = (POA_PortableServer::LifespanPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::LifespanPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_LifespanPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_LifespanPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_LifespanPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_LifespanPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_LifespanPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_LifespanPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::LifespanPolicy::_is_a (
                                                           const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
+                                                          CORBA::Environment &_tao_orb_environment
                                                           )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/LifespanPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/LifespanPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -492,37 +332,37 @@ void* POA_PortableServer::LifespanPolicy::_downcast (
                                                      const char* logical_type_id
                                                      )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/LifespanPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/LifespanPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::LifespanPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::LifespanPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/LifespanPolicy:1.0";
+  return "IDL:PortableServer/LifespanPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_LifespanPolicy::_tao_collocated_LifespanPolicy (
                                                                                     POA_PortableServer::LifespanPolicy_ptr  servant,
-                                                                                    TAO_Stub *stub
+                                                                                    STUB_Object *stub
                                                                                     )
   : ACE_NESTED_CLASS (PortableServer, LifespanPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -538,176 +378,119 @@ POA_PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_Lifes
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_LifespanPolicy::_is_a (
                                                                           const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
+                                                                          CORBA::Environment &_tao_orb_environment
                                                                           )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_LifespanPolicy::copy (
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &_tao_orb_environment
                                                                             )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_LifespanPolicy::destroy (
-                                                                  CORBA::Environment &ACE_TRY_ENV
+                                                                  CORBA::Environment &_tao_orb_environment
                                                                   )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_LifespanPolicy::policy_type (
-                                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                                   CORBA::Environment &_tao_orb_environment
                                                                                    )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::LifespanPolicyValue
 POA_PortableServer::_tao_collocated_LifespanPolicy::value (
-                                                           CORBA::Environment &ACE_TRY_ENV
+                                                           CORBA::Environment &_tao_orb_environment
                                                            )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::LifespanPolicy*
 POA_PortableServer::LifespanPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_LifespanPolicy (this, stub);
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_IdUniquenessPolicy_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);
+static const TAO_operation_db_entry PortableServer_IdUniquenessPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::IdUniquenessPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::IdUniquenessPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::IdUniquenessPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::IdUniquenessPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::IdUniquenessPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::IdUniquenessPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::IdUniquenessPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::IdUniquenessPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::IdUniquenessPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::IdUniquenessPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_IdUniquenessPolicy_Perfect_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_IdUniquenessPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_IdUniquenessPolicy_optable_pool [_tao_PortableServer_IdUniquenessPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_IdUniquenessPolicy_allocator (_tao_PortableServer_IdUniquenessPolicy_optable_pool, _tao_PortableServer_IdUniquenessPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdUniquenessPolicy_optable (PortableServer_IdUniquenessPolicy_operations, 5, 10, &_tao_PortableServer_IdUniquenessPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_IdUniquenessPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdUniquenessPolicy::_get_value_skel (
                                                               CORBA::ServerRequest &_tao_server_request,
                                                               void *_tao_object_reference,
                                                               void * /* context */,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &_tao_orb_environment
                                                               )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdUniquenessPolicyValue, 0, 0}
+  }; // PortableServer_IdUniquenessPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_IdUniquenessPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdUniquenessPolicy_value_paramdata};
+
   POA_PortableServer::IdUniquenessPolicy *_tao_impl = (POA_PortableServer::IdUniquenessPolicy *)_tao_object_reference;
   PortableServer::IdUniquenessPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_IdUniquenessPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_IdUniquenessPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
                                                          CORBA::ServerRequest &_tao_server_request,
                                                          void * _tao_object_reference,
                                                          void * /*context*/,
-                                                         CORBA::Environment &ACE_TRY_ENV
+                                                         CORBA::Environment &_tao_orb_environment
                                                          )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -717,55 +500,34 @@ void POA_PortableServer::IdUniquenessPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_IdUniquenessPolicy_is_a_paramdata};
   POA_PortableServer::IdUniquenessPolicy_ptr  _tao_impl = (POA_PortableServer::IdUniquenessPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::IdUniquenessPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdUniquenessPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_IdUniquenessPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_IdUniquenessPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdUniquenessPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_IdUniquenessPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::IdUniquenessPolicy::_is_a (
                                                               const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &_tao_orb_environment
                                                               )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdUniquenessPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -775,37 +537,37 @@ void* POA_PortableServer::IdUniquenessPolicy::_downcast (
                                                          const char* logical_type_id
                                                          )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdUniquenessPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::IdUniquenessPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:1.0";
+  return "IDL:PortableServer/IdUniquenessPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_tao_collocated_IdUniquenessPolicy (
                                                                                             POA_PortableServer::IdUniquenessPolicy_ptr  servant,
-                                                                                            TAO_Stub *stub
+                                                                                            STUB_Object *stub
                                                                                             )
   : ACE_NESTED_CLASS (PortableServer, IdUniquenessPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -821,176 +583,119 @@ POA_PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_I
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_IdUniquenessPolicy::_is_a (
                                                                               const char* logical_type_id,
-                                                                              CORBA::Environment &ACE_TRY_ENV
+                                                                              CORBA::Environment &_tao_orb_environment
                                                                               )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdUniquenessPolicy::copy (
-                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                CORBA::Environment &_tao_orb_environment
                                                                                 )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_IdUniquenessPolicy::destroy (
-                                                                      CORBA::Environment &ACE_TRY_ENV
+                                                                      CORBA::Environment &_tao_orb_environment
                                                                       )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_IdUniquenessPolicy::policy_type (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                        )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::IdUniquenessPolicyValue
 POA_PortableServer::_tao_collocated_IdUniquenessPolicy::value (
-                                                               CORBA::Environment &ACE_TRY_ENV
+                                                               CORBA::Environment &_tao_orb_environment
                                                                )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
-
 PortableServer::IdUniquenessPolicy*
-POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_PortableServer::IdUniquenessPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_PortableServer::_tao_collocated_IdUniquenessPolicy (this, stub);
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_IdAssignmentPolicy_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);
+static const TAO_operation_db_entry PortableServer_IdAssignmentPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::IdAssignmentPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::IdAssignmentPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::IdAssignmentPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::IdAssignmentPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::IdAssignmentPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::IdAssignmentPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::IdAssignmentPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::IdAssignmentPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::IdAssignmentPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::IdAssignmentPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_IdAssignmentPolicy_Perfect_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_IdAssignmentPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_IdAssignmentPolicy_optable_pool [_tao_PortableServer_IdAssignmentPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_IdAssignmentPolicy_allocator (_tao_PortableServer_IdAssignmentPolicy_optable_pool, _tao_PortableServer_IdAssignmentPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_IdAssignmentPolicy_optable (PortableServer_IdAssignmentPolicy_operations, 5, 10, &_tao_PortableServer_IdAssignmentPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_IdAssignmentPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::IdAssignmentPolicy::_get_value_skel (
                                                               CORBA::ServerRequest &_tao_server_request,
                                                               void *_tao_object_reference,
                                                               void * /* context */,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &_tao_orb_environment
                                                               )
 {
+  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_IdAssignmentPolicyValue, 0, 0}
+  }; // PortableServer_IdAssignmentPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_IdAssignmentPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_IdAssignmentPolicy_value_paramdata};
+
   POA_PortableServer::IdAssignmentPolicy *_tao_impl = (POA_PortableServer::IdAssignmentPolicy *)_tao_object_reference;
   PortableServer::IdAssignmentPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_IdAssignmentPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_IdAssignmentPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
                                                          CORBA::ServerRequest &_tao_server_request,
                                                          void * _tao_object_reference,
                                                          void * /*context*/,
-                                                         CORBA::Environment &ACE_TRY_ENV
+                                                         CORBA::Environment &_tao_orb_environment
                                                          )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -1000,55 +705,34 @@ void POA_PortableServer::IdAssignmentPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_IdAssignmentPolicy_is_a_paramdata};
   POA_PortableServer::IdAssignmentPolicy_ptr  _tao_impl = (POA_PortableServer::IdAssignmentPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::IdAssignmentPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_IdAssignmentPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_IdAssignmentPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_IdAssignmentPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_IdAssignmentPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_IdAssignmentPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::IdAssignmentPolicy::_is_a (
                                                               const char* value,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &_tao_orb_environment
                                                               )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/IdAssignmentPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -1058,37 +742,37 @@ void* POA_PortableServer::IdAssignmentPolicy::_downcast (
                                                          const char* logical_type_id
                                                          )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/IdAssignmentPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::IdAssignmentPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
+  return "IDL:PortableServer/IdAssignmentPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_tao_collocated_IdAssignmentPolicy (
                                                                                             POA_PortableServer::IdAssignmentPolicy_ptr  servant,
-                                                                                            TAO_Stub *stub
+                                                                                            STUB_Object *stub
                                                                                             )
   : ACE_NESTED_CLASS (PortableServer, IdAssignmentPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -1104,178 +788,119 @@ POA_PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_I
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_IdAssignmentPolicy::_is_a (
                                                                               const char* logical_type_id,
-                                                                              CORBA::Environment &ACE_TRY_ENV
+                                                                              CORBA::Environment &_tao_orb_environment
                                                                               )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_IdAssignmentPolicy::copy (
-                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                CORBA::Environment &_tao_orb_environment
                                                                                 )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_IdAssignmentPolicy::destroy (
-                                                                      CORBA::Environment &ACE_TRY_ENV
+                                                                      CORBA::Environment &_tao_orb_environment
                                                                       )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_IdAssignmentPolicy::policy_type (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                        )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::IdAssignmentPolicyValue
 POA_PortableServer::_tao_collocated_IdAssignmentPolicy::value (
-                                                               CORBA::Environment &ACE_TRY_ENV
+                                                               CORBA::Environment &_tao_orb_environment
                                                                )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::IdAssignmentPolicy*
 POA_PortableServer::IdAssignmentPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_IdAssignmentPolicy (this, stub);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ImplicitActivationPolicy_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);
+static const TAO_operation_db_entry PortableServer_ImplicitActivationPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::ImplicitActivationPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::ImplicitActivationPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::ImplicitActivationPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::ImplicitActivationPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ImplicitActivationPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::ImplicitActivationPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::ImplicitActivationPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ImplicitActivationPolicy_Perfect_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_ImplicitActivationPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_ImplicitActivationPolicy_optable_pool [_tao_PortableServer_ImplicitActivationPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ImplicitActivationPolicy_allocator (_tao_PortableServer_ImplicitActivationPolicy_optable_pool, _tao_PortableServer_ImplicitActivationPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ImplicitActivationPolicy_optable (PortableServer_ImplicitActivationPolicy_operations, 5, 10, &_tao_PortableServer_ImplicitActivationPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_ImplicitActivationPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel (
                                                                     CORBA::ServerRequest &_tao_server_request,
                                                                     void *_tao_object_reference,
                                                                     void * /* context */,
-                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    CORBA::Environment &_tao_orb_environment
                                                                     )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ImplicitActivationPolicyValue, 0, 0}
+  }; // PortableServer_ImplicitActivationPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ImplicitActivationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ImplicitActivationPolicy_value_paramdata};
+
   POA_PortableServer::ImplicitActivationPolicy *_tao_impl = (POA_PortableServer::ImplicitActivationPolicy *)_tao_object_reference;
   PortableServer::ImplicitActivationPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_ImplicitActivationPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_ImplicitActivationPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
                                                                CORBA::ServerRequest &_tao_server_request,
                                                                void * _tao_object_reference,
                                                                void * /*context*/,
-                                                               CORBA::Environment &ACE_TRY_ENV
+                                                               CORBA::Environment &_tao_orb_environment
                                                                )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -1285,55 +910,34 @@ void POA_PortableServer::ImplicitActivationPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_ImplicitActivationPolicy_is_a_paramdata};
   POA_PortableServer::ImplicitActivationPolicy_ptr  _tao_impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ImplicitActivationPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ImplicitActivationPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ImplicitActivationPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_ImplicitActivationPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ImplicitActivationPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ImplicitActivationPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::ImplicitActivationPolicy::_is_a (
                                                                     const char* value,
-                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    CORBA::Environment &_tao_orb_environment
                                                                     )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ImplicitActivationPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -1343,37 +947,37 @@ void* POA_PortableServer::ImplicitActivationPolicy::_downcast (
                                                                const char* logical_type_id
                                                                )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ImplicitActivationPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ImplicitActivationPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:1.0";
+  return "IDL:PortableServer/ImplicitActivationPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_tao_collocated_ImplicitActivationPolicy (
                                                                                                         POA_PortableServer::ImplicitActivationPolicy_ptr  servant,
-                                                                                                        TAO_Stub *stub
+                                                                                                        STUB_Object *stub
                                                                                                         )
   : ACE_NESTED_CLASS (PortableServer, ImplicitActivationPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -1389,176 +993,119 @@ POA_PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_colloc
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::_is_a (
                                                                                     const char* logical_type_id,
-                                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                                    CORBA::Environment &_tao_orb_environment
                                                                                     )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::copy (
-                                                                                      CORBA::Environment &ACE_TRY_ENV
+                                                                                      CORBA::Environment &_tao_orb_environment
                                                                                       )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::destroy (
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &_tao_orb_environment
                                                                             )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::policy_type (
-                                                                                             CORBA::Environment &ACE_TRY_ENV
+                                                                                             CORBA::Environment &_tao_orb_environment
                                                                                              )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::ImplicitActivationPolicyValue
 POA_PortableServer::_tao_collocated_ImplicitActivationPolicy::value (
-                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                     CORBA::Environment &_tao_orb_environment
                                                                      )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::ImplicitActivationPolicy*
 POA_PortableServer::ImplicitActivationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ImplicitActivationPolicy (this, stub);
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_ServantRetentionPolicy_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);
+static const TAO_operation_db_entry PortableServer_ServantRetentionPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::ServantRetentionPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::ServantRetentionPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::ServantRetentionPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::ServantRetentionPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::ServantRetentionPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::ServantRetentionPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::ServantRetentionPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::ServantRetentionPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::ServantRetentionPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::ServantRetentionPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::ServantRetentionPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_ServantRetentionPolicy_Perfect_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_ServantRetentionPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_ServantRetentionPolicy_optable_pool [_tao_PortableServer_ServantRetentionPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantRetentionPolicy_allocator (_tao_PortableServer_ServantRetentionPolicy_optable_pool, _tao_PortableServer_ServantRetentionPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantRetentionPolicy_optable (PortableServer_ServantRetentionPolicy_operations, 5, 10, &_tao_PortableServer_ServantRetentionPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_ServantRetentionPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::ServantRetentionPolicy::_get_value_skel (
                                                                   CORBA::ServerRequest &_tao_server_request,
                                                                   void *_tao_object_reference,
                                                                   void * /* context */,
-                                                                  CORBA::Environment &ACE_TRY_ENV
+                                                                  CORBA::Environment &_tao_orb_environment
                                                                   )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_ServantRetentionPolicyValue, 0, 0}
+  }; // PortableServer_ServantRetentionPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_ServantRetentionPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_ServantRetentionPolicy_value_paramdata};
+
   POA_PortableServer::ServantRetentionPolicy *_tao_impl = (POA_PortableServer::ServantRetentionPolicy *)_tao_object_reference;
   PortableServer::ServantRetentionPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_ServantRetentionPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_ServantRetentionPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
                                                              CORBA::ServerRequest &_tao_server_request,
                                                              void * _tao_object_reference,
                                                              void * /*context*/,
-                                                             CORBA::Environment &ACE_TRY_ENV
+                                                             CORBA::Environment &_tao_orb_environment
                                                              )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -1568,55 +1115,34 @@ void POA_PortableServer::ServantRetentionPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_ServantRetentionPolicy_is_a_paramdata};
   POA_PortableServer::ServantRetentionPolicy_ptr  _tao_impl = (POA_PortableServer::ServantRetentionPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::ServantRetentionPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_ServantRetentionPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_ServantRetentionPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_ServantRetentionPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_ServantRetentionPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantRetentionPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::ServantRetentionPolicy::_is_a (
                                                                   const char* value,
-                                                                  CORBA::Environment &ACE_TRY_ENV
+                                                                  CORBA::Environment &_tao_orb_environment
                                                                   )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantRetentionPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -1626,37 +1152,37 @@ void* POA_PortableServer::ServantRetentionPolicy::_downcast (
                                                              const char* logical_type_id
                                                              )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantRetentionPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantRetentionPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:1.0";
+  return "IDL:PortableServer/ServantRetentionPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_tao_collocated_ServantRetentionPolicy (
                                                                                                     POA_PortableServer::ServantRetentionPolicy_ptr  servant,
-                                                                                                    TAO_Stub *stub
+                                                                                                    STUB_Object *stub
                                                                                                     )
   : ACE_NESTED_CLASS (PortableServer, ServantRetentionPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -1672,176 +1198,119 @@ POA_PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocat
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ServantRetentionPolicy::_is_a (
                                                                                   const char* logical_type_id,
-                                                                                  CORBA::Environment &ACE_TRY_ENV
+                                                                                  CORBA::Environment &_tao_orb_environment
                                                                                   )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_ServantRetentionPolicy::copy (
-                                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                                    CORBA::Environment &_tao_orb_environment
                                                                                     )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_ServantRetentionPolicy::destroy (
-                                                                          CORBA::Environment &ACE_TRY_ENV
+                                                                          CORBA::Environment &_tao_orb_environment
                                                                           )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_ServantRetentionPolicy::policy_type (
-                                                                                           CORBA::Environment &ACE_TRY_ENV
+                                                                                           CORBA::Environment &_tao_orb_environment
                                                                                            )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::ServantRetentionPolicyValue
 POA_PortableServer::_tao_collocated_ServantRetentionPolicy::value (
-                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   CORBA::Environment &_tao_orb_environment
                                                                    )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::ServantRetentionPolicy*
 POA_PortableServer::ServantRetentionPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantRetentionPolicy (this, stub);
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_PortableServer_RequestProcessingPolicy_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);
+static const TAO_operation_db_entry PortableServer_RequestProcessingPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::RequestProcessingPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::RequestProcessingPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::RequestProcessingPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::RequestProcessingPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::RequestProcessingPolicy::_is_a_skel}
 };
-/* starting time is 0:12:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 6,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy", 	&POA_PortableServer::RequestProcessingPolicy::copy_skel},
-      {"_is_a",  &POA_PortableServer::RequestProcessingPolicy::_is_a_skel},
-      {"",},
-      {"destroy", 	&POA_PortableServer::RequestProcessingPolicy::destroy_skel},
-      {"",}, {"",},
-      {"_get_value", 	&POA_PortableServer::RequestProcessingPolicy::_get_value_skel},
-      {"",}, {"",},
-      {"_non_existent",  &POA_PortableServer::RequestProcessingPolicy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type", 	&POA_PortableServer::RequestProcessingPolicy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 0:12:47 */
-TAO_PortableServer_RequestProcessingPolicy_Perfect_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+static const CORBA::Long _tao_PortableServer_RequestProcessingPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_RequestProcessingPolicy_optable_pool [_tao_PortableServer_RequestProcessingPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_RequestProcessingPolicy_allocator (_tao_PortableServer_RequestProcessingPolicy_optable_pool, _tao_PortableServer_RequestProcessingPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_RequestProcessingPolicy_optable (PortableServer_RequestProcessingPolicy_operations, 5, 10, &_tao_PortableServer_RequestProcessingPolicy_allocator);
 
 // skeleton constructor
 POA_PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_PortableServer_RequestProcessingPolicy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_PortableServer::RequestProcessingPolicy::_get_value_skel (
                                                                    CORBA::ServerRequest &_tao_server_request,
                                                                    void *_tao_object_reference,
                                                                    void * /* context */,
-                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   CORBA::Environment &_tao_orb_environment
                                                                    )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_RequestProcessingPolicyValue, 0, 0}
+  }; // PortableServer_RequestProcessingPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_RequestProcessingPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_RequestProcessingPolicy_value_paramdata};
+
   POA_PortableServer::RequestProcessingPolicy *_tao_impl = (POA_PortableServer::RequestProcessingPolicy *)_tao_object_reference;
   PortableServer::RequestProcessingPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_RequestProcessingPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->value (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_RequestProcessingPolicy_value_calldata,
+                               &_tao_retval
+                               );
 }
 
 void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
                                                               CORBA::ServerRequest &_tao_server_request,
                                                               void * _tao_object_reference,
                                                               void * /*context*/,
-                                                              CORBA::Environment &ACE_TRY_ENV
+                                                              CORBA::Environment &_tao_orb_environment
                                                               )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -1851,55 +1320,34 @@ void POA_PortableServer::RequestProcessingPolicy::_is_a_skel (
   {"_is_a", 1, 2, PortableServer_RequestProcessingPolicy_is_a_paramdata};
   POA_PortableServer::RequestProcessingPolicy_ptr  _tao_impl = (POA_PortableServer::RequestProcessingPolicy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_PortableServer::RequestProcessingPolicy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel PortableServer_RequestProcessingPolicy_non_existent_calldata =
-  {"_non_existent", 1, 1, PortableServer_RequestProcessingPolicy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
+                                 _tao_orb_environment,
+                                 &PortableServer_RequestProcessingPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &PortableServer_RequestProcessingPolicy_non_existent_calldata,
-    &_tao_retval
-  );
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_RequestProcessingPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_PortableServer::RequestProcessingPolicy::_is_a (
                                                                    const char* value,
-                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   CORBA::Environment &_tao_orb_environment
                                                                    )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Policy:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/RequestProcessingPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -1909,37 +1357,37 @@ void* POA_PortableServer::RequestProcessingPolicy::_downcast (
                                                               const char* logical_type_id
                                                               )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/RequestProcessingPolicy:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::RequestProcessingPolicy_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
+  return "IDL:PortableServer/RequestProcessingPolicy:1.0";
 }
 
 POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_tao_collocated_RequestProcessingPolicy (
                                                                                                       POA_PortableServer::RequestProcessingPolicy_ptr  servant,
-                                                                                                      TAO_Stub *stub
+                                                                                                      STUB_Object *stub
                                                                                                       )
   : ACE_NESTED_CLASS (PortableServer, RequestProcessingPolicy) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
@@ -1955,72 +1403,327 @@ POA_PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_colloca
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_RequestProcessingPolicy::_is_a (
                                                                                    const char* logical_type_id,
-                                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                                   CORBA::Environment &_tao_orb_environment
                                                                                    )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Policy_ptr POA_PortableServer::_tao_collocated_RequestProcessingPolicy::copy (
-                                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                                     CORBA::Environment &_tao_orb_environment
                                                                                      )
 {
   return this->servant_->copy (
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
 void POA_PortableServer::_tao_collocated_RequestProcessingPolicy::destroy (
-                                                                           CORBA::Environment &ACE_TRY_ENV
+                                                                           CORBA::Environment &_tao_orb_environment
                                                                            )
 {
   this->servant_->destroy (
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
 CORBA::PolicyType POA_PortableServer::_tao_collocated_RequestProcessingPolicy::policy_type (
-                                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                                            CORBA::Environment &_tao_orb_environment
                                                                                             )
 {
-  return this->servant_->policy_type (ACE_TRY_ENV);
+  return this->servant_->policy_type (_tao_orb_environment);
 }
 
 PortableServer::RequestProcessingPolicyValue
 POA_PortableServer::_tao_collocated_RequestProcessingPolicy::value (
-                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    CORBA::Environment &_tao_orb_environment
                                                                     )
 {
-  return this->servant_->value(ACE_TRY_ENV);
+  return this->servant_->value(_tao_orb_environment);
 }
 
 PortableServer::RequestProcessingPolicy*
 POA_PortableServer::RequestProcessingPolicy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_RequestProcessingPolicy (this, stub);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+static const TAO_operation_db_entry PortableServer_SynchronizationPolicy_operations [] = {
+  {"_get_value", &POA_PortableServer::SynchronizationPolicy::_get_value_skel},
+  {"copy", &POA_PortableServer::SynchronizationPolicy::copy_skel},
+  {"destroy", &POA_PortableServer::SynchronizationPolicy::destroy_skel},
+  {"_get_policy_type", &POA_PortableServer::SynchronizationPolicy::_get_policy_type_skel},
+  {"_is_a", &POA_PortableServer::SynchronizationPolicy::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_SynchronizationPolicy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (15);
+static char _tao_PortableServer_SynchronizationPolicy_optable_pool [_tao_PortableServer_SynchronizationPolicy_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_SynchronizationPolicy_allocator (_tao_PortableServer_SynchronizationPolicy_optable_pool, _tao_PortableServer_SynchronizationPolicy_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_SynchronizationPolicy_optable (PortableServer_SynchronizationPolicy_operations, 5, 10, &_tao_PortableServer_SynchronizationPolicy_allocator);
+
+// skeleton constructor
+POA_PortableServer::SynchronizationPolicy::SynchronizationPolicy (void)
+{
+  this->optable_ = &tao_PortableServer_SynchronizationPolicy_optable;
+}
+
+void POA_PortableServer::SynchronizationPolicy::_get_value_skel (
+                                                                 CORBA::ServerRequest &_tao_server_request,
+                                                                 void *_tao_object_reference,
+                                                                 void * /* context */,
+                                                                 CORBA::Environment &_tao_orb_environment
+                                                                 )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_PortableServer_SynchronizationPolicy_value_paramdata [] =
+  {
+    {PortableServer::_tc_SynchronizationPolicyValue, 0, 0}
+  }; // PortableServer_SynchronizationPolicy_value_paramdata
+
+  static const TAO_Call_Data_Skel _get_PortableServer_SynchronizationPolicy_value_calldata =
+  {"_get_value", 1, 1, _get_PortableServer_SynchronizationPolicy_value_paramdata};
+
+  POA_PortableServer::SynchronizationPolicy *_tao_impl = (POA_PortableServer::SynchronizationPolicy *)_tao_object_reference;
+  PortableServer::SynchronizationPolicyValue _tao_retval;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &_get_PortableServer_SynchronizationPolicy_value_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
+  _tao_retval = _tao_impl->value (
+                                  _tao_orb_environment
+                                  );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &_get_PortableServer_SynchronizationPolicy_value_calldata,
+                               &_tao_retval
+                               );
+}
+
+void POA_PortableServer::SynchronizationPolicy::_is_a_skel (
+                                                            CORBA::ServerRequest &_tao_server_request,
+                                                            void * _tao_object_reference,
+                                                            void * /*context*/,
+                                                            CORBA::Environment &_tao_orb_environment
+                                                            )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_SynchronizationPolicy_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_SynchronizationPolicy_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_SynchronizationPolicy_is_a_paramdata};
+  POA_PortableServer::SynchronizationPolicy_ptr  _tao_impl = (POA_PortableServer::SynchronizationPolicy_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_SynchronizationPolicy_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_SynchronizationPolicy_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
+}
+
+CORBA::Boolean POA_PortableServer::SynchronizationPolicy::_is_a (
+                                                                 const char* value,
+                                                                 CORBA::Environment &_tao_orb_environment
+                                                                 )
+{
+  if (
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/SynchronizationPolicy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Policy:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
+    return 1;
+  else
+    return 0;
+}
+
+void* POA_PortableServer::SynchronizationPolicy::_downcast (
+                                                            const char* logical_type_id
+                                                            )
+{
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/SynchronizationPolicy:1.0") == 0)
+    return ACE_static_cast (POA_PortableServer::SynchronizationPolicy_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Policy:1.0") == 0)
+    return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
+    return ACE_static_cast(PortableServer::Servant, this);
+  return 0;
+}
+
+void POA_PortableServer::SynchronizationPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
+{
+  TAO_Skeleton skel; // pointer to skeleton for operation
+  const char *opname = req.operation (); // retrieve operation name
+  // find the skeleton corresponding to this opname
+  if (this->_find (opname, skel) == -1)
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
+  else
+    skel (req, this, context, env);
+}
+
+const char* POA_PortableServer::SynchronizationPolicy::_interface_repository_id (void) const
+{
+  return "IDL:PortableServer/SynchronizationPolicy:1.0";
+}
+
+POA_PortableServer::_tao_collocated_SynchronizationPolicy::_tao_collocated_SynchronizationPolicy (
+                                                                                                  POA_PortableServer::SynchronizationPolicy_ptr  servant,
+                                                                                                  STUB_Object *stub
+                                                                                                  )
+  : ACE_NESTED_CLASS (PortableServer, SynchronizationPolicy) (stub, servant, 1),
+    ACE_NESTED_CLASS (POA_CORBA, _tao_collocated_Policy) (servant, stub),
+    CORBA_Object (stub, servant, 1),
+    servant_ (servant)
+{
+}
+
+POA_PortableServer::SynchronizationPolicy_ptr POA_PortableServer::_tao_collocated_SynchronizationPolicy::_get_servant (void) const
+{
+  return this->servant_;
+}
+
+CORBA::Boolean POA_PortableServer::_tao_collocated_SynchronizationPolicy::_is_a (
+                                                                                 const char* logical_type_id,
+                                                                                 CORBA::Environment &_tao_orb_environment
+                                                                                 )
+{
+  return this->servant_->_is_a (
+                                logical_type_id,
+                                _tao_orb_environment
+                                );
+}
+
+CORBA::Policy_ptr POA_PortableServer::_tao_collocated_SynchronizationPolicy::copy (
+                                                                                   CORBA::Environment &_tao_orb_environment
+                                                                                   )
+{
+  return this->servant_->copy (
+                               _tao_orb_environment
+                               );
+}
+
+void POA_PortableServer::_tao_collocated_SynchronizationPolicy::destroy (
+                                                                         CORBA::Environment &_tao_orb_environment
+                                                                         )
+{
+  this->servant_->destroy (
+                           _tao_orb_environment
+                           );
+}
+
+CORBA::PolicyType POA_PortableServer::_tao_collocated_SynchronizationPolicy::policy_type (
+                                                                                          CORBA::Environment &_tao_orb_environment
+                                                                                          )
+{
+  return this->servant_->policy_type (_tao_orb_environment);
+}
+
+PortableServer::SynchronizationPolicyValue
+POA_PortableServer::_tao_collocated_SynchronizationPolicy::value (
+                                                                  CORBA::Environment &_tao_orb_environment
+                                                                  )
+{
+  return this->servant_->value(_tao_orb_environment);
+}
+
+PortableServer::SynchronizationPolicy*
+POA_PortableServer::SynchronizationPolicy::_this (CORBA_Environment &TAO_IN_ENV)
+{
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
+  return new POA_PortableServer::_tao_collocated_SynchronizationPolicy (this, stub);
+}
+
+static const TAO_operation_db_entry PortableServer_POAManager_operations [] = {
+  {"_is_a", &POA_PortableServer::POAManager::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_POAManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_POAManager_optable_pool [_tao_PortableServer_POAManager_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_POAManager_allocator (_tao_PortableServer_POAManager_optable_pool, _tao_PortableServer_POAManager_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_POAManager_optable (PortableServer_POAManager_operations, 1, 1, &_tao_PortableServer_POAManager_allocator);
 
 // skeleton constructor
 POA_PortableServer::POAManager::POAManager (void)
 {
+  this->optable_ = &tao_PortableServer_POAManager_optable;
+}
+
+void POA_PortableServer::POAManager::_is_a_skel (
+                                                 CORBA::ServerRequest &_tao_server_request,
+                                                 void * _tao_object_reference,
+                                                 void * /*context*/,
+                                                 CORBA::Environment &_tao_orb_environment
+                                                 )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_POAManager_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_POAManager_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_POAManager_is_a_paramdata};
+  POA_PortableServer::POAManager_ptr  _tao_impl = (POA_PortableServer::POAManager_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_POAManager_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_POAManager_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::POAManager::_is_a (
                                                       const char* value,
-                                                      CORBA::Environment &ACE_TRY_ENV
+                                                      CORBA::Environment &_tao_orb_environment
                                                       )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POAManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POAManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2030,35 +1733,35 @@ void* POA_PortableServer::POAManager::_downcast (
                                                  const char* logical_type_id
                                                  )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/POAManager:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POAManager:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::POAManager_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::POAManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/POAManager:1.0";
+  return "IDL:PortableServer/POAManager:1.0";
 }
 
 POA_PortableServer::_tao_collocated_POAManager::_tao_collocated_POAManager (
                                                                             POA_PortableServer::POAManager_ptr  servant,
-                                                                            TAO_Stub *stub
+                                                                            STUB_Object *stub
                                                                             )
   : ACE_NESTED_CLASS (PortableServer, POAManager) (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -2073,93 +1776,128 @@ POA_PortableServer::POAManager_ptr POA_PortableServer::_tao_collocated_POAManage
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_POAManager::_is_a (
                                                                       const char* logical_type_id,
-                                                                      CORBA::Environment &ACE_TRY_ENV
+                                                                      CORBA::Environment &_tao_orb_environment
                                                                       )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 void POA_PortableServer::_tao_collocated_POAManager::activate (
-                                                               CORBA::Environment &ACE_TRY_ENV
+                                                               CORBA::Environment &_tao_orb_environment
                                                                )
 {
   this->servant_->activate (
-                            ACE_TRY_ENV
+                            _tao_orb_environment
                             );
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 void POA_PortableServer::_tao_collocated_POAManager::hold_requests (
                                                                     CORBA::Boolean wait_for_completion,
-                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                    CORBA::Environment &_tao_orb_environment
                                                                     )
 {
   this->servant_->hold_requests (
                                  wait_for_completion,
-                                 ACE_TRY_ENV
+                                 _tao_orb_environment
                                  );
 }
 
 void POA_PortableServer::_tao_collocated_POAManager::discard_requests (
                                                                        CORBA::Boolean wait_for_completion,
-                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                       CORBA::Environment &_tao_orb_environment
                                                                        )
 {
   this->servant_->discard_requests (
                                     wait_for_completion,
-                                    ACE_TRY_ENV
+                                    _tao_orb_environment
                                     );
 }
 
 void POA_PortableServer::_tao_collocated_POAManager::deactivate (
                                                                  CORBA::Boolean etherealize_objects,
                                                                  CORBA::Boolean wait_for_completion,
-                                                                 CORBA::Environment &ACE_TRY_ENV
+                                                                 CORBA::Environment &_tao_orb_environment
                                                                  )
 {
   this->servant_->deactivate (
                               etherealize_objects,
                               wait_for_completion,
-                              ACE_TRY_ENV
+                              _tao_orb_environment
                               );
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-PortableServer::POAManager::State
-POA_PortableServer::_tao_collocated_POAManager:: get_state(CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->servant_->get_state (ACE_TRY_ENV);
-}
 
 PortableServer::POAManager*
 POA_PortableServer::POAManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_POAManager (this, stub);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+static const TAO_operation_db_entry PortableServer_AdapterActivator_operations [] = {
+  {"_is_a", &POA_PortableServer::AdapterActivator::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_AdapterActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_AdapterActivator_optable_pool [_tao_PortableServer_AdapterActivator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_AdapterActivator_allocator (_tao_PortableServer_AdapterActivator_optable_pool, _tao_PortableServer_AdapterActivator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_AdapterActivator_optable (PortableServer_AdapterActivator_operations, 1, 1, &_tao_PortableServer_AdapterActivator_allocator);
 
 // skeleton constructor
 POA_PortableServer::AdapterActivator::AdapterActivator (void)
 {
+  this->optable_ = &tao_PortableServer_AdapterActivator_optable;
+}
+
+void POA_PortableServer::AdapterActivator::_is_a_skel (
+                                                       CORBA::ServerRequest &_tao_server_request,
+                                                       void * _tao_object_reference,
+                                                       void * /*context*/,
+                                                       CORBA::Environment &_tao_orb_environment
+                                                       )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_AdapterActivator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_AdapterActivator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_AdapterActivator_is_a_paramdata};
+  POA_PortableServer::AdapterActivator_ptr  _tao_impl = (POA_PortableServer::AdapterActivator_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_AdapterActivator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_AdapterActivator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::AdapterActivator::_is_a (
                                                             const char* value,
-                                                            CORBA::Environment &ACE_TRY_ENV
+                                                            CORBA::Environment &_tao_orb_environment
                                                             )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/AdapterActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/AdapterActivator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2169,35 +1907,35 @@ void* POA_PortableServer::AdapterActivator::_downcast (
                                                        const char* logical_type_id
                                                        )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/AdapterActivator:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/AdapterActivator:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::AdapterActivator_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::AdapterActivator::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/AdapterActivator:1.0";
+  return "IDL:PortableServer/AdapterActivator:1.0";
 }
 
 POA_PortableServer::_tao_collocated_AdapterActivator::_tao_collocated_AdapterActivator (
                                                                                         POA_PortableServer::AdapterActivator_ptr  servant,
-                                                                                        TAO_Stub *stub
+                                                                                        STUB_Object *stub
                                                                                         )
   : ACE_NESTED_CLASS (PortableServer, AdapterActivator) (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -2212,25 +1950,25 @@ POA_PortableServer::AdapterActivator_ptr POA_PortableServer::_tao_collocated_Ada
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::_is_a (
                                                                             const char* logical_type_id,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &_tao_orb_environment
                                                                             )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_adapter (
                                                                                       PortableServer::POA_ptr  parent,
                                                                                       const char* name,
-                                                                                      CORBA::Environment &ACE_TRY_ENV
+                                                                                      CORBA::Environment &_tao_orb_environment
                                                                                       )
 {
   return this->servant_->unknown_adapter (
                                           parent,
                                           name,
-                                          ACE_TRY_ENV
+                                          _tao_orb_environment
                                           );
 }
 
@@ -2238,25 +1976,71 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_AdapterActivator::unknown_ada
 PortableServer::AdapterActivator*
 POA_PortableServer::AdapterActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_AdapterActivator (this, stub);
 }
 
+static const TAO_operation_db_entry PortableServer_ServantManager_operations [] = {
+  {"_is_a", &POA_PortableServer::ServantManager::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_ServantManager_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_ServantManager_optable_pool [_tao_PortableServer_ServantManager_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantManager_allocator (_tao_PortableServer_ServantManager_optable_pool, _tao_PortableServer_ServantManager_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantManager_optable (PortableServer_ServantManager_operations, 1, 1, &_tao_PortableServer_ServantManager_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantManager::ServantManager (void)
 {
+  this->optable_ = &tao_PortableServer_ServantManager_optable;
+}
+
+void POA_PortableServer::ServantManager::_is_a_skel (
+                                                     CORBA::ServerRequest &_tao_server_request,
+                                                     void * _tao_object_reference,
+                                                     void * /*context*/,
+                                                     CORBA::Environment &_tao_orb_environment
+                                                     )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_ServantManager_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantManager_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantManager_is_a_paramdata};
+  POA_PortableServer::ServantManager_ptr  _tao_impl = (POA_PortableServer::ServantManager_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_ServantManager_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantManager_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantManager::_is_a (
                                                           const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
+                                                          CORBA::Environment &_tao_orb_environment
                                                           )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2266,35 +2050,35 @@ void* POA_PortableServer::ServantManager::_downcast (
                                                      const char* logical_type_id
                                                      )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ServantManager::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantManager:1.0";
+  return "IDL:PortableServer/ServantManager:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ServantManager::_tao_collocated_ServantManager (
                                                                                     POA_PortableServer::ServantManager_ptr  servant,
-                                                                                    TAO_Stub *stub
+                                                                                    STUB_Object *stub
                                                                                     )
   : ACE_NESTED_CLASS (PortableServer, ServantManager) (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -2309,12 +2093,12 @@ POA_PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_Serva
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
                                                                           const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
+                                                                          CORBA::Environment &_tao_orb_environment
                                                                           )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
@@ -2322,26 +2106,72 @@ CORBA::Boolean POA_PortableServer::_tao_collocated_ServantManager::_is_a (
 PortableServer::ServantManager*
 POA_PortableServer::ServantManager::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantManager (this, stub);
 }
 
+static const TAO_operation_db_entry PortableServer_ServantActivator_operations [] = {
+  {"_is_a", &POA_PortableServer::ServantActivator::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_ServantActivator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_ServantActivator_optable_pool [_tao_PortableServer_ServantActivator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantActivator_allocator (_tao_PortableServer_ServantActivator_optable_pool, _tao_PortableServer_ServantActivator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantActivator_optable (PortableServer_ServantActivator_operations, 1, 1, &_tao_PortableServer_ServantActivator_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantActivator::ServantActivator (void)
 {
+  this->optable_ = &tao_PortableServer_ServantActivator_optable;
+}
+
+void POA_PortableServer::ServantActivator::_is_a_skel (
+                                                       CORBA::ServerRequest &_tao_server_request,
+                                                       void * _tao_object_reference,
+                                                       void * /*context*/,
+                                                       CORBA::Environment &_tao_orb_environment
+                                                       )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_ServantActivator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantActivator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantActivator_is_a_paramdata};
+  POA_PortableServer::ServantActivator_ptr  _tao_impl = (POA_PortableServer::ServantActivator_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_ServantActivator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantActivator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantActivator::_is_a (
                                                             const char* value,
-                                                            CORBA::Environment &ACE_TRY_ENV
+                                                            CORBA::Environment &_tao_orb_environment
                                                             )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantActivator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantActivator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2351,37 +2181,37 @@ void* POA_PortableServer::ServantActivator::_downcast (
                                                        const char* logical_type_id
                                                        )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantActivator:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantActivator:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantActivator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ServantActivator::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantActivator:1.0";
+  return "IDL:PortableServer/ServantActivator:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ServantActivator::_tao_collocated_ServantActivator (
                                                                                         POA_PortableServer::ServantActivator_ptr  servant,
-                                                                                        TAO_Stub *stub
+                                                                                        STUB_Object *stub
                                                                                         )
   : ACE_NESTED_CLASS (PortableServer, ServantActivator) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub),
@@ -2397,25 +2227,25 @@ POA_PortableServer::ServantActivator_ptr POA_PortableServer::_tao_collocated_Ser
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ServantActivator::_is_a (
                                                                             const char* logical_type_id,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &_tao_orb_environment
                                                                             )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 PortableServer::Servant POA_PortableServer::_tao_collocated_ServantActivator::incarnate (
                                                                                          const PortableServer::ObjectId & oid,
                                                                                          PortableServer::POA_ptr  adapter,
-                                                                                         CORBA::Environment &ACE_TRY_ENV
+                                                                                         CORBA::Environment &_tao_orb_environment
                                                                                          )
 {
   return this->servant_->incarnate (
                                     oid,
                                     adapter,
-                                    ACE_TRY_ENV
+                                    _tao_orb_environment
                                     );
 }
 
@@ -2425,7 +2255,7 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
                                                                         PortableServer::Servant serv,
                                                                         CORBA::Boolean cleanup_in_progress,
                                                                         CORBA::Boolean remaining_activations,
-                                                                        CORBA::Environment &ACE_TRY_ENV
+                                                                        CORBA::Environment &_tao_orb_environment
                                                                         )
 {
   this->servant_->etherealize (
@@ -2434,7 +2264,7 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
                                serv,
                                cleanup_in_progress,
                                remaining_activations,
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
@@ -2442,26 +2272,72 @@ void POA_PortableServer::_tao_collocated_ServantActivator::etherealize (
 PortableServer::ServantActivator*
 POA_PortableServer::ServantActivator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantActivator (this, stub);
 }
 
+static const TAO_operation_db_entry PortableServer_ServantLocator_operations [] = {
+  {"_is_a", &POA_PortableServer::ServantLocator::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_ServantLocator_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_ServantLocator_optable_pool [_tao_PortableServer_ServantLocator_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_ServantLocator_allocator (_tao_PortableServer_ServantLocator_optable_pool, _tao_PortableServer_ServantLocator_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_ServantLocator_optable (PortableServer_ServantLocator_operations, 1, 1, &_tao_PortableServer_ServantLocator_allocator);
+
 // skeleton constructor
 POA_PortableServer::ServantLocator::ServantLocator (void)
 {
+  this->optable_ = &tao_PortableServer_ServantLocator_optable;
+}
+
+void POA_PortableServer::ServantLocator::_is_a_skel (
+                                                     CORBA::ServerRequest &_tao_server_request,
+                                                     void * _tao_object_reference,
+                                                     void * /*context*/,
+                                                     CORBA::Environment &_tao_orb_environment
+                                                     )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_ServantLocator_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_ServantLocator_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_ServantLocator_is_a_paramdata};
+  POA_PortableServer::ServantLocator_ptr  _tao_impl = (POA_PortableServer::ServantLocator_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_ServantLocator_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_ServantLocator_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::ServantLocator::_is_a (
                                                           const char* value,
-                                                          CORBA::Environment &ACE_TRY_ENV
+                                                          CORBA::Environment &_tao_orb_environment
                                                           )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantLocator:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/ServantManager:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantLocator:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/ServantManager:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2471,37 +2347,37 @@ void* POA_PortableServer::ServantLocator::_downcast (
                                                      const char* logical_type_id
                                                      )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantLocator:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantLocator:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantLocator_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/ServantManager:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/ServantManager:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::ServantManager_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::ServantLocator::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/ServantLocator:1.0";
+  return "IDL:PortableServer/ServantLocator:1.0";
 }
 
 POA_PortableServer::_tao_collocated_ServantLocator::_tao_collocated_ServantLocator (
                                                                                     POA_PortableServer::ServantLocator_ptr  servant,
-                                                                                    TAO_Stub *stub
+                                                                                    STUB_Object *stub
                                                                                     )
   : ACE_NESTED_CLASS (PortableServer, ServantLocator) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_PortableServer, _tao_collocated_ServantManager) (servant, stub),
@@ -2517,12 +2393,12 @@ POA_PortableServer::ServantLocator_ptr POA_PortableServer::_tao_collocated_Serva
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_ServantLocator::_is_a (
                                                                           const char* logical_type_id,
-                                                                          CORBA::Environment &ACE_TRY_ENV
+                                                                          CORBA::Environment &_tao_orb_environment
                                                                           )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
@@ -2531,7 +2407,7 @@ PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::prei
                                                                                        PortableServer::POA_ptr  adapter,
                                                                                        const char * operation,
                                                                                        PortableServer::ServantLocator::Cookie & the_cookie,
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                        )
 {
   return this->servant_->preinvoke (
@@ -2539,7 +2415,7 @@ PortableServer::Servant POA_PortableServer::_tao_collocated_ServantLocator::prei
                                     adapter,
                                     operation,
                                     the_cookie,
-                                    ACE_TRY_ENV
+                                    _tao_orb_environment
                                     );
 }
 
@@ -2549,7 +2425,7 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
                                                                      const char * operation,
                                                                      PortableServer::ServantLocator::Cookie the_cookie,
                                                                      PortableServer::Servant the_servant,
-                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                     CORBA::Environment &_tao_orb_environment
                                                                      )
 {
   this->servant_->postinvoke (
@@ -2558,7 +2434,7 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
                               operation,
                               the_cookie,
                               the_servant,
-                              ACE_TRY_ENV
+                              _tao_orb_environment
                               );
 }
 
@@ -2566,27 +2442,71 @@ void POA_PortableServer::_tao_collocated_ServantLocator::postinvoke (
 PortableServer::ServantLocator*
 POA_PortableServer::ServantLocator::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_ServantLocator (this, stub);
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+static const TAO_operation_db_entry PortableServer_POA_operations [] = {
+  {"_is_a", &POA_PortableServer::POA::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_POA_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (2);
+static char _tao_PortableServer_POA_optable_pool [_tao_PortableServer_POA_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_POA_allocator (_tao_PortableServer_POA_optable_pool, _tao_PortableServer_POA_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_POA_optable (PortableServer_POA_operations, 1, 1, &_tao_PortableServer_POA_allocator);
 
 // skeleton constructor
 POA_PortableServer::POA::POA (void)
 {
+  this->optable_ = &tao_PortableServer_POA_optable;
+}
+
+void POA_PortableServer::POA::_is_a_skel (
+                                          CORBA::ServerRequest &_tao_server_request,
+                                          void * _tao_object_reference,
+                                          void * /*context*/,
+                                          CORBA::Environment &_tao_orb_environment
+                                          )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_POA_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_POA_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_POA_is_a_paramdata};
+  POA_PortableServer::POA_ptr  _tao_impl = (POA_PortableServer::POA_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_POA_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_POA_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::POA::_is_a (
                                                const char* value,
-                                               CORBA::Environment &ACE_TRY_ENV
+                                               CORBA::Environment &_tao_orb_environment
                                                )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/POA:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/POA:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -2596,35 +2516,35 @@ void* POA_PortableServer::POA::_downcast (
                                           const char* logical_type_id
                                           )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/POA:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/POA:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::POA_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::POA::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/POA:1.0";
+  return "IDL:PortableServer/POA:1.0";
 }
 
 POA_PortableServer::_tao_collocated_POA::_tao_collocated_POA (
                                                               POA_PortableServer::POA_ptr  servant,
-                                                              TAO_Stub *stub
+                                                              STUB_Object *stub
                                                               )
   : ACE_NESTED_CLASS (PortableServer, POA) (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -2639,12 +2559,12 @@ POA_PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::_get_servan
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_POA::_is_a (
                                                                const char* logical_type_id,
-                                                               CORBA::Environment &ACE_TRY_ENV
+                                                               CORBA::Environment &_tao_orb_environment
                                                                )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
@@ -2652,335 +2572,339 @@ PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::create_POA (
                                                                              const char* adapter_name,
                                                                              PortableServer::POAManager_ptr  a_POAManager,
                                                                              const CORBA::PolicyList & policies,
-                                                                             CORBA::Environment &ACE_TRY_ENV
+                                                                             CORBA::Environment &_tao_orb_environment
                                                                              )
 {
   return this->servant_->create_POA (
                                      adapter_name,
                                      a_POAManager,
                                      policies,
-                                     ACE_TRY_ENV
+                                     _tao_orb_environment
                                      );
 }
 
 PortableServer::POA_ptr POA_PortableServer::_tao_collocated_POA::find_POA (
                                                                            const char* adapter_name,
                                                                            CORBA::Boolean activate_it,
-                                                                           CORBA::Environment &ACE_TRY_ENV
+                                                                           CORBA::Environment &_tao_orb_environment
                                                                            )
 {
   return this->servant_->find_POA (
                                    adapter_name,
                                    activate_it,
-                                   ACE_TRY_ENV
+                                   _tao_orb_environment
                                    );
 }
 
 void POA_PortableServer::_tao_collocated_POA::destroy (
                                                        CORBA::Boolean etherealize_objects,
                                                        CORBA::Boolean wait_for_completion,
-                                                       CORBA::Environment &ACE_TRY_ENV
+                                                       CORBA::Environment &_tao_orb_environment
                                                        )
 {
   this->servant_->destroy (
                            etherealize_objects,
                            wait_for_completion,
-                           ACE_TRY_ENV
+                           _tao_orb_environment
                            );
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 PortableServer::ThreadPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_thread_policy (
                                                                                                 PortableServer::ThreadPolicyValue value,
-                                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                                CORBA::Environment &_tao_orb_environment
                                                                                                 )
 {
   return this->servant_->create_thread_policy (
                                                value,
-                                               ACE_TRY_ENV
+                                               _tao_orb_environment
                                                );
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 PortableServer::LifespanPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_lifespan_policy (
                                                                                                     PortableServer::LifespanPolicyValue value,
-                                                                                                    CORBA::Environment &ACE_TRY_ENV
+                                                                                                    CORBA::Environment &_tao_orb_environment
                                                                                                     )
 {
   return this->servant_->create_lifespan_policy (
                                                  value,
-                                                 ACE_TRY_ENV
+                                                 _tao_orb_environment
                                                  );
 }
 
 PortableServer::IdUniquenessPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_uniqueness_policy (
                                                                                                              PortableServer::IdUniquenessPolicyValue value,
-                                                                                                             CORBA::Environment &ACE_TRY_ENV
+                                                                                                             CORBA::Environment &_tao_orb_environment
                                                                                                              )
 {
   return this->servant_->create_id_uniqueness_policy (
                                                       value,
-                                                      ACE_TRY_ENV
+                                                      _tao_orb_environment
                                                       );
 }
 
 PortableServer::IdAssignmentPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_id_assignment_policy (
                                                                                                              PortableServer::IdAssignmentPolicyValue value,
-                                                                                                             CORBA::Environment &ACE_TRY_ENV
+                                                                                                             CORBA::Environment &_tao_orb_environment
                                                                                                              )
 {
   return this->servant_->create_id_assignment_policy (
                                                       value,
-                                                      ACE_TRY_ENV
+                                                      _tao_orb_environment
                                                       );
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 PortableServer::ImplicitActivationPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_implicit_activation_policy (
                                                                                                                          PortableServer::ImplicitActivationPolicyValue value,
-                                                                                                                         CORBA::Environment &ACE_TRY_ENV
+                                                                                                                         CORBA::Environment &_tao_orb_environment
                                                                                                                          )
 {
   return this->servant_->create_implicit_activation_policy (
                                                             value,
-                                                            ACE_TRY_ENV
+                                                            _tao_orb_environment
                                                             );
 }
 
 PortableServer::ServantRetentionPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_servant_retention_policy (
                                                                                                                      PortableServer::ServantRetentionPolicyValue value,
-                                                                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                                                                     CORBA::Environment &_tao_orb_environment
                                                                                                                      )
 {
   return this->servant_->create_servant_retention_policy (
                                                           value,
-                                                          ACE_TRY_ENV
+                                                          _tao_orb_environment
                                                           );
 }
 
 PortableServer::RequestProcessingPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_request_processing_policy (
                                                                                                                        PortableServer::RequestProcessingPolicyValue value,
-                                                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                                                        )
 {
   return this->servant_->create_request_processing_policy (
                                                            value,
-                                                           ACE_TRY_ENV
+                                                           _tao_orb_environment
                                                            );
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+PortableServer::SynchronizationPolicy_ptr POA_PortableServer::_tao_collocated_POA::create_synchronization_policy (
+                                                                                                                  PortableServer::SynchronizationPolicyValue value,
+                                                                                                                  CORBA::Environment &_tao_orb_environment
+                                                                                                                  )
+{
+  return this->servant_->create_synchronization_policy (
+                                                        value,
+                                                        _tao_orb_environment
+                                                        );
+}
 
 char*
 POA_PortableServer::_tao_collocated_POA::the_name (
-                                                   CORBA::Environment &ACE_TRY_ENV
+                                                   CORBA::Environment &_tao_orb_environment
                                                    )
 {
-  return this->servant_->the_name(ACE_TRY_ENV);
+  return this->servant_->the_name(_tao_orb_environment);
 }
 PortableServer::POA_ptr
 POA_PortableServer::_tao_collocated_POA::the_parent (
-                                                     CORBA::Environment &ACE_TRY_ENV
+                                                     CORBA::Environment &_tao_orb_environment
                                                      )
 {
-  return this->servant_->the_parent(ACE_TRY_ENV);
+  return this->servant_->the_parent(_tao_orb_environment);
 }
 PortableServer::POAManager_ptr
 POA_PortableServer::_tao_collocated_POA::the_POAManager (
-                                                         CORBA::Environment &ACE_TRY_ENV
+                                                         CORBA::Environment &_tao_orb_environment
                                                          )
 {
-  return this->servant_->the_POAManager(ACE_TRY_ENV);
+  return this->servant_->the_POAManager(_tao_orb_environment);
 }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 PortableServer::AdapterActivator_ptr
 POA_PortableServer::_tao_collocated_POA::the_activator (
-                                                        CORBA::Environment &ACE_TRY_ENV
+                                                        CORBA::Environment &_tao_orb_environment
                                                         )
 {
-  return this->servant_->the_activator(ACE_TRY_ENV);
+  return this->servant_->the_activator(_tao_orb_environment);
 }
 
 void POA_PortableServer::_tao_collocated_POA::the_activator (
                                                              PortableServer::AdapterActivator_ptr _tao_value,
-                                                             CORBA::Environment &ACE_TRY_ENV
+                                                             CORBA::Environment &_tao_orb_environment
                                                              )
 {
   this->servant_->the_activator (
                                  _tao_value,
-                                 ACE_TRY_ENV
+                                 _tao_orb_environment
                                  );
 }
 
 PortableServer::ServantManager_ptr POA_PortableServer::_tao_collocated_POA::get_servant_manager (
-                                                                                                 CORBA::Environment &ACE_TRY_ENV
+                                                                                                 CORBA::Environment &_tao_orb_environment
                                                                                                  )
 {
   return this->servant_->get_servant_manager (
-                                              ACE_TRY_ENV
+                                              _tao_orb_environment
                                               );
 }
 
 void POA_PortableServer::_tao_collocated_POA::set_servant_manager (
                                                                    PortableServer::ServantManager_ptr  imgr,
-                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   CORBA::Environment &_tao_orb_environment
                                                                    )
 {
   this->servant_->set_servant_manager (
                                        imgr,
-                                       ACE_TRY_ENV
+                                       _tao_orb_environment
                                        );
 }
 
 PortableServer::Servant POA_PortableServer::_tao_collocated_POA::get_servant (
-                                                                              CORBA::Environment &ACE_TRY_ENV
+                                                                              CORBA::Environment &_tao_orb_environment
                                                                               )
 {
   return this->servant_->get_servant (
-                                      ACE_TRY_ENV
+                                      _tao_orb_environment
                                       );
 }
 
 void POA_PortableServer::_tao_collocated_POA::set_servant (
                                                            PortableServer::Servant p_servant,
-                                                           CORBA::Environment &ACE_TRY_ENV
+                                                           CORBA::Environment &_tao_orb_environment
                                                            )
 {
   this->servant_->set_servant (
                                p_servant,
-                               ACE_TRY_ENV
+                               _tao_orb_environment
                                );
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::activate_object (
                                                                                      PortableServer::Servant p_servant,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                                     CORBA::Environment &_tao_orb_environment
                                                                                      )
 {
   return this->servant_->activate_object (
                                           p_servant,
-                                          ACE_TRY_ENV
+                                          _tao_orb_environment
                                           );
 }
 
 void POA_PortableServer::_tao_collocated_POA::activate_object_with_id (
                                                                        const PortableServer::ObjectId & id,
                                                                        PortableServer::Servant p_servant,
-                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                       CORBA::Environment &_tao_orb_environment
                                                                        )
 {
   this->servant_->activate_object_with_id (
                                            id,
                                            p_servant,
-                                           ACE_TRY_ENV
+                                           _tao_orb_environment
                                            );
 }
 
 void POA_PortableServer::_tao_collocated_POA::deactivate_object (
                                                                  const PortableServer::ObjectId & oid,
-                                                                 CORBA::Environment &ACE_TRY_ENV
+                                                                 CORBA::Environment &_tao_orb_environment
                                                                  )
 {
   this->servant_->deactivate_object (
                                      oid,
-                                     ACE_TRY_ENV
+                                     _tao_orb_environment
                                      );
 }
 
 CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference (
                                                                              const char *intf,
-                                                                             CORBA::Environment &ACE_TRY_ENV
+                                                                             CORBA::Environment &_tao_orb_environment
                                                                              )
 {
   return this->servant_->create_reference (
                                            intf,
-                                           ACE_TRY_ENV
+                                           _tao_orb_environment
                                            );
 }
 
 CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::create_reference_with_id (
                                                                                      const PortableServer::ObjectId & oid,
                                                                                      const char *intf,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                                     CORBA::Environment &_tao_orb_environment
                                                                                      )
 {
   return this->servant_->create_reference_with_id (
                                                    oid,
                                                    intf,
-                                                   ACE_TRY_ENV
+                                                   _tao_orb_environment
                                                    );
 }
 
 PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::servant_to_id (
                                                                                    PortableServer::Servant p_servant,
-                                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                                   CORBA::Environment &_tao_orb_environment
                                                                                    )
 {
   return this->servant_->servant_to_id (
                                         p_servant,
-                                        ACE_TRY_ENV
+                                        _tao_orb_environment
                                         );
 }
 
 CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::servant_to_reference (
                                                                                  PortableServer::Servant p_servant,
-                                                                                 CORBA::Environment &ACE_TRY_ENV
+                                                                                 CORBA::Environment &_tao_orb_environment
                                                                                  )
 {
   return this->servant_->servant_to_reference (
                                                p_servant,
-                                               ACE_TRY_ENV
+                                               _tao_orb_environment
                                                );
 }
 
 PortableServer::Servant POA_PortableServer::_tao_collocated_POA::reference_to_servant (
                                                                                        CORBA::Object_ptr  reference,
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                        )
 {
   return this->servant_->reference_to_servant (
                                                reference,
-                                               ACE_TRY_ENV
+                                               _tao_orb_environment
                                                );
 }
 
 PortableServer::ObjectId * POA_PortableServer::_tao_collocated_POA::reference_to_id (
                                                                                      CORBA::Object_ptr  reference,
-                                                                                     CORBA::Environment &ACE_TRY_ENV
+                                                                                     CORBA::Environment &_tao_orb_environment
                                                                                      )
 {
   return this->servant_->reference_to_id (
                                           reference,
-                                          ACE_TRY_ENV
+                                          _tao_orb_environment
                                           );
 }
 
 PortableServer::Servant POA_PortableServer::_tao_collocated_POA::id_to_servant (
                                                                                 const PortableServer::ObjectId & oid,
-                                                                                CORBA::Environment &ACE_TRY_ENV
+                                                                                CORBA::Environment &_tao_orb_environment
                                                                                 )
 {
   return this->servant_->id_to_servant (
                                         oid,
-                                        ACE_TRY_ENV
+                                        _tao_orb_environment
                                         );
 }
 
 CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
                                                                             const PortableServer::ObjectId & oid,
-                                                                            CORBA::Environment &ACE_TRY_ENV
+                                                                            CORBA::Environment &_tao_orb_environment
                                                                             )
 {
   return this->servant_->id_to_reference (
                                           oid,
-                                          ACE_TRY_ENV
+                                          _tao_orb_environment
                                           );
 }
 
@@ -2988,26 +2912,144 @@ CORBA::Object_ptr POA_PortableServer::_tao_collocated_POA::id_to_reference (
 PortableServer::POA*
 POA_PortableServer::POA::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_POA (this, stub);
 }
 
+static const TAO_operation_db_entry PortableServer_Current_operations [] = {
+  {"get_POA", &POA_PortableServer::Current::get_POA_skel},
+  {"get_object_id", &POA_PortableServer::Current::get_object_id_skel},
+  {"_is_a", &POA_PortableServer::Current::_is_a_skel}
+};
+
+static const CORBA::Long _tao_PortableServer_Current_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (9);
+static char _tao_PortableServer_Current_optable_pool [_tao_PortableServer_Current_optable_size];
+static ACE_Static_Allocator_Base _tao_PortableServer_Current_allocator (_tao_PortableServer_Current_optable_pool, _tao_PortableServer_Current_optable_size);
+static TAO_Dynamic_Hash_OpTable tao_PortableServer_Current_optable (PortableServer_Current_operations, 3, 6, &_tao_PortableServer_Current_allocator);
+
 // skeleton constructor
 POA_PortableServer::Current::Current (void)
 {
+  this->optable_ = &tao_PortableServer_Current_optable;
+}
+
+void POA_PortableServer::Current::get_POA_skel (
+                                                CORBA::ServerRequest &_tao_server_request,
+                                                void *_tao_object_reference,
+                                                void * /* context */,
+                                                CORBA::Environment &_tao_orb_environment
+                                                )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_Current_get_POA_paramdata [] =
+  {
+    {PortableServer::_tc_POA, 0, 0}
+  }; // PortableServer_Current_get_POA_paramdata
+
+  static const TAO_Call_Data_Skel PortableServer_Current_get_POA_calldata =
+  {"get_POA", 1, 1, PortableServer_Current_get_POA_paramdata};
+
+  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
+  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_Current_get_POA_calldata,
+                                 &_tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
+  _tao_retval = _tao_impl->get_POA (
+                                    _tao_orb_environment
+                                    );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_Current_get_POA_calldata,
+                               &_tao_retval
+                               );
+}
+
+void POA_PortableServer::Current::get_object_id_skel (
+                                                      CORBA::ServerRequest &_tao_server_request,
+                                                      void *_tao_object_reference,
+                                                      void * /* context */,
+                                                      CORBA::Environment &_tao_orb_environment
+                                                      )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_Current_get_object_id_paramdata [] =
+  {
+    {PortableServer::_tc_ObjectId, 0, 0}
+  }; // PortableServer_Current_get_object_id_paramdata
+
+  static const TAO_Call_Data_Skel PortableServer_Current_get_object_id_calldata =
+  {"get_object_id", 1, 1, PortableServer_Current_get_object_id_paramdata};
+
+  POA_PortableServer::Current *_tao_impl = (POA_PortableServer::Current *)_tao_object_reference;
+  PortableServer::ObjectId *_tao_retval = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_Current_get_object_id_calldata,
+                                 _tao_retval
+                                 );
+  if (_tao_orb_environment.exception ()) return;
+  _tao_retval = _tao_impl->get_object_id (
+                                          _tao_orb_environment
+                                          );
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_Current_get_object_id_calldata,
+                               _tao_retval
+                               );
+}
+
+void POA_PortableServer::Current::_is_a_skel (
+                                              CORBA::ServerRequest &_tao_server_request,
+                                              void * _tao_object_reference,
+                                              void * /*context*/,
+                                              CORBA::Environment &_tao_orb_environment
+                                              )
+{
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel PortableServer_Current_is_a_paramdata [] =
+  {
+    {CORBA::_tc_boolean, 0, 0},
+    {CORBA::_tc_string, CORBA::ARG_IN, 0}
+  };
+  static const TAO_Call_Data_Skel PortableServer_Current_is_a_calldata =
+  {"_is_a", 1, 2, PortableServer_Current_is_a_paramdata};
+  POA_PortableServer::Current_ptr  _tao_impl = (POA_PortableServer::Current_ptr) _tao_object_reference;
+  CORBA::Boolean _tao_retval;
+  char *_tao_value = 0;
+  _tao_server_request.demarshal (
+                                 _tao_orb_environment,
+                                 &PortableServer_Current_is_a_calldata,
+                                 &_tao_retval,
+                                 &_tao_value
+                                 );
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
+  _tao_server_request.marshal (
+                               _tao_orb_environment,
+                               //                               _tao_skel_environment,
+                               &PortableServer_Current_is_a_calldata,
+                               &_tao_retval,
+                               &_tao_value
+                               );
+  CORBA::string_free (_tao_value);
 }
 
 CORBA::Boolean POA_PortableServer::Current::_is_a (
                                                    const char* value,
-                                                   CORBA::Environment &ACE_TRY_ENV
+                                                   CORBA::Environment &_tao_orb_environment
                                                    )
 {
   if (
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/PortableServer/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+      (!ACE_OS::strcmp ((char *)value, "IDL:PortableServer/Current:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Current:1.0")) ||
+      (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
     return 1;
   else
     return 0;
@@ -3017,37 +3059,37 @@ void* POA_PortableServer::Current::_downcast (
                                               const char* logical_type_id
                                               )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/PortableServer/Current:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:PortableServer/Current:1.0") == 0)
     return ACE_static_cast (POA_PortableServer::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/Current:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Current_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
   return 0;
 }
 
-void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
+void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &env)
 {
   TAO_Skeleton skel; // pointer to skeleton for operation
   const char *opname = req.operation (); // retrieve operation name
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
+    {
+      env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
+      ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
+    }
   else
-    skel (req, this, context, ACE_TRY_ENV);
+    skel (req, this, context, env);
 }
 
 const char* POA_PortableServer::Current::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/PortableServer/Current:1.0";
+  return "IDL:PortableServer/Current:1.0";
 }
 
 POA_PortableServer::_tao_collocated_Current::_tao_collocated_Current (
                                                                       POA_PortableServer::Current_ptr  servant,
-                                                                      TAO_Stub *stub
+                                                                      STUB_Object *stub
                                                                       )
   : ACE_NESTED_CLASS (PortableServer, Current) (stub, servant, 1),
     ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Current) (servant, stub),
@@ -3063,30 +3105,30 @@ POA_PortableServer::Current_ptr POA_PortableServer::_tao_collocated_Current::_ge
 
 CORBA::Boolean POA_PortableServer::_tao_collocated_Current::_is_a (
                                                                    const char* logical_type_id,
-                                                                   CORBA::Environment &ACE_TRY_ENV
+                                                                   CORBA::Environment &_tao_orb_environment
                                                                    )
 {
   return this->servant_->_is_a (
                                 logical_type_id,
-                                ACE_TRY_ENV
+                                _tao_orb_environment
                                 );
 }
 
 PortableServer::POA_ptr POA_PortableServer::_tao_collocated_Current::get_POA (
-                                                                              CORBA::Environment &ACE_TRY_ENV
+                                                                              CORBA::Environment &_tao_orb_environment
                                                                               )
 {
   return this->servant_->get_POA (
-                                  ACE_TRY_ENV
+                                  _tao_orb_environment
                                   );
 }
 
 PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_object_id (
-                                                                                       CORBA::Environment &ACE_TRY_ENV
+                                                                                       CORBA::Environment &_tao_orb_environment
                                                                                        )
 {
   return this->servant_->get_object_id (
-                                        ACE_TRY_ENV
+                                        _tao_orb_environment
                                         );
 }
 
@@ -3094,7 +3136,7 @@ PortableServer::ObjectId * POA_PortableServer::_tao_collocated_Current::get_obje
 PortableServer::Current*
 POA_PortableServer::Current::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
   if (TAO_IN_ENV.exception () != 0)
     return 0;
   return new POA_PortableServer::_tao_collocated_Current (this, stub);
diff --git a/TAO/tao/POAS.h b/TAO/tao/POAS.h
index 0652bb63e2d..1f4e7e41646 100644
--- a/TAO/tao/POAS.h
+++ b/TAO/tao/POAS.h
@@ -22,18 +22,9 @@
 #include "tao/Servant_Base.h"
 #include "tao/POA_CORBA.h"
 
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE POA_PortableServer
+class TAO_Export POA_PortableServer
 {
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+public:
 
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
@@ -50,26 +41,22 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::ThreadPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::ThreadPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -85,7 +72,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ThreadPolicy (
                                   ThreadPolicy_ptr  servant,
-                                  TAO_Stub *stub
+                                  STUB_Object *stub
                                   );
     ThreadPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -111,7 +98,6 @@ TAO_NAMESPACE POA_PortableServer
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
@@ -128,27 +114,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::LifespanPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::LifespanPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -164,7 +146,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_LifespanPolicy (
                                     LifespanPolicy_ptr  servant,
-                                    TAO_Stub *stub
+                                    STUB_Object *stub
                                     );
     LifespanPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -207,27 +189,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::IdUniquenessPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::IdUniquenessPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -243,7 +221,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_IdUniquenessPolicy (
                                         IdUniquenessPolicy_ptr  servant,
-                                        TAO_Stub *stub
+                                        STUB_Object *stub
                                         );
     IdUniquenessPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -286,27 +264,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::IdAssignmentPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::IdAssignmentPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -322,7 +296,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_IdAssignmentPolicy (
                                         IdAssignmentPolicy_ptr  servant,
-                                        TAO_Stub *stub
+                                        STUB_Object *stub
                                         );
     IdAssignmentPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -350,8 +324,6 @@ TAO_NAMESPACE POA_PortableServer
 #endif // end #if !defined
 
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
   class TAO_Export ImplicitActivationPolicy : public virtual POA_CORBA::Policy
@@ -367,27 +339,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::ImplicitActivationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::ImplicitActivationPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -403,7 +371,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ImplicitActivationPolicy (
                                               ImplicitActivationPolicy_ptr  servant,
-                                              TAO_Stub *stub
+                                              STUB_Object *stub
                                               );
     ImplicitActivationPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -446,27 +414,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::ServantRetentionPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::ServantRetentionPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -482,7 +446,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ServantRetentionPolicy (
                                             ServantRetentionPolicy_ptr  servant,
-                                            TAO_Stub *stub
+                                            STUB_Object *stub
                                             );
     ServantRetentionPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -525,27 +489,23 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::RequestProcessingPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    static void _non_existent_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &ACE_TRY_ENV = CORBA::Environment::default_environment ());
-
     static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     static void _get_policy_type_skel (
                                        CORBA::ServerRequest &_tao_req,
                                        void *_tao_obj,
                                        void *_tao_context,
                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                        );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::RequestProcessingPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
@@ -561,7 +521,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_RequestProcessingPolicy (
                                              RequestProcessingPolicy_ptr  servant,
-                                             TAO_Stub *stub
+                                             STUB_Object *stub
                                              );
     RequestProcessingPolicy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -588,7 +548,86 @@ TAO_NAMESPACE POA_PortableServer
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+
+  // **************************************************
+  //
+  // TAO spcific POA locking policy (non-standard)
+  //
+  // **************************************************
+
+  class SynchronizationPolicy;
+  typedef SynchronizationPolicy *SynchronizationPolicy_ptr;
+  class TAO_Export SynchronizationPolicy : public virtual POA_CORBA::Policy
+  {
+  protected:
+    SynchronizationPolicy (void);
+  public:
+    virtual ~SynchronizationPolicy (void);
+    virtual CORBA::Boolean _is_a (
+                                  const char* logical_type_id,
+                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual void* _downcast (
+                             const char* logical_type_id
+                             );
+    virtual PortableServer::SynchronizationPolicyValue value (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+    static void _get_value_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    static void copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    static void destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    static void _get_policy_type_skel (
+                                       CORBA::ServerRequest &_tao_req,
+                                       void *_tao_obj,
+                                       void *_tao_context,
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                       );
+
+
+    PortableServer::SynchronizationPolicy *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+    virtual const char* _interface_repository_id (void) const;
+  };
+
+
+#if !defined (_PORTABLESERVER_SYNCHRONIZATIONPOLICY___COLLOCATED_SH_)
+#define _PORTABLESERVER_SYNCHRONIZATIONPOLICY___COLLOCATED_SH_
+
+  class TAO_Export _tao_collocated_SynchronizationPolicy    : public virtual PortableServer::SynchronizationPolicy,
+                                                              public virtual POA_CORBA::_tao_collocated_Policy
+  {
+  public:
+    _tao_collocated_SynchronizationPolicy (
+                                           SynchronizationPolicy_ptr  servant,
+                                           STUB_Object *stub
+                                           );
+    SynchronizationPolicy_ptr _get_servant (void) const;
+    virtual CORBA::Boolean _is_a (
+                                  const char *logical_type_id,
+                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                  );
+    virtual PortableServer::SynchronizationPolicyValue value (
+                                                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                                              );
+    virtual CORBA::Policy_ptr copy (
+                                    CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                    );
+    virtual void destroy (
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                          );
+    virtual CORBA::PolicyType policy_type (
+                                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                           );
+
+  private:
+    SynchronizationPolicy_ptr servant_;
+  };
+
+
+#endif // end #if !defined
 
 
   class POAManager;
@@ -607,17 +646,13 @@ TAO_NAMESPACE POA_PortableServer
                              );
     virtual void activate ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual void hold_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual void discard_requests (CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual void deactivate (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
@@ -634,7 +669,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_POAManager (
                                 POAManager_ptr  servant,
-                                TAO_Stub *stub
+                                STUB_Object *stub
                                 );
     POAManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -644,9 +679,6 @@ TAO_NAMESPACE POA_PortableServer
     virtual void activate (
                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                            );
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual void hold_requests (
                                 CORBA::Boolean wait_for_completion,
                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
@@ -661,10 +693,6 @@ TAO_NAMESPACE POA_PortableServer
                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                              );
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    virtual PortableServer::POAManager::State get_state (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
   private:
     POAManager_ptr servant_;
   };
@@ -673,8 +701,6 @@ TAO_NAMESPACE POA_PortableServer
 #endif // end #if !defined
 
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
   class TAO_Export AdapterActivator :  public virtual TAO_Local_ServantBase
@@ -691,6 +717,8 @@ TAO_NAMESPACE POA_PortableServer
                              );
     virtual CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent, const char *name,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::AdapterActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -706,7 +734,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_AdapterActivator (
                                       AdapterActivator_ptr  servant,
-                                      TAO_Stub *stub
+                                      STUB_Object *stub
                                       );
     AdapterActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -741,6 +769,7 @@ TAO_NAMESPACE POA_PortableServer
     virtual void* _downcast (
                              const char* logical_type_id
                              );
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
@@ -757,7 +786,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ServantManager (
                                     ServantManager_ptr  servant,
-                                    TAO_Stub *stub
+                                    STUB_Object *stub
                                     );
     ServantManager_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -791,6 +820,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual void etherealize (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, PortableServer::Servant serv, CORBA::Boolean cleanup_in_progress, CORBA::Boolean remaining_activations,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::ServantActivator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -807,7 +838,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ServantActivator (
                                       ServantActivator_ptr  servant,
-                                      TAO_Stub *stub
+                                      STUB_Object *stub
                                       );
     ServantActivator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -858,6 +889,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual void postinvoke (const PortableServer::ObjectId &oid, PortableServer::POA_ptr adapter, const char *operation, PortableServer::ServantLocator::Cookie the_cookie, PortableServer::Servant the_servant,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::ServantLocator *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -874,7 +907,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_ServantLocator (
                                     ServantLocator_ptr  servant,
-                                    TAO_Stub *stub
+                                    STUB_Object *stub
                                     );
     ServantLocator_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -904,7 +937,6 @@ TAO_NAMESPACE POA_PortableServer
 
 #endif // end #if !defined
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
   class POA;
   typedef POA *POA_ptr;
@@ -926,27 +958,27 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual void destroy (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::ThreadPolicy_ptr  create_thread_policy (PortableServer::ThreadPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
     virtual PortableServer::LifespanPolicy_ptr  create_lifespan_policy (PortableServer::LifespanPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual PortableServer::IdUniquenessPolicy_ptr  create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual PortableServer::IdAssignmentPolicy_ptr  create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::ImplicitActivationPolicy_ptr  create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual PortableServer::ServantRetentionPolicy_ptr  create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual PortableServer::RequestProcessingPolicy_ptr  create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+    // **************************************************
+    //
+    // TAO spcific POA locking policy (non-standard)
+    //
+    // **************************************************
+
+    virtual PortableServer::SynchronizationPolicy_ptr  create_synchronization_policy (PortableServer::SynchronizationPolicyValue value,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual char * the_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
 
@@ -954,8 +986,6 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual PortableServer::POAManager_ptr  the_POAManager (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::AdapterActivator_ptr  the_activator (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
 
     virtual void the_activator(PortableServer::AdapterActivator_ptr the_activator, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
@@ -968,8 +998,6 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual void set_servant (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
     virtual PortableServer::ObjectId * activate_object (PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
     virtual void activate_object_with_id (const PortableServer::ObjectId &id, PortableServer::Servant p_servant,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
@@ -992,6 +1020,8 @@ TAO_NAMESPACE POA_PortableServer
 
     virtual CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid,  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
 
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     PortableServer::POA *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -1007,7 +1037,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_POA (
                          POA_ptr  servant,
-                         TAO_Stub *stub
+                         STUB_Object *stub
                          );
     POA_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -1030,16 +1060,10 @@ TAO_NAMESPACE POA_PortableServer
                           CORBA::Boolean wait_for_completion,
                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                           );
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::ThreadPolicy_ptr create_thread_policy (
                                                                    PortableServer::ThreadPolicyValue value,
                                                                    CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                                                    );
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
     virtual PortableServer::LifespanPolicy_ptr create_lifespan_policy (
                                                                        PortableServer::LifespanPolicyValue value,
                                                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
@@ -1052,8 +1076,6 @@ TAO_NAMESPACE POA_PortableServer
                                                                                 PortableServer::IdAssignmentPolicyValue value,
                                                                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                                                                 );
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
                                                                                             PortableServer::ImplicitActivationPolicyValue value,
                                                                                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
@@ -1066,8 +1088,17 @@ TAO_NAMESPACE POA_PortableServer
                                                                                           PortableServer::RequestProcessingPolicyValue value,
                                                                                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                                                                           );
-#endif /* TAO_HAS_MINIMUM_CORBA */
 
+    // **************************************************
+    //
+    // TAO spcific POA locking policy (non-standard)
+    //
+    // **************************************************
+
+    virtual PortableServer::SynchronizationPolicy_ptr create_synchronization_policy (
+                                                                                     PortableServer::SynchronizationPolicyValue value,
+                                                                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                                                                     );
 
     virtual char*  the_name (
                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
@@ -1078,8 +1109,6 @@ TAO_NAMESPACE POA_PortableServer
     virtual PortableServer::POAManager_ptr the_POAManager (
                                                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                                            );
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
     virtual PortableServer::AdapterActivator_ptr the_activator (
                                                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                                                                 );
@@ -1100,9 +1129,6 @@ TAO_NAMESPACE POA_PortableServer
                               PortableServer::Servant p_servant,
                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
                               );
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
     virtual PortableServer::ObjectId * activate_object (
                                                         PortableServer::Servant p_servant,
                                                         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
@@ -1173,8 +1199,12 @@ TAO_NAMESPACE POA_PortableServer
                              const char* logical_type_id
                              );
     virtual PortableServer::POA_ptr  get_POA ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
+    static void get_POA_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     virtual PortableServer::ObjectId * get_object_id ( CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0; // pure virtual
+    static void get_object_id_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
     virtual void _dispatch (CORBA::ServerRequest &req, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
@@ -1192,7 +1222,7 @@ TAO_NAMESPACE POA_PortableServer
   public:
     _tao_collocated_Current (
                              Current_ptr  servant,
-                             TAO_Stub *stub
+                             STUB_Object *stub
                              );
     Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -1221,8 +1251,5 @@ TAO_NAMESPACE POA_PortableServer
 #include "POAS.i"
 #endif // defined INLINE
 
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
 
 #endif /* TAO_IDL_POAS_H */
diff --git a/TAO/tao/POAS.i b/TAO/tao/POAS.i
index ea63bcf1531..c94824088b9 100644
--- a/TAO/tao/POAS.i
+++ b/TAO/tao/POAS.i
@@ -7,15 +7,11 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::ThreadPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
@@ -31,17 +27,11 @@ ACE_INLINE void POA_PortableServer::ThreadPolicy::_get_policy_type_skel (CORBA::
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ThreadPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::LifespanPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
@@ -57,15 +47,11 @@ ACE_INLINE void POA_PortableServer::LifespanPolicy::_get_policy_type_skel (CORBA
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::LifespanPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
@@ -81,15 +67,11 @@ ACE_INLINE void POA_PortableServer::IdUniquenessPolicy::_get_policy_type_skel (C
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdUniquenessPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
@@ -105,17 +87,11 @@ ACE_INLINE void POA_PortableServer::IdAssignmentPolicy::_get_policy_type_skel (C
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::IdAssignmentPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
@@ -131,15 +107,11 @@ ACE_INLINE void POA_PortableServer::ImplicitActivationPolicy::_get_policy_type_s
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ImplicitActivationPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
@@ -155,15 +127,11 @@ ACE_INLINE void POA_PortableServer::ServantRetentionPolicy::_get_policy_type_ske
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::ServantRetentionPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
 {
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
@@ -179,18 +147,39 @@ ACE_INLINE void POA_PortableServer::RequestProcessingPolicy::_get_policy_type_sk
   POA_CORBA::Policy_ptr impl = (POA_PortableServer::RequestProcessingPolicy_ptr) obj;
   POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
+// **************************************************
+//
+// TAO spcific POA locking policy (non-standard)
+//
+// **************************************************
+
+// skeleton destructor
+ACE_INLINE
+POA_PortableServer::SynchronizationPolicy::~SynchronizationPolicy (void)
+{
+}
+ACE_INLINE void POA_PortableServer::SynchronizationPolicy::copy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::SynchronizationPolicy_ptr) obj;
+  POA_CORBA::Policy::copy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::SynchronizationPolicy::destroy_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::SynchronizationPolicy_ptr) obj;
+  POA_CORBA::Policy::destroy_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
+ACE_INLINE void POA_PortableServer::SynchronizationPolicy::_get_policy_type_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA::Environment &env)
+{
+  POA_CORBA::Policy_ptr impl = (POA_PortableServer::SynchronizationPolicy_ptr) obj;
+  POA_CORBA::Policy::_get_policy_type_skel (req, (POA_CORBA::Policy_ptr) impl, context, env);
+}
 
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::POAManager::~POAManager (void)
 {
 }
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::AdapterActivator::~AdapterActivator (void)
@@ -211,9 +200,6 @@ ACE_INLINE
 POA_PortableServer::ServantLocator::~ServantLocator (void)
 {
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 // skeleton destructor
 ACE_INLINE
 POA_PortableServer::POA::~POA (void)
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 5572d879cf1..df50b4317b2 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -7,10 +7,10 @@
 //    TAO
 //
 // = FILENAME
-//   POA_CORBA.h
+//    POA_CORBA.h
 //
-//   This file is created by merging the CurrentS.h, PolicyS.h,
-//   PollableS.h, DomainC.h and DynAnyS.h files which have been removed.
+//    This file is created by merging the PolicyS.h and CurrentS.h files which
+//    have been removed.
 //
 // = AUTHOR
 //
@@ -29,70 +29,14 @@
 #ifndef TAO_IDL_POA_CORBA_H
 #define TAO_IDL_POA_CORBA_H
 
-#include "tao/CurrentC.h"
 #include "tao/PolicyC.h"
+#include "tao/CurrentC.h"
 #include "tao/DynAnyC.h"
-#include "tao/DomainC.h"
 #include "tao/Servant_Base.h"
-#if defined(TAO_POLLER)
-#include "tao/PollableC.h"
-#endif /* TAO_POLLER */
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
 
 class TAO_Export  POA_CORBA
 {
 public:
-  // ****************************************************************
-
-  class Current;
-  typedef Current *Current_ptr;
-  class  Current :  public virtual TAO_ServantBase
-  {
-  protected:
-    Current (void);
-  public:
-    virtual ~Current (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
-    ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-    virtual const char* _interface_repository_id (void) const;
-
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Current_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  };
-
-  class  _tao_collocated_Current     : public virtual CORBA_Current
-  {
-  public:
-    _tao_collocated_Current (
-        Current_ptr  servant,
-        TAO_Stub *stub
-      );
-    Current_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
-      );
-
-  private:
-    Current_ptr servant_;
-  };
-
-  // ****************************************************************
-
   class Policy;
   typedef Policy *Policy_ptr;
   class TAO_Export  Policy :  public virtual TAO_ServantBase
@@ -100,30 +44,16 @@ public:
   protected:
     Policy (void);
   public:
-    Policy (const Policy& rhs);
     virtual ~Policy (void);
-
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-
     virtual void* _downcast (
         const char* logical_type_id
       );
-
     virtual CORBA::PolicyType policy_type (
         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
        ) = 0;
-
-    virtual CORBA::Policy_ptr copy (
-        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
-       ) = 0;
-
-    virtual void destroy (
-        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
-       ) = 0;
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
     static void _get_policy_type_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
@@ -131,6 +61,9 @@ public:
         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
       );
 
+    virtual CORBA::Policy_ptr copy (
+        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+       ) = 0;
     static void copy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
@@ -138,6 +71,9 @@ public:
         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
       );
 
+    virtual void destroy (
+        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+       ) = 0;
     static void destroy_skel (
         CORBA::ServerRequest &_tao_req,
         void *_tao_obj,
@@ -145,48 +81,24 @@ public:
         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
       );
 
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA_Environment &TAO_IN_ENV =
-          CORBA::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA_Environment &TAO_IN_ENV =
-          CORBA::default_environment ()
-      );
+    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    CORBA_Policy_ptr _this (
-        CORBA_Environment &TAO_IN_ENV =
-          CORBA::default_environment ());
+    ACE_CORBA_1(Policy) *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
+  };
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Policy_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-  };
+#if !defined (_CORBA_POLICY___COLLOCATED_SH_)
+#define _CORBA_POLICY___COLLOCATED_SH_
 
   class TAO_Export  _tao_collocated_Policy     : public virtual CORBA_Policy
   {
   public:
     _tao_collocated_Policy (
         Policy_ptr  servant,
-        TAO_Stub *stub
+        STUB_Object *stub
       );
     Policy_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
@@ -207,567 +119,61 @@ public:
     Policy_ptr servant_;
   };
 
-  // ****************************************************************
-
-  class PolicyManager;
-  typedef PolicyManager *PolicyManager_ptr;
-  class TAO_Export PolicyManager :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    PolicyManager (void);
-  public:
-    PolicyManager (const PolicyManager& rhs);
-    virtual ~PolicyManager (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::PolicyManager *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_PolicyManager     : public virtual CORBA::PolicyManager
-  {
-  public:
-    _tao_collocated_PolicyManager (
-        PolicyManager_ptr  servant,
-        TAO_Stub *stub
-      );
-    PolicyManager_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PolicyManager_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class PolicyCurrent;
-  typedef PolicyCurrent *PolicyCurrent_ptr;
-  class TAO_Export PolicyCurrent : public virtual PolicyManager, public virtual Current
-  {
-  protected:
-    PolicyCurrent (void);
-  public:
-    PolicyCurrent (const PolicyCurrent& rhs);
-    virtual ~PolicyCurrent (void);
 
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+#endif /* end #if !defined */
 
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
 
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
 
-    CORBA::PolicyCurrent *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_PolicyCurrent     : public virtual CORBA::PolicyCurrent,
-      public virtual _tao_collocated_PolicyManager,
-      public virtual _tao_collocated_Current
-  {
-  public:
-    _tao_collocated_PolicyCurrent (
-        PolicyCurrent_ptr  servant,
-        TAO_Stub *stub
-      );
-    PolicyCurrent_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PolicyCurrent_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class DomainManager;
-  typedef DomainManager *DomainManager_ptr;
-  class  DomainManager :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    DomainManager (void);
-
-  public:
-    DomainManager (const DomainManager& rhs);
-    virtual ~DomainManager (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-        static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    CORBA::DomainManager *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-    virtual CORBA::Policy_ptr get_domain_policy (
-      CORBA::PolicyType policy_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        CORBA::default_environment ()
-    ) = 0;
-    static void get_domain_policy_skel (
-      CORBA::ServerRequest &_tao_req, 
-      void *_tao_obj, 
-      void *_tao_context, 
-      CORBA::Environment &_tao_env = 
-        CORBA::default_environment ()
-    );
-
-  };
-
-  class  _tao_collocated_DomainManager : public virtual CORBA::DomainManager
-  {
-  public:
-    _tao_collocated_DomainManager (
-        DomainManager_ptr  servant,
-        TAO_Stub *stub
-      );
-    DomainManager_ptr _get_servant (void) const;
-        virtual CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-  
-  private:
-    DomainManager_ptr servant_;
-  };
-
-  // ****************************************************************
+#if defined(_MSC_VER)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
 
-#if defined (TAO_POLLER)
-  class Pollable;
-  typedef Pollable *Pollable_ptr;
-  class TAO_Export Pollable :  public virtual PortableServer::ServantBase
+  class Current;
+  typedef Current *Current_ptr;
+  class  Current :  public virtual TAO_ServantBase
   {
   protected:
-    Pollable (void);
+    Current (void);
   public:
-    Pollable (const Pollable& rhs);
-    virtual ~Pollable (void);
+    virtual ~Current (void);
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual void* _downcast (
         const char* logical_type_id
       );
-    virtual CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void is_ready_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+    static void _is_a_skel (CORBA::ServerRequest &req, void *obj, void *context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+    virtual void _dispatch (CORBA::ServerRequest &_tao_req, void *_tao_context, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
 
-    CORBA::Pollable *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
+    ACE_CORBA_1(Current) *_this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
     virtual const char* _interface_repository_id (void) const;
   };
 
-  class TAO_Export _tao_collocated_Pollable     : public virtual CORBA::Pollable
-  {
-  public:
-    _tao_collocated_Pollable (
-        Pollable_ptr  servant,
-        TAO_Stub *stub
-      );
-    Pollable_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    Pollable_ptr servant_;
-  };
 
-  // ****************************************************************
+#if !defined (_CORBA_CURRENT___COLLOCATED_SH_)
+#define _CORBA_CURRENT___COLLOCATED_SH_
 
-  class DIIPollable;
-  typedef DIIPollable *DIIPollable_ptr;
-  class TAO_Export DIIPollable : public virtual Pollable
-  {
-  protected:
-    DIIPollable (void);
-  public:
-    DIIPollable (const DIIPollable& rhs);
-    virtual ~DIIPollable (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::Boolean in_mult_inheritance (void);
-
-    static void is_ready_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void create_pollable_set_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::DIIPollable *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
-  };
-
-  class TAO_Export _tao_collocated_DIIPollable     : public virtual CORBA::DIIPollable,
-      public virtual _tao_collocated_Pollable
+  class  _tao_collocated_Current     : public virtual CORBA_Current
   {
   public:
-    _tao_collocated_DIIPollable (
-        DIIPollable_ptr  servant,
-        TAO_Stub *stub
+    _tao_collocated_Current (
+        Current_ptr  servant,
+        STUB_Object *stub
       );
-    DIIPollable_ptr _get_servant (void) const;
+    Current_ptr _get_servant (void) const;
     virtual CORBA::Boolean _is_a (
         const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
+        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
       );
 
   private:
-    DIIPollable_ptr servant_;
-  };
-
-  // ****************************************************************
-
-  class PollableSet;
-  typedef PollableSet *PollableSet_ptr;
-  class TAO_Export PollableSet :  public virtual PortableServer::ServantBase
-  {
-  protected:
-    PollableSet (void);
-  public:
-    PollableSet (const PollableSet& rhs);
-    virtual ~PollableSet (void);
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-    virtual CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void create_dii_pollable_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void add_pollable_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void poll_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void remove_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      ) = 0;
-    static void number_left_skel (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_obj,
-        void *_tao_context,
-        CORBA::Environment &_tao_env =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-    CORBA::PollableSet *_this (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual const char* _interface_repository_id (void) const;
+    Current_ptr servant_;
   };
 
-  class TAO_Export _tao_collocated_PollableSet : public virtual CORBA::PollableSet
-  {
-  public:
-    _tao_collocated_PollableSet (
-        PollableSet_ptr  servant,
-        TAO_Stub *stub
-      );
-    PollableSet_ptr _get_servant (void) const;
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    virtual CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-  private:
-    PollableSet_ptr servant_;
-  };
-#endif /* 0 */
 
-  // ****************************************************************
+#endif /* end #if !defined */
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
 
 class DynAny;
 typedef DynAny *DynAny_ptr;
@@ -1027,21 +433,19 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynAny_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNANY___COLLOCATED_SH_)
+#define _CORBA_DYNANY___COLLOCATED_SH_
 
 class  _tao_collocated_DynAny : public virtual CORBA_DynAny
 {
 public:
   _tao_collocated_DynAny (
       DynAny_ptr  servant,
-      TAO_Stub *stub
-     );
+      STUB_Object *stub
+    );
   DynAny_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
       const char *logical_type_id,
@@ -1051,7 +455,7 @@ public:
   virtual CORBA::TypeCode_ptr type (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
-    );
+     );
   virtual void assign (
       CORBA_DynAny_ptr CORBA_Dyn_any,
       CORBA::Environment &TAO_IN_ENV =
@@ -1240,6 +644,11 @@ private:
   DynAny_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
+
 class DynEnum;
 typedef DynEnum *DynEnum_ptr;
 class TAO_Export DynEnum : public virtual DynAny
@@ -1291,13 +700,11 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynEnum_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNENUM___COLLOCATED_SH_)
+#define _CORBA_DYNENUM___COLLOCATED_SH_
 
 class  _tao_collocated_DynEnum : public virtual CORBA_DynEnum,
     public virtual _tao_collocated_DynAny
@@ -1305,7 +712,7 @@ class  _tao_collocated_DynEnum : public virtual CORBA_DynEnum,
 public:
   _tao_collocated_DynEnum (
       DynEnum_ptr  servant,
-      TAO_Stub *stub
+      STUB_Object *stub
     );
   DynEnum_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
@@ -1336,6 +743,10 @@ private:
   DynEnum_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynStruct;
 typedef DynStruct *DynStruct_ptr;
 class TAO_Export DynStruct : public virtual DynAny
@@ -1363,13 +774,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
-  virtual CORBA::NameValuePairSeq * get_members (
+  virtual NameValuePairSeq * get_members (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_members (
-      const CORBA::NameValuePairSeq & value,
+      const NameValuePairSeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
@@ -1386,13 +797,11 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynStruct_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNSTRUCT___COLLOCATED_SH_)
+#define _CORBA_DYNSTRUCT___COLLOCATED_SH_
 
 class  _tao_collocated_DynStruct : public virtual CORBA_DynStruct,
     public virtual _tao_collocated_DynAny
@@ -1400,7 +809,7 @@ class  _tao_collocated_DynStruct : public virtual CORBA_DynStruct,
 public:
   _tao_collocated_DynStruct (
       DynStruct_ptr  servant,
-      TAO_Stub *stub
+      STUB_Object *stub
     );
   DynStruct_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
@@ -1416,12 +825,12 @@ public:
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
-  virtual CORBA::NameValuePairSeq * get_members (
+  virtual NameValuePairSeq * get_members (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_members (
-      const CORBA::NameValuePairSeq & value,
+      const NameValuePairSeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
@@ -1430,6 +839,10 @@ private:
   DynStruct_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynUnion;
 typedef DynUnion *DynUnion_ptr;
 class TAO_Export DynUnion : public virtual DynAny
@@ -1501,13 +914,11 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynUnion_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNUNION___COLLOCATED_SH_)
+#define _CORBA_DYNUNION___COLLOCATED_SH_
 
 class  _tao_collocated_DynUnion : public virtual CORBA_DynUnion,
     public virtual _tao_collocated_DynAny
@@ -1515,7 +926,7 @@ class  _tao_collocated_DynUnion : public virtual CORBA_DynUnion,
 public:
   _tao_collocated_DynUnion (
       DynUnion_ptr  servant,
-      TAO_Stub *stub
+      STUB_Object *stub
     );
   DynUnion_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
@@ -1562,6 +973,10 @@ private:
   DynUnion_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynSequence;
 typedef DynSequence *DynSequence_ptr;
 class TAO_Export DynSequence : public virtual DynAny
@@ -1590,13 +1005,13 @@ public:
         CORBA::Environment::default_environment ()
      ) = 0;
 
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
@@ -1621,13 +1036,11 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynSequence_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNSEQUENCE___COLLOCATED_SH_)
+#define _CORBA_DYNSEQUENCE___COLLOCATED_SH_
 
 class  _tao_collocated_DynSequence : public virtual CORBA_DynSequence,
     public virtual _tao_collocated_DynAny
@@ -1635,7 +1048,7 @@ class  _tao_collocated_DynSequence : public virtual CORBA_DynSequence,
 public:
   _tao_collocated_DynSequence (
       DynSequence_ptr  servant,
-      TAO_Stub *stub
+      STUB_Object *stub
     );
   DynSequence_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
@@ -1652,12 +1065,12 @@ public:
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
@@ -1666,6 +1079,10 @@ private:
   DynSequence_ptr servant_;
 };
 
+
+#endif /* end #if !defined */
+
+
 class DynArray;
 typedef DynArray *DynArray_ptr;
 class TAO_Export DynArray : public virtual DynAny
@@ -1683,13 +1100,13 @@ public:
   virtual void* _downcast (
       const char* logical_type_id
     );
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
 
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      ) = 0;
@@ -1706,13 +1123,11 @@ public:
         CORBA::Environment::default_environment ()
     );
   virtual const char* _interface_repository_id (void) const;
+};
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef DynArray_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
 
-};
+#if !defined (_CORBA_DYNARRAY___COLLOCATED_SH_)
+#define _CORBA_DYNARRAY___COLLOCATED_SH_
 
 class  _tao_collocated_DynArray : public virtual CORBA_DynArray,
     public virtual _tao_collocated_DynAny
@@ -1720,7 +1135,7 @@ class  _tao_collocated_DynArray : public virtual CORBA_DynArray,
 public:
   _tao_collocated_DynArray (
       DynArray_ptr  servant,
-      TAO_Stub *stub
+      STUB_Object *stub
     );
   DynArray_ptr _get_servant (void) const;
   virtual CORBA::Boolean _is_a (
@@ -1728,12 +1143,12 @@ public:
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
     );
-  virtual CORBA_AnySeq * get_elements (
+  virtual AnySeq * get_elements (
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
   virtual void set_elements (
-      const CORBA_AnySeq & value,
+      const AnySeq & value,
       CORBA::Environment &TAO_IN_ENV =
         CORBA::Environment::default_environment ()
      );
@@ -1742,99 +1157,9 @@ private:
   DynArray_ptr servant_;
 };
 
-  class ConstructionPolicy;
-  typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  class  ConstructionPolicy : public virtual Policy
-  {
-  protected:
-    ConstructionPolicy (void);
-
-  public:
-    ConstructionPolicy (const ConstructionPolicy& rhs);
-    virtual ~ConstructionPolicy (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-        static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-
-    CORBA::ConstructionPolicy *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
 
-    virtual const char* _interface_repository_id (void) const;
-    virtual void make_domain_manager (
-      CORBA::InterfaceDef_ptr object_type,
-      CORBA::Boolean constr_policy,
-      CORBA::Environment &ACE_TRY_ENV = 
-        CORBA::default_environment ()
-    ) = 0;
-  static void make_domain_manager_skel (
-      CORBA::ServerRequest &_tao_req, 
-      void *_tao_obj, 
-      void *_tao_context, 
-      CORBA::Environment &_tao_env = 
-        CORBA::default_environment ()
-    );
+#endif /* end #if !defined */
 
-  };
-
-  class  _tao_collocated_ConstructionPolicy : public virtual CORBA::ConstructionPolicy,
-      public virtual _tao_collocated_Policy
-  {
-  public:
-    _tao_collocated_ConstructionPolicy (
-        ConstructionPolicy_ptr  servant,
-        TAO_Stub *stub
-      );
-    ConstructionPolicy_ptr _get_servant (void) const;
-        virtual void make_domain_manager (
-        CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy,
-        CORBA::Environment &ACE_TRY_ENV = 
-          CORBA::default_environment ()
-      );
-    virtual CORBA::Boolean _is_a (
-        const char *logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  
-  private:
-    ConstructionPolicy_ptr servant_;
-  };
-
-#endif /* ! defined TAO_HAS_MINIMUM_CORBA */
 
 #if defined(_MSC_VER)
 #pragma warning(default:4250)
@@ -1842,6 +1167,7 @@ private:
 
 };
 
+
 #if defined(_MSC_VER)
 #pragma warning(default:4250)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp
index 051c17f07f4..766a2dd06f9 100644
--- a/TAO/tao/Pluggable.cpp
+++ b/TAO/tao/Pluggable.cpp
@@ -1,23 +1,29 @@
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
+// ============================================================================
+//
+// = LIBRARY
+//
+// = FILENAME
+//
+// = DESCRIPTION
+//
+// = AUTHOR
+//
+// ============================================================================
+
 #include "tao/Pluggable.h"
 #include "tao/Stub.h"
 #include "tao/Environment.h"
 #include "tao/GIOP.h"
 
-#if !defined (__ACE_INLINE__)
-# include "tao/Pluggable.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(tao, Pluggable, "$Id$")
-
-TAO_Connector_Registry::TAO_Connector_Registry (void)
-  : iiop_connector_ (0)
+TAO_Connector_Registry::TAO_Connector_Registry()
+  : iiop_connector_(0)
 {
 }
 
-TAO_Connector_Registry::~TAO_Connector_Registry (void)
+TAO_Connector_Registry::~TAO_Connector_Registry()
 {
 }
 
@@ -26,28 +32,26 @@ TAO_Connector_Registry::get_connector (CORBA::ULong tag)
 {
   // For now, only IIOP connectors.
   if (tag != TAO_IOP_TAG_INTERNET_IOP)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Invalid connector tag %d\n",
-                       tag),
-                      0);
-  else
-    return iiop_connector_;
+  {
+    ACE_DEBUG ((LM_DEBUG, "Invalid connector tag %d\n", tag));
+    return 0;
+  }
+
+  return iiop_connector_;
 }
 
 CORBA::Boolean
 TAO_Connector_Registry::add_connector (TAO_Connector *connector)
 {
+
   if (connector->tag() == TAO_IOP_TAG_INTERNET_IOP)
-    {
-      // do not copy, but save the reference (i.e. pointer)
-      this->iiop_connector_ = connector;
-      return 1;
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Invalid connector tag %d\n",
-                       connector->tag ()),
-                      0);
+  {
+    // do not copy, but save the reference (i.e. pointer)
+    this->iiop_connector_ = connector;
+    return 1;
+  }
+  ACE_DEBUG ((LM_DEBUG, "Invalid connector tag %d\n", connector->tag()));
+  return 0;
 }
 
 int
@@ -56,8 +60,7 @@ TAO_Connector_Registry::open(TAO_Resource_Factory *trf, ACE_Reactor *reactor)
   // @@ Once again since we only accept 1 iiop connector, this is easy
   if (iiop_connector_)
     return this->iiop_connector_->open (trf, reactor);
-  else
-    return 0;
+  return 0;
 }
 
 int
@@ -67,89 +70,102 @@ TAO_Connector_Registry::close_all()
   //    since there is only one!
   if (iiop_connector_)
     return this->iiop_connector_->close ();
-  else
-    return 0;
+  return 0;
 }
 
 int
-TAO_Connector_Registry::preconnect (const char *the_preconnections)
+TAO_Connector_Registry::preconnect (const char* the_preconnections)
 {
   // It would be good to use auto_ptr<> to guard against premature
   // termination and, thus, leaks.
   int result=0;
   char *preconnections = ACE_OS::strdup (the_preconnections);
 
-  // @@ OK, what we should do is parse the string so that we can
-  // gather @@ together addresses of the same protocol together and
-  // pass to the @@ appropriate connector.  But, for now we ASSUME
-  // they are all @@ INET IP:Port!! HACK. fredk
+  // @@ OK, what we should do is parse the string so that we can gather
+  // @@ together addresses of the same protocol together and pass to the
+  // @@ appropriate connector.  But, for now we ASSUME they are all
+  // @@ INET IP:Port!! HACK. fredk
 
   if (this->iiop_connector_)
-    result = this->iiop_connector_->preconnect (preconnections);
+    result = this->iiop_connector_->preconnect(preconnections);
 
   ACE_OS::free (preconnections);
 
   return result;
+
 }
 
-int
-TAO_Connector_Registry::connect (TAO_Stub *&obj,
-                                 TAO_Transport *&transport)
+TAO_Profile *
+TAO_Connector_Registry::connect (STUB_Object *&obj,
+                                 CORBA::Environment &env)
 {
+  TAO_Profile *profile;
   CORBA::ULong req_tag = TAO_IOP_TAG_INTERNET_IOP;
-  TAO_Profile *profile = obj->profile_in_use ();
+
+  // @@ FRED _ For now still only support ONE profile!
+  if (! (profile = obj->get_fwd_profile ()))
+    profile = obj->profile_in_use ();
 
   // @@ And the profile selection policy is .... ONLY IIOP, and the
   // @@ first one found!
   if (profile->tag () != req_tag)
-    return -1;
+  {
+    TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, 0);
+  }
+
+  // obj->set_profile_in_use (profile);
 
-  // here is where we get the appropriate connector object but we are
-  // the Connector Registry so call get_connector(tag)
+  // here is where we get the appropriate connector object
+  // but we are the Connector Registry so call get_connector(tag)
 
-  TAO_Connector *connector =
-    this->get_connector (req_tag);
+  TAO_Connector *connector = this->get_connector(req_tag);
+
+  TAO_Transport *transport = connector->connect(profile, env);
+  TAO_CHECK_ENV_RETURN (env, 0);
+
+  if (transport == 0)
+    return 0;
 
-  return connector->connect (profile, transport);
+  return profile;
 }
 
-TAO_IOP_Version::~TAO_IOP_Version (void)
+Version::~Version (void)
 {
 }
 
-TAO_IOP_Version::TAO_IOP_Version (const TAO_IOP_Version &src)
+Version::Version (const Version &src)
   : major (src.major),
     minor (src.minor)
 {
 }
 
-TAO_IOP_Version::TAO_IOP_Version (CORBA::Octet maj, CORBA::Octet min)
+Version::Version (CORBA::Octet maj, CORBA::Octet min)
   : major (maj),
     minor (min)
 {
 }
 
 void
-TAO_IOP_Version::set_version (CORBA::Octet maj, CORBA::Octet min)
+Version::set_version (CORBA::Octet maj, CORBA::Octet min)
 {
   this->major = maj;
   this->minor = min;
 }
 
 int
-TAO_IOP_Version::operator== (const TAO_IOP_Version *&src)
+Version::operator== (const Version *&src)
 {
-  return this->major == src->major && this->minor == src->minor;
+  return (this->major == src->major && this->minor == src->minor);
 }
 
 int
-TAO_IOP_Version::operator== (const TAO_IOP_Version &src)
+Version::operator== (const Version &src)
 {
-  return this->major == src.major && this->minor == src.minor;
+  return (this->major == src.major && this->minor == src.minor);
 }
 
-TAO_IOP_Version &
-TAO_IOP_Version::operator= (const TAO_IOP_Version &src)
+Version &
+Version::operator= (const Version &src)
 {
   this->major = src.major;
   this->minor = src.minor;
diff --git a/TAO/tao/Pluggable.h b/TAO/tao/Pluggable.h
index c732e529b18..a42befbb0c3 100644
--- a/TAO/tao/Pluggable.h
+++ b/TAO/tao/Pluggable.h
@@ -13,7 +13,7 @@
 //     Interface for the TAO pluggable protocol frameowrk.
 //
 // = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
+//     Fred Kuhns
 //
 // ============================================================================
 
@@ -21,428 +21,205 @@
 #define TAO_PLUGGABLE_H
 
 #include "tao/corbafwd.h"
+#include "tao/Typecode.h"
 
-// Forward declarations.
 class ACE_Addr;
 class ACE_Reactor;
 class TAO_ORB_Core;
 
-class TAO_Stub;
+class STUB_Object;
 class TAO_Profile;
 class TAO_MProfile;
 class TAO_Resource_Factory;
 
+// Generic definitions for the new Transport class.
+// NOTE, the transport object is created in the Service handler constructor
+// and delted in the service handlers destructor!!
+
 class TAO_Export TAO_Transport
 {
-  // = TITLE
-  //   Generic definitions for the new Transport class.
-  //
-  // = DESCRIPTION
-  //   The transport object is created in the Service handler
-  //   constructor and deleted in the service handlers destructor!!
-
 public:
   virtual CORBA::ULong tag (void) = 0;
   // The tag, each concrete class will have a specific tag value.
 
-  virtual void close_connection() = 0;
-  // Call the corresponding connection handler's <handle_close>
-  // method.
+  virtual int idle (void) = 0;
+  virtual void close_conn() = 0;
+  virtual void resume_conn (ACE_Reactor *reactor) = 0;
 
-  virtual void resume_connection (ACE_Reactor *reactor) = 0;
-  // Calls the Reactor's <resume_handler> on behalf of the
-  // corresponding connection handler.
-  // @@ Fred: who does the suspend_handler thing? The transport object
-  //    itself? Can we clarify the relantionship between PP and the
-  //    leader-follower protocol on the client side.
+  virtual ssize_t send (const ACE_Message_Block *mblk) = 0;
+  virtual ssize_t send (const u_char *buf, size_t len) = 0;
+  virtual ssize_t send (const iovec *iov, int iovcnt) = 0;
 
-  virtual int idle (void) = 0;
-  // Idles the corresponding connection handler.
+  virtual ssize_t receive (char *buf, size_t len) = 0;
+  virtual ssize_t receive (iovec *iov, int iovcnt) = 0;
 
+  virtual TAO_Transport *_nil (void) = 0;
   virtual int is_nil (TAO_Transport *obj) = 0;
-  // returns 0 if the obj is 0.
-  // @@ Fred: what are this two methods? Are they related to the
-  //    IDL-generated methods of similar names? You may want to know
-  //    that they added those methods for ORBs that map Foo_ptr to a
-  //    class instead of Foo*, but we are not required to do that for
-  //    PP, right?
 
-  virtual TAO_Transport *_nil (void) = 0;
-  // Return a NULL pointer of type TAO_Transport *.
-
-  virtual ACE_HANDLE handle (void) = 0;
-  // This is primarily used for error and debugging messages!
-  // @@ Fred: what about connecting to the reactor?
-
-  virtual ssize_t send (const ACE_Message_Block *mblk,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the contents of the Message_Block to the connection.
-  // @@ Fred: I assume this writes the complete message block chain?
-  //    Can you document that? Can this be written in the base class
-  //    in terms of send(iovec)? Ditto for the next method?
-  // @@ Fred: why do we have time values here?  Isn't the time out
-  //    going to be obtained from the policies in the ORB? Or did I
-  //    said that we expected to always have timeouts so it should be
-  //    part of the interface, I don't remember....
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual ssize_t send (const u_char *buf,
-                        size_t len,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the contents of the buffer of length len to the connection.
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual ssize_t send (const iovec *iov,
-                        int iovcnt,
-                        ACE_Time_Value *s = 0) = 0;
-  // Write the contents of iovcnt iovec's to the connection.
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        ACE_Time_Value *s = 0) = 0;
-  // Read len bytes from into buf.
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual ssize_t recv (char *buf,
-                        size_t len,
-                        int flags,
-                        ACE_Time_Value *s = 0) = 0;
-  // Read len bytes from into buf using flags.
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual ssize_t recv (iovec *iov,
-                        int iovcnt,
-                        ACE_Time_Value *s = 0) = 0;
-  //  Read received data into the iovec buffers.
-  // @@ Fred: how do we report a timeout back to the higher levels? A
-  //    special return code? An exception? Use (yuk!) errno?
-
-  virtual int send_request (TAO_ORB_Core *orb_core,
-                            TAO_OutputCDR &stream,
+  virtual int send_request (TAO_ORB_Core *orb_core, 
+                            TAO_OutputCDR &stream, 
                             int twoway) = 0;
-  // Default action to be taken for send request.
-
-  //  virtual int send_response (TAO_OutputCDR &response) = 0;
-  // @@ Fred: I guess that send_reponse is not much different from
-  //    send_request()? If the thing is obsolete please remove it, it
-  //    only makes the code harder to read.
-
-  virtual ~TAO_Transport (void);
-  // destructor
-};
-
-class TAO_Export TAO_IOP_Version
-{
-  // = TITLE
-  //   Major and Minor version number of the Inter-ORB Protocol.
-public:
-  CORBA::Octet major;
-  // Major version number
-
-  CORBA::Octet minor;
-  // Minor version number
-
-  TAO_IOP_Version (const TAO_IOP_Version &src);
-  // Copy constructor
 
-  TAO_IOP_Version (CORBA::Octet maj = 0,
-           CORBA::Octet min = 0);
-  // Default constructor.
+//  virtual int send_response (TAO_OutputCDR &response) = 0;
 
-  ~TAO_IOP_Version (void);
-  // Destructor.
+  virtual ACE_HANDLE handle(void) = 0;
+  // this is primarily used for error and debugging messages!
 
-  void set_version (CORBA::Octet maj, CORBA::Octet min);
-  // Explicitly set the major and minor version.
-
-  TAO_IOP_Version &operator= (const TAO_IOP_Version &src);
-  // Copy operator.
-
-  int operator== (const TAO_IOP_Version &src);
-  // Equality operator
-
-  int operator== (const TAO_IOP_Version *&src);
-  // Equality operator
+  virtual ~TAO_Transport(void);
 };
 
-// @@ Fred: we must implement the TAO_Generic_Profile class too!
+// Generic Profile definitions
 class TAO_Export TAO_Profile
 {
-  // = TITLE
-  //   Generic Profile definitions.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-  //
 public:
-  TAO_Profile (void);
-  // Constructor
-
-  virtual CORBA::ULong tag (void) const = 0;
+  virtual CORBA::ULong tag (void) = 0;
   // The tag, each concrete class will have a specific tag value.
-  // @@ Fred, any reason this cannot be implemented in the base class?
-  //    Do you want to save the memory required to store the tag_ for
-  //    the time required to call the virtual function?
 
-  virtual int parse (TAO_InputCDR& cdr,
-                     CORBA::Boolean& continue_decoding,
+  virtual ASYS_TCHAR *addr_to_string(void) = 0;
+  virtual int parse (TAO_InputCDR& cdr, 
+                     CORBA::Boolean& continue_decoding, 
                      CORBA::Environment &env) = 0;
-  // Initialize this object using the given CDR octet string.
-
-  virtual int parse_string (const char *string,
-                            CORBA::Environment &env) = 0;
-  // Initialize this object using the given input string.
-  // @@ Fred: is this function (and the next) to support URL style
-  //    object references? I'm not sure we want to support them for
-  //    all protocols, it was just a convinience for IIOP, mostly for
-  //    ease of debugging.  The utils/catior program should help with
-  //    that though.
-  //    Having said that: this sounds like an interesting way to
-  //    support an extensible framework for the interoperable naming
-  //    service bootstrapping procotol.
+  virtual int parse_string (const char *string, CORBA::Environment &env) = 0;
+  // Parse the CDR encapsulation in <body>...
+
+  virtual CORBA::TypeCode::traverse_status encode (TAO_OutputCDR *&stream,
+                                                   CORBA::Environment &env) = 0;
 
   virtual CORBA::String to_string (CORBA::Environment &env) = 0;
-  // Return a string representation for this profile.  client must
-  // deallocate memory.
 
-  virtual const TAO_opaque &body (void) const = 0;
+  virtual const TAO_opaque& body (void) const = 0;
   // The body, an octet sequence that represent the marshaled
-  // profile.
-  // @@ Fred: We have to think about this method: it basically
-  //          requires the profile to keep both the <body> and the
-  //          interpreted representation (as host/port/etc.)
-  //          This is good for performance reasons, but it may consume
-  //          too much memory, maybe a method like this:
-  //
-  //          void body (TAO_opaque& return_body) const = 0;
-  //
-  //          will work better.
-
-  virtual int encode (TAO_OutputCDR &stream) const = 0;
-  // Encode this profile in a stream, i.e. marshal it.
-  // @@ Fred: notice the correct use of const and references in this
-  //    method ;-)
-
-  virtual const TAO_ObjectKey &object_key (void) const = 0;
-  // @@ deprecated. return a reference to the Object Key.
-  // @@ Fred: if it is deprecated why don't we just remove it?
-
-  TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-  // @@ Fred: does it make sense to have a method to modify the object
-  //    key?
+  // profile... 
 
   virtual TAO_ObjectKey *_key (CORBA::Environment &env) = 0;
+  virtual const TAO_ObjectKey &object_key (void) const = 0;
   // Obtain the object key, return 0 if the profile cannot be parsed.
   // The memory is owned by this object (not given to the caller).
 
-  void forward_to (TAO_MProfile *mprofiles);
-  // Keep a pointer to the forwarded profile
+  virtual ACE_Addr &object_addr (const ACE_Addr *addr) = 0;
+  virtual ACE_Addr &object_addr (void) = 0;
 
-  TAO_MProfile* forward_to (void);
-  // MProfile accessor
-
-  virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
-                                        CORBA::Environment &env) = 0;
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, port, host, object_key and
-  // version are the same.
+  virtual TAO_Transport *transport(void) = 0;
+  virtual TAO_Profile *_nil (void) = 0;
 
   virtual CORBA::ULong hash (CORBA::ULong max,
                              CORBA::Environment &env) = 0;
-  // Return a hash value for this object.
 
-  virtual ASYS_TCHAR *addr_to_string(void) = 0;
-  // Return a string representation for the address.
-  // @@ Fred: who owns the string returned?
+  virtual CORBA::Boolean is_equivalent (TAO_Profile* other_profile,
+                                        CORBA::Environment &env) = 0;
 
   virtual void reset_hint (void) = 0;
-  // This method is used with a connection has been reset requiring
-  // the hint to be cleaned up and reset to NULL.
+  // this methoid is used with a connection has been reset requiring the
+  // hint to be cleaned up and reset to NULL.
 
-  virtual TAO_Profile *_nil (void) = 0;
-  // Return a null object pointer.
-  // @@ Fred: what is this method used for? Is this similar to the
-  //    *static* methods generated for IDL objects?
+  virtual void fwd_profiles (TAO_MProfile *mprofiles) = 0;
+  // object will assume ownership for this object!!
 
-  virtual CORBA::ULong _incr_refcnt (void) = 0;
-  // Increase the reference count by one on this object.
+  virtual TAO_MProfile *fwd_profiles (void) = 0;
+  // this object keeps ownership of this object
+
+  virtual TAO_MProfile *get_fwd_profiles (void) = 0;
+  // copy of MProfile, user must delete.
 
+  virtual CORBA::ULong _incr_refcnt (void) = 0;
   virtual CORBA::ULong _decr_refcnt (void) = 0;
-  // Decrement the object's reference count.  When this count goes to
-  // 0 this object will be deleted.
-  // @@ Fred: reference counting can be implemented in the base class!
 
 protected:
-  TAO_MProfile *forward_to_i (void);
-  // this object keeps ownership of this object
-
   virtual ~TAO_Profile (void);
   // If you have a virtual method you need a virtual dtor.
 
-private:
-  TAO_MProfile* forward_to_;
 };
 
+struct Version {
+  CORBA::Octet major;
+  CORBA::Octet minor;
+  
+  Version (const Version &src);
+  Version (CORBA::Octet maj = 0, CORBA::Octet min = 0);
+  ~Version (void);
+
+  void set_version (CORBA::Octet maj, CORBA::Octet min);
+  Version &operator= (const Version &src);
+  int operator== (const Version &src);
+  int operator== (const Version *&src);
+
+};
+
+// End Profile
+
 class TAO_Export TAO_Acceptor
 {
-  // = TITLE
-  //   Abstract Acceptor class used for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
+  //   TAOs Abstract Acceptor class used for pluggable protocols.
 public:
 
-  virtual TAO_Profile *create_profile (TAO_ObjectKey &object_key) = 0;
-  // Create the corresponding profile for this endpoint.
-  // @@ Fred: that <object_key> should be const.
-  // @@ Fred: we haven't thought about acceptors that service more
-  //    than one endpoint (for example: listening on sap_any). Maybe a
-  //    better interface is:
-  //    virtual int add_profiles (const TAO_ObjectKey& key,
-  //                              TAO_MProfile& mprofile) const = 0;
-  //    // Add the profiles serviced by this acceptor to the
-  //    // <mprofile> list. Use <key> to fill in the profiles.
-
-  virtual ACE_Event_Handler *acceptor (void) = 0;
+  virtual TAO_Profile *create_profile (TAO_ObjectKey& object_key) = 0;
+
+  virtual ACE_Event_Handler* acceptor (void) = 0;
   // Return the ACE acceptor...
-  // @@ Fred: could this method be const?
 
   virtual CORBA::ULong tag (void) = 0;
   // The tag, each concrete class will have a specific tag value.
 
-  virtual int close (void) = 0;
-  // Closes the acceptor
-
   virtual ~TAO_Acceptor (void);
-  // Destructor
+
 };
 
+// Connector Registry and Generic Connector interface definitions
+
 class TAO_Export TAO_Connector
 {
-  // = TITLE
-  //   Connector Registry and Generic Connector interface definitions.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
 public:
 
-  // @@ Fred: the more I think about it the more the Connectors seem
-  //    to be the entry point to a complete protocol, for example:
-  //    this looks like the correct spot to add a method like:
-  //    virtual TAO_Acceptor* acceptor (const char* endpoint) = 0;
-  //    // Create a new acceptor from an endpoint specification, if
-  //    // the specification is not recognized then we return 0.
-  //    // Each protocol will be characterized by a prefix, so
-  //    // endpoints will be specified as:
-  //    // "iiop:macarena:0" - IIOP on macarena, port <any>
-  //    // "uiop:/foo/bar"   - GIOP over unix domain, file /foo/bar
-  //    // "iiop:localhost:0" - IIOP, sap_any [any better idea?]
-  //    // "aal5giop:......"   - GIOP over AAL5, how to specify the
-  //    //                       end point?
-  //    //
-  //    // this format is extensible, for example:
-  //    // "rtiiop:macarena:0,15" - real-time IIOP, host, port, prio.
-  //
-  //    Anyway, maybe the method does not belong here, but it belongs
-  //    somewhere.
-  //    Note: On second thought: Connectors should be per-ORB objects,
-  //          but the set of PP is more like a per-process thing.
-  //          Maybe there should be a ProtocolRegistry as you
-  //          suggested, that acts as a factory of both connectors and
-  //          acceptors.
-  //
-
-  virtual int preconnect (char *preconnections) = 0;
-  // Initial set of connections to be established.
-  // @@ Fred: Any better way to express the connections? Should they
-  //          include the protocol prefix shown above?
-
-  virtual int open (TAO_Resource_Factory *trf,
-                    ACE_Reactor *reactor) = 0;
-  //  Initialize object and register with reactor.
-
-  virtual int close (void) = 0;
-  // Shutdown Connector bridge and concreate Connector.
+  virtual int preconnect(char* preconnections) = 0;
+  virtual int open(TAO_Resource_Factory *trf, ACE_Reactor *reactor) = 0;
+  virtual int close(void) = 0;
 
   virtual CORBA::ULong tag (void) = 0;
-  // The tag identifying the specific ORB transport layer protocol.
-  // For example TAO_IOP_TAG_INTERNET_IOP = 0.  The tag is used in the
-  // IOR to identify the type of profile included. IOR -> {{tag0,
-  // profile0} {tag1, profole1} ...}  GIOP.h defines typedef
-  // CORBA::ULong TAO_IOP_Profile_ID;
-
-  virtual int connect (TAO_Profile *profile,
-                       TAO_Transport *&) = 0;
-  // To support pluggable we need to abstract away the connect()
-  // method so it can be called from the GIOP code independant of the
-  // actual transport protocol in use.
-  // @@ Fred: notice the change in interface: it takes a profile,
-  //    stores the hint on it but returns the transport, that makes
-  //    this method thread safe. We don't care if other threads change
-  //    the hint, we will receive the right transport anyway.
+  // The tag identifying the specific ORB transport layer
+  // protocol.  For example TAO_IOP_TAG_INTERNET_IOP = 0.
+  // The tag is used in the IOR to identify the type of profile
+  // included. IOR -> {{tag0, profile0} {tag1, profole1} ...}
+  // GIOP.h defines typedef CORBA::ULong TAO_IOP_Profile_ID;
+
+  virtual TAO_Transport* connect(TAO_Profile* profile, 
+                                 CORBA::Environment &env) = 0;
+  // In order to support pluggable we need to abstract away the 
+  // connect() method so it can be called from the GIOP code
+  // independant of the actual transport protocol in use.
 
   virtual ~TAO_Connector (void);
-  // the destructor.
-};
+  // the destructor
+
+}; 
 
+// How does user add new Protocols?
+// Registry needs to decide which profiles are added to profile list.
 class TAO_Export TAO_Connector_Registry
 {
-  // = TITLE
-  //   All loaded ESIOP or GIOP connector bridges must register with
-  //   this object.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-  //   @@ Fred: this class should be able to dynamically load a set of
-  //            connectors using the service configurator.
-  //   @@ Fred: We have to start working on the acceptor registry.
 public:
-  TAO_Connector_Registry (void);
-  //  Default constructor.
-
-  ~TAO_Connector_Registry (void);
-  //  Default destructor.
 
+  TAO_Connector_Registry ();
+  ~TAO_Connector_Registry ();
+  
   TAO_Connector *get_connector (CORBA::ULong tag);
-  // Return the connector bridge corresponding to tag (IOP).
-
   CORBA::Boolean add_connector (TAO_Connector *connector);
-  // All TAO_Connectors will have a tag() member which will be used
-  // for registering object, as well as type checking.
+  // All TAO_Connectors will have a tag() member which will be
+  // used for registering object, as well as type checking.
 
-  int open (TAO_Resource_Factory *trf,
-            ACE_Reactor *reactor);
-  // Initialize all registered connectors.
+  int open(TAO_Resource_Factory *trf, ACE_Reactor *reactor);
+  int close_all(void);
 
-  int close_all (void);
-  // Close all open connectors.
-
-  int preconnect (const char *the_preconnections);
-  // For this list of preconnections call the connector specific
-  // preconnect method for each preconnection.
-
-  int connect (TAO_Stub *&obj, TAO_Transport *&);
-  // This is where the transport protocol is selected based on some
-  // policy.  This member will call the connect member of the
-  // TAO_Connector class which in turn will call the concrete
-  // connector.
+  int preconnect (const char* the_preconnections);
 
+  TAO_Profile *connect (STUB_Object *&obj, CORBA::Environment &env);
+  // This is where the transport protocol is selected based on
+  // some policy.  This member will call the connect member of the
+  // TAO_Connector class which in turn will call the concrete connector.
 private:
   TAO_Connector *iiop_connector_;
-  // @@ for now this is all we support!  This next iteration will be a
-  // bit more generic.  Something like a key, value pair with key
+  // @@ for now this is all we support!  This next iteration will be
+  // a bit more generic.  Something like a key, value pair with key
   // equil to the IOP_TYPE and value a pointer to the Connector.
 };
 
-#if defined (__ACE_INLINE__)
-# include "tao/Pluggable.i"
-#endif /* __ACE_INLINE__ */
-
 #endif  /* TAO_PLUGGABLE_H */
diff --git a/TAO/tao/Pluggable.i b/TAO/tao/Pluggable.i
deleted file mode 100644
index 4fcf113b6e6..00000000000
--- a/TAO/tao/Pluggable.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Profile::TAO_Profile (void)
-  :  forward_to_ (0)
-{
-}
-
-ACE_INLINE void
-TAO_Profile::forward_to (TAO_MProfile *mprofiles)
-{
-  this->forward_to_ = mprofiles;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to (void)
-{
-  return this->forward_to_;
-}
-
-ACE_INLINE TAO_MProfile *
-TAO_Profile::forward_to_i (void)
-{
-  return this->forward_to_;
-}
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index 90362927698..3ea88619c24 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -1,77 +1,15 @@
-//
 // $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Policy{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-
-#pragma prefix "omg.org"
 
 module CORBA
 {
-  typedef short PolicyErrorCode;
-  const PolicyErrorCode BAD_POLICY               = 0;
-  const PolicyErrorCode UNSUPPORTED_POLICY       = 1;
-  const PolicyErrorCode BAD_POLICY_TYPE          = 2;
-  const PolicyErrorCode BAD_POLICY_VALUE         = 3;
-  const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-  exception PolicyError
-  {
-    PolicyErrorCode reason;
-  };
-
-  exception InvalidPolicies
-  {
-    sequence<unsigned short> indices;
-  };
-
   typedef unsigned long PolicyType;
+
   interface Policy
-  {
-    readonly attribute PolicyType policy_type;
-    Policy copy ();
-    void destroy ();
-  };
+    {
+      readonly attribute PolicyType policy_type;
+      Policy copy ();
+      void destroy ();
+    };
 
   typedef sequence<Policy> PolicyList;
-
-  typedef sequence<PolicyType> PolicyTypeSeq;
-
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-
-  interface PolicyManager
-  {
-    PolicyList get_policy_overrides (in PolicyTypeSeq ts);
-    void set_policy_overrides (
-             in PolicyList policies,
-             in SetOverrideType set_add)
-        raises (InvalidPolicies);
-  };
-
-  interface Current
-  {
-  };
-
-  interface PolicyCurrent : PolicyManager, Current
-  {
-  };
-
 };
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index b4062def722..c15c8aa4fa5 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -13,7 +13,6 @@
 #include "tao/Stub.h"
 #include "tao/Servant_Base.h"
 #include "tao/POA_CORBA.h"
-#include "tao/Invocation.h"
 
 #if !defined (__ACE_INLINE__)
 #include "PolicyC.i"
@@ -21,133 +20,13 @@
 
 ACE_RCSID(tao, PolicyC, "$Id$")
 
-// ****************************************************************
-
-const CORBA::PolicyErrorCode CORBA::BAD_POLICY               = 0;
-const CORBA::PolicyErrorCode CORBA::UNSUPPORTED_POLICY       = 1;
-const CORBA::PolicyErrorCode CORBA::BAD_POLICY_TYPE          = 2;
-const CORBA::PolicyErrorCode CORBA::BAD_POLICY_VALUE         = 3;
-const CORBA::PolicyErrorCode CORBA::UNSUPPORTED_POLICY_VALUE = 4;
-
-// ****************************************************************
-
-// default constructor
-CORBA_PolicyError::CORBA_PolicyError (void)
-  : CORBA_UserException (CORBA::_tc_PolicyError)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PolicyError::~CORBA_PolicyError (void)
-{
-}
-
-// copy constructor
-CORBA_PolicyError::CORBA_PolicyError (const CORBA_PolicyError &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-    this->reason = _tao_excp.reason;
-}
-
-// assignment operator
-CORBA_PolicyError&
-CORBA_PolicyError::operator= (const CORBA_PolicyError &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->reason = _tao_excp.reason;
-  return *this;
-}
-
-// narrow
-CORBA_PolicyError_ptr
-CORBA_PolicyError::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PolicyError_ptr, exc);
-  else
-    return 0;
-}
-
-void CORBA_PolicyError::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PolicyError::_alloc (void)
-{
-  return new CORBA_PolicyError;
-}
-
-CORBA_PolicyError::CORBA_PolicyError(
-  CORBA::PolicyErrorCode _tao_reason)
-
-  : CORBA_UserException  (CORBA::TypeCode::_duplicate (CORBA::_tc_PolicyError))
-{
-    this->reason = _tao_reason;
-}
-
-// ****************************************************************
-
-// default constructor
-CORBA_InvalidPolicies::CORBA_InvalidPolicies (void)
-  : CORBA_UserException (CORBA::_tc_InvalidPolicies)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_InvalidPolicies::~CORBA_InvalidPolicies (void)
-{
-}
-
-// copy constructor
-CORBA_InvalidPolicies::CORBA_InvalidPolicies (const CORBA_InvalidPolicies &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
+CORBA_Policy_ptr CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
 {
-    this->indices = _tao_excp.indices;
-}
-
-// assignment operator
-CORBA_InvalidPolicies&
-CORBA_InvalidPolicies::operator= (const CORBA_InvalidPolicies &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  this->indices = _tao_excp.indices;
-  return *this;
-}
-
-// narrow
-CORBA_InvalidPolicies_ptr
-CORBA_InvalidPolicies::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_InvalidPolicies_ptr, exc);
-  else
-    return 0;
-}
-
-void CORBA_InvalidPolicies::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_InvalidPolicies::_alloc (void)
-{
-  return new CORBA_InvalidPolicies;
-}
-
-CORBA_InvalidPolicies::CORBA_InvalidPolicies(
-  const CORBA_InvalidPolicies::_tao_seq_UShort & _tao_indices)
-
-  : CORBA_UserException  (CORBA::TypeCode::_duplicate (CORBA::_tc_InvalidPolicies))
-{
-    this->indices = _tao_indices;
-}
+  if (!CORBA::is_nil (obj))
+    obj->_incr_refcnt ();
 
-// ****************************************************************
+  return obj;
+} // end of _duplicate
 
 CORBA_Policy_ptr CORBA_Policy::_narrow (
     CORBA::Object_ptr obj,
@@ -156,183 +35,120 @@ CORBA_Policy_ptr CORBA_Policy::_narrow (
 {
   if (CORBA::is_nil (obj))
     return CORBA_Policy::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/Policy:1.0", env))
+  if (!obj->_is_a ("IDL:CORBA/Policy:1.0", env))
     return CORBA_Policy::_nil ();
-  TAO_Stub* stub = obj->_stubobj ();
+  STUB_Object *stub = obj->_stubobj ();
   stub->_incr_refcnt ();
-  void* servant = 0;
-  if (obj->_is_collocated () && obj->_servant() != 0)
-    servant = obj->_servant()->_downcast ("IDL:omg.org/CORBA/Policy:1.0");
-  if (servant == 0)
-    return new CORBA_Policy(stub);
+  if (!obj->_is_collocated ()
+         || !obj->_servant()
+         || obj->_servant()->_downcast ("IDL:CORBA/Policy:1.0") == 0
+      )
+  {
+    CORBA_Policy_ptr new_obj = new CORBA_Policy(stub);
+    return new_obj;
+  } // end of if
+  void* servant = obj->_servant ()->_downcast ("IDL:CORBA/Policy:1.0");
   return new POA_CORBA::_tao_collocated_Policy(
       ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
       stub
     );
 }
 
-CORBA_Policy_ptr CORBA_Policy::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
+CORBA_Policy_ptr CORBA_Policy::_nil (void)
 {
-  if (CORBA::is_nil (obj))
-    return CORBA_Policy::_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/Policy:1.0");
-  if (servant == 0)
-    return new CORBA_Policy(stub);
-  return new POA_CORBA::_tao_collocated_Policy(
-      ACE_reinterpret_cast(POA_CORBA::Policy_ptr, servant),
-      stub
-    );
-}
+  return (CORBA_Policy_ptr)NULL;
+} // end of _nil
 
 CORBA::PolicyType CORBA_Policy::policy_type (
-    CORBA::Environment &ACE_TRY_ENV
-  )
+    CORBA::Environment &_tao_environment
+   )
 {
-    CORBA::PolicyType _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "_get_""policy_type",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
+  static const TAO_Param_Data _get_CORBA_Policy_policy_type_paramdata [] =
   {
-    ACE_TRY_ENV.clear ();
-    _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);
+    {CORBA::_tc_PolicyType, PARAM_RETURN, 0}
+  }; // CORBA_Policy_policy_type_paramdata
 
-    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);
+  static const TAO_Call_Data _get_CORBA_Policy_policy_type_calldata =
+  {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata, 0, 0};
 
-    }
-    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);
+  CORBA::PolicyType _tao_retval = 0;
+  STUB_Object *istub = this->_stubobj ();
+  if (istub)
+  {
+    void* _tao_arguments[1];
+    void** _tao_current_arg = _tao_arguments;
+    *_tao_current_arg = &_tao_retval; _tao_current_arg++;
+    istub->do_static_call (
+      _tao_environment,
+      &_get_CORBA_Policy_policy_type_calldata,
+      _tao_arguments
+    );
+  } // end of if (istub)
   return _tao_retval;
 }
 
 CORBA_Policy_ptr CORBA_Policy::copy (
-    CORBA::Environment &ACE_TRY_ENV
-  )
+    CORBA::Environment &_tao_environment
+   )
 {
-    CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "copy",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
+  static const TAO_Param_Data CORBA_Policy_copy_paramdata [] =
   {
-    ACE_TRY_ENV.clear ();
-    _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);
+    {CORBA::_tc_Policy, PARAM_RETURN, 0}
+  }; // CORBA_Policy_copy_paramdata
 
-    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);
+  static const TAO_Call_Data CORBA_Policy_copy_calldata =
+  {"copy", 1, 1, CORBA_Policy_copy_paramdata, 0, 0};
 
-    }
-    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);
+  CORBA_Policy_ptr _tao_retval = CORBA_Policy::_nil ();
+  STUB_Object *istub = this->_stubobj ();
+  if (istub)
+  {
+    CORBA::Object_ptr _tao_base_retval = CORBA::Object::_nil ();
+    void* _tao_arguments[1];
+    void** _tao_current_arg = _tao_arguments;
+    *_tao_current_arg = &_tao_base_retval; _tao_current_arg++;
+    istub->do_static_call (
+      _tao_environment,
+      &CORBA_Policy_copy_calldata,
+      _tao_arguments
+    );
+    _tao_retval = CORBA_Policy::_narrow (_tao_base_retval, _tao_environment);
+    CORBA::release (_tao_base_retval);
+  } // end of if (istub)
   return _tao_retval;
 }
 
 void CORBA_Policy::destroy (
-    CORBA::Environment &ACE_TRY_ENV
-  )
+    CORBA::Environment &_tao_environment
+   )
 {
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "destroy",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
+  static const TAO_Param_Data CORBA_Policy_destroy_paramdata [] =
   {
-    ACE_TRY_ENV.clear ();
-    _tao_call.start (ACE_TRY_ENV);
-        ACE_CHECK;
-
-    int _invoke_status =
-      _tao_call.invoke (0, 0, ACE_TRY_ENV);
-        ACE_CHECK;
+    {CORBA::_tc_void, PARAM_RETURN, 0}
+  }; // CORBA_Policy_destroy_paramdata
 
-    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;
-
-  }
+  static const TAO_Call_Data CORBA_Policy_destroy_calldata =
+  {"destroy", 1, 1, CORBA_Policy_destroy_paramdata, 0, 0};
 
+  STUB_Object *istub = this->_stubobj ();
+  if (istub)
+  {
+    void* _tao_arguments[1];
+    void** _tao_current_arg = _tao_arguments;
+    *_tao_current_arg = 0; _tao_current_arg++;
+    istub->do_static_call (
+      _tao_environment,
+      &CORBA_Policy_destroy_calldata,
+      _tao_arguments
+    );
+  } // end of if (istub)
+  return;
 }
 
 CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment &env)
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Policy:1.0")) ||
     (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (env))))
   return 1; // success using local knowledge
   else
@@ -341,22 +157,11 @@ CORBA::Boolean CORBA_Policy::_is_a (const CORBA::Char *value, CORBA::Environment
 
 const char* CORBA_Policy::_interface_repository_id (void) const
 {
-  return "IDL:omg.org/CORBA/Policy:1.0";
-}
-
-CORBA_Policy_ptr
-CORBA_Policy::_duplicate (CORBA_Policy_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
+  return "IDL:CORBA/Policy:1.0";
 }
 
-CORBA_Policy_ptr
-CORBA_Policy::_nil (void)
-{
-  return (CORBA_Policy_ptr)0;
-}
+#if !defined (_CORBA_POLICYLIST_CS_)
+#define _CORBA_POLICYLIST_CS_
 
 // *************************************************************
 // CORBA_PolicyList
@@ -370,595 +175,11 @@ CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max) // uses max size
 CORBA_PolicyList::CORBA_PolicyList (CORBA::ULong max, CORBA::ULong length, CORBA_Policy_ptr *buffer, CORBA::Boolean release)
   : TAO_Unbounded_Object_Sequence<CORBA_Policy> (max, length, buffer, release)
 {}
-CORBA_PolicyList::CORBA_PolicyList (const CORBA_PolicyList &seq) // copy ctor
+CORBA_PolicyList::CORBA_PolicyList (const CORBA::PolicyList &seq) // copy ctor
   : TAO_Unbounded_Object_Sequence<CORBA_Policy> (seq)
 {}
 CORBA_PolicyList::~CORBA_PolicyList (void) // dtor
 {}
 
-// *************************************************************
-// CORBA_PolicyTypeSeq
-// *************************************************************
-
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (void)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max) // uses max size
-  : TAO_Unbounded_Sequence<CORBA::ULong>
- (max)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::ULong> (max, length, buffer, release)
-{}
-CORBA_PolicyTypeSeq::CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &seq)
-  : TAO_Unbounded_Sequence<CORBA::ULong> (seq)
-{}
-CORBA_PolicyTypeSeq::~CORBA_PolicyTypeSeq (void)
-{}
-
-// ****************************************************************
-
-CORBA::PolicyManager_ptr CORBA_PolicyManager::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyManager::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/PolicyManager:1.0", env))
-    return CORBA_PolicyManager::_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/PolicyManager:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyManager(stub);
-  return new POA_CORBA::_tao_collocated_PolicyManager(
-      ACE_reinterpret_cast(POA_CORBA::PolicyManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyManager_ptr CORBA_PolicyManager::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyManager::_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/PolicyManager:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyManager(stub);
-  return new POA_CORBA::_tao_collocated_PolicyManager(
-      ACE_reinterpret_cast(POA_CORBA::PolicyManager_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides (
-    const CORBA_PolicyTypeSeq & ts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  CORBA_PolicyList* _tao_retval = 0;
-  ACE_UNUSED_ARG(_tao_retval);
-  ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-}
-
-void CORBA_PolicyManager::set_policy_overrides (
-    const CORBA_PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager: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); // remote call
-}
-
-const char* CORBA_PolicyManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyManager:1.0";
-}
-
-// ****************************************************************
-
-
-CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyCurrent::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/PolicyCurrent:1.0", env))
-    return CORBA_PolicyCurrent::_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/PolicyCurrent:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyCurrent(stub);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent(
-      ACE_reinterpret_cast(POA_CORBA::PolicyCurrent_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PolicyCurrent_ptr CORBA_PolicyCurrent::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PolicyCurrent::_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/PolicyCurrent:1.0");
-  if (servant == 0)
-    return new CORBA_PolicyCurrent(stub);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent(
-      ACE_reinterpret_cast(POA_CORBA::PolicyCurrent_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA_PolicyCurrent::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current: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); // remote call
-}
-
-const char* CORBA_PolicyCurrent::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
-}
-
-// ****************************************************************
-
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PolicyError &_tao_elem) // copying
-{
-  CORBA_PolicyError *_tao_any_val = new CORBA_PolicyError (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyError, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PolicyError *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyError, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyError *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyError, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyError *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyError, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyError, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyError, _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_InvalidPolicies &_tao_elem) // copying
-{
-  CORBA_InvalidPolicies *_tao_any_val = new CORBA_InvalidPolicies (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InvalidPolicies, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_InvalidPolicies *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_InvalidPolicies, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_InvalidPolicies *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_InvalidPolicies, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_InvalidPolicies *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_InvalidPolicies, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_InvalidPolicies, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_InvalidPolicies, _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_Policy_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_Policy::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Policy, _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_Policy_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_Policy::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Policy, 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_Policy, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_Policy::_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_Policy, tmp, 1, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-    // failure
-  }
-  ACE_CATCHANY
-  {
-    delete tmp;
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA_PolicyList &_tao_elem
-  ) // copying
-{
-  CORBA_PolicyList *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_PolicyList (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyList, _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_PolicyList *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyList, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyList *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyList, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyList *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyList, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyList, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyList, _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_PolicyTypeSeq &_tao_elem
-  ) // copying
-{
-  CORBA_PolicyTypeSeq *_tao_any_val;
-  ACE_NEW (_tao_any_val, CORBA_PolicyTypeSeq (_tao_elem));
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyTypeSeq, _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_PolicyTypeSeq *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_PolicyTypeSeq, _tao_elem, 0, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PolicyTypeSeq *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PolicyTypeSeq, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PolicyTypeSeq *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PolicyTypeSeq, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_PolicyTypeSeq, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_PolicyTypeSeq, _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::SetOverrideType _tao_elem)
-{
-  CORBA::SetOverrideType *_any_val;
-  ACE_NEW (_any_val, CORBA::SetOverrideType (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_SetOverrideType, _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::SetOverrideType &_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_SetOverrideType, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-    if (stream.decode (CORBA::_tc_SetOverrideType, &_tao_elem, 0, ACE_TRY_ENV)
-      == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      return 1;
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    return 0;
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_Policy_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_Policy_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_Policy::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Unbounded_Sequence<CORBA::UShort>;
-template class TAO_Unbounded_Sequence<CORBA::ULong>;
-template class TAO_Unbounded_Object_Sequence<CORBA_Policy>;
-template class TAO_Object_Manager<CORBA_Policy>;
-
-//  template class TAO_Object_Field_T<CORBA_Policy>;
-//  template class TAO_Object_Field_T<CORBA_PolicyManager>;
-//  template class TAO_Object_Field_T<CORBA_PolicyCurrent>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::UShort>
-#pragma instantiate TAO_Unbounded_Sequence<CORBA::ULong>
-#pragma instantiate TAO_Unbounded_Object_Sequence<CORBA_Policy>
-#pragma instantiate TAO_Object_Manager<CORBA_Policy>
-
-//#  pragma instantiate TAO_Object_Field_T<CORBA_Policy>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyManager>
-//#  pragma instantiate TAO_Object_Field_T<CORBA_PolicyCurrent>
 
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* end #if !defined */
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index e95015a5d94..cd9b9a1e105 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -11,79 +11,21 @@
 #ifndef TAO_IDL_POLICYC_H
 #define TAO_IDL_POLICYC_H
 
-#include "tao/CurrentC.h"
-#include "tao/CDR.h"
+#include "tao/Object.h"
 #include "tao/Sequence.h"
 #include "tao/Sequence_T.h"
 
-class TAO_Export CORBA_PolicyError : public CORBA::UserException
-{
-public:
-  CORBA::PolicyErrorCode reason;
-
-  CORBA_PolicyError (void); // default ctor
-  CORBA_PolicyError (const CORBA::PolicyError &); // copy ctor
-  ~CORBA_PolicyError (void); // dtor
-  CORBA_PolicyError &operator= (const CORBA_PolicyError &);
-
-  virtual void _raise (void);
-
-  static CORBA_PolicyError *_narrow (CORBA::Exception *);
-
-  CORBA_PolicyError(
-    CORBA::PolicyErrorCode _tao_reason);
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-}; // exception CORBA::PolicyError
+#if !defined (_CORBA_POLICY___PTR_CH_)
+#define _CORBA_POLICY___PTR_CH_
 
-// ****************************************************************
+class CORBA_Policy;
+typedef CORBA_Policy *CORBA_Policy_ptr;
 
-class CORBA_InvalidPolicies;
-typedef CORBA_InvalidPolicies *CORBA_InvalidPolicies_ptr;
+#endif /* end #if !defined */
 
-class TAO_Export CORBA_InvalidPolicies : public CORBA::UserException
-{
-public:
-  class TAO_Export _tao_seq_UShort : public TAO_Unbounded_Sequence<CORBA::UShort>
-  {
-  public:
-    _tao_seq_UShort (void); // default ctor
-    _tao_seq_UShort (CORBA::ULong max); // uses max size
-    _tao_seq_UShort (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::UShort *buffer,
-        CORBA::Boolean release=0
-      );
-    _tao_seq_UShort (const _tao_seq_UShort &); // copy ctor
-    ~_tao_seq_UShort (void); // dtor
-  };
-  typedef _tao_seq_UShort *_tao_seq_UShort_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_UShort;
-
-  _tao_seq_UShort indices;
-
-  CORBA_InvalidPolicies (void); // default ctor
-  CORBA_InvalidPolicies (const CORBA_InvalidPolicies &); // copy ctor
-  ~CORBA_InvalidPolicies (void); // dtor
-  CORBA_InvalidPolicies &operator= (const CORBA_InvalidPolicies &);
-
-  virtual void _raise (void);
-
-  static CORBA_InvalidPolicies *_narrow (CORBA::Exception *);
-
-  CORBA_InvalidPolicies(
-      const _tao_seq_UShort & _tao_indices);
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-}; // exception CORBA::InvalidPolicies
-
-// ****************************************************************
 
-class CORBA_Policy;
-typedef CORBA_Policy *CORBA_Policy_ptr;
+#if !defined (_CORBA_POLICY___VAR_CH_)
+#define _CORBA_POLICY___VAR_CH_
 
 class TAO_Export  CORBA_Policy_var
 {
@@ -110,6 +52,13 @@ private:
   CORBA_Policy_ptr ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_POLICY___OUT_CH_)
+#define _CORBA_POLICY___OUT_CH_
+
 class TAO_Export  CORBA_Policy_out
 {
 public:
@@ -127,49 +76,37 @@ private:
   CORBA_Policy_ptr &ptr_;
 };
 
-class TAO_Export  CORBA_Policy : public virtual CORBA_Object
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_POLICY_CH_)
+#define _CORBA_POLICY_CH_
+
+class TAO_Export  CORBA_Policy : public virtual ACE_CORBA_1 (Object)
 {
 public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Policy_ptr _ptr_type;
-  typedef CORBA_Policy_var _var_type;
-#endif /* __GNUC__ */
-
   // the static operations
   static CORBA_Policy_ptr _duplicate (CORBA_Policy_ptr obj);
-  static CORBA_Policy_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
-  static CORBA_Policy_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
+  static CORBA_Policy_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   static CORBA_Policy_ptr _nil (void);
 
   virtual CORBA::PolicyType policy_type (
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
+                                         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                         );
   virtual CORBA_Policy_ptr copy (
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
+                                 CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                 );
   virtual void destroy (
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA_Environment &TAO_IN_ENV =
-        CORBA::default_environment ()
-    );
+                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                        );
+  virtual CORBA::Boolean _is_a (const CORBA::Char *type_id,
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()
+                                );
   virtual const char* _interface_repository_id (void) const;
 protected:
   CORBA_Policy (void); // default constructor
-  CORBA_Policy (TAO_Stub *objref,
+  CORBA_Policy (STUB_Object *objref,
                 TAO_ServantBase *_tao_servant = 0,
                 CORBA::Boolean _tao_collocated = 0
                 );
@@ -179,6 +116,13 @@ private:
   void operator= (const CORBA_Policy &);
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_POLICYLIST_CH_)
+#define _CORBA_POLICYLIST_CH_
+
 // *************************************************************
 // CORBA_PolicyList
 // *************************************************************
@@ -186,23 +130,26 @@ private:
 class TAO_Export  CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_Policy>
 {
 public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyList_ptr _ptr_type;
-  typedef CORBA_PolicyList_var _var_type;
-#endif /* __GNUC__ */
-
   CORBA_PolicyList (void); // default ctor
   CORBA_PolicyList (CORBA::ULong max); // uses max size
   CORBA_PolicyList (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA_Policy_ptr *buffer,
-      CORBA::Boolean release=0
-    );
+                    CORBA::ULong max,
+                    CORBA::ULong length,
+                    CORBA_Policy_ptr *buffer,
+                    CORBA::Boolean release=0
+                    );
   CORBA_PolicyList (const CORBA_PolicyList &); // copy ctor
   ~CORBA_PolicyList (void); // dtor
 };
 typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
+// not used: static CORBA::TypeCode_ptr _tc_PolicyList_seq;
+
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_POLICYLIST___VAR_CH_)
+#define _CORBA_POLICYLIST___VAR_CH_
 
 // *************************************************************
 // class CORBA::PolicyList_var
@@ -236,6 +183,13 @@ private:
   CORBA_PolicyList *ptr_;
 };
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_POLICYLIST___OUT_CH_)
+#define _CORBA_POLICYLIST___OUT_CH_
+
 class TAO_Export  CORBA_PolicyList_out
 {
 public:
@@ -255,325 +209,10 @@ private:
   void operator= (const CORBA_PolicyList_var &);
 };
 
-// *************************************************************
-// PolicyTypeSeq
-// *************************************************************
-
-class TAO_Export CORBA_PolicyTypeSeq : public TAO_Unbounded_Sequence<CORBA::ULong>
-{
-public:
-  CORBA_PolicyTypeSeq (void); // default ctor
-  CORBA_PolicyTypeSeq (CORBA::ULong max); // uses max size
-  CORBA_PolicyTypeSeq (
-      CORBA::ULong max,
-      CORBA::ULong length,
-      CORBA::ULong *buffer,
-      CORBA::Boolean release=0
-    );
-  CORBA_PolicyTypeSeq (const CORBA_PolicyTypeSeq &); // copy ctor
-  ~CORBA_PolicyTypeSeq (void); // dtor
-};
-typedef CORBA_PolicyTypeSeq *CORBA_PolicyTypeSeq_ptr;
-
-// *************************************************************
-// class CORBA::PolicyTypeSeq_var
-// *************************************************************
-
-class TAO_Export CORBA_PolicyTypeSeq_var
-{
-public:
-  CORBA_PolicyTypeSeq_var (void); // default constructor
-  CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *);
-  CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &);
-  ~CORBA_PolicyTypeSeq_var (void); // destructor
-
-  CORBA_PolicyTypeSeq_var &operator= (CORBA_PolicyTypeSeq *);
-  CORBA_PolicyTypeSeq_var &operator= (const CORBA_PolicyTypeSeq_var &);
-  CORBA_PolicyTypeSeq *operator-> (void);
-  const CORBA_PolicyTypeSeq *operator-> (void) const;
-
-  operator const CORBA_PolicyTypeSeq &() const;
-  operator CORBA_PolicyTypeSeq &();
-  operator CORBA_PolicyTypeSeq &() const;
-  CORBA::PolicyType &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const CORBA_PolicyTypeSeq &in (void) const;
-  CORBA_PolicyTypeSeq &inout (void);
-  CORBA_PolicyTypeSeq *&out (void);
-  CORBA_PolicyTypeSeq *_retn (void);
-  CORBA_PolicyTypeSeq *ptr (void) const;
-
-private:
-  CORBA_PolicyTypeSeq *ptr_;
-};
-
-class TAO_Export CORBA_PolicyTypeSeq_out
-{
-public:
-  CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&);
-  CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &);
-  CORBA_PolicyTypeSeq_out (const CORBA_PolicyTypeSeq_out &);
-  CORBA_PolicyTypeSeq_out &operator= (const CORBA_PolicyTypeSeq_out &);
-  CORBA_PolicyTypeSeq_out &operator= (CORBA_PolicyTypeSeq *);
-  operator CORBA_PolicyTypeSeq *&();
-  CORBA_PolicyTypeSeq *&ptr (void);
-  CORBA_PolicyTypeSeq *operator-> (void);
-  CORBA::PolicyType &operator[] (CORBA::ULong index);
-
-private:
-  CORBA_PolicyTypeSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_PolicyTypeSeq_var &);
-};
-
-class TAO_Export CORBA_PolicyManager_var
-{
-public:
-  CORBA_PolicyManager_var (void); // default constructor
-  CORBA_PolicyManager_var (CORBA_PolicyManager_ptr);
-  CORBA_PolicyManager_var (const CORBA_PolicyManager_var &);
-  ~CORBA_PolicyManager_var (void); // destructor
-
-  CORBA_PolicyManager_var &operator= (CORBA_PolicyManager_ptr);
-  CORBA_PolicyManager_var &operator= (const CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_ptr operator-> (void) const;
-
-  operator const CORBA_PolicyManager_ptr &() const;
-  operator CORBA_PolicyManager_ptr &();
-  // in, inout, out, _retn
-  CORBA_PolicyManager_ptr in (void) const;
-  CORBA_PolicyManager_ptr &inout (void);
-  CORBA_PolicyManager_ptr &out (void);
-  CORBA_PolicyManager_ptr _retn (void);
-  CORBA_PolicyManager_ptr ptr (void) const;
-
-private:
-  CORBA_PolicyManager_ptr ptr_;
-};
-
-class TAO_Export CORBA_PolicyManager_out
-{
-public:
-  CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &);
-  CORBA_PolicyManager_out (CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_out (const CORBA_PolicyManager_out &);
-  CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_out &);
-  CORBA_PolicyManager_out &operator= (const CORBA_PolicyManager_var &);
-  CORBA_PolicyManager_out &operator= (CORBA_PolicyManager_ptr);
-  operator CORBA_PolicyManager_ptr &();
-  CORBA_PolicyManager_ptr &ptr (void);
-  CORBA_PolicyManager_ptr operator-> (void);
-
-private:
-  CORBA_PolicyManager_ptr &ptr_;
-};
-
-class TAO_Export CORBA_PolicyManager : public virtual CORBA_Object
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyManager_ptr _ptr_type;
-  typedef CORBA_PolicyManager_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PolicyManager_ptr _duplicate (CORBA_PolicyManager_ptr obj);
-  static CORBA_PolicyManager_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  static CORBA_PolicyManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  static CORBA_PolicyManager_ptr _nil (void);
-
-  virtual CORBA_PolicyList * get_policy_overrides (
-        const CORBA_PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA_PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::default_environment ()
-      );
-  virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PolicyManager (void); // default constructor
-  CORBA_PolicyManager (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-  virtual ~CORBA_PolicyManager (void);
-private:
-  CORBA_PolicyManager (const CORBA_PolicyManager &);
-  void operator= (const CORBA_PolicyManager &);
-};
-
-// ****************************************************************
-
-class TAO_Export CORBA_PolicyCurrent_var
-{
-public:
-  CORBA_PolicyCurrent_var (void); // default constructor
-  CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr);
-  CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &);
-  ~CORBA_PolicyCurrent_var (void); // destructor
-
-  CORBA_PolicyCurrent_var &operator= (CORBA_PolicyCurrent_ptr);
-  CORBA_PolicyCurrent_var &operator= (const CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_ptr operator-> (void) const;
-
-  operator const CORBA_PolicyCurrent_ptr &() const;
-  operator CORBA_PolicyCurrent_ptr &();
-  // in, inout, out, _retn
-  CORBA_PolicyCurrent_ptr in (void) const;
-  CORBA_PolicyCurrent_ptr &inout (void);
-  CORBA_PolicyCurrent_ptr &out (void);
-  CORBA_PolicyCurrent_ptr _retn (void);
-  CORBA_PolicyCurrent_ptr ptr (void) const;
-
-private:
-  CORBA_PolicyCurrent_ptr ptr_;
-};
-
-class TAO_Export CORBA_PolicyCurrent_out
-{
-public:
-  CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &);
-  CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_out (const CORBA_PolicyCurrent_out &);
-  CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_out &);
-  CORBA_PolicyCurrent_out &operator= (const CORBA_PolicyCurrent_var &);
-  CORBA_PolicyCurrent_out &operator= (CORBA_PolicyCurrent_ptr);
-  operator CORBA_PolicyCurrent_ptr &();
-  CORBA_PolicyCurrent_ptr &ptr (void);
-  CORBA_PolicyCurrent_ptr operator-> (void);
-
-private:
-  CORBA_PolicyCurrent_ptr &ptr_;
-};
-
-class TAO_Export CORBA_PolicyCurrent: public virtual CORBA_PolicyManager, public virtual CORBA_Current
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PolicyCurrent_ptr _ptr_type;
-  typedef CORBA_PolicyCurrent_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PolicyCurrent_ptr _duplicate (CORBA_PolicyCurrent_ptr obj);
-  static CORBA_PolicyCurrent_ptr _narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  static CORBA_PolicyCurrent_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  static CORBA_PolicyCurrent_ptr _nil (void);
-
-  virtual CORBA::Boolean _is_a (
-        const CORBA::Char *type_id,
-        CORBA::Environment &env =
-          CORBA::default_environment ()
-      );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PolicyCurrent (void); // default constructor
-  CORBA_PolicyCurrent (TAO_Stub *objref,
-        TAO_ServantBase *_tao_servant = 0,
-        CORBA::Boolean _tao_collocated = 0
-      );
-  virtual ~CORBA_PolicyCurrent (void);
-private:
-  CORBA_PolicyCurrent (const CORBA_PolicyCurrent &);
-  void operator= (const CORBA_PolicyCurrent &);
-};
-
-// ****************************************************************
-
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyError &);
-void TAO_Export operator<<= (CORBA::Any &, CORBA::PolicyError*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyError *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::InvalidPolicies &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::InvalidPolicies*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::InvalidPolicies *&);
-
-// Any operators for interface CORBA::Policy
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::Policy_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::Policy *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyList &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::PolicyList*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyList *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             const CORBA::PolicyTypeSeq &);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::PolicyTypeSeq*);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::PolicyTypeSeq *&);
-void TAO_Export operator<<= (CORBA::Any &,
-                             CORBA::SetOverrideType);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &,
-                                       CORBA::SetOverrideType &);
-
-// ****************************************************************
+#endif /* end #if !defined */
 
 #if defined (__ACE_INLINE__)
 #include "PolicyC.i"
-#else
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyError &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::InvalidPolicies &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::InvalidPolicies::_tao_seq_UShort &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::InvalidPolicies::_tao_seq_UShort &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::Policy_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyList &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyList &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::PolicyTypeSeq &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::PolicyTypeSeq &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::SetOverrideType &);
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
-
 #endif /* defined INLINE */
 
 #endif /* TAO_IDL_POLICYC_H */
diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i
index 72d236faf5a..e9efc734932 100644
--- a/TAO/tao/PolicyC.i
+++ b/TAO/tao/PolicyC.i
@@ -9,54 +9,12 @@
 // Information on TAO is available at
 //                 http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// *************************************************************
-// Inline operations for class CORBA::InvalidPolicies::_tao_seq_UShort
-// *************************************************************
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (void)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (CORBA::ULong max)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (max)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::UShort *buffer,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (max,
-                                           length,
-                                           buffer,
-                                           release)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::_tao_seq_UShort (
-    const CORBA_InvalidPolicies::_tao_seq_UShort &rhs)
-  : TAO_Unbounded_Sequence<CORBA::UShort> (rhs)
-{
-}
-
-ACE_INLINE
-CORBA_InvalidPolicies::_tao_seq_UShort::~_tao_seq_UShort (void)
-{
-}
-
-// ****************************************************************
-
 ACE_INLINE
 CORBA_Policy::CORBA_Policy (void) // default constructor
 {}
 
 ACE_INLINE
-CORBA_Policy::CORBA_Policy (TAO_Stub *objref,
+CORBA_Policy::CORBA_Policy (STUB_Object *objref,
                             TAO_ServantBase *_tao_servant,
                             CORBA::Boolean _tao_collocated)
   : CORBA_Object (objref, _tao_servant, _tao_collocated)
@@ -66,6 +24,14 @@ ACE_INLINE
 CORBA_Policy::~CORBA_Policy (void) // destructor
 {}
 
+
+#if !defined (_CORBA_Policy___VAR_CI_)
+#define _CORBA_Policy___VAR_CI_
+
+// *************************************************************
+// Inline operations for class CORBA_Policy_var
+// *************************************************************
+
 ACE_INLINE
 CORBA_Policy_var::CORBA_Policy_var (void) // default constructor
   : ptr_ (CORBA_Policy::_nil ())
@@ -160,6 +126,13 @@ CORBA_Policy_var::_retn (void)
   return val;
 }
 
+
+#endif /* end #if !defined */
+
+
+#if !defined (_CORBA_Policy___OUT_CI_)
+#define _CORBA_Policy___OUT_CI_
+
 // *************************************************************
 // Inline operations for class CORBA_Policy_out
 // *************************************************************
@@ -223,6 +196,9 @@ CORBA_Policy_out::operator-> (void)
   return this->ptr_;
 }
 
+
+#endif /* end #if !defined */
+
 // *************************************************************
 // Inline operations for class CORBA_PolicyList_var
 // *************************************************************
@@ -403,749 +379,3 @@ CORBA_PolicyList_out::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyTypeSeq_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (CORBA_PolicyTypeSeq *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::CORBA_PolicyTypeSeq_var (const CORBA_PolicyTypeSeq_var &p)
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_PolicyTypeSeq(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::~CORBA_PolicyTypeSeq_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_var &
-CORBA_PolicyTypeSeq_var::operator= (CORBA_PolicyTypeSeq *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_var &
-CORBA_PolicyTypeSeq_var::operator= (const CORBA_PolicyTypeSeq_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_PolicyTypeSeq (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator const CORBA_PolicyTypeSeq &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator CORBA_PolicyTypeSeq &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_var::operator CORBA_PolicyTypeSeq &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::PolicyType &
-CORBA_PolicyTypeSeq_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_PolicyTypeSeq &
-CORBA_PolicyTypeSeq_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq &
-CORBA_PolicyTypeSeq_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE CORBA_PolicyTypeSeq *&
-CORBA_PolicyTypeSeq_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::_retn (void)
-{
-  CORBA_PolicyTypeSeq *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyTypeSeq_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (CORBA_PolicyTypeSeq_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::CORBA_PolicyTypeSeq_out (const CORBA_PolicyTypeSeq_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyTypeSeq_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyTypeSeq_out &
-CORBA_PolicyTypeSeq_out::operator= (const CORBA_PolicyTypeSeq_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyTypeSeq_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq_out &
-CORBA_PolicyTypeSeq_out::operator= (CORBA_PolicyTypeSeq *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyTypeSeq_out::operator CORBA_PolicyTypeSeq *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *&
-CORBA_PolicyTypeSeq_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyTypeSeq *
-CORBA_PolicyTypeSeq_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::PolicyType &
-CORBA_PolicyTypeSeq_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager::CORBA_PolicyManager (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PolicyManager::CORBA_PolicyManager (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PolicyManager::~CORBA_PolicyManager (void) // destructor
-{}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager::_duplicate (CORBA_PolicyManager_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager::_nil (void)
-{
-  return (CORBA_PolicyManager_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (void) // default constructor
-  : ptr_ (CORBA_PolicyManager::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (CORBA_PolicyManager_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::CORBA_PolicyManager_var (const CORBA_PolicyManager_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyManager::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PolicyManager_var::~CORBA_PolicyManager_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (CORBA_PolicyManager_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_var &
-CORBA_PolicyManager_var::operator= (const CORBA_PolicyManager_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PolicyManager::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::operator const CORBA_PolicyManager_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_var::operator CORBA_PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PolicyManager_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyManager_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (CORBA_PolicyManager_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyManager::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::CORBA_PolicyManager_out (const CORBA_PolicyManager_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyManager_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const CORBA_PolicyManager_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyManager_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (const CORBA_PolicyManager_var &p)
-{
-  this->ptr_ = CORBA_PolicyManager::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyManager_out &
-CORBA_PolicyManager_out::operator= (CORBA_PolicyManager_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyManager_out::operator CORBA_PolicyManager_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr &
-CORBA_PolicyManager_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyManager_ptr
-CORBA_PolicyManager_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent::CORBA_PolicyCurrent (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent::CORBA_PolicyCurrent (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent::~CORBA_PolicyCurrent (void) // destructor
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent::_duplicate (CORBA_PolicyCurrent_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent::_nil (void)
-{
-  return (CORBA_PolicyCurrent_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (void) // default constructor
-  : ptr_ (CORBA_PolicyCurrent::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (CORBA_PolicyCurrent_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::CORBA_PolicyCurrent_var (const CORBA_PolicyCurrent_var &p) // copy constructor
-  : ptr_ (CORBA_PolicyCurrent::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::~CORBA_PolicyCurrent_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (CORBA_PolicyCurrent_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_var &
-CORBA_PolicyCurrent_var::operator= (const CORBA_PolicyCurrent_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::operator const CORBA_PolicyCurrent_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_var::operator CORBA_PolicyCurrent_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PolicyCurrent_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PolicyCurrent_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (CORBA_PolicyCurrent_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PolicyCurrent::_nil ();
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::CORBA_PolicyCurrent_out (const CORBA_PolicyCurrent_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PolicyCurrent_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const CORBA_PolicyCurrent_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PolicyCurrent_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (const CORBA_PolicyCurrent_var &p)
-{
-  this->ptr_ = CORBA_PolicyCurrent::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_out &
-CORBA_PolicyCurrent_out::operator= (CORBA_PolicyCurrent_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PolicyCurrent_out::operator CORBA_PolicyCurrent_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr &
-CORBA_PolicyCurrent_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PolicyCurrent_ptr
-CORBA_PolicyCurrent_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// ****************************************************************
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PolicyError &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.reason)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PolicyError &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if (
-      (strm >> _tao_aggregate.reason)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_InvalidPolicies::_tao_seq_UShort &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InvalidPolicies::_tao_seq_UShort &_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
-    return strm.read_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_InvalidPolicies &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-  {
-    // now marshal the members (if any)
-    if (
-      (strm << _tao_aggregate.indices)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_InvalidPolicies &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    // now marshal the members
-    if (
-      (strm >> _tao_aggregate.indices)
-    )
-      return 1;
-    else
-      return 0;
-  }
-  else
-    return 0;
-}
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_Policy_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_Policy_ptr &
-  );
-
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PolicyList &_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_PolicyList &_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
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PolicyTypeSeq &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PolicyTypeSeq &_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
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::SetOverrideType &_tao_enumval)
-{
-  return strm.write_ulong ((CORBA::ULong) _tao_enumval);
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::SetOverrideType &_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;
-}
diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp
index 079873eade6..cad124b75a8 100644
--- a/TAO/tao/PolicyS.cpp
+++ b/TAO/tao/PolicyS.cpp
@@ -1,6 +1,7 @@
-/* -*- C++ -*- */
 // $Id$
 
+/* -*- C++ -*- */
+
 // ******  Code generated by the The ACE ORB (TAO) IDL Compiler *******
 // TAO ORB and the TAO IDL Compiler have been developed by Washington
 // University Computer Science's Distributed Object Computing Group.
@@ -12,176 +13,142 @@
 #include "tao/Operation_Table.h"
 #include "tao/Server_Request.h"
 #include "tao/POA_CORBA.h"
-#include "tao/Environment.h"
-#include "tao/Typecode.h"
-#include "tao/ORB.h"
 
 ACE_RCSID(tao, PolicyS, "$Id$")
 
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
-class TAO_CORBA_Policy_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);
+static const TAO_operation_db_entry CORBA_Policy_operations [] = {
+  {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel},
+  {"copy", &POA_CORBA::Policy::copy_skel},
+  {"destroy", &POA_CORBA::Policy::destroy_skel},
+  {"_is_a", &POA_CORBA::Policy::_is_a_skel}
 };
-/* starting time is 17:16:21 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17,  0, 17,  0, 17,  0,
-      0,  0, 17, 17, 17, 17, 17, 17, 17, 17,
-     17, 17, 17, 17, 17, 17,  0, 17, 17, 17,
-     17,  0, 17, 17, 17, 17, 17, 17,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 5,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 16,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 16,
-      HASH_VALUE_RANGE = 13,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"copy",  &POA_CORBA::Policy::copy_skel},
-      {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
-      {"",},
-      {"destroy",       &POA_CORBA::Policy::destroy_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
-      {"",}, {"",},
-      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 17:16:21 */
-TAO_CORBA_Policy_Perfect_Hash_OpTable tao_CORBA_Policy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
+static const CORBA::Long _tao_CORBA_Policy_optable_size = sizeof (ACE_Hash_Map_Entry<const char *, TAO_Skeleton>) * (12);
+static char _tao_CORBA_Policy_optable_pool [_tao_CORBA_Policy_optable_size];
+static ACE_Static_Allocator_Base _tao_CORBA_Policy_allocator (_tao_CORBA_Policy_optable_pool, _tao_CORBA_Policy_optable_size);
+TAO_Dynamic_Hash_OpTable tao_CORBA_Policy_optable (CORBA_Policy_operations, 4, 8, &_tao_CORBA_Policy_allocator);
 // skeleton constructor
 POA_CORBA::Policy::Policy (void)
 {
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
   this->optable_ = &tao_CORBA_Policy_optable;
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 }
 
-// copy ctor
-POA_CORBA::Policy::Policy (const Policy& rhs)
-  :   TAO_ServantBase (rhs)
-{}
 // skeleton destructor
 POA_CORBA::Policy::~Policy (void)
 {
 }
-
-#if !defined (TAO_HAS_LOCALITY_CONSTRAINT_POLICIES)
 void POA_CORBA::Policy::_get_policy_type_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_orb_environment
 )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel _get_CORBA_Policy_policy_type_paramdata [] =
+  {
+    {CORBA::_tc_PolicyType, 0, 0}
+  }; // CORBA_Policy_policy_type_paramdata
+
+  static const TAO_Call_Data_Skel _get_CORBA_Policy_policy_type_calldata =
+  {"_get_policy_type", 1, 1, _get_CORBA_Policy_policy_type_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
   CORBA::PolicyType _tao_retval = 0;
+  _tao_server_request.demarshal (
+    _tao_orb_environment,
+    &_get_CORBA_Policy_policy_type_calldata,
+    &_tao_retval
+  );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->policy_type (
-    ACE_TRY_ENV
+    _tao_orb_environment
+  );
+  _tao_server_request.marshal (
+    _tao_orb_environment,
+    //    _tao_orb_environment,
+    &_get_CORBA_Policy_policy_type_calldata,
+    &_tao_retval
   );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
 }
 
 void POA_CORBA::Policy::copy_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_orb_environment
 )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel CORBA_Policy_copy_paramdata [] =
+  {
+    {CORBA::_tc_Policy, 0, 0}
+  }; // CORBA_Policy_copy_paramdata
+
+  static const TAO_Call_Data_Skel CORBA_Policy_copy_calldata =
+  {"copy", 1, 1, CORBA_Policy_copy_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
-  CORBA::Policy_var _tao_retval;
+  CORBA::Object_ptr _tao_retval = CORBA::Object::_nil ();
+  _tao_server_request.demarshal (
+    _tao_orb_environment,
+    &CORBA_Policy_copy_calldata,
+    &_tao_retval
+  );
+  if (_tao_orb_environment.exception ()) return;
   _tao_retval = _tao_impl->copy (
-    ACE_TRY_ENV
+    _tao_orb_environment
+  );
+  _tao_server_request.marshal (
+    _tao_orb_environment,
+    //    _tao_skel_environment,
+    &CORBA_Policy_copy_calldata,
+    &_tao_retval
   );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
 }
 
 void POA_CORBA::Policy::destroy_skel (
     CORBA::ServerRequest &_tao_server_request,
     void *_tao_object_reference,
     void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_orb_environment
 )
 {
+  //  CORBA::Environment _tao_skel_environment;
+  static const TAO_Param_Data_Skel CORBA_Policy_destroy_paramdata [] =
+  {
+    {CORBA::_tc_void, 0, 0}
+  }; // CORBA_Policy_destroy_paramdata
+
+  static const TAO_Call_Data_Skel CORBA_Policy_destroy_calldata =
+  {"destroy", 1, 1, CORBA_Policy_destroy_paramdata};
+
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *)_tao_object_reference;
+  _tao_server_request.demarshal (
+    _tao_orb_environment,
+    &CORBA_Policy_destroy_calldata,
+    0
+  );
+  if (_tao_orb_environment.exception ()) return;
   _tao_impl->destroy (
-    ACE_TRY_ENV
+    _tao_orb_environment
+  );
+  _tao_server_request.marshal (
+    _tao_orb_environment,
+    //    _tao_skel_environment,
+    &CORBA_Policy_destroy_calldata,
+    0
   );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
 }
 
 void POA_CORBA::Policy::_is_a_skel (
     CORBA::ServerRequest &_tao_server_request,
     void * _tao_object_reference,
     void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_orb_environment
   )
 {
+  //  CORBA::Environment _tao_skel_environment;
   static const TAO_Param_Data_Skel CORBA_Policy_is_a_paramdata [] =
   {
     {CORBA::_tc_boolean, 0, 0},
@@ -191,54 +158,33 @@ void POA_CORBA::Policy::_is_a_skel (
   {"_is_a", 1, 2, CORBA_Policy_is_a_paramdata};
   POA_CORBA::Policy_ptr  _tao_impl = (POA_CORBA::Policy_ptr) _tao_object_reference;
   CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
+  char *_tao_value = 0;
   _tao_server_request.demarshal (
-    ACE_TRY_ENV,
+    _tao_orb_environment,
     &CORBA_Policy_is_a_calldata,
     &_tao_retval,
-    &_tao_value.inout ()
+    &_tao_value
   );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
+  if (_tao_orb_environment.exception () != 0) return;
+  _tao_retval = _tao_impl->_is_a (_tao_value, _tao_orb_environment);
   _tao_server_request.marshal (
-    ACE_TRY_ENV,
+    _tao_orb_environment,
+    //    _tao_skel_environment,
     &CORBA_Policy_is_a_calldata,
     &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-void POA_CORBA::Policy::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Policy_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Policy_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_Policy_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Policy_non_existent_calldata,
-    &_tao_retval
+    &_tao_value
   );
+  CORBA::string_free (_tao_value);
 }
-#endif /* !TAO_HAS_LOCALITY_CONSTRAINT_POLICIES */
 
 CORBA::Boolean POA_CORBA::Policy::_is_a (
     const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Environment &_tao_orb_environment
   )
 {
   if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Policy:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
+    (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/Policy:1.0")) ||
+    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (_tao_orb_environment))))
       return 1;
     else
       return 0;
@@ -248,7 +194,7 @@ void* POA_CORBA::Policy::_downcast (
     const char* logical_type_id
   )
 {
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Policy:1.0") == 0)
+  if (ACE_OS::strcmp (logical_type_id, "IDL:CORBA/Policy:1.0") == 0)
     return ACE_static_cast (POA_CORBA::Policy_ptr, this);
   if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
     return ACE_static_cast(PortableServer::Servant, this);
@@ -262,7 +208,7 @@ void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, COR
   // find the skeleton corresponding to this opname
   if (this->_find (opname, skel) == -1)
   {
-    env.exception (new CORBA_BAD_OPERATION ());
+    env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO));
     ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
   }
 else
@@ -274,11 +220,9 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
   return "IDL:CORBA/Policy:1.0";
 }
 
-// ****************************************************************
-
 POA_CORBA::_tao_collocated_Policy::_tao_collocated_Policy (
     POA_CORBA::Policy_ptr  servant,
-    TAO_Stub *stub
+    STUB_Object *stub
   )
   : CORBA_Policy (stub, servant, 1),
     CORBA_Object (stub, servant, 1),
@@ -329,210 +273,12 @@ void POA_CORBA::_tao_collocated_Policy::destroy  (
   );
 }
 
+
 CORBA::Policy*
 POA_CORBA::Policy::_this (CORBA_Environment &TAO_IN_ENV)
 {
-  TAO_Stub *stub = this->_create_stub (TAO_IN_ENV);
-  ACE_CHECK_RETURN (0);
+  STUB_Object *stub = this->_create_stub (TAO_IN_ENV);
+  if (TAO_IN_ENV.exception () != 0)
+    return 0;
   return new POA_CORBA::_tao_collocated_Policy (this, stub);
 }
-
-// ****************************************************************
-
-POA_CORBA::PolicyManager::PolicyManager (void)
-{
-}
-
-POA_CORBA::PolicyManager::PolicyManager (const PolicyManager& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-
-POA_CORBA::PolicyManager::~PolicyManager (void)
-{
-}
-
-CORBA::Boolean POA_CORBA::PolicyManager::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::PolicyManager::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::PolicyManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ TODO
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyManager:1.0";
-}
-
-CORBA::PolicyManager*
-POA_CORBA::PolicyManager::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PolicyManager (this, stub);
-}
-
-POA_CORBA::_tao_collocated_PolicyManager::_tao_collocated_PolicyManager (
-    POA_CORBA::PolicyManager_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (PolicyManager) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PolicyManager_ptr POA_CORBA::_tao_collocated_PolicyManager::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PolicyManager::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::PolicyList * POA_CORBA::_tao_collocated_PolicyManager::get_policy_overrides  (
-    const CORBA::PolicyTypeSeq & ts,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->get_policy_overrides (
-    ts,
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PolicyManager::set_policy_overrides  (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->set_policy_overrides (
-    policies,
-    set_add,
-    ACE_TRY_ENV
-  );
-}
-
-// ****************************************************************
-
-POA_CORBA::PolicyCurrent::PolicyCurrent (void)
-{
-}
-
-// copy ctor
-POA_CORBA::PolicyCurrent::PolicyCurrent (const PolicyCurrent& rhs)
-  : ACE_NESTED_CLASS (POA_CORBA,PolicyManager) (rhs),
-    ACE_NESTED_CLASS (POA_CORBA,Current) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::PolicyCurrent::~PolicyCurrent (void)
-{
-}
-
-CORBA::Boolean POA_CORBA::PolicyCurrent::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyCurrent:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PolicyManager:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Current:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void* POA_CORBA::PolicyCurrent::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyCurrent:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyCurrent_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PolicyManager:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PolicyManager_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Current:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Current_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::PolicyCurrent::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA_BAD_OPERATION ());
-}
-
-const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PolicyCurrent:1.0";
-}
-
-CORBA::PolicyCurrent*
-POA_CORBA::PolicyCurrent::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PolicyCurrent (this, stub);
-}
-
-POA_CORBA::_tao_collocated_PolicyCurrent::_tao_collocated_PolicyCurrent (
-    POA_CORBA::PolicyCurrent_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_CORBA_1 (PolicyCurrent) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_PolicyManager) (servant, stub),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Current) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PolicyCurrent_ptr POA_CORBA::_tao_collocated_PolicyCurrent::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PolicyCurrent::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp
deleted file mode 100644
index 7d61f7fdfe6..00000000000
--- a/TAO/tao/Policy_Manager.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// $Id$
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/Policy_Manager.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, Policy_Manager, "$Id$")
-
-void
-TAO_Policy_Manager_Impl::set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ The spec does not say what to do on this case.
-  if (set_add != CORBA::SET_OVERRIDE
-      && set_add != CORBA::ADD_OVERRIDE)
-    ACE_THROW (CORBA::BAD_PARAM ());
-
-  CORBA::InvalidPolicies invalid_policies;
-  invalid_policies.indices.length (policies.length ());
-  int n = 0;
-  for (CORBA::ULong i = 0; i < policies.length ();  ++i)
-    {
-      CORBA::Policy_ptr policy = policies[i];
-      if (CORBA::is_nil (policy))
-        continue;
-
-      CORBA::ULong index = policy->policy_type (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (TAO_MIN_PROPIETARY_POLICY <= index
-          && index < TAO_MAX_PROPIETARY_POLICY)
-        index -= TAO_MIN_PROPIETARY_POLICY;
-
-      if (index >= TAO_MAX_POLICIES)
-        invalid_policies.indices[n++] = CORBA::UShort (i);
-    }
-  if (n != 0)
-    {
-      invalid_policies.indices.length (n);
-      ACE_THROW (CORBA::InvalidPolicies (invalid_policies));
-    }
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      for (int i = 0; i < TAO_MAX_POLICIES; ++i)
-        {
-          this->policies_[i] = CORBA::Policy::_nil ();
-        }
-      this->count_ = 0;
-    }
-
-  for (CORBA::ULong j = 0; j < policies.length ();  ++j)
-    {
-      CORBA::Policy_ptr policy = policies[j];
-      if (CORBA::is_nil (policy))
-        continue;
-
-      CORBA::ULong index = policy->policy_type (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (TAO_MIN_PROPIETARY_POLICY <= index
-          && index < TAO_MAX_PROPIETARY_POLICY)
-        index -= TAO_MIN_PROPIETARY_POLICY;
-
-      // No need to validate the index...
-      if (CORBA::is_nil (this->policies_[index].in ()))
-        this->count_++;
-
-      this->policies_[index] =
-        CORBA::Policy::_duplicate (policy);
-    }
-}
-
-CORBA::PolicyList *
-TAO_Policy_Manager_Impl::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong l = types.length ();
-
-  CORBA::ULong slots = l;
-  if (slots == 0)
-    slots = this->count_;
-
-  CORBA::PolicyList_var policy_list =
-    new CORBA::PolicyList (slots);
-  policy_list->length (slots);
-
-  int n = 0;
-  if (types.length () == 0)
-    {
-      for (int i = 0; i < TAO_MAX_POLICIES; ++i)
-        {
-          if (CORBA::is_nil (this->policies_[i].in ()))
-            continue;
-          policy_list[n++] =
-            CORBA::Policy::_duplicate (this->policies_[i].in ());
-        }
-    }
-  else
-    {
-      for (CORBA::ULong j = 0; j < types.length ();  ++j)
-        {
-          CORBA::ULong index = types[j];
-
-          if (TAO_MIN_PROPIETARY_POLICY <= index
-              && index < TAO_MAX_PROPIETARY_POLICY)
-            index -= TAO_MIN_PROPIETARY_POLICY;
-
-          if (index < TAO_MAX_POLICIES)
-            policy_list[n++] =
-              CORBA::Policy::_duplicate (this->policies_[index].in ());
-        }
-    }
-
-  policy_list->length (n);
-  return policy_list._retn ();
-}
-
-CORBA::Policy_ptr
-TAO_Policy_Manager_Impl::get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::ULong index = type;
-
-  if (TAO_MIN_PROPIETARY_POLICY <= index
-      && index < TAO_MAX_PROPIETARY_POLICY)
-    index -= TAO_MIN_PROPIETARY_POLICY;
-
-  if (index >= TAO_MAX_POLICIES)
-    return CORBA::Policy::_nil ();
-
-  return CORBA::Policy::_duplicate (this->policies_[index].in ());
-}
-
-// ****************************************************************
-
-CORBA::PolicyList *
-TAO_Policy_Manager::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV);
-}
-
-void
-TAO_Policy_Manager::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-CORBA::PolicyList *
-TAO_Policy_Current::get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy_overrides (ts, ACE_TRY_ENV);
-}
-
-void
-TAO_Policy_Current::set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV)
-{
-  this->impl_.set_policy_overrides (policies, set_add, ACE_TRY_ENV);
-}
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h
deleted file mode 100644
index 6b597093e0f..00000000000
--- a/TAO/tao/Policy_Manager.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy_Manager.h
-//
-// = DESCRIPTION
-//   An implementation for the CORBA::PolicyManager interface.
-//
-// = AUTHOR
-//   Carlos O'Ryan (coryan@cs.wustl.edu)
-//
-// ============================================================================
-
-#ifndef TAO_POLICY_MANAGER_H
-#define TAO_POLICY_MANAGER_H
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-
-#include "tao/POA_CORBA.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_Policy_Manager_Impl
-{
-  //
-  // = TITLE
-  //   The policy manager implementation.
-  //
-  // = DESCRIPTION
-  //   This class is used to implement both the CORBA::PolicyManager
-  //   and the CORBA::PolicyCurrent interfaces.
-  //
-public:
-  TAO_Policy_Manager_Impl (void);
-  // Constructor
-
-  void set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Modify the list of policies to include <policies>.
-  // If <set_add> is CORBA::SET_OVERRIDE then we replace all the old
-  // policies. If it is CORBA::ADD_OVERRIDE we simply add the policies 
-  // in <policies>.
-  // No attempt is made to validate the policies for consitency.
-
-  CORBA::PolicyList * get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Get the values (if any) for the policies in <types>, if <types>
-  // is an empty list the method returns *all* the current policies.
-
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Obtain a single policy.
-
-private:
-  CORBA::Policy_var policies_[TAO_MAX_POLICIES];
-  // The policies
-
-  CORBA::ULong count_;
-  // The number of non-nil policies...
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Manager : public POA_CORBA::PolicyManager
-{
-public:
-  TAO_Policy_Manager (void);
-  // constructor
-
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-private:
-  TAO_Policy_Manager_Impl impl_;
-  // The implementation.
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent
-{
-public:
-  TAO_Policy_Current (void);
-  // constructor
- 
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  // Obtain a single policy.
-
-  // = The CORBA::PolicyManager operations
-
-  virtual CORBA::PolicyList * get_policy_overrides (
-        const CORBA::PolicyTypeSeq & ts,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-  virtual void set_policy_overrides (
-        const CORBA::PolicyList & policies,
-        CORBA::SetOverrideType set_add,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-
-private:
-  TAO_Policy_Manager_Impl impl_;
-  // The implementation.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Policy_Manager.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
-#endif /* TAO_POLICY_MANAGER_H */
diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i
deleted file mode 100644
index 2926fbd39ec..00000000000
--- a/TAO/tao/Policy_Manager.i
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-ACE_INLINE
-TAO_Policy_Manager_Impl::TAO_Policy_Manager_Impl (void)
-  :  count_ (0)
-{
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Policy_Manager::TAO_Policy_Manager (void)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Manager::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy (policy, ACE_TRY_ENV);
-}
-
-// ****************************************************************
-
-ACE_INLINE
-TAO_Policy_Current::TAO_Policy_Current (void)
-{
-}
-
-ACE_INLINE CORBA::Policy_ptr
-TAO_Policy_Current::get_policy (
-      CORBA::PolicyType policy,
-      CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->impl_.get_policy (policy, ACE_TRY_ENV);
-}
-
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
deleted file mode 100644
index 347aa4c9dfc..00000000000
--- a/TAO/tao/Pollable.pidl
+++ /dev/null
@@ -1,54 +0,0 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Policy.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in Pollable{C,S,S_T}.{h,i,cpp}
-//   The code is then hand-crafted to compile it inside the ORB, avoid
-//   cyclic dependencies and enforce the locality constraints on
-//   certain objects.
-//
-// ================================================================
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface PollableSet;
-
-  interface Pollable {
-    boolean is_ready(in unsigned long timeout);
-
-    PollableSet create_pollable_set( );
-  };
-
-  interface DIIPollable : Pollable { };
-
-  interface PollableSet {
-
-    exception NoPossiblePollable { };
-    exception UnknownPollable { };
-
-    DIIPollable create_dii_pollable();
-
-    void add_pollable(in Pollable potential );
-
-    Pollable poll(in unsigned long timeout)
-      raises( NoPossiblePollable );
-
-    void remove(in Pollable potential )
-      raises( UnknownPollable );
-
-    unsigned short number_left( );
-  };
-
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
deleted file mode 100644
index 9e4a8c926ae..00000000000
--- a/TAO/tao/PollableC.cpp
+++ /dev/null
@@ -1,1094 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.cpp
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/PollableC.h"
-#include "tao/POA_CORBA.h"
-#include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/Any.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PollableC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, PollableC, "$Id$")
-
-CORBA_Pollable_ptr CORBA_Pollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Pollable::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/Pollable:1.0", env))
-    return CORBA_Pollable::_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/Pollable:1.0");
-  if (servant == 0)
-    return new CORBA_Pollable(stub);
-  return new POA_CORBA::_tao_collocated_Pollable(
-      ACE_reinterpret_cast(POA_CORBA::Pollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA_Pollable_ptr CORBA_Pollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_Pollable::_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/Pollable:1.0");
-  if (servant == 0)
-    return new CORBA_Pollable(stub);
-  return new POA_CORBA::_tao_collocated_Pollable(
-      ACE_reinterpret_cast(POA_CORBA::Pollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA_Pollable::is_ready (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::Boolean _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "is_ready",
-      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 << timeout)
-      ))
-      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;
-}
-
-CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA_PollableSet_ptr _tao_retval = CORBA_PollableSet::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_pollable_set",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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_Pollable::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable: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); // remote call
-}
-
-const char* CORBA_Pollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Pollable:1.0";
-}
-
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::DIIPollable::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/DIIPollable:1.0", env))
-    return CORBA::DIIPollable::_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/DIIPollable:1.0");
-  if (servant == 0)
-    return new CORBA::DIIPollable(stub);
-  return new POA_CORBA::_tao_collocated_DIIPollable(
-      ACE_reinterpret_cast(POA_CORBA::DIIPollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::DIIPollable_ptr CORBA::DIIPollable::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA::DIIPollable::_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/DIIPollable:1.0");
-  if (servant == 0)
-    return new CORBA::DIIPollable(stub);
-  return new POA_CORBA::_tao_collocated_DIIPollable(
-      ACE_reinterpret_cast(POA_CORBA::DIIPollable_ptr, servant),
-      stub
-    );
-}
-
-CORBA::Boolean CORBA::DIIPollable::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable: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); // remote call
-}
-
-const char* CORBA::DIIPollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DIIPollable:1.0";
-}
-
-CORBA_PollableSet_ptr CORBA_PollableSet::_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PollableSet::_nil ();
-  if (!obj->_is_a ("IDL:omg.org/CORBA/PollableSet:1.0", env))
-    return CORBA_PollableSet::_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/PollableSet:1.0");
-  if (servant == 0)
-    return new CORBA_PollableSet(stub);
-  return new POA_CORBA::_tao_collocated_PollableSet(
-      ACE_reinterpret_cast(POA_CORBA::PollableSet_ptr, servant),
-      stub
-    );
-}
-
-CORBA_PollableSet_ptr CORBA_PollableSet::_unchecked_narrow (
-    CORBA::Object_ptr obj,
-    CORBA::Environment &env
-  )
-{
-  if (CORBA::is_nil (obj))
-    return CORBA_PollableSet::_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/PollableSet:1.0");
-  if (servant == 0)
-    return new CORBA_PollableSet(stub);
-  return new POA_CORBA::_tao_collocated_PollableSet(
-      ACE_reinterpret_cast(POA_CORBA::PollableSet_ptr, servant),
-      stub
-    );
-}
-
-// default constructor
-CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (void)
-  : CORBA_UserException (CORBA_PollableSet::_tc_NoPossiblePollable)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PollableSet::NoPossiblePollable::~NoPossiblePollable (void)
-{
-}
-
-// copy constructor
-CORBA_PollableSet::NoPossiblePollable::NoPossiblePollable (const CORBA_PollableSet::NoPossiblePollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-CORBA_PollableSet::NoPossiblePollable&
-CORBA_PollableSet::NoPossiblePollable::operator= (const CORBA_PollableSet::NoPossiblePollable &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_PollableSet::NoPossiblePollable_ptr
-CORBA_PollableSet::NoPossiblePollable::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PollableSet::NoPossiblePollable_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_PollableSet::NoPossiblePollable::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PollableSet::NoPossiblePollable::_alloc (void)
-{
-  return new CORBA_PollableSet::NoPossiblePollable;
-}
-
-static const CORBA::Long _oc_CORBA_PollableSet_NoPossiblePollable[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  53, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f4e6f), ACE_NTOHL (0x506f7373), ACE_NTOHL (0x69626c65), ACE_NTOHL (0x506f6c6c), ACE_NTOHL (0x61626c65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0
-  19, ACE_NTOHL (0x4e6f506f), ACE_NTOHL (0x73736962), ACE_NTOHL (0x6c65506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c650000),  // name = NoPossiblePollable
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_NoPossiblePollable), (char *) &_oc_CORBA_PollableSet_NoPossiblePollable, 0, sizeof (CORBA_PollableSet::NoPossiblePollable));
-CORBA::TypeCode_ptr CORBA_PollableSet::_tc_NoPossiblePollable = &_tc_TAO_tc_CORBA_PollableSet_NoPossiblePollable;
-
-// default constructor
-CORBA_PollableSet::UnknownPollable::UnknownPollable (void)
-  : CORBA_UserException (CORBA_PollableSet::_tc_UnknownPollable)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_PollableSet::UnknownPollable::~UnknownPollable (void)
-{
-}
-
-// copy constructor
-CORBA_PollableSet::UnknownPollable::UnknownPollable (const CORBA_PollableSet::UnknownPollable &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-  }
-
-// assignment operator
-CORBA_PollableSet::UnknownPollable&
-CORBA_PollableSet::UnknownPollable::operator= (const CORBA_PollableSet::UnknownPollable &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_PollableSet::UnknownPollable_ptr
-CORBA_PollableSet::UnknownPollable::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_PollableSet::UnknownPollable_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_PollableSet::UnknownPollable::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_PollableSet::UnknownPollable::_alloc (void)
-{
-  return new CORBA_PollableSet::UnknownPollable;
-}
-
-static const CORBA::Long _oc_CORBA_PollableSet_UnknownPollable[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c6c6162), ACE_NTOHL (0x6c655365), ACE_NTOHL (0x742f556e), ACE_NTOHL (0x6b6e6f77), ACE_NTOHL (0x6e506f6c), ACE_NTOHL (0x6c61626c), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0
-  16, ACE_NTOHL (0x556e6b6e), ACE_NTOHL (0x6f776e50), ACE_NTOHL (0x6f6c6c61), ACE_NTOHL (0x626c6500),  // name = UnknownPollable
-  0, // member count
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_PollableSet_UnknownPollable (CORBA::tk_except, sizeof (_oc_CORBA_PollableSet_UnknownPollable), (char *) &_oc_CORBA_PollableSet_UnknownPollable, 0, sizeof (CORBA_PollableSet::UnknownPollable));
-CORBA::TypeCode_ptr CORBA_PollableSet::_tc_UnknownPollable = &_tc_TAO_tc_CORBA_PollableSet_UnknownPollable;
-
-CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::DIIPollable_ptr _tao_retval = CORBA::DIIPollable::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "create_dii_pollable",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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_PollableSet::add_pollable (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "add_pollable",
-      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 << potential)
-      ))
-      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_Pollable_ptr CORBA_PollableSet::poll (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    static TAO_Exception_Data _tao_CORBA_PollableSet_poll_exceptiondata [] =
-  {
-    {CORBA_PollableSet::_tc_NoPossiblePollable, CORBA_PollableSet::NoPossiblePollable::_alloc}
-  };
-
-  CORBA_Pollable_ptr _tao_retval = CORBA_Pollable::_nil ();
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "poll",
-      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 << timeout)
-      ))
-      ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, 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_PollableSet::remove (
-    CORBA_Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    static TAO_Exception_Data _tao_CORBA_PollableSet_remove_exceptiondata [] =
-  {
-    {CORBA_PollableSet::_tc_UnknownPollable, CORBA_PollableSet::UnknownPollable::_alloc}
-  };
-
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW (CORBA::INV_OBJREF ());
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "remove",
-      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 << potential)
-      ))
-      ACE_THROW (CORBA::MARSHAL ());
-
-    int _invoke_status =
-      _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, 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::UShort CORBA_PollableSet::number_left (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-    CORBA::UShort _tao_retval = 0;
-
-  TAO_Stub *istub = this->_stubobj ();
-  if (istub == 0)
-    ACE_THROW_RETURN (CORBA::INV_OBJREF (), _tao_retval);
-
-
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "number_left",
-      istub->orb_core ()
-    );
-
-
-  for (;;)
-  {
-    ACE_TRY_ENV.clear ();
-    _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_PollableSet::_is_a (const CORBA::Char *value, CORBA::Environment &env)
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet: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); // remote call
-}
-
-const char* CORBA_PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_Pollable_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_Pollable::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_Pollable, _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_Pollable_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_Pollable::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_Pollable, 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_Pollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_Pollable::_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_Pollable, 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_Pollable>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_Pollable>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, CORBA::DIIPollable_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::DIIPollable::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_DIIPollable, _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::DIIPollable_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA::DIIPollable::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_DIIPollable, 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_DIIPollable, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA::DIIPollable::_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_DIIPollable, 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::DIIPollable>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA::DIIPollable>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet_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_PollableSet::_duplicate (_tao_elem);
-    _tao_any.replace (CORBA::_tc_PollableSet, _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_PollableSet_ptr &_tao_elem)
-{
-  CORBA::Object_ptr *tmp = 0;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_elem = CORBA_PollableSet::_nil ();
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_PollableSet, 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_PollableSet, &_tao_obj_var.out (), 0, ACE_TRY_ENV)
-       == CORBA::TypeCode::TRAVERSE_CONTINUE)
-    {
-      _tao_elem = CORBA_PollableSet::_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_PollableSet, 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_PollableSet>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO_Object_Field_T<CORBA_PollableSet>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA_PollableSet::NoPossiblePollable &_tao_elem) // copying
-{
-  CORBA_PollableSet::NoPossiblePollable *_tao_any_val = new CORBA_PollableSet::NoPossiblePollable (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet::NoPossiblePollable *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::NoPossiblePollable *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA_PollableSet::_tc_NoPossiblePollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PollableSet::NoPossiblePollable *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::NoPossiblePollable, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA_PollableSet::_tc_NoPossiblePollable, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA_PollableSet::_tc_NoPossiblePollable, _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_PollableSet::UnknownPollable &_tao_elem) // copying
-{
-  CORBA_PollableSet::UnknownPollable *_tao_any_val = new CORBA_PollableSet::UnknownPollable (_tao_elem);
-  if (!_tao_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_UnknownPollable, _tao_any_val, 1, ACE_TRY_ENV);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    delete _tao_any_val;
-  }
-  ACE_ENDTRY;
-}
-
-void operator<<= (CORBA::Any &_tao_any, CORBA_PollableSet::UnknownPollable *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PollableSet::UnknownPollable *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA_PollableSet::_tc_UnknownPollable, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA_PollableSet::UnknownPollable *)_tao_any.value ();
-      return 1;
-    }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA_PollableSet::UnknownPollable, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA_PollableSet::_tc_UnknownPollable, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA_PollableSet::_tc_UnknownPollable, _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::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_Pollable_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_Pollable_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_Pollable::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_DIIPollable_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_DIIPollable_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_DIIPollable::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_PollableSet_ptr _tao_objref
-  )
-{
-  CORBA::Object_ptr _tao_corba_obj = _tao_objref;
-  return (strm << _tao_corba_obj);
-}
-
-CORBA::Boolean
-operator>> (
-    TAO_InputCDR &strm,
-    CORBA_PollableSet_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_PollableSet::_narrow (
-          obj.in (),
-          ACE_TRY_ENV
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
deleted file mode 100644
index de98961c6e9..00000000000
--- a/TAO/tao/PollableC.h
+++ /dev/null
@@ -1,437 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.h
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_POLLABLEC_H
-#define TAO_IDL_POLLABLEC_H
-
-#include "tao/corbafwd.h"
-#include "tao/Object.h"
-#include "tao/Exception.h"
-#include "tao/CDR.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 TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class CORBA_PollableSet;
-typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
-
-class TAO_Export CORBA_PollableSet_var
-{
-public:
-  CORBA_PollableSet_var (void); // default constructor
-  CORBA_PollableSet_var (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var (const CORBA_PollableSet_var &); // copy constructor
-  ~CORBA_PollableSet_var (void); // destructor
-
-  CORBA_PollableSet_var &operator= (CORBA_PollableSet_ptr);
-  CORBA_PollableSet_var &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_ptr operator-> (void) const;
-
-  operator const CORBA_PollableSet_ptr &() const;
-  operator CORBA_PollableSet_ptr &();
-  // in, inout, out, _retn
-  CORBA_PollableSet_ptr in (void) const;
-  CORBA_PollableSet_ptr &inout (void);
-  CORBA_PollableSet_ptr &out (void);
-  CORBA_PollableSet_ptr _retn (void);
-  CORBA_PollableSet_ptr ptr (void) const;
-
-private:
-  CORBA_PollableSet_ptr ptr_;
-};
-
-class TAO_Export CORBA_PollableSet_out
-{
-public:
-  CORBA_PollableSet_out (CORBA_PollableSet_ptr &);
-  CORBA_PollableSet_out (CORBA_PollableSet_var &);
-  CORBA_PollableSet_out (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_out &);
-  CORBA_PollableSet_out &operator= (const CORBA_PollableSet_var &);
-  CORBA_PollableSet_out &operator= (CORBA_PollableSet_ptr);
-  operator CORBA_PollableSet_ptr &();
-  CORBA_PollableSet_ptr &ptr (void);
-  CORBA_PollableSet_ptr operator-> (void);
-
-private:
-  CORBA_PollableSet_ptr &ptr_;
-};
-
-class CORBA_Pollable;
-typedef CORBA_Pollable *CORBA_Pollable_ptr;
-
-class TAO_Export CORBA_Pollable_var
-{
-public:
-  CORBA_Pollable_var (void); // default constructor
-  CORBA_Pollable_var (CORBA_Pollable_ptr);
-  CORBA_Pollable_var (const CORBA_Pollable_var &); // copy constructor
-  ~CORBA_Pollable_var (void); // destructor
-
-  CORBA_Pollable_var &operator= (CORBA_Pollable_ptr);
-  CORBA_Pollable_var &operator= (const CORBA_Pollable_var &);
-  CORBA_Pollable_ptr operator-> (void) const;
-
-  operator const CORBA_Pollable_ptr &() const;
-  operator CORBA_Pollable_ptr &();
-  // in, inout, out, _retn
-  CORBA_Pollable_ptr in (void) const;
-  CORBA_Pollable_ptr &inout (void);
-  CORBA_Pollable_ptr &out (void);
-  CORBA_Pollable_ptr _retn (void);
-  CORBA_Pollable_ptr ptr (void) const;
-
-private:
-  CORBA_Pollable_ptr ptr_;
-};
-
-class TAO_Export CORBA_Pollable_out
-{
-public:
-  CORBA_Pollable_out (CORBA_Pollable_ptr &);
-  CORBA_Pollable_out (CORBA_Pollable_var &);
-  CORBA_Pollable_out (const CORBA_Pollable_out &);
-  CORBA_Pollable_out &operator= (const CORBA_Pollable_out &);
-  CORBA_Pollable_out &operator= (const CORBA_Pollable_var &);
-  CORBA_Pollable_out &operator= (CORBA_Pollable_ptr);
-  operator CORBA_Pollable_ptr &();
-  CORBA_Pollable_ptr &ptr (void);
-  CORBA_Pollable_ptr operator-> (void);
-
-private:
-  CORBA_Pollable_ptr &ptr_;
-};
-
-class TAO_Export CORBA_Pollable : public virtual CORBA_Object
-{
- public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Pollable_ptr _ptr_type;
-  typedef CORBA_Pollable_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_Pollable_ptr _duplicate (CORBA_Pollable_ptr obj);
-  static CORBA_Pollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_Pollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_Pollable_ptr _nil (void);
-
-  virtual CORBA::Boolean is_ready (
-      CORBA::ULong timeout,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA_PollableSet_ptr create_pollable_set (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_Pollable (void); // default constructor
-  CORBA_Pollable (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_Pollable (void);
-private:
-  CORBA_Pollable (const CORBA_Pollable &);
-  void operator= (const CORBA_Pollable &);
-};
-
-class CORBA_DIIPollable;
-typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr;
-
-class TAO_Export CORBA_DIIPollable_var
-{
-public:
-  CORBA_DIIPollable_var (void); // default constructor
-  CORBA_DIIPollable_var (CORBA_DIIPollable_ptr);
-  CORBA_DIIPollable_var (const CORBA_DIIPollable_var &); // copy constructor
-  ~CORBA_DIIPollable_var (void); // destructor
-
-  CORBA_DIIPollable_var &operator= (CORBA_DIIPollable_ptr);
-  CORBA_DIIPollable_var &operator= (const CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_ptr operator-> (void) const;
-
-  operator const CORBA_DIIPollable_ptr &() const;
-  operator CORBA_DIIPollable_ptr &();
-  // in, inout, out, _retn
-  CORBA_DIIPollable_ptr in (void) const;
-  CORBA_DIIPollable_ptr &inout (void);
-  CORBA_DIIPollable_ptr &out (void);
-  CORBA_DIIPollable_ptr _retn (void);
-  CORBA_DIIPollable_ptr ptr (void) const;
-
-private:
-  CORBA_DIIPollable_ptr ptr_;
-};
-
-class TAO_Export CORBA_DIIPollable_out
-{
-public:
-  CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &);
-  CORBA_DIIPollable_out (CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_out (const CORBA_DIIPollable_out &);
-  CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_out &);
-  CORBA_DIIPollable_out &operator= (const CORBA_DIIPollable_var &);
-  CORBA_DIIPollable_out &operator= (CORBA_DIIPollable_ptr);
-  operator CORBA_DIIPollable_ptr &();
-  CORBA_DIIPollable_ptr &ptr (void);
-  CORBA_DIIPollable_ptr operator-> (void);
-
-private:
-  CORBA_DIIPollable_ptr &ptr_;
-};
-
-class TAO_Export CORBA_DIIPollable: public virtual CORBA_Pollable
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_DIIPollable_ptr _ptr_type;
-  typedef CORBA_DIIPollable_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_DIIPollable_ptr _duplicate (CORBA_DIIPollable_ptr obj);
-  static CORBA_DIIPollable_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_DIIPollable_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_DIIPollable_ptr _nil (void);
-
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_DIIPollable (void); // default constructor
-  CORBA_DIIPollable (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_DIIPollable (void);
-private:
-  CORBA_DIIPollable (const CORBA_DIIPollable &);
-  void operator= (const CORBA_DIIPollable &);
-};
-
-class TAO_Export CORBA_PollableSet : public virtual ACE_CORBA_1 (Object)
-{
-public:
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_PollableSet_ptr _ptr_type;
-  typedef CORBA_PollableSet_var _var_type;
-#endif /* __GNUC__ */
-
-  // the static operations
-  static CORBA_PollableSet_ptr _duplicate (CORBA_PollableSet_ptr obj);
-  static CORBA_PollableSet_ptr _narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_PollableSet_ptr _unchecked_narrow (
-      CORBA::Object_ptr obj,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  static CORBA_PollableSet_ptr _nil (void);
-
-  class NoPossiblePollable;
-  typedef NoPossiblePollable *NoPossiblePollable_ptr;
-
-  class TAO_Export NoPossiblePollable : public CORBA::UserException
-  {
-  public:
-    // ****************
-    // The fields (and their helper classes)
-
-
-    // End of implicit types for the fields
-    // ****************
-
-    NoPossiblePollable (void); // default ctor
-    NoPossiblePollable (const NoPossiblePollable &); // copy ctor
-    ~NoPossiblePollable (void); // dtor
-          NoPossiblePollable &operator= (const NoPossiblePollable &);
-
-
-    virtual void _raise (void);
-
-    static NoPossiblePollable *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-  }; // exception CORBA::PollableSet::NoPossiblePollable
-
-  static CORBA::TypeCode_ptr _tc_NoPossiblePollable;
-
-  class UnknownPollable;
-  typedef UnknownPollable *UnknownPollable_ptr;
-
-  class TAO_Export UnknownPollable : public CORBA::UserException
-  {
-  public:
-    // ****************
-    // The fields (and their helper classes)
-
-
-    // End of implicit types for the fields
-    // ****************
-
-    UnknownPollable (void); // default ctor
-    UnknownPollable (const UnknownPollable &); // copy ctor
-    ~UnknownPollable (void); // dtor
-          UnknownPollable &operator= (const UnknownPollable &);
-
-
-    virtual void _raise (void);
-
-    static UnknownPollable *_narrow (CORBA::Exception *);
-
-
-    // = TAO extension
-    static CORBA::Exception *_alloc (void);
-
-  }; // exception CORBA::PollableSet::UnknownPollable
-
-  static CORBA::TypeCode_ptr _tc_UnknownPollable;
-
-
-  virtual CORBA_DIIPollable_ptr create_dii_pollable (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual void add_pollable (
-      CORBA_Pollable_ptr potential,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA_Pollable_ptr poll (
-      CORBA::ULong timeout,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual void remove (
-      CORBA_Pollable_ptr potential,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA::UShort number_left (
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  virtual CORBA::Boolean _is_a (
-      const CORBA::Char *type_id,
-      CORBA::Environment &env =
-        CORBA::default_environment ()
-    );
-  virtual const char* _interface_repository_id (void) const;
-protected:
-  CORBA_PollableSet (void); // default constructor
-  CORBA_PollableSet (TAO_Stub *objref,
-      TAO_ServantBase *_tao_servant = 0,
-      CORBA::Boolean _tao_collocated = 0
-    );
-  virtual ~CORBA_PollableSet (void);
-private:
-  CORBA_PollableSet (const CORBA_PollableSet &);
-  void operator= (const CORBA_PollableSet &);
-};
-
-// Any operators for interface CORBA_Pollable
-void TAO_Export operator<<= (CORBA::Any &, CORBA_Pollable_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_Pollable *&);
-// Any operators for interface CORBA::DIIPollable
-void TAO_Export operator<<= (CORBA::Any &, CORBA::DIIPollable_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA::DIIPollable *&);
-// Any operators for interface CORBA_PollableSet
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet_ptr);
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet *&);
-void TAO_Export operator<<= (CORBA::Any &, const CORBA_PollableSet::NoPossiblePollable &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet::NoPossiblePollable*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet::NoPossiblePollable *&);
-void TAO_Export operator<<= (CORBA::Any &, const CORBA_PollableSet::UnknownPollable &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, CORBA_PollableSet::UnknownPollable*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, CORBA_PollableSet::UnknownPollable *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA_Pollable_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA_Pollable_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA::DIIPollable_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA::DIIPollable_ptr &);
-CORBA::Boolean TAO_Export
-operator<< (TAO_OutputCDR &, const CORBA_PollableSet_ptr );
-CORBA::Boolean TAO_Export
-operator>> (TAO_InputCDR &, CORBA_PollableSet_ptr &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_PollableSet::NoPossiblePollable &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::NoPossiblePollable &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const CORBA_PollableSet::UnknownPollable &); //
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, CORBA_PollableSet::UnknownPollable &);
-
-#endif /* __ACE_INLINE__ */
-
-
-#if defined (__ACE_INLINE__)
-#include "PollableC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_POLLABLEC_H */
diff --git a/TAO/tao/PollableC.i b/TAO/tao/PollableC.i
deleted file mode 100644
index 5b365ad2053..00000000000
--- a/TAO/tao/PollableC.i
+++ /dev/null
@@ -1,648 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CORBA_Pollable::CORBA_Pollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_Pollable::CORBA_Pollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_Pollable::~CORBA_Pollable (void) // destructor
-{}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable::_duplicate (CORBA_Pollable_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable::_nil (void)
-{
-  return (CORBA_Pollable_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (void) // default constructor
-  : ptr_ (CORBA_Pollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (CORBA_Pollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::CORBA_Pollable_var (const CORBA_Pollable_var &p) // copy constructor
-  : ptr_ (CORBA_Pollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_Pollable_var::~CORBA_Pollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (CORBA_Pollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_var &
-CORBA_Pollable_var::operator= (const CORBA_Pollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator const CORBA_Pollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_Pollable_var::operator CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Pollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_Pollable_ptr val = this->ptr_;
-  this->ptr_ = CORBA_Pollable::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_Pollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (CORBA_Pollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_Pollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_Pollable_out::CORBA_Pollable_out (const CORBA_Pollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_Pollable_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const CORBA_Pollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_Pollable_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (const CORBA_Pollable_var &p)
-{
-  this->ptr_ = CORBA_Pollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_Pollable_out &
-CORBA_Pollable_out::operator= (CORBA_Pollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_Pollable_out::operator CORBA_Pollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr &
-CORBA_Pollable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_Pollable_ptr
-CORBA_Pollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable::CORBA_DIIPollable (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_DIIPollable::CORBA_DIIPollable (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_DIIPollable::~CORBA_DIIPollable (void) // destructor
-{}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable::_duplicate (CORBA_DIIPollable_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable::_nil (void)
-{
-  return (CORBA_DIIPollable_ptr)0;
-}
-
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (void) // default constructor
-  : ptr_ (CORBA_DIIPollable::_nil ())
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (CORBA_DIIPollable_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::CORBA_DIIPollable_var (const CORBA_DIIPollable_var &p) // copy constructor
-  : ptr_ (CORBA_DIIPollable::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_DIIPollable_var::~CORBA_DIIPollable_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (CORBA_DIIPollable_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_var &
-CORBA_DIIPollable_var::operator= (const CORBA_DIIPollable_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::operator const CORBA_DIIPollable_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_var::operator CORBA_DIIPollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_DIIPollable_ptr val = this->ptr_;
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_DIIPollable_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (CORBA_DIIPollable_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_DIIPollable::_nil ();
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::CORBA_DIIPollable_out (const CORBA_DIIPollable_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_DIIPollable_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (const CORBA_DIIPollable_var &p)
-{
-  this->ptr_ = CORBA_DIIPollable::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_DIIPollable_out &
-CORBA_DIIPollable_out::operator= (CORBA_DIIPollable_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_DIIPollable_out::operator CORBA_DIIPollable_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr &
-CORBA_DIIPollable_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_DIIPollable_ptr
-CORBA_DIIPollable_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet::CORBA_PollableSet (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_PollableSet::CORBA_PollableSet (TAO_Stub *objref, TAO_ServantBase *_tao_servant, CORBA::Boolean _tao_collocated) // constructor
-  : CORBA_Object (objref, _tao_servant, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_PollableSet::~CORBA_PollableSet (void) // destructor
-{}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet::_duplicate (CORBA_PollableSet_ptr obj)
-{
-  if (!CORBA::is_nil (obj))
-    obj->_incr_refcnt ();
-  return obj;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet::_nil (void)
-{
-  return (CORBA_PollableSet_ptr)0;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PollableSet_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (void) // default constructor
-  : ptr_ (CORBA_PollableSet::_nil ())
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (CORBA_PollableSet_ptr p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::CORBA_PollableSet_var (const CORBA_PollableSet_var &p) // copy constructor
-  : ptr_ (CORBA_PollableSet::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-CORBA_PollableSet_var::~CORBA_PollableSet_var (void) // destructor
-{
-  CORBA::release (this->ptr_);
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (CORBA_PollableSet_ptr p)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_var &
-CORBA_PollableSet_var::operator= (const CORBA_PollableSet_var &p)
-{
-  if (this != &p)
-  {
-    CORBA::release (this->ptr_);
-    this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ());
-  }
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator const CORBA_PollableSet_ptr &() const // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA_PollableSet_var::operator CORBA_PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::in (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::inout (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_var::out (void)
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PollableSet::_nil ();
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_var::_retn (void)
-{
-  // yield ownership of managed obj reference
-  CORBA_PollableSet_ptr val = this->ptr_;
-  this->ptr_ = CORBA_PollableSet::_nil ();
-  return val;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_PollableSet_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_ptr &p)
-  : ptr_ (p)
-{
-  this->ptr_ = CORBA_PollableSet::_nil ();
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (CORBA_PollableSet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  CORBA::release (this->ptr_);
-  this->ptr_ = CORBA_PollableSet::_nil ();
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::CORBA_PollableSet_out (const CORBA_PollableSet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_PollableSet_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const CORBA_PollableSet_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_PollableSet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (const CORBA_PollableSet_var &p)
-{
-  this->ptr_ = CORBA_PollableSet::_duplicate (p.ptr ());
-  return *this;
-}
-
-ACE_INLINE CORBA_PollableSet_out &
-CORBA_PollableSet_out::operator= (CORBA_PollableSet_ptr p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE
-CORBA_PollableSet_out::operator CORBA_PollableSet_ptr &() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr &
-CORBA_PollableSet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_PollableSet_ptr
-CORBA_PollableSet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::NoPossiblePollable
-// *************************************************************
-
-// *************************************************************
-// Inline operations for exception CORBA_PollableSet::UnknownPollable
-// *************************************************************
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_PollableSet_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_PollableSet_ptr &
-  );
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_Pollable_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_Pollable_ptr &
-  );
-
-CORBA::Boolean TAO_Export
-operator<< (
-    TAO_OutputCDR &,
-    const CORBA_DIIPollable_ptr
-  );
-CORBA::Boolean TAO_Export
-operator>> (
-    TAO_InputCDR &,
-    CORBA_DIIPollable_ptr &
-  );
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::NoPossiblePollable &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PollableSet::NoPossiblePollable &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA_PollableSet::UnknownPollable &_tao_aggregate)
-{
-  // first marshal the repository ID
-  if (strm << _tao_aggregate._id ())
-    return 1;
-  else
-    return 0;
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_PollableSet::UnknownPollable &_tao_aggregate)
-{
-  // retrieve  RepoID and verify if we are of that type
-  char *_tao_repoID;
-  if ((strm >> _tao_repoID) &&
-      (_tao_aggregate._is_a (_tao_repoID)))
-  {
-    return 1;
-  }
-  else
-    return 0;
-}
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp
deleted file mode 100644
index 08f791e08a7..00000000000
--- a/TAO/tao/PollableS.cpp
+++ /dev/null
@@ -1,946 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableS.cpp
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#include "tao/PollableS.h"
-#include "tao/Operation_Table.h"
-#include "tao/Server_Request.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, PollableS, "$Id$")
-
-class TAO_CORBA_Pollable_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 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_Pollable_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_Pollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20, 20, 20, 20, 20,  0, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,  0, 20, 20, 20,
-     20,  0, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_Pollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 4,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_is_a",  &POA_CORBA::Pollable::_is_a_skel},
-      {"",}, {"",},
-      {"is_ready",      &POA_CORBA::Pollable::is_ready_skel},
-      {"",}, {"",}, {"",}, {"",},
-      {"_non_existent",  &POA_CORBA::Pollable::_non_existent_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"create_pollable_set",   &POA_CORBA::Pollable::create_pollable_set_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_Pollable_Perfect_Hash_OpTable tao_CORBA_Pollable_optable;
-// skeleton constructor
-POA_CORBA::Pollable::Pollable (void)
-{
-  this->optable_ = &tao_CORBA_Pollable_optable;
-}
-
-// copy ctor
-POA_CORBA::Pollable::Pollable (const Pollable& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::Pollable::~Pollable (void)
-{
-}
-void POA_CORBA::Pollable::is_ready_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_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference;
-  CORBA::Boolean _tao_retval = 0;
-  CORBA::ULong timeout;
-  if (!(
-    (_tao_in >> timeout)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << CORBA::Any::from_boolean (_tao_retval))
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Pollable::create_pollable_set_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::Pollable *_tao_impl = (POA_CORBA::Pollable *)_tao_object_reference;
-  CORBA::PollableSet_var _tao_retval;
-  _tao_retval = _tao_impl->create_pollable_set (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::Pollable::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Pollable_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Pollable_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_Pollable_is_a_paramdata};
-  POA_CORBA::Pollable_ptr  _tao_impl = (POA_CORBA::Pollable_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::Pollable::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::Pollable::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_Pollable_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_Pollable_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_Pollable_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_Pollable_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::Pollable::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::Pollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/Pollable:1.0";
-}
-
-POA_CORBA::_tao_collocated_Pollable::_tao_collocated_Pollable (
-    POA_CORBA::Pollable_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (CORBA,Pollable) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::Pollable_ptr POA_CORBA::_tao_collocated_Pollable::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_Pollable::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_Pollable::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-
-CORBA::Pollable*
-POA_CORBA::Pollable::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_Pollable (this, stub);
-}
-
-class TAO_CORBA_DIIPollable_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 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_DIIPollable_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20, 20, 20, 20, 20,  0, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20,  0, 20, 20, 20,
-     20,  0, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 4,
-      MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 15,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"_is_a",  &POA_CORBA::DIIPollable::_is_a_skel},
-      {"",}, {"",},
-      {"is_ready",      &POA_CORBA::DIIPollable::is_ready_skel},
-      {"",}, {"",}, {"",}, {"",},
-      {"_non_existent",  &POA_CORBA::DIIPollable::_non_existent_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"create_pollable_set",   &POA_CORBA::DIIPollable::create_pollable_set_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_DIIPollable_Perfect_Hash_OpTable tao_CORBA_DIIPollable_optable;
-// skeleton constructor
-POA_CORBA::DIIPollable::DIIPollable (void)
-{
-  this->optable_ = &tao_CORBA_DIIPollable_optable;
-}
-
-// copy ctor
-POA_CORBA::DIIPollable::DIIPollable (const DIIPollable& rhs)
-  :   ACE_NESTED_CLASS (POA_CORBA,Pollable) (rhs),
-    TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::DIIPollable::~DIIPollable (void)
-{
-}
-void POA_CORBA::DIIPollable::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_DIIPollable_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_DIIPollable_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_DIIPollable_is_a_paramdata};
-  POA_CORBA::DIIPollable_ptr  _tao_impl = (POA_CORBA::DIIPollable_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::DIIPollable::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/DIIPollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Pollable:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::DIIPollable::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_DIIPollable_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_DIIPollable_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_DIIPollable_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_DIIPollable_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::DIIPollable::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/DIIPollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::DIIPollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Pollable:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::Pollable_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::DIIPollable::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/DIIPollable:1.0";
-}
-
-POA_CORBA::_tao_collocated_DIIPollable::_tao_collocated_DIIPollable (
-    POA_CORBA::DIIPollable_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (CORBA,DIIPollable) (),
-    ACE_NESTED_CLASS (POA_CORBA,_tao_collocated_Pollable) (servant, stub),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_DIIPollable::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_DIIPollable::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-
-CORBA::DIIPollable*
-POA_CORBA::DIIPollable::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_DIIPollable (this, stub);
-}
-
-class TAO_CORBA_PollableSet_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 15:37:47 */
-/* C++ code produced by gperf version 2.7 (GNU C++ version) */
-/* Command-line: /project/macarena/coryan/head/ACE_wrappers/bin/gperf -m -M -J -c -C -D -E -T -f 0 -a -o -t -p -K opname_ -L C++ -Z TAO_CORBA_PollableSet_Perfect_Hash_OpTable -N lookup  */
-unsigned int
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-     20, 20, 20, 20, 20,  0, 20,  0, 20,  0,
-     20,  0, 20, 20, 20, 20, 20, 20,  0, 20,
-      0, 20,  0, 20,  0, 20,  0, 20, 20, 20,
-     20, 20, 20, 20, 20, 20, 20, 20,
-    };
-  return len + asso_values[str[len - 1]] + asso_values[str[0]];
-}
-
-const class TAO_operation_db_entry *
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 7,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 19,
-      HASH_VALUE_RANGE = 16,
-      DUPLICATES = 0
-    };
-
-  static const class TAO_operation_db_entry  wordlist[] =
-    {
-      {"",}, {"",}, {"",}, {"",},
-      {"poll",  &POA_CORBA::PollableSet::poll_skel},
-      {"_is_a",  &POA_CORBA::PollableSet::_is_a_skel},
-      {"remove",        &POA_CORBA::PollableSet::remove_skel},
-      {"",}, {"",}, {"",}, {"",},
-      {"number_left",   &POA_CORBA::PollableSet::number_left_skel},
-      {"add_pollable",  &POA_CORBA::PollableSet::add_pollable_skel},
-      {"_non_existent",  &POA_CORBA::PollableSet::_non_existent_skel},
-      {"",}, {"",}, {"",}, {"",}, {"",},
-      {"create_dii_pollable",   &POA_CORBA::PollableSet::create_dii_pollable_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];
-        }
-    }
-  return 0;
-}
-/* ending time is 15:37:47 */
-TAO_CORBA_PollableSet_Perfect_Hash_OpTable tao_CORBA_PollableSet_optable;
-// skeleton constructor
-POA_CORBA::PollableSet::PollableSet (void)
-{
-  this->optable_ = &tao_CORBA_PollableSet_optable;
-}
-
-// copy ctor
-POA_CORBA::PollableSet::PollableSet (const PollableSet& rhs)
-  :   TAO_ServantBase (rhs)
-{}
-// skeleton destructor
-POA_CORBA::PollableSet::~PollableSet (void)
-{
-}
-void POA_CORBA::PollableSet::create_dii_pollable_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::DIIPollable_var _tao_retval;
-  _tao_retval = _tao_impl->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::add_pollable_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_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var potential;
-  if (!(
-    (_tao_in >> potential.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->add_pollable (
-    potential.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_CORBA::PollableSet::poll_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_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var _tao_retval;
-  CORBA::ULong timeout;
-  if (!(
-    (_tao_in >> timeout)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_retval = _tao_impl->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval.in ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::remove_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_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::Pollable_var potential;
-  if (!(
-    (_tao_in >> potential.out ())
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-  _tao_impl->remove (
-    potential.in (),
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-}
-
-void POA_CORBA::PollableSet::number_left_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void *_tao_object_reference,
-    void * /* context */,
-    CORBA::Environment &ACE_TRY_ENV
-)
-{
-  POA_CORBA::PollableSet *_tao_impl = (POA_CORBA::PollableSet *)_tao_object_reference;
-  CORBA::UShort _tao_retval = 0;
-  _tao_retval = _tao_impl->number_left (
-    ACE_TRY_ENV
-  );
-  ACE_CHECK;
-  _tao_server_request.init_reply (ACE_TRY_ENV);
-  ACE_CHECK;
-  TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-  if (!(
-    (_tao_out << _tao_retval)
-  ))
-    ACE_THROW (CORBA::MARSHAL () );
-
-}
-
-void POA_CORBA::PollableSet::_is_a_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * _tao_object_reference,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_PollableSet_is_a_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0},
-    {CORBA::_tc_string, CORBA::ARG_IN, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_PollableSet_is_a_calldata =
-  {"_is_a", 1, 2, CORBA_PollableSet_is_a_paramdata};
-  POA_CORBA::PollableSet_ptr  _tao_impl = (POA_CORBA::PollableSet_ptr) _tao_object_reference;
-  CORBA::Boolean _tao_retval;
-  CORBA::String_var _tao_value;
-  _tao_server_request.demarshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-  ACE_CHECK;
-  _tao_retval = _tao_impl->_is_a (_tao_value.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_is_a_calldata,
-    &_tao_retval,
-    &_tao_value.inout ()
-  );
-}
-
-CORBA::Boolean POA_CORBA::PollableSet::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  if (
-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PollableSet:1.0")) ||
-    (!ACE_OS::strcmp ((char *)value, CORBA::_tc_Object->id (ACE_TRY_ENV))))
-      return 1;
-    else
-      return 0;
-}
-
-void POA_CORBA::PollableSet::_non_existent_skel (
-    CORBA::ServerRequest &_tao_server_request,
-    void * /* _tao_object_reference */ ,
-    void * /*context*/,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  static const TAO_Param_Data_Skel CORBA_PollableSet_non_existent_paramdata [] =
-  {
-    {CORBA::_tc_boolean, 0, 0}
-  };
-  static const TAO_Call_Data_Skel CORBA_PollableSet_non_existent_calldata =
-  {"_non_existent", 1, 1, CORBA_PollableSet_non_existent_paramdata};
-  CORBA::Boolean _tao_retval = 0;
-  _tao_server_request.marshal (
-    ACE_TRY_ENV,
-    &CORBA_PollableSet_non_existent_calldata,
-    &_tao_retval
-  );
-}
-
-void* POA_CORBA::PollableSet::_downcast (
-    const char* logical_type_id
-  )
-{
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/PollableSet:1.0") == 0)
-    return ACE_static_cast (POA_CORBA::PollableSet_ptr, this);
-  if (ACE_OS::strcmp (logical_type_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
-    return ACE_static_cast(PortableServer::Servant, this);
-  return 0;
-}
-
-void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV)
-{
-  TAO_Skeleton skel; // pointer to skeleton for operation
-  const char *opname = req.operation (); // retrieve operation name
-  // find the skeleton corresponding to this opname
-  if (this->_find (opname, skel) == -1)
-  {
-    ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname));
-    ACE_THROW (CORBA_BAD_OPERATION ());
-  }
-  else
-    skel (req, this, context, ACE_TRY_ENV);
-}
-
-const char* POA_CORBA::PollableSet::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/CORBA/PollableSet:1.0";
-}
-
-POA_CORBA::_tao_collocated_PollableSet::_tao_collocated_PollableSet (
-    POA_CORBA::PollableSet_ptr  servant,
-    TAO_Stub *stub
-  )
-  : ACE_NESTED_CLASS (CORBA,PollableSet) (),
-    CORBA_Object (stub, servant, 1),
-    servant_ (servant)
-{
-}
-
-POA_CORBA::PollableSet_ptr POA_CORBA::_tao_collocated_PollableSet::_get_servant (void) const
-{
-  return this->servant_;
-}
-
-CORBA::Boolean POA_CORBA::_tao_collocated_PollableSet::_is_a (
-    const char* logical_type_id,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->_is_a (
-      logical_type_id,
-      ACE_TRY_ENV
-    );
-}
-
-CORBA::DIIPollable_ptr POA_CORBA::_tao_collocated_PollableSet::create_dii_pollable  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PollableSet::add_pollable  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->add_pollable (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::Pollable_ptr POA_CORBA::_tao_collocated_PollableSet::poll  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-void POA_CORBA::_tao_collocated_PollableSet::remove  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->servant_->remove (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-CORBA::UShort POA_CORBA::_tao_collocated_PollableSet::number_left  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->servant_->number_left (
-    ACE_TRY_ENV
-  );
-}
-
-
-CORBA::PollableSet*
-POA_CORBA::PollableSet::_this (CORBA_Environment &ACE_TRY_ENV)
-{
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
-  return new POA_CORBA::_tao_collocated_PollableSet (this, stub);
-}
diff --git a/TAO/tao/PollableS.h b/TAO/tao/PollableS.h
deleted file mode 100644
index abacbd7b139..00000000000
--- a/TAO/tao/PollableS.h
+++ /dev/null
@@ -1,232 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   PollableC.h
-//
-// = DESCRIPTION
-//   Generated from Pollable.pidl
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_POLLABLES_H
-#define TAO_IDL_POLLABLES_H
-
-#include "tao/PollableC.h"
-#include "tao/POA_CORBA.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 */
-
-#if 0
-TAO_NAMESPACE  POA_CORBA
-{
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export Pollable_tie : public Pollable
-  {
-  public:
-    Pollable_tie (T &t);
-    // the T& ctor
-    Pollable_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    Pollable_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    Pollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~Pollable_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    Pollable_tie (const Pollable_tie &);
-    void operator= (const Pollable_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export DIIPollable_tie : public DIIPollable
-  {
-  public:
-    DIIPollable_tie (T &t);
-    // the T& ctor
-    DIIPollable_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    DIIPollable_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    DIIPollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~DIIPollable_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Boolean is_ready (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::PollableSet_ptr create_pollable_set (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    DIIPollable_tie (const DIIPollable_tie &);
-    void operator= (const DIIPollable_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-  // TIE class: Refer to CORBA v2.2, Section 20.34.4
-  template <class T>
-  class TAO_Export PollableSet_tie : public PollableSet
-  {
-  public:
-    PollableSet_tie (T &t);
-    // the T& ctor
-    PollableSet_tie (T &t, PortableServer::POA_ptr poa);
-    // ctor taking a POA
-    PollableSet_tie (T *tp, CORBA::Boolean release=1);
-    // ctor taking pointer and an ownership flag
-    PollableSet_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release=1);
-    // ctor with T*, ownership flag and a POA
-    ~PollableSet_tie (void);
-    // dtor
-
-    // TIE specific functions
-    T *_tied_object (void);
-    // return the underlying object
-    void _tied_object (T &obj);
-    // set the underlying object
-    void _tied_object (T *obj, CORBA::Boolean release=1);
-    // set the underlying object and the ownership flag
-    CORBA::Boolean _is_owner (void);
-    // do we own it
-    void _is_owner (CORBA::Boolean b);
-    // set the ownership
-
-    // overridden ServantBase operations
-    PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &env =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::DIIPollable_ptr create_dii_pollable (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void add_pollable (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::Pollable_ptr poll (
-        CORBA::ULong timeout,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    void remove (
-        CORBA::Pollable_ptr potential,
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-    CORBA::UShort number_left (
-        CORBA::Environment &ACE_TRY_ENV =
-          CORBA::Environment::default_environment ()
-      );
-private:
-    T *ptr_;
-    PortableServer::POA_var poa_;
-    CORBA::Boolean rel_;
-
-    // copy and assignment are not allowed
-    PollableSet_tie (const PollableSet_tie &);
-    void operator= (const PollableSet_tie &);
-  };
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-};
-
-#include "PollableS_T.h"
-#endif /* 0 */
-
-#if defined (__ACE_INLINE__)
-#include "PollableS.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS.i b/TAO/tao/PollableS.i
deleted file mode 100644
index 4356126e508..00000000000
--- a/TAO/tao/PollableS.i
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-
-ACE_INLINE void POA_CORBA::DIIPollable::is_ready_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj;
-  POA_CORBA::Pollable::is_ready_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
-
-ACE_INLINE void POA_CORBA::DIIPollable::create_pollable_set_skel (
-    CORBA::ServerRequest &req,
-    void *obj,
-    void *context,
-    CORBA::Environment &env
-  )
-{
-  POA_CORBA::Pollable_ptr impl = (POA_CORBA::DIIPollable_ptr) obj;
-  POA_CORBA::Pollable::create_pollable_set_skel (
-      req,
-      (POA_CORBA::Pollable_ptr) impl,
-      context,
-       env
-    );
-}
diff --git a/TAO/tao/PollableS_T.cpp b/TAO/tao/PollableS_T.cpp
deleted file mode 100644
index b220702989c..00000000000
--- a/TAO/tao/PollableS_T.cpp
+++ /dev/null
@@ -1,25 +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_POLLABLES_T_CPP_
-#define _TAO_IDL_POLLABLES_T_CPP_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "PollableS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS_T.h b/TAO/tao/PollableS_T.h
deleted file mode 100644
index 6f5211ec1e9..00000000000
--- a/TAO/tao/PollableS_T.h
+++ /dev/null
@@ -1,37 +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_POLLABLES_T_H_
-#define _TAO_IDL_POLLABLES_T_H_
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "PollableS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "PollableS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("PollableS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* ifndef */
diff --git a/TAO/tao/PollableS_T.i b/TAO/tao/PollableS_T.i
deleted file mode 100644
index f215b832afd..00000000000
--- a/TAO/tao/PollableS_T.i
+++ /dev/null
@@ -1,371 +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
-
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::Pollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::Pollable_tie<T>::~Pollable_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::Pollable_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::Pollable_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::Pollable_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::Pollable_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::Pollable_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_CORBA::Pollable_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::DIIPollable_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::DIIPollable_tie<T>::~DIIPollable_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::DIIPollable_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::DIIPollable_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::DIIPollable_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::DIIPollable_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> ACE_INLINE
-CORBA::Boolean POA_CORBA::DIIPollable_tie<T>::is_ready  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->is_ready (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::PollableSet_ptr POA_CORBA::DIIPollable_tie<T>::create_pollable_set  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_pollable_set (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
-
-#if defined (ACE_HAS_USING_KEYWORD)
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::PollableSet_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
-{}
-
-template <class T> ACE_INLINE
-POA_CORBA::PollableSet_tie<T>::~PollableSet_tie (void)
-{
-  if (this->rel_) delete this->ptr_;
-}
-
-template <class T> ACE_INLINE T *
-POA_CORBA::PollableSet_tie<T>::_tied_object (void)
-{
-  return this->ptr_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_tied_object (T &obj)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = &obj;
-  this->rel_ = 0;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_tied_object (T *obj, CORBA::Boolean release)
-{
-  if (this->rel_) delete this->ptr_;
-  this->ptr_ = obj;
-  this->rel_ = release;
-}
-
-template <class T> ACE_INLINE CORBA::Boolean
-POA_CORBA::PollableSet_tie<T>::_is_owner (void)
-{
-  return this->rel_;
-}
-
-template <class T> ACE_INLINE void
-POA_CORBA::PollableSet_tie<T>::_is_owner (CORBA::Boolean b)
-{
-  this->rel_ = b;
-}
-
-template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA::PollableSet_tie<T>::_default_POA (CORBA::Environment &env)
-{
-  if (!CORBA::is_nil (this->poa_.in ()))
-    return PortableServer::POA::_duplicate (this->poa_.in ());
-  else
-  {
-    TAO_POA *poa = TAO_ORB_Core_instance ()->root_poa ();
-    PortableServer::POA_var result = poa->_this (env);
-    if (env.exception () != 0)
-      return PortableServer::POA::_nil ();
-    else
-      return result._retn ();
-  }
-}
-
-template <class T> ACE_INLINE
-CORBA::DIIPollable_ptr POA_CORBA::PollableSet_tie<T>::create_dii_pollable  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->create_dii_pollable (
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::PollableSet_tie<T>::add_pollable  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->add_pollable (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::Pollable_ptr POA_CORBA::PollableSet_tie<T>::poll  (
-    CORBA::ULong timeout,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->poll (
-    timeout,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-void POA_CORBA::PollableSet_tie<T>::remove  (
-    CORBA::Pollable_ptr potential,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  this->ptr_->remove (
-    potential,
-    ACE_TRY_ENV
-  );
-}
-
-template <class T> ACE_INLINE
-CORBA::UShort POA_CORBA::PollableSet_tie<T>::number_left  (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return this->ptr_->number_left (
-    ACE_TRY_ENV
-  );
-}
-
-#endif /* ACE_HAS_USING_KEYWORD */
diff --git a/TAO/tao/Principal.h b/TAO/tao/Principal.h
index 0a2c01dccf3..de97dd94163 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -48,11 +48,6 @@ public:
 
   CORBA_Principal (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Principal_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
 private:
   ~CORBA_Principal (void);
 
diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp
index 4a76a26c868..ef78cd7e8ba 100644
--- a/TAO/tao/Request.cpp
+++ b/TAO/tao/Request.cpp
@@ -1,9 +1,6 @@
 // $Id$
 
 #include "tao/Request.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 #include "tao/Object.h"
 #include "tao/Stub.h"
 
@@ -13,13 +10,6 @@
 
 ACE_RCSID(tao, Request, "$Id$")
 
-void
-CORBA::release (CORBA::Request_ptr req)
-{
-  if (req)
-    req->_decr_refcnt ();
-}
-
 CORBA::ULong
 CORBA_Request::_incr_refcnt (void)
 {
@@ -41,12 +31,6 @@ CORBA_Request::_decr_refcnt (void)
   return 0;
 }
 
-CORBA_Request*
-CORBA_Request::_nil (void)
-{
-  return 0;
-}
-
 // Reference counting for DII Request object
 
 // DII Request class implementation
@@ -55,31 +39,23 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
                               const CORBA::Char *op,
                               CORBA::NVList_ptr args,
                               CORBA::NamedValue_ptr result,
-                              CORBA::Flags flags,
-                              CORBA::Environment &TAO_IN_ENV)
+                              CORBA::Flags flags)
   : args_ (args),
     result_ (result),
     flags_ (flags),
-    env_ (TAO_IN_ENV),
-    contexts_ (0),
-    ctx_ (0),
     refcount_ (1)
 {
   target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_dup (op);
+  opname_ = CORBA::string_copy (op);
 }
 
 CORBA_Request::CORBA_Request (CORBA::Object_ptr obj,
-                              const CORBA::Char *op,
-                              CORBA::Environment &TAO_IN_ENV)
+                              const CORBA::Char *op)
   : flags_ (0),
-    env_ (TAO_IN_ENV),
-    contexts_ (0),
-    ctx_ (0),
     refcount_ (1)
 {
   target_ = CORBA::Object::_duplicate (obj);
-  opname_ = CORBA::string_dup (op);
+  opname_ = CORBA::string_copy (op);
 
   ACE_NEW (args_, CORBA::NVList);
   ACE_NEW (result_, CORBA::NamedValue);
@@ -104,9 +80,9 @@ CORBA_Request::~CORBA_Request (void)
 // flow in some exotic situations.
 
 void
-CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::invoke (void)
 {
-  TAO_Stub *stub = this->target_->_stubobj ();
+  STUB_Object *stub = this->target_->_stubobj ();
 
   stub->do_dynamic_call ((char *) opname_,
                          1,
@@ -114,13 +90,13 @@ CORBA_Request::invoke (CORBA::Environment &ACE_TRY_ENV)
                          result_,
                          flags_,
                          exceptions_,
-                         ACE_TRY_ENV);
+                         env_);
 }
 
 void
-CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
+CORBA_Request::send_oneway (void)
 {
-  TAO_Stub *stub = this->target_->_stubobj ();
+  STUB_Object *stub = this->target_->_stubobj ();
 
   stub->do_dynamic_call ((char *) opname_,
                          0,
@@ -128,281 +104,5 @@ CORBA_Request::send_oneway (CORBA::Environment &ACE_TRY_ENV)
                          result_,
                          flags_,
                          exceptions_,
-                         ACE_TRY_ENV);
-}
-
-void
-CORBA_Request::send_deferred (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-void
-CORBA_Request::get_response (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                  CORBA::COMPLETED_NO));
-}
-
-CORBA::Boolean
-CORBA_Request::poll_response (CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
-}
-
-
-//  constructor.
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (max)
-{
-  // no-op
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (rhs)
-{
-  // no-op
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong max,
-                                            CORBA::ULong length,
-                                            CORBA_Request **data,
-                                            CORBA::Boolean release)
-  : TAO_Unbounded_Pseudo_Sequence <CORBA_Request> (max,
-                                                   length,
-                                                   data,
-                                                   release)
-{
-  // no-op
-}
-
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (void)
-{
-  // no-op
-}
-
-/*
-// Constructor using a maximum length value.
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong maximum)
-  : TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))
-{
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                                            CORBA::ULong length,
-                                            CORBA::Request_ptr *data,
-                                            CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-{
-}
-
-CORBA_ORB_RequestSeq::CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs)
-  : TAO_Unbounded_Base_Sequence (rhs)
-{
-  CORBA::Request_ptr *tmp1 = allocbuf (this->maximum_);
-  CORBA::Request_ptr * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  this->buffer_ = tmp1;
-}
-
-CORBA_ORB_RequestSeq &
-CORBA_ORB_RequestSeq::operator= (const CORBA_ORB_RequestSeq &rhs)
-{
-  if (this == &rhs)
-    return *this;
-
-  if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-        {
-          // free the old buffer
-          CORBA::Request_ptr *tmp =
-            ACE_reinterpret_cast (CORBA::Request_ptr *,
-                                  this->buffer_);
-          freebuf (tmp);
-          this->buffer_ = allocbuf (rhs.maximum_);
-        }
-    }
-  else
-    this->buffer_ = allocbuf (rhs.maximum_);
-
-  TAO_Unbounded_Base_Sequence::operator= (rhs);
-
-  CORBA::Request_ptr *tmp1 =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-  CORBA::Request_ptr * const tmp2 =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          rhs.buffer_);
-
-  for (CORBA::ULong i = 0; i < this->length_; ++i)
-    tmp1[i] = tmp2[i];
-
-  return *this;
-}
-
-CORBA_ORB_RequestSeq::~CORBA_ORB_RequestSeq (void)
-{
-  this->_deallocate_buffer ();
-}
-
-CORBA::Request_ptr
-CORBA_ORB_RequestSeq::operator[] (CORBA::ULong i)
-{
-  if (i >= this->maximum_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) CORBA_ORB_RequestSeq %p\n",
-                       "operator[] - subscript out of range"),
-                      0);
-
-  CORBA::Request_ptr *tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-  return tmp[i];
-}
-
-const CORBA::Request*
-CORBA_ORB_RequestSeq::operator[] (CORBA::ULong i) const
-{
-  if (i >= this->maximum_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) CORBA_ORB_RequestSeq %p\n",
-                       "operator[] - subscript out of range"),
-                      0);
-
-  CORBA::Request_ptr * const tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr * ACE_CAST_CONST,
-                          this->buffer_);
-
-  return tmp[i];
-}
-
-CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::allocbuf (CORBA::ULong size)
-{
-  return new CORBA::Request_ptr[size];
-}
-
-void
-CORBA_ORB_RequestSeq::freebuf (CORBA::Request_ptr *buffer)
-{
-  delete [] buffer;
-}
-
-void
-CORBA_ORB_RequestSeq::_allocate_buffer (CORBA::ULong length)
-{
-  CORBA::Request_ptr * tmp = allocbuf (length);
-
-  if (this->buffer_ != 0)
-    {
-      CORBA::Request_ptr *old =
-        ACE_reinterpret_cast (CORBA::Request_ptr *,
-                              this->buffer_);
-
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-
-      if (this->release_)
-        freebuf (old);
-    }
-
-  this->buffer_ = tmp;
-}
-
-void
-CORBA_ORB_RequestSeq::_deallocate_buffer (void)
-{
-  if (this->buffer_ == 0 || this->release_ == 0)
-    return;
-
-  CORBA::Request_ptr *tmp =
-    ACE_reinterpret_cast (CORBA::Request_ptr *,
-                          this->buffer_);
-
-  freebuf (tmp);
-
-  this->buffer_ = 0;
-}
-
-CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::get_buffer (CORBA::Boolean orphan)
-{
-  CORBA::Request_ptr *result = 0;
-
-  if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-        {
-          result = allocbuf (this->length_);
-          this->buffer_ = result;
-        }
-      else
-        {
-          result = ACE_reinterpret_cast (CORBA::Request_ptr *,
-                                         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::Request_ptr *,
-                                        this->buffer_);
-          this->maximum_ = 0;
-          this->length_ = 0;
-          this->buffer_ = 0;
-          this->release_ = 0;
-        }
-    }
-  return result;
+                         env_);
 }
-
-const CORBA::Request_ptr *
-CORBA_ORB_RequestSeq::get_buffer (void) const
-{
-  return ACE_reinterpret_cast (const CORBA::Request_ptr * ACE_CAST_CONST,
-                               this->buffer_);
-}
-
-void
-CORBA_ORB_RequestSeq::replace (CORBA::ULong max,
-                               CORBA::ULong length,
-                               CORBA::Request_ptr *data,
-                               CORBA::Boolean release)
-{
-  this->maximum_ = max;
-  this->length_ = length;
-
-  if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::Request_ptr *tmp =
-        ACE_reinterpret_cast(CORBA::Request_ptr *,
-                             this->buffer_);
-      freebuf (tmp);
-    }
-
-  this->buffer_ = data;
-  this->release_ = release;
-}
-*/
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Pseudo_Sequence<CORBA_Request>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA_Request>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index 309069f30c4..e525d92ed09 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -15,23 +15,15 @@
 //
 // = AUTHOR
 //     Copyright 1994-1995 by Sun Microsystems, Inc.
-//     Additions and RequestSeq by Jeff Parsons <parsons@cs.wustl.edu>
 //
 // ============================================================================
 
 #ifndef TAO_REQUEST_H
-#define TAO_REQUEST_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
+#define TAO_REQUEST_ H
 
 #include "tao/corbafwd.h"
 #include "tao/NVList.h"
 #include "tao/Environment.h"
-#include "tao/Context.h"
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.h"
 
 class TAO_Export CORBA_Request
 {
@@ -58,17 +50,7 @@ public:
   CORBA::ExceptionList_ptr exceptions (void);
   // Return the exceptions resulting from this request.
 
-  CORBA::Context_ptr ctx (void) const;
-  // Accessor for the Context member.
-
-  void ctx (CORBA::Context_ptr);
-  // Mutator for the Context member.
-
-  CORBA::ContextList_ptr contexts (void);
-  // Return a list of the request's result's contexts. Since
-  // TAO does not implement Contexts, this will always be 0.
-
-  CORBA::Environment_ptr env (void);
+  CORBA_Environment *env (void);
   // Return the <Environment> for this request.
 
   // Argument manipulation helper functions.
@@ -87,30 +69,15 @@ public:
   // Returns reference to Any for extraction using >>=.
   CORBA_Any &return_value (void);
 
-  void invoke (CORBA::Environment &ACE_TRY_ENV =
-                 CORBA::Environment::default_environment ());
+  void invoke (void);
   // Perform method resolution and invoke an appropriate method. If
   // the method returns successfully, its result is placed in the
   // result argument specified on <create_request>. The behavior is
   // undefined if this <Request> has already been used with a previous
   // call to <invoke>, <send>, or <send_multiple_requests>.
 
-  // A default argument is set, but please note that this not recommended
-  // as the user may not be able to propagate the exceptions
-
-  void send_oneway (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
+  void send_oneway (void);
   // Send a oneway request.
-  // A default argument is set, but please note that this not recommended
-  // as the user may not be able to propagate the exceptions.
-
-  // NOT IMPLEMENTED - these next 3 will just throw CORBA::NO_IMPLEMENT.
-  void send_deferred (CORBA::Environment &ACE_TRY_ENV =
-                        CORBA::Environment::default_environment ());
-  void get_response (CORBA::Environment &ACE_TRY_ENV =
-                      CORBA::Environment::default_environment ());
-  CORBA::Boolean poll_response (CORBA::Environment &ACE_TRY_ENV =
-                                  CORBA::Environment::default_environment ());
 
   // Pseudo object methods
   static CORBA_Request* _duplicate (CORBA_Request*);
@@ -120,12 +87,6 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_Request_ptr _ptr_type;
-  typedef CORBA_Request_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
 private:
   friend class CORBA_Object;
 
@@ -135,14 +96,10 @@ private:
                  const CORBA::Char *op,
                  CORBA::NVList_ptr args,
                  CORBA::NamedValue_ptr result,
-                 CORBA::Flags flags,
-                 CORBA::Environment &TAO_IN_ENV =
-                   CORBA::default_environment ());
+                 CORBA::Flags flags);
 
   CORBA_Request (CORBA::Object_ptr obj,
-                 const CORBA::Char *op,
-                 CORBA::Environment &TAO_IN_ENV =
-                   CORBA::default_environment ());
+                 const CORBA::Char *op);
 
   ~CORBA_Request (void);
 
@@ -161,18 +118,12 @@ private:
   CORBA::Flags flags_;
   // invocation flags
 
-  CORBA::Environment env_;
+  CORBA_Environment env_;
   // holds exceptions
 
   CORBA::ExceptionList exceptions_;
   // list of exceptions raised by the operation
 
-  CORBA::ContextList_ptr contexts_;
-  // List of the request's result's contexts.
-
-  CORBA::Context_ptr ctx_;
-  // Context associated with this request.
-
   CORBA::ULong refcount_;
   // reference counting
 
@@ -248,148 +199,8 @@ private:
   CORBA_Request_ptr &ptr_;
 };
 
-// Make sure you instantiate this in Request.cpp
-class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request>
-{
-public:
-// Helpful with template programming.
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_ORB_RequestSeq_ptr _ptr_type;
-  typedef CORBA_ORB_RequestSeq_var _var_type;
-#endif /* __GNUC__ */
-
-  // Implement the same constructors provided by the template here,
-  // check Sequence_T.h for ideas.
-  // Simply delegate on the template for the implementation...
-  
-  CORBA_ORB_RequestSeq (void);
-  // default ctor
-
-  CORBA_ORB_RequestSeq (CORBA::ULong max);
-  // Constructor with a "hint" for the maximum capacity.
-
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                        CORBA::ULong length,
-                        CORBA_Request* * data,
-                        CORBA::Boolean release=0);
-  // Constructor with a given buffer.
-
-  CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &);
-  // Copy ctor, deep copies.
-
-  //~CORBA_ORB_RequestSeq (void);
-  // dtor releases all the contained elements.
-};
-
-// This class definition should be removed.. But need to 
-// check with all the compiler guys before we have this removed
-
-/*class CORBA_ORB_RequestSeq : public TAO_Unbounded_Base_Sequence
-{
-public:
-
-  
-  // Default constructor.
-  CORBA_ORB_RequestSeq (void);
-
-  // Constructor using a maximum length value.
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum);
-
-  // Constructor with all the sequence parameters.
-  CORBA_ORB_RequestSeq (CORBA::ULong maximum,
-                        CORBA::ULong length,
-                        CORBA::Request_ptr *data,
-                        CORBA::Boolean release = 0);
-
-  // Copy constructor.
-  CORBA_ORB_RequestSeq (const CORBA_ORB_RequestSeq &rhs);
-
-  // Assignment operator.
-  CORBA_ORB_RequestSeq &operator= (const CORBA_ORB_RequestSeq &rhs);
-
-  // Dtor.
-  ~CORBA_ORB_RequestSeq (void);
-
-  // = Accessors.
-  CORBA::Request_ptr operator[] (CORBA::ULong i);
-
-  const CORBA::Request* operator[] (CORBA::ULong i) const;
-
-  // = Static operations.
-
-  // Allocate storage for the sequence.
-  static CORBA::Request_ptr *allocbuf (CORBA::ULong size);
-
-  // Free the sequence.
-  static void freebuf (CORBA::Request_ptr *buffer);
-
-  virtual void _allocate_buffer (CORBA::ULong length);
-
-  virtual void _deallocate_buffer (void);
-
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-
-  CORBA::Request_ptr *get_buffer (CORBA::Boolean orphan = 0);
-
-  const CORBA::Request_ptr *get_buffer (void) const;
-
-  void replace (CORBA::ULong max,
-                CORBA::ULong length,
-                CORBA::Request_ptr *data,
-                CORBA::Boolean release);
-};
-*/
-class CORBA_ORB_RequestSeq_var
-{
-public:
-  CORBA_ORB_RequestSeq_var (void); // default constructor
-  CORBA_ORB_RequestSeq_var (CORBA_ORB_RequestSeq *);
-  CORBA_ORB_RequestSeq_var (const CORBA_ORB_RequestSeq_var &); // copy constructor
-  ~CORBA_ORB_RequestSeq_var (void); // destructor
-
-  CORBA_ORB_RequestSeq_var &operator= (CORBA_ORB_RequestSeq *);
-  CORBA_ORB_RequestSeq_var &operator= (const CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  const CORBA_ORB_RequestSeq *operator-> (void) const;
-
-  operator const CORBA_ORB_RequestSeq &() const;
-  operator CORBA_ORB_RequestSeq &();
-  operator CORBA_ORB_RequestSeq &() const;
-  CORBA::Octet &operator[] (CORBA::ULong index);
-  // in, inout, out, _retn
-  const CORBA_ORB_RequestSeq &in (void) const;
-  CORBA_ORB_RequestSeq &inout (void);
-  CORBA_ORB_RequestSeq *&out (void);
-  CORBA_ORB_RequestSeq *_retn (void);
-  CORBA_ORB_RequestSeq *ptr (void) const;
-
-private:
-  CORBA_ORB_RequestSeq *ptr_;
-};
-
-class CORBA_ORB_RequestSeq_out
-{
-public:
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq *&);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_var &);
-  CORBA_ORB_RequestSeq_out (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq_out &);
-  CORBA_ORB_RequestSeq_out &operator= (CORBA_ORB_RequestSeq *);
-  operator CORBA_ORB_RequestSeq *&();
-  CORBA_ORB_RequestSeq *&ptr (void);
-  CORBA_ORB_RequestSeq *operator-> (void);
-  CORBA::Octet &operator[] (CORBA::ULong index);
-
-private:
-  CORBA_ORB_RequestSeq *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ORB_RequestSeq_var &);
-};
-
 #if defined (__ACE_INLINE__)
 # include "tao/Request.i"
 #endif /* __ACE_INLINE__ */
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #endif /* TAO_REQUEST_H */
diff --git a/TAO/tao/Request.i b/TAO/tao/Request.i
index 6b3d8e56b87..02d0cb587b9 100644
--- a/TAO/tao/Request.i
+++ b/TAO/tao/Request.i
@@ -4,6 +4,12 @@
 
 // Return the target of this request.
 
+ACE_INLINE void
+CORBA::release (CORBA::Request_ptr req)
+{
+  if (req)
+    req->_decr_refcnt ();
+}
 
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::Request_ptr req)
@@ -19,53 +25,51 @@ CORBA_Request::_duplicate (CORBA_Request* x)
   return x;
 }
 
+ACE_INLINE CORBA_Request*
+CORBA_Request::_nil (void)
+{
+  return 0;
+}
 
 ACE_INLINE CORBA::Object_ptr 
 CORBA_Request::target (void) const 
 { 
-  return this->target_; 
+  return target_; 
 }
 
 // Return the operation name for the request.
 ACE_INLINE const CORBA::Char *
 CORBA_Request::operation (void) const 
 {
-  return this->opname_; 
+  return opname_; 
 }
 
 // Return the arguments for the request.
 ACE_INLINE CORBA::NVList_ptr 
 CORBA_Request::arguments (void) 
 { 
-  return this->args_; 
+  return args_; 
 }
 
 // Return the result for the request.
 ACE_INLINE CORBA::NamedValue_ptr 
 CORBA_Request::result (void) 
 {
-  return this->result_; 
+  return result_; 
 }
 
 // Return the exceptions resulting from this request.
 ACE_INLINE CORBA::ExceptionList_ptr 
 CORBA_Request::exceptions (void) 
 { 
-  return &this->exceptions_; 
-}
-
-// Return the request's contexts
-ACE_INLINE CORBA::ContextList_ptr
-CORBA_Request::contexts (void)
-{
-  return this->contexts_;
+  return &exceptions_; 
 }
 
 // Return the <Environment> for this request.
 ACE_INLINE CORBA::Environment *
 CORBA_Request::env (void) 
 {
-  return &this->env_; 
+  return &env_; 
 }
 
 // The argument manipulation helper functions
@@ -73,43 +77,37 @@ CORBA_Request::env (void)
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_IN, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_IN, this->env_)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_in_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_IN, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_IN, this->env_)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_INOUT, this->env_)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_inout_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_INOUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_INOUT, this->env_)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_element (CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_element (CORBA::ARG_OUT, this->env_)->any_;
 }
 
 ACE_INLINE CORBA_Any &
 CORBA_Request::add_out_arg (const CORBA::Char *name)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  return this->args_->add_item (name, CORBA::ARG_OUT, ACE_TRY_ENV)->any_;
+  return this->args_->add_item (name, CORBA::ARG_OUT, this->env_)->any_;
 }
 
 ACE_INLINE void
@@ -125,20 +123,8 @@ CORBA_Request::return_value (void )
   return this->result_->any_;
 }
 
-ACE_INLINE CORBA::Context_ptr
-CORBA_Request::ctx (void) const
-{
-  return this->ctx_;
-}
-
-ACE_INLINE void
-CORBA_Request::ctx (CORBA::Context_ptr ctx)
-{
-  ACE_UNUSED_ARG (ctx);
-}
-
 // *************************************************************
-// Inline operations for class CORBA_Request_var
+// Inline operations for class CORBA_NVList_var
 // *************************************************************
 
 ACE_INLINE
@@ -297,5 +283,3 @@ CORBA_Request_out::operator-> (void)
 {
   return this->ptr_;
 }
-
-
diff --git a/TAO/tao/Resource_Factory.cpp b/TAO/tao/Resource_Factory.cpp
deleted file mode 100644
index 6aaf7d48aeb..00000000000
--- a/TAO/tao/Resource_Factory.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// $Id$
-
-#include "tao/Resource_Factory.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(tao, Resource_Factory, "$Id$")
-
-TAO_Resource_Factory::TAO_Resource_Factory (void)
-{
-}
-
-TAO_Resource_Factory::~TAO_Resource_Factory (void)
-{
-}
-
-ACE_Reactor *
-TAO_Resource_Factory::get_reactor (void)
-{
-  return 0;
-}
-
-ACE_Thread_Manager *
-TAO_Resource_Factory::get_thr_mgr (void)
-{
-  return 0;
-}
-
-TAO_Connector *
-TAO_Resource_Factory::get_connector (void)
-{
-  return 0;
-}
-
-TAO_Connector_Registry *
-TAO_Resource_Factory::get_connector_registry (void)
-{
-  return 0;
-}
-
-TAO_CACHED_CONNECT_STRATEGY *
-TAO_Resource_Factory::get_cached_connect_strategy (void)
-{
-  return 0;
-}
-
-TAO_NULL_CREATION_STRATEGY *
-TAO_Resource_Factory::get_null_creation_strategy (void)
-{
-  return 0;
-}
-
-TAO_NULL_ACTIVATION_STRATEGY *
-TAO_Resource_Factory::get_null_activation_strategy (void)
-{
-  return 0;
-}
-
-TAO_Acceptor *
-TAO_Resource_Factory::get_acceptor (void)
-{
-  return 0;
-}
-
-TAO_POA *
-TAO_Resource_Factory::get_root_poa (void)
-{
-  return 0;
-}
-
-TAO_Object_Adapter *
-TAO_Resource_Factory::object_adapter (void)
-{
-  return 0;
-}
-
-TAO_GLOBAL_Collocation_Table *
-TAO_Resource_Factory::get_global_collocation_table (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  return 0;
-}
-
-ACE_Data_Block *
-TAO_Resource_Factory::create_input_cdr_data_block (size_t size)
-{
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Resource_Factory>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Resource_Factory>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
deleted file mode 100644
index 005af671c1d..00000000000
--- a/TAO/tao/Resource_Factory.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   Resource_Factory.h
-//
-// = AUTHOR
-//   Chris Cleeland
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_RESOURCE_FACTORY_H
-#define TAO_RESOURCE_FACTORY_H
-
-#include "ace/Service_Object.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Hash_Map_Manager.h"
-#include "tao/IIOP_Connector.h"
-#include "tao/corbafwd.h"
-
-class TAO_Client_Connection_Handler;
-class TAO_POA;
-class TAO_Object_Adapter;
-
-// ****************************************************************
-
-class TAO_Cached_Connector_Lock : public ACE_Adaptive_Lock
-{
-  // TITLE
-  //   This lock class determines the type underlying lock
-  //   when it gets constructed.
-public:
-  TAO_Cached_Connector_Lock (void);
-  ~TAO_Cached_Connector_Lock (void);
-};
-
-typedef ACE_Cached_Connect_Strategy<TAO_Client_Connection_Handler,
-                                    TAO_SOCK_CONNECTOR,
-                                    TAO_Cached_Connector_Lock>
-        TAO_CACHED_CONNECT_STRATEGY;
-
-// ****************************************************************
-
-class TAO_Collocation_Table_Lock : public ACE_Adaptive_Lock
-{
-  // TITLE
-  //   This lock class determines the type underlying lock
-  //   when it gets constructed.
-public:
-  TAO_Collocation_Table_Lock (void);
-  ~TAO_Collocation_Table_Lock (void);
-};
-
-typedef ACE_Hash_Map_Manager<ACE_INET_Addr, TAO_Object_Adapter *, TAO_Collocation_Table_Lock> TAO_GLOBAL_Collocation_Table;
-
-// ****************************************************************
-
-typedef ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
-
-typedef ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
-
-// ****************************************************************
-
-class TAO_Export TAO_Resource_Factory : public ACE_Service_Object
-{
-  // = TITLE
-  //   Factory which manufacturers resources for use by the ORB Core.
-  //
-  // = DESCRIPTION
-  //   This class is a factory/repository for critical ORB Core
-  //   resources.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_Resource_Factory (void);
-  virtual ~TAO_Resource_Factory (void);
-
-  // = Resource Retrieval
-
-  virtual ACE_Reactor *get_reactor (void);
-  // Return an <ACE_Reactor> to be utilized.
-
-  virtual ACE_Thread_Manager *get_thr_mgr (void);
-  // Return an <ACE_Thread_Manager> to be utilized.
-
-  virtual TAO_Connector *get_connector (void);
-  // Return an Connector to be utilized.
-
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-  // Return an Connector to be utilized.
-
-  virtual TAO_CACHED_CONNECT_STRATEGY *get_cached_connect_strategy (void);
-  // Return an Cached Connect Strategy to be utilized.
-
-  virtual TAO_NULL_CREATION_STRATEGY *get_null_creation_strategy (void);
-  // This no-op creation strategy is necessary for using the
-  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
-
-  virtual TAO_NULL_ACTIVATION_STRATEGY *get_null_activation_strategy (void);
-  // This no-op activation strategy prevents the cached connector from
-  // calling the service handler's <open> method multiple times.
-
-  virtual TAO_Acceptor *get_acceptor (void);
-  // Return an Acceptor to be utilized.
-
-  virtual TAO_POA *get_root_poa (void);
-  // Return a root poa to be utilized.
-
-  virtual TAO_Object_Adapter *object_adapter (void);
-  // Return a object adapter to be utilized.
-
-  virtual TAO_GLOBAL_Collocation_Table *get_global_collocation_table (void);
-  // Get the global collocation table.  Return the pointer to the
-  // global collocation table if we are using one, otherwise, return
-  // 0.
-
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  // Access the input CDR allocators.
-
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  // Access the output CDR allocators.
-
-  virtual ACE_Data_Block *create_input_cdr_data_block (size_t size);
-  // The Message Blocks used for input CDRs must have appropiate
-  // locking strategies.
-};
-
-#endif /* TAO_RESOURCE_FACTORY_H */
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 779beb4e3ce..cf604958be2 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -400,28 +400,3 @@ void TAO_Unbounded_Sequence<CORBA::Octet>::_deallocate_buffer (void)
 }
 
 #endif /* defined (TAO_NO_COPY_OCTET_SEQUENCES) */
-
-////////////////////////////////////////////////////////////////////////////////
-
-int
-operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-{
-  if (rhs.length () != lhs.length ())
-    return 0;
-
-  for (CORBA::ULong i = 0;
-       i < rhs.length ();
-       ++i)
-    if (rhs[i] != lhs[i])
-      return 0;
-
-  return 1;
-}
-
-int
-operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &lhs,
-            const TAO_Unbounded_Sequence<CORBA::Octet> &rhs)
-{
-  return !(lhs == rhs);
-}
diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h
index 747e4373283..f34a837e90f 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -85,23 +85,17 @@ protected:
                      void *buffer);
   // Assume ownership and set length to 0.
 
-  // = orbos/98-01-11 proposed extensions.
-  CORBA::Boolean release (void) const;
-  // Returns the state of the sequence release flag.
-
-public:
-
-  // = The following two functions should be protected but we made it
-  // public because it breaks some compilers.
-
   TAO_Base_Sequence (const TAO_Base_Sequence &rhs);
   TAO_Base_Sequence &operator= (const TAO_Base_Sequence &rhs);
   // Copy constructor and assignment operator are protected, the
   // derived classes must provided the right semantics for the buffer
   // copy, only the static fields are actually copy.
 
-protected:
+  // = orbos/98-01-11 proposed extensions.
+  CORBA::Boolean release (void) const;
+  // Returns the state of the sequence release flag.
 
+protected:
   CORBA::ULong maximum_;
   // The maximum number of elements the buffer can contain.
 
@@ -314,9 +308,9 @@ public:
   // reference elements, which are freed using release(). The freebuf
   // function will ignore null pointers passed to it.
 
-  // = Fast buffer accessors.
-  char **get_buffer (CORBA::Boolean orphan = 0);
-  const char **get_buffer (void) const;
+  // = orbos/98-01-11 proposed extensions.
+  char* *get_buffer (CORBA::Boolean orphan = 0);
+  const char* *get_buffer (void) const;
 
   virtual void _allocate_buffer (CORBA::ULong length);
   virtual void _deallocate_buffer (void);
@@ -387,10 +381,9 @@ public:
   // Implement the methods for all the sequence, please seee
   // TAO_Base_Sequence.
 
-  // = Fast buffer accessors.
+  // = orbos/98-01-11 proposed extensions.
   CORBA::Octet *get_buffer (CORBA::Boolean orphan = 0);
   const CORBA::Octet *get_buffer (void) const;
-
   // NOTE: This last two methods can be rendered useless in certain
   // cases, see below.
   void replace (CORBA::ULong max,
@@ -432,12 +425,7 @@ private:
 
 // ****************************************************************
 
-// Comparison of octet sequence.
-extern TAO_Export int operator== (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                                  const TAO_Unbounded_Sequence<CORBA::Octet> &r);
 
-extern TAO_Export int operator!= (const TAO_Unbounded_Sequence<CORBA::Octet> &l,
-                                  const TAO_Unbounded_Sequence<CORBA::Octet> &r);
 
 // ****************************************************************
 
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index fe30d6dc81d..a8686a9e3d5 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -64,7 +64,7 @@ TAO_Unbounded_Sequence<T>::~TAO_Unbounded_Sequence (void)
   this->_deallocate_buffer ();
 }
 
-template<class T> void
+template<class T> void 
 TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
   T* tmp = TAO_Unbounded_Sequence<T>::allocbuf (length);
@@ -169,7 +169,7 @@ TAO_Bounded_Sequence<T, MAX>::~TAO_Bounded_Sequence (void)
   this->_deallocate_buffer ();
 }
 
-template<class T, CORBA::ULong MAX> void
+template<class T, CORBA::ULong MAX> void 
 TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
 {
   // For this class memory is never reallocated so the implementation
@@ -177,7 +177,7 @@ TAO_Bounded_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong)
   this->buffer_ = TAO_Bounded_Sequence<T, MAX>::allocbuf (MAX);
 }
 
-template<class T, CORBA::ULong MAX> void
+template<class T, CORBA::ULong MAX> void 
 TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -335,7 +335,7 @@ TAO_Unbounded_Object_Sequence<T>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T> void
+template<class T> void 
 TAO_Unbounded_Object_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
   T **tmp = TAO_Unbounded_Object_Sequence<T>::allocbuf (length);
@@ -360,7 +360,7 @@ TAO_Unbounded_Object_Sequence<T>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T> void
+template<class T> void 
 TAO_Unbounded_Object_Sequence<T>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -501,7 +501,7 @@ TAO_Bounded_Object_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong length)
     TAO_Bounded_Object_Sequence<T, MAX>::allocbuf (length);
 }
 
-template<class T, CORBA::ULong MAX> void
+template<class T, CORBA::ULong MAX> void 
 TAO_Bounded_Object_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -649,7 +649,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::freebuf (T **buffer)
   delete[] buffer;
 }
 
-template<class T> void
+template<class T> void 
 TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 {
   T **tmp = TAO_Unbounded_Pseudo_Sequence<T>::allocbuf (length);
@@ -674,7 +674,7 @@ TAO_Unbounded_Pseudo_Sequence<T>::_allocate_buffer (CORBA::ULong length)
   this->buffer_ = tmp;
 }
 
-template<class T> void
+template<class T> void 
 TAO_Unbounded_Pseudo_Sequence<T>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -797,7 +797,7 @@ TAO_Bounded_Pseudo_Sequence<T, MAX>::_allocate_buffer (CORBA::ULong length)
     TAO_Bounded_Pseudo_Sequence<T, MAX>::allocbuf (length);
 }
 
-template<class T, CORBA::ULong MAX> void
+template<class T, CORBA::ULong MAX> void 
 TAO_Bounded_Pseudo_Sequence<T, MAX>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
@@ -932,7 +932,7 @@ TAO_Bounded_String_Sequence<MAX>::_allocate_buffer (CORBA::ULong length)
     TAO_Bounded_String_Sequence<MAX>::allocbuf (MAX);
 }
 
-template<CORBA::ULong MAX> void
+template<CORBA::ULong MAX> void 
 TAO_Bounded_String_Sequence<MAX>::_deallocate_buffer (void)
 {
   if (this->buffer_ == 0 || this->release_ == 0)
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index e2200ad344a..d2e9e758de7 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -281,16 +281,13 @@ public:
   TAO_Object_Manager<T> &operator= (T *);
   // Assignment from T *.
 
-  T * operator-> (void) const;
-  // Return pointer.
-
   operator const T *() const;
   // Cast (read-only).
 
   operator T *&();
   // Cast.
 
-  T *in (void) const;
+  const T *in (void) const;
   // for in parameter.
 
   T *&inout (void);
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 35c7c972afe..128c705df70 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -129,6 +129,7 @@ TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (CORBA::ULong length,
                                                     CORBA::Boolean release)
   : TAO_Bounded_Base_Sequence (MAX, length, data, release)
 {
+  this->_allocate_buffer (MAX);
 }
 
 template <class T, CORBA::ULong MAX> ACE_INLINE T *
@@ -215,7 +216,7 @@ TAO_Object_Manager<T>::~TAO_Object_Manager (void)
 }
 
 template <class T> ACE_INLINE
-TAO_Object_Manager<T>::TAO_Object_Manager (const TAO_Object_Manager<T> &rhs)
+TAO_Object_Manager<T>::TAO_Object_Manager (const TAO_Object_Manager &rhs)
   : ptr_ (rhs.ptr_),
     release_ (rhs.release_)
 {
@@ -228,12 +229,6 @@ TAO_Object_Manager<T>::TAO_Object_Manager(T** buffer, CORBA::Boolean release)
 {
 }
 
-template <class T> ACE_INLINE T *
-TAO_Object_Manager<T>::operator-> (void) const
-{
-  return *this->ptr_;
-}
-
 template <class T> ACE_INLINE
 TAO_Object_Manager<T>::operator const T* () const // cast
 {
@@ -246,7 +241,7 @@ TAO_Object_Manager<T>::operator T* &() // cast
   return *this->ptr_;
 }
 
-template <class T> ACE_INLINE T *
+template <class T> ACE_INLINE const T *
 TAO_Object_Manager<T>::in (void) const
 {
   return *this->ptr_;
diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp
index 8c6633a173f..efbd9759231 100644
--- a/TAO/tao/Servant_Base.cpp
+++ b/TAO/tao/Servant_Base.cpp
@@ -4,7 +4,6 @@
 #include "tao/Timeprobe.h"
 #include "tao/Operation_Table.h"
 #include "tao/ORB_Core.h"
-#include "tao/POA.h"
 #include "tao/Stub.h"
 #include "tao/Environment.h"
 #include "tao/Server_Request.h"
@@ -36,23 +35,17 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description,
 #endif /* ACE_ENABLE_TIMEPROBES */
 
 TAO_ServantBase::TAO_ServantBase (void)
-  : optable_ (0),
-    single_threaded_poa_lock_ (0),
-    single_threaded_poa_lock_count_ (0)
+  :  optable_ (0)
 {
 }
 
-TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs)
-  : optable_ (rhs.optable_),
-    single_threaded_poa_lock_ (0),
-    single_threaded_poa_lock_count_ (0)
+TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &)
 {
 }
 
 TAO_ServantBase &
-TAO_ServantBase::operator= (const TAO_ServantBase &rhs)
+TAO_ServantBase::operator= (const TAO_ServantBase &)
 {
-  this->optable_ = rhs.optable_;
   return *this;
 }
 
@@ -66,16 +59,6 @@ TAO_ServantBase::_default_POA (CORBA::Environment &env)
   return TAO_ORB_Core_instance ()->root_poa_reference (env);
 }
 
-void
-TAO_ServantBase::_add_ref (CORBA::Environment &)
-{
-}
-
-void
-TAO_ServantBase::_remove_ref (CORBA::Environment &)
-{
-}
-
 CORBA::Boolean
 TAO_ServantBase::_is_a (const char* logical_type_id,
 			CORBA::Environment &env)
@@ -87,19 +70,12 @@ TAO_ServantBase::_is_a (const char* logical_type_id,
   return 0;
 }
 
-CORBA::Boolean
-TAO_ServantBase::_non_existent (CORBA::Environment &)
-{
-  return 0;
-}
-
 int
 TAO_ServantBase::_find (const char *opname,
-                        TAO_Skeleton& skelfunc,
-                        const unsigned int length)
+                        TAO_Skeleton& skelfunc)
 {
   ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_BASE_FIND_START);
-  return optable_->find (opname, skelfunc, length);
+  return optable_->find (opname, skelfunc);
 }
 
 int
@@ -109,20 +85,20 @@ TAO_ServantBase::_bind (const char *opname,
   return optable_->bind (opname, skel_ptr);
 }
 
-TAO_Stub *
+STUB_Object *
 TAO_ServantBase::_create_stub (CORBA_Environment &env)
 {
-  TAO_Stub *stub;
+  STUB_Object *stub;
 
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current &poa_current = orb_core->poa_current ();
-  TAO_POA_Current_Impl *poa_current_impl = poa_current.implementation ();
+  TAO_POA_Current *poa_current = orb_core->poa_current ();
 
-  if (poa_current_impl != 0 &&
-      this == poa_current_impl->servant ())
+  if (poa_current != 0
+      && poa_current->in_upcall ()
+      && this == poa_current->servant ())
     {
-      stub = orb_core->orb ()->create_stub_object (poa_current_impl->object_key (),
-                                                   this->_interface_repository_id (),
+      stub = orb_core->orb ()->create_stub_object (poa_current->object_key (),
+                                                   this->_interface_repository_id (), 
                                                    env);
     }
   else
@@ -146,164 +122,10 @@ TAO_ServantBase::_create_stub (CORBA_Environment &env)
   return stub;
 }
 
-ACE_SYNCH_MUTEX &
-TAO_ServantBase::_single_threaded_poa_lock (void)
-{
-  return *this->single_threaded_poa_lock_;
-}
-
-void
-TAO_ServantBase::_increment_single_threaded_poa_lock_count (void)
-{
-  // Only one thread at a time through this code (guarantee provided
-  // by the POA).
-  u_long current_count = this->single_threaded_poa_lock_count_++;
-  if (current_count == 0)
-    {
-      ACE_NEW (this->single_threaded_poa_lock_,
-               ACE_SYNCH_MUTEX);
-    }
-}
-
-void
-TAO_ServantBase::_decrement_single_threaded_poa_lock_count (void)
-{
-  // Only one thread at a time through this code (guarantee provided
-  // by the POA).
-  u_long current_count = --this->single_threaded_poa_lock_count_;
-  if (current_count == 0)
-    {
-      delete this->single_threaded_poa_lock_;
-      this->single_threaded_poa_lock_ = 0;
-    }
-}
-
-TAO_RefCountServantBase::~TAO_RefCountServantBase (void)
-{
-}
-
-void
-TAO_RefCountServantBase::_add_ref (CORBA::Environment &)
-{
-  ++this->ref_count_;
-}
-
-void
-TAO_RefCountServantBase::_remove_ref (CORBA::Environment &)
-{
-  CORBA::ULong new_count = --this->ref_count_;
-  if (new_count == 0)
-    {
-      delete this;
-    }
-}
-
-TAO_RefCountServantBase::TAO_RefCountServantBase (void)
-  : ref_count_ (1)
-{
-}
-
-TAO_RefCountServantBase::TAO_RefCountServantBase (const TAO_RefCountServantBase &)
-  : ref_count_ (1)
-{
-}
-
-TAO_RefCountServantBase &
-TAO_RefCountServantBase::operator= (const TAO_RefCountServantBase &)
-{
-  return *this;
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (void)
-  : ptr_ (0)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (TAO_ServantBase *p)
-  : ptr_ (p)
-{
-}
-
-TAO_ServantBase_var::TAO_ServantBase_var (const TAO_ServantBase_var &b)
-  : ptr_ (b.ptr_)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_add_ref ();
-}
-
-TAO_ServantBase_var::~TAO_ServantBase_var (void)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref ();
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (TAO_ServantBase *p)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref ();
-
-  this->ptr_ = p;
-
-  return *this;
-}
-
-TAO_ServantBase_var &
-TAO_ServantBase_var::operator= (const TAO_ServantBase_var &b)
-{
-  if (this->ptr_ != b.ptr_)
-  {
-    if (this->ptr_ != 0)
-      this->ptr_->_remove_ref ();
-
-    if ((this->ptr_ = b.ptr_) != 0)
-      this->ptr_->_add_ref ();
-  }
-
-  return *this;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::operator->() const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::in (void) const
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::inout (void)
-{
-  return this->ptr_;
-}
-
-TAO_ServantBase *&
-TAO_ServantBase_var::out (void)
-{
-  if (this->ptr_ != 0)
-    this->ptr_->_remove_ref();
-
-  this->ptr_ = 0;
-
-  return this->ptr_;
-}
-
-TAO_ServantBase *
-TAO_ServantBase_var::_retn (void)
-{
-  TAO_ServantBase *retval = this->ptr_;
-  this->ptr_ = 0;
-  return retval;
-}
-
-TAO_Stub *
+STUB_Object *
 TAO_Local_ServantBase::_create_stub (CORBA_Environment &env)
 {
-  PortableServer::ObjectId_var invalid_oid =
+  PortableServer::ObjectId_var invalid_oid = 
     PortableServer::string_to_ObjectId ("invalid");
 
   TAO_ObjectKey tmp_key (invalid_oid->length (),
@@ -316,8 +138,6 @@ TAO_Local_ServantBase::_create_stub (CORBA_Environment &env)
                                                                env);
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 CORBA::Object_ptr
 TAO_DynamicImplementation::_this (CORBA::Environment &env)
 {
@@ -325,7 +145,7 @@ TAO_DynamicImplementation::_this (CORBA::Environment &env)
   // object. Unlike _this() for static skeletons, its return type is
   // not interface-specific because a DSI servant may very well
   // incarnate multiple CORBA objects of different types.
-  TAO_Stub *stub = this->_create_stub (env);
+  STUB_Object *stub = this->_create_stub (env);
   if (env.exception () != 0)
     return CORBA::Object::_nil ();
 
@@ -349,7 +169,7 @@ TAO_DynamicImplementation::_downcast (const char *repository_id)
   return this;
 }
 
-TAO_Stub *
+STUB_Object *
 TAO_DynamicImplementation::_create_stub (CORBA::Environment &env)
 {
   // If DynamicImplementation::_this() is invoked outside of the
@@ -357,28 +177,28 @@ TAO_DynamicImplementation::_create_stub (CORBA::Environment &env)
   // by the DSI servant, it raises the PortableServer::WrongPolicy
   // exception.
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
-  TAO_POA_Current &poa_current = orb_core->poa_current ();
-  TAO_POA_Current_Impl *poa_current_impl = poa_current.implementation ();
+  TAO_POA_Current *poa_current = orb_core->poa_current ();
 
-  if (poa_current_impl == 0 &&
-      this != poa_current_impl->servant ())
+  if (poa_current == 0
+      || !poa_current->in_upcall ()
+      || this != poa_current->servant ())
     {
       CORBA::Exception *exception = new PortableServer::POA::WrongPolicy;
       env.exception (exception);
       return 0;
     }
 
-  PortableServer::POA_var poa = poa_current_impl->get_POA (env);
+  PortableServer::POA_var poa = poa_current->get_POA (env);
   if (env.exception () != 0)
     return 0;
 
-  CORBA::RepositoryId interface = this->_primary_interface (poa_current_impl->object_id (),
+  CORBA::RepositoryId interface = this->_primary_interface (poa_current->object_id (),
                                                             poa.in (),
                                                             env);
   if (env.exception () != 0)
     return 0;
 
-  return TAO_ORB_Core_instance ()->orb ()->create_stub_object (poa_current_impl->object_key (),
+  return TAO_ORB_Core_instance ()->orb ()->create_stub_object (poa_current->object_key (),
                                                                interface,
                                                                env);
 }
@@ -399,5 +219,3 @@ TAO_DynamicImplementation::_dispatch (CORBA::ServerRequest &request,
       request.dsi_marshal (env);
     }
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Servant_Base.h b/TAO/tao/Servant_Base.h
index d4bcae36244..b5676694496 100644
--- a/TAO/tao/Servant_Base.h
+++ b/TAO/tao/Servant_Base.h
@@ -1,4 +1,3 @@
-
 // This may look like C, but it's really -*- C++ -*-
 // $Id$
 
@@ -26,37 +25,28 @@ class TAO_Operation_Table;
 class TAO_Export TAO_ServantBase
 {
   // = TITLE
-  //     Base class for skeletons and servants.
+  //   Base class for skeletons and servants.
   //
   // = DESCRIPTION
-  //     The POA spec requires that all servants inherit from this
-  //     class.
+  //   The POA spec requires that all servants inherit from this
+  //   class.
 public:
   friend class TAO_POA;
-  friend class TAO_Object_Adapter;
   friend class CORBA_Object;
 
   virtual ~TAO_ServantBase (void);
-  // Destructor.
-
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  // Returns the default POA for this servant.
-
-  virtual CORBA::Boolean _is_a (const char* logical_type_id,
-                                CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  // Local implementation of the CORBA::Object::_is_a method.
+  // destructor
 
-  virtual CORBA::Boolean _non_existent (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  // Default <_non_existent>: always returns false.
+  TAO_ServantBase &operator= (const TAO_ServantBase &);
+  // assignment operator.
 
-  // = Reference counting hooks: no-ops by default.
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Returns the default POA for this servant.
 
   virtual void *_downcast (const char *repository_id) = 0;
   // Get the correct vtable.
 
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
 protected:
@@ -66,12 +56,13 @@ protected:
   TAO_ServantBase (const TAO_ServantBase &);
   // Copy constructor, protected so no instances can be created.
 
-  TAO_ServantBase &operator= (const TAO_ServantBase &);
-  // assignment operator.
+  virtual CORBA::Boolean _is_a (const char* logical_type_id,
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Local implementation of the CORBA::Object::_is_a method.
 
   virtual void _dispatch (CORBA::ServerRequest &request,
                           void *context,
-                          CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Dispatches a request to the object: find the operation, cast the
   // type to the most derived type, demarshall all the parameters from
   // the request and finally invokes the operation, storing the
@@ -79,8 +70,7 @@ protected:
   // <request>.
 
   virtual int _find (const char *opname,
-                     TAO_Skeleton &skelfunc,
-                     const unsigned int length = 0);
+                     TAO_Skeleton &skelfunc);
   // Find an operation in the operation table.
 
   virtual int _bind (const char *opname,
@@ -88,129 +78,11 @@ protected:
   // Register a CORBA IDL operation name.
 
   virtual const char *_interface_repository_id (void) const = 0;
-  // Get this interface's repository id (TAO specific).
-
-  // = Should be protected/private, but a nested class needs it.
-
-public:
-  ACE_SYNCH_MUTEX &_single_threaded_poa_lock (void);
-  // Access to the single threaded poa lock.
-
-protected:
-  void _increment_single_threaded_poa_lock_count (void);
-  // New single threaded POA wants to use this lock.
-
-  void _decrement_single_threaded_poa_lock_count (void);
-  // Single threaded POA is no longer interested in this lock.
+  // Get this interface's repository id.
 
   TAO_Operation_Table *optable_;
   // The operation table for this servant, it is initialized by the
   // most derived class.
-
-  ACE_SYNCH_MUTEX *single_threaded_poa_lock_;
-  // Lock for single threaded POAs.
-
-  u_long single_threaded_poa_lock_count_;
-  // Reference count for lock.
-};
-
-class TAO_Export TAO_RefCountServantBase : public virtual TAO_ServantBase
-{
-  // = TITLE
-  //     Reference counting mix-in class.
-  //
-  // = DESCRIPTION
-  //     The RefCountServantBase mix-in class overrides the inherited
-  //     _add_ref and _remove_ref functions it inherits from
-  //     ServantBase, implementing them to provide true reference
-  //     counting. An instance of a servant class derived from
-  //     RefCountServantBase initially has a reference count of
-  //     one. Invoking _add_ref on the servant instance increases its
-  //     reference count by one. Invoking _remove_ref on the servant
-  //     instance decreases its reference count by one; if the
-  //     resulting reference count equals zero, _remove_ref invokes
-  //     delete on its this pointer in order to destroy the
-  //     servant. For ORBs that operate in multi-threaded
-  //     environments, the implementations of _add_ref and _remove_ref
-  //     that the RefCountServantBase class provides shall be
-  //     thread-safe.
-  //
-  //     Like ServantBase, RefCountServantBase supports copy
-  //     construction and the default assignment operation. Copy
-  //     construction always sets the reference count of the new
-  //     servant instance to one. The default assignment
-  //     implementation merely returns *this and does not affect the
-  //     reference count.
-
-public:
-
-  ~TAO_RefCountServantBase (void);
-  // Destructor.
-
-  virtual void _add_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  // Increase reference count by one.
-
-  virtual void _remove_ref (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
-  // Decreases reference count by one; if the resulting reference
-  // count equals zero, _remove_ref invokes delete on its this pointer
-  // in order to destroy the servant.
-
-protected:
-
-  TAO_RefCountServantBase (void);
-  // Constructor: initial reference count is one.
-
-  TAO_RefCountServantBase (const TAO_RefCountServantBase &);
-  // Copy Constructor: Always sets the reference count of the new
-  // servant instance to one.
-
-  TAO_RefCountServantBase &operator= (const TAO_RefCountServantBase &);
-  // The default assignment implementation merely returns *this and
-  // does not affect the reference count.
-
-private:
-
-  ACE_Atomic_Op<ACE_SYNCH_MUTEX, CORBA::ULong> ref_count_;
-  // Reference counter.
-};
-
-class TAO_Export TAO_ServantBase_var
-{
-  // = TITLE
-  //     Auto pointer for reference counting servants.
-  //
-  // = DESCRIPTION
-  //     For the convenience of automatically managing servant
-  //     reference counts, the PortableServer namespace also provides
-  //     the ServantBase_var class. This class behaves similarly to
-  //     _var classes for object references (see Section 20.3.1).
-
-public:
-  TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var (TAO_ServantBase *p);
-
-  TAO_ServantBase_var (const TAO_ServantBase_var &b);
-
-  ~TAO_ServantBase_var (void);
-
-  TAO_ServantBase_var &operator= (TAO_ServantBase *p);
-
-  TAO_ServantBase_var &operator= (const TAO_ServantBase_var &b);
-
-  TAO_ServantBase *operator-> () const;
-
-  TAO_ServantBase *in (void) const;
-
-  TAO_ServantBase *&inout (void);
-
-  TAO_ServantBase *&out (void);
-
-  TAO_ServantBase *_retn (void);
-
-private:
-
-  TAO_ServantBase *ptr_;
 };
 
 class TAO_Export TAO_Servant_Hash
@@ -225,13 +97,11 @@ class TAO_Export TAO_Local_ServantBase : public TAO_ServantBase
   // = TITLE
   //   Base class for local skeletons and servants.
 protected:
-  TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This is an auxiliar method for _this().  Make sure *not* to
   // register with the default POA
 };
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
 {
   // = TITLE
@@ -244,19 +114,19 @@ class TAO_Export TAO_DynamicImplementation : public virtual TAO_ServantBase
   //   circumstances may lead to unpredictable results.
 public:
   virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
+                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // The invoke() method receives requests issued to any CORBA object
   // incarnated by the DSI servant and performs the processing
   // necessary to execute the request.
 
   virtual CORBA::RepositoryId _primary_interface (const PortableServer::ObjectId &oid,
                                                   PortableServer::POA_ptr poa,
-                                                  CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ()) = 0;
+                                                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // The _primary_interface() method receives an ObjectId value and a
   // POA_ptr as input parameters and returns a valid RepositoryId
   // representing the most-derived interface for that oid.
 
-  CORBA::Object_ptr _this (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  CORBA::Object_ptr _this (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Returns a CORBA::Object_ptr for the target object.
 
 protected:
@@ -267,17 +137,15 @@ protected:
   virtual void *_downcast (const char *repository_id);
   // Simply returns "this"
 
-  virtual TAO_Stub *_create_stub (CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+  virtual STUB_Object *_create_stub (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // This is an auxiliar method for _this() and _narrow().
 
   virtual void _dispatch (CORBA::ServerRequest &request,
                           void *context,
-                          CORBA_Environment &ACE_TRY_ENV = CORBA::default_environment ());
+                          CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Turns around and calls invoke.
 };
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 #if defined (__ACE_INLINE__)
 # include "tao/Servant_Base.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp
index f94cd6709cf..2ec75d93cd1 100644
--- a/TAO/tao/Server_Request.cpp
+++ b/TAO/tao/Server_Request.cpp
@@ -11,7 +11,6 @@
 #include "tao/Principal.h"
 #include "tao/ORB_Core.h"
 #include "tao/Timeprobe.h"
-#include "tao/Any.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Server_Request.i"
@@ -19,3 +18,588 @@
 
 ACE_RCSID(tao, Server_Request, "$Id$")
 
+#if defined (ACE_ENABLE_TIMEPROBES)
+
+static const char *TAO_Server_Request_Timeprobe_Description[] =
+{
+  "Server_Request::Server_Request - start",
+  "Server_Request::Server_Request - end",
+};
+
+enum
+{
+  // Timeprobe description table start key 
+  TAO_SERVER_REQUEST_START = 400,
+  TAO_SERVER_REQUEST_END
+};
+
+// Setup Timeprobes
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Server_Request_Timeprobe_Description,
+                                  TAO_SERVER_REQUEST_START);
+
+#endif /* ACE_ENABLE_TIMEPROBES */
+
+IIOP_ServerRequest::IIOP_ServerRequest (TAO_InputCDR &input,
+                                        TAO_OutputCDR &output,
+                                        TAO_ORB_Core *orb_core,
+                                        CORBA::Environment &env)
+  : operation_ (0),
+    incoming_ (&input),
+    outgoing_ (&output),
+    response_expected_ (0),
+    params_ (0),
+    retval_ (0),
+    exception_ (0),
+    exception_type_ (TAO_GIOP_NO_EXCEPTION),
+    orb_core_ (orb_core),
+    service_info_ (),
+    request_id_ (0),
+    object_key_ (),
+    requesting_principal_ (0)
+{
+  ACE_FUNCTION_TIMEPROBE (TAO_SERVER_REQUEST_START);
+
+  this->parse_header (env);
+}
+
+void
+IIOP_ServerRequest::parse_header_std (CORBA::Environment &env)
+{
+  // Tear out the service context ... we currently ignore it, but it
+  // should probably be passed to each ORB service as appropriate
+  // (e.g. transactions, security).
+  //
+  // NOTE: As security support kicks in, this is a good place to
+  // verify a digital signature, if that is required in this security
+  // environment.  It may be required even when using IPSEC security
+  // infrastructure.
+
+  TAO_InputCDR& input = *this->incoming_;
+
+  input >> this->service_info_;
+  CORBA::Boolean hdr_status = input.good_bit ();
+
+  // Get the rest of the request header ...
+
+  hdr_status = hdr_status && input.read_ulong (this->request_id_);
+  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
+
+  // We use ad-hoc demarshalling here: there is no need to increase
+  // the reference count on the CDR message block, because this key
+  // will not outlive the request (or the message block).
+
+  CORBA::Long key_length;
+  hdr_status = hdr_status && input.read_long (key_length);
+  if (hdr_status)
+    {
+      this->object_key_.replace (key_length, key_length,
+                                 (CORBA::Octet*)input.rd_ptr (),
+                                 0);
+      input.skip_bytes (key_length);
+    }
+
+  CORBA::Long length;
+  hdr_status = hdr_status && input.read_long (length);
+  if (hdr_status)
+    {
+      this->operation_ = input.rd_ptr ();
+      hdr_status = input.skip_bytes (length);
+    }
+
+  if (hdr_status)
+    {
+      input >> this->requesting_principal_;
+      hdr_status = input.good_bit ();
+    }
+
+  if (!hdr_status)
+    env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
+
+}
+
+void
+IIOP_ServerRequest::parse_header_lite (CORBA::Environment &env)
+{
+  TAO_InputCDR& input = *this->incoming_;
+
+  CORBA::Boolean hdr_status = input.good_bit ();
+
+  // Get the rest of the request header ...
+
+  hdr_status = hdr_status && input.read_ulong (this->request_id_);
+  hdr_status = hdr_status && input.read_boolean (this->response_expected_);
+
+  // We use ad-hoc demarshalling here: there is no need to increase
+  // the reference count on the CDR message block, because this key
+  // will not outlive the request (or the message block).
+
+  CORBA::Long key_length;
+  hdr_status = hdr_status && input.read_long (key_length);
+  if (hdr_status)
+    {
+      this->object_key_.replace (key_length, key_length,
+                                 (CORBA::Octet*)input.rd_ptr (),
+                                 0);
+      input.skip_bytes (key_length);
+    }
+
+  CORBA::Long length;
+  hdr_status = hdr_status && input.read_long (length);
+  if (hdr_status)
+    {
+      this->operation_ = input.rd_ptr ();
+      hdr_status = input.skip_bytes (length);
+    }
+
+  if (!hdr_status)
+    env.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_NO));
+}
+
+
+
+void
+IIOP_ServerRequest::parse_header (CORBA::Environment &env)
+{
+  if (this->orb_core_->orb_params ()->use_lite_protocol ())
+    this->parse_header_lite (env);
+  else
+    this->parse_header_std (env);
+}
+
+// This constructor is used, by the locate request code
+
+IIOP_ServerRequest::IIOP_ServerRequest (CORBA::ULong &request_id,
+                                        CORBA::Boolean &response_expected,
+                                        TAO_ObjectKey &object_key,
+                                        char* operation,
+                                        TAO_OutputCDR &output,
+                                        TAO_ORB_Core *orb_core,
+                                        CORBA::Environment &)
+  : operation_ (operation),
+    incoming_ (0),
+    outgoing_ (&output),
+    response_expected_ (response_expected),
+    params_ (0),
+    retval_ (0),
+    exception_ (0),
+    exception_type_ (TAO_GIOP_NO_EXCEPTION),
+    orb_core_ (orb_core),
+    service_info_ (0),
+    request_id_ (request_id),
+    object_key_ (object_key),
+    requesting_principal_ (0)
+{
+}
+
+IIOP_ServerRequest::~IIOP_ServerRequest (void)
+{
+  if (this->params_)
+    CORBA::release (this->params_);
+  delete this->retval_;
+  delete this->exception_;
+}
+
+CORBA::ORB_ptr
+IIOP_ServerRequest::orb (void)
+{
+  return this->orb_core_->orb ();
+}
+
+TAO_POA *
+IIOP_ServerRequest::oa (void)
+{
+  return this->orb_core_->root_poa ();
+}
+
+// Unmarshal in/inout params, and set up to marshal the appropriate
+// inout/out/return values later on.
+
+void
+IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list,
+                               CORBA::Environment &env)
+{
+  env.clear ();
+
+  // Save params for later use when marshaling the reply.
+  this->params_ = list;
+
+  // Then unmarshal each "in" and "inout" parameter.
+  for (u_int i = 0; i < list->count (); i++)
+    {
+      CORBA::NamedValue_ptr nv = list->item (i, env);
+
+      // check if it is an in or inout parameter
+      if (ACE_BIT_DISABLED (nv->flags (), CORBA::ARG_IN | CORBA::ARG_INOUT))
+        continue;
+
+      // First, make sure the memory into which we'll be unmarshaling
+      // exists, and is the right size.
+      //
+      // NOTE: desirable to have a way to let the dynamic
+      // implementation routine preallocate this data, for
+      // environments where DSI is just being used in lieu of a
+      // language mapped server-side API and the size is really
+      // knowable in advance.
+      //
+      // This is exactly what the TAO IDL compiler generated skeletons do.
+
+      CORBA::Any_ptr any = nv->value ();
+      CORBA::TypeCode_var tc = any->type ();
+
+      void *value;
+      if (!any->value ())
+        { // not preallocated
+          ACE_NEW (value, char [tc->size (env)]);
+
+          if (env.exception () != 0)
+            return;
+
+          any->replace (tc.in (), value, 1, env);
+          if (env.exception () != 0)
+            return;
+
+        }
+      else
+        value = (void *)any->value (); // memory was already preallocated
+
+      // Then just unmarshal the value.
+      (void) incoming_->decode (tc.in (), value, 0, env);
+      if (env.exception () != 0)
+        {
+          const char* param_name = nv->name ();
+          if (param_name == 0)
+            param_name = "(no name given)";
+          ACE_ERROR ((LM_ERROR,
+                      "IIOP_ServerRequest::arguments - problem while"
+                      " decoding parameter %d <%s>\n", i, param_name));
+          return;
+        }
+    }
+
+  // If any data is left over, it'd be context values ... else error.
+  // We don't support context values, so it's always an error.
+
+  // @@ (TAO) support for Contexts??
+  if (incoming_->length () != 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "IIOP_ServerRequest::arguments - "
+                  "%d bytes left in buffer\n", incoming_->length ()));
+      env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO));
+    }
+}
+
+// Store the result value.  There's either an exception, or a result,
+// but not both of them.  Results (and exceptions) can be reported
+// only after the parameter list has been provided (maybe empty).
+
+void
+IIOP_ServerRequest::set_result (const CORBA::Any &value,
+                                CORBA::Environment &env)
+{
+  env.clear ();
+
+  // setting a result when another result already exists or if an exception
+  // exists is an error
+  if (this->retval_ || this->exception_)
+    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
+  else
+    {
+      this->retval_ = new CORBA::Any (value);
+    }
+}
+
+// Store the exception value.
+
+void
+IIOP_ServerRequest::set_exception (const CORBA::Any &value,
+                                   CORBA::Environment &env)
+{
+  if (this->retval_ || this->exception_)
+    env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO));
+  else
+  {
+    // Try to narrow to ForwardRequest
+    PortableServer::ForwardRequest_ptr forward_request =
+        PortableServer::ForwardRequest::_narrow ((CORBA::Exception *) value.value ());
+
+    // If narrowing of exception succeeded
+    if (forward_request != 0)
+      {
+        this->forward_location_ = forward_request->forward_reference;
+        this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
+      }
+    // Normal exception
+    else
+     {
+       this->exception_ = new CORBA::Any (value);
+
+       // @@ This cast is not safe, but we haven't implemented the >>=
+       // and <<= operators for base exceptions (yet).
+       CORBA_Exception* x = (CORBA_Exception*)value.value ();
+       if (CORBA_UserException::_narrow (x) != 0)
+         this->exception_type_ = TAO_GIOP_USER_EXCEPTION;
+       else
+        this->exception_type_ = TAO_GIOP_SYSTEM_EXCEPTION;
+    }
+  }
+}
+
+// Extension
+void
+IIOP_ServerRequest::demarshal (CORBA::Environment &orb_env,
+                               // ORB related exception reporting
+                               const TAO_Call_Data_Skel *info,
+                               // call description
+                               ...)
+{
+  CORBA::ULong i;
+  const TAO_Param_Data_Skel *pdp;
+  va_list param_vector;
+  va_start (param_vector, info);
+
+  for (i = 0, pdp = info->params;
+       i < info->param_count;
+       i++, pdp++)
+    {
+      void *ptr = va_arg (param_vector, void *);
+
+      if ((pdp->mode == CORBA::ARG_IN)
+          || (pdp->mode == CORBA::ARG_INOUT))
+        {
+          // Then just unmarshal the value.
+          (void) incoming_->decode (pdp->tc, ptr, 0, orb_env);
+        }
+
+      if (orb_env.exception ())
+        {
+          orb_env.print_exception ("ServerRequest::demarshal - parameter decode failed");
+          return;
+        }
+    }
+  va_end (param_vector);
+}
+
+// Extension
+
+void
+IIOP_ServerRequest::marshal (CORBA::Environment &orb_env,
+                             // ORB related exception reporting
+                             //                             CORBA::Environment &skel_env,
+                             // skeleton related exception reporting
+                             const TAO_Call_Data_Skel *info,
+                             // call description
+                             ...)
+{
+  // what is "orb_env" and "skel_env"?
+  // "skel_env" holds the exception that got raised inside the operation
+  // implementation (upcall)
+  //
+  // "orb_env" is the exception that may have been raised due to things going
+  // wrong in the entire dispatch process. These are always system exceptions.
+
+  // check if we are inside with an exception. This may have happened
+  // since the upcall could have set some exception
+#if 0 /* ASG */
+  if (skel_env.exception ())
+    {
+      // We must increase the "refcnt" on the exception, because it is
+      // "owned" by both <skel_env> and (eventually) by the
+      // Server_Request.
+      CORBA::Exception_ptr exception = skel_env.exception ();
+      exception->_incr_refcnt ();
+
+      // The Any does not own the because ultimately it will be owned 
+      // by the Server_Request via the call to "set_exception"
+      CORBA::Any any (skel_env.exception ()->_type (), exception);
+      this->set_exception (any, orb_env);
+    }
+#endif
+
+  // Setup a Reply message so that we can marshal all the outgoing parameters
+  // into it. If an exception was set, then that gets marshaled into the reply
+  // message and we don't do anything after that
+  this->init_reply (orb_env);
+
+#if 0 /* ASG */
+  // exception? nothing to do after this
+  if (orb_env.exception () || skel_env.exception ())
+    return;
+#endif
+  TAO_CHECK_ENV_RETURN_VOID (orb_env);
+
+  CORBA::ULong i;
+  const TAO_Param_Data_Skel *pdp;
+  va_list param_vector;
+  va_start (param_vector, info);
+
+  for (i = 0, pdp = info->params;
+       i < info->param_count;
+       i++, pdp++)
+    {
+      void *ptr = va_arg (param_vector, void *);
+
+      if (pdp->mode == 0)
+        {
+          // check if the return type is not void
+          if (pdp->tc->kind (orb_env) != CORBA::tk_void)
+            {
+              // Then just marshal the value.
+              (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
+            }
+          continue;
+        }
+      else if ((pdp->mode == CORBA::ARG_INOUT)
+          || (pdp->mode == CORBA::ARG_OUT))
+        {
+          // Then just marshal the value.
+          (void) this->outgoing_->encode (pdp->tc, ptr, 0, orb_env);
+        }
+
+      if (orb_env.exception ())
+        {
+          orb_env.print_exception ("ServerRequest::marshal - parameter encode failed");
+          return;
+        }
+    }
+  va_end (param_vector);
+
+}
+
+void
+IIOP_ServerRequest::init_reply (CORBA::Environment &env)
+{
+  // Construct a REPLY header.
+  TAO_GIOP::start_message (TAO_GIOP::Reply,
+			   *this->outgoing_,
+			   this->orb_core_);
+
+  TAO_GIOP_ServiceContextList resp_ctx;
+  resp_ctx.length (0);
+  this->outgoing_->encode (TC_ServiceContextList,
+                           &resp_ctx,
+                           0,
+                           env);
+  this->outgoing_->write_ulong (this->request_id_);
+
+  // Standard exceptions are caught in Connect::handle_input
+
+  // Forward exception only.
+  if (!CORBA::is_nil (this->forward_location_.in ()))
+    {
+      this->outgoing_->write_ulong (TAO_GIOP_LOCATION_FORWARD);
+
+      CORBA::Object_ptr object_ptr = this->forward_location_.in ();
+      (void) this->outgoing_->encode (CORBA::_tc_Object,
+                                      &object_ptr,
+                                      0,
+                                      env);
+
+      // If encoding went fine
+      if (env.exception () != 0)
+        {
+          env.print_exception  ("ServerRequest::marshal - forwarding parameter encode failed");
+          return;
+        }
+    }
+
+  // Any exception at all.
+  else if (this->exception_)
+    {
+      CORBA::TypeCode_ptr except_tc;
+
+      except_tc = this->exception_->type ();
+
+      // Finish the GIOP Reply header, then marshal the exception.
+      // XXX x->type () someday ...
+
+      this->outgoing_->write_ulong (this->exception_type_);
+
+      // we know that the value () will return the ACE_Message_Block
+      TAO_InputCDR cdr ((ACE_Message_Block*)this->exception_->value ());
+      (void) this->outgoing_->append (except_tc, &cdr, env);
+    }
+  else // Normal reply
+    // First finish the GIOP header ...
+    this->outgoing_->write_ulong (TAO_GIOP_NO_EXCEPTION);
+}
+
+// this method will be utilized by the DSI servant to marshal outgoing
+// parameters
+
+void
+IIOP_ServerRequest::dsi_marshal (CORBA::Environment &env)
+{
+  // NOTE: if "env" is set, it takes precedence over exceptions
+  // reported using the mechanism of the ServerRequest.  Only system
+  // exceptions are reported that way ...
+  //
+  // XXX Exception reporting is ambiguous; it can be cleaner than
+  // this.  With both language-mapped and dynamic/explicit reporting
+  // mechanisms, one of must be tested "first" ... so an exception
+  // reported using the other mechanism could be "lost".  Perhaps only
+  // the language mapped one should be used for system exceptions.
+
+
+  // only if there wasn't any exception, we proceed
+  if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION &&
+      CORBA::is_nil (this->forward_location_.in ()))
+    {
+      // ... then send any return value ...
+      if (this->retval_)
+        {
+          CORBA::TypeCode_var tc = this->retval_->type ();
+	        void* value = ACE_const_cast(void*,this->retval_->value ());
+	        if (this->retval_->any_owns_data ())
+            {
+              TAO_InputCDR cdr ((ACE_Message_Block *)value);
+              (void) this->outgoing_->append (tc.in (), &cdr, env);
+            }
+          else
+	          {
+	            (void) this->outgoing_->encode (tc.in (), value, 0, env);
+	          }
+        }
+
+      // ... Followed by "inout" and "out" parameters, left to right
+      if (this->params_)
+        {
+          for (u_int i = 0;
+               i < this->params_->count ();
+               i++)
+            {
+              CORBA::NamedValue_ptr nv = this->params_->item (i, env);
+              if (!(nv->flags () & (CORBA::ARG_INOUT|CORBA::ARG_OUT)))
+                continue;
+
+              CORBA::Any_ptr any = nv->value ();
+              CORBA::TypeCode_var tc = any->type ();
+              void* value = ACE_const_cast(void*,any->value ());
+              if (any->any_owns_data ())
+                {
+                  TAO_InputCDR cdr ((ACE_Message_Block *)value);
+                  (void) this->outgoing_->append (tc.in (), &cdr, env);
+                }
+              else
+                {
+                  (void) this->outgoing_->encode (tc.in (), value, 0, env);
+                }
+            }
+        }
+    }
+}
+
+
+CORBA::Object_ptr 
+IIOP_ServerRequest::forward_location (void)
+// get the forward_location
+{
+  return CORBA::Object::_duplicate (this->forward_location_.in ());
+}
+
+CORBA::ULong 
+IIOP_ServerRequest::exception_type (void)
+// get the exception type
+{
+  return this->exception_type_;
+}
diff --git a/TAO/tao/Server_Request.h b/TAO/tao/Server_Request.h
index b17e9cabc57..9aeb8639923 100644
--- a/TAO/tao/Server_Request.h
+++ b/TAO/tao/Server_Request.h
@@ -110,8 +110,6 @@ public:
   static CORBA_ServerRequest *_nil (void);
   // the standard _nil method on pseudo objects
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   virtual void arguments (CORBA::NVList_ptr &list,
                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
   // Implementation uses this to provide the ORB with the operation's
@@ -143,20 +141,9 @@ public:
   // this stuff is a catastrophic error since this is all part of the
   // basic CORBA Object Model.
 
-  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-  // marshal outgoing parameters. Used by DSI
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   virtual const char *operation (void) const = 0;
   // get the operation name
 
-  virtual unsigned int operation_length (void) const = 0;
-  // get the length of the operation name
-
-  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
-  // Start a Reply message.
-
   //  CORBA::Context_ptr ctx (void) = 0;
   // return the context pointer
 
@@ -179,6 +166,12 @@ public:
                         ...) = 0;
   // marshal outgoing parameters
 
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+  // marshal outgoing parameters. Used by DSI
+
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) = 0;
+  // Start a Reply message.
+
   virtual TAO_InputCDR &incoming (void) = 0;
   // Retrieve the incoming stream.
 
@@ -187,12 +180,167 @@ public:
 
   virtual CORBA::Boolean response_expected (void) const = 0;
   // is the response expected
+};
+
+class TAO_Export IIOP_ServerRequest : public CORBA_ServerRequest
+{
+  // = TITLE
+  //    Class representing an IIOP ServerRequest object.
+public:
+  // = Initialization and termination methods.
+  IIOP_ServerRequest (TAO_InputCDR &input,
+                      TAO_OutputCDR &output,
+                      TAO_ORB_Core *orb_core,
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // Constructor
+  IIOP_ServerRequest (CORBA::ULong &request_id,
+                      CORBA::Boolean &response_expected,
+                      TAO_ObjectKey &object_key,
+                      char* operation,
+                      TAO_OutputCDR &output,
+                      TAO_ORB_Core *orb_core,
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  virtual ~IIOP_ServerRequest (void);
+  // Destructor.
+
+  // = General ServerRequest operations
+  void arguments (CORBA::NVList_ptr &list,
+                  CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  void set_result (const CORBA::Any &value,
+                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  void set_exception (const CORBA::Any &value,
+                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+
+  // = Request attributes.
+
+  const char *operation (void) const;
+  // return the operation name
+
+  //  CORBA::Context_ptr ctx (void);
+  // return the context pointer
+
+  // = TAO extensions
+
+  CORBA::ORB_ptr  orb (void);
+  // return the underlying ORB
+
+  TAO_POA *oa (void);
+  // return the Object Adapter
+
+  //
+  // = TAO extensions
+  // meant to be used internally.
+  //
+
+  virtual void demarshal (CORBA_Environment &orb_env,
+                          const TAO_Call_Data_Skel *info,
+                          ...);
+  // demarshal incoming parameters. Used by the SSI skeleton (i.e., the IDL
+  // compiler generated skeleton)
+
+  virtual void marshal (CORBA_Environment &orb_env,
+                        //                        CORBA_Environment &skel_env,
+                        const TAO_Call_Data_Skel *info,
+                        ...);
+  // marshal outgoing parameters and return value. This is used by the SSI
+  // i.e., by the IDL compiler generated skeletons.
+
+  virtual void dsi_marshal (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // does the marshaling of outgoing parameters and is used by the DSI based
+  // scheme
+
+  virtual void init_reply (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // start a Reply message
+
+  virtual TAO_InputCDR &incoming (void);
+  // Retrieve the incoming stream.
+
+  virtual TAO_OutputCDR &outgoing (void);
+  // Retrieve the outgoing stream.
+
+  virtual CORBA::Boolean response_expected (void) const;
+  // is the response expected
+
+  virtual CORBA::Principal_ptr principal (void) const;
+
+  virtual const TAO_ObjectKey &object_key (void) const;
+
+  virtual const TAO_GIOP_ServiceContextList &service_info (void) const;
+
+  // The pseudo object methods, not really needed because the class is
+  // not in the spec, but we add them for the sake of completeness.
+  static IIOP_ServerRequest* _duplicate (IIOP_ServerRequest*);
+  static IIOP_ServerRequest* _nil (void);
+
+  // To handle System Exceptions at the lowest level,
+  // a method returning the request_id_ is needed.
+
+  CORBA::ULong request_id (void);
+
+  CORBA::Object_ptr forward_location (void);
+  // get the forward_location
+
+  CORBA::ULong exception_type (void);
+  // get the exception type
+
+private:
+   void parse_header (CORBA::Environment &TAO_IN_ENV);
+  // Parse the request header and store the result on this object.
+
+  void parse_header_std (CORBA::Environment &TAO_IN_ENV);
+  // Parse the standard IIOP request header and store the result on
+  // this object.
+
+  void parse_header_lite (CORBA::Environment &TAO_IN_ENV);
+  // Parse the lightweight version of the IIOP request header and
+  // store the result on this object.
+
+private:
+  char* operation_;
+  // Operation name.
+
+  CORBA::Object_var forward_location_;
+
+  TAO_InputCDR *incoming_;
+  // Incoming stream.
+
+  TAO_OutputCDR *outgoing_;
+  // Outgoing stream.
+
+  CORBA::Boolean response_expected_;
+  // is it oneway or twoway
+
+  CORBA::NVList_ptr params_;
+  // Incoming parameters.
+
+  CORBA::Any_ptr retval_;
+  // Return value.
+
+  CORBA::Any_ptr exception_;
+  // Any exception which might be raised.
+
+  //  TAO_GIOP_ReplyStatusType exception_type_;
+  CORBA::ULong exception_type_;
+  // exception type (will be NO_EXCEPTION in the majority of the cases)
+
+  TAO_ORB_Core* orb_core_;
+  // A pointer to the ORB Core for the context where the request was
+  // created.
+
+  TAO_GIOP_ServiceContextList service_info_;
+  // The service context for the request (CORBA Reference?)
+
+  CORBA::ULong request_id_;
+  // Unique identifier for a request
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA::ServerRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
+  TAO_ObjectKey object_key_;
+  // The object key of the destination object.
 
+  CORBA::Principal_ptr requesting_principal_;
+  // Identifies the requester
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Server_Request.i b/TAO/tao/Server_Request.i
index 808df8fd876..119e5d6cee7 100644
--- a/TAO/tao/Server_Request.i
+++ b/TAO/tao/Server_Request.i
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 ACE_INLINE CORBA::Boolean
@@ -16,7 +15,6 @@ CORBA::is_nil (CORBA_ServerRequest *x)
 // ServerRequest the "slow" version (with copies for each field) and
 // IIOP_ServerRequest the "fast" version (with no copies at all). The
 // first would be use for DII and the later for SII.
-
 ACE_INLINE CORBA_ServerRequest *
 CORBA_ServerRequest::_duplicate (CORBA_ServerRequest *)
 {
@@ -33,3 +31,61 @@ CORBA_ServerRequest::_nil (void)
 {
   return 0;
 }
+
+ACE_INLINE TAO_InputCDR &
+IIOP_ServerRequest::incoming (void)
+{
+  return *this->incoming_;
+}
+
+ACE_INLINE TAO_OutputCDR &
+IIOP_ServerRequest::outgoing (void)
+{
+  return *this->outgoing_;
+}
+
+// Invocation attributes.
+ACE_INLINE const char *
+IIOP_ServerRequest::operation (void) const
+{
+  return this->operation_;
+}
+
+#if 0
+//@@ (TAO) to do after Context is implemented
+ACE_INLINE CORBA::Context_ptr
+IIOP_ServerRequest::ctx (void)
+{
+  return 0;
+}
+#endif
+
+ACE_INLINE CORBA::Boolean
+IIOP_ServerRequest::response_expected (void) const
+{
+  return this->response_expected_;
+}
+
+ACE_INLINE CORBA::Principal_ptr 
+IIOP_ServerRequest::principal (void) const
+{
+  return this->requesting_principal_;
+}
+
+ACE_INLINE const TAO_ObjectKey &
+IIOP_ServerRequest::object_key (void) const
+{
+  return this->object_key_;
+}
+
+ACE_INLINE const TAO_GIOP_ServiceContextList &
+IIOP_ServerRequest::service_info (void) const
+{
+  return this->service_info_;
+}
+
+ACE_INLINE CORBA::ULong 
+IIOP_ServerRequest::request_id (void)
+{
+  return this->request_id_;
+}
diff --git a/TAO/tao/Server_Strategy_Factory.cpp b/TAO/tao/Server_Strategy_Factory.cpp
index 702fe1dc9f9..22257f16b5c 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -5,7 +5,6 @@
 ACE_RCSID(tao, Server_Strategy_Factory, "$Id$")
 
 TAO_Server_Strategy_Factory::TAO_Server_Strategy_Factory (void)
-  : active_object_map_creation_parameters_ ()
 {
 }
 
@@ -14,7 +13,7 @@ TAO_Server_Strategy_Factory::~TAO_Server_Strategy_Factory(void)
 }
 
 int
-TAO_Server_Strategy_Factory::open (TAO_ORB_Core*)
+TAO_Server_Strategy_Factory::open (void)
 {
   return 0;
 }
@@ -43,10 +42,30 @@ TAO_Server_Strategy_Factory::scheduling_strategy (void)
   return 0;
 }
 
-int
-TAO_Server_Strategy_Factory::enable_poa_locking (void)
+TAO_Active_Object_Map_Impl *
+TAO_Server_Strategy_Factory::create_active_object_map (int user_id_policy)
+{
+  ACE_UNUSED_ARG (user_id_policy);
+  return 0;
+}
+
+TAO_Reverse_Active_Object_Map_Impl *
+TAO_Server_Strategy_Factory::create_reverse_active_object_map (int unique_id_policy)
 {
-  return -1;
+  ACE_UNUSED_ARG (unique_id_policy);
+  return 0;
+}
+
+ACE_Lock *
+TAO_Server_Strategy_Factory::create_poa_lock (void)
+{
+  return 0;
+}
+
+ACE_Lock *
+TAO_Server_Strategy_Factory::create_poa_mgr_lock (void)
+{
+  return 0;
 }
 
 ACE_Lock *
@@ -73,24 +92,10 @@ 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
-{
-  return this->active_object_map_creation_parameters_;
-}
-
-TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters::Active_Object_Map_Creation_Parameters (void)
-  : active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE),
-    object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH),
-    object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX),
-    reverse_object_lookup_strategy_for_unique_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_ids_ (1),
-    allow_reactivation_of_system_ids_ (1),
-    poa_map_size_ (TAO_DEFAULT_SERVER_POA_MAP_SIZE),
-    poa_lookup_strategy_for_transient_id_policy_ (TAO_ACTIVE_DEMUX),
-    poa_lookup_strategy_for_persistent_id_policy_ (TAO_DYNAMIC_HASH),
-    use_active_hint_in_poa_names_ (1)
+u_long 
+TAO_Server_Strategy_Factory::active_object_map_size (void) const
 {
+  return TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 3618634884f..ce9cacb56aa 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -20,11 +20,9 @@
 #include "ace/Service_Object.h"
 #include "ace/Strategies_T.h"
 #include "tao/Connect.h"
-#include "tao/params.h"
 
 class TAO_Active_Object_Map_Impl;
 class TAO_Reverse_Active_Object_Map_Impl;
-class TAO_ORB_Core;
 
 class TAO_Server_Strategy_Factory : public ACE_Service_Object
 {
@@ -34,45 +32,6 @@ class TAO_Server_Strategy_Factory : public ACE_Service_Object
   //    serves as an interface to a subclass that REALLY gets
   //    specified and loaded by the Service Configurator.
 public:
-
-  struct Active_Object_Map_Creation_Parameters
-  {
-    Active_Object_Map_Creation_Parameters (void);
-    // Constructor.
-
-    CORBA::ULong active_object_map_size_;
-    // Default size of object lookup table.
-
-    TAO_Demux_Strategy object_lookup_strategy_for_user_id_policy_;
-    // The type of lookup/demultiplexing strategy being used for user
-    // id policy
-
-    TAO_Demux_Strategy object_lookup_strategy_for_system_id_policy_;
-    // The type of lookup/demultiplexing strategy being used for
-    // system id policy
-
-    TAO_Demux_Strategy reverse_object_lookup_strategy_for_unique_id_policy_;
-    // The type of reverse lookup/demultiplexing strategy being used
-    // for the UNIQUE_ID policy
-
-    int use_active_hint_in_ids_;
-    // Flag to indicate whether the active hint should be used with
-    // the IOR.
-
-    int allow_reactivation_of_system_ids_;
-    // Flag to indicate whether reactivations of servants was required
-    // (under the system id policy).  If not, certain resources may
-    // not be required.
-
-    CORBA::ULong poa_map_size_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_transient_id_policy_;
-
-    TAO_Demux_Strategy poa_lookup_strategy_for_persistent_id_policy_;
-
-    int use_active_hint_in_poa_names_;
-  };
-
   // = Initialization and termination methods.
   TAO_Server_Strategy_Factory (void);
   // Constructor.
@@ -80,7 +39,7 @@ public:
   virtual ~TAO_Server_Strategy_Factory(void);
   // Destructor.
 
-  virtual int open (TAO_ORB_Core* orb_core);
+  virtual int open (void);
   // Call <open> on various strategies.  This is not performed in
   // <init> so that the other portions of the ORB have a chance to
   // "settle" in their initialization since the streategies herein
@@ -110,8 +69,21 @@ public:
   virtual SCHEDULING_STRATEGY *scheduling_strategy (void);
   // Return the scheduling strategy used.
 
-  virtual int enable_poa_locking (void);
-  // Enable POA locking?
+  virtual TAO_Active_Object_Map_Impl *create_active_object_map (int user_id_policy);
+  // Return a new id-->sevant table.  If <user_id_policy> is true, the
+  // request is being made for a POA with USER_ID policy. Otherwise,
+  // the SYSTEM_ID policy is being used.
+
+  virtual TAO_Reverse_Active_Object_Map_Impl *create_reverse_active_object_map (int unique_id_policy);
+  // Return a new servant-->id table.  If <unique_id_policy> is true,
+  // the request is being made for a POA with UNIQUE_ID
+  // policy. Otherwise, the MULTIPLE_ID policy is being used.
+
+  virtual ACE_Lock *create_poa_lock (void);
+  // Return a new lock for use in locking the POA.
+
+  virtual ACE_Lock *create_poa_mgr_lock (void);
+  // Return a new lock for use in locking the POA Manager.
 
   virtual ACE_Lock *create_servant_lock (void);
   // Return a new lock for use in locking the servant.
@@ -125,13 +97,8 @@ public:
   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.
-
-protected:
-
-  Active_Object_Map_Creation_Parameters active_object_map_creation_parameters_;
-  // Active object map creation parameters.
+  virtual u_long active_object_map_size (void) const;
+  // Return the object table size
 };
 
 #endif /* TAO_SERVER_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/Services.cpp b/TAO/tao/Services.cpp
deleted file mode 100644
index b917c859520..00000000000
--- a/TAO/tao/Services.cpp
+++ /dev/null
@@ -1,558 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  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 "tao/Services.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Services.i"
-#endif /* !defined INLINE */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CS_
-
-// *************************************************************
-// CORBA::ServiceDetail::_tao_seq_Octet
-// *************************************************************
-
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (void)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (CORBA::ULong max, CORBA::ULong length, CORBA::Octet *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::_tao_seq_Octet (const _tao_seq_Octet &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::Octet>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceDetail::_tao_seq_Octet::~_tao_seq_Octet (void) // dtor
-{}
-
-static const CORBA::Long _oc_CORBA_ServiceDetail__tao_seq_Octet[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-  0,
-};
-static CORBA::TypeCode _tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_CORBA_ServiceDetail__tao_seq_Octet), (char *) &_oc_CORBA_ServiceDetail__tao_seq_Octet, 0, sizeof (CORBA::ServiceDetail::_tao_seq_Octet));
-CORBA::TypeCode_ptr CORBA::ServiceDetail::_tc__tao_seq_Octet = &_tc_TAO_tc_CORBA_ServiceDetail__tao_seq_Octet;
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ULong* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ULong *old = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *,this->buffer_);
-    
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceOption
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (CORBA::ULong max, CORBA::ULong length, CORBA::ULong *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::_tao_seq_ServiceOption (const _tao_seq_ServiceOption &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceOption::~_tao_seq_ServiceOption (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_allocate_buffer (CORBA::ULong length)
-  {
-    CORBA::ServiceDetail* tmp = CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (length);
-    
-    if (this->buffer_ != 0)
-    {
-      CORBA::ServiceDetail *old = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-      
-      for (CORBA::ULong i = 0; i < this->length_; ++i)
-        tmp[i] = old[i];
-      
-      if (this->release_)
-        CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (old);
-      
-    }
-    this->buffer_ = tmp;
-  }
-  
-  void
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_deallocate_buffer (void)
-  {
-    if (this->buffer_ == 0 || this->release_ == 0)
-      return;
-    
-    CORBA::ServiceDetail *tmp = ACE_reinterpret_cast (CORBA::ServiceDetail *,this->buffer_);
-    
-    CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    this->buffer_ = 0;
-  } 
-  
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Dtor.
-  {
-    this->_deallocate_buffer ();
-  }
-  
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CS_
-
-// *************************************************************
-// CORBA::ServiceInformation::_tao_seq_ServiceDetail
-// *************************************************************
-
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (void)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max) // uses max size
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (CORBA::ULong max, CORBA::ULong length, CORBA::ServiceDetail *buffer, CORBA::Boolean release)
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (max, length, buffer, release)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::_tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &seq) // copy ctor
-  : 
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
- (seq)
-{}
-CORBA::ServiceInformation::_tao_seq_ServiceDetail::~_tao_seq_ServiceDetail (void) // dtor
-{}
-
-
-#endif /* end #if !defined */
-
-void operator<<= (CORBA::Any &_tao_any, const CORBA::ServiceDetail &_tao_elem) // copying
-{
-  CORBA::ServiceDetail *_any_val;
-  ACE_NEW (_any_val, CORBA::ServiceDetail (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceDetail, _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::ServiceDetail *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceDetail, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceDetail *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceDetail, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceDetail *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceDetail, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ServiceDetail, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ServiceDetail, _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::ServiceInformation &_tao_elem) // copying
-{
-  CORBA::ServiceInformation *_any_val;
-  ACE_NEW (_any_val, CORBA::ServiceInformation (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceInformation, _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::ServiceInformation *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (CORBA::_tc_ServiceInformation, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ServiceInformation *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (CORBA::_tc_ServiceInformation, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (CORBA::ServiceInformation *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, CORBA::ServiceInformation, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (CORBA::_tc_ServiceInformation, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (CORBA::_tc_ServiceInformation, _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;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA_ServiceDetail::_tao_seq_Octet &_tao_sequence
-  )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_dynamic_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (CORBA_ServiceDetail::_tao_seq_Octet *)&_tao_sequence);
-      if (oseq->mb ())
-        return strm.write_octet_array_mb (oseq->mb ());
-      else
-        return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-    }
-    
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail::_tao_seq_Octet &_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
-    
-#if defined (TAO_NO_COPY_OCTET_SEQUENCES)
-    if (ACE_BIT_DISABLED (strm.start ()->flags (),ACE_Message_Block::DONT_DELETE))
-    {
-      TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
-        ACE_dynamic_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-      oseq->replace (_tao_seq_len, strm.start ());
-      oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-      strm.skip_bytes (_tao_seq_len);
-      return 1;
-    }
-    else
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-    
-#else /* TAO_NO_COPY_OCTET_SEQUENCES */
-    return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES */
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator<< (TAO_OutputCDR &strm, const CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_detail_type) &&
-    (strm << _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean 
-operator>> (TAO_InputCDR &strm, CORBA_ServiceDetail &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_detail_type) &&
-    (strm >> _tao_aggregate.service_detail)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean 
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceOption &_tao_sequence
-            )
-{
-  if (strm << _tao_sequence.length ())
-  {
-    // encode all elements
-    return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator>> (TAO_InputCDR &strm, 
-            CORBA_ServiceInformation::_tao_seq_ServiceOption &_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
-    return strm.read_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-  }
-  return 0; // error
-}
-
-CORBA::Boolean 
-operator<< (
-            TAO_OutputCDR &strm,
-            const CORBA_ServiceInformation::_tao_seq_ServiceDetail &_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_ServiceInformation::_tao_seq_ServiceDetail &_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_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.service_options) &&
-    (strm << _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, 
-                           CORBA_ServiceInformation &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.service_options) &&
-    (strm >> _tao_aggregate.service_details)
-  )
-    return 1;
-  else
-    return 0;
-  
-}
-
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
deleted file mode 100644
index 6c7ce1cb4d2..00000000000
--- a/TAO/tao/Services.h
+++ /dev/null
@@ -1,542 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Service_Detail.h
-//
-// = DESCRIPTION
-//
-//    Service_Detail stubs. This code generated by the The ACE ORB (TAO) IDL
-//    Compiler and was then hand crafted
-//
-// ============================================================================
-
-#ifndef TAO_SERVICES_H
-#define TAO_SERVICES_H
-
-#include "tao/Sequence.h"
-#include "tao/Sequence_T.h"
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-struct TAO_Export CORBA_ServiceDetail
-{
-  CORBA::ServiceDetailType service_detail_type;
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_
-  
-  // *************************************************************
-  // _tao_seq_Octet
-  // *************************************************************
-  
-  class  _tao_seq_Octet : public TAO_Unbounded_Sequence<CORBA::Octet>
-  {
-    public:
-      _tao_seq_Octet (void); // default ctor
-      _tao_seq_Octet (CORBA::ULong max); // uses max size
-      _tao_seq_Octet (
-                      CORBA::ULong max,
-                      CORBA::ULong length,
-                      CORBA::Octet *buffer,
-                      CORBA::Boolean release=0
-                      );
-      _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor
-      ~_tao_seq_Octet (void); // dtor
-      
-#if defined(TAO_NO_COPY_OCTET_SEQUENCES)
-      _tao_seq_Octet (
-                      CORBA::ULong length,
-                      const ACE_Message_Block* mb
-                      )
-        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
-#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
-    };
-
-  typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_
-  
-  // *************************************************************
-  // class CORBA::ServiceDetail::_tao_seq_Octet_var
-  // *************************************************************
-  
-  class  _tao_seq_Octet_var
-    {
-    public:
-      _tao_seq_Octet_var (void); // default constructor
-      _tao_seq_Octet_var (_tao_seq_Octet *);
-      _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor
-      ~_tao_seq_Octet_var (void); // destructor
-      
-      _tao_seq_Octet_var &operator= (_tao_seq_Octet *);
-      _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &);
-      _tao_seq_Octet *operator-> (void);
-      const _tao_seq_Octet *operator-> (void) const;
-      
-      operator const _tao_seq_Octet &() const;
-      operator _tao_seq_Octet &();
-      operator _tao_seq_Octet &() const;
-      CORBA::Octet &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_Octet &in (void) const;
-      _tao_seq_Octet &inout (void);
-      _tao_seq_Octet *&out (void);
-      _tao_seq_Octet *_retn (void);
-      _tao_seq_Octet *ptr (void) const;
-      
-    private:
-      _tao_seq_Octet *ptr_;
-    };
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___OUT_CH_
-
-    class  _tao_seq_Octet_out
-    {
-    public:
-      _tao_seq_Octet_out (_tao_seq_Octet *&);
-      _tao_seq_Octet_out (_tao_seq_Octet_var &);
-      _tao_seq_Octet_out (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (const _tao_seq_Octet_out &);
-      _tao_seq_Octet_out &operator= (_tao_seq_Octet *);
-      operator _tao_seq_Octet *&();
-      _tao_seq_Octet *&ptr (void);
-      _tao_seq_Octet *operator-> (void);
-      CORBA::Octet &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_Octet *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_Octet_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_Octet service_detail;
-};
-
-class  CORBA_ServiceDetail_var
-{
- public:
-  CORBA_ServiceDetail_var (void); // default constructor
-  CORBA_ServiceDetail_var (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var (const CORBA_ServiceDetail_var &); // copy constructor
-  ~CORBA_ServiceDetail_var (void); // destructor
-  
-  CORBA_ServiceDetail_var &operator= (CORBA_ServiceDetail *);
-  CORBA_ServiceDetail_var &operator= (const CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail *operator-> (void);
-  const CORBA_ServiceDetail *operator-> (void) const;
-  
-  operator const CORBA_ServiceDetail &() const;
-  operator CORBA_ServiceDetail &();
-  operator CORBA_ServiceDetail &() const;
-  // in, inout, out, _retn
-  const CORBA_ServiceDetail &in (void) const;
-  CORBA_ServiceDetail &inout (void);
-  CORBA_ServiceDetail *&out (void);
-  CORBA_ServiceDetail *_retn (void);
-  CORBA_ServiceDetail *ptr (void) const;
-  
- private:
-  CORBA_ServiceDetail *ptr_;
-};
-
-class  CORBA_ServiceDetail_out
-{
- public:
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail *&);
-  CORBA_ServiceDetail_out (CORBA_ServiceDetail_var &);
-  CORBA_ServiceDetail_out (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (const CORBA_ServiceDetail_out &);
-  CORBA_ServiceDetail_out &operator= (CORBA_ServiceDetail *);
-  operator CORBA_ServiceDetail *&();
-  CORBA_ServiceDetail *&ptr (void);
-  CORBA_ServiceDetail *operator-> (void);
-  
- private:
-  CORBA_ServiceDetail *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ServiceDetail_var &);
-};
-
-struct  CORBA_ServiceInformation
-{
-  
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-  
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA::ULong *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Dtor.
-      
-      // = Accessors.
-      CORBA::ULong &operator[] (CORBA::ULong i);
-      const CORBA::ULong &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA::ULong *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA::ULong *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA::ULong *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA::ULong *data,
-                    CORBA::Boolean release);
-    };
-  
-#endif /* end #if !defined */
-  
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_
-  
-  // *************************************************************
-  // _tao_seq_ServiceOption
-  // *************************************************************
-  
-  class  _tao_seq_ServiceOption : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA::ULong>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceOption (void); // default ctor
-      _tao_seq_ServiceOption (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceOption (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA::ULong *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceOption (const _tao_seq_ServiceOption &); // copy ctor
-      ~_tao_seq_ServiceOption (void); // dtor
-    };
-  typedef _tao_seq_ServiceOption *_tao_seq_ServiceOption_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceOption;
-  
-  
-#endif /* end #if !defined */
-  
-  
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_
-
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-  // *************************************************************
-  
-  class  _tao_seq_ServiceOption_var
-    {
-    public:
-      _tao_seq_ServiceOption_var (void); // default constructor
-      _tao_seq_ServiceOption_var (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var (const _tao_seq_ServiceOption_var &); // copy constructor
-      ~_tao_seq_ServiceOption_var (void); // destructor
-      _tao_seq_ServiceOption_var &operator= (_tao_seq_ServiceOption *);
-      _tao_seq_ServiceOption_var &operator= (const _tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption *operator-> (void);
-      const _tao_seq_ServiceOption *operator-> (void) const;
-      
-      operator const _tao_seq_ServiceOption &() const;
-      operator _tao_seq_ServiceOption &();
-      operator _tao_seq_ServiceOption &() const;
-      CORBA::ServiceOption &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceOption &in (void) const;
-      _tao_seq_ServiceOption &inout (void);
-      _tao_seq_ServiceOption *&out (void);
-      _tao_seq_ServiceOption *_retn (void);
-      _tao_seq_ServiceOption *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceOption *ptr_;
-    };
-  
-  
-#endif /* end #if !defined */
-  
-  
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_
-  
-  class  _tao_seq_ServiceOption_out
-    {
-    public:
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption *&);
-      _tao_seq_ServiceOption_out (_tao_seq_ServiceOption_var &);
-      _tao_seq_ServiceOption_out (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (const _tao_seq_ServiceOption_out &);
-      _tao_seq_ServiceOption_out &operator= (_tao_seq_ServiceOption *);
-      operator _tao_seq_ServiceOption *&();
-      _tao_seq_ServiceOption *&ptr (void);
-      _tao_seq_ServiceOption *operator-> (void);
-      CORBA::ServiceOption &operator[] (CORBA::ULong index);
-      
-    private:
-      _tao_seq_ServiceOption *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceOption_var &);
-    };
-  
-  
-#endif /* end #if !defined */
-  
-  _tao_seq_ServiceOption service_options;
-  
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-  
-  class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail : public TAO_Unbounded_Base_Sequence
-    {
-    public:
-      // = Initialization and termination methods.
-      
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Default constructor.
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-                                                                               CORBA::ULong length,
-                                                                               CORBA_ServiceDetail *data,
-                                                                               CORBA::Boolean release = 0);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail & rhs);
-      _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs);
-      virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Dtor.
-      // = Accessors.
-      CORBA_ServiceDetail &operator[] (CORBA::ULong i);
-      const CORBA_ServiceDetail &operator[] (CORBA::ULong i) const;
-      // = Static operations.
-      static CORBA_ServiceDetail *allocbuf (CORBA::ULong size);
-      static void freebuf (CORBA_ServiceDetail *buffer);
-      virtual void _allocate_buffer (CORBA::ULong length);
-      virtual void _deallocate_buffer (void);
-      // Implement the TAO_Base_Sequence methods (see Sequence.h)
-      
-      CORBA_ServiceDetail *get_buffer (CORBA::Boolean orphan = 0);
-      const CORBA_ServiceDetail *get_buffer (void) const;
-      void replace (CORBA::ULong max,
-                    CORBA::ULong length,
-                    CORBA_ServiceDetail *data,
-                    CORBA::Boolean release);
-    };
-  
-#endif /* end #if !defined */
-  
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-  
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_
-  
-  // *************************************************************
-  // _tao_seq_ServiceDetail
-  // *************************************************************
-  
-  class  _tao_seq_ServiceDetail : public
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
-  TAO_Unbounded_Sequence<CORBA_ServiceDetail>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-    {
-    public:
-      _tao_seq_ServiceDetail (void); // default ctor
-      _tao_seq_ServiceDetail (CORBA::ULong max); // uses max size
-      _tao_seq_ServiceDetail (
-                              CORBA::ULong max,
-                              CORBA::ULong length,
-                              CORBA_ServiceDetail *buffer,
-                              CORBA::Boolean release=0
-                              );
-      _tao_seq_ServiceDetail (const _tao_seq_ServiceDetail &); // copy ctor
-      ~_tao_seq_ServiceDetail (void); // dtor
-    };
-  typedef _tao_seq_ServiceDetail *_tao_seq_ServiceDetail_ptr;
-  static CORBA::TypeCode_ptr _tc__tao_seq_ServiceDetail;
-  
-  
-#endif /* end #if !defined */
-  
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_
-  
-  // *************************************************************
-  // class CORBA::ServiceInformation::_tao_seq_ServiceDetail_var
-  // *************************************************************
-  
-  class  _tao_seq_ServiceDetail_var
-    {
-    public:
-      _tao_seq_ServiceDetail_var (void); // default constructor
-      _tao_seq_ServiceDetail_var (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var (const _tao_seq_ServiceDetail_var &); // copy constructor
-      ~_tao_seq_ServiceDetail_var (void); // destructor
-
-      _tao_seq_ServiceDetail_var &operator= (_tao_seq_ServiceDetail *);
-      _tao_seq_ServiceDetail_var &operator= (const _tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail *operator-> (void);
-      const _tao_seq_ServiceDetail *operator-> (void) const;
-
-      operator const _tao_seq_ServiceDetail &() const;
-      operator _tao_seq_ServiceDetail &();
-      operator _tao_seq_ServiceDetail &() const;
-      CORBA_ServiceDetail &operator[] (CORBA::ULong index);
-      // in, inout, out, _retn
-      const _tao_seq_ServiceDetail &in (void) const;
-      _tao_seq_ServiceDetail &inout (void);
-      _tao_seq_ServiceDetail *&out (void);
-      _tao_seq_ServiceDetail *_retn (void);
-      _tao_seq_ServiceDetail *ptr (void) const;
-
-    private:
-      _tao_seq_ServiceDetail *ptr_;
-    };
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___OUT_CH_
-
-  class  _tao_seq_ServiceDetail_out
-    {
-    public:
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail *&);
-      _tao_seq_ServiceDetail_out (_tao_seq_ServiceDetail_var &);
-      _tao_seq_ServiceDetail_out (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (const _tao_seq_ServiceDetail_out &);
-      _tao_seq_ServiceDetail_out &operator= (_tao_seq_ServiceDetail *);
-      operator _tao_seq_ServiceDetail *&();
-      _tao_seq_ServiceDetail *&ptr (void);
-      _tao_seq_ServiceDetail *operator-> (void);
-      CORBA_ServiceDetail &operator[] (CORBA::ULong index);
-
-    private:
-      _tao_seq_ServiceDetail *&ptr_;
-      // assignment from T_var not allowed
-      void operator= (const _tao_seq_ServiceDetail_var &);
-    };
-
-
-#endif /* end #if !defined */
-
-    _tao_seq_ServiceDetail service_details;
-};
-
-
-class  CORBA_ServiceInformation_var
-{
- public:
-  CORBA_ServiceInformation_var (void); // default constructor
-  CORBA_ServiceInformation_var (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &); // copy constructor
-  ~CORBA_ServiceInformation_var (void); // destructor
-  
-  CORBA_ServiceInformation_var &operator= (CORBA_ServiceInformation *);
-  CORBA_ServiceInformation_var &operator= (const CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation *operator-> (void);
-  const CORBA_ServiceInformation *operator-> (void) const;
-  
-  operator const CORBA_ServiceInformation &() const;
-  operator CORBA_ServiceInformation &();
-  operator CORBA_ServiceInformation &() const;
-  // in, inout, out, _retn
-  const CORBA_ServiceInformation &in (void) const;
-  CORBA_ServiceInformation &inout (void);
-  CORBA_ServiceInformation *&out (void);
-  CORBA_ServiceInformation *_retn (void);
-  CORBA_ServiceInformation *ptr (void) const;
-  
- private:
-  CORBA_ServiceInformation *ptr_;
-};
-
-class  CORBA_ServiceInformation_out
-{
- public:
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation *&);
-  CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &);
-  CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (const CORBA_ServiceInformation_out &);
-  CORBA_ServiceInformation_out &operator= (CORBA_ServiceInformation *);
-  
-  operator CORBA_ServiceInformation *&();
-  CORBA_ServiceInformation *&ptr (void);
-  CORBA_ServiceInformation *operator-> (void);
-  
- private:
-  CORBA_ServiceInformation *&ptr_;
-  // assignment from T_var not allowed
-  void operator= (const CORBA_ServiceInformation_var &);
-};
-
-
-void  operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-void  operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&);
-void  operator<<= (CORBA::Any &, const CORBA_ServiceInformation &); // copying version
-void  operator<<= (CORBA::Any &, CORBA_ServiceInformation*); // noncopying version
-CORBA::Boolean  operator>>= (const CORBA::Any &, CORBA_ServiceInformation *&);
-
-#ifndef __ACE_INLINE__
-
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceDetail::_tao_seq_Octet &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceDetail::_tao_seq_Octet &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation &);
- //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceOption &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceOption &);
-CORBA::Boolean  operator<< (TAO_OutputCDR &, const CORBA_ServiceInformation::_tao_seq_ServiceDetail &); //
-CORBA::Boolean  operator>> (TAO_InputCDR &, CORBA_ServiceInformation::_tao_seq_ServiceDetail &);
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (__ACE_INLINE__)
-#include "Services.i"
-#endif /* defined INLINE */
-
-
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_SERVICES_H */
diff --git a/TAO/tao/Services.i b/TAO/tao/Services.i
deleted file mode 100644
index 5c52bc2ac61..00000000000
--- a/TAO/tao/Services.i
+++ /dev/null
@@ -1,1244 +0,0 @@
-//$Id$
-/* -*- C++ -*- */
-
-// ******  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
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail_var::CORBA_ServiceDetail_var ( CORBA_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::CORBA_ServiceDetail_var (const  CORBA_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new  CORBA_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_var::~CORBA_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= ( CORBA_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE  CORBA_ServiceDetail_var &
- CORBA_ServiceDetail_var::operator= (const  CORBA_ServiceDetail_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new  CORBA_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator const  CORBA_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
- CORBA_ServiceDetail_var::operator  CORBA_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail &
- CORBA_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE  CORBA_ServiceDetail *&
- CORBA_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::_retn (void)
-{
-   CORBA_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE  CORBA_ServiceDetail *
- CORBA_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out ( CORBA_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
- CORBA_ServiceDetail_out::CORBA_ServiceDetail_out (const  CORBA_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE  CORBA_ServiceDetail_out &
- CORBA_ServiceDetail_out::operator= (const  CORBA_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail_out &
-CORBA_ServiceDetail_out::operator= (CORBA_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail_out::operator CORBA_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *&
-CORBA_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail *
-CORBA_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_)
-#define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (CORBA_ServiceDetail::_tao_seq_Octet *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::_tao_seq_Octet_var (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_var::~_tao_seq_Octet_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_var &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceDetail::_tao_seq_Octet (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator const CORBA_ServiceDetail::_tao_seq_Octet &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator CORBA_ServiceDetail::_tao_seq_Octet &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::_retn (void)
-{
-  CORBA_ServiceDetail::_tao_seq_Octet *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceDetail::_tao_seq_Octet_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (CORBA_ServiceDetail::_tao_seq_Octet_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceDetail::_tao_seq_Octet_out::_tao_seq_Octet_out (const CORBA_ServiceDetail::_tao_seq_Octet_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (const CORBA_ServiceDetail::_tao_seq_Octet_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceDetail::_tao_seq_Octet_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet_out &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator= (CORBA_ServiceDetail::_tao_seq_Octet *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator CORBA_ServiceDetail::_tao_seq_Octet *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *&
-CORBA_ServiceDetail::_tao_seq_Octet_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail::_tao_seq_Octet *
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Octet &
-CORBA_ServiceDetail::_tao_seq_Octet_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (CORBA_ServiceInformation *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_var::~CORBA_ServiceInformation_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (CORBA_ServiceInformation *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_var &
-CORBA_ServiceInformation_var::operator= (const CORBA_ServiceInformation_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator const CORBA_ServiceInformation &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_var::operator CORBA_ServiceInformation &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation &
-CORBA_ServiceInformation_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::_retn (void)
-{
-  CORBA_ServiceInformation *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (CORBA_ServiceInformation_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation_out::CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (const CORBA_ServiceInformation_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation_out &
-CORBA_ServiceInformation_out::operator= (CORBA_ServiceInformation *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation_out::operator CORBA_ServiceInformation *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *&
-CORBA_ServiceInformation_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation *
-CORBA_ServiceInformation_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-  
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA::ULong[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (CORBA::ULong *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA::ULong *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA::ULong *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->maximum_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA::ULong *tmp = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA::ULong *tmp1 = ACE_reinterpret_cast (CORBA::ULong *, this->buffer_);
-    CORBA::ULong * const tmp2 = ACE_reinterpret_cast (CORBA::ULong * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong* tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA::ULong &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA::ULong * const tmp = ACE_reinterpret_cast (CORBA::ULong* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA::ULong *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA::ULong*, 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::ULong*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA::ULong *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA::ULong * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA::ULong *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA::ULong *tmp = ACE_reinterpret_cast(CORBA::ULong*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CI_
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceOption_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_tao_seq_ServiceOption_var (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::~_tao_seq_ServiceOption_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_var &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceOption (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceOption &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator CORBA_ServiceInformation::_tao_seq_ServiceOption &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceOption *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceOption_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (CORBA_ServiceInformation::_tao_seq_ServiceOption_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::_tao_seq_ServiceOption_out (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceOption_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceOption_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption_out &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceOption *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator CORBA_ServiceInformation::_tao_seq_ServiceOption *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *&
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceOption *
-CORBA_ServiceInformation::_tao_seq_ServiceOption_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::ServiceOption &
-CORBA_ServiceInformation::_tao_seq_ServiceOption_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_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-  // = Static operations.
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (CORBA::ULong size)
-  // Allocate storage for the sequence.
-  {
-    return new CORBA_ServiceDetail[size];
-  }
-  
-  ACE_INLINE void CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (CORBA::ServiceDetail *buffer)
-  // Free the sequence.
-  {
-    delete [] buffer;
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void) // Default constructor.
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum) // Constructor using a maximum length value.
-    : TAO_Unbounded_Base_Sequence (maximum, CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (maximum))
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum,
-    CORBA::ULong length,
-    CORBA_ServiceDetail *data,
-    CORBA::Boolean release)
-  : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
-  {
-  }
-  
-  ACE_INLINE
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Copy constructor.
-    : TAO_Unbounded_Base_Sequence (rhs)
-  {
-    CORBA_ServiceDetail *tmp1 = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->maximum_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    this->buffer_ = tmp1;
-  }
-  
-  ACE_INLINE CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator= (const CORBA::ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail &rhs)
-  // Assignment operator.
-  {
-    if (this == &rhs)
-      return *this;
-    
-    if (this->release_)
-    {
-      if (this->maximum_ < rhs.maximum_)
-      {
-        // free the old buffer
-        CORBA_ServiceDetail *tmp = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-        CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-        this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-      }
-    }
-    else
-      this->buffer_ = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (rhs.maximum_);
-    
-    TAO_Unbounded_Base_Sequence::operator= (rhs);
-    
-    CORBA_ServiceDetail *tmp1 = ACE_reinterpret_cast (CORBA_ServiceDetail *, this->buffer_);
-    CORBA_ServiceDetail * const tmp2 = ACE_reinterpret_cast (CORBA_ServiceDetail * ACE_CAST_CONST, rhs.buffer_);
-    
-    for (CORBA::ULong i = 0; i < this->length_; ++i)
-      tmp1[i] = tmp2[i];
-    
-    return *this;
-  }
-  
-  // = Accessors.
-  ACE_INLINE CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i)
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail* tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-    return tmp[i];
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail &
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::operator[] (CORBA::ULong i) const
-  // operator []
-  {
-    ACE_ASSERT (i < this->maximum_);
-    CORBA_ServiceDetail * const tmp = ACE_reinterpret_cast (CORBA_ServiceDetail* ACE_CAST_CONST, this->buffer_);
-    return tmp[i];
-  }
-  
-  // Implement the TAO_Base_Sequence methods (see Sequence.h)
-  
-  ACE_INLINE CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (CORBA::Boolean orphan)
-  {
-    CORBA_ServiceDetail *result = 0;
-    if (orphan == 0)
-    {
-      // We retain ownership.
-      if (this->buffer_ == 0)
-      {
-        result = CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::allocbuf (this->length_);
-        this->buffer_ = result;
-      }
-      else
-      {
-        result = ACE_reinterpret_cast (CORBA_ServiceDetail*, 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_ServiceDetail*,this->buffer_);
-        this->maximum_ = 0;
-        this->length_ = 0;
-        this->buffer_ = 0;
-        this->release_ = 0;
-      }
-    }
-    return result;
-  }
-  
-  ACE_INLINE const CORBA_ServiceDetail *
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::get_buffer (void) const
-  {
-    return ACE_reinterpret_cast(const CORBA_ServiceDetail * ACE_CAST_CONST, this->buffer_);
-  }
-  
-  ACE_INLINE void
-  CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::replace (CORBA::ULong max,
-  CORBA::ULong length,
-  CORBA_ServiceDetail *data,
-  CORBA::Boolean release)
-  {
-    this->maximum_ = max;
-    this->length_ = length;
-    if (this->buffer_ && this->release_ == 1)
-    {
-      CORBA_ServiceDetail *tmp = ACE_reinterpret_cast(CORBA_ServiceDetail*,this->buffer_);
-      CORBA_ServiceInformation::_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail::freebuf (tmp);
-    }
-    this->buffer_ = data;
-    this->release_ = release;
-  }
-  
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-
-#if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_)
-#define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CI_
-
-// *************************************************************
-// Inline operations for class CORBA_ServiceInformation::_tao_seq_ServiceDetail_var
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_tao_seq_ServiceDetail_var (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::~_tao_seq_ServiceDetail_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // deep copy
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new CORBA_ServiceInformation::_tao_seq_ServiceDetail (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator const CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() // cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail &() const// cast 
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-ACE_INLINE const CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for variable size 
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::_retn (void)
-{
-  CORBA_ServiceInformation::_tao_seq_ServiceDetail *tmp = this->ptr_;
-  this->ptr_ = 0;
-  return tmp;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::ServiceInformation::_tao_seq_ServiceDetail_out
-// *************************************************************
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail *&p)
-  : ptr_ (p)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (CORBA_ServiceInformation::_tao_seq_ServiceDetail_var &p) // constructor from _var
-  : ptr_ (p.out ())
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::_tao_seq_ServiceDetail_out (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p) // copy constructor
-  : ptr_ (ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_)
-{}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (const CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &p)
-{
-  this->ptr_ = ACE_const_cast (CORBA_ServiceInformation::_tao_seq_ServiceDetail_out&,p).ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail_out &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator= (CORBA_ServiceInformation::_tao_seq_ServiceDetail *p)
-{
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE 
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator CORBA_ServiceInformation::_tao_seq_ServiceDetail *&() // cast
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *&
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::ptr (void) // ptr
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceInformation::_tao_seq_ServiceDetail *
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA_ServiceDetail &
-CORBA_ServiceInformation::_tao_seq_ServiceDetail_out::operator[] (CORBA::ULong index)
-{
-  return this->ptr_->operator[] (index);
-}
-
-
-#endif /* end #if !defined */
-
diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp
index 084243fcc68..8731c9c28c9 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -19,7 +19,6 @@
 #include "tao/Invocation.h"
 #include "tao/ORB_Core.h"
 #include "tao/Client_Strategy_Factory.h"
-#include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Stub.i"
@@ -27,72 +26,126 @@
 
 #include "tao/Timeprobe.h"
 
-ACE_RCSID(tao, TAO_Stub, "$Id$")
+ACE_RCSID(tao, STUB_Object, "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char *TAO_TAO_Stub_Timeprobe_Description[] =
-  {
-    "TAO_Stub::do_static_call - start",
-    "TAO_Stub::do_static_call - end",
-    "TAO_Stub::do_static_call - set_cancel",
-    "TAO_Stub::do_static_call - grab_orb_core",
-    "TAO_Stub::do_static_call - invocation_ctor",
-    "TAO_Stub::do_static_call - invocation_start",
-    "TAO_Stub::do_static_call - put_params"
-  };
+static const char *TAO_STUB_Object_Timeprobe_Description[] =
+{
+  "STUB_Object::do_static_call - start",
+  "STUB_Object::do_static_call - end",
+  "STUB_Object::do_static_call - set_cancel",
+  "STUB_Object::do_static_call - grab_orb_core",
+  "STUB_Object::do_static_call - invocation_ctor",
+  "STUB_Object::do_static_call - invocation_start",
+  "STUB_Object::do_static_call - put_params"
+};
 
 enum
-  {
-    // Timeprobe description table start key
-    TAO_STUB_OBJECT_DO_STATIC_CALL_START = 500,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_END,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_SET_CANCEL,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_GRAB_ORB_CORE,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START,
-    TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS
-  };
+{
+  // Timeprobe description table start key
+  TAO_STUB_OBJECT_DO_STATIC_CALL_START = 500,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_END,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_SET_CANCEL,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_GRAB_ORB_CORE,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START,
+  TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS
+};
 
 // Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_TAO_Stub_Timeprobe_Description,
+ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_STUB_Object_Timeprobe_Description,
                                   TAO_STUB_OBJECT_DO_STATIC_CALL_START);
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-TAO_Stub::TAO_Stub (char *repository_id,
-                    const TAO_MProfile &profiles,
-                    TAO_ORB_Core* orb_core)
+STUB_Object::STUB_Object (char *repository_id,
+                          TAO_MProfile &profiles)
   : type_id (repository_id),
     base_profiles_ ((CORBA::ULong) 0),
-    forward_profiles_ (0),
+    fwd_profiles_ (0),
     profile_in_use_ (0),
+    fwd_profile_ (0),
     profile_lock_ptr_ (0),
-    profile_success_ (0),
+    fwd_profile_success_ (0),
     // what about ACE_SYNCH_MUTEX refcount_lock_
     refcount_ (1),
     use_locate_request_ (0),
-    first_locate_request_ (0),
-    orb_core_ (orb_core)
-#if defined (TAO_HAS_CORBA_MESSAGING)
-    , policies_ (0)
-#endif /* TAO_HAS_CORBA_MESSAGING */
+    first_locate_request_ (0)
 {
-  if (this->orb_core_ == 0)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "TAO: (%P|%t) TAO_Stub created with default "
-                      "ORB core\n"));
-        }
-      this->orb_core_ = TAO_ORB_Core_instance ();
-    }
 
-  this->profile_lock_ptr_ =
-    this->orb_core_->client_factory ()->create_iiop_profile_lock ();
+  this->profile_lock_ptr_ =  
+    TAO_ORB_Core_instance ()->client_factory ()->create_iiop_profile_lock ();  
+
+  set_profiles (&profiles);
+}
+
+STUB_Object::STUB_Object (char *repository_id,
+                          TAO_Profile *profile)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    fwd_profiles_ (0),
+    profile_in_use_ (0),
+    fwd_profile_ (0),
+    profile_lock_ptr_ (0),
+    fwd_profile_success_ (0),
+    // what about ACE_SYNCH_MUTEX refcount_lock_
+    refcount_ (1),
+    use_locate_request_ (0),
+    first_locate_request_ (0)
+{
+  // @@ XXX need to verify type and deal with wrong types
+
+  this->profile_lock_ptr_ =  
+    TAO_ORB_Core_instance ()->client_factory ()->create_iiop_profile_lock ();  
+
+  base_profiles_.set (1);
+  
+  base_profiles_.add_profile (profile);
+  
+  this->set_profile_in_use_i (this->base_profiles_.get_next ());  
 
-  this->set_base_profiles (profiles);
+}
+
+STUB_Object::STUB_Object (char *repository_id,
+                          TAO_MProfile *profiles)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    fwd_profiles_ (0),
+    profile_in_use_ (0),
+    fwd_profile_ (0),
+    profile_lock_ptr_ (0),
+    fwd_profile_success_ (0),
+    // what about ACE_SYNCH_MUTEX refcount_lock_
+    refcount_ (1),
+    use_locate_request_ (0),
+    first_locate_request_ (0)
+{
+  // @@ XXX need to verify type and deal with wrong types
+
+  // @@ does this need to be freed?
+  this->profile_lock_ptr_ =  
+    TAO_ORB_Core_instance ()->client_factory ()->create_iiop_profile_lock ();  
+
+  set_profiles (profiles);
+
+}
+
+STUB_Object::STUB_Object (char *repository_id)
+  : type_id (repository_id),
+    base_profiles_ ((CORBA::ULong) 0),
+    fwd_profiles_ (0),
+    profile_in_use_ (0),
+    fwd_profile_ (0),
+    profile_lock_ptr_ (0),
+    fwd_profile_success_ (0),
+    // what about ACE_SYNCH_MUTEX refcount_lock_
+    refcount_ (1),
+    use_locate_request_ (0),
+    first_locate_request_ (0)
+{
+  this->profile_lock_ptr_ = 
+    TAO_ORB_Core_instance ()->client_factory ()->create_iiop_profile_lock ();  
 }
 
 // Quick'n'dirty hash of objref data, for partitioning objrefs into
@@ -103,8 +156,8 @@ TAO_Stub::TAO_Stub (char *repository_id,
 // @@ Use all profiles for hash function!!!!!  FRED
 //    can get different values, depending on the profile_in_use!!
 CORBA::ULong
-TAO_Stub::hash (CORBA::ULong max,
-                CORBA::Environment &env)
+STUB_Object::hash (CORBA::ULong max,
+                   CORBA::Environment &env)
 {
   // we rely on the profile object to has it's address info
   if (profile_in_use_)
@@ -112,6 +165,27 @@ TAO_Stub::hash (CORBA::ULong max,
   ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) hash called on a null profile!\n"), 0);
 }
 
+int operator==(const TAO_opaque& rhs,
+               const TAO_opaque& lhs)
+{
+  if (rhs.length () != lhs.length ())
+    return 0;
+
+  for (CORBA::ULong i = 0;
+       i < rhs.length ();
+       ++i)
+    if (rhs[i] != lhs[i])
+      return 0;
+
+  return 1;
+}
+
+int operator!=(const TAO_opaque& rhs,
+               const TAO_opaque& lhs)
+{
+  return !(rhs == lhs);
+}
+
 // Expensive comparison of objref data, to see if two objrefs
 // certainly point at the same object. (It's quite OK for this to
 // return FALSE, and yet have the two objrefs really point to the same
@@ -120,26 +194,28 @@ TAO_Stub::hash (CORBA::ULong max,
 // NOTE that this must NOT go across the network!
 // @@ Two object references are the same if any two profiles are the same!
 CORBA::Boolean
-TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj,
-                         CORBA::Environment &env)
+STUB_Object::is_equivalent (CORBA::Object_ptr other_obj,
+                            CORBA::Environment &env)
 {
   if (CORBA::is_nil (other_obj) == 1)
     return 0;
 
-  TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_;
-  TAO_Profile *this_profile = this->profile_in_use_;
+  STUB_Object *other_iiop_obj =
+    ACE_dynamic_cast (STUB_Object*, other_obj->_stubobj ());
+  if (other_iiop_obj == 0)
+    return 0;
 
-  if (other_profile == 0 || this_profile == 0)
+  if (! this->profile_in_use_ || ! other_iiop_obj->profile_in_use_ )
     return 0;
 
   // Compare the profiles
-  return this_profile->is_equivalent (other_profile, env);
+  return this->profile_in_use_->is_equivalent (other_iiop_obj->profile_in_use_, env);
 }
 
 // Memory managment
 
 CORBA::ULong
-TAO_Stub::_incr_refcnt (void)
+STUB_Object::_incr_refcnt (void)
 {
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
 
@@ -147,7 +223,7 @@ TAO_Stub::_incr_refcnt (void)
 }
 
 CORBA::ULong
-TAO_Stub::_decr_refcnt (void)
+STUB_Object::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0);
@@ -224,7 +300,7 @@ private:
 // which does all the work.
 
 void
-TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
+STUB_Object::do_static_call (CORBA::Environment &TAO_IN_ENV,
                              const TAO_Call_Data *info,
                              void** args)
 
@@ -235,32 +311,35 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
 
   ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_SET_CANCEL);
 
+  TAO_ORB_Core* orb_core = TAO_ORB_Core_instance ();
+
   ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_GRAB_ORB_CORE);
 
+  TAO_GIOP_ReplyStatusType status = TAO_GIOP_NO_EXCEPTION;
+
   // Do a locate_request if necessary/wanted.
   // Suspect that you will be forwarded, so be proactive!
   // strategy for reducing overhead when you think a request will
   // be forwarded.  No standard way now to know.
   if (this->use_locate_request_ && this->first_locate_request_)
     {
-      TAO_GIOP_Locate_Request_Invocation call (this,
-                                               this->orb_core_);
+      TAO_GIOP_Locate_Request_Invocation call (this, orb_core);
 
       // Simply let these exceptions propagate up
       // (if any of them occurs.)
-      call.start (ACE_TRY_ENV);
-      ACE_CHECK;
+      call.start (TAO_IN_ENV);
 
-      call.invoke (ACE_TRY_ENV);
-      ACE_CHECK;
+      status = call.invoke (TAO_IN_ENV);
 
       this->first_locate_request_ = 0;
+
+      if (status == TAO_GIOP_SYSTEM_EXCEPTION)
+        return;
     }
 
   if (info->is_roundtrip)
     {
-      TAO_GIOP_Twoway_Invocation call (this, info->opname,
-                                       this->orb_core_);
+      TAO_GIOP_Twoway_Invocation call (this, info->opname, orb_core);
       ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR);
 
       // We may need to loop through here more than once if we're
@@ -278,146 +357,232 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV,
       //
       for (;;)
         {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START);
-
-          // Make the call ... blocking for the response.
-          this->put_params (ACE_TRY_ENV, info, call, args);
-          ACE_CHECK;
-
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
-
-          int status =
-            call.invoke (info->excepts,
-                         info->except_count,
-                         ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
+          // Start the call by constructing the request message header.
+          TAO_TRY_VAR_EX (TAO_IN_ENV, SYSEX1)
+            {
+              call.start (TAO_IN_ENV);
+              TAO_CHECK_ENV_EX (SYSEX1);
 
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
+              ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START);
+            }
+          TAO_CATCH (CORBA_SystemException, ex)
+            {
+              ACE_MT (ACE_GUARD (ACE_Lock,
+                                guard,
+                                *this->profile_lock_ptr_));
 
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              // If this is the fwd_profile, then check to see if we
+              // need to go back to the original profile and try that.
+              if (this->fwd_profile_ != 0)
+                {
+		  this->set_fwd_profile (0);
 
-          // The only case left is status == TAO_INVOKE_OK, exit the
-          // loop.  We cannot retry because at this point we either
-          // got a reply or something with an status of
-          // COMPLETED_MAYBE, thus we cannot reissue the request if we
-          // are to satisfy the "at most once" semantics.
-          break;
-        }
+                  // See if we need to try again.
+                  if (this->fwd_profile_success_ == 1)
+                    {
+                      this->fwd_profile_success_ = 0;
+                      TAO_IN_ENV.clear ();
+                      TAO_GOTO (roundtrip_continue_label);
+                    }
+                }
+              TAO_RETHROW_SAME_ENV_RETURN_VOID;
+            }
+          TAO_ENDTRY;
 
-      // Now, get all the "return", "out", and "inout" parameters
-      // from the response message body ... return parameter is
-      // first, the rest are in the order defined in the IDL spec
-      // (which is also the order that DII users are required to
-      // use).
+          this->put_params (TAO_IN_ENV, info, call, args);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
 
-      const TAO_Param_Data *pdp = info->params;
-      for (void** i = args;
-           i !=  args + info->param_count;
-           i++, pdp++)
-        {
-          void *ptr = *i;
+          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
 
-          // if it is an inout parameter, it would become
-          // necessary to first release the "in" memory
-          if (pdp->mode == PARAM_INOUT)
+          TAO_TRY_VAR_EX (TAO_IN_ENV, SYSEX2)
+            {
+              status = call.invoke (info->excepts, info->except_count, TAO_IN_ENV);
+              TAO_CHECK_ENV_EX (SYSEX2);
+            }
+          TAO_CATCH (CORBA_SystemException, ex)
             {
-              // @@ TODO - add others as we test each case
-              // (ASG) will do 03/22/98.
-              // @@ IMHO this should be handled in the stub
-              // (coryan)
-              switch (pdp->tc->kind (TAO_IN_ENV))
+              ACE_MT (ACE_GUARD (ACE_Lock,
+                                guard,
+                                *this->profile_lock_ptr_));
+
+              // If this is the fwd_profile, then check to see if we
+              // need to go back to the original profile and try that.
+              if (this->fwd_profile_ != 0)
                 {
-                case CORBA::tk_string:
-                  {
-                    CORBA::string_free (*(char **)ptr);
-                    *(char **)ptr = 0;
-                  }
-                  break;
-                default:
-                  break;
+		  this->set_fwd_profile (0);
+
+                  // See if we need to try again.
+                  if (this->fwd_profile_success_ == 1)
+                    {
+                      this->fwd_profile_success_ = 0;
+                      TAO_IN_ENV.clear ();
+                      TAO_GOTO (roundtrip_continue_label);
+                    }
                 }
+              TAO_RETHROW_SAME_ENV_RETURN_VOID;
             }
+          TAO_ENDTRY;
 
-          if (pdp->mode == PARAM_RETURN
-              || pdp->mode == PARAM_OUT
-              || pdp->mode == PARAM_INOUT)
+          if (status == TAO_GIOP_USER_EXCEPTION)
+            return;
+          else if (status == TAO_GIOP_NO_EXCEPTION)
             {
-              // The language mapping's memory allocation
-              // policy says that some data is heap-allocated.
-              // This interpreter is told about the relevant
-              // policy by whoever built the operation
-              // description (e.g. the IDL compiler) so it
-              // doesn't have to know the policy associated
-              // with a particular language binding
-              // (e.g. C/C++ differ, and C++ even has
-              // different policies for different kinds of
-              // structures).
-              if (pdp->value_size == 0)
+              // @@ DB: and lock this
+              // @@ FRED - make a request and it fails first time
+              //    then fail.  Otherwise, go back to first profile
+              //    and start again!
+              if (this->fwd_profile_ != 0)
+                this->fwd_profile_success_ = 1;
+
+              // Now, get all the "return", "out", and "inout"
+              // parameters from the response message body.
+
+              const TAO_Param_Data *pdp = info->params;
+              for (void** i = args;
+                   i !=  args + info->param_count;
+                   i++, pdp++)
                 {
-                  call.get_value (pdp->tc, ptr, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-              else
-                {
-                  // @@ (ASG) -  I think we must completely
-                  // get rid of this case because IDL compiler
-                  // generated stubs will use this function
-                  // and they better allocate all the memory.
-
-                  // assert (value_size == tc->size());
-                  *(void **)ptr = new CORBA::Octet [pdp->value_size];
-                  call.get_value (pdp->tc, *(void **)ptr, ACE_TRY_ENV);
-                  ACE_CHECK;
+                  void *ptr = *i;
+
+                  // if it is an inout parameter, it would become
+                  // necessary to first release the "in" memory
+                  if (pdp->mode == PARAM_INOUT)
+                    {
+                      // @@ TODO - add others as we test each case
+                      // (ASG) will do 03/22/98.
+                      // @@ IMHO this should be handled in the stub
+                      // (coryan)
+                      switch (pdp->tc->kind (TAO_IN_ENV))
+                        {
+                        case CORBA::tk_string:
+                          {
+                            CORBA::string_free (*(char **)ptr);
+                            *(char **)ptr = 0;
+                          }
+                        break;
+                        default:
+                          break;
+                        }
+                    }
+                  if (pdp->mode == PARAM_RETURN
+                      || pdp->mode == PARAM_OUT
+                      || pdp->mode == PARAM_INOUT)
+                    {
+                      // The language mapping's memory allocation
+                      // policy says that some data is heap-allocated.
+                      // This interpreter is told about the relevant
+                      // policy by whoever built the operation
+                      // description (e.g. the IDL compiler) so it
+                      // doesn't have to know the policy associated
+                      // with a particular language binding
+                      // (e.g. C/C++ differ, and C++ even has
+                      // different policies for different kinds of
+                      // structures).
+                      if (pdp->value_size == 0)
+                        call.get_value (pdp->tc, ptr, TAO_IN_ENV);
+                      else
+                        {
+                          // @@ (ASG) -  I think we must completely
+                          // get rid of this case because IDL compiler
+                          // generated stubs will use this function
+                          // and they better allocate all the memory.
+
+                          // assert (value_size == tc->size());
+                          *(void **)ptr = new CORBA::Octet [pdp->value_size];
+                          call.get_value (pdp->tc, *(void **)ptr, TAO_IN_ENV);
+                        }
+
+                      if (TAO_IN_ENV.exception ())
+                        {
+                          TAO_IN_ENV.print_exception ("do_static_call, get reply parameter");
+                          return;
+                        }
+                    }
                 }
+              return;
+            }
+          // ... or maybe this request got forwarded to someplace
+          // else; send the request there instead.
+          if (status != TAO_GIOP_LOCATION_FORWARD)
+            {
+              // @@ What is the right exception to throw in this case?
+              // TRANSIENT - FRED
+              TAO_IN_ENV.exception (new CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE));
+              return;
             }
+          TAO_LABEL (roundtrip_continue_label);
         }
-    } // if (two way)
+    }
   else
     {
-      TAO_GIOP_Oneway_Invocation call (this, info->opname,
-                                       this->orb_core_);
-      ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR);
-
       for (;;)
         {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
+          TAO_GIOP_Oneway_Invocation call (this, info->opname, orb_core);
+          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_CTOR);
 
-          this->put_params (ACE_TRY_ENV, info, call, args);
-          ACE_CHECK;
+          // Start the call by constructing the request message header.
+          TAO_TRY_VAR_EX (TAO_IN_ENV, SYSEX3)
+            {
+              call.start (TAO_IN_ENV);
+              TAO_CHECK_ENV_EX (SYSEX3);
+              ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_INVOCATION_START);
+            }
+          TAO_CATCH (CORBA_SystemException, ex)
+            {
+              ACE_MT (ACE_GUARD (ACE_Lock,
+                                guard,
+	                                *this->profile_lock_ptr_));
 
-          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
-          int status = call.invoke (ACE_TRY_ENV);
-          ACE_CHECK;
+              // If this is the fwd_profile, then check to see if we
+              // need to go back to the original profile and try that.
+              if (this->fwd_profile_ != 0)
+                {
+		  this->set_fwd_profile (0);
 
-          if (status == TAO_INVOKE_RESTART)
-            continue;
+                  // See if we need to try again.
+                  if (this->fwd_profile_success_ == 1)
+                    {
+                      this->fwd_profile_success_ = 0;
+                      TAO_IN_ENV.clear ();
+                      TAO_GOTO (oneway_continue_label);
+                    }
+                }
+              TAO_RETHROW_SAME_ENV_RETURN_VOID;
+            }
+          TAO_ENDTRY;
 
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
+          this->put_params (TAO_IN_ENV, info, call, args);
+          TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV);
+
+          ACE_TIMEPROBE (TAO_STUB_OBJECT_DO_STATIC_CALL_PUT_PARAMS);
+          /* TAO_GIOP_ReplyStatusType status = */ call.invoke (TAO_IN_ENV);
 
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          // @@ and lock this
+          if (this->fwd_profile_ != 0)
+            this->fwd_profile_success_ = 1;
 
-          break;
+          // @@ TODO We do not get any LOCATION_FORWARD in this case,
+          // IMHO this is a good case for use of a LocateRequest,
+          // under some strategy control, of course. In that case we need
+          // a loop, as above.
+          return;
         }
+      TAO_LABEL (oneway_continue_label);
     }
 }
 
 void
-TAO_Stub::put_params (CORBA::Environment &ACE_TRY_ENV,
+STUB_Object::put_params (CORBA::Environment &env,
                          const TAO_Call_Data *info,
                          TAO_GIOP_Invocation &call,
                          void** args)
 {
+  if (env.exception ())
+    {
+      env.print_exception ("do_static_call, start request message");
+      return;
+    }
+
   // Now, put all "in" and "inout" parameters into the request
   // message body.
   //
@@ -435,283 +600,239 @@ TAO_Stub::put_params (CORBA::Environment &ACE_TRY_ENV,
       void *ptr = *i;
 
       if (pdp->mode == PARAM_IN)
-        {
-          call.put_param (pdp->tc, ptr, ACE_TRY_ENV);
-        }
+        call.put_param (pdp->tc, ptr, env);
       else if (pdp->mode == PARAM_INOUT)
         {
           if (pdp->value_size == 0)
-            call.put_param (pdp->tc, ptr, ACE_TRY_ENV);
+            call.put_param (pdp->tc, ptr, env);
           else
-            call.put_param (pdp->tc, *(void **)ptr, ACE_TRY_ENV);
+            call.put_param (pdp->tc, *(void **)ptr, env);
+        }
+      if (env.exception ())
+        {
+          env.print_exception ("do_static_call, put request parameter");
+          return;
         }
-      ACE_CHECK;
     }
 }
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
 // DII analogue of the above.
 
 void
-TAO_Stub::do_dynamic_call (const char *opname,
+STUB_Object::do_dynamic_call (const char *opname,
                               CORBA::Boolean is_roundtrip,
                               CORBA::NVList_ptr args,
                               CORBA::NamedValue_ptr result,
                               CORBA::Flags,
                               CORBA::ExceptionList &exceptions,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   TAO_Synchronous_Cancellation_Required NOT_USED;
 
-  // Do a locate_request if necessary/wanted.
-  // Suspect that you will be forwarded, so be proactive!
-  // strategy for reducing overhead when you think a request will
-  // be forwarded.  No standard way now to know.
-  if (this->use_locate_request_ && this->first_locate_request_)
-    {
-      TAO_GIOP_Locate_Request_Invocation call (this, this->orb_core_);
-
-      // Simply let these exceptions propagate up
-      // (if any of them occurs.)
-      call.start (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      call.invoke (ACE_TRY_ENV);
-      ACE_CHECK;
-
-      this->first_locate_request_ = 0;
-    }
-
+  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
   if (is_roundtrip)
     {
-      TAO_GIOP_Twoway_Invocation call (this, opname, this->orb_core_);
+      TAO_GIOP_Twoway_Invocation call (this, opname, orb_core);
 
       // Loop as needed for forwarding; see above.
 
       for (;;)
         {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
+          call.start (env);
+          if (env.exception () != 0) return;
 
-          this->put_params (call, args, ACE_TRY_ENV);
-          ACE_CHECK;
+          this->put_params (call, args, env);
+          if (env.exception () != 0) return;
 
           // Make the call ... blocking for the response.
-          int status =
-            call.invoke (exceptions, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          // The only case left is status == TAO_INVOKE_OK, exit the
-          // loop.  We cannot retry because at this point we either
-          // got a reply or something with an status of
-          // COMPLETED_MAYBE, thus we cannot reissue the request if we
-          // are to satisfy the "at most once" semantics.
-          break;
-        }
+          TAO_GIOP_ReplyStatusType status =
+            call.invoke (exceptions, env);
+          if (env.exception ())
+            {
+              env.print_exception ("do_dynamic_call, invoke");
+              return;
+            }
+          if (status == TAO_GIOP_SYSTEM_EXCEPTION
+              || status == TAO_GIOP_USER_EXCEPTION)
+            return;
 
-      // Now, get all the "return", "out", and "inout" parameters
-      // from the response message body ... return parameter is
-      // first, the rest are in the order defined in the IDL spec
-      // (which is also the order that DII users are required to
-      // use).
+          // Now, get all the "return", "out", and "inout" parameters
+          // from the response message body ... return parameter is
+          // first, the rest are in the order defined in the IDL spec
+          // (which is also the order that DII users are required to
+          // use).
 
-      if (result != 0)
-        {
+          if (status == TAO_GIOP_NO_EXCEPTION)
+            {
+              if (result != 0)
+                {
 #if 0
-          // @@ (ASG) I need to look into this OUT_LIST_MEMORY stuff
-          // (4/21/98).
-          // @@ (Carlos) All this code seems bogus, we know that
-          //    allocating memory of behalf of the user is and endless
-          //    source of trouble (due to vtbls and the such).
+                  // @@ (ASG) I need to look into this OUT_LIST_MEMORY stuff
+                  // (4/21/98).
 
-          // If caller didn't set OUT_LIST_MEMORY flag, allocate
-          // memory for return value ...
+                  // If caller didn't set OUT_LIST_MEMORY flag, allocate
+                  // memory for return value ...
 
-          if (!(flags & CORBA::OUT_LIST_MEMORY))
-            {
-              CORBA::TypeCode_var tcp = result->value ()->type ();
-              size_t size = tcp->size (ACE_TRY_ENV);
-              ACE_CHECK;
+                  if (!(flags & CORBA::OUT_LIST_MEMORY))
+                    {
+                      CORBA::TypeCode_var tcp = result->value ()->type ();
+                      size_t size = tcp->size (env);
+                      env.print_exception ("do_dynamic_call, get result size");
 
-              if (size != 0)
-                {
-                  void *ptr = new CORBA::Octet [size];
+                      if (size != 0)
+                        {
+                          void *ptr = new CORBA::Octet [size];
 
-                  result->value ()->replace (tcp.in (), ptr, 1, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
-            }
+                          result->value ()->replace (tcp.in (), ptr,
+                                                     1, env);
+                          env.print_exception ("do_dynamic_call, set result mem");
+                        }
+                    }
 #endif
-          if (!result->value ()->value_)
-            {
-              // storage was not allocated. In this case, we
-              // simply grab the portion of the CDR stream
-              // that contained this parameter, The
-              // application should use the appropriate >>=
-              // operator to retrieve the value
-              char *begin, *end;
-              TAO_InputCDR temp (call.inp_stream ());
-              CORBA::TypeCode::traverse_status retval;
-              CORBA::Any *any = result->value ();
-
-              begin = call.inp_stream ().rd_ptr ();
-              // skip the parameter to get the ending position
-              retval = temp.skip (any->type_, ACE_TRY_ENV);
-              ACE_CHECK;
-
-              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                {
-                  end = temp.rd_ptr ();
-                  any->cdr_ = new ACE_Message_Block (end - begin);
-                  TAO_OutputCDR out (any->cdr_);
-
-                  retval = out.append (any->type_,
-                                       &call.inp_stream (), ACE_TRY_ENV);
-                  ACE_CHECK;
-
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                  if (!result->value ()->value_)
                     {
-                      any->any_owns_data_ = 1;
-                      any->value_ = 0;
+                      // storage was not allocated. In this case, we
+                      // simply grab the portion of the CDR stream
+                      // that contained this parameter, The
+                      // application should use the appropriate >>=
+                      // operator to retrieve the value
+                      char *begin, *end;
+                      TAO_InputCDR temp (call.inp_stream ());
+                      CORBA::TypeCode::traverse_status retval;
+                      CORBA::Any *any = result->value ();
+
+                      begin = call.inp_stream ().rd_ptr ();
+                      // skip the parameter to get the ending position
+                      retval = temp.skip (any->type_, env);
+                      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                        {
+                          end = temp.rd_ptr ();
+                          any->cdr_ = new ACE_Message_Block (end - begin);
+                          TAO_OutputCDR out (any->cdr_);
+
+                          retval = out.append (any->type_,
+                                               &call.inp_stream (), env);
+                          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                            {
+                              any->any_owns_data_ = 1;
+                              any->value_ = 0;
+                            }
+                        }
+                    }
+                  else
+                    {
+                      // the application had allocated the top level
+                      // storage. We simply retrieve the data
+                      call.get_value (result->value ()->type_,
+                                      result->value ()->value_, env);
                     }
                 }
-            }
-          else
-            {
-              // the application had allocated the top level
-              // storage. We simply retrieve the data
-              call.get_value (result->value ()->type_,
-                              result->value ()->value_, ACE_TRY_ENV);
-              ACE_CHECK;
-            }
-        }
 
-      for (u_int i = 0; i < args->count (); i++)
-        {
-          CORBA::NamedValue_ptr value = args->item (i, ACE_TRY_ENV);
-          ACE_CHECK;
-
-          CORBA::Any *any = value->value ();
-
-          if (value->flags () == CORBA::ARG_OUT
-              || value->flags () == CORBA::ARG_INOUT)
-            {
-#if 0
-              // @@  (ASG) need to deal with this
-
-              // If caller didn't set OUT_LIST_MEMORY flag, allocate
-              // memory for this parameter ...
-              if (!(flags & CORBA::OUT_LIST_MEMORY))
+              for (u_int i = 0; i < args->count (); i++)
                 {
-                  CORBA::TypeCode_var tcp = value->value ()->type ();
-                  size_t size = tcp->size (ACE_TRY_ENV);
-                  ACE_CHECK;
+                  CORBA::NamedValue_ptr value = args->item (i, env);
+                  CORBA::Any *any = value->value ();
 
-                  if (size != 0)
+                  if (value->flags () == CORBA::ARG_OUT
+                      || value->flags () == CORBA::ARG_INOUT)
                     {
-                      CORBA::Octet *ptr = new CORBA::Octet [size];
+#if 0
+                      // @@  (ASG) need to deal with this
 
-                      value->value ()->replace (tcp.in (), ptr,
-                                                1, ACE_TRY_ENV);
-                      ACE_CHECK;
-                    }
-                }
+                      // If caller didn't set OUT_LIST_MEMORY flag, allocate
+                      // memory for this parameter ...
+                      if (!(flags & CORBA::OUT_LIST_MEMORY))
+                        {
+                          CORBA::TypeCode_var tcp = value->value ()->type ();
+                          size_t size = tcp->size (env);
+                          env.print_exception ("do_dynamic_call, get param size");
+
+                          if (size != 0)
+                            {
+                              CORBA::Octet *ptr = new CORBA::Octet [size];
+
+                              value->value ()->replace (tcp.in (), ptr,
+                                                        1, env);
+                              env.print_exception ("do_dynamic_call, set result mem");
+                            }
+                        }
 #endif
-              if (!any->value_)
-                {
-                  // storage was not allocated. In this case,
-                  // we simply grab the portion of the CDR
-                  // stream that contained this parameter, The
-                  // application should use the appropriate
-                  // >>= operator to retrieve the value
-                  char *begin, *end;
-                  TAO_InputCDR temp (call.inp_stream ());
-                  CORBA::TypeCode::traverse_status retval;
-
-                  begin = call.inp_stream ().rd_ptr ();
-                  // skip the parameter to get the ending position
-                  retval = temp.skip (any->type_, ACE_TRY_ENV);
-                  ACE_CHECK;
-
-                  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-                    {
-                      end = temp.rd_ptr ();
-                      any->cdr_ = new ACE_Message_Block (end - begin);
-                      TAO_OutputCDR out (any->cdr_);
-
-                      retval = out.append (any->type_,
-                                           &call.inp_stream (), ACE_TRY_ENV);
-                      ACE_CHECK;
-
-                      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                      if (!any->value_)
                         {
-                          any->any_owns_data_ = 1;
-                          any->value_ = 0;
+                          // storage was not allocated. In this case,
+                          // we simply grab the portion of the CDR
+                          // stream that contained this parameter, The
+                          // application should use the appropriate
+                          // >>= operator to retrieve the value
+                          char *begin, *end;
+                          TAO_InputCDR temp (call.inp_stream ());
+                          CORBA::TypeCode::traverse_status retval;
+
+                          begin = call.inp_stream ().rd_ptr ();
+                          // skip the parameter to get the ending position
+                          retval = temp.skip (any->type_, env);
+                          if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                            {
+                              end = temp.rd_ptr ();
+                              any->cdr_ = new ACE_Message_Block (end - begin);
+                              TAO_OutputCDR out (any->cdr_);
+
+                              retval = out.append (any->type_,
+                                                   &call.inp_stream (), env);
+                              if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
+                                {
+                                  any->any_owns_data_ = 1;
+                                  any->value_ = 0;
+                                }
+                            }
+                        }
+                      else
+                        {
+                          // the application had allocated the top level
+                          // storage. We simply retrieve the data
+                          call.get_value (any->type_,
+                                          (void *) any->value_, env);
+                        }
+                      if (env.exception ())
+                        {
+                          env.print_exception ("do_dynamic_call, get response parameter");
+                          return;
                         }
                     }
                 }
-              else
-                {
-                  // the application had allocated the top level
-                  // storage. We simply retrieve the data
-                  call.get_value (any->type_,
-                                  (void *) any->value_, ACE_TRY_ENV);
-                  ACE_CHECK;
-                }
+              return;
             }
+          // ... or maybe this request got forwarded to someplace else.
+          assert (status == TAO_GIOP_LOCATION_FORWARD);
+          // @@ TODO We should not use assert because it crashes the
+          // application, raise an exception
         }
     }
   else
     {
-      TAO_GIOP_Oneway_Invocation call (this, opname, this->orb_core_);
-
-      for (;;)
-        {
-          call.start (ACE_TRY_ENV);
-          ACE_CHECK;
+      TAO_GIOP_Oneway_Invocation call (this, opname, orb_core);
+      call.start (env);
+      if (env.exception () != 0) return;
 
-          this->put_params (call, args, ACE_TRY_ENV);
-          ACE_CHECK;
+      this->put_params (call, args, env);
+      if (env.exception () != 0) return;
 
-          int status = call.invoke (ACE_TRY_ENV);
-          ACE_CHECK;
-
-          if (status == TAO_INVOKE_RESTART)
-            continue;
-
-          if (status == TAO_INVOKE_EXCEPTION)
-            return; // Shouldn't happen
-
-          if (status != TAO_INVOKE_OK)
-            ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-
-          break;
-        }
+      (void) call.invoke (env);
     }
+
 }
 
 void
-TAO_Stub::put_params (TAO_GIOP_Invocation &call,
-                      CORBA::NVList_ptr args,
-                      CORBA::Environment &ACE_TRY_ENV)
+STUB_Object::put_params (TAO_GIOP_Invocation &call,
+                         CORBA::NVList_ptr args,
+                         CORBA::Environment &env)
 {
   // Now, put all "in" and "inout" parameters into the request
   // message body.
 
   for (u_int i = 0; i < args->count (); i++)
     {
-      CORBA::NamedValue_ptr value = args->item (i, ACE_TRY_ENV);
-      ACE_CHECK;
+      CORBA::NamedValue_ptr value = args->item (i, env);
 
       if (value->flags () == CORBA::ARG_IN
           || value->flags () == CORBA::ARG_INOUT)
@@ -720,188 +841,19 @@ TAO_Stub::put_params (TAO_GIOP_Invocation &call,
           if (value->value ()->any_owns_data_)
             {
               call.put_param (value->value ()->type_,
-                              value->value ()->value_, ACE_TRY_ENV);
-              ACE_CHECK;
+                              value->value ()->value_, env);
             }
           else
             {
               TAO_OutputCDR &cdr = call.out_stream ();
-              TAO_InputCDR in (value->value ()->cdr_,
-                               TAO_ENCAP_BYTE_ORDER,
-                               this->orb_core_);
-              cdr.append (value->value ()->type_, &in, ACE_TRY_ENV);
-              ACE_CHECK;
+              TAO_InputCDR in (value->value ()->cdr_);
+              cdr.append (value->value ()->type_, &in, env);
+            }
+          if (env.exception ())
+            {
+              env.print_exception ("do_dynamic_call, put request parameter");
+              return;
             }
         }
     }
 }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-// ****************************************************************
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-CORBA::Policy_ptr
-TAO_Stub::get_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->refcount_lock_,
-                    CORBA::Policy::_nil ());
-
-  if (this->policies_ == 0)
-    return CORBA::Policy::_nil ();
-
-  return this->policies_->get_policy (type, ACE_TRY_ENV);
-}
-
-CORBA::Policy_ptr
-TAO_Stub::get_client_policy (
-    CORBA::PolicyType type,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
-                    this->refcount_lock_,
-                    CORBA::Policy::_nil ());
-
-  CORBA::Policy_var result;
-  if (this->policies_ != 0)
-    {
-      result = this->policies_->get_policy (type, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Current *policy_current =
-        this->orb_core_->policy_current ();
-      if (policy_current != 0)
-        {
-          result = policy_current->get_policy (type, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-        }
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      TAO_Policy_Manager *policy_manager =
-        this->orb_core_->policy_manager ();
-      if (policy_manager != 0)
-        {
-          result = policy_manager->get_policy (type, ACE_TRY_ENV);
-          ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-        }
-    }
-
-  if (CORBA::is_nil (result.in ()))
-    {
-      result = this->orb_core_->get_default_policy (type, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-    }
-
-  return result._retn ();
-}
-
-TAO_Stub*
-TAO_Stub::set_policy_overrides (
-    const CORBA::PolicyList & policies,
-    CORBA::SetOverrideType set_add,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  // Notice the use of an explicit constructor....
-  auto_ptr<TAO_Policy_Manager_Impl> policy_manager (new TAO_Policy_Manager_Impl);
-
-  if (set_add == CORBA::SET_OVERRIDE)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  else if (this->policies_ == 0)
-    {
-      policy_manager->set_policy_overrides (policies,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-  else
-    {
-      *policy_manager = *this->policies_;
-      policy_manager->set_policy_overrides (policies,
-                                            set_add,
-                                            ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-    }
-
-  TAO_Stub* stub;
-  ACE_NEW_RETURN (stub, TAO_Stub (CORBA::string_dup (this->type_id.in ()),
-                                  this->base_profiles_,
-                                  this->orb_core_),
-                  0);
-  stub->policies_ = policy_manager.release ();
-  return stub;
-}
-
-CORBA::PolicyList *
-TAO_Stub::get_policy_overrides (
-    const CORBA::PolicyTypeSeq & types,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  if (this->policies_ == 0)
-    return 0;
-
-  return this->policies_->get_policy_overrides (types, ACE_TRY_ENV);
-}
-
-CORBA::Boolean
-TAO_Stub::validate_connection (
-    CORBA::PolicyList_out inconsistent_policies,
-    CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ What is a good default value to return....
-  inconsistent_policies = 0;
-  return 0;
-}
-
-void
-TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
-{
-  // we assume that the profile_in_use_ is being
-  // forwarded!  Grab the lock so things don't change.
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-
-  TAO_MProfile *now_pfiles = this->forward_profiles_;
-  if (now_pfiles == 0)
-    now_pfiles = &this->base_profiles_;
-
-  ACE_NEW (this->forward_profiles_,
-           TAO_MProfile (mprofiles));
-
-  // forwarded profile points to the new IOR (profiles)
-  this->profile_in_use_->forward_to (this->forward_profiles_);
-
-  // new profile list points back to the list which was forwarded.
-  this->forward_profiles_->forward_from (now_pfiles);
-
-  // make sure we start at the beginning of mprofiles
-  this->forward_profiles_->rewind ();
-}
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class auto_ptr<TAO_Policy_Manager_Impl>;
-template class ACE_Auto_Basic_Ptr<TAO_Policy_Manager_Impl>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate auto_ptr<TAO_Policy_Manager_Impl>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Policy_Manager_Impl>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_CORBA_MESSAGING */
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index d1509c76a92..ff2025c2ee1 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -37,16 +37,13 @@
 
 class TAO_GIOP_Invocation;
 class TAO_ORB_Core;
-class TAO_Policy_Manager_Impl;
+
+typedef STUB_Object IIOP_Object;
 
 // Descriptions of parameters.
 
 enum TAO_Param_Type
 {
-  // @@ Is there any use for this enum? I would assume that the
-  //    similar ones on corbfwd.h are enough!
-  // @@ Jeff: can you check into that?
-
   // = TITLE
   //   TAO_Param_Type
   // =DESCRIPTION
@@ -193,10 +190,10 @@ struct TAO_Skel_Entry
   // skeleton corresponding to the operation
 };
 
-class TAO_Export TAO_Stub
+class TAO_Export STUB_Object
 {
   // = TITLE
-  //   TAO_Stub
+  //   STUB_Object
   //
   // = DESCRIPTION
   //   Per-objref data includes the (protocol-specific) Profile, which
@@ -212,8 +209,8 @@ class TAO_Export TAO_Stub
   //   type.
 public:
   void do_static_call (CORBA_Environment &TAO_IN_ENV,
-                       const TAO_Call_Data *info,
-                       void** args);
+                               const TAO_Call_Data *info,
+                               void** args);
   // The "stub interpreter" method parameters are:
   //
   //    - TAO_IN_ENV ... used for exception reporting
@@ -231,16 +228,13 @@ public:
   // shuffling.  The stub and "do_static_call" parameters are all but the
   // same, except that their order is different.
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   void do_dynamic_call (const char *opname,
-                        CORBA::Boolean is_roundtrip,
-                        CORBA::NVList_ptr args,
-                        CORBA::NamedValue_ptr result,
-                        CORBA::Flags flags,
-                        CORBA::ExceptionList &exceptions,
-                        CORBA_Environment &TAO_IN_ENV =
-                              CORBA::default_environment ());
+                                CORBA::Boolean is_roundtrip,
+                                CORBA::NVList_ptr args,
+                                CORBA::NamedValue_ptr result,
+                                CORBA::Flags flags,
+                                CORBA::ExceptionList &exceptions,
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Dynamic invocations use a more costly "varargs" calling
   // convention; it's got the same input data as the (static)
   // stub-oriented one, but the data is represented somewhat
@@ -259,37 +253,6 @@ public:
   //    - exceptions ... list of legal user-defined exceptions
   //    - TAO_IN_ENV ... used for exception reporting.
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  CORBA::Policy_ptr get_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::Policy_ptr get_client_policy (
-      CORBA::PolicyType type,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  TAO_Stub* set_policy_overrides (
-      const CORBA::PolicyList & policies,
-      CORBA::SetOverrideType set_add,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::PolicyList * get_policy_overrides (
-      const CORBA::PolicyTypeSeq & types,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-  CORBA::Boolean validate_connection (
-      CORBA::PolicyList_out inconsistent_policies,
-      CORBA::Environment &ACE_TRY_ENV =
-        CORBA::default_environment ()
-    );
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
   CORBA::String_var type_id;
   // All objref representations carry around a type ID.
 
@@ -302,88 +265,119 @@ public:
   // equivalent).
 
   CORBA::Boolean is_equivalent (CORBA::Object_ptr other_obj,
-                                CORBA_Environment &TAO_IN_ENV =
-                                      CORBA::default_environment ());
-  // Implement the is_equivalent() method for the CORBA::Object
+        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()); 
+  // XXX All objref representations should know how to marshal
+  // themselves.  That will involve ensuring that the IOR that gets
+  // marshaled talks a specific protocol, otherwise the target of a
+  // message would not be invoke using the objref it receives
+  // (compromising functionality in a very basic and mysterious
+  // mannter).  So for example an objref might need to create a proxy
+  // for itself rather than marshaling its own representation.  [ The
+  // IIOP engine does not need to worry about such issues since it
+  // only supports one protocol -- the problem won't show up.
+  // "Multiprotocol ORBs" will need to solve that problem though.  ]
 
   // Our Constructors ...
 
-  TAO_Stub (char *repository_id,
-            const TAO_MProfile &profiles,
-            TAO_ORB_Core *orb_core);
+  STUB_Object (char * repository_id);
+  // XXX All objref representations should know how to marshal
+  // themselves.  That will involve ensuring that the IOR that gets
+  // marshaled talks a specific protocol, otherwise the target of a
+  // message would not be invoke using the objref it receives
+  // (compromising functionality in a very basic and mysterious
+  // manner).  So for example an objref might need to create a proxy
+  // for itself rather than marshaling its own representation.  [ The
+  // IIOP engine does not need to worry about such issues since it
+  // only supports one protocol -- the problem won't show up.
+  // "Multiprotocol ORBs" will need to solve that problem though.  ]
+
+  STUB_Object (char *repository_id,
+               TAO_Profile *profile);
+  // degenerate case where only one profile is wanted.  This method
+  // is depricated and is here ONLY for compatibility with multiple
+  // profile unfriendly code!
+
+  STUB_Object (char *repository_id,
+               TAO_MProfile *profiles);
   // Construct from a repository ID and a list of profiles.
 
+  STUB_Object (char *repository_id,
+               TAO_MProfile &profiles);
+  // Construct from a repository ID and a profile ID.profile ID.
+
   // = Memory management.
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-  // Manage the base (non-forwarded) profiles.
+  TAO_Profile *set_profile_in_use_i (TAO_Profile *pfile);
+  // Makes a copy of the profile and frees the existing profile_in_use.
+  // NOT THREAD SAFE
+
+  TAO_Profile *set_profile_in_use (TAO_Profile *pfile);
+  // THREAD SAFE
+  // Makes a copy of the profile and frees the existing profile_in_use.
+
   TAO_Profile *profile_in_use (void) ;
   // returns a pointer to the profile_in_use object.  This object
-  // retains ownership of this profile.
+  // retains ownership of this object.
+
+  TAO_Profile *set_profiles (TAO_MProfile *mprofiles);
+  // This method *WILL* also set the profile_in_use to reference
+  // the first profile in this list!
+  // client must free this memory when done!
 
   TAO_MProfile *get_profiles (void);
+  // Reference to the profile list, reference count is not
+  // incremented.
+
+  TAO_MProfile *copy_profiles (void);
   // Copy of the profile list, user must free memory when done.
   // although the user can call get_profiles then reorder
-  // the list and give it back to TAO_Stub.
+  // the list and give it back to STUB_Object.
 
-  const TAO_MProfile& get_base_profiles (void) const;
-  // Obtain a reference to the basic profile set.
-
-  // manage forward and base profiles.
   TAO_Profile *next_profile (void);
-  // THREAD SAFE.  If forward_profiles is null then this will
-  // get the next profile in the base_profiles list.  If forward is not null
-  // then this will get the next profile for the list of forwarding
-  // profiles.  If all profiles have been tried then 0 is returned and
-  // profile_in_use_ is set to the first profile in the base_profiles
-  // list.
-
-  TAO_Profile *next_profile_i (void);
-  // NON-THREAD SAFE version of next_profile (void)
+  // this will both set profile_in_use_ to reference the next
+  // profile in the mprofiles list AND it will return a pointer 
+  // to this profile.  This object retains ownership of the profile!
 
-  void reset_profiles (void);
+  TAO_Profile *reset_profiles (void);
   // THREAD SAFE
-  // this method will reset the base profile list to reference the first
-  // profile and if there are anmy existing forward profiles they are
-  // reset.
-
-  void reset_profiles_i (void);
-  // NON-THREAD SAFE version of reset_profiles (void);
-
-  CORBA::Boolean valid_forward_profile (void);
-  // Returns 1 if a forward profile has successfully been used.
-  // profile_success_ && forward_profiles_
-
-  // Just forward profiles.
-  void use_locate_requests (CORBA::Boolean use_it);
-  // set the flags to use locate_requests.
+  // this method will reset the profile list to reference the first
+  // profile AND it will set profile_in_use to ref this profile.
 
-  void set_valid_profile (void);
-   // NON-THREAD-SAFE.  Will set profile_success_ to 0.
+  void set_fwd_profiles (TAO_MProfile *mprofiles);
+  // THREAD SAFE.
+  // set the prifile list of the current profile_in_use to
+  // mprofiles.  The object profile_in_use will take responsibilty
+  // for the memory and this object (STUB_Obj) will be responsible
+  // for list manipulation!
 
-   CORBA::Boolean valid_profile (void);
-   // returns TRUE if a connection was successful with at least
-   // one profile.
+  TAO_MProfile *get_fwd_profiles (void);
+  // Copy of the fwd profile list, user must free memory when done.
+  // although the user can call get_profiles then reorder
+  // the list and give it back to STUB_Object.
 
-   TAO_Profile *set_base_profiles (const TAO_MProfile& mprofiles);
-   // Initialize the base_profiles_ and set profile_in_use_ to
-   // reference the first profile.
+  TAO_Profile *next_fwd_profile (void);
+  // this will both set fwd_profile to reference the next
+  // profile in the profile_in_use's fwd_profiles's list AND it will 
+  // return a pointer to this profile.  This object retains ownership 
+  // of the profile!
 
-  void add_forward_profiles (const TAO_MProfile &mprofiles);
-  // THREAD SAFE.
-  // set the forward_profiles.  This object will assume ownership of
-  // this TAO_MProfile object!!
-
-  CORBA::Boolean next_profile_retry (void);
-  // THREAD SAFE
-  // used to get the next profile after the one being used has
-  // failed during the initial connect or send of the message!
+  TAO_Profile *get_fwd_profile (void) ;
+  // Returns the current forwarding profile.
+  // THREAD-SAFE.  Returns the current forwarding profile.
 
-  TAO_ORB_Core* orb_core (void) const;
-  // Accessor
+  void use_locate_requests (CORBA::Boolean use_it);
+  // set the flags to use locate_requests.
 
 protected:
+  ACE_Lock &get_profile_lock (void);
+  // Gives reference to the lock guarding the forwarding profile.
+
+  TAO_Profile *get_fwd_profile_i (void) ;
+  // NON-THREAD-SAFE.  Returns the current forwarding profile.
+  // @@ Should this be public
+ 
   void put_params (CORBA_Environment &TAO_IN_ENV,
                    const TAO_Call_Data *info,
                    TAO_GIOP_Invocation &call,
@@ -391,56 +385,47 @@ protected:
   // Helper method to factor out common code in static oneway
   // vs. twoway invocations.
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
   void put_params (TAO_GIOP_Invocation &call,
                    CORBA::NVList_ptr args,
-                   CORBA_Environment &TAO_IN_ENV =
-                         CORBA::default_environment ());
+                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Helper method to factor out common code in dynamic oneway
   // vs. twoway invocations.
 
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
 private:
-  TAO_Profile *set_profile_in_use_i (TAO_Profile *pfile);
-  // Makes a copy of the profile and frees the existing profile_in_use.
-  // NOT THREAD SAFE
-
   void reset_first_locate_request (void);
   // NON-THREAD-SAFE.
   // reset the flag telling that the locate request should be used
 
-  void reset_base ();
-  // NON-THREAD-SAFE.  utility method which resets or initializes
-  // the base_profile list and forward flags.
-
-  void forward_back_one (void);
-  // NON-THREAD-SAFE.  utility method which unrolls (removes or pops)
-  // the top most forwarding profile list.
+  TAO_Profile *set_fwd_profile (TAO_Profile *new_profile);
+  // NOT THREAD-SAFE.  Sets a new value for the forwarding profile and
+  // returns the current value.
+ 
+  void reset_fwd_profiles (void);
+  // NOT THREAD-SAFE.
+  // get rid of forwarding for the current profile!
 
-  void reset_forward ();
-   // NOT THREAD-SAFE.  utility method which pops all forward profile
-   // lists and resets the forward_profiles_ pointer.
-
-  ~TAO_Stub (void);
+  ~STUB_Object (void);
   // Destructor is to be called only through _decr_refcnt()
 
-  TAO_Profile *next_forward_profile (void);
-  // NON-THREAD-SAFE.  utility method for next_profile.
-
 private:
+    // @@ For now, we keep track of transport specific profiles here,
+  //    but in the next iteration this will go away ... only transport
+  //    neutral info is kept here => STUB_Object should also go away!
+  //    fredk
   TAO_MProfile     base_profiles_;
   // ordered list of profiles for this object.
-  TAO_MProfile     *forward_profiles_;
+  TAO_MProfile     *fwd_profiles_;
 
   TAO_Profile *profile_in_use_;
   // this is the profile that we are currently sending/receiving with
 
+  TAO_Profile *fwd_profile_;
+  // Store the forwarding profile
+
   ACE_Lock* profile_lock_ptr_;
   // Mutex to protect access to the forwarding profile
 
-  size_t profile_success_;
+  size_t fwd_profile_success_;
   // Have we successfully talked to the forward profile yet?
 
   ACE_SYNCH_MUTEX refcount_lock_;
@@ -455,18 +440,9 @@ private:
   CORBA::Boolean first_locate_request_;
   // distinguishes the first from following calls
 
-  TAO_ORB_Core* orb_core_;
-  // The ORB
-
-#if defined (TAO_HAS_CORBA_MESSAGING)
-  TAO_Policy_Manager_Impl* policies_;
-  // The policy overrides in this object, if nil then use the default
-  // policies.
-#endif /* TAO_HAS_CORBA_MESSAGING */
-
   // = Disallow copy constructor and assignment operator
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
-  ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
+  ACE_UNIMPLEMENTED_FUNC (STUB_Object (const STUB_Object &))
+  ACE_UNIMPLEMENTED_FUNC (STUB_Object &operator = (const STUB_Object &))
 
 #if defined (__GNUG__)
   // G++ (even 2.6.3) stupidly thinks instances can't be created.
diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i
index 242203aaba2..16bd60e024a 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -5,19 +5,49 @@
 #include <tao/debug.h>
 
 ACE_INLINE
+STUB_Object::~STUB_Object (void)
+{
+  assert (this->refcount_ == 0);
+
+  // Cleanup hint
+
+  if (this->profile_in_use_ != 0) 
+  {
+    this->profile_in_use_->reset_hint ();
+    // decrease reference count on profile
+    this->profile_in_use_->_decr_refcnt ();   
+    this->profile_in_use_ = 0;
+  }
+
+  if (this->fwd_profile_)
+  {
+    this->fwd_profile_->reset_hint ();
+    this->fwd_profile_->_decr_refcnt ();
+    this->fwd_profile_ = 0;
+  }
+
+  if (fwd_profiles_)
+    delete fwd_profiles_;
+
+  if (this->profile_lock_ptr_)
+    delete this->profile_lock_ptr_; 
+
+}
+
+ACE_INLINE
 TAO_Profile *
-TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
+STUB_Object::set_profile_in_use_i (TAO_Profile *pfile)
 {
   TAO_Profile *old = this->profile_in_use_;
 
   // Since we are actively using this profile we dont want
   // it to disappear, so increase the reference count by one!!
   if (pfile && (pfile->_incr_refcnt () == 0))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                        "(%P|%t) unable to increment profile ref!\n"),
-                        0);
-    }
+  {
+    ACE_ERROR_RETURN ((LM_ERROR,
+                      "(%P|%t) unable to increment profile ref!\n"),
+                      0);
+  }
 
   this->profile_in_use_ = pfile;
 
@@ -28,245 +58,252 @@ TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile)
 }
 
 ACE_INLINE
-void
-TAO_Stub::reset_first_locate_request (void)
+TAO_Profile * 
+STUB_Object::set_profiles (TAO_MProfile *mprofiles)
 {
-  first_locate_request_ = 1;
+
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
+                            0));
+
+  base_profiles_.set (mprofiles);
+
+  return this->set_profile_in_use_i (this->base_profiles_.get_next ());  
+
 }
 
 ACE_INLINE
-void
-TAO_Stub::reset_base (void)
+TAO_Profile *
+STUB_Object::profile_in_use (void)
 {
-  this->base_profiles_.rewind ();
-  reset_first_locate_request ();
-  profile_success_ = 0;
-
-  set_profile_in_use_i (base_profiles_.get_next ());
+  return this->profile_in_use_;
 }
 
 ACE_INLINE
-void
-TAO_Stub::forward_back_one (void)
+TAO_Profile *
+STUB_Object::set_profile_in_use (TAO_Profile *pfile)
 {
-  TAO_MProfile *from = forward_profiles_->forward_from ();
 
-  delete forward_profiles_;
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
+                            0));
 
-  // the current profile in this profile list is no
-  // longer being forwarded, so set the reference to zero.
-  if (from == &base_profiles_)
-    {
-      base_profiles_.get_current_profile ()->forward_to (0);
-      forward_profiles_ = 0;
-    }
-  else
-    {
-      from->get_current_profile ()->forward_to (0);
-      forward_profiles_ = from;
-    }
+  return set_profile_in_use_i (pfile);
 
 }
 
-ACE_INLINE
-void
-TAO_Stub::reset_forward (void)
-{
-  while (this->forward_profiles_ != 0)
-    forward_back_one ();
-}
 
 ACE_INLINE
-void
-TAO_Stub::reset_profiles_i (void)
+TAO_Profile *
+STUB_Object::get_fwd_profile_i (void)
 {
-  reset_forward ();
-  reset_base ();
+  return this->fwd_profile_;
 }
 
 ACE_INLINE
-void
-TAO_Stub::reset_profiles (void)
+TAO_Profile *
+STUB_Object::get_fwd_profile (void)
 {
-  ACE_MT (ACE_GUARD (ACE_Lock,
-                     guard,
-                     *this->profile_lock_ptr_));
-  reset_profiles_i ();
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
+                            0));
+
+  return this->get_fwd_profile_i ();
 }
 
+
+// set_fwd_profile is currently called with either an arg of NULL
+// or with a pointer to another STUB_Object's profile_in_use_.
+// Change in strategy from previous version:  Since we assume this 
+// forward profile comes from am MProfile list, we just increment the
+// reference count on the profile.  We do not copy it and we assume
+// the user will not modify!
 ACE_INLINE
-TAO_Stub::~TAO_Stub (void)
+TAO_Profile *
+STUB_Object::set_fwd_profile (TAO_Profile *new_profile)
 {
-  assert (this->refcount_ == 0);
+ 
+  TAO_Profile *old = this->fwd_profile_;
 
-  if (forward_profiles_)
-    reset_profiles ();
+  // show that we are using this!
+  // @@ could be an inline => reduce code, common
+  if (new_profile && (new_profile->_incr_refcnt () == 0))
+  {
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       "(%P|%t) unable to increment profile ref!\n"), 
+                       0);
+  }
 
-  if (this->profile_in_use_ != 0)
-    {
-      this->profile_in_use_->reset_hint ();
-      // decrease reference count on profile
-      this->profile_in_use_->_decr_refcnt ();
-      this->profile_in_use_ = 0;
-    }
+  this->fwd_profile_ = new_profile;
 
-  if (this->profile_lock_ptr_)
-    delete this->profile_lock_ptr_;
+  if (old) 
+    old->_decr_refcnt ();
 
+  return this->fwd_profile_;
 }
 
 ACE_INLINE
-TAO_Profile *
-TAO_Stub::profile_in_use (void)
+ACE_Lock &
+STUB_Object::get_profile_lock (void)
 {
-  return this->profile_in_use_;
+  return *this->profile_lock_ptr_;
 }
 
 ACE_INLINE
-void
-TAO_Stub::use_locate_requests (CORBA::Boolean use_it)
+void 
+STUB_Object::reset_first_locate_request (void)
+{
+  first_locate_request_ = 1;
+}
+
+ACE_INLINE
+void 
+STUB_Object::use_locate_requests (CORBA::Boolean use_it)
 {
   if (use_it)
     {
       this->first_locate_request_ = 1;
       this->use_locate_request_ = 1;
     }
-  else
+  else 
     {
       // Don't use it.
       this->first_locate_request_ = 0;
       this->use_locate_request_ = 0;
-    }
-}
+    }   
+} 
 
 ACE_INLINE
-TAO_MProfile *
-TAO_Stub::get_profiles (void)
+TAO_MProfile * 
+STUB_Object::get_profiles (void)
 {
-  return new TAO_MProfile (base_profiles_);
+  return new TAO_MProfile (&base_profiles_);
 }
 
 ACE_INLINE
-TAO_Profile *
-TAO_Stub::next_forward_profile (void)
+void
+STUB_Object::reset_fwd_profiles (void)
 {
-  TAO_Profile *pfile_next = 0;
-
-  while (this->forward_profiles_
-         && (pfile_next = forward_profiles_->get_next ()) == 0)
-    // that was the last profile.  Now we clean up our forward profiles.
-    // since we own the forward MProfiles, we must delete them when done.
-    forward_back_one ();
 
-  return pfile_next;
+  if (fwd_profiles_)
+  {
+    // @@ Assume on one level deep FRED
+    TAO_MProfile *old = fwd_profiles_;
+    TAO_MProfile *prev = old->fwded_mprofile ();
+    // this should be base_profiles_
+    if (prev->get_current_profile ())
+      prev->get_current_profile ()->fwd_profiles (0);
+      // it better be!  this should be profile_in_use_
+  }
+    
+  set_fwd_profile (0);
 }
 
 ACE_INLINE
 TAO_Profile *
-TAO_Stub::next_profile_i (void)
+STUB_Object::reset_profiles (void)
 {
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
+                            0));
 
-  TAO_Profile *pfile_next = 0;
-  if (forward_profiles_)
-    {
-      pfile_next = next_forward_profile ();
-      if (pfile_next == 0)
-        pfile_next = base_profiles_.get_next ();
-    }
-  else
-    pfile_next = base_profiles_.get_next ();
+  // first get rid of any forwarding profile list and fwd_profile
+  reset_fwd_profiles ();
 
-  if (pfile_next == 0)
-    reset_base ();
-  else
-    set_profile_in_use_i (pfile_next);
+  // then rewind profile list, back to the beginning
+  this->base_profiles_.rewind ();
 
-  return pfile_next;
+  reset_first_locate_request ();
+  // resets the flag of the first call locate request to true
+  
+  return this->set_profile_in_use_i (this->base_profiles_.get_next ());
 }
 
 ACE_INLINE
 TAO_Profile *
-TAO_Stub::next_profile (void)
+STUB_Object::next_profile (void)
 {
-
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
                             0));
-  return next_profile_i ();
+
+  return this->set_profile_in_use_i (this->base_profiles_.get_next ());
 }
 
 ACE_INLINE
-CORBA::Boolean
-TAO_Stub::valid_forward_profile (void)
+TAO_MProfile * 
+STUB_Object::get_fwd_profiles (void)
 {
-  return (profile_success_ && forward_profiles_);
+  if (fwd_profiles_)
+    return new TAO_MProfile (this->fwd_profiles_);
+  return 0;
 }
 
 ACE_INLINE
 void
-TAO_Stub::set_valid_profile (void)
+STUB_Object::set_fwd_profiles (TAO_MProfile *mprofiles)
 {
-  profile_success_ = 1;
-}
 
-ACE_INLINE
-CORBA::Boolean
-TAO_Stub::valid_profile (void)
-{
-  return profile_success_;
-}
+  if (! profile_in_use_)
+    return ;
 
-ACE_INLINE
-TAO_Profile *
-TAO_Stub::set_base_profiles (const TAO_MProfile &mprofiles)
-{
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
-                            0));
+  // profile_in_use_ will copy the object but delegate
+  // to this Stub_Obj responsibility for manipulating list!
+  TAO_MProfile *tmp = new TAO_MProfile (mprofiles);
 
-  // first reset things so we start from scratch!
-  reset_forward ();
-  base_profiles_.set (mprofiles);
-  reset_base ();
-  return profile_in_use_;
+  // now add a pointer back the the profile list hat had been 
+  // forwarded.  Note, since the profile list is like
+  // a state machine, the current poitner refers to the
+  // actual profile that was forwarded!
 
+  {
+    ACE_MT (ACE_GUARD (ACE_Lock, 
+                       guard, 
+                       *this->profile_lock_ptr_));
+  
+    if (this->fwd_profiles_)
+    {
+      if (TAO_orbdebug)
+        ACE_DEBUG ((LM_DEBUG, "** Overwriting fwd profiles!\n"));
+      TAO_MProfile *old = this->fwd_profiles_;
+      TAO_MProfile *prev = old->fwded_mprofile ();
+      if (prev->get_current_profile ())
+        prev->get_current_profile ()->fwd_profiles (0);
+      // @@ FRED: UGLY but for now just one level!
+      delete this->fwd_profiles_;
+    }
+      
+    this->fwd_profiles_ = tmp;
+  
+    // @@ if (this->fwd_profiles_)
+    // @@ // add a link in the chain!
+    // @@ tmp->fwded_mprofile (this->fwd_profiles_);
+
+    this->fwd_profiles_->fwded_mprofile (&this->base_profiles_);
+    profile_in_use_->fwd_profiles (this->fwd_profiles_);
+
+    set_fwd_profile ( this->fwd_profiles_->get_next ());
+  }
+ 
 }
 
 ACE_INLINE
-CORBA::Boolean
-TAO_Stub::next_profile_retry (void)
+TAO_Profile *
+STUB_Object::next_fwd_profile (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (ACE_Lock,
-                            guard,
-                            *this->profile_lock_ptr_,
+  ACE_MT (ACE_GUARD_RETURN (ACE_Lock, 
+                            guard, 
+                            *this->profile_lock_ptr_, 
                             0));
 
-  if (profile_success_ && forward_profiles_)
-    {
-      reset_profiles_i ();
-      return 1;
-    }
-  else if (next_profile_i ())
-    {
-      return 1;
-    }
-  else
-    {
-      reset_profiles_i ();
-      return 0;
-    }
-}
+  if (fwd_profiles_)
+    return this->set_fwd_profile (this->fwd_profiles_->get_next ());
 
-ACE_INLINE const TAO_MProfile&
-TAO_Stub::get_base_profiles (void) const
-{
-  return this->base_profiles_;
+  return this->set_fwd_profile (0);
 }
 
-ACE_INLINE TAO_ORB_Core*
-TAO_Stub::orb_core (void) const
-{
-  return this->orb_core_;
-}
diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp
index 5bddd279377..45a092e9040 100644
--- a/TAO/tao/TAO.cpp
+++ b/TAO/tao/TAO.cpp
@@ -80,12 +80,12 @@ TAO_ORB_Manager::init (int& argc,
 
 int
 TAO_ORB_Manager::init_child_poa (int& argc,
-				 char **argv,
+				 char **argv,       
 				 char *poa_name,
 				 CORBA_Environment &env)
 {
   int init_result;
-
+  
   // check to see if root poa has to be created.
   init_result = this->init (argc, argv, env);
 
@@ -160,23 +160,6 @@ TAO_ORB_Manager::activate (PortableServer::Servant servant,
   return str;
 }
 
-void
-TAO_ORB_Manager::deactivate (const char *id,
-                             CORBA_Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id = this->poa_->reference_to_id (object.in (),
-                                                                        ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->poa_->deactivate_object (object_id.in (),
-                                 ACE_TRY_ENV);
-}
-
 // Activate the object with the object_name under the child POA.
 
 CORBA::String
@@ -211,24 +194,7 @@ TAO_ORB_Manager::activate_under_child_poa (const char* object_name,
 
   return str;
 }
-
-void
-TAO_ORB_Manager::deactivate_under_child_poa (const char *id,
-                                             CORBA_Environment &ACE_TRY_ENV)
-{
-  CORBA::Object_var object =
-    this->orb_->string_to_object (id,
-                                  ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableServer::ObjectId_var object_id = this->child_poa_->reference_to_id (object.in (),
-                                                                              ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->child_poa_->deactivate_object (object_id.in (),
-                                       ACE_TRY_ENV);
-}
-
+  
 // Enter the ORB event loop.
 
 int
@@ -236,42 +202,16 @@ TAO_ORB_Manager::run (CORBA_Environment &env,
                       ACE_Time_Value *tv)
 {
   this->poa_manager_->activate (env);
-  TAO_CHECK_ENV_RETURN (env, -1);
-
-  if (this->orb_->run (tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                      -1);
-  return 0;
-}
 
-int
-TAO_ORB_Manager::run (ACE_Time_Value &tv,
-                      CORBA_Environment &env)
-{
-  this->poa_manager_->activate (env);
   TAO_CHECK_ENV_RETURN (env, -1);
 
   if (this->orb_->run (tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACE_ERROR_RETURN ( (LM_ERROR,
                        "(%P|%t) TAO_ORB_Manager %p\n",
                        "run"),
-                      -1);
-  return 0;
-}
+                       -1);
 
-int
-TAO_ORB_Manager::run (CORBA_Environment &env)
-{
-  this->poa_manager_->activate (env);
   TAO_CHECK_ENV_RETURN (env, -1);
-
-  if (this->orb_->run () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_ORB_Manager %p\n",
-                       "run"),
-                      -1);
   return 0;
 }
 
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 631951b0991..601f64279a1 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -14,7 +14,7 @@ CFG=TAO - Win32 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 - Win32 Debug"

+!MESSAGE NMAKE /f "TAO.mak" CFG="TAO - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -27,7 +27,7 @@ CFG=TAO - Win32 Debug
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -104,12 +104,13 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /I "..\..\\" /I " ..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

+# SUBTRACT BASE CPP /YX

+# 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"

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"

-CPP=cl.exe

-# 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

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -134,12 +135,13 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /MTd /c

+# SUBTRACT BASE CPP /YX

+# 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"

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

-CPP=cl.exe

-# 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 /MDd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\..\\" /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "TAO_BUILD_DLL" /FD /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -171,8 +173,528 @@ SOURCE=.\Active_Object_Map.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ACTIV=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ACTIV=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ACTIV=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ACTIV=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -186,8 +708,528 @@ SOURCE=.\Any.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ANY_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ANY_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ANY_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ANY_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -201,8 +1243,528 @@ SOURCE=.\append.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_APPEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_APPEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_APPEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_APPEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -216,23 +1778,540 @@ SOURCE=.\CDR.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Interpreter.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_CDR_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CDR_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_CDR_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CDR_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -246,8 +2325,528 @@ SOURCE=.\Client_Strategy_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_CLIEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CLIEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_CLIEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CLIEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -261,37 +2860,541 @@ SOURCE=.\Connect.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Context.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_CONNE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CONNE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_CONNE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CONNE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

@@ -306,8 +3409,528 @@ SOURCE=.\CurrentC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_CURRE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CURRE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_CURRE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CURRE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -321,8 +3944,528 @@ SOURCE=.\CurrentS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_CURREN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CURREN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_CURREN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_CURREN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -336,8 +4479,528 @@ SOURCE=.\debug.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DEBUG=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEBUG=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DEBUG=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEBUG=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -351,8 +5014,528 @@ SOURCE=.\decode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DECOD=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DECOD=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DECOD=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DECOD=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -366,8 +5549,528 @@ SOURCE=.\deep_free.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DEEP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEEP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DEEP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEEP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -381,23 +6084,528 @@ SOURCE=.\default_client.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\default_resource.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_DEFAU=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEFAU=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DEFAU=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEFAU=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -411,37 +6619,527 @@ SOURCE=.\default_server.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainC.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_DEFAUL=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEFAUL=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_DEFAUL=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DEFAUL=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

@@ -456,8 +7154,542 @@ SOURCE=.\DynAny_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNAN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynArray_i.h"\

+	".\DynEnum_i.h"\

+	".\DynSequence_i.h"\

+	".\DynStruct_i.h"\

+	".\DynUnion_i.h"\

+	".\DynUnion_i_T.cpp"\

+	".\DynUnion_i_T.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNAN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNAN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynArray_i.h"\

+	".\DynEnum_i.h"\

+	".\DynSequence_i.h"\

+	".\DynStruct_i.h"\

+	".\DynUnion_i.h"\

+	".\DynUnion_i_T.cpp"\

+	".\DynUnion_i_T.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNAN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -471,8 +7703,528 @@ SOURCE=.\DynAnyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNANY=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNANY=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNANY=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNANY=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -486,8 +8238,528 @@ SOURCE=.\DynAnyS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNANYS=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNANYS=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNANYS=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNANYS=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -501,8 +8773,530 @@ SOURCE=.\DynArray_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNAR=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynArray_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNAR=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNAR=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynArray_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNAR=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -516,8 +9310,530 @@ SOURCE=.\DynEnum_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynEnum_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNEN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynEnum_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNEN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -531,8 +9847,530 @@ SOURCE=.\DynSequence_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNSE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynSequence_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNSE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNSE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynSequence_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNSE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -546,8 +10384,530 @@ SOURCE=.\DynStruct_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNST=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynStruct_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNST=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNST=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynStruct_i.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNST=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -561,8 +10921,534 @@ SOURCE=.\DynUnion_i.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_DYNUN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynUnion_i.h"\

+	".\DynUnion_i_T.cpp"\

+	".\DynUnion_i_T.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNUN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_DYNUN=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\DynUnion_i.h"\

+	".\DynUnion_i_T.cpp"\

+	".\DynUnion_i_T.h"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_DYNUN=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -576,8 +11462,528 @@ SOURCE=.\encode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ENCOD=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ENCOD=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ENCOD=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ENCOD=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -591,8 +11997,528 @@ SOURCE=.\Environment.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ENVIR=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ENVIR=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ENVIR=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ENVIR=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -606,8 +12532,528 @@ SOURCE=.\Exception.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_EXCEP=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_EXCEP=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_EXCEP=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_EXCEP=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -621,8 +13067,530 @@ SOURCE=.\Forwarding_Servant.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_FORWA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\Forwarding_Servant.h"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_FORWA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_FORWA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\Forwarding_Servant.h"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_FORWA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -636,23 +13604,542 @@ SOURCE=.\GIOP.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\GIOP_Server_Request.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_GIOP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_GIOP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_GIOP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_GIOP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -688,7 +14175,7 @@ SOURCE=.\IIOP_Connector.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.cpp

+SOURCE=.\IIOP_Interpreter.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -696,14 +14183,534 @@ SOURCE=.\IIOP_Profile.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_IIOP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_IIOP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_IIOP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_IIOP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.cpp

+SOURCE=.\IIOP_ORB.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -711,14 +14718,534 @@ SOURCE=.\IIOP_Transport.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_IIOP_O=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_IIOP_O=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_IIOP_O=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_IIOP_O=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\InconsistentTypeCodeC.cpp

+SOURCE=.\IIOP_Profile.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -733,7 +15260,7 @@ SOURCE=.\InconsistentTypeCodeC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.cpp

+SOURCE=.\IIOP_Transport.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -748,7 +15275,7 @@ SOURCE=.\Invocation.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_LookupTable.cpp

+SOURCE=.\InconsistentTypeCodeC.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -756,14 +15283,534 @@ SOURCE=.\IOR_LookupTable.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_INCON=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_INCON=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_INCON=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_INCON=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\Key_Adapters.cpp

+SOURCE=.\Invocation.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -771,8 +15818,542 @@ SOURCE=.\Key_Adapters.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_INVOC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_INVOC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_INVOC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_INVOC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -786,8 +16367,528 @@ SOURCE=.\Managed_Types.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_MANAG=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_MANAG=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_MANAG=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_MANAG=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -801,37 +16902,527 @@ SOURCE=.\Marshal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingC.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_MARSH=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_MARSH=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_MARSH=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_MARSH=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

@@ -861,8 +17452,528 @@ SOURCE=.\NVList.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_NVLIS=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_NVLIS=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_NVLIS=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_NVLIS=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -876,23 +17987,528 @@ SOURCE=.\Object.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Object_Adapter.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_OBJEC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OBJEC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_OBJEC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OBJEC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -906,23 +18522,528 @@ SOURCE=.\Object_KeyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ObjectIDList.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_OBJECT=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OBJECT=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_OBJECT=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OBJECT=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -936,8 +19057,542 @@ SOURCE=.\Operation_Table.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_OPERA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OPERA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_OPERA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_OPERA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -951,8 +19606,552 @@ SOURCE=.\ORB.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ORB_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_Dgram.h"\

+	"..\..\ace\SOCK_Dgram.i"\

+	"..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ORB_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ORB_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_Connector.i"\

+	"..\..\ace\SOCK_Dgram.h"\

+	"..\..\ace\SOCK_Dgram.i"\

+	"..\..\ace\SOCK_Dgram_Mcast.h"\

+	"..\..\ace\SOCK_Dgram_Mcast.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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ORB_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -966,8 +20165,570 @@ SOURCE=.\ORB_Core.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_ORB_CO=\

+	"..\..\ace\Acceptor.cpp"\

+	"..\..\ace\Acceptor.h"\

+	"..\..\ace\Acceptor.i"\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Arg_Shifter.h"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Env_Value_T.cpp"\

+	"..\..\ace\Env_Value_T.h"\

+	"..\..\ace\Env_Value_T.i"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Local_Tokens.h"\

+	"..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\ace\Pipe.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Select_Reactor.h"\

+	"..\..\ace\Select_Reactor.i"\

+	"..\..\ace\Select_Reactor_Base.h"\

+	"..\..\ace\Select_Reactor_Base.i"\

+	"..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\ace\Select_Reactor_T.h"\

+	"..\..\ace\Select_Reactor_T.i"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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_Heap.h"\

+	"..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\ace\Timer_Heap_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Token.h"\

+	"..\..\ace\Token.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ORB_CO=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_ORB_CO=\

+	"..\..\ace\Acceptor.cpp"\

+	"..\..\ace\Acceptor.h"\

+	"..\..\ace\Acceptor.i"\

+	"..\..\ace\ACE.h"\

+	"..\..\ace\ACE.i"\

+	"..\..\ace\Addr.h"\

+	"..\..\ace\Addr.i"\

+	"..\..\ace\Arg_Shifter.h"\

+	"..\..\ace\Atomic_Op.i"\

+	"..\..\ace\Auto_Ptr.cpp"\

+	"..\..\ace\Auto_Ptr.h"\

+	"..\..\ace\Auto_Ptr.i"\

+	"..\..\ace\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Env_Value_T.cpp"\

+	"..\..\ace\Env_Value_T.h"\

+	"..\..\ace\Env_Value_T.i"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.h"\

+	"..\..\ace\IPC_SAP.h"\

+	"..\..\ace\IPC_SAP.i"\

+	"..\..\ace\Local_Tokens.h"\

+	"..\..\ace\Local_Tokens.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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\Pipe.h"\

+	"..\..\ace\Pipe.i"\

+	"..\..\ace\Reactor.h"\

+	"..\..\ace\Reactor.i"\

+	"..\..\ace\Reactor_Impl.h"\

+	"..\..\ace\Select_Reactor.h"\

+	"..\..\ace\Select_Reactor.i"\

+	"..\..\ace\Select_Reactor_Base.h"\

+	"..\..\ace\Select_Reactor_Base.i"\

+	"..\..\ace\Select_Reactor_T.cpp"\

+	"..\..\ace\Select_Reactor_T.h"\

+	"..\..\ace\Select_Reactor_T.i"\

+	"..\..\ace\Service_Config.h"\

+	"..\..\ace\Service_Config.i"\

+	"..\..\ace\Service_Object.h"\

+	"..\..\ace\Service_Object.i"\

+	"..\..\ace\Service_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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_Heap.h"\

+	"..\..\ace\Timer_Heap_T.cpp"\

+	"..\..\ace\Timer_Heap_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Token.h"\

+	"..\..\ace\Token.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_ORB_CO=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -981,8 +20742,528 @@ SOURCE=.\params.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_PARAM=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_PARAM=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_PARAM=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_PARAM=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1011,8 +21292,544 @@ SOURCE=.\POA.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_POA_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\Forwarding_Servant.h"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POA_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_POA_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\Forwarding_Servant.h"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POA_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1026,23 +21843,528 @@ SOURCE=.\POAC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\POAManager.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_POAC_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POAC_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_POAC_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POAC_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1056,23 +22378,528 @@ SOURCE=.\POAS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Policy_Manager.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_POAS_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POAS_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_POAS_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POAS_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1086,8 +22913,528 @@ SOURCE=.\PolicyC.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_POLIC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POLIC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_POLIC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POLIC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1101,8 +23448,528 @@ SOURCE=.\PolicyS.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_POLICY=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POLICY=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_POLICY=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_POLICY=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1116,8 +23983,528 @@ SOURCE=.\Principal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_PRINC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_PRINC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_PRINC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_PRINC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1131,23 +24518,528 @@ SOURCE=.\Request.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Resource_Factory.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_REQUE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_REQUE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_REQUE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_REQUE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1161,8 +25053,528 @@ SOURCE=.\Sequence.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_SEQUE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SEQUE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_SEQUE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SEQUE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1176,8 +25588,542 @@ SOURCE=.\Servant_Base.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_SERVA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_SERVA=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVA=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1191,8 +26137,542 @@ SOURCE=.\Server_Request.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_SERVE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_SERVE=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\High_Res_Timer.h"\

+	"..\..\ace\High_Res_Timer.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\Timeprobe.h"\

+	"..\..\ace\Timeprobe.i"\

+	"..\..\ace\Timeprobe_T.cpp"\

+	"..\..\ace\Timeprobe_T.h"\

+	"..\..\ace\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

+	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\Timeprobe.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVE=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1206,23 +26686,528 @@ SOURCE=.\Server_Strategy_Factory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Services.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_SERVER=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVER=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_SERVER=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SERVER=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1236,8 +27221,528 @@ SOURCE=.\skip.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_SKIP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SKIP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_SKIP_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_SKIP_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1251,8 +27756,528 @@ SOURCE=.\Stub.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_STUB_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_STUB_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_STUB_=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_STUB_=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1266,8 +28291,530 @@ SOURCE=.\TAO.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_TAO_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TAO_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_TAO_C=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TAO_C=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1281,37 +28828,529 @@ SOURCE=.\TAO_Internal.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseC.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_TAO_I=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TAO_I=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_TAO_I=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\TAO_Internal.h"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TAO_I=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

@@ -1326,8 +29365,528 @@ SOURCE=.\Typecode.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

+DEP_CPP_TYPEC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TYPEC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

+DEP_CPP_TYPEC=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TYPEC=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -1341,44 +29900,534 @@ SOURCE=.\Typecode_Constants.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Union.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_TYPECO=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TYPECO=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_TYPECO=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_TYPECO=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueFactory.cpp

+SOURCE=.\Union.cpp

 

 !IF  "$(CFG)" == "TAO - Win32 Release"

 

@@ -1386,37 +30435,527 @@ SOURCE=.\ValueFactory.cpp
 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

+DEP_CPP_UNION=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_UNION=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

 

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.cpp

-

-!IF  "$(CFG)" == "TAO - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "TAO - Win32 Alpha Debug"

+DEP_CPP_UNION=\

+	"..\..\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\Basic_Types.h"\

+	"..\..\ace\Basic_Types.i"\

+	"..\..\ace\config-win32-borland.h"\

+	"..\..\ace\config-win32-common.h"\

+	"..\..\ace\config-win32.h"\

+	"..\..\ace\config-WinCE.h"\

+	"..\..\ace\config.h"\

+	"..\..\ace\Connector.cpp"\

+	"..\..\ace\Connector.h"\

+	"..\..\ace\Connector.i"\

+	"..\..\ace\Containers.h"\

+	"..\..\ace\Containers.i"\

+	"..\..\ace\Containers_T.cpp"\

+	"..\..\ace\Containers_T.h"\

+	"..\..\ace\Containers_T.i"\

+	"..\..\ace\Dynamic.h"\

+	"..\..\ace\Dynamic.i"\

+	"..\..\ace\Dynamic_Service.cpp"\

+	"..\..\ace\Dynamic_Service.h"\

+	"..\..\ace\Event_Handler.h"\

+	"..\..\ace\Event_Handler.i"\

+	"..\..\ace\Free_List.cpp"\

+	"..\..\ace\Free_List.h"\

+	"..\..\ace\Free_List.i"\

+	"..\..\ace\Functor.h"\

+	"..\..\ace\Functor.i"\

+	"..\..\ace\Functor_T.cpp"\

+	"..\..\ace\Functor_T.h"\

+	"..\..\ace\Functor_T.i"\

+	"..\..\ace\Get_Opt.h"\

+	"..\..\ace\Get_Opt.i"\

+	"..\..\ace\Handle_Set.h"\

+	"..\..\ace\Handle_Set.i"\

+	"..\..\ace\Hash_Map_Manager.h"\

+	"..\..\ace\Hash_Map_Manager.i"\

+	"..\..\ace\Hash_Map_Manager_T.cpp"\

+	"..\..\ace\Hash_Map_Manager_T.h"\

+	"..\..\ace\Hash_Map_Manager_T.i"\

+	"..\..\ace\inc_user_config.h"\

+	"..\..\ace\INET_Addr.h"\

+	"..\..\ace\INET_Addr.i"\

+	"..\..\ace\IO_Cntl_Msg.h"\

+	"..\..\ace\iosfwd.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_Base.h"\

+	"..\..\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_Block_T.cpp"\

+	"..\..\ace\Message_Block_T.h"\

+	"..\..\ace\Message_Block_T.i"\

+	"..\..\ace\Message_Queue.h"\

+	"..\..\ace\Message_Queue.i"\

+	"..\..\ace\Message_Queue_T.cpp"\

+	"..\..\ace\Message_Queue_T.h"\

+	"..\..\ace\Message_Queue_T.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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

+	"..\..\ace\Signal.h"\

+	"..\..\ace\Signal.i"\

+	"..\..\ace\Singleton.cpp"\

+	"..\..\ace\Singleton.h"\

+	"..\..\ace\Singleton.i"\

+	"..\..\ace\SOCK.h"\

+	"..\..\ace\SOCK.i"\

+	"..\..\ace\SOCK_Acceptor.h"\

+	"..\..\ace\SOCK_Acceptor.i"\

+	"..\..\ace\SOCK_Connector.h"\

+	"..\..\ace\SOCK_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.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

+	"..\..\ace\streams.h"\

+	"..\..\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_Options.i"\

+	"..\..\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\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

+	"..\..\ace\ws2tcpip.h"\

+	".\Active_Object_Map.h"\

+	".\Active_Object_Map.i"\

+	".\align.h"\

+	".\any.h"\

+	".\any.i"\

+	".\cdr.h"\

+	".\cdr.i"\

+	".\Client_Strategy_Factory.h"\

+	".\connect.h"\

+	".\connect.i"\

+	".\corba.h"\

+	".\CurrentC.h"\

+	".\CurrentC.i"\

+	".\debug.h"\

+	".\default_client.h"\

+	".\default_client.i"\

+	".\default_server.h"\

+	".\default_server.i"\

+	".\DynAny_i.h"\

+	".\DynAnyC.h"\

+	".\DynAnyC.i"\

+	".\Environment.h"\

+	".\Environment.i"\

+	".\Exception.h"\

+	".\Exception.i"\

+	".\giop.h"\

+	".\giop.i"\

+	".\IIOP_Interpreter.h"\

+	".\IIOP_ORB.h"\

+	".\IIOP_ORB.i"\

+	".\InconsistentTypeCodeC.h"\

+	".\Invocation.h"\

+	".\Invocation.i"\

+	".\Managed_Types.h"\

+	".\Managed_Types.i"\

+	".\marshal.h"\

+	".\marshal.i"\

+	".\nvlist.h"\

+	".\NVList.i"\

+	".\object.h"\

+	".\object.i"\

+	".\Object_KeyC.h"\

+	".\Object_KeyC.i"\

+	".\Operation_Table.h"\

+	".\orb.h"\

+	".\ORB.i"\

+	".\orb_core.h"\

+	".\orb_core.i"\

+	".\ORB_Strategies_T.cpp"\

+	".\ORB_Strategies_T.h"\

+	".\ORB_Strategies_T.i"\

+	".\orbconf.h"\

+	".\params.h"\

+	".\params.i"\

+	".\poa.h"\

+	".\POA.i"\

+	".\POA_CORBA.h"\

+	".\poa_macros.h"\

+	".\poaC.h"\

+	".\poaC.i"\

+	".\poaS.h"\

+	".\poaS.i"\

+	".\PolicyC.h"\

+	".\PolicyC.i"\

+	".\Principal.h"\

+	".\Principal.i"\

+	".\request.h"\

+	".\Request.i"\

+	".\sequence.h"\

+	".\sequence.i"\

+	".\Sequence_T.cpp"\

+	".\Sequence_T.h"\

+	".\Sequence_T.i"\

+	".\servant_base.h"\

+	".\Servant_Base.i"\

+	".\Server_Request.h"\

+	".\Server_Request.i"\

+	".\Server_Strategy_Factory.h"\

+	".\singletons.h"\

+	".\stub.h"\

+	".\stub.i"\

+	".\try_macros.h"\

+	".\typecode.h"\

+	".\typecode.i"\

+	".\Union.h"\

+	".\varout.cpp"\

+	".\varout.h"\

+	".\varout.i"\

+	

+NODEP_CPP_UNION=\

+	".\IIOP_Object.h"\

+	".\IIOP_Object.i"\

+	

 

 !ENDIF 

 

@@ -1431,19 +30970,19 @@ SOURCE=.\Active_Object_Map.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\any.h

+SOURCE=.\align.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\arg_shifter.h

+SOURCE=.\any.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\cdr.h

+SOURCE=.\arg_shifter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Interpreter.h

+SOURCE=.\cdr.h

 # End Source File

 # Begin Source File

 

@@ -1455,18 +30994,10 @@ SOURCE=.\connect.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\corba.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\CurrentC.h

 # End Source File

 # Begin Source File

@@ -1479,22 +31010,10 @@ SOURCE=.\default_client.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_server.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAny_i.h

 # End Source File

 # Begin Source File

@@ -1539,10 +31058,6 @@ SOURCE=.\giop.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Server_Request.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_Acceptor.h

 # End Source File

 # Begin Source File

@@ -1551,23 +31066,23 @@ SOURCE=.\IIOP_Connector.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.h

+SOURCE=.\IIOP_Interpreter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.h

+SOURCE=.\IIOP_ORB.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\InconsistentTypeCodeC.h

+SOURCE=.\IIOP_Profile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.h

+SOURCE=.\IIOP_Transport.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_LookupTable.h

+SOURCE=.\InconsistentTypeCodeC.h

 # End Source File

 # Begin Source File

 

@@ -1579,14 +31094,6 @@ SOURCE=.\marshal.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.h

 # End Source File

 # Begin Source File

@@ -1599,18 +31106,10 @@ SOURCE=.\object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Operation_Table.h

 # End Source File

 # Begin Source File

@@ -1659,19 +31158,15 @@ SOURCE=.\poaC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\poaS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.h

+SOURCE=.\PolicyC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyC.h

+SOURCE=.\PolicyS.h

 # End Source File

 # Begin Source File

 

@@ -1683,10 +31178,6 @@ SOURCE=.\request.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Resource_Factory.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

@@ -1707,10 +31198,6 @@ SOURCE=.\Server_Strategy_Factory.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

@@ -1735,24 +31222,8 @@ SOURCE=.\typecode.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\varout.h

 # End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.h

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -1775,34 +31246,14 @@ SOURCE=.\connect.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_client.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_server.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAnyC.i

 # End Source File

 # Begin Source File

@@ -1819,10 +31270,6 @@ SOURCE=.\giop.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Server_Request.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_ORB.i

 # End Source File

 # Begin Source File

@@ -1835,14 +31282,6 @@ SOURCE=.\marshal.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\NVList.i

 # End Source File

 # Begin Source File

@@ -1855,10 +31294,6 @@ SOURCE=.\Object_KeyC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ObjectIDList.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\ORB.i

 # End Source File

 # Begin Source File

@@ -1879,18 +31314,10 @@ SOURCE=.\poaC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\poaS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\PolicyC.i

 # End Source File

 # Begin Source File

@@ -1911,10 +31338,6 @@ SOURCE=.\Server_Request.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\stub.i

 # End Source File

 # Begin Source File

@@ -1929,18 +31352,6 @@ SOURCE=.\Timeprobe.i
 

 SOURCE=.\typecode.i

 # End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.i

-# End Source File

 # End Group

 # Begin Group "Resource Files"

 

diff --git a/TAO/tao/TAO.h b/TAO/tao/TAO.h
index 1afe2695344..d0f96435887 100644
--- a/TAO/tao/TAO.h
+++ b/TAO/tao/TAO.h
@@ -44,13 +44,13 @@ public:
   ~TAO_ORB_Manager (void);
   // Destructor.
 
-  int init (int &argc,
+  int init (int& argc,
             char *argv[],
             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Initialize the ORB/root POA, using the supplied command line
   // arguments or the default ORB components.  Returns -1 on failure.
 
-  int init_child_poa (int &argc,
+  int init_child_poa (int& argc,
                       char *argv[],
                       char *poa_name,
                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -64,10 +64,6 @@ public:
   // can call this method multiple times to activate multiple objects.
   // Returns 0 on failure.
 
-  void deactivate (const char *id,
-                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // Deactivate object in RootPOA.
-
   CORBA::String activate_under_child_poa (const char *servant_name,
                                           PortableServer::Servant servant,
                                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
@@ -76,15 +72,8 @@ public:
   // servant_name. Users should call this to activate objects under
   // the child_poa.
 
-  void deactivate_under_child_poa (const char *id,
-                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // Deactivate object in child POA.
-
-  int run (CORBA_Environment &TAO_IN_ENV,
-           ACE_Time_Value *tv);
-  int run (ACE_Time_Value &tv,
-           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  int run (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  int run (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment (),
+           ACE_Time_Value *tv = 0);
   // Run the ORB event loop with the specified <tv> time value Returns
   // -1 on failure.
 
diff --git a/TAO/tao/TAO4.mak b/TAO/tao/TAO4.mak
index b8da83db9d9..c4530cf7c6d 100644
--- a/TAO/tao/TAO4.mak
+++ b/TAO/tao/TAO4.mak
@@ -70,7 +70,7 @@ CLEAN :
 	-@erase "$(INTDIR)\Exception.obj"

 	-@erase "$(INTDIR)\Forwarding_Servant.obj"

 	-@erase "$(INTDIR)\GIOP.obj"

-	-@erase "$(INTDIR)\CDR_Interpreter.obj"

+	-@erase "$(INTDIR)\IIOP_Interpreter.obj"

 	-@erase "$(INTDIR)\IIOP_Object.obj"

 	-@erase "$(INTDIR)\IIOP_ORB.obj"

 	-@erase "$(INTDIR)\Marshal.obj"

@@ -150,7 +150,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Exception.obj" \

 	"$(INTDIR)\Forwarding_Servant.obj" \

 	"$(INTDIR)\GIOP.obj" \

-	"$(INTDIR)\CDR_Interpreter.obj" \

+	"$(INTDIR)\IIOP_Interpreter.obj" \

 	"$(INTDIR)\IIOP_Object.obj" \

 	"$(INTDIR)\IIOP_ORB.obj" \

 	"$(INTDIR)\Marshal.obj" \

@@ -220,7 +220,7 @@ CLEAN :
 	-@erase "$(INTDIR)\Exception.obj"

 	-@erase "$(INTDIR)\Forwarding_Servant.obj"

 	-@erase "$(INTDIR)\GIOP.obj"

-	-@erase "$(INTDIR)\CDR_Interpreter.obj"

+	-@erase "$(INTDIR)\IIOP_Interpreter.obj"

 	-@erase "$(INTDIR)\IIOP_Object.obj"

 	-@erase "$(INTDIR)\IIOP_ORB.obj"

 	-@erase "$(INTDIR)\Marshal.obj"

@@ -305,7 +305,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\Exception.obj" \

 	"$(INTDIR)\Forwarding_Servant.obj" \

 	"$(INTDIR)\GIOP.obj" \

-	"$(INTDIR)\CDR_Interpreter.obj" \

+	"$(INTDIR)\IIOP_Interpreter.obj" \

 	"$(INTDIR)\IIOP_Object.obj" \

 	"$(INTDIR)\IIOP_ORB.obj" \

 	"$(INTDIR)\Marshal.obj" \

@@ -403,7 +403,7 @@ DEP_CPP_TYPEC=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -638,7 +638,7 @@ DEP_CPP_APPEN=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -873,7 +873,7 @@ DEP_CPP_CDR_C=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -1108,7 +1108,7 @@ DEP_CPP_CLIEN=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -1344,7 +1344,7 @@ DEP_CPP_CONNE=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -1586,7 +1586,7 @@ DEP_CPP_DEBUG=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -1821,7 +1821,7 @@ DEP_CPP_DECOD=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -2056,7 +2056,7 @@ DEP_CPP_DEEP_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -2291,7 +2291,7 @@ DEP_CPP_DEEP_F=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -2526,7 +2526,7 @@ DEP_CPP_DEFAU=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -2761,7 +2761,7 @@ DEP_CPP_DEFAUL=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -2996,7 +2996,7 @@ DEP_CPP_ENCOD=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -3231,7 +3231,7 @@ DEP_CPP_EXCEP=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -3466,7 +3466,7 @@ DEP_CPP_GIOP_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -3680,7 +3680,7 @@ DEP_CPP_GIOP_=\
 ################################################################################

 # Begin Source File

 

-SOURCE=.\CDR_Interpreter.cpp

+SOURCE=.\IIOP_Interpreter.cpp

 DEP_CPP_IIOP_=\

 	".\CurrentC.i"\

 	".\Object_KeyC.i"\

@@ -3708,7 +3708,7 @@ DEP_CPP_IIOP_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -3908,7 +3908,7 @@ DEP_CPP_IIOP_=\
 	{$(INCLUDE)}"\ace\ws2tcpip.h"\

 	

 

-"$(INTDIR)\CDR_Interpreter.obj" : $(SOURCE) $(DEP_CPP_IIOP_) "$(INTDIR)"

+"$(INTDIR)\IIOP_Interpreter.obj" : $(SOURCE) $(DEP_CPP_IIOP_) "$(INTDIR)"

 

 

 # End Source File

@@ -3943,7 +3943,7 @@ DEP_CPP_IIOP_O=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -4185,7 +4185,7 @@ DEP_CPP_IIOP_OR=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -4420,7 +4420,7 @@ DEP_CPP_MARSH=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -4655,7 +4655,7 @@ DEP_CPP_NVLIS=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -4890,7 +4890,7 @@ DEP_CPP_OBJEC=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -5125,7 +5125,7 @@ DEP_CPP_OBJECT=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -5360,7 +5360,7 @@ DEP_CPP_OBJECT_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -5595,7 +5595,7 @@ DEP_CPP_OPERA=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -5830,7 +5830,7 @@ DEP_CPP_ORB_C=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -6077,7 +6077,7 @@ DEP_CPP_ORB_CO=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -6325,7 +6325,7 @@ DEP_CPP_PARAM=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -6561,7 +6561,7 @@ DEP_CPP_POA_C=\
 	{$(INCLUDE)}"\.\Forwarding_Servant.h"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -6803,7 +6803,7 @@ DEP_CPP_POAC_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -7038,7 +7038,7 @@ DEP_CPP_POAS_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -7273,7 +7273,7 @@ DEP_CPP_POLIC=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -7508,7 +7508,7 @@ DEP_CPP_POLICY=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -7743,7 +7743,7 @@ DEP_CPP_PRINC=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -7981,7 +7981,7 @@ DEP_CPP_REQUE=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -8216,7 +8216,7 @@ DEP_CPP_SEQUE=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -8451,7 +8451,7 @@ DEP_CPP_SERVA=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -8686,7 +8686,7 @@ DEP_CPP_SERVE=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -8928,7 +8928,7 @@ DEP_CPP_SERVER=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -9164,7 +9164,7 @@ DEP_CPP_SKIP_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -9399,7 +9399,7 @@ DEP_CPP_STUB_=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -9635,7 +9635,7 @@ DEP_CPP_TAO_C=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -9870,7 +9870,7 @@ DEP_CPP_TAO_I=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -10106,7 +10106,7 @@ DEP_CPP_TYPECO=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -10341,7 +10341,7 @@ DEP_CPP_ANY_C=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -10577,7 +10577,7 @@ DEP_CPP_FORWA=\
 	{$(INCLUDE)}"\.\Forwarding_Servant.h"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -10812,7 +10812,7 @@ DEP_CPP_CURRE=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

@@ -11047,7 +11047,7 @@ DEP_CPP_CURREN=\
 	{$(INCLUDE)}"\.\Exception.i"\

 	{$(INCLUDE)}"\.\GIOP.h"\

 	{$(INCLUDE)}"\.\GIOP.i"\

-	{$(INCLUDE)}"\.\CDR_Interpreter.h"\

+	{$(INCLUDE)}"\.\IIOP_Interpreter.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.h"\

 	{$(INCLUDE)}"\.\IIOP_Object.i"\

 	{$(INCLUDE)}"\.\IIOP_ORB.h"\

diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index d13c7b405ba..0750c47d31d 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -6,60 +6,45 @@
 #include "ace/Object_Manager.h"
 #include "tao/default_server.h"
 #include "tao/default_client.h"
-#include "tao/default_resource.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID(tao, TAO_Internal, "$Id$")
 
-int TAO_Internal::service_open_count_ = 0;
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-const char *TAO_Internal::resource_factory_args_ = TAO_DEFAULT_RESOURCE_FACTORY_ARGS;
-const char *TAO_Internal::server_strategy_args_ = TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS;
-const char *TAO_Internal::client_strategy_args_ = TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
-#else
-const char *TAO_Internal::resource_factory_args_ = 0;
-const char *TAO_Internal::server_strategy_args_ = 0;
-const char *TAO_Internal::client_strategy_args_ = 0;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+ACE_STATIC_SVC_REQUIRE (TAO_Resource_Factory)
+ACE_STATIC_SVC_REQUIRE (TAO_Default_Server_Strategy_Factory)
+ACE_STATIC_SVC_REQUIRE (TAO_Default_Client_Strategy_Factory)
+#endif /* TAO_USES_STATIC_SERVICE */
 
-void
-TAO_Internal::default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_args,
-                                        const char *client_strategy_args)
-{
-  TAO_Internal::resource_factory_args_ = resource_factory_args;
-  TAO_Internal::server_strategy_args_ = server_strategy_args;
-  TAO_Internal::client_strategy_args_ = client_strategy_args;
-}
+int TAO_Internal::service_open_count_ = 0;
 
 int
-TAO_Internal::open_services (int& argc, char** argv, int ignore_default_svc_conf)
+TAO_Internal::open_services (int& argc, char** argv)
 {
   ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, *ACE_Static_Object_Lock::instance (), -1));
-#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
-  ignore_default_svc_conf = 1;
-#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
 
   if (TAO_Internal::service_open_count_++ == 0)
     {
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Resource_Factory);
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Client_Strategy_Factory);
-      ACE_Service_Config::static_svcs ()->
-        insert (&ace_svc_desc_TAO_Default_Server_Strategy_Factory);
-
+      int ignore_static_service = 1;
+      int ignore_default_svc_conf = 0;
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+      ignore_static_service = 0;
+#if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+      ignore_default_svc_conf = 1;
+#endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+#endif /* TAO_USES_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
       int retv = ACE_Service_Config::open (argc, argv,
                                            ACE_DEFAULT_LOGGER_KEY,
-                                           0, // Don't ignore static services.
+                                           ignore_static_service,
                                            ignore_default_svc_conf);
-
-      if (TAO_Internal::resource_factory_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::resource_factory_args_);
-      if (TAO_Internal::client_strategy_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::client_strategy_args_);
-      if (TAO_Internal::server_strategy_args_ != 0)
-        ACE_Service_Config::process_directive (TAO_Internal::server_strategy_args_);
-
+# if defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
+      ACE_Service_Config::process_directive
+        (TAO_DEFAULT_RESOURCE_FACTORY_ARGS);
+      ACE_Service_Config::process_directive
+        (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS);
+      ACE_Service_Config::process_directive
+        (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS);
+# endif /* TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
       return retv;
     }
   else
diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h
index 41e2a5d6d15..a2313147bc8 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -29,15 +29,12 @@ class TAO_Export TAO_Internal
   //    see this class.
 {
 public:
-  static int open_services (int& argc, char** argv, int ignore_default_svc_conf = 0);
+  static int open_services (int& argc, char** argv);
   // Initialize the ACE Service Configurator.  This is a one-shot
   // method, i.e., it can be called multiple times but it will only do
   // its work once.  It does, however, track the number of times it's
   // called (see <open_services>).  It is fully thread-safe.  Return 0
-  // if successful, -1 with errno set if failure.  You can provide
-  // your program a set of default svc.conf entries by setting
-  // <ignore_default_svc_conf> to non-zero and use
-  // default_svc_conf_entries() before calling open_services().
+  // if successful, -1 with errno set if failure.
 
   static int close_services (void);
   // The complement to <open_services>, this will perform appropriate
@@ -46,12 +43,6 @@ public:
   // things down on the last call.  It is fully thread-safe.  Return 0
   // if successful, -1 with errno set if failure.
 
-  static void default_svc_conf_entries (const char *resource_factory_args,
-                                        const char *server_strategy_args,
-                                        const char *client_strategy_args);
-  // Set default svc.conf content.  This call has no effect if This
-  // function must be called before first ORB initialization.
-
 private:
   TAO_Internal (void);
   // Private CTOR prevents this class from being instantiated.
@@ -60,10 +51,6 @@ private:
   // Number of times <open_services> has been called.  Incremented by
   // <open_services>, and decremented by <close_services>.  Access to
   // this is protected via the <ACE_Static_Object_Lock>.
-
-  static const char *resource_factory_args_;
-  static const char *server_strategy_args_;
-  static const char *client_strategy_args_;
 };
 
 #endif /* TAO_INTERNAL_H */
diff --git a/TAO/tao/TAO_Internal.i b/TAO/tao/TAO_Internal.i
new file mode 100644
index 00000000000..357b59f4a8d
--- /dev/null
+++ b/TAO/tao/TAO_Internal.i
@@ -0,0 +1,4 @@
+// -*- c++ -*-
+//
+// $Id$
+
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index 7d350fe13df..68a5c0a6825 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -24,7 +24,7 @@ CFG=TAO Static - Win32 Debug
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "LIB\Release"

 # PROP Target_Dir ""

 # 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

+# 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_INLINE__=0 /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409

 # ADD RSC /l 0x409

@@ -102,10 +102,6 @@ SOURCE=.\CDR.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Interpreter.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Client_Strategy_Factory.cpp

 # End Source File

 # Begin Source File

@@ -114,14 +110,6 @@ SOURCE=.\Connect.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Context.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\corbafwd.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\CurrentC.cpp

 # End Source File

 # Begin Source File

@@ -146,22 +134,10 @@ SOURCE=.\default_client.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_server.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAny_i.cpp

 # End Source File

 # Begin Source File

@@ -214,10 +190,6 @@ SOURCE=.\GIOP.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Server_Request.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_Acceptor.cpp

 # End Source File

 # Begin Source File

@@ -226,27 +198,27 @@ SOURCE=.\IIOP_Connector.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.cpp

+SOURCE=.\IIOP_Interpreter.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Transport.cpp

+SOURCE=.\IIOP_ORB.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\InconsistentTypeCodeC.cpp

+SOURCE=.\IIOP_Profile.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.cpp

+SOURCE=.\IIOP_Transport.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\IOR_LookupTable.cpp

+SOURCE=.\InconsistentTypeCodeC.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Key_Adapters.cpp

+SOURCE=.\Invocation.cpp

 # End Source File

 # Begin Source File

 

@@ -258,14 +230,6 @@ SOURCE=.\Marshal.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\MProfile.cpp

 # End Source File

 # Begin Source File

@@ -278,10 +242,6 @@ SOURCE=.\Object.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.cpp

 # End Source File

 # Begin Source File

@@ -314,18 +274,10 @@ SOURCE=.\POAC.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\POAS.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\PolicyC.cpp

 # End Source File

 # Begin Source File

@@ -342,10 +294,6 @@ SOURCE=.\Request.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Resource_Factory.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Sequence.cpp

 # End Source File

 # Begin Source File

@@ -362,10 +310,6 @@ SOURCE=.\Server_Strategy_Factory.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\skip.cpp

 # End Source File

 # Begin Source File

@@ -382,14 +326,6 @@ SOURCE=.\TAO_Internal.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\TimeBaseC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\TimeBaseS.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Typecode.cpp

 # End Source File

 # Begin Source File

@@ -400,22 +336,6 @@ SOURCE=.\Typecode_Constants.cpp
 

 SOURCE=.\Union.cpp

 # End Source File

-# Begin Source File

-

-SOURCE=.\ValueBase.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.cpp

-# End Source File

 # End Group

 # Begin Group "Header Files"

 

@@ -442,10 +362,6 @@ SOURCE=.\cdr.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\CDR_Interpreter.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Client_Strategy_Factory.h

 # End Source File

 # Begin Source File

@@ -458,10 +374,6 @@ SOURCE=.\corba.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\debug.h

 # End Source File

 # Begin Source File

@@ -470,18 +382,10 @@ SOURCE=.\default_client.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_server.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAny_i.h

 # End Source File

 # Begin Source File

@@ -526,10 +430,6 @@ SOURCE=.\giop.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Server_Request.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_Acceptor.h

 # End Source File

 # Begin Source File

@@ -538,35 +438,31 @@ SOURCE=.\IIOP_Connector.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\IIOP_Profile.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\IIOP_Transport.h

+SOURCE=.\IIOP_Interpreter.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\InconsistentTypeCodeC.h

+SOURCE=.\IIOP_ORB.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Invocation.h

+SOURCE=.\IIOP_Profile.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Types.h

+SOURCE=.\IIOP_Transport.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\marshal.h

+SOURCE=.\InconsistentTypeCodeC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.h

+SOURCE=.\Managed_Types.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingS.h

+SOURCE=.\marshal.h

 # End Source File

 # Begin Source File

 

@@ -582,10 +478,6 @@ SOURCE=.\object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Object_Adapter.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Object_KeyC.h

 # End Source File

 # Begin Source File

@@ -638,19 +530,15 @@ SOURCE=.\poaC.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\poaS.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.h

+SOURCE=.\PolicyC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\PolicyC.h

+SOURCE=.\PolicyS.h

 # End Source File

 # Begin Source File

 

@@ -662,10 +550,6 @@ SOURCE=.\request.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Resource_Factory.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\sequence.h

 # End Source File

 # Begin Source File

@@ -686,10 +570,6 @@ SOURCE=.\Server_Strategy_Factory.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\singletons.h

 # End Source File

 # Begin Source File

@@ -714,24 +594,8 @@ SOURCE=.\typecode.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\varout.h

 # End Source File

-# Begin Source File

-

-SOURCE=.\WrongTransactionC.h

-# End Source File

 # End Group

 # Begin Group "Inline Files"

 

@@ -754,10 +618,6 @@ SOURCE=.\connect.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\corbafwd.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\CurrentC.i

 # End Source File

 # Begin Source File

@@ -766,22 +626,10 @@ SOURCE=.\default_client.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\default_resource.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\default_server.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\DomainC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\DomainS_T.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\DynAnyC.i

 # End Source File

 # Begin Source File

@@ -798,10 +646,6 @@ SOURCE=.\giop.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\GIOP_Server_Request.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\IIOP_ORB.i

 # End Source File

 # Begin Source File

@@ -818,14 +662,6 @@ SOURCE=.\marshal.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\MessagingC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\MessagingS.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\NVList.i

 # End Source File

 # Begin Source File

@@ -862,18 +698,10 @@ SOURCE=.\poaC.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\POAManager.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\poaS.i

 # End Source File

 # Begin Source File

 

-SOURCE=.\Policy_Manager.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\PolicyC.i

 # End Source File

 # Begin Source File

@@ -906,10 +734,6 @@ SOURCE=.\Server_Request.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Services.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\stub.i

 # End Source File

 # Begin Source File

@@ -926,18 +750,6 @@ SOURCE=.\typecode.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\ValueBase.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\ValueFactory_Map.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\varout.i

 # End Source File

 # End Group

diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
deleted file mode 100644
index 3a74a4c8045..00000000000
--- a/TAO/tao/TimeBaseC.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseC.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#include "TimeBaseC.h"
-
-#include "TimeBaseS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, TimeBaseC, "$Id$")
-
-static const CORBA::Long _oc_TimeBase_TimeT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-  6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-  CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TimeT (CORBA::tk_alias, sizeof (_oc_TimeBase_TimeT), (char *) &_oc_TimeBase_TimeT, 0, sizeof (TimeBase::TimeT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TimeT, &_tc_TAO_tc_TimeBase_TimeT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_InaccuracyT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f496e61), ACE_NTOHL (0x63637572), ACE_NTOHL (0x61637954), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/TimeBase/InaccuracyT:1.0
-  12, ACE_NTOHL (0x496e6163), ACE_NTOHL (0x63757261), ACE_NTOHL (0x63795400),  // name = InaccuracyT
-  CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-    6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-    CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_InaccuracyT (CORBA::tk_alias, sizeof (_oc_TimeBase_InaccuracyT), (char *) &_oc_TimeBase_InaccuracyT, 0, sizeof (TimeBase::InaccuracyT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InaccuracyT, &_tc_TAO_tc_TimeBase_InaccuracyT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_TdfT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f546466), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-  5, ACE_NTOHL (0x54646654), ACE_NTOHL (0x0),  // name = TdfT
-  CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_TdfT (CORBA::tk_alias, sizeof (_oc_TimeBase_TdfT), (char *) &_oc_TimeBase_TdfT, 0, sizeof (TimeBase::TdfT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TdfT, &_tc_TAO_tc_TimeBase_TdfT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_UtcT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f557463), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/UtcT:1.0
-  5, ACE_NTOHL (0x55746354), ACE_NTOHL (0x0),  // name = UtcT
-  4, // member count
-    5, ACE_NTOHL (0x74696d65), ACE_NTOHL (0x0),  // name = time
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-    8, ACE_NTOHL (0x696e6163), ACE_NTOHL (0x636c6f00),  // name = inacclo
-    CORBA::tk_ulong,
-
-    8, ACE_NTOHL (0x696e6163), ACE_NTOHL (0x63686900),  // name = inacchi
-    CORBA::tk_ushort,
-
-    4, ACE_NTOHL (0x74646600),  // name = tdf
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f546466), ACE_NTOHL (0x543a312e), ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/TimeBase/TdfT:1.0
-      5, ACE_NTOHL (0x54646654), ACE_NTOHL (0x0),  // name = TdfT
-      CORBA::tk_short,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_UtcT (CORBA::tk_struct, sizeof (_oc_TimeBase_UtcT), (char *) &_oc_TimeBase_UtcT, 0, sizeof (TimeBase::UtcT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UtcT, &_tc_TAO_tc_TimeBase_UtcT)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_TimeBase_IntervalT[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f496e74), ACE_NTOHL (0x65727661), ACE_NTOHL (0x6c543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/IntervalT:1.0
-  10, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x7276616c), ACE_NTOHL (0x54000000),  // name = IntervalT
-  2, // member count
-    12, ACE_NTOHL (0x6c6f7765), ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400),  // name = lower_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-    12, ACE_NTOHL (0x75707065), ACE_NTOHL (0x725f626f), ACE_NTOHL (0x756e6400),  // name = upper_bound
-    CORBA::tk_alias, // typecode kind for typedefs
-    56, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x54696d65), ACE_NTOHL (0x42617365), ACE_NTOHL (0x2f54696d), ACE_NTOHL (0x65543a31), ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-      6, ACE_NTOHL (0x54696d65), ACE_NTOHL (0x54000000),  // name = TimeT
-      CORBA::tk_ulonglong,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_TimeBase_IntervalT (CORBA::tk_struct, sizeof (_oc_TimeBase_IntervalT), (char *) &_oc_TimeBase_IntervalT, 0, sizeof (TimeBase::IntervalT));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TimeBase)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IntervalT, &_tc_TAO_tc_TimeBase_IntervalT)
-TAO_NAMESPACE_END
-void operator<<= (CORBA::Any &_tao_any, const TimeBase::UtcT &_tao_elem) // copying
-{
-  TimeBase::UtcT *_any_val;
-  ACE_NEW (_any_val, TimeBase::UtcT (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_UtcT, _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, TimeBase::UtcT *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_UtcT, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::UtcT *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TimeBase::_tc_UtcT, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TimeBase::UtcT *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TimeBase::UtcT, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TimeBase::_tc_UtcT, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TimeBase::_tc_UtcT, _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 TimeBase::IntervalT &_tao_elem) // copying
-{
-  TimeBase::IntervalT *_any_val;
-  ACE_NEW (_any_val, TimeBase::IntervalT (_tao_elem));
-  if (!_any_val) return;
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_IntervalT, _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, TimeBase::IntervalT *_tao_elem) // non copying
-{
-  ACE_TRY_NEW_ENV
-  {
-    _tao_any.replace (TimeBase::_tc_IntervalT, _tao_elem, 1, ACE_TRY_ENV); // consume it
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY {}
-  ACE_ENDTRY;
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, TimeBase::IntervalT *&_tao_elem)
-{
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::TypeCode_var type = _tao_any.type ();
-    if (!type->equal (TimeBase::_tc_IntervalT, ACE_TRY_ENV)) return 0; // not equal
-    ACE_TRY_CHECK;
-    if (_tao_any.any_owns_data ())
-    {
-      _tao_elem = (TimeBase::IntervalT *)_tao_any.value ();
-      return 1;
-      }
-    else
-    {
-      ACE_NEW_RETURN (_tao_elem, TimeBase::IntervalT, 0);
-      TAO_InputCDR stream (_tao_any._tao_get_cdr ());
-      if (stream.decode (TimeBase::_tc_IntervalT, _tao_elem, 0, ACE_TRY_ENV)
-        == CORBA::TypeCode::TRAVERSE_CONTINUE)
-      {
-        ((CORBA::Any *)&_tao_any)->replace (TimeBase::_tc_IntervalT, _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;
-}
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
deleted file mode 100644
index 4f21b84929a..00000000000
--- a/TAO/tao/TimeBaseC.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseC.h
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl, the common time representation for
-//   Time in CORBA.
-//   The code was generated by the IDL compiler and then hand-crafted
-//   to reduce the includes interdependencies.
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASEC_H
-#define TAO_IDL_TIMEBASEC_H
-
-#include "tao/Any.h"
-#include "tao/CDR.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 TAO_Export
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_NAMESPACE  TimeBase
-{
-  typedef CORBA::ULongLong TimeT;
-  typedef CORBA::ULongLong_out TimeT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TimeT;
-
-  typedef TimeT InaccuracyT;
-  typedef TimeT_out InaccuracyT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InaccuracyT;
-
-  typedef CORBA::Short TdfT;
-  typedef CORBA::Short_out TdfT_out;
-    TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TdfT;
-
-  struct TAO_Export UtcT
-  {
-    TimeT time;
-    CORBA::ULong inacclo;
-    CORBA::UShort inacchi;
-    TdfT tdf;
-  };
-
-  class TAO_Export UtcT_var
-  {
-  public:
-    UtcT_var (void); // default constructor
-    UtcT_var (UtcT *);
-    UtcT_var (const UtcT_var &); // copy constructor
-    ~UtcT_var (void); // destructor
-
-    UtcT_var &operator= (UtcT *);
-    UtcT_var &operator= (const UtcT_var &);
-    UtcT *operator-> (void);
-    const UtcT *operator-> (void) const;
-
-    operator const UtcT &() const;
-    operator UtcT &();
-    operator UtcT &() const;
-    // in, inout, out, _retn
-    const UtcT &in (void) const;
-    UtcT &inout (void);
-    UtcT &out (void);
-    UtcT _retn (void);
-    UtcT *ptr (void) const;
-
-  private:
-    UtcT *ptr_;
-  };
-
-  typedef UtcT &UtcT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UtcT;
-
-  struct TAO_Export IntervalT
-  {
-    TimeT lower_bound;
-    TimeT upper_bound;
-  };
-
-  class TAO_Export IntervalT_var
-  {
-  public:
-    IntervalT_var (void); // default constructor
-    IntervalT_var (IntervalT *);
-    IntervalT_var (const IntervalT_var &); // copy constructor
-    ~IntervalT_var (void); // destructor
-
-    IntervalT_var &operator= (IntervalT *);
-    IntervalT_var &operator= (const IntervalT_var &);
-    IntervalT *operator-> (void);
-    const IntervalT *operator-> (void) const;
-
-    operator const IntervalT &() const;
-    operator IntervalT &();
-    operator IntervalT &() const;
-    // in, inout, out, _retn
-    const IntervalT &in (void) const;
-    IntervalT &inout (void);
-    IntervalT &out (void);
-    IntervalT _retn (void);
-    IntervalT *ptr (void) const;
-
-  private:
-    IntervalT *ptr_;
-  };
-
-  typedef IntervalT &IntervalT_out;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IntervalT;
-
-
-}; // module TimeBase
-
-void TAO_Export operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TimeBase::UtcT *&);
-void TAO_Export operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-void TAO_Export operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-CORBA::Boolean TAO_Export operator>>= (const CORBA::Any &, TimeBase::IntervalT *&);
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseC.i"
-#else
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TimeBase::UtcT &);
-CORBA::Boolean TAO_Export operator<< (TAO_OutputCDR &, const TimeBase::IntervalT &);
-CORBA::Boolean TAO_Export operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_TIMEBASEC_H */
diff --git a/TAO/tao/TimeBaseC.i b/TAO/tao/TimeBaseC.i
deleted file mode 100644
index b319880585e..00000000000
--- a/TAO/tao/TimeBaseC.i
+++ /dev/null
@@ -1,271 +0,0 @@
-// $Id$
-
-// *************************************************************
-// Inline operations for class TimeBase::UtcT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (TimeBase::UtcT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::UtcT_var::UtcT_var (const TimeBase::UtcT_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TimeBase::UtcT(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::~UtcT_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (TimeBase::UtcT *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TimeBase::UtcT_var &
-TimeBase::UtcT_var::operator= (const TimeBase::UtcT_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::UtcT (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT *
-TimeBase::UtcT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator const TimeBase::UtcT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator TimeBase::UtcT &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::UtcT_var::operator TimeBase::UtcT &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const TimeBase::UtcT &
-TimeBase::UtcT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT &
-TimeBase::UtcT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE TimeBase::UtcT &
-TimeBase::UtcT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT
-TimeBase::UtcT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::UtcT *
-TimeBase::UtcT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// Inline operations for class TimeBase::IntervalT_var
-// *************************************************************
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (void) // default constructor
-  : ptr_ (0)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (TimeBase::IntervalT *p)
-  : ptr_ (p)
-{}
-
-ACE_INLINE
-TimeBase::IntervalT_var::IntervalT_var (const TimeBase::IntervalT_var &p) // copy constructor
-{
-  if (p.ptr_)
-    this->ptr_ = new TimeBase::IntervalT(*p.ptr_);
-  else
-    this->ptr_ = 0;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::~IntervalT_var (void) // destructor
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (TimeBase::IntervalT *p)
-{
-  delete this->ptr_;
-  this->ptr_ = p;
-  return *this;
-}
-
-ACE_INLINE TimeBase::IntervalT_var &
-TimeBase::IntervalT_var::operator= (const TimeBase::IntervalT_var &p)
-{
-  if (this != &p)
-  {
-    delete this->ptr_;
-    this->ptr_ = new TimeBase::IntervalT (*p.ptr_);
-  }
-  return *this;
-}
-
-ACE_INLINE const TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT *
-TimeBase::IntervalT_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator const TimeBase::IntervalT &() const // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator TimeBase::IntervalT &() // cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE
-TimeBase::IntervalT_var::operator TimeBase::IntervalT &() const// cast
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE const TimeBase::IntervalT &
-TimeBase::IntervalT_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT &
-TimeBase::IntervalT_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-// mapping for fixed size
-ACE_INLINE TimeBase::IntervalT &
-TimeBase::IntervalT_var::out (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT
-TimeBase::IntervalT_var::_retn (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE TimeBase::IntervalT *
-TimeBase::IntervalT_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::UtcT &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.time) &&
-    (strm << _tao_aggregate.inacclo) &&
-    (strm << _tao_aggregate.inacchi) &&
-    (strm << _tao_aggregate.tdf)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::UtcT &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.time) &&
-    (strm >> _tao_aggregate.inacclo) &&
-    (strm >> _tao_aggregate.inacchi) &&
-    (strm >> _tao_aggregate.tdf)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TimeBase::IntervalT &_tao_aggregate)
-{
-  if (
-    (strm << _tao_aggregate.lower_bound) &&
-    (strm << _tao_aggregate.upper_bound)
-  )
-    return 1;
-  else
-    return 0;
-
-}
-
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, TimeBase::IntervalT &_tao_aggregate)
-{
-  if (
-    (strm >> _tao_aggregate.lower_bound) &&
-    (strm >> _tao_aggregate.upper_bound)
-  )
-    return 1;
-  else
-    return 0;
-
-}
diff --git a/TAO/tao/TimeBaseS.cpp b/TAO/tao/TimeBaseS.cpp
deleted file mode 100644
index 668cc8c6ae9..00000000000
--- a/TAO/tao/TimeBaseS.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#include "TimeBaseS.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* !defined INLINE */
-
-ACE_RCSID(tao, TimeBaseS, "$Id$")
diff --git a/TAO/tao/TimeBaseS.h b/TAO/tao/TimeBaseS.h
deleted file mode 100644
index dc854c5a681..00000000000
--- a/TAO/tao/TimeBaseS.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS.h
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//   The file is almost empty and only present to keep other IDL files
-//   that include TimeBase.pidl happy.
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_H
-#define TAO_IDL_TIMEBASES_H
-
-#include "TimeBaseC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TimeBaseS_T.h"
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS.i"
-#endif /* defined INLINE */
-
-#endif /* TAO_IDL_TIMEBASES_H */
diff --git a/TAO/tao/TimeBaseS.i b/TAO/tao/TimeBaseS.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/TimeBaseS.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/TimeBaseS_T.cpp b/TAO/tao/TimeBaseS_T.cpp
deleted file mode 100644
index fb85a396231..00000000000
--- a/TAO/tao/TimeBaseS_T.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_T_CPP
-#define TAO_IDL_TIMEBASES_T_CPP
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#include "TimeBaseS_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* !defined INLINE */
-
-
-#endif /* TAO_IDL_TIMEBASES_T_CPP */
diff --git a/TAO/tao/TimeBaseS_T.h b/TAO/tao/TimeBaseS_T.h
deleted file mode 100644
index ea740cb51e3..00000000000
--- a/TAO/tao/TimeBaseS_T.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- C++ -*- */
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   TimeBaseS_T.cpp
-//
-// = DESCRIPTION
-//   Generated from TimeBase.pidl
-//
-// ================================================================
-
-#ifndef TAO_IDL_TIMEBASES_T_H
-#define TAO_IDL_TIMEBASES_T_H
-
-#if defined(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-
-#if defined (__ACE_INLINE__)
-#include "TimeBaseS_T.i"
-#endif /* defined INLINE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "TimeBaseS_T.cpp"
-#endif /* defined REQUIRED SOURCE */
-
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("TimeBaseS_T.cpp")
-#endif /* defined REQUIRED PRAGMA */
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_IDL_TIMEBASES_T_H */
diff --git a/TAO/tao/TimeBaseS_T.i b/TAO/tao/TimeBaseS_T.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/TimeBaseS_T.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Timeprobe.h b/TAO/tao/Timeprobe.h
index 2967a794ebb..dc801dc2290 100644
--- a/TAO/tao/Timeprobe.h
+++ b/TAO/tao/Timeprobe.h
@@ -11,62 +11,6 @@
 
 #include "ace/Timeprobe.h"
 
-// The macro for turning off all timeprobes except
-// the ones that are pertinent to pluggable protocols.
-//#define TAO_SELECT_PP_TIMEPROBES
-
-// The macro for turning off all timeprobes except
-// four - 2 to measure client send time and 2 to measure
-// server upcall processing and return time.
-// NOTE: If both this and the pluggable protocols macro
-// above are defined, code below will undefine this macro.
-// They should not both be defined at the same time.
-//#define TAO_SELECT_MINIMAL_TIMEPROBES
-
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-# define TAO_PP_TIMEPROBE(id) \
-         ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X) \
-         ACE_Function_Timeprobe<ACE_TIMEPROBE_WITH_LOCKING> \
-         function_timeprobe (*ACE_TIMEPROBE_SINGLETON::instance (), X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-# if defined (TAO_SELECT_PP_TIMEPROBES)
-#   if defined TAO_SELECT_MINIMAL_TIMEPROBES
-#     undef TAO_SELECT_MINIMIAL_TIMEPROBES
-#   endif /* TAO_SELECT_MINIMAL_TIMEPROBES */
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   define TAO_MINIMAL_TIMEPROBE(id)
-# endif /* TAO_SELECT_PP_TIMEPROBES */
-
-# if defined (TAO_SELECT_MINIMAL_TIMEPROBES)
-#   undef TAO_MINIMAL_TIMEPROBE
-#   define TAO_MINIMAL_TIMEPROBE(id) \
-           ACE_TIMEPROBE_SINGLETON::instance ()->timeprobe (id)
-#   undef ACE_TIMEPROBE
-#   define ACE_TIMEPROBE(id)
-#   undef ACE_FUNCTION_TIMEPROBE
-#   define ACE_FUNCTION_TIMEPROBE(X)
-#   undef TAO_PP_TIMEPROBE
-#   define TAO_PP_TIMEPROBE(id)
-#   undef TAO_FUNCTION_PP_TIMEPROBE
-#   define TAO_FUNCTION_PP_TIMEPROBE(X)
-# endif /* TAO_SELECT_MINIMAL_TIMEPROBES */   
-
-#else /* ACE_ENABLE_TIMEPROBES */
-
-# define TAO_PP_TIMEPROBE(id)
-# define TAO_FUNCTION_PP_TIMEPROBE(X)
-# define TAO_MINIMAL_TIMEPROBE(id)
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 2abaa4b6f2a..26a01a726b6 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -16,9 +16,8 @@
 #include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/Exception.h"
-#include "tao/CDR_Interpreter.h"
+#include "tao/IIOP_Interpreter.h"
 #include "tao/Principal.h"
-#include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Typecode.i"
@@ -93,8 +92,6 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind)
     byte_order_ (0),
     kind_ (kind),
     parent_ (0),
-    tc_base_ (0),
-    root_tc_base_ (0),
     refcount_ (1),
     orb_owns_ (1),
     private_state_ (new TC_Private_State (kind)),
@@ -214,15 +211,6 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
       // to remain dangling. Hence we save a handle to the original
       // allocated buffer.
 
-      // *NOTE* that the buffer parameter is simply our encapsulation. It does
-      // not contain our TypeCode::kind () and the length. These are passed as
-      // separate parameters. However, in case of indirected typecodes, the
-      // offset value for the indirection will effectively point to the tk_kind
-      // field in our CDR representation. Hence, we introduce a new field
-      // called tc_base_ which represents the start of our CDR
-      // representation. The buffer_ data member will point to our
-      // encapsulation. 
-
       // @@ The typecode buffer contain the encapsulation byte order
       // in the first byte...
       const CORBA::Octet *ptr =
@@ -230,27 +218,14 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
                               buffer);
       this->byte_order_ = *ptr;
 
-      // allocate a buffer which will accomodate our entire encapsulation plus
-      // 4 bytes for our tk_kind value and 4 bytes for our encapsulation
-      // length. The extra MAX_ALIGNMENT bytes are necessary to ensure that we
-      // will get a properly aligned buffer.
-
       ACE_NEW (this->non_aligned_buffer_,
-               char [this->length_ + 4 + 4 + ACE_CDR::MAX_ALIGNMENT]);
+               char [this->length_ + CDR::MAX_ALIGNMENT]);
 
       char* start = ptr_align_binary (this->non_aligned_buffer_,
-                                      ACE_CDR::MAX_ALIGNMENT);
-
-      (void) ACE_OS::memcpy (start, &this->kind_, 4);
-      (void) ACE_OS::memcpy (start + 4, &this->length_, 4);
-      (void) ACE_OS::memcpy (start + 8, buffer, this->length_);
-      // we are the topmost level typecode and hence our typecode base is
-      // the start whereas the buffer_ which represents the encapsulation is 8
-      // bytes ahead of the typecode base
-      this->tc_base_ = start;
-      // since we do not have any parents, we are the root
-      this->root_tc_base_ = start;
-      this->buffer_ = start + 4 + 4;
+                                      CDR::MAX_ALIGNMENT);
+
+      (void) ACE_OS::memcpy (start, buffer, this->length_);
+      this->buffer_ = start;
       this->private_state_->tc_size_known_ = 1;
       this->private_state_->tc_size_ = size;
     }
@@ -264,10 +239,6 @@ CORBA_TypeCode::CORBA_TypeCode (CORBA::TCKind kind,
       this->byte_order_ = *ptr;
 
       this->buffer_ = buffer;
-      // our typecode base is 8 bytes prior to our encapsulation and our root
-      // base is the same as that of our parent's
-      this->tc_base_ = this->buffer_ - 8;
-      this->root_tc_base_ = parent->root_tc_base_;
     }
 }
 
@@ -559,125 +530,125 @@ TC_Private_State::~TC_Private_State (void)
   // determine what kind of children we may have and free the space accordingly
   switch (this->tc_kind_)
     {
-      case CORBA::tk_enum:
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-	            this->tc_member_name_list_ = 0;
-            }
-          break;
+    case CORBA::tk_enum:
+        // free up the member name list
+        if (this->tc_member_name_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+	      {
+		CORBA::string_free (this->tc_member_name_list_ [i]);
+		this->tc_member_name_list_ [i] = 0;
+	      }
+
+            delete [] this->tc_member_name_list_;
+	    this->tc_member_name_list_ = 0;
+          }
+        break;
 
-      case CORBA::tk_struct:
-      case CORBA::tk_except:
-        {
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-	            this->tc_member_name_list_ = 0;
-            }
+    case CORBA::tk_struct:
+    case CORBA::tk_except:
+      {
+        // free up the member name list
+        if (this->tc_member_name_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+	      {
+		CORBA::string_free (this->tc_member_name_list_ [i]);
+		this->tc_member_name_list_ [i] = 0;
+	      }
+
+            delete [] this->tc_member_name_list_;
+	    this->tc_member_name_list_ = 0;
+          }
 
-          // free up member type list
-          if (this->tc_member_type_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::release (this->tc_member_type_list_[i]);
-	              }
-
-              // Now free up the array.
-              delete [] this->tc_member_type_list_;
-	            this->tc_member_type_list_ = 0;
-            }
-          this->tc_member_count_ = 0;
-        }
-        break;
+        // free up member type list
+        if (this->tc_member_type_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+	      {
+		CORBA::release (this->tc_member_type_list_[i]);
+	      }
+
+            // Now free up the array.
+            delete [] this->tc_member_type_list_;
+	    this->tc_member_type_list_ = 0;
+          }
+        this->tc_member_count_ = 0;
+      }
+      break;
 
-      case CORBA::tk_sequence:
-      case CORBA::tk_array:
-      case CORBA::tk_alias:
-        // Delete the content type only if it has a parent i.e., if it
-        // is not acquired from the pool of constant or predefined
-        // typecodes.
-        if (this->tc_content_type_known_ && this->tc_content_type_ != 0)
-	        {
-	          CORBA::release (this->tc_content_type_);
-	          this->tc_content_type_ = 0;
-	        }
-        break;
+    case CORBA::tk_sequence:
+    case CORBA::tk_array:
+    case CORBA::tk_alias:
+      // Delete the content type only if it has a parent i.e., if it
+      // is not acquired from the pool of constant or predefined
+      // typecodes.
+      if (this->tc_content_type_known_ && this->tc_content_type_ != 0)
+	{
+	  CORBA::release (this->tc_content_type_);
+	  this->tc_content_type_ = 0;
+	}
+      break;
 
-      case CORBA::tk_union:
-        {
-          // free up the member name list
-          if (this->tc_member_name_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-		              CORBA::string_free (this->tc_member_name_list_ [i]);
-		              this->tc_member_name_list_ [i] = 0;
-	              }
-
-              delete [] this->tc_member_name_list_;
-            }
+    case CORBA::tk_union:
+      {
+        // free up the member name list
+        if (this->tc_member_name_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+	      {
+		CORBA::string_free (this->tc_member_name_list_ [i]);
+		this->tc_member_name_list_ [i] = 0;
+	      }
+
+            delete [] this->tc_member_name_list_;
+          }
 
-          // Free up type list, label list, and finally the discriminator
-          if (this->tc_member_type_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-	              {
-                  CORBA::release (this->tc_member_type_list_[i]);
-	              }
-
-              // Now free up the array.
-              delete [] this->tc_member_type_list_;
-	            this->tc_member_type_list_ = 0;
-            }
-          if (this->tc_member_label_list_known_)
-            {
-              for (CORBA::ULong i = 0;
-                   i < this->tc_member_count_;
-                   i++)
-                // Free up the label (Any_ptr).
-                delete this->tc_member_label_list_[i];
-
-              delete [] this->tc_member_label_list_;
-	            this->tc_member_label_list_ = 0;
-            }
-          this->tc_member_count_ = 0;
+        // Free up type list, label list, and finally the discriminator
+        if (this->tc_member_type_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+	      {
+                CORBA::release (this->tc_member_type_list_[i]);
+	      }
+
+            // Now free up the array.
+            delete [] this->tc_member_type_list_;
+	    this->tc_member_type_list_ = 0;
+          }
+        if (this->tc_member_label_list_known_)
+          {
+            for (CORBA::ULong i = 0;
+                 i < this->tc_member_count_;
+                 i++)
+              // Free up the label (Any_ptr).
+              delete this->tc_member_label_list_[i];
+
+            delete [] this->tc_member_label_list_;
+	    this->tc_member_label_list_ = 0;
+          }
+        this->tc_member_count_ = 0;
 
-          // Discriminator must come last b/c it will be inside the Any
-          // in each element of the label list.
-          CORBA::release (this->tc_discriminator_type_);
-	        this->tc_discriminator_type_ = 0;
-        }
-        break;
+        // Discriminator must come last b/c it will be inside the Any
+        // in each element of the label list.
+        CORBA::release (this->tc_discriminator_type_);
+	this->tc_discriminator_type_ = 0;
+      }
+      break;
 
-      default:
-        // nothing to do
-        break;
+    default:
+      // nothing to do
+      break;
     }
 }
 
@@ -1268,7 +1239,7 @@ CORBA_TypeCode::private_name (CORBA::Environment &env) const
             return this->private_state_->tc_name_;
           }
         else
-          TAO_THROW_ENV_RETURN (CORBA::INTERNAL (), env, (CORBA::String)0);
+          TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, (CORBA::String)0);
       }
     // No other typecodes ever have type IDs.
     default:
@@ -1312,7 +1283,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const
         if (!stream.skip_string ()          // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         this->private_state_->tc_member_count_known_ = 1;
         this->private_state_->tc_member_count_ = members;
@@ -1338,14 +1309,14 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const
             || !skip_typecode (stream)          // discriminant TC
             || !stream.read_ulong (members)      // default used
             || !stream.read_ulong (members))     // real member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         this->private_state_->tc_member_count_known_ = 1;
         this->private_state_->tc_member_count_ = members;
         return this->private_state_->tc_member_count_;
       }
     default:
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
     }
   ACE_NOTREACHED (return 0);
 }
@@ -1397,13 +1368,13 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
         this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
 
         if (this->private_state_->tc_member_type_list_ == 0)
-          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !stream.read_ulong (temp))  // member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0);
 
         // compute the typecodes for all the members and
         // return the required one.
@@ -1411,7 +1382,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
           // the ith entry will have the typecode of the ith guy
           {
             if (!stream.skip_string ())  // skip the name
-              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
             CORBA::TypeCode::traverse_status status =
               stream.decode (CORBA::_tc_TypeCode,
                              // the typecode will be
@@ -1432,7 +1403,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
             TAO_CHECK_ENV_RETURN (env, 0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
           }
 
         this->private_state_->tc_member_type_list_known_ = 1;
@@ -1464,16 +1435,16 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
       // @@EXC@@ Need to check allocation failure.
         this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount];
         if (this->private_state_->tc_member_type_list_ == 0)
-          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0);
 
       // skip the id, name, and discrimant type part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !skip_typecode (stream))   // skip typecode for discriminant
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (CORBA::TypeCode_ptr)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0);
         else if (!stream.read_ulong (temp)     // default used
                  || !stream.read_ulong (temp)) // member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
         // Always big enough because labels can only be of a
         // few different types of which "long" has the
         // largest size.
@@ -1495,7 +1466,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
                 || !stream.skip_string ())  // skip the name
-              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
             status =  stream.decode (CORBA::_tc_TypeCode,  // get the typecode
                                      &private_state_->tc_member_type_list_[i],
@@ -1504,7 +1475,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index,
             TAO_CHECK_ENV_RETURN (env, 0);
 
             if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
           }
         this->private_state_->tc_member_type_list_known_ = 1;
 
@@ -1561,20 +1532,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (char *)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()     // type ID, hidden
             || !stream.skip_string ()     // enum name
             || !stream.read_ulong (temp)) // member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0);
 
       // compute the typecodes for all the members and
       // return the required one.
         for (CORBA::ULong i = 0; i < mcount; i++)
           // now skip this name
           if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]))
-            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
+            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0);
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
@@ -1608,20 +1579,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (char *)0);
 
         // skip the id, name, and member_count part
         if (!stream.skip_string ()     // type ID, hidden
             || !stream.skip_string ()     // struct/except name
             || !stream.read_ulong (temp)) // member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0);
 
           // compute the typecodes for all the members and
           // return the required one.
         for (CORBA::ULong i = 0; i < mcount; i++)
           if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
               || !skip_typecode (stream))
-            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+            TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         this->private_state_->tc_member_name_list_known_ = 1;
 
@@ -1654,16 +1625,16 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index,
 
         if (this->private_state_->tc_member_name_list_ == 0)
           // no memory for the member_list
-          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, 0);
 
         // skip the id, name, and discrimant type part
         if (!stream.skip_string ()        // type ID, hidden
             || !stream.skip_string ()     // typedef name
             || !skip_typecode (stream))   // skip typecode for discriminant
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, (char *)0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0);
         else if (!stream.read_ulong (temp)     // default used
                  || !stream.read_ulong (temp)) // member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
         else
           {
             CORBA::Long scratch; // always big enough because labels can
@@ -1684,12 +1655,12 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index,
                 TAO_CHECK_ENV_RETURN (env, 0);
 
                 if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-                  TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+                  TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
                 // skip typecode for member
                 if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])
                     || (!skip_typecode (stream))) // skip typecode
-                  TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (), env, 0);
+                  TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
               }
 
             this->private_state_->tc_member_name_list_known_ = 1;
@@ -1712,21 +1683,24 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index,
 // Return member labels for CORBA::tk_union typecodes.
 CORBA::Any_ptr
 CORBA_TypeCode::private_member_label (CORBA::ULong n,
-                                      CORBA::Environment &ACE_TRY_ENV) const
+                                      CORBA::Environment &env) const
 {
+  env.clear ();
+
   // this function is only applicable to the CORBA::tk_union TC
   if (this->kind_ != CORBA::tk_union)
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::BadKind (), env, 0);
 
-  TAO_InputCDR stream (this->buffer_+4,
-                       this->length_-4,
+  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
 
-  // skip ID and name
+  // skip ID and name, and then get the discriminant TC
+  CORBA::TypeCode_ptr    tc = 0;
+
   if (!stream.skip_string ()       // type ID, hidden
       || !stream.skip_string ()    // typedef name
       || !skip_typecode (stream))  // skip discriminant typecode
-    ACE_THROW_RETURN (CORBA::TypeCode::BadKind (), 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
       // skip default used, and get member count
   CORBA::ULong member_count;
@@ -1737,7 +1711,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
       ACE_DEBUG ((LM_DEBUG,
                   "TypeCode::private_member_label -- "
                   "error reading from stream"));
-    ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0);
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
     }
 
   // Double checked locking...
@@ -1747,87 +1721,69 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n,
     if (n < member_count)
       return this->private_state_->tc_member_label_list_[n];
     else
-      ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  // member labels are of type Any. However, the actual types are
-  // restricted to simple types
-
-
-  // @@EXC@@ We should use Auto_Ptr_Array to make this exception
-  // safe.
-  CORBA::Any_ptr* label_list;
-  ACE_NEW_THROW_EX (label_list,
-                    CORBA::Any_ptr [member_count],
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  // get the discriminant TC
-  CORBA::TypeCode_ptr tc = this->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (0);
+      TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+
+      // member labels are of type Any. However, the actual types are
+      // restricted to simple types
+      // @@EXC@@ We need a macro here to use new (nothrow()) xxx.
+  this->private_state_->tc_member_label_list_ = new CORBA::Any_ptr [member_count];
+  if (this->private_state_->tc_member_label_list_ == 0)
+    TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, 0);
+
+  tc = this->discriminator_type (env);
+  // retrieve the discriminator type as this decides what the
+  // label is
+  TAO_CHECK_ENV_RETURN (env, 0);
 
   for (CORBA::ULong i = 0; i < member_count; i++)
     {
-      // Create an any from the portion of the CDR stream created
-      // above.....
-
-      // @@ This code assumes that the stream is a single message
-      //    block, this is perfectly OK [the stream is created from a
-      //    single buffer], but we may need to change this is the
-      //    stream creation changes. [Carlos]
-      TAO_InputCDR temp (stream);
-
-      char *begin = stream.rd_ptr ();
-      int retval = temp.skip (tc, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
-
-      char* end = temp.rd_ptr ();
-
-      // We need to allocate more memory than in the original
-      // stream, first to guarantee that the buffer is aligned in
-      // memory and next because the realignment may introduce
-      // extra padding. 2*MAX_ALIGNMENT should be enough.
-      // @@EXC@@ This doesn't seem to be exception safe.
-      TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT,
-                         ACE_CDR_BYTE_ORDER,
-                         ACE_Allocator::instance (),
-                         ACE_Allocator::instance ());
-
-      retval = out.append (tc, &stream, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-      if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-        return 0;
+      // allocate buffer to hold the member label value
+      // @@EXC@@ Also need to check for buf == 0.
+      CORBA::Octet *buf = 0;
+      buf = new CORBA::Octet [tc->size (env)];
+      TAO_CHECK_ENV_RETURN (env, 0);
 
-      // @@EXC@@ Need to check memory allocation failure.
-      ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (tc, 0, out.begin ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
+      CORBA::TypeCode::traverse_status status =
+        CORBA::TypeCode::TRAVERSE_STOP;
 
-      if (stream.skip_string () == 0
-          || this->skip_typecode (stream) == 0)
+      TAO_TRY_VAR (env)
+        {
+          status = stream.decode (tc, buf, this, env);
+          TAO_CHECK_ENV;
+        }
+      TAO_CATCHANY
+        {
+          delete [] buf;
+          TAO_RETHROW_SAME_ENV_RETURN (0);
+        }
+      TAO_ENDTRY;
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
+          || !stream.skip_string ()         // member name
+          || !skip_typecode (stream)) // member type
+        {           // member TC
+          ACE_DEBUG ((LM_DEBUG,
+                      "TypeCode::private_member_label -- "
+                      "error getting typecode for member %d",i));
+          delete [] buf;
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+        }
+      else
         {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "TypeCode::private_member_label "
-                        "error getting typecode for member %d\n",
-                        i));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            0);
+          // @@EXC@@ Need to check memory allocation failure.
+          this->private_state_->tc_member_label_list_[i] = new
+            CORBA::Any (tc, buf, 1);
         }
     }
 
-  this->private_state_->tc_member_label_list_ = label_list;
   this->private_state_->tc_member_label_list_known_ = 1;
 
-  // If caller asked for the label for a nonexistent member, they get
-  // an error report!
+      // If caller asked for the label for a nonexistent member, they get
+      // an error report!
   if (n >= member_count)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->private_state_->tc_member_label_list_[n];
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+  else
+    return this->private_state_->tc_member_label_list_[n];
 }
 
 CORBA::TypeCode_ptr
@@ -1849,7 +1805,7 @@ CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const
       || stream.decode (CORBA::_tc_TypeCode,
                         &this->private_state_->tc_discriminator_type_, this,
                         env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
   this->private_state_->tc_discriminator_type_known_ = 1;
   return this->private_state_->tc_discriminator_type_;
@@ -1873,7 +1829,7 @@ CORBA_TypeCode::private_default_index (CORBA::Environment &env) const
       || !stream.skip_string ()         // typedef name
       || !skip_typecode (stream)        // skip discriminant
       || !stream.read_long (this->private_state_->tc_default_index_used_))
-    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
   this->private_state_->tc_default_index_used_known_ = 1;
   return this->private_state_->tc_default_index_used_;
@@ -1898,7 +1854,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const
         // skip the typecode of the element and get the bounds
         if (!skip_typecode (stream) // skip typecode
             || !stream.read_ulong (this->private_state_->tc_length_))
-          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
         else
           {
             this->private_state_->tc_length_known_ = 1;
@@ -1922,7 +1878,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const
             return this->private_state_->tc_length_;
           }
         else
-          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
       }
       ACE_NOTREACHED (break);
 
@@ -1957,7 +1913,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
         TAO_CHECK_ENV_RETURN (env, 0);
 
         if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // element type
-          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
         else
           {
             this->private_state_->tc_content_type_known_ = 1;
@@ -1976,7 +1932,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
 
         if (!stream.skip_string ()  // typeID
             || !stream.skip_string ()) // name
-          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
 
         status = stream.decode (CORBA::_tc_TypeCode,
                                 &this->private_state_->tc_content_type_, this,
@@ -1984,7 +1940,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const
         TAO_CHECK_ENV_RETURN (env, 0);
 
         if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
-          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
         else
           {
             this->private_state_->tc_content_type_known_ = 1;
@@ -2014,7 +1970,7 @@ CORBA_TypeCode::private_discrim_pad_size (CORBA::Environment &env)
   size_t discrim_size;
   size_t overall_align;
 
- (void) TAO_CDR_Interpreter::calc_key_union_attributes (&stream,
+ (void) TAO_IIOP_Interpreter::calc_key_union_attributes (&stream,
                                                          overall_align,
                                                          discrim_size,
                                                          env);
@@ -2068,7 +2024,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const
         if (!stream.skip_string ()                  // ID
             || !stream.skip_string ()       // struct name
             || !stream.read_ulong (members))
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         return 3 + 2 * members;
       }
@@ -2084,7 +2040,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const
         if (!stream.skip_string ()                      // ID
             || !stream.skip_string ()           // typedef name
             || !stream.read_ulong (members))
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         return 3 + members;
       }
@@ -2102,20 +2058,243 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const
             || !skip_typecode (stream)          // discriminant TC
             || !stream.read_ulong (members)      // default used
             || !stream.read_ulong (members))     // real member count
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
         return 5 + 3 * members;
       }
     }
 }
 
-CORBA::Any_ptr
-CORBA_TypeCode::parameter (const CORBA::Long index,
-                           CORBA::Environment &ACE_TRY_ENV)
+
+// Internal hack, used until member_count () and length () are
+// implemented.  Doesn't support all the types that those routines
+// support.
+
+CORBA::ULong
+CORBA_TypeCode::ulong_param (CORBA::ULong n,
+                             CORBA::Environment &env) const
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
-                                         CORBA::COMPLETED_NO),
-                    0);
+  CORBA::ULong temp;
+
+  temp = this->param_count (env);               // clears env
+  TAO_CHECK_ENV_RETURN (env, 0);
+
+  if (temp < n)
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+
+  // Get parameters for non-empty typecodes; their parameter lists are
+  // encapsulated CDR (for complex ones) or inlined (for simple ones).
+  switch (kind_)
+    {
+    default: // most have no long params
+      break;
+
+      // Array, sequence ... complex parameter lists
+    case CORBA::tk_array:               // param 1 is an integer
+    case CORBA::tk_sequence:            // ... identical content
+      {
+        if (n == 0)
+          break;
+
+        // Build CDR stream for encapsulated params, and skip the
+        // typecode up front.
+        TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+                             this->byte_order_);
+
+        if (!skip_typecode (stream))
+          TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
+
+        // Then comes the "bounds" parameter.
+        if (!stream.read_ulong (temp))
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+        return temp;
+      }
+
+    // string, wstring ... simple parameter lists, containing just the
+    // string bounds (zero indicates unbounded).  Stored specially
+    case CORBA::tk_string:
+    case CORBA::tk_wstring:
+      if (n != 0)
+        break;
+      return this->length_;
+    }
+  TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
+}
+
+// Internal hack, used until member_type (), discriminator_type (),
+// and content_type () are implemented.
+//
+// NOTE special calling convention for stream.decode () when we're
+// potentially deencapsulating an indirected typecode: the "data2"
+// value indicates that this typecode is the parent.  See comments at
+// stream.decode () for further details.
+
+CORBA::TypeCode_ptr
+CORBA_TypeCode::typecode_param (CORBA::ULong n,
+                                CORBA::Environment &env) const
+{
+  CORBA::ULong temp;
+
+  temp = this->param_count (env);               // clears env
+  TAO_CHECK_ENV_RETURN (env, 0);
+
+  if (temp < n)
+    TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+
+  // Build the de-encapsulating CDR stream, bypassing the stringent
+  // alignment tests (we're a bit looser in what we need here, and we
+  // _know_ we're OK).  Then skip the byte order code.
+
+  TAO_InputCDR stream (this->buffer_+4, this->length_-4,
+                       this->byte_order_);
+  CORBA::TypeCode_ptr tc = 0;
+  CORBA::TypeCode::traverse_status status = CORBA::TypeCode::TRAVERSE_STOP;
+  CORBA::ULong i = 0;
+
+  switch (this->kind_)
+    {
+    default:                            // most have no tc params
+      break;
+
+    case CORBA::tk_sequence:            // param 0 is a tc
+    case CORBA::tk_array:
+      if (n != 0)
+        break;
+      status = stream.decode (CORBA::_tc_TypeCode,
+                              &tc,
+                              this,
+                              env);
+      TAO_CHECK_ENV_RETURN (env, 0);
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+      return tc;
+
+    case CORBA::tk_alias:               // #1 is a tc
+      if (n != 2)
+        break;
+      if (!stream.skip_string ()        // type ID, hidden
+          || !stream.skip_string ())    // typedef name
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env,  0);
+
+      status = stream.decode (CORBA::_tc_TypeCode, &tc, this,  env);
+      TAO_CHECK_ENV_RETURN (env, 0);
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+      return tc;
+
+    case CORBA::tk_except:
+    case CORBA::tk_struct:              // #5 and up are tc, index from 0
+      if (n < 4 || n & 0x1)
+        // tc is at odd number of param list
+        TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+
+      if (!stream.skip_string ()                // type ID, hidden
+          || !stream.skip_string ()     // typedef name
+          || !stream.read_ulong (temp))
+       // member count
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+
+      temp = (n - 3) / 2;
+
+      // skip member pairs to the one we want
+      for (i = 0; i < temp; i++)
+        // skip to the member being asked
+        if (!stream.skip_string ()        // member name
+            || !skip_typecode (stream))
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+
+      if (!stream.skip_string ())
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+
+      status = stream.decode (CORBA::_tc_TypeCode,
+                              &tc,
+                              this,
+                              env);
+      TAO_CHECK_ENV_RETURN (env, 0);
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+      return tc;
+
+    case CORBA::tk_union:            // #6 and up are tc, index from 0
+      if (n != 2 && (n < 7 || (n - 7) % 3))
+        TAO_THROW_ENV_RETURN (CORBA::TypeCode::Bounds (), env, 0);
+
+      if (!stream.skip_string ()                // type ID, hidden
+          || !stream.skip_string ())           // typedef name
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+
+      status = stream.decode (CORBA::_tc_TypeCode,
+                              &tc, this,
+                              env);
+      TAO_CHECK_ENV_RETURN (env, 0);
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)  // TC
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+      if (!stream.read_ulong (temp) // default used
+          || !stream.read_ulong (temp))   // member count
+        {
+          CORBA::release (tc);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+        }
+
+      if (n == 2)
+        return tc;
+
+      temp = (n - 7) / 3;
+
+      // skip to the member requested
+
+      CORBA::Long scratch;              // always big enough
+
+      for (i = 0; i < temp; i++)
+        {
+          status = stream.decode (tc, &scratch, this,  env); // member label
+          // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+          TAO_CHECK_ENV_RETURN (env, 0);
+
+          if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
+              || !stream.skip_string ()         // member name
+              || !skip_typecode (stream))
+            {   // member typecode
+              CORBA::release (tc);
+              TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+            }
+        }
+      // member label
+      TAO_TRY_VAR (env)
+        {
+          status = stream.decode (tc,
+                                  &scratch, this,
+                                  env);
+          TAO_CHECK_ENV;
+
+          if (status != CORBA::TypeCode::TRAVERSE_CONTINUE
+              || !stream.skip_string ())            // member name
+            TAO_TRY_THROW (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+        }
+      TAO_CATCHANY
+        {
+          CORBA::release (tc);
+          TAO_RETHROW_SAME_ENV_RETURN (0);
+        }
+      TAO_ENDTRY;
+
+      CORBA::release (tc);
+
+      status = stream.decode (CORBA::_tc_TypeCode,
+                              &tc, this,
+                              env);
+      TAO_CHECK_ENV_RETURN (env, 0);
+
+      if (status != CORBA::TypeCode::TRAVERSE_CONTINUE)
+        TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
+      return tc;
+    }
+
+  TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0);
 }
 
 // Tell user the size of an instance of the data type described by
@@ -2125,7 +2304,7 @@ size_t
 CORBA::TypeCode::private_size (CORBA::Environment &env)
 {
   if (kind_ >= CORBA::TC_KIND_COUNT)
-    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
   env.clear ();
 
@@ -2135,11 +2314,11 @@ CORBA::TypeCode::private_size (CORBA::Environment &env)
   if (this->private_state_->tc_size_known_)
     return this->private_state_->tc_size_;
 
-  if (TAO_CDR_Interpreter::table_[kind_].calc_ == 0)
+  if (TAO_IIOP_Interpreter::table_[kind_].calc_ == 0)
     {
       private_state_->tc_size_known_ = 1;
       private_state_->tc_size_ =
-        TAO_CDR_Interpreter::table_[kind_].size_;
+        TAO_IIOP_Interpreter::table_[kind_].size_;
       return private_state_->tc_size_;
     }
 
@@ -2149,7 +2328,7 @@ CORBA::TypeCode::private_size (CORBA::Environment &env)
 
   private_state_->tc_size_known_ = 1;
   private_state_->tc_size_ =
-    TAO_CDR_Interpreter::table_[kind_].calc_ (&stream, alignment, env);
+    TAO_IIOP_Interpreter::table_[kind_].calc_ (&stream, alignment, env);
   return private_state_->tc_size_;
 }
 
@@ -2163,7 +2342,7 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &env)
   env.clear ();
 
   if (kind_ >= CORBA::TC_KIND_COUNT)
-    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), env, 0);
+    TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0);
 
   // Double checked locking...
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard,
@@ -2171,11 +2350,11 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &env)
   if (this->private_state_->tc_alignment_known_)
     return this->private_state_->tc_alignment_;
 
-  if (TAO_CDR_Interpreter::table_[kind_].calc_ == 0)
+  if (TAO_IIOP_Interpreter::table_[kind_].calc_ == 0)
     {
       private_state_->tc_alignment_known_ = 1;
       private_state_->tc_alignment_ =
-        TAO_CDR_Interpreter::table_[kind_].alignment_;
+        TAO_IIOP_Interpreter::table_[kind_].alignment_;
       return private_state_->tc_alignment_;
     }
 
@@ -2183,7 +2362,7 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &env)
   TAO_InputCDR stream (this->buffer_+4, this->length_-4,
                        this->byte_order_);
 
-  (void) TAO_CDR_Interpreter::table_[kind_].calc_ (&stream,
+  (void) TAO_IIOP_Interpreter::table_[kind_].calc_ (&stream,
                                                     alignment,
                                                     env);
   TAO_CHECK_ENV_RETURN (env, 0);
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 9544a4cefb8..4742ae45da6 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -67,7 +67,7 @@ public:
     Bounds (void);
 
     virtual void _raise (void);
-    static Bounds* _narrow (CORBA_Exception *ex);
+    Bounds* _narrow (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
   };
 
@@ -77,7 +77,7 @@ public:
     BadKind (void);
 
     virtual void _raise (void);
-    static BadKind* _narrow (CORBA_Exception *ex);
+    BadKind* _narrow (CORBA_Exception *ex);
     virtual int _is_a (const char* interface_id) const;
   };
 
@@ -91,70 +91,56 @@ public:
   // Returns a NULL typecode.
 
   CORBA::Boolean equal (const CORBA::TypeCode_ptr,
-                        CORBA_Environment &TAO_IN_ENV = 
-                          CORBA::default_environment ()) const;
+                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Compares two typecodes.
 
   CORBA::Boolean equivalent (CORBA::TypeCode_ptr,
-                             CORBA_Environment &TAO_IN_ENV = 
-                               CORBA::default_environment ()) const;
+                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Unaliases receiver and argument before comparing.
 
-  CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = 
-                        CORBA::default_environment ()) const;
+  CORBA::TCKind kind (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // For all TypeCode kinds, returns the "kind" of the typecode.
 
-  const char *id (CORBA_Environment &TAO_IN_ENV = 
-                    CORBA::default_environment ()) const;
+  const char *id (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *name (CORBA_Environment &TAO_IN_ENV = 
-                      CORBA::default_environment ()) const;
+  const char *name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns name (), raises (BadKind).
 
-  CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = 
-                               CORBA::default_environment ()) const;
+  CORBA::ULong member_count (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   const char *member_name (CORBA::ULong index,
-                           CORBA_Environment &TAO_IN_ENV = 
-                             CORBA::default_environment ()) const;
+                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns member_name (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr member_type (CORBA::ULong index,
-                                   CORBA_Environment &TAO_IN_ENV = 
-                                     CORBA::default_environment ()) const;
+                                   CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except.
 
   CORBA::Any_ptr member_label (CORBA::ULong n,
-                               CORBA_Environment &TAO_IN_ENV = 
-                                 CORBA::default_environment ()) const;
+                               CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = 
-                                            CORBA::default_environment ()) const;
+  CORBA::TypeCode_ptr discriminator_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns the discriminator type for tk_union. raises (BadKind).
 
-  CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = 
-                               CORBA::default_environment ()) const;
+  CORBA::Long default_index (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns the default index for the tk_union. Raises (BadKind).
 
-  CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = 
-                         CORBA::default_environment ()) const;
+  CORBA::ULong length (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array.
 
-  CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = 
-                                      CORBA::default_environment ()) const;
+  CORBA::TypeCode_ptr content_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias.
 
-  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = 
-                                       CORBA::default_environment ());
+  CORBA::ULong TAO_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Calculates the padded size of discriminant type TAO Extension.
 
   // = Creation/refcounting
@@ -197,14 +183,12 @@ public:
   };
   // these are used to indicate the status of marshaling
 
-  size_t size (CORBA_Environment &TAO_IN_ENV = 
-                 CORBA::default_environment ());
+  size_t size (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t alignment (CORBA_Environment &TAO_IN_ENV = 
-                      CORBA::default_environment ());
-  // returns the alignment requirements for this typecode.
-  // used by the IIOP marshaling engine.
+  size_t alignment (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
+  // returns the alignment requirements for this typecode. used by the
+  // IIOP marshaling engine.
 
   // Reference counting operations.
   CORBA::ULong _incr_refcnt (void);
@@ -212,22 +196,18 @@ public:
 
   // = Following three are deprecated
 
-  // The following are deprecated in the CORBA 2.2 spec and are
-  // missing altogether from 2.3a (98-12-04), but they are included
-  // here as no-ops so legacy apps won't completely break. They
-  // throw CORBA::NO_IMPLEMENT.
-
-  CORBA::Any_ptr parameter (const CORBA::Long index,
-                            CORBA_Environment &TAO_IN_ENV = 
-                              CORBA::default_environment ());
-  // Deprecated in the CORBA 2.2 spec and
-  // missing altogether from 2.3a (98-12-04),
-
-  CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = 
-                              CORBA::default_environment ()) const;
+  CORBA::ULong param_count (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Deprecated, CORBA 1.2, not fully usable. Returns the number of
   // parameters that the typecode takes.
 
+  CORBA::ULong ulong_param (CORBA::ULong n,
+                            CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
+
+  CORBA::TypeCode_ptr typecode_param (CORBA::ULong n,
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
+  // Internal utilities, pending CORBA 2.0 IFR APIs; just enough to
+  // make array and sequence typecode interpretation cheap
+
   // private:
   //
   // = The guts of the typecode implementation class
@@ -252,146 +232,106 @@ public:
   // reference to that parent to ensure its memory is not freed
   // inappropriately.
 
-  const char *tc_base_;
-  // my typecode base. Notice that the buffer_ member points to my
-  // encapsulation. However, for indirected typecodes, the offsets will point
-  // to my tk_kind field which should be pointed to be tc_base_
-
-  const char *root_tc_base_;
-  // base of the topmost level typecode. Applicable only if I have any parents,
-  // else it is the same as tc_base. This helps in case we have indirections
-  // and we need to traverse beyond encapsulation boundaries
-
   static CORBA::Boolean skip_typecode (TAO_InputCDR &stream);
   // skip a typecode encoding in a given CDR stream.  This is just a
   // helper function.
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_TypeCode_ptr _ptr_type;
-  typedef CORBA_TypeCode_var _var_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
 private:
   // = All the private/helper methods
 
   CORBA::Boolean private_equal (CORBA::TypeCode_ptr tc,
-                                CORBA_Environment &TAO_IN_ENV = 
-                                  CORBA::default_environment ()) const;
+                                CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // Compares the typecodes.
 
-  const char *private_id (CORBA_Environment &TAO_IN_ENV = 
-                            CORBA::default_environment ()) const;
+  const char *private_id (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // For tk_{objref,struct,union,enum,alias,except}. Returns the
   // repository ID, raises BadKind.
 
-  const char *private_name (CORBA_Environment &TAO_IN_ENV = 
-                              CORBA::default_environment ()) const;
+  const char *private_name (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns name (), raises (BadKind)
 
-  CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = 
-                                       CORBA::default_environment ()) const;
+  CORBA::ULong private_member_count (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns member_count (), raises (BadKind). Useful for tk_struct,
   // tk_union, tk_enum, tk_alias, and tk_except.
 
   CORBA::TypeCode_ptr private_member_type (CORBA::ULong index,
-                                           CORBA_Environment &TAO_IN_ENV = 
-                                             CORBA::default_environment ()) const;
+                                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns member_type (...), raises (BadKind, Bounds); Useful for
   // tk_struct, tk_union, and tk_except
 
   const char *private_member_name (CORBA::ULong index,
-                                   CORBA_Environment &TAO_IN_ENV = 
-                                     CORBA::default_environment ()) const;
+                                    CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns member_name (...), raises (BadKind, Bounds); Useful for tk_union,
   // tk_struct, tk_except, and tk_enum
 
   CORBA::Any_ptr private_member_label (CORBA::ULong n,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                         CORBA::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // For tk_union. Returns the label. Raises BadKind, Bounds.
 
-  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = 
-                                                    CORBA::default_environment ()) const;
+  CORBA::TypeCode_ptr private_discriminator_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns the discriminator type for tk_union. raises (BadKind);
 
-  CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = 
-                                       CORBA::default_environment ()) const;
+  CORBA::Long private_default_index (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns the default index for the tk_union. Raises (BadKind);
 
-  CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = 
-                                CORBA::default_environment ()) const;
+  CORBA::Long private_length (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns length, raises (BadKind). Used for tk_string,
   // tk_sequence, and tk_array
 
-  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = 
-                                              CORBA::default_environment ()) const;
+  CORBA::TypeCode_ptr private_content_type (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // returns the content type (element type). Raises (BadKind); Useful
   // for tk_sequence, tk_array, and tk_alias
 
-  size_t private_size (CORBA_Environment &TAO_IN_ENV = 
-                         CORBA::default_environment ());
+  size_t private_size (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // returns the size. Used by the IIOP marshaling engine.
 
-  size_t private_alignment (CORBA_Environment &TAO_IN_ENV = 
-                              CORBA::default_environment ());
+  size_t private_alignment (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // returns the alignment requirements for this typecode. used by the
   // IIOP marshaling engine.
 
-  CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = 
-                                           CORBA::default_environment ());
+  CORBA::ULong private_discrim_pad_size (CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
   // Calculates the padded size of discriminant type TAO Extension
 
   // = All the private helpers testing for equality of typecodes
 
   CORBA::Boolean private_equal_objref (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                         CORBA::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of objrefs
 
   CORBA::Boolean private_equal_struct (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                         CORBA::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of structs
 
   CORBA::Boolean private_equal_union (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &TAO_IN_ENV = 
-                                        CORBA::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of unions
 
   CORBA::Boolean private_equal_enum (CORBA::TypeCode_ptr tc,
-                                     CORBA_Environment &TAO_IN_ENV = 
-                                       CORBA::default_environment ()) const;
+                                     CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of enums
 
   CORBA::Boolean private_equal_string (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                         CORBA::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of strings
 
   CORBA::Boolean private_equal_wstring (CORBA::TypeCode_ptr tc,
-                                        CORBA_Environment &TAO_IN_ENV = 
-                                          CORBA::default_environment ()) const;
+                                        CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of wide strings
 
   CORBA::Boolean private_equal_sequence (CORBA::TypeCode_ptr tc,
-                                         CORBA_Environment &TAO_IN_ENV = 
-                                           CORBA::default_environment ()) const;
+                                         CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of sequences
 
   CORBA::Boolean private_equal_array (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &TAO_IN_ENV = 
-                                        CORBA::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of array
 
   CORBA::Boolean private_equal_alias (CORBA::TypeCode_ptr tc,
-                                      CORBA_Environment &TAO_IN_ENV = 
-                                        CORBA::default_environment ()) const;
+                                      CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of typedefs
 
   CORBA::Boolean private_equal_except (CORBA::TypeCode_ptr tc,
-                                       CORBA_Environment &TAO_IN_ENV = 
-                                         CORBA::default_environment ()) const;
+                                       CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ()) const;
   // test equality for typecodes of exceptions
 
   CORBA::ULong refcount_;
@@ -528,6 +468,7 @@ public:
   CORBA_TypeCode_out (CORBA_TypeCode_var &);
   CORBA_TypeCode_out (const CORBA_TypeCode_out &);
   CORBA_TypeCode_out &operator= (const CORBA_TypeCode_out &);
+  CORBA_TypeCode_out &operator= (const CORBA_TypeCode_var &);
   CORBA_TypeCode_out &operator= (CORBA_TypeCode_ptr);
   operator CORBA_TypeCode_ptr &();
   CORBA_TypeCode_ptr &ptr (void);
@@ -535,9 +476,6 @@ public:
 
 private:
   CORBA_TypeCode_ptr &ptr_;
-
-  CORBA_TypeCode_out &operator= (const CORBA_TypeCode_var &);
-  // Assignment from _var not allowed
 };
 
 class TAO_Export TAO_TypeCodes
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index 6fbf45bdaf9..7a19e94e44f 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -251,6 +251,13 @@ CORBA_TypeCode_out::operator= (const CORBA_TypeCode_out &p)
 }
 
 ACE_INLINE CORBA_TypeCode_out &
+CORBA_TypeCode_out::operator= (const CORBA_TypeCode_var &p)
+{
+  this->ptr_ = CORBA_TypeCode::_duplicate (p.ptr ());
+  return *this;
+}
+
+ACE_INLINE CORBA_TypeCode_out &
 CORBA_TypeCode_out::operator= (CORBA_TypeCode_ptr p)
 {
   this->ptr_ = p;
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index de0c6c6e499..7837b76436c 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -32,46 +32,38 @@
 #include "tao/Object.h"
 #include "tao/Object_KeyC.h"
 #include "tao/PolicyC.h"
+#include "tao/PolicyC.h"
 #include "tao/CurrentC.h"
-#include "tao/DynAnyC.h"
-#include "tao/InconsistentTypeCodeC.h"
-#include "tao/DomainC.h"
-#include "tao/WrongTransactionC.h"
-#include "tao/Services.h"
-#include "tao/NVList.h"
-#if defined(TAO_POLLER)
-#include "tao/PollableC.h"
-#endif /* TAO_POLLER */
 
 ACE_RCSID(tao, Typecode_Constants, "$Id$")
 
 // Declare all the standard typecodes owned by the ORB
 
 // Null and void
-CORBA::TypeCode_ptr CORBA::_tc_null = 0;
-CORBA::TypeCode_ptr CORBA::_tc_void = 0;
+CORBA::TypeCode_ptr CORBA::_tc_null;
+CORBA::TypeCode_ptr CORBA::_tc_void;
 // Basic numeric types:  short, long, longlong, and unsigned variants
-CORBA::TypeCode_ptr CORBA::_tc_short = 0;
-CORBA::TypeCode_ptr CORBA::_tc_long = 0;
-CORBA::TypeCode_ptr CORBA::_tc_longlong = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ushort = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ulong = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ulonglong = 0;
+CORBA::TypeCode_ptr CORBA::_tc_short;
+CORBA::TypeCode_ptr CORBA::_tc_long;
+CORBA::TypeCode_ptr CORBA::_tc_longlong;
+CORBA::TypeCode_ptr CORBA::_tc_ushort;
+CORBA::TypeCode_ptr CORBA::_tc_ulong;
+CORBA::TypeCode_ptr CORBA::_tc_ulonglong;
 // Floating point types: single, double, quad precision
-CORBA::TypeCode_ptr CORBA::_tc_float = 0;
-CORBA::TypeCode_ptr CORBA::_tc_double = 0;
-CORBA::TypeCode_ptr CORBA::_tc_longdouble = 0;
+CORBA::TypeCode_ptr CORBA::_tc_float;
+CORBA::TypeCode_ptr CORBA::_tc_double;
+CORBA::TypeCode_ptr CORBA::_tc_longdouble;
 // Various simple quantities.
-CORBA::TypeCode_ptr CORBA::_tc_boolean = 0;
-CORBA::TypeCode_ptr CORBA::_tc_octet = 0;
+CORBA::TypeCode_ptr CORBA::_tc_boolean;
+CORBA::TypeCode_ptr CORBA::_tc_octet;
 // Internationalization-related data types: ISO Latin/1 and "wide"
 // characters, and strings of each.  "wchar" is probably Unicode 1.1,
 // "wstring" being null-terminated sets thereof.
-CORBA::TypeCode_ptr CORBA::_tc_char = 0;
-CORBA::TypeCode_ptr CORBA::_tc_wchar = 0;
+CORBA::TypeCode_ptr CORBA::_tc_char;
+CORBA::TypeCode_ptr CORBA::_tc_wchar;
 // a string/wstring have a simple parameter list that indicates the length
-CORBA::TypeCode_ptr CORBA::_tc_string = 0;
-CORBA::TypeCode_ptr CORBA::_tc_wstring = 0;
+CORBA::TypeCode_ptr CORBA::_tc_string;
+CORBA::TypeCode_ptr CORBA::_tc_wstring;
 //
 // Various things that can be passed as "general" parameters:
 // Any, TypeCode_ptr, Principal_ptr, Object_ptr
@@ -83,59 +75,21 @@ CORBA::TypeCode_ptr CORBA::_tc_Object = 0;
 // Two typecodes for exceptions
 CORBA::TypeCode_ptr CORBA::TypeCode::_tc_Bounds = 0;
 CORBA::TypeCode_ptr CORBA::TypeCode::_tc_BadKind = 0;
-// Some more typecodes in the CORBA namespace. We keep adding
-// to this list as we find more and more things being introduced
-// to the CORBA namespace.
-
+// Some more typecodes in the CORBA namespace. We keep adding to this list as
+// we find more and more things being introduced to the CORBA namespace
+CORBA::TypeCode_ptr CORBA::_tc_Policy = 0;
+CORBA::TypeCode_ptr CORBA::_tc_PolicyList = 0;
 CORBA::TypeCode_ptr CORBA::_tc_Current = 0;
 CORBA::TypeCode_ptr CORBA::_tc_Identifier = 0;
 CORBA::TypeCode_ptr CORBA::_tc_RepositoryId = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ORBid = 0;
-CORBA::TypeCode_ptr CORBA_ORB::_tc_ObjectId = 0;
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-CORBA::TypeCode_ptr CORBA_ORB::_tc_InconsistentTypeCode = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ConstructionPolicy = 0;
-CORBA::TypeCode_ptr CORBA::_tc_NamedValue = 0;
-CORBA::TypeCode_ptr CORBA::_tc_WrongTransaction = 0;
-CORBA::TypeCode_ptr CORBA::_tc_AnySeq = 0;
-CORBA::TypeCode_ptr CORBA::_tc_FieldName = 0;
-CORBA::TypeCode_ptr CORBA::_tc_NameValuePair = 0;
-CORBA::TypeCode_ptr CORBA::_tc_NameValuePairSeq = 0;
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-CORBA::TypeCode_ptr CORBA::_tc_PolicyErrorCode = 0;
-CORBA::TypeCode_ptr CORBA::_tc_PolicyError = 0;
-CORBA::TypeCode_ptr CORBA::_tc_InvalidPolicies = 0;
 CORBA::TypeCode_ptr CORBA::_tc_PolicyType = 0;
-CORBA::TypeCode_ptr CORBA::_tc_Policy = 0;
-CORBA::TypeCode_ptr CORBA::_tc_PolicyList = 0;
-CORBA::TypeCode_ptr CORBA::_tc_PolicyTypeSeq = 0;
-CORBA::TypeCode_ptr CORBA::_tc_SetOverrideType = 0;
-CORBA::TypeCode_ptr CORBA::_tc_PolicyManager = 0;
-CORBA::TypeCode_ptr CORBA::_tc_PolicyCurrent = 0;
-
-CORBA::TypeCode_ptr CORBA::_tc_DomainManager = 0;
-CORBA::TypeCode_ptr CORBA::_tc_DomainManagerList = 0;
-
-CORBA::TypeCode_ptr CORBA::_tc_PollableSet = 0;
-CORBA::TypeCode_ptr CORBA::_tc_Pollable = 0;
-CORBA::TypeCode_ptr CORBA::_tc_DIIPollable = 0;
-
-// Service definitions
-CORBA::TypeCode_ptr CORBA::_tc_ServiceType = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ServiceOption = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ServiceDetailType = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ServiceDetail = 0;
-CORBA::TypeCode_ptr CORBA::_tc_ServiceInformation = 0;
-
 // Internal to TAO ORB
 CORBA::TypeCode_ptr TC_opaque = 0;
 CORBA::TypeCode_ptr TC_ServiceContextList = 0;
 CORBA::TypeCode_ptr TC_completion_status = 0;
 
-// initialize all the ORB owned TypeCode constants. This
-// routine will be invoked by the ORB_init method.
+// initialize all the ORB owned TypeCode constants. This routine will be
+// invoked by the ORB_init method
 void
 TAO_TypeCodes::init (void)
 {
@@ -194,14 +148,14 @@ TAO_TypeCodes::init (void)
   static const CORBA::Long _oc_wstring [] =
   {
     // CDR typecode octets
-    TAO_ENCAP_BYTE_ORDER,       // native endian + padding; "tricky"
+    TAO_ENCAP_BYTE_ORDER,	// native endian + padding; "tricky"
     0                     // ... unbounded string
   };
   CORBA::_tc_wstring = new CORBA::TypeCode (CORBA::tk_wstring,
                                             sizeof _oc_wstring,
                                             (char *) &_oc_wstring,
                                             1,
-                                            sizeof (CORBA::WChar*));
+                                            sizeof (CORBA::WString));
 
   //
   // Various things that can be passed as "general" parameters:
@@ -219,7 +173,7 @@ TAO_TypeCodes::init (void)
 
   static const u_char oc_objref [] =
   {
-    0, 0, 0, 0,                 // big endian encoding (+ padding)
+    0, 0, 0, 0,			// big endian encoding (+ padding)
     0, 0, 0, 29,                  // 29 char string + 3 pad bytes
     'I', 'D', 'L', ':',
     'o', 'm', 'g', '.',
@@ -229,7 +183,7 @@ TAO_TypeCodes::init (void)
     'j', 'e', 'c', 't',
     ':', '1', '.', '0',
     '\0', 0, 0, 0,
-    0, 0, 0, 7,                 // 7 chars "Object" + 1 pad byte
+    0, 0, 0, 7,			// 7 chars "Object" + 1 pad byte
     'O', 'b', 'j', 'e',
     'c', 't', '\0', 0,
   };
@@ -260,12 +214,11 @@ TAO_TypeCodes::init (void)
     0, 0, 0, 0            // no members to this typecode
   };
 
-  CORBA::TypeCode::_tc_Bounds =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof tc_buf_Bounds,
-                         tc_buf_Bounds,
-                         1,
-                         sizeof (CORBA::TypeCode::Bounds));
+  CORBA::TypeCode::_tc_Bounds = new CORBA::TypeCode (CORBA::tk_except,
+                                                     sizeof tc_buf_Bounds,
+                                                     tc_buf_Bounds,
+                                                     1,
+                                                     sizeof (CORBA::TypeCode::Bounds));
 
   static char tc_buf_BadKind [] =
   {
@@ -284,1221 +237,97 @@ TAO_TypeCodes::init (void)
     0, 0, 0, 0            // no members to this typecode
   };
 
-  CORBA::TypeCode::_tc_BadKind =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof tc_buf_BadKind,
-                         tc_buf_BadKind,
-                         1,
-                         sizeof (CORBA::TypeCode::BadKind));
+  CORBA::TypeCode::_tc_BadKind = new CORBA::TypeCode (CORBA::tk_except,
+                                                      sizeof tc_buf_BadKind,
+                                                      tc_buf_BadKind,
+                                                      1,
+                                                      sizeof (CORBA::TypeCode::BadKind));
 
   static const CORBA::Long _oc_CORBA_Identifier[] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order
-    25,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4964),
-    ACE_NTOHL (0x656e7469),
-    ACE_NTOHL (0x66696572),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Identifier:1.0
-    11,
-    ACE_NTOHL (0x4964656e),
-    ACE_NTOHL (0x74696669),
-    ACE_NTOHL (0x657200fd),  // name = Identifier
+    25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Identifier:1.0
+    11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x657200fd),  // name = Identifier
     CORBA::tk_string,
     0, // string length
   };
 
-  CORBA::_tc_Identifier =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_Identifier),
-                         (char *) &_oc_CORBA_Identifier,
-                         1,
-                         sizeof (CORBA::Identifier));
+  CORBA::_tc_Identifier = new CORBA::TypeCode (CORBA::tk_alias,
+                                               sizeof (_oc_CORBA_Identifier),
+                                               (char *) &_oc_CORBA_Identifier,
+                                               1,
+                                               sizeof (CORBA::Identifier));
 
   static const CORBA::Long _oc_CORBA_RepositoryId[] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order
-    27,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5265),
-    ACE_NTOHL (0x706f7369),
-    ACE_NTOHL (0x746f7279),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:CORBA/RepositoryId:1.0
-    13,
-    ACE_NTOHL (0x5265706f),
-    ACE_NTOHL (0x7369746f),
-    ACE_NTOHL (0x72794964),
-    ACE_NTOHL (0xfdfdfd),  // name = RepositoryId
-    CORBA::tk_string,
-    0, // string length
-  };
-  CORBA::_tc_RepositoryId =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_RepositoryId),
-                         (char *) &_oc_CORBA_RepositoryId,
-                         1,
-                         sizeof (CORBA::RepositoryId));
-
-  static const CORBA::Long _oc_CORBA_ORBid[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    28, ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x4269643a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
-    6,
-    ACE_NTOHL (0x4f524269),
-    ACE_NTOHL (0x64000000),  // name = ORBid
+    27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e3000fd),  // repository ID = IDL:CORBA/RepositoryId:1.0
+    13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0xfdfdfd),  // name = RepositoryId
     CORBA::tk_string,
     0, // string length
   };
-  CORBA::_tc_ORBid = new CORBA::TypeCode (CORBA::tk_alias,
-                                          sizeof (_oc_CORBA_ORBid),
-                                          (char *) &_oc_CORBA_ORBid,
-                                          0,
-                                          sizeof (CORBA::ORBid));
-
-  static const CORBA::Long _oc_CORBA_ObjectId[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x49643a31),
-    ACE_NTOHL (0x2e300000),  // repository ID =
-                             //   IDL:omg.org/CORBA/ObjectId:1.0
-    9,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63744964),
-    ACE_NTOHL (0x0),        // name = ObjectId
-    CORBA::tk_string,
-    0,                      // string length
-  };
-  CORBA_ORB::_tc_ObjectId =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ObjectId),
-                         (char *) &_oc_CORBA_ObjectId,
-                         0,
-                         sizeof (CORBA_ORB::ObjectId));
-
-#if !defined(TAO_HAS_MINIMUM_CORBA)
-  static const CORBA::Long _oc_CORBA_ORB_InconsistentTypeCode[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,   // byte order
-    47,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f52),
-    ACE_NTOHL (0x422f496e),
-    ACE_NTOHL (0x636f6e73),
-    ACE_NTOHL (0x69737465),
-    ACE_NTOHL (0x6e745479),
-    ACE_NTOHL (0x7065436f),
-    ACE_NTOHL (0x64653a31),
-    ACE_NTOHL (0x2e3000fd), // repository ID =
-                            //   IDL:omg.org/CORBA/ORB/InconsistentTypeCode:1.0
-    21,
-    ACE_NTOHL (0x496e636f),
-    ACE_NTOHL (0x6e736973),
-    ACE_NTOHL (0x74656e74),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x436f6465),
-    ACE_NTOHL (0xfdfdfd),   // name = InconsistentTypeCode
-    0,                      // member count
-  };
-
-  CORBA_ORB::_tc_InconsistentTypeCode =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_ORB_InconsistentTypeCode),
-                         (char *) &_oc_CORBA_ORB_InconsistentTypeCode,
-                         0,
-                         sizeof (CORBA_ORB_InconsistentTypeCode));
-
-  static const CORBA::Long _oc_CORBA_ConstructionPolicy[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f436f),
-    ACE_NTOHL (0x6e737472),
-    ACE_NTOHL (0x75637469),
-    ACE_NTOHL (0x6f6e506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/ConstructionPolicy:1.0
-    19,
-    ACE_NTOHL (0x436f6e73),
-    ACE_NTOHL (0x74727563),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),   // name = ConstructionPolicy,
-  };
-  CORBA::_tc_ConstructionPolicy =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_ConstructionPolicy),
-                         (char *) &_oc_CORBA_ConstructionPolicy,
-                         0,
-                         sizeof (CORBA::ConstructionPolicy));
-
-
-  static const CORBA::Long _oc_corba_NamedValue[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x636f7262),
-    ACE_NTOHL (0x612f4e61),
-    ACE_NTOHL (0x6d656456),
-    ACE_NTOHL (0x616c7565),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/corba/NamedValue:1.0
-    11,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x6456616c),
-    ACE_NTOHL (0x75650000),  // name = NamedValue,
-  };
-
-  CORBA::_tc_NamedValue =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_corba_NamedValue),
-                         (char *) &_oc_corba_NamedValue,
-                         0,
-                         sizeof (CORBA::NamedValue));
-
-  static const CORBA::Long _oc_CORBA_NameValuePair[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    28,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x6169723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:CORBA/NameValuePair:1.0
-    14,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72000000),   // name = NameValuePair
-    2,                        // member count
-    3,
-    ACE_NTOHL (0x69640000),   // name = id
-    CORBA::tk_alias,          // typecode kind for typedefs
-    56,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-    6,
-    ACE_NTOHL (0x76616c75),
-    ACE_NTOHL (0x65000000),   // name = value
-    CORBA::tk_any,
-  };
+  CORBA::_tc_RepositoryId = new CORBA::TypeCode (CORBA::tk_alias,
+                                                 sizeof
+                                                 (_oc_CORBA_RepositoryId),
+                                                 (char *)
+                                                 &_oc_CORBA_RepositoryId,
+                                                 1,
+                                                 sizeof (CORBA::RepositoryId));
 
-  CORBA::_tc_NameValuePair =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_NameValuePair),
-                         (char *) &_oc_CORBA_NameValuePair,
-                         0,
-                         sizeof (CORBA::NameValuePair));
 
-  static const CORBA::Long _oc_CORBA_NameValuePairSeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x61697253),
-    ACE_NTOHL (0x65713a31),
-    ACE_NTOHL (0x2e300000),   // repository ID = IDL:CORBA/NameValuePairSeq:1.0
-    17,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72536571),
-    ACE_NTOHL (0x0),          // name = NameValuePairSeq
-    CORBA::tk_sequence,       // typecode kind
-    164,                      // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_struct,         // typecode kind
-    148,                      // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    28,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4e61),
-    ACE_NTOHL (0x6d655661),
-    ACE_NTOHL (0x6c756550),
-    ACE_NTOHL (0x6169723a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/NameValuePair:1.0
-    14,
-    ACE_NTOHL (0x4e616d65),
-    ACE_NTOHL (0x56616c75),
-    ACE_NTOHL (0x65506169),
-    ACE_NTOHL (0x72000000),   // name = NameValuePair
-    2,                        // member count
-    3,
-    ACE_NTOHL (0x69640000),   // name = id
-    CORBA::tk_alias,          // typecode kind for typedefs
-    56,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-    6,
-    ACE_NTOHL (0x76616c75),
-    ACE_NTOHL (0x65000000),   // name = value
-    CORBA::tk_any,
-    0,
-  };
-  CORBA::_tc_NameValuePairSeq =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_NameValuePairSeq),
-                         (char *) &_oc_CORBA_NameValuePairSeq,
-                         0,
-                         sizeof (CORBA::NameValuePairSeq));
-
-  static const CORBA::Long _oc_CORBA_WrongTransaction[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5772),
-    ACE_NTOHL (0x6f6e6754),
-    ACE_NTOHL (0x72616e73),
-    ACE_NTOHL (0x61637469),
-    ACE_NTOHL (0x6f6e3a31),
-    ACE_NTOHL (0x2e300000),   // repository ID =
-                              //   IDL:omg.org/CORBA/WrongTransaction:1.0
-    17,
-    ACE_NTOHL (0x57726f6e),
-    ACE_NTOHL (0x67547261),
-    ACE_NTOHL (0x6e736163),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x0),          // name = WrongTransaction
-    0,                        // member count
-  };
-  CORBA::_tc_WrongTransaction =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_WrongTransaction),
-                         (char *) &_oc_CORBA_WrongTransaction,
-                         0,
-                         sizeof (CORBA::WrongTransaction));
-
-  static const CORBA::Long _oc_CORBA_AnySeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    21,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f416e),
-    ACE_NTOHL (0x79536571),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID = IDL:CORBA/AnySeq:1.0
-    7,
-    ACE_NTOHL (0x416e7953),
-    ACE_NTOHL (0x65710000),   // name = AnySeq
-    CORBA::tk_sequence,       // typecode kind
-    12,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_any,
-    0,
-  };
-
-  CORBA::_tc_AnySeq =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_AnySeq),
-                         (char *) &_oc_CORBA_AnySeq,
-                         0,
-                         sizeof (CORBA_AnySeq));
-
-  static const CORBA::Long _oc_CORBA_FieldName[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    24,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4669),
-    ACE_NTOHL (0x656c644e),
-    ACE_NTOHL (0x616d653a),
-    ACE_NTOHL (0x312e3000),   // repository ID = IDL:CORBA/FieldName:1.0
-    10,
-    ACE_NTOHL (0x4669656c),
-    ACE_NTOHL (0x644e616d),
-    ACE_NTOHL (0x65000000),   // name = FieldName
-    CORBA::tk_string,
-    0,                        // string length
-  };
-  CORBA::_tc_FieldName =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_FieldName),
-                         (char *) &_oc_CORBA_FieldName,
-                         0,
-                         sizeof (CORBA::FieldName));
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
- // Service Types
-  static const CORBA::Long _oc_CORBA_ServiceOption[] =
-  {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-   36,
-   ACE_NTOHL (0x49444c3a),
-   ACE_NTOHL (0x6f6d672e),
-   ACE_NTOHL (0x6f72672f),
-   ACE_NTOHL (0x434f5242),
-   ACE_NTOHL (0x412f5365),
-   ACE_NTOHL (0x72766963),
-   ACE_NTOHL (0x654f7074),
-   ACE_NTOHL (0x696f6e3a),
-   ACE_NTOHL (0x312e3000),  // repository ID =
-                            //   IDL:omg.org/CORBA/ServiceOption:1.0
-   14,
-   ACE_NTOHL (0x53657276),
-   ACE_NTOHL (0x6963654f),
-   ACE_NTOHL (0x7074696f),
-   ACE_NTOHL (0x6e000000),  // name = ServiceOption
-   CORBA::tk_ulong,
-  };
-
-  CORBA::_tc_ServiceOption =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_ServiceOption),
-                         (char *) &_oc_CORBA_ServiceOption,
-                         0,
-                         sizeof (CORBA::ServiceOption));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetailType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-  };
-
- CORBA::_tc_ServiceDetailType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceDetailType),
-                        (char *) &_oc_CORBA_ServiceDetailType,
-                        0,
-                        sizeof (CORBA::ServiceDetailType));
-
-  static const CORBA::Long _oc_CORBA_ServiceType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID= IDL:omg.org/CORBA/ServiceType:1.0
-    12,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636554),
-    ACE_NTOHL (0x79706500),  // name = ServiceType
-    CORBA::tk_ushort,
-  };
-
- CORBA::_tc_ServiceType =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_ServiceType),
-                        (char *) &_oc_CORBA_ServiceType,
-                        0,
-                        sizeof (CORBA::ServiceType));
-
-  static const CORBA::Long _oc_CORBA_ServiceDetail[] =
+  static const CORBA::Long _oc_CORBA_PolicyType[] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID= IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
+    25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x54797065), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/PolicyType:1.0
+    11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63795479), ACE_NTOHL (0x706500fd),  // name = PolicyType
     CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
   };
+  CORBA::_tc_PolicyType = new CORBA::TypeCode (CORBA::tk_alias, sizeof
+                                               (_oc_CORBA_PolicyType),
+                                               (char *)
+                                               &_oc_CORBA_PolicyType,
+                                               1,
+                                               sizeof (CORBA::PolicyType));
 
-  CORBA::_tc_ServiceDetail =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceDetail),
-                         (char *) &_oc_CORBA_ServiceDetail,
-                         0,
-                         sizeof (CORBA::ServiceDetail));
-
-
-  static const CORBA::Long _oc_CORBA_ServiceInformation[] =
+  static const CORBA::Long _oc_CORBA_Policy[] =
   {
     TAO_ENCAP_BYTE_ORDER, // byte order
-    41,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65496e66),
-    ACE_NTOHL (0x6f726d61),
-    ACE_NTOHL (0x74696f6e),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/ServiceInformation:1.0
-    19,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x6e666f72),
-    ACE_NTOHL (0x6d617469),
-    ACE_NTOHL (0x6f6e0000),  // name = ServiceInformation
-    2, // member count
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x6f707469),
-    ACE_NTOHL (0x6f6e7300),  // name = service_options
-    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
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x654f7074),
-    ACE_NTOHL (0x696f6e3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceOption:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x6963654f),
-    ACE_NTOHL (0x7074696f),
-    ACE_NTOHL (0x6e000000),  // name = ServiceOption
-    CORBA::tk_ulong,
-    0,
-    16,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c7300),  // name = service_details
-    CORBA::tk_sequence, // typecode kind
-    232, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    216, // encapsulation length
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c3a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetail:1.0
-    14,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c000000),  // name = ServiceDetail
-    2, // member count
-    20,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c5f74),
-    ACE_NTOHL (0x79706500),  // name = service_detail_type
-    CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x72766963),
-    ACE_NTOHL (0x65446574),
-    ACE_NTOHL (0x61696c54),
-    ACE_NTOHL (0x7970653a),
-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ServiceDetailType:1.0
-    18,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636544),
-    ACE_NTOHL (0x65746169),
-    ACE_NTOHL (0x6c547970),
-    ACE_NTOHL (0x65000000),  // name = ServiceDetailType
-    CORBA::tk_ulong,
-    15,
-    ACE_NTOHL (0x73657276),
-    ACE_NTOHL (0x6963655f),
-    ACE_NTOHL (0x64657461),
-    ACE_NTOHL (0x696c0000),  // name = service_detail
-    CORBA::tk_sequence, // typecode kind
-    12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-    0,
-    0,
+    21, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Policy:1.0
+    7, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = Policy,
   };
+  CORBA::_tc_Policy = new CORBA::TypeCode (CORBA::tk_objref,
+                                           sizeof (_oc_CORBA_Policy),
+                                           (char *) &_oc_CORBA_Policy,
+                                           1,
+                                           sizeof (CORBA::Policy));
 
- CORBA::_tc_ServiceInformation =
-    new CORBA::TypeCode (CORBA::tk_struct,
-                         sizeof (_oc_CORBA_ServiceInformation),
-                         (char *) &_oc_CORBA_ServiceInformation,
-                         0,
-                         sizeof (CORBA::ServiceInformation));
-
-  // ****************************************************************
-
-  static const CORBA::Long _oc_CORBA_PolicyErrorCode[] =
-  {
+ static const CORBA::Long _oc_CORBA_PolicyList[] =
+ {
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  25, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x4c697374), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/PolicyList:1.0
+  11, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x63794c69), ACE_NTOHL (0x737400fd),  // name = PolicyList
+  CORBA::tk_sequence, // typecode kind
+  60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x72436f64),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),  // repository ID =
-                             //   IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7243),
-    ACE_NTOHL (0x6f646500),  // name = PolicyErrorCode
-    CORBA::tk_short,
-  };
-  CORBA::_tc_PolicyErrorCode =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_PolicyErrorCode),
-                         (char *) &_oc_CORBA_PolicyErrorCode,
-                         0,
-                         sizeof (CORBA::PolicyErrorCode));
-
-  static const CORBA::Long _oc_CORBA_PolicyError[] =
-  {
+    CORBA::tk_objref, // typecode kind
+    44, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x723a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyError:1.0
-    12,
-    ACE_NTOHL (0x506f6c69),
-
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7200),   // name = PolicyError
-    1, // member count
-    7,
-    ACE_NTOHL (0x72656173),
-    ACE_NTOHL (0x6f6e0000),   // name = reason
-    CORBA::tk_alias,          // typecode kind for typedefs
-    72,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4572726f),
-    ACE_NTOHL (0x72436f64),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyErrorCode:1.0
-    16,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794572),
-    ACE_NTOHL (0x726f7243),
-    ACE_NTOHL (0x6f646500),   // name = PolicyErrorCode
-    CORBA::tk_short,
-  };
-  CORBA::_tc_PolicyError =
-    new CORBA::TypeCode(CORBA::tk_except,
-                        sizeof (_oc_CORBA_PolicyError),
-                        (char *) &_oc_CORBA_PolicyError,
-                        0,
-                        sizeof (CORBA::PolicyError));
-
-  static const CORBA::Long _oc_CORBA_InvalidPolicies[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f496e),
-    ACE_NTOHL (0x76616c69),
-    ACE_NTOHL (0x64506f6c),
-    ACE_NTOHL (0x69636965),
-    ACE_NTOHL (0x733a312e),
-    ACE_NTOHL (0x30000000),   // repository ID = IDL:omg.org/CORBA/InvalidPolicies:1.0
-    16,
-    ACE_NTOHL (0x496e7661),
-    ACE_NTOHL (0x6c696450),
-    ACE_NTOHL (0x6f6c6963),
-    ACE_NTOHL (0x69657300),   // name = InvalidPolicies
-    1,                        // member count
-    8,
-    ACE_NTOHL (0x696e6469),
-    ACE_NTOHL (0x63657300),   // name = indices
-    CORBA::tk_sequence,       // typecode kind
-    12,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    CORBA::tk_ushort,
-    0,
-  };
-  CORBA::_tc_InvalidPolicies =
-    new CORBA::TypeCode (CORBA::tk_except,
-                         sizeof (_oc_CORBA_InvalidPolicies),
-                         (char *) &_oc_CORBA_InvalidPolicies,
-                         0,
-                         sizeof (CORBA::InvalidPolicies));
-
-  static const CORBA::Long _oc_CORBA_PolicyType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70650000),   // name = PolicyType
-    CORBA::tk_ulong,
-  };
-  CORBA::_tc_PolicyType =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_PolicyType),
-                         (char *) &_oc_CORBA_PolicyType,
-                         0,
-                         sizeof (CORBA::PolicyType));
-
-  static const CORBA::Long _oc_CORBA_Policy[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID = IDL:omg.org/CORBA/Policy:1.0
-    7,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),   // name = Policy,
-  };
-  CORBA::_tc_Policy =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_Policy),
-                         (char *) &_oc_CORBA_Policy,
-                         1,
-                         sizeof (CORBA::Policy));
-
-  static const CORBA::Long _oc_CORBA_PolicyList[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    33,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4c697374),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),            // repository ID =
-                                //   IDL:omg.org/CORBA/PolicyList:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794c69),
-    ACE_NTOHL (0x73740000),     // name = PolicyList
-    CORBA::tk_sequence,         // typecode kind
-    68,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    CORBA::tk_objref,           // typecode kind
-    52,                         // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),            // repository ID =
-                                //   IDL:omg.org/CORBA/Policy:1.0
-    7,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63790000),     // name = Policy,
-    0,
-  };
- CORBA::_tc_PolicyList =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_PolicyList),
-                        (char *) &_oc_CORBA_PolicyList,
-                        1,
-                        sizeof (CORBA::PolicyList));
-
-  static const CORBA::Long _oc_CORBA_PolicyTypeSeq[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x5365713a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyTypeSeq:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70655365),
-    ACE_NTOHL (0x71000000),   // name = PolicyTypeSeq
-    CORBA::tk_sequence,       // typecode kind
-    80,                       // encapsulation length
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    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 (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x54797065),
-    ACE_NTOHL (0x3a312e30),
-    ACE_NTOHL (0x0),          // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyType:1.0
-    11,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63795479),
-    ACE_NTOHL (0x70650000),   // name = PolicyType
-    CORBA::tk_ulong,
-    0,
+    21, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f506f), ACE_NTOHL (0x6c696379), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0xfdfdfd),  // repository ID = IDL:CORBA/Policy:1.0
+    7, ACE_NTOHL (0x506f6c69), ACE_NTOHL (0x637900fd),  // name = Policy,
+  0,
  };
- CORBA::_tc_PolicyTypeSeq =
-   new CORBA::TypeCode (CORBA::tk_alias,
-                        sizeof (_oc_CORBA_PolicyTypeSeq),
-                        (char *) &_oc_CORBA_PolicyTypeSeq,
-                        0,
-                        sizeof (CORBA::PolicyTypeSeq));
-
-  static const CORBA::Long _oc_CORBA_SetOverrideType[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    38,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f5365),
-    ACE_NTOHL (0x744f7665),
-    ACE_NTOHL (0x72726964),
-    ACE_NTOHL (0x65547970),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/SetOverrideType:1.0
-    16,
-    ACE_NTOHL (0x5365744f),
-    ACE_NTOHL (0x76657272),
-    ACE_NTOHL (0x69646554),
-    ACE_NTOHL (0x79706500),   // name = SetOverrideType
-    2,                        // member count
-    13,
-    ACE_NTOHL (0x5345545f),
-    ACE_NTOHL (0x4f564552),
-    ACE_NTOHL (0x52494445),
-    ACE_NTOHL (0x0),          // name = SET_OVERRIDE
-    13,
-    ACE_NTOHL (0x4144445f),
-    ACE_NTOHL (0x4f564552),
-    ACE_NTOHL (0x52494445),
-    ACE_NTOHL (0x0),          // name = ADD_OVERRIDE
-  };
- CORBA::_tc_SetOverrideType =
-   new CORBA::TypeCode (CORBA::tk_enum,
-                        sizeof (_oc_CORBA_SetOverrideType),
-                        (char *) &_oc_CORBA_SetOverrideType,
-                        0,
-                        sizeof (CORBA::SetOverrideType));
-
-  static const CORBA::Long _oc_CORBA_PolicyManager[] =
- {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyManager:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),   // name = PolicyManager,
-  };
- CORBA::_tc_PolicyManager =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_PolicyManager),
-                        (char *) &_oc_CORBA_PolicyManager,
-                        0,
-                        sizeof (CORBA::PolicyManager));
-
-  static const CORBA::Long _oc_CORBA_PolicyCurrent[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c696379),
-    ACE_NTOHL (0x43757272),
-    ACE_NTOHL (0x656e743a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PolicyCurrent:1.0
-    14,
-    ACE_NTOHL (0x506f6c69),
-    ACE_NTOHL (0x63794375),
-    ACE_NTOHL (0x7272656e),
-    ACE_NTOHL (0x74000000),   // name = PolicyCurrent,
-  };
- CORBA::_tc_PolicyCurrent =
-   new CORBA::TypeCode  (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_PolicyCurrent),
-                         (char *) &_oc_CORBA_PolicyCurrent,
-                         0,
-                         sizeof (CORBA::PolicyCurrent));
-
-  static const CORBA::Long _oc_CORBA_DomainManager[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),   // repository ID =
-                              //IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-    ACE_NTOHL (0x446f6d61),
-
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),   // name = DomainManager,
-  };
-  CORBA::_tc_DomainManager =
-    new CORBA::TypeCode (CORBA::tk_objref,
-                         sizeof (_oc_CORBA_DomainManager),
-                         (char *) &_oc_CORBA_DomainManager,
-                         0,
-                         sizeof (CORBA_DomainManager));
-
-  static const CORBA::Long _oc_CORBA_DomainManagerList[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,       // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765724c),
-    ACE_NTOHL (0x6973743a),
-    ACE_NTOHL (0x312e3000),     // repository ID =
-                                //IDL:omg.org/CORBA/DomainManagerList:1.0
-    18,
-    ACE_NTOHL (0x446f6d61),
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x724c6973),
-    ACE_NTOHL (0x74000000),     // name = DomainManagerList
-    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
-    36,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f446f),
-    ACE_NTOHL (0x6d61696e),
-    ACE_NTOHL (0x4d616e61),
-    ACE_NTOHL (0x6765723a),
-    ACE_NTOHL (0x312e3000),     // repository ID =
-                                //IDL:omg.org/CORBA/DomainManager:1.0
-    14,
-    ACE_NTOHL (0x446f6d61),
-    ACE_NTOHL (0x696e4d61),
-    ACE_NTOHL (0x6e616765),
-    ACE_NTOHL (0x72000000),     // name = DomainManager,
-    0,
-  };
-  CORBA::_tc_DomainManagerList =
-    new CORBA::TypeCode (CORBA::tk_alias,
-                         sizeof (_oc_CORBA_DomainManagerList),
-                         (char *) &_oc_CORBA_DomainManagerList,
-                         0,
-                         sizeof (CORBA_DomainManagerList));
+ CORBA::_tc_PolicyList = new CORBA::TypeCode (CORBA::tk_alias,
+                                              sizeof (_oc_CORBA_PolicyList),
+                                              (char *) &_oc_CORBA_PolicyList,
+                                              1,
+                                              sizeof (CORBA::PolicyList));
 
- // ****************************************************************
-
-#if defined(TAO_POLLER)
-  static const CORBA::Long _oc_CORBA_Pollable[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c6c6162),
-    ACE_NTOHL (0x6c653a31),
-    ACE_NTOHL (0x2e300000),   // repository ID =
-                              //   IDL:omg.org/CORBA/Pollable:1.0
-    9,
-    ACE_NTOHL (0x506f6c6c),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x0),          // name = Pollable,
-  };
- CORBA::_tc_Pollable =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_Pollable),
-                        (char *) &_oc_CORBA_Pollable,
-                        0,
-                        sizeof (CORBA_Pollable));
-
-  static const CORBA::Long _oc_CORBA_DIIPollable[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4449),
-    ACE_NTOHL (0x49506f6c),
-    ACE_NTOHL (0x6c61626c),
-    ACE_NTOHL (0x653a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/DIIPollable:1.0
-    12,
-    ACE_NTOHL (0x44494950),
-    ACE_NTOHL (0x6f6c6c61),
-    ACE_NTOHL (0x626c6500),   // name = DIIPollable,
-  };
- CORBA::_tc_DIIPollable =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_DIIPollable),
-                        (char *) &_oc_CORBA_DIIPollable,
-                        0,
-                        sizeof (CORBA::DIIPollable));
-
-  static const CORBA::Long _oc_CORBA_PollableSet[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    34,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f506f),
-    ACE_NTOHL (0x6c6c6162),
-    ACE_NTOHL (0x6c655365),
-    ACE_NTOHL (0x743a312e),
-    ACE_NTOHL (0x30000000),   // repository ID =
-                              //   IDL:omg.org/CORBA/PollableSet:1.0
-    12,
-    ACE_NTOHL (0x506f6c6c),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x53657400),   // name = PollableSet,
-  };
- CORBA::_tc_PollableSet =
-   new CORBA::TypeCode (CORBA::tk_objref,
-                        sizeof (_oc_CORBA_PollableSet),
-                        (char *) &_oc_CORBA_PollableSet,
-                        0,
-                        sizeof (CORBA_PollableSet));
-
-#endif /* TAO_POLLER */
-
- // ****************************************************************
-
-  static const CORBA::Long _oc_CORBA_Current[] =
-  {
-    TAO_ENCAP_BYTE_ORDER,     // byte order
-    22,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4375),
-    ACE_NTOHL (0x7272656e),
-    ACE_NTOHL (0x743a312e),
-    ACE_NTOHL (0x3000fdfd),   // repository ID = IDL:CORBA/Current:1.0
-    8,
-    ACE_NTOHL (0x43757272),
-    ACE_NTOHL (0x656e7400),   // name = Current,
-  };
+ static const CORBA::Long _oc_CORBA_Current[] =
+ {
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  22, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4375), ACE_NTOHL (0x7272656e), ACE_NTOHL (0x743a312e), ACE_NTOHL (0x3000fdfd),  // repository ID = IDL:CORBA/Current:1.0
+  8, ACE_NTOHL (0x43757272), ACE_NTOHL (0x656e7400),  // name = Current,
+ };
  CORBA::_tc_Current = new CORBA::TypeCode (CORBA::tk_objref,
                                            sizeof (_oc_CORBA_Current),
                                            (char *) &_oc_CORBA_Current,
@@ -1592,12 +421,11 @@ TAO_TypeCodes::init (void)
     // END bytes of encapsulation 0 (sequence params)
   };
 
-  TC_ServiceContextList =
-    new CORBA::TypeCode (CORBA::tk_sequence,
-                         sizeof _oc_svc_ctx_list,
-                         (char *) &_oc_svc_ctx_list,
-                         1,
-                         sizeof (TAO_GIOP_ServiceContextList));
+  TC_ServiceContextList = new CORBA::TypeCode (CORBA::tk_sequence,
+                                               sizeof _oc_svc_ctx_list,
+                                               (char *) &_oc_svc_ctx_list,
+                                               1,
+                                               sizeof (TAO_GIOP_ServiceContextList));
 
   static const CORBA::ULong oc_completion_status [] =
   {
@@ -1695,64 +523,8 @@ TAO_TypeCodes::fini (void)
 
   CORBA::release (CORBA::_tc_RepositoryId);
 
-  CORBA::release (CORBA::_tc_ORBid);
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  CORBA::release (CORBA_ORB::_tc_InconsistentTypeCode);
-
-  CORBA::release (CORBA::_tc_ConstructionPolicy);
-
-  CORBA::release (CORBA::_tc_NamedValue);
-
-  CORBA::release (CORBA::_tc_WrongTransaction);
-
-  CORBA::release (CORBA::_tc_AnySeq);
-
-  CORBA::release (CORBA::_tc_NameValuePair);
-
-  CORBA::release (CORBA::_tc_NameValuePairSeq);
-
-  CORBA::release (CORBA::_tc_FieldName);
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  CORBA::release (CORBA_ORB::_tc_ObjectId);
-
   CORBA::release (CORBA::_tc_PolicyType);
 
-  CORBA::release (CORBA::_tc_PolicyErrorCode);
-
-  CORBA::release (CORBA::_tc_PolicyError);
-
-  CORBA::release (CORBA::_tc_InvalidPolicies);
-
-  CORBA::release (CORBA::_tc_PolicyTypeSeq);
-
-  CORBA::release (CORBA::_tc_SetOverrideType);
-
-  CORBA::release (CORBA::_tc_PolicyManager);
-
-  CORBA::release (CORBA::_tc_PolicyCurrent);
-
-  CORBA::release (CORBA::_tc_DomainManager);
-
-  CORBA::release (CORBA::_tc_DomainManagerList);
-
-#if defined (TAO_POLLER)
-  CORBA::release (CORBA::_tc_Pollable);
-
-  CORBA::release (CORBA::_tc_DIIPollable);
-
-  CORBA::release (CORBA::_tc_PollableSet);
-#endif /* defined (TAO_POLLER) */
-
-  // Service types
-   //= Service type
-   CORBA::release (CORBA::_tc_ServiceType);
-   CORBA::release (CORBA::_tc_ServiceOption);
-   CORBA::release (CORBA::_tc_ServiceDetailType);
-   CORBA::release (CORBA::_tc_ServiceDetail);
-   CORBA::release (CORBA::_tc_ServiceInformation);
-
   // TAO specific
   CORBA::release (TC_opaque);
 
diff --git a/TAO/tao/UIOP_Acceptor.cpp b/TAO/tao/UIOP_Acceptor.cpp
deleted file mode 100644
index e02e1d4daa9..00000000000
--- a/TAO/tao/UIOP_Acceptor.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//      UIOP_Acceptor.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_Acceptor.h"
-#include "tao/GIOP.h"
-
-CORBA::ULong
-TAO_UIOP_Acceptor::tag (void)
-{
-  return this->tag_;
-}
-
-TAO_UIOP_Acceptor::TAO_UIOP_Acceptor (void)
-  : base_acceptor_ (),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP)
-{
-}
-
-TAO_Profile *
-TAO_UIOP_Acceptor::create_profile (TAO_ObjectKey &)
-{
-  return 0;
-}
-
-ACE_Event_Handler *
-TAO_UIOP_Acceptor::acceptor (void)
-{
-  return &base_acceptor_;
-}
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Acceptor.h b/TAO/tao/UIOP_Acceptor.h
deleted file mode 100644
index f73c0d9e28e..00000000000
--- a/TAO/tao/UIOP_Acceptor.h
+++ /dev/null
@@ -1,72 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UIOP_Acceptor.h
-//
-// = DESCRIPTION
-//    Unix Domain Socket (UIOP) specific acceptor processing
-//
-// = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
-//    Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_ACCEPTOR_H
-#define TAO_UIOP_ACCEPTOR_H
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/Acceptor.h"
-#include "ace/LSOCK_Acceptor.h"
-#include "tao/Pluggable.h"
-#include "tao/Connect.h"
-
-typedef ACE_Strategy_Acceptor<TAO_Server_Connection_Handler,
-                              ACE_LSOCK_ACCEPTOR>
-        TAO_UIOP_BASE_ACCEPTOR;
-// was defined in Connect.h
-
-// TAO UIOP_Acceptor concrete call defination
-
-class TAO_Export TAO_UIOP_Acceptor : public TAO_Acceptor
-{
-  // = TITLE
-  //   The UIOP-specific bridge class for the concrete acceptor.
-  //
-  // = DESCRIPTION
-  //   
-public:
-  // TAO_UIOP_Acceptor (ACE_UNIX_Addr &addr);
-  // Create Acceptor object using addr.
-
-  TAO_UIOP_Acceptor (void);
-  // Create Acceptor object using addr.
-
-  CORBA::ULong tag (void);
-  // The tag, each concrete class will have a specific tag value.
-
-  virtual TAO_Profile *create_profile (TAO_ObjectKey& object_key);
-  // create profile object for this Acceptor using the SAP
-  // (service access point, Host and Port) and object_key.
-
-  virtual ACE_Event_Handler *acceptor (void);
-  // Return the underlying acceptor object, ACE_Acceptor
-
-private:
-  TAO_UIOP_BASE_ACCEPTOR base_acceptor_;
-  // the concrete acceptor, as a pointer to its base class.
-
-  CORBA::ULong tag_;
-  //  the IOP specific tag.
-};
-
-# endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_ACCEPTOR_H */
diff --git a/TAO/tao/UIOP_Connect.cpp b/TAO/tao/UIOP_Connect.cpp
deleted file mode 100644
index fceff511557..00000000000
--- a/TAO/tao/UIOP_Connect.cpp
+++ /dev/null
@@ -1,1383 +0,0 @@
-// $Id$
-
-#if !defined(ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/debug.h"
-#include "tao/GIOP.h"
-#include "tao/GIOP_Server_Request.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/CDR.h"
-
-#include "tao/UIOP_Connect.h"
-#include "tao/UIOP_Transport.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/UIOP_Connect.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, UIOP_Connect, "$Id$")
-
-TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core)
-  : TAO_UIOP_SVC_HANDLER (orb_core->thr_mgr (), 0, 0)
-{
-}
-
-TAO_UIOP_Handler_Base::TAO_UIOP_Handler_Base (ACE_Thread_Manager *t)
-  : TAO_UIOP_SVC_HANDLER (t, 0, 0)
-{
-}
-
-int
-TAO_UIOP_Handler_Base::resume_handler (ACE_Reactor *)
-{
-  errno = ENOTSUP;
-  return -1;
-}
-
-// @@ For pluggable protocols, added a reference to
-//    the corresponding transport obj.
-TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Handler_Base (t ? t : TAO_ORB_Core_instance()->thr_mgr ()),
-    orb_core_ (TAO_ORB_Core_instance ())
-{
-  uiop_transport_ = new TAO_UIOP_Server_Transport(this);
-}
-
-// @@ For pluggable protocols, added a reference to the
-//    corresponding transport obj.
-TAO_UIOP_Server_Connection_Handler::TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core)
-  : TAO_UIOP_Handler_Base (orb_core),
-    orb_core_ (orb_core)
-{
-  uiop_transport_ = new TAO_UIOP_Server_Transport(this);
-}
-
-TAO_Transport *
-TAO_UIOP_Server_Connection_Handler::transport (void)
-{
-  // @@ For now return nothing since all is not in place!
-  return uiop_transport_;
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::open (void*)
-{
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.
-  ACE_UNIX_Addr addr;
-
-  if (this->peer ().get_remote_addr (addr) == -1)
-    return -1;
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    this->orb_core_->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    this->orb_core_->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                ACE_reinterpret_cast (void *, &sndbufsize),
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                    ACE_reinterpret_cast (void *, &rcvbufsize),
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* !ACE_LACKS_SOCKET_BUFSIZ */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  char client[MAXPATHLEN + 1];
-
-  if (addr.get_path_name (client, MAXPATHLEN) == -1)
-    addr.addr_to_string (client, sizeof (client));
-
-  if (TAO_orbdebug)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) connection from client %s\n",
-                client));
-  return 0;
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::activate (long flags,
-                                              int n_threads,
-                                              int force_active,
-                                              long priority,
-                                              int grp_id,
-                                              ACE_Task_Base *task,
-                                              ACE_hthread_t thread_handles[],
-                                              void *stack[],
-                                              size_t stack_size[],
-                                              ACE_thread_t  thread_names[])
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_UIOP_Server_Connection_Handler::activate"
-                 " %d threads, flags = %d\n",
-                 n_threads,
-                 flags,
-                 THR_BOUND));
-
-  return TAO_UIOP_SVC_HANDLER::activate (flags,
-                                         n_threads,
-                                         force_active,
-                                         priority,
-                                         grp_id,
-                                         task,
-                                         thread_handles,
-                                         stack,
-                                         stack_size,
-                                         thread_names);
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                             ACE_Reactor_Mask rm)
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_UIOP_Server_Connection_Handler::handle_close"
-                 " (%d, %d)\n",
-                 handle,
-                 rm));
-
-  return TAO_UIOP_SVC_HANDLER::handle_close (handle, rm);
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::svc (void)
-{
-  // This method is called when an instance is "activated", i.e.,
-  // turned into an active object.  Presumably, activation spawns a
-  // thread with this method as the "worker function".
-  int result = 0;
-
-  // Inheriting the ORB_Core stuff from the parent thread.  WARNING:
-  // this->orb_core_ is *not* the same as TAO_ORB_Core_instance(),
-  // this thread was just created and we are in fact *initializing*
-  // the ORB_Core based on the resources of the ORB that created
-  // us....
-
-  TAO_ORB_Core *tss_orb_core = TAO_ORB_Core_instance ();
-  tss_orb_core->inherit_from_parent_thread (this->orb_core_);
-
-  // We need to change this->orb_core_ so it points to the TSS ORB
-  // Core, but we must preserve the old value
-  TAO_ORB_Core* old_orb_core = this->orb_core_;
-  this->orb_core_ = tss_orb_core;
-
-  if (TAO_orbdebug)
-    ACE_DEBUG ((LM_DEBUG,
-                "(%P|%t) TAO_UIOP_Server_Connection_Handler::svc begin\n"));
-
-  // Here we simply synthesize the "typical" event loop one might find
-  // in a reactive handler, except that this can simply block waiting
-  // for input.
-
-  while ((result = handle_input ()) >= 0)
-    continue;
-
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_UIOP_Server_Connection_Handler::svc end\n"));
-
-  this->orb_core_ = old_orb_core;
-
-  return result;
-}
-
-// Handle processing of the request residing in <input>, setting
-// <response_required> to zero if the request is for a oneway or
-// non-zero if for a two-way and <output> to any necessary response
-// (including errors).  In case of errors, -1 is returned and
-// additional information carried in <TAO_IN_ENV>.
-// The request ID is needed by handle_input. It is passed back
-// as reference.
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_message (TAO_InputCDR &input,
-                                                    TAO_OutputCDR &output,
-                                                    CORBA::Boolean &response_required,
-                                                    CORBA::ULong &request_id,
-                                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  GIOP_ServerRequest request (input,
-                              output,
-                              this->orb_core_,
-                              ACE_TRY_ENV);
-  ACE_CHECK_RETURN (-1);
-
-  // The request_id_ field in request will be 0 if something went
-  // wrong before it got a chance to read it out.
-  request_id = request.request_id ();
-
-  response_required = request.response_expected ();
-
-  const CORBA::Octet *object_key = request.object_key ().get_buffer ();
-
-#if !defined (TAO_NO_IOR_TABLE)
-  if (ACE_OS::memcmp (object_key,
-		      &TAO_POA::objectkey_prefix[0],
-		      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
-    {
-      ACE_CString object_id (ACE_reinterpret_cast (const char *, object_key),
-			     TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE,
-			     0,
-			     0);
-
-      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;
-
-      // Do the Table Lookup.
-      int status =
-	this->orb_core_->orb ()->_tao_find_in_IOR_table (object_id,
-							 object_reference);
-
-      // If ObjectID not in table or reference is nil raise OBJECT_NOT_EXIST.
-
-      if (CORBA::is_nil (object_reference) || status == -1)
-	ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), -1);
-
-      // ObjectID present in the table with an associated NON-NULL reference.
-      // Throw a forward request exception.
-
-      CORBA::Object_ptr dup = CORBA::Object::_duplicate (object_reference);
-
-      ACE_THROW_RETURN (PortableServer::ForwardRequest (dup), -1);
-    }
-
-#endif
-
-  // So, we read a request, now handle it using something more
-  // primitive than a CORBA2 ServerRequest pseudo-object.
-
-  // @@ (CJC) We need to create a TAO-specific request which will hold
-  // context for a request such as the connection handler ("this") over
-  // which the request was received so that the servicer of the request
-  // has sufficient context to send a response on its own.
-  //
-  // One thing which me must be careful of is that responses are sent
-  // with a single write so that they're not accidentally interleaved
-  // over the transport (as could happen using TCP).
-
-  this->orb_core_->object_adapter ()->dispatch_servant (request.object_key (),
-                                                        request,
-                                                        0,
-                                                        ACE_TRY_ENV);
-  // NEED TO CHECK FOR any errors present in <env> and set the return
-  // code appropriately.
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_locate (TAO_InputCDR &input,
-                                                   TAO_OutputCDR &output,
-                                                   CORBA::Boolean &response_required,
-                                                   CORBA::ULong &request_id,
-                                                   CORBA::Environment &env)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_LOCATE_START);
-
-  // This will extract the request header, set <response_required> as
-  // appropriate.
-  TAO_GIOP_LocateRequestHeader locateRequestHeader;
-
-  env.clear ();
-  if (locateRequestHeader.init (input, env) == 0)
-    {
-      request_id = locateRequestHeader.request_id;
-      response_required = 0;
-      return -1;
-    }
-
-  // Copy the request ID to be able to respond in case of an
-  // exception.
-  request_id = locateRequestHeader.request_id;
-  response_required = 1;
-
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-  TAO_OutputCDR dummy_output (repbuf, sizeof(repbuf));
-  // This output CDR is not used!
-
-  TAO_ObjectKey tmp_key (locateRequestHeader.object_key.length (),
-                         locateRequestHeader.object_key.length (),
-                         locateRequestHeader.object_key.get_buffer (),
-                         0);
-
-  CORBA::Object_var forward_location_var;
-  TAO_GIOP_LocateStatusType status;
-
-// #if !defined (TAO_NO_IOR_TABLE)
-//   if (ACE_OS::memcmp (tmp_key.get_buffer (),
-// 		      &TAO_POA::objectkey_prefix[0],
-// 		      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) == 0)
-//     {
-//       ACE_DEBUG ((LM_DEBUG,
-// 		  "TAO Object Key Prefix found in the object key.\n"));
-
-
-//       // Do the Table Lookup. Raise a location forward exception or
-//       // a non-exist exception.
-
-//       // CORBA::Object_ptr object_reference;
-//       // int s =
-//       //     table->lookup (request.object_key (),
-//       //                    object_reference);
-//       // if (s == -1)
-//       //   {
-//       //      status = TAO_GIOP_UNKNOWN_OBJECT;
-//       //   }
-//       // else
-//       //   {
-//       //      status = TAO_GIOP_OBJECT_FORWARD;
-//       //      forward_location_var =
-//       //          CORBA::Object::_duplicate (object_reference);
-//       //    }
-//     }
-//   // else
-//   //   {
-// #endif
-
-  // this->handle_locate_i (....);
-
-  GIOP_ServerRequest serverRequest (locateRequestHeader.request_id,
-                                    response_required,
-                                    tmp_key,
-                                    "_non_existent",
-                                    dummy_output,
-                                    this->orb_core_,
-                                    env);
-
-  this->orb_core_->object_adapter ()->dispatch_servant (serverRequest.object_key (),
-                                                        serverRequest,
-                                                        0,
-                                                        env);
-
-  if (serverRequest.exception_type () == TAO_GIOP_NO_EXCEPTION
-      && env.exception () == 0)
-    {
-      // we got no exception, so the object is here
-      status = TAO_GIOP_OBJECT_HERE;
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO: (%P|%t) handle_locate() : found\n"));
-    }
-  else if (serverRequest.exception_type () != TAO_GIOP_NO_EXCEPTION)
-    {
-      forward_location_var = serverRequest.forward_location ();
-      if (!CORBA::is_nil (forward_location_var.in ()))
-        {
-          status = TAO_GIOP_OBJECT_FORWARD;
-          ACE_DEBUG ((LM_DEBUG,
-                      "handle_locate has been called: forwarding\n"));
-        }
-      else
-        {
-          // Normal exception, so the object is not here
-          status = TAO_GIOP_UNKNOWN_OBJECT;
-          ACE_DEBUG ((LM_DEBUG,
-                      "handle_locate has been called: not here\n"));
-        }
-
-      // The locate_servant call might have thrown an exception but we
-      // don't want to marshal it because it is no failure.  The
-      // proper Locacte_Reply will tell the client what is going on.
-
-      // Remove the exception
-      env.clear ();
-    }
-  else
-    {
-      // Try to narrow to ForwardRequest
-      PortableServer::ForwardRequest_ptr forward_request_ptr =
-        PortableServer::ForwardRequest::_narrow (env.exception ());
-
-      // If narrowing of exception succeeded
-      if (forward_request_ptr != 0)
-        {
-          status = TAO_GIOP_OBJECT_FORWARD;
-          forward_location_var = forward_request_ptr->forward_reference;
-          ACE_DEBUG ((LM_DEBUG,
-                      "handle_locate has been called: forwarding\n"));
-        }
-      else
-        {
-          // Normal exception, so the object is not here
-          status = TAO_GIOP_UNKNOWN_OBJECT;
-          ACE_DEBUG ((LM_DEBUG,
-                      "handle_locate has been called: not here\n"));
-        }
-
-      // the locate_servant call might have thrown an exception but we
-      // don't want to marshal it because it is no failure.  The
-      // proper Locacte_Reply will tell the client what is going on.
-
-      // Remove the exception
-      env.clear ();
-    }
-
-#if !defined (TAO_NO_IOR_TABLE)
-  //  }
-#endif
-
-  // Create the response.
-  TAO_GIOP::start_message (TAO_GIOP::LocateReply, output,
-                           this->orb_core_);
-  output.write_ulong (locateRequestHeader.request_id);
-  output.write_ulong (status);
-
-  if (status == TAO_GIOP_OBJECT_FORWARD)
-    {
-      CORBA::Object_ptr object_ptr = forward_location_var.in ();
-      if ((output << object_ptr) == 0)
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Server_Connection_Handler::handle_locate - "
-                          "error marshaling forwarded reference\n"));
-            }
-          response_required = 0;
-          return -1;
-        }
-    }
-
-  return 0;
-}
-
-void
-TAO_UIOP_Server_Connection_Handler::send_response (TAO_OutputCDR &output)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
-
-  TAO_GIOP::send_request (this->uiop_transport_,
-                          output,
-                          this->orb_core_);
-}
-
-// This method is designed to return system exceptions to the caller.
-
-void
-TAO_UIOP_Server_Connection_Handler::send_error (CORBA::ULong request_id,
-                                           CORBA::Exception *x)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_SEND_RESPONSE_START);
-
-  // The request_id is going to be not 0, if it was sucessfully read
-  if (request_id != 0)
-    {
-      // Create a new output CDR stream
-      TAO_OutputCDR output;
-
-      // Construct a REPLY header.
-      TAO_GIOP::start_message (TAO_GIOP::Reply, output,
-                               this->orb_core_);
-
-      // A new try/catch block, but if something goes wrong now we
-      // have no hope, just abort.
-      ACE_TRY_NEW_ENV
-        {
-          // create and write a dummy context
-          TAO_GIOP_ServiceContextList resp_ctx;
-          resp_ctx.length (0);
-          output << resp_ctx;
-
-          // Write the request ID
-          output.write_ulong (request_id);
-
-          // @@ TODO This is the place to conditionally compile
-          // forwarding. It certainly seems easy to strategize too,
-          // just invoke an strategy to finish marshalling the
-          // response.
-
-          // Now we check for Forwarding ***************************
-
-          // Try to narrow to ForwardRequest
-          PortableServer::ForwardRequest_ptr forward_request_ptr =
-            PortableServer::ForwardRequest::_narrow (x);
-
-          // If narrowing of exception succeeded
-          if (forward_request_ptr != 0
-              && !CORBA::is_nil (forward_request_ptr->forward_reference.in ()))
-            {
-              // write the reply_status
-              output.write_ulong (TAO_GIOP_LOCATION_FORWARD);
-
-              // write the object reference into the stream
-              CORBA::Object_ptr object_ptr =
-                forward_request_ptr->forward_reference.in();
-
-              output << object_ptr;
-            }
-          // end of the forwarding code ****************************
-          else
-            {
-              // Write the exception
-              CORBA::TypeCode_ptr except_tc = x->_type ();
-
-              CORBA::ExceptionType extype = CORBA::USER_EXCEPTION;
-              if (CORBA::SystemException::_narrow (x) != 0)
-                extype = CORBA::SYSTEM_EXCEPTION;
-
-              // write the reply_status
-              output.write_ulong (TAO_GIOP::convert_CORBA_to_GIOP_exception (extype));
-
-              // write the actual exception
-              output.encode (except_tc, x, 0, ACE_TRY_ENV);
-              ACE_TRY_CHECK;
-            }
-        }
-      ACE_CATCH (CORBA_Exception, ex)
-        {
-          // now we know, that while handling the error an other error
-          // happened -> no hope, close connection.
-
-          // close the handle
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) closing conn %d after fault %p\n",
-                      this->peer ().get_handle (),
-                      "TAO_UIOP_Server_Connection_Handler::send_error"));
-          this->handle_close ();
-          return;
-        }
-      ACE_ENDTRY;
-
-      // hand it to the next lower layer
-      TAO_GIOP::send_request (this->uiop_transport_, output, this->orb_core_);
-    }
-}
-
-int
-TAO_UIOP_Server_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  // CJCXXX The tasks of this method should change to something like
-  // the following:
-  // 1. call into GIOP to pull off the header
-  // 2. construct a complete request
-  // 3. dispatch that request and return any required reply and errors
-
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_START);
-
-  // @@ TODO This should take its memory from a specialized
-  // allocator. It is better to use a message block than a on stack
-  // buffer because we cannot minimize memory copies in that case.
-  TAO_InputCDR input (this->orb_core_->create_input_cdr_data_block (ACE_CDR::DEFAULT_BUFSIZE),
-                      TAO_ENCAP_BYTE_ORDER);
-
-  char repbuf[ACE_CDR::DEFAULT_BUFSIZE];
-#if defined(ACE_HAS_PURIFY)
-  (void) ACE_OS::memset (repbuf, '\0', sizeof (repbuf));
-#endif /* ACE_HAS_PURIFY */
-  TAO_OutputCDR output (repbuf, sizeof(repbuf),
-                        TAO_ENCAP_BYTE_ORDER,
-                        this->orb_core_->output_cdr_buffer_allocator (),
-                        this->orb_core_->output_cdr_buffer_allocator ());
-
-  int result = 0;
-  int error_encountered = 0;
-  CORBA::Boolean response_required = 0;
-  CORBA::ULong request_id = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      // Try to recv a new request.
-      TAO_GIOP::Message_Type type =
-        TAO_GIOP::recv_request (this->uiop_transport_, input, this->orb_core_);
-
-      TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_RECEIVE_REQUEST_END);
-
-      // Check to see if we've been cancelled cooperatively.
-      if (this->orb_core_->orb ()->should_shutdown () != 0)
-        error_encountered = 1;
-      else
-        {
-          switch (type)
-            {
-            case TAO_GIOP::Request:
-              // Message was successfully read, so handle it.  If we
-              // encounter any errors, <output> will be set
-              // appropriately by the called code, and -1 will be
-              // returned.
-              if (this->handle_message (input,
-                                        output,
-                                        response_required,
-                                        request_id,
-                                        ACE_TRY_ENV) == -1)
-                error_encountered = 1;
-              ACE_TRY_CHECK;
-              break;
-
-            case TAO_GIOP::LocateRequest:
-              if (this->handle_locate (input,
-                                       output,
-                                       response_required,
-                                       request_id,
-                                       ACE_TRY_ENV) == -1)
-                error_encountered = 1;
-              ACE_TRY_CHECK;
-              break;
-
-            case TAO_GIOP::EndOfFile:
-              // Got a EOF
-              result = -1;
-              break;
-
-              // These messages should never be sent to the server;
-              // it's an error if the peer tries.  Set the environment
-              // accordingly, as it's not yet been reported as an
-              // error.
-            case TAO_GIOP::Reply:
-            case TAO_GIOP::LocateReply:
-            case TAO_GIOP::CloseConnection:
-            default:                                    // Unknown message
-              ACE_DEBUG ((LM_DEBUG,
-                          "(%P|%t) Illegal message received by server\n"));
-              ACE_TRY_THROW (CORBA::COMM_FAILURE ());
-              // NOTREACHED
-
-            case TAO_GIOP::CommunicationError:
-            case TAO_GIOP::MessageError:
-              // Here, MessageError can either mean condition for
-              // GIOP::MessageError happened or a GIOP message was
-              // not successfully received.  Sending back of
-              // GIOP::MessageError is handled in TAO_GIOP::parse_header.
-              error_encountered = 1;
-              break;
-            }
-        }
-    }
-  ACE_CATCHANY                  // Only CORBA exceptions are caught here.
-    {
-      if (response_required)
-        this->send_error (request_id, &ex);
-      else
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) exception thrown "
-                          "but client is not waiting a response\n"));
-              ACE_TRY_ENV.print_exception ("");
-            }
-
-          // It is unfotunate that an exception (probably a system
-          // exception) was thrown by the upcall code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-          result = 0;
-        }
-      return result;
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.
-      //   If we have native exceptions but no support for them
-      //   in the ORB we should still be able to catch it.
-      //   If we don't have native exceptions it couldn't have been
-      //   raised in the first place!
-
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) closing conn %d after fault %p\n",
-                  this->peer().get_handle (),
-                  "TAO_UIOP_Server_Connection_Handler::handle_input"));
-      //      this->handle_close ();
-      return -1;
-    }
-#endif /* TAO_HAS_EXCEPTIONS */
-  ACE_ENDTRY;
-
-  if (response_required)
-    {
-      if (!error_encountered)
-        this->send_response (output);
-      else
-        {
-          // No exception but some kind of error, yet a response is
-          // required.
-          if (TAO_orbdebug)
-            ACE_ERROR ((LM_ERROR,
-                        "TAO: (%P|%t) %s: closing conn, no exception, "
-                        "but expecting response\n",
-                        "TAO_UIOP_Server_Connection_Handler::handle_input"));
-          //          this->handle_close ();
-          return -1;
-        }
-    }
-  else if (error_encountered)
-    {
-      // No exception, no response expected, but an error ocurred,
-      // close the socket.
-      if (TAO_orbdebug)
-        ACE_ERROR ((LM_ERROR,
-                    "TAO: (%P|%t) %s: closing conn, no exception, "
-                    "but expecting response\n",
-                    "TAO_UIOP_Server_Connection_Handler::handle_input"));
-      //      this->handle_close ();
-      return -1;
-    }
-
-  TAO_MINIMAL_TIMEPROBE (TAO_SERVER_CONNECTION_HANDLER_HANDLE_INPUT_END);
-
-  return result;
-}
-
-// @@ For pluggable protocols, added a reference to the corresponding
-//    transport obj.
-TAO_UIOP_Client_Connection_Handler::TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Handler_Base (t == 0 ? TAO_ORB_Core_instance ()->thr_mgr () : t),
-    expecting_response_ (0),
-    input_available_ (0)
-{
-  uiop_transport_ = new TAO_UIOP_Client_Transport(this);
-}
-
-// @@ Need to get rid of the Transport Objects!
-TAO_UIOP_Client_Connection_Handler::~TAO_UIOP_Client_Connection_Handler (void)
-{
-  delete this->uiop_transport_;
-  this->uiop_transport_ = 0;
-}
-
-TAO_Transport *
-TAO_UIOP_Client_Connection_Handler::transport (void)
-{
-  return this->uiop_transport_;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::open (void *)
-{
-  // Here is where we could enable all sorts of things such as
-  // nonblock I/O, sock buf sizes, TCP no-delay, etc.
-
-#if !defined (ACE_LACKS_SOCKET_BUFSIZ)
-  int sndbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_sndbuf_size ();
-  int rcvbufsize =
-    TAO_ORB_Core_instance ()->orb_params ()->sock_rcvbuf_size ();
-
-  if (this->peer ().set_option (SOL_SOCKET,
-                                SO_SNDBUF,
-                                ACE_reinterpret_cast (void *, &sndbufsize),
-                                sizeof (sndbufsize)) == -1
-      && errno != ENOTSUP)
-    return -1;
-  else if (this->peer ().set_option (SOL_SOCKET,
-                                     SO_RCVBUF,
-                                    ACE_reinterpret_cast (void *, &rcvbufsize),
-                                     sizeof (rcvbufsize)) == -1
-           && errno != ENOTSUP)
-    return -1;
-#endif /* ACE_LACKS_SOCKET_BUFSIZ */
-
-  (void) this->peer ().enable (ACE_CLOEXEC);
-  // Set the close-on-exec flag for that file descriptor. If the
-  // operation fails we are out of luck (some platforms do not support
-  // it and return -1).
-
-  // For now, we just return success
-  return 0;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::send_request (TAO_ORB_Core *,
-                                                  TAO_OutputCDR &,
-                                                  int)
-{
-  errno = ENOTSUP;
-  return -1;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  errno = ENOTSUP;
-  return -1;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::check_unexpected_data (void)
-{
-  // We're a client, so we're not expecting to see input.  Still we
-  // better check what it is!
-  char ignored;
-  ssize_t ret = this->peer().recv (&ignored,
-                                   sizeof ignored,
-                                   MSG_PEEK);
-  switch (ret)
-    {
-    case 0:
-    case -1:
-      // 0 is a graceful shutdown
-      // -1 is a somewhat ugly shutdown
-      //
-      // Both will result in us returning -1 and this connection
-      // getting closed
-      //
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_WARNING,
-                    "UIOP_Client_Connection_Handler::handle_input: "
-                    "closing connection on fd %d\n",
-                    this->peer().get_handle ()));
-      break;
-
-    case 1:
-      //
-      // @@ Fix me!!
-      //
-      // This should be the close connection message.  Since we don't
-      // handle this yet, log an error, and close the connection.
-      ACE_ERROR ((LM_WARNING,
-                  "UIOP_Client_Connection_Handler::handle_input received "
-                  "input while not expecting a response; "
-                  "closing connection on fd %d\n",
-                  this->peer().get_handle ()));
-      break;
-    }
-
-  // We're not expecting input at this time, so we'll always
-  // return -1 for now.
-  return -1;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle,
-                                                  ACE_Reactor_Mask rm)
-{
-  if (TAO_orbdebug)
-    ACE_DEBUG  ((LM_DEBUG,
-                 "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_close"
-                 " (%d, %d)\n",
-                 handle,
-                 rm));
-
-  if (this->recycler ())
-    this->recycler ()->mark_as_closed (this->recycling_act ());
-
-  // Deregister this handler with the ACE_Reactor.
-  if (this->reactor ())
-    {
-      ACE_Reactor_Mask mask = ACE_Event_Handler::ALL_EVENTS_MASK |
-        ACE_Event_Handler::DONT_CALL;
-
-      // Make sure there are no timers.
-      this->reactor ()->cancel_timer (this);
-
-      // Remove self from reactor.
-      this->reactor ()->remove_handler (this, mask);
-    }
-
-  this->peer ().close ();
-
-  return 0;
-}
-
-int
-TAO_UIOP_Client_Connection_Handler::close (u_long)
-{
-  this->destroy ();
-
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_RW_Client_Connection_Handler::TAO_RW_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Client_Connection_Handler (t)
-{
-}
-
-TAO_RW_Client_Connection_Handler::~TAO_RW_Client_Connection_Handler (void)
-{
-}
-
-int
-TAO_RW_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
-                                                TAO_OutputCDR &stream,
-                                                int is_twoway)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-  //
-  // We could call a template method to do all this stuff, and if the
-  // connection handler were obtained from a factory, then this could
-  // be dynamically linked in (wouldn't that be cool/freaky?)
-
-  // Send the request
-  int success =
-    ACE_static_cast (int, TAO_GIOP::send_request (this->uiop_transport_,
-                                                  stream,
-                                                  orb_core));
-
-  TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
-  if (!success)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_RW_Client_Connection_Handler::resume_handler (ACE_Reactor *)
-{
-  // Since we don't suspend, we don't have to resume.
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_ST_Client_Connection_Handler::TAO_ST_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Client_Connection_Handler (t)
-{
-}
-
-TAO_ST_Client_Connection_Handler::~TAO_ST_Client_Connection_Handler (void)
-{
-}
-
-int
-TAO_ST_Client_Connection_Handler::open (void *something)
-{
-  int result = TAO_UIOP_Client_Connection_Handler::open (something);
-
-  if (result != 0)
-    return result;
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-  return r->register_handler (this,
-                              ACE_Event_Handler::READ_MASK);
-}
-
-// @@ this seems odd that the connection handler would call methods in the
-//    GIOP object.  Some of this mothod's functionality should be moved
-//    to GIOP. fredk
-int
-TAO_ST_Client_Connection_Handler::send_request (TAO_ORB_Core* orb_core,
-                                                TAO_OutputCDR &stream,
-                                                int is_twoway)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-  //
-  // We could call a template method to do all this stuff, and if the
-  // connection handler were obtained from a factory, then this could
-  // be dynamically linked in (wouldn't that be cool/freaky?)
-
-  // Send the request
-  int success  = (int) TAO_GIOP::send_request (this->uiop_transport_,
-                                               stream,
-                                               orb_core);
-  TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
-  if (!success)
-    return -1;
-
-  if (is_twoway)
-    {
-      // Set the state so that we know we're looking for a response.
-      this->expecting_response_ = 1;
-
-      // Go into a loop, waiting until it's safe to try to read
-      // something on the socket.  The handle_input() method doesn't
-      // actualy do the read, though, proper behavior based on what is
-      // read may be different if we're not using GIOP above here.
-      // So, we leave the reading of the response to the caller of
-      // this method, and simply insure that this method doesn't
-      // return until such time as doing a recv() on the socket would
-      // actually produce fruit.
-      ACE_Reactor *r = orb_core->reactor ();
-
-      int ret = 0;
-
-      while (ret != -1 && ! this->input_available_)
-        ret = r->handle_events ();
-
-      this->input_available_ = 0;
-      // We can get events now, b/c we want them!
-
-      // We're no longer expecting a response!
-      this->expecting_response_ = 0;
-    }
-
-  return 0;
-}
-
-int
-TAO_ST_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  int retval = 0;
-
-  if (this->expecting_response_)
-    {
-      this->input_available_ = 1;
-      // Temporarily remove ourself from notification so that if
-      // another sub event loop is in effect still waiting for its
-      // response, it doesn't spin tightly gobbling up CPU.
-      TAO_ORB_Core_instance ()->reactor ()->suspend_handler (this);
-    }
-  else
-    retval = this->check_unexpected_data ();
-
-  return retval;
-}
-
-int
-TAO_ST_Client_Connection_Handler::resume_handler (ACE_Reactor *reactor)
-{
-  return reactor->resume_handler (this);
-}
-
-// ****************************************************************
-
-TAO_MT_UIOP_Client_Connection_Handler::TAO_MT_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t)
-  : TAO_UIOP_Client_Connection_Handler (t),
-    calling_thread_ (ACE_OS::NULL_thread),
-    cond_response_available_ (0),
-    orb_core_ (0)
-{
-}
-
-TAO_MT_UIOP_Client_Connection_Handler::~TAO_MT_UIOP_Client_Connection_Handler (void)
-{
-  delete this->cond_response_available_;
-}
-
-int
-TAO_MT_UIOP_Client_Connection_Handler::open (void *something)
-{
-  int result = TAO_UIOP_Client_Connection_Handler::open (something);
-
-  if (result != 0)
-    return result;
-
-  // Now we must register ourselves with the reactor for input events
-  // which will detect GIOP Reply messages and EOF conditions.
-  ACE_Reactor *r = TAO_ORB_Core_instance ()->reactor ();
-  return r->register_handler (this,
-                              ACE_Event_Handler::READ_MASK);
-}
-
-ACE_SYNCH_CONDITION*
-TAO_MT_UIOP_Client_Connection_Handler::cond_response_available (TAO_ORB_Core* orb_core)
-{
-  // @@ TODO This condition variable should per-ORB-per-thread, not
-  // per-connection, it is a waste to have more than one of this in
-  // the same thread.
-  if (this->cond_response_available_ == 0)
-    {
-      ACE_NEW_RETURN (this->cond_response_available_,
-                      ACE_SYNCH_CONDITION (orb_core->leader_follower_lock ()),
-                      0);
-    }
-  return this->cond_response_available_;
-}
-
-int
-TAO_MT_UIOP_Client_Connection_Handler::send_request (TAO_ORB_Core *orb_core,
-                                                     TAO_OutputCDR &stream,
-                                                     int is_twoway)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_CLIENT_CONNECTION_HANDLER_SEND_REQUEST_START);
-
-  // Save the ORB_Core for the handle_input callback...
-  this->orb_core_ = orb_core;
-
-  // NOTE: Here would also be a fine place to calculate a digital
-  // signature for the message and place it into a preallocated slot
-  // in the "ServiceContext".  Similarly, this is a good spot to
-  // encrypt messages (or just the message bodies) if that's needed in
-  // this particular environment and that isn't handled by the
-  // networking infrastructure (e.g. IPSEC).
-  //
-  // We could call a template method to do all this stuff, and if the
-  // connection handler were obtained from a factory, then this could
-  // be dynamically linked in (wouldn't that be cool/freaky?)
-
-  if (!is_twoway)
-    {
-      // Send the request
-      int success  = (int) TAO_GIOP::send_request (this->uiop_transport_,
-                                                   stream,
-                                                   this->orb_core_);
-
-      TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
-      if (!success)
-        return -1;
-    }
-  else // is_twoway
-    {
-      ACE_Reactor *r = this->orb_core_->reactor ();
-
-      if (this->reactor () != r)
-        {
-          ACE_Reactor_Mask mask =
-            ACE_Event_Handler::ALL_EVENTS_MASK | ACE_Event_Handler::DONT_CALL;
-          this->reactor ()->remove_handler (this, mask);
-
-          r->register_handler (this,
-                               ACE_Event_Handler::READ_MASK);
-        }
-
-      if (this->orb_core_->leader_follower_lock ().acquire() == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                           "Failed to get the lock.\n"),
-                          -1);
-
-      // Set the state so that we know we're looking for a response.
-      this->expecting_response_ = 1;
-      // remember in which thread the client connection handler was running
-      this->calling_thread_ = ACE_Thread::self ();
-
-      // Send the request
-      int success = (int) TAO_GIOP::send_request (this->uiop_transport_,
-                                                  stream,
-                                                  orb_core);
-
-      TAO_MINIMAL_TIMEPROBE (GIOP_SEND_REQUEST_RETURN);
-
-      if (!success)
-        {
-          this->orb_core_->leader_follower_lock ().release ();
-          return -1;
-        }
-
-      // check if there is a leader, but the leader is not us
-      if (this->orb_core_->leader_available () &&
-          !this->orb_core_->I_am_the_leader_thread ())
-        {
-          // wait as long as no input is available and/or
-          // no leader is available
-          while (!this->input_available_ &&
-                 this->orb_core_->leader_available ())
-            {
-              ACE_SYNCH_CONDITION* cond =
-                this->cond_response_available (orb_core);
-              if (this->orb_core_->add_follower (cond) == -1)
-                ACE_ERROR ((LM_ERROR,
-                            "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                            "Failed to add a follower thread\n"));
-              cond->wait ();
-            }
-          // now somebody woke us up to become a leader or to handle
-          // our input. We are already removed from the follower queue
-          if (this->input_available_)
-            {
-              // there is input waiting for me
-              if (this->orb_core_->leader_follower_lock ().release () == -1)
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                                   "Failed to release the lock.\n"),
-                                  -1);
-              // The following variables are safe, because we are not
-              // registered with the reactor any more.
-              this->input_available_ = 0;
-              this->expecting_response_ = 0;
-              this->calling_thread_ = ACE_OS::NULL_thread;
-              return 0;
-            }
-        }
-
-      // Become a 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->orb_core_->set_leader_thread ();
-      // this might increase the recount of the leader
-
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                           "Failed to release the lock.\n"),
-                          -1);
-
-      r->owner (ACE_Thread::self ());
-
-      int ret = 0;
-
-      while (ret != -1 && !this->input_available_)
-        ret = r->handle_events ();
-
-      if (ret == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                           "handle_events failed.\n"),
-                          -1);
-
-      // 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.
-
-      if (this->orb_core_->unset_leader_wake_up_follower () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::send_request: "
-                           "Failed to unset the leader and wake up a new follower.\n"),
-                          -1);
-      // Make use reusable
-      this->input_available_ = 0;
-      this->expecting_response_ = 0;
-      this->calling_thread_ = ACE_OS::NULL_thread;
-    }
-
-  return 0;
-}
-
-int
-TAO_MT_UIOP_Client_Connection_Handler::handle_input (ACE_HANDLE)
-{
-  if (this->orb_core_ == 0)
-    this->orb_core_ = TAO_ORB_Core_instance ();
-
-  if (this->orb_core_->leader_follower_lock ().acquire () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                       "Failed to get the lock.\n"),
-                      -1);
-
-  if (!this->expecting_response_)
-    {
-      // we got something, but did not want
-      // @@ wake up an other thread, we are lost
-
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                           "Failed to release the lock.\n"),
-                          -1);
-      return this->check_unexpected_data ();
-    }
-
-  if (ACE_OS::thr_equal (this->calling_thread_,
-                         ACE_Thread::self ()))
-    {
-      // We are now a leader getting its response.
-      this->input_available_ = 1;
-
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                           "Failed to release the lock.\n"),
-                          -1);
-      this->orb_core_->reactor ()->suspend_handler (this);
-      // resume_handler is called in TAO_GIOP_Invocation::invoke
-      return 0;
-    }
-  else
-    {
-      // We are a leader, which got a response for one of the
-      // followers, which means we are now a thread running the wrong
-      // Client_Connection_Handler
-
-      // At this point we might fail to remove the follower, because
-      // it has been already chosen to become the leader, so it is
-      // awake and will get this too.
-      ACE_SYNCH_CONDITION* cond =
-        this->cond_response_available (this->orb_core_);
-
-      this->orb_core_->remove_follower (cond);
-
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                           "Failed to release the lock.\n"),
-                          -1);
-
-      this->orb_core_->reactor ()->suspend_handler (this);
-      // We should wake suspend the thread before we wake him up.
-      // resume_handler is called in TAO_GIOP_Invocation::invoke
-
-      // @@ TODO (Michael): We might be able to optimize this in
-      // doing the suspend_handler as last thing, but I am not sure
-      // if a race condition would occur.
-
-      if (this->orb_core_->leader_follower_lock ().acquire () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                           "Failed to acquire the lock.\n"),
-                          -1);
-      // The thread was already selected to become a leader, so we
-      // will be called again.
-      this->input_available_ = 1;
-      cond->signal ();
-
-      if (this->orb_core_->leader_follower_lock ().release () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%P|%t) TAO_UIOP_Client_Connection_Handler::handle_input: "
-                           "Failed to release the lock.\n"),
-                          -1);
-      return 0;
-    }
-}
-
-int
-TAO_MT_UIOP_Client_Connection_Handler::resume_handler (ACE_Reactor *reactor)
-{
-  return reactor->resume_handler (this);
-}
-
-// ****************************************************************
-
-#define TAO_UIOP_SVC_TUPLE ACE_Svc_Tuple<TAO_UIOP_Client_Connection_Handler>
-#define UIOP_CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<TAO_UIOP_Client_Connection_Handler, ACE_LSOCK_CONNECTOR, TAO_Cached_Connector_Lock>
-#define UIOP_REFCOUNTED_HASH_RECYCLABLE_ADDR ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>;
-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*>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH>
-#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*>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connect.h b/TAO/tao/UIOP_Connect.h
deleted file mode 100644
index c7c6694353d..00000000000
--- a/TAO/tao/UIOP_Connect.h
+++ /dev/null
@@ -1,296 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Connect.h
-//
-// = AUTHOR
-//     Ossama Othman
-//
-// ============================================================================
-
-
-#ifndef TAO_UIOP_CONNECT_H
-#define TAO_UIOP_CONNECT_H
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#  include "ace/Acceptor.h"
-#  include "ace/Synch.h"
-#  include "ace/Svc_Handler.h"
-#  include "ace/Reactor.h"
-#  include "ace/LSOCK_Acceptor.h"
-
-#  include "tao/corbafwd.h"
-
-// Forward Decls
-class TAO_Transport;
-class TAO_ORB_Core;
-
-class TAO_UIOP_Transport;
-class TAO_UIOP_Client_Transport;
-class TAO_UIOP_Server_Transport;
-
-typedef ACE_Svc_Handler<ACE_LSOCK_STREAM, ACE_NULL_SYNCH> TAO_UIOP_SVC_HANDLER;
-
-class TAO_UIOP_Handler_Base : public TAO_UIOP_SVC_HANDLER
-{
-public:
-  TAO_UIOP_Handler_Base (ACE_Thread_Manager *t);
-  TAO_UIOP_Handler_Base (TAO_ORB_Core *orb_core);
-
-  virtual TAO_Transport *transport (void) = 0;
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-};
-
-class TAO_Export TAO_UIOP_Client_Connection_Handler : public TAO_UIOP_Handler_Base
-{
-  // = TITLE
-  //      <Svc_Handler> used on the client side and returned by the
-  //      <TAO_CONNECTOR>.
-public:
-  // = Intialization method.
-  TAO_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual ~TAO_UIOP_Client_Connection_Handler (void);
-
-  // = <Connector> hook.
-  virtual int open (void *);
-  // Activation template method.
-
-  virtual int send_request (TAO_ORB_Core* orb_core,
-                            TAO_OutputCDR &stream,
-                            int is_twoway);
-  // Send the request in <stream>.  If it is a twoway invocation, then
-  // this re-enters the reactor event loop so that incoming requests
-  // can continue to be serviced.  This insures that a nested upcall,
-  // i.e., an invocation coming back from the remote during this
-  // invocation, will still be handled and deadlock averted.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-  virtual int close (u_long flags = 0);
-  // Object termination hook.
-
-  virtual TAO_Transport *transport (void);
-
-protected:
-
-  TAO_UIOP_Client_Transport *uiop_transport_;
-  // @@ New transport object reference.
-  // The handler is responsible for creating this object when
-  // it is instantiated. fredk
-
-  int check_unexpected_data (void);
-  // This method checks for unexpected data
-
-  int expecting_response_;
-  // State flag which, if non-zero, indicates that this handler is
-  // looking to get input.  Otherwise, any input received is
-  // unexpected.
-
-  int input_available_;
-  // Flag indicating whether or not input is available.  Only valid
-  // when <expecting_response_> is non-zero.
-};
-
-class TAO_Export TAO_RW_UIOP_Client_Connection_Handler : public TAO_UIOP_Client_Connection_Handler
-{
-public:
-  TAO_RW_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual ~TAO_RW_UIOP_Client_Connection_Handler (void);
-
-  virtual int send_request (TAO_ORB_Core* orb_core,
-                            TAO_OutputCDR &stream,
-                            int is_twoway);
-  // Send the request in <stream>.  Since this class simply
-  // reads/writes from a socket (and does not handle nested upcalls),
-  // there is no need to register with a reactor.
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
-protected:
-
-};
-
-class TAO_Export TAO_ST_UIOP_Client_Connection_Handler : public TAO_UIOP_Client_Connection_Handler
-{
-public:
-  TAO_ST_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual ~TAO_ST_UIOP_Client_Connection_Handler (void);
-
-  virtual int open (void *);
-  // Initialize the handler.
-
-  virtual int send_request (TAO_ORB_Core* orb_core,
-                            TAO_OutputCDR &stream,
-                            int is_twoway);
-  // Send the request in <stream>.  If it is a twoway invocation, then
-  // this re-enters the reactor event loop so that incoming requests
-  // can continue to be serviced.  This insures that a nested upcall,
-  // i.e., an invocation coming back from the remote during this
-  // invocation, will still be handled and deadlock averted.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
-protected:
-
-};
-
-class TAO_Export TAO_MT_UIOP_Client_Connection_Handler : public TAO_UIOP_Client_Connection_Handler
-{
-public:
-  TAO_MT_UIOP_Client_Connection_Handler (ACE_Thread_Manager *t = 0);
-
-  virtual ~TAO_MT_UIOP_Client_Connection_Handler (void);
-
-  virtual int open (void *);
-  // Initialize the handler.
-
-  virtual int send_request (TAO_ORB_Core* orb_core,
-                            TAO_OutputCDR &stream,
-                            int is_twoway);
-  // Send the request in <stream>.  If it is a twoway invocation, then
-  // this re-enters the reactor event loop so that incoming requests
-  // can continue to be serviced.  This insures that a nested upcall,
-  // i.e., an invocation coming back from the remote during this
-  // invocation, will still be handled and deadlock averted.
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Called when a a response from a twoway invocation is available.
-
-  virtual int resume_handler (ACE_Reactor *reactor);
-  // Resume the handler.
-
-protected:
-  ACE_SYNCH_CONDITION* cond_response_available (TAO_ORB_Core* orb_core);
-  // Return the cond_response_available, initializing it if necessary.
-
-  ACE_thread_t calling_thread_;
-  // the thread ID of the thread we were running in.
-
-  ACE_SYNCH_CONDITION* cond_response_available_;
-  // wait on reponse if the leader-follower model is active
-
-  TAO_ORB_Core* orb_core_;
-  // The ORB core where we are executing a request.
-};
-
-// ****************************************************************
-
-class TAO_ORB_Core;
-
-class TAO_Export TAO_UIOP_Server_Connection_Handler : public TAO_UIOP_Handler_Base
-{
-  // = TITLE
-  //   Handles requests on a single connection in a server.
-
-public:
-  TAO_UIOP_Server_Connection_Handler (ACE_Thread_Manager* t = 0);
-  TAO_UIOP_Server_Connection_Handler (TAO_ORB_Core *orb_core);
-  // Constructor.
-
-  virtual int open (void *);
-  // Called by the <Strategy_Acceptor> when the handler is completely
-  // connected.  Argument is unused.
-
-  // = Active object activation method.
-  virtual int activate (long flags = THR_NEW_LWP,
-                        int n_threads = 1,
-                        int force_active = 0,
-                        long priority = ACE_DEFAULT_THREAD_PRIORITY,
-                        int grp_id = -1,
-                        ACE_Task_Base *task = 0,
-                        ACE_hthread_t thread_handles[] = 0,
-                        void *stack[] = 0,
-                        size_t stack_size[] = 0,
-                        ACE_thread_t  thread_names[] = 0);
-
-  virtual int svc (void);
-  // Only used when the handler is turned into an active object by
-  // calling <activate>.  This serves as the event loop in such cases.
-
-  // = Template Methods Called by <handle_input>
-
-  virtual int handle_message (TAO_InputCDR &msg,
-                              TAO_OutputCDR &response,
-                              CORBA::Boolean &response_required,
-                              CORBA::ULong &request_id,
-                              CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // Handle processing of the request residing in <msg>, setting
-  // <response_required> to zero if the request is for a oneway or
-  // non-zero if for a two-way and <response> to any necessary
-  // response (including errors).  In case of errors, -1 is returned
-  // and additional information carried in <env>.
-
-  TAO_Transport *transport (void);
-
-protected:
-  TAO_UIOP_Server_Transport *uiop_transport_;
-  // @@ New transport object reference.
-
-  virtual int handle_locate (TAO_InputCDR &msg,
-                             TAO_OutputCDR &response,
-                             CORBA::Boolean &response_required,
-                             CORBA::ULong &request_id,
-                             CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  // Handle processing of the location request residing in <msg>,
-  // setting <response_required> to one if no errors are encountered.
-  // The LocateRequestReply is placed into <response>.  In case of
-  // errors, -1 is returned and additional information carried in
-  // <TAO_IN_ENV>.
-
-  virtual void send_response (TAO_OutputCDR &response);
-  // Send <response> to the client on the other end.
-
-  void send_error (CORBA::ULong request_id,
-                   CORBA::Exception *ex);
-  // Send <error> to the client on the other end, which
-  // means basically sending the exception.
-
-  // = Event Handler overloads
-
-  virtual int handle_input (ACE_HANDLE = ACE_INVALID_HANDLE);
-  // Reads a message from the <peer()>, dispatching and servicing it
-  // appropriately.
-
-  virtual int handle_close (ACE_HANDLE = ACE_INVALID_HANDLE,
-                            ACE_Reactor_Mask = ACE_Event_Handler::NULL_MASK);
-  // Perform appropriate closing.
-
-  TAO_ORB_Core *orb_core_;
-  // Cache the ORB Core to minimize
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Connect.i"
-#endif /* __ACE_INLINE__ */
-
-# endif /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif /* TAO_UIOP_CONNECT_H */
diff --git a/TAO/tao/UIOP_Connect.i b/TAO/tao/UIOP_Connect.i
deleted file mode 100644
index 271262ee1ec..00000000000
--- a/TAO/tao/UIOP_Connect.i
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-
-#endif /* ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
deleted file mode 100644
index 65f67474ceb..00000000000
--- a/TAO/tao/UIOP_Connector.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = 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"
-#include "tao/ORB_Core.h"
-#include "tao/Environment.h"
-
-CORBA::ULong
-TAO_UIOP_Connector::tag (void)
-{
-  return this->tag_;
-}
-
-TAO_UIOP_Connector::TAO_UIOP_Connector (void)
-  : tag_(TAO_IOP_TAG_INTERNET_IOP),
-    base_connector_ ()
-{
-}
-
-int
-TAO_UIOP_Connector::connect (TAO_Profile *profile,
-                             TAO_Transport *& transport)
-{
-  if (profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
-    return -1;
-
-  TAO_UIOP_Profile *uiop_profile =
-    ACE_dynamic_cast (TAO_UIOP_Profile *, profile);
-
-  if (uiop_profile == 0)
-    return -1;
-
-// Establish the connection and get back a <Client_Connection_Handler>.
-// @@ We do not have the ORB core
-// #if defined (TAO_ARL_USES_SAME_CONNECTOR_PORT)
-//   if (this->orb_core_->arl_same_port_connect ())
-//     {
-//       ACE_UNIX_Addr local_addr (this->orb_core_->orb_params ()->addr ());
-//       local_addr.set_port_number (server_addr_p->get_port_number ());
-//
-//       // Set the local port number to use.
-//       if (con->connect (uiop_profile->hint (),
-//                         uiop_profile->object_addr (),
-//                         0,
-//                         local_addr,
-//                         1) == -1);
-//       {
-//         // Give users a clue to the problem.
-//       ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-//                    "%s failed (%p)\n",
-//                    __FILE__,
-//                    __LINE__,
-//                    uiop_profile->addr_to_string (),
-//                    "errno"));
-//
-//        TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (), env);
-//        }
-//    }
-//  else
-//#endif /* TAO_ARL_USES_SAME_CONNECTOR_PORT */
-
-  const ACE_UNIX_Addr &oa = uiop_profile->object_addr ();
-
-  TAO_Client_Connection_Handler* result;
-
-  // the connect call will set the hint () stored in the Profile
-  // object; but we obtain the transport in the <result>
-  // variable. Other threads may modify the hint, but we are not
-  // affected.
-  if (this->base_connector_.connect (uiop_profile->hint (),
-                                     result,
-                                     oa) == -1)
-    { // Give users a clue to the problem.
-      if (TAO_orbdebug)
-        ACE_DEBUG ((LM_ERROR, "(%P|%t) %s:%u, connection to "
-                    "%s failed (%p)\n",
-                    __FILE__,
-                    __LINE__,
-                    profile->addr_to_string (),
-                    "errno"));
-
-      return -1;
-    }
-
-  transport = result->transport ();
-
-  return 0;
-}
-
-int
-TAO_UIOP_Connector::open (TAO_Resource_Factory *trf,
-                          ACE_Reactor *reactor)
-{
-  // @@ Fred: why not just
-  //
-  // return this->base_connector_.open (....); ????
-  //
-  if (this->base_connector_.open (reactor,
-                                  trf->get_null_creation_strategy (),
-                                  trf->get_cached_connect_strategy (),
-                                  trf->get_null_activation_strategy ()) != 0)
-    return -1;
-  return 0;
-}
-
-int
-TAO_UIOP_Connector::close (void)
-{
-  this->base_connector_.close ();
-  return 0;
-}
-
-int
-TAO_UIOP_Connector::preconnect (char *preconnections)
-{
-#if 0
-  if (preconnections)
-    {
-      ACE_UNIX_Addr dest;
-      TAO_Client_Connection_Handler *handler;
-      ACE_Unbounded_Stack<TAO_Client_Connection_Handler *> handlers;
-
-      char *nextptr = 0;
-      char *where = 0;
-
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *trendezvous_point = where;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-
-              dest.set (trendezvous_point);
-
-              // Try to establish the connection
-              handler = 0;
-              if (this->base_connector_.connect (handler, dest) == 0)
-                // Save it for later so we can mark it as idle
-                handlers.push (handler);
-              else
-                ACE_ERROR ((LM_ERROR,
-                            "(%P|%t) Unable to preconnect to rendezvous point"
-                            " '%s'.\n",
-                            dest.get_path_name ()));
-            }
-          else
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Couldn't find a ':' separator in '%s'"
-                        " spec.\n",
-                        where));
-        }
-
-      // Walk the stack of handlers and mark each one as idle now.
-      handler = 0;
-      while (handlers.pop (handler) == 0)
-        handler->idle ();
-
-    }
-#else
-  int successes = 0;
-  if (preconnections)
-    {
-      ACE_UNIX_Addr dest;
-      ACE_Unbounded_Stack<ACE_UNIX_Addr> dests;
-
-      char *nextptr = 0;
-      char *where = 0;
-      for (where = ACE::strsplit_r (preconnections, ",", nextptr);
-           where != 0;
-           where = ACE::strsplit_r (0, ",", nextptr))
-        {
-          char *rendezvous_point = where;
-          char *sep = ACE_OS::strchr (where, ':');
-
-          if (sep)
-            {
-              *sep = '\0';
-
-              dest.set (rendezvous_point);
-              dests.push (dest);
-            }
-          else
-            ACE_ERROR ((LM_ERROR,
-                        "(%P|%t) Couldn't find a ':' separator in '%s'"
-                        " spec.\n",
-                        where));
-        }
-
-      // Create an array of addresses from the stack, as well as an
-      // array of eventual handlers.
-      size_t num_connections = dests.size ();
-      ACE_UNIX_Addr *remote_addrs = 0;
-      TAO_Client_Connection_Handler **handlers = 0;
-      char *failures = 0;
-
-      ACE_NEW_RETURN (remote_addrs,
-                      ACE_UNIX_Addr[num_connections],
-                      -1);
-      ACE_NEW_RETURN (handlers,
-                      TAO_Client_Connection_Handler *[num_connections],
-                      -1);
-      ACE_NEW_RETURN (failures,
-                      char[num_connections],
-                      -1);
-
-      size_t index = 0;
-
-      // Fill in the remote address array
-      while (dests.pop (remote_addrs[index]) == 0)
-        handlers[index++] = 0;
-
-      // Finally, try to connect.
-      this->base_connector_.connect_n (num_connections,
-                                       handlers,
-                                       remote_addrs,
-                                       failures);
-      // Loop over all the failures and set the handlers that
-      // succeeded to idle state.
-      for (index = 0;
-           index < num_connections;
-           ++index)
-        {
-          if (!failures[index])
-            {
-              handlers[index]->idle ();
-              ++successes;
-            }
-        }
-    }
-#endif /* 0 */
-  return successes;
-}
-
-#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>;
-
-#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>
-
-#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
deleted file mode 100644
index 7b1a0db164d..00000000000
--- a/TAO/tao/UIOP_Connector.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    UIOP_Connector.h
-//
-// = DESCRIPTION
-//    UIOP specific connector processing
-//
-// = AUTHOR
-//    Fred Kuhns <fredk@cs.wustl.edu>
-//    Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_CONNECTOR_H
-#define TAO_UIOP_CONNECTOR_H
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/Connector.h"
-#include "ace/LSOCK_Connector.h"
-#include "tao/Pluggable.h"
-#include "tao/Connect.h"
-
-typedef ACE_Strategy_Connector<TAO_Client_Connection_Handler,
-                               ACE_LSOCK_CONNECTOR> TAO_UIOP_BASE_CONNECTOR;
-
-class TAO_Export TAO_UIOP_Connector : public TAO_Connector
-{
-  // = TITLE
-  //   UIOP-specific Connector bridge for pluggable protocols.
-  //
-  // = DESCRIPTION
-  //   
-public:
-  // = Initialization and termination methods.
-  TAO_UIOP_Connector (void);
-  // Constructor.
-  // @@ Do we want to pass in the tag here or should it be statically
-  // defined?
-
-  int open (TAO_Resource_Factory *trf, ACE_Reactor *reactor);
-  //  Initialize object and register with reactor.
-
-  int close (void);
-  // Shutdown Connector bridge and concreate Connector.
-
-  int preconnect (char *preconnections);
-  // Initial set of connections to be established.
-
-  CORBA::ULong tag (void);
-  // The tag identifying the specific ORB transport layer protocol.
-  // For example TAO_IOP_TAG_INTERNET_IOP = 0.  The tag is used in the
-  // IOR to identify the type of profile included. IOR -> {{tag0,
-  // profile0} {tag1, profile1} ...}  GIOP.h defines typedef
-  // CORBA::ULong TAO_IOP_Profile_ID;
-
-  int connect (TAO_Profile *profile,
-               TAO_Transport *&transport);
-  // Connect will be called from TAO_GIOP_Invocation::start
-
-private:
-  CORBA::ULong tag_;
-  // UIOP tag.
-
-  TAO_UIOP_BASE_CONNECTOR  base_connector_;
-  // The connector initiating connection requests for UIOP.
-};
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_CONNECTOR_H */
diff --git a/TAO/tao/UIOP_Profile.cpp b/TAO/tao/UIOP_Profile.cpp
deleted file mode 100644
index 5b4cca477a6..00000000000
--- a/TAO/tao/UIOP_Profile.cpp
+++ /dev/null
@@ -1,689 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Profile.h"
-#include "tao/GIOP.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/ORB.h"
-#include "tao/MProfile.h"
-#include "tao/ORB_Core.h"
-#include "tao/POA.h"
-#include "tao/debug.h"
-
-ACE_RCSID(tao, UIOP_Profile, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-static const char *prefix_ = "uiop:";
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
-                                    const char *object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (),
-    object_addr_ (addr),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  this->set (addr);
-  int l = ACE_OS::strlen (object_key);
-  this->object_key_.length (l);
-
-  for (int i = 0; i < l; ++i)
-    this->object_key_[i] = object_key[i];
-
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
-                                    const TAO_ObjectKey& object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  this->set (addr);
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
-                                    const TAO_IOP_Version& version,
-                                    const char *object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (version),
-    object_key_ (),
-    object_addr_ (addr),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  this->set (addr);
-  int l = ACE_OS::strlen (object_key);
-  this->object_key_.length (l);
-
-  for (int i = 0; i < l; ++i)
-    this->object_key_[i] = object_key[i];
-
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const ACE_UNIX_Addr& addr,
-                                    const TAO_IOP_Version& version,
-                                    const TAO_ObjectKey& object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (version),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  this->set (addr);
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
-                                    const TAO_ObjectKey& object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (object_key),
-    object_addr_ (rendezvous_point),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-
-  if (rendezvous_point)
-  {
-    ACE_NEW (this->rendezvous_point_,
-             char[ACE_OS::strlen (rendezvous_point) + 1]);
-    ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
-  }
-
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
-                                    const TAO_ObjectKey& object_key,
-                                    const ACE_UNIX_Addr& addr)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (object_key),
-    object_addr_ (addr),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-
-  if (rendezvous_point)
-  {
-    ACE_NEW (this->rendezvous_point_,
-             char[ACE_OS::strlen (rendezvous_point) + 1]);
-    ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
-  }
-
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char* rendezvous_point,
-                                    const TAO_IOP_Version& version,
-                                    const TAO_ObjectKey& object_key)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (object_key),
-    object_addr_ (rendezvous_point),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  ACE_UNUSED_ARG (version);
-
-  ACE_NEW (this->rendezvous_point_,
-           char[ACE_OS::strlen (rendezvous_point) + 1]);
-  ACE_OS::strcpy (this->rendezvous_point_, rendezvous_point);
-
-  this->create_body ();
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_UIOP_Profile *pfile)
-  : rendezvous_point_(0),
-    tag_(pfile->tag_),
-    body_(pfile->body_),
-    version_(pfile->version_),
-    object_key_(pfile->object_key_),
-    object_addr_(pfile->object_addr_),
-    hint_(0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-
-  ACE_NEW (this->rendezvous_point_,
-           char[ACE_OS::strlen (pfile->rendezvous_point_) + 1]);
-  ACE_OS::strcpy (this->rendezvous_point_, pfile->rendezvous_point_);
-  hint_ = pfile->hint_;
-
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile)
-  : rendezvous_point_(0),
-    tag_(pfile.tag_),
-    body_(pfile.body_),
-    version_(pfile.version_),
-    object_key_(pfile.object_key_),
-    object_addr_(pfile.object_addr_),
-    hint_(0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-
-  ACE_NEW (this->rendezvous_point_,
-           char[ACE_OS::strlen (pfile.rendezvous_point_) + 1]);
-  ACE_OS::strcpy (this->rendezvous_point_, pfile.rendezvous_point_);
-  hint_ = pfile.hint_;
-
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const TAO_IOP_Version &version)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (version),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (const char *string,
-                                    CORBA::Environment &env)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-  parse_string (string, env);
-}
-
-TAO_UIOP_Profile::TAO_UIOP_Profile (void)
-  : rendezvous_point_ (0),
-    tag_ (TAO_IOP_TAG_INTERNET_IOP),
-    body_ (),
-    version_ (DEF_UIOP_MAJOR, DEF_UIOP_MINOR),
-    object_key_ (),
-    object_addr_ (),
-    hint_ (0),
-    // what about refcount_lock_ (),
-    refcount_ (1)
-{
-}
-
-int
-TAO_UIOP_Profile::set (const ACE_UNIX_Addr& addr)
-{
-  char temp_rendezvous_point[MAXPATHLEN + 1];
-  const char *temp_rendezvous_point2 = 0;
-
-//   if (TAO_ORB_Core_instance ()->orb_params ()->use_dotted_decimal_addresses ())
-//     {
-//       temp_rendezvous_point2 = addr.get_rendezvous_point_addr ();
-//       if (temp_rendezvous_point2 == 0)
-//         return -1;
-//     }
-//   else
-//     {
-      if (addr.get_rendezvous_point_name (temprendezvous_point,
-                                          sizeof (temp_rendezvous_point)) != 0)
-        return -1;
-
-      temp_rendezvous_point2 = temp_rendezvous_point;
-//     }
-
-  ACE_NEW_RETURN (this->rendezvous_point_,
-                  char[ACE_OS::strlen (temp_rendezvous_point2) + 1],
-                  -1);
-  ACE_OS::strcpy (this->rendezvous_point_, temp_rendezvous_point2);
-
-  return 0;
-
-}
-
-TAO_UIOP_Profile::~TAO_UIOP_Profile (void)
-{
-  assert (this->refcount_ == 0);
-
-  delete [] this->rendezvous_point_;
-  this->rendezvous_point_ = 0;
-}
-
-// return codes:
-// -1 -> error
-//  0 -> can't understand this version
-//  1 -> success.
-int
-TAO_UIOP_Profile::parse (TAO_InputCDR& cdr,
-                         CORBA::Boolean &continue_decoding,
-                         CORBA::Environment &env)
-{
-  CORBA::ULong encap_len = cdr.length ();
-
-  // Read and verify major, minor versions, ignoring UIOP
-  // profiles whose versions we don't understand.
-  // FIXME:  Version question again,  what do we do about them for this
-  //         protocol?
-
-  if (!(cdr.read_octet (this->version_.major)
-        && this->version_.major == TAO_UIOP_Profile::DEF_UIOP_MAJOR
-        && cdr.read_octet (this->version_.minor)
-        && this->version_.minor <= TAO_UIOP_Profile::DEF_UIOP_MINOR))
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "detected new v%d.%d UIOP profile",
-                this->version_.major,
-                this->version_.minor));
-    return 0;
-  }
-
-  if (this->rendezvous_point_)
-    {
-      delete [] this->rendezvous_point_;
-      this->rendezvous_point_ = 0;
-    }
-
-  // Get rendezvous_point
-  if (cdr.read_string (this->rendezvous_point_) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "error decoding UIOP rendezvous_point"));
-      return -1;
-    }
-
-  this->object_addr_.set (this->rendezvous_point_);
-
-  // ... and object key.
-
-  if ((cdr >> this->object_key_) == 0)
-    return -1;
-
-  if (cdr.length () != 0 && TAO_debug_level)
-    {
-      // If there is extra data in the profile we are supposed to
-      // ignore it, but print a warning just in case...
-      ACE_DEBUG ((LM_DEBUG,
-                  "%d bytes out of %d left after UIOP profile data\n",
-                  cdr.length (),
-                  encap_len));
-    }
-  if (cdr.good_bit ())
-    return 1;
-
-  return -1;
-}
-
-int
-TAO_UIOP_Profile::parse_string (const char *string,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  if (!string || !*string)
-    return 0;
-
-  // Remove the "N.N//" prefix, and verify the version's one
-  // that we accept
-
-  if (isdigit (string [0])
-      && isdigit (string [2])
-      && string [1] == '.'
-      && string [3] == '/'
-      && string [4] == '/')
-    {
-      // @@ This may fail for non-ascii character sets [but take that
-      // with a grain of salt]
-      this->version_.set_version ((char) (string [0] - '0'),
-                                  (char) (string [2] - '0'));
-      string += 5;
-    }
-  else
-    ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
-  if (this->version_.major != TAO_UIOP_Profile::DEF_UIOP_MAJOR
-      || this->version_.minor  > TAO_UIOP_Profile::DEF_UIOP_MINOR)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
-    }
-
-  // Pull off the "rendezvous_pointname:" part of the objref
-  // Copy the string because we are going to modify it...
-  CORBA::String_var copy = CORBA::string_dup (string);
-
-  char *start = copy.inout ();
-  char *cp = ACE_OS::strchr (start, ':');
-
-  if (cp == 0)
-    {
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
-    }
-
-  if (this->rendezvous_point_)
-    {
-      // @@ You are setting this->rendezvous_point_ using CORBA::string_alloc() a
-      // couple of lines below, you should then use CORBA::string_free()
-      // to release it!  In general use a single form of memory
-      // allocation for a field/variable to avoid new/free() and
-      // malloc/delete() mismatches.
-      // Ohh, and if you are going to use CORBA::string_alloc() &
-      // friends you may consider using CORBA::String_var to manage
-      // the memory automatically (though there may be forces that
-      // suggest otherwise).
-      delete [] this->rendezvous_point_;
-      this->rendezvous_point_ = 0;
-    }
-
-  this->rendezvous_point_ = CORBA::string_alloc (1 + cp - start);
-  for (cp = this->rendezvous_point_; *start != ':'; *cp++ = *start++)
-    continue;
-
-  *cp = 0; start++; // increment past :
-
-  cp = ACE_OS::strchr (start, '/');
-
-  if (cp == 0)
-    {
-      CORBA::string_free (this->rendezvous_point_);
-      ACE_THROW_RETURN (CORBA::MARSHAL (), -1);
-    }
-
-  this->object_addr_.set (this->rendezvous_point_);
-
-  start = ++cp;  // increment past the /
-
-  TAO_POA::decode_string_to_sequence (this->object_key_, start);
-
-  return 1;
-}
-
-//  TAO_InputCDR cdr (body.get_buffer (), body.length (), body[0]);
-//
-// @@
-//  CORBA::Boolean byte_order;
-//  cdr >> CORBA::Any::to_boolean (byte_order);
-//  cdr >> this->version_.major;
-//  cdr >> this->version_.minor;
-//  cdr >> this->rendezvous_point_;
-//  cdr >> this->object_key_;
-//  this->object_addr_.set (this->rendezvous_point_);
-// }
-
-void
-TAO_UIOP_Profile::create_body (void)
-{
-  TAO_OutputCDR cdr;
-}
-// @@
-//   cdr << TAO_ENCAP_BYTE_ORDER;
-//   cdr << this->version_.major;
-//   cdr << this->version_.minor;
-//   cdr << this->rendezvous_point_;
-//   cdr << this->object_key_;
-//
-//   // Create a copy by making a temporary TAO_opaque object.
-//   // @@ TODO the CDR stream may contain several fragments, need to
-//   // merge them...
-//   this->body_ = TAO_opaque (cdr.length (), // length
-//                             cdr.length (), // maximum
-//                             cdr.buffer (), // buffer
-//                             0);            // not own
-// }
-
-CORBA::Boolean
-TAO_UIOP_Profile::is_equivalent (TAO_Profile *other_profile,
-                                 CORBA::Environment &env)
-{
-  env.clear ();
-
-  if (other_profile->tag () != TAO_IOP_TAG_INTERNET_IOP)
-    return 0;
-
-  TAO_UIOP_Profile *op =
-    ACE_dynamic_cast (TAO_UIOP_Profile *, other_profile);
-
-  ACE_ASSERT (op->object_key_.length () < UINT_MAX);
-
-  return this->object_key_ == op->object_key_
-    && ACE_OS::strcmp (this->rendezvous_point_, op->rendezvous_point_) == 0
-    && this->version_ == op->version_;
-}
-
-CORBA::ULong
-TAO_UIOP_Profile::hash (CORBA::ULong max,
-                        CORBA::Environment &env)
-{
-  CORBA::ULong hashval;
-
-  env.clear ();
-
-  // Just grab a bunch of convenient bytes and hash them; could do
-  // more (rendezvous_point, full key, exponential hashing)
-  // but no real need  to do so except if performance requires a more
-  // costly hash.
-
-  hashval = this->object_key_.length () *
-    ACE_OS::atoi (this->rendezvous_point_);  // FIXME:  Is this valid?
-  hashval += this->version_.minor;
-
-  if (this->object_key_.length () >= 4)
-    {
-      hashval += this->object_key_ [1];
-      hashval += this->object_key_ [3];
-    }
-
-  return hashval % max;
-}
-
-char *
-TAO_UIOP_Profile::addr_to_string(void)
-{
-  static char s[MAXPATHLEN + MAXPATHLEN];
-  ACE_OS::sprintf (s, "%s",
-                   this->rendezvous_point_);
-  return s;
-}
-
-const char *
-TAO_UIOP_Profile::rendezvous_point (const char *r)
-{
-  if (this->rendezvous_point_)
-    {
-      delete [] this->rendezvous_point_;
-      this->rendezvous_point_ = 0;
-    }
-
-  if (h)
-    {
-      ACE_NEW_RETURN (this->rendezvous_point_,
-                      char[ACE_OS::strlen (r) + 1],
-                      0);
-      ACE_OS::strcpy (this->rendezvous_point_, r);
-    }
-
-  return this->rendezvous_point_;
-}
-
-void
-TAO_UIOP_Profile::reset_hint (void)
-{
-  if (this->hint_)
-    {
-      this->hint_->cleanup_hint ();
-      this->hint_ = 0;
-    }
-}
-
-TAO_UIOP_Profile &
-TAO_UIOP_Profile::operator= (const TAO_UIOP_Profile &src)
-{
-  this->version_ = src.version_;
-
-  this->object_key_ = src.object_key_;
-
-  this->object_addr_.set (src.object_addr_);
-
-  if (this->rendezvous_point_)
-    {
-      delete [] this->rendezvous_point_;
-      this->rendezvous_point_ = 0;
-    }
-
-  if (src.rendezvous_point_)
-    {
-      ACE_NEW_RETURN (this->rendezvous_point_,
-                      char[ACE_OS::strlen (src.rendezvous_point_) + 1],
-                      *this);
-      ACE_OS::strcpy (this->rendezvous_point_, src.rendezvous_point_);
-    }
-
-  return *this;
-}
-
-// Memory managment
-
-CORBA::ULong
-TAO_UIOP_Profile::_incr_refcnt (void)
-{
-  // OK, think I got it.  When this object is created (guard) the
-  // lock is automatically acquired (refcount_lock_).  Then when
-  // we leave this method the destructir for guard is called which
-  // releases the lock!
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->refcount_lock_, 0);
-
-  return this->refcount_++;
-}
-
-CORBA::ULong
-TAO_UIOP_Profile::_decr_refcnt (void)
-{
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, mon, this->refcount_lock_, 0);
-    this->refcount_--;
-    if (this->refcount_ != 0)
-      return this->refcount_;
-  }
-
-  // refcount is 0, so delete us!
-  // delete will call our ~ destructor which in turn deletes stuff.
-  delete this;
-  return 0;
-}
-
-CORBA::String
-TAO_UIOP_Profile::to_string (CORBA::Environment &env)
-{
-  ACE_UNUSED_ARG (env);
-
-  CORBA::String_var key;
-  TAO_POA::encode_sequence_to_string (key.inout(),
-                                      this->object_key ());
-
-  u_int buflen = (ACE_OS::strlen (::prefix_) +
-                  1 /* major # */ + 1 /* minor # */ +
-                  2 /* double-slash separator */ +
-                  ACE_OS::strlen (this->rendezvous_point_) +
-                  1 /* colon separator */ +
-                  5 /* port number */ +
-                  1 /* slash separator */ +
-                  ACE_OS::strlen (key) +
-                  1 /* zero terminator */);
-
-  CORBA::String buf = CORBA::string_alloc (buflen);
-
-  static const char digits [] = "0123456789";
-
-  ACE_OS::sprintf (buf,
-                   "%s%c.%c//%s/%s",
-                   ::prefix_,
-                   digits [this->version_.major],
-                   digits [this->version_.minor],
-                   this->rendezvous_point_,
-                   key.in ());
-  return buf;
-}
-
-const char *
-TAO_UIOP_Profile::prefix (void)
-{
-  return ::prefix_;
-}
-
-int
-TAO_UIOP_Profile::encode (TAO_OutputCDR &stream) const
-{
-  // UNSIGNED LONG, tag for this protocol profile;
-  // @@ it seems like this is not a good separation of concerns, why
-  // do we write the TAG here? That's generic code and should be
-  // handled by the object reference writer (IMHO).
-  stream.write_ulong (TAO_IOP_TAG_INTERNET_IOP);
-
-  // UNSIGNED LONG, number of succeeding bytes in the
-  // encapsulation.  We don't actually need to make the
-  // encapsulation, as nothing needs stronger alignment than
-  // this longword; it guarantees the rest is aligned for us.
-
-  CORBA::ULong rendezvous_pointlen = ACE_OS::strlen ((char *) this->rendezvous_point_);
-  CORBA::ULong encap_len =
-    1                              // byte order
-    + 1                            // version major
-    + 1                            // version minor
-    + 1                            // pad byte
-    + 4                            // sizeof (strlen)
-    + rendezvous_pointlen + 1                  // strlen + null
-    + (~rendezvous_pointlen & 01)              // optional pad byte
-    + 2                            // port
-    + ( rendezvous_pointlen & 02)              // optional pad short
-    + 4                            // sizeof (key length)
-    + this->object_key_.length (); // key length.
-  stream.write_ulong (encap_len);
-
-  // CHAR describing byte order, starting the encapsulation
-  stream.write_octet (TAO_ENCAP_BYTE_ORDER);
-
-  // UIOP::TAO_IOP_Version, two characters (version 1.0) padding
-  stream.write_char (this->version_.major);
-  stream.write_char (this->version_.minor);
-
-  // STRING rendezvous_pointname from profile
-  stream.write_string (this->rendezvous_point_);
-
-  // OCTET SEQUENCE for object key
-  stream << this->object_key_;
-
-  return 1;
-}
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Profile.h b/TAO/tao/UIOP_Profile.h
deleted file mode 100644
index d9d4f75f577..00000000000
--- a/TAO/tao/UIOP_Profile.h
+++ /dev/null
@@ -1,239 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Profile.h
-//
-// = DESCRIPTION
-//     Unix Domain Socket (UIOP) profile specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_PROFILE_H
-#define TAO_UIOP_PROFILE_H
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "ace/Synch.h"
-#include "ace/UNIX_Addr.h"
-#include "tao/Pluggable.h"
-#include "tao/Object_KeyC.h"
-
-class TAO_Client_Connection_Handler;
-
-// TAO UIOP_Profile concrete Profile definitions
-class TAO_Export TAO_UIOP_Profile : public TAO_Profile
-{
-  // = TITLE
-  //   This class defines the protocol specific attributes required
-  //   for locating ORBs over Unix Domain Sockets.
-  //
-  // = DESCRIPTION
-  //   This class defines the UIOP profile.
-public:
-  // = Currently, TAO supports UIOP 0.0.
-  enum
-    {
-      DEF_UIOP_MAJOR = 0,  // FIXME:  Version numbers?
-      DEF_UIOP_MINOR = 0
-    };
-
-  static const char *prefix (void);
-  // Return the char string prefix.
-
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const char *object_key);
-  // Profile constructor, the rendezvous_point field derived derived from
-  // addr.
-
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor, same as above except the object_key has
-  // already been marshaled.  (actually, no marshalling for this protocol)
-
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_IOP_Version &version,
-                    const char *object_key);
-  // Profile constructor, explicitly define the protocol version.
-
-  TAO_UIOP_Profile (const ACE_UNIX_Addr &addr,
-                    const TAO_IOP_Version &version,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor, explicitly define the protocol version.
-
-  TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO_ObjectKey &object_key,
-                    const ACE_UNIX_Addr &addr);
-  // Profile constructor
-
-  TAO_UIOP_Profile (const char *rendevous_point,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor
-
-  TAO_UIOP_Profile (const char *rendezvous_point,
-                    const TAO_IOP_Version &version,
-                    const TAO_ObjectKey &object_key);
-  // Profile constructor, explicitly define the protocol version
-  // FIXME:  What do we do about versions?
-
-  TAO_UIOP_Profile (const char *string,
-                    CORBA::Environment &env);
-  // Create object using a string ior.
-
-  TAO_UIOP_Profile (const TAO_UIOP_Profile *pfile);
-  // Profile copy constructor
-
-  TAO_UIOP_Profile (const TAO_UIOP_Profile &pfile);
-  // Profile copy constructor
-
-  TAO_UIOP_Profile (const TAO_IOP_Version &version);
-  // Profile constructor, explicitly define the version.
-
-  TAO_UIOP_Profile (void);
-  // Profile constructor, default.
-
-  ~TAO_UIOP_Profile (void);
-  // Destructor is to be called only through <_decr_refcnt>.
-
-  CORBA::ULong tag (void) const;
-  // The tag, each concrete class will have a specific tag value.  for
-  // example we are TAO_IOP_TAG_INTERNET_IOP.
-
-  int parse (TAO_InputCDR& cdr,
-             CORBA::Boolean& continue_decoding,
-             CORBA::Environment &env);
-  // Initialize this object using the given CDR octet string.
-
-  int parse_string (const char *string,
-                    CORBA::Environment &env);
-  // Initialize this object using the given input string.
-
-  CORBA::String to_string (CORBA::Environment &env);
-  // Return a string representation for this profile.
-  // client must deallocate memory.
-
-  const TAO_opaque& body (void) const;
-  // Create UIOP_Profile Object from marshalled data.
-
-  virtual int encode (TAO_OutputCDR &stream) const;
-  // Encode this profile in a stream, i.e. marshal it.
-  // FIXME:  NO MARSHALING for Unix Domain Sockets is needing
-
-  const TAO_ObjectKey &object_key (void) const;
-  // @@ deprecated, return a reference to the Object Key.
-
-  TAO_ObjectKey &object_key (TAO_ObjectKey& objkey);
-  // @@ deprecated. set the Object Key.
-
-  TAO_ObjectKey *_key (CORBA::Environment &env);
-  // Return a pointer to the Object Key.
-
-  CORBA::Boolean is_equivalent (TAO_Profile *other_profile,
-                                CORBA::Environment &env);
-  // Return true if this profile is equivalent to other_profile.  Two
-  // profiles are equivalent iff their key, rendezvous point, object_key
-  // and version are the same.
-
-  CORBA::ULong hash (CORBA::ULong max,
-                     CORBA::Environment &env);
-  // Return a hash value for this object.
-
-  char *addr_to_string (void);
-  // Return a string representation for the address.
-
-  const ACE_UNIX_Addr &object_addr (void) const;
-  // return a reference to the object_addr.
-
-  const char *rendezvous_point (void);
-  // Return a pointer to the rendezvous point string.  This object maintains
-  // ownership of this string.
-
-  const char *rendezvous_point (const char *h);
-  // Copy the string h into rendezvous_point_ and return the resulting pointer.
-  // This object maintains ownership of this string.
-
-  const TAO_IOP_Version *version (void);
-  // Return a pointer to this profile's version.  This object
-  // maintains ownership.
-
-  const TAO_IOP_Version *version (TAO_IOP_Version *v);
-  // First set the version then return a pointer to it.  This object
-  // maintains ownership.
-
-  TAO_Client_Connection_Handler *&hint (void);
-  // This is a hint for which connection handler to use.
-
-  void reset_hint (void);
-  // Reset the hint's value.
-
-  TAO_Profile *_nil (void);
-  // Return a null object pointer.
-
-  void operator= (const TAO_UIOP_Profile &src);
-  // Assignment operator
-
-  virtual CORBA::ULong _incr_refcnt (void);
-  // Increase the reference count by one on this object.
-
-  virtual CORBA::ULong _decr_refcnt (void);
-  // Decrement the object's reference count.  When this count goes to
-  // 0 this object will be deleted.
-
-private:
-  int set (const ACE_UNIX_Addr &addr);
-  // helper method to set the UNIX_Addr.
-
-  void create_body (void);
-  // Does the work for <add_profile>.
-
-private:
-
-  char *rendezvous_point_;
-  // String representing the rendezvous point.
-
-  CORBA::ULong tag_;
-  // The tag.
-
-  TAO_opaque body_;
-  // Marshaled profile (CDR).
-
-  TAO_IOP_Version version_;
-  // UIOP version number.
-
-  TAO_ObjectKey object_key_;
-  // object_key associated with this profile.
-
-  ACE_UNIX_Addr object_addr_;
-  // Cached instance of <ACE_UNIX_Addr> for use in making
-  // invocations, etc.
-
-  TAO_Client_Connection_Handler *hint_;
-  // Pointer to a connection handler which we successfully used
-  // already.
-
-  ACE_SYNCH_MUTEX refcount_lock_;
-  // Mutex to protect reference count.
-
-  CORBA::ULong refcount_;
-  // Number of outstanding references to this object.
-
-  TAO_MProfile *forward_to_;
-  // list of profiles which we should try forwarding on.
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/UIOP_Profile.i"
-#endif /* __ACE_INLINE__ */
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_PROFILE_H */
diff --git a/TAO/tao/UIOP_Profile.i b/TAO/tao/UIOP_Profile.i
deleted file mode 100644
index d4b9dc66157..00000000000
--- a/TAO/tao/UIOP_Profile.i
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-
-ACE_INLINE CORBA::ULong
-TAO_UIOP_Profile::tag (void) const
-{
-  return this->tag_;
-}
-
-ACE_INLINE const TAO_ObjectKey &
-TAO_UIOP_Profile::object_key (void) const
-{
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey &
-TAO_UIOP_Profile::object_key (TAO_ObjectKey& objkey)
-{
-  this->object_key_ = objkey;
-  return this->object_key_;
-}
-
-ACE_INLINE TAO_ObjectKey *
-TAO_UIOP_Profile::_key (CORBA::Environment &)
-{
-  return new TAO_ObjectKey (this->object_key_);
-}
-
-ACE_INLINE const TAO_opaque&
-TAO_UIOP_Profile::body (void) const
-{
-  return this->body_;
-}
-
-ACE_INLINE const ACE_UNIX_Addr&
-TAO_UIOP_Profile::object_addr (void) const
-{
-  return this->object_addr_;
-}
-
-ACE_INLINE const char *
-TAO_UIOP_Profile::rendezvous_point (void)
-{
-  return this->rendezvous_point_;
-}
-
-ACE_INLINE const TAO_IOP_Version *
-TAO_UIOP_Profile::version (void)
-{
-  return &this->version_;
-}
-
-ACE_INLINE const TAO_IOP_Version *
-TAO_UIOP_Profile::version (TAO_IOP_Version *v)
-{
-  this->version_ = *v;
-  return &this->version_;
-}
-
-ACE_INLINE TAO_Client_Connection_Handler *&
-TAO_UIOP_Profile::hint (void)
-{
-  return this->hint_;
-}
-
-ACE_INLINE TAO_Profile *
-TAO_UIOP_Profile::_nil (void)
-{
-  return (TAO_UIOP_Profile *) 0;
-}
-
-#endif  /* !defined ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Transport.cpp b/TAO/tao/UIOP_Transport.cpp
deleted file mode 100644
index 593bd7bb431..00000000000
--- a/TAO/tao/UIOP_Transport.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/UIOP_Transport.h"
-#include "tao/GIOP.h"
-#include "tao/Connect.h"
-#include "tao/Timeprobe.h"
-
-#if defined (ACE_ENABLE_TIMEPROBES)
-
-static const char *TAO_Transport_Timeprobe_Description[] =
-  {
-    "UIOP_Transport::send - start",
-    "UIOP_Transport::send - end",
-
-    "UIOP_Transport::receive - start",
-    "UIOP_Transport::recieve - end",
-
-    "UIOP_Client_Transport::send_request - start",
-    "UIOP_Client_Transport::send_request - end"
-  };
-
-enum
-  {
-    TAO_UIOP_TRANSPORT_SEND_START = 1200,
-    TAO_UIOP_TRANSPORT_SEND_END,
-
-    TAO_UIOP_TRANSPORT_RECEIVE_START,
-    TAO_UIOP_TRANSPORT_RECEIVE_END,
-
-    TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_START,
-    TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_END
-  };
-
-
-// Setup Timeprobes
-ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Transport_Timeprobe_Description,
-                                  TAO_UIOP_TRANSPORT_SEND_START);
-
-#endif /* ACE_ENABLE_TIMEPROBES */
-
-
-TAO_UIOP_Transport::TAO_UIOP_Transport (TAO_UIOP_Handler_Base* handler)
-  : handler_(handler),
-    tag_(TAO_IOP_TAG_INTERNET_IOP)
-{
-}
-
-TAO_UIOP_Transport::~TAO_UIOP_Transport (void)
-{
-}
-
-TAO_UIOP_Server_Transport::TAO_UIOP_Server_Transport (TAO_Server_Connection_Handler *handler)
-  : TAO_UIOP_Transport(handler),
-    server_handler_ (0)
-{
-  server_handler_ = handler;
-}
-
-TAO_UIOP_Client_Transport::TAO_UIOP_Client_Transport (TAO_Client_Connection_Handler *handler)
-  :  TAO_UIOP_Transport(handler),
-     client_handler_ (0)
-{
-  client_handler_ = handler;
-}
-
-TAO_UIOP_Server_Transport::~TAO_UIOP_Server_Transport (void)
-{
-}
-
-TAO_UIOP_Client_Transport::~TAO_UIOP_Client_Transport (void)
-{
-}
-
-CORBA::ULong
-TAO_UIOP_Transport::tag (void)
-{
-  return this->tag_;
-}
-
-TAO_Client_Connection_Handler *
-TAO_UIOP_Client_Transport::client_handler (void)
-{
-  return this->client_handler_;
-}
-
-TAO_Server_Connection_Handler *
-TAO_UIOP_Server_Transport::server_handler (void)
-{
-  return this->server_handler_;
-}
-
-TAO_UIOP_Handler_Base *&
-TAO_UIOP_Transport::handler (void)
-{
-  return this->handler_;
-}
-
-int
-TAO_UIOP_Transport::idle (void)
-{
-  return this->handler_->idle();
-}
-
-int
-TAO_UIOP_Transport::is_nil (TAO_Transport *obj)
-{
-  return obj == 0;
-}
-
-TAO_Transport *
-TAO_UIOP_Transport::_nil (void)
-{
-  return (TAO_UIOP_Transport *)0;
-}
-
-void
-TAO_UIOP_Transport::resume_connection (ACE_Reactor *reactor)
-{
-  this->handler_->resume_handler (reactor);
-}
-
-void
-TAO_UIOP_Transport::close_connection (void)
-{
-  this->handler_->handle_close ();
-}
-
-ACE_HANDLE
-TAO_UIOP_Transport::handle (void)
-{
-  return this->handler_->get_handle ();
-}
-
-int
-TAO_UIOP_Client_Transport::send_request (TAO_ORB_Core *orb_core,
-                                         TAO_OutputCDR &stream,
-                                         int twoway)
-{
-  ACE_FUNCTION_TIMEPROBE (TAO_UIOP_CLIENT_TRANSPORT_SEND_REQUEST_START);
-
-  return this->client_handler_->send_request (orb_core, stream, twoway);
-}
-
-// int
-// TAO_UIOP_Server_Transport::send_response (TAO_OutputCDR &response)
-// {
-//   this->server_handler_->send_response (response);
-//   return 1;
-// }
-
-ssize_t
-TAO_UIOP_Transport::send (const ACE_Message_Block *mblk, ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  ACE_UNUSED_ARG (s);
-
-  // For the most part this was copied from GIOP::send_request and
-  // friends.
-
-  iovec iov[IOV_MAX];
-  int iovcnt = 0;
-  ssize_t n = 0;
-  ssize_t nbytes = 0;
-
-  for (const ACE_Message_Block *i = mblk;
-       i != 0;
-       i = i->cont ())
-    {
-      // Make sure there is something to send!
-      if (i->length () > 0)
-        {
-          iov[iovcnt].iov_base = i->rd_ptr ();
-          iov[iovcnt].iov_len  = i->length ();
-          iovcnt++;
-
-          // The buffer is full make a OS call.  @@ TODO this should
-          // be optimized on a per-platform basis, for instance, some
-          // platforms do not implement writev() there we should copy
-          // the data into a buffer and call send_n(). In other cases
-          // there may be some limits on the size of the iovec, there
-          // we should set IOV_MAX to that limit.
-          if (iovcnt == IOV_MAX)
-            {
-              n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                                   iovcnt);
-              if (n < 1)
-                return n;
-
-              nbytes += n;
-              iovcnt = 0;
-            }
-        }
-    }
-
-  // Check for remaining buffers to be sent!
-  if (iovcnt != 0)
-    {
-      n = this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                           iovcnt);
-      if (n < 1)
-        return n;
-
-      nbytes += n;
-    }
-
-  return nbytes;
-}
-
-ssize_t
-TAO_UIOP_Transport::send (const u_char *buf,
-                          size_t len,
-                          ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().send_n (buf, len);
-}
-
-ssize_t
-TAO_UIOP_Transport::send (const iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_SEND_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().sendv_n ((const iovec *) iov,
-                                          iovcnt);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (char *buf,
-                          size_t len,
-                          ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().recv_n (buf, len);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (char *buf,
-                          size_t len,
-                          int flags,
-                          ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  ACE_UNUSED_ARG (s);
-  return this->handler_->peer ().recv_n (buf,
-                                         len,
-                                         flags);
-}
-
-ssize_t
-TAO_UIOP_Transport::recv (iovec *iov,
-                          int iovcnt,
-                          ACE_Time_Value *s)
-{
-  TAO_FUNCTION_PP_TIMEPROBE (TAO_UIOP_TRANSPORT_RECEIVE_START);
-
-  ACE_UNUSED_ARG (s);
-  return handler_->peer ().recvv_n (iov, iovcnt);
-}
-
-#endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
diff --git a/TAO/tao/UIOP_Transport.h b/TAO/tao/UIOP_Transport.h
deleted file mode 100644
index 0a2ace83ba2..00000000000
--- a/TAO/tao/UIOP_Transport.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     UIOP_Transport.h
-//
-// = DESCRIPTION
-//     Unix Domain Socket (UIOP) Transport specific processing
-//
-// = AUTHOR
-//     Fred Kuhns <fredk@cs.wustl.edu>
-//     Ossama Othman <othman@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_UIOP_TRANSPORT_H
-#define TAO_UIOP_TRANSPORT_H
-
-# if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS)
-
-#include "tao/Pluggable.h"
-
-// Forward decls.
-class TAO_UIOP_Handler_Base;
-class TAO_UIOP_Client_Connection_Handler;
-class TAO_UIOP_Server_Connection_Handler;
-
-class TAO_Export TAO_UIOP_Transport : public TAO_Transport
-{
-  // = TITLE
-  //   This class acts as a bridge class to the transport specific 
-  //   connection handler (handler_).  
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-public:
-  TAO_UIOP_Transport (TAO_UIOP_Handler_Base *handler);
-  // Base object's creator method. 
-
-  ~TAO_UIOP_Transport (void);
-  // Default destructor.
-
-  CORBA::ULong tag (void);
-  // Returns the specific IOP instance, in this case UIOP.
-
-  void close_connection (void);
-  // Call the corresponding connection handlers handle_close method.
-
-  void resume_connection (ACE_Reactor *reactor);
-  // Calls the reactors resume_handler on behalf of the corresponding
-  // connection handler.
-
-  int idle (void);
-  // Idles the corresponding connection handler.
-
-  TAO_UIOP_Handler_Base *&handler (void);
-  // Return a reference to the corresponding connection handler.
-
-  int is_nil (TAO_Transport *obj);
-  // Returns 0 if the obj is 0, else 1.
-
-  TAO_Transport *_nil (void);
-  // Return a NULL pointer of type TAO_Transport *.
-
-  ACE_HANDLE handle (void);
-  // Return the underlying connection handle.
-
-  ssize_t send (const ACE_Message_Block *mblk,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the Message_Block to the connection.
-
-  ssize_t send (const u_char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Write the contents of the buffer of length len to the connection.
-
-  ssize_t send (const iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  // Write the contents of iovcnt iovec's to the connection.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf.
-
-  ssize_t recv (char *buf,
-                size_t len,
-                int flags,
-                ACE_Time_Value *s = 0);
-  // Read len bytes from into buf using flags.
-
-  ssize_t recv (iovec *iov,
-                int iovcnt,
-                ACE_Time_Value *s = 0);
-  //  Read received data into the iovec buffers.
-
-  // @@ Fred, why is this method defined inline?  It should be defined
-  // in the *.cpp file!
-  virtual int send_request (TAO_ORB_Core *  /* orb_core */,
-                            TAO_OutputCDR & /* stream   */,
-                            int             /* twoway   */) { return -1; };
-  // Default action to be taken for send request.
-
-protected:
-  TAO_UIOP_Handler_Base *handler_;
-  // the connection service handler used for accessing lower layer
-  // communication protocols.
-
-  CORBA::ULong tag_;
-  // UIOP tag.
-};
-
-class TAO_Export TAO_UIOP_Client_Transport : public TAO_UIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for Client side communication with a
-  //   server.
-  // 
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-public:
-  TAO_UIOP_Client_Transport (TAO_Client_Connection_Handler *handler);
-  // Constructor.  Note, TAO_UIOP_Handler_Base is the base class for
-  // both TAO_Client_Connection_Handler and
-  // TAO_Server_Connection_Handler.
-
-  ~TAO_UIOP_Client_Transport (void);
-  // destructor
-
-  TAO_Client_Connection_Handler *client_handler (void);
-  // return a pointer to the client's connection handler.
-
-  int send_request (TAO_ORB_Core *orb_core,
-                    TAO_OutputCDR &stream,
-                    int twoway);
-  // This is a bridge method for the connection handlers
-  // <send_request> method.  The connection handler is responsible for
-  // concurrency strategies, typically using the leader-follower
-  // pattern.
-
-private:
-  TAO_Client_Connection_Handler *client_handler_;
-  // pointer to the corresponding client side connection handler.
-};
-
-class TAO_Export TAO_UIOP_Server_Transport : public TAO_UIOP_Transport
-{
-  // = TITLE
-  //   The Transport class used for server communication with a
-  //   connected client.
-  //
-  // = DESCRIPTION
-  //   @@ Fred, please fill in here.
-public:
-
-  TAO_UIOP_Server_Transport (TAO_Server_Connection_Handler *handler);
-  //  Default creator method.
-
-  ~TAO_UIOP_Server_Transport (void);
-  // Default destructor
-
-  TAO_Server_Connection_Handler *server_handler (void);
-  //  Return a pointer to the underlying connection handler. 
-
-//  virtual int send_response (TAO_OutputCDR &response);
-  // @@ Fred, should this method be removed?
-
-private:
-  TAO_Server_Connection_Handler *server_handler_;
-  // Pointer to the corresponding connection handler.
-};
-
-# endif  /* !ACE_LACKS_UNIX_DOMAIN_SOCKETS */
-
-#endif  /* TAO_UIOP_TRANSPORT_H */
diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp
deleted file mode 100644
index 5d17173684b..00000000000
--- a/TAO/tao/ValueBase.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueBase.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include "tao/CDR.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/ValueBase.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueBase, "$Id$")
-
-
-// destructor
-CORBA_ValueBase::~CORBA_ValueBase (void)
-{
-}
-
-CORBA_ValueBase*
-CORBA_ValueBase::_downcast (CORBA_ValueBase* vt)
-{
-  return vt;  // every vt is a CORBA::ValueBase :-)
-}
-
-
-// OBV marshaling in principle:
-// _tao_marshal () is called from the CDR operator<< ()
-// to marshal a valuetype. To marshal the state
-// it calls (virtual) _tao_marshal_v () (IDL generated) on itself
-// which 'jumps' to the most derived valuetype class. This function
-// further calls (inline) _tao_marshal_state, which is generated from
-// IDL too and does the marshaling of state members and base classes
-// (before, if any) actually.
-// Fragmentation (chunking) needs some cooperation with the CDR stream.
-// It needs to keep track of the state we're in:
-// (outside chunk, beginning of chunk - no data, inside chunk and
-// the nesting level of valuetypes. (The chunks itself are not nested.))
-
-// (see CORBA 2.3 GIOP 15.3.4)
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_marshal (TAO_OutputCDR &strm,
-                               CORBA_ValueBase *this_,
-                               ptr_arith_t formal_type_id)
-{
-  CORBA::Boolean retval = 1;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Is 'this' yet marshalled ? (->1a)
-  //    If not then mark 'this' as marshalled. (->2) +++
-  //    Or is it null ? (write null_ref and return ok)
-  // 1a. Put indirection and return successfull.
-
-  if (this_ == 0)
-    {
-      retval = strm.write_ulong (0);
-      // write TAO_OBV_GIOP_Flags::Null_ref
-      return retval;
-    }
-
-  // 2. if (chunking) and we are in a chunk (look in strm),
-  //    end the chunk by writing its length at its start.
-  //    This is the responsibility of the CDR stream. +++
-  //    But if nothing is writtern in this chunk yet,
-  //    we want to overwrite the place of the dummy blocksize-tag
-  //    with our <value-tag>.
-  //    Increase the nesting level of valuetypes.
-
-  // 3. Build <value-tag>, which states if chunking is used
-  //    and if type information ((list of) repository id(s))
-  //    is provided. The latter is necessary if the formal_type_id
-  //    is unequal the 'true derived' type of this object. +++
-
-  CORBA::ULong value_tag =   TAO_OBV_GIOP_Flags::Value_tag_base
-                           | TAO_OBV_GIOP_Flags::Type_info_single;
-
-  retval = strm.write_ulong (value_tag);
-  if (!retval)
-    return retval;
-
-  // 4. Marshal type information.
-
-  retval = strm.write_string (this_->_tao_obv_repository_id ());
-  if (!retval)
-    return retval;
-
-  // 5. if (chunking) let room for a blocksize-tag. (i.e. write ULong)
-
-  // 6. Now marshal state members. (%! Problem when state is empty
-  //    and chunked encoding is used.)
-
-  retval = this_->_tao_marshal_v (strm);
-
-  // 7. if (chunking) let strm overwrite the last blocksize tag
-  //    with its concrete value.                                 +++
-  // 8. if (chunking) write an end tag, or (optimization) let the CDR
-  //    care for collecting all end tags of nested values (e.g. linked
-  //    list), so that only one end tag at all must be written.  +++
-
-  return retval;
-}
-
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
-                                  CORBA_ValueBase *& new_object)
-{
-  // This is for the special case only that one unmarshals in order
-  // to assign the newly created object directly to a ValueBase pointer.
-  // Implementation is like a specialized one (in TC.cpp, if T.idl is source).
-  // basically do:
-  //  ValueBase::_tao_unmarshal_pre ()
-  //    (Gets factory or possible a null or an existing object.
-  //     Then the job is done. On an existing (backreferenced) object
-  //     do a cast and a type check)
-  //  new_object = factory->create_for_unmarshal ()
-  //     (with apropriate cast)
-  //  new_object->_tao_unmarshal_v ()
-  //  new_object->_tao_unmarshal_post ()
-
-  ACE_DEBUG ((LM_DEBUG, "unimpl. CORBA::ValueBase::_tao_unmarshal\n"));
-  return 0; // %!
-}
-
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
-                                     CORBA_ValueFactory_ptr &factory,
-                                     CORBA_ValueBase *&valuetype,
-                                     const char * const repo_id)
-{ // %! dont leak on error case !
-  // %! postconditions
-  CORBA::Boolean retval = 1;
-  factory = 0;
-  // %! yet much to do ... look for +++ !
-
-  // 1. Get the <value-tag> (else it may be <indirection-tag> or <null-ref>).
-  //    Is object yet unmarshalled (<indirection-tag> is set) ? (->1a)
-  //    Is <null-ref> given ? Set 0 and return ok.
-  // 1a. Lookup the real address in memory, which should be aligned +++
-  //     to CORBA::ValueBase. Its possible at this point that worse
-  //     type mismatch gets by undetected, if the CDR stream fakes.
-  //     So the type should be checked ... +++
-
-  CORBA::ULong value_tag;
-  if (!strm.read_ulong (value_tag))
-    {
-      return 0;
-    }
-
-  if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
-    {
-      valuetype = 0;
-      return 1;
-      // ok, null reference unmarshaled
-    }
-  // 2. Now at this point it must be a <value-tag> (error else).
-  //    if (chunking) check that any last chunk ends with matching
-  //    size. If not raise marshal exception.
-  //    Increase the nesting level of valuetypes.
-
-  if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag))
-    {
-      ACE_DEBUG ((LM_DEBUG, "!CORBA::ValueBase::_tao_unmarshal_pre not value_tag\n"));
-      return 0;
-    }
-
-  // 3. if (chunking) read and record the blocksize-tag.
-
-  // 4. Unmarshal type information and lookup factory.
-  //    If no type information is given in the CDR encoding, as told
-  //    from the <value-tag>, then use the repository id parameter
-  //    (it _must_ be right).
-
-  CORBA::String_var repo_id_stream;
-
-  // It would be more efficient not to copy the string %!)
-  if (strm.read_string (repo_id_stream.inout ()) == 0)
-    {
-      return 0;
-    }
-
-  factory = TAO_ORB_Core_instance ()->orb ()   // @@ %! right way to access ?
-    ->lookup_value_factory (repo_id_stream.in());
-  if (factory == 0) // %! except.!
-    {
-      ACE_DEBUG ((LM_ERROR, "(%N:%l) OBV factory is null !!!\n"));
-      return 0;
-    }
-
-  return retval;
-}
-
-CORBA::Boolean
-CORBA_ValueBase::_tao_unmarshal_post (TAO_InputCDR &strm)
-{
-  CORBA::Boolean retval = 1;
-
-  // (... called from T::_tao_unmarshal)
-  // 7. if (chunking) check the last blocksize tag for correct value.  +++
-  //    And if we're gonna to truncate, skip all the state of the more
-  //    derived classes. (But it might need to be accessed again,
-  //    if there are embedded objects which are referenced later
-  //    in this CDR encoding stream.)
-
-  // 8. if (chunking) there must be some end tag. Let the CDR stream deal
-  //    with this (and decrease the nesting level of valuetypes).
-  //    Also the CDR stream must check for eventually outstanding end tags
-  //    at the end of the stream which have to cause a marshal
-  //    exception there.
-
-  return retval;
-}
-
-
-// member functions for CORBA_DefaultValueRefCountBase ============
-
-// destructor
-CORBA_DefaultValueRefCountBase::~CORBA_DefaultValueRefCountBase (void)
-{
-}
-
-void
-CORBA_DefaultValueRefCountBase::_add_ref (void)
-{
-  this->_tao_add_ref ();
-}
-
-void
-CORBA_DefaultValueRefCountBase::_remove_ref (void)
-{
-  this->_tao_remove_ref ();
-}
-
-CORBA::ULong
-CORBA_DefaultValueRefCountBase::_refcount_value (void)
-{
-  return this->_tao_refcount_value ();
-}
-
-
-// some constants
-
-const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_base    = 0x7fffff00L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Value_tag_sigbits = 0xffffff00L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Codebase_url      = 1;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_sigbits = 0x00000006L;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_none    = 0;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_single  = 2;
-const CORBA::ULong TAO_OBV_GIOP_Flags::Type_info_list    = 6;
-
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueBase.h b/TAO/tao/ValueBase.h
deleted file mode 100644
index 69a0e4f0170..00000000000
--- a/TAO/tao/ValueBase.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueBase.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEBASE_H
-#define TAO_VALUEBASE_H
-
-#include "ace/OS.h"           /* for ptr_arith_t */
-#include "tao/corbafwd.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-
-class TAO_Export CORBA_ValueBase
-{
-  // = TITLE
-  //   Abstract baseclass for Valuetypes
-  //   (see CORBA 2.3 20.17.5)
-
-public:
-  // reference counting
-  virtual void _add_ref (void) = 0;
-  virtual void _remove_ref (void) = 0;
-  // %! virtual CORBA::ValueBase* _copy_value (void) = 0;
-  virtual CORBA::ULong _refcount_value (void) = 0;
-
-  // dynamic casting
-  static CORBA::ValueBase* _downcast (CORBA::ValueBase*);
-
-  virtual const char* _tao_obv_repository_id () const = 0;
-  // TAO extension
-
-  // TAO internal --------------------------
-
-  static CORBA::Boolean _tao_marshal (TAO_OutputCDR &strm,
-                                      CORBA_ValueBase *_this,
-                               ptr_arith_t formal_type_id = 0);
-  // Marshal a valuetype (see operator<< in tao_idl generated file
-  // how it is called)
-
-  static CORBA::Boolean _tao_unmarshal (TAO_InputCDR &strm,
-                                        CORBA_ValueBase *&_this);
-  // Unmarshal a valuetype, if formal type is a pointer to ValueBase
-
-  // static CORBA::Boolean
-  // T::_tao_unmarshal (TAO_InputCDR &, CORBA_ValueBase *&_this)
-  // is typespecific for valuetype T and generated from tao_idl
-  // Use this for unmarshaling.
-
-  static CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &strm,
-                                            CORBA_ValueFactory_ptr &,
-                                            CORBA_ValueBase *&,
-                                            const char * const repo_id);
-  CORBA::Boolean _tao_unmarshal_post (TAO_InputCDR &strm);
-  // Both used internally and are called from T::_tao_unmarshal ()
-
-
-public:  // otherwise these cannot be called from a static function
-  virtual void *_tao_obv_narrow (ptr_arith_t) = 0;
-
-  virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &) = 0;
-  // during marshal jump to the most derived part
-
-  virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &) = 0;
-  // called after obtaining the fresh object from create_for_unmarshal ()
-
-protected:
-  CORBA_ValueBase (void);
-  CORBA_ValueBase (const CORBA_ValueBase&);
-  virtual ~CORBA_ValueBase ();
-
-private:
-  void operator= (const CORBA_ValueBase &);
-}; // CORBA_ValueBase
-
-
-
-
-class TAO_Export CORBA_DefaultValueRefCountBase : public virtual CORBA_ValueBase
-{
-  // = TITLE
-  //   Default mix-in for reference count of a valuetype.
-
-public:
-  virtual void _add_ref (void);
-  virtual void _remove_ref (void);
-  virtual CORBA::ULong _refcount_value (void);
-
-  void _tao_add_ref (void);
-  void _tao_remove_ref (void);
-  CORBA::ULong _tao_refcount_value (void);
-  // The _tao variants are inline for fast access from T_var
-  // (if valuetype T is compiled with optimization for that.) %! (todo)
-
-protected:
-  CORBA_DefaultValueRefCountBase (void);
-  CORBA_DefaultValueRefCountBase (const CORBA_DefaultValueRefCountBase&);
-  virtual ~CORBA_DefaultValueRefCountBase ();
-
-private:
-  void operator= (const CORBA_DefaultValueRefCountBase &);
-
-private: // data
-  CORBA::ULong _tao_reference_count_;
-  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
-}; // CORBA_DefaultValueRefCountBase
-
-// %! which lock has the lowest memory overhead ?
-// %! todo refcountbase w/o locking (now memory overhead)
-// $! todo: debug aids for refcounts
-
-
-class TAO_OBV_GIOP_Flags
-{
-  // CORBA 2.3: 15.3.4
-public:
-  static const CORBA::ULong Value_tag_base;
-  static const CORBA::ULong Value_tag_sigbits;
-  static const CORBA::ULong Codebase_url;
-  static const CORBA::ULong Type_info_sigbits;
-  static const CORBA::ULong Type_info_none;
-  static const CORBA::ULong Type_info_single;
-  static const CORBA::ULong Type_info_list;
-
-  static CORBA::Boolean is_null_ref           (CORBA::ULong);
-  static CORBA::Boolean is_value_tag          (CORBA::ULong);
-  static CORBA::Boolean has_codebase_url      (CORBA::ULong);
-  static CORBA::Boolean has_no_type_info      (CORBA::ULong);
-  static CORBA::Boolean has_single_type_info  (CORBA::ULong);
-  static CORBA::Boolean has_list_type_info    (CORBA::ULong);
-  static CORBA::Boolean is_chunked            (CORBA::ULong);
-  static CORBA::Boolean is_indirection_tag    (CORBA::ULong);
-  static CORBA::Boolean is_indirection        (CORBA::ULong);
-  static CORBA::Boolean is_block_size         (CORBA::ULong);
-  static CORBA::Boolean is_end_tag            (CORBA::ULong);
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueBase.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEBASE_H */
diff --git a/TAO/tao/ValueBase.i b/TAO/tao/ValueBase.i
deleted file mode 100644
index 4117def9904..00000000000
--- a/TAO/tao/ValueBase.i
+++ /dev/null
@@ -1,136 +0,0 @@
-// This may not look like C++, but it's really -*- C++ -*-
-// $Id$
-
-// static operations in namespace CORBA ========================
-
-ACE_INLINE void
-CORBA::add_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_add_ref ();
-}
-
-ACE_INLINE void
-CORBA::remove_ref (CORBA::ValueBase *val)
-{
-  if (val)
-    val->_remove_ref ();
-}
-
-// ===========================================================
-
-// constructor
-ACE_INLINE
-CORBA_ValueBase::CORBA_ValueBase (void)
-{
-}
-
-
-// ===========================================================
-
-// constructor
-ACE_INLINE
-CORBA_DefaultValueRefCountBase::CORBA_DefaultValueRefCountBase (void)
-    : _tao_reference_count_ (1)
-{
-}
-
-
-ACE_INLINE void
-CORBA_DefaultValueRefCountBase::_tao_add_ref (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE void
-CORBA_DefaultValueRefCountBase::_tao_remove_ref (void)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  // The guard has been already given up, but this is no problem
-  // cause we have held the last reference, and this one we don't give
-  // away anymore, we do:
-  delete this;
-}
-
-ACE_INLINE CORBA::ULong
-CORBA_DefaultValueRefCountBase::_tao_refcount_value (void)
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_,0);
-  return _tao_reference_count_;
-}
-
-// ===========================================================
-
-// Detection of flags in the CDR Stream
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_null_ref (CORBA::ULong tag)
-{
-  return (tag == 0);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_value_tag (CORBA::ULong tag)
-{
-  return ((tag & Value_tag_sigbits) == 0x7FFFFF00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: has_codebase_url(CORBA::ULong tag)
-{
-  return (tag & Codebase_url);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_no_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_none);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_single_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_single);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::has_list_type_info (CORBA::ULong tag)
-{
-  return ((tag & Type_info_sigbits) == Type_info_list);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags:: is_chunked (CORBA::ULong tag)
-{
-  return (tag & 8);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection_tag (CORBA::ULong tag)
-{
-  return (tag == 0xFFFFFFFFL);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_indirection (CORBA::ULong value)
-{
-  return (0x80000000L < value && value <= (0xFFFFFFFFL - 4));
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_block_size (CORBA::ULong value)
-{
-  return ( 0 < value && value < 0x7fffff00L);
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_OBV_GIOP_Flags::is_end_tag (CORBA::ULong tag)
-{
-  return (0x80000000L < tag  && tag <= 0xFFFFFFFFL);
-}
diff --git a/TAO/tao/ValueFactory.cpp b/TAO/tao/ValueFactory.cpp
deleted file mode 100644
index 6b8f049ca11..00000000000
--- a/TAO/tao/ValueFactory.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-
-#include "tao/ValueFactory.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueFactory, "$Id$")
-
-CORBA_ValueFactoryBase::~CORBA_ValueFactoryBase ()
-{
-}
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory.h b/TAO/tao/ValueFactory.h
deleted file mode 100644
index 9b0557f2611..00000000000
--- a/TAO/tao/ValueFactory.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEFACTORY_H
-#define TAO_VALUEFACTORY_H
-
-#include "tao/corbafwd.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-
-class TAO_Export CORBA_ValueFactoryBase
-{
-  /*  friend CORBA::Boolean _tao_unmarshal_pre (TAO_InputCDR &,
-                                            CORBA_ValueFactory_ptr &,
-                                            CORBA_ValueBase *&,
-                                            const char * const);
-  %! how can I make the friendship work ? (g++) */
-public:
-  CORBA_ValueFactoryBase ();
-  virtual ~CORBA_ValueFactoryBase ();
-
-  // non-standard
-  virtual const char* tao_repository_id () = 0;
-
-  // non-virtual is non-standard
-  void _add_ref (void);
-  void _remove_ref (void);
-
-  // private: %!
-  virtual CORBA_ValueBase* create_for_unmarshal (void) = 0;
-  // In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T)
-  // (see at definition below)
-
-private:
-  CORBA::ULong _tao_reference_count_;
-  ACE_SYNCH_MUTEX _tao_reference_count_lock_;
-}; // CORBA_ValueFactoryBase
-
-
-
-// Use this macro for writing code that is independend from
-// the compiler support of covariant return types of pointers to
-// virtual inherited classes.
-// (e.g. in egcs-2.90.29 980515 (egcs-1.0.3 release) its not yet implemented)
-// (But it is TAO specific and at the moment the covariant case is not
-// elaborated --- its just a suggestion.)
-
-#ifdef TAO_HAS_OBV_COVARIANT_RETURN
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) TYPE *
-#else /*  TAO_HAS_OBV_COVARIANT_RETURN */
-#  define TAO_OBV_CREATE_RETURN_TYPE(TYPE) CORBA::ValueBase *
-#endif /* TAO_HAS_OBV_COVARIANT_RETURN */
-
-
-
-// (The obtaining of the repository id is currently not yet like the OMG way. %!)
-//
-// Macro for on the fly registration of a factory (with type Factory).
-// The repository id is taken from the static repository id of the
-// valuetype via tao_repository_id () of the specialized factory.
-// It forgets the pre-registered factory (if any) and the reference
-// to the newly created one. (A new reference could be obtained with
-// orb->lookup_value_factory (CORBA::String repo_id) .)
-
-#define TAO_OBV_REGISTER_FACTORY(FACTORY) \
-  { CORBA_ValueFactory_ptr factory = new FACTORY; \
-    CORBA_ValueFactory_ptr prev_factory = \
-    TAO_ORB_Core_instance ()->orb ()->register_value_factory (\
-                                   factory->tao_repository_id (),\
-                                   factory); \
-    if (prev_factory) prev_factory->_remove_ref (); \
-    factory->_remove_ref (); }
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueFactory.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEFACTORY_H */
diff --git a/TAO/tao/ValueFactory.i b/TAO/tao/ValueFactory.i
deleted file mode 100644
index 84d4da93833..00000000000
--- a/TAO/tao/ValueFactory.i
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CORBA_ValueFactoryBase::CORBA_ValueFactoryBase ()
-  : _tao_reference_count_ (1)
-{
-}
-
-ACE_INLINE void
-CORBA_ValueFactoryBase::_add_ref (void)
-{
-  ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-  ++_tao_reference_count_;
-}
-
-ACE_INLINE void
-CORBA_ValueFactoryBase::_remove_ref (void)
-{
-  {
-    ACE_GUARD (ACE_SYNCH_MUTEX, guard, this->_tao_reference_count_lock_);
-    -- this->_tao_reference_count_;
-    if (this->_tao_reference_count_ != 0)
-      return;
-  }
-  delete this;
-}
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp
deleted file mode 100644
index b2c771f0a30..00000000000
--- a/TAO/tao/ValueFactory_Map.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory_Map.cpp
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#include "tao/ValueFactory_Map.h"
-#include "tao/ValueFactory.h"
-#include "tao/ORB.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-#if !defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, ValueFactory_Map, "$Id$")
-
-
-TAO_ValueFactory_Map::TAO_ValueFactory_Map ()
-  : map_ ()   // use default size and allocator
-{
-}
-
-TAO_ValueFactory_Map::~TAO_ValueFactory_Map ()
-{
-  // Initialize an iterator.  We need to go thru each entry and free
-  // up storage allocated to hold the external ids and invoke
-  // _remove_ref () on the internal ids.
-  FACTORY_MAP_MANAGER::ITERATOR iterator (this->map_);
-
-  for (FACTORY_MAP_MANAGER::ENTRY *entry = 0;
-       iterator.next (entry) != 0;
-       iterator.advance ())
-    {
-      // We had allocated memory and stored the string. So we free the
-      // memory.
-      CORBA::string_free ((char *) entry->ext_id_);
-      entry->ext_id_ = 0;
-      entry->int_id_->_remove_ref ();
-      entry->int_id_ = 0;
-    }
-}
-
-// %! Thread issues
-
-int
-TAO_ValueFactory_Map::rebind (const char *repo_id,
-                              CORBA_ValueFactory_ptr &factory)
-{
-//  ACE_READ_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, guard, map_->mutex(),-1);
-//   --- but must be recursive
-  const char *prev_repo_id;
-  CORBA_ValueFactory_ptr 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.
-      if (ret == 1)    // there was a previous factory
-        {
-          factory = prev_factory;
-          CORBA::string_free (ACE_const_cast(char*,prev_repo_id));
-        }
-    }
-  return ret;
-}
-
-int
-TAO_ValueFactory_Map::unbind (const char *repo_id,
-                              CORBA_ValueFactory_ptr &factory)
-{
-  // ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr> *prev_entry;
-  FACTORY_MAP_MANAGER::ENTRY *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,
-      factory = prev_entry->int_id_;
-      char *temp = ACE_const_cast (char *, prev_entry->ext_id_);
-      ret = this->map_.unbind (prev_entry);
-      if (ret == 0)
-        {
-          CORBA::string_free (temp);
-        }
-    }
-  return ret;
-}
-
-// %! perhaps inline
-int
-TAO_ValueFactory_Map::find (const char *repo_id,
-                            CORBA_ValueFactory_ptr &factory)
-{
-  int ret = this->map_.find (repo_id, factory);
-  // %! this must be guarded to be atomic  !!!!!!!!!!!!!!!!!!
-  if (ret > -1)
-    {
-      factory->_add_ref ();    // The caller gets one reference as gift.
-    }
-  return ret;
-}
-
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>;
-template class ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>;
-template class ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<const char *, CORBA_ValueFactory_ptr, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA_ValueFactory_ptr>
-#pragma instantiate ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-#endif /* TAO_HAS_VALUETYPE */
diff --git a/TAO/tao/ValueFactory_Map.h b/TAO/tao/ValueFactory_Map.h
deleted file mode 100644
index 95952dab090..00000000000
--- a/TAO/tao/ValueFactory_Map.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     ValueFactory_Map.h
-//
-// = AUTHOR
-//     Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
-//
-// ============================================================================
-
-#ifndef TAO_VALUEFACTORY_MAP_H
-#define TAO_VALUEFACTORY_MAP_H
-
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-#include "tao/corbafwd.h"
-
-#ifdef TAO_HAS_VALUETYPE
-
-class TAO_ValueFactory_Map
-{
-public:
-  TAO_ValueFactory_Map ();
-  ~TAO_ValueFactory_Map ();
-
-
-  int rebind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Associate the factory (int_id) with the repo_id (ext_id).
-  // Invokes _add_ref () on the factory.
-  // If previous factory had been bind with this repo_id, this one is
-  // returned in factory (and the caller holds a reference).
-  // Returns -1 on failure, 0 on success and 1 if a previous factory
-  // is found (and returned in factory).
-
-  int unbind (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Removes entry for repo_id from the map and sets factory to
-  // the tied one.
-
-  int find (const char *repo_id, CORBA_ValueFactory_ptr &factory);
-  // Lookup a matching factory for repo_id.
-  // Invokes _add_ref () on the factory if found.
-  // Returns -1 on failure and 0 on success.
-
-  void dump (void);
-private:
-
-  typedef ACE_Hash_Map_Manager_Ex<const char *,
-                                  CORBA_ValueFactory_ptr,
-                                  ACE_Hash<const char *>,
-                                  ACE_Equal_To<const char *>,
-                                  ACE_SYNCH_RW_MUTEX>
-          FACTORY_MAP_MANAGER;
-  FACTORY_MAP_MANAGER map_;
-  // The hash table data structure.
-}; /* TAO_ValueFactory_Map */
-
-
-// currently the ValueFactory_Map is a singleton and not per ORB
-// as in the OMG specs
-typedef ACE_Singleton<TAO_ValueFactory_Map, ACE_SYNCH_MUTEX>
-        TAO_VALUEFACTORY_MAP;
-
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/ValueFactory_Map.i"
-#endif /* __ACE_INLINE__) */
-
-#endif /* TAO_HAS_VALUETYPE */
-#endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/ValueFactory_Map.i b/TAO/tao/ValueFactory_Map.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tao/ValueFactory_Map.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
deleted file mode 100644
index 09755f69a8d..00000000000
--- a/TAO/tao/Version.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-// This is an automatically generated file.
-
-#define TAO_MAJOR_VERSION 0
-#define TAO_MINOR_VERSION 3
-#define TAO_BETA_VERSION 23
-#define TAO_VERSION "0.3.23"
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
deleted file mode 100644
index e85873c1b2a..00000000000
--- a/TAO/tao/WrongTransactionC.cpp
+++ /dev/null
@@ -1,63 +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 "tao/WrongTransactionC.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-// default constructor
-CORBA_WrongTransaction::CORBA_WrongTransaction (void)
-  : CORBA_UserException (CORBA::_tc_WrongTransaction)
-{
-}
-
-// destructor - all members are of self managing types
-CORBA_WrongTransaction::~CORBA_WrongTransaction (void)
-{
-}
-
-// copy constructor
-CORBA_WrongTransaction::CORBA_WrongTransaction (const CORBA_WrongTransaction &_tao_excp)
-  : CORBA_UserException (_tao_excp._type ())
-{
-}
-
-// assignment operator
-CORBA_WrongTransaction&
-CORBA_WrongTransaction::operator= (const CORBA_WrongTransaction &_tao_excp)
-{
-
-  this->CORBA_UserException::operator= (_tao_excp);
-  return *this;
-}
-
-// narrow
-CORBA_WrongTransaction_ptr
-CORBA_WrongTransaction::_narrow (CORBA::Exception *exc)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_WrongTransaction_ptr, exc);
-  else
-    return 0;
-}
-
-
-void CORBA_WrongTransaction::_raise ()
-{
-  TAO_RAISE(*this);
-}
-
-// TAO extension - the _alloc method
-CORBA::Exception *CORBA_WrongTransaction::_alloc (void)
-{
-  return new CORBA_WrongTransaction;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
deleted file mode 100644
index 580b5885ff0..00000000000
--- a/TAO/tao/WrongTransactionC.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    WrongTransactionC.h
-//
-// = AUTHOR
-//
-// ******  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_WRONG_TRANSACTIONC_H
-#define TAO_IDL_WRONG_TRANSACTIONC_H
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-#include "tao/corbafwd.h"
-#include "tao/Exception.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(_MSC_VER)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_Export CORBA_WrongTransaction : public CORBA::UserException
-{
-// = TITLE
-//   Exception class generated by the TAO IDL compiler.
-//
-// = DESCRIPTION
-//   This exception is thrown if a CORBA Request is implicitly
-//   associated with a transaction and is found to have an
-//   error in its parameters when checked at runtime (invocation).
-public:
-
-  CORBA_WrongTransaction (void); // default ctor
-  CORBA_WrongTransaction (const CORBA_WrongTransaction &); // copy ctor
-  ~CORBA_WrongTransaction (void); // dtor
-  CORBA_WrongTransaction &operator= (const CORBA_WrongTransaction &);
-
-
-  virtual void _raise (void);
-
-  static CORBA_WrongTransaction *_narrow (CORBA::Exception *);
-
-
-  // = TAO extension
-  static CORBA::Exception *_alloc (void);
-
-}; // exception CORBA::WrongTransaction
-
-#if defined(_MSC_VER)
-#pragma warning(default:4250)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#endif /* ifndef TAO_IDL_WRONG_TRANSACTIONC_H */
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
index 36d2277a63d..b86abd454e9 100644
--- a/TAO/tao/append.cpp
+++ b/TAO/tao/append.cpp
@@ -24,7 +24,6 @@
 #include "tao/Environment.h"
 #include "tao/Any.h"
 #include "tao/GIOP.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, append, "$Id$")
 
@@ -87,10 +86,9 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -119,19 +117,15 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
       // encode the typecode
       retval = dest->encode (CORBA::_tc_TypeCode, &elem_tc, 0, env);
       if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
-        {
-          // append the data
-          retval = dest->append (elem_tc, src, env);
-          CORBA::release (elem_tc);
-        }
+        // append the data
+        retval = dest->append (elem_tc, src, env);
     }
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::append detected error\n"));
       CORBA::release (elem_tc);
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Any::append detected error"));
     }
   return retval;
 }
@@ -201,11 +195,9 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
         }
       else // bad kind_ value to be decoded
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Marshal_TypeCode: "
-                        "Bad kind_ value in CDR stream\n"));
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream"));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -215,10 +207,9 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::append detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -294,9 +285,8 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -339,10 +329,9 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling encode_struct detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -398,7 +387,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                           member_label = tc->member_label (i, env);
                           if (env.exception () == 0)
                             {
-			                        CORBA::TypeCode_var type = member_label->type ();
+			      CORBA::TypeCode_var type = member_label->type ();
                               // do the matching
                               switch (type->kind (env))
                                 {
@@ -437,7 +426,9 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                                 case CORBA::tk_enum:
                                   {
                                     CORBA::Long l;
-                                    TAO_InputCDR stream (member_label->_tao_get_cdr ());
+                                    TAO_InputCDR stream ((ACE_Message_Block *)
+                                                         member_label->value
+							 ());
                                     (void)stream.decode (discrim_tc, &l, 0, env);
                                     if (l == *(CORBA::Long *) &discrim_val)
                                       discrim_matched = 1;
@@ -452,12 +443,10 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                                   }
                                   break;
                                 case CORBA::tk_wchar:
-                                  {
-                                    CORBA::WChar wc;
-                                    *member_label >>= CORBA::Any::to_wchar (wc);
-                                    if (wc == *(CORBA::WChar *) &discrim_val)
-                                      discrim_matched = 1;
-                                  }
+                                  // @@ ASG TO-DO
+                                  if (*(CORBA::WChar *) member_label->value ()
+                                      == *(CORBA::WChar *) &discrim_val)
+                                    discrim_matched = 1;
                                   break;
                                 case CORBA::tk_boolean:
                                   {
@@ -468,7 +457,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                                   }
                                   break;
                                 default:
-                                  env.exception (new CORBA::BAD_TYPECODE ());
+                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
                                   return CORBA::TypeCode::TRAVERSE_STOP;
                                 }// end of switch
 
@@ -489,13 +478,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                                 }
                               else
                                 {
-                                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                                   return CORBA::TypeCode::TRAVERSE_STOP;
                                 }
                             }
                           else
                             {
-                              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                               return CORBA::TypeCode::TRAVERSE_STOP;
                             }
                         } // end of for loop
@@ -509,31 +498,31 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr  tc,
                     }
                   else
                     {
-                      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                       return CORBA::TypeCode::TRAVERSE_STOP;
                     }
                 }
               else
                 {
-                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                   return CORBA::TypeCode::TRAVERSE_STOP;
                 }
             }
           else
             {
-              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
               return CORBA::TypeCode::TRAVERSE_STOP;
             }
         }
       else
         {
-          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
   else
     {
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -560,10 +549,9 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::append detected error"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::append detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -611,10 +599,9 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
         } // no exception computing content type
     }
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "marshaling TAO_Marshal_Sequence::append detected error\n"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::append detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -654,12 +641,10 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
             return CORBA::TypeCode::TRAVERSE_CONTINUE;
         } // no exception computing content type
     } // no exception computing bounds
-
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::append detected error"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::append detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -690,10 +675,9 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::append detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -744,10 +728,9 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Except detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -775,10 +758,9 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_WString::append detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::append detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 75af0b5f16d..d6a4c3ec553 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -43,7 +43,6 @@
 #include "tao/Request.h"
 #include "tao/Server_Request.h"
 #include "tao/Object.h"
-#include "tao/Context.h"
 #include "tao/Typecode.h"
 
 #include "tao/varout.h"
@@ -77,12 +76,6 @@
 #include "tao/Sequence_T.h"
 #include "tao/Object_KeyC.h"
 #include "tao/Union.h"
-#include "tao/ValueBase.h"
-#include "tao/ValueFactory.h"
-#include "tao/Services.h"
-#include "tao/ObjectIDList.h"
-#include "tao/DomainC.h"
-#include "tao/WrongTransactionC.h"
 
 #if !defined (ACE_NESTED_CLASS)
 #if defined (ACE_WIN32)
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
deleted file mode 100644
index 558881bfad0..00000000000
--- a/TAO/tao/corbafwd.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "tao/corbafwd.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, corbafwd, "$Id$")
-
-const CORBA::ServiceType CORBA::Security = 1;
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 46305700add..f4fcae7d5f3 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -27,7 +27,7 @@
 #define TAO_CORBAFWD_H
 
 // @@ TODO take the portion that we need of ace/CDR_Stream.h into
-// ace/CDR_Types.h
+// ace/CDR_Types.h 
 #include "ace/CDR_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -61,8 +61,6 @@
 # endif
 #endif /* _MSC_VER */
 
-#define TAO_DEFAULT_MINOR_CODE 0xffff0000L
-
 // Forward declarations of some data types are needed.
 
 class CORBA_Any;
@@ -98,7 +96,6 @@ class CORBA_UserException;
 class CORBA_SystemException;
 class CORBA_UnknownUserException;
 class CORBA_ExceptionList;
-class CORBA_ExceptionList_var;
 typedef class CORBA_Exception *CORBA_Exception_ptr;
 
 // all the system exception classes, the list is used as follows:
@@ -131,80 +128,28 @@ typedef class CORBA_Exception *CORBA_Exception_ptr;
   TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
   TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
   TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
-  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
-  TAO_SYSTEM_EXCEPTION(REBIND); \
-  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION);
+  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION);
 
 #define TAO_SYSTEM_EXCEPTION(name) \
   class CORBA_ ## name
 TAO_SYSTEM_EXCEPTION_LIST
 #undef TAO_SYSTEM_EXCEPTION
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-class CORBA_WrongTransaction;
-typedef CORBA_WrongTransaction *CORBA_WrongTransaction_ptr;
-
-struct CORBA_NameValuePair;
-class CORBA_NameValuePair_var;
-class CORBA_NameValuePair_out;
-typedef CORBA_NameValuePair *CORBA_NameValuePair_ptr;
-
 class CORBA_Request;
 class CORBA_Request_var;
 class CORBA_Request_out;
 typedef class CORBA_Request *CORBA_Request_ptr;
 
-class CORBA_ORB_RequestSeq;
-class CORBA_ORB_RequestSeq_var;
-class CORBA_ORB_RequestSeq_out;
-typedef class CORBA_ORB_RequestSeq *CORBA_ORB_RequestSeq_ptr;
-
 class CORBA_NamedValue;
 class CORBA_NamedValue_var;
 class CORBA_NamedValue_out;
 typedef class CORBA_NamedValue *CORBA_NamedValue_ptr;
 
-
 class CORBA_NVList;
 class CORBA_NVList_var;
 class CORBA_NVList_out;
 typedef class CORBA_NVList *CORBA_NVList_ptr;
 
-class CORBA_Context;
-class CORBA_Context_var;
-class CORBA_Context_out;
-typedef class CORBA_Context *CORBA_Context_ptr;
-
-class CORBA_ContextList;
-class CORBA_ContextList_var;
-class CORBA_ContextList_out;
-typedef class CORBA_ContextList *CORBA_ContextList_ptr;
-
-class CORBA_ConstructionPolicy;
-class CORBA_ConstructionPolicy_var;
-class CORBA_ConstructionPolicy_out;
-typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
-
-class CORBA_AnySeq;
-class CORBA_AnySeq_var;
-class CORBA_AnySeq_out;
-typedef class CORBA_AnySeq *CORBA_AnySeq_ptr;
-
-// Forward declarations.
-class CORBA_NameValuePairSeq;
-class CORBA_NameValuePairSeq_var;
-class CORBA_NameValuePairSeq_out;
-typedef CORBA_NameValuePairSeq *CORBA_NameValuePairSeq_ptr;
-
-#endif /* ! TAO_HAS_MINIMUM_CORBA */
-
 class CORBA_ORB;
 class CORBA_ORB_var;
 class CORBA_ORB_out;
@@ -215,6 +160,16 @@ class CORBA_Object_var;
 class CORBA_Object_out;
 typedef class CORBA_Object *CORBA_Object_ptr;
 
+class CORBA_Policy;
+class CORBA_Policy_var;
+class CORBA_Policy_out;
+typedef class CORBA_Policy *CORBA_Policy_ptr;
+
+class CORBA_PolicyList;
+class CORBA_PolicyList_var;
+class CORBA_PolicyList_out;
+typedef class CORBA_PolicyList *CORBA_PolicyList_ptr;
+
 class CORBA_Current;
 class CORBA_Current_var;
 class CORBA_Current_out;
@@ -224,105 +179,24 @@ class CORBA_ServerRequest;
 typedef class CORBA_ServerRequest *CORBA_ServerRequest_ptr;
 
 class CORBA_Environment;
-class CORBA_Environment_var;
-class CORBA_Environment_out;
 typedef class CORBA_Environment *CORBA_Environment_ptr;
 
-// = Service Forward declaration
-struct CORBA_ServiceDetail;
-class CORBA_ServiceDetail_var;
-class CORBA_ServiceDetail_out;
-typedef CORBA_ServiceDetail * CORBA_ServiceDetail_ptr;
-
-struct CORBA_ServiceInformation;
-class CORBA_ServiceInformation_var;
-class CORBA_ServiceInformation_out;
-typedef CORBA_ServiceInformation * CORBA_ServiceInformation_ptr;
-
 class CORBA_Principal;
 typedef class CORBA_Principal *CORBA_Principal_ptr;
 
 typedef class CORBA_ImplementationDef *CORBA_ImplementationDef_ptr;
 
-class CORBA_InterfaceDef;
-class CORBA_InterfaceDef_var;
-class CORBA_InterfaceDef_out;
 typedef class CORBA_InterfaceDef *CORBA_InterfaceDef_ptr;
 
-#ifdef TAO_HAS_VALUETYPE
-class CORBA_ValueBase;
-class CORBA_ValueFactoryBase;
-typedef CORBA_ValueFactoryBase *CORBA_ValueFactory_ptr;
-class CORBA_DefaultValueRefCountBase;
-#endif /* TAO_HAS_VALUETYPE */
-
 class CORBA_String_var;
 class CORBA_String_out;
-class CORBA_WString_var;
-class CORBA_WString_out;
 
 class CORBA_ExceptionList;
 
-class CORBA_PolicyError;
-typedef CORBA_PolicyError *CORBA_PolicyError_ptr;
-
-class CORBA_InvalidPolicies;
-typedef CORBA_InvalidPolicies* CORBA_InvalidPolicies_ptr;
-
-class CORBA_PolicyTypeSeq;
-class CORBA_PolicyTypeSeq_var;
-class CORBA_PolicyTypeSeq_out;
-
-class CORBA_PolicyManager;
-typedef CORBA_PolicyManager *CORBA_PolicyManager_ptr;
-
-class CORBA_PolicyCurrent;
-typedef CORBA_PolicyCurrent *CORBA_PolicyCurrent_ptr;
-
-class CORBA_Policy;
-class CORBA_Policy_var;
-class CORBA_Policy_out;
-typedef CORBA_Policy *CORBA_Policy_ptr;
-
-class CORBA_PolicyList;
-class CORBA_PolicyList_var;
-class CORBA_PolicyList_out;
-typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
-
-class CORBA_DomainManager;
-class CORBA_DomainManager_var;
-class CORBA_DomainManager_out;
-typedef CORBA_DomainManager *CORBA_DomainManager_ptr;
-
-class CORBA_DomainManagerList;
-class CORBA_DomainManagerList_var;
-class CORBA_DomainManagerList_out;
-typedef CORBA_DomainManagerList *CORBA_DomainManagerList_ptr;
-
-class CORBA_PollableSet;
-class CORBA_PollableSet_var;
-class CORBA_PollableSet_out;
-typedef CORBA_PollableSet *CORBA_PollableSet_ptr;
-
-class CORBA_Pollable;
-class CORBA_Pollable_var;
-class CORBA_Pollable_out;
-typedef CORBA_Pollable *CORBA_Pollable_ptr;
-
-class CORBA_DIIPollable;
-class CORBA_DIIPollable_var;
-class CORBA_DIIPollable_out;
-typedef CORBA_DIIPollable *CORBA_DIIPollable_ptr;
-
 class TAO_InputCDR;
 class TAO_OutputCDR;
-// @@ TODO This should be TAO_TAO_Stub
-class TAO_Stub;
-
-class CORBA_ORB_ObjectIdList;
-class CORBA_ORB_ObjectIdList_var;
-class CORBA_ORB_ObjectIdList_out;
-typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
+// @@ TODO This should be TAO_STUB_Object
+class STUB_Object;
 
 // enum values defined in tao/NVList.h, bitwise ORed.
 typedef u_int CORBA_Flags;
@@ -338,6 +212,9 @@ typedef void (*TAO_Skeleton)(
 template <class T> class TAO_Unbounded_Sequence;
 template <class T> class TAO_Unbounded_Object_Sequence;
 
+class CORBA_String_var;
+class CORBA_String_out;
+
 class TAO_Export CORBA
 {
   // = TITLE
@@ -348,72 +225,72 @@ class TAO_Export CORBA
   //    for all standard types Foo.
 public:
 
-  typedef ACE_CDR::Boolean Boolean;
+  typedef CDR::Boolean Boolean;
   typedef Boolean &Boolean_out;
   // Out type for boolean.
 
   // This and the other CORBA IDL types below are
   // typedef'd to the corresponding CDR types
   // already defined in ACE.
-  typedef ACE_CDR::Octet Octet;
+  typedef CDR::Octet Octet;
   typedef Octet  &Octet_out;
 
-  typedef ACE_CDR::Short Short;
+  typedef CDR::Short Short;
   typedef Short &Short_out;
-  typedef ACE_CDR::UShort UShort;
+  typedef CDR::UShort UShort;
   typedef UShort &UShort_out;
 
-  typedef ACE_CDR::Long Long;
+  typedef CDR::Long Long;
   typedef Long &Long_out;
-  typedef ACE_CDR::ULong ULong;
+  typedef CDR::ULong ULong;
   typedef ULong &ULong_out;
 
-  typedef ACE_CDR::LongLong LongLong;
+  typedef CDR::LongLong LongLong;
   typedef LongLong &LongLong_out;
-  typedef ACE_CDR::ULongLong ULongLong;
+  typedef CDR::ULongLong ULongLong;
   typedef ULongLong &ULongLong_out;
 
-  typedef ACE_CDR::Float Float;
+  typedef CDR::Float Float;
   typedef Float &Float_out;
 
-  typedef ACE_CDR::Double Double;
+  typedef CDR::Double Double;
   typedef Double &Double_out;
 
-  typedef ACE_CDR::LongDouble LongDouble;
+  typedef CDR::LongDouble LongDouble;
   typedef LongDouble &LongDouble_out;
 
 
-  typedef ACE_CDR::Char Char;
+  typedef CDR::Char Char;
   typedef Char &Char_out;
 
   typedef Char *String;
 
   // = String memory management.
-  static Char* string_alloc (ULong len);
-  static Char* string_dup (const Char *);
+  static String string_alloc (ULong len);
+  static String string_copy (const Char *);
+  static String string_dup (const Char *);
   static void string_free (Char *);
-  // This is a TAO extension and must go away....
-  static Char* string_copy (const Char *);
+
+  typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
 
   typedef CORBA_String_var String_var;
   typedef CORBA_String_out String_out;
 
-  // WChar was standarized in CORBA 2.2, but is still a bit unstable.
+  // WChar is an IDL extension, not yet standard.  We use 32 bits
+  // because that's what many platforms use for their native wchar_t.
+
+  typedef CDR::WChar WChar;
+  typedef WChar *WString;
 
-  typedef ACE_CDR::WChar WChar;
   typedef WChar &WChar_out;
   // Out type for WChar.
 
   // = String memory management routines.
-  static WChar* wstring_alloc (ULong len);
-  static WChar* wstring_dup (const WChar *const);
+  static WString wstring_alloc (ULong len);
+  static WString wstring_copy (const WChar *const);
+  static WString wstring_dup (const WChar *const);
   static void wstring_free (WChar *const);
 
-  typedef CORBA_WString_var WString_var;
-  typedef CORBA_WString_out WString_out;
-
-  typedef TAO_Unbounded_Sequence<Octet> OctetSeq;
-
   // = various CORBA defined classes.
   typedef CORBA_Any Any;
   typedef CORBA_Any_var Any_var;
@@ -421,8 +298,6 @@ public:
   typedef Any *Any_ptr;
 
   typedef CORBA_Environment Environment;
-  typedef CORBA_Environment_var Environment_var;
-  typedef CORBA_Environment_out Environment_out;
   typedef Environment *Environment_ptr;
 
   typedef CORBA_Exception Exception;
@@ -430,13 +305,6 @@ public:
   typedef CORBA_SystemException SystemException;
   typedef CORBA_UserException  UserException;
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  typedef CORBA_Request Request;
-  typedef Request *Request_ptr;
-  typedef CORBA_Request_var Request_var;
-  typedef CORBA_Request_out Request_out;
-
   typedef CORBA_NamedValue NamedValue;
   typedef NamedValue *NamedValue_ptr;
   typedef CORBA_NamedValue_var NamedValue_var;
@@ -447,22 +315,6 @@ public:
   typedef CORBA_NVList_var NVList_var;
   typedef CORBA_NVList_out NVList_out;
 
-  typedef CORBA_Context Context;
-  typedef CORBA_Context *Context_ptr;
-  typedef CORBA_Context_var Context_var;
-  typedef CORBA_Context_out Context_out;
-
-  typedef CORBA_ContextList ContextList;
-  typedef CORBA_ContextList *ContextList_ptr;
-  typedef CORBA_ContextList_var ContextList_var;
-  typedef CORBA_ContextList_out ContextList_out;
-
-  typedef char *CORBA_FieldName;
-  typedef CORBA_String_var CORBA_FieldName_var;
-  typedef CORBA_String_out CORBA_FieldName_out;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   typedef CORBA_Object Object;
   typedef CORBA_Object *Object_ptr;
   typedef CORBA_Object_var Object_var;
@@ -476,6 +328,11 @@ public:
   typedef CORBA_ORB_var ORB_var;
   typedef CORBA_ORB_out ORB_out;
 
+  typedef CORBA_Request Request;
+  typedef Request *Request_ptr;
+  typedef CORBA_Request_var Request_var;
+  typedef CORBA_Request_out Request_out;
+
   typedef CORBA_ServerRequest ServerRequest;
   typedef ServerRequest *ServerRequest_ptr;
 
@@ -486,33 +343,26 @@ public:
   typedef CORBA_TypeCode_out TypeCode_out;
 
   typedef CORBA_ExceptionList ExceptionList;
-  typedef CORBA_ExceptionList_var ExceptionList_var;
   typedef CORBA_ExceptionList *ExceptionList_ptr;
 
   typedef CORBA_ImplementationDef *ImplementationDef_ptr;
 
-  typedef CORBA_InterfaceDef InterfaceDef;
-  typedef CORBA_InterfaceDef *InterfaceDef_ptr;
-  typedef CORBA_InterfaceDef_var InterfaceDef_var;
-  typedef CORBA_InterfaceDef_out InterfaceDef_out;
+  typedef class CORBA_InterfaceDef *InterfaceDef_ptr;
+
+  typedef CORBA_Policy Policy;
+  typedef CORBA_Policy *Policy_ptr;
+  typedef CORBA_Policy_var Policy_var;
+  typedef CORBA_Policy_out Policy_out;
+
+  typedef CORBA_PolicyList PolicyList;
+  typedef CORBA_PolicyList_var PolicyList_var;
+  typedef CORBA_PolicyList_out PolicyList_out;
 
   typedef CORBA_Current Current;
   typedef CORBA_Current *Current_ptr;
   typedef CORBA_Current_var Current_var;
   typedef CORBA_Current_out Current_out;
 
-#ifdef TAO_HAS_VALUETYPE
-  typedef CORBA_ValueBase ValueBase;
-  typedef CORBA_ValueFactoryBase ValueFactoryBase;
-  typedef CORBA_ValueFactoryBase *ValueFactory;
-          // as CORBA 2.3a C++ map. 20.17.10 says
-  typedef CORBA_ValueFactoryBase *ValueFactory_ptr;
-          // own invention, more readable
-  typedef CORBA_DefaultValueRefCountBase  DefaultValueRefCountBase;
-  static void add_ref (ValueBase *);
-  static void remove_ref (ValueBase *);
-#endif /* TAO_HAS_VALUETYPE */
-
   // enum values defined in nvlist.hh, bitwise ORed.
   typedef u_int Flags;
 
@@ -525,7 +375,7 @@ public:
     COMPLETED_MAYBE    // can't say what happened; retry unsafe
   };
 
-  enum exception_type
+  enum ExceptionType
   {
     // = Exception type.
 
@@ -534,8 +384,6 @@ public:
     SYSTEM_EXCEPTION
   };
 
-  CORBA::TypeCode_ptr _tc_exception_type;
-
   // all the system exception classes
 #define TAO_SYSTEM_EXCEPTION(name) \
   typedef CORBA_ ## name      name
@@ -547,37 +395,27 @@ TAO_SYSTEM_EXCEPTION_LIST
   // = all the CORBA::is_nil methods.
   static Boolean is_nil (Object_ptr);
   static Boolean is_nil (Environment_ptr);
+  static Boolean is_nil (NamedValue_ptr);
+  static Boolean is_nil (NVList_ptr);
+  static Boolean is_nil (Request_ptr);
+  //  static Boolean is_nil (Context_ptr);
   static Boolean is_nil (TypeCode_ptr);
   static Boolean is_nil (ORB_ptr);
   static Boolean is_nil (Principal_ptr);
   static Boolean is_nil (ServerRequest_ptr req);
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  static Boolean is_nil (Request_ptr);
-  static Boolean is_nil (NamedValue_ptr);
-  static Boolean is_nil (NVList_ptr);
-  static Boolean is_nil (Context_ptr);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   // = all the CORBA release methods.
   static void release (Object_ptr);
   static void release (Environment_ptr);
+  static void release (NamedValue_ptr);
+  static void release (NVList_ptr);
+  static void release (Request_ptr);
   static void release (Principal_ptr);
+  //  static Boolean release (Context_ptr);
   static void release (TypeCode_ptr);
   static void release (ORB_ptr);
   static void release (ServerRequest_ptr req);
 
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-
-  static void release (Request_ptr);
-  static void release (NamedValue_ptr);
-  static void release (NVList_ptr);
-  static void release (Context_ptr);
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   enum TCKind
   {
     // = Kinds of typecodes.
@@ -657,206 +495,16 @@ TAO_SYSTEM_EXCEPTION_LIST
 
   static TypeCode_ptr _tc_UnknownUserException;
 
-  static CORBA::TypeCode_ptr _tc_Current;
-
-#if !defined (TAO_HAS_MINIMUM_CORBA)
-  static CORBA::TypeCode_ptr _tc_NamedValue;
-#endif /* End of Minimum CORBA */
-  enum
-  {
-    // = Flags for NVList add methods
-    ARG_IN                  = 0x01,
-    ARG_OUT                 = 0x02,
-    ARG_INOUT               = 0x04,
-    IN_COPY_VALUE           = 0x08,
-    OUT_LIST_MEMORY         = 0x10,
-    DEPENDENT_LIST          = 0x20,
-
-    // = Flags for Context methods
-    CTX_RESTRICT_SCOPE      = 0x40,
-    CTX_DELETE_DESCENDENTS  = 0x80,
-
-    // = Flags for deferred synchronous methods
-    INV_NO_RESPONSE         = 0x100,
-    INV_TERM_ON_ERR         = 0x200,
-    RESP_NO_WAIT            = 0x400
-  };
-
-  typedef char *ORBid;
-  typedef CORBA::String_var ORBid_var;
-  typedef CORBA::String_out ORBid_out;
-  static CORBA::TypeCode_ptr _tc_ORBid;
-
-  typedef char *Identifier;
-  typedef CORBA::String_var Identifier_var;
-  typedef CORBA::String_out Identifier_out;
-  static CORBA::TypeCode_ptr _tc_Identifier;
-
-  typedef char *RepositoryId;
-  typedef CORBA::String_var RepositoryId_var;
-  typedef CORBA::String_out RepositoryId_out;
-  static CORBA::TypeCode_ptr _tc_RepositoryId;
-
-  typedef CORBA::Short PolicyErrorCode;
-  typedef CORBA::Short_out PolicyErrorCode_out;
-  static CORBA::TypeCode_ptr _tc_PolicyErrorCode;
-
-  static const PolicyErrorCode BAD_POLICY;
-  static const PolicyErrorCode UNSUPPORTED_POLICY;
-  static const PolicyErrorCode BAD_POLICY_TYPE;
-  static const PolicyErrorCode BAD_POLICY_VALUE;
-  static const PolicyErrorCode UNSUPPORTED_POLICY_VALUE;
-
-  typedef CORBA_PolicyError PolicyError;
-  typedef CORBA_PolicyError *PolicyError_ptr;
-  static CORBA::TypeCode_ptr _tc_PolicyError;
-
-  typedef CORBA_InvalidPolicies InvalidPolicies;
-  typedef CORBA_InvalidPolicies* InvalidPolicies_ptr;
-  static CORBA::TypeCode_ptr _tc_InvalidPolicies;
-
-  typedef CORBA::ULong PolicyType;
-  typedef CORBA::ULong_out PolicyType_out;
-  static CORBA::TypeCode_ptr _tc_PolicyType;
-
-  typedef CORBA_Policy Policy;
-  typedef CORBA_Policy *Policy_ptr;
-  typedef CORBA_Policy_var Policy_var;
-  typedef CORBA_Policy_out Policy_out;
   static CORBA::TypeCode_ptr _tc_Policy;
-
-  typedef CORBA_PolicyList PolicyList;
-  typedef CORBA_PolicyList_var PolicyList_var;
-  typedef CORBA_PolicyList_out PolicyList_out;
   static CORBA::TypeCode_ptr _tc_PolicyList;
 
-  // = Service definitions
-  typedef CORBA::UShort ServiceType;
-  typedef ServiceType CORBA_ServiceType;
-  typedef CORBA::UShort_out ServiceType_out;
-  typedef ServiceType_out CORBA_ServiceType_out;
-  static CORBA::TypeCode_ptr _tc_ServiceType;
-  static const ServiceType Security;
-
-  typedef CORBA::ULong ServiceOption;
-  typedef ServiceOption CORBA_ServiceOption;
-  typedef CORBA::ULong_out ServiceOption_out;
-  typedef ServiceOption_out CORBA_ServiceOption_out;
-  static  CORBA::TypeCode_ptr _tc_ServiceOption;
-
-  typedef CORBA::ULong ServiceDetailType;
-  typedef ServiceDetailType CORBA_ServiceDetailType;
-  typedef CORBA::ULong_out ServiceDetailType_out;
-  typedef ServiceDetailType_out CORBA_ServiceDetailType_out;
-  static  CORBA::TypeCode_ptr _tc_ServiceDetailType;
-
-  typedef CORBA_ServiceDetail ServiceDetail;
-  typedef CORBA_ServiceDetail_var ServiceDetail_var;
-  typedef CORBA_ServiceDetail_out ServiceDetail_out;
-  typedef CORBA_ServiceDetail *ServiceDetail_ptr;
-  static CORBA::TypeCode_ptr _tc_ServiceDetail;
-
-  typedef CORBA_ServiceInformation ServiceInformation;
-  typedef CORBA_ServiceInformation_var ServiceInformation_var;
-  typedef CORBA_ServiceInformation_out ServiceInformation_out;
-  typedef CORBA_ServiceInformation *ServiceInformation_ptr;
-  static CORBA::TypeCode_ptr _tc_ServiceInformation;
-
-  typedef CORBA_PolicyTypeSeq PolicyTypeSeq;
-  typedef CORBA_PolicyTypeSeq_var PolicyTypeSeq_var;
-  typedef CORBA_PolicyTypeSeq_out PolicyTypeSeq_out;
-  static CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
-
-  enum SetOverrideType
-  {
-    SET_OVERRIDE,
-    ADD_OVERRIDE
-  };
-  typedef SetOverrideType &SetOverrideType_out;
-  static CORBA::TypeCode_ptr _tc_SetOverrideType;
-
-  typedef CORBA_PolicyManager PolicyManager;
-  typedef CORBA_PolicyManager *PolicyManager_ptr;
-  static CORBA::TypeCode_ptr _tc_PolicyManager;
-
-  typedef CORBA_PolicyCurrent PolicyCurrent;
-  typedef CORBA_PolicyCurrent *PolicyCurrent_ptr;
-  static CORBA::TypeCode_ptr _tc_PolicyCurrent;
-
-  typedef CORBA_DomainManager DomainManager;
-  typedef CORBA_DomainManager *DomainManager_ptr;
-  typedef CORBA_DomainManager_var DomainManager_var;
-  typedef CORBA_DomainManager_out DomainManager_out;
-  static CORBA::TypeCode_ptr _tc_DomainManager;
-
-  typedef CORBA_DomainManagerList DomainManagerList;
-  typedef CORBA_DomainManagerList *DomainManagerList_ptr;
-  typedef CORBA_DomainManagerList_var DomainManagerList_var;
-  typedef CORBA_DomainManagerList_out DomainManagerList_out;
-  static CORBA::TypeCode_ptr _tc_DomainManagerList;
-
-  static const PolicyType SecConstruction;
-
-#if ! defined (TAO_HAS_MINIMUM_CORBA)
-  typedef CORBA_ConstructionPolicy ConstructionPolicy;
-  typedef CORBA_ConstructionPolicy *ConstructionPolicy_ptr;
-  typedef CORBA_ConstructionPolicy_var ConstructionPolicy_var;
-  typedef CORBA_ConstructionPolicy_out ConstructionPolicy_out;
-  static CORBA::TypeCode_ptr _tc_ConstructionPolicy;
-
-  typedef CORBA_WrongTransaction WrongTransaction;
-  typedef WrongTransaction *WrongTransaction_ptr;
-  static CORBA::TypeCode_ptr _tc_WrongTransaction;
-
-  typedef CORBA_AnySeq AnySeq;
-  typedef CORBA_AnySeq *AnySeq_ptr;
-  typedef CORBA_AnySeq_var AnySeq_var;
-  typedef CORBA_AnySeq_out AnySeq_out;
-  static CORBA::TypeCode_ptr _tc_AnySeq;
-
-  typedef CORBA_FieldName FieldName;
-  typedef CORBA_FieldName_var FieldName_var;
-  typedef CORBA_FieldName_out FieldName_out;
-  static CORBA::TypeCode_ptr _tc_FieldName;
-
-  typedef CORBA_NameValuePair NameValuePair;
-  typedef CORBA_NameValuePair *NameValuePair_ptr;
-  typedef CORBA_NameValuePair_var NameValuePair_var;
-  typedef CORBA_NameValuePair_out NameValuePair_out;
-  static CORBA::TypeCode_ptr _tc_NameValuePair;
-
-  typedef CORBA_NameValuePairSeq NameValuePairSeq;
-  typedef CORBA_NameValuePairSeq *NameValuePairSeq_ptr;
-  typedef CORBA_NameValuePairSeq_var NameValuePairSeq_var;
-  typedef CORBA_NameValuePairSeq_out NameValuePairSeq_out;
-  static CORBA::TypeCode_ptr _tc_NameValuePairSeq;
-
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
-
-  // ****************************************************************
-
-  typedef CORBA_PollableSet PollableSet;
-  typedef CORBA_PollableSet_var PollableSet_var;
-  typedef CORBA_PollableSet_out PollableSet_out;
-  typedef CORBA_PollableSet_ptr PollableSet_ptr;
-  static CORBA::TypeCode_ptr _tc_PollableSet;
-
-  typedef CORBA_Pollable Pollable;
-  typedef CORBA_Pollable_var Pollable_var;
-  typedef CORBA_Pollable_out Pollable_out;
-  typedef CORBA_Pollable_ptr Pollable_ptr;
-  static CORBA::TypeCode_ptr _tc_Pollable;
-
-  typedef CORBA_DIIPollable DIIPollable;
-  typedef CORBA_DIIPollable_var DIIPollable_var;
-  typedef CORBA_DIIPollable_out DIIPollable_out;
-  typedef CORBA_DIIPollable_ptr DIIPollable_ptr;
-  static CORBA::TypeCode_ptr _tc_DIIPollable;
-
-  // ****************************************************************
+  static CORBA::TypeCode_ptr _tc_Current;
+
+  static CORBA_Environment& default_environment (void);
+  // Obtain the thread-specific default environment.
 
   // There could be a single version of these methods, but g++ 2.7.2
-  // gets horribly confused if we used CORBA::default_environment() at
+  // gets horribly confused if we used CORBA::default_environment() at 
   // this point.
   static ORB_ptr ORB_init (int &argc,
                            char *const *argv,
@@ -867,11 +515,6 @@ TAO_SYSTEM_EXCEPTION_LIST
                            CORBA_Environment &TAO_IN_ENV);
   // ORB initialisation
 
-  // = TAO extensions...
-
-  static CORBA_Environment& default_environment (void);
-  // Obtain the thread-specific default environment.
-
   // = The following two methods are TAO-specific extensions.
   static ORB_ptr instance (void);
   // Returns a pointer to the "default ORB."
@@ -879,17 +522,37 @@ TAO_SYSTEM_EXCEPTION_LIST
   static void instance (ORB_ptr);
   // Sets a pointer to the "default ORB."
 
+  enum
+  {
+    // = Define flags for NVList add methods
+
+    ARG_IN = 0x01,
+    ARG_OUT = 0x02,
+    ARG_INOUT = 0x04,
+    IN_COPY_VALUE = 0x08,
+    OUT_LIST_MEMORY = 0x10
+  };
+
+  typedef char *Identifier;
+  typedef CORBA::String_var Identifier_var;
+  typedef CORBA::String_out Identifier_out;
+  static CORBA::TypeCode_ptr _tc_Identifier;
+
+  typedef char *RepositoryId;
+  typedef CORBA::String_var RepositoryId_var;
+  typedef CORBA::String_out RepositoryId_out;
+  static CORBA::TypeCode_ptr _tc_RepositoryId;
+
+  typedef CORBA::ULong PolicyType;
+  typedef CORBA::ULong_out PolicyType_out;
+  static CORBA::TypeCode_ptr _tc_PolicyType;
+
 private:
   friend class CORBA_ORB;
   static ORB_ptr instance_;
   // Points to the "default ORB."
 };  // end of class (namespace) CORBA
 
-// ****************************************************************
-
-// A helper clas to handle the various kinds of octet sequences used
-// inside the ORB.
-
 typedef TAO_Unbounded_Sequence<CORBA::Octet> TAO_opaque;
 extern TAO_Export CORBA::TypeCode_ptr TC_opaque;
 
@@ -904,8 +567,4 @@ class TAO_ObjectKey_var;
 class TAO_ObjectKey_out;
 typedef TAO_ObjectKey *TAO_ObjectKey_ptr;
 
-#if defined (__ACE_INLINE__)
-# include "tao/corbafwd.i"
-#endif /* ! __ACE_INLINE__ */
-
 #endif /* TAO_CORBAFWD_H */
diff --git a/TAO/tao/corbafwd.i b/TAO/tao/corbafwd.i
deleted file mode 100644
index 766b0ee6a30..00000000000
--- a/TAO/tao/corbafwd.i
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-ACE_INLINE TAO_Export CORBA::String
-CORBA::string_alloc (CORBA::ULong len)
-{
-  // Allocate 1 + strlen to accomodate the null terminating character.
-  return new CORBA::Char[size_t (len + 1)];
-}
-
-ACE_INLINE TAO_Export void
-CORBA::string_free (CORBA::Char *str)
-{
-  delete [] str;
-}
-
-ACE_INLINE TAO_Export CORBA::String
-CORBA::string_dup (const CORBA::Char *str)
-{
-  if (!str)
-    return 0;
-
-  size_t len = ACE_OS::strlen (str);
-
-  // This allocates an extra byte for the '\0';
-  CORBA::String copy = CORBA::string_alloc (len);
-
-  ACE_OS::memcpy (copy, str, len + 1);
-  return copy;
-}
-
-// ----------------------------------------------------------------------
-// Wide strings
-// ----------------------------------------------------------------------
-
-ACE_INLINE TAO_Export CORBA::WChar*
-CORBA::wstring_alloc (CORBA::ULong len)
-{
-  return new CORBA::WChar [(size_t) (len + 1)];
-}
-
-ACE_INLINE TAO_Export void
-CORBA::wstring_free (CORBA::WChar *const str)
-{
-  delete [] str;
-}
-
-ACE_INLINE TAO_Export CORBA::WChar*
-CORBA::wstring_dup (const WChar *const str)
-{
-  if (!str)
-    return 0;
-
-  CORBA::WChar* retval = CORBA::wstring_alloc (ACE_OS::wslen (str));
-  return ACE_OS::wscpy (retval, str);
-}
-
diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp
index 878f96f75c4..74eec278d50 100644
--- a/TAO/tao/decode.cpp
+++ b/TAO/tao/decode.cpp
@@ -29,6 +29,7 @@
 #include "tao/GIOP.h"
 #include "tao/Any.h"
 #include "tao/Principal.h"
+#include "tao/IIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/Object.h"
 #include "tao/Stub.h"
@@ -36,7 +37,6 @@
 #include "tao/ORB.h"
 #include "tao/Union.h"
 #include "tao/ORB_Core.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, decode, "$Id$")
 
@@ -115,10 +115,9 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::decode detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::decode detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,
                             CORBA::TypeCode::TRAVERSE_STOP);
     }
 }
@@ -160,7 +159,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
   // actual buffer. Hence it makes no sense keeping pointers to stack
   // memory.
   //
-  // See TAO_Stub.cpp::do_static_call in which a GIOP_Invocation is
+  // See STUB_Object.cpp::do_static_call in which a GIOP_Invocation is
   // allocated on stack
 #if 0
   any->cdr_ = ACE_Message_Block::duplicate ((ACE_Message_Block *)
@@ -191,12 +190,20 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
 
   end = temp.rd_ptr ();
 
+  ACE_Message_Block* cdr;
+
   // We need to allocate more memory than in the original
   // stream, first to guarantee that the buffer is aligned in
   // memory and next because the realignment may introduce
   // extra padding. 2*MAX_ALIGNMENT should be enough.
   // @@EXC@@ This doesn't seem to be exception safe.
-  TAO_OutputCDR out (end - begin + 2 * ACE_CDR::MAX_ALIGNMENT);
+  ACE_NEW_RETURN (cdr,
+                  ACE_Message_Block (end - begin
+                                     + 2*CDR::MAX_ALIGNMENT),
+                  CORBA::TypeCode::TRAVERSE_STOP);
+  // Align the buffer before creating the CDR stream.
+  CDR::mb_align (cdr);
+  TAO_OutputCDR out (cdr);
 
   retval = out.append (elem_tc.in (), stream, env);
   TAO_CHECK_ENV_RETURN (env, retval);
@@ -208,21 +215,16 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr,
     DEEP_FREE (any->type_, any->value_, 0, env);
   TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
-  any->cdr_ = ACE_Message_Block::duplicate (out.begin ());
+  any->cdr_ = cdr;
   any->value_ = 0;
-
-  if (any->type_)
-    CORBA::release (any->type_);
-
   any->type_ = elem_tc._retn ();
   any->any_owns_data_ = 1;
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Any::decode detected error"));
     }
   return retval;
 }
@@ -313,7 +315,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
               // have nonempty parameter lists ...
             default:
               // Error: missed a case!
-              env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
               return CORBA::TypeCode::TRAVERSE_STOP;
 
               // Some have "simple" parameter lists ... some of these
@@ -393,7 +395,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
               {
                 if (parent_typecode == 0)
                   {
-                    env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                    env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE));
                     return CORBA::TypeCode::TRAVERSE_STOP;
                   }
 
@@ -440,12 +442,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
                 // constructing indir_stream by subtracting 4 (length
                 // of the offset parameter itself).
 
-                //                TAO_InputCDR indir_stream (*stream, 8, offset
-                //                - 4);
-                ACE_Message_Block *mb = (ACE_Message_Block *)stream->start ();
-                TAO_InputCDR indir_stream (mb->rd_ptr () + offset - 4,
-                                           -1 * (offset - 4));
-
+                TAO_InputCDR indir_stream (*stream, 8, offset - 4);
 
                 continue_decoding = indir_stream.good_bit ();
 
@@ -523,11 +520,9 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
         }
       else // bad kind_ value to be decoded
         {
-          env.exception (new CORBA::BAD_TYPECODE ());
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Marshal_TypeCode:decode: "
-                        "Bad kind_ value in CDR stream\n"));
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream"));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -536,10 +531,9 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::decode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -553,20 +547,38 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr,
                                void *context,
                                CORBA::Environment &env)
 {
+  CORBA::Boolean continue_decoding = 1;
+
   // Context is the CDR stream.
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
 
-  CORBA::Principal_ptr x;
+  CORBA::Principal_ptr *pp = (CORBA::Principal_ptr *) data;
+  CORBA::ULong len;
+
+  continue_decoding = stream->read_ulong (len);
+  if (len == 0 || !continue_decoding)
+    *pp = 0;  // null principal
+  else
+    {
+      // Allocate storage for Principal and its buffer.
+      ACE_NEW_RETURN (*pp,
+                      CORBA::Principal,
+                      CORBA::TypeCode::TRAVERSE_CONTINUE);
+      (*pp)->id.length (len);
+
+      continue_decoding =
+        stream->read_octet_array ((*pp)->id.get_buffer (), len);
+    }
 
-  if ((*stream >> x) == 0)
+  if (continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
-      *(CORBA_Principal_ptr*)data = CORBA::Principal::_nil ();
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Principal::decode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
-
-  *(CORBA_Principal **)data = x;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // Decode obj ref.  An IOR
@@ -577,20 +589,170 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr,
                             void *context,
                             CORBA::Environment &env)
 {
+  CORBA::Boolean continue_decoding = 1;
+
   // Context is the CDR stream.
   TAO_InputCDR *stream = (TAO_InputCDR *) context;
+  CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
+  CORBA::String type_hint;
+
+  // First, read the type hint. This will be the type_id encoded in an
+  // object reference.
+  stream->decode (CORBA::_tc_string, &type_hint, 0, env);
+
+  // Read the profiles, discarding all until an IIOP profile comes by.
+  // Once we see an IIOP profile, ignore any further ones.
+  //
+  // XXX this will need to change someday to let different protocol
+  // code be accessed, not just IIOP.  Protocol modules will be
+  // dynamically loaded from shared libraries via ORB_init (), and we
+  // just need to be able to access such preloaded libraries here as
+  // we unmarshal objrefs.
+
+  CORBA::ULong profiles;
+  STUB_Object *objdata = 0;
+
+  // get the count of profiles that follow
+  continue_decoding = stream->read_ulong (profiles);
+
+  // No profiles means a NIL objref.
+
+  if (profiles == 0)
+    {
+      *(CORBA::Object_ptr *) data = CORBA::Object::_nil ();
+      CORBA::string_free (type_hint);
+      type_hint = 0;
+      return CORBA_TypeCode::TRAVERSE_CONTINUE;
+    }
+
+  // get a profile container to store all profiles in the IOR.
+  TAO_MProfile *mp = new TAO_MProfile (profiles);
+
+  while (profiles-- != 0 )
+  {
+    // @@ For now we just take IIOP_Profiles,  FRED
+    // We keep decoding until we find a valid IIOP profile.
+    CORBA::ULong tag;
+
+    // get the profile ID tag
+    if ( (continue_decoding = stream->read_ulong (tag)) == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "cannot read profile tag\n"));
+        continue;
+      }
+
+    if (tag != TAO_IOP_TAG_INTERNET_IOP ) // || objdata != 0)
+      {
+        continue_decoding = stream->skip_string ();
+        ACE_DEBUG ((LM_DEBUG, "unknown tag %d skipping\n", tag));
+        continue;
+      }
+
+    // OK, we've got an IIOP profile.  It's going to be
+    // encapsulated ProfileData.  Create a new decoding stream and
+    // context for it, and tell the "parent" stream that this data
+    // isn't part of it any more.
+
+    CORBA::ULong encap_len;
+    // ProfileData is encoded as a sequence of octet. So first get
+    // the length of the sequence.
+    if ( (continue_decoding = stream->read_ulong (encap_len)) == 0)
+      {
+        ACE_DEBUG ((LM_DEBUG, "cannot read encap length\n"));
+        continue;
+      }
+
+    // Create the decoding stream from the encapsulation in the
+    // buffer, and skip the encapsulation.
+    TAO_InputCDR str (*stream, encap_len);
+
+    continue_decoding =
+      str.good_bit ()
+      && stream->skip_bytes(encap_len);
+
+    if (!continue_decoding)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+                    "problem decoding encapsulated stream, "
+                    "len = %d\n", encap_len));
+        continue;
+      }
+
+    // get the default IIOP Profile and fill in the blanks
+    // with str.
+    TAO_IIOP_Profile *pfile = new TAO_IIOP_Profile;
 
-  CORBA::Object_ptr object;
+    // return code will be -1 if an error occurs
+    // otherwise 0 for stop (can't read this profile type or version)
+    // and 1 for continue.
+    // @@ check with carlos about how TRAVERSE_CONTINUE is used!  FRED
+    switch (pfile->parse (str, continue_decoding, env))
+    {
+      case -1:
+        pfile->_decr_refcnt ();
+        return CORBA::TypeCode::TRAVERSE_STOP;
+      case 0:
+        break;
+      case 1:
+      default:
+        mp->add_profile (pfile);
+        // all other return values indicate success
+        break;
+    }
+    // get more profiles
+    pfile->_decr_refcnt ();
+    continue;
+  }
 
-  if ((*stream >> object) == 0)
+  // make sure we got some profiles!
+  if (mp->profile_count () == 0)
     {
-      *(CORBA_Object_ptr*)data = CORBA::Object::_nil ();
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG, "no IIOP v%d.%d (or earlier) profile in IOR!\n",
+                TAO_IIOP_Profile::DEF_IIOP_MAJOR, TAO_IIOP_Profile::DEF_IIOP_MINOR));
+      // get rid of the original MProfile!
+      delete mp;
+
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 
-  *(CORBA_Object **)data = object;
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  // Ownership of type_hint is given to STUB_Object
+  // STUB_Object will make a copy of mp!
+  objdata = new STUB_Object (type_hint, mp);
+
+  // get rid of the original MProfile!
+  delete mp;
+
+  if ( objdata == 0)
+    return CORBA::TypeCode::TRAVERSE_STOP;
+
+  // Create a new CORBA_Object and give it the STUB_Object just
+  // created.
+  TAO_ServantBase *servant =
+    TAO_ORB_Core_instance ()->orb ()->_get_collocated_servant (objdata);
+  CORBA_Object *corba_proxy = 0;
+
+  corba_proxy = new CORBA_Object (objdata, servant, servant != 0);
+
+  if (corba_proxy)
+    *(CORBA_Object **)data = corba_proxy;
+  else
+    continue_decoding = 0;
+
+    // the corba proxy would have already incremented the reference count on
+    // the objdata. So we decrement it here by 1 so that the objdata is now
+    // fully owned by the corba_proxy that was created.
+    // objdata->_decr_refcnt ();
+
+  if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
+      && continue_decoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
+    {
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error"));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // Decode structs.
@@ -699,10 +861,35 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
                           if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE
                               && env.exception () == 0)
                             {
-                              TAO_Object_Field_T<CORBA_Object>* field =
-                                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                                      ACE_const_cast (void *, data));
-                              field->_downcast (object, env);
+                              // The representation of a base
+                              // CORBA::Object is a little different.
+                              // @@ TODO maybe equivalent() is the right
+                              // method here.
+                              CORBA::Boolean is_corba_object =
+                                param->equal (CORBA::_tc_Object, env);
+                              if (env.exception () == 0)
+                                {
+                                  if (is_corba_object == 0)
+                                    {
+                                      TAO_Object_Field* field =
+                                        ACE_reinterpret_cast (TAO_Object_Field *,
+                                                              ACE_const_cast (void *, data));
+                                      field->_downcast (object, env);
+                                      // The size of this field is different...
+                                      size = sizeof(TAO_Object_Field_T<CORBA_Object>);
+                                    }
+                                  else
+                                    {
+                                      CORBA_Object_ptr* tmp =
+                                        ACE_reinterpret_cast(CORBA_Object_ptr*,
+                                                             ACE_const_cast(void*,data));
+                                      *tmp = object;
+                                    }
+                                }
+                              else
+                                {
+                                  retval = CORBA::TypeCode::TRAVERSE_STOP;
+                                }
                             }
                         }
                         break;
@@ -729,10 +916,9 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling encode_struct detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -837,11 +1023,12 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                                   break;
                                 case CORBA::tk_enum:
                                   {
-                                    CORBA::ULong ul;
+                                    CORBA::Long l;
                                     TAO_InputCDR stream ((ACE_Message_Block *)
-                                                         member_label->_tao_get_cdr ());
-                                    (void)stream.decode (discrim_tc, &ul, 0, env);
-                                    if (ul == *(CORBA::ULong *) discrim_val)
+                                                         member_label->value
+                                                         ());
+                                    (void)stream.decode (discrim_tc, &l, 0, env);
+                                    if (l == *(CORBA::Long *) discrim_val)
                                       discrim_matched = 1;
                                   }
                                   break;
@@ -854,9 +1041,8 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                                   }
                                   break;
                                 case CORBA::tk_wchar:
-                                  CORBA::WChar wc;
-                                  *member_label >>= CORBA::Any::to_wchar (wc);
-                                  if (wc == *(CORBA::WChar *) discrim_val)
+                                  // @@ ASG TO-DO
+                                  if (*(CORBA::WChar *) member_label->value () == *(CORBA::WChar *) discrim_val)
                                     discrim_matched = 1;
                                   break;
                                 case CORBA::tk_boolean:
@@ -868,7 +1054,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                                   }
                                   break;
                                 default:
-                                  env.exception (new CORBA::BAD_TYPECODE ());
+                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
                                   return CORBA::TypeCode::TRAVERSE_STOP;
                                 }// end of switch
 
@@ -884,32 +1070,19 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                                     {
                                       member_val = base_union->_access (1);
                                       // marshal according to the matched typecode
-                                      if (member_tc->kind () == CORBA::tk_objref)
-                                        {
-                                          // we know that the object pointer is stored in a
-                                          // TAO_Object_Field_T parametrized type
-                                          TAO_Object_Field_T<CORBA_Object>* field =
-                                            ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                                                  member_val);
-                                          CORBA::Object_ptr ptr = field->_upcast ();
-                                          return stream->decode (member_tc, &ptr, data2, env);
-                                        }
-                                      else
-                                        {
-                                          return stream->decode (member_tc, member_val,
-                                                                 data2, env);
-                                        }
+                                      return stream->decode (member_tc, member_val,
+                                                           data2, env);
                                     }
                                 }
                               else
                                 {
-                                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                                   return CORBA::TypeCode::TRAVERSE_STOP;
                                 }
                             }
                           else
                             {
-                              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                               return CORBA::TypeCode::TRAVERSE_STOP;
                             }
                         } // end of for loop
@@ -917,52 +1090,38 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr  tc,
                       if (default_tc)
                         {
                           member_val = base_union->_access (1);
-                          if (default_tc->kind () == CORBA::tk_objref)
-                            {
-                              // we know that the object pointer is stored in a
-                              // TAO_Object_Field_T parametrized type
-                              TAO_Object_Field_T<CORBA_Object>* field =
-                                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                                      member_val);
-                              CORBA::Object_ptr ptr = field->_upcast ();
-                              return stream->decode (default_tc, &ptr, data2, env);
-                            }
-                          else
-                            {
-                              return stream->decode (default_tc, member_val,
-                                                     data2, env);
-                            }
+                          return stream->decode (default_tc, member_val, data2, env);
                         }
                       else
                         return CORBA::TypeCode::TRAVERSE_CONTINUE;
                     }
                   else
                     {
-                      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                       return CORBA::TypeCode::TRAVERSE_STOP;
                     }
                 }
               else
                 {
-                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                   return CORBA::TypeCode::TRAVERSE_STOP;
                 }
             }
           else
             {
-              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
               return CORBA::TypeCode::TRAVERSE_STOP;
             }
         }
       else
         {
-          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
   else
     {
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -994,10 +1153,9 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_String::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::decode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1218,7 +1376,7 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr  tc,
   // If an error was detected but no exception was raised then raise a
   // marshal exception.
   if (env.exception () == 0)
-    env.exception (new CORBA::MARSHAL ());
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -1364,12 +1522,10 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr  tc,
             } // no exception computing size
         } // no exception computing content type
     } // no exception computing bounds
-
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::decode detected error\n"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::decode detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -1463,10 +1619,9 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::decode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1593,10 +1748,9 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Except detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1640,10 +1794,9 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_WString::decode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::decode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index 6d647935f40..2263bdfc319 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -29,15 +29,10 @@
 // ============================================================================
 
 #include "tao/Marshal.h"
-#include "tao/CDR.h"
 #include "tao/Environment.h"
-#include "tao/Any.h"
 #include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/Principal.h"
-#include "tao/varout.h"
-#include "tao/Union.h"
-#include "tao/debug.h"
+#include "tao/Any.h"
+#include "tao/Sequence.h"
 
 ACE_RCSID(tao, deep_free, "$Id$")
 
@@ -115,7 +110,7 @@ DEEP_FREE (CORBA::TypeCode_ptr  param,
   return retval;
 }
 
-// deep free for primitives
+// deep copy for primitives
 CORBA::TypeCode::traverse_status
 TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
                                   const void *,
@@ -126,13 +121,16 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
 
   if (!tc)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   my_kind = tc->kind (env);
+
+  // @@EXC@@ Don't know how to print the following debug info.
+  //         Anyhow, currently, tc->kind won't throw any exception.
+  // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Primitive::deep_free detected error"));
   TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   switch (my_kind)
@@ -155,10 +153,9 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr  tc,
     case CORBA::tk_boolean:
       break;
     default:
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -172,10 +169,9 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
 {
   if (!tc)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Struct::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -184,6 +180,10 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
 
   // compute the number of fields in the struct
   int member_count = tc->member_count (env);
+
+  // @@EXC@@ Don't know how to print out this error message using
+  //         the TAO_CHECK... macro.  Is it necessary?
+  // ACE_DEBUG((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error"));
   TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
   for (int i = 0; i < member_count && retval ==
@@ -192,11 +192,17 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
       // get the typecode for the ith field
       param = tc->member_type (i, env);
 
+      // @@EXC@@ Don't know how to print out this error message using
+      //         the TAO_CHECK... macro.   Is it necessary?
+      // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error"));
       TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
       // get the size of the field
       size = param->size (env);
 
+      // @@EXC@@ Don't know how to print out this error message using
+      //         the TAO_CHECK... macro.   Is it necessary?
+      // ACE_DEBUG ((LM_DEBUG,"TAO_Marshal_Struct::deep_free detected error"));
       TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
       switch (param->kind_)
@@ -230,8 +236,8 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
 
         case CORBA::tk_objref:
           {
-            TAO_Object_Field_T<CORBA_Object>* field =
-              ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
+            TAO_Object_Field* field =
+              ACE_reinterpret_cast (TAO_Object_Field *,
                                     ACE_const_cast (void *, source));
             field->_release ();
             retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
@@ -271,10 +277,9 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr  tc,
 
   if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Struct::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -290,41 +295,48 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
   CORBA::TypeCode_ptr discrim_tc;
   CORBA::TypeCode_ptr member_tc;
   CORBA::Any_ptr member_label;
+  CORBA::ULong discrim_size_with_pad;
   const void *discrim_val;
   CORBA::ULong member_count;
   CORBA::Long  default_index;
   CORBA::ULong i;
   CORBA::TypeCode_ptr default_tc = 0;
   CORBA::Boolean discrim_matched = 0;
-  TAO_Base_Union *base_union;
-  void *member_val;
-
-  // Get a base pointer so we can use the union's virtual functions.
-  base_union = ACE_reinterpret_cast (TAO_Base_Union *,
-                                     ACE_const_cast (void *, 
-                                                     data));
 
   discrim_tc = tc->discriminator_type (env);
-  // Get the discriminator type
+  // get the discriminator type
   // @@EXC@@ Why are we changing the exception thrown here?
-  //  if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+  //  if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
   TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
 
-  discrim_val = base_union->_discriminant ();
-  // Get a pointer to the discriminator value.
+  // deep_free the discriminator value
+  retval = DEEP_FREE (discrim_tc, data, data2, env);
+  TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP);
+
+  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
+    TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+
+  discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
+  // @@EXC@@ Why are we changing the exception thrown here?
+  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+  TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
+
+  discrim_val = data;
+  // save the pointer to the discriminator value
 
-  member_val = base_union->_access (0);
-  // Get a pointer to the member, but don't allocate new storage.
+  data = (char *)data + discrim_size_with_pad;
+  data2 = (char *)data2 + discrim_size_with_pad;
+  // move the pointer to point to the actual value
 
   default_index = tc->default_index (env);
   // now get ready to marshal the actual union value
   // @@EXC@@ Why are we changing the exception thrown here?
-  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
   TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
   member_count = tc->member_count (env);
   // @@EXC@@ Why are we changing the exception thrown here?
-  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+  // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
   TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
   // check which label value matches with the discriminator
@@ -335,7 +347,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
     {
       member_label = tc->member_label (i, env);
       // @@EXC@@ Why are we changing the exception thrown here?
-      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
       TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
       // do the matching
@@ -343,51 +355,41 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
       switch (type->kind (env))
         {
         case CORBA::tk_short:
-          if (*(CORBA::Short *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Short *)discrim_val)
-            discrim_matched = 1;
-          break;
         case CORBA::tk_ushort:
-          if (*(CORBA::UShort *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::UShort *)discrim_val)
+          if (*(CORBA::Short *)member_label->value () ==
+              *(CORBA::Short *)discrim_val)
             discrim_matched = 1;
           break;
         case CORBA::tk_long:
-          if (*(CORBA::Long *)member_label->_tao_get_cdr ()->base () ==
-              *(CORBA::Long *)discrim_val)
-            discrim_matched = 1;
-          break;
         case CORBA::tk_ulong:
         case CORBA::tk_enum:
-          if (*(CORBA::ULong *)member_label->_tao_get_cdr ()->base () ==
+          if (*(CORBA::ULong *)member_label->value () ==
               *(CORBA::ULong *)discrim_val)
             discrim_matched = 1;
           break;
         case CORBA::tk_char:
-          if (*(CORBA::Char *)member_label->_tao_get_cdr ()->base () ==
+          if (*(CORBA::Char *)member_label->value () ==
               *(CORBA::Char *)discrim_val)
             discrim_matched = 1;
           break;
         case CORBA::tk_wchar:
-          if (*(CORBA::WChar *)member_label->_tao_get_cdr ()->base () ==
+          if (*(CORBA::WChar *)member_label->value () ==
               *(CORBA::WChar *)discrim_val)
             discrim_matched = 1;
           break;
         case CORBA::tk_boolean:
-          if (*(CORBA::Boolean *)member_label->_tao_get_cdr ()->base () ==
+          if (*(CORBA::Boolean *)member_label->value () ==
               *(CORBA::Boolean *)discrim_val)
             discrim_matched = 1;
           break;
         default:
-          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (), 
-                                env, 
-                                CORBA::TypeCode::TRAVERSE_STOP);
+          TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP);
         }// end of switch
 
       // get the member typecode
       member_tc = tc->member_type (i, env);
       // @@EXC@@ Why are we changing the exception thrown here?
-      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
+      // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env,  CORBA::TypeCode::TRAVERSE_STOP);
       TAO_CHECK_ENV_RETURN (env,  CORBA::TypeCode::TRAVERSE_STOP);
 
       if (default_index >= 0 && default_index-- == 0)
@@ -397,51 +399,15 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr  tc,
           default_tc = member_tc;
         }
       if (discrim_matched)
-        {
-          // deep_free the discriminator value
-          retval = DEEP_FREE (discrim_tc, 
-                              discrim_val, 
-                              data2, 
-                              env);
-
-          TAO_CHECK_ENV_RETURN (env, 
-                                CORBA::TypeCode::TRAVERSE_STOP);
-
-          if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-            TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
-                                  env, 
-                                  CORBA::TypeCode::TRAVERSE_STOP);
-
-          // marshal according to the matched typecode
-          // @@EXC@@ No need to check env.
-          return DEEP_FREE (member_tc, 
-                            member_val,
-                            data2, 
-                            env);
-        } // end of if
-    } // end of for
+        // marshal according to the matched typecode
+        // @@EXC@@ No need to check env.
+        return DEEP_FREE (member_tc, data,
+                          data2, env);
+    } // end of while
 
   // we are here only if there was no match
-
-  // deep_free the discriminator value
-  retval = DEEP_FREE (discrim_tc, 
-                      discrim_val, 
-                      data2, 
-                      env);
-
-  TAO_CHECK_ENV_RETURN (env, 
-                        CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), 
-                          env, 
-                          CORBA::TypeCode::TRAVERSE_STOP);
-
   if (default_tc)
-    return DEEP_FREE (default_tc, 
-                      member_val, 
-                      data2, 
-                      env);
+    return DEEP_FREE (default_tc, data, data2, env);
   else
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
@@ -488,10 +454,9 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
 
   if (!tc)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Struct::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   bounds = tc->length (env);
@@ -634,11 +599,10 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Sequence::deep_free detected error\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling TAO_Marshal_Sequence::deep_free detected error"));
       // error exit
-      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (), env, CORBA::TypeCode::TRAVERSE_STOP);
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP);
 }
@@ -656,10 +620,9 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
 
   if (!tc)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Struct::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
 
   // get element type
@@ -737,10 +700,9 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr  tc,
   else
     {
       // We should never reach here.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::decode detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::decode detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
   ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP);
 }
@@ -763,10 +725,9 @@ TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr  tc,
 
   if (!tc)
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::deep_free detected error\n"));
-      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Struct::deep_free detected error"));
+      TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP);
     }
     // XXX: Exceptions are currently leaked because of bugs lurking
     // in this area.  Keep in mind that there are two things to
diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp
index 30e13c81a8b..a77c2bdf2ab 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -64,8 +64,6 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv)
                 this->client_connection_handler_ = MT_CLIENT_CONNECTION_HANDLER;
               else if (ACE_OS::strcasecmp (name, "ST") == 0)
                 this->client_connection_handler_ = ST_CLIENT_CONNECTION_HANDLER;
-              else if (ACE_OS::strcasecmp (name, "RW") == 0)
-                this->client_connection_handler_ = RW_CLIENT_CONNECTION_HANDLER;
             }
         }
     }
@@ -101,76 +99,23 @@ TAO_Default_Client_Strategy_Factory::create_client_creation_strategy (void)
                       TAO_ST_Connect_Creation_Strategy,
                       0);
     }
-  else if (this->client_connection_handler_ == MT_CLIENT_CONNECTION_HANDLER)
+  else
     {
       ACE_NEW_RETURN (client_creation_strategy,
                       TAO_MT_Connect_Creation_Strategy,
                       0);
     }
-  else if (this->client_connection_handler_ == RW_CLIENT_CONNECTION_HANDLER)
-    {
-      ACE_NEW_RETURN (client_creation_strategy,
-                      TAO_RW_Connect_Creation_Strategy,
-                      0);
-    }
 
   return client_creation_strategy;
 }
 
-// ****************************************************************
-
-TAO_ST_Connect_Creation_Strategy::TAO_ST_Connect_Creation_Strategy (ACE_Thread_Manager *t)
-  : ACE_Creation_Strategy<TAO_Client_Connection_Handler> (t)
-{
-}
-
-int
-TAO_ST_Connect_Creation_Strategy::make_svc_handler (TAO_Client_Connection_Handler *&sh)
-{
-  if (sh == 0)
-    ACE_NEW_RETURN (sh, TAO_ST_Client_Connection_Handler (this->thr_mgr_), -1);
-
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_MT_Connect_Creation_Strategy::TAO_MT_Connect_Creation_Strategy (ACE_Thread_Manager *t)
-  : ACE_Creation_Strategy<TAO_Client_Connection_Handler> (t)
-{
-}
-
-int
-TAO_MT_Connect_Creation_Strategy::make_svc_handler (TAO_Client_Connection_Handler *&sh)
-{
-  if (sh == 0)
-    ACE_NEW_RETURN (sh, TAO_MT_Client_Connection_Handler (this->thr_mgr_), -1);
-
-  return 0;
-}
-
-// ****************************************************************
-
-TAO_RW_Connect_Creation_Strategy::TAO_RW_Connect_Creation_Strategy (ACE_Thread_Manager *t)
-  : ACE_Creation_Strategy<TAO_Client_Connection_Handler> (t)
-{
-}
-
-int
-TAO_RW_Connect_Creation_Strategy::make_svc_handler (TAO_Client_Connection_Handler *&sh)
-{
-  if (sh == 0)
-    ACE_NEW_RETURN (sh, TAO_RW_Client_Connection_Handler (this->thr_mgr_), -1);
-
-  return 0;
-}
-
-// ****************************************************************
-
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
 ACE_STATIC_SVC_DEFINE (TAO_Default_Client_Strategy_Factory,
-		       ASYS_TEXT ("Client_Strategy_Factory"),
+		       ASYS_TEXT ("TAO_Default_Client_Strategy_Factory"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_Default_Client_Strategy_Factory),
 		       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
+#endif /* TAO_USES_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
 ACE_FACTORY_DEFINE (TAO, TAO_Default_Client_Strategy_Factory)
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 2aba0ea5b81..eb1b250ba87 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -19,41 +19,6 @@
 
 #include "tao/Client_Strategy_Factory.h"
 
-// ****************************************************************
-
-class TAO_Export TAO_ST_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_ST_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_ST_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_MT_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_MT_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_MT_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
-class TAO_Export TAO_RW_Connect_Creation_Strategy : public ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-{
-public:
-  TAO_RW_Connect_Creation_Strategy (ACE_Thread_Manager * = 0);
-
-  virtual int make_svc_handler (TAO_Client_Connection_Handler *&sh);
-  // Makes TAO_RW_Client_Connection_Handlers
-};
-
-// ****************************************************************
-
 class TAO_Default_Client_Strategy_Factory : public TAO_Client_Strategy_Factory
 {
   // = TITLE
@@ -97,8 +62,7 @@ private:
   enum Client_Connection_Handler_Type
   {
     MT_CLIENT_CONNECTION_HANDLER,
-    ST_CLIENT_CONNECTION_HANDLER,
-    RW_CLIENT_CONNECTION_HANDLER
+    ST_CLIENT_CONNECTION_HANDLER
   };
 
   Client_Connection_Handler_Type client_connection_handler_;
@@ -109,7 +73,10 @@ private:
 # include "tao/default_client.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
 ACE_STATIC_SVC_DECLARE (TAO_Default_Client_Strategy_Factory)
+#endif /* TAO_USE_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
 #endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
deleted file mode 100644
index ab6fff4e357..00000000000
--- a/TAO/tao/default_resource.cpp
+++ /dev/null
@@ -1,655 +0,0 @@
-// $Id$
-
-#include "tao/default_resource.h"
-#include "ace/Select_Reactor.h"
-#include "ace/XtReactor.h"
-#include "ace/FlReactor.h"
-#include "ace/WFMO_Reactor.h"
-#include "ace/Msg_WFMO_Reactor.h"
-#include "ace/Arg_Shifter.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/default_resource.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID(tao, default_resource, "$Id$")
-
-TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
-  : resource_source_ (TAO_GLOBAL),
-    poa_source_ (TAO_GLOBAL),
-    collocation_table_source_ (TAO_GLOBAL),
-    reactor_type_ (TAO_REACTOR_SELECT_MT),
-    cdr_allocator_source_ (TAO_GLOBAL)
-{
-}
-
-TAO_Default_Resource_Factory::~TAO_Default_Resource_Factory (void)
-{
-}
-
-int
-TAO_Default_Resource_Factory::init (int argc, char **argv)
-{
-  ACE_TRACE ("TAO_Default_Server_Strategy_Factory::parse_args");
-  // This table shows the arguments that are parsed with their valid
-  // combinations.
-  //
-  //   ORB      POA    comments
-  // +-------+-------+-----------------+
-  // | TSS   | TSS   | if ORB==TSS     |
-  // |       |       | then POA=TSS    |
-  // |       |       | as def.value.   |
-  // +-------+-------+-----------------+
-  // | TSS   | GLOBAL| ok.             |
-  // +-------+-------+-----------------+
-  // | GLOBAL| GLOBAL| if ORB==Global  |
-  // |       |       | then POA=Global |
-  // |       |       | as def.value.   |
-  // +-------+-------+-----------------+
-  // | GLOBAL| TSS   | *NOT VALID*     |
-  // +-------+-------+-----------------+
-
-  int local_poa_source      = -1;
-  int local_resource_source = -1;
-
-  for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcmp (argv[curarg], "-ORBresources") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              local_resource_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
-              local_resource_source = TAO_TSS;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoa") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              local_poa_source = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
-              local_poa_source = TAO_TSS;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactorlock") == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Default_Resource obsolete -ORBreactorlock "
-                    "option, please use -ORBreactortype\n"));
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "null") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name, "token") == 0)
-              reactor_type_= TAO_REACTOR_SELECT_ST;
-          }
-      }
-
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBreactortype") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "select_mt") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_MT;
-            else if (ACE_OS::strcasecmp (name, "select_st") == 0)
-              reactor_type_ = TAO_REACTOR_SELECT_ST;
-            else if (ACE_OS::strcasecmp (name, "fl_reactor") == 0)
-#if defined(ACE_HAS_FL)
-              reactor_type_ = TAO_REACTOR_FL;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - FlReactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_HAS_FL */
-            else if (ACE_OS::strcasecmp (name, "xt_reactor") == 0)
-#if defined(ACE_HAS_XT)
-              reactor_type_ = TAO_REACTOR_XT;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - XtReactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_HAS_XT */
-            else if (ACE_OS::strcasecmp (name, "WFMO") == 0)
-#if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_WFMO;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - WFMO Reactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_WIN32 */
-            else if (ACE_OS::strcasecmp (name, "MsgWFMO") == 0)
-#if defined(ACE_WIN32)
-              reactor_type_ = TAO_REACTOR_MSGWFMO;
-#else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - MsgWFMO Reactor"
-                          " not supported on this platform\n"));
-#endif /* ACE_WIN32 */
-            else
-              ACE_DEBUG ((LM_DEBUG,
-                          "TAO_Default_Factory - unknown argument"
-                          " <%s> for -ORBreactorytype\n", name));
-          }
-      }
-
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBcoltable") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              collocation_table_source_ = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "orb") == 0)
-              collocation_table_source_ = TAO_TSS;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBinputcdrallocator") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            if (ACE_OS::strcasecmp (name, "global") == 0)
-              this->cdr_allocator_source_ = TAO_GLOBAL;
-            else if (ACE_OS::strcasecmp (name, "tss") == 0)
-              this->cdr_allocator_source_ = TAO_TSS;
-          }
-      }
-
-  // Don't allow a global ORB and a tss POA.
-  if ( (local_resource_source == TAO_GLOBAL) &&
-       (local_poa_source == TAO_TSS) )
-    return -1;
-
-  // make poa=tss the default, if ORB is tss and the user didn't
-  // specify a value.
-  if ( (local_resource_source == TAO_TSS) &&
-       (local_poa_source      == -1) )
-    local_poa_source = TAO_TSS;
-
-  // update the object data members.
-  if (local_resource_source != -1)
-    this->resource_source_ = local_resource_source;
-  if (local_poa_source != -1)
-    this->poa_source_      = local_poa_source;
-
-  // Don't allow a global ORB and a tss POA.
-  if ( (this->resource_source_ == TAO_GLOBAL) &&
-       (this->poa_source_      == TAO_TSS) )
-    return -1;
-
-  return 0;
-}
-
-#define IMPLEMENT_GET_METHOD(methodname,rtype,membername)\
-rtype TAO_Default_Resource_Factory::methodname(void)\
-{\
-  switch (resource_source_)\
-    {\
-    case TAO_GLOBAL:\
-      return &GLOBAL_ALLOCATED::instance ()->membername;\
-    case TAO_TSS:\
-      return &TSS_ALLOCATED::instance ()->membername;\
-    }\
-  return 0;\
-}
-
-IMPLEMENT_GET_METHOD(get_thr_mgr, ACE_Thread_Manager *, tm_)
-IMPLEMENT_GET_METHOD(get_acceptor, TAO_Acceptor *, a_)
-IMPLEMENT_GET_METHOD(get_connector_registry, TAO_Connector_Registry *, cr_)
-IMPLEMENT_GET_METHOD(get_connector, TAO_Connector *, c_)
-IMPLEMENT_GET_METHOD(get_null_creation_strategy, TAO_NULL_CREATION_STRATEGY *, null_creation_strategy_)
-IMPLEMENT_GET_METHOD(get_null_activation_strategy, TAO_NULL_ACTIVATION_STRATEGY *, null_activation_strategy_)
-
-// @@ TODO We may be changing the state of the global
-//    Allocated_Resources structure, but without any locks?
-//    It seems to be done all over the place.
-
-ACE_Reactor_Impl*
-TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
-{
-  ACE_Reactor_Impl *impl = 0;
-  switch (this->reactor_type_)
-    {
-    default:
-    case TAO_REACTOR_SELECT_MT:
-      ACE_NEW_RETURN (impl, TAO_REACTOR, 0);
-      break;
-
-    case TAO_REACTOR_SELECT_ST:
-      ACE_NEW_RETURN (impl, TAO_NULL_LOCK_REACTOR, 0);
-      break;
-
-    case TAO_REACTOR_FL:
-#if defined(ACE_HAS_FL)
-      ACE_NEW_RETURN (impl, ACE_FlReactor, 0);
-#endif /* ACE_HAS_FL */
-      break;
-
-    case TAO_REACTOR_XT:
-#if defined(ACE_HAS_XT)
-      ACE_NEW_RETURN (impl, ACE_XtReactor, 0);
-#endif /* ACE_HAS_FL */
-      break;
-
-    case TAO_REACTOR_WFMO:
-#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE)
-      ACE_NEW_RETURN (impl, ACE_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-      break;
-
-    case TAO_REACTOR_MSGWFMO:
-#if defined(ACE_WIN32)
-      ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0);
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-      break;
-    }
-  return impl;
-}
-
-ACE_Reactor *
-TAO_Default_Resource_Factory::get_reactor (void)
-{
-  switch (this->resource_source_)
-    {
-    case TAO_GLOBAL:
-      if (GLOBAL_ALLOCATED::instance ()->r_ == 0)
-        {
-          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->r_,
-                          ACE_Reactor (this->allocate_reactor_impl (), 1),
-                          0);
-        }
-      return GLOBAL_ALLOCATED::instance ()->r_;
-      ACE_NOTREACHED (break);
-    case TAO_TSS:
-      if (TSS_ALLOCATED::instance ()->r_ == 0)
-        {
-          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->r_,
-                          ACE_Reactor (this->allocate_reactor_impl (), 1),
-                          0);
-        }
-      return TSS_ALLOCATED::instance ()->r_;
-      ACE_NOTREACHED (break);
-    }
-  return 0;
-}
-
-TAO_Object_Adapter *
-TAO_Default_Resource_Factory::object_adapter (void)
-{
-  // @@ Remove this use of ORB_Core_instance() from here!!!!
-  switch (this->resource_source_)
-    {
-    case TAO_GLOBAL:
-      if (GLOBAL_ALLOCATED::instance ()->object_adapter_ == 0)
-        {
-          TAO_ORB_Core &orb_core = *TAO_ORB_Core_instance ();
-          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->object_adapter_,
-                          TAO_Object_Adapter (orb_core.server_factory ()->active_object_map_creation_parameters (), orb_core),
-                          0);
-        }
-      return GLOBAL_ALLOCATED::instance ()->object_adapter_;
-      ACE_NOTREACHED (break);
-    case TAO_TSS:
-      if (TSS_ALLOCATED::instance ()->object_adapter_ == 0)
-        {
-          TAO_ORB_Core &orb_core = *TAO_ORB_Core_instance ();
-          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->object_adapter_,
-                          TAO_Object_Adapter (orb_core.server_factory ()->active_object_map_creation_parameters (), orb_core),
-                          0);
-        }
-      return TSS_ALLOCATED::instance ()->object_adapter_;
-      ACE_NOTREACHED (break);
-    }
-  return 0;
-}
-
-TAO_CACHED_CONNECT_STRATEGY *
-TAO_Default_Resource_Factory::get_cached_connect_strategy (void)
-{
-  // @@ Remove this use of ORB_Core_instance() from here!!!!
-  switch (this->resource_source_)
-    {
-    case TAO_GLOBAL:
-      if (GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_ == 0)
-        {
-          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_,
-                          TAO_CACHED_CONNECT_STRATEGY (TAO_ORB_Core_instance ()->client_factory ()->create_client_creation_strategy ()),
-                          0);
-        }
-      return GLOBAL_ALLOCATED::instance ()->cached_connect_strategy_;
-      ACE_NOTREACHED (break);
-    case TAO_TSS:
-      if (TSS_ALLOCATED::instance ()->cached_connect_strategy_ == 0)
-        {
-          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->cached_connect_strategy_,
-                          TAO_CACHED_CONNECT_STRATEGY (TAO_ORB_Core_instance ()->client_factory ()->create_client_creation_strategy ()),
-                          0);
-        }
-      return TSS_ALLOCATED::instance ()->cached_connect_strategy_;
-      ACE_NOTREACHED (break);
-    }
-  return 0;
-}
-
-TAO_POA *
-TAO_Default_Resource_Factory::get_root_poa (void)
-{
-  switch (poa_source_)
-    {
-    case TAO_GLOBAL:
-      return GLOBAL_ALLOCATED::instance ()->poa_;
-    case TAO_TSS:
-      return TSS_ALLOCATED::instance ()->poa_;
-    }
-  return 0;
-}
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_Null_Mutex> TSS_MALLOC;
-typedef ACE_Allocator_Adapter<TSS_MALLOC> TSS_ALLOCATOR;
-
-typedef ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> GBL_MALLOC;
-typedef ACE_Allocator_Adapter<GBL_MALLOC> GBL_ALLOCATOR;
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
-{
-  switch (this->cdr_allocator_source_)
-    {
-    case TAO_GLOBAL:
-      if (GLOBAL_ALLOCATED::instance ()->input_cdr_dblock_allocator_ == 0)
-        {
-          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->input_cdr_dblock_allocator_,
-                          GBL_ALLOCATOR,
-                          0);
-        }
-      return GLOBAL_ALLOCATED::instance ()->input_cdr_dblock_allocator_;
-      ACE_NOTREACHED (break);
-    case TAO_TSS:
-      if (TSS_ALLOCATED::instance ()->input_cdr_dblock_allocator_ == 0)
-        {
-          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->input_cdr_dblock_allocator_,
-                          TSS_ALLOCATOR,
-                          0);
-        }
-      return TSS_ALLOCATED::instance ()->input_cdr_dblock_allocator_;
-      ACE_NOTREACHED (break);
-    }
-  return 0;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
-{
-  switch (this->cdr_allocator_source_)
-    {
-    case TAO_GLOBAL:
-      if (GLOBAL_ALLOCATED::instance ()->input_cdr_buffer_allocator_ == 0)
-        {
-          ACE_NEW_RETURN (GLOBAL_ALLOCATED::instance ()->input_cdr_buffer_allocator_,
-                          GBL_ALLOCATOR,
-                          0);
-        }
-      return GLOBAL_ALLOCATED::instance ()->input_cdr_buffer_allocator_;
-    case TAO_TSS:
-      if (TSS_ALLOCATED::instance ()->input_cdr_buffer_allocator_ == 0)
-        {
-          ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->input_cdr_buffer_allocator_,
-                          TSS_ALLOCATOR,
-                          0);
-        }
-      return TSS_ALLOCATED::instance ()->input_cdr_buffer_allocator_;
-    }
-  return 0;
-}
-
-ACE_Allocator*
-TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
-{
-  if (TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_ == 0)
-    {
-      ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_,
-                      TSS_ALLOCATOR,
-                      0);
-    }
-  return TSS_ALLOCATED::instance ()->output_cdr_dblock_allocator_;
-}
-
-ACE_Allocator *
-TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
-{
-  if (TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_ == 0)
-    {
-      ACE_NEW_RETURN (TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_,
-                      TSS_ALLOCATOR,
-                      0);
-    }
-  return TSS_ALLOCATED::instance ()->output_cdr_buffer_allocator_;
-}
-
-
-ACE_Data_Block*
-TAO_Default_Resource_Factory::create_input_cdr_data_block (size_t size)
-{
-  switch (this->cdr_allocator_source_)
-    {
-    case TAO_GLOBAL:
-      {
-        ACE_Allocator* buffer_alloc =
-          this->input_cdr_buffer_allocator ();
-        ACE_Allocator* dblock_alloc =
-          this->input_cdr_dblock_allocator ();
-
-        typedef
-          ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-          Global_Data_Block;
-        Global_Data_Block *nb;
-
-        ACE_NEW_MALLOC_RETURN (
-            nb,
-            ACE_static_cast(Global_Data_Block*,
-                            dblock_alloc->malloc (sizeof (Global_Data_Block))),
-            Global_Data_Block (size,
-                               ACE_Message_Block::MB_DATA,
-                               0,
-                               buffer_alloc,
-                               0,
-                               dblock_alloc),
-            0);
-        return nb;
-      }
-
-    case TAO_TSS:
-      {
-        ACE_Allocator* buffer_alloc =
-          this->input_cdr_buffer_allocator ();
-        ACE_Allocator* dblock_alloc =
-          this->input_cdr_dblock_allocator ();
-
-        ACE_Data_Block *nb;
-
-        ACE_NEW_MALLOC_RETURN (
-            nb,
-            ACE_static_cast(ACE_Data_Block*,
-                            dblock_alloc->malloc (sizeof (ACE_Data_Block))),
-            ACE_Data_Block (size,
-                            ACE_Message_Block::MB_DATA,
-                            0,
-                            buffer_alloc,
-                            0,
-                            0,
-                            dblock_alloc),
-            0);
-        return nb;
-      }
-    }
-  return 0;
-}
-
-TAO_GLOBAL_Collocation_Table *
-TAO_Default_Resource_Factory::get_global_collocation_table (void)
-{
-  return (collocation_table_source_ == TAO_GLOBAL ? GLOBAL_Collocation_Table::instance () : 0);
-}
-
-// ****************************************************************
-
-TAO_Allocated_Resources::TAO_Allocated_Resources (void)
-  : r_ (0),
-    object_adapter_ (0),
-    cached_connect_strategy_ (0),
-    poa_(0),
-    input_cdr_dblock_allocator_ (0),
-    input_cdr_buffer_allocator_ (0),
-    output_cdr_dblock_allocator_ (0),
-    output_cdr_buffer_allocator_ (0)
-{
-  // Make sure that the thread manager does not wait for threads
-  this->tm_.wait_on_exit (0);
-}
-
-TAO_Allocated_Resources::~TAO_Allocated_Resources (void)
-{
-  if (this->input_cdr_dblock_allocator_ != 0)
-    this->input_cdr_dblock_allocator_->remove ();
-  delete this->input_cdr_dblock_allocator_;
-
-  if (this->input_cdr_buffer_allocator_ != 0)
-    this->input_cdr_buffer_allocator_->remove ();
-  delete this->input_cdr_buffer_allocator_;
-
-  if (this->output_cdr_dblock_allocator_ != 0)
-    this->output_cdr_dblock_allocator_->remove ();
-  delete this->output_cdr_dblock_allocator_;
-
-  if (this->output_cdr_buffer_allocator_ != 0)
-    this->output_cdr_buffer_allocator_->remove ();
-  delete this->output_cdr_buffer_allocator_;
-
-  if (this->cached_connect_strategy_ != 0)
-    {
-      // Zap the creation strategy that we created earlier
-      delete this->cached_connect_strategy_->creation_strategy ();
-      delete this->cached_connect_strategy_;
-    }
-
-  delete this->object_adapter_;
-
-  this->c_.close ();
-
-  delete this->r_;
-}
-
-// ****************************************************************
-
-TAO_Collocation_Table_Lock::TAO_Collocation_Table_Lock (void)
-{
-  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_collocation_table_lock ();
-  // We don't need to worry about the race condition here because this
-  // is called from within the ctor of Hash_Map_Manager which is
-  // placed inside a ACE_Singleton.
-}
-
-TAO_Collocation_Table_Lock::~TAO_Collocation_Table_Lock (void)
-{
-  delete this->lock_;
-  this->lock_ = 0;
-}
-
-// ****************************************************************
-
-TAO_Cached_Connector_Lock::TAO_Cached_Connector_Lock (void)
-{
-  this->lock_ = TAO_ORB_Core_instance ()->server_factory ()->create_cached_connector_lock ();
-}
-
-TAO_Cached_Connector_Lock::~TAO_Cached_Connector_Lock (void)
-{
-  delete this->lock_;
-  this->lock_ = 0;
-}
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_Default_Resource_Factory,
-                       ASYS_TEXT ("Resource_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_Default_Resource_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO, TAO_Default_Resource_Factory)
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>;
-template class ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >;
-template class ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >;
-
-template class ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>;
-template class ACE_Creation_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-template class ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-template class ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Recycling_Strategy<TAO_Client_Connection_Handler>;
-template class ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>;
-
-template class ACE_Node<TAO_Client_Connection_Handler *>;
-
-template class ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>;
-template class ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>;
-template class ACE_TSS<TAO_Allocated_Resources>;
-
-template class ACE_Select_Reactor_Token_T<ACE_Noop_Token>;
-template class ACE_Lock_Adapter<ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-template class ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Allocator_Adapter<ACE_Malloc<ACE_LOCAL_MEMORY_POOL,ACE_SYNCH_MUTEX> >
-#pragma instantiate ACE_Locked_Data_Block<ACE_Lock_Adapter<ACE_SYNCH_MUTEX> >
-
-#pragma instantiate ACE_Strategy_Acceptor<TAO_Server_Connection_Handler, TAO_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Creation_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Connect_Strategy<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-#pragma instantiate ACE_Strategy_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-#pragma instantiate ACE_NOOP_Creation_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Concurrency_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Recycling_Strategy<TAO_Client_Connection_Handler>
-#pragma instantiate ACE_Connector<TAO_Client_Connection_Handler, TAO_SOCK_CONNECTOR>
-
-#pragma instantiate ACE_Node<TAO_Client_Connection_Handler *>
-
-#pragma instantiate ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_TSS<TAO_Allocated_Resources>
-
-#pragma instantiate ACE_Select_Reactor_Token_T<ACE_Noop_Token>
-#pragma instantiate ACE_Lock_Adapter< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-#pragma instantiate ACE_Select_Reactor_T< ACE_Select_Reactor_Token_T<ACE_Noop_Token> >
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
deleted file mode 100644
index 4c1abc6afa0..00000000000
--- a/TAO/tao/default_resource.h
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   default_resource.h
-//
-// = AUTHOR
-//   Chris Cleeland
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_DEFAULT_RESOURCE_H
-#define TAO_DEFAULT_RESOURCE_H
-
-#include "ace/Strategies_T.h"
-#include "ace/Singleton.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Resource_Factory.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/POA.h"
-
-// ****************************************************************
-
-class TAO_Export TAO_Allocated_Resources
-{
-  // = TITLE
-  //   Container for the resources allocated by the factory.
-  //
-  // = DESCRIPTION
-  //
-public:
-  TAO_Allocated_Resources (void);
-  // Constructor necessary because we have pointers.  It's inlined
-  // here rather than in the .i file because it's easier than trying
-  // to re-order header files in corba.h to eliminate the "used
-  // before declared inline" warnings/errors on certain compilers.
-
-  ~TAO_Allocated_Resources (void);
-  // Destructor is also necessary because we now allocate some of
-  // the objects held here.
-
-  // = Resources
-
-  ACE_Thread_Manager tm_;
-  // The Thread Manager
-
-  TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
-  // This no-op creation strategy is necessary for using the
-  // <Strategy_Connector> with the <Cached_Connect_Strategy>.
-
-  TAO_NULL_ACTIVATION_STRATEGY null_activation_strategy_;
-  // This no-op activation strategy prevents the cached connector from
-  // calling the service handler's <open> method multiple times.
-
-  TAO_IIOP_Acceptor a_;
-  // The Acceptor
-
-  TAO_IIOP_Connector c_;
-  // The Connector, HACK to create the first connector which happens
-  // to be IIOP.
-
-  TAO_Connector_Registry cr_;
-  // The Connector Registry!
-
-  ACE_Reactor *r_;
-  // The Reactor.
-
-  TAO_Object_Adapter *object_adapter_;
-  // Object Adapter.
-
-  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
-  // The Cached Connect Strategy
-
-  TAO_POA *poa_;
-  // Pointer to application-created POA.
-
-  ACE_Allocator *input_cdr_dblock_allocator_;
-  ACE_Allocator *input_cdr_buffer_allocator_;
-  // The allocators for the input CDR streams.
-
-  ACE_Allocator *output_cdr_dblock_allocator_;
-  ACE_Allocator *output_cdr_buffer_allocator_;
-  // The allocators for the output CDR streams.
-};
-
-// ****************************************************************
-
-class TAO_Default_Resource_Factory : public TAO_Resource_Factory
-{
-  // = TITLE
-  //   TAO's default resource factory
-  //
-  // = DESCRIPTION
-  //   Using a <{resource source specifier}> as a discriminator, the
-  //   factory can return resource instances which are, e.g., global,
-  //   stored in thread-specific storage, stored in shared memory,
-  //   etc.
-  //
-public:
-  // = Initialization and termination methods.
-  TAO_Default_Resource_Factory (void);
-  // Constructor.
-
-  virtual ~TAO_Default_Resource_Factory (void);
-  // Destructor.
-
-  // = Service Configurator hooks.
-  virtual int init (int argc, char* argv[]);
-  // Dynamic linking hook
-
-  int parse_args (int argc, char* argv[]);
-  // Parse svc.conf arguments
-
-  // = Member Accessors
-  enum
-  {
-    TAO_GLOBAL,
-    TAO_TSS
-  };
-
-  // = Type of Reactor
-  enum
-  {
-    TAO_REACTOR_SELECT_MT, // Use ACE_Token
-    TAO_REACTOR_SELECT_ST, // Use ACE_Noop_Token
-    TAO_REACTOR_FL,
-    TAO_REACTOR_XT,
-    TAO_REACTOR_WFMO,
-    TAO_REACTOR_MSGWFMO
-  };
-
-  // = Range of values for <{resource source specifier}>.
-  virtual void resource_source (int which_source);
-  // Set the resource source specifier.
-  virtual int resource_source (void);
-  // Get the resource source specifier.
-
-  virtual void poa_source (int which_source);
-  // Set the POA source specifier.
-  virtual int poa_source (void);
-  // Get the POA source specifier.
-
-  int cdr_allocator_source (void);
-  // Modify and get the source for the CDR allocators
-
-  // = Resource Retrieval
-  virtual ACE_Reactor *get_reactor (void);
-  virtual ACE_Thread_Manager *get_thr_mgr (void);
-  virtual TAO_Connector *get_connector (void);
-  virtual TAO_Connector_Registry *get_connector_registry (void);
-  virtual TAO_CACHED_CONNECT_STRATEGY *get_cached_connect_strategy (void);
-  virtual TAO_NULL_CREATION_STRATEGY *get_null_creation_strategy (void);
-  virtual TAO_NULL_ACTIVATION_STRATEGY *get_null_activation_strategy (void);
-  virtual TAO_Acceptor *get_acceptor (void);
-  virtual TAO_POA *get_root_poa (void);
-  virtual TAO_Object_Adapter *object_adapter (void);
-  virtual TAO_GLOBAL_Collocation_Table *get_global_collocation_table (void);
-  virtual ACE_Allocator* input_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* input_cdr_buffer_allocator (void);
-  virtual ACE_Allocator* output_cdr_dblock_allocator (void);
-  virtual ACE_Allocator* output_cdr_buffer_allocator (void);
-  virtual ACE_Data_Block *create_input_cdr_data_block (size_t size);
-
-protected:
-  ACE_Reactor_Impl *allocate_reactor_impl (void) const;
-  // Obtain the reactor implementation
-
-protected:
-
-  int resource_source_;
-  // Flag indicating whether resources should be global or
-  // thread-specific.
-
-  int poa_source_;
-  // Flag indicating whether the POA should be global or
-  // thread-specific.  If not set specifically, this takes on the
-  // value of <resource_source_>.
-
-  int collocation_table_source_;
-  // Flag indicating whether the collocation table should be global
-  // thread-specific.  It defaults to TAO_GLOBAL if not set
-  // specifically.
-
-  int reactor_type_;
-  // Flag indicating which kind of reactor we should use.
-
-  int cdr_allocator_source_;
-  // The source for the CDR allocator. Even with a TSS resource
-  // factory the user may be interested in global allocators for the
-  // CDR streams, for instance to keep the buffers around after the
-  // upcall and/or pass them to another thread.
-
-  // = Typedefs for the singleton types used to store our orb core
-  // information.
-  typedef ACE_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
-          GLOBAL_ALLOCATED;
-  typedef ACE_TSS_Singleton<TAO_Allocated_Resources, ACE_SYNCH_MUTEX>
-          TSS_ALLOCATED;
-
-  typedef ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
-          GLOBAL_Collocation_Table;
-};
-
-#if defined (__ACE_INLINE__)
-#include "tao/default_resource.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_STATIC_SVC_DECLARE (TAO_Default_Resource_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
-
-#endif /* TAO_DEFAULT_CLIENT_H */
diff --git a/TAO/tao/default_resource.i b/TAO/tao/default_resource.i
deleted file mode 100644
index 1567935345f..00000000000
--- a/TAO/tao/default_resource.i
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-ACE_INLINE void
-TAO_Default_Resource_Factory::resource_source (int which_source)
-{
-  resource_source_ = which_source;
-}
-
-ACE_INLINE int
-TAO_Default_Resource_Factory::resource_source (void)
-{
-  return resource_source_;
-}
-
-ACE_INLINE void
-TAO_Default_Resource_Factory::poa_source (int which_source)
-{
-  poa_source_ = which_source;
-}
-
-ACE_INLINE int
-TAO_Default_Resource_Factory::poa_source (void)
-{
-  return poa_source_;
-}
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index c1a76f1b9e4..642dd9405dd 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -11,6 +11,10 @@ ACE_RCSID(tao, default_server, "$Id$")
 
 TAO_Default_Server_Strategy_Factory::TAO_Default_Server_Strategy_Factory (void)
   : thread_flags_ (THR_BOUND),
+    active_object_map_size_ (TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE),
+    object_lookup_strategy_for_user_id_policy_ (TAO_DYNAMIC_HASH),
+    object_lookup_strategy_for_system_id_policy_ (TAO_ACTIVE_DEMUX),
+    reverse_object_lookup_strategy_for_unique_id_policy_ (TAO_DYNAMIC_HASH),
     poa_lock_type_ (TAO_THREAD_LOCK),
     poa_mgr_lock_type_ (TAO_THREAD_LOCK),
     event_loop_lock_type_ (TAO_NULL_LOCK),
@@ -45,17 +49,53 @@ TAO_Default_Server_Strategy_Factory::concurrency_strategy (void)
     return this->concurrency_strategy_;
 }
 
-int
-TAO_Default_Server_Strategy_Factory::enable_poa_locking (void)
+ACE_Lock *
+TAO_Default_Server_Strategy_Factory::create_poa_lock (void)
 {
+  ACE_Lock *the_lock = 0;
+
   switch (this->poa_lock_type_)
     {
-    case TAO_NULL_LOCK:
-      return 0;
     case TAO_THREAD_LOCK:
+#if defined (ACE_HAS_THREADS)
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> (),
+                      0);
+      break;
+#endif /* ACE_HAS_THREADS */
     default:
-      return 1;
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
+                      0);
+      break;
     }
+
+  return the_lock;// Just to make sure we return something
+}
+
+ACE_Lock *
+TAO_Default_Server_Strategy_Factory::create_poa_mgr_lock (void)
+{
+  ACE_Lock *the_lock = 0;
+
+  switch (this->poa_mgr_lock_type_)
+    {
+    case TAO_THREAD_LOCK:
+#if defined (ACE_HAS_THREADS)
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Thread_Mutex> (),
+                      0);
+      break;
+#endif /* ACE_HAS_THREADS */
+    default:
+      ACE_NEW_RETURN (the_lock,
+                      ACE_Lock_Adapter<ACE_Null_Mutex> (),
+                      0);
+      break;
+    }
+
+  // Just to make sure we return something.
+  return the_lock;
 }
 
 ACE_Lock *
@@ -129,6 +169,105 @@ TAO_Default_Server_Strategy_Factory::create_cached_connector_lock (void)
   return the_lock;
 }
 
+TAO_Active_Object_Map_Impl *
+TAO_Default_Server_Strategy_Factory::create_active_object_map (int user_id_policy)
+{
+  if (user_id_policy)
+    return this->create_user_id_policy_active_object_map ();
+  else
+    return this->create_system_id_policy_active_object_map ();
+}
+
+TAO_Active_Object_Map_Impl *
+TAO_Default_Server_Strategy_Factory::create_user_id_policy_active_object_map (void)
+{
+  return this->create_active_object_map_i (this->object_lookup_strategy_for_user_id_policy_, 1);
+}
+
+TAO_Active_Object_Map_Impl *
+TAO_Default_Server_Strategy_Factory::create_system_id_policy_active_object_map (void)
+{
+  return this->create_active_object_map_i (this->object_lookup_strategy_for_system_id_policy_, 0);
+}
+
+TAO_Active_Object_Map_Impl *
+TAO_Default_Server_Strategy_Factory::create_active_object_map_i (TAO_Demux_Strategy table_type,
+                                                                 int user_id_policy)
+{
+  // Create the appropriate-sized object table based on passed
+  // arguments.
+  TAO_Active_Object_Map_Impl *objtable = 0;
+
+  switch (table_type)
+    {
+    case TAO_LINEAR:
+      ACE_NEW_RETURN (objtable,
+                      TAO_Linear_Active_Object_Map (this->active_object_map_size_),
+                      0);
+      break;
+      // Don't do this one right now until we determine how to deal
+      // with its reliance on a global singleton.
+    case TAO_USER_DEFINED:
+      // it is assumed that the user would have used the hooks to
+      // supply a user-defined instance of the object table
+      //
+      // Note that the usage below doesn't really fit very well now.
+      // We need for the userdef stuff to provide a creation hook--IF
+      // we decide to keep the whole demultiplexing strategy creation
+      // the way it is.  IMHO, the way that userdef stuff should be
+      // done is to create the User_Server_Strategy_Factory and just
+      // link it in.  The default server would only encompass the
+      // strategies that are "shipped", so to speak. --cjc
+      if (user_id_policy)
+        objtable = TAO_ORB_Core_instance()->oa_params()->userdef_lookup_strategy_for_user_id_policy ();
+      else
+        objtable = TAO_ORB_Core_instance()->oa_params()->userdef_lookup_strategy_for_system_id_policy ();
+      break;
+    case TAO_ACTIVE_DEMUX:
+      ACE_NEW_RETURN (objtable,
+                      TAO_Active_Demux_Active_Object_Map (this->active_object_map_size_),
+                      0);
+      break;
+    case TAO_DYNAMIC_HASH:
+      ACE_NEW_RETURN (objtable,
+                      TAO_Dynamic_Hash_Active_Object_Map (this->active_object_map_size_),
+                      0);
+      break;
+    }
+
+  return objtable;
+}
+
+TAO_Reverse_Active_Object_Map_Impl *
+TAO_Default_Server_Strategy_Factory::create_reverse_active_object_map (int unique_id_policy)
+{
+  // Create the appropriate-sized object table based on passed
+  // arguments.
+  TAO_Reverse_Active_Object_Map_Impl *objtable = 0;
+
+  if (unique_id_policy)
+    {
+      if (this->reverse_object_lookup_strategy_for_unique_id_policy_ == TAO_USER_DEFINED)
+        {
+          objtable = TAO_ORB_Core_instance ()->oa_params ()->userdef_reverse_lookup_strategy_for_unique_id_policy ();
+        }
+      else
+        {
+          ACE_NEW_RETURN (objtable,
+                          TAO_Reverse_Active_Object_Map_For_Unique_Id_Policy (this->active_object_map_size_),
+                          0);
+        }
+    }
+  else
+    {
+      ACE_NEW_RETURN (objtable,
+                      TAO_Reverse_Active_Object_Map_For_Multiple_Id_Policy (),
+                      0);
+    }
+
+  return objtable;
+}
+
 // Evil macros b/c I'm lazy!
 #define TAO_BEGINCHECK  if (0)
 #define TAO_CHECKANDSET(sym) else if (ACE_OS::strcmp (flag, #sym) == 0) ACE_SET_BITS (this->thread_flags_, sym)
@@ -162,8 +301,10 @@ TAO_Default_Server_Strategy_Factory::init (int argc, char *argv[])
 }
 
 int
-TAO_Default_Server_Strategy_Factory::open (TAO_ORB_Core* orb_core)
+TAO_Default_Server_Strategy_Factory::open (void)
 {
+  TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
+
   if (reactive_strategy_.open (orb_core->reactor ()) == 0
       && threaded_strategy_.open (orb_core->thr_mgr (),
                                   this->thread_flags_) == 0)
@@ -193,48 +334,11 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
               this->concurrency_strategy_ = &threaded_strategy_;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0 ||
-             ACE_OS::strcmp (argv[curarg], "-ORBactiveobjectmapsize") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.active_object_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoamapsize") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          this->active_object_map_creation_parameters_.poa_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinids") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBtablesize") == 0)
       {
         curarg++;
         if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_ids_ = ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBactivehintinpoanames") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.use_active_hint_in_poa_names_ = ACE_OS::atoi (value);
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBallowreactivationofsystemids") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *value = argv[curarg];
-
-            this->active_object_map_creation_parameters_.allow_reactivation_of_system_ids_ = ACE_OS::atoi (value);
-          }
+          this->active_object_map_size_ = ACE_OS::strtoul (argv[curarg], 0, 10);
       }
     else if (ACE_OS::strcmp (argv[curarg], "-ORBuseridpolicydemuxstrategy") == 0)
       {
@@ -245,9 +349,11 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
 
             // Active demux not supported with user id policy
             if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_DYNAMIC_HASH;
+              this->object_lookup_strategy_for_user_id_policy_ = TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_user_id_policy_ = TAO_LINEAR;
+              this->object_lookup_strategy_for_user_id_policy_ = TAO_LINEAR;
+            else if (ACE_OS::strcasecmp (name, "user") == 0)
+              this->object_lookup_strategy_for_user_id_policy_ = TAO_USER_DEFINED;
           }
       }
     else if (ACE_OS::strcmp (argv[curarg], "-ORBsystemidpolicydemuxstrategy") == 0)
@@ -258,28 +364,16 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_DYNAMIC_HASH;
+              this->object_lookup_strategy_for_system_id_policy_ = TAO_DYNAMIC_HASH;
             else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_LINEAR;
+              this->object_lookup_strategy_for_system_id_policy_ = TAO_LINEAR;
             else if (ACE_OS::strcasecmp (name, "active") == 0)
-              this->active_object_map_creation_parameters_.object_lookup_strategy_for_system_id_policy_ = TAO_ACTIVE_DEMUX;
+              this->object_lookup_strategy_for_system_id_policy_ = TAO_ACTIVE_DEMUX;
+            else if (ACE_OS::strcasecmp (name, "user") == 0)
+              this->object_lookup_strategy_for_system_id_policy_ = TAO_USER_DEFINED;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpersistentidpolicydemuxstrategy") == 0)
-      {
-        curarg++;
-        if (curarg < argc)
-          {
-            char *name = argv[curarg];
-
-            // Active demux not supported with user id policy
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_persistent_id_policy_ = TAO_LINEAR;
-          }
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBtransientidpolicydemuxstrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBuniqueidpolicyreversedemuxstrategy") == 0)
       {
         curarg++;
         if (curarg < argc)
@@ -287,34 +381,25 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_LINEAR;
-            else if (ACE_OS::strcasecmp (name, "active") == 0)
-              this->active_object_map_creation_parameters_.poa_lookup_strategy_for_transient_id_policy_ = TAO_ACTIVE_DEMUX;
+              this->reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_DYNAMIC_HASH;
+            else if (ACE_OS::strcasecmp (name, "user") == 0)
+              this->reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_USER_DEFINED;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBuniqueidpolicyreversedemuxstrategy") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoalock") == 0)
       {
         curarg++;
         if (curarg < argc)
           {
             char *name = argv[curarg];
 
-            if (ACE_OS::strcasecmp (name, "dynamic") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_DYNAMIC_HASH;
-            else if (ACE_OS::strcasecmp (name, "linear") == 0)
-              this->active_object_map_creation_parameters_.reverse_object_lookup_strategy_for_unique_id_policy_ = TAO_LINEAR;
+            if (ACE_OS::strcasecmp (name, "thread") == 0)
+              this->poa_lock_type_ = TAO_THREAD_LOCK;
+            else if (ACE_OS::strcasecmp (name, "null") == 0)
+              this->poa_lock_type_ = TAO_NULL_LOCK;
           }
       }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBdemuxstrategy") == 0)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "Warning: -ORBdemuxstrategy is deprecated.  Please use "
-                    "-ORBsystemidpolicydemuxstrategy or -ORBuseridpolicydemuxstrategy instead.\n"));
-        curarg++;
-      }
-    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoalock") == 0)
+    else if (ACE_OS::strcmp (argv[curarg], "-ORBpoamgrlock") == 0)
       {
         curarg++;
         if (curarg < argc)
@@ -322,9 +407,9 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
             char *name = argv[curarg];
 
             if (ACE_OS::strcasecmp (name, "thread") == 0)
-              this->poa_lock_type_ = TAO_THREAD_LOCK;
+              this->poa_mgr_lock_type_ = TAO_THREAD_LOCK;
             else if (ACE_OS::strcasecmp (name, "null") == 0)
-              this->poa_lock_type_ = TAO_NULL_LOCK;
+              this->poa_mgr_lock_type_ = TAO_NULL_LOCK;
           }
       }
     else if (ACE_OS::strcmp (argv[curarg], "-ORBeventlock") == 0)
@@ -377,13 +462,21 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[])
   return 0;
 }
 
-TAO_Default_Server_Creation_Strategy::TAO_Default_Server_Creation_Strategy (ACE_Thread_Manager *t)
+u_long
+TAO_Default_Server_Strategy_Factory::active_object_map_size (void) const
+{
+  return this->active_object_map_size_;
+}
+
+TAO_Default_Server_Creation_Strategy::
+TAO_Default_Server_Creation_Strategy (ACE_Thread_Manager *t)
   :  ACE_Creation_Strategy<TAO_Server_Connection_Handler> (t)
 {
 }
 
 int
-TAO_Default_Server_Creation_Strategy::make_svc_handler (TAO_Server_Connection_Handler *&sh)
+TAO_Default_Server_Creation_Strategy::
+make_svc_handler (TAO_Server_Connection_Handler *&sh)
 {
   if (sh == 0)
     {
@@ -409,10 +502,13 @@ template class ACE_Thread_Strategy<TAO_Server_Connection_Handler>;
 #pragma instantiate ACE_Thread_Strategy<TAO_Server_Connection_Handler>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
 ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory,
-		       ASYS_TEXT ("Server_Strategy_Factory"),
+		       ASYS_TEXT ("TAO_Default_Server_Strategy_Factory"),
                        ACE_SVC_OBJ_T,
                        &ACE_SVC_NAME (TAO_Default_Server_Strategy_Factory),
 		       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
+#endif /* TAO_USES_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
 ACE_FACTORY_DEFINE (TAO, TAO_Default_Server_Strategy_Factory)
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 46fddd5e65b..01cad8eac2f 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -43,7 +43,7 @@ public:
   TAO_Default_Server_Strategy_Factory (void);
   virtual ~TAO_Default_Server_Strategy_Factory (void);
 
-  virtual int open (TAO_ORB_Core*);
+  virtual int open (void);
   // Call <open> for our strategies.
 
   // = Server-side ORB Strategy Factory Methods.
@@ -52,8 +52,27 @@ public:
 
   virtual CONCURRENCY_STRATEGY *concurrency_strategy (void);
 
-  virtual int enable_poa_locking (void);
-  // Enable POA locking?
+  virtual TAO_Active_Object_Map_Impl *create_active_object_map (int user_id_policy);
+  // Return a new id-->sevant table.  If <user_id_policy> is true, the
+  // request is being made for a POA with USER_ID policy. Otherwise,
+  // the SYSTEM_ID policy is being used.
+
+  virtual TAO_Reverse_Active_Object_Map_Impl *create_reverse_active_object_map (int unique_id_policy);
+  // Return a new servant-->id table.  If <unique_id_policy> is true,
+  // the request is being made for a POA with UNIQUE_ID
+  // policy. Otherwise, the MULTIPLE_ID policy is being used.
+
+  virtual ACE_Lock *create_poa_lock (void);
+  // Creates and returns a lock for POA based on the setting for
+  // <-ORBpoalock>.  A setting of <thread> returns an
+  // <ACE_Lock_Adapter\<ACE_Thread_Mutex\>>; a setting of <null>
+  // returns an <ACE_Lock_Adapter\<ACE_NULL_Mutex\>>.
+
+  virtual ACE_Lock *create_poa_mgr_lock (void);
+  // Creates and returns a lock for a POA Manager based on the setting
+  // for <-ORBpoamgrlock>.  A setting of <thread> returns an
+  // <ACE_Lock_Adapter\<ACE_Thread_Mutex\>>; a setting of <null>
+  // returns an <ACE_Lock_Adapter\<ACE_NULL_Mutex\>>.
 
   virtual ACE_Lock *create_servant_lock (void);
   // Creates and returns a lock for servants based on the setting of
@@ -86,6 +105,9 @@ public:
   virtual int init (int argc, char *argv[]);
   // Initialize the ORB when it's linked dynamically.
 
+  virtual u_long active_object_map_size (void) const;
+  // Return the object table size
+
   int parse_args (int argc, char *argv[]);
   // Arguments are in the form of -ORBxxx.  Valid arguments are:
   // <-ORBconcurrency> <{which}>
@@ -104,9 +126,30 @@ public:
 protected:
   void tokenize (char *flag_string);
 
+  // = Helpers for <create_active_object_map>
+  TAO_Active_Object_Map_Impl *create_user_id_policy_active_object_map (void);
+  TAO_Active_Object_Map_Impl *create_system_id_policy_active_object_map (void);
+  TAO_Active_Object_Map_Impl *create_active_object_map_i (TAO_Demux_Strategy table_type,
+                                                          int user_id_policy);
+
   u_long thread_flags_;
   // Default thread flags passed to thr_create().
 
+  u_long active_object_map_size_;
+  // Default size of object lookup table.
+
+  TAO_Demux_Strategy object_lookup_strategy_for_user_id_policy_;
+  // The type of lookup/demultiplexing strategy being used for user id
+  // policy
+
+  TAO_Demux_Strategy object_lookup_strategy_for_system_id_policy_;
+  // The type of lookup/demultiplexing strategy being used for system
+  // id policy
+
+  TAO_Demux_Strategy reverse_object_lookup_strategy_for_unique_id_policy_;
+  // The type of reverse lookup/demultiplexing strategy being used for
+  // the UNIQUE_ID policy
+
   enum Lock_Type
   {
     TAO_NULL_LOCK,
@@ -158,7 +201,10 @@ protected:
 # include "tao/default_server.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (TAO_USES_STATIC_SERVICE) || defined (TAO_PLATFORM_SVC_CONF_FILE_NOTSUP)
 ACE_STATIC_SVC_DECLARE (TAO_Default_Server_Strategy_Factory)
+#endif /* TAO_USE_STATIC_SERVICE || TAO_PLATFORM_SVC_CONF_FILE_NOTSUP */
+
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
 #endif /* TAO_DEFAULT_SERVER_FACTORY_H */
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index ac3a0892cd3..4bf85a06f83 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -31,7 +31,6 @@
 #include "tao/Principal.h"
 #include "tao/varout.h"
 #include "tao/Union.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, encode, "$Id$")
 
@@ -96,10 +95,9 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -146,10 +144,9 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Any::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Any::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -187,9 +184,8 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
           // Indirected typecodes can't occur at "top level" like
           // this, only nested inside others!
         case ~0u:
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "indirected typecode at top level!\n"));
+          ACE_DEBUG ((LM_DEBUG,
+                      "indirected typecode at top level!"));
           continue_encoding = 0;
           break;
 
@@ -216,10 +212,9 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -232,16 +227,30 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr,
                                void *context,
                                CORBA::Environment &env)
 {
+  CORBA::Boolean continue_encoding = 1;
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
   CORBA::Principal_ptr p = *(CORBA::Principal_ptr *) data;
 
-  if ((*stream << p) == 0)
+  if (p != 0)
+    {
+      continue_encoding = stream->write_long (p->id.length ());
+
+      continue_encoding = continue_encoding &&
+        stream->write_octet_array (p->id.get_buffer (),
+                                   p->id.length ());
+    }
+  else
+    continue_encoding = stream->write_long (0);
+  if (continue_encoding == 1)
+    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+  else
     {
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Principal::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // encode obj ref
@@ -254,21 +263,57 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
-  // Current version:  objref is really an TAO_Stub.
+  // Current version:  objref is really an STUB_Object.
   // @@ But, it need not be.  All IIOP specific processing has
   //    been move to the specific transport profile class!
   //
   // XXX this doesn't actually verify that the stuff got written
   // OK to the "wire" ...
-  // @@ Seems to break here!
-  CORBA::Object_ptr obj = *(CORBA::Object_ptr *) data;
+  CORBA::Object_ptr obj = *(CORBA::Object_ptr*) data;
+
+  // NIL objrefs ... marshal as empty type hint, no elements.
 
-  if ((*stream << obj) == 0)
+  if (CORBA::is_nil (obj))
     {
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-      return CORBA::TypeCode::TRAVERSE_STOP;
+      // encode an empty type_id i.e., an empty string
+      stream->write_ulong (1);
+      stream->write_char (0);
+
+      // Number of profiles = 0
+      stream->write_ulong (0);
+
+      return CORBA::TypeCode::TRAVERSE_CONTINUE;
+    }
+  else
+    {
+
+      // All other objrefs ... narrow to a "real type" that we
+      // recognize, then marshal.
+      //
+      // XXX this will be changed so it narrows to STUB_Object and
+      // then asks that surrogate/proxy to marshal itself.
+      //
+      // For now, the original code is minimally changed.
+      // @@ Need to pass this stuff of to IIOP_Profile and let it
+      //    marshal it's own self.  This will be make_body
+
+      // @@ FRED: we will only encode he profile_in_use!!
+      // @@ need to add support for multiple profiles.  Move this part
+      // @@ to MProfile!!
+
+      STUB_Object *stubobj = obj->_stubobj ();
+
+      // STRING, a type ID hint
+      stream->encode (CORBA::_tc_string, &stubobj->type_id, 0, env);
+
+      // UNSIGNED LONG, value one, count of the sequence of
+      // encapsulated protocol profiles;
+      stream->write_ulong (1);
+
+      stubobj->profile_in_use ()->encode (stream, env);
+
+      return CORBA::TypeCode::TRAVERSE_CONTINUE;
     }
-  return CORBA::TypeCode::TRAVERSE_CONTINUE;
 }
 
 // encode structs
@@ -364,13 +409,39 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
 
                         case CORBA::tk_objref:
                           {
-                            // we know that the object pointer is stored in a
-                            // TAO_Object_Field_T parametrized type
-                            TAO_Object_Field_T<CORBA_Object>* field =
-                              ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                                    ACE_const_cast (void *, data));
-                            CORBA::Object_ptr ptr = field->_upcast ();
-                            retval = stream->encode (param, &ptr, 0, env);
+			    // The representation of a base
+			    // CORBA::Object is a little different.
+			    // @@ TODO maybe equivalent() is the right
+			    // method here.
+			    CORBA::Boolean is_corba_object =
+			      param->equal (CORBA::_tc_Object, env);
+			    if (env.exception () == 0)
+			      {
+				CORBA_Object_ptr ptr = 0;
+				if (is_corba_object == 0)
+				  {
+				    TAO_Object_Field* field =
+				      ACE_reinterpret_cast (TAO_Object_Field *,
+							    ACE_const_cast (void *, data));
+				    ptr = field->_upcast ();
+				    // The size of this field is different...
+				    size =
+				      sizeof(TAO_Object_Field_T<CORBA_Object>);
+				  }
+				else
+				  {
+				    CORBA_Object_ptr* tmp =
+				      ACE_reinterpret_cast(CORBA::Object_ptr*,
+							   ACE_const_cast(void*,
+									  data));
+				    ptr = *tmp;
+				  }
+				retval = stream->encode (param, &ptr, 0, env);
+			      }
+			    else
+			      {
+				retval = CORBA::TypeCode::TRAVERSE_STOP;
+			      }
                           }
                           break;
 
@@ -397,10 +468,9 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling encode_struct detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -411,205 +481,220 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc,
                            const void *data,
                            const void *data2,
                            void *context,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   TAO_OutputCDR *stream = (TAO_OutputCDR *) context;
 
-  CORBA::TypeCode_ptr discrim_tc =
-    tc->discriminator_type (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
+  CORBA::TypeCode_ptr discrim_tc = tc->discriminator_type (env);
   // get the discriminator type
 
-  CORBA::TypeCode_ptr default_tc = 0;
-  CORBA::Boolean discrim_matched = 0;
-
-  TAO_Base_Union *base_union = (TAO_Base_Union *)data;
-  void *member_val;
-
-  // encode the discriminator value
-  const void *discrim_val = base_union->_discriminant ();
-  CORBA::TypeCode::traverse_status retval =
-    stream->encode (discrim_tc, discrim_val, data2, ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
-    return retval;
-
-  CORBA::ULong discrim_size_with_pad =
-    tc->TAO_discrim_pad_size (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // move the pointer to point to the actual value
-  data = (char *) data + discrim_size_with_pad;
-  data2 = (char *) data2 + discrim_size_with_pad;
-
-  // now get ready to marshal the actual union value
-  CORBA::Long default_index =
-    tc->default_index (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // get the member count
-  CORBA::ULong member_count =
-    tc->member_count (ACE_TRY_ENV);
-  ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-  // Check which label value matches with the
-  // discriminator value. Accordingly, marshal the
-  // corresponding member_type. If none match,
-  // check if default exists and marshal
-  // accordingly. Otherwise it is an error.
-  for (int i = 0; member_count-- != 0; i++)
+  if (env.exception () == 0)
     {
-      CORBA::Any_ptr member_label =
-        tc->member_label (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      // do the matching
-      CORBA::TypeCode_var type = member_label->type ();
-      switch (type->kind (ACE_TRY_ENV))
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short s;
-            *member_label >>= s;
-            if (s == *(CORBA::Short *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort s;
-            *member_label >>= s;
-            if (s == *(CORBA::UShort *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long l;
-            *member_label >>= l;
-            if (l == *(CORBA::Long *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong l;
-            *member_label >>= l;
-            if (l == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong ul;
-            TAO_InputCDR stream ((ACE_Message_Block *)
-                                 member_label->_tao_get_cdr ());
-            (void)stream.decode (discrim_tc, &ul, 0, ACE_TRY_ENV);
-            ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-            if (ul == *(CORBA::ULong *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char c;
-            *member_label >>= CORBA::Any::to_char (c);
-            if (c == *(CORBA::Char *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          CORBA::WChar wc;
-          *member_label >>= CORBA::Any::to_wchar (wc);
-          if (wc == *(CORBA::WChar *) discrim_val)
-            discrim_matched = 1;
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean b;
-            *member_label >>= CORBA::Any::to_boolean (b);
-            if (b == *(CORBA::Boolean *) discrim_val)
-              discrim_matched = 1;
-          }
-          break;
-
-        default:
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "Union::encode - "
-                        "Bad discriminant type\n"));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE),
-                            CORBA::TypeCode::TRAVERSE_STOP);
-        }// end of switch
-
-      // get the member typecode
-      CORBA::TypeCode_ptr member_tc =
-        tc->member_type (i, ACE_TRY_ENV);
-      ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP);
-
-      if (default_index >= 0 && default_index-- == 0)
-        {
-          // have we reached the default label?, if so,
-          // save a handle to the typecode for the default
-          default_tc = member_tc;
-        }
-      if (discrim_matched)
+      CORBA::TypeCode_ptr member_tc;
+      CORBA::Any_ptr member_label;
+      CORBA::ULong discrim_size_with_pad;
+      const void *discrim_val;
+      CORBA::ULong member_count;
+      CORBA::Long default_index;
+      CORBA::TypeCode_ptr default_tc = 0;
+      CORBA::Boolean discrim_matched = 0;
+
+      TAO_Base_Union *base_union = (TAO_Base_Union *)data;
+      void *member_val;
+
+      // encode the discriminator value
+      discrim_val = base_union->_discriminant ();
+      CORBA::TypeCode::traverse_status retval =
+        stream->encode (discrim_tc, discrim_val, data2, env);
+
+      if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          member_val = base_union->_access (0);
-          // marshal according to the matched typecode
-
-          if (member_tc->kind () == CORBA::tk_objref)
+          discrim_size_with_pad = tc->TAO_discrim_pad_size (env);
+          if (env.exception () == 0)
             {
-              // we know that the object pointer is stored in a
-              // TAO_Object_Field_T parametrized type
-              TAO_Object_Field_T<CORBA_Object>* field =
-                ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                      member_val);
-              CORBA::Object_ptr ptr = field->_upcast ();
-              return stream->encode (member_tc, &ptr, data2, ACE_TRY_ENV);
+              // move the pointer to point to the actual value
+              data = (char *) data + discrim_size_with_pad;
+              data2 = (char *) data2 + discrim_size_with_pad;
+              // now get ready to marshal the actual union value
+              default_index = tc->default_index (env);
+              if (env.exception () == 0)
+                {
+                  // get the member count
+                  member_count = tc->member_count (env);
+                  if (env.exception () == 0)
+                    {
+                      // Check which label value matches with the
+                      // discriminator value. Accordingly, marshal the
+                      // corresponding member_type. If none match,
+                      // check if default exists and marshal
+                      // accordingly. Otherwise it is an error.
+                      for (int i = 0; member_count-- != 0; i++)
+                        {
+                          member_label = tc->member_label (i, env);
+                          if (env.exception () == 0)
+                            {
+                              // do the matching
+                              CORBA::TypeCode_var type = member_label->type ();
+                              switch (type->kind (env))
+                                {
+                                case CORBA::tk_short:
+                                  {
+                                    CORBA::Short s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::Short *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ushort:
+                                  {
+                                    CORBA::UShort s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::UShort *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_long:
+                                  {
+                                    CORBA::Long l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::Long *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ulong:
+                                  {
+                                    CORBA::ULong l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::ULong *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_enum:
+                                  {
+                                    CORBA::Long l;
+                                    TAO_InputCDR stream ((ACE_Message_Block *)
+                                                         member_label->_tao_get_cdr ());
+                                    (void)stream.decode (discrim_tc, &l, 0, env);
+                                    if (l == *(CORBA::Long *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_char:
+                                  {
+                                    CORBA::Char c;
+                                    *member_label >>= CORBA::Any::to_char (c);
+                                    if (c == *(CORBA::Char *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_wchar:
+                                  // @@ ASG TO-DO
+                                  if (*(CORBA::WChar *) member_label->value () == *(CORBA::WChar *) discrim_val)
+                                    discrim_matched = 1;
+                                  break;
+                                case CORBA::tk_boolean:
+                                  {
+                                    CORBA::Boolean b;
+                                    *member_label >>= CORBA::Any::to_boolean (b);
+                                    if (b == *(CORBA::Boolean *) discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                default:
+                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+                                  ACE_DEBUG ((LM_DEBUG,
+                                              "Union::encode - Bad discriminant type"));
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
+                                }// end of switch
+
+                              // get the member typecode
+                              member_tc = tc->member_type (i, env);
+                              if (env.exception () == 0)
+                                {
+                                  if (default_index >= 0 && default_index-- == 0)
+                                    {
+                                      // have we reached the default label?, if so,
+                                      // save a handle to the typecode for the default
+                                      default_tc = member_tc;
+                                    }
+                                  if (discrim_matched)
+                                    {
+                                      member_val = base_union->_access (0);
+                                      // marshal according to the matched typecode
+                                      return stream->encode (member_tc, member_val,
+                                                             data2, env);
+                                    }
+                                }
+                              else // error getting member type
+                                {
+                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+                                  ACE_DEBUG ((LM_DEBUG,
+                                              "Union::encode - error getting member type:%d",i));
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
+                                }
+
+                            }
+                          else // error getting member label
+                            {
+                              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+                              ACE_DEBUG ((LM_DEBUG,
+                                          "Union::encode - error member label : %d", i));
+                              return CORBA::TypeCode::TRAVERSE_STOP;
+                            }
+                        } // end of while
+                      // we are here only if there was no match
+                      if (default_tc)
+                        {
+                          member_val = base_union->_access (0);
+                          return stream->encode (default_tc, member_val, data2, env);
+                        }
+                      else
+                        {
+                          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+                          ACE_DEBUG ((LM_DEBUG,
+                                      "Union::encode - failed. No match and no default case"));
+                          return CORBA::TypeCode::TRAVERSE_STOP;
+                        }
+                    }
+                  else // error getting member count
+                    {
+                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+                      ACE_DEBUG ((LM_DEBUG,
+                                  "Union::encode - error getting member count"));
+                      return CORBA::TypeCode::TRAVERSE_STOP;
+                    }
+                }
+              else // error getting default index
+                {
+                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+                  ACE_DEBUG ((LM_DEBUG,
+                              "Union::encode - error getting default used"));
+                  return CORBA::TypeCode::TRAVERSE_STOP;
+                }
             }
-          else
+          else // error getting discrim_pad_size
             {
-              return stream->encode (member_tc, member_val,
-                                     data2, ACE_TRY_ENV);
+              env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+              ACE_DEBUG ((LM_DEBUG,
+                          "Union::encode - error getting discrim padded size"));
+              return CORBA::TypeCode::TRAVERSE_STOP;
             }
         }
-    }
-  // we are here only if there was no match
-  if (default_tc)
-    {
-      member_val = base_union->_access (0);
-      if (default_tc->kind () == CORBA::tk_objref)
-        {
-          // we know that the object pointer is stored in a
-          // TAO_Object_Field_T parametrized type
-          TAO_Object_Field_T<CORBA_Object>* field =
-            ACE_reinterpret_cast (TAO_Object_Field_T<CORBA_Object> *,
-                                  member_val);
-          CORBA::Object_ptr ptr = field->_upcast ();
-          return stream->encode (default_tc, &ptr, data2, ACE_TRY_ENV);
-        }
-      else
+      else // error encoding discriminant
         {
-          return stream->encode (default_tc, member_val,
-                                 data2, ACE_TRY_ENV);
+          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+          ACE_DEBUG ((LM_DEBUG,
+                      "Union::encode - error encoding discriminant"));
+          return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Union::encode - failed. "
-                "No match and no default case\n"));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    CORBA::TypeCode::TRAVERSE_STOP);
+  else // error getting the discriminant
+    {
+      env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+      ACE_DEBUG ((LM_DEBUG,
+                  "Union::encode - error getting the discriminant typecode"));
+      return CORBA::TypeCode::TRAVERSE_STOP;
+    }
 }
 
 // encode string
@@ -849,7 +934,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc,
   // If an error was detected but no exception was raised then raise a
   // marshal exception.
   if (env.exception () == 0)
-    env.exception (new CORBA::MARSHAL ());
+    env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -994,12 +1079,10 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc,
             } // no exception computing size
         } // no exception computing content type
     } // no exception computing bounds
-
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::encode detected error\n"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::encode detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -1067,7 +1150,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
       case CORBA::tk_alias:
       case CORBA::tk_except:
       case CORBA::tk_wstring:
-        retval = stream->encode (tc2, data, 0, env);
+        retval = stream->encode (tc2, value, 0, env);
         break;
       default:
         // anything else is an error
@@ -1080,10 +1163,9 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::encode detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -1202,10 +1284,9 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::encode detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Except detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/iopfwd.h b/TAO/tao/iopfwd.h
deleted file mode 100644
index 61ab19abf41..00000000000
--- a/TAO/tao/iopfwd.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO
-//
-// = FILENAME
-//   iopfwd.h
-//
-// = DESCRIPTION
-//   Forward declare the types in the IOP namespace.
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_IOPFWD_H
-#define TAO_IOPFWD_H
-
-#include "tao/corbafwd.h"
-
-class TAO_Export IOP
-{
-  // = TITLE
-  //   Provides the IOP namespace.
-  //
-  // = DESCRIPTION
-public:
-  typedef CORBA::ULong ComponentId;
-  typedef CORBA::ULong_out ComponentId_out;
-  // static CORBA::TypeCode_ptr _tc_ComponentId;
-
-  typedef CORBA::ULong ServiceId;
-  typedef CORBA::ULong_out ServiceId_out;
-  // static CORBA::TypeCode_ptr _tc_ServiceId;
-
-  // @@ Add more types....
-};
-
-#endif /* TAO_IOPFWD_H */
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
deleted file mode 100644
index 573336d8728..00000000000
--- a/TAO/tao/orb.idl
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-// Included for compatibility with the CORBA 2 specification.
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  interface Object {};
-
-  interface ORB {};
-
-  interface TypeCode {};
-};
-
-#pragma prefix ""
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index 20418a759f6..0d85d4512d3 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -60,28 +60,22 @@
 // without timestamps, transient and persistent POA cannot be
 // distinguished
 
-//#define TAO_USE_DOTTED_DECIMAL_ADDRESSES
-//
-// If set the ORB will use dotted decimal addresses in the IORs it
-// exports, this is useful for platforms or environments that cannot
-// depend on a DNS beign available.
-
 // The default arguments of the resource factory for the fake service
 // configurator
 #if !defined (TAO_DEFAULT_RESOURCE_FACTORY_ARGS)
-#define TAO_DEFAULT_RESOURCE_FACTORY_ARGS "static Resource_Factory \"-ORBresources tss -ORBreactorlock null\""
+#define TAO_DEFAULT_RESOURCE_FACTORY_ARGS "static TAO_Resource_Factory \"-ORBresources tss -ORBreactorlock null\""
 #endif /* TAO_DEFAULT_RESOURCE_FACTORY_ARGS */
 
 // The default arguments of the client strategy factory for the fake service
 // configurator
 #if !defined (TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS "static Client_Strategy_Factory \"\""
+#define TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS "static TAO_Default_Client_Strategy_Factory \"\""
 #endif /* TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS */
 
 // The default arguments of the server strategy factory for the fake service
 // configurator
 #if !defined (TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS)
-#define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS  "static Server_Strategy_Factory \"-ORBconcurrency reactive -ORBsystemidpolicydemuxstrategy dynamic -ORBtablesize 128\""
+#define TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS  "static TAO_Default_Server_Strategy_Factory \"-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128\""
 #endif /* TAO_DEFAULT_SERVER_STRATEGY_FACTORY_ARGS */
 
 // The default size of TAO's server active object map.
@@ -97,11 +91,6 @@
 # endif /* TAO_DEFAULT_SERVER_OBJECT_TABLE_SIZE */
 #endif /* ! TAO_DEFAULT_SERVER_ACTIVE_OBJECT_MAP_SIZE */
 
-// The default size of TAO's server poa map.
-#if !defined (TAO_DEFAULT_SERVER_POA_MAP_SIZE)
-#  define TAO_DEFAULT_SERVER_POA_MAP_SIZE 24
-#endif /* ! TAO_DEFAULT_SERVER_POA_MAP_SIZE */
-
 // The default UDP multicast port number for locating the TAO Naming
 // Service.
 #if !defined (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT)
@@ -127,9 +116,9 @@
 #endif /* TAO_DEFAULT_NAME_SERVER_REPLY_PORT */
 
 // The default timeout receiving the location request to the TAO
-// Naming, Trading and other servicesService.
+// Naming Service and Trading Service.
 #if !defined (TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT)
-#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 4
+#define TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT 1
 #endif /* TAO_DEFAULT_SERVICE_RESOLUTION_TIMEOUT */
 
 // The default starting port number for TAO servers.
@@ -242,34 +231,6 @@
 #define TAO_CONST
 #endif /* TAO_CONST */
 
-// The IDL compiler can generate the classes corresponding to IDL
-// sequences in two ways:
-// + Use the TAO templates for sequences,
-//   i.e. TAO_{Unb,B}ounded_Sequence<>
-// + Explicitly generate code for the sequence.
-//
-// The first approach can (potentially) produce smaller code, because
-// the code for a sequence over a particular type (say sequence<long>)
-// can be shared across multiple IDL files.
-// Unfortunately it is hard to manage the template instantiations on
-// platforms that do not automatically generate them, mainly because
-// it is hard to decide on which generated file are the templates
-// instantiated.  Thus the second approach is more convenient for most
-// applications.
-//
-// On platforms that support automatic template instantiation we use
-// the first approach.
-// On platforms that require explicit template instantiations we use
-// explicitly generated code for sequences if the platform does not.
-// If the application requires it (such as embedded systems) the
-// default can be changed, but then the application developer is
-// responsible for instantiating the templates.
-//
-#if !defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) && \
-    defined (ACE_HAS_TEMPLATE_SPECIALIZATION)
-#define TAO_USE_SEQUENCE_TEMPLATES
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // ObjectIds recognized by CORBA_ORB::resolve_initial_references ()...
 // of course, no guarantees are made that the call will return
 // something useful.
@@ -278,43 +239,8 @@
 #define TAO_OBJID_ROOTPOA          "RootPOA"
 #define TAO_OBJID_POACURRENT       "POACurrent"
 #define TAO_OBJID_INTERFACEREP     "InterfaceRepository"
-#define TAO_OBJID_POLICYMANAGER    "ORBPolicyManager"
-#define TAO_OBJID_POLICYCURRENT    "PolicyCurrent"
 
 // The Root POA default name.
 #define TAO_DEFAULT_ROOTPOA_NAME   ""
 
-// OBV is in experimental stage
-#define TAO_HAS_VALUETYPE
-
-// Minimum CORBA
-// #define TAO_HAS_MINIMUM_CORBA
-
-// CORBA Messaging
-#if defined(ACE_WIN32)
-// In other platforms this is defined in the command-line
-#define TAO_HAS_CORBA_MESSAGING
-#endif /* ACE_WIN32 */
-
-// The maximum value for an standard PolicyType, we use this trick to
-// pack the standard policies and the TAO extension in a single
-// array.
-// The motivation for such a low-level optimization is that policies
-// can be set on a per-object level, allocating a complex data
-// structure (such as a hash map) or a big array for each object is
-// not feasible.
-#define TAO_MAX_STANDARD_POLICIES 64
-
-// The number of TAO specific policies
-#define TAO_POLICIES_COUNT 32
-
-// The size of the Policy array, the number of policies supported in
-// TAO is limited by this number.
-#define TAO_MAX_POLICIES (TAO_MAX_STANDARD_POLICIES+TAO_POLICIES_COUNT)
-
-// TAO may define its own policies, they are defined in a range far
-// from the standard policies.
-#define TAO_MIN_PROPIETARY_POLICY 1024
-#define TAO_MAX_PROPIETARY_POLICY (TAO_MIN_PROPIETARY_POLICY+TAO_POLICIES_COUNT)
-
 #endif  /* TAO_ORB_CONFIG_H */
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index fafb7007d57..dd227156a7d 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -6,14 +6,11 @@
 # include "tao/params.i"
 #endif /* __ACE_INLINE__ */
 
-#include "tao/IOR_LookupTable.h"
-
 ACE_RCSID(tao, params, "$Id$")
 
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   : name_service_port_ (0),
     trading_service_port_ (0),
-    ior_lookup_table_ (0),
     sock_rcvbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     sock_sndbuf_size_ (ACE_DEFAULT_MAX_SOCKET_BUFSIZ),
     cdr_memcpy_tradeoff_ (ACE_DEFAULT_CDR_MEMCPY_TRADEOFF),
@@ -23,6 +20,4 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (void)
 
 TAO_ORB_Parameters::~TAO_ORB_Parameters (void)
 {
-  // Delete the table.
-  delete this->ior_lookup_table_;
 }
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index bffffcdd697..8927a770854 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -25,7 +25,6 @@
 class TAO_Server_Connection_Handler;
 class TAO_Active_Object_Map_Impl;
 class TAO_Reverse_Active_Object_Map_Impl;
-class TAO_IOR_LookupTable;
 
 // This is a quick hack to avoid having to unravel the intracacies of
 // the all the hairy order interdepencies that currently exist in TAO.
@@ -114,24 +113,14 @@ public:
 
   int use_lite_protocol (void) const;
   void use_lite_protocol (int);
-  // The ORB will use a modified version of GIOP that minimizes the
-  // header size. By default we use the standard GIOP protocol.
+  // The ORB will use a modified version of IIOP that minimizes the
+  // header size. By default we use the standard IIOP protocol.
 
   int use_dotted_decimal_addresses (void) const;
   void use_dotted_decimal_addresses (int);
   // The ORB will use the dotted decimal notation for addresses. By
   // default we use the full ascii names.
 
-  TAO_IOR_LookupTable * ior_lookup_table (void);
-  void ior_lookup_table (TAO_IOR_LookupTable *table);
-  // The table used by the ORB for looking up the ObjectID:IOR mappings
-  // specified on the commandline through the -ORBInitRef and
-  // -ORBDefaultInitRef parameters.
-
-  char *default_init_ref (void) const;
-  void default_init_ref (const ACE_CString &default_init_ref);
-  // Set/Get the Init Reference of an arbitrary ObjectID.
-
 private:
   ACE_INET_Addr addr_;
   // host + port number we are listening on
@@ -154,14 +143,6 @@ private:
   ACE_CString init_ref_;
   // Initial Reference supplied as <ObjectID>:<IOR>
 
-  TAO_IOR_LookupTable *ior_lookup_table_;
-  // Table that has the mapping <ObjectID>:<IOR>
-  // The IOR could be in any of the following formats :
-  // IOR: ...  / iiop: ...  / iioploc: ... / iiopname: ...
-
-  ACE_CString default_init_ref_;
-  // List of comma separated prefixes from ORBDefaultInitRef.
-
   int sock_rcvbuf_size_;
   // Size to be used for a socket's receive buffer.
 
@@ -196,6 +177,44 @@ enum TAO_Demux_Strategy
   TAO_USER_DEFINED
 };
 
+class TAO_Export TAO_OA_Parameters
+  // = TITLE
+  //    Parameters specific to an Object Adapter.  By definition, this
+  //    is only on the server side, since a client does not have an
+  //    object adapter.
+  //
+  // = NOTES
+  //    This can be subclassed in order to have OA-specific
+  //    parameters, e.g., the Realtime Object Adapter might subclass
+  //    this and add its own parameters.
+{
+public:
+  TAO_LOCAL_INLINE TAO_OA_Parameters (void);
+  // Constructor
+
+  TAO_LOCAL_INLINE ~TAO_OA_Parameters (void);
+  // Destructor
+
+  TAO_LOCAL_INLINE TAO_Active_Object_Map_Impl *userdef_lookup_strategy_for_user_id_policy (void);
+  // return the lookup strategy for the user id policy
+
+  TAO_LOCAL_INLINE TAO_Active_Object_Map_Impl *userdef_lookup_strategy_for_system_id_policy (void);
+  // return the lookup strategy for the system id policy
+
+  TAO_LOCAL_INLINE TAO_Reverse_Active_Object_Map_Impl *userdef_reverse_lookup_strategy_for_unique_id_policy (void);
+  // return the reverse lookup strategy for unique id policy
+
+  TAO_LOCAL_INLINE void tablesize (CORBA::ULong tablesize);
+  // set the table size for lookup table
+
+  TAO_LOCAL_INLINE CORBA::ULong tablesize (void);
+  // get the table size for the lookup table
+
+private:
+  CORBA::ULong tablesize_;
+  // size of object lookup table
+};
+
 #if defined (__ACE_INLINE__)
 # include "tao/params.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/params.i b/TAO/tao/params.i
index 53a742a9062..c258811bb4a 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -14,6 +14,46 @@
 //
 // ============================================================================
 
+ACE_INLINE
+TAO_OA_Parameters::TAO_OA_Parameters (void)
+{
+}
+
+ACE_INLINE
+TAO_OA_Parameters::~TAO_OA_Parameters (void)
+{
+}
+
+ACE_INLINE void
+TAO_OA_Parameters::tablesize (CORBA::ULong tblsize)
+{
+  this->tablesize_ = tblsize;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_OA_Parameters::tablesize (void)
+{
+  return this->tablesize_;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Impl *
+TAO_OA_Parameters::userdef_lookup_strategy_for_user_id_policy (void)
+{
+  return 0;
+}
+
+ACE_INLINE TAO_Active_Object_Map_Impl *
+TAO_OA_Parameters::userdef_lookup_strategy_for_system_id_policy (void)
+{
+  return 0;
+}
+
+ACE_INLINE TAO_Reverse_Active_Object_Map_Impl *
+TAO_OA_Parameters::userdef_reverse_lookup_strategy_for_unique_id_policy (void)
+{
+  return 0;
+}
+
 ACE_INLINE int
 TAO_ORB_Parameters::sock_rcvbuf_size (void) const
 {
@@ -157,27 +197,3 @@ TAO_ORB_Parameters::trading_service_port (void) const
 {
   return this->trading_service_port_;
 }
-
-ACE_INLINE TAO_IOR_LookupTable *
-TAO_ORB_Parameters::ior_lookup_table (void)
-{
-  return this->ior_lookup_table_;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::ior_lookup_table (TAO_IOR_LookupTable *table)
-{
-  this->ior_lookup_table_ = table;
-}
-
-ACE_INLINE void
-TAO_ORB_Parameters::default_init_ref (const ACE_CString &default_init_ref)
-{
-  this->default_init_ref_ = default_init_ref;
-}
-
-ACE_INLINE char *
-TAO_ORB_Parameters::default_init_ref (void) const
-{
-  return this->default_init_ref_.rep ();
-}
diff --git a/TAO/tao/poa_macros.h b/TAO/tao/poa_macros.h
index 46b6d0ca3a7..b1f40199ee4 100644
--- a/TAO/tao/poa_macros.h
+++ b/TAO/tao/poa_macros.h
@@ -7,22 +7,15 @@
 
 // Convenient macro for testing for deadlock, as well as for detecting
 // when mutexes fail.
-#define TAO_POA_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
-
-#define TAO_POA_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
-
 #define TAO_POA_WRITE_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_WRITE_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
+  TAO_WRITE_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO))
 
 #define TAO_POA_READ_GUARD(MUTEX,OBJ,LOCK,ENV) \
-  TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER ())
+  TAO_READ_GUARD_THROW(MUTEX,OBJ,LOCK,ENV,CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO))
 
 #define TAO_POA_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_WRITE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
-
+  TAO_WRITE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO))
 #define TAO_POA_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV) \
-  TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER ())
+  TAO_READ_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,RETURN,ENV,CORBA::OBJ_ADAPTER (CORBA::COMPLETED_NO))
 
 #endif /* TAO_POA_MACROS_H */
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
index b6dca5d281c..0b46dda1867 100644
--- a/TAO/tao/skip.cpp
+++ b/TAO/tao/skip.cpp
@@ -24,7 +24,6 @@
 #include "tao/GIOP.h"
 #include "tao/Any.h"
 #include "tao/Environment.h"
-#include "tao/debug.h"
 
 ACE_RCSID(tao, skip, "$Id$")
 
@@ -82,10 +81,9 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Primitive::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Primitive::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -117,7 +115,6 @@ TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
       else
         retval = CORBA::TypeCode::TRAVERSE_STOP;
     }
-  CORBA::release (elem_tc);
   return retval;
 }
 
@@ -198,11 +195,9 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
         }
       else // bad kind_ value to be decoded
         {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        "TAO_Marshal_TypeCode::skip: "
-                        "Bad kind_ value in CDR stream"));
-          env.exception (new CORBA::BAD_TYPECODE ());
+          env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO_Marshal_TypeCode: Bad kind_ value in CDR stream"));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
@@ -211,10 +206,9 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -244,10 +238,9 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Principal::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Principal::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -330,10 +323,9 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         if (!str.skip_string ()
             || !str.skip_ushort ())
           {
-            if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG,
-                          "error decoding IIOP host/port"));
-            env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+            ACE_DEBUG ((LM_DEBUG,
+                        "error decoding IIOP host/port"));
             return CORBA::TypeCode::TRAVERSE_STOP;
           }
 
@@ -341,7 +333,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         if (str.skip (TC_opaque,
                       env) != CORBA::TypeCode::TRAVERSE_CONTINUE)
           {
-            env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+            env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
             return CORBA::TypeCode::TRAVERSE_STOP;
           }
       }
@@ -351,10 +343,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_ObjRef::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG, "marshaling decode_objref detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -393,10 +383,9 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Struct::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "marshaling encode_struct detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -433,149 +422,151 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
       retval = stream->decode (discrim_tc, &discrim_val, 0, env);
       if (retval == CORBA::TypeCode::TRAVERSE_CONTINUE)
         {
-          // now get ready to skip the actual union value
-          default_index = tc->default_index (env);
+              // now get ready to skip the actual union value
+              default_index = tc->default_index (env);
 
-          if (env.exception () == 0)
-            {
-              member_count = tc->member_count (env);
               if (env.exception () == 0)
                 {
-                  // check which label value matches with the discriminator
-                  // value. Accordingly, marshal the corresponding
-                  // member_type. If none match, check if default exists
-                  // and marshal accordingly. Otherwise it is an error.
-
-                  for (i = 0; i < member_count; i++)
+                  member_count = tc->member_count (env);
+                  if (env.exception () == 0)
                     {
-                      member_label = tc->member_label (i, env);
-                      if (env.exception () == 0)
+                      // check which label value matches with the discriminator
+                      // value. Accordingly, marshal the corresponding
+                      // member_type. If none match, check if default exists
+                      // and marshal accordingly. Otherwise it is an error.
+
+                      for (i = 0; i < member_count; i++)
                         {
-                          // do the matching
-			                    CORBA::TypeCode_var type = member_label->type ();
-                          switch (type->kind (env))
+                          member_label = tc->member_label (i, env);
+                          if (env.exception () == 0)
                             {
-                              case CORBA::tk_short:
-                                {
-                                  CORBA::Short s;
-                                  *member_label >>= s;
-                                  if (s == *(CORBA::Short *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_ushort:
-                                {
-                                  CORBA::UShort s;
-                                  *member_label >>= s;
-                                  if (s == *(CORBA::UShort *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_long:
-                                {
-                                  CORBA::Long l;
-                                  *member_label >>= l;
-                                  if (l == *(CORBA::Long *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_ulong:
+                              // do the matching
+			      CORBA::TypeCode_var type = member_label->type ();
+                              switch (type->kind (env))
                                 {
-                                  CORBA::ULong l;
-                                  *member_label >>= l;
-                                  if (l == *(CORBA::ULong *) &discrim_val)
+                                case CORBA::tk_short:
+                                  {
+                                    CORBA::Short s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::Short *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ushort:
+                                  {
+                                    CORBA::UShort s;
+                                    *member_label >>= s;
+                                    if (s == *(CORBA::UShort *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_long:
+                                  {
+                                    CORBA::Long l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::Long *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_ulong:
+                                  {
+                                    CORBA::ULong l;
+                                    *member_label >>= l;
+                                    if (l == *(CORBA::ULong *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_enum:
+                                  {
+                                    CORBA::Long l;
+                                    TAO_InputCDR stream ((ACE_Message_Block *)
+                                                         member_label->value
+                                                         ());
+                                    (void)stream.decode (discrim_tc, &l, 0, env);
+                                    if (l == *(CORBA::Long *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_char:
+                                  {
+                                    CORBA::Char c;
+                                    *member_label >>= CORBA::Any::to_char (c);
+                                    if (c == *(CORBA::Char *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                case CORBA::tk_wchar:
+                                  // @@ ASG TO-DO
+                                  if (*(CORBA::WChar *) member_label->value ()
+                                      == *(CORBA::WChar *) &discrim_val)
                                     discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_enum:
-                                {
-                                  CORBA::ULong ul;
-                                  TAO_InputCDR stream (member_label->_tao_get_cdr ());
-                                  (void)stream.decode (discrim_tc, &ul, 0, env);
-                                  if (ul == *(CORBA::ULong *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_char:
+                                  break;
+                                case CORBA::tk_boolean:
+                                  {
+                                    CORBA::Boolean b;
+                                    *member_label >>= CORBA::Any::to_boolean (b);
+                                    if (b == *(CORBA::Boolean *) &discrim_val)
+                                      discrim_matched = 1;
+                                  }
+                                  break;
+                                default:
+                                  env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO));
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
+                                }// end of switch
+
+                              // get the member typecode
+                              member_tc = tc->member_type (i, env);
+                              if (env.exception () == 0)
                                 {
-                                  CORBA::Char c;
-                                  *member_label >>= CORBA::Any::to_char (c);
-                                  if (c == *(CORBA::Char *) &discrim_val)
-                                    discrim_matched = 1;
-                                }
-                                break;
-                              case CORBA::tk_wchar:
-                                CORBA::WChar wc;
-                                *member_label >>= CORBA::Any::to_wchar (wc);
-                                if (wc == *(CORBA::WChar *) &discrim_val)
-                                  discrim_matched = 1;
-                                break;
-                              case CORBA::tk_boolean:
-                                {
-                                  CORBA::Boolean b;
-                                  *member_label >>= CORBA::Any::to_boolean (b);
-                                  if (b == *(CORBA::Boolean *) &discrim_val)
-                                    discrim_matched = 1;
+                                  if (default_index >= 0 && default_index-- == 0)
+                                    // have we reached the default label?, if so,
+                                    // save a handle to the typecode for the default
+                                    default_tc = member_tc;
+                                  if (discrim_matched)
+                                    {
+                                      // marshal according to the matched typecode
+                                      return stream->skip (member_tc, env);
+                                    }
                                 }
-                                break;
-                              default:
-                                env.exception (new CORBA::BAD_TYPECODE ());
-                                return CORBA::TypeCode::TRAVERSE_STOP;
-                            }// end of switch
-
-                          // get the member typecode
-                          member_tc = tc->member_type (i, env);
-                          if (env.exception () == 0)
-                            {
-                              if (default_index >= 0 && default_index-- == 0)
-                                // have we reached the default label?, if so,
-                                // save a handle to the typecode for the default
-                                default_tc = member_tc;
-                              if (discrim_matched)
+                              else
                                 {
-                                  // marshal according to the matched typecode
-                                  return stream->skip (member_tc, env);
+                                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+                                  return CORBA::TypeCode::TRAVERSE_STOP;
                                 }
                             }
                           else
                             {
-                              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                              env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                               return CORBA::TypeCode::TRAVERSE_STOP;
                             }
-                        }
+                        } // end of for loop
+                      // we are here only if there was no match
+                      if (default_tc)
+                        return stream->skip (default_tc, env);
                       else
-                        {
-                          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-                          return CORBA::TypeCode::TRAVERSE_STOP;
-                        }
-                    } // end of for loop
-                  // we are here only if there was no match
-                  if (default_tc)
-                    return stream->skip (default_tc, env);
+                        return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                    }
                   else
-                    return CORBA::TypeCode::TRAVERSE_CONTINUE;
+                    {
+                      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+                      return CORBA::TypeCode::TRAVERSE_STOP;
+                    }
                 }
               else
                 {
-                  env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+                  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
                   return CORBA::TypeCode::TRAVERSE_STOP;
                 }
-            }
-          else
-            {
-              env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
-              return CORBA::TypeCode::TRAVERSE_STOP;
-            }
         }
       else
         {
-          env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+          env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
           return CORBA::TypeCode::TRAVERSE_STOP;
         }
     }
   else
     {
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -604,10 +595,9 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_TypeCode::skip detected error"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -654,10 +644,9 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
         return CORBA::TypeCode::TRAVERSE_CONTINUE;
     }
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::skip detected error\n"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::skip detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -693,10 +682,9 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
         } // no exception computing content type
     } // no exception computing bounds
   // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "TAO_Marshal_Sequence::skip detected error\n"));
-  env.exception (new CORBA::MARSHAL ());
+  env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO));
+  ACE_DEBUG ((LM_DEBUG,
+              "marshaling TAO_Marshal_Sequence::skip detected error"));
   return CORBA::TypeCode::TRAVERSE_STOP;
 }
 
@@ -728,10 +716,9 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Alias::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Alias::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -781,10 +768,9 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_Except::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_Except detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
@@ -819,10 +805,9 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
     return CORBA::TypeCode::TRAVERSE_CONTINUE;
   else
     {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO_Marshal_WString::skip detected error\n"));
-      env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE));
+      env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE));
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO_Marshal_TypeCode::skip detected error"));
       return CORBA::TypeCode::TRAVERSE_STOP;
     }
 }
diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld
index 5114dadb183..ae477754d64 100644
--- a/TAO/tao/tao.bld
+++ b/TAO/tao/tao.bld
@@ -28,7 +28,7 @@ Exception.cpp
 	C++
 GIOP.cpp
 	C++
-CDR_Interpreter.cpp
+IIOP_Interpreter.cpp
 	C++
 IIOP_Object.cpp
 	C++
diff --git a/TAO/tao/try_macros.h b/TAO/tao/try_macros.h
index 4df4cd77af4..7e99d7ff9d9 100644
--- a/TAO/tao/try_macros.h
+++ b/TAO/tao/try_macros.h
@@ -23,7 +23,7 @@
 //   *        NOTICE !!!    NOTICE !!!   NOTICE !!!   NOTICE !!!     *
 //   *                                                               *
 //   *                                                               *
-//   *        The macros in this file is deprecated.                 *
+//   *        The macros in this file is depricated.                 *
 //   *                                                               *
 //   *        Please check out $ACE_ROOT/ace/CORBA_macros.h          *
 //   *        for a new set of helper macros that replace            *
diff --git a/TAO/tao/varout.cpp b/TAO/tao/varout.cpp
index 30a5e36aac4..33340e2ec6b 100644
--- a/TAO/tao/varout.cpp
+++ b/TAO/tao/varout.cpp
@@ -36,8 +36,7 @@ TAO_Object_Field_T<T>::_downcast (CORBA_Object* base_ptr,
   CORBA::release (this->ptr_);
   this->ptr_ = 0;
   this->ptr_ = T::_narrow (base_ptr, env);
-  if (env.exception () != 0) 
-    return;
+  if (env.exception () != 0) return;
 }
 
 template<class T> CORBA_Object*
diff --git a/TAO/tao/varout.h b/TAO/tao/varout.h
index cb34463a3cb..19a56f7758c 100644
--- a/TAO/tao/varout.h
+++ b/TAO/tao/varout.h
@@ -13,8 +13,8 @@
 //     Templates for _var and _out types
 //
 // = AUTHOR
-//   Aniruddha Gokhale <gokhale@cs.wustl.edu>
-// 
+//
+//   Aniruddha Gokhale
 // ============================================================================
 
 #ifndef TAO_VAROUT_H
@@ -31,18 +31,19 @@ class TAO_Object_Field_T : public TAO_Object_Field
   //
   // = DESCRIPTION
   //   When an object reference appears in a structure the marshaling
-  //   and demarhsaling of the structure gets complicated: the
-  //   interpreter can only marshal CORBA_Object_ptr when it
-  //   dermarshal it creates on of those objects.  The downcasting to
-  //   the right type must be executed by classes with compile-time
-  //   knowledge of the object type.  The solution addopted in TAO is
-  //   to create a special manager class for that field,
+  //   and demarhsaling of the structure gets complicated:
+  //   the interpreter can only marshal CORBA_Object_ptr when it
+  //   dermarshal it creates on of those objects.
+  //   The downcasting to the right type must be executed by classes
+  //   with compile-time knowledge of the object type.
+  //   The solution addopted in TAO is to create a special manager
+  //   class for that field,
 public:
   TAO_Object_Field_T (void);
   // default constructor
 
-  TAO_Object_Field_T (T *object);
-  // constructor from a T *, assumes ownership of <object> i.e. it
+  TAO_Object_Field_T (T* object);
+  // constructor from a T*, assumes ownership of <object> i.e. it
   // *will* release it.
 
   TAO_Object_Field_T (const TAO_Object_Field_T<T> &);
@@ -51,49 +52,48 @@ public:
   virtual ~TAO_Object_Field_T (void);
   // destructor
 
-  TAO_Object_Field_T<T> &operator= (T *object);
+  TAO_Object_Field_T<T> &operator= (T* object);
   // Assignment from a T*, it assumes ownership of <object>.
 
   TAO_Object_Field_T<T> &operator= (const TAO_Object_Field_T<T> &);
   // Assignment operator, in duplicates the underlying objects.
 
-  T *operator-> (void) const;
+  T* operator-> (void) const;
   // smart pointer (const)
 
-  operator T *const &() const;
+  operator T* const &() const;
   // cast operator
 
-  operator T *&();
+  operator T* &();
   // cast operator
 
   // = operations for parameter passing modes
 
-  T *in (void) const;
+  T* in (void) const;
   // for in type parameter
 
-  T *&inout (void);
+  T* &inout (void);
   // for inout type parameter
 
-  T *&out (void);
+  T* &out (void);
   // for out parameter
 
-  T *_retn (void);
+  T* _retn (void);
   // for return type
 
-  T *ptr (void) const;
+  T* ptr (void) const;
   // TAO extension for access to the underlying pointer.
 
-  virtual void _downcast (CORBA_Object *base_ptr,
+  virtual void _downcast (CORBA_Object* base_ptr,
                           CORBA_Environment &TAO_IN_ENV = CORBA::default_environment ());
-  virtual CORBA_Object *_upcast (void);
+  virtual CORBA_Object* _upcast (void);
   virtual void _release (void);
   // Implement the TAO_Object_Field methods.
 
 private:
-  T *ptr_;
+  T* ptr_;
 };
 
-#if 0
 // ****************************************************************
 // The following classes are experimental, some of them do *not*
 // compile and produce errors in compilers that check templates before
@@ -101,7 +101,7 @@ private:
 // several classes generated by IDL compiler, possibly reducing the
 // complexity of the compiler.
 // ****************************************************************
-
+#if 0
 template <class T>
 class TAO_Fixed_var
   // = TITLE
diff --git a/TAO/taoConf.sh.in b/TAO/taoConf.sh.in
deleted file mode 100644
index 60955b5ff8f..00000000000
--- a/TAO/taoConf.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Configuration of the TAO distribution
-#
-
-TAO_COMPILER="@CXX@"
-TAO_LIBDIR="@TAO_LIBDIR@"
-TAO_INCLUDEDIR="@TAO_INCLUDEDIR@ @CXXFLAGS@"
-TAO_LIBS="@TAO_LIBS@"
diff --git a/TAO/tests/CDR/Makefile b/TAO/tests/CDR/Makefile
index 56d267910af..4e315cfb17b 100644
--- a/TAO/tests/CDR/Makefile
+++ b/TAO/tests/CDR/Makefile
@@ -64,6 +64,9 @@ octet_sequence: $(addprefix $(VDIR),$(OCTET_SEQUENCE_OBJS))
 allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -72,6 +75,9 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -136,70 +142,38 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -211,10 +185,36 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -223,31 +223,22 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -269,8 +260,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -287,69 +281,45 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 .obj/tc.o .obj/tc.so .shobj/tc.o .shobj/tc.so: tc.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -413,70 +383,38 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -488,10 +426,36 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -500,31 +464,22 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -546,8 +501,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -564,70 +522,46 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 .obj/growth.o .obj/growth.so .shobj/growth.o .shobj/growth.so: growth.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -694,70 +628,38 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -769,10 +671,36 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -781,31 +709,22 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -827,8 +746,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -845,69 +767,45 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 .obj/octet_sequence.o .obj/octet_sequence.so .shobj/octet_sequence.o .shobj/octet_sequence.so: octet_sequence.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -971,70 +869,38 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -1046,10 +912,36 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1058,31 +950,22 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1104,8 +987,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1122,70 +1008,46 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 .obj/allocator.o .obj/allocator.so .shobj/allocator.o .shobj/allocator.so: allocator.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1252,70 +1114,38 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Server_Request.i \
  $(TAO_ROOT)/tao/varout.h \
  $(TAO_ROOT)/tao/varout.i \
@@ -1327,10 +1157,36 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1339,31 +1195,22 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1385,8 +1232,11 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1403,64 +1253,37 @@ allocator: $(addprefix $(VDIR),$(ALLOCATOR_OBJS))
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/Union.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index aebfd317fb4..92b2b2d905a 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -35,9 +35,9 @@ class Application_Simulator
   // = DESCRIPTION
   //   Tries to simulate the behavior of an application: it randomly
   //   acquires and releases memory, of variable sizes.
-  //   The intention is to produce some level of fragmentation in main
+  //   The intention is to produce some level of fragmentation in main 
   //   memory.
-
+  
 public:
   Application_Simulator (int max_fragments,
                     int max_fragment_size);
@@ -128,15 +128,15 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "SEED = %d\n", seed));
 
-  ACE_Allocator* buffer_allocator =
+  ACE_Allocator* buffer_allocator = 
     ACE_Allocator::instance ();
-  ACE_Allocator* dblock_allocator =
+  ACE_Allocator* dblock_allocator = 
     ACE_Allocator::instance ();
   if (tss)
     {
-      buffer_allocator =
+      buffer_allocator = 
         TAO_ORB_Core_instance ()->output_cdr_buffer_allocator ();
-      dblock_allocator =
+      dblock_allocator = 
         TAO_ORB_Core_instance ()->output_cdr_dblock_allocator ();
     }
 
@@ -147,7 +147,7 @@ main (int argc, char *argv[])
 
   int* argument_sizes;
   ACE_NEW_RETURN (argument_sizes, int[max_arguments], 1);
-
+    
   int n = ACE_OS::rand_r (seed) % max_arguments + 1;
   for (int k = 0; k < n; ++k)
     argument_sizes[k] = ACE_OS::rand_r (seed) % max_argument_size + 1;
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 81995dcf317..72ae4995da1 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -212,75 +212,75 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0,
-					    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+					    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       ACE_Get_Opt get_opt (argc, argv, "dn:l:");
       int opt;
       
       while ((opt = get_opt ()) != EOF)
-	      {
-	        switch (opt)
-	          {
-	            case 'd':
-	              TAO_debug_level++;
-	              break;
-	            case 'n':
-	              n = ACE_OS::atoi (get_opt.optarg);
-	              break;
-	            case 'l':
-	              nloops = ACE_OS::atoi (get_opt.optarg);
-	              break;
-	            case '?':
-	            default:
-	              ACE_DEBUG ((LM_DEBUG,
-			          "Usage: %s "
-			          "-d debug"
-			          "-n <num> "
-			          "-l <loops> "
-			          "\n",
-			          argv[0]));
-	              return -1;
-	            }
-	      }
+	{
+	  switch (opt)
+	    {
+	    case 'd':
+	      TAO_debug_level++;
+	      break;
+	    case 'n':
+	      n = ACE_OS::atoi (get_opt.optarg);
+	      break;
+	    case 'l':
+	      nloops = ACE_OS::atoi (get_opt.optarg);
+	      break;
+	    case '?':
+	    default:
+	      ACE_DEBUG ((LM_DEBUG,
+			  "Usage: %s "
+			  "-d debug"
+			  "-n <num> "
+			  "-l <loops> "
+			  "\n",
+			  argv[0]));
+	      return -1;
+	    }
+	}
   
       for (int i = 0; i < nloops; ++i)
-	      {
-	        TAO_OutputCDR output;
-	        CDR_Test_Types test_types;
+	{
+	  TAO_OutputCDR output;
+	  CDR_Test_Types test_types;
 	  
-	        if (test_put (output, test_types) != 0)
-	          {
-	            return 1;
-	          }
-	        TAO_InputCDR input (output);
-	        if (TAO_debug_level > 0)
-	          {
-	            ACE_DEBUG ((LM_DEBUG, "Output CDR: \n"));
-	            ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
-	            ACE_DEBUG ((LM_DEBUG, "Input CDR: \n"));
-	            ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
-	          }
+	  if (test_put (output, test_types) != 0)
+	    {
+	      return 1;
+	    }
+	  TAO_InputCDR input (output);
+	  if (TAO_debug_level > 0)
+	    {
+	      ACE_DEBUG ((LM_DEBUG, "Output CDR: \n"));
+	      ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
+	      ACE_DEBUG ((LM_DEBUG, "Input CDR: \n"));
+	      ACE_HEX_DUMP ((LM_DEBUG, input.rd_ptr(), 64));
+	    }
 
-	        if (test_get (input, test_types) != 0)
-	          {
-	            return 1;
-	          }
-	      }
+	  if (test_get (input, test_types) != 0)
+	    {
+	      return 1;
+	    }
+	}
       
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("TC");
+      TAO_TRY_ENV.print_exception ("TC");
       return 0;
 
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp
index 4c4f9519ac6..40c076a1065 100644
--- a/TAO/tests/CDR/octet_sequence.cpp
+++ b/TAO/tests/CDR/octet_sequence.cpp
@@ -27,15 +27,10 @@ ACE_Message_Block * m3;
 
 void dump(char * msg)
 {
-  ACE_DEBUG ((LM_INFO,
-              "%s\n"
-              "m1: %d\n"
-              "m2: %d\n"
-              "m3: %d\n",
-              msg,
-              m1->data_block()->reference_count(),
-              m2->data_block()->reference_count(),
-              m3->data_block()->reference_count()));
+  cout << msg << "\n"
+       << "m1: " << m1->data_block()->reference_count() << "\n"
+       << "m2: " << m2->data_block()->reference_count() << "\n"
+       << "m3: " << m3->data_block()->reference_count() << endl;
 }
 
 int main(int, char*[])
@@ -63,8 +58,7 @@ int main(int, char*[])
     TAO_OutputCDR cdr;
     cdr.write_octet_array_mb(m1);
     dump("expect 3,3,3"); // that's what I expected, anyway
-    ACE_DEBUG ((LM_INFO, "total cdr length is %u\n",
-                ACE_static_cast (u_int, cdr.total_length())));
+    cout << "total cdr length is " << cdr.total_length() << endl;
   }
   dump("expect 2,2,2"); // that's what I expected, anyway
 
diff --git a/TAO/tests/CDR/run_test.pl b/TAO/tests/CDR/run_test.pl
index 0eb511921eb..8d7b776e395 100755
--- a/TAO/tests/CDR/run_test.pl
+++ b/TAO/tests/CDR/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../bin";
 require ACEutils;
 
@@ -17,19 +16,19 @@ $args = "";
 $| = 1;
 print STDERR "\n";
 
-sub run_test
+sub run_test 
 {
     #my $test = shift (@tests);
     my $args = shift (@argslist);
-
+    
     print STDERR "\n$brace $test $args test BEGUN\n";
     $TST = Process::Create  ($EXEPREFIX."$test".$Process::EXE_EXT,
-                             "$args");
+			     "$args");
     print STDERR "\t$test RUNNING\n";
-    $retval = ($TST->Wait ()) / 256;
+    $retval = ($TST->Wait ()) / 256; 
     if (retval != 0)
     {
-        print STDERR "$brace $test $args FAILED; exited with value $retval\n";
+	print STDERR "$brace $test $args FAILED; exited with value $retval\n";
     }
     print STDERR "$brace $test ENDED successfully\n";
 }
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index adaa00b138b..c4121268f76 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -27,13 +27,13 @@ ACE_RCSID(CDR, tc, "$Id$")
 int
 main (int argc, char *argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
                                             0,
-					    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+					    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       static const CORBA::TypeCode_ptr tcs[]=
       {
@@ -103,8 +103,8 @@ main (int argc, char *argv[])
 	{
 	  CORBA::TypeCode_ptr tc = *i;
 
-	  CORBA::TCKind k = tc->kind (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
+	  CORBA::TCKind k = tc->kind (TAO_TRY_ENV);
+	  TAO_CHECK_ENV;
 
 	  switch (k)
 	    {
@@ -115,15 +115,15 @@ main (int argc, char *argv[])
 	    case CORBA::tk_alias:
 	    case CORBA::tk_except:
 	      {
-		const char *id = tc->id (ACE_TRY_ENV);
-		ACE_TRY_CHECK;
+		const char *id = tc->id (TAO_TRY_ENV);
+		TAO_CHECK_ENV;
 
-		const char *name = tc->name (ACE_TRY_ENV);
-		ACE_TRY_CHECK;
+		const char *name = tc->name (TAO_TRY_ENV);
+		TAO_CHECK_ENV;
 
 		CORBA::ULong length = 0;
                 // tc->length (TAO_TRY_ENV);
-		            // ACE_TRY_CHECK;
+		TAO_CHECK_ENV;
 
 		ACE_DEBUG ((LM_DEBUG,
 			    "ID = '%s'\n"
@@ -145,11 +145,11 @@ main (int argc, char *argv[])
 	    }
 	}
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("TC");
+      TAO_TRY_ENV.print_exception ("TC");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DynAny_Test/Makefile b/TAO/tests/DynAny_Test/Makefile
index 6f7ff86f6f2..4ac7d580082 100644
--- a/TAO/tests/DynAny_Test/Makefile
+++ b/TAO/tests/DynAny_Test/Makefile
@@ -59,7 +59,10 @@ CPPFLAGS += -I$(TAO_ROOT)
 basic_test:	$(addprefix $(VDIR),$(BASIC_TEST_OBJS))
 		$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+clean:		
+                -/bin/rm -rf $(VDIR)/*.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean:	clean
-		-$(RM) da_testsC.* da_testsS.* da_testsS_T.*
+		-/bin/rm -rf da_testsC.* da_testsS.* da_testsS_T.*
 
 
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index d96b05a63c7..d0e4ff29331 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -13,7 +13,7 @@
 //    Implementation file for the driver program.
 //
 // = AUTHOR
-//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Jeff Parsons <jp4@cs.wustl.edu>
 //
 // ============================================================================
 
@@ -63,15 +63,15 @@ Driver::~Driver (void)
 int
 Driver::init (int argc, char* argv[])
 {
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       // Retrieve the underlying ORB
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
                                     "local",
-                                    ACE_TRY_ENV);
+                                    TAO_TRY_ENV);
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Parse command line and verify parameters.
       if (this->parse_args (argc, argv) == -1)
@@ -81,12 +81,12 @@ Driver::init (int argc, char* argv[])
                           -1);
 
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("Driver::init");
+      TAO_TRY_ENV.print_exception ("Driver::init");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return 0;
 }
diff --git a/TAO/tests/DynAny_Test/run_test.pl b/TAO/tests/DynAny_Test/run_test.pl
index ae22a39216a..d16d5907fe5 100755
--- a/TAO/tests/DynAny_Test/run_test.pl
+++ b/TAO/tests/DynAny_Test/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../bin";
 require ACEutils;
 
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index b6804112594..ae6bc6c10b3 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -44,7 +44,7 @@ Test_DynAny::run_test (void)
 {
   Data data (this->orb_);
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -55,13 +55,13 @@ Test_DynAny::run_test (void)
 
       CORBA_Any in1 (CORBA::_tc_double);
       CORBA_DynAny_ptr fa1 = this->orb_->create_dyn_any (in1,
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_double (data.m_double1, 
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Double d_out = fa1->get_double (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Double d_out = fa1->get_double (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (d_out == data.m_double1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -74,15 +74,15 @@ Test_DynAny::run_test (void)
       d_out = data.m_double2;
       CORBA_DynAny_ptr ftc1 = 
         this->orb_->create_basic_dyn_any (CORBA::_tc_double,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::Any in_any1;
       in_any1 <<= data.m_double1;
       ftc1->from_any (in_any1, 
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Any* out_any1 = ftc1->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       *out_any1 >>= d_out;
 
       // value in DynAny_i created with NEW
@@ -94,11 +94,11 @@ Test_DynAny::run_test (void)
       else 
         ++this->error_count_;
 
-      fa1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa1);
-      ftc1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc1);
 
       ACE_DEBUG ((LM_DEBUG,
@@ -111,21 +111,21 @@ Test_DynAny::run_test (void)
       CORBA_Any in (CORBA::_tc_TypeCode);
       CORBA_DynAny_ptr fa2 = 
         this->orb_->create_dyn_any (in,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa2->insert_typecode (data.m_typecode1, 
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::TypeCode_ptr tc_out = fa2->get_typecode (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::TypeCode_ptr tc_out = fa2->get_typecode (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (tc_out->equal (data.m_typecode1,
-                         ACE_TRY_ENV))
+                         TAO_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
@@ -133,43 +133,43 @@ Test_DynAny::run_test (void)
       tc_out = data.m_typecode2;
       CORBA_DynAny_ptr ftc2 = 
         this->orb_->create_basic_dyn_any (CORBA::_tc_TypeCode,
-                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::Any in_any2;
       in_any2 <<= data.m_typecode1;
       ftc2->from_any (in_any2, 
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Any* out_any2 = ftc2->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Any* out_any2 = ftc2->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       *out_any2 >>= tc_out;
 
       // value in DynAny_i created with NEW
       delete out_any2;
 
       if (tc_out->equal(data.m_typecode1,
-                        ACE_TRY_ENV))
+                        TAO_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
-      fa2->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa2->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa2);
-      ftc2->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc2->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc2);
       CORBA::release (tc_out);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynany::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynany::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp
index 1d14cea19c9..dfde047395c 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.cpp
+++ b/TAO/tests/DynAny_Test/test_dynarray.cpp
@@ -46,7 +46,7 @@ Test_DynArray::run_test (void)
 
   DynAnyTests::test_array ta = {0};
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -58,25 +58,25 @@ Test_DynArray::run_test (void)
       CORBA::Any in_any1;
       in_any1 <<= ta;
       CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynArray_ptr fa1 = CORBA_DynArray::_narrow (dp1,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->seek (1,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_long (data.m_long1,
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->rewind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->rewind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::Long l_out1 = data.m_long2;
       fa1->seek (1,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      l_out1 = fa1->get_long (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      l_out1 = fa1->get_long (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (l_out1 == data.m_long1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -88,16 +88,16 @@ Test_DynArray::run_test (void)
 
       CORBA_DynArray_ptr ftc1 = 
         this->orb_->create_dyn_array (DynAnyTests::_tc_test_array,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ta[1] = data.m_long1;
       CORBA::Any in_any2;
       in_any2 <<= ta;
       ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Any* out_any1 = ftc1->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       DynAnyTests::test_array_forany ta_out;
       *out_any1 >>= ta_out; 
       
@@ -120,10 +120,10 @@ Test_DynArray::run_test (void)
       as_in[0] = in_any3;
       as_in[1] = in_any3;
       ftc1->set_elements (as_in,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      AnySeq* as_out = ftc1->get_elements (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      AnySeq* as_out = ftc1->get_elements (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_Any out_any2 = (*as_out)[1];
       CORBA::Long l_out2;
       out_any2 >>= l_out2;
@@ -136,20 +136,20 @@ Test_DynArray::run_test (void)
       // Created with NEW
       delete as_out;
 
-      fa1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa1);
-      ftc1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc1);
       CORBA::release (dp1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynarray::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynarray::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index d781d05fa68..b34ee1770ff 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -44,7 +44,7 @@ Test_DynEnum::run_test (void)
 {
   DynAnyTests::test_enum te = DynAnyTests::ZEROTH;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/value_as_ulong\n"));
@@ -52,16 +52,16 @@ Test_DynEnum::run_test (void)
       CORBA_Any in_any1;
       in_any1 <<= te;
       CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1,
-                                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynEnum_ptr de1 = CORBA_DynEnum::_narrow (dp1,
-                                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       de1->value_as_ulong (2,
-                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::ULong ul_out1 = de1->value_as_ulong (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::ULong ul_out1 = de1->value_as_ulong (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (ul_out1 == 2)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -72,10 +72,10 @@ Test_DynEnum::run_test (void)
                  "testing: value_as_string\n"));
 
       de1->value_as_string ("FIRST",
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::String_var s = de1->value_as_string (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::String_var s = de1->value_as_string (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (!ACE_OS::strcmp (s.in (), "FIRST"))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -88,15 +88,15 @@ Test_DynEnum::run_test (void)
 
       CORBA_DynEnum_ptr de2 = 
         this->orb_->create_dyn_enum (DynAnyTests::_tc_test_enum,
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                     TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_Any in_any2;
       in_any2 <<= DynAnyTests::THIRD;
       de2->from_any (in_any2,
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA_Any* out_any1 = de2->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA_Any* out_any1 = de2->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       *out_any1 >>= te;
       if (te == DynAnyTests::THIRD)
         ACE_DEBUG ((LM_DEBUG,
@@ -107,20 +107,20 @@ Test_DynEnum::run_test (void)
       // Created with NEW
       delete out_any1;
 
-      de1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      de1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (de1);
-      de2->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      de2->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (de2);
       CORBA::release (dp1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynenum::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynenum::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 7228533144c..238385f4796 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -47,7 +47,7 @@ Test_DynSequence::run_test (void)
   DynAnyTests::test_seq ts (2);
   ts.length (2);
 
-    ACE_TRY_NEW_ENV
+    TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -62,24 +62,24 @@ Test_DynSequence::run_test (void)
       in_any1 <<= ts;
       CORBA_DynAny_ptr dp1 =
         this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynSequence_ptr fa1 = CORBA_DynSequence::_narrow (dp1,
-                                                              ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                              TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->seek (1,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_string (data.m_string1,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->rewind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->rewind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->seek (1,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::String out_str1 = fa1->get_string (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::String out_str1 = fa1->get_string (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (!ACE_OS::strcmp (out_str1, data.m_string1))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -91,16 +91,16 @@ Test_DynSequence::run_test (void)
 
       CORBA_DynSequence_ptr ftc1 =
         this->orb_->create_dyn_sequence (DynAnyTests::_tc_test_seq,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      ts[0] = CORBA::string_dup (data.m_string1);
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      ts[0] = data.m_string1;
       CORBA_Any in_any2;
       in_any2 <<= ts;
       ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Any* out_any1 = ftc1->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       DynAnyTests::test_seq* ts_out;
       *out_any1 >>= ts_out;
       if (!ACE_OS::strcmp ((*ts_out)[0], data.m_string1))
@@ -116,13 +116,13 @@ Test_DynSequence::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: length/set_elements/get_elements\n"));
 
-      if (ftc1->length (ACE_TRY_ENV) != 2)
+      if (ftc1->length (TAO_TRY_ENV) != 2)
         ++this->error_count_;
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ftc1->length (3,
-                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       AnySeq as_in (3);
       as_in.length (3);
       CORBA_Any in_any3;
@@ -132,10 +132,10 @@ Test_DynSequence::run_test (void)
       in_any3 <<= CORBA::Any::from_string (data.m_string1, 0);
       as_in[2] = in_any3;
       ftc1->set_elements (as_in,
-                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      AnySeq* as_out = ftc1->get_elements (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      AnySeq* as_out = ftc1->get_elements (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_Any out_any2 = (*as_out)[2];
       CORBA::String out_str2;
       out_any2 >>= CORBA::Any::to_string (out_str2, 0);
@@ -149,20 +149,20 @@ Test_DynSequence::run_test (void)
       delete as_out;
       delete out_str2;
 
-      fa1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa1);
       CORBA::release (dp1);
-      ftc1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynsequence::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynsequence::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index dbadeaa4409..2cdf9688b64 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -50,7 +50,7 @@ Test_DynStruct::run_test (void)
   ts.es.f = data.m_float2;
   ts.es.s = data.m_short2;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(Any)/insert/get/next/seek/rewind/current_component\n"));
@@ -59,40 +59,40 @@ Test_DynStruct::run_test (void)
       in_any1 <<= ts;
       CORBA_DynAny_ptr dp1 = 
         this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynStruct_ptr fa1 = CORBA_DynStruct::_narrow (dp1,
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_char (data.m_char1,
-                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_longlong (data.m_longlong1,
-        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->insert_float (data.m_float1,
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->insert_short (data.m_short1,
-                                                          ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->current_component (ACE_TRY_ENV)->rewind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      fa1->rewind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Char c = fa1->get_char (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->current_component (TAO_TRY_ENV)->insert_float (data.m_float1,
+                                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->current_component (TAO_TRY_ENV)->insert_short (data.m_short1,
+                                                          TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->current_component (TAO_TRY_ENV)->rewind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      fa1->rewind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Char c = fa1->get_char (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (c != data.m_char1)
         ++this->error_count_;
-      CORBA::LongLong ll = fa1->get_longlong (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::LongLong ll = fa1->get_longlong (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       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);
-      ACE_TRY_CHECK;
+      fa1->current_component(TAO_TRY_ENV)->seek (1,
+                                                TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Short s = fa1->current_component (TAO_TRY_ENV)->get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (s != data.m_short1)
         ++this->error_count_;
       if (this->error_count_ == 0)
@@ -104,8 +104,8 @@ Test_DynStruct::run_test (void)
 
       CORBA_DynStruct_ptr ftc1 = 
         this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ts.c = data.m_char1;
       ts.ll = data.m_longlong1;
       ts.es.f = data.m_float1;
@@ -113,10 +113,10 @@ Test_DynStruct::run_test (void)
       CORBA_Any in_any2;
       in_any2 <<= ts;
       ftc1->from_any (in_any2,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA_Any* out_any1 = ftc1->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA_Any* out_any1 = ftc1->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       DynAnyTests::test_struct* ts_out;
       *out_any1 >>= ts_out;
       if (ts_out->es.s == data.m_short1)
@@ -132,14 +132,14 @@ Test_DynStruct::run_test (void)
                  "testing: current_member_name/current_member_kind\n"));
 
       ftc1->seek (2,
-                 ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      FieldName fn = ftc1->current_member_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                 TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      FieldName fn = ftc1->current_member_name (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (ACE_OS::strcmp (fn, "es"))
         ++this->error_count_;
-      CORBA::TCKind tk = ftc1->current_member_kind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::TCKind tk = ftc1->current_member_kind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (tk != CORBA::tk_struct)
         ++this->error_count_;
       if (this->error_count_ == 0)
@@ -149,16 +149,16 @@ Test_DynStruct::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: get_members/set_members\n"));
 
-      NameValuePairSeq* nvps = fa1->get_members (ACE_TRY_ENV);
+      NameValuePairSeq* nvps = fa1->get_members (TAO_TRY_ENV);
       CORBA_DynStruct_ptr sm =
         this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
-                                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       sm->set_members (*nvps,
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      NameValuePairSeq* gm = sm->get_members (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      NameValuePairSeq* gm = sm->get_members (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (ACE_OS::strcmp ((*gm)[2].id, "es"))
         ++this->error_count_;
 
@@ -166,23 +166,23 @@ Test_DynStruct::run_test (void)
       delete nvps;
       delete gm;
 
-      fa1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa1);
       CORBA::release (dp1);
-      ftc1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc1);
-      sm->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      sm->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (sm);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynstruct::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynstruct::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 2baaa62e994..33abad947ad 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -46,7 +46,7 @@ Test_DynUnion::run_test (void)
 
   DynAnyTests::test_union tu;
 
-  ACE_TRY_NEW_ENV
+  TAO_TRY
     {
       ACE_DEBUG ((LM_DEBUG,
                  "\t*=*=*=*= %s =*=*=*=*\n",
@@ -61,16 +61,16 @@ Test_DynUnion::run_test (void)
       in_any1 <<= tu;
       CORBA_DynAny_ptr dp1 =
         this->orb_->create_dyn_any (in_any1,
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                    TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynUnion_ptr fa1 = CORBA_DynUnion::_narrow (dp1,
-                                                        ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                                        TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       fa1->insert_short (data.m_short1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Short s_out1 = fa1->get_short (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Short s_out1 = fa1->get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (s_out1 == data.m_short1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -80,17 +80,17 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: constructor(TypeCode)/from_any/to_any\n"));
 
-      CORBA_Any* out_any1 = fa1->to_any (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA_Any* out_any1 = fa1->to_any (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA_DynUnion_ptr ftc1 = 
         this->orb_->create_dyn_union (DynAnyTests::_tc_test_union,
-                                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       ftc1->from_any (*out_any1,
-                      ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::Short s_out2 = ftc1->get_short (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                      TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::Short s_out2 = ftc1->get_short (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (s_out2 == data.m_short1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
@@ -103,64 +103,64 @@ Test_DynUnion::run_test (void)
       ACE_DEBUG ((LM_DEBUG,
                  "testing: set_as_default\n"));
 
-      if (!ftc1->set_as_default (ACE_TRY_ENV))
+      if (!ftc1->set_as_default (TAO_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_;
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing:discriminator/discriminator_kind\n"));
 
-      CORBA_DynAny_ptr dp2 = ftc1->discriminator (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      if (dp2->type (ACE_TRY_ENV)->kind () 
-            == ftc1->discriminator_kind (ACE_TRY_ENV))
+      CORBA_DynAny_ptr dp2 = ftc1->discriminator (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      if (dp2->type (TAO_TRY_ENV)->kind () 
+            == ftc1->discriminator_kind (TAO_TRY_ENV))
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_; 
       
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG,
                  "testing:member/member_kind/member_name\n"));
 
-      CORBA_DynAny_ptr dp3 = ftc1->member (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::String m_nm = ftc1->member_name (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      CORBA::TCKind tk = ftc1->member_kind (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA_DynAny_ptr dp3 = ftc1->member (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::String m_nm = ftc1->member_name (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+      CORBA::TCKind tk = ftc1->member_kind (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       if (!ACE_OS::strcmp (m_nm, "s")         && 
           tk == CORBA::tk_short               &&
-          dp3->get_short (ACE_TRY_ENV) == data.m_short1)
+          dp3->get_short (TAO_TRY_ENV) == data.m_short1)
         ACE_DEBUG ((LM_DEBUG,
                    "++ OK ++\n"));
       else 
         ++this->error_count_; 
 
-      ACE_TRY_CHECK;
+      TAO_CHECK_ENV;
 
       // Created with string_dup
       CORBA::string_free (m_nm);
       
-      fa1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      fa1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (fa1);
       CORBA::release (dp1);
-      ftc1->destroy (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      ftc1->destroy (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
       CORBA::release (ftc1);
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_TRY_ENV.print_exception ("test_dynunion::run_test");
+      TAO_TRY_ENV.print_exception ("test_dynunion::run_test");
       return -1;
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n%d errors\n",
diff --git a/TAO/tests/FL_Cube/Makefile b/TAO/tests/FL_Cube/Makefile
deleted file mode 100644
index 2a722e7b81e..00000000000
--- a/TAO/tests/FL_Cube/Makefile
+++ /dev/null
@@ -1,1460 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server
-
-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))
-
-#----------------------------------------------------------------------------
-#       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
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_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/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.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 \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 test_i.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.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/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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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.h testS_T.h testS_T.i testS_T.cpp testS.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/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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/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 \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.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.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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 test_i.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/FL_Cube/README b/TAO/tests/FL_Cube/README
deleted file mode 100644
index a882db73603..00000000000
--- a/TAO/tests/FL_Cube/README
+++ /dev/null
@@ -1,9 +0,0 @@
-# $Id$
-
-Simply run the server and the client, as follows:
-
-$ server -o foo.ior
-$ client -k file://foo.ior
-
-	The test only does something useful if the FL toolkit was
-enabled.
diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
deleted file mode 100644
index 6267d68055b..00000000000
--- a/TAO/tests/FL_Cube/client.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(FL_Cube, client, "$Id$")
-
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
-#include <FL/Fl.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Roller.h>
-
-class Client
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (CORBA::ORB_ptr orb,
-          Fl_Window* parent);
-  // ctor
-
-  ~Client (void);
-
-  void show (void);
-  // Call show on all the window objects
-
-  void parse_args (int argc, char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV);
-
-private:
-  static void x_cb (Fl_Widget *widget, void* cookie);
-  static void y_cb (Fl_Widget *widget, void* cookie);
-  // The callbacks
-
-  void x_changed (void);
-  void y_changed (void);
-  // The methods for the callbacks
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  Fl_Roller* x_roller_;
-  Fl_Roller* y_roller_;
-  // The rollers
-
-  Simple_Server_var server_;
-  // The server.
-};
-
-int main (int argc, char* argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Fl_Window window (300, 100);
-
-      Client client (orb.in (), &window);
-
-      window.end ();
-
-      window.show ();
-
-      client.show ();
-
-      client.parse_args (argc, argv, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      Fl::run ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-Client::Client (CORBA::ORB_ptr orb,
-                Fl_Window* parent)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-  this->x_roller_ =
-    new Fl_Roller (10, parent->h () / 2 - 20,
-                   parent->w () / 2 - 10, 40);
-  this->x_roller_->type (FL_HORIZONTAL);
-  this->x_roller_->callback (Client::x_cb, this);
-  this->x_roller_->range (-360, 360);
-  this->x_roller_->step (1);
-
-  this->y_roller_ =
-    new Fl_Roller (3 * parent->w () / 4 - 20, 10,
-                   40, parent->h () - 20);
-  this->y_roller_->type (FL_VERTICAL);
-  this->y_roller_->callback (Client::y_cb, this);
-  this->y_roller_->range (-360, 360);
-  this->y_roller_->step (1);
-}
-
-Client::~Client (void)
-{
-  delete x_roller_;
-  delete y_roller_;
-}
-
-void
-Client::show (void)
-{
-  this->x_roller_->show ();
-  this->y_roller_->show ();
-}
-
-void
-Client::x_cb (Fl_Widget*, void* cookie)
-{
-  Client *self = ACE_static_cast(Client*,cookie);
-  self->x_changed ();
-}
-
-void
-Client::y_cb (Fl_Widget*, void* cookie)
-{
-  Client *self = ACE_static_cast(Client*,cookie);
-  self->y_changed ();
-}
-
-void
-Client::x_changed (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Long x = CORBA::Long (this->x_roller_->value ());
-      this->server_->set_x_angle (x, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed");
-    }
-  ACE_ENDTRY;
-}
-
-void
-Client::y_changed (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Long y = CORBA::Long (this->y_roller_->value ());
-      this->server_->set_y_angle (y, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Client::x_changed");
-    }
-  ACE_ENDTRY;
-}
-
-void
-Client::parse_args (int argc, char *argv[],
-                    CORBA::Environment &ACE_TRY_ENV)
-{
-  const char *ior = "file://test.ior";
-
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.optarg;
-        break;
-      case '?':
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    "usage:  %s "
-                    "-k <ior> "
-                    "\n",
-                    argv [0]));
-      }
-
-  CORBA::Object_var object =
-    this->orb_->string_to_object (ior, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  this->server_ =
-    Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-}
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
deleted file mode 100644
index c5f4433df76..00000000000
--- a/TAO/tests/FL_Cube/server.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(FL_Cube, server, "$Id$")
-
-#if !defined (ACE_HAS_FL)
-
-int main (int, char *[])
-{
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  return 0;
-}
-
-#else
-
-#include <FL/Fl.h>
-
-const char *ior_output_file = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-			   "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  Fl_Window window(300, 300);
-
-  Simple_Window sw (10, 10,
-                    window.w () - 20, window.h () - 20);
-  window.resizable (&sw);
-
-  window.end ();
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      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 ()))
-        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;
-
-      Simple_Server_i server_impl (orb.in (), &sw);
-
-      Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-	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);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (Fl::run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Fl::run"), -1);
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/svc.conf b/TAO/tests/FL_Cube/svc.conf
deleted file mode 100644
index 192ca875c45..00000000000
--- a/TAO/tests/FL_Cube/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBreactortype fl_reactor"
diff --git a/TAO/tests/FL_Cube/test.idl b/TAO/tests/FL_Cube/test.idl
deleted file mode 100644
index 6f1397b3008..00000000000
--- a/TAO/tests/FL_Cube/test.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server {
-
-  oneway void set_x_angle (in long x);
-  oneway void set_y_angle (in long y);
-  // Set the X and Y angles in the view port..
-
-  void shutdown ();
-  // Shutdown the ORB
-};
diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp
deleted file mode 100644
index b6208c01cf9..00000000000
--- a/TAO/tests/FL_Cube/test_i.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if defined(ACE_HAS_FL)
-#include <GL/gl.h>
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(FL_Cube, test_i, "$Id$")
-
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
-                                  Simple_Window *window)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     window_ (window)
-{
-
-}
-
-void
-Simple_Server_i::set_x_angle (CORBA::Long x, CORBA::Environment&)
-{
-  this->window_->set_x_angle (x);
-}
-
-void
-Simple_Server_i::set_y_angle (CORBA::Long y, CORBA::Environment&)
-{
-  this->window_->set_y_angle (y);
-}
-
-void
-Simple_Server_i::shutdown (CORBA::Environment&)
-{
-  this->orb_->shutdown (0);
-}
-
-// ****************************************************************
-
-Simple_Window::Simple_Window (int x, int y,
-                              int w, int h,
-                              const char* l)
-  :  Fl_Gl_Window (x, y, w, h, l),
-     x_angle_ (0),
-     y_angle_ (0)
-{
-    boxv0[0] = -0.5; boxv0[1] = -0.5; boxv0[2] = -0.5;
-    boxv1[0] =  0.5; boxv1[1] = -0.5; boxv1[2] = -0.5;
-    boxv2[0] =  0.5; boxv2[1] =  0.5; boxv2[2] = -0.5;
-    boxv3[0] = -0.5; boxv3[1] =  0.5; boxv3[2] = -0.5;
-    boxv4[0] = -0.5; boxv4[1] = -0.5; boxv4[2] =  0.5;
-    boxv5[0] =  0.5; boxv5[1] = -0.5; boxv5[2] =  0.5;
-    boxv6[0] =  0.5; boxv6[1] =  0.5; boxv6[2] =  0.5;
-    boxv7[0] = -0.5; boxv7[1] =  0.5; boxv7[2] =  0.5;
-}
-
-void
-Simple_Window::set_x_angle (CORBA::Long x)
-{
-  this->x_angle_ = x;
-  this->redraw ();
-}
-
-void
-Simple_Window::set_y_angle (CORBA::Long y)
-{
-  this->y_angle_ = y;
-  this->redraw ();
-}
-
-void
-Simple_Window::draw (void)
-{
-  // Based on the CubeView example in the FL toolkit.
-
-  if (!this->valid())
-    {
-      glLoadIdentity();
-      glViewport(0, 0, this->w(), this->h());
-      glOrtho(-2,2,-2,2,-20000,10000);
-      glEnable(GL_BLEND);
-      glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-    }
-
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-    glPushMatrix();
-
-    glRotatef(this->x_angle_, 0, 1, 0);
-    glRotatef(this->y_angle_, 1, 0, 0);
-
-    this->draw_cube ();
-
-    glPopMatrix ();
-}
-
-void
-Simple_Window::draw_cube (void)
-{
-  const float ALPHA = 0.5;
-
-    glBegin(GL_QUADS);
-      glColor4f(0.0, 0.0, 1.0, ALPHA);
-      glVertex3fv(boxv0);
-      glVertex3fv(boxv1);
-      glVertex3fv(boxv2);
-      glVertex3fv(boxv3);
-
-      glColor4f(1.0, 1.0, 0.0, ALPHA);
-      glVertex3fv(boxv0);
-      glVertex3fv(boxv4);
-      glVertex3fv(boxv5);
-      glVertex3fv(boxv1);
-
-      glColor4f(0.0, 1.0, 1.0, ALPHA);
-      glVertex3fv(boxv2);
-      glVertex3fv(boxv6);
-      glVertex3fv(boxv7);
-      glVertex3fv(boxv3);
-
-      glColor4f(1.0, 0.0, 0.0, ALPHA);
-      glVertex3fv(boxv4);
-      glVertex3fv(boxv5);
-      glVertex3fv(boxv6);
-      glVertex3fv(boxv7);
-
-      glColor4f(1.0, 0.0, 1.0, ALPHA);
-      glVertex3fv(boxv0);
-      glVertex3fv(boxv3);
-      glVertex3fv(boxv7);
-      glVertex3fv(boxv4);
-
-      glColor4f(0.0, 1.0, 0.0, ALPHA);
-      glVertex3fv(boxv1);
-      glVertex3fv(boxv5);
-      glVertex3fv(boxv6);
-      glVertex3fv(boxv2);
-    glEnd();
-
-    glColor3f(1.0, 1.0, 1.0);
-    glBegin(GL_LINES);
-      glVertex3fv(boxv0);
-      glVertex3fv(boxv1);
-
-      glVertex3fv(boxv1);
-      glVertex3fv(boxv2);
-
-      glVertex3fv(boxv2);
-      glVertex3fv(boxv3);
-
-      glVertex3fv(boxv3);
-      glVertex3fv(boxv0);
-
-      glVertex3fv(boxv4);
-      glVertex3fv(boxv5);
-
-      glVertex3fv(boxv5);
-      glVertex3fv(boxv6);
-
-      glVertex3fv(boxv6);
-      glVertex3fv(boxv7);
-      glVertex3fv(boxv7);
-      glVertex3fv(boxv4);
-
-      glVertex3fv(boxv0);
-      glVertex3fv(boxv4);
-
-      glVertex3fv(boxv1);
-      glVertex3fv(boxv5);
-
-      glVertex3fv(boxv2);
-      glVertex3fv(boxv6);
-
-      glVertex3fv(boxv3);
-      glVertex3fv(boxv7);
-    glEnd();
-}
-
-#endif /* ACE_HAS_FL */
diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h
deleted file mode 100644
index 76b105cff79..00000000000
--- a/TAO/tests/FL_Cube/test_i.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/FL_Server
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_FL_SERVER_TEST_I_H
-#define TAO_FL_SERVER_TEST_I_H
-
-#include "testS.h"
-
-#if defined(ACE_HAS_FL)
-
-#include <FL/Fl_Gl_Window.h>
-
-
-class Simple_Window : public Fl_Gl_Window
-{
-public:
-  Simple_Window (int x, int y, int w, int h,
-                 const char * l = 0);
-  // Constructor
-
-  void set_x_angle (CORBA::Long x);
-  void set_y_angle (CORBA::Long y);
-
-private:
-  virtual void draw (void);
-  // from the Fl_Gl_Window...
-
-  virtual void draw_cube (void);
-
-  CORBA::Long x_angle_;
-  CORBA::Long y_angle_;
-  // The angles...
-
-  float boxv0[3]; float boxv1[3];
-  float boxv2[3]; float boxv3[3];
-  float boxv4[3]; float boxv5[3];
-  float boxv6[3]; float boxv7[3];
-  // The vertices of the cube
-};
-
-class Simple_Server_i : public POA_Simple_Server
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Simple_Server_i (CORBA::ORB_ptr orb,
-                   Simple_Window* window);
-  // ctor
-
-  // = The Simple_Server methods.
-  void set_x_angle (CORBA::Long x, CORBA::Environment&);
-  void set_y_angle (CORBA::Long y, CORBA::Environment&);
-  void shutdown (CORBA::Environment&);
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  Simple_Window* window_;
-  // Display the graphics...
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_FL */
-
-#endif /* TAO_FL_SERVER_TEST_I_H */
diff --git a/TAO/tests/FL_Cube/test_i.i b/TAO/tests/FL_Cube/test_i.i
deleted file mode 100644
index cfa1da318d3..00000000000
--- a/TAO/tests/FL_Cube/test_i.i
+++ /dev/null
@@ -1 +0,0 @@
-// $Id$
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.dsw b/TAO/tests/InterOp-Naming/InterOp-Naming.dsw
deleted file mode 100644
index 6648f10b220..00000000000
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "InterOpNaming"=".\InterOp_test.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-    Begin Project Dependency

-    Project_Dep_Name Simple Bank Client

-    End Project Dependency

-}}}

-

-###############################################################################

-

-Project: "Simple Bank Client"="..\..\examples\Simple\bank\client.dsp" - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/InterOp-Naming/InterOp_test.cpp b/TAO/tests/InterOp-Naming/InterOp_test.cpp
deleted file mode 100644
index a371592d946..00000000000
--- a/TAO/tests/InterOp-Naming/InterOp_test.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-// $Id$
-
-#include "tao/ORB.h"
-#include "tao/corba.h"
-#include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Naming/Naming_Utils.h"
-#include "BankC.h"
-#include "BankS.h"
-
-int
-main (int argc, char *argv[])
-{
-  Bank::AccountManager_var accountmanager_server;
-  Bank::Account_var server;
-
-  TAO_TRY
-    {
-
-      // Retrieve the ORB.
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
-                                             argv,
-                                             0,
-                                             TAO_TRY_ENV);
-      TAO_CHECK_ENV;
-
-      if (argc < 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "No Name specified to be resolved\n"));
-        }
-      else
-        {
-          CORBA::Object_var naming_obj =
-            orb_->resolve_initial_references (argv[1]);
-
-          if (CORBA::is_nil (naming_obj.in ()))
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               " (%P|%t) Unable to resolve the given Name.\n"),
-                              -1);
-
-          accountmanager_server =
-            Bank::AccountManager::_narrow (naming_obj.in (),
-                                           TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          server = accountmanager_server->open ("Vishal",
-                                                100.00,
-                                                TAO_TRY_ENV);
-
-          TAO_CHECK_ENV;
-
-          server->deposit (100.00,
-                           TAO_TRY_ENV);
-          TAO_CHECK_ENV;
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "Balance returned from Server : %f\n",
-                      server->balance (TAO_TRY_ENV)));
-
-
-          ACE_DEBUG ((LM_DEBUG,
-                      "Resolved IOR for %s : %s\n",
-                      argv[1],
-                      orb_->object_to_string (naming_obj.in ())));
-
-        }
-    }
-  TAO_CATCHANY
-    {
-      TAO_TRY_ENV.print_exception ("init");
-      return -1;
-    }
-  TAO_ENDTRY;
-
-  return 0;
-}
-
-
-
-
diff --git a/TAO/tests/InterOp-Naming/InterOp_test.dsp b/TAO/tests/InterOp-Naming/InterOp_test.dsp
deleted file mode 100644
index ab901a516c5..00000000000
--- a/TAO/tests/InterOp-Naming/InterOp_test.dsp
+++ /dev/null
@@ -1,112 +0,0 @@
-# Microsoft Developer Studio Project File - Name="InterOperable Naming Service Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=InterOperable Naming Service 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 "InterOp_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 "InterOp_test.mak" CFG="InterOperable Naming Service Test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "InterOperable Naming Service Test - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "InterOperable Naming Service 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)" == "InterOperable Naming Service 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 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 "..\..\\" /I "..\..\orbsvcs\\" /I "..\..\examples\Simple\bank" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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 orbsvcs.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ELSEIF  "$(CFG)" == "InterOperable Naming Service 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 /I "..\..\..\\" /I "..\..\\" /I "..\..\orbsvcs\\" /I "..\..\examples\Simple\bank" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD  /c

-# SUBTRACT CPP /YX

-# 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 orbsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao" /libpath:"..\..\orbsvcs\orbsvcs"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "InterOperable Naming Service Test - Win32 Release"

-# Name "InterOperable Naming Service Test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=..\..\examples\Simple\bank\BankC.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\examples\Simple\bank\BankS.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\InterOp_test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/InterOp-Naming/Makefile b/TAO/tests/InterOp-Naming/Makefile
deleted file mode 100644
index a3cf6276b87..00000000000
--- a/TAO/tests/InterOp-Naming/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif
-
-LDLIBS = -lTAO
-
-PROG_SRCS = \
-        InterOp_test.cpp \
-
-SRC = $(PROG_SRCS)
-
-SIMPLE_CLT_OBJS = \
-                InterOp_test.o \
-                ../../../examples/Simple/bank/.obj/BankC.o \
-                ../../../examples/Simple/bank/.obj/BankS.o
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-BIN2 = InterOp_test
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
-
-#----------------------------------------------------------------------------
-#       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
-#----------------------------------------------------------------------------
-
-
-LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service -L$(TAO_ROOT)/examples/Simple/bank
-
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT)/examples/Simple/bank
-
-InterOp_test: $(addprefix $(VDIR),$(SIMPLE_CLT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-#----------------------------------------------------------------------------
-#       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/tests/InterOp-Naming/README b/TAO/tests/InterOp-Naming/README
deleted file mode 100644
index 1cdb7366cca..00000000000
--- a/TAO/tests/InterOp-Naming/README
+++ /dev/null
@@ -1,69 +0,0 @@
-CORBA InterOperable Naming Service :
--------------------------------------
-
-This service allows the ORB to be administratively configured to return
-object references from CORBA::ORB::resolve_initial_references () for
-non-locality constrained objects.
-
-For more information on the service please see :
-
-$(TAO_ROOT)/docs/releasenotes/#nservices
-$(TAO_ROOT)/docs/Options.html
-
-The InterOp_test :
-
-With minor changes to the Makefile the test can be run with any of the
-TAO simple examples $(TAO_ROOT)/examples/Simple/* . Here the test is 
-run with the bank example. The test calls resolve_initial_references 
-on argv[1].
-
-TEST 1: Single Profile iioplocs using -ORBInitRef
-
-Simple/bank> server -i bank -n  
-					// -i Adds the bank:IOR mapping to
-					// the ORB table.
-					// -n Use the Naming Service.
-
-InterOp-Naming> InterOp_test arbit_service \
-		-ORBInitRef "arbit_service=iioploc:1.0//<host-name>:<port>/bank"
-
-
-TEST 2: Multiple Profile iioplocs using -ORBInitRef
-
-Simple/bank> server -i bank -n
-
-					// -i Adds the bank:IOR mapping to
-					// the ORB table.
-					// -n Use the Naming Service.
-
-InterOp-Naming> InterOp_test arbit_service \
-		-ORBInitRef "arbit_service=iioploc:1.0//<host-name>:<port>/bank,
-					   1.0//<host-name2>:<port2>/key,
-					   ...
-					   1.0//<host-namen>:<portN>/key"
-
-TEST 3: Single Profile iioploc using -ORBDefautlInitRef
-
-Simple/bank> server -i bank -n
-
-					// -i Adds the bank:IOR mapping to
-					// the ORB table.
-					// -n Use the Naming Service.
-
-InterOp-Naming> InterOp_test bank \
-		-ORBDefaultInitRef "iioploc:1.0//<host-name>:<port>"
-
-TEST 4: Multiple Profile iioploc using -ORBDefaultInitRef
-
-Simple/bank> server -i bank -n
-
-					// -i Adds the bank:IOR mapping to
-					// the ORB table.
-					// -n Use the Naming Service.
-
-InterOp-Naming> InterOp_test bank \
-		-ORBDefaultInitRef "iioploc:1.0//<host-name>:<port>,
-					    1.0//<host-name2>:<port2>,
-					    ...
-					    1.0//<host-namen>:<portN>"
-
diff --git a/TAO/tests/MT_Client/MT_Client.dsw b/TAO/tests/MT_Client/MT_Client.dsw
deleted file mode 100644
index 6cab0b649dd..00000000000
--- a/TAO/tests/MT_Client/MT_Client.dsw
+++ /dev/null
@@ -1,53 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

-

-###############################################################################

-

-Project: "Multithreaded Client"=.\client.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Multithreaded Server"=.\server.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "ORB Creation"=.\orb_creation.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/TAO/tests/MT_Client/Makefile b/TAO/tests/MT_Client/Makefile
deleted file mode 100644
index 354c6cc5427..00000000000
--- a/TAO/tests/MT_Client/Makefile
+++ /dev/null
@@ -1,1743 +0,0 @@
-#----------------------------------------------------------------------------
-#
-#       $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-IDLFILES = testC testS
-BIN = client server orb_creation
-
-SRC = $(addsuffix .cpp, $(BIN) $(IDLFILES) test_i)
-
-CLIENT_OBJS = 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
-#----------------------------------------------------------------------------
-
-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
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-orb_creation: $(addprefix $(VDIR),$(ORB_CREATION_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/client.o .obj/client.so .shobj/client.o .shobj/client.so: 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/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/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/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/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 \
- 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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/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/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
- test_i.h testS.h 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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 test_i.i
-.obj/orb_creation.o .obj/orb_creation.so .shobj/orb_creation.o .shobj/orb_creation.so: orb_creation.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/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/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/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/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 \
- 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 \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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.h testS_T.h testS_T.i testS_T.cpp testS.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/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 \
- $(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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 test_i.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/MT_Client/README b/TAO/tests/MT_Client/README
deleted file mode 100644
index 88e1fb11341..00000000000
--- a/TAO/tests/MT_Client/README
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id$
-
-Description:
-
-	This is a simple test for multi-threaded clients; it just
-creates a simple server process and runs a client with multiple thread 
-sharing the same object reference.
-
-Expected output:
-	The server prints out the IOR of the object it serves. The
-client shouldn't print out anything, it returns 0 on success.
-	Note: there seems to be a little bug in the leader-follower
-code and it prints more than it should.
-
-How to run:
-	You can use the run_test.pl script to run it or:
-
-$ server -o test.ior
-$ client -k file://test.ior -n 4 -i 1000
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
deleted file mode 100644
index d47a445d22c..00000000000
--- a/TAO/tests/MT_Client/client.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "testC.h"
-
-ACE_RCSID(MT_Client, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int niterations = 5;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
-  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 '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-n <nthreads> "
-                           "-i <niterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (Simple_Server_ptr server, int niterations);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  Simple_Server_var server_;
-  // The server.
-
-  int niterations_;
-  // The number of iterations on each client thread.
-};
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      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;
-
-      Simple_Server_var server =
-        Simple_Server::_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);
-        }
-
-      Client client (server.in (), niterations);
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
-      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 (Simple_Server_ptr server,
-                int niterations)
-  :  server_ (Simple_Server::_duplicate (server)),
-     niterations_ (niterations)
-{
-}
-
-int
-Client::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // If we are using a global ORB this is a nop, otherwise it
-      // initializes the ORB resources for this thread.
-      int argc = 0;
-      char* argv[] = { "" };
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-          this->server_->test_method (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/client.dsp b/TAO/tests/MT_Client/client.dsp
deleted file mode 100644
index 94fdf21662c..00000000000
--- a/TAO/tests/MT_Client/client.dsp
+++ /dev/null
@@ -1,205 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Multithreaded Client" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Multithreaded 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 NMAKE /f "client.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 "client.mak" CFG="Multithreaded Client - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Multithreaded Client - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Multithreaded Client - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Multithreaded Client - 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 ""

-# 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 /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "Multithreaded Client - 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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Multithreaded Client - Win32 Release"

-# Name "Multithreaded Client - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\client.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 ""

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "Multithreaded 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

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl $(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)" == "Multithreaded Client - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl $(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

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\testC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/MT_Client/client.global.conf b/TAO/tests/MT_Client/client.global.conf
deleted file mode 100644
index 4883a8b375b..00000000000
--- a/TAO/tests/MT_Client/client.global.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBresources global"
diff --git a/TAO/tests/MT_Client/client.tss.conf b/TAO/tests/MT_Client/client.tss.conf
deleted file mode 100644
index d1a2308e80f..00000000000
--- a/TAO/tests/MT_Client/client.tss.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-static Resource_Factory "-ORBresources tss"
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
deleted file mode 100644
index 117441de000..00000000000
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "testC.h"
-
-ACE_RCSID(MT_Client, orb_creation, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int niterations = 5;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
-  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 '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-n <nthreads> "
-                           "-i <niterations> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client : public ACE_Task_Base
-{
-  // = TITLE
-  //   Run the client thread
-  //
-  // = DESCRIPTION
-  //   Use the ACE_Task_Base class to run the client threads.
-  //
-public:
-  Client (int niterations,
-          const char* ior);
-  // ctor
-
-  virtual int svc (void);
-  // The thread entry point.
-
-private:
-  int niterations_;
-  // The number of iterations on each client thread.
-
-  const char* ior_;
-  // The IOR that we should use.
-};
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
-      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;
-
-      Simple_Server_var server =
-        Simple_Server::_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);
-        }
-
-      Client client (niterations, ior);
-      if (client.activate (THR_NEW_LWP | THR_JOINABLE,
-                           nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate client threads\n"),
-                          1);
-
-      client.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "threads finished\n"));
-
-      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 (int niterations,
-                const char* ior)
-  :  niterations_ (niterations),
-     ior_ (ior)
-{
-}
-
-int
-Client::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      for (int i = 0; i < this->niterations_; ++i)
-        {
-          // If we are using a global ORB this is a nop, otherwise it
-          // initializes the ORB resources for this thread.
-          int argc = 0;
-          char* argv[] = { "" };
-          CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          CORBA::Object_var object =
-            orb->string_to_object (this->ior_, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          Simple_Server_var server =
-            Simple_Server::_narrow (object.in (), ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (server.in ()))
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%P|%t) Object reference <%s> is nil\n",
-                                 ior),
-                                1);
-            }
-
-          server->test_method (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          if (TAO_debug_level > 0 && i % 100 == 0)
-            ACE_DEBUG ((LM_DEBUG, "(%P|%t) iteration = %d\n", i));
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "MT_Client: exception raised");
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/orb_creation.dsp b/TAO/tests/MT_Client/orb_creation.dsp
deleted file mode 100644
index ef588a54094..00000000000
--- a/TAO/tests/MT_Client/orb_creation.dsp
+++ /dev/null
@@ -1,206 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ORB Creation" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=ORB Creation - 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 "orb_creation.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 "orb_creation.mak" CFG="ORB Creation - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ORB Creation - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "ORB Creation - 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)" == "ORB Creation - 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 ""

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "ORB Creation - 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "ORB Creation - Win32 Release"

-# Name "ORB Creation - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\orb_creation.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 ""

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "ORB Creation - 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

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl $(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)" == "ORB Creation - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl $(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

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\testC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/MT_Client/run_test.pl b/TAO/tests/MT_Client/run_test.pl
deleted file mode 100755
index 659f8671712..00000000000
--- a/TAO/tests/MT_Client/run_test.pl
+++ /dev/null
@@ -1,43 +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 ACEutils;
-
-$client_conf="client.global.conf";
-$client_process="client";
-$debug_level='0';
-$threads='10';
-
-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$Process::EXE_EXT ",
-                       " -ORBsvcconf server.conf  -ORBdebuglevel $debug_level"
-                       . " -o $iorfile");
-
-ACE::waitforfile ($iorfile);
-
-$status  = system ($EXEPREFIX."$client_process$Process::EXE_EXT "
-                   . " -ORBsvcconf $client_conf -ORBdebuglevel $debug_level"
-                   . " -k file://$iorfile "
-                   . " -n $threads -i 1000");
-
-$SV->Kill (); $SV->Wait ();
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/MT_Client/server.conf b/TAO/tests/MT_Client/server.conf
deleted file mode 100644
index f56feb1f8d0..00000000000
--- a/TAO/tests/MT_Client/server.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-#
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency thread-per-connection"
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
deleted file mode 100644
index f3d32eea712..00000000000
--- a/TAO/tests/MT_Client/server.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-
-ACE_RCSID(MT_Client, server, "$Id$")
-
-const char *ior_output_file = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-			   "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  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;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Simple_Server_i server_impl (orb.in ());
-
-      Simple_Server_var server =
-        server_impl._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-	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);
-	}
-
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      if (orb->run () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "orb->run"), -1);
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/MT_Client/server.dsp b/TAO/tests/MT_Client/server.dsp
deleted file mode 100644
index 698582b3fa6..00000000000
--- a/TAO/tests/MT_Client/server.dsp
+++ /dev/null
@@ -1,218 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Multithreaded Server" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Multithreaded 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 NMAKE /f "server.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 "server.mak" CFG="Multithreaded Server - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Multithreaded Server - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "Multithreaded Server - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "Multithreaded Server - 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 ""

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 tao.lib ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ELSEIF  "$(CFG)" == "Multithreaded Server - 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 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 taod.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace" /libpath:"..\..\tao"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Multithreaded Server - Win32 Release"

-# Name "Multithreaded Server - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\server.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\test_i.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"

-# Begin Source File

-

-SOURCE=.\test_i.h

-# End Source File

-# End Group

-# Begin Group "IDL Files"

-

-# PROP Default_Filter ".idl"

-# Begin Source File

-

-SOURCE=.\test.idl

-

-!IF  "$(CFG)" == "Multithreaded 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

-

-BuildCmds= \

-	..\..\..\bin\Release\tao_idl $(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)" == "Multithreaded Server - Win32 Debug"

-

-USERDEP__TEST_="..\..\..\bin\tao_idl.exe"	

-# Begin Custom Build - Invoking TAO_IDL Compiler

-InputPath=.\test.idl

-InputName=test

-

-BuildCmds= \

-	..\..\..\bin\tao_idl $(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

-# Begin Group "Inline Files"

-

-# PROP Default_Filter ".i"

-# Begin Source File

-

-SOURCE=.\test_i.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testC.i

-# End Source File

-# Begin Source File

-

-SOURCE=.\testS.i

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/TAO/tests/MT_Client/test.idl b/TAO/tests/MT_Client/test.idl
deleted file mode 100644
index 62239ef9a88..00000000000
--- a/TAO/tests/MT_Client/test.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * $Id$
- */
-
-interface Simple_Server {
-  void test_method ();
-
-  void shutdown ();
-};
diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp
deleted file mode 100644
index e6e62d54fc2..00000000000
--- a/TAO/tests/MT_Client/test_i.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(MT_Client, test_i, "$Id$")
-
-void
-Simple_Server_i::test_method (CORBA::Environment&)
-{
-}
-
-void
-Simple_Server_i::shutdown (CORBA::Environment&)
-{
-  this->orb_->shutdown (1);
-}
diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h
deleted file mode 100644
index 75575caf691..00000000000
--- a/TAO/tests/MT_Client/test_i.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/MT_Client
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Carlos O'Ryan
-//
-// ============================================================================
-
-#ifndef TAO_MT_CLIENT_TEST_I_H
-#define TAO_MT_CLIENT_TEST_I_H
-
-#include "testS.h"
-
-class Simple_Server_i : public POA_Simple_Server
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  // = The Simple_Server methods.
-  void test_method (CORBA::Environment&);
-  void shutdown (CORBA::Environment&);
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_MT_CLIENT_TEST_I_H */
diff --git a/TAO/tests/MT_Client/test_i.i b/TAO/tests/MT_Client/test_i.i
deleted file mode 100644
index 97524552ff4..00000000000
--- a/TAO/tests/MT_Client/test_i.i
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile
index 83ba817c7d2..19d918755e7 100644
--- a/TAO/tests/Makefile
+++ b/TAO/tests/Makefile
@@ -15,8 +15,6 @@ DIRS  = CDR \
         Param_Test \
         NestedUpcall \
         Multiple_Inheritance \
-	MT_Client \
-	FL_Cube
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
diff --git a/TAO/tests/Multiple_Inheritance/Makefile b/TAO/tests/Multiple_Inheritance/Makefile
index a23748954c7..82e5aaac7d5 100644
--- a/TAO/tests/Multiple_Inheritance/Makefile
+++ b/TAO/tests/Multiple_Inheritance/Makefile
@@ -15,11 +15,11 @@ endif # ! TAO_ROOT
 LDLIBS = -lTAO
 
 IDL_SRC	= Multiple_InheritanceC.cpp Multiple_InheritanceS.cpp
-PROG_SRCS = $(IDL_SRC) server.cpp client.cpp
+PROG_SRCS = $(IDL_SRC) server.cpp client.cpp 
 
 LSRC = $(PROG_SRCS)
 
-FILE_SVR_OBJS = Multiple_InheritanceC.o Multiple_InheritanceS.o server.o
+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
@@ -50,861 +50,32 @@ client:	$(addprefix $(VDIR),$(FILE_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) Multiple_InheritanceC.* Multiple_InheritanceS.* Multiple_InheritanceS_T.* client server
+	-/bin/rm -rf Multiple_InheritanceC.* Multiple_InheritanceS.* Multiple_InheritanceS_T.* client server
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 .obj/Multiple_InheritanceC.o .obj/Multiple_InheritanceC.so .shobj/Multiple_InheritanceC.o .shobj/Multiple_InheritanceC.so: Multiple_InheritanceC.cpp \
- Multiple_InheritanceC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Multiple_InheritanceC.i Multiple_InheritanceS.h \
- Multiple_InheritanceS_T.h Multiple_InheritanceS_T.i \
- Multiple_InheritanceS_T.cpp Multiple_InheritanceS.i
+ Multiple_InheritanceC.h Multiple_InheritanceC.i \
+ Multiple_InheritanceS.h Multiple_InheritanceS_T.h \
+ Multiple_InheritanceS_T.i Multiple_InheritanceS_T.cpp \
+ Multiple_InheritanceS.i
 .obj/Multiple_InheritanceS.o .obj/Multiple_InheritanceS.so .shobj/Multiple_InheritanceS.o .shobj/Multiple_InheritanceS.so: Multiple_InheritanceS.cpp \
  Multiple_InheritanceS.h Multiple_InheritanceC.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  Multiple_InheritanceC.i Multiple_InheritanceS_T.h \
  Multiple_InheritanceS_T.i Multiple_InheritanceS_T.cpp \
  Multiple_InheritanceS.i
-.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/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
- Multiple_Inheritance_i.h Multiple_InheritanceS.h \
- Multiple_InheritanceC.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Multiple_InheritanceC.i Multiple_InheritanceS_T.h \
- Multiple_InheritanceS_T.i Multiple_InheritanceS_T.cpp \
- Multiple_InheritanceS.i \
+.obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp Multiple_Inheritance_i.h Multiple_InheritanceS.h \
+ Multiple_InheritanceC.h Multiple_InheritanceC.i \
+ Multiple_InheritanceS_T.h Multiple_InheritanceS_T.i \
+ Multiple_InheritanceS_T.cpp Multiple_InheritanceS.i \
  $(TAO_ROOT)/tao/TAO.h
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
@@ -961,229 +132,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- Multiple_InheritanceC.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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Multiple_InheritanceC.i
+ Multiple_InheritanceC.h Multiple_InheritanceC.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 69b7e081cd9..c91e049c621 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -71,7 +71,7 @@ main (int argc, char **argv)
 {
   CORBA::Environment env;
 
-  // Parse the command-line arguments to get the IOR
+  // Parse the command-line arguments to get the IOR 
   parse_args (argc, argv);
 
   // Initialize the ORB
@@ -83,13 +83,13 @@ main (int argc, char **argv)
     }
 
   // If ior_input_file exists, Read the file, and get the IOR
-  // else, it must have been specified on the command line
+  // else, it must have been specified on the command line 
   if (ior_input_file != 0)
     {
       ACE_HANDLE input_file = ACE_OS::open (ior_input_file, 0);
       if (input_file == ACE_INVALID_HANDLE)
-	ACE_ERROR_RETURN ((LM_ERROR,
-			   "Cannot open input file for reading IOR: %s\n",
+	ACE_ERROR_RETURN ((LM_DEBUG,
+			   "Cannot open input file for reading IOR: %s\n", 
 			   ior_input_file),
 			  -1);
       ACE_Read_Buffer ior_buffer (input_file);
@@ -110,7 +110,7 @@ main (int argc, char **argv)
       env.print_exception ("CORBA::ORB::string_to_object");
       return -1;
     }
-
+  
   CORBA::String_var string;
 
   // Narrow the object reference
diff --git a/TAO/tests/Multiple_Inheritance/run_test.pl b/TAO/tests/Multiple_Inheritance/run_test.pl
index a5533c0989c..abaeff69391 100755
--- a/TAO/tests/Multiple_Inheritance/run_test.pl
+++ b/TAO/tests/Multiple_Inheritance/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../bin';
 require ACEutils;
 
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index 05135156b37..be8bd73c210 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -43,37 +43,37 @@ main (int argc, char **argv)
   ACE_DEBUG ((LM_DEBUG, "\n\tMultiple Inheritance Server\n\n"));
   TAO_TRY
     {
-      orb_manager.init_child_poa (argc,
-                                  argv,
-                                  "child_poa",
+      orb_manager.init_child_poa (argc, 
+                                  argv, 
+                                  "child_poa", 
                                   TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       if (parse_args (argc, argv) != 0)
 	return -1;
-
+      
       CORBA::String_var ior =
-	orb_manager.activate_under_child_poa ("my_object",
-					      &servant,
+	orb_manager.activate_under_child_poa ("my_object", 
+					      &servant, 
 					      TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
       ACE_DEBUG ((LM_DEBUG, "%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",
+	    ACE_ERROR_RETURN ((LM_DEBUG,
+			       "Cannot open output file for writing IOR: %s", 
 			       ior_output_file),
-			      -1);
+			      -1); 
 	  ACE_OS::fprintf (output_file, "%s", ior.in ());
 	  ACE_OS::fclose (output_file);
 	}
-
+      
       orb_manager.run (TAO_TRY_ENV);
       TAO_CHECK_ENV;
     }
diff --git a/TAO/tests/Multiple_Profiles/Makefile b/TAO/tests/Multiple_Profiles/Makefile
deleted file mode 100644
index 0d266622919..00000000000
--- a/TAO/tests/Multiple_Profiles/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lTAO
-
-PROG_SRCS =	forward.cpp
-
-LSRC = $(PROG_SRCS)
-
-OBJS = forward.o
-
-BIN = forward
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-
-#----------------------------------------------------------------------------
-#	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
-
-forward:	$(addprefix $(VDIR),$(OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Multiple_Profiles/forward.cpp b/TAO/tests/Multiple_Profiles/forward.cpp
deleted file mode 100644
index 846532a1727..00000000000
--- a/TAO/tests/Multiple_Profiles/forward.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-// $Id$
-#include <tao/IIOP_Profile.h>
-#include <tao/Stub.h>
-// this gives all we need
-
-// URL SYNTAX
-// IOP:major.minor//host:port/object_key
-const char host_base[] = "myhost";
-const int  port_base   = 10000;
-const TAO_ObjectKey key_base (0);
-const ACE_INET_Addr addr_base;
-
-STUB_Object **FWD_STUBS = 0;
-STUB_Object *base_stub = 0;
-
-// a stand in for TAO_GIOP_Invocation::start which calls
-// TAO_Connector_Registry::connect (STUB_Object *&obj, ...)
-// connect will then get the profile_in_use () and call the
-// corresponding concrete connectors connect method.
-int
-mystart ()
-{
-  // this is where we would get the connector registry
-  // and ask it to connect us to the STUB_Object
-  char answer[80];
-  TAO_IIOP_Profile *pfile = 
-    ACE_dynamic_cast (TAO_IIOP_Profile *, base_stub->profile_in_use ());
-
-  printf("Try to connect to host %s, port %d\n", 
-	 pfile->host (), pfile->port ());
-
-  printf("Succeed or Error [s|e]? ");
-
-  scanf ("%s", answer);
-
-  printf("\n");
-
-  if (*answer == 'e' || *answer == 'E')
-    return -1;
-  else
-    return 0;
-}
-
-int
-myinvoke ()
-{
-  TAO_IIOP_Profile *pfile = 
-    ACE_dynamic_cast (TAO_IIOP_Profile *, base_stub->profile_in_use ());
-  STUB_Object *fwd_stub=0;
-  char answer[80];
-  printf("Sending request to host %s, port %d\n",
-	 pfile->host (), pfile->port ());
-
-  printf("Succeed, Error or Forward [s|e|f]? ");
-  scanf ("%s", answer);
-  printf("\n");
-
-  if (*answer == 'f' || *answer == 'F')
-    {
-      // Forward request
-      if ((fwd_stub = *FWD_STUBS) == 0)
-	{
-	  // no more fwd stubs left, can't forward
-	  printf("No fwd stubs left, can't forward, change to ERROR!\n");
-	  *answer = 'e';
-        }
-      else
-	{
-	  ++FWD_STUBS;
-          // this logic is actually in 
-          // TAO_GIOP_Invocation::location_forward
-          base_stub->add_forward_profiles (fwd_stub->get_profiles ());
-	}
-    }
-
-  if (*answer == 'e' || *answer == 'E')
-    return -1;
-  else if (*answer == 's' || *answer == 'S')
-    return 0;
-  else
-    return 1;
-}
-
-
-
-main (int argc, char **argv)
-{
-  int npfiles=0,nfwds=0,tpfiles=0;
-  TAO_MProfile **mpfiles;
-
-  if (argc > 1)
-    {
-      // get number of profiles and forwards
-      npfiles = atoi(argv[1]);
-      nfwds   = atoi(argv[2]);
-    }
-  else
-    {
-      npfiles = 3;
-      nfwds   = 3;
-    }
-
-  tpfiles = npfiles * nfwds;
-
-  printf("\nUsing %d profiles per IOR and %d forward IORs (%d total pfiles)\n",
-         npfiles, nfwds-1, tpfiles);
-
-  STUB_Object **stubobjs = new STUB_Object *[nfwds+1];
-  mpfiles = new TAO_MProfile *[nfwds];
-
-  char host[512];
-  int port = 0;
-
-  // Create the profile lists
-  for (int i=0;i<nfwds;i++) 
-    {
-      mpfiles [i] = new TAO_MProfile (npfiles);
-      for (int j=0;j<npfiles;j++)
-        {
-          sprintf(host, "%s%d.%d", host_base, i, j);
-          port = port_base + 100 * i + j;
-	  printf("\t%d) Creating profile for host %s, port %d and stub %d\n",
-		 j, host, port, i);
-          TAO_IIOP_Profile *pfile = new TAO_IIOP_Profile(host,
-                                                        port,
-                                                        key_base,
-                                                        addr_base);
-          if (mpfiles [i]->add_profile (pfile) < 0) 
-	    {
-              printf ("Error adding profile to mprofile!!\n");
-              return(1);
-            }
-        } // adding pfiles to the MProfile list.
-      stubobjs [i] = new STUB_Object ((char *)0, mpfiles [i]);
-    } // greating MProfile pfile lists
-
-  // so, mpfiles [0] is the initial list and corresponds to the
-  // original STUB_Object stubobjs [0].
-  // mpfiles [1...nfwds-1] are the forward pfile lists and corresponds
-  // to the STUB_Objects stubobjs [1...nfwds-1]
-
-  FWD_STUBS = stubobjs+1;
-  base_stub = stubobjs [0];
-  stubobjs [nfwds] = 0; // marks end of list!
-
-  // *** The forwarding loop!
-roundtrip_continue_label:
-  {
-    if (mystart () < 0) // call.start (...) in do_static_call
-      {
-        // connect failed
-	// in real life an exception is through of either
-	// INTERNAL  COMPLETED_NO or
-	// TRANSIENT COMPLETED_NO
-	// So this should be in a TAO_CATCH ... TAO_ENDTRY
-	printf("Connect Failed!\n");
-        if (base_stub->profile_success_ && base_stub->forward_profiles_)
-          {
-            // reset profiles list and start all over again
-            base_stub->reset_profiles ();
-            goto roundtrip_continue_label;
-          }
-        else if (base_stub->next_profile () != 0)
-          {
-            goto roundtrip_continue_label;
-          }
-        else
-	  {
-	    printf("That was our last profile, exit!\n");
-	    return(0);
-          }
-      }
-
-    // we are connected, try sending request
-    // in real life invoke returns 
-    // TAO_GIOP_NO_EXCEPTION
-    // TAO_GIOP_USER_EXCEPTION
-    // TAO_GIOP_SYSTEM_EXCEPTION
-    // ** TAO_GIOP_LOCATION_FORWARD
-    // Exceptions
-    // CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)
-    // CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)
-    int result = myinvoke (); // this is call.invoke (...)
-
-    if (result == 0)
-      { // TAO_GIOP_NO_EXCEPTION
-	printf("Invocation succeeded.\n");
-      }
-    else if (result == -1)
-      { exception or TAO_GIOP_USER_EXCEPTION, TAO_GIOP_SYSTEM_EXCEPTION
-	printf ("Invocation Failed NO FWD!\n");
-      }
-    else
-      {
-	printf ("Invocation was FORWARDED!\n");
-      }
-    if (result != 0)
-      {
-	// get the next profile.  If we were forwarded the new, forward
-	// profile list has already been added to the stub object so all
-	// we got to do here is get the next profile!
-        if (base_stub->profile_success_ && base_stub->forward_profiles_)
-	  {
-	    printf("Resetting profiles!\n");
-	    base_stub->reset_profiles ();
-	    goto roundtrip_continue_label;
-          }
-        else if (base_stub->next_profile () != 0)
-	  {
-	    goto roundtrip_continue_label;
-          }
-        else
-	  {
-	    printf("That was our last profile, exiting\n");
-          }
-      }
-    else
-      {
-	base_stub->set_valid_profile ();
-	goto roundtrip_continue_label;
-      }
-  }
-  return (0);
-}
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
index 26b1089cddd..56d2264ede6 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/Makefile
@@ -26,8 +26,10 @@ 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
+BUILD = $(BIN)
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
 #       Include macros and targets
@@ -45,7 +47,8 @@ include $(TAO_ROOT)/taoconfig.mk
 #       Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
 
 .PRECIOUS: MT_Client_TestC.h MT_Client_TestC.i MT_Client_TestC.cpp
 .PRECIOUS: MT_Client_TestS.h MT_Client_TestS.i MT_Client_TestS.cpp
@@ -58,579 +61,25 @@ client: $(addprefix $(VDIR),$(CLIENT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) MT_Client_Test[CS].* MT_Client_TestS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf MT_Client_Test[CS].* MT_Client_TestS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
 .obj/MT_Client_TestC.o .obj/MT_Client_TestC.so .shobj/MT_Client_TestC.o .shobj/MT_Client_TestC.so: MT_Client_TestC.cpp MT_Client_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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
  MT_Client_TestC.i MT_Client_TestS.h MT_Client_TestS_T.h \
  MT_Client_TestS_T.i MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/MT_Client_TestS.o .obj/MT_Client_TestS.so .shobj/MT_Client_TestS.o .shobj/MT_Client_TestS.so: MT_Client_TestS.cpp MT_Client_TestS.h \
- MT_Client_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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
- MT_Client_TestS_T.cpp MT_Client_TestS.i
+ MT_Client_TestC.h MT_Client_TestC.i MT_Client_TestS_T.h \
+ MT_Client_TestS_T.i MT_Client_TestS_T.cpp MT_Client_TestS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -695,225 +144,36 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
- MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
- MT_Client_TestS_T.cpp MT_Client_TestS.i
+ MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.h MT_Client_TestC.i \
+ MT_Client_TestS_T.h MT_Client_TestS_T.i MT_Client_TestS_T.cpp \
+ MT_Client_TestS.i
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -965,8 +225,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Read_Buffer.i \
- client.h \
+ $(ACE_ROOT)/ace/Read_Buffer.i client.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Task.h \
@@ -1039,58 +298,52 @@ realclean: clean
  $(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 \
- $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
@@ -1100,97 +353,65 @@ realclean: clean
  $(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/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 \
+ $(TAO_ROOT)/tao/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  MT_Client_TestC.h MT_Client_TestC.i local_server.h \
  $(TAO_ROOT)/tao/TAO.h \
  MT_Object_i.h MT_Client_TestS.h MT_Client_TestS_T.h \
@@ -1200,6 +421,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1267,224 +491,35 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
- MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- MT_Client_TestC.i MT_Client_TestS_T.h MT_Client_TestS_T.i \
- MT_Client_TestS_T.cpp MT_Client_TestS.i
+ MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.h MT_Client_TestC.i \
+ MT_Client_TestS_T.h MT_Client_TestS_T.i MT_Client_TestS_T.cpp \
+ MT_Client_TestS.i
 .obj/MT_Object_i.o .obj/MT_Object_i.so .shobj/MT_Object_i.o .shobj/MT_Object_i.so: MT_Object_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1548,85 +583,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1635,31 +664,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1681,8 +701,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1699,65 +722,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  MT_Object_i.h MT_Client_TestS.h MT_Client_TestC.h MT_Client_TestC.i \
  MT_Client_TestS_T.h MT_Client_TestS_T.i MT_Client_TestS_T.cpp \
  MT_Client_TestS.i
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
index be258ea8950..6eee002c688 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.conf
@@ -1,5 +1,49 @@
 # $Id$
 #
-dynamic Resource_Factory Service_Object * TAO:_make_TAO_Default_Resource_Factory() "-ORBresources tss"
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources tss"
 dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
-dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -systemidpolicydemuxstrategy dynamic -ORBtablesize 128"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index d897625fee3..af2e1e68945 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -25,7 +25,7 @@
 ACE_RCSID(MT_Client_Test, client, "$Id$")
 
 MT_Client_Task::MT_Client_Task (int argc, char **argv,
-                                int client_number)
+				int client_number)
   : argc_ (argc),
     argv_ (argv),
     client_number_ (client_number)
@@ -37,7 +37,7 @@ MT_Client_Task::svc (void)
 {
   if (this->mT_Client_.init (this->argc_,
                              this->argv_,
-                             this->client_number_) == -1)
+			     this->client_number_) == -1)
     return 1;
   else
     return this->mT_Client_.run ();
@@ -183,7 +183,7 @@ MT_Client::~MT_Client (void)
 
 int
 MT_Client::init (int argc, char **argv,
-                 int client_number)
+		 int client_number)
 {
 
   // Make a copy of argv since ORB_init will change it.
@@ -280,8 +280,7 @@ main (int argc, char **argv)
                                                argc,
                                                argv,
                                                &orb_manager);
-  server->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0,
-                    ACE_DEFAULT_THREAD_PRIORITY);
+  server->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
 
   // starting the client threads
   MT_Client_Task **clients = new MT_Client_Task*[threads];
@@ -290,8 +289,7 @@ main (int argc, char **argv)
     clients[i] = new MT_Client_Task (argc, argv, i);
 
   for (i = 0; i < threads; i++)
-    clients[i]->activate (THR_BOUND | THR_SCHED_FIFO, 1, 0,
-                          ACE_DEFAULT_THREAD_PRIORITY);
+    clients[i]->activate (THR_BOUND | ACE_SCHED_FIFO, 1, 0, ACE_DEFAULT_THREAD_PRIORITY);
 
   int result = ACE_Thread_Manager::instance ()->wait ();
 
@@ -309,3 +307,4 @@ main (int argc, char **argv)
 
   return result;
 }
+
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
index 3a17e045cfd..da9f7ca749a 100755
--- a/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 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;
@@ -18,20 +17,20 @@ $ior2file = "server2.ior";
 unlink $ior1file;
 unlink $ior2file;
 
-$SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
+$SV1 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, 
                         " -ORBport $server1_port -o $ior1file ".
-                        " -ORBobjrefstyle url");
+			" -ORBobjrefstyle url");
 
-$SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
+$SV2 = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, 
                         " -ORBport $server2_port -o $ior2file ".
-                        " -ORBobjrefstyle url");
+			" -ORBobjrefstyle url");
 
 ACE::waitforfile ($ior1file);
 ACE::waitforfile ($ior2file);
 
 $status = system ($EXEPREFIX."client".$Process::EXE_EXT.
-                  " -ORBport $client_port ".
-                  " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
+		  " -ORBport $client_port ".
+		  " -f $ior1file -g $ior2file -n 2 -i 10 -s 5");
 
 $SV1->Kill (); $SV1->Wait ();
 $SV2->Kill (); $SV2->Wait ();
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf b/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf
new file mode 100644
index 00000000000..44c01ee1f07
--- /dev/null
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() "-ORBresources global"
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/Reactor/Makefile b/TAO/tests/NestedUpcall/Reactor/Makefile
index 80539a0ff3e..03e05f684e0 100644
--- a/TAO/tests/NestedUpcall/Reactor/Makefile
+++ b/TAO/tests/NestedUpcall/Reactor/Makefile
@@ -1,11 +1,11 @@
 #----------------------------------------------------------------------------
 #
-#       $Id$
+#	$Id$
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
@@ -23,19 +23,13 @@ NESTEDUPCALLS_CLT_OBJS = ReactorS.o ReactorC.o client.o eh_i.o
 SRC = $(sort $(NESTEDUPCALLS_SVR_OBJS:.o=.cpp) \
              $(NESTEDUPCALLS_CLT_OBJS:.o=.cpp))
 
+BIN = server client
+BUILD = $(BIN)
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BIN2 = server client
-
-#### If the TAO orbsvcs library wasn't built with sufficient components,
-#### don't try to build here.
-TAO_ORBSVCS := $(shell $(ACE_ROOT)/bin/ace_components --orbsvcs)
-ifeq (Naming,$(findstring Naming,$(TAO_ORBSVCS)))
-  BIN = $(BIN2)
-endif # Naming
+VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -47,35 +41,40 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs/Naming_Service
-CPPFLAGS += -I$(TAO_ROOT)/orbsvcs
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs 
 
 .PRECIOUS: ReactorC.h ReactorC.i ReactorC.cpp
 .PRECIOUS: ReactorS.h ReactorS.i ReactorS.cpp
 
-server: $(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_OBJS))
+server:	$(addprefix $(VDIR),$(NESTEDUPCALLS_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
-client: $(addprefix $(VDIR),$(NESTEDUPCALLS_CLT_OBJS))
+client:	$(addprefix $(VDIR),$(NESTEDUPCALLS_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) ReactorS.* ReactorC.* ReactorS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf ReactorS.* ReactorC.* ReactorS_T.*
+	-/bin/rm -rf client server 
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/ReactorC.o .obj/ReactorC.so .shobj/ReactorC.o .shobj/ReactorC.so: ReactorC.cpp ReactorC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/ReactorC.o .obj/ReactorC.so .shobj/ReactorC.o .shobj/ReactorC.so: ReactorC.cpp ReactorC.h ReactorC.i ReactorS.h ReactorS_T.h \
+ ReactorS_T.i ReactorS_T.cpp ReactorS.i
+.obj/ReactorS.o .obj/ReactorS.so .shobj/ReactorS.o .shobj/ReactorS.so: ReactorS.cpp ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
+ ReactorS_T.i ReactorS_T.cpp ReactorS.i
+.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -83,16 +82,20 @@ realclean: clean
  $(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/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 \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
+ $(ACE_ROOT)/ace/Env_Value_T.h \
+ $(ACE_ROOT)/ace/Env_Value_T.i \
+ $(ACE_ROOT)/ace/Env_Value_T.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -131,6 +134,13 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Read_Buffer.i client.h \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(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 \
@@ -139,85 +149,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -226,31 +230,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -272,8 +267,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -290,71 +288,53 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- ReactorC.i ReactorS.h ReactorS_T.h ReactorS_T.i ReactorS_T.cpp \
- ReactorS.i
-.obj/ReactorS.o .obj/ReactorS.so .shobj/ReactorS.o .shobj/ReactorS.so: ReactorS.cpp ReactorS.h ReactorC.h \
+ reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
+ ReactorS_T.i ReactorS_T.cpp ReactorS.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp eh_i.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
+.obj/eh_i.o .obj/eh_i.so .shobj/eh_i.o .shobj/eh_i.so: eh_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -418,304 +398,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- ReactorC.i ReactorS_T.h ReactorS_T.i ReactorS_T.cpp ReactorS.i
-.obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
- $(ACE_ROOT)/ace/Profile_Timer.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/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/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/ace/Env_Value_T.h \
- $(ACE_ROOT)/ace/Env_Value_T.i \
- $(ACE_ROOT)/ace/Env_Value_T.cpp \
- $(ACE_ROOT)/ace/Read_Buffer.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/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/Read_Buffer.i \
- client.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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 \
@@ -742,52 +471,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -796,31 +479,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -842,8 +516,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -860,77 +537,48 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
- ReactorS_T.i ReactorS_T.cpp ReactorS.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- eh_i.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i
-.obj/eh_i.o .obj/eh_i.so .shobj/eh_i.o .shobj/eh_i.so: eh_i.cpp \
+ $(TAO_ROOT)/tao/Union.h eh_i.h \
+ ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h ReactorS_T.i \
+ ReactorS_T.cpp ReactorS.i
+.obj/reactor_i.o .obj/reactor_i.so .shobj/reactor_i.o .shobj/reactor_i.so: reactor_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -994,292 +642,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- eh_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h ReactorS_T.i \
- ReactorS_T.cpp ReactorS.i
-.obj/reactor_i.o .obj/reactor_i.so .shobj/reactor_i.o .shobj/reactor_i.so: reactor_i.cpp \
- $(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/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/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 \
- $(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.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/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 \
@@ -1306,52 +715,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1360,31 +723,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1406,8 +760,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1424,65 +781,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
  ReactorS_T.i ReactorS_T.cpp ReactorS.i
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp server.h \
@@ -1490,6 +821,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1554,218 +888,26 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/orbsvcs_export.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
  reactor_i.h ReactorS.h ReactorC.h ReactorC.i ReactorS_T.h \
@@ -1776,11 +918,12 @@ realclean: clean
  $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(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/Naming/CosNaming_i.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
+ $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingS.i \
+ $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Entries.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/Reactor/run_test.pl b/TAO/tests/NestedUpcall/Reactor/run_test.pl
index e86eee20278..4dda2cc2e11 100755
--- a/TAO/tests/NestedUpcall/Reactor/run_test.pl
+++ b/TAO/tests/NestedUpcall/Reactor/run_test.pl
@@ -1,21 +1,20 @@
+# $Id$
+# -*- perl -*-
 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;
 
-$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-                       " -ORBobjrefstyle url");
+$SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT, 
+		       " -ORBobjrefstyle url");
 
 sleep ($ACE::sleeptime);
 
 $status  = system ($EXEPREFIX."client".$Process::EXE_EXT.
-                   " -x ");
+		   " -x ");
 
 $SV->Wait ();
 
diff --git a/TAO/tests/NestedUpcall/Reactor/svc.conf b/TAO/tests/NestedUpcall/Reactor/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Reactor/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Makefile b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
index 83e7a0db999..b3441916734 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/Makefile
+++ b/TAO/tests/NestedUpcall/Triangle_Test/Makefile
@@ -1,34 +1,34 @@
 #----------------------------------------------------------------------------
 #
-#       $Id$
+#	$Id$
 #
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO
+LDLIBS = -lorbsvcs -lTAO
 
 IDL_SRC = Triangle_TestC.cpp Triangle_TestS.cpp
 PROG_SRCS = $(IDL_SRC) server_A.cpp server_B.cpp \
-        Object_A_i.cpp Object_B_i.cpp Initiator_i.cpp \
-        initiator.cpp
+	Object_A_i.cpp Object_B_i.cpp Initiator_i.cpp \
+	initiator.cpp 
 
 LSRC = $(PROG_SRCS)
 
 NESTEDUPCALLS_SVR_A_OBJS = Triangle_TestS.o Triangle_TestC.o server_A.o \
-        Object_A_i.o
+	Object_A_i.o
 
 NESTEDUPCALLS_SVR_B_OBJS = Triangle_TestS.o Triangle_TestC.o server_B.o \
-        Object_B_i.o
+        Object_B_i.o 
 
 NESTEDUPCALLS_INITIATOR_OBJS = Triangle_TestS.o Triangle_TestC.o initiator.o \
-        Initiator_i.o
+	Initiator_i.o
 
 
 BIN = server_A server_B initiator
@@ -37,7 +37,7 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 VBIN = $(BIN:%=%$(VAR))
 
 #----------------------------------------------------------------------------
-#       Include macros and targets
+#	Include macros and targets
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
@@ -49,10 +49,11 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 include $(TAO_ROOT)/taoconfig.mk
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
-LDFLAGS += -L$(TAO_ROOT)/tao
+LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao 
+CPPFLAGS += -I$(TAO_ROOT)/orbsvcs 
 
 .PRECIOUS: Trangle_TestC.h Triangle_TestC.i Triangle_TestC.cpp
 .PRECIOUS: Triangle_TestS.h Triangle_TestS.i Triangle_TestS.cpp
@@ -67,19 +68,25 @@ initiator: $(addprefix $(VDIR),$(NESTEDUPCALLS_INITIATOR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
 realclean: clean
-	-$(RM) Triangle_TestS.* Triangle_TestC.* Triangle_TestS_T.*
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
+	-/bin/rm -rf Triangle_TestS.* Triangle_TestC.* Triangle_TestS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Triangle_TestC.o .obj/Triangle_TestC.so .shobj/Triangle_TestC.o .shobj/Triangle_TestC.so: Triangle_TestC.cpp Triangle_TestC.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/Triangle_TestC.o .obj/Triangle_TestC.so .shobj/Triangle_TestC.o .shobj/Triangle_TestC.so: Triangle_TestC.cpp Triangle_TestC.h Triangle_TestC.i \
+ Triangle_TestS.h Triangle_TestS_T.h Triangle_TestS_T.i \
+ Triangle_TestS_T.cpp Triangle_TestS.i
+.obj/Triangle_TestS.o .obj/Triangle_TestS.so .shobj/Triangle_TestS.o .shobj/Triangle_TestS.so: Triangle_TestS.cpp Triangle_TestS.h Triangle_TestC.h \
+ Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
+ Triangle_TestS_T.cpp Triangle_TestS.i
+.obj/server_A.o .obj/server_A.so .shobj/server_A.o .shobj/server_A.so: server_A.cpp server_A.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -87,13 +94,14 @@ realclean: clean
  $(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/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/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -143,222 +151,36 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Triangle_TestC.i Triangle_TestS.h Triangle_TestS_T.h \
- Triangle_TestS_T.i Triangle_TestS_T.cpp Triangle_TestS.i
-.obj/Triangle_TestS.o .obj/Triangle_TestS.so .shobj/Triangle_TestS.o .shobj/Triangle_TestS.so: Triangle_TestS.cpp Triangle_TestS.h Triangle_TestC.h \
- $(TAO_ROOT)/tao/corba.h \
+ Object_A_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
+ Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
+ Triangle_TestS.i
+.obj/server_B.o .obj/server_B.so .shobj/server_B.o .shobj/server_B.so: server_B.cpp server_B.h \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -366,13 +188,14 @@ realclean: clean
  $(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/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/Get_Opt.i \
+ $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -422,223 +245,35 @@ realclean: clean
  $(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/POAC.h \
+ $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.i \
+ $(TAO_ROOT)/tao/Sequence.h \
+ $(TAO_ROOT)/tao/Managed_Types.h \
  $(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/ORB.i \
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
- Triangle_TestS_T.cpp Triangle_TestS.i
-.obj/server_A.o .obj/server_A.so .shobj/server_A.o .shobj/server_A.so: server_A.cpp server_A.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
+ Object_B_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
+ Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
+ Triangle_TestS.i
+.obj/Object_A_i.o .obj/Object_A_i.so .shobj/Object_A_i.o .shobj/Object_A_i.so: Object_A_i.cpp \
+ $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -646,14 +281,13 @@ realclean: clean
  $(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/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/Get_Opt.i \
- $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -703,315 +337,53 @@ realclean: clean
  $(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/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/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/ORB.i \
- Object_A_i.h Triangle_TestS.h Triangle_TestC.h \
- $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/Any.h \
+ $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
+ $(TAO_ROOT)/tao/Typecode.h \
+ $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
+ $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
- Triangle_TestS_T.cpp Triangle_TestS.i
-.obj/server_B.o .obj/server_B.so .shobj/server_B.o .shobj/server_B.so: server_B.cpp server_B.h \
- $(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/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/Get_Opt.i \
- $(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/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/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/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/PolicyC.i \
  $(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/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 \
+ $(TAO_ROOT)/tao/POA.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/Functor.i \
@@ -1038,68 +410,30 @@ realclean: clean
  $(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/ORB.i \
- Object_B_i.h Triangle_TestS.h Triangle_TestC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.h \
+ $(TAO_ROOT)/tao/POAC.h \
+ $(TAO_ROOT)/tao/POAC.i \
  $(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/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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1121,8 +455,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1139,71 +476,49 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
- Triangle_TestS_T.cpp Triangle_TestS.i
-.obj/Object_A_i.o .obj/Object_A_i.so .shobj/Object_A_i.o .shobj/Object_A_i.so: Object_A_i.cpp \
+ Object_A_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
+ Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
+ Triangle_TestS.i
+.obj/Object_B_i.o .obj/Object_B_i.so .shobj/Object_B_i.o .shobj/Object_B_i.so: Object_B_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1267,293 +582,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Object_A_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
- Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
- Triangle_TestS.i
-.obj/Object_B_i.o .obj/Object_B_i.so .shobj/Object_B_i.o .shobj/Object_B_i.so: Object_B_i.cpp \
- $(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/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/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 \
- $(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.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/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 \
@@ -1580,52 +655,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1634,31 +663,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1680,8 +700,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1698,65 +721,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  Object_B_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
  Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
  Triangle_TestS.i
@@ -1764,6 +761,9 @@ realclean: clean
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1827,85 +827,79 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1914,31 +908,22 @@ realclean: clean
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1960,8 +945,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1978,65 +966,39 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  Initiator_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
  Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
  Triangle_TestS.i
@@ -2045,6 +1007,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2097,8 +1062,7 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Read_Buffer.i \
- initiator.h \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ initiator.h $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  $(TAO_ROOT)/tao/TAO.h \
  $(TAO_ROOT)/tao/corbafwd.h \
@@ -2112,219 +1076,27 @@ realclean: clean
  $(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/ORB.h \
+ $(TAO_ROOT)/tao/Exception.h \
+ $(TAO_ROOT)/tao/Exception.i \
+ $(TAO_ROOT)/tao/ORB.i \
  $(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/PolicyC.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
+ $(TAO_ROOT)/tao/CurrentC.h \
+ $(TAO_ROOT)/tao/CurrentC.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/ORB.i \
- Initiator_i.h Triangle_TestS.h Triangle_TestC.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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/POA.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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- Triangle_TestC.i Triangle_TestS_T.h Triangle_TestS_T.i \
- Triangle_TestS_T.cpp Triangle_TestS.i
+ Initiator_i.h Triangle_TestS.h Triangle_TestC.h Triangle_TestC.i \
+ Triangle_TestS_T.h Triangle_TestS_T.i Triangle_TestS_T.cpp \
+ Triangle_TestS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
index eb49798ddd0..c0dcaba5cbf 100755
--- a/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
+++ b/TAO/tests/NestedUpcall/Triangle_Test/run_test.pl
@@ -1,10 +1,9 @@
+# $Id$
+# -*- perl -*-
 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;
@@ -16,17 +15,17 @@ $ior2file = "serverb.ior";
 unlink $ior1file;
 unlink $ior2file;
 
-$SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT,
+$SV1 = Process::Create ($EXEPREFIX."server_A".$Process::EXE_EXT, 
                         "-o $ior1file -ORBobjrefstyle url");
 
-$SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT,
+$SV2 = Process::Create ($EXEPREFIX."server_B".$Process::EXE_EXT, 
                         "-o $ior2file -ORBobjrefstyle url");
 
 ACE::waitforfile ($ior1file);
 ACE::waitforfile ($ior2file);
 
 $status = system ($EXEPREFIX."initiator".$Process::EXE_EXT.
-                  " -f $ior1file -g $ior2file");
+		  " -f $ior1file -g $ior2file");
 
 $SV1->Kill (); $SV1->Wait ();
 $SV2->Kill (); $SV2->Wait ();
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/svc.conf b/TAO/tests/NestedUpcall/Triangle_Test/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/tests/NestedUpcall/Triangle_Test/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/OctetSeq/Makefile b/TAO/tests/OctetSeq/Makefile
index 81c9aca5d09..f4520866cd2 100644
--- a/TAO/tests/OctetSeq/Makefile
+++ b/TAO/tests/OctetSeq/Makefile
@@ -49,8 +49,11 @@ OctetSeq: $(addprefix $(VDIR),$(OCTETSEQ_OBJS))
 
 .PRECIOUS: $(IDL_HDR) $(IDL_SRC)
 
+clean:
+	-/bin/rm -rf *.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) testC.* testS.* testS_T.*
+	-/bin/rm -rf testC.* testS.* testS_T.*
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -60,6 +63,9 @@ realclean: clean
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -126,291 +132,53 @@ realclean: clean
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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.h testC.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/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/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 \
- $(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.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/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 \
@@ -437,52 +205,6 @@ realclean: clean
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -491,309 +213,22 @@ realclean: clean
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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.h testS_T.h testS_T.i testS_T.cpp testS.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -815,8 +250,11 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -833,65 +271,43 @@ realclean: clean
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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
+ $(TAO_ROOT)/tao/Union.h testC.h \
+ testC.i
+.obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h testC.i testS.h testS_T.h testS_T.i \
+ testS_T.cpp testS.i
+.obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h testC.i testS_T.h testS_T.i \
+ testS_T.cpp testS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/OctetSeq/run_test.pl b/TAO/tests/OctetSeq/run_test.pl
index 6fb4491e4b2..bf18b76c615 100755
--- a/TAO/tests/OctetSeq/run_test.pl
+++ b/TAO/tests/OctetSeq/run_test.pl
@@ -1,10 +1,9 @@
+#$Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 unshift @INC, '../../../bin';
 require ACEutils;
 
diff --git a/TAO/tests/OctetSeq/svc.conf b/TAO/tests/OctetSeq/svc.conf
new file mode 100644
index 00000000000..43c6a486c92
--- /dev/null
+++ b/TAO/tests/OctetSeq/svc.conf
@@ -0,0 +1,49 @@
+# $Id$
+#
+# This file contains a sample ACE_Service_Config configuration
+# file specifying the strategy factories utilized by an application
+# using TAO.  There are currently only two possible factories:
+# Client_Strategy_Factory and Server_Strategy_Factory.  These names
+# must be used as the second argument to their corresponding line,
+# because that's what the ORB uses to find the desired factory.
+#
+# Note that there are two unordinary characteristics of the way *this*
+# file is set up:
+#   - both client and server strategies are specified in the same
+#     file, which would only make sense for co-located clients & servers
+#   - both of the factories are actually sourced out of libTAO.so
+#     (TAO.DLL on Win32), and they would normally be in a separate
+#     dll from the TAO ORB Core.
+#
+# The options which can be passed to the Resource Factory are:
+#
+#   -ORBresources <which>
+#       where <which> can be 'global' to specify globally-held resources,
+#       or 'tss' to specify thread-specific resources.
+#
+# The options which can be passed to the Client are:
+#     <none currently>
+#
+# The options which can be passed to the Server are:
+#
+#   -ORBconcurrency <which>
+#       where <which> can be 'thread-per-connection' to specify
+#       use of the ACE_Threaded_Strategy concurrency strategy,
+#       or 'reactive' to specify use of the ACE_Reactive_Strategy
+#       concurrency strategy.
+#
+#   -ORBthreadflags  <flags>
+#       specifies the default thread flags to use, where <flags> is a
+#       logical OR'ing of the flags THR_DETACHED, THR_BOUND, THR_NEW_LWP,
+#       THR_SUSPENDED, or THR_DAEMON.  Note that not every flag may be valid
+#       on every platform.
+#
+#   -ORBdemuxstrategy <which>
+#       where <which> can be one of 'dynamic', 'linear', 'active', or 'user',
+#       and specifies the type of object lookup strategy used internally.
+#   -ORBtablesize <unsigned>
+#       specifies the size of the object table
+#
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile
index f01e6d8060c..ad186822643 100644
--- a/TAO/tests/Param_Test/Makefile
+++ b/TAO/tests/Param_Test/Makefile
@@ -12,6 +12,10 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
+override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \
+			 -cs Cli.cpp -ci Cli.i \
+			 -ss Ser.cpp -sT Ser_T.cpp  -si Ser.i -st Ser_T.i
+
 LDLIBS   = -lTAO
 LDFLAGS += -L$(TAO_ROOT)/tao
 
@@ -55,10 +59,7 @@ CLI_FILES =	param_testCli	\
 		ub_struct_seq	\
 		var_array	\
 		var_struct \
-		except \
-		big_union \
-		multdim_array \
-		complex_any
+		except
 
 PARAM_TEST_SVR_OBJS = $(addsuffix .o,$(SVR_FILES))
 PARAM_TEST_CLT_OBJS = $(addsuffix .o,$(CLI_FILES))
@@ -92,14 +93,12 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
 #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
-override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \
-			 -cs Cli.cpp -ci Cli.i \
-			 -ss Ser.cpp -sT Ser_T.cpp
-
 TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
 CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG)
 
 .PRECIOUS: $(IDL_HDR) $(IDL_SRC)
+#$(IDL_HDR) $(IDL_SRC): param_test.idl
+#	$(TAO_IDL/tao_idl param_test.idl
 
 server:	$(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
@@ -107,18 +106,31 @@ server:	$(addprefix $(VDIR),$(PARAM_TEST_SVR_OBJS))
 client:	$(addprefix $(VDIR),$(PARAM_TEST_CLT_OBJS))
 	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
 
+clean:
+	-/bin/rm -rf $(VDIR)/*.o $(BIN) obj.* core Templates.DB .make.state
+
 realclean: clean
-	-$(RM) param_testCli.* param_testSer.* param_testSer_T.*
+	-/bin/rm -rf param_testCli.* param_testSer.* param_testSer_T.*
 
 endif # ! ACE_HAS_GNUG_PRE_2_8
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/param_testCli.o .obj/param_testCli.so .shobj/param_testCli.o .shobj/param_testCli.so: param_testCli.cpp param_testCli.h \
- $(TAO_ROOT)/tao/corba.h \
+.obj/param_testCli.o .obj/param_testCli.so .shobj/param_testCli.o .shobj/param_testCli.so: param_testCli.cpp param_testCli.h param_testCli.i \
+ param_testSer.h param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
+.obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
+ param_testCli.i param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
+.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/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -126,278 +138,23 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
- param_testSer_T.cpp param_testS.i
-.obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ param_test_i.h param_testSer.h param_testCli.h param_testCli.i \
+ param_testSer_T.h param_testSer_T.i param_testSer_T.cpp \
+ param_testSer.i
+.obj/param_test_i.o .obj/param_test_i.so .shobj/param_test_i.o .shobj/param_test_i.so: param_test_i.cpp \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -461,295 +218,53 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
- param_testS.i
-.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/inc_user_config.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i \
- param_test_i.h param_testSer.h param_testCli.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/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/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/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 \
@@ -776,52 +291,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -830,310 +299,22 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
- param_testS.i
-.obj/param_test_i.o .obj/param_test_i.so .shobj/param_test_i.o .shobj/param_test_i.so: param_test_i.cpp \
- $(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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1155,8 +336,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -1173,71 +357,56 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
  param_test_i.h param_testSer.h param_testCli.h param_testCli.i \
- param_testSer_T.h param_testS_T.i param_testSer_T.cpp param_testS.i
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h \
+ param_testSer_T.h param_testSer_T.i param_testSer_T.cpp \
+ param_testSer.i
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h param_testCli.i
+.obj/param_testCli.o .obj/param_testCli.so .shobj/param_testCli.o .shobj/param_testCli.so: param_testCli.cpp param_testCli.h param_testCli.i \
+ param_testSer.h param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
+.obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.h \
+ param_testCli.i param_testSer_T.h param_testSer_T.i \
+ param_testSer_T.cpp param_testSer.i
+.obj/driver.o .obj/driver.so .shobj/driver.o .shobj/driver.so: driver.cpp results.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1301,291 +470,53 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i
-.obj/param_testCli.o .obj/param_testCli.so .shobj/param_testCli.o .shobj/param_testCli.so: param_testCli.cpp param_testCli.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/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/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 \
- $(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.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/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 \
@@ -1612,52 +543,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -1666,310 +551,22 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i param_testSer.h param_testSer_T.h param_testS_T.i \
- param_testSer_T.cpp param_testS.i
-.obj/param_testSer.o .obj/param_testSer.so .shobj/param_testSer.o .shobj/param_testSer.so: param_testSer.cpp param_testSer.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -1991,8 +588,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -2009,363 +609,60 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i param_testSer_T.h param_testS_T.i param_testSer_T.cpp \
- param_testS.i
-.obj/driver.o .obj/driver.so .shobj/driver.o .shobj/driver.so: driver.cpp driver.h options.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 \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- $(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/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 \
- $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- param_testCli.h param_testCli.i results.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i \
- client.h client.cpp tests.h any.h bd_long_seq.h bd_short_seq.h \
- bd_str_seq.h bd_string.h bd_struct_seq.h fixed_array.h fixed_struct.h \
- nested_struct.h objref_struct.h objref.h short.h ulonglong.h \
- typecode.h ub_any_seq.h ub_long_seq.h ub_objref_seq.h ub_short_seq.h \
- ub_str_seq.h ub_string.h ub_struct_seq.h var_array.h var_struct.h \
- except.h big_union.h \
+ client.h param_testCli.h param_testCli.i client.cpp options.h tests.h \
+ any.h bd_long_seq.h bd_short_seq.h bd_str_seq.h bd_string.h \
+ bd_struct_seq.h fixed_array.h fixed_struct.h nested_struct.h \
+ objref_struct.h objref.h short.h ulonglong.h typecode.h ub_any_seq.h \
+ ub_long_seq.h ub_objref_seq.h ub_short_seq.h ub_str_seq.h ub_string.h \
+ ub_struct_seq.h var_array.h var_struct.h except.h \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(ACE_ROOT)/ace/Get_Opt.i driver.h
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp options.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/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2430,1135 +727,50 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- results.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- client.h param_testCli.h param_testCli.i client.cpp
-.obj/options.o .obj/options.so .shobj/options.o .shobj/options.so: options.cpp \
- $(ACE_ROOT)/ace/Read_Buffer.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/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/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/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/Read_Buffer.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- options.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(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 \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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
-.obj/results.o .obj/results.so .shobj/results.o .shobj/results.so: results.cpp \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.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/OS.i \
- $(ACE_ROOT)/ace/Trace.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 \
- results.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/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/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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/helper.o .obj/helper.so .shobj/helper.o .shobj/helper.so: helper.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i
-.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.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/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/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 \
- $(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.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/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 \
@@ -3585,52 +797,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -3639,587 +805,22 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i
-.obj/any.o .obj/any.so .shobj/any.o .shobj/any.so: any.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i any.h
-.obj/bd_long_seq.o .obj/bd_long_seq.so .shobj/bd_long_seq.o .shobj/bd_long_seq.so: bd_long_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -4241,286 +842,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i bd_long_seq.h
-.obj/bd_short_seq.o .obj/bd_short_seq.so .shobj/bd_short_seq.o .shobj/bd_short_seq.so: bd_short_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -4537,626 +863,52 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i bd_short_seq.h
-.obj/bd_str_seq.o .obj/bd_str_seq.so .shobj/bd_str_seq.o .shobj/bd_str_seq.so: bd_str_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i bd_str_seq.h
-.obj/bd_string.o .obj/bd_string.so .shobj/bd_string.o .shobj/bd_string.so: bd_string.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- param_testCli.i bd_string.h
-.obj/bd_struct_seq.o .obj/bd_struct_seq.so .shobj/bd_struct_seq.o .shobj/bd_struct_seq.so: bd_struct_seq.cpp helper.h param_testCli.h \
- $(TAO_ROOT)/tao/corba.h \
+ $(TAO_ROOT)/tao/Union.h results.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i \
+ client.h param_testCli.h param_testCli.i client.cpp
+.obj/options.o .obj/options.so .shobj/options.o .shobj/options.so: options.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -5164,16 +916,12 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -5212,284 +960,16 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
+ $(ACE_ROOT)/ace/Read_Buffer.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i options.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i bd_struct_seq.h
-.obj/fixed_array.o .obj/fixed_array.so .shobj/fixed_array.o .shobj/fixed_array.so: fixed_array.cpp helper.h param_testCli.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/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/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 \
  $(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.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 \
@@ -5498,847 +978,50 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i fixed_array.h
-.obj/fixed_struct.o .obj/fixed_struct.so .shobj/fixed_struct.o .shobj/fixed_struct.so: fixed_struct.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i fixed_struct.h
-.obj/nested_struct.o .obj/nested_struct.so .shobj/nested_struct.o .shobj/nested_struct.so: nested_struct.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i nested_struct.h
-.obj/objref_struct.o .obj/objref_struct.so .shobj/objref_struct.o .shobj/objref_struct.so: objref_struct.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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 \
@@ -6365,52 +1048,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -6419,587 +1056,22 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i objref_struct.h
-.obj/objref.o .obj/objref.so .shobj/objref.o .shobj/objref.so: objref.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i objref.h
-.obj/short.o .obj/short.so .shobj/short.o .shobj/short.so: short.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -7021,286 +1093,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i short.h
-.obj/ulonglong.o .obj/ulonglong.so .shobj/ulonglong.o .shobj/ulonglong.so: ulonglong.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -7317,918 +1114,60 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ulonglong.h
-.obj/typecode.o .obj/typecode.so .shobj/typecode.o .shobj/typecode.so: typecode.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i typecode.h
-.obj/ub_any_seq.o .obj/ub_any_seq.so .shobj/ub_any_seq.o .shobj/ub_any_seq.so: ub_any_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- param_testCli.i ub_any_seq.h
-.obj/ub_long_seq.o .obj/ub_long_seq.so .shobj/ub_long_seq.o .shobj/ub_long_seq.so: ub_long_seq.cpp helper.h param_testCli.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/OS.i \
- $(ACE_ROOT)/ace/Trace.h \
+ $(TAO_ROOT)/tao/Union.h
+.obj/results.o .obj/results.so .shobj/results.o .shobj/results.so: results.cpp \
  $(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/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_long_seq.h
-.obj/ub_objref_seq.o .obj/ub_objref_seq.so .shobj/ub_objref_seq.o .shobj/ub_objref_seq.so: ub_objref_seq.cpp helper.h param_testCli.h \
- $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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/Log_Record.i results.h \
+ $(TAO_ROOT)/tao/corba.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
  $(ACE_ROOT)/ace/Message_Block.h \
@@ -8278,847 +1217,53 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_objref_seq.h
-.obj/ub_short_seq.o .obj/ub_short_seq.so .shobj/ub_short_seq.o .shobj/ub_short_seq.so: ub_short_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_short_seq.h
-.obj/ub_str_seq.o .obj/ub_str_seq.so .shobj/ub_str_seq.o .shobj/ub_str_seq.so: ub_str_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
+ $(TAO_ROOT)/tao/GIOP.i \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_str_seq.h
-.obj/ub_string.o .obj/ub_string.so .shobj/ub_string.o .shobj/ub_string.so: ub_string.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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 \
@@ -9145,52 +1290,6 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
  $(TAO_ROOT)/tao/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -9199,587 +1298,22 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.i \
  $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
  $(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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_string.h
-.obj/ub_struct_seq.o .obj/ub_struct_seq.so .shobj/ub_struct_seq.o .shobj/ub_struct_seq.so: ub_struct_seq.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
  $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i ub_struct_seq.h
-.obj/var_array.o .obj/var_array.so .shobj/var_array.o .shobj/var_array.so: var_array.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -9801,286 +1335,11 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
  $(TAO_ROOT)/tao/IIOP_Connector.h \
  $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i var_array.h
-.obj/var_struct.o .obj/var_struct.so .shobj/var_struct.o .shobj/var_struct.so: var_struct.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -10097,622 +1356,88 @@ endif # ! ACE_HAS_GNUG_PRE_2_8
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Connector.i \
  $(ACE_ROOT)/ace/Connector.cpp \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i var_struct.h
-.obj/except.o .obj/except.so .shobj/except.o .shobj/except.so: except.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Connector.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/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 \
- param_testCli.i except.h
-.obj/big_union.o .obj/big_union.so .shobj/big_union.o .shobj/big_union.so: big_union.cpp helper.h param_testCli.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/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/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 \
- $(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.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/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/Services.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
- $(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/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 \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/POA.h \
- $(TAO_ROOT)/tao/POAC.h \
- $(TAO_ROOT)/tao/POAC.i \
- $(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/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/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 \
- $(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/Connect.h \
  $(ACE_ROOT)/ace/Acceptor.h \
- $(ACE_ROOT)/ace/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
  $(ACE_ROOT)/ace/Acceptor.i \
  $(ACE_ROOT)/ace/Acceptor.cpp \
  $(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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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 \
- param_testCli.i big_union.h
-.obj/multdim_array.o .obj/multdim_array.so .shobj/multdim_array.o .shobj/multdim_array.so: multdim_array.cpp
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i
+.obj/helper.o .obj/helper.so .shobj/helper.o .shobj/helper.so: helper.cpp helper.h param_testCli.h param_testCli.i
+.obj/tmplinst.o .obj/tmplinst.so .shobj/tmplinst.o .shobj/tmplinst.so: tmplinst.cpp param_testCli.h param_testCli.i
+.obj/any.o .obj/any.so .shobj/any.o .shobj/any.so: any.cpp helper.h param_testCli.h param_testCli.i any.h
+.obj/bd_long_seq.o .obj/bd_long_seq.so .shobj/bd_long_seq.o .shobj/bd_long_seq.so: bd_long_seq.cpp helper.h param_testCli.h \
+ param_testCli.i bd_long_seq.h
+.obj/bd_short_seq.o .obj/bd_short_seq.so .shobj/bd_short_seq.o .shobj/bd_short_seq.so: bd_short_seq.cpp helper.h param_testCli.h \
+ param_testCli.i bd_short_seq.h
+.obj/bd_str_seq.o .obj/bd_str_seq.so .shobj/bd_str_seq.o .shobj/bd_str_seq.so: bd_str_seq.cpp helper.h param_testCli.h param_testCli.i \
+ bd_str_seq.h
+.obj/bd_string.o .obj/bd_string.so .shobj/bd_string.o .shobj/bd_string.so: bd_string.cpp helper.h param_testCli.h param_testCli.i \
+ bd_string.h
+.obj/bd_struct_seq.o .obj/bd_struct_seq.so .shobj/bd_struct_seq.o .shobj/bd_struct_seq.so: bd_struct_seq.cpp helper.h param_testCli.h \
+ param_testCli.i bd_struct_seq.h
+.obj/fixed_array.o .obj/fixed_array.so .shobj/fixed_array.o .shobj/fixed_array.so: fixed_array.cpp helper.h param_testCli.h \
+ param_testCli.i fixed_array.h
+.obj/fixed_struct.o .obj/fixed_struct.so .shobj/fixed_struct.o .shobj/fixed_struct.so: fixed_struct.cpp helper.h param_testCli.h \
+ param_testCli.i fixed_struct.h
+.obj/nested_struct.o .obj/nested_struct.so .shobj/nested_struct.o .shobj/nested_struct.so: nested_struct.cpp helper.h param_testCli.h \
+ param_testCli.i nested_struct.h
+.obj/objref_struct.o .obj/objref_struct.so .shobj/objref_struct.o .shobj/objref_struct.so: objref_struct.cpp helper.h param_testCli.h \
+ param_testCli.i objref_struct.h
+.obj/objref.o .obj/objref.so .shobj/objref.o .shobj/objref.so: objref.cpp helper.h param_testCli.h param_testCli.i objref.h
+.obj/short.o .obj/short.so .shobj/short.o .shobj/short.so: short.cpp helper.h param_testCli.h param_testCli.i short.h
+.obj/ulonglong.o .obj/ulonglong.so .shobj/ulonglong.o .shobj/ulonglong.so: ulonglong.cpp helper.h param_testCli.h param_testCli.i \
+ ulonglong.h
+.obj/typecode.o .obj/typecode.so .shobj/typecode.o .shobj/typecode.so: typecode.cpp helper.h param_testCli.h param_testCli.i \
+ typecode.h
+.obj/ub_any_seq.o .obj/ub_any_seq.so .shobj/ub_any_seq.o .shobj/ub_any_seq.so: ub_any_seq.cpp helper.h param_testCli.h param_testCli.i \
+ ub_any_seq.h
+.obj/ub_long_seq.o .obj/ub_long_seq.so .shobj/ub_long_seq.o .shobj/ub_long_seq.so: ub_long_seq.cpp helper.h param_testCli.h \
+ param_testCli.i ub_long_seq.h
+.obj/ub_objref_seq.o .obj/ub_objref_seq.so .shobj/ub_objref_seq.o .shobj/ub_objref_seq.so: ub_objref_seq.cpp helper.h param_testCli.h \
+ param_testCli.i ub_objref_seq.h
+.obj/ub_short_seq.o .obj/ub_short_seq.so .shobj/ub_short_seq.o .shobj/ub_short_seq.so: ub_short_seq.cpp helper.h param_testCli.h \
+ param_testCli.i ub_short_seq.h
+.obj/ub_str_seq.o .obj/ub_str_seq.so .shobj/ub_str_seq.o .shobj/ub_str_seq.so: ub_str_seq.cpp helper.h param_testCli.h param_testCli.i \
+ ub_str_seq.h
+.obj/ub_string.o .obj/ub_string.so .shobj/ub_string.o .shobj/ub_string.so: ub_string.cpp helper.h param_testCli.h param_testCli.i \
+ ub_string.h
+.obj/ub_struct_seq.o .obj/ub_struct_seq.so .shobj/ub_struct_seq.o .shobj/ub_struct_seq.so: ub_struct_seq.cpp helper.h param_testCli.h \
+ param_testCli.i ub_struct_seq.h
+.obj/var_array.o .obj/var_array.so .shobj/var_array.o .shobj/var_array.so: var_array.cpp helper.h param_testCli.h param_testCli.i \
+ var_array.h
+.obj/var_struct.o .obj/var_struct.so .shobj/var_struct.o .shobj/var_struct.so: var_struct.cpp helper.h param_testCli.h param_testCli.i \
+ var_struct.h
+.obj/except.o .obj/except.so .shobj/except.o .shobj/except.so: except.cpp helper.h param_testCli.h param_testCli.i except.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/Param_Test/README b/TAO/tests/Param_Test/README
index 7096162031c..d1aab93a07e 100644
--- a/TAO/tests/Param_Test/README
+++ b/TAO/tests/Param_Test/README
@@ -73,7 +73,6 @@ To run the client, type
        var_array            for arrays of var sized types (strings)
        typecode             for typecode
        exception            for exceptions
-       multdim_array        for multi dimensional arrays
 
 
 	There are 2 options of giving the Param_obj-ref-key i.e IOR to
diff --git a/TAO/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp
index 600113401c2..354d009c6bb 100644
--- a/TAO/tests/Param_Test/any.cpp
+++ b/TAO/tests/Param_Test/any.cpp
@@ -47,9 +47,9 @@ Test_Any::opname (void) const
 }
 
 void
-Test_Any::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
+Test_Any::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 #if 0 /* any_table isn't currently used */
@@ -69,24 +69,22 @@ static const CORBA::TypeCode_ptr any_table [] =
 
 int
 Test_Any::init_parameters (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
-  ACE_TRY
+  TAO_TRY
     {
       // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      this->cobj_ = objref->make_coffee (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      //ACE_UNUSED_ARG (sysex);
-
-      ACE_PRINT_EXCEPTION (sysex, "System Exception doing make_coffee");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception doing make_coffee");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
 
   this->reset_parameters ();
   return 0;
@@ -100,53 +98,38 @@ Test_Any::reset_parameters (void)
 
   switch (index)
     {
-    default:
     case Test_Any::ANY_SHORT:
       {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_SHORT subtest\n"));
         CORBA::Short s;
         s = gen->gen_short ();
-	      if (TAO_debug_level > 0)
-	        ACE_DEBUG ((LM_DEBUG, "setting short = %d\n", s));
+	if (TAO_debug_level > 0)
+	  ACE_DEBUG ((LM_DEBUG, "setting short = %d\n", s));
         this->in_ <<= s;
         this->inout_ <<= s;
       }
       break;
-
     case Test_Any::ANY_STRING:
       {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_STRING subtest\n"));
         char *str = gen->gen_string ();
-	      if (TAO_debug_level > 0)
-	        ACE_DEBUG ((LM_DEBUG, "setting string = %s\n", str));
+	if (TAO_debug_level > 0)
+	  ACE_DEBUG ((LM_DEBUG, "setting string = %s\n", str));
         this->in_ <<= str;
         this->inout_ <<= str;
-        CORBA::string_free (str);
       }
       break;
-
     case Test_Any::ANY_OBJREF:
       {
         if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_OBJREF subtest\n"));
+          ACE_DEBUG ((LM_DEBUG, "Testing any with Coffee object.\n"));
 
         // insert the coffee object into the Any
         this->in_ <<= this->cobj_.in ();
         this->inout_ <<= this->cobj_.in ();
       }
       break;
-
     case Test_Any::ANY_ARRAY:
+      // test array
       {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_ARRAY subtest\n"));
-
         Param_Test::Fixed_Array array;
         for (size_t i = 0; i < Param_Test::DIM1; i++)
           array[i] = i;
@@ -156,97 +139,44 @@ Test_Any::reset_parameters (void)
         this->inout_ <<= Param_Test::Fixed_Array_forany (array);
       }
       break;
-
-    case Test_Any::ANY_SHORT_SEQ:
-      {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_SHORT_SEQ subtest\n"));
-        Param_Test::Short_Seq seq;
-        seq.length (gen->gen_short () % 16);
-        for (size_t i = 0; i < seq.length (); i++)
-          seq[i] = gen->gen_short ();
-        this->in_    <<= seq;
-        this->inout_ <<= seq;
-      }
-      break;
-
     case Test_Any::ANY_BD_SHORT_SEQ:
       {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_BD_SHORT_SEQ subtest\n"));
         Param_Test::Bounded_Short_Seq seq;
         seq.length (gen->gen_short () % seq.maximum ());
         for (size_t i = 0; i < seq.length (); i++)
           seq[i] = gen->gen_short ();
-        this->in_    <<= seq;
+        this->in_ <<= seq;
         this->inout_ <<= seq;
       }
       break;
-
     case Test_Any::ANY_STRUCT:
       {
-        if (TAO_debug_level > 0)
-          ACE_DEBUG ((LM_DEBUG,
-                      "Param_Test: ANY_STRUCT subtest\n"));
         Param_Test::Fixed_Struct structure;
         structure = gen->gen_fixed_struct ();
         this->in_ <<= structure;
         this->inout_ <<= structure;
       }
       break;
-
-    case Test_Any::ANY_UNION:
-      {
-        CORBA::Long x = gen->gen_long ();
-        Param_Test::Big_Union the_union;
-        the_union.the_long (x);
-        this->in_    <<= the_union;
-        this->inout_ <<= the_union;
-
-        if (TAO_debug_level > 0)
-          {
-            Param_Test::Big_Union *bu_in, *bu_inout;
-            this->in_ >>= bu_in;
-            this->inout_ >>= bu_inout;
-            ACE_DEBUG ((LM_DEBUG,
-                        "Param_Test: ANY_UNION subtest\n"
-                        "  in %d\n"
-                        "  inout %d\n",
-                        bu_in->the_long (),
-                        bu_inout->the_long ()));
-          }
-      }
-      break;
     }
   return 0;
 }
 
 int
 Test_Any::run_sii_test (Param_Test_ptr objref,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
-  ACE_TRY
-    {
-      this->ret_ = objref->test_any (this->in_,
-                                     this->inout_,
-                                     this->out_.out (),
-                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
+  CORBA::Any_out out (this->out_.out ());
+  this->ret_ = objref->test_any (this->in_,
+                                 this->inout_,
+                                 out,
+                                 env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Any::add_args (CORBA::NVList_ptr param_list,
                     CORBA::NVList_ptr retval,
-                    CORBA::Environment &ACE_TRY_ENV)
+                    CORBA::Environment &env)
 {
   CORBA::Any in_arg (CORBA::_tc_any,
                      &this->in_,
@@ -264,23 +194,23 @@ Test_Any::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("o1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("o2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("o3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_any,
+  retval->item (0, env)->value ()->replace (CORBA::_tc_any,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -292,18 +222,16 @@ Test_Any::check_validity (void)
   Coffee_ptr obj_in, obj_inout, obj_out, obj_ret;
   Param_Test::Fixed_Array_forany array_in, array_inout, array_out, array_ret;
   Param_Test::Bounded_Short_Seq *bdss_in, *bdss_inout, *bdss_out, *bdss_ret;
-  Param_Test::Short_Seq *ubss_in, *ubss_inout, *ubss_out, *ubss_ret;
   Param_Test::Fixed_Struct *fs_in, *fs_inout, *fs_out, *fs_ret;
-  Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret;
 
   if ((this->in_ >>= short_in) &&
       (this->inout_ >>= short_inout) &&
       (this->out_.in () >>= short_out) &&
       (this->ret_.in () >>= short_ret))
     {
-      // ACE_DEBUG ((LM_DEBUG, "Received shorts: in = %d, "
-      //            "inout = %d, out = %d, ret = %d\n",
-      //            short_in, short_inout, short_out, short_ret));
+      ACE_DEBUG ((LM_DEBUG, "Received shorts: in = %d, "
+                  "inout = %d, out = %d, ret = %d\n",
+                  short_in, short_inout, short_out, short_ret));
 
       if ((short_in == short_inout) &&
           (short_in == short_out) &&
@@ -370,21 +298,6 @@ Test_Any::check_validity (void)
         }
       return 1;
     }
-  else if ((this->in_ >>= ubss_in) &&
-           (this->inout_ >>= ubss_inout) &&
-           (this->out_.in () >>= ubss_out) &&
-           (this->ret_.in () >>= ubss_ret))
-    {
-      for (size_t i = 0; i < ubss_in->length (); i ++)
-        {
-          ssize_t square = i * i;
-          if ((*ubss_in)[i] != (*ubss_out)[i] ||
-              (*ubss_inout)[i] != square ||
-              (*ubss_inout)[i] != (*ubss_ret)[i])
-            return 0;
-        }
-      return 1;
-    }
   else if ((this->in_ >>= fs_in) &&
            (this->inout_ >>= fs_inout) &&
            (this->out_.in () >>= fs_out) &&
@@ -393,46 +306,14 @@ Test_Any::check_validity (void)
       // @@ Added test for data validity here.
       return 1;
     }
-  else if ((this->in_ >>= bu_in) &&
-           (this->inout_ >>= bu_inout) &&
-           (this->out_.in () >>= bu_out) &&
-           (this->ret_.in () >>= bu_ret))
-    {
-      if (bu_in->_d () != 2
-          || bu_inout->_d () != 2
-          || bu_out->_d () != 2
-          || bu_ret->_d () != 2)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Test_Any - not all unions contain a long\n"));
-          return 0;
-        }
-
-      if (bu_in->the_long () != bu_inout->the_long ()
-          || bu_in->the_long () != bu_out->the_long ()
-          || bu_in->the_long () != bu_ret->the_long ())
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Test_Any - values mismatch\n"
-                      "  in %d\n"
-                      "  inout %d\n"
-                      "  out %d\n"
-                      "  ret %d\n",
-                      bu_in->the_long (),
-                      bu_inout->the_long (),
-                      bu_out->the_long (),
-                      bu_ret->the_long () ));
-          return 0;
-        }
-      return 1;
-    }
   else
     return 0;
 }
 
 CORBA::Boolean
-Test_Any::check_validity (CORBA::Request_ptr /*req*/)
+Test_Any::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h
index ee3d68d7fc4..1a6777e2ca9 100644
--- a/TAO/tests/Param_Test/any.h
+++ b/TAO/tests/Param_Test/any.h
@@ -39,10 +39,8 @@ public:
     ANY_STRING,
     ANY_OBJREF,
     ANY_ARRAY,
-    ANY_SHORT_SEQ,
     ANY_BD_SHORT_SEQ,
     ANY_STRUCT,
-    ANY_UNION,
     ANY_LAST_TEST_ITEM
   };
 
@@ -74,7 +72,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp
index d48cbe24c4e..7f728049d8a 100644
--- a/TAO/tests/Param_Test/bd_long_seq.cpp
+++ b/TAO/tests/Param_Test/bd_long_seq.cpp
@@ -47,18 +47,17 @@ Test_Bounded_Long_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req,
-                                            CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Long_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr objref,
-                                             CORBA::Environment &ACE_TRY_ENV)
+                                             CORBA::Environment &env)
 {
   ACE_UNUSED_ARG (objref);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
+  ACE_UNUSED_ARG (env);
 
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -85,20 +84,20 @@ Test_Bounded_Long_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                          CORBA::Environment &env)
 {
   Param_Test::Bounded_Long_Seq_out out (this->out_.out ());
   this->ret_ = objref->test_bounded_long_sequence (this->in_.in (),
                                                    this->inout_.inout (),
                                                    out,
-                                                   ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                                   env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
                                        CORBA::NVList_ptr retval,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Bounded_Long_Seq,
                      (void *) &this->in_.in (),
@@ -116,23 +115,23 @@ Test_Bounded_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Bounded_Long_Seq,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h
index 306da6e4a23..2f7dc633067 100644
--- a/TAO/tests/Param_Test/bd_long_seq.h
+++ b/TAO/tests/Param_Test/bd_long_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp
index 0d097f31acb..85016c109c1 100644
--- a/TAO/tests/Param_Test/bd_short_seq.cpp
+++ b/TAO/tests/Param_Test/bd_short_seq.cpp
@@ -47,18 +47,17 @@ Test_Bounded_Short_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req, 
-                                             CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Short_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/,
-                                              CORBA::Environment  & /*env*/)
+Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr objref,
+                                              CORBA::Environment &env)
 {
-  // ACE_UNUSED_ARG (objref);
-  // ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // get some sequence length (32 in this case)
   CORBA::ULong len = this->in_->maximum ();
@@ -87,20 +86,20 @@ Test_Bounded_Short_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref,
-                                           CORBA::Environment &ACE_TRY_ENV)
+                                           CORBA::Environment &env)
 {
   Param_Test::Bounded_Short_Seq_out out (this->out_.out ());
   this->ret_ = objref->test_bounded_short_sequence (this->in_.in (),
                                                     this->inout_.inout (),
                                                     out,
-                                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                                    env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
                                        CORBA::NVList_ptr retval,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Bounded_Short_Seq,
                      (void *) &this->in_.in (),
@@ -118,23 +117,23 @@ Test_Bounded_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_Short_Seq,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Bounded_Short_Seq,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -161,8 +160,9 @@ Test_Bounded_Short_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Bounded_Short_Sequence::check_validity (CORBA::Request_ptr /*req*/)
+Test_Bounded_Short_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h
index 2198fa319fa..798687a9fb5 100644
--- a/TAO/tests/Param_Test/bd_short_seq.h
+++ b/TAO/tests/Param_Test/bd_short_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 954934c4dca..6c057e99247 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -47,16 +47,18 @@ Test_Bounded_String_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr ,
-                                               CORBA::Environment &)
+Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr objref,
+                                               CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   const char *choiceList[] =
   {
     "one",
@@ -89,20 +91,20 @@ Test_Bounded_String_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &env)
 {
   Param_Test::Bounded_StrSeq_out out (this->out_.out ());
   this->ret_ = objref->test_bounded_strseq (this->in_.in (),
                                             this->inout_.inout (),
                                             out,
-                                            ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                            env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_String_Sequence::add_args (CORBA::NVList_ptr param_list,
                                         CORBA::NVList_ptr retval,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Bounded_StrSeq,
                      (void *) &this->in_.in (),
@@ -120,23 +122,23 @@ Test_Bounded_String_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_StrSeq,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Bounded_StrSeq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -163,9 +165,9 @@ Test_Bounded_String_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Bounded_String_Sequence::check_validity (CORBA::Request_ptr /*req*/)
+Test_Bounded_String_Sequence::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h
index ea82ac8d55a..43f89e42f37 100644
--- a/TAO/tests/Param_Test/bd_str_seq.h
+++ b/TAO/tests/Param_Test/bd_str_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp
index 0dc6df8e141..350e9e7355a 100644
--- a/TAO/tests/Param_Test/bd_string.cpp
+++ b/TAO/tests/Param_Test/bd_string.cpp
@@ -55,19 +55,18 @@ Test_Bounded_String::opname (void) const
 }
 
 void
-Test_Bounded_String::dii_req_invoke (CORBA::Request *req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_String::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Bounded_String::init_parameters (Param_Test_ptr /*objref*/,
-				      CORBA::Environment &/*env*/)
+Test_Bounded_String::init_parameters (Param_Test_ptr objref,
+				      CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
-  //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // release any previously occupied values
   CORBA::string_free (this->in_);
@@ -98,20 +97,20 @@ Test_Bounded_String::reset_parameters (void)
 
 int
 Test_Bounded_String::run_sii_test (Param_Test_ptr objref,
-				   CORBA::Environment &ACE_TRY_ENV)
+				   CORBA::Environment &env)
 {
   CORBA::String_out str_out (this->out_);
   this->ret_ = objref->test_unbounded_string (this->in_,
                                               this->inout_,
                                               str_out,
-                                              ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                              env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_String::add_args (CORBA::NVList_ptr param_list,
 			       CORBA::NVList_ptr retval,
-			       CORBA::Environment &ACE_TRY_ENV)
+			       CORBA::Environment &env)
 {
   // create the parameters
   CORBA::Any in_arg (CORBA::_tc_string,
@@ -130,23 +129,23 @@ Test_Bounded_String::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_string,
+  retval->item (0, env)->value ()->replace (CORBA::_tc_string,
                                             &this->ret_,
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -166,9 +165,9 @@ Test_Bounded_String::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Bounded_String::check_validity (CORBA::Request_ptr /*req*/)
+Test_Bounded_String::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h
index 7b12701fdb3..c4e5677e65a 100644
--- a/TAO/tests/Param_Test/bd_string.h
+++ b/TAO/tests/Param_Test/bd_string.h
@@ -65,7 +65,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp
index 9a53167389e..8f99ebcde40 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.cpp
+++ b/TAO/tests/Param_Test/bd_struct_seq.cpp
@@ -50,20 +50,19 @@ Test_Bounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                              CORBA::Environment &ACE_TRY_ENV)
+Test_Bounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /*objref*/,
-                                               CORBA::Environment &/*env*/)
+Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr objref,
+                                               CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
-  //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // set the length of the sequence
   this->in_.length (MAX_STRUCTSEQ_LEN);
@@ -88,20 +87,20 @@ Test_Bounded_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                            CORBA::Environment &ACE_TRY_ENV)
+                                            CORBA::Environment &env)
 {
   Param_Test::Bounded_StructSeq_out out (this->out_.out ());
   this->ret_ = objref->test_bounded_struct_sequence (this->in_,
                                                      this->inout_.inout (),
                                                      out,
-                                                     ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                                     env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Bounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
                                         CORBA::NVList_ptr retval,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Bounded_StructSeq,
                      &this->in_,
@@ -119,23 +118,23 @@ Test_Bounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Bounded_StructSeq,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Bounded_StructSeq,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -151,9 +150,9 @@ Test_Bounded_Struct_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Bounded_Struct_Sequence::check_validity (CORBA::Request_ptr /*req*/)
+Test_Bounded_Struct_Sequence::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h
index 9119a46c90b..138a8ec8032 100644
--- a/TAO/tests/Param_Test/bd_struct_seq.h
+++ b/TAO/tests/Param_Test/bd_struct_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp
deleted file mode 100644
index 52bb0afc62b..00000000000
--- a/TAO/tests/Param_Test/big_union.cpp
+++ /dev/null
@@ -1,553 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    big_union.cpp
-//
-// = DESCRIPTION
-//    tests Big_Unions
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "helper.h"
-#include "big_union.h"
-
-ACE_RCSID(Param_Test, big_union, "$Id$")
-
-// ************************************************************************
-//               Test_Big_Union
-// ************************************************************************
-
-size_t Test_Big_Union::counter = 0;
-
-Test_Big_Union::Test_Big_Union (void)
-  : opname_ (CORBA::string_dup ("test_big_union"))
-{
-}
-
-Test_Big_Union::~Test_Big_Union (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Big_Union::opname (void) const
-{
-  return this->opname_;
-}
-
-void
-Test_Big_Union::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  req->invoke (ACE_TRY_ENV);
-}
-
-int
-Test_Big_Union::init_parameters (Param_Test_ptr objref,
-                                 CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      // get access to a Coffee Object
-      this->cobj_ = objref->make_coffee (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      //ACE_UNUSED_ARG (sysex);
-      ACE_PRINT_EXCEPTION (sysex,"System Exception doing make_coffee");
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "An exception caught in make_coffee");
-      return -1;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  this->reset_parameters ();
-  return 0;
-}
-
-int
-Test_Big_Union::reset_parameters (void)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-  CORBA::ULong index = (counter++ % Test_Big_Union::BIG_UNION_N_BRANCHES);
-
-  switch (index)
-    {
-    case 0:
-      {
-        Param_Test::Fixed_Array x;
-        for (CORBA::ULong i = 0; i < Param_Test::DIM1; ++i)
-          {
-            x[i] = gen->gen_long ();
-          }
-        this->in_.the_array (x);
-        this->inout_.the_array (x);
-      }
-      break;
-    case 1:
-      {
-        this->in_.the_interface (this->cobj_.in ());
-        this->inout_.the_interface (this->cobj_.in ());
-      }
-      break;
-    case 2:
-      {
-        CORBA::Long x = gen->gen_long ();
-        this->in_.the_long (x);
-        this->inout_.the_long (x);
-      }
-      break;
-    case 3:
-      {
-        Param_Test::Big_Union::_another_array x;
-        for (int i = 0; i < 32; ++i)
-          {
-            x[i] = gen->gen_short ();
-          }
-        this->in_.another_array (x);
-        this->inout_.another_array (x);
-      }
-      break;
-    case 4:
-      {
-        CORBA::String_var str = gen->gen_string ();
-        this->in_.the_string (str);
-        this->inout_.the_string (str);
-      }
-      break;
-    case 5:
-      {
-        Param_Test::Short_Seq seq;
-        seq.length (gen->gen_short () % 50);
-        for (size_t i = 0; i < seq.length (); i++)
-          seq[i] = gen->gen_short ();
-        this->in_.the_sequence (seq);
-        this->inout_.the_sequence (seq);
-      }
-      break;
-    case 6:
-      {
-        CORBA::Any any;
-        any <<= CORBA::Short (25);
-        this->in_.the_any (any);
-        this->inout_.the_any (any);
-      }
-      break;
-    case 7:
-      {
-        CORBA::Octet octet = gen->gen_short () % 255;
-        this->in_.the_octet (octet);
-        this->inout_.the_octet (octet);
-      }
-      break;
-    case 8:
-      {
-        CORBA::Char x = '@';
-        this->in_.the_char (x);
-        this->inout_.the_char (x);
-      }
-      break;
-    case 9:
-      {
-        CORBA::Boolean x = gen->gen_short () % 2;
-        this->in_.the_boolean (x);
-        this->inout_.the_boolean (x);
-      }
-      break;
-    case 10:
-      {
-        Param_Test::Var_Struct var_struct;
-        var_struct.dummy1 = gen->gen_string ();
-        var_struct.dummy2 = gen->gen_string ();
-        CORBA::ULong len = gen->gen_long () % 10 + 1;
-        var_struct.seq.length (len);
-        for (CORBA::ULong i = 0; i != len; ++i)
-          {
-            var_struct.seq[i] = gen->gen_string ();
-          }
-        this->in_.the_var_struct (var_struct);
-        this->inout_.the_var_struct (var_struct);
-      }
-      break;
-    case 11:
-      {
-        Param_Test::Fixed_Struct fixed_struct;
-        fixed_struct.l = gen->gen_long ();
-        fixed_struct.c = gen->gen_long () % 255;
-        fixed_struct.s = gen->gen_long () % 32768;
-        fixed_struct.o = gen->gen_long () % 255;
-        fixed_struct.f = gen->gen_short () / 255.0f;
-        fixed_struct.b = gen->gen_long () % 2;
-        fixed_struct.d = gen->gen_short () / 255.0;
-        this->in_.the_fixed_struct (fixed_struct);
-        this->inout_.the_fixed_struct (fixed_struct);
-      }
-      break;
-    }
-  return 0;
-}
-
-int
-Test_Big_Union::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  this->ret_ = objref->test_big_union (this->in_,
-                                       this->inout_,
-                                       this->out_,
-                                       ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
-}
-
-int
-Test_Big_Union::add_args (CORBA::NVList_ptr param_list,
-                          CORBA::NVList_ptr retval,
-                          CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any in_arg (Param_Test::_tc_Big_Union,
-                     &this->in_,
-                     0);
-
-  CORBA::Any inout_arg (Param_Test::_tc_Big_Union,
-                        &this->inout_,
-                        0);
-
-  CORBA::Any out_arg (Param_Test::_tc_Big_Union,
-                      &this->out_,
-                      0);
-
-  // add parameters
-  param_list->add_value ("u1",
-                         in_arg,
-                         CORBA::ARG_IN,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("u2",
-                         inout_arg,
-                         CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("u3",
-                         out_arg,
-                         CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
-
-  // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Big_Union,
-                                            &this->ret_,
-                                            0,
-                                            ACE_TRY_ENV);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Big_Union::check_validity (void)
-{
-  if (this->in_._d () != this->inout_._d ()
-      || this->in_._d () != this->out_->_d ()
-      || this->in_._d () != this->ret_->_d ())
-    {
-      ACE_DEBUG ((LM_DEBUG, "mismatch of discriminators\n"));
-      return 0;
-    }
-
-
-  switch (this->in_._d ())
-    {
-    case 0:
-      {
-        Param_Test::Fixed_Array_slice* in_array    = this->in_.the_array ();
-        Param_Test::Fixed_Array_slice* inout_array = this->inout_.the_array ();
-        Param_Test::Fixed_Array_slice* out_array   = this->out_->the_array ();
-        Param_Test::Fixed_Array_slice* ret_array   = this->ret_->the_array ();
-        for (CORBA::ULong i = 0; i < Param_Test::DIM1; ++i)
-          {
-            if (in_array[i] != inout_array[i]
-                || in_array[i] != out_array[i]
-                || in_array[i] != ret_array[i])
-              {
-                ACE_DEBUG ((LM_DEBUG, 
-                            "mismatch of arrays\n"));
-                return 0;
-              }
-          }
-      }
-      break;
-    case 1:
-      {
-        ACE_DECLARE_NEW_CORBA_ENV;
-        ACE_TRY
-          {
-            Coffee_ptr in    = this->in_.the_interface ();
-            Coffee_ptr inout = this->inout_.the_interface ();
-            Coffee_ptr out   = this->out_->the_interface ();
-            Coffee_ptr ret   = this->ret_->the_interface ();
-
-            if (CORBA::is_nil (in)
-                || CORBA::is_nil (inout)
-                || CORBA::is_nil (out)
-                || CORBA::is_nil (ret))
-              return 0;
-
-            Coffee::Desc_var in_desc =
-              in->description (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-            Coffee::Desc_var inout_desc =
-              inout->description (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-            Coffee::Desc_var out_desc =
-              out->description (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-            Coffee::Desc_var ret_desc =
-              ret->description (ACE_TRY_ENV);
-            ACE_TRY_CHECK;
-
-            if (ACE_OS::strcmp (in_desc->name.in (),
-                                inout_desc->name.in ())
-                || ACE_OS::strcmp (in_desc->name.in (),
-                                   out_desc->name.in ())
-                || ACE_OS::strcmp (in_desc->name.in (),
-                                   ret_desc->name.in ()))
-              return 0;
-          }
-        ACE_CATCHANY
-          {
-            return 0;
-          }
-        ACE_ENDTRY;
-      }
-      break;
-    case 2:
-      {
-        CORBA::Long in    = this->in_.the_long ();
-        CORBA::Long inout = this->inout_.the_long ();
-        CORBA::Long out   = this->out_->the_long ();
-        CORBA::Long ret   = this->ret_->the_long ();
-        if (in != out || in != inout || in != ret)
-          return 0;
-      }
-      break;
-
-    case 3:
-      {
-        Param_Test::Big_Union::_another_array_slice* in_array    =
-          this->in_.another_array ();
-        Param_Test::Big_Union::_another_array_slice* inout_array =
-          this->inout_.another_array ();
-        Param_Test::Big_Union::_another_array_slice* out_array   =
-          this->out_->another_array ();
-        Param_Test::Big_Union::_another_array_slice* ret_array   =
-          this->ret_->another_array ();
-        for (int i = 0; i != 32; ++i)
-          {
-            if (in_array[i] != inout_array[i]
-                || in_array[i] != out_array[i]
-                || in_array[i] != ret_array[i])
-              return 0;
-          }
-      }
-      break;
-
-    case 4:
-      {
-        const char* in    = this->in_.the_string ();
-        const char* inout = this->inout_.the_string ();
-        const char* out   = this->out_->the_string ();
-        const char* ret   = this->ret_->the_string ();
-        if (ACE_OS::strcmp (in,out)
-            || ACE_OS::strcmp (in,inout)
-            || ACE_OS::strcmp (in,ret))
-          return 0;
-      }
-      break;
-
-    case 5:
-      {
-        const Param_Test::Short_Seq& in =
-          this->in_.the_sequence ();
-        const Param_Test::Short_Seq& inout =
-          this->inout_.the_sequence ();
-        const Param_Test::Short_Seq& out =
-          this->out_->the_sequence ();
-        const Param_Test::Short_Seq& ret =
-          this->ret_->the_sequence ();
-
-        if (in.length () != out.length ()
-            || in.length () != inout.length ()
-            || in.length () != ret.length ())
-          return 0;
-
-        for (CORBA::ULong i = 0; i != in.length (); ++i)
-          {
-            if (in[i] != out[i]
-                || in[i] != inout[i]
-                || in[i] != ret[i])
-              return 0;
-          }
-      }
-      break;
-
-    case 6:
-      {
-        CORBA::Any in = this->in_.the_any ();
-        CORBA::Any inout = this->inout_.the_any ();
-        CORBA::Any out = this->out_->the_any ();
-        CORBA::Any ret = this->ret_->the_any ();
-
-        CORBA::Short in_short;
-        CORBA::Short inout_short;
-        CORBA::Short out_short;
-        CORBA::Short ret_short;
-        if (!(in >>= in_short)
-            || !(inout >>= inout_short)
-            || !(out >>= out_short)
-            || !(ret >>= ret_short))
-          return 0;
-
-        if (in_short != inout_short
-            || in_short != out_short
-            || in_short != ret_short)
-          return 0;
-      }
-      break;
-
-    case 7:
-      {
-        CORBA::Octet in    = this->in_.the_octet ();
-        CORBA::Octet inout = this->inout_.the_octet ();
-        CORBA::Octet out   = this->out_->the_octet ();
-        CORBA::Octet ret   = this->ret_->the_octet ();
-        if (in != out || in != inout || in != ret)
-          return 0;
-      }
-      break;
-
-    case 8:
-      {
-        CORBA::Char in    = this->in_.the_char ();
-        CORBA::Char inout = this->inout_.the_char ();
-        CORBA::Char out   = this->out_->the_char ();
-        CORBA::Char ret   = this->ret_->the_char ();
-        if (in != out || in != inout || in != ret)
-          return 0;
-      }
-      break;
-
-    case 9:
-      {
-        CORBA::Boolean in    = this->in_.the_boolean ();
-        CORBA::Boolean inout = this->inout_.the_boolean ();
-        CORBA::Boolean out   = this->out_->the_boolean ();
-        CORBA::Boolean ret   = this->ret_->the_boolean ();
-        if (in != out || in != inout || in != ret)
-          return 0;
-      }
-      break;
-
-    case 10:
-      {
-        const Param_Test::Var_Struct& in =
-          this->in_.the_var_struct ();
-        const Param_Test::Var_Struct& inout =
-          this->inout_.the_var_struct ();
-        const Param_Test::Var_Struct& out =
-          this->out_->the_var_struct ();
-        const Param_Test::Var_Struct& ret =
-          this->ret_->the_var_struct ();
-
-        if (!(ACE_OS::strcmp (in.dummy1.in (),
-                              inout.dummy1.in ()) == 0
-              && ACE_OS::strcmp (in.dummy2.in (),
-                                 inout.dummy2.in ()) == 0)
-            || !(ACE_OS::strcmp (in.dummy1.in (),
-                                 out.dummy1.in ()) == 0
-               && ACE_OS::strcmp (in.dummy2.in (),
-                                  out.dummy2.in ()) == 0)
-            || !(ACE_OS::strcmp (in.dummy1.in (),
-                                 ret.dummy1.in ()) == 0
-               && ACE_OS::strcmp (in.dummy2.in (),
-                                  ret.dummy2.in ()) == 0))
-          return 0;
-
-        if (in.seq.length () != inout.seq.length ()
-            || in.seq.length () != out.seq.length ()
-            || in.seq.length () != ret.seq.length ())
-          return 0;
-
-        CORBA::ULong len = in.seq.length ();
-        for (CORBA::ULong i = 0; i != len; ++i)
-          {
-            if (ACE_OS::strcmp (in.seq[i].in (),
-                                inout.seq[i].in ())
-                || ACE_OS::strcmp (in.seq[i].in (),
-                                   out.seq[i].in ())
-                || ACE_OS::strcmp (in.seq[i].in (),
-                                   ret.seq[i].in ()))
-              return 0;
-          }
-      }
-      break;
-    case 11:
-      {
-        const Param_Test::Fixed_Struct& in =
-          this->in_.the_fixed_struct ();
-        const Param_Test::Fixed_Struct& inout =
-          this->inout_.the_fixed_struct ();
-        const Param_Test::Fixed_Struct& out =
-          this->out_->the_fixed_struct ();
-        const Param_Test::Fixed_Struct& ret =
-          this->ret_->the_fixed_struct ();
-
-        if (! (in.l == inout.l
-               && in.c == inout.c
-               && in.s == inout.s
-               && in.o == inout.o
-               && in.f == inout.f
-               && in.b == inout.b
-               && in.d == inout.d)
-            || !(in.l == out.l
-                 && in.c == out.c
-                 && in.s == out.s
-                 && in.o == out.o
-                 && in.f == out.f
-                 && in.b == out.b
-                 && in.d == out.d)
-            || !(in.l == ret.l
-                 && in.c == ret.c
-                 && in.s == ret.s
-                 && in.o == ret.o
-                 && in.f == ret.f
-                 && in.b == ret.b
-                 && in.d == ret.d))
-          return 0;
-      }
-      break;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-Test_Big_Union::check_validity (CORBA::Request_ptr /*req*/)
-{
-  //ACE_UNUSED_ARG (req);
-  return this->check_validity ();
-}
-
-void
-Test_Big_Union::print_values (void)
-{
-}
diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h
deleted file mode 100644
index 408fb7086d7..00000000000
--- a/TAO/tests/Param_Test/big_union.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    big_union.h
-//
-// = DESCRIPTION
-//     Tests Anys
-//
-// = AUTHORS
-//      Aniruddha Gokhale
-//
-// ============================================================================
-
-#ifndef PARAM_TEST_BIG_UNION_H
-#define PARAM_TEST_BIG_UNION_H
-
-#include "param_testCli.h"
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test Anys
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Big_Union
-{
-public:
-  Test_Big_Union (void);
-  // ctor
-
-  ~Test_Big_Union (void);
-  // dtor
-
-  enum {
-    BIG_UNION_N_BRANCHES = 12
-  };
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr nvlist,
-                CORBA::NVList_ptr retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
-  // invoke DII request with appropriate exception handling.
-
-private:
-  char *opname_;
-  // operation name
-
-  Coffee_var cobj_;
-  // Coffee object used to test Big_Union with object.
-
-  static size_t counter;
-  // test counter.
-
-  Param_Test::Big_Union in_;
-  // in parameter
-
-  Param_Test::Big_Union inout_;
-  // inout parameter
-
-  Param_Test::Big_Union_var out_;
-  // out parameter
-
-  Param_Test::Big_Union_var ret_;
-  // return value
-};
-
-#endif /* PARAM_TEST_BIG_UNION_H */
diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp
index 5b1c6702540..c464dc580fd 100644
--- a/TAO/tests/Param_Test/client.cpp
+++ b/TAO/tests/Param_Test/client.cpp
@@ -49,6 +49,7 @@ template <class T> int
 Param_Test_Client<T>::run_sii_test (void)
 {
   CORBA::ULong i;  // loop index
+  CORBA::Environment env; // to track errors
   Options *opt = OPTIONS::instance (); // get the options
   const char *opname = this->test_object_->opname (); // operation
 
@@ -61,62 +62,50 @@ Param_Test_Client<T>::run_sii_test (void)
   this->results_.error_count (0);
   this->results_.iterations (opt->loop_count ());
 
-  // Declare the Env
-  ACE_DECLARE_NEW_CORBA_ENV;
   // Initialize parameters for the test.
-  if (this->test_object_->init_parameters (this->param_test_, ACE_TRY_ENV) == -1)
+  if (this->test_object_->init_parameters (this->param_test_, env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) client.cpp - run_sii_test:"
                        "init_parameters failed for opname - %s",
                        opname), -1);
 
-
   // Make the calls in a loop.
   for (i = 0; i < opt->loop_count (); i++)
     {
-      ACE_TRY
-        {
-          this->results_.call_count (this->results_.call_count () + 1);
-          if (opt->debug ())
-            ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
-
-          // start the timing
-          this->results_.start_timer ();
-
-          // make the call
-          this->test_object_->run_sii_test (this->param_test_, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          // stop the timer.
-          this->results_.stop_timer ();
-
-          // now check if the values returned are as expected
-          if (opt->debug ())
-            {
-              ACE_DEBUG ((LM_DEBUG, "\n****** After call values *****\n"));
-              this->test_object_->print_values ();
-            }
-        }
-      ACE_CATCHANY
-        {
+      this->results_.call_count (this->results_.call_count () + 1);
+      if (opt->debug ())
+        ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
+
+      // start the timing
+      this->results_.start_timer ();
 
+      // make the call
+      if (this->test_object_->run_sii_test (this->param_test_, env) == -1)
+        {
           this->results_.error_count (this->results_.error_count () + 1);
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, opname);
+          env.print_exception (opname);
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) client.cpp - run_sii_test:"
                       "run_sii_test exception in iteration %d",
                       i));
-          goto loop_around;
+          continue;
+        }
+      // stop the timer.
+      this->results_.stop_timer ();
 
+      // now check if the values returned are as expected
+      if (opt->debug ())
+        {
+          ACE_DEBUG ((LM_DEBUG, "\n****** After call values *****\n"));
+          this->test_object_->print_values ();
         }
-      ACE_ENDTRY;
 
       if (!this->test_object_->check_validity ())
         {
           this->results_.error_count (this->results_.error_count () + 1);
           ACE_ERROR ((LM_ERROR,
                       "(%N:%l) client.cpp - run_sii_test: "
-                      "Invalid results in iteration %d\n",
+                      "Invalid results in iteration %d - ",
                       i));
           continue;
         }
@@ -126,7 +115,6 @@ Param_Test_Client<T>::run_sii_test (void)
                            "(%N:%l) client.cpp - run_sii_test:"
                            "init_parameters failed for opname - %s",
                            opname), -1);
-    loop_around: continue;
     }
 
   // print statistics
@@ -152,6 +140,8 @@ Param_Test_Client<T>::run_dii_test (void)
 {
   const char *opname = this->test_object_->opname ();
   Options *opt = OPTIONS::instance ();
+  CORBA::Environment env; // environment
+
   ACE_DEBUG ((LM_DEBUG,
               "********** %s DII *********\n",
               opname));
@@ -161,16 +151,14 @@ Param_Test_Client<T>::run_dii_test (void)
   this->results_.error_count (0);
   this->results_.iterations (opt->loop_count ());
 
-  // Environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
   // initialize parameters for the test
-  if (this->test_object_->init_parameters (this->param_test_, ACE_TRY_ENV) == -1)
+  if (this->test_object_->init_parameters (this->param_test_, env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) client.cpp - run_dii_test:"
                        "init_parameters failed for opname - %s",
                        opname), -1);
 
-      // Make the calls in a loop.
+  // Make the calls in a loop.
   for (CORBA::ULong i = 0; i < opt->loop_count (); i++)
     {
       this->results_.call_count (this->results_.call_count () + 1);
@@ -188,48 +176,51 @@ Param_Test_Client<T>::run_dii_test (void)
       CORBA::NVList_var retval;
       this->orb_->create_list (1, retval.out ());
 
+      // add arguments and typecode for return valueto the NVList
+      if (this->test_object_->add_args (nvlist,
+					retval.in (),
+					env) == -1)
+        {
+          this->results_.error_count (this->results_.error_count () + 1);
+          env.print_exception (opname);
+          ACE_ERROR ((LM_ERROR,
+                      "(%N:%l) client.cpp - "
+                      "Failed to add args in iteration %d",
+                      i));
+          continue;
+        }
+
       // create the request
       CORBA::Request_var req;
+      CORBA::NamedValue_ptr result =
+	CORBA::NamedValue::_duplicate (retval->item (0, env));
+      this->param_test_->_create_request (opname,
+                                          nvlist,
+                                          result,
+                                          req.out (),
+                                          0, //CORBA::OUT_LIST_MEMORY,
+                                          env);
+      // The OUT_LIST_MEMORY is to be used when the ORB assumes that
+      // we will provide the top-level storage. With 0, the returned
+      // values for ret, inout, and out parameters are all owned by
+      // the ORB and hence we must not free them explicitly.
 
-      ACE_TRY
+      if (opt->debug ())
+        ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
+
+      // Make the invocation, verify the result.
+      TAO_TRY_VAR (*req->env ())
         {
-          // add arguments and typecode for return valueto the NVList
-          this->test_object_->add_args (nvlist,
-					retval.in (),
-					ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-
-          CORBA::NamedValue_ptr result =
-            CORBA::NamedValue::_duplicate (retval->item (0, ACE_TRY_ENV));
-          ACE_TRY_CHECK;
-
-          this->param_test_->_create_request (CORBA_Context::_nil (),
-                                              opname,
-                                              nvlist,
-                                              result,
-                                              req.out (),
-                                              0, //CORBA::OUT_LIST_MEMORY,
-                                              ACE_TRY_ENV);
-          // The OUT_LIST_MEMORY is to be used when the ORB assumes that
-          // we will provide the top-level storage. With 0, the returned
-          // values for ret, inout, and out parameters are all owned by
-          // the ORB and hence we must not free them explicitly.
-          ACE_TRY_CHECK;
-
-          if (opt->debug ())
-            ACE_DEBUG ((LM_DEBUG, "\n****** Before call values *****\n"));
-
-          // Make the invocation, verify the result.
-          this->test_object_->dii_req_invoke (req, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->test_object_->dii_req_invoke (req);
+          TAO_CHECK_ENV;
         }
-      ACE_CATCHANY
+      TAO_CATCHANY
         {
           this->results_.error_count (this->results_.error_count () + 1);
-          ACE_PRINT_EXCEPTION  (ACE_ANY_EXCEPTION,opname);
-          goto loop_around;
+          req->env ()->print_exception (opname);
+          continue;
         }
-      ACE_ENDTRY;
+      TAO_ENDTRY;
 
       if (opt->debug ())
         {
@@ -253,7 +244,6 @@ Param_Test_Client<T>::run_dii_test (void)
       // reset parameters for the test
       this->test_object_->reset_parameters ();
 
-    loop_around:continue;
     } // for loop
 
   // print statistics
diff --git a/TAO/tests/Param_Test/client.dsp b/TAO/tests/Param_Test/client.dsp
index 1968f782f6a..b446f7d288b 100644
--- a/TAO/tests/Param_Test/client.dsp
+++ b/TAO/tests/Param_Test/client.dsp
@@ -42,7 +42,8 @@ RSC=rc.exe
 # 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"helper.h" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +67,8 @@ LINK32=link.exe
 # 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"helper.h" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -111,18 +113,10 @@ SOURCE=.\bd_struct_seq.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\big_union.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\client.cpp

 # End Source File

 # Begin Source File

 

-SOURCE=.\complex_any.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\driver.cpp

 # End Source File

 # Begin Source File

@@ -251,18 +245,10 @@ SOURCE=.\bd_struct_seq.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\big_union.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\client.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\complex_any.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\driver.h

 # End Source File

 # Begin Source File

diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
deleted file mode 100644
index ad08e91145e..00000000000
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    complex_any.cpp
-//
-// = DESCRIPTION
-//    tests complex Anys
-//
-// = AUTHORS
-//    Aniruddha Gokhale, Jeff Parsons, Frank Buschmann
-//
-// ============================================================================
-
-#include "helper.h"
-#include "complex_any.h"
-
-const int LEVEL_2_LENGTH = 5;
-const int LEVEL_3_LENGTH = 3;
-
-ACE_RCSID(Param_Test, any, "$Id$")
-
-// ************************************************************************
-//               Test_Complex_Any
-// ************************************************************************
-
-size_t Test_Complex_Any::counter = 0;
-
-Test_Complex_Any::Test_Complex_Any (void)
-  : opname_ (CORBA::string_dup ("test_complex_any")),
-    out_ (new CORBA::Any),
-    ret_ (new CORBA::Any)
-{
-}
-
-Test_Complex_Any::~Test_Complex_Any (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Complex_Any::opname (void) const
-{
-  return this->opname_;
-}
-
-void
-Test_Complex_Any::dii_req_invoke (CORBA::Request *req, 
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  req->invoke (ACE_TRY_ENV);
-}
-
-int
-Test_Complex_Any::init_parameters (Param_Test_ptr objref,
-                                   CORBA::Environment &ACE_TRY_ENV)
-{
-  return this->reset_parameters ();
-}
-
-// This Any is a real-world use cases
-// submitted by Frank Buschmann of Siemens. Here's the structure:
-//
-// Any <- AnySeq <- AnySeq <- struct <- string
-//                                   <- Any <- Any <- Any <- struct <- string
-//                                                                  <- boolean
-//                                                                  <- short
-int
-Test_Complex_Any::reset_parameters (void)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  Param_Test::AnySeq level2_seq, level3_seq;
-  level2_seq.length (LEVEL_2_LENGTH);
-  level3_seq.length (LEVEL_3_LENGTH);
-
-  for (int j = 0; j < LEVEL_2_LENGTH; j++)
-    {
-      for (int i = 0; i < LEVEL_3_LENGTH; i++)
-        {
-          Param_Test::level4 level4_struct;
-
-          char *l5_str = gen->gen_string ();
-
-	        if (TAO_debug_level > 0)
-	          ACE_DEBUG ((LM_DEBUG, 
-                        "setting level 5 string = %s\n", 
-                        l5_str));
-
-          level4_struct.level5_string = l5_str;
-
-          CORBA::Any level6_any, level7_any;
-
-          Param_Test::level8 level8_struct;
-
-          char *l9_str = gen->gen_string ();
-
-	        if (TAO_debug_level > 0)
-	          ACE_DEBUG ((LM_DEBUG, 
-                        "setting level 9 string = %s\n", 
-                        l9_str));
-
-          level8_struct.level9_string = l9_str;
-
-          CORBA::Short l9_bool = ACE_OS::rand () % 2;
-
-	        if (TAO_debug_level > 0)
-	          ACE_DEBUG ((LM_DEBUG, 
-                        "setting level 9 boolean = %d\n",  
-                        l9_bool));
-
-          level8_struct.level9_boolean = (CORBA::Boolean) l9_bool;
-
-          CORBA::Short l9_short = gen->gen_short ();
-
-	        if (TAO_debug_level > 0)
-	          ACE_DEBUG ((LM_DEBUG, 
-                        "setting level 9 short = %d\n", 
-                        l9_short));
-
-          level8_struct.level9_short = l9_short;
-
-          level7_any <<= level8_struct;
-
-          level6_any <<= level7_any;
-
-          level4_struct.level5_any <<= level6_any;
-
-          level3_seq[i] <<= level4_struct;
-        }
-
-      level2_seq[j] <<= level3_seq;
-    }
-
-  this->in_ <<= level2_seq;
-
-  return 0;
-}
-
-int
-Test_Complex_Any::run_sii_test (Param_Test_ptr objref,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  ACE_TRY
-    {
-      this->ret_ = objref->test_complex_any (this->in_,
-                                             this->inout_,
-                                             this->out_.out (),
-                                             ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      return -1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-int
-Test_Complex_Any::add_args (CORBA::NVList_ptr param_list,
-                            CORBA::NVList_ptr retval,
-                            CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any in_arg (CORBA::_tc_any,
-                     &this->in_,
-                     0);
-
-  CORBA::Any inout_arg (CORBA::_tc_any,
-                        &this->inout_,
-                        0);
-
-  CORBA::Any out_arg (CORBA::_tc_any,
-                      &this->out_.inout (), // .out () causes crash
-                      0);
-
-  // add parameters
-  param_list->add_value ("ca1",
-                         in_arg,
-                         CORBA::ARG_IN,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("ca2",
-                         inout_arg,
-                         CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("ca3",
-                         out_arg,
-                         CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
-
-  // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_any,
-                                            &this->ret_.inout (), // see above
-                                            0, // does not own
-                                            ACE_TRY_ENV);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Complex_Any::check_validity (void)
-{
-  Param_Test::AnySeq *level2_in_seq;
-  Param_Test::AnySeq *level2_test_seq;
-
-  this->in_ >>= level2_in_seq;
-
-  this->inout_ >>= level2_test_seq;
-
-  if (this->comp_engine (level2_in_seq, level2_test_seq) == 0)
-    return 0;
-
-  this->out_.in () >>= level2_test_seq;
-
-  if (this->comp_engine (level2_in_seq, level2_test_seq) == 0)
-    return 0;
-
-  this->ret_.in () >>= level2_test_seq;
-
-  if (this->comp_engine (level2_in_seq, level2_test_seq) == 0)
-    return 0;
-
-  return 1;
-}
-
-// Private helper function for check_validity.
-CORBA::Boolean
-Test_Complex_Any::comp_engine (const Param_Test::AnySeq *level2_in_seq,
-                               const Param_Test::AnySeq *level2_comp_seq)
-{
-  if (level2_in_seq->length() != level2_comp_seq->length())
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-                  "mismatch of level 2 sequence lengths\n"));
-      return 0;
-    }
-
-  for (CORBA::ULong i = 0; i < level2_in_seq->length (); i++)
-    {
-      Param_Test::AnySeq *level3_in_seq;
-      Param_Test::AnySeq *level3_test_seq;
-
-      (*level2_in_seq)[i] >>= level3_in_seq;
-      (*level2_comp_seq)[i] >>= level3_test_seq;
-
-      if (level3_in_seq->length() != level3_test_seq->length())
-        {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "mismatch of level 3 sequence lengths\n"));
-          return 0;
-        }
-
-      for (CORBA::ULong j = 0; j < level3_in_seq->length (); j ++)
-        {
-          Param_Test::level4 *level4_in_struct;
-          Param_Test::level4 *level4_test_struct;
-
-          (*level3_in_seq)[j] >>= level4_in_struct;
-          (*level3_test_seq)[j] >>= level4_test_struct;
-
-          if (ACE_OS::strcmp (level4_in_struct->level5_string,
-                              level4_test_struct->level5_string))
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of level 5 string values\n"));
-              return 0;
-            }
-
-          CORBA::Any level6_in_any;
-          CORBA::Any level6_test_any;
-          CORBA::Any level7_in_any;
-          CORBA::Any level7_test_any;
-
-          level4_in_struct->level5_any >>= level6_in_any;
-          level4_test_struct->level5_any >>= level6_test_any;
-
-          level6_in_any >>= level7_in_any;
-          level6_test_any >>= level7_test_any;
-
-          Param_Test::level8 *level8_in_struct;
-          Param_Test::level8 *level8_test_struct;
-
-          level7_in_any >>= level8_in_struct;
-          level7_test_any >>= level8_test_struct;
-
-          if (ACE_OS::strcmp (level8_in_struct->level9_string,
-                               level8_test_struct->level9_string))
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of level 9 string values\n"));
-              return 0;
-            }
-
-          if (level8_in_struct->level9_boolean != level8_test_struct->level9_boolean)
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of level 9 boolean values\n"));
-              return 0;
-            }
-
-          if (level8_in_struct->level9_short != level8_test_struct->level9_short)
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of level 9 short values\n"));
-              return 0;
-            }
-        }
-    }
-
-  // If we get here, all is correct.
-  return 1;
-}
-
-CORBA::Boolean
-Test_Complex_Any::check_validity (CORBA::Request_ptr /*req*/)
-{
-  return this->check_validity ();
-}
-
-void
-Test_Complex_Any::print_values (void)
-{
-}
diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h
deleted file mode 100644
index 562a3bb1d23..00000000000
--- a/TAO/tests/Param_Test/complex_any.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO/tests/Param_Test
-//
-// = FILENAME
-//     complex_any.h
-//
-// = DESCRIPTION
-//     Tests complex Anys
-//
-// = AUTHORS
-//     Aniruddha Gokhale, Jeff Parsons, Frank Buschmann
-//
-// ============================================================================
-
-#ifndef PARAM_TEST_COMPLEX_ANY_H
-#define PARAM_TEST_COMPLEX_ANY_H
-
-#include "param_testCli.h"
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test complex Anys
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Complex_Any
-{
-public:
-  Test_Complex_Any (void);
-  // ctor
-
-  ~Test_Complex_Any (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr nvlist,
-                CORBA::NVList_ptr retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
-  // invoke DII request with appropriate exception handling.
-
-private:
-  char *opname_;
-  // operation name
-
-  static size_t counter;
-  // test counter.
-
-  CORBA::Any in_;
-  // in parameter
-
-  CORBA::Any inout_;
-  // inout parameter
-
-  CORBA::Any_var out_;
-  // out parameter
-
-  CORBA::Any_var ret_;
-  // return value
-
-  CORBA::Boolean comp_engine (const Param_Test::AnySeq *in_seq,
-                              const Param_Test::AnySeq *comp_seq);
-  // Compares the sequence extracted from in_ to one of the others.
-};
-
-#endif /* PARAM_TEST_COMPLEX_ANY_H */
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 5d39ff0d055..afc80ee57d2 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -16,11 +16,11 @@
 //
 // ============================================================================
 
-#include "driver.h"
 #include "results.h"
 #include "client.h"
 #include "tests.h"
 #include "ace/Get_Opt.h"
+#include "driver.h"
 
 ACE_RCSID(Param_Test, driver, "$Id$")
 
@@ -61,60 +61,52 @@ int
 Driver::init (int argc, char **argv)
 {
   // environment to track exceptions
-  ACE_DECLARE_NEW_CORBA_ENV;
-  //CORBA::Environment env;
+  CORBA::Environment env;
 
   // retrieve the instance of Options
   Options *opt = OPTIONS::instance ();
 
-  char exception_string[256];
+  // Retrieve the underlying ORB
+  this->orb_ = CORBA::ORB_init (argc,
+                                argv,
+                                "internet",
+                                env);
 
-  ACE_TRY
+  if (env.exception () != 0)
     {
-      ACE_OS::strcpy (exception_string, "ORB Initialization");
-      
-      // Retrieve the underlying ORB      
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
-                                    "internet",
-                                    ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("ORB initialization");
+      return -1;
+    }
 
-      // Parse command line and verify parameters.
-      if (opt->parse_args (argc, argv) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "(%N:%l) driver.cpp - "
-                           "parse_args failed\n"),
-                          -1);
-      // Retrieve a Param_Test object reference
-      ACE_OS::strcpy (exception_string,"ORB::string_to_object() failed.");
- 
-      CORBA::Object_var temp =
-        this->orb_->string_to_object (opt->param_test_ior (), ACE_TRY_ENV);
+  // Parse command line and verify parameters.
+  if (opt->parse_args (argc, argv) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%N:%l) driver.cpp - "
+                       "parse_args failed\n"),
+                      -1);
 
-      ACE_TRY_CHECK;
+  // Retrieve a Param_Test object reference
+  CORBA::Object_var temp =
+    this->orb_->string_to_object (opt->param_test_ior (), env);
+  if (env.exception () != 0)
+    {
+      env.print_exception ("ORB::string_to_object() failed.");
+      return -1;
+    }
 
-      if (CORBA::is_nil (temp.in()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ORB::string_to_object() returned null object for IOR <%s>\n",
-                           opt->param_test_ior ()),
-                          -1);
- 
-      // Get the object reference
-      ACE_OS::strcpy (exception_string,"Param_Test::_narrow () failed.");
- 
-      this->objref_ = Param_Test::_narrow (temp.in(), ACE_TRY_ENV);
+  if (CORBA::is_nil (temp.in()))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "ORB::string_to_object() returned null object for IOR <%s>\n",
+                       opt->param_test_ior ()),
+                      -1);
 
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
+  this->objref_ = Param_Test::_narrow (temp.in(), env);
+  if (env.exception () != 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, exception_string);
+      env.print_exception ("Param_Test::_narrow failed");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-  
+
   return 0;
 }
 
@@ -456,73 +448,28 @@ Driver::run (void)
         delete client;
       }
       break;
-
-    case Options::TEST_BIG_UNION:
-      {
-        Param_Test_Client<Test_Big_Union> *client = new
-          Param_Test_Client<Test_Big_Union> (this->orb_.in (),
-                                             this->objref_.in(),
-                                             new Test_Big_Union);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-    case Options::TEST_COMPLEX_ANY:
-      {
-        Param_Test_Client<Test_Complex_Any> *client = new
-          Param_Test_Client<Test_Complex_Any> (this->orb_.in (),
-                                               this->objref_.in(),
-                                               new Test_Complex_Any);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-#if 0
-    case Options::TEST_MULTDIM_ARRAY:
-      {
-        Param_Test_Client<Test_Multdim_Array> *client = new
-          Param_Test_Client<Test_Multdim_Array> (this->orb_.in (),
-                                                 this->objref_.in(),
-                                                 new Test_Multdim_Array);
-        if (opt->invoke_type () == Options::SII)
-          retstatus = client->run_sii_test ();
-        else
-          retstatus = client->run_dii_test ();
-        delete client;
-      }
-      break;
-#endif
     default:
       break;
     }
 
-  // Get in a new environment variable
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       if (opt->shutdown ())
         {
-          this->objref_->shutdown (ACE_TRY_ENV);
-          ACE_TRY_CHECK;
+          this->objref_->shutdown (TAO_TRY_ENV);
+          TAO_CHECK_ENV;
         }
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "during shutdown");
+      TAO_TRY_ENV.print_exception ("during shutdown");
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return retstatus;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
 template class Param_Test_Client<Test_Short>;
 template class Param_Test_Client<Test_ULongLong>;
 template class Param_Test_Client<Test_Unbounded_String>;
@@ -548,14 +495,7 @@ template class Param_Test_Client<Test_Bounded_Long_Sequence>;
 template class Param_Test_Client<Test_Fixed_Array>;
 template class Param_Test_Client<Test_Var_Array>;
 template class Param_Test_Client<Test_Exception>;
-template class Param_Test_Client<Test_Big_Union>;
-template class Param_Test_Client<Test_Complex_Any>;
-#if 0
-template class Param_Test_Client<Test_Multdim_Array>;
-#endif
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
 #pragma instantiate Param_Test_Client<Test_Short>
 #pragma instantiate Param_Test_Client<Test_ULongLong>
 #pragma instantiate Param_Test_Client<Test_Unbounded_String>
@@ -581,9 +521,4 @@ template class Param_Test_Client<Test_Multdim_Array>;
 #pragma instantiate Param_Test_Client<Test_Fixed_Array>
 #pragma instantiate Param_Test_Client<Test_Var_Array>
 #pragma instantiate Param_Test_Client<Test_Exception>
-#pragma instantiate Param_Test_Client<Test_Big_Union>
-#pragma instantiate Param_Test_Client<Test_Complex_Any>
-#if 0
-#pragma instantiate Param_Test_Client<Test_Multdim_Array>
-#endif
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h
index f436cfceaab..a39aedc41d7 100644
--- a/TAO/tests/Param_Test/driver.h
+++ b/TAO/tests/Param_Test/driver.h
@@ -21,7 +21,6 @@
 #define DRIVER_H
 
 #include "options.h"
-#include "param_testCli.h"
 
 class Driver
 {
diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp
index 2dde40d092a..7deac4a1413 100644
--- a/TAO/tests/Param_Test/except.cpp
+++ b/TAO/tests/Param_Test/except.cpp
@@ -26,8 +26,7 @@ ACE_RCSID(Param_Test, except, "$Id$")
 // ************************************************************************
 
 Test_Exception::Test_Exception (void)
-  : opname_ (CORBA::string_dup ("test_exception")),
-    iterations_ (0)
+  : opname_ (CORBA::string_dup ("test_exception"))
 {
 }
 
@@ -44,15 +43,14 @@ Test_Exception::opname (void) const
 }
 
 void
-Test_Exception::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Exception::dii_req_invoke (CORBA::Request *req)
 {
-  ACE_TRY
+  TAO_TRY_VAR (*req->env ())
     {
-      req->invoke (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      req->invoke ();
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (Param_Test::Ooops, ex)
+  TAO_CATCH (Param_Test::Ooops, ex)
     {
       if (TAO_debug_level > 0)
         {
@@ -64,38 +62,34 @@ Test_Exception::dii_req_invoke (CORBA::Request *req,
                       "expected user exception"
                       " (%s,%d)\n", reason, ex.input));
         }
-      this->inout_ = this->in_ * 3;
-      this->out_ = this->in_ * 4;
-      this->ret_ = this->in_ * 5;
-
-      // Why should we use clear ?????
-      //TAO_TRY_ENV.clear ();
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      TAO_TRY_ENV.clear ();
 
       return;
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  TAO_CATCH (CORBA::UNKNOWN, ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - "
-                               "expected system exception\n");
+          TAO_TRY_ENV.print_exception ("Test_Exception::run_sii_test - "
+                                       "expected system exception\n");
         }
-      this->inout_ = this->in_ * 4;
-      this->out_ = this->in_ * 5;
-      this->ret_ = this->in_ * 6;
-
-      // TAO_TRY_ENV.clear ();
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      TAO_TRY_ENV.clear ();
 
       return;
     }
-  ACE_CATCH (Param_Test::BadBoy, ex)
+  TAO_CATCH (Param_Test::BadBoy, ex)
     {
-      ACE_PRINT_EXCEPTION (ex, "Test_Exception::run_sii_test - "
-                           " unexpected exception\n");
-      ACE_TRY_THROW (Param_Test::BadBoy ());
+      TAO_TRY_ENV.print_exception ("Test_Exception::run_sii_test - "
+                                   " unexpected exception\n");
+      TAO_RETHROW_SAME_ENV_RETURN_VOID;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  TAO_ENDTRY;
 }
 
 int
@@ -120,17 +114,19 @@ Test_Exception::reset_parameters (void)
 
 int
 Test_Exception::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_TRY
+  TAO_TRY
     {
       this->ret_ = objref->test_exception (this->in_,
                                            this->inout_,
                                            this->out_,
-                                           ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                           TAO_TRY_ENV);
+      TAO_CHECK_ENV;
+
+      return 0;
     }
-  ACE_CATCH (Param_Test::Ooops, ex)
+  TAO_CATCH (Param_Test::Ooops, ex)
     {
       if (TAO_debug_level > 0)
         {
@@ -142,37 +138,40 @@ Test_Exception::run_sii_test (Param_Test_ptr objref,
                       "expected user exception"
                       " (%s,%d)\n", reason, ex.input));
         }
-      this->inout_ = this->in_ * 3;
-      this->out_ = this->in_ * 4;
-      this->ret_ = this->in_ * 5;
-      return -1;
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      TAO_TRY_ENV.clear ();
+
+      return 0;
     }
-  ACE_CATCH (CORBA::UNKNOWN, ex)
+  TAO_CATCH (CORBA::UNKNOWN, ex)
     {
       if (TAO_debug_level > 0)
         {
-          ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - expected system exception\n");
+          TAO_TRY_ENV.print_exception ("Test_Exception::run_sii_test - "
+                                       "expected system exception\n");
         }
-      this->inout_ = this->in_ * 4;
-      this->out_ = this->in_ * 5;
-      this->ret_ = this->in_ * 6;
-      return -1;
+      this->inout_ = this->in_ * 2;
+      this->out_ = this->in_ * 3;
+      this->ret_ = this->in_ * 4;
+      TAO_TRY_ENV.clear ();
+
+      return 0;
     }
-  ACE_CATCH (Param_Test::BadBoy, ex)
+  TAO_CATCH (Param_Test::BadBoy, ex)
     {
-      ACE_PRINT_EXCEPTION (ex,"Test_Exception::run_sii_test - unexpected system exception\n");
-      return -1;
+      TAO_TRY_ENV.print_exception ("Test_Exception::run_sii_test - "
+                                   " unexpected exception\n");
+      TAO_RETHROW_RETURN (-1);
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
+  TAO_ENDTRY_RETURN (-1);
 }
 
 int
 Test_Exception::add_args (CORBA::NVList_ptr param_list,
                           CORBA::NVList_ptr retval,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   // we provide top level memory to the ORB to retrieve the data
   CORBA::Any in_arg (CORBA::_tc_ulong,
@@ -191,34 +190,33 @@ Test_Exception::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value. Let the ORB allocate storage. We simply tell the ORB
   // what type we are expecting.
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_ulong,
-                                                    &this->ret_,
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (CORBA::_tc_ulong,
+                                            &this->ret_,
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
 CORBA::Boolean
 Test_Exception::check_validity (void)
 {
-  CORBA::ULong n = (this->iterations_++) % 3;
-  if (this->inout_ == this->in_ * (n + 2) &&
-      this->out_ == this->in_ * (n + 3) &&
-      this->ret_ == this->in_ * (n + 4))
+  if (this->inout_ == this->in_ * 2 &&
+      this->out_ == this->in_ * 3 &&
+      this->ret_ == this->in_ * 4)
     return 1;
   return 0;
 }
diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h
index 8b28c39e956..0defca2bfbc 100644
--- a/TAO/tests/Param_Test/except.h
+++ b/TAO/tests/Param_Test/except.h
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
@@ -75,9 +75,6 @@ private:
 
   CORBA::ULong ret_;
   // return value
-
-  CORBA::ULong iterations_;
-  // Current iterations.
 };
 
 #endif /* PARAM_TEST_EXCEPTION_H */
diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp
index 9027af625e1..eb9d8ddb091 100644
--- a/TAO/tests/Param_Test/fixed_array.cpp
+++ b/TAO/tests/Param_Test/fixed_array.cpp
@@ -44,20 +44,19 @@ Test_Fixed_Array::opname (void) const
 }
 
 void
-Test_Fixed_Array::dii_req_invoke (CORBA::Request *req,
-                                  CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Array::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/,
-                                   CORBA::Environment &/*env*/)
+Test_Fixed_Array::init_parameters (Param_Test_ptr objref,
+                                   CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
-  //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   for (CORBA::ULong i=0; i < Param_Test::DIM1; i++)
     {
@@ -85,19 +84,19 @@ Test_Fixed_Array::reset_parameters (void)
 
 int
 Test_Fixed_Array::run_sii_test (Param_Test_ptr objref,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   this->ret_ = objref->test_fixed_array (this->in_,
                                          this->inout_,
                                          this->out_,
-                                         ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                         env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Fixed_Array::add_args (CORBA::NVList_ptr param_list,
                             CORBA::NVList_ptr retval,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            CORBA::Environment &env)
 {
   // We provide the top level memory
   // the Any does not own any of these
@@ -117,23 +116,23 @@ Test_Fixed_Array::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("l1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("l2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("l3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Fixed_Array,
-                                                    this->ret_.inout (),
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Fixed_Array,
+                                            this->ret_.inout (),
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -149,9 +148,9 @@ Test_Fixed_Array::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Fixed_Array::check_validity (CORBA::Request_ptr /*req*/)
+Test_Fixed_Array::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h
index 578d320c9b9..db382fd6f9b 100644
--- a/TAO/tests/Param_Test/fixed_array.h
+++ b/TAO/tests/Param_Test/fixed_array.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp
index 281ab6c72c1..863ddd48ed8 100644
--- a/TAO/tests/Param_Test/fixed_struct.cpp
+++ b/TAO/tests/Param_Test/fixed_struct.cpp
@@ -43,20 +43,19 @@ Test_Fixed_Struct::opname (void) const
 }
 
 void
-Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Test_Fixed_Struct::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/,
-                                    CORBA::Environment &/*env*/)
+Test_Fixed_Struct::init_parameters (Param_Test_ptr objref,
+                                    CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
-  //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   this->in_ = gen->gen_fixed_struct ();
   ACE_OS::memset (&this->inout_,
@@ -85,19 +84,19 @@ Test_Fixed_Struct::reset_parameters (void)
 
 int
 Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA::Environment &env)
 {
   this->ret_ = objref->test_fixed_struct (this->in_,
                                           this->inout_,
                                           this->out_,
-                                          ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                          env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Fixed_Struct::add_args (CORBA::NVList_ptr param_list,
                              CORBA::NVList_ptr retval,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   // We provide the top level memory
   // the Any does not own any of these
@@ -117,23 +116,23 @@ Test_Fixed_Struct::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Fixed_Struct,
-                                                    &this->ret_,
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Fixed_Struct,
+                                            &this->ret_,
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -167,9 +166,9 @@ Test_Fixed_Struct::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Fixed_Struct::check_validity (CORBA::Request_ptr /*req*/)
+Test_Fixed_Struct::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h
index b4091e90fba..aafd6a5e760 100644
--- a/TAO/tests/Param_Test/fixed_struct.h
+++ b/TAO/tests/Param_Test/fixed_struct.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp
deleted file mode 100644
index 618dfbd312c..00000000000
--- a/TAO/tests/Param_Test/multdim_array.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    multidim_array.cpp
-//
-// = DESCRIPTION
-//    tests multidimensional fixed size arrays
-//
-// = AUTHORS
-//      Bala
-//
-// ============================================================================
-# if 0
-#include "helper.h"
-#include "multdim_array.h"
-
-
-ACE_RCSID(Param_Test, fixed_array, "$Id$")
-
-// ************************************************************************
-//               Test_Multdim_Array
-// ************************************************************************
-
-Test_Multdim_Array::Test_Multdim_Array (void)
-  : opname_ (CORBA::string_dup ("test_multdim_array")),
-    ret_ (new Param_Test::Multdim_Array)
-{
-}
-
-Test_Multdim_Array::~Test_Multdim_Array (void)
-{
-  CORBA::string_free (this->opname_);
-  this->opname_ = 0;
-}
-
-const char *
-Test_Multdim_Array::opname (void) const
-{
-  return this->opname_;
-}
-
-void
-Test_Multdim_Array::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
-{
-  req->invoke (ACE_TRY_ENV);
-}
-
-int
-Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/,
-                                     CORBA::Environment &/*env*/)
-{
-  Generator *gen = GENERATOR::instance (); // value generator
-
-  for (CORBA::ULong i=0; i < Param_Test::DIM2; i++)
-    {
-      for (CORBA::ULong j=0; j < Param_Test::DIM3; j++)
-        {
-          for (CORBA::ULong k=0; k < Param_Test::DIM1; k++)
-            {
-              this->in_ [i][j][k] = gen->gen_long ();
-            }
-        }
-    }
-  return 0;
-}
-
-int
-Test_Multdim_Array::reset_parameters (void)
-{
-
-  for (CORBA::ULong i=0; i < Param_Test::DIM2; i++)
-    {
-      for (CORBA::ULong j=0; j < Param_Test::DIM3; j++)
-        {
-          for (CORBA::ULong k=0; k < Param_Test::DIM1; k++)
-            {
-              this->inout_ [i][j][k] = 0;
-              this->out_ [i][j][k] = 0;
-            }
-        }
-    }
-  // free the return value array
-  Param_Test::Multdim_Array_free (this->ret_._retn ());
-  // needed for repeated DII calls
-  this->ret_ = new Param_Test::Multdim_Array;
-  return 0;
-}
-
-int
-Test_Multdim_Array::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
-{
-  this->ret_ = objref->test_multdim_array (this->in_,
-                                           this->inout_,
-                                           this->out_,
-                                           ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
-}
-
-int
-Test_Multdim_Array::add_args (CORBA::NVList_ptr param_list,
-                              CORBA::NVList_ptr retval,
-                              CORBA::Environment &ACE_TRY_ENV)
-{
-  // We provide the top level memory
-  // the Any does not own any of these
-  CORBA::Any in_arg (Param_Test::_tc_Multdim_Array,
-                     this->in_,
-                     0);
-
-  CORBA::Any inout_arg (Param_Test::_tc_Multdim_Array,
-                        this->inout_,
-                        0);
-
-  CORBA::Any out_arg (Param_Test::_tc_Multdim_Array,
-                      this->out_,
-                      0);
-
-  // add parameters
-  param_list->add_value ("l1",
-                         in_arg,
-                         CORBA::ARG_IN,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("l2",
-                         inout_arg,
-                         CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
-
-  param_list->add_value ("l3",
-                         out_arg,
-                         CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
-
-  // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Multdim_Array,
-                                                    this->ret_.inout (),
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
-  return 0;
-}
-
-CORBA::Boolean
-Test_Multdim_Array::check_validity (void)
-{
-  if (this->compare (this->in_, this->inout_) &&
-      this->compare (this->in_, this->out_) &&
-      this->compare (this->in_, this->ret_.in ()))
-    return 1;
-  else
-    return 0;
-}
-
-CORBA::Boolean
-Test_Multdim_Array::check_validity (CORBA::Request_ptr /*req*/)
-{
-  //ACE_UNUSED_ARG (req);
-  return this->check_validity ();
-}
-
-CORBA::Boolean
-Test_Multdim_Array::compare (const Param_Test::Multdim_Array_slice *a1,
-                             const Param_Test::Multdim_Array_slice *a2)
-{
-  for (CORBA::ULong i=0; i < Param_Test::DIM2; i++)
-    {
-      for (CORBA::ULong j=0; j < Param_Test::DIM3; j++)
-        {
-          for (CORBA::ULong k=0; k < Param_Test::DIM1; k++)
-            {
-              if (a1[i][j][k] != a2[i][j][k])
-                return 0;
-            }
-        }
-    }
-  return 1; // success
-}
-
-void
-Test_Multdim_Array::print_values (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "IN array\n"));
-  this->print (this->in_);
-  ACE_DEBUG ((LM_DEBUG, "INOUT array\n"));
-  this->print (this->inout_);
-  ACE_DEBUG ((LM_DEBUG, "OUT array\n"));
-  this->print (this->out_);
-  ACE_DEBUG ((LM_DEBUG, "RET array\n"));
-  this->print (this->ret_.in ());
-}
-
-void
-Test_Multdim_Array::print (const Param_Test::Multdim_Array_slice *a)
-{
-  for (CORBA::ULong i = 0; i < Param_Test::DIM2; i++)
-    {
-      for (CORBA::ULong j=0; j < Param_Test::DIM3; j++)
-        {
-          for (CORBA::ULong k=0; k < Param_Test::DIM1; k++)
-            {
-              ACE_DEBUG ((LM_DEBUG, "\t\tElement #%d #%d #%d = %d \n",i,j,k, a[i][j][k]));
-            }
-        }
-    }
-}
-
-#endif 
diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h
deleted file mode 100644
index 739f34782a9..00000000000
--- a/TAO/tests/Param_Test/multdim_array.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Param_Test
-//
-// = FILENAME
-//    multdim_array.h
-//
-// = DESCRIPTION
-//     Tests multi dimensional array
-//
-// = AUTHORS
-//   Bala
-//
-// ============================================================================
-
-#ifndef PARAM_TEST_MULTDIM_ARRAY_H
-#define PARAM_TEST_MULTDIM_ARRAY_H
-
-#include "param_testCli.h"
-
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-//                        test fixed arrays
-// =*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*
-class Test_Multdim_Array
-{
-public:
-  Test_Multdim_Array (void);
-  // ctor
-
-  ~Test_Multdim_Array (void);
-  // dtor
-
-  int run_sii_test (Param_Test_ptr objref,
-                    CORBA::Environment &env);
-  // run the SII test
-
-  int add_args (CORBA::NVList_ptr nvlist,
-                CORBA::NVList_ptr retval,
-                CORBA::Environment &env);
-  // add args to NVList for DII
-
-  const char *opname (void) const;
-  // return operation name
-
-  int init_parameters (Param_Test_ptr objref,
-                       CORBA::Environment &env);
-  // set values for parameters
-
-  int reset_parameters (void);
-  // reset values for CORBA
-
-  CORBA::Boolean check_validity (void);
-  // check if results are valid
-
-  CORBA::Boolean check_validity (CORBA::Request_ptr req);
-  // check if results are valid. This is used for DII results
-
-  void print_values (void);
-  // print all the values
-
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
-  // invoke DII request with appropriate exception handling.
-
-private:
-  CORBA::Boolean compare (const Param_Test::Multdim_Array_slice *a1,
-                          const Param_Test::Multdim_Array_slice *a2);
-  // compare arrays
-
-  void print (const Param_Test::Multdim_Array_slice *a);
-  // print an array
-
-  char *opname_;
-  // operation name
-
-  Param_Test::Multdim_Array in_;
-  // in parameter
-
-  Param_Test::Multdim_Array inout_;
-  // inout parameter
-
-  Param_Test::Multdim_Array out_;
-  // out parameter
-
-  Param_Test::Multdim_Array_var ret_;
-  // return value
-};
-
-#endif /* PARAM_TEST_FIXED_ARRAY_H */
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index 64a99a82741..7e5667fdc6c 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -48,19 +48,19 @@ Test_Nested_Struct::opname (void) const
 }
 
 void
-Test_Nested_Struct::dii_req_invoke (CORBA::Request *req, CORBA::Environment &ACE_TRY_ENV)
+Test_Nested_Struct::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Nested_Struct::init_parameters (Param_Test_ptr /*objref*/,
-                                     CORBA::Environment &/*env*/)
+Test_Nested_Struct::init_parameters (Param_Test_ptr objref,
+                                     CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
-  //ACE_UNUSED_ARG (objref);
-  //ACE_UNUSED_ARG (env);
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
@@ -89,20 +89,20 @@ Test_Nested_Struct::reset_parameters (void)
 
 int
 Test_Nested_Struct::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   Param_Test::Nested_Struct_out out (this->out_.out ());
   this->ret_ = objref->test_nested_struct (this->in_,
                                            this->inout_.inout (),
                                            out,
-                                           ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                           env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Nested_Struct::add_args (CORBA::NVList_ptr param_list,
 			      CORBA::NVList_ptr retval,
-			      CORBA::Environment &ACE_TRY_ENV)
+			      CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Nested_Struct,
                      (void *) &this->in_,
@@ -120,23 +120,23 @@ Test_Nested_Struct::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Nested_Struct,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Nested_Struct,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -163,9 +163,9 @@ Test_Nested_Struct::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Nested_Struct::check_validity (CORBA::Request_ptr /*req*/)
+Test_Nested_Struct::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h
index 47e6d2a8e43..1dc0f33f3fe 100644
--- a/TAO/tests/Param_Test/nested_struct.h
+++ b/TAO/tests/Param_Test/nested_struct.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp
index 2c88a62c97c..81779309ac1 100644
--- a/TAO/tests/Param_Test/objref.cpp
+++ b/TAO/tests/Param_Test/objref.cpp
@@ -52,10 +52,9 @@ Test_ObjRef::opname (void) const
 }
 
 void
-Test_ObjRef::dii_req_invoke (CORBA::Request *req,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 static const char *Coffee_Flavor [] = {
@@ -69,38 +68,30 @@ static const char *Coffee_Flavor [] = {
 
 int
 Test_ObjRef::init_parameters (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
-  // New environment variable
-  char msg_str[256] = "";
-
-  ACE_TRY
+  // first get a Coffee object
+  this->in_ = objref->make_coffee (env);
+  if (env.exception ())
     {
-      ACE_OS::strcpy (msg_str, "make_cofee");
-
-      // first get a Coffee object
-      this->in_ = objref->make_coffee (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("make_coffee");
+      return -1;
+    }
 
-      // Get some index into Coffee_Flavor [].
-      CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
-      desc.name = Coffee_Flavor [index];
+  // Get some index into Coffee_Flavor [].
+  CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
+  desc.name = Coffee_Flavor [index];
+  // set the attribute of the object
+  this->in_->description (desc, env); // set the attribute for the in object
 
-      // set the attribute of the object
-      ACE_OS::strcpy (msg_str, "set coffee attribute");
-      this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
+  if (env.exception ())
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, msg_str);
+      env.print_exception ("set coffee attribute");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   this->inout_ = Coffee::_nil ();
   this->out_ = Coffee::_nil ();
@@ -115,35 +106,28 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref,
                                          this->out_.in ());
   *this->ret_courier = ACE_dynamic_cast (CORBA::Object_ptr,
                                          this->ret_.in ());
+
   return 0;
 }
 
 int
 Test_ObjRef::reset_parameters (void)
 {
-  // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
-  //CORBA::Environment env;
+  CORBA::Environment env;
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
 
   // Get some index into Coffee_Flavor [].
   CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
   desc.name = Coffee_Flavor [index];
+  // set the attribute of the object
+  this->in_->description (desc, env); // set the attribute for the in object
 
-  ACE_TRY
+  if (env.exception ())
     {
-      // set the attribute of the object
-      this->in_->description (desc, ACE_TRY_ENV); // set the attribute for the in object
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "set coffee attribute");
+      env.print_exception ("set coffee attribute");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   this->inout_ = Coffee::_nil ();
   this->out_ = Coffee::_nil ();
@@ -160,20 +144,20 @@ Test_ObjRef::reset_parameters (void)
 
 int
 Test_ObjRef::run_sii_test (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   Coffee_out out (this->out_.out ());
   this->ret_ = objref->test_objref (this->in_.in (),
                                     this->inout_.inout (),
                                     out,
-                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                    env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_ObjRef::add_args (CORBA::NVList_ptr param_list,
 		       CORBA::NVList_ptr retval,
-		       CORBA::Environment &ACE_TRY_ENV)
+		       CORBA::Environment &env)
 {
   CORBA::Any in_arg (_tc_Coffee,
                      this->in_courier,
@@ -191,23 +175,23 @@ Test_ObjRef::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("o1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("o2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("o3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // Add return value.
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (_tc_Coffee,
+  retval->item (0, env)->value ()->replace (_tc_Coffee,
                                             this->ret_courier,
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
 
   return 0;
 }
@@ -215,85 +199,82 @@ Test_ObjRef::add_args (CORBA::NVList_ptr param_list,
 CORBA::Boolean
 Test_ObjRef::check_validity (void)
 {
-  // Environemnt variable
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  //CORBA::Environment env;
+  CORBA::Environment env;
 
-  Coffee::Desc_var ret_desc;
-  const char *in = 0;
-  const char *out = 0;
-  const char *inout = 0;
-
-  ACE_TRY
+  Coffee::Desc_var in_desc =
+    this->in_->description (env);
+  if (env.exception ())
     {
-      Coffee::Desc_var in_desc =
-        this->in_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      in = in_desc->name.in ();
-
-      Coffee::Desc_var inout_desc =
-        this->inout_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      inout = inout_desc->name.in ();
-
-      Coffee::Desc_var out_desc =
-        this->out_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      out = out_desc->name.in ();
-
-      ret_desc = this->out_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("retrieving description");
+      return 0;
+    }
+  const char* in = in_desc->name.in ();
 
-      const char* ret = ret_desc->name.in ();
+  Coffee::Desc_var inout_desc =
+    this->inout_->description (env);
+  if (env.exception ())
+    {
+      env.print_exception ("retrieving description");
+      return 0;
+    }
+  const char* inout = inout_desc->name.in ();
 
-      // now compare them
-      if (!ACE_OS::strcmp (in, inout) &&
-          !ACE_OS::strcmp (in, out) &&
-          !ACE_OS::strcmp (in, ret))
-        return 1; // success
+  Coffee::Desc_var out_desc =
+    this->out_->description (env);
+  if (env.exception ())
+    {
+      env.print_exception ("retrieving description");
+      return 0;
     }
-  ACE_CATCHANY
+  const char* out = out_desc->name.in ();
+
+  Coffee::Desc_var ret_desc =
+    this->out_->description (env);
+  if (env.exception ())
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retriving description");
+      env.print_exception ("retrieving description");
       return 0;
     }
-  ACE_ENDTRY;
+  const char* ret = ret_desc->name.in ();
 
-  return 1;
+  // now compare them
+  if (!ACE_OS::strcmp (in, inout) &&
+      !ACE_OS::strcmp (in, out) &&
+      !ACE_OS::strcmp (in, ret))
+    return 1; // success
+  else
+    return 0;
 }
 
 CORBA::Boolean
-Test_ObjRef::check_validity (CORBA::Request_ptr /*req*/)
+Test_ObjRef::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
-  //CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_UNUSED_ARG (req);
+  CORBA::Environment env;
 
   // Narrow each checked variable into its _var before
   // calling check_validity().
 
-  ACE_TRY
+  this->inout_ = Coffee::_narrow (*this->inout_courier, env);
+  if (env.exception ())
     {
-      this->inout_ = Coffee::_narrow (*this->inout_courier, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->out_ = Coffee::_narrow (*this->out_courier, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      env.print_exception ("_narrow from DII result");
+      return 0;
+    }
 
-      this->ret_ = Coffee::_narrow (*this->ret_courier, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  this->out_ = Coffee::_narrow (*this->out_courier, env);
+  if (env.exception ())
+    {
+      env.print_exception ("_narrow from DII result");
+      return 0;
     }
-  ACE_CATCHANY
+
+  this->ret_ = Coffee::_narrow (*this->ret_courier, env);
+  if (env.exception ())
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "_narrow from DII result");
+      env.print_exception ("_narrow from DII result");
       return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
 
   return this->check_validity ();
 }
@@ -301,45 +282,42 @@ Test_ObjRef::check_validity (CORBA::Request_ptr /*req*/)
 void
 Test_ObjRef::print_values (void)
 {
-  //  CORBA::Environment env;
-
-  // Env. variable
-  ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  Coffee::Desc_var ret_desc;
-  const char *in = 0;
-  const char *out = 0;
-  const char *inout = 0;
-  ACE_TRY
+  Coffee::Desc_var in_desc =
+    this->in_->description (env);
+  if (env.exception ())
     {
-      Coffee::Desc_var in_desc =
-        this->in_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      in = in_desc->name.in ();
-
-      Coffee::Desc_var inout_desc =
-        this->inout_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      inout = inout_desc->name.in ();
-
-      Coffee::Desc_var out_desc =
-        this->out_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      out = out_desc->name.in ();
+      env.print_exception ("retrieving description");
+      return;
+    }
+  const char* in = in_desc->name.in ();
 
-      ret_desc = this->out_->description (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+  Coffee::Desc_var inout_desc =
+    this->inout_->description (env);
+  if (env.exception ())
+    {
+      env.print_exception ("retrieving description");
+      return;
     }
-  ACE_CATCHANY
+  const char* inout = inout_desc->name.in ();
+
+  Coffee::Desc_var out_desc =
+    this->out_->description (env);
+  if (env.exception ())
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Retrieving Description");
+      env.print_exception ("retrieving description");
       return;
     }
-  ACE_ENDTRY;
-  ACE_CHECK;
+  const char* out = out_desc->name.in ();
 
+  Coffee::Desc_var ret_desc =
+    this->out_->description (env);
+  if (env.exception ())
+    {
+      env.print_exception ("retrieving description");
+      return;
+    }
   const char* ret = ret_desc->name.in ();
 
 
diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h
index 0798248ab0d..a325af0e40e 100644
--- a/TAO/tests/Param_Test/objref.h
+++ b/TAO/tests/Param_Test/objref.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index 03d1b6e0c05..049c2b254c8 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -48,26 +48,25 @@ Test_Objref_Struct::opname (void) const
 }
 
 void
-Test_Objref_Struct::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Objref_Struct::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_Objref_Struct::init_parameters (Param_Test_ptr objref,
-				     CORBA::Environment &ACE_TRY_ENV)
+				     CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
   // set the length of the sequence
   this->in_.x = gen->gen_long ();
-  this->in_.y = objref->make_coffee (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return -1;
+  this->in_.y = objref->make_coffee (env);
+  if (env.exception () != 0) return -1;
   Coffee::Desc d;
   d.name = gen->gen_string ();
-  this->in_.y->description (d, ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return -1;
+  this->in_.y->description (d, env);
+  if (env.exception () != 0) return -1;
 
   return 0;
 }
@@ -83,20 +82,20 @@ Test_Objref_Struct::reset_parameters (void)
 
 int
 Test_Objref_Struct::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   Param_Test::Objref_Struct_out out (this->out_.out ());
   this->ret_ = objref->test_objref_struct (this->in_,
-                                           this->inout_.inout (),
-                                           out,
-                                           ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                        this->inout_.inout (),
+                                        out,
+                                        env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Objref_Struct::add_args (CORBA::NVList_ptr param_list,
-                              CORBA::NVList_ptr retval,
-                              CORBA::Environment &ACE_TRY_ENV)
+			   CORBA::NVList_ptr retval,
+			   CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Objref_Struct,
                     &this->in_,
@@ -114,23 +113,23 @@ Test_Objref_Struct::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Objref_Struct,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Objref_Struct,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -143,22 +142,21 @@ Test_Objref_Struct::check_validity (void)
       || this->in_.x != this->ret_->x)
     return 0;
 
-  //  CORBA::Environment env;
- ACE_DECLARE_NEW_CORBA_ENV;
- if (CORBA::is_nil (this->in_.y.in ())
-     || CORBA::is_nil (this->out_->y.in ())
-     || CORBA::is_nil (this->ret_->y.in ())
-     || CORBA::is_nil (this->inout_->y.in ()) )
-   return 0;
- 
-  Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return 0;
-  Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return 0;
-  Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return 0;
-  Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return 0;
+  CORBA::Environment env;
+  if (CORBA::is_nil (this->in_.y.in ())
+      || CORBA::is_nil (this->out_->y.in ())
+      || CORBA::is_nil (this->ret_->y.in ())
+      || CORBA::is_nil (this->inout_->y.in ()) )
+    return 0;
+
+  Coffee::Desc_var s_in = this->in_.y->description (env);
+  if (env.exception () != 0) return 0;
+  Coffee::Desc_var s_out = this->out_->y->description (env);
+  if (env.exception () != 0) return 0;
+  Coffee::Desc_var s_inout = this->inout_->y->description (env);
+  if (env.exception () != 0) return 0;
+  Coffee::Desc_var s_ret = this->ret_->y->description (env);
+  if (env.exception () != 0) return 0;
 
   if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
       || ACE_OS::strcmp (s_in->name, s_inout->name) != 0
@@ -169,8 +167,9 @@ Test_Objref_Struct::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Objref_Struct::check_validity (CORBA::Request_ptr /*req*/)
+Test_Objref_Struct::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
@@ -188,18 +187,16 @@ Test_Objref_Struct::print_values (void)
               this->out_->x,
               this->ret_->x ));
 
-  //CORBA::Environment env;
-
- ACE_DECLARE_NEW_CORBA_ENV;
+  CORBA::Environment env;
 
-  Coffee::Desc_var s_in = this->in_.y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return;
-  Coffee::Desc_var s_out = this->out_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return;
-  Coffee::Desc_var s_inout = this->inout_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return;
-  Coffee::Desc_var s_ret = this->ret_->y->description (ACE_TRY_ENV);
-  if (ACE_TRY_ENV.exception () != 0) return;
+  Coffee::Desc_var s_in = this->in_.y->description (env);
+  if (env.exception () != 0) return;
+  Coffee::Desc_var s_out = this->out_->y->description (env);
+  if (env.exception () != 0) return;
+  Coffee::Desc_var s_inout = this->inout_->y->description (env);
+  if (env.exception () != 0) return;
+  Coffee::Desc_var s_ret = this->ret_->y->description (env);
+  if (env.exception () != 0) return;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n*=*=*=*=*=*=*=*=*=*=\n"
diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h
index 3c2f0bed205..69269cba196 100644
--- a/TAO/tests/Param_Test/objref_struct.h
+++ b/TAO/tests/Param_Test/objref_struct.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index c548bfeda8a..0a915a66326 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -78,7 +78,7 @@ Options::parse_args (int argc, char **argv)
 
      case 'k':
         CORBA::string_free (this->ior_);
-        this->ior_ = CORBA::string_dup (get_opts.optarg);
+        this->ior_ = CORBA::string_copy (get_opts.optarg);
         break;
 
       case 'i':  // invocation
@@ -137,11 +137,7 @@ Options::parse_args (int argc, char **argv)
           this->test_type_ = Options::TEST_MULTDIM_ARRAY;
         else if (!ACE_OS::strcmp (get_opts.optarg, "exception"))
           this->test_type_ = Options::TEST_EXCEPTION;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "big_union"))
-          this->test_type_ = Options::TEST_BIG_UNION;
-        else if (!ACE_OS::strcmp (get_opts.optarg, "complex_any"))
-          this->test_type_ = Options::TEST_COMPLEX_ANY;
-         break;
+        break;
 
       case '?':
       default:
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index b64ab9ece9a..d477450aa8a 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -58,9 +58,7 @@ public:
     TEST_FIXED_ARRAY,
     TEST_VAR_ARRAY,
     TEST_MULTDIM_ARRAY,
-    TEST_EXCEPTION,
-    TEST_BIG_UNION,
-    TEST_COMPLEX_ANY
+    TEST_EXCEPTION
   };
 
   enum INVOKE_TYPE
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
index 4ec36807208..87662defed7 100644
--- a/TAO/tests/Param_Test/param_test.idl
+++ b/TAO/tests/Param_Test/param_test.idl
@@ -10,7 +10,7 @@
 //
 // = DESCRIPTION
 //    This IDL description is used to test all the parameter passing modes (in,
-//    inout, out, and return) for a number of IDL data types. The goal is to
+//    inout, out, a0nd return) for a number of IDL data types. The goal is to
 //    verify the correctness of the generated stubs and skeletons, and the
 //    the marshaling engine of TAO.
 //
@@ -75,15 +75,15 @@ interface Param_Test
 
   // = Sequences of long, strings, Var_Struct and Object
   // references...
-
-
+  
+  
   struct NameComponent
   {
     string id;
     string kind;
   };
-
-  struct Step
+  
+  struct Step 
   {
     NameComponent name;
     boolean process;
@@ -95,7 +95,7 @@ interface Param_Test
 					   inout PathSpec s2,
 					   out PathSpec s3);
   typedef sequence<short> Short_Seq;
-
+  
   Short_Seq test_short_sequence (in Short_Seq s1,
                                  inout Short_Seq s2,
                                  out Short_Seq s3);
@@ -147,8 +147,8 @@ interface Param_Test
 
   typedef sequence<any> AnySeq;
   AnySeq test_anyseq (in AnySeq s1,
-                      inout AnySeq s2,
-                      out AnySeq s3);
+                                      inout AnySeq s2,
+                                          out AnySeq s3);
 
 /*  typedef sequence<any, 32> Bounded_AnySeq;
   Bounded_AnySeq test_bounded_anyseq (in Bounded_AnySeq s1,
@@ -232,73 +232,16 @@ interface Param_Test
 				out unsigned long s3)
     raises (Ooops);
 
-  union Big_Union switch (short)
-    {
-    case 0:
-      Fixed_Array the_array;
-    case 1:
-      Coffee the_interface;
-    case 2:
-      long the_long;
-    case 3:
-      short another_array[32];
-    case 4:
-      string the_string;
-    case 5:
-      Short_Seq the_sequence;
-    case 6:
-      any the_any;
-    case 7:
-      octet the_octet;
-    case 8:
-      char the_char;
-    case 9:
-      boolean the_boolean;
-    case 10:
-      Var_Struct the_var_struct;
-    case 11:
-      Fixed_Struct the_fixed_struct;
-      // case 12:
-      // Other_Union the_union;
-    };
-
-  Big_Union test_big_union (in Big_Union u1,
-                            inout Big_Union u2,
-                            out Big_Union u3);
-
-  // The following two structs are used to help compose
-  // a complex Any for the test function below.
-  struct level4
-    {
-      string level5_string;
-
-      any level5_any;
-    };
-
-  struct level8
-    {
-      string level9_string;
-
-      boolean level9_boolean;
-
-      short level9_short;
-    };
-
-  any test_complex_any (in any ca1, 
-                        inout any ca2, 
-                        out any ca3);
-
+#if 0
   // multidimensional arrays (fixed). The following will give rise to a 3
   // dimensional array. The following will define a 3-dimensional array of size
   // DIM1 X DIM2 X DIM3
   const unsigned long DIM3 = 3;
-# if 0
   typedef Fixed_Array Multdim_Array [DIM2][DIM3];
 
   Multdim_Array test_multdim_array (in Multdim_Array m1,
                                     inout Multdim_Array m2,
                                     out Multdim_Array m3);
-
 #endif
 
   // sequence of typecodes
@@ -313,4 +256,43 @@ interface Param_Test
   // test simple objects
   //  Object test_object (in Object o1, inout Object o2, out Object o3);
 
+  /*
+  long test_long (in long l1,
+                  inout long l2,
+                  out long l3);
+  char test_char (in char c1,
+                  inout char c2,
+                  out char c3);
+  octet test_octet (in octet o1,
+                    inout octet o2,
+                    out octet o3);
+
+  double test_double (in double d1,
+                      inout double d2,
+                      out double d3);
+
+  // strings bounded
+  const unsigned long STRLEN = 10;
+  string<STRLEN> test_bstring (in string<STRLEN> s1,
+                               inout string<STRLEN> s2,
+                               out string<STRLEN> s3);
+
+  // typedefed string
+  typedef string MYSTRING;
+  MYSTRING test_tstring (in MYSTRING s1,
+                         inout MYSTRING s2,
+                         out MYSTRING s3);
+
+
+  // more combinations to follow
+  union U switch (long)
+    {
+    case 0: sequence<char> cseq;
+    case 1: sequence<octet> oseq;
+    case 2: StrSeq sseq;
+    };
+
+  // complex (but meaningless) to test the naming scheme
+  typedef sequence <sequence <sequence <long>, 5>, 10> complex;
+  */
 };
diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp
index c5cbbd3ec4a..926ccaf00f3 100644
--- a/TAO/tests/Param_Test/param_test_i.cpp
+++ b/TAO/tests/Param_Test/param_test_i.cpp
@@ -98,8 +98,9 @@ char *
 Param_Test_i::test_unbounded_string (const char *s1,
                                      char *&s2,
                                      CORBA::String_out s3,
-                                     CORBA::Environment &)
+                                     CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   char *retstr = CORBA::string_dup (s1);
   s3 = CORBA::string_dup (s1);
   char *tmp = CORBA::string_alloc (2*ACE_OS::strlen (s2));
@@ -132,8 +133,9 @@ Param_Test::Fixed_Struct
 Param_Test_i::test_fixed_struct (const Param_Test::Fixed_Struct &s1,
                                  Param_Test::Fixed_Struct &s2,
                                  Param_Test::Fixed_Struct_out s3,
-                                 CORBA::Environment &)
+                                 CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   s2 = s1;
   s3 = s1;
   return s1;
@@ -217,8 +219,9 @@ Param_Test::StrSeq *
 Param_Test_i::test_strseq (const Param_Test::StrSeq &s1,
                            Param_Test::StrSeq &s2,
                            Param_Test::StrSeq_out s3,
-                           CORBA::Environment &)
+                           CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   // we copy the "in" sequences into all the inout, out and return sequences.
 
   Param_Test::StrSeq
@@ -432,8 +435,9 @@ Param_Test::AnySeq *
 Param_Test_i::test_anyseq (const Param_Test::AnySeq &s1,
                            Param_Test::AnySeq &s2,
                            Param_Test::AnySeq_out s3,
-                           CORBA::Environment &)
+                           CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   // we copy the "in" sequences into all the inout, out and return sequences.
 
   Param_Test::AnySeq
@@ -455,8 +459,9 @@ Param_Test::Var_Struct *
 Param_Test_i::test_var_struct (const Param_Test::Var_Struct &s1,
                                Param_Test::Var_Struct &s2,
                                Param_Test::Var_Struct_out s3,
-                               CORBA::Environment &)
+                               CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   // we copy the "in" sequences into all the inout, out and return sequences.
 
   Param_Test::Var_Struct
@@ -476,8 +481,9 @@ Param_Test::Nested_Struct *
 Param_Test_i::test_nested_struct (const Param_Test::Nested_Struct &s1,
                                   Param_Test::Nested_Struct &s2,
                                   Param_Test::Nested_Struct_out s3,
-                                  CORBA::Environment &)
+                                  CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   // we copy the "in" sequences into all the inout, out and return sequences.
 
   Param_Test::Nested_Struct
@@ -496,8 +502,9 @@ Param_Test::Objref_Struct *
 Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
                                   Param_Test::Objref_Struct &s2,
                                   Param_Test::Objref_Struct_out s3,
-                                  CORBA::Environment &)
+                                  CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (env);
   // we copy the "in" sequences into all the inout, out and return sequences.
 
   Param_Test::Objref_Struct
@@ -514,9 +521,9 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1,
 
 // make a Coffee object
 Coffee_ptr
-Param_Test_i::make_coffee (CORBA::Environment &ACE_TRY_ENV)
+Param_Test_i::make_coffee (CORBA::Environment &env)
 {
-  return this->obj_._this (ACE_TRY_ENV);
+  return this->obj_._this (env);
 }
 
 // test for object references
@@ -524,19 +531,19 @@ Coffee_ptr
 Param_Test_i::test_objref (Coffee_ptr o1,
                            Coffee_ptr &o2,
                            Coffee_out o3,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   Coffee_ptr ret = Coffee::_nil ();
 
-  ACE_TRY
+  TAO_TRY
     {
-      Coffee_var myobj = obj_._this (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      Coffee_var myobj = obj_._this (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (!CORBA::is_nil (o2))
         CORBA::release (o2);
 
-      if (myobj->_is_equivalent (o1, ACE_TRY_ENV))
+      if (myobj->_is_equivalent (o1, env))
         {
           o2 = Coffee::_duplicate (myobj.in ());
           o3 = Coffee::_duplicate (myobj.in ());
@@ -548,17 +555,17 @@ Param_Test_i::test_objref (Coffee_ptr o1,
           o3 = Coffee::_nil ();
         }
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
-      // env.exception (TAO_TRY_ENV.exception ());
+      TAO_TRY_ENV.print_exception ("System Exception");
+      env.exception (TAO_TRY_ENV.exception ());
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
-      // env.exception (TAO_TRY_ENV.exception ());
+      TAO_TRY_ENV.print_exception ("User Exception");
+      env.exception (TAO_TRY_ENV.exception ());
     }
-  ACE_ENDTRY;
+  TAO_ENDTRY;
 
   return ret;
 }
@@ -568,7 +575,7 @@ CORBA::TypeCode_ptr
 Param_Test_i::test_typecode (CORBA::TypeCode_ptr t1,
                              CORBA::TypeCode_ptr &t2,
                              CORBA::TypeCode_out t3,
-                             CORBA::Environment &/*env*/)
+                             CORBA::Environment &env)
 {
   // we simply assign t1 to the others
   CORBA::TypeCode_ptr retval = CORBA::TypeCode::_duplicate (t1);
@@ -582,34 +589,20 @@ CORBA::Any *
 Param_Test_i::test_any (const CORBA::Any &a1,
                         CORBA::Any &a2,
                         CORBA::Any_out a3,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::Environment &env)
 {
   CORBA::Any *ret;
   CORBA::Short short_in;
   char *str_in;
   Coffee_ptr coffee;
   Param_Test::Fixed_Array_forany array;
-  Param_Test::Short_Seq_ptr ub_short_sequence;
   Param_Test::Bounded_Short_Seq_ptr bd_short_sequence;
   Param_Test::Fixed_Struct *fixed_structure;
-  Param_Test::Big_Union *big_union;
 
   a2 = a1;
   a3 = new CORBA::Any (a1);
   ret = new CORBA::Any (a1);
 
-
-  if (TAO_debug_level > 0)
-    {
-      CORBA::TypeCode_var tc = a1.type ();
-      int kind = tc->kind (ACE_TRY_ENV);
-      ACE_CHECK_RETURN (0);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Received any contents are <%d>\n",
-                  kind));
-    }
-
   // debug the incoming Any
   if (a1 >>= short_in)
     {
@@ -649,20 +642,6 @@ Param_Test_i::test_any (const CORBA::Any &a1,
       a2 <<= Param_Test::Fixed_Array_forany (array);
       *ret <<= Param_Test::Fixed_Array_forany (array);
     }
-  else if (a1 >>= ub_short_sequence)
-    {
-      if (TAO_debug_level > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Received Unbounded Short_Seq:"));
-          for (size_t i = 0; i < ub_short_sequence->length (); i++)
-            ACE_DEBUG ((LM_DEBUG, " %d", (*ub_short_sequence)[i]));
-          ACE_DEBUG ((LM_DEBUG, "\n"));
-        }
-      for (size_t i = 0; i < ub_short_sequence->length (); i++)
-        (*ub_short_sequence)[i] = i * i;
-      a2   <<= *ub_short_sequence;
-      *ret <<= *ub_short_sequence;
-    }
   else if (a1 >>= bd_short_sequence)
     {
       if (TAO_debug_level > 0)
@@ -682,32 +661,6 @@ Param_Test_i::test_any (const CORBA::Any &a1,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "Received Fixed_Struct\n"));
     }
-  else if (a1 >>= big_union)
-    {
-      Param_Test::Big_Union *bu_in, *bu_inout, *bu_out, *bu_ret;
-      a1 >>= bu_in;
-
-      // Insert copies....
-      a2 <<= *bu_in;
-      *a3 <<= *bu_in;
-      *ret <<= *bu_in;
-
-      // Extract the value to compare...
-      a2 >>= bu_inout;
-      *a3 >>= bu_out;
-      *ret >>= bu_ret;
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Received Big Union\n"
-                    "  in %d\n"
-                    "  inout %d\n"
-                    "  out %d\n"
-                    "  ret %d\n",
-                    bu_in->the_long (),
-                    bu_inout->the_long (),
-                    bu_out->the_long (),
-                    bu_ret->the_long () ));
-    }
   else
     {
       ACE_DEBUG ((LM_DEBUG, "Received UNKNOWN type\n"));
@@ -721,9 +674,10 @@ Param_Test::Fixed_Array_slice *
 Param_Test_i::test_fixed_array (const Param_Test::Fixed_Array a1,
                                 Param_Test::Fixed_Array a2,
                                 Param_Test::Fixed_Array_out a3,
-                                CORBA::Environment &)
+                                CORBA::Environment &env)
 {
   Param_Test::Fixed_Array_slice *ret;
+  ACE_UNUSED_ARG (env);
 
   Param_Test::Fixed_Array_copy (a2, a1);
   Param_Test::Fixed_Array_copy (a3, a1);
@@ -736,9 +690,10 @@ Param_Test::Var_Array_slice *
 Param_Test_i::test_var_array (const Param_Test::Var_Array a1,
                               Param_Test::Var_Array a2,
                               Param_Test::Var_Array_out a3,
-                              CORBA::Environment &)
+                              CORBA::Environment &env)
 {
   Param_Test::Var_Array_slice *ret;
+  ACE_UNUSED_ARG (env);
 
   Param_Test::Var_Array_copy (a2, a1);
   a3 = Param_Test::Var_Array_dup (a1);
@@ -750,7 +705,7 @@ CORBA::ULong
 Param_Test_i::test_exception (CORBA::ULong s1,
 			      CORBA::ULong& s2,
 			      CORBA::ULong_out s3,
-			      CORBA::Environment &ACE_TRY_ENV)
+			      CORBA::Environment &env)
 {
   int d = this->test_exception_count_ % 3;
   this->test_exception_count_++;
@@ -761,50 +716,15 @@ Param_Test_i::test_exception (CORBA::ULong s1,
       return s1 * 4;
     }
   else if (d == 1)
-      ACE_THROW_RETURN (Param_Test::Ooops (CORBA::string_dup (" % 3 == 1"), s1), 0);
-  ACE_THROW_RETURN (Param_Test::BadBoy (), 0);
-}
-
-Param_Test::Big_Union*
-Param_Test_i::test_big_union (const Param_Test::Big_Union& u1,
-			      Param_Test::Big_Union& u2,
-			      Param_Test::Big_Union_out u3,
-			      CORBA::Environment &)
-{
-  Param_Test::Big_Union_var ret (new Param_Test::Big_Union (u1));
-  u2 = u1;
-  u3 = new Param_Test::Big_Union (u1);
-  return ret._retn ();
-}
-
-CORBA::Any*
-Param_Test_i::test_complex_any (const CORBA::Any &a1,
-                                CORBA::Any &a2,
-                                CORBA::Any_out a3,
-                                CORBA::Environment &ACE_TRY_ENV)
-{
-  CORBA::Any_var ret (new CORBA::Any (a1));
-  a2 = a1;
-  a3 = new CORBA::Any (a1);
-  return ret._retn ();
-}
-
-#if 0
-Param_Test::Multdim_Array_slice *
-Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1,
-                                  Param_Test::Multdim_Array a2,
-                                  Param_Test::Multdim_Array_out a3,
-                                  CORBA::Environment &)
-{
-  Param_Test::Multdim_Array_slice *ret;
-
-  Param_Test::Multdim_Array_copy (a2, a1);
-  Param_Test::Multdim_Array_copy (a3, a1);
-  ret = Param_Test::Multdim_Array_dup (a1);
-  return ret;
+    {
+      env.exception (new Param_Test::Ooops (CORBA::string_dup (" % 3 == 1"),
+					    s1));
+      return 0;
+    }
+  env.exception (new Param_Test::BadBoy);
+  return 0;
 }
 
-#endif
 void
 Param_Test_i::shutdown (CORBA::Environment &)
 {
diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h
index 8c7b1c80371..2ec44acf398 100644
--- a/TAO/tests/Param_Test/param_test_i.h
+++ b/TAO/tests/Param_Test/param_test_i.h
@@ -228,30 +228,8 @@ public:
                                        CORBA::ULong_out s3,
                                        CORBA::Environment &env);
 
-  virtual Param_Test::Big_Union*
-    test_big_union (const Param_Test::Big_Union& u1,
-                    Param_Test::Big_Union& u2,
-                    Param_Test::Big_Union_out u3,
-                    CORBA::Environment &env);
-
-  virtual CORBA::Any* 
-    test_complex_any (const CORBA::Any &a1,
-                      CORBA::Any &a2,
-                      CORBA::Any_out a3,
-                      CORBA::Environment &env);
-
-# if 0
-  // Test for multi dimensional arrays
-  virtual Param_Test::Multdim_Array_slice *
-  test_multdim_array (const Param_Test::Multdim_Array,
-                      Param_Test::Multdim_Array ,
-                      Param_Test::Multdim_Array_out ,
-                      CORBA::Environment &);
-  
-#endif
   void shutdown (CORBA::Environment &env);
 
-  
 private:
   Coffee_i obj_;
   // the coffee object reference we maintain
diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp
index c5055e1c5fb..405441edf59 100644
--- a/TAO/tests/Param_Test/results.cpp
+++ b/TAO/tests/Param_Test/results.cpp
@@ -101,9 +101,9 @@ Results::print_stats (void)
 
 void
 Results::print_exception (const char *call_name,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
-  //ACE_PRINT_EXCEPTION (call_name);
+  env.print_exception (call_name);
 }
 
 void
diff --git a/TAO/tests/Param_Test/run_test.pl b/TAO/tests/Param_Test/run_test.pl
index 26a8d65f916..45b380d620c 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -1,13 +1,11 @@
+# $Id$
+# -*- perl -*-
 eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
     & eval 'exec perl -S $0 $argv:q'
     if 0;
 
-# $Id$
-# -*- perl -*-
-
 use lib "../../../bin";
 require ACEutils;
-require Process;
 
 $port = 0;
 $iorfile = "server.ior";
@@ -22,21 +20,19 @@ sub run_test
   my $type = shift(@_);
 
   $SV = Process::Create ($EXEPREFIX."server".$Process::EXE_EXT,
-                         "$debug -ORBport $port -o ".
+                         "$debug -ORBobjrefstyle url -ORBport $port -o ".
                          $iorfile);
-
+  
   ACE::waitforfile ($iorfile);
 
   system ($EXEPREFIX."client $debug -f $iorfile  -i $invocation -t ".
-          "$type -n $num -x");
+          "$type -n $num");
 
   # @@
   # Someday, a better way of doing this should be found.  Or at least
   # something that can tell if a server is still alive.  There is kill -0 on
   # Unix, but on NT ???
 
-  sleep 3;
-
   $SV->Kill (); $SV->Wait ();
   unlink ($iorfile);
 }
@@ -103,8 +99,7 @@ for ($i = 0; $i <= $#ARGV; $i++)
           "any_sequence",
           "ub_short_sequence", "ub_long_sequence",
           "bd_short_sequence", "bd_long_sequence",
-          "fixed_array", "var_array", "typecode", "exception",
-	  "big_union", "complex_any");
+          "fixed_array", "var_array", "typecode", "exception");
 
 if ($type ne "")
 {
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index 64d0ad6c230..e5d97ab8cd7 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -61,16 +61,15 @@ main (int argc, char *argv[])
   PortableServer::POA_var oa_ptr;
   Param_Test_i *param_test = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
+  TAO_TRY
     {
       char *orb_name = "internet"; // unused by TAO
       CORBA::Object_var temp; // holder for the myriad of times we get
                               // an object which we then have to narrow.
 
       // get the underlying ORB
-      CORBA::ORB_var orb_ptr = CORBA::ORB_init (argc, argv, orb_name, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      CORBA::ORB_var orb_ptr = CORBA::ORB_init (argc, argv, orb_name, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Get the Root POA
 
@@ -80,21 +79,21 @@ main (int argc, char *argv[])
                            "(%P|%t) Unable to get root poa reference.\n"),
                           1);
 
-      oa_ptr = PortableServer::POA::_narrow (temp.in(), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      oa_ptr = PortableServer::POA::_narrow (temp.in(), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       PortableServer::POAManager_var poa_manager =
-        oa_ptr->the_POAManager (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+        oa_ptr->the_POAManager (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::PolicyList policies (2);
       policies.length (2);
       policies[0] =
         oa_ptr->create_id_assignment_policy (PortableServer::USER_ID,
-                                             ACE_TRY_ENV);
+                                             TAO_TRY_ENV);
       policies[1] =
         oa_ptr->create_lifespan_policy (PortableServer::PERSISTENT,
-                                        ACE_TRY_ENV);
+                                        TAO_TRY_ENV);
 
       // We use a different POA, otherwise the user would have to
       // change the object key each time it invokes the server.
@@ -102,8 +101,8 @@ main (int argc, char *argv[])
         oa_ptr->create_POA ("child_poa",
                             poa_manager.in (),
                             policies,
-                            ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                            TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Parse remaining command line and verify parameters.
       parse_args (argc, argv);
@@ -119,20 +118,19 @@ main (int argc, char *argv[])
         PortableServer::string_to_ObjectId ("param_test");
       good_poa->activate_object_with_id (id.in (),
                                          param_test,
-                                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       // Stringify the objref we'll be implementing, and print it to
       // stdout.  Someone will take that string and give it to a
       // client.  Then release the object.
 
-      temp = good_poa->id_to_reference (id.in (), ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      temp = good_poa->id_to_reference (id.in (), TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       CORBA::String_var str =
         orb_ptr->object_to_string (temp.in (),
-                                   ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                                   TAO_TRY_ENV);
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) The IOR is <%s>\n", str.in ()));
       if (ior_output_file)
@@ -143,34 +141,36 @@ main (int argc, char *argv[])
       
 
       // Make the POAs controlled by this manager active
-      poa_manager->activate (ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      poa_manager->activate (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       if (orb_ptr->run () == -1)
         ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "run"), -1);
 
       good_poa->destroy (1,
                          1,
-                         ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                         TAO_TRY_ENV);
+      TAO_CHECK_ENV;
 
       oa_ptr->destroy (1,
                        1,
-                       ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+                       TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
-  ACE_CATCH (CORBA::SystemException, sysex)
+  TAO_CATCH (CORBA::SystemException, sysex)
     {
-      ACE_PRINT_EXCEPTION (sysex, "System Exception");
+      ACE_UNUSED_ARG (sysex);
+      TAO_TRY_ENV.print_exception ("System Exception");
       return -1;
     }
-  ACE_CATCH (CORBA::UserException, userex)
+  TAO_CATCH (CORBA::UserException, userex)
     {
-      ACE_PRINT_EXCEPTION (userex, "User Exception");
+      ACE_UNUSED_ARG (userex);
+      TAO_TRY_ENV.print_exception ("User Exception");
       return -1;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
+  TAO_ENDTRY;
+
   // Free resources
   delete param_test;
 
diff --git a/TAO/tests/Param_Test/server.dsp b/TAO/tests/Param_Test/server.dsp
index 9dae9a5b184..d22d2142c47 100644
--- a/TAO/tests/Param_Test/server.dsp
+++ b/TAO/tests/Param_Test/server.dsp
@@ -68,7 +68,7 @@ LINK32=link.exe
 # 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" /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

+# SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp
index 95bc8cb298e..92fc0286b92 100644
--- a/TAO/tests/Param_Test/short.cpp
+++ b/TAO/tests/Param_Test/short.cpp
@@ -43,18 +43,20 @@ Test_Short::opname (void) const
 }
 
 void
-Test_Short::dii_req_invoke (CORBA::Request *req,
-                            CORBA::Environment &ACE_TRY_ENV)
+Test_Short::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Short::init_parameters (Param_Test_ptr /*objref*/,
-                             CORBA::Environment &)
+Test_Short::init_parameters (Param_Test_ptr objref,
+                             CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   this->in_ = gen->gen_short ();
   this->inout_ =  0;
   return 0;
@@ -71,20 +73,20 @@ Test_Short::reset_parameters (void)
 
 int
 Test_Short::run_sii_test (Param_Test_ptr objref,
-                          CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   this->ret_ = objref->test_short (this->in_,
                                    this->inout_,
                                    this->out_,
-                                   ACE_TRY_ENV);
+                                   env);
 
-  return (ACE_TRY_ENV.exception () ? -1:0);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Short::add_args (CORBA::NVList_ptr param_list,
                       CORBA::NVList_ptr retval,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &env)
 {
   // we provide top level memory to the ORB to retrieve the data
   CORBA::Any in_arg (CORBA::_tc_short,
@@ -103,24 +105,24 @@ Test_Short::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value. Let the ORB allocate storage. We simply tell the ORB
   // what type we are expecting.
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_short,
-                                                    &this->ret_,
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (CORBA::_tc_short,
+                                            &this->ret_,
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -136,8 +138,9 @@ Test_Short::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Short::check_validity (CORBA::Request_ptr /*req*/)
+Test_Short::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h
index d512befbc31..f1654379287 100644
--- a/TAO/tests/Param_Test/short.h
+++ b/TAO/tests/Param_Test/short.h
@@ -65,7 +65,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/svc.conf b/TAO/tests/Param_Test/svc.conf
index 599839eb910..39f3c0a4d00 100644
--- a/TAO/tests/Param_Test/svc.conf
+++ b/TAO/tests/Param_Test/svc.conf
@@ -2,6 +2,6 @@
 #
 # Please read $TAO_ROOT/docs/Options.html for details.
 #
-static Resource_Factory "-ORBresources global"
-static Client_Strategy_Factory ""
-static Server_Strategy_Factory "-ORBconcurrency reactive -ORBtablesize 128"
+dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global"
+dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory()
+dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128"
diff --git a/TAO/tests/Param_Test/tests.h b/TAO/tests/Param_Test/tests.h
index 9cd2b1b1dc6..f1845ebd497 100644
--- a/TAO/tests/Param_Test/tests.h
+++ b/TAO/tests/Param_Test/tests.h
@@ -43,9 +43,5 @@
 #include "var_array.h"
 #include "var_struct.h"
 #include "except.h"
-#include "big_union.h"
-#include "complex_any.h"
-#if 0
-#include "multdim_array.h"
-#endif
+
 #endif /* if !defined */
diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp
index 90f16ff0c32..0e25f2b8e8b 100644
--- a/TAO/tests/Param_Test/typecode.cpp
+++ b/TAO/tests/Param_Test/typecode.cpp
@@ -43,15 +43,14 @@ Test_TypeCode::opname (void) const
 }
 
 void
-Test_TypeCode::dii_req_invoke (CORBA::Request *req,
-                               CORBA::Environment &ACE_TRY_ENV)
+Test_TypeCode::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_TypeCode::init_parameters (Param_Test_ptr objref,
-                                CORBA::Environment &/*ACE_TRY_ENV*/)
+                                CORBA::Environment &env)
 {
   static CORBA::TypeCode_ptr tc_table [] =
     {
@@ -91,20 +90,20 @@ Test_TypeCode::reset_parameters (void)
 
 int
 Test_TypeCode::run_sii_test (Param_Test_ptr objref,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Environment &env)
 {
   CORBA::TypeCode_out out (this->out_);
   this->ret_ = objref->test_typecode (this->in_.in (),
                                       this->inout_.inout (),
                                       out,
-                                      ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                      env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_TypeCode::add_args (CORBA::NVList_ptr param_list,
 			 CORBA::NVList_ptr retval,
-			 CORBA::Environment &ACE_TRY_ENV)
+			 CORBA::Environment &env)
 {
   CORBA::Any in_arg (CORBA::_tc_TypeCode,
                      &this->in_,
@@ -122,34 +121,33 @@ Test_TypeCode::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_TypeCode,
-                                                    &this->ret_,
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (CORBA::_tc_TypeCode,
+                                            &this->ret_,
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
 CORBA::Boolean
 Test_TypeCode::check_validity (void)
 {
-  //CORBA::Environment env;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  if (this->in_.in ()->equal (this->inout_.in (), ACE_TRY_ENV) &&
-      this->in_.in ()->equal (this->out_.in (), ACE_TRY_ENV) &&
-      this->in_.in ()->equal (this->ret_.in (), ACE_TRY_ENV))
+  CORBA::Environment env;
+  if (this->in_.in ()->equal (this->inout_.in (), env) &&
+      this->in_.in ()->equal (this->out_.in (), env) &&
+      this->in_.in ()->equal (this->ret_.in (), env))
     return 1;
   else
     return 0;
diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h
index 06933e73d48..c35274ad2a1 100644
--- a/TAO/tests/Param_Test/typecode.h
+++ b/TAO/tests/Param_Test/typecode.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp
index b71f846c94e..f2f659ea03a 100644
--- a/TAO/tests/Param_Test/ub_any_seq.cpp
+++ b/TAO/tests/Param_Test/ub_any_seq.cpp
@@ -20,7 +20,6 @@
 #include "ub_any_seq.h"
 
 const CORBA::ULong TEST_SEQ_LENGTH = 5;
-const CORBA::ULong NUM_TEST_TYPES = 4;
 
 ACE_RCSID(Param_Test, ub_any_seq, "$Id$")
 
@@ -50,15 +49,14 @@ Test_AnySeq::opname (void) const
 }
 
 void
-Test_AnySeq::dii_req_invoke (CORBA::Request *req,
-                             CORBA::Environment &ACE_TRY_ENV)
+Test_AnySeq::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_AnySeq::init_parameters (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
@@ -67,17 +65,15 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref,
 
   for (CORBA::ULong i=0; i < this->in_->length (); i++)
     {
-      CORBA::ULong index = 
-        (CORBA::ULong) (gen->gen_short () % NUM_TEST_TYPES);
+      CORBA::ULong index = (CORBA::ULong) (gen->gen_short () % 4);
       switch (index)
         {
         case 0:
           {
             CORBA::Short s;
             s = gen->gen_short ();
-	          if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG, 
-                          "setting short = %d\n", s));
+	    if (TAO_debug_level > 0)
+              ACE_DEBUG ((LM_DEBUG, "setting short = %d\n", s));
             this->in_[i] <<= s;
             this->inout_[i] <<= 0; // different from in_
           }
@@ -86,42 +82,44 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref,
           {
             char *str = gen->gen_string ();
             if (TAO_debug_level > 0)
-              ACE_DEBUG ((LM_DEBUG, 
-                          "setting string = %s\n", str));
+              ACE_DEBUG ((LM_DEBUG, "setting string = %s\n", str));
             this->in_[i] <<= str;
             this->inout_[i] <<= 0; // different from in_
           }
           break;
         case 2:
           {
-	          if (TAO_debug_level > 0)
-	            ACE_DEBUG ((LM_DEBUG, 
-                          "setting coffee object \n" ));
-            ACE_TRY
+	    if (TAO_debug_level > 0)
+	      ACE_DEBUG ((LM_DEBUG, "setting coffee object \n" ));
+            TAO_TRY
               {
                 // get access to a Coffee Object
-                Coffee_var cobj = objref->make_coffee (ACE_TRY_ENV);
-                ACE_TRY_CHECK;
+                Coffee_var cobj = objref->make_coffee (TAO_TRY_ENV);
+                TAO_CHECK_ENV;
 
                 // insert the coffee object into the Any
                 this->in_[i] <<= cobj.in ();
                 this->inout_[i] <<= 0; // different from in_
               }
-            ACE_CATCH (CORBA::SystemException, sysex)
+            TAO_CATCH (CORBA::SystemException, sysex)
               {
-                ACE_PRINT_EXCEPTION (sysex,
-                                     "System Exception doing make_coffee");
+                ACE_UNUSED_ARG (sysex);
+                TAO_TRY_ENV.print_exception
+		  ("System Exception doing make_coffee");
                 return -1;
               }
-            ACE_ENDTRY;
+            TAO_ENDTRY;
           }
           break;
         case 3:
           if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG, 
-                        "setting constant string \n" ));
-	        this->in_[i] <<= "Const string";
-	        this->inout_[i] <<= 0; // different from in_
+            ACE_DEBUG ((LM_DEBUG, "setting constant string \n" ));
+	    this->in_[i] <<= "Const string";
+	    this->inout_[i] <<= 0; // different from in_
+          break;
+        case 4:
+          break;
+        case 5:
           break;
         }
     }
@@ -136,8 +134,7 @@ Test_AnySeq::reset_parameters (void)
 
   for (CORBA::ULong i=0; i < this->in_->length (); i++)
     {
-      CORBA::ULong index = 
-        (CORBA::ULong) (gen->gen_long () % NUM_TEST_TYPES);
+      CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 4);
 
       switch (index)
         {
@@ -162,8 +159,12 @@ Test_AnySeq::reset_parameters (void)
           }
           break;
         case 3:
-	        this->in_[i] <<= "Const string";
-	        this->inout_[i] <<= "Const string";
+	    this->in_[i] <<= "Const string";
+	    this->inout_[i] <<= "Const string";
+          break;
+        case 4:
+          break;
+        case 5:
           break;
         }
     }
@@ -174,20 +175,20 @@ Test_AnySeq::reset_parameters (void)
 
 int
 Test_AnySeq::run_sii_test (Param_Test_ptr objref,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Environment &env)
 {
   Param_Test::AnySeq_out out (this->out_.out ());
   this->ret_ = objref->test_anyseq (this->in_.in (),
                                     this->inout_.inout (),
                                     out,
-                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1 : 0);
+                                    env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_AnySeq::add_args (CORBA::NVList_ptr param_list,
                        CORBA::NVList_ptr retval,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_AnySeq,
                      (void *) &this->in_.in (),
@@ -205,25 +206,24 @@ Test_AnySeq::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_AnySeq,
-                                                    // see above
-                                                    &this->ret_.inout (),
-                                                    // does not own
-                                                    0, 
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_AnySeq,
+					    // see above
+					    &this->ret_.inout (),
+					     // does not own
+                                            0, env);
   return 0;
 }
 
@@ -241,61 +241,49 @@ Test_AnySeq::check_validity (void)
           (this->out_[i] >>= short_out) &&
           (this->ret_[i] >>= short_ret))
         {
-          ACE_DEBUG ((LM_DEBUG, 
-                      "Received shorts: in = %d, "
+          ACE_DEBUG ((LM_DEBUG, "Received shorts: in = %d, "
                       "inout = %d, out = %d, ret = %d\n",
-                      short_in, 
-                      short_inout, 
-                      short_out, 
-                      short_ret));
-
-          if ((short_in != short_inout) ||
-              (short_in != short_out) ||
-              (short_in != short_ret))
+                      short_in, short_inout, short_out, short_ret));
+
+          if ((short_in == short_inout) &&
+              (short_in == short_out) &&
+              (short_in == short_ret))
+            return 1;
+          else
             {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of short values\n"));
+              ACE_DEBUG ((LM_DEBUG, "mismatch of short values\n"));
               return 0;
             }
-          else
-            continue;
         }
       else if ((this->in_[i] >>= str_in) &&
                (this->inout_[i] >>= str_inout) &&
                (this->out_[i] >>= str_out) &&
                (this->ret_[i] >>= str_ret))
         {
-          if (ACE_OS::strcmp (str_in, str_inout) ||
-              ACE_OS::strcmp (str_in, str_out) ||
-              ACE_OS::strcmp (str_in, str_ret))
+          if (!ACE_OS::strcmp (str_in, str_inout) &&
+              !ACE_OS::strcmp (str_in, str_out) &&
+              !ACE_OS::strcmp (str_in, str_ret))
+            return 1;
+          else
             {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of string values\n"));
+              ACE_DEBUG ((LM_DEBUG, "mismatch of string values\n"));
               return 0;
             }
-          else
-            continue;
         }
       else if ((this->in_[i] >>= obj_in) &&
                (this->inout_[i] >>= obj_inout) &&
                (this->out_[i] >>= obj_out) &&
                (this->ret_[i] >>= obj_ret))
         {
-          if (!(obj_in->_is_equivalent (obj_inout)) ||
-              !(obj_in->_is_equivalent (obj_out)) ||
-              !(obj_in->_is_equivalent (obj_ret)))
-            {
-              ACE_DEBUG ((LM_DEBUG, 
-                          "mismatch of Coffee values\n"));
-              return 0;
-            }
+          // all the >>= operators returned true so we are OK.
+          return 1;
         }
       else
-        continue;
+        return 0;
     }
 
-  // Everything checks out.
-  return 1;
+  // Should never reach this.
+  return 0;
 }
 
 CORBA::Boolean
@@ -349,6 +337,5 @@ Test_AnySeq::print_sequence (const Param_Test::AnySeq &s)
              "\td = %f\n",
              i,
              vs.l, vs.c, vs.s, vs.o, vs.f, vs.b, vs.d));
-      */    
-    }
+      */    }
 }
diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 4d65e04e0d5..ce418d63438 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp
index 7eca8262399..a38a13df40b 100644
--- a/TAO/tests/Param_Test/ub_long_seq.cpp
+++ b/TAO/tests/Param_Test/ub_long_seq.cpp
@@ -47,18 +47,20 @@ Test_Long_Sequence::opname (void) const
 }
 
 void
-Test_Long_Sequence::dii_req_invoke (CORBA::Request *req,
-                                    CORBA::Environment &ACE_TRY_ENV)
+Test_Long_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Long_Sequence::init_parameters (Param_Test_ptr ,
-                                     CORBA::Environment &/*ACE_TRY_ENV*/)
+Test_Long_Sequence::init_parameters (Param_Test_ptr objref,
+                                     CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -85,20 +87,20 @@ Test_Long_Sequence::reset_parameters (void)
 
 int
 Test_Long_Sequence::run_sii_test (Param_Test_ptr objref,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Environment &env)
 {
   Param_Test::Long_Seq_out out (this->out_.out ());
   this->ret_ = objref->test_long_sequence (this->in_.in (),
                                            this->inout_.inout (),
                                            out,
-                                           ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                           env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
                                CORBA::NVList_ptr retval,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Long_Seq,
                      (void *) &this->in_.in (),
@@ -116,23 +118,23 @@ Test_Long_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Long_Seq,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Long_Seq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -159,8 +161,9 @@ Test_Long_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Long_Sequence::check_validity (CORBA::Request_ptr )
+Test_Long_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h
index 1dfab9de0c0..0fca83a1352 100644
--- a/TAO/tests/Param_Test/ub_long_seq.h
+++ b/TAO/tests/Param_Test/ub_long_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp
index b996d463413..53c28ec4354 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.cpp
+++ b/TAO/tests/Param_Test/ub_objref_seq.cpp
@@ -57,15 +57,14 @@ Test_ObjRef_Sequence::opname (void) const
 }
 
 void
-Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_ObjRef_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
-                                       CORBA::Environment &ACE_TRY_ENV)
+                                       CORBA::Environment &env)
 {
   Coffee::Desc desc;
   Generator *gen = GENERATOR::instance (); // value generator
@@ -80,23 +79,23 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref,
     {
       // generate some arbitrary string to be filled into the ith location in
       // the sequence
-      this->in_[i] = objref->make_coffee (ACE_TRY_ENV);
-      if (ACE_TRY_ENV.exception ())
+      this->in_[i] = objref->make_coffee (env);
+      if (env.exception ())
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "make cofee \n"), -1);
+          env.print_exception ("make_coffee");
+          return -1;
         }
       // select a Coffee flavor at random
       CORBA::ULong index = (CORBA::ULong) (gen->gen_long () % 6);
       desc.name = Coffee_Flavor [index];
       // set the attribute for the in object
       Coffee_ptr tmp = this->in_[i];
-      tmp->description (desc, ACE_TRY_ENV);
+      tmp->description (desc, env);
 
-      if (ACE_TRY_ENV.exception ())
+      if (env.exception ())
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "set cofee attribute \n"), -1);
+          env.print_exception ("set coffee attribute");
+          return -1;
         }
     }
   return 0;
@@ -113,7 +112,7 @@ Test_ObjRef_Sequence::reset_parameters (void)
 
 int
 Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   Param_Test::Coffee_Mix_out out (this->out_.out ());
   // ACE_DEBUG ((LM_DEBUG, "test_coffe_mix (IN):\n"));
@@ -121,14 +120,14 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref,
   this->ret_ = objref->test_coffe_mix (this->in_,
                                        this->inout_.inout (),
                                        out,
-                                       ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                       env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Coffee_Mix,
                      (void *) &this->in_,
@@ -146,32 +145,30 @@ Test_ObjRef_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Coffee_Mix,
-                                                    &this->ret_.inout (),
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Coffee_Mix,
+                                            &this->ret_.inout (),
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
 CORBA::Boolean
 Test_ObjRef_Sequence::check_validity (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-  
-  ACE_TRY
+  TAO_TRY
     {
       // ACE_DEBUG ((LM_DEBUG, "IN: \n"));
       // this->print_sequence (this->in_);
@@ -182,35 +179,38 @@ Test_ObjRef_Sequence::check_validity (void)
       // ACE_DEBUG ((LM_DEBUG, "OUT: \n"));
       // this->print_sequence (this->out_.in ());
 
-      this->compare (this->in_,
-                     this->inout_.in (),
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
-      this->compare (this->in_,
-                     this->out_.in (),
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-      
-      this->compare (this->in_,
-                     this->ret_.in (),
-                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
+      if (this->compare (this->in_,
+                         this->inout_.in (),
+                         TAO_TRY_ENV))
+        {
+          TAO_CHECK_ENV;
+          if (this->compare (this->in_,
+                             this->out_.in (),
+                             TAO_TRY_ENV))
+            {
+              TAO_CHECK_ENV;
+              if (this->compare (this->in_,
+                                 this->ret_.in (),
+                                 TAO_TRY_ENV))
+                {
+                  TAO_CHECK_ENV;
+                  return 1;
+                }
+            }
+        }
+      return 0;
     }
-  ACE_CATCHANY
+  TAO_CATCHANY
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
+      return 0;
     }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
- return 1; 
+  TAO_ENDTRY_RETURN (0);
 }
 
 CORBA::Boolean
-Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr )
+Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr req)
 {
-  //ACE_UNUSED_ARG (req);
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
@@ -238,7 +238,7 @@ Test_ObjRef_Sequence::print_values (void)
 CORBA::Boolean
 Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
                                const Param_Test::Coffee_Mix &s2,
-                               CORBA::Environment &ACE_TRY_ENV)
+                                                           CORBA::Environment& env)
 {
   if (s1.maximum () != s2.maximum ())
       return 0;
@@ -256,17 +256,17 @@ Test_ObjRef_Sequence::compare (const Param_Test::Coffee_Mix &s1,
       if (CORBA::is_nil (vs1) || CORBA::is_nil (vs2))
         return 0;
 
-      CORBA::String_var n1 = vs1->description (ACE_TRY_ENV)->name.in ();
-      if (ACE_TRY_ENV.exception ())
+      CORBA::String_var n1 = vs1->description (env)->name.in ();
+      if (env.exception ())
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "retrieving description for vs1"), 0);
+          env.print_exception ("retrieving description for vs1");
+          return 0;
         }
-      CORBA::String_var n2 = vs2->description (ACE_TRY_ENV)->name.in ();
-      if (ACE_TRY_ENV.exception ())
+      CORBA::String_var n2 = vs2->description (env)->name.in ();
+      if (env.exception ())
         {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "retrieving description for vs2"), 0);
+          env.print_exception ("retrieving description for vs2");
+          return 0;
         }
       if (ACE_OS::strcmp(n1.in (), n2.in ()) != 0)
         return 0;
diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h
index e660e0aaaf2..c1d0744290c 100644
--- a/TAO/tests/Param_Test/ub_objref_seq.h
+++ b/TAO/tests/Param_Test/ub_objref_seq.h
@@ -62,13 +62,13 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
   CORBA::Boolean compare (const Param_Test::Coffee_Mix &s1,
                           const Param_Test::Coffee_Mix &s2,
-                          CORBA::Environment& env);
+                                                  CORBA::Environment& env);
   // compare
 
   void print_sequence (const Param_Test::Coffee_Mix &s);
diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp
index 6bea60fdb72..d393474cb5a 100644
--- a/TAO/tests/Param_Test/ub_short_seq.cpp
+++ b/TAO/tests/Param_Test/ub_short_seq.cpp
@@ -47,18 +47,20 @@ Test_Short_Sequence::opname (void) const
 }
 
 void
-Test_Short_Sequence::dii_req_invoke (CORBA::Request *req,
-                                     CORBA::Environment &ACE_TRY_ENV)
+Test_Short_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
 Test_Short_Sequence::init_parameters (Param_Test_ptr objref,
-                                      CORBA::Environment &)
+                                      CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -87,20 +89,20 @@ Test_Short_Sequence::reset_parameters (void)
 
 int
 Test_Short_Sequence::run_sii_test (Param_Test_ptr objref,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA::Environment &env)
 {
   Param_Test::Short_Seq_out out (this->out_.out ());
   this->ret_ = objref->test_short_sequence (this->in_.in (),
                                             this->inout_.inout (),
                                             out,
-                                            ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                            env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
                                CORBA::NVList_ptr retval,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Short_Seq,
                      (void *) &this->in_.in (),
@@ -118,24 +120,24 @@ Test_Short_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Short_Seq,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
-return 0;
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Short_Seq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
+  return 0;
 }
 
 CORBA::Boolean
@@ -161,8 +163,9 @@ Test_Short_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Short_Sequence::check_validity (CORBA::Request_ptr )
+Test_Short_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h
index b9ad0469149..3c245c24bde 100644
--- a/TAO/tests/Param_Test/ub_short_seq.h
+++ b/TAO/tests/Param_Test/ub_short_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 3d5f431d407..64fbc26b3c2 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -47,16 +47,18 @@ Test_String_Sequence::opname (void) const
 }
 
 void
-Test_String_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_String_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_String_Sequence::init_parameters (Param_Test_ptr ,
-                                       CORBA::Environment &)
+Test_String_Sequence::init_parameters (Param_Test_ptr objref,
+                                       CORBA::Environment &env)
 {
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   const char *choiceList[] =
   {
     "one",
@@ -91,20 +93,20 @@ Test_String_Sequence::reset_parameters (void)
 
 int
 Test_String_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   Param_Test::StrSeq_out out (this->out_.out ());
   this->ret_ = objref->test_strseq (this->in_.in (),
                                     this->inout_.inout (),
                                     out,
-                                    ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                    env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_String_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_StrSeq,
                      (void *) &this->in_.in (),
@@ -122,23 +124,23 @@ Test_String_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_StrSeq,
-                                                    &this->ret_.inout (), // see above
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_StrSeq,
+                                            &this->ret_.inout (), // see above
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -165,8 +167,9 @@ Test_String_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_String_Sequence::check_validity (CORBA::Request_ptr )
+Test_String_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h
index 97972a1cdec..a7307a74999 100644
--- a/TAO/tests/Param_Test/ub_str_seq.h
+++ b/TAO/tests/Param_Test/ub_str_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp
index fe076ce293f..7a41a10cc59 100644
--- a/TAO/tests/Param_Test/ub_string.cpp
+++ b/TAO/tests/Param_Test/ub_string.cpp
@@ -55,18 +55,18 @@ Test_Unbounded_String::opname (void) const
 }
 
 void
-Test_Unbounded_String::dii_req_invoke (CORBA::Request *req,
-                                       CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_String::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Unbounded_String::init_parameters (Param_Test_ptr ,
-                                        CORBA::Environment &)
+Test_Unbounded_String::init_parameters (Param_Test_ptr objref,
+                                        CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
-
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // release any previously occupied values
   CORBA::string_free (this->in_);
@@ -97,20 +97,20 @@ Test_Unbounded_String::reset_parameters (void)
 
 int
 Test_Unbounded_String::run_sii_test (Param_Test_ptr objref,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Environment &env)
 {
   CORBA::String_out str_out (this->out_);
   this->ret_ = objref->test_unbounded_string (this->in_,
                                               this->inout_,
                                               str_out,
-                                              ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                              env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Unbounded_String::add_args (CORBA::NVList_ptr param_list,
 				 CORBA::NVList_ptr retval,
-				 CORBA::Environment &ACE_TRY_ENV)
+				 CORBA::Environment &env)
 {
   // create the parmaters
   CORBA::Any in_arg (CORBA::_tc_string,
@@ -129,23 +129,23 @@ Test_Unbounded_String::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_string,
-                                                    &this->ret_,
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (CORBA::_tc_string,
+                                            &this->ret_,
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -165,10 +165,11 @@ Test_Unbounded_String::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Unbounded_String::check_validity (CORBA::Request_ptr )
+Test_Unbounded_String::check_validity (CORBA::Request_ptr req)
 {
   // No need to retrieve anything because, for all the args and
   // the return, we provided the memory and we own it.
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h
index 7a5ffc45210..ad2c150d2e8 100644
--- a/TAO/tests/Param_Test/ub_string.h
+++ b/TAO/tests/Param_Test/ub_string.h
@@ -65,7 +65,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp
index d7511d6e6c5..5035d33a050 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.cpp
+++ b/TAO/tests/Param_Test/ub_struct_seq.cpp
@@ -48,18 +48,20 @@ Test_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Test_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Struct_Sequence::init_parameters (Param_Test_ptr ,
-                                       CORBA::Environment &)
+Test_Struct_Sequence::init_parameters (Param_Test_ptr objref,
+                                     CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -88,20 +90,20 @@ Test_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   Param_Test::StructSeq_out out (this->out_.out ());
   this->ret_ = objref->test_struct_sequence (this->in_,
                                              this->inout_.inout (),
                                              out,
-                                             ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                             env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
                                 CORBA::NVList_ptr retval,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_StructSeq,
                      &this->in_,
@@ -119,23 +121,23 @@ Test_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_StructSeq,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_StructSeq,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -151,8 +153,9 @@ Test_Struct_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Struct_Sequence::check_validity (CORBA::Request_ptr )
+Test_Struct_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
@@ -259,18 +262,20 @@ Test_Unbounded_Struct_Sequence::opname (void) const
 }
 
 void
-Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req,
-                                                CORBA::Environment &ACE_TRY_ENV)
+Test_Unbounded_Struct_Sequence::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr ,
-                                                 CORBA::Environment &)
+Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr objref,
+                                     CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -300,20 +305,20 @@ Test_Unbounded_Struct_Sequence::reset_parameters (void)
 
 int
 Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref,
-                                              CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Environment &env)
 {
   Param_Test::PathSpec_out out (this->out_.out ());
   this->ret_ = objref->test_unbounded_struct_sequence (this->in_,
-                                                       this->inout_.inout (),
-                                                       out,
-                                                       ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                             this->inout_.inout (),
+                                             out,
+                                             env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Unbounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
-                                          CORBA::NVList_ptr retval,
-                                          CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::NVList_ptr retval,
+                                CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_PathSpec,
                      &this->in_,
@@ -331,23 +336,23 @@ Test_Unbounded_Struct_Sequence::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_PathSpec,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_PathSpec,
                                             &this->ret_.inout (),
                                             0,
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -363,8 +368,9 @@ Test_Unbounded_Struct_Sequence::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Unbounded_Struct_Sequence::check_validity (CORBA::Request_ptr )
+Test_Unbounded_Struct_Sequence::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
@@ -391,7 +397,7 @@ Test_Unbounded_Struct_Sequence::print_values (void)
 
 CORBA::Boolean
 Test_Unbounded_Struct_Sequence::compare (const Param_Test::PathSpec &s1,
-                                         const Param_Test::PathSpec &s2)
+                               const Param_Test::PathSpec &s2)
 {
   if (s1.maximum () != s2.maximum ())
       return 0;
diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h
index eeca962f963..f104b59813c 100644
--- a/TAO/tests/Param_Test/ub_struct_seq.h
+++ b/TAO/tests/Param_Test/ub_struct_seq.h
@@ -62,7 +62,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
@@ -130,7 +130,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 protected:
diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp
index 7ff4fdea85f..92eecd725c5 100644
--- a/TAO/tests/Param_Test/ulonglong.cpp
+++ b/TAO/tests/Param_Test/ulonglong.cpp
@@ -39,18 +39,20 @@ Test_ULongLong::opname (void) const
 }
 
 void
-Test_ULongLong::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_ULongLong::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_ULongLong::init_parameters (Param_Test_ptr ,
-                                CORBA::Environment &)
+Test_ULongLong::init_parameters (Param_Test_ptr objref,
+                                CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   this->in_ = gen->gen_long ();
   this->inout_ =  0;
   return 0;
@@ -67,20 +69,20 @@ Test_ULongLong::reset_parameters (void)
 
 int
 Test_ULongLong::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+                          CORBA::Environment &env)
 {
   this->ret_ = objref->test_ulonglong (this->in_,
                                        this->inout_,
                                        this->out_,
-                                       ACE_TRY_ENV);
+                                       env);
 
-  return (ACE_TRY_ENV.exception () ? -1:0);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_ULongLong::add_args (CORBA::NVList_ptr param_list,
-                          CORBA::NVList_ptr retval,
-                          CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::NVList_ptr retval,
+                      CORBA::Environment &env)
 {
   // we provide top level memory to the ORB to retrieve the data
   CORBA::Any in_arg (CORBA::_tc_ulonglong,
@@ -99,24 +101,24 @@ Test_ULongLong::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value. Let the ORB allocate storage. We simply tell the ORB
   // what type we are expecting.
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (CORBA::_tc_ulonglong,
+  retval->item (0, env)->value ()->replace (CORBA::_tc_ulonglong,
                                             &this->ret_,
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -132,8 +134,9 @@ Test_ULongLong::check_validity (void)
 }
 
 CORBA::Boolean
-Test_ULongLong::check_validity (CORBA::Request_ptr )
+Test_ULongLong::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h
index 2b27a929b0f..7e3aeaee240 100644
--- a/TAO/tests/Param_Test/ulonglong.h
+++ b/TAO/tests/Param_Test/ulonglong.h
@@ -57,7 +57,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp
index 1b8025bb8f4..1e82a7ec744 100644
--- a/TAO/tests/Param_Test/var_array.cpp
+++ b/TAO/tests/Param_Test/var_array.cpp
@@ -45,18 +45,19 @@ Test_Var_Array::opname (void) const
 }
 
 void
-Test_Var_Array::dii_req_invoke (CORBA::Request *req,
-                                CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Array::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Var_Array::init_parameters (Param_Test_ptr ,
-                                 CORBA::Environment &)
+Test_Var_Array::init_parameters (Param_Test_ptr objref,
+                                 CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
 
   // fill the in_ array
   for (CORBA::ULong i=0; i < Param_Test::DIM2; i++)
@@ -80,20 +81,20 @@ Test_Var_Array::reset_parameters (void)
 
 int
 Test_Var_Array::run_sii_test (Param_Test_ptr objref,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Environment &env)
 {
   Param_Test::Var_Array_out out_arr (this->out_.out ());
   this->ret_ = objref->test_var_array (this->in_,
                                        this->inout_,
                                        out_arr,
-                                       ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                       env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Var_Array::add_args (CORBA::NVList_ptr param_list,
 			  CORBA::NVList_ptr retval,
-			  CORBA::Environment &ACE_TRY_ENV)
+			  CORBA::Environment &env)
 {
   // We provide the top level memory
   // the Any does not own any of these
@@ -113,23 +114,23 @@ Test_Var_Array::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("v1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("v2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("v3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value type
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Var_Array,
-                                                    this->ret_.in (),
-                                                    0, // does not own
-                                                    ACE_TRY_ENV);
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Var_Array,
+                                            this->ret_.in (),
+                                            0, // does not own
+                                            env);
   return 0;
 }
 
@@ -145,8 +146,9 @@ Test_Var_Array::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Var_Array::check_validity (CORBA::Request_ptr )
+Test_Var_Array::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h
index 64c362f1d61..1f301485220 100644
--- a/TAO/tests/Param_Test/var_array.h
+++ b/TAO/tests/Param_Test/var_array.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *,CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 25ea7fccd89..d1251ab4b7d 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -48,18 +48,20 @@ Test_Var_Struct::opname (void) const
 }
 
 void
-Test_Var_Struct::dii_req_invoke (CORBA::Request *req,
-                                 CORBA::Environment &ACE_TRY_ENV)
+Test_Var_Struct::dii_req_invoke (CORBA::Request *req)
 {
-  req->invoke (ACE_TRY_ENV);
+  req->invoke ();
 }
 
 int
-Test_Var_Struct::init_parameters (Param_Test_ptr ,
-                                  CORBA::Environment &)
+Test_Var_Struct::init_parameters (Param_Test_ptr objref,
+                                  CORBA::Environment &env)
 {
   Generator *gen = GENERATOR::instance (); // value generator
 
+  ACE_UNUSED_ARG (objref);
+  ACE_UNUSED_ARG (env);
+
   // get some sequence length (not more than 10)
   CORBA::ULong len = (CORBA::ULong) (gen->gen_long () % 10) + 1;
 
@@ -89,20 +91,20 @@ Test_Var_Struct::reset_parameters (void)
 
 int
 Test_Var_Struct::run_sii_test (Param_Test_ptr objref,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA::Environment &env)
 {
   Param_Test::Var_Struct_out out (this->out_.out ());
   this->ret_ = objref->test_var_struct (this->in_,
                                         this->inout_.inout (),
                                         out,
-                                        ACE_TRY_ENV);
-  return (ACE_TRY_ENV.exception () ? -1:0);
+                                        env);
+  return (env.exception () ? -1:0);
 }
 
 int
 Test_Var_Struct::add_args (CORBA::NVList_ptr param_list,
 			   CORBA::NVList_ptr retval,
-			   CORBA::Environment &ACE_TRY_ENV)
+			   CORBA::Environment &env)
 {
   CORBA::Any in_arg (Param_Test::_tc_Var_Struct,
                     &this->in_,
@@ -120,23 +122,23 @@ Test_Var_Struct::add_args (CORBA::NVList_ptr param_list,
   param_list->add_value ("s1",
                          in_arg,
                          CORBA::ARG_IN,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s2",
                          inout_arg,
                          CORBA::ARG_INOUT,
-                         ACE_TRY_ENV);
+                         env);
 
   param_list->add_value ("s3",
                          out_arg,
                          CORBA::ARG_OUT,
-                         ACE_TRY_ENV);
+                         env);
 
   // add return value
-  retval->item (0, ACE_TRY_ENV)->value ()->replace (Param_Test::_tc_Var_Struct,
+  retval->item (0, env)->value ()->replace (Param_Test::_tc_Var_Struct,
                                             &this->ret_.inout (), // see above
                                             0, // does not own
-                                            ACE_TRY_ENV);
+                                            env);
   return 0;
 }
 
@@ -170,8 +172,9 @@ Test_Var_Struct::check_validity (void)
 }
 
 CORBA::Boolean
-Test_Var_Struct::check_validity (CORBA::Request_ptr )
+Test_Var_Struct::check_validity (CORBA::Request_ptr req)
 {
+  ACE_UNUSED_ARG (req);
   return this->check_validity ();
 }
 
diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h
index b28e8d59bb8..b4c15f33bfa 100644
--- a/TAO/tests/Param_Test/var_struct.h
+++ b/TAO/tests/Param_Test/var_struct.h
@@ -61,7 +61,7 @@ public:
   void print_values (void);
   // print all the values
 
-  void dii_req_invoke (CORBA::Request *, CORBA::Environment &);
+  void dii_req_invoke (CORBA::Request *);
   // invoke DII request with appropriate exception handling.
 
 private:
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/utils/IOR-parser/Makefile b/TAO/utils/IOR-parser/Makefile
index 4f2a6e17b54..62087418798 100644
--- a/TAO/utils/IOR-parser/Makefile
+++ b/TAO/utils/IOR-parser/Makefile
@@ -12,10 +12,15 @@ BIN   	= ior-parser
 
 FILES  	= ior-handler
 
+LIBNAME  = libIOR
+LIB      = $(LIBNAME).a
+SHLIB    = $(LIBNAME).$(SOEXT)
+
 SRC   	= $(addsuffix .cpp,$(FILES))
+LSRC	= $(addsuffix .cpp,$(FILES))
 OBJ	= $(addsuffix .o,$(FILES))
 
-BUILD	= $(VBIN)
+#BUILD	= $(VBIN)
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -25,6 +30,7 @@ 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
 
@@ -41,6 +47,29 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/ior-handler.o .obj/ior-handler.so .shobj/ior-handler.o .shobj/ior-handler.so: ior-handler.cpp ior-handler.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/ior-handler.o .obj/ior-handler.so .shobj/ior-handler.o .shobj/ior-handler.so: ior-handler.cpp ior-handler.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/TAO/utils/catior/Makefile b/TAO/utils/catior/Makefile
index 4ae1d4e7ce2..6fb7bc31eec 100644
--- a/TAO/utils/catior/Makefile
+++ b/TAO/utils/catior/Makefile
@@ -49,6 +49,9 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -113,85 +116,79 @@ include $(TAO_ROOT)/taoconfig.mk
  $(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/Services.i \
  $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
  $(TAO_ROOT)/tao/CDR.h \
+ $(TAO_ROOT)/tao/Marshal.h \
  $(TAO_ROOT)/tao/Typecode.h \
  $(TAO_ROOT)/tao/Typecode.i \
+ $(TAO_ROOT)/tao/Marshal.i \
  $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object.i \
  $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
  $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.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/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/Sequence_T.h \
+ $(TAO_ROOT)/tao/Sequence_T.i \
+ $(TAO_ROOT)/tao/Sequence_T.cpp \
  $(TAO_ROOT)/tao/GIOP.i \
+ $(TAO_ROOT)/tao/Object.h \
+ $(TAO_ROOT)/tao/Object.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 \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
  $(TAO_ROOT)/tao/PolicyC.h \
+ $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
  $(TAO_ROOT)/tao/POA.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/POAC.h \
  $(TAO_ROOT)/tao/POAC.i \
  $(TAO_ROOT)/tao/Servant_Base.h \
@@ -200,31 +197,22 @@ include $(TAO_ROOT)/taoconfig.mk
  $(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/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/Active_Object_Map.i \
+ $(TAO_ROOT)/tao/POA.i \
+ $(TAO_ROOT)/tao/poa_macros.h \
+ $(TAO_ROOT)/tao/Stub.h \
+ $(TAO_ROOT)/tao/Pluggable.h \
+ $(TAO_ROOT)/tao/MProfile.h \
+ $(TAO_ROOT)/tao/Stub.i \
+ $(TAO_ROOT)/tao/params.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(TAO_ROOT)/tao/params.i \
+ $(TAO_ROOT)/tao/ORB_Core.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies.i \
@@ -246,8 +234,11 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Message_Queue_T.cpp \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(TAO_ROOT)/tao/Connect.h \
- $(ACE_ROOT)/ace/Acceptor.h \
+ $(TAO_ROOT)/tao/IIOP_Connector.h \
+ $(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/Svc_Handler.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Task.i \
@@ -264,66 +255,39 @@ include $(TAO_ROOT)/taoconfig.mk
  $(ACE_ROOT)/ace/Svc_Handler.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/Connect.h \
+ $(ACE_ROOT)/ace/Acceptor.h \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
  $(TAO_ROOT)/tao/Connect.i \
- $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
- $(TAO_ROOT)/tao/Active_Object_Map.i \
- $(TAO_ROOT)/tao/POAManager.h \
- $(TAO_ROOT)/tao/poa_macros.h \
- $(TAO_ROOT)/tao/POAManager.i \
- $(TAO_ROOT)/tao/Object_Adapter.h \
- $(TAO_ROOT)/tao/Object_Adapter.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/Stub.i \
- $(TAO_ROOT)/tao/ORB_Core.h \
- $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Resource_Factory.h \
- $(TAO_ROOT)/tao/IIOP_Connector.h \
- $(ACE_ROOT)/ace/Connector.h \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(TAO_ROOT)/tao/IIOP_Acceptor.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/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
+ $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(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/IIOP_Profile.h \
- $(TAO_ROOT)/tao/IIOP_Profile.i
+ $(TAO_ROOT)/tao/IIOP_Profile.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index f4445db7a82..b717e41c1d2 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -70,7 +70,7 @@ catiiop (CORBA::String string,
 
   if (cp == 0)
     {
-      env.exception (new CORBA_DATA_CONVERSION ());
+      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -88,7 +88,7 @@ catiiop (CORBA::String string,
 
   if (cp == 0)
     {
-      env.exception (new CORBA_DATA_CONVERSION ());
+      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
       CORBA::string_free (hostname);
       return 0;
     }
@@ -122,8 +122,8 @@ catior (CORBA::String str,
   // resulting data.
 
   ACE_Message_Block mb (ACE_OS::strlen ((char *) str)  / 2 + 1
-                        + ACE_CDR::MAX_ALIGNMENT);
-  ACE_CDR::mb_align (&mb);
+                        + CDR::MAX_ALIGNMENT);
+  CDR::mb_align (&mb);
 
   char *buffer = mb.rd_ptr ();
   char *tmp = (char *) str;
@@ -201,6 +201,7 @@ catior (CORBA::String str,
   // we unmarshal objrefs.
 
   CORBA::ULong profiles = 0;
+  // IIOP_Object *objdata = 0;
 
   continue_decoding = stream.read_ulong (profiles);
 
@@ -401,7 +402,7 @@ catpoop (CORBA::String string,
 
   if (cp == 0)
     {
-      env.exception (new CORBA_DATA_CONVERSION ());
+      env.exception (new CORBA_DATA_CONVERSION (CORBA::COMPLETED_NO));
       return 0;
     }
 
@@ -509,7 +510,7 @@ main (int argc, char *argv[])
   CORBA::Environment env;
   CORBA::ORB_var orb_var =  CORBA::ORB_init (argc, argv, "TAO", env);
   CORBA::Boolean b;
-  int opt;
+  char opt;
 
   while ((opt = get_opt ()) != EOF)
     {
@@ -545,7 +546,7 @@ main (int argc, char *argv[])
             while (!ifstr.eof ())
               {
                 ifstr.get (ch);
-                if (ch == '\n' || ifstr.eof ())
+                if (ch == '\n' || ch == EOF)
                   break;
                 aString += ch;
               }
@@ -595,7 +596,7 @@ main (int argc, char *argv[])
                 b = catpoop (str, env);
               }
             else
-              ACE_ERROR_RETURN ((LM_ERROR,
+              ACE_ERROR_RETURN ((LM_DEBUG,
                                  "Don't know how to decode this IOR\n"),
                                 -1);
             if (b == 1)
diff --git a/VERSION b/VERSION
index 10b71a7e265..0723a7c4487 100644
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
-This is ACE version 4.6.40, released Sat May 22 16:36:14 1999.
+This is ACE version 4.6.22, released Mon Feb 15 13:17:15 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
-found in the file PROBLEM-REPORT-FORM.  To ensure that you see responses,
+found in the file BUG-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
diff --git a/WindozeCE/WindozeCE.h b/WindozeCE/WindozeCE.h
index ba860d6a0ee..0252c250b3e 100644
--- a/WindozeCE/WindozeCE.h
+++ b/WindozeCE/WindozeCE.h
@@ -14,7 +14,6 @@
 #endif
 
 #include "resource.h"		// main symbols
-#include "ace/OS.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CWindozeCEApp:
@@ -40,8 +39,6 @@ public:
 		//    DO NOT EDIT what you see in these blocks of generated code !
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
-          private:
-            ACE_Object_Manager obj_mgr_;
 };
 
 
diff --git a/WindozeCE/WindozeCEDlg.cpp b/WindozeCE/WindozeCEDlg.cpp
index 8a9e03358a1..63489881d79 100644
--- a/WindozeCE/WindozeCEDlg.cpp
+++ b/WindozeCE/WindozeCEDlg.cpp
@@ -5,7 +5,7 @@
 #include "stdafx.h"
 #include "WindozeCE.h"
 #include "WindozeCEDlg.h"
-#include "ace/ARGV.h"
+#include "ace/ARGV.h" 
 #include "ACEApp.h"
 
 #ifdef _DEBUG
@@ -47,8 +47,8 @@ UINT worker (void * arg)
   //     }
   //   return 0;
 }
-
-
+                 
+  
 /////////////////////////////////////////////////////////////////////////////
 // CWindozeCEDlg dialog
 
@@ -88,18 +88,18 @@ BEGIN_MESSAGE_MAP(CWindozeCEDlg, CDialog)
   //  when the application's main window is not a dialog
   SetIcon(m_hIcon, TRUE);			// Set big icon
   SetIcon(m_hIcon, FALSE);		// Set small icon
-
-  this->SetDlgItemText (IDC_PROGRAM_OUTPUT,
+	
+  this->SetDlgItemText (IDC_PROGRAM_OUTPUT, 
                         TEXT ("Fill in the command line arguments you want to pass to the program below:"));
   CenterWindow(GetDesktopWindow());	// center to the hpc screen
 
-  this->ace.set_window (this->m_hWnd, NC_ACE_NOTIFY, INC_ACE_LOGMSG);
+  this->ace.set_window (this, NC_ACE_NOTIFY, INC_ACE_LOGMSG);
   this->ace.set_self_default ();
   host_window_ = this;
   return TRUE;  // return TRUE  unless you set the focus to a control
 }
 
-BOOL CWindozeCEDlg::OnCommand(WPARAM wParam, LPARAM lParam)
+BOOL CWindozeCEDlg::OnCommand(WPARAM wParam, LPARAM lParam) 
 {
   static BOOL got_cmd = FALSE;
   int notify = HIBYTE (wParam);
@@ -107,7 +107,8 @@ BOOL CWindozeCEDlg::OnCommand(WPARAM wParam, LPARAM lParam)
 
   if (notify == NC_ACE_NOTIFY && id == INC_ACE_LOGMSG)
     {
-      LPTSTR head = (LPTSTR) lParam ;
+      CString *msg = (CString *) lParam ;
+      LPTSTR head = (LPTSTR) ((LPCTSTR) *msg);
       CString newbuf;
 
       LPTSTR newline;
@@ -121,26 +122,26 @@ BOOL CWindozeCEDlg::OnCommand(WPARAM wParam, LPARAM lParam)
         }
 
       newbuf += head;
-
+      
       CEdit *editor = (CEdit *) GetDlgItem (IDC_PROGRAM_OUTPUT);
       editor -> ReplaceSel (newbuf);
 
-      ACE_OS::free (head);
+      delete msg;
       return TRUE;
     }
   return CDialog::OnCommand(wParam, lParam);
 }
 
-void CWindozeCEDlg::OnTimer(UINT nIDEvent)
+void CWindozeCEDlg::OnTimer(UINT nIDEvent) 
 {
   //   CWnd *text = this->GetDlgItem (IDC_TEXT_DISP);
   //   text->ModifyStyle (WS_VISIBLE, SS_CENTER, 0);
   //   this->UpdateWindow ();
-
+	
   CDialog::OnTimer(nIDEvent);
 }
 
-void CWindozeCEDlg::OnStart()
+void CWindozeCEDlg::OnStart() 
 {
   static BOOL once = FALSE;
 
diff --git a/acconfig.h b/acconfig.h
index 51d5b84cc84..2e1d49a341b 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -42,8 +42,8 @@
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
 
-/* Some platforms require _GNU_SOURCE to be defined to make some function
-   prototypes "visible." */
+/* Some platforms require _GNU_SOURCE to be defined to make some functions
+   declaration "visible." */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
@@ -114,28 +114,28 @@
 
 /* Cray specific configuration parameters */
 /*
- *  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.  
- *
- *  _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, ...)
- *  or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203,
- *  being run on an MPP machine.
- *
- *  Summary:
- *
- *  _CRAYMPP  (defined only if running on MPP machine, e.g. T3E, UNICOS/mk)
- *  _CRAYT3E  (defined specifically if compiling on a Cray T3E)
- *  _UNICOS   (defined if running UNICOS or UNICOS/mk)
- *
- *  Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10
- *
- *  Contributed by Doug Anderson <doug "at" clark.net>
- */
+    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.  
+
+    _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, ...)
+    or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203,
+    being run on an MPP machine.
+
+    Summary:
+
+    _CRAYMPP  (defined only if running on MPP machine, e.g. T3E, UNICOS/mk)
+    _CRAYT3E  (defined specifically if compiling on a Cray T3E)
+    _UNICOS   (defined if running UNICOS or UNICOS/mk)
+
+    Tested on UNICOS 10.0.0.2, UNICOS/mk 2.0.3.10
+
+    Contributed by Doug Anderson <doug@clark.net>
+*/
 #undef _CRAYMPP
 #undef _CRAYT3E
 #undef _UNICOS
@@ -238,13 +238,16 @@
 
 /* typedef for ACE_UINT64 */
 /*
-   We only make the typedef if ACE_UINT64_TYPEDEF is defined.  Otherwise,
-   let ace/Basic_Types.h do the work for us.
+   We only make the typedef if ACE_UINT64_TYPEDEF is defined and
+   ACE_LACKS_LONGLONG_T isn't defined  .  Otherwise,
+   let ace/Basic_Types.h do the work for us.  ACE_UINT64_TYPEDEF is
+   defined during the initial configuration process if a 64 bit unsigned int
+   was found.
 */
 #undef ACE_UINT64_TYPEDEF
 #if defined(ACE_UINT64_TYPEDEF)
-   typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF && !ACE_DISABLE_AUTOCONF_UINT64 */
+  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
+#endif /* ACE_UINT64_TYPEDEF */
 
 /* Enable ACE inlining */
 #undef __ACE_INLINE__
@@ -352,9 +355,6 @@
    See "ace/OS.h" for details. */
 #undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
 
-/* Platform doesn't cast MAP_FAILED to a (void *). */
-#undef ACE_HAS_BROKEN_MAP_FAILED
-
 /* Compiler/platform doesn't support namespaces (or the support is not fully
    implemented.) */
 #undef ACE_HAS_BROKEN_NAMESPACES
@@ -410,6 +410,9 @@
    prototype. */
 #undef ACE_HAS_BROKEN_SETRLIMIT
 
+/* Platform doesn't define _terrno() even though it should (only for TLI) */
+#undef ACE_HAS_BROKEN_T_ERRNO
+
 /* platform define struct timespec members as ts_sec and ts_nsec instead of
    tv_sec and tv_nsec.  This is highly non-portable.  Currently only
    FreeBSD 2.1.x uses it. */
@@ -428,6 +431,9 @@
 /* Platform has <bytesex.h>. */
 #undef ACE_HAS_BYTESEX_H
 
+/* Platform has <features.h> */
+#undef ACE_HAS_FEATURES_H
+
 /* Platform supports the Win32 CancelIO() function (WinNT 4.0 and beyond). */
 #undef ACE_HAS_CANCEL_IO
 
@@ -503,9 +509,6 @@
 /* Platform supports IP multicast */
 #undef ACE_HAS_IP_MULTICAST
 
-/* Platform supports IPv6 */
-#undef ACE_HAS_IP6
-
 /* Platform supports the very odd IRIX 6.2 threads... */
 #undef ACE_HAS_IRIX62_THREADS
 
@@ -642,6 +645,9 @@
    PTHREAD_PROCESS_SHARED values */
 #undef ACE_HAS_PTHREAD_PROCESS_ENUM
 
+/* Platform has pthread_sigmask() defined. */
+#undef ACE_HAS_PTHREAD_SIGMASK
+
 /* Purify'ing.  Defined on command line. */
 #undef ACE_HAS_PURIFY
 
@@ -801,7 +807,7 @@
 /* Platform supports STREAMS */
 #undef ACE_HAS_STREAMS
 
-/* Platform supports STREAM pipes */
+/* Platform s
 #undef ACE_HAS_STREAM_PIPES
 
 /* Compiler/platform supports strerror () */
@@ -942,7 +948,7 @@
 #undef ACE_HAS_MOSTLY_UNICODE_APIS
 
 /* Compiler supports the C++ typename keyword */
-#undef ACE_HAS_TYPENAME_KEYWORD
+#undef E_HAS_TYPENAME_KEYWORD
 
 /* Compiler supports the new using keyword for C++ namespaces. */
 #undef ACE_HAS_USING_KEYWORD
@@ -1085,9 +1091,6 @@
 /* Platform lacks pthread_mutexattr_setpshared(). */
 #undef ACE_LACKS_MUTEXATTR_PSHARED
 
-/* OS requires non-null status pointer for ::pthread_join () */
-#undef ACE_LACKS_NULL_PTHREAD_STATUS
-
 /* Platform lacks <sys/param.h> (e.g., MVS) */
 #undef ACE_LACKS_PARAM_H
 
@@ -1109,7 +1112,7 @@
    memory and message queues. */
 #undef ACE_LACKS_SOME_POSIX_PROTOTYPES
 
-/* Compiler complains about use of obsolete "#pragma once" */
+/* Compiler complains about "#pragma once" */
 #undef ACE_LACKS_PRAGMA_ONCE
 
 /* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */
@@ -1118,12 +1121,9 @@
 /* Platform lack pthread_attr_setstackaddr() */
 #undef ACE_LACKS_THREAD_STACK_ADDR
 
-/* Platform lacks pthread_cancel() */
+/* Platform lacks pthread_cancel(). */
 #undef ACE_LACKS_PTHREAD_CANCEL
 
-/* Platform lacks pthread_sigmask () */
-#undef ACE_LACKS_PTHREAD_SIGMASK
-
 /* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */
 #undef ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
@@ -1139,9 +1139,6 @@
 /* Platform lacks the readlink() function. */
 #undef ACE_LACKS_READLINK
 
-/* Platform lacks the rename() function. */
-#undef ACE_LACKS_RENAME
-
 /* Platform lacks recvmsg() */
 #undef ACE_LACKS_RECVMSG
 
@@ -1224,9 +1221,6 @@
 /* Platform doesn't have netinet/tcp.h */
 #undef ACE_LACKS_TCP_H
 
-/* OS does not support TCP_NODELAY */
-#undef ACE_LACKS_TCP_NODELAY
-
 /* Platform lacks pthread_attr_setscope() */
 #undef ACE_LACKS_THREAD_PROCESS_SCOPING
 
@@ -1245,14 +1239,6 @@
 /* Platform/compiler lacks the ualarm() prototype (e.g., Solaris) */
 #undef ACE_LACKS_UALARM_PROTOTYPE
 
-/* Compiler does not have any istream operator>> for chars, u_chars, or
-   signed chars. */
-#undef ACE_LACKS_CHAR_RIGHT_SHIFTS
-
-/* Compiler does not have operator>> (istream &, u_char *) or
-   operator>> (istream &, signed char *) */
-#undef ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
-
 /* Platform lacks the ucontext.h file */
 #undef ACE_LACKS_UCONTEXT_H
 
@@ -1305,7 +1291,7 @@
 #undef ACE_NEEDS_REGEXPR_H
 
 /* Platform needs to #include <sched.h> to get thread scheduling defs. */
-#undef ACE_NEEDS_SCHED_H
+#undef ACE_LACKS_SCHED_H
 
 /* <time.h> doesn't automatically #include <sys/time.h> */
 #undef ACE_LACKS_SYSTIME_H
diff --git a/ace-config.1.in b/ace-config.1.in
deleted file mode 100644
index 1b3c0dd5f61..00000000000
--- a/ace-config.1.in
+++ /dev/null
@@ -1,58 +0,0 @@
-.\" Process this file with
-.\" groff -man -Tascii ace-config.1
-.\"
-.TH ace-config 1 "DECEMBER 1998" "Library Configuration" "User Manuals"
-.SH NAME
-ace-config \- Display ACE Library Configuration
-.SH SYNOPSIS
-.B ace-config 
-.I OPTION 
-.B [
-.I OPTION
-.B ... ] 
-.B [
-.I LIBRARY
-.B ]
-.SH DESCRIPTION
-.B ace-config
-is a script that is used to display what compiler flags and libraries were
-used when ACE was built.
-.SH OPTIONS
-.IP --version
-ACE version information
-.IP --help
-display help message and exit
-.IP --cxx
-C++ compiler used for compiling
-.IP --cxxflags
-C++ pre-processor and compiler flags
-.IP --libs
-library linking information
-.IP --libs-only-L
-the -L/-R part of
-.I --libs
-.IP --libs-only-l
-the -l part of 
-.I --libs
-.SH LIBRARY
-.I LIBRARY
-refers to the library for which the specified configuration is desired.  Valid
-libraries are:
-.IP ace
-the ACE library
-.IP netsvcs
-the ACE net services library
-.IP tao
-the ACE ORB (TAO) library
-.SH FILES
-.I @libdir@/aceConf.sh
-.RS
-Additional ACE related library configuration information.
-.RE
-.SH BUGS
-No option to display which C++ compiler was used to compile ACE currently
-exists.
-.SH AUTHOR
-Ossama Othman <othman@cs.wustl.edu>
-.SH "SEE ALSO"
-.BR tao-config (1)
diff --git a/ace-config.in b/ace-config.in
index 25e92e47fef..110e452c943 100644
--- a/ace-config.in
+++ b/ace-config.in
@@ -1,6 +1,4 @@
 #!/bin/sh
-#
-# $Id$
 
 set -e
 
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 5b96172d8e6..9852fcd8386 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
 #define ACE_BUILD_DLL
-#include "ace/ACE.h"
+#include "ace/IPC_SAP.h"
 #include "ace/Handle_Set.h"
+#include "ace/ACE.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/INET_Addr.h"
-#include "ace/Object_Manager.h"
 #include "ace/SString.h"
+#include "ace/Process.h"
+#include "ace/Object_Manager.h"
 #include "ace/Version.h"
 
 #if defined (ACE_LACKS_INLINE_FUNCTIONS)
@@ -15,9 +17,6 @@
 
 ACE_RCSID(ace, ACE, "$Id$")
 
-// Static data members.
-u_int ACE::init_fini_count_ = 0;
-
 // Keeps track of whether we're in some global debug mode.
 char ACE::debug_ = 0;
 
@@ -30,36 +29,16 @@ size_t ACE::pagesize_ = 0;
 // Size of allocation granularity.
 size_t ACE::allocation_granularity_ = 0;
 
-
 int
 ACE::init (void)
 {
-  // Don't use ACE_TRACE, because Object_Manager might not have been
-  // instantiated yet.
-  // ACE_TRACE ("ACE::init");
-
-  ++init_fini_count_;
-
-  return ACE_Object_Manager::instance ()->init ();
+  return ACE_Object_Manager::init ();
 }
 
 int
 ACE::fini (void)
 {
-  ACE_TRACE ("ACE::fini");
-
-  if (init_fini_count_ > 0)
-    {
-      if (--init_fini_count_ == 0)
-        return ACE_Object_Manager::instance ()->fini ();
-      else
-        // Wait for remaining fini () calls.
-        return 1;
-    }
-  else
-    // More ACE::fini () calls than ACE::init () calls.  Bad
-    // application!
-    return -1;
+  return ACE_Object_Manager::fini ();
 }
 
 u_int
@@ -120,6 +99,26 @@ ACE::compiler_beta_version (void)
 #endif
 }
 
+void
+ACE::unique_name (const void *object,
+                  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
+  // uniqueness between other "live" objects in the same process. The
+  // uniqueness of this name is therefore only valid for the life of
+  // <object>.
+  TCHAR temp_name[ACE_UNIQUE_NAME_LEN];
+  ACE_OS::sprintf (temp_name,
+                   ACE_TEXT ("%x%d"),
+                   object,
+                   ACE_OS::getpid ());
+  ACE_OS::strncpy (name,
+                   temp_name,
+                   length);
+}
+
 int
 ACE::terminate_process (pid_t pid)
 {
@@ -241,7 +240,7 @@ ACE::execname (const char *old_name)
                       -1);
       char *end = new_name;
 
-      end = ACE_OS::strecpy (new_name, old_name);
+      end = ACE::strecpy (new_name, old_name);
 
       // Concatenate the .exe suffix onto the end of the executable.
       ACE_OS::strcpy (end, ".exe");
@@ -321,7 +320,7 @@ ACE::execname (const wchar_t *old_name)
                       -1);
       wchar_t *end = new_name;
 
-      end = ACE_OS::strecpy (new_name, old_name);
+      end = ACE::strecpy (new_name, old_name);
 
       // Concatenate the .exe suffix onto the end of the executable.
       ACE_OS::strcpy (end, L".exe");
@@ -570,7 +569,13 @@ ACE::strenvdup (const char *str)
 {
   ACE_TRACE ("ACE::strenvdup");
 
-  return ACE_OS::strenvdup (str);
+  char *temp;
+
+  if (str[0] == '$'
+      && (temp = ACE_OS::getenv (&str[1])) != 0)
+    return ACE_OS::strdup (temp);
+  else
+    return ACE_OS::strdup (str);
 }
 #endif /* ACE_HAS_WINCE */
 
@@ -592,7 +597,6 @@ netsvc.so            netsvc.so + warning   libnetsvc.so
 
 */
 
-#if ! defined (ACE_PSOS_DIAB_MIPS)
 int
 ACE::ldfind (const ASYS_TCHAR filename[],
              ASYS_TCHAR pathname[],
@@ -947,7 +951,6 @@ ACE::open_temp_file (const char *name, int mode, int perm)
     return handle;
 #endif /* ACE_WIN32 */
 }
-#endif /* ! ACE_PSOS_DIAB_MIPS */
 
 const char *
 ACE::basename (const char *pathname, char delim)
@@ -1077,6 +1080,30 @@ ACE::recv (ACE_HANDLE handle, size_t n, ...)
 // Miscellaneous static methods used throughout ACE.
 
 ssize_t
+ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len)
+{
+  ACE_TRACE ("ACE::send_n");
+  size_t bytes_written;
+  ssize_t n;
+
+  for (bytes_written = 0; bytes_written < len; bytes_written += n)
+    {
+      n = ACE::send (handle,
+                     (const char *) buf + bytes_written,
+                     len - bytes_written);
+      if (n == -1)
+        {
+          if (errno == EWOULDBLOCK)
+            n = 0; // Keep trying to send.
+          else
+            return -1;
+        }
+    }
+
+  return bytes_written;
+}
+
+ssize_t
 ACE::send_n (ACE_HANDLE handle,
              const void *buf,
              size_t len,
@@ -1104,6 +1131,35 @@ ACE::send_n (ACE_HANDLE handle,
   return bytes_written;
 }
 
+// Receive <len> bytes into <buf> from <handle> (uses the <write>
+// system call on UNIX and the <WriteFile> call on Win32).
+
+ssize_t
+ACE::write_n (ACE_HANDLE handle,
+              const void *buf,
+              size_t len)
+{
+  ACE_TRACE ("ACE::write_n");
+
+  size_t bytes_written;
+  ssize_t n;
+
+  for (bytes_written = 0; bytes_written < len; bytes_written += n)
+    {
+      n = ACE_OS::write (handle, (const char *) buf + bytes_written,
+                         len - bytes_written);
+      if (n == -1)
+        {
+          if (errno == EWOULDBLOCK)
+            n = 0; // Keep trying to send.
+          else
+            return -1;
+        }
+    }
+
+  return bytes_written;
+}
+
 ssize_t
 ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len)
 {
@@ -1158,6 +1214,39 @@ ACE::recv_n (ACE_HANDLE handle, void *buf, size_t len, int flags)
   return bytes_read;
 }
 
+// Receive <len> bytes into <buf> from <handle> (uses the <read>
+// system call on UNIX and the <ReadFile> call on Win32).
+
+ssize_t
+ACE::read_n (ACE_HANDLE handle,
+             void *buf,
+             size_t len)
+{
+  ACE_TRACE ("ACE::read_n");
+
+  size_t bytes_read;
+  ssize_t n;
+
+  for (bytes_read = 0; bytes_read < len; bytes_read += n)
+    {
+      n = ACE_OS::read (handle,
+                        (char *) buf + bytes_read,
+                        len - bytes_read);
+
+      if (n == -1)
+        {
+          if (errno == EWOULDBLOCK)
+            n = 0; // Keep trying to read.
+          else
+            return -1;
+        }
+      else if (n == 0)
+        break;
+    }
+
+  return bytes_read;
+}
+
 int
 ACE::enter_recv_timedwait (ACE_HANDLE handle,
                            const ACE_Time_Value *timeout,
@@ -1169,17 +1258,6 @@ ACE::enter_recv_timedwait (ACE_HANDLE handle,
   if (timeout == 0)
     return 0;
 
-#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-  struct pollfd fds;
-
-  fds.fd = handle;
-  fds.events = POLLIN;
-  fds.revents = 0;
-
-  int a = ACE_OS::poll (&fds, 1, *timeout);
-
-#else
   ACE_Handle_Set handle_set;
   handle_set.set_bit (handle);
 
@@ -1189,8 +1267,6 @@ ACE::enter_recv_timedwait (ACE_HANDLE handle,
                           (fd_set *) 0, // write_fds.
                           (fd_set *) 0, // exception_fds.
                           timeout);
-#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
-
    switch ( a )
    {
    case 0:  // Timer expired.  return -1
@@ -1246,17 +1322,6 @@ ACE::enter_send_timedwait (ACE_HANDLE handle,
   if (timeout==0)
     return 0;
 
-#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-  struct pollfd fds;
-
-  fds.fd = handle;
-  fds.events = POLLOUT;
-  fds.revents = 0;
-
-  int a = ACE_OS::poll (&fds, 1, *timeout);
-
-#else
   ACE_Handle_Set handle_set;
   handle_set.set_bit (handle);
 
@@ -1269,8 +1334,6 @@ ACE::enter_send_timedwait (ACE_HANDLE handle,
                           (fd_set *) handle_set,
                           (fd_set *) 0,
                           timeout);
-#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
-
    switch ( a )
    {
    case 0: // Timer expired.
@@ -1678,29 +1741,16 @@ ACE::handle_timed_complete (ACE_HANDLE h,
                             int is_tli)
 {
   ACE_TRACE ("ACE::handle_timed_complete");
-
-#if !defined (ACE_WIN32) && defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-  struct pollfd fds;
-
-  fds.fd = h;
-  fds.events = POLLIN | POLLOUT;
-  fds.revents = 0;
-
-#else
   ACE_Handle_Set rd_handles;
   ACE_Handle_Set wr_handles;
-
-  rd_handles.set_bit (h);
-  wr_handles.set_bit (h);
-#endif /* !ACE_WIN32 && ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
+  int need_to_check;
 
 #if defined (ACE_WIN32)
   ACE_Handle_Set ex_handles;
   ex_handles.set_bit (h);
 #endif /* ACE_WIN32 */
-
-  int need_to_check;
+  rd_handles.set_bit (h);
+  wr_handles.set_bit (h);
 
 #if defined (ACE_WIN32)
   int n = ACE_OS::select (int (h) + 1,
@@ -1709,17 +1759,11 @@ ACE::handle_timed_complete (ACE_HANDLE h,
                           ex_handles,
                           timeout);
 #else
-# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-  int n = ACE_OS::poll (&fds, 1, timeout);
-
-# else
   int n = ACE_OS::select (int (h) + 1,
                           rd_handles,
                           wr_handles,
                           0,
                           timeout);
-# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
 #endif /* ACE_WIN32 */
 
   // If we failed to connect within the time period allocated by the
@@ -1746,24 +1790,14 @@ ACE::handle_timed_complete (ACE_HANDLE h,
   need_to_check = 1;
 #else
   if (is_tli)
-
-# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-    need_to_check = (fds.revents & POLLIN) && !(fds.revents & POLLOUT);
-# else
     need_to_check = rd_handles.is_set (h) && !wr_handles.is_set (h);
-# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
-
   else
 #if defined(AIX)
     // AIX is broken... both success and failed connect will set the
     // write handle only, so always check.
     need_to_check = 1;
 #else
-# if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-    need_to_check = (fds.revents & POLLIN);
-# else
     need_to_check = rd_handles.is_set (h);
-# endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
 #endif /* AIX */
 #endif /* ACE_WIN32 */
 
@@ -1835,35 +1869,17 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
   if (listener == ACE_INVALID_HANDLE)
     return -1;
 
-#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-  struct pollfd fds;
-
-  fds.fd = listener;
-  fds.events = POLLIN;
-  fds.revents = 0;
-
-#else
   // Use the select() implementation rather than poll().
   ACE_Handle_Set rd_handle;
   rd_handle.set_bit (listener);
-#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
 
   // We need a loop here if <restart> is enabled.
 
   for (;;)
     {
-#if defined (ACE_HAS_POLL) && defined (ACE_HAS_LIMITED_SELECT)
-
-      int n = ACE_OS::poll (&fds, 1, timeout);
-
-#else
-      int n = ACE_OS::select (int (listener) + 1,
+      switch (ACE_OS::select (int (listener) + 1,
                               rd_handle, 0, 0,
-                              timeout);
-#endif /* ACE_HAS_POLL && ACE_HAS_LIMITED_SELECT */
-
-      switch (n)
+                              timeout))
         {
         case -1:
           if (errno == EINTR && restart)
@@ -1889,7 +1905,7 @@ ACE::handle_timed_accept (ACE_HANDLE listener,
           /* NOTREACHED */
         }
     }
-  ACE_NOTREACHED (return 0);
+  ACE_NOTREACHED(return 0);
 }
 
 // Bind socket to an unused port.
@@ -2039,23 +2055,18 @@ ACE::fork (const char *program_name,
         }
 
       // Parent process waits for child to terminate.
-#if defined (ACE_HAS_UNION_WAIT)
-      union wait status;
-      if (pid < 0 || ACE_OS::waitpid (pid, &(status.w_status), 0) < 0)
-#else
       int status;
       if (pid < 0 || ACE_OS::waitpid (pid, &status, 0) < 0)
-#endif /* ACE_HAS_UNION_WAIT */
         return -1;
 
       // child terminated by calling exit()?
-      if (WIFEXITED ((status)))
+      if (WIFEXITED (status))
         {
           // child terminated normally?
-          if (WEXITSTATUS ((status)) == 0)
+          if (WEXITSTATUS (status) == 0)
             return 1;
           else
-            errno = WEXITSTATUS ((status));
+            errno = WEXITSTATUS (status);
         }
       else
         // child didn't call exit(); perhaps it received a signal?
@@ -2157,7 +2168,7 @@ int
 ACE::set_flags (ACE_HANDLE handle, int flags)
 {
   ACE_TRACE ("ACE::set_flags");
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+#if defined (ACE_WIN32) || defined (ACE_LACKS_FCNTL)
   switch (flags)
     {
     case ACE_NONBLOCK:
@@ -2193,7 +2204,7 @@ ACE::clr_flags (ACE_HANDLE handle, int flags)
 {
   ACE_TRACE ("ACE::clr_flags");
 
-#if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_LACKS_FCNTL)
+#if defined (ACE_WIN32) || defined (ACE_LACKS_FCNTL)
   switch (flags)
     {
     case ACE_NONBLOCK:
@@ -2765,12 +2776,7 @@ ACE::get_bcast_addr (ACE_UINT32 &bcast_addr,
 
   // Get interface structure and initialize the addresses using UNIX
   // techniques
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
-  if (ACE_OS::ioctl (s, cmd, (char *) &ifc) == -1)
+  if (ACE_OS::ioctl (s, SIOCGIFCONF, (char *) &ifc) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("%p\n"),
                        ASYS_TEXT ("ACE::get_bcast_addr:")
@@ -2957,13 +2963,8 @@ ACE::count_interfaces (ACE_HANDLE handle,
   ifcfg.ifc_req = p_ifs;
   ifcfg.ifc_len = ifreq_size;
 
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
   if (ACE_OS::ioctl (handle,
-                     cmd,
+                     SIOCGIFCONF,
                      (caddr_t) &ifcfg) == -1)
     {
       ACE_OS::free (ifcfg.ifc_req);
@@ -3117,12 +3118,12 @@ ACE::get_ip_interfaces (size_t &count,
 
       lpii = &info[i];
       if (!(lpii->iiFlags & IFF_UP))
-        continue;
+	  continue;
 
       // We assume IPv4 addresses here
       addrp = ACE_reinterpret_cast(struct sockaddr_in *, &(lpii->iiAddress));
       if (addrp->sin_addr.s_addr == INADDR_ANY)
-        continue;
+	  continue;
 
       // Set the address for the caller.
       addrs[count].set(addrp, sizeof(lpii->iiAddress));
@@ -3257,13 +3258,8 @@ ACE::get_ip_interfaces (size_t &count,
   ifcfg.ifc_req = p_ifs.get ();
   ifcfg.ifc_len = num_ifs * sizeof (struct ifreq);
 
-#if defined (AIX)
-  int cmd = CSIOCGIFCONF;
-#else
-  int cmd = SIOCGIFCONF;
-#endif /* AIX */
   if (ACE_OS::ioctl (handle,
-                     cmd,
+                     SIOCGIFCONF,
                      (caddr_t) &ifcfg) == -1)
     {
       ACE_OS::close (handle);
diff --git a/ace/ACE.h b/ace/ACE.h
index ef2f03b2deb..60d0d7417c5 100644
--- a/ace/ACE.h
+++ b/ace/ACE.h
@@ -209,6 +209,14 @@ public:
   // system call).  If <handle> is set to non-blocking mode this call
   // will poll until all <len> bytes are sent.
 
+  static ssize_t send_n (ACE_HANDLE handle,
+                         const void *buf,
+                         size_t len);
+  // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
+  // system call on UNIX and the <ACE_OS::recv> call on Win32).  If
+  // <handle> is set to non-blocking mode this call will poll until
+  // all <len> bytes are sent.
+
   // = Timed <send> operations.
   static ssize_t send (ACE_HANDLE handle,
                        const void *buf,
@@ -339,24 +347,24 @@ public:
   // = File system I/O functions.
 
   // These encapsulate differences between UNIX and Win32 and also
-  // send and recv exactly n bytes.  The definitions have been moved
-  // to ACE_OS; these remain for backward compatiblity.
-
-  static ssize_t send_n (ACE_HANDLE handle,
-                         const void *buf,
-                         size_t len);
-  // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
-  // system call on UNIX and the <ACE_OS::recv> call on Win32).  If
-  // <handle> is set to non-blocking mode this call will poll until
-  // all <len> bytes are sent.
+  // send and recv exactly n bytes.
 
   static ssize_t read_n (ACE_HANDLE handle,
                          void *buf,
                          size_t len);
+  // Receive <len> bytes into <buf> from <handle> (uses the
+  // <ACE_OS::read> call, which uses the <read> system call on UNIX
+  // and the <ReadFile> call on Win32).  If <handle> is set to
+  // non-blocking mode this call will poll until all <len> bytes are
+  // received.
 
   static ssize_t write_n (ACE_HANDLE handle,
                           const void *buf,
                           size_t len);
+  // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
+  // calls, which is uses the <write> system call on UNIX and the
+  // <WriteFile> call on Win32).  If <handle> is set to non-blocking
+  // mode this call will poll until all <len> bytes are sent.
 
   // = Socket connection establishment calls.
 
@@ -444,7 +452,7 @@ public:
   // Return a dynamically allocated duplicate of <str>, substituting
   // the environment variable if <str[0] == '$'>.  Note that the
   // pointer is allocated with <ACE_OS::malloc> and must be freed by
-  // <ACE_OS::free>.
+  // <ACE_OS::free>
 #endif /* ACE_HAS_WINCE */
 
   static char *strecpy (char *des, const char *src);
@@ -690,11 +698,6 @@ private:
   // Cleanup after the <send> operation (e.g., restore the appropriate
   // non-blocking status of <handle>).
 
-  static u_int init_fini_count_;
-  // Counter to match init ()/fini () calls.  init () must increment
-  // it; fini () must decrement it.  fini () then does nothing until
-  // it reaches 0.
-
   static size_t pagesize_;
   // Size of a VM page.
 
diff --git a/ace/ACE.i b/ace/ACE.i
index 03a43c35cd2..224cdbdd706 100644
--- a/ace/ACE.i
+++ b/ace/ACE.i
@@ -1,33 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
 
-// Wrappers for methods that have been moved to ACE_OS.
-
-ASYS_INLINE ssize_t
-ACE::read_n (ACE_HANDLE handle,
-             void *buf,
-             size_t len)
-{
-  ACE_TRACE ("ACE::read_n");
-  return ACE_OS::read_n (handle, buf, len);
-}
-
-ASYS_INLINE ssize_t
-ACE::send_n (ACE_HANDLE handle, const void *buf, size_t len)
-{
-  ACE_TRACE ("ACE::send_n");
-  return ACE_OS::send_n (handle, buf, len);
-}
-
-ASYS_INLINE ssize_t
-ACE::write_n (ACE_HANDLE handle,
-              const void *buf,
-              size_t len)
-{
-  ACE_TRACE ("ACE::write_n");
-  return ACE_OS::write_n (handle, buf, len);
-}
-
 // Miscellaneous static methods used throughout ACE.
 
 ASYS_INLINE ssize_t
@@ -35,7 +8,7 @@ ACE::send (ACE_HANDLE handle, const void *buf, size_t len)
 {
   ACE_TRACE ("ACE::send");
 
-#if defined (ACE_WIN32) || defined (ACE_PSOS)
+#if defined (ACE_WIN32)
   return ACE_OS::send (handle, (const char *) buf, len);
 #else
   return ACE_OS::write (handle, (const char *) buf, len);
@@ -53,7 +26,7 @@ ASYS_INLINE ssize_t
 ACE::recv (ACE_HANDLE handle, void *buf, size_t len)
 {
   ACE_TRACE ("ACE::recv");
-#if defined (ACE_WIN32) || defined (ACE_PSOS)
+#if defined (ACE_WIN32)
     return ACE_OS::recv (handle, (char *) buf, len);
 #else
     return ACE_OS::read (handle, (char *) buf, len);
@@ -71,24 +44,30 @@ ACE::recv (ACE_HANDLE handle, void *buf, size_t len, int flags)
 ASYS_INLINE char *
 ACE::strecpy (char *s, const char *t)
 {
-  return ACE_OS::strecpy (s, t);
+  ACE_TRACE ("ACE::strecpy");
+  register char *dscan = s;
+  register const char *sscan = t;
+
+  while ((*dscan++ = *sscan++) != '\0')
+    continue;
+
+  return dscan;
 }
 
 #if defined (ACE_HAS_UNICODE)
 ASYS_INLINE wchar_t *
 ACE::strecpy (wchar_t *s, const wchar_t *t)
 {
-  return ACE_OS::strecpy (s, t);
-}
-#endif /* ACE_HAS_UNICODE */
+  ACE_TRACE ("ACE::strecpy");
+  register wchar_t *dscan = s;
+  register const wchar_t *sscan = t;
 
-ASYS_INLINE void
-ACE::unique_name (const void *object,
-                  LPTSTR name,
-                  size_t length)
-{
-  ACE_OS::unique_name (object, name, length);
+  while ((*dscan++ = *sscan++) != '\0')
+    continue;
+
+  return dscan;
 }
+#endif /* ACE_HAS_UNICODE */
 
 // Return flags currently associated with handle.
 
@@ -121,13 +100,13 @@ ACE::log2 (u_long num)
   return log;
 }
 
-ASYS_INLINE char
+ASYS_INLINE char 
 ACE::nibble2hex (u_int n)
 {
   return ACE::hex_chars_[n & 0x0f];
 }
 
-ASYS_INLINE u_char
+ASYS_INLINE u_char 
 ACE::hex2byte (char c)
 {
   if (isdigit (c))
diff --git a/ace/ARGV.cpp b/ace/ARGV.cpp
index 73460c87b44..a16fcb61a12 100644
--- a/ace/ARGV.cpp
+++ b/ace/ARGV.cpp
@@ -40,16 +40,186 @@ ACE_ARGV::string_to_argv (void)
 {
   ACE_TRACE ("ACE_ARGV::string_to_argv");
 
-  return ACE_OS::string_to_argv (this->buf_,
-                                 this->argc_,
-                                 this->argv_,
-                                 this->substitute_env_args_);
+  // Reset the number of arguments
+  this->argc_ = 0;
+  
+  if (this->buf_ == 0)
+    return -1;
+
+ ASYS_TCHAR *cp = this->buf_;
+
+ // First pass: count arguments.
+
+ // '#' is the start-comment token..
+ while (*cp != '\0' && *cp != '#')
+   {
+     // Skip whitespace..
+     while (ACE_OS::ace_isspace (*cp))
+       cp++;
+     
+     // Increment count and move to next whitespace..
+     if (*cp != '\0')
+       this->argc_++;
+     
+     // Grok quotes....
+     if (*cp == '\'' || *cp == '"')
+       {
+	 ASYS_TCHAR quote = *cp;
+	 
+	 // Scan past the string..
+	 for (cp++; *cp != '\0' && *cp != quote; cp++)
+	   continue;
+
+	 // '\0' implies unmatched quote..
+	 if (*cp == '\0')
+	   {
+	     ACE_ERROR ((LM_ERROR, 
+			 ASYS_TEXT ("unmatched %c detected\n"), quote));
+	     this->argc_--;
+	     break;
+	   } 
+	 else 
+	   cp++;
+       }
+     else // Skip over non-whitespace....
+       while (*cp != '\0' && !ACE_OS::ace_isspace (*cp))
+	 cp++;
+   }
+ 
+ // Second pass: copy arguments.
+ ASYS_TCHAR arg[ACE_DEFAULT_ARGV_BUFSIZ];
+ ASYS_TCHAR *argp = arg;
+ 
+ // Make sure that the buffer we're copying into is always large
+ // enough.
+ if (cp - this->buf_ >= ACE_DEFAULT_ARGV_BUFSIZ)
+   ACE_NEW_RETURN (argp,
+                   ASYS_TCHAR[cp - this->buf_ + 1],
+                   -1);
+
+ // Make a new argv vector of argc + 1 elements.
+ ACE_NEW_RETURN (this->argv_,
+                 ASYS_TCHAR *[this->argc_ + 1],
+                 -1);
+ 
+ ASYS_TCHAR *ptr = this->buf_;
+
+ for (size_t i = 0; i < this->argc_; i++)
+   {
+     // Skip whitespace..
+     while (ACE_OS::ace_isspace (*ptr))
+       ptr++;
+     
+     // Copy next argument and move to next whitespace..
+     if (*ptr == '\'' || *ptr == '"')
+       {
+	 ASYS_TCHAR quote = *ptr++;
+	 
+	 for (cp = argp;
+	      *ptr != '\0' && *ptr != quote; 
+	      ptr++, cp++)
+           {
+             // @@ We can probably remove this since we ensure it's
+             // big enough earlier!
+             ACE_ASSERT (unsigned (cp - argp) < ACE_DEFAULT_ARGV_BUFSIZ);
+	     *cp = *ptr;
+           }
+	 
+	 *cp = '\0';
+	 if (*ptr == quote)
+	   ptr++;
+       }
+     else
+       {
+	 for (cp = arg; 
+	      *ptr && !ACE_OS::ace_isspace (*ptr); 
+	      ptr++, cp++)
+           {
+             // @@ We can probably remove this since we ensure it's
+             // big enough earlier!
+             ACE_ASSERT (unsigned (cp - argp) < ACE_DEFAULT_ARGV_BUFSIZ);
+	     *cp = *ptr;
+           }
+
+	 *cp = '\0';
+       }
+     
+     // Check for environment variable substitution here.
+#if !defined (ACE_HAS_WINCE)
+     // WinCE doesn't have environment variables so we just skip it.
+     if (this->substitute_env_args_)
+       ACE_ALLOCATOR_RETURN (this->argv_[i],
+                             ACE::strenvdup (arg),
+                             -1);
+     else
+#endif /* !ACE_HAS_WINCE */
+       ACE_ALLOCATOR_RETURN (this->argv_[i], 
+                             ACE_OS::strdup (arg),
+                             -1);
+   }
+ 
+ if (argp != arg)
+   delete [] argp;
+
+ this->argv_[this->argc_] = 0;
+
+ return 0;
 }
 
 int
-ACE_ARGV::argv_to_string (ASYS_TCHAR **argv, ASYS_TCHAR *&buf)
+ACE_ARGV::argv_to_string (ASYS_TCHAR **argv,ASYS_TCHAR *&buf)
 {
-  return ACE_OS::argv_to_string (argv, buf);
+  if (argv == 0 || argv[0] == 0)
+    return 0;
+
+  int buf_len = 0;
+  
+  // Determine the length of the buffer.
+
+  for (int i = 0; argv[i] != 0; i++)
+    {
+      ASYS_TCHAR *temp;
+
+      // Account for environment variables.
+      if (this->substitute_env_args_
+	  && (argv[i][0] == '$'
+	  && (temp = ACE_OS::getenv (&argv[i][1])) != 0))
+	buf_len += ACE_OS::strlen (temp);	
+      else
+	buf_len += ACE_OS::strlen (argv[i]);
+
+      // Add one for the extra space between each string.
+      buf_len++;
+    }
+
+  // Step through all argv params and copy each one into buf; separate
+  // each param with white space.
+
+  ACE_NEW_RETURN (buf, ASYS_TCHAR[buf_len + 1],0);
+
+  // initial null charater to make it a null string.
+  buf[0] = '\0';
+  ASYS_TCHAR *end = buf;
+  int j;
+
+  for (j = 0; argv[j] != 0; j++)
+    {
+      ASYS_TCHAR *temp;
+
+      // Account for environment variables.
+      if (this->substitute_env_args_
+	  && (argv[j][0] == '$'
+	  && (temp = ACE_OS::getenv (&argv[j][1])) != 0))
+	end = ACE::strecpy (end, temp);
+      else
+	end = ACE::strecpy (end, argv[j]);
+
+      // Replace the null char that strecpy put there with white space.
+      *(end-1) = ' ';
+    }
+  // Null terminate the string.
+  *end = '\0';
+  return j;// the number of arguments.
 }
 
 ACE_ARGV::ACE_ARGV (const ASYS_TCHAR buf[],
diff --git a/ace/ARGV.h b/ace/ARGV.h
index eb4a9593e47..9edebe6c1e7 100644
--- a/ace/ARGV.h
+++ b/ace/ARGV.h
@@ -33,8 +33,7 @@ class ACE_Export ACE_ARGV
   //     environment variable substitutions if necessary.
 public:
   // = Initialization and termination.
-  ACE_ARGV (const ASYS_TCHAR buf[],
-            int substitute_env_args = 1);
+  ACE_ARGV (const ASYS_TCHAR buf[], int substitute_env_args = 1);
   // Converts <buf> into an <argv>-style vector of strings.  If
   // <substitute_env_args> is enabled then we'll substitute the
   // environment variables for each $ENV encountered in the string.
diff --git a/ace/ARGV.i b/ace/ARGV.i
index b14d0963274..f9fc1e73f12 100644
--- a/ace/ARGV.i
+++ b/ace/ARGV.i
@@ -26,7 +26,7 @@ ACE_ARGV::buf (void)
   if (this->buf_ == 0 && this->state_ == ITERATIVE) 
     this->create_buf_from_queue ();
 
-  return (const ASYS_TCHAR *) this->buf_;
+  return (const ASYS_TCHAR *)this->buf_;
 }
 
 // Return the arguments in an entry-per-argument array
@@ -44,10 +44,10 @@ ACE_ARGV::argv (void)
 
       // Convert buf_ to argv_
       if (this->string_to_argv () == -1)
-        return (ASYS_TCHAR **) 0;
+        return 0;
     }
 
-  return (ASYS_TCHAR **) this->argv_;
+  return this->argv_;
 }
 
 // Subscript operator.  
diff --git a/ace/ATM_Addr.cpp b/ace/ATM_Addr.cpp
deleted file mode 100644
index dcf40446f37..00000000000
--- a/ace/ATM_Addr.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-// $Id$
-
-// Defines the Internet domain address family address format.
-
-#define ACE_BUILD_DLL
-#include "ace/ATM_Addr.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/ATM_Addr.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, ATM_Addr, "$Id$")
-
-ACE_ALLOC_HOOK_DEFINE(ACE_ATM_Addr)
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-#define BHLI_MAGIC "FORE_ATM"
-// This is line rate in cells/s for an OC-3 MM interface.
-const long ACE_ATM_Addr::LINE_RATE = 353207;
-const int ACE_ATM_Addr::OPT_FLAGS_CPID = 0x1;
-const int ACE_ATM_Addr::OPT_FLAGS_PMP = 0x2;
-const int ACE_ATM_Addr::DEFAULT_SELECTOR = 0x99;
-#else
-const long ACE_ATM_Addr::LINE_RATE = 0L;
-const int ACE_ATM_Addr::OPT_FLAGS_CPID = 0;
-const int ACE_ATM_Addr::OPT_FLAGS_PMP = 0;
-const int ACE_ATM_Addr::DEFAULT_SELECTOR = 0x0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-
-// Default constructor
-
-ACE_ATM_Addr::ACE_ATM_Addr (unsigned char selector)
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  : ACE_Addr (AF_ATM,
-#else
-  : ACE_Addr (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-              sizeof this->atm_addr_)
-{
-  // ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  (void) ACE_OS::memset ((void *) &this->atm_addr_,
-                         0,
-                         sizeof this->atm_addr_);
-  this->init (selector);
-}
-
-// Copy constructor.
-
-ACE_ATM_Addr::ACE_ATM_Addr (const ACE_ATM_Addr &sap,
-                            unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
-}
-
-ACE_ATM_Addr::ACE_ATM_Addr (const ATMSAPAddress *sap,
-                            unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
-}
-
-ACE_ATM_Addr::ACE_ATM_Addr (const ASYS_TCHAR sap[],
-                            unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::ACE_ATM_Addr");
-  this->set (sap, selector);
-}
-
-void
-ACE_ATM_Addr::init (unsigned char selector)
-{
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  // Note: this approach may be FORE implementation-specific.  When we
-  // bind with tag_addr ABSENT and tag_selector PRESENT, only the
-  // selector (i.e. address[19]) is used by the TP.  The rest of the
-  // local address is filled in by the TP and can be obtained via the
-  // 'ret' parameter or with t_getname()/t_getprotaddr().
-
-  atm_addr_.addressType = (u_int16_t) AF_ATM;
-
-  atm_addr_.sap.t_atm_sap_addr.SVE_tag_addr = (int8_t) T_ATM_ABSENT;
-  atm_addr_.sap.t_atm_sap_addr.SVE_tag_selector = (int8_t) T_ATM_PRESENT;
-
-  atm_addr_.sap.t_atm_sap_addr.address_format = (u_int8_t) T_ATM_ENDSYS_ADDR;
-  atm_addr_.sap.t_atm_sap_addr.address_length = ATMNSAP_ADDR_LEN;
-  atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1] = selector;
-
-  atm_addr_.sap.t_atm_sap_layer2.SVE_tag = (int8_t) T_ATM_ABSENT;
-  atm_addr_.sap.t_atm_sap_layer3.SVE_tag = (int8_t) T_ATM_ABSENT;
-
-  atm_addr_.sap.t_atm_sap_appl.SVE_tag = (int8_t) T_ATM_PRESENT;
-  atm_addr_.sap.t_atm_sap_appl.ID_type = (u_int8_t) T_ATM_USER_APP_ID;
-
-  ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_appl.ID.user_defined_ID,
-                  BHLI_MAGIC,
-                  sizeof atm_addr_.sap.t_atm_sap_appl.ID);
-#else
-  ACE_UNUSED_ARG (selector);
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-int
-ACE_ATM_Addr::set (const ACE_ATM_Addr &sap,
-                   unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::set");
-
-  this->init (selector);
-
-  this->ACE_Addr::base_set (sap.get_type (),
-                            sap.get_size ());
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  ACE_ASSERT (sap.get_type () == AF_ATM);
-#endif /* ACE_HAS_FORE_ATM_XTI */
-
-  (void) ACE_OS::memcpy ((void *) &this->atm_addr_,
-                         (void *) &sap.atm_addr_,
-                         sizeof this->atm_addr_);
-  return 0;
-}
-
-int
-ACE_ATM_Addr::set (const ATMSAPAddress *sap,
-                   unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::set");
-
-  this->init (selector);
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  this->ACE_Addr::base_set (AF_ATM,
-#else
-  this->ACE_Addr::base_set (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-                            sizeof (*sap));
-
-  (void) ACE_OS::memcpy ((void *) &this->atm_addr_,
-                         (void *) sap,
-                         sizeof this->atm_addr_);
-  return 0;
-}
-
-int
-ACE_ATM_Addr::set (const ASYS_TCHAR address[],
-                   unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::set");
-
-  this->init (selector);
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  atm_addr_.sap.t_atm_sap_addr.SVE_tag_addr =
-    (int8_t) T_ATM_PRESENT;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-  return this->string_to_addr (address);
-}
-
-// Transform the string into the current addressing format.
-
-int
-ACE_ATM_Addr::string_to_addr (const ASYS_TCHAR sap[])
-{
-  ACE_TRACE ("ACE_ATM_Addr::string_to_addr");
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  this->ACE_Addr::base_set (AF_ATM,
-#else
-  this->ACE_Addr::base_set (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-                            sizeof this->atm_addr_);
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  struct hostent *entry;
-  struct atmnsap_addr *nsap;
-
-  // Yow, someone gave us a NULL ATM address!
-  if (sap == 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else if ((entry = gethostbyname_atmnsap((ASYS_TCHAR *)sap)) != 0)
-    {
-      ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_addr.address, 
-                      entry->h_addr_list[0],
-                      ATMNSAP_ADDR_LEN - 1);
-    }
-  else if ((nsap = atmnsap_addr (sap)) != 0)
-    {
-      ACE_OS::memcpy (atm_addr_.sap.t_atm_sap_addr.address,
-                      nsap->atmnsap,
-                      ATMNSAP_ADDR_LEN);
-    }
-  else
-#else
-  ACE_UNUSED_ARG (sap);
-#endif /* ACE_HAS_FORE_ATM_XTI */
-    {
-      errno = EINVAL;
-      return -1;
-    }
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  return 0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-// Transform the current address into string format.
-
-int
-ACE_ATM_Addr::addr_to_string (ASYS_TCHAR addr[],
-                              size_t addrlen) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::addr_to_string");
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  ASYS_TCHAR buffer[MAXNAMELEN + 1];
-  struct atmnsap_addr nsap;
-  ACE_OS::memcpy (nsap.atmnsap,
-                  atm_addr_.sap.t_atm_sap_addr.address,
-                  ATMNSAP_ADDR_LEN);
-  ACE_OS::sprintf (buffer,
-                   ASYS_TEXT ("%s"),
-                   ASYS_WIDE_STRING (atmnsap_ntoa (nsap)));
-
-  size_t total_len = ACE_OS::strlen (buffer)
-    + sizeof ('\0'); // For trailing '\0'.
-
-  if (addrlen < total_len)
-    return -1;
-  else
-    ACE_OS::strcpy(addr, buffer);
-
-  return 0;
-#else
-  ACE_UNUSED_ARG (addr);
-  ACE_UNUSED_ARG (addrlen);
-  return -1;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-const ASYS_TCHAR *
-ACE_ATM_Addr::addr_to_string (void) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::addr_to_string");
-
-  static ASYS_TCHAR addr[MAXHOSTNAMELEN + 1];
-  this->addr_to_string (addr,
-                        MAXHOSTNAMELEN + 1);
-  return addr;
-}
-
-// Set a pointer to the address.
-void
-ACE_ATM_Addr::set_addr (void *addr, int len)
-{
-  ACE_TRACE ("ACE_ATM_Addr::set_addr");
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  this->ACE_Addr::base_set (AF_ATM,
-#else
-  this->ACE_Addr::base_set (AF_UNSPEC,
-#endif /* ACE_HAS_FORE_ATM_XTI */
-                            len);
-  ACE_OS::memcpy ((void *) &this->atm_addr_,
-                  (void *) addr, len);
-}
-
-// Compare two addresses for inequality.
-
-int
-ACE_ATM_Addr::operator != (const ACE_ATM_Addr &sap) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::operator !=");
-  return !((*this) == sap);
-}
-
-// Compare two addresses for equality.
-
-int
-ACE_ATM_Addr::operator == (const ACE_ATM_Addr &sap) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::operator ==");
-
-  return ACE_OS::memcmp (&atm_addr_,
-                         &sap.atm_addr_,
-#if defined (ACE_HAS_FORE_ATM_XTI)
-                         sizeof (struct ATMSAPAddress)) == 0;
-#else
-                         sizeof (ATMSAPAddress)) == 0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-void
-ACE_ATM_Addr::dump (void) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-
-  ASYS_TCHAR s[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
-  ACE_OS::sprintf (s,
-                   ASYS_TEXT ("%s"),
-                   ASYS_WIDE_STRING (this->addr_to_string ()));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("%s"), s));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-// Some OSes (namely, AIX) have implemented the v5 t_getprotaddr()
-// command.  Others, like Irix, still use the v4 t_getname().  Both
-// are offered here.
-
-#ifdef aix
-#define T_GETPROTADDR(fd, laddr, raddr)	ACE_OS::t_getprotaddr(fd, laddr, raddr)
-#else
-#define T_GETPROTADDR(fd, laddr, raddr) ACE_OS::t_getname(fd, laddr.addr, LOCALNAME)
-#endif /* aix */
-
-int
-ACE_ATM_Addr::get_local_address (ACE_HANDLE fd,
-                                 u_char addr[])
-{
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  ATMSAPAddress local_addr;
-  struct t_bind boundaddr;
-
-  boundaddr.addr.maxlen = sizeof local_addr;
-  boundaddr.addr.buf = (char *) &local_addr;
-
-  if (T_GETPROTADDR (fd, &boundaddr, 0) == -1)
-    {
-      ACE_OS::t_error ("T_GETPROTADDR (local_address)");
-      return -1;
-    }
-
-  ACE_OS::memcpy (addr,
-                  local_addr.sap.t_atm_sap_addr.address,
-                  ATMNSAP_ADDR_LEN);
-  return 0;
-#else
-  ACE_UNUSED_ARG (fd);
-  ACE_UNUSED_ARG (addr);
-  return -1;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-char *
-ACE_ATM_Addr::construct_options(ACE_HANDLE fd,
-                                int qos_kb,
-                                int flags,
-                                long *optsize)
-{
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  struct t_opthdr *popt;
-  char *buf;
-  int qos_cells;
-  struct t_info info;
-
-  if (ACE_OS::t_getinfo (fd, &info) == -1)
-    {
-      ACE_OS::t_error ("t_getinfo");
-      return 0;
-    }
- 
-  buf = (char *) ACE_OS::malloc (info.options);
-
-  if (buf == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("Unable to allocate %ld bytes for options\n"),
-                       info.options),
-                      0);
-
-  popt = (struct t_opthdr *) buf;
-
-  if (flags & OPT_FLAGS_CPID)
-    {
-      // This constructs the T_ATM_ORIG_ADDR option, which is used to
-      // signal the UNI 3.1 Calling Party ID Information Element.
-      t_atm_addr *source_addr;
-
-      popt->len	= sizeof (struct t_opthdr) + sizeof (t_atm_addr);
-      popt->level = T_ATM_SIGNALING;
-      popt->name = T_ATM_ORIG_ADDR;
-      popt->status = 0;
-
-      source_addr = 
-        (t_atm_addr *)((char *) popt + sizeof (struct t_opthdr));
-
-      source_addr->address_format = T_ATM_ENDSYS_ADDR;
-      source_addr->address_length = ATMNSAP_ADDR_LEN;
-
-      if (get_local_address (fd, source_addr->address))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Can't get local address!\n")));
-          ACE_OS::free (buf);
-          return 0;
-        }
-
-      popt = T_OPT_NEXTHDR (buf, info.options , popt);
-    }
-
-  // This constructs all options necessary (bearer cap., QoS, and
-  // Traffic Descriptor) to signal for a CBR connection with the
-  // specified QoS in kbit/sec., and/or specify a PMP connection.
-
-  // For FORE 200e cards, the adapter shapes traffic to CBR with rate
-  // equal to PCR CLP=0+1 (traffic.forward.PCR_all_traffic)
-
-  qos_cells = (qos_kb * 1000) / (48*8);
-
-  if ((qos_cells > 0 && qos_cells < LINE_RATE) 
-      || (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)))
-    {
-      struct t_atm_bearer *bearer;
-      struct t_atm_traffic *traffic;
-
-      // T_ATM_BEARER_CAP: Broadband bearer capability
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_bearer);
-      popt->level = T_ATM_SIGNALING;
-      popt->name = T_ATM_BEARER_CAP;
-      popt->status = 0;
-
-      bearer = (struct t_atm_bearer *)((char *) popt + sizeof (struct t_opthdr));
-      bearer->bearer_class = T_ATM_CLASS_X;
-
-      if (qos_cells)
-        {
-          bearer->traffic_type = T_ATM_CBR;
-          bearer->timing_requirements = T_ATM_END_TO_END;
-        }
-      else
-        {
-          bearer->traffic_type	 = 0; // UBR
-          bearer->timing_requirements = 0;
-        }
-      bearer->clipping_susceptibility = T_ATM_NULL;
-
-      if (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP))
-        bearer->connection_configuration = T_ATM_1_TO_MANY;
-      else
-        bearer->connection_configuration = T_ATM_1_TO_1;
-
-      popt = T_OPT_NEXTHDR (buf, info.options, popt);
-
-      // T_ATM_TRAFFIC: traffic descriptor
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_traffic);
-      popt->level = T_ATM_SIGNALING;
-      popt->name = T_ATM_TRAFFIC;
-      popt->status = 0;
-
-      traffic = (struct t_atm_traffic *)((char *) popt + sizeof (struct t_opthdr));
-
-      traffic->forward.PCR_high_priority = T_ATM_ABSENT;
-      traffic->forward.PCR_all_traffic = qos_cells ? qos_cells : LINE_RATE;
-      traffic->forward.SCR_high_priority = T_ATM_ABSENT;
-      traffic->forward.SCR_all_traffic = T_ATM_ABSENT;
-      traffic->forward.MBS_high_priority = T_ATM_ABSENT;
-      traffic->forward.MBS_all_traffic = T_ATM_ABSENT;
-      traffic->forward.tagging = T_NO;
-
-      traffic->backward.PCR_high_priority = T_ATM_ABSENT;
-      traffic->backward.PCR_all_traffic	= 
-        (ACE_BIT_ENABLED (flags, OPT_FLAGS_PMP)) 
-        ? 0 : qos_cells ? qos_cells : LINE_RATE;
-      traffic->backward.SCR_high_priority = T_ATM_ABSENT;
-      traffic->backward.SCR_all_traffic	= T_ATM_ABSENT;
-      traffic->backward.MBS_high_priority = T_ATM_ABSENT;
-      traffic->backward.MBS_all_traffic	= T_ATM_ABSENT;
-      traffic->backward.tagging = T_NO;
-
-      traffic->best_effort = qos_cells ? T_NO : T_YES;
-
-      popt = T_OPT_NEXTHDR (buf,
-                            info.options,
-                            popt);
-    }
-
-  if (qos_cells > 0 && qos_cells < LINE_RATE)
-    {
-      struct t_atm_qos *qos;
-
-      // T_ATM_QOS: Quality of Service
-      popt->len	= sizeof (struct t_opthdr) + sizeof (struct t_atm_qos);
-      popt->level = T_ATM_SIGNALING;
-      popt->name = T_ATM_QOS;
-      popt->status = 0;
-
-      qos = (struct t_atm_qos *)((char *) popt + sizeof (struct t_opthdr));
-      qos->coding_standard = T_ATM_ITU_CODING;
-      qos->forward.qos_class = T_ATM_QOS_CLASS_1;
-      qos->backward.qos_class = T_ATM_QOS_CLASS_1;
-
-      popt = T_OPT_NEXTHDR (buf, info.options, popt);
-    }
-
-  // return actual size of options and option buffer to user
-  *optsize = (char *) popt - buf;
-
-  return buf;
-#else
-  ACE_UNUSED_ARG (fd);
-  ACE_UNUSED_ARG (qos_kb);
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (optsize);
-  return 0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
diff --git a/ace/ATM_Addr.h b/ace/ATM_Addr.h
deleted file mode 100644
index 2f644c3bb95..00000000000
--- a/ace/ATM_Addr.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    ATM_Addr.h
-//
-// = AUTHOR
-//    Joe Hoffert <joeh@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_ATM_ADDR_H
-#define ACE_ATM_ADDR_H
-
-#include "ace/ACE.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Addr.h"
-
-#if !defined (ACE_HAS_FORE_ATM_XTI)
-typedef int ATMSAPAddress;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-
-class ACE_Export ACE_ATM_Addr : public ACE_Addr
-{
-  // = TITLE
-  //    Defines the ATM domain address family address format.
-public:
-  // Constants used for ATM options
-  static const long LINE_RATE;
-  static const int OPT_FLAGS_CPID;
-  static const int OPT_FLAGS_PMP;
-  static const int DEFAULT_SELECTOR;
-
-  // = Initialization methods.
-  ACE_ATM_Addr (unsigned char selector = DEFAULT_SELECTOR);
-  // Default constructor.
-
-  ACE_ATM_Addr (const ACE_ATM_Addr &,
-                unsigned char selector = DEFAULT_SELECTOR);
-  // Copy constructor.
-
-  ACE_ATM_Addr (const ATMSAPAddress *,
-                unsigned char selector = DEFAULT_SELECTOR);
-  // Creates an <ACE_ATM_Addr> from an ATMSAPAddress structure. This
-  // is vendor specific (FORE systems). May need to change when other
-  // vendors are supported.
-
-  ACE_ATM_Addr (const ASYS_TCHAR sap[],
-                unsigned char selector = DEFAULT_SELECTOR);
-  // Initializes an <ACE_ATM_Addr> from the <sap> which can be
-  // "atm-address" (e.g.,
-  // "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname"
-  // (e.g., "frisbee.cs.wustl.edu").
-
-  ~ACE_ATM_Addr (void);
-  // Default dtor.
-
-  // = Initialization methods (useful after object construction).
-  void init (unsigned char selector = DEFAULT_SELECTOR);
-  // Default initialization for non-address values (e.g.,
-  // t_atm_sap_addr.SVE_tag_addr, t_atm_sap_addr.SVE_tag_selector)
-
-  int set (const ACE_ATM_Addr &,
-           unsigned char selector = DEFAULT_SELECTOR);
-  // Initializes from another <ACE_ATM_Addr>.
-
-  int set (const ATMSAPAddress *,
-           unsigned char selector = DEFAULT_SELECTOR);
-  // Initializes an <ACE_ATM_Addr> from an ATMSAPAddress
-  // structure. This is vendor specific (FORE systems). May need to
-  // change when other vendors are supported.
-
-  int set (const ASYS_TCHAR sap[],
-           unsigned char selector = DEFAULT_SELECTOR);
-  // Initializes an <ACE_ATM_Addr> from the <sap> which can be
-  // "atm-address" (e.g.,
-  // "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname"
-  // (e.g., "frisbee.cs.wustl.edu").
-
-  virtual int string_to_addr (const ASYS_TCHAR sap[]);
-  // Initializes an <ACE_ATM_Addr> from the <sap> which can be
-  // "atm-address" (e.g.,
-  // "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") or "hostname"
-  // (e.g., "frisbee.cs.wustl.edu").
-
-  virtual int addr_to_string (ASYS_TCHAR addr[], 
-                              size_t addrlen) const;
-  // Return the character representation of the ATM address (e.g.,
-  // "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00") storing it in
-  // the <addr> (which is assumed to be <addrlen> bytes long). This
-  // version is reentrant.  Returns -1 if the <addrlen> of the <addr>
-  // is too small, else 0.
-
-  const ASYS_TCHAR *addr_to_string (void) const;
-  // Return the character representation of the ATM address (e.g.,
-  // "47.0005.80.ffe100.0000.f20f.2200.0020480694f9.00"). Returns -1
-  // if the <size> of the <buffer> is too small, else 0.(This version
-  // is non-reentrant since it returns a pointer to a static data
-  // area.)
-
-  virtual void *get_addr (void) const;
-  // Return a pointer to the underlying network address.
-
-  virtual void set_addr (void *, int);
-  // Set a pointer to the address.
-
-  unsigned char get_selector (void) const;
-  // Return the selector for network address.
-
-  void set_selector (unsigned char);
-  // Set the selector for the network address.
-
-  int operator == (const ACE_ATM_Addr &SAP) const;
-  // Compare two addresses for equality.  The addresses are considered
-  // equal if they contain the same ATM address.  Q: Is there any
-  // other check for equality needed for ATM?
-
-  int operator != (const ACE_ATM_Addr &SAP) const;
-  // Compare two addresses for inequality.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  static char *construct_options (ACE_HANDLE fd,
-                                  int qos_kb,
-                                  int flags,
-                                  long *optsize);
-  // Construct options for ATM connections
-
-protected:
-  static int get_local_address (ACE_HANDLE handle,
-                                u_char addr[]);
-  // Get the local ATM address.
-
-private:
-  ATMSAPAddress atm_addr_;
-  // Underlying representation - this may be very
-  // vendor-implementation specific. Other vendors (besides FORE) may
-  // name and define this structure differently. We can work around
-  // that problem when we run into other vendors supporting XTI on top
-  // of ATM. Is this class specific to XTI?  Not sure.
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/ATM_Addr.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_ATM_ADDR_H */
diff --git a/ace/ATM_Addr.i b/ace/ATM_Addr.i
deleted file mode 100644
index 0fb582ae719..00000000000
--- a/ace/ATM_Addr.i
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ATM_Addr.i
-
-// Default dtor.
-ACE_INLINE
-ACE_ATM_Addr::~ACE_ATM_Addr (void)
-{
-}
-
-// Return the address.
-
-ACE_INLINE void *
-ACE_ATM_Addr::get_addr (void) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::get_addr");
-  return (void *) &this->atm_addr_;
-}
-
-ACE_INLINE unsigned char
-ACE_ATM_Addr::get_selector (void) const
-{
-  ACE_TRACE ("ACE_ATM_Addr::get_selector");
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  return atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1];
-#else
-  return 0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
-
-ACE_INLINE void
-ACE_ATM_Addr::set_selector (unsigned char selector)
-{
-  ACE_TRACE ("ACE_ATM_Addr::set_selector");
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  atm_addr_.sap.t_atm_sap_addr.address[ATMNSAP_ADDR_LEN - 1] = selector;
-#else
-  ACE_UNUSED_ARG (selector);
-#endif /* ACE_HAS_FORE_ATM_XTI */
-}
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index 8e7a560b9ae..ef5cda76d80 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -958,8 +958,9 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::shared_accept
       return -1;
     }
   // Activate the <svc_handler> using the designated concurrency
-  // strategy (note that this method becomes responsible for handling
-  // errors and freeing up the memory if things go awry...)
+  // strategy (note that this method becomes responsible for
+  // handling errors and freeing up the memory if things go
+  // awry...)
   else
     return this->activate_svc_handler (svc_handler);
 }
@@ -1024,7 +1025,7 @@ ACE_Oneshot_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE
 
   // 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
+  // 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 ();
diff --git a/ace/Active_Map_Manager.h b/ace/Active_Map_Manager.h
index 713aedd17b4..90e98caaa7a 100644
--- a/ace/Active_Map_Manager.h
+++ b/ace/Active_Map_Manager.h
@@ -23,7 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_Active_Map_Manager_Key
+class ACE_Export ACE_Active_Map_Manager_Key 
 {
   // = TITLE
   //     Key used in the Active Object Map.
@@ -36,24 +36,24 @@ public:
   ACE_Active_Map_Manager_Key (void);
   // Default constructor.
 
-  ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index,
-                              ACE_UINT32 slot_generation);
-  // Constructor given the <slot_index> and <slot_generation> number.
-  // This is useful once the user has somehow recovered the
-  // <slot_index> and <slot_generation> number from the client.
-
-  ACE_UINT32 slot_index (void) const;
-  void slot_index (ACE_UINT32 i);
-  // Get/Set the <slot_index>.
-
-  ACE_UINT32 slot_generation (void) const;
-  void slot_generation (ACE_UINT32 g);
-  // Get/Set the <slot_generation> number.
-
+  ACE_Active_Map_Manager_Key (u_long index,
+                              u_long generation);
+  // Constructor given the index and generation number.  This is
+  // useful once the user has somehow recovered the index and
+  // generation number from the client.
+
+  u_long index (void) const;
+  void index (u_long i);
+  // Get/Set the index.
+  
+  u_long generation (void) const;
+  void generation (u_long g);
+  // Get/Set the generation number.
+  
   static size_t size (void);
   // Size required to store information about active key.
 
-  void decode (const void *data);
+  void decode (const void *data);  
   // Recover state of active key from <data>.  User must make sure
   // that <data> encoded using the <encode> method.
 
@@ -68,29 +68,15 @@ public:
   // = This really should be protected but because of template
   // friends, they are not.
 
-  void increment_slot_generation_count (void);
-  // Increment the <slot_generation> number.
+  void increment_generation_count (void);
+  // Increment the generation number.
 
 private:
+  u_long index_;
+  // Index in the active map.
 
-  struct key_data
-  {
-    // = TITLE
-    //     Data for the Active Object Map Key.
-    //
-    // = DESCRIPTION
-    //     This separate structure makes it easier to manage copying
-    //     the index and the generation to and from the user buffer.
-
-    ACE_UINT32 slot_index_;
-    // Slot index in the active map.
-
-    ACE_UINT32 slot_generation_;
-    // Slot generation number of <slot_index_> slot in the active map.
-  };
-
-  key_data key_data_;
-  // Data for the Active Object Map Key.
+  u_long generation_;
+  // Generation number of <index_> slot in the active map.
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Active_Map_Manager.i b/ace/Active_Map_Manager.i
index 486a595b2be..8980a49002f 100644
--- a/ace/Active_Map_Manager.i
+++ b/ace/Active_Map_Manager.i
@@ -1,87 +1,109 @@
 // $Id$
 
-ACE_INLINE
+ACE_INLINE 
 ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (void)
+  : index_ (~0),
+    generation_ (0)
 {
   // If you change ~0, please change ACE_Map_Manager::free_list_id()
   // accordingly.
-  this->key_data_.slot_index_ = ~0;
-  this->key_data_.slot_generation_ = 0;
 }
 
-ACE_INLINE
-ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (ACE_UINT32 slot_index,
-                                                        ACE_UINT32 slot_generation)
+ACE_INLINE 
+ACE_Active_Map_Manager_Key::ACE_Active_Map_Manager_Key (u_long index, 
+                                                        u_long generation)
+  : index_ (index),
+    generation_ (generation)
 {
-  this->key_data_.slot_index_ = slot_index;
-  this->key_data_.slot_generation_ = slot_generation;
 }
 
-ACE_INLINE ACE_UINT32
-ACE_Active_Map_Manager_Key::slot_index (void) const
+ACE_INLINE u_long 
+ACE_Active_Map_Manager_Key::index (void) const
 {
-  return this->key_data_.slot_index_;
+  return this->index_;
 }
-
-ACE_INLINE ACE_UINT32
-ACE_Active_Map_Manager_Key::slot_generation (void) const
+  
+ACE_INLINE u_long 
+ACE_Active_Map_Manager_Key::generation (void) const
 {
-  return this->key_data_.slot_generation_;
+  return this->generation_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Active_Map_Manager_Key::operator== (const ACE_Active_Map_Manager_Key &rhs) const
 {
-  return
-    this->key_data_.slot_index_ == rhs.key_data_.slot_index_ &&
-    this->key_data_.slot_generation_ == rhs.key_data_.slot_generation_;
+  return 
+    this->index_ == rhs.index_ &&
+    this->generation_ == rhs.generation_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Active_Map_Manager_Key::operator!= (const ACE_Active_Map_Manager_Key &rhs) const
 {
   return !this->operator== (rhs);
 }
 
-ACE_INLINE void
-ACE_Active_Map_Manager_Key::slot_index (ACE_UINT32 i)
+ACE_INLINE void 
+ACE_Active_Map_Manager_Key::index (u_long i)
 {
-  this->key_data_.slot_index_ = i;
+  this->index_ = i;
 }
-
-ACE_INLINE void
-ACE_Active_Map_Manager_Key::slot_generation (ACE_UINT32 g)
+  
+ACE_INLINE void 
+ACE_Active_Map_Manager_Key::generation (u_long g)
 {
-  this->key_data_.slot_generation_ = g;
+  this->generation_ = g;
 }
 
-ACE_INLINE void
-ACE_Active_Map_Manager_Key::increment_slot_generation_count (void)
+ACE_INLINE void 
+ACE_Active_Map_Manager_Key::increment_generation_count (void)
 {
-  ++this->key_data_.slot_generation_;
+  ++this->generation_;
 }
 
 /* static */
 ACE_INLINE size_t
 ACE_Active_Map_Manager_Key::size (void)
 {
-  return sizeof (ACE_UINT32) + sizeof (ACE_UINT32);
+  return sizeof (u_long) + sizeof (u_long);
 }
 
-ACE_INLINE void
-ACE_Active_Map_Manager_Key::decode (const void *data)
+ACE_INLINE void 
+ACE_Active_Map_Manager_Key::decode (const void *d)
 {
-  // Copy the information from the user buffer into the key.
-  ACE_OS::memcpy (&this->key_data_,
+  // Cast so that we can do pointer arithmetic.
+  const char *data = (const char *) d;
+
+  // Grab the index first.
+  ACE_OS::memcpy (&this->index_,
+                  data,
+                  sizeof this->index_);
+
+  // Move along...
+  data += sizeof this->index_;
+
+  // Grab the generation second.
+  ACE_OS::memcpy (&this->generation_,
                   data,
-                  sizeof this->key_data_);
+                  sizeof this->generation_);
 }
 
-ACE_INLINE void
-ACE_Active_Map_Manager_Key::encode (void *data) const
+ACE_INLINE void 
+ACE_Active_Map_Manager_Key::encode (void *d) const
 {
-  // Copy the key data to the user buffer.
+  // Cast so that we can do pointer arithmetic.
+  char *data = (char *) d;
+
+  // Grab the index first.
+  ACE_OS::memcpy (data,
+                  &this->index_,
+                  sizeof this->index_);
+
+  // Move along...
+  data += sizeof this->index_;
+
+  // Grab the generation second.
   ACE_OS::memcpy (data,
-                  &this->key_data_,
-                  sizeof this->key_data_);
+                  &this->generation_,
+                  sizeof this->generation_);
 }
diff --git a/ace/Active_Map_Manager_T.h b/ace/Active_Map_Manager_T.h
index e0cb4f4fa8c..1c5201e7860 100644
--- a/ace/Active_Map_Manager_T.h
+++ b/ace/Active_Map_Manager_T.h
@@ -27,7 +27,7 @@
 template <class T>
 class ACE_Active_Map_Manager : public ACE_Map_Manager<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
 {
-  // = TITLE
+  // = TITLE  
   //     Define a map abstraction that associates system generated
   //     keys with user specified values.
   //
@@ -107,7 +107,7 @@ public:
   // into the "out" parameter <old_key> and <old_value>.  The function
   // fails if <key> is not in the map.
 
-  int find (const ACE_Active_Map_Manager_Key &key,
+  int find (const ACE_Active_Map_Manager_Key &key, 
             T &value);
   // Locate <value> associated with <key>.
 
@@ -129,7 +129,7 @@ public:
   int unbind (const ACE_Active_Map_Manager_Key &key);
   // Remove <key> from the map.
 
-  int unbind (const ACE_Active_Map_Manager_Key &key,
+  int unbind (const ACE_Active_Map_Manager_Key &key, 
               T &value);
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
@@ -148,9 +148,6 @@ public:
   size_t total_size (void);
   // Return the total size of the map.
 
-  static const ACE_Active_Map_Manager_Key npos (void);
-  // Returns a key that cannot be found in the map.
-
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Active_Map_Manager_T.i b/ace/Active_Map_Manager_T.i
index 54388cd354d..b3bffe68fac 100644
--- a/ace/Active_Map_Manager_T.i
+++ b/ace/Active_Map_Manager_T.i
@@ -1,26 +1,26 @@
 // $Id$
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::bind (ACE_Active_Map_Manager_Key &key,
                                  T *&internal_value)
 {
-  size_t slot_index;
-  int result = this->next_free (slot_index);
+  size_t index;
+  int result = this->next_free (index);
 
   if (result == 0)
     {
       // Move from free list to occupied list
-      this->move_from_free_list_to_occupied_list (slot_index);
+      this->move_from_free_list_to_occupied_list (index);
 
       // Reset the key.
-      this->search_structure_[slot_index].ext_id_.increment_slot_generation_count ();
-      this->search_structure_[slot_index].ext_id_.slot_index (slot_index);
+      this->search_structure_[index].ext_id_.increment_generation_count ();
+      this->search_structure_[index].ext_id_.index (index);
 
       // Copy the key for the user.
-      key = this->search_structure_[slot_index].ext_id_;
+      key = this->search_structure_[index].ext_id_;
 
       // This is where the user should place the value.
-      internal_value = &this->search_structure_[slot_index].int_id_;
+      internal_value = &this->search_structure_[index].int_id_;
 
       // Update the current size.
       ++this->cur_size_;
@@ -29,7 +29,7 @@ ACE_Active_Map_Manager<T>::bind (ACE_Active_Map_Manager_Key &key,
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::bind (const T &value,
                                  ACE_Active_Map_Manager_Key &key)
 {
@@ -46,51 +46,51 @@ ACE_Active_Map_Manager<T>::bind (const T &value,
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::bind (const T &value)
 {
   ACE_Active_Map_Manager_Key key;
   return this->bind (value, key);
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::find (const ACE_Active_Map_Manager_Key &key,
                                  T *&internal_value)
 {
-  size_t slot_index = key.slot_index ();
-  size_t slot_generation = key.slot_generation ();
-
-  if (slot_index > this->total_size_ ||
-      this->search_structure_[slot_index].ext_id_.slot_generation () != slot_generation ||
-      this->search_structure_[slot_index].ext_id_.slot_index () == this->free_list_id ())
+  size_t index = key.index ();
+  size_t generation = key.generation ();
+ 
+  if (index > this->total_size_ ||
+      this->search_structure_[index].ext_id_.generation () != generation ||
+      this->search_structure_[index].ext_id_.index () == this->free_list_id ())
     {
       return -1;
     }
   else
     {
       // This is where the user value is.
-      internal_value = &this->search_structure_[slot_index].int_id_;
+      internal_value = &this->search_structure_[index].int_id_;
     }
 
   return 0;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::find (const ACE_Active_Map_Manager_Key &key)
 {
   T *internal_value = 0;
-  return this->find (key,
+  return this->find (key, 
                      internal_value);
 }
 
-template <class T> ACE_INLINE int
-ACE_Active_Map_Manager<T>::find (const ACE_Active_Map_Manager_Key &key,
+template <class T> ACE_INLINE int 
+ACE_Active_Map_Manager<T>::find (const ACE_Active_Map_Manager_Key &key, 
                                  T &value)
-{
+{  
   T *internal_value = 0;
   int result = this->find (key,
                            internal_value);
-
+  
   if (result == 0)
     {
       value = *internal_value;
@@ -99,58 +99,58 @@ ACE_Active_Map_Manager<T>::find (const ACE_Active_Map_Manager_Key &key,
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::rebind (const ACE_Active_Map_Manager_Key &key,
                                    const T &value)
 {
   int result = this->find (key);
-
+  
   if (result == 0)
     {
       // Store new value.
-      this->search_structure_[key.slot_index ()].int_id_ = value;
+      this->search_structure_[key.index ()].int_id_ = value;
     }
 
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::rebind (const ACE_Active_Map_Manager_Key &key,
                                    const T &value,
                                    T &old_value)
 {
   int result = this->find (key);
-
+  
   if (result == 0)
     {
       // Copy old value.
-      old_value = this->search_structure_[key.slot_index ()].int_id_;
-
+      old_value = this->search_structure_[key.index ()].int_id_;
+      
       // Store new value.
-      this->search_structure_[key.slot_index ()].int_id_ = value;
+      this->search_structure_[key.index ()].int_id_ = value;
     }
 
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::rebind (const ACE_Active_Map_Manager_Key &key,
                                    const T &value,
                                    ACE_Active_Map_Manager_Key &old_key,
                                    T &old_value)
 {
   int result = this->find (key);
-
+  
   if (result == 0)
     {
       // Copy old key.
-      old_key = this->search_structure_[key.slot_index ()].ext_id_;
-
+      old_key = this->search_structure_[key.index ()].ext_id_;
+      
       // Copy old value.
-      old_value = this->search_structure_[key.slot_index ()].int_id_;
-
+      old_value = this->search_structure_[key.index ()].int_id_;
+      
       // Store new value.
-      this->search_structure_[key.slot_index ()].int_id_ = value;
+      this->search_structure_[key.index ()].int_id_ = value;
     }
 
   return result;
@@ -162,16 +162,16 @@ ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key,
 {
   int result = this->find (key,
                            internal_value);
-
+  
   if (result == 0)
     {
-      size_t slot_index = key.slot_index ();
-
+      size_t index = key.index ();      
+      
       // Move from occupied list to free list
-      this->move_from_occupied_list_to_free_list (slot_index);
+      this->move_from_occupied_list_to_free_list (index);
 
-      // Reset the slot_index.  This will tell us that this entry is free.
-      this->search_structure_[slot_index].ext_id_.slot_index (this->free_list_id ());
+      // Reset the index.  This will tell us that this entry is free.
+      this->search_structure_[index].ext_id_.index (this->free_list_id ());
 
       // Update the current size.
       --this->cur_size_;
@@ -180,14 +180,14 @@ ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key,
   return result;
 }
 
-template <class T> ACE_INLINE int
-ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key,
+template <class T> ACE_INLINE int 
+ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key, 
                                    T &value)
 {
   T *internal_value;
   int result = this->unbind (key,
                              internal_value);
-
+  
   if (result == 0)
     {
       // Copy old value.
@@ -197,7 +197,7 @@ ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key,
   return result;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key)
 {
   T *internal_value;
@@ -205,83 +205,77 @@ ACE_Active_Map_Manager<T>::unbind (const ACE_Active_Map_Manager_Key &key)
                        internal_value);
 }
 
-template <class T> ACE_INLINE
+template <class T> ACE_INLINE 
 ACE_Active_Map_Manager<T>::ACE_Active_Map_Manager (ACE_Allocator *alloc)
   : ACE_AMM_BASE (alloc)
 {
 }
 
-template <class T> ACE_INLINE
+template <class T> ACE_INLINE 
 ACE_Active_Map_Manager<T>::ACE_Active_Map_Manager (size_t size,
                                                    ACE_Allocator *alloc)
-  : ACE_AMM_BASE (size,
+  : ACE_AMM_BASE (size, 
                   alloc)
 {
 }
 
-template <class T> ACE_INLINE
+template <class T> ACE_INLINE 
 ACE_Active_Map_Manager<T>::~ACE_Active_Map_Manager (void)
 {
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::open (size_t length,
                                  ACE_Allocator *alloc)
 {
   return ACE_AMM_BASE::open (length, alloc);
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Active_Map_Manager<T>::close (void)
 {
   return ACE_AMM_BASE::close ();
 }
 
-template <class T> ACE_INLINE size_t
+template <class T> ACE_INLINE size_t 
 ACE_Active_Map_Manager<T>::current_size (void)
 {
   return ACE_AMM_BASE::current_size ();
 }
 
-template <class T> ACE_INLINE size_t
+template <class T> ACE_INLINE size_t 
 ACE_Active_Map_Manager<T>::total_size (void)
 {
   return ACE_AMM_BASE::total_size ();
 }
 
-/* static */
-template <class T> ACE_INLINE const ACE_Active_Map_Manager_Key
-ACE_Active_Map_Manager<T>::npos (void)
-{
-  return ACE_Active_Map_Manager_Key (~0, ~0);
-}
-
-template <class T> ACE_INLINE void
+template <class T> ACE_INLINE void 
 ACE_Active_Map_Manager<T>::dump (void) const
 {
   ACE_AMM_BASE::dump ();
 }
 
-template <class T> ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
+template <class T> ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> 
 ACE_Active_Map_Manager<T>::begin (void)
 {
   return ACE_AMM_BASE::begin ();
 }
 
-template <class T> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
+template <class T> ACE_INLINE ACE_Map_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> 
 ACE_Active_Map_Manager<T>::end (void)
 {
   return ACE_AMM_BASE::end ();
 }
 
-template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
+template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> 
 ACE_Active_Map_Manager<T>::rbegin (void)
 {
   return ACE_AMM_BASE::rbegin ();
 }
 
-template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex>
+template <class T> ACE_INLINE ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, T, ACE_Null_Mutex> 
 ACE_Active_Map_Manager<T>::rend (void)
 {
   return ACE_AMM_BASE::rend ();
 }
+
diff --git a/ace/Addr.cpp b/ace/Addr.cpp
index aff435317f1..9a0e74e3ba4 100644
--- a/ace/Addr.cpp
+++ b/ace/Addr.cpp
@@ -9,8 +9,7 @@ ACE_RCSID(ace, Addr, "$Id$")
 #if defined (ACE_HAS_BROKEN_SAP_ANY)
 #if defined (sap_any)
 #undef sap_any
-// Note: this object requires static construction and destruction.
-/* static */
+// This is a static class variable.
 const ACE_Addr ace_sap_any (AF_ANY, -1);
 
 const ACE_Addr &
@@ -21,8 +20,7 @@ ACE_Addr::sap_any (void)
 #define sap_any sap_any()
 #endif /* sap_any */
 #else
-// Note: this object requires static construction and destruction.
-/* static */
+// This is a static class variable.
 const ACE_Addr ACE_Addr::sap_any (AF_ANY, -1);
 #endif /* ACE_HAS_BROKEN_SAP_ANY */
 
diff --git a/ace/Asynch_Acceptor.h b/ace/Asynch_Acceptor.h
index 57b57328fbd..41f3ce435ea 100644
--- a/ace/Asynch_Acceptor.h
+++ b/ace/Asynch_Acceptor.h
@@ -52,7 +52,7 @@ public:
   virtual int open (const ACE_INET_Addr &address,
                     size_t bytes_to_read = 0,
                     int pass_addresses = 0,
-                    int backlog = ACE_DEFAULT_BACKLOG,
+                    int backlog = 5,
                     int reuse_addr = 1,
                     ACE_Proactor *proactor = 0,
                     int validate_new_connection = 0,
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 373356337eb..50d3ea6323d 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -6,705 +6,1530 @@
 ACE_RCSID(ace, Asynch_IO, "$Id$")
 
 #if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
-// This only works on platforms with Asynchronous IO
+// This only works on Win32 platforms
 
 #include "ace/Proactor.h"
 #include "ace/Message_Block.h"
+#include "ace/Service_Config.h"
 #include "ace/INET_Addr.h"
-#include "ace/Asynch_IO_Impl.h"
+#include "ace/Task_T.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Asynch_IO.i"
 #endif /* __ACE_INLINE__ */
 
-// *********************************************************************
+ACE_Asynch_Result::ACE_Asynch_Result (ACE_Handler &handler,
+                                      const void* act,
+                                      ACE_HANDLE event,
+                                      u_long offset,
+                                      u_long offset_high)
+  : handler_ (handler),
+    act_ (act),
+    bytes_transferred_ (0),
+    success_ (0),
+    completion_key_ (0),
+    error_ (0)
+{
+  // Set the ACE_OVERLAPPED structure
+  this->Internal = 0;
+  this->InternalHigh = 0;
+  this->Offset = offset;
+  this->OffsetHigh = offset_high;
+  this->hEvent = event;
+
+#if defined (ACE_HAS_AIO_CALLS)
+  ACE_NEW (this->aiocb_ptr_, aiocb);
+#endif /* ACE_HAS_AIO_CALLS */
+}
+
+ACE_Asynch_Result::~ACE_Asynch_Result (void)
+{
+}
 
 u_long
 ACE_Asynch_Result::bytes_transferred (void) const
 {
-  return this->implementation ()->bytes_transferred ();
+  return this->bytes_transferred_;
 }
 
 const void *
 ACE_Asynch_Result::act (void) const
 {
-  return this->implementation ()->act ();
+  return this->act_;
 }
 
 int
 ACE_Asynch_Result::success (void) const
 {
-  return this->implementation ()->success ();
+  return this->success_;
 }
 
 const void *
 ACE_Asynch_Result::completion_key (void) const
 {
-  return this->implementation ()->completion_key ();
+  return this->completion_key_;
 }
 
 u_long
 ACE_Asynch_Result::error (void) const
 {
-  return this->implementation ()->error ();
-}
-
-ACE_HANDLE
-ACE_Asynch_Result::event (void) const
-{
-  return this->implementation ()->event ();
+  return this->error_;
 }
 
 u_long
 ACE_Asynch_Result::offset (void) const
 {
-  return this->implementation ()->offset ();
+  return this->Offset;
 }
 
 u_long
 ACE_Asynch_Result::offset_high (void) const
 {
-  return this->implementation ()->offset_high ();
-}
-
-int
-ACE_Asynch_Result::priority (void) const
-{
-  return this->implementation ()->priority ();
+  return this->OffsetHigh;
 }
 
-int
-ACE_Asynch_Result::signal_number (void) const
-{
-  return this->implementation ()->signal_number ();
-}
-
-ACE_Asynch_Result::ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation)
-  : implementation_ (implementation)
+ACE_HANDLE
+ACE_Asynch_Result::event (void) const
 {
+  return this->hEvent;
 }
 
-ACE_Asynch_Result::~ACE_Asynch_Result (void)
+#if defined (ACE_HAS_AIO_CALLS)
+aiocb *
+ACE_Asynch_Result::aiocb_ptr (void)
 {
-  // Proactor deletes the implementation when the <complete> finishes. 
+  return aiocb_ptr_;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
-ACE_Asynch_Result_Impl *
-ACE_Asynch_Result::implementation (void) const
+ACE_Asynch_Operation::ACE_Asynch_Operation (void)
+  : handler_ (0),
+    handle_ (ACE_INVALID_HANDLE)
 {
-  return this->implementation_;
 }
 
-// *********************************************************************
-
 int
 ACE_Asynch_Operation::open (ACE_Handler &handler,
                             ACE_HANDLE handle,
                             const void *completion_key,
                             ACE_Proactor *proactor)
 {
-  return this->implementation ()->open (handler,
-                                        handle,
-                                        completion_key,
-                                        proactor);
+  this->proactor_ = proactor;
+  this->handler_ = &handler;
+  this->handle_ = handle;
+
+  // Grab the handle from the <handler> if <handle> is invalid
+  if (this->handle_ == ACE_INVALID_HANDLE)
+    this->handle_ = this->handler_->handle ();
+  if (this->handle_ == ACE_INVALID_HANDLE)
+    return -1;
+
+  // If no proactor was passed
+  if (this->proactor_ == 0)
+    {
+      // Grab the proactor from the <Service_Config> if
+      // <handler->proactor> is zero
+      this->proactor_ = this->handler_->proactor ();
+      if (this->proactor_ == 0)
+        this->proactor_ = ACE_Proactor::instance();
+    }
+
+#if defined (ACE_HAS_AIO_CALLS)
+
+  // AIO stuff is present. So no registering.
+  // @@ But something has to be done to associate completion key with
+  // the handle provided. How about a HashTable of size "the number of
+  // file descriptors that are possible in the system".
+  ACE_UNUSED_ARG (completion_key);
+  return 0;
+
+#else /* ACE_HAS_AIO_CALLS */
+
+  // Register with the <proactor>.
+  return this->proactor_->register_handle (this->handle_,
+                                           completion_key);
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 int
 ACE_Asynch_Operation::cancel (void)
 {
-  return this->implementation ()->cancel ();
-}
+#if defined (ACE_HAS_AIO_CALLS)
 
-ACE_Proactor *
-ACE_Asynch_Operation::proactor (void) const
-{
-  return this->implementation ()->proactor ();
-}
+  // @@ <aio_cancel> will come here soon.
+  return 0;
 
-ACE_Asynch_Operation_Impl *
-ACE_Asynch_Operation::implementation (void) const
-{
-  return this->implementation_;
-}
+#elif (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
+  // All I/O operations that are canceled will complete with the error
+  // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
+  // operations will occur normally.
 
-ACE_Asynch_Operation::ACE_Asynch_Operation (void)
-  : implementation_ (0)
-{
-}
+  return (int) ::CancelIo (this->handle_);
 
-ACE_Asynch_Operation::~ACE_Asynch_Operation (void)
-{
-  delete this->implementation_;
-  this->implementation_ = 0;
+#else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */
+  ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
-void
-ACE_Asynch_Operation::implementation (ACE_Asynch_Operation_Impl *implementation)
+#if defined (ACE_HAS_AIO_CALLS)
+// If the ptr is o, just check whether there is any slot free and
+// return 0 if yes, else return -1. If a valid ptr is passed, keep it
+// in a free slot.
+int
+ACE_Asynch_Operation::register_aio_with_proactor (aiocb *aiocb_ptr)
 {
-  this->implementation_ = implementation;
+  if (aiocb_ptr == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Status check max %d cur %d\n",
+                  this->proactor_->aiocb_list_max_size_,
+                  this->proactor_->aiocb_list_cur_size_));
+
+      // Just check the status of the list.
+      if (this->proactor_->aiocb_list_cur_size_ >=
+          this->proactor_->aiocb_list_max_size_)
+        return -1;
+      else
+        return 0;
+    }
+
+  // Non-zero ptr. Find a free slot and store.
+
+  // Make sure again.
+  if (this->proactor_->aiocb_list_cur_size_ >=
+      this->proactor_->aiocb_list_max_size_)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:Asynch_Operation: No space to store the <aio> info.\n"),
+                      -1);
+
+  // Slot(s) available. Find a free one.
+  size_t ai;
+  for (ai = 0;
+       ai < this->proactor_->aiocb_list_max_size_;
+       ai++)
+    if (this->proactor_->aiocb_list_[ai] == 0)
+      break;
+
+  // Sanity check.
+  if (ai == this->proactor_->aiocb_list_max_size_)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:Asynch_Operation: No space to store the <aio> info.\n"),
+                      -1);
+
+  // Store the pointers.
+  this->proactor_->aiocb_list_[ai] = aiocb_ptr;
+  this->proactor_->aiocb_list_cur_size_ ++;
+
+  return 0;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
 ACE_Proactor *
-ACE_Asynch_Operation::get_proactor (ACE_Proactor *user_proactor,
-                                    ACE_Handler &handler) const
+ACE_Asynch_Operation::proactor (void)
 {
-  if (user_proactor == 0)
-    {
-      // Grab the singleton proactor if <handler->proactor> is zero
-      user_proactor = handler.proactor ();
-      if (user_proactor == 0)
-        user_proactor = ACE_Proactor::instance ();
-    }
-
-  return user_proactor;
+  return this->proactor_;
 }
 
 // ************************************************************
 
 ACE_Asynch_Read_Stream::ACE_Asynch_Read_Stream (void)
-  : implementation_ (0)
 {
 }
 
-ACE_Asynch_Read_Stream::~ACE_Asynch_Read_Stream (void)
+int
+ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
+                              u_long bytes_to_read,
+                              const void *act)
 {
+  // Create the Asynch_Result.
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          message_block,
+                          bytes_to_read,
+                          act,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+  ssize_t return_val = this->shared_read (result);
+  if (return_val == -1)
+    delete result;
+  return return_val;
 }
 
 int
-ACE_Asynch_Read_Stream::open (ACE_Handler &handler,
-                              ACE_HANDLE handle,
-                              const void *completion_key,
-                              ACE_Proactor *proactor)
+ACE_Asynch_Read_Stream::shared_read (ACE_Asynch_Read_Stream::Result *result)
 {
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
+#if defined (ACE_HAS_AIO_CALLS)
+  // Act according to the completion strategy that is set in the
+  // proactor.
 
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
+  // Using RT Signals to notify the completion.
+  if (this->proactor ()->posix_completion_strategy () ==
+      ACE_Proactor::RT_SIGNALS)
+    {
+      // Setup AIOCB.
+      // @@ Priority always 0?
+      result->aiocb_ptr ()->aio_fildes = result->handle ();
+      result->aiocb_ptr ()->aio_offset = result->Offset;
+      result->aiocb_ptr ()->aio_buf = result->message_block ().wr_ptr ();
+      result->aiocb_ptr ()->aio_nbytes = result->bytes_to_read ();
+      result->aiocb_ptr ()->aio_reqprio = 0;
+      result->aiocb_ptr ()->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
+      result->aiocb_ptr ()->aio_sigevent.sigev_signo = ACE_SIG_AIO;
+      result->aiocb_ptr ()->aio_sigevent.sigev_value.sival_ptr =
+        (void *) result;
+
+      // Fire off the aio write.
+      if (aio_read (result->aiocb_ptr ()) == -1)
+        // Queueing failed.
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:%p\n",
+                           "Asynch_Read_Stream: aio_read queueing failed"),
+                          -1);
+    }
+  else
+    {
+      // AIO_CONTROL_BLOCKS strategy.
 
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Read_Stream_Impl *implementation = proactor->create_asynch_read_stream ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class. 
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
-}
-  
-int
-ACE_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
-                              u_long bytes_to_read,
-                              const void *act,
-                              int priority,
-                              int signal_number)
-{
-  return this->implementation ()->read (message_block,
-                                        bytes_to_read,
-                                        act,
-                                        priority,
-                                        signal_number);
-}
+      // Make a new AIOCB and issue aio_read, if queueing is possible
+      // store this with the Proactor, so that that can be used for
+      // <aio_return> and <aio_error>.
 
-ACE_Asynch_Read_Stream_Impl *
-ACE_Asynch_Read_Stream::implementation (void) const
-{
-  return implementation_;
-}
+      // Allocate aiocb block.
+      aiocb *aiocb_ptr = 0;
+      ACE_NEW_RETURN (aiocb_ptr,
+                      aiocb,
+                      -1);
 
-void
-ACE_Asynch_Read_Stream::implementation (ACE_Asynch_Read_Stream_Impl *implementation)
-{
-  this->implementation_ = implementation;
+      // Make sure there is space in the aiocb list.
+      if (this->register_aio_with_proactor (0) == -1)
+        {
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
+
+          // @@ Set errno to EAGAIN so that applications will know this as
+          // a queueing failure and try again this aio_read it they want.
+          errno = EAGAIN;
+
+          return -1;
+        }
+
+      // Setup AIOCB.
+      // @@ Priority always 0?
+      // @@ Signal no, always?
+      aiocb_ptr->aio_fildes = result->handle ();
+      aiocb_ptr->aio_offset = result->Offset;
+      aiocb_ptr->aio_buf = result->message_block ().wr_ptr ();
+      aiocb_ptr->aio_nbytes = result->bytes_to_read ();
+      aiocb_ptr->aio_reqprio = 0;
+      aiocb_ptr->aio_sigevent.sigev_notify = SIGEV_NONE;
+      //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
+      aiocb_ptr->aio_sigevent.sigev_value.sival_ptr =
+        (void *) result;
+
+      // Fire off the aio write.
+      if (aio_read (aiocb_ptr) == -1)
+        {
+          // Queueing failed.
+          ACE_ERROR ((LM_ERROR,
+                      "Error:%p\n",
+                      "Asynch_Read_Stream: aio_read queueing failed"));
+
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
+
+          return -1;
+        }
 
-  // Init the base class' implementation also.
-  ACE_Asynch_Operation::implementation (this->implementation_);
+      // Success. Store the aiocb_ptr with Proactor.
+      if (this->register_aio_with_proactor (aiocb_ptr) == -1)
+        {
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
+
+          return -1;
+        }
+    }
+  // Aio successfully issued and ptr stored.
+  return 0;
+
+#else /* ACE_HAS_AIO_CALLS */
+  u_long bytes_read;
+
+  // Initiate the read
+  int initiate_result = ::ReadFile (result->handle (),
+                                    result->message_block ().wr_ptr (),
+                                    result->bytes_to_read (),
+                                    &bytes_read,
+                                    result);
+  if (initiate_result == 1)
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 1;
+
+  // If initiate failed, check for a bad error.
+  errno = ::GetLastError ();
+  switch (errno)
+    {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      return 0;
+
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
+
+      // Cleanup dynamically allocated Asynch_Result
+      delete result;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
+    }
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 // ************************************************************
 
+ACE_Asynch_Read_Stream::Result::Result (ACE_Handler &handler,
+                                        ACE_HANDLE handle,
+                                        ACE_Message_Block &message_block,
+                                        u_long bytes_to_read,
+                                        const void* act,
+                                        ACE_HANDLE event)
+  : ACE_Asynch_Result (handler, act, event),
+    bytes_to_read_ (bytes_to_read),
+    message_block_ (message_block),
+    handle_ (handle)
+{
+}
+
 u_long
 ACE_Asynch_Read_Stream::Result::bytes_to_read (void) const
 {
-  return this->implementation ()->bytes_to_read ();
+  return this->bytes_to_read_;
 }
 
 ACE_Message_Block &
 ACE_Asynch_Read_Stream::Result::message_block (void) const
 {
-  return this->implementation ()->message_block ();
+  return this->message_block_;
 }
 
 ACE_HANDLE
 ACE_Asynch_Read_Stream::Result::handle (void) const
 {
-  return this->implementation ()->handle ();
+  return this->handle_;
 }
 
-ACE_Asynch_Read_Stream::Result::Result (ACE_Asynch_Read_Stream_Result_Impl *implementation)
-  : ACE_Asynch_Result (implementation), 
-    implementation_ (implementation)
+void
+ACE_Asynch_Read_Stream::Result::complete(u_long bytes_transferred,
+                                          int success,
+                                          const void *completion_key,
+                                          u_long error)
 {
-}
+  // Copy the data which was returned by GetQueuedCompletionStatus
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
 
-ACE_Asynch_Read_Stream::Result::~Result (void)
-{
-  // Proactor will delete the implementation after <complete> is
-  // finished.
-}
+  // Appropriately move the pointers in the message block.
+  this->message_block_.wr_ptr (bytes_transferred);
 
-ACE_Asynch_Read_Stream_Result_Impl *
-ACE_Asynch_Read_Stream::Result::implementation (void) const
-{
-  return this->implementation_;
+  // Callback: notify <handler> of completion
+  this->handler_.handle_read_stream (*this);
 }
 
-// ***************************************************
+// ************************************************************
 
 ACE_Asynch_Write_Stream::ACE_Asynch_Write_Stream (void)
-  : implementation_ (0)
 {
 }
 
-ACE_Asynch_Write_Stream::~ACE_Asynch_Write_Stream (void)
+int
+ACE_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
+                                u_long bytes_to_write,
+                                const void *act)
 {
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          message_block,
+                          bytes_to_write,
+                          act,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+  ssize_t return_val = this->shared_write (result);
+  if (return_val == -1)
+    delete result;
+  return return_val;
 }
 
 int
-ACE_Asynch_Write_Stream::open (ACE_Handler &handler,
-                               ACE_HANDLE handle,
-                               const void *completion_key,
-                               ACE_Proactor *proactor)
+ACE_Asynch_Write_Stream::shared_write (ACE_Asynch_Write_Stream::Result *result)
 {
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
+#if defined (ACE_HAS_AIO_CALLS)
+  // Act according to the completion strategy that is set in the
+  // proactor.
+  if (this->proactor ()->posix_completion_strategy () ==
+      ACE_Proactor::RT_SIGNALS)
+    {
+      // Setup AIOCB.
+      // @@ Priority always 0?
+      result->aiocb_ptr ()->aio_fildes = result->handle ();
+      result->aiocb_ptr ()->aio_offset = result->Offset;
+      result->aiocb_ptr ()->aio_buf = result->message_block ().rd_ptr ();
+      result->aiocb_ptr ()->aio_nbytes = result->bytes_to_write ();
+      result->aiocb_ptr ()->aio_reqprio = 0;
+      result->aiocb_ptr ()->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
+      result->aiocb_ptr ()->aio_sigevent.sigev_signo = ACE_SIG_AIO;
+      result->aiocb_ptr ()->aio_sigevent.sigev_value.sival_ptr =
+        (void *) result;
+
+      // Fire off the aio write.
+      if (aio_write (result->aiocb_ptr ()) == -1)
+        // Queueing failed.
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:%p\n",
+                           "Asynch_Write_Stream: aio_write queueing failed"),
+                          -1);
+    }
+  else
+    {
+      // AIO_CONTROL_BLOCKS strategy.
 
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
+      // Make a new AIOCB and issue aio_write, if queueing is possible
+      // store this with the Proactor, so that that can be used for
+      // <aio_return> and <aio_error>.
 
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Write_Stream_Impl *implementation = proactor->create_asynch_write_stream ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class.
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
-}
+      // Allocate aiocb block.
+      aiocb *aiocb_ptr = 0;
+      ACE_NEW_RETURN  (aiocb_ptr,
+                       aiocb,
+                       -1);
 
-int
-ACE_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
-                                u_long bytes_to_write,
-                                const void *act,
-                                int priority,
-                                int signal_number)
-{
-  return this->implementation ()->write (message_block,
-                                         bytes_to_write,
-                                         act,
-                                         priority,
-                                        signal_number);
-}
+      // Make sure there is space in the aiocb list.
+      if (this->register_aio_with_proactor (0) == -1)
+        {
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
 
-ACE_Asynch_Write_Stream_Impl *
-ACE_Asynch_Write_Stream::implementation (void) const
-{
-  return this->implementation_;
-}
+          // @@ Set errno to EAGAIN so that applications will know this as
+          // a queueing failure and try again this aio_read it they want.
+          errno = EAGAIN;
 
-void
-ACE_Asynch_Write_Stream::implementation (ACE_Asynch_Write_Stream_Impl *implementation)
-{
-  this->implementation_ = implementation;
+          return -1;
+        }
+
+      // Setup AIOCB.
+      // @@ Priority always 0?
+      // @@ Signal no, always?
+      aiocb_ptr->aio_fildes = result->handle ();
+      aiocb_ptr->aio_offset = result->Offset;
+      aiocb_ptr->aio_buf = result->message_block ().rd_ptr ();
+      aiocb_ptr->aio_nbytes = result->bytes_to_write ();
+      aiocb_ptr->aio_reqprio = 0;
+      aiocb_ptr->aio_sigevent.sigev_notify = SIGEV_NONE;
+      //this->this->aiocb_.aio_sigevent.sigev_signo = SIGRTMAX;
+      aiocb_ptr->aio_sigevent.sigev_value.sival_ptr =
+        (void *) result;
+
+      // Fire off the aio write.
+      if (aio_write (aiocb_ptr) == -1)
+        {
+          // Queueing failed.
+          ACE_ERROR ((LM_ERROR,
+                      "Error:%p\n",
+                      "Asynch_Write_Stream: aio_write queueing failed"));
+
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
 
-  // Init the base class' implementation also.
-  ACE_Asynch_Operation::implementation (this->implementation_);
+          return -1;
+        }
+
+      // Success. Store the aiocb_ptr with Proactor.
+      if (this->register_aio_with_proactor (aiocb_ptr) == -1)
+        {
+          // Clean up the memory allocated.
+          delete aiocb_ptr;
+
+          return -1;
+        }
+    }
+
+  // Aio successfully issued.
+  return 0;
+
+#else /* ACE_HAS_AIO_CALLS */
+  u_long bytes_written;
+
+  // Initiate the write
+  int initiate_result = ::WriteFile (result->handle (),
+                                     result->message_block ().rd_ptr (),
+                                     result->bytes_to_write (),
+                                     &bytes_written,
+                                     result);
+  if (initiate_result == 1)
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 1;
+
+  // If initiate failed, check for a bad error.
+  errno = ::GetLastError ();
+  switch (errno)
+    {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      return 0;
+
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
+
+      // Cleanup dynamically allocated Asynch_Result
+      delete result;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("WriteFile")), -1);
+    }
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 // ************************************************************
 
+ACE_Asynch_Write_Stream::Result::Result (ACE_Handler &handler,
+                                         ACE_HANDLE handle,
+                                         ACE_Message_Block &message_block,
+                                         u_long bytes_to_write,
+                                         const void* act,
+                                         ACE_HANDLE event)
+  : ACE_Asynch_Result (handler, act, event),
+    bytes_to_write_ (bytes_to_write),
+    message_block_ (message_block),
+    handle_ (handle)
+{
+}
+
 u_long
 ACE_Asynch_Write_Stream::Result::bytes_to_write (void) const
 {
-  return this->implementation ()->bytes_to_write ();
+  return this->bytes_to_write_;
 }
 
 ACE_Message_Block &
 ACE_Asynch_Write_Stream::Result::message_block (void) const
 {
-  return this->implementation ()->message_block ();
+  return this->message_block_;
 }
 
 ACE_HANDLE
 ACE_Asynch_Write_Stream::Result::handle (void) const
 {
-  return this->implementation ()->handle ();
+  return this->handle_;
 }
 
-ACE_Asynch_Write_Stream::Result::Result (ACE_Asynch_Write_Stream_Result_Impl *implementation)
-  : ACE_Asynch_Result (implementation),
-    implementation_ (implementation)
+void
+ACE_Asynch_Write_Stream::Result::complete (u_long bytes_transferred,
+                                           int success,
+                                           const void *completion_key,
+                                           u_long error)
 {
-}
+  // Copy the data which was returned by GetQueuedCompletionStatus
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
 
-ACE_Asynch_Write_Stream::Result::~Result (void)
-{
-  // Proactor will delte the implementation when the <complete> call
-  // finishes.
-}
+  // Appropriately move the pointers in the message block.
+  this->message_block_.rd_ptr (bytes_transferred);
 
-ACE_Asynch_Write_Stream_Result_Impl *
-ACE_Asynch_Write_Stream::Result::implementation (void) const
-{
-  return this->implementation_;
+  // Callback: notify <handler> of completion
+  this->handler_.handle_write_stream (*this);
 }
 
 // ************************************************************
 
-ACE_Asynch_Read_File::ACE_Asynch_Read_File (void)
-  : implementation_ (0)
-{
-} 
-
-ACE_Asynch_Read_File::~ACE_Asynch_Read_File (void)
-{
-} 
-
-int
-ACE_Asynch_Read_File::open (ACE_Handler &handler,
-                            ACE_HANDLE handle,
-                            const void *completion_key,
-                            ACE_Proactor *proactor)
-{
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
-
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
-
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Read_File_Impl *implementation = proactor->create_asynch_read_file ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class.
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
-}
-
 int
 ACE_Asynch_Read_File::read (ACE_Message_Block &message_block,
                             u_long bytes_to_read,
                             u_long offset,
                             u_long offset_high,
-                            const void *act,
-                            int priority,
-                            int signal_number)
+                            const void *act)
 {
-  return this->implementation ()->read (message_block,
-                                        bytes_to_read,
-                                        offset,
-                                        offset_high,
-                                        act,
-                                        priority,
-                                        signal_number);
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          message_block,
+                          bytes_to_read,
+                          act,
+                          offset,
+                          offset_high,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+  return this->shared_read (result);
 }
 
-ACE_Asynch_Read_File_Impl *
-ACE_Asynch_Read_File::implementation (void) const
+// ************************************************************
+
+ACE_Asynch_Read_File::Result::Result (ACE_Handler &handler,
+                                      ACE_HANDLE handle,
+                                      ACE_Message_Block &message_block,
+                                      u_long bytes_to_read,
+                                      const void* act,
+                                      u_long offset,
+                                      u_long offset_high,
+                                      ACE_HANDLE event)
+  : ACE_Asynch_Read_Stream::Result (handler, handle, message_block, bytes_to_read, act, event)
 {
-  return this->implementation_;
+  this->Offset = offset;
+  this->OffsetHigh = offset_high;
 }
 
 void
-ACE_Asynch_Read_File::implementation (ACE_Asynch_Read_File_Impl *implementation)
+ACE_Asynch_Read_File::Result::complete (u_long bytes_transferred,
+                                        int success,
+                                        const void *completion_key,
+                                        u_long error)
 {
-  this->implementation_ = implementation;
+  // Copy the data which was returned by GetQueuedCompletionStatus.
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
+
+  // Appropriately move the pointers in the message block.
+  this->message_block_.wr_ptr (bytes_transferred);
 
-  // Set also the base class' implementation.
-  ACE_Asynch_Read_Stream::implementation (implementation);
+  // Callback: notify <handler> of completion.
+  this->handler_.handle_read_file (*this);
 }
 
 // ************************************************************
 
-ACE_Asynch_Read_File::Result::Result (ACE_Asynch_Read_File_Result_Impl *implementation)
-  : ACE_Asynch_Read_Stream::Result (implementation),
-    implementation_ (implementation)
-{
-}
-  
-ACE_Asynch_Read_File::Result::~Result (void)
+int
+ACE_Asynch_Write_File::write (ACE_Message_Block &message_block,
+                              u_long bytes_to_write,
+                              u_long offset,
+                              u_long offset_high,
+                              const void *act)
 {
-  // Proactor will delete the implementation when <complete> call
-  // completes.
-}
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          message_block,
+                          bytes_to_write,
+                          act,
+                          offset,
+                          offset_high,
+                          this->proactor_->get_handle ()),
+                  -1);
 
-ACE_Asynch_Read_File_Result_Impl *
-ACE_Asynch_Read_File::Result::implementation (void) const
-{
-  return this->implementation_;
+  return this->shared_write (result);
 }
 
 // ************************************************************
 
-ACE_Asynch_Write_File::ACE_Asynch_Write_File (void)
-  : implementation_ (0)
+ACE_Asynch_Write_File::Result::Result (ACE_Handler &handler,
+                                       ACE_HANDLE handle,
+                                       ACE_Message_Block &message_block,
+                                       u_long bytes_to_write,
+                                       const void* act,
+                                       u_long offset,
+                                       u_long offset_high,
+                                       ACE_HANDLE event)
+  : ACE_Asynch_Write_Stream::Result (handler, handle, message_block, bytes_to_write, act, event)
 {
+  this->Offset = offset;
+  this->OffsetHigh = offset_high;
 }
 
-ACE_Asynch_Write_File::~ACE_Asynch_Write_File (void)
+void
+ACE_Asynch_Write_File::Result::complete (u_long bytes_transferred,
+                                         int success,
+                                         const void *completion_key,
+                                         u_long error)
 {
+  // Copy the data which was returned by GetQueuedCompletionStatus
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
+
+  // Appropriately move the pointers in the message block.
+  this->message_block_.rd_ptr (bytes_transferred);
+
+  // Callback: notify <handler> of completion
+  this->handler_.handle_write_file (*this);
 }
 
-int
-ACE_Asynch_Write_File::open (ACE_Handler &handler,
-                             ACE_HANDLE handle,
-                             const void *completion_key,
-                             ACE_Proactor *proactor)
+// ************************************************************
+
+#if defined (ACE_HAS_AIO_CALLS)
+class ACE_Export ACE_Asynch_Accept_Handler : public ACE_Event_Handler
 {
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
+  // = TITLE
+  //     For the POSIX implementation, this class takes care of doing
+  //     Asynch_Accept.
+  //
+  // = DESCRIPTION
+  //
+public:
+  ACE_Asynch_Accept_Handler (ACE_Reactor* reactor = 0,
+                             ACE_Proactor* proactor = 0);
+  // Constructor. Give the reactor so that it can activate/deactivate
+  // the handlers. Give also the proactor used here, so that the
+  // handler can send information through the notification pipe of the
+  // proactor, in case AIO_CONTROL_BLOCKS strategy is used.
 
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
+  ~ACE_Asynch_Accept_Handler (void);
+  // Destructor.
 
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Write_File_Impl *implementation = proactor->create_asynch_write_file ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class.
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
-}
+  int register_accept_call (ACE_Asynch_Accept::Result* result);
+  // Register this <accept> call with the local handler.
 
-int
-ACE_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                              u_long bytes_to_write,
-                              u_long offset,
-                              u_long offset_high,
-                              const void *act,
-                              int priority,
-                              int signal_number)
+  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
+  // Called when accept event comes up on the <listen_handle>.
+
+private:
+  ACE_Asynch_Accept::Result* deregister_accept_call (void);
+  // Undo the things done when registering.
+
+  ACE_Unbounded_Queue<ACE_Asynch_Accept::Result*> result_queue_;
+  // Queue of Result pointers that correspond to all the <accept>'s
+  // pending.
+
+  ACE_Reactor *reactor_;
+  // Reactor used by the Asynch_Accept. We need this here to enable
+  // and disable the <handle> now and then, depending on whether any
+  // <accept> is pending or no.
+
+  ACE_SYNCH_MUTEX lock_;
+  // The lock to protect the  result queue which is shared. The queue
+  // is updated by main thread in the register function call and
+  // through the auxillary thread  in the deregister fun. So let us
+  // mutex it.
+
+  ACE_Proactor *proactor_;
+  // Proactor used by the Asynch_Accept class.
+};
+
+ACE_Asynch_Accept_Handler::ACE_Asynch_Accept_Handler (ACE_Reactor* reactor,
+                                                      ACE_Proactor* proactor)
+  : reactor_ (reactor),
+    proactor_ (proactor)
 {
-  return this->implementation ()->write (message_block,
-                                         bytes_to_write,
-                                         offset,
-                                         offset_high,
-                                         act,
-                                         priority,
-                                         signal_number);
 }
 
-ACE_Asynch_Write_File_Impl *
-ACE_Asynch_Write_File::implementation (void) const
+ACE_Asynch_Accept_Handler::~ACE_Asynch_Accept_Handler (void)
 {
-  return this->implementation_;
 }
 
-void
-ACE_Asynch_Write_File::implementation (ACE_Asynch_Write_File_Impl *implementation)
+int
+ACE_Asynch_Accept_Handler::register_accept_call (ACE_Asynch_Accept::Result* result)
 {
-  this->implementation_ = implementation;
-  
-  // Init the base class' implementation also.
-  ACE_Asynch_Write_Stream::implementation (implementation);
-}
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept_Handler::register_accept_call called\n"));
 
-// ************************************************************
+  // The queue is updated by main thread in the register function call
+  // and thru the auxillary thread in the deregister fun. So let us
+  // mutex it.
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
-ACE_Asynch_Write_File::Result::Result (ACE_Asynch_Write_File_Result_Impl *implementation)
-  : ACE_Asynch_Write_Stream::Result (implementation),
-    implementation_ (implementation)
-{
-}
+  // Insert this result to the queue.
+  int insert_result = this->result_queue_.enqueue_tail (result);
+  if (insert_result == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%N:%l:ACE_Asynch_Accept_Handler::register_accept_call failed\n"),
+                      -1);
 
-ACE_Asynch_Write_File::Result::~Result (void)
-{
-  // Proactor will delete the implementation when the <complete> call
-  // completes. 
+  // If this is the only item, then it means there the set was empty
+  // before. So enable the <handle> in the reactor.
+  if (this->result_queue_.size () == 1)
+    {
+      int return_val = this->reactor_->resume_handler (result->listen_handle ());
+      if (return_val != 0)
+        return return_val;
+    }
+  
+  return 0;
 }
 
-ACE_Asynch_Write_File_Result_Impl *
-ACE_Asynch_Write_File::Result::implementation (void) const
+ACE_Asynch_Accept::Result *
+ACE_Asynch_Accept_Handler::deregister_accept_call (void)
 {
-  return this->implementation_;
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept_Handler::deregister_accept_call\n"));
+  
+  // The queue is updated by main thread in the register function call and
+  // thru the auxillary thread  in the deregister fun. So let us mutex
+  // it.
+  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+
+  // Get the first item (result ptr) from the Queue.
+  ACE_Asynch_Accept::Result* result = 0;
+  int return_dequeue = this->result_queue_.dequeue_head (result);
+  if (return_dequeue == -1)
+    return 0;
+  
+  ACE_ASSERT (result != 0);
+
+  // Disable the <handle> in the reactor if no <accept>'s are pending.
+  if (this->result_queue_.size () == 0)
+    {
+      int return_val = this->reactor_->suspend_handler (result->listen_handle ()); 
+      if (return_val != 0)
+        return 0;
+    }
+
+  // Return the result pointer.
+  return result;
 }
 
-// *********************************************************************
+int
+ACE_Asynch_Accept_Handler::handle_input (ACE_HANDLE fd)
+{
+  // An <accept> has been sensed on the <listen_handle>. We should be
+  // able to just go ahead and do the <accept> now on this <fd>. This
+  // should be the same as the <listen_handle>.
+
+  // @@ Debugging.
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept_Handler::handle_input called\n"));
+
+  // Deregister this info pertaining to this <accept> call.
+  ACE_Asynch_Accept::Result* result = this->deregister_accept_call ();
+
+  // @@ Debugging.
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t):ACE_Asynch_Accept_Handler::handle_input : fd = [%d], Result->listen_handle = [%d]\n",
+              fd,
+              result->listen_handle ()));
+
+  // Issue <accept> now.
+  // @@ We shouldnt block here since we have already done poll/select
+  // thru reactor. But are we sure?
+  ACE_HANDLE new_handle = ACE_OS::accept (result->listen_handle (), 0, 0);
+  if (new_handle == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:(%P | %t):%p\n",
+                       "<accept> system call failed"),
+                      -1);
+
+  // Accept has completed.
+
+  // Store the new handle.
+  result->accept_handle_ = new_handle;
+
+  // Notify the mail process about this completion
+  // Signal the main process about this completion or send the result
+  // pointer thru the notify pipe depending on what is Completion
+  // Notification Strategy.
+  switch (this->proactor_->posix_completion_strategy ())
+    {
+    case ACE_Proactor::RT_SIGNALS:
+      // Queue a signal to the proactor.
+      {
+        // @@ Debugging.
+        ACE_DEBUG ((LM_DEBUG,
+                    "ACE_Asynch_Accept_Handler::handle_input: RT_SIGNALS\n"));
+
+        // Get this process id.
+        pid_t pid = ACE_OS::getpid ();
+        if (pid == (pid_t) -1)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Error:(%P | %t):%p",
+                           "<getpid> failed\n"),
+                          -1);
+
+      // Set the signal information.
+      sigval value;
+      value.sival_ptr = (void *) result;
+
+      // Queue the signal.
+      if (sigqueue (pid, ACE_SIG_AIO, value) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:(%P | %t):%p",
+                           "<sigqueue> failed\n"),
+                          -1);
+      }
+      break;
+
+    case ACE_Proactor::AIO_CONTROL_BLOCKS:
+      // @@ Debugging.
+      ACE_DEBUG ((LM_DEBUG,
+                  "ACE_Asynch_Accept_Handler::handle_input: AIO_CONTROL_BLOCKS\n"));
+
+      // Send the Result through the notification pipe.
+      if (this->proactor_->notify_asynch_accept (result) == -1)
+        return -1;
+      break;
+
+    default:
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "%N:%l:Unknow POSIX_COMPLETION_STRATEGY\n"),
+                        -1);
+    }
 
+  return 0;
+}
+#endif /* ACE_HAS_AIO_CALLS */
+
+#if defined (ACE_HAS_AIO_CALLS)
+// We need accept handlers here.
 ACE_Asynch_Accept::ACE_Asynch_Accept (void)
-  : implementation_ (0)
+  : accept_handler_ (0)
 {
 }
-
-ACE_Asynch_Accept::~ACE_Asynch_Accept (void)
+#else /* Not ACE_HAS_AIO_CALLS */
+ACE_Asynch_Accept::ACE_Asynch_Accept (void)
 {
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
+#if defined (ACE_HAS_AIO_CALLS)
 int
 ACE_Asynch_Accept::open (ACE_Handler &handler,
                          ACE_HANDLE handle,
                          const void *completion_key,
                          ACE_Proactor *proactor)
 {
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept::open called\n"));
 
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
+  // Common things to register for any Asynch Operation. We need to
+  // call the base class' <open>  method.
+  int result_open = this->ACE_Asynch_Operation::open (handler,
+                                                      handle,
+                                                      completion_key,
+                                                      proactor);
+  if (result_open < 0)
+    return result_open;
 
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Accept_Impl *implementation = proactor->create_asynch_accept ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class.
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
+  // Init the Asynch_Accept_Handler now. Only now it can be inited,
+  // because it needs to keep Proactor also with it.
+  ACE_NEW_RETURN (this->accept_handler_,
+                  ACE_Asynch_Accept_Handler (&this->reactor_,
+                                             this->proactor_),
+                  -1);
+
+  // Register the handle with the reactor.
+  this->reactor_.register_handler (this->handle_,
+                                   this->accept_handler_,
+                                   ACE_Event_Handler::ACCEPT_MASK);
+
+  // Suspend the <handle> now. Enable only when the <accept> is issued
+  // by the application.
+  this->reactor_.suspend_handler (this->handle_);
+
+  // Spawn the thread. It is the only thread we are going to have. It
+  // will do the <handle_events> on the reactor.
+  ACE_Thread_Manager::instance ()->spawn (ACE_Asynch_Accept::thread_function,
+                                          (void *)&this->reactor_);
+
+  return 0;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
 int
 ACE_Asynch_Accept::accept (ACE_Message_Block &message_block,
                            u_long bytes_to_read,
                            ACE_HANDLE accept_handle,
-                           const void *act,
-                           int priority,
-                           int signal_number)
+                           const void *act)
 {
-  return this->implementation ()->accept (message_block,
-                                          bytes_to_read,
-                                          accept_handle,
-                                          act,
-                                          priority,
-                                          signal_number);
-}
+#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS))
 
-ACE_Asynch_Accept_Impl *
-ACE_Asynch_Accept::implementation (void)  const
-{
-  return this->implementation_;
+  // @@ Debugging.
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept::accept called\n"));
+
+  // Common code for both WIN and POSIX.
+
+  // Sanity check: make sure that enough space has been allocated by
+  // the caller.
+  size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr);
+  size_t space_in_use = message_block.wr_ptr () - message_block.base ();
+  size_t total_size = message_block.size ();
+  size_t available_space = total_size - space_in_use;
+  size_t space_needed = bytes_to_read + 2 * address_size;
+  if (available_space < space_needed)
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Buffer too small\n")), -1);
+
+#if !defined (ACE_HAS_AIO_CALLS)
+  // WIN Specific.
+
+  int close_accept_handle = 0;
+  // If the <accept_handle> is invalid, we will create a new socket.
+  if (accept_handle == ACE_INVALID_HANDLE)
+    {
+      accept_handle = ACE_OS::socket (PF_INET,
+                                      SOCK_STREAM,
+                                      0);
+      if (accept_handle == ACE_INVALID_HANDLE)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("ACE_OS::socket")), -1);
+      else
+        // Remember to close the socket down if failures occur.
+        close_accept_handle = 1;
+    }
+#endif /* Not ACE_HAS_AIO_CALLS */
+
+  // Common code for both WIN and POSIX.
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          accept_handle,
+                          message_block,
+                          bytes_to_read,
+                          act,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+#if defined (ACE_HAS_AIO_CALLS)
+  // Code specific to the POSIX Implementation.
+
+  // Register this <accept> call with the local handler.
+  this->accept_handler_->register_accept_call (result);
+
+  return 0;
+#else /* Not ACE_HAS_AIO_CALLS */
+  // Code specific to WIN platforms.
+
+  u_long bytes_read;
+
+  // Initiate the accept.
+  int initiate_result = ::AcceptEx ((SOCKET) result->listen_handle (),
+                                    (SOCKET) result->accept_handle (),
+                                    result->message_block ().wr_ptr (),
+                                    result->bytes_to_read (),
+                                    address_size,
+                                    address_size,
+                                    &bytes_read,
+                                    result);
+  if (initiate_result == 1)
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 1;
+
+  // If initiate failed, check for a bad error.
+  errno = ::GetLastError ();
+  switch (errno)
+    {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      return 0;
+
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
+
+      if (close_accept_handle == 1)
+        // Close the newly created socket
+        ACE_OS::closesocket (accept_handle);
+
+      // Cleanup dynamically allocated Asynch_Result.
+      delete result;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
+    }
+#endif /* ACE_HAS_AIO_CALLS */
+
+#else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */
+  ACE_NOTSUP_RETURN (-1);
+#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */
 }
 
-void
-ACE_Asynch_Accept::implementation (ACE_Asynch_Accept_Impl *implementation)
+#if defined (ACE_HAS_AIO_CALLS)
+void*
+ACE_Asynch_Accept::thread_function (void* arg_reactor)
 {
-  this->implementation_ = implementation;
-  // Set the implementation in the base class.
-  ACE_Asynch_Operation::implementation (implementation);
+  ACE_DEBUG ((LM_DEBUG, "ACE_Asynch_Accept::thread_function called\n"));
+
+  // Retrieve the reactor pointer from the argument.
+  ACE_Reactor* reactor = (ACE_Reactor *) arg_reactor;
+  if (reactor == 0)
+    reactor = ACE_Reactor::instance ();
+
+  // For this reactor, this thread is the owner.
+  reactor->owner (ACE_OS::thr_self ());
+
+  // Handle events.
+  int result = 0;
+  while (result != -1)
+    {
+      result = reactor->handle_events ();
+      ACE_DEBUG ((LM_DEBUG,
+                  "ACE_Asynch_Accept::Thread_Function : handle_events : result = [%d]\n",
+                  result));
+    }
+
+  ACE_DEBUG ((LM_DEBUG, "Exiting ACE_Asynch_Accept::thread_function \n"));
+  return 0;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
 // ************************************************************
 
 u_long
 ACE_Asynch_Accept::Result::bytes_to_read (void) const
 {
-  return this->implementation ()->bytes_to_read ();
+  return this->bytes_to_read_;
 }
 
 ACE_Message_Block &
 ACE_Asynch_Accept::Result::message_block (void) const
 {
-  return this->implementation ()->message_block ();
+  return this->message_block_;
 }
 
 ACE_HANDLE
 ACE_Asynch_Accept::Result::listen_handle (void) const
 {
-  return this->implementation ()->listen_handle ();
+  return this->listen_handle_;
 }
 
 ACE_HANDLE
 ACE_Asynch_Accept::Result::accept_handle (void) const
 {
-  return this->implementation ()->accept_handle ();
+  return this->accept_handle_;
 }
 
-ACE_Asynch_Accept::Result::Result (ACE_Asynch_Accept_Result_Impl *implementation)
-  : ACE_Asynch_Result (implementation),
-    implementation_ (implementation)
+ACE_Asynch_Accept::Result::Result (ACE_Handler &handler,
+                                   ACE_HANDLE listen_handle,
+                                   ACE_HANDLE accept_handle,
+                                   ACE_Message_Block &message_block,
+                                   u_long bytes_to_read,
+                                   const void* act,
+                                   ACE_HANDLE event)
+  : ACE_Asynch_Result (handler, act, event),
+    bytes_to_read_ (bytes_to_read),
+    message_block_ (message_block),
+    listen_handle_ (listen_handle),
+    accept_handle_ (accept_handle)
 {
 }
 
-ACE_Asynch_Accept::Result::~Result (void)
+void
+ACE_Asynch_Accept::Result::complete (u_long bytes_transferred,
+                                     int success,
+                                     const void *completion_key,
+                                     u_long error)
 {
-  // Proactor will delete the implementation when the <complete> call
-  // completes.
-}
+  // Copy the data which was returned by GetQueuedCompletionStatus
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
 
-ACE_Asynch_Accept_Result_Impl *
-ACE_Asynch_Accept::Result::implementation (void) const
-{
-  return this->implementation_;
+  // Appropriately move the pointers in the message block.
+  this->message_block_.wr_ptr (bytes_transferred);
+
+  // Callback: notify <handler> of completion.
+  this->handler_.handle_accept (*this);
 }
 
 // ************************************************************
 
-ACE_Asynch_Transmit_File::ACE_Asynch_Transmit_File (void)
-  : implementation_ (0)
+#if defined (ACE_HAS_AIO_CALLS)
+class ACE_Export ACE_Asynch_Transmit_Handler : public ACE_Handler
+{
+  // = TITLE
+  //     Auxillary handler for doing <Asynch_Transmit_File> in
+  //     Unix. <ACE_Asynch_Transmit_File> internally uses this.
+  //
+  // = DESCRIPTION
+  //     This is a helper class for implementing
+  //     <ACE_Asynch_Transmit_File> in Unix systems.
+public:
+  ACE_Asynch_Transmit_Handler (ACE_Asynch_Transmit_File::Result *result);
+  // Constructor. Result pointer will have all the information to do
+  // the file transmission (socket, file, application handler, bytes
+  // to write).
+
+  virtual ~ACE_Asynch_Transmit_Handler (void);
+  // Destructor.
+
+  int transmit (void);
+  // Do the transmission. All the info to do the transmission is in
+  // the <result> member.
+
+protected:
+  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
+  // This is called when asynchronous writes from the socket complete.
+
+  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
+  // This is called when asynchronous reads from the file complete.
+private:
+  int initiate_read_file (void);
+  // Issue asynch read from  the file.
+
+  ACE_Asynch_Transmit_File::Result *result_;
+  // The asynch result pointer made from the initial transmit file
+  // request.
+  
+  ACE_Asynch_Read_File rf_;
+  // To read from the file to be transmitted.
+
+  ACE_Asynch_Write_Stream ws_;
+  // Write stream to write the header, trailer and the data.
+
+  ACE_Message_Block *mb_;
+  // Message bloack used to do the transmission.
+
+  enum ACT
+  {
+    HEADER_ACT  = 1,
+    DATA_ACT    = 2,
+    TRAILER_ACT = 3
+  };
+
+  ACT header_act_;
+  ACT data_act_;
+  ACT trailer_act_;
+  // ACT to transmit header, data and trailer.
+
+  size_t file_offset_;
+  // Current offset of the file being transmitted.
+
+  size_t file_size_;
+  // Total size of the file.
+
+  size_t bytes_transferred_;
+  // Number of bytes transferred on the stream.
+};
+
+// Constructor.
+ACE_Asynch_Transmit_Handler::ACE_Asynch_Transmit_Handler (ACE_Asynch_Transmit_File::Result *result)
+  : result_ (result),
+    mb_ (0),
+    header_act_ (this->HEADER_ACT),
+    data_act_ (this->DATA_ACT),
+    trailer_act_ (this->TRAILER_ACT),
+    file_offset_ (result->offset ()),
+    file_size_ (0),
+    bytes_transferred_ (0)
+{
+  // Allocate memory for the message block.
+  ACE_NEW (this->mb_,
+           ACE_Message_Block (this->result_->bytes_per_send ()
+                              + 1));
+  // Init the file size.
+  file_size_ = ACE_OS::filesize (this->result_->file ());
+}
+
+// Destructor.
+ACE_Asynch_Transmit_Handler::~ACE_Asynch_Transmit_Handler (void)
+{
+  delete result_;
+  mb_->release ();
+}
+
+// Do the transmission.
+// Initiate transmitting the header. When that completes
+// handle_write_stream will be called, there start transmitting the file.
+int
+ACE_Asynch_Transmit_Handler::transmit (void)
+{
+  // Open Asynch_Read_File.
+  if (this->rf_.open (*this,
+                      this->result_->file ()) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "ACE_Asynch_Transmit_Handler:read_file open failed\n"),
+                      -1);
+
+  // Open Asynch_Write_Stream.
+  if (this->ws_.open (*this,
+                      this->result_->socket ()) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "ACE_Asynch_Transmit_Handler:write_stream open failed\n"),
+                      -1);
+
+  // Transmit the header.
+  if (this->ws_.write (*this->result_->header_and_trailer ()->header (),
+                       this->result_->header_and_trailer ()->header_bytes (),
+                       (void *) &this->header_act_) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
+                      -1);
+  return 0;
+}
+
+void
+ACE_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 {
+  // Update bytes transferred so far.
+  this->bytes_transferred_ += result.bytes_transferred ();
+
+  // Check the success parameter.
+  if (result.success () == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  "Asynch_Transmit_File failed.\n"));
+      
+      // Check the success parameter.
+      if (result.success () == 0)
+        {
+          // Failure.
+          ACE_ERROR ((LM_ERROR,
+                      "Asynch_Transmit_File failed.\n"));
+          
+          ACE_SEH_TRY
+            {
+              this->result_->complete (this->bytes_transferred_,
+                                       0,      // Failure.
+                                       0,      // @@ Completion key.
+                                       0);     // @@ Error no.
+            }
+          ACE_SEH_FINALLY
+            {
+              // This is crucial to prevent memory leaks. This deletes
+              // the result pointer also.
+              delete this;
+            }
+        }
+    }
+
+  // Write stream successful.
+
+  // Partial write to socket.
+  int unsent_data = result.bytes_to_write () - result.bytes_transferred ();
+  if (unsent_data != 0)
+    {
+      // Reset pointers.
+      result.message_block ().rd_ptr (result.bytes_transferred ());
+
+      // Duplicate the message block and retry remaining data
+      if (this->ws_.write (*result.message_block ().duplicate (),
+                           unsent_data,
+                           result.act ()) == -1)
+        {
+          // @@ Handle this error.
+          ACE_ERROR ((LM_ERROR,
+                      "Asynch_Transmit_Handler:write_stream failed\n"));
+          return;
+        }
+
+      // @@ Handling *partial write* to a socket.  Let us not continue
+      // further before this write finishes. Because proceeding with
+      // another read and then write might change the order of the
+      // file transmission, because partial write to the stream is
+      // always possible.
+      return;
+    }
+  
+  // Not a partial write. A full write.
+
+  // Check ACT to see what was sent.
+  ACT act = *(ACT *) result.act ();
+
+  switch (act)
+    {
+    case TRAILER_ACT:
+      // If it is the "trailer" that is just sent, then transmit file
+      // is complete. 
+      // Call the application handler.
+      ACE_SEH_TRY
+        {
+          this->result_->complete (this->bytes_transferred_,
+                                   1,      // @@ Success.
+                                   0,      // @@ Completion key.
+                                   0);     // @@ Errno.
+        }
+      ACE_SEH_FINALLY
+        {
+          delete this;
+        }
+      break;
+
+    case HEADER_ACT:
+    case DATA_ACT:
+      // If header/data was sent, initiate the file data transmission.
+      if (this->initiate_read_file () == -1)
+        // @@ Handle this error.
+        ACE_ERROR ((LM_ERROR,
+                    "Error:Asynch_Transmit_Handler:read_file couldnt be initiated\n"));
+      break;
+      
+    default:
+      // @@ Handle this error.
+      ACE_ERROR ((LM_ERROR,
+                  "Error:ACE_Asynch_Transmit_Handler::handle_write_stream::Unexpected act\n"));
+    }
 }
 
-ACE_Asynch_Transmit_File::~ACE_Asynch_Transmit_File (void)
+void
+ACE_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File::Result &result)
 {
+  // Failure.
+  if (result.success () == 0)
+    {
+      //
+      ACE_SEH_TRY
+        {
+          this->result_->complete (this->bytes_transferred_,
+                                   0,      // Failure.
+                                   0,      // @@ Completion key.
+                                   errno); // Error no.
+        }
+      ACE_SEH_FINALLY
+        {
+          delete this;
+        }
+      return;
+    }
+
+  // Read successful.
+  if (result.bytes_transferred () == 0)
+    return;
+
+  // Increment offset and write data to network.
+  this->file_offset_ += result.bytes_transferred ();
+  if (this->ws_.write (result.message_block (),
+                       result.bytes_transferred (),
+                       (void *)&this->data_act_) == -1)
+    {
+      // @@ Handle this error.
+      ACE_ERROR ((LM_ERROR,
+                  "Error:ACE_Asynch_Transmit_File : write to the stream failed\n"));
+      return;
+    }
 }
 
 int
-ACE_Asynch_Transmit_File::open (ACE_Handler &handler,
-                                ACE_HANDLE handle,
-                                const void *completion_key,
-                                ACE_Proactor *proactor)
+ACE_Asynch_Transmit_Handler::initiate_read_file (void)
 {
-  // Get a proactor for/from the user.
-  proactor = this->get_proactor (proactor, handler);
+  // Is there something to read.
+  if (this->file_offset_ >= this->file_size_)
+    {
+      // File is sent. Send the trailer.
+      if (this->ws_.write (*this->result_->header_and_trailer ()->trailer (),
+                           this->result_->header_and_trailer ()->trailer_bytes (),
+                           (void *)&this->trailer_act_) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:Asynch_Transmit_Handler:write_stream writing trailer failed\n"),
+                          -1);
+      return 0;
+    }
+  else
+    {
+      // Inititiate an asynchronous read from the file.
+      if (this->rf_.read (*this->mb_,
+                          this->mb_->size () - 1,
+                          this->file_offset_) == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:Asynch_Transmit_Handler::read from file failed\n"),
+                          -1);
+      return 0;
+    }
+}
+#endif /* ACE_HAS_AIO_CALLS */
 
-  // Delete the old implementation.
-  delete this->implementation_;
-  this->implementation_ = 0;
+// ************************************************************
 
-  // Now let us get the implementation initialized.
-  ACE_Asynch_Transmit_File_Impl *implementation = proactor->create_asynch_transmit_file ();
-  if (implementation == 0)
-    return -1;
-  
-  // Set the implementation class
-  this->implementation (implementation);
-  
-  // Call the <open> method of the base class.
-  return ACE_Asynch_Operation::open (handler,
-                                     handle,
-                                     completion_key,
-                                     proactor);
+ACE_Asynch_Transmit_File::ACE_Asynch_Transmit_File (void)
+{
 }
 
 int
@@ -715,88 +1540,209 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
                                          u_long offset_high,
                                          u_long bytes_per_send,
                                          u_long flags,
-                                         const void *act,
-                                         int priority,
-                                         int signal_number)
-{
-  return this->implementation ()->transmit_file (file,
-                                                 header_and_trailer,
-                                                 bytes_to_write,
-                                                 offset,
-                                                 offset_high,
-                                                 bytes_per_send,
-                                                 flags,
-                                                 act,
-                                                 priority,
-                                                 signal_number);
-}
+                                         const void *act)
+{
+#if defined (ACE_HAS_AIO_CALLS)
+  // Adjust these parameters if there are default values specified.
+  ssize_t file_size = ACE_OS::filesize (file);
+
+  if (file_size == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p\n",
+                       ":Asynch_Transmit_File:Couldnt know the file size"),
+                      -1);
+
+  if (bytes_to_write == 0)
+    bytes_to_write = file_size;
+
+  if (offset > (size_t) file_size)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p\n",
+                       "Asynch_Transmit_File:File size is less than offset"),
+                      -1);
+
+  if (offset != 0)
+    bytes_to_write = file_size - offset + 1;
+
+  if (bytes_per_send == 0)
+    bytes_per_send = bytes_to_write;
+
+  // Configure the result parameter.
+  Result *result = 0;
+
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          file,
+                          header_and_trailer,
+                          bytes_to_write,
+                          offset,
+                          offset_high,
+                          bytes_per_send,
+                          flags,
+                          act,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+  // Make the auxillary handler and initiate transmit.
+  ACE_Asynch_Transmit_Handler *transmit_handler = 0;
+
+  ACE_NEW_RETURN (transmit_handler,
+                  ::ACE_Asynch_Transmit_Handler (result),
+                  -1);
+
+  ssize_t return_val = transmit_handler->transmit ();
+
+  if (return_val == -1)
+    // This deletes the <result> in it too.
+    delete transmit_handler;
+
+  return 0;
+
+#elif (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
+  Result *result = 0;
+  ACE_NEW_RETURN (result,
+                  Result (*this->handler_,
+                          this->handle_,
+                          file,
+                          header_and_trailer,
+                          bytes_to_write,
+                          offset,
+                          offset_high,
+                          bytes_per_send,
+                          flags,
+                          act,
+                          this->proactor_->get_handle ()),
+                  -1);
+
+  ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers = 0;
+  if (result->header_and_trailer () != 0)
+    transmit_buffers = result->header_and_trailer ()->transmit_buffers ();
+
+  // Initiate the transmit file
+  int initiate_result = ::TransmitFile ((SOCKET) result->socket (),
+                                        result->file (),
+                                        result->bytes_to_write (),
+                                        result->bytes_per_send (),
+                                        result,
+                                        transmit_buffers,
+                                        result->flags ());
+  if (initiate_result == 1)
+    // Immediate success: the OVERLAPPED will still get queued.
+    return 1;
+
+  // If initiate failed, check for a bad error.
+  errno = ::GetLastError ();
+  switch (errno)
+    {
+    case ERROR_IO_PENDING:
+      // The IO will complete proactively: the OVERLAPPED will still
+      // get queued.
+      return 0;
 
-ACE_Asynch_Transmit_File_Impl *
-ACE_Asynch_Transmit_File::implementation (void) const
-{
-  return this->implementation_;
-}
+    default:
+      // Something else went wrong: the OVERLAPPED will not get
+      // queued.
 
-void
-ACE_Asynch_Transmit_File::implementation (ACE_Asynch_Transmit_File_Impl *implementation)
-{
-  this->implementation_ = implementation;
-  // Set the base class' implementation also.
-  ACE_Asynch_Operation::implementation (this->implementation_);
+      // Cleanup dynamically allocated Asynch_Result
+      delete result;
+
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("TransmitFile")), -1);
+    }
+#else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
+  ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
-// ***********************************************************************************
+// ************************************************************
 
 ACE_HANDLE
 ACE_Asynch_Transmit_File::Result::socket (void) const
 {
-  return this->implementation ()->socket ();
+  return this->socket_;
 }
 
 ACE_HANDLE
 ACE_Asynch_Transmit_File::Result::file (void) const
 {
-  return this->implementation ()->file ();
+  return this->file_;
 }
 
 ACE_Asynch_Transmit_File::Header_And_Trailer *
 ACE_Asynch_Transmit_File::Result::header_and_trailer (void) const
 {
-  return this->implementation ()->header_and_trailer ();
+  return this->header_and_trailer_;
 }
 
 u_long
 ACE_Asynch_Transmit_File::Result::bytes_to_write (void) const
 {
-  return this->implementation ()->bytes_to_write ();
+  return this->bytes_to_write_;
 }
 
 u_long
 ACE_Asynch_Transmit_File::Result::bytes_per_send (void) const
 {
-  return this->implementation ()->bytes_per_send ();
+  return this->bytes_per_send_;
 }
 
 u_long
 ACE_Asynch_Transmit_File::Result::flags (void) const
 {
-  return this->implementation ()->flags ();
+  return this->flags_;
 }
 
-ACE_Asynch_Transmit_File::Result::Result (ACE_Asynch_Transmit_File_Result_Impl *implementation)
-  : ACE_Asynch_Result (implementation),
-    implementation_ (implementation)
+ACE_Asynch_Transmit_File::Result::Result (ACE_Handler &handler,
+                                          ACE_HANDLE socket,
+                                          ACE_HANDLE file,
+                                          Header_And_Trailer *header_and_trailer,
+                                          u_long bytes_to_write,
+                                          u_long offset,
+                                          u_long offset_high,
+                                          u_long bytes_per_send,
+                                          u_long flags,
+                                          const void *act,
+                                          ACE_HANDLE event)
+  : ACE_Asynch_Result (handler, act, event, offset, offset_high),
+    socket_ (socket),
+    file_ (file),
+    header_and_trailer_ (header_and_trailer),
+    bytes_to_write_ (bytes_to_write),
+    bytes_per_send_ (bytes_per_send),
+    flags_ (flags)
 {
 }
 
-ACE_Asynch_Transmit_File::Result::~Result (void)
-{
-}
+void
+ACE_Asynch_Transmit_File::Result::complete (u_long bytes_transferred,
+                                            int success,
+                                            const void *completion_key,
+                                            u_long error)
+{
+  // Copy the data which was returned by GetQueuedCompletionStatus
+  this->bytes_transferred_ = bytes_transferred;
+  this->success_ = success;
+  this->completion_key_ = completion_key;
+  this->error_ = error;
+
+  // We will not do this because (a) the header and trailer blocks may
+  // be the same message_blocks and (b) in cases of failures we have
+  // no idea how much of what (header, data, trailer) was sent.
+  /*
+    if (this->success_ && this->header_and_trailer_ != 0)
+    {
+    ACE_Message_Block *header = this->header_and_trailer_->header ();
+    if (header != 0)
+    header->rd_ptr (this->header_and_trailer_->header_bytes ());
 
-ACE_Asynch_Transmit_File_Result_Impl *
-ACE_Asynch_Transmit_File::Result::implementation (void) const
-{
-  return this->implementation_;
+    ACE_Message_Block *trailer = this->header_and_trailer_->trailer ();
+    if (trailer != 0)
+    trailer->rd_ptr (this->header_and_trailer_->trailer_bytes ());
+    }
+    */
+
+  // Callback: notify <handler> of completion
+  this->handler_.handle_transmit_file (*this);
 }
 
 // ************************************************************
@@ -812,10 +1758,6 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::Header_And_Trailer (ACE_Message_Bl
 {
 }
 
-ACE_Asynch_Transmit_File::Header_And_Trailer::~Header_And_Trailer (void)
-{
-}
-
 void
 ACE_Asynch_Transmit_File::Header_And_Trailer::header_and_trailer (ACE_Message_Block *header,
                                                                   u_long header_bytes,
@@ -915,7 +1857,12 @@ ACE_Asynch_Transmit_File::Header_And_Trailer::transmit_buffers (void)
     }
 }
 
-// *********************************************************************
+
+// ************************************************************
+
+ACE_Handler::~ACE_Handler (void)
+{
+}
 
 ACE_Handler::ACE_Handler (void)
   : proactor_ (0)
@@ -927,10 +1874,6 @@ ACE_Handler::ACE_Handler (ACE_Proactor *d)
 {
 }
 
-ACE_Handler::~ACE_Handler (void)
-{
-}
-
 void
 ACE_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
 {
@@ -946,8 +1889,7 @@ ACE_Handler::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
 void
 ACE_Handler::handle_accept (const ACE_Asynch_Accept::Result &result)
 {
- 
-	ACE_UNUSED_ARG (result);
+  ACE_UNUSED_ARG (result);
 }
 
 void
@@ -969,14 +1911,11 @@ ACE_Handler::handle_write_file (const ACE_Asynch_Write_File::Result &result)
 }
 
 void
-ACE_Handler::handle_time_out (const ACE_Time_Value & /* tv */,
-                              const void *           /* act */)
-{
-}
-
-void
-ACE_Handler::handle_wakeup (void)
+ACE_Handler::handle_time_out (const ACE_Time_Value &tv,
+                              const void *act)
 {
+  ACE_UNUSED_ARG (tv);
+  ACE_UNUSED_ARG (act);
 }
 
 ACE_Proactor *
@@ -1035,4 +1974,16 @@ ACE_Service_Handler::open (ACE_HANDLE,
 {
 }
 
-#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS */
+#if defined (ACE_HAS_AIO_CALLS)
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Unbounded_Queue<ACE_Asynch_Accept::Result*>;
+template class ACE_Node<ACE_Asynch_Accept::Result*>;
+template class ACE_Unbounded_Queue_Iterator<ACE_Asynch_Accept::Result*>;
+#elif  defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Unbounded_Queue<ACE_Asynch_Accept::Result*>
+#pragma instantiate ACE_Node<ACE_Asynch_Accept::Result*>
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Asynch_Accept::Result*>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* ACE_HAS_AIO_CALLS */
+
+#endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
diff --git a/ace/Asynch_IO.h b/ace/Asynch_IO.h
index fb555a90610..0667f1bdb22 100644
--- a/ace/Asynch_IO.h
+++ b/ace/Asynch_IO.h
@@ -4,42 +4,40 @@
 // ============================================================================
 //
 // = LIBRARY
-//
 //    ace
 //
 // = FILENAME
-//
 //    Asynch_IO.h
 //
 // = DESCRIPTION
+//    This only works on Win32 platforms or on POSIX platforms with
+//    aio_ routines.
 //
-//    This works on Win32 (#if defined (ACE_WIN32) && !defined
-//    (ACE_HAS_WINCE)) platforms and on POSIX4 platforms with <aio_*>
-//    routines (#if defined (ACE_HAS_AIO_CALLS))
-//
-//    On Win32 platforms, the implementation of
-//    <ACE_Asynch_Transmit_File> and <ACE_Asynch_Accept> are only
-//    supported if ACE_HAS_WINSOCK2 is defined or you are on WinNT 4.0
-//    or higher. 
+//    The implementation of <ACE_Asynch_Transmit_File> and
+//    <ACE_Asynch_Accept> are only supported if ACE_HAS_WINSOCK2 is
+//    defined or you are on WinNT 4.0 or higher.
 //
 // = AUTHOR
-//
-//    Irfan Pyarali <irfan@cs.wustl.edu>,
-//    Tim Harrison <harrison@cs.wustl.edu> and
+//    Irfan Pyarali (irfan@cs.wustl.edu),
+//    Tim Harrison (harrison@cs.wustl.edu) and
 //    Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
 // ============================================================================
 
-#if !defined (ACE_ASYNCH_IO_H)
+#ifndef ACE_ASYNCH_IO_H
 #define ACE_ASYNCH_IO_H
 
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
+ (defined (ACE_HAS_AIO_CALLS))
+
+#include "ace/Task.h"
+#include "ace/Reactor.h"
 
 // Forward declarations
 class ACE_Proactor;
@@ -47,26 +45,24 @@ class ACE_Handler;
 class ACE_Message_Block;
 class ACE_INET_Addr;
 
-// Forward declarations
-class ACE_Asynch_Result_Impl;
-
-class ACE_Export ACE_Asynch_Result
+class ACE_Export ACE_Asynch_Result : public ACE_OVERLAPPED
 {
   // = TITLE
-  //
-  //     An interface base class which allows users access to common
-  //     information related to an asynchronous operation.
+  //     An abstract class which adds information to the OVERLAPPED
+  //     structure to make it more useful.
   //
   // = DESCRIPTION
-  // 
-  //     An interface base class from which you can obtain some basic
+  //     An abstract base class from which you can obtain some basic
   //     information like the number of bytes transferred, the ACT
   //     associated with the asynchronous operation, indication of
-  //     success or failure, etc. Subclasses may want to store more
+  //     success or failure, etc.  Subclasses may want to store more
   //     information that is particular to the asynchronous operation
   //     it represents.
-
 public:
+  // Proactor is the only class which is allowed to call the
+  // <complete> method.
+  friend class ACE_Proactor;
+
   u_long bytes_transferred (void) const;
   // Number of bytes transferred by the operation.
 
@@ -77,205 +73,167 @@ public:
   // Did the operation succeed?
 
   const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // On WIN32, this returns the ACT associated with the handle when it
-  // was registered with the I/O completion port.
-  //
-  // @@ This is not implemented for POSIX4 platforms. Returns 0.
+  // This returns the ACT associated with the handle when it was
+  // registered with the I/O completion port.  This ACT is not the
+  // same as the ACT associated with the asynchronous operation.
 
   u_long error (void) const;
-  // Error value if the operation fails.
+  // Error value if the operation fail.
 
   ACE_HANDLE event (void) const;
-  // On WIN32, this returns the event associated with the OVERLAPPED
-  // structure. 
-  //
-  // This returns ACE_INVALID_HANDLE on POSIX4-Unix platforms.
+  // Event associated with the OVERLAPPED structure
 
   u_long offset (void) const;
   u_long offset_high (void) const;
-  // This really make sense only when doing file I/O. 
-  // 
-  // On WIN32, these are represented in the OVERLAPPED datastructure.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using aiocb64.
+  // Offset associated with the OVERLAPPED structure.  This really
+  // make sense only when doing file I/O.
 
-  int priority (void) const;
-  // Priority of the operation. 
-  //
-  // On POSIX4-Unix, this is supported. Works like <nice> in
-  // Unix. Negative values are not allowed. 0 means priority of the
-  // operation same as the process priority. 1 means priority of the
-  // operation is one less than process. And so forth.
-  //
-  // On Win32, this is a no-op.
-  
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from ACE_SIGRTMIN to ACE_SIGRTMAX. By 
-  // default, ACE_SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
+  ACE_Asynch_Result (ACE_Handler &handler,
+                     const void* act,
+                     ACE_HANDLE event,
+                     u_long offset = 0,
+                     u_long offset_high = 0);
+  // Constructor.
 
+#if defined (ACE_HAS_AIO_CALLS)
+  aiocb* aiocb_ptr (void);
+  // Returns the underlying <aio control block> used to issue the aio
+  // call.
+#endif /* ACE_HAS_AIO_CALLS */
 
   virtual ~ACE_Asynch_Result (void);
   // Destructor.
 
 protected:
-  ACE_Asynch_Result (ACE_Asynch_Result_Impl *implementation);
-  // Constructor. This implementation will not be deleted.  The
-  // implementation will be deleted by the Proactor.
-
-  ACE_Asynch_Result_Impl *implementation (void) const;
-  // Get the implementation class.
-  
-  ACE_Asynch_Result_Impl *implementation_;
-  // Implementation class.
+  virtual void complete (u_long bytes_transferred,
+                         int success,
+                         const void *completion_key,
+                         u_long error = 0) = 0;
+  // This is the key method.  Subclasses will override this method to
+  // call the correct callback on the handler.
+
+  ACE_Handler &handler_;
+  // Handler that will be called back.
+
+  const void *act_;
+  // ACT for this operation.
+
+  u_long bytes_transferred_;
+  // Bytes transferred by this operation.
+
+  int success_;
+  // Success indicator.
+
+  const void *completion_key_;
+  // ACT associated with handle.
+
+  u_long error_;
+  // Error if operation failed.
+
+#if defined (ACE_HAS_AIO_CALLS)
+  aiocb *aiocb_ptr_;
+  // This is the <aio control block> used to issue the <aio_>
+  // call. Let us give this to the OS along with the result, so that
+  // on completion we can take this and use it for <aio_error> and
+  // <aio_return>.
+#endif /* ACE_HAS_AIO_CALLS */
 };
 
-// Forward declarations
-class ACE_Asynch_Operation_Impl;
-
 class ACE_Export ACE_Asynch_Operation
 {
   // = TITLE
-  //
-  //     This is an interface base class for all asynch
-  //     operations. The resposiblility of this class is to forward
-  //     all methods to its delegation/implementation class, e.g.,
-  //     <ACE_WIN32_Asynch_Operation> or <ACE_POSIX_Asynch_Operation>.
+  //     This is a base class for all asynch operations.
   //
   // = DESCRIPTION
-  //
   //     There are some attributes and functionality which is common
-  //     to all asychronous operations. The delegation classes of this
-  //     class will factor out this code.
-
+  //     to all asychronous operations.  This abstract class will
+  //     factor out this code.
 public:
   int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
+            ACE_HANDLE handle = ACE_INVALID_HANDLE,
+            const void *completion_key = 0,
+            ACE_Proactor *proactor = 0);
   // Initializes the factory with information which will be used with
   // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
   // <ACE_Handler::handle> will be called on the <handler> to get the
   // correct handle.
 
   int cancel (void);
-  // On Win32, this cancels all pending accepts operations that were
-  // issued by the calling thread.  The function does not cancel
-  // asynchronous operations issued by other threads.
-  //
-  // @@ POSIX: please implement me.
-
-  // = Access methods.
+  // This cancels all pending accepts operations that were issued by
+  // the calling thread.  The function does not cancel asynchronous
+  // operations issued by other threads.
 
-  ACE_Proactor* proactor (void) const;
+  // Access methods.
+  ACE_Proactor* proactor (void);
   // Return the underlying proactor.
-
-  virtual ~ACE_Asynch_Operation (void);
-  // Destructor.
-
 protected:
+#if defined (ACE_HAS_AIO_CALLS)
+  int register_aio_with_proactor (aiocb *aiocb_ptr);
+  // This call is for the POSIX implementation. This method is used by
+  // <ACE_Asynch_Operation> to store some information with the
+  // Proactor after an <aio_> call is issued, so that the Proactor can
+  // retrive this information to do <aio_return> and <aio_error>.
+  // Passing a '0' ptr returns the status, indicating whether there
+  // are slots available or no. Passing a valid ptr stores the ptr
+  // with the Proactor.
+#endif /* ACE_HAS_AIO_CALLS */
+
   ACE_Asynch_Operation (void);
-  // Constructor.
+  // A no-op constructor.
 
-  ACE_Asynch_Operation_Impl *implementation (void) const;
-  // Return the underlying implementation class.
+  ACE_Proactor *proactor_;
+  // Proactor that this Asynch IO will be registered with.
 
-  void implementation (ACE_Asynch_Operation_Impl *implementation);
-  // Set the implementation class.
-  
-  ACE_Proactor *get_proactor (ACE_Proactor *user_proactor,
-                              ACE_Handler &handler) const;
-  // Get a proactor for/from the user
+  ACE_Handler *handler_;
+  // Handler that will receive the callback.
 
-  ACE_Asynch_Operation_Impl *implementation_;
-  // Implementation class.
+  ACE_HANDLE handle_;
+  // I/O handle used for reading.
 };
 
-// Forward declarations
-class ACE_Asynch_Read_Stream_Result_Impl;
-class ACE_Asynch_Read_Stream_Impl;
-
 class ACE_Export ACE_Asynch_Read_Stream : public ACE_Asynch_Operation
 {
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous reads
-  //     on a stream. This class forwards all methods to its
-  //     implementation class.
+  //     on a stream.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <read>s can
   //     started using this class.  An ACE_Asynch_Read_Stream::Result
   //     will be passed back to the <handler> when the asynchronous
   //     reads completes through the <ACE_Handler::handle_read_stream>
   //     callback.
-
 public:
+  class Result;
+  // Forward declaration of the Result class.
+
   ACE_Asynch_Read_Stream (void);
   // A do nothing constructor.
 
-  virtual ~ACE_Asynch_Read_Stream (void);
-  // Destructor
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
   int read (ACE_Message_Block &message_block,
             u_long bytes_to_read,
-            const void *act = 0,
-            int priority = 0,
-            int signal_number = ACE_SIGRTMIN);
+            const void *act = 0);
   // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Read_Stream_Impl *implementation (void) const;
-  // Return the underlying implementation class.
+  // be read and stored in the <message_block>.
 
 protected:
-  void implementation (ACE_Asynch_Read_Stream_Impl *implementation);
-  // Set the implementation class.
-
-  ACE_Asynch_Read_Stream_Impl *implementation_;
-  // Implementation class that all methods will be forwarded to.
+  int shared_read (Result *result);
+  // This is the method which does the real work and is there so that
+  // the ACE_Asynch_Read_File class can use it too.
 
 public:
   class ACE_Export Result : public ACE_Asynch_Result
   {
     // = TITLE
-    // 
-    //     This is the class which will be passed back to the
-    //     <handler> when the asynchronous read completes. This class
-    //     forwards all the methods to the implementation classes.
+    //     This is that class which will be passed back to the
+    //     <handler> when the asynchronous read completes.
     //
     // = DESCRIPTION
-    // 
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous read.
-    
-    friend class ACE_POSIX_Asynch_Read_Stream_Result;
-    friend class ACE_WIN32_Asynch_Read_Stream_Result;
-    // The concrete implementation result classes only construct this
-    // class.
+    friend class ACE_Asynch_Read_Stream;
+    // The factory has special privileges.
 
   public:
     u_long bytes_to_read (void) const;
@@ -288,104 +246,82 @@ public:
     ACE_HANDLE handle (void) const;
     // I/O handle used for reading.
 
-    ACE_Asynch_Read_Stream_Result_Impl *implementation (void) const;
-    // Get the implementation class.
-    
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE handle,
+            ACE_Message_Block &message_block,
+            u_long bytes_to_read,
+            const void* act,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Read_Stream factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the read completes.
+
   protected:
-    Result (ACE_Asynch_Read_Stream_Result_Impl *implementation);
-    // Constructor.
-    
-    virtual ~Result (void);
-    // Destructor.
+    u_long bytes_to_read_;
+    // Bytes requested when the asynchronous read was initiated.
+
+    ACE_Message_Block &message_block_;
+    // Message block for reading the data into.
 
-    ACE_Asynch_Read_Stream_Result_Impl *implementation_;
-    // The implementation class.
+    ACE_HANDLE handle_;
+    // I/O handle used for reading.
   };
 };
 
-// Forward declarations
-class ACE_Asynch_Write_Stream_Impl;
-class ACE_Asynch_Write_Stream_Result_Impl;
-
 class ACE_Export ACE_Asynch_Write_Stream : public ACE_Asynch_Operation
 {
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous writes
-  //     on a stream. This class forwards all methods to its
-  //     implementation class.
+  //     on a stream.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <writes>s can
-  //     started using this class.  An ACE_Asynch_Write_Stream::Result
+  //     started using this class.  A ACE_Asynch_Write_Stream::Result
   //     will be passed back to the <handler> when the asynchronous
   //     write completes through the
   //     <ACE_Handler::handle_write_stream> callback.
-
 public:
+  class Result;
+  // Forward declaration of the Result class.
+
   ACE_Asynch_Write_Stream (void);
   // A do nothing constructor.
 
-  virtual ~ACE_Asynch_Write_Stream (void);
-  // Destructor.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
   int write (ACE_Message_Block &message_block,
              u_long bytes_to_write,
-             const void *act = 0,
-             int priority = 0,
-             int signal_number = ACE_SIGRTMIN);
+             const void *act = 0);
   // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Write_Stream_Impl *implementation (void) const;
-  // Return the underlying implementation class.
+  // will be written from the <message_block>.
 
 protected:
-  void implementation (ACE_Asynch_Write_Stream_Impl *implementation);
-  // Set the implementation class.
-
-  ACE_Asynch_Write_Stream_Impl *implementation_;
-  // Implementation class that all methods will be forwarded to.
+  int shared_write (Result *result);
+  // This is the method which does the real work and is there so that
+  // the ACE_Asynch_Write_File class can use it too.
 
 public:
-  class  ACE_Export Result : public ACE_Asynch_Result
+  class ACE_Export Result : public ACE_Asynch_Result
   {
     // = TITLE
-    //
     //     This is that class which will be passed back to the
-    //     <handler> when the asynchronous write completes. This class
-    //     forwards all the methods to the implementation class.
+    //     <handler> when the asynchronous write completes.
     //
     // = DESCRIPTION
-    // 
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous write.
-
-    friend class ACE_POSIX_Asynch_Write_Stream_Result;
-    friend class ACE_WIN32_Asynch_Write_Stream_Result;
-    // The concrete implementation result classes only construct this
-    // class.
-
   public:
+    friend class ACE_Asynch_Write_Stream;
+    // The factory has special privileges.
+
     u_long bytes_to_write (void) const;
     // The number of bytes which were requested at the start of the
     // asynchronous write.
@@ -396,101 +332,70 @@ public:
     ACE_HANDLE handle (void) const;
     // I/O handle used for writing.
 
-    ACE_Asynch_Write_Stream_Result_Impl *implementation (void) const;
-    // Get the implementation class.
-    
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE handle,
+            ACE_Message_Block &message_block,
+            u_long bytes_to_write,
+            const void* act,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Write_Stream factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the write completes.
+
   protected:
-    Result (ACE_Asynch_Write_Stream_Result_Impl *implementation);
-    // Constrcutor.
-    
-    virtual ~Result (void);
-    // Destructor.
-
-    ACE_Asynch_Write_Stream_Result_Impl *implementation_;
-    // Implementation class.
-  };
-};  
+    u_long bytes_to_write_;
+    // The number of bytes which were requested at the start of the
+    // asynchronous write.
 
-// Forward declarations
-class ACE_Asynch_Read_File_Impl;
-class ACE_Asynch_Read_File_Result_Impl;
+    ACE_Message_Block &message_block_;
+    // Message block that contains the data to be written.
+
+    ACE_HANDLE handle_;
+    // I/O handle used for writing.
+  };
+};
 
 class ACE_Export ACE_Asynch_Read_File : public ACE_Asynch_Read_Stream
 {
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous reads
-  //     on a file. This class forwards all methods to its
-  //     implementation class.
+  //     on a file.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class. An ACE_Asynch_Read_File::Result
+  //     started using this class.  A ACE_Asynch_Read_File::Result
   //     will be passed back to the <handler> when the asynchronous
   //     reads completes through the <ACE_Handler::handle_read_file>
   //     callback.
   //
   //     This class differs slightly from ACE_Asynch_Read_Stream as it
   //     allows the user to specify an offset for the read.
-
 public:
-  ACE_Asynch_Read_File (void);
-  // A do nothing constructor.
-
-  virtual ~ACE_Asynch_Read_File (void);
-  // Destructor.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-  
   int read (ACE_Message_Block &message_block,
             u_long bytes_to_read,
             u_long offset = 0,
             u_long offset_high = 0,
-            const void *act = 0,
-            int priority = 0,
-            int signal_number = ACE_SIGRTMIN);
+            const void *act = 0);
   // This starts off an asynchronous read.  Upto <bytes_to_read> will
   // be read and stored in the <message_block>.  The read will start
-  // at <offset> from the beginning of the file. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Read_File_Impl *implementation (void) const;
-  // Return the underlying implementation class.
-
-protected:
-  void implementation (ACE_Asynch_Read_File_Impl *implementation);
-  // Set the implementation class.
-  
-  ACE_Asynch_Read_File_Impl *implementation_;
-  // Delegation/implementation class that all methods will be
-  // forwarded to.
-
+  // at <offset> from the beginning of the file.
 public:
   class ACE_Export Result : public ACE_Asynch_Read_Stream::Result
   {
     // = TITLE
-    //
     //     This is that class which will be passed back to the
-    //     <handler> when the asynchronous read completes. This class
-    //     forwards all the methods to the implementation class.
+    //     <handler> when the asynchronous read completes.
     //
     // = DESCRIPTION
-    //
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous read.
@@ -502,41 +407,40 @@ public:
     //     required by this class as ACE_Asynch_Result can store the
     //     <offset>.
 
-    friend class ACE_POSIX_Asynch_Read_File_Result;
-    friend class ACE_WIN32_Asynch_Read_File_Result;
-    // The concrete implementation result classes only construct this
-    // class.
-    
-  public:
-    ACE_Asynch_Read_File_Result_Impl *implementation (void) const;
-    // Get the implementation class.
+    friend class ACE_Asynch_Read_File;
+    // The factory has special privileges.
 
-  protected:
-    Result (ACE_Asynch_Read_File_Result_Impl *implementation);
-    // Constructor. This implementation will not be deleted.
-
-    virtual ~Result (void);
-    // Destructor.
-    
-    ACE_Asynch_Read_File_Result_Impl *implementation_;
-    // The implementation class.
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE handle,
+            ACE_Message_Block &message_block,
+            u_long bytes_to_read,
+            const void* act,
+            u_long offset,
+            u_long offset_high,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Read_File factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the read completes.
   };
 };
 
-// Forward declarations
-class ACE_Asynch_Write_File_Impl;
-class ACE_Asynch_Write_File_Result_Impl;
-
 class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream
 {
+public:
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous writes
-  //     on a file. This class forwards all methods to its
-  //     implementation class.
+  //     on a file.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <write>s can be
   //     started using this class.  A ACE_Asynch_Write_File::Result
   //     will be passed back to the <handler> when the asynchronous
@@ -545,63 +449,23 @@ class ACE_Export ACE_Asynch_Write_File : public ACE_Asynch_Write_Stream
   //
   //     This class differs slightly from ACE_Asynch_Write_Stream as
   //     it allows the user to specify an offset for the write.
-
-public:
-  ACE_Asynch_Write_File (void);
-  // A do nothing constructor.
-
-  virtual ~ACE_Asynch_Write_File (void);
-  // Destructor.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
   int write (ACE_Message_Block &message_block,
              u_long bytes_to_write,
              u_long offset = 0,
              u_long offset_high = 0,
-             const void *act = 0,
-             int priority = 0,
-             int signal_number = ACE_SIGRTMIN);
+             const void *act = 0);
   // This starts off an asynchronous write.  Upto <bytes_to_write>
   // will be write and stored in the <message_block>.  The write will
-  // start at <offset> from the beginning of the file. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Write_File_Impl *implementation (void) const;
-  // Return the underlying implementation class.
-
-protected:
-  void implementation (ACE_Asynch_Write_File_Impl *implementation);
-  // Set the implementation.
-
-  ACE_Asynch_Write_File_Impl *implementation_;
-  // Implementation object.
+  // start at <offset> from the beginning of the file.
 
 public:
   class ACE_Export Result : public ACE_Asynch_Write_Stream::Result
   {
     // = TITLE
-    //
     //     This is that class which will be passed back to the
-    //     <handler> when the asynchronous write completes. This class
-    //     forwards all the methods to the implementation class. 
+    //     <handler> when the asynchronous write completes.
     //
     // = DESCRIPTION
-    //
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous write.
@@ -612,119 +476,91 @@ public:
     //     of <ACE_Handler::handle_write_stream>.  No additional state
     //     is required by this class as ACE_Asynch_Result can store
     //     the <offset>.
-    
-    friend class ACE_POSIX_Asynch_Write_File_Result;
-    friend class ACE_WIN32_Asynch_Write_File_Result;
-    // The concrete implementation result classes only construct this
-    // class.
-
-  public:
-    ACE_Asynch_Write_File_Result_Impl *implementation (void) const;
-    //  Get the implementation class.
- 
-  protected:
-    Result (ACE_Asynch_Write_File_Result_Impl *implementation);
-    // Constructor. This implementation will not be deleted.
 
-    virtual ~Result (void);
-    // Destructor.
+    friend class ACE_Asynch_Write_File;
+    // The factory has special privileges.
 
-    ACE_Asynch_Write_File_Result_Impl *implementation_;
-    // The implementation class.
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE handle,
+            ACE_Message_Block &message_block,
+            u_long bytes_to_write,
+            const void* act,
+            u_long offset,
+            u_long offset_high,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Write_File factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the write completes.
   };
 };
 
-// Forward declarations
-class ACE_Asynch_Accept_Result_Impl;
-class ACE_Asynch_Accept_Impl;
-
 class ACE_Export ACE_Asynch_Accept : public ACE_Asynch_Operation
 {
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous accepts
-  //     on a listen handle. This class forwards all methods to its
-  //     implementation class.
+  //     on a listen handle.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <accept>s can
   //     started using this class.  A ACE_Asynch_Accept::Result will
   //     be passed back to the <handler> when the asynchronous accept
   //     completes through the <ACE_Handler::handle_accept>
   //     callback.
-
 public:
   ACE_Asynch_Accept (void);
   // A do nothing constructor.
 
-  virtual ~ACE_Asynch_Accept (void);
-  // Destructor.
-
+#if defined (ACE_HAS_AIO_CALLS)
   int open (ACE_Handler &handler,
             ACE_HANDLE handle = ACE_INVALID_HANDLE,
             const void *completion_key = 0,
             ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-  
+  // (We will also call base class's <open> from here).
+#endif /* ACE_HAS_AIO_CALLS */
+
   int accept (ACE_Message_Block &message_block,
               u_long bytes_to_read,
               ACE_HANDLE accept_handle = ACE_INVALID_HANDLE,
-              const void *act = 0,
-              int priority = 0,
-              int signal_number = ACE_SIGRTMIN);
+              const void *act = 0);
   // This starts off an asynchronous accept.  The asynchronous accept
   // call also allows any initial data to be returned to the
   // <handler>.  Upto <bytes_to_read> will be read and stored in the
   // <message_block>.  The <accept_handle> will be used for the
   // <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
-  // handle will be created. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
+  // handle will be created.
   //
   // <message_block> must be specified. This is because the address of
   // the new connection is placed at the end of this buffer.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Accept_Impl *implementation (void) const;
-  // Return the underlying implementation class.
-
-protected:
-  void implementation (ACE_Asynch_Accept_Impl *implementation);
-  // Set the implementation class.
-
-  ACE_Asynch_Accept_Impl *implementation_;
-  // Delegation/implementation class that all methods will be
-  // forwarded to.  
 
 public:
   class ACE_Export Result : public ACE_Asynch_Result
   {
     // = TITLE
-    //
     //     This is that class which will be passed back to the
     //     <handler> when the asynchronous accept completes.
     //
     // = DESCRIPTION
-    //
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous accept.
-
-    friend class ACE_POSIX_Asynch_Accept_Result;
-    friend class ACE_WIN32_Asynch_Accept_Result;
-    // The concrete implementation result classes only construct this
-    // class.
-    
   public:
+    friend class ACE_Asynch_Accept;
+    // The factory has special privileges.
+
+#if defined (ACE_HAS_AIO_CALLS)
+    friend class ACE_Asynch_Accept_Handler;
+    // This factory does it all, so it needs spl privileges.
+#endif /* ACE_HAS_AIO_CALLS */
+
     u_long bytes_to_read (void) const;
     // The number of bytes which were requested at the start of the
     // asynchronous accept.
@@ -738,34 +574,60 @@ public:
     ACE_HANDLE accept_handle (void) const;
     // I/O handle for the new connection.
 
-    ACE_Asynch_Accept_Result_Impl *implementation (void) const;
-    // Get the implementation.
-    
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE listen_handle,
+            ACE_HANDLE accept_handle,
+            ACE_Message_Block &message_block,
+            u_long bytes_to_read,
+            const void* act,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Accept factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the accept completes.
+
   protected:
-    Result (ACE_Asynch_Accept_Result_Impl *implementation);
-    // Contructor. Implementation will not be deleted.
-    
-    virtual ~Result (void);
-    // Destructor.
-
-    ACE_Asynch_Accept_Result_Impl *implementation_;
-    // Impelmentation class.
+    u_long bytes_to_read_;
+    // Bytes requested when the asynchronous read was initiated.
+
+    ACE_Message_Block &message_block_;
+    // Message block for reading the data into.
+
+    ACE_HANDLE listen_handle_;
+    // I/O handle used for accepting new connections.
+
+    ACE_HANDLE accept_handle_;
+    // I/O handle for the new connection.
   };
-};
 
-// Forward declarations
-class ACE_Asynch_Transmit_File_Result_Impl;
-class ACE_Asynch_Transmit_File_Impl;
+private:
+#if defined (ACE_HAS_AIO_CALLS)
+  static void* thread_function  (void* reactor);
+  // The thread function that does handle events
+
+  ACE_Reactor reactor_;
+  // Reactor to wait on the <listen_handle>.
+
+  ACE_Asynch_Accept_Handler* accept_handler_;
+  // The Event Handler to do handle_input.
+#endif /* ACE_HAS_AIO_CALLS */
+};
 
 class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation
 {
   // = TITLE
-  //
   //     This class is a factory for starting off asynchronous
   //     transmit files on a stream.
   //
   // = DESCRIPTION
-  //
   //     Once <open> is called, multiple asynchronous <transmit_file>s
   //     can started using this class.  A
   //     ACE_Asynch_Transmit_File::Result will be passed back to the
@@ -778,26 +640,13 @@ class ACE_Export ACE_Asynch_Transmit_File : public ACE_Asynch_Operation
   //     function provides high-performance file data transfer over
   //     network connections.  This function would be of great use in
   //     a Web Server, Image Server, etc.
-
 public:
-  // Forward declarations
   class Header_And_Trailer;
-  
-  ACE_Asynch_Transmit_File (void);
-  // A do nothing constructor.
+  // Forward declaration.
 
-  virtual ~ACE_Asynch_Transmit_File (void);
-  // Destructor.
+  ACE_Asynch_Transmit_File (void);
+  // A "do-nothing" constructor.
 
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle = ACE_INVALID_HANDLE,
-            const void *completion_key = 0,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call. If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-  
   int transmit_file (ACE_HANDLE file,
                      Header_And_Trailer *header_and_trailer = 0,
                      u_long bytes_to_write = 0,
@@ -805,9 +654,7 @@ public:
                      u_long offset_high = 0,
                      u_long bytes_per_send = 0,
                      u_long flags = 0,
-                     const void *act = 0,
-                     int priority = 0,
-                     int signal_number = ACE_SIGRTMIN);
+                     const void *act = 0);
   // This starts off an asynchronous transmit file.  The <file> is a
   // handle to an open file.  <header_and_trailer> is a pointer to a
   // data structure that contains pointers to data to send before and
@@ -816,46 +663,23 @@ public:
   // written to the <socket>.  If you want to send the entire file,
   // let <bytes_to_write> = 0.  <bytes_per_send> is the size of each
   // block of data sent per send operation.  Please read the Win32
-  // documentation on what the flags should be. Priority of the
-  // operation is specified by <priority>. On POSIX4-Unix, this is
-  // supported. Works like <nice> in Unix. Negative values are not
-  // allowed. 0 means priority of the operation same as the process
-  // priority. 1 means priority of the operation is one less than
-  // process. And so forth. On Win32, this is a no-op.
-  // <signal_number> is the POSIX4 real-time signal number to be used 
-  // for the operation. <signal_number> ranges from ACE_SIGRTMIN to
-  // ACE_SIGRTMAX. This argument is a no-op on non-POSIX4 systems. 
-
-  ACE_Asynch_Transmit_File_Impl *implementation (void) const;
-  // Return the underlying implementation class.
-
-protected:
-  void implementation (ACE_Asynch_Transmit_File_Impl *);
-  // Set the implementation.
-
-  ACE_Asynch_Transmit_File_Impl *implementation_;
-  // The implementation class.
+  // documentation on what the flags should be.
 
 public:
   class ACE_Export Result : public ACE_Asynch_Result
   {
     // = TITLE
-    //
     //     This is that class which will be passed back to the
     //     <handler> when the asynchronous transmit file completes.
     //
     // = DESCRIPTION
-    //
     //     This class has all the information necessary for the
     //     <handler> to uniquiely identify the completion of the
     //     asynchronous transmit file.
-
-    friend class ACE_POSIX_Asynch_Transmit_File_Result;
-    friend class ACE_WIN32_Asynch_Transmit_File_Result;
-    // The concrete implementation result classes only construct this
-    // class.
-    
   public:
+    friend class ACE_Asynch_Transmit_File;
+    // The factory has special privileges.
+
     ACE_HANDLE socket (void) const;
     // Socket used for transmitting the file.
 
@@ -864,53 +688,79 @@ public:
 
     Header_And_Trailer *header_and_trailer (void) const;
     // Header and trailer data associated with this transmit file.
-    
+
     u_long bytes_to_write (void) const;
     // The number of bytes which were requested at the start of the
     // asynchronous transmit file.
-    
+
     u_long bytes_per_send (void) const;
     // Number of bytes per send requested at the start of the transmit
     // file.
-    
+
     u_long flags (void) const;
     // Flags which were passed into transmit file.
 
-    ACE_Asynch_Transmit_File_Result_Impl *implementation (void) const;
-    // Get the implementation class.
-    
+    // protected:
+    //
+    // These two should really be protected.  But sometimes it
+    // simplifies code to be able to "fake" a result.  Use carefully.
+    Result (ACE_Handler &handler,
+            ACE_HANDLE socket,
+            ACE_HANDLE file,
+            Header_And_Trailer *header_and_trailer,
+            u_long bytes_to_write,
+            u_long offset,
+            u_long offset_high,
+            u_long bytes_per_send,
+            u_long flags,
+            const void *act,
+            ACE_HANDLE event);
+    // Constructor is protected since creation is limited to
+    // ACE_Asynch_Transmit_File factory.
+
+    virtual void complete (u_long bytes_transferred,
+                           int success,
+                           const void *completion_key,
+                           u_long error = 0);
+    // ACE_Proactor will call this method when the write completes.
+
   protected:
-    Result (ACE_Asynch_Transmit_File_Result_Impl *implementation);
-    // Constructor.
+    ACE_HANDLE socket_;
+    // Network I/O handle.
+
+    ACE_HANDLE file_;
+    // File I/O handle.
+
+    Header_And_Trailer *header_and_trailer_;
+    // Header and trailer data associated with this transmit file.
+
+    u_long bytes_to_write_;
+    // The number of bytes which were requested at the start of the
+    // asynchronous transmit file.
 
-    virtual ~Result (void);
-    // Destructor.
-    
-    ACE_Asynch_Transmit_File_Result_Impl *implementation_;
-    // The implementation class.
+    u_long bytes_per_send_;
+    // Number of bytes per send requested at the start of the transmit
+    // file.
+
+    u_long flags_;
+    // Flags which were passed into transmit file.
   };
 
   class ACE_Export Header_And_Trailer
   {
     // = TITLE
-    //
     //     The class defines a data structure that contains pointers
     //     to data to send before and after the file data is sent.
     //
     // = DESCRIPTION
-    //
     //     This class provides a wrapper over TRANSMIT_FILE_BUFFERS
     //     and provided a consistent use of ACE_Message_Blocks.
-
   public:
     Header_And_Trailer (ACE_Message_Block *header = 0,
                         u_long header_bytes = 0,
                         ACE_Message_Block *trailer = 0,
                         u_long trailer_bytes = 0);
     // Constructor.
-    
-    virtual ~Header_And_Trailer (void);
-    // Destructor
 
     void header_and_trailer (ACE_Message_Block *header = 0,
                              u_long header_bytes = 0,
@@ -958,14 +808,11 @@ public:
 class ACE_Export ACE_Handler
 {
   // = TITLE
-  //
   //     This base class defines the interface for receiving the
   //     results of asynchronous operations.
   //
   // = DESCRIPTION
-  //
   //     Subclasses of this class will fill in appropriate methods.
-
 public:
   ACE_Handler (void);
   // A do nothing constructor.
@@ -1002,12 +849,7 @@ public:
   virtual void handle_time_out (const ACE_Time_Value &tv,
                                 const void *act = 0);
   // Called when timer expires.  <tv> was the requested time value and
-  // <act> is the ACT passed when scheduling the timer.
-
-  virtual void handle_wakeup (void);
-  // This is method works with the <run_event_loop> of the
-  // ACE_Proactor. A special <Wake_Up_Completion> is used to wake up
-  // all the threads that are blocking for completions.
+  // <act> is the ACT passed when scheduling the timer
 
   ACE_Proactor *proactor (void);
   // Get the proactor associated with this handler.
@@ -1019,37 +861,30 @@ public:
   // Get the I/O handle used by this <handler>. This method will be
   // called by the ACE_Asynch_* classes when an ACE_INVALID_HANDLE is
   // passed to <open>.
-
 protected:
   ACE_Proactor *proactor_;
   // The proactor associated with this handler.
 };
 
-// Forward declarations
-class ACE_INET_Addr;
-
-// Forward declarations
+// Forward declartion
 template <class HANDLER>
 class ACE_Asynch_Acceptor;
 
 class ACE_Export ACE_Service_Handler : public ACE_Handler
 {
   // = TITLE
-  //
   //     This base class defines the interface for the
   //     ACE_Asynch_Acceptor to call into when new connection are
   //     accepted.
   //
   // = DESCRIPTION
-  //
   //     Subclasses of this class will fill in appropriate methods to
   //     define application specific behavior.
-  
+public:
   friend class ACE_Asynch_Acceptor<ACE_Service_Handler>;
   // The Acceptor is the factory and therefore should have special
   // privileges.
-  
-public:
+
   ACE_Service_Handler (void);
   // A do nothing constructor.
 
diff --git a/ace/Asynch_IO_Impl.cpp b/ace/Asynch_IO_Impl.cpp
deleted file mode 100644
index 9baab6f5e04..00000000000
--- a/ace/Asynch_IO_Impl.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// $Id$
-#define ACE_BUILD_DLL
-#include "ace/OS.h"
-#include "ace/Asynch_IO_Impl.h"
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
-// This only works on Win32 platforms and on Unix platforms supporting
-// aio calls. 
-
-#if !defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ace/Asynch_IO_Impl.h b/ace/Asynch_IO_Impl.h
deleted file mode 100644
index 834817032b5..00000000000
--- a/ace/Asynch_IO_Impl.h
+++ /dev/null
@@ -1,506 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    ace
-//
-// = FILENAME
-//
-//    Asynch_IO_Impl.h
-//
-// = DESCRIPTION
-//
-//    This class contains asbtract base classes for all the concrete
-//    implementation classes for the various asynchronous operations
-//    that are used with the Praoctor.
-//
-// = AUTHOR
-//
-//    Irfan Pyarali (irfan@cs.wustl.edu),
-//    Tim Harrison (harrison@cs.wustl.edu) and
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_ASYNCH_IO_IMPL_H)
-#define ACE_ASYNCH_IO_IMPL_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS))
-// This only works on Win32 platforms and on Unix platforms supporting
-// aio calls.
-
-#include "ace/Asynch_IO.h"
-
-// Forward declaration.
-class ACE_Proactor_Impl;
-
-class ACE_Export ACE_Asynch_Result_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for the all the classes that provide
-  //     concrete implementations for ACE_Asynch_Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Result_Impl (void) {}
-
-  virtual u_long bytes_transferred (void) const = 0;
-  // Number of bytes transferred by the operation.
-
-  virtual const void *act (void) const = 0;
-  // ACT associated with the operation.
-
-  virtual int success (void) const = 0;
-  // Did the operation succeed?
-
-  virtual const void *completion_key (void) const = 0;
-  // This ACT is not the same as the ACT associated with the
-  // asynchronous operation.
-
-  virtual u_long error (void) const = 0;
-  // Error value if the operation fail.
-
-  virtual ACE_HANDLE event (void) const = 0;
-  // Event associated with the OVERLAPPED structure.
-
-  virtual u_long offset (void) const = 0;
-  virtual u_long offset_high (void) const = 0;
-  // This really make sense only when doing file I/O.
-
-  virtual int priority (void) const = 0;
-  // Priority of the operation.
-
-  virtual int signal_number (void) const = 0;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-
-  // protected:
-  //
-  // These two should really be protected.  But sometimes it
-  // simplifies code to be able to "fake" a result.  Use carefully.
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error = 0) = 0;
-  // This is called when the asynchronous operation completes.
-
-  virtual int post_completion (ACE_Proactor_Impl *proactor) = 0;
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_Asynch_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Operation.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Operation_Impl () {}
-
-  virtual int open (ACE_Handler &handler,
-                    ACE_HANDLE handle,
-                    const void *completion_key,
-                    ACE_Proactor *proactor) = 0;
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  virtual int cancel (void) = 0;
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  // = Access methods.
-
-  virtual ACE_Proactor* proactor (void) const = 0;
-  // Return the underlying proactor.
-
-protected:
-  ACE_Asynch_Operation_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Read_Stream_Impl : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Read_Stream
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Read_Stream_Impl (void) {}
-
-  virtual int read (ACE_Message_Block &message_block,
-                    u_long bytes_to_read,
-                    const void *act,
-                    int priority,
-                    int signal_number) = 0;
-  // This starts off an asynchronous read. Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.
-
-protected:
-  ACE_Asynch_Read_Stream_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Read_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Read_Stream::Result class.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Read_Stream_Result_Impl () {}
-
-  virtual u_long bytes_to_read (void) const = 0;
-  // The number of bytes which were requested at the start of the
-  // asynchronous read.
-
-  virtual ACE_Message_Block &message_block (void) const = 0;
-  // Message block which contains the read data.
-
-  virtual ACE_HANDLE handle (void) const = 0;
-  // I/O handle used for reading.
-
-protected:
-  ACE_Asynch_Read_Stream_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Write_Stream_Impl : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Write_Stream class.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Write_Stream_Impl (void) {}
-
-  virtual int write (ACE_Message_Block &message_block,
-                     u_long bytes_to_write,
-                     const void *act,
-                     int priority,
-                     int signal_number) = 0;
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>.
-
-protected:
-  ACE_Asynch_Write_Stream_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Write_Stream_Result_Impl : public virtual ACE_Asynch_Result_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Write_Stream::Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Write_Stream_Result_Impl () {}
-
-  virtual u_long bytes_to_write (void) const = 0;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  virtual ACE_Message_Block &message_block (void) const = 0;
-  // Message block that contains the data to be written.
-
-  virtual ACE_HANDLE handle (void) const = 0;
-  // I/O handle used for writing.
-
-protected:
-  ACE_Asynch_Write_Stream_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Read_File_Impl : public virtual ACE_Asynch_Read_Stream_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Read_File::Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Read_File_Impl () {}
-
-  virtual int read (ACE_Message_Block &message_block,
-                    u_long bytes_to_read,
-                    u_long offset,
-                    u_long offset_high,
-                    const void *act,
-                    int priority,
-                    int signal_number) = 0;
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.  The read will start
-  // at <offset> from the beginning of the file.
-
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Read_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
-  virtual int read (ACE_Message_Block &message_block,
-                    u_long bytes_to_read,
-                    const void *act,
-                    int priority,
-                    int signal_number) = 0;
-  // This starts off an asynchronous read. Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.
-
-protected:
-  ACE_Asynch_Read_File_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Read_File_Result_Impl : public virtual ACE_Asynch_Read_Stream_Result_Impl
-{
-  // = TITLE
-  //     This is the abstract base class for all the concrete
-  //     implementation classes for ACE_Asynch_Read_File::Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Read_File_Result_Impl () {}
-  // Destructor.
-
-protected:
-  ACE_Asynch_Read_File_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Write_File_Impl : public virtual ACE_Asynch_Write_Stream_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Write_File.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Write_File_Impl (void) {}
-
-  virtual int write (ACE_Message_Block &message_block,
-                     u_long bytes_to_write,
-                     u_long offset,
-                     u_long offset_high,
-                     const void *act,
-                     int priority,
-                    int signal_number) = 0;
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be write and stored in the <message_block>.  The write will
-  // start at <offset> from the beginning of the file.
-
-  // We don;t need to redefine the following function again because it
-  // has already been defined in ACE_Asynch_Write_Stream_Impl.  But we
-  // still need it here to supress a overwriting pure virtual function
-  // warning in KAI compiler.
-  virtual int write (ACE_Message_Block &message_block,
-                     u_long bytes_to_write,
-                     const void *act,
-                     int priority,
-                     int signal_number) = 0;
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>.
-
-protected:
-  ACE_Asynch_Write_File_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Write_File_Result_Impl : public virtual ACE_Asynch_Write_Stream_Result_Impl
-{
-  // = TITLE
-  //
-  //     This is the abstract base class for all the concrete
-  //     implementation classes that provide different implementations
-  //     for the ACE_Asynch_Write_File::Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Write_File_Result_Impl () {}
-
-protected:
-  ACE_Asynch_Write_File_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Accept_Impl : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Accept.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Accept_Impl (void) {}
-
-  virtual int accept (ACE_Message_Block &message_block,
-                      u_long bytes_to_read,
-                      ACE_HANDLE accept_handle,
-                      const void *act,
-                      int priority,
-                    int signal_number) = 0;
-  // This starts off an asynchronous accept.  The asynchronous accept
-  // call also allows any initial data to be returned to the
-  // <handler>.  Upto <bytes_to_read> will be read and stored in the
-  // <message_block>.  The <accept_handle> will be used for the
-  // <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
-  // handle will be created.
-  //
-  // <message_block> must be specified. This is because the address of
-  // the new connection is placed at the end of this buffer.
-
-protected:
-  ACE_Asynch_Accept_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Accept_Result_Impl : public virtual ACE_Asynch_Result_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Accept.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Accept_Result_Impl () {}
-
-  virtual u_long bytes_to_read (void) const = 0;
-  // The number of bytes which were requested at the start of the
-  // asynchronous accept.
-
-  virtual ACE_Message_Block &message_block (void) const = 0;
-  // Message block which contains the read data.
-
-  virtual ACE_HANDLE listen_handle (void) const = 0;
-  // I/O handle used for accepting new connections.
-
-  virtual ACE_HANDLE accept_handle (void) const = 0;
-  // I/O handle for the new connection.
-
-protected:
-  ACE_Asynch_Accept_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Asynch_Transmit_File_Impl : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Transmit_File.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Transmit_File_Impl () {}
-
-  virtual int transmit_file (ACE_HANDLE file,
-                             ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                             u_long bytes_to_write,
-                             u_long offset,
-                             u_long offset_high,
-                             u_long bytes_per_send,
-                             u_long flags,
-                             const void *act,
-                             int priority,
-                             int signal_number) = 0;
-  // This starts off an asynchronous transmit file.
-
-protected:
-  ACE_Asynch_Transmit_File_Impl (void);
-  // Do-nothing constructor.
-};
-
-class ACE_Export ACE_Asynch_Transmit_File_Result_Impl : public virtual ACE_Asynch_Result_Impl
-{
-  // = TITLE
-  //
-  //     Abstract base class for all the concrete implementation
-  //     classes that provide different implementations for the
-  //     ACE_Asynch_Transmit_File::Result.
-  //
-  // = DESCRIPTION
-  //
-public:
-  virtual ~ACE_Asynch_Transmit_File_Result_Impl () {}
-
-  virtual ACE_HANDLE socket (void) const = 0;
-  // Socket used for transmitting the file.
-
-  virtual ACE_HANDLE file (void) const = 0;
-  // File from which the data is read.
-
-  virtual ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const = 0;
-  // Header and trailer data associated with this transmit file.
-
-  virtual u_long bytes_to_write (void) const = 0;
-  // The number of bytes which were requested at the start of the
-  // asynchronous transmit file.
-
-  virtual u_long bytes_per_send (void) const = 0;
-  // Number of bytes per send requested at the start of the transmit
-  // file.
-
-  virtual u_long flags (void) const = 0;
-  // Flags which were passed into transmit file.
-
-protected:
-  ACE_Asynch_Transmit_File_Result_Impl (void);
-  // Do-nothing constructor.
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/Asynch_IO_Impl.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_AIO_CALLS  || !ACE_HAS_WINCE && ACE_WIN32 */
-#endif /* ACE_ASYNCH_IO_IMPL_H */
diff --git a/ace/Asynch_IO_Impl.i b/ace/Asynch_IO_Impl.i
deleted file mode 100644
index a6c36925943..00000000000
--- a/ace/Asynch_IO_Impl.i
+++ /dev/null
@@ -1,87 +0,0 @@
-// $Id$
-
-ACE_INLINE
-ACE_Asynch_Result_Impl::ACE_Asynch_Result_Impl (void)
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Operation_Impl::ACE_Asynch_Operation_Impl (void)
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Read_Stream_Impl::ACE_Asynch_Read_Stream_Impl (void)
-  : ACE_Asynch_Operation_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Read_Stream_Result_Impl::ACE_Asynch_Read_Stream_Result_Impl (void)
-  : ACE_Asynch_Result_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Write_Stream_Impl::ACE_Asynch_Write_Stream_Impl (void)
-  : ACE_Asynch_Operation_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Write_Stream_Result_Impl::ACE_Asynch_Write_Stream_Result_Impl (void)
-  : ACE_Asynch_Result_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Read_File_Impl::ACE_Asynch_Read_File_Impl (void)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Read_File_Result_Impl::ACE_Asynch_Read_File_Result_Impl (void)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Write_File_Impl::ACE_Asynch_Write_File_Impl (void)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Write_File_Result_Impl::ACE_Asynch_Write_File_Result_Impl (void)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Accept_Impl::ACE_Asynch_Accept_Impl (void)
-  : ACE_Asynch_Operation_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Accept_Result_Impl::ACE_Asynch_Accept_Result_Impl (void)
-  : ACE_Asynch_Result_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Transmit_File_Impl::ACE_Asynch_Transmit_File_Impl (void)
-  : ACE_Asynch_Operation_Impl ()
-{
-}
-
-ACE_INLINE
-ACE_Asynch_Transmit_File_Result_Impl::ACE_Asynch_Transmit_File_Result_Impl (void)
-  : ACE_Asynch_Result_Impl ()
-{
-}
diff --git a/ace/Atomic_Op.i b/ace/Atomic_Op.i
index 28f1bab5d89..8c56bb42ba2 100644
--- a/ace/Atomic_Op.i
+++ b/ace/Atomic_Op.i
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 // $Id$
 
 template <class ACE_LOCK, class TYPE> ACE_INLINE TYPE 
diff --git a/ace/Auto_Ptr.h b/ace/Auto_Ptr.h
index fdf00e2cdbc..e6639638e2d 100644
--- a/ace/Auto_Ptr.h
+++ b/ace/Auto_Ptr.h
@@ -34,15 +34,14 @@ class ACE_Auto_Basic_Ptr
 public:
   // = Initialization and termination methods
   /* explicit */ ACE_Auto_Basic_Ptr (X *p = 0);
-  ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &ap);
-  ACE_Auto_Basic_Ptr<X> &operator= (ACE_Auto_Basic_Ptr<X> &rhs);
+  ACE_Auto_Basic_Ptr (const ACE_Auto_Basic_Ptr<X> &ap);
+  ACE_Auto_Basic_Ptr<X> &operator= (const ACE_Auto_Basic_Ptr<X> &rhs);
   ~ACE_Auto_Basic_Ptr (void);
 
   // = Accessor methods.
   X &operator *() const;
   X *get (void) const;
-  X *release (void);
-  void reset (X *p = 0);
+  X *release (void) const;
 
   void dump (void) const;
   // Dump the state of an object.
@@ -88,16 +87,15 @@ class ACE_Auto_Basic_Array_Ptr
 public:
   // = Initialization and termination methods.
   /* explicit */ ACE_Auto_Basic_Array_Ptr (X *p = 0);
-  ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> &ap);
-  ACE_Auto_Basic_Array_Ptr<X> &operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs);
+  ACE_Auto_Basic_Array_Ptr (const ACE_Auto_Basic_Array_Ptr<X> &ap);
+  ACE_Auto_Basic_Array_Ptr<X> &operator= (const ACE_Auto_Basic_Array_Ptr<X> &rhs);
   ~ACE_Auto_Basic_Array_Ptr (void);
 
   // = Accessor methods.
   X &operator* () const;
   X &operator[] (int i) const;
   X *get (void) const;
-  X *release (void);
-  void reset (X *p = 0);
+  X *release (void) const;
 
   void dump (void) const;
   // Dump the state of an object.
diff --git a/ace/Auto_Ptr.i b/ace/Auto_Ptr.i
index 74281c2dc88..794c0f260ca 100644
--- a/ace/Auto_Ptr.i
+++ b/ace/Auto_Ptr.i
@@ -11,60 +11,53 @@ ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (X *p)
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (ACE_Auto_Basic_Ptr<X> &rhs)
-  : p_ (rhs.release ())
+ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr (const ACE_Auto_Basic_Ptr<X> &ap)
+  : p_ (ap.release ()) 
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::ACE_Auto_Basic_Ptr");
 }
 
-template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Ptr<X>::get (void) const
-{
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::get");
-  return this->p_;
-}
-
-template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Ptr<X>::release (void)
-{
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::release");
-  X *old = this->p_;
-  this->p_ = 0;
-  return old;
-}
-
-template<class X> ACE_INLINE void
-ACE_Auto_Basic_Ptr<X>::reset (X *p)
-{
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::reset");
-  if (this->get () != p)
-    delete this->get ();
-  this->p_ = p;
-}
-
 template<class X> ACE_INLINE ACE_Auto_Basic_Ptr<X> &
-ACE_Auto_Basic_Ptr<X>::operator= (ACE_Auto_Basic_Ptr<X> &rhs)
+ACE_Auto_Basic_Ptr<X>::operator= (const ACE_Auto_Basic_Ptr<X> &rhs)
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::operator=");
-  if (this != &rhs)
+  if (this != &rhs) 
     {
-      this->reset (rhs.release ());
+      delete this->p_;
+      this->p_ = rhs.release ();
     }
   return *this;
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr (void)
-{
+ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr (void) 
+{ 
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::~ACE_Auto_Basic_Ptr");
-  delete this->get ();
+  delete p_; 
 }
 
 template<class X> ACE_INLINE X &
-ACE_Auto_Basic_Ptr<X>::operator *() const
+ACE_Auto_Basic_Ptr<X>::operator *() const 
 {
   ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::operator *()");
-  return *this->get ();
+  return *p_;
+}
+
+template<class X> ACE_INLINE X *
+ACE_Auto_Basic_Ptr<X>::get (void) const 
+{
+  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::get");
+  return p_;
+}
+
+template<class X> ACE_INLINE X *
+ACE_Auto_Basic_Ptr<X>::release (void) const
+{
+  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::release");
+  X *old = this->p_;
+  ACE_Auto_Basic_Ptr<X> *fake_this = (ACE_Auto_Basic_Ptr<X> *) this;
+  fake_this->p_ = 0;
+  return old;
 }
 
 #if !defined (ACE_HAS_STANDARD_CPP_LIBRARY) || \
@@ -78,87 +71,79 @@ auto_ptr<X>::auto_ptr (X *p)
 }
 
 template<class X> ACE_INLINE X *
-auto_ptr<X>::operator-> () const
+auto_ptr<X>::operator-> () const 
 {
   ACE_TRACE ("auto_ptr<X>::operator->");
-  return this->get ();
+  return ACE_Auto_Basic_Ptr<X>::p_;
 }
 
 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (X *p)
-  : p_ (p)
+ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (X *p) 
+  : p_ (p) 
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr");
 }
 
-template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Array_Ptr<X>::get (void) const
-{
-  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get");
-  return this->p_;
-}
-
-template<class X> ACE_INLINE X *
-ACE_Auto_Basic_Array_Ptr<X>::release (void)
-{
-  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::release");
-  X *old = this->p_;
-  this->p_ = 0;
-  return old;
-}
-
-template<class X> ACE_INLINE void
-ACE_Auto_Basic_Array_Ptr<X>::reset (X *p)
-{
-  ACE_TRACE ("ACE_Auto_Basic_Ptr<X>::reset");
-  if (this->get () != p)
-    delete [] this->get ();
-  this->p_ = p;
-}
-
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (ACE_Auto_Basic_Array_Ptr<X> &rhs)
-  : p_ (rhs.release ())
+ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr (const ACE_Auto_Basic_Array_Ptr<X> &ap) 
+  : p_ (ap.release ()) 
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr");
 }
 
 template<class X> ACE_INLINE ACE_Auto_Basic_Array_Ptr<X> &
-ACE_Auto_Basic_Array_Ptr<X>::operator= (ACE_Auto_Basic_Array_Ptr<X> &rhs)
+ACE_Auto_Basic_Array_Ptr<X>::operator= (const ACE_Auto_Basic_Array_Ptr<X> &rhs)
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::operator=");
-  if (this != &rhs)
+  if (this != &rhs) 
     {
-      this->reset (rhs.release ());
+      delete [] this->p_;
+      this->p_ = rhs.release ();
     }
   return *this;
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr (void)
+ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr (void) 
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::~ACE_Auto_Basic_Array_Ptr");
-  delete [] this->get ();
+  delete [] p_;
 }
 
 template<class X> ACE_INLINE X &
 ACE_Auto_Basic_Array_Ptr<X>::operator *() const
 {
-  return *this->get ();
+  return *p_;
 }
 
 template<class X> ACE_INLINE X &
 ACE_Auto_Basic_Array_Ptr<X>::operator[](int i) const
 {
-  X *array = this->get ();
-  return array[i];
+  return p_[i];
+}
+
+template<class X> ACE_INLINE X *
+ACE_Auto_Basic_Array_Ptr<X>::get (void) const 
+{
+  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::get");
+  return p_;
+}
+
+template<class X> ACE_INLINE X *
+ACE_Auto_Basic_Array_Ptr<X>::release (void) const 
+{
+  ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::release");
+  X *old = this->p_;
+  ACE_Auto_Basic_Array_Ptr<X> *fake_this = (ACE_Auto_Basic_Array_Ptr<X> *) this;
+  fake_this->p_ = 0;
+  return old;
 }
 
 template<class X> ACE_INLINE
-ACE_Auto_Array_Ptr<X>::ACE_Auto_Array_Ptr (X *p)
-  : ACE_Auto_Basic_Array_Ptr<X> (p)
+ACE_Auto_Array_Ptr<X>::ACE_Auto_Array_Ptr (X *p) 
+  : ACE_Auto_Basic_Array_Ptr<X> (p) 
 {
   ACE_TRACE ("ACE_Auto_Basic_Array_Ptr<X>::ACE_Auto_Basic_Array_Ptr");
 }
@@ -166,5 +151,6 @@ ACE_Auto_Array_Ptr<X>::ACE_Auto_Array_Ptr (X *p)
 template<class X> ACE_INLINE X *
 ACE_Auto_Array_Ptr<X>::operator->() const
 {
-  return this->get ();
+  return ACE_Auto_Basic_Array_Ptr<X>::p_;
 }
+
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h
index 367710a3c1f..039c8b0e75e 100644
--- a/ace/Basic_Types.h
+++ b/ace/Basic_Types.h
@@ -161,7 +161,7 @@
   typedef unsigned short ACE_UINT16;
 # elif ACE_SIZEOF_INT == 2
   typedef int ACE_INT16;
-  typedef unsigned int ACE_UINT16;
+  typedef unsigned short ACE_UINT16;
 # 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"
@@ -184,9 +184,6 @@ typedef ACE_UINT16 ACE_USHORT16;
 # if ACE_SIZEOF_INT == 4
   typedef int ACE_INT32;
   typedef unsigned int ACE_UINT32;
-#   if defined (__KCC) && !defined (ACE_LACKS_LONGLONG_T)
-  typedef unsigned long long ACE_UINT64;
-#   endif /* __KCC */
 # elif ACE_SIZEOF_LONG == 4
   typedef long ACE_INT32;
   typedef unsigned long ACE_UINT32;
@@ -356,26 +353,14 @@ typedef ACE_UINT16 ACE_USHORT16;
 // 64-bit literals require special marking on some platforms.
 # if defined (ACE_WIN32)
 #   define ACE_UINT64_LITERAL(n) n ## ui64
-#   define ACE_INT64_LITERAL(n) n ## i64
-# elif defined (ACE_LACKS_LONGLONG_T)
-    // Can only specify 32-bit arguments.
-#   define ACE_UINT64_LITERAL(n) (ACE_U_LongLong (n))
-      // This one won't really work, but it'll keep
-      // some compilers happy until we have better support
-#   define ACE_INT64_LITERAL(n) (ACE_U_LongLong (n))
-# else  /* ! ACE_WIN32  &&  ! ACE_LACKS_LONGLONG_T */
+# else  /* ! ACE_WIN32 */
 #   define ACE_UINT64_LITERAL(n) n ## ull
-#   define ACE_INT64_LITERAL(n) n ## ll
-# endif /* ! ACE_WIN32  &&  ! ACE_LACKS_LONGLONG_T */
+# endif /* ! ACE_WIN32 */
 
 #if !defined (ACE_UINT64_FORMAT_SPECIFIER)
 # define ACE_UINT64_FORMAT_SPECIFIER "%llu"
 #endif /* ACE_UINT64_FORMAT_SPECIFIER */
 
-#if !defined (ACE_INT64_FORMAT_SPECIFIER)
-# define ACE_INT64_FORMAT_SPECIFIER "%lld"
-#endif /* ACE_INT64_FORMAT_SPECIFIER */
-
 // Cast from UINT64 to a double requires an intermediate cast to INT64
 // on some platforms.
 # if defined (ACE_WIN32)
@@ -432,24 +417,6 @@ typedef ACE_UINT16 ACE_USHORT16;
 #   endif /* LDBL_MAX_EXP */
 # endif /* ACE_SIZEOF_LONG_DOUBLE */
 
-// Max and min sizes for the ACE integer types.
-#define ACE_CHAR_MAX 0x7F
-#define ACE_CHAR_MIN -(ACE_CHAR_MAX)-1
-#define ACE_OCTET_MAX 0xFF
-#define ACE_INT16_MAX 0x7FFF
-#define ACE_INT16_MIN -(ACE_INT16_MAX)-1
-#define ACE_UINT16_MAX 0xFFFF
-#define ACE_WCHAR_MAX ACE_UINT16_MAX
-#define ACE_INT32_MAX 0x7FFFFFFF
-#define ACE_INT32_MIN -(ACE_INT32_MAX)-1
-#define ACE_UINT32_MAX 0xFFFFFFFF
-#define ACE_INT64_MAX ACE_INT64_LITERAL(0x7FFFFFFFFFFFFFFF)
-#define ACE_INT64_MIN -(ACE_INT64_MAX)-1
-#define ACE_UINT64_MAX ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF)
-// These use ANSI/IEEE format.
-#define ACE_FLT_MAX 3.402823466e+38F
-#define ACE_DBL_MAX 1.7976931348623158e+308
-
 // Byte-order (endian-ness) determination.
 # if defined (BYTE_ORDER)
 #   if (BYTE_ORDER == LITTLE_ENDIAN)
diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 9b313446eed..0f4ed8875fc 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -40,7 +40,7 @@
 #endif /* ! __ACE_INLINE__ */
 
 int
-ACE_CDR::grow (ACE_Message_Block *mb, size_t minsize)
+CDR::grow (ACE_Message_Block *mb, size_t minsize)
 {
   // Calculate the new buffer's length; if growing for encode, we
   // don't grow in "small" chunks because of the cost.
@@ -53,31 +53,31 @@ ACE_CDR::grow (ACE_Message_Block *mb, size_t minsize)
       // TODO The growth strategy should be controlled using
       // the ORB parameters....
       if (newsize == 0)
-        newsize = ACE_CDR::DEFAULT_BUFSIZE;
-      else if (size < ACE_CDR::EXP_GROWTH_MAX)
+        newsize = CDR::DEFAULT_BUFSIZE;
+      else if (size < CDR::EXP_GROWTH_MAX)
         newsize *= 2;
       else
-        newsize += ACE_CDR::LINEAR_GROWTH_CHUNK;
+        newsize += CDR::LINEAR_GROWTH_CHUNK;
     }
-  else if (minsize + ACE_CDR::MAX_ALIGNMENT <= size)
+  else if (minsize + CDR::MAX_ALIGNMENT <= size)
     return 0;
   else
     {
       if (newsize == 0)
-        newsize = ACE_CDR::DEFAULT_BUFSIZE;
+	      newsize = CDR::DEFAULT_BUFSIZE;
 
-      while (newsize < minsize + ACE_CDR::MAX_ALIGNMENT)
+      while (newsize < minsize + CDR::MAX_ALIGNMENT)
         {
-          if (newsize < ACE_CDR::EXP_GROWTH_MAX)
+          if (newsize < CDR::EXP_GROWTH_MAX)
             newsize *= 2;
           else
-            newsize += ACE_CDR::LINEAR_GROWTH_CHUNK;
+            newsize += CDR::LINEAR_GROWTH_CHUNK;
         }
     }
 
   ACE_Message_Block tmp (newsize);
 
-  ACE_CDR::mb_align (&tmp);
+  CDR::mb_align (&tmp);
 
   tmp.copy (mb->rd_ptr (), mb->length());
   mb->data_block (tmp.data_block ()->duplicate ());
@@ -87,29 +87,15 @@ ACE_CDR::grow (ACE_Message_Block *mb, size_t minsize)
   return 0;
 }
 
-size_t
-ACE_CDR::total_length (const ACE_Message_Block* begin,
-                       const ACE_Message_Block* end)
-{
-  size_t l = 0;
-  // Compute the total size.
-  for (const ACE_Message_Block *i = begin;
-       i != end;
-       i = i->cont ())
-    l += i->length ();
-  return l;
-}
-
-
 #if defined (NONNATIVE_LONGDOUBLE)
 int
-ACE_CDR::LongDouble::operator== (const ACE_CDR::LongDouble &rhs) const
+CDR::LongDouble::operator== (const CDR::LongDouble &rhs) const
 {
   return ACE_OS::memcmp (this->ld, rhs.ld, 16) == 0;
 }
 
 int
-ACE_CDR::LongDouble::operator!= (const ACE_CDR::LongDouble &rhs) const
+CDR::LongDouble::operator!= (const CDR::LongDouble &rhs) const
 {
   return ACE_OS::memcmp (this->ld, rhs.ld, 16) != 0;
 }
@@ -122,7 +108,7 @@ ACE_OutputCDR::ACE_OutputCDR (size_t size,
                               ACE_Allocator *buffer_allocator,
                               ACE_Allocator *data_block_allocator,
                               size_t memcpy_tradeoff)
-  :  start_ (size ? size : ACE_CDR::DEFAULT_BUFSIZE + ACE_CDR::MAX_ALIGNMENT,
+  :  start_ (size ? size : CDR::DEFAULT_BUFSIZE + CDR::MAX_ALIGNMENT,
              ACE_Message_Block::MB_DATA,
              0,
              0,
@@ -136,7 +122,7 @@ ACE_OutputCDR::ACE_OutputCDR (size_t size,
      good_bit_ (1),
      memcpy_tradeoff_ (memcpy_tradeoff)
 {
-  ACE_CDR::mb_align (&this->start_);
+  CDR::mb_align (&this->start_);
   this->current_ = &this->start_;
 }
 
@@ -160,7 +146,7 @@ ACE_OutputCDR::ACE_OutputCDR (char *data, size_t size,
      memcpy_tradeoff_ (memcpy_tradeoff)
 {
   // We cannot trust the buffer to be properly aligned
-  ACE_CDR::mb_align (&this->start_);
+  CDR::mb_align (&this->start_);
   this->current_ = &this->start_;
 }
 
@@ -173,26 +159,55 @@ ACE_OutputCDR::ACE_OutputCDR (ACE_Message_Block *data,
      memcpy_tradeoff_ (memcpy_tradeoff)
 {
   // We cannot trust the buffer to be properly aligned
-  ACE_CDR::mb_align (&this->start_);
+  CDR::mb_align (&this->start_);
   this->current_ = &this->start_;
 }
 
+ACE_OutputCDR::~ACE_OutputCDR (void)
+{
+  if (this->start_.cont () != 0)
+    {
+      ACE_Message_Block::release (this->start_.cont ());
+      this->start_.cont (0);
+    }
+  this->current_ = 0;
+}
+
+void
+ACE_OutputCDR::reset (void)
+{
+  this->current_ = &this->start_;
+  CDR::mb_align (&this->start_);
+}
+
+size_t
+ACE_OutputCDR::total_length (void) const
+{
+  size_t l = 0;
+  // Compute the total size.
+  for (const ACE_Message_Block *i = this->begin ();
+       i != this->end ();
+       i = i->cont ())
+    l += i->length ();
+  return l;
+}
+
 int
 ACE_OutputCDR::grow_and_adjust (size_t size,
                                 size_t align,
                                 char*& buf)
 {
   if (this->current_->cont () == 0
-      || this->current_->cont ()->size () < size + ACE_CDR::MAX_ALIGNMENT)
+      || this->current_->cont ()->size () < size + CDR::MAX_ALIGNMENT)
     {
       // Allocate the next block, it must be large enough.
-      size_t block_size = ACE_CDR::DEFAULT_BUFSIZE;
-      while (block_size < size + ACE_CDR::MAX_ALIGNMENT)
+      size_t block_size = CDR::DEFAULT_BUFSIZE;
+      while (block_size < size + CDR::MAX_ALIGNMENT)
         {
-          if (block_size < ACE_CDR::EXP_GROWTH_MAX)
+          if (block_size < CDR::EXP_GROWTH_MAX)
             block_size *= 2;
           else
-            block_size += ACE_CDR::LINEAR_GROWTH_CHUNK;
+            block_size += CDR::LINEAR_GROWTH_CHUNK;
         }
       this->good_bit_ = 0;
       ACE_Message_Block* tmp;
@@ -213,12 +228,12 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
       // The new block must start with the same alignment as the
       // previous block finished.
       ptr_arith_t tmpalign =
-        ptr_arith_t(tmp->wr_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+        ptr_arith_t(tmp->wr_ptr ()) % CDR::MAX_ALIGNMENT;
       ptr_arith_t curalign =
-        ptr_arith_t(this->current_->wr_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
+        ptr_arith_t(this->current_->wr_ptr ()) % CDR::MAX_ALIGNMENT;
       int offset = curalign - tmpalign;
       if (offset < 0)
-        offset += ACE_CDR::MAX_ALIGNMENT;
+        offset += CDR::MAX_ALIGNMENT;
       tmp->rd_ptr (offset);
       tmp->wr_ptr (tmp->rd_ptr ());
 
@@ -230,13 +245,13 @@ ACE_OutputCDR::grow_and_adjust (size_t size,
 
   // Now we are ready to set buf..
   // recompute the position....
-  buf = ptr_align_binary (this->current_->wr_ptr (), align);
+  buf = ptr_align_binary (this->current_->wr_ptr(), align);
   this->current_->wr_ptr (buf + size);
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_string (ACE_CDR::ULong len,
+CDR::Boolean
+ACE_OutputCDR::write_string (CDR::ULong len,
                              const char *x)
 {
   if (len != 0)
@@ -261,9 +276,9 @@ ACE_OutputCDR::write_string (ACE_CDR::ULong len,
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_wstring (ACE_CDR::ULong len,
-                              const ACE_CDR::WChar *x)
+CDR::Boolean
+ACE_OutputCDR::write_wstring (CDR::ULong len,
+                              const CDR::WChar *x)
 {
   if (x != 0)
     {
@@ -282,7 +297,7 @@ ACE_OutputCDR::write_wstring (ACE_CDR::ULong len,
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
 {
   // If the buffer is small and it fits in the current message
@@ -298,8 +313,8 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
                            ACE_Message_Block::DONT_DELETE))
         {
           if (! this->write_array (i->rd_ptr (),
-                                   ACE_CDR::OCTET_SIZE,
-                                   ACE_CDR::OCTET_ALIGN,
+                                   CDR::OCTET_SIZE,
+                                   CDR::OCTET_ALIGN,
                                    length))
             {
               return 0;
@@ -311,8 +326,8 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
           && this->current_->wr_ptr () + length < this->current_->end ())
         {
           if (! this->write_array (i->rd_ptr (),
-                                   ACE_CDR::OCTET_SIZE,
-                                   ACE_CDR::OCTET_ALIGN,
+                                   CDR::OCTET_SIZE,
+                                   CDR::OCTET_ALIGN,
                                    length))
             {
               return 0;
@@ -320,15 +335,12 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
           continue;
         }
 
-      ACE_Message_Block* cont =
-        new ACE_Message_Block (i->data_block ()->duplicate ());
+      ACE_Message_Block* cont = ACE_Message_Block::duplicate (i);
       if (cont != 0)
         {
           cont->cont (this->current_->cont ());
           this->current_->cont (cont);
           this->current_ = cont;
-          cont->rd_ptr (i->rd_ptr ());
-          cont->wr_ptr (i->wr_ptr ());
         }
       else
         {
@@ -339,37 +351,37 @@ ACE_OutputCDR::write_octet_array_mb (const ACE_Message_Block* mb)
   return 1;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_1 (const ACE_CDR::Octet *x)
+CDR::Boolean
+ACE_OutputCDR::write_1 (const CDR::Octet *x)
 {
   char *buf;
   if (this->adjust (1, buf) == 0)
     {
-      *ACE_reinterpret_cast(ACE_CDR::Octet*, buf) = *x;
+      *ACE_reinterpret_cast(CDR::Octet*, buf) = *x;
       return 1;
     }
 
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
+CDR::Boolean
+ACE_OutputCDR::write_2 (const CDR::UShort *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0)
+  if (this->adjust (CDR::SHORT_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(ACE_CDR::UShort*,buf) = *x;
+      *ACE_reinterpret_cast(CDR::UShort*,buf) = *x;
       return 1;
 #else
       if (!this->do_byte_swap_)
         {
-          *ACE_reinterpret_cast (ACE_CDR::UShort *, buf) = *x;
+          *ACE_reinterpret_cast (CDR::UShort *, buf) = *x;
           return 1;
         }
       else
         {
-          ACE_CDR::swap_2 (ACE_reinterpret_cast (const char*, x), buf);
+          CDR::swap_2 (ACE_reinterpret_cast (const char*, x), buf);
           return 1;
         }
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
@@ -378,24 +390,24 @@ ACE_OutputCDR::write_2 (const ACE_CDR::UShort *x)
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
+CDR::Boolean
+ACE_OutputCDR::write_4 (const CDR::ULong *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
+  if (this->adjust (CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(ACE_CDR::ULong*,buf) = *x;
+      *ACE_reinterpret_cast(CDR::ULong*,buf) = *x;
       return 1;
 #else
       if (!this->do_byte_swap_)
         {
-          *ACE_reinterpret_cast (ACE_CDR::ULong *, buf) = *x;
+          *ACE_reinterpret_cast (CDR::ULong *, buf) = *x;
           return 1;
         }
       else
         {
-          ACE_CDR::swap_4 (ACE_reinterpret_cast (const char*, x), buf);
+          CDR::swap_4 (ACE_reinterpret_cast (const char*, x), buf);
           return 1;
         }
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
@@ -404,24 +416,24 @@ ACE_OutputCDR::write_4 (const ACE_CDR::ULong *x)
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
+CDR::Boolean
+ACE_OutputCDR::write_8 (const CDR::ULongLong *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
+  if (this->adjust (CDR::LONGLONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(ACE_CDR::ULongLong*,buf) = *x;
+      *ACE_reinterpret_cast(CDR::ULongLong*,buf) = *x;
       return 1;
 #else
       if (!this->do_byte_swap_)
         {
-          *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf) = *x;
+          *ACE_reinterpret_cast (CDR::ULongLong *, buf) = *x;
           return 1;
         }
       else
         {
-          ACE_CDR::swap_8 (ACE_reinterpret_cast (const char*, x), buf);
+          CDR::swap_8 (ACE_reinterpret_cast (const char*, x), buf);
           return 1;
         }
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
@@ -430,26 +442,26 @@ ACE_OutputCDR::write_8 (const ACE_CDR::ULongLong *x)
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_16 (const ACE_CDR::LongDouble *x)
+CDR::Boolean
+ACE_OutputCDR::write_16 (const CDR::LongDouble *x)
 {
   char* buf;
-  if (this->adjust (ACE_CDR::LONGDOUBLE_SIZE,
-                    ACE_CDR::LONGDOUBLE_ALIGN,
+  if (this->adjust (CDR::LONGDOUBLE_SIZE,
+                    CDR::LONGDOUBLE_ALIGN,
                     buf) == 0)
     {
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-      *ACE_reinterpret_cast(ACE_CDR::LongDouble*,buf) = *x;
+      *ACE_reinterpret_cast(CDR::LongDouble*,buf) = *x;
       return 1;
 #else
       if (!this->do_byte_swap_)
         {
-          *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf) = *x;
+          *ACE_reinterpret_cast (CDR::LongDouble *, buf) = *x;
           return 1;
         }
       else
         {
-          ACE_CDR::swap_16 (ACE_reinterpret_cast (const char*, x), buf);
+          CDR::swap_16 (ACE_reinterpret_cast (const char*, x), buf);
           return 1;
         }
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
@@ -458,11 +470,11 @@ ACE_OutputCDR::write_16 (const ACE_CDR::LongDouble *x)
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_OutputCDR::write_array (const void *x,
-                            size_t size,
-                            size_t align,
-                            ACE_CDR::ULong length)
+			    size_t size,
+			    size_t align,
+			    CDR::ULong length)
 {
   char *buf;
   if (this->adjust (size * length, align, buf) == 0)
@@ -471,7 +483,7 @@ ACE_OutputCDR::write_array (const void *x,
       ACE_OS::memcpy (buf, x, size*length);
       return 1;
 #else
-      if (!this->do_byte_swap_ || size == 1)
+      if (!this->do_byte_swap_)
         {
           ACE_OS::memcpy (buf, x, size*length);
           return 1;
@@ -484,16 +496,16 @@ ACE_OutputCDR::write_array (const void *x,
           switch (size)
             {
             case 2:
-              swapper = ACE_CDR::swap_2;
+              swapper = CDR::swap_2;
               break;
             case 4:
-              swapper = ACE_CDR::swap_4;
+              swapper = CDR::swap_4;
               break;
             case 8:
-              swapper = ACE_CDR::swap_8;
+              swapper = CDR::swap_8;
               break;
             case 16:
-              swapper = ACE_CDR::swap_16;
+              swapper = CDR::swap_16;
               break;
             default:
               // TODO: print something?
@@ -517,17 +529,17 @@ ACE_OutputCDR::write_array (const void *x,
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_OutputCDR::write_boolean_array (const ACE_CDR::Boolean* x,
-                                    ACE_CDR::ULong length)
+CDR::Boolean
+ACE_OutputCDR::write_boolean_array (const CDR::Boolean* x,
+                                    CDR::ULong length)
 {
   // It is hard to optimize this, the spec requires that on the wire
   // booleans be represented as a byte with value 0 or 1, but in
   // memoery it is possible (though very unlikely) that a boolean has
   // a non-zero value (different from 1).
   // We resort to a simple loop.
-  const ACE_CDR::Boolean* end = x + length;
-  for (const ACE_CDR::Boolean* i = x; i != end && this->good_bit (); ++i)
+  const CDR::Boolean* end = x + length;
+  for (const CDR::Boolean* i = x; i != end && this->good_bit (); ++i)
     {
       this->write_boolean (*i);
     }
@@ -554,32 +566,14 @@ ACE_InputCDR::ACE_InputCDR (size_t bufsiz,
 {
 }
 
-ACE_InputCDR::ACE_InputCDR (const ACE_Message_Block *data,
+ACE_InputCDR::ACE_InputCDR (ACE_Message_Block *data,
                             int byte_order)
-  :  start_ (ACE_CDR::total_length (data, 0) + ACE_CDR::MAX_ALIGNMENT),
-  // @@ We may need allocators for the previous line, and the size may
-  // be a standard ACE_*CDR size...
+  :  start_ (data->data_block ()->duplicate ()),
      do_byte_swap_ (byte_order != ACE_CDR_BYTE_ORDER),
      good_bit_ (1)
 {
-  // We must copy the contents of <data> into the new buffer, but
-  // respecting the alignment.
-  ptr_arith_t curalign =
-    ptr_arith_t(data->rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
-  ptr_arith_t tmpalign =
-    ptr_arith_t(this->start_.rd_ptr ()) % ACE_CDR::MAX_ALIGNMENT;
-  int offset = curalign - tmpalign;
-  if (offset < 0)
-    offset += ACE_CDR::MAX_ALIGNMENT;
-  this->start_.rd_ptr (offset);
-  this->start_.wr_ptr (offset);
-
-  for (const ACE_Message_Block* i = data;
-       i != 0;
-       i = i->cont ())
-    {
-      this->start_.copy (i->rd_ptr (), i->length ());
-    }
+  this->start_.rd_ptr (data->rd_ptr ());
+  this->start_.wr_ptr (data->wr_ptr ());
 }
 
 ACE_InputCDR::ACE_InputCDR (ACE_Data_Block *data,
@@ -592,7 +586,7 @@ ACE_InputCDR::ACE_InputCDR (ACE_Data_Block *data,
 
 ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs,
                             size_t size,
-                            ACE_CDR::Long offset)
+                            CDR::Long offset)
   : start_ (rhs.start_.data_block ()->duplicate ()),
     do_byte_swap_ (rhs.do_byte_swap_),
     good_bit_ (1)
@@ -627,7 +621,7 @@ ACE_InputCDR::ACE_InputCDR (const ACE_InputCDR& rhs,
       this->start_.rd_ptr (newpos);
       this->start_.wr_ptr (newpos + size);
 
-      ACE_CDR::Octet byte_order;
+      CDR::Octet byte_order;
       this->read_octet (byte_order);
       this->do_byte_swap_ = (byte_order != ACE_CDR_BYTE_ORDER);
     }
@@ -663,7 +657,7 @@ ACE_InputCDR::operator= (const ACE_InputCDR& rhs)
 ACE_InputCDR::ACE_InputCDR (const ACE_OutputCDR& rhs,
                             ACE_Allocator* buffer_allocator,
                             ACE_Allocator* data_block_allocator)
-  : start_ (rhs.total_length () + ACE_CDR::MAX_ALIGNMENT,
+  : start_ (rhs.total_length () + CDR::MAX_ALIGNMENT,
             ACE_Message_Block::MB_DATA,
             0,
             0,
@@ -676,22 +670,26 @@ ACE_InputCDR::ACE_InputCDR (const ACE_OutputCDR& rhs,
     do_byte_swap_ (rhs.do_byte_swap_),
     good_bit_ (1)
 {
-  ACE_CDR::mb_align (&this->start_);
+  CDR::mb_align (&this->start_);
   for (const ACE_Message_Block *i = rhs.begin ();
        i != rhs.end ();
        i = i->cont ())
     this->start_.copy (i->rd_ptr (), i->length ());
 }
 
-ACE_CDR::Boolean
+ACE_InputCDR::~ACE_InputCDR (void)
+{
+}
+
+CDR::Boolean
 ACE_InputCDR::read_string (char *&x)
 {
-  ACE_CDR::ULong len;
+  CDR::ULong len;
 
   this->read_ulong (len);
   if (len > 0)
     {
-      ACE_NEW_RETURN (x, ACE_CDR::Char[len], 0);
+      ACE_NEW_RETURN (x, CDR::Char[len], 0);
       if (this->read_char_array (x, len))
         return 1;
       delete [] x;
@@ -701,10 +699,10 @@ ACE_InputCDR::read_string (char *&x)
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_InputCDR::read_string (ACE_CString &x)
 {
-  ACE_CDR::Char *data;
+  CDR::Char *data;
   if (this->read_string (data))
     {
       x = data;
@@ -716,14 +714,14 @@ ACE_InputCDR::read_string (ACE_CString &x)
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
+CDR::Boolean
+ACE_InputCDR::read_wstring (CDR::WChar*& x)
 {
-  ACE_CDR::ULong len;
+  CDR::ULong len;
   this->read_ulong (len);
   if (this->good_bit())
     {
-      ACE_NEW_RETURN (x, ACE_CDR::WChar[len], 0);
+      ACE_NEW_RETURN (x, CDR::WChar[len], 0);
       if (this->read_wchar_array (x, len))
         return 1;
 
@@ -733,11 +731,11 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x)
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_InputCDR::read_array (void* x,
                           size_t size,
                           size_t align,
-                          ACE_CDR::ULong length)
+                          CDR::ULong length)
 {
   char* buf;
   if (this->adjust (size * length, align, buf) == 0)
@@ -757,25 +755,25 @@ ACE_InputCDR::read_array (void* x,
             case 2:
               for (; target != end; target += size, buf += size)
                 {
-                  ACE_CDR::swap_2 (buf, target);
+                  CDR::swap_2 (buf, target);
                 }
               break;
             case 4:
               for (; target != end; target += size, buf += size)
                 {
-                  ACE_CDR::swap_4 (buf, target);
+                  CDR::swap_4 (buf, target);
                 }
               break;
             case 8:
               for (; target != end; target += size, buf += size)
                 {
-                  ACE_CDR::swap_8 (buf, target);
+                  CDR::swap_8 (buf, target);
                 }
               break;
             case 16:
               for (; target != end; target += size, buf += size)
                 {
-                  ACE_CDR::swap_16 (buf, target);
+                  CDR::swap_16 (buf, target);
                 }
               break;
             default:
@@ -792,28 +790,28 @@ ACE_InputCDR::read_array (void* x,
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_boolean_array (ACE_CDR::Boolean *x,
-                                  ACE_CDR::ULong length)
+CDR::Boolean
+ACE_InputCDR::read_boolean_array (CDR::Boolean *x,
+                                  CDR::ULong length)
 {
   // It is hard to optimize this, the spec requires that on the wire
   // booleans be represented as a byte with value 0 or 1, but in
   // memoery it is possible (though very unlikely) that a boolean has
   // a non-zero value (different from 1).
   // We resort to a simple loop.
-  for (ACE_CDR::ULong i = 0; i != length && this->good_bit_; ++i)
+  for (CDR::ULong i = 0; i != length && this->good_bit_; ++i)
     {
       this->read_boolean (x[i]);
     }
   return this->good_bit_;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_1 (ACE_CDR::Octet *x)
+CDR::Boolean
+ACE_InputCDR::read_1 (CDR::Octet *x)
 {
   if (this->rd_ptr () < this->end ())
     {
-      *x = *ACE_reinterpret_cast (ACE_CDR::Octet*,this->rd_ptr());
+      *x = *ACE_reinterpret_cast (CDR::Octet*,this->rd_ptr());
       this->start_.rd_ptr (1);
       return 1;
     }
@@ -822,104 +820,104 @@ ACE_InputCDR::read_1 (ACE_CDR::Octet *x)
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_2 (ACE_CDR::UShort *x)
+CDR::Boolean
+ACE_InputCDR::read_2 (CDR::UShort *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::SHORT_SIZE, buf) == 0)
+  if (this->adjust (CDR::SHORT_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
       if (!this->do_byte_swap_)
         {
-          *x = *ACE_reinterpret_cast (ACE_CDR::UShort*, buf);
+          *x = *ACE_reinterpret_cast (CDR::UShort*, buf);
         }
       else
         {
-          ACE_CDR::swap_2 (buf, ACE_reinterpret_cast (char*, x));
+          CDR::swap_2 (buf, ACE_reinterpret_cast (char*, x));
         }
 #else
-      *x = *ACE_reinterpret_cast(ACE_CDR::UShort*,buf);
+      *x = *ACE_reinterpret_cast(CDR::UShort*,buf);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
       return 1;
     }
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_4 (ACE_CDR::ULong *x)
+CDR::Boolean
+ACE_InputCDR::read_4 (CDR::ULong *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::LONG_SIZE, buf) == 0)
+  if (this->adjust (CDR::LONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
       if (!this->do_byte_swap_)
         {
-          *x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf);
+          *x = *ACE_reinterpret_cast (CDR::ULong*, buf);
         }
       else
         {
-          ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, x));
+          CDR::swap_4 (buf, ACE_reinterpret_cast (char*, x));
         }
 #else
-      *x = *ACE_reinterpret_cast(ACE_CDR::ULong*,buf);
+      *x = *ACE_reinterpret_cast(CDR::ULong*,buf);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
       return 1;
     }
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_8 (ACE_CDR::ULongLong *x)
+CDR::Boolean
+ACE_InputCDR::read_8 (CDR::ULongLong *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::LONGLONG_SIZE, buf) == 0)
+  if (this->adjust (CDR::LONGLONG_SIZE, buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
       if (!this->do_byte_swap_)
         {
-          *x = *ACE_reinterpret_cast (ACE_CDR::ULongLong *, buf);
+          *x = *ACE_reinterpret_cast (CDR::ULongLong *, buf);
         }
       else
         {
-          ACE_CDR::swap_8 (buf, ACE_reinterpret_cast (char*, x));
+          CDR::swap_8 (buf, ACE_reinterpret_cast (char*, x));
         }
 #else
-      *x = *ACE_reinterpret_cast(ACE_CDR::ULongLong*,buf);
+      *x = *ACE_reinterpret_cast(CDR::ULongLong*,buf);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
       return 1;
     }
   return 0;
 }
 
-ACE_CDR::Boolean
-ACE_InputCDR::read_16 (ACE_CDR::LongDouble *x)
+CDR::Boolean
+ACE_InputCDR::read_16 (CDR::LongDouble *x)
 {
   char *buf;
-  if (this->adjust (ACE_CDR::LONGLONG_SIZE,
-                    ACE_CDR::LONGLONG_ALIGN,
+  if (this->adjust (CDR::LONGLONG_SIZE,
+                    CDR::LONGLONG_ALIGN,
                     buf) == 0)
     {
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
       if (!this->do_byte_swap_)
         {
-          *x = *ACE_reinterpret_cast (ACE_CDR::LongDouble *, buf);
+          *x = *ACE_reinterpret_cast (CDR::LongDouble *, buf);
         }
       else
         {
-          ACE_CDR::swap_16 (buf, ACE_reinterpret_cast (char*, x));
+          CDR::swap_16 (buf, ACE_reinterpret_cast (char*, x));
         }
 #else
-      *x = *ACE_reinterpret_cast(ACE_CDR::LongDouble*,buf);
+      *x = *ACE_reinterpret_cast(CDR::LongDouble*,buf);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
       return 1;
     }
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_InputCDR::skip_string (void)
 {
-  ACE_CDR::ULong len;
+  CDR::ULong len;
   if (this->read_ulong (len))
     {
       if (this->rd_ptr () + len <= this->end ())
@@ -933,7 +931,7 @@ ACE_InputCDR::skip_string (void)
   return 0;
 }
 
-ACE_CDR::Boolean
+CDR::Boolean
 ACE_InputCDR::skip_bytes (size_t len)
 {
   if (this->rd_ptr () + len <= this->end ())
diff --git a/ace/CDR_Stream.h b/ace/CDR_Stream.h
index 22634aefbc3..f68f5c56bdc 100644
--- a/ace/CDR_Stream.h
+++ b/ace/CDR_Stream.h
@@ -49,18 +49,16 @@
 #define ACE_CDR_H
 
 #include "ace/Message_Block.h"
-#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-class ACE_Export ACE_CDR
+class ACE_Export CDR
 {
   // = TITLE
   //   Keep constants and some routines common to both Output and
   //   Input CDR streams.
-  //
 public:
   // = Constants defined by the CDR protocol.
   // By defining as many of these constants as possible as enums we
@@ -124,19 +122,16 @@ public:
   // large enough to contain any of the basic IDL types.  Return -1 on
   // failure, 0 on success.
 
-  static size_t total_length (const ACE_Message_Block *begin,
-                              const ACE_Message_Block *end);
-
   // Definitions of the IDL basic types, for use in the CDR
   // classes. The cleanest way to avoid complaints from all compilers
   // is to define them all.
-  #if defined (CHORUS) && defined (ghs) && !defined (__STANDARD_CXX)
+  #if defined (ghs) && defined (CHORUS)
     // This is non-compliant, but a nasty bout with
     // Green Hills C++68000 1.8.8 forces us into it.
     typedef unsigned long Boolean;
-  #else  /* ! (CHORUS && ghs 1.8.8) */
+  #else  /* ! (ghs && CHORUS) */
     typedef u_char Boolean;
-  #endif /* ! (CHORUS && ghs 1.8.8) */
+  #endif /* ! (ghs && CHORUS) */
 
   typedef u_char Octet;
   typedef char Char;
@@ -152,7 +147,7 @@ public:
   # 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)
+  #   if defined (sun) && !defined (ACE_LACKS_U_LONGLONG_T)
         // sun #defines u_longlong_t, maybe other platforms do also.
         // Use it, at least with g++, so that its -pedantic doesn't
         // complain about no ANSI C++ long long.
@@ -168,9 +163,9 @@ public:
       // application can cope with the loss of range, it can define
       // conversion operators itself.
   #   if defined (ACE_BIG_ENDIAN)
-        struct LongLong { ACE_CDR::Long h, l; };
+        struct LongLong { CDR::Long h, l; };
   #   else
-        struct LongLong { ACE_CDR::Long l, h; };
+        struct LongLong { CDR::Long l, h; };
   #   endif /* ! ACE_BIG_ENDIAN */
   # endif /* no native 64 bit integer type */
 
@@ -282,115 +277,114 @@ public:
 
   struct ACE_Export from_boolean
   {
-    from_boolean (ACE_CDR::Boolean b);
-    ACE_CDR::Boolean val_;
+    from_boolean (CDR::Boolean b);
+    CDR::Boolean val_;
   };
 
   struct ACE_Export from_octet
   {
-    from_octet (ACE_CDR::Octet o);
-    ACE_CDR::Octet val_;
+    from_octet (CDR::Octet o);
+    CDR::Octet val_;
   };
 
   struct ACE_Export from_char
   {
-    from_char (ACE_CDR::Char c);
-    ACE_CDR::Char val_;
+    from_char (CDR::Char c);
+    CDR::Char val_;
   };
 
   struct ACE_Export from_wchar
   {
-    from_wchar (ACE_CDR::WChar wc);
-    ACE_CDR::WChar val_;
+    from_wchar (CDR::WChar wc);
+    CDR::WChar val_;
   };
 
   struct ACE_Export from_string
   {
-    from_string (ACE_CDR::Char* s,
-                 ACE_CDR::ULong b,
-                 ACE_CDR::Boolean nocopy = 0);
-    ACE_CDR::Char *val_;
-    ACE_CDR::ULong bound_;
-    ACE_CDR::Boolean nocopy_;
+    from_string (CDR::Char* s,
+                 CDR::ULong b,
+                 CDR::Boolean nocopy = 0);
+    CDR::Char *val_;
+    CDR::ULong bound_;
+    CDR::Boolean nocopy_;
   };
 
   // = We have one method per basic IDL type....
   // They return 0 on failure and 1 on success.
-  ACE_CDR::Boolean write_boolean (ACE_CDR::Boolean x);
-  ACE_CDR::Boolean write_char (ACE_CDR::Char x);
-  ACE_CDR::Boolean write_wchar (ACE_CDR::WChar x);
-  ACE_CDR::Boolean write_octet (ACE_CDR::Octet x);
-  ACE_CDR::Boolean write_short (ACE_CDR::Short x);
-  ACE_CDR::Boolean write_ushort (ACE_CDR::UShort x);
-  ACE_CDR::Boolean write_long (ACE_CDR::Long x);
-  ACE_CDR::Boolean write_ulong (ACE_CDR::ULong x);
-  ACE_CDR::Boolean write_longlong (const ACE_CDR::LongLong &x);
-  ACE_CDR::Boolean write_ulonglong (const ACE_CDR::ULongLong &x);
-  ACE_CDR::Boolean write_float (ACE_CDR::Float x);
-  ACE_CDR::Boolean write_double (const ACE_CDR::Double &x);
-  ACE_CDR::Boolean write_longdouble (const ACE_CDR::LongDouble &x);
+  CDR::Boolean write_boolean (CDR::Boolean x);
+  CDR::Boolean write_char (CDR::Char x);
+  CDR::Boolean write_wchar (CDR::WChar x);
+  CDR::Boolean write_octet (CDR::Octet x);
+  CDR::Boolean write_short (CDR::Short x);
+  CDR::Boolean write_ushort (CDR::UShort x);
+  CDR::Boolean write_long (CDR::Long x);
+  CDR::Boolean write_ulong (CDR::ULong x);
+  CDR::Boolean write_longlong (const CDR::LongLong &x);
+  CDR::Boolean write_ulonglong (const CDR::ULongLong &x);
+  CDR::Boolean write_float (CDR::Float x);
+  CDR::Boolean write_double (const CDR::Double &x);
+  CDR::Boolean write_longdouble (const CDR::LongDouble &x);
 
   // = For string we offer methods that accept a precomputed length.
-  ACE_CDR::Boolean write_string (const ACE_CDR::Char *x);
-  ACE_CDR::Boolean write_string (ACE_CDR::ULong len,
-                                 const ACE_CDR::Char *x);
-  ACE_CDR::Boolean write_string (const ACE_CString &x);
-  ACE_CDR::Boolean write_wstring (const ACE_CDR::WChar *x);
-  ACE_CDR::Boolean write_wstring (ACE_CDR::ULong length,
-                                  const ACE_CDR::WChar *x);
+  CDR::Boolean write_string (const CDR::Char *x);
+  CDR::Boolean write_string (CDR::ULong len, const CDR::Char *x);
+  CDR::Boolean write_string (const ACE_CString &x);
+  CDR::Boolean write_wstring (const CDR::WChar *x);
+  CDR::Boolean write_wstring (CDR::ULong length,
+                              const CDR::WChar *x);
 
   // = We add one method to write arrays of basic IDL types.
   // Note: the portion written starts at <x> and ends at <x + length>.
   // The length is *NOT* stored into the CDR stream.
-  ACE_CDR::Boolean write_boolean_array (const ACE_CDR::Boolean *x,
-                                        ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_char_array (const ACE_CDR::Char *x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_wchar_array (const ACE_CDR::WChar* x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_octet_array (const ACE_CDR::Octet* x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_short_array (const ACE_CDR::Short *x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_ushort_array (const ACE_CDR::UShort *x,
-                                       ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_long_array (const ACE_CDR::Long *x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_ulong_array (const ACE_CDR::ULong *x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_longlong_array (const ACE_CDR::LongLong* x,
-                                         ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_ulonglong_array (const ACE_CDR::ULongLong *x,
-                                          ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_float_array (const ACE_CDR::Float *x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_double_array (const ACE_CDR::Double *x,
-                                       ACE_CDR::ULong length);
-  ACE_CDR::Boolean write_longdouble_array (const ACE_CDR::LongDouble* x,
-                                           ACE_CDR::ULong length);
-
-  ACE_CDR::Boolean write_octet_array_mb (const ACE_Message_Block* mb);
+  CDR::Boolean write_boolean_array (const CDR::Boolean *x,
+                                    CDR::ULong length);
+  CDR::Boolean write_char_array (const CDR::Char *x,
+                                 CDR::ULong length);
+  CDR::Boolean write_wchar_array (const CDR::WChar* x,
+                                  CDR::ULong length);
+  CDR::Boolean write_octet_array (const CDR::Octet* x,
+                                  CDR::ULong length);
+  CDR::Boolean write_short_array (const CDR::Short *x,
+                                  CDR::ULong length);
+  CDR::Boolean write_ushort_array (const CDR::UShort *x,
+                                   CDR::ULong length);
+  CDR::Boolean write_long_array (const CDR::Long *x,
+                                 CDR::ULong length);
+  CDR::Boolean write_ulong_array (const CDR::ULong *x,
+                                  CDR::ULong length);
+  CDR::Boolean write_longlong_array (const CDR::LongLong* x,
+                                     CDR::ULong length);
+  CDR::Boolean write_ulonglong_array (const CDR::ULongLong *x,
+                                      CDR::ULong length);
+  CDR::Boolean write_float_array (const CDR::Float *x,
+                                  CDR::ULong length);
+  CDR::Boolean write_double_array (const CDR::Double *x,
+                                   CDR::ULong length);
+  CDR::Boolean write_longdouble_array (const CDR::LongDouble* x,
+                                       CDR::ULong length);
+
+  CDR::Boolean write_octet_array_mb (const ACE_Message_Block* mb);
   // Write an octet array contained inside a MB, this can be optimized
   // to minimize copies.
 
   // = We have one method per basic IDL type....
   // They return 0 on failure and 1 on success.
-  ACE_CDR::Boolean append_boolean (ACE_InputCDR &);
-  ACE_CDR::Boolean append_char (ACE_InputCDR &);
-  ACE_CDR::Boolean append_wchar (ACE_InputCDR &);
-  ACE_CDR::Boolean append_octet (ACE_InputCDR &);
-  ACE_CDR::Boolean append_short (ACE_InputCDR &);
-  ACE_CDR::Boolean append_ushort (ACE_InputCDR &);
-  ACE_CDR::Boolean append_long (ACE_InputCDR &);
-  ACE_CDR::Boolean append_ulong (ACE_InputCDR &);
-  ACE_CDR::Boolean append_longlong (ACE_InputCDR &);
-  ACE_CDR::Boolean append_ulonglong (ACE_InputCDR &);
-  ACE_CDR::Boolean append_float (ACE_InputCDR &);
-  ACE_CDR::Boolean append_double (ACE_InputCDR &);
-  ACE_CDR::Boolean append_longdouble (ACE_InputCDR &);
-
-  ACE_CDR::Boolean append_wstring (ACE_InputCDR &);
-  ACE_CDR::Boolean append_string (ACE_InputCDR &);
+  CDR::Boolean append_boolean (ACE_InputCDR &);
+  CDR::Boolean append_char (ACE_InputCDR &);
+  CDR::Boolean append_wchar (ACE_InputCDR &);
+  CDR::Boolean append_octet (ACE_InputCDR &);
+  CDR::Boolean append_short (ACE_InputCDR &);
+  CDR::Boolean append_ushort (ACE_InputCDR &);
+  CDR::Boolean append_long (ACE_InputCDR &);
+  CDR::Boolean append_ulong (ACE_InputCDR &);
+  CDR::Boolean append_longlong (ACE_InputCDR &);
+  CDR::Boolean append_ulonglong (ACE_InputCDR &);
+  CDR::Boolean append_float (ACE_InputCDR &);
+  CDR::Boolean append_double (ACE_InputCDR &);
+  CDR::Boolean append_longdouble (ACE_InputCDR &);
+
+  CDR::Boolean append_wstring (ACE_InputCDR &);
+  CDR::Boolean append_string (ACE_InputCDR &);
 
   int good_bit (void) const;
   // Returns 0 if an error has ocurred, the only expected error is to
@@ -410,9 +404,6 @@ public:
   const ACE_Message_Block *end (void) const;
   // Return the last message in the chain that is is use.
 
-  const ACE_Message_Block *current (void) const;
-  // Return the <current_> message block in chain.
-
   const char *buffer (void) const;
 
   size_t length (void) const;
@@ -420,27 +411,21 @@ public:
   // methods only return information about the first block in the
   // chain.
 
-  int align_write_ptr (size_t alignment);
-  // Utility function to allow the user more flexibility.
-  // Pads the stream up to the nearest <alignment>-byte boundary.
-  // Argument MUST be a power of 2.
-  // Returns 0 on success and -1 on failure.
-
 private:
   ACE_OutputCDR (const ACE_OutputCDR& rhs);
   ACE_OutputCDR& operator= (const ACE_OutputCDR& rhs);
   // disallow copying...
 
-  ACE_CDR::Boolean write_1 (const ACE_CDR::Octet *x);
-  ACE_CDR::Boolean write_2 (const ACE_CDR::UShort *x);
-  ACE_CDR::Boolean write_4 (const ACE_CDR::ULong *x);
-  ACE_CDR::Boolean write_8 (const ACE_CDR::ULongLong *x);
-  ACE_CDR::Boolean write_16 (const ACE_CDR::LongDouble *x);
+  CDR::Boolean write_1 (const CDR::Octet *x);
+  CDR::Boolean write_2 (const CDR::UShort *x);
+  CDR::Boolean write_4 (const CDR::ULong *x);
+  CDR::Boolean write_8 (const CDR::ULongLong *x);
+  CDR::Boolean write_16 (const CDR::LongDouble *x);
 
-  ACE_CDR::Boolean write_array (const void *x,
-                                size_t size,
-                                size_t align,
-                                ACE_CDR::ULong length);
+  CDR::Boolean write_array (const void *x,
+                            size_t size,
+                            size_t align,
+                            CDR::ULong length);
   // write an array of <length> elements, each of <size> bytes and the
   // start aligned at a multiple of <align>. The elements are assumed
   // to be packed with the right alignment restrictions.  It is mostly
@@ -484,6 +469,10 @@ private:
   ACE_Message_Block *current_;
   // The current block in the chain were we are writing.
 
+  ACE_Allocator *buffer_allocator_;
+  ACE_Allocator *data_block_allocator_;
+  // Allocators for stream growth.
+
   int do_byte_swap_;
   // If not zero swap bytes at writing so the created CDR stream byte
   // order does *not* match the machine byte order.  The motivation
@@ -534,7 +523,7 @@ public:
   // Create an empty input stream. The caller is responsible for
   // putting the right data and providing the right alignment.
 
-  ACE_InputCDR (const ACE_Message_Block *data,
+  ACE_InputCDR (ACE_Message_Block *data,
                 int byte_order = ACE_CDR_BYTE_ORDER);
   // Create an input stream from an ACE_Message_Block
 
@@ -550,7 +539,7 @@ public:
 
   ACE_InputCDR (const ACE_InputCDR& rhs,
                 size_t size,
-                ACE_CDR::Long offset);
+                CDR::Long offset);
   // When interpreting indirected TypeCodes it is useful to make a
   // "copy" of the stream starting in the new position.
 
@@ -572,109 +561,109 @@ public:
 
   struct ACE_Export to_boolean
   {
-    to_boolean (ACE_CDR::Boolean &b);
-    ACE_CDR::Boolean &ref_;
+    to_boolean (CDR::Boolean &b);
+    CDR::Boolean &ref_;
   };
 
   struct ACE_Export to_char
   {
-    to_char (ACE_CDR::Char &c);
-    ACE_CDR::Char &ref_;
+    to_char (CDR::Char &c);
+    CDR::Char &ref_;
   };
 
   struct ACE_Export to_wchar
   {
-    to_wchar (ACE_CDR::WChar &wc);
-    ACE_CDR::WChar &ref_;
+    to_wchar (CDR::WChar &wc);
+    CDR::WChar &ref_;
   };
 
   struct ACE_Export to_octet
   {
-    to_octet (ACE_CDR::Octet &o);
-    ACE_CDR::Octet &ref_;
+    to_octet (CDR::Octet &o);
+    CDR::Octet &ref_;
   };
 
   struct ACE_Export to_string
   {
-    to_string (ACE_CDR::Char *&s, ACE_CDR::ULong b);
-    ACE_CDR::Char *&val_;
-    ACE_CDR::ULong bound_;
+    to_string (CDR::Char *&s, CDR::ULong b);
+    CDR::Char *&val_;
+    CDR::ULong bound_;
   };
 
   // = We have one method per basic IDL type....
   // They return 0 on failure and 1 on success.
-  ACE_CDR::Boolean read_boolean (ACE_CDR::Boolean& x);
-  ACE_CDR::Boolean read_char (ACE_CDR::Char &x);
-  ACE_CDR::Boolean read_wchar (ACE_CDR::WChar& x);
-  ACE_CDR::Boolean read_octet (ACE_CDR::Octet& x);
-  ACE_CDR::Boolean read_short (ACE_CDR::Short &x);
-  ACE_CDR::Boolean read_ushort (ACE_CDR::UShort &x);
-  ACE_CDR::Boolean read_long (ACE_CDR::Long &x);
-  ACE_CDR::Boolean read_ulong (ACE_CDR::ULong &x);
-  ACE_CDR::Boolean read_longlong (ACE_CDR::LongLong& x);
-  ACE_CDR::Boolean read_ulonglong (ACE_CDR::ULongLong& x);
-  ACE_CDR::Boolean read_float (ACE_CDR::Float &x);
-  ACE_CDR::Boolean read_double (ACE_CDR::Double &x);
-  ACE_CDR::Boolean read_longdouble (ACE_CDR::LongDouble &x);
-
-  ACE_CDR::Boolean read_string (ACE_CDR::Char *&x);
-  ACE_CDR::Boolean read_string (ACE_CString &x);
-  ACE_CDR::Boolean read_wstring (ACE_CDR::WChar*& x);
+  CDR::Boolean read_boolean (CDR::Boolean& x);
+  CDR::Boolean read_char (CDR::Char &x);
+  CDR::Boolean read_wchar (CDR::WChar& x);
+  CDR::Boolean read_octet (CDR::Octet& x);
+  CDR::Boolean read_short (CDR::Short &x);
+  CDR::Boolean read_ushort (CDR::UShort &x);
+  CDR::Boolean read_long (CDR::Long &x);
+  CDR::Boolean read_ulong (CDR::ULong &x);
+  CDR::Boolean read_longlong (CDR::LongLong& x);
+  CDR::Boolean read_ulonglong (CDR::ULongLong& x);
+  CDR::Boolean read_float (CDR::Float &x);
+  CDR::Boolean read_double (CDR::Double &x);
+  CDR::Boolean read_longdouble (CDR::LongDouble &x);
+
+  CDR::Boolean read_string (CDR::Char *&x);
+  CDR::Boolean read_string (ACE_CString &x);
+  CDR::Boolean read_wstring (CDR::WChar*& x);
 
   // = One method for each basic type...
   // The buffer <x> must be large enough to contain <length>
   // elements.
   // They return -1 on failure and 0 on success.
-  ACE_CDR::Boolean read_boolean_array (ACE_CDR::Boolean* x,
-                                       ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_char_array (ACE_CDR::Char *x,
-                                    ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_wchar_array (ACE_CDR::WChar* x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_octet_array (ACE_CDR::Octet* x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_short_array (ACE_CDR::Short *x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_ushort_array (ACE_CDR::UShort *x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_long_array (ACE_CDR::Long *x,
-                                    ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_ulong_array (ACE_CDR::ULong *x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_longlong_array (ACE_CDR::LongLong* x,
-                                        ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_ulonglong_array (ACE_CDR::ULongLong* x,
-                                         ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_float_array (ACE_CDR::Float *x,
-                                     ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_double_array (ACE_CDR::Double *x,
-                                      ACE_CDR::ULong length);
-  ACE_CDR::Boolean read_longdouble_array (ACE_CDR::LongDouble* x,
-                                          ACE_CDR::ULong length);
+  CDR::Boolean read_boolean_array (CDR::Boolean* x,
+                                   CDR::ULong length);
+  CDR::Boolean read_char_array (CDR::Char *x,
+                                CDR::ULong length);
+  CDR::Boolean read_wchar_array (CDR::WChar* x,
+                                 CDR::ULong length);
+  CDR::Boolean read_octet_array (CDR::Octet* x,
+                                 CDR::ULong length);
+  CDR::Boolean read_short_array (CDR::Short *x,
+                                 CDR::ULong length);
+  CDR::Boolean read_ushort_array (CDR::UShort *x,
+                                  CDR::ULong length);
+  CDR::Boolean read_long_array (CDR::Long *x,
+                                CDR::ULong length);
+  CDR::Boolean read_ulong_array (CDR::ULong *x,
+                                 CDR::ULong length);
+  CDR::Boolean read_longlong_array (CDR::LongLong* x,
+                                    CDR::ULong length);
+  CDR::Boolean read_ulonglong_array (CDR::ULongLong* x,
+                                     CDR::ULong length);
+  CDR::Boolean read_float_array (CDR::Float *x,
+                                 CDR::ULong length);
+  CDR::Boolean read_double_array (CDR::Double *x,
+                                  CDR::ULong length);
+  CDR::Boolean read_longdouble_array (CDR::LongDouble* x,
+                                      CDR::ULong length);
 
   // = We have one method per basic IDL type....
   // They return 0 on failure and 1 on success.
-  ACE_CDR::Boolean skip_boolean (void);
-  ACE_CDR::Boolean skip_char (void);
-  ACE_CDR::Boolean skip_wchar (void);
-  ACE_CDR::Boolean skip_octet (void);
-  ACE_CDR::Boolean skip_short (void);
-  ACE_CDR::Boolean skip_ushort (void);
-  ACE_CDR::Boolean skip_long (void);
-  ACE_CDR::Boolean skip_ulong (void);
-  ACE_CDR::Boolean skip_longlong (void);
-  ACE_CDR::Boolean skip_ulonglong (void);
-  ACE_CDR::Boolean skip_float (void);
-  ACE_CDR::Boolean skip_double (void);
-  ACE_CDR::Boolean skip_longdouble (void);
-
-  ACE_CDR::Boolean skip_wstring (void);
-  ACE_CDR::Boolean skip_string (void);
+  CDR::Boolean skip_boolean (void);
+  CDR::Boolean skip_char (void);
+  CDR::Boolean skip_wchar (void);
+  CDR::Boolean skip_octet (void);
+  CDR::Boolean skip_short (void);
+  CDR::Boolean skip_ushort (void);
+  CDR::Boolean skip_long (void);
+  CDR::Boolean skip_ulong (void);
+  CDR::Boolean skip_longlong (void);
+  CDR::Boolean skip_ulonglong (void);
+  CDR::Boolean skip_float (void);
+  CDR::Boolean skip_double (void);
+  CDR::Boolean skip_longdouble (void);
+
+  CDR::Boolean skip_wstring (void);
+  CDR::Boolean skip_string (void);
   // The next field must be a string, this method skips it. It is
   // useful in parsing a TypeCode.
   // Return 0 on failure and 1 on success.
 
-  ACE_CDR::Boolean skip_bytes (size_t n);
+  CDR::Boolean skip_bytes (size_t n);
   // Skip <n> bytes in the CDR stream.
   // Return 0 on failure and 1 on success.
 
@@ -692,34 +681,12 @@ public:
   size_t length (void) const;
   // Return how many bytes are left in the stream.
 
-  int align_read_ptr (size_t alignment);
-  // Utility function to allow the user more flexibility.
-  // Skips up to the nearest <alignment>-byte boundary.
-  // Argument MUST be a power of 2.
-  // Returns 0 on success and -1 on failure.
-
-  int do_byte_swap (void) const;
-  // If non-zero then this stream is writing in non-native byte order,
-  // this is only meaningful if ACE_ENABLE_SWAP_ON_WRITE is defined.
-
-protected:
-  ACE_Message_Block start_;
-  // The start of the chain of message blocks, even though in the
-  // current version the chain always has length 1.
-
-  int do_byte_swap_;
-  // The CDR stream byte order does not match the one on the machine,
-  // swapping is needed while reading.
-
-  int good_bit_;
-  // set to 0 when an error occurs.
-
 private:
-  ACE_CDR::Boolean read_1 (ACE_CDR::Octet *x);
-  ACE_CDR::Boolean read_2 (ACE_CDR::UShort *x);
-  ACE_CDR::Boolean read_4 (ACE_CDR::ULong *x);
-  ACE_CDR::Boolean read_8 (ACE_CDR::ULongLong *x);
-  ACE_CDR::Boolean read_16 (ACE_CDR::LongDouble *x);
+  CDR::Boolean read_1 (CDR::Octet *x);
+  CDR::Boolean read_2 (CDR::UShort *x);
+  CDR::Boolean read_4 (CDR::ULong *x);
+  CDR::Boolean read_8 (CDR::ULongLong *x);
+  CDR::Boolean read_16 (CDR::LongDouble *x);
 
   // Several types can be read using the same routines, since TAO
   // tries to use native types with known size for each CORBA type.
@@ -728,10 +695,10 @@ private:
   // alignment requirements of CDR streams and implement the
   // operations using asignment.
 
-  ACE_CDR::Boolean read_array (void* x,
-                               size_t size,
-                               size_t align,
-                               ACE_CDR::ULong length);
+  CDR::Boolean read_array (void* x,
+                           size_t size,
+                           size_t align,
+                           CDR::ULong length);
   // Read an array of <length> elements, each of <size> bytes and the
   // start aligned at a multiple of <align>. The elements are assumed
   // to be packed with the right alignment restrictions.  It is mostly
@@ -759,6 +726,18 @@ private:
               char *&buf);
   // As above, but now the size and alignment requirements may be
   // different.
+
+protected:
+  ACE_Message_Block start_;
+  // The start of the chain of message blocks, even though in the
+  // current version the chain always has length 1.
+
+  int do_byte_swap_;
+  // The CDR stream byte order does not match the one on the machine,
+  // swapping is needed while reading.
+
+  int good_bit_;
+  // set to 0 when an error occurs.
 };
 
 #if defined(__ACE_INLINE__)
@@ -766,75 +745,75 @@ private:
 #else
 
 // CDR output operators for primitive types
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::Short x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::UShort x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::Long x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::ULong x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::LongLong x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::ULongLong x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR& os,
-                                               ACE_CDR::LongDouble x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::Float x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_CDR::Double x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               const ACE_CString &x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::Short x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::UShort x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::Long x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::ULong x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::LongLong x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::ULongLong x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR& os,
+                                           CDR::LongDouble x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::Float x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           CDR::Double x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           const ACE_CString &x);
 
 // CDR output operator from helper classes
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_OutputCDR::from_boolean x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_OutputCDR::from_char x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_OutputCDR::from_wchar x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_OutputCDR::from_octet x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               ACE_OutputCDR::from_string x);
-extern ACE_Export ACE_CDR::Boolean operator<< (ACE_OutputCDR &os,
-                                               const ACE_CDR::Char* x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           ACE_OutputCDR::from_boolean x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           ACE_OutputCDR::from_char x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           ACE_OutputCDR::from_wchar x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           ACE_OutputCDR::from_octet x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           ACE_OutputCDR::from_string x);
+extern ACE_Export CDR::Boolean operator<< (ACE_OutputCDR &os,
+                                           const CDR::Char* x);
 // CDR input operators for primitive types
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::Short &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::UShort &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::Long &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::ULong &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::LongLong &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::ULongLong &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::LongDouble &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::Float &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::Double &x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CString &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::Short &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::UShort &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::Long &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::ULong &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::LongLong &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::ULongLong &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::LongDouble &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::Float &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::Double &x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_CString &x);
 
 // CDR input operator from helper classes
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_InputCDR::to_boolean x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_InputCDR::to_char x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_InputCDR::to_wchar x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_InputCDR::to_octet x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_InputCDR::to_string x);
-extern ACE_Export ACE_CDR::Boolean operator>> (ACE_InputCDR &is,
-                                               ACE_CDR::Char*& x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_InputCDR::to_boolean x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_InputCDR::to_char x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_InputCDR::to_wchar x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_InputCDR::to_octet x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           ACE_InputCDR::to_string x);
+extern ACE_Export CDR::Boolean operator>> (ACE_InputCDR &is,
+                                           CDR::Char*& x);
 
 #endif /* __ACE_INLINE */
 
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index 529eb077061..2a11af1605b 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -4,14 +4,14 @@
 // ****************************************************************
 
 ACE_INLINE void
-ACE_CDR::swap_2 (const char *orig, char* target)
+CDR::swap_2 (const char *orig, char* target)
 {
   target[1] = *orig++;
   target[0] = *orig++;
 }
 
 ACE_INLINE void
-ACE_CDR::swap_4 (const char *orig, char* target)
+CDR::swap_4 (const char *orig, char* target)
 {
   target [3] = *orig++;
   target [2] = *orig++;
@@ -20,7 +20,7 @@ ACE_CDR::swap_4 (const char *orig, char* target)
 }
 
 ACE_INLINE void
-ACE_CDR::swap_8 (const char *orig, char* target)
+CDR::swap_8 (const char *orig, char* target)
 {
   target [7] = *orig++;
   target [6] = *orig++;
@@ -33,7 +33,7 @@ ACE_CDR::swap_8 (const char *orig, char* target)
 }
 
 ACE_INLINE void
-ACE_CDR::swap_16 (const char *orig, char* target)
+CDR::swap_16 (const char *orig, char* target)
 {
   target [15] = *orig++;
   target [14] = *orig++;
@@ -54,10 +54,10 @@ ACE_CDR::swap_16 (const char *orig, char* target)
 }
 
 ACE_INLINE void
-ACE_CDR::mb_align (ACE_Message_Block *mb)
+CDR::mb_align (ACE_Message_Block *mb)
 {
   char *start = ptr_align_binary (mb->base (),
-                                  ACE_CDR::MAX_ALIGNMENT);
+                                  CDR::MAX_ALIGNMENT);
   mb->rd_ptr (start);
   mb->wr_ptr (start);
 
@@ -75,57 +75,57 @@ ACE_CDR::mb_align (ACE_Message_Block *mb)
 
 // implementing the special types
 ACE_INLINE
-ACE_OutputCDR::from_boolean::from_boolean (ACE_CDR::Boolean b)
+ACE_OutputCDR::from_boolean::from_boolean (CDR::Boolean b)
   : val_ (b)
 {
 }
 
 ACE_INLINE
-ACE_InputCDR::to_boolean::to_boolean (ACE_CDR::Boolean &b)
+ACE_InputCDR::to_boolean::to_boolean (CDR::Boolean &b)
   : ref_ (b)
 {
 }
 
 ACE_INLINE
-ACE_OutputCDR::from_octet::from_octet (ACE_CDR::Octet o)
+ACE_OutputCDR::from_octet::from_octet (CDR::Octet o)
   : val_ (o)
 {
 }
 
 ACE_INLINE
-ACE_InputCDR::to_octet::to_octet (ACE_CDR::Octet &o)
+ACE_InputCDR::to_octet::to_octet (CDR::Octet &o)
   : ref_ (o)
 {
 }
 
 ACE_INLINE
-ACE_OutputCDR::from_char::from_char (ACE_CDR::Char c)
+ACE_OutputCDR::from_char::from_char (CDR::Char c)
   : val_ (c)
 {
 }
 
 ACE_INLINE
-ACE_InputCDR::to_char::to_char (ACE_CDR::Char &c)
+ACE_InputCDR::to_char::to_char (CDR::Char &c)
   : ref_ (c)
 {
 }
 
 ACE_INLINE
-ACE_OutputCDR::from_wchar::from_wchar (ACE_CDR::WChar wc)
+ACE_OutputCDR::from_wchar::from_wchar (CDR::WChar wc)
   : val_ (wc)
 {
 }
 
 ACE_INLINE
-ACE_InputCDR::to_wchar::to_wchar (ACE_CDR::WChar &wc)
+ACE_InputCDR::to_wchar::to_wchar (CDR::WChar &wc)
   : ref_ (wc)
 {
 }
 
 ACE_INLINE
-ACE_OutputCDR::from_string::from_string (ACE_CDR::Char *s,
-                                         ACE_CDR::ULong b,
-                                         ACE_CDR::Boolean nocopy)
+ACE_OutputCDR::from_string::from_string (CDR::Char *s,
+                                         CDR::ULong b,
+                                         CDR::Boolean nocopy)
   : val_ (s),
     bound_ (b),
     nocopy_ (nocopy)
@@ -133,8 +133,8 @@ ACE_OutputCDR::from_string::from_string (ACE_CDR::Char *s,
 }
 
 ACE_INLINE
-ACE_InputCDR::to_string::to_string (ACE_CDR::Char *&s,
-                                    ACE_CDR::ULong b)
+ACE_InputCDR::to_string::to_string (CDR::Char *&s,
+                                    CDR::ULong b)
   : val_ (s),
     bound_ (b)
 {
@@ -142,246 +142,226 @@ ACE_InputCDR::to_string::to_string (ACE_CDR::Char *&s,
 
 // ****************************************************************
 
-ACE_INLINE 
-ACE_OutputCDR::~ACE_OutputCDR (void)
-{
-  if (this->start_.cont () != 0)
-    {
-      ACE_Message_Block::release (this->start_.cont ());
-      this->start_.cont (0);
-    }
-  this->current_ = 0;
-}
-
-ACE_INLINE void
-ACE_OutputCDR::reset (void)
-{
-  this->current_ = &this->start_;
-
-  for (ACE_Message_Block *i = &this->start_; i; i = i->cont())
-    ACE_CDR::mb_align (i);
-}
-
 // Decode the CDR stream.
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_octet (ACE_CDR::Octet x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_octet (CDR::Octet x)
 {
-  return this->write_1 (ACE_reinterpret_cast (const ACE_CDR::Octet*,&x));
+  return this->write_1 (ACE_reinterpret_cast (const CDR::Octet*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_boolean (ACE_CDR::Boolean x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_boolean (CDR::Boolean x)
 {
   return this->write_octet (x ? 1 : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_char (ACE_CDR::Char x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_char (CDR::Char x)
 {
-  return this->write_1 (ACE_reinterpret_cast (const ACE_CDR::Octet*, &x));
+  return this->write_1 (ACE_reinterpret_cast (const CDR::Octet*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_wchar (ACE_CDR::WChar x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_wchar (CDR::WChar x)
 {
-  return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort*,&x));
+  return this->write_2 (ACE_reinterpret_cast (const CDR::UShort*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_short (ACE_CDR::Short x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_short (CDR::Short x)
 {
-  return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort*, &x));
+  return this->write_2 (ACE_reinterpret_cast (const CDR::UShort*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ushort (ACE_CDR::UShort x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ushort (CDR::UShort x)
 {
-  return this->write_2 (ACE_reinterpret_cast (const ACE_CDR::UShort*, &x));
+  return this->write_2 (ACE_reinterpret_cast (const CDR::UShort*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_long (ACE_CDR::Long x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_long (CDR::Long x)
 {
-  return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x));
+  return this->write_4 (ACE_reinterpret_cast (const CDR::ULong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ulong (ACE_CDR::ULong x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ulong (CDR::ULong x)
 {
-  return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x));
+  return this->write_4 (ACE_reinterpret_cast (const CDR::ULong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_longlong (const ACE_CDR::LongLong &x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_longlong (const CDR::LongLong &x)
 {
-  return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*, &x));
+  return this->write_8 (ACE_reinterpret_cast (const CDR::ULongLong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ulonglong (const ACE_CDR::ULongLong &x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ulonglong (const CDR::ULongLong &x)
 {
-  return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*,&x));
+  return this->write_8 (ACE_reinterpret_cast (const CDR::ULongLong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_float (ACE_CDR::Float x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_float (CDR::Float x)
 {
-  return this->write_4 (ACE_reinterpret_cast (const ACE_CDR::ULong*, &x));
+  return this->write_4 (ACE_reinterpret_cast (const CDR::ULong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_double (const ACE_CDR::Double &x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_double (const CDR::Double &x)
 {
-  return this->write_8 (ACE_reinterpret_cast (const ACE_CDR::ULongLong*, &x));
+  return this->write_8 (ACE_reinterpret_cast (const CDR::ULongLong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_longdouble (const ACE_CDR::LongDouble &x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_longdouble (const CDR::LongDouble &x)
 {
-  return this->write_16 (ACE_reinterpret_cast (const ACE_CDR::LongDouble*,&x));
+  return this->write_16 (ACE_reinterpret_cast (const CDR::LongDouble*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_string (const ACE_CDR::Char *x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_string (const CDR::Char *x)
 {
   if (x != 0)
     return this->write_string (ACE_OS::strlen(x), x);
   return this->write_string (0, 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::write_string (const ACE_CString &x)
 {
   return this->write_string (x.length(), x.c_str());
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_wstring (const ACE_CDR::WChar *x)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_wstring (const CDR::WChar *x)
 {
   if (x != 0)
     return this->write_wstring (ACE_OS::wslen (x), x);
   return this->write_wstring (0, 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_char_array (const ACE_CDR::Char *x,
-                                 ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_char_array (const CDR::Char *x,
+                                 CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::OCTET_SIZE,
-                            ACE_CDR::OCTET_ALIGN,
+                            CDR::OCTET_SIZE,
+                            CDR::OCTET_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_wchar_array (const ACE_CDR::WChar* x,
-                                  ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_wchar_array (const CDR::WChar* x,
+                                  CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::SHORT_SIZE,
-                            ACE_CDR::SHORT_ALIGN,
+                            CDR::SHORT_SIZE,
+                            CDR::SHORT_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_octet_array (const ACE_CDR::Octet* x,
-                                  ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_octet_array (const CDR::Octet* x,
+                                  CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::OCTET_SIZE,
-                            ACE_CDR::OCTET_ALIGN,
+                            CDR::OCTET_SIZE,
+                            CDR::OCTET_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_short_array (const ACE_CDR::Short *x,
-                                  ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_short_array (const CDR::Short *x,
+                                  CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::SHORT_SIZE,
-                            ACE_CDR::SHORT_ALIGN,
+                            CDR::SHORT_SIZE,
+                            CDR::SHORT_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ushort_array (const ACE_CDR::UShort *x,
-                                   ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ushort_array (const CDR::UShort *x,
+                                   CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::SHORT_SIZE,
-                            ACE_CDR::SHORT_ALIGN,
+                            CDR::SHORT_SIZE,
+                            CDR::SHORT_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_long_array (const ACE_CDR::Long *x,
-                                 ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_long_array (const CDR::Long *x,
+                                 CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONG_SIZE,
-                            ACE_CDR::LONG_ALIGN,
+                            CDR::LONG_SIZE,
+                            CDR::LONG_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ulong_array (const ACE_CDR::ULong *x,
-                                  ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ulong_array (const CDR::ULong *x,
+                                  CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONG_SIZE,
-                            ACE_CDR::LONG_ALIGN,
+                            CDR::LONG_SIZE,
+                            CDR::LONG_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_longlong_array (const ACE_CDR::LongLong *x,
-                                     ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_longlong_array (const CDR::LongLong *x,
+                                     CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONGLONG_SIZE,
-                            ACE_CDR::LONGLONG_ALIGN,
+                            CDR::LONGLONG_SIZE,
+                            CDR::LONGLONG_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_ulonglong_array (const ACE_CDR::ULongLong *x,
-                                      ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_ulonglong_array (const CDR::ULongLong *x,
+                                      CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONGLONG_SIZE,
-                            ACE_CDR::LONGLONG_ALIGN,
+                            CDR::LONGLONG_SIZE,
+                            CDR::LONGLONG_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_float_array (const ACE_CDR::Float *x,
-                                  ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_float_array (const CDR::Float *x,
+                                  CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONG_SIZE,
-                            ACE_CDR::LONG_ALIGN,
+                            CDR::LONG_SIZE,
+                            CDR::LONG_ALIGN,
                             length);
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_double_array (const ACE_CDR::Double *x,
-                                   ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_double_array (const CDR::Double *x,
+                                   CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONGLONG_SIZE,
-                            ACE_CDR::LONGLONG_ALIGN,
+                            CDR::LONGLONG_SIZE,
+                            CDR::LONGLONG_ALIGN,
                             length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_OutputCDR::write_longdouble_array (const ACE_CDR::LongDouble* x,
-                                       ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_OutputCDR::write_longdouble_array (const CDR::LongDouble* x,
+                                       CDR::ULong length)
 {
   return this->write_array (x,
-                            ACE_CDR::LONGDOUBLE_SIZE,
-                            ACE_CDR::LONGDOUBLE_ALIGN,
+                            CDR::LONGDOUBLE_SIZE,
+                            CDR::LONGDOUBLE_ALIGN,
                             length);
 }
 
@@ -396,7 +376,7 @@ ACE_OutputCDR::adjust (size_t size,
                        size_t align,
                        char*& buf)
 {
-  buf = ptr_align_binary (this->current_->wr_ptr (),
+  buf = ptr_align_binary (this->current_->wr_ptr(),
                           align);
   char *end = buf + size;
 
@@ -427,18 +407,6 @@ ACE_OutputCDR::end (void) const
   return this->current_->cont ();
 }
 
-ACE_INLINE const ACE_Message_Block*
-ACE_OutputCDR::current (void) const
-{
-  return this->current_;
-}
-
-ACE_INLINE size_t
-ACE_OutputCDR::total_length (void) const
-{
-  return ACE_CDR::total_length (this->begin (), this->end ());
-}
-
 ACE_INLINE const char*
 ACE_OutputCDR::buffer (void) const
 {
@@ -457,325 +425,305 @@ ACE_OutputCDR::do_byte_swap (void) const
   return this->do_byte_swap_;
 }
 
-ACE_INLINE int
-ACE_OutputCDR::align_write_ptr (size_t alignment)
-{
-  char *buf = ptr_align_binary (this->current_->wr_ptr (),
-                                alignment);
-
-  if (buf <= this->current_->end ())
-    {
-      this->current_->wr_ptr (buf);
-      return 0;
-    }
-
-  return this->grow_and_adjust (0, alignment, buf);
-}
-
 // ****************************************************************
 
-ACE_INLINE 
-ACE_InputCDR::~ACE_InputCDR (void)
-{
-}
-
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_octet (ACE_CDR::Octet& x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_octet (CDR::Octet& x)
 {
   return this->read_1 (&x);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_boolean (ACE_CDR::Boolean& x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_boolean (CDR::Boolean& x)
 {
-  ACE_CDR::Octet tmp;
+  CDR::Octet tmp;
   this->read_octet (tmp);
   x = tmp ? 1 : 0;
   return this->good_bit_;
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_char (ACE_CDR::Char &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_char (CDR::Char &x)
 {
-  return this->read_1 (ACE_reinterpret_cast (ACE_CDR::Octet*, &x));
+  return this->read_1 (ACE_reinterpret_cast (CDR::Octet*, &x));
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_wchar (ACE_CDR::WChar& x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_wchar (CDR::WChar& x)
 {
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_short (ACE_CDR::Short &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_short (CDR::Short &x)
 {
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*, &x));
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ushort (ACE_CDR::UShort &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ushort (CDR::UShort &x)
 {
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*, &x));
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*, &x));
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_long (ACE_CDR::Long &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_long (CDR::Long &x)
 {
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x));
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*, &x));
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ulong (ACE_CDR::ULong &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ulong (CDR::ULong &x)
 {
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x));
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*, &x));
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_longlong (ACE_CDR::LongLong &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_longlong (CDR::LongLong &x)
 {
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*, &x));
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ulonglong (ACE_CDR::ULongLong &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ulonglong (CDR::ULongLong &x)
 {
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x));
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_float (ACE_CDR::Float &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_float (CDR::Float &x)
 {
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*, &x));
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*, &x));
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_double (ACE_CDR::Double &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_double (CDR::Double &x)
 {
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*, &x));
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*, &x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_longdouble (ACE_CDR::LongDouble &x)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_longdouble (CDR::LongDouble &x)
 {
-  return this->read_16 (ACE_reinterpret_cast (ACE_CDR::LongDouble*,&x));
+  return this->read_16 (ACE_reinterpret_cast (CDR::LongDouble*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_char_array (ACE_CDR::Char* x,
-                               ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_char_array (CDR::Char* x,
+                               CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::OCTET_SIZE,
-                           ACE_CDR::OCTET_ALIGN,
+                           CDR::OCTET_SIZE,
+                           CDR::OCTET_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_wchar_array (ACE_CDR::WChar* x,
-                                ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_wchar_array (CDR::WChar* x,
+                                CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::SHORT_SIZE,
-                           ACE_CDR::SHORT_ALIGN,
+                           CDR::SHORT_SIZE,
+                           CDR::SHORT_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_octet_array (ACE_CDR::Octet* x,
-                                ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_octet_array (CDR::Octet* x,
+                                CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::OCTET_SIZE,
-                           ACE_CDR::OCTET_ALIGN,
+                           CDR::OCTET_SIZE,
+                           CDR::OCTET_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_short_array (ACE_CDR::Short *x,
-                                ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_short_array (CDR::Short *x,
+                                CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::SHORT_SIZE,
-                           ACE_CDR::SHORT_ALIGN,
+                           CDR::SHORT_SIZE,
+                           CDR::SHORT_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ushort_array (ACE_CDR::UShort *x,
-                                 ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ushort_array (CDR::UShort *x,
+                                 CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::SHORT_SIZE,
-                           ACE_CDR::SHORT_ALIGN,
+                           CDR::SHORT_SIZE,
+                           CDR::SHORT_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_long_array (ACE_CDR::Long *x,
-                               ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_long_array (CDR::Long *x,
+                               CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONG_SIZE,
-                           ACE_CDR::LONG_ALIGN,
+                           CDR::LONG_SIZE,
+                           CDR::LONG_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ulong_array (ACE_CDR::ULong *x,
-                                ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ulong_array (CDR::ULong *x,
+                                CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONG_SIZE,
-                           ACE_CDR::LONG_ALIGN,
+                           CDR::LONG_SIZE,
+                           CDR::LONG_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_longlong_array (ACE_CDR::LongLong *x,
-                                   ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_longlong_array (CDR::LongLong *x,
+                                   CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONGLONG_SIZE,
-                           ACE_CDR::LONGLONG_ALIGN,
+                           CDR::LONGLONG_SIZE,
+                           CDR::LONGLONG_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_ulonglong_array (ACE_CDR::ULongLong *x,
-                                    ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_ulonglong_array (CDR::ULongLong *x,
+                                    CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONGLONG_SIZE,
-                           ACE_CDR::LONGLONG_ALIGN,
+                           CDR::LONGLONG_SIZE,
+                           CDR::LONGLONG_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_float_array (ACE_CDR::Float *x,
-                                ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_float_array (CDR::Float *x,
+                                CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONG_SIZE,
-                           ACE_CDR::LONG_ALIGN,
+                           CDR::LONG_SIZE,
+                           CDR::LONG_ALIGN,
                            length);
 }
 
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_double_array (ACE_CDR::Double *x,
-                                 ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_double_array (CDR::Double *x,
+                                 CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONGLONG_SIZE,
-                           ACE_CDR::LONGLONG_ALIGN,
+                           CDR::LONGLONG_SIZE,
+                           CDR::LONGLONG_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::read_longdouble_array (ACE_CDR::LongDouble* x,
-                                     ACE_CDR::ULong length)
+ACE_INLINE CDR::Boolean
+ACE_InputCDR::read_longdouble_array (CDR::LongDouble* x,
+                                     CDR::ULong length)
 {
   return this->read_array (x,
-                           ACE_CDR::LONGDOUBLE_SIZE,
-                           ACE_CDR::LONGDOUBLE_ALIGN,
+                           CDR::LONGDOUBLE_SIZE,
+                           CDR::LONGDOUBLE_ALIGN,
                            length);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_char (void)
 {
-  ACE_CDR::Char x;
-  return this->read_1 (ACE_reinterpret_cast (ACE_CDR::Octet*,&x));
+  CDR::Char x;
+  return this->read_1 (ACE_reinterpret_cast (CDR::Octet*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_wchar (void)
 {
-  ACE_CDR::WChar x;
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
+  CDR::WChar x;
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_octet (void)
 {
-  ACE_CDR::Octet x;
+  CDR::Octet x;
   return this->read_1 (&x);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_boolean (void)
 {
-  ACE_CDR::Octet tmp;
+  CDR::Octet tmp;
   this->read_octet (tmp);
   return this->good_bit_;
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_short (void)
 {
-  ACE_CDR::Short x;
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
+  CDR::Short x;
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_ushort (void)
 {
-  ACE_CDR::UShort x;
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
+  CDR::UShort x;
+  return this->read_2 (ACE_reinterpret_cast (CDR::UShort*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_long (void)
 {
-  ACE_CDR::Long x;
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x));
+  CDR::Long x;
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_ulong (void)
 {
-  ACE_CDR::ULong x;
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x));
+  CDR::ULong x;
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_longlong (void)
 {
-  ACE_CDR::LongLong x;
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x));
+  CDR::LongLong x;
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_ulonglong (void)
 {
-  ACE_CDR::ULongLong x;
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x));
+  CDR::ULongLong x;
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_float (void)
 {
   float x;
-  return this->read_4 (ACE_reinterpret_cast (ACE_CDR::ULong*,&x));
+  return this->read_4 (ACE_reinterpret_cast (CDR::ULong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_double (void)
 {
   double x;
-  return this->read_8 (ACE_reinterpret_cast (ACE_CDR::ULongLong*,&x));
+  return this->read_8 (ACE_reinterpret_cast (CDR::ULongLong*,&x));
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_InputCDR::skip_longdouble (void)
 {
-  ACE_CDR::LongDouble x;
-  return this->read_16 (ACE_reinterpret_cast (ACE_CDR::LongDouble*,&x));
+  CDR::LongDouble x;
+  return this->read_16 (ACE_reinterpret_cast (CDR::LongDouble*,&x));
 }
 
 ACE_INLINE char*
@@ -815,7 +763,7 @@ ACE_InputCDR::adjust (size_t size,
 
 ACE_INLINE int
 ACE_InputCDR::adjust (size_t size,
-                      char*& buf)
+		      char*& buf)
 {
   return this->adjust (size, size, buf);
 }
@@ -840,77 +788,77 @@ ACE_InputCDR::good_bit (void) const
 
 // ****************************************************************
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::Short x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::Short x)
 {
   os.write_short (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::UShort x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::UShort x)
 {
   os.write_ushort (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::Long x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::Long x)
 {
   os.write_long (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::ULong x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::ULong x)
 {
   os.write_ulong (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::LongLong x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::LongLong x)
 {
   os.write_longlong (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::ULongLong x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::ULongLong x)
 {
   os.write_ulonglong (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::LongDouble x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::LongDouble x)
 {
   os.write_longdouble (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::Float x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::Float x)
 {
   os.write_float (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, ACE_CDR::Double x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, CDR::Double x)
 {
   os.write_double (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator<< (ACE_OutputCDR &os, const ACE_CDR::Char *x)
+ACE_INLINE CDR::Boolean
+operator<< (ACE_OutputCDR &os, const CDR::Char *x)
 {
   os.write_string (x);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, const ACE_CString &x)
 {
   os.write_string (x);
@@ -918,35 +866,35 @@ operator<< (ACE_OutputCDR &os, const ACE_CString &x)
 }
 
 // The following use the helper classes
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_boolean x)
 {
   os.write_boolean (x.val_);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_char x)
 {
   os.write_char (x.val_);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wchar x)
 {
   os.write_wchar (x.val_);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x)
 {
   os.write_octet (x.val_);
   return os.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x)
 {
   os.write_string (x.bound_, x.val_);
@@ -955,77 +903,77 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x)
 
 // ****************************************************************
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::Short &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::Short &x)
 {
   is.read_short (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::UShort &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::UShort &x)
 {
   is.read_ushort (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>>(ACE_InputCDR &is, ACE_CDR::Long &x)
+ACE_INLINE CDR::Boolean
+operator>>(ACE_InputCDR &is, CDR::Long &x)
 {
   is.read_long (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::ULong &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::ULong &x)
 {
   is.read_ulong (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR& is, ACE_CDR::LongLong &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR& is, CDR::LongLong &x)
 {
   is.read_longlong (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR& is, ACE_CDR::ULongLong &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR& is, CDR::ULongLong &x)
 {
   is.read_ulonglong (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR& is, ACE_CDR::LongDouble &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR& is, CDR::LongDouble &x)
 {
   is.read_longdouble (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::Float &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::Float &x)
 {
   is.read_float (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::Double &x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::Double &x)
 {
   is.read_double (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
-operator>> (ACE_InputCDR &is, ACE_CDR::Char *&x)
+ACE_INLINE CDR::Boolean
+operator>> (ACE_InputCDR &is, CDR::Char *&x)
 {
   is.read_string (x);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_CString &x)
 {
   is.read_string (x);
@@ -1033,35 +981,35 @@ operator>> (ACE_InputCDR &is, ACE_CString &x)
 }
 
 // The following use the helper classes
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_InputCDR::to_boolean x)
 {
   is.read_boolean (x.ref_);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_InputCDR::to_char x)
 {
   is.read_char (x.ref_);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_InputCDR::to_wchar x)
 {
   is.read_wchar (x.ref_);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_InputCDR::to_octet x)
 {
   is.read_octet (x.ref_);
   return is.good_bit ();
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 operator>> (ACE_InputCDR &is, ACE_InputCDR::to_string x)
 {
   is.read_string (x.val_);
@@ -1075,135 +1023,113 @@ operator>> (ACE_InputCDR &is, ACE_InputCDR::to_string x)
 // methods of the ACE_InputCDR class
 // ***************************************************************************
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_boolean (ACE_InputCDR &stream)
 {
-  ACE_CDR::Boolean x;
+  CDR::Boolean x;
   return (stream.read_boolean (x) ? this->write_boolean (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_char (ACE_InputCDR &stream)
 {
-  ACE_CDR::Char x;
+  CDR::Char x;
   return (stream.read_char (x) ? this->write_char (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_wchar (ACE_InputCDR &stream)
 {
-  ACE_CDR::WChar x;
+  CDR::WChar x;
   return (stream.read_wchar (x) ? this->write_wchar (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_octet (ACE_InputCDR &stream)
 {
-  ACE_CDR::Octet x;
+  CDR::Octet x;
   return (stream.read_octet (x) ? this->write_octet (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_short (ACE_InputCDR &stream)
 {
-  ACE_CDR::Short x;
+  CDR::Short x;
   return (stream.read_short (x) ? this->write_short (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_ushort (ACE_InputCDR &stream)
 {
-  ACE_CDR::UShort x;
+  CDR::UShort x;
   return (stream.read_ushort (x) ? this->write_ushort (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_long (ACE_InputCDR &stream)
 {
-  ACE_CDR::Long x;
+  CDR::Long x;
   return (stream.read_long (x) ? this->write_long (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_ulong (ACE_InputCDR &stream)
 {
-  ACE_CDR::ULong x;
+  CDR::ULong x;
   return (stream.read_ulong (x) ? this->write_ulong (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_longlong (ACE_InputCDR &stream)
 {
-  ACE_CDR::LongLong x;
+  CDR::LongLong x;
   return (stream.read_longlong (x) ? this->write_longlong (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_ulonglong (ACE_InputCDR &stream)
 {
-  ACE_CDR::ULongLong x;
+  CDR::ULongLong x;
   return (stream.read_ulonglong (x) ? this->write_ulonglong (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_float (ACE_InputCDR &stream)
 {
-  ACE_CDR::Float x;
+  CDR::Float x;
   return (stream.read_float (x) ? this->write_float (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_double (ACE_InputCDR &stream)
 {
-  ACE_CDR::Double x;
+  CDR::Double x;
   return (stream.read_double (x) ? this->write_double (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_longdouble (ACE_InputCDR &stream)
 {
-  ACE_CDR::LongDouble x;
+  CDR::LongDouble x;
   return (stream.read_longdouble (x) ? this->write_longdouble (x) : 0);
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_string (ACE_InputCDR &stream)
 {
-  ACE_CDR::Char *x;
-  ACE_CDR::Boolean flag =
+  CDR::Char *x;
+  CDR::Boolean flag =
     (stream.read_string (x) ? this->write_string (x) : 0);
   delete [] x;
   return flag;
 }
 
-ACE_INLINE ACE_CDR::Boolean
+ACE_INLINE CDR::Boolean
 ACE_OutputCDR::append_wstring (ACE_InputCDR &stream)
 {
-  ACE_CDR::WChar *x;
-  ACE_CDR::Boolean flag =
+  CDR::WChar *x;
+  CDR::Boolean flag =
     (stream.read_wstring (x) ? this->write_wstring (x) : 0);
   delete [] x;
   return flag;
 }
-
-ACE_INLINE int
-ACE_InputCDR::do_byte_swap (void) const
-{
-  return this->do_byte_swap_;
-}
-
-ACE_INLINE int
-ACE_InputCDR::align_read_ptr (size_t alignment)
-{
-  char *buf = ptr_align_binary (this->rd_ptr (),
-                                alignment);
-
-  if (buf <= this->end ())
-    {
-      this->start_.rd_ptr (buf);
-      return 0;
-    }
-
-  this->good_bit_ = 0;
-  return -1;
-}
diff --git a/ace/CLASSIX/Makefile b/ace/CLASSIX/Makefile
index a207ce3da0e..ffe7419a5f8 100644
--- a/ace/CLASSIX/Makefile
+++ b/ace/CLASSIX/Makefile
@@ -25,9 +25,13 @@ FILES    = \
         CLASSIX_CO_Connector  	\
         CLASSIX_CLD_Connector
 
+
+TEMPLATE_FILES =
+
 DEFS    = $(addsuffix .h,$(FILES)) Svc_Conf_Tokens.h
 DEFS    += $(addsuffix .i,$(FILES))
 LSRC    = $(addsuffix .cpp,$(FILES))
+LSRC2   = $(addsuffix .cpp,$(TEMPLATE_FILES))
 
 BUILD   = $(VLIB)
 
@@ -36,6 +40,14 @@ BUILD   = $(VLIB)
 #----------------------------------------------------------------------------
 
 include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+
+ifneq ($(GHS),)
+  ifeq ($(CPU),86)
+    FILES += gethrtime
+    LSRC += gethrtime.cpp
+  endif # 86
+endif # GHS
+
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index c540e5af1f6..f595a28b657 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -30,8 +30,6 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/OS.h"
-
 // All these macros assume the CORBA::Environment variable used to pass
 // in/out the exception is call ACE_TRY_ENV.  Below is the name we use
 // in TAO (The ACE ORB.)  Most other ORB's have their own naming
@@ -66,9 +64,6 @@
 # endif /* ACE_CORBA_HAS_EXCEPTIONS */
 #endif /* ACE_HAS_EXCEPTIONS */
 
-#define ACE_DECLARE_NEW_CORBA_ENV \
-  CORBA::Environment ACE_TRY_ENV
-
 #if defined (ACE_CORBA_HAS_EXCEPTIONS)
 // -----------------------------------------------------------------
 # define ACE_ADOPT_CORBA_ENV(ENV) ACE_UNUSED_ARG(ENV)
@@ -79,9 +74,6 @@
 // Used then the function requires a return value.
 # define ACE_CHECK_RETURN(RETV)
 
-// ACE_THROW_INT should not be used by the user.
-# define ACE_THROW_INT(EXCEPTION) throw EXCEPTION
-
 // Throwing an exception is easy. These two macros should _NOT_ be
 // used within try blocks.
 # define ACE_THROW(EXCEPTION) throw EXCEPTION
@@ -167,9 +159,6 @@
     if (ACE_TRY_ENV . exception () != 0) \
       return RETV
 
-// ACE_THROW_INT should not be used by the user.
-# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION)
-
 // Throwing exceptions will inevitably cause an return from the current
 // function.  These two macros should _NOT_ be used within try blocks.
 // Use ACE_TRY_THROW or ACE_TRY_THROW_EX instead.
@@ -311,87 +300,4 @@
 
 #endif /* ! ACE_CORBA_HAS_EXCEPTIONS */
 
-// ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS.
-#if defined(ACE_NEW_THROWS_EXCEPTIONS)
-
-#   define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
-     do { try { POINTER = new CONSTRUCTOR; } \
-       catch (ACE_bad_alloc) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
-     } while (0)
-// The following ACE_NEW_THROW* macros are to be depricated soon.
-// -------------------- Start Depricated --------------------
-#   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
-     do { try { POINTER = new CONSTRUCTOR; } \
-       catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
-     } while (0)
-#   define ACE_NEW_THROW_RETURN(POINTER,CONSTRUCTOR,EXCEPTION,RET_VAL) \
-     do { try { POINTER = new CONSTRUCTOR; } \
-        catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW_RETURN (EXCEPTION,RET_VAL); } \
-     } while (0)
-#   define ACE_NEW_TRY_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
-  do { try { POINTER = new CONSTRUCTOR; } \
-       catch (ACE_bad_alloc) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
-     } while (0)
-// -------------------- End Depricated --------------------
-
-#else
-
-#   define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
-     do { POINTER = new CONSTRUCTOR; \
-       if (POINTER == 0) { errno = ENOMEM; ACE_THROW_INT (EXCEPTION); } \
-     } while (0)
-// The following ACE_NEW_THROW* macros are to be depricated soon.
-// -------------------- Start Depricated --------------------
-#   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
-     do { POINTER = new CONSTRUCTOR; \
-       if (POINTER == 0) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
-     } while (0)
-#   define ACE_NEW_THROW_RETURN(POINTER,CONSTRUCTOR,EXCEPTION,RET_VAL) \
-     do { POINTER = new CONSTRUCTOR; \
-        if (POINTER == 0)\
-        { errno = ENOMEM; TAO_THROW_RETURN (EXCEPTION,RET_VAL); } \
-     } while (0)
-#   define ACE_NEW_TRY_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
-     do { POINTER = new CONSTRUCTOR; \
-       if (POINTER == 0) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
-     } while (0)
-// -------------------- End Depricated --------------------
-
-#endif /* ACE_NEW_THROWS_EXCEPTIONS */
-
-# define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
-  ACE_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
-
-# define ACE_READ_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
-  ACE_Read_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
-
-# define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \
-  ACE_Write_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) ACE_THROW_INT (EXCEPTION);
-
-// The following ACE_GUARD_THROW* macros are to be depricated soon.
-// -------------------- Start Depricated --------------------
-# define ACE_GUARD_THROW(MUTEX,OBJ,LOCK,EXCEPTION) \
-  ACE_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) TAO_THROW (EXCEPTION);
-# define ACE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,EXCEPTION,RETURN) \
-  ACE_Guard<MUTEX> OBJ (LOCK); \
-    if (OBJ.locked () == 0) TAO_THROW_RETURN (EXCEPTION, RETURN);
-// -------------------- End Deprication --------------------
-
-// ============================================================
-
-// Print out a TAO exception.  This is not CORBA compliant.
-# define ACE_PRINT_TAO_EXCEPTION(EX,INFO) \
-  EX.print_exception (INFO)
-
-// Print out a CORBA exception.  There is not portable way to
-// dump a CORBA exception.  If you are using other ORB implementation,
-// redefine the macro to get what you want.
-# if !defined ACE_PRINT_EXCEPTION
-#   define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO)
-# endif /* ACE_PRINT_EXCEPTION */
-
 #endif /* ACE_CORBA_MACROS_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp b/ace/Cache_Hash_T.cpp
index cc406850df6..b1c330d72eb 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.cpp
+++ b/ace/Cache_Hash_T.cpp
@@ -1,21 +1,23 @@
 // $Id$
 
-#ifndef JAWS_CACHE_HASH_T_CPP
-#define JAWS_CACHE_HASH_T_CPP
+#ifndef ACE_CACHE_HASH_T_CPP
+#define ACE_CACHE_HASH_T_CPP
 
-#include "JAWS/Cache_Hash_T.h"
-#include "JAWS/Hash_Bucket_T.h"
+#include "ace_Cache_Hash_T.h"
+#include "ace_Hash_Bucket_T.h"
 
-template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> unsigned long
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::hash (const EXT_ID &ext_id) const
+ACE_RCSID(ace, Cache_Hash_T, "$Id$")
+
+template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> u_long
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::hash (const EXT_ID &ext_id) const
 {
   return HASH_FUNC (ext_id) % this->size_;
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (unsigned long number) const
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (u_long number) const
 {
-  unsigned long d = 3;
+  u_long d = 3;
 
   if (number <= 2) return (number == 2);
 
@@ -31,7 +33,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::isprime (unsigned long number) const
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx)
 {
   if (this->hashtable_[hash_idx] == 0)
     {
@@ -46,7 +48,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::new_cachebucket (size_t hash_idx)
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::JAWS_Cache_Hash (ACE_Allocator *alloc,
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::ACE_Cache_Hash (ACE_Allocator *alloc,
                                                           size_t size)
   : allocator_ (alloc),
     hashtable_ (0)
@@ -61,35 +63,31 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::JAWS_Cache_Hash (ACE_Allocator *alloc
 
   size_t memsize = this->size_ * sizeof (CACHE_BUCKET_MANAGER *);
 
+  // @@ James, can you please use the right ACE_* allocation macro here?
   this->hashtable_
     = (CACHE_BUCKET_MANAGER **) this->allocator_->malloc (memsize);
 
   if (this->hashtable_)
-    {
-      for (size_t i = 0; i < this->size_; i++)
-        this->hashtable_[i] = 0;
-    }
+    for (size_t i = 0; i < this->size_; i++)
+      this->hashtable_[i] = 0;
   else
-    {
-      this->size_ = 0;
-      // should indicate something is wrong to the user.
-    }
+    // should indicate something is wrong to the user.
+    this->size_ = 0;
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~ACE_Cache_Hash (void)
 {
   if (this->hashtable_)
     {
       for (size_t i = 0; i < this->size_; i++)
-        {
-          if (this->hashtable_[i])
-            {
-              ACE_DES_FREE (this->hashtable_[i], this->allocator_->free,
-                            CACHE_BUCKET_MANAGER);
-              this->hashtable_[i] = 0;
-            }
-        }
+        if (this->hashtable_[i])
+          {
+            ACE_DES_FREE (this->hashtable_[i], this->allocator_->free,
+                          CACHE_BUCKET_MANAGER);
+            this->hashtable_[i] = 0;
+          }
+
       this->allocator_->free (this->hashtable_);
       this->hashtable_ = 0;
     }
@@ -98,9 +96,9 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void)
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const
 {
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     return -1;
@@ -109,10 +107,10 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id) const
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id,
-                                                JAWS_Cache_Object *&int_id) const
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id,
+                                                ACE_Cache_Object *&int_id) const
 {
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     return -1;
@@ -121,11 +119,11 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::find (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id,
-                                                JAWS_Cache_Object *const &int_id)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id,
+                                                ACE_Cache_Object *const &int_id)
 {
   int result;
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     {
@@ -143,11 +141,11 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id,
-                                                   JAWS_Cache_Object *&int_id)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id,
+                                                   ACE_Cache_Object *&int_id)
 {
   int result;
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     {
@@ -165,13 +163,13 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id,
-                                                  JAWS_Cache_Object *const &int_id,
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id,
+                                                  ACE_Cache_Object *const &int_id,
                                                   EXT_ID &old_ext_id,
-                                                  JAWS_Cache_Object *&old_int_id)
+                                                  ACE_Cache_Object *&old_int_id)
 {
   int result;
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     {
@@ -192,9 +190,9 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id,
 
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id)
 {
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     return -1;
@@ -203,10 +201,10 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id)
 }
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id,
-                                                  JAWS_Cache_Object *&int_id)
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id,
+                                                  ACE_Cache_Object *&int_id)
 {
-  unsigned long hash_idx = this->hash (ext_id);
+  u_long hash_idx = this->hash (ext_id);
 
   if (this->hashtable_[hash_idx] == 0)
     return -1;
@@ -216,12 +214,9 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::unbind (const EXT_ID &ext_id,
 
 
 template <class EXT_ID, class HASH_FUNC, class EQ_FUNC> size_t
-JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const
+ACE_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::size (void) const
 {
   return this->size_;
 }
 
-
-
-
-#endif /* JAWS_CACHEHASH_T_CPP */
+#endif /* UTL_CACHEHASH_T_CPP */
diff --git a/ace/Cache_Hash_T.h b/ace/Cache_Hash_T.h
new file mode 100644
index 00000000000..0fe5ac0f8ab
--- /dev/null
+++ b/ace/Cache_Hash_T.h
@@ -0,0 +1,74 @@
+/* -*- c++ -*- */
+// $Id$
+
+// @@ James, please add a standard "header" here like you see in all
+// the other ACE headerfiles.
+
+#ifndef ACE_CACHE_HASH_T_H
+#define ACE_CACHE_HASH_T_H
+
+#include "ace/OS.h"
+
+// @@ James, I think that this #include is wrong...
+#include "ace_Cache_Object.h"
+
+// Forward declaration
+template <class EXT_ID, class INT_ID, class EQ_FUNC>
+class ACE_Hash_Bucket_Manager;
+
+// @@ James, can you please update ALL of these classes and methods to
+// use the standard ACE commenting style, i.e., add = TITLE and =
+// DESCRIPTION headers and comments for each method.
+
+template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
+class ACE_Cache_Hash
+{
+public:
+
+  typedef ACE_Hash_Bucket_Manager<EXT_ID, ACE_Cache_Object *, EQ_FUNC>
+          CACHE_BUCKET_MANAGER;
+
+  ACE_Cache_Hash (ACE_Allocator *alloc = 0, size_t size = 521);
+  // 521 == smallest number > 512 that is prime.  Why is a prime
+  // number important?  I am trying to maximize scattering when using
+  // mod on the hashed value.  This might be bogus though.
+
+  virtual ~ACE_Cache_Hash (void);
+
+  int find (const EXT_ID &ext_id) const;
+  int find (const EXT_ID &ext_id, ACE_Cache_Object *&int_id) const;
+  int bind (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id);
+  int trybind (const EXT_ID &ext_id, ACE_Cache_Object *&int_id);
+  int rebind (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id,
+	      EXT_ID &old_ext_id, ACE_Cache_Object *&old_int_id);
+
+  int unbind (const EXT_ID &ext_id);
+  int unbind (const EXT_ID &ext_id, ACE_Cache_Object *&int_id);
+
+  size_t size (void) const;
+
+protected:
+
+  virtual u_long hash (const EXT_ID &ext_id) const;
+  int isprime (u_long number) const;
+  int new_cachebucket (size_t idx);
+
+private:
+
+  ACE_Allocator *allocator_;
+  size_t size_;
+
+  ACE_SYNCH_MUTEX lock_;
+  CACHE_BUCKET_MANAGER **hashtable_;
+
+};
+
+// @@ James, please also make sure that you add the 
+// #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+// stuff as well... (see other template files to see how this works).
+
+#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+#include "ace_Cache_Hash_T.cpp"
+#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+#endif /* ACE_CACHE_HASH_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp b/ace/Cache_Heap_T.cpp
index 36575ef2741..bc1f3f4389d 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.cpp
+++ b/ace/Cache_Heap_T.cpp
@@ -1,13 +1,15 @@
 // $Id$
 
-#ifndef JAWS_CACHE_HEAP_T_CPP
-#define JAWS_CACHE_HEAP_T_CPP
+#ifndef ACE_CACHE_HEAP_T_CPP
+#define ACE_CACHE_HEAP_T_CPP
 
-#include "JAWS/Cache_Heap_T.h"
-#include "JAWS/Cache_Manager_T.h"
+#include "ace_Cache_Heap_T.h"
+#include "ace_Cache_Manager_T.h"
+
+ACE_RCSID(ace, Cache_Heap_T, "$Id$")
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_Heap (ACE_Allocator *alloc,
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::ACE_Cache_Heap (ACE_Allocator *alloc,
                                                        size_t maxsize)
   : allocator_ (alloc),
     maxsize_ (maxsize),
@@ -19,33 +21,30 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_Heap (ACE_Allocator *alloc,
   size_t memsize
     = this->maxsize_ * sizeof (Cache_Heap_Item *);
 
+  // @@ James, can you please use the right ACE_* macro here?
   this->heap_ = (Cache_Heap_Item **) this->allocator_->malloc (memsize);
+
   if (this->heap_)
-    {
-      for (size_t i = 0; i < this->maxsize_; i++)
-        this->heap_[i] = 0;
-    }
+    for (size_t i = 0; i < this->maxsize_; i++)
+      this->heap_[i] = 0;
   else
-    {
-      this->maxsize_ = 0;
-      // should indicate something
-    }
+    // should indicate something.
+    this->maxsize_ = 0;
+
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~ACE_Cache_Heap (void)
 {
   if (this->heap_ != 0)
     {
       for (size_t i = 0; i < this->maxsize_; i++)
-        {
-          if (this->heap_[i])
-            {
-              ACE_DES_FREE (this->heap_[i], this->allocator_->free,
-                            Cache_Heap_Item);
-              this->heap_[i] = 0;
-            }
-        }
+        if (this->heap_[i])
+          {
+            ACE_DES_FREE (this->heap_[i], this->allocator_->free,
+                          Cache_Heap_Item);
+            this->heap_[i] = 0;
+          }
       this->allocator_->free (this->heap_);
       this->heap_ = 0;
     }
@@ -54,31 +53,31 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const
 {
   return (this->size_ == 0);
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const
 {
-  return (this->size_ == this->maxsize_);
+  return this->size_ == this->maxsize_;
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::size (void) const
 {
   return this->size_;
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const
 {
   return this->maxsize_;
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm,
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm,
                                                 size_t new_maxsize)
 {
   int result = -1;
@@ -86,6 +85,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm,
   size_t memsize
     = new_maxsize * sizeof (Cache_Heap_Item *);
 
+  // @@ JAmes, can you please use the right ACE_*_RETURN macro here?
   Cache_Heap_Item **new_heap
     = (Cache_Heap_Item **) this->allocator_->malloc (memsize);
   if (new_heap)
@@ -99,6 +99,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm,
         else
           new_heap[i] = 0;
 
+      // @@ James, why is this volatile?!
       Cache_Heap_Item ** volatile temp = this->heap_;
       this->heap_ = new_heap;
       this->maxsize_ = new_maxsize;
@@ -110,7 +111,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *cm,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item)
 {
   /* ASSERT: this->size_ < this->maxsize_ */
 
@@ -131,8 +132,8 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_Heap_Item *item)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
-                                               JAWS_Cache_Object *const &int_id)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
+                                               ACE_Cache_Object *const &int_id)
 {
   if (this->is_full ())
     return -1;
@@ -141,7 +142,9 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
   ACE_NEW_MALLOC_RETURN (item,
                          (Cache_Heap_Item *)
                          this->allocator_->malloc (sizeof (Cache_Heap_Item)),
-                         Cache_Heap_Item (ext_id, int_id), -1);
+                         Cache_Heap_Item (ext_id,
+                                          int_id),
+                         -1);
 
   this->insert_i (item);
 
@@ -149,7 +152,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
 {
   /* ASSERT: this->size_ > 0 */
   this->size_--;
@@ -181,7 +184,7 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos)
 {
   Cache_Heap_Item *item = this->heap_[pos];
 
@@ -198,43 +201,42 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove_i (size_t pos)
     }
 
   this->heap_[0] = item;
-
   this->remove_i ();
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
-                                               JAWS_Cache_Object *&int_id)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
+                                               ACE_Cache_Object *&int_id)
 {
   if (this->is_empty ())
     return -1;
 
   Cache_Heap_Item *item = this->heap_[0];
-  item->int_id_->heap_item (0);
 
   this->remove_i ();
 
   ext_id = item->ext_id_;
   int_id = item->int_id_;
 
-  ACE_DES_FREE (item, this->allocator_->free, Cache_Heap_Item);
+  ACE_DES_FREE (item,
+                this->allocator_->free, Cache_Heap_Item);
   item = 0;
   return 0;
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
 {
   if (item == 0)
     return 0;
 
+  // James, please use the right ACE_*_cast() macro here.
   Cache_Heap_Item *real_item = (Cache_Heap_Item *) item;
 
   // Make sure the item is where it thinks it is.
   if (this->heap_[real_item->heap_idx_] != real_item)
     return -1;
 
-  real_item->int_id_->heap_item (0);
   this->remove_i (real_item->heap_idx_);
 
   ACE_DES_FREE (real_item, this->allocator_->free, Cache_Heap_Item);
@@ -244,11 +246,12 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
+ACE_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
 {
   if (item == 0)
     return 0;
 
+  // James, please use the right ACE_*_cast() macro here.
   Cache_Heap_Item *real_item = (Cache_Heap_Item *) item;
 
   // Make sure the item is where it thinks it is.
@@ -261,10 +264,9 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
   return 0;
 }
 
-
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::
-JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id)
+ACE_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::
+ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id)
   : ext_id_ (ext_id),
     int_id_ (int_id),
     heap_idx_ (0)
@@ -273,10 +275,9 @@ JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id)
 }
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int
-JAWS_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
+ACE_Cache_Heap_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
 {
   return this->int_id_->priority ();
 }
 
-
-#endif /* JAWS_CACHE_HEAP_T_CPP */
+#endif /* ACE_CACHE_HEAP_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h b/ace/Cache_Heap_T.h
index 16fbe890fe6..6c36460b802 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Heap_T.h
+++ b/ace/Cache_Heap_T.h
@@ -1,35 +1,44 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_CACHE_HEAP_T_H
-#define JAWS_CACHE_HEAP_T_H
+// @@ James, please add a standard "header" here like you see in all
+// the other ACE headerfiles.
+
+#ifndef ACE_CACHE_HEAP_T_H
+#define ACE_CACHE_HEAP_T_H
 
 #include "ace/Malloc.h"
-#include "JAWS/Cache_Object.h"
+// @@ James, this #include is wrong...
+#include "ace_Cache_Object.h"
 
 // Forward declarations
 template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Manager;
+class ACE_Cache_Manager;
 
 template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Heap_Item;
+class ACE_Cache_Heap_Item;
 
+// @@ James, can you please update ALL of these classes and methods to
+// use the standard ACE commenting style, i.e., add = TITLE and =
+// DESCRIPTION headers and comments for each method.
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_Heap
+class ACE_Cache_Heap
 // Roll my own heap here.  Eventually, a heap should be its own
 // standalone data structure.
 {
 public:
+  typedef ACE_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> 
+          Cache_Manager;
+  typedef ACE_Cache_Heap_Item<EXT_ID, FACT, H_FN, E_FN> 
+          Cache_Heap_Item;   
 
-  typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager;
-  typedef JAWS_Cache_Heap_Item<EXT_ID, FACT, H_FN, E_FN> Cache_Heap_Item;
-
-  JAWS_Cache_Heap (ACE_Allocator *alloc = 0, size_t maxsize = 8192);
+  ACE_Cache_Heap (ACE_Allocator *alloc = 0,
+                  size_t maxsize = 8192);
   // maxsize is the total number of objects the in memory cache is
   // willing to manage
 
-  ~JAWS_Cache_Heap (void);
+  ~ACE_Cache_Heap (void);
 
   int is_empty (void) const;
   int is_full (void) const;
@@ -41,10 +50,10 @@ public:
   // attempt to grow (or shrink) the heap.  Return 0 on success, -1 on
   // error.
 
-  int insert (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
+  int insert (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id);
   // attempt to insert int_id into heap.
 
-  int remove (EXT_ID &ext_id, JAWS_Cache_Object *&int_id);
+  int remove (EXT_ID &ext_id, ACE_Cache_Object *&int_id);
   // attempt to remove the top element of heap.
 
   int remove (void *item);
@@ -72,32 +81,31 @@ private:
   size_t size_;
 
   Cache_Heap_Item **heap_;
-
 };
 
 
 template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_Heap_Item
+class ACE_Cache_Heap_Item
 {
-
-  friend class JAWS_Cache_Heap<EXT_ID, FACT, H_FN, E_FN>;
+  friend class ACE_Cache_Heap<EXT_ID, FACT, H_FN, E_FN>;
 
 public:
-
-  JAWS_Cache_Heap_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  unsigned int priority (void);
+  ACE_Cache_Heap_Item (const EXT_ID &ext_id, ACE_Cache_Object *const &int_id);
+  u_int priority (void);
 
 private:
-
   EXT_ID ext_id_;
-  JAWS_Cache_Object *int_id_;
+  ACE_Cache_Object *int_id_;
 
   size_t heap_idx_;
-
 };
 
+// @@ James, please also make sure that you add the 
+// #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+// stuff as well... (see other template files to see how this works).
+
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Cache_Heap_T.cpp"
+#include "ace_Cache_Heap_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_CACHE_HEAP_T_H */
+#endif /* ACE_CACHE_HEAP_T_H */
diff --git a/ace/Cache_Manager.cpp b/ace/Cache_Manager.cpp
new file mode 100644
index 00000000000..9cbffead4aa
--- /dev/null
+++ b/ace/Cache_Manager.cpp
@@ -0,0 +1,124 @@
+// $Id$
+
+#include "ace/OS.h"
+#include "ace/ACE.h"
+#include "ace/Synch.h"
+
+#include "ace_Cache_Manager.h"
+
+ACE_RCSID(ace, Cache_Manager, "$Id$")
+
+ACE_String_Hash_Functor::ACE_String_Hash_Functor (const char *s)
+  : i_ (0)
+{
+  this->i_ = ACE::hash_pjw (s);
+}
+
+ACE_String_Hash_Functor::operator int (void) const
+{
+  return this->i_;
+}
+
+ACE_String_Equal_Functor::ACE_String_Equal_Functor (const char *s1,
+                                                    const char *s2)
+  : i_ (0)
+{
+  this->i_ = ACE_OS::strcmp (s1, s2);
+}
+
+ACE_String_Equal_Functor::operator int (void) const
+{
+  return this->i_ == 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Hash_Bucket_Item<char const *, ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_DLCStack<char const *, ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_DLCStack_Iterator<char const *,
+                                                 ACE_Cache_Object *>;
+template class ACE_Hash_Bucket_Manager<const char *,
+                                       ACE_Cache_Object *,
+                                       ACE_String_Equal_Functor>;
+template class ACE_Cache_Hash<const char *,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_Heap_Item<char const *,
+                                   ACE_Referenced_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>;
+template class ACE_Cache_Heap<const char *,
+                              ACE_Referenced_Cache_Object_Factory,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_Manager<const char *,
+                                 ACE_Referenced_Cache_Object_Factory,
+                                 ACE_String_Hash_Functor,
+                                 ACE_String_Equal_Functor>;
+template class ACE_Cache_Heap_Item<char const *,
+                                   ACE_Counted_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>;
+template class ACE_Cache_Heap<const char *,
+                              ACE_Counted_Cache_Object_Factory,
+                              ACE_String_Hash_Functor,
+                              ACE_String_Equal_Functor>;
+template class ACE_Cache_Manager<const char *,
+                                 ACE_Counted_Cache_Object_Factory,
+                                 ACE_String_Hash_Functor,
+                                 ACE_String_Equal_Functor>;
+template class ACE_Singleton<ACE_Referenced_Cache_Object_Factory,
+                             ACE_SYNCH_MUTEX>;
+template class ACE_Singleton<ACE_Counted_Cache_Object_Factory,
+                             ACE_SYNCH_MUTEX>;
+template class ACE_Singleton<ACE_String_Referenced_Cache_Manager,
+                             ACE_SYNCH_MUTEX>;
+template class ACE_Singleton<ACE_String_Counted_Cache_Manager,
+                             ACE_SYNCH_MUTEX>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Hash_Bucket_Item<char const *, ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_DLCStack<char const *, ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_DLCStack_Iterator<char const *,
+                                                      ACE_Cache_Object *>
+#pragma instantiate ACE_Hash_Bucket_Manager<const char *,
+                                            ACE_Cache_Object *,
+                                            ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Hash<const char *,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap_Item<char const *,
+                                        ACE_Referenced_Cache_Object_Factory,
+                                        ACE_String_Hash_Functor,
+                                        ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap<const char *,
+                                   ACE_Referenced_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Manager<const char *,
+                                      ACE_Referenced_Cache_Object_Factory,
+                                      ACE_String_Hash_Functor,
+                                      ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap_Item<char const *,
+                                        ACE_Counted_Cache_Object_Factory,
+                                        ACE_String_Hash_Functor,
+                                        ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Heap<const char *,
+                                   ACE_Counted_Cache_Object_Factory,
+                                   ACE_String_Hash_Functor,
+                                   ACE_String_Equal_Functor>
+#pragma instantiate ACE_Cache_Manager<const char *,
+                                      ACE_Counted_Cache_Object_Factory,
+                                      ACE_String_Hash_Functor,
+                                      ACE_String_Equal_Functor>
+#pragma instantiate ACE_Singleton<ACE_Referenced_Cache_Object_Factory,
+                                  ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Singleton<ACE_Counted_Cache_Object_Factory,
+                                  ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Singleton<ACE_String_Referenced_Cache_Manager,
+                                  ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Singleton<ACE_String_Counted_Cache_Manager,
+                                  ACE_SYNCH_MUTEX>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/ace/Cache_Manager.h b/ace/Cache_Manager.h
new file mode 100644
index 00000000000..c80edb806b6
--- /dev/null
+++ b/ace/Cache_Manager.h
@@ -0,0 +1,55 @@
+/* -*- c++ -*- */
+// $Id$
+
+// @@ James, please add a standard "header" here like you see in all
+// the other ACE headerfiles.
+
+#ifndef ACE_CACHE_MANAGER_H
+#define ACE_CACHE_MANAGER_H
+
+#include "ace/OS.h"
+#include "ace/ACE.h"
+#include "ace/Synch.h"
+
+// @@ James, this #include is wrong...
+#include "ace_Cache_Manager_T.h"
+
+// @@ James, can you please update ALL of these classes and methods to
+// use the standard ACE commenting style, i.e., add = TITLE and =
+// DESCRIPTION headers and comments for each method.
+
+class ACE_String_Hash_Functor
+{
+public:
+  ACE_String_Hash_Functor (const char *s);
+  operator int (void) const;
+
+private:
+  int i_;
+};
+
+// @@ James, can you put these functors into the same place that the
+// ones used by Irfan in the Hash_Map_Manager_Ex file are used?!
+class ACE_String_Equal_Functor
+{
+public:
+  ACE_String_Equal_Functor (const char *s1, const char *s2);
+  operator int (void) const;
+
+private:
+  int i_;
+};
+
+typedef ACE_Cache_Manager<const char *,
+                          ACE_Referenced_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_String_Referenced_Cache_Manager;
+
+typedef ACE_Cache_Manager<const char *,
+                          ACE_Counted_Cache_Object_Factory,
+                          ACE_String_Hash_Functor,
+                          ACE_String_Equal_Functor>
+        ACE_String_Counted_Cache_Manager;
+
+#endif /* ACE_CACHE_MANAGER_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp b/ace/Cache_Manager_T.cpp
index 27f274429bf..ffabdfa75f5 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.cpp
+++ b/ace/Cache_Manager_T.cpp
@@ -1,19 +1,18 @@
 // $Id$
 
-#ifndef JAWS_CACHE_MANAGER_T_CPP
-#define JAWS_CACHE_MANAGER_T_CPP
+#ifndef ACE_CACHE_MANAGER_T_CPP
+#define ACE_CACHE_MANAGER_T_CPP
 
-#include "JAWS/Cache_Manager_T.h"
-#include "JAWS/Cache_Hash_T.h"
+#include "ace_Cache_Manager_T.h"
+#include "ace_Cache_Hash_T.h"
+#include "ace_Cache_Heap_T.h"
 
-class Cache_Manager;
-
-#include <iostream.h>
+ACE_RCSID(ace, Cache_Manager_T, "$Id$")
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::JAWS_Cache_Manager (ACE_Allocator *alloc,
-                     JAWS_Cache_Object_Factory *cof,
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::ACE_Cache_Manager (ACE_Allocator *alloc,
+                     ACE_Cache_Object_Factory *cof,
                      size_t hashsize,
                      size_t maxsize,
                      size_t maxobjsize,
@@ -40,6 +39,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   if (this->lowwater_ > this->highwater_)
     this->lowwater_ = this->highwater_ / 2;
 
+  // @@ James, please don't use "magic numbers" like 1024.  Make sure
+  // you use the same symbolic constants as the other places...
   if (this->maxobjsize_ > (this->highwater_ - this->lowwater_) * 1024)
     this->maxobjsize_ = (this->highwater_ - this->lowwater_) * (1024/2);
 
@@ -56,6 +57,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
                   (Cache_Hash *)
                   this->allocator_->malloc (sizeof (Cache_Hash)),
                   Cache_Hash (alloc, hashsize));
+  // @@ James, please check the ACE_NEW_MALLOC macro -- it should do
+  // this check and bailout if this->hash_ == 0...
 
   if (this->hash_ == 0)
     {
@@ -68,6 +71,9 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
                   this->allocator_->malloc (sizeof (Cache_Heap)),
                   Cache_Heap (alloc, maxsize));
 
+  // @@ James, please check the ACE_NEW_MALLOC macro -- it should do
+  // this check and bailout if this->hash_ == 0...
+
   if (this->heap_ == 0)
     {
       this->maxsize_ = 0;
@@ -78,11 +84,10 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
     }
 }
 
-
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 ::open (ACE_Allocator *alloc,
-        JAWS_Cache_Object_Factory *cof,
+        ACE_Cache_Object_Factory *cof,
         size_t hashsize,
         size_t maxsize,
         size_t maxobjsize,
@@ -122,6 +127,7 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
   if (this->factory_ == 0)
     this->factory_ = Object_Factory::instance ();
 
+  // @@ James, please use the ACE_NEW_MALLOC_RETURN macro here.
   this->hash_ = (Cache_Hash *) this->allocator_->malloc (sizeof (Cache_Hash));
   if (this->hash_ == 0)
     {
@@ -130,9 +136,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
       return -1;
     }
+
+  // @@ James, please use the ACE_NEW_*_RETURN macro here.
   new (this->hash_) Cache_Hash (alloc, hashsize);
 
+  // @@ James, please use the ACE_NEW_MALLOC_RETURN macro here.
   this->heap_ = (Cache_Heap *) this->allocator_->malloc (sizeof (Cache_Heap));
+
   if (this->heap_ == 0)
     {
       errno = ENOMEM;
@@ -144,19 +154,21 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
       return -1;
     }
+
+  // @@ James, please use the ACE_NEW_*_RETURN macro here.
   new (this->heap_) Cache_Heap (alloc, maxsize);
 
   return 0;
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Manager (void)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::~ACE_Cache_Manager (void)
 {
   this->close ();
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
 {
   while (this->waterlevel_ > 0)
     this->FLUSH_i ();
@@ -177,8 +189,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::GET_i (const KEY &key, JAWS_Cache_Object *&object)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::GET_i (const KEY &key, ACE_Cache_Object *&object)
 {
   int result = this->hash_->find (key, object);
 
@@ -191,63 +203,32 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::PUT_i (const KEY &key, const void *data, size_t size, JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::PUT_i (const KEY &key, const void *data, size_t size, ACE_Cache_Object *&obj)
 {
   int result = 0;
 
-  if (data == 0)
-    {
-      this->FLUSH_i (key);
-      obj = 0;
-      return 0;
-    }
+  this->FLUSH_i (key);
 
   result = this->MAKE (data, size, obj);
   if (result == -1)
-    {
-      if (obj)
-        this->DROP_i (obj);
-      else
-        cerr << "MAKE failed.  Bummer!" << endl;
-      return -1;
-    }
-
-  obj->internal (new KEY (key));
-
-  KEY old_key;
-  JAWS_Cache_Object *old_obj;
+    return -1;
 
-  result = this->hash_->rebind (key, obj, old_key, old_obj);
+  result = this->hash_->bind (key, obj);
   if (result == -1)
     {
-      cerr << "*** hash bind error: " << key << endl;
-      obj->release ();
       this->DROP_i (obj);
       return -1;
     }
-  else if (result == 1)
-    {
-      this->heap_->remove (old_obj->heap_item ());
-      this->waterlevel_ -= old_obj->size ();
-      old_obj->release ();
-      this->DROP_i (old_obj);
-    }
 
   result = this->heap_->insert (key, obj);
   if (result == -1)
     {
-      cerr << "*** heap insertion error: " << key << endl;
       this->hash_->unbind (key);
-      obj->release ();
       this->DROP_i (obj);
       return -1;
     }
 
-#ifdef ENTERA_VERBOSE_TRACE
-  cerr << "*** bound: " << key << endl;
-#endif
-
   this->waterlevel_ += size;
 
   // Acquire this one for the putter.
@@ -257,71 +238,50 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 ::FLUSH_i (const KEY &key)
 {
-  JAWS_Cache_Object *temp_object;
+  ACE_Cache_Object *temp_object;
 
-#ifdef ENTERA_VERBOSE_TRACE
-  cerr << "*** flush key unbinding: " << key << endl;
-#endif
   int result = this->hash_->unbind (key, temp_object);
   if (result == 0)
     {
       this->waterlevel_ -= temp_object->size ();
-      if (this->heap_->remove (temp_object->heap_item ()) == -1)
-        cerr << "*** flush key heap remove failed: " << endl;
-      temp_object->release ();
+      this->heap_->remove (temp_object->heap_item ());
       this->DROP_i (temp_object);
     }
-  else
-    cerr << "*** flush key hash unbind failed: " << key << endl;
 
   return result;
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 ::FLUSH_i (void)
 {
   KEY temp_key;
-  JAWS_Cache_Object *temp_object;
+  ACE_Cache_Object *temp_object;
 
   int result = this->heap_->remove (temp_key, temp_object);
   if (result == 0)
     {
-#ifdef ENTERA_VERBOSE_TRACE
-      cerr << "*** flush unbinding: " << temp_key << endl;
-#endif
       result = this->hash_->unbind (temp_key);
-      if (result == -1)
-        cerr << "*** flush hash unbind failed: " << temp_key << endl;
-      result = 0;
       this->waterlevel_ -= temp_object->size ();
-      temp_object->release ();
       this->DROP_i (temp_object);
     }
-  else
-    {
-      cerr << "*** flush heap remove failed" << endl;
-    }
 
   return result;
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::DROP_i (JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::DROP_i (ACE_Cache_Object *const &obj)
 {
-  int result = 0;
+  int result = obj->release ();
 
-  if (obj->count () == 0)
+  if (result == 0)
     {
-      KEY *key = (KEY *) obj->internal ();
-      this->factory_->destroy (obj);
-      delete key;
-      obj = 0;
-      result = 1;
+      if (obj->count () == 0)
+        this->factory_->destroy (obj);
     }
   else
     result = this->heap_->adjust (obj->heap_item ());
@@ -330,8 +290,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::GET (const KEY &key, JAWS_Cache_Object *&object)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::GET (const KEY &key, ACE_Cache_Object *&object)
 {
   ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
 
@@ -339,8 +299,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::PUT (const KEY &key, const void *data, size_t size, JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::PUT (const KEY &key, const void *data, size_t size, ACE_Cache_Object *&obj)
 {
   ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
 
@@ -348,64 +308,28 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::MAKE (const void *data, size_t size, JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::MAKE (const void *data, size_t size, ACE_Cache_Object *&obj)
 {
   // verify object is within cacheable range
-  if (size/1024 > this->maxobjsize_)
-    {
-#if 0
-      // What we do is cache it anyway, but remove it as soon as the
-      // requester returns it.
-      obj = this->factory_->create (data, size);
-      return 0;
-#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;
-
-#endif /* 0 */
-    }
-
-  if (size/1024 < this->minobjsize_)
+  // @@ James, please don't use these magic numbers...
+  if (size/1024 > this->maxobjsize_ || size/1024 < this->minobjsize_)
+    return -1;
 
-    {
-      // Don't bother to cache this.
-      cerr << "*** " << size << " is too small to cache" << endl;
-      return -1;
-    }
+  // make sure heap has enough room
+  if (this->heap_->is_full () && this->FLUSH_i () == -1)
+    return -1;
 
   // make sure we have sufficient memory
   if (this->waterlevel_ + size > this->highwater_ * (1024 * 1024))
-    {
-      do
-        {
-          if (this->FLUSH_i () == -1)
-            {
-              cerr << "*** cache flooded, flush error" << endl;
-              return -1;
-            }
-        }
-      while (this->waterlevel_ > this->lowwater_ * (1024 * 1024));
-    }
-
-  // make sure heap has enough room
-  if (this->heap_->is_full ())
-    {
-      cerr << "*** heap full, flushing" << endl;
+    do
       if (this->FLUSH_i () == -1)
-        {
-          cerr << "*** heap full, flush error" << endl;
-          return -1;
-        }
-    }
+        return -1;
+    while (this->waterlevel_ > this->lowwater_ * (1024 * 1024));
 
   obj = this->factory_->create (data, size);
   if (this->TAKE (obj) == -1)
     {
-      cerr << "*** take error" << endl;
       this->factory_->destroy (obj);
       obj = 0;
       return -1;
@@ -415,8 +339,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::TAKE (JAWS_Cache_Object *const &obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::TAKE (ACE_Cache_Object *const &obj)
 {
   if (obj == 0)
     return -1;
@@ -425,71 +349,21 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
-::DROP (JAWS_Cache_Object *&obj)
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+::DROP (ACE_Cache_Object *const &obj)
 {
   if (obj == 0)
     return -1;
 
-#if 0
-  if (obj->size ()/1024 > this->maxobjsize_)
-    {
-      ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
-
-      int result = obj->release ();
-      if (result == 0)
-        {
-          if (obj->count () == 0)
-            {
-              KEY *key = (KEY *) obj->internal ();
-#ifdef ENTERA_VERBOSE_TRACE
-              cerr << "*** drop large unbinding: " << key << endl;
-#endif
-              result = this->hash_->unbind (*key);
-              if (result == 0)
-                {
-                  if (this->heap_->remove (obj->heap_item ()) == -1)
-                    cerr << "*** drop large heap remove failed: " << endl;
-                  this->factory_->destroy (obj);
-                  delete key;
-                  obj = 0;
-                  result = 1;
-                }
-              else
-                cerr << "*** drop large hash unbind failed: " << key << endl;
-            }
-        }
-      return result;
-    }
-#endif /* 0 */
-
   {
     ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
 
-    int result = obj->release ();
-
-    if (result == 0)
-      {
-        if (obj->count () == 0)
-          {
-            KEY *key = (KEY *) obj->internal ();
-            this->factory_->destroy (obj);
-            delete key;
-            obj = 0;
-            result = 1;
-          }
-        else
-          {
-            result = this->DROP_i (obj);
-          }
-      }
-
-    return result;
+    return this->DROP_i (obj);
   }
 }
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int
-JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
+ACE_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 ::FLUSH (void)
 {
   ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_);
@@ -499,8 +373,8 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
 
 
 template <class KEY, class DATA, class CACHE_MANAGER>
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
-::JAWS_Cache_Proxy (const KEY &key, Cache_Manager *manager)
+ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
+::ACE_Cache_Proxy (const KEY &key, Cache_Manager *manager)
   : object_ (0),
     manager_ (manager)
 {
@@ -513,8 +387,8 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
 }
 
 template <class KEY, class DATA, class CACHE_MANAGER>
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
-::JAWS_Cache_Proxy (const KEY &key, DATA *data, size_t size,
+ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
+::ACE_Cache_Proxy (const KEY &key, DATA *data, size_t size,
                    Cache_Manager *manager)
   : object_ (0),
     manager_ (manager)
@@ -528,31 +402,22 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>
 }
 
 template <class KEY, class DATA, class CACHE_MANAGER>
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~JAWS_Cache_Proxy (void)
+ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::~ACE_Cache_Proxy (void)
 {
-  DATA *data = this->data ();
   this->manager_->DROP (this->object_);
-  if (this->object_ == 0)
-    this->close (data);
+  this->object_ = 0;
 }
 
 template <class KEY, class DATA, class CACHE_MANAGER> DATA *
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const
+ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::data (void) const
 {
-  return this->object_ ? (DATA *) this->object_->data () : 0;
+  return (DATA *) this->object_->data ();
 }
 
 template <class KEY, class DATA, class CACHE_MANAGER>
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const
+ACE_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::operator DATA * (void) const
 {
   return this->data ();
 }
 
-template <class KEY, class DATA, class CACHE_MANAGER> int
-JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER>::close (DATA *)
-{
-  return 0;
-}
-
-
-#endif /* JAWS_CACHE_MANAGER_T_CPP */
+#endif /* ACE_CACHE_MANAGER_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h b/ace/Cache_Manager_T.h
index f3c14de3671..a35ccc70c9c 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager_T.h
+++ b/ace/Cache_Manager_T.h
@@ -1,47 +1,56 @@
 /* -*- c++ -*- */
-// Hey Emacs!  This is a C++ file!
 // $Id$
 
-#ifndef JAWS_CACHE_MANAGER_T_H
-#define JAWS_CACHE_MANAGER_T_H
+// @@ James, please add a standard "header" here like you see in all
+// the other ACE headerfiles.
+
+#ifndef ACE_CACHE_MANAGER_T_H
+#define ACE_CACHE_MANAGER_T_H
 
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
 
-#include "JAWS/Cache_Object.h"
+// @@ James, I think that this #include is wrong...
+#include "ace_Cache_Object.h"
 
-template <class KEY, class HASH_FUNC, class EQ_FUNC> class JAWS_Cache_Hash;
-template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Heap;
+// @@ James, can you please update ALL of these classes and methods to
+// use the standard ACE commenting style, i.e., add = TITLE and =
+// DESCRIPTION headers and comments for each method.
+
+template <class KEY, class HASH_FUNC, class EQ_FUNC> class ACE_Cache_Hash;
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_List;
+class ACE_Cache_Heap;
 
 template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Manager
+class ACE_Cache_Manager
 {
-
-  friend class JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC>;
-  friend class JAWS_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC>;
-  friend class JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC>;
+  friend class ACE_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC>;
+  friend class ACE_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC>;
 
 public:
-
-  typedef ACE_Singleton<FACTORY, ACE_SYNCH_MUTEX> Object_Factory;
-  typedef JAWS_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> Cache_Hash;
-  typedef JAWS_Cache_List<KEY, FACTORY, HASH_FUNC, EQ_FUNC> Cache_Heap;
-
-  JAWS_Cache_Manager (ACE_Allocator *alloc = 0,
-                     JAWS_Cache_Object_Factory *cof = 0,
-
-                     size_t hashsize = 2048,   // number of hash buckets
-                     size_t maxsize = 65535,   // max number of in memory
+  typedef ACE_Singleton<FACTORY, ACE_SYNCH_MUTEX> 
+          Object_Factory;
+  typedef ACE_Cache_Hash<KEY, HASH_FUNC, EQ_FUNC> 
+          Cache_Hash;
+  typedef ACE_Cache_Heap<KEY, FACTORY, HASH_FUNC, EQ_FUNC> 
+          Cache_Heap;
+
+  ACE_Cache_Manager (ACE_Allocator *alloc = 0,
+                     ACE_Cache_Object_Factory *cof = 0,
+
+                     // @@ James, can you please remove the use of
+                     // explicit constants here and use macros instead
+                     // that can be redefined, a la the ones in OS.h.
+
+                     size_t hashsize = 1024,   // number of hash buckets
+                     size_t maxsize = 4096,    // max number of in memory
                                                // objects
 
-                     size_t maxobjsize = 256,  // max cached object size in kB
+                     size_t maxobjsize = 512,  // max cached object size in kB
                      size_t minobjsize = 0,    // min cached object size in kB
 
-                     size_t highwater = 100,   // max size of cache in MB
-                     size_t lowwater = 50,     // min size of cache when
+                     size_t highwater = 50,    // max size of cache in MB
+                     size_t lowwater = 40,     // min size of cache when
                                                // expiring after highwater
                                                // has been reached
 
@@ -54,13 +63,13 @@ public:
                      );
 
   int open (ACE_Allocator *alloc = 0,
-            JAWS_Cache_Object_Factory *cof = 0,
+            ACE_Cache_Object_Factory *cof = 0,
 
             size_t hashsize = 1024,   // number of hash buckets
             size_t maxsize = 4096,    // max number of in memory
                                       // objects
 
-            size_t maxobjsize = 5120, // max cached object size in kB
+            size_t maxobjsize = 512,  // max cached object size in kB
             size_t minobjsize = 0,    // min cached object size in kB
 
             size_t highwater = 50,    // max size of cache in MB
@@ -76,28 +85,28 @@ public:
                                       // counts
             );
 
-  ~JAWS_Cache_Manager (void);
+  ~ACE_Cache_Manager (void);
 
   int close (void);
 
   // Search Methods
 
-  int GET (const KEY &key, JAWS_Cache_Object *&cobj);
+  int GET (const KEY &key, ACE_Cache_Object *&cobj);
   // Retrieve the object associated with key from cache.  Return 0 on
   // success, -1 on failure.
 
   int PUT (const KEY &key, const void *data, size_t size,
-           JAWS_Cache_Object *&obj);
+           ACE_Cache_Object *&obj);
   // Inserts or replaces object associated with key into cache.
   // Return 0 on success, -1 on failure.
 
-  int MAKE (const void *data, size_t size, JAWS_Cache_Object *&cobj);
+  int MAKE (const void *data, size_t size, ACE_Cache_Object *&cobj);
   // Create a cached object, increment reference count.
 
-  int TAKE (JAWS_Cache_Object *const &cobj);
+  int TAKE (ACE_Cache_Object *const &cobj);
   // Increment reference count.
 
-  int DROP (JAWS_Cache_Object *&cobj);
+  int DROP (ACE_Cache_Object *const &cobj);
   // Decrement reference count on cached object, perhaps delete.
   // Returns 0 if only decremented, 1 if deleted, -1 if error.
 
@@ -106,12 +115,12 @@ public:
 
 protected:
 
-  int GET_i (const KEY &key, JAWS_Cache_Object *&object);
+  int GET_i (const KEY &key, ACE_Cache_Object *&object);
   // Retrieve the object associated with key from cache.  Return 0 on
   // success, -1 on failure.
 
   int PUT_i (const KEY &key, const void *data, size_t size,
-             JAWS_Cache_Object *&object);
+             ACE_Cache_Object *&object);
   // Inserts or replaces object associated with key into cache.
   // Return 0 on success, -1 on failure.
 
@@ -121,13 +130,13 @@ protected:
   int FLUSH_i (const KEY &key);
   // Removes object associated with key from cache.
 
-  int DROP_i (JAWS_Cache_Object *&cobj);
+  int DROP_i (ACE_Cache_Object *const &cobj);
   // Decrement reference count on cached object, perhaps delete.
 
 private:
 
   ACE_Allocator *allocator_;
-  JAWS_Cache_Object_Factory *factory_;
+  ACE_Cache_Object_Factory *factory_;
 
   size_t hashsize_;
   size_t maxsize_;
@@ -143,43 +152,42 @@ private:
   Cache_Heap *heap_;
 
   ACE_SYNCH_RW_MUTEX lock_;
-
 };
 
-
 template <class KEY, class DATA, class CACHE_MANAGER>
-class JAWS_Cache_Proxy
+class ACE_Cache_Proxy
 {
 public:
   typedef CACHE_MANAGER Cache_Manager;
   typedef ACE_Singleton<Cache_Manager, ACE_SYNCH_MUTEX>
           Cache_Manager_Singleton;
 
-  JAWS_Cache_Proxy (const KEY &, Cache_Manager * = 0);
+  ACE_Cache_Proxy (const KEY &, Cache_Manager * = 0);
   // Corresponds to a GET
 
-  JAWS_Cache_Proxy (const KEY &, DATA *, size_t, Cache_Manager * = 0);
+  ACE_Cache_Proxy (const KEY &,
+                   DATA *,
+                   size_t,
+                   Cache_Manager * = 0);
   // Corresponds to a U/PUT
 
-  virtual ~JAWS_Cache_Proxy (void);
+  ~ACE_Cache_Proxy (void);
 
   DATA *data (void) const;
   operator DATA * (void) const;
 
-  virtual int close (DATA *);
-
 private:
-
-  JAWS_Cache_Object *object_;
+  ACE_Cache_Object *object_;
   Cache_Manager *manager_;
-
-
 };
 
-
+// @@ James, please also make sure that you add the 
+// #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+// stuff as well... (see other template files to see how this works).
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Cache_Manager_T.cpp"
+// @@ James, this #include is incorrect.
+#include "ace_Cache_Manager_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_CACHE_MANAGER_T_H */
+#endif /* ACE_CACHE_MANAGER_T_H */
diff --git a/ace/Cache_Object.cpp b/ace/Cache_Object.cpp
new file mode 100644
index 00000000000..ae46b14a67b
--- /dev/null
+++ b/ace/Cache_Object.cpp
@@ -0,0 +1,282 @@
+// $Id$
+
+#include "ace_Cache_Object.h"
+
+ACE_RCSID(ace, Cache_Object, "$Id$")
+
+ACE_Cache_Object::ACE_Cache_Object (const void *data,
+                                    size_t size)
+  : data_ (data),
+    size_ (size)
+{
+  this->first_access_ = ACE_OS::time ((time_t *)0);
+  this->last_access_ = this->first_access_;
+  this->new_last_access_ = this->last_access_;
+}
+
+ACE_Cache_Object::~ACE_Cache_Object (void)
+{
+  this->data_ = 0;
+  this->size_ = 0;
+}
+
+const void *
+ACE_Cache_Object::data (void) const
+{
+  return this->data_;
+}
+
+size_t
+ACE_Cache_Object::size (void) const
+{
+  return this->size_;
+}
+
+u_int
+ACE_Cache_Object::count (void) const
+{
+  return this->count_i ();
+}
+
+int
+ACE_Cache_Object::acquire (void)
+{
+  this->new_last_access_ = ACE_OS::time ((time_t *)0);
+  return this->acquire_i ();
+}
+
+int
+ACE_Cache_Object::release (void)
+{
+  this->last_access_ = this->new_last_access_;
+  return this->release_i ();
+}
+
+time_t
+ACE_Cache_Object::last_access (void) const
+{
+  return this->last_access_;
+}
+
+time_t
+ACE_Cache_Object::first_access (void) const
+{
+  return this->first_access_;
+}
+
+u_int
+ACE_Cache_Object::priority (void) const
+{
+  return this->priority_i ();
+}
+
+void *
+ACE_Cache_Object::heap_item (void) const
+{
+  return this->heap_item_;
+}
+
+void
+ACE_Cache_Object::heap_item (void *item)
+{
+  this->heap_item_ = item;
+}
+
+ACE_Referenced_Cache_Object::
+ACE_Referenced_Cache_Object (const void *data,
+                             size_t size)
+  : ACE_Cache_Object (data, size)
+{
+}
+
+ACE_Referenced_Cache_Object::~ACE_Referenced_Cache_Object (void)
+{
+}
+
+u_int
+ACE_Referenced_Cache_Object::count_i (void) const
+{
+  // @@ James, please use the appropriate ACE_*_cast() macro here.
+  ACE_Referenced_Cache_Object *mutable_this
+    = (ACE_Referenced_Cache_Object *) this;
+
+  if (mutable_this->count_.tryacquire_write () == 0)
+    return 0;
+
+  return 1;
+}
+
+int
+ACE_Referenced_Cache_Object::acquire_i (void)
+{
+  return this->count_.acquire_read ();
+}
+
+int
+ACE_Referenced_Cache_Object::release_i (void)
+{
+  return this->count_.release ();
+}
+
+u_int
+ACE_Referenced_Cache_Object::priority_i (void) const
+{
+  u_int priority = ~(0U);
+  double delta
+    = ACE_OS::difftime (this->last_access (),
+                        this->first_access ());
+
+  if (delta >= 0.0 && delta < ~(0U))
+    priority = u_int (delta);
+
+  return priority;
+}
+
+ACE_Counted_Cache_Object::
+ACE_Counted_Cache_Object (const void *data,
+                          size_t size)
+  : ACE_Cache_Object (data, size),
+    count_ (0),
+    new_count_ (0)
+{
+}
+
+ACE_Counted_Cache_Object::~ACE_Counted_Cache_Object (void)
+{
+}
+
+u_int
+ACE_Counted_Cache_Object::count_i (void) const
+{
+  // @@ James, please use the appropriate ACE_*_cast() macro here.
+  ACE_Counted_Cache_Object *mutable_this =
+    (ACE_Counted_Cache_Object *) this;
+  {
+    ACE_Guard<ACE_SYNCH_MUTEX> g (mutable_this->lock_);
+
+    return this->count_;
+  }
+}
+
+int
+ACE_Counted_Cache_Object::acquire_i (void)
+{
+  ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
+
+  this->new_count_++;
+  return 0;
+}
+
+int
+ACE_Counted_Cache_Object::release_i (void)
+{
+  ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
+
+  this->new_count_--;
+  this->count_ = this->new_count_;
+  return 0;
+}
+
+u_int
+ACE_Counted_Cache_Object::priority_i (void) const
+{
+  return this->count_i ();
+}
+
+ACE_Cache_Object_Factory::ACE_Cache_Object_Factory (ACE_Allocator *alloc)
+  : allocator_ (alloc)
+{
+  if (this->allocator_ == 0)
+    this->allocator_ = ACE_Allocator::instance ();
+}
+
+ACE_Cache_Object_Factory::~ACE_Cache_Object_Factory (void)
+{
+}
+
+int
+ACE_Cache_Object_Factory::open (ACE_Allocator *alloc)
+{
+  this->allocator_ = alloc;
+
+  if (this->allocator_ == 0)
+    this->allocator_ = ACE_Allocator::instance ();
+
+  return 0;
+}
+
+ACE_Referenced_Cache_Object_Factory
+::ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc)
+  : ACE_Cache_Object_Factory (alloc)
+{
+}
+
+ACE_Referenced_Cache_Object_Factory
+::~ACE_Referenced_Cache_Object_Factory (void)
+{
+}
+
+ACE_Cache_Object *
+ACE_Referenced_Cache_Object_Factory::create (const void *data,
+                                             size_t size)
+{
+  ACE_Referenced_Cache_Object *obj;
+
+  size_t obj_size = sizeof (ACE_Referenced_Cache_Object);
+
+  ACE_NEW_MALLOC_RETURN (obj,
+                         (ACE_Referenced_Cache_Object *)
+                         this->allocator_->malloc (obj_size),
+                         ACE_Referenced_Cache_Object (data,
+                                                      size),
+                         0);
+  return obj;
+}
+
+void
+ACE_Referenced_Cache_Object_Factory::destroy (ACE_Cache_Object *obj)
+{
+  // @@ James, please use the appropriate ACE_*_cast() macro here.
+  ACE_Referenced_Cache_Object *rco =
+    (ACE_Referenced_Cache_Object *) obj;
+  ACE_DES_FREE (rco,
+                this->allocator_->free,
+                ACE_Referenced_Cache_Object);
+}
+
+ACE_Counted_Cache_Object_Factory
+::ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc)
+  : ACE_Cache_Object_Factory (alloc)
+{
+}
+
+ACE_Counted_Cache_Object_Factory
+::~ACE_Counted_Cache_Object_Factory (void)
+{
+}
+
+ACE_Cache_Object *
+ACE_Counted_Cache_Object_Factory::create (const void *data, size_t size)
+{
+  ACE_Counted_Cache_Object *obj;
+
+  size_t obj_size = sizeof (ACE_Counted_Cache_Object);
+  ACE_NEW_MALLOC_RETURN (obj,
+                         (ACE_Counted_Cache_Object *)
+                         this->allocator_->malloc (obj_size),
+                         ACE_Counted_Cache_Object (data,
+                                                   size),
+                         0);
+
+  return obj;
+}
+
+void
+ACE_Counted_Cache_Object_Factory::destroy (ACE_Cache_Object *obj)
+{
+  // @@ James, please use the appropriate ACE_*_cast() macro here.
+  ACE_Counted_Cache_Object *cco =
+    (ACE_Counted_Cache_Object *) obj;
+  ACE_DES_FREE (cco,
+                this->allocator_->free, ACE_Counted_Cache_Object);
+}
diff --git a/ace/Cache_Object.h b/ace/Cache_Object.h
new file mode 100644
index 00000000000..f403ec59c89
--- /dev/null
+++ b/ace/Cache_Object.h
@@ -0,0 +1,129 @@
+/* -*- c++ -*- */
+// $Id$
+
+// @@ James, please add a standard "header" here like you see in all
+// the other ACE headerfiles.
+
+#ifndef ACE_CACHE_OBJECT_H
+#define ACE_CACHE_OBJECT_H
+
+#include "ace/OS.h"
+#include "ace/Synch.h"
+#include "ace/Malloc.h"
+
+// @@ James, can you please update ALL of these classes and methods to
+// use the standard ACE commenting style, i.e., add = TITLE and =
+// DESCRIPTION headers and comments for each method.
+
+// Cache bucket -- use Hash_Bucket to hold cacheable objects.
+
+class ACE_Cache_Object
+{
+public:
+  ACE_Cache_Object (const void *, size_t);
+  virtual ~ACE_Cache_Object (void);
+
+  const void *data (void) const;
+  size_t size (void) const;
+  u_int count (void) const;
+
+  int acquire (void);
+  int release (void);
+
+  time_t last_access (void) const;
+  time_t first_access (void) const;
+
+  u_int priority (void) const;
+
+  enum { ACE_CO_REFERENCED, ACE_CO_COUNTED };
+
+  void *heap_item (void) const;
+  void heap_item (void *item);
+
+protected:
+  virtual u_int count_i (void) const = 0;
+  virtual int acquire_i (void) = 0;
+  virtual int release_i (void) = 0;
+  virtual u_int priority_i (void) const = 0;
+
+private:
+  const void *data_;
+  size_t size_;
+
+  time_t last_access_;
+  time_t first_access_;
+  time_t new_last_access_;
+
+  void *heap_item_;
+};
+
+class ACE_Referenced_Cache_Object : public ACE_Cache_Object
+{
+public:
+  ACE_Referenced_Cache_Object (const void *, size_t);
+  virtual ~ACE_Referenced_Cache_Object (void);
+
+protected:
+  virtual u_int count_i (void) const;
+  virtual int acquire_i (void);
+  virtual int release_i (void);
+  virtual u_int priority_i (void) const;
+
+private:
+  /* MUTABLE */ ACE_SYNCH_RW_MUTEX count_;
+};
+
+class ACE_Counted_Cache_Object : public ACE_Cache_Object
+{
+public:
+  ACE_Counted_Cache_Object (const void *, size_t);
+  virtual ~ACE_Counted_Cache_Object (void);
+
+protected:
+  virtual u_int count_i (void) const;
+  virtual int acquire_i (void);
+  virtual int release_i (void);
+  virtual u_int priority_i (void) const;
+
+private:
+  u_int count_;
+  u_int new_count_;
+  /* MUTABLE */ ACE_SYNCH_MUTEX lock_;
+};
+
+class ACE_Cache_Object_Factory
+{
+public:
+  ACE_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_Cache_Object_Factory (void);
+
+  int open (ACE_Allocator *alloc = 0);
+
+  virtual ACE_Cache_Object * create (const void *, size_t) = 0;
+  virtual void destroy (ACE_Cache_Object *) = 0;
+
+protected:
+  ACE_Allocator *allocator_;
+};
+
+class ACE_Referenced_Cache_Object_Factory : public ACE_Cache_Object_Factory
+{
+public:
+  ACE_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_Referenced_Cache_Object_Factory (void);
+
+  virtual ACE_Cache_Object * create (const void *, size_t);
+  virtual void destroy (ACE_Cache_Object *);
+};
+
+class ACE_Counted_Cache_Object_Factory : public ACE_Cache_Object_Factory
+{
+public:
+  ACE_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0);
+  virtual ~ACE_Counted_Cache_Object_Factory (void);
+
+  virtual ACE_Cache_Object * create (const void *, size_t);
+  virtual void destroy (ACE_Cache_Object *);
+};
+
+#endif /* UTL_CACHE_OBJECT_H */
diff --git a/ace/Connector.cpp b/ace/Connector.cpp
index a0e12e99768..cccd932ac52 100644
--- a/ace/Connector.cpp
+++ b/ace/Connector.cpp
@@ -102,28 +102,6 @@ ACE_Connector<SH, PR_CO_2>::connect_svc_handler (SVC_HANDLER *&svc_handler,
 }
 
 template <class SH, PR_CO_1> int
-ACE_Connector<SH, PR_CO_2>::connect_svc_handler (SVC_HANDLER *&svc_handler,
-                                                 SVC_HANDLER *&sh_copy,
-                                                 const PR_AD &remote_addr,
-                                                 ACE_Time_Value *timeout,
-                                                 const PR_AD &local_addr,
-                                                 int reuse_addr,
-                                                 int flags,
-                                                 int perms)
-{
-  ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect_svc_handler");
-
-  sh_copy = svc_handler;
-  return this->connector_.connect (svc_handler->peer (),
-                                   remote_addr,
-                                   timeout,
-                                   local_addr,
-                                   reuse_addr,
-                                   flags,
-                                   perms);
-}
-
-template <class SH, PR_CO_1> int
 ACE_Connector<SH, PR_CO_2>::open (ACE_Reactor *r, int flags)
 {
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::open");
@@ -260,11 +238,8 @@ ACE_Connector<SH, PR_CO_2>::cleanup_AST (ACE_HANDLE handle,
     {
       // Error, entry not found in map.
       errno = ENOENT;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ASYS_TEXT ("%p %d not found in map\n"),
-                         ASYS_TEXT ("find"),
-                         handle),
-                        -1);
+      ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p %d not found in map\n"),
+                        ASYS_TEXT ("find"), handle), -1);
     }
 
   // Try to remove from ACE_Timer_Queue but if it's not there we
@@ -363,46 +338,6 @@ ACE_Connector<SH, PR_CO_2>::connect (SH *&sh,
                                      int flags,
                                      int perms)
 {
-  return this->connect_i (sh,
-                          0,
-                          remote_addr,
-                          synch_options,
-                          local_addr,
-                          reuse_addr,
-                          flags,
-                          perms);
-}
-
-template <class SH, PR_CO_1> int
-ACE_Connector<SH, PR_CO_2>::connect (SH *&sh,
-                                     SH *&sh_copy,
-                                     const PR_AD &remote_addr,
-                                     const ACE_Synch_Options &synch_options,
-                                     const PR_AD &local_addr,
-                                     int reuse_addr,
-                                     int flags,
-                                     int perms)
-{
-  return this->connect_i (sh,
-                          &sh_copy,
-                          remote_addr,
-                          synch_options,
-                          local_addr,
-                          reuse_addr,
-                          flags,
-                          perms);
-}
-
-template <class SH, PR_CO_1> int
-ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
-                                       SH **sh_copy,
-                                       const PR_AD &remote_addr,
-                                       const ACE_Synch_Options &synch_options,
-                                       const PR_AD &local_addr,
-                                       int reuse_addr,
-                                       int flags,
-                                       int perms)
-{
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::connect");
 
   SH* new_sh = sh;
@@ -420,27 +355,14 @@ ACE_Connector<SH, PR_CO_2>::connect_i (SH *&sh,
   else
     timeout = (ACE_Time_Value *) synch_options.time_value ();
 
-  int result;
-  if (sh_copy == 0)
-    result = this->connect_svc_handler (new_sh,
-                                        remote_addr,
-                                        timeout,
-                                        local_addr,
-                                        reuse_addr,
-                                        flags,
-                                        perms);
-  else
-    result = this->connect_svc_handler (new_sh,
-                                        *sh_copy,
-                                        remote_addr,
-                                        timeout,
-                                        local_addr,
-                                        reuse_addr,
-                                        flags,
-                                        perms);
-
   // Delegate to connection strategy.
-  if (result == -1)
+  if (this->connect_svc_handler (new_sh,
+                                 remote_addr,
+                                 timeout,
+                                 local_addr,
+                                 reuse_addr,
+                                 flags,
+                                 perms) == -1)
     {
       if (use_reactor && errno == EWOULDBLOCK)
         {
@@ -615,7 +537,7 @@ ACE_Connector<SH, PR_CO_2>::close (void)
 }
 
 template <class SH, PR_CO_1> int
-ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
+ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::handle_close");
 
@@ -626,6 +548,10 @@ ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
       // Timer_Queue).
       this->closing_ = 1;
 
+      // Remove all timer objects associated with <this> object from
+      // the <Reactor>'s Timer_Queue.
+      this->reactor ()->cancel_timer (this);
+
       MAP_ITERATOR mi (this->handler_map_);
 
       // Iterate through the map and shut down all the pending handlers.
@@ -634,6 +560,9 @@ ACE_Connector<SH, PR_CO_2>::handle_close (ACE_HANDLE, ACE_Reactor_Mask)
            mi.next (me) != 0;
            mi.advance ())
         {
+          this->reactor ()->remove_handler (me->ext_id_,
+                                            mask | ACE_Event_Handler::DONT_CALL);
+
           AST *ast = 0;
           this->cleanup_AST (me->ext_id_, ast);
 
@@ -875,27 +804,6 @@ ACE_Strategy_Connector<SH, PR_CO_2>::connect_svc_handler
 }
 
 template <class SH, PR_CO_1> int
-ACE_Strategy_Connector<SH, PR_CO_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)
-{
-  return this->connect_strategy_->connect_svc_handler (sh,
-                                                       sh_copy,
-                                                       remote_addr,
-                                                       timeout,
-                                                       local_addr,
-                                                       reuse_addr,
-                                                       flags,
-                                                       perms);
-}
-
-template <class SH, PR_CO_1> int
 ACE_Strategy_Connector<SH, PR_CO_2>::activate_svc_handler (SVC_HANDLER *svc_handler)
 {
   return this->concurrency_strategy_->activate_svc_handler (svc_handler, this);
diff --git a/ace/Connector.h b/ace/Connector.h
index eac69ebc942..6e607beeb4b 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -142,16 +142,6 @@ public:
                        int reuse_addr = 0,
                        int flags = O_RDWR,
                        int perms = 0);
-
-  virtual int connect (SVC_HANDLER *&svc_handler,
-                       SVC_HANDLER *&sh_copy,
-                       const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                       const ACE_Synch_Options &synch_options = ACE_Synch_Options::defaults,
-                       const ACE_PEER_CONNECTOR_ADDR &local_addr
-                         = (ACE_PEER_CONNECTOR_ADDR &) ACE_PEER_CONNECTOR_ADDR_ANY,
-                       int reuse_addr = 0,
-                       int flags = O_RDWR,
-                       int perms = 0);
   // Initiate connection of <svc_handler> to peer at <remote_addr>
   // using <synch_options>.  If the caller wants to designate the
   // selected <local_addr> they can (and can also insist that the
@@ -190,15 +180,11 @@ public:
 protected:
   // = Helpful typedefs.
 
-  typedef ACE_Svc_Tuple<SVC_HANDLER>
-          AST;
+  typedef ACE_Svc_Tuple<SVC_HANDLER> AST;
 
-  typedef ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX>
-          MAP_MANAGER;
-  typedef ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX>
-          MAP_ITERATOR;
-  typedef ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *>
-          MAP_ENTRY;
+  typedef ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX> MAP_MANAGER;
+  typedef ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX> MAP_ITERATOR;
+  typedef ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *> MAP_ENTRY;
 
   // = The following two methods define the Connector's strategies for
   // creating, connecting, and activating SVC_HANDLER's, respectively.
@@ -219,14 +205,6 @@ protected:
                                    int reuse_addr,
                                    int flags,
                                    int perms);
-  virtual int connect_svc_handler (SVC_HANDLER *&svc_handler,
-                                   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);
   // Bridge method for connecting the <svc_handler> to the
   // <remote_addr>.  The default behavior delegates to the
   // <PEER_CONNECTOR::connect>.
@@ -292,16 +270,6 @@ protected:
   // Cleanup the <handler_map_> and returns the appropriate
   // ACE_Svc_Tuple (which is 0 if there is no associated tuple).
 
-  virtual int connect_i (SVC_HANDLER *&svc_handler,
-                         SVC_HANDLER **sh_copy,
-                         const ACE_PEER_CONNECTOR_ADDR &remote_addr,
-                         const ACE_Synch_Options &synch_options,
-                         const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                         int reuse_addr,
-                         int flags,
-                         int perms);
-  // Implementation the connect() methods
-
   MAP_MANAGER handler_map_;
   // Lookup table that maps an I/O handle to a SVC_HANDLER *.
 
@@ -413,23 +381,6 @@ protected:
   // <SVC_HANDLER>.  The default behavior delegates to the
   // <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
 
-  virtual int 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);
-  // Bridge method for connecting the new connection into the
-  // <SVC_HANDLER>.  The default behavior delegates to the
-  // <PEER_CONNECTOR::connect> in the <Connect_Strategy>.
-  // <sh_copy> is used to obtain a copy of the <sh> pointer, but that
-  // can be kept in the stack; the motivation is a bit too long to
-  // include here, but basically we want to modify <sh> safely, using
-  // the internal locks in the Connect_Strategy, while saving a TSS
-  // copy in <sh_copy>, usually located in the stack.
-
   virtual int activate_svc_handler (SVC_HANDLER *svc_handler);
   // Bridge method for activating a <SVC_HANDLER> with the appropriate
   // concurrency strategy.  The default behavior of this method is to
diff --git a/ace/Containers.h b/ace/Containers.h
index eb9b107b74f..73d73c54b8f 100644
--- a/ace/Containers.h
+++ b/ace/Containers.h
@@ -18,7 +18,6 @@
 #define ACE_CONTAINERS_H
 
 #include "ace/OS.h"
-#include "ace/Malloc_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,10 +34,11 @@ class ACE_Export ACE_DLList_Node
   // = TITLE
   //     Base implementation of element in a DL list.  Needed for
   //     ACE_Double_Linked_List.
-public:
+
   friend class ACE_Double_Linked_List<ACE_DLList_Node>;
   friend class ACE_Double_Linked_List_Iterator<ACE_DLList_Node>;
 
+public:
   ACE_DLList_Node (void *&i,
                    ACE_DLList_Node *n = 0,
                    ACE_DLList_Node *p = 0);
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp
index 44ab889ab61..6b8e51a7076 100644
--- a/ace/Containers_T.cpp
+++ b/ace/Containers_T.cpp
@@ -54,14 +54,12 @@ template<class T> void
 ACE_Bounded_Stack<T>::operator= (const ACE_Bounded_Stack<T> &s)
 {
   ACE_TRACE ("ACE_Bounded_Stack<T>::operator=");
-
   if (&s != this)
     {
       if (this->size_ < s.size_)
         {
           delete [] this->stack_;
-          ACE_NEW (this->stack_,
-                   T[s.size_]);
+          ACE_NEW (this->stack_, T[s.size_]);
         }
       this->top_ = s.top_;
 
@@ -109,7 +107,6 @@ template<class T, size_t ACE_SIZE> void
 ACE_Fixed_Stack<T, ACE_SIZE>::operator= (const ACE_Fixed_Stack<T, ACE_SIZE> &s)
 {
   ACE_TRACE ("ACE_Fixed_Stack<T, ACE_SIZE>::operator=");
-
   if (&s != this)
     {
       this->top_ = s.top_;
@@ -146,7 +143,7 @@ ACE_Unbounded_Stack<T>::ACE_Unbounded_Stack (ACE_Allocator *alloc)
     this->allocator_ = ACE_Allocator::instance ();
 
   ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                  (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
                   ACE_Node<T>);
   this->head_->next_ = this->head_;
 }
@@ -185,7 +182,7 @@ ACE_Unbounded_Stack<T>::copy_all_nodes (const ACE_Unbounded_Stack<T> &s)
     {
       ACE_Node<T> *nptr = temp->next_;
       ACE_NEW_MALLOC (temp->next_,
-                      (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                      (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
                       ACE_Node<T> (s_temp->item_, nptr));
       temp = temp->next_;
     }
@@ -202,7 +199,7 @@ ACE_Unbounded_Stack<T>::ACE_Unbounded_Stack (const ACE_Unbounded_Stack<T> &s)
     this->allocator_ = ACE_Allocator::instance ();
 
   ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                  (ACE_Node<T>*) this->allocator_->malloc( sizeof (ACE_Node<T>)),
                   ACE_Node<T>);
   this->head_->next_ = this->head_;
 
@@ -214,7 +211,6 @@ template<class T> void
 ACE_Unbounded_Stack<T>::operator= (const ACE_Unbounded_Stack<T> &s)
 {
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::operator=");
-
   if (this != &s)
     {
       this->delete_all_nodes ();
@@ -228,10 +224,8 @@ ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack (void)
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::~ACE_Unbounded_Stack");
 
   this->delete_all_nodes ();
-  ACE_DES_FREE_TEMPLATE (head_,
-                         this->allocator_->free,
-                         ACE_Node,
-                         <T>);
+  ACE_DES_FREE_TEMPLATE (head_, this->allocator_->free,
+                         ACE_Node, <T>);
 }
 
 template<class T> int
@@ -242,9 +236,8 @@ ACE_Unbounded_Stack<T>::push (const T &new_item)
   ACE_Node<T> *temp;
 
   ACE_NEW_MALLOC_RETURN (temp,
-                         (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
-                         ACE_Node<T> (new_item, this->head_->next_),
-                         -1);
+                         (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                         ACE_Node<T> (new_item, this->head_->next_), -1);
 
   this->head_->next_ = temp;
   this->cur_size_++;
@@ -264,10 +257,8 @@ ACE_Unbounded_Stack<T>::pop (T &item)
       item = temp->item_;
       this->head_->next_ = temp->next_;
 
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_Node,
-                             <T>);
+      ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free,
+                             ACE_Node, <T>);
       this->cur_size_--;
       return 0;
     }
@@ -323,10 +314,8 @@ ACE_Unbounded_Stack<T>::remove (const T &item)
       // Skip over the node that we're deleting.
       curr->next_ = temp->next_;
       this->cur_size_--;
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_Node,
-                             <T>);
+      ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free,
+                             ACE_Node, <T>);
       return 0;
     }
 }
@@ -343,7 +332,7 @@ ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (ACE_Allocator *alloc)
     this->allocator_ = ACE_Allocator::instance ();
 
   ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                  (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
                   ACE_Node<T>);
 
   // Make the list circular by pointing it back to itself.
@@ -362,7 +351,7 @@ ACE_Unbounded_Queue<T>::ACE_Unbounded_Queue (const ACE_Unbounded_Queue<T> &us)
     this->allocator_ = ACE_Allocator::instance ();
 
   ACE_NEW_MALLOC (this->head_,
-                  (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                  (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
                   ACE_Node<T>);
   this->head_->next_ = this->head_;
   this->copy_nodes (us);
@@ -445,8 +434,7 @@ ACE_Unbounded_Queue<T>::delete_nodes (void)
 
       ACE_DES_FREE_TEMPLATE (temp,
                              this->allocator_->free,
-                             ACE_Node,
-                             <T>);
+                             ACE_Node, <T>);
       this->cur_size_--;
     }
 
@@ -460,10 +448,8 @@ ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)
 //   ACE_TRACE ("ACE_Unbounded_Queue<T>::~ACE_Unbounded_Queue (void)");
 
   this->delete_nodes ();
-  ACE_DES_FREE_TEMPLATE (head_,
-                         this->allocator_->free,
-                         ACE_Node,
-                         <T>);
+  ACE_DES_FREE_TEMPLATE (head_, this->allocator_->free,
+                         ACE_Node, <T>);
   this->head_ = 0;
 }
 
@@ -476,9 +462,8 @@ ACE_Unbounded_Queue<T>::enqueue_head (const T &new_item)
 
   // Create a new node that points to the original head.
   ACE_NEW_MALLOC_RETURN (temp,
-                         (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
-                         ACE_Node<T> (new_item, this->head_->next_),
-                         -1);
+                         (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                         ACE_Node<T> (new_item, this->head_->next_), -1);
 
   // Link this pointer into the front of the list.
   this->head_->next_ = temp;
@@ -499,7 +484,7 @@ ACE_Unbounded_Queue<T>::enqueue_tail (const T &new_item)
 
   // Create a new dummy node.
   ACE_NEW_MALLOC_RETURN (temp,
-                         (ACE_Node<T> *) this->allocator_->malloc (sizeof (ACE_Node<T>)),
+                         (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
                          ACE_Node<T> (this->head_->next_), -1);
 
   // Link this dummy pointer into the list.
@@ -525,10 +510,8 @@ ACE_Unbounded_Queue<T>::dequeue_head (T &item)
 
   item = temp->item_;
   this->head_->next_ = temp->next_;
-  ACE_DES_FREE_TEMPLATE (temp,
-                         this->allocator_->free,
-                         ACE_Node,
-                         <T>);
+  ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free,
+                         ACE_Node, <T>);
   --this->cur_size_;
   return 0;
 }
@@ -784,9 +767,8 @@ ACE_Double_Linked_List<T>::~ACE_Double_Linked_List (void)
 {
   this->delete_nodes ();
 
-  ACE_DES_FREE (head_,
-                this->allocator_->free,
-                T);
+  ACE_DES_FREE (head_, this->allocator_->free,
+                  T);
 
   this->head_ = 0;
 }
@@ -1204,8 +1186,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (void)
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
-  ACE_NEW (this->search_structure_,
-           ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+  ACE_NEW (this->search_structure_, ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->max_size_; i++)
     this->search_structure_[i].is_free_ = 1;
@@ -1218,8 +1199,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (const ACE_Bounded_Set<T> &bs)
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
 
-  ACE_NEW (this->search_structure_,
-           ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
+  ACE_NEW (this->search_structure_, ACE_Bounded_Set<T>::Search_Structure[this->max_size_]);
 
   for (size_t i = 0; i < this->cur_size_; i++)
     this->search_structure_[i] = bs.search_structure_[i];
@@ -1253,8 +1233,7 @@ ACE_Bounded_Set<T>::ACE_Bounded_Set (size_t size)
     max_size_ (size)
 {
   ACE_TRACE ("ACE_Bounded_Set<T>::ACE_Bounded_Set");
-  ACE_NEW (this->search_structure_,
-           ACE_Bounded_Set<T>::Search_Structure[size]);
+  ACE_NEW (this->search_structure_, ACE_Bounded_Set<T>::Search_Structure[size]);
 
   for (size_t i = 0; i < this->max_size_; i++)
     this->search_structure_[i].is_free_ = 1;
@@ -1464,12 +1443,10 @@ ACE_DNode<T>::ACE_DNode (const T &i, ACE_DNode<T> *n, ACE_DNode<T> *p)
 {
 }
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
 template <class T>
 ACE_DNode<T>::~ACE_DNode (void)
 {
 }
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Unbounded_Set)
 
@@ -1492,8 +1469,7 @@ ACE_Unbounded_Set<T>::insert_tail (const T &item)
   // Create a new dummy node.
   ACE_NEW_MALLOC_RETURN (temp,
                          (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
-                         ACE_Node<T> (this->head_->next_),
-                         -1);
+                         ACE_Node<T> (this->head_->next_), -1);
 
   // Link this pointer into the list.
   this->head_->next_ = temp;
@@ -1556,10 +1532,8 @@ ACE_Unbounded_Set<T>::delete_nodes (void)
     {
       ACE_Node<T> *temp = curr;
       curr = curr->next_;
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_Node,
-                             <T>);
+      ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free,
+                             ACE_Node, <T>);
       this->cur_size_--;
     }
 
@@ -1575,10 +1549,8 @@ ACE_Unbounded_Set<T>::~ACE_Unbounded_Set (void)
   this->delete_nodes ();
 
   // Delete the dummy node.
-  ACE_DES_FREE_TEMPLATE (head_,
-                         this->allocator_->free,
-                         ACE_Node,
-                         <T>);
+  ACE_DES_FREE_TEMPLATE (head_, this->allocator_->free,
+                         ACE_Node, <T>);
   this->head_ = 0;
 }
 
@@ -1680,10 +1652,8 @@ ACE_Unbounded_Set<T>::remove (const T &item)
       // Skip over the node that we're deleting.
       curr->next_ = temp->next_;
       this->cur_size_--;
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_Node,
-                             <T>);
+      ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free,
+                             ACE_Node, <T>);
       return 0;
     }
 }
@@ -1757,24 +1727,19 @@ ACE_Unbounded_Set_Iterator<T>::next (T *&item)
 }
 
 template <class T> ACE_Unbounded_Set_Iterator<T>
-ACE_Unbounded_Set_Iterator<T>::operator++ (int)
+ACE_Unbounded_Set_Iterator<T>::operator++ (void)
 {
-  //ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::operator++ (int)");
+  //ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::operator++ ()");
   ACE_Unbounded_Set_Iterator<T> retv (*this);
 
-  // postfix operator
-
   this->advance ();
   return retv;
 }
 
 template <class T> ACE_Unbounded_Set_Iterator<T>&
-ACE_Unbounded_Set_Iterator<T>::operator++ (void)
+ACE_Unbounded_Set_Iterator<T>::operator++ (int)
 {
-  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::operator++ (void)");
-
-  // prefix operator
-
+  // ACE_TRACE ("ACE_Unbounded_Set_Iterator<T>::operator++ (int)");
   this->advance ();
   return *this;
 }
@@ -1960,11 +1925,9 @@ ACE_Ordered_MultiSet<T>::remove (const T &item)
 
     this->cur_size_--;
 
-    ACE_DES_FREE_TEMPLATE (node,
-                           this->allocator_->free,
-                           ACE_DNode,
-                           <T>);
-    return 0;
+    ACE_DES_FREE_TEMPLATE (node, this->allocator_->free, ACE_DNode, <T>);
+
+        return 0;
   }
 
   return -1;
@@ -2027,10 +1990,10 @@ ACE_Ordered_MultiSet<T>::insert_from (const T &item, ACE_DNode<T> *position,
 
     // create a new node
   ACE_DNode<T> *temp;
-  ACE_NEW_MALLOC_RETURN (temp,
-                         (ACE_DNode<T>*) this->allocator_->malloc (sizeof (ACE_DNode<T>)),
-                         ACE_DNode<T> (item),
-                         -1);
+  ACE_NEW_MALLOC_RETURN (
+    temp,
+    (ACE_DNode<T>*) this->allocator_->malloc (sizeof (ACE_DNode<T>)),
+    ACE_DNode<T> (item), -1);
 
   // obtain approximate location of the node
   int result = locate (item, position, position);
@@ -2178,23 +2141,20 @@ template <class T> void
 ACE_Ordered_MultiSet<T>::delete_nodes (void)
 {
   // iterate through list, deleting nodes
-  for (ACE_DNode<T> *curr = this->head_;
-       curr != 0;
-       )
-    {
-      ACE_DNode<T> *temp = curr;
-      curr = curr->next_;
-      ACE_DES_FREE_TEMPLATE (temp,
-                             this->allocator_->free,
-                             ACE_DNode,
-                             <T>);
-    }
+  ACE_DNode<T> *curr = this->head_;
+  while (curr)
+  {
+    ACE_DNode<T> *temp = curr;
+    curr = curr->next_;
+    ACE_DES_FREE_TEMPLATE (temp, this->allocator_->free, ACE_DNode, <T>);
+  }
 
   this->head_ = 0;
   this->tail_ = 0;
   this->cur_size_ = 0;
 }
 
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Ordered_MultiSet_Iterator)
 
 template <class T>
@@ -2225,10 +2185,10 @@ template <class T> T *
 ACE_DLList<T>::insert_tail (T *new_item)
 {
   ACE_DLList_Node *temp1, *temp2;
-  ACE_NEW_MALLOC_RETURN (temp1,
-                         (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)),
-                         ACE_DLList_Node ((void *&)new_item),
-                         0);
+  ACE_NEW_MALLOC_RETURN (
+    temp1,
+    (ACE_DLList_Node *) this->allocator_->malloc (sizeof (ACE_DLList_Node)),
+    ACE_DLList_Node ((void *&)new_item), 0);
 
   temp2 = ACE_DLList_Base::insert_tail (temp1);
   return (T *) (temp2 ? temp2->item_ : 0);
@@ -2252,9 +2212,7 @@ ACE_DLList<T>::delete_head (void)
 {
   ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_head ();
   T *temp2 = (T *) (temp1 ? temp1->item_ : 0);
-  ACE_DES_FREE (temp1,
-                this->allocator_->free,
-                ACE_DLList_Node);
+  ACE_DES_FREE (temp1, this->allocator_->free, ACE_DLList_Node);
 
   return temp2;
 }
@@ -2264,9 +2222,8 @@ ACE_DLList<T>::delete_tail (void)
 {
   ACE_DLList_Node *temp1 = ACE_DLList_Base::delete_tail ();
   T *temp2 = (T *) (temp1 ? temp1->item_ : 0);
-  ACE_DES_FREE (temp1,
-                this->allocator_->free,
-                ACE_DLList_Node);
+  ACE_DES_FREE (temp1, this->allocator_->free, ACE_DLList_Node);
+
   return temp2;
 }
 
@@ -2275,49 +2232,26 @@ ACE_DLList<T>::delete_tail (void)
 // Dynamically initialize an array.
 
 template <class T>
-ACE_Array_Base<T>::ACE_Array_Base (size_t size,
-                                   ACE_Allocator *alloc)
+ACE_Array_Base<T>::ACE_Array_Base (size_t size)
   : max_size_ (size),
-    cur_size_ (size),
-    allocator_ (alloc)
+    cur_size_ (size)
 {
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
   if (size != 0)
-    {
-      ACE_NEW_MALLOC (this->array_,
-                      (T *) this->allocator_->malloc (size * sizeof (T)),
-                      T);
-      for (size_t i = 0; i < size; ++i)
-        new (&array_[i]) T;
-    }
+    ACE_NEW (this->array_, T[size]);
   else
     this->array_ = 0;
 }
 
 template <class T>
 ACE_Array_Base<T>::ACE_Array_Base (size_t size,
-                                   const T &default_value,
-                                   ACE_Allocator *alloc)
+                                   const T &default_value)
   : max_size_ (size),
-    cur_size_ (size),
-    allocator_ (alloc)
+    cur_size_ (size)
 {
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
-  if (size != 0)
-    {
-      ACE_NEW_MALLOC (this->array_,
-                      (T *) this->allocator_->malloc (size * sizeof (T)),
-                      T);
+  ACE_NEW (this->array_, T[size]);
 
-      for (size_t i = 0; i < size; ++i)
-        new (&array_[i]) T (default_value);
-    }
-  else
-    this->array_ = 0;
+  for (size_t i = 0; i < size; i++)
+    this->array_[i] = default_value;
 }
 
 // The copy constructor (performs initialization).
@@ -2325,47 +2259,38 @@ ACE_Array_Base<T>::ACE_Array_Base (size_t size,
 template <class T>
 ACE_Array_Base<T>::ACE_Array_Base (const ACE_Array_Base<T> &s)
    : max_size_ (s.size ()),
-     cur_size_ (s.size ()),
-     allocator_ (s.allocator_)
+     cur_size_ (s.size ())
 {
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
-  ACE_NEW_MALLOC (this->array_,
-                  (T *) this->allocator_->malloc (s.size () * sizeof (T)),
-                  T);
+  ACE_NEW (this->array_, T[s.size ()]);
 
   for (size_t i = 0; i < this->size (); i++)
-    new (&this->array_[i]) T (s.array_[i]);
+    this->array_[i] = s.array_[i];
 }
 
 // Assignment operator (performs assignment).
 
-template <class T> void
+template <class T> ACE_Array_Base<T>&
 ACE_Array_Base<T>::operator= (const ACE_Array_Base<T> &s)
 {
   // Check for "self-assignment".
 
-  if (this != &s)
+  if (this == &s)
+    return *this;
+  else if (this->max_size_ < s.size ())
     {
-      if (this->max_size_ < s.size ())
-        {
-          ACE_DES_ARRAY_FREE (this->array_,
-                              this->max_size_,
-                              this->allocator_->free,
-                              T);
-
-          ACE_NEW_MALLOC (this->array_,
-                          (T *) this->allocator_->malloc (s.size () * sizeof (T)),
-                          T);
-          this->max_size_ = s.size ();
-        }
+      delete [] this->array_;
 
-      this->cur_size_ = s.size ();
+      ACE_NEW_RETURN (this->array_, T[s.size ()], *this);
 
-      for (size_t i = 0; i < this->size (); i++)
-        new (&this->array_[i]) T (s.array_[i]);
+      this->max_size_ = s.size ();
     }
+
+  this->cur_size_ = s.size ();
+
+  for (size_t i = 0; i < this->size (); i++)
+    this->array_[i] = s.array_[i];
+
+  return *this;
 }
 
 // Set an item in the array at location index.
@@ -2389,9 +2314,10 @@ ACE_Array_Base<T>::get (T &item, size_t index) const
 {
    if (this->in_range (index))
      {
-       // Copies the item.  If you don't want to copy, use operator []
-       // instead (but then you'll be responsible for range checking).
-       item = this->array_[index];
+       item = this->array_[index];  // Copies the item.  If you don't
+                                    // want to copy, use operator [] instead
+                                    // (but then you'll be responsible for
+                                    // range checking).
        return 0;
      }
    else
@@ -2403,31 +2329,16 @@ ACE_Array_Base<T>::max_size (size_t new_size)
 {
   if (new_size > this->max_size_)
     {
-      T *tmp;
-
-      ACE_NEW_MALLOC_RETURN (tmp,
-                             (T *) this->allocator_->malloc (new_size * sizeof (T)),
-                             T,
-                             -1);
+      // @@ We should use auto_ptr<>!
+      T* tmp;
+      ACE_NEW_RETURN (tmp, T[new_size], -1);
 
       for (size_t i = 0; i < this->cur_size_; ++i)
-         new (&tmp[i]) T (this->array_[i]);
-
-      // Initialize the new portion of the array that exceeds the
-      // previously allocated section.
-      for (size_t j = this->cur_size_; j < new_size; j++)
-        new (&tmp[j]) T;
-
-      ACE_DES_ARRAY_FREE (this->array_,
-                          this->max_size_,
-                          this->allocator_->free,
-                          T);
-
+        tmp[i] = this->array_[i];
+      delete[] this->array_;
       this->array_ = tmp;
       this->max_size_ = new_size;
-      this->cur_size_ = new_size;
     }
-
   return 0;
 }
 
diff --git a/ace/Containers_T.h b/ace/Containers_T.h
index 73ef014d561..2bca82f0b46 100644
--- a/ace/Containers_T.h
+++ b/ace/Containers_T.h
@@ -219,10 +219,8 @@ class ACE_DNode
 
 public:
 
-# if ! defined (ACE_HAS_BROKEN_NOOP_DTORS)
   ~ACE_DNode (void);
-  // This isn't necessary, but it keeps some compilers happy.
-# endif /* ! defined (ACE_HAS_BROKEN_NOOP_DTORS) */
+  // This isn't necessary, but it keeps the compiler happy.
 
 private:
 
@@ -249,7 +247,7 @@ class ACE_Unbounded_Stack
   // = DESCRIPTION
   //     This implementation of an unbounded Stack uses a linked list.
   //     If you use the <insert> or <remove> methods you should keep
-  //     in mind that duplicate entries aren't allowed.  In general,
+  //     in mind that duplicate entries aren't allow.  In general,
   //     therefore, you should avoid the use of these methods since
   //     they aren't really part of the ADT stack.
 public:
@@ -724,6 +722,7 @@ class ACE_DLList : public ACE_DLList_Base
   friend class ACE_DLList_Iterator<T>;
 
 public:
+
   void operator= (ACE_DLList<T> &l);
   // Delegates to ACE_Double_Linked_List.
 
@@ -830,10 +829,10 @@ public:
 
   // = STL styled iteration, compare, and reference functions.
 
-  ACE_Unbounded_Set_Iterator<T> operator++ (int);
+  ACE_Unbounded_Set_Iterator<T> operator++ (void);
   // Postfix advance.
 
-  ACE_Unbounded_Set_Iterator<T>& operator++ (void);
+  ACE_Unbounded_Set_Iterator<T>& operator++ (int);
   // Prefix advance.
 
   T& operator* (void);
@@ -847,7 +846,6 @@ public:
   // Declare the dynamic allocation hooks.
 
 private:
-
   ACE_Node<T> *current_;
   // Pointer to the current node in the iteration.
 
@@ -1215,10 +1213,12 @@ class ACE_Ordered_MultiSet_Iterator
 {
   // = TITLE
   //     Implement a bidirectional iterator over an ordered multiset.
-  //     This class template requires that < operator semantics be
-  //     defined for the parameterized type <T>, but does not impose
-  //     any restriction on how that ordering operator is implemented.
+  //     This class template requires that < operator semantics be defined
+  //     for the parameterized type <T>, but does not impose any restriction
+  //     on how that ordering operator is implemented.
+
 public:
+
   friend class ACE_Ordered_MultiSet<T>;
 
   // = Initialization method.
@@ -1269,15 +1269,14 @@ class ACE_Ordered_MultiSet
 {
   // = TITLE
   //     Implement a simple ordered multiset of <T> of unbounded size.
-  //     This class template requires that < operator semantics be
-  //     defined for the parameterized type <T>, but does not impose
-  //     any restriction on how that ordering operator is implemented.
+  //     This class template requires that < operator semantics be defined
+  //     for the parameterized type <T>, but does not impose any restriction
+  //     on how that ordering operator is implemented.
   //
   // = DESCRIPTION
   //     This implementation of an unordered set uses a circular
   //     linked list with a dummy node.  This implementation does not
-  //     allow duplicates, but it maintains FIFO ordering of
-  //     insertions.
+  //     allow duplicates, but it maintains FIFO ordering of insertions.
 public:
   friend class ACE_Ordered_MultiSet_Iterator<T>;
 
@@ -1400,13 +1399,10 @@ public:
 
   // = Initialization and termination methods.
 
-  ACE_Array_Base (size_t size = 0,
-                  ACE_Allocator *alloc = 0);
+  ACE_Array_Base (size_t size = 0);
   // Dynamically create an uninitialized array.
 
-  ACE_Array_Base (size_t size,
-                  const T &default_value,
-                  ACE_Allocator *alloc = 0);
+  ACE_Array_Base (size_t size, const T &default_value);
   // Dynamically initialize the entire array to the <default_value>.
 
   ACE_Array_Base (const ACE_Array_Base<T> &s);
@@ -1414,7 +1410,7 @@ public:
   // copy of the contents of parameter <s>, i.e., *this == s will
   // return true.
 
-  void operator= (const ACE_Array_Base<T> &s);
+  ACE_Array_Base<T>& operator= (const ACE_Array_Base<T> &s);
   // Assignment operator performs an assignment by making an exact
   // copy of the contents of parameter <s>, i.e., *this == s will
   // return true.  Note that if the <max_size_> of <array_> is >= than
@@ -1481,9 +1477,6 @@ private:
   T *array_;
   // Pointer to the array's storage buffer.
 
-  ACE_Allocator *allocator_;
-  // Allocation strategy of the ACE_Array_Base.
-
   friend class ACE_Array_Iterator<T>;
 };
 
@@ -1498,6 +1491,7 @@ class ACE_Array : public ACE_Array_Base<T>
   // = DESCRIPTION
   //   This class extends ACE_Array_Base, it provides comparison
   //   operators.
+  //
 public:
   // Define a "trait"
   typedef T TYPE;
@@ -1508,13 +1502,10 @@ public:
 
   // = Initialization and termination methods.
 
-  ACE_Array (size_t size = 0,
-             ACE_Allocator* alloc = 0);
+  ACE_Array (size_t size = 0);
   // Dynamically create an uninitialized array.
 
-  ACE_Array (size_t size,
-             const T &default_value,
-             ACE_Allocator* alloc = 0);
+  ACE_Array (size_t size, const T &default_value);
   // Dynamically initialize the entire array to the <default_value>.
 
   ACE_Array (const ACE_Array<T> &s);
diff --git a/ace/Containers_T.i b/ace/Containers_T.i
index 9d59bf2ee0a..540910be8f6 100644
--- a/ace/Containers_T.i
+++ b/ace/Containers_T.i
@@ -308,10 +308,7 @@ ACE_Ordered_MultiSet<T>::size (void) const
 template <class T> ACE_INLINE
 ACE_Array_Base<T>::~ACE_Array_Base (void)
 {
-  ACE_DES_ARRAY_FREE (this->array_,
-                      this->max_size_,
-                      this->allocator_->free,
-                      T);
+   delete [] this->array_;
 }
 
 template <class T> ACE_INLINE size_t
@@ -347,17 +344,15 @@ ACE_Array_Base<T>::operator[] (size_t index) const
 // ****************************************************************
 
 template <class T> ACE_INLINE
-ACE_Array<T>::ACE_Array (size_t size,
-                         ACE_Allocator *alloc)
-  : ACE_Array_Base<T> (size, alloc)
+ACE_Array<T>::ACE_Array (size_t size)
+  : ACE_Array_Base<T>(size)
 {
 }
 
 template <class T> ACE_INLINE
 ACE_Array<T>::ACE_Array (size_t size,
-                         const T &default_value,
-                         ACE_Allocator *alloc)
-  : ACE_Array_Base<T> (size, default_value, alloc)
+                         const T &default_value)
+  : ACE_Array_Base<T> (size, default_value)
 {
 }
 
@@ -376,8 +371,11 @@ ACE_Array<T>::operator= (const ACE_Array<T> &s)
 {
   // Check for "self-assignment".
 
-  if (this != &s)
+  if (this == &s)
+    return;
+  else {
     this->ACE_Array_Base<T>::operator= (s);
+  }
 }
 
 // Compare this array with <s> for inequality.
@@ -456,9 +454,7 @@ template <class T> ACE_INLINE int
 ACE_DLList<T>::remove (ACE_DLList_Node *n)
 {
   int result = ACE_DLList_Base::remove (n);
-  ACE_DES_FREE (n,
-                this->allocator_->free,
-                ACE_DLList_Node);
+  ACE_DES_FREE (n, this->allocator_->free, ACE_DLList_Node);
   return result;
 }
 
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 44e935f62b2..961b3e1cafd 100644
--- a/ace/DLL.cpp
+++ b/ace/DLL.cpp
@@ -5,8 +5,8 @@
 #include "ace/DLL.h"
 
 ACE_RCSID(ace, DLL, "$Id$")
-
-// Default constructor. Also, by default, the object will be closed
+ 
+// Default constructor. Also, by default, the object will be closed 
 // before it is destroyed.
 
 ACE_DLL::ACE_DLL (int close_on_destruction)
@@ -17,7 +17,7 @@ ACE_DLL::ACE_DLL (int close_on_destruction)
 
 // If the library name and the opening mode are specified than on
 // object creation the library is implicitly opened.
-
+  
 ACE_DLL::ACE_DLL (ACE_DL_TYPE dll_name,
                   int open_mode,
                   int close_on_destruction)
@@ -26,7 +26,7 @@ ACE_DLL::ACE_DLL (ACE_DL_TYPE dll_name,
 {
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%s\n"),
+                "%s\n",
                 this->error ()));
 }
 
@@ -39,19 +39,19 @@ ACE_DLL::~ACE_DLL (void)
   // CLose the library only if it hasn't been already.
   this->close ();
 }
-
+  
 // This method opens the library based on the mode specified using the
 // ACE_SHLIB_HANDLE which is obtained on making the ACE_OS::dlopen call.
 // The default mode is:
-// RTLD_LAZY     Only references to data symbols are relocate when the
+// RTLD_LAZY     Only references to data symbols are relocate when the 
 //               object is first loaded.
 // The other modes include:
 //  RTLD_NOW     All necessary relocations are performed when the
 //               object is first loaded.
 //  RTLD_GLOBAL  The object symbols are made available for the
-//               relocation processing of any other object.
+//               relocation processing of any other object. 
 
-int
+int 
 ACE_DLL::open (ACE_DL_TYPE dll_filename,
                int open_mode,
                int close_on_destruction)
@@ -80,7 +80,7 @@ ACE_DLL::open (ACE_DL_TYPE dll_filename,
 
   if (this->handle_ == ACE_SHLIB_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%s\n"), this->error ()),
+                       "%s\n", this->error ()),
                       -1);
   return 0;
 }
@@ -96,7 +96,7 @@ ACE_DLL::symbol (ACE_DL_TYPE sym_name)
 // The library is closed using the ACE_SHLIB_HANDLE obejct.  i.e. The
 // shared object is now disassociated form the current process.
 
-int
+int 
 ACE_DLL::close (void)
 {
   int retval = 0;
@@ -121,7 +121,7 @@ char *
 ACE_DLL::error (void)
 {
   return ACE_OS::dlerror ();
-}
+} 
 
 // Return the handle to the user either temporarily or forever, thus
 // orphaning it. If 0 means the user wants the handle forever and if 1
@@ -139,22 +139,3 @@ ACE_DLL::get_handle (int become_owner)
   // Return the handle requested by the user.
   return this->handle_;
 }
-
-// Set the handle for the DLL. By default, the object will be closed
-// before it is destroyed.
-
-int
-ACE_DLL::set_handle (ACE_SHLIB_HANDLE handle,
-                     int close_on_destruction)
-{
-  // Close the handle in use before accepting the next one.
-  if (this->close () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%s\n"), this->error ()),
-                      -1);
-
-  this->handle_ = handle;
-  this->close_on_destruction_ = close_on_destruction;
-
-  return 0;
-}
diff --git a/ace/DLL.h b/ace/DLL.h
index 47799d3f2ea..8ce7503e7c2 100644
--- a/ace/DLL.h
+++ b/ace/DLL.h
@@ -87,9 +87,6 @@ public:
   // won't call <close> when it goes out of scope, even if
   // <close_on_destruction> is set.
 
-  int set_handle (ACE_SHLIB_HANDLE handle, int close_on_destruction = 1);
-  // Set the handle for the DLL object. By default, the <close> operation on the
-  // object will be invoked before it is destroyed.
 private:
   ACE_SHLIB_HANDLE handle_;
   // This is a handle to the DLL.
diff --git a/ace/Dump.cpp b/ace/Dump.cpp
index 6e578547bd3..886b04309cb 100644
--- a/ace/Dump.cpp
+++ b/ace/Dump.cpp
@@ -131,3 +131,12 @@ ACE_ODB::remove_object (const void *this_ptr)
 }
 
 ACE_ODB *ACE_ODB::instance_ = 0;
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+ACE_MT (template class ACE_Guard<ACE_Thread_Mutex>);
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+#pragma instantiate ACE_Guard<ACE_Thread_Mutex>
+#endif /* ACE_MT_SAFE */
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/Event_Handler.cpp b/ace/Event_Handler.cpp
index 35e5c69a4cd..fdad741b680 100644
--- a/ace/Event_Handler.cpp
+++ b/ace/Event_Handler.cpp
@@ -16,10 +16,9 @@ ACE_RCSID(ace, Event_Handler, "$Id$")
 // Implement conceptually abstract virtual functions in the base class
 // so derived classes don't have to implement unused ones.
 
-ACE_Event_Handler::ACE_Event_Handler (ACE_Reactor *r,
-                                      int p)
-  : priority_ (p),
-    reactor_ (r)
+ACE_Event_Handler::ACE_Event_Handler (void)
+  : priority_ (ACE_Event_Handler::LO_PRIORITY),
+    reactor_ (0)
 {
   // ACE_TRACE ("ACE_Event_Handler::ACE_Event_Handler");
 }
diff --git a/ace/Event_Handler.h b/ace/Event_Handler.h
index ece9adf8715..ff70ff3636c 100644
--- a/ace/Event_Handler.h
+++ b/ace/Event_Handler.h
@@ -147,12 +147,10 @@ public:
 #endif /* ACE_HAS_WINCE */
 
 protected:
-  ACE_Event_Handler (ACE_Reactor * = 0,
-                     int priority = ACE_Event_Handler::LO_PRIORITY);
+  ACE_Event_Handler (void);
   // Force ACE_Event_Handler to be an abstract base class.
 
 private:
-
   int priority_;
   // Priority of this Event_Handler.
 
diff --git a/ace/FIFO.cpp b/ace/FIFO.cpp
index 7301dae0df9..840ddb8d7bc 100644
--- a/ace/FIFO.cpp
+++ b/ace/FIFO.cpp
@@ -31,28 +31,22 @@ ACE_FIFO::open (const char *r, int flags, int perms,
   ACE_TRACE ("ACE_FIFO::open");
   ACE_OS::strncpy (this->rendezvous_, r, MAXPATHLEN);
 
-#if defined (ACE_PSOS_DIAB_MIPS)
-  if ( ACE_OS::mkfifo (this->rendezvous_, perms) == -1
+  if ((flags & O_CREAT) != 0 
+      && ACE_OS::mkfifo (this->rendezvous_, perms) == -1 
       && !(errno == EEXIST))
     return -1;
-#else
-  if ((flags & O_CREAT) != 0
-      && ACE_OS::mkfifo (this->rendezvous_, perms) == -1
-      && !(errno == EEXIST))
-    return -1;
-#endif
 
   this->set_handle (ACE_OS::open (this->rendezvous_, flags, 0, sa));
   return this->get_handle () == ACE_INVALID_HANDLE ? -1 : 0;
 }
 
-ACE_FIFO::ACE_FIFO (const char *fifo_name,
-		    int flags,
+ACE_FIFO::ACE_FIFO (const char *fifo_name, 
+		    int flags, 
 		    int perms,
                     LPSECURITY_ATTRIBUTES sa)
 {
   ACE_TRACE ("ACE_FIFO::ACE_FIFO");
-  if (this->open (fifo_name, flags, perms, sa) == -1)
+  if (this->open (fifo_name, flags, perms, sa) == -1) 
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_FIFO")));
 }
 
@@ -74,3 +68,4 @@ ACE_FIFO::close (void)
     }
  return result;
 }
+
diff --git a/ace/FILE.cpp b/ace/FILE.cpp
index c667526b73a..ee3575c1292 100644
--- a/ace/FILE.cpp
+++ b/ace/FILE.cpp
@@ -22,7 +22,7 @@ ACE_FILE::dump (void) const
   ACE_IO_SAP::dump ();
 }
 
-// This is the do-nothing constructor. 
+/* This is the do-nothing constructor. */
 
 ACE_FILE::ACE_FILE (void)
 {
diff --git a/ace/FILE_Connector.h b/ace/FILE_Connector.h
index 6d8eb9b1333..f00195b1ccb 100644
--- a/ace/FILE_Connector.h
+++ b/ace/FILE_Connector.h
@@ -38,7 +38,7 @@ public:
                       const ACE_Addr &local_sap = ACE_Addr::sap_any,
                       int reuse_addr = 0,
                       int flags = O_RDWR | O_CREAT,
-                      int perms = ACE_DEFAULT_FILE_PERMS);
+                      int perms = 0);
   // Actively ``connect'' and produce a <new_io> <ACE_FILE_IO> object
   // if things go well.  The <remote_sap> is the file that we are
   // trying to create/open.  If it's the default value of
@@ -60,7 +60,7 @@ public:
                const ACE_Addr &local_sap = ACE_Addr::sap_any,
                int reuse_addr = 0,
                int flags = O_RDWR | O_CREAT,
-               int perms = ACE_DEFAULT_FILE_PERMS);
+               int perms = 0);
   // Actively ``connect'' and produce a <new_io> <ACE_FILE_IO> object
   // if things go well.  The <remote_sap> is the file that we are
   // trying to create/open.  If it's the default value of
diff --git a/ace/FILE_IO.cpp b/ace/FILE_IO.cpp
index 3486629e491..594f59d6ca1 100644
--- a/ace/FILE_IO.cpp
+++ b/ace/FILE_IO.cpp
@@ -55,9 +55,7 @@ ACE_FILE_IO::send (size_t n, ...) const
       iovp[i].iov_len  = va_arg (argp, int);
     }
 
-  ssize_t result = ACE_OS::writev (this->get_handle (), 
-                                   iovp,
-                                   total_tuples);
+  ssize_t result = ACE_OS::writev (this->get_handle (), iovp, total_tuples);
 #if !defined (ACE_HAS_ALLOCA)
   delete [] iovp;
 #endif /* !defined (ACE_HAS_ALLOCA) */
@@ -92,9 +90,7 @@ ACE_FILE_IO::recv (size_t n, ...) const
       iovp[i].iov_len  = va_arg (argp, int);
     }
 
-  ssize_t result = ACE_OS::readv (this->get_handle (),
-                                  iovp, 
-                                  total_tuples);
+  ssize_t result = ACE_OS::readv (this->get_handle (), iovp, total_tuples);
 #if !defined (ACE_HAS_ALLOCA)
   delete [] iovp;
 #endif /* !defined (ACE_HAS_ALLOCA) */
@@ -102,29 +98,4 @@ ACE_FILE_IO::recv (size_t n, ...) const
   return result;
 }
 
-// Allows a client to read from a file without having to provide a
-// buffer to read.  This method determines how much data is in the
-// file, allocates a buffer of this size, reads in the data, and
-// returns the number of bytes read.
-
-ssize_t
-ACE_FILE_IO::recvv (iovec *io_vec)
-{
-  ACE_TRACE ("ACE_FILE_IO::recvv");
-
-  io_vec->iov_base = 0;
-  long length = ACE_OS::filesize (this->get_handle ());
-
-  if (length > 0)
-    {
-      ACE_NEW_RETURN (io_vec->iov_base,
-                      char[length],
-                      -1);
-      io_vec->iov_len = this->recv_n (io_vec->iov_base,
-                                      length);
-      return io_vec->iov_len;
-    }
-  else
-    return length;
-}
 
diff --git a/ace/FILE_IO.h b/ace/FILE_IO.h
index 808bb76f730..37bd120df2e 100644
--- a/ace/FILE_IO.h
+++ b/ace/FILE_IO.h
@@ -92,37 +92,12 @@ public:
   // *total* number of trailing arguments, *not* a couple of the
   // number of tuple pairs!
 
-  ssize_t send (const void *buf,
-                size_t n,
-                ACE_OVERLAPPED *overlapped) const;
+  ssize_t send (const void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
   // Send <n> bytes via Win32 WriteFile using overlapped I/O.
 
-  ssize_t recv (void *buf,
-                size_t n,
-                ACE_OVERLAPPED *overlapped) const;
+  ssize_t recv (void *buf, size_t n, ACE_OVERLAPPED *overlapped) const;
   // Recv <n> bytes via Win32 ReadFile using overlapped I/O.
 
-  ssize_t sendv (const iovec iov[],
-                 size_t n) const;
-  // Send an <iovec> of size <n> to the file.
-
-  ssize_t recvv (iovec *io_vec);
-  // Allows a client to read from a file without having to provide a
-  // buffer to read.  This method determines how much data is in the
-  // file, allocates a buffer of this size, reads in the data, and
-  // returns the number of bytes read.  The caller is responsible for
-  // deleting the member in the <iov_base> field of <io_vec> using
-  // delete [] io_vec->iov_base.
-
-  ssize_t sendv_n (const iovec iov[],
-                   size_t n) const;
-  // Send an <iovec> of size <n> to the file.  Will block until all
-  // bytes are sent or an error occurs.
-
-  ssize_t recvv_n (iovec iov[],
-                   size_t n) const;
-  // Receive an <iovec> of size <n> to the file.
-
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/FILE_IO.i b/ace/FILE_IO.i
index ab5956c468c..36cc4fd01d6 100644
--- a/ace/FILE_IO.i
+++ b/ace/FILE_IO.i
@@ -3,37 +3,6 @@
 
 // FILE_IO.i
 
-ASYS_INLINE ssize_t
-ACE_FILE_IO::sendv_n (const iovec iov[], size_t n) const
-{
-  ACE_TRACE ("ACE_FILE_IO::sendv_n");
-  return ACE::writev_n (this->get_handle (),
-                        iov,
-                        n);
-}
-
-// Recv an n byte message from the file.
-
-ASYS_INLINE ssize_t
-ACE_FILE_IO::recvv_n (iovec iov[], size_t n) const
-{
-  ACE_TRACE ("ACE_FILE_IO::recvv_n");
-  // @@ Carlos, can you please update this to call the
-  // new ACE::recvv_n() method that you write?
-  return ACE_OS::readv (this->get_handle (),
-                        iov,
-                        n);
-}
-
-// Send an <iovec> of size <n> to the file.
-
-ASYS_INLINE ssize_t
-ACE_FILE_IO::sendv (const iovec iov[], size_t n) const
-{
-  ACE_TRACE ("ACE_FILE_IO::sendv");
-  return ACE_OS::writev (this->get_handle (), iov, n);
-}
-
 // Send exactly N bytes from BUF to this file.  Keeping trying until
 // this many bytes are sent.
 
@@ -129,5 +98,4 @@ ACE_FILE_IO::recv (void *buf, size_t n,
   return ACE_OS::read (this->get_handle (), (char *) buf, n,
 		       overlapped);
 }
-
 #endif /* ACE_HAS_STREAM_PIPES */
diff --git a/ace/Filecache.cpp b/ace/Filecache.cpp
index edf8d04eabe..035e14eb932 100644
--- a/ace/Filecache.cpp
+++ b/ace/Filecache.cpp
@@ -46,14 +46,13 @@ ACE_Filecache_Handle::init (void)
 }
 
 ACE_Filecache_Handle::ACE_Filecache_Handle (void)
-  : file_ (0), handle_ (0), mapit_ (0)
 {
   this->init ();
 }
 
 ACE_Filecache_Handle::ACE_Filecache_Handle (const char *filename,
                                             ACE_Filecache_Flag mapit)
-  : file_ (0), handle_ (0), mapit_ (mapit)
+  : mapit_ (mapit)
 {
   this->init ();
   // Fetch the file from the Virtual_Filesystem let the
@@ -67,7 +66,7 @@ ACE_Filecache_Handle::ACE_Filecache_Handle (const char *filename,
 ACE_Filecache_Handle::ACE_Filecache_Handle (const char *filename,
                                             int size,
                                             ACE_Filecache_Flag mapit)
-  : file_ (0), handle_ (0), mapit_ (mapit)
+  : mapit_ (mapit)
 {
   this->init ();
   // Since this is being opened for a write, simply create a new
@@ -136,7 +135,6 @@ ACE_Filecache_Handle::size (void) const
 #define ACE_Filecache_Hash_Entry \
         ACE_Hash_Map_Entry<const char *, ACE_Filecache_Object *>
 
-/* template<> */
 ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const char *const &ext_id,
                                               ACE_Filecache_Object *const &int_id,
                                               ACE_Filecache_Hash_Entry *next,
@@ -148,7 +146,6 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (const char *const &ext_id,
 {
 }
 
-/* template<> */
 ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
                                               ACE_Filecache_Hash_Entry *prev)
   : ext_id_ (0),
@@ -157,7 +154,6 @@ ACE_Filecache_Hash_Entry::ACE_Hash_Map_Entry (ACE_Filecache_Hash_Entry *next,
 {
 }
 
-/* template<> */
 ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 {
   ACE_OS::free ((void *) ext_id_);
@@ -166,13 +162,13 @@ ACE_Filecache_Hash_Entry::~ACE_Hash_Map_Entry (void)
 // We need these template specializations since KEY is defined as a
 // char*, which doesn't have a hash() or equal() method defined on it.
 
-/* template<> */ long unsigned int
+long unsigned int
 ACE_Filecache_Hash::hash (const char *const &ext_id)
 {
   return ACE::hash_pjw (ext_id);
 }
 
-/* template<> */ int
+int
 ACE_Filecache_Hash::equal (const char *const &id1, const char *const &id2)
 {
   return ACE_OS::strcmp (id1, id2) == 0;
@@ -421,16 +417,7 @@ ACE_Filecache_Object::init (void)
 }
 
 ACE_Filecache_Object::ACE_Filecache_Object (void)
-  : tempname_ (0),
-    mmap_ (),
-    handle_ (0),
-    // stat_ (),
-    size_ (0),
-    action_ (0),
-    error_ (0),
-    stale_ (0),
-    // sa_ (),
-    junklock_ (),
+  : stale_ (0),
     lock_ (junklock_)
 {
   this->init ();
@@ -440,16 +427,8 @@ ACE_Filecache_Object::ACE_Filecache_Object (const char *filename,
                                             ACE_SYNCH_RW_MUTEX &lock,
                                             LPSECURITY_ATTRIBUTES sa,
                                             int mapit)
-  : tempname_ (0),
-    mmap_ (),
-    handle_ (0),
-    // stat_ (),
-    size_ (0),
-    action_ (0),
-    error_ (0),
-    stale_ (0),
+  : stale_ (0),
     sa_ (sa),
-    junklock_ (),
     lock_ (lock)
 {
   this->init ();
@@ -736,3 +715,4 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Filecache_Objec
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, ACE_Filecache_Object *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
 #endif /* ACE_HAS_TEMPLATE_SPECIALIZATION */
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/ace/FlReactor.cpp b/ace/FlReactor.cpp
deleted file mode 100644
index 6759770eee4..00000000000
--- a/ace/FlReactor.cpp
+++ /dev/null
@@ -1,309 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_DLL
-#include "ace/FlReactor.h"
-#include "ace/Synch_T.h"
-
-ACE_RCSID(ace, FlReactor, "$Id$")
-
-#if defined (ACE_HAS_FL)
-
-#include <FL/Fl.h>
-
-ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
-
-// Must be called with lock held
-ACE_FlReactor::ACE_FlReactor (size_t size,
-			      int restart,
-			      ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // FlReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the FlReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the FlReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the FlReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_FlReactor::~ACE_FlReactor (void)
-{
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Fl functions to wait for an event, not <select>
-
-int
-ACE_FlReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-					 ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_FlReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-
-      // Check to make sure our handle's are all usable.
-      ACE_Select_Reactor_Handle_Set temp_set = handle_set;
-
-      ACE_Time_Value zero = ACE_Time_Value::zero;
-      if (ACE_OS::select (width,
-                          temp_set.rd_mask_,
-                          temp_set.wr_mask_,
-                          temp_set.ex_mask_,
-                          &zero) == -1)
-        return -1; // Bad file arguments...
-
-      // Instead of waiting using <select>, just use the Fl mechanism
-      // to wait for one or more events...
-
-      // Wait for something to happen.
-      double t = 0;
-      if (max_wait_time != 0)
-        t = max_wait_time->sec () + max_wait_time->usec () / 1000000.0F;
-
-      while (t > 0) {
-        t = Fl::wait (t);
-      }
-
-      // Reset the width, in case it changed during the upcalls.
-      width = this->handler_rep_.max_handlep1 ();
-
-      // Now actually read the result needed by the <Select_Reactor>
-      // using <select>.
-      zero = ACE_Time_Value::zero;
-      nfound = ACE_OS::select (width,
-                               handle_set.rd_mask_,
-                               handle_set.wr_mask_,
-                               handle_set.ex_mask_,
-                               &zero);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_FlReactor::fl_io_proc (int fd, void* reactor)
-{
-  ACE_FlReactor *self = ACE_static_cast(ACE_FlReactor *, reactor);
-  ACE_HANDLE handle = (ACE_HANDLE)fd; //ACE_reinterpret_cast(ACE_HANDLE, fd);
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (fd + 1,
-			       wait_set.rd_mask_,
-			       wait_set.wr_mask_,
-			       wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-	dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-	dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-	dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-void
-ACE_FlReactor::fl_timeout_proc (void* reactor)
-{
-  ACE_FlReactor *self = ACE_static_cast (ACE_FlReactor *, reactor);
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-
-int
-ACE_FlReactor::register_handler_i (ACE_HANDLE handle,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, FL_WRITE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, FL_EXCEPT);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, FL_READ);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
-    {
-      ACE_SET_BITS (condition, FL_WRITE); // connected, you may write
-      ACE_SET_BITS (condition, FL_READ);  // connected, you have data/err
-    }
-
-  if (condition != 0)
-    {
-      Fl::add_fd ((int)handle, // ACE_reinterpret_cast(int,handle),
-                  ACE_FlReactor::fl_io_proc,
-                  this);
-    }
-  return 0;
-}
-
-int
-ACE_FlReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_FlReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  Fl::remove_fd ((int)handle); // ACE_reinterpret_cast(int,handle));
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-int
-ACE_FlReactor::remove_handler_i (const ACE_Handle_Set &handles,
-				 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-					       mask);
-}
-
-// The following functions ensure that there is an Fl timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_FlReactor::reset_timeout (void)
-{
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time != 0)
-    {
-      float t = max_wait_time->sec ()
-        + max_wait_time->usec () / 1000000.0F;
-      Fl::add_timeout (t, ACE_FlReactor::fl_timeout_proc, this);
-    }
-}
-
-long
-ACE_FlReactor::schedule_timer (ACE_Event_Handler *handler,
-			       const void *arg,
-			       const ACE_Time_Value &delta_time,
-			       const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_FlReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (handler,
-                                                    arg,
-                                                    delta_time,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (ACE_Event_Handler *handler,
-			     int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-					dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_FlReactor::cancel_timer (long timer_id,
-			     const void **arg,
-			     int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_FlReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-					arg,
-					dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-#endif /* ACE_HAS_FL */
diff --git a/ace/FlReactor.h b/ace/FlReactor.h
deleted file mode 100644
index 93519596657..00000000000
--- a/ace/FlReactor.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   ace
-//
-// = FILENAME
-//   FlReactor.h
-//
-// = AUTHOR
-//   Carlos O'Ryan <coryan@cs.wustl.edu>
-//
-//   Based in part in the ACE_XtReactor implementation by:
-//
-//    Eric C. Newton's <ecn@clark.net>,
-//    Kirill Rybaltchenko <Kirill.Rybaltchenko@cern.ch>, and
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_FLREACTOR_H
-#define ACE_FLREACTOR_H
-
-#include "ace/Select_Reactor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_FL)
-
-class ACE_Export ACE_FlReactor : public ACE_Select_Reactor
-{
-  // = TITLE
-  //   A Reactor implementation that uses the Fast-Light (FL) toolkit
-  //   for event demultiplexing.  This will let us integrate the FL
-  //   toolkit with ACE and/or TAO.
-  //
-  // = DESCRIPTION
-  //   As many other GUI toolkits FL supports a minimal set of
-  //   callbacks to handle event demultiplexing, namely simple methods
-  //   to add file descriptors to the event demuxing set or timeout
-  //   events.  This class adapts this simple mechanisms so they are
-  //   compatible with ACE's Reactor.
-  //   
-
-public:
-  // = Initialization and termination methods.
-  ACE_FlReactor (size_t size = DEFAULT_SIZE,
-                 int restart = 0,
-                 ACE_Sig_Handler * = 0);
-  virtual ~ACE_FlReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *handler,
-                               const void *arg,
-                               const ACE_Time_Value &delta_time,
-                               const ACE_Time_Value &interval);
-
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Fl.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-  // Register a single <handler>.
-
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-  // Register a set of <handlers>.
-
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-  // Remove the <handler> associated with this <handle>.
-
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-  // Remove a set of <handles>.
-
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-  // Wait for events to occur.
-
-private:
-  void reset_timeout (void);
-
-  // = Integrate with the FL callback function mechanism.
-  static void fl_io_proc (int fd, void*);
-  static void fl_timeout_proc (void*);
-
-  ACE_FlReactor (const ACE_FlReactor &);
-  ACE_FlReactor &operator = (const ACE_FlReactor &);
-  // Deny access since member-wise won't work...
-};
-
-#if defined(__ACE_INLINE__)
-#include "ace/FlReactor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_FL */
-
-#endif /* ACE_FLREACTOR_H */
diff --git a/ace/FlReactor.i b/ace/FlReactor.i
deleted file mode 100644
index 74e88caa0c5..00000000000
--- a/ace/FlReactor.i
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-
diff --git a/ace/Future.h b/ace/Future.h
index e512f627f26..36d65b46cb0 100644
--- a/ace/Future.h
+++ b/ace/Future.h
@@ -73,8 +73,7 @@ private:
 
   int get (T &value,
            ACE_Time_Value *tv);
-  // Wait up to <tv> time to get the <value>.  Note that <tv> must be
-  // specified in absolute time rather than relative time.
+  // Wait up to <tv> time to get the <value>.
 
   operator T ();
   // Type conversion. will block forever until the result is
@@ -161,8 +160,7 @@ public:
 
   int get (T &value,
            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.
+  // Wait up to <tv> time to get the <value>.
 
   operator T ();
   // Type conversion, which obtains the result of the asynchronous
diff --git a/ace/Get_Opt.cpp b/ace/Get_Opt.cpp
index ac21a57ad8f..1681010c0fc 100644
--- a/ace/Get_Opt.cpp
+++ b/ace/Get_Opt.cpp
@@ -93,7 +93,7 @@ ACE_Get_Opt::operator () (void)
       if (this->optind >= this->argc_ 
 	  || *(this->nextchar_ = this->argv_[this->optind]) != '-') 
 	{
-	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
+	  this->nextchar_ = ASYS_TEXT ("");
 	  return EOF;
 	}
 
@@ -102,7 +102,7 @@ ACE_Get_Opt::operator () (void)
 	{	
 	  // Found "--".
 	  ++this->optind;
-	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
+	  this->nextchar_ = ASYS_TEXT ("");
 	  return EOF;
 	}
     }			
@@ -122,10 +122,8 @@ ACE_Get_Opt::operator () (void)
 	++this->optind;
 
       if (this->opterr && *this->optstring_ != ':')
-	ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("%s: illegal option -- %c\n"), 
-		    this->argv_[0],
-                    opt));
+	ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%s: illegal option -- %c\n"), 
+		    this->argv_[0], opt));
       return '?';
     }
 
@@ -142,7 +140,7 @@ ACE_Get_Opt::operator () (void)
       else if (this->argc_ <= ++this->optind) 
 	{ 
 	  // No arg.
-	  this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
+	  this->nextchar_ = ASYS_TEXT ("");
 
 	  if (*this->optstring_ == ':')
 	    return ':';
@@ -155,7 +153,7 @@ ACE_Get_Opt::operator () (void)
       else // White space.
 	this->optarg = this->argv_[this->optind];
 
-      this->nextchar_ = ACE_const_cast (char *, ASYS_TEXT (""));
+      this->nextchar_ = ASYS_TEXT ("");
       ++this->optind;
     }
 
diff --git a/ace/Handle_Set.h b/ace/Handle_Set.h
index 197518f2673..90515cdc298 100644
--- a/ace/Handle_Set.h
+++ b/ace/Handle_Set.h
@@ -76,7 +76,7 @@ public:
   // <size_> == 0.
 
 #if defined (ACE_HAS_BIG_FD_SET)
-  ACE_Handle_Set & operator= (const ACE_Handle_Set &);
+  void operator= (const ACE_Handle_Set &);
   // Assignment operator optimizes for cases where <size_> == 0.
 #endif /* ACE_HAS_BIG_FD_SET */
 
diff --git a/ace/Handle_Set.i b/ace/Handle_Set.i
index 1326fa4fa8d..cc8808b964c 100644
--- a/ace/Handle_Set.i
+++ b/ace/Handle_Set.i
@@ -28,7 +28,7 @@ ACE_Handle_Set::reset (void)
 }
 
 #if defined (ACE_HAS_BIG_FD_SET)
-ACE_INLINE ACE_Handle_Set &
+ACE_INLINE void 
 ACE_Handle_Set::operator= (const ACE_Handle_Set &rhs)
 {
   ACE_TRACE ("ACE_Handle_Set::reset");
@@ -42,8 +42,6 @@ ACE_Handle_Set::operator= (const ACE_Handle_Set &rhs)
     }
   else
     this->reset ();
-
-  return *this;
 }
 #endif /* ACE_HAS_BIG_FD_SET */
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp b/ace/Hash_Bucket_T.cpp
index f498ce12681..41e76096122 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.cpp
+++ b/ace/Hash_Bucket_T.cpp
@@ -1,19 +1,21 @@
 // $Id$
 
-#ifndef JAWS_HASH_BUCKET_T_CPP
-#define JAWS_HASH_BUCKET_T_CPP
+#ifndef ACE_HASH_BUCKET_T_CPP
+#define ACE_HASH_BUCKET_T_CPP
 
-#include "JAWS/Hash_Bucket_T.h"
+#include "ace_Hash_Bucket_T.h"
+
+ACE_RCSID(ace, Hash_Bucket_T, "$Id$")
 
 // -----------------
 // Hash_Bucket_Item
 // -----------------
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>
-::JAWS_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev)
+ACE_Hash_Bucket_Item<EXT_ID, INT_ID>
+::ACE_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev)
   : ext_id_ (ext_id),
     int_id_ (int_id),
     next_ (next),
@@ -22,16 +24,16 @@ JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>
 }
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>
-::JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev)
+ACE_Hash_Bucket_Item<EXT_ID, INT_ID>
+::ACE_Hash_Bucket_Item (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev)
   : next_ (next),
     prev_ (prev)
 {
 }
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>::~JAWS_Hash_Bucket_Item (void)
+ACE_Hash_Bucket_Item<EXT_ID, INT_ID>::~ACE_Hash_Bucket_Item (void)
 {
   this->next_ = 0;
   this->prev_ = 0;
@@ -43,8 +45,8 @@ JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>::~JAWS_Hash_Bucket_Item (void)
 // ---------------------
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
-JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc)
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
+ACE_Hash_Bucket_DLCStack (ACE_Allocator *alloc)
   : allocator_ (alloc),
     head_ (0),
     tail_ (0)
@@ -54,29 +56,29 @@ JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc)
 }
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
-~JAWS_Hash_Bucket_DLCStack (void)
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
+~ACE_Hash_Bucket_DLCStack (void)
 {
   this->reset ();
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
 is_empty (void) const
 {
   return this->head_ == 0 && this->tail_ == 0;
 }
 
-template <class EXT_ID, class INT_ID> JAWS_HASH_BUCKET_ITEM *
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
+template <class EXT_ID, class INT_ID> ACE_HASH_BUCKET_ITEM *
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::
 push (const EXT_ID &ext_id, const INT_ID &int_id)
 {
-  size_t malloc_size = sizeof (JAWS_HASH_BUCKET_ITEM);
-  JAWS_HASH_BUCKET_ITEM *item;
+  size_t malloc_size = sizeof (ACE_HASH_BUCKET_ITEM);
+  ACE_HASH_BUCKET_ITEM *item;
   ACE_NEW_MALLOC_RETURN (item,
-                         (JAWS_HASH_BUCKET_ITEM *)
+                         (ACE_HASH_BUCKET_ITEM *)
                          this->allocator_->malloc (malloc_size),
-                         JAWS_HASH_BUCKET_ITEM (ext_id, int_id), 0);
+                         ACE_HASH_BUCKET_ITEM (ext_id, int_id), 0);
 
   if (item != 0)
     {
@@ -94,16 +96,17 @@ push (const EXT_ID &ext_id, const INT_ID &int_id)
           this->head_->prev_ = item;
           this->tail_->next_ = item;
           this->head_ = item;
+          this->tail_ = item;
         }
     }
 
   return item;
 }
 
-template <class EXT_ID, class INT_ID> JAWS_HASH_BUCKET_ITEM *
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void)
+template <class EXT_ID, class INT_ID> ACE_HASH_BUCKET_ITEM *
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void)
 {
-  JAWS_HASH_BUCKET_ITEM *item = 0;
+  ACE_HASH_BUCKET_ITEM *item = 0;
 
   if (! this->is_empty ())
     {
@@ -126,16 +129,16 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::pop (void)
 }
 
 template <class EXT_ID, class INT_ID> void
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset (void)
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::reset (void)
 {
-  JAWS_HASH_BUCKET_ITEM *item = 0;
+  ACE_HASH_BUCKET_ITEM *item = 0;
 
   while ((item = this->pop ()) != 0)
     this->remove (item);
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (JAWS_HASH_BUCKET_ITEM *item)
+ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (ACE_HASH_BUCKET_ITEM *item)
 {
   int result = 0;
 
@@ -143,12 +146,8 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (JAWS_HASH_BUCKET_ITEM *item)
     {
       if (item->next_ != 0 && item->prev_ != 0)
         {
-          if (item->next_ != item)
+          if (item->next_ != item->prev_)
             {
-              if (this->head_ == item)
-                this->head_ = item->next_;
-              if (this->tail_ == item)
-                this->tail_ = item->prev_;
               item->next_->prev_ = item->prev_;
               item->prev_->next_ = item->next_;
             }
@@ -163,7 +162,7 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (JAWS_HASH_BUCKET_ITEM *item)
       if (item->next_ == 0 && item->prev_ == 0)
         {
           ACE_DES_FREE_TEMPLATE2 (item, this->allocator_->free,
-                                  JAWS_Hash_Bucket_Item, EXT_ID, INT_ID);
+                                  ACE_Hash_Bucket_Item, EXT_ID, INT_ID);
         }
       else
         result = -1;
@@ -178,8 +177,8 @@ JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>::remove (JAWS_HASH_BUCKET_ITEM *item)
 // ------------------------------
 
 template <class EXT_ID, class INT_ID>
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
-JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
+ACE_Hash_Bucket_DLCStack_Iterator (const ACE_HASH_BUCKET_DLCSTACK &dlcstack)
   : dlcstack_ (dlcstack),
     next_ (0),
     prev_ (0),
@@ -188,7 +187,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void)
 {
   int result = 0;
 
@@ -204,13 +203,13 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::first (void)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last (void)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::last (void)
 {
   return this->first ();
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void)
 {
   int result = 1;
 
@@ -231,7 +230,7 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::advance (void)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void)
 {
   int result = 1;
 
@@ -252,8 +251,8 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::revert (void)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
-next (JAWS_HASH_BUCKET_ITEM *&item)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
+next (ACE_HASH_BUCKET_ITEM *&item)
 {
   if (this->next_ == 0)
     this->first ();
@@ -263,16 +262,16 @@ next (JAWS_HASH_BUCKET_ITEM *&item)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
-next (JAWS_HASH_BUCKET_ITEM *&item) const
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
+next (ACE_HASH_BUCKET_ITEM *&item) const
 {
   item = this->next_;
   return ! this->done ();
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
-prev (JAWS_HASH_BUCKET_ITEM *&item)
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
+prev (ACE_HASH_BUCKET_ITEM *&item)
 {
   if (this->prev_ == 0)
     this->last ();
@@ -282,15 +281,15 @@ prev (JAWS_HASH_BUCKET_ITEM *&item)
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
-prev (JAWS_HASH_BUCKET_ITEM *&item) const
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::
+prev (ACE_HASH_BUCKET_ITEM *&item) const
 {
   item = this->prev_;
   return ! this->done ();
 }
 
 template <class EXT_ID, class INT_ID> int
-JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const
+ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const
 {
   return this->done_;
 }
@@ -301,8 +300,8 @@ JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>::done (void) const
 // --------------------
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC>
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
-::JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc)
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
+::ACE_Hash_Bucket_Manager (ACE_Allocator *alloc = 0)
   : dlcstack_ (alloc)
 {
   if (alloc == 0)
@@ -310,7 +309,7 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc)
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc)
 {
   this->dlcstack_.allocator_ = alloc;
   if (alloc == 0)
@@ -320,23 +319,23 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::open (ACE_Allocator *alloc)
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC>
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~JAWS_Hash_Bucket_Manager (void)
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::~ACE_Hash_Bucket_Manager (void)
 {
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close (void)
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::close (void)
 {
   this->dlcstack_.reset ();
   return 0;
 }
 
-template <class EXT_ID, class INT_ID, class EQ_FUNC> JAWS_HASH_BUCKET_ITEM *
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
+template <class EXT_ID, class INT_ID, class EQ_FUNC> ACE_HASH_BUCKET_ITEM *
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
 ::find_i (const EXT_ID &ext_id) const
 {
-  JAWS_HASH_BUCKET_DLCSTACK_ITERATOR iter (this->dlcstack_);
-  JAWS_HASH_BUCKET_ITEM *item = 0;
+  ACE_HASH_BUCKET_DLCSTACK_ITERATOR iter (this->dlcstack_);
+  ACE_HASH_BUCKET_ITEM *item = 0;
 
   if (iter.first ())
     while (!iter.done ())
@@ -351,11 +350,11 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id,
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id,
                                                       INT_ID &int_id) const
 {
   int result = -1;
-  JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
+  ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
 
   if (item)
     {
@@ -367,7 +366,7 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::find (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
 ::find (const EXT_ID &ext_id) const
 {
   INT_ID dummy_id;
@@ -375,7 +374,7 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id,
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id,
                                                       const INT_ID &int_id)
 {
   int result = 0;
@@ -394,7 +393,7 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::bind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id,
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id,
                                                          INT_ID &int_id)
 {
   int result = 0;
@@ -413,13 +412,13 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::trybind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id,
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id,
                                                         const INT_ID &int_id,
                                                         EXT_ID &old_ext_id,
                                                         INT_ID &old_int_id)
 {
   int result = 0;
-  JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
+  ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
 
   if (item)
     {
@@ -436,11 +435,11 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::rebind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id,
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id,
                                                         INT_ID &int_id)
 {
   int result = -1;
-  JAWS_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
+  ACE_HASH_BUCKET_ITEM *item = this->find_i (ext_id);
 
   if (item)
     {
@@ -453,10 +452,10 @@ JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id,
 }
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC> int
-JAWS_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id)
+ACE_Hash_Bucket_Manager<EXT_ID,INT_ID,EQ_FUNC>::unbind (const EXT_ID &ext_id)
 {
   INT_ID dummy_id;
   return this->unbind (ext_id, dummy_id);
 }
 
-#endif /* JAWS_HASH_BUCKET_T_CPP */
+#endif /* ACE_HASH_BUCKET_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h b/ace/Hash_Bucket_T.h
index 9a394a2b42d..c493f081cea 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Hash_Bucket_T.h
+++ b/ace/Hash_Bucket_T.h
@@ -2,15 +2,15 @@
 // Hey Emacs!  This is a C++ file!
 // $Id$
 
-#ifndef JAWS_HASH_BUCKET_T_H
-#define JAWS_HASH_BUCKET_T_H
+#ifndef ACE_HASH_BUCKET_T_H
+#define ACE_HASH_BUCKET_T_H
 
 #include "ace/Containers.h"
 
-#define JAWS_HASH_BUCKET_ITEM JAWS_Hash_Bucket_Item<EXT_ID, INT_ID>
-#define JAWS_HASH_BUCKET_DLCSTACK JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID>
-#define JAWS_HASH_BUCKET_DLCSTACK_ITERATOR \
-        JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>
+#define ACE_HASH_BUCKET_ITEM ACE_Hash_Bucket_Item<EXT_ID, INT_ID>
+#define ACE_HASH_BUCKET_DLCSTACK ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID>
+#define ACE_HASH_BUCKET_DLCSTACK_ITERATOR \
+        ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>
 
 
 // Why Hash_Bucket?
@@ -22,16 +22,16 @@
 // exclusion.
 
 template <class EXT_ID, class INT_ID>
-class JAWS_Hash_Bucket_Item
+class ACE_Hash_Bucket_Item
 {
 public:
-  JAWS_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0);
-  JAWS_Hash_Bucket_Item (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0,
-                        JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0);
+  ACE_Hash_Bucket_Item (const EXT_ID &ext_id, const INT_ID &int_id,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0);
+  ACE_Hash_Bucket_Item (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next = 0,
+                        ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev = 0);
 
-  ~JAWS_Hash_Bucket_Item (void);
+  ~ACE_Hash_Bucket_Item (void);
   // Destructor.
 
   EXT_ID ext_id_;
@@ -40,51 +40,51 @@ public:
   INT_ID int_id_;
   // The contents of the entry itself.
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *next_;
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *next_;
   // Pointer to the next item in the bucket of overflow nodes.
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *prev_;
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *prev_;
   // Pointer to the prev item in the bucket of overflow nodes.
 
 };
 
 
-template <class EXT_ID, class INT_ID> class JAWS_Hash_Bucket_DLCStack_Iterator;
+template <class EXT_ID, class INT_ID> class ACE_Hash_Bucket_DLCStack_Iterator;
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC>
-class JAWS_Hash_Bucket_Manager;
+class ACE_Hash_Bucket_Manager;
 
 template <class EXT_ID, class INT_ID>
-class JAWS_Hash_Bucket_DLCStack
+class ACE_Hash_Bucket_DLCStack
 // Create a doubly linked circular stack to be managed by the
 // Hash_Bucket_Manager
 {
-  friend JAWS_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>;
+  friend ACE_Hash_Bucket_DLCStack_Iterator<EXT_ID, INT_ID>;
 
 public:
 
-  JAWS_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0);
-  ~JAWS_Hash_Bucket_DLCStack (void);
+  ACE_Hash_Bucket_DLCStack (ACE_Allocator *alloc = 0);
+  ~ACE_Hash_Bucket_DLCStack (void);
 
   int is_empty (void) const;
   // Returns 1 if the container is empty, otherwise returns 0.
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id,
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *push (const EXT_ID &ext_id,
                                               const INT_ID &int_id);
   // Adds <new_item> to the head of the list.
   // Returns the new item that was inserted.
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *pop (void);
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *pop (void);
   // Removes and returns the first <item> in the list.  Returns
   // internal node's address on success, 0 if the queue was empty.
   // This method will *not* free the internal node.
 
   void reset (void);
-  // Reset the <JAWS_Hash_Bucket_DLCStack> to be empty.
+  // Reset the <ACE_Hash_Bucket_DLCStack> to be empty.
   // Notice that since no one is interested in the items within,
   // This operation will delete all items.
 
-  int remove (JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *item);
+  int remove (ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *item);
   // If item is still part of the CStack, it is removed.
   // In anycase, if there is no error, item is freed.
   // Returns 0 if ok, -1 on error.
@@ -93,18 +93,18 @@ public:
 
 private:
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *head_;
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *tail_;
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *head_;
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *tail_;
 
 };
 
 
 template <class EXT_ID, class INT_ID>
-class JAWS_Hash_Bucket_DLCStack_Iterator
+class ACE_Hash_Bucket_DLCStack_Iterator
 {
 public:
 
-  JAWS_Hash_Bucket_DLCStack_Iterator (const JAWS_HASH_BUCKET_DLCSTACK &dlcstack);
+  ACE_Hash_Bucket_DLCStack_Iterator (const ACE_HASH_BUCKET_DLCSTACK &dlcstack);
 
   int first (void);
   // Moves to first element in the set, clears done flag.  Returns 0
@@ -124,12 +124,12 @@ public:
   // end up being the last element in the set, 1 otherwise.  If revert
   // takes us to the last element, done is set to true.
 
-  int next (JAWS_HASH_BUCKET_ITEM *&item);
-  int next (JAWS_HASH_BUCKET_ITEM *&item) const;
+  int next (ACE_HASH_BUCKET_ITEM *&item);
+  int next (ACE_HASH_BUCKET_ITEM *&item) const;
   // Pass back the next item.  Returns 0 if done is true, 1 otherwise.
 
-  int prev (JAWS_HASH_BUCKET_ITEM *&item);
-  int prev (JAWS_HASH_BUCKET_ITEM *&item) const;
+  int prev (ACE_HASH_BUCKET_ITEM *&item);
+  int prev (ACE_HASH_BUCKET_ITEM *&item) const;
   // Pass back the previous item.  Returns 0 if done is true, 1
   // otherwise.
 
@@ -139,21 +139,21 @@ public:
   // element.
 
 private:
-  const JAWS_HASH_BUCKET_DLCSTACK &dlcstack_;
-  JAWS_HASH_BUCKET_ITEM *next_;
-  JAWS_HASH_BUCKET_ITEM *prev_;
+  const ACE_HASH_BUCKET_DLCSTACK &dlcstack_;
+  ACE_HASH_BUCKET_ITEM *next_;
+  ACE_HASH_BUCKET_ITEM *prev_;
   int done_;
 };
 
 
 template <class EXT_ID, class INT_ID, class EQ_FUNC>
-class JAWS_Hash_Bucket_Manager
+class ACE_Hash_Bucket_Manager
 {
 public:
-  JAWS_Hash_Bucket_Manager (ACE_Allocator *alloc = 0);
+  ACE_Hash_Bucket_Manager (ACE_Allocator *alloc = 0);
   int open (ACE_Allocator *alloc = 0);
 
-  ~JAWS_Hash_Bucket_Manager (void);
+  ~ACE_Hash_Bucket_Manager (void);
   int close (void);
 
   int find (const EXT_ID &ext_id) const;
@@ -175,7 +175,7 @@ public:
   // then behaves just like <bind>.  Otherwise, store the old values
   // of <ext_id> and <int_id> into the "out" parameters and rebind the
   // new parameters.  This is very useful if you need to have an
-  // atomic way of updating <JAWS_Hash_Map_Entrys> and you also need full
+  // atomic way of updating <ACE_Hash_Map_Entrys> and you also need full
   // control over memory allocation.  Returns 0 if a new entry is
   // bound successfully, returns 1 if an existing entry was rebound,
   // and returns -1 if failures occur.
@@ -188,19 +188,19 @@ public:
 
 protected:
 
-  JAWS_Hash_Bucket_Item<EXT_ID, INT_ID> *find_i (const EXT_ID &ext_id) const;
+  ACE_Hash_Bucket_Item<EXT_ID, INT_ID> *find_i (const EXT_ID &ext_id) const;
   // Returns the item associated with ext_id if found in list.
   // Returns NULL if not found.
 
 private:
 
-  JAWS_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_;
+  ACE_Hash_Bucket_DLCStack<EXT_ID, INT_ID> dlcstack_;
 
 };
 
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Hash_Bucket_T.cpp"
+#include "ace_Hash_Bucket_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
-#endif /* JAWS_HASH_BUCKET_T_H */
+#endif /* ACE_HASH_BUCKET_T_H */
diff --git a/ace/High_Res_Timer.cpp b/ace/High_Res_Timer.cpp
index edd5acbac21..c8e70158554 100644
--- a/ace/High_Res_Timer.cpp
+++ b/ace/High_Res_Timer.cpp
@@ -23,12 +23,48 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
 # include "ace/Synch.h"
 # include "ace/Object_Manager.h"
 
+# if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+
+u_long
+ACE_High_Res_Timer::get_registry_scale_factor (void)
+{
+  HKEY hk;
+  unsigned long speed;
+  unsigned long speed_size = sizeof speed;
+  unsigned long speed_type = REG_DWORD;
+
+  long rc = ::RegOpenKeyEx (HKEY_LOCAL_MACHINE,
+                            ACE_TEXT ("HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"),
+                            NULL,
+                            KEY_READ,
+                            &hk);
+
+  if (rc != ERROR_SUCCESS)
+    // Couldn't find key
+    return 1;
+
+  rc = ::RegQueryValueEx (hk,
+                          ACE_TEXT ("~MHz"),
+                          0,
+                          &speed_type,
+                          (LPBYTE) &speed,
+                          &speed_size);
+
+  ::RegCloseKey (hk);
+
+  if (rc != ERROR_SUCCESS)
+    // Couldn't get the value
+    return 1;
+
+  return speed;
+}
+# endif /*ACE_WIN32 && ! ACE_HAS_WINCE */
+
   // Initialize the global_scale_factor_ to 1.  The first
   // ACE_High_Res_Timer instance construction will override this
   // value.
   /* static */
   ACE_UINT32 ACE_High_Res_Timer::global_scale_factor_ = 1u;
-  
 #else  /* ! (ACE_HAS_PENTIUM || ACE_HAS_POWERPC_TIMER || \
              ACE_HAS_ALPHA_TIMER)  ||
           ACE_HAS_HI_RES_TIMER */
@@ -40,12 +76,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
              ACE_HAS_ALPHA_TIMER)  ||
           ACE_HAS_HI_RES_TIMER */
 
-// This is used to tell if the global_scale_factor_ has been
-// set, and if high resolution timers are supported.
-/* static */
-int ACE_High_Res_Timer::global_scale_factor_status_ = 0;
-
-
 ACE_UINT32
 ACE_High_Res_Timer::global_scale_factor ()
 {
@@ -55,7 +85,7 @@ ACE_High_Res_Timer::global_scale_factor ()
     ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
      defined (ghs) || defined (__GNUG__) || defined (__KCC))
   // Check if the global scale factor needs to be set, and do if so.
-  if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
+  if (ACE_High_Res_Timer::global_scale_factor_ == 1u)
     {
       // Grab ACE's static object lock.  This doesn't have anything to
       // do with static objects; it's just a convenient lock to use.
@@ -63,26 +93,16 @@ ACE_High_Res_Timer::global_scale_factor ()
                                 *ACE_Static_Object_Lock::instance (), 0));
 
       // Double check
-      if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
+      if (ACE_High_Res_Timer::global_scale_factor_ == 1u)
         {
 #         if defined (ACE_WIN32)
-            LARGE_INTEGER freq;
-            if (::QueryPerformanceFrequency (&freq))
-              // We have a high-res timer
-              ACE_High_Res_Timer::global_scale_factor 
-                (ACE_static_cast (unsigned int, 
-                                  freq.QuadPart / ACE_ONE_SECOND_IN_USECS));
-            else
-              // High-Res timers not supported
-              ACE_High_Res_Timer::global_scale_factor_status_ = -1;  
-
-            return ACE_High_Res_Timer::global_scale_factor_;
-
+            ACE_High_Res_Timer::global_scale_factor (
+              ACE_High_Res_Timer::get_registry_scale_factor ());
 #         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.
+            // Get the BogoMIPS from /proc.  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.
             FILE *cpuinfo;
             if ((cpuinfo = ACE_OS::fopen ("/proc/cpuinfo", "r")))
               {
@@ -108,14 +128,12 @@ ACE_High_Res_Timer::global_scale_factor ()
             ACE_High_Res_Timer::calibrate ();
         }
     }
-
-  ACE_High_Res_Timer::global_scale_factor_status_ = 1;
 #endif /* (ACE_HAS_PENTIUM || ACE_HAS_POWERPC_TIMER || \
            ACE_HAS_ALPHA_TIMER) && \
           ! ACE_HAS_HIGH_RES_TIMER &&
           ((WIN32 && ! WINCE) || ghs || __GNUG__) */
 
-  return ACE_High_Res_Timer::global_scale_factor_;
+  return global_scale_factor_;
 }
 
 ACE_High_Res_Timer::ACE_High_Res_Timer (void)
@@ -160,7 +178,7 @@ ACE_High_Res_Timer::calibrate (const ACE_UINT32 usec,
 
   // The addition of 5 below rounds instead of truncates.
   const ACE_UINT32 scale_factor =
-    (ticks.whole () / actual_sleep.whole () + 5) /
+    (ticks.whole () / actual_sleep.whole ()  +  5) /
     10u /* usec/100 usec */;
   ACE_High_Res_Timer::global_scale_factor (scale_factor);
 
@@ -177,20 +195,20 @@ ACE_High_Res_Timer::dump (void) const
              global_scale_factor ()));
 #if defined (ACE_LACKS_LONGLONG_T)
   ACE_DEBUG ((LM_DEBUG,
-             ASYS_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n")
-             ASYS_TEXT ("end_.hi ():       %8x; end_.lo ():        %8x;\n")
-             ASYS_TEXT ("total_.hi ():     %8x; total_.lo ():      %8x;\n")
-             ASYS_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
+             ASYS_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n"
+                        "end_.hi ():       %8x; end_.lo ():        %8x;\n"
+                        "total_.hi ():     %8x; total_.lo ():      %8x;\n"
+                        "start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
              start_.hi (), start_.lo (),
              end_.hi (), end_.lo (),
              total_.hi (), total_.lo (),
              start_incr_.hi (), start_incr_.lo ()));
 #else  /* ! ACE_LACKS_LONGLONG_T */
   ACE_DEBUG ((LM_DEBUG,
-             ASYS_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n")
-             ASYS_TEXT ("end_.hi ():       %8x; end_.lo ():        %8x;\n")
-             ASYS_TEXT ("total_.hi ():     %8x; total_.lo ():      %8x;\n")
-             ASYS_TEXT ("start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
+             ASYS_TEXT (":\nstart_.hi ():     %8x; start_.lo ():      %8x;\n"
+                        "end_.hi ():       %8x; end_.lo ():        %8x;\n"
+                        "total_.hi ():     %8x; total_.lo ():      %8x;\n"
+                        "start_incr_.hi () %8x; start_incr_.lo (): %8x;\n"),
              ACE_CU64_TO_CU32 (start_ >> 32),
              ACE_CU64_TO_CU32 (start_ & 0xfffffffful),
              ACE_CU64_TO_CU32 (end_ >> 32),
diff --git a/ace/High_Res_Timer.h b/ace/High_Res_Timer.h
index 676e47f24cb..6fca8eecfaa 100644
--- a/ace/High_Res_Timer.h
+++ b/ace/High_Res_Timer.h
@@ -178,11 +178,20 @@ public:
   // However, setting the global_scale_factor_ appropriately will
   // result in the finest resolution possible.
 
+protected:
+
+#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
+  static u_long get_registry_scale_factor (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 /* ACE_WIN32 */
+
+private:
   static void hrtime_to_tv (ACE_Time_Value &tv,
                             const ACE_hrtime_t hrt);
   // Converts an <hrt> to <tv> using global_scale_factor_.
 
-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
@@ -206,12 +215,6 @@ private:
   static ACE_UINT32 global_scale_factor_;
   // Converts ticks to microseconds.  That is, ticks /
   // global_scale_factor_ == microseconds.
-
-  static int global_scale_factor_status_;
-  // Indicates the status of the global scale factor,
-  // 0  = hasn't been set
-  // 1  = been set
-  // -1 = HR timer not supported
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/High_Res_Timer.i b/ace/High_Res_Timer.i
index add1f266fa2..9b3515264c8 100644
--- a/ace/High_Res_Timer.i
+++ b/ace/High_Res_Timer.i
@@ -27,12 +27,10 @@ ACE_INLINE ACE_Time_Value
 ACE_High_Res_Timer::gettimeofday (const ACE_OS::ACE_HRTimer_Op op)
 {
 #if defined (ACE_WIN32)
-  // Get the global scale factor if there isn't one yet.
-  if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
-    ACE_High_Res_Timer::global_scale_factor ();
-
-  // If there isn't a high-res timer, use gettimeofday ();
-  if (ACE_High_Res_Timer::global_scale_factor_status_ == -1)
+  // If the global_scale_factor_ == 1 and we're on a WIN32 platform,
+  // then a scale factor is needed by the platform gethrtime.  Since
+  // one has not been set, just return ACE_OS::gettimeofday.
+  if (ACE_High_Res_Timer::global_scale_factor () == 1)
     return ACE_OS::gettimeofday ();
 #endif /* ACE_WIN32 */
 
@@ -47,12 +45,10 @@ ACE_INLINE ACE_hrtime_t
 ACE_High_Res_Timer::gettime (const ACE_OS::ACE_HRTimer_Op op)
 {
 #if defined (ACE_WIN32)
-  // Get the global scale factor if there isn't one yet.
-  if (ACE_High_Res_Timer::global_scale_factor_status_ == 0)
-    ACE_High_Res_Timer::global_scale_factor ();
-
-  // If there isn't a high-res timer, use gettimeofday ();
-  if (ACE_High_Res_Timer::global_scale_factor_status_ == -1)
+  // If the global_scale_factor_ == 1 and we're on a WIN32 platform,
+  // then a scale factor is needed by the platform gethrtime.  Since
+  // one has not been set, just return ACE_OS::gettimeofday.
+  if (ACE_High_Res_Timer::global_scale_factor () == 1)
     {
       ACE_Time_Value tv = ACE_OS::gettimeofday ();
       // Return the time in microseconds because the global_scale_factor_
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index 341863d32c4..555d9641244 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -126,31 +126,14 @@ ACE_INET_Addr::string_to_addr (const ASYS_TCHAR s[])
 
   if (ip_addr == 0) // Assume it's a port number.
     {
-      if (ACE_OS::strspn (t, "1234567890") 
-          == ACE_OS::strlen (t))
-        { // port number
-          u_short port = (u_short) ACE_OS::atoi (t);
-          result = this->set (port,
-                              ACE_UINT32 (INADDR_ANY));
-        }
-      else // port name
-        result = this->set (t, 
-                            ACE_UINT32 (INADDR_ANY));
+      u_short port = (u_short) ACE_OS::atoi (t);
+      result = this->set (port, ACE_UINT32 (INADDR_ANY));
     }
   else
     {
-      *ip_addr = '\0'; ++ip_addr; // skip over ':'
-
-      if (ACE_OS::strspn (ip_addr,
-                         "1234567890") ==          
-          ACE_OS::strlen (ip_addr))
-        {
-          u_short port = 
-            (u_short) ACE_OS::atoi (ip_addr);
-          result = this->set (port, t);
-        }
-      else
-        result = this->set (ip_addr, t);
+      *ip_addr = '\0';
+      u_short port = (u_short) ACE_OS::atoi (ip_addr + 1); // Skip over ':'
+      result = this->set (port, t);
     }
 
   ACE_OS::free (ACE_MALLOC_T (t));
@@ -223,6 +206,7 @@ ACE_INET_Addr::set (u_short port_number,
   this->ACE_Addr::base_set (AF_INET, sizeof this->inet_addr_);
   (void) ACE_OS::memset ((void *) &this->inet_addr_, 0, sizeof
                          this->inet_addr_);
+  const char *hostname_ch = ASYS_ONLY_MULTIBYTE_STRING (host_name);
 
   // Yow, someone gave us a NULL host_name!
   if (host_name == 0)
@@ -230,7 +214,7 @@ ACE_INET_Addr::set (u_short port_number,
       errno = EINVAL;
       return -1;
     }
-  else if (ACE_OS::inet_aton (ASYS_ONLY_MULTIBYTE_STRING (host_name), (struct in_addr *) &addr) == 1)
+  else if (ACE_OS::inet_aton (hostname_ch, (struct in_addr *) &addr) == 1)
     return this->set (port_number, encode ? ntohl (addr) : addr, encode);
 
   else
@@ -242,7 +226,7 @@ ACE_INET_Addr::set (u_short port_number,
       ACE_HOSTENT_DATA buf;
       int error;
 
-      hostent *hp = ACE_OS::gethostbyname_r (ASYS_ONLY_MULTIBYTE_STRING (host_name), &hentry,
+      hostent *hp = ACE_OS::gethostbyname_r (hostname_ch, &hentry,
                                              buf, &error);
 #endif /* VXWORKS */
 
@@ -339,7 +323,7 @@ ACE_INET_Addr::ACE_INET_Addr (u_short port_number,
                 ASYS_TEXT ("ACE_INET_Addr::ACE_INET_Addr: %p\n"),
                 ((host_name == 0) ?
                  (ASYS_TEXT ("<unknown>")) :
-                 host_name)));
+                 (ASYS_WIDE_STRING (host_name)))));
 #endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
 }
 
@@ -493,8 +477,7 @@ ACE_INET_Addr::get_host_name (void) const
   ACE_TRACE ("ACE_INET_Addr::get_host_name");
 
   static ASYS_TCHAR name[MAXHOSTNAMELEN + 1];
-  if (this->get_host_name (name, MAXHOSTNAMELEN + 1) == -1)
-    ACE_OS::strcpy (name, "<unknown>");
+  this->get_host_name (name, MAXHOSTNAMELEN + 1);
   return name;
 }
 
diff --git a/ace/INET_Addr.h b/ace/INET_Addr.h
index 1d62735b875..5d6a626e44a 100644
--- a/ace/INET_Addr.h
+++ b/ace/INET_Addr.h
@@ -126,10 +126,8 @@ public:
 
   virtual int string_to_addr (const ASYS_TCHAR address[]);
   // Initializes an <ACE_INET_Addr> from the <address>, which can be
-  // "ip-addr:port-number" (e.g., "tango.cs.wustl.edu:1234"),
-  // "ip-addr:port-name" (e.g., "tango.cs.wustl.edu:telnet"),
-  // "ip-number:port-number" (e.g., "128.252.166.57:1234"), or
-  // "ip-number:port-name" (e.g., "128.252.166.57:telnet").  If there
+  // "ip-addr:port-number" (e.g., "tango.cs.wustl.edu:1234") or
+  // "ip-number:port-number" (e.g., "128.252.166.57:1234").  If there
   // is no ':' in the <address> it is assumed to be a port number,
   // with the IP address being INADDR_ANY.
 
diff --git a/ace/IOStream.h b/ace/IOStream.h
index 00f253ba81f..d98e8a3b399 100644
--- a/ace/IOStream.h
+++ b/ace/IOStream.h
@@ -397,7 +397,7 @@ typedef ostream& (*__omanip_)(ostream&);
 // These are necessary in case somebody wants to derive from us and
 // override one of these with a custom approach.
 
-#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS)
+#ifdef CHORUS
 #define GET_FUNC_SET0(MT,CODE,CODE2) \
         GET_PROT(MT,short &,CODE) \
         GET_PROT(MT,u_short &,CODE) \
@@ -412,18 +412,6 @@ typedef ostream& (*__omanip_)(ostream&);
         GET_PROT(MT,char *,CODE) \
         inline virtual MT& operator>>(__omanip_ func) CODE2 \
         inline virtual MT& operator>>(__manip_ func)  CODE2
-#elif defined (ACE_LACKS_CHAR_RIGHT_SHIFTS)
-#define GET_FUNC_SET0(MT,CODE,CODE2) \
-        GET_PROT(MT,short &,CODE) \
-        GET_PROT(MT,u_short &,CODE) \
-        GET_PROT(MT,int &,CODE) \
-        GET_PROT(MT,u_int &,CODE) \
-        GET_PROT(MT,long &,CODE) \
-        GET_PROT(MT,u_long &,CODE) \
-        GET_PROT(MT,float &,CODE) \
-        GET_PROT(MT,double &,CODE) \
-        inline virtual MT& operator>>(__omanip_ func) CODE2 \
-        inline virtual MT& operator>>(__manip_ func)  CODE2
 #else
 #define GET_FUNC_SET0(MT,CODE,CODE2) \
         GET_PROT(MT,short &,CODE) \
@@ -463,7 +451,7 @@ typedef ostream& (*__omanip_)(ostream&);
   #define GET_FUNC_SET1(MT,CODE,CODE2) GET_FUNC_SET0(MT,CODE,CODE2)
   #define PUT_FUNC_SET1(MT,CODE,CODE2) PUT_FUNC_SET0(MT,CODE,CODE2)
 #else
-#if defined (ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS)
+#ifdef CHORUS
   #define GET_FUNC_SET1(MT,CODE,CODE2) \
           GET_PROT(MT,signed char &,CODE) \
           GET_FUNC_SET0(MT,CODE,CODE2)
diff --git a/ace/LSOCK_Acceptor.h b/ace/LSOCK_Acceptor.h
index f5ee37e4667..711e6561c5a 100644
--- a/ace/LSOCK_Acceptor.h
+++ b/ace/LSOCK_Acceptor.h
@@ -44,14 +44,14 @@ public:
   ACE_LSOCK_Acceptor (const ACE_Addr &local_sap,
                       int reuse_addr = 0,
                       int protocol_family = PF_UNIX,
-                      int backlog = ACE_DEFAULT_BACKLOG,
+                      int backlog = 5,
                       int protocol = 0);
   // Initiate a passive mode socket.
 
   int open (const ACE_Addr &local_sap,
             int reuse_addr = 0,
             int protocol_family = PF_UNIX,
-            int backlog = ACE_DEFAULT_BACKLOG,
+            int backlog = 5,
             int protocol = 0);
   // Initiate a passive mode socket.
 
diff --git a/ace/Log_Msg.cpp b/ace/Log_Msg.cpp
index 06d3aeb191f..744c80b146e 100644
--- a/ace/Log_Msg.cpp
+++ b/ace/Log_Msg.cpp
@@ -75,17 +75,17 @@ class ACE_Log_Msg_Manager
   //      Synchronize output operations.
 {
 public:
-  static ACE_Recursive_Thread_Mutex *get_lock (void);
+  static ACE_Thread_Mutex *get_lock (void);
 
   static void close (void);
 
 private:
-  static ACE_Recursive_Thread_Mutex *lock_;
+  static ACE_Thread_Mutex *lock_;
 };
 
-ACE_Recursive_Thread_Mutex *ACE_Log_Msg_Manager::lock_ = 0;
+ACE_Thread_Mutex *ACE_Log_Msg_Manager::lock_ = 0;
 
-ACE_Recursive_Thread_Mutex *
+ACE_Thread_Mutex *
 ACE_Log_Msg_Manager::get_lock (void)
 {
   // This function is called by the first thread to create an ACE_Log_Msg
@@ -96,7 +96,7 @@ ACE_Log_Msg_Manager::get_lock (void)
     {
       ACE_NO_HEAP_CHECK;
 
-      ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_, ACE_Recursive_Thread_Mutex, 0);
+      ACE_NEW_RETURN_I (ACE_Log_Msg_Manager::lock_, ACE_Thread_Mutex, 0);
 
       // Allocate the ACE_Log_Msg IPC instance.
       ACE_NEW_RETURN (ACE_Log_Msg_message_queue, ACE_LOG_MSG_IPC_STREAM, 0);
@@ -248,28 +248,29 @@ ACE_Log_Msg::instance (void)
 }
 #undef ACE_NEW_RETURN_I
 
-// Sets the flag in the default priority mask used to initialize
-// ACE_Log_Msg instances, as well as the current per-thread instance.
-
 void
-ACE_Log_Msg::enable_debug_messages (ACE_Log_Priority priority)
+ACE_Log_Msg::disable_debug_messages()
+  // Clears the LM_DEBUG flag from the default priority mask used to
+  // initialize ACE_Log_Msg instances, as well as the current instance.
 {
-  ACE_SET_BITS (ACE_Log_Msg::default_priority_mask_, priority);
-  ACE_Log_Msg *i = ACE_Log_Msg::instance ();
-  i->priority_mask (i->priority_mask () | priority);
+  default_priority_mask_ &= ~LM_DEBUG;
+  ACE_Log_Msg *currentInstance = ACE_Log_Msg::instance();
+  currentInstance->priority_mask(currentInstance->priority_mask()
+                                 & ~LM_DEBUG);
 }
 
-// Clears the flag in the default priority mask used to initialize
-// ACE_Log_Msg instances, as well as the current per-thread instance.
-
 void
-ACE_Log_Msg::disable_debug_messages (ACE_Log_Priority priority)
+ACE_Log_Msg::enable_debug_messages()
+  // Sets the LM_DEBUG flag in the default priority mask used to
+  // initialize ACE_Log_Msg instances, as well as the current instance.
 {
-  ACE_CLR_BITS (ACE_Log_Msg::default_priority_mask_, priority);
-  ACE_Log_Msg *i = ACE_Log_Msg::instance ();
-  i->priority_mask (i->priority_mask () & ~priority);
+  default_priority_mask_ |= LM_DEBUG;
+  ACE_Log_Msg *currentInstance = ACE_Log_Msg::instance();
+  currentInstance->priority_mask(currentInstance->priority_mask()
+                                 | LM_DEBUG);
 }
 
+
 // Name of the local host.
 const ASYS_TCHAR *ACE_Log_Msg::local_host_ = 0;
 
@@ -285,7 +286,7 @@ pid_t ACE_Log_Msg::pid_ = -1;
 // Current offset of msg_[].
 int ACE_Log_Msg::msg_off_ = 0;
 
-// Default per-thread priority mask
+// Default priority mask
 // By default, all priorities are enabled.
 u_long ACE_Log_Msg::default_priority_mask_ = LM_SHUTDOWN
                                            | LM_TRACE
@@ -299,10 +300,6 @@ u_long ACE_Log_Msg::default_priority_mask_ = LM_SHUTDOWN
                                            | LM_ALERT
                                            | LM_EMERGENCY;
 
-// Default per-process priority mask
-// By default, no priorities are enabled.
-u_long ACE_Log_Msg::process_priority_mask_ = 0;
-
 void
 ACE_Log_Msg::close (void)
 {
@@ -344,7 +341,7 @@ ACE_Log_Msg::flags (void)
 {
   ACE_TRACE ("ACE_Log_Msg::flags");
   u_long result;
-  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), 0));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), 0));
 
   result = ACE_Log_Msg::flags_;
   return result;
@@ -354,7 +351,7 @@ void
 ACE_Log_Msg::set_flags (u_long flgs)
 {
   ACE_TRACE ("ACE_Log_Msg::set_flags");
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock ()));
+  ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock ()));
 
   ACE_SET_BITS (ACE_Log_Msg::flags_, flgs);
 }
@@ -363,7 +360,7 @@ void
 ACE_Log_Msg::clr_flags (u_long flgs)
 {
   ACE_TRACE ("ACE_Log_Msg::clr_flags");
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock ()));
+  ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock ()));
 
   ACE_CLR_BITS (ACE_Log_Msg::flags_, flgs);
 }
@@ -380,35 +377,23 @@ ACE_Log_Msg::acquire (void)
 }
 
 u_long
-ACE_Log_Msg::priority_mask (u_long n_mask, MASK_TYPE mask_type)
+ACE_Log_Msg::priority_mask (u_long n_mask)
 {
-  u_long o_mask;
-
-  if (mask_type == THREAD) {
-    o_mask = this->priority_mask_;
-    this->priority_mask_ = n_mask;
-  }
-  else {
-    o_mask = ACE_Log_Msg::process_priority_mask_;
-        ACE_Log_Msg::process_priority_mask_ = n_mask;
-  }
-
+  u_long o_mask = this->priority_mask_;
+  this->priority_mask_ = n_mask;
   return o_mask;
 }
 
 u_long
-ACE_Log_Msg::priority_mask (MASK_TYPE mask_type)
+ACE_Log_Msg::priority_mask (void)
 {
-  return mask_type == THREAD  ?  this->priority_mask_
-                              :  ACE_Log_Msg::process_priority_mask_;
+  return this->priority_mask_;
 }
 
 int
 ACE_Log_Msg::log_priority_enabled (ACE_Log_Priority log_priority)
 {
-  return ACE_BIT_ENABLED (this->priority_mask_ |
-                            ACE_Log_Msg::process_priority_mask_,
-                          log_priority);
+  return ACE_BIT_ENABLED (this->priority_mask_, log_priority);
 }
 
 int
@@ -442,7 +427,7 @@ ACE_Log_Msg::ACE_Log_Msg (void)
 {
   // ACE_TRACE ("ACE_Log_Msg::ACE_Log_Msg");
 
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
+  ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
                      *ACE_Log_Msg_Manager::get_lock ()));
   ++instance_count_;
 }
@@ -457,7 +442,7 @@ ACE_Log_Msg::~ACE_Log_Msg (void)
   // If ACE_Log_Msg_Manager::close () is called, the lock will
   // be deleted.
   {
-    ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
+    ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
                        *ACE_Log_Msg_Manager::get_lock ()));
     instance_count = --instance_count_;
   }
@@ -502,7 +487,7 @@ ACE_Log_Msg::open (const ASYS_TCHAR *prog_name,
                    LPCTSTR logger_key)
 {
   ACE_TRACE ("ACE_Log_Msg::open");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), -1));
 
   if (prog_name)
     {
@@ -1062,7 +1047,7 @@ ACE_Log_Msg::log (ACE_Log_Record &log_record,
 #endif /* ACE_WIN32 */
 
       // Make sure that the lock is held during all this.
-      ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), -1));
+      ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ACE_Log_Msg_Manager::get_lock (), -1));
 
       if (ACE_BIT_ENABLED (ACE_Log_Msg::flags_,
                            ACE_Log_Msg::STDERR)
@@ -1196,7 +1181,7 @@ ACE_Log_Msg::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntrace_depth_ = %d\n"), this->trace_depth_));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\trace_active_ = %d\n"), this->trace_active_));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\tracing_enabled_ = %d\n"), this->tracing_enabled_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\npriority_mask_ = %x\n"), this->priority_mask_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\npriority_mask_ = %d\n"), this->priority_mask_));
   if (this->thr_desc_ != 0 && this->thr_desc_->state () != 0)
     ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\thr_state_ = %d\n"),
                 this->thr_desc_->state ()));
diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h
index 0ab26552c37..e1ab3591a22 100644
--- a/ace/Log_Msg.h
+++ b/ace/Log_Msg.h
@@ -116,7 +116,7 @@ class ACE_Export ACE_Log_Msg_Callback
   //     Your log() routine is called with an instance of
   //     ACE_Log_Record.  From this class, you can get the log
   //     message, the verbose log message, message type, message
-  //     priority, and so on.
+  //     priority, and so on. 
   //
   //     Remember that there is one Log_Msg object per thread.
   //     Therefore, you may need to register your callback object with
@@ -181,13 +181,13 @@ public:
   static int exists (void);
   // Returns non-null if an ACE_Log_Msg exists for the calling thread.
 
-  static void disable_debug_messages (ACE_Log_Priority priority = LM_DEBUG);
-  // Clears the flag from the default priority mask used to
+  static void disable_debug_messages();
+  // Clears the LM_DEBUG flag from the default priority mask used to
   // initialize ACE_Log_Msg instances.
 
-  static void enable_debug_messages (ACE_Log_Priority priority = LM_DEBUG);
-  // Sets the flag in the default priority mask used to initialize
-  // ACE_Log_Msg instances.
+  static void enable_debug_messages();
+  // Sets the LM_DEBUG flag in the default priority mask used to
+  // initialize ACE_Log_Msg instances.
 
   ACE_Log_Msg (void);
   // Initialize logger.
@@ -321,16 +321,10 @@ public:
   void start_tracing (void);
   int  tracing_enabled (void);
 
-  typedef enum
-  {
-          THREAD,
-          PROCESS
-  } MASK_TYPE;
-
   // = Get/set the priority mask.
-  u_long priority_mask (MASK_TYPE = THREAD);
+  u_long priority_mask (void);
   // Get the current <ACE_Log_Priority> mask.
-  u_long priority_mask (u_long, MASK_TYPE = THREAD);
+  u_long priority_mask (u_long);
   // Set the <ACE_Log_Priority> mask, returns original mask.
 
   int log_priority_enabled (ACE_Log_Priority log_priority);
@@ -457,19 +451,14 @@ private:
 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 
   u_long priority_mask_;
-  // Keeps track of all the per-thread <ACE_Log_Priority> values that
-  // are currently enabled.  Default is for all logging priorities to
-  // be enabled.
+  // Keeps track of all the <ACE_Log_Priority> values that are
+  // currently enabled.  Default is for all logging priorities to be
+  // enabled.
 
   // = The following fields are *not* kept in thread-specific storage.
 
   // We only want one instance for the entire process!
 
-  static u_long process_priority_mask_;
-  // Keeps track of all the per-process <ACE_Log_Priority> values that
-  // are currently enabled.  Default is for all logging priorities to
-  // be enabled.
-
   static const ASYS_TCHAR *program_name_;
   // Records the program name.
 
diff --git a/ace/Log_Priority.h b/ace/Log_Priority.h
index 0ddb9591534..a43f8a1ea24 100644
--- a/ace/Log_Priority.h
+++ b/ace/Log_Priority.h
@@ -71,7 +71,14 @@ enum ACE_Log_Priority
 
   // Do not use!!  This enum value ensures that the underlying
   // integral type for this enum is at least 32 bits.
+#if defined (ACE_HAS_BROKEN_ENUMS)
+  LM_ENSURE_32_BITS = 0x1FFFFFFF
+  // HP/CXX makes an error the usage of "long enumerators", but this
+  // one (that requires 29 bits) is OK.... only HP can come up with
+  // something like that...
+#else  /* ! ACE_HAS_BROKEN_ENUMS */
   LM_ENSURE_32_BITS = 0x7FFFFFFF
+#endif /* ! ACE_HAS_BROKEN_ENUMS */
 };
 
 #endif /* ACE_LOG_PRIORITY_H */
diff --git a/ace/Log_Record.cpp b/ace/Log_Record.cpp
index d3729cbe707..4c569fec68b 100644
--- a/ace/Log_Record.cpp
+++ b/ace/Log_Record.cpp
@@ -116,7 +116,7 @@ ACE_Log_Record::ACE_Log_Record (void)
 }
 
 int
-ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
+ACE_Log_Record::format_msg (const ASYS_TCHAR host_name[],
                             u_long verbose_flag,
                             ASYS_TCHAR *verbose_msg)
 {
@@ -138,8 +138,8 @@ ACE_Log_Record::format_msg (const ASYS_TCHAR *host_name,
       const ASYS_TCHAR *lhost_name =  (const ASYS_TCHAR *) ((host_name == 0)
         ? ((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);
+      const ASYS_TCHAR *lhost_name = host_name ==
+        0 ? ASYS_TEXT ("<local_host>") : host_name;
 # endif /* ! defined (ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS) */
 
       ACE_OS::sprintf (verbose_msg,
@@ -183,9 +183,11 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
     {
       if (log_window == 0)
         log_window = ACE_CE_Bridge::get_default_winbridge ();
+      
+      CString *verbose_cstring = new CString (verbose_msg);
 
       // <verbose_cstring> will be deleted by <write_msg> function
-      log_window->write_msg (verbose_msg);
+      log_window->write_msg (verbose_cstring);
     }
 
   return result;
@@ -210,7 +212,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
                                                  1,
                                                  verbose_msg_len,
                                                  fp);
-
+          
           // We should have written everything
           if (fwrite_result != verbose_msg_len)
             {
@@ -219,7 +221,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
           else
             {
               ACE_OS::fflush (fp);
-            }
+            }              
         }
     }
 
@@ -229,7 +231,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
 #if ! defined (ACE_LACKS_IOSTREAM_TOTALLY)
 
 int
-ACE_Log_Record::print (const ASYS_TCHAR *host_name,
+ACE_Log_Record::print (const ASYS_TCHAR host_name[],
                        u_long verbose_flag,
                        ostream &s)
 {
@@ -237,7 +239,7 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
   int result = this->format_msg (host_name, verbose_flag, verbose_msg);
 
   if (result == 0)
-    {
+    {      
       s << verbose_msg;
       s.flush ();
     }
@@ -246,3 +248,4 @@ ACE_Log_Record::print (const ASYS_TCHAR *host_name,
 }
 
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
+
diff --git a/ace/Log_Record.h b/ace/Log_Record.h
index 6d0ba580b2d..beb74441aab 100644
--- a/ace/Log_Record.h
+++ b/ace/Log_Record.h
@@ -19,6 +19,7 @@
 #include "ace/ACE.h"
 
 #include "ace/Log_Priority.h"
+#include "ace/SString.h"
 
 #ifndef ACE_LOG_RECORD_H
 #define ACE_LOG_RECORD_H
diff --git a/ace/Log_Record.i b/ace/Log_Record.i
index 7b7c5e1b3be..01730620d43 100644
--- a/ace/Log_Record.i
+++ b/ace/Log_Record.i
@@ -32,32 +32,32 @@ ACE_Log_Record::decode (void)
   this->length_ = ntohl (this->length_);
 }
 
-ASYS_INLINE long
+ASYS_INLINE long 
 ACE_Log_Record::type (void) const
 {
   ACE_TRACE ("ACE_Log_Record::type");
   return this->type_;
 }
 
-ASYS_INLINE void
+ASYS_INLINE void 
 ACE_Log_Record::type (long t)
 {
   ACE_TRACE ("ACE_Log_Record::type");
   this->type_ = t;
 }
 
-ASYS_INLINE long
+ASYS_INLINE long 
 ACE_Log_Record::length (void) const
 {
   ACE_TRACE ("ACE_Log_Record::length");
   return this->length_;
 }
 
-ASYS_INLINE void
+ASYS_INLINE void 
 ACE_Log_Record::length (long l)
 {
   ACE_TRACE ("ACE_Log_Record::length");
-  this->length_ = ACE_static_cast (ACE_UINT32, l);
+  this->length_ = l;
 }
 
 ASYS_INLINE const ACE_Time_Value &
@@ -67,21 +67,21 @@ ACE_Log_Record::time_stamp (void) const
   return this->time_stamp_;
 }
 
-ASYS_INLINE void
+ASYS_INLINE void 
 ACE_Log_Record::time_stamp (const ACE_Time_Value &ts)
 {
   ACE_TRACE ("ACE_Log_Record::time_stamp");
   this->time_stamp_ = ts;
 }
 
-ASYS_INLINE long
+ASYS_INLINE long 
 ACE_Log_Record::pid (void) const
 {
   ACE_TRACE ("ACE_Log_Record::pid");
   return this->pid_;
 }
 
-ASYS_INLINE void
+ASYS_INLINE void 
 ACE_Log_Record::pid (long p)
 {
   ACE_TRACE ("ACE_Log_Record::pid");
@@ -94,3 +94,4 @@ ACE_Log_Record::msg_data (void)
   ACE_TRACE ("ACE_Log_Record::msg_data");
   return this->msg_data_;
 }
+
diff --git a/ace/Makefile b/ace/Makefile
index 9fd14f2ccaa..3d05bb4993d 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -9,11 +9,10 @@ LIB      = libACE.a
 SHLIB    = libACE.$(SOEXT)
 
 OS_FILES = \
+  ACE \
   Basic_Types \
-  OS \
-  Sched_Params
+  OS
 UTILS_FILES = \
-  ACE \
   Active_Map_Manager \
   Arg_Shifter \
   ARGV \
@@ -48,6 +47,7 @@ THREADS_FILES = \
   Activation_Queue \
   Process \
   Process_Manager \
+  Sched_Params \
   Synch \
   Synch_Options \
   Thread \
@@ -56,7 +56,6 @@ THREADS_FILES = \
 DEMUX_FILES = \
   Event_Handler \
   Handle_Set \
-  POSIX_Proactor \
   Priority_Reactor \
   Proactor \
   Reactor \
@@ -65,8 +64,6 @@ DEMUX_FILES = \
   WFMO_Reactor
 CONNECTION_FILES = \
   Asynch_IO \
-  Asynch_IO_Impl \
-  POSIX_Asynch_IO \
   Strategies
 SOCKETS_FILES = \
   IPC_SAP \
@@ -87,7 +84,6 @@ SOCKETS_FILES = \
   SOCK_Stream
 IPC_FILES = \
   Addr \
-  ATM_Addr \
   DEV \
   DEV_Addr \
   DEV_Connector \
@@ -169,9 +165,22 @@ OTHER_FILES = \
   Registry_Name_Space \
   Remote_Name_Space \
   TP_Reactor \
-  XtReactor \
-  FlReactor \
-  TkReactor
+  XtReactor
+
+FILES = \
+  $(OS_FILES) \
+  $(UTILS_FILES) \
+  $(LOGGING_FILES) \
+  $(THREADS_FILES) \
+  $(DEMUX_FILES) \
+  $(CONNECTION_FILES) \
+  $(SOCKETS_FILES) \
+  $(IPC_FILES) \
+  $(SVCCONF_FILES) \
+  $(STREAMS_FILES) \
+  $(MEMORY_FILES) \
+  $(TOKEN_FILES) \
+  $(OTHER_FILES)
 
 TEMPLATE_FILES = \
            Acceptor \
@@ -219,6 +228,36 @@ TEMPLATE_FILES = \
            Typed_SV_Message \
            Typed_SV_Message_Queue
 
+####
+#### Build customization.
+####
+#ifndef ACE_COMPONENTS
+#  #### CURRENTLY UNUSED!
+#  #### XXXX [Please see docs/ACE-subsets.html for documentation.] XXXX
+#  ACE_COMPONENTS = \
+#    OS \
+#    Utils \
+#    Logging \
+#    Threads \
+#    Demux \
+#    Connection \
+#    Sockets \
+#    IPC \
+#    Svcconf \
+#    Streams \
+#    Memory \
+#    Token \
+#    Other
+#endif # ACE_COMPONENTS
+
+ifeq ($(AIX_TEMPLATE_HACK),1)
+  FILES = 0_ACE_All_Src
+  TEMPLATE_FILES = 0_ACE_All_Tmp
+endif
+
+LSRC  = $(addsuffix .cpp,$(FILES))
+LSRC2 = $(addsuffix .cpp,$(TEMPLATE_FILES))
+
 #----------------------------------------------------------------------------
 #       Include macros and targets
 #----------------------------------------------------------------------------
@@ -233,109 +272,6 @@ ifneq ($(GHS),)
   endif # 86
 endif # GHS
 
-####
-#### Build customization.
-####
-ifndef ACE_COMPONENTS
-  #### Please see docs/ACE-subsets.html for documentation.
-  ACE_COMPONENTS = \
-    OS \
-    Utils \
-    Logging \
-    Threads \
-    Demux \
-    Connection \
-    Sockets \
-    IPC \
-    Svcconf \
-    Streams \
-    Memory \
-    Token \
-    Other
-endif # ACE_COMPONENTS
-
-ifeq (FOR_TAO,$(ACE_COMPONENTS))
-  #### These ACE components are necessary to support TAO.
-  ACE_COMPONENTS = \
-    OS \
-    Utils \
-    Logging \
-    Threads \
-    Demux \
-    Connection \
-    Sockets \
-    IPC \
-    Svcconf \
-    Streams \
-    Memory
-endif # FOR_TAO
-
-####
-#### ACE_COMPONENTS support.
-####
-ifneq (,$(findstring OS,$(ACE_COMPONENTS)))
-  FILES += $(OS_FILES)
-endif # OS
-
-ifneq (,$(findstring Utils,$(ACE_COMPONENTS)))
-  FILES += $(UTILS_FILES)
-endif # Utils
-
-ifneq (,$(findstring Logging,$(ACE_COMPONENTS)))
-  FILES += $(LOGGING_FILES)
-endif # Logging
-
-ifneq (,$(findstring Threads,$(ACE_COMPONENTS)))
-  FILES += $(THREADS_FILES)
-endif # Threads
-
-ifneq (,$(findstring Demux,$(ACE_COMPONENTS)))
-  FILES += $(DEMUX_FILES)
-endif # Demux
-
-ifneq (,$(findstring Connection,$(ACE_COMPONENTS)))
-  FILES += $(CONNECTION_FILES)
-endif # Connection
-
-ifneq (,$(findstring Sockets,$(ACE_COMPONENTS)))
-  FILES += $(SOCKETS_FILES)
-endif # Sockets
-
-ifneq (,$(findstring IPC,$(ACE_COMPONENTS)))
-  FILES += $(IPC_FILES)
-endif # IPC
-
-ifneq (,$(findstring Svcconf,$(ACE_COMPONENTS)))
-  FILES += $(SVCCONF_FILES)
-endif # Svcconf
-
-ifneq (,$(findstring Streams,$(ACE_COMPONENTS)))
-  FILES += $(STREAMS_FILES)
-endif # Streams
-
-ifneq (,$(findstring Memory,$(ACE_COMPONENTS)))
-  FILES += $(MEMORY_FILES)
-endif # Memory
-
-ifneq (,$(findstring Token,$(ACE_COMPONENTS)))
-  FILES += $(TOKEN_FILES)
-endif # Token
-
-ifeq (,$(findstring Other,$(ACE_COMPONENTS)))
-  CCFLAGS += -DACE_LACKS_ACE_OTHER
-else
-  FILES += $(OTHER_FILES)
-endif # Other
-
-ifeq ($(AIX_TEMPLATE_HACK),1)
-  FILES = 0_ACE_All_Src
-  TEMPLATE_FILES = 0_ACE_All_Tmp
-endif
-
-LSRC  = $(addsuffix .cpp,$(FILES))
-
-BUILD += ACE_COMPONENTS
-
 include $(ACE_ROOT)/include/makeinclude/macros.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
 include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
@@ -351,13 +287,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 #       Local targets
 #----------------------------------------------------------------------------
 
-.PHONY: ACE_COMPONENTS
-ACE_COMPONENTS:
-	@$(ACE_ROOT)/bin/ace_components --ace --set " $(ACE_COMPONENTS) "
-
-realclean:
-	@$(ACE_ROOT)/bin/ace_components --ace --remove
-
 #### Setting ACELIB to null allows it to be used for building shared libraries,
 #### including libACE.$(SOEXT,) on certain platforms.
 ACELIB =
@@ -472,65 +401,100 @@ endif # GHS
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/Basic_Types.o .obj/Basic_Types.so .shobj/Basic_Types.o .shobj/Basic_Types.so: Basic_Types.cpp \
- $(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/Template_Instantiations.cpp
-.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \
+.obj/Log_Msg.o .obj/Log_Msg.so .shobj/Log_Msg.o .shobj/Log_Msg.so: Log_Msg.cpp \
  $(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/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-.obj/Sched_Params.o .obj/Sched_Params.so .shobj/Sched_Params.o .shobj/Sched_Params.so: Sched_Params.cpp \
- $(ACE_ROOT)/ace/Sched_Params.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/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/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/Sched_Params.i
-.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp $(ACE_ROOT)/ace/ACE.h \
+ $(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/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(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/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/SPIPE_Connector.h \
+ $(ACE_ROOT)/ace/SPIPE_Stream.h \
+ $(ACE_ROOT)/ace/SPIPE.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE.i \
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ $(ACE_ROOT)/ace/SPIPE_Connector.i
+.obj/ACE.o .obj/ACE.so .shobj/ACE.o .shobj/ACE.so: ACE.cpp \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
@@ -540,48 +504,52 @@ endif # GHS
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/Process.h \
+ $(ACE_ROOT)/ace/Process.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/Version.h
-.obj/Active_Map_Manager.o .obj/Active_Map_Manager.so .shobj/Active_Map_Manager.o .shobj/Active_Map_Manager.so: Active_Map_Manager.cpp \
- $(ACE_ROOT)/ace/Active_Map_Manager.h \
+.obj/Activation_Queue.o .obj/Activation_Queue.so .shobj/Activation_Queue.o .shobj/Activation_Queue.so: Activation_Queue.cpp \
+ $(ACE_ROOT)/ace/Activation_Queue.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Active_Map_Manager.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.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/Free_List.h \
@@ -605,13 +573,21 @@ endif # GHS
  $(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/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/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 \
@@ -623,39 +599,69 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp
-.obj/Arg_Shifter.o .obj/Arg_Shifter.so .shobj/Arg_Shifter.o .shobj/Arg_Shifter.so: Arg_Shifter.cpp \
+ $(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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/Method_Request.h \
+ $(ACE_ROOT)/ace/Activation_Queue.i
+.obj/Addr.o .obj/Addr.so .shobj/Addr.o .shobj/Addr.so: Addr.cpp $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Arg_Shifter.h
+ $(ACE_ROOT)/ace/Addr.i
 .obj/ARGV.o .obj/ARGV.so .shobj/ARGV.o .shobj/ARGV.so: ARGV.cpp $(ACE_ROOT)/ace/ARGV.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -694,22 +700,90 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/ARGV.i
-.obj/Containers.o .obj/Containers.so .shobj/Containers.o .shobj/Containers.so: Containers.cpp \
+.obj/Arg_Shifter.o .obj/Argifter.so .shobj/Arg_Shifter.o .shobj/Arg_Shifter.so: Arg_Shifter.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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/Arg_Shifter.h
+.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Basic_Types.o .obj/Basic_Types.so .shobj/Basic_Types.o .shobj/Basic_Types.so: Basic_Types.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Template_Instantiations.cpp
+.obj/Containers.o .obj/Containers.so .shobj/Containers.o .shobj/Containers.so: Containers.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -747,21 +821,304 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
+.obj/CORBA_Handler.o .obj/CORBA_Handler.so .shobj/CORBA_Handler.o .shobj/CORBA_Handler.so: CORBA_Handler.cpp \
+ $(ACE_ROOT)/ace/CORBA_Handler.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Shared_Object.i \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i
+.obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp \
+ $(ACE_ROOT)/ace/CORBA_Ref.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/CORBA_Ref.i \
+ $(ACE_ROOT)/ace/CORBA_Ref.cpp
+.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp $(ACE_ROOT)/ace/DEV.h \
+ $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IO_SAP.i \
+ $(ACE_ROOT)/ace/DEV_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/DEV_Addr.i \
+ $(ACE_ROOT)/ace/DEV.i
+.obj/DEV_Addr.o .obj/DEV_Addr.so .shobj/DEV_Addr.o .shobj/DEV_Addr.so: DEV_Addr.cpp \
+ $(ACE_ROOT)/ace/DEV_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Addr.i \
+ $(ACE_ROOT)/ace/DEV_Addr.i
+.obj/DEV_Connector.o .obj/DEV_Connector.so .shobj/DEV_Connector.o .shobj/DEV_Connector.so: DEV_Connector.cpp \
+ $(ACE_ROOT)/ace/DEV_Connector.h \
+ $(ACE_ROOT)/ace/DEV_IO.h \
+ $(ACE_ROOT)/ace/DEV.h \
+ $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IO_SAP.i \
+ $(ACE_ROOT)/ace/DEV_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/DEV_Addr.i \
+ $(ACE_ROOT)/ace/DEV.i \
+ $(ACE_ROOT)/ace/DEV_IO.i \
+ $(ACE_ROOT)/ace/DEV_Connector.i
+.obj/DEV_IO.o .obj/DEV_IO.so .shobj/DEV_IO.o .shobj/DEV_IO.so: DEV_IO.cpp \
+ $(ACE_ROOT)/ace/DEV_IO.h \
+ $(ACE_ROOT)/ace/DEV.h \
+ $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IO_SAP.i \
+ $(ACE_ROOT)/ace/DEV_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/DEV_Addr.i \
+ $(ACE_ROOT)/ace/DEV.i \
+ $(ACE_ROOT)/ace/DEV_IO.i
 .obj/Dirent.o .obj/Dirent.so .shobj/Dirent.o .shobj/Dirent.so: Dirent.cpp
+.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.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.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/Dump.h \
+ $(ACE_ROOT)/ace/Dump_T.h \
+ $(ACE_ROOT)/ace/Dump_T.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
 .obj/Dynamic.o .obj/Dynamic.so .shobj/Dynamic.o .shobj/Dynamic.so: Dynamic.cpp \
  $(ACE_ROOT)/ace/Dynamic.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
@@ -786,21 +1143,101 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Dynamic.i
+.obj/Event_Handler.o .obj/Event_Handler.so .shobj/Event_Handler.o .shobj/Event_Handler.so: Event_Handler.cpp \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.i \
+ $(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_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/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/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i
 .obj/Filecache.o .obj/Filecache.so .shobj/Filecache.o .shobj/Filecache.so: Filecache.cpp \
  $(ACE_ROOT)/ace/Filecache.h \
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Mem_Map.i \
  $(ACE_ROOT)/ace/Synch_T.h \
@@ -818,12 +1255,6 @@ endif # GHS
  $(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 \
@@ -834,7 +1265,6 @@ endif # GHS
  $(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 \
@@ -855,8 +1285,6 @@ endif # GHS
  $(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 \
@@ -867,22 +1295,273 @@ endif # GHS
  $(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/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i
+.obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp $(ACE_ROOT)/ace/FIFO.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/FIFO.i
+.obj/FIFO_Recv.o .obj/FIFO_Recv.so .shobj/FIFO_Recv.o .shobj/FIFO_Recv.so: FIFO_Recv.cpp \
+ $(ACE_ROOT)/ace/FIFO_Recv.h \
+ $(ACE_ROOT)/ace/FIFO.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/FIFO.i \
+ $(ACE_ROOT)/ace/FIFO_Recv.i
+.obj/FIFO_Recv_Msg.o .obj/FIFO_Recv_Msg.so .shobj/FIFO_Recv_Msg.o .shobj/FIFO_Recv_Msg.so: FIFO_Recv_Msg.cpp \
+ $(ACE_ROOT)/ace/FIFO_Recv_Msg.h \
+ $(ACE_ROOT)/ace/FIFO_Recv.h \
+ $(ACE_ROOT)/ace/FIFO.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/FIFO.i \
+ $(ACE_ROOT)/ace/FIFO_Recv.i \
+ $(ACE_ROOT)/ace/FIFO_Recv_Msg.i
+.obj/FIFO_Send.o .obj/FIFO_Send.so .shobj/FIFO_Send.o .shobj/FIFO_Send.so: FIFO_Send.cpp \
+ $(ACE_ROOT)/ace/FIFO_Send.h \
+ $(ACE_ROOT)/ace/FIFO.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/FIFO.i \
+ $(ACE_ROOT)/ace/FIFO_Send.i
+.obj/FIFO_Send_Msg.o .obj/FIFO_Send_Msg.so .shobj/FIFO_Send_Msg.o .shobj/FIFO_Send_Msg.so: FIFO_Send_Msg.cpp \
+ $(ACE_ROOT)/ace/FIFO_Send_Msg.h \
+ $(ACE_ROOT)/ace/FIFO_Send.h \
+ $(ACE_ROOT)/ace/FIFO.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/FIFO.i \
+ $(ACE_ROOT)/ace/FIFO_Send.i \
+ $(ACE_ROOT)/ace/FIFO_Send_Msg.i
+.obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp $(ACE_ROOT)/ace/FILE.h \
+ $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/FILE.i
+.obj/FILE_Addr.o .obj/FILE_Addr.so .shobj/FILE_Addr.o .shobj/FILE_Addr.so: FILE_Addr.cpp \
+ $(ACE_ROOT)/ace/FILE_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Addr.i \
+ $(ACE_ROOT)/ace/FILE_Addr.i
+.obj/FILE_Connector.o .obj/FILE_Connector.so .shobj/FILE_Connector.o .shobj/FILE_Connector.so: FILE_Connector.cpp \
+ $(ACE_ROOT)/ace/FILE_Connector.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 \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/FILE.i \
+ $(ACE_ROOT)/ace/FILE_IO.i \
+ $(ACE_ROOT)/ace/FILE_Connector.i
+.obj/FILE_IO.o .obj/FILE_IO.so .shobj/FILE_IO.o .shobj/FILE_IO.so: FILE_IO.cpp \
+ $(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 \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/FILE.i \
+ $(ACE_ROOT)/ace/FILE_IO.i
 .obj/Functor.o .obj/Functor.so .shobj/Functor.o .shobj/Functor.so: Functor.cpp \
  $(ACE_ROOT)/ace/Functor_T.h \
  $(ACE_ROOT)/ace/Functor.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.i \
@@ -892,38 +1571,66 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Get_Opt.i
+.obj/Handle_Set.o .obj/Handle_Set.so .shobj/Handle_Set.o .shobj/Handle_Set.so: Handle_Set.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Handle_Set.i
 .obj/Hash_Map_Manager.o .obj/Hash_Map_Manager.so .shobj/Hash_Map_Manager.o .shobj/Hash_Map_Manager.so: Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/Synch.h \
@@ -948,7 +1655,6 @@ endif # GHS
  $(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 \
@@ -971,8 +1677,6 @@ endif # GHS
  $(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 \
@@ -983,26 +1687,32 @@ endif # GHS
  $(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/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i
 .obj/High_Res_Timer.o .obj/High_Res_Timer.so .shobj/High_Res_Timer.o .shobj/High_Res_Timer.so: High_Res_Timer.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/High_Res_Timer.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 \
@@ -1041,174 +1751,131 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Stats.i
-.obj/Method_Request.o .obj/Method_Request.so .shobj/Method_Request.o .shobj/Method_Request.so: Method_Request.cpp \
- $(ACE_ROOT)/ace/Method_Request.h \
+.obj/INET_Addr.o .obj/INET_Addr.so .shobj/INET_Addr.o .shobj/INET_Addr.so: INET_Addr.cpp \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Object_Manager.o .obj/Object_Manager.so .shobj/Object_Manager.o .shobj/Object_Manager.so: Object_Manager.cpp \
- $(ACE_ROOT)/ace/Object_Manager.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/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i
+.obj/IOStream.o .obj/IOStream.so .shobj/IOStream.o .shobj/IOStream.so: IOStream.cpp \
+ $(ACE_ROOT)/ace/IOStream.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/Token_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 \
- $(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 \
- $(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 \
- $(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 \
- $(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/Local_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Manager.i \
- $(ACE_ROOT)/ace/Naming_Context.h \
- $(ACE_ROOT)/ace/Name_Proxy.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
  $(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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Service_Manager.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Service_Manager.i
-.obj/Profile_Timer.o .obj/Profile_Timer.so .shobj/Profile_Timer.o .shobj/Profile_Timer.so: Profile_Timer.cpp \
- $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/IOStream_T.h \
+ $(ACE_ROOT)/ace/IOStream_T.i \
+ $(ACE_ROOT)/ace/IOStream_T.cpp
+.obj/IO_SAP.o .obj/IO_SAP.so .shobj/IO_SAP.o .shobj/IO_SAP.so: IO_SAP.cpp \
+ $(ACE_ROOT)/ace/IO_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Registry.o .obj/Registry.so .shobj/Registry.o .shobj/Registry.so: Registry.cpp \
- $(ACE_ROOT)/ace/Registry.h \
+ $(ACE_ROOT)/ace/IO_SAP.i
+.obj/IPC_SAP.o .obj/IPC_SAP.so .shobj/IPC_SAP.o .shobj/IPC_SAP.so: IPC_SAP.cpp \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/SString.o .obj/SString.so .shobj/SString.o .shobj/SString.so: SString.cpp \
- $(ACE_ROOT)/ace/Malloc.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/IPC_SAP.i
+.obj/Local_Name_Space.o .obj/Local_Name_Space.so .shobj/Local_Name_Space.o .shobj/Local_Name_Space.so: Local_Name_Space.cpp \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Local_Name_Space.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/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1232,11 +1899,6 @@ endif # GHS
  $(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 \
@@ -1246,13 +1908,29 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(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 \
@@ -1264,47 +1942,59 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Stats.o .obj/Stats.so .shobj/Stats.o .shobj/Stats.so: Stats.cpp \
- $(ACE_ROOT)/ace/Stats.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(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/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.cpp
+.obj/Local_Tokens.o .obj/Local_Tokens.so .shobj/Local_Tokens.o .shobj/Local_Tokens.so: Local_Tokens.cpp \
+ $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Containers.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/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 \
@@ -1321,298 +2011,289 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Stats.i
-.obj/System_Time.o .obj/System_Time.so .shobj/System_Time.o .shobj/System_Time.so: System_Time.cpp \
- $(ACE_ROOT)/ace/System_Time.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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 \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Manager.h \
+ $(ACE_ROOT)/ace/Token_Manager.i
+.obj/LSOCK.o .obj/LSOCK.so .shobj/LSOCK.o .shobj/LSOCK.so: LSOCK.cpp \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.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_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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/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
-.obj/Time_Request_Reply.o .obj/Time_Request_Reply.so .shobj/Time_Request_Reply.o .shobj/Time_Request_Reply.so: Time_Request_Reply.cpp \
- $(ACE_ROOT)/ace/Time_Request_Reply.h \
- $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/LSOCK.i
+.obj/LSOCK_Acceptor.o .obj/LSOCK_Acceptor.so .shobj/LSOCK_Acceptor.o .shobj/LSOCK_Acceptor.so: LSOCK_Acceptor.cpp \
+ $(ACE_ROOT)/ace/LSOCK_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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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
-.obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/LSOCK_Acceptor.i
+.obj/LSOCK_CODgram.o .obj/LSOCK_CODgram.so .shobj/LSOCK_CODgram.o .shobj/LSOCK_CODgram.so: LSOCK_CODgram.cpp \
+ $(ACE_ROOT)/ace/LSOCK_CODgram.h \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Timer_Hash.o .obj/Timer_Hash.so .shobj/Timer_Hash.o .shobj/Timer_Hash.so: Timer_Hash.cpp \
- $(ACE_ROOT)/ace/Timer_Hash.h \
- $(ACE_ROOT)/ace/Timer_Hash_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.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/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/LSOCK.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_CODgram.i \
+ $(ACE_ROOT)/ace/LSOCK_CODgram.i
+.obj/LSOCK_Connector.o .obj/LSOCK_Connector.so .shobj/LSOCK_Connector.o .shobj/LSOCK_Connector.so: LSOCK_Connector.cpp \
+ $(ACE_ROOT)/ace/LSOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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.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.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/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/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 \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_List_T.cpp
-.obj/Timer_Heap.o .obj/Timer_Heap.so .shobj/Timer_Heap.o .shobj/Timer_Heap.so: Timer_Heap.cpp \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i \
+ $(ACE_ROOT)/ace/LSOCK_Connector.i
+.obj/LSOCK_Dgram.o .obj/LSOCK_Dgram.so .shobj/LSOCK_Dgram.o .shobj/LSOCK_Dgram.so: LSOCK_Dgram.cpp \
+ $(ACE_ROOT)/ace/LSOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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.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.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/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/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 \
- $(ACE_ROOT)/ace/Timer_List_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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_Dgram.i \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Dgram.i
+.obj/LSOCK_Stream.o .obj/LSOCK_Stream.so .shobj/LSOCK_Stream.o .shobj/LSOCK_Stream.so: LSOCK_Stream.cpp \
+ $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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.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.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.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/UNIX_Addr.h \
+ $(ACE_ROOT)/ace/UNIX_Addr.i \
+ $(ACE_ROOT)/ace/LSOCK.h \
+ $(ACE_ROOT)/ace/LSOCK.i \
+ $(ACE_ROOT)/ace/LSOCK_Stream.i
+.obj/Log_Record.o .obj/Log_Record.so .shobj/Log_Record.o .shobj/Log_Record.so: Log_Record.cpp \
+ $(ACE_ROOT)/ace/Log_Record.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.i \
+ $(ACE_ROOT)/ace/OS.i \
+ $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/Log_Msg.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/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \
  $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(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/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 \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1636,6 +2317,11 @@ endif # GHS
  $(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 \
@@ -1644,50 +2330,66 @@ endif # GHS
  $(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/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp
-.obj/Timer_Wheel.o .obj/Timer_Wheel.so .shobj/Timer_Wheel.o .shobj/Timer_Wheel.so: Timer_Wheel.cpp \
- $(ACE_ROOT)/ace/Timer_Wheel.h \
- $(ACE_ROOT)/ace/Timer_Wheel_T.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Memory_Pool.i
+.obj/Mem_Map.o .obj/Mem_Map.so .shobj/Mem_Map.o .shobj/Mem_Map.so: Mem_Map.cpp \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Mem_Map.i
+.obj/Memory_Pool.o .obj/Memory_Pool.so .shobj/Memory_Pool.o .shobj/Memory_Pool.so: Memory_Pool.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Synch_T.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.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_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.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(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 \
@@ -1695,74 +2397,47 @@ endif # GHS
  $(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/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
-.obj/Dump.o .obj/Dump.so .shobj/Dump.o .shobj/Dump.so: Dump.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
+.obj/Message_Block.o .obj/Message_Block.so .shobj/Message_Block.o .shobj/Message_Block.so: Message_Block.cpp \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Event_Handler.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.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/Dump.h \
- $(ACE_ROOT)/ace/Dump_T.h \
- $(ACE_ROOT)/ace/Dump_T.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
-.obj/Log_Msg.o .obj/Log_Msg.so .shobj/Log_Msg.o .shobj/Log_Msg.so: Log_Msg.cpp \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/ACE.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.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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.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 \
@@ -1773,17 +2448,10 @@ endif # GHS
  $(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 \
@@ -1791,6 +2459,11 @@ endif # GHS
  $(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 \
@@ -1800,84 +2473,50 @@ endif # GHS
  $(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/SPIPE_Connector.h \
- $(ACE_ROOT)/ace/SPIPE_Stream.h \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
- $(ACE_ROOT)/ace/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
-.obj/Log_Record.o .obj/Log_Record.so .shobj/Log_Record.o .shobj/Log_Record.so: Log_Record.cpp \
- $(ACE_ROOT)/ace/Log_Record.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/Timeprobe.h
+.obj/Message_Queue.o .obj/Message_Queue.so .shobj/Message_Queue.o .shobj/Message_Queue.so: Message_Queue.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Trace.o .obj/Trace.so .shobj/Trace.o .shobj/Trace.so: Trace.cpp \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/ACE.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/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Activation_Queue.o .obj/Activation_Queue.so .shobj/Activation_Queue.o .shobj/Activation_Queue.so: Activation_Queue.cpp \
- $(ACE_ROOT)/ace/Activation_Queue.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.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/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/Message_Queue.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/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -1914,8 +2553,6 @@ endif # GHS
  $(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 \
@@ -1932,15 +2569,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1950,38 +2582,52 @@ endif # GHS
  $(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/Message_Queue.i
+.obj/Method_Request.o .obj/Method_Request.so .shobj/Method_Request.o .shobj/Method_Request.so: Method_Request.cpp \
  $(ACE_ROOT)/ace/Method_Request.h \
- $(ACE_ROOT)/ace/Activation_Queue.i
-.obj/Process.o .obj/Process.so .shobj/Process.o .shobj/Process.so: Process.cpp \
- $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Process.i \
- $(ACE_ROOT)/ace/ARGV.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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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 \
@@ -1995,161 +2641,234 @@ endif # GHS
  $(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/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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/ARGV.i
-.obj/Process_Manager.o .obj/Process_Manager.so .shobj/Process_Manager.o .shobj/Process_Manager.so: Process_Manager.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(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_Impl.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/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/Svc_Conf_Tokens.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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i
+.obj/Name_Proxy.o .obj/Name_Proxy.so .shobj/Name_Proxy.o .shobj/Name_Proxy.so: Name_Proxy.cpp \
+ $(ACE_ROOT)/ace/Name_Proxy.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Event_Handler.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.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/Process.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Process_Manager.h \
- $(ACE_ROOT)/ace/Process_Manager.i
-.obj/Synch.o .obj/Synch.so .shobj/Synch.o .shobj/Synch.so: Synch.cpp \
- $(ACE_ROOT)/ace/Thread.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/Thread.i \
- $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Signal.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_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/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/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/Synch_Options.o .obj/Synch_Options.so .shobj/Synch_Options.o .shobj/Synch_Options.so: Synch_Options.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(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/ACE.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h
+.obj/Name_Request_Reply.o .obj/Name_Request_Reply.so .shobj/Name_Request_Reply.o .shobj/Name_Request_Reply.so: Name_Request_Reply.cpp \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Synch_Options.i
-.obj/Thread.o .obj/Thread.so .shobj/Thread.o .shobj/Thread.so: Thread.cpp \
- $(ACE_ROOT)/ace/Thread.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.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread.i
-.obj/Thread_Manager.o .obj/Thread_Manager.so .shobj/Thread_Manager.o .shobj/Thread_Manager.so: Thread_Manager.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Name_Space.o .obj/Name_Space.so .shobj/Name_Space.o .shobj/Name_Space.so: Name_Space.cpp \
+ $(ACE_ROOT)/ace/Name_Space.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Event_Handler.i \
+ $(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/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/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 \
@@ -2166,29 +2885,72 @@ endif # GHS
  $(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
-.obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp \
- $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h
+.obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming_Context.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Thread.i \
- $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Naming_Context.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/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 \
@@ -2199,30 +2961,98 @@ endif # GHS
  $(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/Token.i
-.obj/Event_Handler.o .obj/Event_Handler.so .shobj/Event_Handler.o .shobj/Event_Handler.so: Event_Handler.cpp \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.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/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(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/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Remote_Name_Space.h \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.h \
+ $(ACE_ROOT)/ace/Local_Name_Space.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(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/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.cpp \
+ $(ACE_ROOT)/ace/Registry_Name_Space.h
+.obj/Object_Manager.o .obj/Object_Manager.so .shobj/Object_Manager.o .shobj/Object_Manager.so: Object_Manager.cpp \
+ $(ACE_ROOT)/ace/Object_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(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/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/Token_Manager.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2230,11 +3060,19 @@ endif # GHS
  $(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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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 \
@@ -2248,18 +3086,15 @@ 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 \
- $(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/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 \
@@ -2269,62 +3104,57 @@ endif # GHS
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/Handle_Set.o .obj/Handle_Set.so .shobj/Handle_Set.o .shobj/Handle_Set.so: Handle_Set.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Manager.i \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Service_Manager.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/Service_Manager.i
+.obj/Obstack.o .obj/Obstack.so .shobj/Obstack.o .shobj/Obstack.so: Obstack.cpp \
+ $(ACE_ROOT)/ace/Obstack.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/Handle_Set.i
-.obj/POSIX_Proactor.o .obj/POSIX_Proactor.so .shobj/POSIX_Proactor.o .shobj/POSIX_Proactor.so: POSIX_Proactor.cpp \
- $(ACE_ROOT)/ace/POSIX_Proactor.h \
- $(ACE_ROOT)/ace/Proactor_Impl.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
-.obj/Priority_Reactor.o .obj/Priority_Reactor.so .shobj/Priority_Reactor.o .shobj/Priority_Reactor.so: Priority_Reactor.cpp \
- $(ACE_ROOT)/ace/Priority_Reactor.h \
- $(ACE_ROOT)/ace/Containers.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(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/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -2348,6 +3178,11 @@ endif # GHS
  $(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 \
@@ -2357,58 +3192,38 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(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/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/Priority_Reactor.i
-.obj/Proactor.o .obj/Proactor.so .shobj/Proactor.o .shobj/Proactor.so: Proactor.cpp \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Obstack.i
+.obj/OS.o .obj/OS.so .shobj/OS.o .shobj/OS.so: OS.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Proactor_Impl.h \
- $(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/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.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/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.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 \
@@ -2416,13 +3231,17 @@ endif # GHS
  $(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/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 \
@@ -2430,15 +3249,20 @@ endif # GHS
  $(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/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 \
@@ -2450,12 +3274,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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 \
@@ -2469,18 +3287,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.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/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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2491,8 +3302,6 @@ endif # GHS
  $(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_T.i \
  $(ACE_ROOT)/ace/Task_T.cpp \
  $(ACE_ROOT)/ace/Module.h \
@@ -2501,24 +3310,34 @@ endif # GHS
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
+.obj/Parse_Node.o .obj/Parse_Node.so .shobj/Parse_Node.o .shobj/Parse_Node.so: Parse_Node.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.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/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -2526,22 +3345,12 @@ endif # GHS
  $(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/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(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 \
@@ -2549,6 +3358,9 @@ endif # GHS
  $(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 \
@@ -2561,18 +3373,26 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(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/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/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(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/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(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 \
@@ -2587,64 +3407,96 @@ endif # GHS
  $(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/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/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/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/TP_Reactor.h \
- $(ACE_ROOT)/ace/TP_Reactor.i
-.obj/Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so: Select_Reactor.cpp \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.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/Parse_Node.h \
+ $(ACE_ROOT)/ace/Parse_Node.i
+.obj/Pipe.o .obj/Pipe.so .shobj/Pipe.o .shobj/Pipe.so: Pipe.cpp \
+ $(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/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i
+.obj/Priority_Reactor.o .obj/Priority_Reactor.so .shobj/Priority_Reactor.o .shobj/Priority_Reactor.so: Priority_Reactor.cpp \
+ $(ACE_ROOT)/ace/Priority_Reactor.h \
+ $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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.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/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
@@ -2658,30 +3510,25 @@ endif # GHS
  $(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 \
  $(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.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/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.i \
@@ -2701,24 +3548,34 @@ endif # GHS
  $(ACE_ROOT)/ace/Timer_Heap_T.h \
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
  $(ACE_ROOT)/ace/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
-.obj/Select_Reactor_Base.o .obj/Select_Reactor_Base.so .shobj/Select_Reactor_Base.o .shobj/Select_Reactor_Base.so: Select_Reactor_Base.cpp \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/Priority_Reactor.i
+.obj/Proactor.o .obj/Proactor.so .shobj/Proactor.o .shobj/Proactor.so: Proactor.cpp \
+ $(ACE_ROOT)/ace/Proactor.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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 \
@@ -2728,12 +3585,9 @@ endif # GHS
  $(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 \
@@ -2747,66 +3601,66 @@ endif # GHS
  $(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.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/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/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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
-.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.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/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i
+.obj/Process.o .obj/Process.so .shobj/Process.o .shobj/Process.so: Process.cpp \
+ $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Process.i \
+ $(ACE_ROOT)/ace/ARGV.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/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 \
@@ -2820,146 +3674,107 @@ endif # GHS
  $(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 \
  $(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.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/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_Impl.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/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 \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.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/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/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Timer_Heap.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.h \
- $(ACE_ROOT)/ace/Timer_Heap_T.cpp
-.obj/Asynch_IO.o .obj/Asynch_IO.so .shobj/Asynch_IO.o .shobj/Asynch_IO.so: Asynch_IO.cpp \
- $(ACE_ROOT)/ace/Asynch_IO.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/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Memory_Pool.i \
+ $(ACE_ROOT)/ace/ARGV.i
+.obj/Process_Manager.o .obj/Process_Manager.so .shobj/Process_Manager.o .shobj/Process_Manager.so: Process_Manager.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Asynch_IO_Impl.o .obj/Asynch_IO_Impl.so .shobj/Asynch_IO_Impl.o .shobj/Asynch_IO_Impl.so: Asynch_IO_Impl.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_Impl.h
-.obj/POSIX_Asynch_IO.o .obj/POSIX_Asynch_IO.so .shobj/POSIX_Asynch_IO.o .shobj/POSIX_Asynch_IO.so: POSIX_Asynch_IO.cpp \
- $(ACE_ROOT)/ace/POSIX_Asynch_IO.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/Process_Manager.h \
+ $(ACE_ROOT)/ace/Process_Manager.i
+.obj/Profile_Timer.o .obj/Profile_Timer.so .shobj/Profile_Timer.o .shobj/Profile_Timer.so: Profile_Timer.cpp \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i
-.obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \
+ $(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/Time_Value.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i
+.obj/Reactor.o .obj/Reactor.so .shobj/Reactor.o .shobj/Reactor.so: Reactor.cpp \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -2985,7 +3800,6 @@ endif # GHS
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -3007,262 +3821,397 @@ endif # GHS
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.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/Svc_Conf_Tokens.h \
+ $(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/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/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/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/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i
-.obj/IPC_SAP.o .obj/IPC_SAP.so .shobj/IPC_SAP.o .shobj/IPC_SAP.so: IPC_SAP.cpp \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/TP_Reactor.h \
+ $(ACE_ROOT)/ace/TP_Reactor.i
+.obj/Read_Buffer.o .obj/Read_Buffer.so .shobj/Read_Buffer.o .shobj/Read_Buffer.so: Read_Buffer.cpp \
+ $(ACE_ROOT)/ace/Read_Buffer.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i
-.obj/LSOCK.o .obj/LSOCK.so .shobj/LSOCK.o .shobj/LSOCK.so: LSOCK.cpp \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.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/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/Read_Buffer.i \
+ $(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
+.obj/Registry.o .obj/Registry.so .shobj/Registry.o .shobj/Registry.so: Registry.cpp \
+ $(ACE_ROOT)/ace/Registry.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/LSOCK.i
-.obj/LSOCK_Acceptor.o .obj/LSOCK_Acceptor.so .shobj/LSOCK_Acceptor.o .shobj/LSOCK_Acceptor.so: LSOCK_Acceptor.cpp \
- $(ACE_ROOT)/ace/LSOCK_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/ACE.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Registry_Name_Space.o .obj/Registry_Name_Space.so .shobj/Registry_Name_Space.o .shobj/Registry_Name_Space.so: Registry_Name_Space.cpp \
+ $(ACE_ROOT)/ace/Registry_Name_Space.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Acceptor.i
-.obj/LSOCK_CODgram.o .obj/LSOCK_CODgram.so .shobj/LSOCK_CODgram.o .shobj/LSOCK_CODgram.so: LSOCK_CODgram.cpp \
- $(ACE_ROOT)/ace/LSOCK_CODgram.h \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/SOCK.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Remote_Name_Space.o .obj/Remote_Name_Space.so .shobj/Remote_Name_Space.o .shobj/Remote_Name_Space.so: Remote_Name_Space.cpp \
+ $(ACE_ROOT)/ace/Remote_Name_Space.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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/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/Name_Proxy.h \
+ $(ACE_ROOT)/ace/INET_Addr.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/LSOCK.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_CODgram.i \
- $(ACE_ROOT)/ace/LSOCK_CODgram.i
-.obj/LSOCK_Connector.o .obj/LSOCK_Connector.so .shobj/LSOCK_Connector.o .shobj/LSOCK_Connector.so: LSOCK_Connector.cpp \
- $(ACE_ROOT)/ace/LSOCK_Connector.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.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/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/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
- $(ACE_ROOT)/ace/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i \
- $(ACE_ROOT)/ace/LSOCK_Connector.i
-.obj/LSOCK_Dgram.o .obj/LSOCK_Dgram.so .shobj/LSOCK_Dgram.o .shobj/LSOCK_Dgram.so: LSOCK_Dgram.cpp \
- $(ACE_ROOT)/ace/LSOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
- $(ACE_ROOT)/ace/SOCK.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/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/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h
+.obj/Remote_Tokens.o .obj/Remote_Tokens.so .shobj/Remote_Tokens.o .shobj/Remote_Tokens.so: Remote_Tokens.cpp \
+ $(ACE_ROOT)/ace/Remote_Tokens.h \
+ $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_Dgram.i \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Dgram.i
-.obj/LSOCK_Stream.o .obj/LSOCK_Stream.so .shobj/LSOCK_Stream.o .shobj/LSOCK_Stream.so: LSOCK_Stream.cpp \
- $(ACE_ROOT)/ace/LSOCK_Stream.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.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/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/UNIX_Addr.h \
- $(ACE_ROOT)/ace/UNIX_Addr.i \
- $(ACE_ROOT)/ace/LSOCK.h \
- $(ACE_ROOT)/ace/LSOCK.i \
- $(ACE_ROOT)/ace/LSOCK_Stream.i
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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/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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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 \
+ $(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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp
 .obj/SOCK.o .obj/SOCK.so .shobj/SOCK.o .shobj/SOCK.so: SOCK.cpp $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3277,15 +4226,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3319,15 +4274,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3344,15 +4305,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3373,15 +4340,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3411,15 +4384,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3431,56 +4410,66 @@ endif # GHS
  $(ACE_ROOT)/ace/SOCK.i \
  $(ACE_ROOT)/ace/SOCK_Dgram.i \
  $(ACE_ROOT)/ace/SOCK_Dgram_Bcast.i
-.obj/SOCK_Dgram_Mcast.o .obj/SOCK_Dgram_Mcast.so .shobj/SOCK_Dgram_Mcast.o .shobj/SOCK_Dgram_Mcast.so: SOCK_Dgram_Mcast.cpp \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
- $(ACE_ROOT)/ace/SOCK_Dgram.h \
+.obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp \
+ $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_Dgram.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
-.obj/SOCK_IO.o .obj/SOCK_IO.so .shobj/SOCK_IO.o .shobj/SOCK_IO.so: SOCK_IO.cpp \
- $(ACE_ROOT)/ace/SOCK_IO.h \
+ $(ACE_ROOT)/ace/SOCK_IO.i
+.obj/SOCK_Dgram_Mcast.o .obj/SOCK_Dgram_Mcast.so .shobj/SOCK_Dgram_Mcast.o .shobj/SOCK_Dgram_Mcast.so: SOCK_Dgram_Mcast.cpp \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.h \
+ $(ACE_ROOT)/ace/SOCK_Dgram.h \
  $(ACE_ROOT)/ace/SOCK.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i
+ $(ACE_ROOT)/ace/SOCK_Dgram.i \
+ $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/INET_Addr.i \
+ $(ACE_ROOT)/ace/SOCK_Dgram_Mcast.i
 .obj/SOCK_Stream.o .obj/SOCK_Stream.so .shobj/SOCK_Stream.o .shobj/SOCK_Stream.so: SOCK_Stream.cpp \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
@@ -3488,15 +4477,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
@@ -3507,464 +4502,1133 @@ endif # GHS
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i
-.obj/Addr.o .obj/Addr.so .shobj/Addr.o .shobj/Addr.so: Addr.cpp $(ACE_ROOT)/ace/Addr.h \
+.obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp \
+ $(ACE_ROOT)/ace/SPIPE.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.i
-.obj/ATM_Addr.o .obj/ATM_Addr.so .shobj/ATM_Addr.o .shobj/ATM_Addr.so: ATM_Addr.cpp \
- $(ACE_ROOT)/ace/ATM_Addr.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE.i
+.obj/SPIPE_Acceptor.o .obj/SPIPE_Acceptor.so .shobj/SPIPE_Acceptor.o .shobj/SPIPE_Acceptor.so: SPIPE_Acceptor.cpp \
+ $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
+ $(ACE_ROOT)/ace/SPIPE_Stream.h \
+ $(ACE_ROOT)/ace/SPIPE.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/ATM_Addr.i
-.obj/DEV.o .obj/DEV.so .shobj/DEV.o .shobj/DEV.so: DEV.cpp $(ACE_ROOT)/ace/DEV.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE.i \
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
+.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 \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/DEV_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/DEV_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/DEV.i
-.obj/DEV_Addr.o .obj/DEV_Addr.so .shobj/DEV_Addr.o .shobj/DEV_Addr.so: DEV_Addr.cpp \
- $(ACE_ROOT)/ace/DEV_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i
+.obj/SPIPE_Connector.o .obj/SPIPE_Connector.so .shobj/SPIPE_Connector.o .shobj/SPIPE_Connector.so: SPIPE_Connector.cpp \
+ $(ACE_ROOT)/ace/SPIPE_Connector.h \
+ $(ACE_ROOT)/ace/SPIPE_Stream.h \
+ $(ACE_ROOT)/ace/SPIPE.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.i \
- $(ACE_ROOT)/ace/DEV_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h
-.obj/DEV_Connector.o .obj/DEV_Connector.so .shobj/DEV_Connector.o .shobj/DEV_Connector.so: DEV_Connector.cpp \
- $(ACE_ROOT)/ace/DEV_Connector.h \
- $(ACE_ROOT)/ace/DEV_IO.h \
- $(ACE_ROOT)/ace/DEV.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.h \
+ $(ACE_ROOT)/ace/Addr.h \
+ $(ACE_ROOT)/ace/Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE.i \
+ $(ACE_ROOT)/ace/SPIPE_Stream.i \
+ $(ACE_ROOT)/ace/SPIPE_Connector.i
+.obj/SPIPE_Stream.o .obj/SPIPE_Stream.so .shobj/SPIPE_Stream.o .shobj/SPIPE_Stream.so: SPIPE_Stream.cpp \
+ $(ACE_ROOT)/ace/SPIPE_Stream.h \
+ $(ACE_ROOT)/ace/SPIPE.h \
+ $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IO_SAP.i \
- $(ACE_ROOT)/ace/DEV_Addr.h \
+ $(ACE_ROOT)/ace/IPC_SAP.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/DEV_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE_Addr.i \
+ $(ACE_ROOT)/ace/SPIPE.i \
+ $(ACE_ROOT)/ace/SPIPE_Stream.i
+.obj/SString.o .obj/SString.so .shobj/SString.o .shobj/SString.so: SString.cpp \
+ $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/DEV.i \
- $(ACE_ROOT)/ace/DEV_IO.i \
- $(ACE_ROOT)/ace/DEV_Connector.i
-.obj/DEV_IO.o .obj/DEV_IO.so .shobj/DEV_IO.o .shobj/DEV_IO.so: DEV_IO.cpp \
- $(ACE_ROOT)/ace/DEV_IO.h \
- $(ACE_ROOT)/ace/DEV.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/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
+.obj/Sched_Params.o .obj/Sched_Params.so .shobj/Sched_Params.o .shobj/Sched_Params.so: Sched_Params.cpp \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/DEV_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/DEV_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/DEV.i \
- $(ACE_ROOT)/ace/DEV_IO.i
-.obj/FIFO.o .obj/FIFO.so .shobj/FIFO.o .shobj/FIFO.so: FIFO.cpp $(ACE_ROOT)/ace/FIFO.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Sched_Params.h \
+ $(ACE_ROOT)/ace/Sched_Params.i
+.obj/Select_Reactor_Base.o .obj/Select_Reactor_Base.so .shobj/Select_Reactor_Base.o .shobj/Select_Reactor_Base.so: Select_Reactor_Base.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/FIFO.i
-.obj/FIFO_Recv.o .obj/FIFO_Recv.so .shobj/FIFO_Recv.o .shobj/FIFO_Recv.so: FIFO_Recv.cpp \
- $(ACE_ROOT)/ace/FIFO_Recv.h \
- $(ACE_ROOT)/ace/FIFO.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/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/Mem_Map.h \
+ $(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 \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(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/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/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp
+.obj/Select_Reactor.o .obj/Select_Reactor.so .shobj/Select_Reactor.o .shobj/Select_Reactor.so: Select_Reactor.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/FIFO.i \
- $(ACE_ROOT)/ace/FIFO_Recv.i
-.obj/FIFO_Recv_Msg.o .obj/FIFO_Recv_Msg.so .shobj/FIFO_Recv_Msg.o .shobj/FIFO_Recv_Msg.so: FIFO_Recv_Msg.cpp \
- $(ACE_ROOT)/ace/FIFO_Recv_Msg.h \
- $(ACE_ROOT)/ace/FIFO_Recv.h \
- $(ACE_ROOT)/ace/FIFO.h \
- $(ACE_ROOT)/ace/IPC_SAP.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/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/Mem_Map.h \
+ $(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 \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i
+.obj/Shared_Memory.o .obj/Shared_Memory.so .shobj/Shared_Memory.o .shobj/Shared_Memory.so: Shared_Memory.cpp \
+ $(ACE_ROOT)/ace/Shared_Memory.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/FIFO.i \
- $(ACE_ROOT)/ace/FIFO_Recv.i \
- $(ACE_ROOT)/ace/FIFO_Recv_Msg.i
-.obj/FIFO_Send.o .obj/FIFO_Send.so .shobj/FIFO_Send.o .shobj/FIFO_Send.so: FIFO_Send.cpp \
- $(ACE_ROOT)/ace/FIFO_Send.h \
- $(ACE_ROOT)/ace/FIFO.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i
+.obj/Service_Config.o .obj/Service_Config.so .shobj/Service_Config.o .shobj/Service_Config.so: Service_Config.cpp \
+ $(ACE_ROOT)/ace/Svc_Conf.h \
+ $(ACE_ROOT)/ace/Obstack.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/FIFO.i \
- $(ACE_ROOT)/ace/FIFO_Send.i
-.obj/FIFO_Send_Msg.o .obj/FIFO_Send_Msg.so .shobj/FIFO_Send_Msg.o .shobj/FIFO_Send_Msg.so: FIFO_Send_Msg.cpp \
- $(ACE_ROOT)/ace/FIFO_Send_Msg.h \
- $(ACE_ROOT)/ace/FIFO_Send.h \
- $(ACE_ROOT)/ace/FIFO.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/Obstack.i \
+ $(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 \
+ $(ACE_ROOT)/ace/Parse_Node.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Parse_Node.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/ARGV.h \
+ $(ACE_ROOT)/ace/ARGV.i \
+ $(ACE_ROOT)/ace/Service_Manager.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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/Service_Manager.i \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp \
+ $(ACE_ROOT)/ace/Proactor.h \
+ $(ACE_ROOT)/ace/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(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/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i
+.obj/Service_Manager.o .obj/Service_Manager.so .shobj/Service_Manager.o .shobj/Service_Manager.so: Service_Manager.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/FIFO.i \
- $(ACE_ROOT)/ace/FIFO_Send.i \
- $(ACE_ROOT)/ace/FIFO_Send_Msg.i
-.obj/FILE_Addr.o .obj/FILE_Addr.so .shobj/FILE_Addr.o .shobj/FILE_Addr.so: FILE_Addr.cpp \
- $(ACE_ROOT)/ace/FILE_Addr.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.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/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/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Service_Config.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/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/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/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/Service_Manager.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/SOCK_Acceptor.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i \
+ $(ACE_ROOT)/ace/Service_Manager.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/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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Strategies_T.i \
+ $(ACE_ROOT)/ace/Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i
+.obj/Service_Object.o .obj/Service_Object.so .shobj/Service_Object.o .shobj/Service_Object.so: Service_Object.cpp \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.i \
- $(ACE_ROOT)/ace/FILE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h
-.obj/FILE.o .obj/FILE.so .shobj/FILE.o .shobj/FILE.so: FILE.cpp $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/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/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Service_Types.i
+.obj/Service_Types.o .obj/Service_Types.so .shobj/Service_Types.o .shobj/Service_Types.so: Service_Types.cpp \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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
-.obj/FILE_Connector.o .obj/FILE_Connector.so .shobj/FILE_Connector.o .shobj/FILE_Connector.so: FILE_Connector.cpp \
- $(ACE_ROOT)/ace/FILE_Connector.h \
- $(ACE_ROOT)/ace/FILE_IO.h \
- $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/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/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/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/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/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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_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.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Stream.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Stream.i \
+ $(ACE_ROOT)/ace/Stream.cpp
+.obj/Service_Repository.o .obj/Service_Repository.so .shobj/Service_Repository.o .shobj/Service_Repository.so: Service_Repository.cpp \
+ $(ACE_ROOT)/ace/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/FILE_Connector.i
-.obj/FILE_IO.o .obj/FILE_IO.so .shobj/FILE_IO.o .shobj/FILE_IO.so: FILE_IO.cpp \
- $(ACE_ROOT)/ace/FILE_IO.h \
- $(ACE_ROOT)/ace/FILE.h \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(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/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/Thread.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.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/Shared_Memory_MM.o .obj/Shared_Memory_MM.so .shobj/Shared_Memory_MM.o .shobj/Shared_Memory_MM.so: Shared_Memory_MM.cpp \
+ $(ACE_ROOT)/ace/Shared_Memory_MM.h \
+ $(ACE_ROOT)/ace/Shared_Memory.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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
-.obj/INET_Addr.o .obj/INET_Addr.so .shobj/INET_Addr.o .shobj/INET_Addr.so: INET_Addr.cpp \
- $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Mem_Map.h \
+ $(ACE_ROOT)/ace/Mem_Map.i \
+ $(ACE_ROOT)/ace/Shared_Memory_MM.i
+.obj/Shared_Memory_SV.o .obj/Shared_Memory_SV.so .shobj/Shared_Memory_SV.o .shobj/Shared_Memory_SV.so: Shared_Memory_SV.cpp \
+ $(ACE_ROOT)/ace/Shared_Memory_SV.h \
+ $(ACE_ROOT)/ace/Shared_Memory.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/IO_SAP.o .obj/IO_SAP.so .shobj/IO_SAP.o .shobj/IO_SAP.so: IO_SAP.cpp \
- $(ACE_ROOT)/ace/IO_SAP.h \
+ $(ACE_ROOT)/ace/SV_Shared_Memory.h \
+ $(ACE_ROOT)/ace/SV_Shared_Memory.i \
+ $(ACE_ROOT)/ace/Shared_Memory_SV.i
+.obj/Shared_Object.o .obj/Shared_Object.so .shobj/Shared_Object.o .shobj/Shared_Object.so: Shared_Object.cpp \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IO_SAP.i
-.obj/IOStream.o .obj/IOStream.so .shobj/IOStream.o .shobj/IOStream.so: IOStream.cpp \
- $(ACE_ROOT)/ace/IOStream.h \
+ $(ACE_ROOT)/ace/Shared_Object.i
+.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/IOStream_T.h \
- $(ACE_ROOT)/ace/IOStream_T.i \
- $(ACE_ROOT)/ace/IOStream_T.cpp
-.obj/Pipe.o .obj/Pipe.so .shobj/Pipe.o .shobj/Pipe.so: Pipe.cpp \
- $(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/Event_Handler.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.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/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/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/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/Stats.o .obj/Stats.so .shobj/Stats.o .shobj/Stats.so: Stats.cpp \
+ $(ACE_ROOT)/ace/Stats.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i
-.obj/Signal.o .obj/Signal.so .shobj/Signal.o .shobj/Signal.so: Signal.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/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/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/Stats.i
+.obj/Strategies.o .obj/Strategies.so .shobj/Strategies.o .shobj/Strategies.so: Strategies.cpp \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Event_Handler.i \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Timer_Queue.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/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -3972,9 +5636,6 @@ endif # GHS
  $(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 \
@@ -3986,235 +5647,825 @@ endif # GHS
  $(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 \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Strategies_T.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/Service_Config.i \
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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
+.obj/SV_Message.o .obj/SV_Message.so .shobj/SV_Message.o .shobj/SV_Message.so: SV_Message.cpp \
+ $(ACE_ROOT)/ace/SV_Message.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h
-.obj/SPIPE.o .obj/SPIPE.so .shobj/SPIPE.o .shobj/SPIPE.so: SPIPE.cpp \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Message.i
+.obj/SV_Message_Queue.o .obj/SV_Message_Queue.so .shobj/SV_Message_Queue.o .shobj/SV_Message_Queue.so: SV_Message_Queue.cpp \
+ $(ACE_ROOT)/ace/SV_Message_Queue.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/SPIPE.i
-.obj/SPIPE_Acceptor.o .obj/SPIPE_Acceptor.so .shobj/SPIPE_Acceptor.o .shobj/SPIPE_Acceptor.so: SPIPE_Acceptor.cpp \
- $(ACE_ROOT)/ace/SPIPE_Acceptor.h \
- $(ACE_ROOT)/ace/SPIPE_Stream.h \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Message.h \
+ $(ACE_ROOT)/ace/SV_Message.i \
+ $(ACE_ROOT)/ace/SV_Message_Queue.i
+.obj/SV_Semaphore_Complex.o .obj/SV_Semaphore_Complex.so .shobj/SV_Semaphore_Complex.o .shobj/SV_Semaphore_Complex.so: SV_Semaphore_Complex.cpp \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
-.obj/SPIPE_Connector.o .obj/SPIPE_Connector.so .shobj/SPIPE_Connector.o .shobj/SPIPE_Connector.so: SPIPE_Connector.cpp \
- $(ACE_ROOT)/ace/SPIPE_Connector.h \
- $(ACE_ROOT)/ace/SPIPE_Stream.h \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Complex.i
+.obj/SV_Semaphore_Simple.o .obj/SV_Semaphore_Simple.so .shobj/SV_Semaphore_Simple.o .shobj/SV_Semaphore_Simple.so: SV_Semaphore_Simple.cpp \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i \
- $(ACE_ROOT)/ace/SPIPE_Connector.i
-.obj/SPIPE_Stream.o .obj/SPIPE_Stream.so .shobj/SPIPE_Stream.o .shobj/SPIPE_Stream.so: SPIPE_Stream.cpp \
- $(ACE_ROOT)/ace/SPIPE_Stream.h \
- $(ACE_ROOT)/ace/SPIPE.h \
- $(ACE_ROOT)/ace/IPC_SAP.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Semaphore_Simple.i
+.obj/SV_Shared_Memory.o .obj/SV_Shared_Memory.so .shobj/SV_Shared_Memory.o .shobj/SV_Shared_Memory.so: SV_Shared_Memory.cpp \
+ $(ACE_ROOT)/ace/SV_Shared_Memory.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/SPIPE_Addr.i \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/SPIPE.i \
- $(ACE_ROOT)/ace/SPIPE_Stream.i
-.obj/SV_Message.o .obj/SV_Message.so .shobj/SV_Message.o .shobj/SV_Message.so: SV_Message.cpp \
- $(ACE_ROOT)/ace/SV_Message.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/SV_Shared_Memory.i
+.obj/Synch.o .obj/Synch.so .shobj/Synch.o .shobj/Synch.so: Synch.cpp \
+ $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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_Message.i
-.obj/SV_Message_Queue.o .obj/SV_Message_Queue.so .shobj/SV_Message_Queue.o .shobj/SV_Message_Queue.so: SV_Message_Queue.cpp \
- $(ACE_ROOT)/ace/SV_Message_Queue.h \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.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
+.obj/Synch_Options.o .obj/Synch_Options.so .shobj/Synch_Options.o .shobj/Synch_Options.so: Synch_Options.cpp \
+ $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/Synch_Options.i
+.obj/System_Time.o .obj/System_Time.so .shobj/System_Time.o .shobj/System_Time.so: System_Time.cpp \
+ $(ACE_ROOT)/ace/System_Time.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_Message.h \
- $(ACE_ROOT)/ace/SV_Message.i \
- $(ACE_ROOT)/ace/SV_Message_Queue.i
-.obj/SV_Semaphore_Complex.o .obj/SV_Semaphore_Complex.so .shobj/SV_Semaphore_Complex.o .shobj/SV_Semaphore_Complex.so: SV_Semaphore_Complex.cpp \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Signal.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_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/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/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
+.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \
+ $(ACE_ROOT)/ace/TP_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i
-.obj/SV_Semaphore_Simple.o .obj/SV_Semaphore_Simple.so .shobj/SV_Semaphore_Simple.o .shobj/SV_Semaphore_Simple.so: SV_Semaphore_Simple.cpp \
+ $(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/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/Mem_Map.h \
+ $(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 \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/TP_Reactor.i
+.obj/Task.o .obj/Task.so .shobj/Task.o .shobj/Task.so: Task.cpp $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/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
+.obj/Timer_Hash.o .obj/Timer_Hash.so .shobj/Timer_Hash.o .shobj/Timer_Hash.so: Timer_Hash.cpp \
+ $(ACE_ROOT)/ace/Timer_Hash.h \
+ $(ACE_ROOT)/ace/Timer_Hash_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_Simple.i
-.obj/SV_Shared_Memory.o .obj/SV_Shared_Memory.so .shobj/SV_Shared_Memory.o .shobj/SV_Shared_Memory.so: SV_Shared_Memory.cpp \
- $(ACE_ROOT)/ace/SV_Shared_Memory.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/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 \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp
+.obj/Timer_Heap.o .obj/Timer_Heap.so .shobj/Timer_Heap.o .shobj/Timer_Heap.so: Timer_Heap.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/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 \
+ $(ACE_ROOT)/ace/Timer_List_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/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 \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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.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/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/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/Timer_Queue.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp
+.obj/Timer_Wheel.o .obj/Timer_Wheel.so .shobj/Timer_Wheel.o .shobj/Timer_Wheel.so: Timer_Wheel.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel.h \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_Shared_Memory.i
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
+ $(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/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
 .obj/TLI.o .obj/TLI.so .shobj/TLI.o .shobj/TLI.so: TLI.cpp $(ACE_ROOT)/ace/TLI.h \
  $(ACE_ROOT)/ace/IPC_SAP.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
@@ -4227,15 +6478,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
@@ -4252,15 +6509,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Handle_Set.i \
  $(ACE_ROOT)/ace/TLI_Connector.h \
@@ -4282,15 +6545,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IPC_SAP.i \
  $(ACE_ROOT)/ace/Addr.h \
@@ -4299,28 +6568,549 @@ endif # GHS
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/TLI_Stream.i
+.obj/Thread.o .obj/Thread.so .shobj/Thread.o .shobj/Thread.so: Thread.cpp \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Thread.i
+.obj/Thread_Manager.o .obj/Thread_Manager.so .shobj/Thread_Manager.o .shobj/Thread_Manager.so: Thread_Manager.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.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.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/Thread_Manager.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/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/Dynamic.h \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i
+.obj/Timeprobe.o .obj/Timeprobe.so .shobj/Timeprobe.o .shobj/Timeprobe.so: Timeprobe.cpp \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Time_Request_Reply.o .obj/Time_Request_Reply.so .shobj/Time_Request_Reply.o .shobj/Time_Request_Reply.so: Time_Request_Reply.cpp \
+ $(ACE_ROOT)/ace/Time_Request_Reply.h \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Token.o .obj/Token.so .shobj/Token.o .shobj/Token.so: Token.cpp \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Thread.i \
+ $(ACE_ROOT)/ace/Token.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/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(ACE_ROOT)/ace/Token.i
+.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 \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/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/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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/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/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 \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Collection.i
+.obj/Token_Invariants.o .obj/Token_Invariants.so .shobj/Token_Invariants.o .shobj/Token_Invariants.so: Token_Invariants.cpp \
+ $(ACE_ROOT)/ace/Token_Invariants.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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/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/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 \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Invariants.i
+.obj/Token_Manager.o .obj/Token_Manager.so .shobj/Token_Manager.o .shobj/Token_Manager.so: Token_Manager.cpp \
+ $(ACE_ROOT)/ace/Token_Manager.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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/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/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 \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Manager.i
+.obj/Token_Request_Reply.o .obj/Token_Request_Reply.so .shobj/Token_Request_Reply.o .shobj/Token_Request_Reply.so: Token_Request_Reply.cpp \
+ $(ACE_ROOT)/ace/Token_Request_Reply.h \
+ $(ACE_ROOT)/ace/Local_Tokens.h \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.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.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/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/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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 \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Token_Request_Reply.i
+.obj/Trace.o .obj/Trace.so .shobj/Trace.o .shobj/Trace.so: Trace.cpp \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/ACE.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/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
 .obj/TTY_IO.o .obj/TTY_IO.so .shobj/TTY_IO.o .shobj/TTY_IO.so: TTY_IO.cpp \
  $(ACE_ROOT)/ace/TTY_IO.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/DEV_Addr.h \
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/DEV_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/DEV_Connector.h \
  $(ACE_ROOT)/ace/DEV_IO.h \
  $(ACE_ROOT)/ace/DEV.h \
@@ -4335,15 +7125,21 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.i \
  $(ACE_ROOT)/ace/UNIX_Addr.i
@@ -4354,20 +7150,25 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IO_Cntl_Msg.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 \
@@ -4423,8 +7224,6 @@ endif # GHS
  $(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 \
@@ -4441,15 +7240,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -4492,20 +7286,25 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IO_Cntl_Msg.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 \
@@ -4561,8 +7360,6 @@ endif # GHS
  $(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 \
@@ -4579,15 +7376,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -4628,20 +7420,25 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/IO_Cntl_Msg.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 \
@@ -4697,8 +7494,6 @@ endif # GHS
  $(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 \
@@ -4715,15 +7510,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -4755,56 +7545,43 @@ endif # GHS
  $(ACE_ROOT)/ace/SPIPE.i \
  $(ACE_ROOT)/ace/UPIPE_Addr.h \
  $(ACE_ROOT)/ace/UPIPE_Stream.i
-.obj/DLL.o .obj/DLL.so .shobj/DLL.o .shobj/DLL.so: DLL.cpp $(ACE_ROOT)/ace/DLL.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
-.obj/Parse_Node.o .obj/Parse_Node.so .shobj/Parse_Node.o .shobj/Parse_Node.so: Parse_Node.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+.obj/WFMO_Reactor.o .obj/WFMO_Reactor.so .shobj/WFMO_Reactor.o .shobj/WFMO_Reactor.so: WFMO_Reactor.cpp \
+ $(ACE_ROOT)/ace/WFMO_Reactor.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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/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 \
@@ -4827,28 +7604,11 @@ endif # GHS
  $(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/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/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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 \
@@ -4861,117 +7621,73 @@ endif # GHS
  $(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/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/Svc_Conf_Tokens.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/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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(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/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/Parse_Node.h \
- $(ACE_ROOT)/ace/Parse_Node.i
-.obj/Service_Config.o .obj/Service_Config.so .shobj/Service_Config.o .shobj/Service_Config.so: Service_Config.cpp \
- $(ACE_ROOT)/ace/Svc_Conf.h \
- $(ACE_ROOT)/ace/Obstack.h \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Timer_Heap.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.h \
+ $(ACE_ROOT)/ace/Timer_Heap_T.cpp
+.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Obstack.i \
- $(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 \
- $(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/Parse_Node.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Parse_Node.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/ARGV.h \
- $(ACE_ROOT)/ace/ARGV.i \
- $(ACE_ROOT)/ace/Service_Manager.h \
+ $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/SOCK_Stream.h \
  $(ACE_ROOT)/ace/SOCK_IO.h \
  $(ACE_ROOT)/ace/SOCK.h \
@@ -4984,60 +7700,16 @@ endif # GHS
  $(ACE_ROOT)/ace/INET_Addr.h \
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/SOCK_Acceptor.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Service_Manager.i \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(ACE_ROOT)/ace/Proactor.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/Service_Manager.o .obj/Service_Manager.so .shobj/Service_Manager.o .shobj/Service_Manager.so: Service_Manager.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/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.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/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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/XtReactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
  $(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 \
@@ -5060,299 +7732,49 @@ endif # GHS
  $(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/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/Service_Manager.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/SOCK_Acceptor.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/Service_Manager.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/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/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/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i
-.obj/Service_Object.o .obj/Service_Object.so .shobj/Service_Object.o .shobj/Service_Object.so: Service_Object.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.i
-.obj/Service_Repository.o .obj/Service_Repository.so .shobj/Service_Repository.o .shobj/Service_Repository.so: Service_Repository.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.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/Service_Types.o .obj/Service_Types.so .shobj/Service_Types.o .shobj/Service_Types.so: Service_Types.cpp \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Task.h \
- $(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/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 \
  $(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/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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_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.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp
-.obj/Shared_Object.o .obj/Shared_Object.so .shobj/Shared_Object.o .shobj/Shared_Object.so: Shared_Object.cpp \
- $(ACE_ROOT)/ace/Shared_Object.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/Shared_Object.i
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i
 .obj/Svc_Conf_l.o .obj/Svc_Conf_l.so .shobj/Svc_Conf_l.o .shobj/Svc_Conf_l.so: Svc_Conf_l.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Svc_Conf.h \
  $(ACE_ROOT)/ace/Obstack.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 \
@@ -5396,8 +7818,6 @@ endif # GHS
  $(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 \
@@ -5418,18 +7838,23 @@ endif # GHS
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5476,8 +7901,6 @@ endif # GHS
  $(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 \
@@ -5512,15 +7935,10 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5542,87 +7960,35 @@ endif # GHS
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/Stream.i \
  $(ACE_ROOT)/ace/Stream.cpp
-.obj/CDR_Stream.o .obj/CDR_Stream.so .shobj/CDR_Stream.o .shobj/CDR_Stream.so: CDR_Stream.cpp \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
+.obj/Acceptor.o .obj/Acceptor.so .shobj/Acceptor.o .shobj/Acceptor.so: Acceptor.cpp \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Log_Record.i \
+ $(ACE_ROOT)/ace/Acceptor.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/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/Service_Object.i \
  $(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
-.obj/Message_Block.o .obj/Message_Block.so .shobj/Message_Block.o .shobj/Message_Block.so: Message_Block.cpp \
- $(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_T.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5630,111 +7996,34 @@ endif # GHS
  $(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/Timeprobe.h
-.obj/Message_Queue.o .obj/Message_Queue.so .shobj/Message_Queue.o .shobj/Message_Queue.so: Message_Queue.cpp \
- $(ACE_ROOT)/ace/Message_Queue.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_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/Mem_Map.h \
+ $(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/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/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/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 \
@@ -5746,20 +8035,31 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(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/Thread_Manager.h \
  $(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/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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5769,30 +8069,97 @@ endif # GHS
  $(ACE_ROOT)/ace/WFMO_Reactor.h \
  $(ACE_ROOT)/ace/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i
-.obj/Task.o .obj/Task.so .shobj/Task.o .shobj/Task.so: Task.cpp $(ACE_ROOT)/ace/Task.h \
+ $(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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp
+.obj/Asynch_Acceptor.o .obj/Asynch_Acceptor.so .shobj/Asynch_Acceptor.o .shobj/Asynch_Acceptor.so: Asynch_Acceptor.cpp \
+ $(ACE_ROOT)/ace/Asynch_Acceptor.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Auto_Ptr.o .obj/Auto_Ptr.so .shobj/Auto_Ptr.o .shobj/Auto_Ptr.so: Auto_Ptr.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Auto_Ptr.i \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp
+.obj/Connector.o .obj/Connector.so .shobj/Connector.o .shobj/Connector.so: Connector.cpp \
+ $(ACE_ROOT)/ace/Connector.h \
+ $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -5801,10 +8168,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
  $(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 \
@@ -5818,16 +8186,34 @@ endif # GHS
  $(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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.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/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(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/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.i \
  $(ACE_ROOT)/ace/Task.i \
  $(ACE_ROOT)/ace/Task_T.h \
@@ -5843,32 +8229,11 @@ endif # GHS
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5886,23 +8251,37 @@ endif # GHS
  $(ACE_ROOT)/ace/Module.cpp \
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
- $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp \
+ $(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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i \
+ $(ACE_ROOT)/ace/Connector.i \
+ $(ACE_ROOT)/ace/Connector.cpp
+.obj/Containers_T.o .obj/Containers_T.so .shobj/Containers_T.o .shobj/Containers_T.so: Containers_T.cpp \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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 \
@@ -5940,39 +8319,70 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i
-.obj/Mem_Map.o .obj/Mem_Map.so .shobj/Mem_Map.o .shobj/Mem_Map.so: Mem_Map.cpp \
- $(ACE_ROOT)/ace/Mem_Map.h \
+.obj/Dump_T.o .obj/Dump_T.so .shobj/Dump_T.o .shobj/Dump_T.so: Dump_T.cpp \
+ $(ACE_ROOT)/ace/Dump_T.h \
+ $(ACE_ROOT)/ace/Dump.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Mem_Map.i
-.obj/Memory_Pool.o .obj/Memory_Pool.so .shobj/Memory_Pool.o .shobj/Memory_Pool.so: Memory_Pool.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.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/Dump_T.cpp
+.obj/Dynamic_Service.o .obj/Dynamic_Service.so .shobj/Dynamic_Service.o .shobj/Dynamic_Service.so: Dynamic_Service.cpp \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Shared_Object.i \
  $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -5987,7 +8397,6 @@ endif # GHS
  $(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 \
@@ -6000,38 +8409,163 @@ endif # GHS
  $(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/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/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-.obj/Obstack.o .obj/Obstack.so .shobj/Obstack.o .shobj/Obstack.so: Obstack.cpp \
- $(ACE_ROOT)/ace/Obstack.h \
- $(ACE_ROOT)/ace/Malloc.h \
+ $(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/Service_Repository.h \
+ $(ACE_ROOT)/ace/Service_Types.h \
+ $(ACE_ROOT)/ace/Service_Types.i \
+ $(ACE_ROOT)/ace/Service_Repository.i \
+ $(ACE_ROOT)/ace/Dynamic_Service.h \
+ $(ACE_ROOT)/ace/Dynamic_Service.cpp
+.obj/Env_Value_T.o .obj/Env_Value_T.so .shobj/Env_Value_T.o .shobj/Env_Value_T.so: Env_Value_T.cpp \
+ $(ACE_ROOT)/ace/Env_Value_T.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Env_Value_T.i \
+ $(ACE_ROOT)/ace/Env_Value_T.cpp
+.obj/Event_Handler_T.o .obj/Event_Handler_T.so .shobj/Event_Handler_T.o .shobj/Event_Handler_T.so: Event_Handler_T.cpp \
+ $(ACE_ROOT)/ace/Event_Handler_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.i
+.obj/Free_List.o .obj/Free_List.so .shobj/Free_List.o .shobj/Free_List.so: Free_List.cpp \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp
+.obj/Functor_T.o .obj/Functor_T.so .shobj/Functor_T.o .shobj/Functor_T.so: Functor_T.cpp \
+ $(ACE_ROOT)/ace/Functor_T.h \
+ $(ACE_ROOT)/ace/Functor.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.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/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Functor.i \
+ $(ACE_ROOT)/ace/Functor_T.i \
+ $(ACE_ROOT)/ace/Functor_T.cpp
+.obj/Future.o .obj/Future.so .shobj/Future.o .shobj/Future.so: Future.cpp \
+ $(ACE_ROOT)/ace/Future.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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 \
@@ -6045,47 +8579,29 @@ endif # GHS
  $(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/Obstack.i
-.obj/Read_Buffer.o .obj/Read_Buffer.so .shobj/Read_Buffer.o .shobj/Read_Buffer.so: Read_Buffer.cpp \
- $(ACE_ROOT)/ace/Read_Buffer.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Future.cpp
+.obj/Hash_Map_Manager_T.o .obj/Hash_Map_Manager_T.so .shobj/Hash_Map_Manager_T.o .shobj/Hash_Map_Manager_T.so: Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -6100,35 +8616,36 @@ endif # GHS
  $(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/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/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/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/Read_Buffer.i \
- $(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 \
@@ -6140,97 +8657,79 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h
-.obj/Shared_Memory.o .obj/Shared_Memory.so .shobj/Shared_Memory.o .shobj/Shared_Memory.so: Shared_Memory.cpp \
- $(ACE_ROOT)/ace/Shared_Memory.h \
- $(ACE_ROOT)/ace/ACE.h \
+.obj/IOStream_T.o .obj/IOStream_T.so .shobj/IOStream_T.o .shobj/IOStream_T.so: IOStream_T.cpp \
+ $(ACE_ROOT)/ace/IOStream_T.h \
+ $(ACE_ROOT)/ace/IOStream.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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
-.obj/Shared_Memory_MM.o .obj/Shared_Memory_MM.so .shobj/Shared_Memory_MM.o .shobj/Shared_Memory_MM.so: Shared_Memory_MM.cpp \
- $(ACE_ROOT)/ace/Shared_Memory_MM.h \
- $(ACE_ROOT)/ace/Shared_Memory.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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Shared_Memory_MM.i
-.obj/Shared_Memory_SV.o .obj/Shared_Memory_SV.so .shobj/Shared_Memory_SV.o .shobj/Shared_Memory_SV.so: Shared_Memory_SV.cpp \
- $(ACE_ROOT)/ace/Shared_Memory_SV.h \
- $(ACE_ROOT)/ace/Shared_Memory.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/SV_Shared_Memory.h \
- $(ACE_ROOT)/ace/SV_Shared_Memory.i \
- $(ACE_ROOT)/ace/Shared_Memory_SV.i
-.obj/Local_Tokens.o .obj/Local_Tokens.so .shobj/Local_Tokens.o .shobj/Local_Tokens.so: Local_Tokens.cpp \
- $(ACE_ROOT)/ace/Thread.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/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/IOStream_T.i \
+ $(ACE_ROOT)/ace/IOStream_T.cpp
+.obj/Local_Name_Space_T.o .obj/Local_Name_Space_T.so .shobj/Local_Name_Space_T.o .shobj/Local_Name_Space_T.so: Local_Name_Space_T.cpp \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Thread.i \
- $(ACE_ROOT)/ace/Local_Tokens.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Local_Name_Space.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/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/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 \
@@ -6247,18 +8746,29 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
  $(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 \
@@ -6270,65 +8780,136 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Manager.h \
- $(ACE_ROOT)/ace/Token_Manager.i
-.obj/Remote_Tokens.o .obj/Remote_Tokens.so .shobj/Remote_Tokens.o .shobj/Remote_Tokens.so: Remote_Tokens.cpp \
- $(ACE_ROOT)/ace/Remote_Tokens.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(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/Hash_Map_Manager.i \
+ $(ACE_ROOT)/ace/Local_Name_Space_T.cpp
+.obj/Malloc_T.o .obj/Malloc_T.so .shobj/Malloc_T.o .shobj/Malloc_T.so: Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Local_Tokens.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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/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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Memory_Pool.h \
+ $(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/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/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
+.obj/Managed_Object.o .obj/Managed_Object.so .shobj/Managed_Object.o .shobj/Managed_Object.so: Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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/Object_Manager.h \
+ $(ACE_ROOT)/ace/Object_Manager.i \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp
+.obj/Map_Manager.o .obj/Map_Manager.so .shobj/Map_Manager.o .shobj/Map_Manager.so: Map_Manager.cpp \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
@@ -6336,6 +8917,11 @@ endif # GHS
  $(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 \
@@ -6345,16 +8931,11 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.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/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -6366,29 +8947,34 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(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/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 \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.cpp
+.obj/Message_Block_T.o .obj/Message_Block_T.so .shobj/Message_Block_T.o .shobj/Message_Block_T.so: Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/Message_Block_T.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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 \
@@ -6403,12 +8989,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/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 \
@@ -6430,45 +9010,35 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(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 \
- $(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/Local_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Collection.i
-.obj/Token_Invariants.o .obj/Token_Invariants.so .shobj/Token_Invariants.o .shobj/Token_Invariants.so: Token_Invariants.cpp \
- $(ACE_ROOT)/ace/Token_Invariants.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
+ $(ACE_ROOT)/ace/Message_Block_T.cpp
+.obj/Message_Queue_T.o .obj/Message_Queue_T.so .shobj/Message_Queue_T.o .shobj/Message_Queue_T.so: Message_Queue_T.cpp \
+ $(ACE_ROOT)/ace/Message_Queue.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -6482,13 +9052,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.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 \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6510,13 +9073,21 @@ endif # GHS
  $(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/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/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 \
@@ -6528,27 +9099,53 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Local_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Invariants.i
-.obj/Token_Manager.o .obj/Token_Manager.so .shobj/Token_Manager.o .shobj/Token_Manager.so: Token_Manager.cpp \
- $(ACE_ROOT)/ace/Token_Manager.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/WFMO_Reactor.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(ACE_ROOT)/ace/Message_Queue.i
+.obj/Module.o .obj/Module.so .shobj/Module.o .shobj/Module.so: Module.cpp \
+ $(ACE_ROOT)/ace/Module.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.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 \
@@ -6562,13 +9159,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.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 \
  $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
@@ -6590,13 +9180,21 @@ endif # GHS
  $(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/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/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 \
@@ -6608,43 +9206,100 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Local_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Manager.i
-.obj/Token_Request_Reply.o .obj/Token_Request_Reply.so .shobj/Token_Request_Reply.o .shobj/Token_Request_Reply.so: Token_Request_Reply.cpp \
- $(ACE_ROOT)/ace/Token_Request_Reply.h \
- $(ACE_ROOT)/ace/Local_Tokens.h \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/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_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(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
+.obj/RB_Tree.o .obj/RB_Tree.so .shobj/RB_Tree.o .shobj/RB_Tree.so: RB_Tree.cpp \
+ $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Event_Handler.i \
+ $(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/RB_Tree.i \
+ $(ACE_ROOT)/ace/RB_Tree.cpp
+.obj/Select_Reactor_T.o .obj/Select_Reactor_T.so .shobj/Select_Reactor_T.o .shobj/Select_Reactor_T.so: Select_Reactor_T.cpp \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Signal.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/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 \
@@ -6658,63 +9313,105 @@ endif # GHS
  $(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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.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/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/Handle_Set.h \
+ $(ACE_ROOT)/ace/Handle_Set.i \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/Token_Request_Reply.i
-.obj/CORBA_Handler.o .obj/CORBA_Handler.so .shobj/CORBA_Handler.o .shobj/CORBA_Handler.so: CORBA_Handler.cpp \
- $(ACE_ROOT)/ace/CORBA_Handler.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Reactor.h \
+ $(ACE_ROOT)/ace/Reactor.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i
+.obj/Singleton.o .obj/Singleton.so .shobj/Singleton.o .shobj/Singleton.so: Singleton.cpp \
+ $(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/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Shared_Object.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/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
+.obj/Strategies_T.o .obj/Strategies_T.so .shobj/Strategies_T.o .shobj/Strategies_T.so: Strategies_T.cpp \
+ $(ACE_ROOT)/ace/Strategies_T.h \
+ $(ACE_ROOT)/ace/Strategies.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.i \
+ $(ACE_ROOT)/ace/Strategies.i \
+ $(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/Synch.h \
@@ -6730,7 +9427,6 @@ endif # GHS
  $(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 \
@@ -6753,8 +9449,6 @@ endif # GHS
  $(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 \
@@ -6766,50 +9460,57 @@ endif # GHS
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.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
-.obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp \
- $(ACE_ROOT)/ace/CORBA_Ref.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(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/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
+.obj/Stream.o .obj/Stream.so .shobj/Stream.o .shobj/Stream.so: Stream.cpp \
+ $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/CORBA_Ref.i \
- $(ACE_ROOT)/ace/CORBA_Ref.cpp
-.obj/Local_Name_Space.o .obj/Local_Name_Space.so .shobj/Local_Name_Space.o .shobj/Local_Name_Space.so: Local_Name_Space.cpp \
- $(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/Local_Name_Space.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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/Log_Record.i \
+ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
+ $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -6834,6 +9535,11 @@ endif # GHS
  $(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 \
@@ -6843,24 +9549,19 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Local_Name_Space_T.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(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 \
+ $(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/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -6879,52 +9580,76 @@ endif # GHS
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Naming_Context.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/Local_Name_Space_T.cpp
-.obj/Msg_WFMO_Reactor.o .obj/Msg_WFMO_Reactor.so .shobj/Msg_WFMO_Reactor.o .shobj/Msg_WFMO_Reactor.so: Msg_WFMO_Reactor.cpp \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.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/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(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_T.i \
+ $(ACE_ROOT)/ace/Task_T.cpp \
+ $(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/Stream.i \
+ $(ACE_ROOT)/ace/Stream.cpp
+.obj/Stream_Modules.o .obj/Stream_Modules.so .shobj/Stream_Modules.o .shobj/Stream_Modules.so: Stream_Modules.cpp \
+ $(ACE_ROOT)/ace/Stream_Modules.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/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 \
@@ -6938,20 +9663,19 @@ endif # GHS
  $(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.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/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_Impl.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/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 \
@@ -6965,80 +9689,74 @@ endif # GHS
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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 \
  $(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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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/WFMO_Reactor.i \
  $(ACE_ROOT)/ace/Strategies.i \
  $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Msg_WFMO_Reactor.i
-.obj/Name_Proxy.o .obj/Name_Proxy.so .shobj/Name_Proxy.o .shobj/Name_Proxy.so: Name_Proxy.cpp \
- $(ACE_ROOT)/ace/Name_Proxy.h \
- $(ACE_ROOT)/ace/INET_Addr.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.i \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp
+.obj/Svc_Handler.o .obj/Svc_Handler.so .shobj/Svc_Handler.o .shobj/Svc_Handler.so: Svc_Handler.cpp \
+ $(ACE_ROOT)/ace/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.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/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.h \
+ $(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 \
@@ -7047,12 +9765,9 @@ endif # GHS
  $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
  $(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 \
@@ -7066,17 +9781,32 @@ endif # GHS
  $(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.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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -7088,51 +9818,93 @@ endif # GHS
  $(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/Name_Request_Reply.h
-.obj/Name_Request_Reply.o .obj/Name_Request_Reply.so .shobj/Name_Request_Reply.o .shobj/Name_Request_Reply.so: Name_Request_Reply.cpp \
- $(ACE_ROOT)/ace/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.h \
+ $(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/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/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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ $(ACE_ROOT)/ace/Dynamic.i
+.obj/Synch_T.o .obj/Synch_T.so .shobj/Synch_T.o .shobj/Synch_T.so: Synch_T.cpp \
+ $(ACE_ROOT)/ace/Thread.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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
-.obj/Name_Space.o .obj/Name_Space.so .shobj/Name_Space.o .shobj/Name_Space.so: Name_Space.cpp \
- $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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.i \
+ $(ACE_ROOT)/ace/Atomic_Op.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp
+.obj/Task_T.o .obj/Task_T.so .shobj/Task_T.o .shobj/Task_T.so: Task_T.cpp \
+ $(ACE_ROOT)/ace/Task_T.h \
+ $(ACE_ROOT)/ace/Message_Queue.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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -7157,6 +9929,11 @@ endif # GHS
  $(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 \
@@ -7166,22 +9943,16 @@ endif # GHS
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -7200,258 +9971,224 @@ endif # GHS
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
  $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Name_Request_Reply.h
-.obj/Naming_Context.o .obj/Naming_Context.so .shobj/Naming_Context.o .shobj/Naming_Context.so: Naming_Context.cpp \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(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_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/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_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
+.obj/Timeprobe_T.o .obj/Timeprobe_T.so .shobj/Timeprobe_T.o .shobj/Timeprobe_T.so: Timeprobe_T.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.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/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
+.obj/Timer_Hash_T.o .obj/Timer_Hash_T.so .shobj/Timer_Hash_T.o .shobj/Timer_Hash_T.so: Timer_Hash_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Hash_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Naming_Context.h \
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.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/Malloc.h \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(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/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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_Hash_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+.obj/Timer_Heap_T.o .obj/Timer_Heap_T.so .shobj/Timer_Heap_T.o .shobj/Timer_Heap_T.so: Timer_Heap_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Heap_T.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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Remote_Name_Space.h \
- $(ACE_ROOT)/ace/Local_Name_Space_T.h \
- $(ACE_ROOT)/ace/Local_Name_Space.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/Local_Name_Space_T.cpp \
- $(ACE_ROOT)/ace/Registry_Name_Space.h
-.obj/Registry_Name_Space.o .obj/Registry_Name_Space.so .shobj/Registry_Name_Space.o .shobj/Registry_Name_Space.so: Registry_Name_Space.cpp \
- $(ACE_ROOT)/ace/Registry_Name_Space.h \
+ $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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
-.obj/Remote_Name_Space.o .obj/Remote_Name_Space.so .shobj/Remote_Name_Space.o .shobj/Remote_Name_Space.so: Remote_Name_Space.cpp \
- $(ACE_ROOT)/ace/Remote_Name_Space.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.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/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/Log_Record.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Malloc_T.h \
  $(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/Mem_Map.h \
+ $(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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(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_Heap_T.cpp
+.obj/Timer_List_T.o .obj/Timer_List_T.so .shobj/Timer_List_T.o .shobj/Timer_List_T.so: Timer_List_T.cpp \
+ $(ACE_ROOT)/ace/Timer_List_T.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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h
-.obj/TP_Reactor.o .obj/TP_Reactor.so .shobj/TP_Reactor.o .shobj/TP_Reactor.so: TP_Reactor.cpp \
- $(ACE_ROOT)/ace/TP_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Event_Handler.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/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.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
+ $(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 \
@@ -7459,9 +10196,6 @@ endif # GHS
  $(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 \
@@ -7474,79 +10208,49 @@ endif # GHS
  $(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 \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/TP_Reactor.i
-.obj/XtReactor.o .obj/XtReactor.so .shobj/XtReactor.o .shobj/XtReactor.so: XtReactor.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
+ $(ACE_ROOT)/ace/Timer_List_T.cpp
+.obj/Timer_Queue_Adapters.o .obj/Timer_Queue_Adapters.so .shobj/Timer_Queue_Adapters.o .shobj/Timer_Queue_Adapters.so: Timer_Queue_Adapters.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_Adapters.h \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/XtReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(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 \
@@ -7560,54 +10264,90 @@ endif # GHS
  $(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.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/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/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
-.obj/FlReactor.o .obj/FlReactor.so .shobj/FlReactor.o .shobj/FlReactor.so: FlReactor.cpp \
- $(ACE_ROOT)/ace/FlReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Signal.h \
+ $(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/Hash_Map_Manager_T.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(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/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/Timer_Queue_Adapters.i \
+ $(ACE_ROOT)/ace/Timer_Queue_Adapters.cpp
+.obj/Timer_Queue_T.o .obj/Timer_Queue_T.so .shobj/Timer_Queue_T.o .shobj/Timer_Queue_T.so: Timer_Queue_T.cpp \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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 \
@@ -7622,8 +10362,8 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
+ $(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 \
@@ -7646,42 +10386,34 @@ endif # GHS
  $(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 \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
-.obj/TkReactor.o .obj/TkReactor.so .shobj/TkReactor.o .shobj/TkReactor.so: TkReactor.cpp \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp
+.obj/Timer_Wheel_T.o .obj/Timer_Wheel_T.so .shobj/Timer_Wheel_T.o .shobj/Timer_Wheel_T.so: Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/Timer_Wheel_T.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.h \
+ $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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_T.h \
+ $(ACE_ROOT)/ace/Event_Handler.h \
  $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -7694,30 +10426,12 @@ endif # GHS
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/TkReactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Free_List.i \
+ $(ACE_ROOT)/ace/Free_List.cpp \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
+ $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -7725,9 +10439,6 @@ endif # GHS
  $(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 \
@@ -7740,25 +10451,61 @@ endif # GHS
  $(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 \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i
+ $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i
+.obj/Typed_SV_Message.o .obj/Typed_SV_Message.so .shobj/Typed_SV_Message.o .shobj/Typed_SV_Message.so: Typed_SV_Message.cpp \
+ $(ACE_ROOT)/ace/Typed_SV_Message.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Typed_SV_Message.i \
+ $(ACE_ROOT)/ace/Typed_SV_Message.cpp
+.obj/Typed_SV_Message_Queue.o .obj/Typed_SV_Message_Queue.so .shobj/Typed_SV_Message_Queue.o .shobj/Typed_SV_Message_Queue.so: Typed_SV_Message_Queue.cpp \
+ $(ACE_ROOT)/ace/Typed_SV_Message.h \
+ $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/Basic_Types.h \
+ $(ACE_ROOT)/ace/Basic_Types.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/Typed_SV_Message.i \
+ $(ACE_ROOT)/ace/Typed_SV_Message.cpp \
+ $(ACE_ROOT)/ace/Typed_SV_Message_Queue.h \
+ $(ACE_ROOT)/ace/SV_Message_Queue.h \
+ $(ACE_ROOT)/ace/SV_Message.h \
+ $(ACE_ROOT)/ace/SV_Message.i \
+ $(ACE_ROOT)/ace/SV_Message_Queue.i \
+ $(ACE_ROOT)/ace/Typed_SV_Message_Queue.i \
+ $(ACE_ROOT)/ace/Typed_SV_Message_Queue.cpp
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ace/Makefile.am b/ace/Makefile.am
deleted file mode 100644
index 36e938da735..00000000000
--- a/ace/Makefile.am
+++ /dev/null
@@ -1,826 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the entire ACE release
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## Disable building of CLASSIX library for now.
-## SUBDIRS = CLASSIX
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-# Define any X libraries that ACE needs, if any.
-ACE_XLIBS = @ACE_XLIBS@
-
-
-# We only want `gethrtime.cpp' if building on Pentium(tm) with GNU C++.
-if ACE_ON_PENTIUM
-ACE_GETHRTIME_CPP = gethrtime.cpp
-else
-ACE_GETHRTIME_CPP =
-endif
-
-# Define which ACE components to build
-if BUILD_OS_FILES
-LIBACE_OS = libACE_OS.la
-else
-LIBACE_OS =  
-endif
-
-if BUILD_UTILS_FILES
-LIBACE_UTILS = libACE_Utils.la
-else
-LIBACE_UTILS = 
-endif
-
-if BUILD_LOGGING_FILES
-LIBACE_LOGGING = libACE_Logging.la
-else
-LIBACE_LOGGING = 
-endif
-
-
-if BUILD_THREADS_FILES
-LIBACE_THREADS = libACE_Threads.la
-else
-LIBACE_THREADS = 
-endif
-
-if BUILD_DEMUX_FILES
-LIBACE_DEMUX = libACE_Demux.la
-else
-LIBACE_DEMUX = 
-endif
-
-if BUILD_CONNECTION_FILES
-LIBACE_CONNECTION = libACE_Connection.la
-else
-LIBACE_CONNECTION = 
-endif
-
-if BUILD_SOCKETS_FILES
-LIBACE_SOCKETS = libACE_Sockets.la
-else
-LIBACE_SOCKETS = 
-endif
-
-if BUILD_IPC_FILES
-LIBACE_IPC = libACE_IPC.la
-else
-LIBACE_IPC = 
-endif
-
-if BUILD_SVCCONF_FILES
-LIBACE_SVCCONF = libACE_Svcconf.la
-else
-LIBACE_SVCCONF = 
-endif
-
-if BUILD_STREAMS_FILES
-LIBACE_STREAMS = libACE_Streams.la
-else
-LIBACE_STREAMS = 
-endif
-
-if BUILD_MEMORY_FILES
-LIBACE_MEMORY = libACE_Memory.la
-else
-LIBACE_MEMORY = 
-endif
-
-if BUILD_TOKEN_FILES
-LIBACE_TOKEN = libACE_Token.la
-else
-LIBACE_TOKEN = 
-endif
-
-if BUILD_OTHER_FILES
-LIBACE_OTHER = libACE_Other.la
-else
-LIBACE_OTHER = 
-endif
-
-if BUILD_FULL_LIBRARY
-LIBACE = libACE.la
-else
-LIBACE =
-endif
-
-# Build a libtool library, libACE.la for installation in libdir.
-lib_LTLIBRARIES = \
-        $(LIBACE) \
-        $(LIBACE_OS) \
-        $(LIBACE_UTILS) \
-        $(LIBACE_LOGGING) \
-        $(LIBACE_THREADS) \
-        $(LIBACE_DEMUX) \
-        $(LIBACE_CONNECTION) \
-        $(LIBACE_SOCKETS) \
-        $(LIBACE_IPC) \
-        $(LIBACE_SVCCONF) \
-        $(LIBACE_STREAMS) \
-        $(LIBACE_MEMORY) \
-        $(LIBACE_TOKEN) \
-        $(LIBACE_OTHER)
-
-libACE_OS_la_SOURCES = \
-        Basic_Types.cpp \
-        OS.cpp \
-        Sched_Params.cpp
-
-libACE_Utils_la_SOURCES = \
-        ACE.cpp \
-        Active_Map_Manager.cpp \
-        Arg_Shifter.cpp \
-        ARGV.cpp \
-        Containers.cpp \
-        Dirent.cpp \
-        Dynamic.cpp \
-        Filecache.cpp \
-        Functor.cpp \
-        Get_Opt.cpp \
-        Hash_Map_Manager.cpp \
-        High_Res_Timer.cpp \
-        Method_Request.cpp \
-        Object_Manager.cpp \
-        Profile_Timer.cpp \
-        Registry.cpp \
-        SString.cpp \
-        Stats.cpp \
-        System_Time.cpp \
-        Time_Request_Reply.cpp \
-        Timeprobe.cpp \
-        Timer_Hash.cpp \
-        Timer_Heap.cpp \
-        Timer_List.cpp \
-        Timer_Queue.cpp \
-        Timer_Wheel.cpp \
-        $(ACE_GETHRTIME_CPP)
-
-# We only want `gethrtime.cpp' if building on Pentium(tm) so we need
-# to let Automake know that `gethrtime.cpp' is conditionally built.
-EXTRA_libACE_Utils_la_SOURCES = gethrtime.cpp
-
-libACE_Logging_la_SOURCES = \
-        Dump.cpp \
-        Log_Msg.cpp \
-        Log_Record.cpp \
-        Trace.cpp
-
-libACE_Threads_la_SOURCES = \
-        Activation_Queue.cpp \
-        Process.cpp \
-        Process_Manager.cpp \
-        Synch.cpp \
-        Synch_Options.cpp \
-        Thread.cpp \
-        Thread_Manager.cpp \
-        Token.cpp
-
-libACE_Demux_la_SOURCES = \
-        Event_Handler.cpp \
-        Handle_Set.cpp \
-        POSIX_Proactor.cpp \
-        Priority_Reactor.cpp \
-        Proactor.cpp \
-        Reactor.cpp \
-        Select_Reactor.cpp \
-        Select_Reactor_Base.cpp \
-        WFMO_Reactor.cpp
-
-libACE_Connection_la_SOURCES = \
-        Asynch_IO.cpp \
-        Asynch_IO_Impl.cpp \
-        POSIX_Asynch_IO.cpp \
-        Strategies.cpp
-
-libACE_Sockets_la_SOURCES = \
-        IPC_SAP.cpp \
-        LSOCK.cpp \
-        LSOCK_Acceptor.cpp \
-        LSOCK_CODgram.cpp \
-        LSOCK_Connector.cpp \
-        LSOCK_Dgram.cpp \
-        LSOCK_Stream.cpp \
-        SOCK.cpp \
-        SOCK_Acceptor.cpp \
-        SOCK_CODgram.cpp \
-        SOCK_Connector.cpp \
-        SOCK_Dgram.cpp \
-        SOCK_Dgram_Bcast.cpp \
-        SOCK_Dgram_Mcast.cpp \
-        SOCK_IO.cpp \
-        SOCK_Stream.cpp
-
-libACE_IPC_la_SOURCES = \
-        Addr.cpp \
-	ATM_Addr.cpp \
-        DEV.cpp \
-        DEV_Addr.cpp \
-        DEV_Connector.cpp \
-        DEV_IO.cpp \
-        FIFO.cpp \
-        FIFO_Recv.cpp \
-        FIFO_Recv_Msg.cpp \
-        FIFO_Send.cpp \
-        FIFO_Send_Msg.cpp \
-        FILE_Addr.cpp \
-        FILE.cpp \
-        FILE_Connector.cpp \
-        FILE_IO.cpp \
-        INET_Addr.cpp \
-        IO_SAP.cpp \
-        IOStream.cpp \
-        Pipe.cpp \
-        Signal.cpp \
-        SPIPE_Addr.cpp \
-        SPIPE.cpp \
-        SPIPE_Acceptor.cpp \
-        SPIPE_Connector.cpp \
-        SPIPE_Stream.cpp \
-        SV_Message.cpp \
-        SV_Message_Queue.cpp \
-        SV_Semaphore_Complex.cpp \
-        SV_Semaphore_Simple.cpp \
-        SV_Shared_Memory.cpp \
-        TLI.cpp \
-        TLI_Acceptor.cpp \
-        TLI_Connector.cpp \
-        TLI_Stream.cpp \
-        TTY_IO.cpp \
-        UNIX_Addr.cpp \
-        UPIPE_Acceptor.cpp \
-        UPIPE_Connector.cpp \
-        UPIPE_Stream.cpp
-
-libACE_Svcconf_la_SOURCES = \
-        DLL.cpp \
-        Parse_Node.cpp \
-        Service_Config.cpp \
-        Service_Manager.cpp \
-        Service_Object.cpp \
-        Service_Repository.cpp \
-        Service_Types.cpp \
-        Shared_Object.cpp \
-        Svc_Conf_l.cpp \
-        Svc_Conf_y.cpp
-
-libACE_Streams_la_SOURCES = \
-        CDR_Stream.cpp \
-        Message_Block.cpp \
-        Message_Queue.cpp \
-        Task.cpp
-
-libACE_Memory_la_SOURCES = \
-        Malloc.cpp \
-        Mem_Map.cpp \
-        Memory_Pool.cpp \
-        Obstack.cpp \
-        Read_Buffer.cpp \
-        Shared_Memory.cpp \
-        Shared_Memory_MM.cpp \
-        Shared_Memory_SV.cpp
-
-libACE_Token_la_SOURCES = \
-        Local_Tokens.cpp \
-        Remote_Tokens.cpp \
-        Token_Collection.cpp \
-        Token_Invariants.cpp \
-        Token_Manager.cpp \
-        Token_Request_Reply.cpp
-
-libACE_Other_la_SOURCES = \
-        CORBA_Handler.cpp \
-        CORBA_Ref.cpp \
-        Local_Name_Space.cpp \
-        Msg_WFMO_Reactor.cpp \
-        Name_Proxy.cpp \
-        Name_Request_Reply.cpp \
-        Name_Space.cpp \
-        Naming_Context.cpp \
-        Registry_Name_Space.cpp \
-        Remote_Name_Space.cpp \
-        TP_Reactor.cpp \
-        XtReactor.cpp
-
-libACE_la_SOURCES = \
-	$(libACE_OS_la_SOURCES) \
-	$(libACE_Utils_la_SOURCES) \
-	$(libACE_Logging_la_SOURCES) \
-	$(libACE_Threads_la_SOURCES) \
-	$(libACE_Demux_la_SOURCES) \
-	$(libACE_Connection_la_SOURCES) \
-	$(libACE_Sockets_la_SOURCES) \
-	$(libACE_IPC_la_SOURCES) \
-	$(libACE_Svcconf_la_SOURCES) \
-	$(libACE_Streams_la_SOURCES) \
-	$(libACE_Memory_la_SOURCES) \
-	$(libACE_Token_la_SOURCES) \
-	$(libACE_Other_la_SOURCES)
-
-# We only want `gethrtime.cpp' if building on Pentium(tm) so we need
-# to let Automake know that `gethrtime.cpp' is conditionally built.
-EXTRA_libACE_la_SOURCES = gethrtime.cpp
-
-
-## The following is an excerpt from the "libtool" manual, written by
-## Gordon Matzigkeit:
-##
-## This flag accepts an argument of the form `current[:revision[:age]]'. So,
-## passing `-version-info 3:12:1' sets current to 3, revision to 12, and age
-## to 1. 
-## If either revision or age are omitted, they default to 0. Also note that
-## age must be less than or equal to the current interface number. 
-##
-## Here are a set of rules to help you update your library version
-## information: 
-##
-##     1.Start with version information of `0:0:0' for each libtool library. 
-##     2.Update the version information only immediately before a public
-##       release of your software. More frequent updates are unnecessary, and
-##       only guarantee that the current interface number gets larger faster. 
-##     3.If the library source code has changed at all since the last update,
-##       then increment revision (`c:r:a' becomes `c:r+1:a'). 
-##     4.If any interfaces have been added, removed, or changed since the last
-##       update, increment current, and set revision to 0. 
-##     5.If any interfaces have been added since the last public release, then
-##       increment age. 
-##     6.If any interfaces have been removed since the last public release,
-##       then set age to 0. 
-##
-## Never try to set the interface numbers so that they correspond to the
-## release number of your package. This is an abuse that only fosters
-## misunderstanding of the purpose of library versions. Instead, use the
-## `-release' flag (see section 6.4 Managing release information), but be
-## warned that every release of your package will not be binary compatibility
-## with any other release. 
-
-## The below "-version-info" isn't being used the way libtool intends
-## it to be used but we do it that way to make the version numbers
-## that ACE uses match those created by libtool from "-version-info."
-##libACE_la_LDFLAGS = $(X_LIBS) \
-##                  -version-info 10:4:6   ## 10-6=4 --> libACE.so.4.6.4
-libACE_la_LDFLAGS = $(X_LIBS) \
-        -version-info @ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@
-
-# We also add any X libraries to the list.
-libACE_la_LIBADD = $(X_PRE_LIBS) $(ACE_XLIBS) $(X_EXTRA_LIBS)
-
-## These are template source files.
-ACE_TEMPLATE_FILES = \
-        Acceptor.cpp \
-        Active_Map_Manager_T.cpp \
-        Asynch_Acceptor.cpp \
-        Auto_Ptr.cpp \
-        Connector.cpp \
-        Containers_T.cpp \
-        Dump_T.cpp \
-        Dynamic_Service.cpp \
-        Env_Value_T.cpp \
-        Event_Handler_T.cpp \
-        Free_List.cpp \
-        Functor_T.cpp \
-        Future.cpp \
-        Hash_Map_Manager_T.cpp \
-        IOStream_T.cpp \
-        LOCK_SOCK_Acceptor.cpp \
-        Local_Name_Space_T.cpp \
-        Malloc_T.cpp \
-        Managed_Object.cpp \
-        Map_Manager.cpp \
-        Map_T.cpp \
-        Message_Block_T.cpp \
-        Message_Queue_T.cpp \
-        Module.cpp \
-	Pair_T.cpp \
-        RB_Tree.cpp \
-        Select_Reactor_T.cpp \
-        Singleton.cpp \
-        Strategies_T.cpp \
-        Stream.cpp \
-        Stream_Modules.cpp \
-        Svc_Handler.cpp \
-        Synch_T.cpp \
-        Task_T.cpp \
-        Template_Instantiations.cpp \
-        Timeprobe_T.cpp \
-        Timer_Hash_T.cpp \
-        Timer_Heap_T.cpp \
-        Timer_List_T.cpp \
-        Timer_Queue_Adapters.cpp \
-        Timer_Queue_T.cpp \
-        Timer_Wheel_T.cpp \
-        Typed_SV_Message.cpp \
-        Typed_SV_Message_Queue.cpp
-
-## It would be good to remove pkgincludedir.  However, we want to install
-## headers in "$(prefix)/ace" not "$(prefix)/ACE" because the source files
-## include files in the directory "ace."  By default pkgincludedir would
-## be "$(prefix)/$(PACKAGE)" which would be "$(prefix)/ACE" in our case.
-## It is for this reason that we must redefine "pkgincludedir."
-## However, if we set the package to "ace" instead of "ACE" then we won't
-## need to set the "pkgincludedir."
-##                    -Ossama
-##pkgincludedir = $(prefix)/include/ace
-pkginclude_HEADERS = \
-        ACE.h \
-        ACE.i \
-        ARGV.h \
-        ARGV.i \
-	ATM_Addr.h \
-	ATM_Addr.i \
-        Acceptor.h \
-        Acceptor.i \
-        Activation_Queue.h \
-        Activation_Queue.i \
-        Active_Map_Manager.h \
-        Active_Map_Manager.i \
-        Active_Map_Manager_T.h \
-        Active_Map_Manager_T.i \
-        Addr.h \
-        Addr.i \
-        Arg_Shifter.h \
-        Array.h \
-        Asynch_Acceptor.h \
-        Asynch_Acceptor.i \
-        Asynch_IO.h \
-        Asynch_IO.i \
-        Asynch_IO_Impl.h \
-        Asynch_IO_Impl.i \
-        Atomic_Op.i \
-        Auto_Ptr.h \
-        Auto_Ptr.i \
-        Basic_Types.h \
-        Basic_Types.i \
-        CDR_Stream.h \
-        CDR_Stream.i \
-        CORBA_Handler.h \
-        CORBA_Handler.i \
-        CORBA_Ref.h \
-        CORBA_Ref.i \
-        CORBA_macros.h \
-        Connector.h \
-        Connector.i \
-        Containers.h \
-        Containers.i \
-        Containers_T.h \
-        Containers_T.i \
-        DEV.h \
-        DEV.i \
-        DEV_Addr.h \
-        DEV_Addr.i \
-        DEV_Connector.h \
-        DEV_Connector.i \
-        DEV_IO.h \
-        DEV_IO.i \
-        DLL.h \
-        Date_Time.h \
-        Date_Time.i \
-        Dirent.h \
-        Dirent.i \
-        Dump.h \
-        Dump_T.h \
-        Dynamic.h \
-        Dynamic.i \
-        Dynamic_Service.h \
-        Dynamic_Service.i \
-        Env_Value_T.h \
-        Env_Value_T.i \
-        Event_Handler.h \
-        Event_Handler.i \
-        Event_Handler_T.h \
-        Event_Handler_T.i \
-        FIFO.h \
-        FIFO.i \
-        FIFO_Recv.h \
-        FIFO_Recv.i \
-        FIFO_Recv_Msg.h \
-        FIFO_Recv_Msg.i \
-        FIFO_Send.h \
-        FIFO_Send.i \
-        FIFO_Send_Msg.h \
-        FIFO_Send_Msg.i \
-        FILE.h \
-        FILE.i \
-        FILE_Addr.h \
-        FILE_Addr.i \
-        FILE_Connector.h \
-        FILE_Connector.i \
-        FILE_IO.h \
-        FILE_IO.i \
-        Filecache.h \
-        Free_List.h \
-        Free_List.i \
-        Functor.h \
-        Functor.i \
-        Functor_T.h \
-        Functor_T.i \
-        Future.h \
-        Get_Opt.h \
-        Get_Opt.i \
-        Handle_Set.h \
-        Handle_Set.i \
-        Hash_Map_Manager.h \
-        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 \
-        INET_Addr.i \
-        IOStream.h \
-        IOStream_T.h \
-        IOStream_T.i \
-        IO_Cntl_Msg.h \
-        IO_Cntl_Msg.i \
-        IO_SAP.h \
-        IO_SAP.i \
-        IPC_SAP.h \
-        IPC_SAP.i \
-        LOCK_SOCK_Acceptor.h \
-        LSOCK.h \
-        LSOCK.i \
-        LSOCK_Acceptor.h \
-        LSOCK_Acceptor.i \
-        LSOCK_CODgram.h \
-        LSOCK_CODgram.i \
-        LSOCK_Connector.h \
-        LSOCK_Connector.i \
-        LSOCK_Dgram.h \
-        LSOCK_Dgram.i \
-        LSOCK_Stream.h \
-        LSOCK_Stream.i \
-        Local_Name_Space.h \
-        Local_Name_Space_T.h \
-        Local_Tokens.h \
-        Local_Tokens.i \
-        Log_Msg.h \
-        Log_Msg.i \
-        Log_Priority.h \
-        Log_Record.h \
-        Log_Record.i \
-        Malloc.h \
-        Malloc.i \
-        Malloc_Base.h \
-        Malloc_T.h \
-        Malloc_T.i \
-        Managed_Object.h \
-        Managed_Object.i \
-        Map.h \
-        Map.i \
-        Map_Manager.h \
-        Map_Manager.i \
-        Map_T.h \
-        Map_T.i \
-        Mem_Map.h \
-        Mem_Map.i \
-        Memory_Pool.h \
-        Memory_Pool.i \
-        Message_Block.h \
-        Message_Block.i \
-        Message_Block_T.h \
-        Message_Block_T.i \
-        Message_Queue.h \
-        Message_Queue.i \
-        Message_Queue_T.h \
-        Message_Queue_T.i \
-        Method_Object.h \
-        Method_Request.h \
-        Module.h \
-        Module.i \
-        Msg_WFMO_Reactor.h \
-        Msg_WFMO_Reactor.i \
-        Multiplexor.h \
-        Multiplexor.i \
-        NT_Service.h \
-        NT_Service.i \
-        Name_Proxy.h \
-        Name_Request_Reply.h \
-        Name_Space.h \
-        Naming_Context.h \
-        OS.h \
-        OS.i \
-        Object_Manager.h \
-        Object_Manager.i \
-        Obstack.h \
-        Obstack.i \
-        POSIX_Asynch_IO.h \
-        POSIX_Asynch_IO.i \
-        POSIX_Proactor.h \
-        POSIX_Proactor.i \
-        Pair.h \
-        Pair.i \
-        Pair_T.h \
-        Pair_T.i \
-        Parse_Node.h \
-        Parse_Node.i \
-        Pipe.h \
-        Pipe.i \
-        Priority_Reactor.h \
-        Priority_Reactor.i \
-        Proactor.h \
-        Proactor.i \
-        Proactor_Impl.h \
-        Process.h \
-        Process.i \
-        Process_Manager.h \
-        Process_Manager.i \
-        Profile_Timer.h \
-        Profile_Timer.i \
-        RB_Tree.h \
-        RB_Tree.i \
-        Reactor.h \
-        Reactor.i \
-        Reactor_Impl.h \
-        Read_Buffer.h \
-        Read_Buffer.i \
-        Registry.h \
-        Registry_Name_Space.h \
-        Remote_Name_Space.h \
-        Remote_Tokens.h \
-        Remote_Tokens.i \
-        SOCK.h \
-        SOCK.i \
-        SOCK_Acceptor.h \
-        SOCK_Acceptor.i \
-        SOCK_CODgram.h \
-        SOCK_CODgram.i \
-        SOCK_Connector.h \
-        SOCK_Connector.i \
-        SOCK_Dgram.h \
-        SOCK_Dgram.i \
-        SOCK_Dgram_Bcast.h \
-        SOCK_Dgram_Bcast.i \
-        SOCK_Dgram_Mcast.h \
-        SOCK_Dgram_Mcast.i \
-        SOCK_IO.h \
-        SOCK_IO.i \
-        SOCK_Stream.h \
-        SOCK_Stream.i \
-        SPIPE.h \
-        SPIPE.i \
-        SPIPE_Acceptor.h \
-        SPIPE_Acceptor.i \
-        SPIPE_Addr.h \
-        SPIPE_Addr.i \
-        SPIPE_Connector.h \
-        SPIPE_Connector.i \
-        SPIPE_Stream.h \
-        SPIPE_Stream.i \
-        SString.h \
-        SString.i \
-        SV_Message.h \
-        SV_Message.i \
-        SV_Message_Queue.h \
-        SV_Message_Queue.i \
-        SV_Semaphore_Complex.h \
-        SV_Semaphore_Complex.i \
-        SV_Semaphore_Simple.h \
-        SV_Semaphore_Simple.i \
-        SV_Shared_Memory.h \
-        SV_Shared_Memory.i \
-        Sched_Params.h \
-        Sched_Params.i \
-        Select_Reactor.h \
-        Select_Reactor.i \
-        Select_Reactor_Base.h \
-        Select_Reactor_Base.i \
-        Select_Reactor_T.h \
-        Select_Reactor_T.i \
-        Service_Config.h \
-        Service_Config.i \
-        Service_Manager.h \
-        Service_Manager.i \
-        Service_Object.h \
-        Service_Object.i \
-        Service_Repository.h \
-        Service_Repository.i \
-        Service_Types.h \
-        Service_Types.i \
-        Shared_Memory.h \
-        Shared_Memory_MM.h \
-        Shared_Memory_MM.i \
-        Shared_Memory_SV.h \
-        Shared_Memory_SV.i \
-        Shared_Object.h \
-        Shared_Object.i \
-        Signal.h \
-        Signal.i \
-        Singleton.h \
-        Singleton.i \
-        Stats.h \
-        Stats.i \
-        Strategies.h \
-        Strategies.i \
-        Strategies_T.h \
-        Strategies_T.i \
-        Stream.h \
-        Stream.i \
-        Stream_Modules.h \
-        Stream_Modules.i \
-        Svc_Conf.h \
-        Svc_Conf_Tokens.h \
-        Svc_Handler.h \
-        Svc_Handler.i \
-        Synch.h \
-        Synch.i \
-        Synch_Options.h \
-        Synch_Options.i \
-        Synch_T.h \
-        Synch_T.i \
-        System_Time.h \
-        TLI.h \
-        TLI.i \
-        TLI_Acceptor.h \
-        TLI_Acceptor.i \
-        TLI_Connector.h \
-        TLI_Connector.i \
-        TLI_Stream.h \
-        TLI_Stream.i \
-        TP_Reactor.h \
-        TP_Reactor.i \
-        TTY_IO.h \
-        Task.h \
-        Task.i \
-        Task_T.h \
-        Task_T.i \
-        Thread.h \
-        Thread.i \
-        Thread_Manager.h \
-        Thread_Manager.i \
-        Time_Request_Reply.h \
-        Time_Value.h \
-        Timeprobe.h \
-        Timeprobe.i \
-        Timeprobe_T.h \
-        Timer_Hash.h \
-        Timer_Hash_T.h \
-        Timer_Heap.h \
-        Timer_Heap_T.h \
-        Timer_List.h \
-        Timer_List_T.h \
-        Timer_Queue.h \
-        Timer_Queue_Adapters.h \
-        Timer_Queue_Adapters.i \
-        Timer_Queue_T.h \
-        Timer_Queue_T.i \
-        Timer_Wheel.h \
-        Timer_Wheel_T.h \
-        Token.h \
-        Token.i \
-        Token_Collection.h \
-        Token_Collection.i \
-        Token_Invariants.h \
-        Token_Invariants.i \
-        Token_Manager.h \
-        Token_Manager.i \
-        Token_Request_Reply.h \
-        Token_Request_Reply.i \
-        Trace.h \
-        Trace.i \
-        Typed_SV_Message.h \
-        Typed_SV_Message.i \
-        Typed_SV_Message_Queue.h \
-        Typed_SV_Message_Queue.i \
-        UNIX_Addr.h \
-        UNIX_Addr.i \
-        UPIPE_Acceptor.h \
-        UPIPE_Acceptor.i \
-        UPIPE_Addr.h \
-        UPIPE_Connector.h \
-        UPIPE_Connector.i \
-        UPIPE_Stream.h \
-        UPIPE_Stream.i \
-        Version.h \
-        WFMO_Reactor.h \
-        WFMO_Reactor.i \
-        WIN32_Asynch_IO.h \
-        WIN32_Asynch_IO.i \
-        WIN32_Proactor.h \
-        WIN32_Proactor.i \
-        XtReactor.h \
-        config.h \
-        inc_user_config.h \
-        iosfwd.h \
-        streams.h \
-        ws2tcpip.h \
-        $(ACE_TEMPLATE_FILES)
-## Make sure config.h and $(ACE_TEMPLATE_FILES) are in the above header list!
-
-## Make sure the following get into the distribution
-EXTRA_DIST = $(ACE_TEMPLATE_FILES)
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/ace/Malloc.cpp b/ace/Malloc.cpp
index 21111301edc..5caa47c8b48 100644
--- a/ace/Malloc.cpp
+++ b/ace/Malloc.cpp
@@ -140,13 +140,12 @@ ACE_Allocator::close_singleton (void)
 {
   ACE_TRACE ("ACE_Allocator::close_singleton");
 
-  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, 
+  ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
                      *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Allocator::delete_allocator_)
     {
-      // This should never be executed....  See the
-      // ACE_Allocator::instance (void) method for an explanation.
+      // This should never be executed.  See ACE_Allocator::instance (void).
       delete ACE_Allocator::allocator_;
       ACE_Allocator::allocator_ = 0;
       ACE_Allocator::delete_allocator_ = 0;
@@ -158,11 +157,6 @@ ACE_Allocator::~ACE_Allocator (void)
   ACE_TRACE ("ACE_Allocator::~ACE_Allocator");
 }
 
-ACE_Allocator::ACE_Allocator (void)
-{
-  ACE_TRACE ("ACE_Allocator::ACE_Allocator");
-}
-
 void
 ACE_Static_Allocator_Base::dump (void) const
 {
diff --git a/ace/Malloc_Base.h b/ace/Malloc_Base.h
index f2a40868cd2..ff7dac57a08 100644
--- a/ace/Malloc_Base.h
+++ b/ace/Malloc_Base.h
@@ -38,9 +38,6 @@ public:
   static void close_singleton (void);
   // Delete the dynamically allocated Singleton
 
-  ACE_Allocator (void);
-  // "No-op" constructor (needed to make certain compilers happy).
-
   virtual ~ACE_Allocator (void);
   // Virtual destructor
 
diff --git a/ace/Managed_Object.h b/ace/Managed_Object.h
index 01556585db4..1eee00516c3 100644
--- a/ace/Managed_Object.h
+++ b/ace/Managed_Object.h
@@ -65,7 +65,7 @@ class ACE_Managed_Object
   //     This template class wraps an interface that is used to
   //     allocate and access an object that is managed by the
   //     ACE_Object_Manager.  Because static template member functions
-  //     are not supported by some compilers, it is a separate
+  //     are not supported by most compilers, it is a separate
   //     (template) class.
   //
   //     This interface is typically used to replace a static object
@@ -93,7 +93,7 @@ class ACE_Managed_Object
   //
   //     By default, preallocation uses dynamic allocation.  The
   //     preallocated objects and arrays are allocated off the heap in
-  //     the ACE_Object_Manager constructor.  To statically place the
+  //     the ACE_Object_Manager constructor.  The statically place the
   //     preallocated objects in program global data instead of on the
   //     heap, #define ACE_HAS_STATIC_PREALLOCATION prior to building
   //     the ACE library.
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 4fa80e02dc5..92ddb7572bd 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -80,9 +80,9 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind_i (const EXT_ID &ext_id,
 {
   // Try to find the key.
   size_t index = 0;
-  int result = this->find_and_return_index (ext_id,
+  int result = this->find_and_return_index (ext_id, 
                                             index);
-
+  
   if (result == 0)
     {
       // We found the key. Nothing to change.
@@ -111,7 +111,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::next_free (size_t &free_slot)
     {
       // Resize the map.
       int result = this->resize_i (this->new_size ());
-
+      
       // Check for errors.
       if (result == 0)
         {
@@ -132,7 +132,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t index,
 {
   // Grab the entry.
   ENTRY &entry = this->search_structure_[index];
-
+  
   //
   // Remove from current list.
   //
@@ -147,7 +147,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t index,
     {
       this->search_structure_[current_list_prev].next (entry.next ());
     }
-
+  
   // Fix the entry after us.
   size_t current_list_next = entry.next ();
   if (current_list_next == current_list_id)
@@ -173,7 +173,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_move (size_t index,
 
   // Fix entry after us.
   if (new_list_next == new_list_id)
-    {
+    {      
       new_list.prev (index);
     }
   else
@@ -196,8 +196,8 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::shared_bind (const EXT_ID &ext_id,
   if (result == 0)
     {
       // Copy key and value.
-      this->search_structure_[index].int_id_ = int_id;
-      this->search_structure_[index].ext_id_ = ext_id;
+      this->search_structure_[index].int_id_ = int_id;      
+      this->search_structure_[index].ext_id_ = ext_id;      
 
       // Move from free list to occupied list
       this->move_from_free_list_to_occupied_list (index);
@@ -217,7 +217,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
 {
   // First try to find the key.
   size_t index = 0;
-  int result = this->find_and_return_index (ext_id,
+  int result = this->find_and_return_index (ext_id, 
                                             index);
 
   if (result == 0)
@@ -238,7 +238,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
   else
     {
       // We didn't find it, so let's add it.
-      return this->shared_bind (ext_id,
+      return this->shared_bind (ext_id, 
                                 int_id);
     }
 }
@@ -250,7 +250,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
 {
   // First try to find the key.
   size_t index = 0;
-  int result = this->find_and_return_index (ext_id,
+  int result = this->find_and_return_index (ext_id, 
                                             index);
 
   if (result == 0)
@@ -270,7 +270,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
   else
     {
       // We didn't find it, so let's add it.
-      return this->shared_bind (ext_id,
+      return this->shared_bind (ext_id, 
                                 int_id);
     }
 }
@@ -282,7 +282,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
 
   // First try to find the key.
   size_t index = 0;
-  int result = this->find_and_return_index (ext_id,
+  int result = this->find_and_return_index (ext_id, 
                                             index);
 
   if (result == 0)
@@ -300,7 +300,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind_i (const EXT_ID &ext_id,
   else
     {
       // We didn't find it, so let's add it.
-      return this->shared_bind (ext_id,
+      return this->shared_bind (ext_id, 
                                 int_id);
     }
 }
@@ -324,7 +324,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind_i (const EXT_ID &ext_id,
   else
     {
       // We didn't find it, so let's bind it!
-      return this->bind_i (ext_id,
+      return this->bind_i (ext_id, 
                            int_id);
     }
 }
@@ -338,7 +338,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_and_return_index (const EXT_ID &
        i != this->occupied_list_id ();
        i = this->search_structure_[i].next ())
     {
-      if (this->equal (this->search_structure_[i].ext_id_,
+      if (this->equal (this->search_structure_[i].ext_id_, 
                        ext_id))
         {
           // If found, return index.
@@ -365,7 +365,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find_i (const EXT_ID &ext_id,
       // Key was found.  Make a copy of value.
       int_id = this->search_structure_[index].int_id_;
     }
-
+  
   return result;
 }
 
@@ -374,7 +374,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_and_return_index (const EXT_ID
                                                                     size_t &index)
 {
   // Try to find the key.
-  int result = this->find_and_return_index (ext_id,
+  int result = this->find_and_return_index (ext_id, 
                                             index);
 
   if (result == 0)
@@ -395,7 +395,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_i (const EXT_ID &ext_id,
 {
   // Unbind the entry.
   size_t index = 0;
-  int result = this->unbind_and_return_index (ext_id,
+  int result = this->unbind_and_return_index (ext_id, 
                                               index);
 
   if (result == 0)
@@ -403,7 +403,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_i (const EXT_ID &ext_id,
       // If found, copy the value.
       int_id = this->search_structure_[index].int_id_;
     }
-
+  
   return result;
 }
 
@@ -419,21 +419,21 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::resize_i (size_t new_size)
                         -1);
 
   // Copy over the occupied entires.
-  for (i = this->occupied_list_.next ();
+  for (i = this->occupied_list_.next (); 
        i != this->occupied_list_id ();
        i = this->search_structure_[i].next ())
     {
       // Copy constructor.
-      new (&(temp[i])) ENTRY (this->search_structure_[i]);
+      new (&(temp[i])) ENTRY (this->search_structure_[i]); 
     }
 
   // Copy over the free entires.
-  for (i = this->free_list_.next ();
+  for (i = this->free_list_.next (); 
        i != this->free_list_id ();
        i = this->search_structure_[i].next ())
     {
       // Copy constructor.
-      new (&(temp[i])) ENTRY (this->search_structure_[i]);
+      new (&(temp[i])) ENTRY (this->search_structure_[i]); 
     }
 
   // Construct the new elements.
@@ -479,7 +479,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::new_size (void)
       // Linear increase if we have reached MAX_EXPONENTIAL.
       current_size += LINEAR_INCREASE;
     }
-
+  
   // This should be the new size.
   return current_size;
 }
@@ -534,22 +534,6 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::dump_i (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-template <class EXT_ID, class INT_ID, class ACE_LOCK>
-ACE_Map_Entry<EXT_ID, INT_ID>&
-ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
-{
-  // @@ This function should be inlined.  We moved it here to avoid
-  // a compiler bug in SunCC 4.2.  Once we know the correct patch to fix
-  // the compiler problem, it should be moved back to .i file again.
-  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
-
-  int result = this->next (retv);
-  ACE_ASSERT (result != 0);
-  ACE_UNUSED_ARG (result);
-
-  return *retv;
-}
-
 template <class EXT_ID, class INT_ID, class ACE_LOCK> void
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 {
@@ -563,3 +547,4 @@ ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::dump (void) const
 }
 
 #endif /* ACE_MAP_MANAGER_C */
+
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 9a7ea27de27..d2d7d26e303 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -182,7 +182,7 @@ public:
   // attempt is made to bind an existing entry, and returns -1 if
   // failures occur.
 
-  int find (const EXT_ID &ext_id,
+  int find (const EXT_ID &ext_id, 
             INT_ID &int_id);
   // Locate <ext_id> and pass out parameter via <int_id>.  If found,
   // returns and non-negative integer; returns -1 if not found.
@@ -196,7 +196,7 @@ public:
   // <int_id>s are *not* dynamically allocated...)  Returns 0 if
   // successful, else -1.
 
-  int unbind (const EXT_ID &ext_id,
+  int unbind (const EXT_ID &ext_id, 
               INT_ID &int_id);
   // Break any association of <ext_id>.  Returns the value of <int_id>
   // in case the caller needs to deallocate memory.  Returns 0 if
@@ -239,40 +239,40 @@ protected:
   // These methods assume that the locks are held by the private
   // methods.
 
-  int bind_i (const EXT_ID &ext_id,
+  int bind_i (const EXT_ID &ext_id, 
               const INT_ID &int_id);
   // Performs the binding of <ext_id> to <int_id>.  Must be called
   // with locks held.
 
-  int shared_bind (const EXT_ID &ext_id,
+  int shared_bind (const EXT_ID &ext_id, 
                    const INT_ID &int_id);
   // Bind an entry (without finding first).  Must be called with locks
   // held.
 
-  int rebind_i (const EXT_ID &ext_id,
+  int rebind_i (const EXT_ID &ext_id, 
                 const INT_ID &int_id,
-                EXT_ID &old_ext_id,
+                EXT_ID &old_ext_id, 
                 INT_ID &old_int_id);
   // Performs a rebinding of <ext_it> to <int_id>.  Also, recovers old
   // values.  Must be called with locks held.
 
-  int rebind_i (const EXT_ID &ext_id,
+  int rebind_i (const EXT_ID &ext_id, 
                 const INT_ID &int_id,
                 INT_ID &old_int_id);
   // Performs a rebinding of <ext_it> to <int_id>.  Also, recovers old
   // values.  Must be called with locks held.
 
-  int rebind_i (const EXT_ID &ext_id,
+  int rebind_i (const EXT_ID &ext_id, 
                 const INT_ID &int_id);
   // Performs a rebinding of <ext_it> to <int_id>.  Must be called
   // with locks held.
 
-  int trybind_i (const EXT_ID &ext_id,
+  int trybind_i (const EXT_ID &ext_id, 
                  INT_ID &int_id);
   // Performs a conditional bind of <int_id> using <ext_id> as the
   // key.  Must be called with locks held.
 
-  int find_i (const EXT_ID &ext_id,
+  int find_i (const EXT_ID &ext_id, 
               INT_ID &int_id);
   // Performs a find of <int_id> using <ext_id> as the key.  Must be
   // called with locks held.
@@ -282,7 +282,7 @@ protected:
   // Performs a find using <ext_id> as the key.  Must be called with
   // locks held.
 
-  int unbind_i (const EXT_ID &ext_id,
+  int unbind_i (const EXT_ID &ext_id, 
                 INT_ID &int_id);
   // Performs an unbind of <int_id> using <ext_id> as the key.  Must
   // be called with locks held.
@@ -424,7 +424,7 @@ protected:
   void dump_i (void) const;
   // Dump the state of an object.
 
-  ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> *map_man_;
+  ACE_Map_Manager <EXT_ID, INT_ID, ACE_LOCK> &map_man_;
   // Map we are iterating over.
 
   size_t next_;
diff --git a/ace/Map_Manager.i b/ace/Map_Manager.i
index ded8b4b0357..959ec90966d 100644
--- a/ace/Map_Manager.i
+++ b/ace/Map_Manager.i
@@ -16,7 +16,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::next (void) const
 }
 
 template <class EXT_ID, class INT_ID> ACE_INLINE void
-ACE_Map_Entry<EXT_ID, INT_ID>::next (size_t n)
+ACE_Map_Entry<EXT_ID, INT_ID>::next (size_t n) 
 {
   this->next_ = n;
 }
@@ -28,7 +28,7 @@ ACE_Map_Entry<EXT_ID, INT_ID>::prev (void) const
 }
 
 template <class EXT_ID, class INT_ID> ACE_INLINE void
-ACE_Map_Entry<EXT_ID, INT_ID>::prev (size_t p)
+ACE_Map_Entry<EXT_ID, INT_ID>::prev (size_t p) 
 {
   this->prev_ = p;
 }
@@ -76,7 +76,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->bind_i (ext_id,
+  return this->bind_i (ext_id, 
                        int_id);
 }
 
@@ -88,9 +88,9 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->rebind_i (ext_id,
-                         int_id,
-                         old_ext_id,
+  return this->rebind_i (ext_id, 
+                         int_id, 
+                         old_ext_id, 
                          old_int_id);
 }
 
@@ -101,8 +101,8 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->rebind_i (ext_id,
-                         int_id,
+  return this->rebind_i (ext_id, 
+                         int_id, 
                          old_int_id);
 }
 
@@ -112,7 +112,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->rebind_i (ext_id,
+  return this->rebind_i (ext_id, 
                          int_id);
 }
 
@@ -122,7 +122,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->trybind_i (ext_id,
+  return this->trybind_i (ext_id, 
                           int_id);
 }
 
@@ -132,7 +132,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id)
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   size_t index = 0;
-  return this->find_and_return_index (ext_id,
+  return this->find_and_return_index (ext_id, 
                                       index);
 }
 
@@ -142,7 +142,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id,
 {
   ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->find_i (ext_id,
+  return this->find_i (ext_id, 
                        int_id);
 }
 
@@ -151,7 +151,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind_i (const EXT_ID &ext_id)
 {
   // Unbind the entry.
   size_t index = 0;
-  return this->unbind_and_return_index (ext_id,
+  return this->unbind_and_return_index (ext_id, 
                                         index);
 }
 
@@ -161,7 +161,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id,
 {
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  return this->unbind_i (ext_id,
+  return this->unbind_i (ext_id, 
                          int_id);
 }
 
@@ -266,17 +266,17 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rend (void)
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator_Base (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm)
-  : map_man_ (&mm),
-    next_ (this->map_man_->occupied_list_id ())
+  : map_man_ (mm),
+    next_ (this->map_man_.occupied_list_id ())
 {
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT_ID> *&mm) const
 {
-  if (this->next_ != this->map_man_->occupied_list_id ())
+  if (this->next_ != this->map_man_.occupied_list_id ())
     {
-      mm = &this->map_man_->search_structure_[this->next_];
+      mm = &this->map_man_.search_structure_[this->next_];
       return 1;
     }
   else
@@ -288,50 +288,63 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
 {
-  return this->next_ == this->map_man_->occupied_list_id ();
+  return this->next_ == this->map_man_.occupied_list_id ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::forward_i (void)
 {
-  if (this->next_ == this->map_man_->occupied_list_id ())
+  if (this->next_ == this->map_man_.occupied_list_id ())
     {
-      this->next_ = this->map_man_->occupied_list_.next ();
+      this->next_ = this->map_man_.occupied_list_.next ();
     }
   else
     {
-      this->next_ = this->map_man_->search_structure_[this->next_].next ();
+      this->next_ = this->map_man_.search_structure_[this->next_].next ();
     }
 
-  return this->next_ != this->map_man_->occupied_list_id ();
+  return this->next_ != this->map_man_.occupied_list_id ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::reverse_i (void)
 {
-  if (this->next_ == this->map_man_->occupied_list_id ())
+  if (this->next_ == this->map_man_.occupied_list_id ())
     {
-      this->next_ = this->map_man_->occupied_list_.prev ();
+      this->next_ = this->map_man_.occupied_list_.prev ();
     }
   else
     {
-      this->next_ = this->map_man_->search_structure_[this->next_].prev ();
+      this->next_ = this->map_man_.search_structure_[this->next_].prev ();
     }
 
-  return this->next_ != this->map_man_->occupied_list_id ();
+  return this->next_ != this->map_man_.occupied_list_id ();
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
-ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &
+ACE_Map_Entry<EXT_ID, INT_ID>&
+ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator* (void) const
+{
+  ACE_Map_Entry<EXT_ID, INT_ID> *retv = 0;
+
+  int result = this->next (retv);
+  ACE_ASSERT (result != 0);
+  ACE_UNUSED_ARG (result);
+
+  return *retv;
+}
+
+template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>&
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::map (void)
 {
-  return *this->map_man_;
+  return this->map_man_;
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE int
 ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator== (const ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> &rhs) const
 {
-  return (this->map_man_ == rhs.map_man_ &&
+  return (&this->map_man_ == &rhs.map_man_ && 
           this->next_ == rhs.next_);
 }
 
@@ -342,7 +355,7 @@ ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK>::operator!= (const ACE_Map_Itera
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
-ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm,
+ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Iterator (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, 
                                                               int pass_end)
   : ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> (mm)
 {
@@ -391,7 +404,7 @@ ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::operator-- (int)
 }
 
 template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_INLINE
-ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Reverse_Iterator (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm,
+ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Map_Reverse_Iterator (ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK> &mm, 
                                                                               int pass_end)
   : ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> (mm)
 {
diff --git a/ace/Map_T.h b/ace/Map_T.h
index fe1c9926fdb..0b86223dbfd 100644
--- a/ace/Map_T.h
+++ b/ace/Map_T.h
@@ -30,22 +30,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 template <class T>
-class ACE_Noop_Key_Generator
-{
-  // = TITLE
-  //     Defines a noop key generator.
-public:
-
-  int operator() (T &);
-  // Functor method: generates a new key.
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-template <class T>
 class ACE_Incremental_Key_Generator
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a simple incremental key generator.
   //
   // = DESCRIPTION
@@ -55,7 +42,7 @@ class ACE_Incremental_Key_Generator
   //       - Constructor that accepts 0 in the constructor.
   //       - Prefix increment.
   //       - Assignment.
-  //
+  // 
   //     Note that a primitive types such as u_long, int, etc., are
   //     suitable for this class.
 public:
@@ -80,18 +67,18 @@ protected:
 template <class T>
 class ACE_Iterator_Impl
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a abstract iterator.
   //
   // = DESCRIPTION
   //     Implementation to be provided by subclasses.
 public:
-
+  
   virtual ~ACE_Iterator_Impl (void);
-  // Destructor.
-
+  // Destructor.  
+  
   virtual ACE_Iterator_Impl<T> *clone (void) const = 0;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const = 0;
   // Comparison.
@@ -111,18 +98,18 @@ public:
 template <class T>
 class ACE_Reverse_Iterator_Impl
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a abstract reverse iterator.
   //
   // = DESCRIPTION
   //     Implementation to be provided by subclasses.
 public:
-
+  
   virtual ~ACE_Reverse_Iterator_Impl (void);
-  // Destructor.
-
+  // Destructor.  
+  
   virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const = 0;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const = 0;
   // Comparison.
@@ -142,29 +129,29 @@ public:
 template <class T>
 class ACE_Iterator
 {
-  // = TITLE
+  // = TITLE  
   //     Defines the iterator interface.
   //
   // = DESCRIPTION
   //     Implementation to be provided by forwarding.
 public:
-
+  
   // = Traits.
   typedef T value_type;
   typedef ACE_Iterator_Impl<T> implementation;
 
   ACE_Iterator (ACE_Iterator_Impl<T> *impl);
-  // Constructor.
+  // Constructor.  
 
   ACE_Iterator (const ACE_Iterator<T> &rhs);
   // Copy constructor.
-
+  
   ~ACE_Iterator (void);
-  // Destructor.
+  // Destructor.  
 
   ACE_Iterator<T> &operator= (const ACE_Iterator<T> &rhs);
   // Assignment operator.
-
+  
   int operator== (const ACE_Iterator<T> &rhs) const;
   int operator!= (const ACE_Iterator<T> &rhs) const;
   // Comparison operators.
@@ -185,12 +172,12 @@ public:
   // Postfix reverse.
 
   ACE_Iterator_Impl<T> &impl (void);
-  // Accessor to implementation object.
+  // Accessor to implementation object.    
 
 protected:
 
   ACE_Iterator_Impl<T> *implementation_;
-  // Implementation pointer.
+  // Implementation pointer.    
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -198,29 +185,29 @@ protected:
 template <class T>
 class ACE_Reverse_Iterator
 {
-  // = TITLE
+  // = TITLE  
   //     Defines the reverse iterator interface.
   //
   // = DESCRIPTION
   //     Implementation to be provided by forwarding.
 public:
-
+  
   // = Traits.
   typedef T value_type;
   typedef ACE_Reverse_Iterator_Impl<T> implementation;
 
   ACE_Reverse_Iterator (ACE_Reverse_Iterator_Impl<T> *impl);
-  // Constructor.
+  // Constructor.  
 
   ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rhs);
   // Copy constructor.
-
+  
   ~ACE_Reverse_Iterator (void);
-  // Destructor.
+  // Destructor.  
 
   ACE_Reverse_Iterator<T> &operator= (const ACE_Reverse_Iterator<T> &rhs);
   // Assignment operator.
-
+  
   int operator== (const ACE_Reverse_Iterator<T> &rhs) const;
   int operator!= (const ACE_Reverse_Iterator<T> &rhs) const;
   // Comparison operators.
@@ -241,12 +228,12 @@ public:
   // Postfix reverse.
 
   ACE_Reverse_Iterator_Impl<T> &impl (void);
-  // Accessor to implementation object.
+  // Accessor to implementation object.    
 
 protected:
 
   ACE_Reverse_Iterator_Impl<T> *implementation_;
-  // Implementation pointer.
+  // Implementation pointer.    
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -254,7 +241,7 @@ protected:
 template <class KEY, class VALUE>
 class ACE_Map
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a map interface.
   //
   // = DESCRIPTION
@@ -336,7 +323,7 @@ public:
 
   virtual int rebind (const KEY &key,
                       const VALUE &value,
-                      KEY &old_key,
+                      KEY &old_key, 
                       VALUE &old_value) = 0;
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
@@ -354,7 +341,7 @@ public:
   // attempt is made to bind an existing entry.  This function fails
   // for maps that do not allow user specified keys.
 
-  virtual int find (const KEY &key,
+  virtual int find (const KEY &key, 
                     VALUE &value) = 0;
   // Locate <value> associated with <key>.
 
@@ -364,7 +351,7 @@ public:
   virtual int unbind (const KEY &key) = 0;
   // Remove <key> from the map.
 
-  virtual int unbind (const KEY &key,
+  virtual int unbind (const KEY &key, 
                       VALUE &value) = 0;
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
@@ -413,24 +400,24 @@ private:
 template <class T, class IMPLEMENTATION, class ENTRY>
 class ACE_Map_Impl_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a iterator implementation for the Map_Impl class.
   //
   // = DESCRIPTION
   //     Implementation to be provided by <IMPLEMENTATION>.
 public:
-
+  
   // = Traits.
   typedef IMPLEMENTATION implementation;
 
   ACE_Map_Impl_Iterator_Adapter (const IMPLEMENTATION &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Map_Impl_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -448,9 +435,9 @@ public:
   // Accessor to implementation object.
 
 protected:
-
+  
   IMPLEMENTATION implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -458,25 +445,24 @@ protected:
 template <class T, class IMPLEMENTATION, class ENTRY>
 class ACE_Map_Impl_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a reverse iterator implementation for the Map_Impl class.
   //
   // = DESCRIPTION
   //     Implementation to be provided by IMPLEMENTATION.
 public:
-
+  
   // = Traits.
-  typedef IMPLEMENTATION
-          implementation;
+  typedef IMPLEMENTATION implementation;
 
   ACE_Map_Impl_Reverse_Iterator_Adapter (const IMPLEMENTATION &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Map_Impl_Reverse_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -496,7 +482,7 @@ public:
 protected:
 
   IMPLEMENTATION implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -504,7 +490,7 @@ protected:
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY>
 class ACE_Map_Impl : public ACE_Map<KEY, VALUE>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a map implementation.
   //
   // = DESCRIPTION
@@ -512,8 +498,8 @@ class ACE_Map_Impl : public ACE_Map<KEY, VALUE>
 public:
 
   // = Traits.
-  typedef ACE_Map_Impl_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, ITERATOR, ENTRY> iterator_impl;
-  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, REVERSE_ITERATOR, ENTRY> reverse_iterator_impl;
+  typedef ACE_Map_Impl_Iterator_Adapter<value_type, ITERATOR, ENTRY> iterator_impl;
+  typedef ACE_Map_Impl_Reverse_Iterator_Adapter<value_type, REVERSE_ITERATOR, ENTRY> reverse_iterator_impl;
   typedef IMPLEMENTATION implementation;
 
   // = Initialization and termination methods.
@@ -591,7 +577,7 @@ public:
 
   virtual int rebind (const KEY &key,
                       const VALUE &value,
-                      KEY &old_key,
+                      KEY &old_key, 
                       VALUE &old_value);
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
@@ -609,7 +595,7 @@ public:
   // attempt is made to bind an existing entry.  This function fails
   // for maps that do not allow user specified keys.
 
-  virtual int find (const KEY &key,
+  virtual int find (const KEY &key, 
                     VALUE &value);
   // Locate <value> associated with <key>.
 
@@ -619,7 +605,7 @@ public:
   virtual int unbind (const KEY &key);
   // Remove <key> from the map.
 
-  virtual int unbind (const KEY &key,
+  virtual int unbind (const KEY &key, 
                       VALUE &value);
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
@@ -663,24 +649,24 @@ private:
 template <class T, class VALUE>
 class ACE_Active_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a iterator implementation for the Active_Map_Manager_Adapter.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Active_Map_Manager::iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::iterator implementation;
+  typedef ACE_Active_Map_Manager<VALUE>::iterator implementation;
 
   ACE_Active_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Active_Map_Manager_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -693,14 +679,14 @@ public:
 
   virtual void minus_minus (void);
   // Reverse.
-
+  
   ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl (void);
   // Accessor to implementation object.
 
 protected:
 
   ACE_Map_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -708,24 +694,24 @@ protected:
 template <class T, class VALUE>
 class ACE_Active_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a reverse iterator implementation for the Active_Map_Manager_Adapter.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Active_Map_Manager::reverse_iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Active_Map_Manager<VALUE>::reverse_iterator implementation;
+  typedef ACE_Active_Map_Manager<VALUE>::reverse_iterator implementation;
 
   ACE_Active_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Active_Map_Manager_Reverse_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -745,7 +731,7 @@ public:
 protected:
 
   ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, VALUE, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -753,17 +739,17 @@ protected:
 template <class KEY, class VALUE, class KEY_ADAPTER>
 class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a map implementation.
   //
-  // = DESCRIPTION
+  // = DESCRIPTION  
   //     Implementation to be provided by <ACE_Active_Map_Manager>.
 public:
 
   // = Traits.
   typedef ACE_Pair<KEY, VALUE> expanded_value;
-  typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> iterator_impl;
-  typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> reverse_iterator_impl;
+  typedef ACE_Active_Map_Manager_Iterator_Adapter<value_type, expanded_value> iterator_impl;
+  typedef ACE_Active_Map_Manager_Reverse_Iterator_Adapter<value_type, expanded_value> reverse_iterator_impl;
   typedef ACE_Active_Map_Manager<expanded_value> implementation;
 
   // = Initialization and termination methods.
@@ -841,7 +827,7 @@ public:
 
   virtual int rebind (const KEY &key,
                       const VALUE &value,
-                      KEY &old_key,
+                      KEY &old_key, 
                       VALUE &old_value);
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
@@ -859,7 +845,7 @@ public:
   // attempt is made to bind an existing entry.  This function fails
   // for maps that do not allow user specified keys.
 
-  virtual int find (const KEY &key,
+  virtual int find (const KEY &key, 
                     VALUE &value);
   // Locate <value> associated with <key>.
 
@@ -869,7 +855,7 @@ public:
   virtual int unbind (const KEY &key);
   // Remove <key> from the map.
 
-  virtual int unbind (const KEY &key,
+  virtual int unbind (const KEY &key, 
                       VALUE &value);
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
@@ -898,7 +884,7 @@ protected:
   virtual int unbind (const KEY &key,
                       expanded_value *&internal_value);
   // Unbind helper.
-
+  
   ACE_Active_Map_Manager<ACE_Pair<KEY, VALUE> > implementation_;
   // All implementation details are forwarded to this class.
 
@@ -927,24 +913,24 @@ private:
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
 class ACE_Hash_Map_Manager_Ex_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a iterator implementation for the Hash_Map_Manager_Adapter.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Hash_Map_Manager_Ex::iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator implementation;
+  typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::iterator implementation;
 
   ACE_Hash_Map_Manager_Ex_Iterator_Adapter (const ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Hash_Map_Manager_Ex_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -964,7 +950,7 @@ public:
 protected:
 
   ACE_Hash_Map_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -972,24 +958,24 @@ protected:
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS>
 class ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a reverse iterator implementation for the Hash_Map_Manager_Adapter.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Hash_Map_Manager_Ex::reverse_iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator implementation;
+  typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::reverse_iterator implementation;
 
   ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (const ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -1009,7 +995,7 @@ public:
 protected:
 
   ACE_Hash_Map_Reverse_Iterator_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1017,16 +1003,16 @@ protected:
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR>
 class ACE_Hash_Map_Manager_Ex_Adapter : public ACE_Map<KEY, VALUE>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a map implementation.
   //
-  // = DESCRIPTION
+  // = DESCRIPTION  
   //     Implementation to be provided by <ACE_Hash_Map_Manager_Ex>.
 public:
 
   // = Traits.
-  typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> iterator_impl;
-  typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE, HASH_KEY, COMPARE_KEYS> reverse_iterator_impl;
+  typedef ACE_Hash_Map_Manager_Ex_Iterator_Adapter<value_type, KEY, VALUE, HASH_KEY, COMPARE_KEYS> iterator_impl;
+  typedef ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<value_type, KEY, VALUE, HASH_KEY, COMPARE_KEYS> reverse_iterator_impl;
   typedef ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> implementation;
 
   // = Initialization and termination methods.
@@ -1104,7 +1090,7 @@ public:
 
   virtual int rebind (const KEY &key,
                       const VALUE &value,
-                      KEY &old_key,
+                      KEY &old_key, 
                       VALUE &old_value);
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
@@ -1122,7 +1108,7 @@ public:
   // attempt is made to bind an existing entry.  This function fails
   // for maps that do not allow user specified keys.
 
-  virtual int find (const KEY &key,
+  virtual int find (const KEY &key, 
                     VALUE &value);
   // Locate <value> associated with <key>.
 
@@ -1132,7 +1118,7 @@ public:
   virtual int unbind (const KEY &key);
   // Remove <key> from the map.
 
-  virtual int unbind (const KEY &key,
+  virtual int unbind (const KEY &key, 
                       VALUE &value);
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
@@ -1182,24 +1168,24 @@ private:
 template <class T, class KEY, class VALUE>
 class ACE_Map_Manager_Iterator_Adapter : public ACE_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a iterator implementation for the Map_Manager_Adapter.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Map_Manager::iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator implementation;
+  typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::iterator implementation;
 
   ACE_Map_Manager_Iterator_Adapter (const ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Map_Manager_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -1219,7 +1205,7 @@ public:
 protected:
 
   ACE_Map_Iterator<KEY, VALUE, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1227,24 +1213,24 @@ protected:
 template <class T, class KEY, class VALUE>
 class ACE_Map_Manager_Reverse_Iterator_Adapter : public ACE_Reverse_Iterator_Impl<T>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a reverse iterator implementation for the Map Manager.
   //
   // = DESCRIPTION
   //     Implementation to be provided by ACE_Map_Manager::reverse_iterator.
 public:
-
+  
   // = Traits.
-  typedef ACE_TYPENAME ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator implementation;
+  typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::reverse_iterator implementation;
 
   ACE_Map_Manager_Reverse_Iterator_Adapter (const ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> &impl);
-  // Constructor.
+  // Constructor.  
 
   virtual ~ACE_Map_Manager_Reverse_Iterator_Adapter (void);
-  // Destructor.
+  // Destructor.  
 
   virtual ACE_Reverse_Iterator_Impl<T> *clone (void) const;
-  // Clone.
+  // Clone.  
 
   virtual int compare (const ACE_Reverse_Iterator_Impl<T> &rhs) const;
   // Comparison.
@@ -1264,7 +1250,7 @@ public:
 protected:
 
   ACE_Map_Reverse_Iterator<KEY, VALUE, ACE_Null_Mutex> implementation_;
-  // All implementation details are forwarded to this class.
+  // All implementation details are forwarded to this class.  
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1272,16 +1258,16 @@ protected:
 template <class KEY, class VALUE, class KEY_GENERATOR>
 class ACE_Map_Manager_Adapter : public ACE_Map<KEY, VALUE>
 {
-  // = TITLE
+  // = TITLE  
   //     Defines a map implementation.
   //
-  // = DESCRIPTION
+  // = DESCRIPTION  
   //     Implementation to be provided by <ACE_Map_Manager>.
 public:
 
   // = Traits.
-  typedef ACE_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> iterator_impl;
-  typedef ACE_Map_Manager_Reverse_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, KEY, VALUE> reverse_iterator_impl;
+  typedef ACE_Map_Manager_Iterator_Adapter<value_type, KEY, VALUE> iterator_impl;
+  typedef ACE_Map_Manager_Reverse_Iterator_Adapter<value_type, KEY, VALUE> reverse_iterator_impl;
   typedef ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex> implementation;
 
   // = Initialization and termination methods.
@@ -1359,7 +1345,7 @@ public:
 
   virtual int rebind (const KEY &key,
                       const VALUE &value,
-                      KEY &old_key,
+                      KEY &old_key, 
                       VALUE &old_value);
   // Reassociate <key> with <value>, storing the old key and value
   // into the "out" parameters <old_key> and <old_value>.  The
@@ -1377,7 +1363,7 @@ public:
   // attempt is made to bind an existing entry.  This function fails
   // for maps that do not allow user specified keys.
 
-  virtual int find (const KEY &key,
+  virtual int find (const KEY &key, 
                     VALUE &value);
   // Locate <value> associated with <key>.
 
@@ -1387,7 +1373,7 @@ public:
   virtual int unbind (const KEY &key);
   // Remove <key> from the map.
 
-  virtual int unbind (const KEY &key,
+  virtual int unbind (const KEY &key, 
                       VALUE &value);
   // Remove <key> from the map, and return the <value> associated with
   // <key>.
diff --git a/ace/Map_T.i b/ace/Map_T.i
index ed64cf6d6a7..6e4f4907bac 100644
--- a/ace/Map_T.i
+++ b/ace/Map_T.i
@@ -2,14 +2,6 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class T> ACE_INLINE int
-ACE_Noop_Key_Generator<T>::operator() (T &)
-{
-  return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
 template <class T> ACE_INLINE
 ACE_Incremental_Key_Generator<T>::ACE_Incremental_Key_Generator (void)
   : t_ (0)
@@ -56,7 +48,7 @@ ACE_Iterator<T>::ACE_Iterator (const ACE_Iterator<T> &rhs)
   : implementation_ (rhs.implementation_->clone ())
 {
 }
-
+  
 template <class T> ACE_INLINE
 ACE_Iterator<T>::~ACE_Iterator (void)
 {
@@ -71,13 +63,13 @@ ACE_Iterator<T>::operator= (const ACE_Iterator<T> &rhs)
   return *this;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Iterator<T>::operator== (const ACE_Iterator<T> &rhs) const
 {
   return this->implementation_->compare (*rhs.implementation_);
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Iterator<T>::operator!= (const ACE_Iterator<T> &rhs) const
 {
   return !this->operator== (rhs);
@@ -96,7 +88,7 @@ ACE_Iterator<T>::operator++ (void)
   return *this;
 }
 
-template <class T> ACE_INLINE ACE_Iterator<T>
+template <class T> ACE_INLINE ACE_Iterator<T> 
 ACE_Iterator<T>::operator++ (int)
 {
   ACE_Iterator<T> tmp = *this;
@@ -111,7 +103,7 @@ ACE_Iterator<T>::operator-- (void)
   return *this;
 }
 
-template <class T> ACE_INLINE ACE_Iterator<T>
+template <class T> ACE_INLINE ACE_Iterator<T> 
 ACE_Iterator<T>::operator-- (int)
 {
   ACE_Iterator<T> tmp = *this;
@@ -138,7 +130,7 @@ ACE_Reverse_Iterator<T>::ACE_Reverse_Iterator (const ACE_Reverse_Iterator<T> &rh
   : implementation_ (rhs.implementation_->clone ())
 {
 }
-
+  
 template <class T> ACE_INLINE
 ACE_Reverse_Iterator<T>::~ACE_Reverse_Iterator (void)
 {
@@ -153,13 +145,13 @@ ACE_Reverse_Iterator<T>::operator= (const ACE_Reverse_Iterator<T> &rhs)
   return *this;
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Reverse_Iterator<T>::operator== (const ACE_Reverse_Iterator<T> &rhs) const
 {
   return this->implementation_->compare (*rhs.implementation_);
 }
 
-template <class T> ACE_INLINE int
+template <class T> ACE_INLINE int 
 ACE_Reverse_Iterator<T>::operator!= (const ACE_Reverse_Iterator<T> &rhs) const
 {
   return !this->operator== (rhs);
@@ -178,7 +170,7 @@ ACE_Reverse_Iterator<T>::operator++ (void)
   return *this;
 }
 
-template <class T> ACE_INLINE ACE_Reverse_Iterator<T>
+template <class T> ACE_INLINE ACE_Reverse_Iterator<T> 
 ACE_Reverse_Iterator<T>::operator++ (int)
 {
   ACE_Reverse_Iterator<T> tmp = *this;
@@ -193,7 +185,7 @@ ACE_Reverse_Iterator<T>::operator-- (void)
   return *this;
 }
 
-template <class T> ACE_INLINE ACE_Reverse_Iterator<T>
+template <class T> ACE_INLINE ACE_Reverse_Iterator<T> 
 ACE_Reverse_Iterator<T>::operator-- (int)
 {
   ACE_Reverse_Iterator<T> tmp = *this;
@@ -209,12 +201,12 @@ ACE_Reverse_Iterator<T>::impl (void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE> ACE_INLINE
+template <class KEY, class VALUE> ACE_INLINE 
 ACE_Map<KEY, VALUE>::ACE_Map (void)
 {
 }
 
-template <class KEY, class VALUE> ACE_INLINE
+template <class KEY, class VALUE> ACE_INLINE 
 ACE_Map<KEY, VALUE>::~ACE_Map (void)
 {
 }
@@ -266,7 +258,7 @@ ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) const
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE int
 ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::compare (const ACE_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs
+  const ACE_Map_Impl_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs 
     = ACE_dynamic_cast_3_ref (const ACE_Map_Impl_Iterator_Adapter, T, IMPLEMENTATION, ENTRY, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -321,7 +313,7 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::clone (void) co
 template <class T, class IMPLEMENTATION, class ENTRY> ACE_INLINE int
 ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs
+  const ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY> &rhs 
     = ACE_dynamic_cast_3_ref (const ACE_Map_Impl_Reverse_Iterator_Adapter, T, IMPLEMENTATION, ENTRY, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -355,10 +347,10 @@ ACE_Map_Impl_Reverse_Iterator_Adapter<T, IMPLEMENTATION, ENTRY>::impl (void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::ACE_Map_Impl (ACE_Allocator *alloc)
   : implementation_ (alloc)
-{
+{  
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE
@@ -378,47 +370,47 @@ template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class RE
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::open (size_t length,
                                                 ACE_Allocator *alloc)
 {
-  return this->implementation_.open (length,
+  return this->implementation_.open (length, 
                                      alloc);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::close (void)
 {
   return this->implementation_.close ();
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::bind (const KEY &key,
                                                 const VALUE &value)
 {
-  return this->implementation_.bind (key,
+  return this->implementation_.bind (key, 
                                      value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::bind_modify_key (const VALUE &value,
                                                            KEY &key)
 {
-  return this->implementation_.bind_modify_key (value,
+  return this->implementation_.bind_modify_key (value, 
                                                 key);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::bind_create_key (const VALUE &value,
                                                            KEY &key)
 {
-  return this->implementation_.bind_create_key (value,
+  return this->implementation_.bind_create_key (value, 
                                                 key);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::bind_create_key (const VALUE &value)
 {
   return this->implementation_.bind_create_key (value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::recover_key (const KEY &modified_key,
                                                        KEY &original_key)
 {
@@ -426,88 +418,88 @@ ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rec
                                             original_key);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rebind (const KEY &key,
                                                   const VALUE &value)
 {
-  return this->implementation_.rebind (key,
+  return this->implementation_.rebind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rebind (const KEY &key,
                                                   const VALUE &value,
                                                   VALUE &old_value)
 {
-  return this->implementation_.rebind (key,
-                                       value,
+  return this->implementation_.rebind (key, 
+                                       value, 
                                        old_value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::rebind (const KEY &key,
                                                   const VALUE &value,
-                                                  KEY &old_key,
+                                                  KEY &old_key, 
                                                   VALUE &old_value)
 {
   return this->implementation_.rebind (key,
-                                       value,
+                                       value, 
                                        old_key,
                                        old_value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::trybind (const KEY &key,
                                                    VALUE &value)
 {
-  return this->implementation_.trybind (key,
+  return this->implementation_.trybind (key, 
                                         value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::find (const KEY &key,
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::find (const KEY &key, 
                                                 VALUE &value)
 {
   return this->implementation_.find (key,
                                      value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::find (const KEY &key)
 {
   return this->implementation_.find (key);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unbind (const KEY &key)
 {
   return this->implementation_.unbind (key);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int
-ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unbind (const KEY &key,
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE int 
+ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::unbind (const KEY &key, 
                                                   VALUE &value)
 {
-  return this->implementation_.unbind (key,
+  return this->implementation_.unbind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE size_t 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
 
-template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE void
+template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE void 
 ACE_Map_Impl<KEY, VALUE, IMPLEMENTATION, ITERATOR, REVERSE_ITERATOR, ENTRY>::dump (void) const
 {
-  this->implementation_.dump ();
+  this->implementation_.dump ();  
 }
 
 template <class KEY, class VALUE, class IMPLEMENTATION, class ITERATOR, class REVERSE_ITERATOR, class ENTRY> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -563,7 +555,7 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::clone (void) const
 template <class T, class VALUE> ACE_INLINE int
 ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::compare (const ACE_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE> &rhs
+  const ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE> &rhs 
     = ACE_dynamic_cast_2_ref (const ACE_Active_Map_Manager_Iterator_Adapter, T, VALUE, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -572,10 +564,9 @@ ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::compare (const ACE_Iterator_I
 template <class T, class VALUE> ACE_INLINE T
 ACE_Active_Map_Manager_Iterator_Adapter<T, VALUE>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).int_id_.first (),
-            (*implementation_).int_id_.second ());
+  ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_;
+  return T (entry.int_id_.first (),
+            entry.int_id_.second ());
 }
 
 template <class T, class VALUE> ACE_INLINE void
@@ -619,7 +610,7 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::clone (void) const
 template <class T, class VALUE> ACE_INLINE int
 ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE> &rhs
+  const ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE> &rhs 
     = ACE_dynamic_cast_2_ref (const ACE_Active_Map_Manager_Reverse_Iterator_Adapter, T, VALUE, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -628,10 +619,9 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::compare (const ACE_Re
 template <class T, class VALUE> ACE_INLINE T
 ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).int_id_.first (),
-            (*implementation_).int_id_.second ());
+  ACE_Active_Map_Manager<VALUE>::ENTRY &entry = *this->implementation_;
+  return T (entry.int_id_.first (),
+            entry.int_id_.second ());
 }
 
 template <class T, class VALUE> ACE_INLINE void
@@ -654,10 +644,10 @@ ACE_Active_Map_Manager_Reverse_Iterator_Adapter<T, VALUE>::impl (void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
-{
+{  
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE
@@ -677,38 +667,38 @@ template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::open (size_t length,
                                                                ACE_Allocator *alloc)
 {
-  return this->implementation_.open (length,
+  return this->implementation_.open (length, 
                                      alloc);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::close (void)
 {
   return this->implementation_.close ();
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind (const KEY &,
                                                                const VALUE &)
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_modify_key (const VALUE &value,
                                                                           KEY &key)
 {
   // Reserve a slot and create an active key.
   expanded_value *internal_value = 0;
   ACE_Active_Map_Manager_Key active_key;
-  int result = this->implementation_.bind (active_key,
+  int result = this->implementation_.bind (active_key, 
                                            internal_value);
   if (result == 0)
     {
       // Encode the active key and the existing user key into key part
       // of <expanded_value>.
       result = this->key_adapter_.encode (key,
-                                          active_key,
+                                          active_key, 
                                           internal_value->first ());
       if (result == 0)
         {
@@ -727,20 +717,20 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_modify_key (const
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const VALUE &value,
                                                                           KEY &key)
 {
   // Reserve a slot and create an active key.
   expanded_value *internal_value = 0;
   ACE_Active_Map_Manager_Key active_key;
-  int result = this->implementation_.bind (active_key,
+  int result = this->implementation_.bind (active_key, 
                                            internal_value);
   if (result == 0)
     {
       // Encode the active key into key part of <expanded_value>.
       result = this->key_adapter_.encode (internal_value->first (),
-                                          active_key,
+                                          active_key, 
                                           internal_value->first ());
       if (result == 0)
         {
@@ -759,13 +749,13 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const VALUE &value)
 {
   // Reserve a slot and create an active key.
   expanded_value *internal_value = 0;
   ACE_Active_Map_Manager_Key active_key;
-  int result = this->implementation_.bind (active_key,
+  int result = this->implementation_.bind (active_key, 
                                            internal_value);
   if (result == 0)
     {
@@ -788,7 +778,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::bind_create_key (const
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::recover_key (const KEY &modified_key,
                                                                       KEY &original_key)
 {
@@ -798,7 +788,7 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::recover_key (const KEY
                                     original_key);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
                                                                ACE_Pair<KEY, VALUE> *&internal_value)
 {
@@ -809,21 +799,21 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
   if (result == 0)
     {
       // Find recovered active key in map.
-      result = this->implementation_.find (active_key,
+      result = this->implementation_.find (active_key, 
                                            internal_value);
     }
-
+  
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key, 
                                                                VALUE &value)
 {
   expanded_value *internal_value = 0;
-  int result = this->find (key,
+  int result = this->find (key, 
                            internal_value);
-
+              
   if (result == 0)
     {
       // Copy value.
@@ -833,22 +823,22 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key,
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::find (const KEY &key)
 {
   expanded_value *internal_value = 0;
-  return this->find (key,
+  return this->find (key, 
                      internal_value);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
                                                                  const VALUE &value)
 {
   expanded_value *internal_value = 0;
-  int result = this->find (key,
+  int result = this->find (key, 
                            internal_value);
-
+              
   if (result == 0)
     {
       // Reset value.
@@ -858,15 +848,15 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
                                                                  const VALUE &value,
                                                                  VALUE &old_value)
 {
   expanded_value *internal_value = 0;
-  int result = this->find (key,
+  int result = this->find (key, 
                            internal_value);
-
+              
   if (result == 0)
     {
       // Copy old value.
@@ -879,16 +869,16 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
                                                                  const VALUE &value,
-                                                                 KEY &old_key,
+                                                                 KEY &old_key, 
                                                                  VALUE &old_value)
 {
   expanded_value *internal_value = 0;
-  int result = this->find (key,
+  int result = this->find (key, 
                            internal_value);
-
+              
   if (result == 0)
     {
       // Copy old key and value.
@@ -902,14 +892,14 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::rebind (const KEY &key,
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::trybind (const KEY &,
                                                                   VALUE &)
 {
   ACE_NOTSUP_RETURN (-1);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
                                                                  ACE_Pair<KEY, VALUE> *&internal_value)
 {
@@ -920,29 +910,29 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
   if (result == 0)
     {
       // Unbind recovered active key from map.
-      result = this->implementation_.unbind (active_key,
+      result = this->implementation_.unbind (active_key, 
                                              internal_value);
     }
-
+  
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key)
 {
   expanded_value *internal_value = 0;
-  return this->unbind (key,
+  return this->unbind (key, 
                        internal_value);
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int
-ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE int 
+ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key, 
                                                                  VALUE &value)
 {
   expanded_value *internal_value = 0;
-  int result = this->unbind (key,
+  int result = this->unbind (key, 
                              internal_value);
-
+              
   if (result == 0)
     {
       // Copy value.
@@ -952,22 +942,22 @@ ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::unbind (const KEY &key,
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE size_t 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
 
-template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE void
+template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE void 
 ACE_Active_Map_Manager_Adapter<KEY, VALUE, KEY_ADAPTER>::dump (void) const
 {
-  this->implementation_.dump ();
+  this->implementation_.dump ();  
 }
 
 template <class KEY, class VALUE, class KEY_ADAPTER> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -1029,7 +1019,7 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>:
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE int
 ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::compare (const ACE_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs
+  const ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs 
     = ACE_dynamic_cast_5_ref (const ACE_Hash_Map_Manager_Ex_Iterator_Adapter, T, KEY, VALUE, HASH_KEY, COMPARE_KEYS, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -1038,10 +1028,9 @@ ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>:
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE T
 ACE_Hash_Map_Manager_Ex_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).ext_id_,
-            (*implementation_).int_id_);
+  ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_;
+  return T (entry.ext_id_,
+            entry.int_id_);
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE void
@@ -1085,7 +1074,7 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE int
 ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs
+  const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS> &rhs 
     = ACE_dynamic_cast_5_ref (const ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter, T, KEY, VALUE, HASH_KEY, COMPARE_KEYS, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -1094,10 +1083,9 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE T
 ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPARE_KEYS>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).ext_id_,
-            (*implementation_).int_id_);
+  ACE_Hash_Map_Manager_Ex<KEY, VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_;
+  return T (entry.ext_id_,
+            entry.int_id_);
 }
 
 template <class T, class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS> ACE_INLINE void
@@ -1120,10 +1108,10 @@ ACE_Hash_Map_Manager_Ex_Reverse_Iterator_Adapter<T, KEY, VALUE, HASH_KEY, COMPAR
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
-{
+{  
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE
@@ -1143,58 +1131,58 @@ template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::open (size_t length,
                                                                                           ACE_Allocator *alloc)
 {
-  return this->implementation_.open (length,
+  return this->implementation_.open (length, 
                                      alloc);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::close (void)
 {
   return this->implementation_.close ();
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::bind (const KEY &key,
                                                                                           const VALUE &value)
 {
-  return this->implementation_.bind (key,
+  return this->implementation_.bind (key, 
                                      value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::bind_modify_key (const VALUE &value,
                                                                                                      KEY &key)
 {
-  return this->implementation_.bind (key,
+  return this->implementation_.bind (key, 
                                      value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::bind_create_key (const VALUE &value,
                                                                                                      KEY &key)
 {
   // Invoke the user specified key generation functor.
   int result = this->key_generator_ (key);
-
+  
   if (result == 0)
     {
       // Try to add.
-      result = this->implementation_.bind (key,
+      result = this->implementation_.bind (key, 
                                            value);
     }
 
   return result;
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::bind_create_key (const VALUE &value)
 {
   KEY key;
-  return this->bind_create_key (value,
+  return this->bind_create_key (value, 
                                 key);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::recover_key (const KEY &modified_key,
                                                                                                  KEY &original_key)
 {
@@ -1202,88 +1190,88 @@ ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATO
   return 0;
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rebind (const KEY &key,
                                                                                             const VALUE &value)
 {
-  return this->implementation_.rebind (key,
+  return this->implementation_.rebind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rebind (const KEY &key,
                                                                                             const VALUE &value,
                                                                                             VALUE &old_value)
 {
-  return this->implementation_.rebind (key,
-                                       value,
+  return this->implementation_.rebind (key, 
+                                       value, 
                                        old_value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::rebind (const KEY &key,
                                                                                             const VALUE &value,
-                                                                                            KEY &old_key,
+                                                                                            KEY &old_key, 
                                                                                             VALUE &old_value)
 {
   return this->implementation_.rebind (key,
-                                       value,
+                                       value, 
                                        old_key,
                                        old_value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::trybind (const KEY &key,
                                                                                              VALUE &value)
 {
-  return this->implementation_.trybind (key,
+  return this->implementation_.trybind (key, 
                                         value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::find (const KEY &key,
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::find (const KEY &key, 
                                                                                           VALUE &value)
 {
   return this->implementation_.find (key,
                                      value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::find (const KEY &key)
 {
   return this->implementation_.find (key);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::unbind (const KEY &key)
 {
   return this->implementation_.unbind (key);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int
-ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::unbind (const KEY &key,
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE int 
+ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::unbind (const KEY &key, 
                                                                                             VALUE &value)
 {
-  return this->implementation_.unbind (key,
+  return this->implementation_.unbind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE size_t 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
 
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE void
+template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE void 
 ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, HASH_KEY, COMPARE_KEYS, KEY_GENERATOR>::dump (void) const
 {
-  this->implementation_.dump ();
+  this->implementation_.dump ();  
 }
 
 template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class KEY_GENERATOR> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
@@ -1345,7 +1333,7 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::clone (void) const
 template <class T, class KEY, class VALUE> ACE_INLINE int
 ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE> &rhs
+  const ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE> &rhs 
     = ACE_dynamic_cast_3_ref (const ACE_Map_Manager_Iterator_Adapter, T, KEY, VALUE, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -1354,10 +1342,9 @@ ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Iterator_Imp
 template <class T, class KEY, class VALUE> ACE_INLINE T
 ACE_Map_Manager_Iterator_Adapter<T, KEY, VALUE>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).ext_id_,
-            (*implementation_).int_id_);
+  ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_;
+  return T (entry.ext_id_,
+            entry.int_id_);
 }
 
 template <class T, class KEY, class VALUE> ACE_INLINE void
@@ -1401,7 +1388,7 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::clone (void) const
 template <class T, class KEY, class VALUE> ACE_INLINE int
 ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Reverse_Iterator_Impl<T> &rhs_base) const
 {
-  const ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE> &rhs
+  const ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE> &rhs 
     = ACE_dynamic_cast_3_ref (const ACE_Map_Manager_Reverse_Iterator_Adapter, T, KEY, VALUE, rhs_base);
 
   return this->implementation_ == rhs.implementation_;
@@ -1410,10 +1397,9 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::compare (const ACE_Reve
 template <class T, class KEY, class VALUE> ACE_INLINE T
 ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::dereference () const
 {
-  // The following syntax is necessary to work around certain broken compilers.
-  // In particular, please do not prefix implementation_ with this->
-  return T ((*implementation_).ext_id_,
-            (*implementation_).int_id_);
+  ACE_Map_Manager<KEY, VALUE, ACE_Null_Mutex>::ENTRY &entry = *this->implementation_;
+  return T (entry.ext_id_,
+            entry.int_id_);
 }
 
 template <class T, class KEY, class VALUE> ACE_INLINE void
@@ -1436,10 +1422,10 @@ ACE_Map_Manager_Reverse_Iterator_Adapter<T, KEY, VALUE>::impl (void)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::ACE_Map_Manager_Adapter (ACE_Allocator *alloc)
   : implementation_ (alloc)
-{
+{  
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE
@@ -1459,50 +1445,50 @@ template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::open (size_t length,
                                                           ACE_Allocator *alloc)
 {
-  return this->implementation_.open (length,
+  return this->implementation_.open (length, 
                                      alloc);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::close (void)
 {
   return this->implementation_.close ();
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::bind (const KEY &key,
                                                           const VALUE &value)
 {
-  return this->implementation_.bind (key,
+  return this->implementation_.bind (key, 
                                      value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::bind_modify_key (const VALUE &value,
                                                                      KEY &key)
 {
-  return this->implementation_.bind (key,
+  return this->implementation_.bind (key, 
                                      value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::bind_create_key (const VALUE &value,
                                                                      KEY &key)
 {
   // Invoke the user specified key generation functor.
   int result = this->key_generator_ (key);
-
+  
   if (result == 0)
     {
       // Try to add.
-      result = this->implementation_.bind (key,
+      result = this->implementation_.bind (key, 
                                            value);
     }
 
   return result;
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::bind_create_key (const VALUE &value)
 {
   KEY key;
@@ -1510,7 +1496,7 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::bind_create_key (const VALUE
                                 key);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::recover_key (const KEY &modified_key,
                                                                  KEY &original_key)
 {
@@ -1518,88 +1504,88 @@ ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::recover_key (const KEY &modi
   return 0;
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rebind (const KEY &key,
                                                             const VALUE &value)
 {
-  return this->implementation_.rebind (key,
+  return this->implementation_.rebind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rebind (const KEY &key,
                                                             const VALUE &value,
                                                             VALUE &old_value)
 {
-  return this->implementation_.rebind (key,
-                                       value,
+  return this->implementation_.rebind (key, 
+                                       value, 
                                        old_value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::rebind (const KEY &key,
                                                             const VALUE &value,
-                                                            KEY &old_key,
+                                                            KEY &old_key, 
                                                             VALUE &old_value)
 {
   return this->implementation_.rebind (key,
-                                       value,
+                                       value, 
                                        old_key,
                                        old_value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::trybind (const KEY &key,
                                                              VALUE &value)
 {
-  return this->implementation_.trybind (key,
+  return this->implementation_.trybind (key, 
                                         value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::find (const KEY &key,
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::find (const KEY &key, 
                                                           VALUE &value)
 {
   return this->implementation_.find (key,
                                      value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::find (const KEY &key)
 {
   return this->implementation_.find (key);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key)
 {
   return this->implementation_.unbind (key);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int
-ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key,
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE int 
+ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::unbind (const KEY &key, 
                                                             VALUE &value)
 {
-  return this->implementation_.unbind (key,
+  return this->implementation_.unbind (key, 
                                        value);
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::current_size (void)
 {
   return this->implementation_.current_size ();
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE size_t 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::total_size (void)
 {
   return this->implementation_.total_size ();
 }
 
-template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE void
+template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE void 
 ACE_Map_Manager_Adapter<KEY, VALUE, KEY_GENERATOR>::dump (void) const
 {
-  this->implementation_.dump ();
+  this->implementation_.dump ();  
 }
 
 template <class KEY, class VALUE, class KEY_GENERATOR> ACE_INLINE ACE_Iterator_Impl<ACE_Reference_Pair<const KEY, VALUE> > *
diff --git a/ace/Memory_Pool.cpp b/ace/Memory_Pool.cpp
index b8a3567fa6d..3acd2ee2441 100644
--- a/ace/Memory_Pool.cpp
+++ b/ace/Memory_Pool.cpp
@@ -33,7 +33,7 @@ ACE_Local_Memory_Pool::acquire (size_t nbytes,
   ACE_TRACE ("ACE_Local_Memory_Pool::acquire");
   rounded_bytes = this->round_up (nbytes);
 
-  ACE_Auto_Basic_Array_Ptr<char> cp (new char[rounded_bytes]);
+  ACE_Auto_Basic_Array_Ptr<char> cp = new char[rounded_bytes];
 
   if (cp.get () == 0)
     ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("(%P|%t) new failed \n")), 0);
@@ -402,19 +402,10 @@ ACE_MMAP_Memory_Pool::handle_signal (int signum, siginfo_t *siginfo, ucontext_t
   // knowing the faulting address.  guess_on_fault_ can only be true
   // on platforms that do not provide the faulting address through
   // signals or exceptions.
-  // We check to see if the mapping is up to date. If it is, then this
-  // fault isn't due to this mapping and we pass it on.
   if (guess_on_fault_)
     {
-      // check if the current mapping is up to date.
       off_t current_file_offset = ACE_OS::filesize (this->mmap_.handle ());
 
-      if (ACE_static_cast(size_t, current_file_offset) == this->mmap_.size())
-	{
-	  // It is up to date so this is a bad address.
-	  return -1;
-	}
-
       // Extend the mapping to cover the size of the backing store.
       return this->map_file (current_file_offset);
     }
diff --git a/ace/Memory_Pool.h b/ace/Memory_Pool.h
index 5be4903deb5..1c7223e4cfa 100644
--- a/ace/Memory_Pool.h
+++ b/ace/Memory_Pool.h
@@ -354,7 +354,6 @@ public:
 
   LPSECURITY_ATTRIBUTES sa_;
   // Pointer to a security attributes object.  Only used on NT.
-
 };
 
 class ACE_Export ACE_MMAP_Memory_Pool : public ACE_Event_Handler
@@ -468,7 +467,6 @@ protected:
 
   LPSECURITY_ATTRIBUTES sa_;
   // Security attributes object, only used on NT.
-
 };
 
 class ACE_Export ACE_Lite_MMAP_Memory_Pool : public ACE_MMAP_Memory_Pool
diff --git a/ace/Message_Block.cpp b/ace/Message_Block.cpp
index 87e4271b777..abc84cec0b8 100644
--- a/ace/Message_Block.cpp
+++ b/ace/Message_Block.cpp
@@ -184,7 +184,7 @@ ACE_Data_Block::size (size_t length)
                             (char *) this->allocator_strategy_->malloc (length),
                             -1);
 
-      ACE_OS::memcpy (buf,
+      ACE_OS::memcpy (buf, 
                       this->base_,
                       this->cur_size_);
       if (ACE_BIT_DISABLED (this->flags_,
@@ -213,21 +213,6 @@ ACE_Message_Block::size (size_t length)
   return 0;
 }
 
-size_t
-ACE_Message_Block::total_size (void) const
-{
-  ACE_TRACE ("ACE_Message_Block::total_size");
-
-  size_t s = 0;
-
-  for (ACE_Message_Block *temp = ACE_const_cast (ACE_Message_Block *, this);
-       temp != 0;
-       temp = temp->cont ())
-    s += temp->size ();
-
-  return s;
-}
-
 ACE_Data_Block::ACE_Data_Block (void)
   : type_ (ACE_Message_Block::MB_DATA),
     cur_size_ (0),
@@ -283,7 +268,6 @@ ACE_Data_Block::ACE_Data_Block (size_t size,
 ACE_Message_Block::ACE_Message_Block (const char *data,
                                       size_t size,
                                       u_long priority)
-  : data_block_ (0)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
 
@@ -298,14 +282,12 @@ ACE_Message_Block::ACE_Message_Block (const char *data,
                     ACE_Time_Value::zero,     // execution time
                     ACE_Time_Value::max_time, // absolute time of deadline
                     0,  // data block
-                    0,  // data_block allocator
-                    0) == -1) // message_block allocator
-    ACE_ERROR ((LM_ERROR,
+                    0) == -1) // data_block allocator
+    ACE_ERROR ((LM_ERROR, 
                 ASYS_TEXT ("ACE_Message_Block")));
 }
 
-ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator)
-  : data_block_ (0)
+ACE_Message_Block::ACE_Message_Block (void)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
 
@@ -320,8 +302,7 @@ ACE_Message_Block::ACE_Message_Block (ACE_Allocator *message_block_allocator)
                     ACE_Time_Value::zero,     // execution time
                     ACE_Time_Value::max_time, // absolute time of deadline
                     0, // data block
-                    0, // data_block allocator
-                    message_block_allocator) == -1) // message_block allocator
+                    0) == -1) // data_block allocator
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("ACE_Message_Block")));
 }
@@ -335,9 +316,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                                       u_long priority,
                                       const ACE_Time_Value & execution_time,
                                       const ACE_Time_Value & deadline_time,
-                                      ACE_Allocator *data_block_allocator,
-                                      ACE_Allocator *message_block_allocator)
-  : data_block_ (0)
+                                      ACE_Allocator *data_block_allocator)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
 
@@ -352,8 +331,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                     execution_time,
                     deadline_time,
                     0, // data block
-                    data_block_allocator,
-                    message_block_allocator) == -1)
+                    data_block_allocator) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("ACE_Message_Block")));
 }
@@ -368,8 +346,7 @@ ACE_Message_Block::init (size_t size,
                          u_long priority,
                          const ACE_Time_Value & execution_time,
                          const ACE_Time_Value & deadline_time,
-                         ACE_Allocator *data_block_allocator,
-                         ACE_Allocator *message_block_allocator)
+                         ACE_Allocator *data_block_allocator)
 {
   ACE_TRACE ("ACE_Message_Block::init");
 
@@ -384,8 +361,7 @@ ACE_Message_Block::init (size_t size,
                        execution_time,
                        deadline_time,
                        0,  // data block
-                       data_block_allocator,
-                       message_block_allocator);
+                       data_block_allocator);
 }
 
 int
@@ -406,8 +382,7 @@ ACE_Message_Block::init (const char *data,
                        ACE_Time_Value::zero,     // execution time
                        ACE_Time_Value::max_time, // absolute time of deadline
                        0,  // data block
-                       0,  // data_block allocator
-                       0); // message_block allocator
+                       0);
 }
 
 ACE_Message_Block::ACE_Message_Block (size_t size,
@@ -421,9 +396,7 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                                       const ACE_Time_Value & execution_time,
                                       const ACE_Time_Value & deadline_time,
                                       ACE_Data_Block *db,
-                                      ACE_Allocator *data_block_allocator,
-                                      ACE_Allocator *message_block_allocator)
-  : data_block_ (0)
+                                      ACE_Allocator *data_block_allocator)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
 
@@ -438,15 +411,12 @@ ACE_Message_Block::ACE_Message_Block (size_t size,
                     execution_time,
                     deadline_time,
                     db,
-                    data_block_allocator,
-                    message_block_allocator) == -1)
+                    data_block_allocator) == -1)
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("ACE_Message_Block")));
 }
 
-ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block,
-                                      ACE_Allocator *message_block_allocator)
-  : data_block_ (0)
+ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block)
 {
   ACE_TRACE ("ACE_Message_Block::ACE_Message_Block");
 
@@ -460,9 +430,8 @@ ACE_Message_Block::ACE_Message_Block (ACE_Data_Block *data_block,
                     0,         // priority
                     ACE_Time_Value::zero,     // execution time
                     ACE_Time_Value::max_time, // absolute time of deadline
-                    data_block, // data block
-                    data_block->data_block_allocator (),
-                    message_block_allocator) == -1)
+                    data_block,
+                    data_block->data_block_allocator ()) == -1) // data block
     ACE_ERROR ((LM_ERROR,
                 ASYS_TEXT ("ACE_Message_Block")));
 }
@@ -479,8 +448,7 @@ ACE_Message_Block::init_i (size_t size,
                            const ACE_Time_Value & execution_time,
                            const ACE_Time_Value & deadline_time,
                            ACE_Data_Block *db,
-                           ACE_Allocator *data_block_allocator,
-                           ACE_Allocator *message_block_allocator)
+                           ACE_Allocator *data_block_allocator)
 {
   ACE_TRACE ("ACE_Message_Block::init_i");
   ACE_FUNCTION_TIMEPROBE (ACE_MESSAGE_BLOCK_INIT_I_ENTER);
@@ -493,14 +461,7 @@ ACE_Message_Block::init_i (size_t size,
   this->cont_ = msg_cont;
   this->next_ = 0;
   this->prev_ = 0;
-
-  this->message_block_allocator_ = message_block_allocator;
-
-  if (this->data_block_ != 0)
-    {
-      this->data_block_->release ();
-      this->data_block_ = 0;
-    }
+  this->data_block_ = 0;
 
   if (db == 0)
     {
@@ -712,13 +673,8 @@ ACE_Message_Block::release_i (ACE_Lock *lock)
     }
 
   // We will now commit suicide: this object *must* have come from the
-  // allocator given.
-  if (this->message_block_allocator_ == 0)
-    delete this;
-  else
-    ACE_DES_FREE (this,
-                  message_block_allocator_->free,
-                  ACE_Message_Block);
+  // heap.
+  delete this;
 
   return result;
 }
@@ -774,50 +730,24 @@ ACE_Message_Block::duplicate (void) const
   // Create a new <ACE_Message_Block> that contains unique copies of
   // the message block fields, but a reference counted duplicate of
   // the <ACE_Data_Block>.
-
-  // If there is no allocator, use the standard new and delete calls.
-  if (this->message_block_allocator_ == 0)
-    ACE_NEW_RETURN (nb,
-                    ACE_Message_Block (0, // size
-                                       ACE_Message_Type (0), // type
-                                       0, // cont
-                                       0, // data
-                                       0, // allocator
-                                       0, // locking strategy
-                                       0, // flags
-                                       this->priority_, // priority
-                                       this->execution_time_, // execution time
-                                       this->deadline_time_, // absolute time to deadline
-                                       // Get a pointer to a
-                                       // "duplicated" <ACE_Data_Block>
-                                       // (will simply increment the
-                                       // reference count).
-                                       this->data_block ()->duplicate  (),
-                                       this->data_block ()->data_block_allocator (),
-                                       this->message_block_allocator_),
+  ACE_NEW_RETURN (nb,
+                  ACE_Message_Block (0, // size
+                                     ACE_Message_Type (0), // type
+                                     0, // cont
+                                     0, // data
+                                     0, // allocator
+                                     0, // locking strategy
+                                     0, // flags
+                                     this->priority_, // priority
+                                     this->execution_time_, // execution time
+                                     this->deadline_time_, // absolute time to deadline
+                                     // Get a pointer to a
+                                     // "duplicated" <ACE_Data_Block>
+                                     // (will simply increment the
+                                     // reference count).
+                                     this->data_block ()->duplicate  (),
+                                     this->data_block ()->data_block_allocator ()),
                   0);
-  else // Otherwise, use the message_block_allocator passed in.
-    ACE_NEW_MALLOC_RETURN (nb,
-                           ACE_reinterpret_cast(ACE_Message_Block*,
-                                                message_block_allocator_->malloc (sizeof (ACE_Message_Block))),
-                           ACE_Message_Block (0, // size
-                                              ACE_Message_Type (0), // type
-                                              0, // cont
-                                              0, // data
-                                              0, // allocator
-                                              0, // locking strategy
-                                              0, // flags
-                                              this->priority_, // priority
-                                              this->execution_time_, // execution time
-                                              this->deadline_time_, // absolute time to deadline
-                                              // Get a pointer to a
-                                              // "duplicated" <ACE_Data_Block>
-                                              // (will simply increment the
-                                              // reference count).
-                                              this->data_block ()->duplicate  (),
-                                              this->data_block ()->data_block_allocator (),
-                                              this->message_block_allocator_),
-                           0);
 
   // Set the read and write pointers in the new <Message_Block> to the
   // same relative offset as in the existing <Message_Block>.  Note
@@ -899,52 +829,19 @@ ACE_Message_Block::clone (Message_Flags mask) const
   if (db == 0)
     return 0;
 
-  ACE_Message_Block *nb;
-
-  if(message_block_allocator_ == 0)
-    {
-      nb = new ACE_Message_Block (0, // size
-                                  ACE_Message_Type (0), // type
-                                  0, // cont
-                                  0, // data
-                                  0, // allocator
-                                  0, // locking strategy
-                                  0, // flags
-                                  this->priority_, // priority
-                                  this->execution_time_, // execution time
-                                  this->deadline_time_, // absolute time to deadline
-                                // Get a pointer to a
-                                // "duplicated" <ACE_Data_Block>
-                                // (will simply increment the
-                                // reference count).
-                                db,
-                                db->data_block_allocator (),
-                                this->message_block_allocator_);
-    }
-  else
-    {
-      // This is the ACE_NEW_MALLOC macro with the return check removed.
-      // We need to do it this way because if it fails we need to release
-      // the cloned data block that was created above.  If we used
-      // ACE_NEW_MALLOC_RETURN, there would be a memory leak because the
-      // above db pointer would be left dangling.
-      nb = ACE_static_cast(ACE_Message_Block*,message_block_allocator_->malloc (sizeof (ACE_Message_Block)));
-      if(nb != 0)
-        new (nb) ACE_Message_Block (0, // size
-                                    ACE_Message_Type (0), // type
-                                    0, // cont
-                                    0, // data
-                                    0, // allocator
-                                    0, // locking strategy
-                                    0, // flags
-                                    this->priority_, // priority
-                                    this->execution_time_, // execution time
-                                    this->deadline_time_, // absolute time to deadline
-                                    db,
-                                    db->data_block_allocator(),
-                                    this->message_block_allocator_);
-    }
-
+  ACE_Message_Block *nb =
+    new ACE_Message_Block (0, // size
+                           ACE_Message_Type (0), // type
+                           0, // cont
+                           0, // data
+                           0, // allocator
+                           0, // locking strategy
+                           0, // flags
+                           this->priority_, // priority
+                           this->execution_time_, // execution time
+                           this->deadline_time_, // absolute time to deadline
+                           db,  // data_block
+                           db->data_block_allocator ());
   if (nb == 0)
     {
       db->release ();
diff --git a/ace/Message_Block.h b/ace/Message_Block.h
index 3826646765c..6bc76e67d3e 100644
--- a/ace/Message_Block.h
+++ b/ace/Message_Block.h
@@ -100,11 +100,10 @@ public:
   };
 
   // = Initialization and termination.
-  ACE_Message_Block (ACE_Allocator *message_block_allocator = 0);
+  ACE_Message_Block (void);
   // Create an empty message.
 
-  ACE_Message_Block (ACE_Data_Block *,
-                     ACE_Allocator *message_block_allocator = 0);
+  ACE_Message_Block (ACE_Data_Block *);
   // Create an <ACE_Message_Block> that owns the <ACE_Data_Block> *.
 
   ACE_Message_Block (const char *data,
@@ -124,8 +123,7 @@ public:
                      u_long priority = 0,
                      const ACE_Time_Value & execution_time = ACE_Time_Value::zero,
                      const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time,
-                     ACE_Allocator *data_block_allocator = 0,
-                     ACE_Allocator *message_block_allocator = 0);
+                     ACE_Allocator *data_block_allocator = 0);
   // Create an initialized message of type <type> containing <size>
   // bytes.  The <cont> argument initializes the continuation field in
   // the <Message_Block>.  If <data> == 0 then we create and own the
@@ -139,13 +137,6 @@ public:
   // The <data_block_allocator> is use to allocate the data blocks
   // while the <allocator_strategy> is used to allocate the buffers
   // contained by those.
-  // The <message_block_allocator> is used to allocate new
-  // <Message_Block> objects when a duplicate method is called.  If
-  // a <message_block_allocator> is given, this <Message_Block> and
-  // future <Message_Block> objects created by duplicate will be free'ed
-  // into this allocator when they are released.  Note: if you use this
-  // allocator, the <Message_Block> you created should have been created
-  // using this allocator because it will be released to the same allocator.
 
   int init (const char *data,
             size_t size = 0);
@@ -163,8 +154,7 @@ public:
             u_long priority = 0,
             const ACE_Time_Value & execution_time = ACE_Time_Value::zero,
             const ACE_Time_Value & deadline_time = ACE_Time_Value::max_time,
-            ACE_Allocator *data_block_allocator = 0,
-            ACE_Allocator *message_block_allocator = 0);
+            ACE_Allocator *data_block_allocator = 0);
   // Create an initialized message of type <type> containing <size>
   // bytes.  The <cont> argument initializes the continuation field in
   // the <Message_Block>.  If <data> == 0 then we create and own the
@@ -181,9 +171,6 @@ public:
 
   virtual ~ACE_Message_Block (void);
   // Delete all the resources held in the message.
-  //
-  // Note that release() is designed to release the continuation
-  // chain; the destructor is not. See release() for details.
 
   // = Message Type accessors and mutators.
 
@@ -250,24 +237,6 @@ public:
   // ACE_Data_Block's reference count goes to 0, it is deleted.
   // In all cases, this ACE_Message_Block is deleted - it must have come
   // from the heap, or there will be trouble.
-  //
-  // release() is designed to release the continuation chain; the
-  // destructor is not.  If we make the destructor release the
-  // continuation chain by calling release() or delete on the message
-  // blocks in the continuation chain, the following code will not
-  // work since the message block in the continuation chain is not off
-  // the heap:
-  //
-  //  ACE_Message_Block mb1 (1024);
-  //  ACE_Message_Block mb2 (1024);
-  //
-  //  mb1.cont (&mb2);
-  //
-  // And hence, call release() on a dynamically allocated message
-  // block. This will release all the message blocks in the
-  // continuation chain.  If you call delete or let the message block
-  // fall off the stack, cleanup of the message blocks in the
-  // continuation chain becomes the responsibility of the user.
 
   static ACE_Message_Block *release (ACE_Message_Block *mb);
   // This behaves like the non-static method <release>, except that it
@@ -323,23 +292,17 @@ public:
   void length (size_t n);
   // Set the length of the message
 
-  // = Set/get <Message_Block> size info.
-  size_t total_size (void) const;
-  // Get the total number of bytes in all <Message_Block>s, including
-  // chained <Message_Block>s.
-
+  // = Message size is the total amount of space alloted.
   size_t size (void) const;
-  // Get the number of bytes in the top-level <Message_Block> (i.e.,
-  // does not consider the bytes in chained <Message_Block>s).
-
+  // Get the total amount of space in the message.
   int size (size_t length);
-  // Set the number of bytes in the top-level <Message_Block>,
-  // reallocating space if necessary.  However, the <rd_ptr_> and
-  // <wr_ptr_> remain at the original offsets into the buffer, even if
-  // it is reallocated.  Returns 0 if successful, else -1.
+  // Set the total amount of space in the message, reallocating space
+  // if necessary.  However, the <rd_ptr_> and <wr_ptr_> remain at the
+  // original offsets into the buffer, even if it is reallocated.
+  // Returns 0 if successful, else -1.
 
   size_t space (void) const;
-  // Get the number of bytes in the top-level <Message_Block>.
+  // Get the amount of space remaining in the message.
 
   void crunch (void);
   // Normalizes data in message block to align with the base.
@@ -374,16 +337,13 @@ public:
   ACE_Lock *locking_strategy (ACE_Lock *);
   // Set a new locking strategy and return the hold one.
 
-  int reference_count (void) const;
-  // Get the current reference count.
-
   void dump (void) const;
   // Dump the state of an object.
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-protected:
+private:
   // = Internal initialization methods.
   ACE_Message_Block (size_t size,
                      ACE_Message_Type type,
@@ -396,8 +356,7 @@ protected:
                      const ACE_Time_Value & execution_time,
                      const ACE_Time_Value & deadline_time,
                      ACE_Data_Block *db,
-                     ACE_Allocator *data_block_allocator,
-                     ACE_Allocator *message_block_allocator);
+                     ACE_Allocator *data_block_allocator);
   // Perform the actual initialization.
 
   int release_i (ACE_Lock *lock);
@@ -415,8 +374,7 @@ protected:
               const ACE_Time_Value & execution_time,
               const ACE_Time_Value & deadline_time,
               ACE_Data_Block *db,
-              ACE_Allocator *data_block_allocator,
-              ACE_Allocator *message_block_allocator);
+              ACE_Allocator *data_block_allocator);
   // Perform the actual initialization.
 
   size_t rd_ptr_;
@@ -448,11 +406,6 @@ protected:
   // Pointer to the reference counted data structure that contains the
   // actual memory buffer.
 
-  ACE_Allocator *message_block_allocator_;
-  // The allocator used to destroy ourselves when release is called
-  // and create new message blocks on duplicate.
-
-private:
   // = Disallow these operations for now (use <clone> instead).
   ACE_Message_Block &operator= (const ACE_Message_Block &);
   ACE_Message_Block (const ACE_Message_Block &);
@@ -557,7 +510,7 @@ public:
   ACE_Allocator *data_block_allocator (void) const;
   // Get the allocator used to create this object
 
-protected:
+private:
   ACE_Data_Block *release_i (void);
   // Internal release implementation
 
@@ -606,7 +559,6 @@ protected:
   ACE_Allocator *data_block_allocator_;
   // The allocator use to destroy ourselves.
 
-private:
   // = Disallow these operations.
   ACE_Data_Block &operator= (const ACE_Data_Block &);
   ACE_Data_Block (const ACE_Data_Block &);
diff --git a/ace/Message_Block.i b/ace/Message_Block.i
index c8d175f8f27..31f63a9a641 100644
--- a/ace/Message_Block.i
+++ b/ace/Message_Block.i
@@ -10,20 +10,6 @@ ACE_Message_Block::data_block (void) const
   return this->data_block_;
 }
 
-// This function must comes before ACE_Message_Block::reference_count
-// to avoid a g++ warning.
-ACE_INLINE int
-ACE_Data_Block::reference_count (void) const
-{
-  return reference_count_;
-}
-
-ACE_INLINE int
-ACE_Message_Block::reference_count (void) const
-{
-  return data_block () ? data_block ()->reference_count () : 0;
-}
-
 ACE_INLINE char *
 ACE_Data_Block::base (void) const
 {
@@ -119,6 +105,13 @@ ACE_Message_Block::size (void) const
   return this->data_block ()->size ();
 }
 
+ACE_INLINE size_t
+ACE_Message_Block::space (void) const
+{
+  ACE_TRACE ("ACE_Message_Block::space");
+  return this->size () - this->length ();
+}
+
 ACE_INLINE ACE_Message_Block::ACE_Message_Type
 ACE_Data_Block::msg_type (void) const
 {
@@ -185,7 +178,7 @@ ACE_Message_Block::msg_priority (u_long pri)
   this->priority_ = pri;
 }
 
-ACE_INLINE const ACE_Time_Value &
+ACE_INLINE const ACE_Time_Value & 
 ACE_Message_Block::msg_execution_time (void) const
 {
   ACE_TRACE ("ACE_Message_Block::msg_execution_time (void)");
@@ -193,21 +186,21 @@ ACE_Message_Block::msg_execution_time (void) const
 }
 
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Message_Block::msg_execution_time (const ACE_Time_Value & et)
 {
   ACE_TRACE ("ACE_Message_Block::msg_execution_time (const ACE_Time_Value & et)");
   this->execution_time_ = et;
 }
 
-ACE_INLINE const ACE_Time_Value &
+ACE_INLINE const ACE_Time_Value & 
 ACE_Message_Block::msg_deadline_time (void) const
 {
   ACE_TRACE ("ACE_Message_Block::msg_deadline_time (void)");
   return this->deadline_time_;
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Message_Block::msg_deadline_time (const ACE_Time_Value & dt)
 {
   ACE_TRACE ("ACE_Message_Block::msg_deadline_time (const ACE_Time_Value & et)");
@@ -291,13 +284,6 @@ ACE_Message_Block::wr_ptr (size_t n)
   this->wr_ptr_ += n;
 }
 
-ACE_INLINE size_t
-ACE_Message_Block::space (void) const
-{
-  ACE_TRACE ("ACE_Message_Block::space");
-  return this->end () - this->wr_ptr ();
-}
-
 ACE_INLINE void
 ACE_Message_Block::cont (ACE_Message_Block *cont_msg)
 {
@@ -364,6 +350,12 @@ ACE_Data_Block::locking_strategy (ACE_Lock *nls)
   return ols;
 }
 
+ACE_INLINE int
+ACE_Data_Block::reference_count (void) const
+{
+  return reference_count_;
+}
+
 ACE_INLINE ACE_Lock *
 ACE_Message_Block::locking_strategy (void)
 {
@@ -385,46 +377,46 @@ ACE_Message_Block::locking_strategy (ACE_Lock *nls)
 // class ACE_Dynamic_Message_Strategy //
 ////////////////////////////////////////
 
-ACE_INLINE u_long
+ACE_INLINE u_long 
 ACE_Dynamic_Message_Strategy::static_bit_field_mask (void)
 {
   return static_bit_field_mask_;
 }
   // get static bit field mask
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Dynamic_Message_Strategy::static_bit_field_mask (u_long ul)
 {
   static_bit_field_mask_ = ul;
 }
   // set static bit field mask
 
-ACE_INLINE u_long
+ACE_INLINE u_long 
 ACE_Dynamic_Message_Strategy::static_bit_field_shift (void)
 {
   return static_bit_field_shift_;
 }
   // get left shift value to make room for static bit field
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Dynamic_Message_Strategy::static_bit_field_shift (u_long ul)
 {
   static_bit_field_shift_ = ul;
 }
   // set left shift value to make room for static bit field
 
-ACE_INLINE u_long
+ACE_INLINE u_long 
 ACE_Dynamic_Message_Strategy::dynamic_priority_max (void)
 {
   return dynamic_priority_max_;
 }
   // get maximum supported priority value
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Dynamic_Message_Strategy::dynamic_priority_max (u_long ul)
 {
   // pending_shift_ depends on dynamic_priority_max_: for performance
-  // reasons, the value in pending_shift_ is (re)calculated only when
+  // reasons, the value in pending_shift_ is (re)calculated only when 
   // dynamic_priority_max_ is initialized or changes, and is stored
   // as a class member rather than being a derived value.
   dynamic_priority_max_ = ul;
@@ -432,24 +424,24 @@ ACE_Dynamic_Message_Strategy::dynamic_priority_max (u_long ul)
 }
   // set maximum supported priority value
 
-ACE_INLINE u_long
+ACE_INLINE u_long 
 ACE_Dynamic_Message_Strategy::dynamic_priority_offset (void)
 {
   return dynamic_priority_offset_;
 }
   // get offset for boundary between signed range and unsigned range
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Dynamic_Message_Strategy::dynamic_priority_offset (u_long ul)
 {
 
 
-  // max_late_ and min_pending_ depend on dynamic_priority_offset_: for
+  // max_late_ and min_pending_ depend on dynamic_priority_offset_: for 
   // performance reasons, the values in max_late_ and min_pending_ are
   // (re)calculated only when dynamic_priority_offset_ is initialized
   // or changes, and are stored as a class member rather than being
   // derived each time one of their values is needed.
-  dynamic_priority_offset_ = ul;
+  dynamic_priority_offset_ = ul;  
   max_late_ = ACE_Time_Value (0, ul - 1);
   min_pending_ = ACE_Time_Value (0, ul);
 }
@@ -464,9 +456,9 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
   Priority_Status status = ACE_Dynamic_Message_Strategy::PENDING;
 
   // start with the passed absolute time as the message's priority, then
-  // call the polymorphic hook method to (at least partially) convert
+  // call the polymorphic hook method to (at least partially) convert 
   // the absolute time and message attributes into the message's priority
-  ACE_Time_Value priority (tv);
+  ACE_Time_Value priority (tv);  
   convert_priority (priority, mb);
 
   // if the priority is negative, the message is pending
@@ -481,14 +473,14 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
     }
   }
   // otherwise, if the priority is greater than the maximum late
-  // priority value that can be represented, it is beyond late
+  // priority value that can be represented, it is beyond late 
   else if (priority > max_late_)
   {
     // all messages that are beyond late are assigned lowest priority (zero)
     mb.msg_priority (0);
     return ACE_Dynamic_Message_Strategy::BEYOND_LATE;
-  }
-  // otherwise, the message is late, but its priority is correct
+  }  
+  // otherwise, the message is late, but its priority is correct  
   else
   {
     status = ACE_Dynamic_Message_Strategy::LATE;
@@ -496,7 +488,7 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
 
   // use (fast) bitwise operators to isolate and replace
   // the dynamic portion of the message's priority
-  mb.msg_priority((mb.msg_priority() & static_bit_field_mask_) |
+  mb.msg_priority((mb.msg_priority() & static_bit_field_mask_) | 
                   ((priority.usec () + ACE_ONE_SECOND_IN_USECS * priority.sec ()) <<
                    static_bit_field_shift_));
 
@@ -510,7 +502,7 @@ ACE_Dynamic_Message_Strategy::priority_status (ACE_Message_Block & mb,
 // class ACE_Deadline_Message_Strategy //
 /////////////////////////////////////////
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Deadline_Message_Strategy::convert_priority (ACE_Time_Value & priority,
                                                  const ACE_Message_Block & mb)
 {
@@ -525,8 +517,8 @@ ACE_Deadline_Message_Strategy::convert_priority (ACE_Time_Value & priority,
 // class ACE_Laxity_Message_Strategy //
 ///////////////////////////////////////
 
-ACE_INLINE void
-ACE_Laxity_Message_Strategy::convert_priority (ACE_Time_Value & priority,
+ACE_INLINE void 
+ACE_Laxity_Message_Strategy::convert_priority (ACE_Time_Value & priority, 
                                                const ACE_Message_Block & mb)
 {
   // Convert absolute time passed in tv to negative
diff --git a/ace/Message_Block_T.h b/ace/Message_Block_T.h
index d5a019f92ce..330b391da47 100644
--- a/ace/Message_Block_T.h
+++ b/ace/Message_Block_T.h
@@ -61,7 +61,7 @@ private:
   // The lock
 
   // = Disallow these operations.
-  ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block<ACE_LOCK> &operator= (const ACE_Locked_Data_Block<ACE_LOCK> &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block &operator= (const ACE_Locked_Data_Block<ACE_LOCK> &))
   ACE_UNIMPLEMENTED_FUNC (ACE_Locked_Data_Block (const ACE_Locked_Data_Block<ACE_LOCK> &))
 };
 
diff --git a/ace/Message_Block_T.i b/ace/Message_Block_T.i
index 279dcaa704d..fa4f1aba34c 100644
--- a/ace/Message_Block_T.i
+++ b/ace/Message_Block_T.i
@@ -7,7 +7,6 @@
 template<class ACE_LOCK> ACE_INLINE
 ACE_Locked_Data_Block<ACE_LOCK>::ACE_Locked_Data_Block (void)
 {
-  this->locking_strategy_ = &this->lock_;
 }
 
 template<class ACE_LOCK> ACE_INLINE
diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h
index 01328a6655b..2d084b1c918 100644
--- a/ace/Message_Queue.h
+++ b/ace/Message_Queue.h
@@ -58,7 +58,7 @@ public:
   virtual int close (void) = 0;
   // Close down the message queue and release all resources.
 
-  virtual ~ACE_Message_Queue_Base (void);
+  virtual ~ACE_Message_Queue_Base (void) = 0;
   // Close down the message queue and release all resources.
 
   // = Enqueue and dequeue methods.
@@ -146,7 +146,7 @@ class ACE_Message_Queue_Vx : public ACE_Message_Queue<ACE_NULL_SYNCH>
   //     MsgQ.  It does not use any synchronization, because it relies
   //     on the native MsgQ implementation to take care of that.  The
   //     only system calls that it uses are VxWorks msgQLib calls, so
-  //     it is suitable for use in interrupt service routines.
+  //     it is suitable for use in iterrupt service routines.
   //
   //     NOTE: *Many* ACE_Message_Queue features are not supported with
   //     this specialization, including:
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index f1255f597a6..fa4bd8951d2 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -24,6 +24,11 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue)
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Dynamic_Message_Queue)
 
+
+//////////////////////////////////////
+// class ACE_Message_Queue_Iterator //
+//////////////////////////////////////
+
 template <ACE_SYNCH_DECL>
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Iterator (ACE_Message_Queue <ACE_SYNCH_USE> &q)
   : queue_ (q),
@@ -34,7 +39,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Iterator (ACE_Messa
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry)
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_ != 0)
     {
@@ -48,7 +53,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry)
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::done (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   return this->curr_ == 0;
 }
@@ -56,7 +61,7 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::done (void) const
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::advance (void)
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_)
     this->curr_ = this->curr_->next ();
@@ -70,6 +75,11 @@ ACE_Message_Queue_Iterator<ACE_SYNCH_USE>::dump (void) const
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue_Iterator)
 
+
+//////////////////////////////////////////////
+// class ACE_Message_Queue_Reverse_Iterator //
+//////////////////////////////////////////////
+
 template <ACE_SYNCH_DECL>
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Reverse_Iterator (ACE_Message_Queue <ACE_SYNCH_USE> &q)
   : queue_ (q),
@@ -80,7 +90,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::ACE_Message_Queue_Reverse_Ite
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&entry)
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_ != 0)
     {
@@ -94,7 +104,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::next (ACE_Message_Block *&ent
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::done (void) const
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   return this->curr_ == 0;
 }
@@ -102,7 +112,7 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::done (void) const
 template <ACE_SYNCH_DECL> int
 ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::advance (void)
 {
-  ACE_READ_GUARD_RETURN (ACE_SYNCH_MUTEX_T, m, this->queue_.lock_, -1)
+  ACE_Read_Guard<ACE_SYNCH_MUTEX_T> m (this->queue_.lock_);
 
   if (this->curr_)
     this->curr_ = this->curr_->prev ();
@@ -114,6 +124,11 @@ ACE_Message_Queue_Reverse_Iterator<ACE_SYNCH_USE>::dump (void) const
 {
 }
 
+
+/////////////////////////////
+// class ACE_Message_Queue //
+/////////////////////////////
+
 template <ACE_SYNCH_DECL> void
 ACE_Message_Queue<ACE_SYNCH_USE>::dump (void) const
 {
@@ -236,9 +251,15 @@ ACE_Message_Queue<ACE_SYNCH_USE>::close (void)
     {
       this->cur_count_--;
 
-      this->cur_bytes_ -= this->head_->total_size ();
+      ACE_Message_Block *temp;
+
+      // Decrement all the counts.
+      for (temp = this->head_;
+           temp != 0;
+           temp = temp->cont ())
+        this->cur_bytes_ -= temp->size ();
 
-      ACE_Message_Block *temp = this->head_;
+      temp = this->head_;
       this->head_ = this->head_->next ();
 
       // Make sure to use <release> rather than <delete> since this is
@@ -310,8 +331,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail_i (ACE_Message_Block *new_item)
       this->tail_ = new_item;
     }
 
-  // Make sure to count all the bytes in a composite message!!!
-  this->cur_bytes_ += new_item->total_size ();
+  // Make sure to count *all* the bytes in a composite message!!!
+
+  for (ACE_Message_Block *temp = new_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ += temp->size ();
 
   this->cur_count_++;
 
@@ -341,8 +366,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head_i (ACE_Message_Block *new_item)
 
   this->head_ = new_item;
 
-  // Make sure to count all the bytes in a composite message!!!
-  this->cur_bytes_ += new_item->total_size ();
+  // Make sure to count *all* the bytes in a composite message!!!
+
+  for (ACE_Message_Block *temp = new_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ += temp->size ();
 
   this->cur_count_++;
 
@@ -406,8 +435,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item)
         }
     }
 
-  // Make sure to count all the bytes in a composite message!!!
-  this->cur_bytes_ += new_item->total_size ();
+  // Make sure to count *all* the bytes in a composite message!!!
+
+  for (ACE_Message_Block *temp = new_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ += temp->size ();
 
   this->cur_count_++;
 
@@ -425,9 +458,10 @@ template <ACE_SYNCH_DECL> int
 ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item)
 {
   if (this->head_ ==0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("Attempting to dequeue from empty queue")),
-                      -1);
+  {
+    ACE_ERROR_RETURN((LM_ERROR, ASYS_TEXT ("Attempting to dequeue from empty queue")), -1);
+  }
+
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i");
   first_item = this->head_;
   this->head_ = this->head_->next ();
@@ -439,8 +473,12 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item
     // NULL...
     this->head_->prev (0);
 
-  // Subtract off all of the bytes associated with this message.
-  this->cur_bytes_ -= first_item->total_size ();
+  // Make sure to subtract off all of the bytes associated with this
+  // message.
+  for (ACE_Message_Block *temp = first_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ -= temp->size ();
 
   this->cur_count_--;
 
@@ -736,9 +774,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::~ACE_Dynamic_Message_Queue (void)
 // 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)
+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;
 
@@ -753,121 +792,130 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_messages (ACE_Message_Block *&l
   // refresh priority status boundaries in the queue
   result = this->refresh_queue (current_time);
   if (result < 0)
+  {
     return result;
+  }
 
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING) 
-      && this->pending_head_
-      && this->pending_tail_)
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::PENDING) &&
+      (this->pending_head_) && (this->pending_tail_))
+  {
+    // patch up pointers for the new tail of the queue
+    if (this->pending_head_->prev ())
     {
-      // patch up pointers for the new tail of the queue
-      if (this->pending_head_->prev ())
-        {
-          this->tail_ = this->pending_head_->prev ();
-          this->pending_head_->prev ()->next (0);
-        }
-      else
-        {
-          // the list has become empty
-          this->head_ = 0;
-          this->tail_ = 0;
-        }
-
-      // point to the head and tail of the list
-      list_head = this->pending_head_;
-      list_tail = this->pending_tail_;
-
-      // cut the pending messages out of the queue entirely
-      this->pending_head_->prev (0);
-      this->pending_head_ = 0;
-      this->pending_tail_ = 0;
+      this->tail_ = this->pending_head_->prev ();
+      this->pending_head_->prev ()->next (0);
     }
-
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE) 
-      && this->late_head_
-      && this->late_tail_)
+    else
     {
-      // Patch up pointers for the (possibly) new head and tail of the
-      // queue.
-      if (this->late_tail_->next ())
-        this->late_tail_->next ()->prev (this->late_head_->prev ());
-      else
-        this->tail_ = this->late_head_->prev ();
-
-      if (this->late_head_->prev ())
-        this->late_head_->prev ()->next (this->late_tail_->next ());
-      else
-        this->head_ = this->late_tail_->next ();
-
-      // put late messages behind pending messages (if any) being returned
-      this->late_head_->prev (list_tail);
-      if (list_tail)
-        list_tail->next (this->late_head_);
-      else
-        list_head = this->late_head_;
-
-      list_tail = this->late_tail_;
-
-      this->late_tail_->next (0);
-      this->late_head_ = 0;
-      this->late_tail_ = 0;
+      // the list has become empty
+      this->head_ = 0;
+      this->tail_ = 0;
     }
 
-  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE) 
-      && this->beyond_late_head_
-      && this->beyond_late_tail_)
+    // point to the head and tail of the list
+    list_head = this->pending_head_;
+    list_tail = this->pending_tail_;
+
+    // cut the pending messages out of the queue entirely
+    this->pending_head_->prev (0);
+    this->pending_head_ = 0;
+    this->pending_tail_ = 0;
+  }
+
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::LATE) &&
+      (this->late_head_) && (this->late_tail_))
+  {
+    // patch up pointers for the (possibly) new head and tail of the queue
+    if (this->late_tail_->next ())
     {
-      // Patch up pointers for the new tail of the queue
-      if (this->beyond_late_tail_->next ())
-        {
-          this->head_ = this->beyond_late_tail_->next ();
-          this->beyond_late_tail_->next ()->prev (0);
-        }
-      else
-        {
-          // the list has become empty
-          this->head_ = 0;
-          this->tail_ = 0;
-        }
-
-      // Put beyond late messages at the end of the list being
-      // returned.
-      if (list_tail)
-        {
-          this->beyond_late_head_->prev (list_tail);
-          list_tail->next (this->beyond_late_head_);
-        }
-      else
-        list_head = this->beyond_late_head_;
+      this->late_tail_->next ()->prev (this->late_head_->prev ());
+    }
+    else
+    {
+      this->tail_ = this->late_head_->prev ();
+    }
+    if (this->late_head_->prev ())
+    {
+      this->late_head_->prev ()->next (this->late_tail_->next ());
+    }
+    else
+    {
+      this->head_ = this->late_tail_->next ();
+    }
 
-      list_tail = this->beyond_late_tail_;
+    // put late messages behind pending messages (if any) being returned
+    this->late_head_->prev (list_tail);
+    if (list_tail)
+    {
+      list_tail->next (this->late_head_);
+    }
+    else
+    {
+      list_head = this->late_head_;
+    }
+    list_tail = this->late_tail_;
+
+    this->late_tail_->next (0);
+    this->late_head_ = 0;
+    this->late_tail_ = 0;
+  }
+
+  if ((status_flags & (u_int) ACE_Dynamic_Message_Strategy::BEYOND_LATE) &&
+      (this->beyond_late_head_) && (this->beyond_late_tail_))
+  {
+    // patch up pointers for the new tail of the queue
+    if (this->beyond_late_tail_->next ())
+    {
+      this->head_ = this->beyond_late_tail_->next ();
+      this->beyond_late_tail_->next ()->prev (0);
+    }
+    else
+    {
+      // the list has become empty
+      this->head_ = 0;
+      this->tail_ = 0;
+    }
 
-      this->beyond_late_tail_->next (0);
-      this->beyond_late_head_ = 0;
-      this->beyond_late_tail_ = 0;
+    // put beyond late messages at the end of the list being returned
+    if (list_tail)
+    {
+      this->beyond_late_head_->prev (list_tail);
+      list_tail->next (this->beyond_late_head_);
+    }
+    else
+    {
+      list_head = this->beyond_late_head_;
     }
+    list_tail = this->beyond_late_tail_;
 
-  // Decrement message and size counts for removed messages.
-  ACE_Message_Block *temp1;
+    this->beyond_late_tail_->next (0);
+    this->beyond_late_head_ = 0;
+    this->beyond_late_tail_ = 0;
+  }
 
-  for (temp1 = list_head;
-       temp1 != 0;
-       temp1 = temp1->next ())
-    {
-      this->cur_count_--;
+  // decrement message and size counts for removed messages
+  ACE_Message_Block *temp1, *temp2;
+  for (temp1 = list_head; temp1 != 0; temp1 = temp1->next ())
+  {
+    this->cur_count_--;
 
-      this->cur_bytes_ -= temp1->total_size ();
+    for (temp2 = temp1; temp2 != 0; temp2 = temp2->cont ())
+    {
+      this->cur_bytes_ -= temp2->size ();
     }
+  }
 
   return result;
 }
+  // Detach all messages with status given in the passed flags from
+  // the queue and return them by setting passed head and tail pointers
+  // to the linked list they comprise.  This method is intended primarily
+  // as a means of periodically harvesting messages that have missed
+  // their deadlines, but is available in its most general form.  All
+  // messages are returned in priority order, from head to tail, as of
+  // the time this method was called.
+
 
-// Detach all messages with status given in the passed flags from the
-// queue and return them by setting passed head and tail pointers to
-// the linked list they comprise.  This method is intended primarily
-// as a means of periodically harvesting messages that have missed
-// their deadlines, but is available in its most general form.  All
-// messages are returned in priority order, from head to tail, as of
-// the time this method was called.
 
 template <ACE_SYNCH_DECL> int
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&first_item,
@@ -891,23 +939,26 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&firs
   // refresh priority status boundaries in the queue
   result = this->refresh_queue (current_time);
   if (result < 0)
+  {
     return result;
+  }
 
   // *now* it's appropriate to wait for an enqueued item
   result = this->wait_not_empty_cond (ace_mon, timeout);
   if (result == -1)
+  {
     return result;
+  }
 
-  // call the internal dequeue method, which selects an item from the
-  // highest priority status portion of the queue that has messages
-  // enqueued.
-  result = this->dequeue_head_i (first_item);
+  // call the internal dequeue method, which selects an
+  // item from the highest priority status portion of
+  // the queue that has messages enqueued.
+  result = dequeue_head_i (first_item);
 
   return result;
 }
-
-// Dequeue and return the <ACE_Message_Block *> at the (logical) head
-// of the queue.
+  // Dequeue and return the <ACE_Message_Block *>
+  // at the (logical) head of the queue.
 
 template <ACE_SYNCH_DECL> void
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dump (void) const
@@ -945,121 +996,130 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item
   ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i");
 
   if (new_item == 0)
+  {
     return -1;
+  }
 
   int result = 0;
 
-  // Get the current time.
+  // get the current time
   ACE_Time_Value current_time = ACE_OS::gettimeofday ();
 
-  // Refresh priority status boundaries in the queue.
-
+  // refresh priority status boundaries in the queue
   result = this->refresh_queue (current_time);
   if (result < 0)
+  {
     return result;
+  }
 
-  // Where we enqueue depends on the message's priority status.
-  switch (message_strategy_.priority_status (*new_item,
-                                             current_time))
-    {
+  // where we enqueue depends on the message's priority status
+  switch (message_strategy_.priority_status (*new_item, current_time))
+  {
     case ACE_Dynamic_Message_Strategy::PENDING:
       if (this->pending_tail_ == 0)
-        {
-          // Check for simple case of an empty pending queue, where
-          // all we need to do is insert <new_item> into the tail of
-          // the queue.
-          pending_head_ = new_item;
-          pending_tail_ = pending_head_;
-          return this->enqueue_tail_i (new_item);
-        }
+      {
+        // Check for simple case of an empty pending queue, where all we need to
+        // do is insert <new_item> into the tail of the queue.
+        pending_head_ = new_item;
+        pending_tail_ = pending_head_;
+        return this->enqueue_tail_i (new_item);
+      }
       else
-        {
-          // Enqueue the new message in priority order in the pending
-          // sublist
-          result = sublist_enqueue_i (new_item,
-                                      current_time,
-                                      this->pending_head_,
-                                      this->pending_tail_,
-                                      ACE_Dynamic_Message_Strategy::PENDING);
-        }
+      {
+        // enqueue the new message in priority order in the pending sublist
+        result = sublist_enqueue_i (new_item,
+                                    current_time,
+                                    this->pending_head_,
+                                    this->pending_tail_,
+                                    ACE_Dynamic_Message_Strategy::PENDING);
+      }
+
       break;
 
     case ACE_Dynamic_Message_Strategy::LATE:
       if (this->late_tail_ == 0)
+      {
+        late_head_ = new_item;
+        late_tail_ = late_head_;
+
+        if (this->pending_head_ == 0)
         {
-          late_head_ = new_item;
-          late_tail_ = late_head_;
-
-          if (this->pending_head_ == 0)
-            // Check for simple case of an empty pending queue,
-            // where all we need to do is insert <new_item> into the
-            // tail of the queue.
-            return this->enqueue_tail_i (new_item);
-          else if (this->beyond_late_tail_ == 0)
-            // Check for simple case of an empty beyond late queue, where all
-            // we need to do is insert <new_item> into the head of the queue.
-            return this->enqueue_head_i (new_item);
-          else
-            {
-              // Otherwise, we can just splice the new message in
-              // between the pending and beyond late portions of the
-              // queue.
-              this->beyond_late_tail_->next (new_item);
-              new_item->prev (this->beyond_late_tail_);
-              this->pending_head_->prev (new_item);
-              new_item->next (this->pending_head_);
-            }
+          // Check for simple case of an empty pending queue, where all
+          // we need to do is insert <new_item> into the tail of the queue.
+          return this->enqueue_tail_i (new_item);
         }
-      else
+        else if (this->beyond_late_tail_ == 0)
+        {
+          // Check for simple case of an empty beyond late queue, where all
+          // we need to do is insert <new_item> into the head of the queue.
+          return this->enqueue_head_i (new_item);
+        }
+        else
         {
-          // Enqueue the new message in priority order in the late
-          // sublist
-          result = sublist_enqueue_i (new_item,
-                                      current_time,
-                                      this->late_head_,
-                                      this->late_tail_,
-                                      ACE_Dynamic_Message_Strategy::LATE);
+          // otherwise, we can just splice the new message in between
+          // the pending and beyond late portions of the queue
+          this->beyond_late_tail_->next (new_item);
+          new_item->prev (this->beyond_late_tail_);
+          this->pending_head_->prev (new_item);
+          new_item->next (this->pending_head_);
         }
+      }
+      else
+      {
+        // enqueue the new message in priority order in the late sublist
+        result = sublist_enqueue_i (new_item,
+                                    current_time,
+                                    this->late_head_,
+                                    this->late_tail_,
+                                    ACE_Dynamic_Message_Strategy::LATE);
+      }
       break;
 
     case ACE_Dynamic_Message_Strategy::BEYOND_LATE:
       if (this->beyond_late_tail_ == 0)
+      {
+        // Check for simple case of an empty beyond late queue, where all
+        // we need to do is insert <new_item> into the head of the queue.
+        beyond_late_head_ = new_item;
+        beyond_late_tail_ = beyond_late_head_;
+        return this->enqueue_head_i (new_item);
+      }
+      else
+      {
+        // all beyond late messages have the same (zero) priority, so
+        // just put the new one at the end of the beyond late messages
+        if (this->beyond_late_tail_->next ())
         {
-          // Check for simple case of an empty beyond late queue,
-          // where all we need to do is insert <new_item> into the
-          // head of the queue.
-          beyond_late_head_ = new_item;
-          beyond_late_tail_ = beyond_late_head_;
-          return this->enqueue_head_i (new_item);
+          this->beyond_late_tail_->next ()->prev (new_item);
         }
-      else
+        else
         {
-          // all beyond late messages have the same (zero) priority,
-          // so just put the new one at the end of the beyond late
-          // messages
-          if (this->beyond_late_tail_->next ())
-            this->beyond_late_tail_->next ()->prev (new_item);
-          else
-            this->tail_ = new_item;
-
-          new_item->next (this->beyond_late_tail_->next ());
-          this->beyond_late_tail_->next (new_item);
-          new_item->prev (this->beyond_late_tail_);
-          this->beyond_late_tail_ = new_item;
+          this->tail_ = new_item;
         }
 
+        new_item->next (this->beyond_late_tail_->next ());
+        this->beyond_late_tail_->next (new_item);
+        new_item->prev (this->beyond_late_tail_);
+        this->beyond_late_tail_ = new_item;
+      }
+
       break;
 
-      // should never get here, but just in case...
+    // should never get here, but just in case...
     default:
       result = -1;
       break;
-    }
+  }
 
   if (result < 0)
+  {
     return result;
+  }
 
-  this->cur_bytes_ += new_item->total_size ();
+  for (ACE_Message_Block *temp = new_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ += temp->size ();
 
   this->cur_count_++;
 
@@ -1068,12 +1128,12 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item
   else
     return this->cur_count_;
 }
+  // Enqueue an <ACE_Message_Block *> in accordance with its priority.
+  // priority may be *dynamic* or *static* or a combination or *both*
+  // It calls the priority evaluation function passed into the Dynamic
+  // Message Queue constructor to update the priorities of all enqueued
+  // messages.
 
-// Enqueue an <ACE_Message_Block *> in accordance with its priority.
-// priority may be *dynamic* or *static* or a combination or *both* It
-// calls the priority evaluation function passed into the Dynamic
-// Message Queue constructor to update the priorities of all enqueued
-// messages.
 
 template <ACE_SYNCH_DECL> int
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::sublist_enqueue_i (ACE_Message_Block *new_item,
@@ -1085,64 +1145,72 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::sublist_enqueue_i (ACE_Message_Block *
   int result = 0;
   ACE_Message_Block *current_item = 0;
 
-  // Find message after which to enqueue new item, based on message
-  // priority and priority status.
+  // find message after which to enqueue new item,
+  // based on message priority and priority status
   for (current_item = sublist_tail;
        current_item;
        current_item = current_item->prev ())
+  {
+    if (message_strategy_.priority_status (*current_item, current_time) == status)
     {
-      if (message_strategy_.priority_status (*current_item, current_time) == status)
-        {
-          if (current_item->msg_priority () >= new_item->msg_priority ())
-            break;
-        }
-      else
-        {
-          sublist_head = new_item;
-          break;
-        }
+      if (current_item->msg_priority () >= new_item->msg_priority ())
+      {
+        break;
+      }
     }
+    else
+    {
+      sublist_head = new_item;
+      break;
+    }
+  }
 
   if (current_item == 0)
+  {
+    // if the new message has highest priority of any,
+    // put it at the head of the list (and sublist)
+    new_item->prev (0);
+    new_item->next (this->head_);
+    if (this->head_ != 0)
     {
-      // If the new message has highest priority of any, put it at the
-      // head of the list (and sublist).
-      new_item->prev (0);
-      new_item->next (this->head_);
-      if (this->head_ != 0)
-        this->head_->prev (new_item);
-      else
-        {
-          this->tail_ = new_item;
-          sublist_tail = new_item;
-        }
-      this->head_ = new_item;
-      sublist_head = new_item;
+      this->head_->prev (new_item);
+    }
+    else
+    {
+      this->tail_ = new_item;
+      sublist_tail = new_item;
     }
+    this->head_ = new_item;
+    sublist_head = new_item;
+  }
   else
+  {
+    // insert the new item into the list
+    new_item->next (current_item->next ());
+    new_item->prev (current_item);
+    if (current_item->next ())
     {
-      // insert the new item into the list
-      new_item->next (current_item->next ());
-      new_item->prev (current_item);
-
-      if (current_item->next ())
-        current_item->next ()->prev (new_item);
-      else
-        this->tail_ = new_item;
+      current_item->next ()->prev (new_item);
+    }
+    else
+    {
+      this->tail_ = new_item;
+    }
 
-      current_item->next (new_item);
+    current_item->next (new_item);
 
-      // If the new item has lowest priority of any in the sublist,
-      // move the tail pointer of the sublist back to the new item
-      if (current_item == sublist_tail)
-        sublist_tail = new_item;
+    // if the new item has lowest priority of any in the sublist,
+    // move the tail pointer of the sublist back to the new item
+    if (current_item == sublist_tail)
+    {
+      sublist_tail = new_item;
     }
+  }
 
   return result;
 }
+  // enqueue a message in priority order within a given priority status sublist
 
-// Enqueue a message in priority order within a given priority status
-// sublist.
 
 template <ACE_SYNCH_DECL> int
 ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&first_item)
@@ -1177,8 +1245,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&fi
       first_item->prev (0);
       first_item->next (0);
     }
-
-  // Second, try to dequeue from the head of the late list
+  // second, try to dequeue from the head of the late list
   else if (this->late_head_)
     {
       last_in_subqueue = this->late_head_ == this->late_tail_ ? 1 : 0;
@@ -1245,7 +1312,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head_i (ACE_Message_Block *&fi
 
   // Make sure to subtract off all of the bytes associated with this
   // message.
-  this->cur_bytes_ -= first_item->total_size ();
+  for (ACE_Message_Block *temp = first_item;
+       temp != 0;
+       temp = temp->cont ())
+    this->cur_bytes_ -= temp->size ();
 
   this->cur_count_--;
 
@@ -1288,8 +1358,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_
   // refresh priority status boundaries in the queue
   if (this->pending_head_)
     {
-      current_status = message_strategy_.priority_status (*this->pending_head_,
-                                                          current_time);
+      current_status = message_strategy_.priority_status (*this->pending_head_, current_time);
       switch (current_status)
         {
         case ACE_Dynamic_Message_Strategy::BEYOND_LATE:
@@ -1397,6 +1466,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_pending_queue (const ACE_Time_
                            -1);
         }
     }
+
   return 0;
 }
 
@@ -1489,11 +1559,11 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::refresh_late_queue (const ACE_Time_Val
 // function.
 
 template <ACE_SYNCH_DECL> int
-ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_item,
-                                                             ACE_Time_Value *timeout)
+ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (
+  ACE_Message_Block *&first_item,
+  ACE_Time_Value *timeout)
 {
-  return ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (first_item,
-                                                              timeout);
+  return ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (first_item, timeout);
 }
 
 // Private method to hide public base class method: just calls base
@@ -1525,6 +1595,10 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_i
 // where it was placed after the queue is refreshed prior to the next
 // enqueue or dequeue operation.
 
+/////////////////////////////////////
+// class ACE_Message_Queue_Factory //
+/////////////////////////////////////
+
 template <ACE_SYNCH_DECL>
 ACE_Message_Queue<ACE_SYNCH_USE> *
 ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_static_message_queue (size_t hwm,
@@ -1632,4 +1706,7 @@ ACE_Message_Queue_Factory<ACE_SYNCH_USE>::create_NT_message_queue (size_t max_th
 
 #endif /* ACE_WIN32 && ACE_HAS_WINNT4 != 0 */
 #endif /* defined (VXWORKS) */
+
+
+
 #endif /* ACE_MESSAGE_QUEUE_T_C */
diff --git a/ace/Message_Queue_T.i b/ace/Message_Queue_T.i
index c0517a71f47..b5b40a48d07 100644
--- a/ace/Message_Queue_T.i
+++ b/ace/Message_Queue_T.i
@@ -6,7 +6,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue (ACE_Message_Block *&first_item,
                                            ACE_Time_Value *timeout)
 {
   ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::notification_strategy");
-  return this->dequeue_head (first_item, timeout);
+  return this->dequeue (first_item, timeout);
 }
 
 template <ACE_SYNCH_DECL> ACE_INLINE ACE_Notification_Strategy *
diff --git a/ace/NT_Service.cpp b/ace/NT_Service.cpp
index 09e77617cc1..79ccb86873a 100644
--- a/ace/NT_Service.cpp
+++ b/ace/NT_Service.cpp
@@ -83,19 +83,24 @@ ACE_NT_Service::handle_control (DWORD control_code)
   switch(control_code) {
   case SERVICE_CONTROL_SHUTDOWN:
   case SERVICE_CONTROL_STOP:
-    stop_requested(control_code);
+    report_status(SERVICE_STOP_PENDING);
+    /* how to cancel? */
     break;
 
   case SERVICE_CONTROL_PAUSE:
-    pause_requested(control_code);
+    report_status(SERVICE_PAUSE_PENDING);
+    this->suspend();
+    report_status(SERVICE_PAUSED);
     break;
 
   case SERVICE_CONTROL_CONTINUE:
-    continue_requested(control_code);
+    report_status(SERVICE_CONTINUE_PENDING);
+    this->resume();
+    report_status(SERVICE_RUNNING);
     break;
 
   case SERVICE_CONTROL_INTERROGATE:
-    interrogate_requested(control_code);
+    report_status(0);
     break;
   }
 
@@ -105,39 +110,6 @@ ACE_NT_Service::handle_control (DWORD control_code)
 
 
 void
-ACE_NT_Service::stop_requested (DWORD)
-{
-  this->report_status (SERVICE_STOP_PENDING);
-  /* how to cancel? */
-}
-
-
-void
-ACE_NT_Service::pause_requested (DWORD)
-{
-  this->report_status (SERVICE_PAUSE_PENDING);
-  this->suspend ();
-  report_status (SERVICE_PAUSED);
-}
-
-
-void
-ACE_NT_Service::continue_requested (DWORD)
-{
-  this->report_status (SERVICE_CONTINUE_PENDING);
-  this->resume ();
-  report_status (SERVICE_RUNNING);
-}
-
-
-void
-ACE_NT_Service::interrogate_requested (DWORD)
-{
-  this->report_status (0);
-}
-
-
-void
 ACE_NT_Service::name (LPCTSTR name, LPCTSTR desc)
 {
 
@@ -173,7 +145,7 @@ TCHAR this_exe[MAXPATHLEN];
       if (GetModuleFileName(0, this_exe, sizeof(this_exe)) == 0)
         return -1;
       exe_path = this_exe;
-    }
+    }	
 
   SC_HANDLE sc_mgr = OpenSCManager(0, 0, SC_MANAGER_ALL_ACCESS);
   if (sc_mgr == 0)
@@ -355,69 +327,21 @@ DWORD
 ACE_NT_Service::state (ACE_Time_Value *wait_hint)
 {
 
-DWORD curr_state;
-
-  if (this->state (&curr_state, wait_hint) == -1)
-    return 0;
-  return curr_state;
-
-}
-
-
-int
-ACE_NT_Service::state (DWORD *pstate, ACE_Time_Value *wait_hint)
-{
-
   SC_HANDLE svc = this->svc_sc_handle();
   if (svc == 0)
-    return -1;
-
-  if (QueryServiceStatus (svc, &this->svc_status_) == 0)
-    return -1;
+    return 0;
 
+  QueryServiceStatus (svc, &this->svc_status_);
   if (wait_hint != 0)
     {
       wait_hint->msec(this->svc_status_.dwWaitHint);
     }
 
-  *pstate = this->svc_status_.dwCurrentState;
-
-  return 0;
-
-}
-
-
-
-// test_access
-//
-// Open a new handle, ignoring any handle open in svc_sc_handle_.  This
-// function's results are returned without leaving the handle open.
-int
-ACE_NT_Service::test_access (DWORD desired_access)
-{
-
-  int status = -1;     // Guilty until proven innocent
-
-  SC_HANDLE sc_mgr = OpenSCManager(0, 0, GENERIC_READ);
-  if (sc_mgr != 0)
-    {
-      SC_HANDLE handle = OpenService(sc_mgr,
-                                     this->name(),
-                                     desired_access);
-      CloseServiceHandle(sc_mgr);
-      if (handle != 0)
-        {
-          status = 0;
-          CloseServiceHandle (handle);
-        }
-    }
-
-  return status;
+  return this->svc_status_.dwCurrentState;
 
 }
 
 
-
 // report_status
 //
 // Reports the current status.  If new_status is not 0, it sets the 
diff --git a/ace/NT_Service.h b/ace/NT_Service.h
index c266454568e..10de349958e 100644
--- a/ace/NT_Service.h
+++ b/ace/NT_Service.h
@@ -231,23 +231,9 @@ public:
   DWORD state (ACE_Time_Value *wait_hint = 0);
   // Get the current state for the service.  If <wait_hint> is not 0, it
   // receives the service's reported wait hint.
-  // Note that this function returns 0 on failure (not -1 as is usual in ACE).
-  // A zero return would (probably) only be returned if there is either no
-  // service with the given name in the SCM database, or the caller does not
-  // have sufficient rights to access the service state.  The set of valid
-  // service state values are all greater than 0.
-
-  int state (DWORD *pstate, ACE_Time_Value *wait_hint = 0);
-  // A version of state() which returns -1 for failure, 0 for success.
-  // The DWORD pointed to by pstate receives the state value.
-
-  int test_access (DWORD desired_access = SERVICE_ALL_ACCESS);
-  // Test access to the object's service in the SCM.  The service must already
-  // have been inserted in the SCM database.  This function has no affect on
-  // the service itself.  Returns 0 if the specified access is allowed, -1
-  // otherwise (either the access is denied, or there is a problem with the
-  // service's definition - check ACE_OS::last_error to get the specific
-  // error indication.
+  // Note that this function doesn't return anything that's guaranteed
+  // noticeable on a failure.  It'll return 0 on failure, but that may not
+  // be guaranteed to avoid conflict with any other value now or in the future.
 
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
@@ -270,18 +256,6 @@ protected:
   // ACE_Time_Value::zero is passed - it checks the state once but doesn't
   // wait after that.
 
-  virtual void stop_requested (DWORD control_code);
-  // Called by handle_control () when a stop/shutdown was requested.
-
-  virtual void pause_requested (DWORD control_code);
-  // Called by handle_control () when a pause was requested.
-
-  virtual void continue_requested (DWORD control_code);
-  // Called by handle_control () when a continue was requested.
-
-  virtual void interrogate_requested (DWORD control_code);
-  // Called by handle_control () when a interrogate was requested.
-
 protected:
   DWORD                  start_time_;   // Estimate of init time needed
   SERVICE_STATUS_HANDLE  svc_handle_;   // Service handle - doesn't need close.
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp
index d52d3bc31cd..b6c4f4c05e1 100644
--- a/ace/Name_Proxy.cpp
+++ b/ace/Name_Proxy.cpp
@@ -37,6 +37,8 @@ ACE_Name_Proxy::open (const ACE_INET_Addr &remote_addr,
 
   if (options[ACE_Synch_Options::USE_TIMEOUT])
     timeout = ACE_const_cast (ACE_Time_Value *, options.time_value ());
+  else
+    timeout = ACE_const_cast (ACE_Time_Value *, &ACE_Time_Value::zero);
 
   // Initiate the connection.
   return this->connector_.connect (this->peer_,
diff --git a/ace/Naming_Context.cpp b/ace/Naming_Context.cpp
index b165a601ac9..d0ff74ee5c5 100644
--- a/ace/Naming_Context.cpp
+++ b/ace/Naming_Context.cpp
@@ -585,11 +585,11 @@ ACE_Name_Options::parse_args (int argc, char *argv[])
       {
       case 'c':
         {
-          if (ACE_OS::strcmp (get_opt.optarg, "PROC_LOCAL") == 0)
+          if (ACE_OS::strcmp (get_opt.optarg, "PROC_LOCAL"))
             this->context (ACE_Naming_Context::PROC_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.optarg, "NODE_LOCAL") == 0)
+          else if (ACE_OS::strcmp (get_opt.optarg, "NODE_LOCAL"))
             this->context (ACE_Naming_Context::NODE_LOCAL);
-          else if (ACE_OS::strcmp (get_opt.optarg, "NET_LOCAL") == 0)
+          else if (ACE_OS::strcmp (get_opt.optarg, "NET_LOCAL"))
             this->context (ACE_Naming_Context::NET_LOCAL);
         }
         break;
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 425bcad3dbf..99327afd9f5 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -2,17 +2,30 @@
 
 #define ACE_BUILD_DLL
 #include "ace/OS.h"
+#include "ace/SString.h"
 #include "ace/Sched_Params.h"
 
+#if defined (ACE_WIN32)
+# include "ace/ARGV.h"
+#endif /* ACE_WIN32 */
+
 // Perhaps we should *always* include ace/OS.i in order to make sure
 // we can always link against the OS symbols?
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS.i"
 #endif /* ACE_HAS_INLINED_OS_CALLS */
 
+#include "ace/Task.h"
+#include "ace/Synch_T.h"
+#include "ace/Containers.h"
+
+#include "ace/streams.h"
+
 ACE_RCSID(ace, OS, "$Id$")
 
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+# include "ace/Object_Manager.h"
+
 # if defined (ACE_HAS_WINCE)
 const wchar_t *ACE_OS::day_of_week_name[] = {ACE_TEXT ("Sun"), ACE_TEXT ("Mon"),
                                              ACE_TEXT ("Tue"), ACE_TEXT ("Wed"),
@@ -28,192 +41,31 @@ const wchar_t *ACE_OS::month_name[] = {ACE_TEXT ("Jan"), ACE_TEXT ("Feb"),
 static const ASYS_TCHAR *ACE_OS_CTIME_R_FMTSTR = ACE_TEXT ("%3s %3s %02d %02d:%02d:%02d %04d\n");
 # endif /* ACE_HAS_WINCE */
 
-class ACE_OS_Thread_Mutex_Guard
-{
-  // = TITLE
-  //     This data structure is meant to be used within an ACE_OS
-  //     function.  It performs automatic aquisition and release of
-  //     an ACE_thread_mutex_t.
-  //
-  // = DESCRIPTION
-  //     For internal use only by ACE_OS.
-public:
-  ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m);
-  // Implicitly and automatically acquire the lock.
-
-  ~ACE_OS_Thread_Mutex_Guard (void);
-  // Implicitly release the lock.
-
-  int acquire (void);
-  // Explicitly acquire the lock.
-
-  int release (void);
-  // Explicitly release the lock.
-
-protected:
-  ACE_thread_mutex_t &lock_;
-  // Reference to the mutex.
-
-  int owner_;
-  // Keeps track of whether we acquired the lock or failed.
-
-  // = Prevent assignment and initialization.
-  ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &);
-  ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &);
-};
-
-inline
-int
-ACE_OS_Thread_Mutex_Guard::acquire (void)
-{
-  return owner_ = ACE_OS::thread_mutex_lock (&lock_);
-}
-
-inline
-int
-ACE_OS_Thread_Mutex_Guard::release (void)
-{
-  if (owner_ == -1)
-    return 0;
-  else
-    {
-      owner_ = -1;
-      return ACE_OS::thread_mutex_unlock (&lock_);
-    }
-}
-
-inline
-ACE_OS_Thread_Mutex_Guard::ACE_OS_Thread_Mutex_Guard (ACE_thread_mutex_t &m)
-   : lock_ (m)
-{
-  acquire ();
-}
-
-ACE_OS_Thread_Mutex_Guard::~ACE_OS_Thread_Mutex_Guard ()
-{
-  release ();
-}
-
-class ACE_OS_Recursive_Thread_Mutex_Guard
-{
-  // = TITLE
-  //     This data structure is meant to be used within an ACE_OS
-  //     function.  It performs automatic aquisition and release of
-  //     an ACE_recursive_thread_mutex_t.
-  //
-  // = DESCRIPTION
-  //     For internal use only by ACE_OS.
-public:
-  ACE_OS_Recursive_Thread_Mutex_Guard (ACE_recursive_thread_mutex_t &m);
-  // Implicitly and automatically acquire the lock.
-
-  ~ACE_OS_Recursive_Thread_Mutex_Guard (void);
-  // Implicitly release the lock.
-
-  int acquire (void);
-  // Explicitly acquire the lock.
-
-  int release (void);
-  // Explicitly release the lock.
-
-protected:
-  ACE_recursive_thread_mutex_t &lock_;
-  // Reference to the mutex.
-
-  int owner_;
-  // Keeps track of whether we acquired the lock or failed.
-
-  // = Prevent assignment and initialization.
-  ACE_OS_Recursive_Thread_Mutex_Guard &operator= (
-    const ACE_OS_Recursive_Thread_Mutex_Guard &);
-  ACE_OS_Recursive_Thread_Mutex_Guard (
-    const ACE_OS_Recursive_Thread_Mutex_Guard &);
-};
-
-inline
-int
-ACE_OS_Recursive_Thread_Mutex_Guard::acquire (void)
-{
-  return owner_ = ACE_OS::recursive_mutex_lock (&lock_);
-}
-
-inline
-int
-ACE_OS_Recursive_Thread_Mutex_Guard::release (void)
-{
-  if (owner_ == -1)
-    return 0;
-  else
-    {
-      owner_ = -1;
-      return ACE_OS::recursive_mutex_unlock (&lock_);
-    }
-}
-
-inline
-ACE_OS_Recursive_Thread_Mutex_Guard::ACE_OS_Recursive_Thread_Mutex_Guard (
-  ACE_recursive_thread_mutex_t &m)
-   : lock_ (m)
-{
-  acquire ();
-}
-
-ACE_OS_Recursive_Thread_Mutex_Guard::~ACE_OS_Recursive_Thread_Mutex_Guard ()
-{
-  release ();
-}
-
-#define ACE_OS_GUARD \
-  ACE_OS_Thread_Mutex_Guard (*(ACE_thread_mutex_t *) \
-    ACE_OS_Object_Manager::preallocated_object[ \
-      ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]);
-
-#define ACE_TSS_CLEANUP_GUARD \
-  ACE_OS_Recursive_Thread_Mutex_Guard (*(ACE_recursive_thread_mutex_t *) \
-    ACE_OS_Object_Manager::preallocated_object[ \
-      ACE_OS_Object_Manager::ACE_TSS_CLEANUP_LOCK]);
-
-#define ACE_TSS_BASE_GUARD \
-  ACE_OS_Recursive_Thread_Mutex_Guard (*(ACE_recursive_thread_mutex_t *) \
-    ACE_OS_Object_Manager::preallocated_object[ \
-      ACE_OS_Object_Manager::ACE_TSS_BASE_LOCK]);
-
-
 # if defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS)
 int
 ACE_OS::netdb_acquire (void)
 {
-  return ACE_OS::thread_mutex_lock ((ACE_thread_mutex_t *)
-    ACE_OS_Object_Manager::preallocated_object[
-      ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]);
+  ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+  return ace_os_monitor_lock->acquire ();
 }
 
 int
 ACE_OS::netdb_release (void)
 {
-  return ACE_OS::thread_mutex_unlock ((ACE_thread_mutex_t *)
-    ACE_OS_Object_Manager::preallocated_object[
-      ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK]);
+  ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+  return ace_os_monitor_lock->release ();
 }
 # endif /* defined (ACE_LACKS_NETDB_REENTRANT_FUNCTIONS) */
-#else  /* ! ACE_MT_SAFE */
-# define ACE_OS_GUARD
-# define ACE_TSS_CLEANUP_GUARD
-# define ACE_TSS_BASE_GUARD
-#endif /* ! ACE_MT_SAFE */
-
-ACE_EXIT_HOOK ACE_OS::exit_hook_ = 0;
+#endif /* defined (ACE_MT_SAFE) */
 
 // Static constant representing `zero-time'.
-// Note: this object requires static construction.
 const ACE_Time_Value ACE_Time_Value::zero;
 
-// Constant for maximum time representable.  Note that this time
-// is not intended for use with select () or other calls that may
-// have *their own* implementation-specific maximum time representations.
-// Its primary use is in time computations such as those used by the
-// dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class.
-// Note: this object requires static construction.
+// Static constant representing `maximum-time'.
 const ACE_Time_Value ACE_Time_Value::max_time (LONG_MAX,
                                                ACE_ONE_SECOND_IN_USECS - 1);
 
@@ -254,7 +106,7 @@ void ACE_Time_Value::set (const FILETIME &file_time)
 
 ACE_Time_Value::operator FILETIME () const
 {
-  ACE_TRACE ("ACE_Time_Value::operator FILETIME");
+  // ACE_TRACE ("ACE_Time_Value::operator FILETIME");
   ULARGE_INTEGER _100ns;
   _100ns.QuadPart = (((DWORDLONG) this->tv_.tv_sec * (10000 * 1000) +
                       this->tv_.tv_usec * 10) +
@@ -301,7 +153,7 @@ ACE_Cleanup_Info::operator!= (const ACE_Cleanup_Info &o) const
 void
 ACE_Time_Value::dump (void) const
 {
-  ACE_TRACE ("ACE_Time_Value::dump");
+  // ACE_TRACE ("ACE_Time_Value::dump");
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntv_sec_ = %d"), this->tv_.tv_sec));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntv_usec_ = %d\n"), this->tv_.tv_usec));
@@ -399,7 +251,7 @@ ACE_Countdown_Time::~ACE_Countdown_Time (void)
 void
 ACE_OS::readPPCTimeBase (u_long &most, u_long &least)
 {
-  ACE_TRACE ("ACE_OS::readPPCTimeBase");
+  // ACE_TRACE ("ACE_OS::readPPCTimeBase");
 
   // This function can't be inline because it depends on the arguments
   // being in particular registers (r3 and r4), in conformance with the
@@ -419,7 +271,7 @@ ACE_OS::readPPCTimeBase (u_long &most, u_long &least)
 void
 ACE_OS::readPPCTimeBase (u_long &most, u_long &least)
 {
-  ACE_TRACE ("ACE_OS::readPPCTimeBase");
+  // ACE_TRACE ("ACE_OS::readPPCTimeBase");
 
   // This function can't be inline because it defines a symbol,
   // aclock.  If there are multiple calls to the function in a
@@ -446,7 +298,7 @@ ACE_OS::readPPCTimeBase (u_long &most, u_long &least)
 int
 ACE_OS::uname (struct utsname *name)
 {
-  ACE_TRACE ("ACE_OS::uname");
+  // ACE_TRACE ("ACE_OS::uname");
 # if defined (ACE_WIN32)
   size_t maxnamelen = sizeof name->nodename;
   ACE_OS::strcpy (name->sysname, ACE_TEXT ("Win32"));
@@ -612,7 +464,7 @@ ACE_OS::uname (struct utsname *name)
 struct hostent *
 ACE_OS::gethostbyname (const char *name)
 {
-  ACE_TRACE ("ACE_OS::gethostbyname");
+  // ACE_TRACE ("ACE_OS::gethostbyname");
 
   // not thread safe!
   static hostent ret;
@@ -641,7 +493,7 @@ ACE_OS::gethostbyname (const char *name)
 struct hostent *
 ACE_OS::gethostbyaddr (const char *addr, int length, int type)
 {
-  ACE_TRACE ("ACE_OS::gethostbyaddr");
+  // ACE_TRACE ("ACE_OS::gethostbyaddr");
 
   if (length != 4 || type != AF_INET)
     {
@@ -680,7 +532,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
                          hostent *result, ACE_HOSTENT_DATA buffer,
                          int *h_errnop)
 {
-  ACE_TRACE ("ACE_OS::gethostbyaddr_r");
+  // ACE_TRACE ("ACE_OS::gethostbyaddr_r");
   if (length != 4 || type != AF_INET)
     {
       errno = EINVAL;
@@ -730,7 +582,7 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
                          ACE_HOSTENT_DATA buffer,
                          int *h_errnop)
 {
-  ACE_TRACE ("ACE_OS::gethostbyname_r");
+  // ACE_TRACE ("ACE_OS::gethostbyname_r");
 
   if (ACE_OS::netdb_acquire ())
     return 0;
@@ -777,7 +629,7 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
 void
 ACE_OS::ace_flock_t::dump (void) const
 {
-ACE_TRACE ("ACE_OS::ace_flock_t::dump");
+// ACE_TRACE ("ACE_OS::ace_flock_t::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("handle_ = %u"), this->handle_));
@@ -798,7 +650,7 @@ ACE_TRACE ("ACE_OS::ace_flock_t::dump");
 void
 ACE_OS::mutex_lock_cleanup (void *mutex)
 {
-ACE_TRACE ("ACE_OS::mutex_lock_cleanup");
+// ACE_TRACE ("ACE_OS::mutex_lock_cleanup");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   ACE_mutex_t *p_lock = (ACE_mutex_t *) mutex;
@@ -818,7 +670,7 @@ ACE_TRACE ("ACE_OS::mutex_lock_cleanup");
 FILE *
 ACE_OS::fopen (const char *filename, const char *mode)
 {
-  ACE_TRACE ("ACE_OS::fopen");
+  // ACE_TRACE ("ACE_OS::fopen");
   int hmode = _O_TEXT;
 
   for (const char *mode_ptr = mode; *mode_ptr != 0; mode_ptr++)
@@ -846,7 +698,7 @@ ACE_OS::fopen (const char *filename, const char *mode)
 FILE *
 ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
 {
-  ACE_TRACE ("ACE_OS::fopen");
+  // ACE_TRACE ("ACE_OS::fopen");
   int hmode = _O_TEXT;
 
   for (const wchar_t *mode_ptr = mode; *mode_ptr != 0; mode_ptr++)
@@ -878,7 +730,7 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
 int
 ACE_OS::fprintf (FILE *fp, const char *format, ...)
 {
-  ACE_TRACE ("ACE_OS::fprintf");
+  // ACE_TRACE ("ACE_OS::fprintf");
   int result = 0;
   va_list ap;
   va_start (ap, format);
@@ -890,7 +742,7 @@ ACE_OS::fprintf (FILE *fp, const char *format, ...)
 int
 ACE_OS::printf (const char *format, ...)
 {
-  ACE_TRACE ("ACE_OS::printf");
+  // ACE_TRACE ("ACE_OS::printf");
   int result;
   va_list ap;
   va_start (ap, format);
@@ -903,7 +755,6 @@ int
 ACE_OS::sprintf (char *buf, const char *format, ...)
 {
   // ACE_TRACE ("ACE_OS::sprintf");
-
   int result;
   va_list ap;
   va_start (ap, format);
@@ -915,7 +766,7 @@ ACE_OS::sprintf (char *buf, const char *format, ...)
 char *
 ACE_OS::gets (char *str, int n)
 {
-  ACE_TRACE ("ACE_OS::gets");
+  // ACE_TRACE ("ACE_OS::gets");
   int c;
   char *s = str;
 
@@ -942,7 +793,7 @@ ACE_OS::gets (char *str, int n)
   return (c == EOF) ? 0 : str;
 }
 
-#else  /* ACE_HAS_WINCE */
+#else
 int
 fprintf (FILE *fp, char *format, const char *msg)
 {
@@ -957,7 +808,7 @@ fprintf (FILE *fp, char *format, const char *msg)
 int
 ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 {
-  ACE_TRACE ("ACE_OS::fprintf");
+  // ACE_TRACE ("ACE_OS::fprintf");
 #   if defined (ACE_HAS_WINCE)
   ACE_NOTSUP_RETURN (-1);
 #   else
@@ -973,7 +824,7 @@ ACE_OS::fprintf (FILE *fp, const wchar_t *format, ...)
 int
 ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 {
-  ACE_TRACE ("ACE_OS::sprintf");
+  // ACE_TRACE ("ACE_OS::sprintf");
   int result;
   va_list ap;
   va_start (ap, format);
@@ -986,7 +837,7 @@ ACE_OS::sprintf (wchar_t *buf, const wchar_t *format, ...)
 int
 ACE_OS::sprintf (wchar_t *buf, const char *format, ...)
 {
-  ACE_TRACE ("ACE_OS::sprintf");
+  // ACE_TRACE ("ACE_OS::sprintf");
   const wchar_t *wide_format = ACE_WString (format).fast_rep ();
   int result;
   va_list ap;
@@ -1003,7 +854,7 @@ ACE_OS::sprintf (wchar_t *buf, const char *format, ...)
 wchar_t *
 ACE_OS::mktemp (wchar_t *s)
 {
-  ACE_TRACE ("ACE_OS::mktemp");
+  // ACE_TRACE ("ACE_OS::mktemp");
   if (s == 0)
     // check for null template string failed!
     return 0;
@@ -1024,14 +875,12 @@ ACE_OS::mktemp (wchar_t *s)
           // getting this filename back (so, yes, there is a race
           // condition if multiple threads in a process use the same
           // template).  This appears to match the behavior of the
-          // SunOS 5.5 mktemp().
-          ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%05d%c"),
-                           ACE_OS::getpid (), unique_letter);
+          // Solaris 2.5 mktemp().
+          ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%05d%c"), getpid (), unique_letter);
           while (ACE_OS::stat (s, &sb) >= 0)
             {
               if (++unique_letter <= L'z')
-                ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%05d%c"),
-                                 ACE_OS::getpid (), unique_letter);
+                ACE_OS::sprintf (xxxxxx, ACE_TEXT ("%05d%c"), getpid (), unique_letter);
               else
                 {
                   // maximum of 26 unique files per template, per process
@@ -1049,7 +898,7 @@ ACE_OS::mktemp (wchar_t *s)
 int
 ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...)
 {
-  ACE_TRACE ("ACE_OS::execl");
+  // ACE_TRACE ("ACE_OS::execl");
 #if defined (ACE_WIN32) || defined (VXWORKS)
   ACE_NOTSUP_RETURN (-1);
 #else
@@ -1062,7 +911,7 @@ ACE_OS::execl (const char * /* path */, const char * /* arg0 */, ...)
 int
 ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...)
 {
-  ACE_TRACE ("ACE_OS::execle");
+  // ACE_TRACE ("ACE_OS::execle");
 #if defined (ACE_WIN32) || defined (VXWORKS)
   ACE_NOTSUP_RETURN (-1);
 #else
@@ -1075,7 +924,7 @@ ACE_OS::execle (const char * /* path */, const char * /* arg0 */, ...)
 int
 ACE_OS::execlp (const char * /* file */, const char * /* arg0 */, ...)
 {
-  ACE_TRACE ("ACE_OS::execlp");
+  // ACE_TRACE ("ACE_OS::execlp");
 #if defined (ACE_WIN32) || defined (VXWORKS)
   ACE_NOTSUP_RETURN (-1);
 #else
@@ -1085,6 +934,11 @@ ACE_OS::execlp (const char * /* file */, const char * /* arg0 */, ...)
 #endif /* ACE_WIN32 */
 }
 
+#if defined (ACE_HAS_PRIOCNTL)
+# include /**/ <sys/rtpriocntl.h>
+# include /**/ <sys/tspriocntl.h>
+#endif /* ACE_HAS_PRIOCNTL */
+
 int
 ACE_OS::scheduling_class (const char *class_name, ACE_id_t &id)
 {
@@ -1141,7 +995,7 @@ ACE_OS::set_scheduling_params (const ACE_Sched_Params &sched_params,
 
   if (sched_params.policy () == ACE_SCHED_OTHER  &&
       sched_params.quantum () == ACE_Time_Value::zero)
-      // SunOS doesn't support non-zero quantums in time-sharing class:  use
+      // Solaris doesn't support non-zero quantums in time-sharing class:  use
       // real-time class instead.
     {
       tsparms_t tsparms;
@@ -1254,7 +1108,7 @@ int
 ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
                       ACE_id_t id)
 {
-  ACE_TRACE ("ACE_OS::sched_params");
+  // ACE_TRACE ("ACE_OS::sched_params");
 # if defined (CHORUS)
   ACE_UNUSED_ARG (id);
   int result;
@@ -1389,14 +1243,9 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
 // ACE_thread_t, ACE_hthread_t, and ACE_thread_key_t are implemented
 // as structures...  Under no circumstances should these be given
 // initial values.
-// Note: these three objects require static construction.
 ACE_thread_t ACE_OS::NULL_thread;
 ACE_hthread_t ACE_OS::NULL_hthread;
-#if defined (ACE_HAS_TSS_EMULATION)
-  ACE_thread_key_t ACE_OS::NULL_key = ACE_static_cast (ACE_thread_key_t, -1);
-#else  /* ! ACE_HAS_TSS_EMULATION */
-  ACE_thread_key_t ACE_OS::NULL_key;
-#endif /* ! ACE_HAS_TSS_EMULATION */
+ACE_thread_key_t ACE_OS::NULL_key;
 
 #if defined (CHORUS)
 KnCap ACE_OS::actorcaps_[ACE_CHORUS_MAX_ACTORS];
@@ -1421,19 +1270,19 @@ int ACE_OS::socket_initialized_;
 ACE_TSS_Ref::ACE_TSS_Ref (ACE_thread_t id)
   : tid_(id)
 {
-ACE_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
+// ACE_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
 }
 
 ACE_TSS_Ref::ACE_TSS_Ref (void)
 {
-ACE_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
+// ACE_TRACE ("ACE_TSS_Ref::ACE_TSS_Ref");
 }
 
 // Check for equality.
 int
 ACE_TSS_Ref::operator== (const ACE_TSS_Ref &info) const
 {
-ACE_TRACE ("ACE_TSS_Ref::operator==");
+// ACE_TRACE ("ACE_TSS_Ref::operator==");
 
   return this->tid_ == info.tid_;
 }
@@ -1443,7 +1292,7 @@ inline
 int
 ACE_TSS_Ref::operator!= (const ACE_TSS_Ref &tss_ref) const
 {
-ACE_TRACE ("ACE_TSS_Ref::operator==");
+// ACE_TRACE ("ACE_TSS_Ref::operator==");
 
   return !(*this == tss_ref);
 }
@@ -1460,16 +1309,12 @@ ACE_TSS_Info::ACE_TSS_Info (ACE_thread_key_t key,
     tss_obj_ (tss_inst),
     thread_count_ (-1)
 {
-ACE_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
+// ACE_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
 }
 
 ACE_TSS_Info::ACE_TSS_Info (void)
-  : key_ (ACE_OS::NULL_key),
-    destructor_ (0),
-    tss_obj_ (0),
-    thread_count_ (-1)
 {
-ACE_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
+// ACE_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
 }
 
 # if defined (ACE_HAS_NONSCALAR_THREAD_KEY_T)
@@ -1490,7 +1335,7 @@ ACE_TRACE ("ACE_TSS_Info::ACE_TSS_Info");
 int
 ACE_TSS_Info::operator== (const ACE_TSS_Info &info) const
 {
-ACE_TRACE ("ACE_TSS_Info::operator==");
+// ACE_TRACE ("ACE_TSS_Info::operator==");
 
   return this->key_ == info.key_;
 }
@@ -1499,7 +1344,7 @@ ACE_TRACE ("ACE_TSS_Info::operator==");
 int
 ACE_TSS_Info::operator!= (const ACE_TSS_Info &info) const
 {
-ACE_TRACE ("ACE_TSS_Info::operator==");
+// ACE_TRACE ("ACE_TSS_Info::operator==");
 
   return !(*this == info);
 }
@@ -1510,14 +1355,15 @@ ACE_TSS_Info::dump (void)
 //  ACE_TRACE ("ACE_TSS_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("key_ = %u\n"), this->key_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("destructor_ = %u\n"), this->destructor_));
-  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("tss_obj_ = %u\n"), this->tss_obj_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("key_ = %u"), this->key_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ndestructor_ = %u"), this->destructor_));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ntss_obj_ = %u"), this->tss_obj_));
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-// Moved class ACE_TSS_Keys declaration to OS.h so it can be visible
-// to the single file of template instantiations.
+// moved class ACE_TSS_Keys declaration
+// to OS.h so it can be visible to the
+// single file of template instantiations
 
 ACE_TSS_Keys::ACE_TSS_Keys (void)
 {
@@ -1557,7 +1403,6 @@ int
 ACE_TSS_Keys::test_and_clear (const ACE_thread_key_t key)
 {
   ACE_KEY_INDEX (key_index, key);
-
   u_int word, bit;
   find (key_index, word, bit);
 
@@ -1602,8 +1447,8 @@ public:
   void key_used (ACE_thread_key_t key);
   // Mark a key as being used by this thread.
 
-  int free_all_keys_left (void);
-  // Free all keys left in the table before destruction.
+  int free_all_key_left (void);
+  // Free all key left in the table before destruct myself.
 
   static int lockable () { return instance_ != 0; }
   // Indication of whether the ACE_TSS_CLEANUP_LOCK is usable, and
@@ -1618,23 +1463,14 @@ protected:
 
 private:
   // Array of <ACE_TSS_Info> objects.
-  typedef ACE_TSS_Info ACE_TSS_TABLE[ACE_DEFAULT_THREAD_KEYS];
-  typedef ACE_TSS_Info *ACE_TSS_TABLE_ITERATOR;
+  typedef ACE_Array<ACE_TSS_Info> ACE_TSS_TABLE;
+  typedef ACE_Array_Iterator<ACE_TSS_Info> ACE_TSS_TABLE_ITERATOR;
 
   ACE_TSS_TABLE table_;
   // Table of <ACE_TSS_Info>'s.
 
-  ACE_thread_key_t in_use_;
-  // Key for the thread-specific array of whether each TSS key is in use.
-
-  ACE_TSS_Keys *tss_keys ();
-  // Accessor for this threads ACE_TSS_Keys instance.
-
-#if defined (ACE_HAS_TSS_EMULATION)
-  ACE_thread_key_t in_use_key_;
-  // Key that is used by in_use_.  We save this key so that we know
-  // not to call its destructor in free_all_keys_left ().
-#endif /* ACE_HAS_TSS_EMULATION */
+  ACE_TSS<ACE_TSS_Keys> in_use_;
+  // Array, per thread (in TSS), of whether each TSS key is in use.
 
   // = Static data.
   static ACE_TSS_Cleanup *instance_;
@@ -1655,30 +1491,33 @@ ACE_TSS_Cleanup::~ACE_TSS_Cleanup (void)
 void
 ACE_TSS_Cleanup::exit (void * /* status */)
 {
-  ACE_TRACE ("ACE_TSS_Cleanup::exit");
+  // ACE_TRACE ("ACE_TSS_Cleanup::exit");
 
-  ACE_TSS_TABLE_ITERATOR key_info = table_;
+  ACE_TSS_Info *key_info = 0;
   ACE_TSS_Info info_arr[ACE_DEFAULT_THREAD_KEYS];
   int info_ix = 0;
 
   // While holding the lock, we only collect the ACE_TSS_Info objects
   // in an array without invoking the according destructors.
+
   {
-    ACE_TSS_CLEANUP_GUARD
+    ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+      ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+        (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+      ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *lock));
 
     // Iterate through all the thread-specific items and free them all
     // up.
 
-    for (unsigned int i = 0;
-         i < ACE_DEFAULT_THREAD_KEYS;
-         ++key_info, ++i)
+    for (ACE_TSS_TABLE_ITERATOR iter (this->table_);
+         iter.next (key_info) != 0;
+         iter.advance ())
       {
-        if (key_info->key_ == ACE_OS::NULL_key  ||
-            ! key_info->key_in_use ()) continue;
+        if (! key_info->key_in_use ()) continue;
 
         // If the key's ACE_TSS_Info in-use bit for this thread was set,
         // unset it and decrement the key's thread_count_.
-        if (! tss_keys ()->test_and_clear (key_info->key_))
+        if (! in_use_->test_and_clear (key_info->key_))
           {
             --key_info->thread_count_;
           }
@@ -1712,10 +1551,13 @@ ACE_TSS_Cleanup::exit (void * /* status */)
         }
     }
 
-  // Acquire the ACE_TSS_CLEANUP_LOCK, then free TLS keys and remove
+  // Acquiring ACE_TSS_Cleanup::lock_ to free TLS keys and remove
   // entries from ACE_TSS_Info table.
   {
-    ACE_TSS_CLEANUP_GUARD
+    ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+      ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+        (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+      ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *lock));
 
 # if 0
     // We shouldn't free the key and remove it from the table here
@@ -1743,77 +1585,53 @@ ACE_TSS_Cleanup::exit (void * /* status */)
 }
 
 int
-ACE_TSS_Cleanup::free_all_keys_left (void)
-  // This is called from ACE_OS::cleanup_tss ().  When this gets
-  // called, all threads should have exited except the main thread.
-  // No key should be freed from this routine.  It there's any,
-  // something might be wrong.
+ACE_TSS_Cleanup::free_all_key_left (void)
+  // This is call from ACE_OS::cleanup_tss
+  // When this gets called, all threads should
+  // have exited except the main thread.
+  // No key should be freed from this routine.
+  // It there's any, something might be wrong.
 {
   ACE_thread_key_t key_arr[ACE_DEFAULT_THREAD_KEYS];
-  ACE_TSS_TABLE_ITERATOR key_info = table_;
-  unsigned int idx = 0;
-  unsigned int i;
+  ACE_TSS_Info *key_info = 0;
+  int idx = 0;
 
-  for (i = 0;
-       i < ACE_DEFAULT_THREAD_KEYS;
-       ++key_info, ++i)
-#if defined (ACE_HAS_TSS_EMULATION)
-    if (key_info->key_ != in_use_key_)
-#endif /* ACE_HAS_TSS_EMULATION */
-      // Don't call ACE_OS::thr_keyfree () on ACE_TSS_Cleanup's own
-      // key.  See the comments in ACE_OS::thr_key_detach ():  the key
-      // doesn't get detached, so it will be in the table here.
-      // However, there's no resource associated with it, so we don't
-      // need to keyfree it.  The dynamic memory associated with it
-      // was already deleted by ACE_TSS_Cleanup::exit (), so we don't
-      // want to access it again.
-      key_arr [idx++] = key_info->key_;
-
-  for (i = 0; i < idx; i++)
+  for (ACE_TSS_TABLE_ITERATOR iter (this->table_);
+       iter.next (key_info) != 0;
+       iter.advance ())
+    key_arr [idx++] = key_info->key_;
+
+  for (int i = 0; i < idx; i++)
     if (key_arr[i] != ACE_OS::NULL_key)
-#if defined (ACE_HAS_TSS_EMULATION)
       ACE_OS::thr_keyfree (key_arr[i]);
-#else /* ACE_WIN32 */
-      // Don't call ACE_OS::thr_keyfree here.  It will try to use
-      // <in_use_> which has already been cleaned up here.
-      TlsFree (key_arr[i]);
-#endif /* ACE_HAS_TSS_EMULATION */
 
   return 0;
 }
 
-extern "C" void
-ACE_TSS_Cleanup_keys_destroyer (void *tss_keys)
-{
-  delete ACE_reinterpret_cast (ACE_TSS_Keys *, tss_keys);
-}
-
 ACE_TSS_Cleanup::ACE_TSS_Cleanup (void)
-  : table_ ()
-  , in_use_ (ACE_OS::NULL_key)
-#if defined (ACE_HAS_TSS_EMULATION)
-    // ACE_TSS_Emulation::total_keys () provides the value of the next
-    // key to be created.
-  , in_use_key_ (ACE_TSS_Emulation::total_keys ())
-#endif /* ACE_HAS_TSS_EMULATION */
+  : table_ (ACE_DEFAULT_THREAD_KEYS, ACE_TSS_Info (ACE_OS::NULL_key)),
+    in_use_ ()
 {
-  ACE_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup");
+// ACE_TRACE ("ACE_TSS_Cleanup::ACE_TSS_Cleanup");
 }
 
 ACE_TSS_Cleanup *
 ACE_TSS_Cleanup::instance (void)
 {
-  ACE_TRACE ("ACE_TSS_Cleanup::instance");
+// ACE_TRACE ("ACE_TSS_Cleanup::instance");
 
   // Create and initialize thread-specific key.
   if (ACE_TSS_Cleanup::instance_ == 0)
     {
       // Insure that we are serialized!
-      ACE_TSS_CLEANUP_GUARD
+      ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+        ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+          (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+        ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *lock, 0));
 
       // Now, use the Double-Checked Locking pattern to make sure we
       // only create the ACE_TSS_Cleanup instance once.
-      if (ACE_TSS_Cleanup::instance_ == 0)
+      if (instance_ == 0)
         {
           ACE_NEW_RETURN (ACE_TSS_Cleanup::instance_, ACE_TSS_Cleanup, 0);
         }
@@ -1827,41 +1645,40 @@ ACE_TSS_Cleanup::insert (ACE_thread_key_t key,
                          void (*destructor)(void *),
                          void *inst)
 {
-ACE_TRACE ("ACE_TSS_Cleanup::insert");
-  ACE_TSS_CLEANUP_GUARD
+// ACE_TRACE ("ACE_TSS_Cleanup::insert");
+  ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+    ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *lock, -1));
 
   ACE_KEY_INDEX (key_index, key);
-  if (key_index < ACE_DEFAULT_THREAD_KEYS)
-    {
-      table_[key_index] = ACE_TSS_Info (key, destructor, inst);
-      return 0;
-    }
-  else
-    {
-      return -1;
-    }
+  return this->table_.set (ACE_TSS_Info (key, destructor, inst), key_index);
 }
 
 int
 ACE_TSS_Cleanup::remove (ACE_thread_key_t key)
 {
-  ACE_TRACE ("ACE_TSS_Cleanup::remove");
-  ACE_TSS_CLEANUP_GUARD
+  // ACE_TRACE ("ACE_TSS_Cleanup::remove");
+  ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+    ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *lock, -1));
 
   ACE_KEY_INDEX (key_index, key);
-  if (key_index < ACE_DEFAULT_THREAD_KEYS)
+  if (key_index <= this->table_.size ())
     {
       // "Remove" the TSS_Info table entry by zeroing out its key_ and
       // destructor_ fields.  Also, keep track of the number threads
       // using the key.
       ACE_TSS_Info &info = this->table_ [key_index];
 
-      // Don't bother to check <in_use_> if the program is shutting
-      // down.  Doing so will cause a new ACE_TSS object getting
-      // created again.
-      if (! ACE_OS_Object_Manager::shutting_down ()
-          && ! tss_keys ()->test_and_clear (info.key_))
-        --info.thread_count_;
+      // Don't bother to check <in_use_> if the program is shutting down.
+      // Doing so will cause a new ACE_TSS object getting created again.
+      if (! ACE_Object_Manager::shutting_down () &&
+          ! in_use_->test_and_clear (info.key_))
+        {
+          --info.thread_count_;
+        }
 
       info.key_ = ACE_OS::NULL_key;
       info.destructor_ = 0;
@@ -1874,18 +1691,21 @@ ACE_TSS_Cleanup::remove (ACE_thread_key_t key)
 int
 ACE_TSS_Cleanup::detach (void *inst)
 {
-  ACE_TSS_CLEANUP_GUARD
+  ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+    ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+    ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *lock, -1));
 
-  ACE_TSS_TABLE_ITERATOR key_info = table_;
+  ACE_TSS_Info *key_info = 0;
   int success = 0;
   int ref_cnt = 0;
 
   // Mark the key as detached in the TSS_Info table.
   // It only works for the first key that "inst" owns.
   // I don't know why.
-  for (unsigned int i = 0;
-       i < ACE_DEFAULT_THREAD_KEYS;
-       ++key_info, ++i)
+  for (ACE_TSS_TABLE_ITERATOR iter (this->table_);
+       iter.next (key_info) != 0;
+       iter.advance ())
     {
       if (key_info->tss_obj_ == inst)
         {
@@ -1921,9 +1741,12 @@ ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
 {
   // If the key's ACE_TSS_Info in-use bit for this thread is not set,
   // set it and increment the key's thread_count_.
-  if (! tss_keys ()->test_and_set (key))
+  if (! in_use_->test_and_set (key))
     {
-      ACE_TSS_CLEANUP_GUARD
+      ACE_MT (ACE_Recursive_Thread_Mutex *lock =
+        ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+          (ACE_Object_Manager::ACE_TSS_CLEANUP_LOCK);
+        ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *lock));
 
       // Retrieve the key's ACE_TSS_Info and increment its thread_count_.
       ACE_KEY_INDEX (key_index, key);
@@ -1938,58 +1761,21 @@ ACE_TSS_Cleanup::key_used (ACE_thread_key_t key)
 void
 ACE_TSS_Cleanup::dump (void)
 {
+  ACE_TSS_Info *key_info = 0;
+
   // Iterate through all the thread-specific items and dump them all.
 
-  ACE_TSS_TABLE_ITERATOR key_info = table_;
-  for (unsigned int i = 0;
-       i < ACE_DEFAULT_THREAD_KEYS;
-       ++key_info, ++i)
+  for (ACE_TSS_TABLE_ITERATOR iter (this->table_);
+       iter.next (key_info) != 0;
+       iter.advance ())
     key_info->dump ();
 }
 
-ACE_TSS_Keys *
-ACE_TSS_Cleanup::tss_keys ()
-{
-  if (in_use_ == ACE_OS::NULL_key)
-    {
-      ACE_TSS_CLEANUP_GUARD
-      // Double-check;
-      if (in_use_ == ACE_OS::NULL_key)
-        {
-          // Initialize in_use_ with a new key.
-          if (ACE_OS::thr_keycreate (&in_use_,
-                                     &ACE_TSS_Cleanup_keys_destroyer))
-            return 0; // Major problems, this should *never* happen!
-        }
-    }
-
-  ACE_TSS_Keys *ts_keys = 0;
-  if (ACE_OS::thr_getspecific (in_use_,
-        ACE_reinterpret_cast (void **, &ts_keys)) == -1)
-    return 0; // This should not happen!
-
-  if (ts_keys == 0)
-    {
-      ACE_NEW_RETURN (ts_keys, ACE_TSS_Keys, 0);
-      // Store the dynamically allocated pointer in thread-specific
-      // storage.
-      if (ACE_OS::thr_setspecific (in_use_,
-            ACE_reinterpret_cast (void *, ts_keys)) == -1)
-        {
-          delete ts_keys;
-          return 0; // Major problems, this should *never* happen!
-        }
-    }
-
-  return ts_keys;
-}
-
 # if defined (ACE_HAS_TSS_EMULATION)
 u_int ACE_TSS_Emulation::total_keys_ = 0;
 
 ACE_TSS_Emulation::ACE_TSS_DESTRUCTOR
-ACE_TSS_Emulation::tss_destructor_[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX]
- = { 0 };
+ACE_TSS_Emulation::tss_destructor_ [ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX] = { 0 };
 
 #if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 
@@ -2017,8 +1803,11 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[])
   // Create the one native TSS key, if necessary.
   if (key_created_ == 0)
     {
-      // Double-checked lock . . .
-      ACE_TSS_BASE_GUARD
+      ACE_Recursive_Thread_Mutex *lock =
+        ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object
+          (ACE_Object_Manager::ACE_TSS_BASE_LOCK);
+
+      ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *lock, 0);
 
       if (key_created_ == 0)
         {
@@ -2126,16 +1915,22 @@ ACE_TSS_Emulation::tss_open (void *ts_storage[ACE_TSS_THREAD_KEYS_MAX])
 #   endif /* ! ACE_PSOS */
 }
 
-void
-ACE_TSS_Emulation::tss_close ()
-{
-#if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-  // Free native_tss_key_ here.
-#endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE */
-}
-
 # endif /* ACE_HAS_TSS_EMULATION */
 
+# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Array<ACE_TSS_Info>;
+template class ACE_Array_Base<ACE_TSS_Info>;
+template class ACE_Array_Iterator<ACE_TSS_Info>;
+template class ACE_Node<ACE_TSS_Ref>;
+template class ACE_TSS<ACE_TSS_Keys>;
+# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#   pragma instantiate ACE_Array<ACE_TSS_Info>
+#   pragma instantiate ACE_Array_Base<ACE_TSS_Info>
+#   pragma instantiate ACE_Array_Iterator<ACE_TSS_Info>
+#   pragma instantiate ACE_Node<ACE_TSS_Ref>
+#   pragma instantiate ACE_TSS<ACE_TSS_Keys>
+# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* WIN32 || ACE_HAS_TSS_EMULATION */
 
 void
@@ -2148,41 +1943,28 @@ ACE_OS::cleanup_tss (const u_int main_thread)
 
   if (main_thread)
     {
-#if !defined (ACE_HAS_TSS_EMULATION)  &&  !defined (ACE_HAS_MINIMAL_ACE_OS)
+#if ! defined (ACE_HAS_TSS_EMULATION)
       // Just close the ACE_Log_Msg for the current (which should be
       // main) thread.  We don't have TSS emulation; if there's native
       // TSS, it should call its destructors when the main thread
       // exits.
       ACE_Log_Msg::close ();
-#endif /* ! ACE_HAS_TSS_EMULATION  &&  ! ACE_HAS_MINIMAL_ACE_OS */
+#endif /* ! ACE_HAS_TSS_EMULATION */
 
 #if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION)
-#if defined (ACE_WIN32)
-      // Don't do this with TSS_Emulation, because the the
-      // ACE_TSS_Cleanup::instance () has already exited ().  We can't
-      // safely access the TSS values that were created by the main
-      // thread.
-
       // Remove all TSS_Info table entries.
-      ACE_TSS_Cleanup::instance ()->free_all_keys_left ();
-#endif /* ACE_WIN32 */
-
+      ACE_TSS_Cleanup::instance ()->free_all_key_left ();
       // Finally, free up the ACE_TSS_Cleanup instance.  This method gets
       // called by the ACE_Object_Manager.
       delete ACE_TSS_Cleanup::instance ();
 #endif /* WIN32 || ACE_HAS_TSS_EMULATION */
-
-#if defined (ACE_HAS_TSS_EMULATION)
-      ACE_TSS_Emulation::tss_close ();
-#endif /* ACE_HAS_TSS_EMULATION */
     }
 }
 
 void
 ACE_Thread_Adapter::inherit_log_msg (void)
 {
-#if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)  && \
-    !defined (ACE_HAS_MINIMAL_ACE_OS)
+#if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)
   // Inherit the logging features if the parent thread has an
   // <ACE_Log_Msg>.  Note that all of the following operations occur
   // within thread-specific storage.
@@ -2209,14 +1991,11 @@ ACE_Thread_Adapter::inherit_log_msg (void)
   // descriptor in.
 
   if (this->thr_desc_ != 0)
-    // This downcast is safe.  We do it to avoid having to #include
-    // ace/Thread_Manager.h.
-    ACE_LOG_MSG->thr_desc (ACE_reinterpret_cast (ACE_Thread_Descriptor *,
-                                                 this->thr_desc_));
+    ACE_LOG_MSG->thr_desc (this->thr_desc_);
   // Block the thread from proceeding until
   // thread manager has thread descriptor ready.
 
-#endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG  &&  ! ACE_HAS_MINIMAL_ACE_OS */
+#endif /* ACE_THREADS_DONT_INHERIT_LOG_MSG */
 }
 
 void *
@@ -2255,14 +2034,14 @@ ACE_Thread_Adapter::invoke (void)
   exit_hook.thr_mgr (this->thr_mgr ());
 # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
 
-#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */
+#endif
 
   // Extract the arguments.
   ACE_THR_FUNC_INTERNAL func = ACE_reinterpret_cast (ACE_THR_FUNC_INTERNAL,
                                                      this->user_func_);
   void *arg = this->arg_;
 #if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
-  ACE_OS_Thread_Descriptor *thr_desc = this->thr_desc_;
+  ACE_Thread_Descriptor *thr_desc = this->thr_desc_;
 #endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */
 
   // Delete ourselves since we don't need <this> anymore.  Make sure
@@ -2270,11 +2049,11 @@ ACE_Thread_Adapter::invoke (void)
   delete this;
 
 #if defined (ACE_NEEDS_LWP_PRIO_SET)
-  // On SunOS, the LWP priority needs to be set in order to get
-  // preemption when running in the RT class.  This is the ACE way to
-  // do that . . .
+  // On Solaris 2.5.x and 2.6, the LWP priority needs to be set in
+  // order to get preemption when running in the RT class.  This is
+  // the ACE way to do that . . .
   ACE_hthread_t thr_handle;
-  ACE_OS::thr_self (thr_handle);
+  ACE_Thread::self (thr_handle);
   int prio;
 
   // thr_getprio () on the current thread should never fail.
@@ -2357,8 +2136,8 @@ ACE_Thread_Adapter::invoke (void)
         {
           // Not spawned by ACE_Thread_Manager, use the old buggy
           // version.  You should seriously consider using
-          // ACE_Thread_Manager to spawn threads.  The following code
-          // is know to cause some problem.
+          // ACE_Thread_Manager to spawn threads.  The following
+          // code is know to cause some problem.
           CWinThread *pThread = ::AfxGetThread ();
 
           if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ())
@@ -2404,7 +2183,7 @@ ace_cleanup_destroyer (ACE_Cleanup *object, void *param)
 extern "C" void *
 ace_thread_adapter (void *args)
 {
-  ACE_TRACE ("ace_thread_adapter");
+  // ACE_TRACE ("ace_thread_adapter");
 
 #if defined (ACE_HAS_TSS_EMULATION)
   // As early as we can in the execution of the new thread, allocate
@@ -2436,9 +2215,7 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
     arg_ (arg),
     entry_point_ (entry_point),
     thr_mgr_ (tm),
-    // An ACE_Thread_Descriptor really is an ACE_OS_Thread_Descriptor.
-    // But without #including ace/Thread_Manager.h, we don't know that.
-    thr_desc_ (ACE_reinterpret_cast (ACE_OS_Thread_Descriptor *,td))
+    thr_desc_ (td)
 #if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)
     ,
     ostream_ (0),
@@ -2452,10 +2229,9 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
 #endif /* ACE_THREADS_DONT_INHERIT_LOG_MSG */
 {
-ACE_TRACE ("Ace_Thread_Adapter::Ace_Thread_Adapter");
-#if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)  && \
-    !defined (ACE_HAS_MINIMAL_ACE_OS)
-  if (ACE_Log_Msg::exists ())
+// ACE_TRACE ("Ace_Thread_Adapter::Ace_Thread_Adapter");
+#if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG)
+  if ( ACE_Log_Msg::exists() )
     {
       ACE_Log_Msg *inherit_log_ = ACE_LOG_MSG;
       this->ostream_ = inherit_log_->msg_ostream ();
@@ -2468,7 +2244,7 @@ ACE_TRACE ("Ace_Thread_Adapter::Ace_Thread_Adapter");
       this->seh_except_handler_ = handler;
 # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
     }
-#endif /* ! ACE_THREADS_DONT_INHERIT_LOG_MSG  &&  ! ACE_HAS_MINIMAL_ACE_OS */
+#endif /* ACE_THREADS_DONT_INHERIT_LOG_MSG */
 }
 
 int
@@ -2482,7 +2258,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                     size_t stacksize,
                     ACE_Thread_Adapter *thread_adapter)
 {
-  ACE_TRACE ("ACE_OS::thr_create");
+  // ACE_TRACE ("ACE_OS::thr_create");
 
   if (ACE_BIT_DISABLED (flags, THR_DETACHED) &&
       ACE_BIT_DISABLED (flags, THR_JOINABLE))
@@ -2670,7 +2446,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           int spolicy;
 
 #       if defined (ACE_HAS_ONLY_SCHED_OTHER)
-            // SunOS, thru version 5.6, only supports SCHED_OTHER.
+            // Solaris, thru version 2.6, only supports SCHED_OTHER.
             spolicy = SCHED_OTHER;
 #       else
           // Make sure to enable explicit scheduling, in case we didn't
@@ -2792,12 +2568,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
            }
 #       else
          {
-#         if defined (sun)  &&  defined (ACE_HAS_ONLY_SCHED_OTHER)
-           // SunOS, through 5.6, POSIX only allows priorities > 0 to
+#         if defined (sun)
+           // Solaris POSIX only allows priorities > 0 to
            // ::pthread_attr_setschedparam.  If a priority of 0 was
            // requested, set the thread priority after creating it, below.
            if (priority > 0)
-#         endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */
+#         endif /* sun */
              {
 #         if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
                result = ::pthread_attr_setprio (&attr,
@@ -2869,7 +2645,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (ACE_BIT_ENABLED (flags, THR_NEW_LWP))
         {
           // Increment the number of LWPs by one to emulate the
-          // SunOS semantics.
+          // Solaris semantics.
           int lwps = ACE_OS::thr_getconcurrency ();
           if (lwps == -1)
             {
@@ -2880,7 +2656,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                 }
               else
                 {
-                  // This should never happen on SunOS:
+                  // This should never happen on Solaris:
                   // ::thr_getconcurrency () should always succeed.
                   return -1;
                 }
@@ -2913,11 +2689,10 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
   if (ACE_BIT_ENABLED (flags, THR_DETACHED))
     {
 #         if defined (HPUX_10)
-    // HP-UX DCE threads' pthread_detach will smash thr_id if it's
-    // just given as an argument.  This will cause ACE_Thread_Manager
-    // (if it's doing this create) to lose track of the new thread
-    // since the ID will be passed back equal to 0.  So give
-    // pthread_detach a junker to scribble on.
+    // HP-UX DCE threads' pthread_detach will smash thr_id if it's just given
+    // as an argument.  This will cause ACE_Thread_Manager (if it's doing this
+    // create) to lose track of the new thread since the ID will be passed back
+    // equal to 0.  So give pthread_detach a junker to scribble on.
       ACE_thread_t  junker;
       cma_handle_assign(thr_id, &junker);
       ::pthread_detach (&junker);
@@ -2946,15 +2721,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
   ::pthread_attr_destroy (&attr);
 #     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
-  // This is a SunOS or POSIX implementation of pthreads,
+  // This is a Solaris or POSIX implementation of pthreads,
   // where we assume that ACE_thread_t and ACE_hthread_t are the same.
   // If this *isn't* correct on some platform, please let us know.
   if (result != -1)
     *thr_handle = *thr_id;
 
-#     if defined (sun)  &&  defined (ACE_HAS_ONLY_SCHED_OTHER)
-        // SunOS prior to 5.7:
-
+#     if defined (sun)
         // If the priority is 0, then we might have to set it now
         // because we couldn't set it with
         // ::pthread_attr_setschedparam, as noted above.  This doesn't
@@ -2963,9 +2736,9 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
         // applies regardless of the inherit_sched attribute: if it
         // was PTHREAD_INHERIT_SCHED, then it certainly inherited its
         // parent's priority.  If it was PTHREAD_EXPLICIT_SCHED, then
-        // "attr" was initialized by the SunOS ::pthread_attr_init
+        // "attr" was initialized by the Solaris ::pthread_attr_init
         // () to contain NULL for the priority, which indicated to
-        // SunOS ::pthread_create () to inherit the parent
+        // Solaris ::pthread_create () to inherit the parent
         // priority.)
         if (priority == 0)
           {
@@ -2981,20 +2754,18 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                                           result), int,
                         -1, result);
 
-            // The only policy supported by by SunOS, thru version 5.6,
-            // is SCHED_OTHER, so that's hard-coded here.
-            policy = ACE_SCHED_OTHER;
-
             if (sparam.sched_priority != 0)
               {
                 ACE_OS::memset ((void *) &sparam, 0, sizeof sparam);
                 // The memset to 0 sets the priority to 0, so we don't need
                 // to explicitly set sparam.sched_priority.
 
+                // The only policy supported by by Solaris, thru version 2.6,
+                // is SCHED_OTHER, so that's hard-coded below.
                 ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setschedparam (
-                                                       *thr_id,
-                                                       policy,
-                                                       &sparam),
+                                                        *thr_id,
+                                                        SCHED_OTHER,
+                                                        &sparam),
                                                      result),
                                    int, -1);
               }
@@ -3011,12 +2782,10 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
             // If the thread is bound, then set the priority on its LWP.
             if (ACE_BIT_ENABLED (flags, THR_BOUND))
               {
-                ACE_Sched_Params sched_params (
-                  ACE_BIT_ENABLED (flags, THR_SCHED_FIFO) ||
-                    ACE_BIT_ENABLED (flags, THR_SCHED_RR)  ?
-                    ACE_SCHED_FIFO  :
-                    ACE_SCHED_OTHER,
-                  priority);
+                ACE_Sched_Params sched_params (ACE_BIT_ENABLED (flags,
+                  THR_SCHED_FIFO) || ACE_BIT_ENABLED (flags,
+                  THR_SCHED_RR)  ?  ACE_SCHED_FIFO  :ACE_SCHED_OTHER,
+                                               priority);
                 result = ACE_OS::lwp_setparams (sched_params,
                                       /* ? How do we find the ID of the LWP
                                            to which *thr_id is bound? */);
@@ -3024,7 +2793,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #         endif /* 0 */
 #       endif /* ACE_NEEDS_LWP_PRIO_SET */
 
-#     endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */
+#     endif /* sun */
   return result;
 #   elif defined (ACE_HAS_STHREADS)
   int result;
@@ -3043,7 +2812,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
   if (result != -1)
     {
-      // With SunOS threads, ACE_thread_t and ACE_hthread_t are the same.
+      // With Solaris threads, ACE_thread_t and ACE_hthread_t are the same.
       *thr_handle = *thr_id;
 
       if (priority != ACE_DEFAULT_THREAD_PRIORITY)
@@ -3278,13 +3047,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (! thr_id_provided  &&  thr_id)
         {
           if (*thr_id  &&  (*thr_id)[0] == ACE_THR_ID_ALLOCATED)
-            // *thr_id was allocated by the Thread_Manager.  ::taskTcb
-            // (int tid) returns the address of the WIND_TCB (task
-            // control block).  According to the ::taskSpawn()
+            // *thr_id was allocated by the Thread_Manager.
+            // ::taskTcb (int tid) returns the address of the WIND_TCB
+            // (task control block).  According to the ::taskSpawn()
             // documentation, the name of the new task is stored at
             // pStackBase, but is that of the current task?  If so, it
-            // might be a bit quicker than this extraction of the tcb
-            // . . .
+            // might be a bit quicker than this extraction of the tcb . . .
             ACE_OS::strncpy (*thr_id + 1, ::taskTcb (tid)->name, 10);
           else
             // *thr_id was not allocated by the Thread_Manager.
@@ -3319,7 +3087,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 void
 ACE_OS::thr_exit (void *status)
 {
-ACE_TRACE ("ACE_OS::thr_exit");
+// ACE_TRACE ("ACE_OS::thr_exit");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
     ::pthread_exit (status);
@@ -3332,11 +3100,7 @@ ACE_TRACE ("ACE_OS::thr_exit");
 
 #     if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
     int using_afx = -1;
-    // An ACE_Thread_Descriptor really is an ACE_OS_Thread_Descriptor.
-    // But without #including ace/Thread_Manager.h, we don't know that.
-    ACE_OS_Thread_Descriptor *td =
-      ACE_reinterpret_cast (ACE_OS_Thread_Descriptor *,
-                            ACE_Log_Msg::instance ()->thr_desc ());
+    ACE_Thread_Descriptor *td = ACE_Log_Msg::instance ()->thr_desc ();
     if (td)
       using_afx = ACE_BIT_ENABLED (td->flags (), THR_USE_AFX);
 #     endif /* ACE_HAS_MFC && (ACE_HAS_MFC != 0) */
@@ -3358,10 +3122,9 @@ ACE_TRACE ("ACE_OS::thr_exit");
       }
     else
       {
-        // Not spawned by ACE_Thread_Manager, use the old buggy
-        // version.  You should seriously consider using
-        // ACE_Thread_Manager to spawn threads.  The following code is
-        // know to cause some problem.
+        // Not spawned by ACE_Thread_Manager, use the old buggy version.
+        // You should seriously consider using ACE_Thread_Manager to spawn threads.
+        // The following code is know to cause some problem.
         CWinThread *pThread = ::AfxGetThread ();
         if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ())
           ::_endthreadex ((DWORD) status);
@@ -3461,7 +3224,7 @@ ACE_OS::lwp_setparams (const ACE_Sched_Params &sched_params)
 int
 ACE_OS::thr_setspecific (ACE_OS_thread_key_t key, void *data)
 {
-  // ACE_TRACE ("ACE_OS::thr_setspecific");
+// ACE_TRACE ("ACE_OS::thr_setspecific");
 #   if defined (ACE_HAS_THREADS)
 #     if defined (ACE_HAS_PTHREADS)
 #       if defined (ACE_HAS_FSU_PTHREADS)
@@ -3479,6 +3242,7 @@ ACE_OS::thr_setspecific (ACE_OS_thread_key_t key, void *data)
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), ace_result_), int, -1);
 #     elif defined (ACE_HAS_WTHREADS)
     ::TlsSetValue (key, data);
+    ACE_TSS_Cleanup::instance ()->key_used (key);
     return 0;
 #     endif /* ACE_HAS_STHREADS */
 #   else
@@ -3492,11 +3256,10 @@ ACE_OS::thr_setspecific (ACE_OS_thread_key_t key, void *data)
 int
 ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
 {
-  // ACE_TRACE ("ACE_OS::thr_setspecific");
+// ACE_TRACE ("ACE_OS::thr_setspecific");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_TSS_EMULATION)
     ACE_KEY_INDEX (key_index, key);
-
     if (key_index >= ACE_TSS_Emulation::total_keys ())
       {
         errno = EINVAL;
@@ -3536,10 +3299,6 @@ ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
     ::TlsSetValue (key, data);
     ACE_TSS_Cleanup::instance ()->key_used (key);
     return 0;
-#   else
-    ACE_UNUSED_ARG (key);
-    ACE_UNUSED_ARG (data);
-    ACE_NOTSUP_RETURN (-1);
 #   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (key);
@@ -3551,7 +3310,7 @@ ACE_OS::thr_setspecific (ACE_thread_key_t key, void *data)
 int
 ACE_OS::thr_keyfree (ACE_thread_key_t key)
 {
-ACE_TRACE ("ACE_OS::thr_keyfree");
+// ACE_TRACE ("ACE_OS::thr_keyfree");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_TSS_EMULATION)
     return ACE_TSS_Cleanup::instance ()->remove (key);
@@ -3570,10 +3329,7 @@ ACE_TRACE ("ACE_OS::thr_keyfree");
     // the key and destructor.
     ACE_TSS_Cleanup::instance ()->remove (key);
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::TlsFree (key), ace_result_), int, -1);
-#   else
-    ACE_UNUSED_ARG (key);
-    ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (key);
   ACE_NOTSUP_RETURN (-1);
@@ -3590,7 +3346,7 @@ ACE_OS::thr_keycreate (ACE_OS_thread_key_t *key,
 #   endif /* ACE_HAS_THR_C_DEST */
                        void *inst)
 {
-    // ACE_TRACE ("ACE_OS::thr_keycreate");
+// ACE_TRACE ("ACE_OS::thr_keycreate");
 #   if defined (ACE_HAS_THREADS)
 #     if defined (ACE_HAS_PTHREADS)
     ACE_UNUSED_ARG (inst);
@@ -3644,7 +3400,7 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key,
 # endif /* ACE_HAS_THR_C_DEST */
                        void *inst)
 {
-  // ACE_TRACE ("ACE_OS::thr_keycreate");
+// ACE_TRACE ("ACE_OS::thr_keycreate");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_TSS_EMULATION)
     if (ACE_TSS_Emulation::next_key (*key) == 0)
@@ -3692,12 +3448,7 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key,
     else
       ACE_FAIL_RETURN (-1);
       /* NOTREACHED */
-#   else
-    ACE_UNUSED_ARG (key);
-    ACE_UNUSED_ARG (dest);
-    ACE_UNUSED_ARG (inst);
-    ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_TSS_EMULATION */
+#   endif /* ACE_HAS_STHREADS */
 # else
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (dest);
@@ -3736,220 +3487,6 @@ ACE_OS::thr_key_detach (void *inst)
 # endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */
 }
 
-void
-ACE_OS::unique_name (const void *object,
-                  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
-  // uniqueness between other "live" objects in the same process. The
-  // uniqueness of this name is therefore only valid for the life of
-  // <object>.
-  TCHAR temp_name[ACE_UNIQUE_NAME_LEN];
-  ACE_OS::sprintf (temp_name,
-                   ACE_TEXT ("%x%d"),
-                   object,
-                   ACE_OS::getpid ());
-  ACE_OS::strncpy (name,
-                   temp_name,
-                   length);
-}
-
-int
-ACE_OS::argv_to_string (ASYS_TCHAR **argv,
-                        ASYS_TCHAR *&buf,
-                        int substitute_env_args)
-{
-  if (argv == 0 || argv[0] == 0)
-    return 0;
-
-  int buf_len = 0;
-
-  // Determine the length of the buffer.
-
-  for (int i = 0; argv[i] != 0; i++)
-    {
-      ASYS_TCHAR *temp = 0;
-
-      // Account for environment variables.
-      if (substitute_env_args
-          && (argv[i][0] == '$'
-              && (temp = ACE_OS::getenv (&argv[i][1])) != 0))
-        buf_len += ACE_OS::strlen (temp);
-      else
-        buf_len += ACE_OS::strlen (argv[i]);
-
-      // Add one for the extra space between each string.
-      buf_len++;
-    }
-
-  // Step through all argv params and copy each one into buf; separate
-  // each param with white space.
-
-  ACE_NEW_RETURN (buf,
-                  ASYS_TCHAR[buf_len + 1],
-                  0);
-
-  // Initial null charater to make it a null string.
-  buf[0] = '\0';
-  ASYS_TCHAR *end = buf;
-  int j;
-
-  for (j = 0; argv[j] != 0; j++)
-    {
-      ASYS_TCHAR *temp = 0;
-
-      // Account for environment variables.
-      if (substitute_env_args
-      && (argv[j][0] == '$'
-              && (temp = ACE_OS::getenv (&argv[j][1])) != 0))
-        end = ACE_OS::strecpy (end, temp);
-      else
-        end = ACE_OS::strecpy (end, argv[j]);
-
-      // Replace the null char that strecpy put there with white
-      // space.
-      end[-1] = ' ';
-    }
-
-  // Null terminate the string.
-  *end = '\0';
-  // The number of arguments.
-  return j;
-}
-
-int
-ACE_OS::string_to_argv (ASYS_TCHAR *buf,
-                        size_t &argc,
-                        ASYS_TCHAR **&argv,
-                        int substitute_env_args)
-{
-  // Reset the number of arguments
-  argc = 0;
-
-  if (buf == 0)
-    return -1;
-
-  ASYS_TCHAR *cp = buf;
-
-  // First pass: count arguments.
-
-  // '#' is the start-comment token..
-  while (*cp != '\0' && *cp != '#')
-    {
-      // Skip whitespace..
-      while (ACE_OS::ace_isspace (*cp))
-        cp++;
-
-      // Increment count and move to next whitespace..
-      if (*cp != '\0')
-        argc++;
-
-      // Grok quotes....
-      if (*cp == '\'' || *cp == '"')
-        {
-          ASYS_TCHAR quote = *cp;
-
-          // Scan past the string..
-          for (cp++; *cp != '\0' && *cp != quote; cp++)
-            continue;
-
-          // '\0' implies unmatched quote..
-          if (*cp == '\0')
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ASYS_TEXT ("unmatched %c detected\n"),
-                          quote));
-              argc--;
-              break;
-            }
-          else
-            cp++;
-        }
-      else // Skip over non-whitespace....
-        while (*cp != '\0' && !ACE_OS::ace_isspace (*cp))
-          cp++;
-    }
-
-  // Second pass: copy arguments.
-  ASYS_TCHAR arg[ACE_DEFAULT_ARGV_BUFSIZ];
-  ASYS_TCHAR *argp = arg;
-
-  // Make sure that the buffer we're copying into is always large
-  // enough.
-  if (cp - buf >= ACE_DEFAULT_ARGV_BUFSIZ)
-    ACE_NEW_RETURN (argp,
-                    ASYS_TCHAR[cp - buf + 1],
-                    -1);
-
-  // Make a new argv vector of argc + 1 elements.
-  ACE_NEW_RETURN (argv,
-                  ASYS_TCHAR *[argc + 1],
-                  -1);
-
-  ASYS_TCHAR *ptr = buf;
-
-  for (size_t i = 0; i < argc; i++)
-    {
-      // Skip whitespace..
-      while (ACE_OS::ace_isspace (*ptr))
-        ptr++;
-
-      // Copy next argument and move to next whitespace..
-      if (*ptr == '\'' || *ptr == '"')
-        {
-          ASYS_TCHAR quote = *ptr++;
-
-          for (cp = argp;
-               *ptr != '\0' && *ptr != quote;
-               ptr++, cp++)
-            {
-              // @@ We can probably remove this since we ensure it's
-              // big enough earlier!
-              ACE_ASSERT (unsigned (cp - argp) < ACE_DEFAULT_ARGV_BUFSIZ);
-              *cp = *ptr;
-            }
-
-          *cp = '\0';
-          if (*ptr == quote)
-            ptr++;
-        }
-      else
-        {
-          for (cp = arg;
-               *ptr && !ACE_OS::ace_isspace (*ptr);
-               ptr++, cp++)
-            {
-              // @@ We can probably remove this since we ensure it's
-              // big enough earlier!
-              ACE_ASSERT (u_int (cp - argp) < ACE_DEFAULT_ARGV_BUFSIZ);
-              *cp = *ptr;
-            }
-
-          *cp = '\0';
-        }
-
-      // Check for environment variable substitution here.
-#if !defined (ACE_HAS_WINCE)
-      if (substitute_env_args)
-        ACE_ALLOCATOR_RETURN (argv[i],
-                              ACE_OS::strenvdup (arg),
-                              -1);
-      else
-#endif /* ACE_HAS_WINCE */
-        ACE_ALLOCATOR_RETURN (argv[i],
-                              ACE_OS::strdup (arg),
-                              -1);
-    }
-
-  if (argp != arg)
-    delete [] argp;
-
-  argv[argc] = 0;
-  return 0;
-}
-
 // Create a contiguous command-line argument buffer with each arg
 // separated by spaces.
 
@@ -3957,35 +3494,35 @@ pid_t
 ACE_OS::fork_exec (ASYS_TCHAR *argv[])
 {
 # if defined (ACE_WIN32)
-  ASYS_TCHAR *buf;
+  ACE_ARGV argv_buf (argv);
 
-  if (ACE_OS::argv_to_string (argv, buf) != -1)
+  if (argv_buf.buf () != 0)
     {
       PROCESS_INFORMATION process_info;
 #   if !defined (ACE_HAS_WINCE)
       STARTUPINFO startup_info;
-      ACE_OS::memset ((void *) &startup_info,
-                      0,
-                      sizeof startup_info);
+      ACE_OS::memset ((void *) &startup_info, 0, sizeof startup_info);
       startup_info.cb = sizeof startup_info;
 
       if (::CreateProcess (0,
-                           (LPTSTR) ACE_WIDE_STRING (buf),
+                           (LPTSTR) ACE_WIDE_STRING (argv_buf.buf ()),
                            0, // No process attributes.
                            0,  // No thread attributes.
                            TRUE, // Allow handle inheritance.
-                           0, // Don't create a new console window.
+                           0,   /* CREATE_NEW_CONSOLE */
+                                // Don't create a new console window.
                            0, // No environment.
                            0, // No current directory.
                            &startup_info,
                            &process_info))
 #   else
       if (::CreateProcess (0,
-                           (LPTSTR) buf,
+                           (LPTSTR) ACE_WIDE_STRING (argv_buf.buf ()),
                            0, // No process attributes.
                            0,  // No thread attributes.
                            FALSE, // Can's inherit handles on CE
-                           0, // Don't create a new console window.
+                           0, /* CREATE_NEW_CONSOLE */
+                              // Don't create a new console window.
                            0, // No environment.
                            0, // No current directory.
                            0, // Can't use startup info on CE
@@ -3996,7 +3533,6 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
           ACE_OS::close (process_info.hThread);
           ACE_OS::close (process_info.hProcess);
           // Return new process id.
-          delete [] buf;
           return process_info.dwProcessId;
         }
     }
@@ -4017,8 +3553,7 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
           // Child process.
           if (ACE_OS::execv (argv[0], argv) == -1)
             {
-              ACE_ERROR ((LM_ERROR,
-                          "%p Exec failed\n"));
+              ACE_ERROR ((LM_ERROR, "%p Exec failed\n"));
 
               // If the execv fails, this child needs to exit.
               ACE_OS::exit (errno);
@@ -4030,100 +3565,6 @@ ACE_OS::fork_exec (ASYS_TCHAR *argv[])
 # endif /* ACE_WIN32 */
 }
 
-// Receive <len> bytes into <buf> from <handle> (uses the <read>
-// system call on UNIX and the <ReadFile> call on Win32).
-
-ssize_t
-ACE_OS::read_n (ACE_HANDLE handle,
-                void *buf,
-                size_t len)
-{
-  ACE_TRACE ("ACE_OS::read_n");
-
-  size_t bytes_read;
-  ssize_t n;
-
-  for (bytes_read = 0; bytes_read < len; bytes_read += n)
-    {
-      n = ACE_OS::read (handle,
-                        (char *) buf + bytes_read,
-                        len - bytes_read);
-
-      if (n == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            n = 0; // Keep trying to read.
-          else
-            return -1;
-        }
-      else if (n == 0)
-        break;
-    }
-
-  return bytes_read;
-}
-
-ssize_t
-ACE_OS::send_n (ACE_HANDLE handle, const void *buf, size_t len)
-{
-  ACE_TRACE ("ACE_OS::send_n");
-  size_t bytes_written;
-  ssize_t n;
-
-  for (bytes_written = 0; bytes_written < len; bytes_written += n)
-    {
-      n =
-#if defined (ACE_WIN32) || defined (ACE_PSOS)
-          ACE_OS::send (handle,
-                        (const char *) buf + bytes_written,
-                        len - bytes_written);
-#else
-          ACE_OS::write (handle,
-                         (const char *) buf + bytes_written,
-                         len - bytes_written);
-#endif /* ACE_WIN32 */
-
-      if (n == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            n = 0; // Keep trying to send.
-          else
-            return -1;
-        }
-    }
-
-  return bytes_written;
-}
-
-// Write <len> bytes from <buf> to <handle> (uses the <write>
-// system call on UNIX and the <WriteFile> call on Win32).
-
-ssize_t
-ACE_OS::write_n (ACE_HANDLE handle,
-                 const void *buf,
-                 size_t len)
-{
-  ACE_TRACE ("ACE_OS::write_n");
-
-  size_t bytes_written;
-  ssize_t n;
-
-  for (bytes_written = 0; bytes_written < len; bytes_written += n)
-    {
-      n = ACE_OS::write (handle, (const char *) buf + bytes_written,
-                         len - bytes_written);
-      if (n == -1)
-        {
-          if (errno == EWOULDBLOCK)
-            n = 0; // Keep trying to send.
-          else
-            return -1;
-        }
-    }
-
-  return bytes_written;
-}
-
 # if defined (ACE_LACKS_WRITEV)
 
 // "Fake" writev for operating systems without it.  Note that this is
@@ -4132,7 +3573,7 @@ ACE_OS::write_n (ACE_HANDLE handle,
 extern "C" int
 writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
 {
-  ACE_TRACE ("::writev");
+  // ACE_TRACE ("::writev");
 
   size_t length = 0;
   int i;
@@ -4160,7 +3601,7 @@ writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
       ptr += iov[i].iov_len;
     }
 
-  ssize_t result = ACE_OS::write_n (handle, buf, length);
+  ssize_t result = ACE::write_n (handle, buf, length);
 #   if !defined (ACE_HAS_ALLOCA)
   delete [] buf;
 #   endif /* !defined (ACE_HAS_ALLOCA) */
@@ -4178,7 +3619,7 @@ readv (ACE_HANDLE handle,
        ACE_READV_TYPE *iov,
        int n)
 {
-ACE_TRACE ("readv");
+// ACE_TRACE ("readv");
 
   ssize_t length = 0;
   int i;
@@ -4196,7 +3637,7 @@ ACE_TRACE ("readv");
   ACE_NEW_RETURN (buf, char[length], -1);
 #   endif /* !defined (ACE_HAS_ALLOCA) */
 
-  length = ACE_OS::read_n (handle, buf, length);
+  length = ACE::read_n (handle, buf, length);
 
   if (length != -1)
     {
@@ -4234,7 +3675,7 @@ ftruncate (ACE_HANDLE handle, long len)
   fl.l_start = len;
   fl.l_type = F_WRLCK;
 
-  return ACE_OS::fcntl (handle, F_FREESP, ACE_reinterpret_cast (long, &fl));
+  return ::fcntl (handle, F_FREESP, &fl);
 }
 # endif /* ACE_NEEDS_FTRUNCATE */
 
@@ -4242,7 +3683,7 @@ ftruncate (ACE_HANDLE handle, long len)
 char *
 ACE_OS::mktemp (char *s)
 {
-  ACE_TRACE ("ACE_OS::mktemp");
+  // ACE_TRACE ("ACE_OS::mktemp");
   if (s == 0)
     // check for null template string failed!
     return 0;
@@ -4263,13 +3704,12 @@ ACE_OS::mktemp (char *s)
           // getting this filename back (so, yes, there is a race
           // condition if multiple threads in a process use the same
           // template).  This appears to match the behavior of the
-          // SunOS 5.5 mktemp().
-          ACE_OS::sprintf (xxxxxx, "%05d%c", ACE_OS::getpid (), unique_letter);
+          // Solaris 2.5 mktemp().
+          ACE_OS::sprintf (xxxxxx, "%05d%c", getpid (), unique_letter);
           while (ACE_OS::stat (s, &sb) >= 0)
             {
               if (++unique_letter <= 'z')
-                ACE_OS::sprintf (xxxxxx, "%05d%c", ACE_OS::getpid (),
-                                 unique_letter);
+                ACE_OS::sprintf (xxxxxx, "%05d%c", getpid (), unique_letter);
               else
                 {
                   // maximum of 26 unique files per template, per process
@@ -4289,6 +3729,7 @@ ACE_OS::socket_init (int version_high, int version_low)
 # if defined (ACE_WIN32)
   if (ACE_OS::socket_initialized_ == 0)
     {
+      // cout << "WSAStartup" << endl;
       WORD version_requested = MAKEWORD (version_high, version_low);
       WSADATA wsa_data;
       int error = WSAStartup (version_requested, &wsa_data);
@@ -4302,10 +3743,7 @@ ACE_OS::socket_init (int version_high, int version_low)
           ::MessageBox (NULL, buf, ACE_TEXT ("WSAStartup failed!"), MB_OK);
         }
 #   else
-      ACE_OS::fprintf (stderr,
-                       "ACE_OS::socket_init; WSAStartup failed, "
-                         "WSAGetLastError returned %d\n",
-                       error);
+        cerr << "WSAStartup failed, WSAGetLastError returned " << error << endl;
 #   endif /* ACE_HAS_WINCE */
 
       ACE_OS::socket_initialized_ = 1;
@@ -4323,6 +3761,7 @@ ACE_OS::socket_fini (void)
 # if defined (ACE_WIN32)
   if (ACE_OS::socket_initialized_ != 0)
     {
+      // cout << "WSACleanup" << endl;
       if (WSACleanup () != 0)
         {
           int error = ::WSAGetLastError ();
@@ -4332,10 +3771,7 @@ ACE_OS::socket_fini (void)
           ACE_OS::sprintf (buf, fmt, ACE_TEXT ("WSACleanup"), error);
           ::MessageBox (NULL, buf , ACE_TEXT ("WSACleanup failed!"), MB_OK);
 #   else
-          ACE_OS::fprintf (stderr,
-                           "ACE_OS::socket_fini; WSACleanup failed, "
-                             "WSAGetLastError returned %d\n",
-                           error);
+          cerr << "WSACleanup failed, WSAGetLastError returned " << error << endl;
 #   endif /* ACE_HAS_WINCE */
         }
       ACE_OS::socket_initialized_ = 0;
@@ -4400,15 +3836,9 @@ spa (FUNCPTR entry, ...)
         argv[i] = 0;
     }
 
-  // The hard-coded options are what ::sp () uses, except for the
-  // larger stack size (instead of ::sp ()'s 20000).
-  const int ret = ::taskSpawn (argv[0],    // task name
-                               100,        // task priority
-                               VX_FP_TASK, // task options
-                               1000000,    // stack size
-                               entry,      // entry point
-                               argc,       // first argument to main ()
-                               (int) argv, // second argument to main ()
+  // The hard-coded options are what ::sp () uses.
+  const int ret = ::taskSpawn (argv[0], 100, VX_FP_TASK, 1000000,
+                               entry, argc, (int) argv,
                                0, 0, 0, 0, 0, 0, 0, 0);
   va_end (pvar);
 
@@ -4435,7 +3865,7 @@ siginfo_t::siginfo_t (ACE_HANDLE *handles)
 pid_t
 ACE_OS::fork (const char *program_name)
 {
-  ACE_TRACE ("ACE_OS::fork");
+  // ACE_TRACE ("ACE_OS::fork");
 # if defined (ACE_LACKS_FORK)
   ACE_UNUSED_ARG (program_name);
   ACE_NOTSUP_RETURN (pid_t (-1));
@@ -4447,10 +3877,8 @@ ACE_OS::fork (const char *program_name)
     ::fork ();
 #endif /* ACE_HAS_STHREADS */
 
-#if !defined (ACE_HAS_MINIMAL_ACE_OS)
   if (pid == 0)
     ACE_LOG_MSG->sync (program_name);
-#endif /* ! ACE_HAS_MINIMAL_ACE_OS */
 
   return pid;
 # endif /* ACE_WIN32 */
@@ -4553,7 +3981,10 @@ ACE_OS::pread (ACE_HANDLE handle,
 # if defined (ACE_HAS_P_READ_WRITE)
 #   if defined (ACE_WIN32)
 
-  ACE_OS_GUARD
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ace_os_monitor_lock, -1));
 
   // Remember the original file pointer position
   DWORD original_position = ::SetFilePointer (handle,
@@ -4634,7 +4065,10 @@ ACE_OS::pread (ACE_HANDLE handle,
 
 # else /* ACE_HAS_P_READ_WRITE */
 
-  ACE_OS_GUARD
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ace_os_monitor_lock, -1));
 
   // Remember the original file pointer position
   off_t original_position = ACE_OS::lseek (handle,
@@ -4678,7 +4112,10 @@ ACE_OS::pwrite (ACE_HANDLE handle,
 # if defined (ACE_HAS_P_READ_WRITE)
 #   if defined (ACE_WIN32)
 
-  ACE_OS_GUARD
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ace_os_monitor_lock, -1));
 
   // Remember the original file pointer position
   DWORD original_position = ::SetFilePointer (handle,
@@ -4757,7 +4194,10 @@ ACE_OS::pwrite (ACE_HANDLE handle,
 #   endif /* ACE_WIN32 */
 # else /* ACE_HAS_P_READ_WRITE */
 
-  ACE_OS_GUARD
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ace_os_monitor_lock, -1));
 
   // Remember the original file pointer position
   off_t original_position = ACE_OS::lseek (handle,
@@ -4794,7 +4234,7 @@ ACE_OS::open (const char *filename,
               int perms,
               LPSECURITY_ATTRIBUTES sa)
 {
-  ACE_TRACE ("ACE_OS::open");
+  // ACE_TRACE ("ACE_OS::open");
 #if defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (mode);
@@ -4843,25 +4283,20 @@ ACE_OS::open (const char *filename,
   if (ACE_BIT_ENABLED (mode, FILE_FLAG_POSIX_SEMANTICS))
     flags |= FILE_FLAG_POSIX_SEMANTICS;
 
-  ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;)
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = 0;)
 
   if (ACE_BIT_ENABLED (mode, _O_APPEND))
     {
       ACE_MT
         (
-          ace_os_monitor_lock = (ACE_thread_mutex_t *)
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK];
-          ACE_OS::thread_mutex_lock (ace_os_monitor_lock);
-        )
+          ace_os_monitor_lock =
+            ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+          ace_os_monitor_lock->acquire ();
+         )
     }
 
   ACE_HANDLE h = ::CreateFileA (filename, access,
-#if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
                                 FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-#else
-                                FILE_SHARE_READ | FILE_SHARE_WRITE,
-#endif /* ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0 */
                                 ACE_OS::default_win32_security_attributes (sa),
                                 creation,
                                 flags,
@@ -4874,7 +4309,7 @@ ACE_OS::open (const char *filename,
           ::SetFilePointer (h, 0, 0, FILE_END);
         }
 
-      ACE_MT (ACE_OS::thread_mutex_unlock (ace_os_monitor_lock);)
+      ACE_MT (ace_os_monitor_lock->release ();)
     }
 
   if (h == ACE_INVALID_HANDLE)
@@ -4913,7 +4348,7 @@ ACE_OS::open (const wchar_t *filename,
               LPSECURITY_ATTRIBUTES sa)
 {
   ACE_UNUSED_ARG (perms);
-  ACE_TRACE ("ACE_OS::open");
+  // ACE_TRACE ("ACE_OS::open");
   // Warning: This function ignores _O_APPEND
   DWORD access = GENERIC_READ;
   if (ACE_BIT_ENABLED (mode, O_WRONLY))
@@ -4954,17 +4389,16 @@ ACE_OS::open (const wchar_t *filename,
   if (ACE_BIT_ENABLED (mode, FILE_FLAG_POSIX_SEMANTICS))
     flags |= FILE_FLAG_POSIX_SEMANTICS;
 
-  ACE_MT (ACE_thread_mutex_t *ace_os_monitor_lock = 0;)
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = 0;)
 
   if (ACE_BIT_ENABLED (mode, _O_APPEND))
     {
       ACE_MT
         (
-          ace_os_monitor_lock = (ACE_thread_mutex_t *)
-            ACE_OS_Object_Manager::preallocated_object[
-              ACE_OS_Object_Manager::ACE_OS_MONITOR_LOCK];
-          ACE_OS::thread_mutex_lock (ace_os_monitor_lock);
-        )
+          ace_os_monitor_lock =
+            ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+          ace_os_monitor_lock->acquire ();
+         )
     }
 
   ACE_HANDLE h = ::CreateFileW (filename, access,
@@ -4986,7 +4420,7 @@ ACE_OS::open (const wchar_t *filename,
           ::SetFilePointer (h, 0, 0, FILE_END);
         }
 
-      ACE_MT (ACE_OS::thread_mutex_unlock (ace_os_monitor_lock);)
+      ACE_MT (ace_os_monitor_lock->release ();)
     }
 
   if (h == ACE_INVALID_HANDLE)
@@ -5181,17 +4615,17 @@ ACE_OS::ctime_r (const time_t *clock,
 time_t
 ACE_OS::mktime (struct tm *t)
 {
-  ACE_TRACE ("ACE_OS::mktime");
-#   if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
-  ACE_UNUSED_ARG (t);
-  ACE_NOTSUP_RETURN (-1);
+  // ACE_TRACE ("ACE_OS::asctime");
+#   if defined (ACE_HAS_MT_SAFE_MKTIME) || !defined (ACE_HAS_THREADS)
+  ACE_OSCALL_RETURN (::mktime (t), time_t, (time_t) -1);
 #   else
-#     if defined (ACE_HAS_THREADS)  &&  !defined (ACE_HAS_MT_SAFE_MKTIME)
-  ACE_OS_GUARD
-#     endif /* ACE_HAS_THREADS  &&  ! ACE_HAS_MT_SAFE_MKTIME */
+  ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock =
+    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
+      (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *ace_os_monitor_lock, (time_t) -1));
 
   ACE_OSCALL_RETURN (::mktime (t), time_t, (time_t) -1);
-#   endif /* ACE_PSOS && ! ACE_PSOS_HAS_TIME */
+#   endif /* ACE_HAS_MT_SAFE_MKTIME */
 }
 # endif /* !ACE_HAS_WINCE */
 
@@ -5215,18 +4649,18 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
   TCHAR name3[ACE_UNIQUE_NAME_LEN];
   TCHAR name4[ACE_UNIQUE_NAME_LEN];
 
-  ACE_OS::unique_name ((const void *) &rw->lock_,
-                       name1,
-                       ACE_UNIQUE_NAME_LEN);
-  ACE_OS::unique_name ((const void *) &rw->waiting_readers_,
-                       name2,
-                       ACE_UNIQUE_NAME_LEN);
-  ACE_OS::unique_name ((const void *) &rw->waiting_writers_,
-                       name3,
-                       ACE_UNIQUE_NAME_LEN);
-  ACE_OS::unique_name ((const void *) &rw->waiting_important_writer_,
-                       name4,
-                       ACE_UNIQUE_NAME_LEN);
+  ACE::unique_name ((const void *) &rw->lock_,
+                    name1,
+                    ACE_UNIQUE_NAME_LEN);
+  ACE::unique_name ((const void *) &rw->waiting_readers_,
+                    name2,
+                    ACE_UNIQUE_NAME_LEN);
+  ACE::unique_name ((const void *) &rw->waiting_writers_,
+                    name3,
+                    ACE_UNIQUE_NAME_LEN);
+  ACE::unique_name ((const void *) &rw->waiting_important_writer_,
+                    name4,
+                    ACE_UNIQUE_NAME_LEN);
 
   if (ACE_OS::mutex_init (&rw->lock_, type, name1, arg) == 0
       && ACE_OS::cond_init (&rw->waiting_readers_, type, name2, arg) == 0
@@ -5262,573 +4696,16 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
 }
 # endif /* ! ACE_HAS_THREADS || ACE_LACKS_RWLOCK_T */
 
-#if defined (ACE_LACKS_COND_T) && ! defined (ACE_PSOS_DIAB_MIPS)
-// NOTE: The ACE_OS::cond_* functions for some non-Unix platforms are
-// defined here either because they're too big to be inlined, or
-// to avoid use before definition if they were inline.
-
-int
-ACE_OS::cond_destroy (ACE_cond_t *cv)
-{
-  ACE_TRACE ("ACE_OS::cond_destroy");
-# if defined (ACE_HAS_THREADS)
-#   if defined (ACE_HAS_WTHREADS)
-  ACE_OS::event_destroy (&cv->waiters_done_);
-#   elif defined (VXWORKS) || defined (ACE_PSOS)
-  ACE_OS::sema_destroy (&cv->waiters_done_);
-#   endif /* VXWORKS */
-  ACE_OS::thread_mutex_destroy (&cv->waiters_lock_);
-  return ACE_OS::sema_destroy (&cv->sema_);
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
-{
-ACE_TRACE ("ACE_OS::cond_init");
-# if defined (ACE_HAS_THREADS)
-  cv->waiters_ = 0;
-  cv->was_broadcast_ = 0;
-
-  int result = 0;
-  if (ACE_OS::sema_init (&cv->sema_, 0, type, name, arg) == -1)
-    result = -1;
-  else if (ACE_OS::thread_mutex_init (&cv->waiters_lock_) == -1)
-    result = -1;
-#   if defined (VXWORKS) || defined (ACE_PSOS)
-  else if (ACE_OS::sema_init (&cv->waiters_done_, 0, type) == -1)
-#   else
-  else if (ACE_OS::event_init (&cv->waiters_done_) == -1)
-#   endif /* VXWORKS */
-    result = -1;
-  return result;
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_UNUSED_ARG (type);
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (arg);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_signal (ACE_cond_t *cv)
-{
-ACE_TRACE ("ACE_OS::cond_signal");
-# if defined (ACE_HAS_THREADS)
-  // If there aren't any waiters, then this is a no-op.  Note that
-  // this function *must* be called with the <external_mutex> held
-  // since other wise there is a race condition that can lead to the
-  // lost wakeup bug...  This is needed to ensure that the <waiters_>
-  // value is not in an inconsistent internal state while being
-  // updated by another thread.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  int have_waiters = cv->waiters_ > 0;
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  if (have_waiters != 0)
-    return ACE_OS::sema_post (&cv->sema_);
-  else
-    return 0; // No-op
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_broadcast (ACE_cond_t *cv)
-{
-ACE_TRACE ("ACE_OS::cond_broadcast");
-# if defined (ACE_HAS_THREADS)
-  // The <external_mutex> must be locked before this call is made.
-
-  // This is needed to ensure that <waiters_> and <was_broadcast_> are
-  // consistent relative to each other.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  int have_waiters = 0;
-
-  if (cv->waiters_ > 0)
-    {
-      // We are broadcasting, even if there is just one waiter...
-      // Record the fact that we are broadcasting.  This helps the
-      // cond_wait() method know how to optimize itself.  Be sure to
-      // set this with the <waiters_lock_> held.
-      cv->was_broadcast_ = 1;
-      have_waiters = 1;
-    }
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-  int result = 0;
-  if (have_waiters)
-    {
-      // Wake up all the waiters.
-      if (ACE_OS::sema_post (&cv->sema_, cv->waiters_) == -1)
-        result = -1;
-      // Wait for all the awakened threads to acquire their part of
-      // the counting semaphore.
-#   if defined (VXWORKS) || defined (ACE_PSOS)
-      else if (ACE_OS::sema_wait (&cv->waiters_done_) == -1)
-#   else
-      else if (ACE_OS::event_wait (&cv->waiters_done_) == -1)
-#   endif /* VXWORKS */
-        result = -1;
-      // This is okay, even without the <waiters_lock_> held because
-      // no other waiter threads can wake up to access it.
-      cv->was_broadcast_ = 0;
-    }
-  return result;
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_wait (ACE_cond_t *cv,
-                   ACE_mutex_t *external_mutex)
-{
-  ACE_TRACE ("ACE_OS::cond_wait");
-# if defined (ACE_HAS_THREADS)
-  // Prevent race conditions on the <waiters_> count.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  cv->waiters_++;
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  int result = 0;
-
-#   if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
-  if (external_mutex->type_ == USYNC_PROCESS)
-    // This call will automatically release the mutex and wait on the semaphore.
-    ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_,
-                                                            cv->sema_, INFINITE, FALSE),
-                                     result),
-                   int, -1, result);
-  else
-#   endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
-    {
-      // We keep the lock held just long enough to increment the count of
-      // waiters by one.  Note that we can't keep it held across the call
-      // to ACE_OS::sema_wait() since that will deadlock other calls to
-      // ACE_OS::cond_signal().
-      if (ACE_OS::mutex_unlock (external_mutex) != 0)
-        return -1;
-
-      // Wait to be awakened by a ACE_OS::cond_signal() or
-      // ACE_OS::cond_broadcast().
-      result = ACE_OS::sema_wait (&cv->sema_);
-    }
-
-  // Reacquire lock to avoid race conditions on the <waiters_> count.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-
-  // We're ready to return, so there's one less waiter.
-  cv->waiters_--;
-
-  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
-
-  // Release the lock so that other collaborating threads can make
-  // progress.
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  if (result == -1)
-    // Bad things happened, so let's just return below.
-    /* NOOP */;
-#   if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
-  else if (external_mutex->type_ == USYNC_PROCESS)
-    {
-      if (last_waiter)
-
-        // This call atomically signals the <waiters_done_> event and
-        // waits until it can acquire the mutex.  This is important to
-        // prevent unfairness.
-        ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (cv->waiters_done_,
-                                                                external_mutex->proc_mutex_,
-                                                                INFINITE, FALSE),
-                                         result),
-                       int, -1, result);
-      else
-        // We must always regain the <external_mutex>, even when
-        // errors occur because that's the guarantee that we give to
-        // our callers.
-        ACE_OS::mutex_lock (external_mutex);
-
-      return result;
-      /* NOTREACHED */
-    }
-#   endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
-  // If we're the last waiter thread during this particular broadcast
-  // then let all the other threads proceed.
-  else if (last_waiter)
-#   if defined (VXWORKS) || defined (ACE_PSOS)
-    ACE_OS::sema_post (&cv->waiters_done_);
-#   else
-    ACE_OS::event_signal (&cv->waiters_done_);
-#   endif /* VXWORKS */
-
-  // We must always regain the <external_mutex>, even when errors
-  // occur because that's the guarantee that we give to our callers.
-  ACE_OS::mutex_lock (external_mutex);
-
-  return result;
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_UNUSED_ARG (external_mutex);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_timedwait (ACE_cond_t *cv,
-                        ACE_mutex_t *external_mutex,
-                        ACE_Time_Value *timeout)
-{
-  ACE_TRACE ("ACE_OS::cond_timedwait");
-# if defined (ACE_HAS_THREADS)
-  // Handle the easy case first.
-  if (timeout == 0)
-    return ACE_OS::cond_wait (cv, external_mutex);
-#   if defined (ACE_HAS_WTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
-
-  // Prevent race conditions on the <waiters_> count.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  cv->waiters_++;
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  int result = 0;
-  int error = 0;
-  int msec_timeout;
-
-  if (timeout->sec () == 0 && timeout->usec () == 0)
-    msec_timeout = 0; // Do a "poll."
-  else
-    {
-      // Note that we must convert between absolute time (which is
-      // passed as a parameter) and relative time (which is what
-      // WaitForSingleObjects() expects).
-      ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ());
-
-      // Watchout for situations where a context switch has caused the
-      // current time to be > the timeout.
-      if (relative_time < ACE_Time_Value::zero)
-        msec_timeout = 0;
-      else
-        msec_timeout = relative_time.msec ();
-    }
-
-#     if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
-  if (external_mutex->type_ == USYNC_PROCESS)
-    // This call will automatically release the mutex and wait on the
-    // semaphore.
-    result = ::SignalObjectAndWait (external_mutex->proc_mutex_,
-                                    cv->sema_,
-                                    msec_timeout,
-                                    FALSE);
-  else
-#     endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
-    {
-      // We keep the lock held just long enough to increment the count
-      // of waiters by one.  Note that we can't keep it held across
-      // the call to WaitForSingleObject since that will deadlock
-      // other calls to ACE_OS::cond_signal().
-      if (ACE_OS::mutex_unlock (external_mutex) != 0)
-        return -1;
-
-      // Wait to be awakened by a ACE_OS::signal() or
-      // ACE_OS::broadcast().
-#     if defined (ACE_WIN32)
-#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
-      result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#       else /* ACE_USES_WINCE_SEMA_SIMULATION */
-      // Can't use Win32 API on our simulated semaphores.
-      result = ACE_OS::sema_wait (&cv->sema_,
-                                  ACE_Time_Value (0, msec_timeout * 1000));
-#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
-#     elif defined (ACE_PSOS)
-      // Inline the call to ACE_OS::sema_wait () because it takes an
-      // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
-      u_long ticks = (KC_TICKS2SEC * msec_timeout) / ACE_ONE_SECOND_IN_MSECS;
-      result = ::sm_p (cv->sema_.sema_, SM_WAIT, ticks);
-#     elif defined (VXWORKS)
-      // Inline the call to ACE_OS::sema_wait () because it takes an
-      // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
-      int ticks_per_sec = ::sysClkRateGet ();
-      int ticks = msec_timeout * ticks_per_sec / ACE_ONE_SECOND_IN_MSECS;
-      result = ::semTake (cv->sema_.sema_, ticks);
-#     endif /* ACE_WIN32 || VXWORKS */
-    }
-
-  // Reacquire lock to avoid race conditions.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  cv->waiters_--;
-
-  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
-
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-#     if defined (ACE_WIN32)
-  if (result != WAIT_OBJECT_0)
-    {
-      switch (result)
-        {
-        case WAIT_TIMEOUT:
-          error = ETIME;
-          break;
-        default:
-          error = ::GetLastError ();
-          break;
-        }
-      result = -1;
-    }
-#     elif defined (ACE_PSOS)
-  if (result != 0)
-    {
-      switch (result)
-        {
-        case ERR_TIMEOUT:
-          error = ETIME;
-          break;
-        default:
-          error = errno;
-          break;
-        }
-      result = -1;
-    }
-#     elif defined (VXWORKS)
-  if (result == ERROR)
-    {
-      switch (errno)
-        {
-        case S_objLib_OBJ_TIMEOUT:
-          error = ETIME;
-          break;
-        default:
-          error = errno;
-          break;
-        }
-      result = -1;
-    }
-#     endif /* ACE_WIN32 || VXWORKS */
-#     if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
-  if (external_mutex->type_ == USYNC_PROCESS)
-    {
-      if (last_waiter)
-        // This call atomically signals the <waiters_done_> event and
-        // waits until it can acquire the mutex.  This is important to
-        // prevent unfairness.
-        ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (cv->waiters_done_,
-                                                                external_mutex->proc_mutex_,
-                                                                INFINITE, FALSE),
-                                         result),
-                       int, -1, result);
-      else
-        // We must always regain the <external_Mutex>, even when
-        // errors occur because that's the guarantee that we give to
-        // our callers.
-        ACE_OS::mutex_lock (external_mutex);
-
-      return result;
-      /* NOTREACHED */
-    }
-#     endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
-  // Note that this *must* be an "if" statement rather than an "else
-  // if" statement since the caller may have timed out and hence the
-  // result would have been -1 above.
-  if (last_waiter)
-    // Release the signaler/broadcaster if we're the last waiter.
-#     if defined (ACE_WIN32)
-    ACE_OS::event_signal (&cv->waiters_done_);
-#     else
-    ACE_OS::sema_post (&cv->waiters_done_);
-#     endif /* ACE_WIN32 */
-
-  // We must always regain the <external_mutex>, even when errors
-  // occur because that's the guarantee that we give to our callers.
-  ACE_OS::mutex_lock (external_mutex);
-
-  errno = error;
-  return result;
-#   endif /* ACE_HAS_WTHREADS || ACE_HAS_VXWORKS || ACE_PSOS */
-# else
-  ACE_UNUSED_ARG (cv);
-  ACE_UNUSED_ARG (external_mutex);
-  ACE_UNUSED_ARG (timeout);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_THREADS */
-}
-
-# if defined (ACE_HAS_WTHREADS)
-int
-ACE_OS::cond_timedwait (ACE_cond_t *cv,
-                        ACE_thread_mutex_t *external_mutex,
-                        ACE_Time_Value *timeout)
-{
-  ACE_TRACE ("ACE_OS::cond_timedwait");
-#   if defined (ACE_HAS_THREADS)
-  // Handle the easy case first.
-  if (timeout == 0)
-    return ACE_OS::cond_wait (cv, external_mutex);
-
-  // Prevent race conditions on the <waiters_> count.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  cv->waiters_++;
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  int result = 0;
-  int error = 0;
-  int msec_timeout;
-
-  if (timeout->sec () == 0 && timeout->usec () == 0)
-    msec_timeout = 0; // Do a "poll."
-  else
-    {
-      // Note that we must convert between absolute time (which is
-      // passed as a parameter) and relative time (which is what
-      // WaitForSingleObjects() expects).
-      ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ());
-
-      // Watchout for situations where a context switch has caused the
-      // current time to be > the timeout.
-      if (relative_time < ACE_Time_Value::zero)
-        msec_timeout = 0;
-      else
-        msec_timeout = relative_time.msec ();
-    }
-
-  // We keep the lock held just long enough to increment the count of
-  // waiters by one.  Note that we can't keep it held across the call
-  // to WaitForSingleObject since that will deadlock other calls to
-  // ACE_OS::cond_signal().
-  if (ACE_OS::thread_mutex_unlock (external_mutex) != 0)
-    return -1;
-
-  // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast().
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  result = ::WaitForSingleObject (cv->sema_, msec_timeout);
-#     else
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_,
-                              ACE_Time_Value (0, msec_timeout * 1000));
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
-
-  // Reacquire lock to avoid race conditions.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-
-  cv->waiters_--;
-
-  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
-
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  if (result != WAIT_OBJECT_0)
-    {
-      switch (result)
-        {
-        case WAIT_TIMEOUT:
-          error = ETIME;
-          break;
-        default:
-          error = ::GetLastError ();
-          break;
-        }
-      result = -1;
-    }
-
-  if (last_waiter)
-    // Release the signaler/broadcaster if we're the last waiter.
-    ACE_OS::event_signal (&cv->waiters_done_);
-
-  // We must always regain the <external_mutex>, even when errors
-  // occur because that's the guarantee that we give to our callers.
-  ACE_OS::thread_mutex_lock (external_mutex);
-  errno = error;
-  return result;
-#   else
-  ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_THREADS */
-}
-
-int
-ACE_OS::cond_wait (ACE_cond_t *cv,
-                   ACE_thread_mutex_t *external_mutex)
-{
-  ACE_TRACE ("ACE_OS::cond_wait");
-#   if defined (ACE_HAS_THREADS)
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-  cv->waiters_++;
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  int result = 0;
-  int error = 0;
-
-  // We keep the lock held just long enough to increment the count of
-  // waiters by one.  Note that we can't keep it held across the call
-  // to ACE_OS::sema_wait() since that will deadlock other calls to
-  // ACE_OS::cond_signal().
-  if (ACE_OS::thread_mutex_unlock (external_mutex) != 0)
-    return -1;
-
-  // Wait to be awakened by a ACE_OS::cond_signal() or
-  // ACE_OS::cond_broadcast().
-#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
-  result = ::WaitForSingleObject (cv->sema_, INFINITE);
-#     else
-  // Can't use Win32 API on simulated semaphores.
-  result = ACE_OS::sema_wait (&cv->sema_);
-#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
-
-  // Reacquire lock to avoid race conditions.
-  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
-
-  cv->waiters_--;
-
-  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
-
-  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
-
-  if (result != WAIT_OBJECT_0)
-    {
-      switch (result)
-        {
-        case WAIT_TIMEOUT:
-          error = ETIME;
-          break;
-        default:
-          error = ::GetLastError ();
-          break;
-        }
-    }
-  else if (last_waiter)
-    // Release the signaler/broadcaster if we're the last waiter.
-    ACE_OS::event_signal (&cv->waiters_done_);
-
-  // We must always regain the <external_mutex>, even when errors
-  // occur because that's the guarantee that we give to our callers.
-  ACE_OS::thread_mutex_lock (external_mutex);
-
-  // Reset errno in case mutex_lock() also fails...
-  errno = error;
-  return result;
-#   else
-  ACE_NOTSUP_RETURN (-1);
-#   endif /* ACE_HAS_THREADS */
-}
-# endif /* ACE_HAS_WTHREADS */
-#endif /* ACE_LACKS_COND_T */
-
 void
 ACE_OS::exit (int status)
 {
-  ACE_TRACE ("ACE_OS::exit");
+  // ACE_TRACE ("ACE_OS::exit");
 
 #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
-  // Shut down the ACE_Object_Manager, if it had registered its exit_hook.
-  // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
+  // Shut down the ACE_Object_Manager.  With
+  // ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
   // instantiated on the main's stack.  ::exit () doesn't destroy it.
-  if (exit_hook_)
-    (*exit_hook_) ();
+  ACE_Object_Manager::fini ();
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 #if !defined (ACE_HAS_WINCE)
@@ -6021,7 +4898,7 @@ ACE_PSOS_Time_t::init_simulator_time (void)
 // Static member function to initialize system time, using UNIX calls.
 
 #   endif /* ACE_PSOSIM */
-# endif /* ACE_PSOS && ! ACE_PSOS_DIAB_MIPS */
+# endif /* ACE_PSOS */
 
 # if defined (__DGUX) && defined (ACE_HAS_THREADS) && defined (_POSIX4A_DRAFT10_SOURCE)
 extern "C" int __d6_sigwait (sigset_t *set);
@@ -6118,342 +4995,6 @@ ace_sysconf_dump (void)
 }
 # endif /* CHORUS */
 
-ACE_OS_WString::ACE_OS_WString (const ACE_USHORT16 *s)
-  : rep_ (0)
-{
-  size_t len = ACE_OS::strlen (s);
-  ACE_NEW (this->rep_,
-           char[len+1]);
-
-  for (size_t i = 0; i < len; i++)
-    {
-      ACE_USHORT16 *t = ACE_const_cast (ACE_USHORT16 *, s);
-      this->rep_[i] = ACE_static_cast (char, *(t + i));
-    }
-
-  this->rep_[len] = '\0';
-  return;
-}
-
-ACE_OS_CString::ACE_OS_CString (const char *s)
-  : rep_ (0)
-{
-  size_t len = ACE_OS::strlen (s);
-  ACE_NEW (this->rep_,
-           ACE_USHORT16[len+1]);
-
-  for (size_t i = 0; i < len; i++)
-    this->rep_[i] = s[i];
-
-  this->rep_[len] = '\0';
-  return;
-}
-
-# define ACE_OS_PREALLOCATE_OBJECT(TYPE, ID)\
-    {\
-      TYPE *obj_p = 0;\
-      ACE_NEW_RETURN (obj_p, TYPE, -1);\
-      preallocated_object[ID] = (void *) obj_p;\
-    }
-# define ACE_OS_DELETE_PREALLOCATED_OBJECT(TYPE, ID)\
-    delete (TYPE *) preallocated_object[ID];\
-    preallocated_object[ID] = 0;
-
-ACE_Object_Manager_Base::ACE_Object_Manager_Base (void)
-  : object_manager_state_ (OBJ_MAN_UNINITIALIZED)
-  , dynamically_allocated_ (0)
-  , next_ (0)
-{
-}
-
-ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void)
-{
-#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
-  // Clear the flag so that fini () doesn't delete again.
-  dynamically_allocated_ = 0;
-#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
-}
-
-int
-ACE_Object_Manager_Base::starting_up_i ()
-{
-  return object_manager_state_ < OBJ_MAN_INITIALIZED;
-}
-
-int
-ACE_Object_Manager_Base::shutting_down_i ()
-{
-  return object_manager_state_ > OBJ_MAN_INITIALIZED;
-}
-
-extern "C"
-void
-ACE_OS_Object_Manager_Internal_Exit_Hook ()
-{
-  if (ACE_OS_Object_Manager::instance_)
-    ACE_OS_Object_Manager::instance ()->fini ();
-}
-
-ACE_OS_Object_Manager *ACE_OS_Object_Manager::instance_ = 0;
-
-void *ACE_OS_Object_Manager::preallocated_object[
-  ACE_OS_Object_Manager::ACE_OS_PREALLOCATED_OBJECTS] = { 0 };
-
-ACE_OS_Object_Manager::ACE_OS_Object_Manager ()
-{
-  // If instance_ was not 0, then another ACE_OS_Object_Manager has
-  // already been instantiated (it is likely to be one initialized by way
-  // of library/DLL loading).  Let this one go through construction in
-  // case there really is a good reason for it (like, ACE is a static/archive
-  // library, and this one is the non-static instance (with
-  // ACE_HAS_NONSTATIC_OBJECT_MANAGER, or the user has a good reason for
-  // creating a separate one) but the original one will be the one retrieved
-  // from calls to ACE_Object_Manager::instance().
-
-  // Be sure that no further instances are created via instance ().
-  if (instance_ == 0)
-    instance_ = this;
-
-  init ();
-}
-
-ACE_OS_Object_Manager::~ACE_OS_Object_Manager ()
-{
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
-  fini ();
-}
-
-ACE_OS_Object_Manager *
-ACE_OS_Object_Manager::instance (void)
-{
-  // This function should be called during construction of static
-  // instances, or before any other threads have been created in
-  // the process.  So, it's not thread safe.
-
-  if (instance_ == 0)
-    {
-      ACE_OS_Object_Manager *instance_pointer;
-
-      ACE_NEW_RETURN (instance_pointer, ACE_OS_Object_Manager, 0);
-      ACE_ASSERT (instance_pointer == instance_);
-
-      instance_pointer->dynamically_allocated_ = 1;
-
-    }
-
-  return instance_;
-}
-
-int
-ACE_OS_Object_Manager::init (void)
-{
-  if (starting_up_i ())
-    {
-      // First, indicate that this ACE_OS_Object_Manager instance is being
-      // initialized.
-      object_manager_state_ = OBJ_MAN_INITIALIZING;
-
-      if (this == instance_)
-        {
-# 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_ERROR ((LM_ERROR,
-                        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_ERROR ((LM_ERROR,
-                        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_ERROR ((LM_ERROR,
-                        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).
-          ACE_OS::socket_init (ACE_WSOCK_VERSION);
-
-          // Register the exit hook, for use by ACE_OS::exit ().
-          ACE_OS::set_exit_hook (ACE_OS_Object_Manager_Internal_Exit_Hook);
-        }
-
-      // Finally, indicate that the ACE_OS_Object_Manager instance has
-      // been initialized.
-      object_manager_state_ = OBJ_MAN_INITIALIZED;
-
-      return 0;
-    } else {
-      // Had already initialized.
-      return -1;
-    }
-}
-
-// Clean up an ACE_OS_Object_Manager.  There can be instances of this object
-// other than The Instance.  This can happen if a user creates one for some
-// reason.  All objects clean up their per-object information and managed
-// objects, but only The Instance cleans up the static preallocated objects.
-int
-ACE_OS_Object_Manager::fini (void)
-{
-  if (instance_ == 0  ||  shutting_down_i ())
-    // Too late.  Or, maybe too early.  Either fini () has already
-    // been called, or init () was never called.
-    return -1;
-
-  // No mutex here.  Only the main thread should destroy the singleton
-  // ACE_OS_Object_Manager instance.
-
-  // Indicate that the ACE_OS_Object_Manager instance is being shut
-  // down.  This object manager should be the last one to be shut
-  // down.
-  object_manager_state_ = OBJ_MAN_SHUTTING_DOWN;
-
-  // If another Object_Manager has registered for termination, do it.
-  if (next_)
-    {
-      next_->fini ();
-      next_ = 0;  // Protect against recursive calls.
-    }
-
-  // Only clean up preallocated objects when the singleton Instance is being
-  // destroyed.
-  if (this == instance_)
-    {
-      // Close down Winsock (no-op on other platforms).
-      ACE_OS::socket_fini ();
-
-#if ! defined (ACE_HAS_STATIC_PREALLOCATION)
-      // Cleanup the dynamically preallocated objects.
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-#   if !defined (__Lynx__)
-      // LynxOS 3.0.0 has problems with this after fork.
-      if (ACE_OS::thread_mutex_destroy (ACE_reinterpret_cast (
-        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 (1)")));
-#   endif /* ! __Lynx__ */
-      ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_thread_mutex_t,
-                                         ACE_OS_MONITOR_LOCK)
-#   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_CLEANUP_LOCK])) != 0)
-          ACE_ERROR ((LM_ERROR,
-                      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) && \
-       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 (3)")));
-#   endif /* ! __Lynx__ */
-      ACE_OS_DELETE_PREALLOCATED_OBJECT (ACE_recursive_thread_mutex_t,
-                                         ACE_TSS_BASE_LOCK)
-#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
-# endif /* ACE_MT_SAFE */
-#endif /* ! ACE_HAS_STATIC_PREALLOCATION */
-    }
-
-  // Indicate that this ACE_OS_Object_Manager instance has been shut down.
-  object_manager_state_ = OBJ_MAN_SHUT_DOWN;
-
-  if (dynamically_allocated_)
-    {
-      delete this;
-    }
-
-  if (this == instance_)
-    instance_ = 0;
-
-  return 0;
-}
-
-int
-ACE_OS_Object_Manager::starting_up (void)
-{
-  return ACE_OS_Object_Manager::instance_  ?
-    instance_->starting_up_i ()  :  1;
-}
-
-int
-ACE_OS_Object_Manager::shutting_down (void)
-{
-  return ACE_OS_Object_Manager::instance_  ?
-    instance_->shutting_down_i ()  :  1;
-}
-
-#if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
-class ACE_Export ACE_OS_Object_Manager_Manager
-  // = TITLE
-  //    Ensure that the <ACE_OS_Object_Manager> gets initialized at
-  //    program startup, and destroyed at program termination.
-  //
-  // = DESCRIPTION
-  //    Without ACE_HAS_NONSTATIC_OBJECT_MANAGER, a static instance of this
-  //    class is created.  Therefore, it gets created before main ()
-  //    is called.  And it gets destroyed after main () returns.
-{
-public:
-  ACE_OS_Object_Manager_Manager (void);
-  ~ACE_OS_Object_Manager_Manager (void);
-
-private:
-  ACE_thread_t saved_main_thread_id_;
-  // Save the main thread ID, so that destruction can be suppressed.
-};
-
-ACE_OS_Object_Manager_Manager::ACE_OS_Object_Manager_Manager (void)
-  : saved_main_thread_id_ (ACE_OS::thr_self ())
-{
-  // Ensure that the Object_Manager gets initialized before any
-  // application threads have been spawned.  Because this will be called
-  // during construction of static objects, that should always be the
-  // case.
-  (void) ACE_OS_Object_Manager::instance ();
-}
-
-ACE_OS_Object_Manager_Manager::~ACE_OS_Object_Manager_Manager (void)
-{
-  if (ACE_OS::thr_equal (ACE_OS::thr_self (),
-                         saved_main_thread_id_))
-    {
-      delete ACE_OS_Object_Manager::instance_;
-      ACE_OS_Object_Manager::instance_ = 0;
-    }
-  // else if this destructor is not called by the main thread, then do
-  // not delete the ACE_OS_Object_Manager.  That causes problems, on
-  // WIN32 at least.
-}
-
-static ACE_OS_Object_Manager_Manager ACE_OS_Object_Manager_Manager_instance;
-#endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
-
 # if defined (ACE_HAS_WINCE)
 ACE_CE_Bridge *ACE_CE_Bridge::default_text_bridge_ = 0;
 
@@ -6464,24 +5005,7 @@ ACE_CE_Bridge::ACE_CE_Bridge (void)
 {
 }
 
-#  if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
 ACE_CE_Bridge::ACE_CE_Bridge (CWnd *w, int n, int i)
-  : text_output_ (w->m_hWnd),
-    notification_ (n),
-    idc_ (i)
-{
-}
-
-void
-ACE_CE_Bridge::set_window (CWnd *w, int n, int i)
-{
-  this->text_output_ = w->m_hWnd;
-  this->notification_ = n;
-  this->idc_ = i;
-}
-#   endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */
-
-ACE_CE_Bridge::ACE_CE_Bridge (HWND w, int n, int i)
   : text_output_ (w),
     notification_ (n),
     idc_ (i)
@@ -6489,7 +5013,7 @@ ACE_CE_Bridge::ACE_CE_Bridge (HWND w, int n, int i)
 }
 
 void
-ACE_CE_Bridge::set_window (HWND w, int n, int i)
+ACE_CE_Bridge::set_window (CWnd *w, int n, int i)
 {
   this->text_output_ = w;
   this->notification_ = n;
@@ -6520,7 +5044,7 @@ ACE_CE_Bridge::idc (void)
   return this->idc_;
 }
 
-HWND
+CWnd *
 ACE_CE_Bridge::window (void)
 {
   return this->text_output_;
@@ -6535,26 +5059,18 @@ ACE_CE_Bridge::get_default_winbridge (void)
 int
 ACE_CE_Bridge::write_msg (LPCTSTR str)
 {
-  LPTSTR s = ACE_OS::strdup (str);
-  return PostMessage (this->text_output_,
-                      WM_COMMAND,
-                      MAKEWORD (this->idc_,
-                                this->notification_),
-                      (long)((void *) s));
+  return this->write_msg (new CString (str));
 }
 
-#if 0
 int
 ACE_CE_Bridge::write_msg (CString *s)
 {
   // Don't ask!
-  return PostMessage (this->text_output_,
-                      WM_COMMAND,
-                      MAKEWORD (this->idc_,
-                                this->notification_),
-                      (long)((void *) s));
+  return this->text_output_->PostMessage (WM_COMMAND,
+                                          MAKEWORD (this->idc_,
+                                                    this->notification_),
+                                          (long)((void *) s));
 }
-#endif /* 0 */
 
 //          **** Warning ****
 // You should not use the following function under CE at all.  This
@@ -6566,11 +5082,10 @@ void
 exit (int status)
 {
 #if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
-  // Shut down the ACE_Object_Manager, if it had registered its exit_hook.
-  // With ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
+  // Shut down the ACE_Object_Manager.  With
+  // ACE_HAS_NONSTATIC_OBJECT_MANAGER, the ACE_Object_Manager is
   // instantiated on the main's stack.  ::exit () doesn't destroy it.
-  if (exit_hook_)
-    (*exit_hook_) ();
+  ACE_Object_Manager::fini ();
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
   ACE_OS::exit (status);
diff --git a/ace/OS.h b/ace/OS.h
index df4539cee6e..c4601c77b0a 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -18,7 +18,6 @@
 #ifndef ACE_OS_H
 # define ACE_OS_H
 
-
 // This file should be a link to the platform/compiler-specific
 // configuration file (e.g., config-sunos5-sunc++-4.x.h).
 # include "ace/inc_user_config.h"
@@ -84,14 +83,14 @@
 #   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))
-#   define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)              ((TYPE<T1, T2, T3> *) (EXPR))
-#   define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)          ((TYPE<T1, T2, T3, T4> *) (EXPR))
-#   define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)      ((TYPE<T1, T2, T3, T4, T5> *) (EXPR))
+#   define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR)              ((TYPE<T1, T2, T3> *) (EXPR)) 
+#   define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR)          ((TYPE<T1, T2, T3, T4> *) (EXPR)) 
+#   define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR)      ((TYPE<T1, T2, T3, T4, T5> *) (EXPR)) 
 #   define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR)                      ((TYPE<T1> &) (EXPR))
 #   define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR)                  ((TYPE<T1, T2> &) (EXPR))
-#   define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)              ((TYPE<T1, T2, T3> &) (EXPR))
-#   define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)          ((TYPE<T1, T2, T3, T4> &) (EXPR))
-#   define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)      ((TYPE<T1, T2, T3, T4, T5> &) (EXPR))
+#   define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR)              ((TYPE<T1, T2, T3> &) (EXPR)) 
+#   define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR)          ((TYPE<T1, T2, T3, T4> &) (EXPR)) 
+#   define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR)      ((TYPE<T1, T2, T3, T4, T5> &) (EXPR)) 
 # endif /* ACE_HAS_ANSI_CASTS */
 
 # if !defined (ACE_CAST_CONST)
@@ -118,6 +117,11 @@
 #   define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME
 # endif /* ! ACE_HAS_BROKEN_NAMESPACES */
 
+// Define some helpful macros.
+# define ACE_ONE_SECOND_IN_MSECS 1000L
+# define ACE_ONE_SECOND_IN_USECS 1000000L
+# define ACE_ONE_SECOND_IN_NSECS 1000000000L
+
 # if defined (ACE_NO_INLINE)
   // ACE inlining has been explicitly disabled.  Implement
   // internally within ACE by undefining __ACE_INLINE__.
@@ -153,10 +157,6 @@
 #   define ACE_DEFAULT_TIMEOUT 5
 # endif /* ACE_DEFAULT_TIMEOUT */
 
-# if !defined (ACE_DEFAULT_BACKLOG)
-#   define ACE_DEFAULT_BACKLOG 5
-# endif /* ACE_DEFAULT_BACKLOG */
-
 # if !defined (ACE_DEFAULT_THREADS)
 #   define ACE_DEFAULT_THREADS 1
 # endif /* ACE_DEFAULT_THREADS */
@@ -550,7 +550,7 @@ private:
 # define ACE_MIN(x,y) (((x)<(y))?(x):(y))
 
 // Keep the compiler from complaining about parameters which are not used.
-# if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (DEC_CXX) || defined (__KCC) || defined (__rational__) || (__USLC__)
+# if defined (ghs) || defined (__GNUC__) || defined (__hpux) || defined (__sgi) || defined (DEC_CXX) || defined (__KCC) || defined (__rational__)
 // Some compilers complain about "statement with no effect" with (a).
 // This eliminates the warnings, and no code is generated for the null
 // conditional statement.  NOTE: that may only be true if -O is enabled,
@@ -560,14 +560,14 @@ private:
 #   define ACE_UNUSED_ARG(a) (a)
 # endif /* ghs */
 
-# if defined (__sgi) || defined (ghs) || defined (DEC_CXX) || defined(__BORLANDC__) || defined (__KCC)
+# if defined (__sgi) || defined (ghs) || defined (DEC_CXX) || defined(__BORLANDC__)
 #   define ACE_NOTREACHED(a)
-# else  /* ! defined . . . */
+# else
 #   define ACE_NOTREACHED(a) a
-# endif /* ! defined . . . */
+# endif /* defined (__sgi) || defined (ghs) || defined (DEC_CXX) || defined(__BORLANDC__) */
 
 # if defined (ACE_NEEDS_FUNC_DEFINITIONS)
-    // It just evaporated ;-)  Not pleasant.
+// It just evaporated ;-) Not pleasant.
 #   define ACE_UNIMPLEMENTED_FUNC(f)
 # else
 #   define ACE_UNIMPLEMENTED_FUNC(f) f;
@@ -668,18 +668,6 @@ typedef int key_t;
 #   endif /* ! defined (ACE_PSOS_PROVIDES_ERROR_SYMBOLS_TM) */
 #   define ERRMAX       151      /* Last error number                     */
 
-#   if ! defined (NSIG)
-#     define NSIG 32
-#   endif /* NSIG */
-
-#   if ! defined (TCP_NODELAY)
-#     define TCP_NODELAY  1
-#   endif /* TCP_NODELAY */
-
-#if defined (ACE_LACKS_ASSERT_MACRO)
- #define assert(expr)
-#endif
-
 #   if defined (ACE_PSOSIM)
 
 #     include /**/ <ace/sys_conf.h> /* system configuration file */
@@ -726,14 +714,7 @@ typedef int key_t;
       typedef unsigned int  uint_t;
       typedef unsigned long ulong_t;
       typedef char *caddr_t;
-
-#       if defined (ACE_PSOS_DIAB_PPC)
-      typedef unsigned long pid_t;
-#       else /* !defined (ACE_PSOS_DIAB_PPC) */
       typedef long pid_t;
-#       endif /* defined (ACE_PSOS_DIAB_PPC) */
-
-
 //      typedef unsigned char wchar_t;
 #     endif
 
@@ -743,14 +724,10 @@ typedef int key_t;
 #     include /**/ <pna.h>      /* pNA+ TCP/IP Network Manager calls */
 #     include /**/ <phile.h>     /* pHILE+ file system calls */
 //    #include /**/ <prepccfg.h>     /* pREPC+ file system calls */
-#     if defined (ACE_PSOS_DIAB_MIPS)
-#       if defined (ACE_PSOS_USES_DIAB_SYS_CALLS)
-#         include /**/ <unistd.h>    /* Diab Data supplied file system calls */
-#       else
-#         include /**/ <prepc.h>
-#       endif /* ACE_PSOS_USES_DIAB_SYS_CALLS */
-#       include /**/ <sys/wait.h>    /* Diab Data supplied header file */
-#     endif /* ACE_PSOS_DIAB_MIPS */
+
+// These are colliding with the pSOS libraries
+// # include /**/ <unistd.h>    /* Diab Data supplied file system calls */
+// # include /**/ <sys/wait.h>    /* Diab Data supplied header file */
 
 // This collides with phile.h
 //    #include /**/ <sys/stat.h>    /* Diab Data supplied header file */
@@ -790,10 +767,7 @@ typedef u_long ACE_id_t;
 typedef u_long ACE_pri_t;
 
 // pHILE+ calls the DIR struct XDIR instead
-#    if !defined (ACE_PSOS_DIAB_PPC)
 typedef XDIR DIR;
-#    endif /* !defined (ACE_PSOS_DIAB_PPC) */
-
 
 // Use pSOS semaphores, wrapped . . .
 typedef struct
@@ -836,10 +810,6 @@ typedef struct
 #   define ACE_DIRECTORY_SEPARATOR_STR_A "/"
 #   define ACE_DIRECTORY_SEPARATOR_CHAR_A '/'
 
-// Define the name of the environment variable that defines the temp
-// directory.
-#   define ACE_DEFAULT_TEMP_DIR_ENV "TMP"
-
 #   define ACE_DLL_SUFFIX ".so"
 #   define ACE_DLL_PREFIX "lib"
 #   define ACE_LD_SEARCH_PATH "LD_LIBRARY_PATH"
@@ -994,19 +964,13 @@ struct ACE_OVERLAPPED
   ACE_HANDLE hEvent;
 };
 
-#   if !defined (USER_INCLUDE_SYS_TIME_TM)
-#     if defined (ACE_PSOS_DIAB_PPC)
-typedef struct timespec timespec_t;
-#     else /* ! defined (ACE_PSOS_DIAB_PPC) */
+#   if !defined(USER_INCLUDE_SYS_TIME_TM)
 typedef struct timespec
 {
   time_t tv_sec; // Seconds
   long tv_nsec; // Nanoseconds
 } timespec_t;
-#     endif /* defined (ACE_PSOS_DIAB_PPC) */
-#   endif /*  !defined (USER_INCLUDE_SYS_TIME_TM) */
-
-#if defined (ACE_PSOS_HAS_TIME)
+#   endif
 
 // Use pSOS time, wrapped . . .
 class ACE_Export ACE_PSOS_Time_t
@@ -1069,7 +1033,6 @@ private:
   u_long ticks_;
   // ticks: number of system clock ticks (KC_TICKS2SEC-1 max)
 } ;
-#endif /* ACE_PSOS_HAS_TIME */
 
 # endif /* defined (ACE_PSOS) */
 
@@ -1118,9 +1081,12 @@ extern "C" pthread_t pthread_self (void);
 // overlap or are otherwise confused.  This is an attempt to start
 // straightening them out.
 # if defined (ACE_HAS_PTHREADS_STD)    /* POSIX.1c threads (pthreads) */
+  // POSIX.1c threads implies pthread_sigmask()
+#   if !defined (ACE_HAS_PTHREAD_SIGMASK)
+#     define ACE_HAS_PTHREAD_SIGMASK
+#   endif /* ! ACE_HAS_PTHREAD_SIGMASK */
   // ... and 2-parameter asctime_r and ctime_r
-#   if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && \
-       !defined (ACE_HAS_STHREADS)
+#   if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && !defined (ACE_HAS_STHREADS)
 #     define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #   endif
 # endif /* ACE_HAS_PTHREADS_STD */
@@ -1131,13 +1097,13 @@ extern "C" pthread_t pthread_self (void);
 #   define ACE_TRACE(X) ACE_Trace ____ (ASYS_TEXT (X), __LINE__, ASYS_TEXT (__FILE__))
 # endif /* ACE_NTRACE */
 
-# if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS_DIAB_MIPS)
-#     include /**/ <time.h>
+# if !defined (ACE_HAS_WINCE)
+#   include /**/ <time.h>
 #   if defined (__Lynx__)
 #     include /**/ <st.h>
 #     include /**/ <sem.h>
 #   endif /* __Lynx__ */
-# endif /* ACE_HAS_WINCE ACE_PSOS_DIAB_MIPS */
+# endif /* ACE_HAS_WINCE */
 
 # if defined (ACE_LACKS_SYSTIME_H)
 // Some platforms may need to include this, but I suspect that most
@@ -1203,11 +1169,7 @@ public:
   // Constant "0".
 
   static const ACE_Time_Value max_time;
-  // Constant for maximum time representable.  Note that this time
-  // is not intended for use with select () or other calls that may
-  // have *their own* implementation-specific maximum time representations.
-  // Its primary use is in time computations such as those used by the
-  // dynamic subpriority strategies in the ACE_Dynamic_Message_Queue class.
+  // Constant for maximum time representable.
 
   // = Initialization methods.
 
@@ -1369,7 +1331,8 @@ public:
   // Calls stop and then start.  max_wait_time_ is modified by the
   // call to stop.
 
-private:  ACE_Time_Value *max_wait_time_;
+private:
+  ACE_Time_Value *max_wait_time_;
   // Maximum time we were willing to wait.
 
   ACE_Time_Value start_time_;
@@ -1721,6 +1684,12 @@ typedef const struct rlimit ACE_SETRLIMIT_TYPE;
 # define ACE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \
   ACE_Guard<MUTEX> OBJ (LOCK); \
     if (OBJ.locked () == 0) return RETURN;
+# define ACE_GUARD_THROW(MUTEX,OBJ,LOCK,EXCEPTION) \
+  ACE_Guard<MUTEX> OBJ (LOCK); \
+    if (OBJ.locked () == 0) TAO_THROW (EXCEPTION);
+# define ACE_GUARD_THROW_RETURN(MUTEX,OBJ,LOCK,EXCEPTION,RETURN) \
+  ACE_Guard<MUTEX> OBJ (LOCK); \
+    if (OBJ.locked () == 0) TAO_THROW_RETURN (EXCEPTION, RETURN);
 # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \
   ACE_Write_Guard<MUTEX> OBJ (LOCK); \
     if (OBJ.locked () == 0) return;
@@ -1806,21 +1775,10 @@ struct stat
 
 # if defined (ACE_HAS_EXCEPTIONS)
 #   define ACE_THROW_SPEC(X) throw X
-#   if defined (ACE_WIN32)
-// @@ MSVC "supports" the keyword but doesn't implement it (Huh?).
-//    Therefore, we simply supress the warning for now.
-#     pragma warning( disable : 4290 )
-#   endif /* ACE_WIN32 */
 # else  /* ! ACE_HAS_EXCEPTIONS */
 #   define ACE_THROW_SPEC(X)
 # endif /* ! ACE_HAS_EXCEPTIONS */
 
-#if defined (ACE_HAS_PRIOCNTL)
-  // Need to #include these before #defining USYNC_PROCESS on SunOS 5.x.
-# include /**/ <sys/rtpriocntl.h>
-# include /**/ <sys/tspriocntl.h>
-#endif /* ACE_HAS_PRIOCNTL */
-
 # if defined (ACE_HAS_THREADS)
 
 #   if defined (ACE_HAS_STHREADS)
@@ -2162,6 +2120,31 @@ typedef u_int ACE_thread_key_t;
 /* #define T_NOFPU         0x00000000   Not using FPU */
 /* #define T_FPU           0x00000002   Using FPU bit */
 
+//// forward declaration of cond_t emulation class
+//class ACE_cond_t;
+//
+//// Wrapper for NT events on pSOS.
+//class ACE_Export ACE_event_t
+//{
+//  friend class ACE_OS;
+//protected:
+//  ACE_mutex_t lock_;
+//  // Protect critical section.
+//
+//  ACE_cond_t condition_;
+//// Keeps track of waiters.
+//
+//int manual_reset_;
+//// Specifies if this is an auto- or manual-reset event.
+//
+//int is_signaled_;
+//// "True" if signaled.
+//
+//u_long waiting_threads_;
+//// Number of waiting threads.
+//};
+
+
 #   elif defined (VXWORKS)
 // For mutex implementation using mutual-exclusion semaphores (which
 // can be taken recursively).
@@ -2193,8 +2176,7 @@ struct sockaddr_un {
 #     define VX_UNBREAKABLE        0x0002  /* breakpoints ignored */
 #     define VX_FP_TASK            0x0008  /* floating point coprocessor */
 #     define VX_PRIVATE_ENV        0x0080  /* private environment support */
-#     define VX_NO_STACK_FILL      0x0100  /* do not stack fill for
-                                              checkstack () */
+#     define VX_NO_STACK_FILL      0x0100  /* do not stack fill for checkstack () */
 
 #     define THR_CANCEL_DISABLE      0
 #     define THR_CANCEL_ENABLE       0
@@ -2210,8 +2192,8 @@ struct sockaddr_un {
 #     define THR_SCHED_RR            0
 #     define THR_SCHED_DEFAULT       0
 #     define USYNC_THREAD            0
-#     define USYNC_PROCESS           1 /* It's all global on VxWorks
-                                          (without MMU option). */
+#     define USYNC_PROCESS           1 /* it's all global on VxWorks (without MMU
+                                     option) */
 
 #     if !defined (ACE_DEFAULT_SYNCH_TYPE)
  // Types include these options: SEM_Q_PRIORITY, SEM_Q_FIFO,
@@ -2221,8 +2203,7 @@ struct sockaddr_un {
 #     endif /* ! ACE_DEFAULT_SYNCH_TYPE */
 
 typedef SEM_ID ACE_mutex_t;
-// Implement ACE_thread_mutex_t with ACE_mutex_t because there's just
-// one process . . .
+// implement ACE_thread_mutex_t with ACE_mutex_t sinces there's just one process . . .
 typedef ACE_mutex_t ACE_thread_mutex_t;
 #     if !defined (ACE_HAS_POSIX_SEM)
 // Use VxWorks semaphores, wrapped . . .
@@ -2394,11 +2375,9 @@ protected:
 typedef rwlock_t ACE_rwlock_t;
 #   endif /* ACE_LACKS_RWLOCK_T */
 
-// Define some default thread priorities on all threaded platforms, if
-// not defined above or in the individual platform config file.
-// ACE_THR_PRI_FIFO_DEF should be used by applications for default
-// real-time thread priority.  ACE_THR_PRI_OTHER_DEF should be used
-// for non-real-time priority.
+// #define ACE_THR_PRI_FIFO_DEF on all threaded platforms, if not defined
+// above or in the individual platform config file.  It should be used by
+// applications for a default real-time thread priority.
 #   if !defined(ACE_THR_PRI_FIFO_DEF)
 #     if defined (ACE_WTHREADS)
       // It would be more in spirit to use THREAD_PRIORITY_NORMAL.  But,
@@ -2411,47 +2390,6 @@ typedef rwlock_t ACE_rwlock_t;
 #     endif /* ! ACE_WTHREADS */
 #   endif /* ! ACE_THR_PRI_FIFO_DEF */
 
-#   if !defined(ACE_THR_PRI_OTHER_DEF)
-#     if defined (ACE_WTHREADS)
-      // It would be more in spirit to use THREAD_PRIORITY_NORMAL.  But,
-      // using THREAD_PRIORITY_ABOVE_NORMAL should give preference to the
-      // threads in this process, even if the process is not in the
-      // REALTIME_PRIORITY_CLASS.
-#       define ACE_THR_PRI_OTHER_DEF THREAD_PRIORITY_NORMAL
-#     else  /* ! ACE_WTHREADS */
-#       define ACE_THR_PRI_OTHER_DEF 0
-#     endif /* ! ACE_WTHREADS */
-#   endif /* ! ACE_THR_PRI_OTHER_DEF */
-
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-typedef ACE_thread_mutex_t ACE_recursive_thread_mutex_t;
-#else
-class ACE_recursive_thread_mutex_t
-{
-  // = TITLE
-  //     Implement a thin C++ wrapper that allows nested acquisition
-  //     and release of a mutex that occurs in the same thread.
-  //
-  // = DESCRIPTION
-  //     This implementation is based on an algorithm sketched by Dave
-  //     Butenhof <butenhof@zko.dec.com>.  Naturally, I take the
-  //     credit for any mistakes ;-)
-public:
-  ACE_thread_mutex_t nesting_mutex_;
-  // Guards the state of the nesting level and thread id.
-
-  ACE_cond_t lock_available_;
-  // This condition variable suspends other waiting threads until the
-  // mutex is available.
-
-  int nesting_level_;
-  // Current nesting level of the recursion.
-
-  ACE_thread_t owner_id_;
-  // Current owner of the lock.
-};
-#endif /* ACE_WIN32 */
-
 # else /* !ACE_HAS_THREADS, i.e., the OS/platform doesn't support threading. */
 
 // Give these things some reasonable value...
@@ -2474,17 +2412,12 @@ public:
 #   define THR_SCHED_FIFO          0
 #   define THR_SCHED_RR            0
 #   define THR_SCHED_DEFAULT       0
-#   if !defined (USYNC_THREAD)
-#     define USYNC_THREAD 0
-#   endif /* ! USYNC_THREAD */
-#   if !defined (USYNC_PROCESS)
-#     define USYNC_PROCESS 0
-#   endif /* ! USYNC_PROCESS */
+#   define USYNC_THREAD 0
+#   define USYNC_PROCESS 0
 // These are dummies needed for class OS.h
 typedef int ACE_cond_t;
 typedef int ACE_mutex_t;
 typedef int ACE_thread_mutex_t;
-typedef int ACE_recursive_thread_mutex_t;
 #   if !defined (ACE_HAS_POSIX_SEM) && !defined (ACE_PSOS)
 typedef int ACE_sema_t;
 #   endif /* !ACE_HAS_POSIX_SEM && !ACE_PSOS */
@@ -2538,30 +2471,16 @@ protected:
 #     define BUFSIZ LC_BUFSIZ
 #   endif /* defined (ACE_PSOS) */
 
-#if defined (ACE_PSOS_DIAB_MIPS)
-#undef size_t
-typedef unsigned int size_t;
-#endif
-
 #   include /**/ <new.h>
-
-#   if !defined (ACE_PSOS_DIAB_MIPS)
 #   include /**/ <signal.h>
-#   endif /* ACE_PSOS_DIAB_MIPS */
-
 #   include /**/ <errno.h>
-
-#   if ! defined (ACE_PSOS_DIAB_MIPS)
 #   include /**/ <fcntl.h>
-#   endif /* ! ACE_PSOS_DIAB_MIPS */
 # endif /* ACE_HAS_WINCE */
 
 # include /**/ <limits.h>
 # include /**/ <ctype.h>
-# if ! defined (ACE_PSOS_DIAB_MIPS)
 # include /**/ <string.h>
 # include /**/ <stdlib.h>
-# endif /* ! ACE_PSOS_DIAB_MIPS */
 # include /**/ <float.h>
 
 // This is defined by XOPEN to be a minimum of 16.  POSIX.1g
@@ -2600,9 +2519,9 @@ typedef unsigned int size_t;
 
 # endif /* ACE_PSOS_SNARFS_HEADER_INFO */
 
-# if defined (ACE_NEEDS_SCHED_H)
+# if defined (ACE_LACKS_SCHED_H)
 #   include /**/ <sched.h>
-# endif /* ACE_NEEDS_SCHED_H */
+# endif /* ACE_LACKS_SCHED_H */
 
 # if defined (ACE_HAS_WINCE)
 #   define islower iswlower
@@ -2621,9 +2540,7 @@ typedef unsigned int size_t;
 # endif /* ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
 
 # if !defined (ACE_HAS_WINCE)
-#   if ! defined (ACE_PSOS_DIAB_MIPS)
 #   include /**/ <fcntl.h>
-#   endif /* ! ACE_PSOS_DIAB_MIPS */
 # endif /* ACE_HAS_WINCE */
 
 // This must come after signal.h is #included.
@@ -2637,17 +2554,6 @@ typedef unsigned int size_t;
 # endif /* ACE_HAS_BYTESEX_H */
 # include "ace/Basic_Types.h"
 
-// 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
-
-// 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;
-
 # if defined (ACE_HAS_SIG_MACROS)
 #   undef sigemptyset
 #   undef sigfillset
@@ -2925,10 +2831,6 @@ typedef int (*ACE_SEH_EXCEPT_HANDLER)(void *);
 #   define ACE_DLL_SUFFIX ".dll"
 #   define ACE_DLL_PREFIX ""
 
-// Define the name of the environment variable that defines the temp
-// directory.
-#   define ACE_DEFAULT_TEMP_DIR_ENV "TEMP"
-
 // This will help until we figure out everything:
 #   define NFDBITS 32 /* only used in unused functions... */
 // These two may be used for internal flags soon:
@@ -3041,12 +2943,10 @@ typedef OVERLAPPED ACE_OVERLAPPED;
 typedef DWORD ACE_thread_t;
 typedef HANDLE ACE_hthread_t;
 typedef long pid_t;
-#   if defined (ACE_HAS_TSS_EMULATION)
-      typedef DWORD ACE_OS_thread_key_t;
-      typedef u_int ACE_thread_key_t;
-#   else  /* ! ACE_HAS_TSS_EMULATION */
-      typedef DWORD ACE_thread_key_t;
-#   endif /* ! ACE_HAS_TSS_EMULATION */
+typedef DWORD ACE_thread_key_t;
+#   if !defined (__BORLANDC__)
+typedef DWORD nlink_t;
+#   endif /* __BORLANDC__ */
 
 // 64-bit quad-word definitions.
 typedef unsigned __int64 ACE_QWORD;
@@ -3058,7 +2958,6 @@ inline DWORD ACE_HIGH_DWORD (ACE_QWORD q) { return (DWORD) (q >> 32); }
 // Win32 dummies to help compilation.
 
 #   if !defined (__BORLANDC__)
-typedef DWORD nlink_t;
 typedef int mode_t;
 typedef int uid_t;
 typedef int gid_t;
@@ -3176,10 +3075,6 @@ typedef char TCHAR;
 #   define ACE_DIRECTORY_SEPARATOR_STR_A "/"
 #   define ACE_DIRECTORY_SEPARATOR_CHAR_A '/'
 
-// Define the name of the environment variable that defines the temp
-// directory.
-#   define ACE_DEFAULT_TEMP_DIR_ENV "TMP"
-
 // We're some kind of UNIX...
 #   define ACE_PLATFORM_A "UNIX"
 #   define ACE_PLATFORM_EXE_SUFFIX_A ""
@@ -3377,6 +3272,7 @@ extern "C"
 #     if defined (ACE_HAS_STL_QUEUE_CONFLICT)
 #       undef queue
 #     endif /* ACE_HAS_STL_QUEUE_CONFLICT */
+#     include /**/ <netdb.h>
 #   endif /* VXWORKS */
 
 // This part if to avoid STL name conflict with the map structure
@@ -3417,7 +3313,14 @@ unsigned long inet_network(const char *);
 #     endif /* howmany */
 #   endif /* __Lynx__ */
 
-#   if defined (CHORUS)
+#   if defined (CYGWIN32)
+#     include /**/ <sys/uio.h>
+#     include /**/ <sys/file.h>
+#     include /**/ <sys/time.h>
+#     include /**/ <sys/resource.h>
+#     include /**/ <sys/wait.h>
+#     include /**/ <pwd.h>
+#   elif defined (CHORUS)
 #     include /**/ <chorus.h>
 #     include /**/ <cx/select.h>
 #     include /**/ <sys/uio.h>
@@ -3443,23 +3346,6 @@ typedef cx_fd_mask fd_mask;
 #       define howmany(x, y)   (((x)+((y)-1))/(y))
 #     endif /* howmany */
 typedef void (*__sighandler_t)(int); // keep Signal compilation happy
-#   elif defined (CYGWIN32)
-#     include /**/ <sys/uio.h>
-#     include /**/ <sys/file.h>
-#     include /**/ <sys/time.h>
-#     include /**/ <sys/resource.h>
-#     include /**/ <sys/wait.h>
-#     include /**/ <pwd.h>
-#   elif defined (__QNX__)
-#     include /**/ <sys/uio.h>
-#     include /**/ <sys/ipc.h>
-#     include /**/ <sys/sem.h>
-#     include /**/ <sys/time.h>
-#     include /**/ <sys/wait.h>
-#     include /**/ <pwd.h>
-#     ifndef howmany
-#       define howmany(x, y)   (((x)+((y)-1))/(y))
-#     endif /* howmany */
 #   elif ! defined (VXWORKS)
 #     include /**/ <sys/uio.h>
 #     include /**/ <sys/ipc.h>
@@ -3485,11 +3371,7 @@ typedef void (*__sighandler_t)(int); // keep Signal compilation happy
 #   endif /* ACE_HAS_STRINGS */
 
 #   if defined (ACE_HAS_TERM_IOCTLS)
-#     if defined (__QNX__)
-#       include /**/ <termios.h>
-#     else  /* ! __QNX__ */
-#       include /**/ <sys/termios.h>
-#     endif /* ! __QNX__ */
+#     include /**/ <sys/termios.h>
 #   endif /* ACE_HAS_TERM_IOCTLS */
 
 #   if !defined (ACE_LACKS_UNISTD_H)
@@ -3510,11 +3392,7 @@ typedef void (*__sighandler_t)(int); // keep Signal compilation happy
 
 #   if defined (ACE_HAS_SIGINFO_T)
 #     if !defined (ACE_LACKS_SIGINFO_H)
-#       if defined (__QNX__)
-#         include /**/ <sys/siginfo.h>
-#       else  /* ! __QNX__ */
-#         include /**/ <siginfo.h>
-#       endif /* ! __QNX__ */
+#       include /**/ <siginfo.h>
 #     endif /* ACE_LACKS_SIGINFO_H */
 #     if !defined (ACE_LACKS_UCONTEXT_H)
 #       include /**/ <ucontext.h>
@@ -3564,17 +3442,11 @@ extern int t_errno;
 #     include /**/ <alloca.h>
 #   endif /* ACE_HAS_ALLOCA_H */
 
-#   if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI) || defined (ACE_HAS_FORE_ATM_XTI)
+#   if defined (ACE_HAS_TIUSER_H) || defined (ACE_HAS_XTI)
 #     if defined (ACE_HAS_TIUSER_H_BROKEN_EXTERN_C)
 extern "C" {
 #     endif /* ACE_HAS_TIUSER_H_BROKEN_EXTERN_C */
-#     if defined (ACE_HAS_FORE_ATM_XTI)
-#       include /**/ <fore_xti/xti_user_types.h>
-#       include /**/ <fore_xti/xti.h>
-#       include /**/ <fore_xti/xti_atm.h>
-#       include /**/ <fore_xti/netatm/atm.h>
-#       include /**/ <fore_xti/ans.h>
-#     elif defined (ACE_HAS_TIUSER_H)
+#     if defined (ACE_HAS_TIUSER_H)
 #       include /**/ <tiuser.h>
 #     else
 #       if defined (ACE_HAS_BROKEN_XTI_MACROS)
@@ -3813,18 +3685,6 @@ typedef fd_set ACE_FD_SET_TYPE;
 #   define MAXHOSTNAMELEN  256
 # endif /* MAXHOSTNAMELEN */
 
-// Define INET string length constants if they haven't been defined
-//
-// for IPv4 dotted-decimal
-# if !defined (INET_ADDRSTRLEN)
-#   define INET_ADDRSTRLEN 16
-# endif /* INET_ADDRSTRLEN */
-//
-// for IPv6 hex string
-# if !defined (INET6_ADDRSTRLEN)
-#   define INET6_ADDRSTRLEN 46
-# endif /* INET6_ADDRSTRLEN */
-
 # if defined (ACE_LACKS_SIGSET)
 typedef u_int sigset_t;
 # endif /* ACE_LACKS_SIGSET */
@@ -3883,27 +3743,15 @@ struct sigaction
 # endif /* SIGALRM */
 
 # if !defined (SIG_DFL)
-#   if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#     define SIG_DFL ((void *) 0)
-#   else
-#     define SIG_DFL ((__sighandler_t) 0)
-#   endif
+#   define SIG_DFL ((__sighandler_t) 0)
 # endif /* SIG_DFL */
 
 # if !defined (SIG_IGN)
-#   if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#     define SIG_IGN ((void *) 1)     /* ignore signal */
-#   else
-#     define SIG_IGN ((__sighandler_t) 1)     /* ignore signal */
-#   endif
+#   define SIG_IGN ((__sighandler_t) 1)     /* ignore signal */
 # endif /* SIG_IGN */
 
 # if !defined (SIG_ERR)
-#   if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-#     define SIG_ERR ((void *) -1)    /* error return from signal */
-#   else
-#     define SIG_ERR ((__sighandler_t) -1)    /* error return from signal */
-#   endif
+#   define SIG_ERR ((__sighandler_t) -1)    /* error return from signal */
 # endif /* SIG_ERR */
 
 # if !defined (O_NONBLOCK)
@@ -4162,13 +4010,12 @@ typedef void *(*ACE_THR_C_FUNC)(void *);
 # endif /* VXWORKS */
 }
 
-# if !defined (MAP_FAILED) || defined (ACE_HAS_BROKEN_MAP_FAILED)
-#   undef MAP_FAILED
+# if !defined (MAP_FAILED)
 #   define MAP_FAILED ((void *) -1)
 # elif defined (ACE_HAS_LONG_MAP_FAILED)
 #   undef MAP_FAILED
 #   define MAP_FAILED ((void *) -1L)
-# endif /* !MAP_FAILED || ACE_HAS_BROKEN_MAP_FAILED */
+# endif /* MAP_FAILED */
 
 # if defined (ACE_HAS_CHARPTR_DL)
 typedef char * ACE_DL_TYPE;
@@ -4220,6 +4067,10 @@ typedef int ucontext_t;
 #   include /**/ <tli/timod.h>
 # endif /* ACE_HAS_TIMOD_H */
 
+# if defined (ACE_HAS_BROKEN_T_ERRNO)
+#   undef t_errno
+# endif /* ACE_HAS_BROKEN_T_ERRNO */
+
 # if defined rewinddir
 #   undef rewinddir
 # endif /* rewinddir */
@@ -4352,12 +4203,6 @@ typedef void (*ACE_CLEANUP_FUNC)(void *object, void *param) /* throw () */;
 }
 # endif /* ACE_HAS_SIG_C_FUNC */
 
-// For use by ACE_OS::exit ().
-extern "C"
-{
-  typedef void (*ACE_EXIT_HOOK) ();
-}
-
 # if defined (ACE_WIN32)
 // Default WIN32 structured exception handler.
 int ACE_SEH_Default_Exception_Selector (void *);
@@ -4411,29 +4256,6 @@ public:
 // be an extern "C" to make certain compilers happy...
 extern "C" ACE_Export void *ace_thread_adapter (void *args);
 
-class ACE_OS_Thread_Descriptor
-{
-  // = TITLE
-  //     Parent class of all ACE_Thread_Descriptor classes.
-  //
-  // =
-  //     Container for ACE_Thread_Descriptor members that are
-  //     used in ACE_OS.
-public:
-  long flags (void) const;
-  // Get the thread creation flags.
-
-protected:
-  ACE_OS_Thread_Descriptor (long flags = 0);
-  // For use by ACE_Thread_Descriptor.
-
-  long flags_;
-  // Keeps track of whether this thread was created "detached" or not.
-  // If a thread is *not* created detached then if someone calls
-  // <ACE_Thread_Manager::wait>, we need to join with that thread (and
-  // close down the handle).
-};
-
 // Forward decl.
 class ACE_Thread_Manager;
 class ACE_Thread_Descriptor;
@@ -4499,7 +4321,7 @@ private:
   ACE_Thread_Manager *thr_mgr_;
   // Optional thread manager.
 
-  ACE_OS_Thread_Descriptor *thr_desc_;
+  ACE_Thread_Descriptor *thr_desc_;
   // Optional thread descriptor.  Passing this pointer in will force
   // the spawned thread to cache this location in <Log_Msg> and wait
   // until <Thread_Manager> fills in all information in thread
@@ -4533,115 +4355,6 @@ private:
   // destructor and has no friends.
 };
 
-class ACE_Export ACE_Thread_Control
-{
-  // = TITLE
-  //     Used to keep track of a thread's activities within its entry
-  //     point function.
-  //
-  // = DESCRIPTION
-  //     A <ACE_Thread_Manager> uses this class to ensure that threads
-  //     it spawns automatically register and unregister themselves
-  //     with it.
-  //
-  //     This class can be stored in thread-specific storage using the
-  //     <ACE_TSS> wrapper.  When a thread exits the
-  //     <ACE_TSS::cleanup> function deletes this object, thereby
-  //     ensuring that it gets removed from its associated
-  //     <ACE_Thread_Manager>.
-public:
-  ACE_Thread_Control (ACE_Thread_Manager *tm = 0,
-                      int insert = 0);
-  // Initialize the thread control object.  If <insert> != 0, then
-  // register the thread with the Thread_Manager.
-
-  ~ACE_Thread_Control (void);
-  // Remove the thread from its associated <Thread_Manager> and exit
-  // the thread if <do_thr_exit> is enabled.
-
-  void *exit (void *status,
-              int do_thr_exit);
-  // Remove this thread from its associated <Thread_Manager> and exit
-  // the thread if <do_thr_exit> is enabled.
-
-  int insert (ACE_Thread_Manager *tm, int insert = 0);
-  // Store the <Thread_Manager> and use it to register ourselves for
-  // correct shutdown.
-
-  ACE_Thread_Manager *thr_mgr (void);
-  // Returns the current <Thread_Manager>.
-
-  ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *);
-  // Atomically set a new <Thread_Manager> and return the old
-  // <Thread_Manager>.
-
-  void *status (void *status);
-  // Set the exit status (and return existing status).
-
-  void *status (void);
-  // Get the current exit status.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-private:
-  ACE_Thread_Manager *tm_;
-  // Pointer to the thread manager for this block of code.
-
-  void *status_;
-  // Keeps track of the exit status for the thread.
-};
-
-class ACE_Export ACE_Thread_Exit
-{
-  // = TITLE
-  //    Keep exit information for a Thread in thread specific storage.
-  //    so that the thread-specific exit hooks will get called no
-  //    matter how the thread exits (e.g., via <ACE_Thread::exit>, C++
-  //    or Win32 exception, "falling off the end" of the thread entry
-  //    point function, etc.).
-  //
-  // = DESCRIPTION
-  //    This clever little helper class is stored in thread-specific
-  //    storage using the <ACE_TSS> wrapper.  When a thread exits the
-  //    <ACE_TSS::cleanup> function deletes this object, thereby
-  //    closing it down gracefully.
-public:
-  ACE_Thread_Exit (void);
-  // Capture the Thread that will be cleaned up automatically.
-
-  void thr_mgr (ACE_Thread_Manager *tm);
-  // Set the <ACE_Thread_Manager>.
-
-  void *status (void *s);
-  // Set the exit status.
-
-  void *status (void);
-  // Get the exit status.
-
-  ~ACE_Thread_Exit (void);
-  // Destructor calls the thread-specific exit hooks when a thread
-  // exits.
-
-  static ACE_Thread_Exit *instance (void);
-  // Singleton access point.
-
-  static void cleanup (void *instance, void *);
-  // Cleanup method, used by the <ACE_Object_Manager> to destroy the
-  // singleton.
-
-private:
-  void *status_;
-  // Exit status...
-
-  ACE_Thread_Control thread_control_;
-  // Automatically add/remove the thread from the
-  // <ACE_Thread_Manager>.
-};
-
 # if defined (ACE_LACKS_FLOATING_POINT)
 typedef ACE_UINT32 ACE_timer_t;
 # else
@@ -4746,13 +4459,6 @@ public:
   static int getopt (int argc,
                      char *const *argv,
                      const char *optstring);
-  static int argv_to_string (ASYS_TCHAR **argv,
-                             ASYS_TCHAR *&buf,
-                             int substitute_env_args = 1);
-  static int string_to_argv (ASYS_TCHAR *buf,
-                             size_t &argc,
-                             ASYS_TCHAR **&argv,
-                             int substitute_env_args = 1);
   static long sysconf (int);
 
   // = A set of wrappers for condition variables.
@@ -4814,7 +4520,7 @@ public:
   static int fclose (FILE *fp);
   static int fcntl (ACE_HANDLE handle,
                     int cmd,
-                    long arg = 0);
+                    int val = 0);
   static int fdetach (const char *file);
 
   static int fsync(ACE_HANDLE handle);
@@ -5006,11 +4712,6 @@ public:
 # if !defined (ACE_HAS_WINCE)
   static time_t mktime (struct tm *timeptr);
 # endif /* !ACE_HAS_WINCE */
-
-  // wrapper for time zone information.
-  static void tzset (void);
-  static long timezone (void);
-
   static double difftime (time_t t1,
                           time_t t0);
   static time_t time (time_t *tloc = 0);
@@ -5052,9 +4753,6 @@ public:
   static int memcmp (const void *t,
                      const void *s,
                      size_t len);
-  static void *memchr(const void *s,
-                      int c,
-                      size_t len);
   static void *memcpy (void *t,
                        const void *s,
                        size_t len);
@@ -5102,19 +4800,6 @@ public:
   static int munmap (void *addr,
                      size_t len);
 
-  // = A set of wrappers for recursive mutex locks.
-  static int recursive_mutex_init (ACE_recursive_thread_mutex_t *m,
-                                   LPCTSTR name = 0,
-                                   void *arg = 0,
-                                   LPSECURITY_ATTRIBUTES sa = 0);
-  static int recursive_mutex_destroy (ACE_recursive_thread_mutex_t *m);
-
-  static int recursive_mutex_lock (ACE_recursive_thread_mutex_t *m);
-
-  static int recursive_mutex_trylock (ACE_recursive_thread_mutex_t *m);
-
-  static int recursive_mutex_unlock (ACE_recursive_thread_mutex_t *m);
-
   // = A set of wrappers for mutex locks.
   static int mutex_init (ACE_mutex_t *m,
                          int type = ACE_DEFAULT_SYNCH_TYPE,
@@ -5204,14 +4889,6 @@ public:
                        void *buf,
                        size_t len,
                        ACE_OVERLAPPED *);
-  static ssize_t read_n (ACE_HANDLE handle,
-                         void *buf,
-                         size_t len);
-  // Receive <len> bytes into <buf> from <handle> (uses the
-  // <ACE_OS::read> call, which uses the <read> system call on UNIX
-  // and the <ReadFile> call on Win32).  If <handle> is set to
-  // non-blocking mode this call will poll until all <len> bytes are
-  // received.
   static int readlink (const char *path,
                        char *buf,
                        size_t bufsiz);
@@ -5232,13 +4909,6 @@ public:
                         const void *buf,
                         size_t nbyte,
                         ACE_OVERLAPPED *);
-  static ssize_t write_n (ACE_HANDLE handle,
-                          const void *buf,
-                          size_t len);
-  // Send <len> bytes from <buf> to <handle> (uses the <ACE_OS::write>
-  // calls, which is uses the <write> system call on UNIX and the
-  // <WriteFile> call on Win32).  If <handle> is set to non-blocking
-  // mode this call will poll until all <len> bytes are sent.
   static ssize_t pwrite (ACE_HANDLE handle,
                          const void *buf,
                          size_t nbyte,
@@ -5399,10 +5069,6 @@ public:
                           const sigset_t *nsp,
                           sigset_t *osp);
 
-  static int pthread_sigmask (int how,
-                              const sigset_t *nsp,
-                              sigset_t *osp);
-
   // = A set of wrappers for sockets.
   static ACE_HANDLE accept (ACE_HANDLE handle,
                             struct sockaddr *addr,
@@ -5418,7 +5084,6 @@ public:
                                         int length,
                                         int type);
   static struct hostent *gethostbyname (const char *name);
-  static struct hostent *gethostbyname2 (const char *name, int type);
   static struct hostent *gethostbyaddr_r (const char *addr,
                                           int length,
                                           int type,
@@ -5459,15 +5124,6 @@ public:
   static int inet_aton (const char *strptr,
                         struct in_addr *addr);
 
-  static const char *inet_ntop (int family,
-                                const void *addrptr,
-                                char *strptr,
-                                size_t len);
-  static int inet_pton (int family,
-                        const char *strptr,
-                        void *addrptr);
-
-
   static int listen (ACE_HANDLE handle,
                      int backlog);
   static int recv (ACE_HANDLE handle,
@@ -5484,9 +5140,6 @@ public:
                    const char *buf,
                    int len, int
                    flags = 0);
-  static ssize_t send_n (ACE_HANDLE handle,
-                         const void *buf,
-                         size_t len);
   static int sendto (ACE_HANDLE handle,
                      const char *buf,
                      int len,
@@ -5562,9 +5215,6 @@ public:
                       size_t len);
   static char *strcpy (char *s,
                        const char *t);
-  static char *strecpy (char *des, const char *src);
-  // Copies <src> to <des>, returning a pointer to the end of the
-  // copied region, rather than the beginning, as <strcpy> does.
   static char *strpbrk (char *s1,
                         const char *s2);
   static const char *strpbrk (const char *s1,
@@ -5584,7 +5234,6 @@ public:
                               const char *t,
                               size_t len);
   static char *strdup (const char *s); // Uses malloc
-  static char *strenvdup (const char *str);
   static size_t strlen (const char *s);
   static char *strncpy (char *s,
                         const char *t,
@@ -5640,7 +5289,6 @@ public:
                           wint_t c);
   static const wchar_t *strchr (const wchar_t *s,
                                 wint_t c);
-  static wchar_t *strecpy (wchar_t *s, const wchar_t *t);
   static wchar_t *strrchr (wchar_t *s,
                            wint_t c);
   static const wchar_t *strrchr (const wchar_t *s,
@@ -5943,16 +5591,6 @@ public:
   static void thr_testcancel (void);
   static void thr_yield (void);
 
-  static void unique_name (const void *object,
-                           LPTSTR name,
-                           size_t length);
-  // This method uses process id and object pointer to come up with a
-  // machine wide unique name.  The process ID will provide uniqueness
-  // between processes on the same machine. The "this" pointer of the
-  // <object> will provide uniqueness between other "live" objects in
-  // the same process. The uniqueness of this name is therefore only
-  // valid for the life of <object>.
-
   static ACE_thread_t NULL_thread;
   // This is necessary to deal with POSIX pthreads and their use of
   // structures for thread ids.
@@ -6000,21 +5638,8 @@ public:
   static int priority_control (ACE_idtype_t, ACE_id_t, int, void *);
   // Low-level interface to priocntl (2).
 
-private:
-  static ACE_EXIT_HOOK exit_hook_;
-  // Function that is called by ACE_OS::exit (), if non-null.
-
-  static ACE_EXIT_HOOK set_exit_hook (ACE_EXIT_HOOK exit_hook) {
-    ACE_EXIT_HOOK old_hook = exit_hook_;
-    exit_hook_ = exit_hook;
-    return old_hook;
-  }
-  // For use by ACE_Object_Manager only, to register its exit hook..
-
-  friend class ACE_OS_Object_Manager;
-  // Allow the ACE_OS_Object_Manager to call set_exit_hook.
-
 # if defined (ACE_WIN32)
+private:
 #   if defined (ACE_HAS_WINCE)
   static const wchar_t *day_of_week_name[7];
   static const wchar_t *month_name[12];
@@ -6027,156 +5652,6 @@ private:
 # endif /* ACE_WIN32 */
 };
 
-class ACE_Export ACE_Object_Manager_Base
-{
-  // = TITLE
-  //     Base class for ACE_Object_Manager(s).
-  //
-  // = DESCRIPTION
-  //     Encapsulates the most useful ACE_Object_Manager data structures.
-public:
-# if (defined (ACE_PSOS) && defined (__DIAB))  || \
-     (defined (__DECCXX_VER) && __DECCXX_VER < 60000000)
-  // The Diab compiler got confused and complained about access rights
-  // if this section was protected (changing this to public makes it happy).
-  // Similarly, DEC CXX 5.6 needs the methods to be public.
-public:
-# else  /* ! (ACE_PSOS && __DIAB)  ||  ! __DECCXX_VER < 60000000 */
-protected:
-# endif /* ! (ACE_PSOS && __DIAB)  ||  ! __DECCXX_VER < 60000000 */
-  ACE_Object_Manager_Base (void);
-  // Default constructor.
-
-  virtual ~ACE_Object_Manager_Base (void);
-  // Destructor.
-
-public:
-  virtual int init (void) = 0;
-  // Explicitly initialize.  Returns 0 on success, -1 on failure
-  // due to either already having been initialized, or dynamic
-  // allocation failure (in which case errno is set to ENOMEM).
-
-  virtual int fini (void) = 0;
-  // Explicitly destroy.  Returns 0 on success, -1 on failure due to
-  // already having been destroyed, or 1 because the number of fini ()
-  // calls hasn't reached the number of init () calls.
-
-  enum Object_Manager_State
-    {
-      OBJ_MAN_UNINITIALIZED = 0,
-      OBJ_MAN_INITIALIZING,
-      OBJ_MAN_INITIALIZED,
-      OBJ_MAN_SHUTTING_DOWN,
-      OBJ_MAN_SHUT_DOWN
-    };
-
-protected:
-  int starting_up_i (void);
-  // Returns 1 before ACE_Object_Manager_Base has been constructed.
-  // This flag can be used to determine if the program is constructing
-  // static objects.  If no static object spawns any threads, the
-  // program will be single-threaded when this flag returns 1.  (Note
-  // that the program still might construct some static objects when
-  // this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not
-  // defined.)
-
-  int shutting_down_i (void);
-  // Returns 1 after ACE_Object_Manager_Base has been destroyed.  This
-  // flag can be used to determine if the program is in the midst of
-  // destroying static objects.  (Note that the program might destroy
-  // some static objects before this flag can return 1, if
-  // ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.)
-
-  Object_Manager_State object_manager_state_;
-  // State of the Object_Manager;
-
-  u_int dynamically_allocated_;
-  // Flag indicating whether the ACE_Object_Manager was dynamically
-  // allocated by ACE.  (If is was dynamically allocated by the
-  // application, then the application is responsible for destroying
-  // it.)
-
-  ACE_Object_Manager_Base *next_;
-  // Link to next Object_Manager, for chaining.
-private:
-  // Disallow copying by not implementing the following . . .
-  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &);
-  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &);
-};
-
-extern "C"
-void
-ACE_OS_Object_Manager_Internal_Exit_Hook ();
-
-
-class ACE_Export ACE_OS_Object_Manager : public ACE_Object_Manager_Base
-{
-public:
-  virtual int init (void);
-  // Explicitly initialize.
-
-  virtual int fini (void);
-  // Explicitly destroy.
-
-  static int starting_up (void);
-  // Returns 1 before the ACE_OS_Object_Manager has been constructed.
-  // See ACE_Object_Manager::starting_up () for more information.
-
-  static int shutting_down (void);
-  // Returns 1 after the ACE_OS_Object_Manager has been destroyed.
-  // See ACE_Object_Manager::shutting_down () for more information.
-
-  enum Preallocated_Object
-    {
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      ACE_OS_MONITOR_LOCK,
-      ACE_TSS_CLEANUP_LOCK,
-#   if defined (ACE_HAS_TSS_EMULATION) && \
-       defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
-      ACE_TSS_BASE_LOCK,
-#   endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
-# else
-      // There currently are no preallocated arrays in the ACE
-      // library.  If the application doesn't have any, make sure
-      // the the preallocated_array size is at least one by declaring
-      // this dummy . . .
-      ACE_OS_EMPTY_PREALLOCATED_OBJECT,
-# endif /* ACE_MT_SAFE */
-
-      ACE_OS_PREALLOCATED_OBJECTS  // This enum value must be last!
-    };
-  // Unique identifiers for preallocated objects.
-
-public:
-  // Application code should not use these explicitly, so they're
-  // hidden here.  They're public so that the ACE_Object_Manager can
-  // be constructed/destructed in main () with
-  // ACE_HAS_NONSTATIC_OBJECT_MANAGER.
-  ACE_OS_Object_Manager ();
-  // Constructor.
-
-  ~ACE_OS_Object_Manager ();
-  // Destructor.
-
-private:
-  friend class ACE_OS;
-  friend class ACE_Object_Manager;
-  friend class ACE_OS_Object_Manager_Manager;
-  friend class ACE_TSS_Cleanup;
-  friend class ACE_TSS_Emulation;
-  friend void ACE_OS_Object_Manager_Internal_Exit_Hook ();
-  // This class is for internal use by ACE_OS, etc., only.
-
-  static ACE_OS_Object_Manager *instance (void);
-  // Accessor to singleton instance.
-
-  static ACE_OS_Object_Manager *instance_;
-  // Singleton instance pointer.
-
-  static void *preallocated_object[ACE_OS_PREALLOCATED_OBJECTS];
-  // Table of preallocated objects.
-};
-
 # if defined (ACE_HAS_WINCE)
 
 //          **** Warning ****
@@ -6300,9 +5775,6 @@ public:
   // 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 ().
-
 private:
   // Global TSS structures.
   static u_int total_keys_;
@@ -6343,13 +5815,13 @@ private:
 // file of template instantiations.
 # if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION)
 class ACE_TSS_Ref
-{
   // = TITLE
   //     "Reference count" for thread-specific storage keys.
   //
   // = DESCRIPTION
   //     Since the <ACE_Unbounded_Stack> doesn't allow duplicates, the
   //     "reference count" is the identify of the thread_id.
+{
 public:
   ACE_TSS_Ref (ACE_thread_t id);
   // Constructor
@@ -6370,12 +5842,12 @@ public:
 };
 
 class ACE_TSS_Info
-{
   // = TITLE
   //     Thread Specific Key management.
   //
   // = DESCRIPTION
   //     This class maps a key to a "destructor."
+{
 public:
   ACE_TSS_Info (ACE_thread_key_t key,
                 void (*dest)(void *) = 0,
@@ -6419,7 +5891,6 @@ private:
 };
 
 class ACE_TSS_Keys
-{
   // = TITLE
   //     Collection of in-use flags for a thread's TSS keys.
   //     For internal use only by ACE_TSS_Cleanup; it is public because
@@ -6429,7 +5900,8 @@ class ACE_TSS_Keys
   // = DESCRIPTION
   //     Wrapper around array of whether each key is in use.  A simple
   //     typedef doesn't work with Sun C++ 4.2.
-public:
+{
+ public:
   ACE_TSS_Keys (void);
   // Default constructor, to initialize all bits to zero (unused).
 
@@ -6464,63 +5936,6 @@ private:
 
 # endif /* defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION) */
 
-class ACE_Export ACE_OS_WString
-{
-  // = TITLE
-  //     A lightweight wchar* to char* string conversion class.
-  //
-  // = DESCRIPTION
-  //     The purpose of this class is to perform conversion between
-  //     wchar and char strings.  It is not intended for general
-  //     purpose use.
-public:
-  ACE_OS_WString (const ACE_USHORT16 *s);
-  // Ctor must take a wchar stirng.
-
-  ~ACE_OS_WString (void);
-  // Dtor will free up the memory.
-
-  char *char_rep (void);
-  // Return the internal char* representation.
-
-private:
-  char *rep_;
-  // Internal pointer to the converted string.
-
-  ACE_OS_WString (void);
-  ACE_OS_WString (ACE_OS_WString &);
-  ACE_OS_WString& operator= (ACE_OS_WString &);
-  // Disallow these operation.
-};
-
-class ACE_Export ACE_OS_CString
-{
-  // = TITLE
-  //     A lightweight char* to wchar* string conversion class.
-  //
-  // = DESCRIPTION
-  //     The purpose of this class is to perform conversion from
-  //     char* to wchar* strings.  It is not intended for general
-  //     purpose use.
-public:
-  ACE_OS_CString (const char *s);
-  // Ctor must take a wchar stirng.
-
-  ~ACE_OS_CString (void);
-  // Dtor will free up the memory.
-
-  ACE_USHORT16 *wchar_rep (void);
-  // Return the internal char* representation.
-
-private:
-  ACE_USHORT16 *rep_;
-  // Internal pointer to the converted string.
-
-  ACE_OS_CString (void);
-  ACE_OS_CString (ACE_OS_CString &);
-  ACE_OS_CString operator= (ACE_OS_CString &);
-  // Disallow these operation.
-};
 
 // Support non-scalar thread keys, such as with some POSIX
 // implementations, e.g., MVS.
@@ -6548,11 +5963,7 @@ private:
     // introduces other stuff that breaks things, like <memory>, which
     // screws up auto_ptr.
 #     include /**/ <new>
-#     if defined (__HP_aCC) && !defined (RWSTD_NO_NAMESPACE)
-#       define ACE_bad_alloc std::bad_alloc
-#     else
-#       define ACE_bad_alloc bad_alloc
-#     endif /* RWSTD_NO_NAMESPACE */
+#     define ACE_bad_alloc bad_alloc
 #   endif /* __SUNPRO_CC */
 
 #   define ACE_NEW_RETURN(POINTER,CONSTRUCTOR,RET_VAL) \
@@ -6564,6 +5975,18 @@ private:
    do { try { POINTER = new CONSTRUCTOR; } \
         catch (ACE_bad_alloc) { errno = ENOMEM; return; } \
    } while (0)
+#   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
+     do { try { POINTER = new CONSTRUCTOR; } \
+       catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
+     } while (0)
+#   define ACE_NEW_THROW_RETURN(POINTER,CONSTRUCTOR,EXCEPTION,RET_VAL) \
+     do { try { POINTER = new CONSTRUCTOR; } \
+        catch (ACE_bad_alloc) { errno = ENOMEM; TAO_THROW_RETURN (EXCEPTION,RET_VAL); } \
+     } while (0)
+#   define ACE_NEW_TRY_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
+  do { try { POINTER = new CONSTRUCTOR; } \
+       catch (ACE_bad_alloc) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
+     } while (0)
 
 # else /* ACE_NEW_THROWS_EXCEPTIONS */
 
@@ -6575,7 +5998,19 @@ private:
    do { POINTER = new CONSTRUCTOR; \
      if (POINTER == 0) { errno = ENOMEM; return; } \
    } while (0)
-
+#   define ACE_NEW_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
+     do { POINTER = new CONSTRUCTOR; \
+       if (POINTER == 0) { errno = ENOMEM; TAO_THROW (EXCEPTION); } \
+     } while (0)
+#   define ACE_NEW_THROW_RETURN(POINTER,CONSTRUCTOR,EXCEPTION,RET_VAL) \
+     do { POINTER = new CONSTRUCTOR; \
+        if (POINTER == 0)\
+        { errno = ENOMEM; TAO_THROW_RETURN (EXCEPTION,RET_VAL); } \
+     } while (0)
+#   define ACE_NEW_TRY_THROW(POINTER,CONSTRUCTOR,EXCEPTION) \
+     do { POINTER = new CONSTRUCTOR; \
+       if (POINTER == 0) { errno = ENOMEM; TAO_TRY_THROW (EXCEPTION); } \
+     } while (0)
 # endif /* ACE_NEW_THROWS_EXCEPTIONS */
 
 // Some useful abstrations for expressions involving
@@ -6604,209 +6039,38 @@ private:
 
 # define ACE_NOOP(x)
 
-# define ACE_DES_NOFREE (POINTER,CLASS) \
-   do { \
-        if (POINTER) \
-          { \
-            POINTER->~CLASS (); \
-          } \
-      } \
-   while (0)
-
-# define ACE_DES_ARRAY_NOFREE (POINTER,SIZE,CLASS) \
-   do { \
-        if (POINTER) \
-          { \
-            for (size_t i = 0; \
-                 i < SIZE; \
-                 ++i) \
-            { \
-              POINTER[i].~CLASS (); \
-            } \
-          } \
-      } \
-   while (0)
-
+# define ACE_DES_NOFREE (POINTER,CLASS) POINTER->~CLASS ()
 # define ACE_DES_FREE(POINTER,DEALLOCATOR,CLASS) \
-   do { \
-        if (POINTER) \
-          { \
-            POINTER->~CLASS (); \
-            DEALLOCATOR (POINTER); \
-          } \
-      } \
-   while (0)
-
-# define ACE_DES_ARRAY_FREE(POINTER,SIZE,DEALLOCATOR,CLASS) \
-   do { \
-        if (POINTER) \
-          { \
-            for (size_t i = 0; \
-                 i < SIZE; \
-                 ++i) \
-            { \
-              POINTER[i].~CLASS (); \
-            } \
-            DEALLOCATOR (POINTER); \
-          } \
-      } \
-   while (0)
+   do { POINTER->~CLASS (); DEALLOCATOR (POINTER); } while (0)
 
 # if defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR)
 #   define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS (); \
-            } \
-        } \
-     while (0)
-
-#   define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              for (size_t i = 0; \
-                   i < SIZE; \
-                   ++i) \
-              { \
-                POINTER[i].~T_CLASS (); \
-              } \
-            } \
-        } \
-     while (0)
-
+     POINTER->~ T_CLASS ()
 #   define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-
-#   define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              for (size_t i = 0; \
-                   i < SIZE; \
-                   ++i) \
-              { \
-                POINTER[i].~T_CLASS (); \
-              } \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-
+   do { POINTER->~ T_CLASS (); \
+        DEALLOCATOR (POINTER); \
+      } while (0)
 #   define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->~T_CLASS (); \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-
-#   define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-     do { \
-          if (POINTER) \
-            { \
-              for (size_t i = 0; \
-                   i < SIZE; \
-                   ++i) \
-              { \
-                POINTER[i].~T_CLASS (); \
-              } \
-              DEALLOCATOR (POINTER); \
-            } \
-        } \
-     while (0)
-
+  do { POINTER->~ T_CLASS (); \
+       DEALLOCATOR (POINTER); \
+     } while (0)
 # else /* ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
 #   define ACE_DES_NOFREE_TEMPLATE (POINTER,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              POINTER->T_CLASS T_PARAMETER::~T_CLASS (); \
-            } \
-        } \
-     while (0)
-
-#   define ACE_DES_ARRAY_NOFREE_TEMPLATE (POINTER,SIZE,T_CLASS,T_PARAMETER) \
-     do { \
-          if (POINTER) \
-            { \
-              for (size_t i = 0; \
-                   i < SIZE; \
-                   ++i) \
-              { \
-                POINTER[i].T_CLASS T_PARAMETER::~T_CLASS (); \
-              } \
-            } \
-        } \
-     while (0)
+     POINTER -> T_CLASS T_PARAMETER ::~ T_CLASS ()
 
 #   if defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L
   // LynxOS 3.0.0's g++ has trouble with the real versions of these.
 #     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
-#     define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER)
 #     define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
-#     define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2)
 #   else
 #     define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-       do { \
-            if (POINTER) \
-              { \
-                POINTER->T_CLASS T_PARAMETER::~T_CLASS (); \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
-
-#     define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \
-       do { \
-            if (POINTER) \
-              { \
-                for (size_t i = 0; \
-                     i < SIZE; \
-                     ++i) \
-                { \
-                  POINTER[i].T_CLASS T_PARAMETER::~T_CLASS (); \
-                } \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
-
+    do { POINTER-> T_CLASS T_PARAMETER ::~ T_CLASS (); \
+         DEALLOCATOR (POINTER); \
+       } while (0)
 #     define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-       do { \
-            if (POINTER) \
-              { \
-                POINTER->T_CLASS <T_PARAM1, T_PARAM2>::~T_CLASS (); \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
-
-#     define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \
-       do { \
-            if (POINTER) \
-              { \
-                for (size_t i = 0; \
-                     i < SIZE; \
-                     ++i) \
-                { \
-                  POINTER[i].T_CLASS <T_PARAM1, T_PARAM2>::~T_CLASS (); \
-                } \
-                DEALLOCATOR (POINTER); \
-              } \
-          } \
-       while (0)
-
+    do { POINTER-> T_CLASS <T_PARAM1, T_PARAM2> ::~ T_CLASS (); \
+         DEALLOCATOR (POINTER); \
+       } while (0)
 #   endif /* defined (__Lynx__) && __LYNXOS_SDK_VERSION == 199701L */
 # endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */
 
@@ -6879,24 +6143,10 @@ extern "C" ACE_Export void ace_mutex_lock_cleanup_adapter (void *args);
 #   endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 # endif /* ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
-# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
-
-#   if !defined (ACE_HAS_MINIMAL_ACE_OS)
-#     include "ace/Object_Manager.h"
-#   endif /* ! ACE_HAS_MINIMAL_ACE_OS */
-
+# if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER) && !defined (ACE_HAS_WINCE) && !defined (ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER)
 // Rename "main ()" on platforms that don't allow it to be called "main ()".
-
-// Also, create ACE_Object_Manager static instance(s) in "main ()".
-// ACE_MAIN_OBJECT_MANAGER defines the ACE_Object_Manager(s) that will
-// be instantiated on the stack of main ().  Note that it is only used
-// when compiling main ():  its value does not affect the contents of
-// ace/OS.o.
-#   if !defined (ACE_MAIN_OBJECT_MANAGER)
-#     define ACE_MAIN_OBJECT_MANAGER \
-        ACE_OS_Object_Manager ace_os_object_manager; \
-        ACE_Object_Manager ace_object_manager;
-#   endif /* ! ACE_MAIN_OBJECT_MANAGER */
+// Also, create an ACE_Object_Manager static instance in "main ()".
+#   include "ace/Object_Manager.h"
 
 #   if defined (ACE_PSOSIM)
 // PSOSIM root lacks the standard argc, argv command line parameters,
@@ -6909,7 +6159,7 @@ ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 { \
   int argc = 1;                            /* dummy arg count */ \
   char *argv[] = {"psosim"};               /* dummy arg list */ \
-  ACE_MAIN_OBJECT_MANAGER \
+  ACE_Object_Manager ace_object_manager;   /* has program lifetime */ \
   int ret_val = -1; /* assume the worst */ \
   if (ACE_PSOS_Time_t::init_simulator_time ()) /* init simulator time */ \
   { \
@@ -6934,19 +6184,19 @@ ACE_MAIN ()   /* user's entry point, e.g., "main" w/out argc, argv */ \
 { \
   int argc = 1;                           /* dummy arg count */ \
   char *argv[] = {"root"};                /* dummy arg list */ \
-  ACE_MAIN_OBJECT_MANAGER \
+  ACE_Object_Manager ace_object_manager;  /* has program lifetime */ \
   ace_main_i (argc, argv);                /* call user main, ignore result */ \
 } \
 int \
 ace_main_i
 #   else
 #     define main \
-ace_main_i (int, ASYS_TCHAR *[]);                  /* forward declaration */ \
+ace_main_i (int, char *[]);                      /* forward declaration */ \
 int \
-ACE_MAIN (int argc, ASYS_TCHAR *argv[]) /* user's entry point, e.g., main */ \
+ACE_MAIN (int argc, char *argv[])   /* user's entry point, e.g., "main" */ \
 { \
-  ACE_MAIN_OBJECT_MANAGER \
-  return ace_main_i (argc, argv);           /* what the user calls "main" */ \
+  ACE_Object_Manager ace_object_manager;        /* has program lifetime */ \
+  return ace_main_i (argc, argv);         /* what the user calls "main" */ \
 } \
 int \
 ace_main_i
@@ -6954,6 +6204,21 @@ ace_main_i
 # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */
 
 # if defined (ACE_HAS_WINCE)
+#   include "ace/Object_Manager.h"
+// We need to rename program entry name "main" with ace_ce_main here
+// so that we can call it from CE's bridge class.
+
+// I'll assume there'll only be DLL version of ACE on CE for now.
+#   define main \
+ace_main_i (int, ASYS_TCHAR *[]); /* forward declaration */ \
+int \
+ace_ce_main (int argc, ASYS_TCHAR *argv[])   /* user's entry point, e.g., "main" */ \
+{ \
+  return ace_main_i (argc, argv);         /* what the user calls "main" */ \
+} \
+int \
+ace_main_i
+
 class ACE_Export ACE_CE_Bridge
 {
   // = TITLE
@@ -6973,31 +6238,21 @@ public:
   ACE_CE_Bridge (void);
   // Default ctor.
 
-#   if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
   ACE_CE_Bridge (CWnd *, int notification, int idc);
   // Construct and set the default windows.
-#   endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */
-
-  ACE_CE_Bridge (HWND, int notification, int idc);
-  // Construct and set the default windows.
 
   ~ACE_CE_Bridge (void);
   // Default dtor.
 
-#   if defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
   void set_window (CWnd *, int notification, int idc);
   // Specify which window to use.
-#   endif /* ACE_HAS_MFC && ACE_HAS_MFC != 0 */
-
-  void set_window (HWND, int notification, int idc);
-  // Specify which window to use.
 
   void set_self_default (void);
   // Set the default window.
 
   int notification (void);
   int idc (void);
-  HWND window (void);
+  CWnd *window (void);
   // Access functions.
 
   static ACE_CE_Bridge *get_default_winbridge (void);
@@ -7006,15 +6261,16 @@ public:
   int write_msg (LPCTSTR str);
   // Write a string to windows.
 
-#if 0
   int write_msg (CString *cs);
   // Write a CString to windows.  Notice that the CString object will
   // be freed by windows.
-#endif /* 0 */
 private:
   // @@ We should use a allocator here.
 
-  HWND text_output_;
+  CWinThread *control_;
+  // The ace program that tied to this windows.
+
+  CWnd *text_output_;
   // A pointer to the window that knows how to
   // handle ACE related messages.
 
@@ -7153,10 +6409,6 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 #   define ASYS_INLINE inline
 # endif /* ACE_LACKS_INLINE_FUNCTIONS */
 
-# if !defined (ACE_HAS_MINIMAL_ACE_OS)
-#   include "ace/Trace.h"
-# endif /* ! ACE_HAS_MINIMAL_ACE_OS */
-
 # if defined (ACE_HAS_INLINED_OSCALLS)
 #   if defined (ACE_INLINE)
 #     undef ACE_INLINE
@@ -7165,10 +6417,10 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 #   include "ace/OS.i"
 # endif /* ACE_HAS_INLINED_OSCALLS */
 
-# if !defined (ACE_HAS_MINIMAL_ACE_OS)
-    // This needs to come here to avoid problems with circular dependencies.
-#   include "ace/Log_Msg.h"
-# endif /* ! ACE_HAS_MINIMAL_ACE_OS */
+# include "ace/Trace.h"
+
+// These need to come here to avoid problems with circular dependencies.
+# include "ace/Log_Msg.h"
 
 // The following are some insane macros that are useful in cases when
 // one has to have a string in a certain format.  Both of these macros
@@ -7184,21 +6436,20 @@ typedef ACE_TRANSMIT_FILE_BUFFERS* ACE_LPTRANSMIT_FILE_BUFFERS;
 // that some data may be lost in this conversion.
 
 # if defined (UNICODE)
+#   include "ace/Auto_Ptr.h"
+#   include "ace/SString.h"
 #   define ACE_WIDE_STRING(ASCII_STRING) \
-ACE_OS_CString (ASCII_STRING).wchar_rep ()
+ACE_WString (ASCII_STRING).fast_rep ()
 #   define ACE_MULTIBYTE_STRING(WIDE_STRING) \
-ACE_OS_WString (WIDE_STRING).char_rep ()
+ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get ()
 #   define ACE_TEXT_STRING ACE_WString
 #   if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
 #     define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING
-#     define ASYS_ONLY_WIDE_STRING(WIDE_STRING) WIDE_STRING
 #     define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) \
-ACE_OS_WString (WIDE_STRING).char_rep ()
+ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get ()
 #   else
 #     define ASYS_MULTIBYTE_STRING(WIDE_STRING) \
-ACE_OS_WString (WIDE_STRING).char_rep ()
-#     define ASYS_ONLY_WIDE_STRING(ASCII_STRING) \
-ACE_OS_CString (ASCII_STRING).wchar_rep ()
+ACE_Auto_Basic_Array_Ptr<char> (ACE_WString (WIDE_STRING).char_rep ()).get ()
 #     define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING
 #   endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 # else
@@ -7206,12 +6457,11 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 #   define ACE_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING
 #   define ACE_TEXT_STRING ACE_CString
 #   define ASYS_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING
-#   define ASYS_ONLY_WIDE_STRING(WIDE_STRING) WIDE_STRING
 #   define ASYS_ONLY_MULTIBYTE_STRING(WIDE_STRING) WIDE_STRING
 # endif /* UNICODE */
 
 # if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
-#   define ASYS_WIDE_STRING(ASCII_STRING) ACE_OS_CString (ASCII_STRING).wchar_rep ()
+#   define ASYS_WIDE_STRING(ASCII_STRING) ACE_WString (ASCII_STRING).fast_rep ()
 # else
 #   define ASYS_WIDE_STRING(ASCII_STRING) ASCII_STRING
 # endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
@@ -7226,13 +6476,9 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 # if defined (ACE_LITTLE_ENDIAN)
 #   define ACE_HTONL(X) ACE_SWAP_LONG (X)
 #   define ACE_NTOHL(X) ACE_SWAP_LONG (X)
-#   define ACE_IDL_NCTOHL(X) (X)
-#   define ACE_IDL_NSTOHL(X) (X)
 # else
 #   define ACE_HTONL(X) X
 #   define ACE_NTOHL(X) X
-#   define ACE_IDL_NCTOHL(X) (X << 24)
-#   define ACE_IDL_NSTOHL(X) ((X) << 16)
 # endif /* ACE_LITTLE_ENDIAN */
 
 # if defined (ACE_LITTLE_ENDIAN)
@@ -7256,12 +6502,16 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 #   else /* not _POSIX_RTSIG_MAX */
   // POSIX-4 compilant system has to provide atleast 8 RT signals.
   // @@ Make sure the platform does *not* define this constant with
-  // some other name. If yes, use that instead of 8.
+  // some other name. If yes, use that instead of 8.(Alex)
 #     define ACE_RTSIG_MAX 8
 #   endif /* _POSIX_RTSIG_MAX */
+
+  // The signal used for all the Asynch_Operations.
+#   define ACE_SIG_AIO SIGRTMIN
+
 # endif /* ACE_HAS_AIO_CALLS */
 
-  // Wrapping around wait status <wstat> macros for platforms that
+  // Wrapping around wait status <wstat> macros for platforms that 
   // lack them.
 
   // Evaluates to a non-zero value if status was returned for a child
@@ -7312,10 +6562,10 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 
 // Stuff used by the ACE CDR classes.
 #if defined ACE_LITTLE_ENDIAN
-#  define ACE_CDR_BYTE_ORDER 1
+#  define ACE_CDR_BYTE_ORDER 1  
 // little endian encapsulation byte order has value = 1
 #else  /* ! ACE_LITTLE_ENDIAN */
-#  define ACE_CDR_BYTE_ORDER 0
+#  define ACE_CDR_BYTE_ORDER 0  
 // big endian encapsulation byte order has value = 0
 #endif /* ! ACE_LITTLE_ENDIAN */
 
@@ -7327,7 +6577,7 @@ ACE_OS_CString (ASCII_STRING).wchar_rep ()
 // more efficient just to copy the octet sequence, for instance, while
 // enconding a "small" octet sequence in a buffer that has enough
 // space. This parameter controls the default value for "small enough",
-// but an ORB may use a different value, set from a command line option.
+// but an ORB may use a different value, set from a command line option. 
 #define ACE_DEFAULT_CDR_MEMCPY_TRADEOFF 256
 
 // In some environments it is useful to swap the bytes on write, for
@@ -7414,13 +6664,4 @@ typedef u_long long ptr_arith_t;
 #define ptr_align_binary(ptr, alignment) \
         ((char *) align_binary (((ptr_arith_t) (ptr)), (alignment)))
 
-// Defining POSIX4 real-time signal range.
-#if defined ACE_HAS_AIO_CALLS
-#define ACE_SIGRTMIN SIGRTMIN
-#define ACE_SIGRTMAX SIGRTMAX
-#else /* !ACE_HAS_AIO_CALLS */
-#define ACE_SIGRTMIN 0
-#define ACE_SIGRTMAX 0
-#endif /* ACE_HAS_AIO_CALLS */
-
 #endif  /* ACE_OS_H */
diff --git a/ace/OS.i b/ace/OS.i
index c202b4d0d2e..c74e3deb1ab 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -112,7 +112,7 @@ typedef const struct timespec * ACE_TIMESPEC_PTR;
 ACE_INLINE
 ACE_Time_Value::operator timeval () const
 {
-  ACE_TRACE ("ACE_Time_Value::operator timeval");
+  // ACE_TRACE ("ACE_Time_Value::operator timeval");
   return this->tv_;
 }
 
@@ -121,7 +121,7 @@ ACE_Time_Value::operator timeval () const
 ACE_INLINE
 ACE_Time_Value::operator const timeval * () const
 {
-  ACE_TRACE ("ACE_Time_Value::operator timeval");
+  // ACE_TRACE ("ACE_Time_Value::operator timeval");
   return (const timeval *) &this->tv_;
 }
 
@@ -177,7 +177,6 @@ ACE_Time_Value::set (const timeval &tv)
 
 ACE_INLINE
 ACE_Time_Value::ACE_Time_Value (const timeval &tv)
-  // : tv_ ()
 {
   // ACE_TRACE ("ACE_Time_Value::ACE_Time_Value");
   this->set (tv);
@@ -185,7 +184,6 @@ ACE_Time_Value::ACE_Time_Value (const timeval &tv)
 
 ACE_INLINE
 ACE_Time_Value::ACE_Time_Value (void)
-  // : tv_ ()
 {
   // ACE_TRACE ("ACE_Time_Value::ACE_Time_Value");
   this->set (0, 0);
@@ -207,7 +205,7 @@ ACE_INLINE int
 operator > (const ACE_Time_Value &tv1,
             const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator >");
+  // ACE_TRACE ("operator >");
   if (tv1.tv_.tv_sec > tv2.tv_.tv_sec)
     return 1;
   else if (tv1.tv_.tv_sec == tv2.tv_.tv_sec
@@ -223,7 +221,7 @@ ACE_INLINE int
 operator >= (const ACE_Time_Value &tv1,
              const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator >=");
+  // ACE_TRACE ("operator >=");
   if (tv1.tv_.tv_sec > tv2.tv_.tv_sec)
     return 1;
   else if (tv1.tv_.tv_sec == tv2.tv_.tv_sec
@@ -238,7 +236,7 @@ operator >= (const ACE_Time_Value &tv1,
 ACE_INLINE
 ACE_Time_Value::operator timespec_t () const
 {
-  ACE_TRACE ("ACE_Time_Value::operator timespec_t");
+  // ACE_TRACE ("ACE_Time_Value::operator timespec_t");
   timespec_t tv;
 #if ! defined(ACE_HAS_BROKEN_TIMESPEC_MEMBERS)
   tv.tv_sec = this->tv_.tv_sec;
@@ -256,7 +254,6 @@ ACE_Time_Value::operator timespec_t () const
 
 ACE_INLINE
 ACE_Time_Value::ACE_Time_Value (const timespec_t &tv)
-  // : tv_ ()
 {
   // ACE_TRACE ("ACE_Time_Value::ACE_Time_Value");
   this->set (tv);
@@ -276,7 +273,7 @@ ACE_Time_Value::ACE_Time_Value (const ACE_Time_Value &tv)
 ACE_INLINE long
 ACE_Time_Value::sec (void) const
 {
-  ACE_TRACE ("ACE_Time_Value::sec");
+  // ACE_TRACE ("ACE_Time_Value::sec");
   return this->tv_.tv_sec;
 }
 
@@ -285,7 +282,7 @@ ACE_Time_Value::sec (void) const
 ACE_INLINE void
 ACE_Time_Value::sec (long sec)
 {
-  ACE_TRACE ("ACE_Time_Value::sec");
+  // ACE_TRACE ("ACE_Time_Value::sec");
   this->tv_.tv_sec = sec;
 }
 
@@ -294,7 +291,7 @@ ACE_Time_Value::sec (long sec)
 ACE_INLINE long
 ACE_Time_Value::msec (void) const
 {
-  ACE_TRACE ("ACE_Time_Value::msec");
+  // ACE_TRACE ("ACE_Time_Value::msec");
   return this->tv_.tv_sec * 1000 + this->tv_.tv_usec / 1000;
 }
 
@@ -303,7 +300,7 @@ ACE_Time_Value::msec (void) const
 ACE_INLINE void
 ACE_Time_Value::msec (long milliseconds)
 {
-  ACE_TRACE ("ACE_Time_Value::msec");
+  // ACE_TRACE ("ACE_Time_Value::msec");
   // Convert millisecond units to seconds;
   this->tv_.tv_sec = milliseconds / 1000;
   // Convert remainder to microseconds;
@@ -315,7 +312,7 @@ ACE_Time_Value::msec (long milliseconds)
 ACE_INLINE long
 ACE_Time_Value::usec (void) const
 {
-  ACE_TRACE ("ACE_Time_Value::usec");
+  // ACE_TRACE ("ACE_Time_Value::usec");
   return this->tv_.tv_usec;
 }
 
@@ -324,7 +321,7 @@ ACE_Time_Value::usec (void) const
 ACE_INLINE void
 ACE_Time_Value::usec (long usec)
 {
-  ACE_TRACE ("ACE_Time_Value::usec");
+  // ACE_TRACE ("ACE_Time_Value::usec");
   this->tv_.tv_usec = usec;
 }
 
@@ -334,7 +331,7 @@ ACE_INLINE int
 operator < (const ACE_Time_Value &tv1,
             const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator <");
+  // ACE_TRACE ("operator <");
   return tv2 > tv1;
 }
 
@@ -344,7 +341,7 @@ ACE_INLINE int
 operator <= (const ACE_Time_Value &tv1,
              const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator <=");
+  // ACE_TRACE ("operator <=");
   return tv2 >= tv1;
 }
 
@@ -374,7 +371,7 @@ operator != (const ACE_Time_Value &tv1,
 ACE_INLINE void
 ACE_Time_Value::operator+= (const ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Time_Value::operator+=");
+  // ACE_TRACE ("ACE_Time_Value::operator+=");
   this->tv_.tv_sec += tv.tv_.tv_sec;
   this->tv_.tv_usec += tv.tv_.tv_usec;
   this->normalize ();
@@ -385,7 +382,7 @@ ACE_Time_Value::operator+= (const ACE_Time_Value &tv)
 ACE_INLINE void
 ACE_Time_Value::operator-= (const ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_Time_Value::operator-=");
+  // ACE_TRACE ("ACE_Time_Value::operator-=");
   this->tv_.tv_sec -= tv.tv_.tv_sec;
   this->tv_.tv_usec -= tv.tv_.tv_usec;
   this->normalize ();
@@ -397,7 +394,7 @@ ACE_INLINE ACE_Time_Value
 operator + (const ACE_Time_Value &tv1,
             const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator +");
+  // ACE_TRACE ("operator +");
   ACE_Time_Value sum (tv1.tv_.tv_sec + tv2.tv_.tv_sec,
                       tv1.tv_.tv_usec + tv2.tv_.tv_usec);
 
@@ -411,7 +408,7 @@ ACE_INLINE ACE_Time_Value
 operator - (const ACE_Time_Value &tv1,
             const ACE_Time_Value &tv2)
 {
-  ACE_TRACE ("operator -");
+  // ACE_TRACE ("operator -");
   ACE_Time_Value delta (tv1.tv_.tv_sec - tv2.tv_.tv_sec,
                         tv1.tv_.tv_usec - tv2.tv_.tv_usec);
   delta.normalize ();
@@ -426,9 +423,7 @@ operator - (const ACE_Time_Value &tv1,
 #   include /**/ <cstring>
 # else
 #   if defined (ACE_LACKS_MEMORY_H)
-#     if !defined (ACE_PSOS_DIAB_MIPS)
-#       include /**/ <string.h>
-#     endif /* ACE_PSOS_DIAB_MIPS */
+#     include /**/ <string.h>
 #   else
 #     include /**/ <memory.h>
 #   endif /* VXWORKS */
@@ -484,7 +479,7 @@ extern "C" char *mktemp (char *);
 ACE_INLINE int
 ACE_OS::chdir (const char *path)
 {
-  ACE_TRACE ("ACE_OS::chdir");
+  // ACE_TRACE ("ACE_OS::chdir");
 #   if defined (VXWORKS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::chdir ((char *) path), ace_result_),
                      int, -1);
@@ -503,23 +498,23 @@ ACE_OS::chdir (const char *path)
 # endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
 
 ACE_INLINE int
-ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
+ACE_OS::fcntl (ACE_HANDLE handle, int cmd, int value)
 {
-  ACE_TRACE ("ACE_OS::fcntl");
+  // ACE_TRACE ("ACE_OS::fcntl");
 # if defined (ACE_LACKS_FCNTL)
   ACE_UNUSED_ARG (handle);
   ACE_UNUSED_ARG (cmd);
-  ACE_UNUSED_ARG (arg);
+  ACE_UNUSED_ARG (value);
   ACE_NOTSUP_RETURN (-1);
 # else
-  ACE_OSCALL_RETURN (::fcntl (handle, cmd, arg), int, -1);
+  ACE_OSCALL_RETURN (::fcntl (handle, cmd, value), int, -1);
 # endif /* ACE_LACKS_FCNTL */
 }
 
 ACE_INLINE int
 ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
 {
-  ACE_TRACE ("ACE_OS::fstat");
+  // ACE_TRACE ("ACE_OS::fstat");
 #if defined (ACE_PSOS_LACKS_PHILE)
   ACE_UNUSED_ARG (handle);
   ACE_UNUSED_ARG (stp);
@@ -541,7 +536,7 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
 ACE_INLINE int
 ACE_OS::lstat (const char *file, struct stat *stp)
 {
-  ACE_TRACE ("ACE_OS::lstat");
+  // ACE_TRACE ("ACE_OS::lstat");
 # if defined (ACE_LACKS_LSTAT) || \
      defined (ACE_HAS_WINCE) || defined (ACE_WIN32)
   ACE_UNUSED_ARG (file);
@@ -561,19 +556,19 @@ ACE_OS::lstat (const char *file, struct stat *stp)
 ACE_INLINE int
 ACE_OS::fsync (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::fsync");
+  // ACE_TRACE ("ACE_OS::fsync");
 # if defined (ACE_LACKS_FSYNC)
   ACE_UNUSED_ARG (handle);
   ACE_NOTSUP_RETURN (-1);
 # else
   ACE_OSCALL_RETURN (::fsync (handle), int, -1);
-# endif /* ACE_LACKS_FSYNC */
+# endif /* ACE_LACKS_FCNTL */
 }
 
 ACE_INLINE gid_t
 ACE_OS::getgid (void)
 {
-  ACE_TRACE ("ACE_OS::getgid");
+  // ACE_TRACE ("ACE_OS::getgid");
 # if defined (VXWORKS) || defined(CHORUS) || defined (ACE_PSOS)
   // getgid() is not supported:  just one group anyways
   return 0;
@@ -585,7 +580,7 @@ ACE_OS::getgid (void)
 ACE_INLINE int
 ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
 {
-  ACE_TRACE ("ACE_OS::getopt");
+  // ACE_TRACE ("ACE_OS::getopt");
 #if defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
@@ -604,7 +599,7 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
 ACE_INLINE int
 ACE_OS::mkfifo (const char *file, mode_t mode)
 {
-  ACE_TRACE ("ACE_OS::mkfifo");
+  // ACE_TRACE ("ACE_OS::mkfifo");
 #if defined (ACE_LACKS_MKFIFO)
   ACE_UNUSED_ARG (file);
   ACE_UNUSED_ARG (mode);
@@ -626,7 +621,7 @@ ACE_OS::mktemp (char *s)
 ACE_INLINE int
 ACE_OS::pipe (ACE_HANDLE fds[])
 {
-  ACE_TRACE ("ACE_OS::pipe");
+  // ACE_TRACE ("ACE_OS::pipe");
 #if defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (fds);
   ACE_NOTSUP_RETURN (-1);
@@ -650,7 +645,7 @@ extern "C" {
 ACE_INLINE int
 ACE_OS::rand_r (ACE_RANDR_TYPE &seed)
 {
-  ACE_TRACE ("ACE_OS::rand_r");
+  // ACE_TRACE ("ACE_OS::rand_r");
 # if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Prand_r (&seed), int, -1);
@@ -675,7 +670,7 @@ ACE_OS::rand_r (ACE_RANDR_TYPE &seed)
 ACE_INLINE pid_t
 ACE_OS::setsid (void)
 {
-  ACE_TRACE ("ACE_OS::setsid");
+  // ACE_TRACE ("ACE_OS::setsid");
 #if defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS)
   ACE_NOTSUP_RETURN (-1);
 # else
@@ -686,7 +681,7 @@ ACE_OS::setsid (void)
 ACE_INLINE mode_t
 ACE_OS::umask (mode_t cmask)
 {
-  ACE_TRACE ("ACE_OS::umask");
+  // ACE_TRACE ("ACE_OS::umask");
 #if defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (cmask);
   ACE_NOTSUP_RETURN (-1);
@@ -739,7 +734,7 @@ ACE_OS::default_win32_security_attributes (LPSECURITY_ATTRIBUTES sa)
 ACE_INLINE int
 ACE_OS::chdir (const char *path)
 {
-  ACE_TRACE ("ACE_OS::chdir");
+  // ACE_TRACE ("ACE_OS::chdir");
   ACE_OSCALL_RETURN (::_chdir (path), int, -1);
 }
 
@@ -753,12 +748,12 @@ ACE_OS::mktemp (char *s)
 # endif /* !ACE_HAS_MOSTLY_UNICODE_APIS */
 
 ACE_INLINE int
-ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
+ACE_OS::fcntl (ACE_HANDLE handle, int cmd, int value)
 {
-  ACE_TRACE ("ACE_OS::fcntl");
+  // ACE_TRACE ("ACE_OS::fcntl");
   ACE_UNUSED_ARG (handle);
   ACE_UNUSED_ARG (cmd);
-  ACE_UNUSED_ARG (arg);
+  ACE_UNUSED_ARG (value);
 
   ACE_NOTSUP_RETURN (-1); // We should be able to map this stuff
 }
@@ -766,7 +761,7 @@ ACE_OS::fcntl (ACE_HANDLE handle, int cmd, long arg)
 ACE_INLINE uid_t
 ACE_OS::getgid (void)
 {
-  ACE_TRACE ("ACE_OS::getgid");
+  // ACE_TRACE ("ACE_OS::getgid");
   ACE_NOTSUP_RETURN (-1);
 }
 
@@ -777,7 +772,7 @@ ACE_OS::getopt (int argc, char *const *argv, const char *optstring)
   ACE_UNUSED_ARG (argv);
   ACE_UNUSED_ARG (optstring);
 
-  ACE_TRACE ("ACE_OS::getopt");
+  // ACE_TRACE ("ACE_OS::getopt");
   ACE_NOTSUP_RETURN (-1);
 }
 
@@ -788,7 +783,7 @@ ACE_OS::mkfifo (const char *file, mode_t mode)
   ACE_UNUSED_ARG (file);
   ACE_UNUSED_ARG (mode);
 
-  ACE_TRACE ("ACE_OS::mkfifo");
+  // ACE_TRACE ("ACE_OS::mkfifo");
   ACE_NOTSUP_RETURN (-1);
 }
 # endif /* ACE_HAS_MOSTLY_UNICODE_APIS */
@@ -797,7 +792,7 @@ ACE_INLINE int
 ACE_OS::pipe (ACE_HANDLE fds[])
 {
 # if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::pipe");
+  // ACE_TRACE ("ACE_OS::pipe");
   ACE_OSCALL_RETURN (::_pipe ((int *) fds, PIPE_BUF, 0), int, -1);   // Use default mode
 # else
   ACE_NOTSUP_RETURN (-1);
@@ -809,14 +804,14 @@ ACE_OS::rand_r (ACE_RANDR_TYPE& seed)
 {
   ACE_UNUSED_ARG (seed);
 
-  ACE_TRACE ("ACE_OS::rand_r");
+  // ACE_TRACE ("ACE_OS::rand_r");
   ACE_NOTSUP_RETURN (-1);
 }
 
 ACE_INLINE pid_t
 ACE_OS::setsid (void)
 {
-  ACE_TRACE ("ACE_OS::setsid");
+  // ACE_TRACE ("ACE_OS::setsid");
   ACE_NOTSUP_RETURN (-1);
 }
 
@@ -824,7 +819,7 @@ ACE_INLINE mode_t
 ACE_OS::umask (mode_t cmask)
 {
 # if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::umask");
+  // ACE_TRACE ("ACE_OS::umask");
   ACE_OSCALL_RETURN (::_umask (cmask), int, -1);
 # else
   ACE_NOTSUP_RETURN (-1);
@@ -834,8 +829,8 @@ ACE_OS::umask (mode_t cmask)
 ACE_INLINE int
 ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
 {
-  ACE_TRACE ("ACE_OS::fstat");
-# if 1
+  // ACE_TRACE ("ACE_OS::fstat");
+# if defined (ACE_HAS_WINCE)
   BY_HANDLE_FILE_INFORMATION fdata;
 
   if (::GetFileInformationByHandle (handle, &fdata) == FALSE)
@@ -851,19 +846,11 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
   else
     {
       stp->st_size = fdata.nFileSizeLow;
-      stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime).sec ();
-      stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime).sec ();
-#if !defined (ACE_HAS_WINCE)
-      stp->st_ctime = ACE_Time_Value (fdata.ftCreationTime).sec ();
-      stp->st_nlink = ACE_static_cast (short, fdata.nNumberOfLinks);
-      stp->st_dev = stp->st_rdev = 0; // No equivalent conversion.
-      stp->st_mode = S_IXOTH | S_IROTH |
-        (fdata.dwFileAttributes & FILE_ATTRIBUTE_READONLY ? 0 : S_IWOTH);
-#endif /* !ACE_HAS_WINCE */
+      stp->st_atime = ACE_Time_Value (fdata.ftLastAccessTime);
+      stp->st_mtime = ACE_Time_Value (fdata.ftLastWriteTime);
     }
   return 0;
-# else /* 1 */
-  // This implementation close the handle.
+# else
   int retval = -1;
   int fd = ::_open_osfhandle ((long) handle, 0);
   if (fd != -1)
@@ -872,7 +859,7 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
   ::_close (fd);
   // Remember to close the file handle.
   return retval;
-# endif /* 1 */
+# endif /* ACE_HAS_WINCE */
 }
 
 #endif /* WIN32 */
@@ -880,10 +867,10 @@ ACE_OS::fstat (ACE_HANDLE handle, struct stat *stp)
 ACE_INLINE int
 ACE_OS::clock_gettime (clockid_t clockid, struct timespec *ts)
 {
-  ACE_TRACE ("ACE_OS::clock_gettime");
+  // ACE_TRACE ("ACE_OS::clock_gettime");
 #if defined (ACE_HAS_CLOCK_GETTIME)
   ACE_OSCALL_RETURN (::clock_gettime (clockid, ts), int, -1);
-# elif defined (ACE_PSOS) && ! defined (ACE_PSOS_DIAB_MIPS)
+#elif defined (ACE_PSOS)
   ACE_UNUSED_ARG (clockid);
   ACE_PSOS_Time_t pt;
   int result = ACE_PSOS_Time_t::get_system_time(pt);
@@ -900,7 +887,6 @@ ACE_INLINE ACE_Time_Value
 ACE_OS::gettimeofday (void)
 {
   // ACE_TRACE ("ACE_OS::gettimeofday");
-
   timeval tv;
   int result = 0;
 #if defined (ACE_HAS_WINCE)
@@ -954,7 +940,7 @@ ACE_OS::gettimeofday (void)
 ACE_INLINE int
 ACE_OS::stat (const char *file, struct stat *stp)
 {
-  ACE_TRACE ("ACE_OS::stat");
+  // ACE_TRACE ("ACE_OS::stat");
 # if defined (VXWORKS)
   ACE_OSCALL_RETURN (::stat ((char *) file, stp), int, -1);
 #elif defined (ACE_PSOS_LACKS_PHILE)
@@ -979,16 +965,8 @@ ACE_INLINE time_t
 ACE_OS::time (time_t *tloc)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::time");
-#  if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
-        unsigned long d_date, d_time, d_tick;
-        tm_get(&d_date, &d_time, &d_tick); // get current time
-        if (tloc)
-                *tloc = d_time; // set time as time_t
-        return d_time;
-#  else
+  // ACE_TRACE ("ACE_OS::time");
   ACE_OSCALL_RETURN (::time (tloc), time_t, (time_t) -1);
-#  endif /* ACE_PSOS && ! ACE_PSOS_HAS_TIME */
 #else
   time_t retv = ACE_OS::gettimeofday ().sec ();
   if (tloc)
@@ -1000,14 +978,14 @@ ACE_OS::time (time_t *tloc)
 ACE_INLINE void
 ACE_OS::srand (u_int seed)
 {
-  ACE_TRACE ("ACE_OS::srand");
+  // ACE_TRACE ("ACE_OS::srand");
   ::srand (seed);
 }
 
 ACE_INLINE int
 ACE_OS::rand (void)
 {
-  ACE_TRACE ("ACE_OS::rand");
+  // ACE_TRACE ("ACE_OS::rand");
   ACE_OSCALL_RETURN (::rand (), int, -1);
 }
 
@@ -1015,20 +993,13 @@ ACE_OS::rand (void)
 ACE_INLINE int
 ACE_OS::unlink (const char *path)
 {
-  ACE_TRACE ("ACE_OS::unlink");
+  // ACE_TRACE ("ACE_OS::unlink");
 # if defined (VXWORKS)
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::unlink ((char *) path),
-                                                   ace_result_),
-                       int, -1);
-# elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE)
-    ACE_OSCALL_RETURN (::remove_f ((char *) path), int , -1);
-# elif defined (ACE_PSOS) && defined (ACE_PSOS_HAS_C_LIBRARY)
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove ((char *) path),
-                                                   ace_result_),
-                       int, -1);
-# elif defined (ACE_LACKS_UNLINK)
-    ACE_UNUSED_ARG (path);
-    ACE_NOTSUP_RETURN (-1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::unlink ((char *) path), ace_result_),
+                     int, -1);
+# elif defined (ACE_PSOS)
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::remove ((char *) path), ace_result_),
+                     int, -1);
 # else
   ACE_OSCALL_RETURN (::unlink (path), int, -1);
 # endif /* VXWORKS */
@@ -1037,19 +1008,19 @@ ACE_OS::unlink (const char *path)
 ACE_INLINE int
 ACE_OS::rename (const char *old_name, const char *new_name)
 {
-# if (ACE_LACKS_RENAME)
+# if 0
+  ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1);
+# else
   ACE_UNUSED_ARG (old_name);
   ACE_UNUSED_ARG (new_name);
   ACE_NOTSUP_RETURN (-1);
-# else
-  ACE_OSCALL_RETURN (::rename (old_name, new_name), int, -1);
-# endif /* ACE_LACKS_RENAME */
+# endif /* 0 */
 }
 
 ACE_INLINE char *
 ACE_OS::tempnam (const char *dir, const char *pfx)
 {
-  ACE_TRACE ("ACE_OS::tempnam");
+  // ACE_TRACE ("ACE_OS::tempnam");
 # if defined (VXWORKS) || defined (ACE_LACKS_TEMPNAM)
   ACE_UNUSED_ARG (dir);
   ACE_UNUSED_ARG (pfx);
@@ -1074,7 +1045,7 @@ ACE_OS::tempnam (const char *dir, const char *pfx)
 ACE_INLINE int
 ACE_OS::shm_unlink (const char *path)
 {
-  ACE_TRACE ("ACE_OS::shm_unlink");
+  // ACE_TRACE ("ACE_OS::shm_unlink");
 # if defined (ACE_HAS_SHM_OPEN)
   ACE_OSCALL_RETURN (::shm_unlink (path), int, -1);
 # else  /* ! ACE_HAS_SHM_OPEN */
@@ -1087,7 +1058,7 @@ ACE_OS::shm_unlink (const char *path)
 ACE_INLINE LPTSTR
 ACE_OS::cuserid (LPTSTR user, size_t maxlen)
 {
-  ACE_TRACE ("ACE_OS::cuserid");
+  // ACE_TRACE ("ACE_OS::cuserid");
 #if defined (VXWORKS)
   ACE_UNUSED_ARG (maxlen);
   if (user == 0)
@@ -1101,7 +1072,7 @@ ACE_OS::cuserid (LPTSTR user, size_t maxlen)
       ::remCurIdGet (user, 0);
       return user;
     }
-#elif defined (CHORUS) || defined (ACE_HAS_WINCE) || defined (ACE_PSOS) || defined (__QNXNTO__)
+#elif defined (CHORUS) || defined (ACE_HAS_WINCE) || defined (ACE_PSOS)
   // @@ WinCE doesn't support GetUserName.  But there should be a way
   // to get around this.
   ACE_UNUSED_ARG (user);
@@ -1125,7 +1096,7 @@ ACE_OS::cuserid (LPTSTR user, size_t maxlen)
 ACE_INLINE void
 ACE_OS::_exit (int status)
 {
-  ACE_TRACE ("ACE_OS::_exit");
+  // ACE_TRACE ("ACE_OS::_exit");
 #if defined (VXWORKS)
   ::exit (status);
 #elif defined (ACE_PSOSIM)
@@ -1158,7 +1129,7 @@ ACE_OS::abort (void)
 ACE_INLINE void *
 ACE_OS::malloc (size_t nbytes)
 {
-  ACE_TRACE ("ACE_OS::malloc");
+  // ACE_TRACE ("ACE_OS::malloc");
   return ::malloc (nbytes);
 }
 
@@ -1166,7 +1137,7 @@ ACE_INLINE void *
 ACE_OS::calloc (size_t elements, size_t sizeof_elements)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::calloc");
+  // ACE_TRACE ("ACE_OS::calloc");
   return ::calloc (elements, sizeof_elements);
 #else
   // @@ This will probably not work since it doesn't consider
@@ -1178,7 +1149,7 @@ ACE_OS::calloc (size_t elements, size_t sizeof_elements)
 ACE_INLINE void *
 ACE_OS::realloc (void *ptr, size_t nbytes)
 {
-  ACE_TRACE ("ACE_OS::realloc");
+  // ACE_TRACE ("ACE_OS::realloc");
   return ::realloc (ACE_MALLOC_T (ptr), nbytes);
 }
 
@@ -1192,31 +1163,11 @@ ACE_OS::free (void *ptr)
 ACE_INLINE int
 ACE_OS::memcmp (const void *t, const void *s, size_t len)
 {
-  ACE_TRACE ("ACE_OS::memcmp");
+  // ACE_TRACE ("ACE_OS::memcmp");
   return ::memcmp (t, s, len);
 }
 
 ACE_INLINE void *
-ACE_OS::memchr (const void *s, int c, size_t len)
-{
-#if defined (ACE_HAS_MEMCHR)
-  ACE_TRACE ("ACE_OS::memchr");
-  return ::memchr (s, c, len);
-#else
-  unsigned char *t = (unsigned char *) s;
-  unsigned char *e = (unsigned char *) s + len;
-  while (t < e)
-    {
-      if (((int) *t) == c)
-        return t;
-      else
-        t++;
-    }
-  return 0;
-#endif /* ACE_HAS_MEMCHR */
-}
-
-ACE_INLINE void *
 ACE_OS::memcpy (void *t, const void *s, size_t len)
 {
   // ACE_TRACE ("ACE_OS::memcpy");
@@ -1226,21 +1177,21 @@ ACE_OS::memcpy (void *t, const void *s, size_t len)
 ACE_INLINE void *
 ACE_OS::memmove (void *t, const void *s, size_t len)
 {
-  ACE_TRACE ("ACE_OS::memmove");
+  // ACE_TRACE ("ACE_OS::memcpy");
   return ::memmove (t, s, len);
 }
 
 ACE_INLINE void *
 ACE_OS::memset (void *s, int c, size_t len)
 {
-  ACE_TRACE ("ACE_OS::memset");
+  // ACE_TRACE ("ACE_OS::memset");
   return ::memset (s, c, len);
 }
 
 ACE_INLINE char *
 ACE_OS::strcat (char *s, const char *t)
 {
-  ACE_TRACE ("ACE_OS::strcat");
+  // ACE_TRACE ("ACE_OS::strcat");
   return ::strcat (s, t);
 }
 
@@ -1248,7 +1199,7 @@ ACE_INLINE size_t
 ACE_OS::strcspn (const char *s, const char *reject)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strcspn");
+  // ACE_TRACE ("ACE_OS::strcspn");
   return ::strcspn (s, reject);
 #else
   const char *scan;
@@ -1273,7 +1224,7 @@ ACE_INLINE size_t
 ACE_OS::strspn (const char *s, const char *t)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strspn");
+  // ACE_TRACE ("ACE_OS::strspn");
   return ::strspn (s, t);
 #else
   ACE_UNUSED_ARG (s);
@@ -1286,7 +1237,7 @@ ACE_INLINE char *
 ACE_OS::strchr (char *s, int c)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strchr");
+  // ACE_TRACE ("ACE_OS::strchr");
   return ::strchr (s, c);
 #else
   for (;;++s)
@@ -1303,7 +1254,7 @@ ACE_INLINE const char *
 ACE_OS::strchr (const char *s, int c)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strchr");
+  // ACE_TRACE ("ACE_OS::strchr");
   return (const char *) ::strchr (s, c);
 #else
   for (;;++s)
@@ -1335,14 +1286,14 @@ ACE_OS::strnchr (char *s, int c, size_t len)
 ACE_INLINE const char *
 ACE_OS::strstr (const char *s, const char *t)
 {
-  ACE_TRACE ("ACE_OS::strstr");
+  // ACE_TRACE ("ACE_OS::strstr");
   return (const char *) ::strstr (s, t);
 }
 
 ACE_INLINE char *
 ACE_OS::strstr (char *s, const char *t)
 {
-  ACE_TRACE ("ACE_OS::strstr");
+  // ACE_TRACE ("ACE_OS::strstr");
   return ::strstr (s, t);
 }
 
@@ -1385,7 +1336,7 @@ ACE_OS::strnstr (char *s, const char *t, size_t len)
 ACE_INLINE char *
 ACE_OS::strrchr (char *s, int c)
 {
-  ACE_TRACE ("ACE_OS::strrchr");
+  // ACE_TRACE ("ACE_OS::strrchr");
 #if !defined (ACE_LACKS_STRRCHR)
   return ::strrchr (s, c);
 #else
@@ -1404,7 +1355,7 @@ ACE_OS::strrchr (char *s, int c)
 ACE_INLINE const char *
 ACE_OS::strrchr (const char *s, int c)
 {
-  ACE_TRACE ("ACE_OS::strrchr");
+  // ACE_TRACE ("ACE_OS::strrchr");
 #if !defined (ACE_LACKS_STRRCHR)
   return (const char *) ::strrchr (s, c);
 #else
@@ -1423,7 +1374,7 @@ ACE_OS::strrchr (const char *s, int c)
 ACE_INLINE int
 ACE_OS::strcmp (const char *s, const char *t)
 {
-  ACE_TRACE ("ACE_OS::strcmp");
+  // ACE_TRACE ("ACE_OS::strcmp");
   return ::strcmp (s, t);
 }
 
@@ -1431,27 +1382,13 @@ ACE_INLINE char *
 ACE_OS::strcpy (char *s, const char *t)
 {
   // ACE_TRACE ("ACE_OS::strcpy");
-
   return ::strcpy (s, t);
 }
 
-ACE_INLINE char *
-ACE_OS::strecpy (char *s, const char *t)
-{
-  //  ACE_TRACE ("ACE_OS::strecpy");
-  register char *dscan = s;
-  register const char *sscan = t;
-
-  while ((*dscan++ = *sscan++) != '\0')
-    continue;
-
-  return dscan;
-}
-
 ACE_INLINE int
 ACE_OS::to_lower (int c)
 {
-  ACE_TRACE ("ACE_OS::to_lower");
+  // ACE_TRACE ("ACE_OS::to_lower");
   return tolower (c);
 }
 
@@ -1483,7 +1420,6 @@ ACE_INLINE char *
 ACE_OS::strdup (const char *s)
 {
   // ACE_TRACE ("ACE_OS::strdup");
-
   // @@ Should we provide this function on WinCE?
 #if defined (ACE_HAS_STRDUP_EMULATION)
   char *t = (char *) ::malloc (::strlen (s) + 1);
@@ -1508,7 +1444,7 @@ ACE_INLINE int
 ACE_OS::strcasecmp (const char *s, const char *t)
 {
 #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strcasecmp");
+  // ACE_TRACE ("ACE_OS::strcasecmp");
 # if defined (ACE_LACKS_STRCASECMP)
   // Handles most of what the BSD version does, but does not indicate
   // lexicographic ordering if the strings are unequal.  Just
@@ -1539,7 +1475,7 @@ ACE_INLINE int
 ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
 {
 #if !defined (ACE_WIN32) || defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strcasecmp");
+  // ACE_TRACE ("ACE_OS::strcasecmp");
 # if defined (ACE_LACKS_STRCASECMP)
   // Handles most of what the BSD version does, but does not indicate
   // lexicographic ordering if the strings are unequal.  Just
@@ -1570,7 +1506,7 @@ ACE_OS::strncasecmp (const char *s, const char *t, size_t len)
 ACE_INLINE int
 ACE_OS::strncmp (const char *s, const char *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strncmp");
+  // ACE_TRACE ("ACE_OS::strncmp");
   return ::strncmp (s, t, len);
 }
 
@@ -1584,21 +1520,21 @@ ACE_OS::strncpy (char *s, const char *t, size_t len)
 ACE_INLINE char *
 ACE_OS::strncat (char *s, const char *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strncat");
+  // ACE_TRACE ("ACE_OS::strncat");
   return ::strncat (s, t, len);
 }
 
 ACE_INLINE char *
 ACE_OS::strtok (char *s, const char *tokens)
 {
-  ACE_TRACE ("ACE_OS::strtok");
+  // ACE_TRACE ("ACE_OS::strtok");
   return ::strtok (s, tokens);
 }
 
 ACE_INLINE char *
 ACE_OS::strtok_r (char *s, const char *tokens, char **lasts)
 {
-  ACE_TRACE ("ACE_OS::strtok_r");
+  // ACE_TRACE ("ACE_OS::strtok_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
   return ::strtok_r (s, tokens, lasts);
 #else
@@ -1623,7 +1559,7 @@ ACE_OS::strtol (const char *s, char **ptr, int base)
   // @@ We must implement this function for WinCE also.
   // Notice WinCE support wcstol.
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strtol");
+  // ACE_TRACE ("ACE_OS::strtol");
   return ::strtol (s, ptr, base);
 #else
   ACE_UNUSED_ARG (s);
@@ -1639,7 +1575,7 @@ ACE_OS::strtoul (const char *s, char **ptr, int base)
   // @@ We must implement this function for WinCE also.
   // Notice WinCE support wcstoul.
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strtoul");
+  // ACE_TRACE ("ACE_OS::strtoul");
 # if defined (linux) && defined (__GLIBC__)
   // ::strtoul () appears to be broken on Linux 2.0.30/Alpha w/glibc:
   // it returns 0 for a negative number.
@@ -1660,7 +1596,7 @@ ACE_OS::strtod (const char *s, char **endptr)
 {
   // @@ WinCE only support wcstod
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::strtod");
+  // ACE_TRACE ("ACE_OS::strtod");
   return ::strtod (s, endptr);
 #else /* ACE_HAS_WINCE */
   ACE_UNUSED_ARG (s);
@@ -1683,7 +1619,7 @@ ACE_OS::ace_isspace (const char s)
 ACE_INLINE long
 ACE_OS::sysconf (int name)
 {
-  ACE_TRACE ("ACE_OS::sysconf");
+  // ACE_TRACE ("ACE_OS::sysconf");
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (-1);
@@ -1717,10 +1653,10 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
       && ::pthread_mutex_init (m, attributes) == 0)
 #   elif defined (ACE_HAS_PTHREADS_DRAFT7) || defined (ACE_HAS_PTHREADS_STD)
     if (ACE_ADAPT_RETVAL(::pthread_mutexattr_init (&attributes), result) == 0
-#     if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_MUTEXATTR_PSHARED)
+#     if defined (_POSIX_THREAD_PROCESS_SHARED)
         && ACE_ADAPT_RETVAL(::pthread_mutexattr_setpshared(&attributes, type),
                             result) == 0
-#     endif /* _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_MUTEXATTR_PSHARED */
+#     endif /* _POSIX_THREAD_PROCESS_SHARED */
         && ACE_ADAPT_RETVAL(::pthread_mutex_init (m, &attributes), result)== 0)
 #   else // draft 6
     if (::pthread_mutexattr_init (&attributes) == 0
@@ -1798,7 +1734,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
 ACE_INLINE int
 ACE_OS::mutex_destroy (ACE_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::mutex_destroy");
+  // ACE_TRACE ("ACE_OS::mutex_destroy");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
 #   if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6))
@@ -1837,7 +1773,7 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m)
 ACE_INLINE int
 ACE_OS::mutex_lock (ACE_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::mutex_lock");
+  // ACE_TRACE ("ACE_OS::mutex_lock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
@@ -1886,10 +1822,9 @@ ACE_OS::mutex_lock (ACE_mutex_t *m)
 }
 
 ACE_INLINE int
-ACE_OS::mutex_lock (ACE_mutex_t *m,
-                    int &abandoned)
+ACE_OS::mutex_lock (ACE_mutex_t *m, int &abandoned)
 {
-  ACE_TRACE ("ACE_OS::mutex_lock");
+  // ACE_TRACE ("ACE_OS::mutex_lock");
 #if defined (ACE_HAS_THREADS) && defined (ACE_HAS_WTHREADS)
   abandoned = 0;
   switch (m->type_)
@@ -1926,7 +1861,7 @@ ACE_OS::mutex_lock (ACE_mutex_t *m,
 ACE_INLINE int
 ACE_OS::mutex_trylock (ACE_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::mutex_trylock");
+  // ACE_TRACE ("ACE_OS::mutex_trylock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
@@ -2049,7 +1984,7 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m, int &abandoned)
 ACE_INLINE int
 ACE_OS::mutex_unlock (ACE_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::mutex_unlock");
+  // ACE_TRACE ("ACE_OS::mutex_unlock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
@@ -2120,7 +2055,7 @@ ACE_OS::thread_mutex_init (ACE_thread_mutex_t *m,
 ACE_INLINE int
 ACE_OS::thread_mutex_destroy (ACE_thread_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::thread_mutex_destroy");
+  // ACE_TRACE ("ACE_OS::thread_mutex_destroy");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
   return ACE_OS::mutex_destroy (m);
@@ -2139,7 +2074,7 @@ ACE_OS::thread_mutex_destroy (ACE_thread_mutex_t *m)
 ACE_INLINE int
 ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::thread_mutex_lock");
+  // ACE_TRACE ("ACE_OS::thread_mutex_lock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
   return ACE_OS::mutex_lock (m);
@@ -2158,7 +2093,7 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m)
 ACE_INLINE int
 ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::thread_mutex_trylock");
+  // ACE_TRACE ("ACE_OS::thread_mutex_trylock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
   return ACE_OS::mutex_trylock (m);
@@ -2188,7 +2123,7 @@ ACE_OS::thread_mutex_trylock (ACE_thread_mutex_t *m)
 ACE_INLINE int
 ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 {
-  ACE_TRACE ("ACE_OS::thread_mutex_unlock");
+  // ACE_TRACE ("ACE_OS::thread_mutex_unlock");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS)
   return ACE_OS::mutex_unlock (m);
@@ -2208,12 +2143,12 @@ ACE_OS::thread_mutex_unlock (ACE_thread_mutex_t *m)
 // NOTE: The ACE_OS::cond_* functions for Unix platforms are defined
 // here because the ACE_OS::sema_* functions below need them.
 // However, ACE_WIN32 and VXWORKS define the ACE_OS::cond_* functions
-// using the ACE_OS::sema_* functions.  So, they are defined in OS.cpp.
-
+// using the ACE_OS::sema_* functions.  So, they appear after the
+// ACE_OS::sema_* functions.
 ACE_INLINE int
 ACE_OS::cond_destroy (ACE_cond_t *cv)
 {
-  ACE_TRACE ("ACE_OS::cond_destroy");
+  // ACE_TRACE ("ACE_OS::cond_destroy");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
@@ -2233,7 +2168,7 @@ ACE_OS::cond_destroy (ACE_cond_t *cv)
 ACE_INLINE int
 ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
 {
-  // ACE_TRACE ("ACE_OS::cond_init");
+// ACE_TRACE ("ACE_OS::cond_init");
   ACE_UNUSED_ARG (type);
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (arg);
@@ -2247,10 +2182,10 @@ ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
       && ::pthread_cond_init (cv, attributes) == 0
 #     elif defined (ACE_HAS_PTHREADS_STD) || defined (ACE_HAS_PTHREADS_DRAFT7)
   if (ACE_ADAPT_RETVAL(::pthread_condattr_init (&attributes), result) == 0
-#       if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_MUTEXATTR_PSHARED)
+#       if defined (_POSIX_THREAD_PROCESS_SHARED)
       && ACE_ADAPT_RETVAL(::pthread_condattr_setpshared(&attributes, type),
                           result) == 0
-#       endif /* _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_MUTEXATTR_PSHARED */
+#       endif /* _POSIX_THREAD_PROCESS_SHARED */
       && ACE_ADAPT_RETVAL(::pthread_cond_init (cv, &attributes), result) == 0
 #     else  /* this is draft 6 */
   if (::pthread_condattr_init (&attributes) == 0
@@ -2290,7 +2225,7 @@ ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
 ACE_INLINE int
 ACE_OS::cond_signal (ACE_cond_t *cv)
 {
-ACE_TRACE ("ACE_OS::cond_signal");
+// ACE_TRACE ("ACE_OS::cond_signal");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
@@ -2311,7 +2246,7 @@ ACE_TRACE ("ACE_OS::cond_signal");
 ACE_INLINE int
 ACE_OS::cond_broadcast (ACE_cond_t *cv)
 {
-ACE_TRACE ("ACE_OS::cond_broadcast");
+// ACE_TRACE ("ACE_OS::cond_broadcast");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
@@ -2336,7 +2271,7 @@ ACE_INLINE int
 ACE_OS::cond_wait (ACE_cond_t *cv,
                    ACE_mutex_t *external_mutex)
 {
-  ACE_TRACE ("ACE_OS::cond_wait");
+  // ACE_TRACE ("ACE_OS::cond_wait");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 #     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
@@ -2361,7 +2296,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
                         ACE_mutex_t *external_mutex,
                         ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_OS::cond_timedwait");
+  // ACE_TRACE ("ACE_OS::cond_timedwait");
 # if defined (ACE_HAS_THREADS)
   int result;
   timespec_t ts;
@@ -2434,269 +2369,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
 #endif /* !ACE_LACKS_COND_T */
 
 ACE_INLINE int
-ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2)
-{
-#if defined (ACE_HAS_PTHREADS)
-# if defined (pthread_equal)
-  // If it's a macro we can't say "::pthread_equal"...
-  return pthread_equal (t1, t2);
-# else
-  return ::pthread_equal (t1, t2);
-# endif /* pthread_equal */
-#elif defined (VXWORKS)
-  return ! ACE_OS::strcmp (t1, t2);
-#else /* For both STHREADS and WTHREADS... */
-  // Hum, Do we need to treat WTHREAD differently?
-  // levine 13 oct 98 % I don't think so, ACE_thread_t is a DWORD.
-  return t1 == t2;
-#endif /* Threads variety case */
-}
-
-ACE_INLINE void
-ACE_OS::thr_self (ACE_hthread_t &self)
-{
-  ACE_TRACE ("ACE_OS::thr_self");
-#if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_PTHREADS)
-  // Note, don't use "::" here since the following call is often a macro.
-  self = pthread_self ();
-# elif defined (ACE_HAS_THREAD_SELF)
-  self = ::thread_self ();
-# elif defined (ACE_HAS_STHREADS)
-  self = ::thr_self ();
-# elif defined (ACE_HAS_WTHREADS)
-  self = ::GetCurrentThread ();
-# elif defined (ACE_PSOS)
-  t_ident ((char *) 0, 0, &self);
-# elif defined (VXWORKS)
-  self = ::taskIdSelf ();
-# endif /* ACE_HAS_STHREADS */
-#else
-  self = 1; // Might as well make it the main thread ;-)
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE ACE_thread_t
-ACE_OS::thr_self (void)
-{
-  ACE_TRACE ("ACE_OS::thr_self");
-#if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_PTHREADS)
-  // Note, don't use "::" here since the following call is often a macro.
-  ACE_OSCALL_RETURN (pthread_self (), int, -1);
-# elif defined (ACE_HAS_STHREADS)
-  ACE_OSCALL_RETURN (::thr_self (), int, -1);
-# elif defined (ACE_HAS_WTHREADS)
-  return ::GetCurrentThreadId ();
-# elif defined (ACE_PSOS)
-  // there does not appear to be a way to get
-  // a task's name other than at creation
-  return 0;
-# elif defined (VXWORKS)
-  return ::taskName (::taskIdSelf ());
-# endif /* ACE_HAS_STHREADS */
-#else
-  return 1; // Might as well make it the first thread ;-)
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
-ACE_OS::recursive_mutex_init (ACE_recursive_thread_mutex_t *m,
-                              LPCTSTR name,
-                              void *arg,
-                              LPSECURITY_ATTRIBUTES sa)
-{
-  ACE_UNUSED_ARG (sa);
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  return ACE_OS::thread_mutex_init (m, 0, name, arg);
-#else
-  if (ACE_OS::thread_mutex_init (&m->nesting_mutex_, 0, name, arg) == -1)
-    return -1;
-  else if (ACE_OS::cond_init (&m->lock_available_, USYNC_THREAD, name, arg) == -1)
-    return -1;
-  else
-    {
-      m->nesting_level_ = 0;
-      m->owner_id_ = ACE_OS::NULL_thread;
-      return 0;
-    }
-#endif /* ACE_HAS_RECURSIVE_MUTEXES */
-#else
-  ACE_UNUSED_ARG (m);
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (arg);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
-ACE_OS::recursive_mutex_destroy (ACE_recursive_thread_mutex_t *m)
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  return ACE_OS::thread_mutex_destroy (m);
-#else
-  if (ACE_OS::thread_mutex_destroy (&m->nesting_mutex_) == -1)
-    return -1;
-  else if (ACE_OS::cond_destroy (&m->lock_available_) == -1)
-    return -1;
-  else
-    return 0;
-#endif /* ACE_HAS_RECURSIVE_MUTEXES */
-#else
-  ACE_UNUSED_ARG (m);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
-ACE_OS::recursive_mutex_lock (ACE_recursive_thread_mutex_t *m)
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  return ACE_OS::thread_mutex_lock (m);
-#else
-  ACE_thread_t t_id = ACE_OS::thr_self ();
-  int result = 0;
-
-  // Acquire the guard.
-  if (ACE_OS::thread_mutex_lock (&m->nesting_mutex_) == -1)
-    result = -1;
-  else
-    {
-      // If there's no contention, just grab the lock immediately
-      // (since this is the common case we'll optimize for it).
-      if (m->nesting_level_ == 0)
-        m->owner_id_ = t_id;
-      // If we already own the lock, then increment the nesting level
-      // and return.
-      else if (ACE_OS::thr_equal (t_id, m->owner_id_) == 0)
-        {
-          // Wait until the nesting level has dropped to zero, at
-          // which point we can acquire the lock.
-          while (m->nesting_level_ > 0)
-            ACE_OS::cond_wait (&m->lock_available_,
-                               &m->nesting_mutex_);
-
-              // At this point the nesting_mutex_ is held...
-              m->owner_id_ = t_id;
-        }
-
-      // At this point, we can safely increment the nesting_level_ no
-      // matter how we got here!
-      m->nesting_level_++;
-    }
-
-  int error = errno;
-  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  errno = error;
-  return result;
-#endif /* ACE_HAS_RECURSIVE_MUTEXES */
-#else
-  ACE_UNUSED_ARG (m);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
-ACE_OS::recursive_mutex_trylock (ACE_recursive_thread_mutex_t *m)
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  return ACE_OS::thread_mutex_trylock (m);
-#else
-  ACE_thread_t t_id = ACE_OS::thr_self ();
-  int result = 0;
-
-  // Acquire the guard.
-  if (ACE_OS::thread_mutex_lock (&m->nesting_mutex_) == -1)
-    result = -1;
-  else
-    {
-      // If there's no contention, just grab the lock immediately.
-      if (m->nesting_level_ == 0)
-        {
-          m->owner_id_ = t_id;
-          m->nesting_level_ = 1;
-        }
-      // If we already own the lock, then increment the nesting level
-      // and proceed.
-      else if (ACE_OS::thr_equal (t_id, m->owner_id_))
-        m->nesting_level_++;
-      else
-        {
-          errno = EBUSY;
-          result = -1;
-        }
-    }
-
-  int error = errno;
-  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  errno = error;
-  return result;
-#endif /* ACE_HAS_RECURSIVE_MUTEXES */
-#else
-  ACE_UNUSED_ARG (m);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
-ACE_OS::recursive_mutex_unlock (ACE_recursive_thread_mutex_t *m)
-{
-#if defined (ACE_HAS_THREADS)
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  return ACE_OS::thread_mutex_unlock (m);
-#else
-ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
-#if !defined (ACE_NDEBUG)
-  ACE_thread_t t_id = ACE_OS::thr_self ();
-#endif /* ACE_NDEBUG */
-  int result = 0;
-
-  if (ACE_OS::thread_mutex_lock (&m->nesting_mutex_) == -1)
-    result = -1;
-  else
-    {
-#if !defined (ACE_NDEBUG)
-      if (m->nesting_level_ == 0
-          || ACE_OS::thr_equal (t_id, m->owner_id_) == 0)
-        {
-          errno = EINVAL;
-          result = -1;
-        }
-      else
-#endif /* ACE_NDEBUG */
-        {
-          m->nesting_level_--;
-          if (m->nesting_level_ == 0)
-            {
-              // This may not be strictly necessary, but it does put
-              // the mutex into a known state...
-              m->owner_id_ = ACE_OS::NULL_thread;
-
-              // Inform waiters that the lock is free.
-              if (ACE_OS::cond_signal (&m->lock_available_) == -1)
-                result = -1;
-            }
-        }
-    }
-  int error = errno;
-  ACE_OS::thread_mutex_unlock (&m->nesting_mutex_);
-  errno = error;
-  return result;
-#endif /* ACE_HAS_RECURSIVE_MUTEXES */
-#else
-  ACE_UNUSED_ARG (m);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
 ACE_OS::sema_destroy (ACE_sema_t *s)
 {
-  ACE_TRACE ("ACE_OS::sema_destroy");
+  // ACE_TRACE ("ACE_OS::sema_destroy");
 # if defined (ACE_HAS_POSIX_SEM)
   int result;
 #   if defined (ACE_LACKS_NAMED_POSIX_SEM)
@@ -2704,7 +2379,7 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
     {
       // Only destroy the semaphore if we're the ones who
       // initialized it.
-      ACE_OSCALL (::sem_destroy (s->sema_),int, -1, result);
+      ACE_OSCALL (ACE_ADAPT_RETVAL (::sem_destroy (s->sema_), result), int, -1, result);
       ACE_OS::shm_unlink (s->name_);
       delete s->name_;
       return result;
@@ -2712,14 +2387,14 @@ ACE_OS::sema_destroy (ACE_sema_t *s)
 #else
   if (s->name_)
     {
-      ACE_OSCALL (::sem_unlink (s->name_), int, -1, result);
+      ACE_OSCALL (ACE_ADAPT_RETVAL (::sem_unlink (s->name_), result), int, -1, result);
       ACE_OS::free ((void *) s->name_);
-      ACE_OSCALL_RETURN (::sem_close (s->sema_), int, -1);
+      ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sem_close (s->sema_), ace_result_), int, -1);
     }
 #   endif /*  ACE_LACKS_NAMED_POSIX_SEM */
   else
     {
-      ACE_OSCALL (::sem_destroy (s->sema_), int, -1, result);
+      ACE_OSCALL (ACE_ADAPT_RETVAL (::sem_destroy (s->sema_), result), int, -1, result);
       delete s->sema_;
       s->sema_ = 0;
       return result;
@@ -2766,7 +2441,7 @@ ACE_OS::sema_init (ACE_sema_t *s,
                    int max,
                    LPSECURITY_ATTRIBUTES sa)
 {
-  ACE_TRACE ("ACE_OS::sema_init");
+  // ACE_TRACE ("ACE_OS::sema_init");
 # if defined (ACE_HAS_POSIX_SEM)
   ACE_UNUSED_ARG (arg);
   ACE_UNUSED_ARG (max);
@@ -2838,9 +2513,11 @@ ACE_OS::sema_init (ACE_sema_t *s,
       ACE_NEW_RETURN (s->sema_,
                       sem_t,
                       -1);
-      ACE_OSCALL_RETURN (::sem_init (s->sema_,
-                                     type != USYNC_THREAD,
-                                     count), int, -1);
+      ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sem_init (s->sema_,
+                                                       type != USYNC_THREAD,
+                                                       count),
+                                           ace_result_),
+                         int, -1);
     }
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
@@ -2953,9 +2630,9 @@ ACE_OS::sema_init (ACE_sema_t *s,
 ACE_INLINE int
 ACE_OS::sema_post (ACE_sema_t *s)
 {
-  ACE_TRACE ("ACE_OS::sema_post");
+  // ACE_TRACE ("ACE_OS::sema_post");
 # if defined (ACE_HAS_POSIX_SEM)
-  ACE_OSCALL_RETURN (::sem_post (s->sema_), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sem_post (s->sema_), ace_result_), int, -1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_post (s), ace_result_), int, -1);
@@ -3037,10 +2714,11 @@ ACE_OS::sema_post (ACE_sema_t *s, size_t release_count)
 ACE_INLINE int
 ACE_OS::sema_trywait (ACE_sema_t *s)
 {
-  ACE_TRACE ("ACE_OS::sema_trywait");
+  // ACE_TRACE ("ACE_OS::sema_trywait");
 # if defined (ACE_HAS_POSIX_SEM)
   // POSIX semaphores set errno to EAGAIN if trywait fails
-  ACE_OSCALL_RETURN (::sem_trywait (s->sema_), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sem_trywait (s->sema_), ace_result_),
+                     int, -1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   // STHREADS semaphores set errno to EBUSY if trywait fails.
@@ -3143,9 +2821,9 @@ ACE_OS::sema_trywait (ACE_sema_t *s)
 ACE_INLINE int
 ACE_OS::sema_wait (ACE_sema_t *s)
 {
-  ACE_TRACE ("ACE_OS::sema_wait");
+  // ACE_TRACE ("ACE_OS::sema_wait");
 # if defined (ACE_HAS_POSIX_SEM)
-  ACE_OSCALL_RETURN (::sem_wait (s->sema_), int, -1);
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sem_wait (s->sema_), ace_result_), int, -1);
 # elif defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_wait (s), ace_result_), int, -1);
@@ -3251,7 +2929,7 @@ ACE_OS::sema_wait (ACE_sema_t *s)
 ACE_INLINE int
 ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_OS::sema_wait");
+  // ACE_TRACE ("ACE_OS::sema_wait");
 # if defined (ACE_HAS_POSIX_SEM)
   ACE_UNUSED_ARG (s);
   ACE_UNUSED_ARG (tv);
@@ -3440,11 +3118,565 @@ ACE_OS::sema_wait (ACE_sema_t *s, ACE_Time_Value &tv)
 # endif /* ACE_HAS_POSIX_SEM */
 }
 
+#if defined (ACE_LACKS_COND_T)
+
+// NOTE: The ACE_OS::cond_* functions for some non-Unix platforms are
+// defined here because they need the ACE_OS::sema_* functions above.
+// However, some Unix platforms define the ACE_OS::sema_* functions
+// using the ACE_OS::cond_* functions.  So, they appear before the
+// ACE_OS::sema_* functions above.
+ACE_INLINE int
+ACE_OS::cond_destroy (ACE_cond_t *cv)
+{
+  // ACE_TRACE ("ACE_OS::cond_destroy");
+# if defined (ACE_HAS_THREADS)
+#   if defined (ACE_HAS_WTHREADS)
+  ACE_OS::event_destroy (&cv->waiters_done_);
+#   elif defined (VXWORKS) || defined (ACE_PSOS)
+  ACE_OS::sema_destroy (&cv->waiters_done_);
+#   endif /* VXWORKS */
+  ACE_OS::thread_mutex_destroy (&cv->waiters_lock_);
+  return ACE_OS::sema_destroy (&cv->sema_);
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_init (ACE_cond_t *cv, int type, LPCTSTR name, void *arg)
+{
+// ACE_TRACE ("ACE_OS::cond_init");
+# if defined (ACE_HAS_THREADS)
+  cv->waiters_ = 0;
+  cv->was_broadcast_ = 0;
+
+  int result = 0;
+  if (ACE_OS::sema_init (&cv->sema_, 0, type, name, arg) == -1)
+    result = -1;
+  else if (ACE_OS::thread_mutex_init (&cv->waiters_lock_) == -1)
+    result = -1;
+#   if defined (VXWORKS) || defined (ACE_PSOS)
+  else if (ACE_OS::sema_init (&cv->waiters_done_, 0, type) == -1)
+#   else
+  else if (ACE_OS::event_init (&cv->waiters_done_) == -1)
+#   endif /* VXWORKS */
+    result = -1;
+  return result;
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_UNUSED_ARG (type);
+  ACE_UNUSED_ARG (name);
+  ACE_UNUSED_ARG (arg);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_signal (ACE_cond_t *cv)
+{
+// ACE_TRACE ("ACE_OS::cond_signal");
+# if defined (ACE_HAS_THREADS)
+  // If there aren't any waiters, then this is a no-op.  Note that
+  // this function *must* be called with the <external_mutex> held
+  // since other wise there is a race condition that can lead to the
+  // lost wakeup bug...  This is needed to ensure that the <waiters_>
+  // value is not in an inconsistent internal state while being
+  // updated by another thread.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  int have_waiters = cv->waiters_ > 0;
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  if (have_waiters != 0)
+    return ACE_OS::sema_post (&cv->sema_);
+  else
+    return 0; // No-op
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_broadcast (ACE_cond_t *cv)
+{
+// ACE_TRACE ("ACE_OS::cond_broadcast");
+# if defined (ACE_HAS_THREADS)
+  // The <external_mutex> must be locked before this call is made.
+
+  // This is needed to ensure that <waiters_> and <was_broadcast_> are
+  // consistent relative to each other.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  int have_waiters = 0;
+
+  if (cv->waiters_ > 0)
+    {
+      // We are broadcasting, even if there is just one waiter...
+      // Record the fact that we are broadcasting.  This helps the
+      // cond_wait() method know how to optimize itself.  Be sure to
+      // set this with the <waiters_lock_> held.
+      cv->was_broadcast_ = 1;
+      have_waiters = 1;
+    }
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+  int result = 0;
+  if (have_waiters)
+    {
+      // Wake up all the waiters.
+      if (ACE_OS::sema_post (&cv->sema_, cv->waiters_) == -1)
+        result = -1;
+      // Wait for all the awakened threads to acquire their part of
+      // the counting semaphore.
+#   if defined (VXWORKS) || defined (ACE_PSOS)
+      else if (ACE_OS::sema_wait (&cv->waiters_done_) == -1)
+#   else
+      else if (ACE_OS::event_wait (&cv->waiters_done_) == -1)
+#   endif /* VXWORKS */
+        result = -1;
+      // This is okay, even without the <waiters_lock_> held because
+      // no other waiter threads can wake up to access it.
+      cv->was_broadcast_ = 0;
+    }
+  return result;
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_wait (ACE_cond_t *cv,
+                   ACE_mutex_t *external_mutex)
+{
+  // ACE_TRACE ("ACE_OS::cond_wait");
+# if defined (ACE_HAS_THREADS)
+  // Prevent race conditions on the <waiters_> count.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  cv->waiters_++;
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  int result = 0;
+
+#   if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
+  if (external_mutex->type_ == USYNC_PROCESS)
+    // This call will automatically release the mutex and wait on the semaphore.
+    ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (external_mutex->proc_mutex_,
+                                                            cv->sema_, INFINITE, FALSE),
+                                     result),
+                   int, -1, result);
+  else
+#   endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
+    {
+      // We keep the lock held just long enough to increment the count of
+      // waiters by one.  Note that we can't keep it held across the call
+      // to ACE_OS::sema_wait() since that will deadlock other calls to
+      // ACE_OS::cond_signal().
+      if (ACE_OS::mutex_unlock (external_mutex) != 0)
+        return -1;
+
+      // Wait to be awakened by a ACE_OS::cond_signal() or
+      // ACE_OS::cond_broadcast().
+      result = ACE_OS::sema_wait (&cv->sema_);
+    }
+
+  // Reacquire lock to avoid race conditions on the <waiters_> count.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+
+  // We're ready to return, so there's one less waiter.
+  cv->waiters_--;
+
+  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
+
+  // Release the lock so that other collaborating threads can make
+  // progress.
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  if (result == -1)
+    // Bad things happened, so let's just return below.
+    /* NOOP */;
+#   if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
+  else if (external_mutex->type_ == USYNC_PROCESS)
+    {
+      if (last_waiter)
+
+        // This call atomically signals the <waiters_done_> event and
+        // waits until it can acquire the mutex.  This is important to
+        // prevent unfairness.
+        ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (cv->waiters_done_,
+                                                                external_mutex->proc_mutex_,
+                                                                INFINITE, FALSE),
+                                         result),
+                       int, -1, result);
+      else
+        // We must always regain the <external_mutex>, even when
+        // errors occur because that's the guarantee that we give to
+        // our callers.
+        ACE_OS::mutex_lock (external_mutex);
+
+      return result;
+      /* NOTREACHED */
+    }
+#   endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
+  // If we're the last waiter thread during this particular broadcast
+  // then let all the other threads proceed.
+  else if (last_waiter)
+#   if defined (VXWORKS) || defined (ACE_PSOS)
+    ACE_OS::sema_post (&cv->waiters_done_);
+#   else
+    ACE_OS::event_signal (&cv->waiters_done_);
+#   endif /* VXWORKS */
+
+  // We must always regain the <external_mutex>, even when errors
+  // occur because that's the guarantee that we give to our callers.
+  ACE_OS::mutex_lock (external_mutex);
+
+  return result;
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_UNUSED_ARG (external_mutex);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_timedwait (ACE_cond_t *cv,
+                        ACE_mutex_t *external_mutex,
+                        ACE_Time_Value *timeout)
+{
+  // ACE_TRACE ("ACE_OS::cond_timedwait");
+# if defined (ACE_HAS_THREADS)
+  // Handle the easy case first.
+  if (timeout == 0)
+    return ACE_OS::cond_wait (cv, external_mutex);
+#   if defined (ACE_HAS_WTHREADS) || defined (VXWORKS) || defined (ACE_PSOS)
+
+  // Prevent race conditions on the <waiters_> count.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  cv->waiters_++;
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  int result = 0;
+  int error = 0;
+  int msec_timeout;
+
+  if (timeout->sec () == 0 && timeout->usec () == 0)
+    msec_timeout = 0; // Do a "poll."
+  else
+    {
+      // Note that we must convert between absolute time (which is
+      // passed as a parameter) and relative time (which is what
+      // WaitForSingleObjects() expects).
+      ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ());
+
+      // Watchout for situations where a context switch has caused the
+      // current time to be > the timeout.
+      if (relative_time < ACE_Time_Value::zero)
+        msec_timeout = 0;
+      else
+        msec_timeout = relative_time.msec ();
+    }
+
+#     if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
+  if (external_mutex->type_ == USYNC_PROCESS)
+    // This call will automatically release the mutex and wait on the
+    // semaphore.
+    result = ::SignalObjectAndWait (external_mutex->proc_mutex_,
+                                    cv->sema_,
+                                    msec_timeout,
+                                    FALSE);
+  else
+#     endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
+    {
+      // We keep the lock held just long enough to increment the count
+      // of waiters by one.  Note that we can't keep it held across
+      // the call to WaitForSingleObject since that will deadlock
+      // other calls to ACE_OS::cond_signal().
+      if (ACE_OS::mutex_unlock (external_mutex) != 0)
+        return -1;
+
+      // Wait to be awakened by a ACE_OS::signal() or
+      // ACE_OS::broadcast().
+#     if defined (ACE_WIN32)
+#       if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+      result = ::WaitForSingleObject (cv->sema_, msec_timeout);
+#       else /* ACE_USES_WINCE_SEMA_SIMULATION */
+      // Can't use Win32 API on our simulated semaphores.
+      result = ACE_OS::sema_wait (&cv->sema_,
+                                  ACE_Time_Value (0, msec_timeout * 1000));
+#       endif /* ACE_USES_WINCE_SEMA_SIMULATION */
+#     elif defined (ACE_PSOS)
+      // Inline the call to ACE_OS::sema_wait () because it takes an
+      // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
+      u_long ticks = (KC_TICKS2SEC * msec_timeout) / ACE_ONE_SECOND_IN_MSECS;
+      result = ::sm_p (cv->sema_.sema_, SM_WAIT, ticks);
+#     elif defined (VXWORKS)
+      // Inline the call to ACE_OS::sema_wait () because it takes an
+      // ACE_Time_Value argument.  Avoid the cost of that conversion . . .
+      int ticks_per_sec = ::sysClkRateGet ();
+      int ticks = msec_timeout * ticks_per_sec / ACE_ONE_SECOND_IN_MSECS;
+      result = ::semTake (cv->sema_.sema_, ticks);
+#     endif /* ACE_WIN32 || VXWORKS */
+    }
+
+  // Reacquire lock to avoid race conditions.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  cv->waiters_--;
+
+  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
+
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+#     if defined (ACE_WIN32)
+  if (result != WAIT_OBJECT_0)
+    {
+      switch (result)
+        {
+        case WAIT_TIMEOUT:
+          error = ETIME;
+          break;
+        default:
+          error = ::GetLastError ();
+          break;
+        }
+      result = -1;
+    }
+#     elif defined (ACE_PSOS)
+  if (result != 0)
+    {
+      switch (result)
+        {
+        case ERR_TIMEOUT:
+          error = ETIME;
+          break;
+        default:
+          error = errno;
+          break;
+        }
+      result = -1;
+    }
+#     elif defined (VXWORKS)
+  if (result == ERROR)
+    {
+      switch (errno)
+        {
+        case S_objLib_OBJ_TIMEOUT:
+          error = ETIME;
+          break;
+        default:
+          error = errno;
+          break;
+        }
+      result = -1;
+    }
+#     endif /* ACE_WIN32 || VXWORKS */
+#     if defined (ACE_HAS_SIGNAL_OBJECT_AND_WAIT)
+  if (external_mutex->type_ == USYNC_PROCESS)
+    {
+      if (last_waiter)
+        // This call atomically signals the <waiters_done_> event and
+        // waits until it can acquire the mutex.  This is important to
+        // prevent unfairness.
+        ACE_WIN32CALL (ACE_ADAPT_RETVAL (::SignalObjectAndWait (cv->waiters_done_,
+                                                                external_mutex->proc_mutex_,
+                                                                INFINITE, FALSE),
+                                         result),
+                       int, -1, result);
+      else
+        // We must always regain the <external_Mutex>, even when
+        // errors occur because that's the guarantee that we give to
+        // our callers.
+        ACE_OS::mutex_lock (external_mutex);
+
+      return result;
+      /* NOTREACHED */
+    }
+#     endif /* ACE_HAS_SIGNAL_OBJECT_AND_WAIT */
+  else if (last_waiter)
+    // Release the signaler/broadcaster if we're the last waiter.
+#     if defined (ACE_WIN32)
+    ACE_OS::event_signal (&cv->waiters_done_);
+#     else
+    ACE_OS::sema_post (&cv->waiters_done_);
+#     endif /* ACE_WIN32 */
+
+  // We must always regain the <external_mutex>, even when errors
+  // occur because that's the guarantee that we give to our callers.
+  ACE_OS::mutex_lock (external_mutex);
+
+  errno = error;
+  return result;
+#   endif /* ACE_HAS_WTHREADS || ACE_HAS_VXWORKS || ACE_PSOS */
+# else
+  ACE_UNUSED_ARG (cv);
+  ACE_UNUSED_ARG (external_mutex);
+  ACE_UNUSED_ARG (timeout);
+  ACE_NOTSUP_RETURN (-1);
+# endif /* ACE_HAS_THREADS */
+}
+
+# if defined (ACE_HAS_WTHREADS)
+ACE_INLINE int
+ACE_OS::cond_timedwait (ACE_cond_t *cv,
+                        ACE_thread_mutex_t *external_mutex,
+                        ACE_Time_Value *timeout)
+{
+  // ACE_TRACE ("ACE_OS::cond_timedwait");
+#   if defined (ACE_HAS_THREADS)
+  // Handle the easy case first.
+  if (timeout == 0)
+    return ACE_OS::cond_wait (cv, external_mutex);
+
+  // Prevent race conditions on the <waiters_> count.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  cv->waiters_++;
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  int result = 0;
+  int error = 0;
+  int msec_timeout;
+
+  if (timeout->sec () == 0 && timeout->usec () == 0)
+    msec_timeout = 0; // Do a "poll."
+  else
+    {
+      // Note that we must convert between absolute time (which is
+      // passed as a parameter) and relative time (which is what
+      // WaitForSingleObjects() expects).
+      ACE_Time_Value relative_time (*timeout - ACE_OS::gettimeofday ());
+
+      // Watchout for situations where a context switch has caused the
+      // current time to be > the timeout.
+      if (relative_time < ACE_Time_Value::zero)
+        msec_timeout = 0;
+      else
+        msec_timeout = relative_time.msec ();
+    }
+
+  // We keep the lock held just long enough to increment the count of
+  // waiters by one.  Note that we can't keep it held across the call
+  // to WaitForSingleObject since that will deadlock other calls to
+  // ACE_OS::cond_signal().
+  if (ACE_OS::thread_mutex_unlock (external_mutex) != 0)
+    return -1;
+
+  // Wait to be awakened by a ACE_OS::signal() or ACE_OS::broadcast().
+#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+  result = ::WaitForSingleObject (cv->sema_, msec_timeout);
+#     else
+  // Can't use Win32 API on simulated semaphores.
+  result = ACE_OS::sema_wait (&cv->sema_,
+                              ACE_Time_Value (0, msec_timeout * 1000));
+#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
+
+  // Reacquire lock to avoid race conditions.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+
+  cv->waiters_--;
+
+  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
+
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  if (result != WAIT_OBJECT_0)
+    {
+      switch (result)
+        {
+        case WAIT_TIMEOUT:
+          error = ETIME;
+          break;
+        default:
+          error = ::GetLastError ();
+          break;
+        }
+      result = -1;
+    }
+
+  if (last_waiter)
+    // Release the signaler/broadcaster if we're the last waiter.
+    ACE_OS::event_signal (&cv->waiters_done_);
+
+  // We must always regain the <external_mutex>, even when errors
+  // occur because that's the guarantee that we give to our callers.
+  ACE_OS::thread_mutex_lock (external_mutex);
+  errno = error;
+  return result;
+#   else
+  ACE_NOTSUP_RETURN (-1);
+#   endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE int
+ACE_OS::cond_wait (ACE_cond_t *cv,
+                   ACE_thread_mutex_t *external_mutex)
+{
+  // ACE_TRACE ("ACE_OS::cond_wait");
+#   if defined (ACE_HAS_THREADS)
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+  cv->waiters_++;
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  int result = 0;
+  int error = 0;
+
+  // We keep the lock held just long enough to increment the count of
+  // waiters by one.  Note that we can't keep it held across the call
+  // to ACE_OS::sema_wait() since that will deadlock other calls to
+  // ACE_OS::cond_signal().
+  if (ACE_OS::thread_mutex_unlock (external_mutex) != 0)
+    return -1;
+
+  // Wait to be awakened by a ACE_OS::cond_signal() or
+  // ACE_OS::cond_broadcast().
+#     if !defined (ACE_USES_WINCE_SEMA_SIMULATION)
+  result = ::WaitForSingleObject (cv->sema_, INFINITE);
+#     else
+  // Can't use Win32 API on simulated semaphores.
+  result = ACE_OS::sema_wait (&cv->sema_);
+#     endif /* ACE_USES_WINCE_SEMA_SIMULATION */
+
+  // Reacquire lock to avoid race conditions.
+  ACE_OS::thread_mutex_lock (&cv->waiters_lock_);
+
+  cv->waiters_--;
+
+  int last_waiter = cv->was_broadcast_ && cv->waiters_ == 0;
+
+  ACE_OS::thread_mutex_unlock (&cv->waiters_lock_);
+
+  if (result != WAIT_OBJECT_0)
+    {
+      switch (result)
+        {
+        case WAIT_TIMEOUT:
+          error = ETIME;
+          break;
+        default:
+          error = ::GetLastError ();
+          break;
+        }
+    }
+  else if (last_waiter)
+    // Release the signaler/broadcaster if we're the last waiter.
+    ACE_OS::event_signal (&cv->waiters_done_);
+
+  // We must always regain the <external_mutex>, even when errors
+  // occur because that's the guarantee that we give to our callers.
+  ACE_OS::thread_mutex_lock (external_mutex);
+
+  // Reset errno in case mutex_lock() also fails...
+  errno = error;
+  return result;
+#   else
+  ACE_NOTSUP_RETURN (-1);
+#   endif /* ACE_HAS_THREADS */
+}
+# endif /* ACE_HAS_WTHREADS */
+#endif /* ACE_LACKS_COND_T */
 
 ACE_INLINE int
 ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_tryrdlock");
+  // ACE_TRACE ("ACE_OS::rw_tryrdlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_tryrdlock (rw), ace_result_), int, -1);
@@ -3480,7 +3712,7 @@ ACE_OS::rw_tryrdlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_trywrlock (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_trywrlock");
+  // ACE_TRACE ("ACE_OS::rw_trywrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_trywrlock (rw), ace_result_), int, -1);
@@ -3516,7 +3748,7 @@ ACE_OS::rw_trywrlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_rdlock (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_rdlock");
+  // ACE_TRACE ("ACE_OS::rw_rdlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_rdlock (rw), ace_result_), int, -1);
@@ -3559,7 +3791,7 @@ ACE_OS::rw_rdlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_wrlock (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_wrlock");
+  // ACE_TRACE ("ACE_OS::rw_wrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_wrlock (rw), ace_result_), int, -1);
@@ -3604,7 +3836,7 @@ ACE_OS::rw_wrlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_unlock (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_unlock");
+  // ACE_TRACE ("ACE_OS::rw_unlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rw_unlock (rw), ace_result_), int, -1);
@@ -3662,7 +3894,7 @@ ACE_OS::rw_unlock (ACE_rwlock_t *rw)
 ACE_INLINE int
 ACE_OS::rw_trywrlock_upgrade (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rw_wrlock");
+  // ACE_TRACE ("ACE_OS::rw_wrlock");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   // Some native rwlocks, such as those on Solaris, don't
@@ -3743,7 +3975,7 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw,
 ACE_INLINE int
 ACE_OS::rwlock_destroy (ACE_rwlock_t *rw)
 {
-  ACE_TRACE ("ACE_OS::rwlock_destroy");
+  // ACE_TRACE ("ACE_OS::rwlock_destroy");
 #if defined (ACE_HAS_THREADS)
 # if !defined (ACE_LACKS_RWLOCK_T)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::rwlock_destroy (rw), ace_result_), int, -1);
@@ -4141,18 +4373,13 @@ ACE_INLINE ACE_HANDLE
 ACE_OS::accept (ACE_HANDLE handle, struct sockaddr *addr,
                 int *addrlen)
 {
-  ACE_TRACE ("ACE_OS::accept");
+  // ACE_TRACE ("ACE_OS::accept");
 #if defined (ACE_PSOS)
-#  if !defined (ACE_PSOS_DIAB_PPC)
-ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
-                                (ACE_SOCKET_LEN *) addrlen),
-                      ACE_HANDLE, ACE_INVALID_HANDLE);
-#  else
-ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr *) addr,
-                                (ACE_SOCKET_LEN *) addrlen),
-                      ACE_HANDLE, ACE_INVALID_HANDLE);
-#  endif /* defined ACE_PSOS_DIAB_PPC */
+  ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
+                                 (ACE_SOCKET_LEN *) addrlen),
+                       ACE_HANDLE, ACE_INVALID_HANDLE);
 #else
+
   // On a non-blocking socket with no connections to accept, 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.
@@ -4181,34 +4408,34 @@ ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, (struct sockaddr *) addr,
 ACE_INLINE int
 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_TRACE ("ACE_OS::bind");
+#if defined (ACE_PSOS)
   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) */
+#else
   ACE_SOCKCALL_RETURN (::bind ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
-#endif /* defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC) */
+#endif /* defined (ACE_PSOS) */
 }
 
 ACE_INLINE int
 ACE_OS::connect (ACE_HANDLE handle, struct sockaddr *addr, int addrlen)
 {
-  ACE_TRACE ("ACE_OS::connect");
-#if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
+  // ACE_TRACE ("ACE_OS::connect");
+#if defined (ACE_PSOS)
   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) */
+#else
   ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1);
-#endif /* defined (ACE_PSOS)  && !defined (ACE_PSOS_DIAB_PPC) */
+#endif /* defined (ACE_PSOS) */
 }
 
 #if !defined (VXWORKS)
 ACE_INLINE struct hostent *
 ACE_OS::gethostbyname (const char *name)
 {
-  ACE_TRACE ("ACE_OS::gethostbyname");
+  // ACE_TRACE ("ACE_OS::gethostbyname");
 # if defined (ACE_PSOS)
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (0);
@@ -4220,34 +4447,9 @@ ACE_OS::gethostbyname (const char *name)
 }
 
 ACE_INLINE struct hostent *
-ACE_OS::gethostbyname2 (const char *name, int family)
-{
-  ACE_TRACE ("ACE_OS::gethostbyname2");
-# if defined (ACE_PSOS)
-  ACE_UNUSED_ARG (name);
-  ACE_UNUSED_ARG (family);
-  ACE_NOTSUP_RETURN (0);
-# elif defined (ACE_HAS_IP6)
-#   if defined (ACE_HAS_NONCONST_GETBY)
-  ACE_SOCKCALL_RETURN (::gethostbyname2 (ACE_const_cast (char *, name), family), struct hostent *, 0);
-#   else
-  ACE_SOCKCALL_RETURN (::gethostbyname2 (name, family), struct hostent *, 0);
-#   endif /* ACE_HAS_NONCONST_GETBY */
-# else
-  // IPv4-only implementation
-  if (family == AF_INET)
-    {
-      return ACE_OS::gethostbyname (name);
-    }
-
-  ACE_NOTSUP_RETURN (0);
-# endif /* ACE_PSOS */
-}
-
-ACE_INLINE struct hostent *
 ACE_OS::gethostbyaddr (const char *addr, int length, int type)
 {
-  ACE_TRACE ("ACE_OS::gethostbyaddr");
+  // ACE_TRACE ("ACE_OS::gethostbyaddr");
 # if defined (ACE_PSOS)
   ACE_UNUSED_ARG (addr);
   ACE_UNUSED_ARG (length);
@@ -4270,28 +4472,22 @@ ACE_OS::select (int width,
                 fd_set *rfds, fd_set *wfds, fd_set *efds,
                 const ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_OS::select");
+  // ACE_TRACE ("ACE_OS::select");
 #if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
   // We must defend against non-conformity!
-  timeval copy;
-  timeval *timep;
+  ACE_Time_Value copy;
 
   if (timeout != 0)
     {
       copy = *timeout;
-      timep = &copy;
+      timeout = &copy;
     }
-  else
-    timep = 0;
-#else
-  const timeval *timep = (timeout == 0 ? (const timeval *)0 : *timeout);
 #endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */
   ACE_SOCKCALL_RETURN (::select (width,
                                  (ACE_FD_SET_TYPE *) rfds,
                                  (ACE_FD_SET_TYPE *) wfds,
                                  (ACE_FD_SET_TYPE *) efds,
-                                 timep),
-                       int, -1);
+                                 timeout == 0 ? 0 : (timeval *) (const timeval *) *timeout) , int, -1);
 }
 
 ACE_INLINE int
@@ -4299,19 +4495,18 @@ ACE_OS::select (int width,
                 fd_set *rfds, fd_set *wfds, fd_set *efds,
                 const ACE_Time_Value &timeout)
 {
-  ACE_TRACE ("ACE_OS::select");
+  // ACE_TRACE ("ACE_OS::select");
 #if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
-# define ___ACE_TIMEOUT &copy
-  timeval copy = timeout;
+# define ___ACE_TIMEOUT copy
+  ACE_Time_Value copy(timeout);
 #else
-# define ___ACE_TIMEOUT timep
-  const timeval *timep = timeout;
+# define ___ACE_TIMEOUT timeout
 #endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */
   ACE_SOCKCALL_RETURN (::select (width,
                                  (ACE_FD_SET_TYPE *) rfds,
                                  (ACE_FD_SET_TYPE *) wfds,
                                  (ACE_FD_SET_TYPE *) efds,
-                                 ___ACE_TIMEOUT),
+                                 (timeval *) (const timeval *) ___ACE_TIMEOUT),
                        int, -1);
 #undef ___ACE_TIMEOUT
 }
@@ -4319,7 +4514,7 @@ ACE_OS::select (int width,
 ACE_INLINE int
 ACE_OS::recv (ACE_HANDLE handle, char *buf, int len, int flags)
 {
-  ACE_TRACE ("ACE_OS::recv");
+  // ACE_TRACE ("ACE_OS::recv");
 
 
   // On UNIX, a non-blocking socket with no data to receive, this system
@@ -4348,17 +4543,11 @@ ACE_INLINE int
 ACE_OS::recvfrom (ACE_HANDLE handle, char *buf, int len,
                   int flags, struct sockaddr *addr, int *addrlen)
 {
-  ACE_TRACE ("ACE_OS::recvfrom");
+  // ACE_TRACE ("ACE_OS::recvfrom");
 #if defined (ACE_PSOS)
-#  if !defined ACE_PSOS_DIAB_PPC
   ACE_SOCKCALL_RETURN (::recvfrom ((ACE_SOCKET) handle, buf, (ACE_SOCKET_LEN) len, flags,
                                    (struct sockaddr_in *) addr, (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
-#  else
-  ACE_SOCKCALL_RETURN (::recvfrom ((ACE_SOCKET) handle, buf, (ACE_SOCKET_LEN) len, flags,
-                                   (struct sockaddr *) addr, (ACE_SOCKET_LEN *) addrlen),
-                       int, -1);
-#  endif /* defined ACE_PSOS_DIAB_PPC */
 #elif defined (ACE_WIN32)
   int result = ::recvfrom ((ACE_SOCKET) handle,
                            buf,
@@ -4387,7 +4576,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle, char *buf, int len,
 ACE_INLINE int
 ACE_OS::send (ACE_HANDLE handle, const char *buf, int len, int flags)
 {
-  ACE_TRACE ("ACE_OS::send");
+  // ACE_TRACE ("ACE_OS::send");
 #if defined (VXWORKS) || defined (HPUX) || defined (ACE_PSOS)
   ACE_SOCKCALL_RETURN (::send ((ACE_SOCKET) handle, (char *) buf, len, flags), int, -1);
 #else
@@ -4403,21 +4592,15 @@ ACE_OS::sendto (ACE_HANDLE handle,
                 const struct sockaddr *addr,
                 int addrlen)
 {
-  ACE_TRACE ("ACE_OS::sendto");
+  // ACE_TRACE ("ACE_OS::sendto");
 #if defined (VXWORKS)
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf, len, flags,
                                  ACE_const_cast (struct sockaddr *, addr), addrlen),
                        int, -1);
 #elif defined (ACE_PSOS)
-#  if !defined (ACE_PSOS_DIAB_PPC)
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf, len, flags,
                                  (struct sockaddr_in *) addr, addrlen),
                        int, -1);
-#  else
-  ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, (char *) buf, len, flags,
-                                 (struct sockaddr *) addr, addrlen),
-                       int, -1);
-#  endif /*defined ACE_PSOS_DIAB_PPC */
 #else
   ACE_SOCKCALL_RETURN (::sendto ((ACE_SOCKET) handle, buf, len, flags,
                                  ACE_const_cast (struct sockaddr *, addr), addrlen),
@@ -4429,8 +4612,8 @@ ACE_INLINE int
 ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr,
                      int *addrlen)
 {
-  ACE_TRACE ("ACE_OS::getpeername");
-#if defined (ACE_PSOS) && !defined ACE_PSOS_DIAB_PPC
+  // ACE_TRACE ("ACE_OS::getpeername");
+#if defined (ACE_PSOS)
   ACE_SOCKCALL_RETURN (::getpeername ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
@@ -4547,7 +4730,7 @@ ACE_OS::getprotobynumber_r (int proto,
 ACE_INLINE struct servent *
 ACE_OS::getservbyname (const char *svc, const char *proto)
 {
-  ACE_TRACE ("ACE_OS::getservbyname");
+  // ACE_TRACE ("ACE_OS::getservbyname");
 #if defined (ACE_LACKS_GETSERVBYNAME)
   ACE_UNUSED_ARG (svc);
   ACE_UNUSED_ARG (proto);
@@ -4566,8 +4749,8 @@ ACE_OS::getsockname (ACE_HANDLE handle,
                      struct sockaddr *addr,
                      int *addrlen)
 {
-  ACE_TRACE ("ACE_OS::getsockname");
-#if defined (ACE_PSOS) && !defined (ACE_PSOS_DIAB_PPC)
+  // ACE_TRACE ("ACE_OS::getsockname");
+#if defined (ACE_PSOS)
   ACE_SOCKCALL_RETURN (::getsockname ((ACE_SOCKET) handle, (struct sockaddr_in *) addr,
                                       (ACE_SOCKET_LEN *) addrlen),
                        int, -1);
@@ -4584,7 +4767,7 @@ ACE_OS::getsockopt (ACE_HANDLE handle,
                     char *optval,
                     int *optlen)
 {
-  ACE_TRACE ("ACE_OS::getsockopt");
+  // ACE_TRACE ("ACE_OS::getsockopt");
   ACE_SOCKCALL_RETURN (::getsockopt ((ACE_SOCKET) handle, level, optname, optval, (ACE_SOCKET_LEN *) optlen),
                        int, -1);
 }
@@ -4592,7 +4775,7 @@ ACE_OS::getsockopt (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::listen (ACE_HANDLE handle, int backlog)
 {
-  ACE_TRACE ("ACE_OS::listen");
+  // ACE_TRACE ("ACE_OS::listen");
   ACE_SOCKCALL_RETURN (::listen ((ACE_SOCKET) handle, backlog), int, -1);
 }
 
@@ -4600,7 +4783,7 @@ ACE_INLINE int
 ACE_OS::setsockopt (ACE_HANDLE handle, int level, int optname,
                     const char *optval, int optlen)
 {
-  ACE_TRACE ("ACE_OS::setsockopt");
+  // ACE_TRACE ("ACE_OS::setsockopt");
   ACE_SOCKCALL_RETURN (::setsockopt ((ACE_SOCKET) handle, level, optname,
                                      (ACE_SOCKOPT_TYPE1) optval, optlen),
                        int, -1);
@@ -4609,14 +4792,14 @@ ACE_OS::setsockopt (ACE_HANDLE handle, int level, int optname,
 ACE_INLINE int
 ACE_OS::shutdown (ACE_HANDLE handle, int how)
 {
-  ACE_TRACE ("ACE_OS::shutdown");
+  // ACE_TRACE ("ACE_OS::shutdown");
   ACE_SOCKCALL_RETURN (::shutdown ((ACE_SOCKET) handle, how), int, -1);
 }
 
 ACE_INLINE ACE_HANDLE
 ACE_OS::socket (int domain, int type, int proto)
 {
-  ACE_TRACE ("ACE_OS::socket");
+  // ACE_TRACE ("ACE_OS::socket");
   ACE_SOCKCALL_RETURN (::socket (domain, type, proto),
                        ACE_HANDLE, ACE_INVALID_HANDLE);
 }
@@ -4624,14 +4807,14 @@ ACE_OS::socket (int domain, int type, int proto)
 ACE_INLINE int
 ACE_OS::atoi (const char *s)
 {
-  ACE_TRACE ("ACE_OS::atoi");
+  // ACE_TRACE ("ACE_OS::atoi");
   ACE_OSCALL_RETURN (::atoi (s), int, -1);
 }
 
 ACE_INLINE int
 ACE_OS::recvmsg (ACE_HANDLE handle, struct msghdr *msg, int flags)
 {
-  ACE_TRACE ("ACE_OS::recvmsg");
+  // ACE_TRACE ("ACE_OS::recvmsg");
 #if !defined (ACE_LACKS_RECVMSG)
 # if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD bytes_received = 0;
@@ -4670,7 +4853,7 @@ ACE_OS::sendmsg (ACE_HANDLE handle,
                  const struct msghdr *msg,
                  int flags)
 {
-  ACE_TRACE ("ACE_OS::sendmsg");
+  // ACE_TRACE ("ACE_OS::sendmsg");
 #if !defined (ACE_LACKS_SENDMSG)
 # if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD bytes_sent = 0;
@@ -4709,7 +4892,7 @@ ACE_INLINE int
 ACE_OS::fclose (FILE *fp)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::fclose");
+  // ACE_TRACE ("ACE_OS::fclose");
   ACE_OSCALL_RETURN (::fclose (fp), int, -1);
 #else
   // On CE, FILE * == void * == HANDLE
@@ -4724,7 +4907,7 @@ ACE_OS::fclose (FILE *fp)
 ACE_INLINE char *
 ACE_OS::fgets (char *buf, int size, FILE *fp)
 {
-  ACE_TRACE ("ACE_OS::fgets");
+  // ACE_TRACE ("ACE_OS::fgets");
   ACE_OSCALL_RETURN (::fgets (buf, size, fp), char *, 0);
 }
 
@@ -4734,7 +4917,7 @@ ACE_OS::fgets (char *buf, int size, FILE *fp)
 ACE_INLINE FILE *
 ACE_OS::fopen (const char *filename, const char *mode)
 {
-  ACE_TRACE ("ACE_OS::fopen");
+  // ACE_TRACE ("ACE_OS::fopen");
   ACE_OSCALL_RETURN (::fopen (filename, mode), FILE *, 0);
 }
 #endif /* ACE_WIN32 */
@@ -4744,7 +4927,7 @@ ACE_INLINE int
 ACE_OS::fflush (FILE *fp)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::fflush");
+  // ACE_TRACE ("ACE_OS::fflush");
   ACE_OSCALL_RETURN (::fflush (fp), int, -1);
 #else
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL(::FlushFileBuffers (fp),
@@ -4756,7 +4939,7 @@ ACE_OS::fflush (FILE *fp)
 ACE_INLINE size_t
 ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 {
-  ACE_TRACE ("ACE_OS::fread");
+  // ACE_TRACE ("ACE_OS::fread");
 #if defined (ACE_HAS_WINCE)
   DWORD len = 0;
   size_t tlen = size * nelems;
@@ -4784,7 +4967,7 @@ ACE_OS::fread (void *ptr, size_t size, size_t nelems, FILE *fp)
 ACE_INLINE size_t
 ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
 {
-  ACE_TRACE ("ACE_OS::fwrite");
+  // ACE_TRACE ("ACE_OS::fwrite");
 #if defined (ACE_HAS_WINCE)
   DWORD len = 0;
   size_t tlen = size * nitems;
@@ -4809,12 +4992,11 @@ ACE_OS::fwrite (const void *ptr, size_t size, size_t nitems, FILE *fp)
 #endif /* ACE_LACKS_POSIX_PROTOTYPES */
 }
 
-#if !defined (ACE_HAS_WINCE)
 ACE_INLINE int
 ACE_OS::truncate (const char *filename,
                   off_t offset)
 {
-  ACE_TRACE ("ACE_OS::truncate");
+  // ACE_TRACE ("ACE_OS::truncate");
 #if defined (ACE_WIN32)
   ACE_HANDLE handle;
   if ((handle = ACE_OS::open (filename, O_WRONLY, 0666)) < 0)
@@ -4836,7 +5018,6 @@ ACE_OS::truncate (const char *filename,
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_WIN32 */
 }
-#endif /* ACE_HAS_WINCE */
 
 // Accessors to PWD file.
 
@@ -4901,9 +5082,7 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
 #if !defined (ACE_LACKS_PWD_FUNCTIONS)
 # if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if !defined (ACE_LACKS_PWD_REENTRANT_FUNCTIONS)
-#     if defined (ACE_HAS_PTHREADS_STD) && \
-      !defined (ACE_HAS_STHREADS) || \
-      defined (__USLC__) // Added by Roland Gigler for SCO UnixWare 7.
+#     if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_HAS_STHREADS)
   struct passwd *result;
   int status;
 #       if defined (DIGITAL_UNIX)
@@ -4956,7 +5135,7 @@ ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
                          hostent *result, ACE_HOSTENT_DATA buffer,
                          int *h_errnop)
 {
-  ACE_TRACE ("ACE_OS::gethostbyaddr_r");
+  // ACE_TRACE ("ACE_OS::gethostbyaddr_r");
 # if defined (ACE_PSOS)
   ACE_UNUSED_ARG (addr);
   ACE_UNUSED_ARG (length);
@@ -5012,7 +5191,7 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
                          ACE_HOSTENT_DATA buffer,
                          int *h_errnop)
 {
-  ACE_TRACE ("ACE_OS::gethostbyname_r");
+  // ACE_TRACE ("ACE_OS::gethostbyname_r");
 #if defined (ACE_PSOS)
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (result);
@@ -5073,7 +5252,7 @@ ACE_OS::gethostbyname_r (const char *name, hostent *result,
 ACE_INLINE char *
 ACE_OS::gets (char *str)
 {
-  ACE_TRACE ("ACE_OS::gets");
+  // ACE_TRACE ("ACE_OS::gets");
   ACE_OSCALL_RETURN (::gets (str), char *, 0);
 }
 #endif /* 0 */
@@ -5082,7 +5261,7 @@ ACE_INLINE struct servent *
 ACE_OS::getservbyname_r (const char *svc, const char *proto,
                          struct servent *result, ACE_SERVENT_DATA buf)
 {
-  ACE_TRACE ("ACE_OS::getservbyname_r");
+  // ACE_TRACE ("ACE_OS::getservbyname_r");
 #if defined (ACE_LACKS_GETSERVBYNAME)
   ACE_UNUSED_ARG (svc);
   ACE_UNUSED_ARG (proto);
@@ -5126,7 +5305,7 @@ ACE_OS::getservbyname_r (const char *svc, const char *proto,
 ACE_INLINE long
 ACE_OS::inet_addr (const char *name)
 {
-  ACE_TRACE ("ACE_OS::inet_addr");
+  // ACE_TRACE ("ACE_OS::inet_addr");
 #if defined (VXWORKS) || defined (ACE_PSOS)
 
   u_long ret = 0;
@@ -5170,7 +5349,7 @@ ACE_OS::inet_addr (const char *name)
 ACE_INLINE char *
 ACE_OS::inet_ntoa (const struct in_addr addr)
 {
-  ACE_TRACE ("ACE_OS::inet_ntoa");
+  // ACE_TRACE ("ACE_OS::inet_ntoa");
 #if defined (ACE_PSOS)
   ACE_UNUSED_ARG (addr);
   ACE_NOTSUP_RETURN (0);
@@ -5180,71 +5359,9 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
 }
 
 ACE_INLINE int
-ACE_OS::inet_pton (int family, const char *strptr, void *addrptr)
-{
-  ACE_TRACE ("ACE_OS::inet_pton");
-
-#if defined (ACE_HAS_IP6)
-  ACE_OSCALL_RETURN (::inet_pton (family, strptr, addrptr), int, -1);
-#else
-  if (family == AF_INET)
-    {
-      struct in_addr in_val;
-
-      if (ACE_OS::inet_aton (strptr, &in_val))
-        {
-          ACE_OS::memcpy (addrptr, &in_val, sizeof (struct in_addr));
-          return 1; // Success
-        }
-
-      return 0; // Input is not a valid presentation format
-    }
-
-  ACE_NOTSUP_RETURN(-1);
-#endif  /* ACE_HAS_IP6 */
-}
-
-ACE_INLINE const char *
-ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)
-{
-  ACE_TRACE ("ACE_OS::inet_ntop");
-
-#if defined (ACE_HAS_IP6)
-  ACE_OSCALL_RETURN (::inet_ntop (family, addrptr, strptr, len), const char *, 0);
-#else
-  const unsigned char *p =
-    ACE_reinterpret_cast (const unsigned char *, addrptr);
-
-  if (family == AF_INET)
-    {
-      char temp[INET_ADDRSTRLEN];
-
-      // Stevens uses snprintf() in his implementation but snprintf()
-      // doesn't appear to be very portable.  For now, hope that using
-      // sprintf() will not cause any string/memory overrun problems.
-      ACE_OS::sprintf (temp,
-                       "%d.%d.%d.%d",
-                       p[0], p[1], p[2], p[3]);
-
-      if (ACE_OS::strlen (temp) >= len)
-        {
-          errno = ENOSPC;
-          return 0; // Failure
-        }
-
-      ACE_OS::strcpy (strptr, temp);
-      return strptr;
-    }
-
-  ACE_NOTSUP_RETURN(0);
-#endif /* ACE_HAS_IP6 */
-}
-
-ACE_INLINE int
 ACE_OS::last_error (void)
 {
   // ACE_TRACE ("ACE_OS::last_error");
-
 #if defined (ACE_WIN32)
   return errno == 0 ? ::GetLastError () : errno;
 #else
@@ -5255,7 +5372,7 @@ ACE_OS::last_error (void)
 ACE_INLINE void
 ACE_OS::last_error (int error)
 {
-  ACE_TRACE ("ACE_OS::last_error");
+  // ACE_TRACE ("ACE_OS::last_error");
 #if defined (ACE_WIN32)
   ::SetLastError (error);
 #else
@@ -5267,7 +5384,7 @@ ACE_OS::last_error (int error)
 ACE_INLINE void
 ACE_OS::perror (const char *s)
 {
-  ACE_TRACE ("ACE_OS::perror");
+  // ACE_TRACE ("ACE_OS::perror");
   ::perror (s);
 }
 #endif /* ! ACE_HAS_WINCE */
@@ -5277,14 +5394,14 @@ ACE_OS::perror (const char *s)
 ACE_INLINE int
 ACE_OS::puts (const char *s)
 {
-  ACE_TRACE ("ACE_OS::puts");
+  // ACE_TRACE ("ACE_OS::puts");
   ACE_OSCALL_RETURN (::puts (s), int, -1);
 }
 
 ACE_INLINE int
 ACE_OS::fputs (const char *s, FILE *stream)
 {
-  ACE_TRACE ("ACE_OS::puts");
+  // ACE_TRACE ("ACE_OS::puts");
   ACE_OSCALL_RETURN (::fputs (s, stream), int, -1);
 }
 #endif /* ! ACE_HAS_WINCE */
@@ -5295,21 +5412,14 @@ ACE_OS::signal (int signum, ACE_SignalHandler func)
   if (signum == 0)
     return 0;
   else
-#if defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
-    return (ACE_SignalHandler) ::signal (signum, (void (*)(void)) func);
-#elif defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
-    return 0;
-#elif defined (ACE_PSOS_TM)
-    // @@ It would be good to rework this so the ACE_PSOS_TM specific
-    //    branch is not needed, but prying it out of ACE_LACKS_UNIX_SIGNALS
-    //    will take some extra work - deferred for now.
+#if defined (ACE_PSOS_TM)  //JINLU
     return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func);
 #elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) || !defined (ACE_LACKS_UNIX_SIGNALS)
-#  if !defined (ACE_HAS_TANDEM_SIGNALS) && !defined (ACE_HAS_LYNXOS_SIGNALS)
+# if !defined (ACE_HAS_TANDEM_SIGNALS) && !defined (ACE_HAS_LYNXOS_SIGNALS)
     return ::signal (signum, func);
-#  else
+# else
     return (ACE_SignalHandler) ::signal (signum, (void (*)(int)) func);
-#  endif /* !ACE_HAS_TANDEM_SIGNALS */
+# endif /* !ACE_HAS_TANDEM_SIGNALS */
 #else
     // @@ Don't know how to implement signal on WinCE (yet.)
     ACE_UNUSED_ARG (signum);
@@ -5322,7 +5432,7 @@ ACE_INLINE int
 ACE_OS::system (const char *s)
 {
   // ACE_TRACE ("ACE_OS::system");
-#if !defined (CHORUS) && !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS)
+#if !defined (CHORUS) && !defined (ACE_HAS_WINCE)
     // ACE_TRACE ("ACE_OS::system");
     ACE_OSCALL_RETURN (::system (s), int, -1);
 #else
@@ -5334,7 +5444,7 @@ ACE_OS::system (const char *s)
 ACE_INLINE int
 ACE_OS::thr_continue (ACE_hthread_t target_thread)
 {
-  ACE_TRACE ("ACE_OS::thr_continue");
+  // ACE_TRACE ("ACE_OS::thr_continue");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_continue (target_thread), ace_result_), int, -1);
@@ -5359,6 +5469,25 @@ ACE_OS::thr_continue (ACE_hthread_t target_thread)
 }
 
 ACE_INLINE int
+ACE_OS::thr_equal (ACE_thread_t t1, ACE_thread_t t2)
+{
+#if defined (ACE_HAS_PTHREADS)
+# if defined (pthread_equal)
+  // If it's a macro we can't say "::pthread_equal"...
+  return pthread_equal (t1, t2);
+# else
+  return ::pthread_equal (t1, t2);
+# endif /* pthread_equal */
+#elif defined (VXWORKS)
+  return ! ACE_OS::strcmp (t1, t2);
+#else /* For both STHREADS and WTHREADS... */
+  // Hum, Do we need to treat WTHREAD differently?
+  // levine 13 oct 98 % I don't think so, ACE_thread_t is a DWORD.
+  return t1 == t2;
+#endif /* Threads variety case */
+}
+
+ACE_INLINE int
 ACE_OS::thr_cmp (ACE_hthread_t t1, ACE_hthread_t t2)
 {
 #if defined (ACE_HAS_PTHREADS)
@@ -5378,7 +5507,7 @@ ACE_OS::thr_cmp (ACE_hthread_t t1, ACE_hthread_t t2)
 ACE_INLINE int
 ACE_OS::thr_getconcurrency (void)
 {
-  ACE_TRACE ("ACE_OS::thr_getconcurrency");
+  // ACE_TRACE ("ACE_OS::thr_getconcurrency");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   return ::thr_getconcurrency ();
@@ -5395,7 +5524,7 @@ ACE_OS::thr_getconcurrency (void)
 ACE_INLINE int
 ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio)
 {
-  ACE_TRACE ("ACE_OS::thr_getprio");
+  // ACE_TRACE ("ACE_OS::thr_getprio");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (thr_id, &prio), ace_result_), int, -1);
@@ -5456,13 +5585,62 @@ ACE_OS::thr_getprio (ACE_hthread_t thr_id, int &prio)
 }
 
 
+ACE_INLINE void
+ACE_OS::thr_self (ACE_hthread_t &self)
+{
+  // ACE_TRACE ("ACE_OS::thr_self");
+#if defined (ACE_HAS_THREADS)
+# if defined (ACE_HAS_PTHREADS)
+  // Note, don't use "::" here since the following call is often a macro.
+  self = pthread_self ();
+# elif defined (ACE_HAS_THREAD_SELF)
+  self = ::thread_self ();
+# elif defined (ACE_HAS_STHREADS)
+  self = ::thr_self ();
+# elif defined (ACE_HAS_WTHREADS)
+  self = ::GetCurrentThread ();
+# elif defined (ACE_PSOS)
+  t_ident ((char *) 0, 0, &self);
+# elif defined (VXWORKS)
+  self = ::taskIdSelf ();
+# endif /* ACE_HAS_STHREADS */
+#else
+  self = 1; // Might as well make it the main thread ;-)
+#endif /* ACE_HAS_THREADS */
+}
+
+ACE_INLINE ACE_thread_t
+ACE_OS::thr_self (void)
+{
+  // ACE_TRACE ("ACE_OS::thr_self");
+#if defined (ACE_HAS_THREADS)
+# if defined (ACE_HAS_PTHREADS)
+  // Note, don't use "::" here since the following call is often a macro.
+  ACE_OSCALL_RETURN (pthread_self (), int, -1);
+# elif defined (ACE_HAS_STHREADS)
+  ACE_OSCALL_RETURN (::thr_self (), int, -1);
+# elif defined (ACE_HAS_WTHREADS)
+  return ::GetCurrentThreadId ();
+# elif defined (ACE_PSOS)
+  // there does not appear to be a way to get
+  // a task's name other than at creation
+  return 0;
+# elif defined (VXWORKS)
+  return ::taskName (::taskIdSelf ());
+# endif /* ACE_HAS_STHREADS */
+#else
+  return 1; // Might as well make it the first thread ;-)
+#endif /* ACE_HAS_THREADS */
+}
+
+
 #if defined (ACE_HAS_TSS_EMULATION)
 
 #if defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
 ACE_INLINE int
 ACE_OS::thr_getspecific (ACE_OS_thread_key_t key, void **data)
 {
-  ACE_TRACE ("ACE_OS::thr_getspecific");
+  // ACE_TRACE ("ACE_OS::thr_getspecific");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), ace_result_), int, -1);
@@ -5602,7 +5780,7 @@ ACE_TSS_Emulation::ts_object (const ACE_thread_key_t key)
 ACE_INLINE int
 ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
 {
-  ACE_TRACE ("ACE_OS::thr_getspecific");
+  // ACE_TRACE ("ACE_OS::thr_getspecific");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_TSS_EMULATION)
     ACE_KEY_INDEX (key_index, key);
@@ -5655,14 +5833,51 @@ ACE_OS::thr_getspecific (ACE_thread_key_t key, void **data)
       errno = error;
       return 0;
     }
-# else
+# endif /* ACE_HAS_STHREADS */
+#else
   ACE_UNUSED_ARG (key);
   ACE_UNUSED_ARG (data);
   ACE_NOTSUP_RETURN (-1);
+#endif /* ACE_HAS_THREADS */
+}
+
+
+ACE_INLINE int
+ACE_OS::thr_join (ACE_thread_t waiter_id,
+                  ACE_thread_t *thr_id,
+                  void **status)
+{
+  // ACE_TRACE ("ACE_OS::thr_join");
+#if defined (ACE_HAS_THREADS)
+# if defined (ACE_HAS_STHREADS)
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), ace_result_),
+                     int, -1);
+# elif defined (ACE_HAS_PTHREADS)
+  ACE_UNUSED_ARG (thr_id);
+#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
+  ACE_OSCALL_RETURN (::pthread_join (waiter_id, status), int, -1);
+#   else
+  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (waiter_id, status), ace_result_),
+                     int, -1);
+#   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
+# elif defined (ACE_HAS_WTHREADS)
+  ACE_UNUSED_ARG (waiter_id);
+  ACE_UNUSED_ARG (thr_id);
+  ACE_UNUSED_ARG (status);
+
+  // This could be implemented if the DLL-Main function or the
+  // task exit base class some log the threads which have exited
+  ACE_NOTSUP_RETURN (-1);
+# elif defined (VXWORKS) || defined (ACE_PSOS)
+  ACE_UNUSED_ARG (waiter_id);
+  ACE_UNUSED_ARG (thr_id);
+  ACE_UNUSED_ARG (status);
+  ACE_NOTSUP_RETURN (-1);
 # endif /* ACE_HAS_STHREADS */
 #else
-  ACE_UNUSED_ARG (key);
-  ACE_UNUSED_ARG (data);
+  ACE_UNUSED_ARG (waiter_id);
+  ACE_UNUSED_ARG (thr_id);
+  ACE_UNUSED_ARG (status);
   ACE_NOTSUP_RETURN (-1);
 #endif /* ACE_HAS_THREADS */
 }
@@ -5671,20 +5886,16 @@ ACE_INLINE int
 ACE_OS::thr_join (ACE_hthread_t thr_handle,
                   void **status)
 {
-  ACE_TRACE ("ACE_OS::thr_join");
+  // ACE_TRACE ("ACE_OS::thr_join");
+  thr_handle = thr_handle;
+  status = status;
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), ace_result_),
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-#     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
-  void *temp;
-  ACE_OSCALL_RETURN (::pthread_join (thr_handle,
-    status == 0  ?  &temp  :  status), int, -1);
-#     else
   ACE_OSCALL_RETURN (::pthread_join (thr_handle, status), int, -1);
-#     endif
 #   else
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (thr_handle, status), ace_result_),
                      int, -1);
@@ -5724,55 +5935,9 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
 }
 
 ACE_INLINE int
-ACE_OS::thr_join (ACE_thread_t waiter_id,
-                  ACE_thread_t *thr_id,
-                  void **status)
-{
-  ACE_TRACE ("ACE_OS::thr_join");
-#if defined (ACE_HAS_THREADS)
-# if defined (ACE_HAS_STHREADS)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (waiter_id, thr_id, status), ace_result_),
-                     int, -1);
-# elif defined (ACE_HAS_PTHREADS)
-  ACE_UNUSED_ARG (thr_id);
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-#     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
-  void *temp;
-  ACE_OSCALL_RETURN (::pthread_join (waiter_id,
-    status == 0  ?  &temp  :  status), int, -1);
-#     else
-  ACE_OSCALL_RETURN (::pthread_join (waiter_id, status), int, -1);
-#     endif
-#   else
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_join (waiter_id, status), ace_result_),
-                     int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
-# elif defined (ACE_HAS_WTHREADS)
-  ACE_UNUSED_ARG (waiter_id);
-  ACE_UNUSED_ARG (thr_id);
-  ACE_UNUSED_ARG (status);
-
-  // This could be implemented if the DLL-Main function or the
-  // task exit base class some log the threads which have exited
-  ACE_NOTSUP_RETURN (-1);
-# elif defined (VXWORKS) || defined (ACE_PSOS)
-  ACE_UNUSED_ARG (waiter_id);
-  ACE_UNUSED_ARG (thr_id);
-  ACE_UNUSED_ARG (status);
-  ACE_NOTSUP_RETURN (-1);
-# endif /* ACE_HAS_STHREADS */
-#else
-  ACE_UNUSED_ARG (waiter_id);
-  ACE_UNUSED_ARG (thr_id);
-  ACE_UNUSED_ARG (status);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_THREADS */
-}
-
-ACE_INLINE int
 ACE_OS::thr_setcancelstate (int new_state, int *old_state)
 {
-  ACE_TRACE ("ACE_OS::thr_setcancelstate");
+  // ACE_TRACE ("ACE_OS::thr_setcancelstate");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
@@ -5814,7 +5979,7 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state)
 ACE_INLINE int
 ACE_OS::thr_setcanceltype (int new_type, int *old_type)
 {
-  ACE_TRACE ("ACE_OS::thr_setcanceltype");
+  // ACE_TRACE ("ACE_OS::thr_setcanceltype");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4)
@@ -5848,7 +6013,7 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type)
 ACE_INLINE int
 ACE_OS::thr_cancel (ACE_thread_t thr_id)
 {
-  ACE_TRACE ("ACE_OS::thr_cancel");
+  // ACE_TRACE ("ACE_OS::thr_cancel");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
@@ -5871,7 +6036,7 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id)
 ACE_INLINE int
 ACE_OS::sigwait (sigset_t *set, int *sig)
 {
-  ACE_TRACE ("ACE_OS::sigwait");
+  // ACE_TRACE ("ACE_OS::sigwait");
   int local_sig;
   if (sig == 0)
     sig = &local_sig;
@@ -5932,7 +6097,7 @@ ACE_OS::sigwait (sigset_t *set, int *sig)
 ACE_INLINE void
 ACE_OS::thr_testcancel (void)
 {
-  ACE_TRACE ("ACE_OS::thr_testcancel");
+  // ACE_TRACE ("ACE_OS::thr_testcancel");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
 #if defined(ACE_HAS_PTHREADS_DRAFT6)
@@ -5955,7 +6120,7 @@ ACE_OS::thr_sigsetmask (int how,
                         const sigset_t *nsm,
                         sigset_t *osm)
 {
-  ACE_TRACE ("ACE_OS::thr_sigsetmask");
+  // ACE_TRACE ("ACE_OS::thr_sigsetmask");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_LACKS_PTHREAD_THR_SIGSETMASK)
   // DCE threads and Solaris 2.4 have no such function.
@@ -6035,7 +6200,7 @@ ACE_OS::thr_sigsetmask (int how,
 ACE_INLINE int
 ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
 {
-  ACE_TRACE ("ACE_OS::thr_kill");
+  // ACE_TRACE ("ACE_OS::thr_kill");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
 #   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined(ACE_LACKS_PTHREAD_KILL)
@@ -6081,7 +6246,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
 ACE_INLINE size_t
 ACE_OS::thr_min_stack (void)
 {
-  ACE_TRACE ("ACE_OS::thr_min_stack");
+  // ACE_TRACE ("ACE_OS::thr_min_stack");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
 #   if defined (ACE_HAS_THR_MINSTACK)
@@ -6130,7 +6295,7 @@ ACE_OS::thr_min_stack (void)
 ACE_INLINE int
 ACE_OS::thr_setconcurrency (int hint)
 {
-  ACE_TRACE ("ACE_OS::thr_setconcurrency");
+  // ACE_TRACE ("ACE_OS::thr_setconcurrency");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setconcurrency (hint),
@@ -6156,7 +6321,7 @@ ACE_OS::thr_setconcurrency (int hint)
 ACE_INLINE int
 ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio)
 {
-  ACE_TRACE ("ACE_OS::thr_setprio");
+  // ACE_TRACE ("ACE_OS::thr_setprio");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (thr_id, prio),
@@ -6219,7 +6384,7 @@ ACE_OS::thr_setprio (ACE_hthread_t thr_id, int prio)
 ACE_INLINE int
 ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 {
-  ACE_TRACE ("ACE_OS::thr_suspend");
+  // ACE_TRACE ("ACE_OS::thr_suspend");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_suspend (target_thread), ace_result_), int, -1);
@@ -6246,7 +6411,7 @@ ACE_OS::thr_suspend (ACE_hthread_t target_thread)
 ACE_INLINE void
 ACE_OS::thr_yield (void)
 {
-  ACE_TRACE ("ACE_OS::thr_yield");
+  // ACE_TRACE ("ACE_OS::thr_yield");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_STHREADS)
   ::thr_yield ();
@@ -6274,7 +6439,7 @@ ACE_OS::thr_yield (void)
 ACE_INLINE int
 ACE_OS::priority_control (ACE_idtype_t idtype, ACE_id_t id, int cmd, void *arg)
 {
-  ACE_TRACE ("ACE_OS::priority_control");
+  // ACE_TRACE ("ACE_OS::priority_control");
 #if defined (ACE_HAS_PRIOCNTL)
   ACE_OSCALL_RETURN (priocntl (idtype, id, cmd, ACE_static_cast (caddr_t, arg)),
                      int, -1);
@@ -6291,7 +6456,7 @@ ACE_INLINE void
 ACE_OS::rewind (FILE *fp)
 {
 #if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::rewind");
+  // ACE_TRACE ("ACE_OS::rewind");
   ::rewind (fp);
 #else
   // In WinCE, "FILE *" is actually a HANDLE.
@@ -6305,7 +6470,7 @@ ACE_OS::rewind (FILE *fp)
 ACE_INLINE long
 ACE_OS::filesize (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::filesize");
+  // ACE_TRACE ("ACE_OS::filesize");
 #if defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (::GetFileSize (handle, NULL), long, -1);
 #else /* !ACE_WIN32 */
@@ -6320,7 +6485,7 @@ ACE_OS::readv (ACE_HANDLE handle,
                iovec *iov,
                int iovlen)
 {
-  ACE_TRACE ("ACE_OS::readv");
+  // ACE_TRACE ("ACE_OS::readv");
   ACE_OSCALL_RETURN (::readv (handle, iov, iovlen), ssize_t, -1);
 }
 
@@ -6329,7 +6494,7 @@ ACE_OS::writev (ACE_HANDLE handle,
                 const iovec *iov,
                 int iovcnt)
 {
-  ACE_TRACE ("ACE_OS::writev");
+  // ACE_TRACE ("ACE_OS::writev");
   ACE_OSCALL_RETURN (::writev (handle, (ACE_WRITEV_TYPE *) iov, iovcnt), int, -1);
 }
 
@@ -6338,48 +6503,18 @@ ACE_OS::recvv (ACE_HANDLE handle,
                iovec *buffers,
                int n)
 {
-#if defined (ACE_HAS_WINSOCK2)
-
+#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD bytes_received = 0;
-  int result = 1;
-
-  // Winsock 2 has WSASend and can do this directly, but Winsock 1 needs
-  // to do the recvs piece-by-piece.
-
-# if (ACE_HAS_WINSOCK2 != 0)
-  result = ::WSARecv ((SOCKET) handle,
-                      (WSABUF *) buffers,
-                      n,
-                      &bytes_received,
-                      0,
-                      0,
-                      0);
-# else
-  int i, chunklen;
-  char *chunkp = 0;
-
-  // Step through the buffers requested by caller; for each one, cycle
-  // through reads until it's filled or an error occurs.
-  for (i = 0; i < n && result > 0; i++)
-    {
-      chunkp = buffers[i].iov_base;     // Point to part of chunk being read
-      chunklen = buffers[i].iov_len;    // Track how much to read to chunk
-      while (chunklen > 0 && result > 0)
-        {
-          result = ::recv ((SOCKET) handle, chunkp, chunklen, 0);
-          if (result > 0)
-            {
-              chunkp += result;
-              chunklen -= result;
-              bytes_received += result;
-            }
-        }
-    }
-# endif /* ACE_HAS_WINSOCK2 != 0 */
-
-  if (result == SOCKET_ERROR)
+  int result = ::WSARecv ((SOCKET) handle,
+                          (WSABUF *) buffers,
+                          n,
+                          &bytes_received,
+                          0,
+                          0,
+                          0);
+  if (result != 0)
     {
-      errno = ::WSAGetLastError ();
+      errno = ::GetLastError ();
       return -1;
     }
   else
@@ -6394,40 +6529,22 @@ ACE_OS::sendv (ACE_HANDLE handle,
                const iovec *buffers,
                int n)
 {
-#if defined (ACE_HAS_WINSOCK2)
+#if (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
   DWORD bytes_sent = 0;
-  int result = 0;
-
-  // Winsock 2 has WSASend and can do this directly, but Winsock 1 needs
-  // to do the sends one-by-one.
-# if (ACE_HAS_WINSOCK2 != 0)
-  result = ::WSASend ((SOCKET) handle,
-                      (WSABUF *) buffers,
-                      n,
-                      &bytes_sent,
-                      0,
-                      0,
-                      0);
-# else
-  int i;
-  for (i = 0; i < n && result != SOCKET_ERROR; i++)
-    {
-      result = ::send ((SOCKET) handle,
-                       buffers[i].iov_base,
-                       buffers[i].iov_len,
-                       0);
-      bytes_sent += buffers[i].iov_len;     // Gets ignored on error anyway
-    }
-# endif /* ACE_HAS_WINSOCK2 != 0 */
-
-  if (result == SOCKET_ERROR)
+  int result = ::WSASend ((SOCKET) handle,
+                          (WSABUF *) buffers,
+                          n,
+                          &bytes_sent,
+                          0,
+                          0,
+                          0);
+  if (result != 0)
     {
-      errno = ::WSAGetLastError ();
+      errno = ::GetLastError ();
       return -1;
     }
   else
     return (ssize_t) bytes_sent;
-
 #else
   return ACE_OS::writev (handle, buffers, n);
 #endif /* ACE_HAS_WINSOCK2 */
@@ -6436,7 +6553,7 @@ ACE_OS::sendv (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::poll (struct pollfd *pollfds, u_long len, ACE_Time_Value *timeout)
 {
-  ACE_TRACE ("ACE_OS::poll");
+  // ACE_TRACE ("ACE_OS::poll");
 #if defined (ACE_HAS_POLL)
   int to = timeout == 0 ? -1 : int (timeout->msec ());
   ACE_OSCALL_RETURN (::poll (pollfds, len, to), int, -1);
@@ -6452,7 +6569,7 @@ ACE_OS::poll (struct pollfd *pollfds, u_long len, ACE_Time_Value *timeout)
 ACE_INLINE int
 ACE_OS::poll (struct pollfd *pollfds, u_long len, const ACE_Time_Value &timeout)
 {
-  ACE_TRACE ("ACE_OS::poll");
+  // ACE_TRACE ("ACE_OS::poll");
 #if defined (ACE_HAS_POLL)
   ACE_OSCALL_RETURN (::poll (pollfds, len, int (timeout.msec ())), int, -1);
 #else
@@ -6468,7 +6585,7 @@ ACE_INLINE int
 ACE_OS::t_accept (ACE_HANDLE handle, int reshandle,
                   struct t_call *call)
 {
-  ACE_TRACE ("ACE_OS::t_accept");
+  // ACE_TRACE ("ACE_OS::t_accept");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_accept (handle, reshandle, call), int, -1);
 #else
@@ -6484,7 +6601,7 @@ ACE_INLINE char *
 ACE_OS::t_alloc (ACE_HANDLE handle, int struct_type,
              int fields)
 {
-  ACE_TRACE ("ACE_OS::t_alloc");
+  // ACE_TRACE ("ACE_OS::t_alloc");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_alloc (handle, struct_type, fields),
                      char *, 0);
@@ -6501,7 +6618,7 @@ ACE_INLINE int
 ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
                 struct t_bind *ret)
 {
-  ACE_TRACE ("ACE_OS::t_bind");
+  // ACE_TRACE ("ACE_OS::t_bind");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_bind (handle, req, ret), int, -1);
 #else
@@ -6516,7 +6633,7 @@ ACE_OS::t_bind (ACE_HANDLE handle, struct t_bind *req,
 ACE_INLINE int
 ACE_OS::t_close (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_close");
+  // ACE_TRACE ("ACE_OS::t_close");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_close (handle), int, -1);
 #else
@@ -6531,7 +6648,7 @@ ACE_OS::t_connect(int fildes,
                   struct t_call *sndcall,
                   struct t_call *rcvcall)
 {
-  ACE_TRACE ("ACE_OS::t_connect");
+  // ACE_TRACE ("ACE_OS::t_connect");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_connect (fildes, sndcall, rcvcall), int, -1);
 #else
@@ -6546,7 +6663,7 @@ ACE_OS::t_connect(int fildes,
 ACE_INLINE void
 ACE_OS::t_error (char *errmsg)
 {
-  ACE_TRACE ("ACE_OS::t_error");
+  // ACE_TRACE ("ACE_OS::t_error");
 #if defined (ACE_HAS_TLI)
   ::t_error (errmsg);
 #else
@@ -6557,9 +6674,9 @@ ACE_OS::t_error (char *errmsg)
 ACE_INLINE int
 ACE_OS::t_free (char *ptr, int struct_type)
 {
-  ACE_TRACE ("ACE_OS::t_free");
+  // ACE_TRACE ("ACE_OS::t_free");
 #if defined (ACE_HAS_TLI)
-  if (ptr == 0)
+  if (ptr != 0)
     return 0;
   ACE_OSCALL_RETURN (::t_free (ptr, struct_type), int, -1);
 #else
@@ -6573,7 +6690,7 @@ ACE_OS::t_free (char *ptr, int struct_type)
 ACE_INLINE int
 ACE_OS::t_getinfo (ACE_HANDLE handle, struct t_info *info)
 {
-  ACE_TRACE ("ACE_OS::t_getinfo");
+  // ACE_TRACE ("ACE_OS::t_getinfo");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getinfo (handle, info), int, -1);
 #else
@@ -6589,7 +6706,7 @@ ACE_OS::t_getname (ACE_HANDLE handle,
                struct netbuf *namep,
                int type)
 {
-  ACE_TRACE ("ACE_OS::t_getname");
+  // ACE_TRACE ("ACE_OS::t_getname");
 #if defined (ACE_HAS_SVR4_TLI)
   ACE_OSCALL_RETURN (::t_getname (handle, namep, type), int, -1);
 #else
@@ -6598,13 +6715,13 @@ ACE_OS::t_getname (ACE_HANDLE handle,
   ACE_UNUSED_ARG (type);
 
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_SVR4_TLI */
+#endif /* ACE_HAS_STREAM_PIPES */
 }
 
 ACE_INLINE int
 ACE_OS::t_getstate (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_getstate");
+  // ACE_TRACE ("ACE_OS::t_getstate");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_getstate (handle), int, -1);
 #else
@@ -6617,7 +6734,7 @@ ACE_OS::t_getstate (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
 {
-  ACE_TRACE ("ACE_OS::t_listen");
+  // ACE_TRACE ("ACE_OS::t_listen");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_listen (handle, call), int, -1);
 #else
@@ -6631,7 +6748,7 @@ ACE_OS::t_listen (ACE_HANDLE handle, struct t_call *call)
 ACE_INLINE int
 ACE_OS::t_look (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_look");
+  // ACE_TRACE ("ACE_OS::t_look");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_look (handle), int, -1);
 #else
@@ -6644,7 +6761,7 @@ ACE_OS::t_look (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::t_open (char *path, int oflag, struct t_info *info)
 {
-  ACE_TRACE ("ACE_OS::t_open");
+  // ACE_TRACE ("ACE_OS::t_open");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_open (path, oflag, info), int, -1);
 #else
@@ -6661,7 +6778,7 @@ ACE_OS::t_optmgmt (ACE_HANDLE handle,
                struct t_optmgmt *req,
                struct t_optmgmt *ret)
 {
-  ACE_TRACE ("ACE_OS::t_optmgmt");
+  // ACE_TRACE ("ACE_OS::t_optmgmt");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_optmgmt (handle, req, ret), int, -1);
 #else
@@ -6679,7 +6796,7 @@ ACE_OS::t_rcv (ACE_HANDLE handle,
            unsigned nbytes,
            int *flags)
 {
-  ACE_TRACE ("ACE_OS::t_rcv");
+  // ACE_TRACE ("ACE_OS::t_rcv");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcv (handle, buf, nbytes, flags),
                      int, -1);
@@ -6696,7 +6813,7 @@ ACE_OS::t_rcv (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 {
-  ACE_TRACE ("ACE_OS::t_rcvdis");
+  // ACE_TRACE ("ACE_OS::t_rcvdis");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvdis (handle, discon), int, -1);
 #else
@@ -6710,7 +6827,7 @@ ACE_OS::t_rcvdis (ACE_HANDLE handle, struct t_discon *discon)
 ACE_INLINE int
 ACE_OS::t_rcvrel (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_rcvrel");
+  // ACE_TRACE ("ACE_OS::t_rcvrel");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvrel (handle), int, -1);
 #else
@@ -6725,7 +6842,7 @@ ACE_OS::t_rcvudata (ACE_HANDLE handle,
                 struct t_unitdata *unitdata,
                 int *flags)
 {
-  ACE_TRACE ("ACE_OS::t_rcvudata");
+  // ACE_TRACE ("ACE_OS::t_rcvudata");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvudata (handle, unitdata, flags),
                      int, -1);
@@ -6741,7 +6858,7 @@ ACE_OS::t_rcvudata (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 {
-  ACE_TRACE ("ACE_OS::t_rcvuderr");
+  // ACE_TRACE ("ACE_OS::t_rcvuderr");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_rcvuderr (handle, uderr), int, -1);
 #else
@@ -6755,7 +6872,7 @@ ACE_OS::t_rcvuderr (ACE_HANDLE handle, struct t_uderr *uderr)
 ACE_INLINE int
 ACE_OS::t_snd (ACE_HANDLE handle, char *buf, unsigned nbytes, int flags)
 {
-  ACE_TRACE ("ACE_OS::t_snd");
+  // ACE_TRACE ("ACE_OS::t_snd");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snd (handle, buf, nbytes, flags), int, -1);
 #else
@@ -6771,7 +6888,7 @@ ACE_OS::t_snd (ACE_HANDLE handle, char *buf, unsigned nbytes, int flags)
 ACE_INLINE int
 ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
 {
-  ACE_TRACE ("ACE_OS::t_snddis");
+  // ACE_TRACE ("ACE_OS::t_snddis");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_snddis (handle, call), int, -1);
 #else
@@ -6785,7 +6902,7 @@ ACE_OS::t_snddis (ACE_HANDLE handle, struct t_call *call)
 ACE_INLINE int
 ACE_OS::t_sndrel (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_sndrel");
+  // ACE_TRACE ("ACE_OS::t_sndrel");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sndrel (handle), int, -1);
 #else
@@ -6798,7 +6915,7 @@ ACE_OS::t_sndrel (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::t_sync (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_sync");
+  // ACE_TRACE ("ACE_OS::t_sync");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_sync (handle), int, -1);
 #else
@@ -6811,7 +6928,7 @@ ACE_OS::t_sync (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::t_unbind (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::t_unbind");
+  // ACE_TRACE ("ACE_OS::t_unbind");
 #if defined (ACE_HAS_TLI)
   ACE_OSCALL_RETURN (::t_unbind (handle), int, -1);
 #else
@@ -6824,7 +6941,7 @@ ACE_OS::t_unbind (ACE_HANDLE handle)
 ACE_INLINE char *
 ACE_OS::compile (const char *instring, char *expbuf, char *endbuf)
 {
-  ACE_TRACE ("ACE_OS::compile");
+  // ACE_TRACE ("ACE_OS::compile");
 #if defined (ACE_HAS_REGEX)
   ACE_OSCALL_RETURN (::compile (instring, expbuf, endbuf), char *, 0);
 #else
@@ -6839,7 +6956,7 @@ ACE_OS::compile (const char *instring, char *expbuf, char *endbuf)
 ACE_INLINE int
 ACE_OS::close (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::close");
+  // ACE_TRACE ("ACE_OS::close");
 #if defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (handle), ace_result_), int, -1);
 #elif defined (ACE_PSOS) && ! defined (ACE_PSOS_LACKS_PHILE)
@@ -6859,7 +6976,7 @@ ACE_OS::close (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::closesocket (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::close");
+  // ACE_TRACE ("ACE_OS::close");
 #if defined (ACE_WIN32)
   ACE_SOCKCALL_RETURN (::closesocket ((SOCKET) handle), int, -1);
 #else
@@ -6870,7 +6987,7 @@ ACE_OS::closesocket (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::access (const char *path, int amode)
 {
-  ACE_TRACE ("ACE_OS::access");
+  // ACE_TRACE ("ACE_OS::access");
 #if defined (ACE_LACKS_ACCESS)
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (amode);
@@ -6886,13 +7003,9 @@ ACE_OS::access (const char *path, int amode)
 ACE_INLINE ACE_HANDLE
 ACE_OS::creat (LPCTSTR filename, mode_t mode)
 {
-  ACE_TRACE ("ACE_OS::creat");
+  // ACE_TRACE ("ACE_OS::creat");
 #if defined (ACE_WIN32)
   return ACE_OS::open (filename, mode);
-#elif defined(ACE_PSOS)
-   ACE_OSCALL_RETURN(::create_f((char *)filename, 1024,
-                              S_IRUSR | S_IWUSR | S_IXUSR),
-                     ACE_HANDLE, ACE_INVALID_HANDLE);
 #elif defined(ACE_PSOS_TM)
   ACE_UNUSED_ARG (filename);
   ACE_UNUSED_ARG (mode);
@@ -6914,7 +7027,7 @@ ACE_OS::creat (LPCTSTR filename, mode_t mode)
 ACE_INLINE int
 ACE_OS::uname (struct utsname *name)
 {
-  ACE_TRACE ("ACE_OS::uname");
+  // ACE_TRACE ("ACE_OS::uname");
   ACE_OSCALL_RETURN (::uname (name), int, -1);
 }
 #endif /* ! ACE_WIN32 && ! VXWORKS && ! CHORUS */
@@ -6922,7 +7035,7 @@ ACE_OS::uname (struct utsname *name)
 ACE_INLINE int
 ACE_OS::hostname (char name[], size_t maxnamelen)
 {
-  ACE_TRACE ("ACE_OS::hostname");
+  // ACE_TRACE ("ACE_OS::hostname");
 #if !defined (ACE_HAS_WINCE)
 # if defined (ACE_WIN32)
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameA (name, LPDWORD (&maxnamelen)),
@@ -6966,7 +7079,7 @@ ACE_OS::hostname (char name[], size_t maxnamelen)
 ACE_INLINE int
 ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val)
 {
-  ACE_TRACE ("ACE_OS::msgctl");
+  // ACE_TRACE ("ACE_OS::msgctl");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::msgctl (msqid, cmd, val), int, -1);
 #else
@@ -6981,7 +7094,7 @@ ACE_OS::msgctl (int msqid, int cmd, struct msqid_ds *val)
 ACE_INLINE int
 ACE_OS::msgget (key_t key, int msgflg)
 {
-  ACE_TRACE ("ACE_OS::msgget");
+  // ACE_TRACE ("ACE_OS::msgget");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::msgget (key, msgflg), int, -1);
 #else
@@ -6996,7 +7109,7 @@ ACE_INLINE int
 ACE_OS::msgrcv (int int_id, void *buf, size_t len,
                 long type, int flags)
 {
-  ACE_TRACE ("ACE_OS::msgrcv");
+  // ACE_TRACE ("ACE_OS::msgrcv");
 #if defined (ACE_HAS_SYSV_IPC)
 # if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_LACKS_SOME_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::msgrcv (int_id, (msgbuf *) buf, len, type, flags),
@@ -7019,7 +7132,7 @@ ACE_OS::msgrcv (int int_id, void *buf, size_t len,
 ACE_INLINE int
 ACE_OS::msgsnd (int int_id, const void *buf, size_t len, int flags)
 {
-  ACE_TRACE ("ACE_OS::msgsnd");
+  // ACE_TRACE ("ACE_OS::msgsnd");
 #if defined (ACE_HAS_SYSV_IPC)
 # if defined (ACE_HAS_NONCONST_MSGSND)
   ACE_OSCALL_RETURN (::msgsnd (int_id, (void *) buf, len, flags), int, -1);
@@ -7041,7 +7154,7 @@ ACE_OS::msgsnd (int int_id, const void *buf, size_t len, int flags)
 ACE_INLINE u_int
 ACE_OS::alarm (u_int secs)
 {
-  ACE_TRACE ("ACE_OS::alarm");
+  // ACE_TRACE ("ACE_OS::alarm");
 
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (CHORUS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (secs);
@@ -7055,7 +7168,7 @@ ACE_OS::alarm (u_int secs)
 ACE_INLINE u_int
 ACE_OS::ualarm (u_int usecs, u_int interval)
 {
-  ACE_TRACE ("ACE_OS::ualarm");
+  // ACE_TRACE ("ACE_OS::ualarm");
 
 #if defined (ACE_HAS_UALARM)
   return ::ualarm (usecs, interval);
@@ -7073,7 +7186,7 @@ ACE_INLINE u_int
 ACE_OS::ualarm (const ACE_Time_Value &tv,
                 const ACE_Time_Value &tv_interval)
 {
-  ACE_TRACE ("ACE_OS::ualarm");
+  // ACE_TRACE ("ACE_OS::ualarm");
 
 #if defined (ACE_HAS_UALARM)
   u_int usecs = (tv.sec () * ACE_ONE_SECOND_IN_USECS) + tv.usec ();
@@ -7092,7 +7205,7 @@ ACE_OS::ualarm (const ACE_Time_Value &tv,
 ACE_INLINE int
 ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::dlclose");
+  // ACE_TRACE ("ACE_OS::dlclose");
 #if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
 
 # if !defined (ACE_HAS_AUTOMATIC_INIT_FINI)
@@ -7137,7 +7250,7 @@ ACE_OS::dlclose (ACE_SHLIB_HANDLE handle)
 ACE_INLINE char *
 ACE_OS::dlerror (void)
 {
-  ACE_TRACE ("ACE_OS::dlerror");
+  // ACE_TRACE ("ACE_OS::dlerror");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
   ACE_OSCALL_RETURN ((char *)::dlerror (), char *, 0);
 # elif defined (__hpux)
@@ -7160,7 +7273,7 @@ ACE_OS::dlerror (void)
 ACE_INLINE ACE_SHLIB_HANDLE
 ACE_OS::dlopen (ACE_DL_TYPE filename, int mode)
 {
-  ACE_TRACE ("ACE_OS::dlopen");
+  // ACE_TRACE ("ACE_OS::dlopen");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
   void *handle;
 #   if defined (ACE_HAS_SGIDLADD)
@@ -7208,7 +7321,7 @@ ACE_OS::dlopen (ACE_DL_TYPE filename, int mode)
 ACE_INLINE void *
 ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_DL_TYPE symbolname)
 {
-  ACE_TRACE ("ACE_OS::dlsym");
+  // ACE_TRACE ("ACE_OS::dlsym");
 # if defined (ACE_HAS_SVR4_DYNAMIC_LINKING)
 #   if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::dlsym (handle, (char*) symbolname), void *, 0);
@@ -7253,16 +7366,15 @@ ACE_OS::dlerror (void)
 ACE_INLINE void *
 ACE_OS::dlsym (ACE_SHLIB_HANDLE handle, ACE_WIDE_DL_TYPE symbolname)
 {
-  ACE_TRACE ("ACE_OS::dlsym");
+  // ACE_TRACE ("ACE_OS::dlsym");
   ACE_WIN32CALL_RETURN (::GetProcAddress (handle, symbolname), void *, 0);
 }
 #endif /* ACE_HAS_WINCE */
 
-
 ACE_INLINE int
 ACE_OS::step (const char *str, char *expbuf)
 {
-  ACE_TRACE ("ACE_OS::step");
+  // ACE_TRACE ("ACE_OS::step");
 #if defined (ACE_HAS_REGEX)
   ACE_OSCALL_RETURN (::step (str, expbuf), int, -1);
 #else
@@ -7276,7 +7388,7 @@ ACE_OS::step (const char *str, char *expbuf)
 ACE_INLINE long
 ACE_OS::sysinfo (int cmd, char *buf, long count)
 {
-  ACE_TRACE ("ACE_OS::sysinfo");
+  // ACE_TRACE ("ACE_OS::sysinfo");
 #if defined (ACE_HAS_SYSINFO)
   ACE_OSCALL_RETURN (::sysinfo (cmd, buf, count), long, -1);
 #else
@@ -7291,7 +7403,7 @@ ACE_OS::sysinfo (int cmd, char *buf, long count)
 ACE_INLINE ssize_t
 ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte)
 {
-  ACE_TRACE ("ACE_OS::write");
+  // ACE_TRACE ("ACE_OS::write");
 #if defined (ACE_WIN32)
   DWORD bytes_written; // This is set to 0 byte WriteFile.
 
@@ -7311,8 +7423,6 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte)
 #else
 # if defined (ACE_LACKS_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::write (handle, (const char *) buf, nbyte), ssize_t, -1);
-# elif defined (ACE_PSOS)
-  ACE_OSCALL_RETURN (::write_f(handle, (void *) buf, nbyte), ssize_t, -1);
 # elif defined (ACE_HAS_CHARPTR_SOCKOPT)
   ACE_OSCALL_RETURN (::write (handle, (char *) buf, nbyte), ssize_t, -1);
 # else
@@ -7325,7 +7435,7 @@ ACE_INLINE ssize_t
 ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte,
                ACE_OVERLAPPED *overlapped)
 {
-  ACE_TRACE ("ACE_OS::write");
+  // ACE_TRACE ("ACE_OS::write");
   overlapped = overlapped;
 #if defined (ACE_WIN32)
   DWORD bytes_written; // This is set to 0 byte WriteFile.
@@ -7342,7 +7452,7 @@ ACE_OS::write (ACE_HANDLE handle, const void *buf, size_t nbyte,
 ACE_INLINE ssize_t
 ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len)
 {
-  ACE_TRACE ("ACE_OS::read");
+  // ACE_TRACE ("ACE_OS::read");
 #if defined (ACE_WIN32)
   DWORD ok_len;
   if (::ReadFile (handle, buf, len, &ok_len, 0))
@@ -7381,7 +7491,7 @@ ACE_INLINE ssize_t
 ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len,
               ACE_OVERLAPPED *overlapped)
 {
-  ACE_TRACE ("ACE_OS::read");
+  // ACE_TRACE ("ACE_OS::read");
   overlapped = overlapped;
 #if defined (ACE_WIN32)
   DWORD ok_len;
@@ -7394,7 +7504,7 @@ ACE_OS::read (ACE_HANDLE handle, void *buf, size_t len,
 ACE_INLINE int
 ACE_OS::readlink (const char *path, char *buf, size_t bufsiz)
 {
-  ACE_TRACE ("ACE_OS::readlink");
+  // ACE_TRACE ("ACE_OS::readlink");
 # if defined (ACE_LACKS_READLINK) || \
      defined (ACE_HAS_WINCE) || defined (ACE_WIN32)
   ACE_UNUSED_ARG (path);
@@ -7416,7 +7526,7 @@ ACE_OS::getmsg (ACE_HANDLE handle,
                 struct strbuf *data,
                 int *flags)
 {
-  ACE_TRACE ("ACE_OS::getmsg");
+  // ACE_TRACE ("ACE_OS::getmsg");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::getmsg (handle, ctl, data, flags), int, -1);
 #else
@@ -7437,7 +7547,7 @@ ACE_OS::getpmsg (ACE_HANDLE handle,
                  int *band,
                  int *flags)
 {
-  ACE_TRACE ("ACE_OS::getpmsg");
+  // ACE_TRACE ("ACE_OS::getpmsg");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::getpmsg (handle, ctl, data, band, flags), int, -1);
 #else
@@ -7455,7 +7565,7 @@ ACE_OS::getpmsg (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::getrusage (int who, struct rusage *ru)
 {
-  ACE_TRACE ("ACE_OS::getrusage");
+  // ACE_TRACE ("ACE_OS::getrusage");
 
 #if defined (ACE_HAS_SYSCALL_GETRUSAGE)
   // This nonsense is necessary for HP/UX...
@@ -7489,7 +7599,7 @@ ACE_OS::getrusage (int who, struct rusage *ru)
 ACE_INLINE int
 ACE_OS::isastream (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::isastream");
+  // ACE_TRACE ("ACE_OS::isastream");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::isastream (handle), int, -1);
 #else
@@ -7509,7 +7619,7 @@ ACE_OS::mmap (void *addr,
               ACE_HANDLE *file_mapping,
               LPSECURITY_ATTRIBUTES sa)
 {
-  ACE_TRACE ("ACE_OS::mmap");
+  // ACE_TRACE ("ACE_OS::mmap");
 #if defined (ACE_WIN32)
   int nt_flags = 0;
   ACE_HANDLE local_handle = ACE_INVALID_HANDLE;
@@ -7655,7 +7765,7 @@ ACE_OS::mmap (void *addr,
 ACE_INLINE int
 ACE_OS::mprotect (void *addr, size_t len, int prot)
 {
-  ACE_TRACE ("ACE_OS::mprotect");
+  // ACE_TRACE ("ACE_OS::mprotect");
 #if defined (ACE_WIN32)
   DWORD dummy; // Sigh!
   return ::VirtualProtect(addr, len, prot, &dummy) ? 0 : -1;
@@ -7672,7 +7782,7 @@ ACE_OS::mprotect (void *addr, size_t len, int prot)
 ACE_INLINE int
 ACE_OS::msync (void *addr, size_t len, int sync)
 {
-  ACE_TRACE ("ACE_OS::msync");
+  // ACE_TRACE ("ACE_OS::msync");
 #if defined (ACE_WIN32)
   ACE_UNUSED_ARG (sync);
 
@@ -7695,7 +7805,7 @@ ACE_OS::msync (void *addr, size_t len, int sync)
 ACE_INLINE int
 ACE_OS::munmap (void *addr, size_t len)
 {
-  ACE_TRACE ("ACE_OS::munmap");
+  // ACE_TRACE ("ACE_OS::munmap");
 #if defined (ACE_WIN32)
   ACE_UNUSED_ARG (len);
 
@@ -7712,7 +7822,7 @@ ACE_OS::munmap (void *addr, size_t len)
 ACE_INLINE int
 ACE_OS::madvise (caddr_t addr, size_t len, int advice)
 {
-  ACE_TRACE ("ACE_OS::madvise");
+  // ACE_TRACE ("ACE_OS::madvise");
 #if defined (ACE_WIN32)
   ACE_UNUSED_ARG (addr);
   ACE_UNUSED_ARG (len);
@@ -7733,7 +7843,7 @@ ACE_INLINE int
 ACE_OS::putmsg (ACE_HANDLE handle, const struct strbuf *ctl,
                 const struct strbuf *data, int flags)
 {
-  ACE_TRACE ("ACE_OS::putmsg");
+  // ACE_TRACE ("ACE_OS::putmsg");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::putmsg (handle,
                                (ACE_STRBUF_TYPE) ctl,
@@ -7772,7 +7882,7 @@ ACE_OS::putpmsg (ACE_HANDLE handle,
                  int band,
                  int flags)
 {
-  ACE_TRACE ("ACE_OS::putpmsg");
+  // ACE_TRACE ("ACE_OS::putpmsg");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::putpmsg (handle,
                                 (ACE_STRBUF_TYPE) ctl,
@@ -7788,7 +7898,7 @@ ACE_OS::putpmsg (ACE_HANDLE handle,
 ACE_INLINE int
 ACE_OS::semctl (int int_id, int semnum, int cmd, semun value)
 {
-  ACE_TRACE ("ACE_OS::semctl");
+  // ACE_TRACE ("ACE_OS::semctl");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::semctl (int_id, semnum, cmd, value), int, -1);
 #else
@@ -7804,7 +7914,7 @@ ACE_OS::semctl (int int_id, int semnum, int cmd, semun value)
 ACE_INLINE int
 ACE_OS::semget (key_t key, int nsems, int flags)
 {
-  ACE_TRACE ("ACE_OS::semget");
+  // ACE_TRACE ("ACE_OS::semget");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::semget (key, nsems, flags), int, -1);
 #else
@@ -7819,7 +7929,7 @@ ACE_OS::semget (key_t key, int nsems, int flags)
 ACE_INLINE int
 ACE_OS::semop (int int_id, struct sembuf *sops, size_t nsops)
 {
-  ACE_TRACE ("ACE_OS::semop");
+  // ACE_TRACE ("ACE_OS::semop");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::semop (int_id, sops, nsops), int, -1);
 #else
@@ -7834,7 +7944,7 @@ ACE_OS::semop (int int_id, struct sembuf *sops, size_t nsops)
 ACE_INLINE void *
 ACE_OS::shmat (int int_id, void *shmaddr, int shmflg)
 {
-  ACE_TRACE ("ACE_OS::shmat");
+  // ACE_TRACE ("ACE_OS::shmat");
 #if defined (ACE_HAS_SYSV_IPC)
 # if defined (ACE_LACKS_POSIX_PROTOTYPES) || defined (ACE_LACKS_SOME_POSIX_PROTOTYPES)
   ACE_OSCALL_RETURN (::shmat (int_id, (char *)shmaddr, shmflg), void *, (void *) -1);
@@ -7853,7 +7963,7 @@ ACE_OS::shmat (int int_id, void *shmaddr, int shmflg)
 ACE_INLINE int
 ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf)
 {
-  ACE_TRACE ("ACE_OS::shmctl");
+  // ACE_TRACE ("ACE_OS::shmctl");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::shmctl (int_id, cmd, buf), int, -1);
 #else
@@ -7868,7 +7978,7 @@ ACE_OS::shmctl (int int_id, int cmd, struct shmid_ds *buf)
 ACE_INLINE int
 ACE_OS::shmdt (void *shmaddr)
 {
-  ACE_TRACE ("ACE_OS::shmdt");
+  // ACE_TRACE ("ACE_OS::shmdt");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::shmdt ((char *) shmaddr), int, -1);
 #else
@@ -7881,7 +7991,7 @@ ACE_OS::shmdt (void *shmaddr)
 ACE_INLINE int
 ACE_OS::shmget (key_t key, int size, int flags)
 {
-  ACE_TRACE ("ACE_OS::shmget");
+  // ACE_TRACE ("ACE_OS::shmget");
 #if defined (ACE_HAS_SYSV_IPC)
   ACE_OSCALL_RETURN (::shmget (key, size, flags), int, -1);
 #else
@@ -7900,7 +8010,7 @@ ACE_OS::shm_open (const char *filename,
                   int perms,
                   LPSECURITY_ATTRIBUTES sa)
 {
-  ACE_TRACE ("ACE_OS::shm_open");
+  // ACE_TRACE ("ACE_OS::shm_open");
 # if defined (ACE_HAS_SHM_OPEN)
   ACE_UNUSED_ARG (sa);
   ACE_OSCALL_RETURN (::shm_open (filename, mode, perms), ACE_HANDLE, -1);
@@ -7912,55 +8022,15 @@ ACE_OS::shm_open (const char *filename,
 }
 #endif /* ! ACE_HAS_MOSTLY_UNICODE_APIS */
 
-ACE_INLINE void
-ACE_OS::tzset (void)
-{
-# if !defined (ACE_HAS_WINCE) && !defined (VXWORKS) && !defined (ACE_PSOS)
-#   if defined (ACE_WIN32)
-  ::_tzset ();  // For Win32.
-#   else
-  ::tzset ();   // For UNIX platforms.
-#   endif /* ACE_WIN32 */
-# else
-  errno = ENOTSUP;
-# endif /* !ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS */
-}
-
-ACE_INLINE long
-ACE_OS::timezone (void)
-{
-# if !defined (ACE_HAS_WINCE) && !defined (VXWORKS) && !defined (ACE_PSOS) \
-&& !defined (CHORUS)
-#   if defined (ACE_WIN32)
-  return _timezone;  // For Win32.
-#   elif defined(__Lynx__) || defined (__FreeBSD__)
-  long result = 0;
-  struct timeval time;
-  struct timezone zone;
-  ACE_OSCALL (::gettimeofday (&time, &zone), int, -1, result);
-  return zone.tz_minuteswest * 60;
-#   else
-  return ::timezone;   // For UNIX platforms.
-#   endif
-# else
-  ACE_NOTSUP_RETURN (0);
-# endif /* !ACE_HAS_WINCE && !VXWORKS && !ACE_PSOS */
-}
-
 #if !defined (ACE_LACKS_DIFFTIME)
 ACE_INLINE double
 ACE_OS::difftime (time_t t1, time_t t0)
 {
-#if defined (ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
-  // simulate difftime ; just subtracting ; ACE_PSOS case
-  return ((double)t1) - ((double)t0);
-#else
 # if defined (ACE_DIFFTIME)
   return ACE_DIFFTIME (t1, t0);
 # else
   return ::difftime (t1, t0);
-# endif /* ACE_DIFFTIME  && ! ACE_PSOS_HAS_TIME */
-#endif // ACE_PSOS
+# endif /* ACE_DIFFTIME */
 }
 #endif /* ! ACE_LACKS_DIFFTIME */
 
@@ -7968,11 +8038,9 @@ ACE_OS::difftime (time_t t1, time_t t0)
 ACE_INLINE char *
 ACE_OS::ctime (const time_t *t)
 {
-  ACE_TRACE ("ACE_OS::ctime");
+  // ACE_TRACE ("ACE_OS::ctime");
 # if defined (ACE_HAS_BROKEN_CTIME)
   ACE_OSCALL_RETURN (::asctime (::localtime (t)), char *, 0);
-#elif defined(ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
-  return "ctime-return";
 # else
   ACE_OSCALL_RETURN (::ctime (t), char *, 0);
 # endif    /* ACE_HAS_BROKEN_CTIME) */
@@ -7981,7 +8049,7 @@ ACE_OS::ctime (const time_t *t)
 ACE_INLINE char *
 ACE_OS::ctime_r (const time_t *t, char *buf, int buflen)
 {
-  ACE_TRACE ("ACE_OS::ctime_r");
+  // ACE_TRACE ("ACE_OS::ctime_r");
 # if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   char *result;
@@ -8003,16 +8071,11 @@ ACE_OS::ctime_r (const time_t *t, char *buf, int buflen)
 
 #   endif /* defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) */
 # else
-#    if defined(ACE_PSOS) && ! defined (ACE_PSOS_HAS_TIME)
-   ::strncpy(buf, "ctime-return",buflen);
-   return buf;
-#    else
   char *result;
   ACE_OSCALL (::ctime (t), char *, 0, result);
   if (result != 0)
     ::strncpy (buf, result, buflen);
   return buf;
-#    endif // ACE_PSOS
 # endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 #endif /* !ACE_HAS_WINCE */
@@ -8020,8 +8083,8 @@ ACE_OS::ctime_r (const time_t *t, char *buf, int buflen)
 ACE_INLINE struct tm *
 ACE_OS::localtime (const time_t *t)
 {
-#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
-  ACE_TRACE ("ACE_OS::localtime");
+#if !defined (ACE_HAS_WINCE)
+  // ACE_TRACE ("ACE_OS::localtime");
   ACE_OSCALL_RETURN (::localtime (t), struct tm *, 0);
 #else
   // @@ Don't you start wondering what kind of functions
@@ -8034,7 +8097,7 @@ ACE_OS::localtime (const time_t *t)
 ACE_INLINE struct tm *
 ACE_OS::localtime_r (const time_t *t, struct tm *res)
 {
-  ACE_TRACE ("ACE_OS::localtime_r");
+  // ACE_TRACE ("ACE_OS::localtime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Plocaltime_r(t, res), struct tm *, 0);
@@ -8043,8 +8106,9 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
 # else
   ACE_OSCALL_RETURN (::localtime_r (t, res), struct tm *, 0);
 # endif /* DIGITAL_UNIX */
-#elif !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
+#elif !defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (res);
+
   ACE_OSCALL_RETURN (::localtime (t), struct tm *, 0);
 #else
   // @@ Same as ACE_OS::localtime (), you need to implement it
@@ -8058,8 +8122,8 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res)
 ACE_INLINE struct tm *
 ACE_OS::gmtime (const time_t *t)
 {
-#if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
-  ACE_TRACE ("ACE_OS::localtime");
+#if !defined (ACE_HAS_WINCE)
+  // ACE_TRACE ("ACE_OS::localtime");
   ACE_OSCALL_RETURN (::gmtime (t), struct tm *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
@@ -8071,7 +8135,7 @@ ACE_OS::gmtime (const time_t *t)
 ACE_INLINE struct tm *
 ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 {
-  ACE_TRACE ("ACE_OS::localtime_r");
+  // ACE_TRACE ("ACE_OS::localtime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (DIGITAL_UNIX)
   ACE_OSCALL_RETURN (::_Pgmtime_r (t, res), struct tm *, 0);
@@ -8080,7 +8144,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 # else
   ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0);
 # endif /* DIGITAL_UNIX */
-#elif !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
+#elif !defined (ACE_HAS_WINCE)
   struct tm *result;
   ACE_OSCALL (::gmtime (t), struct tm *, 0, result) ;
   if (result != 0)
@@ -8098,8 +8162,8 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 ACE_INLINE char *
 ACE_OS::asctime (const struct tm *t)
 {
-#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
-  ACE_TRACE ("ACE_OS::asctime");
+#if !defined (ACE_HAS_WINCE)
+  // ACE_TRACE ("ACE_OS::asctime");
   ACE_OSCALL_RETURN (::asctime (t), char *, 0);
 #else
   // @@ WinCE doesn't have gmtime also.
@@ -8111,7 +8175,7 @@ ACE_OS::asctime (const struct tm *t)
 ACE_INLINE char *
 ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
 {
-  ACE_TRACE ("ACE_OS::asctime_r");
+  // ACE_TRACE ("ACE_OS::asctime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
   char *result;
@@ -8129,7 +8193,7 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
   ACE_OSCALL_RETURN (::asctime_r (t, buf, buflen), char *, 0);
 #   endif /* HPUX_10 */
 # endif /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
-#elif ! defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
+#elif ! defined (ACE_HAS_WINCE)
   char *result;
   ACE_OSCALL (::asctime (t), char *, 0, result);
   ::strncpy (buf, result, buflen);
@@ -8148,7 +8212,7 @@ ACE_INLINE size_t
 ACE_OS::strftime (char *s, size_t maxsize, const char *format,
                   const struct tm *timeptr)
 {
-#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS) || defined (ACE_PSOS_HAS_TIME)
+#if !defined (ACE_HAS_WINCE)
   return ::strftime (s, maxsize, format, timeptr);
 #else
   ACE_UNUSED_ARG (s);
@@ -8165,7 +8229,7 @@ ACE_OS::flock_init (ACE_OS::ace_flock_t *lock,
                     LPCTSTR name,
                     mode_t perms)
 {
-  ACE_TRACE ("ACE_OS::flock_init");
+  // ACE_TRACE ("ACE_OS::flock_init");
 #if defined (CHORUS)
   lock->lockname_ = 0;
   // Let's see if it already exists.
@@ -8270,7 +8334,7 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock,
                       off_t start,
                       off_t len)
 {
-  ACE_TRACE ("ACE_OS::flock_wrlock");
+  // ACE_TRACE ("ACE_OS::flock_wrlock");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_OS::adjust_flock_params (lock, whence, start, len);
 #  if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
@@ -8306,9 +8370,7 @@ ACE_OS::flock_wrlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_len = len;
   lock->lock_.l_type = F_WRLCK;         // set write lock
   // block, if no access
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW,
-                                    ACE_reinterpret_cast (long, &lock->lock_)),
-                     int, -1);
+  ACE_OSCALL_RETURN (::fcntl (lock->handle_, F_SETLKW, &lock->lock_), int, -1);
 #endif /* ACE_WIN32 */
 }
 
@@ -8318,7 +8380,7 @@ ACE_OS::flock_rdlock (ACE_OS::ace_flock_t *lock,
                       off_t start,
                       off_t len)
 {
-  ACE_TRACE ("ACE_OS::flock_rdlock");
+  // ACE_TRACE ("ACE_OS::flock_rdlock");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_OS::adjust_flock_params (lock, whence, start, len);
 #  if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
@@ -8354,9 +8416,7 @@ ACE_OS::flock_rdlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_len = len;
   lock->lock_.l_type = F_RDLCK;         // set read lock
   // block, if no access
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLKW,
-                                    ACE_reinterpret_cast (long, &lock->lock_)),
-                     int, -1);
+  ACE_OSCALL_RETURN (::fcntl (lock->handle_, F_SETLKW, &lock->lock_), int, -1);
 #endif /* ACE_WIN32 */
 }
 
@@ -8366,7 +8426,7 @@ ACE_OS::flock_trywrlock (ACE_OS::ace_flock_t *lock,
                          off_t start,
                          off_t len)
 {
-  ACE_TRACE ("ACE_OS::ace_flock_trywrlock");
+  // ACE_TRACE ("ACE_OS::ace_flock_trywrlock");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 #  if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
   ACE_OS::adjust_flock_params (lock, whence, start, len);
@@ -8403,9 +8463,9 @@ ACE_OS::flock_trywrlock (ACE_OS::ace_flock_t *lock,
 
   int result = 0;
   // Does not block, if no access, returns -1 and set errno = EBUSY;
-  ACE_OSCALL (ACE_OS::fcntl (lock->handle_,
-                             F_SETLK,
-                             ACE_reinterpret_cast (long, &lock->lock_)),
+  ACE_OSCALL (::fcntl (lock->handle_,
+                       F_SETLK,
+                       &lock->lock_),
               int, -1, result);
 
 # if ! defined (ACE_PSOS)
@@ -8423,7 +8483,7 @@ ACE_OS::flock_tryrdlock (ACE_OS::ace_flock_t *lock,
                          off_t start,
                          off_t len)
 {
-  ACE_TRACE ("ACE_OS::ace_flock_tryrdlock");
+  // ACE_TRACE ("ACE_OS::ace_flock_tryrdlock");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
 #  if defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)
   ACE_OS::adjust_flock_params (lock, whence, start, len);
@@ -8460,9 +8520,7 @@ ACE_OS::flock_tryrdlock (ACE_OS::ace_flock_t *lock,
 
   int result = 0;
   // Does not block, if no access, returns -1 and set errno = EBUSY;
-  ACE_OSCALL (ACE_OS::fcntl (lock->handle_, F_SETLK,
-                             ACE_reinterpret_cast (long, &lock->lock_)),
-              int, -1, result);
+  ACE_OSCALL (::fcntl (lock->handle_, F_SETLK, &lock->lock_), int, -1, result);
 
 # if ! defined (ACE_PSOS)
   if (result == -1 && (errno == EACCES || errno == EAGAIN))
@@ -8479,7 +8537,7 @@ ACE_OS::flock_unlock (ACE_OS::ace_flock_t *lock,
                       off_t start,
                       off_t len)
 {
-  ACE_TRACE ("ACE_OS::flock_unlock");
+  // ACE_TRACE ("ACE_OS::flock_unlock");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_OS::adjust_flock_params (lock, whence, start, len);
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::UnlockFile (lock->handle_,
@@ -8506,16 +8564,14 @@ ACE_OS::flock_unlock (ACE_OS::ace_flock_t *lock,
   lock->lock_.l_type = F_UNLCK;   // Unlock file.
 
   // release lock
-  ACE_OSCALL_RETURN (ACE_OS::fcntl (lock->handle_, F_SETLK,
-                                    ACE_reinterpret_cast (long, &lock->lock_)),
-                     int, -1);
+  ACE_OSCALL_RETURN (::fcntl (lock->handle_, F_SETLK, &lock->lock_), int, -1);
 #endif /* ACE_WIN32 */
 }
 
 ACE_INLINE int
 ACE_OS::flock_destroy (ACE_OS::ace_flock_t *lock)
 {
-  ACE_TRACE ("ACE_OS::flock_destroy");
+  // ACE_TRACE ("ACE_OS::flock_destroy");
   if (lock->handle_ != ACE_INVALID_HANDLE)
     {
       ACE_OS::flock_unlock (lock);
@@ -8557,7 +8613,7 @@ ACE_INLINE int
 ACE_OS::execv (const char *path,
                char *const argv[])
 {
-  ACE_TRACE ("ACE_OS::execv");
+  // ACE_TRACE ("ACE_OS::execv");
 #if defined (ACE_LACKS_EXEC)
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (argv);
@@ -8587,7 +8643,7 @@ ACE_OS::execve (const char *path,
                 char *const argv[],
                 char *const envp[])
 {
-  ACE_TRACE ("ACE_OS::execve");
+  // ACE_TRACE ("ACE_OS::execve");
 #if defined (ACE_LACKS_EXEC)
   ACE_UNUSED_ARG (path);
   ACE_UNUSED_ARG (argv);
@@ -8617,7 +8673,7 @@ ACE_INLINE int
 ACE_OS::execvp (const char *file,
                 char *const argv[])
 {
-  ACE_TRACE ("ACE_OS::execvp");
+  // ACE_TRACE ("ACE_OS::execvp");
 #if defined (ACE_LACKS_EXEC)
   ACE_UNUSED_ARG (file);
   ACE_UNUSED_ARG (argv);
@@ -8646,7 +8702,7 @@ ACE_OS::execvp (const char *file,
 ACE_INLINE FILE *
 ACE_OS::fdopen (ACE_HANDLE handle, const char *mode)
 {
-  ACE_TRACE ("ACE_OS::fdopen");
+  // ACE_TRACE ("ACE_OS::fdopen");
 # if defined (ACE_WIN32)
   // kernel file handle -> FILE* conversion...
   // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost
@@ -8690,7 +8746,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const char *mode)
 ACE_INLINE int
 ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset)
 {
-  ACE_TRACE ("ACE_OS::ftruncate");
+  // ACE_TRACE ("ACE_OS::ftruncate");
 #if defined (ACE_WIN32)
   if (::SetFilePointer (handle, offset, NULL, FILE_BEGIN) != (unsigned) -1)
     ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::SetEndOfFile (handle), ace_result_), int, -1);
@@ -8711,7 +8767,7 @@ ACE_OS::ftruncate (ACE_HANDLE handle, off_t offset)
 ACE_INLINE int
 ACE_OS::getrlimit (int resource, struct rlimit *rl)
 {
-  ACE_TRACE ("ACE_OS::getrlimit");
+  // ACE_TRACE ("ACE_OS::getrlimit");
 
 #if defined (ACE_LACKS_RLIMIT)
   ACE_UNUSED_ARG (resource);
@@ -8730,7 +8786,7 @@ ACE_OS::getrlimit (int resource, struct rlimit *rl)
 ACE_INLINE int
 ACE_OS::setrlimit (int resource, ACE_SETRLIMIT_TYPE *rl)
 {
-  ACE_TRACE ("ACE_OS::setrlimit");
+  // ACE_TRACE ("ACE_OS::setrlimit");
 
 #if defined (ACE_LACKS_RLIMIT)
   ACE_UNUSED_ARG (resource);
@@ -8750,7 +8806,7 @@ ACE_INLINE int
 ACE_OS::socketpair (int domain, int type,
                     int protocol, ACE_HANDLE sv[2])
 {
-  ACE_TRACE ("ACE_OS::socketpair");
+  // ACE_TRACE ("ACE_OS::socketpair");
 #if defined (ACE_WIN32) || defined (ACE_LACKS_SOCKETPAIR)
   ACE_UNUSED_ARG (domain);
   ACE_UNUSED_ARG (type);
@@ -8767,7 +8823,7 @@ ACE_OS::socketpair (int domain, int type,
 ACE_INLINE ACE_HANDLE
 ACE_OS::dup (ACE_HANDLE handle)
 {
-  ACE_TRACE ("ACE_OS::dup");
+  // ACE_TRACE ("ACE_OS::dup");
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
   ACE_HANDLE new_fd;
   if (::DuplicateHandle(::GetCurrentProcess (),
@@ -8795,7 +8851,7 @@ ACE_OS::dup (ACE_HANDLE handle)
 ACE_INLINE int
 ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle)
 {
-  ACE_TRACE ("ACE_OS::dup2");
+  // ACE_TRACE ("ACE_OS::dup2");
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS)
   // msvcrt has _dup2 ?!
   ACE_UNUSED_ARG (oldhandle);
@@ -8814,7 +8870,7 @@ ACE_OS::dup2 (ACE_HANDLE oldhandle, ACE_HANDLE newhandle)
 ACE_INLINE ACE_hrtime_t
 ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 {
-  ACE_TRACE ("ACE_OS::gethrtime");
+  // ACE_TRACE ("ACE_OS::gethrtime");
 #if defined (ACE_HAS_HI_RES_TIMER)
   ACE_UNUSED_ARG (op);
   return ::gethrtime ();
@@ -8873,13 +8929,30 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
   asm volatile ("rpcc %0" : "=r" (now) : : "memory");
 
   return now;
-#elif defined (ACE_WIN32) && defined (ACE_HAS_PENTIUM)
-  LARGE_INTEGER freq;
-
-  ::QueryPerformanceCounter (&freq);
+#elif defined (ACE_WIN32) && defined (ACE_HAS_PENTIUM) && !defined (ACE_HAS_WINCE)
+  // Issue the RDTSC assembler instruction to get the number of clock
+  // ticks since system boot.  RDTSC is only available on Pentiums and
+  // higher.  Thanks to Wayne Vucenic <wvucenic@netgate.net> for
+  // pointing us to intel's RDTSC instruction.  See
+  // http://www.sandpile.org/80x86/rdtsc.shtml for a description of
+  // the RDTSC instruction.  Or see Frank van Gilluwe's "The
+  // Undocumented PC" published by Addison Wesley Developers Press.
 
-  return freq.QuadPart;
+  ACE_UNUSED_ARG (op);
+  unsigned long least;
+  unsigned long most;
+
+  __asm {
+    //      __asm               rdtsc
+    // VC++ doesn't know the opcode for rdtsc (OFh, 31h), so we'll
+    // emit the opcode manually.
+      __asm             _emit           0xf
+      __asm             _emit           0x31
+      __asm             mov             least,eax
+      __asm             mov             most,edx
+      }
 
+  return ACE_MAKE_QWORD (least, most);
 #elif defined (CHORUS)
   if (op == ACE_OS::ACE_HRTIMER_GETTIME)
     {
@@ -8951,7 +9024,7 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op)
 ACE_INLINE int
 ACE_OS::fdetach (const char *file)
 {
-  ACE_TRACE ("ACE_OS::fdetach");
+  // ACE_TRACE ("ACE_OS::fdetach");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::fdetach (file), int, -1);
 #else
@@ -8964,7 +9037,7 @@ ACE_OS::fdetach (const char *file)
 ACE_INLINE int
 ACE_OS::fattach (int handle, const char *path)
 {
-  ACE_TRACE ("ACE_OS::fattach");
+  // ACE_TRACE ("ACE_OS::fattach");
 #if defined (ACE_HAS_STREAM_PIPES)
   ACE_OSCALL_RETURN (::fattach (handle, path), int, -1);
 #else
@@ -8978,7 +9051,7 @@ ACE_OS::fattach (int handle, const char *path)
 ACE_INLINE pid_t
 ACE_OS::fork (void)
 {
-  ACE_TRACE ("ACE_OS::fork");
+  // ACE_TRACE ("ACE_OS::fork");
 #if defined (ACE_LACKS_FORK)
   ACE_NOTSUP_RETURN (pid_t (-1));
 #else
@@ -8989,7 +9062,7 @@ ACE_OS::fork (void)
 ACE_INLINE int
 ACE_OS::getpagesize (void)
 {
-  ACE_TRACE ("ACE_OS::getpagesize");
+  // ACE_TRACE ("ACE_OS::getpid");
 #if defined (ACE_WIN32)
   SYSTEM_INFO sys_info;
   ::GetSystemInfo (&sys_info);
@@ -9035,12 +9108,12 @@ ACE_OS::getpid (void)
 ACE_INLINE pid_t
 ACE_OS::getpgid (pid_t pid)
 {
-  ACE_TRACE ("ACE_OS::getpgid");
+  // ACE_TRACE ("ACE_OS::getpgid");
 #if defined (ACE_LACKS_GETPGID)
   ACE_UNUSED_ARG (pid);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (VXWORKS) || defined (ACE_PSOS)
-  // getpgid() is not supported, only one process anyway.
+  // getpid() is not supported, only one process anyway.
   ACE_UNUSED_ARG (pid);
   return 0;
 #else
@@ -9051,7 +9124,7 @@ ACE_OS::getpgid (pid_t pid)
 ACE_INLINE off_t
 ACE_OS::lseek (ACE_HANDLE handle, off_t offset, int whence)
 {
-  ACE_TRACE ("ACE_OS::lseek");
+  // ACE_TRACE ("ACE_OS::lseek");
 
 #if defined (ACE_WIN32)
 # if SEEK_SET != FILE_BEGIN || SEEK_CUR != FILE_CURRENT || SEEK_END != FILE_END
@@ -9139,24 +9212,28 @@ ACE_OS::fseek (FILE *fp, long offset, int whence)
 ACE_INLINE pid_t
 ACE_OS::wait (int *stat_loc)
 {
-  ACE_TRACE ("ACE_OS::wait");
+  // ACE_TRACE ("ACE_OS::wait");
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined(CHORUS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (stat_loc);
 
   ACE_NOTSUP_RETURN (0);
 #else
-# if defined (ACE_HAS_UNION_WAIT)
+# if !defined (AIX)
+#   if defined (ACE_HAS_UNION_WAIT)
   ACE_OSCALL_RETURN (::wait ((union wait *) stat_loc), pid_t, -1);
-# else
+#   else
   ACE_OSCALL_RETURN (::wait (stat_loc), pid_t, -1);
-# endif /* ACE_HAS_UNION_WAIT */
+#   endif /* ACE_HAS_UNION_WAIT */
+# else
+  ACE_OSCALL_RETURN (::wait ((union wait *) stat_loc), pid_t, -1);
+# endif /* defined (AIX) */
 #endif /* defined (ACE_WIN32) */
 }
 
 ACE_INLINE pid_t
 ACE_OS::waitpid (pid_t pid, int *stat_loc, int options)
 {
-  ACE_TRACE ("ACE_OS::waitpid");
+  // ACE_TRACE ("ACE_OS::waitpid");
 #if defined (ACE_WIN32) || defined (VXWORKS) || defined (ACE_PSOS)
   ACE_UNUSED_ARG (pid);
   ACE_UNUSED_ARG (stat_loc);
@@ -9174,7 +9251,7 @@ ACE_OS::waitpid (pid_t pid, int *stat_loc, int options)
 ACE_INLINE int
 ACE_OS::ioctl (ACE_HANDLE handle, int cmd, void *val)
 {
-  ACE_TRACE ("ACE_OS::ioctl");
+  // ACE_TRACE ("ACE_OS::ioctl");
 
 #if defined (ACE_WIN32)
   ACE_SOCKET sock = (ACE_SOCKET) handle;
@@ -9198,7 +9275,7 @@ ACE_OS::ioctl (ACE_HANDLE handle, int cmd, void *val)
 ACE_INLINE int
 ACE_OS::kill (pid_t pid, int signum)
 {
-  ACE_TRACE ("ACE_OS::kill");
+  // ACE_TRACE ("ACE_OS::kill");
 #if defined (ACE_WIN32) || defined (CHORUS) || defined(ACE_PSOS)
   ACE_UNUSED_ARG (pid);
   ACE_UNUSED_ARG (signum);
@@ -9213,7 +9290,7 @@ ACE_OS::sigaction (int signum,
                    const struct sigaction *nsa,
                    struct sigaction *osa)
 {
-  ACE_TRACE ("ACE_OS::sigaction");
+  // ACE_TRACE ("ACE_OS::sigaction");
   if (signum == 0)
     return 0;
 #if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
@@ -9246,7 +9323,7 @@ ACE_OS::sigaction (int signum,
 ACE_INLINE char *
 ACE_OS::getcwd (char *buf, size_t size)
 {
-  ACE_TRACE ("ACE_OS::getcwd");
+  // ACE_TRACE ("ACE_OS::getcwd");
 # if defined (ACE_WIN32)
   return ::_getcwd (buf, size);
 # elif defined (ACE_PSOS_LACKS_PHILE)
@@ -9343,7 +9420,7 @@ ACE_OS::getcwd (char *buf, size_t size)
 ACE_INLINE int
 ACE_OS::sleep (u_int seconds)
 {
-  ACE_TRACE ("ACE_OS::sleep");
+  // ACE_TRACE ("ACE_OS::sleep");
 #if defined (ACE_WIN32)
   ::Sleep (seconds * ACE_ONE_SECOND_IN_MSECS);
   return 0;
@@ -9376,20 +9453,22 @@ ACE_OS::sleep (u_int seconds)
 ACE_INLINE int
 ACE_OS::sleep (const ACE_Time_Value &tv)
 {
-  ACE_TRACE ("ACE_OS::sleep");
+  // ACE_TRACE ("ACE_OS::sleep");
 #if defined (ACE_WIN32)
   ::Sleep (tv.msec ());
   return 0;
+#elif defined (ACE_HAS_POLL) && !defined (ACE_POLL_IS_BROKEN)
+  ACE_OSCALL_RETURN (::poll (0, 0, tv.msec ()), int, -1);
 #else
-# if defined (ACE_HAS_NONCONST_SELECT_TIMEVAL)
-  // Copy the timeval, because this platform doesn't declare the timeval
-  // as a pointer to const.
+# if defined (linux)
+  // Copy the timeval, because Linux modifies it!  It's strange that
+  // the compiler doesn't warn about passing the address of a const as
+  // a non-const argument.
   timeval tv_copy = tv;
   ACE_OSCALL_RETURN (::select (0, 0, 0, 0, &tv_copy), int, -1);
-# else  /* ! ACE_HAS_NONCONST_SELECT_TIMEVAL */
-  const timeval *tvp = tv;
-  ACE_OSCALL_RETURN (::select (0, 0, 0, 0, tvp), int, -1);
-# endif /* ACE_HAS_NONCONST_SELECT_TIMEVAL */
+# else  /* ! linux */
+  ACE_OSCALL_RETURN (::select (0, 0, 0, 0, (timeval *) &tv), int, -1);
+# endif /* ! linux */
 #endif /* ACE_WIN32 */
 }
 
@@ -9397,7 +9476,7 @@ ACE_INLINE int
 ACE_OS::nanosleep (const struct timespec *requested,
                    struct timespec *remaining)
 {
-  ACE_TRACE ("ACE_OS::nanosleep");
+  // ACE_TRACE ("ACE_OS::nanosleep");
 #if defined (ACE_HAS_CLOCK_GETTIME)
   // ::nanosleep () is POSIX 1003.1b.  So is ::clock_gettime ().  So,
   // if ACE_HAS_CLOCK_GETTIME is defined, then ::nanosleep () should
@@ -9405,7 +9484,6 @@ ACE_OS::nanosleep (const struct timespec *requested,
   // require linking with -lposix4.
   return ::nanosleep ((ACE_TIMESPEC_PTR) requested, remaining);
 #elif defined (ACE_PSOS)
-#  if ! defined (ACE_PSOS_DIAB_MIPS)
   double ticks = KC_TICKS2SEC * requested->tv_sec +
                  ( ACE_static_cast (double, requested->tv_nsec) *
                    ACE_static_cast (double, KC_TICKS2SEC) ) /
@@ -9437,7 +9515,6 @@ ACE_OS::nanosleep (const struct timespec *requested,
   }
 
   // tm_wkafter always returns 0
-#  endif /* ACE_PSOS_DIAB_MIPS */
   return 0;
 #else
   ACE_UNUSED_ARG (remaining);
@@ -9480,8 +9557,8 @@ ACE_OS::mkdir (const char *path, mode_t mode)
 ACE_INLINE char *
 ACE_OS::getenv (const char *symbol)
 {
-  ACE_TRACE ("ACE_OS::getenv");
-#if !defined (ACE_HAS_WINCE) && !defined(ACE_PSOS)
+  // ACE_TRACE ("ACE_OS::getenv");
+#if !defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::getenv (symbol), char *, 0);
 #else
   // @@ WinCE doesn't have the concept of environment variables.
@@ -9493,7 +9570,7 @@ ACE_OS::getenv (const char *symbol)
 ACE_INLINE int
 ACE_OS::putenv (const char *string)
 {
-  ACE_TRACE ("ACE_OS::putenv");
+  // ACE_TRACE ("ACE_OS::putenv");
   // VxWorks declares ::putenv with a non-const arg.
 #if !defined (ACE_HAS_WINCE) && !defined (ACE_PSOS)
   ACE_OSCALL_RETURN (::putenv ((char *) string), int, -1);
@@ -9545,7 +9622,6 @@ ACE_INLINE wchar_t *
 ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
 {
   // ACE_TRACE ("ACE_OS::strcpy");
-
 # if defined (ACE_HAS_UNICODE)
   return ::wcscpy (s, t);
 # else
@@ -9565,7 +9641,7 @@ ACE_OS::strcpy (wchar_t *s, const wchar_t *t)
 ACE_INLINE int
 ACE_OS::strcmp (const wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::strcmp");
+  // ACE_TRACE ("ACE_OS::strcmp");
 # if defined (ACE_HAS_UNICODE)
   return ::wcscmp (s, t);
 # else
@@ -9603,7 +9679,6 @@ ACE_INLINE ACE_USHORT16 *
 ACE_OS::strcpy (ACE_USHORT16 *s, const ACE_USHORT16 *t)
 {
   // ACE_TRACE ("ACE_OS::strcpy");
-
   ACE_USHORT16 *result = s;
 
   while ((*s++ = *t++) != 0)
@@ -9615,8 +9690,7 @@ ACE_OS::strcpy (ACE_USHORT16 *s, const ACE_USHORT16 *t)
 ACE_INLINE int
 ACE_OS::strcmp (const ACE_USHORT16 *s, const ACE_USHORT16 *t)
 {
-  ACE_TRACE ("ACE_OS::strcmp");
-
+  // ACE_TRACE ("ACE_OS::strcpy");
   while (*s != 0 &&
          *t != 0 &&
          *s == *t)
@@ -9660,43 +9734,30 @@ ACE_OS::atoi (const wchar_t *s)
 }
 
 ACE_INLINE wchar_t *
-ACE_OS::strecpy (wchar_t *s, const wchar_t *t)
-{
-  ACE_TRACE ("ACE_OS::strecpy");
-  register wchar_t *dscan = s;
-  register const wchar_t *sscan = t;
-
-  while ((*dscan++ = *sscan++) != '\0')
-    continue;
-
-  return dscan;
-}
-
-ACE_INLINE wchar_t *
 ACE_OS::strpbrk (wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::wcspbrk");
+  // ACE_TRACE ("ACE_OS::wcspbrk");
   return ::wcspbrk (s, t);
 }
 
 ACE_INLINE const wchar_t *
 ACE_OS::strpbrk (const wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::wcspbrk");
+  // ACE_TRACE ("ACE_OS::wcspbrk");
   return ::wcspbrk (s, t);
 }
 
 ACE_INLINE wchar_t *
 ACE_OS::strcat (wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::strcat");
+  // ACE_TRACE ("ACE_OS::strcat");
   return ::wcscat (s, t);
 }
 
 ACE_INLINE const wchar_t *
 ACE_OS::strchr (const wchar_t *s, wint_t c)
 {
-  ACE_TRACE ("ACE_OS::strchr");
+  // ACE_TRACE ("ACE_OS::strchr");
   return (const wchar_t *) ::wcschr (s, c);
 }
 
@@ -9713,7 +9774,7 @@ ACE_OS::strnchr (const wchar_t *s, wint_t c, size_t len)
 ACE_INLINE const wchar_t *
 ACE_OS::strrchr (const wchar_t *s, wint_t c)
 {
-  ACE_TRACE ("ACE_OS::strrchr");
+  // ACE_TRACE ("ACE_OS::strrchr");
 # if !defined (ACE_HAS_WINCE)
   return (const wchar_t *) ::wcsrchr (s, c);
 # else
@@ -9732,7 +9793,7 @@ ACE_OS::strrchr (const wchar_t *s, wint_t c)
 ACE_INLINE wchar_t *
 ACE_OS::strchr (wchar_t *s, wint_t c)
 {
-  ACE_TRACE ("ACE_OS::strchr");
+  // ACE_TRACE ("ACE_OS::strchr");
   return ::wcschr (s, c);
 }
 
@@ -9745,7 +9806,7 @@ ACE_OS::strnchr (wchar_t *s, wint_t c, size_t len)
 ACE_INLINE wchar_t *
 ACE_OS::strrchr (wchar_t *s, wint_t c)
 {
-  ACE_TRACE ("ACE_OS::strrchr");
+  // ACE_TRACE ("ACE_OS::strrchr");
 # if !defined (ACE_HAS_WINCE)
   return (wchar_t *) ::wcsrchr (s, c);
 # else
@@ -9764,14 +9825,14 @@ ACE_OS::strrchr (wchar_t *s, wint_t c)
 ACE_INLINE wint_t
 ACE_OS::to_lower (wint_t c)
 {
-  ACE_TRACE ("ACE_OS::to_lower");
+  // ACE_TRACE ("ACE_OS::to_lower");
   return ::towlower (c);
 }
 
 ACE_INLINE int
 ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::strcasecmp");
+  // ACE_TRACE ("ACE_OS::strcasecmp");
 
 # if !defined (ACE_WIN32)
   // Handles most of what the BSD version does, but does not indicate
@@ -9800,7 +9861,7 @@ ACE_OS::strcasecmp (const wchar_t *s, const wchar_t *t)
 ACE_INLINE int
 ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strcasecmp");
+  // ACE_TRACE ("ACE_OS::strcasecmp");
 
 # if !defined (ACE_WIN32)
   // Handles most of what the BSD version does, but does not indicate
@@ -9830,35 +9891,35 @@ ACE_OS::strncasecmp (const wchar_t *s, const wchar_t *t, size_t len)
 ACE_INLINE int
 ACE_OS::strncmp (const wchar_t *s, const wchar_t *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strncmp");
+  // ACE_TRACE ("ACE_OS::strncmp");
   return ::wcsncmp (s, t, len);
 }
 
 ACE_INLINE wchar_t *
 ACE_OS::strncpy (wchar_t *s, const wchar_t *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strncpy");
+  // ACE_TRACE ("ACE_OS::strncpy");
   return ::wcsncpy (s, t, len);
 }
 
 ACE_INLINE wchar_t *
 ACE_OS::strncat (wchar_t *s, const wchar_t *t, size_t len)
 {
-  ACE_TRACE ("ACE_OS::strncat");
+  // ACE_TRACE ("ACE_OS::strncat");
   return ::wcsncat (s, t, len);
 }
 
 ACE_INLINE wchar_t *
 ACE_OS::strtok (wchar_t *s, const wchar_t *tokens)
 {
-  ACE_TRACE ("ACE_OS::strtok");
+  // ACE_TRACE ("ACE_OS::strtok");
   return ::wcstok (s, tokens);
 }
 
 ACE_INLINE long
 ACE_OS::strtol (const wchar_t *s, wchar_t **ptr, int base)
 {
-  ACE_TRACE ("ACE_OS::strtol");
+  // ACE_TRACE ("ACE_OS::strtol");
   return ::wcstol (s, ptr, base);
 }
 
@@ -9873,14 +9934,14 @@ ACE_OS::ace_isspace (wchar_t c)
 ACE_INLINE const wchar_t *
 ACE_OS::strstr (const wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::strstr");
+  // ACE_TRACE ("ACE_OS::strstr");
   return (const wchar_t *) ::wcsstr (s, t);
 }
 
 ACE_INLINE wchar_t *
 ACE_OS::strstr (wchar_t *s, const wchar_t *t)
 {
-  ACE_TRACE ("ACE_OS::strstr");
+  // ACE_TRACE ("ACE_OS::strstr");
   return ::wcsstr (s, t);
 }
 
@@ -9917,7 +9978,6 @@ ACE_INLINE wchar_t *
 ACE_OS::strdup (const wchar_t *s)
 {
   // ACE_TRACE ("ACE_OS::strdup");
-
 #   if defined (__BORLANDC__)
   wchar_t *buffer = (wchar_t *) malloc ((ACE_OS::strlen (s) + 1) * sizeof (wchar_t));
   return ::wcscpy (buffer, s);
@@ -9936,7 +9996,7 @@ ACE_INLINE int
 ACE_OS::hostname (wchar_t *name, size_t maxnamelen)
 {
 #   if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::hostname");
+  // ACE_TRACE ("ACE_OS::hostname");
   ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::GetComputerNameW (name, LPDWORD (&maxnamelen)),
                                           ace_result_), int, -1);
 #   else
@@ -9949,7 +10009,7 @@ ACE_OS::hostname (wchar_t *name, size_t maxnamelen)
 ACE_INLINE int
 ACE_OS::unlink (const wchar_t *path)
 {
-  ACE_TRACE ("ACE_OS::unlink");
+  // ACE_TRACE ("ACE_OS::unlink");
 #   if !defined (ACE_HAS_WINCE)
   ACE_OSCALL_RETURN (::_wunlink (path), int, -1);
 #   else
@@ -9962,7 +10022,7 @@ ACE_OS::unlink (const wchar_t *path)
 ACE_INLINE ACE_SHLIB_HANDLE
 ACE_OS::dlopen (ACE_WIDE_DL_TYPE filename, int mode)
 {
-  ACE_TRACE ("ACE_OS::dlopen");
+  // ACE_TRACE ("ACE_OS::dlopen");
   ACE_UNUSED_ARG (mode);
 
   ACE_WIN32CALL_RETURN (::LoadLibraryW (filename), ACE_SHLIB_HANDLE, 0);
@@ -9972,7 +10032,7 @@ ACE_INLINE wchar_t *
 ACE_OS::getenv (const wchar_t *symbol)
 {
 #   if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::getenv");
+  // ACE_TRACE ("ACE_OS::getenv");
   ACE_OSCALL_RETURN (::_wgetenv (symbol), wchar_t *, 0);
 #   else
   ACE_UNUSED_ARG (symbol);
@@ -9984,7 +10044,7 @@ ACE_INLINE int
 ACE_OS::rename (const wchar_t *old_name, const wchar_t *new_name)
 {
 #   if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::rename");
+  // ACE_TRACE ("ACE_OS::rename");
   ACE_OSCALL_RETURN (::_wrename (old_name, new_name), int, -1);
 #   else
   // @@ There should be a Win32 API that can do this.
@@ -9998,7 +10058,7 @@ ACE_INLINE int
 ACE_OS::access (const wchar_t *path, int amode)
 {
 #   if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::access");
+  // ACE_TRACE ("ACE_OS::access");
   ACE_OSCALL_RETURN (::_waccess (path, amode), int, -1);
 #   else
   // @@ There should be a Win32 API that can do this.
@@ -10021,7 +10081,7 @@ ACE_OS::fopen (const wchar_t *filename, const wchar_t *mode)
 ACE_INLINE FILE *
 ACE_OS::fdopen (ACE_HANDLE handle, const wchar_t *mode)
 {
-  ACE_TRACE ("ACE_OS::fdopen");
+  // ACE_TRACE ("ACE_OS::fdopen");
 #   if !defined (ACE_HAS_WINCE)
   // kernel file handle -> FILE* conversion...
   // Options: _O_APPEND, _O_RDONLY and _O_TEXT are lost
@@ -10061,7 +10121,7 @@ ACE_OS::fdopen (ACE_HANDLE handle, const wchar_t *mode)
 ACE_INLINE int
 ACE_OS::stat (const wchar_t *file, struct stat *stp)
 {
-  ACE_TRACE ("ACE_OS::stat");
+  // ACE_TRACE ("ACE_OS::stat");
 #   if defined (ACE_HAS_WINCE)
   WIN32_FIND_DATA fdata;
   HANDLE fhandle;
@@ -10094,7 +10154,7 @@ ACE_OS::stat (const wchar_t *file, struct stat *stp)
 ACE_INLINE void
 ACE_OS::perror (const wchar_t *s)
 {
-  ACE_TRACE ("ACE_OS::perror");
+  // ACE_TRACE ("ACE_OS::perror");
 #   if !defined (ACE_HAS_WINCE)
   ::_wperror (s);
 #   else
@@ -10121,7 +10181,7 @@ ACE_OS::system (const wchar_t *command)
 ACE_INLINE wchar_t *
 ACE_OS::mktemp (wchar_t *s)
 {
-  ACE_TRACE ("ACE_OS::mktemp");
+  // ACE_TRACE ("ACE_OS::mktemp");
   return ::_wmktemp (s);
 }
 #   endif /* !ACE_LACKS_MKTEMP */
@@ -10129,7 +10189,7 @@ ACE_OS::mktemp (wchar_t *s)
 ACE_INLINE int
 ACE_OS::mkdir (const wchar_t *path, mode_t mode)
 {
-  ACE_TRACE ("ACE_OS::mkdir");
+  // ACE_TRACE ("ACE_OS::mkdir");
 #   if !defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (mode);
 
@@ -10144,7 +10204,7 @@ ACE_OS::mkdir (const wchar_t *path, mode_t mode)
 ACE_INLINE int
 ACE_OS::chdir (const wchar_t *path)
 {
-  ACE_TRACE ("ACE_OS::chdir");
+  // ACE_TRACE ("ACE_OS::chdir");
 #   if defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (path);
   ACE_NOTSUP_RETURN (-1);
@@ -10156,7 +10216,7 @@ ACE_OS::chdir (const wchar_t *path)
 ACE_INLINE wchar_t *
 ACE_OS::getcwd (wchar_t *buf, size_t size)
 {
-  ACE_TRACE ("ACE_OS::getcwd");
+  // ACE_TRACE ("ACE_OS::getcwd");
 #   if defined (ACE_HAS_WINCE)
   ACE_UNUSED_ARG (buf);
   ACE_UNUSED_ARG (size);
@@ -10180,7 +10240,7 @@ ACE_cond_t::waiters (void) const
 ACE_INLINE int
 ACE_OS::thr_continue (const ACE_Thread_ID &thr_id)
 {
-  ACE_TRACE ("ACE_OS::thr_continue");
+  // ACE_TRACE ("ACE_OS::thr_continue");
   return ACE_OS::thr_continue (thr_id.id ());
 }
 
@@ -10193,7 +10253,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                     void *stack,
                     size_t stacksize);
 {
-  ACE_TRACE ("ACE_OS::thr_create");
+  // ACE_TRACE ("ACE_OS::thr_create");
   ACE_thread_t thread_id;
   ACE_hthread_t thread_handle;
 
@@ -10213,7 +10273,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 ACE_INLINE int
 ACE_OS::thr_getprio (const ACE_Thread_ID &thr_id, int &prio)
 {
-  ACE_TRACE ("ACE_OS::thr_getprio");
+  // ACE_TRACE ("ACE_OS::thr_getprio");
   return ACE_OS::thr_getprio (thr_id.handle (), prio);
 }
 
@@ -10252,7 +10312,7 @@ ACE_OS::thr_self (void)
 ACE_INLINE int
 ACE_OS::thr_setprio (const ACE_Thread_ID &thr_id, int prio)
 {
-  ACE_TRACE ("ACE_OS::thr_setprio");
+  // ACE_TRACE ("ACE_OS::thr_setprio");
   return ACE_OS::thr_setprio (thr_id.handle (), prio);
 }
 
@@ -10267,7 +10327,7 @@ ACE_OS::thr_suspend (const ACE_Thread_ID &thr_id)
 ACE_INLINE int
 ACE_OS::sigaddset (sigset_t *s, int signum)
 {
-  ACE_TRACE ("ACE_OS::sigaddset");
+  // ACE_TRACE ("ACE_OS::sigaddset");
 #if defined (ACE_LACKS_SIGSET) || defined (ACE_LACKS_SIGSET_DEFINITIONS)
   if (s == NULL) {
     errno = EFAULT ;
@@ -10277,7 +10337,7 @@ ACE_OS::sigaddset (sigset_t *s, int signum)
     errno = EINVAL ;
     return -1 ;                 // Invalid signum, return error
   }
-#   if defined (ACE_PSOS) && defined (__DIAB) && ! defined(ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+#   if defined (ACE_PSOS) && defined (__DIAB)
   // treat 0th u_long of sigset_t as high bits,
   // and 1st u_long of sigset_t as low bits.
   if (signum <= ACE_BITS_PER_ULONG)
@@ -10309,7 +10369,7 @@ ACE_OS::sigdelset (sigset_t *s, int signum)
     errno = EINVAL ;
     return -1 ;                 // Invalid signum, return error
   }
-#   if defined (ACE_PSOS) && defined (__DIAB) && ! defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+#   if defined (ACE_PSOS) && defined (__DIAB)
   // treat 0th u_long of sigset_t as high bits,
   // and 1st u_long of sigset_t as low bits.
   if (signum <= ACE_BITS_PER_ULONG)
@@ -10337,7 +10397,7 @@ ACE_OS::sigemptyset (sigset_t *s)
     errno = EFAULT ;
     return -1 ;
   }
-#   if defined (ACE_PSOS) && defined (__DIAB) && ! defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+#   if defined (ACE_PSOS) && defined (__DIAB)
   s->s[0] = 0 ;
   s->s[1] = 0 ;
 #   else
@@ -10357,7 +10417,7 @@ ACE_OS::sigfillset (sigset_t *s)
     errno = EFAULT ;
     return -1 ;
   }
-#   if defined (ACE_PSOS) && defined (__DIAB) && ! defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+#   if defined (ACE_PSOS) && defined (__DIAB)
   s->s[0] = ~(u_long) 0 ;
   s->s[1] = ~(u_long) 0 ;
 #   else
@@ -10381,7 +10441,7 @@ ACE_OS::sigismember (sigset_t *s, int signum)
     errno = EINVAL ;
     return -1 ;                 // Invalid signum, return error
   }
-#   if defined (ACE_PSOS) && defined (__DIAB) && ! defined (ACE_PSOS_DIAB_MIPS) && !defined (ACE_PSOS_DIAB_PPC)
+#   if defined (ACE_PSOS) && defined (__DIAB)
   // treat 0th u_long of sigset_t as high bits,
   // and 1st u_long of sigset_t as low bits.
   if (signum <= ACE_BITS_PER_ULONG)
@@ -10424,26 +10484,10 @@ ACE_OS::sigprocmask (int how, const sigset_t *nsp, sigset_t *osp)
 #endif /* ACE_LACKS_SIGSET || ACE_LACKS_SIGSET_DEFINITIONS */
 }
 
-ACE_INLINE int
-ACE_OS::pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
-{
-#if defined (ACE_HAS_PTHREADS_STD)  &&  !defined (ACE_LACKS_PTHREAD_SIGMASK)
-  ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp),
-                                       ace_result_),
-                     int,
-                     -1);
-#else /* !ACE_HAS_PTHREADS_STD */
-  ACE_UNUSED_ARG (how);
-  ACE_UNUSED_ARG (nsp);
-  ACE_UNUSED_ARG (osp);
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_PTHREADS_STD */
-}
-
 ACE_INLINE void *
 ACE_OS::sbrk (int brk)
 {
-  ACE_TRACE ("ACE_OS::sbrk");
+  // ACE_TRACE ("ACE_OS::sbrk");
 
 #if defined (ACE_LACKS_SBRK)
   ACE_UNUSED_ARG (brk);
@@ -10453,21 +10497,6 @@ ACE_OS::sbrk (int brk)
 #endif /* VXWORKS */
 }
 
-ACE_INLINE long
-ACE_OS_Thread_Descriptor::flags (void) const
-{
-  ACE_TRACE ("ACE_OS_Thread_Descriptor::flags");
-  return flags_;
-}
-
-
-ACE_INLINE
-ACE_OS_Thread_Descriptor::ACE_OS_Thread_Descriptor (long flags)
-  : flags_ (flags)
-{
-}
-
-
 ACE_INLINE ACE_Thread_Manager *
 ACE_Thread_Adapter::thr_mgr (void)
 {
@@ -10604,17 +10633,12 @@ ACE_OS::opendir (const char *filename)
 {
 #if defined (ACE_HAS_DIRENT)
 #  if defined (ACE_PSOS)
-
   // The pointer to the DIR buffer must be passed to ACE_OS::closedir
   // in order to free it and avoid a memory leak.
   DIR *dir;
   u_long result;
   ACE_NEW_RETURN (dir, DIR, 0);
-#if defined (ACE_PSOS_DIAB_PPC)
-  result = ::open_dir (ACE_const_cast (char *, filename), &(dir->xdir));
-#else
   result = ::open_dir (ACE_const_cast (char *, filename), dir);
-#endif /* defined ACE_PSOS_DIAB_PPC */
   if (0 == result)
   {
     return dir;
@@ -10624,7 +10648,6 @@ ACE_OS::opendir (const char *filename)
     errno = result;
     return 0;
   }
-
 #  else /* ! defined (ACE_PSOS) */
   // VxWorks' ::opendir () is declared with a non-const argument.
   return ::opendir (ACE_const_cast (char *, filename));
@@ -10641,11 +10664,7 @@ ACE_OS::closedir (DIR *d)
 #if defined (ACE_HAS_DIRENT)
 #  if defined (ACE_PSOS)
   u_long result;
-#if defined (ACE_PSOS_DIAB_PPC)
-  result = ::close_dir (&(d->xdir));
-#else
   result = ::close_dir (d);
-#endif /* defined ACE_PSOS_DIAB_PPC */
   delete d;
   if (result != 0)
   {
@@ -10672,11 +10691,7 @@ ACE_OS::readdir (DIR *d)
   ACE_NEW_RETURN (dir_ent,
                   dirent,
                   0);
-#if defined (ACE_PSOS_DIAB_PPC)
-  result = ::read_dir (&(d->xdir), dir_ent);
-#else
   result = ::read_dir (d, dir_ent);
-#endif /* defined ACE_PSOS_DIAB_PPC) */
 
   if (0 == result)
     return dir_ent;
@@ -10810,7 +10825,7 @@ ACE_OS::qsort (void *base,
 ACE_INLINE int
 ACE_OS::setuid (uid_t uid)
 {
-  ACE_TRACE ("ACE_OS::setuid");
+  // ACE_TRACE ("ACE_OS::setuid");
 # if defined (VXWORKS) || defined (ACE_PSOS)
   // setuid() is not supported:  just one user anyways
   return 0;
@@ -10824,12 +10839,12 @@ ACE_OS::setuid (uid_t uid)
 ACE_INLINE uid_t
 ACE_OS::getuid (void)
 {
-  ACE_TRACE ("ACE_OS::getuid");
+  // ACE_TRACE ("ACE_OS::getuid");
 # if defined (VXWORKS) || defined (ACE_PSOS)
   // getuid() is not supported:  just one user anyways
   return 0;
 # elif defined (ACE_WIN32) || defined(CHORUS)
-  ACE_TRACE ("ACE_OS::getuid");
+  // ACE_TRACE ("ACE_OS::getuid");
   ACE_NOTSUP_RETURN (ACE_static_cast (uid_t, -1));
 #else
   ACE_OSCALL_RETURN (::getuid (), uid_t, (uid_t) -1);
@@ -10844,7 +10859,7 @@ ACE_OS::isatty (ACE_HANDLE handle)
   return 0;
 # elif defined (ACE_WIN32)
 #  if !defined (ACE_HAS_WINCE)
-  ACE_TRACE ("ACE_OS::isatty");
+  // ACE_TRACE ("ACE_OS::isatty");
   int fd = ::_open_osfhandle ((long) handle, 0);
   ACE_OSCALL_RETURN (::_isatty ((int) fd), int, -1);
 #  else
@@ -10852,7 +10867,7 @@ ACE_OS::isatty (ACE_HANDLE handle)
   return 0;
 #  endif /* ACE_HAS_WINCE */
 # else
-  ACE_TRACE ("ACE_OS::isatty");
+  // ACE_TRACE ("ACE_OS::isatty");
   ACE_OSCALL_RETURN (::isatty (handle), int, -1);
 # endif /* defined (ACE_LACKS_ISATTY) */
 }
@@ -10901,49 +10916,3 @@ ACE_OS::fopen_mode_to_open_mode_converter (char x, int &hmode)
       }
 }
 #endif /* ACE_WIN32 */
-
-// Return a dynamically allocated duplicate of <str>, substituting the
-// environment variable if <str[0] == '$'>.  Note that the pointer is
-// allocated with <ACE_OS::malloc> and must be freed by
-// <ACE_OS::free>.
-
-ACE_INLINE char *
-ACE_OS::strenvdup (const char *str)
-{
-#if defined (ACE_HAS_WINCE)
-     // WinCE doesn't have environment variables so we just skip it.
-  return ACE_OS::strdup (str);
-#else
-  char *temp = 0;
-
-  if (str[0] == '$'
-      && (temp = ACE_OS::getenv (&str[1])) != 0)
-    return ACE_OS::strdup (temp);
-  else
-    return ACE_OS::strdup (str);
-#endif /* ACE_HAS_WINCE */
-}
-
-ACE_INLINE
-ACE_OS_WString::~ACE_OS_WString (void)
-{
-  delete[] this->rep_;
-}
-
-ACE_INLINE char *
-ACE_OS_WString::char_rep (void)
-{
-  return this->rep_;
-}
-
-ACE_INLINE
-ACE_OS_CString::~ACE_OS_CString (void)
-{
-  delete[] this->rep_;
-}
-
-ACE_INLINE ACE_USHORT16 *
-ACE_OS_CString::wchar_rep (void)
-{
-  return this->rep_;
-}
diff --git a/ace/Object_Manager.cpp b/ace/Object_Manager.cpp
index c6f5e15b430..81af54dcbb3 100644
--- a/ace/Object_Manager.cpp
+++ b/ace/Object_Manager.cpp
@@ -4,9 +4,9 @@
 
 #include "ace/Object_Manager.h"
 #include "ace/Token_Manager.h"
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
+#if !defined (ACE_HAS_WINCE)
 # include "ace/Naming_Context.h"
-#endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* !ACE_HAS_WINCE */
 #include "ace/Service_Manager.h"
 #include "ace/Service_Config.h"
 #include "ace/Signal.h"
@@ -38,9 +38,16 @@ ACE_RCSID(ace, Object_Manager, "$Id$")
 # define ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS
 #endif /* ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS */
 
-// Singleton pointer.
+// Static data.
 ACE_Object_Manager *ACE_Object_Manager::instance_ = 0;
 
+int ACE_Object_Manager::starting_up_ = 1;
+
+int ACE_Object_Manager::shutting_down_ = 0;
+
+u_int ACE_Object_Manager::initialized_ = 0;
+// Flag to allow handling of multiple calls to init ().
+
 void *ACE_Object_Manager::preallocated_object[
   ACE_Object_Manager::ACE_PREALLOCATED_OBJECTS] = { 0 };
 
@@ -93,9 +100,9 @@ public:
   ~ACE_Object_Manager_Preallocations (void);
 
 private:
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
+#if !defined (ACE_HAS_WINCE)
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Naming_Context;
-#endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* !ACE_HAS_WINCE */
   ACE_Static_Svc_Descriptor ace_svc_desc_ACE_Service_Manager;
 };
 
@@ -110,7 +117,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
 {
   // Define the static services.  This macro call creates static
   // service descriptors that are used for initialization below.
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
+#if !defined (ACE_HAS_WINCE)
   ACE_STATIC_SVC_DEFINE (ACE_Naming_Context_initializer,
                          ASYS_TEXT ("ACE_Naming_Context"),
                          ACE_SVC_OBJ_T,
@@ -118,7 +125,7 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
                          ACE_Service_Type::DELETE_THIS |
                            ACE_Service_Type::DELETE_OBJ,
                          0)
-#endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* !ACE_HAS_WINCE */
 
   ACE_STATIC_SVC_DEFINE (ACE_Service_Manager_initializer,
                          ASYS_TEXT ("ACE_Service_Manager"),
@@ -130,19 +137,19 @@ ACE_Object_Manager_Preallocations::ACE_Object_Manager_Preallocations (void)
 
   // Initialize the static service objects using the descriptors created
   // above.
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
+#if !defined (ACE_HAS_WINCE)
   ace_svc_desc_ACE_Naming_Context =
     ace_svc_desc_ACE_Naming_Context_initializer;
-#endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* !ACE_HAS_WINCE */
 
   ace_svc_desc_ACE_Service_Manager =
     ace_svc_desc_ACE_Service_Manager_initializer;
 
   // Add to the list of static configured services.
-#if !defined (ACE_HAS_WINCE)  &&  !defined (ACE_LACKS_ACE_OTHER)
+#if !defined (ACE_HAS_WINCE)
   ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_ACE_Naming_Context);
-#endif /* ! ACE_HAS_WINCE  &&  ! ACE_LACKS_ACE_OTHER */
+#endif /* !ACE_HAS_WINCE */
 
   ACE_Service_Config::static_svcs ()->
     insert (&ace_svc_desc_ACE_Service_Manager);
@@ -152,101 +159,92 @@ ACE_Object_Manager_Preallocations::~ACE_Object_Manager_Preallocations (void)
 {
 }
 
-int
-ACE_Object_Manager::starting_up (void)
-{
-  return ACE_Object_Manager::instance_  ?  instance_->starting_up_i ()  :  1;
-}
-
-int
-ACE_Object_Manager::shutting_down (void)
+ACE_Object_Manager_Base::ACE_Object_Manager_Base (void)
+  : registered_objects_ (0)
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  , internal_lock_ (new ACE_Recursive_Thread_Mutex)
+  , singleton_null_lock_ (0)
+  , singleton_thread_locks_ (0)
+  , singleton_mutex_locks_ (0)
+  , singleton_recursive_lock_ (0)
+  , singleton_rw_locks_ (0)
+# endif /* ACE_MT_SAFE */
 {
-  return ACE_Object_Manager::instance_  ?  instance_->shutting_down_i ()  :  1;
 }
 
-// Initialize an ACE_Object_Manager.  There can be instances of this object
-// other than The Instance.  This can happen if a user creates one for some
-// reason.  All objects set up their per-object information and managed
-// objects, but only The Instance sets up the static preallocated objects and
-// the (static) ACE_Service_Config signal handler.
 int
 ACE_Object_Manager::init (void)
 {
-  if (starting_up_i ())
+  if (initialized_ == 0)
     {
-      // First, indicate that the ACE_Object_Manager instance is being
-      // initialized.
-      object_manager_state_ = OBJ_MAN_INITIALIZING;
+      initialized_ = 1;
 
-      // Only The Instance sets up with ACE_OS_Object_Manager and initializes
-      // the preallocated objects.
-      if (this == instance_)
+      if (instance_ == 0)
         {
-          // Make sure that the ACE_OS_Object_Manager has been created,
-          // and register with it for chained fini ().
-          ACE_OS_Object_Manager::instance ()->next_ = this;
-
-          // Construct the ACE_Service_Config's signal handler.
-          ACE_NEW_RETURN (ace_service_config_sig_handler_,
-                     ACE_Sig_Adapter (&ACE_Service_Config::handle_signal), -1);
-          ACE_Service_Config::signal_handler (ace_service_config_sig_handler_);
+          // Allocate the ACE_Object_Manager instance on the heap.  Assume
+          // that the application will call fini () to destroy it.
+          ACE_Object_Manager::instance ();
+        }
 
-          // Allocate the preallocated (hard-coded) object instances.
-          ACE_PREALLOCATE_OBJECT (ACE_SYNCH_RW_MUTEX, ACE_FILECACHE_LOCK)
+      // Allocate the preallocated (hard-coded) object instances.
+      ACE_PREALLOCATE_OBJECT (ACE_SYNCH_RW_MUTEX, ACE_FILECACHE_LOCK)
 #     if defined (ACE_HAS_THREADS)
-          ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
-                                  ACE_STATIC_OBJECT_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
+                                ACE_STATIC_OBJECT_LOCK)
 #     endif /* ACE_HAS_THREADS */
 #     if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-          ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex,
-                                  ACE_LOG_MSG_INSTANCE_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex,
-                                  ACE_MT_CORBA_HANDLER_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_DUMP_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
-                                  ACE_SIG_HANDLER_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Null_Mutex, ACE_SINGLETON_NULL_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_LOG_MSG_INSTANCE_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_MT_CORBA_HANDLER_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_DUMP_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_OS_MONITOR_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
+                                ACE_SIG_HANDLER_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Null_Mutex, ACE_SINGLETON_NULL_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
+                                ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_TOKEN_CONST::MUTEX,
+                                ACE_TOKEN_MANAGER_CREATION_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_TOKEN_CONST::MUTEX,
+                                ACE_TOKEN_INVARIANTS_CREATION_LOCK)
+        ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
+                                ACE_TSS_CLEANUP_LOCK)
+#       if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
           ACE_PREALLOCATE_OBJECT (ACE_Recursive_Thread_Mutex,
-                                  ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_TOKEN_CONST::MUTEX,
-                                  ACE_TOKEN_MANAGER_CREATION_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_TOKEN_CONST::MUTEX,
-                                  ACE_TOKEN_INVARIANTS_CREATION_LOCK)
-          ACE_PREALLOCATE_OBJECT (ACE_Thread_Mutex,
-                                  ACE_PROACTOR_EVENT_LOOP_LOCK)
+                                  ACE_TSS_BASE_LOCK)
+#       endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 #     endif /* ACE_MT_SAFE */
-        }
 
       // Do this after the allocation of ACE_STATIC_OBJECT_LOCK.  It
       // shouldn't matter, but just in case
       // ACE_Static_Object_Lock::instance () gets changed . . .
-      ACE_NEW_RETURN (registered_objects_,
+      ACE_NEW_RETURN (instance_->registered_objects_,
                       ACE_Unbounded_Queue<ACE_Cleanup_Info>, -1);
 
-      if (this == instance_)
-        {
-          // Hooks for preallocated objects and arrays provided by application.
-          ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS
-          ACE_APPLICATION_PREALLOCATED_ARRAY_DEFINITIONS
+      // Hooks for preallocated objects and arrays provided by application.
+      ACE_APPLICATION_PREALLOCATED_OBJECT_DEFINITIONS
+      ACE_APPLICATION_PREALLOCATED_ARRAY_DEFINITIONS
 
 #     if defined (ACE_HAS_TSS_EMULATION)
-          // Initialize the main thread's TS storage.
-          ACE_TSS_Emulation::tss_open (ts_storage_);
+        // Initialize the main thread's TS storage.
+        ACE_TSS_Emulation::tss_open (instance_->ts_storage_);
 #     endif /* ACE_HAS_TSS_EMULATION */
 
-          ACE_NEW_RETURN (preallocations_, ACE_Object_Manager_Preallocations,
-                          -1);
+      // Open Winsock (no-op on other platforms).
+      ACE_OS::socket_init (ACE_WSOCK_VERSION);
 
-          // Open the main thread's ACE_Log_Msg.
-          (void) ACE_LOG_MSG;
-        }
+      ACE_NEW_RETURN (instance_->preallocations_,
+        ACE_Object_Manager_Preallocations, -1);
+
+      // Open the main thread's ACE_Log_Msg.
+      (void) ACE_LOG_MSG;
 
-      ACE_NEW_RETURN (default_mask_, ACE_Sig_Set (1), -1);
+      ACE_NEW_RETURN (instance_->default_mask_,
+        ACE_Sig_Set (1), -1);
 
       // Finally, indicate that the ACE_Object_Manager instance has
-      // been initialized.
-      object_manager_state_ = OBJ_MAN_INITIALIZED;
+      // been constructed.
+      instance_->starting_up_ = 0;
 
       return 0;
     } else {
@@ -255,39 +253,146 @@ ACE_Object_Manager::init (void)
     }
 }
 
+int
+ACE_Object_Manager::fini (void)
+{
+  if (instance_ == 0  ||  instance_->shutting_down_ == 1)
+    // Too late.  Or, maybe too early.  Either fini () has already
+    // been called, or init () was never called.
+    return -1;
+
+  // No mutex here.  Only the main thread should destroy the singleton
+  // ACE_Object_Manager instance.
+
+  // First, indicate that the ACE_Object_Manager instance is (being)
+  // destroyed.  If an object tries to register after this, it will be
+  // refused.
+  instance_->shutting_down_ = 1;
+
+  ACE_Trace::stop_tracing ();
+
+  ACE_Cleanup_Info info;
+
+  // Close and possibly delete all service instances in the Service
+  // Repository.
+  ACE_Service_Config::fini_svcs ();
+
+  // Call all registered cleanup hooks, in reverse order of
+  // registration.
+  while (instance_->registered_objects_ &&
+         instance_->registered_objects_->dequeue_head (info) != -1)
+    {
+      if (info.cleanup_hook_ == (ACE_CLEANUP_FUNC) ace_cleanup_destroyer)
+        // The object is an ACE_Cleanup.
+        ace_cleanup_destroyer ((ACE_Cleanup *) info.object_, info.param_);
+      else
+        (*info.cleanup_hook_) (info.object_, info.param_);
+    }
+
+  // Close the main thread's TSS, including its Log_Msg instance.
+  ACE_OS::cleanup_tss (1 /* main thread */);
+
+  //
+  // Note:  Do not access Log Msg after this since it is gone
+  //
+
+  // Unlink all services in the Service Repository and close/delete
+  // all ACE library services and singletons.
+  ACE_Service_Config::close ();
+
+  // Close down Winsock (no-op on other platforms).
+  ACE_OS::socket_fini ();
+
+  delete instance_->preallocations_;
+  instance_->preallocations_ = 0;
+
+  // Close the ACE_Allocator.
+  ACE_Allocator::close_singleton ();
+
+#if ! defined (ACE_HAS_STATIC_PREALLOCATION)
+  // Hooks for deletion of preallocated objects and arrays provided by
+  // application.
+  ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS
+    ACE_APPLICATION_PREALLOCATED_OBJECT_DELETIONS
+
+    // Cleanup the dynamically preallocated arrays.
+    // (none)
+
+    // Cleanup the dynamically preallocated objects.
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_SYNCH_RW_MUTEX, ACE_FILECACHE_LOCK)
+#if defined (ACE_HAS_THREADS)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
+                                    ACE_STATIC_OBJECT_LOCK)
+#endif /* ACE_HAS_THREADS */
+# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
+                                    ACE_LOG_MSG_INSTANCE_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
+                                    ACE_MT_CORBA_HANDLER_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_DUMP_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_OS_MONITOR_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
+                                    ACE_SIG_HANDLER_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Null_Mutex, ACE_SINGLETON_NULL_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
+                                    ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_TOKEN_CONST::MUTEX,
+                                    ACE_TOKEN_MANAGER_CREATION_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_TOKEN_CONST::MUTEX,
+                                    ACE_TOKEN_INVARIANTS_CREATION_LOCK)
+    ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
+                                    ACE_TSS_CLEANUP_LOCK)
+#     if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
+                                      ACE_TSS_BASE_LOCK)
+#     endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
+# endif /* ACE_MT_SAFE */
+#endif /* ! ACE_HAS_STATIC_PREALLOCATION */
+
+#if defined (ACE_HAS_THREADS)
+  ACE_Static_Object_Lock::cleanup_lock ();
+#endif /* ACE_HAS_THREADS */
+
+  delete instance_->default_mask_;
+  instance_->default_mask_ = 0;
+
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
+  if (instance_->dynamically_allocated_)
+    {
+      delete instance_;
+      instance_ = 0;
+    }
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
+
+  return 0;
+}
+
 ACE_Object_Manager::ACE_Object_Manager (void)
   // With ACE_HAS_TSS_EMULATION, ts_storage_ is initialized by the call to
   // ACE_OS::tss_open () in the function body.
-  : registered_objects_ (0)
+  : dynamically_allocated_ (0)
   , preallocations_ (0)
   , default_mask_ (0)
   , ace_service_config_sig_handler_ (0)
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  , internal_lock_ (new ACE_Recursive_Thread_Mutex)
-  , singleton_null_lock_ (0)
-  , singleton_recursive_lock_ (0)
-# endif /* ACE_MT_SAFE */
 {
-  // If instance_ was not 0, then another ACE_Object_Manager has
-  // already been instantiated (it is likely to be one initialized by way
-  // of library/DLL loading).  Let this one go through construction in
-  // case there really is a good reason for it (like, ACE is a static/archive
-  // library, and this one is the non-static instance (with
-  // ACE_HAS_NONSTATIC_OBJECT_MANAGER, or the user has a good reason for
-  // creating a separate one) but the original one will be the one retrieved
-  // from calls to ACE_Object_Manager::instance().
-
-  // Be sure that no further instances are created via instance ().
   if (instance_ == 0)
-    instance_ = this;
+    {
+      // Store the address of the instance so that instance () doesn't
+      // allocate a new one when called.
+      instance_ = this;
 
-  init ();
-}
+      // Construct the ACE_Service_Config's signal handler.
+      ACE_NEW (ace_service_config_sig_handler_,
+               ACE_Sig_Adapter (&ACE_Service_Config::handle_signal));
+      ACE_Service_Config::signal_handler (ace_service_config_sig_handler_);
 
-ACE_Object_Manager::~ACE_Object_Manager (void)
-{
-  dynamically_allocated_ = 0;   // Don't delete this again in fini()
-  fini ();
+      init ();
+    }
+  // else if instance_ was not 0, then then another
+  // ACE_Object_Manager has already been instantiated.
+  // Don't do anything, so that it will own all
+  // ACE_Object_Manager resources.
 }
 
 ACE_Object_Manager *
@@ -304,7 +409,9 @@ ACE_Object_Manager::instance (void)
       ACE_NEW_RETURN (instance_pointer, ACE_Object_Manager, 0);
       ACE_ASSERT (instance_pointer == instance_);
 
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
       instance_pointer->dynamically_allocated_ = 1;
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
       return instance_pointer;
     }
@@ -314,6 +421,18 @@ ACE_Object_Manager::instance (void)
     }
 }
 
+int
+ACE_Object_Manager::starting_up ()
+{
+  return starting_up_;
+}
+
+int
+ACE_Object_Manager::shutting_down ()
+{
+  return shutting_down_;
+}
+
 ACE_Sig_Set &
 ACE_Object_Manager::default_mask (void)
 {
@@ -328,7 +447,7 @@ ACE_Object_Manager::at_exit_i (void *object,
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
     *instance_->internal_lock_, -1));
 
-  if (shutting_down_i ())
+  if (shutting_down ())
     {
       errno = EAGAIN;
       return -1;
@@ -362,9 +481,10 @@ ACE_Object_Manager::at_exit_i (void *object,
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 
 int
-ACE_Object_Manager::get_singleton_lock (ACE_Null_Mutex *&lock)
+ACE_Object_Manager_Base::get_singleton_lock (ACE_Null_Mutex *&lock)
 {
-  if (starting_up ()  ||  shutting_down ())
+  if (ACE_Object_Manager::starting_up ()  ||
+      ACE_Object_Manager::shutting_down ())
     {
       // The preallocated lock has not been constructed yet.
       // Therefore, the program is single-threaded at this point.  Or,
@@ -397,20 +517,63 @@ ACE_Object_Manager::get_singleton_lock (ACE_Null_Mutex *&lock)
 }
 
 int
-ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock)
+ACE_Object_Manager_Base::get_singleton_lock (ACE_Thread_Mutex *&lock)
 {
   if (lock == 0)
     {
-      if (starting_up ()  ||  shutting_down ())
+      if (ACE_Object_Manager::starting_up ()  ||
+          ACE_Object_Manager::shutting_down ())
         {
           // The Object_Manager and its internal lock have not been
           // constructed yet.  Therefore, the program is single-
           // threaded at this point.  Or, the ACE_Object_Manager
           // instance has been destroyed, so the internal lock is not
           // available.  Either way, we can not use double-checked
-          // locking.  So, we'll leak the lock.
+          // locking.
 
           ACE_NEW_RETURN (lock, ACE_Thread_Mutex, -1);
+
+          // Add the new lock to the array of locks to be deleted
+          // at program termination.
+          if (ACE_Object_Manager::instance ()->singleton_thread_locks_ == 0)
+            {
+              // Create the array, then insert the new lock.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_thread_locks_,
+                              ACE_Array<ACE_Thread_Mutex *> (
+                                (size_t) 1,
+                                (ACE_Thread_Mutex *) 0),
+                              -1);
+              (*ACE_Object_Manager::instance ()->singleton_thread_locks_)[0] =
+                 lock;
+            }
+          else
+            {
+              // Grow the array, then insert the new lock.
+
+              // Copy the array pointer.
+              ACE_Array<ACE_Thread_Mutex *> *tmp =
+                ACE_Object_Manager::instance ()->singleton_thread_locks_;
+
+              // Create a new array with one more slot than the current one.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_thread_locks_,
+                              ACE_Array<ACE_Thread_Mutex *> (
+                                tmp->size () + (size_t) 1,
+                                (ACE_Thread_Mutex *) 0),
+                              -1);
+
+              // Copy the old array to the new array.
+              for (u_int i = 0; i < tmp->size (); ++i)
+                (*ACE_Object_Manager::instance ()->
+                   singleton_thread_locks_)[i] = (*tmp) [i];
+
+              // Insert the new lock at the end of the array.
+              (*ACE_Object_Manager::instance ()->singleton_thread_locks_)
+                 [tmp->size ()] = lock;
+
+              delete tmp;
+            }
         }
       else
         {
@@ -443,20 +606,63 @@ ACE_Object_Manager::get_singleton_lock (ACE_Thread_Mutex *&lock)
 }
 
 int
-ACE_Object_Manager::get_singleton_lock (ACE_Mutex *&lock)
+ACE_Object_Manager_Base::get_singleton_lock (ACE_Mutex *&lock)
 {
   if (lock == 0)
     {
-      if (starting_up ()  ||  shutting_down ())
+      if (ACE_Object_Manager::starting_up ()  ||
+          ACE_Object_Manager::shutting_down ())
         {
           // The Object_Manager and its internal lock have not been
           // constructed yet.  Therefore, the program is single-
           // threaded at this point.  Or, the ACE_Object_Manager
           // instance has been destroyed, so the internal lock is not
           // available.  Either way, we can not use double-checked
-          // locking.  So, we'll leak the lock.
+          // locking.
 
           ACE_NEW_RETURN (lock, ACE_Mutex, -1);
+
+          // Add the new lock to the array of locks to be deleted
+          // at program termination.
+          if (ACE_Object_Manager::instance ()->singleton_mutex_locks_ == 0)
+            {
+              // Create the array, then insert the new lock.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_mutex_locks_,
+                              ACE_Array<ACE_Mutex *> (
+                                (size_t) 1,
+                                (ACE_Mutex *) 0),
+                              -1);
+              (*ACE_Object_Manager::instance ()->singleton_mutex_locks_)[0] =
+                 lock;
+            }
+          else
+            {
+              // Grow the array, then insert the new lock.
+
+              // Copy the array pointer.
+              ACE_Array<ACE_Mutex *> *tmp =
+                ACE_Object_Manager::instance ()->singleton_mutex_locks_;
+
+              // Create a new array with one more slot than the current one.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_mutex_locks_,
+                              ACE_Array<ACE_Mutex *> (
+                                tmp->size () + (size_t) 1,
+                                (ACE_Mutex *) 0),
+                              -1);
+
+              // Copy the old array to the new array.
+              for (u_int i = 0; i < tmp->size (); ++i)
+                (*ACE_Object_Manager::instance ()->singleton_mutex_locks_)[i] =
+                   (*tmp) [i];
+
+              // Insert the new lock at the end of the array.
+              (*ACE_Object_Manager::instance ()->singleton_mutex_locks_)
+                 [tmp->size ()] = lock;
+
+              delete tmp;
+            }
         }
       else
         {
@@ -489,9 +695,10 @@ ACE_Object_Manager::get_singleton_lock (ACE_Mutex *&lock)
 }
 
 int
-ACE_Object_Manager::get_singleton_lock (ACE_Recursive_Thread_Mutex *&lock)
+ACE_Object_Manager_Base::get_singleton_lock (ACE_Recursive_Thread_Mutex *&lock)
 {
-  if (starting_up ()  ||  shutting_down ())
+  if (ACE_Object_Manager::starting_up ()  ||
+      ACE_Object_Manager::shutting_down ())
     {
       // The preallocated lock has not been constructed yet.
       // Therefore, the program is single-threaded at this point.  Or,
@@ -514,31 +721,72 @@ ACE_Object_Manager::get_singleton_lock (ACE_Recursive_Thread_Mutex *&lock)
           object ();
     }
   else
-    {
-      // Use the Object_Manager's preallocated lock.
-      lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::
-        get_preallocated_object (ACE_Object_Manager::
-                                 ACE_SINGLETON_RECURSIVE_THREAD_LOCK);
-    }
+    // Use the Object_Manager's preallocated lock.
+    lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::
+    get_preallocated_object (ACE_Object_Manager::
+                             ACE_SINGLETON_RECURSIVE_THREAD_LOCK);
 
   return 0;
 }
 
 int
-ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
+ACE_Object_Manager_Base::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
 {
   if (lock == 0)
     {
-      if (starting_up ()  ||  shutting_down ())
+      if (ACE_Object_Manager::starting_up ()  ||
+          ACE_Object_Manager::shutting_down ())
         {
           // The Object_Manager and its internal lock have not been
           // constructed yet.  Therefore, the program is single-
           // threaded at this point.  Or, the ACE_Object_Manager
           // instance has been destroyed, so the internal lock is not
           // available.  Either way, we can not use double-checked
-          // locking.  So, we'll leak the lock.
+          // locking.
 
           ACE_NEW_RETURN (lock, ACE_RW_Thread_Mutex, -1);
+
+          // Add the new lock to the array of locks to be deleted
+          // at program termination.
+          if (ACE_Object_Manager::instance ()->singleton_rw_locks_ == 0)
+            {
+              // Create the array, then insert the new lock.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_rw_locks_,
+                              ACE_Array<ACE_RW_Thread_Mutex *> (
+                                (size_t) 1,
+                                (ACE_RW_Thread_Mutex *) 0),
+                              -1);
+              (*ACE_Object_Manager::instance ()->singleton_rw_locks_)[0] =
+                 lock;
+            }
+          else
+            {
+              // Grow the array, then insert the new lock.
+
+              // Copy the array pointer.
+              ACE_Array<ACE_RW_Thread_Mutex *> *tmp =
+                ACE_Object_Manager::instance ()->singleton_rw_locks_;
+
+              // Create a new array with one more slot than the current one.
+              ACE_NEW_RETURN (ACE_Object_Manager::instance ()->
+                                singleton_rw_locks_,
+                              ACE_Array<ACE_RW_Thread_Mutex *> (
+                                tmp->size () + (size_t) 1,
+                                (ACE_RW_Thread_Mutex *) 0),
+                              -1);
+
+              // Copy the old array to the new array.
+              for (u_int i = 0; i < tmp->size (); ++i)
+                (*ACE_Object_Manager::instance ()->singleton_rw_locks_)[i] =
+                   (*tmp) [i];
+
+              // Insert the new lock at the end of the array.
+              (*ACE_Object_Manager::instance ()->singleton_rw_locks_)
+                 [tmp->size ()] = lock;
+
+              delete tmp;
+            }
         }
       else
         {
@@ -575,116 +823,8 @@ ACE_Object_Manager::get_singleton_lock (ACE_RW_Thread_Mutex *&lock)
 // NOTE:  this function needs to appear _after_ the
 // get_singleton_lock () functions in order to compile with
 // g++ 2.7.2.3.
-//
-// Clean up an ACE_Object_Manager.  There can be instances of this object
-// other than The Instance.  This can happen if (on Win32) the ACE DLL
-// causes one to be created, or if a user creates one for some reason.
-// Only The Instance cleans up the static preallocated objects.  All objects
-// clean up their per-object information and managed objects.
-int
-ACE_Object_Manager::fini (void)
+ACE_Object_Manager_Base::~ACE_Object_Manager_Base (void)
 {
-  if (shutting_down_i ())
-    // Too late.  Or, maybe too early.  Either fini () has already
-    // been called, or init () was never called.
-    return -1;
-
-  // No mutex here.  Only the main thread should destroy the singleton
-  // ACE_Object_Manager instance.
-
-  // First, indicate that this ACE_Object_Manager instance is being
-  // shut down.
-  object_manager_state_ = OBJ_MAN_SHUTTING_DOWN;
-
-  // Call all registered cleanup hooks, in reverse order of
-  // registration.
-  ACE_Cleanup_Info info;
-  while (registered_objects_ &&
-         registered_objects_->dequeue_head (info) != -1)
-    {
-      if (info.cleanup_hook_ == (ACE_CLEANUP_FUNC) ace_cleanup_destroyer)
-        // The object is an ACE_Cleanup.
-        ace_cleanup_destroyer ((ACE_Cleanup *) info.object_, info.param_);
-      else
-        (*info.cleanup_hook_) (info.object_, info.param_);
-    }
-
-  if (this == instance_)
-    {
-      delete preallocations_;
-      preallocations_ = 0;
-
-      ACE_Trace::stop_tracing ();
-
-      // Close and possibly delete all service instances in the Service
-      // Repository.
-      ACE_Service_Config::fini_svcs ();
-
-      // Close the main thread's TSS, including its Log_Msg instance.
-      ACE_OS::cleanup_tss (1 /* main thread */);
-
-      //
-      // Note:  Do not access Log Msg after this since it is gone
-      //
-
-      // Unlink all services in the Service Repository and close/delete
-      // all ACE library services and singletons.
-      ACE_Service_Config::close ();
-
-      // Close the ACE_Allocator.
-      ACE_Allocator::close_singleton ();
-
-#if ! defined (ACE_HAS_STATIC_PREALLOCATION)
-      // Hooks for deletion of preallocated objects and arrays provided by
-      // application.
-      ACE_APPLICATION_PREALLOCATED_ARRAY_DELETIONS
-      ACE_APPLICATION_PREALLOCATED_OBJECT_DELETIONS
-
-      // Cleanup the dynamically preallocated arrays.
-      // (none)
-
-      // Cleanup the dynamically preallocated objects.
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_SYNCH_RW_MUTEX, ACE_FILECACHE_LOCK)
-#if defined (ACE_HAS_THREADS)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
-                                      ACE_STATIC_OBJECT_LOCK)
-#endif /* ACE_HAS_THREADS */
-# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
-                                      ACE_LOG_MSG_INSTANCE_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
-                                      ACE_MT_CORBA_HANDLER_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_DUMP_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
-                                      ACE_SIG_HANDLER_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Null_Mutex,
-                                      ACE_SINGLETON_NULL_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Recursive_Thread_Mutex,
-                                      ACE_SINGLETON_RECURSIVE_THREAD_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex, ACE_THREAD_EXIT_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_TOKEN_CONST::MUTEX,
-                                      ACE_TOKEN_MANAGER_CREATION_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_TOKEN_CONST::MUTEX,
-                                      ACE_TOKEN_INVARIANTS_CREATION_LOCK)
-      ACE_DELETE_PREALLOCATED_OBJECT (ACE_Thread_Mutex,
-                                      ACE_PROACTOR_EVENT_LOOP_LOCK)
-# endif /* ACE_MT_SAFE */
-#endif /* ! ACE_HAS_STATIC_PREALLOCATION */
-
-#if defined (ACE_HAS_THREADS)
-      ACE_Static_Object_Lock::cleanup_lock ();
-#endif /* ACE_HAS_THREADS */
-    }
-
-  delete default_mask_;
-  default_mask_ = 0;
-
-  delete ace_service_config_sig_handler_;
-  ace_service_config_sig_handler_ = 0;
-
-  delete registered_objects_;
-  registered_objects_ = 0;
-
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
   delete internal_lock_;
   internal_lock_ = 0;
@@ -692,34 +832,46 @@ ACE_Object_Manager::fini (void)
   delete singleton_null_lock_;
   singleton_null_lock_ = 0;
 
+  delete singleton_thread_locks_;
+  singleton_thread_locks_ = 0;
+
+  delete singleton_mutex_locks_;
+  singleton_mutex_locks_ = 0;
+
   delete singleton_recursive_lock_;
   singleton_recursive_lock_ = 0;
+
+  delete singleton_rw_locks_;
+  singleton_rw_locks_ = 0;
 #endif /* ACE_MT_SAFE */
 
-  // Indicate that this ACE_Object_Manager instance has been shut down.
-  object_manager_state_ = OBJ_MAN_SHUT_DOWN;
+  delete registered_objects_;
+  registered_objects_ = 0;
+}
 
-  // Then, ensure that the ACE_OS_Object_Manager gets shut down.
-  if (this == instance_ && ACE_OS_Object_Manager::instance_)
-    ACE_OS_Object_Manager::instance_->fini ();
+ACE_Object_Manager::~ACE_Object_Manager (void)
+{
+#if defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
+  // Clear the flag so that fini () doesn't delete again.
+  dynamically_allocated_ = 0;
+#endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
-  if (dynamically_allocated_)
+  if (fini () != -1)
     {
-      delete this;
+      delete ace_service_config_sig_handler_;
+      ace_service_config_sig_handler_ = 0;
     }
-
-  if (this == instance_)
-    instance_ = 0;
-
-  return 0;
+  // else fini () had already been called.  It would be safe
+  // to delete the 0 pointers again, but this allows us to
+  // add other code to the block above.
 }
 
-
 #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
-class ACE_Export ACE_Object_Manager_Manager
+class ACE_Export ACE_Object_Manager_Destroyer
   // = TITLE
-  //    Ensure that the <ACE_Object_Manager> gets initialized at
-  //    program startup, and destroyed at program termination.
+  //    Ensure that the <ACE_Object_Manager> gets initialized before any
+  //    application threads have been spawned, and destroyed at program
+  //    termination.
   //
   // = DESCRIPTION
   //    Without ACE_HAS_NONSTATIC_OBJECT_MANAGER, a static instance of this
@@ -727,15 +879,15 @@ class ACE_Export ACE_Object_Manager_Manager
   //    is called.  And it gets destroyed after main () returns.
 {
 public:
-  ACE_Object_Manager_Manager (void);
-  ~ACE_Object_Manager_Manager (void);
+  ACE_Object_Manager_Destroyer (void);
+  ~ACE_Object_Manager_Destroyer (void);
 
 private:
   ACE_thread_t saved_main_thread_id_;
   // Save the main thread ID, so that destruction can be suppressed.
 };
 
-ACE_Object_Manager_Manager::ACE_Object_Manager_Manager (void)
+ACE_Object_Manager_Destroyer::ACE_Object_Manager_Destroyer (void)
   : saved_main_thread_id_ (ACE_OS::thr_self ())
 {
   // Ensure that the Object_Manager gets initialized before any
@@ -745,7 +897,7 @@ ACE_Object_Manager_Manager::ACE_Object_Manager_Manager (void)
   (void) ACE_Object_Manager::instance ();
 }
 
-ACE_Object_Manager_Manager::~ACE_Object_Manager_Manager (void)
+ACE_Object_Manager_Destroyer::~ACE_Object_Manager_Destroyer (void)
 {
   if (ACE_OS::thr_equal (ACE_OS::thr_self (),
                          saved_main_thread_id_))
@@ -758,7 +910,7 @@ ACE_Object_Manager_Manager::~ACE_Object_Manager_Manager (void)
   // WIN32 at least.
 }
 
-static ACE_Object_Manager_Manager ACE_Object_Manager_Manager_instance;
+static ACE_Object_Manager_Destroyer ACE_Object_Manager_Destroyer_internal;
 #endif /* ! ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
 #if defined (ACE_HAS_THREADS)
@@ -771,7 +923,7 @@ ACE_Static_Object_Lock_lock = 0;
 ACE_Recursive_Thread_Mutex *
 ACE_Static_Object_Lock::instance (void)
 {
-  if (ACE_Object_Manager::starting_up ()  || \
+  if (ACE_Object_Manager::starting_up ()  ||
       ACE_Object_Manager::shutting_down ())
     {
       // The preallocated ACE_STATIC_OBJECT_LOCK has not been
@@ -808,6 +960,12 @@ ACE_Static_Object_Lock::cleanup_lock (void)
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+    template class ACE_Array<ACE_Thread_Mutex *>;
+    template class ACE_Array_Base<ACE_Thread_Mutex *>;
+    template class ACE_Array<ACE_Mutex *>;
+    template class ACE_Array_Base<ACE_Mutex *>;
+    template class ACE_Array<ACE_RW_Thread_Mutex *>;
+    template class ACE_Array_Base<ACE_RW_Thread_Mutex *>;
     template class ACE_Cleanup_Adapter<ACE_Null_Mutex>;
     template class ACE_Cleanup_Adapter<ACE_Mutex>;
     template class ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>;
@@ -824,6 +982,12 @@ ACE_Static_Object_Lock::cleanup_lock (void)
   template class ACE_Node<ACE_Cleanup_Info>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+#   pragma instantiate ACE_Array<ACE_Thread_Mutex *>
+#   pragma instantiate ACE_Array_Base<ACE_Thread_Mutex *>
+#   pragma instantiate ACE_Array<ACE_Mutex *>
+#   pragma instantiate ACE_Array_Base<ACE_Mutex *>
+#   pragma instantiate ACE_Array<ACE_RW_Thread_Mutex *>
+#   pragma instantiate ACE_Array_Base<ACE_RW_Thread_Mutex *>
 #   pragma instantiate ACE_Cleanup_Adapter<ACE_Null_Mutex>
 #   pragma instantiate ACE_Cleanup_Adapter<ACE_Mutex>
 #   pragma instantiate ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex>
diff --git a/ace/Object_Manager.h b/ace/Object_Manager.h
index 96bd39daf79..e0bc06c1c83 100644
--- a/ace/Object_Manager.h
+++ b/ace/Object_Manager.h
@@ -37,6 +37,7 @@ class ACE_Sig_Set;
 
 template <class T> class ACE_Unbounded_Queue;
 template <class T> class ACE_Cleanup_Adapter;
+template <class T> class ACE_Array;
 
 
 // Configuration parameters.
@@ -53,6 +54,89 @@ template <class T> class ACE_Cleanup_Adapter;
 #endif /* ! ACE_APPLICATION_PREALLOCATED_ARRAY_DECLARATIONS */
 
 
+class ACE_Export ACE_Object_Manager_Base
+{
+  // = TITLE
+  //     Base class for ACE_Object_Manager(s).
+  //
+  // = DESCRIPTION
+  //     Encapsulates the most useful ACE_Object_Manager data structures.
+# if (defined (ACE_PSOS) && defined (__DIAB))  || \
+     (defined (__DECCXX_VER) && __DECCXX_VER < 60000000)
+  // The Diab compiler got confused and complained about access rights
+  // if this section was protected (changing this to public makes it happy).
+  // Similarly, DEC CXX 5.6 needs the methods to be public.
+public:
+# else  /* ! (ACE_PSOS && __DIAB)  ||  ! __DECCXX_VER < 60000000 */
+protected:
+# endif /* ! (ACE_PSOS && __DIAB)  ||  ! __DECCXX_VER < 60000000 */
+  ACE_Object_Manager_Base (void);
+  // Default constructor.
+
+  virtual ~ACE_Object_Manager_Base (void);
+  // Destructor.
+
+  ACE_Unbounded_Queue<ACE_Cleanup_Info> *registered_objects_;
+  // Keeps track of all registered objects.
+
+#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
+  ACE_Recursive_Thread_Mutex *internal_lock_;
+  // Lock that is used to guard internal structures.
+
+  ACE_Cleanup_Adapter<ACE_Null_Mutex> *singleton_null_lock_;
+  // Null lock for guarding singleton creation.
+
+  ACE_Array<ACE_Thread_Mutex *> *singleton_thread_locks_;
+  // Array of locks for guarding singleton creation.
+
+  ACE_Array<ACE_Mutex *> *singleton_mutex_locks_;
+  // Array of locks for guarding singleton creation.
+
+  ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> *singleton_recursive_lock_;
+  // Lock for guarding singleton creation.
+
+  ACE_Array<ACE_RW_Thread_Mutex *> *singleton_rw_locks_;
+  // Array of locks for guarding singleton creation.
+
+public:
+  // = The <get_singleton_lock> accessors are for internal
+  // use by ACE_Singleton _only_.
+
+  static int get_singleton_lock (ACE_Null_Mutex *&);
+  // Accesses an <ACE_Null_Mutex> to be used for construction of
+  // <ACE_Singletons>.  Returns 0, and the lock in the argument, on
+  // success; returns -1 on failure.  The argument is ignored -- it is
+  // only used for overload resolution.
+
+  static int get_singleton_lock (ACE_Thread_Mutex *&);
+  // Accesses a non-recursive <ACE_Thread_Mutex> to be used for
+  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
+  // argument, on success; returns -1 on failure.  The argument is
+  // ignored -- it is only used for overload resolution.
+
+  static int get_singleton_lock (ACE_Mutex *&);
+  // Accesses a non-recursive <ACE_Mutex> to be used for construction
+  // of <ACE_Singletons>.  Returns 0, and the lock in the argument, on
+  // success; returns -1 on failure.  The argument is ignored -- it is
+  // only used for overload resolution.
+
+  static int get_singleton_lock (ACE_Recursive_Thread_Mutex *&);
+  // Accesses a recursive <ACE_Recursive_Thread_Mutex> to be used for
+  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
+  // argument, on success; returns -1 on failure.
+
+  static int get_singleton_lock (ACE_RW_Thread_Mutex *&);
+  // Accesses a readers/writer <ACE_RW_Thread_Mutex> to be used for
+  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
+  // argument, on success; returns -1 on failure.
+#endif /* ACE_MT_SAFE */
+
+private:
+  // Disallow copying by not implementing the following . . .
+  ACE_Object_Manager_Base (const ACE_Object_Manager_Base &);
+  ACE_Object_Manager_Base &operator= (const ACE_Object_Manager_Base &);
+};
+
 class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
 {
   // = TITLE
@@ -130,9 +214,6 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
   //     building the ACE library and your applications.  This #define
   //     is enabled in some config files that are supplied with ACE.
   //
-  //     Note that the ACE_Object_Manager _must_ be created before
-  //     any threads are spawned by the program.
-  //
   //     If ACE_HAS_NONSTATIC_OBJECT_MANAGER is not #defined, the ACE
   //     library creates a static, singleton <ACE_Object_Manager> instance.
   //     The instance is placed in global program data, and constructed
@@ -172,38 +253,16 @@ class ACE_Export ACE_Object_Manager : public ACE_Object_Manager_Base
   //     Greif <jmg@trivida.com> for pointing out that ::exit ()
   //     doesn't destroy automatic objects, and for developing the
   //     recommendations in this paragraph.
-  //
-  //     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_ call ACE::init () at the
-  //     start of the program, and call ACE::fini () at the end.
 
 public:
-  virtual int init (void);
-  // Explicitly initialize (construct the singleton instance of) the
+  static int init (void);
+  // Explicity initialize (construct the singleton instance of) the
   // ACE_Object_Manager.
 
-  virtual int fini (void);
-  // Explicitly destroy the singleton instance of the
+  static int fini (void);
+  // Explicity destroy the singleton instance of the
   // ACE_Object_Manager.
 
-  static int starting_up (void);
-  // Returns 1 before the ACE_Object_Manager has been constructed.
-  // This flag can be used to determine if the program is constructing
-  // static objects.  If no static object spawns any threads, the
-  // program will be single-threaded when this flag returns 1.  (Note
-  // that the program still might construct some static objects when
-  // this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not
-  // defined.)
-
-  static int shutting_down (void);
-  // Returns 1 after the ACE_Object_Manager has been destroyed.  This
-  // flag can be used to determine if the program is in the midst of
-  // destroying static objects.  (Note that the program might destroy
-  // some static objects before this flag can return 1, if
-  // ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.)
-
   static int at_exit (ACE_Cleanup *object, void *param = 0);
   // Register an ACE_Cleanup object for cleanup at process termination.
   // The object is deleted via the ace_cleanup_destroyer ().  If you
@@ -250,13 +309,17 @@ public:
       ACE_LOG_MSG_INSTANCE_LOCK,
       ACE_MT_CORBA_HANDLER_LOCK,
       ACE_DUMP_LOCK,
+      ACE_OS_MONITOR_LOCK,
       ACE_SIG_HANDLER_LOCK,
       ACE_SINGLETON_NULL_LOCK,
       ACE_SINGLETON_RECURSIVE_THREAD_LOCK,
       ACE_THREAD_EXIT_LOCK,
       ACE_TOKEN_MANAGER_CREATION_LOCK,
       ACE_TOKEN_INVARIANTS_CREATION_LOCK,
-      ACE_PROACTOR_EVENT_LOOP_LOCK,
+      ACE_TSS_CLEANUP_LOCK,
+# if defined (ACE_HAS_TSS_EMULATION) && defined (ACE_HAS_THREAD_SPECIFIC_STORAGE)
+      ACE_TSS_BASE_LOCK,
+# endif /* ACE_HAS_TSS_EMULATION && ACE_HAS_THREAD_SPECIFIC_STORAGE */
 #endif /* ACE_MT_SAFE */
 
       // Hook for preallocated objects provided by application.
@@ -285,12 +348,43 @@ public:
   // ace/Managed_Object.h for information on accessing preallocated
   // arrays.
 
+  static int starting_up (void);
+  // Returns 1 before ACE_Object_Manager has been constructed.  This
+  // flag can be used to determine if the program is constructing
+  // static objects.  If no static object spawns any threads, the
+  // program will be single-threaded when this flag returns 1.  (Note
+  // that the program still might construct some static objects when
+  // this flag returns 0, if ACE_HAS_NONSTATIC_OBJECT_MANAGER is not
+  // defined.)
+
+  static int shutting_down (void);
+  // Returns 1 after ACE_Object_Manager has been destroyed.  This flag
+  // can be used to determine if the program is in the midst of
+  // destroying static objects.  (Note that the program might destroy
+  // some static objects before this flag can return 1, if
+  // ACE_HAS_NONSTATIC_OBJECT_MANAGER is not defined.)
+
   static ACE_Sig_Set &default_mask (void);
   // Accesses a default signal set used in ACE_Sig_Guard methods.
 
 private:
-  ACE_Unbounded_Queue<ACE_Cleanup_Info> *registered_objects_;
-  // Keeps track of all registered objects.
+  static ACE_Object_Manager *instance_;
+  // Singleton pointer.
+
+  static int starting_up_;
+  // Flag indicating whether the program is starting up.
+
+  static int shutting_down_;
+  // Flag indicating whether the program is shutting down.
+
+  static u_int initialized_;
+  // Flag to allow graceful handling of multiple calls to init ().
+
+  u_int dynamically_allocated_;
+  // Flag indicating whether the ACE_Object_Manager was dynamically
+  // allocated by ACE.  (If is was dynamically allocated by the
+  // application, then the application is responsible for destroying
+  // it.)
 
   ACE_Object_Manager_Preallocations *preallocations_;
   // Preallocated objects collection.
@@ -305,37 +399,6 @@ private:
   // Register an object or array for deletion at program termination.
   // See description of static version above for return values.
 
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-public:
-  // = The <get_singleton_lock> accessors are for internal
-  // use by ACE_Singleton _only_.
-
-  static int get_singleton_lock (ACE_Null_Mutex *&);
-  // Accesses an <ACE_Null_Mutex> to be used for construction of
-  // <ACE_Singletons>.  Returns 0, and the lock in the argument, on
-  // success; returns -1 on failure.
-
-  static int get_singleton_lock (ACE_Thread_Mutex *&);
-  // Accesses a non-recursive <ACE_Thread_Mutex> to be used for
-  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
-  // argument, on success; returns -1 on failure.
-
-  static int get_singleton_lock (ACE_Mutex *&);
-  // Accesses a non-recursive <ACE_Mutex> to be used for construction
-  // of <ACE_Singletons>.  Returns 0, and the lock in the argument, on
-  // success; returns -1 on failure.
-
-  static int get_singleton_lock (ACE_Recursive_Thread_Mutex *&);
-  // Accesses a recursive <ACE_Recursive_Thread_Mutex> to be used for
-  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
-  // argument, on success; returns -1 on failure.
-
-  static int get_singleton_lock (ACE_RW_Thread_Mutex *&);
-  // Accesses a readers/writer <ACE_RW_Thread_Mutex> to be used for
-  // construction of <ACE_Singletons>.  Returns 0, and the lock in the
-  // argument, on success; returns -1 on failure.
-#endif /* ACE_MT_SAFE */
-
 public:
   // For internal use only by ACE_Managed_Objects.
 
@@ -359,28 +422,13 @@ public:
   ~ACE_Object_Manager (void);
 
 private:
-  static ACE_Object_Manager *instance_;
-  // Singleton pointer.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Recursive_Thread_Mutex *internal_lock_;
-  // Lock that is used to guard internal structures.
-
-  ACE_Cleanup_Adapter<ACE_Null_Mutex> *singleton_null_lock_;
-  // Null lock for guarding singleton creation.
-
-  ACE_Cleanup_Adapter<ACE_Recursive_Thread_Mutex> *singleton_recursive_lock_;
-  // Lock for guarding singleton creation, when Object_Manager
-  // hasn't been started up, or has already been shut down.
-#endif /* ACE_MT_SAFE */
-
 #if defined (ACE_HAS_TSS_EMULATION)
   // Main thread's thread-specific storage array.
   void *ts_storage_[ACE_TSS_Emulation::ACE_TSS_THREAD_KEYS_MAX];
 #endif /* ACE_HAS_TSS_EMULATION */
 
 #if !defined (ACE_HAS_NONSTATIC_OBJECT_MANAGER)
-  friend class ACE_Object_Manager_Manager;
+  friend class ACE_Object_Manager_Destroyer;
 #endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER */
 
   // Disallow copying by not implementing the following . . .
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp
deleted file mode 100644
index 6c3683ed4fb..00000000000
--- a/ace/POSIX_Asynch_IO.cpp
+++ /dev/null
@@ -1,3333 +0,0 @@
-// $Id$
-
-#include "ace/POSIX_Asynch_IO.h"
-
-#if defined (ACE_HAS_AIO_CALLS)
-
-
-#include "ace/Proactor.h"
-#include "ace/Message_Block.h"
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/Task_T.h"
-#include "ace/POSIX_Proactor.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/POSIX_Asynch_IO.i"
-#endif /* __ACE_INLINE__ */
-
-u_long
-ACE_POSIX_Asynch_Result::bytes_transferred (void) const
-{
-  return this->bytes_transferred_;
-}
-
-const void *
-ACE_POSIX_Asynch_Result::act (void) const
-{
-  return this->act_;
-}
-
-int
-ACE_POSIX_Asynch_Result::success (void) const
-{
-  return this->success_;
-}
-
-const void *
-ACE_POSIX_Asynch_Result::completion_key (void) const
-{
-  return this->completion_key_;
-}
-
-u_long
-ACE_POSIX_Asynch_Result::error (void) const
-{
-  return this->error_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Result::event (void) const
-{
-  return ACE_INVALID_HANDLE;
-}
-
-u_long
-ACE_POSIX_Asynch_Result::offset (void) const
-{
-  return this->aio_offset;
-}
-
-u_long
-ACE_POSIX_Asynch_Result::offset_high (void) const
-{
-  //
-  // @@ Support aiocb64??
-  //
-  ACE_NOTSUP_RETURN (0);
-}
-
-int
-ACE_POSIX_Asynch_Result::priority (void) const
-{
-  return this->aio_reqprio;
-}
-
-int
-ACE_POSIX_Asynch_Result::signal_number (void) const
-{
-  return this->aio_sigevent.sigev_signo;
-}
-
-int
-ACE_POSIX_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor_impl)
-{
-  // Get to the platform specific implementation.
-  ACE_POSIX_Proactor *posix_proactor = ACE_dynamic_cast (ACE_POSIX_Proactor *,
-                                                         proactor_impl);
-
-  if (posix_proactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to POSIX Proactor failed\n"), -1);
-
-  // Post myself.
-  return posix_proactor->post_completion (this);
-}
-
-ACE_POSIX_Asynch_Result::~ACE_POSIX_Asynch_Result (void)
-{
-}
-
-ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result (ACE_Handler &handler,
-                                                  const void* act,
-                                                  ACE_HANDLE event,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  int priority,
-                                                  int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    aiocb (),
-    handler_ (handler),
-    act_ (act),
-    success_ (0),
-    completion_key_ (0)
-{
-  aio_offset = offset;
-  aio_reqprio = priority;
-  aio_sigevent.sigev_signo = signal_number;
-
-  // Event is not used on POSIX.
-ACE_UNUSED_ARG (event);
-
-  //
-  // @@ Support offset_high with aiocb64.
-  //
-  ACE_UNUSED_ARG (offset_high);
-
-  // Other fields in the <aiocb> will be initialized by the
-  // subclasses.
-}
-
-// ****************************************************************
-
-int
-ACE_POSIX_Asynch_Operation::open (ACE_Handler &handler,
-                                  ACE_HANDLE handle,
-                                  const void *completion_key,
-                                  ACE_Proactor *proactor)
-{
-  this->proactor_ = proactor;
-  this->handler_ = &handler;
-  this->handle_ = handle;
-
-  // Grab the handle from the <handler> if <handle> is invalid
-  if (this->handle_ == ACE_INVALID_HANDLE)
-    this->handle_ = this->handler_->handle ();
-  if (this->handle_ == ACE_INVALID_HANDLE)
-    return -1;
-
-#if 0
-  // @@ If <proactor> is 0, let us not bother about getting this
-  // Proactor, we have already got the specific implementation
-  // Proactor.
-
-  // If no proactor was passed
-  if (this->proactor_ == 0)
-    {
-      // Grab the proactor from the <Service_Config> if
-      // <handler->proactor> is zero
-      this->proactor_ = this->handler_->proactor ();
-      if (this->proactor_ == 0)
-        this->proactor_ = ACE_Proactor::instance();
-    }
-#endif /* 0 */
-
-  // AIO stuff is present. So no registering.
-  ACE_UNUSED_ARG (completion_key);
-  return 0;
-}
-
-int
-ACE_POSIX_Asynch_Operation::cancel (void)
-{
-  // @@ Not implemented.
-  ACE_NOTSUP_RETURN (0);
-}
-
-ACE_Proactor *
-ACE_POSIX_Asynch_Operation::proactor (void) const
-{
-  return this->proactor_;
-}
-
-ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void)
-{
-}
-
-ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (void)
-  : ACE_Asynch_Operation_Impl (),
-    handler_ (0),
-    handle_ (ACE_INVALID_HANDLE)
-{
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Proactor *
-ACE_POSIX_AIOCB_Asynch_Operation::posix_proactor (void) const
-{
-  return this->posix_aiocb_proactor_;
-}
-
-ACE_POSIX_AIOCB_Asynch_Operation::ACE_POSIX_AIOCB_Asynch_Operation (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_POSIX_Asynch_Operation (),
-    posix_aiocb_proactor_ (posix_aiocb_proactor)
-{
-}
-
-ACE_POSIX_AIOCB_Asynch_Operation::~ACE_POSIX_AIOCB_Asynch_Operation (void)
-{
-}
-
-// If the ptr is o, just check whether there is any slot free and
-// return 0 if yes, else return -1. If a valid ptr is passed, keep it
-// in a free slot.
-int
-ACE_POSIX_AIOCB_Asynch_Operation::register_aio_with_proactor (ACE_POSIX_Asynch_Result *result)
-{
-  return this->posix_proactor ()->register_aio_with_proactor (result);
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Proactor *
-ACE_POSIX_SIG_Asynch_Operation::posix_proactor (void) const
-{
-  return this->posix_sig_proactor_;
-}
-
-ACE_POSIX_SIG_Asynch_Operation::ACE_POSIX_SIG_Asynch_Operation (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_POSIX_Asynch_Operation (),
-    posix_sig_proactor_ (posix_sig_proactor)
-{
-}
-
-ACE_POSIX_SIG_Asynch_Operation::~ACE_POSIX_SIG_Asynch_Operation (void)
-{
-}
-
-// *********************************************************************
-
-u_long
-ACE_POSIX_Asynch_Read_Stream_Result::bytes_to_read (void) const
-{
-  return this->aio_nbytes;
-}
-
-ACE_Message_Block &
-ACE_POSIX_Asynch_Read_Stream_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Read_Stream_Result::handle (void) const
-{
-  return this->aio_fildes;
-}
-
-ACE_POSIX_Asynch_Read_Stream_Result::ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                                                          ACE_HANDLE handle,
-                                                                          ACE_Message_Block &message_block,
-                                                                          u_long bytes_to_read,
-                                                                          const void* act,
-                                                                          ACE_HANDLE event,
-                                                                          int priority,
-                                                                          int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    message_block_ (message_block)
-{
-  this->aio_fildes = handle;
-  this->aio_buf = message_block.wr_ptr ();
-  this->aio_nbytes = bytes_to_read;
-  ACE_UNUSED_ARG (event);
-}
-
-void
-ACE_POSIX_Asynch_Read_Stream_Result::complete (u_long bytes_transferred,
-                                               int success,
-                                               const void *completion_key,
-                                               u_long error)
-{
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // <errno> is available in the aiocb.
-  ACE_UNUSED_ARG (error);
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Read_Stream::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_read_stream (result);
-}
-
-ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void)
-{
-}
-
-// = Base class operations. These operations are here to kill
-//   dominance warnings. These methods call the base class methods. 
-
-u_long
-ACE_POSIX_Asynch_Read_Stream_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Read_Stream_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Read_Stream_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Read_Stream_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_Stream_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Read_Stream_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_Stream_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_Stream_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Read_Stream_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-}
-
-int
-ACE_POSIX_Asynch_Read_Stream_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-}
-
-int
-ACE_POSIX_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// ************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Read_Stream::ACE_POSIX_AIOCB_Asynch_Read_Stream (ACE_POSIX_AIOCB_Proactor  *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Operation (posix_aiocb_proactor)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
-                                          u_long bytes_to_read,
-                                          const void *act,
-                                          int priority,
-                                          int signal_number)
-{
-  // Create the Asynch_Result.
-  ACE_POSIX_Asynch_Read_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_Stream_Result (*this->handler_,
-                                                       this->handle_,
-                                                       message_block,
-                                                       bytes_to_read,
-                                                       act,
-                                                       this->posix_proactor ()->get_handle (),
-                                                       priority,
-                                                       signal_number),
-                  -1);
-
-  ssize_t return_val = this->shared_read (result);
-  if (return_val == -1)
-    delete result;
-  return return_val;
-}
-
-ACE_POSIX_AIOCB_Asynch_Read_Stream::~ACE_POSIX_AIOCB_Asynch_Read_Stream (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_Stream::shared_read (ACE_POSIX_Asynch_Read_Stream_Result *result)
-{
-  // AIO_CONTROL_BLOCKS strategy.
-
-  // Store this <result> with the proactor.
-
-  // Make sure there is space in the aiocb list.
-  if (this->register_aio_with_proactor (0) == -1)
-    {
-      // @@ Set errno to EAGAIN so that applications will know this as
-      // a queueing failure and try again this aio_read it they want.
-      errno = EAGAIN;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Fatal error:%N:%l:%p\n",
-                         "AIOContol Block Array is full!!!. Didnt issue the aio call"),
-                        -1);
-    }
-
-  // Setup AIOCB.
-
-  // We are not making use of the RT signal queueing in this
-  // strategy.
-  result->aio_sigevent.sigev_notify = SIGEV_NONE;
-
-  // Fire off the aio read.
-  if (aio_read (result) == -1)
-    // Queueing failed.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Asynch_Read_Stream: aio_read queueing failed"),
-                      -1);
-
-  // <aio_read> successfully issued. Store the <result> with
-  // proactor.
-  if (this->register_aio_with_proactor (result) == -1)
-    // This shouldn't happen anyway, since we have already checked for
-    // availability of free slots.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Fatal error:%N:%l:%p\n",
-                       "AIOContol Block Array is full!!!. Didnt issue the aio call"),
-                      -1);
-
-  // <aio_read> successfully issued and ptr stored.
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route the
-// call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_Stream::open (ACE_Handler &handler,
-                                          ACE_HANDLE handle,
-                                          const void *completion_key,
-                                          ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_Stream::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Read_Stream::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Read_Stream::ACE_POSIX_SIG_Asynch_Read_Stream (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_POSIX_SIG_Asynch_Operation (posix_sig_proactor)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
-                                        u_long bytes_to_read,
-                                        const void *act,
-                                        int priority,
-                                        int signal_number)
-{
-  // Create the Asynch_Result.
-  ACE_POSIX_Asynch_Read_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_Stream_Result (*this->handler_,
-                                                       this->handle_,
-                                                       message_block,
-                                                       bytes_to_read,
-                                                       act,
-                                                       this->posix_sig_proactor_->get_handle (),
-                                                       priority,
-                                                       signal_number),
-                  -1);
-
-  ssize_t return_val = this->shared_read (result);
-  if (return_val == -1)
-    delete result;
-  return return_val;
-}
-
-ACE_POSIX_SIG_Asynch_Read_Stream::~ACE_POSIX_SIG_Asynch_Read_Stream (void)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_Stream::shared_read (ACE_POSIX_Asynch_Read_Stream_Result *result)
-{
-  // Setup AIOCB.
-
-  // We want queuing of RT signal to notify completion.
-  result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  result->aio_sigevent.sigev_signo = result->signal_number ();
-  
-  // Keep ACE_POSIX_Asynch_Result, the base class pointer in the
-  // signal value. 
-  ACE_POSIX_Asynch_Result *base_result = result;
-  result->aio_sigevent.sigev_value.sival_ptr = ACE_reinterpret_cast (void *,
-                                                                     base_result);
-
-  // Fire off the aio read.
-  if (aio_read (result) == -1)
-    // Queueing failed.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N%l:%p\n",
-                       "Asynch_Read_Stream: aio_read queueing failed"),
-                      -1);
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route the
-// call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Read_Stream::open (ACE_Handler &handler,
-                                        ACE_HANDLE handle,
-                                        const void *completion_key,
-                                        ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_Stream::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Read_Stream::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// ****************************************************************
-
-u_long
-ACE_POSIX_Asynch_Write_Stream_Result::bytes_to_write (void) const
-{
-  return this->aio_nbytes;
-}
-
-ACE_Message_Block &
-ACE_POSIX_Asynch_Write_Stream_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Write_Stream_Result::handle (void) const
-{
-  return this->aio_fildes;
-}
-
-ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_write,
-                                                                            const void* act,
-                                                                            ACE_HANDLE event,
-                                                                            int priority,
-                                                                            int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    message_block_ (message_block)
-{
-  this->aio_fildes = handle;
-  this->aio_buf = message_block.rd_ptr ();
-  this->aio_nbytes = bytes_to_write;
-  ACE_UNUSED_ARG (event);
-}
-
-void
-ACE_POSIX_Asynch_Write_Stream_Result::complete (u_long bytes_transferred,
-                                                int success,
-                                                const void *completion_key,
-                                                u_long error)
-{
-  // Get all the data copied.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // <errno> is available in the aiocb.
-  ACE_UNUSED_ARG (error);
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.rd_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Write_Stream::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_write_stream (result);
-}
-
-ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_POSIX_Asynch_Write_Stream_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Write_Stream_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Write_Stream_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Write_Stream_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_Stream_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Write_Stream_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_Stream_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_Stream_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Write_Stream_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-}
-
-int
-ACE_POSIX_Asynch_Write_Stream_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-}
-
-int
-ACE_POSIX_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Write_Stream::ACE_POSIX_AIOCB_Asynch_Write_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Operation (posix_aiocb_proactor)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
-                                            u_long bytes_to_write,
-                                            const void *act,
-                                            int priority,
-                                            int signal_number)
-{
-  ACE_POSIX_Asynch_Write_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_Stream_Result (*this->handler_,
-                                                        this->handle_,
-                                                        message_block,
-                                                        bytes_to_write,
-                                                        act,
-                                                        this->posix_proactor ()->get_handle (),
-                                                        priority,
-                                                        signal_number),
-                  -1);
-
-  ssize_t return_val = this->shared_write (result);
-  if (return_val == -1)
-    delete result;
-  return return_val;
-}
-
-ACE_POSIX_AIOCB_Asynch_Write_Stream::~ACE_POSIX_AIOCB_Asynch_Write_Stream (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_Stream::shared_write (ACE_POSIX_Asynch_Write_Stream_Result *result)
-{
-  // AIO_CONTROL_BLOCKS strategy.
-
-  // Make sure there is space in the aiocb list.
-  if (this->register_aio_with_proactor (0) == -1)
-    {
-      // @@ Set errno to EAGAIN so that applications will know this as
-      // a queueing failure and try again this aio_read it they want.
-      errno = EAGAIN;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "Fatal error:%N:%l:%p\n",
-                         "AIOContol Block Array is full!!!. Didnt issue the aio call"),
-                        -1);
-    }
-
-  // Setup AIOCB.
-  result->aio_sigevent.sigev_notify = SIGEV_NONE;
-
-  // Fire off the aio write.
-  if (aio_write (result) == -1)
-    // Queueing failed.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Asynch_Write_Stream: aio_write queueing failed"),
-                      -1);
-
-  // Success. Store the <result> with Proactor.
-  if (this->register_aio_with_proactor (result) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Fatal error:%N:%l:%p\n",
-                       "AIOContol Block Array is full!!!"),
-                      -1);
-
-  // Aio successfully issued.
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_Stream::open (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     const void *completion_key,
-                                     ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_Stream::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Write_Stream::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Write_Stream::ACE_POSIX_SIG_Asynch_Write_Stream (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_POSIX_SIG_Asynch_Operation (posix_sig_proactor)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
-                                          u_long bytes_to_write,
-                                          const void *act,
-                                          int priority,
-                                          int signal_number)
-{
-  ACE_POSIX_Asynch_Write_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_Stream_Result (*this->handler_,
-                                                        this->handle_,
-                                                        message_block,
-                                                        bytes_to_write,
-                                                        act,
-                                                        this->posix_sig_proactor_->get_handle (),
-                                                        priority,
-                                                        signal_number),
-                  -1);
-
-  ssize_t return_val = this->shared_write (result);
-  if (return_val == -1)
-    delete result;
-  return return_val;
-}
-
-ACE_POSIX_SIG_Asynch_Write_Stream::~ACE_POSIX_SIG_Asynch_Write_Stream (void)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_Stream::shared_write (ACE_POSIX_Asynch_Write_Stream_Result *result)
-{
-  // Setup AIOCB.
-
-  // We want queuing of RT signal to notify completion.
-  result->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
-  result->aio_sigevent.sigev_signo = result->signal_number ();
-
-  // Keep ACE_POSIX_Asynch_Result, the base class pointer in the
-  // signal value. 
-  ACE_POSIX_Asynch_Result *base_result = result;
-  result->aio_sigevent.sigev_value.sival_ptr = ACE_reinterpret_cast (void *,
-                                                                     base_result);
-
-  // Fire off the aio write.
-  if (aio_write (result) == -1)
-    // Queueing failed.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Asynch_Write_Stream: aio_write queueing failed"),
-                      -1);
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Write_Stream::open (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     const void *completion_key,
-                                     ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_Stream::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Write_Stream::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *************************************************************
-
-ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result (ACE_Handler &handler,
-                                                                      ACE_HANDLE handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      u_long offset,
-                                                                      u_long offset_high,
-                                                                      ACE_HANDLE event,
-                                                                      int priority,
-                                                                      int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_Asynch_Read_File_Result_Impl (),
-    ACE_POSIX_Asynch_Read_Stream_Result (handler,
-                                         handle,
-                                         message_block,
-                                         bytes_to_read,
-                                         act,
-                                         event,
-                                         priority,
-                                         signal_number)
-{
-  this->aio_offset = offset;
-  //
-  // @@ Use aiocb64??
-  //
-  ACE_UNUSED_ARG (offset_high);
-}
-
-void
-ACE_POSIX_Asynch_Read_File_Result::complete (u_long bytes_transferred,
-                                             int success,
-                                             const void *completion_key,
-                                             u_long error)
-{
-  // Copy all the data.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // <errno> is available in the aiocb.
-  ACE_UNUSED_ARG (error);
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Read_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_read_file (result);
-}
-
-ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_POSIX_Asynch_Read_File_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Read_File_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Read_File_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Read_File_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_File_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Read_File_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_File_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Read_File_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Read_File_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-}
-
-int
-ACE_POSIX_Asynch_Read_File_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-}
-
-// The following methods belong to
-// ACE_POSIX_Asynch_Read_Stream_Result. They are here to avoid
-// dominace warnings. These methods route their call to the 
-// ACE_POSIX_Asynch_Read_Stream_Result base class.
-
-u_long
-ACE_POSIX_Asynch_Read_File_Result::bytes_to_read (void) const
-{
-  return ACE_POSIX_Asynch_Read_Stream_Result::bytes_to_read ();
-}
-
-ACE_Message_Block &
-ACE_POSIX_Asynch_Read_File_Result::message_block (void) const
-{
-  return ACE_POSIX_Asynch_Read_Stream_Result::message_block ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Read_File_Result::handle (void) const
-{
-  return ACE_POSIX_Asynch_Read_Stream_Result::handle ();
-}
-
-int
-ACE_POSIX_Asynch_Read_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Read_File::ACE_POSIX_AIOCB_Asynch_Read_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_Asynch_Read_File_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Read_Stream (posix_aiocb_proactor)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                        u_long bytes_to_read,
-                                        u_long offset,
-                                        u_long offset_high,
-                                        const void *act,
-                                        int priority,
-                                        int signal_number)
-{
-  ACE_POSIX_Asynch_Read_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_File_Result (*this->handler_,
-                                                     this->handle_,
-                                                     message_block,
-                                                     bytes_to_read,
-                                                     act,
-                                                     offset,
-                                                     offset_high,
-                                                     this->posix_proactor ()->get_handle (),
-                                                     priority,
-                                                     signal_number),
-                  -1);
-
-  return this->shared_read (result);
-}
-
-ACE_POSIX_AIOCB_Asynch_Read_File::~ACE_POSIX_AIOCB_Asynch_Read_File (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                        u_long bytes_to_read,
-                                        const void *act,
-                                        int priority,
-                                        int signal_number)
-{
-  return ACE_POSIX_AIOCB_Asynch_Read_Stream::read (message_block,
-                                                   bytes_to_read,
-                                                   act,
-                                                   priority,
-                                                   signal_number);
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_File::open (ACE_Handler &handler,
-                                        ACE_HANDLE handle,
-                                        const void *completion_key,
-                                        ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Read_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Read_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// ************************************************************
-
-ACE_POSIX_SIG_Asynch_Read_File::ACE_POSIX_SIG_Asynch_Read_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_Asynch_Read_File_Impl (),
-    ACE_POSIX_SIG_Asynch_Read_Stream (posix_sig_proactor)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                      u_long bytes_to_read,
-                                      u_long offset,
-                                      u_long offset_high,
-                                      const void *act,
-                                      int priority,
-                                      int signal_number)
-{
-  ACE_POSIX_Asynch_Read_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Read_File_Result (*this->handler_,
-                                                     this->handle_,
-                                                     message_block,
-                                                     bytes_to_read,
-                                                     act,
-                                                     offset,
-                                                     offset_high,
-                                                     this->posix_sig_proactor_->get_handle (),
-                                                     priority,
-                                                     signal_number),
-                  -1);
-
-  return this->shared_read (result);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                      u_long bytes_to_read,
-                                      const void *act,
-                                      int priority,
-                                      int signal_number)
-{
-  return ACE_POSIX_SIG_Asynch_Read_Stream::read (message_block,
-                                                 bytes_to_read,
-                                                 act,
-                                                 priority,
-                                                 signal_number);
-}
-
-ACE_POSIX_SIG_Asynch_Read_File::~ACE_POSIX_SIG_Asynch_Read_File (void)
-{
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Read_File::open (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      const void *completion_key,
-                                      ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Read_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Read_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// ************************************************************
-
-ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result (ACE_Handler &handler,
-                                                                        ACE_HANDLE handle,
-                                                                        ACE_Message_Block &message_block,
-                                                                        u_long bytes_to_write,
-                                                                        const void* act,
-                                                                        u_long offset,
-                                                                        u_long offset_high,
-                                                                        ACE_HANDLE event,
-                                                                        int priority,
-                                                                        int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_Asynch_Write_File_Result_Impl (),
-    ACE_POSIX_Asynch_Write_Stream_Result (handler,
-                                          handle,
-                                          message_block,
-                                          bytes_to_write,
-                                          act,
-                                          event,
-                                          priority,
-                                          signal_number)
-{
-  this->aio_offset = offset;
-  //
-  // @@ Support offset_high with aiocb64.
-  //
-  ACE_UNUSED_ARG (offset_high);
-}
-
-void
-ACE_POSIX_Asynch_Write_File_Result::complete (u_long bytes_transferred,
-                                              int success,
-                                              const void *completion_key,
-                                              u_long error)
-{
-  // Copy the data.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // <error> is available in <aio_resultp.aio_error>
-  ACE_UNUSED_ARG (error);
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.rd_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Write_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_write_file (result);
-}
-
-ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result  (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_POSIX_Asynch_Write_File_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Write_File_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Write_File_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Write_File_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_File_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Write_File_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_File_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Write_File_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Write_File_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-} 
-
-int
-ACE_POSIX_Asynch_Write_File_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-} 
-
-// The following methods belong to
-// ACE_POSIX_Asynch_Write_Stream_Result. They are here to avoid
-// dominance warnings. These methods route their call to the 
-// ACE_POSIX_Asynch_Write_Stream_Result base class.
-
-u_long
-ACE_POSIX_Asynch_Write_File_Result::bytes_to_write (void) const
-{
-  return ACE_POSIX_Asynch_Write_Stream_Result::bytes_to_write ();
-}
-
-ACE_Message_Block &
-ACE_POSIX_Asynch_Write_File_Result::message_block (void) const
-{
-  return ACE_POSIX_Asynch_Write_Stream_Result::message_block ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Write_File_Result::handle (void) const
-{
-  return ACE_POSIX_Asynch_Write_Stream_Result::handle ();
-}
-
-int
-ACE_POSIX_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Write_File::ACE_POSIX_AIOCB_Asynch_Write_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_Asynch_Write_File_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Write_Stream (posix_aiocb_proactor)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                          u_long bytes_to_write,
-                                          u_long offset,
-                                          u_long offset_high,
-                                          const void *act,
-                                          int priority,
-                                          int signal_number)
-{
-  ACE_POSIX_Asynch_Write_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_File_Result (*this->handler_,
-                                                      this->handle_,
-                                                      message_block,
-                                                      bytes_to_write,
-                                                      act,
-                                                      offset,
-                                                      offset_high,
-                                                      this->posix_proactor ()->get_handle (),
-                                                      priority,
-                                                      signal_number),
-                  -1);
-
-  return this->shared_write (result);
-}
-
-ACE_POSIX_AIOCB_Asynch_Write_File::~ACE_POSIX_AIOCB_Asynch_Write_File (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                          u_long bytes_to_write,
-                                          const void *act,
-                                          int priority,
-                                          int signal_number)
-{
-  return ACE_POSIX_AIOCB_Asynch_Write_Stream::write (message_block,
-                                                     bytes_to_write,
-                                                     act,
-                                                     priority,
-                                                     signal_number);
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_File::open (ACE_Handler &handler,
-                                   ACE_HANDLE handle,
-                                   const void *completion_key,
-                                   ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Write_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Write_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Write_File::ACE_POSIX_SIG_Asynch_Write_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_Asynch_Write_File_Impl (),
-    ACE_POSIX_SIG_Asynch_Write_Stream (posix_sig_proactor)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                        u_long bytes_to_write,
-                                        u_long offset,
-                                        u_long offset_high,
-                                        const void *act,
-                                        int priority,
-                                        int signal_number)
-{
-  ACE_POSIX_Asynch_Write_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Write_File_Result (*this->handler_,
-                                                      this->handle_,
-                                                      message_block,
-                                                      bytes_to_write,
-                                                      act,
-                                                      offset,
-                                                      offset_high,
-                                                      this->posix_sig_proactor_->get_handle (),
-                                                      priority,
-                                                      signal_number),
-                  -1);
-
-  return this->shared_write (result);
-}
-
-ACE_POSIX_SIG_Asynch_Write_File::~ACE_POSIX_SIG_Asynch_Write_File (void)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                        u_long bytes_to_write,
-                                        const void *act,
-                                        int priority,
-                                        int signal_number)
-{
-  return ACE_POSIX_SIG_Asynch_Write_Stream::write (message_block,
-                                                   bytes_to_write,
-                                                   act,
-                                                   priority,
-                                                   signal_number);
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Write_File::open (ACE_Handler &handler,
-                                   ACE_HANDLE handle,
-                                   const void *completion_key,
-                                   ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Write_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Write_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-u_long
-ACE_POSIX_Asynch_Accept_Result::bytes_to_read (void) const
-{
-  return this->aio_nbytes;
-}
-
-ACE_Message_Block &
-ACE_POSIX_Asynch_Accept_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Accept_Result::listen_handle (void) const
-{
-  return this->listen_handle_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Accept_Result::accept_handle (void) const
-{
-  return this->aio_fildes;
-}
-
-ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result (ACE_Handler &handler,
-                                                                ACE_HANDLE listen_handle,
-                                                                ACE_HANDLE accept_handle,
-                                                                ACE_Message_Block &message_block,
-                                                                u_long bytes_to_read,
-                                                                const void* act,
-                                                                ACE_HANDLE event,
-                                                                int priority,
-                                                                int signal_number)
-
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Accept_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    message_block_ (message_block),
-    listen_handle_ (listen_handle)
-{
-  this->aio_fildes = accept_handle;
-  this->aio_nbytes = bytes_to_read;
-}
-
-void
-ACE_POSIX_Asynch_Accept_Result::complete (u_long bytes_transferred,
-                                          int success,
-                                          const void *completion_key,
-                                          u_long error)
-{
-  // Copy the data.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Accept::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_accept (result);
-}
-
-ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_POSIX_Asynch_Accept_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Accept_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Accept_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Accept_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Accept_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Accept_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Accept_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Accept_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Accept_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-}
-
-int
-ACE_POSIX_Asynch_Accept_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-}
-
-int
-ACE_POSIX_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// *********************************************************************
-
-class ACE_Export ACE_POSIX_Asynch_Accept_Handler : public ACE_Event_Handler
-{
-  // = TITLE
-  //     For the POSIX implementation, we have two helper classes
-  //     (ACE_POSIX_AIOCB_Asynch_Accept_Hander and
-  //     ACE_POSIX_SIG_Asynch_Accept_Handler) to do <Asynch_Accept>. This
-  //     class abstracts out the commonalities on these two helper classes.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ~ACE_POSIX_Asynch_Accept_Handler (void);
-  // Destructor.
-
-protected:
-  ACE_POSIX_Asynch_Accept_Handler (ACE_Reactor* reactor,
-                                   ACE_POSIX_Proactor *posix_proactor);
-  // Constructor. Give the reactor so that it can activate/deactivate
-  // the handlers. Give also the proactor used here, so that the
-  // handler can send the <POSIX_Asynch_Accept> result block through
-  // <post_completion>. 
-
-  int register_accept_call_i (ACE_POSIX_Asynch_Accept_Result* result);
-  // Worker method for registering this <accept> call with the local
-  // handler. This method has the common code found between the two
-  // differnt implementation subclasses. This method assumes that
-  // locks are already obtained to access the shared the queues.
-
-  ACE_POSIX_Asynch_Accept_Result* deregister_accept_call (void);
-  // Method for deregistering.
-
-  ACE_Reactor* reactor_;
-  // Reactor used by the Asynch_Accept. We need this here to enable
-  // and disable the <handle> now and then, depending on whether any
-  // <accept> is pending or no.
-
-  ACE_POSIX_Proactor *posix_proactor_;
-  // POSIX_Proactor.
-  
-  ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result*> result_queue_;
-  // Queue of Result pointers that correspond to all the <accept>'s
-  // pending.
-
-  ACE_SYNCH_MUTEX lock_;
-  // The lock to protect the  result queue which is shared. The queue
-  // is updated by main thread in the register function call and
-  // through the auxillary thread  in the deregister fun. So let us
-  // mutex it.
-};
-
-// *********************************************************************
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Accept_Handler : public ACE_POSIX_Asynch_Accept_Handler
-{
-  // = TITLE
-  //     For the POSIX implementation, this class takes care of doing
-  //     <Asynch_Accept> for AIOCB strategy.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_AIOCB_Asynch_Accept_Handler (ACE_Reactor *reactor,
-                                         ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor. Give the reactor so that it can activate/deactivate
-  // the handlers. Give also the proactor used here, so that the
-  // handler can send information through the notification pipe
-  // (<post_completion>). 
-
-  ~ACE_POSIX_AIOCB_Asynch_Accept_Handler (void);
-  // Destructor.
-  
-  int register_accept_call (ACE_POSIX_Asynch_Accept_Result* result);
-  // Register this <accept> call with the local handler.
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // Called when accept event comes up on the <listen_handle>.
-};
-
-// *********************************************************************
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Accept_Handler : public ACE_POSIX_Asynch_Accept_Handler
-{
-  // = TITLE
-  //     For the POSIX implementation, this class takes care of doing
-  //     Asynch_Accept.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Asynch_Accept_Handler (ACE_Reactor* reactor,
-                                       ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor. Give the reactor so that it can activate/deactivate
-  // the handlers. Give also the proactor used here, so that the
-  // handler can send information through <post_completion>.
-
-  ~ACE_POSIX_SIG_Asynch_Accept_Handler (void);
-  // Destructor.
-
-  int register_accept_call (ACE_POSIX_Asynch_Accept_Result* result);
-  // Register this <accept> call with the local handler.
-
-  virtual int handle_input (ACE_HANDLE fd = ACE_INVALID_HANDLE);
-  // Called when accept event comes up on the <listen_handle>.
-};
-
-// *********************************************************************
-
-ACE_POSIX_Asynch_Accept_Handler::ACE_POSIX_Asynch_Accept_Handler (ACE_Reactor* reactor,
-                                                                  ACE_POSIX_Proactor *posix_proactor)
-  : reactor_ (reactor),
-    posix_proactor_ (posix_proactor)
-{
-}
-
-ACE_POSIX_Asynch_Accept_Handler::~ACE_POSIX_Asynch_Accept_Handler (void)
-{
-}
-
-int
-ACE_POSIX_Asynch_Accept_Handler::register_accept_call_i (ACE_POSIX_Asynch_Accept_Result* result)
-{
-  // Insert this result to the queue.
-  int insert_result = this->result_queue_.enqueue_tail (result);
-  if (insert_result == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:ACE_POSIX_Asynch_Accept_Handler::register_accept_call failed\n"),
-                      -1);
-
-  // If this is the only item, then it means there the set was empty
-  // before. So enable the <handle> in the reactor.
-  if (this->result_queue_.size () == 1)
-    {
-      int return_val = this->reactor_->resume_handler (result->listen_handle ());
-      if (return_val == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:ACE_POSIX_Asynch_Accept_Handler::register_accept_call: "
-                           "Reactor::resume_handler failed\n"),
-                          -1);
-    }
-  
-  return 0;
-}
-
-ACE_POSIX_Asynch_Accept_Result *
-ACE_POSIX_Asynch_Accept_Handler::deregister_accept_call (void)
-{
-  // The queue is updated by main thread in the register function call and
-  // thru the auxillary thread  in the deregister fun. So let us mutex
-  // it.
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-  // Get the first item (result ptr) from the Queue.
-  ACE_POSIX_Asynch_Accept_Result* result = 0;
-  if (this->result_queue_.dequeue_head (result) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_POSIX_Asynch_Accept_Handler::"
-                       "deregister_accept_call:dequeueing failed"),
-                      0);
-
-  ACE_ASSERT (result != 0);
-
-  // Disable the <handle> in the reactor if no <accept>'s are pending.
-  if (this->result_queue_.size () == 0)
-    {
-      if (this->reactor_->suspend_handler (result->listen_handle ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t):%p\n",
-                           "ACE_POSIX_Asynch_Accept_Handler::"
-                           "deregister_accept_call:suspend handler failed"),
-                          0);  
-    }
-
-  // Return the result pointer.
-  return result;
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Accept_Handler::ACE_POSIX_AIOCB_Asynch_Accept_Handler (ACE_Reactor* reactor,
-                                                                              ACE_POSIX_AIOCB_Proactor* posix_aiocb_proactor)
-  : ACE_POSIX_Asynch_Accept_Handler (reactor, posix_aiocb_proactor)
-{
-}
-
-ACE_POSIX_AIOCB_Asynch_Accept_Handler::~ACE_POSIX_AIOCB_Asynch_Accept_Handler (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Accept_Handler::register_accept_call (ACE_POSIX_Asynch_Accept_Result* result)
-{
-  // The queue is updated by main thread in the register function call
-  // and thru the auxillary thread in the deregister fun. So let us
-  // mutex it.
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-
-  return register_accept_call_i (result);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
-{
-  // An <accept> has been sensed on the <listen_handle>. We should be
-  // able to just go ahead and do the <accept> now on this <fd>. This
-  // should be the same as the <listen_handle>.
-
-  // Deregister this info pertaining to this <accept> call.
-  ACE_POSIX_Asynch_Accept_Result* result = this->deregister_accept_call ();
-  if (result == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_POSIX_AIOCB_Asynch_Accept_Handler::"
-                       "handle_input:deregister_accept_call failed"),
-                      -1);
-
-  // Issue <accept> now.
-  // @@ We shouldnt block here since we have already done poll/select
-  // thru reactor. But are we sure?
-  ACE_HANDLE new_handle = ACE_OS::accept (result->listen_handle (), 0, 0);
-  if (new_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_POSIX_AIOCB_Asynch_Accept_Handler::"
-                       "handle_input:<accept> system call failed"),
-                      -1);
-
-  // Accept has completed.
-
-  // Store the new handle.
-  result->aio_fildes = new_handle;
-
-  // Notify the main process about this completion
-  // Send the Result through the notification pipe.
-  if (this->posix_proactor_->post_completion (result) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "ACE_POSIX_AIOCB_Asynch_Accept_Handler::"
-                       "handle_input:<post_completion> failed"),
-                      -1);
-  
-  return 0;
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Accept_Handler::ACE_POSIX_SIG_Asynch_Accept_Handler (ACE_Reactor* reactor,
-                                                                          ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_POSIX_Asynch_Accept_Handler (reactor, posix_sig_proactor)
-{
-}
-
-ACE_POSIX_SIG_Asynch_Accept_Handler::~ACE_POSIX_SIG_Asynch_Accept_Handler (void)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Accept_Handler::register_accept_call (ACE_POSIX_Asynch_Accept_Result* result)
-{
-  // The queue is updated by main thread in the register function call
-  // and thru the auxillary thread in the deregister fun. So let us
-  // mutex it.
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
-  
-  // Do the work.
-  if (this->register_accept_call_i (result) == -1)
-    return -1;
-  
-  return 0;
-}
-
-int
-ACE_POSIX_SIG_Asynch_Accept_Handler::handle_input (ACE_HANDLE /* fd */)
-{
-  // An <accept> has been sensed on the <listen_handle>. We should be
-  // able to just go ahead and do the <accept> now on this <fd>. This
-  // should be the same as the <listen_handle>.
-  
-  // Deregister this info pertaining to this <accept> call.
-  ACE_POSIX_Asynch_Accept_Result* result = this->deregister_accept_call ();
-  if (result == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_POSIX_SIG_Asynch_Accept_Handler::"
-                       "handle_input:deregister_accept_call failed"),
-                      -1);
-  
-  // Issue <accept> now.
-  // @@ We shouldnt block here since we have already done poll/select
-  // thru reactor. But are we sure?
-  ACE_HANDLE new_handle = ACE_OS::accept (result->listen_handle (), 0, 0);
-  if (new_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "ACE_POSIX_SIG_Asynch_Accept_Handler::"
-                       "handle_input:<accept> system call failed"),
-                      -1);
-
-  // Accept has completed.
-  
-  // Store the new handle.
-  result->aio_fildes = new_handle;
-
-  // Notify the main process about this completion.
-  if (this->posix_proactor_->post_completion (result) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "ACE_POSIX_SIG_Asynch_Accept_Handler::"
-                       "handle_input:<post_completion> failed"),
-                      -1);
-  
-  return 0;
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Accept::ACE_POSIX_AIOCB_Asynch_Accept (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Accept_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Operation (posix_aiocb_proactor),
-    accept_handler_ (0)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Accept::accept (ACE_Message_Block &message_block,
-                                       u_long bytes_to_read,
-                                       ACE_HANDLE accept_handle,
-                                       const void *act,
-                                       int priority,
-                                       int signal_number)
-{
-  // Sanity check: make sure that enough space has been allocated by
-  // the caller.
-  size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr);
-  size_t space_in_use = message_block.wr_ptr () - message_block.base ();
-  size_t total_size = message_block.size ();
-  size_t available_space = total_size - space_in_use;
-  size_t space_needed = bytes_to_read + 2 * address_size;
-  if (available_space < space_needed)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Buffer too small\n")), -1);
-
-  // Common code for both WIN and POSIX.
-  ACE_POSIX_Asynch_Accept_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Accept_Result (*this->handler_,
-                                                  this->handle_,
-                                                  accept_handle,
-                                                  message_block,
-                                                  bytes_to_read,
-                                                  act,
-                                                  this->posix_proactor ()->get_handle (),
-                                                  priority,
-                                                  signal_number),
-                  -1);
-
-  // Register this <accept> call with the local handler.
-  if (this->accept_handler_->register_accept_call (result) == -1)
-    return -1;
-  
-  return 0;
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Accept::open (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     const void *completion_key,
-                                     ACE_Proactor *proactor)
-{
-  int result = ACE_POSIX_Asynch_Operation::open (handler,
-                                                 handle,
-                                                 completion_key,
-                                                 proactor);
-  if (result == -1)
-    return result;
-
-  // Init the Asynch_Accept_Handler now. It needs to keep Proactor
-  // also with it.
-  ACE_NEW_RETURN (this->accept_handler_,
-                  ACE_POSIX_AIOCB_Asynch_Accept_Handler (&this->reactor_,
-                                                         this->posix_proactor ()),
-                  -1);
-
-  // Register the handle with the reactor.
-  int return_val = this->reactor_.register_handler (this->handle_,
-                                                    this->accept_handler_,
-                                                    ACE_Event_Handler::ACCEPT_MASK);
-  if (return_val == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Reactor::register_handler failed\n"),
-                      -1);
-
-  // Suspend the <handle> now. Enable only when the <accept> is issued
-  // by the application.
-  return_val = this->reactor_.suspend_handler (this->handle_);
-  if (return_val == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Reactor::suspend_handler failed\n"),
-                      -1);
-
-  // Spawn the thread. It is the only thread we are going to have. It
-  // will do the <handle_events> on the reactor.
-  return_val = ACE_Thread_Manager::instance ()->spawn (ACE_POSIX_AIOCB_Asynch_Accept::thread_function,
-                                                       ACE_reinterpret_cast (void *, &this->reactor_));
-  if (return_val  == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Thread_Manager::spawn failed\n"),
-                      -1);
-
-  return 0;
-}
-
-ACE_POSIX_AIOCB_Asynch_Accept::~ACE_POSIX_AIOCB_Asynch_Accept (void)
-{
-}
-
-void*
-ACE_POSIX_AIOCB_Asynch_Accept::thread_function (void* arg_reactor)
-{
-  // Retrieve the reactor pointer from the argument.
-  ACE_Reactor* reactor = ACE_reinterpret_cast (ACE_Reactor *,
-                                               arg_reactor);
-
-  // It should be valid Reactor, since we have a reactor_ ,e,ner we
-  // are passing only that one here.
-  if (reactor == 0)
-    ACE_ERROR ((LM_ERROR,
-                "%n:%l:Invalid Reactor pointer passed to the thread_function\n",
-                0));
-
-  // For this reactor, this thread is the owner.
-  reactor->owner (ACE_OS::thr_self ());
-
-  // Handle events.
-  int result = 0;
-  while (result != -1)
-    {
-      result = reactor->handle_events ();
-    }
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Accept::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Accept::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Accept::ACE_POSIX_SIG_Asynch_Accept (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Accept_Impl (),
-    ACE_POSIX_SIG_Asynch_Operation (posix_sig_proactor),
-    accept_handler_ (0)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Accept::accept (ACE_Message_Block &message_block,
-                                     u_long bytes_to_read,
-                                     ACE_HANDLE accept_handle,
-                                     const void *act,
-                                     int priority,
-                                     int signal_number)
-{
-  // Sanity check: make sure that enough space has been allocated by
-  // the caller.
-  size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr);
-  size_t space_in_use = message_block.wr_ptr () - message_block.base ();
-  size_t total_size = message_block.size ();
-  size_t available_space = total_size - space_in_use;
-  size_t space_needed = bytes_to_read + 2 * address_size;
-  if (available_space < space_needed)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Buffer too small\n")), -1);
-
-  // Common code for both WIN and POSIX.
-  ACE_POSIX_Asynch_Accept_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Accept_Result (*this->handler_,
-                                                  this->handle_,
-                                                  accept_handle,
-                                                  message_block,
-                                                  bytes_to_read,
-                                                  act,
-                                                  this->posix_sig_proactor_->get_handle (),
-                                                  priority,
-                                                  signal_number),
-                  -1);
-
-  // Register this <accept> call with the local handler.
-  this->accept_handler_->register_accept_call (result);
-
-  return 0;
-}
-
-
-int
-ACE_POSIX_SIG_Asynch_Accept::open (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     const void *completion_key,
-                                     ACE_Proactor *proactor)
-{
-  int result = ACE_POSIX_Asynch_Operation::open (handler,
-                                                 handle,
-                                                 completion_key,
-                                                 proactor);
-  if (result == -1)
-    return result;
-
-  // Init the Asynch_Accept_Handler now. It needs to keep Proactor
-  // also with it.
-  ACE_NEW_RETURN (this->accept_handler_,
-                  ACE_POSIX_SIG_Asynch_Accept_Handler (&this->reactor_,
-                                                       this->posix_proactor ()),
-                  -1);
-
-  // Register the handle with the reactor.
-  int return_val = this->reactor_.register_handler (this->handle_,
-                                                    this->accept_handler_,
-                                                    ACE_Event_Handler::ACCEPT_MASK);
-  if (return_val == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Reactor::register_handler failed\n"),
-                      -1);
-
-  // Suspend the <handle> now. Enable only when the <accept> is issued
-  // by the application.
-  return_val = this->reactor_.suspend_handler (this->handle_);
-  if (return_val == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Reactor::suspend_handler failed\n"),
-                      -1);
-
-  // Spawn the thread. It is the only thread we are going to have. It
-  // will do the <handle_events> on the reactor.
-  return_val = ACE_Thread_Manager::instance ()->spawn (ACE_POSIX_SIG_Asynch_Accept::thread_function,
-                                                       (void *)&this->reactor_);
-  if (return_val  == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:Thread_Manager::spawn failed\n"),
-                      -1);
-
-  return 0;
-}
-
-ACE_POSIX_SIG_Asynch_Accept::~ACE_POSIX_SIG_Asynch_Accept (void)
-{
-}
-
-void*
-ACE_POSIX_SIG_Asynch_Accept::thread_function (void* arg_reactor)
-{
-  // Retrieve the reactor pointer from the argument.
-  ACE_Reactor* reactor = ACE_reinterpret_cast (ACE_Reactor *,
-                                               arg_reactor);
-  if (reactor == 0)
-    reactor = ACE_Reactor::instance ();
-
-  // For this reactor, this thread is the owner.
-  reactor->owner (ACE_OS::thr_self ());
-
-  // Handle events. Wait for any connection events. 
-  int result = 0;
-  while (result != -1)
-    result = reactor->handle_events ();
-  
-  return 0;
-}
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route
-// the call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Accept::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Accept::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Transmit_File_Result::socket (void) const
-{
-  return this->socket_;
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Transmit_File_Result::file (void) const
-{
-  return this->aio_fildes;
-}
-
-ACE_Asynch_Transmit_File::Header_And_Trailer *
-ACE_POSIX_Asynch_Transmit_File_Result::header_and_trailer (void) const
-{
-  return this->header_and_trailer_;
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::bytes_to_write (void) const
-{
-  return this->aio_nbytes;
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::bytes_per_send (void) const
-{
-  return this->bytes_per_send_;
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler &handler,
-                                                                              ACE_HANDLE socket,
-                                                                              ACE_HANDLE file,
-                                                                              ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                              u_long bytes_to_write,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              u_long bytes_per_send,
-                                                                              u_long flags,
-                                                                              const void *act,
-                                                                              ACE_HANDLE event,
-                                                                              int priority,
-                                                                              int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Transmit_File_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, offset, offset_high, priority, signal_number),
-    socket_ (socket),
-    header_and_trailer_ (header_and_trailer),
-    bytes_per_send_ (bytes_per_send),
-    flags_ (flags)
-{
-  this->aio_fildes = file;
-  this->aio_nbytes = bytes_to_write;
-}
-
-void
-ACE_POSIX_Asynch_Transmit_File_Result::complete (u_long bytes_transferred,
-                                                 int success,
-                                                 const void *completion_key,
-                                                 u_long error)
-{
-  // Copy the data.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // We will not do this because (a) the header and trailer blocks may
-  // be the same message_blocks and (b) in cases of failures we have
-  // no idea how much of what (header, data, trailer) was sent.
-  /*
-    if (this->success_ && this->header_and_trailer_ != 0)
-    {
-    ACE_Message_Block *header = this->header_and_trailer_->header ();
-    if (header != 0)
-    header->rd_ptr (this->header_and_trailer_->header_bytes ());
-
-    ACE_Message_Block *trailer = this->header_and_trailer_->trailer ();
-    if (trailer != 0)
-    trailer->rd_ptr (this->header_and_trailer_->trailer_bytes ());
-    }
-  */
-
-  // Create the interface result class.
-  ACE_Asynch_Transmit_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_transmit_file (result);
-}
-
-ACE_POSIX_Asynch_Transmit_File_Result::~ACE_POSIX_Asynch_Transmit_File_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::bytes_transferred (void) const
-{
-  return ACE_POSIX_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_POSIX_Asynch_Transmit_File_Result::act (void) const
-{
-  return ACE_POSIX_Asynch_Result::act ();
-}
-
-int
-ACE_POSIX_Asynch_Transmit_File_Result::success (void) const
-{
-  return ACE_POSIX_Asynch_Result::success ();
-}
-
-const void *
-ACE_POSIX_Asynch_Transmit_File_Result::completion_key (void) const
-{
-  return ACE_POSIX_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::error (void) const
-{
-  return ACE_POSIX_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_POSIX_Asynch_Transmit_File_Result::event (void) const
-{
-  return ACE_POSIX_Asynch_Result::event ();
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::offset (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset ();
-}
-
-u_long
-ACE_POSIX_Asynch_Transmit_File_Result::offset_high (void) const
-{
-  return ACE_POSIX_Asynch_Result::offset_high ();
-}
-
-int
-ACE_POSIX_Asynch_Transmit_File_Result::priority (void) const
-{
-  return ACE_POSIX_Asynch_Result::priority ();
-}
-
-int
-ACE_POSIX_Asynch_Transmit_File_Result::signal_number (void) const
-{
-  return ACE_POSIX_Asynch_Result::signal_number ();
-}
-
-int
-ACE_POSIX_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_POSIX_Asynch_Result::post_completion (proactor);
-}
-
-// *********************************************************************
-
-class ACE_Export ACE_POSIX_Asynch_Transmit_Handler : public ACE_Handler
-{
-  // = TITLE
-  //
-  //     Auxillary handler for doing <Asynch_Transmit_File> in
-  //     Unix. <ACE_POSIX_Asynch_Transmit_File> internally uses this.
-  //
-  // = DESCRIPTION
-  //
-  //     This is a helper class for implementing
-  //     <ACE_POSIX_Asynch_Transmit_File> in Unix systems. This class
-  //     abstracts out all the commonalities in the two different
-  //     POSIX Transmit Handler implementations.
-
-public:
-  virtual ~ACE_POSIX_Asynch_Transmit_Handler (void);
-  // Destructor.
-
-protected:
-  ACE_POSIX_Asynch_Transmit_Handler (ACE_POSIX_Asynch_Transmit_File_Result *result);
-  // Constructor. Result pointer will have all the information to do
-  // the file transmission (socket, file, application handler, bytes
-  // to write).
-
-  ACE_POSIX_Asynch_Transmit_File_Result *result_;
-  // The asynch result pointer made from the initial transmit file
-  // request.
-
-  ACE_Message_Block *mb_;
-  // Message bloack used to do the transmission.
-
-  enum ACT
-  {
-    HEADER_ACT  = 1,
-    DATA_ACT    = 2,
-    TRAILER_ACT = 3
-  };
-
-  ACT header_act_;
-  ACT data_act_;
-  ACT trailer_act_;
-  // ACT to transmit header, data and trailer.
-
-  size_t file_offset_;
-  // Current offset of the file being transmitted.
-
-  size_t file_size_;
-  // Total size of the file.
-
-  size_t bytes_transferred_;
-  // Number of bytes transferred on the stream.
-};
-
-// ************************************************************
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Transmit_Handler : public ACE_POSIX_Asynch_Transmit_Handler
-{
-  // = TITLE
-  //
-  //     Auxillary handler for doing <Asynch_Transmit_File> in
-  //     Unix. <ACE_POSIX_Asynch_Transmit_File> internally uses this.
-  //
-  // = DESCRIPTION
-  //
-  //     This is a helper class for implementing
-  //     <ACE_POSIX_Asynch_Transmit_File> in Unix systems.
-
-public:
-  ACE_POSIX_AIOCB_Asynch_Transmit_Handler (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor,
-                                           ACE_POSIX_Asynch_Transmit_File_Result *result);
-  // Constructor. Result pointer will have all the information to do
-  // the file transmission (socket, file, application handler, bytes
-  // to write).
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Transmit_Handler (void);
-  // Destructor.
-
-  int transmit (void);
-  // Do the transmission. All the info to do the transmission is in
-  // the <result> member.
-
-protected:
-  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
-  // This is called when asynchronous writes from the socket complete.
-
-  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
-  // This is called when asynchronous reads from the file complete.
-
-  int initiate_read_file (void);
-  // Issue asynch read from  the file.
-
-  ACE_POSIX_AIOCB_Asynch_Read_File rf_;
-  // To read from the file to be transmitted.
-
-  ACE_POSIX_AIOCB_Asynch_Write_Stream ws_;
-  // Write stream to write the header, trailer and the data.
-};
-
-// *********************************************************************
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Transmit_Handler : public ACE_POSIX_Asynch_Transmit_Handler
-{
-  // = TITLE
-  //     Auxillary handler for doing <Asynch_Transmit_File> in
-  //     Unix. <ACE_POSIX_Asynch_Transmit_File> internally uses this.
-  //
-  // = DESCRIPTION
-  //     This is a helper class for implementing
-  //     <ACE_POSIX_Asynch_Transmit_File> in Unix systems.
-public:
-  ACE_POSIX_SIG_Asynch_Transmit_Handler (ACE_POSIX_SIG_Proactor *proactor,
-                                         ACE_POSIX_Asynch_Transmit_File_Result *result);
-  // Constructor. Result pointer will have all the information to do
-  // the file transmission (socket, file, application handler, bytes
-  // to write).
-
-  virtual ~ACE_POSIX_SIG_Asynch_Transmit_Handler (void);
-  // Destructor.
-
-  int transmit (void);
-  // Do the transmission. All the info to do the transmission is in
-  // the <result> member.
-
-protected:
-  virtual void handle_write_stream (const ACE_Asynch_Write_Stream::Result &result);
-  // This is called when asynchronous writes from the socket complete.
-
-  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
-  // This is called when asynchronous reads from the file complete.
-
-  int initiate_read_file (void);
-  // Issue asynch read from  the file.
-
-  ACE_POSIX_SIG_Asynch_Read_File rf_;
-  // To read from the file to be transmitted.
-
-  ACE_POSIX_SIG_Asynch_Write_Stream ws_;
-  // Write stream to write the header, trailer and the data.
-};
-
-// *********************************************************************
-
-// Constructor.
-ACE_POSIX_Asynch_Transmit_Handler::ACE_POSIX_Asynch_Transmit_Handler (ACE_POSIX_Asynch_Transmit_File_Result *result)
-  : result_ (result),
-    mb_ (0),
-    header_act_ (this->HEADER_ACT),
-    data_act_ (this->DATA_ACT),
-    trailer_act_ (this->TRAILER_ACT),
-    file_offset_ (result->offset ()),
-    file_size_ (0),
-    bytes_transferred_ (0)
-{
-  // Allocate memory for the message block.
-  ACE_NEW (this->mb_,
-           ACE_Message_Block (this->result_->bytes_per_send ()
-                              + 1));
-  // Init the file size.
-  file_size_ = ACE_OS::filesize (this->result_->file ());
-}
-
-// Destructor.
-ACE_POSIX_Asynch_Transmit_Handler::~ACE_POSIX_Asynch_Transmit_Handler (void)
-{
-  delete result_;
-  mb_->release ();
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::ACE_POSIX_AIOCB_Asynch_Transmit_Handler (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor,
-                                                                                  ACE_POSIX_Asynch_Transmit_File_Result *result)
-  : ACE_POSIX_Asynch_Transmit_Handler (result),
-    rf_ (posix_aiocb_proactor),
-    ws_ (posix_aiocb_proactor)
-{
-}
-
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::~ACE_POSIX_AIOCB_Asynch_Transmit_Handler (void)
-{
-}
-
-// Do the transmission.
-// Initiate transmitting the header. When that completes
-// handle_write_stream will be called, there start transmitting the file.
-int
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::transmit (void)
-{
-  // No proactor is given for the <open>'s. Because we are using the
-  // concrete implementations of the  Asynch_Operations, and we have
-  // already given them the specific proactor, so they wont need the
-  // general <proactor> interface pointer.
-
-  // Open Asynch_Read_File.
-  if (this->rf_.open (*this,
-                      this->result_->file (),
-                      0,
-                      0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_Asynch_Transmit_Handler:read_file open failed\n"),
-                      -1);
-
-  // Open Asynch_Write_Stream.
-  if (this->ws_.open (*this,
-                      this->result_->socket (),
-                      0,
-                      0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_Asynch_Transmit_Handler:write_stream open failed\n"),
-                      -1);
-
-  // Transmit the header.
-  if (this->ws_.write (*this->result_->header_and_trailer ()->header (),
-                       this->result_->header_and_trailer ()->header_bytes (),
-                       ACE_reinterpret_cast (void *, &this->header_act_),
-                       0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
-                      -1);
-  return 0;
-}
-
-void
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
-{
-  // Update bytes transferred so far.
-  this->bytes_transferred_ += result.bytes_transferred ();
-
-  // Check the success parameter.
-  if (result.success () == 0)
-    {
-      // Failure.
-      ACE_ERROR ((LM_ERROR,
-                  "Asynch_Transmit_File failed.\n"));
-      
-      ACE_SEH_TRY
-        {
-          this->result_->complete (this->bytes_transferred_,
-                                   0,      // Failure.
-                                   0,      // @@ Completion key.
-                                   0);     // @@ Error no.
-        }
-      ACE_SEH_FINALLY
-        {
-          // This is crucial to prevent memory leaks. This deletes
-          // the result pointer also.
-          delete this;
-        }
-    }
-  
-  // Write stream successful.
-
-  // Partial write to socket.
-  int unsent_data = result.bytes_to_write () - result.bytes_transferred ();
-  if (unsent_data != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "%N:%l:Partial write to socket: Asynch_write called again\n"));
-
-      // Duplicate the message block and retry remaining data
-      if (this->ws_.write (*result.message_block ().duplicate (),
-                           unsent_data,
-                           result.act (),
-                           this->result_->priority (),
-                           this->result_->signal_number ()) == -1)
-        {
-          // @@ Handle this error.
-          ACE_ERROR ((LM_ERROR,
-                      "Asynch_Transmit_Handler:write_stream failed\n"));
-          return;
-        }
-
-      // @@ Handling *partial write* to a socket.  Let us not continue
-      // further before this write finishes. Because proceeding with
-      // another read and then write might change the order of the
-      // file transmission, because partial write to the stream is
-      // always possible.
-      return;
-    }
-
-  // Not a partial write. A full write.
-
-  // Check ACT to see what was sent.
-  ACT act = * (ACT *) result.act ();
-
-  switch (act)
-    {
-    case TRAILER_ACT:
-      // If it is the "trailer" that is just sent, then transmit file
-      // is complete.
-      // Call the application handler.
-      ACE_SEH_TRY
-        {
-          this->result_->complete (this->bytes_transferred_,
-                                   1,      // @@ Success.
-                                   0,      // @@ Completion key.
-                                   0);     // @@ Errno.
-        }
-      ACE_SEH_FINALLY
-        {
-          delete this;
-        }
-      break;
-
-    case HEADER_ACT:
-    case DATA_ACT:
-      // If header/data was sent, initiate the file data transmission.
-      if (this->initiate_read_file () == -1)
-        // @@ Handle this error.
-        ACE_ERROR ((LM_ERROR,
-                    "Error:Asynch_Transmit_Handler:read_file couldnt be initiated\n"));
-      break;
-
-    default:
-      // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
-                  "Error:ACE_Asynch_Transmit_Handler::handle_write_stream::Unexpected act\n"));
-    }
-}
-
-void
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File::Result &result)
-{
-  // Failure.
-  if (result.success () == 0)
-    {
-      //
-      ACE_SEH_TRY
-        {
-          this->result_->complete (this->bytes_transferred_,
-                                   0,      // Failure.
-                                   0,      // @@ Completion key.
-                                   errno); // Error no.
-        }
-      ACE_SEH_FINALLY
-        {
-          delete this;
-        }
-      return;
-    }
-
-  // Read successful.
-  if (result.bytes_transferred () == 0)
-    return;
-
-  // Increment offset.
-  this->file_offset_ += result.bytes_transferred ();
-
-  // Write data to network.
-  if (this->ws_.write (result.message_block (),
-                       result.bytes_transferred (),
-                       (void *)&this->data_act_,
-                       this->result_->priority (),
-                       this->result_->signal_number ()) == -1)
-    {
-      // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
-                  "Error:ACE_Asynch_Transmit_File : write to the stream failed\n"));
-      return;
-    }
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Transmit_Handler::initiate_read_file (void)
-{
-  // Is there something to read.
-  if (this->file_offset_ >= this->file_size_)
-    {
-      // File is sent. Send the trailer.
-      if (this->ws_.write (*this->result_->header_and_trailer ()->trailer (),
-                           this->result_->header_and_trailer ()->trailer_bytes (),
-                           (void *)&this->trailer_act_,
-                           this->result_->priority (),
-                           this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:Asynch_Transmit_Handler:write_stream writing trailer failed\n"),
-                          -1);
-      return 0;
-    }
-  else
-    {
-      // @@ Is this right??
-      // Previous reads and writes are over. For the new read, adjust
-      // the wr_ptr and the rd_ptr to the beginning.
-      this->mb_->rd_ptr (this->mb_->base ());
-      this->mb_->wr_ptr (this->mb_->base ());
-
-      // Inititiate an asynchronous read from the file.
-      if (this->rf_.read (*this->mb_,
-                          this->mb_->size () - 1,
-                          this->file_offset_,
-                          0, // @@ offset_high !!! if aiocb64 is used.
-                          0, // Act
-                          this->result_->priority (),
-                          this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:Asynch_Transmit_Handler::read from file failed\n"),
-                          -1);
-      return 0;
-    }
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Transmit_Handler::ACE_POSIX_SIG_Asynch_Transmit_Handler (ACE_POSIX_SIG_Proactor *posix_sig_proactor,
-                                                                              ACE_POSIX_Asynch_Transmit_File_Result *result)
-  : ACE_POSIX_Asynch_Transmit_Handler (result),
-    rf_ (posix_sig_proactor),
-    ws_ (posix_sig_proactor)
-{
-}
-
-ACE_POSIX_SIG_Asynch_Transmit_Handler::~ACE_POSIX_SIG_Asynch_Transmit_Handler (void)
-{
-}
-
-// Do the transmission.
-// Initiate transmitting the header. When that completes
-// handle_write_stream will be called, there start transmitting the file.
-int
-ACE_POSIX_SIG_Asynch_Transmit_Handler::transmit (void)
-{
-  // The Proactor given for the <open>'s is not going to be
-  // used. Because we are using the
-  // concrete implementations of the  Asynch_Operations, and we have
-  // already given them the specific proactor, so they wont need the
-  // general <proactor> interface pointer.
-
-  // Open Asynch_Read_File.
-  if (this->rf_.open (*this,
-                      this->result_->file (),
-                      this->result_->completion_key ()) // Completion key
-      == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_Asynch_Transmit_Handler:read_file open failed\n"),
-                      -1);
-
-  // Open Asynch_Write_Stream.
-  if (this->ws_.open (*this,
-                      this->result_->socket (),
-                      this->result_->completion_key ())  // Completion key
-      == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "ACE_Asynch_Transmit_Handler:write_stream open failed\n"),
-                      -1);
-
-  // Transmit the header.
-  if (this->ws_.write (*this->result_->header_and_trailer ()->header (),
-                       this->result_->header_and_trailer ()->header_bytes (),
-                       ACE_reinterpret_cast (void *,
-                                             &this->header_act_),
-                       this->result_->priority (),
-                       this->result_->signal_number ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Asynch_Transmit_Handler:transmitting header:write_stream failed\n"),
-                      -1);
-  return 0;
-}
-
-void
-ACE_POSIX_SIG_Asynch_Transmit_Handler::handle_write_stream (const ACE_Asynch_Write_Stream::Result &result)
-{
-  // Update bytes transferred so far.
-  this->bytes_transferred_ += result.bytes_transferred ();
-
-  // Check the success parameter.
-  if (result.success () == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Asynch_Transmit_File failed.\n"));
-
-      // Check the success parameter.
-      if (result.success () == 0)
-        {
-          // Failure.
-          ACE_ERROR ((LM_ERROR,
-                      "Asynch_Transmit_File failed.\n"));
-
-          ACE_SEH_TRY
-            {
-              this->result_->complete (this->bytes_transferred_,
-                                       0,      // Failure.
-                                       0,      // @@ Completion key.
-                                       0);     // @@ Error no.
-            }
-          ACE_SEH_FINALLY
-            {
-              // This is crucial to prevent memory leaks. This deletes
-              // the result pointer also.
-              delete this;
-            }
-        }
-    }
-
-  // Write stream successful.
-
-  // Partial write to socket.
-  int unsent_data = result.bytes_to_write () - result.bytes_transferred ();
-  if (unsent_data != 0)
-    {
-      // Reset pointers.
-      result.message_block ().rd_ptr (result.bytes_transferred ());
-
-      // Duplicate the message block and retry remaining data
-      if (this->ws_.write (*result.message_block ().duplicate (),
-                           unsent_data,
-                           result.act (),
-                           result.priority (),
-                           this->result_->signal_number ()) == -1)
-        {
-          // @@ Handle this error.
-          ACE_ERROR ((LM_ERROR,
-                      "Asynch_Transmit_Handler:write_stream failed\n"));
-          return;
-        }
-
-      // @@ Handling *partial write* to a socket.  Let us not continue
-      // further before this write finishes. Because proceeding with
-      // another read and then write might change the order of the
-      // file transmission, because partial write to the stream is
-      // always possible.
-      return;
-    }
-
-  // Not a partial write. A full write.
-
-  // Check ACT to see what was sent.
-  ACT act = *(ACT *) result.act ();
-
-  switch (act)
-    {
-    case TRAILER_ACT:
-      // If it is the "trailer" that is just sent, then transmit file
-      // is complete.
-      // Call the application handler.
-      ACE_SEH_TRY
-        {
-          this->result_->complete (this->bytes_transferred_,
-                                   1,      // @@ Success.
-                                   0,      // @@ Completion key.
-                                   0);     // @@ Errno.
-        }
-      ACE_SEH_FINALLY
-        {
-          delete this;
-        }
-      break;
-
-    case HEADER_ACT:
-    case DATA_ACT:
-      // If header/data was sent, initiate the file data transmission.
-      if (this->initiate_read_file () == -1)
-        // @@ Handle this error.
-        ACE_ERROR ((LM_ERROR,
-                    "Error:Asynch_Transmit_Handler:read_file couldnt be initiated\n"));
-      break;
-
-    default:
-      // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
-                  "Error:ACE_Asynch_Transmit_Handler::handle_write_stream::Unexpected act\n"));
-    }
-}
-
-void
-ACE_POSIX_SIG_Asynch_Transmit_Handler::handle_read_file (const ACE_Asynch_Read_File::Result &result)
-{
-  // Failure.
-  if (result.success () == 0)
-    {
-      //
-      ACE_SEH_TRY
-        {
-          this->result_->complete (this->bytes_transferred_,
-                                   0,      // Failure.
-                                   0,      // @@ Completion key.
-                                   errno); // Error no.
-        }
-      ACE_SEH_FINALLY
-        {
-          delete this;
-        }
-      return;
-    }
-
-  // Read successful.
-  if (result.bytes_transferred () == 0)
-    return;
-
-  // Increment offset and write data to network.
-  this->file_offset_ += result.bytes_transferred ();
-  if (this->ws_.write (result.message_block (),
-                       result.bytes_transferred (),
-                       (void *)&this->data_act_,
-                       result.priority (),
-                       result.signal_number ()) == -1)
-    {
-      // @@ Handle this error.
-      ACE_ERROR ((LM_ERROR,
-                  "Error:ACE_Asynch_Transmit_File : write to the stream failed\n"));
-      return;
-    }
-}
-
-int
-ACE_POSIX_SIG_Asynch_Transmit_Handler::initiate_read_file (void)
-{
-  // Is there something to read.
-  if (this->file_offset_ >= this->file_size_)
-    {
-      // File is sent. Send the trailer.
-      if (this->ws_.write (*this->result_->header_and_trailer ()->trailer (),
-                           this->result_->header_and_trailer ()->trailer_bytes (),
-                           (void *)&this->trailer_act_,
-                           this->result_->priority (),
-                           this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:Asynch_Transmit_Handler:write_stream writing trailer failed\n"),
-                          -1);
-      return 0;
-    }
-  else
-    {
-      // Inititiate an asynchronous read from the file.
-      if (this->rf_.read (*this->mb_,
-                          this->mb_->size () - 1,
-                          this->file_offset_,
-                          0,    // @@, offset_high, not implemented.
-                          0,    // ACT
-                          this->result_->priority (),
-                          this->result_->signal_number ()) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:Asynch_Transmit_Handler::read from file failed\n"),
-                          -1);
-      return 0;
-    }
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Asynch_Transmit_File::ACE_POSIX_AIOCB_Asynch_Transmit_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Transmit_File_Impl (),
-    ACE_POSIX_AIOCB_Asynch_Operation (posix_aiocb_proactor)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
-                                                     ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                     u_long bytes_to_write,
-                                                     u_long offset,
-                                                     u_long offset_high,
-                                                     u_long bytes_per_send,
-                                                     u_long flags,
-                                                     const void *act,
-                                                     int priority,
-                                                     int signal_number)
-{
-  // Adjust these parameters if there are default values specified.
-  ssize_t file_size = ACE_OS::filesize (file);
-
-  if (file_size == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N:%l:%p\n",
-                       "POSIX_AIOCB_Asynch_Transmit_File:filesize failed"),
-                      -1);
-
-  if (bytes_to_write == 0)
-    bytes_to_write = file_size;
-
-  if (offset > (size_t) file_size)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Asynch_Transmit_File:File size is less than offset"),
-                      -1);
-
-  if (offset != 0)
-    bytes_to_write = file_size - offset + 1;
-
-  if (bytes_per_send == 0)
-    bytes_per_send = bytes_to_write;
-
-  // Configure the result parameter.
-  ACE_POSIX_Asynch_Transmit_File_Result *result = 0;
-
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Transmit_File_Result (*this->handler_,
-                                                         this->handle_,
-                                                         file,
-                                                         header_and_trailer,
-                                                         bytes_to_write,
-                                                         offset,
-                                                         offset_high,
-                                                         bytes_per_send,
-                                                         flags,
-                                                         act,
-                                                         this->posix_proactor ()->get_handle (),
-                                                         priority,
-                                                         signal_number),
-                  -1);
-
-  // Make the auxillary handler and initiate transmit.
-  ACE_POSIX_AIOCB_Asynch_Transmit_Handler *transmit_handler = 0;
-
-  ACE_NEW_RETURN (transmit_handler,
-                  ::ACE_POSIX_AIOCB_Asynch_Transmit_Handler (this->posix_proactor (),
-                                                             result),
-                  -1);
-
-  ssize_t return_val = transmit_handler->transmit ();
-
-  if (return_val == -1)
-    // This deletes the <result> in it too.
-    delete transmit_handler;
-
-  return 0;
-}
-
-ACE_POSIX_AIOCB_Asynch_Transmit_File::~ACE_POSIX_AIOCB_Asynch_Transmit_File (void)
-{
-}
-
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route the
-// call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_AIOCB_Asynch_Transmit_File::open (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      const void *completion_key,
-                                      ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_AIOCB_Asynch_Transmit_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_AIOCB_Asynch_Transmit_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-} 
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Asynch_Transmit_File::ACE_POSIX_SIG_Asynch_Transmit_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor)
-    : ACE_Asynch_Operation_Impl (),
-      ACE_Asynch_Transmit_File_Impl (),
-      ACE_POSIX_SIG_Asynch_Operation (posix_sig_proactor)
-{
-}
-
-int
-ACE_POSIX_SIG_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
-                                                   ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                   u_long bytes_to_write,
-                                                   u_long offset,
-                                                   u_long offset_high,
-                                                   u_long bytes_per_send,
-                                                   u_long flags,
-                                                   const void *act,
-                                                   int priority,
-                                                   int signal_number)
-{
-  // Adjust these parameters if there are default values specified.
-  ssize_t file_size = ACE_OS::filesize (file);
-
-  if (file_size == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       ":Asynch_Transmit_File:Couldnt know the file size"),
-                      -1);
-
-  if (bytes_to_write == 0)
-    bytes_to_write = file_size;
-
-  if (offset > (size_t) file_size)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Asynch_Transmit_File:File size is less than offset"),
-                      -1);
-
-  if (offset != 0)
-    bytes_to_write = file_size - offset + 1;
-
-  if (bytes_per_send == 0)
-    bytes_per_send = bytes_to_write;
-
-  // Configure the result parameter.
-  ACE_POSIX_Asynch_Transmit_File_Result *result = 0;
-
-  ACE_NEW_RETURN (result,
-                  ACE_POSIX_Asynch_Transmit_File_Result (*this->handler_,
-                                                         this->handle_,
-                                                         file,
-                                                         header_and_trailer,
-                                                         bytes_to_write,
-                                                         offset,
-                                                         offset_high,
-                                                         bytes_per_send,
-                                                         flags,
-                                                         act,
-                                                         this->posix_sig_proactor_->get_handle (),
-                                                         priority,
-                                                         signal_number),
-                  -1);
-
-  // Make the auxillary handler and initiate transmit.
-  ACE_POSIX_SIG_Asynch_Transmit_Handler *transmit_handler = 0;
-
-  ACE_NEW_RETURN (transmit_handler,
-                  ::ACE_POSIX_SIG_Asynch_Transmit_Handler (this->posix_sig_proactor_, result),
-                  -1);
-
-  ssize_t return_val = transmit_handler->transmit ();
-
-  if (return_val == -1)
-    // This deletes the <result> in it too.
-    delete transmit_handler;
-
-  return 0;
-}
-
-ACE_POSIX_SIG_Asynch_Transmit_File::~ACE_POSIX_SIG_Asynch_Transmit_File  (void)
-{
-}
-
-
-// Methods belong to ACE_POSIX_Asynch_Operation base class. These
-// methods are defined here to avoid dominance warnings. They route the
-// call to the ACE_POSIX_Asynch_Operation base class.
-
-int
-ACE_POSIX_SIG_Asynch_Transmit_File::open (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      const void *completion_key,
-                                      ACE_Proactor *proactor)
-{
-  return ACE_POSIX_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_POSIX_SIG_Asynch_Transmit_File::cancel (void)
-{
-  return ACE_POSIX_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_POSIX_SIG_Asynch_Transmit_File::proactor (void) const
-{
-  return ACE_POSIX_Asynch_Operation::proactor ();
-} 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result *>;
-template class ACE_Node<ACE_POSIX_Asynch_Accept_Result *>;
-template class ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Accept_Result *>;
-#elif  defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Queue<ACE_POSIX_Asynch_Accept_Result *>
-#pragma instantiate ACE_Node<ACE_POSIX_Asynch_Accept_Result *>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_POSIX_Asynch_Accept_Result *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/POSIX_Asynch_IO.h b/ace/POSIX_Asynch_IO.h
deleted file mode 100644
index 56224912845..00000000000
--- a/ace/POSIX_Asynch_IO.h
+++ /dev/null
@@ -1,1655 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    ace
-//
-// = FILENAME
-//
-//    POSIX_Asynch_IO.h
-//
-// = DESCRIPTION
-//
-//    The implementation classes for POSIX implementation of Asynch
-//    Operations are defined here in this file.
-//
-// = AUTHOR
-//
-//    Irfan Pyarali (irfan@cs.wustl.edu),
-//    Tim Harrison (harrison@cs.wustl.edu) and
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_POSIX_ASYNCH_IO_H)
-#define ACE_POSIX_ASYNCH_IO_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_AIO_CALLS)
-
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Reactor.h"
-
-// Forward declarations
-class ACE_POSIX_SIG_Proactor;
-class ACE_POSIX_AIOCB_Proactor;
-class ACE_Proactor_Impl;
-
-class ACE_Export ACE_POSIX_Asynch_Result : public virtual ACE_Asynch_Result_Impl,
-                                           public aiocb
-{
-  // = TITLE
-  //
-  //     This class provides concrete implementation for
-  //     ACE_Asynch_Result for POSIX4 platforms. This class extends
-  //     <aiocb> and makes it more useful.
-  //
-  // = DESCRIPTION
-  //
-public:
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE on POSIX4 platforms.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // Priority of the operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-  virtual ~ACE_POSIX_Asynch_Result (void);
-  // Destructor.
-
-protected:
-  ACE_POSIX_Asynch_Result (ACE_Handler &handler,
-                           const void* act,
-                           ACE_HANDLE event,
-                           u_long offset,
-                           u_long offset_high,
-                           int priority,
-                           int signal_number);
-  // Constructor. <Event> is not used on POSIX.
-
-  ACE_Handler &handler_;
-  // Handler that will be called back.
-
-  const void *act_;
-  // ACT for this operation.
-  // We could use <aiocb::aio_sigevent.sigev_value.sival_ptr> for
-  // this. But it doesnot provide the constness, so this may be
-  // better.
-
-  u_long bytes_transferred_;
-  // Bytes transferred by this operation.
-
-  int success_;
-  // Success indicator.
-
-  const void *completion_key_;
-  // ACT associated with handle.
-
-  u_long error_;
-  // Error if operation failed.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Operation : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     This class abstracts out the common things needed for
-  //     implementing Asynch_Operation for POSIX platforms. Specific
-  //     implementations such as POSIX_AIOCB_Asynch_Operation and
-  //     POSIX_SIG_Asynch_Operation etc., can derive from this class.
-  //
-  //  = DESCRIPTION
-  //
-public:
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle. No need for the Proactor since the sub classes
-  // will know the correct implementation Proactor class, since this
-  // Operation class itself was created by the correct implementation
-  // Proactor class.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-
-  // = Access methods.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  ACE_POSIX_Asynch_Operation (void);
-  // No op contructor.
-
-  virtual ~ACE_POSIX_Asynch_Operation (void);
-  // Destructor.
-
-  ACE_Proactor *proactor_;
-  // Proactor that this Asynch IO will be registered with.
-
-  ACE_Handler *handler_;
-  // Handler that will receive the callback.
-
-  ACE_HANDLE handle_;
-  // I/O handle used for reading.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Operation : public virtual ACE_POSIX_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Operation for AIOCB
-  //     (Asynchronous I/O Control Blocks) based implementation of
-  //     Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_AIOCB_Proactor *posix_proactor (void) const;
-  // Return the underlying Proactor implementation.
-
-protected:
-  ACE_POSIX_AIOCB_Asynch_Operation (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Contructor.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Operation (void);
-  // Destructor.
-
-  int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result);
-  // This call is for the POSIX implementation. This method is used by
-  // <ACE_Asynch_Operation> to store some information with the
-  // Proactor after an <aio_> call is issued, so that the Proactor can
-  // retrive this information to do <aio_return> and <aio_error>.
-  // Passing a '0' ptr returns the status, indicating whether there
-  // are slots available or no. Passing a valid ptr stores the ptr
-  // with the Proactor.
-
-  ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor_;
-  // It is easy to get this specific implementation proactor here,
-  // since it is the one that creates the correct POSIX_Asynch_*
-  // objects. We can use this to get to the implementation proactor
-  // directly.
-};
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Operation : public virtual ACE_POSIX_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Operation for Real-Time
-  //     Signal (<sigtimedwait>) based implementation of Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Proactor *posix_proactor (void) const;
-  // Return the  underlying Proactor implemetation.
-
-protected:
-  ACE_POSIX_SIG_Asynch_Operation (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Contructor.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Operation (void);
-  // Destructor.
-
-  ACE_POSIX_SIG_Proactor *posix_sig_proactor_;
-  // It is easy to get this specific implementation proactor here,
-  // since it is the one that creates the correct POSIX_Asynch_*
-  // objects. We can use this to get to the implementation proactor
-  // directly.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Read_Stream_Result : public virtual ACE_Asynch_Read_Stream_Result_Impl,
-                                                       public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This class provides concrete implementation for
-  //     ACE_Asynch_Read_Stream::Result class for POSIX platforms.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_POSIX_AIOCB_Asynch_Read_Stream;
-  friend class ACE_POSIX_SIG_Asynch_Read_Stream;
-  // Factory classes willl have special permissions.
-  
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous read.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for reading.
-  
-  // = Base class operations. These operations are here to kill
-  //   dominance warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // The priority of the asynchronous operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-protected:
-  ACE_POSIX_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                       ACE_HANDLE handle,
-                                       ACE_Message_Block &message_block,
-                                       u_long bytes_to_read,
-                                       const void* act,
-                                       ACE_HANDLE event,
-                                       int priority,
-                                       int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Read_Stream factory.
-  
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // Get the data copied to this class, before calling application
-  // handler.
-
-  virtual ~ACE_POSIX_Asynch_Read_Stream_Result (void);
-  // Destrcutor.
-
-  // aiocb::aio_nbytes
-  // Bytes requested when the asynchronous read was initiated.
-
-  ACE_Message_Block &message_block_;
-  // Message block for reading the data into.
-
-  // aiocb::aio_filedes
-  // I/O handle used for reading.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl,
-                                                      public ACE_POSIX_AIOCB_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Read_Stream for AIOCB
-  //     (Asynchronous I/O Control Blocks) based implementation of
-  //      Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_AIOCB_Asynch_Read_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Read_Stream (void);
-  // Destructor.
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_read (ACE_POSIX_Asynch_Read_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Read_File class can use it too.
-};
-
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl,
-                                                    public ACE_POSIX_SIG_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Read_Stream for Real-Time
-  //     Signal (<sigtimedwait>) based implementation of Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Asynch_Read_Stream (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Read_Stream (void);
-  // Destructor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_read (ACE_POSIX_Asynch_Read_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Read_File class can use it too.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Write_Stream_Result : public virtual ACE_Asynch_Write_Stream_Result_Impl,
-                                                        public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This class provides concrete implementation for
-  //     ACE_Asynch_Write_Stream::Result on POSIX platforms.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous write.
-
-  friend class ACE_POSIX_AIOCB_Asynch_Write_Stream;
-  friend class ACE_POSIX_SIG_Asynch_Write_Stream;
-  // Factory classes will have special privilages.
-
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block that contains the data to be written.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for writing.
-  
-  // = Base class operations. These operations are here to kill
-  //   dominance warnings. These methods call the base class methods. 
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE on POSIX4 platforms.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // The priority of the asynchronous operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-protected:
-  ACE_POSIX_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                        ACE_HANDLE handle,
-                                        ACE_Message_Block &message_block,
-                                        u_long bytes_to_write,
-                                        const void* act,
-                                        ACE_HANDLE event,
-                                        int priority,
-                                        int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Write_Stream factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the write completes.
-
-  virtual ~ACE_POSIX_Asynch_Write_Stream_Result (void);
-  // Destructor.
-
-protected:
-  // aiocb::aio_nbytes
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block_;
-  // Message block that contains the data to be written.
-
-  // aiocb::aio_filedes
-  // I/O handle used for writing.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Write_Stream : public virtual ACE_Asynch_Write_Stream_Impl,
-                                                       public ACE_POSIX_AIOCB_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Write_Stream for AIOCB
-  //     (Asynchronous I/O Control Blocks) based implementation of
-  //      Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_AIOCB_Asynch_Write_Stream (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Write_Stream (void);
-  // Destrcutor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor =  0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_write (ACE_POSIX_Asynch_Write_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Write_File class can use it too.
-};
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Write_Stream : public virtual ACE_Asynch_Write_Stream_Impl,
-                                                     public ACE_POSIX_SIG_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Write_Stream for Real-Time
-  //     Signal (<sigtimedwait>) based implementation of Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Asynch_Write_Stream (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constrctor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Write_Stream (void);
-  // Destructor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_write (ACE_POSIX_Asynch_Write_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Write_File class can use it too.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Read_File_Result : public virtual ACE_Asynch_Read_File_Result_Impl,
-                                                     public ACE_POSIX_Asynch_Read_Stream_Result
-{
-  // = TITLE
-  //
-  //     This class provides concrete implementation for
-  //     ACE_Asynch_Read_File::Result class for POSIX platforms.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_POSIX_AIOCB_Asynch_Read_File;
-  friend class ACE_POSIX_SIG_Asynch_Read_File;
-  // Factory classes willl have special permissions.
-
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  // = These methods belong to ACE_POSIX_Asynch_Result class base
-  //   class. These operations are here to kill dominance
-  //   warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE on POSIX4 platforms.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // The priority of the asynchronous operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-  
-  // = The following methods belong to
-  //   ACE_POSIX_Asynch_Read_Stream_Result. They are here to avoid 
-  //   dominance warnings. These methods route their call to the
-  //   ACE_POSIX_Asynch_Read_Stream_Result base class.
-
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous read.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for reading.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-protected:
-  ACE_POSIX_Asynch_Read_File_Result (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     ACE_Message_Block &message_block,
-                                     u_long bytes_to_read,
-                                     const void* act,
-                                     u_long offset,
-                                     u_long offset_high,
-                                     ACE_HANDLE event,
-                                     int priority,
-                                     int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Read_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the read completes.
-
-  virtual ~ACE_POSIX_Asynch_Read_File_Result (void);
-  // Destructor.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl,
-                                                    public ACE_POSIX_AIOCB_Asynch_Read_Stream
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous reads
-  //     on a file. This class implements ACE_Asynch_Read_File for
-  //     AIOCB (Asynchronous I/O Control Blocks) based implementation
-  //     of Proactor.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class.  A ACE_Asynch_Read_File::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     reads completes through the <ACE_Handler::handle_read_file>
-  //     callback.
-  //
-  //     This class differs slightly from ACE_Asynch_Read_Stream as it
-  //     allows the user to specify an offset for the read.
-
-public:
-  ACE_POSIX_AIOCB_Asynch_Read_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            u_long offset,
-            u_long offset_high,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.  The read will start
-  // at <offset> from the beginning of the file.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Read_File (void);
-  // Destructor.
-  
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This belongs to ACE_POSIX_AIOCB_Asynch_Read_Stream. We have
-  // defined this here to avoid compiler warnings and forward the
-  // method to <ACE_POSIX_AIOCB_Asynch_Read_Stream::read>.
-};
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl,
-                                                  public ACE_POSIX_SIG_Asynch_Read_Stream
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous reads
-  //     on a file. This class implements ACE_Asynch_Operation for
-  //     Real-Time Signal (<sigtimedwait>) based implementation of
-  //     Proactor.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class.  A ACE_Asynch_Read_File::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     reads completes through the <ACE_Handler::handle_read_file>
-  //     callback.
-
-public:
-  ACE_POSIX_SIG_Asynch_Read_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            u_long offset,
-            u_long offset_high,
-            const void *act,
-            int priority,
-            int signal_number);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.  The read will start
-  // at <offset> from the beginning of the file.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Read_File (void);
-  // Destructor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number);
-  // This belongs to ACE_POSIX_SIG_Asynch_Read_Stream. We have
-  // defined this here to avoid compiler warnings and forward the
-  // method to <ACE_POSIX_SIG_Asynch_Read_Stream::read>.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Write_File_Result : public virtual ACE_Asynch_Write_File_Result_Impl,
-                                                      public ACE_POSIX_Asynch_Write_Stream_Result
-{
-  // = TITLE
-  //
-  //     This class provides implementation for
-  //      ACE_Asynch_Write_File_Result for POSIX platforms.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous write.
-  //
-  //     This class differs slightly from
-  //     ACE_Asynch_Write_Stream::Result as it calls back
-  //     <ACE_Handler::handle_write_file> on the <handler> instead
-  //     of <ACE_Handler::handle_write_stream>.  No additional state
-  //     is required by this class as ACE_Asynch_Result can store
-  //     the <offset>.
-
-  friend class ACE_POSIX_AIOCB_Asynch_Write_File;
-  friend class ACE_POSIX_SIG_Asynch_Write_File;
-  // Factory classes will have special permissions.
-
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  // = Base class operations. These operations are here to kill some
-  //   warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE on POSIX4 platforms.
-  
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-  
-  int priority (void) const;
-  // The priority of the asynchronous operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-  
-  // = The following methods belong to
-  //   ACE_POSIX_Asynch_Write_Stream_Result. They are here to avoid
-  //   dominace warnings. These methods route their call to the 
-  //   ACE_POSIX_Asynch_Write_Stream_Result base class. 
-
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block that contains the data to be written.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for writing.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-  
-protected:
-  ACE_POSIX_Asynch_Write_File_Result (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      ACE_Message_Block &message_block,
-                                      u_long bytes_to_write,
-                                      const void* act,
-                                      u_long offset,
-                                      u_long offset_high,
-                                      ACE_HANDLE event,
-                                      int priority,
-                                      int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Write_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the write completes.
-
-  virtual ~ACE_POSIX_Asynch_Write_File_Result (void);
-  // Destructor.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Write_File : public virtual ACE_Asynch_Write_File_Impl,
-                                                     public ACE_POSIX_AIOCB_Asynch_Write_Stream
-{
-  // = TITLE
-  //
-  //     This class provides concrete implementation for
-  //     ACE_Asynch_Write_File for POSIX platforms where the
-  //     completion strategy for Proactor is based on AIOCB (AIO
-  //     Control Blocks).
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_AIOCB_Asynch_Write_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             u_long offset,
-             u_long offset_high,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be write and stored in the <message_block>.  The write will
-  // start at <offset> from the beginning of the file.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Write_File (void);
-  // Destructor.
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This <write> belongs to ACE_POSIX_AIOCB_Asynch_Write_Stream. We
-  // have put this here to avoid compiler warnings. We forward this
-  // method call to the <ACE_POSIX_SIG_Asynch_Write_Stream::write>
-  // one.
-};
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Write_File : public virtual ACE_Asynch_Write_File_Impl,
-                                                   public ACE_POSIX_SIG_Asynch_Write_Stream
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous reads
-  //     on a file. This class implements ACE_Asynch_Operation for
-  //     Real-Time Signal (<sigtimedwait>) based implementation of
-  //     Proactor.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class.  A ACE_Asynch_Read_File::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     reads completes through the <ACE_Handler::handle_read_file>
-  //     callback.
-
-public:
-  ACE_POSIX_SIG_Asynch_Write_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             u_long offset,
-             u_long offset_high,
-             const void *act,
-             int priority,
-             int signal_number);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be write and stored in the <message_block>.  The write will
-  // start at <offset> from the beginning of the file.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Write_File (void);
-  // Destrcutor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number);
-  // This <write> belongs to ACE_POSIX_SIG_Asynch_Write_Stream. We
-  // have put this here to avoid compiler warnings. We forward this
-  // method call to the <ACE_POSIX_SIG_Asynch_Write_Stream::write>
-  // one.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Accept_Result : public virtual ACE_Asynch_Accept_Result_Impl,
-                                                  public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This is that class which will be passed back to the
-  //     <handler> when the asynchronous accept completes.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous accept.
-
-  friend class ACE_POSIX_AIOCB_Asynch_Accept;
-  friend class ACE_POSIX_SIG_Asynch_Accept;
-  // Factory classes willl have special permissions.
-
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous accept.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE listen_handle (void) const;
-  // I/O handle used for accepting new connections.
-
-  ACE_HANDLE accept_handle (void) const;
-  // I/O handle for the new connection.
-
-  // = Base class operations. These operations are here to kill
-  //   dominance warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE on POSIX4 platforms.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. 
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-protected:
-  ACE_POSIX_Asynch_Accept_Result (ACE_Handler &handler,
-                                  ACE_HANDLE listen_handle,
-                                  ACE_HANDLE accept_handle,
-                                  ACE_Message_Block &message_block,
-                                  u_long bytes_to_read,
-                                  const void* act,
-                                  ACE_HANDLE event,
-                                  int priority,
-                                  int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Accept factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the accept completes.
-
-  virtual ~ACE_POSIX_Asynch_Accept_Result (void);
-  // Destructor.
-
-  // aiocb::aio_nbytes
-  // Bytes requested when the asynchronous read was initiated.
-  // Actually, on POSIX implementation, we dont read any intial data.
-
-  ACE_Message_Block &message_block_;
-  // Message block for reading the data into.
-
-  ACE_HANDLE listen_handle_;
-  // I/O handle used for accepting new connections.
-
-  // aiocb::aio_filedes
-  // I/O handle for the new connection.
-};
-
-class ACE_POSIX_AIOCB_Asynch_Accept_Handler;
-// Forward declaration. This class is defined the in the cpp file,
-// since this is internal  to the implementation.
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl,
-                                                 public ACE_POSIX_AIOCB_Asynch_Operation
-{
-public:
-  ACE_POSIX_AIOCB_Asynch_Accept (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // This <open> belongs to ACE_AIOCB_Asynch_Operation. We forward
-  // this call to that method. We have put this here to avoid the
-  // compiler warnings.
-
-  int accept (ACE_Message_Block &message_block,
-              u_long bytes_to_read,
-              ACE_HANDLE accept_handle,
-              const void *act,
-              int priority,
-              int signal_number = 0);
-  // This starts off an asynchronous accept.  The asynchronous accept
-  // call also allows any initial data to be returned to the
-  // <handler>.  Upto <bytes_to_read> will be read and stored in the
-  // <message_block>.  The <accept_handle> will be used for the
-  // <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
-  // handle will be created.
-  //
-  // <message_block> must be specified. This is because the address of
-  // the new connection is placed at the end of this buffer.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Accept (void);
-  // Destructor.
-
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-  
-private:
-  static void* thread_function  (void* reactor);
-  // The thread function that does handle events.
-
-  ACE_Reactor reactor_;
-  // Reactor to wait on the <listen_handle>.
-
-  ACE_POSIX_AIOCB_Asynch_Accept_Handler* accept_handler_;
-  // The Event Handler to do handle_input.
-};
-
-class ACE_POSIX_SIG_Asynch_Accept_Handler;
-// Forward declaration. This class is defined the in the cpp file,
-// since this is internal  to the implementation.
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl,
-                                               public ACE_POSIX_SIG_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Accept for Real-Time
-  //     Signal (<sigtimedwait>) based implementation of Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Asynch_Accept (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // This <open> belongs to ACE_SIG_Asynch_Operation. We forward this
-  // call to that method. We have put this here to avoid the compiler
-  // warnings.
-
-  int accept (ACE_Message_Block &message_block,
-              u_long bytes_to_read,
-              ACE_HANDLE accept_handle,
-              const void *act,
-              int priority,
-              int signal_number);
-  // This starts off an asynchronous accept.  The asynchronous accept
-  // call also allows any initial data to be returned to the
-  // <handler>.  Upto <bytes_to_read> will be read and stored in the
-  // <message_block>.  The <accept_handle> will be used for the
-  // <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
-  // handle will be created.
-  //
-  // <message_block> must be specified. This is because the address of
-  // the new connection is placed at the end of this buffer.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Accept (void);
-  // Destructor.
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class.
- 
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  static void* thread_function (void* reactor);
-  // The thread function that does handle events.
-
-  ACE_Reactor reactor_;
-  // Reactor to wait on the <listen_handle>.
-
-  ACE_POSIX_SIG_Asynch_Accept_Handler* accept_handler_;
-  // The Event Handler to do handle_input.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Transmit_File_Result : public virtual ACE_Asynch_Transmit_File_Result_Impl,
-                                                         public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This is that class which will be passed back to the
-  //     <handler> when the asynchronous transmit file completes.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous transmit file.
-
-  friend class ACE_POSIX_AIOCB_Asynch_Transmit_File;
-  friend class ACE_POSIX_SIG_Asynch_Transmit_File;
-  // Factory classes willl have special permissions.
-
-  friend class ACE_POSIX_Asynch_Transmit_Handler;
-  friend class ACE_POSIX_AIOCB_Asynch_Transmit_Handler;
-  friend class ACE_POSIX_SIG_Asynch_Transmit_Handler;
-  // Handlers do all the job.
-
-  friend class ACE_POSIX_Proactor;
-  // The Proactor constructs the Result class for faking results.
-
-public:
-  ACE_HANDLE socket (void) const;
-  // Socket used for transmitting the file.
-
-  ACE_HANDLE file (void) const;
-  // File from which the data is read.
-
-  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const;
-  // Header and trailer data associated with this transmit file.
-
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous transmit file.
-
-  u_long bytes_per_send (void) const;
-  // Number of bytes per send requested at the start of the transmit
-  // file.
-
-  u_long flags (void) const;
-  // Flags which were passed into transmit file.
-
-  // = Base class operations. These operations are here to kill
-  //   dominance warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This is the ACT associated with the handle on which the
-  // Asynch_Operation takes place.
-  //
-  // @@ This is not implemented for POSIX4 platforms.
-  //
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // This returns ACE_INVALID_HANDLE.
-
-  u_long offset (void) const;
-  u_long offset_high (void) const;
-  // This really make sense only when doing file I/O.
-  //
-  // @@ On POSIX4-Unix, offset_high should be supported using
-  //     aiocb64.
-  //
-
-  int priority (void) const;
-  // The priority of the asynchronous operation.
-
-  int signal_number (void) const;
-  // POSIX4 real-time signal number to be used for the
-  // operation. <signal_number> ranges from SIGRTMIN to SIGRTMAX. By 
-  // default, SIGRTMIN is used to issue <aio_> calls. This is a no-op
-  // on non-POSIX4 systems and returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor.
-
-protected:
-  ACE_POSIX_Asynch_Transmit_File_Result (ACE_Handler &handler,
-                                         ACE_HANDLE socket,
-                                         ACE_HANDLE file,
-                                         ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                         u_long bytes_to_write,
-                                         u_long offset,
-                                         u_long offset_high,
-                                         u_long bytes_per_send,
-                                         u_long flags,
-                                         const void *act,
-                                         ACE_HANDLE event,
-                                         int priority,
-                                         int signal_number);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Transmit_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the write completes.
-
-  virtual ~ACE_POSIX_Asynch_Transmit_File_Result (void);
-  // Destructor.
-
-  ACE_HANDLE socket_;
-  // Network I/O handle.
-
-  // aiocb::aio_filedes
-  // File I/O handle.
-
-  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer_;
-  // Header and trailer data associated with this transmit file.
-
-  // aiocb::aio_nbytes
-  // The number of bytes which were requested at the start of the
-  // asynchronous transmit file.
-
-  u_long bytes_per_send_;
-  // Number of bytes per send requested at the start of the transmit
-  // file.
-
-  u_long flags_;
-  // Flags which were passed into transmit file.
-};
-
-class ACE_Export ACE_POSIX_AIOCB_Asynch_Transmit_File : public virtual ACE_Asynch_Transmit_File_Impl,
-                                                        public ACE_POSIX_AIOCB_Asynch_Operation
-{
-  // = DESCRIPTION
-  //     Implementation for transmit_file will make use of
-  //     POSIX_AIOCB_Asynch_Transmit_Handler.
-public:
-  ACE_POSIX_AIOCB_Asynch_Transmit_File (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor.
-
-  int transmit_file (ACE_HANDLE file,
-                     ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                     u_long bytes_to_write,
-                     u_long offset,
-                     u_long offset_high,
-                     u_long bytes_per_send,
-                     u_long flags,
-                     const void *act,
-                     int priority,
-                     int signal_number = 0);
-  // This starts off an asynchronous transmit file. The <file> is a
-  // handle to an open file.  <header_and_trailer> is a pointer to a
-  // data structure that contains pointers to data to send before and
-  // after the file data is sent.  Set this parameter to 0 if you only
-  // want to transmit the file data.  Upto <bytes_to_write> will be
-  // written to the <socket>.  If you want to send the entire file,
-  // let <bytes_to_write> = 0.  <bytes_per_send> is the size of each
-  // block of data sent per send operation. Please read the POSIX
-  // documentation on what the flags should be.
-
-  virtual ~ACE_POSIX_AIOCB_Asynch_Transmit_File (void);
-  // Destructor.
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-};
-
-class ACE_Export ACE_POSIX_SIG_Asynch_Transmit_File : public virtual ACE_Asynch_Transmit_File_Impl,
-                                                      public ACE_POSIX_SIG_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Transmit_File for Real-Time
-  //     Signal (<sigtimedwait>) based implementation of Proactor.
-  //
-  // = DESCRIPTION
-  //
-public:
-  ACE_POSIX_SIG_Asynch_Transmit_File (ACE_POSIX_SIG_Proactor *posix_sig_proactor);
-  // Constructor.
-
-  int transmit_file (ACE_HANDLE file,
-                     ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                     u_long bytes_to_write,
-                     u_long offset,
-                     u_long offset_high,
-                     u_long bytes_per_send,
-                     u_long flags,
-                     const void *act,
-                     int priority,
-                     int signal_number);
-  // This starts off an asynchronous transmit file. The <file> is a
-  // handle to an open file.  <header_and_trailer> is a pointer to a
-  // data structure that contains pointers to data to send before and
-  // after the file data is sent.  Set this parameter to 0 if you only
-  // want to transmit the file data.  Upto <bytes_to_write> will be
-  // written to the <socket>.  If you want to send the entire file,
-  // let <bytes_to_write> = 0.  <bytes_per_send> is the size of each
-  // block of data sent per send operation.
-
-  virtual ~ACE_POSIX_SIG_Asynch_Transmit_File (void);
-  // Destructor.
-  
-  // = Methods belong to ACE_POSIX_Asynch_Operation base class. These  
-  //   methods are defined here to avoid dominace warnings. They route 
-  //   the call to the ACE_POSIX_Asynch_Operation base class. 
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor = 0);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  //
-  // @@ Not implemented. Returns 0.
-  
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/POSIX_Asynch_IO.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_AIO_CALLS */
-#endif /* ACE_POSIX_ASYNCH_IO_H */
diff --git a/ace/POSIX_Asynch_IO.i b/ace/POSIX_Asynch_IO.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/ace/POSIX_Asynch_IO.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/ace/POSIX_Proactor.cpp b/ace/POSIX_Proactor.cpp
deleted file mode 100644
index 68c8aaf7be0..00000000000
--- a/ace/POSIX_Proactor.cpp
+++ /dev/null
@@ -1,1233 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_DLL
-#include "ace/POSIX_Proactor.h"
-
-#if defined (ACE_HAS_AIO_CALLS)
-
-#include "ace/Task_T.h"
-#include "ace/Log_Msg.h"
-#include "ace/Object_Manager.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
-#endif /* __ACE_INLINE__ */
-
-class ACE_Export ACE_POSIX_Wakeup_Completion : public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  // 
-  //     This is result object is used by the <end_event_loop> of the 
-  //     ACE_Proactor interface to wake up all the threads blocking
-  //     for completions.
-  // 
-  // = DESCRIPTION
-  // 
-  
-public:
-  ACE_POSIX_Wakeup_Completion (ACE_Handler &handler,
-                               const void *act = 0,
-                               ACE_HANDLE event = ACE_INVALID_HANDLE,
-                               int priority = 0,
-                               int signal_number = ACE_SIGRTMIN);
-  // Constructor.
-  
-  virtual ~ACE_POSIX_Wakeup_Completion (void);
-  // Destructor.
-  
-  
-  virtual void complete (u_long bytes_transferred = 0,
-                         int success = 1,
-                         const void *completion_key = 0,
-                         u_long error = 0);
-  // This method calls the <handler>'s <handle_wakeup> method.
-};
-
-// *********************************************************************
-
-ACE_POSIX_Proactor::~ACE_POSIX_Proactor (void)
-{
-  this->close ();
-}
-
-int
-ACE_POSIX_Proactor::close (void)
-{
-  return 0;
-}
-
-int
-ACE_POSIX_Proactor::register_handle (ACE_HANDLE handle,
-                                     const void *completion_key)
-{
-  ACE_UNUSED_ARG (handle);
-  ACE_UNUSED_ARG (completion_key);
-  return 0;
-}
-
-int
-ACE_POSIX_Proactor::wake_up_dispatch_threads (void)
-{
-  return 0;
-}
-
-int
-ACE_POSIX_Proactor::close_dispatch_threads (int)
-{
-  return 0;
-}
-
-size_t
-ACE_POSIX_Proactor::number_of_threads (void) const
-{
-  // @@ Implement it.
-  ACE_NOTSUP_RETURN (0);
-}
-
-void
-ACE_POSIX_Proactor::number_of_threads (size_t threads)
-{
-  // @@ Implement it.
-  ACE_UNUSED_ARG (threads);
-}
-
-ACE_HANDLE
-ACE_POSIX_Proactor::get_handle (void) const
-{
-  return ACE_INVALID_HANDLE;
-}
-
-ACE_Asynch_Read_Stream_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block &message_block,
-                                                      u_long bytes_to_read,
-                                                      const void* act,
-                                                      ACE_HANDLE event,
-                                                      int priority,
-                                                      int signal_number)
-{
-  ACE_Asynch_Read_Stream_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Read_Stream_Result (handler,
-                                                       handle,
-                                                       message_block,
-                                                       bytes_to_read,
-                                                       act,
-                                                       event,
-                                                       priority,
-                                                       signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_Stream_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                       ACE_HANDLE handle,
-                                                       ACE_Message_Block &message_block,
-                                                       u_long bytes_to_write,
-                                                       const void* act,
-                                                       ACE_HANDLE event,
-                                                       int priority,
-                                                       int signal_number)
-{
-  ACE_Asynch_Write_Stream_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Write_Stream_Result (handler,
-                                                        handle,
-                                                        message_block,
-                                                        bytes_to_write,
-                                                        act,
-                                                        event,
-                                                        priority,
-                                                        signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Read_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                                    ACE_HANDLE handle,
-                                                    ACE_Message_Block &message_block,
-                                                    u_long bytes_to_read,
-                                                    const void* act,
-                                                    u_long offset,
-                                                    u_long offset_high,
-                                                    ACE_HANDLE event,
-                                                    int priority,
-                                                    int signal_number)
-{
-  ACE_Asynch_Read_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Read_File_Result (handler,
-                                                     handle,
-                                                     message_block,
-                                                     bytes_to_read,
-                                                     act,
-                                                     offset,
-                                                     offset_high,
-                                                     event,
-                                                     priority,
-                                                     signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block &message_block,
-                                                     u_long bytes_to_write,
-                                                     const void* act,
-                                                     u_long offset,
-                                                     u_long offset_high,
-                                                     ACE_HANDLE event,
-                                                     int priority,
-                                                     int signal_number)
-{
-  ACE_Asynch_Write_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Write_File_Result (handler,
-                                                      handle,
-                                                      message_block,
-                                                      bytes_to_write,
-                                                      act,
-                                                      offset,
-                                                      offset_high,
-                                                      event,
-                                                      priority,
-                                                      signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Accept_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                                 ACE_HANDLE listen_handle,
-                                                 ACE_HANDLE accept_handle,
-                                                 ACE_Message_Block &message_block,
-                                                 u_long bytes_to_read,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
-{
-  ACE_Asynch_Accept_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Accept_Result (handler,
-                                                  listen_handle,
-                                                  accept_handle,
-                                                  message_block,
-                                                  bytes_to_read,
-                                                  act,
-                                                  event,
-                                                  priority,
-                                                  signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Transmit_File_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                        ACE_HANDLE socket,
-                                                        ACE_HANDLE file,
-                                                        ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                        u_long bytes_to_write,
-                                                        u_long offset,
-                                                        u_long offset_high,
-                                                        u_long bytes_per_send,
-                                                        u_long flags,
-                                                        const void *act,
-                                                        ACE_HANDLE event,
-                                                        int priority,
-                                                        int signal_number)
-{
-  ACE_Asynch_Transmit_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Transmit_File_Result (handler,
-                                                         socket,
-                                                         file,
-                                                         header_and_trailer,
-                                                         bytes_to_write,
-                                                         offset,
-                                                         offset_high,
-                                                         bytes_per_send,
-                                                         flags,
-                                                         act,
-                                                         event,
-                                                         priority,
-                                                         signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Result_Impl *
-ACE_POSIX_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                         const void *act,
-                                         const ACE_Time_Value &tv,
-                                         ACE_HANDLE event,
-                                         int priority,
-                                         int signal_number)
-{
-  ACE_Asynch_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Timer (handler,
-                                          act,
-                                          tv,
-                                          event,
-                                          priority,
-                                          signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_POSIX_Proactor::ACE_POSIX_Proactor (void)
-{
-}
-
-#if 0
-int
-ACE_POSIX_Proactor::handle_signal (int, siginfo_t *, ucontext_t *)
-{
-  // Perform a non-blocking "poll" for all the I/O events that have
-  // completed in the I/O completion queue.
-
-  ACE_Time_Value timeout (0, 0);
-  int result = 0;
-
-  while (1)
-    {
-      result = this->handle_events (timeout);
-      if (result != 0 || errno == ETIME)
-        break;
-    }
-
-  // If our handle_events failed, we'll report a failure to the
-  // Reactor.
-  return result == -1 ? -1 : 0;
-}
-
-int
-ACE_POSIX_Proactor::handle_close (ACE_HANDLE handle,
-                                  ACE_Reactor_Mask close_mask)
-{
-  ACE_UNUSED_ARG (close_mask);
-  ACE_UNUSED_ARG (handle);
-
-  return this->close ();
-}
-#endif /* 0 */
-
-void
-ACE_POSIX_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_result,
-                                               u_long bytes_transferred,
-                                               int success,
-                                               const void */* completion_key*/,
-                                               u_long error)
-{
-  ACE_SEH_TRY
-    {
-      // Call completion hook
-      asynch_result->complete (bytes_transferred,
-                               success,
-                               0, // No completion key.
-                               error);
-    }
-  ACE_SEH_FINALLY
-    {
-      // This is crucial to prevent memory leaks
-      delete asynch_result;
-    }
-}
-
-int
-ACE_POSIX_Proactor::post_wakeup_completions (int how_many)
-{
-  ACE_POSIX_Wakeup_Completion *wakeup_completion = 0;
-  for (ssize_t ci = 0; ci < how_many; ci++)
-    {
-      ACE_NEW_RETURN (wakeup_completion,
-                      ACE_POSIX_Wakeup_Completion (this->wakeup_handler_),
-                      -1);
-      
-      if (wakeup_completion->post_completion (this) == -1)
-        return -1;
-    }
-  
-  return 0;
-}  
-
-// *********************************************************************
-
-class ACE_Export ACE_AIOCB_Notify_Pipe_Manager : public ACE_Handler
-{
-  // = TITLE
-  //     This class manages the notify pipe of the AIOCB
-  //     Proactor. This class acts as the Handler for the
-  //     <Asynch_Read> operations issued on the notify pipe. This
-  //     class is very useful in implementing <Asynch_Accept> operation
-  //     class for the <AIOCB_Proactor>. This is also useful for
-  //     implementing <post_completion> for <AIOCB_Proactor>.
-  //
-  // = DESCRIPTION
-  //     <AIOCB_Proactor> class issues a <Asynch_Read> on
-  //     the pipe, using this class as the
-  //     Handler. <POSIX_Asynch_Result *>'s are sent through the
-  //     notify pipe. When <POSIX_Asynch_Result *>'s show up on the
-  //     notify pipe, the <POSIX_AIOCB_Proactor> dispatches the
-  //     completion of the <Asynch_Read_Stream> and calls the
-  //     <handle_read_stream> of this class. This class calls
-  //     <complete> on the <POSIX_Asynch_Result *> and thus calls the
-  //     application handler.
-  //     Handling the MessageBlock:
-  //     We give this message block to read the result pointer through
-  //     the notify pipe. We expect that to read 4 bytes from the
-  //     notify pipe, for each <accept> call. Before giving this
-  //     message block to another <accept>, we update <wr_ptr> and put
-  //     it in its initial position.
-public:
-  ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor);
-  // Constructor. You need the posix proactor because you need to call
-  // <application_specific_code>
-
-  virtual ~ACE_AIOCB_Notify_Pipe_Manager (void);
-  // Destructor.
-
-  int notify (ACE_POSIX_Asynch_Result *result);
-  // Send the result pointer through the notification pipe.
-
-  virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
-  // This is the call back method when <Asynch_Read> from the pipe is
-  // complete.
-
-private:
-  ACE_POSIX_AIOCB_Proactor  *posix_aiocb_proactor_;
-  // The implementation proactor class.
-
-  ACE_Message_Block message_block_;
-  // Message block to get ACE_POSIX_Asynch_Result pointer from the
-  // pipe.
-
-  ACE_Pipe pipe_;
-  // Pipe for the communication between Proactor and the
-  // Asynch_Accept.
-
-  ACE_POSIX_AIOCB_Asynch_Read_Stream read_stream_;
-  // To do asynch_read on the pipe.
-
-  ACE_AIOCB_Notify_Pipe_Manager (void);
-  // Default constructor. Shouldnt be called.
-};
-
-ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Proactor *posix_aiocb_proactor)
-  : posix_aiocb_proactor_ (posix_aiocb_proactor),
-    message_block_ (sizeof (ACE_POSIX_Asynch_Accept_Result *)),
-    read_stream_ (posix_aiocb_proactor)
-{
-  // Open the pipe.
-  this->pipe_.open ();
-
-  // Open the read stream.
-  if (this->read_stream_.open (*this,
-                               this->pipe_.read_handle (),
-                               0, // Completion Key
-                               0) // Proactor
-      == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%N:%l:%p\n",
-                "ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:"
-                "Open on Read Stream failed"));
-
-  // Issue an asynch_read on the read_stream of the notify pipe.
-  if (this->read_stream_.read (this->message_block_,
-                               sizeof (ACE_POSIX_Asynch_Result *),
-                               0, // ACT
-                               0) // Priority
-      == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%N:%l:%p\n",
-                "ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:"
-                "Read from pipe failed"));
-}
-
-ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager (void)
-{
-}
-
-int
-ACE_AIOCB_Notify_Pipe_Manager::notify (ACE_POSIX_Asynch_Result *result)
-{
-  // Send the result pointer through the pipe.
-  int return_val = ACE::send (this->pipe_.write_handle (),
-                              ACE_reinterpret_cast (char *,
-                                                    &result),
-                              sizeof (result));
-  if (return_val != sizeof (result))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%P %t):%p\n",
-                       "ACE_AIOCB_Notify_Pipe_Manager::notify"
-                       "Error:Writing on to notify pipe failed"),
-                      -1);
-  return 0;
-}
-
-void
-ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
-{
-  // The message block actually contains the ACE_POSIX_Asynch_Result
-  // pointer.
-  ACE_POSIX_Asynch_Result *asynch_result = 0;
-  asynch_result = *(ACE_POSIX_Asynch_Result **) result.message_block ().rd_ptr ();
-
-  // Do the upcall.
-  this->posix_aiocb_proactor_->application_specific_code (asynch_result,
-                                                          0,  // No Bytes transferred.
-                                                          1,  // Success.
-                                                          0,  // Completion token.
-                                                          0); // Error.
-
-  // Set the message block properly. Put the <wr_ptr> back in the
-  // initial position.
-  if (this->message_block_.length () > 0)
-      this->message_block_.wr_ptr (this->message_block_.rd_ptr ());
-
-  // One accept has completed. Issue a read to handle any
-  // <post_completion>s in the future.
-  if (this->read_stream_.read (this->message_block_,
-                               sizeof (ACE_POSIX_Asynch_Result *),
-                               0,  // ACT
-                               0)  // Priority
-      == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%N:%l:(%P | %t):%p\n",
-                "ACE_AIOCB_Notify_Pipe_Manager::handle_read_stream:"
-                "Read from pipe failed"));
-}
-
-// *********************************************************************
-
-ACE_POSIX_AIOCB_Proactor::ACE_POSIX_AIOCB_Proactor (void)
-  : aiocb_notify_pipe_manager_ (0),
-    aiocb_list_max_size_ (ACE_RTSIG_MAX),
-    aiocb_list_cur_size_ (0)
-{
-  // Initialize the array.
-  for (size_t ai = 0; ai < this->aiocb_list_max_size_; ai++)
-    {
-      aiocb_list_[ai] = 0;
-      result_list_ [ai] = 0;
-    }
-
-  // Accept Handler for aio_accept. Remember! this issues a Asynch_Read
-  // on the notify pipe for doing the Asynch_Accept.
-  ACE_NEW (aiocb_notify_pipe_manager_,
-           ACE_AIOCB_Notify_Pipe_Manager (this));
-}
-
-// Destructor.
-ACE_POSIX_AIOCB_Proactor::~ACE_POSIX_AIOCB_Proactor (void)
-{
-}
-
-int
-ACE_POSIX_AIOCB_Proactor::handle_events (ACE_Time_Value &wait_time)
-{
-  // Decrement <wait_time> with the amount of time spent in the method
-  ACE_Countdown_Time countdown (&wait_time);
-  return this->handle_events (wait_time.msec ());
-}
-
-int
-ACE_POSIX_AIOCB_Proactor::handle_events (void)
-{
-  return this->handle_events (ACE_INFINITE);
-}
-
-int
-ACE_POSIX_AIOCB_Proactor::post_completion (ACE_POSIX_Asynch_Result *result)
-{
-  // Notify to the completion queue.
-  return this->aiocb_notify_pipe_manager_->notify (result);
-}
-
-ACE_Asynch_Read_Stream_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_read_stream (void)
-{
-  ACE_Asynch_Read_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Read_Stream (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_Stream_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_write_stream (void)
-{
-  ACE_Asynch_Write_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Write_Stream (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Read_File_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_read_file (void)
-{
-  ACE_Asynch_Read_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Read_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Write_File_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_write_file (void)
-{
-  ACE_Asynch_Write_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Write_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Accept_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_accept (void)
-{
-  ACE_Asynch_Accept_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Accept (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Transmit_File_Impl *
-ACE_POSIX_AIOCB_Proactor::create_asynch_transmit_file (void)
-{
-  ACE_Asynch_Transmit_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_AIOCB_Asynch_Transmit_File (this),
-                  0);
-  return  implementation;
-}
-
-int
-ACE_POSIX_AIOCB_Proactor::handle_events (unsigned long milli_seconds)
-{
-  int result_suspend = 0;
-  if (milli_seconds == ACE_INFINITE)
-    {
-      // Indefinite blocking.
-      result_suspend = aio_suspend (this->aiocb_list_,
-                                    this->aiocb_list_max_size_,
-                                    0);
-    }
-  else
-    {
-      // Block on <aio_suspend> for <milli_seconds>
-      timespec timeout;
-      timeout.tv_sec = milli_seconds / 1000;
-      timeout.tv_nsec = (milli_seconds - (timeout.tv_sec * 1000)) * 1000;
-      result_suspend = aio_suspend (this->aiocb_list_,
-                                    this->aiocb_list_max_size_,
-                                    &timeout);
-    }
-
-  // Check for errors
-  if (result_suspend == -1)
-    {
-      // If failure is because of timeout, then return *0*, otherwise
-      // return -1.
-      if (errno ==  EAGAIN)
-        return 0;
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_AIOCB_Proactor::handle_events:"
-                           "aio_suspend failed"),
-                          -1);
-    }
-
-  // No errors, check which aio has finished.
-  size_t ai;
-  int error_status = 0;
-  int return_status = 0;
-  for (ai = 0; ai < this->aiocb_list_max_size_; ai++)
-    {
-      // Dont process null blocks.
-      if (aiocb_list_ [ai] == 0)
-        continue;
-
-      // Analyze error and return values.
-
-      // Get the error status of the aio_ operation.
-      error_status = aio_error (aiocb_list_[ai]);
-      if (error_status == -1)
-        // <aio_error> itself has failed.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_AIOCB_Proactor::handle_events:"
-                           "<aio_error> has failed"),
-                          -1);
-
-      // Is <aio_> operation still in progress?
-      if (error_status == EINPROGRESS)
-        continue;
-
-      // Error_status is not -1 and not EINPROGRESS. So, an <aio_>
-      // operation has finished (successfully or unsuccessfully!!!)
-      // Get the return_status of the <aio_> operation.
-      return_status = aio_return (aiocb_list_[ai]);
-      if (return_status == -1)
-        // <aio_return> itself has failed.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_AIOCB_Proactor::handle_events:"
-                           "<aio_return> failed"),
-                          -1);
-      else
-        // This AIO has finished.
-        break;
-    }
-
-  // Something should have completed.
-  ACE_ASSERT (ai != this->aiocb_list_max_size_);
-
-  // Retrive the result pointer.
-  ACE_POSIX_Asynch_Result *asynch_result = this->result_list_ [ai];
-    
-  // ACE_reinterpret_cast (ACE_POSIX_Asynch_Result *,
-  //                   this->aiocb_list_[ai]);
-  // ACE_dynamic_cast (ACE_POSIX_Asynch_Result *,
-  //                   this->aiocb_list_[ai]);
-
-  // Invalidate entry in the aiocb list.
-  this->aiocb_list_[ai] = 0;
-  this->result_list_ [ai] = 0;
-  this->aiocb_list_cur_size_--;
-
-  // Call the application code.
-  this->application_specific_code (asynch_result,
-                                   return_status, // Bytes transferred.
-                                   1,             // Success
-                                   0,             // No completion key.
-                                   error_status); // Error
-
-  // Success
-  return 1;
-}
-
-void
-ACE_POSIX_AIOCB_Proactor::application_specific_code (ACE_POSIX_Asynch_Result *asynch_result,
-                                                     u_long bytes_transferred,
-                                                     int success,
-                                                     const void *completion_key,
-                                                     u_long error)
-{
-  ACE_POSIX_Proactor::application_specific_code (asynch_result,
-                                                 bytes_transferred,
-                                                 success,
-                                                 completion_key,
-                                                 error);
-}
-
-int
-ACE_POSIX_AIOCB_Proactor::register_aio_with_proactor (ACE_POSIX_Asynch_Result *result)
-{
-  ACE_TRACE ("ACE_POSIX_AIOCB_Proactor::register_aio_with_proactor");
-
-  if (result == 0)
-    {
-      // Just check the status of the list.
-      if (this->aiocb_list_cur_size_ >=
-          this->aiocb_list_max_size_)
-        return -1;
-      else
-        return 0;
-    }
-
-  // Non-zero ptr. Find a free slot and store.
-
-  // Make sure again.
-  if (this->aiocb_list_cur_size_ >=
-      this->aiocb_list_max_size_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:Asynch_Operation: No space to store the <aio> info.\n"),
-                      -1);
-
-  // Slot(s) available. Find a free one.
-  size_t ai;
-  for (ai = 0;
-       ai < this->aiocb_list_max_size_;
-       ai++)
-    if (this->aiocb_list_[ai] == 0)
-      break;
-
-   // Sanity check.
-  if (ai == this->aiocb_list_max_size_)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:Asynch_Operation: No space to store the <aio> info.\n"),
-                      -1);
-
-  // Store the pointers.
-  this->aiocb_list_[ai] = result; 
-  this->result_list_ [ai] = result;
-
-  this->aiocb_list_cur_size_ ++;
-
-  return 0;
-}
-
-// *********************************************************************
-
-ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (void)
-{
-  // = Mask all the signals, keep a mask set with ACE_SIGRTMIN and set
-  //   up signal handler for SIGRTMIN.
-
-  // Mask all the signals.
-  if (this->mask_all () != 0)
-    return;
-
-  // = Keep a mask set with ACE_SIGRTMIN.
-
-  // Clear the signal set.
-  if (sigemptyset (&this->RT_completion_signals_) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "Error:%p\n",
-                "Couldn't init the RT completion signal set"));
-
-  // Add the signal number to the signal set.
-  if (sigaddset (&this->RT_completion_signals_, ACE_SIGRTMIN) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "Error:%p\n",
-                "Couldnt init the RT completion signal set"));
-
-  // Set up the signal handler for SIGRTMIN.
-  setup_signal_handler (ACE_SIGRTMIN);
-}
-
-ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set)
-{
-  // = Keep <Signal_set> with the Proactor, mask all the signals and
-  //   setup signal handlers for the signals in the <signal_set>.
-
-  // = Keep <signal_set> with the Proactor.
-
-  // Empty the signal set first.
-  if (sigemptyset (&this->RT_completion_signals_) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "Error:(%P | %t):%p\n",
-                "sigemptyset failed"));
-
-  //  Put the <signal_set>.
-  if (ACE_OS::pthread_sigmask (SIG_SETMASK, &signal_set, 0) != 0)
-    ACE_ERROR ((LM_ERROR,
-                "Error:(%P | %t):%p\n",
-                "pthread_sigmask failed"));
-
-  // Get the <signal_set> back from the OS.
-  if (ACE_OS::pthread_sigmask (SIG_SETMASK, 0, &this->RT_completion_signals_) != 0)
-    ACE_ERROR ((LM_ERROR,
-                "Error:(%P | %t):%p\n",
-                "ACE_OS::pthread_sigmask failed"));
-
-
-  // Mask all the signals.
-  if (this->mask_all () != 0)
-    return;
-
-  // For each signal number present in the <signal_set>, set up the
-  // signal handler.
-  int member = 0;
-  for (int si = ACE_SIGRTMIN; si <= ACE_SIGRTMAX; si++)
-    {
-      member = sigismember (&signal_set,
-                            si);
-      if (member == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%N:%l:(%P | %t)::%p\n",
-                    "ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:"
-                    "sigismember failed"));
-      else if (member == 1)
-        {
-          if (this->setup_signal_handler (si) == -1)
-            return;
-        }
-    }
-}
-
-ACE_POSIX_SIG_Proactor::~ACE_POSIX_SIG_Proactor (void)
-{
-  // @@ Enable the masked signals again.
-}
-
-int
-ACE_POSIX_SIG_Proactor::handle_events (ACE_Time_Value &wait_time)
-{
-  // Decrement <wait_time> with the amount of time spent in the method
-  ACE_Countdown_Time countdown (&wait_time);
-  return this->handle_events (wait_time.msec ());
-}
-
-int
-ACE_POSIX_SIG_Proactor::handle_events (void)
-{
-  return this->handle_events (ACE_INFINITE);
-}
-
-int
-ACE_POSIX_SIG_Proactor::post_completion (ACE_POSIX_Asynch_Result *result)
-{
-  // Get this process id.
-  pid_t pid = ACE_OS::getpid ();
-  if (pid == (pid_t) -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N:%l(%P | %t):%p",
-                       "<getpid> failed"),
-                      -1);
-
-  // Set the signal information.
-  sigval value;
-  value.sival_ptr = ACE_reinterpret_cast (void *,
-                                          result);
-
-  // Queue the signal.
-  if (sigqueue (pid, result->signal_number (), value) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N:%l:(%P | %t):%p\n",
-                       "<sigqueue> failed"),
-                      -1);
-  return 0;
-}
-
-ACE_Asynch_Read_Stream_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_read_stream (void)
-{
-  ACE_Asynch_Read_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_Stream (this), 0);
-  return  implementation;
-}
-
-ACE_Asynch_Write_Stream_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_write_stream (void)
-{
-  ACE_Asynch_Write_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_Stream (this), 0);
-  return  implementation;
-}
-
-ACE_Asynch_Read_File_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_read_file (void)
-{
-  ACE_Asynch_Read_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Read_File (this), 0);
-  return  implementation;
-}
-
-ACE_Asynch_Write_File_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_write_file (void)
-{
-  ACE_Asynch_Write_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Write_File (this), 0);
-  return  implementation;
-}
-
-ACE_Asynch_Accept_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_accept (void)
-{
-  ACE_Asynch_Accept_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation, ACE_POSIX_SIG_Asynch_Accept (this), 0);
-  return implementation;
-}
-
-ACE_Asynch_Transmit_File_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_transmit_file (void)
-{
-  ACE_Asynch_Transmit_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_SIG_Asynch_Transmit_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Result_Impl *
-ACE_POSIX_SIG_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                             const void *act,
-                                             const ACE_Time_Value &tv,
-                                             ACE_HANDLE event,
-                                             int priority,
-                                             int signal_number)
-{
-  int is_member = 0;
-
-  // Fix the signal number.
-  if (signal_number == -1)
-    {
-      int si;
-      for (si = ACE_SIGRTMAX;
-           (is_member == 0) && (si >= ACE_SIGRTMIN);
-           si--)
-        {
-          is_member = sigismember (&this->RT_completion_signals_,
-                                   si);
-          if (is_member == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%N:%l:(%P | %t)::\n",
-                               "ACE_POSIX_SIG_Proactor::create_asynch_timer:"
-                               "sigismember failed"),
-                              0);
-        }
-
-      if (is_member == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:%N:%l:(%P | %t)::%s\n",
-                           "ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:"
-                           "Signal mask set empty"),
-                          0);
-      else
-        // + 1 to nullify loop increment.
-        signal_number = si + 1;
-    }
-
-  ACE_Asynch_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_POSIX_Asynch_Timer (handler,
-                                          act,
-                                          tv,
-                                          event,
-                                          priority,
-                                          signal_number),
-                  0);
-  return implementation;
-}
-
-int
-ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const
-{
-  // Set up the handler(actually Null handler) for this real-time
-  // signal.
-  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 function.
-  int sigaction_return = sigaction (signal_number,
-                                    &reaction,
-                                    0);
-  if (sigaction_return == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "Proactor couldnt do sigaction for the RT SIGNAL"),
-                      -1);
-  return 0;
-}
-
-void
-ACE_POSIX_SIG_Proactor::null_handler (int signal_number,
-                                      siginfo_t * /* info */,
-                                      void *      /* context */)
-{
-  ACE_ERROR ((LM_ERROR,
-              "Error:(%P | %t):ACE_POSIX_SIG_Proactor::null_handler called,"
-              "Signal number %d,"
-              "Mask all the RT signals for this thread\n",
-              signal_number));
-}
-
-int
-ACE_POSIX_SIG_Proactor::mask_all (void) const
-{
-  sigset_t full_set;
-
-  // Get full set.
-  if (sigfillset (&full_set) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "sigfillset failed"),
-                      -1);
-
-  // Mask them.
-  if (ACE_OS::pthread_sigmask (SIG_SETMASK, &full_set, 0) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "pthread_sigmask failed"),
-                      -1);
-
-  return 0;
-}
-
-int
-ACE_POSIX_SIG_Proactor::handle_events (unsigned long milli_seconds)
-{
-  int result_sigwait = 0;
-  siginfo_t sig_info;
-
-  // Mask all the signals.
-  if (this->mask_all () != 0)
-    return -1;
-
-  // Wait for the signals.
-  if (milli_seconds == ACE_INFINITE)
-    {
-      result_sigwait = sigwaitinfo (&this->RT_completion_signals_,
-                                    &sig_info);
-    }
-  else
-    {
-      // Wait for <milli_seconds> amount of time.
-      timespec timeout;
-      timeout.tv_sec = milli_seconds / 1000;
-      timeout.tv_nsec = (milli_seconds - (timeout.tv_sec * 1000)) * 1000;
-      result_sigwait = sigtimedwait (&this->RT_completion_signals_,
-                                     &sig_info,
-                                     &timeout);
-    }
-
-  // Check for errors
-  if (result_sigwait == -1)
-    {
-      // If failure is coz of timeout, then return *0* but set errno
-      // appropriately.
-      if (errno == EAGAIN)
-        return 0;
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_SIG_Proactor::handle_events:"
-                           "sigtimedwait/sigwaitinfo failed"),
-                          -1);
-    }
-
-  // No errors, RT compleion signal is received.
-
-  // Is the signo returned consistent with the sig info?
-  if (sig_info.si_signo != result_sigwait)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%N:%l:(%P | %t):"
-                       "ACE_POSIX_SIG_Proactor::handle_events:"
-                       "Inconsistent signal number (%d) in the signal info block",
-                       sig_info.si_signo),
-                      -1);
-
-  // Retrive the result pointer.
-  ACE_POSIX_Asynch_Result *asynch_result = ACE_reinterpret_cast (ACE_POSIX_Asynch_Result *,
-                                                                 sig_info.si_value.sival_ptr);
-
-  // Check the <signal code> and act according to that.
-  if (sig_info.si_code == SI_ASYNCIO)
-    {
-      // Analyze error and return values.
-
-      // Check the error status
-      int error_status = aio_error (asynch_result);
-      if (error_status == -1)
-        // <aio_error> itself has failed.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_SIG_Proactor::handle_events:"
-                           "<aio_error> has failed"),
-                          -1);
-
-      // Completion signal has been received, so it can't be in
-      // progress.
-      ACE_ASSERT (error_status != EINPROGRESS);
-
-      // Error_status is not -1 and not EINPROGRESS. So, an <aio_>
-      // operation has finished (successfully or unsuccessfully!!!)
-      // Get the return_status of the <aio_> operation.
-      int return_status = aio_return (asynch_result);
-      if (return_status == -1)
-        // <aio_return> itself has failed.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:(%P | %t)::%p\n",
-                           "ACE_POSIX_SIG_Proactor::handle_events:"
-                           "<aio_return> failed"),
-                          -1);
-      else
-        {
-          // AIO has finished
-          this->application_specific_code (asynch_result,
-                                           return_status,
-                                           1,             // Result : True.
-                                           0,             // No completion key.
-                                           error_status); // Error.
-        }
-    }
-  else if (sig_info.si_code == SI_QUEUE)
-    {
-      this->application_specific_code (asynch_result,
-                                       0, // No bytes transferred.
-                                       1, // Result : True.
-                                       0, // No completion key.
-                                       0);// No error.
-    }
-  else
-    // Unknown signal code.
-    ACE_ERROR_RETURN ((LM_DEBUG,
-                       "%N:%l:(%P | %t):",
-                       "ACE_POSIX_SIG_Proactor::handle_events:\n"
-                       "Unexpected signal code (%d) returned on completion querying\n",
-                       sig_info.si_code),
-                      -1);
-
-  // Success
-  return 1;
-}
-
-// *********************************************************************
-
-ACE_POSIX_Asynch_Timer::ACE_POSIX_Asynch_Timer (ACE_Handler &handler,
-                                                const void *act,
-                                                const ACE_Time_Value &tv,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    time_ (tv)
-{
-}
-
-void
-ACE_POSIX_Asynch_Timer::complete (u_long bytes_transferred,
-                                  int success,
-                                  const void *completion_key,
-                                  u_long error)
-{
-  ACE_UNUSED_ARG (error);
-  ACE_UNUSED_ARG (completion_key);
-  ACE_UNUSED_ARG (success);
-  ACE_UNUSED_ARG (bytes_transferred);
-
-  this->handler_.handle_time_out (this->time_, this->act ());
-}
-
-// *********************************************************************
-
-ACE_POSIX_Wakeup_Completion::ACE_POSIX_Wakeup_Completion (ACE_Handler &handler,
-                                                          const void *act,
-                                                          ACE_HANDLE event,
-                                                          int priority,
-                                                          int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_POSIX_Asynch_Result (handler, act, event, 0, 0, priority, signal_number)
-{
-}
-
-ACE_POSIX_Wakeup_Completion::~ACE_POSIX_Wakeup_Completion (void)
-{
-}
-
-void
-ACE_POSIX_Wakeup_Completion::complete (u_long       /* bytes_transferred */,
-                                       int          /* success */,
-                                       const void * /* completion_key */,
-                                       u_long       /*  error */)
-{
-  this->handler_.handle_wakeup ();
-}
-
-#endif /* ACE_HAS_AIO_CALLS */
diff --git a/ace/POSIX_Proactor.h b/ace/POSIX_Proactor.h
deleted file mode 100644
index ee3b4af9c01..00000000000
--- a/ace/POSIX_Proactor.h
+++ /dev/null
@@ -1,430 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    POSIX_Proactor.h
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>,
-//    Tim Harrison <harrison@cs.wustl.edu> and
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_POSIX_PROACTOR_H)
-#define ACE_POSIX_PROACTOR_H
-
-#include "ace/Proactor_Impl.h"
-
-#if defined (ACE_HAS_AIO_CALLS)
-// POSIX implementation of Proactor depends on the <aio_> family of
-// system calls.
-
-#include "ace/Free_List.h"
-#include "ace/Pipe.h"
-#include "ace/POSIX_Asynch_IO.h"
-
-class ACE_Export ACE_POSIX_Proactor : public ACE_Proactor_Impl
-{
-  // = TITLE
-  //
-  //     POSIX implementation of the Proactor.
-  //
-  // = DESCRIPTION
-  //
-  //     There are two different strategies by which Proactor can get
-  //     to know the completion of <aio> operations. One is based on
-  //     Asynchronous I/O Control Blocks (AIOCB) where a list of
-  //     AIOCBs are stored and completion status of the corresponding
-  //     operations are queried on them. The other one is based on
-  //     POSIX Real Time signals. This class abstracts out the common
-  //     code needed for both the strategies. ACE_AIOCB_Proactor and
-  //     ACE_SIG_Proactor specialize this class for each strategy.
-
-  friend class ACE_POSIX_SIG_Asynch_Accept_Handler;
-  // For <POSIX_SIG_Asynch_Accept> operation, this handler class does
-  // the actual work, has to register the real-time signal with the
-  // Proactor. 
-
-public:
-  virtual ~ACE_POSIX_Proactor (void);
-  // Virtual destructor.
-
-  virtual int close (void);
-  // Close down the Proactor.
-
-  virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key);
-  // This function is a no-op function for Unix systems. Returns 0.
-  
-  virtual int post_completion (ACE_POSIX_Asynch_Result *result) = 0;
-  // Post a result to the completion port of the Proactor.  If errors
-  // occur, the result will be deleted by this method.  If successful,
-  // the result will be deleted by the Proactor when the result is
-  // removed from the completion port. Therefore, the result should
-  // have been dynamically allocated and should be orphaned by the
-  // user once this method is called.
-
-  int wake_up_dispatch_threads (void);
-  // Add wakeup dispatch threads (reinit).
-
-  int close_dispatch_threads (int wait);
-  // Close all dispatch threads.
-
-  size_t number_of_threads (void) const;
-  void number_of_threads (size_t threads);
-  // Number of thread used as a parameter to CreatIoCompletionPort.
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // Get the event handle. This is a no-op in POSIX. Returns
-  // ACE_INVALID_HANDLE. 
-
-  // Methods used to create Asynch_IO_Result objects. We create the right
-  // objects here in these methods.
-
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block &message_block,
-                                                                                u_long bytes_to_read,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                int priority = 0,
-                                                                                int signal_number = ACE_SIGRTMIN);
-
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
-                                                                                  ACE_HANDLE handle,
-                                                                                  ACE_Message_Block &message_block,
-                                                                                  u_long bytes_to_write,
-                                                                                  const void* act,
-                                                                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                  int priority = 0,
-                                                                                  int signal_number = ACE_SIGRTMIN);
-
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_read,
-                                                                            const void* act,
-                                                                            u_long offset,
-                                                                            u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN);
-
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block &message_block,
-                                                                              u_long bytes_to_write,
-                                                                              const void* act,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN);
-
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
-                                                                      ACE_HANDLE listen_handle,
-                                                                      ACE_HANDLE accept_handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                      int priority = 0,
-                                                                      int signal_number = ACE_SIGRTMIN);
-
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                                                    ACE_HANDLE socket,
-                                                                                    ACE_HANDLE file,
-                                                                                    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                                    u_long bytes_to_write,
-                                                                                    u_long offset,
-                                                                                    u_long offset_high,
-                                                                                    u_long bytes_per_send,
-                                                                                    u_long flags,
-                                                                                    const void *act,
-                                                                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                    int priority = 0,
-                                                                                    int signal_number = ACE_SIGRTMIN);
-  
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN);
-  // Create a timer result object which can be used with the Timer
-  // mechanism of the Proactor. 
-  
-protected:
-  ACE_POSIX_Proactor (void);
-  // Constructor.
-
-  void application_specific_code (ACE_POSIX_Asynch_Result *asynch_result,
-				  u_long bytes_transferred,
-				  int success,
-				  const void *completion_key,
-				  u_long error);
-  // Protect against structured exceptions caused by user code when
-  // dispatching handles. The <completion_key> is not very useful
-  // compared to <AST> that can be associated each asynchronous
-  // operation. <completion_key> is implemented right now for the
-  // POSIX Proators.
-
-  virtual int post_wakeup_completions (int how_many);
-  // Post <how_many> completions to the completion port so that all
-  // threads can wake up. This is used in conjunction with the
-  // <run_event_loop>. 
-
-protected:
-  ACE_Handler wakeup_handler_;
-  // Handler to handle the wakeups. This works in conjunction with the
-  // <ACE_Proactor::run_event_loop>. 
-};
-
-// Forward declarations.
-class ACE_AIOCB_Notify_Pipe_Manager;
-
-class ACE_Export ACE_POSIX_AIOCB_Proactor : public ACE_POSIX_Proactor
-{
-  // = TITLE
-  //
-  //     This Proactor makes use of Asynchronous I/O Control Blocks
-  //     (AIOCB) to notify/get the completion status of the <aio_>
-  //     operations issued.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_AIOCB_Notify_Pipe_Manager;
-  // Handler needs to call application specific code.
-  
-  friend class ACE_POSIX_AIOCB_Asynch_Operation;
-  // This class does the registering of Asynch Operations with the
-  // Proactor which is necessary in the AIOCB strategy.
-
-  // friend class ACE_POSIX_AIOCB_Asynch_Accept_Handler;
-  // For <Asynch_Accept> operation class, this helper class takes care
-  // of doing the <Asynch_Accept>. 
-
-public:
-  ACE_POSIX_AIOCB_Proactor (void);
-  // Constructor.
-
-  virtual ~ACE_POSIX_AIOCB_Proactor (void);
-  // Destructor.
-
-  virtual int handle_events (ACE_Time_Value &wait_time);
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly.
-
-  virtual int handle_events (void);
-  // Block indefinitely until at least one event is dispatched.
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
-
-  virtual int post_completion (ACE_POSIX_Asynch_Result *result);
-  // Post a result to the completion port of the Proactor.
-
-  // = Methods used to create Asynch_IO objects. We create the right
-  // objects here in these methods.
-
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
-
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
-
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
-
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
-
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
-
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
-
-protected:
-  virtual int handle_events (unsigned long milli_seconds);
-  // Dispatch a single set of events.  If <milli_seconds> elapses
-  // before any events occur, return 0. Return 1 if a completion
-  // dispatched. Return -1 on errors.
-
-  void application_specific_code (ACE_POSIX_Asynch_Result *asynch_result,
-				  u_long bytes_transferred,
-				  int success,
-				  const void *completion_key,
-				  u_long error);
-  // We will call the base class's application_specific_code from
-  // here.
-  
-  int register_aio_with_proactor (ACE_POSIX_Asynch_Result *result);
-  // If the ptr is o, just check whether there is any slot free and
-  // return 0 if yes, else return -1. If a valid ptr is passed, keep it
-  // in a free slot.
-
-  ACE_AIOCB_Notify_Pipe_Manager* aiocb_notify_pipe_manager_;
-  // This class takes care of doing <accept> when we use
-  // AIO_CONTROL_BLOCKS strategy.
-  
-  aiocb *aiocb_list_ [ACE_RTSIG_MAX];
-  // Use an array to keep track of all the aio's issued
-  // currently. We'll limit the array size to Maximum RT signals that
-  // can be queued in a process.  This is the upper limit how many aio
-  // operations can be pending at a time.
-
-  ACE_POSIX_Asynch_Result *result_list_ [ACE_RTSIG_MAX];
-  // @@ I am keeing an extra copy of the <aiocb_
-
-  size_t aiocb_list_max_size_;
-  // To maintain the maximum size of the array (list).
-
-  size_t aiocb_list_cur_size_;
-  // To maintain the current size of the array (list).
-};
-
-class ACE_Export ACE_POSIX_SIG_Proactor : public ACE_POSIX_Proactor
-{
-  // = TITLE
-  //
-  //     This Proactor implementation does compeltion querying using
-  //     POSIX Real Time signals. <sigtimedwait>/<sigwaitinfo> call is
-  //     used to get the notify/get the completions.
-  //     The real-time signals that are going to be used with this
-  //     Proactor should be given apriori in the constructor, so that
-  //     those signals can be masked from asynchornous delivery. 
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_POSIX_SIG_Asynch_Operation;
-  // This class does the registering of Asynch Operations with the
-  // Proactor which is necessary in the SIG strategy, because we need
-  // to store the signal number.
-
-public:
-  ACE_POSIX_SIG_Proactor (void);
-  // This constructor masks only the <ACE_SIGRTMIN>
-  // real-time signal. Only this signal should be used to issue
-  // asynchronous operations using this Proctor.
-
-  ACE_POSIX_SIG_Proactor (const sigset_t mask_set);
-  // This constructor should be used to tell the Proactor to mask and
-  // wait for the real-time signals specified in this set. Only these
-  // signals should be used by the asynchronous operations when they
-  // use this Proactor.
-
-  virtual ~ACE_POSIX_SIG_Proactor (void);
-  // Destructor.
-
-  virtual int handle_events (ACE_Time_Value &wait_time);
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
-
-  virtual int handle_events (void);
-  // Block indefinitely until at least one event is dispatched.
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly.
- 
-  virtual int post_completion (ACE_POSIX_Asynch_Result *result);
-  // Post a result to the completion port of the Proactor.
-
-  // = Methods used to create Asynch_IO objects. We create the right
-  // objects here in these methods.
-
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
-
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
-
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
-
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
-
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
-
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
-
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN) ;
-  // If <signal_number> is -1, check with the Proactor and use one of
-  // the signals that is present in the mask set (i.e. the signals for
-  // which the Proactor will be waiting) of the Proactor. If there are
-  // more than one signal, the higher numbered signal will be chosen.
-
-protected:
-  int setup_signal_handler (int signal_number) const;
-  // To setup the handler for a real-time signbal.
-
-  static void null_handler (int signal_number, siginfo_t *info, void *context);
-  // Dummy signal handler. This wont get called at all, since we are
-  // going to be masking the signal in all the threads.
-  
-  int mask_all (void) const;
-  // To mask all the signals in a thread.
-
-  virtual int handle_events (unsigned long milli_seconds);
-  // Dispatch a single set of events.  If <milli_seconds> elapses
-  // before any events occur, return 0. Return 1 if a completion is
-  // dispatched. Return -1 on errors.
-
-  sigset_t RT_completion_signals_;
-  // These signals are used for completion notification by the
-  // Proactor. The signals specified while issueing <Asynch
-  // Operation>s are stored here in this set. These signals are masked
-  // for a thread when it calls the Proactor::handle_events.
-};
-
-class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result
-{
-  // = TITLE
-  //     This class is posted to the completion port when a timer
-  //     expires. When the <complete method> of this object is
-  //     called, the <handler>'s <handle_timeout> method will be
-  //     called. 
-  
-  friend class ACE_POSIX_Proactor;
-  friend class ACE_POSIX_SIG_Proactor;
-  // The factory method for this class is with the POSIX_Proactor 
-  // class. 
-
-protected:
-  ACE_POSIX_Asynch_Timer (ACE_Handler &handler,
-                          const void *act,
-                          const ACE_Time_Value &tv,
-                          ACE_HANDLE event = ACE_INVALID_HANDLE,
-                          int priority = 0,
-                          int signal_number = ACE_SIGRTMIN);
-  // Constructor.
-  
-  virtual ~ACE_POSIX_Asynch_Timer (void) {}
-  // Destructor.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error = 0);
-  // This method calls the <handler>'s handle_timeout method.
-
-  ACE_Time_Value time_;
-  // Time value requested by caller
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/POSIX_Proactor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_AIO_CALLS */
-#endif /* ACE_POSIX_PROACTOR_H */
diff --git a/ace/POSIX_Proactor.i b/ace/POSIX_Proactor.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/ace/POSIX_Proactor.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/ace/Parse_Node.cpp b/ace/Parse_Node.cpp
index cda7c90ee05..a2fbd12780f 100644
--- a/ace/Parse_Node.cpp
+++ b/ace/Parse_Node.cpp
@@ -457,7 +457,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *)
 
       this->symbol_ = (void *)
         ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
-                       object_name);
+                       ASYS_WIDE_STRING (object_name));
 
       if (this->symbol_ == 0)
         {
@@ -465,7 +465,7 @@ ACE_Object_Node::symbol (ACE_Service_Object_Exterminator *)
 
           ACE_ERROR ((LM_ERROR,
                       ASYS_TEXT ("dlsym failed for object %s\n"),
-                      object_name));
+                      ASYS_WIDE_STRING (object_name)));
 
           ASYS_TCHAR *errmsg = ACE_OS::dlerror ();
 
@@ -519,26 +519,11 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       // Locate the factory function <function_name> in the shared
       // object.
 
-      char *function_name = ACE_const_cast (char *,
-                                            this->function_name_);
-
-      // According to the new ANSI C++ specification, casting a void*
-      // pointer to a function pointer is not allowed.  However,
-      // casting a void* pointer to an integer type that is large
-      // enough to hold the pointer value is legal.  I (Nanbor) chose
-      // to cast the return value to long since it should be large
-      // enough to hold the void* pointer's value on most platforms.
-      // I am not sure if casting a long value to a function pointer
-      // is legal or not (can't find a good explanation in spec) but
-      // SunC++, egcs, and KAI compilers, all of which are pretty
-      // close to (or, at least claim to conform with) the standard
-      // did not complain about this as an illegal pointer conversion.
-      long temp_ptr =
-        ACE_reinterpret_cast(long,
-                             ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
-                                            ASYS_WIDE_STRING (function_name)));
-      func = ACE_reinterpret_cast(void *(*)(ACE_Service_Object_Exterminator *),
-                                  temp_ptr);
+      ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_);
+
+      func = (void *(*)(ACE_Service_Object_Exterminator *))
+        ACE_OS::dlsym ((ACE_SHLIB_HANDLE) this->handle (),
+                       ASYS_WIDE_STRING (function_name));
 
       if (func == 0)
         {
@@ -573,7 +558,7 @@ ACE_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
           ace_yyerrno++;
           ACE_ERROR_RETURN ((LM_ERROR,
                              ASYS_TEXT ("%p\n"),
-                             ASYS_WIDE_STRING (this->function_name_)),
+                             this->function_name_),
                             0);
         }
     }
@@ -653,7 +638,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
 
   ACE_Static_Svc_Descriptor **ssdp = 0;
   ACE_STATIC_SVCS &svcs = *ACE_Service_Config::static_svcs ();
-  char *function_name = ACE_const_cast (char *, this->function_name_);
+  ASYS_TCHAR *function_name = ACE_const_cast (ASYS_TCHAR *, this->function_name_);
 
   for (ACE_STATIC_SVCS_ITERATOR iter (svcs);
        iter.next (ssdp) != 0;
@@ -688,7 +673,7 @@ ACE_Static_Function_Node::symbol (ACE_Service_Object_Exterminator *gobbler)
       ace_yyerrno++;
       ACE_ERROR_RETURN ((LM_ERROR,
                          ASYS_TEXT ("%p\n"),
-                         ACE_WIDE_STRING (this->function_name_)),
+                         this->function_name_),
                         0);
     }
 
diff --git a/ace/Pipe.cpp b/ace/Pipe.cpp
index fa25315f78f..e4f52a891f3 100644
--- a/ace/Pipe.cpp
+++ b/ace/Pipe.cpp
@@ -1,3 +1,4 @@
+// Pipe.cpp
 // $Id$
 
 #define ACE_BUILD_DLL
@@ -42,15 +43,15 @@ ACE_Pipe::open (void)
     {
       ACE_INET_Addr sv_addr (my_addr.get_port_number (),
                              ASYS_TEXT ("localhost"));
-
+      
       // Establish a connection within the same process.
       if (connector.connect (writer, sv_addr) == -1)
-        result = -1;
+	result = -1;
       else if (acceptor.accept (reader) == -1)
-        {
-          writer.close ();
-          result = -1;
-        }
+	{
+	  writer.close ();
+	  result = -1;
+	}
     }
 
   // Close down the acceptor endpoint since we don't need it anymore.
@@ -59,15 +60,12 @@ ACE_Pipe::open (void)
     return -1;
 
   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.
   if (writer.set_option (IPPROTO_TCP, TCP_NODELAY,
-                         &one, sizeof one) == -1)
+			 &one, sizeof one) == -1)
     return -1;
-#endif /* ACE_LACKS_TCP_NODELAY */
 
   this->handles_[0] = reader.get_handle ();
   this->handles_[1] = writer.get_handle ();
@@ -137,8 +135,8 @@ ACE_Pipe::ACE_Pipe (ACE_HANDLE handles[2])
                 ASYS_TEXT ("ACE_Pipe::ACE_Pipe")));
 }
 
-ACE_Pipe::ACE_Pipe (ACE_HANDLE read,
-                    ACE_HANDLE write)
+ACE_Pipe::ACE_Pipe (ACE_HANDLE read, 
+		    ACE_HANDLE write)
 {
   ACE_TRACE ("ACE_Pipe::ACE_Pipe");
   this->handles_[0] = read;
diff --git a/ace/Proactor.cpp b/ace/Proactor.cpp
index 8801109ffef..11e57845a3a 100644
--- a/ace/Proactor.cpp
+++ b/ace/Proactor.cpp
@@ -2,23 +2,17 @@
 
 #define ACE_BUILD_DLL
 #include "ace/Proactor.h"
-#include "ace/Proactor_Impl.h"
-#include "ace/Object_Manager.h"
-#include "ace/Task_T.h"
 
 ACE_RCSID(ace, Proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-// This only works on Win32 platforms and on Unix platforms with aio
-// calls.
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) \
+  || (defined (ACE_HAS_AIO_CALLS))
+  // This only works on Win32 platforms and on Unix platforms with aio
+  // calls.
+
 #include "ace/Task_T.h"
 #include "ace/Log_Msg.h"
-
-#if defined (ACE_HAS_AIO_CALLS)
-#   include "ace/POSIX_Proactor.h"
-#else /* !ACE_HAS_AIO_CALLS */
-#   include "ace/WIN32_Proactor.h"
-#endif /* ACE_HAS_AIO_CALLS */
+#include "ace/Object_Manager.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Proactor.i"
@@ -34,40 +28,31 @@ int ACE_Proactor::delete_proactor_ = 0;
 // Terminate the eventloop.
 sig_atomic_t ACE_Proactor::end_event_loop_ = 0;
 
-// Number of threads in the event loop.
-sig_atomic_t ACE_Proactor::event_loop_thread_count_ = 0;
-
 class ACE_Export ACE_Proactor_Timer_Handler : public ACE_Task <ACE_NULL_SYNCH>
+// = TITLE
+//     A Handler for timer. It helps in the management of timers
+//     registered with the Proactor.
+//
+// = DESCRIPTION
+//     This object has a thread that will wait on the earliest time
+//     in a list of timers and an event. When a timer expires, the
+//     thread will post a completion event on the port and go back
+//     to waiting on the timer queue and event. If the event is
+//     signaled, the thread will refresh the time it is currently
+//     waiting on (in case the earliest time has changed)
 {
-  // = TITLE
-  //     A Handler for timer. It helps in the management of timers
-  //     registered with the Proactor.
-  //
-  // = DESCRIPTION
-  //     This object has a thread that will wait on the earliest time
-  //     in a list of timers and an event. When a timer expires, the
-  //     thread will post a completion event on the port and go back
-  //     to waiting on the timer queue and event. If the event is
-  //     signaled, the thread will refresh the time it is currently
-  //     waiting on (in case the earliest time has changed).
-  
   friend class ACE_Proactor;
   // Proactor has special privileges
   // Access needed to: timer_event_
 
-public:
+ public:
   ACE_Proactor_Timer_Handler (ACE_Proactor &proactor);
   // Constructor.
 
-  virtual ~ACE_Proactor_Timer_Handler (void);
+  ~ACE_Proactor_Timer_Handler (void);
   // Destructor.
 
-  int destroy (void);
-  // Proactor calls this to shut down the timer handler
-  // gracefully. Just calling the destructor alone doesnt do what
-  // <destroy> does. <destroy> make sure the thread exits properly. 
-
-protected:
+ protected:
   virtual int svc (void);
   // Run by a daemon thread to handle deferred processing. In other
   // words, this method will do the waiting on the earliest timer and
@@ -97,59 +82,184 @@ ACE_Proactor_Timer_Handler::~ACE_Proactor_Timer_Handler (void)
 
   // Signal timer event.
   this->timer_event_.signal ();
-  
-  // Wait for the Timer Handler thread to exit. 
-  this->thr_mgr ()->wait ();
 }
 
 int
 ACE_Proactor_Timer_Handler::svc (void)
 {
+#if defined (ACE_HAS_AIO_CALLS)
+  // @@ To be implemented.
+  return 0;
+#else /* ACE_HAS_AIO_CALLS */
+  u_long time;
   ACE_Time_Value absolute_time;
-  int empty_flag = 0;
-  int result = 0;
 
   while (this->shutting_down_ == 0)
     {
-      // Is the timer queue empty?
-      empty_flag = this->proactor_.timer_queue ()->is_empty ();
-      
-      if (!empty_flag)
-	{
-	  // Get the earliest absolute time.
-	  absolute_time = this->proactor_.timer_queue ()->earliest_time ();
-          
-          // Block for absolute time.
-          result = this->timer_event_.wait (&absolute_time);
-        }
-      else
+      // default value
+      time = ACE_INFINITE;
+
+      // If the timer queue is not empty
+      if (!this->proactor_.timer_queue ()->is_empty ())
         {
-          // Wait for ever.
-          result = this->timer_event_.wait ();
+          // Get the earliest absolute time.
+          absolute_time
+            = this->proactor_.timer_queue ()->earliest_time ()
+            - this->proactor_.timer_queue ()->gettimeofday ();
+
+          // Time to wait.
+          time = absolute_time.msec ();
         }
-      
-      // Check for timer expiries.
-      if (result == -1)
+
+      // Wait for event upto <time> milli seconds.
+      u_int result = ::WaitForSingleObject (this->timer_event_.handle (),
+                                            time);
+      switch (result)
         {
-          switch (errno)
-            {
-            case ETIME:
-              // timeout: expire timers
-              this->proactor_.timer_queue ()->expire ();
-              break;
-            default:
-              // Error.
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("%N:%l:(%P | %t):%p\n"),
-                                 ASYS_TEXT ("ACE_Proactor_Timer_Handler::svc:wait failed")),
-                                -1);
-            }
+        case ACE_WAIT_TIMEOUT:
+          // timeout: expire timers
+          this->proactor_.timer_queue ()->expire ();
+          break;
+        case ACE_WAIT_FAILED:
+          // error
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("%p\n"),
+                             ASYS_TEXT ("WaitForSingleObject")), -1);
         }
     }
+
+  return 0;
+#endif /* ACE_HAS_AIO_CALLS */
+}
+
+#if defined (ACE_HAS_AIO_CALLS)
+class ACE_Export ACE_AIO_Accept_Handler : public ACE_Handler
+{
+  // = TITLE
+  //     Helper class for doing Asynch_Accept in POSIX4 systems, in
+  //     the case of doing AIO_CONTROL_BLOCKS strategy.
+  //
+  // = DESCRIPTION
+  //     Doing Asynch_Accept in POSIX4 implementation is tricky. In
+  //     the case of doing the things with AIO_CONTROL_BLOCKS and not
+  //     with Real-Time Signals, this becomes even more trickier. We
+  //     use a notifyn pipe here to implement Asynch_Accpet. This class
+  //     will issue a <Asynch_Read> on the pipe. <Asynch_Accept> will
+  //     send a result pointer containg all the information through
+  //     this pipe.
+  //     Handling the MessageBlock:
+  //     We give this message block to read the result pointer through
+  //     the notify pipe. We expect that to read 4 bytes from the
+  //     notify pipe, for each <accept> call. Before giving this
+  //     message block to another <accept>, we update <wr_ptr> and put
+  //     it in its initial position. 
+public:
+  ACE_AIO_Accept_Handler (ACE_Proactor* proactor);
+  // Constructor.
+
+  ~ACE_AIO_Accept_Handler (void);
+  // Destructor.
+  
+  int notify (ACE_Asynch_Accept::Result* result);
+  // Send this Result to Proactor through the notification pipe.
+
+  virtual void handle_read_stream (const ACE_Asynch_Read_Stream::Result &result);
+  // Read from the pipe is complete.  We get the <Result> from
+  // Asynch_Handler. We have to do the notification here.
+
+private:
+  ACE_Proactor* proactor_;
+  // The proactor in use.
+
+  ACE_Message_Block message_block_;
+  // Message block to get ACE_Asynch_Accept::Result pointer from
+  // ACE_Asych_Accept. 
+
+  ACE_Pipe pipe_;
+  // Pipe for the communication between Proactor and the
+  // Asynch_Accept.
+
+  ACE_Asynch_Read_Stream read_stream_;
+  // To do asynch_read on the pipe.
+
+  ACE_AIO_Accept_Handler (void);
+  // Default constructor. Shouldnt be called.
+};
+
+ACE_AIO_Accept_Handler::ACE_AIO_Accept_Handler (ACE_Proactor *proactor)
+  : proactor_ (proactor),
+    message_block_ (sizeof (ACE_Asynch_Accept::Result *) + 64)
+{
+  // Open the pipe.
+  this->pipe_.open ();
+
+  // Open the read stream.
+  if (this->read_stream_.open (*this,
+                               this->pipe_.read_handle (),
+                               0,
+                               this->proactor_) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "%N:%l:%p\n",
+                "Open on Read Stream failed"));
+
+  // Issue an asynch_read on the read_stream of the notify pipe. 
+  if (this->read_stream_.read (this->message_block_,
+                               sizeof (ACE_Asynch_Accept::Result *)) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "%N:%l:%p\n",
+                "Read from stream failed"));
+}
+
+ACE_AIO_Accept_Handler::~ACE_AIO_Accept_Handler (void)
+{
+}
+
+int
+ACE_AIO_Accept_Handler::notify (ACE_Asynch_Accept::Result* result)
+{
+  // Send the result pointer through the pipe.
+  int return_val = ACE::send (this->pipe_.write_handle (),
+                              (char *) &result,
+                              sizeof (result));
+  if (return_val != sizeof (result))
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "(%P %t):%p\n",
+                       "Error:Writing on to pipe failed"),
+                      -1);
   return 0;
 }
 
-// *********************************************************************
+void
+ACE_AIO_Accept_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
+{
+  // @@
+  ACE_DEBUG ((LM_DEBUG, "ACE_AIO_Accept_Handler::handle_read_stream called\n"));
+  
+  // The message block actually contains the ACE_Asynch_Accept::Result.
+  ACE_Asynch_Accept::Result *accept_result = 0;
+  accept_result = *(ACE_Asynch_Accept::Result **) result.message_block ().rd_ptr ();
+  
+  // Do the upcall.
+  this->proactor_->application_specific_code (accept_result,
+                                              0,  // No Bytes transferred.
+                                              1,  // Success.
+                                              0,  // Completion token.
+                                              0); // Error.
+
+  // Set the message block properly. Put the <wr_ptr> back in the
+  // initial position. 
+  if (this->message_block_.length () > 0)
+      this->message_block_.wr_ptr (this->message_block_.rd_ptr ());
+  
+  // One accept has completed. Issue a read to handle any <accept>s in
+  // the future.
+  if (this->read_stream_.read (this->message_block_,
+                               sizeof (ACE_Asynch_Accept::Result)) == -1)
+    ACE_ERROR ((LM_ERROR,
+                "%N:%l:%p\n",
+                "Read from stream failed"));
+}
+#endif /* ACE_HAS_AIO_CALLS */
 
 ACE_Proactor_Handle_Timeout_Upcall::ACE_Proactor_Handle_Timeout_Upcall (void)
   : proactor_ (0)
@@ -163,29 +273,23 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (TIMER_QUEUE &timer_queue,
                                              const ACE_Time_Value &time)
 {
   ACE_UNUSED_ARG (timer_queue);
-  
+
   if (this->proactor_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("(%t) No Proactor set in ACE_Proactor_Handle_Timeout_Upcall,")
                        ASYS_TEXT (" no completion port to post timeout to?!@\n")),
                       -1);
-  
+
   // Create the Asynch_Timer.
-  ACE_Asynch_Result_Impl *asynch_timer = this->proactor_->create_asynch_timer (*handler,
-                                                                               act,
-                                                                               time,
-                                                                               ACE_INVALID_HANDLE,
-                                                                               0,
-                                                                               -1);
-  if (asynch_timer == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_Proactor_Handle_Timeout_Upcall::timeout:"
-                       "create_asynch_timer failed"),
-                      -1);
-  
+  ACE_Proactor::Asynch_Timer *asynch_timer;
+  ACE_NEW_RETURN (asynch_timer,
+                  ACE_Proactor::Asynch_Timer (*handler,
+                                              act,
+                                              time),
+                  -1);
+
   // Post a completion.
-  if (asynch_timer->post_completion (this->proactor_->implementation ()) == -1)
+  if (this->proactor_->post_completion (asynch_timer) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ASYS_TEXT ("Failure in dealing with timers: ")
                        ASYS_TEXT ("PostQueuedCompletionStatus failed\n")),
@@ -232,59 +336,118 @@ ACE_Proactor_Handle_Timeout_Upcall::proactor (ACE_Proactor &proactor)
                       -1);
 }
 
-// *********************************************************************
-
-ACE_Proactor::ACE_Proactor (ACE_Proactor_Impl *implementation,
-                            int delete_implementation,
-                            TIMER_QUEUE *tq)
-  : implementation_ (0),
-    delete_implementation_ (delete_implementation),
-    timer_handler_ (0),
-    timer_queue_ (0),
-    delete_timer_queue_ (0)
-{
-  this->implementation (implementation);
-  
-  if (this->implementation () == 0)
-    {
+ACE_Proactor::ACE_Proactor (size_t number_of_threads,
+                            Timer_Queue *tq,
+                            int used_with_reactor_event_loop,
+                            POSIX_COMPLETION_STRATEGY completion_strategy)
+  :
 #if defined (ACE_HAS_AIO_CALLS)
-      // POSIX Proactor.
-  #if defined (ACE_POSIX_AIOCB_PROACTOR)
-      ACE_NEW (implementation, ACE_POSIX_AIOCB_Proactor);
-  #elif defined (ACE_POSIX_SIG_PROACTOR)
-      ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
-  #else /* Default is to use the SIG one */
-      ACE_NEW (implementation, ACE_POSIX_SIG_Proactor);
-  #endif
-#elif (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-      // WIN_Proactor.
-      ACE_NEW (implementation, ACE_WIN32_Proactor);
+  posix_completion_strategy_ (completion_strategy),
+  aio_accept_handler_ (0),
+  aiocb_list_max_size_ (ACE_RTSIG_MAX),
+  aiocb_list_cur_size_ (0),
+#else /* ACE_HAS_AIO_CALLS */
+  completion_port_ (0),
+  // This *MUST* be 0, *NOT* ACE_INVALID_HANDLE !!!
+  number_of_threads_ (number_of_threads),
 #endif /* ACE_HAS_AIO_CALLS */
-      this->implementation (implementation);
-      this->delete_implementation_ = 1;
+  timer_queue_ (0),
+  delete_timer_queue_ (0),
+  timer_handler_ (0),
+  used_with_reactor_event_loop_ (used_with_reactor_event_loop)
+{
+#if defined (ACE_HAS_AIO_CALLS)
+  ACE_UNUSED_ARG (number_of_threads);
+  ACE_UNUSED_ARG (tq);
+
+  // The following things are necessary only for the
+  // AIO_CONTROL_BLOCKS strategy.
+  if (this->posix_completion_strategy_ == AIO_CONTROL_BLOCKS)
+    {
+      // Initialize the array.
+      for (size_t ai = 0;
+           ai < this->aiocb_list_max_size_;
+           ai++)
+        aiocb_list_[ai] = 0;
+
+      // Accept Handler for aio_accept. Remember! this issues a Asynch_Read
+      // on the notify pipe for doing the Asynch_Accept.
+      ACE_NEW (aio_accept_handler_,
+               ACE_AIO_Accept_Handler (this));
+    }
+
+
+  // Mask the RT_compeltion signals if we are using the RT_SIGNALS
+  // STRATEGY for completion querying.
+  if (completion_strategy == RT_SIGNALS)
+    {
+      // Make the sigset_t consisting of the completion signals.
+      if (sigemptyset (&this->RT_completion_signals_) < 0)
+        ACE_ERROR ((LM_ERROR,
+                    "Error:%p\n",
+                    "Couldn't init the RT completion signal set"));
+
+      if (sigaddset (&this->RT_completion_signals_,
+                     ACE_SIG_AIO) < 0)
+        ACE_ERROR ((LM_ERROR,
+                    "Error:%p\n",
+                    "Couldnt init the RT completion signal set"));
+
+      // Mask them.
+      if (sigprocmask (SIG_BLOCK, &RT_completion_signals_, 0) < 0)
+        ACE_ERROR ((LM_ERROR,
+                    "Error:%p\n",
+                    "Couldnt mask the RT completion signals"));
+
+      // 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 = 0;         // No handler.
+      int sigaction_return = sigaction (ACE_SIG_AIO,
+                                        &reaction,
+                                        0);
+      if (sigaction_return == -1)
+        ACE_ERROR ((LM_ERROR,
+                    "Error:%p\n",
+                    "Proactor couldnt do sigaction for the RT SIGNAL"));
     }
 
+#else /* ACE_HAS_AIO_CALLS */
+
+  ACE_UNUSED_ARG (completion_strategy);
+
+  // Create the completion port.
+  this->completion_port_ = ::CreateIoCompletionPort (INVALID_HANDLE_VALUE,
+                                                     this->completion_port_,
+                                                     0,
+                                                     this->number_of_threads_);
+  if (this->completion_port_ == 0)
+    ACE_ERROR ((LM_ERROR,
+                ASYS_TEXT ("%p\n"),
+                ASYS_TEXT ("CreateIoCompletionPort")));
+
   // Set the timer queue.
   this->timer_queue (tq);
-  
+
   // Create the timer handler
   ACE_NEW (this->timer_handler_,
            ACE_Proactor_Timer_Handler (*this));
-  
-  // Activate <timer_handler>
+
+  // activate <timer_handler>
   if (this->timer_handler_->activate (THR_NEW_LWP | THR_DETACHED) == -1)
     ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%N:%l:(%P | %t):%p\n"),
-                ASYS_TEXT ("Task::activate:could not create thread\n")));
-}
-
-ACE_Proactor::~ACE_Proactor (void)
-{
-  this->close ();
+                ASYS_TEXT ("%p Could not create thread\n"),
+                ASYS_TEXT ("Task::activate")));
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 ACE_Proactor *
-ACE_Proactor::instance (size_t /* threads */)
+ACE_Proactor::instance (size_t threads)
 {
   ACE_TRACE ("ACE_Proactor::instance");
 
@@ -292,16 +455,16 @@ ACE_Proactor::instance (size_t /* threads */)
     {
       // Perform Double-Checked Locking Optimization.
       ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-				*ACE_Static_Object_Lock::instance (),
+                                *ACE_Static_Object_Lock::instance (),
                                 0));
 
       if (ACE_Proactor::proactor_ == 0)
-	{
-	  ACE_NEW_RETURN (ACE_Proactor::proactor_,
-                          ACE_Proactor,
+        {
+          ACE_NEW_RETURN (ACE_Proactor::proactor_,
+                          ACE_Proactor (threads),
                           0);
-	  ACE_Proactor::delete_proactor_ = 1;
-	}
+          ACE_Proactor::delete_proactor_ = 1;
+        }
     }
   return ACE_Proactor::proactor_;
 }
@@ -312,7 +475,7 @@ ACE_Proactor::instance (ACE_Proactor *r)
   ACE_TRACE ("ACE_Proactor::instance");
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
-			    *ACE_Static_Object_Lock::instance (), 0));
+                            *ACE_Static_Object_Lock::instance (), 0));
 
   ACE_Proactor *t = ACE_Proactor::proactor_;
 
@@ -329,7 +492,7 @@ ACE_Proactor::close_singleton (void)
   ACE_TRACE ("ACE_Proactor::close_singleton");
 
   ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon,
-		     *ACE_Static_Object_Lock::instance ()));
+                     *ACE_Static_Object_Lock::instance ()));
 
   if (ACE_Proactor::delete_proactor_)
     {
@@ -342,60 +505,21 @@ ACE_Proactor::close_singleton (void)
 int
 ACE_Proactor::run_event_loop (void)
 {
-  int result = 0;
-
-  // Declaring the lock variable.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-#endif /* ACE_MT_SAFE */
+  ACE_TRACE ("ACE_Proactor::run_event_loop");
 
-  // Early check. It is ok to do this without lock, since we care just
-  // whether it is zero or non-zero.
-  if (ACE_Proactor::end_event_loop_ != 0)
-    return 0;
-   
-  // First time you are in. Increment the thread count.
-  {
-    // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-
-    // Increment the thread count.
-    ACE_Proactor::event_loop_thread_count_ ++;
-  }
-    
-  // Run the event loop.
-  while (1)
+  while (ACE_Proactor::end_event_loop_ == 0)
     {
-      // Check the end loop flag. It is ok to do this without lock,
-      // since we care just whether it is zero or non-zero. 
-      if (ACE_Proactor::end_event_loop_ != 0)
-          break;
-      
-      // <end_event_loop> is not set. Ready to do <handle_events>.
-      result = ACE_Proactor::instance ()->handle_events ();
+      int result = ACE_Proactor::instance ()->handle_events ();
 
       if (ACE_Service_Config::reconfig_occurred ())
-	ACE_Service_Config::reconfigure ();
-      
+        ACE_Service_Config::reconfigure ();
+
       else if (result == -1)
-	break;
+        return -1;
     }
-  
-  // Leaving the event loop. Decrement the thread count.
 
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Decrement the thread count.
-  ACE_Proactor::event_loop_thread_count_ --;
-
-  return result;
+  /* NOTREACHED */
+  return 0;
 }
 
 // Handle events for -tv- time.  handle_events updates -tv- to reflect
@@ -405,95 +529,33 @@ ACE_Proactor::run_event_loop (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Proactor::run_event_loop");
 
-  int result = 0;
-
-  // Declaring the lock variable.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-#endif /* ACE_MT_SAFE */
-
-  // Early check. It is ok to do this without lock, since we care just 
-  // whether it is zero or non-zero.
-  if (ACE_Proactor::end_event_loop_ != 0 ||
-      tv == ACE_Time_Value::zero)
-    return 0;
-  
-  // First time you are in. Increment the thread count.
-  {
-    // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-    
-    // Increment the thread count.
-    ACE_Proactor::event_loop_thread_count_ ++;
-  }
-
-  // Run the event loop.
-  while (1)
+  while (ACE_Proactor::end_event_loop_ == 0
+         && tv != ACE_Time_Value::zero)
     {
-      // Check for end of loop. It is ok to do this without lock,
-      // since we care just whether it is zero or non-zero.
-      if (ACE_Proactor::end_event_loop_ != 0 ||
-          tv == ACE_Time_Value::zero)
-        break;
-
-      // <end_event_loop> is not set. Ready to do <handle_events>.
-      result = ACE_Proactor::instance ()->handle_events (tv);
+      int result = ACE_Proactor::instance ()->handle_events (tv);
 
       if (ACE_Service_Config::reconfig_occurred ())
-	ACE_Service_Config::reconfigure ();
-      
+        ACE_Service_Config::reconfigure ();
+
       // An error has occurred.
       else if (result == -1)
-	break;
+        return result;
     }
 
-  // Leaving the event loop. Decrement the thread count.
-
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Decrement the thread count.
-  ACE_Proactor::event_loop_thread_count_ --;
-
-  return result;
+  /* NOTREACHED */
+  return 0;
 }
 
 int
 ACE_Proactor::end_event_loop (void)
 {
   ACE_TRACE ("ACE_Proactor::end_event_loop");
-  
-  // Obtain the lock, set the end flag and post the wakeup
-  // completions. 
-  
-  // Obtain the lock in the MT environments.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-    (ACE_Object_Manager::ACE_PROACTOR_EVENT_LOOP_LOCK);
-  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, -1);
-#endif /* ACE_MT_SAFE */
-  
-  // Set the end flag.
   ACE_Proactor::end_event_loop_ = 1;
-    
-  // Number of completions to post.
-  int how_many = ACE_Proactor::event_loop_thread_count_;
-  
-  // Reset the thread count.
-  ACE_Proactor::event_loop_thread_count_ = 0;
-
-  // Post completions to all the threads so that they will all wake
-  // up. 
-  return ACE_Proactor::post_wakeup_completions (how_many);
+  //  ACE_Proactor::instance()->notify ();
+  return 0;
 }
 
+/* static */
 int
 ACE_Proactor::event_loop_done (void)
 {
@@ -501,47 +563,66 @@ ACE_Proactor::event_loop_done (void)
   return ACE_Proactor::end_event_loop_ != 0;
 }
 
+ACE_Proactor::~ACE_Proactor (void)
+{
+  this->close ();
+}
+
 int
 ACE_Proactor::close (void)
 {
-  // Close the implementation.
-  if (this->implementation ()->close () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):%p\n",
-                       "ACE_Proactor::close:implementation couldnt be closed"),
-                      -1);
-  
-  // Delete the implementation.
-  if (this->delete_implementation_)
-    {
-      delete this->implementation ();
-      this->implementation_ = 0;
-    }
-
-  // Delete the timer handler.
+  // Take care of the timer handler
   if (this->timer_handler_)
     {
       delete this->timer_handler_;
       this->timer_handler_ = 0;
     }
-  
-  // Delete the timer queue.
+
+  // Take care of the timer queue
   if (this->delete_timer_queue_)
     {
       delete this->timer_queue_;
       this->timer_queue_ = 0;
       this->delete_timer_queue_ = 0;
     }
-
+#if !defined  (ACE_HAS_AIO_CALLS)
+  // Close the completion port
+  if (this->completion_port_ != 0)
+    {
+      int result = ACE_OS::close (this->completion_port_);
+      this->completion_port_ = 0;
+      return result;
+    }
+#endif /* NOT ACE_HAS_AIO_CALLS */
   return 0;
 }
 
 int
 ACE_Proactor::register_handle (ACE_HANDLE handle,
-			       const void *completion_key)
+                               const void *completion_key)
 {
-  return this->implementation ()->register_handle (handle,
-                                                   completion_key);
+#if defined (ACE_HAS_AIO_CALLS)
+  ACE_UNUSED_ARG (handle);
+  ACE_UNUSED_ARG (completion_key);
+  return 0;
+#else /* ACE_HAS_AIO_CALLS */
+  // No locking is needed here as no state changes.
+  ACE_HANDLE cp = ::CreateIoCompletionPort (handle,
+                                            this->completion_port_,
+                                            (u_long) completion_key,
+                                            this->number_of_threads_);
+  if (cp == 0)
+    {
+      errno = ::GetLastError ();
+      // If errno == ERROR_INVALID_PARAMETER, then this handle was
+      // already registered.
+      if (errno != ERROR_INVALID_PARAMETER)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("CreateIoCompletionPort")), -1);
+    }
+  return 0;
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
 long
@@ -575,12 +656,9 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
   // absolute time.
   ACE_Time_Value absolute_time =
     this->timer_queue_->gettimeofday () + time;
-  
+
   // Only one guy goes in here at a time
-  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX,
-                    ace_mon,
-                    this->timer_queue_->mutex (),
-                    -1);  
+  ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->timer_queue_->mutex (), -1);
 
   // Schedule the timer
   long result = this->timer_queue_->schedule (&handler,
@@ -591,7 +669,7 @@ ACE_Proactor::schedule_timer (ACE_Handler &handler,
     {
       // no failures: check to see if we are the earliest time
       if (this->timer_queue_->earliest_time () == absolute_time)
-        
+
         // wake up the timer thread
         if (this->timer_handler_->timer_event_.signal () == -1)
           {
@@ -617,7 +695,7 @@ ACE_Proactor::cancel_timer (long timer_id,
 
 int
 ACE_Proactor::cancel_timer (ACE_Handler &handler,
-                                  int dont_call_handle_close)
+                            int dont_call_handle_close)
 {
   // No need to signal timer event here. Even if the cancel timer was
   // the earliest, we will have an extra wakeup.
@@ -626,299 +704,477 @@ ACE_Proactor::cancel_timer (ACE_Handler &handler,
 }
 
 int
-ACE_Proactor::handle_events (ACE_Time_Value &wait_time)
+ACE_Proactor::handle_signal (int, siginfo_t *, ucontext_t *)
 {
-  return implementation ()->handle_events (wait_time);
+  // Perform a non-blocking "poll" for all the I/O events that have
+  // completed in the I/O completion queue.
+
+  ACE_Time_Value timeout (0, 0);
+  int result = 0;
+
+  for (;;)
+    {
+      result = this->handle_events (timeout);
+
+      if (result != 0 || errno == ETIME)
+        break;
+    }
+
+  // If our handle_events failed, we'll report a failure to the
+  // Reactor.
+  if (result == -1)
+    return -1;
+  else
+    return 0;
 }
 
 int
-ACE_Proactor::handle_events (void)
+ACE_Proactor::handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask)
 {
-  return this->implementation ()->handle_events ();
+  ACE_UNUSED_ARG (close_mask);
+  ACE_UNUSED_ARG (handle);
+
+  return this->close ();
 }
 
-int
-ACE_Proactor::wake_up_dispatch_threads (void)
+// @@ get_handle () implementation. (Alex)
+ACE_HANDLE
+ACE_Proactor::get_handle (void) const
 {
-  return 0;
+#if defined (ACE_HAS_AIO_CALLS)
+  return ACE_INVALID_HANDLE;
+#else /* Not ACE_HAS_AIO_CALLS */
+  if (this->used_with_reactor_event_loop_)
+    return this->event_.handle ();
+  else
+    return 0;
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
-int
-ACE_Proactor::close_dispatch_threads (int)
+#if defined (ACE_HAS_AIO_CALLS)
+ACE_Proactor::POSIX_COMPLETION_STRATEGY
+ACE_Proactor::posix_completion_strategy (void)
 {
-  return 0;
+  return posix_completion_strategy_;
 }
 
-size_t
-ACE_Proactor::number_of_threads (void) const
+#if 0
+void
+ACE_Proactor::posix_completion_strategy (ACE_Proactor::POSIX_COMPLETION_STRATEGY strategy)
 {
-  return this->implementation ()->number_of_threads ();
+  this->posix_completion_strategy_ = strategy;
 }
+#endif /* 0 */
 
-void
-ACE_Proactor::number_of_threads (size_t threads)
+int
+ACE_Proactor::notify_asynch_accept (ACE_Asynch_Accept::Result* result)
 {
-  this->implementation ()->number_of_threads (threads);
+  this->aio_accept_handler_->notify (result);
+
+  return 0;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
-ACE_Proactor::TIMER_QUEUE *
-ACE_Proactor::timer_queue (void) const
+int
+ACE_Proactor::handle_events (ACE_Time_Value &wait_time)
 {
-  return this->timer_queue_;
+  // Decrement <wait_time> with the amount of time spent in the method
+  ACE_Countdown_Time countdown (&wait_time);
+  return this->handle_events (wait_time.msec ());
 }
 
-void
-ACE_Proactor::timer_queue (TIMER_QUEUE *tq)
+int
+ACE_Proactor::handle_events (void)
 {
-  // Cleanup old timer queue.
-  if (this->delete_timer_queue_)
+  return this->handle_events (ACE_INFINITE);
+}
+
+int
+ACE_Proactor::handle_events (unsigned long milli_seconds)
+{
+#if defined (ACE_HAS_AIO_CALLS)
+  if (posix_completion_strategy () == ACE_Proactor::RT_SIGNALS)
     {
-      delete this->timer_queue_;
-      this->delete_timer_queue_ = 0;
+      // Using RT Signals.
+
+      // Wait for <milli_seconds> amount of time.
+      // @@ Assigning <milli_seconds> to tv_sec.
+      timespec timeout;
+      timeout.tv_sec = milli_seconds;
+      timeout.tv_nsec = 0;
+
+      // To get back the signal info.
+      siginfo_t sig_info;
+
+      // Await the RT completion signal.
+      int sig_return = sigtimedwait (&this->RT_completion_signals_,
+                                     &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)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:%p\n",
+                           "Waiting for RT completion signals"),
+                          0);
+
+      // RT completion signals returned.
+      if (sig_return != ACE_SIG_AIO)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
+                           sig_return),
+                          -1);
+
+      // @@ Debugging.
+      ACE_DEBUG ((LM_DEBUG,
+                  "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)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Inconsistent signal number (%d) in the signal info block\n",
+                           sig_info.si_signo),
+                          -1);
+
+      // @@ Debugging.
+      ACE_DEBUG ((LM_DEBUG,
+                  "Signal code for this signal delivery : %d\n",
+                  sig_info.si_code));
+
+      // Retrive the result pointer.
+      ACE_Asynch_Result *asynch_result =
+        (ACE_Asynch_Result *) sig_info.si_value.sival_ptr;
+
+      // Check the <signal code> and act according to that.
+      if (sig_info.si_code == SI_ASYNCIO)
+        {
+          // Retrieve the aiocb from Result ptr.
+          // @@ Some checking should be done to make sure this pointer
+          // is valid. Otherwise <aio_error> will bomb.
+          aiocb* aiocb_ptr =
+            (aiocb *)asynch_result->aiocb_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)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Error:%p\n",
+                               "Invalid control block was sent to <aio_error> for compleion querying"),
+                              -1);
+
+          if (error_code != 0)
+            // Error occurred in the <aio_>call. Return the errno
+            // corresponding to that <aio_> call.
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Error:%p\n",
+                               "An AIO call has failed"),
+                              error_code);
+
+          // No error occured in the AIO operation.
+          int nbytes = aio_return (aiocb_ptr);
+          if (nbytes == -1)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Error:%p\n",
+                               "Invalid control block was send to <aio_return>"),
+                              -1);
+
+          // <nbytes> have been successfully transmitted.
+          size_t bytes_transferred = nbytes;
+
+          // Call the application code.
+          this->application_specific_code (asynch_result,
+                                           bytes_transferred,
+                                           1,  // Result : True.
+                                           0,  // No completion_signal.
+                                           0); // Error.
+        }
+      else if (sig_info.si_code == SI_QUEUE)
+        {
+          // @@ Just debugging.
+          ACE_DEBUG ((LM_DEBUG, "<sigqueue>'d signal received\n"));
+
+          // Should be from the <Asynch_Accept> call.
+          this->application_specific_code (asynch_result,
+                                           0, // No bytes transferred.
+                                           1, // Result : True.
+                                           0, // No completion key.
+                                           0); // No error.
+
+        }
+      else
+        // Unknown signal code.
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "Unexpected signal code (%d) returned on completion querying\n",
+                           sig_info.si_code),
+                          -1);
     }
+  else
+    {
+      //  Not RT_SIGNALS approach. Using <aiocb> control blocks.
+
+      // Is there any entries in the list.
+      if (this->aiocb_list_cur_size_ == 0)
+        // No aio is pending.
+        return 0;
+
+      // Wait for asynch operation to complete.
+      timespec timeout;
+      timeout.tv_sec = milli_seconds;
+      timeout.tv_nsec = 0;
+
+      if (aio_suspend (this->aiocb_list_,
+                       this->aiocb_list_max_size_,
+                       &timeout) == -1)
+        // If failure is coz of timeout, then return *0* but set errno
+        // appropriately. This is what the WinNT proactor does.
+        if (errno ==  EAGAIN)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Error:%p\n",
+                             "aio_suspend"),
+                            0);
+        else
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Error:%p\n",
+                             "aio_suspend"),
+                            -1);
+      // Check which aio has finished.
+      size_t ai;
+      ssize_t nbytes = 0;
+      for (ai = 0; ai < this->aiocb_list_max_size_; ai++)
+        {
+          if (aiocb_list_ [ai] == 0)
+            continue;
+          // Analyze error and return values.
+          if (aio_error (aiocb_list_[ai]) != EINPROGRESS)
+            {
+              nbytes = aio_return (aiocb_list_[ai]);
+
+              if (nbytes == -1)
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "Error:%p\n",
+                                   "An AIO has failed"),
+                                  -1);
+              else
+                {
+                  ACE_DEBUG ((LM_DEBUG,
+                              "An aio has finished\n"));
+                  // This AIO is done.
+                  break;
+                }
+            }
+        }
 
-  // New timer queue.
-  if (tq == 0)
+      if (ai == this->aiocb_list_max_size_)
+        // Nothing completed.
+        return 0;
+
+      // Get the values for the completed aio.
+      
+      // Bytes transfered is what the aio_return gives back.
+      size_t bytes_transferred = nbytes;
+
+      // Retrive the result pointer.
+      ACE_Asynch_Result *asynch_result = (ACE_Asynch_Result *)
+        aiocb_list_[ai]->aio_sigevent.sigev_value.sival_ptr;
+
+      // Invalidate entry in the aiocb list.
+      delete this->aiocb_list_[ai];
+      this->aiocb_list_[ai] = 0;
+      this->aiocb_list_cur_size_--;
+
+      // Call the application code.
+      // @@ Pass <errno> instead of 0. Check out on LynxOS. It is set
+      // to 77 somewhere.
+      this->application_specific_code (asynch_result,
+                                       bytes_transferred,
+                                       1,
+                                       0, // No completion key.
+                                       0);
+    }
+  return 0;
+#else /* ACE_HAS_AIO_CALLS */
+  ACE_OVERLAPPED *overlapped = 0;
+  u_long bytes_transferred = 0;
+  u_long completion_key = 0;
+
+  // Get the next asynchronous operation that completes
+  BOOL result = ::GetQueuedCompletionStatus (this->completion_port_,
+                                             &bytes_transferred,
+                                             &completion_key,
+                                             &overlapped,
+                                             milli_seconds);
+  if (result == FALSE && overlapped == 0)
     {
-      this->timer_queue_ = new TIMER_HEAP;
-      this->delete_timer_queue_ = 1;
+      errno = ::GetLastError ();
+
+      if (errno == WAIT_TIMEOUT)
+        {
+          errno = ETIME;
+          return 0;
+        }
+      else
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("GetQueuedCompletionStatus")),
+                          -1);
     }
   else
     {
-      this->timer_queue_ = tq;
-      this->delete_timer_queue_ = 0;
+      // Narrow the result.
+      ACE_Asynch_Result *asynch_result = (ACE_Asynch_Result *) overlapped;
+
+      // If errors happen, grab the error.
+      if (result == FALSE)
+        errno = ::GetLastError ();
+
+      this->application_specific_code (asynch_result,
+                                       bytes_transferred,
+                                       result,
+                                       (void *) completion_key,
+                                       errno);
     }
-
-  // Set the proactor in the timer queue's functor
-  this->timer_queue_->upcall_functor ().proactor (*this);
-}
-
-ACE_HANDLE
-ACE_Proactor::get_handle (void) const
-{
-  return this->implementation ()->get_handle ();
+  return 0;
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
-ACE_Proactor_Impl *
-ACE_Proactor::implementation (void) const
+void
+ACE_Proactor::application_specific_code (ACE_Asynch_Result *asynch_result,
+                                         u_long bytes_transferred,
+                                         int success,
+                                         const void *completion_key,
+                                         u_long error)
 {
-  return this->implementation_;
+  ACE_SEH_TRY
+    {
+      // Call completion hook
+      asynch_result->complete (bytes_transferred,
+                               success,
+                               (void *) completion_key,
+                               error);
+    }
+  ACE_SEH_FINALLY
+    {
+      // This is crucial to prevent memory leaks
+      delete asynch_result;
+    }
 }
 
-
-ACE_Asynch_Read_Stream_Impl *
-ACE_Proactor::create_asynch_read_stream (void)
+int
+ACE_Proactor::post_completion (ACE_Asynch_Result *result)
 {
-  return this->implementation ()->create_asynch_read_stream ();
-}
+#if defined (ACE_HAS_AIO_CALLS)
+  ACE_UNUSED_ARG (result);
+  return 0;
+#else /* ACE_HAS_AIO_CALLS */
+  // Grab the event associated with the Proactor
+  HANDLE handle = this->get_handle ();
+
+  // If Proactor event is valid, signal it
+  if (handle != ACE_INVALID_HANDLE &&
+      handle != 0)
+    ACE_OS::event_signal (&handle);
+
+  // Post a completion
+  if (::PostQueuedCompletionStatus (this->completion_port_, // completion port
+                                    0, // number of bytes tranferred
+                                    0,// completion key
+                                    result // overlapped
+                                    ) == FALSE)
+    {
+      delete result;
+      ACE_ERROR_RETURN ((LM_ERROR, "Failure in dealing with timers: PostQueuedCompletionStatus failed\n"), -1);
+    }
 
-ACE_Asynch_Write_Stream_Impl *
-ACE_Proactor::create_asynch_write_stream (void)
-{
-  return this->implementation ()->create_asynch_write_stream ();
+  return 0;
+#endif /* ACE_HAS_AIO_CALLS */
 }
 
-ACE_Asynch_Read_File_Impl *
-ACE_Proactor::create_asynch_read_file (void)
+int
+ACE_Proactor::wake_up_dispatch_threads (void)
 {
-  return this->implementation ()->create_asynch_read_file ();
+  return 0;
 }
 
-ACE_Asynch_Write_File_Impl *
-ACE_Proactor::create_asynch_write_file (void)
+int
+ACE_Proactor::close_dispatch_threads (int)
 {
-  return this->implementation ()->create_asynch_write_file ();
+  return 0;
 }
 
-ACE_Asynch_Accept_Impl *
-ACE_Proactor::create_asynch_accept (void)
+#if !defined (ACE_HAS_AIO_CALLS)
+size_t
+ACE_Proactor::number_of_threads (void) const
 {
-  return this->implementation ()->create_asynch_accept ();
+  return this->number_of_threads_;
 }
 
-ACE_Asynch_Transmit_File_Impl *
-ACE_Proactor::create_asynch_transmit_file (void)
+void
+ACE_Proactor::number_of_threads (size_t threads)
 {
-  return this->implementation ()->create_asynch_transmit_file ();
+  this->number_of_threads_ = threads;
 }
+#endif /* ACE_HAS_AIO_CALLS */
 
-ACE_Asynch_Read_Stream_Result_Impl *
-ACE_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                ACE_HANDLE handle,
-                                                ACE_Message_Block &message_block,
-                                                u_long bytes_to_read,
-                                                const void* act,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
+ACE_Proactor::Timer_Queue *
+ACE_Proactor::timer_queue (void) const
 {
-  return this->implementation ()->create_asynch_read_stream_result (handler,
-                                                                    handle,
-                                                                    message_block,
-                                                                    bytes_to_read,
-                                                                    act,
-                                                                    event,
-                                                                    priority,
-                                                                    signal_number);
+  return this->timer_queue_;
 }
 
-
-ACE_Asynch_Write_Stream_Result_Impl *
-ACE_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                 ACE_HANDLE handle,
-                                                 ACE_Message_Block &message_block,
-                                                 u_long bytes_to_write,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
-
+void
+ACE_Proactor::timer_queue (Timer_Queue *tq)
 {
-  return this->implementation ()->create_asynch_write_stream_result (handler,
-                                                                     handle,
-                                                                     message_block,
-                                                                     bytes_to_write,
-                                                                     act,
-                                                                     event,
-                                                                     priority,
-                                                                     signal_number);
-}
-
-
-
-ACE_Asynch_Read_File_Result_Impl *
-ACE_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                              ACE_HANDLE handle,
-                                              ACE_Message_Block &message_block,
-                                              u_long bytes_to_read,
-                                              const void* act,
-                                              u_long offset,
-                                              u_long offset_high,
-                                              ACE_HANDLE event,
-                                              int priority,
-                                              int signal_number)
+  // cleanup old timer queue
+  if (this->delete_timer_queue_)
+    {
+      delete this->timer_queue_;
+      this->delete_timer_queue_ = 0;
+    }
 
-{
-  return this->implementation ()->create_asynch_read_file_result (handler,
-                                                                  handle,
-                                                                  message_block,
-                                                                  bytes_to_read,
-                                                                  act,
-                                                                  offset,
-                                                                  offset_high,
-                                                                  event,
-                                                                  priority,
-                                                                  signal_number);
-}
+  // new timer queue
+  if (tq == 0)
+    {
+      this->timer_queue_ = new Timer_Heap;
+      this->delete_timer_queue_ = 1;
+    }
+  else
+    {
+      this->timer_queue_ = tq;
+      this->delete_timer_queue_ = 0;
+    }
 
-
-
-ACE_Asynch_Write_File_Result_Impl *
-ACE_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                               ACE_HANDLE handle,
-                                               ACE_Message_Block &message_block,
-                                               u_long bytes_to_write,
-                                               const void* act,
-                                               u_long offset,
-                                               u_long offset_high,
-                                               ACE_HANDLE event,
-                                               int priority,
-                                               int signal_number)
-
-{
-  return this->implementation ()->create_asynch_write_file_result (handler,
-                                                                   handle,
-                                                                   message_block,
-                                                                   bytes_to_write,
-                                                                   act,
-                                                                   offset,
-                                                                   offset_high,
-                                                                   event,
-                                                                   priority,
-                                                                   signal_number);
-}
-
-
-ACE_Asynch_Accept_Result_Impl *
-ACE_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                           ACE_HANDLE listen_handle,
-                                           ACE_HANDLE accept_handle,
-                                           ACE_Message_Block &message_block,
-                                           u_long bytes_to_read,
-                                           const void* act,
-                                           ACE_HANDLE event,
-                                           int priority,
-                                           int signal_number)
-
-{
-  return this->implementation ()->create_asynch_accept_result (handler,
-                                                               listen_handle,
-                                                               accept_handle,
-                                                               message_block,
-                                                               bytes_to_read,
-                                                               act,
-                                                               event,
-                                                               priority,
-                                                               signal_number);
-}
-
-ACE_Asynch_Transmit_File_Result_Impl *
-ACE_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                  ACE_HANDLE socket,
-                                                  ACE_HANDLE file,
-                                                  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                  u_long bytes_to_write,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  u_long bytes_per_send,
-                                                  u_long flags,
-                                                  const void *act,
-                                                  ACE_HANDLE event,
-                                                  int priority,
-                                                  int signal_number)
-
-{
-  return this->implementation ()->create_asynch_transmit_file_result (handler,
-                                                                      socket,
-                                                                      file,
-                                                                      header_and_trailer,
-                                                                      bytes_to_write,
-                                                                      offset,
-                                                                      offset_high,
-                                                                      bytes_per_send,
-                                                                      flags,
-                                                                      act,
-                                                                      event,
-                                                                      priority,
-                                                                      signal_number);
-}
-
-ACE_Asynch_Result_Impl *
-ACE_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                   const void *act,
-                                   const ACE_Time_Value &tv,
-                                   ACE_HANDLE event,
-                                   int priority,
-                                   int signal_number)
-{
-  return this->implementation ()->create_asynch_timer (handler,
-                                                       act,
-                                                       tv,
-                                                       event,
-                                                       priority,
-                                                       signal_number);
+  // Set the proactor in the timer queue's functor
+  this->timer_queue_->upcall_functor ().proactor (*this);
 }
 
-int
-ACE_Proactor::post_wakeup_completions (int how_many)
+ACE_Proactor::Asynch_Timer::Asynch_Timer (ACE_Handler &handler,
+                                          const void *act,
+                                          const ACE_Time_Value &tv,
+                                          ACE_HANDLE event)
+  : ACE_Asynch_Result (handler, act, event),
+    time_ (tv)
 {
-  return ACE_Proactor::instance ()->implementation ()->post_wakeup_completions (how_many);
 }
 
 void
-ACE_Proactor::implementation (ACE_Proactor_Impl *implementation)
+ACE_Proactor::Asynch_Timer::complete (u_long bytes_transferred,
+                                      int success,
+                                      const void *completion_key,
+                                      u_long error)
 {
-  this->implementation_ = implementation;
+  ACE_UNUSED_ARG (error);
+  ACE_UNUSED_ARG (completion_key);
+  ACE_UNUSED_ARG (success);
+  ACE_UNUSED_ARG (bytes_transferred);
+
+  this->handler_.handle_time_out (this->time_, this->act ());
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -971,7 +1227,7 @@ template class ACE_Timer_Wheel_Iterator_T<ACE_Handler *,
         ACE_Proactor_Handle_Timeout_Upcall, ACE_SYNCH_RECURSIVE_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-#else /* !ACE_WIN32 || !ACE_HAS_AIO_CALLS */
+#else /* ACE_WIN32 */
 
 ACE_Proactor *
 ACE_Proactor::instance (size_t threads)
@@ -1018,5 +1274,4 @@ ACE_Proactor::event_loop_done (void)
 {
   return sig_atomic_t (1);
 }
-
 #endif /* ACE_WIN32 || ACE_HAS_AIO_CALLS*/
diff --git a/ace/Proactor.h b/ace/Proactor.h
index 7c08bfac14b..2766a512b48 100644
--- a/ace/Proactor.h
+++ b/ace/Proactor.h
@@ -10,36 +10,45 @@
 //    Proactor.h
 //
 // = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>,
-//    Tim Harrison <harrison@cs.wustl.edu> and
+//    Irfan Pyarali (irfan@cs.wustl.edu),
+//    Tim Harrison (harrison@cs.wustl.edu) and
 //    Alexander Babu Arulanthu <alex@cs.wustl.edu>
 //
 // ============================================================================
 
-#if !defined (ACE_PROACTOR_H)
+#ifndef ACE_PROACTOR_H
 #define ACE_PROACTOR_H
 
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-// This only works on Win32 platforms and on Unix platforms supporting
-// POSIX aio calls.
-
 #include "ace/Asynch_IO.h"
-#include "ace/Asynch_IO_Impl.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Event_Handler.h"
+
 #include "ace/Timer_Queue.h"
 #include "ace/Timer_List.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Wheel.h"
+#include "ace/Free_List.h"
+#include "ace/Pipe.h"
+
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
+    (defined (ACE_HAS_AIO_CALLS))
+// This only works on Win32 platforms and on Unix platforms supporting
+// aio calls.
 
 // Forward declarations.
-class ACE_Proactor_Impl;
+class ACE_Asynch_Result;
+class ACE_Asynch_Operation;
 class ACE_Proactor_Timer_Handler;
+class ACE_Proactor;
+#if defined (ACE_HAS_AIO_CALLS)
+class ACE_AIO_Accept_Handler;
+#endif /* ACE_HAS_AIO_CALLS */
 
 class ACE_Export ACE_Proactor_Handle_Timeout_Upcall
 {
@@ -49,28 +58,26 @@ class ACE_Export ACE_Proactor_Handle_Timeout_Upcall
   // = DESCRIPTION
   //      This class implements the functor required by the Timer
   //      Queue to call <handle_timeout> on ACE_Handlers.
-  
+public:
+  friend class ACE_Proactor;
+  // Proactor has special privileges, access needed to: proactor ().
+
   typedef ACE_Timer_Queue_T<ACE_Handler *,
                             ACE_Proactor_Handle_Timeout_Upcall,
                             ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_QUEUE;
-  // Type def for the timer queue.
-  
-  friend class ACE_Proactor;
-  // The main Proactor class has special permissions.
+          TIMER_QUEUE;
 
-public:
   ACE_Proactor_Handle_Timeout_Upcall (void);
   // Constructor.
-  
+
   int timeout (TIMER_QUEUE &timer_queue,
-	       ACE_Handler *handler,
-	       const void *arg,
-	       const ACE_Time_Value &cur_time);
+               ACE_Handler *handler,
+               const void *arg,
+               const ACE_Time_Value &cur_time);
   // This method is called when the timer expires.
 
   int cancellation (TIMER_QUEUE &timer_queue,
-		    ACE_Handler *handler);
+                    ACE_Handler *handler);
   // This method is called when the timer is canceled.
 
   int deletion (TIMER_QUEUE &timer_queue,
@@ -84,11 +91,10 @@ protected:
   // Set the proactor. This will fail, if one is already set!
 
   ACE_Proactor *proactor_;
-  // Handle to the proactor. This is needed for posting a timer result
-  // to the Proactor's completion queue.
+  // Handle to the proactor. This is needed for the completion port.
 };
 
-class ACE_Export ACE_Proactor
+class ACE_Export ACE_Proactor : public ACE_Event_Handler
 {
   // = TITLE
   //     A manager for asynchronous event demultiplexing.
@@ -97,58 +103,84 @@ class ACE_Export ACE_Proactor
   //     See the Proactor pattern description at
   //     http://www.cs.wustl.edu/~schmidt/proactor.ps.gz for more
   //     details.
+public:
+  friend class ACE_Proactor_Timer_Handler;
+  // Timer Handler has special privileges because Access needed to:
+  // thr_mgr_
+
+  friend class ACE_Proactor_Handle_Timeout_Upcall;
+  // Access needed to: Asynch_Timer, and completion_port_.
 
-  // = Here are the private typedefs that the <ACE_Proactor> uses.
+  friend class ACE_Asynch_Operation;
+  // For POSIX4-compliant-Unix systems, the
+  // <register_aio_with_proactor> call is used by
+  // <ACE_Asynch_Operation> to store some information with the
+  // Proactor after an <aio_> call is issued, so that the Proactor can
+  // retrive this information to do <aio_return> and <aio_error>.
 
+#if defined (ACE_HAS_AIO_CALLS)
+  friend class ACE_Asynch_Accept_Handler;
+  // For POSIX4 implementation, this class takes care of doing the
+  // Asynch_Accept.
+
+  friend class ACE_AIO_Accept_Handler;
+  // We need also this class with the Proactor to take care of
+  // Asynch_Accept when we use AIO_CONTROL_BLOCKS.
+#endif /* ACE_HAS_AIO_CALLS */
+
+  // = Here are the typedefs that the <ACE_Proactor> uses.
+
+  // @@ Can these typedefs be capitalized?
+  typedef ACE_Timer_Queue_T<ACE_Handler *,
+                            ACE_Proactor_Handle_Timeout_Upcall,
+                            ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Queue;
   typedef ACE_Timer_Queue_Iterator_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_QUEUE_ITERATOR;
+                                     ACE_Proactor_Handle_Timeout_Upcall,
+                                     ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Queue_Iterator;
   typedef ACE_Timer_List_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_LIST;
+                           ACE_Proactor_Handle_Timeout_Upcall,
+                           ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_List;
   typedef ACE_Timer_List_Iterator_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_LIST_ITERATOR;
+                                    ACE_Proactor_Handle_Timeout_Upcall,
+                                    ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_List_Iterator;
   typedef ACE_Timer_Heap_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_HEAP;
+                           ACE_Proactor_Handle_Timeout_Upcall,
+                           ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Heap;
   typedef ACE_Timer_Heap_Iterator_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_HEAP_ITERATOR;
+                                    ACE_Proactor_Handle_Timeout_Upcall,
+                                    ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Heap_Iterator;
   typedef ACE_Timer_Wheel_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_WHEEL;
+                            ACE_Proactor_Handle_Timeout_Upcall,
+                            ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Wheel;
   typedef ACE_Timer_Wheel_Iterator_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_WHEEL_ITERATOR;
-  
-  // = Friendship.
-  
-  friend class ACE_Proactor_Timer_Handler;
-  // Timer handler runs a thread and manages the timers, on behalf of
-  // the Proactor.
-
-public:
-  typedef ACE_Timer_Queue_T<ACE_Handler *,
-    ACE_Proactor_Handle_Timeout_Upcall,
-    ACE_SYNCH_RECURSIVE_MUTEX>
-  TIMER_QUEUE;
-  // Public type.
-
-  ACE_Proactor (ACE_Proactor_Impl *implementation = 0,
-                int delete_implementation = 0,
-                TIMER_QUEUE *tq = 0);
-  // Constructor. If <implementation> is 0, the correct implementation
-  // object will be created. <delete_implementation> flag determines
-  // whether the implementation object should be deleted by the
-  // Proactor or not. If <tq> is 0, a new TIMER_QUEUE is created.
+                                     ACE_Proactor_Handle_Timeout_Upcall,
+                                     ACE_SYNCH_RECURSIVE_MUTEX>
+          Timer_Wheel_Iterator;
+
+  enum POSIX_COMPLETION_STRATEGY
+  {
+    // Use the real time signals and do <sigtimedwait> on the
+    // signals.
+    RT_SIGNALS,
+    // Store the <aio> control blocks with the <Proactor> and do
+    // <aio_suspend> on them,
+    AIO_CONTROL_BLOCKS
+  };
+  // For Posix4-Compliat-Unix systems how the completion of the
+  // asynchronous calls should be got from the OS.
+
+  ACE_Proactor (size_t number_of_threads = 0,
+                Timer_Queue *tq = 0,
+                int used_with_reactor_event_loop = 0,
+                POSIX_COMPLETION_STRATEGY completion_strategy = AIO_CONTROL_BLOCKS);
+  // A do nothing constructor.
 
   virtual ~ACE_Proactor (void);
   // Virtual destruction.
@@ -177,9 +209,7 @@ public:
 
   static int end_event_loop (void);
   // Instruct the <ACE_Proactor::instance> to terminate its event
-  // loop. 
-  // This method wakes up all the threads blocked on waiting for
-  // completions and end the event loop.
+  // loop.
 
   static int event_loop_done (void);
   // Report if the <ACE_Proactor::instance> event loop is finished.
@@ -188,14 +218,14 @@ public:
   // Close the IO completion port.
 
   virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key);
+                               const void *completion_key);
   // This method adds the <handle> to the I/O completion port. This
-  // function is a no-op function for Unix systems and returns 0;
+  // function is a no-op function for Unix systems.
 
   // = Timer management.
   virtual long schedule_timer (ACE_Handler &handler,
-			       const void *act,
-			       const ACE_Time_Value &time);
+                               const void *act,
+                               const ACE_Time_Value &time);
   // Schedule a <handler> that will expire after <time>.  If it
   // expires then <act> is passed in as the value to the <handler>'s
   // <handle_timeout> callback method.  This method returns a
@@ -204,30 +234,30 @@ public:
   // up to values of greater than 2 billion timers.  As long as timers
   // don't stay around longer than this there should be no problems
   // with accidentally deleting the wrong timer.  Returns -1 on
-  // failure (which is guaranteed never to be a valid <timer_id>).
+  // failure (which is guaranteed never to be a valid <timer_id>.
 
   virtual long schedule_repeating_timer (ACE_Handler &handler,
-					 const void *act,
-					 const ACE_Time_Value &interval);
+                                         const void *act,
+                                         const ACE_Time_Value &interval);
 
   // Same as above except <interval> it is used to reschedule the
   // <handler> automatically.
 
   virtual long schedule_timer (ACE_Handler &handler,
-			       const void *act,
-			       const ACE_Time_Value &time,
-			       const ACE_Time_Value &interval);
+                               const void *act,
+                               const ACE_Time_Value &time,
+                               const ACE_Time_Value &interval);
   // This combines the above two methods into one. Mostly for backward
   // compatibility.
 
   virtual int cancel_timer (ACE_Handler &handler,
-			    int dont_call_handle_close = 1);
+                            int dont_call_handle_close = 1);
   // Cancel all timers associated with this <handler>.  Returns number
   // of timers cancelled.
 
   virtual int cancel_timer (long timer_id,
-			    const void **act = 0,
-			    int dont_call_handle_close = 1);
+                            const void **act = 0,
+                            int dont_call_handle_close = 1);
   // Cancel the single <ACE_Handler> that matches the <timer_id> value
   // (which was returned from the <schedule> method).  If <act> is
   // non-NULL then it will be set to point to the ``magic cookie''
@@ -238,16 +268,21 @@ public:
 
   virtual int handle_events (ACE_Time_Value &wait_time);
   // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
+  // any events occur, return.  Return 0 on success, non-zero (-1) on
+  // timeouts/errors and errno is set accordingly.
 
   virtual int handle_events (void);
   // Block indefinitely until at least one event is dispatched.
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
+  // Return 0 on success, non-zero (-1) on timeouts/errors and errno
+  // is set accordingly.
+
+  virtual int post_completion (ACE_Asynch_Result *result);
+  // Post a result to the completion port of the Proactor.  If errors
+  // occur, the result will be deleted by this method.  If successful,
+  // the result will be deleted by the Proactor when the result is
+  // removed from the completion port.  Therefore, the result should
+  // have been dynamically allocated and should be orphaned by the
+  // user once this method is called.
 
   int wake_up_dispatch_threads (void);
   // Add wakeup dispatch threads (reinit).
@@ -259,176 +294,148 @@ public:
   void number_of_threads (size_t threads);
   // Number of thread used as a parameter to CreatIoCompletionPort.
 
-  TIMER_QUEUE *timer_queue (void) const;
-  void timer_queue (TIMER_QUEUE *timer_queue);
+  Timer_Queue *timer_queue (void) const;
+  void timer_queue (Timer_Queue *);
   // Get/Set timer queue.
-  
+
   virtual ACE_HANDLE get_handle (void) const;
   // Get the event handle.
-  // It is a no-op in POSIX platforms and it returns
-  // ACE_INVALID_HANDLE.
 
-  virtual ACE_Proactor_Impl *implementation (void) const;
-  // Get the implementation class.
+#if defined (ACE_HAS_AIO_CALLS)
+#if 0
+  void posix_completion_strategy (POSIX_COMPLETION_STRATEGY strategy);
+  // Set the completion strategy.
+#endif /* 0 */
 
-  //
-  // = Factory methods for the operations
-  //
-  // Note that the user does not have to use or know about these
-  // methods.
-
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
-  // Create the correct implementation class for doing Asynch_Read_Stream.
-
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
-  // Create the correct implementation class for doing Asynch_Write_Stream.
+  POSIX_COMPLETION_STRATEGY posix_completion_strategy (void);
+  // Return the completion strategy used.
 
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
-  // Create the correct implementation class for doing Asynch_Read_File.
-
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
-  // Create the correct implementation class for doing Asynch_Write_File.
-
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
-  // Create the correct implementation class for doing Asynch_Accept.
-
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
-  // Create the correct implementation class for doing Asynch_Transmit_File.
-
-  //
-  // = Factory methods for the results
-  //
-  // Note that the user does not have to use or know about these
-  // methods unless they want to "fake" results.
-
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block &message_block,
-                                                                                u_long bytes_to_read,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                int priority = 0,
-                                                                                int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Read_Stream::Result class.
-
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
-                                                                                  ACE_HANDLE handle,
-                                                                                  ACE_Message_Block &message_block,
-                                                                                  u_long bytes_to_write,
-                                                                                  const void* act,
-                                                                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                  int priority = 0,
-                                                                                  int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Write_Stream::Result.
-
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_read,
-                                                                            const void* act,
-                                                                            u_long offset,
-                                                                            u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Read_File::Result.
-
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block &message_block,
-                                                                              u_long bytes_to_write,
-                                                                              const void* act,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Write_File::Result.
-
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
-                                                                      ACE_HANDLE listen_handle,
-                                                                      ACE_HANDLE accept_handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                      int priority = 0,
-                                                                      int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Accept::Result.
-
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                                                    ACE_HANDLE socket,
-                                                                                    ACE_HANDLE file,
-                                                                                    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                                    u_long bytes_to_write,
-                                                                                    u_long offset,
-                                                                                    u_long offset_high,
-                                                                                    u_long bytes_per_send,
-                                                                                    u_long flags,
-                                                                                    const void *act,
-                                                                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                    int priority = 0,
-                                                                                    int signal_number = ACE_SIGRTMIN);
-  // Create the correct implementation class for ACE_Asynch_Transmit_File::Result. 
-  
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = ACE_SIGRTMIN);
-  // Create a timer result object which can be used with the Timer
-  // mechanism of the Proactor. 
-  // If <signal_number> is -1, <POSIX_SIG_Proactor> will create a
-  // Timer object with a meaningful signal number, choosing the
-  // largest signal number from the signal mask of the Proactor.
+  int notify_asynch_accept (ACE_Asynch_Accept::Result* result);
+  // Asynch_Accept calls this function to notify an accept to the
+  // Proactor.
+#endif /* ACE_HAS_AIO_CALLS */
 
 protected:
+  virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
+  // Called when object is signaled by OS (either via UNIX signals or
+  // when a Win32 object becomes signaled).
+
+  virtual int handle_close (ACE_HANDLE handle,
+                            ACE_Reactor_Mask close_mask);
+  // Called when object is removed from the ACE_Reactor.
+
+  void application_specific_code (ACE_Asynch_Result *asynch_result,
+                                  u_long bytes_transferred,
+                                  int success,
+                                  const void *completion_key,
+                                  u_long error);
+  // Protect against structured exceptions caused by user code when
+  // dispatching handles.
+
+  virtual int handle_events (unsigned long milli_seconds);
+  // Dispatch a single set of events.  If <milli_seconds> elapses
+  // before any events occur, return.
+
+  // @@ Alex, many C++ compilers don't like nested classes.  Can you
+  // please bring this into the "outer scope" and add an "ACE_" prefix
+  // to it?
+  class ACE_Export Asynch_Timer : protected ACE_Asynch_Result
+    {
+      // = TITLE
+      //     This class is posted to the completion port when a timer
+      //     expires. When the complete method of this object is
+      //     called, the <handler>'s handle_timeout method will be
+      //     called.
+    public:
+      friend class ACE_Proactor_Handle_Timeout_Upcall;
+      // Timer Handler has special privileges
+      // Access needed to: convert Asynch_Timer into an OVERLAPPED
+
+      Asynch_Timer (ACE_Handler &handler,
+                    const void *act,
+                    const ACE_Time_Value &tv,
+                    ACE_HANDLE event = ACE_INVALID_HANDLE);
+
+    protected:
+      virtual void complete (u_long bytes_transferred,
+                             int success,
+                             const void *completion_key,
+                             u_long error = 0);
+      // This method calls the <handler>'s handle_timeout method
+
+      ACE_Time_Value time_;
+      // Time value requested by caller
+  };
+
+#if defined (ACE_HAS_AIO_CALLS)
+  POSIX_COMPLETION_STRATEGY posix_completion_strategy_;
+  // Flag that indicates how the completion status is got from the OS
+  // on the POSIX4-Compliant-Unix systems.
+
+  sigset_t RT_completion_signals_;
+  // These signals are used for completion notification by the
+  // Proactor.
+  // These signals are masked in the current process.
+  // By default, ACE_SIG_AIO_READ and ACE_SIG_AIO_WRITE are
+  // the  two signals used for completion notification. But if the
+  // user has specified someother signals in any of the
+  // read/write/transmit operations, some other signals might also
+  // have got masked.
+
+  ACE_AIO_Accept_Handler* aio_accept_handler_;
+  // This class takes care of doing <accept> when we use
+  // AIO_CONTROL_BLOCKS strategy.
+
+  aiocb *aiocb_list_ [ACE_RTSIG_MAX];
+  // Use an array to keep track of all the aio's issued
+  // currently. We'll limit the array size to Maximum RT signals that
+  // can be queued in a process.  This is the upper limit how many aio
+  // operations can be pending at a time.
+
+  size_t aiocb_list_max_size_;
+  // To maintain the maximum size of the array (list).
+
+  size_t aiocb_list_cur_size_;
+  // To maintain the current size of the array (list).
+#elif defined (ACE_WIN32)
+  ACE_HANDLE completion_port_;
+  // Handle for the completion port. Unix doesnt have completion
+  // ports.
+
+  size_t number_of_threads_;
+  // This number is passed to the <CreatIOCompletionPort> system
+  // call.
+#endif /* ACE_HAS_AIO_CALLS */
+
+  Timer_Queue *timer_queue_;
+  // Timer Queue.
 
-  static int post_wakeup_completions (int how_many);
-  // Post <how_many> completions to the completion port so that all
-  // threads can wake up. This is used in conjunction with the
-  // <run_event_loop>. 
+  int delete_timer_queue_;
+  // Flag on whether to delete the timer queue.
+
+  ACE_Proactor_Timer_Handler *timer_handler_;
+  // Handles timeouts events.
 
-  virtual void implementation (ACE_Proactor_Impl *implementation);
-  // Set the implementation class.
+  ACE_Thread_Manager thr_mgr_;
+  // This will manage the thread in the Timer_Handler.
 
-  ACE_Proactor_Impl *implementation_;
-  // Delegation/implementation class that all methods will be
-  // forwarded to.
+  ACE_Auto_Event event_;
+  // This event is used in conjunction with Reactor when we try to
+  // integrate the event loops of Reactor and the Proactor.
 
-  int delete_implementation_;
-  // Flag used to indicate whether we are responsible for cleaning up
-  // the implementation instance.
+  int used_with_reactor_event_loop_;
+  // Flag that indicates whether we are used in conjunction with
+  // Reactor.
 
+private:
   static ACE_Proactor *proactor_;
   // Pointer to a process-wide <ACE_Proactor>.
 
   static int delete_proactor_;
   // Must delete the <proactor_> if non-0.
-  
-  ACE_Proactor_Timer_Handler *timer_handler_;
-  // Handles timeout events. 
-  
-  ACE_Thread_Manager thr_mgr_;
-  // This will manage the thread in the Timer_Handler.
-
-  TIMER_QUEUE *timer_queue_;
-  // Timer Queue.
-
-  int delete_timer_queue_;
-  // Flag on whether to delete the timer queue.
 
   static sig_atomic_t end_event_loop_;
   // Terminate the proactor event loop.
-
-  static sig_atomic_t event_loop_thread_count_;
-  // Number of threads in the event loop.
-
-private:
-  ACE_Proactor (const ACE_Proactor &);
-  ACE_Proactor &operator= (const ACE_Proactor &);
-  // Deny access since member-wise won't work...
 };
 
 #if defined (__ACE_INLINE__)
@@ -441,7 +448,7 @@ class ACE_Export ACE_Proactor
 public:
   class Timer_Queue {};
   ACE_Proactor (size_t /* number_of_threads */ = 0,
-		Timer_Queue * /* tq */ = 0) {}
+                Timer_Queue * /* tq */ = 0) {}
   virtual int handle_events (void) { return -1; }
   virtual int handle_events (ACE_Time_Value &) { return -1; }
 
@@ -466,5 +473,6 @@ public:
   static sig_atomic_t event_loop_done (void);
   // Placeholder to enable compilation on non-Win32 platforms
 };
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
+
+#endif /* ACE_WIN32 */
 #endif /* ACE_PROACTOR_H */
diff --git a/ace/Proactor_Impl.h b/ace/Proactor_Impl.h
deleted file mode 100644
index 16d5b65d08f..00000000000
--- a/ace/Proactor_Impl.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Proactor_Impl.h
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_PROACTOR_IMPL_H)
-#define ACE_PROACTOR_IMPL_H
-
-#include "ace/OS.h"
-
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-// This only works on Win32 platforms and on Unix platforms supporting
-// aio calls.  
-
-#include "ace/Asynch_IO.h"
-#include "ace/Reactor.h"
-
-class ACE_Export ACE_Proactor_Impl : public ACE_Event_Handler
-{
-  // = TITLE
-  // 
-  //     A manager for asynchronous event demultiplexing. This class
-  //     is the base class for all the concrete implementation
-  //     classes. 
-  //
-  // = DESCRIPTION
-  // 
-  //     See the Proactor pattern description at
-  //     http://www.cs.wustl.edu/~schmidt/proactor.ps.gz for more
-  //     details.
-  
-public:
-  virtual ~ACE_Proactor_Impl (void) {}
-  // Virtual destruction.
-
-  virtual int close (void) = 0;
-  // Close the IO completion port.
-
-  virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key) = 0;
-  // This method adds the <handle> to the I/O completion port. This
-  // function is a no-op function for Unix systems.
-
-  virtual int handle_events (ACE_Time_Value &wait_time) = 0;
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly.
-  
-  virtual int handle_events (void) = 0;
-  // Block indefinitely until at least one event is dispatched.
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly.
- 
-  virtual int wake_up_dispatch_threads (void) = 0;
-  // Add wakeup dispatch threads (reinit).
-
-  virtual int close_dispatch_threads (int wait) = 0;
-  // Close all dispatch threads.
-
-  virtual size_t number_of_threads (void) const = 0;
-  virtual void number_of_threads (size_t threads) = 0;
-  // Number of thread used as a parameter to CreatIoCompletionPort. 
-
-  virtual ACE_HANDLE get_handle (void) const = 0;
-  // Get the event handle.
-  
-  //
-  // = Factory methods for the operations
-  //
-  // Note that the user does not have to use or know about these
-  // methods.
-
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void) = 0;
-  // Create the correct implementation class for doing Asynch_Read_Stream. 
-
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void) = 0;
-  // Create the correct implementation class for doing Asynch_Write_Stream. 
-  
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void) = 0;
-  // Create the correct implementation class for doing Asynch_Read_File. 
-  
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void) = 0;
-    // Create the correct implementation class for doing Asynch_Write_File. 
-
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void) = 0;
-  // Create the correct implementation class for doing Asynch_Accept. 
-  
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void) = 0;
-  // Create the correct implementation class for doing Asynch_Transmit_File.
-  
-  //
-  // = Factory methods for the results
-  //
-  // Note that the user does not have to use or know about these
-  // methods unless they want to "fake" results.
-
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block &message_block,
-                                                                                u_long bytes_to_read,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                int priority = 0,
-                                                                                int signal_number = ACE_SIGRTMIN) = 0;
-  // Create the correct implementation class for ACE_Asynch_Read_Stream::Result class. 
-  
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
-                                                                                  ACE_HANDLE handle,
-                                                                                  ACE_Message_Block &message_block,
-                                                                                  u_long bytes_to_write,
-                                                                                  const void* act,
-                                                                                  ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                  int priority = 0,
-                                                                                  int signal_number = ACE_SIGRTMIN) = 0;
-  // Create the correct implementation class for ACE_Asynch_Write_Stream::Result.
-    
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_read,
-                                                                            const void* act,
-                                                                            u_long offset,
-                                                                            u_long offset_high,
-                                                                            ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                            int priority = 0,
-                                                                            int signal_number = ACE_SIGRTMIN) = 0;
-  // Create the correct implementation class for ACE_Asynch_Read_File::Result.  
-  
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block &message_block,
-                                                                              u_long bytes_to_write,
-                                                                              const void* act,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                              int priority = 0,
-                                                                              int signal_number = ACE_SIGRTMIN) = 0;
-    // Create the correct implementation class for ACE_Asynch_Write_File::Result.
-  
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
-                                                                      ACE_HANDLE listen_handle,
-                                                                      ACE_HANDLE accept_handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                      int priority = 0,
-                                                                      int signal_number = ACE_SIGRTMIN) = 0;
-  // Create the correct implementation class for ACE_Asynch_Accept::Result.
-  
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                                                    ACE_HANDLE socket,
-                                                                                    ACE_HANDLE file,
-                                                                                    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                                    u_long bytes_to_write,
-                                                                                    u_long offset,
-                                                                                    u_long offset_high,
-                                                                                    u_long bytes_per_send,
-                                                                                    u_long flags,
-                                                                                    const void *act,
-                                                                                    ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                                                    int priority = 0,
-                                                                                    int signal_number = ACE_SIGRTMIN) = 0;
-  // Create the correct implementation class for ACE_Asynch_Transmit_File::Result.
-
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event = ACE_INVALID_HANDLE,
-                                                       int priority = 0,
-                                                       int signal_number = 0) = 0;
-  // Create the correct implementation object for the Timer
-  // result. POSIX_SIG_Proactor will create a Timer object with a
-  // meaningful signal number, if you leave the signal number as 0.
-
-  virtual int post_wakeup_completions (int how_many) = 0;
-  // Post <how_many> completions to the completion port so that all
-  // threads can wake up. This is used in conjunction with the
-  // <run_event_loop>. 
-};
-
-#endif /* (ACE_WIN32 && ACE_HAS_WINCE) || ACE_HAS_AIO_CALLS */
-#endif /* ACE_PROACTOR_IMPL_H */
diff --git a/ace/Process.cpp b/ace/Process.cpp
index 2f4abe189f7..3a7606d4cc4 100644
--- a/ace/Process.cpp
+++ b/ace/Process.cpp
@@ -92,8 +92,7 @@ ACE_Process::spawn (ACE_Process_Options &options)
   return this->child_id_;
 #else /* ACE_WIN32 */
   // Fork the new process.
-  this->child_id_ = ACE::fork (options.command_line_argv ()[0],
-                               options.avoid_zombies ());
+  this->child_id_ = ACE_OS::fork (options.command_line_argv ()[0]);
 
   // If we're not supposed to exec, return the process id.
   if (ACE_BIT_ENABLED (options.creation_flags (), ACE_Process_Options::NO_EXEC))
@@ -226,7 +225,6 @@ ACE_Process_Options::ACE_Process_Options (int ie,
     stdin_ (ACE_INVALID_HANDLE),
     stdout_ (ACE_INVALID_HANDLE),
     stderr_ (ACE_INVALID_HANDLE),
-    avoid_zombies_ (0),
 #endif /* ACE_WIN32 */
     set_handles_called_ (0),
     environment_buf_index_ (0),
diff --git a/ace/Process.h b/ace/Process.h
index b80b0020e12..5281897e218 100644
--- a/ace/Process.h
+++ b/ace/Process.h
@@ -154,15 +154,12 @@ public:
   LPSECURITY_ATTRIBUTES get_process_attributes (void) const;
   // Get the process_attributes.  Returns NULL if
   // set_process_attributes has not been set.
-
   LPSECURITY_ATTRIBUTES set_process_attributes (void);
   // If this is called, a non-null process attributes is sent to
   // CreateProcess.
-
   LPSECURITY_ATTRIBUTES get_thread_attributes (void) const;
   // Get the thread_attributes.  Returns NULL if set_thread_attributes
   // has not been set.
-
   LPSECURITY_ATTRIBUTES set_thread_attributes (void);
   // If this is called, a non-null thread attributes is sent to
   // CreateProcess.
@@ -173,14 +170,14 @@ public:
   // Allows disabling of handle inheritence.
 #else /* All things not WIN32 */
 
-  char *const *command_line_argv (void);
+  char * const *command_line_argv (void);
   // argv-style command-line options.  Parses and modifies the string
   // created from this->command_line.  All spaces not in quotes ("" or
   // '') are replaced with null (\0) bytes.  An argv array is built
   // and returned with each entry pointing to the start of
   // null-terminated string.  Returns { 0 } if nothing has been set.
 
-  char *const *env_argv (void);
+  char * const *env_argv (void);
   // argv-style array of environment settings.
 
   // = Accessors for the standard handles.
@@ -188,10 +185,6 @@ public:
   ACE_HANDLE get_stdout (void);
   ACE_HANDLE get_stderr (void);
 
-  void avoid_zombies (int);
-  // Set value for avoid_zombies.
-  int avoid_zombies (void);
-  // Get current value for avoid_zombies.
 #endif /* ACE_WIN32 */
 
 protected:
@@ -238,8 +231,6 @@ protected:
   ACE_HANDLE stdin_;
   ACE_HANDLE stdout_;
   ACE_HANDLE stderr_;
-  // Avoid zombies for spawned processes.
-  int avoid_zombies_;
 #endif /* ACE_WIN32 */
 
 #if !defined (ACE_HAS_WINCE)
diff --git a/ace/Process.i b/ace/Process.i
index ce83a1ec6af..8d68339895f 100644
--- a/ace/Process.i
+++ b/ace/Process.i
@@ -151,16 +151,6 @@ ACE_Process_Options::get_stderr (void)
   return stderr_;
 }
 
-ACE_INLINE int
-ACE_Process_Options::avoid_zombies (void)
-{
-  return avoid_zombies_;
-}
-ACE_INLINE void
-ACE_Process_Options::avoid_zombies (int avoid_zombies)
-{
-  avoid_zombies_ = avoid_zombies;
-}
 #endif /* ACE_WIN32 */
 
 ACE_INLINE LPTSTR
diff --git a/ace/Profile_Timer.cpp b/ace/Profile_Timer.cpp
index cbff43fe3c8..5b0cf717fd1 100644
--- a/ace/Profile_Timer.cpp
+++ b/ace/Profile_Timer.cpp
@@ -11,7 +11,7 @@ ACE_RCSID(ace, Profile_Timer, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer)
 
-#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
+#if defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)
 
 void
 ACE_Profile_Timer::dump (void) const
@@ -28,28 +28,28 @@ ACE_Profile_Timer::ACE_Profile_Timer (void)
   ACE_OS::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
   ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_);
 
-#  if defined (ACE_HAS_PRUSAGE_T)
+#if defined (ACE_HAS_PRUSAGE_T)
   ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_);
   char buf[20];
   ACE_OS::sprintf (buf, "/proc/%d", ACE_OS::getpid ());
 
   if ((this->proc_handle_ = ACE_OS::open (buf, O_RDONLY, 0)) == -1)
     ACE_OS::perror (buf);
-#  elif defined (ACE_HAS_GETRUSAGE)
+#elif defined (ACE_HAS_GETRUSAGE)
   ACE_OS::memset (&this->begin_time_, 0, sizeof this->begin_time_);
   ACE_OS::memset (&this->end_time_, 0, sizeof this->end_time_);
   ACE_OS::memset (&this->last_time_, 0, sizeof this->last_time_);
-#  endif /* ACE_HAS_PRUSAGE_T */
+#endif /* ACE_HAS_PRUSAGE_T */
 }
 
 // Terminate the interval timer.
 ACE_Profile_Timer::~ACE_Profile_Timer (void)
 {
   ACE_TRACE ("ACE_Profile_Timer::~ACE_Profile_Timer");
-#  if defined (ACE_HAS_PRUSAGE_T)
+#if defined (ACE_HAS_PRUSAGE_T)
   if (ACE_OS::close (this->proc_handle_) == -1)
     ACE_OS::perror ("ACE_Profile_Timer::~ACE_Profile_Timer");
-#  endif /* ACE_HAS_PRUSAGE_T */
+#endif /* ACE_HAS_PRUSAGE_T */
 }
 
 // Return the resource utilization.
@@ -61,7 +61,7 @@ ACE_Profile_Timer::get_rusage (ACE_Profile_Timer::Rusage &usage)
   usage = this->end_usage_;
 }
 
-#  if defined (ACE_HAS_PRUSAGE_T)
+#if defined (ACE_HAS_PRUSAGE_T)
 
 // Compute the amount of resource utilization since the start time.
 
@@ -127,14 +127,14 @@ ACE_Profile_Timer::subtract (timespec_t &tdiff, timespec_t &t1, timespec_t &t0)
     }
 }
 
-#  elif defined (ACE_HAS_GETRUSAGE)
+#elif defined (ACE_HAS_GETRUSAGE)
 // Compute the amount of resource utilization since the start time.
 
 void
 ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
 {
   ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage");
-#    if !defined (ACE_WIN32) && !defined (ACE_HAS_LIMITED_RUSAGE_T)
+#if !defined (ACE_WIN32) && !defined (ACE_HAS_LIMITED_RUSAGE_T)
   // integral shared memory size
   usage.ru_ixrss = this->end_usage_.ru_ixrss - this->last_usage_.ru_ixrss;
   // integral unshared data "
@@ -166,9 +166,9 @@ ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
   usage.ru_nivcsw = this->end_usage_.ru_nivcsw - this->last_usage_.ru_nivcsw;
   this->subtract (usage.ru_utime, this->end_usage_.ru_utime, this->last_usage_.ru_utime);
   this->subtract (usage.ru_stime, this->end_usage_.ru_stime, this->last_usage_.ru_stime);
-#    else
+#else
   ACE_UNUSED_ARG(usage);
-#    endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 */
 }
 
 void
@@ -176,7 +176,7 @@ ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et)
 {
   ACE_TRACE ("ACE_Profile_Timer::compute_times");
 
-#    if defined (ACE_WIN32)
+#if defined (ACE_WIN32)
   ACE_Time_Value atv = this->end_time_ - this->begin_time_;
   et.real_time = atv.sec () + ((double) atv.usec ()) / ACE_ONE_SECOND_IN_USECS;
 
@@ -188,7 +188,7 @@ ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et)
   atv = ACE_Time_Value (this->end_usage_.ru_stime)
         - ACE_Time_Value (this->begin_usage_.ru_stime);
   et.system_time = atv.sec () + ((double) atv.usec ()) / ACE_ONE_SECOND_IN_USECS;
-#    else
+#else
   timeval td;
 
   this->subtract (td, this->end_time_, this->begin_time_);
@@ -199,7 +199,7 @@ ACE_Profile_Timer::compute_times (ACE_Elapsed_Time &et)
 
   this->subtract (td, this->end_usage_.ru_stime,  this->begin_usage_.ru_stime);
   et.system_time = td.tv_sec + ((double) td.tv_usec) / ACE_ONE_SECOND_IN_USECS;
-#    endif /* ACE_WIN32 */
+#endif /* ACE_WIN32 */
 }
 
 // Determine the difference between T1 and T2.
@@ -220,7 +220,7 @@ ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0)
     }
 }
 
-#  endif /* ACE_HAS_PRUSAGE_T */
+#endif /* ACE_HAS_PRUSAGE_T */
 
 // Compute the amount of time that has elapsed between start and stop.
 
@@ -232,107 +232,7 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
   return 0;
 }
 
-#elif defined (ACE_WIN32) /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */
-
-void
-ACE_Profile_Timer::dump (void) const
-{
-  ACE_TRACE ("ACE_Profile_Timer::dump");
-  timer_.dump ();
-}
-
-// Initialize interval timer.
-ACE_Profile_Timer::ACE_Profile_Timer (void)
-  : timer_ ()
-{
-  ACE_TRACE ("ACE_Profile_Timer::ACE_Profile_Timer");
-#  if defined (ACE_HAS_GETRUSAGE)
-
-  ACE_OS::memset (&this->end_usage_, 0, sizeof this->end_usage_);
-  ACE_OS::memset (&this->begin_usage_, 0, sizeof this->begin_usage_);
-  ACE_OS::memset (&this->last_usage_, 0, sizeof this->last_usage_);
-
-  ACE_OS::memset (&this->begin_time_, 0, sizeof this->begin_time_);
-  ACE_OS::memset (&this->end_time_, 0, sizeof this->end_time_);
-  ACE_OS::memset (&this->last_time_, 0, sizeof this->last_time_);
-#  endif /* ACE_HAS_GETRUSAGE */
-}
-
-int
-ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
-{
-  ACE_TRACE ("ACE_Profile_Timer::elapsed_time");
-
-  ACE_hrtime_t delta_t; // nanoseconds
-  timer_.elapsed_time (delta_t);
-
-  et.real_time = (__int64) delta_t / (double) ACE_ONE_SECOND_IN_NSECS;
-
-#  if defined (ACE_HAS_GETRUSAGE)
-  ACE_Time_Value atv = ACE_Time_Value (this->end_usage_.ru_utime)
-                       - ACE_Time_Value (this->begin_usage_.ru_utime);
-  et.user_time = atv.sec () + ((double) atv.usec ()) / ACE_ONE_SECOND_IN_USECS;
-
-  atv = ACE_Time_Value (this->end_usage_.ru_stime)
-        - ACE_Time_Value (this->begin_usage_.ru_stime);
-  et.system_time = atv.sec () + ((double) atv.usec ()) / ACE_ONE_SECOND_IN_USECS;
-#  else /* ACE_HAS_GETRUSAGE */
-  et.user_time = 0;
-  et.system_time = 0;
-#  endif /* ACE_HAS_GETRUSAGE */
-
-  return 0;
-}
-
-// Return the resource utilization.
-
-void
-ACE_Profile_Timer::get_rusage (ACE_Profile_Timer::Rusage &usage)
-{
-  ACE_TRACE ("ACE_Profile_Timer::get_rusage");
-#  if defined (ACE_HAS_GETRUSAGE)
-  usage = this->end_usage_;
-#  else /* ACE_HAS_GETRUSAGE */
-  usage = 0;
-#  endif /* ACE_HAS_GETRUSAGE */
-}
-
-// Compute the amount of resource utilization since the start time.
-
-void
-ACE_Profile_Timer::elapsed_rusage (ACE_Profile_Timer::Rusage &usage)
-{
-  ACE_TRACE ("ACE_Profile_Timer::elapsed_rusage");
-
-#  if defined (ACE_HAS_GETRUSAGE)
-  usage.ru_utime = this->end_usage_.ru_utime - this->begin_usage_.ru_utime;
-  usage.ru_stime = this->end_usage_.ru_stime - this->begin_usage_.ru_stime;
-#  else /* ACE_HAS_GETRUSAGE */
-  usage = 0;
-#  endif /* ACE_HAS_GETRUSAGE */
-}
-
-#  if defined (ACE_HAS_GETRUSAGE)
-// Determine the difference between T1 and T2.
-
-void
-ACE_Profile_Timer::subtract (timeval &tdiff, timeval &t1, timeval &t0)
-{
-  ACE_TRACE ("ACE_Profile_Timer::subtract");
-  tdiff.tv_sec  = t1.tv_sec - t0.tv_sec;
-  tdiff.tv_usec = t1.tv_usec - t0.tv_usec;
-
-  // Normalize the time.
-
-  while (tdiff.tv_usec < 0)
-    {
-      tdiff.tv_sec--;
-      tdiff.tv_usec += ACE_ONE_SECOND_IN_USECS;
-    }
-}
-#  endif /* ACE_HAS_GETRUSAGE */
-
-#else /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */
+#else
 
 void
 ACE_Profile_Timer::dump (void) const
@@ -352,19 +252,23 @@ ACE_Profile_Timer::elapsed_time (ACE_Elapsed_Time &et)
 {
   ACE_TRACE ("ACE_Profile_Timer::elapsed_time");
 
-#  if defined (ACE_LACKS_FLOATING_POINT)
+#if defined (ACE_LACKS_FLOATING_POINT)
   ACE_Time_Value delta_t; /* elapsed time will be in microseconds */
   timer_.elapsed_time (delta_t);
 
   // Store the time in usecs.
   et.real_time = delta_t.sec () * ACE_ONE_SECOND_IN_USECS  +
                  delta_t.usec ();
-#  else  /* ! ACE_LACKS_FLOATING_POINT */
+#else  /* ! ACE_LACKS_FLOATING_POINT */
   ACE_hrtime_t delta_t; /* nanoseconds */
   timer_.elapsed_time (delta_t);
 
+# if defined (ACE_WIN32)
+  et.real_time = (__int64) delta_t / (double) ACE_ONE_SECOND_IN_NSECS;
+# else
   et.real_time = delta_t / (double) ACE_ONE_SECOND_IN_NSECS;
-#  endif /* ! ACE_LACKS_FLOATING_POINT */
+# endif /* ACE_WIN32 */
+#endif /* ! ACE_LACKS_FLOATING_POINT */
 
   et.user_time = 0;
   et.system_time = 0;
diff --git a/ace/Profile_Timer.h b/ace/Profile_Timer.h
index 63d055db4dc..daae4348146 100644
--- a/ace/Profile_Timer.h
+++ b/ace/Profile_Timer.h
@@ -100,7 +100,7 @@ private:
   ACE_HANDLE proc_handle_;
   // I/O handle for /proc file system.
 
-#elif defined (ACE_HAS_GETRUSAGE) 
+#elif defined (ACE_HAS_GETRUSAGE)
   void subtract (timeval &tdiff, timeval &t0, timeval &t1);
   // Substract two timestructs and store their difference.
 
@@ -112,12 +112,9 @@ private:
 
   timeval last_time_;
   // Keep track of the last time for incremental timing.
-#endif /* ACE_HAS_PRUSAGE_T */
-
-#if defined (ACE_WIN32) || (!defined (ACE_HAS_PRUSAGE_T) && !defined (ACE_HAS_GETRUSAGE))
+#else
   ACE_High_Res_Timer timer_;
-  // The high resolution timer
-#endif /* ACE_WIN32 || !ACE_HAS_PRUSAGE_T && !ACE_HAS_GETRUSAGE */
+#endif /* ACE_HAS_PRUSAGE_T */
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/ace/Profile_Timer.i b/ace/Profile_Timer.i
index 77c0a6ba322..9126760a8c9 100644
--- a/ace/Profile_Timer.i
+++ b/ace/Profile_Timer.i
@@ -1,9 +1,9 @@
 /* -*- C++ -*- */
 // $Id$
 
-#if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32)
+#if defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)
 
-#  if defined (ACE_HAS_PRUSAGE_T)
+#if defined (ACE_HAS_PRUSAGE_T)
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
@@ -22,7 +22,7 @@ ACE_Profile_Timer::stop (void)
                     PIOCUSAGE,
                     &this->end_usage_);
 }
-#  elif defined (ACE_HAS_GETRUSAGE)
+#elif defined (ACE_HAS_GETRUSAGE)
 ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
@@ -43,37 +43,7 @@ ACE_Profile_Timer::stop (void)
   return 0;
 }
 
-#  endif /* ACE_HAS_PRUSAGE_T */
-
-#elif defined (ACE_WIN32)
-
-ACE_INLINE
-ACE_Profile_Timer::~ACE_Profile_Timer (void)
-{
-}
-
-ACE_INLINE int
-ACE_Profile_Timer::start (void)
-{
-  ACE_TRACE ("ACE_Profile_Timer::start");
-#  if defined (ACE_HAS_GETRUSAGE)
-  ACE_OS::getrusage (RUSAGE_SELF, &this->begin_usage_);
-#  endif /* ACE_HAS_GETRUSAGE */
-  this->timer_.start ();
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Profile_Timer::stop (void)
-{
-  ACE_TRACE ("ACE_Profile_Timer::stop");
-  this->timer_.stop ();
-#  if defined (ACE_HAS_GETRUSAGE)
-  this->last_usage_ = this->end_usage_;
-  ACE_OS::getrusage (RUSAGE_SELF, &this->end_usage_);
-#  endif /* ACE_HAS_GETRUSAGE */
-  return 0;
-}
+#endif /* ACE_HAS_PRUSAGE_T */
 
 #else
 
@@ -81,7 +51,7 @@ ACE_INLINE int
 ACE_Profile_Timer::start (void)
 {
   ACE_TRACE ("ACE_Profile_Timer::start");
-  this->timer_.start ();
+  timer_.start ();
   return 0;
 }
 
@@ -89,7 +59,7 @@ ACE_INLINE int
 ACE_Profile_Timer::stop (void)
 {
   ACE_TRACE ("ACE_Profile_Timer::stop");
-  this->timer_.stop ();
+  timer_.stop ();
   return 0;
 }
 
@@ -97,5 +67,4 @@ ACE_INLINE
 ACE_Profile_Timer::~ACE_Profile_Timer (void)
 {
 }
-
 #endif /* defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE) */
diff --git a/ace/RB_Tree.cpp b/ace/RB_Tree.cpp
index 251f5c563e3..5b619313e6d 100644
--- a/ace/RB_Tree.cpp
+++ b/ace/RB_Tree.cpp
@@ -17,15 +17,15 @@
 
 ACE_RCSID(ace, RB_Tree, "$Id$")
 
-/////////////////////////////////////////////////////
-// template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
-/////////////////////////////////////////////////////
+/////////////////////////////////////////////
+// template class ACE_RB_Tree_Node<KEY, T> //
+/////////////////////////////////////////////
 
 
 // Constructor.
 
-template <class EXT_ID, class INT_ID>
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)
+template <class KEY, class T>
+ACE_RB_Tree_Node<KEY, T>::ACE_RB_Tree_Node (const KEY &k, const T &t)
   : k_ (k)
   , t_ (t)
   , color_ (RED)
@@ -33,17 +33,14 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_I
   , left_ (0)
   , right_ (0)
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t)");
 }
 
 
 // Destructor.
 
-template <class EXT_ID, class INT_ID>
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node ()
+template <class KEY, class T>
+ACE_RB_Tree_Node<KEY, T>::~ACE_RB_Tree_Node ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node");
-
   // Delete left sub-tree.
   delete left_;
 
@@ -53,113 +50,309 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::~ACE_RB_Tree_Node ()
 
 
 
-////////////////////////////////////////////////
-// template class ACE_RB_Tree<EXT_ID, INT_ID> //
-////////////////////////////////////////////////
+////////////////////////////////////////
+// template class ACE_RB_Tree<KEY, T> //
+////////////////////////////////////////
 
 // Constructor.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (ACE_Allocator *alloc)
-  : allocator_ (alloc),
-    root_ (0),
-    current_size_ (0)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree ()
+  : root_ (0)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "ACE_RB_Tree (ACE_Allocator *alloc)");
-  if (this->open (alloc) == -1)
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("ACE_RB_Tree::ACE_RB_Tree\n")));
 }
 
 
 // Copy constructor.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt)
-  : allocator_ (rbt.allocator_),
-    root_ (0),
-    current_size_ (0)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &rbt)
+  : root_ (0)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt)");
-  ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
-
   // Make a deep copy of the passed tree.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt);
+  ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> iter(rbt);
   for (iter.first (); iter.is_done () == 0; iter.next ())
   {
-    insert_i (*(iter.key ()), *(iter.item ()));
+    insert (*(iter.key ()), *(iter.item ()));
   }
 }
 
+
 // Destructor.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree ()
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree ()
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree");
-
-  // Use the locked public method, to be totally safe, as the
-  // class can be used with an allocator and placement new.
-  this->close ();
+  // Clear away all nodes in the tree.
+  clear ();
 }
 
 
 // Assignment operator.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator = (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::operator = (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &rbt)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator =");
-  ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
-
   // Clear out the existing tree.
-  close_i ();
+  clear ();
 
   // Make a deep copy of the passed tree.
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iter(rbt);
+  ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> iter(rbt);
   for (iter.first (); iter.is_done () == 0; iter.next ())
   {
-    insert_i (*(iter.key ()), *(iter.item ()));
+    insert (*(iter.key ()), *(iter.item ()));
   }
-
-  // Use the same allocator as the rhs.
-  allocator_ = rbt.allocator_;
 }
 
 // Less than comparison function for keys, default
 // functor implementation returns 1 if k1 < k2, 0 otherwise.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan (const EXT_ID &k1, const EXT_ID &k2)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> int
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::lessthan (const KEY &k1, const KEY &k2)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::lessthan");
-  return this->compare_keys_ (k1, k2);
+      return this->compare_keys_ (k1, k2);
 }
 
 
-// Method for right rotation of the tree about a given node.
+// Returns a pointer to the item corresponding to the
+// given key, or 0 if it cannot find the key in the tree.
+
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> T*
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::find (const KEY &k)
+{
+  // Find the closest matching node, if there is one.
+  ACE_RB_Tree_Node<KEY, T> *current = find_node (k);
+
+  if (current)
+  {
+    // If a nearest matching node was returned.
+    if (this->lessthan (current->key (), k)
+        || this->lessthan (k, current->key ()))
+    {
+      // If the keys differ, there is no match: return 0.
+      return 0;
+    }
+    else
+    {
+      // The keys match: return a pointer to the node's item.
+      return &(current->item ());
+    }
+  }
+  else
+  {
+    // The tree is empty: return 0.
+    return 0;
+  }
+}
+
+
+
+// Inserts a *copy* of the key and the item into the tree:
+// both the key type KEY and the item type T must have well
+// defined semantics for copy construction and < comparison.
+// This method returns a pointer to the inserted item copy,
+// or 0 if an error occurred.  NOTE: if an identical key
+// already exists in the tree, no new item is created, and
+// the returned pointer addresses the existing item
+// associated with the existing key.
+
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>  T*
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::insert (const KEY &k, const T &t)
+{
+  // Find the closest matching node, if there is one.
+  ACE_RB_Tree_Node<KEY, T> *current = find_node (k);
+  if (current)
+  {
+    if (this->lessthan (current->key (), k))
+    {
+      // If a nearest matching node has a key less than the insertion key.
+      if (current->right ())
+      {
+        // If there is already a right subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nright subtree already present in "
+                                      "ACE_RB_Tree<KEY, T>::insert\n")), 0);
+      }
+      else
+      {
+        // The right subtree is empty: insert new node there.
+        current->right (new ACE_RB_Tree_Node<KEY, T> (k, t));
+        if (current->right ())
+        {
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          T *item = &(current->right ()->item ());
+          current->right ()->parent (current);
+          RB_rebalance (current->right ());
+          root_->color (ACE_RB_Tree_Node_Base::BLACK);
+          return item;
+        }
+        else
+        {
+          // Memory allocation failed.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->right_ failed "
+                                      "in ACE_RB_Tree<KEY, T>::insert\n")), 0);
+        }
+      }
+    }
+    else if (this->lessthan (k, current->key ()))
+    {
+      // If a nearest matching node has a key greater than the insertion key.
+      if (current->left ())
+      {
+        // If there is already a left subtree, complain.
+        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nleft subtree already present in "
+                                      "ACE_RB_Tree<KEY, T>::insert\n")), 0);
+      }
+      else
+      {
+        // The right subtree is empty: insert new node there.
+        current->left (new ACE_RB_Tree_Node<KEY, T> (k, t));
+        if (current->left ())
+        {
+          // If the node was successfully inserted, set its parent, rebalance
+          // the tree, color the root black, and return a pointer to the
+          // inserted item.
+          T *item = &(current->left ()->item ());
+          current->left ()->parent (current);
+          RB_rebalance (current->left ());
+          root_->color (ACE_RB_Tree_Node_Base::BLACK);
+          return item;
+        }
+        else
+        {
+          // Memory allocation failed.
+          ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                           ASYS_TEXT ("\nmemory allocation to current->left_ failed in "
+                                      "ACE_RB_Tree<KEY, T>::insert\n")), 0);
+        }
+      }
+    }
+    else
+    {
+      // The keys match: return a pointer to the node's item.
+      return &(current->item ());
+    }
+  }
+  else
+  {
+    // The tree is empty: insert at the root and color the root black.
+    root_ = new ACE_RB_Tree_Node<KEY, T> (k, t);
+    if (root_)
+    {
+      root_->color (ACE_RB_Tree_Node_Base::BLACK);
+      return &(root_->item ());
+    }
+    else
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
+                         ASYS_TEXT ("\nmemory allocation to root_ failed in "
+                                    "ACE_RB_Tree<KEY, T>::insert\n")), 0);
+    }
+  }
+}
+
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x)
+// Removes the item associated with the given key from the
+// tree and destroys it.  Returns 1 if it found the item
+// and successfully destroyed it, 0 if it did not find the
+// item, or -1 if an error occurred.
+
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>  int
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::remove (const KEY &k)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right");
+  // Find a matching node, if there is one.
+  ACE_RB_Tree_Node<KEY, T> *x, *z;
+
+  z = find_node (k);
 
+  if ((z) && (! this->lessthan (z->key (), k))
+      && (! this->lessthan (k, z->key ())))
+  {
+    // There is a matching node: remove and destroy it.
+    ACE_RB_Tree_Node<KEY, T> *y;
+    if ((z->left ()) && (z->right ()))
+    {
+      y = RB_tree_successor (z);
+    }
+    else
+    {
+      y = z;
+    }
+    if (y->left ())
+    {
+      x = y->left ();
+    }
+    else
+    {
+      x = y->right ();
+    }
+    if (x)
+        {
+          x->parent (y->parent ());
+        }
+    if (y->parent ())
+    {
+      if (y == y->parent ()->left ())
+      {
+        y->parent ()->left (x);
+      }
+      else
+      {
+        y->parent ()->right (x);
+      }
+    }
+    else
+    {
+      root_ = x;
+    }
+    if (y != z)
+    {
+      // Copy the elements of y into z.
+      z->key () = y->key ();
+      z->item () = y->item ();
+    }
+    if (y->color () == ACE_RB_Tree_Node_Base::BLACK)
+    {
+      RB_delete_fixup (x);
+    }
+    y->parent (0);
+    y->right (0);
+    y->left (0);
+    delete y;
+    return 1;
+  }
+  else
+  {
+    // No matching node was found: return 0.
+    return 0;
+  }
+}
+
+
+// Method for right rotation of the tree about a given node.
+
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>  void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tree_Node<KEY, T> * x)
+{
   if (! x)
   {
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                        ASYS_TEXT ("\nerror: x is a null pointer in "
-                                  "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+                                  "ACE_RB_Tree<KEY, T>::RB_rotate_right\n")));
   }
   else if (! (x->left()))
   {
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("\nerror: x->left () is a null pointer in "
-                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_right\n")));
+                           "ACE_RB_Tree<KEY, T>::RB_rotate_right\n")));
   }
   else
   {
-    ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
+    ACE_RB_Tree_Node<KEY, T> * y;
     y = x->left ();
     x->left (y->right ());
     if (y->right ())
@@ -190,26 +383,24 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_right (ACE_RB_Tre
 
 // Method for left rotation of the tree about a given node.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree_Node<KEY, T> * x)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left");
-
   if (! x)
   {
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("\nerror: x is a null pointer in "
-                           "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+                           "ACE_RB_Tree<KEY, T>::RB_rotate_left\n")));
   }
   else if (! (x->right()))
   {
     ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                 ASYS_TEXT ("\nerror: x->right () is a null pointer "
-                           "in ACE_RB_Tree<EXT_ID, INT_ID>::RB_rotate_left\n")));
+                           "in ACE_RB_Tree<KEY, T>::RB_rotate_left\n")));
   }
   else
   {
-    ACE_RB_Tree_Node<EXT_ID, INT_ID> * y;
+    ACE_RB_Tree_Node<KEY, T> * y;
     y = x->right ();
     x->right (y->left ());
     if (y->left ())
@@ -240,107 +431,71 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rotate_left (ACE_RB_Tree
 
 // Method for restoring Red-Black properties after deletion.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>  void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tree_Node<KEY, T> * x)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup");
-
-  while (x &&
-         x->parent () &&
-         x->color () == ACE_RB_Tree_Node_Base::BLACK)
+  while ((x) && (x->parent ()) && (x->color () == ACE_RB_Tree_Node_Base::BLACK))
   {
     if (x == x->parent ()->left ())
     {
-      ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->right ();
-      if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
+      ACE_RB_Tree_Node<KEY, T> *w = x->parent ()->right ();
+      if (w->color () == ACE_RB_Tree_Node_Base::RED)
       {
         w->color (ACE_RB_Tree_Node_Base::BLACK);
         x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
         RB_rotate_left (x->parent ());
         w = x->parent ()->right ();
       }
-      // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-      if ((w) &&
-          (!w->left () ||
-           w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
-          (!w->right () ||
-           w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+      if ((w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
+          (w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
       {
         w->color (ACE_RB_Tree_Node_Base::RED);
         x = x->parent ();
       }
       else
       {
-        // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-        if (w &&
-            (!w->right () ||
-             w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+        if (w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK)
         {
-          if (w->left ())
-            {
-              w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
-            }
+          w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
           w->color (ACE_RB_Tree_Node_Base::RED);
           RB_rotate_right (w);
           w = x->parent ()->right ();
         }
-        if (w)
-          {
-            w->color (x->parent ()->color ());
-            if (w->right ())
-              {
-                w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              }
-          }
+        w->color (x->parent ()->color ());
         x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
         RB_rotate_left (x->parent ());
         x = root_;
       }
     }
     else
     {
-      ACE_RB_Tree_Node<EXT_ID, INT_ID> *w = x->parent ()->left ();
-      if (w && w->color () == ACE_RB_Tree_Node_Base::RED)
+      ACE_RB_Tree_Node<KEY, T> *w = x->parent ()->left ();
+      if (w->color () == ACE_RB_Tree_Node_Base::RED)
       {
         w->color (ACE_RB_Tree_Node_Base::BLACK);
         x->parent ()->color (ACE_RB_Tree_Node_Base::RED);
         RB_rotate_right (x->parent ());
         w = x->parent ()->left ();
       }
-      // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-      if (w &&
-          (!w->left () ||
-           w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
-          (!w->right () ||
-           w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+      if ((w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK) &&
+          (w->right ()->color () == ACE_RB_Tree_Node_Base::BLACK))
       {
         w->color (ACE_RB_Tree_Node_Base::RED);
         x = x->parent ();
       }
       else
       {
-        // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-        if (w &&
-            (!w->left () ||
-             w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK))
+        if (w->left ()->color () == ACE_RB_Tree_Node_Base::BLACK)
         {
+          w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
           w->color (ACE_RB_Tree_Node_Base::RED);
-          if (w->right ())
-            {
-              w->right ()->color (ACE_RB_Tree_Node_Base::BLACK);
-            }
           RB_rotate_left (w);
           w = x->parent ()->left ();
         }
-        if (w)
-          {
-            w->color (x->parent ()->color ());
-            if (w->left ())
-              {
-                w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
-              }
-          }
+        w->color (x->parent ()->color ());
         x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
+        w->left ()->color (ACE_RB_Tree_Node_Base::BLACK);
         RB_rotate_right (x->parent ());
         x = root_;
       }
@@ -360,13 +515,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_delete_fixup (ACE_RB_Tre
 // if the tree is not empty and there is no such match,
 // or 0 if the tree is empty.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k, ACE_RB_Tree_Base::RB_SearchResult &result)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::find_node (const KEY &k)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node");
-
-  // Start at the root.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = root_;
+  ACE_RB_Tree_Node<KEY, T> *current = root_;
 
   while (current)
   {
@@ -381,9 +533,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k,
       }
       else
       {
-        // If the right subtree is empty, we're done searching,
-        // and are positioned to the left of the insertion point.
-        result = LEFT;
+        // If the right subtree is empty, we're done.
         break;
       }
     }
@@ -397,16 +547,13 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k,
       }
       else
       {
-        // If the left subtree is empty, we're done searching,
-        // and are positioned to the right of the insertion point.
-        result = RIGHT;
+        // If the left subtree is empty, we're done.
         break;
       }
     }
     else
     {
-      // If the keys match exactly, we're done as well.
-      result = EXACT;
+      // If the keys match, we're done.
       break;
     }
   }
@@ -417,30 +564,27 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_node (const EXT_ID &k,
 
 // Rebalance the tree after insertion of a node.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_Node<KEY, T> * x)
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance");
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = 0;
+  ACE_RB_Tree_Node<KEY, T> *y = 0;
 
-  while (x &&
-         x->parent () &&
-         x->parent ()->color () == ACE_RB_Tree_Node_Base::RED)
+  while ((x) && (x->parent ())
+         && (x->parent ()->color () == ACE_RB_Tree_Node_Base::RED))
   {
     if (! x->parent ()->parent ())
     {
       // If we got here, something is drastically wrong!
       ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),
                   ASYS_TEXT ("\nerror: parent's parent is null in "
-                             "ACE_RB_Tree<EXT_ID, INT_ID>::RB_rebalance\n")));
+                             "ACE_RB_Tree<KEY, T>::RB_rebalance\n")));
       return;
     }
 
     if (x->parent () == x->parent ()->parent ()->left ())
     {
       y = x->parent ()->parent ()->right ();
-      if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
+      if (y && (y->color () == ACE_RB_Tree_Node_Base::RED))
       {
         // Handle case 1 (see CLR book, pp. 269).
         x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
@@ -466,7 +610,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N
     else
     {
       y = x->parent ()->parent ()->left ();
-      if (y && y->color () == ACE_RB_Tree_Node_Base::RED)
+      if (y && (y->color () == ACE_RB_Tree_Node_Base::RED))
       {
         // Handle case 1 (see CLR book, pp. 269).
         x->parent ()->color (ACE_RB_Tree_Node_Base::BLACK);
@@ -495,17 +639,15 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_rebalance (ACE_RB_Tree_N
 
 // Method to find the successor node of the given node in the tree.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor (ACE_RB_Tree_Node<KEY, T> *x) const
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor");
-
   if (x->right ())
   {
     return RB_tree_minimum (x->right ());
   }
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent ();
+  ACE_RB_Tree_Node<KEY, T> *y = x->parent ();
   while ((y) && (x == y->right ()))
   {
     x = y;
@@ -518,17 +660,15 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_successor (ACE_RB_T
 
 // Method to find the predecessor node of the given node in the tree.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor (ACE_RB_Tree_Node<KEY, T> *x) const
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor");
-
   if (x->left ())
   {
     return RB_tree_maximum (x->left ());
   }
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *y = x->parent ();
+  ACE_RB_Tree_Node<KEY, T> *y = x->parent ();
   while ((y) && (x == y->left ()))
   {
     x = y;
@@ -541,11 +681,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_predecessor (ACE_RB
 
 // Method to find the minimum node of the subtree rooted at the given node.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum (ACE_RB_Tree_Node<KEY, T> *x) const
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum");
-
   while ((x) && (x->left ()))
   {
     x = x->left ();
@@ -557,11 +695,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_minimum (ACE_RB_Tre
 
 // Method to find the maximum node of the subtree rooted at the given node.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum (ACE_RB_Tree_Node<KEY, T> *x) const
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum");
-
   while ((x) && (x->right ()))
   {
     x = x->right ();
@@ -570,490 +706,30 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::RB_tree_maximum (ACE_RB_Tre
   return x;
 }
 
-// Close down an RB_Tree.  this method should
-// only be called with locks already held.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i ()
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close_i");
-
-  delete root_;
-  current_size_ = 0;
-  root_ = 0;
-
-  return 0;
-}
-
-// Returns a pointer to the item corresponding to the given key,
-// or 0 if it cannot find the key in the tree.  This method should
-// only be called with locks already held.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i (const EXT_ID &k,
-                                                             ACE_RB_Tree_Node<EXT_ID, INT_ID>* &entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find_i");
-
-  // Try to find a match.
-  RB_SearchResult result = LEFT;
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
-
-  if (current && result == EXACT)
-  {
-    // Found an exact match: return a pointer to the node.
-    entry = current;
-    return 0;
-  }
-  else
-  {
-    // The node is not there.
-    return -1;
-  }
-}
-
-
-// Inserts a *copy* of the key and the item into the tree:
-// both the key type EXT_ID and the item type INT_ID must have well
-// defined semantics for copy construction and < comparison.
-// This method returns a pointer to the inserted item copy,
-// or 0 if an error occurred.  NOTE: if an identical key
-// already exists in the tree, no new item is created, and
-// the returned pointer addresses the existing item
-// associated with the existing key.   This method should
-// only be called with locks already held.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> INT_ID*
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t)");
-
-  // Find the closest matching node, if there is one.
-  RB_SearchResult result = LEFT;
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
-  if (current)
-  {
-    // If the keys match, just return a pointer to the node's item.
-    if (result == EXACT)
-    {
-      return &(current->item ());
-    }
-    // Otherwise if we're to the left of the insertion
-    // point, insert into the right subtree.
-    else if (result == LEFT)
-    {
-      if (current->right ())
-      {
-        // If there is already a right subtree, complain.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nright subtree already present in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
-      }
-      else
-      {
-        // The right subtree is empty: insert new node there.
-        current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
-        if (current->right ())
-        {
-          // If the node was successfully inserted, set its parent, rebalance
-          // the tree, color the root black, and return a pointer to the
-          // inserted item.
-          INT_ID *item = &(current->right ()->item ());
-          current->right ()->parent (current);
-          RB_rebalance (current->right ());
-          root_->color (ACE_RB_Tree_Node_Base::BLACK);
-          ++current_size_;
-          return item;
-        }
-        else
-        {
-          // Memory allocation failed.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nmemory allocation to current->right_ failed "
-                                      "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
-        }
-      }
-    }
-    // Otherwise, we're to the right of the insertion
-    // point, so insert into the left subtree.
-    else // (result == RIGHT)
-    {
-      if (current->left ())
-      {
-        // If there is already a left subtree, complain.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nleft subtree already present in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
-      }
-      else
-      {
-        // The left subtree is empty: insert new node there.
-        current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
-        if (current->left ())
-        {
-          // If the node was successfully inserted, set its parent, rebalance
-          // the tree, color the root black, and return a pointer to the
-          // inserted item.
-          INT_ID *item = &(current->left ()->item ());
-          current->left ()->parent (current);
-          RB_rebalance (current->left ());
-          root_->color (ACE_RB_Tree_Node_Base::BLACK);
-          ++current_size_;
-          return item;
-        }
-        else
-        {
-          // Memory allocation failed.
-          ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nmemory allocation to current->left_ failed in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
-        }
-      }
-    }
-  }
-  else
-  {
-    // The tree is empty: insert at the root and color the root black.
-    root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t);
-    if (root_)
-    {
-      root_->color (ACE_RB_Tree_Node_Base::BLACK);
-      ++current_size_;
-      return &(root_->item ());
-    }
-    else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("\nmemory allocation to root_ failed in "
-                                    "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), 0);
-    }
-  }
-}
-
-
-// Inserts a *copy* of the key and the item into the tree: both the
-// key type EXT_ID and the item type INT_ID must have well defined semantics
-// for copy construction.  The default implementation also requires that
-// the key type support well defined < semantics.  This method passes back
-// a pointer to the inserted (or existing) node, and the search status.  If
-// the node already exists, the method returns 1.  If the node does not
-// exist, and a new one is successfully created, and the method returns 0.
-// If there was an error, the method returns -1.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t,
-                                                               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert_i (const EXT_ID &k, const INT_ID &t, "
-             "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-
-  // Find the closest matching node, if there is one.
-  RB_SearchResult result = LEFT;
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *current = find_node (k, result);
-  if (current)
-  {
-    // If the keys match, just return a pointer to the node's item.
-    if (result == EXACT)
-    {
-      entry = current;
-      return 1;
-    }
-    // Otherwise if we're to the left of the insertion
-    // point, insert into the right subtree.
-    else if (result == LEFT)
-    {
-      if (current->right ())
-      {
-        // If there is already a right subtree, complain.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nright subtree already present in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
-      }
-      else
-      {
-        // The right subtree is empty: insert new node there.
-        current->right (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
-        if (current->right ())
-        {
-          // If the node was successfully inserted, set its parent, rebalance
-          // the tree, color the root black, and return a pointer to the
-          // inserted item.
-          entry = current->right ();
-          current->right ()->parent (current);
-          RB_rebalance (current->right ());
-          root_->color (ACE_RB_Tree_Node_Base::BLACK);
-          ++current_size_;
-          return 0;
-        }
-        else
-        {
-          // Memory allocation failed.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nmemory allocation to current->right_ failed "
-                                      "in ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
-        }
-      }
-    }
-    // Otherwise, we're to the right of the insertion
-    // point, so insert into the left subtree.
-    else // (result == RIGHT)
-    {
-      if (current->left ())
-      {
-        // If there is already a left subtree, complain.
-        ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nleft subtree already present in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
-      }
-      else
-      {
-        // The left subtree is empty: insert new node there.
-        current->left (new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t));
-        if (current->left ())
-        {
-          // If the node was successfully inserted, set its parent, rebalance
-          // the tree, color the root black, and return a pointer to the
-          // inserted item.
-          entry = current->left ();
-          current->left ()->parent (current);
-          RB_rebalance (current->left ());
-          root_->color (ACE_RB_Tree_Node_Base::BLACK);
-          ++current_size_;
-          return 0;
-        }
-        else
-        {
-          // Memory allocation failed.
-          ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("\nmemory allocation to current->left_ failed in "
-                                      "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
-        }
-      }
-    }
-  }
-  else
-  {
-    // The tree is empty: insert at the root and color the root black.
-    root_ = new ACE_RB_Tree_Node<EXT_ID, INT_ID> (k, t);
-    if (root_)
-    {
-      root_->color (ACE_RB_Tree_Node_Base::BLACK);
-      ++current_size_;
-      entry = root_;
-      return 0;
-    }
-    else
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),
-                         ASYS_TEXT ("\nmemory allocation to root_ failed in "
-                                    "ACE_RB_Tree<EXT_ID, INT_ID>::insert_i\n")), -1);
-    }
-  }
-}
-
-
-// Removes the item associated with the given key from the
-// tree and destroys it.  Returns 1 if it found the item
-// and successfully destroyed it, 0 if it did not find the
-// item, or -1 if an error occurred.  This method should
-// only be called with locks already held.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k, INT_ID &i)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (const EXT_ID &k, INT_ID &i)");
 
-  // Find a matching node, if there is one.
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *z;
-  RB_SearchResult result = LEFT;
-  z = find_node (k, result);
 
-  // If there is a matching node: remove and destroy it.
-  if (z && result == EXACT)
-    {
-      // Return the internal id stored in the deleted node.
-      i = z->item ();
-      return (-1 == this->remove_i (z)) ? -1 : 1;
-    }
-  else
-  {
-    // No matching node was found: return 0.
-    return 0;
-  }
-}
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>  int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *z)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *z)");
-
-  // Delete the node and reorganize the tree to satisfy the Red-Black properties.
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *x, *y;
-
-  if ((z->left ()) && (z->right ()))
-  {
-    y = RB_tree_successor (z);
-  }
-  else
-  {
-    y = z;
-  }
-  if (y->left ())
-  {
-    x = y->left ();
-  }
-  else
-  {
-    x = y->right ();
-  }
-  if (x)
-      {
-        x->parent (y->parent ());
-      }
-  if (y->parent ())
-  {
-    if (y == y->parent ()->left ())
-    {
-      y->parent ()->left (x);
-    }
-    else
-    {
-      y->parent ()->right (x);
-    }
-  }
-  else
-  {
-    root_ = x;
-  }
-  if (y != z)
-  {
-    // Copy the elements of y into z.
-    z->key () = y->key ();
-    z->item () = y->item ();
-  }
-  // CLR pp. 263 says that nil nodes are implicitly colored BLACK
-  if (!y || y->color () == ACE_RB_Tree_Node_Base::BLACK)
-  {
-    RB_delete_fixup (x);
-  }
-  y->parent (0);
-  y->right (0);
-  y->left (0);
-  delete y;
-  --current_size_;
-
-  return 0;
-}
-
-
-
-///////////////////////////////////////////////////////////////////////
-// template class                                                    //
-// ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-///////////////////////////////////////////////////////////////////////
-
-ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator_Base)
-
-// Constructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,               int set_first)
-  : tree_ (&tree), node_ (0)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (ACE_RB_Tree, int)");
-
-  // Position the iterator at the first (or last) node in the tree.
-  if (set_first)
-    {
-      node_ = tree_->RB_tree_minimum (tree_->root_);
-    }
-  else
-    {
-      node_ = tree_->RB_tree_maximum (tree_->root_);
-    }
-}
-
-// Copy constructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter)
-  : tree_ (iter.tree_),
-    node_ (iter.node_)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator_Base (ACE_RB_Tree_Iterator_Base)");
-}
-
-// Assignment operator.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> void
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator=");
-  tree_ = iter.tree_;
-  node_ = iter.node_;
-}
-
-
-// Destructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator_Base ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator_Base");
-}
-
-
-//////////////////////////////////////////////////////////////////
-// template class                                               //
-// ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-//////////////////////////////////////////////////////////////////
-
-ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Iterator)
-
-// Constructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
-     int set_first)
-  : ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (tree, set_first)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator");
-}
-
-
-// Destructor.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator");
-}
 
-//////////////////////////////////////////////////////////////////////////
-// template class                                                       //
-// ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-//////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////
+// template class ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> //
+//////////////////////////////////////////////////////////
 
-ACE_ALLOC_HOOK_DEFINE(ACE_RB_Tree_Reverse_Iterator)
 
 // Constructor.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree, int set_last)
-  : ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (tree, set_last ? 0 : 1)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Iterator (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &tree)
+  : tree_ (tree), node_ (0)
 {
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::ACE_RB_Tree_Reverse_Iterator");
+  // Position the iterator at the first node in the tree.
+  first ();
 }
 
 
 // Destructor.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Reverse_Iterator ()
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Iterator ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::~ACE_RB_Tree_Reverse_Iterator");
 }
 
 
diff --git a/ace/RB_Tree.h b/ace/RB_Tree.h
index 5d20fcb6aee..a58a07d540f 100644
--- a/ace/RB_Tree.h
+++ b/ace/RB_Tree.h
@@ -17,54 +17,38 @@
 #ifndef ACE_RB_TREE_H
 #define ACE_RB_TREE_H
 
-#include "ace/OS.h"
+#include "ace/ACE.h"
 #include "ace/Functor.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// Forward decl.
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Iterator_Base;
-
-// Forward decl.
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Iterator;
-
-// Forward decl.
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Reverse_Iterator;
-
-// Forward decl.
-class ACE_Allocator;
-
 class ACE_RB_Tree_Node_Base
 {
 public:
   enum RB_Tree_Node_Color {RED, BLACK};
 };
 
-template <class EXT_ID, class INT_ID>
+template <class KEY, class T>
 class ACE_RB_Tree_Node : public ACE_RB_Tree_Node_Base
 {
   // = TITLE
   //   Implements a node in a Red-Black Tree ADT.
-  //
 public:
 
   // Initialization and termination methods.
 
-  ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t);
+  ACE_RB_Tree_Node (const KEY &k, const T &t);
   // Constructor.
 
   ~ACE_RB_Tree_Node (void);
   // Destructor.
 
-  EXT_ID &key (void);
+  KEY &key (void);
   // Key accessor.
 
-  INT_ID &item (void);
+  T &item (void);
   // Item accessor.
 
   void color (RB_Tree_Node_Color c);
@@ -73,596 +57,199 @@ public:
   RB_Tree_Node_Color color (void);
   // Get color of the node.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent (void);
+  ACE_RB_Tree_Node<KEY, T> *parent (void);
   // Accessor for node's parent pointer.
 
-  void parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p);
+  void parent (ACE_RB_Tree_Node<KEY, T> * p);
   // Mutator for node's parent pointer.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *left (void);
+  ACE_RB_Tree_Node<KEY, T> *left (void);
   // Accessor for node's left child pointer.
 
-  void left (ACE_RB_Tree_Node<EXT_ID, INT_ID> *l);
+  void left (ACE_RB_Tree_Node<KEY, T> *l);
   // Mutator for node's left child pointer.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *right (void);
+  ACE_RB_Tree_Node<KEY, T> *right (void);
   // Accessor for node's right child pointer.
 
-  void right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r);
+  void right (ACE_RB_Tree_Node<KEY, T> * r);
   // Mutator for node's right child pointer
 
 private:
 
-  EXT_ID k_;
+  KEY k_;
   // The key.
 
-  INT_ID t_;
+  T t_;
   // The item.
 
   RB_Tree_Node_Color color_;
   // Color of the node.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *parent_;
+  ACE_RB_Tree_Node<KEY, T> *parent_;
   // Pointer to node's parent.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *left_;
+  ACE_RB_Tree_Node<KEY, T> *left_;
   // Pointer to node's left child.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *right_;
+  ACE_RB_Tree_Node<KEY, T> *right_;
   // Pointer to node's right child.
 };
 
-
-class ACE_RB_Tree_Base
-{
-public:
-  // = Search result enumeration.
-  enum RB_SearchResult {LEFT, EXACT, RIGHT};
-};
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree : public ACE_RB_Tree_Base
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+class ACE_RB_Tree
 {
   // = TITLE
-  //     Implements a Red-Black Tree ADT, according to T. H. Corman,
-  //     C. E. Leiserson, and R. L. Rivest, "Introduction to Algorithms"
-  //     1990, MIT, chapter 14.
+  //   Implements a Red-Black Tree ADT, according to T. H. Corman,
+  //   C. E. Leiserson, and R. L. Rivest, "Introduction to Algorithms"
+  //   1990, MIT, chapter 14.
   //
   // = Description
-  //     A number of Changes have been made to this class template
-  //     in order to conform to the ACE_Hash_Map_Manager_Ex
-  //     interface.  All previously supported public methods are
-  //     still part of this class. However, these are marked as
-  //     DEPRECATED and will be removed from this class in
-  //     a future version of ACE.  Please migrate your code
-  //     to the appropriate public methods indicated in the
-  //     method deprecation comments.
-  //
-  //     This class uses an <ACE_Allocator> to allocate memory.  The
-  //     user can make this a persistent class by providing an
-  //     <ACE_Allocator> with a persistable memory pool.
-
+  //   If an ACE allocator is passed to the RB_Tree constructor, it is used 
+  //   for all dynamic allocations done by the tree.
 public:
-  friend class ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>;
-  friend class ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>;
-  friend class ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>;
-
-  typedef EXT_ID KEY;
-  typedef INT_ID VALUE;
-  typedef ACE_RB_Tree_Node<EXT_ID, INT_ID> ENTRY;
-
-  // = ACE-style iterator typedefs.
-  typedef ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> ITERATOR;
-  typedef ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> REVERSE_ITERATOR;
-
-  // = STL-style iterator typedefs.
-  typedef ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> iterator;
-  typedef ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> reverse_iterator;
-
   // = Initialization and termination methods.
-
-  ACE_RB_Tree (ACE_Allocator *alloc = 0);
+  ACE_RB_Tree ();
   // Constructor.
 
-  ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt);
+  ACE_RB_Tree (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &rbt);
   // Copy constructor.
 
-  int open (ACE_Allocator *alloc = 0);
-  // Initialize an RB Tree.
-
-  int close (void);
-  // Close down an RB_Tree and release dynamically allocated
-  // resources.
-
   virtual ~ACE_RB_Tree (void);
   // Destructor.
 
-  // = insertion, removal, and search methods.
-
-  int bind (const EXT_ID &item,
-            const INT_ID &int_id);
-  // Associate <ext_id> with <int_id>.  If <ext_id> is already in the
-  // tree then the <ACE_RB_Tree_Node> is not changed.  Returns 0 if a
-  // new entry is bound successfully, returns 1 if an attempt is made
-  // to bind an existing entry, and returns -1 if failures occur.
-
-  int bind (const EXT_ID &ext_id,
-            const INT_ID &int_id,
-            ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Same as a normal bind, except the tree entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-
-  int trybind (const EXT_ID &ext_id,
-               INT_ID &int_id);
-  // Associate <ext_id> with <int_id> if and only if <ext_id> is not
-  // in the tree.  If <ext_id> is already in the tree then the <int_id>
-  // parameter is assigned the existing value in the tree.  Returns 0
-  // if a new entry is bound successfully, returns 1 if an attempt is
-  // made to bind an existing entry, and returns -1 if failures occur.
-
-  int trybind (const EXT_ID &ext_id,
-               INT_ID &int_id,
-               ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Same as a normal trybind, except the tree entry is also passed
-  // back to the caller.  The entry in this case will either be the
-  // newly created entry, or the existing one.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id);
-  // Reassociate <ext_id> with <int_id>.  If <ext_id> is not in the
-  // tree then behaves just like <bind>.  Returns 0 if a new entry is
-  // bound successfully, returns 1 if an existing entry was rebound,
-  // and returns -1 if failures occur.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id,
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Same as a normal rebind, except the tree entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id,
-              INT_ID &old_int_id);
-  // Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
-  // then behaves just like <bind>.  Otherwise, store the old value of
-  // <int_id> into the "out" parameter and rebind the new parameters.
-  // Returns 0 if a new entry is bound successfully, returns 1 if an
-  // existing entry was rebound, and returns -1 if failures occur.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id,
-              INT_ID &old_int_id,
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Same as a normal rebind, except the tree entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id,
-              EXT_ID &old_ext_id,
-              INT_ID &old_int_id);
-  // Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
-  // then behaves just like <bind>.  Otherwise, store the old values
-  // of <ext_id> and <int_id> into the "out" parameters and rebind the
-  // new parameters.  This is very useful if you need to have an
-  // atomic way of updating <ACE_RB_Tree_Nodes> and you also need
-  // full control over memory allocation.  Returns 0 if a new entry is
-  // bound successfully, returns 1 if an existing entry was rebound,
-  // and returns -1 if failures occur.
-
-  int rebind (const EXT_ID &ext_id,
-              const INT_ID &int_id,
-              EXT_ID &old_ext_id,
-              INT_ID &old_int_id,
-              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Same as a normal rebind, except the tree entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-  int find (const EXT_ID &ext_id,
-            INT_ID &int_id);
-  // Locate <ext_id> and pass out parameter via <int_id>.  If found,
-  // return 0, returns -1 if not found.
-
-  int find (const EXT_ID &ext_id,
-            ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Locate <ext_id> and pass out parameter via <entry>.  If found,
-  // return 0, returns -1 if not found.
-
-  int unbind (const EXT_ID &ext_id);
-  // Unbind (remove) the <ext_id> from the tree.  Don't return the
-  // <int_id> to the caller (this is useful for collections where the
-  // <int_id>s are *not* dynamically allocated...)
-
-  int unbind (const EXT_ID &ext_id,
-              INT_ID &int_id);
-  // Break any association of <ext_id>.  Returns the value of <int_id>
-  // in case the caller needs to deallocate memory.
-
-  int unbind (ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry);
-  // Remove entry from tree.  This method should be used with *extreme*
-  // caution, and only for optimization purposes.  The node being passed
-  // in had better have been allocated by the tree that is unbinding it.
-
-  // = Public helper methods.
-
-  size_t current_size (void);
-  // Returns the current number of nodes in the tree.
-
-  void operator= (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt);
+  void operator= (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &rbt);
   // Assignment operator.
 
-  virtual int lessthan (const EXT_ID &k1, const EXT_ID &k2);
+  virtual int lessthan (const KEY &k1, const KEY &k2);
   // Less than comparison function for keys, using comparison functor.
 
-  ACE_LOCK &mutex (void);
-  // Returns a reference to the underlying <ACE_LOCK>.  This makes it
-  // possible to acquire the lock explicitly, which can be useful in
-  // some cases if you instantiate the <ACE_Atomic_Op> with an
-  // <ACE_Recursive_Mutex> or <ACE_Process_Mutex>, or if you need to
-  // guard the state of an iterator.  NOTE: the right name would be
-  // <lock>, but HP/C++ will choke on that!
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  // = STL styled iterator factory functions.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> begin (void);
-  // Return forward iterator positioned at first node in tree.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> end (void);
-  // Return forward iterator positioned at last node in tree.
-
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rbegin (void);
-  // Return reverse iterator positioned at last node in tree.
-
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> rend (void);
-  // Return reverse iterator positioned at first node in tree.
-
-  // = DEPRECATED methods.  Please migrate your code to use the new methods instead
-
-  INT_ID* find (const EXT_ID &k);
+  T* find (const KEY &k);
   // Returns a pointer to the item corresponding to the
   // given key, or 0 if it cannot find the key in the tree.
-  //
-  // DEPRECATED: signature will change to become
-  // int find (const EXT_ID &ext_id); which will return
-  // 0 if the <ext_id> is in the tree, otherwise -1.
-
 
-
-  INT_ID* insert (const EXT_ID &k, const INT_ID &t);
+  T* insert (const KEY &k, const T &t);
   // Inserts a *copy* of the key and the item into the tree: both the
-  // key type EXT_ID and the item type INT_ID must have well defined semantics
+  // key type KEY and the item type T must have well defined semantics
   // for copy construction.  The default implementation also requires that
-  // the key type support well defined < semantics.  This method returns a
+  // the key type support welll defined < semantics.  This method returns a
   // pointer to the inserted item copy, or 0 if an error occurred.
   // NOTE: if an identical key already exists in the tree, no new item
   // is created, and the returned pointer addresses the existing item
   // associated with the existing key.
-  // DEPRECATED
 
-  int remove (const EXT_ID &k);
+  int remove (const KEY &k);
   // Removes the item associated with the given key from the tree and
   // destroys it.  Returns 1 if it found the item and successfully
   // destroyed it, 0 if it did not find the item, or -1 if an error
   // occurred.
-  // DEPRECATED
 
   void clear (void);
   // Destroys all nodes and sets the root pointer null.
-  // DEPRECATED
 
-protected:
+  // These could all be made private methods by making the corresponding
+  // class template instantiations friends, but there are some problems
+  // with this on certain compilers: leave them all public for now.
 
-  // = Protected methods. These should only be called with locks held.
+// private:
 
-  void RB_rotate_right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);
+  void RB_rotate_right (ACE_RB_Tree_Node<KEY, T> * x);
   // Method for right rotation of the tree about a given node.
 
-  void RB_rotate_left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);
+  void RB_rotate_left (ACE_RB_Tree_Node<KEY, T> * x);
   // Method for left rotation of the tree about a given node.
 
-  void RB_delete_fixup (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);
+  void RB_delete_fixup (ACE_RB_Tree_Node<KEY, T> * x);
   // Method for restoring Red-Black properties after deletion.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-    RB_tree_successor (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const;
+  ACE_RB_Tree_Node<KEY, T> * 
+    RB_tree_successor (ACE_RB_Tree_Node<KEY, T> *x) const;
   // Method to find the successor node of the given node in the tree.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-    RB_tree_predecessor (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const;
+  ACE_RB_Tree_Node<KEY, T> * 
+    RB_tree_predecessor (ACE_RB_Tree_Node<KEY, T> *x) const;
   // Method to find the predecessor node of the given node in the
   // tree.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-    RB_tree_minimum (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const;
+  ACE_RB_Tree_Node<KEY, T> * 
+    RB_tree_minimum (ACE_RB_Tree_Node<KEY, T> *x) const;
   // Method to find the minimum node of the subtree rooted at the
   // given node.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-    RB_tree_maximum (ACE_RB_Tree_Node<EXT_ID, INT_ID> *x) const;
+  ACE_RB_Tree_Node<KEY, T> * 
+    RB_tree_maximum (ACE_RB_Tree_Node<KEY, T> *x) const;
   // Method to find the maximum node of the subtree rooted at the
   // given node.
 
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-    find_node (const EXT_ID &k, RB_SearchResult &result);
+  ACE_RB_Tree_Node<KEY, T> * find_node (const KEY &k);
   // Returns a pointer to a matching node if there is one, a pointer
   // to the node under which to insert the item if the tree is not
   // empty and there is no such match, or 0 if the tree is empty.
-  // It stores the result of the search in the result argument:
-  // LEFT if the node is to the left of the node to be inserted,
-  // RIGHT if the node is to the right of the node to be inserted,
-  // or EXACT if an exactly matching node already exists.
 
-  void RB_rebalance (ACE_RB_Tree_Node<EXT_ID, INT_ID> * x);
+  void RB_rebalance (ACE_RB_Tree_Node<KEY, T> * x);
   // Rebalance the tree after insertion of a node.
 
-  int close_i (void);
-  // Close down an RB_Tree.  this method should
-  // only be called with locks already held.
-
-  int find_i (const EXT_ID &ext_id, ACE_RB_Tree_Node<EXT_ID, INT_ID>* &entry);
-  // Retrieves a pointer to the item corresponding to the
-  // given key. Returns 0 for success, or -1 if it cannot find the key
-  // in the tree.
+  // Private members.
 
-  INT_ID* insert_i (const EXT_ID &k, const INT_ID &t);
-  // Inserts a *copy* of the key and the item into the tree: both the
-  // key type EXT_ID and the item type INT_ID must have well defined semantics
-  // for copy construction.  The default implementation also requires that
-  // the key type support well defined < semantics.  This method returns a
-  // pointer to the inserted item copy, or 0 if an error occurred.
-  // NOTE: if an identical key already exists in the tree, no new item
-  // is created, and the returned pointer addresses the existing item
-  // associated with the existing key.
-
-  int insert_i (const EXT_ID &k, const INT_ID &t,
-                ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry);
-  // Inserts a *copy* of the key and the item into the tree: both the
-  // key type EXT_ID and the item type INT_ID must have well defined semantics
-  // for copy construction.  The default implementation also requires that
-  // the key type support well defined < semantics.  This method passes back
-  // a pointer to the inserted (or existing) node, and the search status.  If
-  // the node already exists, the method returns 1.  If the node does not
-  // exist, and a new one is successfully created, and the method returns 0.
-  // If there was an error, the method returns -1.
-
-  int remove_i (const EXT_ID &k, INT_ID &i);
-  // Removes the item associated with the given key from the tree and
-  // destroys it.  Returns 1 if it found the item and successfully
-  // destroyed it, 0 if it did not find the item, or -1 if an error
-  // occurred.  Returns the stored internal id in the second argument.
-
-  int remove_i (ACE_RB_Tree_Node<EXT_ID, INT_ID> *z);
-  // Removes the item associated with the given key from the tree and
-  // destroys it.
-
-private:
-
-  // = Private members.
-
-  ACE_Allocator *allocator_;
-  // Pointer to a memory allocator.
-
-  ACE_LOCK lock_;
-  // Synchronization variable for the MT_SAFE <ACE_RB_Tree>.
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *root_;
+  ACE_RB_Tree_Node<KEY, T> *root_;
   // The root of the tree.
 
   COMPARE_KEYS compare_keys_;
   // Comparison functor for comparing nodes in the tree.
 
-  size_t current_size_;
-  // The current number of nodes in the tree.
-};
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Iterator_Base
-{
-  // = TITLE
-  //   Implements a common base class for iterators for a Red-Black Tree ADT.
-public:
-
-  // = Initialization and termination methods.
-
-  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
-                             int set_first);
-  // Constructor.  Takes an ACE_RB_Tree over which to iterate, and
-  // an integer indicating (if non-zero) to position the iterator
-  // at the first element in the tree (if this integer is 0, the
-  // iterator is positioned at the last element in the tree).
-
-  ACE_RB_Tree_Iterator_Base (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
-  // Copy constructor.
-
-  void operator= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &iter);
-  // Assignment operator: copies both the tree reference and the position in the tree.
-
-  ~ACE_RB_Tree_Iterator_Base (void);
-  // Destructor.
-
-  // = Iteration methods.
-
-  int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const;
-  // Passes back the <entry> under the iterator.  Returns 0 if
-  // the iteration has completed, otherwise 1.
-
-  int done (void) const;
-  // Returns 1 when the iteration has completed, otherwise 0.
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> & operator* (void) const;
-  // STL-like iterator dereference operator: returns a reference
-  // to the node underneath the iterator.
-
-  const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree (void);
-  // Returns a const reference to the tree over which we're iterating.
-
-  int operator== (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &) const;
-  // Comparison operator: returns 1 if both iterators point to the same position, otherwise 0.
-
-  int operator!= (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &) const;
-  // Comparison operator: returns 1 if the iterators point to different positions, otherwise 0.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-
-  // = protected methods
-
-  int forward_i (void);
-  // Move forward by one element in the tree.  Returns 0 when
-  // there are no more elements in the tree, otherwise 1.
-
-  int reverse_i (void);
-  // Move back by one element in the tree.  Returns 0 when
-  // there are no more elements in the tree, otherwise 1.
-
-  void dump_i (void) const;
-  // Dump the state of an object.
-
-  // = Protected members.
-
-  const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> *tree_;
-  // Reference to the ACE_RB_Tree over which we're iterating.
-
-  ACE_RB_Tree_Node <EXT_ID, INT_ID> *node_;
-  // Pointer to the node currently under the iterator.
-
 };
 
-
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Iterator :
-  public ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK>
+class ACE_RB_Tree_Iterator
 {
   // = TITLE
   //   Implements an iterator for a Red-Black Tree ADT.
-
 public:
-
   // = Initialization and termination methods.
-  ACE_RB_Tree_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
-                        int set_first = 1);
-  // Constructor.  Takes an ACE_RB_Tree over which to iterate, and
-  // an integer indicating (if non-zero) to position the iterator
-  // at the first element in the tree (if this integer is 0, the
-  // iterator is positioned at the last element in the tree).
+  ACE_RB_Tree_Iterator (const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &tree);
+  // Constructor.
 
   ~ACE_RB_Tree_Iterator (void);
   // Destructor.
 
-  // = ACE-style iteration methods.
-
-  int advance (void);
-  // Move forward by one element in the tree.  Returns
-  // 0 when all elements have been seen, else 1.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  // = STL-style iteration methods.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void);
-  // Prefix advance.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int);
-  // Postfix advance.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void);
-  // Prefix reverse.
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int);
-  // Postfix reverse.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-  // = DEPRECATED methods.  Please migrate your code to use the new methods instead
-
-  EXT_ID *key (void);
+  KEY *key (void);
   // Accessor for key of node under iterator (if any).
-  // DEPRECATED
 
-  INT_ID *item (void);
+  T *item (void);
   // Accessor for item of node under iterator (if any).
-  // DEPRECATED
 
   int first (void);
-  // Move to the first item in the iteration (and in the tree).
-  // DEPRECATED
+  // Move to the first item in the tree.
 
   int last (void);
-  // Move to the last item in the iteration (and in the tree).
-  // DEPRECATED
+  // Move to the last item in the tree.
 
   int next (void);
-  // Move to the next item in the iteration (and in the tree).
-  // DEPRECATED
+  // Move to the next item in the tree.
 
   int previous (void);
-  // Move to the previous item in the iteration (and in the tree).
-  // DEPRECATED
+  // Move to the previous item in the tree.
 
   int is_done (void);
   // Returns 0 if the iterator is positioned over a valid ACE_RB_Tree
   // node, returns 1 if not.
-  // DEPRECATED: use the base class done () method instead.
 
-};
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-class ACE_RB_Tree_Reverse_Iterator :
-  public ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-{
-  // = TITLE
-  //   Implements a reverse iterator for a Red-Black Tree ADT.
-
-public:
-
-  // = Initialization and termination methods.
-  ACE_RB_Tree_Reverse_Iterator (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &tree,
-                                int set_last = 1);
-  // Constructor.  Takes an ACE_RB_Tree over which to iterate, and
-  // an integer indicating (if non-zero) to position the iterator
-  // at the last element in the tree (if this integer is 0, the
-  // iterator is positioned at the first element in the tree).
-
-  ~ACE_RB_Tree_Reverse_Iterator (void);
-  // Destructor.
-
-  // = ACE-style iteration methods.
-
-  int advance (void);
-  // Move forward by one element in the tree.  Returns
-  // 0 when all elements have been seen, else 1.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  // = STL-style iteration methods.
-
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator++ (void);
-  // Prefix advance.
+private:
+  // = Declare private and do not define.
 
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int);
-  // Postfix advance.
+  // Explicitly prevent assignment and copy construction of iterators.
+  ACE_UNIMPLEMENTED_FUNC (
+    ACE_RB_Tree_Iterator (const ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> &))
+  ACE_UNIMPLEMENTED_FUNC (
+    void operator = (const ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> &))
 
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> & operator-- (void);
-  // Prefix reverse.
+  // Private members.
 
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int);
-  // Postfix reverse.
+  const ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> &tree_;
+  // Reference to the ACE_RB_Tree over which we're iterating.
 
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
+  ACE_RB_Tree_Node <KEY, T> *node_;
+  // Pointer to the node currently under the iterator.
 
 };
 
diff --git a/ace/RB_Tree.i b/ace/RB_Tree.i
index 9ddc53d47f6..3ddfee0f079 100644
--- a/ace/RB_Tree.i
+++ b/ace/RB_Tree.i
@@ -1,1122 +1,185 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
-
-/////////////////////////////////////////////////////
-// template class ACE_RB_Tree_Node<EXT_ID, INT_ID> //
-/////////////////////////////////////////////////////
+/////////////////////////////////////////////
+// template class ACE_RB_Tree_Node<KEY, T> //
+/////////////////////////////////////////////
 
 // Key accessor.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE EXT_ID &
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::key ()
+template <class KEY, class T> ACE_INLINE KEY &
+ACE_RB_Tree_Node<KEY, T>::key ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::key");
   return k_;
 }
 
 
 // Item accessor.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE INT_ID &
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::item ()
+template <class KEY, class T> ACE_INLINE T &
+ACE_RB_Tree_Node<KEY, T>::item ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>:item");
   return t_;
 }
 
 
 // Set color of the node.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE void
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Color c)
+template <class KEY, class T> ACE_INLINE void
+ACE_RB_Tree_Node<KEY, T>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Color c)
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::color mutator");
   color_ = c;
 }
 
 
 // Get color of the node.
 
-template <class EXT_ID, class INT_ID>
+template <class KEY, class T>
 ACE_INLINE ACE_RB_Tree_Node_Base::RB_Tree_Node_Color
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::color ()
+ACE_RB_Tree_Node<KEY, T>::color ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::color accessor");
   return color_;
 }
 
 
 // Accessor for node's parent pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent ()
+template <class KEY, class T> ACE_INLINE ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree_Node<KEY, T>::parent ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent accessor");
   return parent_;
 }
 
 
 // Mutator for node's parent pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE void
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p)
+template <class KEY, class T> ACE_INLINE void
+ACE_RB_Tree_Node<KEY, T>::parent (ACE_RB_Tree_Node<KEY, T> * p)
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent mutator");
   parent_ = p;
 }
-
+  
 
 
 // Accessor for node's left child pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::left ()
+template <class KEY, class T> ACE_INLINE ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree_Node<KEY, T>::left ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::left accessor");
   return left_;
 }
 
 
 // Mutator for node's left child pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE void
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l)
+template <class KEY, class T> ACE_INLINE void
+ACE_RB_Tree_Node<KEY, T>::left (ACE_RB_Tree_Node<KEY, T> * l)
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::left mutator");
   left_ = l;
 }
 
 
 // Accessor for node's right child pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> *
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::right ()
+template <class KEY, class T> ACE_INLINE ACE_RB_Tree_Node<KEY, T> *
+ACE_RB_Tree_Node<KEY, T>::right ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::right accessor");
   return right_;
 }
 
 
 // Mutator for node's right child pointer.
 
-template <class EXT_ID, class INT_ID>
-ACE_INLINE void
-ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r)
+template <class KEY, class T> ACE_INLINE void
+ACE_RB_Tree_Node<KEY, T>::right (ACE_RB_Tree_Node<KEY, T> * r)
 {
-  ACE_TRACE ("ACE_RB_Tree_Node<EXT_ID, INT_ID>::right mutator");
   right_ = r;
 }
 
 
 
-////////////////////////////////////////////////////////////////////////
-// template class ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-////////////////////////////////////////////////////////////////////////
-
-
-// Initialize an RB Tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open (ACE_Allocator *alloc)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  // Calling this->close_i () ensures we release previously allocated
-  // memory before allocating new memory.
-  this->close_i ();
-
-  // If we were passed an allocator use it,
-  // otherwise use the default instance.
-
-  if (alloc == 0)
-    alloc = ACE_Allocator::instance ();
-
-  this->allocator_ = alloc;
-
-  return 0;
-}
-
-// Close down an RB_Tree and release dynamically allocated
-// resources.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close (void)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  return this->close_i ();
-}
-
-
-// Associate <ext_id> with <int_id>.  If <ext_id> is already in the
-// tree then the <ACE_RB_Tree_Node> is not changed.  Returns 0 if a
-// new entry is bound successfully, returns 1 if an attempt is made
-// to bind an existing entry, and returns -1 if failures occur.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
-                                                           const INT_ID &int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &item, const INT_ID &int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  return this->insert_i (ext_id, int_id, entry);
-}
-
-
-// Same as a normal bind, except the tree entry is also passed back
-// to the caller.  The entry in this case will either be the newly
-// created entry, or the existing one.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id,
-                                                           const INT_ID &int_id,
-                                                           ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>"
-             "::bind (const EXT_ID &ext_id, const INT_ID &int_id, "
-             "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  return this->insert_i (ext_id, int_id, entry);
-}
-
-
-// Associate <ext_id> with <int_id> if and only if <ext_id> is not
-// in the tree.  If <ext_id> is already in the tree then the <int_id>
-// parameter is assigned the existing value in the tree.  Returns 0
-// if a new entry is bound successfully, returns 1 if an attempt is
-// made to bind an existing entry, and returns -1 if failures occur.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id,
-                                                              INT_ID &int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "trybind (const EXT_ID &ext_id, INT_ID &int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      int_id = entry->item ();
-    }
-
-  return result;
-}
-
-
-// Same as a normal trybind, except the tree entry is also passed
-// back to the caller.  The entry in this case will either be the
-// newly created entry, or the existing one.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id,
-                                                              INT_ID &int_id,
-                                                              ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "trybind (const EXT_ID &ext_id, INT_ID &int_id, "
-             "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      int_id = entry->item ();
-    }
-
-
-  return result;
-}
-
-
-// Reassociate <ext_id> with <int_id>.  If <ext_id> is not in the
-// tree then behaves just like <bind>.  Returns 0 if a new entry is
-// bound successfully, returns 1 if an existing entry was rebound,
-// and returns -1 if failures occur.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Same as a normal rebind, except the tree entry is also passed back
-// to the caller.  The entry in this case will either be the newly
-// created entry, or the existing one.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id,
-                                                             ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
-             "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
-// then behaves just like <bind>.  Otherwise, store the old value of
-// <int_id> into the "out" parameter and rebind the new parameters.
-// Returns 0 if a new entry is bound successfully, returns 1 if an
-// existing entry was rebound, and returns -1 if failures occur.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id,
-                                                             INT_ID &old_int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, INT_ID &old_int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      old_int_id = entry->item ();
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Same as a normal rebind, except the tree entry is also passed back
-// to the caller.  The entry in this case will either be the newly
-// created entry, or the existing one.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id,
-                                                             INT_ID &old_int_id,
-                                                             ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
-             "INT_ID &old_int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      old_int_id = entry->item ();
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Associate <ext_id> with <int_id>.  If <ext_id> is not in the tree
-// then behaves just like <bind>.  Otherwise, store the old values
-// of <ext_id> and <int_id> into the "out" parameters and rebind the
-// new parameters.  This is very useful if you need to have an
-// atomic way of updating <ACE_RB_Tree_Nodes> and you also need
-// full control over memory allocation.  Returns 0 if a new entry is
-// bound successfully, returns 1 if an existing entry was rebound,
-// and returns -1 if failures occur.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id,
-                                                             EXT_ID &old_ext_id,
-                                                             INT_ID &old_int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id,"
-             "EXT_ID &old_ext_id, INT_ID &old_int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      old_ext_id = entry->key ();
-      old_int_id = entry->item ();
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Same as a normal rebind, except the tree entry is also passed back
-// to the caller.  The entry in this case will either be the newly
-// created entry, or the existing one.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id,
-                                                             const INT_ID &int_id,
-                                                             EXT_ID &old_ext_id,
-                                                             INT_ID &old_int_id,
-                                                             ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "rebind (const EXT_ID &ext_id, const INT_ID &int_id, "
-             "EXT_ID &old_ext_id, INT_ID &old_int_id, "
-             "ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  int result = this->insert_i (ext_id, int_id, entry);
-
-  if (result == 1)
-    {
-      old_ext_id = entry->key ();
-      old_int_id = entry->item ();
-      entry->key () = ext_id;
-      entry->item () = int_id;
-    }
-
-  return result;
-}
-
-
-// Locate <ext_id> and pass out parameter via <int_id>.  If found,
-// return 0, returns -1 if not found.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id,
-                                                           INT_ID &int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "find (const EXT_ID &ext_id, INT_ID &int_id)");
-  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry = 0;
-
-  int result = this->find_i (ext_id, entry);
-  if (result == 0)
-    {
-      int_id = entry->item ();
-    }
-
-  return result;
-}
-
-// Locate <ext_id> and pass out parameter via <entry>.  If found,
-// return 0, returns -1 if not found.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &ext_id,
-                                                           ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "find (const EXT_ID &ext_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)");
-  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  return this->find_i (ext_id, entry);
-}
+////////////////////////////////////////////////////////////////
+// template class ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK> //
+////////////////////////////////////////////////////////////////
 
 
-// Unbind (remove) the <ext_id> from the tree.  Don't return the
-// <int_id> to the caller (this is useful for collections where the
-// <int_id>s are *not* dynamically allocated...).
+// Destroys all nodes and sets the root pointer null.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_id)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE void
+ACE_RB_Tree<KEY, T, COMPARE_KEYS, ACE_LOCK>::clear ()
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  INT_ID int_id;
-  int result = this->remove_i (ext_id, int_id);
-
-  // Remap the return codes from the internal method: this
-  // is maintained this way in support of deprecated methods,
-  // and will be cleaned up when these methods are removed.
-  switch (result)
-    {
-      case 1:
-        // If the node was found and deleted, return success.
-        return 0;
-      case 0:
-        // If nothing was found, set errno and break.
-        errno = ENOENT;
-        break;
-      case -1:
-        // If an error happened, just break.
-        break;
-    }
-
-  // Return an error if we didn't already return success.
-  return -1;
+  delete root_;
+  root_ = 0;
 }
 
 
-// Break any association of <ext_id>.  Returns the value of <int_id>
-// in case the caller needs to deallocate memory.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (const EXT_ID &ext_id,
-                                                             INT_ID &int_id)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::"
-             "unbind (const EXT_ID &ext_id, INT_ID &int_id)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
-  int result = this->remove_i (ext_id, int_id);
+//////////////////////////////////////////////////////////
+// template class ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK> //
+//////////////////////////////////////////////////////////
 
-  // Remap the return codes from the internal method: this
-  // is maintained this way in support of deprecated methods,
-  // and will be cleaned up when these methods are removed.
-  switch (result)
-    {
-      case 1:
-        // If the node was found and deleted, return success.
-        return 0;
-      case 0:
-        // If nothing was found, set errno and break.
-        errno = ENOENT;
-        break;
-      case -1:
-        // If an error happened, just break.
-        break;
-    }
-
-  // Return an error if we didn't already return success.
-  return -1;
-}
 
+// Accessor for key of node under iterator (if any).
 
-// Remove entry from the tree.  This method should be used with *extreme*
-// caution, and only for optimization purposes.  The node being passed
-// in had better have been allocated by the tree that is unbinding it.
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE KEY *
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::key ()
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::unbind (ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry)");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  return this->remove_i (entry);
+  return node_ ? (&(node_->key ())) : 0;
 }
 
 
-// Returns a reference to the underlying <ACE_LOCK>.  This makes it
-// possible to acquire the lock explicitly, which can be useful in
-// some cases if you instantiate the <ACE_Atomic_Op> with an
-// <ACE_Recursive_Mutex> or <ACE_Process_Mutex>, or if you need to
-// guard the state of an iterator.  NOTE: the right name would be
-// <lock>, but HP/C++ will choke on that!
+// Accessor for item of node under iterator (if any).
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_LOCK &
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex (void)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE T *
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::item ()
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::mutex");
-  return this->lock_;
+  return node_ ? (&(node_->item ())) : 0;
 }
 
 
-// Dump the state of an object.
+// Move to the first item in the tree.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::first ()
 {
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("\ncurrent_size_ = %d"), this->current_size_));
-  this->allocator_->dump ();
-  this->lock_.dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-
-// Return forward iterator positioned at first node in tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin (void)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::begin");
-
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this);
-}
-
-
-// Return forward iterator positioned at last node in tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end (void)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::end");
-
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this, 0);
-}
-
-
-// Return reverse iterator positioned at last node in tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin (void)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rbegin");
-
-  return ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this);
-}
-
-
-// Return reverse iterator positioned at first node in tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend (void)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rend");
-
-  return ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> (*this, 0);
-}
-
-
-// Returns a pointer to the item corresponding to the given key,
-// or 0 if it cannot find the key in the tree.  DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE INT_ID*
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &k)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::find (const EXT_ID &k)");
-
-  // The reinterpret cast is to ensure that when this deprecated method is removed, and
-  // is replaced (as planned) by a find method that takes the same argument signature
-  // but returns an int, that the compiler will cough if this return macro is not
-  // changed to just return an int (whose value will be -1).  Please leave this as is.
-  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, ACE_reinterpret_cast(INT_ID*, 0L));
-
-  ACE_RB_Tree_Node<EXT_ID, INT_ID> *entry;
-  int result = this->find_i (k, entry);
-  return (result == 0) ? &(entry->item ()) : 0;
-}
-
-// Inserts a *copy* of the key and the item into the tree:
-// both the key type EXT_ID and the item type INT_ID must have well
-// defined semantics for copy construction and < comparison.
-// This method returns a pointer to the inserted item copy,
-// or 0 if an error occurred.  NOTE: if an identical key
-// already exists in the tree, no new item is created, and
-// the returned pointer addresses the existing item
-// associated with the existing key.   DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE INT_ID*
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert (const EXT_ID &k, const INT_ID &t)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::insert");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, ACE_reinterpret_cast(INT_ID*, 0L));
-
-  return this->insert_i (k, t);
-}
-
-
-// Removes the item associated with the given key from the
-// tree and destroys it.  Returns 1 if it found the item
-// and successfully destroyed it, 0 if it did not find the
-// item, or -1 if an error occurred.  DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove (const EXT_ID &k)
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::remove");
-  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
-
-  INT_ID i;
-  return this->remove_i (k, i);
-}
-
-
-// Destroys all nodes and sets the root pointer null.  DEPRECATED
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::clear ()
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::clear");
-  ACE_WRITE_GUARD (ACE_LOCK, ace_mon, this->lock_);
-
-  this->close_i ();
-}
-
-// Returns the current number of nodes in the tree.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE size_t
-ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size ()
-{
-  ACE_TRACE ("ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::current_size");
-  return current_size_;
-}
-
-
-///////////////////////////////////////////////////////////////////////
-// template class                                                    //
-// ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-///////////////////////////////////////////////////////////////////////
-
-// Passes back the <entry> under the iterator.  Returns 0 if
-// the iteration has completed, otherwise 1.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next");
-
-  if (this->node_)
-    {
-      next_entry = this->node_;
-      return 1;
-    }
-
-  return 0;
-}
-
-
-// Returns 1 when the iteration has completed, otherwise 0.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done (void) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::done");
-
-  return node_ ? 0 : 1;
-}
-
-
-// STL-like iterator dereference operator: returns a reference
-// to the node underneath the iterator.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> &
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator* (void) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator*");
-  return *(this->node_);
-}
-
-
-// Returns a reference to the tree over which we're iterating.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree");
-  return *tree_;
-}
-
-
-// Comparison operator: returns 1 if both iterators point to the same position, otherwise 0.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator==
-  (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator==");
-  return (this->node_ == rbt.node_) ? 1 : 0;
-}
-
-
-// Comparison operator: returns 1 if the iterators point to different positions, otherwise 0.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator!=
-  (const ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator!=");
-  return (this->node_ == rbt.node_) ? 0 : 1;
-}
-
-
-// Move forward by one element in the tree.  Returns 0 when
-// there are no more elements in the tree, otherwise 1.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::forward_i");
-
-  node_ = tree_->RB_tree_successor (node_);
+  node_ = tree_.RB_tree_minimum (tree_.root_);
   return node_ ? 1 : 0;
 }
 
 
-// Move back by one element in the tree.  Returns 0 when
-// there are no more elements in the tree, otherwise 1.
+// Move to the last item in the tree.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i (void)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::last ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::reverse_i");
-
-  node_ = tree_->RB_tree_predecessor (node_);
+  node_ = tree_.RB_tree_maximum (tree_.root_);
   return node_ ? 1 : 0;
 }
 
 
-// Dump the state of an object.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i (void) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator_Base<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump_i");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("node_ = %x"), this->node_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-
-//////////////////////////////////////////////////////////////////
-// template class                                               //
-// ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-//////////////////////////////////////////////////////////////////
-
-// Move forward by one element in the tree.  Returns
-// 0 when all elements have been seen, else 1.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance");
-
-  return this->forward_i ();
-}
-
-
-// Dump the state of an object.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
-
-  this->dump_i ();
-}
-
-
-// Prefix advance.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (void)");
-
-  this->forward_i ();
-  return *this;
-}
-
-
-// Postfix advance.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator++ (int)");
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->forward_i ();
-  return retv;
-}
-
-
-// Prefix reverse.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (void)");
-
-  this->reverse_i ();
-  return *this;
-}
-
-
-// Postfix reverse.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int)
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> operator-- (int)");
-
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->reverse_i ();
-  return retv;
-}
-
-
-// Accessor for key of node under iterator (if any). DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE EXT_ID *
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::key ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::key");
-  ACE_RB_Tree_Node <EXT_ID, INT_ID> *node_p =
-           ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_;
-  return node_p ? (&(node_p->key ())) : 0;
-}
-
-
-// Accessor for item of node under iterator (if any). DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE INT_ID *
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::item ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::item");
-  ACE_RB_Tree_Node <EXT_ID, INT_ID> *node_p =
-           ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_;
-  return node_p ? (&(node_p->item ())) : 0;
-}
-
-
-// Move to the first item in the tree. DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::first ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::first");
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ =
-     ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree_->
-              RB_tree_minimum (ACE_RB_Tree_Iterator<EXT_ID, INT_ID,
-                                                    COMPARE_KEYS,
-                                                    ACE_LOCK>::tree_->root_);
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ ?
-                                                                         1 : 0;
-}
-
-
-// Move to the last item in the tree. DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::last ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::last");
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ =
-     ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree_->
-              RB_tree_maximum (ACE_RB_Tree_Iterator<EXT_ID, INT_ID,
-                                                    COMPARE_KEYS,
-                                                    ACE_LOCK>::tree_->root_);
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ ?
-                                                                         1 : 0;
-}
-
-
 // Moves to the next item in the tree,
-// returns 1 if there is a next item, 0 otherwise. DEPRECATED.
+// returns 1 if there is a next item, 0 otherwise.
 
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next ()
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::next ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::next");
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ =
-   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree_->
-          RB_tree_successor (ACE_RB_Tree_Iterator<EXT_ID, INT_ID,
-                                                  COMPARE_KEYS,
-                                                  ACE_LOCK>::node_);
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ ?
-                                                                         1 : 0;
+  node_ = tree_.RB_tree_successor (node_);
+  return node_ ? 1 : 0;
 }
 
 
 // Moves to the previous item in the tree,
-// returns 1 if there is a previous item, 0 otherwise. DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::previous ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::previous");
-  ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ =
-   ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::tree_->
-         RB_tree_predecessor (ACE_RB_Tree_Iterator<EXT_ID, INT_ID,
-                                                   COMPARE_KEYS,
-                                                   ACE_LOCK>::node_);
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ ?
-                                                                         1 : 0;
-}
+// returns 1 if there is a previous item, 0 otherwise.
 
-
-// Returns 0 if the iterator is positioned over a valid ACE_RB_Tree
-// node, returns 1 if not. DEPRECATED.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::is_done ()
-{
-  ACE_TRACE ("ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::is_done");
-  return ACE_RB_Tree_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::node_ ?
-                                                                         0 : 1;
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// template class                                                       //
-// ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> //
-//////////////////////////////////////////////////////////////////////////
-
-
-// Move forward by one element in the tree.  Returns
-// 0 when all elements have been seen, else 1.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE int
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::advance");
-
-  return this->reverse_i ();
-}
-
-
-// Dump the state of an object.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE void
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump (void) const
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::previous ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::dump");
-
-  this->dump_i ();
-}
-
-
-// Prefix advance.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (void)");
-
-  this->reverse_i ();
-  return *this;
-}
-
-
-// Postfix advance.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int)
-{
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator++ (int)");
-
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->reverse_i ();
-  return retv;
-}
-
-
-// Prefix reverse.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)
-{
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (void)");
-
-  this->forward_i ();
-  return *this;
+  node_ = tree_.RB_tree_predecessor (node_);
+  return node_ ? 1 : 0;
 }
 
-
-// Postfix reverse.
-
-template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK>
-ACE_INLINE ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>
-ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int)
+template <class KEY, class T, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int
+ACE_RB_Tree_Iterator<KEY, T, COMPARE_KEYS, ACE_LOCK>::is_done ()
 {
-  ACE_TRACE ("ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::operator-- (int)");
-
-  ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> retv (*this);
-  this->forward_i ();
-  return retv;
+  return node_ ? 0 : 1;
 }
diff --git a/ace/README b/ace/README
index ab9ed44e8c7..acf69bc2c32 100644
--- a/ace/README
+++ b/ace/README
@@ -39,10 +39,10 @@ ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER
                                         ACE_HAS_NONSTATIC_OBJECT_MANAGER.
                                         Usually used with MFC
                                         applications.
-ACE_MAIN                                Renames "main (int, char *[])",
-                                        for platforms such as g++/VxWorks
-                                        that don't allow "main".  Requires
-                                        the use of
+ACE_MAIN                                Renames "main (int, char
+                                        *[])", for platforms such as
+                                        g++/VxWorks that don't allow
+                                        main.  Requires the use of
                                         ACE_HAS_NONSTATIC_OBJECT_MANAGER.
 ACE_MT_SAFE                             Compile using multi-thread libraries
 ACE_NDEBUG                              Turns off debugging features
@@ -100,7 +100,6 @@ ACE_HAS_GNUG_PRE_2_8                    Compiling with g++ prior to
 ACE_HAS_ONE_DEFINITION_RULE             Compiler enforces C++ One
                                         Definition Rule
 ACE_HAS_PRIOCNTL                        OS has priocntl (2).
-ACE_HAS_RECURSIVE_MUTEXES               Mutexes are inherently recursive (e.g., Win32)
 ACE_HAS_RECV_TIMEDWAIT                  Platform has the MIT pthreads
                                         APIs for
 ACE_HAS_RECVFROM_TIMEDWAIT              timed send/recv operations
@@ -186,8 +185,6 @@ ACE_HAS_BROKEN_ENUMS                    Compiler can't handle large
                                         enums (e.g., HP/UX C++)
 ACE_HAS_BROKEN_HPUX_TEMPLATES           Earlier versions of HP/UX C++
                                         are damned...
-ACE_HAS_BROKEN_MAP_FAILED               Platform doesn't cast MAP_FAILED
-                                        to a void *.
 ACE_HAS_BROKEN_MSG_H                    Platform headers don't support
                                         <msg.h> prototypes
 ACE_HAS_BROKEN_MMAP_H                   HP/UX does not wrap the
@@ -300,7 +297,6 @@ ACE_HAS_INLINED_OSCALLS                 Inline all the static class OS
                                         methods to remove call
                                         overhead
 ACE_HAS_IP_MULTICAST                    Platform supports IP multicast
-ACE_HAS_IP6                             Platform supports IPv6.
 ACE_HAS_IRIX62_THREADS                  Platform supports the very odd
                                         IRIX 6.2 threads...
 ACE_HAS_NONSTATIC_OBJECT_MANAGER        Causes the ACE_Object_Manager
@@ -314,14 +310,10 @@ ACE_HAS_THR_MINSTACK                    Platform calls thr_minstack()
                                         (e.g., Tandem).
 ACE_HAS_LIMITED_RUSAGE_T                The rusage_t structure has
                                         only two fields.
-ACE_HAS_LIMITED_SELECT                  The select is unable to deal with
-                                        large file descriptors.
 ACE_HAS_LONG_MAP_FAILED                 Platform defines MAP_FAILED as
                                         a long constant.
 ACE_HAS_MALLOC_STATS                    Enabled malloc statistics
                                         collection.
-ACE_HAS_MEMCHR                          Use native implementation of memchr.
-ACE_HAS_MINIMAL_ACE_OS                  Disables some #includes in ace/OS.*.
 ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION     Avoid #including ace/streams.h
                                         in OS.h.  Users must include
                                         ace/streams.h, <iostream>, or
@@ -407,6 +399,8 @@ ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP    Platform has
 ACE_HAS_PTHREAD_PROCESS_ENUM            pthread.h declares an enum with
                                         PTHREAD_PROCESS_PRIVATE and
                                         PTHREAD_PROCESS_SHARED values.
+ACE_HAS_PTHREAD_SIGMASK                 Platform has pthread_sigmask()
+                                        defined.
 ACE_HAS_PURIFY                          Purify'ing.  Set by wrapper_macros.GNU.
 ACE_HAS_QUANTIFY                        Quantify'ing.  Set by wrapper_macros.GNU.
 ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS    Platform will recurse
@@ -650,6 +644,13 @@ ACE_LACKS_FCNTL                         Platform lacks POSIX-style fcntl ().
 ACE_LACKS_FSYNC                         Platform lacks fsync().
 ACE_LACKS_INLINE_FUNCTIONS              Platform can't handle "inline"
                                         keyword correctly.
+ACE_LACKS_NETDB_REENTRANT_FUNCTIONS     Platform does not support
+                                        reentrant netdb functions
+                                        (getprotobyname_r,
+                                        getprotobynumber_r,
+                                        gethostbyaddr_r,
+                                        gethostbyname_r,
+                                        getservbyname_r).
 ACE_LACKS_EXEC                          Platform lacks the exec()
                                         family of system calls (e.g.,
                                         Win32, VxWorks, Chorus)
@@ -716,8 +717,6 @@ ACE_LACKS_NETDB_REENTRANT_FUNCTIONS     Platform does not support
                                         gethostbyaddr_r,
                                         gethostbyname_r,
                                         getservbyname_r).
-ACE_LACKS_NULL_PTHREAD_STATUS           OS requires non-null status pointer
-                                        for ::pthread_join ().
 ACE_LACKS_PARAM_H                       Platform lacks <sys/param.h>
                                         (e.g., MVS)
 ACE_LACKS_POSIX_PROTOTYPES              Platform lacks POSIX
@@ -729,7 +728,6 @@ ACE_LACKS_PRI_T                         Platform lacks pri_t (e.g.,
                                         Tandem NonStop UNIX).
 ACE_LACKS_PTHREAD_CANCEL                Platform lacks
                                         pthread_cancel().
-ACE_LACKS_PTHREAD_SIGMASK               Platform lacks pthread_sigmask ().
 ACE_LACKS_PTHREAD_THR_SIGSETMASK        Platform lacks
                                         pthread_thr_sigsetmask (e.g.,
                                         MVS, HP/UX, and OSF/1 3.2)
@@ -741,7 +739,6 @@ ACE_LACKS_QSORT                         Compiler/platform lacks the
 ACE_LACKS_READLINK                      Platform lacks the readlink() function.
 ACE_LACKS_READV                         Platform doesn't define readv,
                                         so use our own
-ACE_LACKS_RENAME                        Platform lacks rename().
 ACE_LACKS_RLIMIT                        Platform/compiler lacks
                                         {get,set}rlimit() function
                                         (e.g., VxWorks, Chorus, and
@@ -762,6 +759,10 @@ ACE_LACKS_RWLOCK_T                      Platform lacks readers/writer
 ACE_LACKS_SBRK                          Platform lacks a working
                                         sbrk() (e.g., Win32 and
                                         VxWorks)
+ACE_LACKS_SCHED_H                       Platform needs to #include
+                                        <sched.h>
+                                        to get thread scheduling
+                                        defs.
 ACE_LACKS_SEEKDIR                       Platform uses ACE_HAS_DIRENT
                                         but does not have seekdir ().
 ACE_LACKS_SEMBUF_T                      Platform lacks struct sembuf
@@ -820,7 +821,6 @@ ACE_LACKS_T_ERRNO                       Header files lack t_errno for
                                         TLI
 ACE_LACKS_TCP_H                         Platform doesn't have
                                         netinet/tcp.h
-ACE_LACKS_TCP_NODELAY                   OS does not support TCP_NODELAY.
 ACE_LACKS_TELLDIR                       Platform uses ACE_HAS_DIRENT
                                         but does not have telldir ().
 ACE_LACKS_THREAD_STACK_SIZE             Platform lacks
@@ -839,16 +839,8 @@ ACE_LACKS_U_LONGLONG_T                  Platform does not have
 ACE_LACKS_UALARM_PROTOTYPE              Platform/compiler lacks the
                                         ualarm() prototype (e.g.,
                                         Solaris)
-ACE_LACKS_CHAR_RIGHT_SHIFTS             Compiler does not have any istream
-                                        operator>> for chars, u_chars, or
-                                        signed chars.
-ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS        Compiler does not have
-                                        operator>> (istream &, u_char *) or
-                                        operator>> (istream &, signed char *)
 ACE_LACKS_UCONTEXT_H                    Platform lacks the ucontext.h
                                         file
-ACE_LACKS_UNBUFFERED_STREAMBUF          Platform lacks streambuf
-                                        "unbuffered ()".
 ACE_LACKS_UNISTD_H                      Platform lacks the unistd.h
                                         file (e.g., VxWorks and Win32)
 ACE_LACKS_UNIX_DOMAIN_SOCKETS           ACE platform has no UNIX
@@ -880,10 +872,6 @@ ACE_NEEDS_LWP_PRIO_SET                  OS has LWPs, and when the
                                         priority of a bound thread is
                                         set, then the LWP priority
                                         must be set also.
-ACE_NEEDS_SCHED_H                       Platform needs to #include
-                                        <sched.h>
-                                        to get thread scheduling
-                                        defs.
 ----------------------------------------
 
 The following is a partial list of where some of these macros are used
diff --git a/ace/Reactor.h b/ace/Reactor.h
index 9cc24fac749..d9789747de1 100644
--- a/ace/Reactor.h
+++ b/ace/Reactor.h
@@ -116,11 +116,7 @@ public:
                     int restart = 0,
                     ACE_Sig_Handler *signal_handler = 0,
                     ACE_Timer_Queue *timer_queue = 0);
-  // Initialize the <ACE_Reactor> to manage <max_number_of_handles>.
-  // If <restart> is non-0 then the <ACE_Reactor>'s <handle_events>
-  // method will be restarted automatically when <EINTR> occurs.  If
-  // <signal_handler> or <timer_queue> are non-0 they are used as the
-  // signal handler and timer queue, respectively.
+  // Initialization.
 
   virtual int set_sig_handler (ACE_Sig_Handler *signal_handler);
   // Use a user specified signal handler instead.
diff --git a/ace/Registry.cpp b/ace/Registry.cpp
index a83b9d5fbbd..5396c6330d8 100644
--- a/ace/Registry.cpp
+++ b/ace/Registry.cpp
@@ -3,7 +3,7 @@
 #define ACE_BUILD_DLL
 
 #include "ace/Registry.h"
-
+      
 ACE_RCSID(ace, Registry, "$Id$")
 
 #if defined (ACE_WIN32)
@@ -22,19 +22,19 @@ ACE_RCSID(ace, Registry, "$Id$")
     } while (0)
 
 
-// Separator for components in a name
+// Separator for components in a name 
 /* static */
 LPCTSTR ACE_Registry::STRING_SEPARATOR = ACE_TEXT ("\\");
 
-int
+int 
 ACE_Registry::Name_Component::operator== (const Name_Component &rhs) const
 {
-  return
+  return 
     rhs.id_ == this->id_ &&
     rhs.kind_ == this->kind_;
 }
 
-int
+int 
 ACE_Registry::Name_Component::operator!= (const Name_Component &rhs) const
 {
   return !this->operator== (rhs);
@@ -68,15 +68,15 @@ ACE_Registry::Binding::Binding (const Istring &name,
 }
 
 
-int
+int 
 ACE_Registry::Binding::operator== (const Binding &rhs) const
 {
-  return
+  return 
     rhs.name_ == this->name_ &&
     rhs.type_ == this->type_;
 }
 
-int
+int 
 ACE_Registry::Binding::operator!= (const Binding &rhs) const
 {
   return !this->operator== (rhs);
@@ -84,7 +84,7 @@ ACE_Registry::Binding::operator!= (const Binding &rhs) const
 
 // Name accessor
 // (Name version)
-void
+void 
 ACE_Registry::Binding::name (Name &name)
 {
   name = ACE_Registry::make_name (this->name_);
@@ -93,7 +93,7 @@ ACE_Registry::Binding::name (Name &name)
 
 // Name accessors
 // (String version)
-void
+void 
 ACE_Registry::Binding::name (Istring &name)
 {
   name = this->name_;
@@ -102,7 +102,7 @@ ACE_Registry::Binding::name (Istring &name)
 
 // Name accessors
 // (String version)
-ACE_Registry::Istring
+ACE_Registry::Istring 
 ACE_Registry::Binding::name (void)
 {
   return this->name_;
@@ -118,8 +118,8 @@ ACE_Registry::Binding::type (void)
 
 
 // Simple object constructor
-ACE_Registry::Object::Object (void *data,
-			      u_long size,
+ACE_Registry::Object::Object (void *data, 
+			      u_long size, 
 			      u_long type)
   : data_ (data),
     size_ (size),
@@ -142,7 +142,7 @@ ACE_Registry::Object::data (void) const
 }
 
 
-void
+void 
 ACE_Registry::Object::size (u_long size)
 {
   this->size_ = size;
@@ -193,7 +193,7 @@ ACE_Registry::Naming_Context::Naming_Context (const Naming_Context &rhs)
     parent_key_ (rhs.parent_key_),
     name_ (rhs.name_)
 {
-  // This is incorrect.
+  // This is incorrect. 
   // Rather than copying key, we should call ::DuplicateHandle()
   // But since this is private (and not used), I don't care much
 }
@@ -208,7 +208,7 @@ ACE_Registry::Naming_Context::operator= (const Naming_Context &rhs)
 	return *this;
 }
 
-
+    
 // Destructor
 ACE_Registry::Naming_Context::~Naming_Context ()
 {
@@ -219,7 +219,7 @@ ACE_Registry::Naming_Context::~Naming_Context ()
 // Insert <object> with <name> into <this> context
 // (Name version)
 int
-ACE_Registry::Naming_Context::bind_new (const Name &name,
+ACE_Registry::Naming_Context::bind_new (const Name &name, 
 					const Object &object)
 {
   return this->bind_new (ACE_Registry::make_string (name), object);
@@ -229,11 +229,11 @@ ACE_Registry::Naming_Context::bind_new (const Name &name,
 // Insert <object> with <name> into <this> context
 // (String version)
 int
-ACE_Registry::Naming_Context::bind_new (const Istring &name,
+ACE_Registry::Naming_Context::bind_new (const Istring &name, 
 					const Object &object)
 {
-  // temporary object
-  Object temp;
+  // temporary object 
+  Object temp;  
   long result = this->resolve (name, temp);
   if (result == 0)
     // resolve succeeded
@@ -248,7 +248,7 @@ ACE_Registry::Naming_Context::bind_new (const Istring &name,
 // Insert or update <object> with <name> into <this> context
 // (Name version)
 int
-ACE_Registry::Naming_Context::bind (const Name &name,
+ACE_Registry::Naming_Context::bind (const Name &name, 
 				    const Object &object)
 {
   return this->bind (ACE_Registry::make_string (name), object);
@@ -258,7 +258,7 @@ ACE_Registry::Naming_Context::bind (const Name &name,
 // Insert or update <object> with <name> into <this> context
 // (String version)
 int
-ACE_Registry::Naming_Context::bind (const Istring &name,
+ACE_Registry::Naming_Context::bind (const Istring &name, 
 				    const Object &object)
 {
   long result = ::RegSetValueEx (this->key_,
@@ -273,8 +273,8 @@ ACE_Registry::Naming_Context::bind (const Istring &name,
 
 // Update <object> with <name> in <this> context
 // (Name version)
-int
-ACE_Registry::Naming_Context::rebind (const Name &name,
+int 
+ACE_Registry::Naming_Context::rebind (const Name &name, 
 				      const Object &new_object)
 {
   return this->rebind (ACE_Registry::make_string (name), new_object);
@@ -283,15 +283,15 @@ ACE_Registry::Naming_Context::rebind (const Name &name,
 
 // Update <object> with <name> in <this> context
 // (String version)
-int
-ACE_Registry::Naming_Context::rebind (const Istring &name,
+int 
+ACE_Registry::Naming_Context::rebind (const Istring &name, 
 				      const Object &new_object)
 {
   Object old_object;
   // find the old one first
   long result = this->resolve (name, old_object);
   if (result == 0)
-    // no need to delete first
+    // no need to delete first 
     result = this->bind (name, new_object);
   return result;
 }
@@ -299,31 +299,31 @@ ACE_Registry::Naming_Context::rebind (const Istring &name,
 
 // Find <object> with <name> in <this> context
 // (Name version)
-int
-ACE_Registry::Naming_Context::resolve (const Name &name,
+int 
+ACE_Registry::Naming_Context::resolve (const Name &name, 
 				       Object &object)
 {
   return this->resolve (ACE_Registry::make_string (name), object);
 }
 
-
+    
 // Find <object> with <name> in <this> context
 // (String version)
-int
-ACE_Registry::Naming_Context::resolve (const Istring &name,
+int 
+ACE_Registry::Naming_Context::resolve (const Istring &name, 
 				       Object &object)
 {
   // Get object state
   u_long type;
   void *data = object.data ();
   u_long size = object.size ();
-
+  
   long result = ::RegQueryValueEx (this->key_,
 				   name.c_str (),
 				   0,
 				   &type,
 				   (BYTE *)data,
-				   &size);
+				   &size);      
   if (result == ERROR_SUCCESS)
     {
       // Reset object state
@@ -335,10 +335,10 @@ ACE_Registry::Naming_Context::resolve (const Istring &name,
   ACE_REGISTRY_CALL_RETURN (result);
 }
 
-
+    
 // Remove object with <name> in <this> context
 // (Name version)
-int
+int 
 ACE_Registry::Naming_Context::unbind (const Name &name)
 {
   return this->unbind (ACE_Registry::make_string (name));
@@ -347,7 +347,7 @@ ACE_Registry::Naming_Context::unbind (const Name &name)
 
 // Remove object with <name> in <this> context
 // (String version)
-int
+int 
 ACE_Registry::Naming_Context::unbind (const Istring &name)
 {
   long result = ::RegDeleteValue (this->key_,
@@ -359,14 +359,14 @@ ACE_Registry::Naming_Context::unbind (const Istring &name)
 
 // Create new <naming_context> relative to <this> context
 // This method may not mean a lot in this implementation
-int
+int 
 ACE_Registry::Naming_Context::new_context (Naming_Context &naming_context)
 {
   // Make sure that we reset the state and close keys
   return naming_context.close ();
 }
 
-
+    
 // Insert <naming_context> with <name> relative to <this> context
 // (Name version)
 int
@@ -395,10 +395,10 @@ ACE_Registry::Naming_Context::bind_new_context (const Istring &name,
 {
   u_long reason;
 
-  long result = ::RegCreateKeyEx (this->key_,
-				  name.c_str (),
-				  0,
-				  0,
+  long result = ::RegCreateKeyEx (this->key_, 
+				  name.c_str (), 
+				  0, 
+				  0, 
 				  persistence,
 				  security_access,
 				  security_attributes,
@@ -422,9 +422,9 @@ ACE_Registry::Naming_Context::bind_new_context (const Istring &name,
 	  // reset result to failure
 	  result = -1;
 	  // Close the key first
-	  ::RegCloseKey (naming_context.key_);
+	  ::RegCloseKey (naming_context.key_);	      
 	  // Reset key
-	  naming_context.key_ = (HKEY) 0;
+	  naming_context.key_ = (HKEY) 0;	      
 	}
     }
 
@@ -434,8 +434,8 @@ ACE_Registry::Naming_Context::bind_new_context (const Istring &name,
 
 // Insert or update <naming_context> with <name> relative to <this> context
 // (Name version)
-int
-ACE_Registry::Naming_Context::bind_context (const Name &name,
+int 
+ACE_Registry::Naming_Context::bind_context (const Name &name, 
 					    /* const */ Naming_Context &naming_context,
 					    u_long persistence,
 					    u_long security_access,
@@ -451,8 +451,8 @@ ACE_Registry::Naming_Context::bind_context (const Name &name,
 
 // Insert or update <naming_context> with <name> relative to <this> context
 // (String version)
-int
-ACE_Registry::Naming_Context::bind_context (const Istring &name,
+int 
+ACE_Registry::Naming_Context::bind_context (const Istring &name, 
 					    /* const */ Naming_Context &naming_context,
 					    u_long persistence,
 					    u_long security_access,
@@ -460,10 +460,10 @@ ACE_Registry::Naming_Context::bind_context (const Istring &name,
 {
   u_long reason;
 
-  long result = ::RegCreateKeyEx (this->key_,
-				  name.c_str (),
-				  0,
-				  0,
+  long result = ::RegCreateKeyEx (this->key_, 
+				  name.c_str (), 
+				  0, 
+				  0, 
 				  persistence,
 				  security_access,
 				  security_attributes,
@@ -480,11 +480,11 @@ ACE_Registry::Naming_Context::bind_context (const Istring &name,
   ACE_REGISTRY_CALL_RETURN (result);
 }
 
-
-// Rename <naming_context> to <name>
+    
+// Rename <naming_context> to <name> 
 // (Name version)
-int
-ACE_Registry::Naming_Context::rebind_context (const Name &name,
+int 
+ACE_Registry::Naming_Context::rebind_context (const Name &name, 
 					      /* const */ Naming_Context &new_naming_context)
 {
   return this->rebind_context (ACE_Registry::make_string (name),
@@ -492,20 +492,20 @@ ACE_Registry::Naming_Context::rebind_context (const Name &name,
 }
 
 
-// Rename <naming_context> to <name>
+// Rename <naming_context> to <name> 
 // (String version)
-int
-ACE_Registry::Naming_Context::rebind_context (const Istring &name,
+int 
+ACE_Registry::Naming_Context::rebind_context (const Istring &name, 
 					      /* const */ Naming_Context &new_naming_context)
 {
   Naming_Context old_naming_context;
   // find the old one first
-  long result = this->resolve_context (name,
+  long result = this->resolve_context (name, 
 				       old_naming_context);
   if (result == 0)
     {
       // naming_context is found: delete entry
-      result = this->unbind_context (name);
+      result = this->unbind_context (name);      
       if (result == 0)
 	{
 	  // successful deletion; rebind
@@ -517,10 +517,10 @@ ACE_Registry::Naming_Context::rebind_context (const Istring &name,
   return result;
 }
 
-
+   
 // Remove naming_context with <name> from <this> context
 // (Name version)
-int
+int 
 ACE_Registry::Naming_Context::unbind_context (const Name &name)
 {
   return this->unbind_context (ACE_Registry::make_string (name));
@@ -529,20 +529,20 @@ ACE_Registry::Naming_Context::unbind_context (const Name &name)
 
 // Remove naming_context with <name> from <this> context
 // (String version)
-int
+int 
 ACE_Registry::Naming_Context::unbind_context (const Istring &name)
 {
-  long result = ::RegDeleteKey (this->key_,
+  long result = ::RegDeleteKey (this->key_, 
 				name.c_str ());
 
   ACE_REGISTRY_CALL_RETURN (result);
 }
 
-
+   
 // Find <naming_context> with <name> in <this> context
 // (Name version)
-int
-ACE_Registry::Naming_Context::resolve_context (const Name &name,
+int 
+ACE_Registry::Naming_Context::resolve_context (const Name &name, 
 					       Naming_Context &naming_context,
 					       u_long security_access)
 {
@@ -554,14 +554,14 @@ ACE_Registry::Naming_Context::resolve_context (const Name &name,
 
 // Find <naming_context> with <name> in <this> context
 // (String version)
-int
-ACE_Registry::Naming_Context::resolve_context (const Istring &name,
+int 
+ACE_Registry::Naming_Context::resolve_context (const Istring &name, 
 					       Naming_Context &naming_context,
 					       u_long security_access)
 {
-  long result = ::RegOpenKeyEx (this->key_,
-				name.c_str (),
-				0,
+  long result = ::RegOpenKeyEx (this->key_, 
+				name.c_str (), 
+				0, 
 				security_access,
 				&naming_context.key_);
   if (result == ERROR_SUCCESS)
@@ -569,7 +569,7 @@ ACE_Registry::Naming_Context::resolve_context (const Istring &name,
       // set the correct parent
       naming_context.parent (this->key_);
       // set the correct name
-      naming_context.name (name);
+      naming_context.name (name);	      
     }
 
   ACE_REGISTRY_CALL_RETURN (result);
@@ -577,19 +577,19 @@ ACE_Registry::Naming_Context::resolve_context (const Istring &name,
 
 
 // Same as unbind_context() with <this> as naming_context
-int
+int 
 ACE_Registry::Naming_Context::destroy (void)
 {
   // hopefully the parent_key_ is still open
-  long result = ::RegDeleteKey (this->parent_key_,
+  long result = ::RegDeleteKey (this->parent_key_, 
 				this->name_.c_str ());
 
   ACE_REGISTRY_CALL_RETURN (result);
 }
-
+    
 
 // Sync content of context to disk
-int
+int 
 ACE_Registry::Naming_Context::flush (void)
 {
   long result = ::RegFlushKey (this->key_);
@@ -598,16 +598,16 @@ ACE_Registry::Naming_Context::flush (void)
 
 
 // Close the handle of the context
-int
+int 
 ACE_Registry::Naming_Context::close (void)
 {
-  long result = this->key_ ? ::RegCloseKey (this->key_) : ERROR_SUCCESS;
+  long result = ::RegCloseKey (this->key_);
   ACE_REGISTRY_CALL_RETURN (result);
 }
 
 
 // Convert a <name> to a <string>
-ACE_Registry::Istring
+ACE_Registry::Istring 
 ACE_Registry::make_string (const Name &const_name)
 {
   Istring string;
@@ -631,7 +631,7 @@ ACE_Registry::make_string (const Name &const_name)
 
 
 // Convert a <string> to a <name>
-ACE_Registry::Name
+ACE_Registry::Name 
 ACE_Registry::make_name (const Istring &string)
 {
   int new_position = 0;
@@ -648,17 +648,17 @@ ACE_Registry::make_name (const Istring &string)
 	// If we have not gone past the end
 	{
 	  // Get the substring
-	  component.id_ = string.substr (last_position,
-					 new_position - last_position);
+	  component.id_ = string.substr (last_position, 
+					 new_position - last_position);	  
 	  // Skip past the seperator
 	  new_position += ACE_OS::strlen (ACE_Registry::STRING_SEPARATOR);
 	}
-      else
+      else 
 	{
 	  // Get the last substring
-	  component.id_ = string.substr (last_position);
+	  component.id_ = string.substr (last_position);	  
 	}
-      // Update positions
+      // Update positions 
       last_position = new_position;
       // Insert component into name
       name.insert (component);
@@ -746,12 +746,12 @@ ACE_Registry::Naming_Context::name (Istring &name)
 
 
 // listing function: iterator creator
-// This is useful when there are many objects and contexts
-// in <this> context and you only want to look at a few entries
+// This is useful when there are many objects and contexts 
+// in <this> context and you only want to look at a few entries 
 // at a time
-int
-ACE_Registry::Naming_Context::list (u_long how_many,
-				    Binding_List &list,
+int 
+ACE_Registry::Naming_Context::list (u_long how_many, 
+				    Binding_List &list, 
 				    Binding_Iterator &iter)
 {
   // Empty list
@@ -759,12 +759,12 @@ ACE_Registry::Naming_Context::list (u_long how_many,
   // Make sure that the list is empty
   list = empty_list;
 
-  // Correctly initalize the iterator
-  iter.reset ();
+  // Correctly initalize the iterator  
+  iter.reset ();  
 
   // Make sure that the iterator uses <this> naming context
   iter.naming_context (*this);
-
+  
   // Start iterations from the objects
   iter.current_enumeration (iter.object_iteration_);
 
@@ -777,7 +777,7 @@ ACE_Registry::Naming_Context::list (u_long how_many,
 
 // listing function: iterator creator
 // This gives back a listing of all entries in <this> context.
-int
+int 
 ACE_Registry::Naming_Context::list (Binding_List &list)
 {
   // Empty list
@@ -797,11 +797,11 @@ ACE_Registry::Naming_Context::list (Binding_List &list)
   long result = 0;
   while (1)
     {
-      ACE_Registry::Binding binding;
+      ACE_Registry::Binding binding;      
       result = iterator.next_one (binding);
       if (result == 0)
 	list.insert (binding);
-      else
+      else 
 	break;
     }
   return 0;
@@ -818,7 +818,7 @@ ACE_Registry::Binding_Iterator::Binding_Iterator ()
 }
 
 
-void
+void 
 ACE_Registry::Binding_Iterator::reset ()
 {
   this->current_enumeration_ = &this->iteration_complete_;
@@ -828,7 +828,7 @@ ACE_Registry::Binding_Iterator::reset ()
 }
 
 
-void
+void 
 ACE_Registry::Binding_Iterator::Iteration_State::reset ()
 {
   this->index_ = 0;
@@ -841,19 +841,19 @@ ACE_Registry::Binding_Iterator::Iteration_State::Iteration_State (Binding_Iterat
 {
 }
 
-
+ 
 ACE_Registry::Binding_Iterator::Object_Iteration::Object_Iteration (Binding_Iterator &iter)
   : Iteration_State (iter)
 {
 }
 
-
+ 
 ACE_Registry::Binding_Iterator::Context_Iteration::Context_Iteration (Binding_Iterator &iter)
   : Iteration_State (iter)
 {
 }
 
-
+ 
 ACE_Registry::Binding_Iterator::Iteration_Complete::Iteration_Complete (Binding_Iterator &iter)
   : Iteration_State (iter)
 {
@@ -861,7 +861,7 @@ ACE_Registry::Binding_Iterator::Iteration_Complete::Iteration_Complete (Binding_
 
 
 // Next entry
-int
+int 
 ACE_Registry::Binding_Iterator::next_one (Binding &binding)
 {
   u_long how_many = 1;
@@ -869,18 +869,18 @@ ACE_Registry::Binding_Iterator::next_one (Binding &binding)
 
   // Get next n (where n is one)
   long result = this->next_n (how_many, list);
-
+  
   if (result == 0)
     // Success
-    binding = (*list.begin ());
-
+    binding = (*list.begin ());  
+  
   return result;
 }
 
 
 // Next <how_many> entries
-int
-ACE_Registry::Binding_Iterator::next_n (u_long how_many,
+int 
+ACE_Registry::Binding_Iterator::next_n (u_long how_many, 
 					Binding_List &list)
 {
   // Empty list
@@ -891,18 +891,18 @@ ACE_Registry::Binding_Iterator::next_n (u_long how_many,
   return this->current_enumeration_->next_n (how_many, list);
 }
 
-
-// Destroy iterator
-int
+  
+// Destroy iterator 
+int 
 ACE_Registry::Binding_Iterator::destroy (void)
 {
   this->reset ();
   return 0;
 }
 
-
+  
 // Set/Get naming_context
-void
+void 
 ACE_Registry::Binding_Iterator::naming_context (Naming_Context &naming_context)
 {
   this->naming_context_ = &naming_context;
@@ -917,7 +917,7 @@ ACE_Registry::Binding_Iterator::naming_context (void)
 
 
 // Set/Get current enumeration
-void
+void 
 ACE_Registry::Binding_Iterator::current_enumeration (Iteration_State &current_enumeration)
 {
   this->current_enumeration_ = &current_enumeration;
@@ -931,8 +931,8 @@ ACE_Registry::Binding_Iterator::current_enumeration (void)
 }
 
 
-int
-ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many,
+int 
+ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many, 
 							  Binding_List &list)
 {
   // Make a copy
@@ -945,19 +945,19 @@ ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many,
       u_long size = sizeof string / sizeof (TCHAR);
       long result = ::RegEnumValue (this->parent_->naming_context (). key(),
 				    this->index_,
-				    string,
+				    string, 
 				    &size,
 				    0,
 				    0,
 				    0,
 				    0);
       switch (result)
-	{
+	{	  
 	case ERROR_SUCCESS:
 	  // Object found
 	  {
 	    // Readjust counters
-	    this->index_++;
+	    this->index_++; 
 	    how_many--;
 
 	    // Add to list
@@ -967,47 +967,47 @@ ACE_Registry::Binding_Iterator::Object_Iteration::next_n (u_long how_many,
 	    list.insert (binding);
 	  }
 	// Continue to add to list
-	break;
-
+	break;	
+	
 	case ERROR_NO_MORE_ITEMS:
 	  // Enumeration of objects complete
-	  // Reset index
-	  this->index_ = 0;
+	  // Reset index 
+	  this->index_ = 0;	  
 
 	  // Current enumeration will become CONTEXTS
-	  this->parent_->current_enumeration (this->parent_->context_iteration_);
+	  this->parent_->current_enumeration (this->parent_->context_iteration_);  
 	  result = this->parent_->current_enumeration ().next_n (how_many,
 								 list);
 	  // If we were able to add objects
 	  if (requested != how_many)
 	    return 0;
-	  else
+	  else 
 	    return result;
-
+	  
 	default:
-	  // Strange error
-	  // Reset index
-	  this->index_ = 0;
+	  // Strange error 
+	  // Reset index 
+	  this->index_ = 0;	  
 	  // Current enumeration will become COMPLETE
-	  this->parent_->current_enumeration (this->parent_->iteration_complete_);
-	  // strange error
+	  this->parent_->current_enumeration (this->parent_->iteration_complete_);  
+	  // strange error 
 	  return -1;
 	}
-    }
+    }  
   // If we reach here, all of <how_many> pairs were added to the list
-  // Since more entries may be available
+  // Since more entries may be available 
   // current enumeration will remain OBJECTS
   return 0;
 }
 
 
-int
-ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many,
+int 
+ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many, 
 							   Binding_List &list)
 {
   // Make a copy
   u_long requested = how_many;
-
+  
   // While there are more entries to be added to the list
   while (how_many > 0)
     {
@@ -1015,19 +1015,19 @@ ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many,
       u_long size = sizeof string / sizeof (TCHAR);
       long result = ::RegEnumKeyEx (this->parent_->naming_context (). key (),
 				    this->index_,
-				    string,
+				    string, 
 				    &size,
 				    0,
 				    0,
 				    0,
 				    0);
       switch (result)
-	{
+	{	  
 	case ERROR_SUCCESS:
 	  // Object found
 	  {
 	    // Readjust counters
-	    this->index_++;
+	    this->index_++; 
 	    how_many--;
 
 	    // Add to list
@@ -1037,7 +1037,7 @@ ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many,
 	    list.insert (binding);
 	  }
 	// Continue to add to list
-	break;
+	break;	
 
 	case ERROR_NO_MORE_ITEMS:
 	  // Enumeration of objects complete
@@ -1045,29 +1045,29 @@ ACE_Registry::Binding_Iterator::Context_Iteration::next_n (u_long how_many,
 	  /* FALL THROUGH */
 
 	default:
-	  // Strange error
+	  // Strange error 
 
-	  // Reset index
-	  this->index_ = 0;
+	  // Reset index 
+	  this->index_ = 0;	  
 	  // Current enumeration will become CONTEXTS
-	  this->parent_->current_enumeration (this->parent_->iteration_complete_);
+	  this->parent_->current_enumeration (this->parent_->iteration_complete_);  
 
 	  // If we were able to add contexts
 	  if (requested != how_many)
 	    return 0;
-	  else
+	  else 
 	    return -1;
 	}
     }
   // If we reach here, all of <how_many> pairs were added to the list
-  // Since more entries may be available
+  // Since more entries may be available 
   // current enumeration will remain CONTEXTS
   return 0;
 }
 
 
-int
-ACE_Registry::Binding_Iterator::Iteration_Complete::next_n (u_long how_many,
+int 
+ACE_Registry::Binding_Iterator::Iteration_Complete::next_n (u_long how_many, 
 							    Binding_List &list)
 {
 	ACE_UNUSED_ARG(list);
@@ -1099,18 +1099,18 @@ ACE_Predefined_Naming_Contexts::connect (ACE_Registry::Naming_Context &naming_co
 				   &naming_context.key_);
   if (predefined == HKEY_CURRENT_USER || predefined == HKEY_CLASSES_ROOT)
     // Make sure that for these types, the machine is local
-    if (machine_name == 0 ||
+    if (machine_name == 0 || 
 	ACE_Predefined_Naming_Contexts::is_local_host (machine_name))
       {
 	naming_context.key_ = predefined;
 	result = 0;
       }
-    else
+    else 
       result = -1;
-
+  
   ACE_REGISTRY_CALL_RETURN (result);
 }
-
+			
 // Check if <machine_name> is the local host
 /* static */
 int
@@ -1124,5 +1124,5 @@ ACE_Predefined_Naming_Contexts::is_local_host (LPCTSTR machine_name)
     result = 0;
   return result;
 }
-
+			
 #endif /* ACE_WIN32 */
diff --git a/ace/SOCK_Acceptor.cpp b/ace/SOCK_Acceptor.cpp
index f86f37c67b5..a3cfaaa8c0f 100644
--- a/ace/SOCK_Acceptor.cpp
+++ b/ace/SOCK_Acceptor.cpp
@@ -140,7 +140,7 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
       addr = (sockaddr *) remote_addr->get_addr ();
     }
 
-  // Handle the case where we're doing a timed <accept>.
+  // Handle the timeout case.
   if (timeout != 0)
     {
       if (ACE::handle_timed_accept (handle, timeout, restart) == -1)
@@ -149,8 +149,8 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
 	{
 	  int val = ACE::get_flags (handle);
 
-	  // Set the handle into non-blocking mode if it's not already
-	  // in it.
+	  // Set the handle into non-blocking mode if it's not
+	  // already in it.
 	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)
 	      && ACE::set_flags (handle, ACE_NONBLOCK) == -1)
 	    return ACE_INVALID_HANDLE;
@@ -159,14 +159,13 @@ ACE_SOCK_Acceptor::shared_accept (ACE_Addr *remote_addr,
 
 	  if (ACE_BIT_DISABLED (val, ACE_NONBLOCK))
 	    {
-	      // We need to stash errno here because <ACE::clr_flags>
-	      // may reset it.
+	      // We need to stash errno here because ACE::clr_flags() may
+	      // reset it.
 	      int 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 (handle, ACE_NONBLOCK);
-	      ACE::clr_flags (new_handle, ACE_NONBLOCK);
 	      errno = error;
 	    }
 	}
diff --git a/ace/SOCK_Acceptor.h b/ace/SOCK_Acceptor.h
index 5f68e60030f..381100bd9bb 100644
--- a/ace/SOCK_Acceptor.h
+++ b/ace/SOCK_Acceptor.h
@@ -38,7 +38,7 @@ public:
   ACE_SOCK_Acceptor (const ACE_Addr &local_sap,
                      int reuse_addr = 0,
                      int protocol_family = PF_INET,
-                     int backlog = ACE_DEFAULT_BACKLOG,
+                     int backlog = 5,
                      int protocol = 0);
     // Initiate a passive mode socket.
 
@@ -48,7 +48,7 @@ public:
   int open (const ACE_Addr &local_sap,
             int reuse_addr = 0,
             int protocol_family = PF_INET,
-            int backlog = ACE_DEFAULT_BACKLOG,
+            int backlog = 5,
             int protocol = 0);
   // Initiate a passive mode socket.
 
diff --git a/ace/SOCK_Dgram_Mcast.cpp b/ace/SOCK_Dgram_Mcast.cpp
index 1a30f757e43..e042b6129d7 100644
--- a/ace/SOCK_Dgram_Mcast.cpp
+++ b/ace/SOCK_Dgram_Mcast.cpp
@@ -315,8 +315,8 @@ ACE_SOCK_Dgram_Mcast::make_multicast_address_i (const ACE_INET_Addr &mcast_addr,
   else
     multicast_address.imr_interface.s_addr = INADDR_ANY;
 
-#if defined (ACE_PSOS) && !defined (ACE_PSOS_TM) && !defined (ACE_PSOS_DIAB_MIPS)
-  multicast_address.imr_mcastaddr.s_addr = htonl(mcast_addr.get_ip_address());
+#if defined (ACE_PSOS) && !defined (ACE_PSOS_TM)
+  multicast_address.imr_mcastaddr.s_addr = htonl (mcast_addr.get_ip_address ());
 #else
   multicast_address.imr_multiaddr.s_addr = htonl (mcast_addr.get_ip_address ());
 #endif /* defined (ACE_PSOS) */
diff --git a/ace/SOCK_Dgram_Mcast.h b/ace/SOCK_Dgram_Mcast.h
index 55d3ba832dd..a5640829f7e 100644
--- a/ace/SOCK_Dgram_Mcast.h
+++ b/ace/SOCK_Dgram_Mcast.h
@@ -34,7 +34,7 @@ class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram
 public:
   // = Initialization routine.
   ACE_SOCK_Dgram_Mcast (void);
-  // Note that there is no <open>.  This cannot be used unless you
+  // Note that there is no open ().  This cannot be used unless you
   // subscribe to the multicast group.  If you just want to send (and
   // not listen) to the multicast group, use ACE_SOCK_Dgram or
   // ACE_SOCK_CODgram.
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp
index abf00af3559..942fdd66342 100644
--- a/ace/SOCK_IO.cpp
+++ b/ace/SOCK_IO.cpp
@@ -34,13 +34,11 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
   handle_set.reset ();
   handle_set.set_bit (this->get_handle ());
 
-  io_vec->iov_base = 0;
-
   // Check the status of the current socket.
   switch (ACE_OS::select (int (this->get_handle ()) + 1,
-                          handle_set,
-                          0, 0,
-                          timeout))
+                         handle_set,
+                         0, 0,
+                         timeout))
     {
     case -1:
       return -1;
@@ -56,17 +54,13 @@ ACE_SOCK_IO::recvv (iovec *io_vec,
 
   u_long inlen;
 
-  if (ACE_OS::ioctl (this->get_handle (),
-                     FIONREAD,
+  if (ACE_OS::ioctl (this->get_handle (), FIONREAD,
                      (u_long *) &inlen) == -1)
     return -1;
   else if (inlen > 0)
     {
-      ACE_NEW_RETURN (io_vec->iov_base,
-                      char[inlen],
-                      -1);
-      io_vec->iov_len = this->recv (io_vec->iov_base,
-                                    inlen);
+      ACE_NEW_RETURN (io_vec->iov_base, char[inlen], -1);
+      io_vec->iov_len = this->recv (io_vec->iov_base, inlen);
       return io_vec->iov_len;
     }
   else
@@ -105,9 +99,7 @@ ACE_SOCK_IO::send (size_t n, ...) const
       iovp[i].iov_len = va_arg (argp, ssize_t);
     }
 
-  ssize_t result = ACE_OS::sendv (this->get_handle (),
-                                  iovp,
-                                  total_tuples);
+  ssize_t result = ACE_OS::sendv (this->get_handle (), iovp, total_tuples);
 #if !defined (ACE_HAS_ALLOCA)
   delete [] iovp;
 #endif /* !defined (ACE_HAS_ALLOCA) */
@@ -143,9 +135,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const
       iovp[i].iov_len = va_arg (argp, ssize_t);
     }
 
-  ssize_t result = ACE_OS::recvv (this->get_handle (), 
-                                  iovp, 
-                                  total_tuples);
+  ssize_t result = ACE_OS::recvv (this->get_handle (), iovp, total_tuples);
 #if !defined (ACE_HAS_ALLOCA)
   delete [] iovp;
 #endif /* !defined (ACE_HAS_ALLOCA) */
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index e978945f0c2..26700cc4064 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -73,8 +73,7 @@ public:
   // buffer to read.  This method determines how much data is in the
   // socket, allocates a buffer of this size, reads in the data, and
   // returns the number of bytes read.  The caller is responsible for
-  // deleting the member in the <iov_base> field of <io_vec> using
-  // delete [] io_vec->iov_base.
+  // deleting the member in the <iov_base> field of <io_vec>.
 
   ssize_t recv (iovec *io_vec,
                 const ACE_Time_Value *timeout = 0);
diff --git a/ace/SPIPE_Connector.cpp b/ace/SPIPE_Connector.cpp
index f06f9bbd0f5..f8078c2c655 100644
--- a/ace/SPIPE_Connector.cpp
+++ b/ace/SPIPE_Connector.cpp
@@ -12,21 +12,21 @@ ACE_RCSID(ace, SPIPE_Connector, "$Id$")
 
 ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector)
 
-// Creates a Local ACE_SPIPE.
+// Creates a Local ACE_SPIPE. 
 
-ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io,
+ACE_SPIPE_Connector::ACE_SPIPE_Connector (ACE_SPIPE_Stream &new_io, 
 					  const ACE_SPIPE_Addr &remote_sap,
 					  ACE_Time_Value *timeout,
 					  const ACE_Addr & local_sap,
-					  int reuse_addr,
+					  int reuse_addr, 
 					  int flags,
 					  int perms)
 {
   ACE_TRACE ("ACE_SPIPE_Connector::ACE_SPIPE_Connector");
-  if (this->connect (new_io, remote_sap, timeout, local_sap,
+  if (this->connect (new_io, remote_sap, timeout, local_sap, 
 		     reuse_addr, flags, perms) == -1
       && timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
-    ACE_ERROR ((LM_ERROR, "address %s, %p\n",
+    ACE_ERROR ((LM_ERROR, "address %s, %p\n", 
 	       remote_sap.get_path_name (), "ACE_SPIPE_Connector"));
 }
 
@@ -42,21 +42,19 @@ ACE_SPIPE_Connector::ACE_SPIPE_Connector (void)
 }
 
 int
-ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io,
+ACE_SPIPE_Connector::connect (ACE_SPIPE_Stream &new_io, 
 			      const ACE_SPIPE_Addr &remote_sap,
 			      ACE_Time_Value *timeout,
 			      const ACE_Addr & /* local_sap */,
 			      int /* reuse_addr */,
-			      int flags,
+			      int flags, 
 			      int perms)
 {
   ACE_TRACE ("ACE_SPIPE_Connector::connect");
 
   // Make darn sure that the O_CREAT flag is not set!
-#if ! defined (ACE_PSOS_DIAB_MIPS)
   ACE_CLR_BITS (flags, O_CREAT);
-# endif /* !ACE_PSOS_DIAB_MIPS */
-  ACE_HANDLE handle = ACE::handle_timed_open (timeout,
+  ACE_HANDLE handle = ACE::handle_timed_open (timeout, 
 					      remote_sap.get_path_name (),
 					      flags, perms);
   new_io.set_handle (handle);
diff --git a/ace/SString.cpp b/ace/SString.cpp
index 373b045b963..b88c3f4f477 100644
--- a/ace/SString.cpp
+++ b/ace/SString.cpp
@@ -249,7 +249,6 @@ ACE_CString::ACE_CString (const ACE_USHORT16 *s,
                           ACE_Allocator *alloc)
   : allocator_ (alloc ? alloc : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
     rep_ (0),
     release_ (0)
 {
@@ -265,11 +264,8 @@ ACE_CString::ACE_CString (const ACE_USHORT16 *s,
     {
       this->release_ = 1;
 
-      size_t len = ACE_WString::strlen (s);
-      ACE_ALLOCATOR (this->rep_,
-                     (char *) this->allocator_->malloc (len + 1));
-      this->len_ = len;
-      this->buf_len_ = len + 1;
+      this->len_ = ACE_WString::strlen (s);
+      this->rep_ = (char *) this->allocator_->malloc (this->len_ + 1);
 
       // Copy the ACE_USHORT16 * string byte-by-byte into the char *
       // string.
@@ -280,65 +276,63 @@ ACE_CString::ACE_CString (const ACE_USHORT16 *s,
     }
 }
 
-// this method might benefit from a little restructuring.
 void
 ACE_CString::set (const char *s,
                   size_t len,
                   int release)
 {
-  // Case 1. Going from memory to more memory
-  size_t new_buf_len = len + 1;
-  if (s != 0 && len != 0 && s[0] != '\0' && release
-      && this->buf_len_ < new_buf_len)
-    {
-      char *temp;
-      ACE_ALLOCATOR (temp,
-                     (char *) this->allocator_->malloc (new_buf_len));
+  // Free memory if necessary
 
-      if (this->release_)
-        this->allocator_->free (this->rep_);
+  // Going from memory to no memory
+  if ((!release || s == 0 || s[0] == '\0' || len == 0)
+      && this->release_)
+    {
+      this->allocator_->free (this->rep_);
+    }
+  // Going from memory to more memory
+  else if (this->len_ < len
+           && this->release_)
+    {
+      this->allocator_->free (this->rep_);
+    }
 
-      this->rep_ = temp;
-      this->buf_len_ = new_buf_len;
+  // Figure out future ownership
+  if (!release || s == 0 || s[0] == '\0' || len == 0)
+    {
+      this->release_ = 0;
+    }
+  else
+    {
       this->release_ = 1;
-      this->len_ = len;
-      ACE_OS::memcpy (this->rep_, s, len);
-      // NUL terminate.
-      this->rep_[len] = '\0';
     }
 
-  // Case 2. No memory allocation is necessary.
-  else
+  // Allocate memory if owner and necessary
+
+  // Len is greater than 0, so must allocate space for it.
+  if (this->release_ && this->len_ < len)
     {
-      // Free memory if necessary and figure out future ownership
-      if (!release || s == 0 || s[0] == '\0' || len == 0)
-        if (this->release_)
-          {
-            this->allocator_->free (this->rep_);
-            this->release_ = 0;
-          }
-      // else - stay with whatever value for release_ we have.
+      this->rep_ = (char *) this->allocator_->malloc (len + 1);
+    }
 
-      // Populate data.
-      if (s == 0 || s[0] == '\0' || len == 0)
-        {
-          this->buf_len_ = 0;
-          this->len_ = 0;
-          this->rep_ = &ACE_CString::NULL_CString_;
-        }
-      else if (!release)
-        {
-          this->buf_len_ = len;
-          this->len_ = len;
-          this->rep_ = (char *) s;
-        }
-      else
-        {
-          ACE_OS::memcpy (this->rep_, s, len);
-          // NUL terminate.
-          this->rep_[len] = 0;
-          this->len_ = len;
-        }
+  // set new length
+  this->len_ = len;
+
+  // If no string or null string is specified by the user.
+  if (s == 0 || s[0] == '\0' || len == 0)
+    {
+      this->rep_ = &ACE_CString::NULL_CString_;
+    }
+  // If we don't own the string.
+  else if (!this->release_)
+    {
+      this->rep_ = (char *) s;
+    }
+  // We own the string.
+  else
+    {
+      ACE_OS::memcpy (this->rep_, s, len);
+      // NUL terminate.
+      this->rep_[len] = 0;
     }
 }
 
@@ -378,43 +372,30 @@ ACE_CString::operator+= (const ACE_CString &s)
 
   if (s.len_ > 0)
     {
-      size_t new_buf_len = this->len_ + s.len_ + 1;
-
-      // case 1. No memory allocation needed.
-      if (this->buf_len_ >= new_buf_len)
-        // Copy in data from new string.
-        ACE_OS::memcpy (this->rep_ + this->len_,
-                        s.rep_,
-                        s.len_);
-
-      // case 2. Memory reallocation is needed
-      else
-        {
-          char *t = 0;
-
-          ACE_ALLOCATOR_RETURN (t,
-                                (char *) this->allocator_->malloc (new_buf_len),
-                                *this);
-
-          // Copy memory from old string into new string.
-          ACE_OS::memcpy (t,
-                          this->rep_,
-                          this->len_);
-
-          ACE_OS::memcpy (t + this->len_,
-                          s.rep_,
-                          s.len_);
-
-          if (this->release_)
-            this->allocator_->free (this->rep_);
+      size_t oldlen = this->len_;
+      size_t newlen = oldlen + s.len_ + 1;
+      this->len_ += s.len_;
+      char *t = 0;
+
+      // Allocate memory for the new string.
+      ACE_ALLOCATOR_RETURN (t,
+                            (char *) this->allocator_->malloc (newlen),
+                            *this);
+      // Copy memory from old string into new string.
+      ACE_OS::memcpy (t,
+                      this->rep_,
+                      oldlen);
+
+      ACE_OS::memcpy (t + oldlen,
+                      s.rep_,
+                      s.len_);
+      t[this->len_] = '\0';
 
-          this->release_ = 1;
-          this->rep_ = t;
-          this->buf_len_ = new_buf_len;
-        }
+      if (this->release_)
+        this->allocator_->free (this->rep_);
 
-      this->len_ += s.len_;
-      this->rep_[this->len_] = '\0';
+      this->release_ = 1;
+      this->rep_ = t;
     }
 
   return *this;
diff --git a/ace/SString.h b/ace/SString.h
index b7fe755c629..83182433516 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -29,21 +29,20 @@ class ACE_Allocator;
 class ACE_Export ACE_CString
 {
   // = TITLE
-  //   This class provides a wrapper facade for C strings.
+  //   A simple C String <ACE_CString> class.
   //
   // = DESCRIPTION
-  //   This class uses an <ACE_Allocator> to allocate memory.  The
-  //   user can make this a persistant class by providing an
-  //   ACE_Allocator with a persistable memory pool.  NOTE: if an
-  //   instance of this class is constructed from or assigned an empty
-  //   string (with first element of '\0'), then it is _not_ allocated
-  //   new space.  Instead, its internal representation is set equal
-  //   to a global empty string.  CAUTION: in cases when ACE_CString
-  //   is constructed from provided buffer with release parameter set
-  //   to 0, ACE_CString is not guaranteed to be '\0' terminated.
   //   This is a place holder until all compilers implement the
-  //   ANSI/ISO C++ standard String class.
-
+  //   ANSI/ISO C++ standard String class.  Note that we need to use
+  //   this class since the ACE ACE_Map_Manager requires an object
+  //   that supports the operator == and operator !=.  This class uses
+  //   an ACE_Allocator to allocate memory.  The user can make this a
+  //   persistant class by providing an ACE_Allocator with a
+  //   persistable memory pool.  NOTE: if an instance of this class is
+  //   constructed from or assigned an empty string (with first
+  //   element of '\0'), then it is _not_ allocated new space.
+  //   Instead, its internal representation is set equal to a global
+  //   empty string.
 public:
   static const int npos;
   // No position constant
@@ -56,8 +55,7 @@ public:
                int release = 1);
   // Constructor that copies <s> into dynamically allocated memory.
   // If <release> is non-0 then the <ACE_allocator> is responsible for
-  // freeing this memory. Memory is _not_ allocated/freed if <release>
-  // is 0. 
+  // freeing this memory.
 
   ACE_CString (const char *s,
                size_t len,
@@ -66,7 +64,7 @@ public:
   // Constructor that copies <len> chars of <s> into dynamically
   // allocated memory (will NUL terminate the result).  If <release>
   // is non-0 then the <ACE_allocator> is responsible for freeing this
-  // memory. Memory is _not_ allocated/freed if <release> is 0. 
+  // memory.
 
   ACE_CString (const ACE_CString &);
   // Copy constructor.
@@ -172,11 +170,7 @@ private:
   // Pointer to a memory allocator.
 
   size_t len_;
-  // Length of the ACE_CString data (not counting the trailing '\0').
-
-  size_t buf_len_;
-  // Length of the ACE_CString data buffer.  Keeping track of the
-  // length allows to avoid unnecessary dynamic allocations.
+  // Length of the ACE_CString (not counting the trailing '\0').
 
   char *rep_;
   // Pointer to data.
@@ -193,130 +187,117 @@ ACE_Export ACE_INLINE ACE_CString operator + (const ACE_CString &, const ACE_CSt
 ACE_Export ostream &operator << (ostream &, const ACE_CString &);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
-class ACE_Export ACE_WString
+class ACE_Export ACE_SString
 {
   // = TITLE
-  //   This class provides a wrapper facade for C wide strings. 
+  //   A very Simple String <ACE_SString> class.  This is not a
+  //   general-purpose string class, and you should probably consider
+  //   using <ACE_CString> is you don't understand why this class
+  //   exists...
   //
-  // = DESCRIPTION 
-  //     This class uses an <ACE_Allocator> to allocate memory.  The
-  //     user can make this a persistant class by providing an
-  //     <ACE_Allocator> with a persistable memory pool.  This is a
-  //     place holder until all compilers implement the ANSI/ISO C++
-  //     standard String class.
+  // = DESCRIPTION
+  //   This class is only intended for use with applications that
+  //   understand how it works.  In particular, its destructor does
+  //   not deallocate its memory when it is destroyed...  We need this
+  //   class since the <ACE_Map_Manager> requires an object that
+  //   supports the operator == and operator !=.  This class uses an
+  //   <ACE_Allocator> to allocate memory.  The user can make this a
+  //   persistant class by providing an <ACE_Allocator> with a
+  //   persistable memory pool.
 public:
   static const int npos;
   // No position constant
 
-  ACE_WString (ACE_Allocator *alloc = 0);
+  ACE_SString (ACE_Allocator *alloc = 0);
   // Default constructor.
 
-  ACE_WString (const char *s,
-               ACE_Allocator *alloc = 0);
-  // Constructor that copies <s> into dynamically allocated memory.
-
-  ACE_WString (const ACE_USHORT16 *s,
-               ACE_Allocator *alloc = 0);
+  ACE_SString (const char *s, ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory.
 
-  ACE_WString (const ACE_USHORT16 *s,
-               size_t len,
-               ACE_Allocator *alloc = 0);
-  // Constructor that copies <len> ACE_USHORT16's of <s> into dynamically
+  ACE_SString (const char *s, size_t len, ACE_Allocator *alloc = 0);
+  // Constructor that copies <len> chars of <s> into dynamically
   // allocated memory (will NUL terminate the result).
 
-  ACE_WString (size_t len, ACE_Allocator *alloc = 0);
-  // Constructor that dynamically allocates memory for <len> + 1
-  // ACE_USHORT16 characters. The newly created memory is set memset to 0.
-
-  ACE_WString (const ACE_WString &s);
+  ACE_SString (const ACE_SString &);
   // Copy constructor.
 
-  ACE_WString (ACE_USHORT16 c, ACE_Allocator *alloc = 0);
+  ACE_SString (char c, ACE_Allocator *alloc = 0);
   // Constructor that copies <c> into dynamically allocated memory.
 
-  ~ACE_WString (void);
-  // Deletes the memory...
+  ~ACE_SString (void);
+  // Default dtor.
 
-  ACE_USHORT16 operator [] (size_t index) const;
+  char operator [] (size_t index) const;
   // Return the <index'th> character in the string (doesn't perform
   // bounds checking).
 
-  ACE_USHORT16 &operator [] (size_t index);
+  char &operator [] (size_t index);
   // Return the <index'th> character by reference in the string
   // (doesn't perform bounds checking).
 
-  ACE_WString &operator = (const ACE_WString &);
+  ACE_SString &operator = (const ACE_SString &);
   // Assignment operator (does copy memory).
 
-  void set (const ACE_USHORT16 *s);
-  // Copy <s>
-
-  void set (const ACE_USHORT16 *s, size_t len);
-  // Copy <len> bytes of <s> (will NUL terminate the result)
-
-  ACE_WString substring (size_t offset, ssize_t length = -1) const;
+  ACE_SString substring (size_t offset, ssize_t length = -1) const;
   // Return a substring given an offset and length, if length == -1
   // use rest of str return empty substring if offset or offset/length
-  // are invalid.
+  // are invalid
 
-  ACE_WString substr (size_t offset, ssize_t length = -1) const;
+  ACE_SString substr (size_t offset, ssize_t length = -1) const;
   // Same as substring
 
-  ACE_WString &operator += (const ACE_WString &);
-  // Concat operator (does copy memory).
-
   u_long hash (void) const;
   // Returns a hash value for this string.
 
   size_t length (void) const;
   // Return the length of the string.
 
-  ACE_USHORT16 *rep (void) const;
-  // Gets a copy of the underlying pointer.
+  void rep (char *s);
+  // Set the underlying pointer.  Since this does not copy memory or
+  // delete existing memory use with extreme caution!!!
 
-  char *char_rep (void) const;
-  // Transform into a copy of the ASCII character representation.
+  const char *rep (void) const;
+  // Get the underlying pointer.
 
-  const ACE_USHORT16 *fast_rep (void) const;
-  // Get at the underlying representation directly!
+  const char *fast_rep (void) const;
+  // Get the underlying pointer.
 
-  const ACE_USHORT16 *c_str (void) const;
+  const char *c_str (void) const;
   // Same as STL String's <c_str> and <fast_rep>.
 
-  int strstr (const ACE_WString &s) const;
+  int strstr (const ACE_SString &s) const;
   // Comparison operator that will match substrings.  Returns the
   // index of the first location that matches, else -1.
 
-  int find (const ACE_WString &str, int pos = 0) const;
+  int find (const ACE_SString &str, int pos = 0) const;
   // Find <str> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int find (const ACE_USHORT16 *s, int pos = 0) const;
+  int find (const char *s, int pos = 0) const;
   // Find <s> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int find (ACE_USHORT16 c, int pos = 0) const;
+  int find (char c, int pos = 0) const;
   // Find <c> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int rfind (ACE_USHORT16 c, int pos = npos) const;
+  int rfind (char c, int pos = npos) const;
   // Find <c> starting at pos (counting from the end).  Returns the
   // index of the first location that matches, else npos.
 
-  int operator == (const ACE_WString &s) const;
+  int operator == (const ACE_SString &s) const;
   // Equality comparison operator (must match entire string).
 
-  int operator < (const ACE_WString &s) const;
+  int operator < (const ACE_SString &s) const;
   // Less than comparison operator.
 
-  int operator > (const ACE_WString &s) const;
+  int operator > (const ACE_SString &s) const;
   // Greater than comparison operator.
 
-  int operator != (const ACE_WString &s) const;
+  int operator != (const ACE_SString &s) const;
   // Inequality comparison operator.
 
-  int compare (const ACE_WString &s) const;
+  int compare (const ACE_SString &s) const;
   // Performs a <strcmp>-style comparison.
 
   void dump (void) const;
@@ -325,145 +306,145 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
-  static size_t strlen (const ACE_USHORT16 *);
-  // Computes the length of a "0" terminated ACE_USHORT16 *.
-
-  static const ACE_USHORT16 *strstr (const ACE_USHORT16 *s1, const ACE_USHORT16 *s2);
-  // Traditional style strstr
-
-  void resize (size_t len);
-  // This method is designed for high-performance. Please use with
-  // care ;-) If the current size of the string is less than <len>,
-  // the string is resized to the new length. The data is is zero'd
-  // out after this operation.
-
 private:
   ACE_Allocator *allocator_;
   // Pointer to a memory allocator.
 
   size_t len_;
-  // Length of the ACE_WString.
+  // Length of the ACE_SString (not counting the trailing '\0').
 
-  ACE_USHORT16 *rep_;
+  char *rep_;
   // Pointer to data.
 };
 
-ACE_Export ACE_INLINE ACE_WString operator + (const ACE_WString &, const ACE_WString &);
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-ACE_Export ostream &operator << (ostream &, const ACE_WString &);
+ACE_Export ostream &operator << (ostream &, const ACE_SString &);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
-class ACE_Export ACE_SString
+class ACE_Export ACE_WString
 {
   // = TITLE
-  //   A very Simple String <ACE_SString> class.  This is not a
-  //   general-purpose string class, and you should probably consider
-  //   using <ACE_CString> is you don't understand why this class
-  //   exists...
+  //   A persistent wide string class.
   //
   // = DESCRIPTION
-  //   This class is only intended for use with applications that
-  //   understand how it works.  In particular, its destructor does
-  //   not deallocate its memory when it is destroyed...  We need this
-  //   class since the <ACE_Map_Manager> requires an object that
-  //   supports the operator == and operator !=.  This class uses an
-  //   <ACE_Allocator> to allocate memory.  The user can make this a
-  //   persistant class by providing an <ACE_Allocator> with a
-  //   persistable memory pool.
+  //   We need to use this class since the <ACE_Map_Manager> requires
+  //   an object that supports the operator == and operator !=.  This
+  //   class uses an <ACE_Allocator> to allocate memory.  The user can
+  //   make this a persistant class by providing an <ACE_Allocator>
+  //   with a persistable memory pool
 public:
   static const int npos;
   // No position constant
 
-  ACE_SString (ACE_Allocator *alloc = 0);
+  ACE_WString (ACE_Allocator *alloc = 0);
   // Default constructor.
 
-  ACE_SString (const char *s, ACE_Allocator *alloc = 0);
+  ACE_WString (const char *s,
+               ACE_Allocator *alloc = 0);
   // Constructor that copies <s> into dynamically allocated memory.
 
-  ACE_SString (const char *s, size_t len, ACE_Allocator *alloc = 0);
-  // Constructor that copies <len> chars of <s> into dynamically
+  ACE_WString (const ACE_USHORT16 *s,
+               ACE_Allocator *alloc = 0);
+  // Constructor that copies <s> into dynamically allocated memory.
+
+  ACE_WString (const ACE_USHORT16 *s,
+               size_t len,
+               ACE_Allocator *alloc = 0);
+  // Constructor that copies <len> ACE_USHORT16's of <s> into dynamically
   // allocated memory (will NUL terminate the result).
 
-  ACE_SString (const ACE_SString &);
+  ACE_WString (size_t len, ACE_Allocator *alloc = 0);
+  // Constructor that dynamically allocates memory for <len> + 1
+  // ACE_USHORT16 characters. The newly created memory is set memset to 0.
+
+  ACE_WString (const ACE_WString &s);
   // Copy constructor.
 
-  ACE_SString (char c, ACE_Allocator *alloc = 0);
+  ACE_WString (ACE_USHORT16 c, ACE_Allocator *alloc = 0);
   // Constructor that copies <c> into dynamically allocated memory.
 
-  ~ACE_SString (void);
-  // Default dtor.
+  ~ACE_WString (void);
+  // Deletes the memory...
 
-  char operator [] (size_t index) const;
+  ACE_USHORT16 operator [] (size_t index) const;
   // Return the <index'th> character in the string (doesn't perform
   // bounds checking).
 
-  char &operator [] (size_t index);
+  ACE_USHORT16 &operator [] (size_t index);
   // Return the <index'th> character by reference in the string
   // (doesn't perform bounds checking).
 
-  ACE_SString &operator = (const ACE_SString &);
+  ACE_WString &operator = (const ACE_WString &);
   // Assignment operator (does copy memory).
 
-  ACE_SString substring (size_t offset, ssize_t length = -1) const;
+  void set (const ACE_USHORT16 *s);
+  // Copy <s>
+
+  void set (const ACE_USHORT16 *s, size_t len);
+  // Copy <len> bytes of <s> (will NUL terminate the result)
+
+  ACE_WString substring (size_t offset, ssize_t length = -1) const;
   // Return a substring given an offset and length, if length == -1
   // use rest of str return empty substring if offset or offset/length
-  // are invalid
+  // are invalid.
 
-  ACE_SString substr (size_t offset, ssize_t length = -1) const;
+  ACE_WString substr (size_t offset, ssize_t length = -1) const;
   // Same as substring
 
+  ACE_WString &operator += (const ACE_WString &);
+  // Concat operator (does copy memory).
+
   u_long hash (void) const;
   // Returns a hash value for this string.
 
   size_t length (void) const;
   // Return the length of the string.
 
-  void rep (char *s);
-  // Set the underlying pointer.  Since this does not copy memory or
-  // delete existing memory use with extreme caution!!!
+  ACE_USHORT16 *rep (void) const;
+  // Gets a copy of the underlying pointer.
 
-  const char *rep (void) const;
-  // Get the underlying pointer.
+  char *char_rep (void) const;
+  // Transform into a copy of the ASCII character representation.
 
-  const char *fast_rep (void) const;
-  // Get the underlying pointer.
+  const ACE_USHORT16 *fast_rep (void) const;
+  // Get at the underlying representation directly!
 
-  const char *c_str (void) const;
+  const ACE_USHORT16 *c_str (void) const;
   // Same as STL String's <c_str> and <fast_rep>.
 
-  int strstr (const ACE_SString &s) const;
+  int strstr (const ACE_WString &s) const;
   // Comparison operator that will match substrings.  Returns the
   // index of the first location that matches, else -1.
 
-  int find (const ACE_SString &str, int pos = 0) const;
+  int find (const ACE_WString &str, int pos = 0) const;
   // Find <str> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int find (const char *s, int pos = 0) const;
+  int find (const ACE_USHORT16 *s, int pos = 0) const;
   // Find <s> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int find (char c, int pos = 0) const;
+  int find (ACE_USHORT16 c, int pos = 0) const;
   // Find <c> starting at pos.  Returns the index of the first
   // location that matches, else npos.
 
-  int rfind (char c, int pos = npos) const;
+  int rfind (ACE_USHORT16 c, int pos = npos) const;
   // Find <c> starting at pos (counting from the end).  Returns the
   // index of the first location that matches, else npos.
 
-  int operator == (const ACE_SString &s) const;
+  int operator == (const ACE_WString &s) const;
   // Equality comparison operator (must match entire string).
 
-  int operator < (const ACE_SString &s) const;
+  int operator < (const ACE_WString &s) const;
   // Less than comparison operator.
 
-  int operator > (const ACE_SString &s) const;
+  int operator > (const ACE_WString &s) const;
   // Greater than comparison operator.
 
-  int operator != (const ACE_SString &s) const;
+  int operator != (const ACE_WString &s) const;
   // Inequality comparison operator.
 
-  int compare (const ACE_SString &s) const;
+  int compare (const ACE_WString &s) const;
   // Performs a <strcmp>-style comparison.
 
   void dump (void) const;
@@ -472,21 +453,36 @@ public:
   ACE_ALLOC_HOOK_DECLARE;
   // Declare the dynamic allocation hooks.
 
+  static size_t strlen (const ACE_USHORT16 *);
+  // Computes the length of a "0" terminated ACE_USHORT16 *.
+
+  static const ACE_USHORT16 *strstr (const ACE_USHORT16 *s1, const ACE_USHORT16 *s2);
+  // Traditional style strstr
+
+  void resize (size_t len);
+  // This method is designed for high-performance. Please use with
+  // care ;-) If the current size of the string is less than <len>,
+  // the string is resized to the new length. The data is is zero'd
+  // out after this operation.
+
 private:
   ACE_Allocator *allocator_;
   // Pointer to a memory allocator.
 
   size_t len_;
-  // Length of the ACE_SString (not counting the trailing '\0').
+  // Length of the ACE_WString.
 
-  char *rep_;
+  ACE_USHORT16 *rep_;
   // Pointer to data.
 };
 
+ACE_Export ACE_INLINE ACE_WString operator + (const ACE_WString &, const ACE_WString &);
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-ACE_Export ostream &operator << (ostream &, const ACE_SString &);
+ACE_Export ostream &operator << (ostream &, const ACE_WString &);
 #endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */
 
+// ************************************************************
+
 class ACE_Export ACE_Tokenizer
 {
   // = TITLE
@@ -588,36 +584,6 @@ private:
   // Pointer to the next free space in delimiters_.
 };
 
-// ****************************************************************
-
-class ACE_Auto_String_Free
-{
-  // = TITLE
-  //   Simple class to automatically de-allocate strings
-  //
-  // = DESCRIPTION
-  //   Keeps a pointer to a string and deallocates it (using
-  //   ACE_OS::free()) on its destructor.
-  //   If you need to delete using "delete[]" the
-  //   ACE_Auto_Array_Ptr<char*> is your choice.
-  //   The class plays the same role as auto_ptr<>
-  //
-public:
-  /* explicit */ ACE_Auto_String_Free (char* p = 0);
-  ACE_Auto_String_Free (ACE_Auto_String_Free &rhs);
-  ACE_Auto_String_Free& operator= (ACE_Auto_String_Free &rhs);
-  ~ACE_Auto_String_Free (void);
-
-  char* operator* () const;
-  char operator[] (int i) const;
-  char* get (void) const;
-  char* release (void);
-  void reset (char* p = 0);
-
-private:
-  char* p_;
-};
-
 #if defined (__ACE_INLINE__)
 #include "ace/SString.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/SString.i b/ace/SString.i
index 8e7157da963..0a1583febd8 100644
--- a/ace/SString.i
+++ b/ace/SString.i
@@ -9,11 +9,12 @@ ACE_INLINE
 ACE_CString::ACE_CString (ACE_Allocator *alloc)
   : allocator_ (alloc ? alloc : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
-    rep_ (&ACE_CString::NULL_CString_),
+    rep_ (0),
     release_ (0)
 {
   ACE_TRACE ("ACE_CString::ACE_CString");
+
+  this->set (0, 0, 0);
 }
 
 // Constructor that actually copies memory.
@@ -24,7 +25,6 @@ ACE_CString::ACE_CString (const char *s,
                           int release)
   : allocator_ (alloc ? alloc : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
     rep_ (0),
     release_ (0)
 {
@@ -44,7 +44,6 @@ ACE_CString::ACE_CString (char c,
                           ACE_Allocator *alloc)
   : allocator_ (alloc ? alloc : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
     rep_ (0),
     release_ (0)
 {
@@ -62,7 +61,6 @@ ACE_CString::ACE_CString (const char *s,
                           int release)
   : allocator_ (alloc ? alloc : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
     rep_ (0),
     release_ (0)
 {
@@ -77,7 +75,6 @@ ACE_INLINE
 ACE_CString::ACE_CString (const ACE_CString &s)
   : allocator_ (s.allocator_ ? s.allocator_ : ACE_Allocator::instance ()),
     len_ (0),
-    buf_len_ (0),
     rep_ (0),
     release_ (0)
 {
@@ -234,26 +231,7 @@ ACE_INLINE int
 ACE_CString::compare (const ACE_CString &s) const
 {
   ACE_TRACE ("ACE_CString::compare");
-
-  // We can't just pass both strings to strcmp, since they are not
-  // guaranteed to be null-terminated.
-
-  // Pick smaller of the two lengths and perform the comparison.
-  int smaller_length = (this->len_ < s.len_) ? this->len_ : s.len_;
-  int result = ACE_OS::strncmp (this->rep_,
-                                s.rep_,
-                                smaller_length);
-
-  if (result != 0 || s.len_ == this->len_)
-    return result;
-
-  else
-    // we need to differentiate based on length
-    if (this->len_ > s.len_)
-      return (this->rep_[smaller_length] - '\0');
-
-    else
-      return ('\0' - s.rep_[smaller_length]);
+  return ACE_OS::strncmp (this->rep_, s.rep_, this->len_);
 }
 
 ACE_INLINE int
@@ -559,7 +537,7 @@ ACE_INLINE int
 ACE_WString::operator < (const ACE_WString &s) const
 {
   ACE_TRACE ("ACE_WString::operator <");
-  return (this->len_ < s.len_)
+  return (this->len_ < s.len_) 
           ? (ACE_OS::memcmp ((const void *) this->rep_,
                              (const void *) s.rep_,
                              this->len_ * sizeof (ACE_USHORT16)) <= 0)
@@ -574,7 +552,7 @@ ACE_INLINE int
 ACE_WString::operator > (const ACE_WString &s) const
 {
   ACE_TRACE ("ACE_WString::operator >");
-  return (this->len_ <= s.len_)
+  return (this->len_ <= s.len_) 
           ? (ACE_OS::memcmp ((const void *) this->rep_,
                              (const void *) s.rep_,
                              this->len_ * sizeof (ACE_USHORT16)) > 0)
@@ -684,69 +662,3 @@ ACE_WString::hash (void) const
 {
   return ACE::hash_pjw (this->rep_);
 }
-
-// ****************************************************************
-
-ACE_INLINE
-ACE_Auto_String_Free::ACE_Auto_String_Free (char* p)
-  :  p_ (p)
-{
-}
-
-ACE_INLINE
-ACE_Auto_String_Free::ACE_Auto_String_Free (ACE_Auto_String_Free& rhs)
-  :  p_ (rhs.p_)
-{
-  rhs.p_ = 0;
-}
-
-ACE_INLINE void
-ACE_Auto_String_Free::reset (char* p)
-{
-  if (this->p_ != 0)
-    ACE_OS::free (this->p_);
-  this->p_ = p;
-}
-
-ACE_INLINE ACE_Auto_String_Free&
-ACE_Auto_String_Free::operator= (ACE_Auto_String_Free& rhs)
-{
-  if (this != &rhs)
-    {
-      this->reset (rhs.p_);
-      rhs.p_ = 0;
-    }
-  return *this;
-}
-
-ACE_INLINE
-ACE_Auto_String_Free::~ACE_Auto_String_Free (void)
-{
-  this->reset (0);
-}
-
-ACE_INLINE char*
-ACE_Auto_String_Free::operator* (void) const
-{
-  return this->p_;
-}
-
-ACE_INLINE char
-ACE_Auto_String_Free::operator[] (int i) const
-{
-  return this->p_[i];
-}
-
-ACE_INLINE char*
-ACE_Auto_String_Free::get (void) const
-{
-  return this->p_;
-}
-
-ACE_INLINE char*
-ACE_Auto_String_Free::release (void)
-{
-  char* p = this->p_;
-  this->p_ = 0;
-  return p;
-}
diff --git a/ace/Sched_Params.cpp b/ace/Sched_Params.cpp
index cafb440f5da..5941faeda07 100644
--- a/ace/Sched_Params.cpp
+++ b/ace/Sched_Params.cpp
@@ -18,12 +18,18 @@
 
 #define ACE_BUILD_DLL
 
+#include "ace/ACE.h"
 #include "ace/Sched_Params.h"
 
 #if !defined (__ACE_INLINE__)
 #include "ace/Sched_Params.i"
 #endif /* __ACE_INLINE__ */
 
+#if defined (ACE_HAS_PRIOCNTL) && defined (ACE_HAS_STHREADS)
+# include /**/ <sys/rtpriocntl.h>
+# include /**/ <sys/tspriocntl.h>
+#endif /* ACE_HAS_PRIOCNTL && defined (ACE_HAS_STHREADS) */
+
 ACE_RCSID(ace, Sched_Params, "$Id$")
 
 int
@@ -49,9 +55,9 @@ ACE_Sched_Params::priority_min (const Policy policy,
                                     P_MYID /* ignored */,
                                     PC_GETCID,
                                     (char *) &pcinfo) == -1)
-        // Just hope that priority range wasn't configured from -1
-        // .. 1
-        return -1;
+	// Just hope that priority range wasn't configured from -1
+	// .. 1
+	return -1;
 
       // OK, now we've got the class ID in pcinfo.pc_cid.  In
       // addition, the maximum configured time-share priority is in
diff --git a/ace/Sched_Params.i b/ace/Sched_Params.i
index 35d75826416..a764423a954 100644
--- a/ace/Sched_Params.i
+++ b/ace/Sched_Params.i
@@ -88,7 +88,7 @@ ACE_Sched_Priority_Iterator::policy (void) const
   return this->policy_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Sched_Priority_Iterator::scope (void) const
 {
   return this->scope_;
@@ -96,10 +96,12 @@ ACE_Sched_Priority_Iterator::scope (void) const
 
 ACE_INLINE
 ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params::Policy &policy,
-                                                          int scope)
+							  int scope)
  : policy_ (policy),
    scope_ (scope)
 {
+  ACE_TRACE ("ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator");
+
   priority_ = ACE_Sched_Params::priority_min (this->policy (), this->scope ());
   this->done_ = 0;
 }
@@ -107,21 +109,22 @@ ACE_Sched_Priority_Iterator::ACE_Sched_Priority_Iterator (const ACE_Sched_Params
 ACE_INLINE
 ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator (void)
 {
+  ACE_TRACE ("ACE_Sched_Priority_Iterator::~ACE_Sched_Priority_Iterator");
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Sched_Priority_Iterator::more (void) const
 {
   return !this->done_;
 }
 
-ACE_INLINE int
+ACE_INLINE int 
 ACE_Sched_Priority_Iterator::priority (void) const
 {
   return this->priority_;
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Sched_Priority_Iterator::next (void)
 {
   if (this->done_)
@@ -129,7 +132,7 @@ ACE_Sched_Priority_Iterator::next (void)
 
   int old_priority = this->priority_;
   priority_ = ACE_Sched_Params::next_priority (this->policy (),
-                                               this->priority (),
-                                               this->scope ());
+					       this->priority (),
+					       this->scope ());
   this->done_ = old_priority == priority_;
 }
diff --git a/ace/Select_Reactor_Base.cpp b/ace/Select_Reactor_Base.cpp
index 3bf4e4ac8cf..af3fc8f88d0 100644
--- a/ace/Select_Reactor_Base.cpp
+++ b/ace/Select_Reactor_Base.cpp
@@ -294,12 +294,6 @@ ACE_Select_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
                                  this->select_reactor_.wait_set_,
                                  ACE_Reactor::CLR_MASK);
 
-  // And suspend_set.
-  this->select_reactor_.bit_ops (handle,
-                                 mask,
-                                 this->select_reactor_.suspend_set_,
-                                 ACE_Reactor::CLR_MASK);
-
   // Note the fact that we've changed the state of the <wait_set_>,
   // which is used by the dispatching loop to determine whether it can
   // keep going or if it needs to reconsult select().
@@ -640,12 +634,6 @@ ACE_Select_Reactor_Notify::handle_input (ACE_HANDLE handle)
             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:
               // Should we bail out if we get an invalid mask?
               ACE_ERROR ((LM_ERROR, ASYS_TEXT ("invalid mask = %d\n"), buffer.mask_));
@@ -705,21 +693,17 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
   ACE_FDS_PTMF ptmf  = &ACE_Handle_Set::set_bit;
   u_long omask = ACE_Event_Handler::NULL_MASK;
 
-  // Find the old reactor masks.  This automatically does the work of
-  // the GET_MASK operation.
-  if (handle_set.rd_mask_.is_set (handle))
-    ACE_SET_BITS (omask, ACE_Event_Handler::READ_MASK);
-  if (handle_set.wr_mask_.is_set (handle))
-    ACE_SET_BITS (omask, ACE_Event_Handler::WRITE_MASK);
-  if (handle_set.ex_mask_.is_set (handle))
-    ACE_SET_BITS (omask, ACE_Event_Handler::EXCEPT_MASK);
-
   switch (ops)
     {
     case ACE_Reactor::GET_MASK:
-      // The work for this operation is done in all cases at the
-      // begining of the function.
+      if (handle_set.rd_mask_.is_set (handle))
+        ACE_SET_BITS (omask, ACE_Event_Handler::READ_MASK);
+      if (handle_set.wr_mask_.is_set (handle))
+        ACE_SET_BITS (omask, ACE_Event_Handler::WRITE_MASK);
+      if (handle_set.ex_mask_.is_set (handle))
+        ACE_SET_BITS (omask, ACE_Event_Handler::EXCEPT_MASK);
       break;
+
     case ACE_Reactor::CLR_MASK:
       ptmf = &ACE_Handle_Set::clr_bit;
       /* FALLTHRU */
@@ -741,6 +725,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
           || ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
         {
           (handle_set.rd_mask_.*ptmf) (handle);
+          ACE_SET_BITS (omask, ACE_Event_Handler::READ_MASK);
         }
       else if (ops == ACE_Reactor::SET_MASK)
         handle_set.rd_mask_.clr_bit (handle);
@@ -752,6 +737,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
                               ACE_Event_Handler::CONNECT_MASK))
         {
           (handle_set.wr_mask_.*ptmf) (handle);
+          ACE_SET_BITS (omask, ACE_Event_Handler::WRITE_MASK);
         }
       else if (ops == ACE_Reactor::SET_MASK)
         handle_set.wr_mask_.clr_bit (handle);
@@ -765,6 +751,7 @@ ACE_Select_Reactor_Impl::bit_ops (ACE_HANDLE handle,
           )
         {
           (handle_set.ex_mask_.*ptmf) (handle);
+          ACE_SET_BITS (omask, ACE_Event_Handler::EXCEPT_MASK);
         }
       else if (ops == ACE_Reactor::SET_MASK)
         handle_set.ex_mask_.clr_bit (handle);
diff --git a/ace/Select_Reactor_Base.h b/ace/Select_Reactor_Base.h
index e21b1a48290..739c50e3dd7 100644
--- a/ace/Select_Reactor_Base.h
+++ b/ace/Select_Reactor_Base.h
@@ -373,8 +373,7 @@ protected:
   // we didn't create it, then we don't delete it).
 
   int restart_;
-  // Restart the <handle_events> event-loop method automatically when
-  // <select> is interrupted via <EINTR>.
+  // Restart automatically when interrupted
 
   int requeue_position_;
   // Position that the main ACE_Select_Reactor thread is requeued in
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 8d9c0d974f0..3c572e06f8b 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -70,7 +70,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::handler_i (int signum,
 
   if (handler == 0)
     return -1;
-  else if (eh != 0 && *eh != 0)
+  else if (*eh != 0)
     *eh = handler;
   return 0;
 }
diff --git a/ace/Select_Reactor_T.h b/ace/Select_Reactor_T.h
index 2f26d04379b..0c85859f460 100644
--- a/ace/Select_Reactor_T.h
+++ b/ace/Select_Reactor_T.h
@@ -127,19 +127,13 @@ public:
                         ACE_Reactor_Notify *notify = 0);
   // Initialize <ACE_Select_Reactor> with size <size>.
 
-  virtual int open (size_t max_number_of_handles = DEFAULT_SIZE,
+  virtual int open (size_t size = DEFAULT_SIZE,
                     int restart = 0,
                     ACE_Sig_Handler * = 0,
                     ACE_Timer_Queue * = 0,
                     int disable_notify_pipe = 0,
                     ACE_Reactor_Notify * = 0);
-  // Initialize the <ACE_Select_Reactor> to manage
-  // <max_number_of_handles>.  If <restart> is non-0 then the
-  // <ACE_Reactor>'s <handle_events> method will be restarted
-  // automatically when <EINTR> occurs.  If <signal_handler> or
-  // <timer_queue> are non-0 they are used as the signal handler and
-  // timer queue, respectively.  If <disable_notify_pipe> is non-0 the
-  // notification pipe is not created, thereby saving two I/O handles.
+  // Initialize <ACE_Select_Reactor> with size <size>.
 
   virtual int current_info (ACE_HANDLE, size_t & /* size */);
   // Returns -1 (not used in this implementation);
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index b447c31d7d5..0a80ff0ada7 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -229,7 +229,7 @@ ACE_Service_Config::parse_args (int argc, ASYS_TCHAR *argv[])
         break;
       case 'k':
         ACE_Service_Config::logger_key_ =
-          ASYS_ONLY_WIDE_STRING (getopt.optarg);
+          ACE_WIDE_STRING (getopt.optarg);
         break;
       case 'n':
         ACE_Service_Config::no_static_svcs_ = 1;
@@ -608,8 +608,6 @@ ACE_Service_Config::open_i (const ASYS_TCHAR program_name[],
 #endif /* ACE_LACKS_UNIX_SIGNALS */
     }
 
-  ace_yy_delete_parse_buffer ();
-
   if (ACE::debug ())
     ACE_Log_Msg::enable_debug_messages ();
 
@@ -637,12 +635,7 @@ ACE_Service_Config::handle_signal (int sig,
                                    siginfo_t *,
                                    ucontext_t *)
 {
-#if defined (ACE_NDEBUG)
-  ACE_UNUSED_ARG (sig);
-#else  /* ! ACE_NDEBUG */
   ACE_ASSERT (ACE_Service_Config::signum_ == sig);
-#endif /* ! ACE_NDEBUG */
-
   ACE_Service_Config::reconfig_occurred_ = 1;
 }
 
@@ -717,10 +710,15 @@ ACE_Service_Config::close (void)
 {
   ACE_TRACE ("ACE_Service_Config::close");
 
-  // Delete the service repository. All the objects inside the service
-  // repository have already been finalized .
+  // ACE_Service_Config must be deleted before the Singletons are
+  // closed so that an object's fini() method may reference a valid
+  // ACE_Reactor.
   ACE_Service_Config::close_svcs ();
 
+  // The Singletons can be used independently of the services.
+  // Therefore, this call must go out here.
+  ACE_Service_Config::close_singletons ();
+
   // Delete the list fo svc.conf files
   delete ACE_Service_Config::svc_conf_file_queue_;
   ACE_Service_Config::svc_conf_file_queue_ = 0;
@@ -729,9 +727,6 @@ ACE_Service_Config::close (void)
   delete ACE_Service_Config::static_svcs_;
   ACE_Service_Config::static_svcs_ = 0;
 
-  // We've prepared a buffer that we no longer need. Delete it.
-  ace_yy_delete_parse_buffer ();
-
   return 0;
 }
 
@@ -756,11 +751,6 @@ ACE_Service_Config::fini_svcs (void)
 
   int result = ACE_Service_Repository::instance ()->fini ();
 
-  // Since the fini() method of the objects inside the service
-  // repository may reference the ACE singletons, they must be
-  // destroyed after the objects have been finalized.
-  ACE_Service_Config::close_singletons ();
-
   if (ACE::debug ())
     ACE_Log_Msg::enable_debug_messages ();
 
diff --git a/ace/Service_Config.h b/ace/Service_Config.h
index bf8d9bae1ec..34cc2506cab 100644
--- a/ace/Service_Config.h
+++ b/ace/Service_Config.h
@@ -317,19 +317,6 @@ protected:
   // <ACE_Service_Config>.  Note that <argv[0]> is assumed to be the
   // program name.
 
-  // The arguments that are valid in a call to this method are 
-  // '-b' - Option to indicate that we should be a daemon
-  // '-d' - Turn on debugging mode
-  // '-f' - Option to read in the list of svc.conf file names
-  // '-k' - Option to read a wide string where in the logger output can 
-  //        be written 
-  // '-y' - Turn on the flag for a  repository of statically 
-  //        linked services
-  // '-n' - Need not have a repository of statically linked services
-  // '-S' - Option to read in the list of services on the command-line
-  //        Please observe the difference between options '-f' that looks
-  //        for a list of files and here a list of services.
-  
   static int start_daemon (void);
   // Become a daemon.
 
diff --git a/ace/Service_Config.i b/ace/Service_Config.i
index c0aff18fde6..1d71fb21cd9 100644
--- a/ace/Service_Config.i
+++ b/ace/Service_Config.i
@@ -58,13 +58,16 @@ ACE_Service_Config::signal_handler (ACE_Sig_Adapter *signal_handler)
 ACE_INLINE int
 ACE_Service_Config::initialize (const ACE_Service_Type *sp, char parameters[])
 {
-  return ACE_Service_Config::initialize (sp, ACE_WIDE_STRING (parameters));
+  wchar_t *wparameters = ACE_const_cast (wchar_t *, ACE_WIDE_STRING (parameters));
+  return ACE_Service_Config::initialize (sp, wparameters);
 }
 
 ACE_INLINE int
 ACE_Service_Config::initialize (const char svc_name[], char parameters[])
 {
-  return ACE_Service_Config::initialize (ACE_WIDE_STRING (svc_name), ACE_WIDE_STRING (parameters));
+  const wchar_t *wsvc_name = ACE_WIDE_STRING (svc_name);
+  wchar_t *wparameters = ACE_const_cast (wchar_t *, ACE_WIDE_STRING (parameters));
+  return ACE_Service_Config::initialize (wsvc_name, wparameters);
 }
 
 ACE_INLINE int
diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp
index d22733c872d..506c0ed74b6 100644
--- a/ace/Service_Manager.cpp
+++ b/ace/Service_Manager.cpp
@@ -181,7 +181,7 @@ ACE_Service_Manager::list_services (void)
 
       if (len > 0)
         {
-          ssize_t n = this->client_stream_.send_n (ASYS_ONLY_MULTIBYTE_STRING (buf),
+          ssize_t n = this->client_stream_.send_n (ASYS_MULTIBYTE_STRING (buf),
                                                    len);
 
           if (n != len || (n == -1 && errno != EPIPE))
diff --git a/ace/Service_Object.cpp b/ace/Service_Object.cpp
index a35507ca7e6..c257afe1853 100644
--- a/ace/Service_Object.cpp
+++ b/ace/Service_Object.cpp
@@ -80,8 +80,7 @@ ACE_Service_Type::resume (void) const
   this->type_->resume ();
 }
 
-ACE_Service_Object::ACE_Service_Object (ACE_Reactor *r)
-  : ACE_Event_Handler (r)
+ACE_Service_Object::ACE_Service_Object (void)
 {
   ACE_TRACE ("ACE_Service_Object::ACE_Service_Object");
 }
diff --git a/ace/Service_Object.h b/ace/Service_Object.h
index e6e9817345b..48d8ed8c318 100644
--- a/ace/Service_Object.h
+++ b/ace/Service_Object.h
@@ -38,11 +38,8 @@ class ACE_Export ACE_Service_Object : public ACE_Event_Handler, public ACE_Share
   //     the <ACE_Service_Config> (due to the <ACE_Shared_Object>).
 public:
   // = Initialization and termination methods.
-  ACE_Service_Object (ACE_Reactor * = 0);
-  // Constructor.
-
+  ACE_Service_Object (void);
   virtual ~ACE_Service_Object (void);
-  // Destructor.
 
   virtual int suspend (void);
     // Temporarily disable a service without removing it completely.
@@ -98,9 +95,6 @@ public:
   void fini (void);
   // Calls fini() on <type_>
 
-  int fini_called (void) const;
-  // Check if the service has been fini'ed.
-
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Service_Object.i b/ace/Service_Object.i
index 1b15899cc49..c69670b5444 100644
--- a/ace/Service_Object.i
+++ b/ace/Service_Object.i
@@ -4,20 +4,20 @@
 // Service_Object.i
 
 ACE_INLINE ACE_Service_Object_Ptr::ACE_Service_Object_Ptr (ACE_Service_Object *so)
-  : service_object_ (so)
+  : service_object_ (so) 
 {
 }
 
-ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void)
-{
+ACE_INLINE ACE_Service_Object_Ptr::~ACE_Service_Object_Ptr (void) 
+{ 
   this->service_object_->fini ();
   delete this->service_object_;
 }
 
 ACE_INLINE ACE_Service_Object *
-ACE_Service_Object_Ptr::operator-> ()
-{
-  return this->service_object_;
+ACE_Service_Object_Ptr::operator-> () 
+{ 
+  return this->service_object_; 
 }
 
 ACE_INLINE const ASYS_TCHAR *
@@ -51,7 +51,7 @@ ACE_Service_Type::handle (void) const
   return this->handle_;
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Service_Type::name (const ASYS_TCHAR *n)
 {
   ACE_TRACE ("ACE_Service_Type::name");
@@ -60,11 +60,11 @@ ACE_Service_Type::name (const ASYS_TCHAR *n)
   this->name_ = ACE_OS::strcpy (new ASYS_TCHAR [ACE_OS::strlen (n) + 1], n);
 #if defined (ACE_HAS_MOSTLY_UNICODE_APIS)
   delete [] (char *) this->chname_;
-  this->chname_ = ACE_OS_WString (this->name_).char_rep ();
+  this->chname_ = ACE_MULTIBYTE_STRING (this->name_);
 #endif /* !ACE_HAS_MOSTLY_UNICODE_APIS */
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Service_Type::type (const ACE_Service_Type_Impl *o, int enabled)
 {
   ACE_TRACE ("ACE_Service_Type::type");
@@ -72,14 +72,14 @@ ACE_Service_Type::type (const ACE_Service_Type_Impl *o, int enabled)
   ((ACE_Service_Type *) this)->active_ = enabled;
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_Service_Type::handle (const ACE_SHLIB_HANDLE h)
 {
   ACE_TRACE ("ACE_Service_Type::handle");
   this->handle_ = h;
 }
 
-ACE_INLINE int
+ACE_INLINE int  
 ACE_Service_Type::active (void) const
 {
   ACE_TRACE ("ACE_Service_Type::active");
@@ -92,10 +92,3 @@ ACE_Service_Type::active (int turnon)
   ACE_TRACE ("ACE_Service_Type::active");
   this->active_ = turnon;
 }
-
-ACE_INLINE int
-ACE_Service_Type::fini_called (void) const
-{
-  ACE_TRACE ("ACE_Service_TYpe::fini_called");
-  return this->fini_already_called_;
-}
diff --git a/ace/Service_Repository.cpp b/ace/Service_Repository.cpp
index 43711da3b7d..d7217bde3f1 100644
--- a/ace/Service_Repository.cpp
+++ b/ace/Service_Repository.cpp
@@ -134,15 +134,17 @@ ACE_Service_Repository::fini (void)
       // remove services, so typically they are deleted in reverse
       // order.
 
-      for (int i = this->current_size_ - 1; i >= 0; i--)
+      for (this->current_size_--;
+           this->current_size_ >= 0;
+           this->current_size_--)
         {
           if (ACE::debug ())
             ACE_DEBUG ((LM_DEBUG,
                         ASYS_TEXT ("finalizing %s\n"),
-                        this->service_vector_[i]->name ()));
+                        this->service_vector_[this->current_size_]->name ()));
           ACE_Service_Type *s =
             ACE_const_cast (ACE_Service_Type *,
-                            this->service_vector_[i]);
+                            this->service_vector_[this->current_size_]);
           s->fini ();
         }
     }
@@ -209,13 +211,6 @@ ACE_Service_Repository::find_i (const ASYS_TCHAR name[],
 
   if (i < this->current_size_)
     {
-      if (this->service_vector_[i]->fini_called ())
-        {
-          if (srp != 0)
-            *srp = 0;
-          return -1;
-        }
-
       if (srp != 0)
 	*srp = this->service_vector_[i];
       if (ignore_suspended
diff --git a/ace/Shared_Memory_MM.h b/ace/Shared_Memory_MM.h
index 3a29becf230..43d43d7cf04 100644
--- a/ace/Shared_Memory_MM.h
+++ b/ace/Shared_Memory_MM.h
@@ -29,11 +29,6 @@ class ACE_Export ACE_Shared_Memory_MM : public ACE_Shared_Memory
 {
   // = TITLE
   //     Shared memory wrapper based on MMAP.
-  //
-  // = DESCRIPTION
-  //     This class provides a very simple-minded shared memory
-  //     manager.  For more a powerful memory allocator please see
-  //     <ACE_Malloc>.  
 public:
   // = Initialization and termination methods.
   ACE_Shared_Memory_MM (void);
diff --git a/ace/Shared_Memory_SV.h b/ace/Shared_Memory_SV.h
index 104175f158c..f2a760a0034 100644
--- a/ace/Shared_Memory_SV.h
+++ b/ace/Shared_Memory_SV.h
@@ -29,11 +29,6 @@ class ACE_Export ACE_Shared_Memory_SV : public ACE_Shared_Memory
 {
   // = TITLE
   //     Shared memory wrapper based on System V shared memory.
-  //
-  // = DESCRIPTION
-  //     This class provides a very simple-minded shared memory
-  //     manager.  For more a powerful memory allocator please see
-  //     <ACE_Malloc>.  
 public:
   enum
     {
diff --git a/ace/Signal.i b/ace/Signal.i
index c8c0cad3049..e9711a640c8 100644
--- a/ace/Signal.i
+++ b/ace/Signal.i
@@ -6,7 +6,6 @@
 
 ACE_INLINE
 ACE_Sig_Set::ACE_Sig_Set (sigset_t *ss)
-  // : sigset_ ()
 {
   ACE_TRACE ("ACE_Sig_Set::ACE_Sig_Set");
 
@@ -19,7 +18,6 @@ ACE_Sig_Set::ACE_Sig_Set (sigset_t *ss)
 
 ACE_INLINE
 ACE_Sig_Set::ACE_Sig_Set (int fill)
-  // : sigset_ ()
 {
   ACE_TRACE ("ACE_Sig_Set::ACE_Sig_Set");
 
@@ -31,7 +29,6 @@ ACE_Sig_Set::ACE_Sig_Set (int fill)
 
 ACE_INLINE
 ACE_Sig_Set::ACE_Sig_Set (ACE_Sig_Set *ss)
-  // : sigset_ ()
 {
   ACE_TRACE ("ACE_Sig_Set::ACE_Sig_Set");
 
@@ -196,7 +193,6 @@ ACE_Sig_Action::operator ACE_SIGACTION * ()
 
 ACE_INLINE
 ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Action &s)
-  // : sa_ ()
 {
   ACE_TRACE ("ACE_Sig_Action::ACE_Sig_Action");
   *this = s; // structure copy.
@@ -230,7 +226,6 @@ ACE_Sig_Action::restore_action (int signum, ACE_Sig_Action &oaction)
 
 ACE_INLINE
 ACE_Sig_Guard::ACE_Sig_Guard (ACE_Sig_Set *mask)
-  : omask_ ()
 {
   //ACE_TRACE ("ACE_Sig_Guard::ACE_Sig_Guard");
 
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 3ebca15eed5..da3a7ff6f18 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -63,30 +63,29 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
           // 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.
+          // so the preallocated lock is not available.
 #endif /* ACE_MT_SAFE */
-
           ACE_NEW_RETURN (singleton, (ACE_Singleton<TYPE, ACE_LOCK>), 0);
 
+          // Register for destruction with ACE_Object_Manager.
+          ACE_Object_Manager::at_exit (singleton);
 #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_Singleton
-          // instantiation.
+          // is static, so we only obtain one per ACE_Singleton instantiation.
           static ACE_LOCK *lock = 0;
           if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
+            // Failed to allocate the lock!
             return 0;
 
           ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
 
           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);
@@ -155,13 +154,12 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // 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.
+          // so the preallocated lock is not available.
 #endif /* ACE_MT_SAFE */
-
           ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0);
 
+          // Register for destruction with ACE_Object_Manager.
+          ACE_Object_Manager::at_exit (singleton);
 #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
         }
       else
@@ -170,15 +168,15 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
           // is static, so we only obtain one per ACE_Singleton instantiation.
           static ACE_LOCK *lock = 0;
           if (ACE_Object_Manager::get_singleton_lock (lock) != 0)
-            // Failed to acquire the lock!
+            // Failed to allocate the lock!
             return 0;
 
           ACE_GUARD_RETURN (ACE_LOCK, ace_mon, *lock, 0);
 
           if (singleton == 0)
             {
-              ACE_NEW_RETURN (singleton, (ACE_TSS_Singleton<TYPE, ACE_LOCK>),
-                              0);
+              ACE_NEW_RETURN (singleton,
+                              (ACE_TSS_Singleton<TYPE, ACE_LOCK>), 0);
 
               // Register for destruction with ACE_Object_Manager.
               ACE_Object_Manager::at_exit (singleton);
diff --git a/ace/Strategies_T.cpp b/ace/Strategies_T.cpp
index 916fafdc17d..d9c8c3a8843 100644
--- a/ace/Strategies_T.cpp
+++ b/ace/Strategies_T.cpp
@@ -291,31 +291,6 @@ ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler
                                    perms);
 }
 
-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)
-{
-  ACE_TRACE ("ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::connect_svc_handler");
-
-  int result =
-    this->connector_.connect (sh->peer (),
-                              remote_addr,
-                              timeout,
-                              local_addr,
-                              reuse_addr,
-                              flags,
-                              perms);
-  sh_copy = sh;
-  return result;
-}
-
 template <class SVC_HANDLER> int
 ACE_Process_Strategy<SVC_HANDLER>::open (size_t n_processes,
                                          ACE_Event_Handler *acceptor,
@@ -647,75 +622,51 @@ ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::connect_s
   // lock *before* registering the newly created handler with the
   // Reactor.
   {
-    // Synchronization is required here as the setting of the
-    // recyclable state must be done atomically with the finding and
-    // binding of the service handler in the cache.
-    ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-    int result = this->connect_svc_handler_i (sh,
-                                              remote_addr,
-                                              timeout,
-                                              local_addr,
-                                              reuse_addr,
-                                              flags,
-                                              perms,
-                                              found);
-    if (result != 0)
-      return result;
-
-  }
-
-  // If it is a new connection, activate it.
-  //
-  // Note: This activation is outside the scope of the lock of the
-  // cached connector.  This is necessary to avoid subtle deadlock
-  // conditions with this lock and the Reactor lock.
-  //
-  // @@ If an error occurs on activation, we should try to remove this
-  // entry from the internal table.
-
-  if (!found)
-    if (this->activate_svc_handler (sh))
-      return -1;
-
-  return 0;
-}
-
-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)
-{
-  int found = 0;
+    CONNECTION_MAP_ENTRY *entry = 0;
 
-  // This artificial scope is required since we need to let go of the
-  // lock *before* registering the newly created handler with the
-  // Reactor.
-  {
     // Synchronization is required here as the setting of the
     // recyclable state must be done atomically with the finding and
     // binding of the service handler in the cache.
     ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
 
-    int result = this->connect_svc_handler_i (sh,
-                                              remote_addr,
-                                              timeout,
-                                              local_addr,
-                                              reuse_addr,
-                                              flags,
-                                              perms,
-                                              found);
-    sh_copy = sh;
-
-    if (result != 0)
-      return result;
-
+    // Check if the user passed a hint svc_handler
+    if (sh != 0)
+      {
+        int result = this->check_hint_i (sh,
+                                         remote_addr,
+                                         timeout,
+                                         local_addr,
+                                         reuse_addr,
+                                         flags,
+                                         perms,
+                                         entry,
+                                         found);
+        if (result != 0)
+          return result;
+      }
+
+    // If not found
+    if (!found)
+      {
+        int result = this->find_or_create_svc_handler_i (sh,
+                                                         remote_addr,
+                                                         timeout,
+                                                         local_addr,
+                                                         reuse_addr,
+                                                         flags,
+                                                         perms,
+                                                         entry,
+                                                         found);
+        if (result != 0)
+          return result;
+      }
+
+    // For all successful cases: mark the <svc_handler> in the cache
+    // as being <in_use>.  Therefore recyclable is BUSY.
+    entry->ext_id_.state (ACE_Recyclable::BUSY);
+
+    // And increment the refcount
+    entry->ext_id_.increment ();
   }
 
   // If it is a new connection, activate it.
@@ -735,61 +686,6 @@ 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)
-{
-  CONNECTION_MAP_ENTRY *entry = 0;
-
-  // Check if the user passed a hint svc_handler
-  if (sh != 0)
-    {
-      int result = this->check_hint_i (sh,
-                                       remote_addr,
-                                       timeout,
-                                       local_addr,
-                                       reuse_addr,
-                                       flags,
-                                       perms,
-                                       entry,
-                                       found);
-      if (result != 0)
-        return result;
-    }
-
-  // If not found
-  if (!found)
-    {
-      int result = this->find_or_create_svc_handler_i (sh,
-                                                       remote_addr,
-                                                       timeout,
-                                                       local_addr,
-                                                       reuse_addr,
-                                                       flags,
-                                                       perms,
-                                                       entry,
-                                                       found);
-      if (result != 0)
-        return result;
-    }
-
-  // For all successful cases: mark the <svc_handler> in the cache
-  // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.state (ACE_Recyclable::BUSY);
-  
-  // And increment the refcount
-  entry->ext_id_.increment ();
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class MUTEX> int
 ACE_Cached_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2, MUTEX>::cache (const void *recycling_act)
 {
   // Synchronization is required here as the setting of the recyclable
diff --git a/ace/Strategies_T.h b/ace/Strategies_T.h
index 4dab6f2c292..d8703ce1b47 100644
--- a/ace/Strategies_T.h
+++ b/ace/Strategies_T.h
@@ -483,18 +483,6 @@ public:
   // The default behavior delegates to the <connect> method of the
   // <PEER_CONNECTOR::connect>.
 
-  virtual int 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);
-  // The default behavior delegates to the <connect> method of the
-  // <PEER_CONNECTOR::connect>.
-  // Please check the documentation in Connector.h for more details.
-
   void dump (void) const;
   // Dump the state of an object.
 
@@ -778,14 +766,6 @@ public:
                                    int reuse_addr,
                                    int flags,
                                    int perms);
-  virtual int 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);
   // Checks to see if there is already a <SVC_HANDLER> in the cache
   // connected to the <remote_addr>.  If so, we return this pointer.
   // Otherwise we establish the connection, put it into the cache, and
@@ -863,15 +843,6 @@ protected:
                     ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, SVC_HANDLER *> *&entry,
                     int &found);
 
-  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,
diff --git a/ace/Svc_Conf.h b/ace/Svc_Conf.h
index 76da4a83507..78cabe6d039 100644
--- a/ace/Svc_Conf.h
+++ b/ace/Svc_Conf.h
@@ -41,9 +41,6 @@
 void ace_yyrestart (FILE *);
 // Restart input file parsing
 
-void ace_yy_delete_parse_buffer (void);
-// Delete the lexer's parse buffer
-
 int ace_yyparse (void);
 // Performs the parsing
 
diff --git a/ace/Svc_Conf.l b/ace/Svc_Conf.l
index 75594f25db8..9ac99604cb8 100644
--- a/ace/Svc_Conf.l
+++ b/ace/Svc_Conf.l
@@ -82,17 +82,6 @@ yywrap (void)
   yyleng = 0;
 
   // This needs to be freed to prevent a memory leak.
-  yy_delete_parse_buffer ();
-
+  yy_delete_buffer (yy_current_buffer);
   return 1;
 }
-
-void
-yy_delete_parse_buffer (void)
-{
-  if (yy_current_buffer != 0) 
-    {
-      yy_delete_buffer (yy_current_buffer);
-      yy_current_buffer = 0;
-    }
-}
diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y
index 921d2b0a8dc..3db61bf08e8 100644
--- a/ace/Svc_Conf.y
+++ b/ace/Svc_Conf.y
@@ -179,11 +179,7 @@ module
       ACE_Module_Type *mt = ace_get_module ($<static_node_>-1, $<static_node_>1->name ());
 
       if (((ACE_Stream_Type *) ($<static_node_>-1)->record ()->type ())->push (mt) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Problem with static\n")));
-          yyerrno++;
-        }
+        yyerrno++;
     }
   | suspend
     {
@@ -245,9 +241,6 @@ svc_location
         }
       else
         {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Unable to find service: %s\n"),
-                      ASYS_WIDE_STRING ($1)));
           ++yyerrno;
           $$ = 0;
         }
@@ -367,12 +360,13 @@ ace_get_module (ACE_Static_Node *str_rec,
   type = sv->type ();
   ACE_Module_Type *mt = (ACE_Module_Type *) type;
   const char *module_type_name = svc_type->name ();
+  const ASYS_TCHAR *wname = ASYS_WIDE_STRING (module_type_name);
 
   if (sr == 0 || st == 0 || mt == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("cannot locate Module_Type %s or STREAM_Type %s\n"),
-                  ASYS_WIDE_STRING (module_type_name),
+                  wname,
                   ASYS_WIDE_STRING (str_rec->name ())));
       yyerrno++;
     }
@@ -381,13 +375,13 @@ ace_get_module (ACE_Static_Node *str_rec,
   // Module_Type object from the svc.conf file.
   ACE_Module<ACE_SYNCH> *mp = (ACE_Module<ACE_SYNCH> *) mt->object ();
 
-  if (ACE_OS::strcmp (mp->name (), ASYS_WIDE_STRING (module_type_name)) != 0)
+  if (ACE_OS::strcmp (mp->name (), wname) != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("warning: assigning Module_Type name %s to Module %s since names differ\n"),
-                  ASYS_WIDE_STRING (module_type_name),
+                  wname,
                   mp->name ()));
-      mp->name (ASYS_WIDE_STRING (module_type_name));
+      mp->name (wname);
     }
 
   return mt;
@@ -411,18 +405,18 @@ ace_create_service_type (const ASYS_TCHAR *name,
     case ACE_SVC_OBJ_T:
       ACE_NEW_RETURN (stp,
                       ACE_Service_Object_Type ((ACE_Service_Object *) symbol,
-                                               name, flags,
+                                               ASYS_WIDE_STRING (name), flags,
                                                gobbler),
                       0);
       break;
     case ACE_MODULE_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Module_Type (symbol, name, flags),
+                      ACE_Module_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     case ACE_STREAM_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Stream_Type (symbol, name, flags),
+                      ACE_Stream_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     default:
diff --git a/ace/Svc_Conf_l.cpp b/ace/Svc_Conf_l.cpp
index 1b6816ab067..f3a38221341 100644
--- a/ace/Svc_Conf_l.cpp
+++ b/ace/Svc_Conf_l.cpp
@@ -1545,17 +1545,6 @@ ace_yywrap (void)
   ace_yyleng = 0;
 
   // This needs to be freed to prevent a memory leak.
-  ace_yy_delete_parse_buffer ();
-
+  ace_yy_delete_buffer (ace_yy_current_buffer);
   return 1;
 }
-
-void
-ace_yy_delete_parse_buffer (void)
-{
-  if (ace_yy_current_buffer != 0) 
-    {
-      ace_yy_delete_buffer (ace_yy_current_buffer);
-      ace_yy_current_buffer = 0;
-    }
-}
diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp
index d92ca5f05bc..65579df2a2b 100644
--- a/ace/Svc_Conf_y.cpp
+++ b/ace/Svc_Conf_y.cpp
@@ -249,7 +249,7 @@ ACE_YYSTYPE ace_yylval;
 #define ace_yystacksize ACE_YYSTACKSIZE
 short ace_yyss[ACE_YYSTACKSIZE];
 ACE_YYSTYPE ace_yyvs[ACE_YYSTACKSIZE];
-#line 314 "Svc_Conf.y"
+#line 307 "Svc_Conf.y"
 // Prints the error string to standard output.  Cleans up the error
 // messages.
 
@@ -305,7 +305,7 @@ ace_get_module (ACE_Static_Node *str_rec,
   const ACE_Service_Type *sv = svc_type->record ();
   type = sv->type ();
   ACE_Module_Type *mt = (ACE_Module_Type *) type;
-  const char *module_type_name = svc_type->name ();
+  ASYS_TCHAR *module_type_name = ACE_const_cast (ASYS_TCHAR *, svc_type->name ());
 
   if (sr == 0 || st == 0 || mt == 0)
     {
@@ -350,18 +350,18 @@ ace_create_service_type (const ASYS_TCHAR *name,
     case ACE_SVC_OBJ_T:
       ACE_NEW_RETURN (stp,
                       ACE_Service_Object_Type ((ACE_Service_Object *) symbol,
-                                               name, flags,
+                                               ASYS_WIDE_STRING (name), flags,
                                                gobbler),
                       0);
       break;
     case ACE_MODULE_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Module_Type (symbol, name, flags),
+                      ACE_Module_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     case ACE_STREAM_T:
       ACE_NEW_RETURN (stp,
-                      ACE_Stream_Type (symbol, name, flags),
+                      ACE_Stream_Type (symbol, ASYS_WIDE_STRING (name), flags),
                       0);
       break;
     default:
@@ -395,7 +395,7 @@ main (int argc, char *argv[])
   return ace_yyparse ();
 }
 #endif /* DEBUGGING */
-#line 399 "Svc_Conf_y.cpp"
+#line 400 "Svc_Conf_y.cpp"
 #define ACE_YYABORT goto ace_yyabort
 #define ACE_YYACCEPT goto ace_yyaccept
 #define ACE_YYERROR goto ace_yyerrlab
@@ -841,15 +841,11 @@ case 26:
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_, ace_yyvsp[0].static_node_->name ());
 
       if (((ACE_Stream_Type *) (ace_yyvsp[-2].static_node_)->record ()->type ())->push (mt) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Problem with static\n")));
-          ace_yyerrno++;
-        }
+        ace_yyerrno++;
     }
 break;
 case 27:
-#line 189 "Svc_Conf.y"
+#line 185 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -858,7 +854,7 @@ case 27:
     }
 break;
 case 28:
-#line 196 "Svc_Conf.y"
+#line 192 "Svc_Conf.y"
 {
       ACE_Module_Type *mt = ace_get_module (ace_yyvsp[-2].static_node_,
                                             ace_yyvsp[0].static_node_->name ());
@@ -867,7 +863,7 @@ case 28:
     }
 break;
 case 29:
-#line 203 "Svc_Conf.y"
+#line 199 "Svc_Conf.y"
 {
       ACE_Static_Node *stream = ace_yyvsp[-2].static_node_;
       ACE_Static_Node *module = ace_yyvsp[0].static_node_;
@@ -889,7 +885,7 @@ case 29:
     }
 break;
 case 30:
-#line 226 "Svc_Conf.y"
+#line 222 "Svc_Conf.y"
 {
       u_int flags
         = ACE_Service_Type::DELETE_THIS
@@ -912,9 +908,6 @@ case 30:
         }
       else
         {
-          ACE_ERROR ((LM_ERROR,
-                      ASYS_TEXT ("Unable to find service: %s\n"),
-                      ASYS_WIDE_STRING (ace_yyvsp[-3].ident_)));
           ++ace_yyerrno;
           ace_yyval.svc_record_ = 0;
         }
@@ -922,64 +915,64 @@ case 30:
     }
 break;
 case 31:
-#line 260 "Svc_Conf.y"
+#line 253 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 32:
-#line 264 "Svc_Conf.y"
+#line 257 "Svc_Conf.y"
 {
       ace_yyval.type_ = 0;
     }
 break;
 case 33:
-#line 268 "Svc_Conf.y"
+#line 261 "Svc_Conf.y"
 {
       ace_yyval.type_ = 1;
     }
 break;
 case 34:
-#line 275 "Svc_Conf.y"
+#line 268 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Object_Node (ace_yyvsp[-2].ident_, ace_yyvsp[0].ident_);
     }
 break;
 case 35:
-#line 279 "Svc_Conf.y"
+#line 272 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Function_Node (ace_yyvsp[-4].ident_, ace_yyvsp[-2].ident_);
     }
 break;
 case 36:
-#line 283 "Svc_Conf.y"
+#line 276 "Svc_Conf.y"
 {
       ace_yyval.location_node_ = new ACE_Static_Function_Node (ace_yyvsp[-2].ident_);
     }
 break;
 case 37:
-#line 290 "Svc_Conf.y"
+#line 283 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_MODULE_T;
     }
 break;
 case 38:
-#line 294 "Svc_Conf.y"
+#line 287 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_SVC_OBJ_T;
     }
 break;
 case 39:
-#line 298 "Svc_Conf.y"
+#line 291 "Svc_Conf.y"
 {
       ace_yyval.type_ = ACE_STREAM_T;
     }
 break;
 case 41:
-#line 305 "Svc_Conf.y"
+#line 298 "Svc_Conf.y"
 { ace_yyval.ident_ = 0; }
 break;
-#line 982 "Svc_Conf_y.cpp"
+#line 976 "Svc_Conf_y.cpp"
     }
     ace_yyssp -= ace_yym;
     ace_yystate = *ace_yyssp;
diff --git a/ace/Synch.cpp b/ace/Synch.cpp
index 1d2e8421c74..0d0d669b69f 100644
--- a/ace/Synch.cpp
+++ b/ace/Synch.cpp
@@ -15,12 +15,12 @@
 #include "ace/Synch.h"
 #include "ace/Object_Manager.h"
 
-ACE_RCSID(ace, Synch, "$Id$")
-
 #if !defined (__ACE_INLINE__)
 #include "ace/Synch.i"
 #endif /* __ACE_INLINE__ */
 
+ACE_RCSID(ace, Synch, "$Id$")
+
 ACE_ALLOC_HOOK_DEFINE(ACE_Null_Mutex)
 ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock)
 ACE_ALLOC_HOOK_DEFINE(ACE_RW_Process_Mutex)
@@ -614,103 +614,140 @@ ACE_Thread_Mutex_Guard::dump (void) const
 
 ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (LPCTSTR name,
                                                         void *arg)
-  : removed_ (0)
+#if !defined (ACE_WIN32)
+  : nesting_mutex_ (name, arg),
+    lock_available_ (nesting_mutex_, name, arg),
+    nesting_level_ (0),
+    owner_id_ (ACE_OS::NULL_thread),
+#else /* ACE_WIN32 */
+  : ACE_Thread_Mutex (name, arg),
+#endif /* ACE_WIN32 */
+    removed_ (0)
 {
-  // ACE_TRACE ("ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex");
 #if defined (ACE_HAS_FSU_PTHREADS) && ! defined (ACE_WIN32)
-  // Initialize FSU pthreads package.  If called more than once,
-  // pthread_init does nothing and so does no harm.
+//      Initialize FSU pthreads package.
+//      If called more than once, pthread_init does nothing
+//      and so does no harm.
    pthread_init ();
 #endif  /*  ACE_HAS_FSU_PTHREADS && ! ACE_WIN32 */
-   if (ACE_OS::recursive_mutex_init (&this->recursive_mutex_,
-                                     name,
-                                     arg) == -1)
-     ACE_ERROR ((LM_ERROR,
-                 ASYS_TEXT ("%p\n"),
-                 ASYS_TEXT ("recursive_mutex_init")));
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex");
 }
 
+#if !defined (ACE_WIN32)
 ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex)
 
-ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex (void)
-{
-  // ACE_TRACE ("ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex");
-  this->remove ();
-}
-
-int
-ACE_Recursive_Thread_Mutex::remove (void)
-{
-// ACE_TRACE ("ACE_Recursive_Thread_Mutex::remove");
-  int result = 0;
-  if (this->removed_ == 0)
-    {
-      this->removed_ = 1;
-      result = ACE_OS::recursive_mutex_destroy (&this->recursive_mutex_);
-    }
-  return result;
-}
-
-// The counter part of the following two functions for Win32 are
-// located in file Synch.i
+// The counter part of the following two functions for Win32
+// are located in file Synch.i
 ACE_thread_t
 ACE_Recursive_Thread_Mutex::get_thread_id (void)
 {
-  // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_thread_id");
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  // @@ The structure CriticalSection in Win32 doesn't hold the thread
-  // handle of the thread that owns the lock.  However it is still not
-  // clear at this point how to translate a thread handle to its
-  // corresponding thread id.
-  errno = ENOTSUP;
-  return ACE_OS::NULL_thread;
-#else
-  ACE_thread_t owner_id;
-  ACE_OS::mutex_lock (&this->recursive_mutex_.nesting_mutex_);
-  owner_id = this->recursive_mutex_.owner_id_;
-  ACE_OS::mutex_unlock (&this->recursive_mutex_.nesting_mutex_);
-  return owner_id;
-#endif /* ACE_WIN32 */
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_thread_id");
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->nesting_mutex_, ACE_OS::NULL_thread);
+  return this->owner_id_;
 }
 
 int
 ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 {
-  // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level");
-#if defined (ACE_HAS_WINCE) || defined (VXWORKS)
-  ACE_NOTSUP_RETURN (-1);
-#elif defined (ACE_HAS_RECURSIVE_MUTEXES)
-  // This is really a Win32-ism...
-  return this->recursive_mutex_.RecursionCount;
-#else
-  int nesting_level = 0;
-  ACE_OS::mutex_lock (&this->recursive_mutex_.nesting_mutex_);
-  nesting_level = this->recursive_mutex_.nesting_level_;
-  ACE_OS::mutex_unlock (&this->recursive_mutex_.nesting_mutex_);
-  return nesting_level;
-#endif /* !ACE_HAS_WINCE */
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level");
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->nesting_mutex_, -1);
+  return this->nesting_level_;
 }
 
-ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &)
+ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &rm)
+  : lock_available_ ((ACE_Thread_Mutex &) rm.nesting_mutex_)
 {
 }
 
 int
 ACE_Recursive_Thread_Mutex::acquire (void)
 {
-  return ACE_OS::recursive_mutex_lock (&this->recursive_mutex_);
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::acquire");
+  ACE_thread_t t_id = ACE_Thread::self ();
+
+  // Acquire the guard.
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->nesting_mutex_, -1);
+
+  // If there's no contention, just grab the lock immediately (since
+  // this is the common case we'll optimize for it).
+  if (this->nesting_level_ == 0)
+    this->set_thread_id (t_id);
+  // If we already own the lock, then increment the nesting level and
+  // return.
+  else if (ACE_OS::thr_equal (t_id, this->owner_id_) == 0)
+    {
+      // Wait until the nesting level has dropped to zero, at which
+      // point we can acquire the lock.
+      while (this->nesting_level_ > 0)
+        this->lock_available_.wait ();
+
+      // Note that at this point the nesting_mutex_ is held...
+      this->set_thread_id (t_id);
+    }
+
+  // At this point, we can safely increment the nesting_level_ no
+  // matter how we got here!
+  this->nesting_level_++;
+  return 0;
 }
 
 int
 ACE_Recursive_Thread_Mutex::release (void)
 {
-  return ACE_OS::recursive_mutex_unlock (&this->recursive_mutex_);
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::release");
+#if !defined (ACE_NDEBUG)
+  ACE_thread_t t_id = ACE_Thread::self ();
+#endif /* ACE_NDEBUG */
+
+  // Automatically acquire mutex.
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->nesting_mutex_, -1);
+
+#if !defined (ACE_NDEBUG)
+  if (this->nesting_level_ == 0
+      || ACE_OS::thr_equal (t_id, this->owner_id_) == 0)
+    {
+      errno = EINVAL;
+      ACE_RETURN (-1);
+    }
+#endif /* ACE_NDEBUG */
+
+  this->nesting_level_--;
+  if (this->nesting_level_ == 0)
+    {
+      // This may not be strictly necessary, but it does put the mutex
+      // into a known state...
+      this->set_thread_id (ACE_OS::NULL_thread);
+
+      // Inform waiters that the lock is free.
+      this->lock_available_.signal ();
+    }
+  return 0;
 }
 
 int
 ACE_Recursive_Thread_Mutex::tryacquire (void)
 {
-  return ACE_OS::recursive_mutex_trylock (&this->recursive_mutex_);
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::tryacquire");
+  ACE_thread_t t_id = ACE_Thread::self ();
+
+  ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->nesting_mutex_, -1);
+
+  // If there's no contention, just grab the lock immediately.
+  if (this->nesting_level_ == 0)
+    {
+      this->set_thread_id (t_id);
+      this->nesting_level_ = 1;
+    }
+  // If we already own the lock, then increment the nesting level and
+  // proceed.
+  else if (ACE_OS::thr_equal (t_id, this->owner_id_))
+    this->nesting_level_++;
+  else
+    {
+      errno = EBUSY;
+      ACE_RETURN (-1);
+    }
+  return 0;
 }
 
 void
@@ -719,8 +756,17 @@ ACE_Recursive_Thread_Mutex::dump (void) const
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
+  this->lock_available_.dump ();
+  this->nesting_mutex_.dump ();
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("nesting_level_ = %d"), this->nesting_level_));
+#if !defined (ACE_HAS_PTHREADS)
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\nowner_id_ = %u"), this->owner_id_));
+#else
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT("\n")));
+#endif /* !ACE_HAS_DCETHREADS */
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
+#endif /* ! ACE_WIN32 */
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Condition_Thread_Mutex)
 
@@ -990,13 +1036,11 @@ ACE_RW_Thread_Mutex::dump (void) const
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 // These are only specialized with ACE_HAS_THREADS.
-template class ACE_Guard<ACE_Thread_Mutex>;
 template class ACE_Guard<ACE_RW_Thread_Mutex>;
 template class ACE_Read_Guard<ACE_RW_Thread_Mutex>;
 template class ACE_Write_Guard<ACE_RW_Thread_Mutex>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 // These are only specialized with ACE_HAS_THREADS.
-#pragma instantiate ACE_Guard<ACE_Thread_Mutex>
 #pragma instantiate ACE_Guard<ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Read_Guard<ACE_RW_Thread_Mutex>
 #pragma instantiate ACE_Write_Guard<ACE_RW_Thread_Mutex>
diff --git a/ace/Synch.h b/ace/Synch.h
index a15155352d1..d6aebc122a1 100644
--- a/ace/Synch.h
+++ b/ace/Synch.h
@@ -105,8 +105,7 @@ class ACE_Export ACE_Adaptive_Lock : public ACE_Lock
   //    This class, as ACE_Lock, provide a set of general locking APIs.
   //    However, it defers our decision of what kind of lock to use
   //    to the run time and delegates all locking operations to the actual
-  //    lock.  Users must define a constructor in their subclass to
-  //    initialize <lock_>.
+  //    lock.  Users must overwrite the constructor to initialize <lock_>.
 public:
   virtual ~ACE_Adaptive_Lock (void);
   // You must also override the destructor function to match with how
@@ -401,37 +400,6 @@ protected:
 #endif /* ACE_WIN32 */
 };
 
-class ACE_Export ACE_Null_Semaphore
-{
-  // = TITLE
-  //     Implement a do nothing <ACE_Semaphore>, i.e., all the methods are
-  //     no ops.
-public:
-  ACE_Null_Semaphore (u_int count = 1, // By default make this unlocked.
-		       int type = USYNC_THREAD,
-		       LPCTSTR name = 0,
-		       void * = 0,
-		       int max = 0x7fffffff);
-  ~ACE_Null_Semaphore (void);
-  int remove (void);
-
-  int acquire (ACE_Time_Value &);
-  int acquire (void);
-  int tryacquire (void);
-  int release (void);
-  int release (size_t);
-  int acquire_write (void);
-  int tryacquire_write (void);
-  int acquire_read (void);
-  int tryacquire_read (void);
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-};
-
 class ACE_Export ACE_RW_Mutex
 {
   // = TITLE
@@ -1267,10 +1235,22 @@ private:
 };
 
 class ACE_Export ACE_Recursive_Thread_Mutex
+#if defined (ACE_WIN32)
+  : public ACE_Thread_Mutex
+#endif /* ACE_WIN32 */
 {
   // = TITLE
-  //     Implement a C++ wrapper that allows nested acquisition and
-  //     release of a mutex that occurs in the same thread.
+  //     Implement a C++ wrapper that allows calls to class
+  //     <ACE_Thread_Mutex> to be nested for a nested acquire() that
+  //     occurs in the same thread.
+  //
+  // = DESCRIPTION
+  //     This class should be a specialization of the
+  //     ACE_Recursive_Lock template class, but problems with some C++
+  //     compilers preclude this.  This implementation is based
+  //     on an algorithm sketched by Dave Butenhof  <butenhof@zko.dec.com>.
+  //     Naturally, I take the credit for any mistakes ;-)
+  // friend class ACE_Condition<class ACE_COND_MUTEX>;
 public:
   ACE_Recursive_Thread_Mutex (LPCTSTR name = 0,
                               void *arg = 0);
@@ -1279,6 +1259,7 @@ public:
   ~ACE_Recursive_Thread_Mutex (void);
   // Implicitly release a recursive mutex.
 
+#if !defined (ACE_WIN32)
   int remove (void);
   // Implicitly release a recursive mutex.
 
@@ -1322,6 +1303,7 @@ public:
   // Releases a recursive mutex (will not release mutex until all the
   // nesting level drops to 0, which means the mutex is no longer
   // held).
+#endif /* ! ACE_WIN32 */
 
   ACE_thread_t get_thread_id (void);
   // Return the id of the thread that currently owns the mutex.
@@ -1332,6 +1314,7 @@ public:
   // The nesting level is incremented every time the thread acquires
   // the mutex recursively.
 
+#if !defined (ACE_WIN32)
   void dump (void) const;
   // Dump the state of an object.
 
@@ -1339,11 +1322,22 @@ public:
   // Declare the dynamic allocation hooks.
 
 protected:
-  // = This method should *not* be public (they hold no locks...)
+  // These methods should *not* be public (they hold no locks...)
   void set_thread_id (ACE_thread_t t);
 
-  ACE_recursive_thread_mutex_t recursive_mutex_;
-  // Recursive mutex.
+  ACE_Thread_Mutex nesting_mutex_;
+  // Guards the state of the nesting level and thread id.
+
+  ACE_Condition_Thread_Mutex lock_available_;
+  // This is the condition variable that actually suspends other
+  // waiting threads until the mutex is available.
+
+  int nesting_level_;
+  // Current nesting level of the recursion.
+
+  ACE_thread_t owner_id_;
+  // Current owner of the lock.
+#endif /* ! ACE_WIN32 */
 
   int removed_;
   // Keeps track of whether <remove> has been called yet to avoid
@@ -1577,9 +1571,7 @@ public:
   // = Initialization and termination methods.
   ACE_Guard (ACE_Null_Mutex &) {}
   ACE_Guard (ACE_Null_Mutex &, int) {}
-#if defined (ACE_WIN32)
   ~ACE_Guard (void) {}
-#endif /* ACE_WIN32 */
 
   int acquire (void) { return 0; }
   int tryacquire (void) { return 0; }
diff --git a/ace/Synch.i b/ace/Synch.i
index 9c0338ee89e..768a4a724c7 100644
--- a/ace/Synch.i
+++ b/ace/Synch.i
@@ -443,87 +443,6 @@ ACE_Process_Semaphore::tryacquire_write (void)
   return this->tryacquire ();
 }
 
-// Null ACE_Semaphore implementation
-
-ACE_INLINE
-ACE_Null_Semaphore::ACE_Null_Semaphore (u_int,
-                                        int,
-                                        LPCTSTR,
-                                        void *,
-                                        int)
-{
-}
-
-ACE_INLINE
-ACE_Null_Semaphore::~ACE_Null_Semaphore (void)
-{
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::remove (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::acquire (ACE_Time_Value &)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::acquire (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::tryacquire (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::release (size_t)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::release (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::acquire_write (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::tryacquire_write (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::acquire_read (void)
-{
-  return 0;
-}
-
-ACE_INLINE int
-ACE_Null_Semaphore::tryacquire_read (void)
-{
-  return 0;
-}
-
-ACE_INLINE void
-ACE_Null_Semaphore::dump (void) const
-{
-}
-
 #if defined (ACE_HAS_THREADS)
 
 ACE_INLINE const ACE_thread_mutex_t &
@@ -704,48 +623,93 @@ ACE_Condition_Thread_Mutex::mutex (void)
   return this->mutex_;
 }
 
+ACE_INLINE
+ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex (void)
+{
+  // ACE_TRACE ("ACE_Recursive_Thread_Mutex::~ACE_Recursive_Thread_Mutex");
+}
+
+#if !defined (ACE_WIN32)
+ACE_INLINE int
+ACE_Recursive_Thread_Mutex::remove (void)
+{
+// ACE_TRACE ("ACE_Recursive_Thread_Mutex::remove");
+  int result = 0;
+  if (this->removed_ == 0)
+    {
+      this->removed_ = 1;
+      this->nesting_mutex_.remove ();
+      result = this->lock_available_.remove ();
+    }
+  return result;
+}
+
 ACE_INLINE void
 ACE_Recursive_Thread_Mutex::set_thread_id (ACE_thread_t t)
 {
 // ACE_TRACE ("ACE_Recursive_Thread_Mutex::set_thread_id");
-#if defined (ACE_HAS_RECURSIVE_MUTEXES)
-  ACE_UNUSED_ARG (t);
-#else  /* ! ACE_HAS_RECURSIVE_MUTEXES */
-  this->recursive_mutex_.owner_id_ = t;
-#endif /* ! ACE_HAS_RECURSIVE_MUTEXES */
+  this->owner_id_ = t;
 }
 
 ACE_INLINE int
 ACE_Recursive_Thread_Mutex::acquire_read (void)
 {
-  return this->acquire ();
+  return acquire ();
 }
 
 ACE_INLINE int
 ACE_Recursive_Thread_Mutex::acquire_write (void)
 {
-  return this->acquire ();
+  return acquire ();
 }
 
 ACE_INLINE int
 ACE_Recursive_Thread_Mutex::tryacquire_read (void)
 {
-  return this->tryacquire ();
+  return tryacquire ();
 }
 
 ACE_INLINE int
 ACE_Recursive_Thread_Mutex::tryacquire_write (void)
 {
-  return this->tryacquire ();
+  return tryacquire ();
+}
+
+#else /* ACE_WIN32 */
+// The counter part of the following two functions for non-Win32 platforms
+// are located in file Synch.cpp
+ACE_INLINE ACE_thread_t
+ACE_Recursive_Thread_Mutex::get_thread_id (void)
+{
+  // @@ The structure CriticalSection in Win32 doesn't hold
+  // the thread handle of the thread that owns the lock.  However
+  // it is still not clear at this point how to translate a
+  // thread handle to its corresponding thread id.
+  errno = ENOTSUP;
+  return ACE_OS::NULL_thread;
 }
 
+ACE_INLINE int
+ACE_Recursive_Thread_Mutex::get_nesting_level (void)
+{
+#if defined (ACE_HAS_WINCE)
+  errno = ENOTSUP;
+  return -1;                    // @@ Is this the right value to return?
+#else
+  return this->lock_.RecursionCount;
+#endif /* ! ACE_HAS_WINCE */
+}
+
+#endif /* ACE_WIN32 */
+
 #endif /* ACE_HAS_THREADS */
 
 // Explicitly destroy the mutex.
 ACE_INLINE int
 ACE_Process_Mutex::remove (void)
 {
-  return this->lock_.remove ();
+  int retv = this->lock_.remove ();
+  return retv;
 }
 
 // Acquire lock ownership (wait on priority queue if necessary).
diff --git a/ace/Synch_Options.cpp b/ace/Synch_Options.cpp
index e3ed2627f1d..dff6dfb9b20 100644
--- a/ace/Synch_Options.cpp
+++ b/ace/Synch_Options.cpp
@@ -1,3 +1,4 @@
+// Synch_Options.cpp
 // $Id$
 
 #define ACE_BUILD_DLL
@@ -18,20 +19,19 @@ ACE_Synch_Options::dump (void) const
 }
 
 // Static initialization.
-// Note: these three objects require static construction and destruction.
 
-/* static */
+/* static */ 
 ACE_Synch_Options ACE_Synch_Options::defaults;
 
-/* static */
+/* static */ 
 ACE_Synch_Options ACE_Synch_Options::synch;
 
-/* static */
+/* static */ 
 ACE_Synch_Options ACE_Synch_Options::asynch (ACE_Synch_Options::USE_REACTOR);
 
 ACE_Synch_Options::ACE_Synch_Options (u_long options,
-                                      const ACE_Time_Value &timeout,
-                                      const void *arg)
+				      const ACE_Time_Value &timeout,
+				      const void *arg)
 {
   // ACE_TRACE ("ACE_Synch_Options::ACE_Synch_Options");
   this->set (options, timeout, arg);
@@ -39,17 +39,13 @@ ACE_Synch_Options::ACE_Synch_Options (u_long options,
 
 void
 ACE_Synch_Options::set (u_long options,
-                        const ACE_Time_Value &timeout,
-                        const void *arg)
+			const ACE_Time_Value &timeout,
+			const void *arg)
 {
   // ACE_TRACE ("ACE_Synch_Options::set");
   this->options_ = options;
   this->timeout_ = (ACE_Time_Value &) timeout;
 
-  // Whoa, possible dependence on static initialization here.  This
-  // function is called during initialization of the statics above.
-  // But, ACE_Time_Value::zero is a static object.  Very fortunately,
-  // its bits have a value of 0.
   if (this->timeout_ != ACE_Time_Value::zero)
     ACE_SET_BITS (this->options_, ACE_Synch_Options::USE_TIMEOUT);
 
@@ -63,7 +59,7 @@ ACE_Synch_Options::operator[] (u_long option) const
   return (this->options_ & option) != 0;
 }
 
-void
+void 
 ACE_Synch_Options::operator= (u_long option)
 {
   ACE_TRACE ("ACE_Synch_Options::operator=");
@@ -77,7 +73,7 @@ ACE_Synch_Options::timeout (void) const
   return this->timeout_;
 }
 
-void
+void 
 ACE_Synch_Options::timeout (ACE_Time_Value &tv)
 {
   ACE_TRACE ("ACE_Synch_Options::timeout");
@@ -104,3 +100,4 @@ ACE_Synch_Options::arg (const void *a)
   ACE_TRACE ("ACE_Synch_Options::arg");
   this->arg_ = a;
 }
+
diff --git a/ace/Synch_T.cpp b/ace/Synch_T.cpp
index 4984d772f13..d72e8b2452c 100644
--- a/ace/Synch_T.cpp
+++ b/ace/Synch_T.cpp
@@ -35,13 +35,6 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (void)
   ACE_NEW (this->lock_, ACE_LOCKING_MECHANISM);
 }
 
-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>
 ACE_Test_and_Set<ACE_LOCK, TYPE>::ACE_Test_and_Set (TYPE initial_value)
   : is_set_ (initial_value)
@@ -107,8 +100,7 @@ ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op (const TYPE &c)
 // ACE_TRACE ("ACE_Atomic_Op<ACE_LOCK, TYPE>::ACE_Atomic_Op");
 }
 
-// ****************************************************************
-// ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
+ACE_ALLOC_HOOK_DEFINE(ACE_Guard)
 
 template <class ACE_LOCK> void
 ACE_Guard<ACE_LOCK>::dump (void) const
@@ -121,7 +113,7 @@ ACE_Guard<ACE_LOCK>::dump (void) const
   ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
 }
 
-// ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
+ACE_ALLOC_HOOK_DEFINE(ACE_Write_Guard)
 
 template <class ACE_LOCK> void
 ACE_Write_Guard<ACE_LOCK>::dump (void) const
@@ -130,7 +122,7 @@ ACE_Write_Guard<ACE_LOCK>::dump (void) const
   ACE_Guard<ACE_LOCK>::dump ();
 }
 
-// ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
+ACE_ALLOC_HOOK_DEFINE(ACE_Read_Guard)
 
 template <class ACE_LOCK> void
 ACE_Read_Guard<ACE_LOCK>::dump (void) const
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index b89d1b0a707..0447145a972 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -96,72 +96,6 @@ private:
   // the lock
 };
 
-template <class ACE_LOCKING_MECHANISM>
-class ACE_Reverse_Lock : public ACE_Lock
-{
-  // = TITLE
-  //     A reverse (or anti) lock.
-  //
-  // = DESCRIPTION
-  //     This is an interesting adapter class that changes a lock into
-  //     a reverse lock, i.e., acquire() on this class calls release()
-  //     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.
-public:
-  typedef ACE_LOCKING_MECHANISM ACE_LOCK;
-
-  // = Initialization/Finalization methods.
-
-  ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock);
-  // Constructor. All locking requests will be forwarded to <lock>.
-
-  virtual ~ACE_Reverse_Lock (void);
-  // Destructor. If <lock_> was not passed in by the user, it will be
-  // deleted.
-
-  // = Lock accessors.
-  virtual int acquire (void);
-  // Release the lock.
-
-  virtual int tryacquire (void);
-  // Release the lock.
-
-  virtual int release (void);
-  // Acquire the lock.
-
-  virtual int acquire_read (void);
-  // Release the lock.
-
-  virtual int acquire_write (void);
-  // Release the lock.
-
-  virtual int tryacquire_read (void);
-  // Release the lock.
-
-  virtual int tryacquire_write (void);
-  // Release the lock.
-
-  virtual int remove (void);
-  // Explicitly destroy the lock.
-
-private:
-  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>
 class ACE_Test_and_Set : public ACE_Event_Handler
 {
@@ -438,6 +372,8 @@ class ACE_Guard
   //     <remove> methods.
 public:
 
+#if defined (ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE)
+
   // = Initialization and termination methods.
   ACE_Guard (ACE_LOCK &l);
 
@@ -467,6 +403,62 @@ public:
   int remove (void);
   // Explicitly remove the lock.
 
+#else
+
+  // = Initialization and termination methods.
+  ACE_Guard (ACE_LOCK &l): lock_ (&l)
+  {
+    this->acquire ();
+  }
+
+  ACE_Guard (ACE_LOCK &l, int block): lock_ (&l)
+    {
+      if (block)
+        this->acquire ();
+      else
+        this->tryacquire ();
+    }
+  // Implicitly and automatically acquire (or try to acquire) the
+  // lock.
+
+  ~ACE_Guard (void)
+  {
+    int error = errno;
+    this->release ();
+    errno = error;
+  }
+  // Implicitly release the lock.
+
+  // = Lock accessors.
+
+  int acquire (void) { return this->owner_ = this->lock_->acquire (); }
+  // Explicitly acquire the lock.
+
+  int tryacquire (void) { return this->owner_ = this->lock_->tryacquire (); }
+  // Conditionally acquire the lock (i.e., won't block).
+
+  int release (void)
+    {
+      if (this->owner_ != -1)
+        {
+          this->owner_ = -1;
+          return this->lock_->release ();
+        }
+      else
+        return 0;
+    }
+  // Explicitly release the lock, but only if it is held!
+
+  // = Utility methods.
+  int locked (void) { return this->owner_ != -1; }
+  // 1 if locked, 0 if couldn't acquire the lock
+  // (errno will contain the reason for this).
+
+  int remove (void) { return this->lock_->remove (); }
+  // Explicitly remove the lock.
+
+#endif /* defined (ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE) */
+
   void dump (void) const;
   // Dump the state of an object.
 
@@ -869,7 +861,7 @@ public:
   typedef ACE_Null_Mutex RECURSIVE_MUTEX;
   typedef ACE_Null_Mutex RW_MUTEX;
   typedef ACE_Null_Condition CONDITION;
-  typedef ACE_Null_Semaphore SEMAPHORE;
+  typedef ACE_Null_Mutex SEMAPHORE;
   typedef ACE_Null_Mutex NULL_SEMAPHORE;
 };
 
@@ -891,7 +883,7 @@ public:
   typedef ACE_RW_Thread_Mutex RW_MUTEX;
   typedef ACE_Condition_Thread_Mutex CONDITION;
   typedef ACE_Thread_Semaphore SEMAPHORE;
-  typedef ACE_Null_Semaphore NULL_SEMAPHORE;
+  typedef ACE_Null_Mutex NULL_SEMAPHORE;
 };
 
 #endif /* ACE_HAS_THREADS */
@@ -922,7 +914,7 @@ public:
 #define ACE_SYNCH_RW_MUTEX ACE_RW_Thread_Mutex
 #define ACE_SYNCH_CONDITION ACE_Condition_Thread_Mutex
 #define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore
-#define ACE_SYNCH_NULL_SEMAPHORE  ACE_Null_Semaphore
+#define ACE_SYNCH_NULL_SEMAPHORE  ACE_Null_Mutex
 
 #else /* ACE_HAS_THREADS */
 
@@ -931,7 +923,7 @@ public:
 #define ACE_SYNCH_RECURSIVE_MUTEX ACE_Null_Mutex
 #define ACE_SYNCH_RW_MUTEX ACE_Null_Mutex
 #define ACE_SYNCH_CONDITION ACE_Null_Condition
-#define ACE_SYNCH_SEMAPHORE ACE_Null_Semaphore
+#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore
 #define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/Synch_T.i b/ace/Synch_T.i
index 52445c8750b..f6cd64770ca 100644
--- a/ace/Synch_T.i
+++ b/ace/Synch_T.i
@@ -5,23 +5,24 @@
 
 #include "ace/Thread.h"
 
+#if defined (ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE)
+
 template <class ACE_LOCK> ACE_INLINE
 ACE_Guard<ACE_LOCK>::ACE_Guard (ACE_LOCK &l)
-  : lock_ (&l), owner_ (0)
+  : lock_ (&l)
 {
   this->acquire ();
 }
 
 template <class ACE_LOCK> ACE_INLINE
 ACE_Guard<ACE_LOCK>::ACE_Guard (ACE_LOCK &l, int block)
-  : lock_ (&l), owner_ (0)
+  : lock_ (&l)
 {
   if (block)
     this->acquire ();
   else
     this->tryacquire ();
 }
-
 // Implicitly and automatically acquire (or try to acquire) the
 // lock.
 
@@ -30,7 +31,6 @@ ACE_Guard<ACE_LOCK>::~ACE_Guard (void)
 {
   this->release ();
 }
-
 // Implicitly release the lock.
 
 template <class ACE_LOCK> ACE_INLINE int
@@ -38,7 +38,6 @@ ACE_Guard<ACE_LOCK>::acquire (void)
 {
   return this->owner_ = this->lock_->acquire ();
 }
-
 // Explicitly acquire the lock.
 
 template <class ACE_LOCK> ACE_INLINE int
@@ -46,21 +45,19 @@ ACE_Guard<ACE_LOCK>::tryacquire (void)
 {
   return this->owner_ = this->lock_->tryacquire ();
 }
-
 // Conditionally acquire the lock (i.e., won't block).
 
 template <class ACE_LOCK> ACE_INLINE int
 ACE_Guard<ACE_LOCK>::release (void)
 {
   if (this->owner_ != -1)
-    {
-      this->owner_ = -1;
-      return this->lock_->release ();
-    }
+  {
+    this->owner_ = -1;
+    return this->lock_->release ();
+  }
   else
     return 0;
 }
-
 // Explicitly release the lock, but only if it is held!
 
 template <class ACE_LOCK> ACE_INLINE int
@@ -68,7 +65,6 @@ ACE_Guard<ACE_LOCK>::locked (void)
 {
   return this->owner_ != -1;
 }
-
 // 1 if locked, 0 if couldn't acquire the lock
 // (errno will contain the reason for this).
 
@@ -79,6 +75,8 @@ ACE_Guard<ACE_LOCK>::remove (void)
 }
 // Explicitly remove the lock.
 
+#endif /* defined (ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE) */
+
 template <class ACE_LOCKING_MECHANISM> ACE_INLINE
 ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::ACE_Lock_Adapter (ACE_LOCKING_MECHANISM &lock)
   : lock_ (&lock),
@@ -161,69 +159,6 @@ ACE_Lock_Adapter<ACE_LOCKING_MECHANISM>::tryacquire_write (void)
   return this->lock_->tryacquire_write ();
 }
 
-template <class ACE_LOCKING_MECHANISM> ACE_INLINE
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::ACE_Reverse_Lock (ACE_LOCKING_MECHANISM &lock)
-  : lock_ (&lock),
-    delete_lock_ (0)
-{
-}
-
-// Explicitly destroy the lock.
-template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::remove (void)
-{
-  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 ();
-}
-
-// Release the lock.
-template <class ACE_LOCKING_MECHANISM> ACE_INLINE int
-ACE_Reverse_Lock<ACE_LOCKING_MECHANISM>::tryacquire (void)
-{
-  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 ();
-}
-
-// 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 ();
-}
-
-// 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 ();
-}
-
-// 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 ();
-}
-
-// 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 ();
-}
-
 #if defined (ACE_HAS_THREADS)
 
 template<class MUTEX> ACE_INLINE int
diff --git a/ace/TLI.cpp b/ace/TLI.cpp
index f6d0ec697cc..69c8b9949f1 100644
--- a/ace/TLI.cpp
+++ b/ace/TLI.cpp
@@ -10,6 +10,16 @@ ACE_RCSID(ace, TLI, "$Id$")
 
 #if defined (ACE_HAS_TLI)
 
+#if defined (ACE_HAS_BROKEN_T_ERRNO)
+// We have to provide _terrno() ourselves.
+
+int *
+_terrno (void)
+{
+  return &t_errno;
+}
+#endif /* ACE_HAS_BROKEN_T_ERRNO */
+
 ACE_ALLOC_HOOK_DEFINE(ACE_TLI)
 
 void
diff --git a/ace/TLI.h b/ace/TLI.h
index 37cd3c0bd7c..b9163d34ac5 100644
--- a/ace/TLI.h
+++ b/ace/TLI.h
@@ -35,14 +35,6 @@
 #define ACE_TLI_TCP_DEVICE "/dev/tcp"
 #endif
 
-// There's not a universal device name for XTI/ATM devices.  If the platform
-// needs something other than /dev/xtisvc0, it needs to be set up in the
-// config.h file as ACE_XTI_ATM_DEVICE. This may be FORE vendor specific and
-// there may be no good default.
-#ifndef ACE_XTI_ATM_DEVICE
-#define ACE_XTI_ATM_DEVICE "/dev/xtisvc0"
-#endif
-
 class ACE_Export ACE_TLI : public ACE_IPC_SAP
 {
   // = TITLE
diff --git a/ace/TLI_Acceptor.cpp b/ace/TLI_Acceptor.cpp
index f77851f2097..5c0761027e3 100644
--- a/ace/TLI_Acceptor.cpp
+++ b/ace/TLI_Acceptor.cpp
@@ -78,7 +78,7 @@ void
 ACE_TLI_Request_Queue::free (ACE_TLI_Request *node)
 {
   ACE_TRACE ("ACE_TLI_Request_Queue::free");
-  node->next_ = this->free_list_;
+  node->next_      = this->free_list_;
   this->free_list_ = node;
 }
 
@@ -111,7 +111,7 @@ int
 ACE_TLI_Request_Queue::dequeue (ACE_TLI_Request *&ptr)
 {
   ACE_TRACE ("ACE_TLI_Request_Queue::dequeue");
-  ptr = this->tail_->next_;
+  ptr              = this->tail_->next_;
   this->tail_->next_ = ptr->next_;
   this->current_count_--;
   return 0;
@@ -120,36 +120,22 @@ ACE_TLI_Request_Queue::dequeue (ACE_TLI_Request *&ptr)
 // This is hideous...
 
 static ACE_HANDLE
-open_new_endpoint (ACE_HANDLE listen_handle,
-                   const char dev[],
-                   struct t_call *callp,
-                   int rwf)
+open_new_endpoint (ACE_HANDLE listen_handle, const char dev[],
+                   struct t_call *callp, int rwf)
 {
   ACE_TRACE ("open_new_endpoint");
-#if defined (ACE_PSOS)
-  ACE_HANDLE fd = ACE_OS::t_open ((char *) dev,
-                                  S_IRUSR | S_IWUSR,
-                                  0);
-#else
-  ACE_HANDLE fd = ACE_OS::t_open ((char *) dev,
-                                  O_RDWR,
-                                  0);
-#endif /* ACE_PSOS */
-
-  if (fd == ACE_INVALID_HANDLE
+  ACE_HANDLE fd;
+
+  if ((fd = ACE_OS::t_open ((char *) dev, O_RDWR, 0)) == ACE_INVALID_HANDLE
       || ACE_OS::t_bind (fd, 0, 0) == ACE_INVALID_HANDLE)
     fd = ACE_INVALID_HANDLE;
-#if defined (I_PUSH) && !defined (ACE_HAS_FORE_ATM_XTI)
-  else if (rwf != 0 && ACE_OS::ioctl (fd,
-                                      I_PUSH,
-                                      ACE_const_cast (char *, "tirdwr"))
-                                      == ACE_INVALID_HANDLE)
+#if defined (I_PUSH)
+  else if (rwf != 0 && ACE_OS::ioctl (fd, I_PUSH, "tirdwr") == ACE_INVALID_HANDLE)
     fd = ACE_INVALID_HANDLE;
 #endif /* I_PUSH */
 
   if (fd == ACE_INVALID_HANDLE)
-    ACE_OS::t_snddis (listen_handle,
-                      callp);
+    ACE_OS::t_snddis (listen_handle, callp);
   return fd;
 }
 
@@ -166,11 +152,9 @@ ACE_TLI_Request_Queue::close (void)
       ACE_TLI_Request &item = this->base_[i];
 
       item.handle_ = ACE_INVALID_HANDLE;
-      if (ACE_OS::t_free ((char *) item.callp_,
-                          T_CALL) != 0)
+      if (ACE_OS::t_free ((char *) item.callp_, T_CALL) != 0)
         res = ACE_INVALID_HANDLE;
     }
-
   delete [] this->base_;
   this->base_ = 0;
   return res;
@@ -183,9 +167,7 @@ ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz)
   this->handle_   = f;
   this->size_ = sz + 1; // Add one more for the dummy node.
 
-  ACE_NEW_RETURN (this->base_,
-                  ACE_TLI_Request[this->size_],
-                  ACE_INVALID_HANDLE);
+  ACE_NEW_RETURN (this->base_, ACE_TLI_Request[this->size_], ACE_INVALID_HANDLE);
 
   // Initialize the ACE_Queue and the free list.
 
@@ -195,9 +177,8 @@ ACE_TLI_Request_Queue::open (ACE_HANDLE f, int sz)
       this->free (item);
 
       item->handle_ = ACE_INVALID_HANDLE;
-      item->callp_ = (t_call *) ACE_OS::t_alloc (this->handle_,
-                                                 T_CALL,
-                                                 T_ALL);
+      item->callp_ = (t_call *) ACE_OS::t_alloc (this->handle_, T_CALL, T_ALL);
+
       if (item->callp_ == 0)
         return ACE_INVALID_HANDLE;
     }
@@ -227,26 +208,21 @@ ACE_TLI_Request_Queue::enqueue (const char device[],
   ACE_TRACE ("ACE_TLI_Request_Queue::enqueue");
   ACE_TLI_Request *temp = this->alloc ();
   ACE_TLI_Request &req  = *this->tail_;
-  int res;
+  int         res;
 
   do
     res = ACE_OS::t_listen (this->handle_, req.callp_);
-  while (res == ACE_INVALID_HANDLE 
-         && restart 
-         && t_errno == TSYSERR 
-         && errno == EINTR);
+  while (res == ACE_INVALID_HANDLE && restart && t_errno == TSYSERR && errno == EINTR);
 
   if (res != ACE_INVALID_HANDLE)
     {
-      req.handle_ = open_new_endpoint (this->handle_,
-                                       device,
-                                       req.callp_,
-                                       rwflag);
+      req.handle_ = open_new_endpoint (this->handle_, device, req.callp_, rwflag);
+
       if (req.handle_ != ACE_INVALID_HANDLE)
         {
-          temp->next_ = this->tail_->next_;
+          temp->next_       = this->tail_->next_;
           this->tail_->next_ = temp;
-          this->tail_ = temp;
+          this->tail_       = temp;
           this->current_count_++;
           return 0;
         }
@@ -306,46 +282,25 @@ ACE_TLI_Acceptor::open (const ACE_Addr &remote_sap,
   ACE_ALLOCATOR_RETURN (this->device_,
                         ACE_OS::strdup (dev),
                         ACE_INVALID_HANDLE);
-  if (this->ACE_TLI::open (dev,
-                           oflag,
-                           info) == ACE_INVALID_HANDLE)
+  if (this->ACE_TLI::open (dev, oflag, info) == ACE_INVALID_HANDLE)
     res = ACE_INVALID_HANDLE;
-#if !defined (ACE_HAS_FORE_ATM_XTI)
-  // Reusing the address causes problems with FORE's API. The issue
-  // may be that t_optmgmt isn't fully supported by FORE. t_errno is
-  // TBADOPT after the t_optmgmt call so maybe options are configured
-  // differently for XTI than for TLI (at least for FORE's
-  // implementation - XTI is supposed to be a superset of TLI).
   else if (reuse_addr
-           && this->set_option (SOL_SOCKET,
-                                SO_REUSEADDR,
-                                &one,
-                                sizeof one) == ACE_INVALID_HANDLE)
+           && this->set_option (SOL_SOCKET, SO_REUSEADDR,
+                                &one, sizeof one) == ACE_INVALID_HANDLE)
     res = ACE_INVALID_HANDLE;
-#endif /* ACE_HAS_FORE_ATM_XTI */
   else if ((this->disp_ =
-            (struct t_discon *) ACE_OS::t_alloc (this->get_handle (),
-                                                 T_DIS,
-                                                 T_ALL)) == 0)
+            (struct t_discon *) ACE_OS::t_alloc (this->get_handle (), T_DIS, T_ALL)) == 0)
     res = ACE_INVALID_HANDLE;
   else
     {
       struct t_bind req;
 
-#if defined (ACE_HAS_FORE_ATM_XTI)
-      // Not sure why but FORE's t_bind call won't work if t_bind.qlen
-      // != 1 Adjust the backlog accordingly.
-      this->backlog_ = 1;
-      req.qlen = 1;
-#else
-      this->backlog_ = qlen;
+      this->backlog_  = qlen;
       req.qlen = qlen;
-#endif /* ACE_HAS_FORE_ATM_XTI */
       req.addr.maxlen = remote_sap.get_size ();
 
       if (remote_sap == ACE_Addr::sap_any)
-        // Note that if addr.len == 0 then ACE_TLI selects the port
-        // number.
+        // Note that if addr.len == 0 then ACE_TLI selects the port number.
         req.addr.len = 0;
       else
         {
@@ -353,23 +308,21 @@ ACE_TLI_Acceptor::open (const ACE_Addr &remote_sap,
           req.addr.buf = (char *) remote_sap.get_addr ();
         }
 
-      res = ACE_OS::t_bind (this->get_handle (),
-                            &req,
-                            0);
+      res = ACE_OS::t_bind (this->get_handle (), &req, 0);
       if (res != ACE_INVALID_HANDLE)
         {
-          ACE_NEW_RETURN (this->queue_,
-                          ACE_TLI_Request_Queue,
-                          -1);
-          res = this->queue_->open (this->get_handle (),
-                                    this->backlog_);
+          ACE_NEW_RETURN (this->queue_, ACE_TLI_Request_Queue, -1);
+
+          res = this->queue_->open (this->get_handle (), this->backlog_);
         }
     }
+
   if (res == ACE_INVALID_HANDLE)
     this->close ();
   return this->get_handle ();
 }
 
+
 ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
                                     int reuse_addr,
                                     int oflag,
@@ -378,15 +331,9 @@ ACE_TLI_Acceptor::ACE_TLI_Acceptor (const ACE_Addr &remote_sap,
                                     const char dev[])
 {
   ACE_TRACE ("ACE_TLI_Acceptor::ACE_TLI_Acceptor");
-  if (this->open (remote_sap,
-                  reuse_addr,
-                  oflag,
-                  info,
-                  back,
-                  dev) == ACE_INVALID_HANDLE)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor")));
+  if (this->open (remote_sap, reuse_addr, oflag,
+                  info, back, dev) == ACE_INVALID_HANDLE)
+    ACE_ERROR ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ACE_TLI_Acceptor::ACE_TLI_Acceptor")));
 }
 
 int
@@ -426,9 +373,7 @@ ACE_TLI_Acceptor::handle_async_event (int restart, int rwf)
       this->queue_->remove (this->disp_->sequence);
       break;
     case T_LISTEN:
-      this->queue_->enqueue (this->device_,
-                             restart,
-                             rwf);
+      this->queue_->enqueue (this->device_, restart, rwf);
       break;
     default:
       return -1;
@@ -454,41 +399,32 @@ ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap,
 
   if (timeout != 0
       && ACE::handle_timed_accept (this->get_handle (),
-                                   timeout,
-                                   restart) == -1)
+                                   timeout, restart) == -1)
     return -1;
   else if (this->queue_->is_empty ())
     {
       req = this->queue_->alloc ();
 
       do
-        res = ACE_OS::t_listen (this->get_handle (),
-                                req->callp_);
+        res = ACE_OS::t_listen (this->get_handle (), req->callp_);
       while (res == ACE_INVALID_HANDLE
              && restart
              && errno == EINTR);
 
       if (res != ACE_INVALID_HANDLE)
         res = req->handle_ = open_new_endpoint (this->get_handle (),
-                                                this->device_,
-                                                req->callp_,
-                                                rwf);
+                                                this->device_, req->callp_, rwf);
     }
   else
     res = this->queue_->dequeue (req);
 
   if (udata != 0)
-    ACE_OS::memcpy ((void *) &req->callp_->udata,
-                    (void *) udata,
-                    sizeof *udata);
+    ACE_OS::memcpy ((void *) &req->callp_->udata, (void *) udata, sizeof *udata);
   if (opt != 0)
-    ACE_OS::memcpy ((void *) &req->callp_->opt,
-                    (void *) opt,
-                    sizeof *opt);
+    ACE_OS::memcpy ((void *) &req->callp_->opt, (void *) opt, sizeof *opt);
 
   while (res != ACE_INVALID_HANDLE)
-    if ((res = ACE_OS::t_accept (this->get_handle (),
-                                 req->handle_,
+    if ((res = ACE_OS::t_accept (this->get_handle (), req->handle_,
                                  req->callp_)) != ACE_INVALID_HANDLE)
       break; // Got one!
     else if (t_errno == TLOOK)
@@ -510,8 +446,7 @@ ACE_TLI_Acceptor::accept (ACE_TLI_Stream &new_tli_sap,
       new_tli_sap.set_handle (req->handle_);
 
       if (remote_addr != 0)
-        remote_addr->set_addr ((void *) req->callp_->addr.buf,
-                               req->callp_->addr.len);
+        remote_addr->set_addr ((void *) req->callp_->addr.buf, req->callp_->addr.len);
     }
 
   req->handle_ = ACE_INVALID_HANDLE;
diff --git a/ace/TLI_Acceptor.h b/ace/TLI_Acceptor.h
index 20ce2575daa..4525daf1dcb 100644
--- a/ace/TLI_Acceptor.h
+++ b/ace/TLI_Acceptor.h
@@ -53,7 +53,7 @@ public:
                     int reuse_addr = 0,
                     int oflag = O_RDWR,
                     struct t_info *info = 0,
-                    int backlog = ACE_DEFAULT_BACKLOG,
+                    int backlog = 5,
                     const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
@@ -61,7 +61,7 @@ public:
                    int reuse_addr = 0,
                    int oflag = O_RDWR,
                    struct t_info *info = 0,
-                   int backlog = ACE_DEFAULT_BACKLOG,
+                   int backlog = 5,
                    const char device[] = ACE_TLI_TCP_DEVICE);
   // Initiate a passive mode socket.
 
diff --git a/ace/TLI_Connector.cpp b/ace/TLI_Connector.cpp
index 12323b0fe1d..289396fda21 100644
--- a/ace/TLI_Connector.cpp
+++ b/ace/TLI_Connector.cpp
@@ -56,44 +56,27 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
       struct t_bind *localaddr;
 
       localaddr = (struct t_bind *) 
-	ACE_OS::t_alloc (new_stream.get_handle (), T_BIND, T_ADDR);
+	::t_alloc (new_stream.get_handle (), T_BIND, T_ADDR);
 
       if (localaddr == 0)
 	result = -1;
       else
 	{
 	  int one = 1;
-#if !defined (ACE_HAS_FORE_ATM_XTI)
-          // Reusing the address causes problems with FORE's API. The
-          // issue may be that t_optmgmt isn't fully supported by
-          // FORE. t_errno is TBADOPT after the t_optmgmt call so
-          // maybe options are configured differently for XTI than for
-          // TLI (at least for FORE's implementation - XTI is supposed
-          // to be a superset of TLI).
-	  if (reuse_addr 
-              && new_stream.set_option (SOL_SOCKET,
-                                        SO_REUSEADDR,
-                                        &one,
-                                        sizeof one) == -1)
+	  if (reuse_addr && new_stream.set_option (SOL_SOCKET, SO_REUSEADDR,
+                                                   &one, sizeof one) == -1)
 	    result = -1;
 	  else
-#endif /* ACE_HAS_FORE_ATM_XTI */
 	    {
 	      // localaddr->glen = 0;
-	      //localaddr->addr.maxlen = local_sap.get_size ();
+	      localaddr->addr.maxlen = local_sap.get_size ();
 	      localaddr->addr.len = local_sap.get_size ();
-              ACE_OS::memcpy(localaddr->addr.buf,
-                             local_sap.get_addr (),
-                             localaddr->addr.len);
-              //localaddr->addr.buf = (char *) local_sap.get_addr ();
-
-	      if (ACE_OS::t_bind (new_stream.get_handle (),
-                                  localaddr,
-                                  localaddr) == -1)
+	      localaddr->addr.buf = (char *) local_sap.get_addr ();
+
+	      if (ACE_OS::t_bind (new_stream.get_handle (), localaddr, localaddr) == -1)
 		result = -1;
 
-	      ACE_OS::t_free ((char *) localaddr,
-                              T_BIND);
+	      ACE_OS::t_free ((char *) localaddr, T_BIND);
 	    }
 	}
 
@@ -117,12 +100,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
       new_stream.close ();
       return -1;
     }
-  //callptr->addr.maxlen = remote_sap.get_size ();
+  callptr->addr.maxlen = remote_sap.get_size ();
   callptr->addr.len = remote_sap.get_size ();
-  ACE_OS::memcpy(callptr->addr.buf,
-                 remote_sap.get_addr (),
-                 callptr->addr.len);
-  //callptr->addr.buf = (char *) remote_sap.get_addr ();
+  callptr->addr.buf = (char *) remote_sap.get_addr ();
 
   if (udata != 0)
     ACE_OS::memcpy ((void *) &callptr->udata, (void *) udata, sizeof *udata);
@@ -130,11 +110,6 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
     ACE_OS::memcpy ((void *) &callptr->opt, (void *) opt, sizeof *opt);
 
   // Connect to remote endpoint.
-#if defined (ACE_HAS_FORE_ATM_XTI)
-  // FORE's XTI/ATM driver has problems with ioctl/fcntl calls so (at least
-  // for now) always have blocking calls.
-  timeout = 0;
-#endif /* ACE_HAS_FORE_ATM_XTI */
 
   if (timeout != 0)   // Enable non-blocking, if required.
     {
@@ -166,11 +141,9 @@ ACE_TLI_Connector::connect (ACE_TLI_Stream &new_stream,
   if (result != -1) 
     {
       new_stream.set_rwflag (rwf);
-#if defined (I_PUSH) && !defined (ACE_HAS_FORE_ATM_XTI)
+#if defined (I_PUSH)
       if (new_stream.get_rwflag ())
-	result = ACE_OS::ioctl (new_stream.get_handle (),
-                                I_PUSH,
-                                ACE_const_cast (char *, "tirdwr"));
+	result = ACE_OS::ioctl (new_stream.get_handle (), I_PUSH, "tirdwr");
 #endif /* I_PUSH */
     }
   else if (!(errno == EWOULDBLOCK || errno == ETIME))
@@ -193,9 +166,8 @@ ACE_TLI_Connector::complete (ACE_TLI_Stream &new_stream,
 			     ACE_Time_Value *tv)
 {
   ACE_TRACE ("ACE_TLI_Connector::complete");
-  ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (),
-                                             tv,
-                                             1);
+  ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv, 1);
+
   if (h == ACE_INVALID_HANDLE)
     {
       new_stream.close ();
diff --git a/ace/TLI_Stream.cpp b/ace/TLI_Stream.cpp
index 629dd295353..19a016ece86 100644
--- a/ace/TLI_Stream.cpp
+++ b/ace/TLI_Stream.cpp
@@ -19,7 +19,6 @@ ACE_TLI_Stream::dump (void) const
 }
 
 ACE_TLI_Stream::ACE_TLI_Stream (void)
-  : rwflag_ (0)
 {
   ACE_TRACE ("ACE_TLI_Stream::ACE_TLI_Stream");
 }
@@ -32,12 +31,10 @@ ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const
 #if defined (ACE_HAS_SVR4_TLI)
   struct netbuf name;
   name.maxlen = sa.get_size ();
-  name.buf = (char *) sa.get_addr ();
+  name.buf    = (char *) sa.get_addr ();
 
-  // if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1)   
-  if (ACE_OS::ioctl (this->get_handle (),
-                     TI_GETPEERNAME,
-                     &name) == -1)
+  if (ACE_OS::ioctl (this->get_handle (), TI_GETPEERNAME, &name) == -1)
+/*  if (ACE_OS::t_getname (this->get_handle (), &name, REMOTENAME) == -1) */
     return -1;
   else
     return 0;
@@ -47,7 +44,7 @@ ACE_TLI_Stream::get_remote_addr (ACE_Addr &sa) const
 #endif /* ACE_HAS_SVR4_TLI */
 }
 
-// Send a release and then await the release from the other side.
+/* Send a release and then await the release from the other side */
 
 int
 ACE_TLI_Stream::active_close (void)
@@ -70,8 +67,8 @@ ACE_TLI_Stream::active_close (void)
   return this->close ();
 }
 
-// Acknowledge the release from the other side and then send the
-// release to the other side.
+/* Acknowledge the release from the other side and then send the release to
+   the other side. */
 
 int
 ACE_TLI_Stream::passive_close (void)
@@ -84,6 +81,7 @@ ACE_TLI_Stream::passive_close (void)
   return this->close ();
 }
 
+
 int
 ACE_TLI_Stream::close (void)
 {
diff --git a/ace/TP_Reactor.h b/ace/TP_Reactor.h
index 6f5bd35886f..3dab62c2607 100644
--- a/ace/TP_Reactor.h
+++ b/ace/TP_Reactor.h
@@ -111,16 +111,11 @@ public:
                   ACE_Timer_Queue * = 0);
   // Initialize <ACE_TP_Reactor> with the default size.
 
-  ACE_TP_Reactor (size_t max_number_of_handles,
+  ACE_TP_Reactor (size_t size,
                   int restart = 0,
                   ACE_Sig_Handler * = 0,
                   ACE_Timer_Queue * = 0);
-  // Initialize the <ACE_TP_Reactor> to manage
-  // <max_number_of_handles>.  If <restart> is non-0 then the
-  // <ACE_Reactor>'s <handle_events> method will be restarted
-  // automatically when <EINTR> occurs.  If <signal_handler> or
-  // <timer_queue> are non-0 they are used as the signal handler and
-  // timer queue, respectively.
+  // Initialize <ACE_TP_Reactor> with size <size>.
 
   // = Event loop drivers.
 
diff --git a/ace/TTY_IO.cpp b/ace/TTY_IO.cpp
index a18aec92f2f..25d76048681 100644
--- a/ace/TTY_IO.cpp
+++ b/ace/TTY_IO.cpp
@@ -74,23 +74,6 @@ ACE_TTY_IO::control (Control_Mode cmd,
         case 38400:
           c_cflag |= B38400;
           break;
-#if 0
-        case 56000:
-          c_cflag |= B56000;
-          break;
-        case 57600:
-          c_cflag |= B57600;
-          break;
-        case 115200:
-          c_cflag |= B115200;
-          break;
-        case 128000:
-          c_cflag |= B128000;
-          break;
-        case 256000:
-          c_cflag |= B256000;
-          break;
-#endif /* 0 */
         default:
           return -1;
         }
@@ -124,8 +107,8 @@ ACE_TTY_IO::control (Control_Mode cmd,
       if (arg->parityenb)
         {
           c_cflag |= PARENB;
-          if (ACE_OS::strcmp ((char *) arg->paritymode, "ODD") == 0
-              || ACE_OS::strcmp ((char *) arg->paritymode, "odd") == 0)
+          if (strcmp((char *) arg->paritymode,"ODD")==0 ||
+              strcmp((char *) arg->paritymode,"odd")==0)
             c_cflag |= PARODD;
         }
 #if defined (CRTSCTS)
@@ -137,14 +120,14 @@ ACE_TTY_IO::control (Control_Mode cmd,
         c_cflag |= CREAD;
 #endif /* CREAD */
 
-      c_oflag = 0;
+      c_oflag=0;
       c_iflag = IGNPAR | INPCK;
       if (arg->databits < 8)
         c_iflag |= ISTRIP;
-      c_lflag = 0;
+      c_lflag=0;
 
-      ivmin_cc4 = (u_char) 0;
-      ivtime_cc5= (u_char) (arg->readtimeoutmsec / 100);
+      ivmin_cc4 =(u_char) 0;
+      ivtime_cc5=(u_char) (arg->readtimeoutmsec / 100);
       devpar.c_iflag = c_iflag;
       devpar.c_oflag = c_oflag;
       devpar.c_cflag = c_cflag;
@@ -153,17 +136,17 @@ ACE_TTY_IO::control (Control_Mode cmd,
       devpar.c_cc[5] = ivtime_cc5;
 
 #if defined(TCSETS)
-      return this->ACE_IO_SAP::control (TCSETS,
-                                        (void *) &devpar);
+      return this->ACE_IO_SAP::control (TCSETS, (void *) &devpar);
 #elif defined(TCSETA)
-      return this->ACE_IO_SAP::control (TCSETA,
-                                        (void *) &devpar);
+      return this->ACE_IO_SAP::control (TCSETA, (void *) &devpar);
 #else
       errno = ENOSYS;
       return -1;
 #endif
+
     case GETPARAMS:
       return -1; // Not yet implemented.
+
     default:
       return -1; // Wrong cmd.
     }
@@ -185,11 +168,6 @@ ACE_TTY_IO::control (Control_Mode cmd,
         case  9600: dcb.BaudRate = CBR_9600; break;
         case  19200: dcb.BaudRate = CBR_19200; break;
         case  38400: dcb.BaudRate = CBR_38400; break;
-        case  56000: dcb.BaudRate = CBR_56000; break;
-        case  57600: dcb.BaudRate = CBR_57600; break;
-        case  115200: dcb.BaudRate = CBR_115200; break;
-        case  128000: dcb.BaudRate = CBR_128000; break;
-        case  256000: dcb.BaudRate = CBR_256000; break;
         default:  return -1;
         }
 
diff --git a/ace/Task.cpp b/ace/Task.cpp
index 9295fe094c9..92e04ba89e1 100644
--- a/ace/Task.cpp
+++ b/ace/Task.cpp
@@ -88,11 +88,11 @@ ACE_Task_Base::activate (long flags,
     return 1; // Already active.
   else
     {
+      this->thr_count_ += n_threads;
       if (this->thr_count_ > 0 && grp_id != -1)
         // If we're joining an existing group of threads then make
         // sure to use its group id.
         grp_id = this->grp_id_;
-      this->thr_count_ += n_threads;
     }
 
   // Use the ACE_Thread_Manager singleton if we're running as an
diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
index f881982b6e4..54d458591f6 100644
--- a/ace/Template_Instantiations.cpp
+++ b/ace/Template_Instantiations.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
-// Note: this file has been created through concatenation of ALL
-// explicit template instantiations in ACE, and only those that
-// interfered with the multithreaded port of ACE to pSOS using the
-// Diab D-C++ 4.1a compiler have been wrapped with the appropriate
-// preprocesor directives for conditional compilation.  If you are
-// trying to use this file, you will need to ensure that any
-// additional preprocessor directives needed are added.  Also, if you
-// wish to extend this technique to instantiation pragmas, you will
-// need to modify the preprocesor directives below
+// Note: this file has been created through concatenation of ALL explicit template
+// instantiations in ACE, and only those that interfered with the
+// multithreaded port of ACE to pSOS using the Diab D-C++ 4.1a compiler
+// have been wrapped with the appropriate preprocesor directives for
+// conditional compilation.  If you are trying to use this file, you will need
+// to ensure that any additional preprocessor directives needed are added.
+// Also, if you wish to extend this technique to instantiation pragmas,
+// you will need to modify the preprocesor directives below
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE)
 
diff --git a/ace/Thread.h b/ace/Thread.h
index 8790d60c223..69c3990b4d9 100644
--- a/ace/Thread.h
+++ b/ace/Thread.h
@@ -159,7 +159,6 @@ public:
 
   static void exit (void *status = 0);
   // Exit the current thread and return "status".
-  // Should _not_ be called by main thread.
 
   static int getconcurrency (void);
   // Get the LWP concurrency level of the process.
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 72d461b9a7c..fb98af4ac9c 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -135,7 +135,7 @@ ACE_Thread_Descriptor::terminate ()
          // Threads created with THR_DAEMON shouldn't exist here, but
          // just to be safe, let's put it here.
 
-         if (ACE_BIT_DISABLED (this->thr_state_, ACE_Thread_Manager::ACE_THR_JOINING))
+         if (ACE_BIT_ENABLED (this->thr_state_, ACE_Thread_Manager::ACE_THR_JOINING))
            {
              if (ACE_BIT_DISABLED (this->flags_, THR_DETACHED | THR_DAEMON)
                  || ACE_BIT_ENABLED (this->flags_, THR_JOINABLE))
@@ -421,7 +421,6 @@ ACE_Thread_Exit::cleanup (void *instance, void *)
 // NOTE: this preprocessor directive should match the one in
 // ACE_Task_Base::svc_run () below.  This prevents the two statics
 // from being defined.
-
 ACE_Thread_Exit *
 ACE_Thread_Exit::instance (void)
 {
@@ -1259,38 +1258,6 @@ ACE_Thread_Manager::testcancel (ACE_thread_t t_id)
   return this->check_state (ACE_THR_CANCELLED, t_id);
 }
 
-// Thread information query functions.
-
-int
-ACE_Thread_Manager::hthread_within (ACE_hthread_t handle)
-{
-  ACE_TRACE ("ACE_Thread_Manager::hthread_within");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_monx, this->lock_, -1));
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    if (ACE_OS::thr_cmp(iter.next ()->thr_handle_, handle))
-      return 1;
-
-  return 0;
-}
-
-int
-ACE_Thread_Manager::thread_within (ACE_thread_t tid)
-{
-  ACE_TRACE ("ACE_Thread_Manager::thread_within");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_monx, this->lock_, -1));
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    if (ACE_OS::thr_equal (iter.next ()->thr_id_, tid))
-      return 1;
-
-  return 0;
-}
-
 // Get group ids for a particular thread id.
 
 int
@@ -2029,8 +1996,8 @@ ACE_Thread_Manager::num_tasks_in_group (int grp_id)
        iter.advance ())
     {
       if (iter.next ()->grp_id_ == grp_id
-          && this->find_task (iter.next ()->task_, i) == 0
-          && iter.next ()->task_ != 0)
+          && this->find_task (iter.next ()->task_, i) ==
+          0)
         tasks_count++;
 
       i++;
@@ -2057,60 +2024,6 @@ ACE_Thread_Manager::num_threads_in_task (ACE_Task_Base *task)
   return threads_count;
 }
 
-// Returns in task_list a list of ACE_Tasks registered with ACE_Thread_Manager.
-
-int
-ACE_Thread_Manager::task_all_list (ACE_Task_Base *task_list[],
-                                   size_t n)
-{
-  ACE_TRACE ("ACE_Thread_Manager::task_all_list");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
-
-  ACE_Task_Base **task_list_iterator = task_list;
-  size_t task_list_count = 0;
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    {
-      if (task_list_count >= n)
-        break;
-
-      if ( iter.next ()->task_ )
-        {
-          task_list_iterator[task_list_count] = iter.next ()->task_;
-          task_list_count++;
-        }
-    }
-
-  return task_list_count;
-}
-
-// Returns in thread_list a list of all thread ids
-
-int
-ACE_Thread_Manager::thread_all_list ( ACE_thread_t thread_list[],
-                                      size_t n)
-{
-  ACE_TRACE ("ACE_Thread_Manager::thread_all_list");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
-
-  size_t thread_count = 0;
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    {
-      if (thread_count >= n)
-        break;
-
-      thread_list[thread_count] = iter.next ()->thr_id_;
-      thread_count ++;
-    }
-
-  return thread_count;
-}
-
 // Returns in task_list a list of ACE_Tasks in a group.
 
 int
@@ -2123,6 +2036,7 @@ ACE_Thread_Manager::task_list (int grp_id,
 
   ACE_Task_Base **task_list_iterator = task_list;
   size_t task_list_count = 0;
+
   size_t i = 0;
 
   for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
@@ -2142,7 +2056,8 @@ ACE_Thread_Manager::task_list (int grp_id,
       i++;
     }
 
-  return task_list_count;
+
+  return 0;
 }
 
 // Returns in thread_list a list of thread ids in an ACE_Task.
@@ -2167,11 +2082,10 @@ ACE_Thread_Manager::thread_list (ACE_Task_Base *task,
       if (iter.next ()->task_ == task)
         {
           thread_list[thread_count] = iter.next ()->thr_id_;
-          thread_count++;
+          thread_count ++;
         }
     }
-
-  return thread_count;
+  return 0;
 }
 
 // Returns in thread_list a list of thread handles in an ACE_Task.
@@ -2181,7 +2095,7 @@ ACE_Thread_Manager::hthread_list (ACE_Task_Base *task,
                                   ACE_hthread_t hthread_list[],
                                   size_t n)
 {
-  ACE_TRACE ("ACE_Thread_Manager::hthread_list");
+  ACE_TRACE ("ACE_Thread_Manager::thread_list");
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
 
   size_t hthread_count = 0;
@@ -2196,67 +2110,11 @@ ACE_Thread_Manager::hthread_list (ACE_Task_Base *task,
       if (iter.next ()->task_ == task)
         {
           hthread_list[hthread_count] = iter.next ()->thr_handle_;
-          hthread_count++;
+          hthread_count ++;
         }
     }
 
-  return hthread_count;
-}
-
-int
-ACE_Thread_Manager::thread_grp_list (int grp_id,
-                                     ACE_thread_t thread_list[],
-                                     size_t n)
-{
-  ACE_TRACE ("ACE_Thread_Manager::thread_grp_list");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
-
-  size_t thread_count = 0;
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    {
-      if (thread_count >= n)
-        break;
-
-      if (iter.next ()->grp_id_ == grp_id)
-        {
-          thread_list[thread_count] = iter.next ()->thr_id_;
-          thread_count++;
-        }
-    }
-
-  return thread_count;
-}
-
-// Returns in thread_list a list of thread handles in an ACE_Task.
-
-int
-ACE_Thread_Manager::hthread_grp_list (int grp_id,
-                                      ACE_hthread_t hthread_list[],
-                                      size_t n)
-{
-  ACE_TRACE ("ACE_Thread_Manager::hthread_list");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1));
-
-  size_t hthread_count = 0;
-
-  for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
-       !iter.done ();
-       iter.advance ())
-    {
-      if (hthread_count >= n)
-        break;
-
-      if (iter.next ()->grp_id_ == grp_id)
-        {
-          hthread_list[hthread_count] = iter.next ()->thr_handle_;
-          hthread_count++;
-        }
-    }
-
-  return hthread_count;
+  return 0;
 }
 
 int
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 2b43724a0bc..8fd28ec4205 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -147,7 +147,7 @@ protected:
 
 #endif /* !ACE_USE_ONE_SHOT_AT_THREAD_EXIT */
 
-class ACE_Thread_Descriptor_Base : public ACE_OS_Thread_Descriptor
+class ACE_Thread_Descriptor_Base
 {
   // = TITLE
   //     Basic information for thread descriptors.  These information
@@ -198,6 +198,12 @@ protected:
   // Pointer to an <ACE_Task_Base> or NULL if there's no
   // <ACE_Task_Base>.
 
+ long flags_;
+  // Keeps track of whether this thread was created "detached" or not.
+  // If a thread is *not* created detached then if someone calls
+  // <ACE_Thread_Manager::wait>, we need to join with that thread (and
+  // close down the handle).
+
   ACE_Thread_Descriptor_Base *next_;
   ACE_Thread_Descriptor_Base *prev_;
   // We need these pointers to maintain the double-linked list in a
@@ -261,6 +267,9 @@ public:
   ~ACE_Thread_Descriptor (void);
   // Do nothing destructor to keep some compilers happy
 
+  long flags (void) const;
+  // Get the thread creation flags.
+
   void acquire_release (void);
   // Do nothing but to acquire the thread descriptor's lock and
   // release.  This will first check if the thread is registered or
@@ -489,7 +498,6 @@ public:
   // Called to clean up when a thread exits.  If <do_thread_exit> is
   // non-0 then <ACE_Thread::exit> is called to exit the thread, in
   // which case <status> is passed as the exit value of the thread.
-  // Should _not_ be called by main thread.
 
   int wait (const ACE_Time_Value *timeout = 0,
             int abandon_detached_threads = 0);
@@ -498,19 +506,14 @@ public:
   // treated as "absolute" time.  Returns 0 on success and -1 on
   // failure.  If <abandon_detached_threads> is set, wait will first
   // check thru its thread list for threads with THR_DETACHED or
-  // THR_DAEMON flags set and remove these threads.  Notice that
-  // unlike other wait_* function, by default, wait () does wait on
-  // all thread spawned by this thread_manager no matter the detached
-  // flags are set or not unless it is called with
-  // <abandon_detached_threads> flag set.
+  // THR_DAEMON flags set and remove these threads.
 
   int join (ACE_thread_t tid, void **status = 0);
-  // Join a thread specified by <tid>.  Do not wait on a detached thread.
+  // Join a thread specified by <tid>.
 
   int wait_grp (int grp_id);
   // Block until there are no more threads running in a group.
-  // Returns 0 on success and -1 on failure.  Notice that wait_grp
-  // will not wait on detached threads.
+  // Returns 0 on success and -1 on failure.
 
   // = Accessors for ACE_Thread_Descriptors.
   ACE_Thread_Descriptor *thread_desc_self (void);
@@ -600,8 +603,7 @@ public:
   // = Operations on ACE_Tasks.
   int wait_task (ACE_Task_Base *task);
   // Block until there are no more threads running in <task>.  Returns
-  // 0 on success and -1 on failure.  Notice that wait_task will not
-  // wait on detached threads.
+  // 0 on success and -1 on failure.
   int suspend_task (ACE_Task_Base *task);
   // Suspend all threads in an ACE_Task.
   int resume_task (ACE_Task_Base *task);
@@ -616,12 +618,9 @@ public:
   // supports cancellation.  Otherwise, perform a "cooperative"
   // cancellation.
 
-  // = Collect thread handles in the thread manager.  Notice that
-  //   the collected information is just a snapshot.
-  int hthread_within (ACE_hthread_t handle);
-  int thread_within (ACE_thread_t tid);
-  // Check if the thread is managed by the thread manager.  Return true if
-  // the thread is found, false otherwise.
+  // = The following method provide new functionality. They do not
+  // follow the same design as current methods. They provide new
+  // functionality.
 
   int num_tasks_in_group (int grp_id);
   // Returns the number of <ACE_Task_Base> in a group.
@@ -633,69 +632,26 @@ public:
                  ACE_Task_Base *task_list[],
                  size_t n);
   // Returns in <task_list> a list of up to <n> <ACE_Tasks> in a
-  // group.  The caller must allocate the memory for <task_list>.  In
-  // case of an error, -1 is returned. If no requested values are
-  // found, 0 is returned, otherwise correct number of retrieved
-  // values are returned.
+  // group.  The caller must allocate the memory for <task_list>
 
   int thread_list (ACE_Task_Base *task,
                    ACE_thread_t thread_list[],
                    size_t n);
-  // Returns in <thread_list> a list of up to <n> thread ids in an
+  // Returns in <thread_list> a list of up to <h> thread ids in an
   // <ACE_Task_Base>.  The caller must allocate the memory for
-  // <thread_list>.  In case of an error, -1 is returned. If no
-  // requested values are found, 0 is returned, otherwise correct
-  // number of retrieved values are returned.
+  // <thread_list>.
 
   int hthread_list (ACE_Task_Base *task,
                     ACE_hthread_t hthread_list[],
                     size_t n);
   // Returns in <hthread_list> a list of up to <n> thread handles in
   // an <ACE_Task_Base>.  The caller must allocate memory for
-  // <hthread_list>.  In case of an error, -1 is returned. If no
-  // requested values are found, 0 is returned, otherwise correct
-  // number of retrieved values are returned.
-
-  int thread_grp_list (int grp_id,
-                       ACE_thread_t thread_list[],
-                       size_t n);
-  // Returns in <thread_list> a list of up to <n> thread ids in a
-  // group <grp_id>.  The caller must allocate the memory for
-  // <thread_list>.  In case of an error, -1 is returned. If no
-  // requested values are found, 0 is returned, otherwise correct
-  // number of retrieved values are returned.
-
-  int hthread_grp_list (int grp_id,
-                        ACE_hthread_t hthread_list[],
-                        size_t n);
-  // Returns in <hthread_list> a list of up to <n> thread handles in
-  // a group <grp_id>.  The caller must allocate memory for
   // <hthread_list>.
 
-  int task_all_list (ACE_Task_Base *task_list[],
-                     size_t n);
-  // Returns in <task_list> a list of up to <n> <ACE_Tasks>.  The
-  // caller must allocate the memory for <task_list>.  In case of an
-  // error, -1 is returned. If no requested values are found, 0 is
-  // returned, otherwise correct number of retrieved values are
-  // returned.
-
-  int thread_all_list (ACE_thread_t thread_list[],
-                       size_t n);
-  // Returns in <thread_list> a list of up to <n> thread ids.  The
-  // caller must allocate the memory for <thread_list>.  In case of an
-  // error, -1 is returned. If no requested values are found, 0 is
-  // returned, otherwise correct number of retrieved values are
-  // returned.
-
   // = Set/get group ids for a particular task.
   int set_grp (ACE_Task_Base *task, int grp_id);
   int get_grp (ACE_Task_Base *task, int &grp_id);
 
-  int count_threads (void) const;
-  // Return a count of the current number of threads active in the
-  // <Thread_Manager>.
-
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
   int at_exit (ACE_At_Thread_Exit* cleanup);
   // Register an At_Thread_Exit hook and the ownership is acquire by
@@ -876,6 +832,115 @@ private:
   // Must delete the <thr_mgr_> if non-0.
 };
 
+class ACE_Export ACE_Thread_Control
+{
+  // = TITLE
+  //     Used to keep track of a thread's activities within its entry
+  //     point function.
+  //
+  // = DESCRIPTION
+  //     A <ACE_Thread_Manager> uses this class to ensure that threads
+  //     it spawns automatically register and unregister themselves
+  //     with it.
+  //
+  //     This class can be stored in thread-specific storage using the
+  //     <ACE_TSS> wrapper.  When a thread exits the
+  //     <ACE_TSS::cleanup> function deletes this object, thereby
+  //     ensuring that it gets removed from its associated
+  //     <ACE_Thread_Manager>.
+public:
+  ACE_Thread_Control (ACE_Thread_Manager *tm = 0,
+                      int insert = 0);
+  // Initialize the thread control object.  If <insert> != 0, then
+  // register the thread with the Thread_Manager.
+
+  ~ACE_Thread_Control (void);
+  // Remove the thread from its associated <Thread_Manager> and exit
+  // the thread if <do_thr_exit> is enabled.
+
+  void *exit (void *status,
+              int do_thr_exit);
+  // Remove this thread from its associated <Thread_Manager> and exit
+  // the thread if <do_thr_exit> is enabled.
+
+  int insert (ACE_Thread_Manager *tm, int insert = 0);
+  // Store the <Thread_Manager> and use it to register ourselves for
+  // correct shutdown.
+
+  ACE_Thread_Manager *thr_mgr (void);
+  // Returns the current <Thread_Manager>.
+
+  ACE_Thread_Manager *thr_mgr (ACE_Thread_Manager *);
+  // Atomically set a new <Thread_Manager> and return the old
+  // <Thread_Manager>.
+
+  void *status (void *status);
+  // Set the exit status (and return existing status).
+
+  void *status (void);
+  // Get the current exit status.
+
+  void dump (void) const;
+  // Dump the state of an object.
+
+  ACE_ALLOC_HOOK_DECLARE;
+  // Declare the dynamic allocation hooks.
+
+private:
+  ACE_Thread_Manager *tm_;
+  // Pointer to the thread manager for this block of code.
+
+  void *status_;
+  // Keeps track of the exit status for the thread.
+};
+
+class ACE_Export ACE_Thread_Exit
+{
+  // = TITLE
+  //    Keep exit information for a Thread in thread specific storage.
+  //    so that the thread-specific exit hooks will get called no
+  //    matter how the thread exits (e.g., via <ACE_Thread::exit>, C++
+  //    or Win32 exception, "falling off the end" of the thread entry
+  //    point function, etc.).
+  //
+  // = DESCRIPTION
+  //    This clever little helper class is stored in thread-specific
+  //    storage using the <ACE_TSS> wrapper.  When a thread exits the
+  //    <ACE_TSS::cleanup> function deletes this object, thereby
+  //    closing it down gracefully.
+public:
+  ACE_Thread_Exit (void);
+  // Capture the Thread that will be cleaned up automatically.
+
+  void thr_mgr (ACE_Thread_Manager *tm);
+  // Set the <ACE_Thread_Manager>.
+
+  void *status (void *s);
+  // Set the exit status.
+
+  void *status (void);
+  // Get the exit status.
+
+  ~ACE_Thread_Exit (void);
+  // Destructor calls the thread-specific exit hooks when a thread
+  // exits.
+
+  static ACE_Thread_Exit *instance (void);
+  // Singleton access point.
+
+  static void cleanup (void *instance, void *);
+  // Cleanup method, used by the <ACE_Object_Manager> to destroy the
+  // singleton.
+
+private:
+  void *status_;
+  // Exit status...
+
+  ACE_Thread_Control thread_control_;
+  // Automatically add/remove the thread from the
+  // <ACE_Thread_Manager>.
+};
+
 #if defined (__ACE_INLINE__)
 #include "ace/Thread_Manager.i"
 #endif /* __ACE_INLINE__ */
diff --git a/ace/Thread_Manager.i b/ace/Thread_Manager.i
index 54ceac2638e..7f4ccb50c99 100644
--- a/ace/Thread_Manager.i
+++ b/ace/Thread_Manager.i
@@ -92,8 +92,7 @@ ACE_At_Thread_Exit_Func::apply()
 
 ACE_INLINE
 ACE_Thread_Descriptor_Base::ACE_Thread_Descriptor_Base (void)
-  : ACE_OS_Thread_Descriptor (),
-    thr_id_ (ACE_OS::NULL_thread),
+  : thr_id_ (ACE_OS::NULL_thread),
     thr_handle_ (ACE_OS::NULL_hthread),
     grp_id_ (0),
     thr_state_ (ACE_Thread_Manager::ACE_THR_IDLE),
@@ -160,6 +159,14 @@ ACE_Thread_Descriptor::self (ACE_hthread_t &handle)
   handle = this->thr_handle_;
 }
 
+// Get the thread creation
+ACE_INLINE long
+ACE_Thread_Descriptor::flags (void) const
+{
+  ACE_TRACE ("ACE_Thread_Descriptor::flag");
+  return flags_;
+}
+
 #if !defined(ACE_USE_ONE_SHOT_AT_THREAD_EXIT)
 ACE_INLINE void
 ACE_Thread_Descriptor::log_msg_cleanup(ACE_Log_Msg* log_msg)
@@ -181,7 +188,7 @@ ACE_Thread_Descriptor::set_next (ACE_Thread_Descriptor *td)
 ACE_INLINE ACE_Thread_Descriptor *
 ACE_Thread_Descriptor::get_next (void)
 {
-  ACE_TRACE ("ACE_Thread_Descriptor::get_next");
+  ACE_TRACE ("ACE_Thread_Descriptor::flag");
   return ACE_static_cast (ACE_Thread_Descriptor *, this->next_);
 }
 
@@ -329,9 +336,3 @@ ACE_Thread_Manager::register_as_terminated (ACE_Thread_Descriptor *td)
 #endif /* ! VXWORKS */
   return 0;
 }
-
-ACE_INLINE int
-ACE_Thread_Manager::count_threads (void) const
-{
-  return this->thr_list_.size ();
-}
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/TkReactor.cpp b/ace/TkReactor.cpp
deleted file mode 100644
index b32a0220333..00000000000
--- a/ace/TkReactor.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-#define ACE_BUILD_DLL
-#include "ace/Synch_T.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/TkReactor.h"
-
-ACE_RCSID(ace, TkReactor, "$Id$")
-
-#if defined (ACE_HAS_TK)
-
-ACE_ALLOC_HOOK_DEFINE (ACE_TkReactor)
-
-// Must be called with lock held
-ACE_TkReactor::ACE_TkReactor (size_t size,
-			      int restart,
-			      ACE_Sig_Handler *h)
-  : ACE_Select_Reactor (size, restart, h),
-    ids_ (0),
-    timeout_ (0)
-{
-  // When the ACE_Select_Reactor is constructed it creates the notify
-  // pipe and registers it with the register_handler_i() method. The
-  // TkReactor overloads this method BUT because the
-  // register_handler_i occurs when constructing the base class
-  // ACE_Select_Reactor, the ACE_Select_Reactor register_handler_i()
-  // is called not the TkReactor register_handler_i().  This means
-  // that the notify pipe is registered with the ACE_Select_Reactor
-  // event handling code not the TkReactor and so notfications don't
-  // work.  To get around this we simply close and re-opened the
-  // notification handler in the constructor of the TkReactor.
-
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-  this->notify_handler_->close ();
-  this->notify_handler_->open (this, 0);
-#endif /* ACE_MT_SAFE */
-}
-
-ACE_TkReactor::~ACE_TkReactor (void)
-{
-  // Delete the remaining items in the linked list.
-
-  while (this->ids_)
-    {
-      ACE_TkReactorID *TkID = this->ids_->next_;
-      delete this->ids_;
-      this->ids_ = TkID;
-    }
-}
-
-// This is just the <wait_for_multiple_events> from ace/Reactor.cpp
-// but we use the Tk functions to wait for an event, not <select>
-
-int
-ACE_TkReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
-					 ACE_Time_Value *max_wait_time)
-{
-  ACE_TRACE ("ACE_TkReactor::wait_for_multiple_events");
-  int nfound;
-
-  do
-    {
-      max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
-      size_t width = this->handler_rep_.max_handlep1 ();
-      handle_set.rd_mask_ = this->wait_set_.rd_mask_;
-      handle_set.wr_mask_ = this->wait_set_.wr_mask_;
-      handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = TkWaitForMultipleEvents (width,
-					handle_set,
-					max_wait_time);
-
-    } while (nfound == -1 && this->handle_error () > 0);
-
-  if (nfound > 0)
-    {
-#if !defined (ACE_WIN32)
-      handle_set.rd_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.wr_mask_.sync (this->handler_rep_.max_handlep1 ());
-      handle_set.ex_mask_.sync (this->handler_rep_.max_handlep1 ());
-#endif /* ACE_WIN32 */
-    }
-  return nfound; // Timed out or input available
-}
-
-void
-ACE_TkReactor::TimerCallbackProc (ClientData cd)
-{
-  ACE_TkReactor *self = (ACE_TkReactor *) cd;
-  self->timeout_ = 0;
-
-  // Deal with any timer events
-  ACE_Select_Reactor_Handle_Set handle_set;
-  self->dispatch (0, handle_set);
-  self->reset_timeout ();
-}
-
-// This could be made shorter if we know which *kind* of event we were
-// about to get.  Here we use <select> to find out which one might be
-// available.
-
-void
-ACE_TkReactor::InputCallbackProc (ClientData cd,
-				  int mask)
-{
-  ACE_TkReactor_Input_Callback *callback = (ACE_TkReactor_Input_Callback *) cd;
-  ACE_TkReactor *self = callback->reactor_;
-  ACE_HANDLE handle = callback->handle_;
-
-  // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
-
-  ACE_Select_Reactor_Handle_Set wait_set;
-
-  // Deal with one file event.
-
-  // - read which kind of event
-  if (self->wait_set_.rd_mask_.is_set (handle))
-    wait_set.rd_mask_.set_bit (handle);
-  if (self->wait_set_.wr_mask_.is_set (handle))
-    wait_set.wr_mask_.set_bit (handle);
-  if (self->wait_set_.ex_mask_.is_set (handle))
-    wait_set.ex_mask_.set_bit (handle);
-
-  int result = ACE_OS::select (handle + 1,
-			       wait_set.rd_mask_,
-			       wait_set.wr_mask_,
-			       wait_set.ex_mask_, &zero);
-
-  ACE_Select_Reactor_Handle_Set dispatch_set;
-
-  // - Use only that one file event (removes events for other files).
-  if (result > 0)
-    {
-      if (wait_set.rd_mask_.is_set (handle))
-	dispatch_set.rd_mask_.set_bit (handle);
-      if (wait_set.wr_mask_.is_set (handle))
-	dispatch_set.wr_mask_.set_bit (handle);
-      if (wait_set.ex_mask_.is_set (handle))
-	dispatch_set.ex_mask_.set_bit (handle);
-
-      self->dispatch (1, dispatch_set);
-    }
-}
-
-int
-ACE_TkReactor::TkWaitForMultipleEvents (int width,
-					ACE_Select_Reactor_Handle_Set &wait_set,
-					ACE_Time_Value *)
-{
-  // Check to make sure our handle's are all usable.
-  ACE_Select_Reactor_Handle_Set temp_set = wait_set;
-
-  if (ACE_OS::select (width,
-		      temp_set.rd_mask_,
-		      temp_set.wr_mask_,
-		      temp_set.ex_mask_,
-		      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-    return -1; // Bad file arguments...
-
-  // Instead of waiting using <select>, just use the Tk mechanism to
-  // wait for a single event.
-
-  // Wait for something to happen.
-  ::Tcl_DoOneEvent (0);
-
-  // Reset the width, in case it changed during the upcalls.
-  width = this->handler_rep_.max_handlep1 ();
-
-  // Now actually read the result needed by the <Select_Reactor> using
-  // <select>.
-  return ACE_OS::select (width,
-			 wait_set.rd_mask_,
-			 wait_set.wr_mask_,
-			 wait_set.ex_mask_,
-			 (ACE_Time_Value *) &ACE_Time_Value::zero);
-}
-
-int
-ACE_TkReactor::register_handler_i (ACE_HANDLE handle,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::register_handler_i");
-
-  int result = ACE_Select_Reactor::register_handler_i (handle,
-                                                       handler, mask);
-  if (result == -1)
-    return -1;
-
-  int condition = 0;
-
-#if !defined ACE_WIN32
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_SET_BITS (condition, TK_EXCEPTION);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#else
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
-    ACE_SET_BITS (condition, TK_WRITABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
-    ACE_NOTSUP_RETURN(-1);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
-    ACE_SET_BITS (condition, TK_READABLE);
-  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK)){
-      ACE_SET_BITS (condition, TK_READABLE); // connected, you may write
-      ACE_SET_BITS (condition, TK_WRITABLE);  // connected, you have data/err
-  }
-#endif /* !ACE_WIN32 */
-
-  if (condition != 0)
-    {
-      ACE_TkReactorID *TkID = this->ids_;
-
-      while(TkID)
-        {
-          if (TkID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (TkID->handle_);
-
-              ACE_TkReactor_Input_Callback *callback;
-              ACE_NEW_RETURN (callback,
-                              ACE_TkReactor_Input_Callback,
-                              -1);
-              callback->reactor_ = this;
-              callback->handle_ = handle;
-              ::Tk_CreateFileHandler ((int) handle,
-                                      condition,
-                                      InputCallbackProc,
-                                      (ClientData) callback);
-              return 0;
-            }
-          else
-            TkID = TkID->next_;
-        }
-
-      ACE_NEW_RETURN (TkID,
-                      ACE_TkReactorID,
-                      -1);
-      TkID->next_ = this->ids_;
-      TkID->handle_ = handle;
-      ACE_TkReactor_Input_Callback *callback;
-      ACE_NEW_RETURN (callback,
-                      ACE_TkReactor_Input_Callback,
-                      -1);
-      callback->reactor_ = this;
-      callback->handle_ = handle;
-
-      ::Tk_CreateFileHandler ((int) handle,
-                              condition,
-                              InputCallbackProc,
-                              (ClientData) callback);
-      this->ids_ = TkID;
-    }
-  return 0;
-}
-
-int
-ACE_TkReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
-				   ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::register_handler_i (handles,
-                                                 handler,
-                                                 mask);
-}
-
-int
-ACE_TkReactor::remove_handler_i (ACE_HANDLE handle,
-				 ACE_Reactor_Mask mask)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_handler_i");
-
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  this->remove_TkFileHandler (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-void
-ACE_TkReactor::remove_TkFileHandler (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_TkReactor::remove_TkInput");
-
-  ACE_TkReactorID *TkID = this->ids_;
-
-  if (TkID)
-    {
-      if (TkID->handle_ == handle)
-        {
-          ::Tk_DeleteFileHandler (TkID->handle_);
-          this->ids_ = TkID->next_;
-          delete TkID;
-          return;
-        }
-
-      ACE_TkReactorID *NextID = TkID->next_;
-
-      while (NextID)
-        {
-          if (NextID->handle_ == handle)
-            {
-              ::Tk_DeleteFileHandler (NextID->handle_);
-              TkID->next_ = NextID->next_;
-              delete NextID;
-              return;
-            }
-          else
-            {
-              TkID = NextID;
-              NextID = NextID->next_;
-            }
-        }
-    }
-}
-
-int
-ACE_TkReactor::remove_handler_i (const ACE_Handle_Set &handles,
-				 ACE_Reactor_Mask mask)
-{
-  return ACE_Select_Reactor::remove_handler_i (handles,
-					       mask);
-}
-
-// The following functions ensure that there is an Tk timeout for the
-// first timeout in the Reactor's Timer_Queue.
-
-void
-ACE_TkReactor::reset_timeout (void)
-{
-  if (this->timeout_)
-    ::Tk_DeleteTimerHandler (this->timeout_);
-  timeout_ = 0;
-
-  ACE_Time_Value *max_wait_time =
-    this->timer_queue_->calculate_timeout (0);
-
-  if (max_wait_time)
-    timeout_ = ::Tk_CreateTimerHandler (max_wait_time->msec (),
-                                        TimerCallbackProc,
-                                        (ClientData) this);
-}
-
-long
-ACE_TkReactor::schedule_timer (ACE_Event_Handler *handler,
-			       const void *arg,
-			       const ACE_Time_Value &delta_time,
-			       const ACE_Time_Value &interval)
-{
-  ACE_TRACE ("ACE_TkReactor::schedule_timer");
-  ACE_MT (ACE_GUARD_RETURN (ACE_Select_Reactor_Token, ace_mon, this->token_, -1));
-
-  long result = ACE_Select_Reactor::schedule_timer (handler,
-                                                    arg,
-                                                    delta_time,
-                                                    interval);
-  if (result == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return result;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (ACE_Event_Handler *handler,
-			     int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (handler,
-					dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-int
-ACE_TkReactor::cancel_timer (long timer_id,
-			     const void **arg,
-			     int dont_call_handle_close)
-{
-  ACE_TRACE ("ACE_TkReactor::cancel_timer");
-
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
-					arg,
-					dont_call_handle_close) == -1)
-    return -1;
-  else
-    {
-      this->reset_timeout ();
-      return 0;
-    }
-}
-
-#endif /* ACE_HAS_TK */
diff --git a/ace/TkReactor.h b/ace/TkReactor.h
deleted file mode 100644
index 7290a49d9c3..00000000000
--- a/ace/TkReactor.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    TkReactor.h
-//
-// = AUTHOR
-//    Nagarajan Surendran <naga@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_TKREACTOR_H
-#define ACE_TKREACTOR_H
-
-#include "ace/Select_Reactor.h"
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (ACE_HAS_TK)
-#include <tk.h>
-
-class ACE_Export ACE_TkReactorID
-{
-  // = TITLE
-  //     This little class is necessary due to the way that Microsoft
-  //     implements sockets to be pointers rather than indices.
-public:
-  ACE_HANDLE handle_;
-  // Underlying handle.
-
-  ACE_TkReactorID *next_;
-  // Pointer to next node in the linked list.
-};
-
-class ACE_TkReactor;
-
-class ACE_Export ACE_TkReactor_Input_Callback
-{
-public:
-  ACE_TkReactor *reactor_;
-  ACE_HANDLE handle_;
-};
-
-class ACE_Export ACE_TkReactor : public ACE_Select_Reactor
-{
-  // = TITLE
-  //     An object-oriented event demultiplexor and event handler
-  //     dispatcher that uses the Tk functions.
-public:
-  // = Initialization and termination methods.
-  ACE_TkReactor (size_t size = DEFAULT_SIZE,
-                 int restart = 0,
-                 ACE_Sig_Handler * = 0);
-
-  virtual ~ACE_TkReactor (void);
-
-  // = Timer operations.
-  virtual long schedule_timer (ACE_Event_Handler *handler,
-                               const void *arg,
-                               const ACE_Time_Value &delta_time,
-                               const ACE_Time_Value &interval);
-
-  virtual int cancel_timer (ACE_Event_Handler *handler,
-                            int dont_call_handle_close = 1);
-
-  virtual int cancel_timer (long timer_id,
-                            const void **arg = 0,
-                            int dont_call_handle_close = 1);
-
-protected:
-  // = Register timers/handles with Tk.
-  virtual int register_handler_i (ACE_HANDLE handle,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-  // Register a single <handler>.
-
-  virtual int register_handler_i (const ACE_Handle_Set &handles,
-                                  ACE_Event_Handler *handler,
-                                  ACE_Reactor_Mask mask);
-  // Register a set of <handlers>.
-
-  virtual int remove_handler_i (ACE_HANDLE handle,
-                                ACE_Reactor_Mask mask);
-  // Remove the <handler> associated with this <handle>.
-
-  virtual int remove_handler_i (const ACE_Handle_Set &handles,
-                                ACE_Reactor_Mask);
-  // Remove a set of <handles>.
-
-  virtual void remove_TkFileHandler (ACE_HANDLE handle);
-  // Removes an Tk FileHandler.
-
-  virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
-                                        ACE_Time_Value *);
-  // Wait for events to occur.
-
-  virtual int TkWaitForMultipleEvents (int,
-                                       ACE_Select_Reactor_Handle_Set &,
-                                       ACE_Time_Value *);
-  //Wait for Tk events to occur.
-
-  ACE_TkReactorID *ids_;
-  Tk_TimerToken timeout_;
-
-private:
-  void reset_timeout (void);
-
-  // = Integrate with the X callback function mechanism.
-  static void TimerCallbackProc (ClientData cd);
-  static void InputCallbackProc (ClientData cd,int mask);
-
-  ACE_TkReactor (const ACE_TkReactor &);
-  ACE_TkReactor &operator = (const ACE_TkReactor &);
-  // Deny access since member-wise won't work...
-};
-
-#endif /* ACE_HAS_TK */
-#endif /* ACE_TK_REACTOR_H */
diff --git a/ace/Token_Manager.cpp b/ace/Token_Manager.cpp
index d202bae2006..aff18c45f91 100644
--- a/ace/Token_Manager.cpp
+++ b/ace/Token_Manager.cpp
@@ -229,7 +229,7 @@ ACE_Token_Manager::release_token (ACE_Tokens *&token)
         {
           errno = ENOENT;
           ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Token Manager could not release %s:%d\n"),
-                      ASYS_ONLY_MULTIBYTE_STRING (token->name ()), token->type ()));
+                      ASYS_MULTIBYTE_STRING (token->name ()), token->type ()));
           // @@ bad
         }
       else
diff --git a/ace/Trace.cpp b/ace/Trace.cpp
index 9b7c6345dd3..8740dbd7c63 100644
--- a/ace/Trace.cpp
+++ b/ace/Trace.cpp
@@ -13,6 +13,16 @@ ACE_RCSID(ace, Trace, "$Id$")
 #endif /* ACE_NTRACE */
 #define ACE_NTRACE 1
 
+// This must come first to avoid "order of include" problems...
+
+#if !defined (ACE_HAS_INLINED_OSCALLS) && !defined(ACE_HAS_ONE_DEFINITION_RULE)
+#define ACE_HAS_INLINED_OSCALLS
+#include "ace/ACE.h"
+#undef ACE_HAS_INLINED_OSCALLS
+#else
+#include "ace/ACE.h"
+#endif /* !ACE_HAS_INLINED_OSCALLS */
+
 #include "ace/Log_Msg.h"
 #include "ace/Trace.h"
 
diff --git a/ace/UNIX_Addr.h b/ace/UNIX_Addr.h
index 1c8b9a8269e..b198b13da25 100644
--- a/ace/UNIX_Addr.h
+++ b/ace/UNIX_Addr.h
@@ -50,7 +50,7 @@ public:
   // Creates an ACE_UNIX_Addr from a string.
 
   int set (const sockaddr_un *, int len);
-  // Creates an ACE_UNIX_Addr from a sockaddr_un structure.
+  // Creates an ACE_INET_Addr from a sockaddr_un structure.
 
   virtual void *get_addr (void) const;
   // Return a pointer to the underlying network address.
diff --git a/ace/UPIPE_Acceptor.h b/ace/UPIPE_Acceptor.h
index c14fedca21d..c1fbdb318d1 100644
--- a/ace/UPIPE_Acceptor.h
+++ b/ace/UPIPE_Acceptor.h
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 // ============================================================================
 //
 // = LIBRARY
diff --git a/ace/Version.h b/ace/Version.h
index 73a4cf3341e..6c95108ca30 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -1,7 +1,7 @@
 // $Id$
 // This is an automatically generated file.
 
-#define ACE_MAJOR_VERSION 4
-#define ACE_MINOR_VERSION 6
-#define ACE_BETA_VERSION 40
-#define ACE_VERSION "4.6.40"
+#define ACE_MAJOR_VERSION (4u)
+#define ACE_MINOR_VERSION (6u)
+#define ACE_BETA_VERSION (22u)
+#define ACE_VERSION "4.6.22\0"
diff --git a/ace/WFMO_Reactor.cpp b/ace/WFMO_Reactor.cpp
index 67733f38837..ddb03e7d922 100644
--- a/ace/WFMO_Reactor.cpp
+++ b/ace/WFMO_Reactor.cpp
@@ -27,8 +27,8 @@ int
 ACE_WFMO_Reactor_Handler_Repository::open (size_t size)
 {
   if (size > MAXIMUM_WAIT_OBJECTS)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"),
+    ACE_ERROR_RETURN ((LM_ERROR, 
+                       ASYS_TEXT ("%d exceeds MAXIMUM_WAIT_OBJECTS (%d)\n"), 
                        size,
                        MAXIMUM_WAIT_OBJECTS),
                       -1);
@@ -65,137 +65,46 @@ ACE_WFMO_Reactor_Handler_Repository::open (size_t size)
 ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void)
 {
   // Free up dynamically allocated space
-  delete [] this->current_handles_;
-  delete [] this->current_info_;
-  delete [] this->current_suspended_info_;
-  delete [] this->to_be_added_info_;
+  delete[] this->current_handles_;
+  delete[] this->current_info_;
+  delete[] this->current_suspended_info_;
+  delete[] this->to_be_added_info_;
 }
 
-ACE_Reactor_Mask
-ACE_WFMO_Reactor_Handler_Repository::bit_ops (long &existing_masks,
-                                              ACE_Reactor_Mask change_masks,
-                                              int operation)
+void
+ACE_WFMO_Reactor_Handler_Repository::remove_network_events_i (long &existing_masks,
+							      ACE_Reactor_Mask to_be_removed_masks)
 {
-  //
-  // Find the old reactor masks.  This automatically does the work of
-  // the GET_MASK operation.
-  //
-
-  ACE_Reactor_Mask old_masks = ACE_Event_Handler::NULL_MASK;
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_READ) ||
-      ACE_BIT_ENABLED (existing_masks, FD_CLOSE))
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::READ_MASK))
     {
-      ACE_SET_BITS (old_masks, ACE_Event_Handler::READ_MASK);
+      ACE_CLR_BITS (existing_masks, FD_READ);
+      ACE_CLR_BITS (existing_masks, FD_CLOSE);
     }
 
-  if (ACE_BIT_ENABLED (existing_masks, FD_WRITE))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::WRITE_MASK);
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_OOB))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::EXCEPT_MASK);
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_ACCEPT))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::ACCEPT_MASK);
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_CONNECT))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::CONNECT_MASK);
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_QOS))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::QOS_MASK);
-
-  if (ACE_BIT_ENABLED (existing_masks, FD_GROUP_QOS))
-    ACE_SET_BITS (old_masks, ACE_Event_Handler::GROUP_QOS_MASK);
-
-  switch (operation)
-    {
-    case ACE_Reactor::CLR_MASK:
-
-      //
-      // For the CLR_MASK operation, clear only the specific masks.
-      //
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK))
-        {
-          ACE_CLR_BITS (existing_masks, FD_READ);
-          ACE_CLR_BITS (existing_masks, FD_CLOSE);
-        }
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::WRITE_MASK))
-        ACE_CLR_BITS (existing_masks, FD_WRITE);
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::EXCEPT_MASK))
-        ACE_CLR_BITS (existing_masks, FD_OOB);
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::ACCEPT_MASK))
-        ACE_CLR_BITS (existing_masks, FD_ACCEPT);
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::CONNECT_MASK))
-        ACE_CLR_BITS (existing_masks, FD_CONNECT);
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::QOS_MASK))
-        ACE_CLR_BITS (existing_masks, FD_QOS);
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::GROUP_QOS_MASK))
-        ACE_CLR_BITS (existing_masks, FD_GROUP_QOS);
-
-      break;
-
-    case ACE_Reactor::SET_MASK:
-
-      //
-      // If the operation is a set, first reset any existing masks
-      //
-
-      existing_masks = 0;
-      /* FALLTHRU */
-
-    case ACE_Reactor::ADD_MASK:
-
-      //
-      // For the ADD_MASK and the SET_MASK operation, add only the
-      // specific masks.
-      //
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::READ_MASK))
-        {
-          ACE_SET_BITS (existing_masks, FD_READ);
-          ACE_SET_BITS (existing_masks, FD_CLOSE);
-        }
-
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::WRITE_MASK))
-        ACE_SET_BITS (existing_masks, FD_WRITE);
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::WRITE_MASK))
+    ACE_CLR_BITS (existing_masks, FD_WRITE);
 
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::EXCEPT_MASK))
-        ACE_SET_BITS (existing_masks, FD_OOB);
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::EXCEPT_MASK))
+    ACE_CLR_BITS (existing_masks, FD_OOB);
 
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::ACCEPT_MASK))
-        ACE_SET_BITS (existing_masks, FD_ACCEPT);
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::ACCEPT_MASK))
+    ACE_CLR_BITS (existing_masks, FD_ACCEPT);
 
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::CONNECT_MASK))
-        ACE_SET_BITS (existing_masks, FD_CONNECT);
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::CONNECT_MASK))
+    ACE_CLR_BITS (existing_masks, FD_CONNECT);
 
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::QOS_MASK))
-        ACE_SET_BITS (existing_masks, FD_QOS);
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::QOS_MASK))
+    ACE_CLR_BITS (existing_masks, FD_QOS);
 
-      if (ACE_BIT_ENABLED (change_masks, ACE_Event_Handler::GROUP_QOS_MASK))
-        ACE_SET_BITS (existing_masks, FD_GROUP_QOS);
-
-      break;
-
-    case ACE_Reactor::GET_MASK:
-
-      //
-      // The work for this operation is done in all cases at the
-      // begining of the function.
-      //
-
-      ACE_UNUSED_ARG (change_masks);
-
-      break;
-    }
-
-  return old_masks;
+  if (ACE_BIT_ENABLED (to_be_removed_masks,
+                       ACE_Event_Handler::GROUP_QOS_MASK))
+    ACE_CLR_BITS (existing_masks, FD_GROUP_QOS);
 }
 
 int
@@ -224,8 +133,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
         // Make sure that it is not already marked for deleted
         !this->current_info_[i].delete_entry_)
       {
-        result = this->remove_handler_i (i,
-                                         mask);
+        result = this->remove_handler_i (i, mask);
         if (result == -1)
           error = 1;
       }
@@ -239,8 +147,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
         // Make sure that it is not already marked for deleted
         !this->current_suspended_info_[i].delete_entry_)
       {
-        result = this->remove_suspended_handler_i (i,
-                                                   mask);
+        result = this->remove_suspended_handler_i (i, mask);
         if (result == -1)
           error = 1;
       }
@@ -254,8 +161,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind_i (ACE_HANDLE handle,
         // Make sure that it is not already marked for deleted
         !this->to_be_added_info_[i].delete_entry_)
       {
-        result = this->remove_to_be_added_handler_i (i,
-                                                     mask);
+        result = this->remove_to_be_added_handler_i (i, mask);
         if (result == -1)
           error = 1;
       }
@@ -277,9 +183,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t index,
     {
       // See if there are other events that the <Event_Handler> is
       // interested in
-      this->bit_ops (this->current_info_[index].network_events_,
-                     to_be_removed_masks,
-                     ACE_Reactor::CLR_MASK);
+      this->remove_network_events_i (this->current_info_[index].network_events_,
+				     to_be_removed_masks);
 
       // Disassociate/Reassociate the event from/with the I/O handle.
       // This will depend on the value of remaining set of network
@@ -311,7 +216,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t index,
       // Remember the mask
       this->current_info_[index].close_masks_ = to_be_removed_masks;
       // Increment the handle count
-          this->handles_to_be_deleted_++;
+      this->handles_to_be_deleted_++;
     }
   else
     {
@@ -324,7 +229,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_handler_i (size_t index,
       if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
         {
           ACE_HANDLE handle = this->current_info_[index].io_handle_;
-          this->current_info_[index].event_handler_->handle_close (handle,
+          this->current_info_[index].event_handler_->handle_close (handle, 
                                                                    to_be_removed_masks);
         }
     }
@@ -341,9 +246,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_suspended_handler_i (size_t index,
     {
       // See if there are other events that the <Event_Handler> is
       // interested in
-      this->bit_ops (this->current_suspended_info_[index].network_events_,
-                     to_be_removed_masks,
-                     ACE_Reactor::CLR_MASK);
+      this->remove_network_events_i (this->current_suspended_info_[index].network_events_,
+				     to_be_removed_masks);
 
       // Disassociate/Reassociate the event from/with the I/O handle.
       // This will depend on the value of remaining set of network
@@ -405,9 +309,8 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t index,
     {
       // See if there are other events that the <Event_Handler> is
       // interested in
-      this->bit_ops (this->to_be_added_info_[index].network_events_,
-                     to_be_removed_masks,
-                     ACE_Reactor::CLR_MASK);
+      this->remove_network_events_i (this->to_be_added_info_[index].network_events_,
+				     to_be_removed_masks);
 
       // Disassociate/Reassociate the event from/with the I/O handle.
       // This will depend on the value of remaining set of network
@@ -452,7 +355,7 @@ ACE_WFMO_Reactor_Handler_Repository::remove_to_be_added_handler_i (size_t index,
       if (ACE_BIT_ENABLED (to_be_removed_masks, ACE_Event_Handler::DONT_CALL) == 0)
         {
           ACE_HANDLE handle = this->to_be_added_info_[index].io_handle_;
-          this->to_be_added_info_[index].event_handler_->handle_close (handle,
+          this->to_be_added_info_[index].event_handler_->handle_close (handle, 
                                                                        to_be_removed_masks);
         }
     }
@@ -918,7 +821,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes_in_to_be_added_infos (void)
   return 0;
 }
 
-void
+void 
 ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 {
   size_t i = 0;
@@ -927,7 +830,7 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Max size = %d\n"),
               this->max_size_));
 
@@ -980,7 +883,7 @@ ACE_WFMO_Reactor_Handler_Repository::dump (void) const
   ACE_DEBUG ((LM_DEBUG,
               ACE_END_DUMP));
 }
-
+  
 /************************************************************/
 
 ACE_WFMO_Reactor::ACE_WFMO_Reactor (ACE_Sig_Handler *sh,
@@ -1129,7 +1032,7 @@ ACE_WFMO_Reactor::open (size_t size,
 
   // Open the notification handler
   if (this->notify_handler_->open (this, this->timer_queue_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
+    ACE_ERROR_RETURN ((LM_ERROR, 
                        ASYS_TEXT ("%p\n"),
 		       ASYS_TEXT ("opening notify handler ")),
 		      -1);
@@ -1235,7 +1138,7 @@ 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_Reactor_Mask mask)
 {
   // Make sure that the <handle> is valid
   if (io_handle == ACE_INVALID_HANDLE)
@@ -1246,24 +1149,22 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
 
   long new_network_events = 0;
   int delete_event = 0;
+
   auto_ptr <ACE_Auto_Event> event;
 
-  // Look up the repository to see if the <event_handler> is already
+  // Look up the repository to see if the <Event_Handler> is already
   // there.
-  ACE_Reactor_Mask old_masks;
-  int found = this->handler_rep_.modify_network_events_i (io_handle,
-                                                          new_masks,
-                                                          old_masks,
-                                                          new_network_events,
-                                                          event_handle,
-                                                          delete_event,
-                                                          ACE_Reactor::ADD_MASK);
+  int found = this->handler_rep_.add_network_events_i (mask,
+						       io_handle,
+						       new_network_events,
+						       event_handle,
+						       delete_event);
 
   // Check to see if the user passed us a valid event; If not then we
   // need to create one
   if (event_handle == ACE_INVALID_HANDLE)
     {
-      event = auto_ptr<ACE_Auto_Event> (new ACE_Auto_Event);
+      event = auto_ptr <ACE_Auto_Event> (new ACE_Auto_Event);
       event_handle = event->handle ();
       delete_event = 1;
     }
@@ -1282,8 +1183,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
                                       event_handle,
                                       delete_event) != -1)
     {
-      // The <event_handler> was not found in the repository, add to
-      // the repository.
+      // The <Event_Handler was not found in the repository Add to the
+      // repository.
       if (delete_event)
         event->handle (ACE_INVALID_HANDLE);
       return 0;
@@ -1293,9 +1194,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle,
 }
 
 int
-ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle,
-                              ACE_Reactor_Mask new_masks,
-                              int operation)
+ACE_WFMO_Reactor::schedule_wakeup_i (ACE_HANDLE io_handle,
+				     ACE_Reactor_Mask masks_to_be_added)
 {
   // Make sure that the <handle> is valid
   if (this->handler_rep_.invalid_handle (io_handle))
@@ -1307,40 +1207,28 @@ ACE_WFMO_Reactor::mask_ops_i (ACE_HANDLE io_handle,
 
   // Look up the repository to see if the <Event_Handler> is already
   // there.
-  ACE_Reactor_Mask old_masks;
-  int found = this->handler_rep_.modify_network_events_i (io_handle,
-                                                          new_masks,
-                                                          old_masks,
-                                                          new_network_events,
-                                                          event_handle,
-                                                          delete_event,
-                                                          operation);
+  int found = this->handler_rep_.add_network_events_i (masks_to_be_added,
+						       io_handle,
+						       new_network_events,
+						       event_handle,
+						       delete_event);
   if (found)
-    {
-      int result = ::WSAEventSelect ((SOCKET) io_handle,
-                                     event_handle,
-                                     new_network_events);
-      if (result == 0)
-        return old_masks;
-      else
-        return result;
-    }
+    return ::WSAEventSelect ((SOCKET) io_handle,
+			     event_handle,
+			     new_network_events);
   else
     return -1;
 }
 
 
-
 int
-ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_handle,
-                                                              ACE_Reactor_Mask new_masks,
-                                                              ACE_Reactor_Mask &old_masks,
-                                                              long &new_network_events,
-                                                              ACE_HANDLE &event_handle,
-                                                              int &delete_event,
-                                                              int operation)
+ACE_WFMO_Reactor_Handler_Repository::add_network_events_i (ACE_Reactor_Mask mask,
+							   ACE_HANDLE io_handle,
+							   long &new_masks,
+							   ACE_HANDLE &event_handle,
+							   int &delete_event)
 {
-  long *modified_network_events = &new_network_events;
+  long *modified_masks = &new_masks;
   int found = 0;
   size_t i;
 
@@ -1353,7 +1241,7 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
         !this->current_info_[i].delete_entry_)
       {
 	found = 1;
-	modified_network_events = &this->current_info_[i].network_events_;
+	modified_masks = &this->current_info_[i].network_events_;
 	delete_event = this->current_info_[i].delete_event_;
 	event_handle = this->current_handles_[i];
       }
@@ -1367,7 +1255,7 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
         !this->current_suspended_info_[i].delete_entry_)
       {
 	found = 1;
-	modified_network_events = &this->current_suspended_info_[i].network_events_;
+	modified_masks = &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_;
       }
@@ -1381,16 +1269,36 @@ ACE_WFMO_Reactor_Handler_Repository::modify_network_events_i (ACE_HANDLE io_hand
         !this->to_be_added_info_[i].delete_entry_)
       {
 	found = 1;
-	modified_network_events = &this->to_be_added_info_[i].network_events_;
+	modified_masks = &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,
-                             new_masks,
-                             operation);
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::READ_MASK))
+    {
+      ACE_SET_BITS (*modified_masks, FD_READ);
+      ACE_SET_BITS (*modified_masks, FD_CLOSE);
+    }
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::WRITE_MASK))
+    ACE_SET_BITS (*modified_masks, FD_WRITE);
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::EXCEPT_MASK))
+    ACE_SET_BITS (*modified_masks, FD_OOB);
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::ACCEPT_MASK))
+    ACE_SET_BITS (*modified_masks, FD_ACCEPT);
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::CONNECT_MASK))
+    ACE_SET_BITS (*modified_masks, FD_CONNECT);
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::QOS_MASK))
+    ACE_SET_BITS (*modified_masks, FD_QOS);
+
+  if (ACE_BIT_ENABLED (mask, ACE_Event_Handler::GROUP_QOS_MASK))
+    ACE_SET_BITS (*modified_masks, FD_GROUP_QOS);
 
-  new_network_events = *modified_network_events;
+  new_masks = *modified_masks;
 
   return found;
 }
@@ -1502,8 +1410,8 @@ ACE_WFMO_Reactor::poll_remaining_handles (size_t index)
 {
   return ::WaitForMultipleObjects (this->handler_rep_.max_handlep1 () - index,
                                    this->handler_rep_.handles () + index,
-                                   FALSE,
-                                   0);
+                                   FALSE, 
+                                   0); 
 }
 
 int
@@ -1600,14 +1508,14 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
       // Dispatch handler
       if (this->dispatch_handler (dispatch_index, max_handlep1) == -1)
         return -1;
-
+      
       // Increment index
       dispatch_index++;
 
       // We're done.
       if (dispatch_index >= max_handlep1)
 	return number_of_handlers_dispatched;
-
+      
       // Readjust nCount
       nCount = max_handlep1 - dispatch_index;
 
@@ -1626,7 +1534,7 @@ ACE_WFMO_Reactor::dispatch_handles (size_t wait_status)
 }
 
 int
-ACE_WFMO_Reactor::dispatch_handler (size_t index,
+ACE_WFMO_Reactor::dispatch_handler (size_t index, 
                                     size_t max_handlep1)
 {
   // Check if there are window messages that need to be dispatched
@@ -1649,7 +1557,7 @@ ACE_WFMO_Reactor::dispatch_handler (size_t index,
           return this->complex_dispatch_handler (index, event_handle);
         else
           return this->simple_dispatch_handler (index, event_handle);
-      }
+      }    
     else
       // The handle was scheduled for deletion, so we will skip it.
       return 0;
@@ -1715,19 +1623,19 @@ ACE_WFMO_Reactor::upcall (ACE_Event_Handler *event_handler,
     {
       long actual_events = events.lNetworkEvents;
 
-      if ((interested_events & actual_events & FD_READ) &&
+      if ((interested_events & actual_events & FD_READ) && 
           event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
-
+      
       if ((interested_events & actual_events & FD_CLOSE) &&
           !ACE_BIT_ENABLED (problems, ACE_Event_Handler::READ_MASK) &&
           event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::READ_MASK);
-
+      
       if ((interested_events & actual_events & FD_ACCEPT) &&
           event_handler->handle_input (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::ACCEPT_MASK);
-
+      
       if ((interested_events & actual_events & FD_WRITE) &&
           event_handler->handle_output (io_handle) == -1)
         ACE_SET_BITS (problems, ACE_Event_Handler::WRITE_MASK);
@@ -1831,11 +1739,11 @@ ACE_WFMO_Reactor::dump (void) const
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Count of currently active threads = %d\n"),
               this->active_threads_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("ID of owner thread = %d\n"),
               this->owner_));
 
@@ -1930,7 +1838,6 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 	      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:
@@ -1939,12 +1846,6 @@ ACE_WFMO_Reactor_Notify::handle_signal (int signum,
 		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"),
diff --git a/ace/WFMO_Reactor.h b/ace/WFMO_Reactor.h
index f27b2486441..7bb17b85eb2 100644
--- a/ace/WFMO_Reactor.h
+++ b/ace/WFMO_Reactor.h
@@ -260,13 +260,10 @@ public:
   // Insert I/O <Event_Handler> entry into the system. This method
   // assumes that the lock are head *before* this method is invoked.
 
-  int unbind (ACE_HANDLE,
-              ACE_Reactor_Mask mask);
+  int unbind (ACE_HANDLE, ACE_Reactor_Mask mask);
   // Remove the binding of <ACE_HANDLE> in accordance with the <mask>.
 
-  int unbind_i (ACE_HANDLE,
-                ACE_Reactor_Mask mask,
-                int &changes_required);
+  int unbind_i (ACE_HANDLE, ACE_Reactor_Mask mask, int &changes_required);
   // Non-lock-grabbing version of <unbind>
 
   void unbind_all (void);
@@ -298,21 +295,18 @@ public:
   int scheduled_for_deletion (size_t index) const;
   // Check to see if <index> has been scheduled for deletion
 
-  int modify_network_events_i (ACE_HANDLE io_handle,
-                               ACE_Reactor_Mask new_masks,
-                               ACE_Reactor_Mask &old_masks,
-                               long &new_network_events,
-                               ACE_HANDLE &event_handle,
-                               int &delete_event,
-                               int operation);
-  // This method is used to calculate the network mask after a mask_op
-  // request to <WFMO_Reactor>. Note that because the <Event_Handler>
-  // may already be in the handler repository, we may have to find the
-  // old event and the old network events
-
-  ACE_Reactor_Mask bit_ops (long &existing_masks,
-                            ACE_Reactor_Mask to_be_removed_masks,
-                            int operation);
+  int add_network_events_i (ACE_Reactor_Mask mask,
+                            ACE_HANDLE io_handle,
+                            long &new_mask,
+                            ACE_HANDLE &event_handle,
+                            int &delete_event);
+  // This method is used to calculate the network mask after a
+  // register request to <WFMO_Reactor>. Note that because the
+  // <Event_Handler> may already be in the handler repository, we may
+  // have to find the old event and the old network events
+
+  void remove_network_events_i (long &existing_masks,
+                                ACE_Reactor_Mask to_be_removed_masks);
   // This method is used to change the network mask left (if any)
   // after a remove request to <WFMO_Reactor>
 
@@ -792,16 +786,13 @@ public:
   // registered with WFMO_Reactor.
 
   virtual int cancel_wakeup (ACE_Event_Handler *event_handler,
-                             ACE_Reactor_Mask masks_to_be_deleted);
-  // Remove <masks_to_be_deleted> to the <handle>'s entry in
-  // WFMO_Reactor.  The Event_Handler associated with <handle> must
-  // already have been registered with WFMO_Reactor.
+                             ACE_Reactor_Mask mask);
+  // This method is identical to the <remove_handler> method.
 
   virtual int cancel_wakeup (ACE_HANDLE handle,
-                             ACE_Reactor_Mask masks_to_be_deleted);
-  // Remove <masks_to_be_deleted> to the <handle>'s entry in
-  // WFMO_Reactor.  The Event_Handler associated with <handle> must
-  // already have been registered with WFMO_Reactor.
+                             ACE_Reactor_Mask mask);
+  // This method is identical to the <remove_handler> method.
+
 
   // = Notification methods.
 
@@ -876,18 +867,14 @@ public:
   // = Low-level wait_set mask manipulation methods.
 
   virtual int mask_ops (ACE_Event_Handler *event_handler,
-                        ACE_Reactor_Mask masks,
-                        int operation);
-  // Modify <masks> of the <event_handler>'s entry in WFMO_Reactor
-  // depending upon <operation>.  <event_handler> must already have
-  // been registered with WFMO_Reactor.
+                        ACE_Reactor_Mask mask,
+                        int ops);
+  // Not implemented
 
   virtual int mask_ops (ACE_HANDLE handle,
-                        ACE_Reactor_Mask masks,
+                        ACE_Reactor_Mask mask,
                         int ops);
-  // Modify <masks> of the <handle>'s entry in WFMO_Reactor depending
-  // upon <operation>.  <handle> must already have been registered
-  // with WFMO_Reactor.
+  // Not implemented
 
   // = Low-level ready_set mask manipulation methods.
 
@@ -908,6 +895,10 @@ public:
   // Dump the state of an object.
 
 protected:
+  virtual int schedule_wakeup_i (ACE_HANDLE handle,
+                                 ACE_Reactor_Mask masks_to_be_added);
+  // Scheduling workhorse
+
   virtual int register_handler_i (ACE_HANDLE event_handle,
                                   ACE_HANDLE io_handle,
                                   ACE_Event_Handler *event_handler,
@@ -918,11 +909,6 @@ protected:
                               int alertable = 0);
   // Event handling workhorse
 
-  virtual int mask_ops_i (ACE_HANDLE io_handle,
-                          ACE_Reactor_Mask masks,
-                          int operation);
-  // Bit masking workhorse
-
   virtual ACE_thread_t owner_i (void);
   // Return the ID of the "owner" thread. Does not do any locking.
 
diff --git a/ace/WFMO_Reactor.i b/ace/WFMO_Reactor.i
index d0c51c64a5a..3890b884370 100644
--- a/ace/WFMO_Reactor.i
+++ b/ace/WFMO_Reactor.i
@@ -71,42 +71,42 @@ ACE_WFMO_Reactor_Handler_Repository::Common_Info::set (Common_Info &common_info)
   *this = common_info;
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump (void) const
 {
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Common_Info::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("I/O Entry = %d\n"),
               this->io_entry_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Event Handler = %d\n"),
               this->event_handler_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("I/O Handle = %d\n"),
               this->io_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Network Events = %d\n"),
               this->network_events_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Delete Event = %d\n"),
               this->delete_event_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Delete Entry = %d\n"),
               this->delete_entry_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Close Masks = %d\n"),
               this->close_masks_));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));  
 }
 
 /************************************************************/
@@ -152,7 +152,7 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::reset (void)
   Common_Info::reset ();
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle) const
 {
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump");
@@ -161,15 +161,15 @@ ACE_WFMO_Reactor_Handler_Repository::Current_Info::dump (ACE_HANDLE event_handle
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Event Handle = %d\n"),
               event_handle));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Suspend Entry = %d\n"),
-              this->suspend_entry_));
+              this->suspend_entry_));  
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));  
 }
 
 /************************************************************/
@@ -221,7 +221,7 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::reset (void)
   Common_Info::reset ();
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const
 {
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump");
@@ -230,15 +230,15 @@ ACE_WFMO_Reactor_Handler_Repository::To_Be_Added_Info::dump (void) const
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Event Handle = %d\n"),
               this->event_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Suspend Entry = %d\n"),
-              this->suspend_entry_));
+              this->suspend_entry_));  
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));  
 }
 
 /************************************************************/
@@ -290,7 +290,7 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::set (ACE_HANDLE event_handl
   Common_Info::set (common_info);
 }
 
-ACE_INLINE void
+ACE_INLINE void 
 ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const
 {
   ACE_TRACE ("ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump");
@@ -299,15 +299,15 @@ ACE_WFMO_Reactor_Handler_Repository::Suspended_Info::dump (void) const
 
   Common_Info::dump ();
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Event Handle = %d\n"),
               this->event_handle_));
 
-  ACE_DEBUG ((LM_DEBUG,
+  ACE_DEBUG ((LM_DEBUG, 
               ASYS_TEXT ("Resume Entry = %d\n"),
-              this->resume_entry_));
+              this->resume_entry_));  
 
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
+  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));  
 }
 
 /************************************************************/
@@ -382,19 +382,19 @@ ACE_INLINE int
 ACE_WFMO_Reactor_Handler_Repository::changes_required (void)
 {
   // Check if handles have be scheduled for additions or removal
-  return this->handles_to_be_added_ > 0
-    || this->handles_to_be_deleted_ > 0
-    || this->handles_to_be_suspended_ > 0
-    || this->handles_to_be_resumed_ > 0;
+  return this->handles_to_be_added_ > 0 ||
+    this->handles_to_be_deleted_ > 0    ||
+    this->handles_to_be_suspended_ > 0  ||
+    this->handles_to_be_resumed_ > 0;
 }
 
 ACE_INLINE int
 ACE_WFMO_Reactor_Handler_Repository::make_changes (void)
 {
   // This method must ONLY be called by the
-  // <WFMO_Reactor->change_state_thread_>. We therefore assume that
-  // there will be no contention for this method and hence no guards
-  // are neccessary.
+  // <WFMO_Reactor->change_state_thread_>. We therefore assume that there
+  // will be no contention for this method and hence no guards are
+  // neccessary.
 
   // Deletions and suspensions in current_info_
   this->make_changes_in_current_infos ();
@@ -419,9 +419,7 @@ ACE_WFMO_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->wfmo_reactor_.lock_, -1);
 
   int changes_required = 0;
-  int result = this->unbind_i (handle,
-                               mask,
-                               changes_required);
+  int result = this->unbind_i (handle, mask, changes_required);
 
   if (changes_required)
     // Wake up all threads in WaitForMultipleObjects so that they can
@@ -431,6 +429,8 @@ ACE_WFMO_Reactor_Handler_Repository::unbind (ACE_HANDLE handle,
   return result;
 }
 
+/************************************************************/
+
 ACE_INLINE long
 ACE_WFMO_Reactor::schedule_timer (ACE_Event_Handler *handler,
                                   const void *arg,
@@ -520,6 +520,7 @@ ACE_WFMO_Reactor::register_handler (ACE_HANDLE event_handle,
                                    io_handle,
                                    event_handler,
                                    mask);
+
 }
 
 ACE_INLINE int
@@ -534,10 +535,7 @@ ACE_WFMO_Reactor::register_handler (const ACE_Handle_Set &handles,
   ACE_HANDLE h;
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
-    if (this->register_handler_i (h,
-                                  ACE_INVALID_HANDLE,
-                                  handler,
-                                  mask) == -1)
+    if (this->register_handler_i (h, ACE_INVALID_HANDLE, handler, mask) == -1)
       return -1;
 
   return 0;
@@ -550,9 +548,7 @@ ACE_WFMO_Reactor::schedule_wakeup (ACE_HANDLE io_handle,
   // This GUARD is necessary since we are updating shared state.
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
-  return this->mask_ops_i (io_handle,
-                           masks_to_be_added,
-                           ACE_Reactor::ADD_MASK);
+  return this->schedule_wakeup_i (io_handle, masks_to_be_added);
 }
 
 ACE_INLINE int
@@ -562,49 +558,21 @@ ACE_WFMO_Reactor::schedule_wakeup (ACE_Event_Handler *event_handler,
   // This GUARD is necessary since we are updating shared state.
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
-  return this->mask_ops_i (event_handler->get_handle (),
-                           masks_to_be_added,
-                           ACE_Reactor::ADD_MASK);
-}
-
-ACE_INLINE int
-ACE_WFMO_Reactor::cancel_wakeup (ACE_HANDLE io_handle,
-                                 ACE_Reactor_Mask masks_to_be_removed)
-{
-  // This GUARD is necessary since we are updating shared state.
-  ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
-
-  return this->mask_ops_i (io_handle,
-                           masks_to_be_removed,
-                           ACE_Reactor::CLR_MASK);
-}
-
-ACE_INLINE int
-ACE_WFMO_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler,
-                                 ACE_Reactor_Mask masks_to_be_removed)
-{
-  // This GUARD is necessary since we are updating shared state.
-  ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
-
-  return this->mask_ops_i (event_handler->get_handle (),
-                           masks_to_be_removed,
-                           ACE_Reactor::CLR_MASK);
+  return this->schedule_wakeup_i (event_handler->get_handle (), masks_to_be_added);
 }
 
 ACE_INLINE int
 ACE_WFMO_Reactor::remove_handler (ACE_Event_Handler *event_handler,
                                   ACE_Reactor_Mask mask)
 {
-  return this->handler_rep_.unbind (event_handler->get_handle (),
-                                    mask);
+  return this->handler_rep_.unbind (event_handler->get_handle (), mask);
 }
 
 ACE_INLINE int
 ACE_WFMO_Reactor::remove_handler (ACE_HANDLE handle,
                                   ACE_Reactor_Mask mask)
 {
-  return this->handler_rep_.unbind (handle,
-                                    mask);
+  return this->handler_rep_.unbind (handle, mask);
 }
 
 ACE_INLINE int
@@ -618,9 +586,7 @@ ACE_WFMO_Reactor::remove_handler (const ACE_Handle_Set &handles,
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
-    if (this->handler_rep_.unbind_i (h,
-                                     mask,
-                                     changes_required) == -1)
+    if (this->handler_rep_.unbind_i (h, mask, changes_required) == -1)
       return -1;
 
   // Wake up all threads in WaitForMultipleObjects so that they can
@@ -631,14 +597,26 @@ ACE_WFMO_Reactor::remove_handler (const ACE_Handle_Set &handles,
 }
 
 ACE_INLINE int
+ACE_WFMO_Reactor::cancel_wakeup (ACE_HANDLE io_handle,
+                                 ACE_Reactor_Mask masks_to_be_removed)
+{
+  return this->remove_handler (io_handle, masks_to_be_removed);
+}
+
+ACE_INLINE int
+ACE_WFMO_Reactor::cancel_wakeup (ACE_Event_Handler *event_handler,
+                                 ACE_Reactor_Mask masks_to_be_removed)
+{
+  return this->remove_handler (event_handler, masks_to_be_removed);
+}
+
+ACE_INLINE int
 ACE_WFMO_Reactor::suspend_handler (ACE_HANDLE handle)
 {
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   int changes_required = 0;
-  int result =
-    this->handler_rep_.suspend_handler_i (handle,
-                                          changes_required);
+  int result = this->handler_rep_.suspend_handler_i (handle, changes_required);
 
   if (changes_required)
     // Wake up all threads in WaitForMultipleObjects so that they can
@@ -664,8 +642,7 @@ ACE_WFMO_Reactor::suspend_handler (const ACE_Handle_Set &handles)
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
-    if (this->handler_rep_.suspend_handler_i (h,
-                                              changes_required) == -1)
+    if (this->handler_rep_.suspend_handler_i (h, changes_required) == -1)
       return -1;
 
   // Wake up all threads in WaitForMultipleObjects so that they can
@@ -684,24 +661,19 @@ ACE_WFMO_Reactor::suspend_handlers (void)
 
   // First suspend all current handles
   int changes_required = 0;
-
-  for (size_t i = 0;
-       i < this->handler_rep_.max_handlep1_ && error == 0;
-       i++)
+  for (size_t i = 0; i < this->handler_rep_.max_handlep1_ && error == 0; i++)
     {
-      result =
-        this->handler_rep_.suspend_handler_i (this->handler_rep_.current_handles_[i],
-                                              changes_required);
+      result = this->handler_rep_.suspend_handler_i (this->handler_rep_.current_handles_[i], changes_required);
       if (result == -1)
         error = 1;
     }
 
   if (!error)
     // Then suspend all to_be_added_handles
-    for (size_t i = 0;
-         i < this->handler_rep_.handles_to_be_added_;
-         i++)
-      this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 1;
+    for (size_t i = 0; i < this->handler_rep_.handles_to_be_added_; i++)
+      {
+        this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 1;
+      }
 
   // Wake up all threads in WaitForMultipleObjects so that they can
   // reconsult the handle set
@@ -716,9 +688,7 @@ ACE_WFMO_Reactor::resume_handler (ACE_HANDLE handle)
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   int changes_required = 0;
-  int result =
-    this->handler_rep_.resume_handler_i (handle,
-                                         changes_required);
+  int result = this->handler_rep_.resume_handler_i (handle, changes_required);
 
   if (changes_required)
     // Wake up all threads in WaitForMultipleObjects so that they can
@@ -744,8 +714,7 @@ ACE_WFMO_Reactor::resume_handler (const ACE_Handle_Set &handles)
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   while ((h = handle_iter ()) != ACE_INVALID_HANDLE)
-    if (this->handler_rep_.resume_handler_i (h,
-                                             changes_required) == -1)
+    if (this->handler_rep_.resume_handler_i (h, changes_required) == -1)
       return -1;
 
   // Wake up all threads in WaitForMultipleObjects so that they can
@@ -763,23 +732,20 @@ ACE_WFMO_Reactor::resume_handlers (void)
   ACE_GUARD_RETURN (ACE_Process_Mutex, ace_mon, this->lock_, -1);
 
   int changes_required = 0;
-  for (size_t i = 0;
-       i < this->handler_rep_.suspended_handles_ && error == 0;
-       i++)
+  for (size_t i = 0; i < this->handler_rep_.suspended_handles_ && error == 0; i++)
     {
-      result =
-        this->handler_rep_.resume_handler_i (this->handler_rep_.current_suspended_info_[i].event_handle_,
-                                             changes_required);
+      result = this->handler_rep_.resume_handler_i (this->handler_rep_.current_suspended_info_[i].event_handle_,
+                                                    changes_required);
       if (result == -1)
         error = 1;
     }
 
   if (!error)
     // Then resume all to_be_added_handles
-    for (size_t i = 0;
-         i < this->handler_rep_.handles_to_be_added_;
-         i++)
-      this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 0;
+    for (size_t i = 0; i < this->handler_rep_.handles_to_be_added_; i++)
+      {
+        this->handler_rep_.to_be_added_info_[i].suspend_entry_ = 0;
+      }
 
   // Wake up all threads in WaitForMultipleObjects so that they can
   // reconsult the handle set
@@ -922,8 +888,7 @@ ACE_WFMO_Reactor::register_handler (const ACE_Sig_Set &sigset,
 #if (ACE_NSIG > 0)
   for (int s = 1; s < ACE_NSIG; s++)
     if (sigset.is_member (s)
-        && this->signal_handler_->register_handler (s,
-                                                    new_sh,
+        && this->signal_handler_->register_handler (s, new_sh,
                                                     new_disp) == -1)
       result = -1;
 #else
@@ -941,10 +906,7 @@ ACE_WFMO_Reactor::remove_handler (int signum,
                                   ACE_Sig_Action *old_disp,
                                   int sigkey)
 {
-  return this->signal_handler_->remove_handler (signum,
-                                                new_disp,
-                                                old_disp,
-                                                sigkey);
+  return this->signal_handler_->remove_handler (signum, new_disp, old_disp, sigkey);
 }
 
 ACE_INLINE int
@@ -967,48 +929,41 @@ ACE_WFMO_Reactor::remove_handler (const ACE_Sig_Set &sigset)
 ACE_INLINE int
 ACE_WFMO_Reactor::handler (int signum, ACE_Event_Handler **eh)
 {
-  ACE_Event_Handler *handler =
-    this->signal_handler_->handler (signum);
+  ACE_Event_Handler *handler = this->signal_handler_->handler (signum);
 
   if (handler == 0)
     return -1;
-  else if (eh != 0 && *eh != 0)
+  else if (*eh != 0)
     *eh = handler;
   return 0;
 }
 
-ACE_INLINE int
-ACE_WFMO_Reactor::mask_ops (ACE_Event_Handler *event_handler,
-                            ACE_Reactor_Mask mask,
-                            int operation)
+ACE_INLINE void
+ACE_WFMO_Reactor::requeue_position (int)
 {
-  ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1);
-
-  return this->mask_ops_i (event_handler->get_handle (),
-                           mask,
-                           operation);
+  // Not implemented
 }
 
 ACE_INLINE int
-ACE_WFMO_Reactor::mask_ops (ACE_HANDLE io_handle,
-                            ACE_Reactor_Mask mask,
-                            int operation)
+ACE_WFMO_Reactor::requeue_position (void)
 {
-  ACE_GUARD_RETURN (ACE_Process_Mutex, monitor, this->lock_, -1);
-
-  return this->mask_ops_i (io_handle,
-                           mask,
-                           operation);
+  // Don't have an implementation for this yet...
+  ACE_NOTSUP_RETURN (-1);
 }
 
-ACE_INLINE void
-ACE_WFMO_Reactor::requeue_position (int)
+ACE_INLINE int
+ACE_WFMO_Reactor::mask_ops (ACE_Event_Handler *event_handler,
+                            ACE_Reactor_Mask mask,
+                            int ops)
 {
-  // Not implemented
+  // Don't have an implementation for this yet...
+  ACE_NOTSUP_RETURN (-1);
 }
 
 ACE_INLINE int
-ACE_WFMO_Reactor::requeue_position (void)
+ACE_WFMO_Reactor::mask_ops (ACE_HANDLE handle,
+                            ACE_Reactor_Mask mask,
+                            int ops)
 {
   // Don't have an implementation for this yet...
   ACE_NOTSUP_RETURN (-1);
@@ -1072,7 +1027,7 @@ ACE_WFMO_Reactor_Handler_Repository::make_changes (void)
   return 0;
 }
 
-ACE_INLINE
+ACE_INLINE 
 ACE_WFMO_Reactor_Handler_Repository::~ACE_WFMO_Reactor_Handler_Repository (void)
 {
 }
diff --git a/ace/WIN32_Asynch_IO.cpp b/ace/WIN32_Asynch_IO.cpp
deleted file mode 100644
index 2a5b19452b7..00000000000
--- a/ace/WIN32_Asynch_IO.cpp
+++ /dev/null
@@ -1,1689 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_DLL
-
-#include "ace/WIN32_Asynch_IO.h"
-
-// ACE_RCSID(ace, Asynch_IO, "$Id$")
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-
-#include "ace/WIN32_Proactor.h"
-#include "ace/Message_Block.h"
-#include "ace/Service_Config.h"
-#include "ace/INET_Addr.h"
-#include "ace/Task_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/WIN32_Asynch_IO.i"
-#endif /* __ACE_INLINE__ */
-
-u_long
-ACE_WIN32_Asynch_Result::bytes_transferred (void) const
-{
-  return this->bytes_transferred_;
-}
-
-const void *
-ACE_WIN32_Asynch_Result::act (void) const
-{
-  return this->act_;
-}
-
-int
-ACE_WIN32_Asynch_Result::success (void) const
-{
-  return this->success_;
-}
-
-const void *
-ACE_WIN32_Asynch_Result::completion_key (void) const
-{
-  return this->completion_key_;
-}
-
-u_long
-ACE_WIN32_Asynch_Result::error (void) const
-{
-  return this->error_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Result::event (void) const
-{
-  return this->hEvent;
-}
-
-u_long
-ACE_WIN32_Asynch_Result::offset (void) const
-{
-  return this->Offset;
-}
-
-u_long
-ACE_WIN32_Asynch_Result::offset_high (void) const
-{
-  return this->OffsetHigh;
-}
-
-int
-ACE_WIN32_Asynch_Result::priority (void) const
-{
-  ACE_NOTSUP_RETURN (0);
-}
-
-int
-ACE_WIN32_Asynch_Result::signal_number (void) const
-{
-  ACE_NOTSUP_RETURN (0);
-}
-
-int
-ACE_WIN32_Asynch_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  // Get to the platform specific implementation.
-  ACE_WIN32_Proactor *win32_proactor = ACE_dynamic_cast (ACE_WIN32_Proactor *,
-                                                         proactor);
-
-  if (win32_proactor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "Dynamic cast to WIN32 Proactor failed\n"), -1);
-
-  // Post myself.
-  return win32_proactor->post_completion (this);
-}
-
-ACE_WIN32_Asynch_Result::~ACE_WIN32_Asynch_Result (void)
-{
-}
-
-ACE_WIN32_Asynch_Result::ACE_WIN32_Asynch_Result (ACE_Handler &handler,
-                                                  const void* act,
-                                                  ACE_HANDLE event,
-                                                  u_long offset,
-                                                  u_long offset_high,
-                                                  int priority,
-                                                  int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    OVERLAPPED (),
-    handler_ (handler),
-    act_ (act),
-    bytes_transferred_ (0),
-    success_ (0),
-    completion_key_ (0),
-    error_ (0)
-{
-  // Set the ACE_OVERLAPPED structure
-  this->Internal = 0;
-  this->InternalHigh = 0;
-  this->Offset = offset;
-  this->OffsetHigh = offset_high;
-  this->hEvent = event;
-
-  ACE_UNUSED_ARG (priority);
-  ACE_UNUSED_ARG (signal_number);
-}
-
-// ****************************************************************
-
-int
-ACE_WIN32_Asynch_Operation::open (ACE_Handler &handler,
-                                  ACE_HANDLE handle,
-                                  const void *completion_key,
-                                  ACE_Proactor *proactor)
-{
-  this->proactor_ = proactor;
-  this->handler_ = &handler;
-  this->handle_ = handle;
-
-  // Grab the handle from the <handler> if <handle> is invalid
-  if (this->handle_ == ACE_INVALID_HANDLE)
-    this->handle_ = this->handler_->handle ();
-  if (this->handle_ == ACE_INVALID_HANDLE)
-    return -1;
-
-  // Register with the <proactor>.
-  return this->win32_proactor_->register_handle (this->handle_,
-                                                 completion_key);
-}
-
-int
-ACE_WIN32_Asynch_Operation::cancel (void)
-{
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) && (defined (_MSC_VER) && (_MSC_VER > 1020))
-  // All I/O operations that are canceled will complete with the error
-  // ERROR_OPERATION_ABORTED. All completion notifications for the I/O
-  // operations will occur normally.
-
-  return (int) ::CancelIo (this->handle_);
-
-#else /* Not ACE_HAS_WINNT4 && ACE_HAS_WINNT4!=0 && _MSC... */
-
-  ACE_NOTSUP_RETURN (-1);
-
-#endif /* ACE_HAS_AIO_CALLS */
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Operation::proactor (void) const
-{
-  return this->proactor_;
-}
-
-ACE_WIN32_Asynch_Operation::ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    win32_proactor_ (win32_proactor),
-    proactor_ (0),
-    handler_ (0),
-    handle_ (ACE_INVALID_HANDLE)
-{
-}
-
-ACE_WIN32_Asynch_Operation::~ACE_WIN32_Asynch_Operation (void)
-{
-}
-
-// ************************************************************
-
-u_long
-ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read (void) const
-{
-  return this->bytes_to_read_;
-}
-
-ACE_Message_Block &
-ACE_WIN32_Asynch_Read_Stream_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Read_Stream_Result::handle (void) const
-{
-  return this->handle_;
-}
-
-ACE_WIN32_Asynch_Read_Stream_Result::ACE_WIN32_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                                                          ACE_HANDLE handle,
-                                                                          ACE_Message_Block &message_block,
-                                                                          u_long bytes_to_read,
-                                                                          const void* act,
-                                                                          ACE_HANDLE event,
-                                                                          int priority,
-                                                                          int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    bytes_to_read_ (bytes_to_read),
-    message_block_ (message_block),
-    handle_ (handle)
-{
-}
-
-void
-ACE_WIN32_Asynch_Read_Stream_Result::complete (u_long bytes_transferred,
-                                               int success,
-                                               const void *completion_key,
-                                               u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Read_Stream::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_read_stream (result);
-}
-
-ACE_WIN32_Asynch_Read_Stream_Result::~ACE_WIN32_Asynch_Read_Stream_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Read_Stream_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Read_Stream_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Read_Stream_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_Stream_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Read_Stream_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_Stream_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_Stream_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ********************************************************************
-
-ACE_WIN32_Asynch_Read_Stream::ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_WIN32_Asynch_Operation (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream::read (ACE_Message_Block &message_block,
-                                    u_long bytes_to_read,
-                                    const void *act,
-                                    int priority,
-                                    int signal_number)
-{
-  // Create the Asynch_Result.
-  ACE_WIN32_Asynch_Read_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_Stream_Result (*this->handler_,
-                                                       this->handle_,
-                                                       message_block,
-                                                       bytes_to_read,
-                                                       act,
-                                                       this->win32_proactor_->get_handle (),
-                                                       priority,
-                                                       signal_number),
-                  -1);
-
-  // Shared read
-  ssize_t return_val = this->shared_read (result);
-
-  // Upon errors
-  if (return_val == -1)
-    delete result;
-
-  return return_val;
-}
-
-ACE_WIN32_Asynch_Read_Stream::~ACE_WIN32_Asynch_Read_Stream (void)
-{
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream::shared_read (ACE_WIN32_Asynch_Read_Stream_Result *result)
-{
-  u_long bytes_read;
-
-  // Initiate the read
-  int initiate_result = ::ReadFile (result->handle (),
-                                    result->message_block ().wr_ptr (),
-                                    result->bytes_to_read (),
-                                    &bytes_read,
-                                    result);
-  if (initiate_result == 1)
-    // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
-
-  // If initiate failed, check for a bad error.
-  errno = ::GetLastError ();
-  switch (errno)
-    {
-    case ERROR_IO_PENDING:
-      // The IO will complete proactively: the OVERLAPPED will still
-      // get queued.
-      return 0;
-
-    default:
-      // Something else went wrong: the OVERLAPPED will not get
-      // queued.
-
-      // Cleanup dynamically allocated Asynch_Result
-      delete result;
-
-      // Return error
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
-    }
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Read_Stream::open (ACE_Handler &handler,
-				    ACE_HANDLE handle,
-				    const void *completion_key,
-				    ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Read_Stream::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Read_Stream::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-}
-
-
-// ************************************************************
-
-u_long
-ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write (void) const
-{
-  return this->bytes_to_write_;
-}
-
-ACE_Message_Block &
-ACE_WIN32_Asynch_Write_Stream_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Write_Stream_Result::handle (void) const
-{
-  return this->handle_;
-}
-
-ACE_WIN32_Asynch_Write_Stream_Result::ACE_WIN32_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_write,
-                                                                            const void* act,
-                                                                            ACE_HANDLE event,
-                                                                            int priority,
-                                                                            int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    bytes_to_write_ (bytes_to_write),
-    message_block_ (message_block),
-    handle_ (handle)
-{
-}
-
-void
-ACE_WIN32_Asynch_Write_Stream_Result::complete (u_long bytes_transferred,
-                                                int success,
-                                                const void *completion_key,
-                                                u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.rd_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Write_Stream::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_write_stream (result);
-}
-
-ACE_WIN32_Asynch_Write_Stream_Result::~ACE_WIN32_Asynch_Write_Stream_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Write_Stream_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Write_Stream_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Write_Stream_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_Stream_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Write_Stream_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_Stream_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_Stream_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ********************************************************************
-
-ACE_WIN32_Asynch_Write_Stream::ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_WIN32_Asynch_Operation (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream::write (ACE_Message_Block &message_block,
-                                      u_long bytes_to_write,
-                                      const void *act,
-                                      int priority,
-                                      int signal_number)
-{
-  ACE_WIN32_Asynch_Write_Stream_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_Stream_Result (*this->handler_,
-                                                        this->handle_,
-                                                        message_block,
-                                                        bytes_to_write,
-                                                        act,
-                                                        this->win32_proactor_->get_handle (),
-                                                        priority,
-                                                        signal_number),
-                  -1);
-
-  // Shared write
-  ssize_t return_val = this->shared_write (result);
-
-  // Upon errors
-  if (return_val == -1)
-    delete result;
-
-  return return_val;
-}
-
-ACE_WIN32_Asynch_Write_Stream::~ACE_WIN32_Asynch_Write_Stream (void)
-{
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream::shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result)
-{
-  u_long bytes_written;
-
-  // Initiate the write
-  int initiate_result = ::WriteFile (result->handle (),
-                                     result->message_block ().rd_ptr (),
-                                     result->bytes_to_write (),
-                                     &bytes_written,
-                                     result);
-  if (initiate_result == 1)
-    // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
-
-  // If initiate failed, check for a bad error.
-  errno = ::GetLastError ();
-  switch (errno)
-    {
-    case ERROR_IO_PENDING:
-      // The IO will complete proactively: the OVERLAPPED will still
-      // get queued.
-      return 0;
-
-    default:
-      // Something else went wrong: the OVERLAPPED will not get
-      // queued.
-
-      // Cleanup dynamically allocated Asynch_Result
-      delete result;
-
-      // Return error
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("WriteFile")), -1);
-    }
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Write_Stream::open (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     const void *completion_key,
-                                     ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Write_Stream::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Write_Stream::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Read_File_Result::ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler,
-                                                                      ACE_HANDLE handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      u_long offset,
-                                                                      u_long offset_high,
-                                                                      ACE_HANDLE event,
-                                                                      int priority,
-                                                                      int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Read_Stream_Result_Impl (),
-    ACE_Asynch_Read_File_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    ACE_WIN32_Asynch_Read_Stream_Result (handler,
-                                         handle,
-                                         message_block,
-                                         bytes_to_read,
-                                         act,
-                                         event,
-                                         priority,
-                                         signal_number)
-{
-  this->Offset = offset;
-  this->OffsetHigh = offset_high;
-}
-
-void
-ACE_WIN32_Asynch_Read_File_Result::complete (u_long bytes_transferred,
-                                             int success,
-                                             const void *completion_key,
-                                             u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus.
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Read_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_read_file (result);
-}
-
-ACE_WIN32_Asynch_Read_File_Result::~ACE_WIN32_Asynch_Read_File_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Read_File_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Read_File_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Read_File_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Read_File_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_File_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Read_File_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_File_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Read_File_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Read_File_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Read_File_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-// The following methods belong to
-// ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++
-// warnings. These methods route their call to the
-// ACE_WIN32_Asynch_Read_Stream_Result base class.
-
-u_long
-ACE_WIN32_Asynch_Read_File_Result::bytes_to_read (void) const
-{
-  return ACE_WIN32_Asynch_Read_Stream_Result::bytes_to_read ();
-}
-
-ACE_Message_Block &
-ACE_WIN32_Asynch_Read_File_Result::message_block (void) const
-{
-  return ACE_WIN32_Asynch_Read_Stream_Result::message_block ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Read_File_Result::handle (void) const
-{
-  return ACE_WIN32_Asynch_Read_Stream_Result::handle ();
-}
-
-int
-ACE_WIN32_Asynch_Read_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Read_File::ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Read_Stream_Impl (),
-    ACE_Asynch_Read_File_Impl (),
-    ACE_WIN32_Asynch_Read_Stream (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                  u_long bytes_to_read,
-                                  u_long offset,
-                                  u_long offset_high,
-                                  const void *act,
-                                  int priority,
-                                  int signal_number)
-{
-  ACE_WIN32_Asynch_Read_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Read_File_Result (*this->handler_,
-                                                     this->handle_,
-                                                     message_block,
-                                                     bytes_to_read,
-                                                     act,
-                                                     offset,
-                                                     offset_high,
-                                                     this->win32_proactor_->get_handle (),
-                                                     priority,
-                                                     signal_number),
-                  -1);
-
-  // Shared read
-  ssize_t return_val = this->shared_read (result);
-
-  // Upon errors
-  if (return_val == -1)
-    delete result;
-
-  return return_val;
-}
-
-ACE_WIN32_Asynch_Read_File::~ACE_WIN32_Asynch_Read_File (void)
-{
-}
-
-int
-ACE_WIN32_Asynch_Read_File::read (ACE_Message_Block &message_block,
-                                  u_long bytes_to_read,
-                                  const void *act,
-                                  int priority,
-                                  int signal_number)
-{
-  return ACE_WIN32_Asynch_Read_Stream::read (message_block,
-                                             bytes_to_read,
-                                             act,
-                                             priority,
-                                             signal_number);
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Read_File::open (ACE_Handler &handler,
-                                  ACE_HANDLE handle,
-                                  const void *completion_key,
-                                  ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Read_File::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Read_File::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Write_File_Result::ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler,
-                                                                        ACE_HANDLE handle,
-                                                                        ACE_Message_Block &message_block,
-                                                                        u_long bytes_to_write,
-                                                                        const void* act,
-                                                                        u_long offset,
-                                                                        u_long offset_high,
-                                                                        ACE_HANDLE event,
-                                                                        int priority,
-                                                                        int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Write_Stream_Result_Impl (),
-    ACE_Asynch_Write_File_Result_Impl (),
-    ACE_WIN32_Asynch_Write_Stream_Result (handler,
-                                          handle,
-                                          message_block,
-                                          bytes_to_write,
-                                          act,
-                                          event,
-                                          priority,
-                                          signal_number)
-{
-  this->Offset = offset;
-  this->OffsetHigh = offset_high;
-}
-
-void
-ACE_WIN32_Asynch_Write_File_Result::complete (u_long bytes_transferred,
-                                              int success,
-                                              const void *completion_key,
-                                              u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.rd_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Write_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_write_file (result);
-}
-
-ACE_WIN32_Asynch_Write_File_Result::~ACE_WIN32_Asynch_Write_File_Result  (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Write_File_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Write_File_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Write_File_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Write_File_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_File_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Write_File_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_File_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Write_File_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Write_File_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Write_File_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-// The following methods belong to
-// ACE_WIN32_Asynch_Write_Stream_Result. They are here to avoid VC++
-// warnings. These methods route their call to the
-// ACE_WIN32_Asynch_Write_Stream_Result base class.
-
-u_long
-ACE_WIN32_Asynch_Write_File_Result::bytes_to_write (void) const
-{
-  return ACE_WIN32_Asynch_Write_Stream_Result::bytes_to_write ();
-}
-
-ACE_Message_Block &
-ACE_WIN32_Asynch_Write_File_Result::message_block (void) const
-{
-  return ACE_WIN32_Asynch_Write_Stream_Result::message_block ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Write_File_Result::handle (void) const
-{
-  return ACE_WIN32_Asynch_Write_Stream_Result::handle ();
-}
-
-int
-ACE_WIN32_Asynch_Write_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Write_File::ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Write_Stream_Impl (),
-    ACE_Asynch_Write_File_Impl (),
-    ACE_WIN32_Asynch_Write_Stream (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                    u_long bytes_to_write,
-                                    u_long offset,
-                                    u_long offset_high,
-                                    const void *act,
-                                    int priority,
-                                    int signal_number)
-{
-  ACE_WIN32_Asynch_Write_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Write_File_Result (*this->handler_,
-                                                      this->handle_,
-                                                      message_block,
-                                                      bytes_to_write,
-                                                      act,
-                                                      offset,
-                                                      offset_high,
-                                                      this->win32_proactor_->get_handle (),
-                                                      priority,
-                                                      signal_number),
-                  -1);
-
-  // Shared write
-  ssize_t return_val = this->shared_write (result);
-
-  // Upon errors
-  if (return_val == -1)
-    delete result;
-
-  return return_val;
-}
-
-ACE_WIN32_Asynch_Write_File::~ACE_WIN32_Asynch_Write_File (void)
-{
-}
-
-int
-ACE_WIN32_Asynch_Write_File::write (ACE_Message_Block &message_block,
-                                    u_long bytes_to_write,
-                                    const void *act,
-                                    int priority,
-                                    int signal_number)
-{
-  return ACE_WIN32_Asynch_Write_Stream::write (message_block,
-                                               bytes_to_write,
-                                               act,
-                                               priority,
-                                               signal_number);
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Write_File::open (ACE_Handler &handler,
-                                   ACE_HANDLE handle,
-                                   const void *completion_key,
-                                   ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Write_File::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Write_File::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-}
-
-// ************************************************************
-
-u_long
-ACE_WIN32_Asynch_Accept_Result::bytes_to_read (void) const
-{
-  return this->bytes_to_read_;
-}
-
-ACE_Message_Block &
-ACE_WIN32_Asynch_Accept_Result::message_block (void) const
-{
-  return this->message_block_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Accept_Result::listen_handle (void) const
-{
-  return this->listen_handle_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Accept_Result::accept_handle (void) const
-{
-  return this->accept_handle_;
-}
-
-ACE_WIN32_Asynch_Accept_Result::ACE_WIN32_Asynch_Accept_Result (ACE_Handler &handler,
-                                                                ACE_HANDLE listen_handle,
-                                                                ACE_HANDLE accept_handle,
-                                                                ACE_Message_Block &message_block,
-                                                                u_long bytes_to_read,
-                                                                const void* act,
-                                                                ACE_HANDLE event,
-                                                                int priority,
-                                                                int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Accept_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number),
-    bytes_to_read_ (bytes_to_read),
-    message_block_ (message_block),
-    listen_handle_ (listen_handle),
-    accept_handle_ (accept_handle)
-{
-}
-
-void
-ACE_WIN32_Asynch_Accept_Result::complete (u_long bytes_transferred,
-                                          int success,
-                                          const void *completion_key,
-                                          u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // Appropriately move the pointers in the message block.
-  this->message_block_.wr_ptr (bytes_transferred);
-
-  // Create the interface result class.
-  ACE_Asynch_Accept::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_accept (result);
-}
-
-ACE_WIN32_Asynch_Accept_Result::~ACE_WIN32_Asynch_Accept_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance 
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Accept_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Accept_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Accept_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Accept_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Accept_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Accept_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Accept_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Accept_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Accept_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Accept_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-int
-ACE_WIN32_Asynch_Accept_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Accept::ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Accept_Impl (),
-    ACE_WIN32_Asynch_Operation (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Accept::accept  (ACE_Message_Block &message_block,
-                                  u_long bytes_to_read,
-                                  ACE_HANDLE accept_handle,
-                                  const void *act,
-                                  int priority,
-                                  int signal_number)
-{
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
-  // Sanity check: make sure that enough space has been allocated by
-  // the caller.
-  size_t address_size = sizeof (sockaddr_in) + sizeof (sockaddr);
-  size_t space_in_use = message_block.wr_ptr () - message_block.base ();
-  size_t total_size = message_block.size ();
-  size_t available_space = total_size - space_in_use;
-  size_t space_needed = bytes_to_read + 2 * address_size;
-  if (available_space < space_needed)
-    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Buffer too small\n")), -1);
-
-  // WIN Specific.
-
-  int close_accept_handle = 0;
-  // If the <accept_handle> is invalid, we will create a new socket.
-  if (accept_handle == ACE_INVALID_HANDLE)
-    {
-      accept_handle = ACE_OS::socket (PF_INET,
-                                      SOCK_STREAM,
-                                      0);
-      if (accept_handle == ACE_INVALID_HANDLE)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("ACE_OS::socket")), -1);
-      else
-        // Remember to close the socket down if failures occur.
-        close_accept_handle = 1;
-    }
-
-  // Common code for both WIN and POSIX.
-  ACE_WIN32_Asynch_Accept_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Accept_Result (*this->handler_,
-                                                  this->handle_,
-                                                  accept_handle,
-                                                  message_block,
-                                                  bytes_to_read,
-                                                  act,
-                                                  this->win32_proactor_->get_handle (),
-                                                  priority,
-                                                  signal_number),
-                  -1);
-
-  u_long bytes_read;
-
-  // Initiate the accept.
-  int initiate_result = ::AcceptEx ((SOCKET) result->listen_handle (),
-                                    (SOCKET) result->accept_handle (),
-                                    result->message_block ().wr_ptr (),
-                                    result->bytes_to_read (),
-                                    address_size,
-                                    address_size,
-                                    &bytes_read,
-                                    result);
-  if (initiate_result == 1)
-    // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
-
-  // If initiate failed, check for a bad error.
-  errno = ::GetLastError ();
-  switch (errno)
-    {
-    case ERROR_IO_PENDING:
-      // The IO will complete proactively: the OVERLAPPED will still
-      // get queued.
-      return 0;
-
-    default:
-      // Something else went wrong: the OVERLAPPED will not get
-      // queued.
-
-      if (close_accept_handle == 1)
-        // Close the newly created socket
-        ACE_OS::closesocket (accept_handle);
-
-      // Cleanup dynamically allocated Asynch_Result.
-      delete result;
-
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("ReadFile")), -1);
-    }
-#else /* ACE_HAS_WINNT4 .......|| ACE_HAS_AIO_CALLS */
-  ACE_NOTSUP_RETURN (-1);
-#endif /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) || (defined (ACE_HAS_AIO_CALLS) */
-}
-
-ACE_WIN32_Asynch_Accept::~ACE_WIN32_Asynch_Accept (void)
-{
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Accept::open (ACE_Handler &handler,
-                               ACE_HANDLE handle,
-                               const void *completion_key,
-                               ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Accept::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Accept::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-}
-
-// *********************************************************************
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Transmit_File_Result::socket (void) const
-{
-  return this->socket_;
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Transmit_File_Result::file (void) const
-{
-  return this->file_;
-}
-
-ACE_Asynch_Transmit_File::Header_And_Trailer *
-ACE_WIN32_Asynch_Transmit_File_Result::header_and_trailer (void) const
-{
-  return this->header_and_trailer_;
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::bytes_to_write (void) const
-{
-  return this->bytes_to_write_;
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::bytes_per_send (void) const
-{
-  return this->bytes_per_send_;
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_WIN32_Asynch_Transmit_File_Result::ACE_WIN32_Asynch_Transmit_File_Result (ACE_Handler &handler,
-                                                                              ACE_HANDLE socket,
-                                                                              ACE_HANDLE file,
-                                                                              ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                              u_long bytes_to_write,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              u_long bytes_per_send,
-                                                                              u_long flags,
-                                                                              const void *act,
-                                                                              ACE_HANDLE event,
-                                                                              int priority,
-                                                                              int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_Asynch_Transmit_File_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, offset, offset_high, priority, signal_number),
-    socket_ (socket),
-    file_ (file),
-    header_and_trailer_ (header_and_trailer),
-    bytes_to_write_ (bytes_to_write),
-    bytes_per_send_ (bytes_per_send),
-    flags_ (flags)
-{
-}
-
-void
-ACE_WIN32_Asynch_Transmit_File_Result::complete (u_long bytes_transferred,
-                                                 int success,
-                                                 const void *completion_key,
-                                                 u_long error)
-{
-  // Copy the data which was returned by GetQueuedCompletionStatus
-  this->bytes_transferred_ = bytes_transferred;
-  this->success_ = success;
-  this->completion_key_ = completion_key;
-  this->error_ = error;
-
-  // We will not do this because (a) the header and trailer blocks may
-  // be the same message_blocks and (b) in cases of failures we have
-  // no idea how much of what (header, data, trailer) was sent.
-  /*
-    if (this->success_ && this->header_and_trailer_ != 0)
-    {
-    ACE_Message_Block *header = this->header_and_trailer_->header ();
-    if (header != 0)
-    header->rd_ptr (this->header_and_trailer_->header_bytes ());
-
-    ACE_Message_Block *trailer = this->header_and_trailer_->trailer ();
-    if (trailer != 0)
-    trailer->rd_ptr (this->header_and_trailer_->trailer_bytes ());
-    }
-  */
-
-  // Create the interface result class.
-  ACE_Asynch_Transmit_File::Result result (this);
-
-  // Call the application handler.
-  this->handler_.handle_transmit_file (result);
-}
-
-ACE_WIN32_Asynch_Transmit_File_Result::~ACE_WIN32_Asynch_Transmit_File_Result (void)
-{
-}
-
-// Base class operations. These operations are here to kill dominance
-// warnings. These methods call the base class methods.
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::bytes_transferred (void) const
-{
-  return ACE_WIN32_Asynch_Result::bytes_transferred ();
-}
-
-const void *
-ACE_WIN32_Asynch_Transmit_File_Result::act (void) const
-{
-  return ACE_WIN32_Asynch_Result::act ();
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File_Result::success (void) const
-{
-  return ACE_WIN32_Asynch_Result::success ();
-}
-
-const void *
-ACE_WIN32_Asynch_Transmit_File_Result::completion_key (void) const
-{
-  return ACE_WIN32_Asynch_Result::completion_key ();
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::error (void) const
-{
-  return ACE_WIN32_Asynch_Result::error ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Asynch_Transmit_File_Result::event (void) const
-{
-  return ACE_WIN32_Asynch_Result::event ();
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::offset (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset ();
-}
-
-u_long
-ACE_WIN32_Asynch_Transmit_File_Result::offset_high (void) const
-{
-  return ACE_WIN32_Asynch_Result::offset_high ();
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File_Result::priority (void) const
-{
-  return ACE_WIN32_Asynch_Result::priority ();
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File_Result::signal_number (void) const
-{
-  return ACE_WIN32_Asynch_Result::signal_number ();
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File_Result::post_completion (ACE_Proactor_Impl *proactor)
-{
-  return ACE_WIN32_Asynch_Result::post_completion (proactor);
-}
-
-// ************************************************************
-
-ACE_WIN32_Asynch_Transmit_File::ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor)
-  : ACE_Asynch_Operation_Impl (),
-    ACE_Asynch_Transmit_File_Impl (),
-    ACE_WIN32_Asynch_Operation (win32_proactor)
-{
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
-                                               ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                               u_long bytes_to_write,
-                                               u_long offset,
-                                               u_long offset_high,
-                                               u_long bytes_per_send,
-                                               u_long flags,
-                                               const void *act,
-                                               int priority,
-                                               int signal_number)
-{
-#if (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0))
-  ACE_WIN32_Asynch_Transmit_File_Result *result = 0;
-  ACE_NEW_RETURN (result,
-                  ACE_WIN32_Asynch_Transmit_File_Result (*this->handler_,
-                                                         this->handle_,
-                                                         file,
-                                                         header_and_trailer,
-                                                         bytes_to_write,
-                                                         offset,
-                                                         offset_high,
-                                                         bytes_per_send,
-                                                         flags,
-                                                         act,
-                                                         this->win32_proactor_->get_handle (),
-                                                         priority,
-                                                         signal_number),
-                  -1);
-
-  ACE_LPTRANSMIT_FILE_BUFFERS transmit_buffers = 0;
-  if (result->header_and_trailer () != 0)
-    transmit_buffers = result->header_and_trailer ()->transmit_buffers ();
-
-  // Initiate the transmit file
-  int initiate_result = ::TransmitFile ((SOCKET) result->socket (),
-                                        result->file (),
-                                        result->bytes_to_write (),
-                                        result->bytes_per_send (),
-                                        result,
-                                        transmit_buffers,
-                                        result->flags ());
-  if (initiate_result == 1)
-    // Immediate success: the OVERLAPPED will still get queued.
-    return 1;
-
-  // If initiate failed, check for a bad error.
-  errno = ::GetLastError ();
-  switch (errno)
-    {
-    case ERROR_IO_PENDING:
-      // The IO will complete proactively: the OVERLAPPED will still
-      // get queued.
-      return 0;
-
-    default:
-      // Something else went wrong: the OVERLAPPED will not get
-      // queued.
-
-      // Cleanup dynamically allocated Asynch_Result
-      delete result;
-
-      ACE_ERROR_RETURN ((LM_ERROR,  ASYS_TEXT ("%p\n"),  ASYS_TEXT ("TransmitFile")), -1);
-    }
-#else /* (defined (ACE_HAS_WINNT4) && (ACE_HAS_WINNT4 != 0)) || (defined (ACE_HAS_WINSOCK2) && (ACE_HAS_WINSOCK2 != 0)) */
-  ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_AIO_CALLS */
-}
-
-ACE_WIN32_Asynch_Transmit_File::~ACE_WIN32_Asynch_Transmit_File (void)
-{
-}
-
-// Methods belong to ACE_WIN32_Asynch_Operation base class. These
-// methods are defined here to avoid VC++ warnings. They route the
-// call to the ACE_WIN32_Asynch_Operation base class.
-
-int
-ACE_WIN32_Asynch_Transmit_File::open (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      const void *completion_key,
-                                      ACE_Proactor *proactor)
-{
-  return ACE_WIN32_Asynch_Operation::open (handler,
-					   handle,
-					   completion_key,
-					   proactor);
-}
-
-int
-ACE_WIN32_Asynch_Transmit_File::cancel (void)
-{
-  return ACE_WIN32_Asynch_Operation::cancel ();
-}
-
-ACE_Proactor *
-ACE_WIN32_Asynch_Transmit_File::proactor (void) const
-{
-  return ACE_WIN32_Asynch_Operation::proactor ();
-} 
-
-#endif /* ACE_WIN32 || ACE_HAS_WINCE */
diff --git a/ace/WIN32_Asynch_IO.h b/ace/WIN32_Asynch_IO.h
deleted file mode 100644
index cbed38456b0..00000000000
--- a/ace/WIN32_Asynch_IO.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//
-//    ace
-//
-// = FILENAME
-//
-//    WIN32_Asynch_IO.h
-//
-// = DESCRIPTION
-//
-//    These classes only works on Win32 platforms.
-//
-//    The implementation of <ACE_Asynch_Transmit_File> and
-//    <ACE_Asynch_Accept> are only supported if ACE_HAS_WINSOCK2 is
-//    defined or you are on WinNT 4.0 or higher.
-//
-// = AUTHOR
-//
-//    Irfan Pyarali (irfan@cs.wustl.edu),
-//    Tim Harrison (harrison@cs.wustl.edu) and
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_WIN32_ASYNCH_IO_H)
-#define ACE_WIN32_ASYNCH_IO_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-
-#include "ace/Asynch_IO_Impl.h"
-
-// Forward declaration
-class ACE_WIN32_Proactor;
-
-class ACE_Export ACE_WIN32_Asynch_Result : public virtual ACE_Asynch_Result_Impl,
-                                           public OVERLAPPED
-{
-  // = TITLE
-  //
-  //     An abstract class which adds information to the OVERLAPPED
-  //     structure to make it more useful.
-  //
-  // = DESCRIPTION
-  //
-  //     An abstract base class from which you can obtain some basic
-  //     information like the number of bytes transferred, the ACT
-  //     associated with the asynchronous operation, indication of
-  //     success or failure, etc.  Subclasses may want to store more
-  //     information that is particular to the asynchronous operation
-  //     it represents.
-
-  friend class ACE_WIN32_Asynch_Accept;
-  // Factory class has special permissions.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // Returns 0.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-  virtual ~ACE_WIN32_Asynch_Result (void);
-  // Destructor.
-
-protected:
-  ACE_WIN32_Asynch_Result (ACE_Handler &handler,
-                           const void* act,
-                           ACE_HANDLE event,
-                           u_long offset,
-                           u_long offset_high,
-                           int priority,
-                           int signal_number = 0);
-  // Constructor.
-
-  ACE_Handler &handler_;
-  // Handler that will be called back.
-
-  const void *act_;
-  // ACT for this operation.
-
-  u_long bytes_transferred_;
-  // Bytes transferred by this operation.
-
-  int success_;
-  // Success indicator.
-
-  const void *completion_key_;
-  // ACT associated with handle.
-
-  u_long error_;
-  // Error if operation failed.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Operation : public virtual ACE_Asynch_Operation_Impl
-{
-  // = TITLE
-  //
-  //     This class abstracts out the common things needed for
-  //     implementing Asynch_Operation for WIN32 platform.
-  //
-  // = DESCRIPTION
-  //
-public:
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  // = Access methods.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  ACE_WIN32_Asynch_Operation (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  virtual ~ACE_WIN32_Asynch_Operation (void);
-  // Destructor.
-
-  ACE_WIN32_Proactor *win32_proactor_;
-  // WIn32 Proactor.
-
-  ACE_Proactor *proactor_;
-  // Proactor that this asynch IO is registered with.
-
-  ACE_Handler *handler_;
-  // Handler that will receive the callback.
-
-  ACE_HANDLE handle_;
-  // I/O handle used for reading.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Read_Stream_Result : public virtual ACE_Asynch_Read_Stream_Result_Impl,
-                                                       public virtual ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This is class provides concrete implementation for
-  //     ACE_Asynch_Read_Stream::Result class.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_WIN32_Asynch_Read_Stream;
-  // Factory class will have special permissions.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous read.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for reading.
-
-  // Base class operations. These operations are here to kill
-  // dominance warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Read_Stream_Result (ACE_Handler &handler,
-                                       ACE_HANDLE handle,
-                                       ACE_Message_Block &message_block,
-                                       u_long bytes_to_read,
-                                       const void* act,
-                                       ACE_HANDLE event,
-                                       int priority,
-                                       int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Read_Stream factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // Proactor will call this method when the read completes.
-
-  virtual ~ACE_WIN32_Asynch_Read_Stream_Result (void);
-  // Destructor.
-
-  u_long bytes_to_read_;
-  // Bytes requested when the asynchronous read was initiated.
-
-  ACE_Message_Block &message_block_;
-  // Message block for reading the data into.
-
-  ACE_HANDLE handle_;
-  // I/O handle used for reading.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Read_Stream : public virtual ACE_Asynch_Read_Stream_Impl,
-                                                public ACE_WIN32_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous reads
-  //     on a stream.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class.  An ACE_Asynch_Read_Stream::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     reads completes through the <ACE_Handler::handle_read_stream>
-  //     callback.
-
-public:
-  ACE_WIN32_Asynch_Read_Stream (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.
-
-  virtual ~ACE_WIN32_Asynch_Read_Stream (void);
-  // Destructor.
-
-  // Methods belong to ACE_WIN32_Asynch_Operation base class. These
-  // methods are defined here to avoid VC++ warnings. They route the
-  // call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_read (ACE_WIN32_Asynch_Read_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Read_File class can use it too.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Write_Stream_Result : public virtual ACE_Asynch_Write_Stream_Result_Impl,
-                                                        public ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This is class provides concrete implementation for
-  //     ACE_Asynch_Write_Stream::Result class.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_WIN32_Asynch_Write_Stream;
-  // Factory class willl have special permissions.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block that contains the data to be written.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for writing.
-
-  // = Base class operations. These operations are here to kill some 
-  //   warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Write_Stream_Result (ACE_Handler &handler,
-                                        ACE_HANDLE handle,
-                                        ACE_Message_Block &message_block,
-                                        u_long bytes_to_write,
-                                        const void* act,
-                                        ACE_HANDLE event,
-                                        int priority,
-                                        int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Write_Stream factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the write completes.
-
-  virtual ~ACE_WIN32_Asynch_Write_Stream_Result (void);
-  // Destructor.
-
-  u_long bytes_to_write_;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block_;
-  // Message block that contains the data to be written.
-
-  ACE_HANDLE handle_;
-  // I/O handle used for writing.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Write_Stream : public virtual ACE_Asynch_Write_Stream_Impl,
-                                                 public ACE_WIN32_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous writes
-  //     on a stream.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <writes>s can
-  //     started using this class.  A ACE_Asynch_Write_Stream::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     write completes through the
-  //     <ACE_Handler::handle_write_stream> callback.
-
-public:
-  ACE_WIN32_Asynch_Write_Stream (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be written from the <message_block>.
-
-  virtual ~ACE_WIN32_Asynch_Write_Stream (void);
-  // Destructor.
-
-  // = Methods belong to ACE_WIN32_Asynch_Operation base class. These 
-  //   methods are defined here to avoid VC++ warnings. They route the 
-  //   call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-protected:
-  int shared_write (ACE_WIN32_Asynch_Write_Stream_Result *result);
-  // This is the method which does the real work and is there so that
-  // the ACE_Asynch_Write_File class can use it too.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Read_File_Result : public virtual ACE_Asynch_Read_File_Result_Impl,
-                                                     public ACE_WIN32_Asynch_Read_Stream_Result
-{
-  // = TITLE
-  //
-  //     This is class provides concrete implementation for
-  //     ACE_Asynch_Read_File::Result class.
-  //
-  // = DESCRIPTION
-  //
-
-  friend class ACE_WIN32_Asynch_Read_File;
-  // Factory class will have special permissions.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  // = These methods belong to ACE_WIN32_Asynch_Result class base
-  //   class. These operations are here to kill some warnings. These 
-  //   methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-  
-  // The following methods belong to
-  // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++
-  // dominance warnings. These methods route their call to the
-  // ACE_WIN32_Asynch_Read_Stream_Result base class.
-
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous read.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for reading.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Read_File_Result (ACE_Handler &handler,
-                                     ACE_HANDLE handle,
-                                     ACE_Message_Block &message_block,
-                                     u_long bytes_to_read,
-                                     const void* act,
-                                     u_long offset,
-                                     u_long offset_high,
-                                     ACE_HANDLE event,
-                                     int priority,
-                                     int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Read_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the read completes.
-
-  virtual ~ACE_WIN32_Asynch_Read_File_Result (void);
-  // Destructor.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Read_File : public virtual ACE_Asynch_Read_File_Impl,
-                                              public ACE_WIN32_Asynch_Read_Stream
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous reads
-  //     on a file.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <read>s can
-  //     started using this class.  A ACE_Asynch_Read_File::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     reads completes through the <ACE_Handler::handle_read_file>
-  //     callback.
-  //
-  //     This class differs slightly from ACE_Asynch_Read_Stream as it
-  //     allows the user to specify an offset for the read.
-
-public:
-  ACE_WIN32_Asynch_Read_File (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            u_long offset,
-            u_long offset_high,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This starts off an asynchronous read.  Upto <bytes_to_read> will
-  // be read and stored in the <message_block>.  The read will start
-  // at <offset> from the beginning of the file.
-
-  virtual ~ACE_WIN32_Asynch_Read_File (void);
-  // Destructor.
-
-  // = Methods belong to ACE_WIN32_Asynch_Operation base class. These 
-  //   methods are defined here to avoid VC++ warnings. They route the 
-  //   call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int read (ACE_Message_Block &message_block,
-            u_long bytes_to_read,
-            const void *act,
-            int priority,
-            int signal_number = 0);
-  // This method belongs to ACE_WIN32_Asynch_Read_Stream. It is here
-  // to avoid the compiler warnings. We forward this call to the
-  // ACE_WIN32_Asynch_Read_Stream class.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Write_File_Result : public virtual ACE_Asynch_Write_File_Result_Impl,
-                                                      public ACE_WIN32_Asynch_Write_Stream_Result
-{
-  // = TITLE
-  //
-  //     This class provides implementation for
-  //      ACE_Asynch_Write_File_Result for WIN32 platforms.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous write.
-  //
-  //     This class differs slightly from
-  //     ACE_Asynch_Write_Stream::Result as it calls back
-  //     <ACE_Handler::handle_write_file> on the <handler> instead
-  //     of <ACE_Handler::handle_write_stream>.  No additional state
-  //     is required by this class as ACE_Asynch_Result can store
-  //     the <offset>.
-
-  friend class ACE_WIN32_Asynch_Write_File;
-  // Factory class will have special permission.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  // = Base class operations. These operations are here to kill some
-  //   warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-  
-  // The following methods belong to
-  // ACE_WIN32_Asynch_Read_Stream_Result. They are here to avoid VC++
-  // warnings. These methods route their call to the
-  // ACE_WIN32_Asynch_Read_Stream_Result base class.
-
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous write.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block that contains the data to be written.
-
-  ACE_HANDLE handle (void) const;
-  // I/O handle used for writing.
-
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Write_File_Result (ACE_Handler &handler,
-                                      ACE_HANDLE handle,
-                                      ACE_Message_Block &message_block,
-                                      u_long bytes_to_write,
-                                      const void* act,
-                                      u_long offset,
-                                      u_long offset_high,
-                                      ACE_HANDLE event,
-                                      int priority,
-                                      int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Write_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the write completes.
-
-  virtual ~ACE_WIN32_Asynch_Write_File_Result (void);
-  // Destructor.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Write_File : public virtual ACE_Asynch_Write_File_Impl,
-                                               public ACE_WIN32_Asynch_Write_Stream
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous writes
-  //     on a file.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <write>s can be
-  //     started using this class.  A ACE_Asynch_Write_File::Result
-  //     will be passed back to the <handler> when the asynchronous
-  //     writes completes through the <ACE_Handler::handle_write_file>
-  //     callback.
-
-public:
-  ACE_WIN32_Asynch_Write_File (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             u_long offset,
-             u_long offset_high,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This starts off an asynchronous write.  Upto <bytes_to_write>
-  // will be write and stored in the <message_block>.  The write will
-  // start at <offset> from the beginning of the file.
-
-  virtual ~ACE_WIN32_Asynch_Write_File (void);
-  // Destrcutor.
-
-  // = Methods belong to ACE_WIN32_Asynch_Operation base class. These 
-  //   methods are defined here to avoid VC++ warnings. They route the 
-  //   call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-
-private:
-  int write (ACE_Message_Block &message_block,
-             u_long bytes_to_write,
-             const void *act,
-             int priority,
-             int signal_number = 0);
-  // This method belongs to ACE_WIN32_Asynch_Write_Stream. It is here
-  // to avoid compiler warnings. This method is forwarded to the
-  // ACE_WIN32_Asynch_Write_Stream class.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Accept_Result : public virtual ACE_Asynch_Accept_Result_Impl,
-                                                  public ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Accept::Result for WIN32
-  //     platform.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous accept.
-
-  friend class ACE_WIN32_Asynch_Accept;
-  // Factory will have special permission.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  u_long bytes_to_read (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous accept.
-
-  ACE_Message_Block &message_block (void) const;
-  // Message block which contains the read data.
-
-  ACE_HANDLE listen_handle (void) const;
-  // I/O handle used for accepting new connections.
-
-  ACE_HANDLE accept_handle (void) const;
-  // I/O handle for the new connection.
-
-  // = Base class operations. These operations are here to kill some 
-  //   warnings. These methods call the base class methods. 
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Accept_Result (ACE_Handler &handler,
-                                  ACE_HANDLE listen_handle,
-                                  ACE_HANDLE accept_handle,
-                                  ACE_Message_Block &message_block,
-                                  u_long bytes_to_read,
-                                  const void* act,
-                                  ACE_HANDLE event,
-                                  int priority,
-                                  int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Accept factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // ACE_Proactor will call this method when the accept completes.
-
-  virtual ~ACE_WIN32_Asynch_Accept_Result (void);
-  // Destructor.
-
-  u_long bytes_to_read_;
-  // Bytes requested when the asynchronous read was initiated.
-
-  ACE_Message_Block &message_block_;
-  // Message block for reading the data into.
-
-  ACE_HANDLE listen_handle_;
-  // I/O handle used for accepting new connections.
-
-  ACE_HANDLE accept_handle_;
-  // I/O handle for the new connection.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Accept : public virtual ACE_Asynch_Accept_Impl,
-                                           public ACE_WIN32_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous accepts
-  //     on a listen handle.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <accept>s can
-  //     started using this class.  A ACE_Asynch_Accept::Result will
-  //     be passed back to the <handler> when the asynchronous accept
-  //     completes through the <ACE_Handler::handle_accept>
-  //     callback.
-
-public:
-  ACE_WIN32_Asynch_Accept (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int accept (ACE_Message_Block &message_block,
-              u_long bytes_to_read,
-              ACE_HANDLE accept_handle,
-              const void *act,
-              int priority,
-              int signal_number = 0);
-  // This starts off an asynchronous accept.  The asynchronous accept
-  // call also allows any initial data to be returned to the
-  // <handler>.  Upto <bytes_to_read> will be read and stored in the
-  // <message_block>.  The <accept_handle> will be used for the
-  // <accept> call.  If (<accept_handle> == INVALID_HANDLE), a new
-  // handle will be created.
-  //
-  // <message_block> must be specified. This is because the address of
-  // the new connection is placed at the end of this buffer.
-
-  ~ACE_WIN32_Asynch_Accept (void);
-  // Destructor.
-
-  // Methods belong to ACE_WIN32_Asynch_Operation base class. These
-  // methods are defined here to avoid VC++ warnings. They route the
-  // call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Transmit_File_Result : public virtual ACE_Asynch_Transmit_File_Result_Impl,
-                                                         public ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  //
-  //     This class implements ACE_Asynch_Transmit_File::Result for
-  //     WIN32 platforms.
-  //
-  // = DESCRIPTION
-  //
-  //     This class has all the information necessary for the
-  //     <handler> to uniquiely identify the completion of the
-  //     asynchronous transmit file.
-
-  friend class ACE_WIN32_Asynch_Transmit_File;
-  // Factory class will have special permission.
-
-  friend class ACE_WIN32_Proactor;
-  // Proactor class has special permission.
-
-public:
-  ACE_HANDLE socket (void) const;
-  // Socket used for transmitting the file.
-
-  ACE_HANDLE file (void) const;
-  // File from which the data is read.
-
-  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer (void) const;
-  // Header and trailer data associated with this transmit file.
-
-  u_long bytes_to_write (void) const;
-  // The number of bytes which were requested at the start of the
-  // asynchronous transmit file.
-
-  u_long bytes_per_send (void) const;
-  // Number of bytes per send requested at the start of the transmit
-  // file.
-
-  u_long flags (void) const;
-  // Flags which were passed into transmit file.
-
-  // Base class operations. These operations are here to kill some
-  // warnings. These methods call the base class methods.
-
-  u_long bytes_transferred (void) const;
-  // Number of bytes transferred by the operation.
-
-  const void *act (void) const;
-  // ACT associated with the operation.
-
-  int success (void) const;
-  // Did the operation succeed?
-
-  const void *completion_key (void) const;
-  // This returns the ACT associated with the handle when it was
-  // registered with the I/O completion port.  This ACT is not the
-  // same as the ACT associated with the asynchronous operation.
-
-  u_long error (void) const;
-  // Error value if the operation fail.
-
-  ACE_HANDLE event (void) const;
-  // Event associated with the OVERLAPPED structure.
-
-  u_long offset (void) const;
-  // This really make sense only when doing file I/O.
-
-  u_long offset_high (void) const;
-  // Offset_high associated with the OVERLAPPED structure.
-
-  int priority (void) const;
-  // The priority of the asynchronous operation. Currently, this is
-  // not supported on Win32.
-
-  int signal_number (void) const;
-  // No-op. Returns 0.
-  
-  int post_completion (ACE_Proactor_Impl *proactor);
-  // Post <this> to the Proactor's completion port.
-
-protected:
-  ACE_WIN32_Asynch_Transmit_File_Result (ACE_Handler &handler,
-					 ACE_HANDLE socket,
-					 ACE_HANDLE file,
-					 ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-					 u_long bytes_to_write,
-					 u_long offset,
-					 u_long offset_high,
-					 u_long bytes_per_send,
-					 u_long flags,
-					 const void *act,
-					 ACE_HANDLE event,
-					 int priority,
-                                         int signal_number = 0);
-  // Constructor is protected since creation is limited to
-  // ACE_Asynch_Transmit_File factory.
-
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error);
-  // Proactor will call this method when the write completes.
-
-  virtual ~ACE_WIN32_Asynch_Transmit_File_Result (void);
-  // Destructor.
-
-  ACE_HANDLE socket_;
-  // Network I/O handle.
-
-  ACE_HANDLE file_;
-  // File I/O handle.
-
-  ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer_;
-  // Header and trailer data associated with this transmit file.
-
-  u_long bytes_to_write_;
-  // The number of bytes which were requested at the start of the
-  // asynchronous transmit file.
-
-  u_long bytes_per_send_;
-  // Number of bytes per send requested at the start of the transmit
-  // file.
-
-  u_long flags_;
-  // Flags which were passed into transmit file.
-};
-
-class ACE_Export ACE_WIN32_Asynch_Transmit_File : public virtual ACE_Asynch_Transmit_File_Impl,
-                                                  public ACE_WIN32_Asynch_Operation
-{
-  // = TITLE
-  //
-  //     This class is a factory for starting off asynchronous
-  //     transmit files on a stream.
-  //
-  // = DESCRIPTION
-  //
-  //     Once <open> is called, multiple asynchronous <transmit_file>s
-  //     can started using this class.  A
-  //     ACE_Asynch_Transmit_File::Result will be passed back to the
-  //     <handler> when the asynchronous transmit file completes
-  //     through the <ACE_Handler::handle_transmit_file> callback.
-  //
-  //     The transmit_file function transmits file data over a
-  //     connected network connection. The function uses the operating
-  //     system's cache manager to retrieve the file data. This
-  //     function provides high-performance file data transfer over
-  //     network connections.  This function would be of great use in
-  //     a Web Server, Image Server, etc.
-
-public:
-  ACE_WIN32_Asynch_Transmit_File (ACE_WIN32_Proactor *win32_proactor);
-  // Constructor.
-
-  int transmit_file (ACE_HANDLE file,
-                     ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                     u_long bytes_to_write,
-                     u_long offset,
-                     u_long offset_high,
-                     u_long bytes_per_send,
-                     u_long flags,
-                     const void *act,
-                     int priority,
-                     int signal_number = 0);
-  // This starts off an asynchronous transmit file. The <file> is a
-  // handle to an open file.  <header_and_trailer> is a pointer to a
-  // data structure that contains pointers to data to send before and
-  // after the file data is sent.  Set this parameter to 0 if you only
-  // want to transmit the file data.  Upto <bytes_to_write> will be
-  // written to the <socket>.  If you want to send the entire file,
-  // let <bytes_to_write> = 0.  <bytes_per_send> is the size of each
-  // block of data sent per send operation.  Please read the Win32
-  // documentation on what the flags should be.
-
-  ~ACE_WIN32_Asynch_Transmit_File (void);
-  // Destructor.
-
-  // Methods belong to ACE_WIN32_Asynch_Operation base class. These
-  // methods are defined here to avoid VC++ warnings. They route the
-  // call to the ACE_WIN32_Asynch_Operation base class.
-
-  int open (ACE_Handler &handler,
-            ACE_HANDLE handle,
-            const void *completion_key,
-            ACE_Proactor *proactor);
-  // Initializes the factory with information which will be used with
-  // each asynchronous call.  If (<handle> == ACE_INVALID_HANDLE),
-  // <ACE_Handler::handle> will be called on the <handler> to get the
-  // correct handle.
-
-  int cancel (void);
-  // This cancels all pending accepts operations that were issued by
-  // the calling thread.  The function does not cancel asynchronous
-  // operations issued by other threads.
-
-  ACE_Proactor* proactor (void) const;
-  // Return the underlying proactor.
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/WIN32_Asynch_IO.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
-#endif /* ACE_WIN32_ASYNCH_IO_H */
diff --git a/ace/WIN32_Asynch_IO.i b/ace/WIN32_Asynch_IO.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/ace/WIN32_Asynch_IO.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/ace/WIN32_Proactor.cpp b/ace/WIN32_Proactor.cpp
deleted file mode 100644
index fc87933c28b..00000000000
--- a/ace/WIN32_Proactor.cpp
+++ /dev/null
@@ -1,598 +0,0 @@
-// $Id$
-
-#define ACE_BUILD_DLL
-
-// ACE_RCSID(ace, Proactor, "$Id$")
-
-#include "ace/WIN32_Proactor.h"
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-// WIN implemenatation of the Proactor.
-
-#include "ace/Log_Msg.h"
-#include "ace/Object_Manager.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/WIN32_Proactor.i"
-#endif /* __ACE_INLINE__ */
-
-class ACE_Export ACE_WIN32_Wakeup_Completion : public ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  // 
-  //     This is result object is used by the <end_event_loop> of the 
-  //     ACE_Proactor interface to wake up all the threads blocking
-  //     for completions.
-  // 
-  // = DESCRIPTION
-  // 
-  
-public:
-  ACE_WIN32_Wakeup_Completion (ACE_Handler &handler,
-                               const void *act = 0,
-                               ACE_HANDLE event = ACE_INVALID_HANDLE,
-                               int priority = 0,
-                               int signal_number = ACE_SIGRTMIN);
-  // Constructor.
-  
-  virtual ~ACE_WIN32_Wakeup_Completion (void);
-  // Destructor.
-  
-  
-  virtual void complete (u_long bytes_transferred = 0,
-                         int success = 1,
-                         const void *completion_key = 0,
-                         u_long error = 0);
-  // This method calls the <handler>'s <handle_wakeup> method.
-};
-
-// *********************************************************************
-
-ACE_WIN32_Proactor::ACE_WIN32_Proactor (size_t number_of_threads,
-                                        int used_with_reactor_event_loop)
-  : completion_port_ (0),
-    // This *MUST* be 0, *NOT* ACE_INVALID_HANDLE !!!
-    number_of_threads_ (number_of_threads),
-    used_with_reactor_event_loop_ (used_with_reactor_event_loop)
-{
-  // Create the completion port.
-  this->completion_port_ = ::CreateIoCompletionPort (INVALID_HANDLE_VALUE,
-                                                     this->completion_port_,
-                                                     0,
-                                                     this->number_of_threads_);
-  if (this->completion_port_ == 0)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("CreateIoCompletionPort")));
-}
-
-ACE_WIN32_Proactor::~ACE_WIN32_Proactor (void)
-{
-  this->close ();
-}
-
-int
-ACE_WIN32_Proactor::close (void)
-{
-  // Close the completion port
-  if (this->completion_port_ != 0)
-    {
-      int result = ACE_OS::close (this->completion_port_);
-      this->completion_port_ = 0;
-      return result;
-    }
-
-  return 0;
-}
-
-int
-ACE_WIN32_Proactor::register_handle (ACE_HANDLE handle,
-                                     const void *completion_key)
-{
-  // No locking is needed here as no state changes.
-  ACE_HANDLE cp = ::CreateIoCompletionPort (handle,
-                                            this->completion_port_,
-                                            (u_long) completion_key,
-                                            this->number_of_threads_);
-  if (cp == 0)
-    {
-      errno = ::GetLastError ();
-      // If errno == ERROR_INVALID_PARAMETER, then this handle was
-      // already registered.
-      if (errno != ERROR_INVALID_PARAMETER)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("CreateIoCompletionPort")), -1);
-    }
-  return 0;
-}
-
-ACE_Asynch_Read_Stream_Impl *
-ACE_WIN32_Proactor::create_asynch_read_stream (void)
-{
-  ACE_Asynch_Read_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_Stream (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_Stream_Impl *
-ACE_WIN32_Proactor::create_asynch_write_stream (void)
-{
-  ACE_Asynch_Write_Stream_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_Stream (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Read_File_Impl *
-ACE_WIN32_Proactor::create_asynch_read_file (void)
-{
-  ACE_Asynch_Read_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Write_File_Impl *
-ACE_WIN32_Proactor::create_asynch_write_file (void)
-{
-  ACE_Asynch_Write_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Accept_Impl *
-ACE_WIN32_Proactor::create_asynch_accept (void)
-{
-  ACE_Asynch_Accept_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Accept (this),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Transmit_File_Impl *
-ACE_WIN32_Proactor::create_asynch_transmit_file (void)
-{
-  ACE_Asynch_Transmit_File_Impl *implementation = 0;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Transmit_File (this),
-                  0);
-  return  implementation;
-}
-
-ACE_Asynch_Read_Stream_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_read_stream_result (ACE_Handler &handler,
-                                                      ACE_HANDLE handle,
-                                                      ACE_Message_Block &message_block,
-                                                      u_long bytes_to_read,
-                                                      const void* act,
-                                                      ACE_HANDLE event,
-                                                      int priority,
-                                                      int signal_number)
-{
-  ACE_Asynch_Read_Stream_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_Stream_Result (handler,
-                                                       handle,
-                                                       message_block,
-                                                       bytes_to_read,
-                                                       act,
-                                                       event,
-                                                       priority,
-                                                       signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_Stream_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_write_stream_result (ACE_Handler &handler,
-                                                       ACE_HANDLE handle,
-                                                       ACE_Message_Block &message_block,
-                                                       u_long bytes_to_write,
-                                                       const void* act,
-                                                       ACE_HANDLE event,
-                                                       int priority,
-                                                       int signal_number)
-{
-  ACE_Asynch_Write_Stream_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_Stream_Result (handler,
-                                                        handle,
-                                                        message_block,
-                                                        bytes_to_write,
-                                                        act,
-                                                        event,
-                                                        priority,
-                                                        signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Read_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_read_file_result (ACE_Handler &handler,
-                                                    ACE_HANDLE handle,
-                                                    ACE_Message_Block &message_block,
-                                                    u_long bytes_to_read,
-                                                    const void* act,
-                                                    u_long offset,
-                                                    u_long offset_high,
-                                                    ACE_HANDLE event,
-                                                    int priority,
-                                                    int signal_number)
-{
-  ACE_Asynch_Read_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Read_File_Result (handler,
-                                                     handle,
-                                                     message_block,
-                                                     bytes_to_read,
-                                                     act,
-                                                     offset,
-                                                     offset_high,
-                                                     event,
-                                                     priority,
-                                                     signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Write_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_write_file_result (ACE_Handler &handler,
-                                                     ACE_HANDLE handle,
-                                                     ACE_Message_Block &message_block,
-                                                     u_long bytes_to_write,
-                                                     const void* act,
-                                                     u_long offset,
-                                                     u_long offset_high,
-                                                     ACE_HANDLE event,
-                                                     int priority,
-                                                     int signal_number)
-{
-  ACE_Asynch_Write_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Write_File_Result (handler,
-                                                      handle,
-                                                      message_block,
-                                                      bytes_to_write,
-                                                      act,
-                                                      offset,
-                                                      offset_high,
-                                                      event,
-                                                      priority,
-                                                      signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Accept_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_accept_result (ACE_Handler &handler,
-                                                 ACE_HANDLE listen_handle,
-                                                 ACE_HANDLE accept_handle,
-                                                 ACE_Message_Block &message_block,
-                                                 u_long bytes_to_read,
-                                                 const void* act,
-                                                 ACE_HANDLE event,
-                                                 int priority,
-                                                 int signal_number)
-{
-  ACE_Asynch_Accept_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Accept_Result (handler,
-                                                  listen_handle,
-                                                  accept_handle,
-                                                  message_block,
-                                                  bytes_to_read,
-                                                  act,
-                                                  event,
-                                                  priority,
-                                                  signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Transmit_File_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                        ACE_HANDLE socket,
-                                                        ACE_HANDLE file,
-                                                        ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                        u_long bytes_to_write,
-                                                        u_long offset,
-                                                        u_long offset_high,
-                                                        u_long bytes_per_send,
-                                                        u_long flags,
-                                                        const void *act,
-                                                        ACE_HANDLE event,
-                                                        int priority,
-                                                        int signal_number)
-{
-  ACE_Asynch_Transmit_File_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Transmit_File_Result (handler,
-                                                         socket,
-                                                         file,
-                                                         header_and_trailer,
-                                                         bytes_to_write,
-                                                         offset,
-                                                         offset_high,
-                                                         bytes_per_send,
-                                                         flags,
-                                                         act,
-                                                         event,
-                                                         priority,
-                                                         signal_number),
-                  0);
-  return implementation;
-}
-
-ACE_Asynch_Result_Impl *
-ACE_WIN32_Proactor::create_asynch_timer (ACE_Handler &handler,
-                                         const void *act,
-                                         const ACE_Time_Value &tv,
-                                         ACE_HANDLE event,
-                                         int priority,
-                                         int signal_number)
-{
-  ACE_Asynch_Result_Impl *implementation;
-  ACE_NEW_RETURN (implementation,
-                  ACE_WIN32_Asynch_Timer (handler,
-                                          act,
-                                          tv,
-                                          event,
-                                          priority,
-                                          signal_number),
-                  0);
-  return implementation;
-}
-
-int
-ACE_WIN32_Proactor::handle_signal (int, siginfo_t *, ucontext_t *)
-{
-  // Perform a non-blocking "poll" for all the I/O events that have
-  // completed in the I/O completion queue.
-
-  ACE_Time_Value timeout (0, 0);
-  int result = 0;
-
-  while (1)
-    {
-      result = this->handle_events (timeout);
-      if (result != 0 || errno == ETIME)
-        break;
-    }
-
-  // If our handle_events failed, we'll report a failure to the
-  // Reactor.
-  return result == -1 ? -1 : 0;
-}
-
-int
-ACE_WIN32_Proactor::handle_close (ACE_HANDLE handle,
-                                  ACE_Reactor_Mask close_mask)
-{
-  ACE_UNUSED_ARG (close_mask);
-  ACE_UNUSED_ARG (handle);
-
-  return this->close ();
-}
-
-ACE_HANDLE
-ACE_WIN32_Proactor::get_handle (void) const
-{
-  if (this->used_with_reactor_event_loop_)
-    return this->event_.handle ();
-  else
-    return 0;
-}
-
-int
-ACE_WIN32_Proactor::handle_events (ACE_Time_Value &wait_time)
-{
-  // Decrement <wait_time> with the amount of time spent in the method
-  ACE_Countdown_Time countdown (&wait_time);
-  return this->handle_events (wait_time.msec ());
-}
-
-int
-ACE_WIN32_Proactor::handle_events (void)
-{
-  return this->handle_events (ACE_INFINITE);
-}
-
-int
-ACE_WIN32_Proactor::handle_events (unsigned long milli_seconds)
-{
-  ACE_OVERLAPPED *overlapped = 0;
-  u_long bytes_transferred = 0;
-  u_long completion_key = 0;
-
-  // Get the next asynchronous operation that completes
-  BOOL result = ::GetQueuedCompletionStatus (this->completion_port_,
-                                             &bytes_transferred,
-                                             &completion_key,
-                                             &overlapped,
-                                             milli_seconds);
-  if (result == FALSE && overlapped == 0)
-    {
-      errno = ::GetLastError ();
-
-      if (errno == WAIT_TIMEOUT)
-        {
-          errno = ETIME;
-          return 0;
-        }
-      else
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ASYS_TEXT ("%p\n"),
-                           ASYS_TEXT ("GetQueuedCompletionStatus")),
-                          -1);
-    }
-  else
-    {
-      // Narrow the result.
-      ACE_WIN32_Asynch_Result *asynch_result = (ACE_WIN32_Asynch_Result *) overlapped;
-
-      // If errors happen, grab the error.
-      if (result == FALSE)
-        errno = ::GetLastError ();
-      else
-        errno = 0;
-
-      this->application_specific_code (asynch_result,
-                                       bytes_transferred,
-                                       result,
-                                       (void *) completion_key,
-                                       errno);
-    }
-  return 1;
-}
-
-void
-ACE_WIN32_Proactor::application_specific_code (ACE_WIN32_Asynch_Result *asynch_result,
-                                               u_long bytes_transferred,
-                                               int success,
-                                               const void *completion_key,
-                                               u_long error)
-{
-  ACE_SEH_TRY
-    {
-      // Call completion hook
-      asynch_result->complete (bytes_transferred,
-                               success,
-                               (void *) completion_key,
-                               error);
-    }
-  ACE_SEH_FINALLY
-    {
-      // This is crucial to prevent memory leaks
-      delete asynch_result;
-    }
-}
-
-int
-ACE_WIN32_Proactor::post_completion (ACE_WIN32_Asynch_Result *result)
-{
-  // Grab the event associated with the Proactor
-  HANDLE handle = this->get_handle ();
-  
-  // If Proactor event is valid, signal it
-  if (handle != ACE_INVALID_HANDLE &&
-      handle != 0)
-    ACE_OS::event_signal (&handle);
-
-  // Post a completion
-  if (::PostQueuedCompletionStatus (this->completion_port_, // completion port
-                                    0,            // number of bytes tranferred
-                                    0,            // completion key
-                                    result      // overlapped
-                                    ) == FALSE)
-    {
-      delete result;
-      ACE_ERROR_RETURN ((LM_ERROR, "PostQueuedCompletionStatus failed\n"), -1);
-    }
-
-  return 0;
-}
-
-int
-ACE_WIN32_Proactor::post_wakeup_completions (int how_many)
-{
-  ACE_WIN32_Wakeup_Completion *wakeup_completion = 0;
-  for (ssize_t ci = 0; ci < how_many; ci++)
-    {
-      ACE_NEW_RETURN (wakeup_completion,
-                      ACE_WIN32_Wakeup_Completion (this->wakeup_handler_),
-                      -1);
-      
-      if (wakeup_completion->post_completion (this) == -1)
-        return -1;
-    }
-  
-  return 0;
-}  
-
-int
-ACE_WIN32_Proactor::wake_up_dispatch_threads (void)
-{
-  return 0;
-}
-
-int
-ACE_WIN32_Proactor::close_dispatch_threads (int)
-{
-  return 0;
-}
-
-size_t
-ACE_WIN32_Proactor::number_of_threads (void) const
-{
-  return this->number_of_threads_;
-}
-
-void
-ACE_WIN32_Proactor::number_of_threads (size_t threads)
-{
-  this->number_of_threads_ = threads;
-}
-
-// *********************************************************************
-
-ACE_WIN32_Asynch_Timer::ACE_WIN32_Asynch_Timer (ACE_Handler &handler,
-                                                const void *act,
-                                                const ACE_Time_Value &tv,
-                                                ACE_HANDLE event,
-                                                int priority,
-                                                int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority,
-                             signal_number),
-    time_ (tv)
-{
-}
-
-void
-ACE_WIN32_Asynch_Timer::complete (u_long bytes_transferred,
-                                  int success,
-                                  const void *completion_key,
-                                  u_long error)
-{
-  ACE_UNUSED_ARG (error);
-  ACE_UNUSED_ARG (completion_key);
-  ACE_UNUSED_ARG (success);
-  ACE_UNUSED_ARG (bytes_transferred);
-
-  this->handler_.handle_time_out (this->time_, this->act ());
-}
-
-// *********************************************************************
-
-ACE_WIN32_Wakeup_Completion::ACE_WIN32_Wakeup_Completion (ACE_Handler &handler,
-                                                          const void *act,
-                                                          ACE_HANDLE event,
-                                                          int priority,
-                                                          int signal_number)
-  : ACE_Asynch_Result_Impl (),
-    ACE_WIN32_Asynch_Result (handler, act, event, 0, 0, priority, signal_number)
-{
-}
-
-ACE_WIN32_Wakeup_Completion::~ACE_WIN32_Wakeup_Completion (void)
-{
-}
-
-void
-ACE_WIN32_Wakeup_Completion::complete (u_long       /* bytes_transferred */,
-                                       int          /* success */,
-                                       const void * /* completion_key */,
-                                       u_long       /*  error */)
-{
-  this->handler_.handle_wakeup ();
-}
-
-#endif /* ACE_WIN32 */
diff --git a/ace/WIN32_Proactor.h b/ace/WIN32_Proactor.h
deleted file mode 100644
index cc7dec6e120..00000000000
--- a/ace/WIN32_Proactor.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    WIN_Proactor.h
-//
-// = AUTHOR
-//    Irfan Pyarali (irfan@cs.wustl.edu),
-//    Tim Harrison (harrison@cs.wustl.edu) and
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#if !defined (ACE_WIN32_PROACTOR_H)
-#define ACE_WIN32_PROACTOR_H
-
-#include "ace/OS.h"
-#include "ace/WIN32_Asynch_IO.h"
-#include "ace/Event_Handler.h"
-
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-// WIN32 implementation of the Proactor.
-
-#include "ace/Proactor_Impl.h"
-
-// Forward declarations.
-class ACE_WIN32_Asynch_Result;
-class ACE_WIN32_Proactor_Timer_Handler;
-
-class ACE_Export ACE_WIN32_Proactor : public ACE_Proactor_Impl
-{
-  // = TITLE
-  //     A manager for asynchronous event demultiplexing.
-  //
-  // = DESCRIPTION
-  //     See the Proactor pattern description at
-  //     http://www.cs.wustl.edu/~schmidt/proactor.ps.gz for more
-  //     details.
-public:
-  ACE_WIN32_Proactor (size_t number_of_threads = 0,
-                      int used_with_reactor_event_loop = 0);
-  // A do nothing constructor.
-
-  virtual ~ACE_WIN32_Proactor (void);
-  // Virtual destruction.
-
-  virtual int close (void);
-  // Close the IO completion port.
-
-  virtual int register_handle (ACE_HANDLE handle,
-			       const void *completion_key);
-  // This method adds the <handle> to the I/O completion port. This
-  // function is a no-op function for Unix systems.
-
-  virtual int handle_events (ACE_Time_Value &wait_time);
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
-
-  virtual int handle_events (void);
-  // Block indefinitely until at least one event is dispatched.
-  // Dispatch a single set of events.  If <wait_time> elapses before
-  // any events occur, return 0.  Return 1 on success i.e., when a
-  // completion is dispatched, non-zero (-1) on errors and errno is
-  // set accordingly. 
-
-  virtual int post_completion (ACE_WIN32_Asynch_Result *result);
-  // Post a result to the completion port of the Proactor.  If errors
-  // occur, the result will be deleted by this method.  If successful,
-  // the result will be deleted by the Proactor when the result is
-  // removed from the completion port.  Therefore, the result should
-  // have been dynamically allocated and should be orphaned by the
-  // user once this method is called.
-
-  int wake_up_dispatch_threads (void);
-  // Add wakeup dispatch threads (reinit).
-
-  int close_dispatch_threads (int wait);
-  // Close all dispatch threads.
-
-  size_t number_of_threads (void) const;
-  void number_of_threads (size_t threads);
-  // Number of thread used as a parameter to CreatIoCompletionPort.
-
-  virtual ACE_HANDLE get_handle (void) const;
-  // Get the event handle.
-
-  virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void);
-
-  virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void);
-
-  virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void);
-
-  virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void);
-
-  virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void);
-
-  virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void);
-
-  // Methods used to create Asynch_IO_Result objects. We create the right
-  // objects here in these methods.
-
-  virtual ACE_Asynch_Read_Stream_Result_Impl *create_asynch_read_stream_result (ACE_Handler &handler,
-                                                                                ACE_HANDLE handle,
-                                                                                ACE_Message_Block &message_block,
-                                                                                u_long bytes_to_read,
-                                                                                const void* act,
-                                                                                ACE_HANDLE event,
-                                                                                int priority,
-                                                                                int signal_number = 0);
-
-  virtual ACE_Asynch_Write_Stream_Result_Impl *create_asynch_write_stream_result (ACE_Handler &handler,
-                                                                                  ACE_HANDLE handle,
-                                                                                  ACE_Message_Block &message_block,
-                                                                                  u_long bytes_to_write,
-                                                                                  const void* act,
-                                                                                  ACE_HANDLE event,
-                                                                                  int priority,
-                                                                                  int signal_number = 0);
-
-  virtual ACE_Asynch_Read_File_Result_Impl *create_asynch_read_file_result (ACE_Handler &handler,
-                                                                            ACE_HANDLE handle,
-                                                                            ACE_Message_Block &message_block,
-                                                                            u_long bytes_to_read,
-                                                                            const void* act,
-                                                                            u_long offset,
-                                                                            u_long offset_high,
-                                                                            ACE_HANDLE event,
-                                                                            int priority,
-                                                                            int signal_number = 0);
-
-  virtual ACE_Asynch_Write_File_Result_Impl *create_asynch_write_file_result (ACE_Handler &handler,
-                                                                              ACE_HANDLE handle,
-                                                                              ACE_Message_Block &message_block,
-                                                                              u_long bytes_to_write,
-                                                                              const void* act,
-                                                                              u_long offset,
-                                                                              u_long offset_high,
-                                                                              ACE_HANDLE event,
-                                                                              int priority,
-                                                                              int signal_number = 0);
-
-  virtual ACE_Asynch_Accept_Result_Impl *create_asynch_accept_result (ACE_Handler &handler,
-                                                                      ACE_HANDLE listen_handle,
-                                                                      ACE_HANDLE accept_handle,
-                                                                      ACE_Message_Block &message_block,
-                                                                      u_long bytes_to_read,
-                                                                      const void* act,
-                                                                      ACE_HANDLE event,
-                                                                      int priority,
-                                                                      int signal_number = 0);
-
-  virtual ACE_Asynch_Transmit_File_Result_Impl *create_asynch_transmit_file_result (ACE_Handler &handler,
-                                                                                    ACE_HANDLE socket,
-                                                                                    ACE_HANDLE file,
-                                                                                    ACE_Asynch_Transmit_File::Header_And_Trailer *header_and_trailer,
-                                                                                    u_long bytes_to_write,
-                                                                                    u_long offset,
-                                                                                    u_long offset_high,
-                                                                                    u_long bytes_per_send,
-                                                                                    u_long flags,
-                                                                                    const void *act,
-                                                                                    ACE_HANDLE event,
-                                                                                    int priority,
-                                                                                    int signal_number = 0);
-  
-  virtual ACE_Asynch_Result_Impl *create_asynch_timer (ACE_Handler &handler,
-                                                       const void *act,
-                                                       const ACE_Time_Value &tv,
-                                                       ACE_HANDLE event,
-                                                       int priority,
-                                                       int signal_number = 0);
-  // Create a timer result object which can be used with the Timer
-  // mechanism of the Proactor. 
-
-protected:
-  virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0);
-  // Called when object is signaled by OS (either via UNIX signals or
-  // when a Win32 object becomes signaled).
-
-  virtual int handle_close (ACE_HANDLE handle,
-			    ACE_Reactor_Mask close_mask);
-  // Called when object is removed from the ACE_Reactor.
-
-  virtual int handle_events (unsigned long milli_seconds);
-  // Dispatch a single set of events.  If <milli_seconds> elapses
-  // before any events occur, return 0. Return 1 if a completion is
-  // dispatched. Return -1 on errors.  
-
-  void application_specific_code (ACE_WIN32_Asynch_Result *asynch_result,
-				  u_long bytes_transferred,
-				  int success,
-				  const void *completion_key,
-				  u_long error);
-  // Protect against structured exceptions caused by user code when
-  // dispatching handles.
-
-  virtual int post_wakeup_completions (int how_many);
-  // Post <how_many> completions to the completion port so that all
-  // threads can wake up. This is used in conjunction with the
-  // <run_event_loop>. 
-
-  ACE_HANDLE completion_port_;
-  // Handle for the completion port. Unix doesnt have completion
-  // ports.
-
-  size_t number_of_threads_;
-  // This number is passed to the <CreatIOCompletionPort> system
-  // call.
-
-  ACE_Auto_Event event_;
-  // This event is used in conjunction with Reactor when we try to
-  // integrate the event loops of Reactor and the Proactor.
-
-  int used_with_reactor_event_loop_;
-  // Flag that indicates whether we are used in conjunction with
-  // Reactor.
-  
-  ACE_Handler wakeup_handler_;
-  // Handler to handle the wakeups. This works in conjunction with the
-  // <ACE_Proactor::run_event_loop>. 
-};
-
-class ACE_Export ACE_WIN32_Asynch_Timer : public ACE_WIN32_Asynch_Result
-{
-  // = TITLE
-  //     This class is posted to the completion port when a timer
-  //     expires. When the complete method of this object is
-  //     called, the <handler>'s handle_timeout method will be
-  //     called.
-
-  friend class ACE_WIN32_Proactor;
-  // The factory method for this class is with the POSIX_Proactor
-  // class.
- 
-protected:
-  ACE_WIN32_Asynch_Timer (ACE_Handler &handler,
-                          const void *act,
-                          const ACE_Time_Value &tv,
-                          ACE_HANDLE event = ACE_INVALID_HANDLE,
-                          int priority = 0,
-                          int signal_number = 0);
-  // Constructor.
-  
-  virtual void complete (u_long bytes_transferred,
-                         int success,
-                         const void *completion_key,
-                         u_long error = 0);
-  // This method calls the <handler>'s handle_timeout method.
-
-  ACE_Time_Value time_;
-  // Time value requested by caller
-};
-
-#if defined (__ACE_INLINE__)
-#include "ace/WIN32_Proactor.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_WIN32 */
-#endif /* ACE_PROACTOR_H */
diff --git a/ace/WIN32_Proactor.i b/ace/WIN32_Proactor.i
deleted file mode 100644
index 6318deb79a0..00000000000
--- a/ace/WIN32_Proactor.i
+++ /dev/null
@@ -1,2 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
diff --git a/ace/XtReactor.cpp b/ace/XtReactor.cpp
index 8acce2bdf4a..aed4161ad09 100644
--- a/ace/XtReactor.cpp
+++ b/ace/XtReactor.cpp
@@ -14,8 +14,8 @@ ACE_ALLOC_HOOK_DEFINE (ACE_XtReactor)
 
 // Must be called with lock held
 ACE_XtReactor::ACE_XtReactor (XtAppContext context,
-			      size_t size,
-			      int restart,
+			      size_t size, 
+			      int restart, 
 			      ACE_Sig_Handler *h)
   : ACE_Select_Reactor (size, restart, h),
     context_ (context),
@@ -54,22 +54,22 @@ ACE_XtReactor::~ACE_XtReactor (void)
 // This is just the <wait_for_multiple_events> from ace/Reactor.cpp
 // but we use the Xt functions to wait for an event, not <select>
 
-int
+int 
 ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_set,
 					 ACE_Time_Value *max_wait_time)
 {
   ACE_TRACE ("ACE_XtReactor::wait_for_multiple_events");
   int nfound;
 
-  do
+  do 
     {
       max_wait_time = this->timer_queue_->calculate_timeout (max_wait_time);
-
+      
       size_t width = this->handler_rep_.max_handlep1 ();
       handle_set.rd_mask_ = this->wait_set_.rd_mask_;
       handle_set.wr_mask_ = this->wait_set_.wr_mask_;
       handle_set.ex_mask_ = this->wait_set_.ex_mask_;
-      nfound = XtWaitForMultipleEvents (width,
+      nfound = XtWaitForMultipleEvents (width, 
 					handle_set,
 					max_wait_time);
 
@@ -86,7 +86,7 @@ ACE_XtReactor::wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &handle_s
   return nfound; // Timed out or input available
 }
 
-void
+void 
 ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId *id)
 {
   ACE_XtReactor *self = (ACE_XtReactor *) closure;
@@ -102,21 +102,21 @@ ACE_XtReactor::TimerCallbackProc (XtPointer closure, XtIntervalId *id)
 // about to get.  Here we use <select> to find out which one might be
 // available.
 
-void
-ACE_XtReactor::InputCallbackProc (XtPointer closure,
-				  int *source,
+void 
+ACE_XtReactor::InputCallbackProc (XtPointer closure, 
+				  int *source, 
 				  XtInputId *)
 {
   ACE_XtReactor *self = (ACE_XtReactor *) closure;
   ACE_HANDLE handle = (ACE_HANDLE) *source;
 
   // my copy isn't const.
-  ACE_Time_Value zero = ACE_Time_Value::zero;
+  ACE_Time_Value zero = ACE_Time_Value::zero; 
 
   ACE_Select_Reactor_Handle_Set wait_set;
 
   // Deal with one file event.
-
+    
   // - read which kind of event
   if (self->wait_set_.rd_mask_.is_set (handle))
     wait_set.rd_mask_.set_bit (handle);
@@ -146,8 +146,8 @@ ACE_XtReactor::InputCallbackProc (XtPointer closure,
     }
 }
 
-int
-ACE_XtReactor::XtWaitForMultipleEvents (int width,
+int 
+ACE_XtReactor::XtWaitForMultipleEvents (int width, 
 					ACE_Select_Reactor_Handle_Set &wait_set,
 					ACE_Time_Value *)
 {
@@ -157,10 +157,10 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width,
   // Check to make sure our handle's are all usable.
   ACE_Select_Reactor_Handle_Set temp_set = wait_set;
 
-  if (ACE_OS::select (width,
-		      temp_set.rd_mask_,
-		      temp_set.wr_mask_,
-		      temp_set.ex_mask_,
+  if (ACE_OS::select (width, 
+		      temp_set.rd_mask_, 
+		      temp_set.wr_mask_, 
+		      temp_set.ex_mask_, 
 		      (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
     return -1; // Bad file arguments...
 
@@ -176,26 +176,26 @@ ACE_XtReactor::XtWaitForMultipleEvents (int width,
   // Now actually read the result needed by the <Select_Reactor> using
   // <select>.
   return ACE_OS::select (width,
-			 wait_set.rd_mask_,
-			 wait_set.wr_mask_,
-			 wait_set.ex_mask_,
+			 wait_set.rd_mask_,  
+			 wait_set.wr_mask_,  
+			 wait_set.ex_mask_,  
 			 (ACE_Time_Value *) &ACE_Time_Value::zero);
 }
 
-XtAppContext
+XtAppContext 
 ACE_XtReactor::context (void) const
 {
-  return this->context_;
+  return this->context_; 
 }
 
-void
+void 
 ACE_XtReactor::context (XtAppContext context)
 {
   this->context_ = context;
 }
 
 int
-ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
+ACE_XtReactor::register_handler_i (ACE_HANDLE handle, 
 				   ACE_Event_Handler *handler,
 				   ACE_Reactor_Mask mask)
 {
@@ -249,10 +249,10 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
             {
               ::XtRemoveInput (XtID->id_);
 
-              XtID->id_ = ::XtAppAddInput (this->context_,
-                                           (int) handle,
-                                           (XtPointer) condition,
-                                           InputCallbackProc,
+              XtID->id_ = ::XtAppAddInput (this->context_, 
+                                           (int) handle, 
+                                           (XtPointer) condition, 
+                                           InputCallbackProc, 
                                            (XtPointer) this);
               return 0;
             }
@@ -266,9 +266,9 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
       XtID->next_ = this->ids_;
       XtID->handle_ = handle;
       XtID->id_ = ::XtAppAddInput (this->context_,
-				  (int) handle,
-				  (XtPointer) condition,
-				  InputCallbackProc,
+				  (int) handle, 
+				  (XtPointer) condition, 
+				  InputCallbackProc, 
 				  (XtPointer) this);
       this->ids_ = XtID;
     }
@@ -276,8 +276,8 @@ ACE_XtReactor::register_handler_i (ACE_HANDLE handle,
 }
 
 int
-ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
-				   ACE_Event_Handler *handler,
+ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles, 
+				   ACE_Event_Handler *handler, 
 				   ACE_Reactor_Mask mask)
 {
   return ACE_Select_Reactor::register_handler_i (handles,
@@ -286,27 +286,13 @@ ACE_XtReactor::register_handler_i (const ACE_Handle_Set &handles,
 }
 
 int
-ACE_XtReactor::remove_handler_i (ACE_HANDLE handle,
+ACE_XtReactor::remove_handler_i (ACE_HANDLE handle, 
 				 ACE_Reactor_Mask mask)
 {
   ACE_TRACE ("ACE_XtReactor::remove_handler_i");
 
-  // In the registration phase we registered first with
-  // ACE_Select_Reactor and then with X.  Now we are now doing things
-  // in reverse order.
-
-  // First clean up the corresponding X11Input.
-  this->remove_XtInput (handle);
-
-  // Now let the reactor do its work.
-  return ACE_Select_Reactor::remove_handler_i (handle,
-                                               mask);
-}
-
-void
-ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_XtReactor::remove_XtInput");
+  int result = ACE_Select_Reactor::remove_handler_i (handle,
+                                                     mask);
 
   ACE_XtReactorID *XtID = this->ids_;
 
@@ -317,7 +303,10 @@ ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
           ::XtRemoveInput (XtID->id_);
           this->ids_ = XtID->next_;
           delete XtID;
-          return;
+          if (result == -1)
+            return result;
+          else
+            return 0;
         }
 
       ACE_XtReactorID *NextID = XtID->next_;
@@ -329,7 +318,11 @@ ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
               ::XtRemoveInput(NextID->id_);
               XtID->next_ = NextID->next_;
               delete NextID;
-              return;
+
+              if (result == -1)
+                return result;
+              else
+                return 0;
             }
           else
             {
@@ -338,20 +331,25 @@ ACE_XtReactor::remove_XtInput (ACE_HANDLE handle)
             }
         }
     }
+
+  if (result == -1)
+    return result;
+  else
+    return 0;
 }
 
-int
-ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles,
+int 
+ACE_XtReactor::remove_handler_i (const ACE_Handle_Set &handles, 
 				 ACE_Reactor_Mask mask)
 {
-  return ACE_Select_Reactor::remove_handler_i (handles,
+  return ACE_Select_Reactor::remove_handler_i (handles, 
 					       mask);
 }
 
 // The following functions ensure that there is an Xt timeout for the
 // first timeout in the Reactor's Timer_Queue.
 
-void
+void 
 ACE_XtReactor::reset_timeout (void)
 {
   // Make sure we have a valid context
@@ -361,20 +359,20 @@ ACE_XtReactor::reset_timeout (void)
     ::XtRemoveTimeOut (timeout_);
   timeout_ = 0;
 
-  ACE_Time_Value *max_wait_time =
+  ACE_Time_Value *max_wait_time = 
     this->timer_queue_->calculate_timeout (0);
 
   if (max_wait_time)
-    timeout_ = ::XtAppAddTimeOut (this->context_,
-                                  max_wait_time->msec (),
-                                  TimerCallbackProc,
+    timeout_ = ::XtAppAddTimeOut (this->context_, 
+                                  max_wait_time->msec (), 
+                                  TimerCallbackProc, 
                                   (XtPointer) this);
 }
 
 long
-ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler,
+ACE_XtReactor::schedule_timer (ACE_Event_Handler *handler, 
 			       const void *arg,
-			       const ACE_Time_Value &delta_time,
+			       const ACE_Time_Value &delta_time, 
 			       const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_XtReactor::schedule_timer");
@@ -399,7 +397,7 @@ ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
-  if (ACE_Select_Reactor::cancel_timer (handler,
+  if (ACE_Select_Reactor::cancel_timer (handler, 
 					dont_call_handle_close) == -1)
     return -1;
   else
@@ -410,13 +408,13 @@ ACE_XtReactor::cancel_timer (ACE_Event_Handler *handler,
 }
 
 int
-ACE_XtReactor::cancel_timer (long timer_id,
+ACE_XtReactor::cancel_timer (long timer_id, 
 			     const void **arg,
 			     int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_XtReactor::cancel_timer");
 
-  if (ACE_Select_Reactor::cancel_timer (timer_id,
+  if (ACE_Select_Reactor::cancel_timer (timer_id, 
 					arg,
 					dont_call_handle_close) == -1)
     return -1;
diff --git a/ace/XtReactor.h b/ace/XtReactor.h
index 2895626357c..b2f86dc5d1f 100644
--- a/ace/XtReactor.h
+++ b/ace/XtReactor.h
@@ -96,9 +96,6 @@ protected:
                                 ACE_Reactor_Mask);
   // Remove a set of <handles>.
 
-  virtual void remove_XtInput (ACE_HANDLE handle);
-  // Removes an Xt handle.
-
   virtual int wait_for_multiple_events (ACE_Select_Reactor_Handle_Set &,
                                         ACE_Time_Value *);
   // Wait for events to occur.
diff --git a/ace/ace.icc b/ace/ace.icc
deleted file mode 100755
index fec8f4c4177..00000000000
--- a/ace/ace.icc
+++ /dev/null
@@ -1,183 +0,0 @@
-// Optimized configuration file to generate the ACE shared library
-option 
-        defaults(xlC_r),
-        gen(check,bounds,no),
-        link(typecheck,yes),
-        opt(level, 3),
-        gen(enumsize, small),
-        link(linkwithmultithreadlib),
-        link(exportAll),
-        link(linkwithsharedlib, yes)
-        {
-                // Initially create a temporary shared object
-               target type (shr) "libAceShr.a"
-                {
-                        option 
-			opt(level,3),
-			macros(global)
-                        {       
-                                   source type(cpp) "pthread.h"
-                                   source type(cpp) "ACE.h"
-                                   source type(cpp) "OS.h"
-                        }
-                        source type (cpp) "Log_Msg.cpp"
-                        source type (cpp) "ACE.cpp"
-                        source type (cpp) "Activation_Queue.cpp"
-                        source type (cpp) "Addr.cpp"
-                        source type (cpp) "ARGV.cpp"
-                        source type (cpp) "Asynch_IO.cpp"
-                        source type (cpp) "Basic_Types.cpp"
-                        source type (cpp) "CORBA_Handler.cpp"
-                        source type (cpp) "CORBA_Ref.cpp"
-                        source type (cpp) "DEV.cpp"
-                        source type (cpp) "DEV_Addr.cpp"
-                        source type (cpp) "DEV_Connector.cpp"
-                        source type (cpp) "DEV_IO.cpp"
-                        source type (cpp) "Dump.cpp"
-                        source type (cpp) "Dynamic.cpp"
-                        source type (cpp) "Event_Handler.cpp"
-                        source type (cpp) "Filecache.cpp"
-                        source type (cpp) "FIFO.cpp"
-                        source type (cpp) "FIFO_Recv.cpp"
-                        source type (cpp) "FIFO_Recv_Msg.cpp"
-                        source type (cpp) "FIFO_Send.cpp"
-                        source type (cpp) "FIFO_Send_Msg.cpp"
-                        source type (cpp) "FILE.cpp"
-                        source type (cpp) "FILE_Addr.cpp"
-                        source type (cpp) "FILE_Connector.cpp"
-                        source type (cpp) "FILE_IO.cpp"
-                        source type (cpp) "Get_Opt.cpp"
-                        source type (cpp) "Handle_Set.cpp"
-                        source type (cpp) "High_Res_Timer.cpp"
-                        source type (cpp) "INET_Addr.cpp"
-                        source type (cpp) "IOStream.cpp"
-                        source type (cpp) "IO_Cntl_Msg.cpp"
-                        source type (cpp) "IO_SAP.cpp"
-                        source type (cpp) "IPC_SAP.cpp"
-                        source type (cpp) "Local_Name_Space.cpp"
-                        source type (cpp) "Local_Tokens.cpp"
-                        source type (cpp) "LSOCK.cpp"
-                        source type (cpp) "LSOCK_Acceptor.cpp"
-                        source type (cpp) "LSOCK_CODgram.cpp"
-                        source type (cpp) "LSOCK_Connector.cpp"
-                        source type (cpp) "LSOCK_Dgram.cpp"
-                        source type (cpp) "LSOCK_Stream.cpp"
-                        source type (cpp) "Log_Record.cpp"
-                        source type (cpp) "Malloc.cpp"
-                        source type (cpp) "Mem_Map.cpp"
-                        source type (cpp) "Memory_Pool.cpp"
-                        source type (cpp) "Message_Block.cpp"
-                        source type (cpp) "Method_Object.cpp"
-                        source type (cpp) "Msg_WFMO_Reactor.cpp"
-                        source type (cpp) "Name_Proxy.cpp"
-                        source type (cpp) "Name_Request_Reply.cpp"
-                        source type (cpp) "Name_Space.cpp"
-                        source type (cpp) "Naming_Context.cpp"
-                        source type (cpp) "Object_Manager.cpp"
-                        source type (cpp) "Obstack.cpp"
-                        source type (cpp) "OS.cpp"
-                        source type (cpp) "Parse_Node.cpp"
-                        source type (cpp) "Pipe.cpp"
-                        source type (cpp) "Proactor.cpp"
-                        source type (cpp) "Process.cpp"
-                        source type (cpp) "Process_Manager.cpp"
-                        source type (cpp) "Profile_Timer.cpp"
-                        source type (cpp) "Reactor.cpp"
-                        source type (cpp) "Read_Buffer.cpp"
-                        source type (cpp) "Registry.cpp"
-                        source type (cpp) "Registry_Name_Space.cpp"
-                        source type (cpp) "Remote_Name_Space.cpp"
-                        source type (cpp) "Remote_Tokens.cpp"
-                        source type (cpp) "SOCK.cpp"
-                        source type (cpp) "SOCK_Acceptor.cpp"
-                        source type (cpp) "SOCK_CODgram.cpp"
-                        source type (cpp) "SOCK_Connector.cpp"
-                        source type (cpp) "SOCK_Dgram.cpp"
-                        source type (cpp) "SOCK_Dgram_Bcast.cpp"
-                        source type (cpp) "SOCK_IO.cpp"
-                        source type (cpp) "SOCK_Dgram_Mcast.cpp"
-                        source type (cpp) "SOCK_Stream.cpp"
-                        source type (cpp) "SPIPE.cpp"
-                        source type (cpp) "SPIPE_Acceptor.cpp"
-                        source type (cpp) "SPIPE_Addr.cpp"
-                        source type (cpp) "SPIPE_Connector.cpp"
-                        source type (cpp) "SPIPE_Stream.cpp"
-                        source type (cpp) "SString.cpp"
-                        source type (cpp) "Sched_Params.cpp"
-                        source type (cpp) "Select_Reactor.cpp"
-                        source type (cpp) "Shared_Memory.cpp"
-                        source type (cpp) "Priority_Reactor.cpp"
-                        source type (cpp) "Service_Config.cpp"
-                        source type (cpp) "Service_Manager.cpp"
-                        source type (cpp) "Service_Object.cpp"
-                        source type (cpp) "Service_Types.cpp"
-                        source type (cpp) "Service_Repository.cpp"
-                        source type (cpp) "Shared_Memory_MM.cpp"
-                        source type (cpp) "Shared_Memory_SV.cpp"
-                        source type (cpp) "Shared_Object.cpp"
-                        source type (cpp) "Signal.cpp"
-                        source type (cpp) "Strategies.cpp"
-                        source type (cpp) "SV_Message.cpp"
-                        source type (cpp) "SV_Message_Queue.cpp"
-                        source type (cpp) "SV_Semaphore_Complex.cpp"
-                        source type (cpp) "SV_Semaphore_Simple.cpp"
-                        source type (cpp) "SV_Shared_Memory.cpp"
-                        source type (cpp) "Synch.cpp"
-                        source type (cpp) "Synch_Options.cpp"
-                        source type (cpp) "System_Time.cpp"
-                        source type (cpp) "Task.cpp"
-                        source type (cpp) "Timer_Hash.cpp"
-                        source type (cpp) "Timer_Heap.cpp"
-                        source type (cpp) "Timer_List.cpp"
-                        source type (cpp) "Timer_Queue.cpp"
-                        source type (cpp) "Timer_Wheel.cpp"
-                        source type (cpp) "TLI.cpp"
-                        source type (cpp) "TLI_Acceptor.cpp"
-                        source type (cpp) "TLI_Connector.cpp"
-                        source type (cpp) "TLI_Stream.cpp"
-                        source type (cpp) "Thread.cpp"
-                        source type (cpp) "Thread_Manager.cpp"
-                        source type (cpp) "Time_Request_Reply.cpp"
-                        source type (cpp) "Token.cpp"
-                        source type (cpp) "Token_Collection.cpp"
-                        source type (cpp) "Token_Invariants.cpp"
-                        source type (cpp) "Token_Manager.cpp"
-                        source type (cpp) "Token_Request_Reply.cpp"
-                        source type (cpp) "Trace.cpp"
-                        source type (cpp) "TTY_IO.cpp"
-                        source type (cpp) "UNIX_Addr.cpp"
-                        source type (cpp) "UPIPE_Acceptor.cpp"
-                        source type (cpp) "UPIPE_Connector.cpp"
-                        source type (cpp) "UPIPE_Stream.cpp"
-                        source type (cpp) "WFMO_Reactor.cpp"
-                        source type (cpp) "XtReactor.cpp"
-                        source type (cpp) "Svc_Conf_l.cpp"
-                        source type (cpp) "Svc_Conf_y.cpp"
-                        source type (cpp) "Array.cpp"
-                        source type (cpp) "Auto_Ptr.cpp"
-                        source type (cpp) "Containers.cpp"
-                        source type (cpp) "Free_List.cpp"
-                        source type (cpp) "Hash_Map_Manager.cpp"
-                        source type (cpp) "Local_Name_Space_T.cpp"
-                        source type (cpp) "Malloc_T.cpp"
-                        source type (cpp) "Managed_Object.cpp"
-                        source type (cpp) "Map_Manager.cpp"
-                        source type (cpp) "Message_Queue.cpp"
-                        source type (cpp) "Module.cpp"
-                        source type (cpp) "Singleton.cpp"
-                        source type (cpp) "Stream.cpp"
-                        source type (cpp) "Stream_Modules.cpp"
-                        source type (cpp) "Synch_T.cpp"
-                        source type (cpp) "Task_T.cpp"
-                        source type (cpp) "Timer_Heap_T.cpp"
-                        source type (cpp) "Timer_Queue_T.cpp"
-
-			//  Link libraries
-                        source type (lib) "libtli_r.a"
-                        source type (lib) "libdl.a"
-                        source type (lib) "libpthreads.a"
-                        source type (lib) "libc_r.a"
-			// Imports
-			source type (imp) "pse.exp"
-        }
-}
diff --git a/ace/ace_ce.dsw b/ace/ace_ce.dsw
index 56f1b374d73..d3d8f9d7704 100644
--- a/ace/ace_ce.dsw
+++ b/ace/ace_ce.dsw
@@ -1,4 +1,4 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00

+Microsoft Developer Studio Workspace File, Format Version 5.00

 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

 

 ###############################################################################

@@ -26,3 +26,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+

diff --git a/ace/ace_ce_dll.dsp b/ace/ace_ce_dll.dsp
index 18926c56e81..8d34b112e01 100644
--- a/ace/ace_ce_dll.dsp
+++ b/ace/ace_ce_dll.dsp
@@ -2,9 +2,9 @@
 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

-# TARGTYPE "Win32 (WCE SH) Dynamic-Link Library" 0x0902

-# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x0b02

-# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x0a02

+# TARGTYPE "Win32 (WCE SH3) Dynamic-Link Library" 0x8102

+# TARGTYPE "Win32 (WCE x86em) Dynamic-Link Library" 0x7f02

+# TARGTYPE "Win32 (WCE MIPS) Dynamic-Link Library" 0x8202

 

 CFG=ace_ce_dll - Win32 (WCE x86em) Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

@@ -19,24 +19,19 @@ CFG=ace_ce_dll - Win32 (WCE x86em) Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "ace_ce_dll - Win32 (WCE x86em) Release" (based on\

- "Win32 (WCE x86em) Dynamic-Link Library")

-!MESSAGE "ace_ce_dll - Win32 (WCE x86em) Debug" (based on\

- "Win32 (WCE x86em) Dynamic-Link Library")

-!MESSAGE "ace_ce_dll - Win32 (WCE MIPS) Release" (based on\

- "Win32 (WCE MIPS) Dynamic-Link Library")

-!MESSAGE "ace_ce_dll - Win32 (WCE MIPS) Debug" (based on\

- "Win32 (WCE MIPS) Dynamic-Link Library")

-!MESSAGE "ace_ce_dll - Win32 (WCE SH) Release" (based on\

- "Win32 (WCE SH) Dynamic-Link Library")

-!MESSAGE "ace_ce_dll - Win32 (WCE SH) Debug" (based on\

- "Win32 (WCE SH) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Dynamic-Link Library")

+!MESSAGE "ace_ce_dll - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

+# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

+# PROP Scc_LocalPath "H/PC Ver. 2.00"

+# PROP WCE_FormatVersion "6.0"

 

 !IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

 

@@ -51,6 +46,9 @@ CFG=ace_ce_dll - Win32 (WCE x86em) Debug
 # PROP Intermediate_Dir "WCE/x86em/Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /O2 /D "UNDER_CE" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=200 /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

 # ADD CPP /nologo /MT /W3 /O2 /I "..\\" /I "..\STL\\" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /c

@@ -58,17 +56,14 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "UNDER_CE" /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=200 /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"

 # ADD RSC /l 0x409 /d "UNDER_CE" /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=200 /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"

 MTL=midl.exe

-# ADD BASE MTL /nologo /mktyplib203 /o NUL /win32 /NDEBUG /NDEBUG

-# ADD MTL /nologo /mktyplib203 /o NUL /win32 /NDEBUG /NDEBUG

+# ADD BASE MTL /nologo /mktyplib203 /o "NUL" /win32 /NDEBUG /NDEBUG

+# ADD MTL /nologo /mktyplib203 /o "NUL" /win32 /NDEBUG /NDEBUG

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib winmm.lib ole32m.lib oleautm.lib msvcrt.lib uuid.lib asfcguid.lib asfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /windowsce:emulation

-# ADD LINK32 msvcrt.lib libcmt.lib winsockm.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /out:"WCE\x86em\ace.dll" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /dll /machine:I386 /nodefaultlib:"msvcrt.lib" /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\x86em\ace.dll" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

 

@@ -83,25 +78,25 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WCE/x86em/Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+EMPFILE=empfile.exe

+# ADD BASE EMPFILE COPY

+# ADD EMPFILE COPY

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /Gm /Zi /Od /D "UNDER_CE" /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=200 /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /YX /c

-# ADD CPP /nologo /G4 /W3 /Zi /Od /I "..\\" /I "..\STL\\" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /c

+# ADD CPP /nologo /G5 /W3 /Zi /Od /I "..\\" /I "..\STL\\" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "UNDER_CE" /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=200 /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 # ADD RSC /l 0x409 /d "UNDER_CE" /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=200 /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib winmm.lib ole32m.lib oleautm.lib msvcrt.lib uuid.lib asfcguid.lib asfc.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /windowsce:emulation

-# ADD LINK32 msvcrtd.lib libcmtd.lib winsockm.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /out:"WCE\x86em\aced.dll" /windowsce:emulation

-EMPFILE=empfile.exe

-# ADD BASE EMPFILE -COPY

-# ADD EMPFILE -COPY

+# ADD LINK32 commctrl.lib coredll.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrtd.lib" /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\x86em\aced.dll" /windowsce:emulation

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

 

@@ -116,26 +111,26 @@ EMPFILE=empfile.exe
 # PROP Intermediate_Dir "WCE/MIPS/Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /ML /W3 /O2 /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /QMRWCE /c

-# ADD CPP /nologo /MT /W3 /O2 /I "..\\" /I "..\STL\\" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\\" /I "..\STL\\" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /QMRWCE /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d "UNDER_CE" /d "UNICODE" /d "NDEBUG" /d _WIN32_WCE=200

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d "UNDER_CE" /d "UNICODE" /d "NDEBUG" /d _WIN32_WCE=200

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /subsystem:windowsce,2.0 /windowsce:noconvert

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 msvcrt.lib libcmt.lib winsock.lib /nologo /dll /machine:MIPS /nodefaultlib:"wsock32.lib" /out:"WCE\MIPS\ace.dll" /subsystem:windowsce,2.0

+# ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:MIPS /nodefaultlib:"wsock32.lib" /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\MIPS\ace.dll" /subsystem:windowsce,2.0

 # SUBTRACT LINK32 /pdb:none

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

 

@@ -150,28 +145,28 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCE/MIPS/Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=clmips.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /QMRWCE /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /I "..\STL\\" /I "..\\" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /QMRWCE /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /I "..\STL\\" /I "..\\" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /QMRWCE /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d "UNDER_CE" /d "UNICODE" /d "DEBUG" /d _WIN32_WCE=200

 # ADD RSC /l 0x409 /r /d "MIPS" /d "_MIPS_" /d "UNDER_CE" /d "UNICODE" /d "DEBUG" /d _WIN32_WCE=200

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /subsystem:windowsce,2.0 /windowsce:noconvert

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 msvcrtd.lib libcmtd.lib winsock.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"wsock32.lib" /out:"WCE\MIPS\aced.dll" /subsystem:windowsce,2.0

+# ADD LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:MIPS /nodefaultlib:"wsock32.lib" /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\MIPS\aced.dll" /subsystem:windowsce,2.0

 # SUBTRACT LINK32 /pdb:none

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -184,28 +179,28 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCE/SH/Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /ML /W3 /O2 /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /c

-# ADD CPP /nologo /MT /W3 /O2 /I "..\\" /I "..\STL\\" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /c

+# ADD CPP /nologo /M$(CECrtMT) /W3 /O2 /I "..\\" /I "..\STL\\" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /YX /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d "UNDER_CE" /d "UNICODE" /d "NDEBUG" /d _WIN32_WCE=200

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d "UNDER_CE" /d "UNICODE" /d "NDEBUG" /d _WIN32_WCE=200

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /machine:SH3 /subsystem:windowsce,2.0 /windowsce:noconvert

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 msvcrt.lib libcmt.lib winsock.lib /nologo /dll /machine:SH3 /nodefaultlib:"wsock32.lib" /out:"WCE\sh\ace.dll" /subsystem:windowsce,2.0

+# ADD LINK32 commctrl.lib coredll.lib /nologo /dll /machine:SH3 /nodefaultlib:"wsock32.lib" /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\sh\ace.dll" /subsystem:windowsce,2.0

 # SUBTRACT LINK32 /pdb:none

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -218,26 +213,26 @@ PFILE=pfile.exe
 # PROP Intermediate_Dir "WCE/SH/Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+PFILE=pfile.exe

+# ADD BASE PFILE COPY

+# ADD PFILE COPY

 CPP=shcl.exe

 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /YX /c

-# ADD CPP /nologo /MTd /W3 /Zi /Od /Gy /I "..\\" /I "..\STL\\" /I "..\..\WinCE\mfcdll" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /D "_AFXDLL" /YX /c

+# ADD CPP /nologo /M$(CECrtMTDebug) /W3 /Zi /Od /Gy /I "..\\" /I "..\STL\\" /I "..\..\WinCE\mfcdll" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D "UNDER_CE" /D "UNICODE" /D _WIN32_WCE=200 /D ACE_HAS_WINCE=1 /D ACE_HAS_DLL=1 /D "_AFXDLL" /YX /c

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d "UNDER_CE" /d "UNICODE" /d "DEBUG" /d _WIN32_WCE=200

 # ADD RSC /l 0x409 /r /d "SHx" /d "SH3" /d "_SH3_" /d "UNDER_CE" /d "UNICODE" /d "DEBUG" /d _WIN32_WCE=200 /d "_AFXDLL"

 MTL=midl.exe

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /dll /debug /machine:SH3 /subsystem:windowsce,2.0 /windowsce:noconvert

 # SUBTRACT BASE LINK32 /pdb:none /nodefaultlib

-# ADD LINK32 msvcrtd.lib libcmtd.lib winsock.lib /nologo /dll /incremental:no /debug /machine:SH3 /out:"WCE\SH\aced.dll" /subsystem:windowsce,2.0

+# ADD LINK32 /nologo /dll /incremental:no /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /out:"WCE\SH\aced.dll" /subsystem:windowsce,2.0

 # SUBTRACT LINK32 /pdb:none

-PFILE=pfile.exe

-# ADD BASE PFILE COPY

-# ADD PFILE COPY

 

 !ENDIF 

 

@@ -247,8 +242,8 @@ PFILE=pfile.exe
 # Name "ace_ce_dll - Win32 (WCE x86em) Debug"

 # Name "ace_ce_dll - Win32 (WCE MIPS) Release"

 # Name "ace_ce_dll - Win32 (WCE MIPS) Debug"

-# Name "ace_ce_dll - Win32 (WCE SH) Release"

-# Name "ace_ce_dll - Win32 (WCE SH) Debug"

+# Name "ace_ce_dll - Win32 (WCE SH3) Release"

+# Name "ace_ce_dll - Win32 (WCE SH3) Debug"

 # Begin Source File

 

 SOURCE=.\ACE.cpp

@@ -270,7 +265,6 @@ DEP_CPP_ACE_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -340,6 +334,7 @@ DEP_CPP_ACE_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACE_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -366,6 +361,8 @@ DEP_CPP_ACE_C=\
 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

 	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

@@ -378,13 +375,14 @@ DEP_CPP_ACE_C=\
 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

 	".\Trace.h"\

 	".\Version.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -404,7 +402,6 @@ DEP_CPP_ACE_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -474,6 +471,7 @@ DEP_CPP_ACE_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACE_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -494,7 +492,6 @@ DEP_CPP_ACE_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -564,16 +561,18 @@ DEP_CPP_ACE_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACE_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_ACE_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

 	".\Auto_Ptr.i"\

@@ -583,41 +582,87 @@ DEP_CPP_ACE_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

 	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

 	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Signal.h"\

+	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\Version.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_ACE_C=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACE_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

 	".\Auto_Ptr.i"\

@@ -627,34 +672,77 @@ DEP_CPP_ACE_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

 	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

 	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Signal.h"\

+	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\Version.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACE_C=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -681,7 +769,6 @@ DEP_CPP_ACTIV=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -775,6 +862,7 @@ DEP_CPP_ACTIV=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACTIV=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -786,6 +874,9 @@ DEP_CPP_ACTIV=\
 	".\Activation_Queue.h"\

 	".\Activation_Queue.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -897,7 +988,6 @@ DEP_CPP_ACTIV=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -917,7 +1007,6 @@ DEP_CPP_ACTIV=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -1011,6 +1100,7 @@ DEP_CPP_ACTIV=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACTIV=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -1031,7 +1121,6 @@ DEP_CPP_ACTIV=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -1125,10 +1214,11 @@ DEP_CPP_ACTIV=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACTIV=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_ACTIV=\

 	".\ACE.h"\

@@ -1136,35 +1226,27 @@ DEP_CPP_ACTIV=\
 	".\Activation_Queue.h"\

 	".\Activation_Queue.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -1187,9 +1269,6 @@ DEP_CPP_ACTIV=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -1247,10 +1326,13 @@ DEP_CPP_ACTIV=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_ACTIV=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ACTIV=\

 	".\ACE.h"\

@@ -1258,35 +1340,27 @@ DEP_CPP_ACTIV=\
 	".\Activation_Queue.h"\

 	".\Activation_Queue.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -1309,9 +1383,6 @@ DEP_CPP_ACTIV=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -1371,117 +1442,10 @@ DEP_CPP_ACTIV=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ACTIV=\

-	".\ce.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Active_Map_Manager.cpp

-

-!IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

-

-DEP_CPP_ACTIVE=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Active_Map_Manager.h"\

-	".\Active_Map_Manager.i"\

-	".\Active_Map_Manager_T.cpp"\

-	".\Active_Map_Manager_T.h"\

-	".\Active_Map_Manager_T.i"\

-	".\Atomic_Op.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

 	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\inc_user_config.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

-	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Map_Manager.cpp"\

-	".\Map_Manager.h"\

-	".\Map_Manager.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

-	".\Signal.h"\

-	".\Signal.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

-	".\Trace.h"\

-	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

-

 !ENDIF 

 

 # End Source File

@@ -1505,7 +1469,6 @@ DEP_CPP_ADDR_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -1527,6 +1490,7 @@ DEP_CPP_ADDR_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ADDR_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -1537,6 +1501,9 @@ DEP_CPP_ADDR_=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -1563,7 +1530,6 @@ DEP_CPP_ADDR_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -1582,7 +1548,6 @@ DEP_CPP_ADDR_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -1604,6 +1569,7 @@ DEP_CPP_ADDR_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ADDR_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -1623,7 +1589,6 @@ DEP_CPP_ADDR_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -1645,23 +1610,26 @@ DEP_CPP_ADDR_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ADDR_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_ADDR_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -1681,23 +1649,28 @@ DEP_CPP_ADDR_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_ADDR_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ADDR_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -1719,7 +1692,8 @@ DEP_CPP_ADDR_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ADDR_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -1746,7 +1720,6 @@ DEP_CPP_ARGV_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -1798,6 +1771,7 @@ DEP_CPP_ARGV_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ARGV_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -1809,6 +1783,9 @@ DEP_CPP_ARGV_=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -1867,7 +1844,6 @@ DEP_CPP_ARGV_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -1887,7 +1863,6 @@ DEP_CPP_ARGV_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -1939,6 +1914,7 @@ DEP_CPP_ARGV_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ARGV_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -1959,7 +1935,6 @@ DEP_CPP_ARGV_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -2011,10 +1986,11 @@ DEP_CPP_ARGV_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ARGV_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_ARGV_=\

 	".\ACE.h"\

@@ -2022,18 +1998,18 @@ DEP_CPP_ARGV_=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -2080,10 +2056,13 @@ DEP_CPP_ARGV_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_ARGV_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ARGV_=\

 	".\ACE.h"\

@@ -2091,18 +2070,18 @@ DEP_CPP_ARGV_=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -2151,7 +2130,8 @@ DEP_CPP_ARGV_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ARGV_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -2180,7 +2160,6 @@ DEP_CPP_ASYNC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -2267,6 +2246,7 @@ DEP_CPP_ASYNC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ASYNC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -2279,9 +2259,10 @@ DEP_CPP_ASYNC=\
 	".\Addr.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -2299,9 +2280,24 @@ DEP_CPP_ASYNC=\
 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

@@ -2325,31 +2321,86 @@ DEP_CPP_ASYNC=\
 	".\Message_Block_T.cpp"\

 	".\Message_Block_T.h"\

 	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

 	".\Proactor.h"\

 	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -2371,7 +2422,6 @@ DEP_CPP_ASYNC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -2458,6 +2508,7 @@ DEP_CPP_ASYNC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ASYNC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -2480,7 +2531,6 @@ DEP_CPP_ASYNC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -2567,10 +2617,11 @@ DEP_CPP_ASYNC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ASYNC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_ASYNC=\

 	".\ACE.h"\

@@ -2579,26 +2630,28 @@ DEP_CPP_ASYNC=\
 	".\Addr.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -2622,15 +2675,21 @@ DEP_CPP_ASYNC=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

 	".\Proactor.h"\

 	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

@@ -2640,6 +2699,7 @@ DEP_CPP_ASYNC=\
 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

 	".\Synch_T.cpp"\

@@ -2647,12 +2707,30 @@ DEP_CPP_ASYNC=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_ASYNC=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_ASYNC=\

 	".\ACE.h"\

@@ -2661,26 +2739,28 @@ DEP_CPP_ASYNC=\
 	".\Addr.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -2704,15 +2784,21 @@ DEP_CPP_ASYNC=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

 	".\Proactor.h"\

 	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

@@ -2722,6 +2808,7 @@ DEP_CPP_ASYNC=\
 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

 	".\Synch_T.cpp"\

@@ -2729,11 +2816,27 @@ DEP_CPP_ASYNC=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_ASYNC=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -2757,7 +2860,6 @@ DEP_CPP_BASIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -2779,6 +2881,7 @@ DEP_CPP_BASIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_BASIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -2980,7 +3083,6 @@ DEP_CPP_BASIC=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -2997,7 +3099,6 @@ DEP_CPP_BASIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -3019,6 +3120,7 @@ DEP_CPP_BASIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_BASIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -3036,7 +3138,45 @@ DEP_CPP_BASIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_BASIC=\

 	".\config.h"\

+	".\sys_conf.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

+

+DEP_CPP_BASIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -3058,17 +3198,15 @@ DEP_CPP_BASIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_BASIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_BASIC=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Addr.h"\

-	".\Addr.i"\

-	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

 	".\Auto_Ptr.i"\

@@ -3078,46 +3216,65 @@ DEP_CPP_BASIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_BASIC=\

 	".\config.h"\

+	".\sys_conf.h"\

+	

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\ace/config.h

+# End Source File

+# Begin Source File

+

+SOURCE=.\Containers.cpp

+

+!IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

+

+DEP_CPP_CONTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

 	".\Containers_T.h"\

 	".\Containers_T.i"\

-	".\Dynamic.h"\

-	".\Dynamic.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

-	".\Filecache.h"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

-	".\High_Res_Timer.h"\

-	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

-	".\INET_Addr.h"\

-	".\INET_Addr.i"\

-	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

-	".\IPC_SAP.h"\

-	".\IPC_SAP.i"\

-	".\Local_Name_Space.h"\

-	".\Local_Name_Space_T.cpp"\

-	".\Local_Name_Space_T.h"\

-	".\Local_Tokens.h"\

-	".\Local_Tokens.i"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

@@ -3131,144 +3288,42 @@ DEP_CPP_BASIC=\
 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Map_Manager.cpp"\

-	".\Map_Manager.h"\

-	".\Map_Manager.i"\

 	".\Mem_Map.h"\

 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

-	".\Message_Block.h"\

-	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Message_Queue.h"\

-	".\Message_Queue.i"\

-	".\Message_Queue_T.cpp"\

-	".\Message_Queue_T.h"\

-	".\Message_Queue_T.i"\

-	".\Module.cpp"\

-	".\Module.h"\

-	".\Module.i"\

-	".\Name_Proxy.h"\

-	".\Name_Request_Reply.h"\

-	".\Name_Space.h"\

-	".\Naming_Context.h"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

-	".\Obstack.h"\

-	".\Obstack.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Pipe.h"\

-	".\Pipe.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Remote_Tokens.h"\

-	".\Remote_Tokens.i"\

-	".\Select_Reactor.h"\

-	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Service_Repository.h"\

-	".\Service_Repository.i"\

-	".\Service_Types.h"\

-	".\Service_Types.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

-	".\SOCK.h"\

-	".\SOCK.i"\

-	".\SOCK_Connector.h"\

-	".\SOCK_Connector.i"\

-	".\SOCK_IO.h"\

-	".\SOCK_IO.i"\

-	".\SOCK_Stream.h"\

-	".\SOCK_Stream.i"\

 	".\SString.h"\

 	".\SString.i"\

-	".\Strategies.h"\

-	".\Strategies.i"\

-	".\Strategies_T.cpp"\

-	".\Strategies_T.h"\

-	".\Strategies_T.i"\

-	".\Stream.cpp"\

-	".\Stream.h"\

-	".\Stream.i"\

-	".\Stream_Modules.cpp"\

-	".\Stream_Modules.h"\

-	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

-	".\Synch_Options.h"\

-	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

-	".\Task.h"\

-	".\Task.i"\

-	".\Task_T.cpp"\

-	".\Task_T.h"\

-	".\Task_T.i"\

-	".\Template_Instantiations.cpp"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Time_Value.h"\

-	".\Timer_Hash.h"\

-	".\Timer_Hash_T.cpp"\

-	".\Timer_Hash_T.h"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

-	".\Timer_List_T.cpp"\

-	".\Timer_List_T.h"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

-	".\Timer_Wheel_T.cpp"\

-	".\Timer_Wheel_T.h"\

-	".\Token.h"\

-	".\Token.i"\

-	".\Token_Invariants.h"\

-	".\Token_Invariants.i"\

-	".\Token_Request_Reply.h"\

-	".\Token_Request_Reply.i"\

 	".\Trace.h"\

-	".\WFMO_Reactor.h"\

-	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_CONTA=\

+	".\ace\config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

 

-DEP_CPP_BASIC=\

+DEP_CPP_CONTA=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Addr.h"\

-	".\Addr.i"\

 	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

@@ -3285,40 +3340,13 @@ DEP_CPP_BASIC=\
 	".\Containers_T.cpp"\

 	".\Containers_T.h"\

 	".\Containers_T.i"\

-	".\Dynamic.h"\

-	".\Dynamic.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

-	".\Filecache.h"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

-	".\High_Res_Timer.h"\

-	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

-	".\INET_Addr.h"\

-	".\INET_Addr.i"\

-	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

-	".\IPC_SAP.h"\

-	".\IPC_SAP.i"\

-	".\Local_Name_Space.h"\

-	".\Local_Name_Space_T.cpp"\

-	".\Local_Name_Space_T.h"\

-	".\Local_Tokens.h"\

-	".\Local_Tokens.i"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

@@ -3332,161 +3360,45 @@ DEP_CPP_BASIC=\
 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Map_Manager.cpp"\

-	".\Map_Manager.h"\

-	".\Map_Manager.i"\

 	".\Mem_Map.h"\

 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

-	".\Message_Block.h"\

-	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Message_Queue.h"\

-	".\Message_Queue.i"\

-	".\Message_Queue_T.cpp"\

-	".\Message_Queue_T.h"\

-	".\Message_Queue_T.i"\

-	".\Module.cpp"\

-	".\Module.h"\

-	".\Module.i"\

-	".\Name_Proxy.h"\

-	".\Name_Request_Reply.h"\

-	".\Name_Space.h"\

-	".\Naming_Context.h"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

-	".\Obstack.h"\

-	".\Obstack.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Pipe.h"\

-	".\Pipe.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Remote_Tokens.h"\

-	".\Remote_Tokens.i"\

-	".\Select_Reactor.h"\

-	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Service_Repository.h"\

-	".\Service_Repository.i"\

-	".\Service_Types.h"\

-	".\Service_Types.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

-	".\SOCK.h"\

-	".\SOCK.i"\

-	".\SOCK_Connector.h"\

-	".\SOCK_Connector.i"\

-	".\SOCK_IO.h"\

-	".\SOCK_IO.i"\

-	".\SOCK_Stream.h"\

-	".\SOCK_Stream.i"\

 	".\SString.h"\

 	".\SString.i"\

-	".\Strategies.h"\

-	".\Strategies.i"\

-	".\Strategies_T.cpp"\

-	".\Strategies_T.h"\

-	".\Strategies_T.i"\

-	".\Stream.cpp"\

-	".\Stream.h"\

-	".\Stream.i"\

-	".\Stream_Modules.cpp"\

-	".\Stream_Modules.h"\

-	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

-	".\Synch_Options.h"\

-	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

-	".\Task.h"\

-	".\Task.i"\

-	".\Task_T.cpp"\

-	".\Task_T.h"\

-	".\Task_T.i"\

-	".\Template_Instantiations.cpp"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Time_Value.h"\

-	".\Timer_Hash.h"\

-	".\Timer_Hash_T.cpp"\

-	".\Timer_Hash_T.h"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

-	".\Timer_List_T.cpp"\

-	".\Timer_List_T.h"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

-	".\Timer_Wheel_T.cpp"\

-	".\Timer_Wheel_T.h"\

-	".\Token.h"\

-	".\Token.i"\

-	".\Token_Invariants.h"\

-	".\Token_Invariants.i"\

-	".\Token_Request_Reply.h"\

-	".\Token_Request_Reply.i"\

 	".\Trace.h"\

-	".\WFMO_Reactor.h"\

-	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

 	

-NODEP_CPP_BASIC=\

-	".\ce.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Containers.cpp

 

-!IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

 

 DEP_CPP_CONTA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

@@ -3538,26 +3450,89 @@ DEP_CPP_CONTA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

+NODEP_CPP_CONTA=\

+	".\ace\config.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+DEP_CPP_CONTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_CONTA=\

+	".\ace\config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_CONTA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

@@ -3609,22 +3584,22 @@ DEP_CPP_CONTA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_CONTA=\

+	".\ace\config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_CONTA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

@@ -3678,7 +3653,7 @@ DEP_CPP_CONTA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_CONTA=\

-	".\ce.h"\

+	".\ace\config.h"\

 	

 

 !ENDIF 

@@ -3703,7 +3678,6 @@ DEP_CPP_DUMP_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dump.h"\

 	".\Dump_T.cpp"\

 	".\Dump_T.h"\

@@ -3741,6 +3715,7 @@ DEP_CPP_DUMP_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DUMP_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -3750,6 +3725,9 @@ DEP_CPP_DUMP_=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -3792,7 +3770,6 @@ DEP_CPP_DUMP_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -3810,7 +3787,6 @@ DEP_CPP_DUMP_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dump.h"\

 	".\Dump_T.cpp"\

 	".\Dump_T.h"\

@@ -3848,6 +3824,7 @@ DEP_CPP_DUMP_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DUMP_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -3866,7 +3843,6 @@ DEP_CPP_DUMP_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dump.h"\

 	".\Dump_T.cpp"\

 	".\Dump_T.h"\

@@ -3904,22 +3880,25 @@ DEP_CPP_DUMP_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DUMP_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_DUMP_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dump.h"\

 	".\Dump_T.cpp"\

 	".\Dump_T.h"\

@@ -3955,22 +3934,27 @@ DEP_CPP_DUMP_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_DUMP_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_DUMP_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dump.h"\

 	".\Dump_T.cpp"\

 	".\Dump_T.h"\

@@ -4008,7 +3992,8 @@ DEP_CPP_DUMP_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DUMP_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -4032,7 +4017,6 @@ DEP_CPP_DYNAM=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

 	".\inc_user_config.h"\

@@ -4056,6 +4040,7 @@ DEP_CPP_DYNAM=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DYNAM=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -4065,6 +4050,9 @@ DEP_CPP_DYNAM=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -4109,7 +4097,6 @@ DEP_CPP_DYNAM=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -4126,7 +4113,6 @@ DEP_CPP_DYNAM=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

 	".\inc_user_config.h"\

@@ -4150,6 +4136,7 @@ DEP_CPP_DYNAM=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DYNAM=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -4167,7 +4154,6 @@ DEP_CPP_DYNAM=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

 	".\inc_user_config.h"\

@@ -4191,26 +4177,26 @@ DEP_CPP_DYNAM=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DYNAM=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_DYNAM=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -4225,45 +4211,33 @@ DEP_CPP_DYNAM=\
 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_DYNAM=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_DYNAM=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -4278,28 +4252,15 @@ DEP_CPP_DYNAM=\
 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_DYNAM=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -4324,7 +4285,6 @@ DEP_CPP_EVENT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -4378,6 +4338,7 @@ DEP_CPP_EVENT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_EVENT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -4387,6 +4348,9 @@ DEP_CPP_EVENT=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -4461,7 +4425,6 @@ DEP_CPP_EVENT=\
 	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -4479,7 +4442,6 @@ DEP_CPP_EVENT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -4533,6 +4495,7 @@ DEP_CPP_EVENT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_EVENT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -4551,7 +4514,6 @@ DEP_CPP_EVENT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -4605,34 +4567,33 @@ DEP_CPP_EVENT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_EVENT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_EVENT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -4654,16 +4615,10 @@ DEP_CPP_EVENT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

@@ -4680,42 +4635,37 @@ DEP_CPP_EVENT=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_EVENT=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_EVENT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -4737,16 +4687,10 @@ DEP_CPP_EVENT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

@@ -4763,149 +4707,12 @@ DEP_CPP_EVENT=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_EVENT=\

-	".\ce.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Functor.cpp

-

-!IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

-

-DEP_CPP_FUNCT=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

 	".\config.h"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\inc_user_config.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc_Base.h"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\streams.h"\

-	".\Trace.h"\

-	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

-	

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

-

-DEP_CPP_FUNCT=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\inc_user_config.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc_Base.h"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\streams.h"\

-	".\Trace.h"\

-	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

-	

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

-

-DEP_CPP_FUNCT=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\inc_user_config.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc_Base.h"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\streams.h"\

-	".\Trace.h"\

-	".\ws2tcpip.h"\

-	

-NODEP_CPP_FUNCT=\

-	".\ce.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -4929,7 +4736,6 @@ DEP_CPP_GET_O=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\inc_user_config.h"\

@@ -4953,6 +4759,7 @@ DEP_CPP_GET_O=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_GET_O=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -4961,6 +4768,9 @@ NODEP_CPP_GET_O=\
 DEP_CPP_GET_O=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -4989,7 +4799,6 @@ DEP_CPP_GET_O=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -5006,7 +4815,6 @@ DEP_CPP_GET_O=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\inc_user_config.h"\

@@ -5030,6 +4838,7 @@ DEP_CPP_GET_O=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_GET_O=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5047,7 +4856,6 @@ DEP_CPP_GET_O=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\inc_user_config.h"\

@@ -5071,21 +4879,24 @@ DEP_CPP_GET_O=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_GET_O=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_GET_O=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\inc_user_config.h"\

@@ -5107,21 +4918,26 @@ DEP_CPP_GET_O=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_GET_O=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_GET_O=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\inc_user_config.h"\

@@ -5145,7 +4961,8 @@ DEP_CPP_GET_O=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_GET_O=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -5169,7 +4986,6 @@ DEP_CPP_HANDL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -5193,6 +5009,7 @@ DEP_CPP_HANDL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HANDL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5201,6 +5018,9 @@ NODEP_CPP_HANDL=\
 DEP_CPP_HANDL=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -5229,7 +5049,6 @@ DEP_CPP_HANDL=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -5246,7 +5065,6 @@ DEP_CPP_HANDL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -5270,6 +5088,7 @@ DEP_CPP_HANDL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HANDL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5287,7 +5106,6 @@ DEP_CPP_HANDL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -5311,21 +5129,24 @@ DEP_CPP_HANDL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HANDL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_HANDL=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -5347,21 +5168,26 @@ DEP_CPP_HANDL=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_HANDL=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_HANDL=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -5385,7 +5211,8 @@ DEP_CPP_HANDL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HANDL=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -5410,7 +5237,6 @@ DEP_CPP_HIGH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\High_Res_Timer.h"\

@@ -5449,6 +5275,7 @@ DEP_CPP_HIGH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HIGH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5458,6 +5285,9 @@ DEP_CPP_HIGH_=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -5520,7 +5350,6 @@ DEP_CPP_HIGH_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -5538,7 +5367,6 @@ DEP_CPP_HIGH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\High_Res_Timer.h"\

@@ -5577,6 +5405,7 @@ DEP_CPP_HIGH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HIGH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5595,7 +5424,6 @@ DEP_CPP_HIGH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\High_Res_Timer.h"\

@@ -5634,32 +5462,27 @@ DEP_CPP_HIGH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HIGH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_HIGH_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -5668,25 +5491,14 @@ DEP_CPP_HIGH_=\
 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

 	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Signal.h"\

-	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\Stats.h"\

@@ -5705,32 +5517,29 @@ DEP_CPP_HIGH_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_HIGH_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_HIGH_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -5739,25 +5548,14 @@ DEP_CPP_HIGH_=\
 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

 	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Signal.h"\

-	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\Stats.h"\

@@ -5778,7 +5576,8 @@ DEP_CPP_HIGH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_HIGH_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -5804,7 +5603,6 @@ DEP_CPP_INET_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -5828,6 +5626,7 @@ DEP_CPP_INET_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_INET_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5838,6 +5637,9 @@ DEP_CPP_INET_=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -5866,7 +5668,6 @@ DEP_CPP_INET_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -5885,7 +5686,6 @@ DEP_CPP_INET_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -5909,6 +5709,7 @@ DEP_CPP_INET_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_INET_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -5928,7 +5729,6 @@ DEP_CPP_INET_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -5952,23 +5752,26 @@ DEP_CPP_INET_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_INET_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_INET_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -5990,23 +5793,28 @@ DEP_CPP_INET_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_INET_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_INET_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -6030,7 +5838,8 @@ DEP_CPP_INET_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_INET_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -6048,9 +5857,9 @@ SOURCE=.\IO_Cntl_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 !ENDIF 

 

@@ -6073,7 +5882,6 @@ DEP_CPP_IO_SA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\IO_SAP.h"\

 	".\IO_SAP.i"\

@@ -6097,6 +5905,7 @@ DEP_CPP_IO_SA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IO_SA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6105,6 +5914,9 @@ NODEP_CPP_IO_SA=\
 DEP_CPP_IO_SA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -6133,7 +5945,6 @@ DEP_CPP_IO_SA=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -6150,7 +5961,6 @@ DEP_CPP_IO_SA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\IO_SAP.h"\

 	".\IO_SAP.i"\

@@ -6174,6 +5984,7 @@ DEP_CPP_IO_SA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IO_SA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6191,7 +6002,6 @@ DEP_CPP_IO_SA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\IO_SAP.h"\

 	".\IO_SAP.i"\

@@ -6215,21 +6025,24 @@ DEP_CPP_IO_SA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IO_SA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_IO_SA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\IO_SAP.h"\

 	".\IO_SAP.i"\

@@ -6251,21 +6064,26 @@ DEP_CPP_IO_SA=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_IO_SA=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_IO_SA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\IO_SAP.h"\

 	".\IO_SAP.i"\

@@ -6289,7 +6107,8 @@ DEP_CPP_IO_SA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IO_SA=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -6313,7 +6132,6 @@ DEP_CPP_IPC_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -6337,6 +6155,7 @@ DEP_CPP_IPC_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IPC_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6345,6 +6164,9 @@ NODEP_CPP_IPC_S=\
 DEP_CPP_IPC_S=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -6373,7 +6195,6 @@ DEP_CPP_IPC_S=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -6390,7 +6211,6 @@ DEP_CPP_IPC_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -6414,6 +6234,7 @@ DEP_CPP_IPC_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IPC_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6431,7 +6252,6 @@ DEP_CPP_IPC_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -6455,21 +6275,24 @@ DEP_CPP_IPC_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IPC_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_IPC_S=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -6491,21 +6314,26 @@ DEP_CPP_IPC_S=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_IPC_S=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_IPC_S=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -6529,7 +6357,8 @@ DEP_CPP_IPC_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_IPC_S=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -6554,7 +6383,6 @@ DEP_CPP_LOCAL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -6631,6 +6459,7 @@ DEP_CPP_LOCAL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOCAL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6640,6 +6469,9 @@ DEP_CPP_LOCAL=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -6723,7 +6555,6 @@ DEP_CPP_LOCAL=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -6741,7 +6572,6 @@ DEP_CPP_LOCAL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -6818,6 +6648,7 @@ DEP_CPP_LOCAL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOCAL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -6836,7 +6667,6 @@ DEP_CPP_LOCAL=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -6913,27 +6743,28 @@ DEP_CPP_LOCAL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOCAL=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_LOCAL=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -7005,27 +6836,30 @@ DEP_CPP_LOCAL=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_LOCAL=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_LOCAL=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -7099,7 +6933,8 @@ DEP_CPP_LOCAL=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOCAL=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -7126,7 +6961,6 @@ DEP_CPP_LOG_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -7201,6 +7035,7 @@ DEP_CPP_LOG_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -7212,6 +7047,9 @@ DEP_CPP_LOG_M=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -7293,7 +7131,6 @@ DEP_CPP_LOG_M=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -7313,7 +7150,6 @@ DEP_CPP_LOG_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -7388,6 +7224,7 @@ DEP_CPP_LOG_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -7408,7 +7245,6 @@ DEP_CPP_LOG_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -7483,10 +7319,11 @@ DEP_CPP_LOG_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_LOG_M=\

 	".\ACE.h"\

@@ -7494,18 +7331,18 @@ DEP_CPP_LOG_M=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -7575,10 +7412,13 @@ DEP_CPP_LOG_M=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_LOG_M=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_LOG_M=\

 	".\ACE.h"\

@@ -7586,18 +7426,18 @@ DEP_CPP_LOG_M=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -7669,7 +7509,8 @@ DEP_CPP_LOG_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_M=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -7693,7 +7534,6 @@ DEP_CPP_LOG_R=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -7715,6 +7555,7 @@ DEP_CPP_LOG_R=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_R=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -7723,6 +7564,9 @@ NODEP_CPP_LOG_R=\
 DEP_CPP_LOG_R=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -7749,7 +7593,6 @@ DEP_CPP_LOG_R=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -7766,7 +7609,6 @@ DEP_CPP_LOG_R=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -7788,6 +7630,7 @@ DEP_CPP_LOG_R=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_R=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -7805,7 +7648,6 @@ DEP_CPP_LOG_R=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -7827,21 +7669,24 @@ DEP_CPP_LOG_R=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_R=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_LOG_R=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -7861,21 +7706,26 @@ DEP_CPP_LOG_R=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_LOG_R=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_LOG_R=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -7897,7 +7747,8 @@ DEP_CPP_LOG_R=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_LOG_R=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -7922,7 +7773,6 @@ DEP_CPP_MALLO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -7974,6 +7824,7 @@ DEP_CPP_MALLO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MALLO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -7983,6 +7834,9 @@ DEP_CPP_MALLO=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -8041,7 +7895,6 @@ DEP_CPP_MALLO=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -8059,7 +7912,6 @@ DEP_CPP_MALLO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -8111,6 +7963,7 @@ DEP_CPP_MALLO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MALLO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -8129,7 +7982,6 @@ DEP_CPP_MALLO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -8181,27 +8033,28 @@ DEP_CPP_MALLO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MALLO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_MALLO=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -8248,27 +8101,30 @@ DEP_CPP_MALLO=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_MALLO=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MALLO=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -8317,7 +8173,8 @@ DEP_CPP_MALLO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MALLO=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -8341,7 +8198,6 @@ DEP_CPP_MEM_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -8365,6 +8221,7 @@ DEP_CPP_MEM_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEM_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -8373,6 +8230,9 @@ NODEP_CPP_MEM_M=\
 DEP_CPP_MEM_M=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -8401,7 +8261,6 @@ DEP_CPP_MEM_M=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -8418,7 +8277,6 @@ DEP_CPP_MEM_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -8442,6 +8300,7 @@ DEP_CPP_MEM_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEM_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -8459,7 +8318,6 @@ DEP_CPP_MEM_M=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -8483,21 +8341,24 @@ DEP_CPP_MEM_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEM_M=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_MEM_M=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -8519,21 +8380,26 @@ DEP_CPP_MEM_M=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_MEM_M=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MEM_M=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -8557,7 +8423,8 @@ DEP_CPP_MEM_M=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEM_M=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -8582,7 +8449,6 @@ DEP_CPP_MEMOR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -8634,6 +8500,7 @@ DEP_CPP_MEMOR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEMOR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -8704,7 +8571,6 @@ DEP_CPP_MEMOR=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -8722,7 +8588,6 @@ DEP_CPP_MEMOR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -8774,6 +8639,7 @@ DEP_CPP_MEMOR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEMOR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -8792,7 +8658,6 @@ DEP_CPP_MEMOR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -8844,10 +8709,11 @@ DEP_CPP_MEMOR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEMOR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_MEMOR=\

 	".\ACE.h"\

@@ -8862,12 +8728,9 @@ DEP_CPP_MEMOR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -8914,10 +8777,13 @@ DEP_CPP_MEMOR=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_MEMOR=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_MEMOR=\

 	".\ACE.h"\

@@ -8932,12 +8798,9 @@ DEP_CPP_MEMOR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -8986,7 +8849,8 @@ DEP_CPP_MEMOR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MEMOR=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -9011,7 +8875,6 @@ DEP_CPP_MESSA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -9065,6 +8928,7 @@ DEP_CPP_MESSA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MESSA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -9074,6 +8938,9 @@ DEP_CPP_MESSA=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -9146,7 +9013,6 @@ DEP_CPP_MESSA=\
 	".\Timeprobe_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -9164,7 +9030,6 @@ DEP_CPP_MESSA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -9218,6 +9083,7 @@ DEP_CPP_MESSA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MESSA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -9236,7 +9102,6 @@ DEP_CPP_MESSA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -9290,34 +9155,33 @@ DEP_CPP_MESSA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MESSA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_MESSA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\High_Res_Timer.h"\

-	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -9339,18 +9203,12 @@ DEP_CPP_MESSA=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

 	".\Signal.h"\

 	".\Signal.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

@@ -9365,267 +9223,38 @@ DEP_CPP_MESSA=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Timeprobe.h"\

-	".\Timeprobe.i"\

-	".\Timeprobe_T.cpp"\

-	".\Timeprobe_T.h"\

-	".\Trace.h"\

-	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

-	

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

-

-DEP_CPP_MESSA=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Atomic_Op.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

-	".\High_Res_Timer.h"\

-	".\High_Res_Timer.i"\

-	".\inc_user_config.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

-	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

-	".\Message_Block.h"\

-	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\Signal.h"\

-	".\Signal.i"\

-	".\Singleton.cpp"\

-	".\Singleton.h"\

-	".\Singleton.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

-	".\Timeprobe.h"\

-	".\Timeprobe.i"\

-	".\Timeprobe_T.cpp"\

-	".\Timeprobe_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_MESSA=\

-	".\ce.h"\

-	

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Message_Queue.cpp

-

-!IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

-

-DEP_CPP_MESSAG=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Atomic_Op.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

 	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

-	".\inc_user_config.h"\

-	".\IO_Cntl_Msg.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

-	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

-	".\Message_Block.h"\

-	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Message_Queue.h"\

-	".\Message_Queue.i"\

-	".\Message_Queue_T.cpp"\

-	".\Message_Queue_T.h"\

-	".\Message_Queue_T.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Service_Repository.h"\

-	".\Service_Repository.i"\

-	".\Service_Types.h"\

-	".\Service_Types.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

-	".\Signal.h"\

-	".\Signal.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\Strategies.h"\

-	".\Strategies.i"\

-	".\Strategies_T.cpp"\

-	".\Strategies_T.h"\

-	".\Strategies_T.i"\

-	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_Options.h"\

-	".\Synch_Options.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

-	".\Trace.h"\

-	".\WFMO_Reactor.h"\

-	".\WFMO_Reactor.i"\

-	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

-DEP_CPP_MESSAG=\

+DEP_CPP_MESSA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

-	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

@@ -9646,187 +9275,32 @@ DEP_CPP_MESSAG=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Message_Queue.h"\

-	".\Message_Queue.i"\

-	".\Message_Queue_T.cpp"\

-	".\Message_Queue_T.h"\

-	".\Message_Queue_T.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Service_Repository.h"\

-	".\Service_Repository.i"\

-	".\Service_Types.h"\

-	".\Service_Types.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

-	".\Strategies.h"\

-	".\Strategies.i"\

-	".\Strategies_T.cpp"\

-	".\Strategies_T.h"\

-	".\Strategies_T.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

-	".\Synch_Options.h"\

-	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

 	".\Trace.h"\

-	".\WFMO_Reactor.h"\

-	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

-

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

-

-DEP_CPP_MESSAG=\

-	".\ACE.h"\

-	".\ACE.i"\

-	".\Atomic_Op.i"\

-	".\Basic_Types.h"\

-	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

+NODEP_CPP_MESSA=\

 	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

-	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

-	".\inc_user_config.h"\

-	".\IO_Cntl_Msg.h"\

-	".\iosfwd.h"\

-	".\Log_Msg.h"\

-	".\Log_Priority.h"\

-	".\Log_Record.h"\

-	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

-	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

-	".\Managed_Object.cpp"\

-	".\Managed_Object.h"\

-	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

-	".\Message_Block.h"\

-	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

-	".\Message_Queue.h"\

-	".\Message_Queue.i"\

-	".\Message_Queue_T.cpp"\

-	".\Message_Queue_T.h"\

-	".\Message_Queue_T.i"\

-	".\Object_Manager.h"\

-	".\Object_Manager.i"\

-	".\OS.h"\

-	".\OS.i"\

-	".\Reactor.h"\

-	".\Reactor.i"\

-	".\Reactor_Impl.h"\

-	".\Service_Config.h"\

-	".\Service_Config.i"\

-	".\Service_Object.h"\

-	".\Service_Object.i"\

-	".\Service_Repository.h"\

-	".\Service_Repository.i"\

-	".\Service_Types.h"\

-	".\Service_Types.i"\

-	".\Shared_Object.h"\

-	".\Shared_Object.i"\

-	".\Signal.h"\

-	".\Signal.i"\

-	".\SString.h"\

-	".\SString.i"\

-	".\Strategies.h"\

-	".\Strategies.i"\

-	".\Strategies_T.cpp"\

-	".\Strategies_T.h"\

-	".\Strategies_T.i"\

-	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Svc_Conf_Tokens.h"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_Options.h"\

-	".\Synch_Options.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

-	".\Thread_Manager.h"\

-	".\Thread_Manager.i"\

-	".\Timer_Queue.h"\

-	".\Timer_Queue_T.cpp"\

-	".\Timer_Queue_T.h"\

-	".\Timer_Queue_T.i"\

-	".\Trace.h"\

-	".\WFMO_Reactor.h"\

-	".\WFMO_Reactor.i"\

-	".\ws2tcpip.h"\

-	

-NODEP_CPP_MESSAG=\

-	".\ce.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -9850,7 +9324,6 @@ DEP_CPP_METHO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -9873,6 +9346,7 @@ DEP_CPP_METHO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_METHO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -9881,6 +9355,9 @@ NODEP_CPP_METHO=\
 DEP_CPP_METHO=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -9908,7 +9385,6 @@ DEP_CPP_METHO=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -9925,7 +9401,6 @@ DEP_CPP_METHO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -9948,6 +9423,7 @@ DEP_CPP_METHO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_METHO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -9965,7 +9441,6 @@ DEP_CPP_METHO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -9988,21 +9463,24 @@ DEP_CPP_METHO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_METHO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_METHO=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -10023,21 +9501,26 @@ DEP_CPP_METHO=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_METHO=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_METHO=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -10060,7 +9543,8 @@ DEP_CPP_METHO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_METHO=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -10088,7 +9572,6 @@ DEP_CPP_OBJEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -10188,6 +9671,7 @@ DEP_CPP_OBJEC=\
 NODEP_CPP_OBJEC=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -10199,6 +9683,9 @@ DEP_CPP_OBJEC=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -10303,7 +9790,6 @@ DEP_CPP_OBJEC=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -10324,7 +9810,6 @@ DEP_CPP_OBJEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -10424,6 +9909,7 @@ DEP_CPP_OBJEC=\
 NODEP_CPP_OBJEC=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -10445,7 +9931,6 @@ DEP_CPP_OBJEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -10545,29 +10030,31 @@ DEP_CPP_OBJEC=\
 NODEP_CPP_OBJEC=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_OBJEC=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Array.h"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -10660,29 +10147,35 @@ DEP_CPP_OBJEC=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_OBJEC=\

+	".\Array.cpp"\

+	".\Array.i"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_OBJEC=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Array.h"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -10777,7 +10270,10 @@ DEP_CPP_OBJEC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OBJEC=\

-	".\ce.h"\

+	".\Array.cpp"\

+	".\Array.i"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -10802,7 +10298,6 @@ DEP_CPP_OBSTA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -10856,6 +10351,7 @@ DEP_CPP_OBSTA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OBSTA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -10865,6 +10361,9 @@ DEP_CPP_OBSTA=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -10925,7 +10424,6 @@ DEP_CPP_OBSTA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -10943,7 +10441,6 @@ DEP_CPP_OBSTA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -10997,6 +10494,7 @@ DEP_CPP_OBSTA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OBSTA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -11015,7 +10513,6 @@ DEP_CPP_OBSTA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -11069,27 +10566,28 @@ DEP_CPP_OBSTA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OBSTA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_OBSTA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -11138,27 +10636,30 @@ DEP_CPP_OBSTA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_OBSTA=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_OBSTA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -11209,7 +10710,8 @@ DEP_CPP_OBSTA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OBSTA=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -11237,7 +10739,6 @@ DEP_CPP_OS_CP=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -11345,6 +10846,7 @@ DEP_CPP_OS_CP=\
 NODEP_CPP_OS_CP=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -11353,7 +10855,12 @@ NODEP_CPP_OS_CP=\
 DEP_CPP_OS_CP=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -11371,7 +10878,20 @@ DEP_CPP_OS_CP=\
 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

@@ -11390,33 +10910,80 @@ DEP_CPP_OS_CP=\
 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

 	".\Sched_Params.h"\

 	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

 	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -11437,7 +11004,6 @@ DEP_CPP_OS_CP=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -11545,6 +11111,7 @@ DEP_CPP_OS_CP=\
 NODEP_CPP_OS_CP=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -11566,7 +11133,6 @@ DEP_CPP_OS_CP=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -11674,33 +11240,42 @@ DEP_CPP_OS_CP=\
 NODEP_CPP_OS_CP=\

 	".\Array.cpp"\

 	".\Array.i"\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_OS_CP=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Array.h"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

+	".\Hash_Map_Manager.h"\

 	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

@@ -11719,59 +11294,117 @@ DEP_CPP_OS_CP=\
 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

 	".\Sched_Params.h"\

 	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

 	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_OS_CP=\

+	".\Array.cpp"\

+	".\Array.i"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_OS_CP=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Array.h"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

+	".\Hash_Map_Manager.h"\

 	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

@@ -11790,35 +11423,83 @@ DEP_CPP_OS_CP=\
 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

 	".\Sched_Params.h"\

 	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

 	".\SV_Semaphore_Simple.h"\

 	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

 	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_OS_CP=\

-	".\ce.h"\

+	".\Array.cpp"\

+	".\Array.i"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -11843,7 +11524,6 @@ DEP_CPP_PARSE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -11949,6 +11629,7 @@ DEP_CPP_PARSE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PARSE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -11958,6 +11639,9 @@ DEP_CPP_PARSE=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -12081,7 +11765,6 @@ DEP_CPP_PARSE=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -12099,7 +11782,6 @@ DEP_CPP_PARSE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -12205,6 +11887,7 @@ DEP_CPP_PARSE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PARSE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -12223,7 +11906,6 @@ DEP_CPP_PARSE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -12329,44 +12011,37 @@ DEP_CPP_PARSE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PARSE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_PARSE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -12389,9 +12064,6 @@ DEP_CPP_PARSE=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -12461,44 +12133,39 @@ DEP_CPP_PARSE=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_PARSE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PARSE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -12521,9 +12188,6 @@ DEP_CPP_PARSE=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -12595,7 +12259,8 @@ DEP_CPP_PARSE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PARSE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -12621,7 +12286,6 @@ DEP_CPP_PIPE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -12660,6 +12324,7 @@ DEP_CPP_PIPE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PIPE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -12670,6 +12335,9 @@ DEP_CPP_PIPE_=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -12713,7 +12381,6 @@ DEP_CPP_PIPE_=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -12732,7 +12399,6 @@ DEP_CPP_PIPE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -12771,6 +12437,7 @@ DEP_CPP_PIPE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PIPE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -12790,7 +12457,6 @@ DEP_CPP_PIPE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -12829,23 +12495,26 @@ DEP_CPP_PIPE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PIPE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_PIPE_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -12882,23 +12551,28 @@ DEP_CPP_PIPE_=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_PIPE_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PIPE_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -12937,7 +12611,8 @@ DEP_CPP_PIPE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PIPE_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -12964,7 +12639,6 @@ DEP_CPP_PROCE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -13018,6 +12692,7 @@ DEP_CPP_PROCE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13029,6 +12704,9 @@ DEP_CPP_PROCE=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -13089,7 +12767,6 @@ DEP_CPP_PROCE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -13109,7 +12786,6 @@ DEP_CPP_PROCE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -13163,6 +12839,7 @@ DEP_CPP_PROCE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13183,7 +12860,6 @@ DEP_CPP_PROCE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -13237,10 +12913,11 @@ DEP_CPP_PROCE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_PROCE=\

 	".\ACE.h"\

@@ -13248,18 +12925,18 @@ DEP_CPP_PROCE=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -13308,10 +12985,13 @@ DEP_CPP_PROCE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_PROCE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PROCE=\

 	".\ACE.h"\

@@ -13319,18 +12999,18 @@ DEP_CPP_PROCE=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -13381,7 +13061,8 @@ DEP_CPP_PROCE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -13406,7 +13087,6 @@ DEP_CPP_PROCES=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -13445,6 +13125,7 @@ DEP_CPP_PROCES=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCES=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13454,6 +13135,9 @@ DEP_CPP_PROCES=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -13497,7 +13181,6 @@ DEP_CPP_PROCES=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -13515,7 +13198,6 @@ DEP_CPP_PROCES=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -13554,6 +13236,7 @@ DEP_CPP_PROCES=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCES=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13572,7 +13255,6 @@ DEP_CPP_PROCES=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -13611,22 +13293,25 @@ DEP_CPP_PROCES=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCES=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_PROCES=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -13663,22 +13348,27 @@ DEP_CPP_PROCES=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_PROCES=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PROCES=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -13717,7 +13407,8 @@ DEP_CPP_PROCES=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROCES=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -13741,7 +13432,6 @@ DEP_CPP_PROFI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -13768,6 +13458,7 @@ DEP_CPP_PROFI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROFI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13776,6 +13467,9 @@ NODEP_CPP_PROFI=\
 DEP_CPP_PROFI=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -13807,7 +13501,6 @@ DEP_CPP_PROFI=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -13824,7 +13517,6 @@ DEP_CPP_PROFI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -13851,6 +13543,7 @@ DEP_CPP_PROFI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROFI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -13868,7 +13561,6 @@ DEP_CPP_PROFI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -13895,21 +13587,24 @@ DEP_CPP_PROFI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROFI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_PROFI=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -13934,21 +13629,26 @@ DEP_CPP_PROFI=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_PROFI=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_PROFI=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\High_Res_Timer.h"\

 	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

@@ -13975,7 +13675,8 @@ DEP_CPP_PROFI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_PROFI=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -14000,7 +13701,6 @@ DEP_CPP_REACT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -14108,6 +13808,7 @@ DEP_CPP_REACT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_REACT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -14117,6 +13818,9 @@ DEP_CPP_REACT=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -14250,7 +13954,6 @@ DEP_CPP_REACT=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -14268,7 +13971,6 @@ DEP_CPP_REACT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -14376,6 +14078,7 @@ DEP_CPP_REACT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_REACT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -14394,7 +14097,6 @@ DEP_CPP_REACT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -14502,44 +14204,37 @@ DEP_CPP_REACT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_REACT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_REACT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -14567,9 +14262,6 @@ DEP_CPP_REACT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -14588,11 +14280,6 @@ DEP_CPP_REACT=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -14629,9 +14316,6 @@ DEP_CPP_REACT=\
 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -14644,44 +14328,39 @@ DEP_CPP_REACT=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_REACT=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_REACT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -14709,9 +14388,6 @@ DEP_CPP_REACT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -14730,11 +14406,6 @@ DEP_CPP_REACT=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -14771,9 +14442,6 @@ DEP_CPP_REACT=\
 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -14788,7 +14456,8 @@ DEP_CPP_REACT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_REACT=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -14812,7 +14481,6 @@ DEP_CPP_SCHED=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -14836,6 +14504,7 @@ DEP_CPP_SCHED=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SCHED=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -14844,6 +14513,9 @@ NODEP_CPP_SCHED=\
 DEP_CPP_SCHED=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -14872,7 +14544,6 @@ DEP_CPP_SCHED=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -14889,7 +14560,6 @@ DEP_CPP_SCHED=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -14913,6 +14583,7 @@ DEP_CPP_SCHED=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SCHED=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -14930,7 +14601,6 @@ DEP_CPP_SCHED=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -14954,21 +14624,24 @@ DEP_CPP_SCHED=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SCHED=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SCHED=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -14990,21 +14663,26 @@ DEP_CPP_SCHED=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SCHED=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SCHED=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -15028,7 +14706,8 @@ DEP_CPP_SCHED=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SCHED=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -15055,7 +14734,6 @@ DEP_CPP_SELEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -15154,6 +14832,7 @@ DEP_CPP_SELEC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SELEC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -15163,6 +14842,9 @@ DEP_CPP_SELEC=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -15258,7 +14940,6 @@ DEP_CPP_SELEC=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -15278,7 +14959,6 @@ DEP_CPP_SELEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -15377,6 +15057,7 @@ DEP_CPP_SELEC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SELEC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -15397,7 +15078,6 @@ DEP_CPP_SELEC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -15496,27 +15176,30 @@ DEP_CPP_SELEC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SELEC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SELEC=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -15525,7 +15208,11 @@ DEP_CPP_SELEC=\
 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

 	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

 	".\Local_Tokens.h"\

 	".\Local_Tokens.i"\

 	".\Log_Msg.h"\

@@ -15559,11 +15246,6 @@ DEP_CPP_SELEC=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -15572,6 +15254,16 @@ DEP_CPP_SELEC=\
 	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

@@ -15589,6 +15281,7 @@ DEP_CPP_SELEC=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

+	".\Time_Value.h"\

 	".\Timer_Heap.h"\

 	".\Timer_Heap_T.cpp"\

 	".\Timer_Heap_T.h"\

@@ -15600,27 +15293,32 @@ DEP_CPP_SELEC=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SELEC=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SELEC=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -15629,7 +15327,11 @@ DEP_CPP_SELEC=\
 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

 	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

 	".\Local_Tokens.h"\

 	".\Local_Tokens.i"\

 	".\Log_Msg.h"\

@@ -15663,11 +15365,6 @@ DEP_CPP_SELEC=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -15676,6 +15373,16 @@ DEP_CPP_SELEC=\
 	".\Shared_Object.i"\

 	".\Signal.h"\

 	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\streams.h"\

@@ -15693,6 +15400,7 @@ DEP_CPP_SELEC=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

+	".\Time_Value.h"\

 	".\Timer_Heap.h"\

 	".\Timer_Heap_T.cpp"\

 	".\Timer_Heap_T.h"\

@@ -15706,7 +15414,8 @@ DEP_CPP_SELEC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SELEC=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -15718,6 +15427,106 @@ SOURCE=.\Select_Reactor_Base.cpp
 

 !IF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Release"

 

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_SELECT=\

+	".\ace\config.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE x86em) Debug"

 

 DEP_CPP_SELECT=\

@@ -15726,6 +15535,9 @@ DEP_CPP_SELECT=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -15817,14 +15629,213 @@ DEP_CPP_SELECT=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

 

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_SELECT=\

+	".\ace\config.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+NODEP_CPP_SELECT=\

+	".\ace\config.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SELECT=\

 	".\ACE.h"\

@@ -15832,13 +15843,11 @@ DEP_CPP_SELECT=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

@@ -15923,10 +15932,12 @@ DEP_CPP_SELECT=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SELECT=\

+	".\ace\config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SELECT=\

 	".\ACE.h"\

@@ -15934,13 +15945,11 @@ DEP_CPP_SELECT=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

-	".\config-win32-borland.h"\

-	".\config-win32-common.h"\

-	".\config-win32.h"\

-	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.h"\

 	".\Containers.i"\

 	".\Containers_T.cpp"\

@@ -16027,7 +16036,7 @@ DEP_CPP_SELECT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SELECT=\

-	".\ce.h"\

+	".\ace\config.h"\

 	

 

 !ENDIF 

@@ -16058,7 +16067,6 @@ DEP_CPP_SERVI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -16167,6 +16175,7 @@ DEP_CPP_SERVI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -16181,8 +16190,6 @@ DEP_CPP_SERVI=\
 	".\ARGV.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

@@ -16204,13 +16211,26 @@ DEP_CPP_SERVI=\
 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

 	".\IPC_SAP.i"\

@@ -16231,6 +16251,19 @@ DEP_CPP_SERVI=\
 	".\Mem_Map.i"\

 	".\Memory_Pool.h"\

 	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\Obstack.h"\

@@ -16239,6 +16272,8 @@ DEP_CPP_SERVI=\
 	".\OS.i"\

 	".\Parse_Node.h"\

 	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

 	".\Proactor.h"\

 	".\Proactor.i"\

 	".\Reactor.h"\

@@ -16268,6 +16303,14 @@ DEP_CPP_SERVI=\
 	".\SOCK_Stream.i"\

 	".\SString.h"\

 	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

 	".\streams.h"\

 	".\SV_Semaphore_Complex.h"\

 	".\SV_Semaphore_Complex.i"\

@@ -16277,21 +16320,38 @@ DEP_CPP_SERVI=\
 	".\Svc_Conf_Tokens.h"\

 	".\Synch.h"\

 	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

 	".\Synch_T.cpp"\

 	".\Synch_T.h"\

 	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

 	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

 	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -16315,7 +16375,6 @@ DEP_CPP_SERVI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -16424,6 +16483,7 @@ DEP_CPP_SERVI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -16448,7 +16508,6 @@ DEP_CPP_SERVI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -16557,10 +16616,11 @@ DEP_CPP_SERVI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SERVI=\

 	".\ACE.h"\

@@ -16571,8 +16631,6 @@ DEP_CPP_SERVI=\
 	".\ARGV.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

@@ -16583,12 +16641,9 @@ DEP_CPP_SERVI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -16598,6 +16653,8 @@ DEP_CPP_SERVI=\
 	".\Get_Opt.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -16675,16 +16732,28 @@ DEP_CPP_SERVI=\
 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

 	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

 	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SERVI=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SERVI=\

 	".\ACE.h"\

@@ -16695,8 +16764,6 @@ DEP_CPP_SERVI=\
 	".\ARGV.i"\

 	".\Asynch_IO.h"\

 	".\Asynch_IO.i"\

-	".\Asynch_IO_Impl.h"\

-	".\Asynch_IO_Impl.i"\

 	".\Atomic_Op.i"\

 	".\Auto_Ptr.cpp"\

 	".\Auto_Ptr.h"\

@@ -16707,12 +16774,9 @@ DEP_CPP_SERVI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -16722,6 +16786,8 @@ DEP_CPP_SERVI=\
 	".\Get_Opt.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -16799,15 +16865,25 @@ DEP_CPP_SERVI=\
 	".\Thread_Manager.h"\

 	".\Thread_Manager.i"\

 	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

 	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVI=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -16834,7 +16910,6 @@ DEP_CPP_SERVIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -16944,6 +17019,7 @@ DEP_CPP_SERVIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -16955,6 +17031,9 @@ DEP_CPP_SERVIC=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -17082,7 +17161,6 @@ DEP_CPP_SERVIC=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -17102,7 +17180,6 @@ DEP_CPP_SERVIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -17212,6 +17289,7 @@ DEP_CPP_SERVIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -17232,7 +17310,6 @@ DEP_CPP_SERVIC=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -17342,10 +17419,11 @@ DEP_CPP_SERVIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVIC=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SERVIC=\

 	".\ACE.h"\

@@ -17353,37 +17431,29 @@ DEP_CPP_SERVIC=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -17410,9 +17480,6 @@ DEP_CPP_SERVIC=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -17480,10 +17547,13 @@ DEP_CPP_SERVIC=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SERVIC=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SERVIC=\

 	".\ACE.h"\

@@ -17491,37 +17561,29 @@ DEP_CPP_SERVIC=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Get_Opt.h"\

 	".\Get_Opt.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -17548,9 +17610,6 @@ DEP_CPP_SERVIC=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -17620,7 +17679,8 @@ DEP_CPP_SERVIC=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVIC=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -17645,7 +17705,6 @@ DEP_CPP_SERVICE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -17686,6 +17745,7 @@ DEP_CPP_SERVICE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -17695,6 +17755,9 @@ DEP_CPP_SERVICE=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -17740,7 +17803,6 @@ DEP_CPP_SERVICE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -17758,7 +17820,6 @@ DEP_CPP_SERVICE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -17799,6 +17860,7 @@ DEP_CPP_SERVICE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -17817,7 +17879,6 @@ DEP_CPP_SERVICE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -17858,22 +17919,25 @@ DEP_CPP_SERVICE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SERVICE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -17912,22 +17976,27 @@ DEP_CPP_SERVICE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SERVICE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SERVICE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -17968,7 +18037,8 @@ DEP_CPP_SERVICE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -17993,7 +18063,6 @@ DEP_CPP_SERVICE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -18036,6 +18105,7 @@ DEP_CPP_SERVICE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -18045,6 +18115,9 @@ DEP_CPP_SERVICE_=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -18092,7 +18165,6 @@ DEP_CPP_SERVICE_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -18110,7 +18182,6 @@ DEP_CPP_SERVICE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -18153,6 +18224,7 @@ DEP_CPP_SERVICE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -18171,7 +18243,6 @@ DEP_CPP_SERVICE_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -18214,22 +18285,25 @@ DEP_CPP_SERVICE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SERVICE_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -18270,22 +18344,27 @@ DEP_CPP_SERVICE_=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SERVICE_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SERVICE_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -18328,7 +18407,8 @@ DEP_CPP_SERVICE_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -18353,7 +18433,6 @@ DEP_CPP_SERVICE_T=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -18461,6 +18540,7 @@ DEP_CPP_SERVICE_T=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_T=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -18470,6 +18550,9 @@ DEP_CPP_SERVICE_T=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -18595,7 +18678,6 @@ DEP_CPP_SERVICE_T=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -18613,7 +18695,6 @@ DEP_CPP_SERVICE_T=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -18721,6 +18802,7 @@ DEP_CPP_SERVICE_T=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_T=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -18739,7 +18821,6 @@ DEP_CPP_SERVICE_T=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -18847,44 +18928,37 @@ DEP_CPP_SERVICE_T=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_T=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SERVICE_T=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -18907,9 +18981,6 @@ DEP_CPP_SERVICE_T=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -18981,44 +19052,39 @@ DEP_CPP_SERVICE_T=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SERVICE_T=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SERVICE_T=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -19041,9 +19107,6 @@ DEP_CPP_SERVICE_T=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -19117,7 +19180,8 @@ DEP_CPP_SERVICE_T=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SERVICE_T=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -19141,7 +19205,6 @@ DEP_CPP_SHARE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -19165,6 +19228,7 @@ DEP_CPP_SHARE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SHARE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19173,6 +19237,9 @@ NODEP_CPP_SHARE=\
 DEP_CPP_SHARE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -19201,7 +19268,6 @@ DEP_CPP_SHARE=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -19218,7 +19284,6 @@ DEP_CPP_SHARE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -19242,6 +19307,7 @@ DEP_CPP_SHARE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SHARE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19259,7 +19325,6 @@ DEP_CPP_SHARE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -19283,21 +19348,24 @@ DEP_CPP_SHARE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SHARE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SHARE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -19319,21 +19387,26 @@ DEP_CPP_SHARE=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SHARE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SHARE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -19357,7 +19430,8 @@ DEP_CPP_SHARE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SHARE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -19382,7 +19456,6 @@ DEP_CPP_SIGNA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -19434,6 +19507,7 @@ DEP_CPP_SIGNA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SIGNA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19443,6 +19517,9 @@ DEP_CPP_SIGNA=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -19501,7 +19578,6 @@ DEP_CPP_SIGNA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -19519,7 +19595,6 @@ DEP_CPP_SIGNA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -19571,6 +19646,7 @@ DEP_CPP_SIGNA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SIGNA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19589,7 +19665,6 @@ DEP_CPP_SIGNA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -19641,27 +19716,28 @@ DEP_CPP_SIGNA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SIGNA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SIGNA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -19708,27 +19784,30 @@ DEP_CPP_SIGNA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SIGNA=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SIGNA=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -19777,7 +19856,8 @@ DEP_CPP_SIGNA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SIGNA=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -19803,7 +19883,6 @@ DEP_CPP_SOCK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -19829,6 +19908,7 @@ DEP_CPP_SOCK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19839,6 +19919,9 @@ DEP_CPP_SOCK_=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -19869,7 +19952,6 @@ DEP_CPP_SOCK_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -19888,7 +19970,6 @@ DEP_CPP_SOCK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -19914,6 +19995,7 @@ DEP_CPP_SOCK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -19933,7 +20015,6 @@ DEP_CPP_SOCK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -19959,23 +20040,26 @@ DEP_CPP_SOCK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -19999,23 +20083,28 @@ DEP_CPP_SOCK_=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20041,7 +20130,8 @@ DEP_CPP_SOCK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -20068,7 +20158,6 @@ DEP_CPP_SOCK_A=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -20116,6 +20205,7 @@ DEP_CPP_SOCK_A=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_A=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20127,6 +20217,9 @@ DEP_CPP_SOCK_A=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -20179,7 +20272,6 @@ DEP_CPP_SOCK_A=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -20199,7 +20291,6 @@ DEP_CPP_SOCK_A=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -20247,6 +20338,7 @@ DEP_CPP_SOCK_A=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_A=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20267,7 +20359,6 @@ DEP_CPP_SOCK_A=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -20315,10 +20406,11 @@ DEP_CPP_SOCK_A=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_A=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_A=\

 	".\ACE.h"\

@@ -20326,13 +20418,15 @@ DEP_CPP_SOCK_A=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -20378,10 +20472,13 @@ DEP_CPP_SOCK_A=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_A=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_A=\

 	".\ACE.h"\

@@ -20389,13 +20486,15 @@ DEP_CPP_SOCK_A=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -20443,7 +20542,8 @@ DEP_CPP_SOCK_A=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_A=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -20469,7 +20569,6 @@ DEP_CPP_SOCK_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20499,6 +20598,7 @@ DEP_CPP_SOCK_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20509,6 +20609,9 @@ DEP_CPP_SOCK_C=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -20543,7 +20646,6 @@ DEP_CPP_SOCK_C=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -20562,7 +20664,6 @@ DEP_CPP_SOCK_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20592,6 +20693,7 @@ DEP_CPP_SOCK_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20611,7 +20713,6 @@ DEP_CPP_SOCK_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20641,23 +20742,26 @@ DEP_CPP_SOCK_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20685,23 +20789,28 @@ DEP_CPP_SOCK_C=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_C=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -20731,7 +20840,8 @@ DEP_CPP_SOCK_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_C=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -20757,7 +20867,6 @@ DEP_CPP_SOCK_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -20794,6 +20903,7 @@ DEP_CPP_SOCK_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20804,6 +20914,9 @@ DEP_CPP_SOCK_CO=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -20845,7 +20958,6 @@ DEP_CPP_SOCK_CO=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -20864,7 +20976,6 @@ DEP_CPP_SOCK_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -20901,6 +21012,7 @@ DEP_CPP_SOCK_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -20920,7 +21032,6 @@ DEP_CPP_SOCK_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -20957,23 +21068,26 @@ DEP_CPP_SOCK_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_CO=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -21008,23 +21122,28 @@ DEP_CPP_SOCK_CO=\
 	".\Time_Value.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_CO=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_CO=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

 	".\inc_user_config.h"\

@@ -21061,7 +21180,8 @@ DEP_CPP_SOCK_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_CO=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -21088,7 +21208,6 @@ DEP_CPP_SOCK_D=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Handle_Set.h"\

@@ -21131,6 +21250,7 @@ DEP_CPP_SOCK_D=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_D=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21142,6 +21262,9 @@ DEP_CPP_SOCK_D=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -21189,7 +21312,6 @@ DEP_CPP_SOCK_D=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -21209,7 +21331,6 @@ DEP_CPP_SOCK_D=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Handle_Set.h"\

@@ -21252,6 +21373,7 @@ DEP_CPP_SOCK_D=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_D=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21272,7 +21394,6 @@ DEP_CPP_SOCK_D=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Handle_Set.h"\

@@ -21315,10 +21436,11 @@ DEP_CPP_SOCK_D=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_D=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_D=\

 	".\ACE.h"\

@@ -21326,13 +21448,15 @@ DEP_CPP_SOCK_D=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Handle_Set.h"\

@@ -21373,10 +21497,13 @@ DEP_CPP_SOCK_D=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_D=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_D=\

 	".\ACE.h"\

@@ -21384,13 +21511,15 @@ DEP_CPP_SOCK_D=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Handle_Set.h"\

@@ -21433,7 +21562,8 @@ DEP_CPP_SOCK_D=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_D=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -21459,7 +21589,6 @@ DEP_CPP_SOCK_DG=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21491,6 +21620,7 @@ DEP_CPP_SOCK_DG=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DG=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21501,6 +21631,9 @@ DEP_CPP_SOCK_DG=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -21537,7 +21670,6 @@ DEP_CPP_SOCK_DG=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -21556,7 +21688,6 @@ DEP_CPP_SOCK_DG=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21588,6 +21719,7 @@ DEP_CPP_SOCK_DG=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DG=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21607,7 +21739,6 @@ DEP_CPP_SOCK_DG=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21639,23 +21770,26 @@ DEP_CPP_SOCK_DG=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DG=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_DG=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21685,23 +21819,28 @@ DEP_CPP_SOCK_DG=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_DG=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_DG=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21733,7 +21872,8 @@ DEP_CPP_SOCK_DG=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DG=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -21759,7 +21899,6 @@ DEP_CPP_SOCK_DGR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21791,6 +21930,7 @@ DEP_CPP_SOCK_DGR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DGR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21801,6 +21941,9 @@ DEP_CPP_SOCK_DGR=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -21837,7 +21980,6 @@ DEP_CPP_SOCK_DGR=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -21856,7 +21998,6 @@ DEP_CPP_SOCK_DGR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21888,6 +22029,7 @@ DEP_CPP_SOCK_DGR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DGR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -21907,7 +22049,6 @@ DEP_CPP_SOCK_DGR=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21939,23 +22080,26 @@ DEP_CPP_SOCK_DGR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DGR=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_DGR=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -21985,23 +22129,28 @@ DEP_CPP_SOCK_DGR=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_DGR=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_DGR=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22033,7 +22182,8 @@ DEP_CPP_SOCK_DGR=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_DGR=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -22059,7 +22209,6 @@ DEP_CPP_SOCK_I=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -22087,6 +22236,7 @@ DEP_CPP_SOCK_I=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_I=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22097,6 +22247,9 @@ DEP_CPP_SOCK_I=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -22131,7 +22284,6 @@ DEP_CPP_SOCK_I=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -22150,7 +22302,6 @@ DEP_CPP_SOCK_I=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -22178,6 +22329,7 @@ DEP_CPP_SOCK_I=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_I=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22197,7 +22349,6 @@ DEP_CPP_SOCK_I=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -22225,25 +22376,26 @@ DEP_CPP_SOCK_I=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_I=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_I=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -22269,25 +22421,28 @@ DEP_CPP_SOCK_I=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_I=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_I=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Handle_Set.h"\

-	".\Handle_Set.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\IPC_SAP.h"\

@@ -22315,7 +22470,8 @@ DEP_CPP_SOCK_I=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_I=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -22341,7 +22497,6 @@ DEP_CPP_SOCK_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22373,6 +22528,7 @@ DEP_CPP_SOCK_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22383,6 +22539,9 @@ DEP_CPP_SOCK_S=\
 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -22419,7 +22578,6 @@ DEP_CPP_SOCK_S=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -22438,7 +22596,6 @@ DEP_CPP_SOCK_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22470,6 +22627,7 @@ DEP_CPP_SOCK_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22489,7 +22647,6 @@ DEP_CPP_SOCK_S=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22521,23 +22678,26 @@ DEP_CPP_SOCK_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_S=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SOCK_S=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22567,23 +22727,28 @@ DEP_CPP_SOCK_S=\
 	".\streams.h"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SOCK_S=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SOCK_S=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Addr.h"\

 	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\INET_Addr.h"\

 	".\INET_Addr.i"\

@@ -22615,7 +22780,8 @@ DEP_CPP_SOCK_S=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SOCK_S=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -22640,7 +22806,6 @@ DEP_CPP_SSTRI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -22708,6 +22873,7 @@ DEP_CPP_SSTRI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SSTRI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22794,7 +22960,6 @@ DEP_CPP_SSTRI=\
 	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -22812,7 +22977,6 @@ DEP_CPP_SSTRI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -22880,6 +23044,7 @@ DEP_CPP_SSTRI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SSTRI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -22898,7 +23063,6 @@ DEP_CPP_SSTRI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -22966,10 +23130,11 @@ DEP_CPP_SSTRI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SSTRI=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SSTRI=\

 	".\ACE.h"\

@@ -22984,12 +23149,9 @@ DEP_CPP_SSTRI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -23052,10 +23214,13 @@ DEP_CPP_SSTRI=\
 	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SSTRI=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SSTRI=\

 	".\ACE.h"\

@@ -23070,12 +23235,9 @@ DEP_CPP_SSTRI=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -23140,7 +23302,8 @@ DEP_CPP_SSTRI=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SSTRI=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -23164,7 +23327,6 @@ DEP_CPP_STATS=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -23188,6 +23350,7 @@ DEP_CPP_STATS=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STATS=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -23197,6 +23360,9 @@ DEP_CPP_STATS=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -23257,7 +23423,6 @@ DEP_CPP_STATS=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -23274,7 +23439,6 @@ DEP_CPP_STATS=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -23298,6 +23462,7 @@ DEP_CPP_STATS=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STATS=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -23315,7 +23480,6 @@ DEP_CPP_STATS=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -23339,147 +23503,90 @@ DEP_CPP_STATS=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STATS=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_STATS=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

 	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Signal.h"\

-	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\Stats.h"\

 	".\Stats.i"\

 	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_STATS=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STATS=\

 	".\ACE.h"\

 	".\ACE.i"\

-	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

-	".\Containers.h"\

-	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

-	".\Event_Handler.h"\

-	".\Event_Handler.i"\

-	".\Free_List.cpp"\

-	".\Free_List.h"\

-	".\Free_List.i"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

 	".\Log_Priority.h"\

 	".\Log_Record.h"\

 	".\Log_Record.i"\

-	".\Malloc.h"\

-	".\Malloc.i"\

 	".\Malloc_Base.h"\

-	".\Malloc_T.cpp"\

-	".\Malloc_T.h"\

-	".\Malloc_T.i"\

 	".\Managed_Object.cpp"\

 	".\Managed_Object.h"\

 	".\Managed_Object.i"\

-	".\Mem_Map.h"\

-	".\Mem_Map.i"\

-	".\Memory_Pool.h"\

-	".\Memory_Pool.i"\

 	".\Object_Manager.h"\

 	".\Object_Manager.i"\

 	".\OS.h"\

 	".\OS.i"\

-	".\Signal.h"\

-	".\Signal.i"\

 	".\SString.h"\

 	".\SString.i"\

 	".\Stats.h"\

 	".\Stats.i"\

 	".\streams.h"\

-	".\SV_Semaphore_Complex.h"\

-	".\SV_Semaphore_Complex.i"\

-	".\SV_Semaphore_Simple.h"\

-	".\SV_Semaphore_Simple.i"\

-	".\Synch.h"\

-	".\Synch.i"\

-	".\Synch_T.cpp"\

-	".\Synch_T.h"\

-	".\Synch_T.i"\

-	".\Thread.h"\

-	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STATS=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -23504,7 +23611,6 @@ DEP_CPP_STRAT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -23597,6 +23703,7 @@ DEP_CPP_STRAT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STRAT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -23606,6 +23713,9 @@ DEP_CPP_STRAT=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -23716,7 +23826,6 @@ DEP_CPP_STRAT=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -23734,7 +23843,6 @@ DEP_CPP_STRAT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -23827,6 +23935,7 @@ DEP_CPP_STRAT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STRAT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -23845,7 +23954,6 @@ DEP_CPP_STRAT=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -23938,44 +24046,37 @@ DEP_CPP_STRAT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STRAT=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_STRAT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -23998,9 +24099,6 @@ DEP_CPP_STRAT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -24057,44 +24155,39 @@ DEP_CPP_STRAT=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_STRAT=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_STRAT=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -24117,9 +24210,6 @@ DEP_CPP_STRAT=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -24178,7 +24268,8 @@ DEP_CPP_STRAT=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_STRAT=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -24203,7 +24294,6 @@ DEP_CPP_SVC_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -24278,6 +24368,7 @@ DEP_CPP_SVC_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -24287,6 +24378,9 @@ DEP_CPP_SVC_C=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -24368,7 +24462,6 @@ DEP_CPP_SVC_C=\
 	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -24386,7 +24479,6 @@ DEP_CPP_SVC_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -24461,6 +24553,7 @@ DEP_CPP_SVC_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -24479,7 +24572,6 @@ DEP_CPP_SVC_C=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -24554,27 +24646,28 @@ DEP_CPP_SVC_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_C=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SVC_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -24644,27 +24737,30 @@ DEP_CPP_SVC_C=\
 	".\Timer_Queue_T.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SVC_C=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SVC_C=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -24736,7 +24832,8 @@ DEP_CPP_SVC_C=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_C=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -24763,7 +24860,6 @@ DEP_CPP_SVC_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -24876,6 +24972,7 @@ DEP_CPP_SVC_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -24887,6 +24984,9 @@ DEP_CPP_SVC_CO=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -25017,7 +25117,6 @@ DEP_CPP_SVC_CO=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -25037,7 +25136,6 @@ DEP_CPP_SVC_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -25150,6 +25248,7 @@ DEP_CPP_SVC_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -25170,7 +25269,6 @@ DEP_CPP_SVC_CO=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -25283,10 +25381,11 @@ DEP_CPP_SVC_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_CO=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SVC_CO=\

 	".\ACE.h"\

@@ -25294,35 +25393,27 @@ DEP_CPP_SVC_CO=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -25345,9 +25436,6 @@ DEP_CPP_SVC_CO=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -25424,10 +25512,13 @@ DEP_CPP_SVC_CO=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SVC_CO=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SVC_CO=\

 	".\ACE.h"\

@@ -25435,35 +25526,27 @@ DEP_CPP_SVC_CO=\
 	".\ARGV.h"\

 	".\ARGV.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -25486,9 +25569,6 @@ DEP_CPP_SVC_CO=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -25567,7 +25647,8 @@ DEP_CPP_SVC_CO=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SVC_CO=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -25592,7 +25673,6 @@ DEP_CPP_SYNCH=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -25627,6 +25707,7 @@ DEP_CPP_SYNCH=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -25636,6 +25717,9 @@ DEP_CPP_SYNCH=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -25675,7 +25759,6 @@ DEP_CPP_SYNCH=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -25693,7 +25776,6 @@ DEP_CPP_SYNCH=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -25728,6 +25810,7 @@ DEP_CPP_SYNCH=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -25746,7 +25829,6 @@ DEP_CPP_SYNCH=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -25781,22 +25863,25 @@ DEP_CPP_SYNCH=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SYNCH=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -25829,22 +25914,27 @@ DEP_CPP_SYNCH=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SYNCH=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SYNCH=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -25879,7 +25969,8 @@ DEP_CPP_SYNCH=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -25903,7 +25994,6 @@ DEP_CPP_SYNCH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -25927,6 +26017,7 @@ DEP_CPP_SYNCH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -25935,6 +26026,9 @@ NODEP_CPP_SYNCH_=\
 DEP_CPP_SYNCH_=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -25963,7 +26057,6 @@ DEP_CPP_SYNCH_=\
 	".\Synch_Options.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -25980,7 +26073,6 @@ DEP_CPP_SYNCH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -26004,6 +26096,7 @@ DEP_CPP_SYNCH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -26021,7 +26114,6 @@ DEP_CPP_SYNCH_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -26045,21 +26137,24 @@ DEP_CPP_SYNCH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SYNCH_=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -26081,21 +26176,26 @@ DEP_CPP_SYNCH_=\
 	".\Synch_Options.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SYNCH_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SYNCH_=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -26119,7 +26219,8 @@ DEP_CPP_SYNCH_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYNCH_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -26144,7 +26245,6 @@ DEP_CPP_SYSTE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -26197,6 +26297,7 @@ DEP_CPP_SYSTE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYSTE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -26206,6 +26307,9 @@ DEP_CPP_SYSTE=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -26265,7 +26369,6 @@ DEP_CPP_SYSTE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -26283,7 +26386,6 @@ DEP_CPP_SYSTE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -26336,6 +26438,7 @@ DEP_CPP_SYSTE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYSTE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -26354,7 +26457,6 @@ DEP_CPP_SYSTE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -26407,27 +26509,28 @@ DEP_CPP_SYSTE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYSTE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_SYSTE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -26475,27 +26578,30 @@ DEP_CPP_SYSTE=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_SYSTE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_SYSTE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -26545,7 +26651,8 @@ DEP_CPP_SYSTE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_SYSTE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -26570,7 +26677,6 @@ DEP_CPP_TASK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -26674,6 +26780,7 @@ DEP_CPP_TASK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TASK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -26683,6 +26790,9 @@ DEP_CPP_TASK_=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -26804,7 +26914,6 @@ DEP_CPP_TASK_=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -26822,7 +26931,6 @@ DEP_CPP_TASK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -26926,6 +27034,7 @@ DEP_CPP_TASK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TASK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -26944,7 +27053,6 @@ DEP_CPP_TASK_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -27048,44 +27156,37 @@ DEP_CPP_TASK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TASK_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_TASK_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -27108,9 +27209,6 @@ DEP_CPP_TASK_=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -27178,44 +27276,39 @@ DEP_CPP_TASK_=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_TASK_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TASK_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -27238,9 +27331,6 @@ DEP_CPP_TASK_=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -27310,7 +27400,8 @@ DEP_CPP_TASK_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TASK_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -27334,7 +27425,6 @@ DEP_CPP_THREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -27358,6 +27448,7 @@ DEP_CPP_THREA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -27366,6 +27457,9 @@ NODEP_CPP_THREA=\
 DEP_CPP_THREA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -27394,7 +27488,6 @@ DEP_CPP_THREA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -27411,7 +27504,6 @@ DEP_CPP_THREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -27435,6 +27527,7 @@ DEP_CPP_THREA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -27452,7 +27545,6 @@ DEP_CPP_THREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -27476,21 +27568,24 @@ DEP_CPP_THREA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_THREA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -27512,21 +27607,26 @@ DEP_CPP_THREA=\
 	".\Thread.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_THREA=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_THREA=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -27550,7 +27650,8 @@ DEP_CPP_THREA=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREA=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -27575,7 +27676,6 @@ DEP_CPP_THREAD=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -27634,6 +27734,7 @@ DEP_CPP_THREAD=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREAD=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -27643,6 +27744,9 @@ DEP_CPP_THREAD=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -27708,7 +27812,6 @@ DEP_CPP_THREAD=\
 	".\Thread_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -27726,7 +27829,6 @@ DEP_CPP_THREAD=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -27785,6 +27887,7 @@ DEP_CPP_THREAD=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREAD=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -27803,7 +27906,6 @@ DEP_CPP_THREAD=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -27862,27 +27964,28 @@ DEP_CPP_THREAD=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREAD=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_THREAD=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

 	".\Event_Handler.h"\

@@ -27936,27 +28039,30 @@ DEP_CPP_THREAD=\
 	".\Thread_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_THREAD=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_THREAD=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Dynamic.h"\

 	".\Dynamic.i"\

 	".\Event_Handler.h"\

@@ -28012,7 +28118,8 @@ DEP_CPP_THREAD=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_THREAD=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -28037,7 +28144,6 @@ DEP_CPP_TOKEN=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -28074,6 +28180,7 @@ DEP_CPP_TOKEN=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -28083,6 +28190,9 @@ DEP_CPP_TOKEN=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -28124,7 +28234,6 @@ DEP_CPP_TOKEN=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -28142,7 +28251,6 @@ DEP_CPP_TOKEN=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -28179,6 +28287,7 @@ DEP_CPP_TOKEN=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -28197,7 +28306,6 @@ DEP_CPP_TOKEN=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -28234,22 +28342,25 @@ DEP_CPP_TOKEN=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_TOKEN=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -28284,22 +28395,27 @@ DEP_CPP_TOKEN=\
 	".\Token.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_TOKEN=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TOKEN=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\inc_user_config.h"\

@@ -28336,7 +28452,8 @@ DEP_CPP_TOKEN=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -28361,7 +28478,6 @@ DEP_CPP_TOKEN_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -28438,6 +28554,7 @@ DEP_CPP_TOKEN_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -28447,6 +28564,9 @@ DEP_CPP_TOKEN_=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -28530,7 +28650,6 @@ DEP_CPP_TOKEN_=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -28548,7 +28667,6 @@ DEP_CPP_TOKEN_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -28625,6 +28743,7 @@ DEP_CPP_TOKEN_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -28643,7 +28762,6 @@ DEP_CPP_TOKEN_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -28720,27 +28838,28 @@ DEP_CPP_TOKEN_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_TOKEN_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -28812,27 +28931,30 @@ DEP_CPP_TOKEN_=\
 	".\Token_Manager.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_TOKEN_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TOKEN_=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -28906,7 +29028,8 @@ DEP_CPP_TOKEN_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TOKEN_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -28931,7 +29054,6 @@ DEP_CPP_TP_RE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -29014,6 +29136,7 @@ DEP_CPP_TP_RE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TP_RE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -29023,6 +29146,9 @@ DEP_CPP_TP_RE=\
 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -29120,7 +29246,6 @@ DEP_CPP_TP_RE=\
 	".\TP_Reactor.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -29138,7 +29263,6 @@ DEP_CPP_TP_RE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -29221,6 +29345,7 @@ DEP_CPP_TP_RE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TP_RE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -29239,7 +29364,6 @@ DEP_CPP_TP_RE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -29322,27 +29446,28 @@ DEP_CPP_TP_RE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TP_RE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_TP_RE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -29385,11 +29510,6 @@ DEP_CPP_TP_RE=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -29415,9 +29535,6 @@ DEP_CPP_TP_RE=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -29428,27 +29545,30 @@ DEP_CPP_TP_RE=\
 	".\TP_Reactor.i"\

 	".\Trace.h"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_TP_RE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TP_RE=\

 	".\ACE.h"\

 	".\ACE.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -29491,11 +29611,6 @@ DEP_CPP_TP_RE=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -29521,9 +29636,6 @@ DEP_CPP_TP_RE=\
 	".\Synch_T.i"\

 	".\Thread.h"\

 	".\Thread.i"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -29536,7 +29648,8 @@ DEP_CPP_TP_RE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TP_RE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -29560,7 +29673,6 @@ DEP_CPP_TRACE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -29583,6 +29695,7 @@ DEP_CPP_TRACE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TRACE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -29591,6 +29704,9 @@ NODEP_CPP_TRACE=\
 DEP_CPP_TRACE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -29618,7 +29734,6 @@ DEP_CPP_TRACE=\
 	".\Trace.h"\

 	".\Trace.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -29635,7 +29750,6 @@ DEP_CPP_TRACE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -29658,6 +29772,7 @@ DEP_CPP_TRACE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TRACE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -29675,7 +29790,6 @@ DEP_CPP_TRACE=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -29698,21 +29812,24 @@ DEP_CPP_TRACE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TRACE=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_TRACE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -29733,21 +29850,26 @@ DEP_CPP_TRACE=\
 	".\Trace.h"\

 	".\Trace.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_TRACE=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_TRACE=\

 	".\ACE.h"\

 	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\inc_user_config.h"\

 	".\iosfwd.h"\

 	".\Log_Msg.h"\

@@ -29770,7 +29892,8 @@ DEP_CPP_TRACE=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_TRACE=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -29795,7 +29918,6 @@ DEP_CPP_WFMO_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -29891,6 +30013,7 @@ DEP_CPP_WFMO_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_WFMO_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -30016,7 +30139,6 @@ DEP_CPP_WFMO_=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -30034,7 +30156,6 @@ DEP_CPP_WFMO_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -30130,6 +30251,7 @@ DEP_CPP_WFMO_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_WFMO_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -30148,7 +30270,6 @@ DEP_CPP_WFMO_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -30244,10 +30365,11 @@ DEP_CPP_WFMO_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_WFMO_=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_WFMO_=\

 	".\ACE.h"\

@@ -30262,29 +30384,18 @@ DEP_CPP_WFMO_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -30307,9 +30418,6 @@ DEP_CPP_WFMO_=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -30369,10 +30477,13 @@ DEP_CPP_WFMO_=\
 	".\WFMO_Reactor.h"\

 	".\WFMO_Reactor.i"\

 	".\ws2tcpip.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_WFMO_=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_WFMO_=\

 	".\ACE.h"\

@@ -30387,29 +30498,18 @@ DEP_CPP_WFMO_=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

 	".\Free_List.h"\

 	".\Free_List.i"\

-	".\Functor.h"\

-	".\Functor.i"\

-	".\Functor_T.cpp"\

-	".\Functor_T.h"\

-	".\Functor_T.i"\

 	".\Handle_Set.h"\

 	".\Handle_Set.i"\

+	".\Hash_Map_Manager.cpp"\

 	".\Hash_Map_Manager.h"\

-	".\Hash_Map_Manager.i"\

-	".\Hash_Map_Manager_T.cpp"\

-	".\Hash_Map_Manager_T.h"\

-	".\Hash_Map_Manager_T.i"\

 	".\inc_user_config.h"\

 	".\IO_Cntl_Msg.h"\

 	".\iosfwd.h"\

@@ -30432,9 +30532,6 @@ DEP_CPP_WFMO_=\
 	".\Memory_Pool.i"\

 	".\Message_Block.h"\

 	".\Message_Block.i"\

-	".\Message_Block_T.cpp"\

-	".\Message_Block_T.h"\

-	".\Message_Block_T.i"\

 	".\Message_Queue.h"\

 	".\Message_Queue.i"\

 	".\Message_Queue_T.cpp"\

@@ -30496,7 +30593,8 @@ DEP_CPP_WFMO_=\
 	".\ws2tcpip.h"\

 	

 NODEP_CPP_WFMO_=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

@@ -30523,7 +30621,6 @@ DEP_CPP_XTREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -30620,6 +30717,7 @@ DEP_CPP_XTREA=\
 	".\XtReactor.h"\

 	

 NODEP_CPP_XTREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -30631,6 +30729,9 @@ DEP_CPP_XTREA=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

@@ -30742,7 +30843,6 @@ DEP_CPP_XTREA=\
 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	".\XtReactor.h"\

-	{$(INCLUDE)}"wce.h"\

 	

 

 !ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE MIPS) Release"

@@ -30762,7 +30862,6 @@ DEP_CPP_XTREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -30859,6 +30958,7 @@ DEP_CPP_XTREA=\
 	".\XtReactor.h"\

 	

 NODEP_CPP_XTREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

@@ -30879,7 +30979,6 @@ DEP_CPP_XTREA=\
 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

 	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

@@ -30976,10 +31075,11 @@ DEP_CPP_XTREA=\
 	".\XtReactor.h"\

 	

 NODEP_CPP_XTREA=\

+	".\config.h"\

 	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Release"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Release"

 

 DEP_CPP_XTREA=\

 	".\ACE.h"\

@@ -30987,18 +31087,18 @@ DEP_CPP_XTREA=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -31045,11 +31145,6 @@ DEP_CPP_XTREA=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -31086,9 +31181,6 @@ DEP_CPP_XTREA=\
 	".\Thread.h"\

 	".\Thread.i"\

 	".\Time_Value.h"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -31098,10 +31190,13 @@ DEP_CPP_XTREA=\
 	".\Trace.h"\

 	".\ws2tcpip.h"\

 	".\XtReactor.h"\

-	{$(INCLUDE)}"wce.h"\

+	

+NODEP_CPP_XTREA=\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

-!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "ace_ce_dll - Win32 (WCE SH3) Debug"

 

 DEP_CPP_XTREA=\

 	".\ACE.h"\

@@ -31109,18 +31204,18 @@ DEP_CPP_XTREA=\
 	".\Addr.h"\

 	".\Addr.i"\

 	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

 	".\Basic_Types.h"\

 	".\Basic_Types.i"\

 	".\config-win32-borland.h"\

 	".\config-win32-common.h"\

 	".\config-win32.h"\

 	".\config-WinCE.h"\

-	".\config.h"\

+	".\Containers.cpp"\

 	".\Containers.h"\

 	".\Containers.i"\

-	".\Containers_T.cpp"\

-	".\Containers_T.h"\

-	".\Containers_T.i"\

 	".\Event_Handler.h"\

 	".\Event_Handler.i"\

 	".\Free_List.cpp"\

@@ -31167,11 +31262,6 @@ DEP_CPP_XTREA=\
 	".\Reactor_Impl.h"\

 	".\Select_Reactor.h"\

 	".\Select_Reactor.i"\

-	".\Select_Reactor_Base.h"\

-	".\Select_Reactor_Base.i"\

-	".\Select_Reactor_T.cpp"\

-	".\Select_Reactor_T.h"\

-	".\Select_Reactor_T.i"\

 	".\Service_Config.h"\

 	".\Service_Config.i"\

 	".\Service_Object.h"\

@@ -31208,9 +31298,6 @@ DEP_CPP_XTREA=\
 	".\Thread.h"\

 	".\Thread.i"\

 	".\Time_Value.h"\

-	".\Timer_Heap.h"\

-	".\Timer_Heap_T.cpp"\

-	".\Timer_Heap_T.h"\

 	".\Timer_Queue.h"\

 	".\Timer_Queue_T.cpp"\

 	".\Timer_Queue_T.h"\

@@ -31222,7 +31309,8 @@ DEP_CPP_XTREA=\
 	".\XtReactor.h"\

 	

 NODEP_CPP_XTREA=\

-	".\ce.h"\

+	".\config.h"\

+	".\sys_conf.h"\

 	

 

 !ENDIF 

diff --git a/ace/ace_dll.dsp b/ace/ace_dll.dsp
index 71e4639265c..fcb8d7de007 100644
--- a/ace/ace_dll.dsp
+++ b/ace/ace_dll.dsp
@@ -14,7 +14,7 @@ CFG=ACE dynamic library - Win32 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 "ace_dll.mak" CFG="ACE dynamic library - Win32 Debug"

+!MESSAGE NMAKE /f "ace_dll.mak" CFG="ACE dynamic library - Win32 Alpha Unicode Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

@@ -31,7 +31,7 @@ CFG=ACE dynamic library - Win32 Debug
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 

 !IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

 

@@ -171,12 +171,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-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 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD MTd c

-# ADD CPP /nologo /MDd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\ /D" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "_DEBUG" /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MTd /c

+# SUBTRACT BASE CPP /YX /Yc /Yu

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /MDd /c

+# SUBTRACT CPP /YX /Yc /Yu

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -203,12 +205,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-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 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 FD c

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

+# SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MD /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /FD /c

+# SUBTRACT CPP /YX

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -235,12 +239,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-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 nologo Gt0 W3 GX Zi Od Gy I "..\\ /D " WIN32" D "_DEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD MTd c

-# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

+# ADD BASE 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

+# SUBTRACT BASE CPP /YX

+# 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

+# SUBTRACT CPP /YX

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -267,12 +273,14 @@ LINK32=link.exe
 # PROP Intermediate_Dir "DLL\Unicode_Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-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 nologo MT Gt0 W3 GX O2 Ob2 I "..\\ /D " WIN32" D "NDEBUG" D "_WINDOWS" D ACE_HAS_DLL=1 D "UNICODE" FD c

+# ADD BASE CPP /nologo /MT /Gt0 /W3 /GX /O2 /Ob2 /I "..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D ACE_HAS_DLL=1 /D "UNICODE" /FD /c

+# SUBTRACT BASE CPP /YX

 # 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

+# SUBTRACT CPP /YX

+MTL=midl.exe

+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /o /win32 "NUL"

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -314,8 +322,98 @@ SOURCE=.\ACE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_ACE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Version.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ACE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Version.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -337,8 +435,252 @@ SOURCE=.\Activation_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_ACTIV=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Activation_Queue.h"\

+	".\Activation_Queue.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ACTIV=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Activation_Queue.h"\

+	".\Activation_Queue.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -383,8 +725,80 @@ SOURCE=.\Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_ADDR_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ADDR_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -406,8 +820,78 @@ SOURCE=.\Arg_Shifter.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_ARG_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Arg_Shifter.h"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ARG_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Arg_Shifter.h"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -429,8 +913,146 @@ SOURCE=.\ARGV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_ARGV_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ARGV_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -452,31 +1074,310 @@ SOURCE=.\Asynch_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_IO_Impl.cpp

-

-!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+DEP_CPP_ASYNC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_ASYNC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -498,8 +1399,404 @@ SOURCE=.\Basic_Types.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_BASIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Template_Instantiations.cpp"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_BASIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Template_Instantiations.cpp"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -552,8 +1849,142 @@ SOURCE=.\Containers.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_CONTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_CONTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -575,8 +2006,186 @@ SOURCE=.\CORBA_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_CORBA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\CORBA_Handler.h"\

+	".\CORBA_Handler.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_CORBA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\CORBA_Handler.h"\

+	".\CORBA_Handler.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -598,8 +2207,80 @@ SOURCE=.\CORBA_Ref.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_CORBA_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\CORBA_Ref.h"\

+	".\CORBA_Ref.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_CORBA_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\CORBA_Ref.h"\

+	".\CORBA_Ref.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -621,8 +2302,80 @@ SOURCE=.\Date_Time.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DATE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Date_Time.h"\

+	".\Date_Time.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DATE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Date_Time.h"\

+	".\Date_Time.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -644,8 +2397,92 @@ SOURCE=.\DEV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DEV_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -667,8 +2504,84 @@ SOURCE=.\DEV_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DEV_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -690,8 +2603,100 @@ SOURCE=.\DEV_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DEV_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -713,8 +2718,96 @@ SOURCE=.\DEV_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DEV_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -736,8 +2829,16 @@ SOURCE=.\Dirent.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DIREN=\

+	".\Dirent.i"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DIREN=\

+	".\Dirent.i"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -759,8 +2860,78 @@ SOURCE=.\DLL.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DLL_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DLL.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DLL_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DLL.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -782,8 +2953,110 @@ SOURCE=.\Dump.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DUMP_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dump.h"\

+	".\Dump_T.cpp"\

+	".\Dump_T.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DUMP_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dump.h"\

+	".\Dump_T.cpp"\

+	".\Dump_T.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -805,8 +3078,114 @@ SOURCE=.\Dynamic.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DYNAM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DYNAM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -828,8 +3207,184 @@ SOURCE=.\Dynamic_Service.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_DYNAMI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic_Service.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_DYNAMI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic_Service.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -851,8 +3406,174 @@ SOURCE=.\Event_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_EVENT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_EVENT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -874,8 +3595,84 @@ SOURCE=.\Event_Handler_T.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_EVENT_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Event_Handler_T.h"\

+	".\Event_Handler_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_EVENT_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Event_Handler_T.h"\

+	".\Event_Handler_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -897,8 +3694,84 @@ SOURCE=.\FIFO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FIFO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -920,8 +3793,88 @@ SOURCE=.\FIFO_Recv.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FIFO_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -943,8 +3896,92 @@ SOURCE=.\FIFO_Recv_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\FIFO_Recv_Msg.h"\

+	".\FIFO_Recv_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FIFO_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\FIFO_Recv_Msg.h"\

+	".\FIFO_Recv_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -966,8 +4003,88 @@ SOURCE=.\FIFO_Send.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FIFO_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -989,8 +4106,92 @@ SOURCE=.\FIFO_Send_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\FIFO_Send_Msg.h"\

+	".\FIFO_Send_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FIFO_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\FIFO_Send_Msg.h"\

+	".\FIFO_Send_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1012,8 +4213,92 @@ SOURCE=.\FILE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FILE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1035,8 +4320,84 @@ SOURCE=.\FILE_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FILE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1058,8 +4419,100 @@ SOURCE=.\FILE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_Connector.h"\

+	".\FILE_Connector.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FILE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_Connector.h"\

+	".\FILE_Connector.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1081,8 +4534,96 @@ SOURCE=.\FILE_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FILE_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1104,8 +4645,196 @@ SOURCE=.\Filecache.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FILEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FILEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1127,8 +4856,86 @@ SOURCE=.\Functor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FUNCT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FUNCT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1150,8 +4957,106 @@ SOURCE=.\Future.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_FUTUR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Future.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_FUTUR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Future.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1173,8 +5078,80 @@ SOURCE=.\Get_Opt.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_GET_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_GET_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1196,8 +5173,80 @@ SOURCE=.\Handle_Set.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_HANDL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_HANDL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1265,8 +5314,150 @@ SOURCE=.\High_Res_Timer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_HIGH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_HIGH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1288,8 +5479,84 @@ SOURCE=.\INET_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_INET_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_INET_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1334,8 +5601,80 @@ SOURCE=.\IO_SAP.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_IO_SA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_IO_SA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1357,8 +5696,96 @@ SOURCE=.\IOStream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_IOSTR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IOStream.h"\

+	".\IOStream_T.cpp"\

+	".\IOStream_T.h"\

+	".\IOStream_T.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_IOSTR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IOStream.h"\

+	".\IOStream_T.cpp"\

+	".\IOStream_T.h"\

+	".\IOStream_T.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1380,8 +5807,80 @@ SOURCE=.\IPC_SAP.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_IPC_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_IPC_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1403,8 +5902,248 @@ SOURCE=.\Local_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LOCAL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LOCAL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1426,8 +6165,192 @@ SOURCE=.\Local_Tokens.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LOCAL_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LOCAL_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1449,8 +6372,192 @@ SOURCE=.\Log_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LOG_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LOG_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1472,8 +6579,76 @@ SOURCE=.\Log_Record.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LOG_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LOG_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1495,8 +6670,92 @@ SOURCE=.\LSOCK.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1518,8 +6777,122 @@ SOURCE=.\LSOCK_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Acceptor.h"\

+	".\LSOCK_Acceptor.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Acceptor.h"\

+	".\LSOCK_Acceptor.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1541,8 +6914,104 @@ SOURCE=.\LSOCK_CODgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_CODgram.h"\

+	".\LSOCK_CODgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_CODgram.h"\

+	".\LSOCK_CODgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1564,8 +7033,122 @@ SOURCE=.\LSOCK_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Connector.h"\

+	".\LSOCK_Connector.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Connector.h"\

+	".\LSOCK_Connector.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1587,8 +7170,100 @@ SOURCE=.\LSOCK_Dgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Dgram.h"\

+	".\LSOCK_Dgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Dgram.h"\

+	".\LSOCK_Dgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1610,8 +7285,112 @@ SOURCE=.\LSOCK_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_LSOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1633,8 +7412,142 @@ SOURCE=.\Malloc.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MALLO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MALLO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1679,8 +7592,80 @@ SOURCE=.\Mem_Map.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MEM_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MEM_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1702,8 +7687,142 @@ SOURCE=.\Memory_Pool.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MEMOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MEMOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1725,8 +7844,170 @@ SOURCE=.\Message_Block.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MESSA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MESSA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1756,8 +8037,246 @@ SOURCE=.\Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MESSAG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MESSAG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1779,8 +8298,78 @@ SOURCE=.\Method_Request.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_METHO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_METHO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1802,8 +8391,250 @@ SOURCE=.\Msg_WFMO_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MSG_W=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Msg_WFMO_Reactor.h"\

+	".\Msg_WFMO_Reactor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MSG_W=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Msg_WFMO_Reactor.h"\

+	".\Msg_WFMO_Reactor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1825,8 +8656,278 @@ SOURCE=.\Multiplexor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_MULTI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Multiplexor.h"\

+	".\Multiplexor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_MULTI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Multiplexor.h"\

+	".\Multiplexor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1848,8 +8949,212 @@ SOURCE=.\Name_Proxy.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_NAME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1871,8 +9176,80 @@ SOURCE=.\Name_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_NAME_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1894,8 +9271,214 @@ SOURCE=.\Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_NAME_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1917,8 +9500,258 @@ SOURCE=.\Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_NAMIN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_NAMIN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1940,8 +9773,272 @@ SOURCE=.\NT_Service.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_NT_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\NT_Service.h"\

+	".\NT_Service.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_NT_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\NT_Service.h"\

+	".\NT_Service.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1963,8 +10060,238 @@ SOURCE=.\Object_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_OBJEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_OBJEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -1986,8 +10313,146 @@ SOURCE=.\Obstack.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_OBSTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_OBSTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2009,8 +10474,276 @@ SOURCE=.\OS.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_OS_CP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_OS_CP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2055,8 +10788,272 @@ SOURCE=.\Parse_Node.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PARSE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PARSE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2078,8 +11075,114 @@ SOURCE=.\Pipe.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2101,8 +11204,220 @@ SOURCE=.\Priority_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PRIOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Priority_Reactor.h"\

+	".\Priority_Reactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PRIOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Priority_Reactor.h"\

+	".\Priority_Reactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2124,8 +11439,302 @@ SOURCE=.\Proactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PROAC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PROAC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2147,8 +11756,150 @@ SOURCE=.\Process.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PROCE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PROCE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2170,8 +11921,112 @@ SOURCE=.\Process_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PROCES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Process_Manager.h"\

+	".\Process_Manager.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PROCES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Process_Manager.h"\

+	".\Process_Manager.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2193,8 +12048,191 @@ SOURCE=.\Profile_Timer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_PROFI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Profile_Timer.h"\

+	".\Profile_Timer.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_PROFI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Profile_Timer.h"\

+	".\Profile_Timer.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=.\RB_Tree.cpp

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+DEP_CPP_RB_TR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\RB_Tree.h"\

+	".\RB_Tree.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+DEP_CPP_RB_TR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\RB_Tree.h"\

+	".\RB_Tree.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2216,8 +12254,292 @@ SOURCE=.\Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_REACT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Msg_WFMO_Reactor.h"\

+	".\Msg_WFMO_Reactor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_REACT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Msg_WFMO_Reactor.h"\

+	".\Msg_WFMO_Reactor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2239,8 +12561,178 @@ SOURCE=.\Read_Buffer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_READ_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Read_Buffer.h"\

+	".\Read_Buffer.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_READ_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Read_Buffer.h"\

+	".\Read_Buffer.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2262,8 +12754,144 @@ SOURCE=.\Registry.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_REGIS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Registry.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_REGIS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Registry.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2285,8 +12913,220 @@ SOURCE=.\Registry_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_REGIST=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_REGIST=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2308,8 +13148,216 @@ SOURCE=.\Remote_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_REMOT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_REMOT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2331,8 +13379,232 @@ SOURCE=.\Remote_Tokens.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_REMOTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_REMOTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2354,8 +13626,80 @@ SOURCE=.\Sched_Params.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SCHED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SCHED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2377,8 +13721,216 @@ SOURCE=.\Select_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SELEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SELEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2400,8 +13952,212 @@ SOURCE=.\Select_Reactor_Base.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2423,8 +14179,354 @@ SOURCE=.\Service_Config.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SERVI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SERVI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2446,8 +14548,284 @@ SOURCE=.\Service_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SERVIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SERVIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2469,8 +14847,116 @@ SOURCE=.\Service_Object.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SERVICE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2492,8 +14978,120 @@ SOURCE=.\Service_Repository.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SERVICE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2515,8 +15113,276 @@ SOURCE=.\Service_Types.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE_T=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SERVICE_T=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2538,8 +15404,78 @@ SOURCE=.\Shared_Memory.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SHARE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SHARE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2561,8 +15497,86 @@ SOURCE=.\Shared_Memory_MM.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_MM.h"\

+	".\Shared_Memory_MM.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SHARED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_MM.h"\

+	".\Shared_Memory_MM.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2584,8 +15598,86 @@ SOURCE=.\Shared_Memory_SV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_SV.h"\

+	".\Shared_Memory_SV.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SHARED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_SV.h"\

+	".\Shared_Memory_SV.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2607,8 +15699,80 @@ SOURCE=.\Shared_Object.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SHARED_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2630,8 +15794,142 @@ SOURCE=.\Signal.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SIGNA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SIGNA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2653,8 +15951,88 @@ SOURCE=.\SOCK.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2676,8 +16054,134 @@ SOURCE=.\SOCK_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2699,8 +16203,96 @@ SOURCE=.\SOCK_CODgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2722,8 +16314,110 @@ SOURCE=.\SOCK_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2745,8 +16439,124 @@ SOURCE=.\SOCK_Dgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2768,8 +16578,100 @@ SOURCE=.\SOCK_Dgram_Bcast.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_DG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Bcast.h"\

+	".\SOCK_Dgram_Bcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_DG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Bcast.h"\

+	".\SOCK_Dgram_Bcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2791,8 +16693,100 @@ SOURCE=.\SOCK_Dgram_Mcast.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_DGR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Mcast.h"\

+	".\SOCK_Dgram_Mcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_DGR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Mcast.h"\

+	".\SOCK_Dgram_Mcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2814,8 +16808,96 @@ SOURCE=.\SOCK_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2837,8 +16919,100 @@ SOURCE=.\SOCK_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2860,8 +17034,92 @@ SOURCE=.\SPIPE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2883,8 +17141,126 @@ SOURCE=.\SPIPE_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2906,8 +17282,84 @@ SOURCE=.\SPIPE_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SPIPE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2929,8 +17381,100 @@ SOURCE=.\SPIPE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SPIPE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2952,8 +17496,96 @@ SOURCE=.\SPIPE_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2975,8 +17607,174 @@ SOURCE=.\SString.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SSTRI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SSTRI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -2998,8 +17796,146 @@ SOURCE=.\Stats.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_STATS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_STATS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3021,8 +17957,246 @@ SOURCE=.\Strategies.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_STRAT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_STRAT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3044,8 +18218,80 @@ SOURCE=.\SV_Message.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SV_ME=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SV_ME=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3067,8 +18313,84 @@ SOURCE=.\SV_Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SV_MES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SV_MES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3090,8 +18412,84 @@ SOURCE=.\SV_Semaphore_Complex.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SV_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3113,8 +18511,80 @@ SOURCE=.\SV_Semaphore_Simple.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SEM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SV_SEM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3136,8 +18606,80 @@ SOURCE=.\SV_Shared_Memory.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SV_SH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3159,8 +18701,188 @@ SOURCE=.\Svc_Conf_l.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SVC_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3182,8 +18904,290 @@ SOURCE=.\Svc_Conf_y.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SVC_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3205,8 +19209,282 @@ SOURCE=.\Svc_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_H=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Svc_Handler.h"\

+	".\Svc_Handler.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SVC_H=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Svc_Handler.h"\

+	".\Svc_Handler.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3228,8 +19506,104 @@ SOURCE=.\Synch.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SYNCH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SYNCH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3251,8 +19625,80 @@ SOURCE=.\Synch_Options.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SYNCH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SYNCH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3274,8 +19720,144 @@ SOURCE=.\System_Time.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_SYSTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\System_Time.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_SYSTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\System_Time.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3297,8 +19879,268 @@ SOURCE=.\Task.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TASK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TASK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3320,8 +20162,80 @@ SOURCE=.\Thread.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_THREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_THREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3343,8 +20257,156 @@ SOURCE=.\Thread_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_THREAD=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_THREAD=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3366,8 +20428,80 @@ SOURCE=.\Time_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Request_Reply.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Request_Reply.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3389,8 +20523,160 @@ SOURCE=.\Timeprobe.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMEP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMEP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3412,8 +20698,166 @@ SOURCE=.\Timer_Hash.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3435,8 +20879,168 @@ SOURCE=.\Timer_Heap.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3458,8 +21062,168 @@ SOURCE=.\Timer_List.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_L=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER_L=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3481,8 +21245,168 @@ SOURCE=.\Timer_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_Q=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER_Q=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3504,8 +21428,272 @@ SOURCE=.\Timer_Queue_Adapters.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_QU=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_Adapters.h"\

+	".\Timer_Queue_Adapters.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER_QU=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_Adapters.h"\

+	".\Timer_Queue_Adapters.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3527,8 +21715,158 @@ SOURCE=.\Timer_Wheel.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_W=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TIMER_W=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3550,8 +21888,88 @@ SOURCE=.\TLI.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TLI_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3573,8 +21991,102 @@ SOURCE=.\TLI_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Acceptor.h"\

+	".\TLI_Acceptor.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TLI_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Acceptor.h"\

+	".\TLI_Acceptor.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3596,8 +22108,104 @@ SOURCE=.\TLI_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Connector.h"\

+	".\TLI_Connector.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TLI_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Connector.h"\

+	".\TLI_Connector.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3619,8 +22227,96 @@ SOURCE=.\TLI_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TLI_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3642,8 +22338,108 @@ SOURCE=.\Token.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TOKEN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3665,8 +22461,192 @@ SOURCE=.\Token_Collection.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Collection.h"\

+	".\Token_Collection.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TOKEN_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Collection.h"\

+	".\Token_Collection.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3688,8 +22668,192 @@ SOURCE=.\Token_Invariants.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TOKEN_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3711,8 +22875,192 @@ SOURCE=.\Token_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TOKEN_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3734,8 +23082,194 @@ SOURCE=.\Token_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TOKEN_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3757,8 +23291,220 @@ SOURCE=.\TP_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TP_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TP_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3780,8 +23526,78 @@ SOURCE=.\Trace.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TRACE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Trace.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TRACE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Trace.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3803,8 +23619,102 @@ SOURCE=.\TTY_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TTY_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\TTY_IO.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TTY_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\TTY_IO.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3826,8 +23736,80 @@ SOURCE=.\Typed_SV_Message.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TYPED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TYPED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3849,8 +23831,94 @@ SOURCE=.\Typed_SV_Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_TYPED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\Typed_SV_Message.cpp"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\Typed_SV_Message_Queue.h"\

+	".\Typed_SV_Message_Queue.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_TYPED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\Typed_SV_Message.cpp"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\Typed_SV_Message_Queue.h"\

+	".\Typed_SV_Message_Queue.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3872,8 +23940,84 @@ SOURCE=.\UNIX_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_UNIX_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_UNIX_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3895,8 +24039,308 @@ SOURCE=.\UPIPE_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_UPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Acceptor.h"\

+	".\UPIPE_Acceptor.i"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_UPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Acceptor.h"\

+	".\UPIPE_Acceptor.i"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3918,8 +24362,306 @@ SOURCE=.\UPIPE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_UPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Connector.h"\

+	".\UPIPE_Connector.i"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_UPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Connector.h"\

+	".\UPIPE_Connector.i"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3941,8 +24683,298 @@ SOURCE=.\UPIPE_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_UPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_UPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -3964,53 +24996,251 @@ SOURCE=.\WFMO_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Asynch_IO.cpp

-

-!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+DEP_CPP_WFMO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.cpp

-

-!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+DEP_CPP_WFMO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

@@ -4033,8 +25263,252 @@ SOURCE=.\XtReactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

 

+DEP_CPP_XTREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	".\XtReactor.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

 

+DEP_CPP_XTREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	".\XtReactor.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

 

 !ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

@@ -5676,7 +27150,25 @@ SOURCE=.\Map_Manager.cpp
 # Begin Source File

 

 SOURCE=.\Map_T.cpp

-# PROP Exclude_From_Build 1

+

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

@@ -5730,12 +27222,25 @@ SOURCE=.\Module.cpp
 # Begin Source File

 

 SOURCE=.\Pair_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\RB_Tree.cpp

-# PROP Exclude_From_Build 1

+!IF  "$(CFG)" == "ACE dynamic library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE dynamic library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index 7932b4fed75..a5d4c0667b9 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -31,7 +31,7 @@ CFG=ACE static library - Win32 Alpha Unicode Debug
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

+# PROP Scc_LocalPath ""

 

 !IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

@@ -46,7 +46,7 @@ CFG=ACE static library - Win32 Alpha Unicode Debug
 # PROP Intermediate_Dir ".\LIB\Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

@@ -72,8 +72,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -98,8 +98,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Unicode_Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "..\STL" /I "..\\" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "_DEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -124,8 +124,8 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir ".\LIB\Unicode_Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

+# ADD BASE CPP /nologo /G5 /MT /W3 /GX /O1 /I "..\STL" /I "..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O1 /I "..\\" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "NDEBUG" /D "UNICODE" /D "WIN32" /D "_WINDOWS" /FD /c

 # SUBTRACT CPP /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409

@@ -150,8 +150,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Lib\Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c

-# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /MTd /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -172,8 +174,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Lib\Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" FD I "..\\ /D " WIN32" c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O1 /I "..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -194,8 +198,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Unicode_Debug"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX Zi Od Gy D "_DEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c

-# ADD CPP /nologo /MTd /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /Gy /I "..\\ /D " WIN32" /D "_DEBUG" /D "_WINDOWS" /D "UNICODE" /FD /MTd /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -216,8 +222,10 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LIB\Unicode_Release"

 # PROP Target_Dir ""

 CPP=cl.exe

-# ADD BASE CPP /Gt0 nologo Gt0 W3 GX O1 D "NDEBUG" D "_WINDOWS" D "UNICODE" FD I "..\\ /D " WIN32" c

-# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /D "WIN32" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /FD /c

+# ADD BASE CPP /nologo /Gt0 /W3 /GX /O1 /I "..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /c

+# SUBTRACT BASE CPP /YX

+# ADD CPP /nologo /MT /Gt0 /W3 /GX /O1 /I "..\\ /D " WIN32" /D "NDEBUG" /D "_WINDOWS" /D "UNICODE" /FD /c

+# SUBTRACT CPP /YX

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo /o".\ace.bsc"

 # ADD BSC32 /nologo /o".\ace.bsc"

@@ -239,7 +247,7 @@ LIB32=link.exe -lib
 # Name "ACE static library - Win32 Alpha Unicode Release"

 # Begin Group "Source Files"

 

-# PROP Default_Filter "cpp"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\ACE.cpp

@@ -254,6 +262,51 @@ SOURCE=.\ACE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_ACE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Version.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -277,6 +330,128 @@ SOURCE=.\Activation_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_ACTIV=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Activation_Queue.h"\

+	".\Activation_Queue.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -323,6 +498,42 @@ SOURCE=.\Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_ADDR_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -346,6 +557,41 @@ SOURCE=.\Arg_Shifter.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_ARG_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Arg_Shifter.h"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -369,6 +615,75 @@ SOURCE=.\ARGV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_ARGV_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -392,28 +707,156 @@ SOURCE=.\Asynch_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Asynch_IO_Impl.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_ASYNC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -438,28 +881,203 @@ SOURCE=.\Basic_Types.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\CDR_Stream.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_BASIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Template_Instantiations.cpp"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -492,6 +1110,73 @@ SOURCE=.\Containers.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_CONTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -515,6 +1200,95 @@ SOURCE=.\CORBA_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_CORBA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\CORBA_Handler.h"\

+	".\CORBA_Handler.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -538,6 +1312,42 @@ SOURCE=.\CORBA_Ref.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_CORBA_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\CORBA_Ref.h"\

+	".\CORBA_Ref.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -561,6 +1371,42 @@ SOURCE=.\Date_Time.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DATE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Date_Time.h"\

+	".\Date_Time.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -584,6 +1430,48 @@ SOURCE=.\DEV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -607,6 +1495,44 @@ SOURCE=.\DEV_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -630,6 +1556,52 @@ SOURCE=.\DEV_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -653,6 +1625,50 @@ SOURCE=.\DEV_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DEV_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -676,6 +1692,10 @@ SOURCE=.\Dirent.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DIREN=\

+	".\Dirent.i"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -699,6 +1719,41 @@ SOURCE=.\DLL.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DLL_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DLL.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -722,6 +1777,57 @@ SOURCE=.\Dump.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DUMP_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dump.h"\

+	".\Dump_T.cpp"\

+	".\Dump_T.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -745,6 +1851,59 @@ SOURCE=.\Dynamic.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DYNAM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -768,6 +1927,94 @@ SOURCE=.\Dynamic_Service.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_DYNAMI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic_Service.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -791,6 +2038,89 @@ SOURCE=.\Event_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_EVENT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -814,6 +2144,44 @@ SOURCE=.\Event_Handler_T.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_EVENT_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Event_Handler_T.h"\

+	".\Event_Handler_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -837,6 +2205,44 @@ SOURCE=.\FIFO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -860,6 +2266,46 @@ SOURCE=.\FIFO_Recv.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -883,6 +2329,48 @@ SOURCE=.\FIFO_Recv_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Recv.h"\

+	".\FIFO_Recv.i"\

+	".\FIFO_Recv_Msg.h"\

+	".\FIFO_Recv_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -906,6 +2394,46 @@ SOURCE=.\FIFO_Send.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -929,6 +2457,48 @@ SOURCE=.\FIFO_Send_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FIFO_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FIFO.h"\

+	".\FIFO.i"\

+	".\FIFO_Send.h"\

+	".\FIFO_Send.i"\

+	".\FIFO_Send_Msg.h"\

+	".\FIFO_Send_Msg.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -952,6 +2522,48 @@ SOURCE=.\FILE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -975,6 +2587,44 @@ SOURCE=.\FILE_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -998,6 +2648,52 @@ SOURCE=.\FILE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_Connector.h"\

+	".\FILE_Connector.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1021,6 +2717,50 @@ SOURCE=.\FILE_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FILE_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\FILE.h"\

+	".\FILE.i"\

+	".\FILE_Addr.h"\

+	".\FILE_Addr.i"\

+	".\FILE_IO.h"\

+	".\FILE_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1044,28 +2784,99 @@ SOURCE=.\Filecache.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Functor.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_FILEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Filecache.h"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -1090,6 +2901,55 @@ SOURCE=.\Future.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_FUTUR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Future.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1113,6 +2973,42 @@ SOURCE=.\Get_Opt.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_GET_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1136,6 +3032,42 @@ SOURCE=.\Handle_Set.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_HANDL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1159,6 +3091,99 @@ SOURCE=.\Hash_Map_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_HASH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1182,6 +3207,77 @@ SOURCE=.\High_Res_Timer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_HIGH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1205,6 +3301,44 @@ SOURCE=.\INET_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_INET_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1251,6 +3385,42 @@ SOURCE=.\IO_SAP.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_IO_SA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1274,6 +3444,50 @@ SOURCE=.\IOStream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_IOSTR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IOStream.h"\

+	".\IOStream_T.cpp"\

+	".\IOStream_T.h"\

+	".\IOStream_T.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1297,6 +3511,42 @@ SOURCE=.\IPC_SAP.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_IPC_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1320,6 +3570,126 @@ SOURCE=.\Local_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LOCAL=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1343,6 +3713,98 @@ SOURCE=.\Local_Tokens.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LOCAL_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1366,6 +3828,98 @@ SOURCE=.\Log_Msg.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LOG_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1389,6 +3943,40 @@ SOURCE=.\Log_Record.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LOG_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1412,6 +4000,48 @@ SOURCE=.\LSOCK.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1435,6 +4065,63 @@ SOURCE=.\LSOCK_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Acceptor.h"\

+	".\LSOCK_Acceptor.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1458,6 +4145,54 @@ SOURCE=.\LSOCK_CODgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_CODgram.h"\

+	".\LSOCK_CODgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1481,6 +4216,63 @@ SOURCE=.\LSOCK_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Connector.h"\

+	".\LSOCK_Connector.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1504,6 +4296,52 @@ SOURCE=.\LSOCK_Dgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Dgram.h"\

+	".\LSOCK_Dgram.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1527,6 +4365,58 @@ SOURCE=.\LSOCK_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_LSOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\LSOCK.h"\

+	".\LSOCK.i"\

+	".\LSOCK_Stream.h"\

+	".\LSOCK_Stream.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1550,6 +4440,73 @@ SOURCE=.\Malloc.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MALLO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1596,6 +4553,42 @@ SOURCE=.\Mem_Map.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MEM_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1619,6 +4612,73 @@ SOURCE=.\Memory_Pool.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MEMOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1642,6 +4702,87 @@ SOURCE=.\Message_Block.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MESSA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1673,6 +4814,125 @@ SOURCE=.\Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MESSAG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1696,28 +4956,40 @@ SOURCE=.\Method_Request.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\Msg_WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_METHO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Method_Request.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -1742,6 +5014,141 @@ SOURCE=.\Multiplexor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_MULTI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Multiplexor.h"\

+	".\Multiplexor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1765,6 +5172,108 @@ SOURCE=.\Name_Proxy.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1788,6 +5297,42 @@ SOURCE=.\Name_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Name_Request_Reply.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1811,6 +5356,109 @@ SOURCE=.\Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_NAME_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1834,6 +5482,131 @@ SOURCE=.\Naming_Context.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_NAMIN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Name_Space.h"\

+	".\Local_Name_Space_T.cpp"\

+	".\Local_Name_Space_T.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1857,6 +5630,138 @@ SOURCE=.\NT_Service.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_NT_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\NT_Service.h"\

+	".\NT_Service.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1880,6 +5785,121 @@ SOURCE=.\Object_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_OBJEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1903,6 +5923,75 @@ SOURCE=.\Obstack.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_OBSTA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1926,6 +6015,140 @@ SOURCE=.\OS.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_OS_CP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1972,6 +6195,138 @@ SOURCE=.\Parse_Node.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PARSE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -1995,6 +6350,59 @@ SOURCE=.\Pipe.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2018,6 +6426,112 @@ SOURCE=.\Priority_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PRIOR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Priority_Reactor.h"\

+	".\Priority_Reactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2041,6 +6555,153 @@ SOURCE=.\Proactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PROAC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2064,6 +6725,77 @@ SOURCE=.\Process.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PROCE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2087,6 +6819,58 @@ SOURCE=.\Process_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PROCES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Process.h"\

+	".\Process.i"\

+	".\Process_Manager.h"\

+	".\Process_Manager.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2110,6 +6894,45 @@ SOURCE=.\Profile_Timer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_PROFI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Profile_Timer.h"\

+	".\Profile_Timer.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2133,6 +6956,148 @@ SOURCE=.\Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_REACT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Msg_WFMO_Reactor.h"\

+	".\Msg_WFMO_Reactor.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2156,6 +7121,91 @@ SOURCE=.\Read_Buffer.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_READ_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Read_Buffer.h"\

+	".\Read_Buffer.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2179,6 +7229,74 @@ SOURCE=.\Registry.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_REGIS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Registry.h"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2202,6 +7320,112 @@ SOURCE=.\Registry_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_REGIST=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Naming_Context.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Registry.h"\

+	".\Registry_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2225,6 +7449,110 @@ SOURCE=.\Remote_Name_Space.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_REMOT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Name_Proxy.h"\

+	".\Name_Request_Reply.h"\

+	".\Name_Space.h"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Name_Space.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2248,6 +7576,118 @@ SOURCE=.\Remote_Tokens.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_REMOTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Remote_Tokens.h"\

+	".\Remote_Tokens.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2271,6 +7711,42 @@ SOURCE=.\Sched_Params.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SCHED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Sched_Params.h"\

+	".\Sched_Params.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2294,6 +7770,110 @@ SOURCE=.\Select_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SELEC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2317,6 +7897,108 @@ SOURCE=.\Select_Reactor_Base.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SELECT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2340,6 +8022,179 @@ SOURCE=.\Service_Config.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SERVI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Asynch_IO.h"\

+	".\Asynch_IO.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Proactor.h"\

+	".\Proactor.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2363,6 +8218,144 @@ SOURCE=.\Service_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SERVIC=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Get_Opt.h"\

+	".\Get_Opt.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Manager.h"\

+	".\Service_Manager.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2386,6 +8379,60 @@ SOURCE=.\Service_Object.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2409,6 +8456,62 @@ SOURCE=.\Service_Repository.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2432,6 +8535,140 @@ SOURCE=.\Service_Types.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SERVICE_T=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2455,6 +8692,41 @@ SOURCE=.\Shared_Memory.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SHARE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2478,6 +8750,45 @@ SOURCE=.\Shared_Memory_MM.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_MM.h"\

+	".\Shared_Memory_MM.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2501,6 +8812,45 @@ SOURCE=.\Shared_Memory_SV.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Memory.h"\

+	".\Shared_Memory_SV.h"\

+	".\Shared_Memory_SV.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2524,6 +8874,42 @@ SOURCE=.\Shared_Object.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SHARED_O=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2547,6 +8933,73 @@ SOURCE=.\Signal.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SIGNA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2570,6 +9023,46 @@ SOURCE=.\SOCK.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2593,6 +9086,69 @@ SOURCE=.\SOCK_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2616,6 +9172,50 @@ SOURCE=.\SOCK_CODgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_CODgram.h"\

+	".\SOCK_CODgram.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2639,6 +9239,57 @@ SOURCE=.\SOCK_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2662,6 +9313,64 @@ SOURCE=.\SOCK_Dgram.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_D=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2685,6 +9394,52 @@ SOURCE=.\SOCK_Dgram_Bcast.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_DG=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Bcast.h"\

+	".\SOCK_Dgram_Bcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2708,6 +9463,52 @@ SOURCE=.\SOCK_Dgram_Mcast.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_DGR=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Dgram.h"\

+	".\SOCK_Dgram.i"\

+	".\SOCK_Dgram_Mcast.h"\

+	".\SOCK_Dgram_Mcast.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2731,6 +9532,50 @@ SOURCE=.\SOCK_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2754,6 +9599,52 @@ SOURCE=.\SOCK_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SOCK_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2777,6 +9668,48 @@ SOURCE=.\SPIPE.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2800,6 +9733,65 @@ SOURCE=.\SPIPE_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2823,6 +9815,44 @@ SOURCE=.\SPIPE_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2846,6 +9876,52 @@ SOURCE=.\SPIPE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Connector.h"\

+	".\SPIPE_Connector.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2869,6 +9945,50 @@ SOURCE=.\SPIPE_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2892,6 +10012,89 @@ SOURCE=.\SString.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SSTRI=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2915,6 +10118,75 @@ SOURCE=.\Stats.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_STATS=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Stats.h"\

+	".\Stats.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2938,6 +10210,125 @@ SOURCE=.\Strategies.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_STRAT=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2961,6 +10352,42 @@ SOURCE=.\SV_Message.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SV_ME=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -2984,6 +10411,44 @@ SOURCE=.\SV_Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SV_MES=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3007,6 +10472,44 @@ SOURCE=.\SV_Semaphore_Complex.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3030,6 +10533,42 @@ SOURCE=.\SV_Semaphore_Simple.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SEM=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3053,6 +10592,42 @@ SOURCE=.\SV_Shared_Memory.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SV_SH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Shared_Memory.h"\

+	".\SV_Shared_Memory.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3076,6 +10651,96 @@ SOURCE=.\Svc_Conf_l.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3099,6 +10764,147 @@ SOURCE=.\Svc_Conf_y.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\ARGV.h"\

+	".\ARGV.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\Obstack.h"\

+	".\Obstack.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Parse_Node.h"\

+	".\Parse_Node.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf.h"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3122,6 +10928,143 @@ SOURCE=.\Svc_Handler.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SVC_H=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Svc_Handler.h"\

+	".\Svc_Handler.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3145,6 +11088,54 @@ SOURCE=.\Synch.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SYNCH=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3168,6 +11159,42 @@ SOURCE=.\Synch_Options.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SYNCH_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3191,6 +11218,74 @@ SOURCE=.\System_Time.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_SYSTE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\System_Time.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3214,6 +11309,136 @@ SOURCE=.\Task.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TASK_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3237,6 +11462,42 @@ SOURCE=.\Thread.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_THREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3260,6 +11521,80 @@ SOURCE=.\Thread_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_THREAD=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Dynamic.h"\

+	".\Dynamic.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3283,6 +11618,42 @@ SOURCE=.\Time_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIME_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Request_Reply.h"\

+	".\Time_Value.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3306,6 +11677,82 @@ SOURCE=.\Timeprobe.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMEP=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\Singleton.cpp"\

+	".\Singleton.h"\

+	".\Singleton.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timeprobe.h"\

+	".\Timeprobe.i"\

+	".\Timeprobe_T.cpp"\

+	".\Timeprobe_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3329,6 +11776,85 @@ SOURCE=.\Timer_Hash.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3352,6 +11878,86 @@ SOURCE=.\Timer_Heap.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3375,6 +11981,86 @@ SOURCE=.\Timer_List.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_L=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3398,6 +12084,86 @@ SOURCE=.\Timer_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_Q=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Hash.h"\

+	".\Timer_Hash_T.cpp"\

+	".\Timer_Hash_T.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_List_T.cpp"\

+	".\Timer_List_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3421,6 +12187,138 @@ SOURCE=.\Timer_Queue_Adapters.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_QU=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_Adapters.h"\

+	".\Timer_Queue_Adapters.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3444,6 +12342,81 @@ SOURCE=.\Timer_Wheel.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TIMER_W=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\High_Res_Timer.h"\

+	".\High_Res_Timer.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Timer_Wheel.h"\

+	".\Timer_Wheel_T.cpp"\

+	".\Timer_Wheel_T.h"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3467,6 +12440,46 @@ SOURCE=.\TLI.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_C=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3490,6 +12503,53 @@ SOURCE=.\TLI_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_A=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Time_Value.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Acceptor.h"\

+	".\TLI_Acceptor.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3513,6 +12573,54 @@ SOURCE=.\TLI_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_CO=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Connector.h"\

+	".\TLI_Connector.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3536,6 +12644,50 @@ SOURCE=.\TLI_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TLI_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\TLI.h"\

+	".\TLI.i"\

+	".\TLI_Stream.h"\

+	".\TLI_Stream.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3559,6 +12711,56 @@ SOURCE=.\Token.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3582,6 +12784,98 @@ SOURCE=.\Token_Collection.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Collection.h"\

+	".\Token_Collection.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3605,6 +12899,98 @@ SOURCE=.\Token_Invariants.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Invariants.h"\

+	".\Token_Invariants.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3628,6 +13014,98 @@ SOURCE=.\Token_Manager.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_M=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Manager.h"\

+	".\Token_Manager.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3651,6 +13129,99 @@ SOURCE=.\Token_Request_Reply.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TOKEN_R=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token_Request_Reply.h"\

+	".\Token_Request_Reply.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3674,6 +13245,112 @@ SOURCE=.\TP_Reactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TP_RE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\TP_Reactor.h"\

+	".\TP_Reactor.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3697,6 +13374,41 @@ SOURCE=.\Trace.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TRACE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Trace.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3720,6 +13432,53 @@ SOURCE=.\TTY_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TTY_I=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\DEV.h"\

+	".\DEV.i"\

+	".\DEV_Addr.h"\

+	".\DEV_Addr.i"\

+	".\DEV_Connector.h"\

+	".\DEV_Connector.i"\

+	".\DEV_IO.h"\

+	".\DEV_IO.i"\

+	".\inc_user_config.h"\

+	".\IO_SAP.h"\

+	".\IO_SAP.i"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\TTY_IO.h"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3743,6 +13502,42 @@ SOURCE=.\Typed_SV_Message.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TYPED=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3766,6 +13561,49 @@ SOURCE=.\Typed_SV_Message_Queue.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_TYPED_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Message.h"\

+	".\SV_Message.i"\

+	".\SV_Message_Queue.h"\

+	".\SV_Message_Queue.i"\

+	".\Trace.h"\

+	".\Typed_SV_Message.cpp"\

+	".\Typed_SV_Message.h"\

+	".\Typed_SV_Message.i"\

+	".\Typed_SV_Message_Queue.h"\

+	".\Typed_SV_Message_Queue.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3789,6 +13627,44 @@ SOURCE=.\UNIX_Addr.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_UNIX_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\inc_user_config.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc_Base.h"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\Trace.h"\

+	".\UNIX_Addr.h"\

+	".\UNIX_Addr.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3812,6 +13688,156 @@ SOURCE=.\UPIPE_Acceptor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_UPIPE=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Acceptor.h"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Acceptor.h"\

+	".\UPIPE_Acceptor.i"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3835,6 +13861,155 @@ SOURCE=.\UPIPE_Connector.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_UPIPE_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SPIPE_Stream.h"\

+	".\SPIPE_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Connector.h"\

+	".\UPIPE_Connector.i"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3858,28 +14033,150 @@ SOURCE=.\UPIPE_Stream.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WFMO_Reactor.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_UPIPE_S=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Module.cpp"\

+	".\Module.h"\

+	".\Module.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SPIPE.h"\

+	".\SPIPE.i"\

+	".\SPIPE_Addr.h"\

+	".\SPIPE_Addr.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\Stream.cpp"\

+	".\Stream.h"\

+	".\Stream.i"\

+	".\Stream_Modules.cpp"\

+	".\Stream_Modules.h"\

+	".\Stream_Modules.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Task.h"\

+	".\Task.i"\

+	".\Task_T.cpp"\

+	".\Task_T.h"\

+	".\Task_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Time_Value.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\UPIPE_Addr.h"\

+	".\UPIPE_Stream.h"\

+	".\UPIPE_Stream.i"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -3892,7 +14189,7 @@ SOURCE=.\WFMO_Reactor.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\WIN32_Asynch_IO.cpp

+SOURCE=.\WFMO_Reactor.cpp

 

 !IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

@@ -3904,28 +14201,127 @@ SOURCE=.\WIN32_Asynch_IO.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+DEP_CPP_WFMO_=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Functor.h"\

+	".\Functor.i"\

+	".\Functor_T.cpp"\

+	".\Functor_T.h"\

+	".\Functor_T.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\Hash_Map_Manager.h"\

+	".\Hash_Map_Manager.i"\

+	".\Hash_Map_Manager_T.cpp"\

+	".\Hash_Map_Manager_T.h"\

+	".\Hash_Map_Manager_T.i"\

+	".\inc_user_config.h"\

+	".\IO_Cntl_Msg.h"\

+	".\iosfwd.h"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Message_Block.h"\

+	".\Message_Block.i"\

+	".\Message_Block_T.cpp"\

+	".\Message_Block_T.h"\

+	".\Message_Block_T.i"\

+	".\Message_Queue.h"\

+	".\Message_Queue.i"\

+	".\Message_Queue_T.cpp"\

+	".\Message_Queue_T.h"\

+	".\Message_Queue_T.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Service_Repository.h"\

+	".\Service_Repository.i"\

+	".\Service_Types.h"\

+	".\Service_Types.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\Strategies.h"\

+	".\Strategies.i"\

+	".\Strategies_T.cpp"\

+	".\Strategies_T.h"\

+	".\Strategies_T.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Thread_Manager.h"\

+	".\Thread_Manager.i"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Trace.h"\

+	".\WFMO_Reactor.h"\

+	".\WFMO_Reactor.i"\

+	".\ws2tcpip.h"\

+	

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

@@ -3950,6 +14346,128 @@ SOURCE=.\XtReactor.cpp
 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

 

+DEP_CPP_XTREA=\

+	".\ACE.h"\

+	".\ACE.i"\

+	".\Addr.h"\

+	".\Addr.i"\

+	".\Atomic_Op.i"\

+	".\Auto_Ptr.cpp"\

+	".\Auto_Ptr.h"\

+	".\Auto_Ptr.i"\

+	".\Basic_Types.h"\

+	".\Basic_Types.i"\

+	".\config-win32-borland.h"\

+	".\config-win32-common.h"\

+	".\config-win32.h"\

+	".\config-WinCE.h"\

+	".\config.h"\

+	".\Containers.h"\

+	".\Containers.i"\

+	".\Containers_T.cpp"\

+	".\Containers_T.h"\

+	".\Containers_T.i"\

+	".\Event_Handler.h"\

+	".\Event_Handler.i"\

+	".\Free_List.cpp"\

+	".\Free_List.h"\

+	".\Free_List.i"\

+	".\Handle_Set.h"\

+	".\Handle_Set.i"\

+	".\inc_user_config.h"\

+	".\INET_Addr.h"\

+	".\INET_Addr.i"\

+	".\iosfwd.h"\

+	".\IPC_SAP.h"\

+	".\IPC_SAP.i"\

+	".\Local_Tokens.h"\

+	".\Local_Tokens.i"\

+	".\Log_Msg.h"\

+	".\Log_Priority.h"\

+	".\Log_Record.h"\

+	".\Log_Record.i"\

+	".\Malloc.h"\

+	".\Malloc.i"\

+	".\Malloc_Base.h"\

+	".\Malloc_T.cpp"\

+	".\Malloc_T.h"\

+	".\Malloc_T.i"\

+	".\Managed_Object.cpp"\

+	".\Managed_Object.h"\

+	".\Managed_Object.i"\

+	".\Map_Manager.cpp"\

+	".\Map_Manager.h"\

+	".\Map_Manager.i"\

+	".\Mem_Map.h"\

+	".\Mem_Map.i"\

+	".\Memory_Pool.h"\

+	".\Memory_Pool.i"\

+	".\Object_Manager.h"\

+	".\Object_Manager.i"\

+	".\OS.h"\

+	".\OS.i"\

+	".\Pipe.h"\

+	".\Pipe.i"\

+	".\Reactor.h"\

+	".\Reactor.i"\

+	".\Reactor_Impl.h"\

+	".\Select_Reactor.h"\

+	".\Select_Reactor.i"\

+	".\Select_Reactor_Base.h"\

+	".\Select_Reactor_Base.i"\

+	".\Select_Reactor_T.cpp"\

+	".\Select_Reactor_T.h"\

+	".\Select_Reactor_T.i"\

+	".\Service_Config.h"\

+	".\Service_Config.i"\

+	".\Service_Object.h"\

+	".\Service_Object.i"\

+	".\Shared_Object.h"\

+	".\Shared_Object.i"\

+	".\Signal.h"\

+	".\Signal.i"\

+	".\SOCK.h"\

+	".\SOCK.i"\

+	".\SOCK_Acceptor.h"\

+	".\SOCK_Acceptor.i"\

+	".\SOCK_Connector.h"\

+	".\SOCK_Connector.i"\

+	".\SOCK_IO.h"\

+	".\SOCK_IO.i"\

+	".\SOCK_Stream.h"\

+	".\SOCK_Stream.i"\

+	".\SString.h"\

+	".\SString.i"\

+	".\streams.h"\

+	".\SV_Semaphore_Complex.h"\

+	".\SV_Semaphore_Complex.i"\

+	".\SV_Semaphore_Simple.h"\

+	".\SV_Semaphore_Simple.i"\

+	".\Svc_Conf_Tokens.h"\

+	".\Synch.h"\

+	".\Synch.i"\

+	".\Synch_Options.h"\

+	".\Synch_Options.i"\

+	".\Synch_T.cpp"\

+	".\Synch_T.h"\

+	".\Synch_T.i"\

+	".\Thread.h"\

+	".\Thread.i"\

+	".\Time_Value.h"\

+	".\Timer_Heap.h"\

+	".\Timer_Heap_T.cpp"\

+	".\Timer_Heap_T.h"\

+	".\Timer_Queue.h"\

+	".\Timer_Queue_T.cpp"\

+	".\Timer_Queue_T.h"\

+	".\Timer_Queue_T.i"\

+	".\Token.h"\

+	".\Token.i"\

+	".\Trace.h"\

+	".\ws2tcpip.h"\

+	".\XtReactor.h"\

+	

+

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

@@ -3962,7 +14480,7 @@ SOURCE=.\XtReactor.cpp
 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter "h"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Acceptor.h

@@ -4005,10 +14523,6 @@ SOURCE=.\Asynch_IO.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_IO_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Auto_Ptr.h

 # End Source File

 # Begin Source File

@@ -4337,10 +14851,6 @@ SOURCE=.\Proactor.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Proactor_Impl.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Process.h

 # End Source File

 # Begin Source File

@@ -4405,10 +14915,6 @@ SOURCE=.\Service_Object.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Record.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\Service_Repository.h

 # End Source File

 # Begin Source File

@@ -4697,14 +15203,6 @@ SOURCE=.\UPIPE_Stream.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\WIN32_Asynch_IO.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\ws2tcpip.h

 # End Source File

 # Begin Source File

@@ -4714,7 +15212,7 @@ SOURCE=.\XtReactor.h
 # End Group

 # Begin Group "Inline Files"

 

-# PROP Default_Filter "i"

+# PROP Default_Filter ""

 # Begin Source File

 

 SOURCE=.\Acceptor.i

@@ -4749,10 +15247,6 @@ SOURCE=.\Asynch_IO.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Asynch_IO_Impl.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Atomic_Op.i

 # End Source File

 # Begin Source File

@@ -5053,10 +15547,6 @@ SOURCE=.\Service_Object.i
 # End Source File

 # Begin Source File

 

-SOURCE=.\Service_Record.i

-# End Source File

-# Begin Source File

-

 SOURCE=.\Service_Repository.i

 # End Source File

 # Begin Source File

@@ -5259,10 +15749,6 @@ SOURCE=.\UPIPE_Connector.i
 

 SOURCE=.\UPIPE_Stream.i

 # End Source File

-# Begin Source File

-

-SOURCE=.\WIN32_Proactor.i

-# End Source File

 # End Group

 # Begin Group "Template Files"

 

@@ -5411,31 +15897,6 @@ SOURCE=.\Free_List.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Functor_T.cpp

-

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

-

-# PROP Exclude_From_Build 1

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

-

-!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=.\Hash_Map_Manager_T.cpp

 

 !IF  "$(CFG)" == "ACE static library - Win32 Debug"

@@ -5482,11 +15943,15 @@ SOURCE=.\Malloc_T.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Managed_Object.cpp

+SOURCE=.\Map_Manager.cpp

+# PROP BASE Exclude_From_Build 1

+# PROP Exclude_From_Build 1

+# End Source File

+# Begin Source File

 

-!IF  "$(CFG)" == "ACE static library - Win32 Debug"

+SOURCE=.\Map_T.cpp

 

-# PROP Exclude_From_Build 1

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

 

 !ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

 

@@ -5507,17 +15972,6 @@ SOURCE=.\Managed_Object.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Map_Manager.cpp

-# PROP BASE Exclude_From_Build 1

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Map_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

 SOURCE=.\Message_Queue_T.cpp

 

 !IF  "$(CFG)" == "ACE static library - Win32 Debug"

@@ -5568,12 +16022,25 @@ SOURCE=.\Module.cpp
 # Begin Source File

 

 SOURCE=.\Pair_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

 

-SOURCE=.\RB_Tree.cpp

-# PROP Exclude_From_Build 1

+!IF  "$(CFG)" == "ACE static library - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Unicode Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Release"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Debug"

+

+!ELSEIF  "$(CFG)" == "ACE static library - Win32 Alpha Unicode Release"

+

+!ENDIF 

+

 # End Source File

 # Begin Source File

 

diff --git a/ace/config-WinCE.h b/ace/config-WinCE.h
index a7f7309c999..c499ed669fa 100644
--- a/ace/config-WinCE.h
+++ b/ace/config-WinCE.h
@@ -3,10 +3,6 @@
 #ifndef ACE_CONFIG_WINCE_H
 #define ACE_CONFIG_WINCE_H
 
-#if !defined (ACE_HAS_WINCE)
-#define ACE_HAS_WINCE 1
-#endif
-
 // Only DLL version is supported on CE.
 #if defined (ACE_HAS_DLL)
 # undef ACE_HAS_DLL
@@ -20,10 +16,10 @@
 #define ACE_HAS_WINNT4 0
 
 // You must use MFC with ACE on CE.
-//  #if defined (ACE_HAS_MFC)
-//  # undef ACE_HAS_MFC
-//  #endif /* ACE_HAS_MFC */
-//  #define ACE_HAS_MFC 1
+#if defined (ACE_HAS_MFC)
+# undef ACE_HAS_MFC
+#endif /* ACE_HAS_MFC */
+#define ACE_HAS_MFC 1
 
 // So is UNICODE.
 #if defined (ACE_HAS_UNICODE)
@@ -41,12 +37,8 @@
 #endif /* ACE_HAS_STRICT */
 #define ACE_HAS_STRICT 1
 
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
-
-// We need to rename program entry name "main" with ace_ce_main here
-// so that we can call it from CE's bridge class.
-#define ACE_MAIN ace_ce_main
-#define ACE_MAIN_OBJECT_MANAGER
+// Non-static object manager does not quite work with CE (yet.)
+#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 0
 
 // SH3 cross-compiler can't handle inline functions correctly (along with other bugs.)
 #if defined (SH3) && defined (DEBUG)
diff --git a/ace/config-aix-4.1.x.h b/ace/config-aix-4.1.x.h
index 0f74d39a0c1..52f1c1c22be 100644
--- a/ace/config-aix-4.1.x.h
+++ b/ace/config-aix-4.1.x.h
@@ -1,4 +1,142 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/config-aix-4.x.h"
+// The following configuration file is designed to work for OS
+// platforms running AIX 4.1.x using the IBM C++ compiler or g++.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+
+// Compiling for AIX.
+#define AIX
+
+// Grab appropriate settings for compiler in use
+#ifdef __GNUG__
+# include "ace/config-g++-common.h"
+#else
+# define ACE_HAS_EXCEPTIONS
+// Compiler supports the ssize_t typedef.
+# define ACE_HAS_SSIZE_T
+# define ACE_TEMPLATES_REQUIRE_PRAGMA
+#endif
+
+// Use BSD 4.4 socket definitions
+#define _BSD 44
+
+
+// Platform supports IP multicast
+#define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_DIRENT
+
+#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
+#define ACE_HAS_AIX_HI_RES_TIMER
+#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#define ACE_HAS_UNION_WAIT
+// Optimize ACE_Handle_Set for select().
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+#define ACE_LACKS_RLIMIT
+#define ACE_LACKS_TIMESPEC_T
+#define ACE_HAS_SIGWAIT
+#define ACE_HAS_H_ERRNO
+#define ACE_LACKS_SETSCHED
+#define ACE_LACKS_TCP_H
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+#define ACE_LACKS_THREAD_STACK_ADDR
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to schmidt@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_STRUCT_NETDB_DATA
+#define ACE_HAS_ALLOCA
+#define ACE_HAS_REENTRANT_FUNCTIONS
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_TLI
+#define ACE_HAS_TLI_PROTOTYPES
+#define ACE_HAS_TIUSER_H
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+#define ACE_HAS_CHARPTR_DL
+#define ACE_HAS_POSIX_TIME
+#define ACE_HAS_THREADS
+#if !defined (ACE_MT_SAFE)
+# define ACE_MT_SAFE 1
+#endif
+#define ACE_HAS_UTIME
+#define ACE_HAS_SELECT_H
+#define ACE_NEEDS_DEV_IO_CONVERSION
+
+#define ACE_HAS_MSG
+#define ACE_LACKS_MSG_ACCRIGHTS
+
+// The following two #defines may require OS patches.  If you
+// have trouble building ACE, try commenting them out.
+#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+
+// This environment requires this thing
+#define _BSD_INCLUDES
+
+// Compiler supports the getrusage() system call
+#define ACE_HAS_GETRUSAGE
+
+// Prototypes for both signal() and struct sigaction are consistent.
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+
+// Compiler/platform supports poll().
+#define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+
+// Compiler supports stropts.h
+#define ACE_HAS_STREAMS
+// #define ACE_HAS_STREAM_PIPES
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// EYE the include file is there
+
+// AIX bzero()
+#define ACE_HAS_STRINGS
+
+// ??? has the berkeley stuff
+// #define ACE_HAS_SUNOS4_GETTIMEOFDAY
+#define ACE_HAS_SVR4_GETTIMEOFDAY
+
+// Note, this only works if the flag is set above!
+#define ACE_HAS_GETRUSAGE
+
+// EYE assume it does for now.
+#define ACE_HAS_SIGTHREADMASK
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_DRAFT7
+#define ACE_LACKS_RWLOCK_T
+#define ACE_PTHREADS_MAP
+
+// include there
+#define ACE_HAS_TIMOD_H
+#define ACE_HAS_TIUSER_H
+
+#if !defined (ACE_NTRACE)
+#define ACE_NTRACE 1
+#endif /* ACE_NTRACE */
+#define ACE_HAS_STRBUF_T
+
+#define ACE_HAS_UALARM
+
+#endif /* ACE_CONFIG_H */
diff --git a/ace/config-aix-4.2.x.h b/ace/config-aix-4.2.x.h
index 0f74d39a0c1..9f8fa9f2336 100644
--- a/ace/config-aix-4.2.x.h
+++ b/ace/config-aix-4.2.x.h
@@ -1,4 +1,190 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "ace/config-aix-4.x.h"
+// The following configuration file is designed to work for OS
+// platforms running AIX 4.2.x using the IBM C++ compiler (xlC) or
+// g++/egcs.
+
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+
+#if defined (__xlC__)
+   // AIX xlC compiler
+   //********************************************************************
+   //
+   // Compiler-related definitions.  These are set for C Set ++ V3
+#  define ACE_HAS_EXCEPTIONS
+   // Compiler supports the ssize_t typedef.
+#  define ACE_HAS_SSIZE_T
+
+   // Keep an eye on this as the compiler and standards converge...
+#  define ACE_LACKS_LINEBUFFERED_STREAMBUF
+
+#  define ACE_TEMPLATES_REQUIRE_PRAGMA
+
+#elif defined (__GNUG__)
+# include "ace/config-g++-common.h"
+# define ACE_HAS_STRING_CLASS
+  // Denotes that GNU has cstring.h as standard, to redefine memchr().
+# define ACE_HAS_GNU_CSTRING_H
+# define ACE_MALLOC_ALIGN 8
+
+# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
+    // ACE_MT_SAFE is #defined below, for all compilers.
+#   if !defined (_REENTRANT)
+#     define _REENTRANT
+#   endif /* _REENTRANT */
+# endif /* !ACE_MT_SAFE */
+
+#else  /* ! __xlC__ && ! __GNUG__ */
+# error unsupported compiler in ace/config-aix-4.2.x.h
+#endif /* ! __xlC__ && ! __GNUG__ */
+
+
+// Compiling for AIX.
+#define AIX
+// Use BSD 4.4 socket definitions
+#define _BSD 44
+
+// This environment requires this thing
+#define _BSD_INCLUDES
+
+#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
+
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+
+// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are
+// not up to date.  On up-to-date systems, it should not be required.
+//#define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
+
+#define ACE_HAS_AIX_HI_RES_TIMER
+#define ACE_HAS_ALLOCA
+
+// Compiler/platform has correctly prototyped header files.
+#define ACE_HAS_CPLUSPLUS_HEADERS
+#define ACE_HAS_CHARPTR_DL
+
+// Prototypes for both signal() and struct sigaction are consistent.
+#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+// OS has readdir and friends.
+#define ACE_HAS_DIRENT
+
+// OS supports the getrusage() system call
+#define ACE_HAS_GETRUSAGE
+
+#define ACE_HAS_GPERF
+
+#define ACE_HAS_H_ERRNO
+
+#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+#define ACE_HAS_IP_MULTICAST
+#define ACE_HAS_MSG
+
+// Compiler/platform supports poll().
+#define ACE_HAS_POLL
+
+// Platform supports POSIX O_NONBLOCK semantics.
+#define ACE_HAS_POSIX_NONBLOCK
+
+#define ACE_HAS_POSIX_TIME
+// ... but needs to include another header for it
+#define ACE_HAS_BROKEN_POSIX_TIME
+// ... and needs another typedef
+#define ACE_LACKS_TIMESPEC_T
+#define ACE_HAS_SELECT_H
+
+// Compiler/platform defines the sig_atomic_t typedef
+#define ACE_HAS_SIG_ATOMIC_T
+#define ACE_HAS_SIGINFO_T
+#define ACE_LACKS_SIGINFO_H
+
+#define ACE_HAS_SIN_LEN
+#define ACE_HAS_SIZET_SOCKET_LEN
+#define ACE_HAS_STRBUF_T
+
+// Compiler supports stropts.h
+#define ACE_HAS_STREAMS
+// #define ACE_HAS_STREAM_PIPES
+
+// Compiler/platform supports strerror ().
+#define ACE_HAS_STRERROR
+
+// AIX bzero()
+#define ACE_HAS_STRINGS
+
+#define ACE_HAS_STRUCT_NETDB_DATA
+
+// Dynamic linking is in good shape on newer OS/patch levels.  If you have
+// trouble with the dynamic linking parts of ACE, and can't patch your OS
+// up to latest levels, comment this out.
+#define ACE_HAS_SVR4_DYNAMIC_LINKING
+// This is tightly related to dynamic linking...
+#define ACE_HAS_AUTOMATIC_INIT_FINI
+
+#define ACE_HAS_SVR4_GETTIMEOFDAY
+
+#define ACE_HAS_SYSV_IPC
+#define ACE_HAS_TIMOD_H
+#define ACE_HAS_TIUSER_H
+#define ACE_HAS_TLI
+#define ACE_HAS_TLI_PROTOTYPES
+#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
+
+#define ACE_HAS_UALARM
+#define ACE_HAS_UCONTEXT_T
+#define ACE_HAS_UNION_WAIT
+#define ACE_HAS_UTIME
+
+// Platform has XPG4 wide character type and functions
+#define ACE_HAS_XPG4_MULTIBYTE_CHAR
+
+
+#define ACE_LACKS_TCP_H
+
+#define ACE_NEEDS_DEV_IO_CONVERSION
+
+// Defines the page size of the system.
+#define ACE_PAGE_SIZE 4096
+
+//**************************************************************
+//
+// Threads related definitions.
+//
+// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS).
+// However, there is also a kernel thread ID (tid_t) that is used in
+// ACE_Log_Msg (printing the thread ID).  The tid_t is not the same as
+// pthread_t, and can't derive one from the other - thread_self() gets
+// the tid_t (kernel thread ID) if called from a thread.
+// Thanks very much to Chris Lahey for straightening this out.
+
+#define ACE_HAS_THREADS
+#if !defined (ACE_MT_SAFE)
+#define ACE_MT_SAFE 1
+#endif
+
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_DRAFT7
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+#define ACE_HAS_REENTRANT_FUNCTIONS
+#define ACE_HAS_SIGTHREADMASK
+#define ACE_HAS_SIGWAIT
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+// If ACE doesn't compile due to the lack of these methods, please
+// send email to ace-users@cs.wustl.edu reporting this.
+// #define ACE_LACKS_CONDATTR_PSHARED
+// #define ACE_LACKS_MUTEXATTR_PSHARED
+#define ACE_LACKS_RWLOCK_T
+#define ACE_LACKS_SETSCHED
+#define ACE_LACKS_THREAD_PROCESS_SCOPING
+#define ACE_LACKS_THREAD_STACK_ADDR
+
+// By default, tracing code is not compiled.  To compile it in, cause
+// ACE_NTRACE to not be defined, and rebuild ACE.
+#if !defined (ACE_NTRACE)
+#define ACE_NTRACE 1
+#endif /* ACE_NTRACE */
+
+#endif /* ACE_CONFIG_H */
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
deleted file mode 100644
index dd18973d49b..00000000000
--- a/ace/config-aix-4.x.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for OS
-// platforms running AIX 4.x using the IBM C++ compiler (xlC) or
-// g++/egcs.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-#if defined (__xlC__)
-   // AIX xlC compiler
-   //********************************************************************
-   //
-   // Compiler-related definitions.  These are set for C Set ++ V3
-#  define ACE_HAS_EXCEPTIONS
-   // Compiler supports the ssize_t typedef.
-#  define ACE_HAS_SSIZE_T
-
-   // Keep an eye on this as the compiler and standards converge...
-#  define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#  define ACE_TEMPLATES_REQUIRE_PRAGMA
-
-#  define ACE_LACKS_PRAGMA_ONCE
-
-#elif defined (__GNUG__)
-# include "ace/config-g++-common.h"
-# define ACE_HAS_STRING_CLASS
-  // Denotes that GNU has cstring.h as standard, to redefine memchr().
-# define ACE_HAS_GNU_CSTRING_H
-# define ACE_MALLOC_ALIGN 8
-
-# if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
-    // ACE_MT_SAFE is #defined below, for all compilers.
-#   if !defined (_REENTRANT)
-#     define _REENTRANT
-#   endif /* _REENTRANT */
-# endif /* !ACE_MT_SAFE */
-
-#else  /* ! __xlC__ && ! __GNUG__ */
-# error unsupported compiler in ace/config-aix-4.x.h
-#endif /* ! __xlC__ && ! __GNUG__ */
-
-
-// Compiling for AIX.
-#define AIX
-
-// Use BSD 4.4 socket definitions for pre-AIX 4.2.  The _BSD setting also
-// controls the data type used for waitpid(), wait(), and wait3().
-#if (ACE_AIX_MINOR_VERS < 2)
-#  define _BSD 44
-#  define ACE_HAS_UNION_WAIT
-#endif /* ACE_AIX_MINOR_VERS < 3 */
-
-// This environment requires this thing
-#define _BSD_INCLUDES
-
-#define ACE_DEFAULT_BASE_ADDR ((char *) 0x80000000)
-
-#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-
-// ACE_HAS_AIX_BROKEN_SOCKET_HEADER may be required if your OS patches are
-// not up to date.  On up-to-date 4.2+ systems, it should not be required.
-// 4.2+ has 4.4 BSD sendmsg/recvmsg
-#if (ACE_AIX_MINOR_VERS < 2)
-#  define ACE_HAS_AIX_BROKEN_SOCKET_HEADER
-#else
-#  define ACE_HAS_SIZET_SOCKET_LEN
-#  define ACE_HAS_4_4BSD_SENDMSG_RECVMSG
-#endif /* ACE_AIX_MINOR_VERS < 2 */
-
-#define ACE_HAS_AIX_HI_RES_TIMER
-#define ACE_HAS_ALLOCA
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-#define ACE_HAS_CHARPTR_DL
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// OS has readdir and friends.
-#define ACE_HAS_DIRENT
-
-// OS supports the getrusage() system call
-#define ACE_HAS_GETRUSAGE
-
-#define ACE_HAS_GPERF
-
-#define ACE_HAS_H_ERRNO
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-#define ACE_HAS_IP_MULTICAST
-#define ACE_HAS_MSG
-#if (ACE_AIX_MINOR_VERS < 2)
-#  define ACE_LACKS_MSG_ACCRIGHTS
-#  define ACE_LACKS_RLIMIT
-#endif
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_HAS_POSIX_TIME
-// ... but needs to include another header for it on 4.2+
-#if (ACE_AIX_MINOR_VERS >= 2)
-#  define ACE_HAS_BROKEN_POSIX_TIME
-#endif /* ACE_AIX_MINOR_VERS > 2 */
-// ... and needs another typedef
-#define ACE_LACKS_TIMESPEC_T
-#define ACE_HAS_SELECT_H
-
-// Compiler/platform defines the sig_atomic_t typedef
-#define ACE_HAS_SIG_ATOMIC_T
-#if (ACE_AIX_MINOR_VERS >= 2)
-#  define ACE_HAS_SIGINFO_T
-#  define ACE_LACKS_SIGINFO_H
-#endif /* ACE_AIX_MINOR_VERS >=2 */
-
-#define ACE_HAS_SIN_LEN
-#define ACE_HAS_STRBUF_T
-
-// Compiler supports stropts.h
-#define ACE_HAS_STREAMS
-// #define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// AIX bzero()
-#define ACE_HAS_STRINGS
-
-#define ACE_HAS_STRUCT_NETDB_DATA
-
-// Dynamic linking is in good shape on newer OS/patch levels.  If you have
-// trouble with the dynamic linking parts of ACE, and can't patch your OS
-// up to latest levels, comment this out.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-// This is tightly related to dynamic linking...
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-#define ACE_HAS_SYSV_IPC
-#define ACE_HAS_TIMOD_H
-#define ACE_HAS_TIUSER_H
-#define ACE_HAS_TLI
-#define ACE_HAS_TLI_PROTOTYPES
-#define ACE_TLI_TCP_DEVICE  "/dev/xti/tcp"
-
-#define ACE_HAS_UALARM
-
-#if (ACE_AIX_MINOR_VERS >= 2)
-#  define ACE_HAS_UCONTEXT_T
-#endif /* ACE_AIX_MINOR_VERS >= 2 */
-
-#define ACE_HAS_UTIME
-
-// Platform has XPG4 wide character type and functions
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
-#define ACE_LACKS_TCP_H
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-//**************************************************************
-//
-// Threads related definitions.
-//
-// The threads on AIX are generally POSIX P1003.1c (ACE_HAS_PTHREADS).
-// However, there is also a kernel thread ID (tid_t) that is used in
-// ACE_Log_Msg (printing the thread ID).  The tid_t is not the same as
-// pthread_t, and can't derive one from the other - thread_self() gets
-// the tid_t (kernel thread ID) if called from a thread.
-// Thanks very much to Chris Lahey for straightening this out.
-
-#define ACE_HAS_THREADS
-#if !defined (ACE_MT_SAFE)
-#define ACE_MT_SAFE 1
-#endif
-
-#define ACE_HAS_PTHREADS
-// 4.3 and up has 1003.1c standard; 4.2 has draft 7
-#if (ACE_AIX_MINOR_VERS >= 3)
-#  define ACE_HAS_PTHREADS_STD
-#else
-#  define ACE_HAS_PTHREADS_DRAFT7
-#endif /* ACE_AIX_MINOR_VERS >= 3 */
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
-#define ACE_HAS_REENTRANT_FUNCTIONS
-#define ACE_HAS_SIGTHREADMASK
-#define ACE_HAS_SIGWAIT
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// If ACE doesn't compile due to the lack of these methods, please
-// send email to ace-users@cs.wustl.edu reporting this.
-// #define ACE_LACKS_CONDATTR_PSHARED
-// #define ACE_LACKS_MUTEXATTR_PSHARED
-#define ACE_LACKS_RWLOCK_T
-#define ACE_LACKS_SETSCHED
-#define ACE_LACKS_THREAD_PROCESS_SCOPING
-#define ACE_LACKS_THREAD_STACK_ADDR
-
-// By default, tracing code is not compiled.  To compile it in, cause
-// ACE_NTRACE to not be defined, and rebuild ACE.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index ee92c196b12..85634eff1e5 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -21,13 +21,10 @@
 #if defined (__GNUG__)
 # include "ace/config-g++-common.h"
 # undef ACE_HAS_ANSI_CASTS
-# define ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS
 #elif defined (ghs)
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
-
 # define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 # define ACE_HAS_TANDEM_SIGNALS
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 # define ACE_HAS_TEMPLATE_SPECIALIZATION
 # define ACE_LACKS_ACE_IOSTREAM  /* MVME lacks signed and unsigned char */
 # define ACE_LACKS_FLOATING_POINT
@@ -52,7 +49,6 @@
 #define ACE_HAS_IP_MULTICAST
 #define ACE_HAS_LONG_MAP_FAILED
 #define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_SIGWAIT
@@ -106,7 +102,6 @@
 #define ACE_HAS_PTHREAD_PROCESS_ENUM
 #define ACE_LACKS_PTHREAD_CANCEL
 #define ACE_LACKS_PTHREAD_CLEANUP
-#define ACE_LACKS_PTHREAD_SIGMASK
 #define ACE_LACKS_PTHREAD_THR_SIGSETMASK
 
 #if !defined (__ACE_INLINE__)
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index 740777122b3..63478b5d786 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -9,9 +9,6 @@
 
 #define ACE_DGUX
 
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
-
 // Static objects do not get initialized correctly, so this is needed.
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 
@@ -57,6 +54,9 @@
 // Platform supports IP multicast
 #define ACE_HAS_IP_MULTICAST
 
+// Compiler/platform does not support the "long long" datatype.
+#define ACE_LACKS_LONGLONG_T
+
 // Green Hills doesn't give a preprocessor symbol for long double
 #define ACE_SIZEOF_LONG_DOUBLE 8
 
@@ -153,7 +153,7 @@
 #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 65536
 
 // Need to #include <sched.h>
-#define ACE_NEEDS_SCHED_H
+#define ACE_LACKS_SCHED_H
 
 // Compiler/platform has thread-specific storage
 //
@@ -177,6 +177,13 @@
 // Platform doesn't have timespec_t data type.
 #define ACE_LACKS_TIMESPEC_T
 
+// Platform doesn't correctly support signed char
+#define ACE_LACKS_SIGNED_CHAR
+
+// Platform doesn't have streambuf linebuffered()
+#define ACE_LACKS_ACE_IOSTREAM
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF
+
 // Use the poll() event demultiplexor rather than select().
 //#define ACE_USE_POLL
 
@@ -188,6 +195,7 @@
 // Defines the page size of the system.
 #define ACE_PAGE_SIZE 4096
 
+#define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #define ACE_HAS_UCONTEXT_T
diff --git a/ace/config-freebsd-pthread.h b/ace/config-freebsd-pthread.h
index ee1f439e896..b765bee88f9 100644
--- a/ace/config-freebsd-pthread.h
+++ b/ace/config-freebsd-pthread.h
@@ -9,16 +9,13 @@
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
 
-#include <osreldate.h>
-// Make sure we source in the OS version.
-
 #if ! defined (__ACE_INLINE__)
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
-#if (__FreeBSD_version < 220000)
+#if (__FreeBSD__ < 3)
 #error Threads are not supported.
-#endif /* __FreeBSD_version < 220000 */
+#endif /* __FreeBSD < 3 */
 
 #define ACE_SIZEOF_LONG_DOUBLE 12
 
@@ -40,9 +37,8 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_CHARPTR_DL
-//#define ACE_USES_ASM_SYMBOL_IN_DLSYM
+#define ACE_USES_ASM_SYMBOL_IN_DLSYM
 #define ACE_LACKS_SIGSET
-#define ACE_NEEDS_SCHED_H
 
 // Use of <malloc.h> is deprecated.
 #define ACE_LACKS_MALLOC_H
@@ -57,7 +53,7 @@ enum schedparam_policy {
 };
 
 // This won't be necessary after it is fixed in the system include headers.
-extern "C" { char * cuserid (char *s); }
+char * cuserid (char *s);
 
 // Platform supports POSIX timers via struct timespec.
 #define ACE_HAS_POSIX_TIME
@@ -78,11 +74,8 @@ extern "C" { char * cuserid (char *s); }
 // Compiler/platform contains the <sys/syscall.h> file.
 #define ACE_HAS_SYSCALL_H
 
-#if (__FreeBSD_version >= 300000)
-#define ACE_HAS_SIGINFO_T
-#endif /* __FreeBSD_version >= 300000 */
-
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+#define ACE_HAS_SIGINFO_T
 #define ACE_LACKS_SIGINFO_H
 #define ACE_LACKS_UCONTEXT_H
 #define ACE_LACKS_SI_ADDR
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h
index d3d1bd384da..2467f3bc012 100644
--- a/ace/config-g++-common.h
+++ b/ace/config-g++-common.h
@@ -28,7 +28,6 @@
 # endif /* __GNUC__ >= 2.90 */
 
 # if __GNUC__ == 2 && __GNUC_MINOR__ >= 91
-#   define ACE_HAS_USING_KEYWORD
     // This is only needed with egcs 1.1 (egcs-2.91.57).  It can't be
     // used with older versions.
 #   define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
diff --git a/ace/config-ghs-common.h b/ace/config-ghs-common.h
deleted file mode 100644
index a9138e3fe97..00000000000
--- a/ace/config-ghs-common.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// This configuration file is designed to be included by another,
-// specific configuration file.  It provides config information common
-// to all Green Hills platforms.
-
-#ifndef ACE_GHS_COMMON_H
-#define ACE_GHS_COMMON_H
-
-#if !defined (ACE_CONFIG_INCLUDE_GHS_COMMON)
-# error ace/config-ghs-common.h: ACE configuration error!  Do not #include this file directly!
-#endif
-
-#if defined (ghs)
-
-# if defined (__STANDARD_CXX)
-    // Green Hills 1.8.9, but not 1.8.8.
-#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
-#   define ACE_LACKS_CHAR_RIGHT_SHIFTS
-#   define ACE_LACKS_UNBUFFERED_STREAMBUF
-# 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
-# define ACE_LACKS_SIGNED_CHAR
-
-#else  /* ! ghs */
-# error ace/config-ghs-common.h can only be used with Green Hills compilers!
-#endif /* ! ghs */
-
-#endif /* ACE_GHS_COMMON_H */
diff --git a/ace/config-hpux-10.x-hpc++.h b/ace/config-hpux-10.x-hpc++.h
index 11c525d72bd..42748a985dd 100644
--- a/ace/config-hpux-10.x-hpc++.h
+++ b/ace/config-hpux-10.x-hpc++.h
@@ -65,9 +65,6 @@
 // used as formal arguments to a template class.
 #  define ACE_HAS_TEMPLATE_TYPEDEFS
 
-// Compiler supports the 'typename' qualifier.
-#  define ACE_HAS_TYPENAME_KEYWORD
-
 // This is legit for A.01.12 and probably at least as far back as A.01.07.
 // Before that, not sure.  But you shouldn't be there anyway ;-)
 #  define ACE_HAS_USING_KEYWORD
@@ -81,9 +78,6 @@
 // Compiler supports template specialization.
 #  define ACE_HAS_TEMPLATE_SPECIALIZATION
 
-// Compiler's runtime new throws bad_alloc on out-of-memory condition.
-#  define ACE_NEW_THROWS_EXCEPTIONS
-
 #endif /* __cplusplus < 199707L */
 
 // Compiler supports the ssize_t typedef.
diff --git a/ace/config-hpux-10.x.h b/ace/config-hpux-10.x.h
index 27a575b60e9..9d1714a895f 100644
--- a/ace/config-hpux-10.x.h
+++ b/ace/config-hpux-10.x.h
@@ -185,10 +185,6 @@ extern int h_errno;     /* This isn't declared in a header file on HP-UX */
 #  if !defined (ACE_MT_SAFE)
         #define ACE_MT_SAFE 1
 #  endif
-
-// The threads version of select loses const-ness of the timeval arg
-#  define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
 #  define ACE_HAS_PTHREADS
 #  define ACE_HAS_PTHREADS_DRAFT4
 // POSIX real-time semaphore definitions are in the header files, and it
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 8f21f48bb87..fe6edf24a52 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -88,9 +88,6 @@
 // Platform supports recvmsg and sendmsg.
 #define ACE_HAS_MSG
 
-// Platform's select() has non-const timeval argument
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
 // Compiler/platform supports poll().
 #define ACE_HAS_POLL
 
@@ -233,6 +230,7 @@
 
 #  define ACE_HAS_PTHREADS
 #  define ACE_HAS_PTHREADS_STD
+#  define ACE_HAS_PTHREAD_SIGMASK
 
 #  define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #endif /* ACE_HAS_THREADS */
diff --git a/ace/config-irix6.x-common.h b/ace/config-irix6.x-common.h
index 0fb6b80f4b0..4cf818151da 100644
--- a/ace/config-irix6.x-common.h
+++ b/ace/config-irix6.x-common.h
@@ -142,8 +142,6 @@
 # define ACE_TIMER_SKEW 10 * 1000
 #endif /* ACE_TIMER_SKEW */
 
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
 // Turns off the tracing feature.
 #if !defined (ACE_NTRACE)
 # define ACE_NTRACE 1
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index 52415880e25..1eb008fca6e 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -20,6 +20,7 @@
 // IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
+#define ACE_HAS_PTHREAD_SIGMASK
 
 #include "ace/config-irix6.x-common.h"
 
@@ -30,6 +31,9 @@
 #define PTHREAD_MIN_PRIORITY PX_PRIO_MIN
 #define PTHREAD_MAX_PRIORITY PX_PRIO_MAX
 
+// Platforms has pthread_thr_sigsetmask
+#define ACE_HAS_PTHREAD_SIGMASK
+
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
diff --git a/ace/config-irix6.x-kcc.h b/ace/config-irix6.x-kcc.h
index a622e6a2046..2dfbfcae753 100644
--- a/ace/config-irix6.x-kcc.h
+++ b/ace/config-irix6.x-kcc.h
@@ -20,6 +20,7 @@
 // IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
+#define ACE_HAS_PTHREAD_SIGMASK
 
 #include "ace/config-irix6.x-common.h"
 
@@ -30,6 +31,9 @@
 #define PTHREAD_MIN_PRIORITY PX_PRIO_MIN
 #define PTHREAD_MAX_PRIORITY PX_PRIO_MAX
 
+// Platforms has pthread_thr_sigsetmask
+#define ACE_HAS_PTHREAD_SIGMASK
+
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
diff --git a/ace/config-irix6.x-sgic++-nothreads.h b/ace/config-irix6.x-sgic++-nothreads.h
index a1cecaee73d..ab8afd08a08 100644
--- a/ace/config-irix6.x-sgic++-nothreads.h
+++ b/ace/config-irix6.x-sgic++-nothreads.h
@@ -95,8 +95,4 @@
 # define ACE_CC_BETA_VERSION  (0)
 #endif /* _COMPILER_VERSION */
 
-#if !defined (ACE_HAS_NETDB_REENTRANT_FUNCTIONS)
-#define ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
-#endif /* ACE_HAS_NETDB_REENTRANT_FUNCTIONS */
-
 #endif /* ACE_CONFIG_IRIX6X_NTHR_H */
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index 5b3306a657a..0a8eef7927d 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -13,6 +13,7 @@
 // Add threading support
 
 #define ACE_HAS_IRIX62_THREADS
+#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_UALARM
 
 // Needed for the threading stuff?
@@ -32,6 +33,9 @@
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
 
+// Platforms has pthread_thr_sigsetmask
+#define ACE_HAS_PTHREAD_SIGMASK
+
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
@@ -39,7 +43,7 @@
 #define ACE_LACKS_COND_TIMEDWAIT_RESET 1
 
 // Scheduling functions are declared in <sched.h>
-#define ACE_NEEDS_SCHED_H
+#define ACE_LACKS_SCHED_H
 
 // When threads are enabled READDIR_R is supported on IRIX.
 #undef ACE_LACKS_READDIR_R
diff --git a/ace/config-kcc-common.h b/ace/config-kcc-common.h
index 0f864be27f5..7c4c41f1fcb 100644
--- a/ace/config-kcc-common.h
+++ b/ace/config-kcc-common.h
@@ -37,10 +37,6 @@
 # define ACE_HAS_PENTIUM
 #endif /* i386 */
 
-// ****** Need to move this somewhere else
-// #define TAO_YY_BREAK
-
-#define ACE_SIZEOF_LONG_LONG 8
 #define ACE_TEMPLATES_REQUIRE_SOURCE
 
 #define ACE_HAS_TEMPLATE_SPECIALIZATION
@@ -61,6 +57,6 @@
 #define ACE_HAS_EXCEPTIONS 1
 #define ACE_HAS_CPLUSPLUS_HEADERS
 
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
+//#define ACE_HAS_NONSTATIC_OBJECT_MANAGER 1
 
 #endif /* ACE_KCC_COMMON_H */
diff --git a/ace/config-linux-common.h b/ace/config-linux-common.h
index bb32614aef3..be3f1c9bbea 100644
--- a/ace/config-linux-common.h
+++ b/ace/config-linux-common.h
@@ -16,11 +16,6 @@
 #define __ACE_INLINE__
 #endif /* ! __ACE_INLINE__ */
 
-// Needed to make some prototypes visible.
-#if ! defined (_GNU_SOURCE)
-#define _GNU_SOURCE
-#endif /* ! _GNU_SOURCE */
-
 // Needed to differentiate between libc 5 and libc 6 (aka glibc).
 // It's there on all libc 5 systems I checked.
 #include <features.h>
@@ -55,7 +50,7 @@
   // NOTE:  the following defines are necessary with glibc 2.0 (0.961212-5)
   //        on Alpha.  I assume that they're necessary on Intel as well,
   //        but that may depend on the version of glibc that is used.
-//# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C
+# define ACE_HAS_DLFCN_H_BROKEN_EXTERN_C
 # define ACE_HAS_VOIDPTR_SOCKOPT
 # define ACE_LACKS_SYSTIME_H
   // The strtok_r declaration is protected in string.h.
@@ -71,11 +66,10 @@
 #   define ACE_LACKS_SIGINFO_H
 #   define ACE_HAS_UCONTEXT_T
 # endif /* __GLIBC__ 2.1+ */
-#else  /* ! __GLIBC__ */
-    // Fixes a problem with some non-glibc versions of Linux...
-#   define ACE_LACKS_MADVISE
+#else /* ! __GLIB__ */
+  // Fixes a problem with some non-glibc versions of Linux...
 #   define ACE_LACKS_MSG_ACCRIGHTS
-#endif /* ! __GLIBC__ */
+#endif /* __GLIBC__ */
 
 
 // Then the compiler specific parts
@@ -146,7 +140,8 @@
 
 #define ACE_LACKS_STRRECVFD
 
-//#define ACE_LACKS_MSYNC
+#define ACE_LACKS_MSYNC
+#define ACE_LACKS_MADVISE
 #define ACE_HAS_PROCFS
 
 // Platform supports System V IPC (most versions of UNIX, but not Win32)
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index a3a491587c5..65e64591628 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -12,18 +12,18 @@
    the tarball of 0.5 can be found, but I suspect that
    Xavier's site has it...
 
-        * RPM == Redhat Package Management
+	* RPM == Redhat Package Management
 
-        My system is a Caldera-based distribution with many upgraded
-        packages.  If you don't use RPM, there is a program (rpm2cpio)
-        which will extract the files for "normal consumption".
+	My system is a Caldera-based distribution with many upgraded
+	packages.  If you don't use RPM, there is a program (rpm2cpio)
+	which will extract the files for "normal consumption".
 
-        You may also want to check out the "ACE On Linux" pages at:
+	You may also want to check out the "ACE On Linux" pages at:
 
-                http://users.deltanet.com/users/slg/ACE/
+		http://users.deltanet.com/users/slg/ACE/
 
-        (They were a little out of date when I last was there
-        however.) */
+	(They were a little out of date when I last was there
+	however.) */
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -38,24 +38,26 @@
 // And they're even POSIX pthreads (MIT implementation)
 #define ACE_HAS_PTHREADS
 // ... and the final standard even!
-#define ACE_HAS_PTHREADS_STD
+#define	ACE_HAS_PTHREADS_STD
+
+#define ACE_HAS_PTHREAD_SIGMASK			// JCEJ 12/19/96
 
 #if !defined (ACE_MT_SAFE)
-        #define ACE_MT_SAFE 1                           // JCEJ 12/22/96        #1
+	#define ACE_MT_SAFE 1				// JCEJ 12/22/96	#1
 #endif
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE         // jcej 12/22/96        #2
-#define PTHREAD_MIN_PRIORITY            0       // JCEJ 12/22/96        #3
-#if !defined(ACE_LACKS_PTHREAD_SIGMASK)
-#  define PTHREAD_MAX_PRIORITY          99      // CJC  02/11/97
+#define ACE_HAS_THREAD_SPECIFIC_STORAGE		// jcej 12/22/96	#2
+#define PTHREAD_MIN_PRIORITY		0	// JCEJ 12/22/96	#3
+#if defined(ACE_HAS_PTHREAD_SIGMASK)
+#  define PTHREAD_MAX_PRIORITY		99	// CJC  02/11/97
 #else
-#  define PTHREAD_MAX_PRIORITY          32      // JCEJ 12/22/96        #3
+#  define PTHREAD_MAX_PRIORITY          32      // JCEJ 12/22/96	#3
 #endif
 
-#define ACE_LACKS_THREAD_STACK_ADDR             // JCEJ 12/17/96
-#define ACE_LACKS_THREAD_STACK_SIZE             // JCEJ 12/17/96
+#define ACE_LACKS_THREAD_STACK_ADDR		// JCEJ 12/17/96
+#define ACE_LACKS_THREAD_STACK_SIZE		// JCEJ 12/17/96
 
-#define ACE_LACKS_RWLOCK_T                      // JCEJ 12/23/96        #1
-#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS    // JCEJ 1/7-8/96
+#define	ACE_LACKS_RWLOCK_T			// JCEJ 12/23/96	#1
+#define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS	// JCEJ 1/7-8/96
 
 #define ACE_HAS_SIGWAIT
 
diff --git a/ace/config-lynxos.h b/ace/config-lynxos.h
index e4f49fae775..b331dd7aa62 100644
--- a/ace/config-lynxos.h
+++ b/ace/config-lynxos.h
@@ -82,7 +82,6 @@
 // Platform does not have const anything
 #define ACE_LACKS_CONST_TIMESPEC_PTR
 #define ACE_HAS_NONCONST_GETBY
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_BROKEN_WRITEV
 #define ACE_HAS_BROKEN_READV
 #define ACE_HAS_BROKEN_SETRLIMIT
@@ -153,7 +152,6 @@
 
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_DRAFT4
-#define ACE_LACKS_NULL_PTHREAD_STATUS
 #define ACE_LACKS_THREAD_STACK_ADDR
 #define ACE_LACKS_SETDETACH
 #define ACE_LACKS_THREAD_PROCESS_SCOPING
@@ -196,17 +194,6 @@ extern "C"
   int putenv (const char *);
 }
 
-// = Proactor stuff
-
-// Aio works on lynx
 #define ACE_HAS_AIO_CALLS
 
-// AIOCB Proactor works on Lynx. But it is not
-// multi-threaded.
-// Lynx OS 3.0.0 lacks POSIX call <pthread_sigmask>. So,we cannot use
-// SIG Proactor also, with multiple threads. So, let us use the AIOCB
-// Proactor. Once <pthreadd_sigmask> is available on Lynx, we can turn
-// on SIG Proactor for this platform.
-// #define ACE_POSIX_SIG_PROACTOR
-#define ACE_POSIX_AIOCB_PROACTOR
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-minimal.h b/ace/config-minimal.h
deleted file mode 100644
index d3e262040fd..00000000000
--- a/ace/config-minimal.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// This configuration file is designed to build only the minimal
-// ACE_OS adaptation layer.
-
-#ifndef ACE_CONFIG_MINIMAL_H
-#define ACE_CONFIG_MINIMAL_H
-
-#define ACE_HAS_MINIMAL_ACE_OS
-
-// Only instantiate the ACE_OS_Object_Manager.
-#define ACE_MAIN_OBJECT_MANAGER \
-  ACE_OS_Object_Manager ace_os_object_manager;
-
-#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER)
-  // To prevent use of ACE_Thread_Exit functions in
-  // ACE_Thread_Adapter::invoke ().
-# define ACE_USE_THREAD_MANAGER_ADAPTER
-#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */
-
-#if defined (ACE_ASSERT)
-# undef ACE_ASSERT
-#endif /* ACE_ASSERT */
-#define ACE_ASSERT(x)
-
-#if defined (ACE_DEBUG)
-# undef ACE_DEBUG
-#endif /* ACE_DEBUG */
-#define ACE_DEBUG(x)
-
-#if defined (ACE_ERROR)
-# undef ACE_ERROR
-#endif /* ACE_ERROR */
-#define ACE_ERROR(x)
-
-#endif /* ACE_CONFIG_MINIMAL_H */
diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index d22c688e02f..560931214df 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -48,10 +48,7 @@
 # define DEC_CXX
 # if (__DECCXX_VER >= 60090010)
     // DEC CXX 6.0 supports exceptions, etc., by default.  Exceptions
-    // are enabled by platform_osf1_4.0.GNU/wrapper_macros.GNU.
-#   if defined (ACE_HAS_EXCEPTIONS)
-#     define ACE_NEW_THROWS_EXCEPTIONS
-#   endif /* ACE_HAS_EXCEPTIONS */
+    // are enabled by platform_osf1_4.0.GNU.
 #   define ACE_HAS_ANSI_CASTS
 #   if !defined (__RTTI)
 #     define ACE_LACKS_RTTI
@@ -60,9 +57,7 @@
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
 #   define ACE_HAS_TYPENAME_KEYWORD
-# else  /* __DECCXX_VER < 60090010 */
-#   define ACE_LACKS_PRAGMA_ONCE
-# endif /* __DECCXX_VER < 60090010 */
+# endif /* __DECCXX_VER >= 60090010 */
 #elif defined (__rational__)
 # define ACE_HAS_REENTRANT_FUNCTIONS
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
@@ -83,14 +78,14 @@
 # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 # define ACE_HAS_BROKEN_IF_HEADER
 # define ACE_HAS_BROKEN_R_ROUTINES
+# define ACE_HAS_BROKEN_T_ERRNO
 # define ACE_HAS_PTHREADS
 # define ACE_HAS_PTHREADS_STD
+# define ACE_HAS_PTHREAD_SIGMASK
 # define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 # define ACE_LACKS_T_ERRNO
 # define ACE_POLL_IS_BROKEN
-# if !defined (DIGITAL_UNIX)
-#   define DIGITAL_UNIX
-# endif /* ! DIGITAL_UNIX */
+# define 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
   // functionality is lost?  Platform supports <sys/procfs.h>
@@ -138,7 +133,6 @@
 #define ACE_HAS_IP_MULTICAST
 #define ACE_HAS_LONG_MAP_FAILED
 #define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_OSF1_GETTIMEOFDAY
 #define ACE_HAS_OSF_TIMOD_H
 #define ACE_HAS_POLL
diff --git a/ace/config-osf1.h b/ace/config-osf1.h
deleted file mode 100644
index 1e6541392c7..00000000000
--- a/ace/config-osf1.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- 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-psos-diab-mips.h b/ace/config-psos-diab-mips.h
deleted file mode 100644
index 77aa346c9b7..00000000000
--- a/ace/config-psos-diab-mips.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for pSOSystem V2.2.1,
-// using the Diab Data D-C++ 4.2 p3 compiler (or a later version)
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-// #if ! defined (__ACE_INLINE__)
-// # define __ACE_INLINE__
-// #endif /* ! __ACE_INLINE__ */
-#if defined (__ACE_INLINE__)
-# undef __ACE_INLINE__
-#endif /* __ACE_INLINE__ */
-
-#define ACE_LACKS_ISATTY
-
-#define ACE_LACKS_DIFFTIME
-
-#define ACE_LACKS_INLINE_FUNCTIONS
-
-#define ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER
-
-#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-#endif /* __GNUG__ */
-
-
-// Don't use RCSID
-#if !defined (ACE_USE_RCSID)
-#define ACE_USE_RCSID 0
-#endif /* #if !defined (ACE_USE_RCSID) */
-
-#define ACE_LACKS_ASSERT_MACRO
-
-#define ACE_LACKS_SIGSET
-#define ACE_LACKS_SIGACTION
-#define ACE_LACKS_FCNTL
-#define ACE_LACKS_FILELOCKS
-#define ACE_LACKS_TRUNCATE
-#define ACE_LACKS_PRAGMA_ONCE
-#define ACE_NLOGGING
-#define ACE_NDEBUG
-
-#define ACE_PSOS_LACKS_PREPC
-
-#define ACE_HAS_STRDUP_EMULATION
-
-#define ACE_HAS_IP_MULTICAST
-
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS
-
-#define ACE_HAS_BROKEN_EXPLICIT_DESTRUCTOR
-
-# define ACE_HAS_BROKEN_NOOP_DTORS
-
-# define ACE_HAS_DIRENT
-# define ACE_LACKS_READDIR_R
-# define ACE_LACKS_TELLDIR
-# define ACE_LACKS_SEEKDIR
-# define ACE_LACKS_REWINDDIR
-
-# define ACE_THREADS_DONT_INHERIT_LOG_MSG
-
-// Template instantiation definitions
-// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-#define ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE
-
-#define ACE_LACKS_HRTIME_T
-
-// #define ACE_LACKS_EVENT_T
-
-// #define ACE_HAS_VERBOSE_NOTSUP
-
-#define ACE_LACKS_MEMORY_H
-
-// #define ACE_LACKS_MALLOC_H
-
-#define ACE_LACKS_MMAP
-
-#define ACE_LACKS_UNIX_DOMAIN_SOCKETS
-
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-
-#define ACE_LACKS_SEMBUF_T
-
-#define ACE_LACKS_EXEC
-
-#define ACE_LACKS_FORK
-
-#define ACE_LACKS_WRITEV
-
-#define ACE_LACKS_READV
-
-// rename the main entry point
-// #define ACE_MAIN extern "C" void root
-
-// All this was commented out for the single threaded port
-/*
-#define ACE_HAS_THREADS
-
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-#define ACE_HAS_TSS_EMULATION
-
-#define ACE_DEFAULT_THREAD_KEYS 256
-
-#define ACE_LACKS_COND_T
-// #define ACE_HAS_TSS_EMULATION
-
-*/
-
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-/* #define ACE_HAS_BROKEN_SENDMSG */
-
-/* #define ACE_HAS_BROKEN_WRITEV  */
-
-#define ACE_HAS_BROKEN_CONVERSIONS
-
-#define ACE_HAS_CHARPTR_SOCKOPT
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-#define ACE_HAS_MSG
-
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_HAS_SIGINFO_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_SIGINFO_IS_SIGINFO_T
-#define ACE_LACKS_SIGSET_DEFINITIONS
-
-#define ACE_HAS_SIGWAIT
-
-//#define ACE_HAS_SIG_ATOMIC_T
-
-// #define ACE_HAS_STRERROR
-
-#define ACE_LACKS_ACCESS
-
-#define ACE_LACKS_GETHOSTENT
-
-#define ACE_LACKS_GETSERVBYNAME
-
-// IO Streams stuff
-/* #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION */
-#define ACE_LACKS_IOSTREAM_TOTALLY
-#define ACE_LACKS_ACE_IOSTREAM
-#define ACE_LACKS_IOSTREAM_FX
-#define ACE_DEFAULT_LOG_STREAM 0
-#define ostream FILE
-
-#define ACE_LACKS_IOSTREAM_FX
-
-#define ACE_LACKS_KEY_T
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#define ACE_LACKS_LONGLONG_T
-
-#define ACE_LACKS_MADVISE
-
-#define ACE_LACKS_MKTEMP
-
-#define ACE_LACKS_MPROTECT
-
-#define ACE_LACKS_MSYNC
-
-#define ACE_LACKS_PARAM_H
-
-#define ACE_LACKS_PWD_FUNCTIONS
-
-#define ACE_LACKS_RLIMIT
-
-#define ACE_LACKS_RPC_H
-
-#define ACE_LACKS_RWLOCK_T
-
-#define ACE_LACKS_SBRK
-
-#define ACE_LACKS_SIGNED_CHAR
-
-#define ACE_LACKS_SI_ADDR
-
-#define ACE_LACKS_SOCKETPAIR
-
-#define ACE_LACKS_STRCASECMP
-
-#define ACE_LACKS_STRRECVFD
-
-#define ACE_LACKS_SYSCALL
-
-#define ACE_LACKS_SYSV_MSG_H
-
-#define ACE_LACKS_SYSV_SHMEM
-
-// #define ACE_LACKS_SYS_NERR
-
-#define ACE_LACKS_SYS_TYPES_H
-
-#define ACE_LACKS_TIMESPEC_T
-
-#define ACE_LACKS_UCONTEXT_H
-
-#define ACE_LACKS_UNIX_SIGNALS
-
-// #define ACE_MALLOC_ALIGN 8
-// #define ACE_LACKS_SYSTIME_H
-
-#define ACE_PAGE_SIZE 4096
-
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#define ACE_PSOS_CANT_USE_SYS_TYPES
-
-// #define ACE_PSOS_SNARFS_HEADER_INFO
-
-#if !defined (ACE_PSOS)
-#define ACE_PSOS
-#endif /* ACE_PSOS */
-
-#if !defined (ACE_PSOS_TBD)
-#define ACE_PSOS_TBD
-#endif /* ACE_PSOS_TBD */
-
-#define ACE_LACKS_MKFIFO
-
-#define ACE_LACKS_MALLOC_H
-
-#define ACE_PSOS_DIAB
-
-#define ACE_PSOS_DIAB_MIPS
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab-ppc.h b/ace/config-psos-diab-ppc.h
deleted file mode 100644
index 551d99cbda5..00000000000
--- a/ace/config-psos-diab-ppc.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for:
-//      a) pSOSystem V2.5.0 for PowerPC (pssppc.250)
-//      b) DiabData C++ compiler - dplus 4.2b
-//        *note pSOSystem V2.5.0 is contained in the PRISM+2.0.0 package
-
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-
-// #if ! defined (__ACE_INLINE__)
-// # define __ACE_INLINE__
-// #endif /* ! __ACE_INLINE__ */
-#if defined (__ACE_INLINE__)
-# undef __ACE_INLINE__
-#endif /* __ACE_INLINE__ */
-
-#define ACE_LACKS_ISATTY
-
-#define ACE_LACKS_DIFFTIME
-
-#define ACE_LACKS_FCNTL
-
-#define ACE_LACKS_FILELOCKS
-
-#define ACE_LACKS_FSYNC
-
-#define ACE_LACKS_INLINE_FUNCTIONS
-
-#define ACE_LACKS_TEMPLATE_AS_TEMPLATE_PARAMETER
-
-#if defined (__GNUG__)
-# include "ace/config-g++-common.h"
-#endif /* __GNUG__ */
-
-#define ACE_PSOS_LACKS_PREPC
-
-#define ACE_PSOS_HAS_TIME
-
-#define ACE_HAS_STRDUP_EMULATION
-
-#define ACE_HAS_IP_MULTICAST
-
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-#define ACE_HAS_BROKEN_EXPLICIT_TYPECAST_OPERATOR_INVOCATION
-
-#define ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS
-
-#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
-
-# define ACE_HAS_BROKEN_NOOP_DTORS
-
-# define ACE_HAS_DIRENT
-# define ACE_LACKS_READDIR_R
-# define ACE_LACKS_TELLDIR
-# define ACE_LACKS_SEEKDIR
-# define ACE_LACKS_REWINDDIR
-
-#define ACE_LACKS_TRUNCATE
-
-// Template instantiation definitions
-// #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
-#define ACE_TEMPLATES_REQUIRE_SOURCE
-
-// IO Streams stuff
-// #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-#define ACE_LACKS_IOSTREAM_TOTALLY
-#define ACE_LACKS_ACE_IOSTREAM
-#define ACE_LACKS_IOSTREAM_FX
-#define ACE_DEFAULT_LOG_STREAM 0
-#define ostream FILE
-
-#define ACE_LACKS_HRTIME_T
-
-// #define ACE_LACKS_EVENT_T
-
-#define ACE_HAS_VERBOSE_NOTSUP
-
-#define ACE_LACKS_MEMORY_H
-
-// #define ACE_LACKS_MALLOC_H
-
-#define ACE_LACKS_MMAP
-
-#define ACE_LACKS_UNIX_DOMAIN_SOCKETS
-
-#define ACE_HAS_NONSTATIC_OBJECT_MANAGER
-
-#define ACE_LACKS_SEMBUF_T
-
-#define ACE_LACKS_EXEC
-
-#define ACE_LACKS_FORK
-
-#define ACE_LACKS_WRITEV
-
-#define ACE_LACKS_READV
-
-// rename the main entry point
-#define ACE_MAIN extern "C" void root
-
-// All this was commented out for the single threaded port
-
-#define ACE_HAS_THREADS
-
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-#define ACE_HAS_TSS_EMULATION
-
-#define ACE_DEFAULT_THREAD_KEYS 256
-
-#define ACE_LACKS_COND_T
-
-// #define ACE_HAS_TSS_EMULATION
-
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-/* #define ACE_HAS_BROKEN_SENDMSG */
-
-/* #define ACE_HAS_BROKEN_WRITEV  */
-
-#define ACE_HAS_BROKEN_CONVERSIONS
-
-#define ACE_HAS_CHARPTR_SOCKOPT
-
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-#define ACE_HAS_MSG
-
-#define ACE_HAS_POSIX_NONBLOCK
-
-#define ACE_HAS_SIGINFO_T
-#define ACE_LACKS_SIGINFO_H
-#define ACE_SIGINFO_IS_SIGINFO_T
-#define ACE_LACKS_SIGSET_DEFINITIONS
-#define ACE_LACKS_SIGSET
-#define ACE_LACKS_SIGACTION
-
-#define ACE_HAS_SIGWAIT
-
-//#define ACE_HAS_SIG_ATOMIC_T
-
-#define ACE_HAS_STRERROR
-
-#define ACE_LACKS_ACCESS
-
-#define ACE_LACKS_GETHOSTENT
-
-#define ACE_LACKS_GETSERVBYNAME
-
-#define ACE_LACKS_KEY_T
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-
-#define ACE_LACKS_LONGLONG_T
-
-#define ACE_LACKS_LSTAT
-
-#define ACE_LACKS_MADVISE
-
-#define ACE_LACKS_MKTEMP
-
-#define ACE_LACKS_MPROTECT
-
-#define ACE_LACKS_MSYNC
-
-#define ACE_LACKS_PARAM_H
-
-#define ACE_LACKS_PWD_FUNCTIONS
-
-#define ACE_LACKS_READLINK
-
-#define ACE_LACKS_RLIMIT
-
-#define ACE_LACKS_RWLOCK_T
-
-#define ACE_LACKS_SBRK
-
-#define ACE_LACKS_SIGNED_CHAR
-
-#define ACE_LACKS_SI_ADDR
-
-#define ACE_LACKS_SOCKETPAIR
-
-#define ACE_LACKS_STRCASECMP
-
-#define ACE_LACKS_STRRECVFD
-
-#define ACE_LACKS_SYSCALL
-
-#define ACE_LACKS_SYSV_MSG_H
-
-#define ACE_LACKS_SYSV_SHMEM
-
-#define ACE_LACKS_SYS_NERR
-
-#define ACE_LACKS_SYS_TYPES_H
-
-#define ACE_LACKS_TIMESPEC_T
-
-#define ACE_LACKS_UCONTEXT_H
-
-#define ACE_LACKS_UNIX_SIGNALS
-
-// #define ACE_MALLOC_ALIGN 8
-// #define ACE_LACKS_SYSTIME_H
-
-#define ACE_PAGE_SIZE 4096
-
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#define ACE_PSOS_CANT_USE_SYS_TYPES
-
-// #define ACE_PSOS_LACKS_PHILE
-
-#define ACE_PSOS_HAS_C_LIBRARY
-
-#define ACE_PSOS_SNARFS_HEADER_INFO
-
-#define ACE_PSOS_LACKS_ARGC_ARGV
-
-#if !defined (ACE_PSOS)
-#define ACE_PSOS
-#endif /* ACE_PSOS */
-
-#if !defined (ACE_PSOS_TBD)
-#define ACE_PSOS_TBD
-#endif /* ACE_PSOS_TBD */
-
-#define ACE_LACKS_MKFIFO
-
-#define ACE_PSOS_DIAB
-
-#define ACE_PSOS_DIAB_PPC
-
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-diab.h b/ace/config-psos-diab.h
index 5e9c62c163b..d4f9e3361a0 100644
--- a/ace/config-psos-diab.h
+++ b/ace/config-psos-diab.h
@@ -32,9 +32,6 @@
 # include "ace/config-g++-common.h"
 #endif /* __GNUG__ */
 
-#define ACE_PSOS_LACKS_PREPC
-
-#define ACE_PSOS_HAS_TIME
 
 #define ACE_HAS_STRDUP_EMULATION
 
@@ -61,6 +58,7 @@
 // Template instantiation definitions
 // #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
 #define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE
 
 // IO Streams stuff
 // #define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
@@ -217,8 +215,6 @@
 
 // #define ACE_PSOS_LACKS_PHILE
 
-#define ACE_PSOS_HAS_C_LIBRARY
-
 #define ACE_PSOS_SNARFS_HEADER_INFO
 
 #define ACE_PSOS_LACKS_ARGC_ARGV
@@ -227,8 +223,8 @@
 #define ACE_PSOS
 #endif /* ACE_PSOS */
 
-#if !defined (ACE_PSOS_DIAB)
-#define ACE_PSOS_DIAB
-#endif /* ACE_PSOS_DIAB */
+#if !defined (ACE_PSOS_TBD)
+#define ACE_PSOS_TBD
+#endif /* ACE_PSOS_TBD */
 #define ACE_LACKS_MKFIFO
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-psos-tm.h b/ace/config-psos-tm.h
index f1570285a57..966b206d43f 100644
--- a/ace/config-psos-tm.h
+++ b/ace/config-psos-tm.h
@@ -29,6 +29,7 @@
 // Template instantiation definitions
 // #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE
 #define ACE_TEMPLATES_REQUIRE_SOURCE
+#define ACE_LACKS_METHOD_DEFINITIONS_IN_CLASS_TEMPLATE
 
 #include <signal.h>          //JINLU
 #include <pna.h>             //JINLU
@@ -191,8 +192,6 @@
 #define ACE_PSOS_LACKS_PHILE
 #define ACE_PSOS_LACKS_PREPC
 #define ACE_PSOS_CANT_USE_SYS_TYPES
-#define ACE_PSOS_HAS_TIME
-
 
 //#define ACE_PSOS_SNARFS_HEADER_INFO
 
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index a658cec275f..9b5cbe62b10 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -143,6 +143,7 @@
 #define ACE_HAS_PTHREADS
 #define ACE_HAS_PTHREADS_STD
 #define ACE_LACKS_PTHREAD_CANCEL
+#define ACE_HAS_PTHREAD_SIGMASK
 #define ACE_HAS_SIGWAIT
 //#define       ACE_HAS_PTHREAD_YIELD_VOID_PTR
 //#define       ACE_HAS_PTHREAD_ATTR_INIT
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index 09ce6c9c72b..6eb59b5f8bd 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -29,11 +29,9 @@
 #   define ACE_TEMPLATES_REQUIRE_SOURCE
 #   define ACE_HAS_STANDARD_CPP_LIBRARY 1
 #   define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
-#   define ACE_USES_OLD_IOSTREAMS 1
-#   define ACE_HAS_THR_C_DEST
+#   define ACE_LACKS_ACE_IOSTREAM /* might not be necessary? */
 # endif /* __SUNPRO_CC >= 0x500 */
 # endif /* __SUNPRO_CC >= 0x420 */
-
 # define ACE_CAST_CONST const
 # define ACE_HAS_HI_RES_TIMER
 # define ACE_HAS_SIG_C_FUNC /* Sun CC 5.0 needs this, 4.2 doesn't mind. */
@@ -85,6 +83,15 @@
 # endif /* !ACE_MT_SAFE */
 
 #elif defined (ghs)
+# if defined (__STANDARD_CXX)
+   // Green Hills 1.8.9, but not 1.8.8.
+#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# endif /* __STANDARD_CXX */
+
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+# define ACE_LACKS_LINEBUFFERED_STREAMBUF
+# define ACE_LACKS_LONGLONG_T /* It really doesn't have it.  Boo. */
+# define ACE_LACKS_SIGNED_CHAR
 
 # if !defined (ACE_MT_SAFE) || ACE_MT_SAFE != 0
     // ACE_MT_SAFE is #defined below, for all compilers.
@@ -96,21 +103,10 @@
 #   endif /* _REENTRANT */
 # endif /* !ACE_MT_SAFE */
 
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
-
   // To avoid warning about inconsistent declaration between Sun's
   // stdlib.h and Green Hills' ctype.h.
 # include <stdlib.h>
 
-  // IOStream_Test never halts with Green Hills 1.8.9.
-# define ACE_LACKS_ACE_IOSTREAM
-
-#elif defined (__KCC) /* KAI compiler */
-
-# define ACE_HAS_ANSI_CASTS
-# include "ace/config-kcc-common.h"
-
 #else  /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
 # error unsupported compiler in ace/config-sunos5.5.h
 #endif /* ! __SUNPRO_CC && ! __GNUG__  && ! ghs */
@@ -135,9 +131,6 @@
 // Optimize ACE_Handle_Set for select().
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 
-// select()'s timeval arg is not declared as const and may be modified
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
-
 // Platform supports pread() and pwrite()
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
@@ -234,9 +227,7 @@
 // Compiler/platform supports sys_siglist array.
 #define ACE_HAS_SYS_SIGLIST
 
-#if defined (_REENTRANT) || \
- (defined (_POSIX_C_SOURCE) && (_POSIX_C_SOURCE - 0 >= 199506L)) || \
- defined (_POSIX_PTHREAD_SEMANTICS)
+#if defined (_REENTRANT)
   // Compile using multi-thread libraries.
 # define ACE_HAS_THREADS
 
@@ -249,9 +240,7 @@
   // -D_POSIX_PTHREAD_SEMANTICS to your CFLAGS.  Or, #define it right
   // here.  See the Intro (3) man page for information on
   // -D_POSIX_PTHREAD_SEMANTICS.
-# if defined (_POSIX_PTHREAD_SEMANTICS)
-#   define ACE_LACKS_RWLOCK_T
-# else
+# if !defined (_POSIX_PTHREAD_SEMANTICS)
 #   define ACE_HAS_STHREADS
 # endif /* ! _POSIX_PTHREAD_SEMANTICS */
 
@@ -268,10 +257,10 @@
 # define ACE_HAS_REENTRANT_FUNCTIONS
 
 # define ACE_NEEDS_LWP_PRIO_SET
+# define ACE_HAS_PTHREAD_SIGMASK
 # define ACE_HAS_THR_YIELD
 # define ACE_LACKS_PTHREAD_YIELD
-#endif /* _REENTRANT || _POSIX_C_SOURCE >= 199506L || \
-          _POSIX_PTHREAD_SEMANTICS */
+#endif /* _REENTRANT */
 
 # define ACE_HAS_PRIOCNTL
 
@@ -300,7 +289,6 @@
 
 #define ACE_HAS_GPERF
 #define ACE_HAS_DIRENT
-#define ACE_HAS_MEMCHR
 
 #if defined (__SUNPRO_CC)
 # define ACE_CC_NAME "SunPro C++"
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-sunos5.6.h b/ace/config-sunos5.6.h
index aa9875f22bf..86aedbb7b5c 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -23,11 +23,4 @@
 
 // SunOS 5.6 has AIO calls.
 #define ACE_HAS_AIO_CALLS
-
-// Sunos 5.6's aio_* with RT signals is broken.  
-#define ACE_POSIX_AIOCB_PROACTOR
-
-// SunOS 5.6 has a buggy select
-#define ACE_HAS_LIMITED_SELECT
-
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.7.h b/ace/config-sunos5.7.h
index a0061773c53..69724bcf3a9 100644
--- a/ace/config-sunos5.7.h
+++ b/ace/config-sunos5.7.h
@@ -28,29 +28,4 @@
 # endif /* __GNUC__ <= 2  &&  __GNUC_MINOR__ < 8 */
 #endif /* __GNUG__ */
 
-#if defined (__KCC)
-typedef unsigned long long uint64_t;
-#endif
-
-// Solaris 5.7 supports SCHED_FIFO and SCHED_RR, as well as SCHED_OTHER.
-#undef ACE_HAS_ONLY_SCHED_OTHER
-
-// Solaris 2.7 can support Real-Time Signals and POSIX4 AIO operations 
-// are supported. 
-
-#if !defined (ACE_HAS_AIO_CALLS)
-#define ACE_HAS_AIO_CALLS
-#endif /* !ACE_HAS_AIO_CALLS */
-
-#if defined (ACE_POSIX_AIOCB_PROACTOR)
-#undef ACE_POSIX_AIOCB_PROACTOR
-#endif /* ACE_POSIX_AIOCB_PROACTOR */
-
-// This is anyway default.
-#define ACE_POSIX_SIG_PROACTOR
-
-#ifdef ACE_HAS_LIMITED_SELECT
-#undef ACE_HAS_LIMITED_SELECT
-#endif /* ACE_HAS_LIMITED_SELECT */
-
 #endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.x-sunc++-4.x-orbix.h b/ace/config-sunos5.x-sunc++-4.x-orbix.h
index ca850489edf..350624e7e6b 100644
--- a/ace/config-sunos5.x-sunc++-4.x-orbix.h
+++ b/ace/config-sunos5.x-sunc++-4.x-orbix.h
@@ -8,23 +8,12 @@
 #ifndef ACE_CONFIG_ORBIX_H
 #define ACE_CONFIG_ORBIX_H
 
-// Pick up correct platform definition file based on compiler's predefined
-// macros.
-#if defined (__SunOS_5_5) || defined (__SunOS_5_5_1)
-#  include "ace/config-sunos5.5.h"
-#elif defined (__SunOS_5_6)
-#  include "ace/config-sunos5.6.h"
-#else
-#  error "Need a new platform extension in config-sunos5.x-sunc++-4.x-orbix.h"
-#endif /* __SunOS_* */
+#include "ace/config-sunos5.5-sunc++-4.x.h"
 
 // Platform contains the Orbix CORBA implementation.
 #define ACE_HAS_ORBIX 1
 
-// Platform contains the multi-threaded Orbix CORBA implementation, unless
-// overridden by site config.
-#if !defined (ACE_HAS_MT_ORBIX)
-#  define ACE_HAS_MT_ORBIX 1
-#endif /* ACE_HAS_MT_ORBIX */
+// Platform contains the multi-threaded Orbix CORBA implementation.
+#define ACE_HAS_MT_ORBIX 1
 
 #endif /* ACE_CONFIG_ORBIX_H */
diff --git a/ace/config-tru64.h b/ace/config-tru64.h
deleted file mode 100644
index 1e6541392c7..00000000000
--- a/ace/config-tru64.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- 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-vxworks5.x.h b/ace/config-vxworks5.x.h
index 641585f1470..b471378b8ce 100644
--- a/ace/config-vxworks5.x.h
+++ b/ace/config-vxworks5.x.h
@@ -41,10 +41,6 @@
   // compile, though, because of the period!  So, let g++/VxWorks users
   // include iostream.h only where they need it.
 # define ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
-
-# define ACE_LACKS_LINEBUFFERED_STREAMBUF
-# define ACE_LACKS_SIGNED_CHAR
-
 #elif defined (ghs)
   // Processor type, if necessary.  Green Hills defines "ppc".
 # if defined (ppc)
@@ -60,11 +56,15 @@
 #   define ACE_HAS_PENTIUM
 # endif /* i386 */
 
-# define ACE_CONFIG_INCLUDE_GHS_COMMON
-# include "ace/config-ghs-common.h"
+# if defined (__STANDARD_CXX)
+   // Green Hills 1.8.9, but not 1.8.8.
+#   define ACE_HAS_STANDARD_CPP_LIBRARY 1
+# endif /* __STANDARD_CXX */
 
+# define ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+# define ACE_HAS_WCHAR_TYPEDEFS_CHAR
+# define ACE_LACKS_LONGLONG_T
 # define ACE_LACKS_UNISTD_H
-
 #else  /* ! __GNUG__ && ! ghs */
 # error unsupported compiler on VxWorks
 #endif /* ! __GNUG__ && ! ghs */
@@ -80,14 +80,11 @@
 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
 #define ACE_HAS_CPLUSPLUS_HEADERS
 #define ACE_HAS_DIRENT
-#define ACE_HAS_DLL 0
 #define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
 #define ACE_HAS_MSG
-#define ACE_HAS_NONCONST_SELECT_TIMEVAL
 #define ACE_HAS_NONSTATIC_OBJECT_MANAGER
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
-#define ACE_HAS_RECURSIVE_MUTEXES
 #define ACE_HAS_SIGINFO_T
 #define ACE_HAS_SIGWAIT
 #define ACE_HAS_SIG_ATOMIC_T
@@ -104,6 +101,7 @@
 #define ACE_LACKS_GETHOSTENT
 #define ACE_LACKS_GETSERVBYNAME
 #define ACE_LACKS_KEY_T
+#define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #define ACE_LACKS_LSTAT
 #define ACE_LACKS_MADVISE
 #define ACE_LACKS_MALLOC_H
@@ -123,6 +121,7 @@
 #define ACE_LACKS_SEEKDIR
 #define ACE_LACKS_SEMBUF_T
 #define ACE_LACKS_SIGINFO_H
+#define ACE_LACKS_SIGNED_CHAR
 #define ACE_LACKS_SI_ADDR
 #define ACE_LACKS_SOCKETPAIR
 #define ACE_LACKS_STRCASECMP
@@ -143,7 +142,6 @@
 #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
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index ddfc4a3b77b..8c139ed5544 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -8,7 +8,7 @@
 #define ACE_WIN32_COMMON_H
 
 // Complain if WIN32 if not already defined.
-#if !defined (WIN32) && !defined (ACE_HAS_WINCE)
+#ifndef WIN32
 #error Please define WIN32 in your project settings.
 #endif /* WIN32 */
 
@@ -20,9 +20,6 @@
 #define ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
 #endif /* ! ACE_HAS_WINCE */
 
-#define ACE_DEFAULT_THREAD_PRIORITY 0
-
-#define ACE_HAS_RECURSIVE_MUTEXES
 #define ACE_HAS_WCHAR_TYPEDEFS_USHORT
 #define ACE_HAS_MSG
 #define ACE_HAS_SOCKADDR_MSG_NAME
@@ -250,21 +247,20 @@ typedef unsigned __int64 ACE_UINT64;
         // must have _MT defined to include multithreading
         // features from win32 headers
         #if !defined(_MT)
-                // *** DO NOT *** DO NOT *** defeat this error message
-                // by defining _MT yourself.  RTFM and see who set _MT.
                 #error You must link ACE against multi-threaded libraries.
         #endif /* _MT */
 #endif /* ACE_MT_SAFE && ACE_MT_SAFE != 0 */
 
-#if !defined (ACE_HAS_WINCE)
 #if defined(ACE_HAS_DLL) && (ACE_HAS_DLL != 0)
         #if !defined(_DLL)
-                // *** DO NOT *** DO NOT *** defeat this error message
-                // by defining _DLL yourself.  RTFM and see who set _DLL.
                 #error You must link against (Debug) Multithreaded DLL run-time libraries.
         #endif /* !_DLL */
+#else /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */
+        #if defined(_DLL)
+                #error You cannot link against (Debug) Multithreaded DLL run-time libraries.
+                #error Link against Single Threaded or Multithreaded (static) run-time libraries.
+        #endif  /* _DLL */
 #endif  /* ACE_HAS_DLL && ACE_HAS_DLL != 0 */
-#endif /* ACE_HAS_WINCE */
 
 // We are using STL's min and max (in algobase.h).  Therefore the
 // macros in window.h are extra
@@ -284,6 +280,11 @@ typedef unsigned __int64 ACE_UINT64;
         #endif /* _UNICODE */
 #endif /* UNICODE */
 
+// If __ACE_INLINE__ is defined to be 0, we will undefine it
+#if defined (__ACE_INLINE__) && (__ACE_INLINE__ == 0)
+        #undef __ACE_INLINE__
+#endif /* __ACE_INLINE__ */
+
 #ifdef _DEBUG
 #if !defined (ACE_HAS_WINCE)
         #include /**/ <crtdbg.h>
@@ -292,15 +293,10 @@ typedef unsigned __int64 ACE_UINT64;
         // If we are making a release, and the user has not specified
         // inline directives, we will default to inline
         #if ! defined (__ACE_INLINE__)
-                #define __ACE_INLINE__ 1
+                #define __ACE_INLINE__
         #endif /* __ACE_INLINE__ */
 #endif
 
-// If __ACE_INLINE__ is defined to be 0, we will undefine it
-#if defined (__ACE_INLINE__) && (__ACE_INLINE__ == 0)
-        #undef __ACE_INLINE__
-#endif /* __ACE_INLINE__ */
-
 // We are build ACE and want to use MFC (multithreaded)
 #if defined(ACE_HAS_MFC) && (ACE_HAS_MFC != 0) && defined (_MT)
         #if (ACE_HAS_DLL != 0) && defined(ACE_BUILD_DLL) && !defined (_WINDLL)
@@ -332,9 +328,6 @@ typedef unsigned __int64 ACE_UINT64;
         #include /**/ <afxwin.h>   /* He is doing MFC */
                 // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h
                 // #define      _INC_WINDOWS  // Prevent winsock.h from including windows.h
-#elif defined (ACE_HAS_WINCE)
-        #include /**/ <windows.h>
-        #include /**/ <wce.h>
 #endif
 
 #if !defined (_INC_WINDOWS)     /* Already include windows.h ? */
diff --git a/ace/config.h.in b/ace/config.h.in
new file mode 100644
index 00000000000..3a4077a9ad4
--- /dev/null
+++ b/ace/config.h.in
@@ -0,0 +1,1337 @@
+/* ace/config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* -*- C++ -*- */
+#ifndef ACE_CONFIG_H
+#define ACE_CONFIG_H
+
+/* ACE configuration header file */
+
+
+/* Define if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+#undef _ALL_SOURCE
+#endif
+
+/* Define if using alloca.c.  */
+#undef C_ALLOCA
+
+/* Define if the closedir function returns void instead of int.  */
+#undef CLOSEDIR_VOID
+
+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+   This function is required for alloca.c support on those systems.  */
+#undef CRAY_STACKSEG_END
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef gid_t
+
+/* Define if you have alloca, as a function or macro.  */
+#undef HAVE_ALLOCA
+
+/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
+#undef HAVE_ALLOCA_H
+
+/* Define if system calls automatically restart after interruption
+   by a signal.  */
+#undef HAVE_RESTARTABLE_SYSCALLS
+
+/* Define if you have the strftime function.  */
+#undef HAVE_STRFTIME
+
+/* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+#undef HAVE_SYS_WAIT_H
+
+/* Define as __inline if that's what the C compiler calls it.  */
+#undef inline
+
+/* Define if on MINIX.  */
+#undef _MINIX
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef mode_t
+
+/* Define if your C compiler doesn't accept -c and -o together.  */
+#undef NO_MINUS_C_MINUS_O
+
+/* Define to `long' if <sys/types.h> doesn't define.  */
+#undef off_t
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef pid_t
+
+/* Define if the system does not provide POSIX.1 features except
+   with this defined.  */
+#undef _POSIX_1_SOURCE
+
+/* Define if you need to in order for stat and other things to work.  */
+#undef _POSIX_SOURCE
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+#undef size_t
+
+/* If using the C implementation of alloca, define if you know the
+   direction of stack growth for your system; otherwise it will be
+   automatically deduced at run-time.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
+ */
+#undef STACK_DIRECTION
+
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define to `int' if <sys/types.h> doesn't define.  */
+#undef uid_t
+
+/* Define if your processor stores words with the most significant
+   byte first (like Motorola and SPARC, unlike Intel and VAX).  */
+#undef WORDS_BIGENDIAN
+
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
+
+/* Define if lex declares yytext as a char * by default, not a char[].  */
+#undef YYTEXT_POINTER
+
+/* Define _REENTRANT if reentrant functions should be used. */
+#ifndef _REENTRANT
+# undef _REENTRANT
+#endif
+
+#ifndef _POSIX_THREADS
+# undef _POSIX_THREADS
+#endif
+
+#ifndef _POSIX_THREAD_SAFE_FUNCTIONS
+# undef _POSIX_THREAD_SAFE_FUNCTIONS
+#endif
+
+/* Some platforms need _POSIX_PTHREAD_SEMANTICS to make some functions work */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+
+/* Some platforms require _GNU_SOURCE to be defined to make some functions
+   declaration "visible." */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
+/* ACE currently doesn't use these; however the configure script does */
+#undef ACE_LACKS_SYSTIMES_H
+#undef ACE_LACKS_UNBUFFERED_STREAMBUF
+#undef ACE_HAS_STDCPP_STL_INCLUDES
+
+#undef ACE_HAS_LIBC_H
+#undef ACE_HAS_OSFCN_H
+#undef ACE_HAS_NEW_NO_H
+#undef ACE_HAS_NEW_H
+#undef ACE_HAS_STDEXCEPT_NO_H
+#undef ACE_HAS_EXCEPTION_H
+#undef ACE_HAS_IOMANIP_NO_H
+
+/* Platform provides <sys/ioctl.h> header */
+#undef ACE_HAS_SYS_IOCTL_H
+
+/*
+ * Deprecated! (or soon to be?)
+ */
+#undef ACE_HAS_OSF1_GETTIMEOFDAY /* timezone* 2nd parameter & no prototype */
+#undef ACE_HAS_LYNXOS_SIGNALS
+#undef ACE_HAS_TANDEM_SIGNALS
+#undef ACE_HAS_IRIX_53_SIGNALS
+
+/*
+ * TODO: These two next #defines have an #undef before them, in
+ * case the variable being defined already had a value.
+ * The #undefs are being picked up by configure, and are commented out!
+ */
+#undef ACE_THREAD_MIN_PRIORITY
+#if defined (ACE_THREAD_MIN_PRIORITY)
+# undef PTHREAD_MIN_PRIORITY
+# define PTHREAD_MIN_PRIORITY ACE_THREAD_MIN_PRIORITY
+#endif  /* #if defined (ACE_THREAD_MIN_PRIORITY) */
+
+#undef ACE_THREAD_MAX_PRIORITY
+#if defined (ACE_THREAD_MAX_PRIORITY)
+# undef PTHREAD_MAX_PRIORITY
+# define PTHREAD_MAX_PRIORITY ACE_THREAD_MAX_PRIORITY
+#endif  /* #if defined (ACE_THREAD_MAX_PRIORITY) */
+
+#undef PTHREAD_STACK_MIN
+#undef PTHREAD_STACK_MAX
+
+/* AIX specific configuration parameters */
+#undef AIX
+#undef _BSD
+#undef _BSD_INCLUDES
+
+/* Cray specific configuration parameters */
+/*
+    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.  
+
+    _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, ...)
+    or the major+minor+level UNICOS/mk version, e.g. 2.0.3 => 203,
+    being run on an MPP machine.
+
+    _CRAYMPP  (defined only if running on MPP machine, e.g. T3E, UNICOS/mk)
+    _CRAYT3E  (defined specifically if compiling on a Cray T3E)
+    _UNICOS   (defined if running UNICOS or UNICOS/mk)
+
+    Contributed by Doug Anderson <doug
+clark.net>
+*/
+#undef _CRAYMPP
+#undef _CRAYT3E
+#undef _UNICOS
+
+/* DG/UX specific configuration parameters */
+#undef ACE_DGUX
+#undef _DGUX_SOURCE
+#undef _POSIX4A_DRAFT10_SOURCE
+#undef _POSIX4_DRAFT_SOURCE
+
+/* HP/UX specific configuration parameters */
+#undef HPUX
+#undef HPUX_10
+#undef HPUX_11
+#undef _HPUX_SOURCE
+
+/* Irix specific configuration parameters */
+#undef IRIX5
+#undef IRIX6
+#undef _BSD_TYPES
+#undef _SGI_MP_SOURCE
+#undef _MODERN_C_
+
+/* LynxOS specific configuration parameters */
+#undef __NO_INCLUDE_WARN__
+#undef _POSIX_THREADS_CALLS
+
+/* M88K specific configuration parameters */
+#undef m88k
+#undef __m88k__
+
+/* NetBSD specific configuration parameters */
+#undef ACE_NETBSD
+
+/* OSF/1 and Digital Unix specific configuration parameters */
+#undef DEC_CXX
+#undef DIGITAL_UNIX
+
+/* pSOS specific configuration parameters */
+#undef ACE_PSOS
+#undef ACE_PSOSIM
+#undef ACE_PSOSTBD
+
+/* SCO specific configuration parameters */
+#undef SCO
+#undef _SVID3
+
+/* UnixWare specific configuration parameters */
+#undef UNIXWARE
+#undef UNIXWARE_2_0
+#undef UNIXWARE_2_1
+
+/* VXWorks specific configuration parameters */
+#undef VXWORKS
+
+/* Win32 specific configuration parameters */
+#undef ACE_WIN32
+
+/* ACE internals */
+#undef ACE_DEFAULT_BASE_ADDR
+#undef ACE_DEFAULT_BASE_ADDRL
+#undef ACE_DEFAULT_CLOSE_ALL_HANDLES
+#undef ACE_DEFAULT_MAX_SOCKET_BUFSIZ
+#undef ACE_DEFAULT_SELECT_REACTOR_SIZE
+#undef ACE_MALLOC_ALIGN
+#undef ACE_MAP_PRIVATE
+#undef ACE_THR_PRI_FIFO_DEF
+#undef ACE_TIMER_SKEW
+#undef ACE_UINT64_FORMAT_SPECIFIER
+#undef ACE_USE_RCSID
+#undef IP_ADD_MEMBERSHIP
+#undef IP_DROP_MEMBERSHIP
+
+/* Specify sizes of given built-in types.  If a size isn't defined here,
+   then ace/Basic_Types.h will attempt to deduce the size. */
+/* #undef ACE_SIZEOF_CHAR */
+#undef ACE_SIZEOF_SHORT
+#undef ACE_SIZEOF_INT
+#undef ACE_SIZEOF_LONG
+#undef ACE_SIZEOF_LONG_LONG
+#undef ACE_SIZEOF_VOID_P
+#undef ACE_SIZEOF_FLOAT
+#undef ACE_SIZEOF_DOUBLE
+#undef ACE_SIZEOF_LONG_DOUBLE
+
+/* typedef for ACE_UINT64 */
+/*
+   We only make the typedef if ACE_UINT64_TYPEDEF is defined and
+   ACE_LACKS_LONGLONG_T isn't defined  .  Otherwise,
+   let ace/Basic_Types.h do the work for us.  ACE_UINT64_TYPEDEF is
+   defined during the initial configuration process if a 64 bit unsigned int
+   was found.
+*/
+#undef ACE_UINT64_TYPEDEF
+#if defined(ACE_UINT64_TYPEDEF)
+  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
+#endif /* ACE_UINT64_TYPEDEF */
+
+/* Enable ACE inlining */
+#undef __ACE_INLINE__
+
+/* Explicitly disable ACE inlining */
+#undef ACE_NO_INLINE
+
+/* Enable ACE_Timeprobes */
+#undef ACE_COMPILE_TIMEPROBES
+
+/* Enable use of GNU template repositories.  GNU C++ w/repo patch
+   and EGCS only */
+#undef ACE_HAS_GNU_REPO
+
+/* Platform supports new C++ style casts (dynamic_cast, static_cast,
+   reinterpret_cast and const_cast) */
+#undef ACE_HAS_ANSI_CASTS
+
+/* Platform supports Asynchronous IO calls */
+#undef ACE_HAS_AIO_CALLS
+
+/* Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_.  Defaults to 64.  */
+#undef ACE_DEFAULT_THREAD_KEYS
+
+/* Specify this if you don't want threads to inherit parent thread's
+   ACE_Log_Msg properties. */
+#undef ACE_THREADS_DONT_INHERIT_LOG_MSG
+
+/* OS has priocntl (2) */
+#undef ACE_HAS_PRIOCNTL
+
+/* Platform has the MIT pthreads APIs for timed send/recv operations */
+#undef ACE_HAS_RECV_TIMEDWAIT
+#undef ACE_HAS_RECVFROM_TIMEDWAIT
+#undef ACE_HAS_RECVMSG_TIMEDWAIT
+#undef ACE_HAS_SEND_TIMEDWAIT
+#undef ACE_HAS_SENDTO_TIMEDWAIT
+#undef ACE_HAS_SENDMSG_TIMEDWAIT
+#undef ACE_HAS_READ_TIMEDWAIT
+#undef ACE_HAS_READV_TIMEDWAIT
+#undef ACE_HAS_WRITE_TIMEDWAIT
+#undef ACE_HAS_WRITEV_TIMEDWAIT
+
+/* Platform has enum instead of int for first argument to ::{get,set}rlimit ().
+   The value of this macro is the enum definition, e.g.,
+   enum __rlimit_resource, for Linux glibc 2.0. */
+#undef ACE_HAS_RLIMIT_RESOURCE_ENUM
+
+/* Platform has enum instead of int for first argument to ::getrusage ().  The
+   value of this macro is the enum definition, e.g., enum __rusage_who, for
+   Linux glibc 2.0. */
+#undef ACE_HAS_RUSAGE_WHO_ENUM
+
+/* Used when users want to compile ACE with STL and STL map class conflicts
+   with <net/if.h> map struct. */
+#undef ACE_HAS_STL_MAP_CONFLICT
+
+/* Used when users want to compile ACE with STL and STL queue class conflicts
+   with <netinet/in.h> queue struct. */
+#undef ACE_HAS_STL_QUEUE_CONFLICT
+
+/* Platform has BSD 4.4 sendmsg()/recvmsg() APIs. */
+#undef ACE_HAS_4_4BSD_SENDMSG_RECVMSG
+
+/* Platform has pread() and pwrite() support */
+#undef ACE_HAS_P_READ_WRITE
+
+/* Platform, such as AIX4, needs to wrap #include of sys/socket.h with
+   #undef/#define of __cplusplus. */
+#undef ACE_HAS_AIX_BROKEN_SOCKET_HEADER
+
+/* Platform has AIX4 ::read_real_time () */
+#undef ACE_HAS_AIX_HI_RES_TIMER
+
+/* Compiler/platform supports alloca() */
+#undef ACE_HAS_ALLOCA
+
+/* Compiler/platform has <alloca.h> */
+#undef ACE_HAS_ALLOCA_H
+
+/* CPU is an Alpha, with the rpcc instruction to read the tick timer. */
+#undef ACE_HAS_ALPHA_TIMER
+
+/* Compiler/platform correctly calls init()/fini() for shared libraries */
+#undef ACE_HAS_AUTOMATIC_INIT_FINI
+
+/* Compiler handles explicit calling of template destructor correctly.
+   See "ace/OS.h" for details. */
+#undef ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR
+
+/* Compiler/platform uses macro for ctime (e.g., MVS) */
+#undef ACE_HAS_BROKEN_CTIME
+
+/* Platform headers don't support <msg.h> prototypes */
+#undef ACE_HAS_BROKEN_MSG_H
+
+/* HP/UX does not wrap the mmap(2) header files with extern "C". */
+#undef ACE_HAS_BROKEN_MMAP_H
+
+/* Platform defines struct timespec in <sys/timers.h> */
+#undef ACE_HAS_BROKEN_POSIX_TIME
+
+/* Platform defines ctime_r, asctime_r, rand_r and getpwnam_r as macros */
+#undef ACE_HAS_BROKEN_R_ROUTINES
+
+/* Compiler can't handle the static ACE_Addr::sap_any construct. */
+#undef ACE_HAS_BROKEN_SAP_ANY
+
+/* OS/compiler omits the const from the sendmsg() prototype. */
+#undef ACE_HAS_BROKEN_SENDMSG
+
+/* OS/compiler omits the const from the rlimit parameter in the setrlimit()
+   prototype. */
+#undef ACE_HAS_BROKEN_SETRLIMIT
+
+/* Platform doesn't define _terrno() even though it should (only for TLI) */
+#undef ACE_HAS_BROKEN_T_ERRNO
+
+/* platform define struct timespec members as ts_sec and ts_nsec instead of
+   tv_sec and tv_nsec.  This is highly non-portable.  Currently only
+   FreeBSD 2.1.x uses it. */
+#undef ACE_HAS_BROKEN_TIMESPEC_MEMBERS
+
+/* OS/compiler omits the const from the iovec parameter in the writev()
+   prototype. */
+#undef ACE_HAS_BROKEN_WRITEV
+
+/* Platform has <bstring.h> (which contains bzero() prototype) */
+#undef ACE_HAS_BSTRING
+
+/* Platform has <bytesex.h>. */
+#undef ACE_HAS_BYTESEX_H
+
+/* Platform supports the Win32 CancelIO() function (WinNT 4.0 and beyond). */
+#undef ACE_HAS_CANCEL_IO
+
+/* OS/platform uses char * for dlopen/dlsym args, rather than const char *. */
+#undef ACE_HAS_CHARPTR_DL
+
+/* OS/platform uses char * for sockopt, rather than const char * */
+#undef ACE_HAS_CHARPTR_SOCKOPT
+
+/* sprintf() returns char * rather than int (e.g., SunOS 4.x)  */
+#undef ACE_HAS_CHARPTR_SPRINTF
+
+/* Platform supports POSIX 1.b clock_gettime () */
+#undef ACE_HAS_CLOCK_GETTIME
+
+/* Prototypes for both signal() and struct sigaction are consistent. */
+#undef ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
+
+/* Compiler/platform has correctly prototyped header files */
+#undef ACE_HAS_CPLUSPLUS_HEADERS
+
+/* Platform has cygwin32 socket.h */
+#undef ACE_HAS_CYGWIN32_SOCKET_H
+
+/* Platform supports operations on directories via struct dirent,
+   readdir_r, etc. */
+#undef ACE_HAS_DIRENT
+
+/* For platforms, e.g., RedHat 4.2/Linux 2.0.30/Alpha, that don't declare dl*
+   functions as extern "C" in dlfcn.h.*/
+#undef ACE_HAS_DLFCN_H_BROKEN_EXTERN_C
+
+/* Compiler supports C++ exception handling */
+#undef ACE_HAS_EXCEPTIONS
+
+/* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be
+   defined, except on Win32) */
+#undef ACE_HAS_GETPAGESIZE
+
+/* Platform supports the getrusage() system call. */
+#undef ACE_HAS_GETRUSAGE
+
+/* Platform has a getrusage () prototype in sys/resource.h that differs from
+   the one in ace/OS.i. */
+#undef ACE_HAS_GETRUSAGE_PROTO
+
+/* GNUC 2.7.3 mistakenly takes the template definition as the place where an
+   inline function of an argument class is first used. */
+#undef ACE_HAS_GNUC_BROKEN_TEMPLATE_INLINE_FUNCTIONS
+
+/* Denotes that GNU has cstring.h as standard which redefines memchr() */
+#undef ACE_HAS_GNU_CSTRING_H
+
+/* The GPERF utility is compiled for this platform */
+#undef ACE_HAS_GPERF
+
+/* Optimize ACE_Handle_Set::count_bits for select() operations (common case) */
+#undef ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
+
+/* Compiler/platform supports SunOS high resolution timers */
+#undef ACE_HAS_HI_RES_TIMER
+
+/* Compiler/platform supports idtype_t. */
+#undef ACE_HAS_IDTYPE_T
+
+/* Inline all the static class OS methods to remove call overhead */
+/* Note: This gets defined by OS.h if __ACE_INLINE__ is defined */
+#undef ACE_HAS_INLINED_OSCALLS
+
+/* Platform supports IP multicast */
+#undef ACE_HAS_IP_MULTICAST
+
+/* Platform supports the very odd IRIX 6.2 threads... */
+#undef ACE_HAS_IRIX62_THREADS
+
+/* 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
+
+/* Platform supports thr_keydelete (e.g,. UNIXWARE) */
+#undef ACE_HAS_THR_KEYDELETE
+
+/* Platform calls thr_minstack() rather than thr_min_stack() (e.g., Tandem). */
+#undef ACE_HAS_THR_MINSTACK
+
+/* The rusage_t structure has only two fields. */
+#undef ACE_HAS_LIMITED_RUSAGE_T
+
+/* 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 defines MAP_FAILED as a long constant. */
+#undef ACE_HAS_LONG_MAP_FAILED
+
+/* Enabled malloc statistics collection. */
+#undef ACE_HAS_MALLOC_STATS
+
+/* Avoid #including ace/streams.h in OS.h.  Users must include ace/streams.h,
+   <iostream>, or <iostream.h> explicitly in their code.  Some platforms, such
+   as g++/VxWorks, have trouble compiling templates and iostreams header
+   because of static variables in the stream headers.  This flag will also
+   avoid extra compilation and runtime overheads on some platforms. */
+#undef ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION
+
+/* Platform supports recvmsg and sendmsg */
+#undef ACE_HAS_MSG
+
+/* Platform uses non-const char * in calls to gethostbyaddr, gethostbyname,
+   getservbyname */
+#undef ACE_HAS_NONCONST_GETBY
+
+/* Platform has a non-const parameter to msgsnd() (e.g., SCO). */
+#undef ACE_HAS_NONCONST_MSGSND
+
+/* Platform's select() uses non-const timeval* (only found on Linux right
+   now) */
+#undef ACE_HAS_NONCONST_SELECT_TIMEVAL
+
+/* Platform has "old" GNU compiler,  i.e. does not completely support
+   standard C++. (compiling with g++ prior to version 2.8.0) */
+#undef ACE_HAS_GNUG_PRE_2_8
+
+/* Compiler/platform uses old malloc()/free() prototypes (ugh) */
+#undef ACE_HAS_OLD_MALLOC
+
+/* Uses ctime_r & asctime_r with only two parameters vs. three. */
+#undef ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+
+/* Platform, e.g., Solaris 2.5, only supports SCHED_OTHER POSIX scheduling
+   policy. */
+#undef ACE_HAS_ONLY_SCHED_OTHER
+
+/* Platform supports the OSF TLI timod STREAMS module */
+#undef ACE_HAS_OSF_TIMOD_H
+
+/* Platform is an Intel Pentium microprocessor. */
+#undef ACE_HAS_PENTIUM
+
+/* Platform contains <poll.h> */
+#undef ACE_HAS_POLL
+
+/* Platform supports POSIX O_NONBLOCK semantics */
+#undef ACE_HAS_POSIX_NONBLOCK
+
+/* Platform supports POSIX real-time semaphores (e.g., VxWorks and Solaris) */
+#undef ACE_HAS_POSIX_SEM
+
+/* Platform supports the POSIX struct timespec type */
+#undef ACE_HAS_POSIX_TIME
+
+/* Platform supports the /proc file system and defines tid_t
+   in <sys/procfs.h> */
+#undef ACE_HAS_PROC_FS
+
+/* Platform supports PowerPC time-base register. */
+#undef ACE_HAS_POWERPC_TIMER
+
+/* Platform supports the prusage_t struct */
+#undef ACE_HAS_PRUSAGE_T
+
+/* Platform supports POSIX Threads */
+#undef ACE_HAS_PTHREADS
+
+/* Platform supports POSIX Threads .4a Draft 4 */
+#undef ACE_HAS_PTHREADS_DRAFT4
+
+/* Platform supports POSIX Threads .4a Draft 6 */
+#undef ACE_HAS_PTHREADS_DRAFT6
+
+/* Platform supports POSIX Threads .1c Draft 7 */
+#undef ACE_HAS_PTHREADS_DRAFT7
+
+/* Platform supports POSIX.1c-1995 threads */
+#undef ACE_HAS_PTHREADS_STD
+
+/* Platform has pthread_sigmask() defined. */
+#undef ACE_HAS_PTHREAD_SIGMASK
+
+/* Platform will recurse infinitely on thread exits from TSS cleanup routines
+   (e.g., AIX) */
+#undef ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+
+/* Platform supports reentrant functions (i.e., all the POSIX *_r
+   functions). */
+#undef ACE_HAS_REENTRANT_FUNCTIONS
+
+/* Solaris for intel uses macros for fstat() and stat(), these are wrappers for
+   _fxstat() and _xstat() uses of the macros.  Causes compile and runtime
+   problems. */
+#undef ACE_HAS_X86_STAT_MACROS
+
+/* Platform has support for multi-byte character support compliant with the
+   XPG4 Worldwide Portability Interface wide-character classification. */
+#undef ACE_HAS_XPG4_MULTIBYTE_CHAR
+
+/* Compiler/platform lacks the standard C library bsearch() function  */
+#undef ACE_LACKS_BSEARCH
+
+/* Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but does not define
+   CMSG_DATA (cmsg) macro. */
+#undef ACE_LACKS_CMSG_DATA_MACRO
+
+/* Platform has ACE_HAS_4_4BSD_SENDMSG_RECVMSG but its cmsghdr structure does
+   not contain an 'unsigned char cmsg_data[0]' member.  (This may be
+   'unsigned char __cmsg_data[0]' on some platforms, in which case we need
+   another macro.) */
+#undef ACE_LACKS_CMSG_DATA_MEMBER
+
+/* Compiler/platform lacks the standard C library qsort() function */
+#undef ACE_LACKS_QSORT
+
+/* Platform lacks POSIX-style fcntl () */
+#undef ACE_LACKS_FCNTL
+
+/* Platform lacks fsync() */
+#undef ACE_LACKS_FSYNC
+
+/* Compiler does not support dynamic_cast.  Usually used
+   with ACE_HAS_ANSI_CASTS */
+#undef ACE_LACKS_RTTI
+
+/* Platform lacks readdir_r() */
+#undef ACE_LACKS_READDIR_R
+
+/* Platform lacks seekdir() */
+#undef ACE_LACKS_SEEKDIR
+
+/* Platform lacks telldir() */
+#undef ACE_LACKS_TELLDIR
+
+/* Platform can't handle "inline" keyword correctly. */
+#undef ACE_LACKS_INLINE_FUNCTIONS
+
+/* Iostreams are not supported adequately on the given platform. */
+#undef ACE_LACKS_IOSTREAM_TOTALLY
+
+/* Platform does not support reentrant netdb functions (getprotobyname_r,
+   getprotobynumber_r, gethostbyaddr_r, gethostbyname_r, getservbyname_r). */
+#undef ACE_LACKS_NETDB_REENTRANT_FUNCTIONS
+
+/* Platform supports the POSIX regular expression library */
+#undef ACE_HAS_REGEX
+
+/* Platform has special header for select(). */
+#undef ACE_HAS_SELECT_H
+
+/* Compiler/platform defines a union semun for SysV shared memory */
+#undef ACE_HAS_SEMUN
+
+/* Platform has a function to set t_errno (e.g., Tandem). */
+#undef ACE_HAS_SET_T_ERRNO
+
+/* Platform supports SVR4 extended signals */
+#undef ACE_HAS_SIGINFO_T
+
+/* Platform/compiler has macros for sig{empty,fill,add,del}set (e.g., SCO and
+   FreeBSD) */
+#undef ACE_HAS_SIG_MACROS
+
+/* Platform supports the Win32 SignalObjectAndWait() function (WinNT 4.0 and
+   beyond). */
+#undef ACE_HAS_SIGNAL_OBJECT_AND_WAIT
+
+/* Automatically restart OS system calls when EINTR occurs */
+#undef ACE_HAS_SIGNAL_SAFE_OS_CALLS
+
+/* Platform/compiler has the sigwait(2) prototype */
+#undef ACE_HAS_SIGWAIT
+
+/* Compiler/platform defines the sig_atomic_t typedef */
+#undef ACE_HAS_SIG_ATOMIC_T
+
+/* Platform supports new BSD inet_addr len field. */
+#undef ACE_HAS_SIN_LEN
+
+/* OS/compiler uses size_t * rather than int * for socket lengths */
+#undef ACE_HAS_SIZET_SOCKET_LEN
+
+/* Platform requires (struct sockaddr *) for msg_name field of
+   struct msghdr. */
+#undef ACE_HAS_SOCKADDR_MSG_NAME
+
+/* Compiler/platform provides the sys/sockio.h file */
+#undef ACE_HAS_SOCKIO_H
+
+/* Platform provides socklen_t type, such as Linux with glibc2. */
+#undef ACE_HAS_SOCKLEN_T
+
+/* Compiler has brain-damaged SPARCwork SunOS 4.x signal prototype... */
+#undef ACE_HAS_SPARCWORKS_401_SIGNALS
+
+/* Compiler supports the ssize_t typedef */
+#undef ACE_HAS_SSIZE_T
+
+/* Platform supports UNIX International Threads */
+#undef ACE_HAS_STHREADS
+
+/* Platform has thr_yield() */
+#undef ACE_HAS_THR_YIELD
+
+/* Platform/compiler supports Standard C++ Library */
+#undef ACE_HAS_STANDARD_CPP_LIBRARY
+
+/* Compiler/platform supports struct strbuf */
+#undef ACE_HAS_STRBUF_T
+
+/* Platform/compiler lacks strdup() (e.g., VxWorks, Chorus, WinCE) */
+#undef ACE_HAS_STRDUP_EMULATION
+
+/* Platform supports STREAMS */
+#undef ACE_HAS_STREAMS
+
+/* Platform supports STREAM pipes */
+#undef ACE_HAS_STREAM_PIPES
+
+/* Compiler/platform supports strerror () */
+#undef ACE_HAS_STRERROR
+
+/* Platform/Compiler supports a String class (e.g., GNU or Win32). */
+#undef ACE_HAS_STRING_CLASS
+
+/* Platform has <strings.h> (which contains bzero() prototype) */
+#undef ACE_HAS_STRINGS
+
+/* Platform has void * as second parameter to gettimeofday and a has a
+   prototype */
+#undef ACE_HAS_SUNOS4_GETTIMEOFDAY
+
+/* Compiler has horrible SunOS 4.x signal handlers... */
+#undef ACE_HAS_SUNOS4_SIGNAL_T
+
+/* Compiler/platform supports SVR4 dynamic linking semantics */
+#undef ACE_HAS_SVR4_DYNAMIC_LINKING
+
+/* Compiler/platform supports SVR4 gettimeofday() prototype but doesn't have
+   a prototype */
+#undef ACE_HAS_SVR4_GETTIMEOFDAY
+
+/* Compiler/platform supports SVR4 signal typedef */
+#undef ACE_HAS_SVR4_SIGNAL_T
+
+/* Compiler/platform supports SVR4 TLI (in particular, T_GETNAME stuff)... */
+#undef ACE_HAS_SVR4_TLI
+
+/* Compiler/platform contains the <sys/syscall.h> file. */
+#undef ACE_HAS_SYSCALL_H
+
+/* Platform provides <sysent.h> header */
+#undef ACE_HAS_SYSENT_H
+
+/* Platform supports system configuration information */
+#undef ACE_HAS_SYSINFO
+
+/* Platform supports System V IPC (most versions of UNIX, but not Win32) */
+#undef ACE_HAS_SYSV_IPC
+
+/* Platform/compiler supports _sys_errlist symbol */
+#undef ACE_HAS_SYS_ERRLIST
+
+/* Platform provides <sys/filio.h> header */
+#undef ACE_HAS_SYS_FILIO_H
+
+/* Compiler/platform supports _sys_siglist array */
+#undef ACE_HAS_SYS_SIGLIST
+
+/* Platform provides <sys/xti.h> header */
+#undef ACE_HAS_SYS_XTI_H
+
+/* Compiler implements template specialization */
+#undef ACE_HAS_TEMPLATE_SPECIALIZATION
+
+/* Compiler implements templates that support typedefs inside of classes used
+   as formal arguments to a template class. */
+#undef ACE_HAS_TEMPLATE_TYPEDEFS
+
+/* Platform has terminal ioctl flags like TCGETS and TCSETS. */
+#undef ACE_HAS_TERM_IOCTLS
+
+/* Platform supports threads */
+#undef ACE_HAS_THREADS
+
+/* Platform has thread_self() rather than pthread_self() (e.g., DCETHREADS
+   and AIX) */
+#undef ACE_HAS_THREAD_SELF
+
+/* Compiler/platform has thread-specific storage */
+#undef ACE_HAS_THREAD_SPECIFIC_STORAGE
+
+/* Platform/compiler supports timezone * as second parameter to
+   gettimeofday() and has a prototype*/
+#und
+
+/* Platform supports TLI timod STREAMS module */
+#undef ACE_HAS_TIMOD_H
+
+/* Platform supports TLI tiuser header */
+#undef ACE_HAS_TIUSER_H
+
+/* Platform does not protect <tiuser.h> with extern "C" */
+#undef ACE_HAS_TIUSER_H_BROKEN_EXTERN_C
+
+/* Platform supports TLI.  Also see ACE_TLI_TCP_DEVICE. */
+#undef ACE_HAS_TLI
+
+/* Platform provides TLI function prototypes */
+#undef ACE_HAS_TLI_PROTOTYPES
+
+/* ACE provides TSS emulation.  See also ACE_DEFAULT_THREAD_KEYS. */
+#undef ACE_HAS_TSS_EMULATION
+
+/* Platform supports ualarm() */
+#undef ACE_HAS_UALARM
+
+/* Platform supports ucontext_t (which is used in the extended signal API). */
+#undef ACE_HAS_UCONTEXT_T
+
+/* The wait() system call takes a (union wait *) rather than int * */
+#undef ACE_HAS_UNION_WAIT
+
+/* Has inconsistent SVR4 signal stuff, but not the same as the other
+   platforms */
+#undef ACE_HAS_UNIXWARE_SVR4_SIGNAL_T
+
+/* Platform has <utime.h> header file */
+#undef ACE_HAS_UTIME
+
+/* Compiler supports the C++ typename keyword */
+#undef ACE_HAS_TYPENAME_KEYWORD
+
+/* Compiler supports the new using keyword for C++ namespaces. */
+#undef ACE_HAS_USING_KEYWORD
+
+/* Prints out console message in ACE_NOTSUP.  Useful for tracking down origin
+   of ACE_NOTSUP. */
+#undef ACE_HAS_VERBOSE_NOTSUP
+
+/* Platform requires void * for mmap(). */
+#undef ACE_HAS_VOIDPTR_MMAP
+
+/* OS/compiler uses void * arg 4 setsockopt() rather than const char * */
+#undef ACE_HAS_VOIDPTR_SOCKOPT
+
+/* The Win32 platform support TryEnterCriticalSection() (WinNT 4.0 and
+   beyond) */
+#undef ACE_HAS_WIN32_TRYLOCK
+
+/* Platform has the XLI version of TLI */
+#undef ACE_HAS_XLI
+
+/* Platform has Xt Intrinsics Toolkit */
+#undef ACE_HAS_XT
+
+/* Platform does not have Motif X toolkit available */
+#undef ACE_LACKS_MOTIF
+
+/* Platform has XTI (X/Open-standardized superset of TLI).  Implies
+   ACE_HAS_TLI but uses a different header file. */
+#undef ACE_HAS_XTI
+
+/* Platform lacks access() (e.g., VxWorks and Chorus) */
+#undef ACE_LACKS_ACCESS
+
+/* Platform can not build ace/IOStream{,_T}.cpp.  This does not necessarily
+   mean that the platform does not support iostreams. */
+#undef ACE_LACKS_ACE_IOSTREAM
+
+/* Platform lacks condition variables (e.g., Win32 and VxWorks) */
+#undef ACE_LACKS_COND_T
+
+/* pthread_cond_timedwait does *not* reset the time argument when
+   the lock is acquired. */
+#undef ACE_LACKS_COND_TIMEDWAIT_RESET
+
+/* Platform has no implementation of pthread_condattr_setpshared(), even
+   though it supports pthreads! */
+#undef ACE_LACKS_CONDATTR_PSHARED
+
+/* Platform uses struct strbuf * rather than const struct strbuf * (e.g.,
+   HP/UX 10.x) */
+#undef ACE_LACKS_CONST_STRBUF_PTR
+
+/* Platform lacks difftime() implementation */
+#undef ACE_LACKS_DIFFTIME
+
+/* Platform lacks the exec() family of system calls (e.g., Win32, VxWorks,
+   Chorus) */
+#undef ACE_LACKS_EXEC
+
+/* Platform lacks file locking mechanism */
+#undef ACE_LACKS_FILELOCKS
+
+/* Platform does not support floating point operations */
+#undef ACE_LACKS_FLOATING_POINT
+
+/* Platform lacks the fork() system call (e.g., Win32, VxWorks, Chorus) */
+#undef ACE_LACKS_FORK
+
+/* Platform lacks the getopt() prototype (e.g., LynxOS) */
+#undef ACE_LACKS_GETOPT_PROTO
+
+/* Platform lacks getpgid() call (e.g., Win32, Chorus, and FreeBSD). */
+#undef ACE_LACKS_GETPGID
+
+/* iostream header does not declare ipfx (), opfx (), etc. */
+#undef ACE_LACKS_IOSTREAM_FX
+
+/* Platform lacks streambuf "linebuffered ()". */
+#undef ACE_LACKS_LINEBUFFERED_STREAMBUF
+
+/* Compiler/platform does not support the unsigned long long datatype. */
+#undef ACE_LACKS_LONGLONG_T
+
+/* Platform lacks the lstat() function. */
+#undef ACE_LACKS_LSTAT
+
+/* Platform does not have u_longlong_t typedef */
+#undef ACE_LACKS_U_LONGLONG_T
+
+/* Platform lacks madvise() (e.g., Linux) */
+#undef ACE_LACKS_MADVISE
+
+/* Platform lacks malloc.h */
+#undef ACE_LACKS_MALLOC_H
+
+/* Platform lacks memory.h (e.g., VxWorks and Chorus) */
+#undef ACE_LACKS_MEMORY_H
+
+/* Platform lacks mkfifo(), e.g. VxWorks, Chorus, pSoS, and WinNT. */
+#undef ACE_LACKS_MKFIFO
+
+/* ACE has no mktemp() */
+#undef ACE_LACKS_MKTEMP
+
+/* The platform doesn't have mmap(2) (e.g., SCO UNIX). */
+#undef ACE_LACKS_MMAP
+
+/* Platform/compiler doesn't have open() mode masks. */
+#undef ACE_LACKS_MODE_MASKS
+
+/* The platform doesn't have mprotect(2) (e.g., EPLX real time OS from CDC
+   (based on LYNX)) */
+#undef ACE_LACKS_MPROTECT
+
+/* Platform defines ACE_HAS_MSG, but lacks msg_accrights{,len}. */
+#undef ACE_LACKS_MSG_ACCRIGHTS
+
+/* Platform lacks struct msgbuf (e.g., NT and MSV). */
+#undef ACE_LACKS_MSGBUF_T
+
+/* Platform lacks msync() */
+#undef ACE_LACKS_MSYNC
+
+/* Platform doesn't support "sync" third argument to msync (?) */
+#undef ACE_HAS_BROKEN_NETBSD_MSYNC
+
+/* Platform doesn't support tempnam */
+#undef ACE_LACKS_TEMPNAM
+
+/* Platform lacks pthread_mutexattr_setpshared(). */
+#undef ACE_LACKS_MUTEXATTR_PSHARED
+
+/* Platform lacks <sys/param.h> (e.g., MVS) */
+#undef ACE_LACKS_PARAM_H
+
+/* Platform lacks named POSIX semaphores (e.g., Chorus) */
+#undef ACE_LACKS_NAMED_POSIX_SEM
+
+/* Platform/compiler lacks {get,set}rlimit() function (e.g., VxWorks, Chorus,
+   and SCO UNIX) */
+#undef ACE_LACKS_RLIMIT
+
+/* Platform/compiler lacks {get,set}rlimit() prototypes (e.g., Tandem) */
+#undef ACE_LACKS_RLIMIT_PROTOTYPE
+
+/* Platform lacks POSIX prototypes for certain System V functions like shared
+   memory and message queues. */
+#undef ACE_LACKS_SOME_POSIX_PROTOTYPES
+
+/* Compiler complains about "#pragma once" */
+#undef ACE_LACKS_PRAGMA_ONCE
+
+/* Platform lacks pri_t (e.g., Tandem NonStop UNIX). */
+#undef ACE_LACKS_PRI_T
+
+/* Platform lack pthread_attr_setstackaddr() */
+#undef ACE_LACKS_THREAD_STACK_ADDR
+
+/* Platform lacks pthread_cancel(). */
+#undef ACE_LACKS_PTHREAD_CANCEL
+
+/* Platform lacks pthread_thr_sigsetmask (e.g., MVS, HP/UX, and OSF/1 3.2) */
+#undef ACE_LACKS_PTHREAD_THR_SIGSETMASK
+
+/* Platfrom lack pthread_yield() support. */
+#undef ACE_LACKS_PTHREAD_YIELD
+
+/* Platform lacks, getpwnam(), etc. */
+#undef ACE_LACKS_PWD_FUNCTIONS
+
+/* Platform lacks getpwnam_r() methods (e.g., SGI 6.2). */
+#undef ACE_LACKS_PWD_REENTRANT_FUNCTIONS
+
+/* Platform lacks the readlink() function. */
+#undef ACE_LACKS_READLINK
+
+/* Platform lacks recvmsg() */
+#undef ACE_LACKS_RECVMSG
+
+/* Platform lacks readers/writer locks. */
+#undef ACE_LACKS_RWLOCK_T
+
+/* Platform lacks a working sbrk() (e.g., Win32 and VxWorks) */
+#undef ACE_LACKS_SBRK
+
+/* Platform lacks struct sembuf (e.g., Win32 and VxWorks) */
+#undef ACE_LACKS_SEMBUF_T
+
+/* Platform lacks pthread_attr_setdetachstate() (e.g., HP/UX 10.x) */
+#undef ACE_LACKS_SETDETACH
+
+/* Platform lacks pthread_attr_setsched() (e.g. MVS) */
+#undef ACE_LACKS_SETSCHED
+
+/* Platform lacks struct sigaction (e.g., Win32 and Chorus) */
+#undef ACE_LACKS_SIGACTION
+
+/* Platform lacks "signed char" type (broken!) */
+#undef ACE_LACKS_SIGNED_CHAR
+
+/* Platform lacks signal sets (e.g., Chorus and Win32) */
+#undef ACE_LACKS_SIGSET
+
+/* Platform/compiler lacks strrchr () function. */
+#undef ACE_LACKS_STRRCHR
+
+/* Platforms/compiler lacks the sys_nerr variable (e.g., VxWorks and MVS). */
+#undef ACE_LACKS_SYS_NERR
+
+/* Platform lacks sys/msg.h (e.g., Chorus and VxWorks) */
+#undef ACE_LACKS_SYSV_MSG_H
+
+/* Platform lacks key_t (e.g., Chorus, VxWorks, Win32) */
+#undef ACE_LACKS_KEY_T
+
+/* Platform lacks sendmsg() */
+#undef ACE_LACKS_SENDMSG
+
+/* Platform lacks the si_addr field of siginfo_t (e.g., VxWorks and
+   HP/UX 10.x) */
+#undef ACE_LACKS_SI_ADDR
+
+/* Platform lacks System V shared memory (e.g., Win32 and VxWorks) */
+#undef ACE_LACKS_SYSV_SHMEM
+
+/* Platform lacks the siginfo.h include file (e.g., MVS) */
+#undef ACE_LACKS_SIGINFO_H
+
+/* Platform doesn't support SO_SNDBUF/SO_RCVBUF (used in TAO) */
+#undef ACE_LACKS_SOCKET_BUFSIZ
+
+/* Platform lacks the socketpair() call (e.g., SCO UNIX) */
+#undef ACE_LACKS_SOCKETPAIR
+
+/* Compiler doesn't support static data member templates */
+#undef ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
+
+/* Compiler/platform lacks strcasecmp() (e.g., DG/UX, UNIXWARE, VXWORKS) */
+#undef ACE_LACKS_STRCASECMP
+
+/* Platform doesn't define struct strrecvfd. */
+#undef ACE_LACKS_STRRECVFD
+
+/* Platform doesn't have syscall() prototype */
+#undef ACE_LACKS_SYSCALL
+
+/* Platform lacks <sys/type> header file */
+#undef ACE_LACKS_SYS_TYPES_H
+
+/* Header files lack t_errno for TLI */
+#undef ACE_LACKS_T_ERRNO
+
+/* Platform doesn't have netinet/tcp.h */
+#undef ACE_LACKS_TCP_H
+
+/* Platform lacks pthread_attr_setscope() */
+#undef ACE_LACKS_THREAD_PROCESS_SCOPING
+
+/* Platform lacks pthread_attr_setstacksize() (e.g., Linux pthreads) */
+#undef ACE_LACKS_THREAD_STACK_SIZE
+
+/* MIT pthreads platform lacks the timedwait prototypes */
+#undef ACE_LACKS_TIMEDWAIT_PROTOTYPES
+
+/* Platform does not define timepec_t as a typedef for struct timespec. */
+#undef ACE_LACKS_TIMESPEC_T
+
+/* Platform doesn't have truncate() (e.g., vxworks) */
+#undef ACE_LACKS_TRUNCATE
+
+/* Platform/compiler lacks the ualarm() prototype (e.g., Solaris) */
+#undef ACE_LACKS_UALARM_PROTOTYPE
+
+/* Platform lacks the ucontext.h file */
+#undef ACE_LACKS_UCONTEXT_H
+
+/* Platform lacks the unistd.h file (e.g., VxWorks and Win32) */
+#undef ACE_LACKS_UNISTD_H
+
+/* ACE platform has no UNIX domain sockets */
+#undef ACE_LACKS_UNIX_DOMAIN_SOCKETS
+
+/* Platform lacks full signal support (e.g., Win32 and Chorus). */
+#undef ACE_LACKS_UNIX_SIGNALS
+
+/* Platform lacks struct utsname (e.g., Win32 and VxWorks) */
+#undef ACE_LACKS_UTSNAME_T
+
+/* Platform lacks wchar_t typedef */
+#undef ACE_LACKS_WCHAR_T
+
+/* The bind() call will not select the port if it's 0. */
+#undef ACE_LACKS_WILDCARD_BIND
+
+/* Renames "main (int, char *[])", for platforms such as g++/VxWorks that
+   don't allow main.  Requires the use of ACE_HAS_NONSTATIC_OBJECT_MANAGER. */
+#undef ACE_MAIN
+
+/* Compile using multi-thread libraries */
+#undef ACE_MT_SAFE
+
+/* Turns off debugging features */
+#undef ACE_NDEBUG
+
+/* Required by platforms with small default stacks. */
+#undef ACE_NEEDS_HUGE_THREAD_STACKSIZE
+
+/* 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 doesn't define readv, so use our own */
+#undef ACE_LACKS_READV
+
+/* Platform doesn't define writev, so use our own */
+#undef ACE_LACKS_WRITEV
+
+/* Platform needs regexpr.h for regular expression support */
+#undef ACE_NEEDS_REGEXPR_H
+
+/* Platform needs to #include <sched.h> to get thread scheduling defs. */
+#undef ACE_LACKS_SCHED_H
+
+/* <time.h> doesn't automatically #include <sys/time.h> */
+#undef ACE_LACKS_SYSTIME_H
+
+/* Compiler's 'new' throws exception on failure (ANSI C++ behavior). */
+#undef ACE_NEW_THROWS_EXCEPTIONS
+
+/* Turns off the LM_DEBUG and LM_ERROR logging macros... */
+#undef ACE_NLOGGING
+
+/* Turns off the tracing feature. */
+#undef ACE_NTRACE
+
+/* Defines the page size of the system (not used on Win32 or with
+   ACE_HAS_GETPAGESIZE). */
+#undef ACE_PAGE_SIZE
+
+/* Platform uses int for select() rather than fd_set */
+#undef ACE_SELECT_USES_INT
+
+/* Compiler's template mechanism must use a pragma.  This is used for AIX's
+   C++ compiler. */
+#undef ACE_TEMPLATES_REQUIRE_PRAGMA
+
+/* Compiler's template mechanim must see source code (i.e., .cpp files).  This
+   is used for GNU G++. */
+#undef ACE_TEMPLATES_REQUIRE_SOURCE
+
+/* Compiler's template instantiation mechanism supports the use of explicit
+   C++ specializations for all used templates. This is also used for GNU G++
+   if you don't use the "repo" patches. */
+#undef ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION
+
+/* Compiler's template instantiation mechanism supports the use of
+   "#pragma instantiate".  Edison Design Group compilers, e.g., SGI C++ and
+   Green Hills 1.8.8 and later, support this. */
+#undef ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA
+
+/* Compiler requires a definition for a "hidden" function, e.g., a private,
+   unimplemented copy constructor or assignment operator.  The SGI C++
+   compiler needs this, in template classes, with
+   ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. */
+#undef ACE_NEEDS_FUNC_DEFINITIONS
+
+/* Device the platform uses for TCP on TLI.  Only needed if not /dev/tcp. */
+#undef ACE_TLI_TCP_DEVICE
+
+/* The OS/platform supports the poll() event demultiplexor */
+#undef ACE_USE_POLL
+
+/* Platform has broken poll() */
+#undef ACE_POLL_IS_BROKEN
+
+/* Platform has its standard c++ library in the namespace std. */
+#undef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
+
+/* The number of bytes in a double.  */
+#undef SIZEOF_DOUBLE
+
+/* The number of bytes in a float.  */
+#undef SIZEOF_FLOAT
+
+/* The number of bytes in a int.  */
+#undef SIZEOF_INT
+
+/* The number of bytes in a long.  */
+#undef SIZEOF_LONG
+
+/* The number of bytes in a long double.  */
+#undef SIZEOF_LONG_DOUBLE
+
+/* The number of bytes in a long long.  */
+#undef SIZEOF_LONG_LONG
+
+/* The number of bytes in a short.  */
+#undef SIZEOF_SHORT
+
+/* The number of bytes in a signed char.  */
+#undef SIZEOF_SIGNED_CHAR
+
+/* The number of bytes in a void *.  */
+#undef SIZEOF_VOID_P
+
+/* Define if you have the execv function.  */
+#undef HAVE_EXECV
+
+/* Define if you have the execve function.  */
+#undef HAVE_EXECVE
+
+/* Define if you have the execvp function.  */
+#undef HAVE_EXECVP
+
+/* Define if you have the <dirent.h> header file.  */
+#undef HAVE_DIRENT_H
+
+/* Define if you have the <fstream> header file.  */
+#undef HAVE_FSTREAM
+
+/* Define if you have the <iomanip> header file.  */
+#undef HAVE_IOMANIP
+
+/* Define if you have the <ios> header file.  */
+#undef HAVE_IOS
+
+/* Define if you have the <iostream> header file.  */
+#undef HAVE_IOSTREAM
+
+/* Define if you have the <istream> header file.  */
+#undef HAVE_ISTREAM
+
+/* Define if you have the <ndir.h> header file.  */
+#undef HAVE_NDIR_H
+
+/* Define if you have the <ostream> header file.  */
+#undef HAVE_OSTREAM
+
+/* Define if you have the <pwd.h> header file.  */
+#undef HAVE_PWD_H
+
+/* Define if you have the <streambuf> header file.  */
+#undef HAVE_STREAMBUF
+
+/* Define if you have the <sys/dir.h> header file.  */
+#undef HAVE_SYS_DIR_H
+
+/* Define if you have the <sys/ndir.h> header file.  */
+#undef HAVE_SYS_NDIR_H
+
+/* Define if you have the aio library (-laio).  */
+#undef HAVE_LIBAIO
+
+/* Define if you have the c_r library (-lc_r).  */
+#undef HAVE_LIBC_R
+
+/* Define if you have the dld library (-ldld).  */
+#undef HAVE_LIBDLD
+
+/* Define if you have the exc library (-lexc).  */
+#undef HAVE_LIBEXC
+
+/* Define if you have the gen library (-lgen).  */
+#undef HAVE_LIBGEN
+
+/* Define if you have the nsl library (-lnsl).  */
+#undef HAVE_LIBNSL
+
+/* Define if you have the socket library (-lsocket).  */
+#undef HAVE_LIBSOCKET
+
+/* Define if you have the xnet library (-lxnet).  */
+#undef HAVE_LIBXNET
+
+/* Define if you have the xti library (-lxti).  */
+#undef HAVE_LIBXTI
+
+/* Name of package */
+#undef PACKAGE
+
+/* Version number of package */
+#undef VERSION
+
+
+
+#endif /* ACE_CONFIG_H */
diff --git a/ace/streams.h b/ace/streams.h
index 290b17a89ba..6bd1b445429 100644
--- a/ace/streams.h
+++ b/ace/streams.h
@@ -22,25 +22,25 @@
 // ============================================================================
 
 #ifndef ACE_STREAMS_H
-# define ACE_STREAMS_H
+#define ACE_STREAMS_H
 
-# include "ace/inc_user_config.h"
+#include "ace/inc_user_config.h"
 
-# if !defined (ACE_LACKS_PRAGMA_ONCE)
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-# endif /* ACE_LACKS_PRAGMA_ONCE */
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#   if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
+#if defined (ACE_HAS_STANDARD_CPP_LIBRARY) && (ACE_HAS_STANDARD_CPP_LIBRARY != 0)
 
-#     if defined (_MSC_VER)
+#if defined (_MSC_VER)
 #pragma warning(disable: 4018 4114 4146 4245)
 #pragma warning(disable: 4663 4664 4665 4511 4512)
-#     endif /* _MSC_VER */
+#endif /* _MSC_VER */
 
-#     if defined (ACE_USES_OLD_IOSTREAMS)
+#if defined (ACE_USES_OLD_IOSTREAMS)
 #include /**/ <iostream.h>
 #include /**/ <fstream.h>
-#     else
+#else
 #include /**/ <iomanip>
 #include /**/ <ios>
 #include /**/ <iostream>
@@ -48,12 +48,12 @@
 #include /**/ <ostream>
 #include /**/ <fstream>
 #include /**/ <streambuf>
-#     endif /* ACE_USES_OLD_IOSTREAMS */
+#endif /* ACE_USES_OLD_IOSTREAMS */
 
-#     if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
+#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) && \
             (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB != 0)
 
-#       if !defined (ACE_USES_OLD_IOSTREAMS)
+#if !defined (ACE_USES_OLD_IOSTREAMS)
 // Make these available in the global name space
 using std::ios;
 using std::streambuf;
@@ -85,33 +85,33 @@ using std::setw;
 using std::dec;
 using std::hex;
 using std::oct;
-#       endif /* ! ACE_USES_OLD_IOSTREAMS */
+#endif /* ! ACE_USES_OLD_IOSTREAMS */
 
-#     endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
+#endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
 
-#     if defined (_MSC_VER)
+#if defined (_MSC_VER)
 #pragma warning(4: 4018 4114 4146 4245)
 #pragma warning(4: 4663 4664 4665 4512 4511)
-#     endif /* _MSC_VER */
+#endif /* _MSC_VER */
 
-#   else /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#else /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
-#   if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
+#if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 #include /**/ <fstream.h>
 #include /**/ <iostream.h>
 
-#     if defined (ACE_WIN32)
-#       if defined(_MSC_VER) // VSB
+#if defined (ACE_WIN32)
+#if defined(_MSC_VER) // VSB
 #include /**/ <ios.h>
 #include /**/ <streamb.h>
 #include /**/ <istream.h>
 #include /**/ <ostream.h>
 #include /**/ <iomanip.h>
-#       endif /* _MSC_VER */
+#endif /* _MSC_VER */
 #include /**/ <strstrea.h> // VSB
-#     endif /* ACE_WIN32 */
-#   endif /* ACE_LACKS_IOSTREAM_TOTALLY */
+#endif /* ACE_WIN32 */
+#endif /* ACE_LACKS_IOSTREAM_TOTALLY */
 
-# endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
+#endif /* ACE_HAS_STANDARD_CPP_LIBRARY */
 
 #endif /* ACE_STREAMS_H */
diff --git a/aceConf.sh.in b/aceConf.sh.in
deleted file mode 100644
index bff456f6928..00000000000
--- a/aceConf.sh.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Configuration of the ACE distribution
-#
-
-ACE_COMPILER="@CXX@"
-ACE_LIBDIR="@ACE_LIBDIR@"
-ACE_INCLUDEDIR="@ACE_INCLUDEDIR@ @CXXFLAGS@"
-ACE_LIBS="@ACE_LIBS@"
diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 00000000000..ebca7cfe1e1
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,856 @@
+dnl -------------------------------------------------------------------------
+dnl       $Id$
+dnl 
+dnl       ACE M4 include file which contains ACE specific M4 macros
+dnl       to be used by the ACE configure script.
+dnl 
+dnl -------------------------------------------------------------------------
+
+dnl  Copyright (C) 1998  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 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*)
+     ;;
+   *tandem*)
+     ;;
+   *unixware*)
+     ;;
+   *vxworks*)
+     ;;
+   *)
+     CXXFLAGS="$CXXFLAGS"
+     ACE_CXXFLAGS="$ACE_CXXFLAGS"
+     DCXXFLAGS="-g"
+     OCXXFLAGS="-O"
+     ;;
+ esac
+])
+
+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
+[
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $1"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+
+ AC_TRY_COMPILE($2, $3, $4, $5)
+
+ dnl Restore the C++ and C flags
+ CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_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.
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  $1
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+])
+
+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" = yes; then
+    ace_just_a_place_holder=fixme
+ifelse([$4], , :, [$4])
+  else
+    ace_just_a_place_holder=fixme
+ifelse([$5], , , [$5
+])dnl
+  fi
+])
+
+dnl   checks for programs
+
+dnl   checks for libraries
+
+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
+      ])
+   ],
+   [
+    ace_cv_feature_thread_flag_set=no
+
+    save_CXXFLAGS="$CXXFLAGS"
+    save_CFLAGS="$CFLAGS"
+
+    CXXFLAGS="$CXXFLAGS -mt"
+    CFLAGS="$CFLAGS -mt"
+
+    ACE_CACHE_CHECK(if compiler can use -mt flag,
+      ace_cv_feature_has_mt_flag,
+      [
+       ACE_CHECK_THREAD_FLAGS(
+         [
+          ace_cv_feature_has_mt_flag=yes
+         ],
+         [
+          ace_cv_feature_has_mt_flag=no
+         ])
+      ],
+      [
+       ace_cv_feature_thread_flag_set=yes
+      ],
+      [
+       CXXFLAGS="$save_CXXFLAGS"
+       CFLAGS="$save_CFLAGS"
+      ])
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+ 
+      CXXFLAGS="$CXXFLAGS -pthread"
+      CFLAGS="$CFLAGS -pthread"
+
+      ACE_CACHE_CHECK(if compiler can use -pthread flag,
+        ace_cv_feature_has_pthread_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_pthread_flag=yes
+           ],
+           [
+            ace_cv_feature_has_pthread_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -pthreads"
+      CFLAGS="$CFLAGS -pthreads"
+
+      ACE_CACHE_CHECK(if compiler can use -pthreads flag,
+        ace_cv_feature_has_pthreads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_pthreads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_pthreads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -mthreads"
+      CFLAGS="$CXXFLAGS -mthreads"
+
+      ACE_CACHE_CHECK(if compiler can use -mthreads flag,
+        ace_cv_feature_has_mthreads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_mthreads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_mthreads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -threads"
+      CFLAGS="$CXXFLAGS -threads"
+
+      ACE_CACHE_CHECK(if compiler can use -threads flag,
+        ace_cv_feature_has_dash_threads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_dash_threads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_dash_threads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+   ],
+   [
+    dnl Do nothing
+   ])
+
+dnl Check for UNIX International Threads -- STHREADS
+
+  ace_has_sthreads=no
+
+  AC_CHECK_FUNC(thr_create,
+    [
+     ace_has_sthreads=yes
+     AC_DEFINE(ACE_HAS_STHREADS)
+    ],
+    [
+     AC_CHECK_LIB(thread, thr_create, dnl
+                  [
+                   ace_has_sthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_STHREADS), the default behavior of
+dnl of adding "-lthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                   LIBS="$LIBS -lthread"
+                   AC_DEFINE(ACE_HAS_STHREADS)
+                  ],)
+    ])
+
+dnl Check for POSIX threads
+
+    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().)
+
+    AC_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
+         ])
+      ])
+
+    ace_has_pthreads=no
+
+dnl Check for POSIX threads -- PTHREADS
+    ACE_CHECK_FUNC(pthread_create, pthread.h,
+      [
+       ace_has_pthreads=yes
+       AC_DEFINE(ACE_HAS_PTHREADS)
+      ],
+      [
+       AC_CHECK_LIB(pthread, pthread_create, dnl
+                    [
+                     ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                     LIBS="$LIBS -lpthread"
+                     AC_DEFINE(ACE_HAS_PTHREADS)
+                    ],)
+
+dnl Check if pthread function names are mangled (e.g. DU 4.0) to maintain
+dnl older Pthread Draft compatibility.
+       if test "$ace_has_pthreads" = no &&
+          test "$ace_cv_lib_pthread_compat_macros" = yes; then
+         ACE_CHECK_LIB(pthread, pthread_create, pthread.h, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lpthread"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl test "$ace_has_pthreads" = no && have compatibilty macros
+
+dnl Check if we need to use -lpthreads instead (e.g. AIX 4.2)
+       if test "$ace_has_pthreads" = no; then
+         AC_CHECK_LIB(pthreads, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lpthreads"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl test "$ace_has_pthreads" = no
+
+       if test "$ace_has_pthreads" = no; then  
+dnl Check for POSIX threads in -lc_r
+dnl Check if we already have the necessary library, first
+         AC_CHECK_LIB(c_r, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lc_r" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lc_r"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl  test "$ace_has_pthreads" = no
+
+       if test "$ace_has_pthreads" = no; then  
+dnl Check for POSIX threads in -lgthreads, i.e. FSU Pthreads
+         AC_CHECK_LIB(gthreads, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lgthreads" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lgthreads"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl  test "$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(
+ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+])dnl
+[
+char thr_create();
+], [
+thr_create();
+], [$1],
+[
+dnl
+  AC_REQUIRE([AC_PROG_AWK])
+
+  AC_TRY_CPP(
+    [
+#include <pthread.h>
+    ], ace_header_exists=yes, ace_header_exists=no)
+
+  cat > conftest.$ac_ext <<EOF
+
+#include <pthread.h>
+  ACE_REAL_FUNCTION pthread_create
+
+EOF
+
+  if test "$ace_header_exists" = yes; then
+    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
+    ace_real_function="pthread_create"
+  fi dnl test "$ace_header_not_exist" != yes
+
+AC_TRY_LINK(
+ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+])dnl
+[
+char $ace_real_function();
+], [
+$ace_real_function();
+], [$1],[$2])
+
+dnl
+  ])
+ ])
+])
+
+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
diff --git a/aclocal.m4 b/aclocal.m4
new file mode 100644
index 00000000000..6c1538348e5
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,1544 @@
+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 ACE specific M4 macros
+dnl       to be used by the ACE configure script.
+dnl 
+dnl -------------------------------------------------------------------------
+
+dnl  Copyright (C) 1998  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 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*)
+     ;;
+   *tandem*)
+     ;;
+   *unixware*)
+     ;;
+   *vxworks*)
+     ;;
+   *)
+     CXXFLAGS="$CXXFLAGS"
+     ACE_CXXFLAGS="$ACE_CXXFLAGS"
+     DCXXFLAGS="-g"
+     OCXXFLAGS="-O"
+     ;;
+ esac
+])
+
+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
+[
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS $1"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+
+ AC_TRY_COMPILE($2, $3, $4, $5)
+
+ dnl Restore the C++ and C flags
+ CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_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.
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  $1
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+])
+
+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" = yes; then
+    ace_just_a_place_holder=fixme
+ifelse([$4], , :, [$4])
+  else
+    ace_just_a_place_holder=fixme
+ifelse([$5], , , [$5
+])dnl
+  fi
+])
+
+dnl   checks for programs
+
+dnl   checks for libraries
+
+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
+      ])
+   ],
+   [
+    ace_cv_feature_thread_flag_set=no
+
+    save_CXXFLAGS="$CXXFLAGS"
+    save_CFLAGS="$CFLAGS"
+
+    CXXFLAGS="$CXXFLAGS -mt"
+    CFLAGS="$CFLAGS -mt"
+
+    ACE_CACHE_CHECK(if compiler can use -mt flag,
+      ace_cv_feature_has_mt_flag,
+      [
+       ACE_CHECK_THREAD_FLAGS(
+         [
+          ace_cv_feature_has_mt_flag=yes
+         ],
+         [
+          ace_cv_feature_has_mt_flag=no
+         ])
+      ],
+      [
+       ace_cv_feature_thread_flag_set=yes
+      ],
+      [
+       CXXFLAGS="$save_CXXFLAGS"
+       CFLAGS="$save_CFLAGS"
+      ])
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+ 
+      CXXFLAGS="$CXXFLAGS -pthread"
+      CFLAGS="$CFLAGS -pthread"
+
+      ACE_CACHE_CHECK(if compiler can use -pthread flag,
+        ace_cv_feature_has_pthread_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_pthread_flag=yes
+           ],
+           [
+            ace_cv_feature_has_pthread_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -pthreads"
+      CFLAGS="$CFLAGS -pthreads"
+
+      ACE_CACHE_CHECK(if compiler can use -pthreads flag,
+        ace_cv_feature_has_pthreads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_pthreads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_pthreads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -mthreads"
+      CFLAGS="$CXXFLAGS -mthreads"
+
+      ACE_CACHE_CHECK(if compiler can use -mthreads flag,
+        ace_cv_feature_has_mthreads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_mthreads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_mthreads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -threads"
+      CFLAGS="$CXXFLAGS -threads"
+
+      ACE_CACHE_CHECK(if compiler can use -threads flag,
+        ace_cv_feature_has_dash_threads_flag,
+        [
+         ACE_CHECK_THREAD_FLAGS(
+           [
+            ace_cv_feature_has_dash_threads_flag=yes
+           ],
+           [
+            ace_cv_feature_has_dash_threads_flag=no
+           ])
+        ],
+        [
+         ace_cv_feature_thread_flag_set=yes
+        ],
+        [
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        ])
+
+    fi dnl test "$ace_cv_feature_thread_flag_set" = no
+   ],
+   [
+    dnl Do nothing
+   ])
+
+dnl Check for UNIX International Threads -- STHREADS
+
+  ace_has_sthreads=no
+
+  AC_CHECK_FUNC(thr_create,
+    [
+     ace_has_sthreads=yes
+     AC_DEFINE(ACE_HAS_STHREADS)
+    ],
+    [
+     AC_CHECK_LIB(thread, thr_create, dnl
+                  [
+                   ace_has_sthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_STHREADS), the default behavior of
+dnl of adding "-lthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                   LIBS="$LIBS -lthread"
+                   AC_DEFINE(ACE_HAS_STHREADS)
+                  ],)
+    ])
+
+dnl Check for POSIX threads
+
+    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().)
+
+    AC_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
+         ])
+      ])
+
+    ace_has_pthreads=no
+
+dnl Check for POSIX threads -- PTHREADS
+    ACE_CHECK_FUNC(pthread_create, pthread.h,
+      [
+       ace_has_pthreads=yes
+       AC_DEFINE(ACE_HAS_PTHREADS)
+      ],
+      [
+       AC_CHECK_LIB(pthread, pthread_create, dnl
+                    [
+                     ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                     LIBS="$LIBS -lpthread"
+                     AC_DEFINE(ACE_HAS_PTHREADS)
+                    ],)
+
+dnl Check if pthread function names are mangled (e.g. DU 4.0) to maintain
+dnl older Pthread Draft compatibility.
+       if test "$ace_has_pthreads" = no &&
+          test "$ace_cv_lib_pthread_compat_macros" = yes; then
+         ACE_CHECK_LIB(pthread, pthread_create, pthread.h, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lpthread"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl test "$ace_has_pthreads" = no && have compatibilty macros
+
+dnl Check if we need to use -lpthreads instead (e.g. AIX 4.2)
+       if test "$ace_has_pthreads" = no; then
+         AC_CHECK_LIB(pthreads, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lpthread" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lpthreads"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl test "$ace_has_pthreads" = no
+
+       if test "$ace_has_pthreads" = no; then  
+dnl Check for POSIX threads in -lc_r
+dnl Check if we already have the necessary library, first
+         AC_CHECK_LIB(c_r, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lc_r" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lc_r"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl  test "$ace_has_pthreads" = no
+
+       if test "$ace_has_pthreads" = no; then  
+dnl Check for POSIX threads in -lgthreads, i.e. FSU Pthreads
+         AC_CHECK_LIB(gthreads, pthread_create, dnl
+                      [
+                       ace_has_pthreads=yes
+dnl Since we AC_DEFINE(ACE_HAS_PTHREADS), the default behavior of
+dnl of adding "-lgthreads" to the "LIBS" variable no longer works.
+dnl So, we have to add it manually.
+                       LIBS="$LIBS -lgthreads"
+                       AC_DEFINE(ACE_HAS_PTHREADS)
+                      ],)
+       fi dnl  test "$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(
+ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+])dnl
+[
+char thr_create();
+], [
+thr_create();
+], [$1],
+[
+dnl
+  AC_REQUIRE([AC_PROG_AWK])
+
+  AC_TRY_CPP(
+    [
+#include <pthread.h>
+    ], ace_header_exists=yes, ace_header_exists=no)
+
+  cat > conftest.$ac_ext <<EOF
+
+#include <pthread.h>
+  ACE_REAL_FUNCTION pthread_create
+
+EOF
+
+  if test "$ace_header_exists" = yes; then
+    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
+    ace_real_function="pthread_create"
+  fi dnl test "$ace_header_not_exist" != yes
+
+AC_TRY_LINK(
+ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+])dnl
+[
+char $ace_real_function();
+], [
+$ace_real_function();
+], [$1],[$2])
+
+dnl
+  ])
+ ])
+])
+
+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
+
+
+# serial 31 AC_PROG_LIBTOOL
+AC_DEFUN(AC_PROG_LIBTOOL,
+[AC_PREREQ(2.12.2)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])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_SYS_NM_PARSE])dnl
+AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+dnl
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Check for any special flags to pass to ltconfig.
+libtool_f
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+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"
+
+# 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
+  ;;
+
+*-*-cygwin32*)
+  AC_SYS_LIBTOOL_CYGWIN32
+  ;;
+
+esac
+
+# enable the --disable-libtool-lock switch
+
+AC_ARG_ENABLE(libtool-lock,
+[  --disable-libtool-lock  force libtool not to do file locking],
+need_locks=$enableval,
+need_locks=yes)
+
+if test x"$need_locks" = xno; then
+  libtool_flags="$libtool_flags --disable-lock"
+fi
+
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+DLLTOOL="$DLLTOOL" AS="$AS" \
+${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])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+
+# 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,
+[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_ENABLE_SHARED(no)])
+
+# AC_DISABLE_STATIC - set the default static flag to --disable-static
+AC_DEFUN(AC_DISABLE_STATIC,
+[AC_ENABLE_STATIC(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,
+[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_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]:/*)
+      # Canonicalize the path of ld
+      re_direlt='/[^/][^/]*/\.\./'
+      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
+changequote([,])dnl
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      case "$host_os" in
+      cygwin*)
+	# Convert to a UNC path for cygwin
+	test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
+	;;
+      *)
+	test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+    ##
+    ## FIXME:  The code fails later on if we try to use an $LD with
+    ##         '\\' path separators.
+    ##
+changequote(,)dnl
+    [A-Za-z]:[\\]*)
+      # Canonicalize the path of ld
+      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
+      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
+changequote([,])dnl
+      sub_uncdir='s%\\%/%g'
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+      done
+      case "$host_os" in
+      cygwin*)
+	# Convert to a UNC path for cygwin
+	test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
+	;;
+      *)
+	test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+  "")
+    # 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}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog"; 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}:"
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/nm; 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_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
+# by C symbol name from nm.
+AC_DEFUN(AC_SYS_NM_PARSE,
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output])
+AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
+[# These are sane defaults that work on at least a few old systems.
+# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
+
+changequote(,)dnl
+# Character class describing NM global symbol codes.
+ac_symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+ac_symxfrm='\1 \1'
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+  ac_symcode='[BCDT]'
+  ;;
+cygwin32* | mingw32*)
+  ac_symcode='[ABCDGISTW]'
+  ;;
+irix*)
+  ac_symcode='[BCDEGRST]'
+  ;;
+solaris*)
+  ac_symcode='[BDT]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  ac_symcode='[ABCDGISTW]'
+fi
+changequote([,])dnl
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  # Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
+  # otherwise AC_SYS_SYMBOL_UNDERSCORE will always be false
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]$ac_symcode[ 	][ 	]*$ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  ac_pipe_works=no
+  rm -f conftest.$ac_ext
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func;return 0;}
+EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    ac_nlist=conftest.nm
+  
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+
+      # Try sorting and uniquifying the output.
+      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+	mv -f "$ac_nlist"T "$ac_nlist"
+      else
+	rm -f "$ac_nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	  cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+
+	  cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+changequote(,)dnl
+lt_preloaded_symbols[] =
+changequote([,])dnl
+{
+EOF
+	sed 's/^\(.*\) \(.*\)$/  {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+	cat <<\EOF >> conftest.c
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftestm.$ac_objext
+	  ac_save_LIBS="$LIBS"
+	  ac_save_CFLAGS="$CFLAGS"
+	  LIBS="conftestm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+	    ac_pipe_works=yes
+	  else
+	    echo "configure: failed program was:" >&AC_FD_CC
+	    cat conftest.c >&AC_FD_CC
+	  fi
+	  LIBS="$ac_save_LIBS"
+	  CFLAGS="$ac_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+	fi
+      else
+	echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
+      fi
+    else
+      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+    fi
+  else
+    echo "$progname: failed program was:" >&AC_FD_CC
+    cat conftest.c >&AC_FD_CC
+  fi
+  rm -rf conftest*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$ac_pipe_works" = yes; then
+    if test x"$ac_symprfx" = x"_"; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      ac_cv_sys_symbol_underscore=no
+    fi
+    break
+  else
+    ac_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+
+ac_result=yes
+if test -z "$ac_cv_sys_global_symbol_pipe"; then
+   ac_result=no
+fi
+AC_MSG_RESULT($ac_result)
+])
+
+# AC_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
+AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN32,
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+AC_CHECK_TOOL(AS, as, false)
+])
+
+# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+#                            with an underscore?
+AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
+[AC_REQUIRE([AC_PROG_NM])dnl
+AC_REQUIRE([AC_SYS_NM_PARSE])dnl
+AC_MSG_CHECKING([for _ prefix in compiled symbols])
+AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
+[ac_cv_sys_symbol_underscore=no
+cat > conftest.$ac_ext <<EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+EOF
+if AC_TRY_EVAL(ac_compile); then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
+    # See whether the symbols have a leading underscore.
+    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
+	:
+      else
+	echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
+      fi
+    fi
+  else
+    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
+  fi
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.c >&AC_FD_CC
+fi
+rm -rf conftest*
+])
+AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
+USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
+AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
+])
+
+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
+AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
+AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl
+AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN32, [indir([AC_SYS_LIBTOOL_CYGWIN32])])dnl
+
+# 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])
+
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/Concrete_Connection_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
index 7a50650d842..1701bad4144 100644
--- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
+++ b/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp
@@ -551,7 +551,8 @@ Thr_Consumer_Handler::svc (void)
         }
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
 Thr_Supplier_Handler::Thr_Supplier_Handler (const Connection_Config_Info &pci)
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/Event_Channel.cpp b/apps/Gateway/Gateway/Event_Channel.cpp
index 57329337afa..c2a4a350c6f 100644
--- a/apps/Gateway/Gateway/Event_Channel.cpp
+++ b/apps/Gateway/Gateway/Event_Channel.cpp
@@ -457,7 +457,7 @@ Event_Channel::bind_proxy (Connection_Handler *connection_handler)
       /* NOTREACHED */
     }
 
-  ACE_NOTREACHED (return 0);
+  return 0;
 }
 
 int
@@ -493,7 +493,7 @@ Event_Channel::subscribe (const Event_Key &event_addr,
       /* NOTREACHED */
     }
 
-  ACE_NOTREACHED (return 0);
+  return 0;
 }
 
 int
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/Makefile b/apps/Gateway/Gateway/Makefile
index 4a34c083dda..d392f815084 100644
--- a/apps/Gateway/Gateway/Makefile
+++ b/apps/Gateway/Gateway/Makefile
@@ -61,6 +61,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -149,15 +152,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -212,6 +210,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Config_Files.o .obj/Config_Files.so .shobj/Config_Files.o .shobj/Config_Files.so: Config_Files.cpp Config_Files.h File_Parser.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -244,6 +245,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/File_Parser.o .obj/File_Parser.so .shobj/File_Parser.o .shobj/File_Parser.so: File_Parser.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -266,6 +270,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -357,15 +364,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -423,6 +425,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -511,15 +516,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -575,6 +575,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -651,6 +654,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -664,9 +670,8 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Event.h Options.h \
- $(ACE_ROOT)/ace/Synch.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Event.h \
+ Options.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 \
@@ -689,6 +694,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -777,15 +785,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -846,6 +849,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -934,15 +940,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1002,6 +1003,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1090,15 +1094,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
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/connection_config b/apps/Gateway/Gateway/connection_config
index 93730edc0da..ce6fa6b4adf 100644
--- a/apps/Gateway/Gateway/connection_config
+++ b/apps/Gateway/Gateway/connection_config
@@ -1,9 +1,9 @@
 # Configuration file that the gatewayd process uses to determine
 # connection information about proxies.
-#
+# 
 # The following provides an explanation for the fields in this file,
 # and how they relate to fields in the corresponding "consumer_config"
-# file.
+# file. 
 #
 # 1. Connection ID -- Each Connection Handler is given a unique ID
 #    that is used in the "consumer_config" file to specify to which
@@ -27,7 +27,7 @@
 # 4. Handler Role -- i.e., Consumer ('C') or Supplier ('S')
 #
 # 5. Max Retry Timeout -- The maximum amount of time that we'll
-#    wait between retry attempts (these start at 1 second and
+#    wait between retry attempts (these start at 1 second and 
 #    double until they reach the Max Retry Timeout).
 #    If this is a '*' character it is an indication to the
 #    Gateway to use the "default value," e.g., which can be provided
@@ -36,17 +36,17 @@
 # 6. Local Port -- The port number that we want to use for
 #    our local Proxy connection.  If this is the value 0 or the '*'
 #    character, then we'll let the socket implementation pick this
-#    value for us.
+#    value for us. 
 #
 # 7. Priority -- Each Consumer/Supplier can be given a priority
-#    that will determine its importance relative to other
+#    that will determine its importance relative to other 
 #    Consumers/Suppliers (this feature isn't implemented yet).
 #
-# Connection  Host         Remote  Handler  Max Retry   Local  Priority
-# ID		           Port    Role     Timeout     Port
+# Connection  Host         Remote  Handler  Max Retry   Local  Priority 
+# ID		           Port    Role     Timeout     Port   
 # ----------  --------     ------  ------   ----------  -----  --------
-   1          localhost    *       S	    *	        *      1
-   2          localhost    *       C	    *	        *      1
+   1          flamenco     *       S	    *	        *      1
+   2          lindy        *       C	    *	        *      1
 #  3          mambo.cs     *       C	    *	        *      1
 #  4          lambada.cs   *       C	    *	        *      1
 #  5          lambada.cs   *       C	    *	        *      1
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/Makefile b/apps/Gateway/Peer/Makefile
index 91228a06baa..67e9e85ba59 100644
--- a/apps/Gateway/Peer/Makefile
+++ b/apps/Gateway/Peer/Makefile
@@ -52,6 +52,9 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -65,8 +68,8 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Options.h ../Gateway/Event.h
+ $(ACE_ROOT)/ace/Get_Opt.i Options.h \
+ ../Gateway/Event.h
 .obj/Peer.o .obj/Peer.so .shobj/Peer.o .shobj/Peer.so: Peer.cpp Peer.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -74,6 +77,9 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -160,15 +166,10 @@ INCLDIRS += -I../Gateway
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
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/Gateway/README b/apps/Gateway/README
index 2fe4e79c372..23d0336d77b 100644
--- a/apps/Gateway/README
+++ b/apps/Gateway/README
@@ -24,43 +24,43 @@ There are 2 directories:
         application-level Gateway process, gatewayd.  The gatewayd
         routes event messages between Peers.  By default, the gatewayd
         plays the Connector role and initializes itself by reading the
-        connection_config and consumer_config files:
-
-        1. The connection_config file establishes the "physical
+        proxy_config and consumer_config files:
+           
+        1. The proxy_config file establishes the "physical
            configuration" of the Consumer and Supplier proxies.  This
            file tells the Gateway what connections to establish with
            particular hosts using particular ports.
-
+           
         2. The consumer_config file establishes the "logical
            configuration."  This file tells the Gateway how to forward
            data coming from Suppliers to the appropriate Consumers.
-
+           
         The application Gateway generally should be started after all
         the Peers described below, though the process should work
         correctly even if it starts first.
-
+                      
 2. Peer
 
         This directory contains the source code for the Peer process,
         peerd.  There are typically many Peers, which act as suppliers
         and consumers of event messages that are routed through the
         gatewayd.
-
+           
         To do anything interesting you'll need at least two Peers: one
         to supply events and one to consume events.  In the
         configuration files, these two types of Peers are designated
         as follows:
 
         1. Supplier Peers (designated by an 'S' in the Gateway's
-           connection_config configuration file).  These Peers are
+           proxy_config configuration file).  These Peers are
            "suppliers" of events to the Gateway.
 
         2. Consumer Peers (designated by an 'C' in the Gateway's
-           connection_config file).  These Peers are "consumers" of
-           events forwarded by the Gateway.  Forwarding is based on
-           the settings in the consumer_config configuration file.
+           proxy_config file).  These Peers are "consumers" of events
+           forwarded by the Gateway.  Forwarding is based on the
+           settings in the consumer_config configuration file.
 
-----------------------------------------
+----------------------------------------           
 
 HOW TO RUN THE TESTS
 
@@ -69,12 +69,12 @@ To run the tests do the following:
 1. Compile everything (i.e., first compile the ACE libraries, then
    compile the Gateway and Peer directories).
 
-2. Edit the consumer_config and connection_config files as discussed
+2. Edit the consumer_config and proxy_config files as discussed
    above to indicate the desired physical and logical mappings
    for Consumers and Suppliers.
-
+   
 3. Start up the Peers (peerd).  You can start up as many as you
-   like, as per the connection_config file, but you'll need at least two
+   like, as per the proxy_config file, but you'll need at least two
    (i.e., one Supplier and Consumer).  I typically start up each Peer
    in a different window on a different machine, but you can run them
    on the same machine as long as you pick different port numbers.
@@ -83,20 +83,20 @@ To run the tests do the following:
 
    If you want to set the port numbers of the Peers from
    the command-line do the following:
-
+   
    a. Change the svc.conf file in the ./Peer/ directory to
       another name (e.g., foo.conf).  This will keep the
       program from starting up with the svc.conf file
       (which dynamically links in the Peers and uses the -a option to
       set the port).
-
+      
    b. Then run the peers in different windows as
-
+   
       # Window 1 (Supplier)
-      % peerd -a S:10011
+      % peerd -a S:10003
 
       # Window 2 (Consumer)
-      % peerd -a C:10012
+      % peerd -a C:10004
 
       etc.  Naturally, you can also edit the svc.conf file, but that
       may be more of a pain if you've got a network filesystem and
@@ -128,8 +128,8 @@ To run the tests do the following:
    trying to reestablish the connection using the same exponential
    backoff algorithm it used for the initial connection establishment.
 
-7. When you want to terminate a Gateway, just type ^C or type any
-   characters in the ./gatewayd window and the process will shut down
+7. When you want to terminate a Gateway, just type ^C or type any 
+   characters in the ./gatewayd window and the process will shut down 
    gracefully.
 
 Please let me know if there are any problems, questions, or
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index 54da21ccf9a..92c889016d2 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -1,19 +1,3 @@
-Tue Mar 16 01:08:05 1999  Nanbor Wang  <nanbor@cs.wustl.edu>
-
-	* server/Makefile:
-	* server/jaws.dsp: Updated makefiles to build shared library.
-
-	* server/svc.conf: Added example settings for using HTTP_Server as
-	  a dynamic service.
-
-	* server/HTTP_Server.{h,cpp}: Added macros to build dynamic
-	  HTTP_Server service.
-
-	* server/main.cpp (main): Since we use static service in JAWS, we
-	  must open the service configure without ignoring the static
-	  svcs.  Thanks to Bill Rizzi <rizzi@softserv.com> for pointing
-	  this out.
-
 Mon Feb 01 17:04:39 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * clients/WebSTONE/conf/paths.{pl,sh}.old:
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/Makefile b/apps/JAWS/PROTOTYPE/HTTPU/Makefile
index ca4e4b71bf6..da5c43cc9b7 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/Makefile
+++ b/apps/JAWS/PROTOTYPE/HTTPU/Makefile
@@ -49,44 +49,41 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 .obj/parse_url.o .obj/parse_url.so .shobj/parse_url.o .shobj/parse_url.so: parse_url.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 ../HTTPU/parse_url.h \
- ../HTTPU/http_export.h
+ $(ACE_ROOT)/ace/Log_Record.i \
+ ../HTTPU/parse_url.h ../HTTPU/http_export.h
 .obj/parse_http_request.o .obj/parse_http_request.so .shobj/parse_http_request.o .shobj/parse_http_request.so: parse_http_request.cpp \
- ../HTTPU/parse_http_request.h $(ACE_ROOT)/ace/OS.h \
+ ../HTTPU/parse_http_request.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Log_Record.i \
+ ../HTTPU/http_headers.h \
  $(ACE_ROOT)/ace/RB_Tree.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/RB_Tree.i \
  $(ACE_ROOT)/ace/RB_Tree.cpp \
  $(ACE_ROOT)/ace/Singleton.h \
@@ -95,11 +92,13 @@ 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 \
@@ -108,9 +107,12 @@ 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/Parse_Headers.h \
- ../JAWS/Export.h $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ ../JAWS/Parse_Headers.h ../JAWS/Export.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/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -129,59 +131,61 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Headers.h \
- ../HTTPU/http_export.h ../HTTPU/http_headers.i \
+ ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_headers.i \
  ../HTTPU/parse_http_request.i
 .obj/parse_http_response.o .obj/parse_http_response.so .shobj/parse_http_response.o .shobj/parse_http_response.so: parse_http_response.cpp \
- ../HTTPU/parse_http_response.h $(ACE_ROOT)/ace/OS.h \
+ ../HTTPU/parse_http_response.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 ../HTTPU/http_export.h \
- ../HTTPU/parse_http_response.i
+ $(ACE_ROOT)/ace/Log_Record.i \
+ ../HTTPU/http_export.h ../HTTPU/parse_http_response.i
 .obj/http_request.o .obj/http_request.so .shobj/http_request.o .shobj/http_request.so: http_request.cpp ../HTTPU/http_request.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -206,55 +210,52 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Parse_Headers.h \
- ../JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \
+ ../JAWS/Parse_Headers.h ../JAWS/Export.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \
- ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
- ../HTTPU/http_status.i ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_base.h \
+ ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \
  $(ACE_ROOT)/ace/RB_Tree.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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
- ../HTTPU/http_base.i ../HTTPU/parse_http_request.h \
- ../HTTPU/parse_http_request.i ../HTTPU/parse_url.h \
- ../HTTPU/http_request.i
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ ../HTTPU/http_headers.i ../HTTPU/http_base.i \
+ ../HTTPU/parse_http_request.h ../HTTPU/parse_http_request.i \
+ ../HTTPU/parse_url.h ../HTTPU/http_request.i
 .obj/http_response.o .obj/http_response.so .shobj/http_response.o .shobj/http_response.so: http_response.cpp ../HTTPU/http_response.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -279,40 +280,34 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Parse_Headers.h \
- ../JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \
+ ../JAWS/Parse_Headers.h ../JAWS/Export.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Headers.h \
- ../HTTPU/http_export.h ../HTTPU/http_base.h ../HTTPU/http_status.h \
- ../HTTPU/http_status.i ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/Singleton.cpp \
+ ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_base.h \
+ ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \
  $(ACE_ROOT)/ace/RB_Tree.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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
- ../HTTPU/http_base.i ../HTTPU/parse_http_response.h \
- ../HTTPU/parse_http_response.i ../HTTPU/http_response.i
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ ../HTTPU/http_headers.i ../HTTPU/http_base.i \
+ ../HTTPU/parse_http_response.h ../HTTPU/parse_http_response.i \
+ ../HTTPU/http_response.i
 .obj/http_base.o .obj/http_base.so .shobj/http_base.o .shobj/http_base.so: http_base.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 \
@@ -320,11 +315,13 @@ 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 \
@@ -335,7 +332,9 @@ 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.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/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -354,48 +353,42 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Headers.h \
- ../HTTPU/http_base.h ../HTTPU/http_export.h ../HTTPU/http_status.h \
- ../HTTPU/http_status.i ../HTTPU/http_headers.h \
+ ../JAWS/Headers.h ../HTTPU/http_base.h ../HTTPU/http_export.h \
+ ../HTTPU/http_status.h ../HTTPU/http_status.i ../HTTPU/http_headers.h \
  $(ACE_ROOT)/ace/RB_Tree.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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.i \
- ../HTTPU/http_base.i
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ ../HTTPU/http_headers.i ../HTTPU/http_base.i
 .obj/http_status.o .obj/http_status.so .shobj/http_status.o .shobj/http_status.so: http_status.cpp ../HTTPU/http_status.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 \
@@ -404,43 +397,41 @@ 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 ../HTTPU/http_export.h \
- ../HTTPU/http_status.i
-.obj/http_headers.o .obj/http_headers.so .shobj/http_headers.o .shobj/http_headers.so: http_headers.cpp $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ ../HTTPU/http_export.h ../HTTPU/http_status.i
+.obj/http_headers.o .obj/http_headers.so .shobj/http_headers.o .shobj/http_headers.so: http_headers.cpp ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/RB_Tree.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp ../HTTPU/http_headers.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
  $(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 \
@@ -449,9 +440,12 @@ 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/Parse_Headers.h \
- ../JAWS/Export.h $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/Malloc.h $(ACE_ROOT)/ace/Malloc.i \
+ $(ACE_ROOT)/ace/Managed_Object.cpp \
+ ../JAWS/Parse_Headers.h ../JAWS/Export.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/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -470,9 +464,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Headers.h \
- ../HTTPU/http_export.h ../HTTPU/http_headers.i
+ ../JAWS/Headers.h ../HTTPU/http_export.h ../HTTPU/http_headers.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
index 41aadd09824..d4bde38d40e 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ace/RB_Tree.h"
 #include "HTTPU/http_headers.h"
 
 HTTP_Hdr_Node
@@ -76,11 +75,6 @@ HTTP_Hdr_Node
 const int &HTTP_HCodes::NUM_HEADER_STRINGS
   = HTTP_Header_Nodes_Singleton::instance ()->num_header_strings_;
 
-HTTP_Header_Nodes::HTTP_Header_Nodes (void)
-  : num_header_strings_ (0)
-{
-}
-
 HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format)
   : token_ (token),
     format_ (format)
@@ -93,15 +87,6 @@ HTTP_Hdr_Node::HTTP_Hdr_Node (const char *token, const char *format)
   header_nodes->num_header_strings_++;
 }
 
-HTTP_HCodes::HTTP_HCodes (void)
-  : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
-{
-}
-
-HTTP_Headers::HTTP_Headers (void)
-{
-}
-
 const char *
 HTTP_Headers::header (int name) const
 {
@@ -145,17 +130,17 @@ HTTP_Headers::value_reset (void)
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_Const_Binary_Functor_Base<int, int>;
+template class ACE_Less_Than_Functor<int, int>;
 template class ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>;
-template class ACE_RB_Tree_Iterator_Base<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Const_Binary_Functor_Base<int, int>
+#pragma instantiate ACE_Less_Than_Functor<int, int>
 #pragma instantiate ACE_RB_Tree<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<int, const HTTP_Hdr_Node *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, const HTTP_Hdr_Node *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_Singleton<HTTP_Header_Nodes, ACE_SYNCH_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
index 73ea46e57b6..e18a7d9064b 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_headers.i
@@ -24,6 +24,18 @@ HTTP_Hdr_Node::format (void) const
   return this->format_;
 }
 
+ACE_INLINE
+HTTP_Header_Nodes::HTTP_Header_Nodes (void)
+  : num_header_strings_ (0)
+{
+}
+
+ACE_INLINE
+HTTP_HCodes::HTTP_HCodes (void)
+  : header_nodes_ (HTTP_Header_Nodes_Singleton::instance ())
+{
+}
+
 ACE_INLINE const HTTP_Hdr_Node &
 HTTP_HCodes::hcode (int type) const
 {
@@ -33,6 +45,11 @@ HTTP_HCodes::hcode (int type) const
   return **hn;
 }
 
+ACE_INLINE
+HTTP_Headers::HTTP_Headers (void)
+{
+}
+
 ACE_INLINE const char *
 HTTP_Headers::header_token (int name) const
 {
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
index 07009659fb7..ae97d2f7fa0 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.cpp
@@ -71,10 +71,6 @@ HTTP_SCode::HTTP_SCode (void)
     }
 }
 
-HTTP_SCode::~HTTP_SCode (void)
-{
-}
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 #   include "HTTPU/http_status.i"
 # endif /* ACE_HAS_INLINED_OSCALLS */
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/http_status.i b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
index 0247ddeb738..6af946c39a7 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
+++ b/apps/JAWS/PROTOTYPE/HTTPU/http_status.i
@@ -17,3 +17,8 @@ HTTP_SCode_Node::operator const char * (void) const
 {
   return this->code_str_;
 }
+
+ACE_INLINE
+HTTP_SCode::~HTTP_SCode (void)
+{
+}
diff --git a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.cpp b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.cpp
index 907321cba47..abeabe4b233 100644
--- a/apps/JAWS/PROTOTYPE/HTTPU/parse_url.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTPU/parse_url.cpp
@@ -88,11 +88,7 @@ HTTP_Parse_URL::parse_url (void)
   p += 2;
 
   this->parse_host (p);
-
-  while (*p == '/')
-    p++;
-
-  if (*p == '\0')
+  if (*p == '/' || *p == '\0')
     return;
 
   this->url_path_ = p;
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
index ad104a993e9..22d3b959083 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTP_10_Parse.cpp
@@ -76,7 +76,6 @@ JAWS_HTTP_10_Parse_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
     }
 
   // request completely parsed
-  info->dump ();
 
   return 0;
 }
diff --git a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
index e22bfef849b..0cd187324b0 100644
--- a/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
+++ b/apps/JAWS/PROTOTYPE/HTTP_10_Write.cpp
@@ -97,30 +97,19 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
     }
   else
     {
-      if (ACE_OS::strcmp (info->version (), "HTTP/0.9") == 0)
-        io->transmit_file (handler,
-                           info->path (),
-                           "",
-                           0,
-                           "",
-                           0);
-      else
-        io->transmit_file (handler,
-                           info->path (),
-                           "HTTP/1.0 200 Ok\r\n\r\n",
-                           19,
-                           "",
-                           0);
+      io->transmit_file (handler,
+                         info->path (),
+                         "",
+                         0,
+                         "",
+                         0);
 
       switch (handler->status ())
         {
         case JAWS_IO_Handler::TRANSMIT_OK_A:
-          {
-            JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, OK_A");
-            data->payload (0);
-            delete info;
-            return 1;
-          }
+          data->payload (0);
+          delete info;
+          return 1;
 
         case JAWS_IO_Handler::TRANSMIT_OK:
           {
@@ -130,18 +119,12 @@ JAWS_HTTP_10_Write_Task::handle_put (JAWS_Data_Block *data, ACE_Time_Value *)
             return 0;
           }
         case JAWS_IO_Handler::TRANSMIT_ERROR:
-          {
-            JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR");
-            data->payload (0);
-            delete info;
-            return 0;
-          }
         case JAWS_IO_Handler::TRANSMIT_ERROR_A:
           {
-            JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR_A");
+            JAWS_TRACE ("JAWS_HTTP_10_Write_Task::handle_put, ERROR");
             data->payload (0);
             delete info;
-            return 1;
+            return -1;
           }
         default:
           {
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h
deleted file mode 100644
index 2d310873cb2..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Hash_T.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_HASH_T_H
-#define JAWS_CACHE_HASH_T_H
-
-#include "ace/OS.h"
-#include "JAWS/Cache_Object.h"
-
-// Forward declaration
-template <class EXT_ID, class INT_ID, class EQ_FUNC>
-class JAWS_Hash_Bucket_Manager;
-
-template <class EXT_ID, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Hash
-{
-public:
-
-  typedef JAWS_Hash_Bucket_Manager<EXT_ID, JAWS_Cache_Object *, EQ_FUNC>
-          CACHE_BUCKET_MANAGER;
-
-  JAWS_Cache_Hash (ACE_Allocator *alloc = 0, size_t size = 521);
-  // 521 == smallest number > 512 that is prime.  Why is a prime
-  // number important?  I am trying to maximize scattering when using
-  // mod on the hashed value.  This might be bogus though.
-
-  virtual ~JAWS_Cache_Hash (void);
-
-  int find (const EXT_ID &ext_id) const;
-  int find (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id) const;
-  int bind (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  int trybind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id);
-  int rebind (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id,
-	      EXT_ID &old_ext_id, JAWS_Cache_Object *&old_int_id);
-
-  int unbind (const EXT_ID &ext_id);
-  int unbind (const EXT_ID &ext_id, JAWS_Cache_Object *&int_id);
-
-  size_t size (void) const;
-
-protected:
-
-  virtual unsigned long hash (const EXT_ID &ext_id) const;
-  int isprime (unsigned long number) const;
-  int new_cachebucket (size_t idx);
-
-private:
-
-  ACE_Allocator *allocator_;
-  size_t size_;
-
-  ACE_SYNCH_MUTEX lock_;
-  CACHE_BUCKET_MANAGER **hashtable_;
-
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Cache_Hash_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* ACE_CACHE_HASH_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
deleted file mode 100644
index f62c990ba1c..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// $Id$
-
-#ifndef JAWS_CACHE_LIST_T_CPP
-#define JAWS_CACHE_LIST_T_CPP
-
-#include "JAWS/Cache_List_T.h"
-#include "JAWS/Cache_Manager_T.h"
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::JAWS_Cache_List (ACE_Allocator *alloc,
-                                                       size_t maxsize)
-  : allocator_ (alloc),
-    maxsize_ (maxsize),
-    size_ (0),
-    head_ (0),
-    tail_ (0)
-{
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_List (void)
-{
-  while (this->head_ != 0)
-    this->remove (this->head_);
-
-  this->allocator_ = 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_empty (void) const
-{
-  return (this->size_ == 0);
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::is_full (void) const
-{
-  return (this->size_ == this->maxsize_);
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::size (void) const
-{
-  return this->size_;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> size_t
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (void) const
-{
-  return this->maxsize_;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::maxsize (Cache_Manager *,
-                                                size_t new_maxsize)
-{
-  this->maxsize_ = new_maxsize;
-  return 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert_i (Cache_List_Item *item)
-{
-  /* ASSERT: this->size_ < this->maxsize_ */
-  item->next_ = 0;
-  item->prev_ = 0;
-
-  if (this->size_++ == 0)
-    this->head_ = this->tail_ = item;
-  else
-    {
-      this->tail_->next_ = item;
-      item->prev_ = this->tail_;
-      this->tail_ = item;
-    }
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::insert (const EXT_ID &ext_id,
-                                               JAWS_Cache_Object *const &int_id)
-{
-  if (this->is_full ())
-    return -1;
-
-  Cache_List_Item *item;
-  ACE_NEW_MALLOC_RETURN (item,
-                         (Cache_List_Item *)
-                         this->allocator_->malloc (sizeof (Cache_List_Item)),
-                         Cache_List_Item (ext_id, int_id), -1);
-
-  this->insert_i (item);
-
-  return 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (void)
-{
-  /* ASSERT: this->size_ > 0 */
-  this->size_--;
-  this->item_ = this->head_;
-  if (this->head_ == this->tail_)
-    {
-      this->head_ = this->tail_ = 0;
-      return;
-    }
-
-  this->head_ = this->head_->next_;
-  this->head_->prev_ = 0;
-  this->item_->next_ = 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> void
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove_i (Cache_List_Item *item)
-{
-  this->size_--;
-  this->item_ = item;
-
-  if (item->next_ == 0 && item->prev_ == 0)
-    {
-      this->head_ = this->tail_ = 0;
-    }
-  else if (item->next_ == 0)
-    {
-      this->tail_ = item->prev_;
-      this->tail_->next_ = 0;
-    }
-  else if (item->prev_ == 0)
-    {
-      this->head_ = item->next_;
-      this->head_->prev_ = 0;
-    }
-  else
-    {
-      item->next_->prev_ = item->prev_;
-      item->prev_->next_ = item->next_;
-    }
-
-  item->next_ = 0;
-  item->prev_ = 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
-                                               JAWS_Cache_Object *&int_id)
-{
-  if (this->is_empty ())
-    return -1;
-
-  this->remove_i ();
-
-  ext_id = this->item_->ext_id_;
-  int_id = this->item_->int_id_;
-  int_id->heap_item (0);
-
-  ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-  this->item_ = 0;
-  return 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
-{
-  if (item == 0)
-    return 0;
-
-  this->remove_i ((Cache_List_Item *) item);
-  this->item_->int_id_->heap_item (0);
-
-  ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-  this->item_ = 0;
-
-  return 0;
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> int
-JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::adjust (void *item)
-{
-  if (item == 0)
-    return 0;
-
-  Cache_List_Item *real_item = (Cache_List_Item *) item;
-
-  this->remove_i (real_item);
-  this->insert_i (real_item);
-  this->item_ = 0;
-
-  return 0;
-}
-
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN>
-JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::
-JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id)
-  : ext_id_ (ext_id),
-    int_id_ (int_id)
-{
-  this->int_id_->heap_item (this);
-}
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN> unsigned int
-JAWS_Cache_List_Item<EXT_ID,FACT,H_FN,E_FN>::priority (void)
-{
-  return this->int_id_->priority ();
-}
-
-
-#endif /* JAWS_CACHE_LIST_T_CPP */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h
deleted file mode 100644
index 7dd9c7c8ca1..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_List_T.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_LIST_T_H
-#define JAWS_CACHE_LIST_T_H
-
-#include "ace/Malloc.h"
-#include "JAWS/Cache_Object.h"
-
-// Forward declarations
-template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_Manager;
-
-template <class EXT_ID, class FACTORY, class HASH_FUNC, class EQ_FUNC>
-class JAWS_Cache_List_Item;
-
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_List
-// Roll my own heap here.  Eventually, a heap should be its own
-// standalone data structure.
-//
-// This version is not a heap, but a doubly linked list.  We are
-// trying to simplify all the heap operations to be O(1).
-{
-public:
-
-  typedef JAWS_Cache_Manager<EXT_ID, FACT, H_FN, E_FN> Cache_Manager;
-  typedef JAWS_Cache_List_Item<EXT_ID, FACT, H_FN, E_FN> Cache_List_Item;
-
-  JAWS_Cache_List (ACE_Allocator *alloc = 0, size_t maxsize = 8192);
-  // maxsize is the total number of objects the in memory cache is
-  // willing to manage
-
-  ~JAWS_Cache_List (void);
-
-  int is_empty (void) const;
-  int is_full (void) const;
-
-  size_t size (void) const;
-  size_t maxsize (void) const;
-
-  int maxsize (Cache_Manager *cm, size_t new_maxsize);
-  // attempt to grow (or shrink) the heap.  Return 0 on success, -1 on
-  // error.
-
-  int insert (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  // attempt to insert int_id into heap.
-
-  int remove (EXT_ID &ext_id, JAWS_Cache_Object *&int_id);
-  // attempt to remove the top element of heap.
-
-  int remove (void *item);
-  // treat item as a Cache_List_Item, and remove it from the heap
-
-  int adjust (void *item);
-  // treat item as a Cache_List_Item, and alter its heap position
-
-protected:
-
-  void insert_i (Cache_List_Item *item);
-  // insert item into heap.
-
-  void remove_i (Cache_List_Item *item);
-  // remove the element residing at pos, but do not delete it.
-
-  void remove_i (void);
-  // remove the element residing at the top of heap, but do not delete it.
-
-private:
-
-  ACE_Allocator *allocator_;
-
-  size_t maxsize_;
-  size_t size_;
-
-  Cache_List_Item *item_;
-
-  Cache_List_Item *head_;
-  Cache_List_Item *tail_;
-
-};
-
-
-template <class EXT_ID, class FACT, class H_FN, class E_FN>
-class JAWS_Cache_List_Item
-{
-
-  friend class JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN>;
-
-public:
-
-  typedef JAWS_Cache_List<EXT_ID, FACT, H_FN, E_FN> Cache_List;
-
-  JAWS_Cache_List_Item (const EXT_ID &ext_id, JAWS_Cache_Object *const &int_id);
-  unsigned int priority (void);
-
-private:
-
-  EXT_ID ext_id_;
-  JAWS_Cache_Object *int_id_;
-
-  JAWS_Cache_List_Item *next_;
-  JAWS_Cache_List_Item *prev_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Cache_List_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#endif /* JAWS_CACHE_LIST_T_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp
deleted file mode 100644
index a91ac38375a..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// $Id$
-
-#include "ace/OS.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-
-#include "JAWS/Cache_Manager.h"
-#include "JAWS/Cache_List_T.h"
-
-JAWS_String_Hash_Functor::JAWS_String_Hash_Functor (const char *s)
-  : i_ (0)
-{
-  this->i_ = ACE::hash_pjw (s);
-}
-
-JAWS_String_Hash_Functor::operator unsigned long (void) const
-{
-  return this->i_;
-}
-
-JAWS_String_Equal_Functor::JAWS_String_Equal_Functor (const char *s1,
-                                                    const char *s2)
-  : i_ (0)
-{
-  this->i_ = ACE_OS::strcmp (s1, s2);
-}
-
-JAWS_String_Equal_Functor::operator int (void) const
-{
-  return this->i_ == 0;
-}
-
-JAWS_Strdup_String::JAWS_Strdup_String (void)
-  : c_ (0),
-    s_ (0)
-{
-}
-
-JAWS_Strdup_String::JAWS_Strdup_String (const char *s)
-  : c_ (0),
-    s_ (0)
-{
-  this->c_ = new int (1);
-  this->s_ = ACE_OS::strdup (s);
-}
-
-JAWS_Strdup_String::JAWS_Strdup_String (const JAWS_Strdup_String &s)
-  : c_ (s.c_),
-    s_ (s.s_)
-{
-  ++*(this->c_);
-}
-
-JAWS_Strdup_String::~JAWS_Strdup_String (void)
-{
-  if (this->c_ && --*(this->c_) == 0)
-    {
-      if (this->s_)
-        ACE_OS::free (this->s_);
-      delete this->c_;
-    }
-  this->s_ = 0;
-  this->c_ = 0;
-}
-
-JAWS_Strdup_String::operator const char * (void) const
-{
-  return this->s_;
-}
-
-void
-JAWS_Strdup_String::operator = (const char *s)
-{
-  if (this->c_ && --*(this->c_) == 0)
-    {
-      if (this->s_)
-        ACE_OS::free (this->s_);
-      delete this->c_;
-    }
-  this->c_ = new int (1);
-  this->s_ = ACE_OS::strdup (s);
-}
-
-void
-JAWS_Strdup_String::operator = (const JAWS_Strdup_String &s)
-{
-  if (this->c_ && --*(this->c_) == 0)
-    {
-      if (this->s_)
-        ACE_OS::free (this->s_);
-      delete this->c_;
-    }
-  this->c_ = s.c_;
-  this->s_ = s.s_;
-  ++*(this->c_);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String,
-                                                 JAWS_Cache_Object *>;
-template class JAWS_Hash_Bucket_Manager<JAWS_Strdup_String,
-                                       JAWS_Cache_Object *,
-                                       JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Hash<JAWS_Strdup_String,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                   JAWS_Referenced_Cache_Object_Factory,
-                                   JAWS_String_Hash_Functor,
-                                   JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                              JAWS_Referenced_Cache_Object_Factory,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                 JAWS_Referenced_Cache_Object_Factory,
-                                 JAWS_String_Hash_Functor,
-                                 JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List_Item<JAWS_Strdup_String,
-                                   JAWS_Counted_Cache_Object_Factory,
-                                   JAWS_String_Hash_Functor,
-                                   JAWS_String_Equal_Functor>;
-template class JAWS_Cache_List<JAWS_Strdup_String,
-                              JAWS_Counted_Cache_Object_Factory,
-                              JAWS_String_Hash_Functor,
-                              JAWS_String_Equal_Functor>;
-template class JAWS_Cache_Manager<JAWS_Strdup_String,
-                                 JAWS_Counted_Cache_Object_Factory,
-                                 JAWS_String_Hash_Functor,
-                                 JAWS_String_Equal_Functor>;
-template class ACE_Singleton<JAWS_Referenced_Cache_Object_Factory,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_Counted_Cache_Object_Factory,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Referenced_Cache_Manager,
-                             ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<JAWS_String_Counted_Cache_Manager,
-                             ACE_SYNCH_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate JAWS_Hash_Bucket_Item<JAWS_Strdup_String, JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_DLCStack<JAWS_Strdup_String, \
-                                             JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_DLCStack_Iterator<JAWS_Strdup_String, \
-                                                      JAWS_Cache_Object *>
-#pragma instantiate JAWS_Hash_Bucket_Manager<JAWS_Strdup_String, \
-                                            JAWS_Cache_Object *, \
-                                            JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Hash<JAWS_Strdup_String, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \
-                                        ACE_Referenced_Cache_Object_Factory, \
-                                        JAWS_String_Hash_Functor, \
-                                        JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \
-                                   JAWS_Referenced_Cache_Object_Factory, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \
-                                      JAWS_Referenced_Cache_Object_Factory, \
-                                      JAWS_String_Hash_Functor, \
-                                      JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap_Item<JAWS_Strdup_String, \
-                                        JAWS_Counted_Cache_Object_Factory, \
-                                        JAWS_String_Hash_Functor, \
-                                        JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Heap<JAWS_Strdup_String, \
-                                   JAWS_Counted_Cache_Object_Factory, \
-                                   JAWS_String_Hash_Functor, \
-                                   JAWS_String_Equal_Functor>
-#pragma instantiate JAWS_Cache_Manager<JAWS_Strdup_String, \
-                                      JAWS_Counted_Cache_Object_Factory, \
-                                      JAWS_String_Hash_Functor, \
-                                      JAWS_String_Equal_Functor>
-#pragma instantiate ACE_Singleton<JAWS_Referenced_Cache_Object_Factory, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_Counted_Cache_Object_Factory, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Referenced_Cache_Manager, \
-                                  ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<JAWS_String_Counted_Cache_Manager, \
-                                  ACE_SYNCH_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
deleted file mode 100644
index 723e6729f33..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Manager.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-#ifndef JAWS_CACHE_MANAGER_H
-#define JAWS_CACHE_MANAGER_H
-
-#include "ace/OS.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-
-#include "JAWS/Cache_Manager_T.h"
-
-class JAWS_String_Hash_Functor
-{
-public:
-  JAWS_String_Hash_Functor (const char *s);
-  operator unsigned long (void) const;
-
-private:
-  unsigned long i_;
-};
-
-class JAWS_String_Equal_Functor
-{
-public:
-  JAWS_String_Equal_Functor (const char *s1, const char *s2);
-  operator int (void) const;
-
-private:
-  int i_;
-};
-
-class JAWS_Strdup_String
-{
-public:
-
-  JAWS_Strdup_String (void);
-  JAWS_Strdup_String (const char *s);
-  JAWS_Strdup_String (const JAWS_Strdup_String &s);
-  ~JAWS_Strdup_String (void);
-
-  operator const char * (void) const;
-  void operator = (const char *s);
-  void operator = (const JAWS_Strdup_String &s);
-
-private:
-
-  int *c_;
-  char *s_;
-
-};
-
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                          JAWS_Referenced_Cache_Object_Factory,
-                          JAWS_String_Hash_Functor,
-                          JAWS_String_Equal_Functor>
-        JAWS_String_Referenced_Cache_Manager;
-
-typedef JAWS_Cache_Manager<JAWS_Strdup_String,
-                          JAWS_Counted_Cache_Object_Factory,
-                          JAWS_String_Hash_Functor,
-                          JAWS_String_Equal_Functor>
-        JAWS_String_Counted_Cache_Manager;
-
-
-#endif /* JAWS_CACHE_MANAGER_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp
deleted file mode 100644
index abb582aa9c7..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-// $Id$
-
-#include "JAWS/Cache_Object.h"
-
-JAWS_Cache_Object::JAWS_Cache_Object (const void *data, size_t size)
-  : internal_ (0),
-    data_ (data),
-    size_ (size)
-{
-  this->first_access_ = ACE_OS::time ((time_t *)0);
-  this->new_last_access_ = this->last_access_ = this->first_access_;
-}
-
-JAWS_Cache_Object::~JAWS_Cache_Object ()
-{
-  this->data_ = 0;
-  this->size_ = 0;
-}
-
-void *
-JAWS_Cache_Object::internal (void) const
-{
-  return this->internal_;
-}
-
-void
-JAWS_Cache_Object::internal (void *item)
-{
-  this->internal_ = item;
-}
-
-const void *
-JAWS_Cache_Object::data (void) const
-{
-  return this->data_;
-}
-
-size_t
-JAWS_Cache_Object::size (void) const
-{
-  return this->size_;
-}
-
-unsigned int
-JAWS_Cache_Object::count (void) const
-{
-  return this->count_i ();
-}
-
-int
-JAWS_Cache_Object::acquire (void)
-{
-  this->new_last_access_ = ACE_OS::time ((time_t *)0);
-  return this->acquire_i ();
-}
-
-int
-JAWS_Cache_Object::release (void)
-{
-  this->last_access_ = this->new_last_access_;
-  return this->release_i ();
-}
-
-time_t
-JAWS_Cache_Object::last_access (void) const
-{
-  return this->last_access_;
-}
-
-time_t
-JAWS_Cache_Object::first_access (void) const
-{
-  return this->first_access_;
-}
-
-unsigned int
-JAWS_Cache_Object::priority (void) const
-{
-  return this->priority_i ();
-}
-
-void *
-JAWS_Cache_Object::heap_item (void) const
-{
-  return this->heap_item_;
-}
-
-void
-JAWS_Cache_Object::heap_item (void *item)
-{
-  this->heap_item_ = item;
-}
-
-
-JAWS_Referenced_Cache_Object::
-JAWS_Referenced_Cache_Object (const void *data, size_t size)
-  : JAWS_Cache_Object (data, size),
-    lock_adapter_ (count_)
-{
-}
-
-JAWS_Referenced_Cache_Object::~JAWS_Referenced_Cache_Object (void)
-{
-}
-
-ACE_Lock &
-JAWS_Referenced_Cache_Object::lock (void)
-{
-  return this->lock_adapter_;
-}
-
-unsigned int
-JAWS_Referenced_Cache_Object::count_i (void) const
-{
-  JAWS_Referenced_Cache_Object *mutable_this
-    = (JAWS_Referenced_Cache_Object *) this;
-
-  if (mutable_this->count_.tryacquire_write () == 0)
-    return 0;
-
-  return 1;
-}
-
-int
-JAWS_Referenced_Cache_Object::acquire_i (void)
-{
-  return this->count_.acquire_read ();
-}
-
-int
-JAWS_Referenced_Cache_Object::release_i (void)
-{
-  return this->count_.release ();
-}
-
-unsigned int
-JAWS_Referenced_Cache_Object::priority_i (void) const
-{
-  unsigned int priority = ~(0U);
-  double delta
-    = ACE_OS::difftime (this->last_access (), this->first_access ());
-
-  if (delta >= 0.0 && delta < ~(0U))
-    priority = (unsigned) delta;
-
-  return priority;
-}
-
-
-
-JAWS_Counted_Cache_Object::
-JAWS_Counted_Cache_Object (const void *data, size_t size)
-  : JAWS_Cache_Object (data, size),
-    count_ (0),
-    new_count_ (0),
-    lock_adapter_ (lock_)
-{
-}
-
-JAWS_Counted_Cache_Object::~JAWS_Counted_Cache_Object (void)
-{
-}
-
-ACE_Lock &
-JAWS_Counted_Cache_Object::lock (void)
-{
-  return this->lock_adapter_;
-}
-
-unsigned int
-JAWS_Counted_Cache_Object::count_i (void) const
-{
-  JAWS_Counted_Cache_Object *mutable_this = (JAWS_Counted_Cache_Object *) this;
-
-  {
-    ACE_Guard<ACE_SYNCH_MUTEX> g (mutable_this->lock_);
-
-    return this->count_;
-  }
-}
-
-int
-JAWS_Counted_Cache_Object::acquire_i (void)
-{
-  ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
-
-  this->new_count_++;
-  return 0;
-}
-
-int
-JAWS_Counted_Cache_Object::release_i (void)
-{
-  ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_);
-
-  this->new_count_--;
-  this->count_ = this->new_count_;
-  return 0;
-}
-
-unsigned int
-JAWS_Counted_Cache_Object::priority_i (void) const
-{
-  return this->count_i ();
-}
-
-JAWS_Cache_Object_Factory::JAWS_Cache_Object_Factory (ACE_Allocator *alloc)
-  : allocator_ (alloc)
-{
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-}
-
-JAWS_Cache_Object_Factory::~JAWS_Cache_Object_Factory (void)
-{
-}
-
-int
-JAWS_Cache_Object_Factory::open (ACE_Allocator *alloc)
-{
-  this->allocator_ = alloc;
-
-  if (this->allocator_ == 0)
-    this->allocator_ = ACE_Allocator::instance ();
-
-  return 0;
-}
-
-JAWS_Referenced_Cache_Object_Factory
-::JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc)
-  : JAWS_Cache_Object_Factory (alloc)
-{
-}
-
-JAWS_Referenced_Cache_Object_Factory
-::~JAWS_Referenced_Cache_Object_Factory (void)
-{
-}
-
-JAWS_Cache_Object *
-JAWS_Referenced_Cache_Object_Factory::create (const void *data, size_t size)
-{
-  JAWS_Referenced_Cache_Object *obj;
-
-  size_t obj_size = sizeof (JAWS_Referenced_Cache_Object);
-  ACE_NEW_MALLOC_RETURN (obj,
-                         (JAWS_Referenced_Cache_Object *)
-                         this->allocator_->malloc (obj_size),
-                         JAWS_Referenced_Cache_Object (data, size), 0);
-
-  return obj;
-}
-
-void
-JAWS_Referenced_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj)
-{
-  JAWS_Referenced_Cache_Object *rco = (JAWS_Referenced_Cache_Object *) obj;
-  ACE_DES_FREE (rco, this->allocator_->free, JAWS_Referenced_Cache_Object);
-}
-
-JAWS_Counted_Cache_Object_Factory
-::JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc)
-  : JAWS_Cache_Object_Factory (alloc)
-{
-}
-
-JAWS_Counted_Cache_Object_Factory
-::~JAWS_Counted_Cache_Object_Factory (void)
-{
-}
-
-JAWS_Cache_Object *
-JAWS_Counted_Cache_Object_Factory::create (const void *data, size_t size)
-{
-  JAWS_Counted_Cache_Object *obj;
-
-  size_t obj_size = sizeof (JAWS_Counted_Cache_Object);
-  ACE_NEW_MALLOC_RETURN (obj,
-                         (JAWS_Counted_Cache_Object *)
-                         this->allocator_->malloc (obj_size),
-                         JAWS_Counted_Cache_Object (data, size), 0);
-
-  return obj;
-}
-
-void
-JAWS_Counted_Cache_Object_Factory::destroy (JAWS_Cache_Object *obj)
-{
-  JAWS_Counted_Cache_Object *cco = (JAWS_Counted_Cache_Object *) obj;
-  ACE_DES_FREE (cco, this->allocator_->free, JAWS_Counted_Cache_Object);
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-// These are only specialized with ACE_HAS_THREADS.
-template class ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>;
-template class ACE_Lock_Adapter<ACE_SYNCH_MUTEX>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-// These are only specialized with ACE_HAS_THREADS.
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX>
-#pragma instantiate ACE_Lock_Adapter<ACE_SYNCH_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h b/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h
deleted file mode 100644
index fbd570b4140..00000000000
--- a/apps/JAWS/PROTOTYPE/JAWS/Cache_Object.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- c++ -*- */
-// $Id$
-
-
-#ifndef JAWS_CACHE_OBJECT_H
-#define JAWS_CACHE_OBJECT_H
-
-#include "ace/OS.h"
-#include "ace/Synch.h"
-#include "ace/Malloc.h"
-
-// Cache bucket -- use Hash_Bucket to hold cacheable objects.
-
-class JAWS_Cache_Object
-{
-public:
-  JAWS_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Cache_Object (void);
-
-  void *internal (void) const;
-  void internal (void *);
-
-  const void *data (void) const;
-  size_t size (void) const;
-  unsigned int count (void) const;
-
-  int acquire (void);
-  int release (void);
-
-  time_t last_access (void) const;
-  time_t first_access (void) const;
-
-  unsigned int priority (void) const;
-
-  enum { ACE_CO_REFERENCED, ACE_CO_COUNTED };
-
-  void *heap_item (void) const;
-  void heap_item (void *item);
-
-  virtual ACE_Lock & lock (void) = 0;
-
-protected:
-
-  virtual unsigned int count_i (void) const = 0;
-  virtual int acquire_i (void) = 0;
-  virtual int release_i (void) = 0;
-  virtual unsigned int priority_i (void) const = 0;
-
-private:
-
-  void *internal_;
-  const void *data_;
-  size_t size_;
-
-  time_t last_access_;
-  time_t first_access_;
-  time_t new_last_access_;
-
-  void *heap_item_;
-
-};
-
-class JAWS_Referenced_Cache_Object : public JAWS_Cache_Object
-{
-public:
-  JAWS_Referenced_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Referenced_Cache_Object (void);
-
-  virtual ACE_Lock & lock (void);
-
-protected:
-
-  virtual unsigned int count_i (void) const;
-  virtual int acquire_i (void);
-  virtual int release_i (void);
-  virtual unsigned int priority_i (void) const;
-
-private:
-
-  /* MUTABLE */ ACE_SYNCH_RW_MUTEX count_;
-  /* MUTABLE */ ACE_Lock_Adapter<ACE_SYNCH_RW_MUTEX> lock_adapter_;
-  
-};
-
-class JAWS_Counted_Cache_Object : public JAWS_Cache_Object
-{
-public:
-  JAWS_Counted_Cache_Object (const void *, size_t);
-  virtual ~JAWS_Counted_Cache_Object (void);
-
-  virtual ACE_Lock & lock (void);
-
-protected:
-
-  virtual unsigned int count_i (void) const;
-  virtual int acquire_i (void);
-  virtual int release_i (void);
-  virtual unsigned int priority_i (void) const;
-
-private:
-
-  unsigned int count_;
-  unsigned int new_count_;
-  /* MUTABLE */ ACE_SYNCH_MUTEX lock_;
-  /* MUTABLE */ ACE_Lock_Adapter<ACE_SYNCH_MUTEX> lock_adapter_;
-
-};
-
-class JAWS_Cache_Object_Factory
-{
-public:
-
-  JAWS_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Cache_Object_Factory (void);
-
-  int open (ACE_Allocator *alloc = 0);
-
-  virtual JAWS_Cache_Object * create (const void *, size_t) = 0;
-  virtual void destroy (JAWS_Cache_Object *) = 0;
-
-protected:
-
-  ACE_Allocator *allocator_;
-
-};
-
-class JAWS_Referenced_Cache_Object_Factory : public JAWS_Cache_Object_Factory
-{
-public:
-  JAWS_Referenced_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Referenced_Cache_Object_Factory (void);
-
-  virtual JAWS_Cache_Object * create (const void *, size_t);
-  virtual void destroy (JAWS_Cache_Object *);
-
-};
-
-class JAWS_Counted_Cache_Object_Factory : public JAWS_Cache_Object_Factory
-{
-public:
-  JAWS_Counted_Cache_Object_Factory (ACE_Allocator *alloc = 0);
-  virtual ~JAWS_Counted_Cache_Object_Factory (void);
-
-  virtual JAWS_Cache_Object * create (const void *, size_t);
-  virtual void destroy (JAWS_Cache_Object *);
-
-};
-
-#endif /* JAWS_CACHE_OBJECT_H */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
index 864e6290ce4..871f85de4af 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
@@ -192,7 +192,7 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
 
   if (result == ACE_Filecache_Handle::ACE_SUCCESS)
     {
-#if defined (ACE_JAWS_BASELINE) || defined (ACE_WIN32)
+#if defined (ACE_JAWS_BASELINE)
       ACE_SOCK_Stream stream;
       stream.set_handle (ioh->handle ());
 
@@ -447,11 +447,11 @@ JAWS_Asynch_IO::transmit_file (JAWS_IO_Handler *ioh,
 
   if (result == ACE_Filecache_Handle::ACE_SUCCESS)
     {
-      ACE_Message_Block hdr_mb (header, header_size);
-      ACE_Message_Block trl_mb (trailer, trailer_size);
+      ACE_Message_Block header_mb (header, header_size);
+      ACE_Message_Block trailer_mb (trailer, trailer_size);
 
       header_and_trailer = new ACE_Asynch_Transmit_File::Header_And_Trailer
-        (hdr_mb.duplicate (), header_size, trl_mb.duplicate (), trailer_size);
+        (header_mb.duplicate (), header_size, trailer_mb.duplicate (), trailer_size);
 
       ACE_Asynch_Transmit_File tf;
 
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
index adb42fe16e0..6e8dd7ec352 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Acceptor.cpp
@@ -95,19 +95,15 @@ JAWS_IO_Synch_Acceptor::get_handle (void)
 
 
 JAWS_IO_Asynch_Acceptor::JAWS_IO_Asynch_Acceptor (void)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
   : acceptor_ (*(new ACE_Asynch_Acceptor<JAWS_Asynch_Handler>)),
     acceptor_ptr_ (&acceptor_)
-#endif
 {
 }
 
 JAWS_IO_Asynch_Acceptor::~JAWS_IO_Asynch_Acceptor (void)
 {
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
   delete this->acceptor_ptr_;
   this->acceptor_ptr_ = 0;
-#endif
 }
 
 int
@@ -192,19 +188,15 @@ JAWS_IO_Asynch_Acceptor::close (void)
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 template class ACE_Asynch_Acceptor<JAWS_Asynch_Handler>;
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
-template class ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>;
 template class ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>;
+template class ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>;
 template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
 template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#if defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS)
 #pragma instantiate ACE_Asynch_Acceptor<JAWS_Asynch_Handler>
-#pragma instantiate  ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>
-#endif /* defined (ACE_WIN32) || defined (ACE_HAS_AIO_CALLS) */
 #pragma instantiate  ACE_Singleton<JAWS_IO_Synch_Acceptor, ACE_SYNCH_MUTEX>
+#pragma instantiate  ACE_Singleton<JAWS_IO_Asynch_Acceptor, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_NULL_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
index 67710d0f543..84bc29e39d7 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO_Handler.cpp
@@ -235,7 +235,7 @@ JAWS_IO_Handler::release (void)
 JAWS_Asynch_IO_Handler_Factory::~JAWS_Asynch_IO_Handler_Factory (void)
 {
 }
-
+ 
 JAWS_IO_Handler *
 JAWS_Asynch_IO_Handler_Factory::create_io_handler (void)
 {
@@ -246,7 +246,7 @@ JAWS_Asynch_IO_Handler_Factory::create_io_handler (void)
 
   return handler;
 }
-
+ 
 void
 JAWS_Asynch_IO_Handler_Factory::destroy_io_handler (JAWS_IO_Handler *handler)
 {
@@ -254,7 +254,7 @@ JAWS_Asynch_IO_Handler_Factory::destroy_io_handler (JAWS_IO_Handler *handler)
 
   if (handler != 0)
     {
-      //cerr << "(" << thr_self () << ") locking for destruction: " << handler << endl;
+cerr << "(" << thr_self () << ") locking for destruction: " << handler << endl;
       handler->lock ();
       delete handler->message_block ();
       handler->message_block (0);
@@ -285,21 +285,21 @@ JAWS_Asynch_IO_Handler::handler (void)
 void
 JAWS_Asynch_IO_Handler::acquire (void)
 {
-  //cerr << "(" << thr_self () << ") acquire handler: " << this << endl;
+cerr << "(" << thr_self () << ") acquire handler: " << this << endl;
   this->count_.acquire_read ();
 }
 
 void
 JAWS_Asynch_IO_Handler::lock (void)
 {
-  //cerr << "(" << thr_self () << ") locking handler: " << this << endl;
+cerr << "(" << thr_self () << ") locking handler: " << this << endl;
   this->count_.acquire_write ();
 }
 
 void
 JAWS_Asynch_IO_Handler::release (void)
 {
-  //cerr << "(" << thr_self () << ") release handler: " << this << endl;
+cerr << "(" << thr_self () << ") release handler: " << this << endl;
   this->count_.release ();
 }
 
@@ -334,15 +334,14 @@ JAWS_Asynch_Handler::open (ACE_HANDLE h,
   this->handler ()->message_block ()->copy (mb.rd_ptr (), mb.length ());
 #endif
 
-  ACE_Asynch_Accept_Result_Impl *fake_result
-    = ACE_Proactor::instance ()->create_asynch_accept_result
-      (*this, JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (),
-       h, mb, JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE,
-       this->ioh_, ACE_INVALID_HANDLE, 0);
+  ACE_Asynch_Accept::Result fake_result
+    (*this, JAWS_IO_Asynch_Acceptor_Singleton::instance ()->get_handle (),
+     h, mb, JAWS_Data_Block::JAWS_DATA_BLOCK_SIZE,
+     this->ioh_, ACE_INVALID_HANDLE);
 
   this->handler ()->handler_ = this;
 
-  fake_result->complete (0, 1, 0);
+  fake_result.complete (0, 1, 0);
 }
 
 void
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile b/apps/JAWS/PROTOTYPE/JAWS/Makefile
index a92ca4841ba..211a853deb1 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile
+++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile
@@ -14,20 +14,12 @@ LIB = libJAWS.a
 SHLIB = libJAWS.$(SOEXT)
 
 MYFILES  	= \
-        Cache_Hash_T \
-        Cache_Heap_T \
-        Cache_List_T \
-        Cache_Manager \
-        Cache_Manager_T \
-        Cache_Object \
-        Hash_Bucket_T \
-	Pipeline_Handler_T \
-	Pipeline \
-	Pipeline_Tasks \
         Headers \
         Parse_Headers \
 	Waiter \
 	Reaper \
+	Pipeline \
+	Pipeline_Tasks \
 	Data_Block \
 	Policy \
 	Concurrency \
@@ -39,7 +31,7 @@ MYFILES  	= \
 LSRC	= $(addsuffix .cpp,$(MYFILES))
 LOBJ	= $(addsuffix .o,$(MYFILES))
 
-CPPFLAGS += -I.. -DJAWS_NTRACE=0 -DACE_NLOGGING #-DJAWS_HAS_THREAD_SAFE_ACCEPT
+CPPFLAGS += -I.. -DJAWS_NTRACE=0 -DACE_NLOGGING -DJAWS_HAS_THREAD_SAFE_ACCEPT
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
@@ -78,136 +70,30 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.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/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/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 ../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/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/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/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 ../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 \
+.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/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 ../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
-.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/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/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.h \
  $(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 \
@@ -215,11 +101,13 @@ 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 \
@@ -229,11 +117,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
@@ -242,50 +125,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/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/Memory_Pool.i
+.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 \
  $(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 \
  $(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/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_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -302,161 +185,64 @@ 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
-.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/Memory_Pool.i \
+ $(ACE_ROOT)/ace/Message_Block.i \
+ ../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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/Asynch_IO.h \
+ $(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/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 ../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
-.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/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/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/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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(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/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/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
-.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/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/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/Log_Priority.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
+ $(ACE_ROOT)/ace/Malloc.h \
  $(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.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/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 \
@@ -464,65 +250,22 @@ 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
-.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/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/Log_Priority.h \
+ $(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/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/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/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/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/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/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/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -534,35 +277,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.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 \
- $(ACE_ROOT)/ace/Message_Queue_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/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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -573,57 +291,86 @@ 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_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/Stream.i \
- $(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/Asynch_IO.i \
+ $(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/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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
+.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/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 \
+ $(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/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/Signal.h \
+ $(ACE_ROOT)/ace/Thread_Manager.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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -631,15 +378,26 @@ 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/Mem_Map.h \
  $(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/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/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 \
@@ -651,35 +409,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.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 \
- $(ACE_ROOT)/ace/Message_Queue_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/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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -690,66 +423,70 @@ 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_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/Stream.i \
- $(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 \
+ ../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/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 \
+ ../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
+.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/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/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 \
- $(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/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 \
@@ -761,7 +498,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -773,6 +512,13 @@ 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/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 \
@@ -788,11 +534,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/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 \
@@ -804,15 +548,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -823,7 +559,8 @@ 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 \
@@ -832,151 +569,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
-.obj/Headers.o .obj/Headers.so .shobj/Headers.o .shobj/Headers.so: Headers.cpp ../JAWS/Headers.h ../JAWS/Export.h \
+ $(ACE_ROOT)/ace/Stream.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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/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/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/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/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/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/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
-.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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.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 \
- $(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/Asynch_IO.h \
+ $(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/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/Message_Block.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 \
- $(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
-.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/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/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/Asynch_IO_Impl.h \
- $(ACE_ROOT)/ace/Asynch_IO_Impl.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/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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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 \
@@ -985,7 +614,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -993,104 +624,22 @@ 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/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/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/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/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/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/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/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/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/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 \
@@ -1098,6 +647,8 @@ 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 \
@@ -1112,15 +663,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1133,61 +676,70 @@ 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/Asynch_IO.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(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/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_Stream.i \
+ $(ACE_ROOT)/ace/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/Export.h \
+ ../JAWS/Pipeline_Tasks.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Stream.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/Stream.i \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.cpp \
+ ../JAWS/Data_Block.h ../JAWS/IO_Handler.h ../JAWS/Policy.h \
+ ../JAWS/Concurrency.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -1212,14 +764,14 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Export.h \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
+ ../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 \
@@ -1234,7 +786,8 @@ 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 \
@@ -1246,15 +799,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1265,7 +810,8 @@ 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 \
@@ -1274,18 +820,22 @@ 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/Policy.h ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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 \
@@ -1293,31 +843,34 @@ 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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 ../JAWS/Concurrency.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 \
@@ -1338,7 +891,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1346,18 +901,17 @@ 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 \
- $(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 \
@@ -1365,6 +919,8 @@ 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 \
@@ -1379,15 +935,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1400,23 +948,28 @@ 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 \
@@ -1426,32 +979,34 @@ 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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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 \
@@ -1472,7 +1027,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1480,18 +1037,17 @@ 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 \
- $(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 \
@@ -1499,6 +1055,8 @@ 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 \
@@ -1513,15 +1071,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1534,60 +1084,72 @@ 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_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
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/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_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/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 \
@@ -1612,14 +1174,14 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Pipeline.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 \
@@ -1634,7 +1196,8 @@ 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 \
@@ -1646,15 +1209,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1665,7 +1220,8 @@ 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 \
@@ -1674,23 +1230,28 @@ 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/Policy.h ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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 \
@@ -1700,34 +1261,38 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  ../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/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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -1752,14 +1317,14 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 ../JAWS/Export.h \
- ../JAWS/Pipeline.h $(ACE_ROOT)/ace/Service_Config.h \
+ ../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 \
@@ -1774,7 +1339,8 @@ 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 \
@@ -1786,15 +1352,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1805,7 +1363,8 @@ 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 \
@@ -1814,22 +1373,26 @@ 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/IO_Acceptor.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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/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/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/SOCK_Stream.i \
  $(ACE_ROOT)/ace/SOCK_Acceptor.i \
@@ -1838,37 +1401,42 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp ../JAWS/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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/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/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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.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 \
@@ -1877,7 +1445,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -1885,7 +1455,8 @@ 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 \
@@ -1895,10 +1466,54 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/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/Hash_Map_Manager.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/Asynch_IO.i \
  $(ACE_ROOT)/ace/Timer_List.h \
  $(ACE_ROOT)/ace/Timer_List_T.h \
  $(ACE_ROOT)/ace/Timer_List_T.cpp \
@@ -1910,35 +1525,18 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Wheel_T.cpp \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.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 \
+ $(ACE_ROOT)/ace/Filecache.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/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 \
@@ -1950,78 +1548,51 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Asynch_Acceptor.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/Message_Queue.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/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.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/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_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(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/LOCK_SOCK_Acceptor.cpp \
+ ../JAWS/Data_Block.h ../JAWS/Pipeline.h \
+ $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/Stream.i \
- $(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
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -2046,34 +1617,28 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/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 \
  $(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/Hash_Map_Manager.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/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -2084,12 +1649,13 @@ 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 \
@@ -2110,7 +1676,8 @@ 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 \
@@ -2119,14 +1686,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/Pipeline_Handler_T.h \
- ../JAWS/Pipeline_Handler_T.cpp ../JAWS/Policy.h ../JAWS/Concurrency.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ ../JAWS/Pipeline_Handler.h ../JAWS/Pipeline_Handler.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 ../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 \
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.cpp b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.cpp
index b0bdfb0d2c8..21aaba59b64 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Parse_Headers.cpp
@@ -29,11 +29,7 @@ JAWS_Parse_Headers::parse_headers (JAWS_Header_Info *info,
         {
           int r = this->parse_header_value (info, mb);
           if (r == 1)
-            {
-              if (info->end_of_headers ())
-                return 1;
-              break;
-            }
+            break;
           continue;
         }
     }
@@ -47,10 +43,6 @@ JAWS_Parse_Headers::parse_headers (JAWS_Header_Info *info,
       mb.crunch ();
       return 0;
     }
-  else if (mb.length () < mb.size ())
-    {
-      return 0;
-    }
   else if (mb.length () == mb.size ())
     {
       // This is one of those cases that should rarely ever happen.
@@ -64,12 +56,6 @@ JAWS_Parse_Headers::parse_headers (JAWS_Header_Info *info,
       info->status (JAWS_Header_Info::TOO_LONG);
       return 1;
     }
-  else if (mb.length () > mb.size ())
-    {
-      ACE_DEBUG ((LM_DEBUG, "JAWS_Parse_Headers: buffer overrun!!\n"));
-      info->status (JAWS_Header_Info::TOO_LONG);
-      return 1;
-    }
 
   ACE_DEBUG ((LM_DEBUG, "JAWS_Parse_Headers -- shouldn't be here!\n"));
   return 1;
@@ -180,15 +166,6 @@ JAWS_Parse_Headers::parse_header_value (JAWS_Header_Info *info,
           return 1;
         }
 
-      if (*q == '\0')
-        {
-          // We are in the middle of binary data.  Get out!
-          mb.rd_ptr (q);
-          info->end_of_line (1);
-          info->end_of_headers (1);
-          return 1;
-        }
-
       // Move past the newline, set the end of line flag
       if (*q == '\n')
         {
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp
index e0f298a48ea..83aa6397415 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.cpp
@@ -25,3 +25,5 @@ JAWS_Pipeline::close (u_long)
 {
   return 0;
 }
+
+#include "JAWS/Pipeline_Handler.cpp"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
index 03c3c66d104..ff04b4fb61f 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline.h
@@ -36,4 +36,6 @@ public:
   virtual int close (u_long = 0);
 };
 
+#include "JAWS/Pipeline_Handler.h"
+
 #endif /* !defined (JAWS_PIPELINE_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp
index ca2e26b3177..9d640c287b6 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#ifndef JAWS_PIPELINE_HANDLER_T_CPP
-#define JAWS_PIPELINE_HANDLER_T_CPP
+#ifndef JAWS_PIPELINE_HANDLER_CPP
+#define JAWS_PIPELINE_HANDLER_CPP
 
-#include "JAWS/Pipeline_Handler_T.h"
+#include "JAWS/Pipeline_Handler.h"
 
-ACE_RCSID(JAWS, Pipeline_Handler_T, "$Id$")
+ACE_RCSID(JAWS, Pipeline_Handler, "$Id$")
 
 template <class TYPE>
 JAWS_Pipeline_Abstract_Handler<TYPE>::JAWS_Pipeline_Abstract_Handler (void)
@@ -28,4 +28,4 @@ JAWS_Pipeline_Abstract_Handler<TYPE>::put (ACE_Message_Block *mb,
   return status;
 }
 
-#endif /* !defined (JAWS_PIPELINE_HANDLER_T_CPP) */
+#endif /* !defined (JAWS_PIPELINE_HANDLER_CPP) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
index 4d4d808fee2..7d95294bf03 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler_T.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Handler.h
@@ -1,8 +1,8 @@
 /* -*- c++ -*- */
 // $Id$
 
-#ifndef JAWS_PIPELINE_HANDLER_T_H
-#define JAWS_PIPELINE_HANDLER_T_H
+#ifndef JAWS_PIPELINE_HANDLER_H
+#define JAWS_PIPELINE_HANDLER_H
 
 #include "JAWS/Export.h"
 #include "JAWS/Pipeline.h"
@@ -26,7 +26,7 @@ public:
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "JAWS/Pipeline_Handler_T.cpp"
+#include "JAWS/Pipeline_Handler.cpp"
 #endif
 
-#endif /* !defined (JAWS_PIPELINE_HANDLER_T_H) */
+#endif /* !defined (JAWS_PIPELINE_HANDLER_H) */
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp
index 8af617d8979..e7bd1b2667c 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.cpp
@@ -4,7 +4,6 @@
 
 #include "JAWS/IO.h"
 #include "JAWS/Pipeline_Tasks.h"
-#include "JAWS/Pipeline_Handler_T.h"
 #include "JAWS/Data_Block.h"
 #include "JAWS/IO_Handler.h"
 #include "JAWS/Policy.h"
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
index 3bbb5080593..4506885b0a2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
+++ b/apps/JAWS/PROTOTYPE/JAWS/Pipeline_Tasks.h
@@ -12,7 +12,6 @@
 
 #include "JAWS/Export.h"
 #include "JAWS/Pipeline.h"
-#include "JAWS/Pipeline_Handler_T.h"
 #include "JAWS/Data_Block.h"
 
 class JAWS_Export JAWS_Pipeline_Handler
diff --git a/apps/JAWS/PROTOTYPE/Makefile b/apps/JAWS/PROTOTYPE/Makefile
index cb6bd8a8cd5..741f7b1aef2 100644
--- a/apps/JAWS/PROTOTYPE/Makefile
+++ b/apps/JAWS/PROTOTYPE/Makefile
@@ -21,7 +21,6 @@ OBJ	= $(addsuffix .o,$(FILES))
 
 LDFLAGS += -L./JAWS
 LDLIBS  = -lHTTPU -lJAWS
-CFLAGS += -DJAWS_HAS_THREAD_SAFE_ACCEPT
 
 BUILD 	= $(VBIN)
 
@@ -47,41 +46,40 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/HTTP_10.o .obj/HTTP_10.so .shobj/HTTP_10.o .shobj/HTTP_10.so: HTTP_10.cpp HTTP_10.h $(ACE_ROOT)/ace/RB_Tree.h \
- $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+.obj/HTTP_10.o .obj/HTTP_10.so .shobj/HTTP_10.o .shobj/HTTP_10.so: HTTP_10.cpp HTTP_10.h \
+ $(ACE_ROOT)/ace/RB_Tree.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ JAWS/Pipeline_Tasks.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 \
@@ -90,8 +88,9 @@ 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.h $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -102,7 +101,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -114,6 +115,8 @@ 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 \
@@ -129,11 +132,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/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 \
@@ -145,10 +146,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -159,7 +157,8 @@ 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 \
@@ -168,38 +167,44 @@ 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.h \
- JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h
+ $(ACE_ROOT)/ace/Stream.cpp \
+ JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \
+ JAWS/JAWS.h
 .obj/HTTP_10_Request.o .obj/HTTP_10_Request.so .shobj/HTTP_10_Request.o .shobj/HTTP_10_Request.so: HTTP_10_Request.cpp JAWS/JAWS.h HTTP_10_Request.h \
- HTTPU/http_request.h $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h $(ACE_ROOT)/ace/OS.h \
+ HTTPU/http_request.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/Malloc.h $(ACE_ROOT)/ace/Malloc.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/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 \
@@ -224,60 +229,51 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 JAWS/Parse_Headers.h \
- JAWS/Export.h $(ACE_ROOT)/ace/Singleton.h \
+ JAWS/Parse_Headers.h JAWS/Export.h \
+ $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp JAWS/Headers.h \
  HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \
  HTTPU/http_status.i HTTPU/http_headers.h \
  $(ACE_ROOT)/ace/RB_Tree.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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp HTTPU/http_headers.i \
- HTTPU/http_base.i HTTPU/parse_http_request.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ HTTPU/http_headers.i HTTPU/http_base.i HTTPU/parse_http_request.h \
  HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i
 .obj/HTTP_10_Read.o .obj/HTTP_10_Read.so .shobj/HTTP_10_Read.o .shobj/HTTP_10_Read.so: HTTP_10_Read.cpp HTTP_10.h \
- $(ACE_ROOT)/ace/RB_Tree.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/RB_Tree.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.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ JAWS/Pipeline_Tasks.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 \
@@ -286,8 +282,9 @@ 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.h $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -298,7 +295,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -310,6 +309,8 @@ 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 \
@@ -325,11 +326,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/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 \
@@ -341,10 +340,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -355,7 +351,8 @@ 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 \
@@ -364,55 +361,58 @@ 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.h \
- JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h JAWS/IO.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \
+ JAWS/JAWS.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/Policy.h JAWS/Concurrency.h
-.obj/HTTP_10_Parse.o .obj/HTTP_10_Parse.so .shobj/HTTP_10_Parse.o .shobj/HTTP_10_Parse.so: HTTP_10_Parse.cpp $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h
+.obj/HTTP_10_Parse.o .obj/HTTP_10_Parse.so .shobj/HTTP_10_Parse.o .shobj/HTTP_10_Parse.so: HTTP_10_Parse.cpp \
+ $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/RB_Tree.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/config-g++-common.h HTTP_10.h \
+ $(ACE_ROOT)/ace/RB_Tree.h \
+ $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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/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/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ JAWS/Pipeline_Tasks.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 \
@@ -421,8 +421,9 @@ 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.h $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -433,7 +434,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -445,6 +448,8 @@ 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 \
@@ -460,11 +465,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/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 \
@@ -476,10 +479,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -490,7 +490,8 @@ 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 \
@@ -499,85 +500,75 @@ 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.h \
- JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h JAWS/JAWS.h JAWS/IO.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \
+ JAWS/JAWS.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/Policy.h JAWS/Concurrency.h HTTP_10_Request.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h HTTP_10_Request.h \
  HTTPU/http_request.h JAWS/Parse_Headers.h JAWS/Headers.h \
  HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \
  HTTPU/http_status.i HTTPU/http_headers.h HTTPU/http_headers.i \
  HTTPU/http_base.i HTTPU/parse_http_request.h \
  HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i
-.obj/HTTP_10_Write.o .obj/HTTP_10_Write.so .shobj/HTTP_10_Write.o .shobj/HTTP_10_Write.so: HTTP_10_Write.cpp $(ACE_ROOT)/ace/OS.h \
+.obj/HTTP_10_Write.o .obj/HTTP_10_Write.so .shobj/HTTP_10_Write.o .shobj/HTTP_10_Write.so: HTTP_10_Write.cpp \
+ $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config-sunos5.6.h \
+ $(ACE_ROOT)/ace/config.h \
  $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/streams.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
+ JAWS/JAWS.h JAWS/IO.h $(ACE_ROOT)/ace/ACE.h \
+ $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i $(ACE_ROOT)/ace/Trace.h \
+ $(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.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 JAWS/JAWS.h JAWS/IO.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/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/Singleton.h \
+ $(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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
+ $(ACE_ROOT)/ace/Synch.i \
+ $(ACE_ROOT)/ace/Synch_T.h \
  $(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 JAWS/Export.h \
- JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h \
- $(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/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_Base.h \
+ $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/Free_List.i \
@@ -585,18 +576,22 @@ 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 \
+ $(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/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 \
@@ -604,6 +599,8 @@ 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 \
@@ -618,15 +615,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.cpp \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -639,23 +628,42 @@ 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 HTTP_10.h \
+ $(ACE_ROOT)/ace/Stream_Modules.cpp \
+ $(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/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/Singleton.h \
+ $(ACE_ROOT)/ace/Singleton.i \
+ $(ACE_ROOT)/ace/Singleton.cpp JAWS/Export.h \
+ JAWS/IO_Handler.h JAWS/Policy.h JAWS/Concurrency.h HTTP_10.h \
  $(ACE_ROOT)/ace/RB_Tree.h \
  $(ACE_ROOT)/ace/RB_Tree.i \
- $(ACE_ROOT)/ace/RB_Tree.cpp JAWS/Pipeline_Tasks.h \
- JAWS/Pipeline.h $(ACE_ROOT)/ace/Stream.h \
+ $(ACE_ROOT)/ace/RB_Tree.cpp \
+ JAWS/Pipeline_Tasks.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_Handler.h \
- JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h HTTP_10_Request.h \
- HTTPU/http_request.h JAWS/Parse_Headers.h JAWS/Headers.h \
- HTTPU/http_export.h HTTPU/http_base.h HTTPU/http_status.h \
- HTTPU/http_status.i HTTPU/http_headers.h HTTPU/http_headers.i \
- HTTPU/http_base.i HTTPU/parse_http_request.h \
+ $(ACE_ROOT)/ace/Stream.cpp \
+ JAWS/Pipeline_Handler.h JAWS/Pipeline_Handler.cpp JAWS/Data_Block.h \
+ HTTP_10_Request.h HTTPU/http_request.h JAWS/Parse_Headers.h \
+ JAWS/Headers.h HTTPU/http_export.h HTTPU/http_base.h \
+ HTTPU/http_status.h HTTPU/http_status.i HTTPU/http_headers.h \
+ HTTPU/http_headers.i HTTPU/http_base.i HTTPU/parse_http_request.h \
  HTTPU/parse_http_request.i HTTPU/parse_url.h HTTPU/http_request.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/PROTOTYPE/README b/apps/JAWS/PROTOTYPE/README
deleted file mode 100644
index dae52514354..00000000000
--- a/apps/JAWS/PROTOTYPE/README
+++ /dev/null
@@ -1,32 +0,0 @@
-This directory contains the source code to the JAWS framework as
-described in Object-Oriented Application Frameworks, Volume 3.
-
-The subdirectories are as follows
-
-  ./JAWS          the core JAWS framework source
-  ./HTTPU         utility classes for HTTP handling
-
-The top level directory contains source to a simple HTTP/0.9 web
-server written using the JAWS framework.
-
-The Makefile uses the ACE Makefile system, so a correctly configured
-ACE should require no changes to get JAWS to compile.
-
-Users of Windows NT can start with the supplied project files, but they
-may require some fiddling with to get it all to compile.
-
-Server command line options:
-
-  -t              : enable/disable tracing (disabled by default)
-  -p PORT         : set listen port to PORT (5432 default)
-  -c CONCURRENCY  : set concurrency strategy, one of PER_REQUEST,
-                    or POOL (the default).
-  -d DISPATCH     : set dispatch strategy, one of ASYNCH, or SYNCH (default)
-  -n NTHREADS     : set number of threads for POOL (5 default)
-  -m MAXTHREADS   : set maximum number of threads for PER_REQUEST,
-                    (20 default)
-  -f THREADFLAGS  : set thread creation flags, recognizes THR_BOUND,
-                    THR_DAEMON, and THR_DETACHED
-  -r RATIO        : set asynch tasks per thread ratio (1 default)
-
--- James
diff --git a/apps/JAWS/PROTOTYPE/main.cpp b/apps/JAWS/PROTOTYPE/main.cpp
index d1bd6f46dcb..f129d4b1dfc 100644
--- a/apps/JAWS/PROTOTYPE/main.cpp
+++ b/apps/JAWS/PROTOTYPE/main.cpp
@@ -21,10 +21,6 @@ handler (int)
 }
 #endif /* ACE_HAS_SIG_C_FUNC */
 
-static JAWS_HTTP_10_Read_Task HTTP_Read;
-static JAWS_HTTP_10_Parse_Task HTTP_Parse;
-static JAWS_HTTP_10_Write_Task HTTP_Write;
-
 int
 main (int argc, char *argv[])
 {
@@ -35,6 +31,9 @@ main (int argc, char *argv[])
   ACE_OS::signal (SIGUSR2, (ACE_SignalHandler) handler);
 
   JAWS_Server server (argc, argv);
+  JAWS_HTTP_10_Read_Task HTTP_Read;
+  JAWS_HTTP_10_Parse_Task HTTP_Parse;
+  JAWS_HTTP_10_Write_Task HTTP_Write;
 
   HTTP_Read.next (&HTTP_Parse);
   HTTP_Parse.next (&HTTP_Write);
diff --git a/apps/JAWS/clients/Blobby/Makefile b/apps/JAWS/clients/Blobby/Makefile
index 005cb80afab..8d12d2fadfd 100644
--- a/apps/JAWS/clients/Blobby/Makefile
+++ b/apps/JAWS/clients/Blobby/Makefile
@@ -43,6 +43,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Blob.o .obj/Blob.so .shobj/Blob.o .shobj/Blob.so: Blob.cpp Blob.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -136,15 +139,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -191,6 +189,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Blob_Handler.o .obj/Blob_Handler.so .shobj/Blob_Handler.o .shobj/Blob_Handler.so: Blob_Handler.cpp Blob_Handler.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -292,15 +293,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -331,6 +327,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -384,8 +383,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.h \
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/ARGV.i \
- Blob.h \
+ $(ACE_ROOT)/ace/ARGV.i Blob.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
@@ -427,15 +425,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/apps/JAWS/clients/Caching/Makefile b/apps/JAWS/clients/Caching/Makefile
index 25c20cba86b..bd718a17b92 100644
--- a/apps/JAWS/clients/Caching/Makefile
+++ b/apps/JAWS/clients/Caching/Makefile
@@ -44,6 +44,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -73,12 +76,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
@@ -120,6 +117,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  http_handler.h \
  $(ACE_ROOT)/ace/Connector.h \
  $(ACE_ROOT)/ace/Map_Manager.h \
diff --git a/apps/JAWS/server/HTTP_Server.cpp b/apps/JAWS/server/HTTP_Server.cpp
index b262b2ca5c8..6aab0c4241b 100644
--- a/apps/JAWS/server/HTTP_Server.cpp
+++ b/apps/JAWS/server/HTTP_Server.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-#define ACE_BUILD_SVC_DLL
-
 #include "ace/Get_Opt.h"
 #include "ace/Asynch_Acceptor.h"
 #include "ace/LOCK_SOCK_Acceptor.h"
@@ -344,7 +342,7 @@ HTTP_Server::asynch_thread_pool (void)
   // Create the thread pool.
   // Register threads with the proactor and thread manager.
   Asynch_Thread_Pool_Task t (*ACE_Proactor::instance (),
-                             this->tm_);
+                             this->tm_); 
 
   // The proactor threads are waiting on the I/O Completion Port.
 
@@ -393,3 +391,4 @@ template class ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/apps/JAWS/server/HTTP_Server.h b/apps/JAWS/server/HTTP_Server.h
index 8f683297a96..614f98b3e24 100644
--- a/apps/JAWS/server/HTTP_Server.h
+++ b/apps/JAWS/server/HTTP_Server.h
@@ -41,7 +41,7 @@ typedef ACE_LOCK_SOCK_Acceptor<ACE_SYNCH_MUTEX> HTTP_SOCK_Acceptor;
 
 typedef HTTP_SOCK_Acceptor HTTP_Acceptor;
 
-class ACE_Svc_Export HTTP_Server : public ACE_Service_Object
+class HTTP_Server : public ACE_Service_Object
   // = TITLE
   //     This server is used to create HTTP Handlers for the Web
   //     server
@@ -134,8 +134,8 @@ private:
 };
 #endif /* ACE_WIN32 */
 
-ACE_SVC_FACTORY_DECLARE (HTTP_Server)
-
 ACE_STATIC_SVC_DECLARE (HTTP_Server)
 
 #endif /* HTTP_SERVER_H */
+
+
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index abb979ddb1f..b530d85f2b0 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -107,7 +107,7 @@ JAWS_Synch_IO::transmit_file (const char *filename,
 
   if (result == ACE_Filecache_Handle::ACE_SUCCESS)
     {
-#if defined (ACE_JAWS_BASELINE) || defined (ACE_WIN32)
+#if defined (ACE_JAWS_BASELINE)
       ACE_SOCK_Stream stream;
       stream.set_handle (this->handle_);
 
diff --git a/apps/JAWS/server/Makefile b/apps/JAWS/server/Makefile
index 2bd79c0343f..675e9ce86b8 100644
--- a/apps/JAWS/server/Makefile
+++ b/apps/JAWS/server/Makefile
@@ -9,8 +9,6 @@
 #----------------------------------------------------------------------------
 
 BIN   	= main
-LIB	= libJAWS.a
-SHLIB	= libJAWS.$(SOEXT)
 
 FILES  	= \
 	HTTP_Server \
@@ -24,15 +22,10 @@ FILES  	= \
 	Parse_Headers \
 	IO
 
-LIBS   += $(ACELIB)
-LDLIBS	= -lJAWS
+SRC	= $(addsuffix .cpp,$(FILES))
+OBJ	= $(addsuffix .o,$(FILES))
 
-PSRC   	= $(addsuffix .cpp,$(BIN))
-LSRC	= $(addsuffix .cpp,$(FILES))
-
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-
-BUILD	= $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
+BUILD	= $(VBIN)
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -42,7 +35,6 @@ 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
 
@@ -62,6 +54,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -109,13 +104,7 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Atomic_Op.i \
  $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Proactor.h \
- IO.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
- HTTP_Server.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/Containers.i \
@@ -142,16 +131,34 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i IO.h \
+ HTTP_Server.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/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(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 \
@@ -174,15 +181,10 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -214,6 +216,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/HTTP_Config.o .obj/HTTP_Config.so .shobj/HTTP_Config.o .shobj/HTTP_Config.so: HTTP_Config.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -234,6 +239,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -291,12 +299,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
  $(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 \
@@ -316,6 +318,7 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i \
  HTTP_Handler.h \
  $(ACE_ROOT)/ace/Asynch_IO.h \
  HTTP_Request.h Parse_Headers.h HTTP_Response.h IO.h HTTP_Helpers.h
@@ -324,6 +327,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -355,6 +361,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -442,15 +451,10 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -478,6 +482,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -564,15 +571,10 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -591,13 +593,15 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
- IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h
+ IO.h $(ACE_ROOT)/ace/Asynch_IO.h
 .obj/HTTP_Request.o .obj/HTTP_Request.so .shobj/HTTP_Request.o .shobj/HTTP_Request.so: HTTP_Request.cpp \
  $(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.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -658,6 +662,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Process.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -695,6 +702,9 @@ 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 Parse_Headers.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -714,6 +724,9 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -783,12 +796,6 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SOCK_Stream.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 \
@@ -808,158 +815,8 @@ include         $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- IO.h \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- HTTP_Helpers.h
-.obj/main.o .obj/main.so .shobj/main.o .shobj/main.so: main.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/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 \
- HTTP_Server.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Acceptor.h \
- $(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/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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- $(ACE_ROOT)/ace/LOCK_SOCK_Acceptor.cpp \
- $(ACE_ROOT)/ace/Asynch_IO.h \
- HTTP_Handler.h HTTP_Request.h Parse_Headers.h HTTP_Response.h IO.h
+ IO.h $(ACE_ROOT)/ace/Asynch_IO.h \
+ HTTP_Helpers.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/apps/JAWS/server/jaws.dsp b/apps/JAWS/server/jaws.dsp
index 1c2d3317665..c34625baa31 100644
--- a/apps/JAWS/server/jaws.dsp
+++ b/apps/JAWS/server/jaws.dsp
@@ -22,7 +22,6 @@ CFG=jaws - Win32 Release
 !MESSAGE 

 

 # Begin Project

-# PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

 CPP=cl.exe

@@ -42,7 +41,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "ACE_NLOGGING" /D ACE_HAS_SVC_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "ACE_NLOGGING" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -66,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # 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" /D ACE_HAS_SVC_DLL=1 /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/apps/JAWS/server/main.cpp b/apps/JAWS/server/main.cpp
index 0d04f565a06..b99638bf194 100644
--- a/apps/JAWS/server/main.cpp
+++ b/apps/JAWS/server/main.cpp
@@ -41,7 +41,7 @@ main (int argc, char *argv[])
   ACE_OS::signal (SIGINT, (ACE_SignalHandler) handler);
   ACE_OS::signal (SIGUSR2, (ACE_SignalHandler) handler);
 
-  if (daemon.open (argc, argv, ACE_DEFAULT_LOGGER_KEY, 0) != 0)
+  if (daemon.open (argc, argv) != 0)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 1);
 
   // The configured service creates threads, and the
diff --git a/apps/JAWS/server/svc.conf b/apps/JAWS/server/svc.conf
index 5f34c06aaa1..a180ee1b383 100644
--- a/apps/JAWS/server/svc.conf
+++ b/apps/JAWS/server/svc.conf
@@ -32,13 +32,6 @@ static HTTP_Server "HTTP_Server -p 5432 -n 20 -i SYNCH -t POOL -b 50 -f THR_NEW_
 # Throttling, 40 threads
 #static HTTP_Server "HTTP_Server -p 5432 -n 40 -i SYNCH -t THROTTLE -b 50 -f THR_NEW_LWP"
 #
-
-#
-# Example for using HTTP_Server as a dynamic service
 #
-# For NT.
-#dynamic HTTP_Server Service_Object * ./jaws.exe:_make_HTTP_Server() "HTTP_Server -p 5432 -n 20 -i SYNCH -t POOL -b 50 -f THR_NEW_LWP"
+#dynamic HTTP_Server Service_Object * .shobj/HTTP_Server:jaws "HTTP_Server -p 5432 -s HTTP_Service"
 
-#
-# For UNIX platforms.
-#dynamic HTTP_Server Service_Object * ./main:_make_HTTP_Server() "HTTP_Server -p 5432  -n 20 -i SYNCH -t POOL -b 50 -f THR_NEW_LWP"
diff --git a/apps/Makefile.am b/apps/Makefile.am
deleted file mode 100644
index 7aba8c167e0..00000000000
--- a/apps/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the apps directory
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## The following directories aren't compiled by default since haven't
-## finished integrating it into ACE...
-##
-## Orbix-Examples
-
-if COMPILE_GPERF
-GPERF_DIR = gperf
-else
-GPERF_DIR = 
-endif
-
-SUBDIRS = $(GPERF_DIR)
-## SUBDIRS = Gateway \
-##           JAWS \
-##           Orbix-Examples \
-##           gperf
-
-## EXTRA_DIST = README
diff --git a/apps/gperf/COPYING b/apps/gperf/COPYING
index 60549be514a..9a170375811 100644
--- a/apps/gperf/COPYING
+++ b/apps/gperf/COPYING
@@ -1,40 +1,38 @@
+
 		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+		     Version 1, February 1989
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989 Free Software Foundation, Inc.
+                    675 Mass Ave, Cambridge, MA 02139, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
+  The license agreements of most software companies try to keep users
+at the mercy of those companies.  By contrast, our General Public
 License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+software--to make sure the software is free for all its users.  The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
 
   When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+price.  Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
 
   To protect your rights, we need to make restrictions that forbid
 anyone to deny you these rights or to ask you to surrender the rights.
 These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
 
-  For example, if you distribute copies of such a program, whether
+  For example, if you distribute copies of a such a program, whether
 gratis or for a fee, you must give the recipients all the rights that
 you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
+source code.  And you must tell them their rights.
 
   We protect your rights with two steps: (1) copyright the software, and
 (2) offer you this license which gives you legal permission to copy,
@@ -47,207 +45,120 @@ want its recipients to know that what they have is not the original, so
 that any problems introduced by others will not reflect on the original
 authors' reputations.
 
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
   The precise terms and conditions for copying, distribution and
 modification follow.
 
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+  0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License.  The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications.  Each
+licensee is addressed as "you".
+
+  1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program.  You may charge a fee for the physical act of
+transferring a copy.
+
+  2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+    a) cause the modified files to carry prominent notices stating that
+    you changed the files and the date of any change; and
+
+    b) cause the whole of any work that you distribute or publish, that
+    in whole or in part contains the Program or any part thereof, either
+    with or without modifications, to be licensed at no charge to all
+    third parties under the terms of this General Public License (except
+    that you may choose to grant warranty protection to some or all
+    third parties, at your option).
+
+    c) If the modified program normally reads commands interactively when
+    run, you must cause it, when started running for such interactive use
+    in the simplest and most usual way, to print or display an
+    announcement including an appropriate copyright notice and a notice
+    that there is no warranty (or else, saying that you provide a
+    warranty) and that users may redistribute the program under these
+    conditions, and telling the user how to view a copy of this General
+    Public License.
+
+    d) You may charge a fee for the physical act of transferring a
+    copy, and you may at your option offer warranty protection in
+    exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
 
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
+  3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+    a) accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    b) accompany it with a written offer, valid for at least three
+    years, to give any third party free (except for a nominal charge
+    for the cost of distribution) a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of
+    Paragraphs 1 and 2 above; or,
+
+    c) accompany it with the information you received as to where the
+    corresponding source code may be obtained.  (This alternative is
     allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+    received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it.  For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+  4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License.  However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+  5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
 
   6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions.  You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
 
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
+  7. The Free Software Foundation may publish revised and/or new versions
 of the General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
 
 Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
+specifies a version number of the license which applies to it and "any
 later version", you have the option of following the terms and conditions
 either of that version or of any later version published by the Free
 Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
+the license, you may choose any version ever published by the Free Software
 Foundation.
 
-  10. If you wish to incorporate parts of the Program into other free
+  8. If you wish to incorporate parts of the Program into other free
 programs whose distribution conditions are different, write to the author
 to ask for permission.  For software which is copyrighted by the Free
 Software Foundation, write to the Free Software Foundation; we sometimes
@@ -257,7 +168,7 @@ of promoting the sharing and reuse of software generally.
 
 			    NO WARRANTY
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+  9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
@@ -267,7 +178,7 @@ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 REPAIR OR CORRECTION.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+  10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
@@ -279,24 +190,25 @@ POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
 
-	    How to Apply These Terms to Your New Programs
+	Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
 
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
+  To do so, attach the following notices to the program.  It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) 19yy  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
+    the Free Software Foundation; either version 1, or (at your option)
+    any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -305,36 +217,33 @@ the "copyright" line and a pointer to where the full notice is found.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) 19xx name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License.  Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
+necessary.  Here a sample; alter the names:
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  program `Gnomovision' (a program to direct compilers to make passes
+  at assemblers) written by James Hacker.
 
   <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+That's all there is to it!
diff --git a/apps/gperf/ChangeLog b/apps/gperf/ChangeLog
index 7f0a5220a68..80c845d381a 100644
--- a/apps/gperf/ChangeLog
+++ b/apps/gperf/ChangeLog
@@ -1,60 +1,3 @@
-Tue May  4 14:24:27 1999  Alexander Babu Arulanthu  <alex@cs.wustl.edu>
-
-	* src/Options.cpp (parse_args): Removed %a flag from -v option and
-	used ACE_OS::exit (0) instead. 
-
-Mon Apr 26 15:42:54 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-	* tests/test-{1,2,3,4,5}.exp:
-
-	  Forgot to update the expected test output to reflect the
-	  version string update listed below.
-
-Mon Apr 26 10:42:08 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-	* src/Version.cpp (version_string): 
-
-	  Updated version string to "2.8 (ACE version)" since 2.7 is used
-	  by the old Cygnus maintained gperf.
-
-	* src/*.{h,cpp}:
-
-	  Updated copyright/distribution information to GPL v2 style notice.
-
-Sun Apr 25 16:16:12 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-	* mdate-sh: Added this file to the CVS repository.  It will be
-	  used once the auto{conf,make} integrations are in place.
-
-Sun Apr 25 16:13:40 1999  Ossama Othman  <othman@cs.wustl.edu>
-
-	* COPYING: Updated to GPL version 2.
-
-Sat Apr 24 18:18:35 1999  Ossama Othman  <othman@cs.wustl.edu>
-	
-	* gperf.1:
-	* gperf.info:
-	* gperf.texi:
-
-	  Added missing quote, cosmetic fix, regenerated gperf.info.
-	
-	* src/Key_List.cpp
-	* src/Options.h: 
-	* src/Options.cpp: 
-
-	  Merged Cygnus patch that allows the user to specify a default
-	  fill expression/value in the keyword table.  Updated help
-	  message with new `-F' option.  Made some cosmetic fixes to the
-	  help message, too.
-
-	* tests/test.cpp: 
-
-	  Minor spelling correction in comment
-
-	* tests/test-6.exp:
-
-	  Updated with new expected gperf output.
-	
 Mon Nov  9 23:37:09 1998  Vishal Kachroo <vishal@cs.wustl.edu>
 
 	* src/Key_List.cpp: Fixed the problem with Binary and Linear
diff --git a/apps/gperf/Makefile.am b/apps/gperf/Makefile.am
deleted file mode 100644
index 308d0ce01b5..00000000000
--- a/apps/gperf/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Top-level Makefile for gperf
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = src ##tests
-
-GPERF_VERSION = 2.0
-
-VERSION = $(GPERF_VERSION)
-
-info_TEXINFOS = gperf.texi
-
-man_MANS = gperf.1
-
-EXTRA_DIST = $(man_MANS) gperf.info
diff --git a/apps/gperf/gperf.1 b/apps/gperf/gperf.1
index a031a7b0435..5673c80062a 100644
--- a/apps/gperf/gperf.1
+++ b/apps/gperf/gperf.1
@@ -1,4 +1,4 @@
-.TH GPERF 1 "December 16, 1988"
+.TH GPERF 1 "December 16, 1988
 .UC 4
 .SH NAME
 gperf \- generate a perfect hash function from a key set
diff --git a/apps/gperf/gperf.info b/apps/gperf/gperf.info
index c27a6ddedf4..c553953d2c5 100644
--- a/apps/gperf/gperf.info
+++ b/apps/gperf/gperf.info
@@ -44,7 +44,7 @@ bugs.
 * Menu:
 
 * Copying::			GNU `gperf' General Public License says
-                                how you can copy and share `gperf'.
+                    how you can copy and share `gperf'.
 * Contributors::		People who have contributed to `gperf'.
 * Motivation::			Static search structures and GNU GPERF.
 * Search Structures::		Static search structures and GNU `gperf'
@@ -1111,20 +1111,20 @@ Foundation, 1989.
 
 Tag Table:
 Node: Top1224
-Node: Copying2511
-Node: Contributors15814
-Node: Motivation16914
-Node: Search Structures18181
-Node: Description21734
-Node: Input Format23554
-Node: Declarations24349
-Node: Keywords26656
-Node: Functions28247
-Node: Output Format28741
-Node: Options31211
-Node: Bugs44581
-Node: Projects47268
-Node: Implementation48845
-Node: Bibliography49564
+Node: Copying2499
+Node: Contributors15802
+Node: Motivation16902
+Node: Search Structures18169
+Node: Description21722
+Node: Input Format23542
+Node: Declarations24337
+Node: Keywords26644
+Node: Functions28235
+Node: Output Format28729
+Node: Options31199
+Node: Bugs44569
+Node: Projects47256
+Node: Implementation48833
+Node: Bibliography49552
 
 End Tag Table
diff --git a/apps/gperf/gperf.texi b/apps/gperf/gperf.texi
index 0e1f45bf91e..c80f227e956 100644
--- a/apps/gperf/gperf.texi
+++ b/apps/gperf/gperf.texi
@@ -95,7 +95,7 @@ bugs.
 @end ifinfo
 @menu
 * Copying::			GNU @code{gperf} General Public License says
-                                how you can copy and share @code{gperf}.
+                    how you can copy and share @code{gperf}.
 * Contributors::		People who have contributed to @code{gperf}.
 * Motivation::			Static search structures and GNU GPERF.
 * Search Structures::		Static search structures and GNU @code{gperf}
diff --git a/apps/gperf/mdate-sh b/apps/gperf/mdate-sh
deleted file mode 100755
index 37171f21fbd..00000000000
--- a/apps/gperf/mdate-sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/sh
-# Get modification time of a file or directory and pretty-print it.
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
-# written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Prevent date giving response in another language.
-LANG=C
-export LANG
-LC_ALL=C
-export LC_ALL
-LC_TIME=C
-export LC_TIME
-
-# Get the extended ls output of the file or directory.
-# On HPUX /bin/sh, "set" interprets "-rw-r--r--" as options, so the "x" below.
-if ls -L /dev/null 1>/dev/null 2>&1; then
-  set - x`ls -L -l -d $1`
-else
-  set - x`ls -l -d $1`
-fi
-# The month is at least the fourth argument
-# (3 shifts here, the next inside the loop).
-shift
-shift
-shift
-
-# Find the month.  Next argument is day, followed by the year or time.
-month=
-until test $month
-do
-  shift
-  case $1 in
-    Jan) month=January; nummonth=1;;
-    Feb) month=February; nummonth=2;;
-    Mar) month=March; nummonth=3;;
-    Apr) month=April; nummonth=4;;
-    May) month=May; nummonth=5;;
-    Jun) month=June; nummonth=6;;
-    Jul) month=July; nummonth=7;;
-    Aug) month=August; nummonth=8;;
-    Sep) month=September; nummonth=9;;
-    Oct) month=October; nummonth=10;;
-    Nov) month=November; nummonth=11;;
-    Dec) month=December; nummonth=12;;
-  esac
-done
-
-day=$2
-
-# Here we have to deal with the problem that the ls output gives either
-# the time of day or the year.
-case $3 in
-  *:*) set `date`; eval year=\$$#
-       case $2 in
-	 Jan) nummonthtod=1;;
-	 Feb) nummonthtod=2;;
-	 Mar) nummonthtod=3;;
-	 Apr) nummonthtod=4;;
-	 May) nummonthtod=5;;
-	 Jun) nummonthtod=6;;
-	 Jul) nummonthtod=7;;
-	 Aug) nummonthtod=8;;
-	 Sep) nummonthtod=9;;
-	 Oct) nummonthtod=10;;
-	 Nov) nummonthtod=11;;
-	 Dec) nummonthtod=12;;
-       esac
-       # For the first six month of the year the time notation can also
-       # be used for files modified in the last year.
-       if (expr $nummonth \> $nummonthtod) > /dev/null;
-       then
-	 year=`expr $year - 1`
-       fi;;
-  *) year=$3;;
-esac
-
-# The result.
-echo $day $month $year
diff --git a/apps/gperf/src/Bool_Array.cpp b/apps/gperf/src/Bool_Array.cpp
index baf74e31a2e..d45da07c905 100644
--- a/apps/gperf/src/Bool_Array.cpp
+++ b/apps/gperf/src/Bool_Array.cpp
@@ -1,27 +1,25 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Fast lookup table abstraction implemented as an Iteration Number Array
+/* Fast lookup table abstraction implemented as an Iteration Number Array
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+   Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 1, or (at your option)
+any later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA.  */
 
 #include "Bool_Array.h"
 
diff --git a/apps/gperf/src/Bool_Array.h b/apps/gperf/src/Bool_Array.h
index 30902b10752..0e869b1a128 100644
--- a/apps/gperf/src/Bool_Array.h
+++ b/apps/gperf/src/Bool_Array.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.*/
 
 #ifndef BOOL_ARRAY_H
 #define BOOL_ARRAY_H
diff --git a/apps/gperf/src/Gen_Perf.cpp b/apps/gperf/src/Gen_Perf.cpp
index 584e1274954..0e7fe834556 100644
--- a/apps/gperf/src/Gen_Perf.cpp
+++ b/apps/gperf/src/Gen_Perf.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Gen_Perf.h"
 
diff --git a/apps/gperf/src/Gen_Perf.h b/apps/gperf/src/Gen_Perf.h
index b9038face7a..6d93b1c653f 100644
--- a/apps/gperf/src/Gen_Perf.h
+++ b/apps/gperf/src/Gen_Perf.h
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 1, or (at your option)
+any later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111, USA. */
 
 #ifndef GEN_PERF_H
 #define GEN_PERF_H
diff --git a/apps/gperf/src/Hash_Table.cpp b/apps/gperf/src/Hash_Table.cpp
index c66b0b4f948..ce4fe30b15a 100644
--- a/apps/gperf/src/Hash_Table.cpp
+++ b/apps/gperf/src/Hash_Table.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Hash_Table.h"
 
diff --git a/apps/gperf/src/Hash_Table.h b/apps/gperf/src/Hash_Table.h
index dba0c478eff..5234f94ce26 100644
--- a/apps/gperf/src/Hash_Table.h
+++ b/apps/gperf/src/Hash_Table.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #ifndef HASH_TABLE_H
 #define HASH_TABLE_H
diff --git a/apps/gperf/src/Iterator.cpp b/apps/gperf/src/Iterator.cpp
index 75d6e40ddef..d2491faa5ab 100644
--- a/apps/gperf/src/Iterator.cpp
+++ b/apps/gperf/src/Iterator.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Iterator.h"
 
diff --git a/apps/gperf/src/Iterator.h b/apps/gperf/src/Iterator.h
index 67fbd8e4603..fc150efdc72 100644
--- a/apps/gperf/src/Iterator.h
+++ b/apps/gperf/src/Iterator.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
 #ifndef ITERATOR_H
 #define ITERATOR_H
diff --git a/apps/gperf/src/Key_List.cpp b/apps/gperf/src/Key_List.cpp
index a17a01491f9..63492aaaac1 100644
--- a/apps/gperf/src/Key_List.cpp
+++ b/apps/gperf/src/Key_List.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Key_List.h"
 
@@ -799,11 +798,7 @@ Key_List::output_keyword_table (void)
 
   for (column = 1; index < head->hash_value; column++)
     {
-      ACE_OS::printf ("%s\"\"%s,%s %s",
-                      l_brace,
-                      option.fill_default (),
-                      r_brace,
-                      column % 9 ? "" : "\n      ");
+      ACE_OS::printf ("%s\"\",%s %s", l_brace, r_brace, column % 9 ? "" : "\n      ");
       index++;
     }
 
diff --git a/apps/gperf/src/Key_List.h b/apps/gperf/src/Key_List.h
index 1fe86eb62b0..1a2d30421a9 100644
--- a/apps/gperf/src/Key_List.h
+++ b/apps/gperf/src/Key_List.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #ifndef KEY_LIST_H
 #define KEY_LIST_H
diff --git a/apps/gperf/src/List_Node.cpp b/apps/gperf/src/List_Node.cpp
index 450831ecb52..6cd2a73d14b 100644
--- a/apps/gperf/src/List_Node.cpp
+++ b/apps/gperf/src/List_Node.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "List_Node.h"
 
diff --git a/apps/gperf/src/List_Node.h b/apps/gperf/src/List_Node.h
index 8592462ed8c..59ca19ed1a8 100644
--- a/apps/gperf/src/List_Node.h
+++ b/apps/gperf/src/List_Node.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #ifndef LIST_NODE_H
 #define LIST_NODE_H
diff --git a/apps/gperf/src/Makefile b/apps/gperf/src/Makefile
index 4212852cd1e..7d8c442ad27 100644
--- a/apps/gperf/src/Makefile
+++ b/apps/gperf/src/Makefile
@@ -49,6 +49,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -61,11 +64,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Iterator.h
+ $(ACE_ROOT)/ace/Get_Opt.i Iterator.h
 .obj/Iterator.o .obj/Iterator.so .shobj/Iterator.o .shobj/Iterator.so: Iterator.cpp Iterator.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -79,14 +84,16 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Options.h
+ $(ACE_ROOT)/ace/Log_Record.i Options.h
 .obj/Gen_Perf.o .obj/Gen_Perf.so .shobj/Gen_Perf.o .shobj/Gen_Perf.so: Gen_Perf.cpp Gen_Perf.h Options.h \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -105,6 +112,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -161,6 +171,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/List_Node.o .obj/List_Node.so .shobj/List_Node.o .shobj/List_Node.so: List_Node.cpp List_Node.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -174,11 +187,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Options.h Vectors.h
+ $(ACE_ROOT)/ace/Log_Record.i Options.h \
+ Vectors.h
 .obj/Hash_Table.o .obj/Hash_Table.so .shobj/Hash_Table.o .shobj/Hash_Table.so: Hash_Table.cpp Hash_Table.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -192,11 +208,14 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Options.h List_Node.h
+ $(ACE_ROOT)/ace/Log_Record.i Options.h \
+ List_Node.h
 .obj/Bool_Array.o .obj/Bool_Array.so .shobj/Bool_Array.o .shobj/Bool_Array.so: Bool_Array.cpp Bool_Array.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -210,11 +229,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Options.h
+ $(ACE_ROOT)/ace/Log_Record.i Options.h
 .obj/Vectors.o .obj/Vectors.so .shobj/Vectors.o .shobj/Vectors.so: Vectors.cpp Vectors.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -233,6 +254,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/apps/gperf/src/Makefile.am b/apps/gperf/src/Makefile.am
deleted file mode 100644
index 9a6a7fdb629..00000000000
--- a/apps/gperf/src/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for GPERF release
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-bin_PROGRAMS = gperf
-
-gperf_SOURCES = \
-         gperf.cpp  \
-         Bool_Array.cpp  \
-         Gen_Perf.cpp  \
-         Hash_Table.cpp  \
-         Iterator.cpp  \
-         Key_List.cpp  \
-         List_Node.cpp  \
-         Options.cpp  \
-         Vectors.cpp  \
-         Version.cpp
-gperf_LDADD = $(top_builddir)/ace/libACE.la
-
-noinst_HEADERS = \
-         Bool_Array.h  \
-         Gen_Perf.h  \
-         Hash_Table.h  \
-         Iterator.h  \
-         Key_List.h  \
-         List_Node.h  \
-         Options.h  \
-         Vectors.h
diff --git a/apps/gperf/src/Options.cpp b/apps/gperf/src/Options.cpp
index 0e5e2ad0b50..73382ca430c 100644
--- a/apps/gperf/src/Options.cpp
+++ b/apps/gperf/src/Options.cpp
@@ -1,27 +1,26 @@
-// -*- C++ -*-
-
 // $Id$
 
 // Handles parsing the Options provided to the user.
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Options.h"
 
@@ -44,9 +43,6 @@ static const int DEFAULT_JUMP_VALUE = 5;
 // Default name for generated lookup function.
 static const char *const DEFAULT_NAME = "in_word_set";
 
-// Default filler for keyword table.
-static const char *const DEFAULT_FILL = "";
-
 // Default name for the key component.
 static const char *const DEFAULT_KEY = "name";
 
@@ -70,7 +66,6 @@ int Options::argc_;
 char **Options::argv_;
 int Options::iterations_;
 const char *Options::function_name_;
-const char *Options::fill_default_;
 const char *Options::key_name_;
 const char *Options::class_name_;
 const char *Options::hash_name_;
@@ -144,7 +139,6 @@ Options::Options (void)
   jump_ = DEFAULT_JUMP_VALUE;
   option_word_ = DEFAULTCHARS | C;
   function_name_ = DEFAULT_NAME;
-  fill_default_ = DEFAULT_FILL;
   key_name_ = DEFAULT_KEY;
   hash_name_ = DEFAULT_HASH_NAME;
   class_name_ = DEFAULT_CLASS_NAME;
@@ -160,43 +154,18 @@ Options::~Options (void)
     {
       char *ptr;
 
-      ACE_OS::fprintf (stderr,
-                       "\ndumping Options:"
-                       "\nDEBUG is.......: %s"
-                       "\nORDER is.......: %s"
-                       "\nANSI is........: %s"
-                       "\nTYPE is........: %s"
-                       "\nINLINE is......: %s"
-                       "\nRANDOM is......: %s"
-                       "\nDEFAULTCHARS is: %s"
-                       "\nSWITCH is......: %s"
-                       "\nPOINTER is.....: %s"
-                       "\nNOLENGTH is....: %s"
-                       "\nLENTABLE is....: %s"
-                       "\nDUP is.........: %s"
-                       "\nFAST is........: %s"
-                       "\nCOMP is........: %s"
-                       "\nNOTYPE is......: %s"
-                       "\nGLOBAL is......: %s"
-                       "\nCONSTANT is....: %s"
-                       "\nCPLUSPLUS is...: %s"
-                       "\nC is...........: %s"
-                       "\nENUM is........: %s"
-                       "\nSTRCASECMP is..: %s"
-                       "\nOPTIMIZE is....: %s"
-                       "\nLINEARSEARCH is: %s"
+      ACE_OS::fprintf (stderr, "\ndumping Options:\nDEBUG is.......: %s\nORDER is.......: %s"
+                       "\nANSI is........: %s\nTYPE is........: %s\nINLINE is......: %s"
+                       "\nRANDOM is......: %s\nDEFAULTCHARS is: %s\nSWITCH is......: %s"
+                       "\nPOINTER is.....: %s\nNOLENGTH is....: %s\nLENTABLE is....: %s"
+                       "\nDUP is.........: %s\nFAST is........: %s\nCOMP is........: %s"
+                       "\nNOTYPE is......: %s\nGLOBAL is......: %s\nCONSTANT is....: %s"
+                       "\nCPLUSPLUS is...: %s\nC is...........: %s\nENUM is........: %s"
+                       "\nSTRCASECMP is..: %s\nOPTIMIZE is....: %s\nLINEARSEARCH is: %s"
 		       "\nBINARYSEARCH is: %s"
-                       "\niterations = %d"
-                       "\nlookup function name = %s"
-                       "\nfill default = %s"
-                       "\nhash function name = %s"
-                       "\nkey name = %s"
-                       "\njump value = %d"
-                       "\nmax associcated value = %d"
-                       "\ninitial associated value = %d"
-                       "\ndelimiters = %s"
-                       "\nnumber of switch statements = %d"
-                       "\n",
+                       "\niterations = %d\nlookup function name = %s\nhash function name = %s"
+                       "\nkey name = %s\njump value = %d\nmax associcated value = %d"
+                       "\ninitial associated value = %d\ndelimiters = %s\nnumber of switch statements = %d\n",
                        ACE_BIT_ENABLED (option_word_, DEBUG) ? "enabled" : "disabled",
                        ACE_BIT_ENABLED (option_word_, ORDER) ? "enabled" : "disabled",
                        ACE_BIT_ENABLED (option_word_, ANSI) ? "enabled" : "disabled",
@@ -223,7 +192,6 @@ Options::~Options (void)
                        ACE_BIT_ENABLED (option_word_, BINARYSEARCH) ? "enabled" : "disabled",
                        iterations_,
                        function_name_,
-                       fill_default_,
                        hash_name_,
                        key_name_,
                        jump_,
@@ -258,7 +226,7 @@ Options::parse_args (int argc, char *argv[])
   if (ACE_LOG_MSG->open (argv[0]) == -1)
     return -1;
 
-  ACE_Get_Opt getopt (argc, argv, "abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:");
+  ACE_Get_Opt getopt (argc, argv, "abBcCdDe:Ef:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:");
   int option_char;
 
   argc_ = argc;
@@ -357,8 +325,7 @@ Options::parse_args (int argc, char *argv[])
                              "-B\tGenerate code for Binary Search.\n"
                              "-c\tGenerate comparison code using strncmp rather than strcmp.\n"
                              "-C\tMake the contents of generated lookup tables constant, i.e., readonly.\n"
-                             "-d\tEnables the debugging option (produces verbose output to the standard\n"
-                             "\terror).\n"
+                             "-d\tEnables the debugging option (produces verbose output to the standard error).\n"
                              "-D\tHandle keywords that hash to duplicate values.  This is useful\n"
                              "\tfor certain highly redundant keyword sets.\n"
                              "-e\tAllow user to provide a string containing delimiters used to separate\n"
@@ -369,13 +336,11 @@ Options::parse_args (int argc, char *argv[])
                              "\trunning time at the cost of minimizing generated table-size.\n"
                              "\tThe numeric argument represents the number of times to iterate when\n"
                              "\tresolving a collision.  `0' means ``iterate by the number of keywords.''\n"
-                             "-F\tProvided expression will be used to assign default values in keyword\n"
-                             "\ttable, i.e., the fill value.  Default is \"\".\n"
                              "-g\tMake generated routines use ``inline'' to remove function overhead.\n"
                              "-G\tGenerate the static table of keywords as a static global variable,\n"
                              "\trather than hiding it inside of the lookup function (which is the\n"
                              "\tdefault behavior).\n"
-                             "-h\tPrints this message.\n"
+                             "-h\tPrints this mesage.\n"
                              "-H\tAllow user to specify name of generated hash function. Default\n"
                              "\tis `hash'.\n"
                              "-i\tProvide an initial value for the associate values array.  Default is 0.\n"
@@ -391,45 +356,42 @@ Options::parse_args (int argc, char *argv[])
                              "\toccur in any order.  Also, the meta-character '*' causes the generated\n"
                              "\thash function to consider ALL key positions, and $ indicates the\n"
                              "\t``final character'' of a key, e.g., $,1,2,4,6-10.\n"
-                             "-K\tAllow use to select name of the keyword component in the keyword\n"
-                             "\tstructure.\n"
+                             "-K\tAllow use to select name of the keyword component in the keyword structure.\n"
                              "-l\tCompare key lengths before trying a string comparison.  This helps\n"
                              "\tcut down on the number of string comparisons made during the lookup.\n"
-                             "-L\tGenerates code in the language specified by the option's argument.\n"
-                             "\tLanguages handled are currently C++ and C.  The default is C.\n"
+                             "-L\tGenerates code in the language specified by the option's argument.  Languages\n"
+                             "\thandled are currently C++ and C.  The default is C.\n"
                              "-m\tAvoids the warning about identical hash values. This is valid\n"
                              "\tonly if the -D option is enabled.\n"
                              "-M\tSkips class definition in the output. This is valid only in C++ mode.\n"
-                             "-n\tDo not include the length of the keyword when computing the hash\n"
-                             "\tfunction.\n"
+                             "-n\tDo not include the length of the keyword when computing the hash function\n"
                              "-N\tAllow user to specify name of generated lookup function.  Default\n"
                              "\tname is `in_word_set.'\n"
                              "-o\tReorders input keys by frequency of occurrence of the key sets.\n"
                              "\tThis should decrease the search time dramatically.\n"
-                             "-O\tOptimize the generated lookup function by assuming that all input\n"
-                             "\tkeywords are members of the keyset from the keyfile.\n"
+                             "-O\tOptimize the generated lookup function by assuming that all input keywords \n"
+                             "\tare members of the keyset from the keyfile.\n"
                              "-p\tChanges the return value of the generated function ``in_word_set''\n"
                              "\tfrom its default boolean value (i.e., 0 or 1), to type ``pointer\n"
                              "\tto wordlist array''  This is most useful when the -t option, allowing\n"
                              "\tuser-defined structs, is used.\n"
                              "-r\tUtilizes randomness to initialize the associated values table.\n"
                              "-s\tAffects the size of the generated hash table.  The numeric argument\n"
-                             "\tfor this option indicates ``how many times larger or smaller'' the\n"
-                             "\tassociated value range should be, in relationship to the number of\n"
-                             "\tkeys, e.g. a value of 3 means ``allow the maximum associated value\n"
-                             "\tto be about 3 times larger than the number of input keys.''\n"
-                             "\tConversely, a value of -3 means ``make the maximum associated\n"
-                             "\tvalue about 3 times smaller than the number of input keys. A\n"
-                             "\tlarger table should decrease the time required for an unsuccessful\n"
-                             "\tsearch, at the expense of extra table space.  Default value is 1.\n"
+                             "\tfor this option indicates ``how many times larger or smaller'' the associated\n"
+                             "\tvalue range should be, in relationship to the number of keys, e.g. a value of 3\n"
+                             "\tmeans ``allow the maximum associated value to be about 3 times larger than the\n"
+                             "\tnumber of input keys.''  Conversely, a value of -3 means ``make the maximum\n"
+                             "\tassociated value about 3 times smaller than the number of input keys.\n"
+                             "\tA larger table should decrease the time required for an unsuccessful search,\n"
+                             "\tat the expense of extra table space.  Default value is 1.\n"
                              "-S\tCauses the generated C code to use a switch statement scheme, rather\n"
                              "\tthan an array lookup table.  This can lead to a reduction in both\n"
                              "\ttime and space requirements for some keyfiles.  The argument to\n"
                              "\tthis option determines how many switch statements are generated.\n"
-                             "\tA value of 1 generates 1 switch containing all the elements, a value\n"
-                             "\tof 2 generates 2 tables with 1/2 the elements in each table, etc.\n"
-                             "\tThis is useful since many C compilers cannot correctly generate code\n"
-                             "\tfor large switch statements.\n"
+                             "\tA value of 1 generates 1 switch containing all the elements, a value of 2\n"
+                             "\tgenerates 2 tables with 1/2 the elements in each table, etc.  This\n"
+                             "\tis useful since many C compilers cannot correctly generate code for\n"
+                             "\tlarge switch statements.\n"
                              "-t\tAllows the user to include a structured type declaration for \n"
                              "\tgenerated code. Any text before %%%% is consider part of the type\n"
                              "\tdeclaration.  Key words and additional fields may follow this, one\n"
@@ -595,12 +557,6 @@ Options::parse_args (int argc, char *argv[])
             function_name_ = getopt.optarg;
             break;
           }
-        // Make fill_default be optarg
-        case 'F':
-          {
-            fill_default_ = getopt.optarg;
-            break;
-          }
         // Order input by frequency of key set occurrence.
         case 'o':
           {
@@ -666,10 +622,10 @@ Options::parse_args (int argc, char *argv[])
         // Print out the version and quit.
         case 'v':
           ACE_ERROR ((LM_ERROR,
-                      "%n: version %s\n%r\n",
+                      "%n: version %s\n%r\n%a",
                       version_string,
-                      &Options::usage));
-          ACE_OS::exit (0);
+                      &Options::usage,
+                      0));
           /* NOTREACHED */
           break;
         // Exit with value of 0 (this is useful to check if gperf exists)
@@ -797,14 +753,6 @@ Options::function_name (void)
   return function_name_;
 }
 
-// Returns the fill default
-
-const char *
-Options::fill_default (void)
-{
-  return fill_default_;
-}
-
 // Returns the keyword key name.
 
 const char *
diff --git a/apps/gperf/src/Options.h b/apps/gperf/src/Options.h
index 36d8427c11d..4b102892a32 100644
--- a/apps/gperf/src/Options.h
+++ b/apps/gperf/src/Options.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #ifndef OPTIONS_H
 #define OPTIONS_H
@@ -112,7 +112,6 @@ public:
   static int initial_value (void);
   static int total_switches (void);
   static const char *function_name (void);
-  static const char *fill_default (void);
   static const char *key_name (void);
   static const char *class_name (void);
   static const char *hash_name (void);
@@ -151,9 +150,6 @@ private:
 
   static const char *function_name_;
   // Names used for generated lookup function.
-  
-  static const char  *fill_default_;
-  // Expression used to assign default values in keyword table.
 
   static const char *key_name_;
   // Name used for keyword key.
diff --git a/apps/gperf/src/Vectors.cpp b/apps/gperf/src/Vectors.cpp
index ce7fac91fb8..a83eb74b5ef 100644
--- a/apps/gperf/src/Vectors.cpp
+++ b/apps/gperf/src/Vectors.cpp
@@ -1,25 +1,24 @@
-// -*- C++ -*-
-
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "Vectors.h"
 
diff --git a/apps/gperf/src/Vectors.h b/apps/gperf/src/Vectors.h
index b0a7be80e18..f66a2d5e5a7 100644
--- a/apps/gperf/src/Vectors.h
+++ b/apps/gperf/src/Vectors.h
@@ -1,25 +1,25 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #ifndef VECTORS_H
 #define VECTORS_H
diff --git a/apps/gperf/src/Version.cpp b/apps/gperf/src/Version.cpp
index 1ed8b33e1ac..deb5d5b9e5b 100644
--- a/apps/gperf/src/Version.cpp
+++ b/apps/gperf/src/Version.cpp
@@ -1,30 +1,28 @@
-// -*- C++ -*-
-
 // $Id$
-
 // Current program version number.
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.
+   written by Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 #include "ace/ACE.h"
 
 ACE_RCSID(src, Version, "$Id$")
 
-char *version_string = "2.8 (ACE version)";
+char *version_string = "2.7 (GNU C++ version)";
diff --git a/apps/gperf/src/gperf.cpp b/apps/gperf/src/gperf.cpp
index 1c1304d185e..d4befbf8330 100644
--- a/apps/gperf/src/gperf.cpp
+++ b/apps/gperf/src/gperf.cpp
@@ -1,27 +1,26 @@
-// -*- C++ -*-
-
 // $Id$
 
 // Driver program for the gperf hash function generator.
 
-// Copyright (C) 1989 Free Software Foundation, Inc.
-// written by Douglas C. Schmidt (schmidt@cs.wustl.edu)
+/* Copyright (C) 1989 Free Software Foundation, Inc.  written by
+   Douglas C. Schmidt (schmidt@ics.uci.edu)
 
-// This file is part of GNU GPERF.
+This file is part of GNU GPERF.
 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
+GNU GPERF is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 1, or (at your option) any
+later version.
 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+GNU GPERF is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+You should have received a copy of the GNU General Public License
+along with GNU GPERF; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111,
+USA.  */
 
 // Simple driver program for the gperf hash function generator.  All
 // the hard work is done in class Gen_Perf and its class methods.
diff --git a/apps/gperf/tests/Makefile b/apps/gperf/tests/Makefile
index 0600c7eacc7..00714eebef2 100644
--- a/apps/gperf/tests/Makefile
+++ b/apps/gperf/tests/Makefile
@@ -98,9 +98,11 @@ realclean:
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/test.o .obj/test.so .shobj/test.o .shobj/test.so: test.cpp \
- $(ACE_ROOT)/ace/OS.h \
+.obj/test.o .obj/test.so .shobj/test.o .shobj/test.so: test.cpp $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/apps/gperf/tests/Makefile.am b/apps/gperf/tests/Makefile.am
deleted file mode 100644
index a6cc359241b..00000000000
--- a/apps/gperf/tests/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-## Copyright (C) 1989, 1992, 1993 Free Software Foundation, Inc.
-## Original makefile written by Douglas C. Schmidt (schmidt@ics.uci.edu)
-## This Makefile.am written by Ossama Othman (othman@astrosun.tn.cornell.edu)
-## 
-## This file is part of GNU GPERF.
-## 
-## GNU GPERF is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 1, or (at your option)
-## any later version.
-## 
-## GNU GPERF is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with GNU GPERF; see the file COPYING.  If not, write to the Free
-## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA. 
-##
-##       Makefile for GPERF tests
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-
-noinst_PROGRAMS = cout aout c++out preout m3out pout iout iout2 tout
-
-cout_SOURCES = cinset.cpp test.cpp
-
-aout_SOURCES = adainset.cpp test.cpp
-
-c++out_SOURCES = c++inset.cpp test.cpp
-
-preout_SOURCES = preinset.cpp test.cpp
-
-m3out_SOURCES = m3inset.cpp test.cpp
-
-pout_SOURCES = pinset.cpp test.cpp
-
-iout_SOURCES = iinset.cpp test.cpp
-
-iout_SOURCES = iinset2.cpp test.cpp
-
-tout_SOURCES = tinset.cpp test.cpp
-
-BUILT_SOURCES = \
-        cinset.cpp \
-        adainset.cpp \
-        c++inset.cpp \
-        preinset.cpp \
-        m3inset.cpp \
-        pinset.cpp \
-        iinset.cpp \
-        iinset2.cpp \
-        tinset.cpp
-
-EXTRA_DIST = \
-        gpc.gperf \
-        gplus.gperf \
-        irc.gperf \
-        makeinfo.gperf \
-        modula2.gperf \
-        ada-pred.exp \
-        ada-res.exp \
-        c++-res.exp \
-        c.exp \
-        corba.exp \
-        idl.exp \
-        modula.exp \
-        pascal.exp \
-        test-1.exp \
-        test-2.exp \
-        test-3.exp \
-        test-4.exp \
-        test-5.exp \
-        test-6.exp \
-        test-7.exp
-
-cinset.cpp: c.gperf
-        $(GPERF) -a -p -c -l -S1 -o $(srcdir)/c.gperf > cinset.cpp
-
-adainset.cpp: ada.gperf
-        $(GPERF) -a -k1,4,'$$' $(srcdir)/ada.gperf > adainset.cpp
-
-c++inset.cpp: c++.gperf
-        $(GPERF) -a -D $(srcdir)/c++.gperf > c++inset.cpp
-
-preinset.cpp: adadefs.gperf
-        $(GPERF) -a -p -D -k1,'$$' -s 2 -o $(srcdir)/adadefs.gperf > preinset.cpp
-
-m3inset.cpp: modula3.gperf
-        $(GPERF) -a -k1,2,'$$' -o $(srcdir)/modula3.gperf > m3inset.cpp
-
-pinset.cpp: pascal.gperf
-        $(GPERF) -a -o -S2 -p < $(srcdir)/pascal.gperf > pinset.cpp
-
-iinset.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -S1 -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
-
-iinset2.cpp: idl.gperf
-        $(GPERF) -m -M -c -C -D -E -T -a -o -p < $(srcdir)/idl.gperf > iinset.cpp
-
-tinset.cpp: corba.gperf
-        $(GPERF) -a -o < $(srcdir)/corba.gperf > tinset.cpp
-
diff --git a/apps/gperf/tests/test-1.exp b/apps/gperf/tests/test-1.exp
index b2c4e4e81ce..ec19bd7dd3c 100644
--- a/apps/gperf/tests/test-1.exp
+++ b/apps/gperf/tests/test-1.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 2.8 (ACE version) */
+/* C code produced by gperf version 2.7 (GNU C++ version) */
 /* Command-line: ../src/gperf -p -j1 -o -t -N is_reserved_word -k1,3,$  */
 /* Command-line: gperf -p -j1 -i 1 -o -t -N is_reserved_word -k1,3,$ c-parse.gperf  */ 
 #include <string.h>
diff --git a/apps/gperf/tests/test-2.exp b/apps/gperf/tests/test-2.exp
index 8e1dbe46b7d..6533162bce4 100644
--- a/apps/gperf/tests/test-2.exp
+++ b/apps/gperf/tests/test-2.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 2.8 (ACE version) */
+/* C code produced by gperf version 2.7 (GNU C++ version) */
 /* Command-line: ../src/gperf -n -k1-8 -l  */
 #include <string.h>
 
diff --git a/apps/gperf/tests/test-3.exp b/apps/gperf/tests/test-3.exp
index 5c99e9ed406..85ce4665dc1 100644
--- a/apps/gperf/tests/test-3.exp
+++ b/apps/gperf/tests/test-3.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 2.8 (ACE version) */
+/* C code produced by gperf version 2.7 (GNU C++ version) */
 /* Command-line: ../src/gperf -p -j 1 -o -a -C -g -t -k1,4,$  */
 /* Command-line: gperf -p -j1 -o -t -N is_reserved_word -k1,4,$ gplus.gperf  */
 #include <string.h>
diff --git a/apps/gperf/tests/test-4.exp b/apps/gperf/tests/test-4.exp
index 7b402f7f28f..70fec863b59 100644
--- a/apps/gperf/tests/test-4.exp
+++ b/apps/gperf/tests/test-4.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 2.8 (ACE version) */
+/* C code produced by gperf version 2.7 (GNU C++ version) */
 /* Command-line: ../src/gperf -D -p -t  */
 /* Command-line: gperf -p -j1 -i 1 -o -t -N is_reserved_word -k1,3,$ c-parse.gperf  */ 
 #include <string.h>
diff --git a/apps/gperf/tests/test-5.exp b/apps/gperf/tests/test-5.exp
index 679889f90c7..c06ae1e988f 100644
--- a/apps/gperf/tests/test-5.exp
+++ b/apps/gperf/tests/test-5.exp
@@ -1,4 +1,4 @@
-/* C code produced by gperf version 2.8 (ACE version) */
+/* C code produced by gperf version 2.7 (GNU C++ version) */
 /* Command-line: ../src/gperf -g -o -j1 -t -p -N is_reserved_word  */
 /* ISO Pascal 7185 reserved words.
  *
diff --git a/apps/gperf/tests/test-6.exp b/apps/gperf/tests/test-6.exp
index 2205ab7f481..d571a77cf7c 100644
--- a/apps/gperf/tests/test-6.exp
+++ b/apps/gperf/tests/test-6.exp
@@ -1,90 +1,84 @@
--a	Generate ANSI standard C output code, i.e., function prototypes.
--b	Generate code for Linear Search.
--B	Generate code for Binary Search.
--c	Generate comparison code using strncmp rather than strcmp.
--C	Make the contents of generated lookup tables constant, i.e., readonly.
--d	Enables the debugging option (produces verbose output to the standard
-	error).
--D	Handle keywords that hash to duplicate values.  This is useful
-	for certain highly redundant keyword sets.
--e	Allow user to provide a string containing delimiters used to separate
-	keywords from their attributes.  Default is ",\n"
--E	Define constant values using an enum local to the lookup function
-	rather than with defines
--f	Generate the gen-perf.hash function ``fast.''  This decreases GPERF's
-	running time at the cost of minimizing generated table-size.
-	The numeric argument represents the number of times to iterate when
-	resolving a collision.  `0' means ``iterate by the number of keywords.''
--F	Provided expression will be used to assign default values in keyword
-	table, i.e., the fill value.  Default is "".
--g	Make generated routines use ``inline'' to remove function overhead.
--G	Generate the static table of keywords as a static global variable,
-	rather than hiding it inside of the lookup function (which is the
-	default behavior).
--h	Prints this message.
--H	Allow user to specify name of generated hash function. Default
-	is `hash'.
--i	Provide an initial value for the associate values array.  Default is 0.
--I	Generate comparison code using case insensitive string comparison, e.g.,
-	strncasecmp or strcasecmp.
-	Setting this value larger helps inflate the size of the final table.
--j	Affects the ``jump value,'' i.e., how far to advance the associated
-	character value upon collisions.  Must be an odd number, default is 5.
--J	Skips '#include <string.h>' part in the output.
--k	Allows selection of the key positions used in the hash function.
-	The allowable choices range between 1-126, inclusive.  The positions
-	are separated by commas, ranges may be used, and key positions may
-	occur in any order.  Also, the meta-character '*' causes the generated
-	hash function to consider ALL key positions, and $ indicates the
-	``final character'' of a key, e.g., $,1,2,4,6-10.
--K	Allow use to select name of the keyword component in the keyword
-	structure.
--l	Compare key lengths before trying a string comparison.  This helps
-	cut down on the number of string comparisons made during the lookup.
--L	Generates code in the language specified by the option's argument.
-	Languages handled are currently C++ and C.  The default is C.
--m	Avoids the warning about identical hash values. This is valid
-	only if the -D option is enabled.
--M	Skips class definition in the output. This is valid only in C++ mode.
--n	Do not include the length of the keyword when computing the hash
-	function.
--N	Allow user to specify name of generated lookup function.  Default
-	name is `in_word_set.'
--o	Reorders input keys by frequency of occurrence of the key sets.
-	This should decrease the search time dramatically.
--O	Optimize the generated lookup function by assuming that all input
-	keywords are members of the keyset from the keyfile.
--p	Changes the return value of the generated function ``in_word_set''
-	from its default boolean value (i.e., 0 or 1), to type ``pointer
-	to wordlist array''  This is most useful when the -t option, allowing
-	user-defined structs, is used.
--r	Utilizes randomness to initialize the associated values table.
--s	Affects the size of the generated hash table.  The numeric argument
-	for this option indicates ``how many times larger or smaller'' the
-	associated value range should be, in relationship to the number of
-	keys, e.g. a value of 3 means ``allow the maximum associated value
-	to be about 3 times larger than the number of input keys.''
-	Conversely, a value of -3 means ``make the maximum associated
-	value about 3 times smaller than the number of input keys. A
-	larger table should decrease the time required for an unsuccessful
-	search, at the expense of extra table space.  Default value is 1.
--S	Causes the generated C code to use a switch statement scheme, rather
-	than an array lookup table.  This can lead to a reduction in both
-	time and space requirements for some keyfiles.  The argument to
-	this option determines how many switch statements are generated.
-	A value of 1 generates 1 switch containing all the elements, a value
-	of 2 generates 2 tables with 1/2 the elements in each table, etc.
-	This is useful since many C compilers cannot correctly generate code
-	for large switch statements.
--t	Allows the user to include a structured type declaration for 
-	generated code. Any text before %% is consider part of the type
-	declaration.  Key words and additional fields may follow this, one
-	group of fields per line.
--T	Prevents the transfer of the type declaration to the output file.
-	Use this option if the type is already defined elsewhere.
--v	Prints out the current version number and exits with a value of 0
--V	Exits silently with a value of 0.
--Z	Allow user to specify name of generated C++ class.  Default
-	name is `Perfect_Hash.'
+-a      Generate ANSI standard C output code, i.e., function prototypes.
+-b      Generate code for Linear Search.
+-B      Generate code for Binary Search.
+-c      Generate comparison code using strncmp rather than strcmp.
+-C      Make the contents of generated lookup tables constant, i.e., readonly.
+-d      Enables the debugging option (produces verbose output to the standard error).
+-D      Handle keywords that hash to duplicate values.  This is useful
+        for certain highly redundant keyword sets.
+-e      Allow user to provide a string containing delimiters used to separate
+        keywords from their attributes.  Default is ",\n"
+-E      Define constant values using an enum local to the lookup function
+        rather than with defines
+-f      Generate the gen-perf.hash function ``fast.''  This decreases GPERF's
+        running time at the cost of minimizing generated table-size.
+        The numeric argument represents the number of times to iterate when
+        resolving a collision.  `0' means ``iterate by the number of keywords.''
+-g      Make generated routines use ``inline'' to remove function overhead.
+-G      Generate the static table of keywords as a static global variable,
+        rather than hiding it inside of the lookup function (which is the
+        default behavior).
+-h      Prints this mesage.
+-H      Allow user to specify name of generated hash function. Default
+        is `hash'.
+-i      Provide an initial value for the associate values array.  Default is 0.
+-I      Generate comparison code using case insensitive string comparison, e.g.,
+        strncasecmp or strcasecmp.
+        Setting this value larger helps inflate the size of the final table.
+-j      Affects the ``jump value,'' i.e., how far to advance the associated
+        character value upon collisions.  Must be an odd number, default is 5.
+-J      Skips '#include <string.h>' part in the output.
+-k      Allows selection of the key positions used in the hash function.
+        The allowable choices range between 1-126, inclusive.  The positions
+        are separated by commas, ranges may be used, and key positions may
+        occur in any order.  Also, the meta-character '*' causes the generated
+        hash function to consider ALL key positions, and $ indicates the
+        ``final character'' of a key, e.g., $,1,2,4,6-10.
+-K      Allow use to select name of the keyword component in the keyword structure.
+-l      Compare key lengths before trying a string comparison.  This helps
+        cut down on the number of string comparisons made during the lookup.
+-L      Generates code in the language specified by the option's argument.  Languages
+        handled are currently C++ and C.  The default is C.
+-m      Avoids the warning about identical hash values. This is valid
+        only if the -D option is enabled.
+-M      Skips class definition in the output. This is valid only in C++ mode.
+-n      Do not include the length of the keyword when computing the hash function
+-N      Allow user to specify name of generated lookup function.  Default
+        name is `in_word_set.'
+-o      Reorders input keys by frequency of occurrence of the key sets.
+        This should decrease the search time dramatically.
+-O      Optimize the generated lookup function by assuming that all input keywords 
+        are members of the keyset from the keyfile.
+-p      Changes the return value of the generated function ``in_word_set''
+        from its default boolean value (i.e., 0 or 1), to type ``pointer
+        to wordlist array''  This is most useful when the -t option, allowing
+        user-defined structs, is used.
+-r      Utilizes randomness to initialize the associated values table.
+-s      Affects the size of the generated hash table.  The numeric argument
+        for this option indicates ``how many times larger or smaller'' the associated
+        value range should be, in relationship to the number of keys, e.g. a value of 3
+        means ``allow the maximum associated value to be about 3 times larger than the
+        number of input keys.''  Conversely, a value of -3 means ``make the maximum
+        associated value about 3 times smaller than the number of input keys.
+        A larger table should decrease the time required for an unsuccessful search,
+        at the expense of extra table space.  Default value is 1.
+-S      Causes the generated C code to use a switch statement scheme, rather
+        than an array lookup table.  This can lead to a reduction in both
+        time and space requirements for some keyfiles.  The argument to
+        this option determines how many switch statements are generated.
+        A value of 1 generates 1 switch containing all the elements, a value of 2
+        generates 2 tables with 1/2 the elements in each table, etc.  This
+        is useful since many C compilers cannot correctly generate code for
+        large switch statements.
+-t      Allows the user to include a structured type declaration for 
+        generated code. Any text before %% is consider part of the type
+        declaration.  Key words and additional fields may follow this, one
+        group of fields per line.
+-T      Prevents the transfer of the type declaration to the output file.
+        Use this option if the type is already defined elsewhere.
+-v      Prints out the current version number and exits with a value of 0
+-V      Exits silently with a value of 0.
+-Z      Allow user to specify name of generated C++ class.  Default
+        name is `Perfect_Hash.'
 Usage: ../src/gperf [-abBcCdDef[num]gGhH<hashname>i<init>IjJk<keys>K<keyname>lL<language>mMnN<function name>oOprs<size>S<switches>tTvVZ<class name>].
 (type ../src/gperf -h for help)
diff --git a/apps/gperf/tests/test.cpp b/apps/gperf/tests/test.cpp
index de57616492c..c43287836ab 100644
--- a/apps/gperf/tests/test.cpp
+++ b/apps/gperf/tests/test.cpp
@@ -1,6 +1,6 @@
-// $Id$
+// $Id: test.cpp 1.1	10/18/96
 
-// Tests the generated perfect hash function.
+// Tests the generated perfect has function.
 
 // The -v option prints diagnostics as to whether a word is in the set
 // or not.  Without -v the program is useful for timing.
diff --git a/bin/Makefile b/bin/Makefile
index fb69b34ef03..4af39ba9094 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -47,10 +47,10 @@ else   # Not building envinfo
 
 include $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
 
-CFILES		= clone.cpp
+CFILES		= clone.cpp 
 OFILES		= clone.o
 DFLAGS		= -b elf
-CCFLAGS		+= -I$(ACE_ROOT)
+CCFLAGS		+= -I$(ACE_ROOT) 
 
 #############################################################################
 # C++ directives
@@ -63,8 +63,11 @@ CCFLAGS		+= -I$(ACE_ROOT)
 clone: $(OFILES)
 	$(CXX) $(CCFLAGS) -o $@ $(OFILES)
 
-realclean: clean
-	-$(RM) clone
+clean:
+	-/bin/rm -f *.o *.out *~ core
+
+realclean: clean 
+	-/bin/rm -fr clone
 
 endif  # envinfo
 
diff --git a/bin/ace_components b/bin/ace_components
deleted file mode 100755
index 0d8a1a086a9..00000000000
--- a/bin/ace_components
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# $Id$
-#
-# Encapsulates set/access of a components file, which records set of
-# components that were built in a library.  Intended to be used by
-# Makefiles and scripts.  See ACE_wrappers/ace/Makefile for an example.
-#
-usage="usage: $0 --ace | --orbsvcs | --tao \
- [--remove | --set \" <components list> \"]"
-
-####
-#### Make sure that ACE_ROOT and TAO_ROOT are set.
-####
-if [ ! "$ACE_ROOT" ]; then
-  echo $0': your ACE_ROOT environment variable is not set!' 1>&2
-  exit -1
-fi
-if [ ! "$TAO_ROOT" ]; then
-  TAO_ROOT=$ACE_ROOT/TAO
-  export TAO_ROOT
-fi
-
-####
-#### Process command line arguments.
-####
-if [ $# -ge 1 ]; then
-  case $1 in
-    --ace) components_file=$ACE_ROOT/ace/ACE_COMPONENTS.list ;;
-    --orbsvcs)
-      components_file=$TAO_ROOT/orbsvcs/orbsvcs/ORBSVCS_COMPONENTS.list ;;
-    --tao) components_file=$TAO_ROOT/tao/TAO_COMPONENTS.list ;;
-    *) echo $usage; exit -1 ;;
-  esac
-  shift
-else
-  echo $usage
-  exit -1
-fi
-
-set_components=0
-if [ $# -ge 1 ]; then
-  if [ $1 = '--set' ]; then
-    set_components=1
-    shift
-    if [ $# -eq 1 ]; then
-      components=$1
-      shift
-    else
-      echo $usage
-      exit -1
-    fi
-  elif [ $1 = '--remove' ]; then
-    rm -f $components_file
-  else
-    echo $usage
-    exit -1
-  fi
-fi
-
-if [ $set_components -eq 1 ]; then
-  ####
-  #### Update the components file, if it has changed since last set.
-  ####
-  if [ -f $components_file ]; then
-    if echo "$components" | diff - $components_file > /dev/null; then
-      :
-    else
-      echo "$components" > $components_file
-    fi
-  else
-    echo "$components" > $components_file
-  fi
-else
-  ####
-  #### Access the contents of the components file, if it exists.
-  ####
-  if [ -f $components_file ]; then
-    cat $components_file
-  fi
-fi
diff --git a/bin/ace_ld b/bin/ace_ld
index f5fd66431e9..4569fa804c0 100755
--- a/bin/ace_ld
+++ b/bin/ace_ld
@@ -63,11 +63,11 @@ $current_dir_in_libDirs = 0;
 @objs = '';
 
 foreach $arg (@ARGV) {
-  if ($arg =~ /^['"]?-L([\S]+)/) {
+  if ($arg =~ /-L([\S]+)/) {
     ($dir = $1) =~ s%/+$%%;     #### trim any trailing slashes
     push (@libDirs, $dir);
     $current_dir_in_libDirs = 1 if $dir eq '.';
-  } elsif ($arg =~ /^['"]?-l([\S]+)/) {
+  } elsif ($arg =~ /-l([\S]+)/) {
     push (@libs, $1);
   } elsif ($arg =~ /\.o$/) {
     push (@objs, $arg);
@@ -129,7 +129,7 @@ if ($munch) {
   #### Insert ctordtor object file before first library in link command.
   $arg_lib = 0;
   foreach $arg (@ARGV) {
-    if ($arg =~ /^['"]?-l/) {
+    if ($arg =~ /-l/) {
       last;
     }
     ++$arg_lib;
diff --git a/bin/auto_compile b/bin/auto_compile
index 054476f45a2..25662f308ba 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -49,12 +49,9 @@ $MODULE='ACE_wrappers';
     ( 'tests , run_tests.sh',
       '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/MT_Client , run_test.pl',
       'TAO/orbsvcs/tests/Simple_Naming , run_test.pl',
-      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane',
-      'TAO/orbsvcs/tests/ImplRepo , run_test.pl airplane_ir',
-      'TAO/orbsvcs/tests/Property , run_test.pl' );
+      'TAO/orbsvcs/tests/Property , run_test.pl',
+      'TAO/performance-tests/Cubit/TAO/IDL_Cubit , run_test.pl');
 
 # We obtain our revision to report errors.
 $REVISION='$Revision$';
@@ -75,28 +72,24 @@ $MAKEFLAGS = $ARGV[4];
 
 $disable_file = $LOGDIR . '/.disable';
 
-sub mywarn {
-  local @msg = @_;
-  open(MAIL, "|mail $ADMIN")
-    || die "cannot open email pipe on error: $msg\n";
-  print MAIL 'The following message is brought to you by: ', "\n";
-  print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n";
-  print MAIL "\n";
-  local $m;
-  foreach $m (@msg) { 
-    print MAIL $m, "\n";
-  }
-  print MAIL "\nPlease check log files for more info\n";
-  close(MAIL)
-    || die "cannot close email pipe on error: $msg\n";
-}
-
 sub mydie {
-  mywarn @_;
-  print HIST 'FAILED', "\n";
-  unlink $disable_file
-    || die "cannot unlink disable file";
-  exit 0;
+    local @msg = @_;
+    open(MAIL, "|mail $ADMIN")
+	|| die "cannot open email pipe on error: $msg\n";
+    print MAIL 'The following error is brought to you by: ', "\n";
+    print MAIL $CMD, ' [', $REVISION, "] for $BUILD on $CHECKOUT\n";
+    print MAIL "\n";
+    local $m;
+    foreach $m (@msg) { 
+	print MAIL $m, "\n";
+    }
+    print MAIL "\nPlease check log files for more info\n";
+    close(MAIL)
+	|| die "cannot close email pipe on error: $msg\n";
+    print HIST 'FAILED', "\n";
+    unlink $disable_file
+        || die "cannot unlink disable file";
+    exit 0;
 }
 
 ### MAIN FUNCTION
@@ -180,7 +173,6 @@ $ENV{'ACE_ROOT'} = $CHECKOUT . '/' . $MODULE . '/build/' . $BUILD;
 $ENV{'TAO_ROOT'} = $CHECKOUT . '/' . $MODULE . '/build/' . $BUILD . '/TAO';
 
 @failures = ();
-@warnings = ();
 $MAKEFLAGS .= " shared_libs_only=1";
 foreach $i (@BUILD_LIST) {
     $date = localtime;
@@ -190,7 +182,6 @@ foreach $i (@BUILD_LIST) {
 
     local $current_dir = $i;
     local $last_error = "";
-    local $last_warning = "";
     while (<MAKE>) {
 	print LOG $_;
 	chop;
@@ -205,12 +196,6 @@ foreach $i (@BUILD_LIST) {
 		$last_error = $current_dir;
 	    }
 	}
-	if (m/Warning:/ || m/warning:/) {
-	  if ($last_warning ne $current_dir) {
-	    push @warnings, "Warning while compiling in $current_dir\n";
-	    $last_warning = $current_dir;
-	  }
-	}
     }
     if (close(MAKE) == 0) {
 	push @failures, "errors while running make in $i";
@@ -259,10 +244,6 @@ if ($#failures >= 0) {
     mydie @failures;
 }
 
-if ($#warnings >= 0) {
-  mywarn @warnings;
-}
-
 close(LOG)
     || mydie "cannot close LOGFILE";
 
@@ -272,5 +253,3 @@ close(HIST)
 
 unlink $disable_file
     || mydie "cannot unlink disable file";
-
-exit 0;
diff --git a/bin/auto_compile_win32.pl b/bin/auto_compile_win32.pl
deleted file mode 100755
index 768dc18c863..00000000000
--- a/bin/auto_compile_win32.pl
+++ /dev/null
@@ -1,377 +0,0 @@
-
-# $Id$
-#   Win32 autobuild helper.
-
-# use lib "$ENV{ACE_ROOT}/bin";
-
-## TO-DO
-##   * Added command line options to selective compile library, et.al.
-##   * Added cvs update.  Also controllable from command line.
-##   * Added building an running version_tests/.  It uses a different
-##     naming scheme.
-##   * Selectively build some specific configs from command line.
-
-## Available command line switches
-##   * -k : Ignore error.  Compile all projects in a collection regardless
-##          of errors.
-##   * -a : Build Alpha collections.
-##   * -D : Build DLLs only.
-##   * -L : Build LIBs only.
-##   * -d : Debug the script.  No compilation will occur.
-##   * -v : Verbose mode.
-##   * -r : Rebuild all.  (Default is Build.)
-
-@Win32_Lists= ("Win32 Debug",
-               "Win32 Release",
-               "Win32 Unicode Debug",
-               "Win32 Unicode Release");
-
-@Alpha_Lists= ("Win32 Alpha Debug",
-               "Win32 Alpha Release",
-               "Win32 Alpha Unicode Debug",
-               "Win32 Alpha Unicode Release");
-
-%Win32_DLL_Collections = ( "$Win32_Lists[0]" => <<EOD , # Debug
-ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
-TAO/tao/TAO.dsw, TAO:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
-TAO/orbsvcs/Naming_Service/Naming_Service.dsw, Naming_Service:
-TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsw, Scheduling_Service:
-TAO/orbsvcs/Event_Service/Event_Service.dsw, Event_Service:
-TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsw, Dump_Schedule:
-TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw, Concurrency_Service:
-TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsw, LifeCycle_Service:
-TAO/orbsvcs/Trading_Service/Trading_Service.dsw, Trading_Service:
-TAO/orbsvcs/Time_Service/Time_Service.dsw, Time_Service_Server:
-TAO/orbsvcs/Time_Service/Time_Service.dsw, Time_Service_Clerk:
-TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.dsw, ImplRepo_Service:
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Server:
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Client:
-TAO/tests/Param_Test/Param_Test.dsw, Param_Test Server:
-TAO/tests/Param_Test/Param_Test.dsw, Param_Test Client:
-netsvcs/lib/netsvcs.dsw, NETSVCS Library:
-netsvcs/servers/servers.dsw, NETSVCS Servers:
-EOD
-                     "$Win32_Lists[1]" => <<EOD , # Release
-ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
-TAO/tao/TAO.dsw, TAO:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
-TAO/orbsvcs/Naming_Service/Naming_Service.dsw, Naming_Service:
-TAO/orbsvcs/Scheduling_Service/Scheduling_Service.dsw, Scheduling_Service:
-TAO/orbsvcs/Event_Service/Event_Service.dsw, Event_Service:
-TAO/orbsvcs/Dump_Schedule/Dump_Schedule.dsw, Dump_Schedule:
-TAO/orbsvcs/Concurrency_Service/Concurrency_Service.dsw, Concurrency_Service:
-TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.dsw, LifeCycle_Service:
-TAO/orbsvcs/Trading_Service/Trading_Service.dsw, Trading_Service:
-TAO/orbsvcs/Time_Service/Time_Service.dsw, Time_Service_Server:
-TAO/orbsvcs/Time_Service/Time_Service.dsw, Time_Service_Clerk:
-TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.dsw, ImplRepo_Service:
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Server:
-TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.dsw, IDL_Cubit Client:
-TAO/tests/Param_Test/Param_Test.dsw, Param_Test Server:
-TAO/tests/Param_Test/Param_Test.dsw, Param_Test Client:
-netsvcs/lib/netsvcs.dsw, NETSVCS Library:
-netsvcs/servers/servers.dsw, NETSVCS Servers:
-EOD
-                     "$Win32_Lists[2]" => <<EOD , # Unicode Debug
-ace/ace.dsw, ACE dynamic library:
-EOD
-                     "$Win32_Lists[3]" => <<EOD # Unicode Release
-ace/ace.dsw, ACE dynamic library:
-EOD
-                  );
-
-%Alpha_DLL_Collections = ( "$Alpha_Lists[0]" => <<EOD , # Debug
-ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
-TAO/tao/TAO.dsw, TAO:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
-TAO/orbsvcs/Naming_Service/Naming_Service.dsw, Naming_Service:
-netsvcs/lib/netsvcs.dsw, NETSVCS Library:
-netsvcs/servers/servers.dsw, NETSVCS Servers:
-tests/tests.dsw, ALL:
-EOD
-                     "$Alpha_Lists[1]" => <<EOD , # Release
-ace/ace.dsw, ACE dynamic library:
-apps/gperf/src/gperf.dsw, gperf:
-TAO/tao/TAO.dsw, TAO:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, orbsvcs:
-TAO/orbsvcs/Naming_Service/Naming_Service.dsw, Naming_Service:
-netsvcs/lib/netsvcs.dsw, NETSVCS Library:
-netsvcs/servers/servers.dsw, NETSVCS Servers:
-EOD
-                     "$Alpha_Lists[2]" => <<EOD , # Unicode Debug
-ace/ace.dsw, ACE dynamic library:
-EOD
-                     "$Alpha_Lists[3]" => <<EOD # Unicode Release
-ace/ace.dsw, ACE dynamic library:
-EOD
-                  );
-
-%Win32_Lib_Collections = ( "$Win32_Lists[0]" => <<EOD , # Debug
-ace/ace.dsw, ACE static library:
-TAO/tao/TAO.dsw, TAO Static:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler Static:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, ORB Services Static:
-EOD
-                     "$Win32_Lists[1]" => <<EOD , # Release
-ace/ace.dsw, ACE static library:
-TAO/tao/TAO.dsw, TAO Static:
-TAO/TAO_IDL/tao_idl.dsw, TAO_IDL Compiler Static:
-TAO/orbsvcs/orbsvcs/orbsvcs.dsw, ORB Services Static:
-EOD
-                     "$Win32_Lists[2]" => <<EOD , # Unicode Debug
-ace/ace.dsw, ACE static library:
-EOD
-                     "$Win32_Lists[3]" => <<EOD # Unicode Release
-ace/ace.dsw, ACE static library:
-EOD
-                  );
-
-%Alpha_Lib_Collections = ( "$Alpha_Lists[0]" => <<EOD , # Debug
-ace/ace.dsw, ACE static library:
-EOD
-                     "$Alpha_Lists[1]" => <<EOD , # Release
-ace/ace.dsw, ACE static library:
-EOD
-                     "$Alpha_Lists[2]" => <<EOD , # Unicode Debug
-ace/ace.dsw, ACE static library:
-EOD
-                     "$Alpha_Lists[3]" => <<EOD # Unicode Release
-ace/ace.dsw, ACE static library:
-EOD
-                  );
-
-@Version_Tests_List = (
-                       "Barrier_Test.dsp",
-                       "Basic_Types_Test.dsp",
-                       "Buffer_Stream_Test.dsp",
-                       "CDR_Test.dsp",
-                       "Conn_Test.dsp",
-                       "DLList_Test.dsp",
-                       "Dynamic_Priority_Test.dsp",
-                       "Enum_Interfaces_Test.dsp",
-                       "Env_Value_Test.dsp",
-                       "Future_Test.dsp",
-                       "Handle_Set_Test.dsp",
-                       "Hash_Map_Manager_Test.dsp",
-                       "High_Res_Timer_Test.dsp",
-                       "IOStream_Test.dsp",
-                       "Map_Manager_Test.dsp",
-                       "Mem_Map_Test.dsp",
-                       "Message_Block_Test.dsp",
-                       "Message_Queue_Notifications_Test.dsp",
-                       "Message_Queue_Test.dsp",
-                       "MM_Shared_Memory_Test.dsp",
-                       "MT_SOCK_Test.dsp",
-                       "Naming_Test.dsp",
-                       "Notify_Performance_Test.dsp",
-                       "OrdMultiSet_Test.dsp",
-                       "Pipe_Test.dsp",
-                       "Priority_Buffer_Test.dsp",
-                       "Priority_Reactor_Test.dsp",
-                       "Priority_Task_Test.dsp",
-                       "Process_Mutex_Test.dsp",
-                       "Process_Strategy_Test.dsp",
-                       "RB_Tree_Test.dsp",
-                       "Reactors_Test.dsp",
-                       "Reactor_Exception_Test.dsp",
-                       "Reactor_Notify_Test.dsp",
-                       "Reactor_Performance_Test.dsp",
-                       "Reactor_Timer_Test.dsp",
-                       "Reader_Writer_Test.dsp",
-                       "Recursive_Mutex_Test.dsp",
-                       "Semaphore_Test.dsp",
-                       "Service_Config_Test.dsp",
-                       "Sigset_Op_Test.dsp",
-                       "Simple_Message_Block_Test.dsp",
-                       "SOCK_Connector_Test.dsp",
-                       "SOCK_Test.dsp",
-                       "SPIPE_Test.dsp",
-                       "SString_Test.dsp",
-                       "SV_Shared_Memory_Test.dsp",
-                       "Task_Test.dsp",
-                       "Thread_Manager_Test.dsp",
-                       "Thread_Mutex_Test.dsp",
-                       "Thread_Pool_Reactor_Test.dsp",
-                       "Thread_Pool_Test.dsp",
-                       "Timeprobe_Test.dsp",
-                       "Timer_Queue_Test.dsp",
-                       "Time_Service_Test.dsp",
-                       "Time_Value_Test.dsp",
-                       "Tokens_Test.dsp",
-                       "TSS_Test.dsp",
-                       "Upgradable_RW_Test.dsp",
-                       "UPIPE_SAP_Test.dsp" );
-
-sub Build_Config
-{
-    my $Config = shift;
-    my $Collection = shift;
-    my $Bname = "";
-    my $Project_File = "";
-    my $Project_Name = "";
-    my $Status = -1;
-    my $Cntr = 0;
-    my $Command_Line = "";
-
-    @Collection = split /:\s*/, $Collection;
-    for ($Cntr = 0; $Cntr < scalar (@Collection); $Cntr++)
-    {
-        $Project_Dir = $Collection[$Cntr];
-        $Project_Dir =~ s/(.*)\/[^\/]*/$1/;
-        $Bname = $Collection[$Cntr];
-        $Bname =~ s/.*\/([^\/]*)/$1/;
-        ($Project_File, $Project_Name) = split /,\s*/, $Bname;
-        chdir ("$ENV{ACE_ROOT}/$Project_Dir");
-        $Command_Line =  "msdev.com $Project_File /MAKE \"$Project_Name - $Config\" /USEENV $Build_Cmd /Y3";
-        if ( $Debug == 0 )
-        {
-            $Status =
-                system "$Command_Line";
-        }
-        else
-        {
-            $Status = 0;
-            print "chdir (\"$ENV{ACE_ROOT}/$Project_Dir\");\n";
-            print "$Status = $Command_Line\n";
-        }
-
-        if ($Ignore_error == 0)
-        {
-            return if $Status != 0;
-        }
-    }
-}
-
-sub Build_Version_Test
-{
-    my $Config = shift;
-    my $Cntr = 0;
-    my $Command_Line = "";
-
-    chdir ("$ENV{ACE_ROOT}/tests/version_tests");
-    for ($Cntr = 0; $Cntr < scalar (@Version_Tests_List); $Cntr++)
-    {
-        $Project_Name = $Version_Tests_List[$Cntr];
-        $Project_Name =~ s/(.*)\.dsp/$1/;
-        $Command_Line =  "msdev.com $Version_Tests_List[$Cntr] /MAKE \"$Project_Name - $Config\" /USEENV $Build_Cmd /Y3";
-        if ( $Debug == 0 )
-        {
-            $Status =
-                system "$Command_Line";
-        }
-        else
-        {
-            $Status = 0;
-            print "$Status = $Command_Line\n";
-        }
-
-        if ($Ignore_error == 0)
-        {
-            return if $Status != 0;
-        }
-    }
-}
-
-sub Build_Collection
-{
-    print "Build_Collection\n" if ( $Verbose );
-    my $Cntr = 0;
-    for (; $Cntr < scalar(@Lists); $Cntr ++)
-    {
-        $Config = $Lists[$Cntr];
-        print "Building $Config of $Target{$Config}\n" if ( $Debug );
-        Build_Config ($Config, $Target{$Config});
-        Build_Version_Test ($Config);
-    }
-}
-
-
-$Verbose = 0;
-$Debug = 0;
-$Ignore_error = 0;              # By default, bail out if an error occurs.
-$Build_DLL = 1;
-$Build_LIB = 1;
-$Build_Cmd = "/BUILD";
-@Lists = @Win32_Lists;
-%DLL_Collections = %Win32_DLL_Collections;
-%Lib_Collections = %Win32_Lib_Collections;
-
-## Parse command line argument
-while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ )
-{
-    if ( $ARGV[0] eq '-k' )     # Ignore error.  Compile the whole thing
-    {
-        print "Ignore errors\n" if ( $Verbose );
-        $Ignore_error = 1;      # in the same configuration.
-    }
-    elsif ( $ARGV[0] eq '-a' )  # Use Alpha
-    {
-        print "Build Alpha\n" if ( $Verbose );
-        @Lists = @Alpha_Lists;
-        %DLL_Collections = %Alpha_DLL_Collections;
-        %Lib_Collections = %Alpha_Lib_Collections;
-    }
-    elsif ( $ARGV[0] eq '-d')   # Script debugging mode
-    {
-        print "Debug mode on\nVerbose mode on\n";
-        $Debug = 1;
-        $Verbose = 1;
-    }
-    elsif ( $ARGV[0] eq '-D' )  # Build DLL only
-    {
-        print "Build DLL only\n" if ( $Verbose );
-        $Build_LIB = 0;
-    }
-    elsif ( $ARGV[0] eq '-L' )  # Build LIB only
-    {
-        print "Build LIB only\n" if ( $Verbose );
-        $Build_DLL = 0;
-    }
-    elsif ( $ARGV[0] eq '-v' )   # Verbose mode
-    {
-        $Verbose = 1;
-    }
-    elsif ( $ARGV[0] eq '-r' )  # Rebuild all
-    {
-        print "Rebuild all\n" if ( $Verbose );
-        $Build_Cmd = "/REBUILD";
-    }
-    else
-    {
-        warn "$0:  unknown option $ARGV[0]\n";
-        die $usage;
-    }
-    shift;
-}
-
-if ( $Verbose )
-{
-    for ($II = 0; $II < scalar (@Lists); $II++)
-    {
-        printf "$Lists[$II]\n";
-    }
-}
-
-if ( $Build_DLL )
-{
-    print "Building DLL\n" if ( $Verbose );
-    %Target = %DLL_Collections;
-    Build_Collection;
-}
-
-if ( $Build_LIB )
-{
-    print "Building LIB\n" if ( $Verbose );
-    %Target = %Lib_Collections;
-    Build_Collection;
-}
-
-print "End\n";
diff --git a/bin/bootstrap b/bin/bootstrap
deleted file mode 100755
index c8157c058ec..00000000000
--- a/bin/bootstrap
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-
-# -------------------------------------------------------------------------
-#       $Id$
-# 
-# Bootstrap ACE/TAO configuration tools when checked out from CVS.
-# Requires GNU autoconf, GNU automake and GNU libtool.
-#
-# This script is only meant to be run by ACE/TAO maintainers.
-# 
-# -------------------------------------------------------------------------
-
-#  Copyright (C) 1999  Ossama Othman
-#
-#  All Rights Reserved
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the current ACE distribution terms.
-# 
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-# Generate an `aclocal.m4' file from all existing m4 macro files
-# including those in the `m4' directory.
-aclocal -I m4
-
-# Generate a `config.h.in' configuration header template from `acconfig.h'.
-autoheader
-
-# Generate the `configure' script from the `configure.in'.
-autoconf
-
-# Generate all `Makefile.in' templates in the directories listed in
-# `configure.in' and add any missing files that GNU Automake needs so
-# that the distribution and configuration processes will run properly.
-automake --add-missing #--verbose
-
-# Update the NEWS file
-# For now just copy the contents of the `VERSION' file to make automake
-# happy.  Eventually, we should start putting real news in to it.
-cp VERSION NEWS
-
diff --git a/bin/count_lines b/bin/count_lines
index 49c541094df..ed6f2d21375 100755
--- a/bin/count_lines
+++ b/bin/count_lines
@@ -32,14 +32,10 @@ foreach $module (@ARGV) {
     open(FIND, "find $module -type f|");
     @files = grep {if (!/build/
 		       && !/CVS/
-		       && !/rpc\+\+/
 		       && !/\.bpr$/
 		       && !/\.mdp$/
-		       && !/\.MDP$/
 		       && !/\.dsp$/
-		       && !/\.DSP$/
 		       && !/\.dsw$/
-		       && !/\.DSW$/
 		       && !/\.mak$/
 		       && !/\.MAK$/
 		       && !/\.o$/
@@ -50,7 +46,6 @@ foreach $module (@ARGV) {
     $totdirs = $#dirs;
     $totfiles = $#files;
     $totlines = 0;
-    %lines = ();
 
     foreach $file (@files) {
 	$n = 0;
@@ -141,36 +136,30 @@ sub initfiletypes {
     # twice, but it could be unproperly classified.
 
     local %filenames =
-	('Makefile'     => 'Makefile',
-	 'README'       => 'README files',
-	 'COPYING'      => 'Licenses',
-	 'LICENSE.*'    => 'Licenses',
-	 'ChangeLog.*'  => 'ChangeLog',
-	 'ChangeLog-.*' => 'ChangeLog',
-	 '.cvsignore'   => 'Control CVS',
-	 'run_test.pl'  => 'Test driver',
-	 'run_test'     => 'Test driver',
-	 'run_tests'    => 'Test driver',
-	 'run_test.sh'  => 'Test driver');
+	('Makefile'    => 'Makefile',
+	 'README'      => 'README files',
+	 'ChangeLog.*' => 'ChangeLog',
+	 'ChangeLog-*' => 'ChangeLog',
+	 '.cvsignore'  => 'Control CVS',
+	 'run_test.pl' => 'Test driver',
+	 'run_test'    => 'Test driver',
+	 'run_tests'   => 'Test driver',
+	 'run_test.sh' => 'Test driver');
     local %fileexts =
 	('cc'    => 'C++ sources',
 	 'cpp'   => 'C++ sources',
 	 'i'     => 'C++ sources',
 	 'h'     => 'Headers',
 	 'hh'    => 'Headers',
-	 'c'     => 'C/C++ sources',
 	 'idl'   => 'IDL sources',
 	 'IDL'   => 'IDL sources',
-	 'pidl'  => 'IDL sources',
 	 'y'     => 'yacc source',
 	 'yy'    => 'yacc source',
 	 'l'     => 'lex source',
 	 'll'    => 'lex source',
 	 'pl'    => 'perl script',
-	 'perl'  => 'perl script',
 	 'GNU'   => 'GNU make config',
 	 'tex'   => '(La)TeX',
-	 'txt'   => 'Text files',
 	 '1'     => 'man pages',
 	 '3'     => 'man pages',
 	 'html'  => 'HTML',
@@ -179,26 +168,15 @@ sub initfiletypes {
 	 'bld'   => 'VxWorks build file',
 	 'bpr'   => 'Borland project files',
 	 'dsp'   => 'DevStudio project files',
-	 'DSP'   => 'DevStudio project files',
 	 'mdp'   => 'MSVC project files',
-	 'MDP'   => 'MSVC project files',
 	 'dsw'   => 'MSVC workspaces',
-	 'DSW'   => 'MSVC workspaces',
 	 'mak'   => 'MSVC MAK files',
-	 'MAK'   => 'MSVC MAK files',
 	 'java'  => 'JAVA source',
 	 'class' => 'JAVA class',
 	 'cccc'  => 'codecount output',
 	 'gif'   => 'GIF images',
 	 'conf'  => 'Svc_Config files',
-	 'diff'  => 'patches',
-	 'zip'   => 'Compressed files',
-	 'gz'    => 'Compressed files',
-	 'EXE'   => 'Win32 executable',
-	 'shar'  => 'Shar archive',
-	 'mib'   => 'MIB definition files',
-	 'gperf' => 'GPERF input',
-	 'phil.*'=> 'Test driver'
+	 'diff'  => 'patches'
 	 );
     local %paths = ();
 
diff --git a/bin/create_ace_build b/bin/create_ace_build
index b42d07b4673..6210cebbc74 100755
--- a/bin/create_ace_build
+++ b/bin/create_ace_build
@@ -58,22 +58,22 @@ PERL5_CWD
 }
 
 ####
-#### Process command line args.
+#### process command line args
 ####
-while ($#ARGV >= 0  &&  $ARGV[0] =~ /^-/) {
-    if ($ARGV[0] eq '-v') {
+while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ ) {
+    if ( $ARGV[0] eq '-v' ) {
         $verbose = 1;
-    } elsif ($ARGV[0] eq '-d') {
-        if ($ARGV[1] =~ /^\d+$/) {
+    } elsif ( $ARGV[0] eq '-d' ) {
+        if ( $ARGV[1] =~ /^\d+$/ ) {
             $directory_mode = $ARGV[1]; shift;
         } else {
             warn "$0:  must provide argument for -d option\n";
             die $usage;
         }
-    } elsif ($ARGV[0] eq '-a') {
+    } elsif ($ARGV[0] eq '-a' ) {
         $source = &cwd ();
         $absolute = 1;
-    } elsif ($ARGV[0] eq '-?') {
+    } elsif ( $ARGV[0] eq '-?' ) {
         print "$usage";
         exit;
     } else {
@@ -97,9 +97,9 @@ if (-e '/usr/bin/find') {
 }
 
 ####
-#### Check that we're in an ACE "top level" directory.
+#### check that we're in an ACE "top level" directory
 ####
-(-d 'ace' && -d 'include')  ||
+( -d 'ace' && -d 'examples' && -d 'netsvcs' )  ||
     die "$0:  must be in an ACE top level (ACE_ROOT) directory!\n";
 
 ####
@@ -111,31 +111,31 @@ if (-e '/usr/bin/find') {
 ####
 #### Get all ACE plain file and directory names.
 ####
-@files = (`$find . -name CVS -prune \\\
+@files = ( `$find . -name CVS -prune \\\
         -o -name build -prune -o \\\
     -name '.*obj' -prune -o -name Templates.DB -prune -o \\\
     \\( ! -type l ! -name core ! -name '*.state' ! -name '*.so' \\\
     ! -name '*.[oa]' ! -name '*~' ! -name '.' ! -name '.#*' \\\
     ! -name '*.log' \\) \\\
-    -print`);
+    -print` );
 
 ####
 #### Create directories and symlinks to files.
 ####
-foreach $file (@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") {
+   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") {
+        unless ( -e "$build/$file" ) {
             if (!$absolute) {
                 $up = '../..';
-                while ($file =~ m%/%g) {
+                while ( $file =~ m%/%g ) {
                   $up .= '/..';
                 }
 
@@ -153,8 +153,7 @@ foreach $file (@files) {
 }
 
 ####
-#### Find all the symlinks in the build directory, and remove ones
-#### that are no longer actually linked to a file.
+#### Find all the symlinks in the build directory
 ####
 open (LINKS, "$find $build -type l |") ||
     die "$0: cannot find symlinks in $build\n";
@@ -164,7 +163,8 @@ while (<LINKS>) {
     local @s = stat $_;
     if ($#s == -1) {
 	print "Removing $_ \n" if $verbose;
-	unlink $_  ||  warn "$0: unlink of $_ failed\n";
+	unlink $_ ||
+	    warn "$0: unlink of $_ failed\n";
     }
 
 }
@@ -176,8 +176,8 @@ close (LINKS) ||
 ####
 print "\nCompleted creation of $build/.\n";
 
-unless (-e "$build/ace/config.h"  &&
-        -e "$build/include/makeinclude/platform_macros.GNU") {
+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";
 }
diff --git a/bin/g++dep b/bin/g++dep
index 2e1dffa3027..4982a43e27b 100755
--- a/bin/g++dep
+++ b/bin/g++dep
@@ -8,13 +8,8 @@
 #       @(#)mkdep.sh    1.7     (Berkeley)      10/13/87
 #
 
-if [ `uname -r` = 5.7 ]; then
-  PATH=/project/danzon/pkg/egcs/bin:/usr/local/bin:/bin:/usr/bin:/usr/ucb:\
+PATH=/usr/local/bin:/bin:/usr/bin:/usr/ucb:\
 /usr/gnu:/usr/gnu/bin:/opt/gnu/bin:/pkg/gnu/bin:$PATH
-else
-  PATH=/usr/local/bin:/bin:/usr/bin:/usr/ucb:\
-/usr/gnu:/usr/gnu/bin:/opt/gnu/bin:/pkg/gnu/bin:$PATH
-fi
 export PATH
 
 if [ $# = 0 ] ; then
diff --git a/bin/make_release b/bin/make_release
index 8d1ec42cdde..051e66511a7 100755
--- a/bin/make_release
+++ b/bin/make_release
@@ -126,7 +126,6 @@ chop ($now = `$date +"%a %b %d %T %Y"`);
 ########
 ######## Setup signal handlers.
 ########
-$status = 1;  #### Must get set to 0 explicitly to indicate success.
 $SIG{'HUP'} = $SIG{'INT'} = $SIG{'QUIT'} = $SIG{'TERM'} = 'cleanup';
 
 
@@ -143,16 +142,15 @@ if ($update_versions  &&  "$kit" ne 'ace+tao') {
   $major_version = $minor_version = $beta_version = 0;
   $previous_version = $version = '';
 
-  $status =
-    &check_workspace ()  ||
-    &get_versions ()  ||
-    &update_version_files ()  ||
-    &update_changelog ()  ||
-    &tag ()  ||
-    &diff ()  ||
-    &create_kit ();
+  &check_workspace ()  ||
+  &get_versions ()  ||
+  &update_version_files ()  ||
+  &update_changelog ()  ||
+  &tag ()  ||
+  &diff ()  ||
+  &create_kit ();
 } else {
-  $status = &create_kit ();
+  &create_kit ();
 }
 &cleanup;
 
@@ -161,7 +159,7 @@ if ($update_versions  &&  "$kit" ne 'ace+tao') {
 ######## Clean up when done or on signal.
 ########
 sub cleanup {
-  exit $status;
+  exit;
 }
 
 
@@ -297,27 +295,14 @@ sub update_version_files () {
 
   system ("$exec_prefix" .
     "perl -pi -e 's/$KIT VERSION:.*/$KIT VERSION: $version/' " .
-    "PROBLEM-REPORT-FORM $exec_suffix");
+    "BUG-REPORT-FORM $exec_suffix");
   return 1 if $? >> 8;
 
-  if (! "$exec_prefix"  &&  $kit =~ /^tao/) {
+  if ($kit =~ /^tao/) {
     system ("$exec_prefix" .
       "perl -pi -e 's/ACE VERSION:.*/ACE VERSION: $ace_version/' " .
-      "PROBLEM-REPORT-FORM $exec_suffix");
+      "BUG-REPORT-FORM $exec_suffix");
     return 1 if $? >> 8;
-
-    open (TAO_VERSION_H, "> tao/Version.h")  ||
-      die "$0: unable to open tao/Version.h\n";
-
-    print TAO_VERSION_H
-      "// \$Id\$\n" .
-      "// This is an automatically generated file.\n\n" .
-      "\#define TAO_MAJOR_VERSION ${major_version}\n" .
-      "\#define TAO_MINOR_VERSION ${minor_version}\n" .
-      "\#define TAO_BETA_VERSION ${beta_version}\n" .
-      "\#define TAO_VERSION \"${version}\"\n";
-
-    close TAO_VERSION_H;
   }
 
   if (! "$exec_prefix"  &&  $kit =~ /^ace/) {
@@ -327,10 +312,10 @@ sub update_version_files () {
     print ACE_VERSION_H
       "// \$Id\$\n" .
       "// This is an automatically generated file.\n\n" .
-      "\#define ACE_MAJOR_VERSION ${major_version}\n" .
-      "\#define ACE_MINOR_VERSION ${minor_version}\n" .
-      "\#define ACE_BETA_VERSION ${beta_version}\n" .
-      "\#define ACE_VERSION \"${version}\"\n";
+      "\#define ACE_MAJOR_VERSION (${major_version}u)\n" .
+      "\#define ACE_MINOR_VERSION (${minor_version}u)\n" .
+      "\#define ACE_BETA_VERSION (${beta_version}u)\n" .
+      "\#define ACE_VERSION \"${version}\\0\"\n";
 
     close ACE_VERSION_H;
   }
@@ -362,14 +347,11 @@ sub update_changelog () {
 
   if ($kit =~ /^ace/) {
     system ("$cvs commit -m'$version' " .
-            "VERSION PROBLEM-REPORT-FORM ChangeLog ace/Version.h " .
-            "&& chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog " .
-            "ace/Version.h");
+            "VERSION BUG-REPORT-FORM ChangeLog ace/Version.h " .
+            "&& chmod 0644 VERSION BUG-REPORT-FORM ChangeLog ace/Version.h");
   } elsif ($kit =~ /tao/) {
-    system ("$cvs commit -m'$version' VERSION PROBLEM-REPORT-FORM ChangeLog " .
-            "tao/Version.h " .
-            "&& chmod 0644 VERSION PROBLEM-REPORT-FORM ChangeLog " .
-            "tao/Version.h");
+    system ("$cvs commit -m'$version' VERSION BUG-REPORT-FORM ChangeLog " .
+            "&& chmod 0644 VERSION BUG-REPORT-FORM ChangeLog");
   }
   return 1 if $? >> 8;
 
@@ -442,7 +424,7 @@ sub create_kit () {
 
   # These files don't get LF->CRLF conversions done when making the zip.
   $bin_files =
-    "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.ico\|\\.gz\|\\.zip\|\\.gif\"";
+    "\"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\|\\.gz\|\\.zip\|\\.gif\"";
 
   if ($kit eq 'ace') {
     system ("$exec_prefix" .
@@ -470,10 +452,10 @@ sub create_kit () {
     system ("$exec_prefix" .
             "/bin/rm -f ACE+TAO.zip; " .
             "$find $release_files $release_filter | " .
-            "$egrep $bin_files | " .
+            "$egrep \"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\" | " .
             "zip ACE+TAO.zip -q9@ &&" .
             "$find $release_files $release_filter | " .
-            "$egrep -v $bin_files | " .
+            "$egrep -v \"\\.dsp|\\.dsw|\\.mak|\\.mdp|\\.ide|\\.exe\" | " .
             "zip ACE+TAO.zip -qlg9@ &&" .
             "$find $release_files $release_filter | $cpio -o -H tar | " .
             "$gzip -9 > ACE+TAO.tar.gz && " .
diff --git a/bin/tao_svcconf.pl b/bin/tao_svcconf.pl
deleted file mode 100755
index 56d05830f59..00000000000
--- a/bin/tao_svcconf.pl
+++ /dev/null
@@ -1,15 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -pi -S $0 ${1+"$@"}'
-    & eval 'exec perl -pi -S $0 $argv:q'
-    if 0;
-
-# $Id$
-#
-# This script can help you convert TAO svc.conf using dynamic services
-# to use static services.
-#
-# You may want to run the "find" command with this script, which maybe
-# something like this:
-#
-# find . -name svc.conf -print | xargs $ACE_ROOT/bin/tao_svcconf.pl
-
-s/^ *dynamic *([A-Za-z_]+) [^\"]+(\"[^\"]+\").*/static $1 $2/;
diff --git a/bin/vc_filter.pl b/bin/vc_filter.pl
deleted file mode 100755
index 3b3946632e8..00000000000
--- a/bin/vc_filter.pl
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id$
-#
-# A perl script that filers length VC output into a concise html report.
-
-# Define html tags.
-$header = "<html><head>
-<title>Error/Warning Summary of Daily Build</title>
-</head>
-
-<body bgcolor=\"white\">
-<h1>Error/Warning Summary of Daily Build</h1><TT>\n";
-$trailer = "</TT></body></html>";
-
-$kosher_b = "";
-$kosher_e = "";
-
-$in_sin_b = "<FONT COLOR=\"RED\">";
-$in_sin_e = "</FONT>";
-
-$new_build_b = "<P>";
-$new_build_e = "";
-
-# Get filename.
-$fname = $ARGV[0];
-open (fp, "$fname");
-
-print $header ;
-
-while ($line = <fp>)
-{
-    print "$new_build_b $line $new_build_e<BR>" if ($line =~/^--------------------Configuration:/);
-
-    if ($line =~/^[A-Z_a-z0-9.]+ - [0-9]+ error\(s\), +[0-9]+ warning\(s\)/)
-    {
-        if ($line =~/0 error\(s\), 0 warning\(s\)/)
-        {
-            print "$kosher_b $line $kosher_e<BR>";
-        }
-        else
-        {
-            print "$in_sin_b $line $in_sin_e<BR>";
-        }
-    }
-
-    print "$in_sin_b $line $in_sin_e<BR>"
-        if ($line =~/^[-A-Z_a-z0-9.\/\\:]+\([0-9]+\) : / ||
-            $line =~/^[-A-Z_a-z0-9.\\:]+\.obj : / ||
-            $line =~/^fatal error/ ||
-            $line =~/^Error executing/ ||
-            $line =~/^4NT: / ||
-            $line =~/^LINK : /);
-
-}
-
-print $trailer;
diff --git a/config.guess b/config.guess
index 97222404275..4e5345fac2e 100755
--- a/config.guess
+++ b/config.guess
@@ -23,7 +23,6 @@
 
 # Written by Per Bothner <bothner@cygnus.com>.
 # The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -152,7 +151,7 @@ EOF
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    NILE*:*:*:dcosx)
+    NILE:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
     sun4H:SunOS:5.*:*)
@@ -241,11 +240,7 @@ EOF
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
 	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
+	int main (argc, argv) int argc; char **argv; {
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -374,25 +369,25 @@ EOF
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/6?? | 9000/7?? | 9000/80[024] | 9000/8?[136790] | 9000/892 )
+	    9000/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 )
               sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>
-
+              
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
+              #endif 
                   long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
+              
+                  switch (cpu) 
               	{
               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
+              	case CPU_PA_RISC2_0: 
               #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
+              	    switch (bits) 
               		{
               		case 64: puts ("hppa2.0w"); break;
               		case 32: puts ("hppa2.0n"); break;
@@ -400,7 +395,7 @@ EOF
               		} break;
               #else  /* !defined(_SC_KERNEL_BITS) */
               	    puts ("hppa2.0"); break;
-              #endif
+              #endif 
               	default: puts ("hppa1.0"); break;
               	}
                   exit (0);
@@ -448,12 +443,6 @@ EOF
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
-    *9??*:MPE*:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    *9??*:MPE*:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
@@ -532,12 +521,6 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit 0 ;;
     *:FreeBSD:*:*)
-	if test -x /usr/bin/objformat; then
-	    if test "elf" = "`/usr/bin/objformat`"; then
-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
-		exit 0
-	    fi
-	fi
 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
     *:NetBSD:*:*)
@@ -565,7 +548,6 @@ EOF
 	# uname on the ARM produces all sorts of strangeness, and we need to
 	# filter it out.
 	case "$UNAME_MACHINE" in
-	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
 	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
 	esac
 
@@ -625,23 +607,22 @@ EOF
 			16)
 				UNAME_MACHINE="alphaev6"
 				;;
-			esac
+			esac	
 
 			objdump --private-headers $dummy | \
 			  grep ld.so.1 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi
+		fi	
 		rm -f $dummy.s $dummy
 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
 	  cat >$dummy.c <<EOF
-#ifdef __cplusplus
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -673,11 +654,10 @@ EOF
 	  # Determine whether the default compiler is a.out or elf
 	  cat >$dummy.c <<EOF
 #include <features.h>
-#ifdef __cplusplus
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
+main(argc, argv)
+     int argc;
+     char *argv[];
+{
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -779,7 +759,7 @@ EOF
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
+    i?86:LynxOS:2.*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -791,9 +771,6 @@ EOF
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 	exit 0 ;;
@@ -824,7 +801,7 @@ EOF
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
diff --git a/config.sub b/config.sub
index 78d36b15a20..da8b7ae65ca 100755
--- a/config.sub
+++ b/config.sub
@@ -152,7 +152,6 @@ case $basic_machine in
 	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \
-		| hppa2.0w \
 		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
 		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
 		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
@@ -177,14 +176,13 @@ case $basic_machine in
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
 	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \
-	      | hppa2.0w-* \
 	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
 	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
 	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | armv*-*)
+	      | f301-*)
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
@@ -347,14 +345,6 @@ case $basic_machine in
 	hppa-next)
 		os=-nextstep3
 		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		os=-mpeix
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		os=-mpeix
-		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		os=-mvs
@@ -422,10 +412,6 @@ case $basic_machine in
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
-	netwinder)
-		basic_machine=armv4l-corel
-		os=-linux
-		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
@@ -729,7 +715,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -rhapsody* \
-	      | -openstep* | -mpeix* | -oskit*)
+	      | -openstep*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-linux*)
@@ -815,9 +801,6 @@ case $basic_machine in
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
-		os=-linux
-		;;
 	arm*-semi)
 		os=-aout
 		;;
@@ -938,12 +921,6 @@ case $basic_machine in
 			-hpux*)
 				vendor=hp
 				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
 			-hiux*)
 				vendor=hitachi
 				;;
diff --git a/configure b/configure
new file mode 100755
index 00000000000..fb363093b32
--- /dev/null
+++ b/configure
@@ -0,0 +1,29276 @@
+#! /bin/sh
+
+# From configure.in Revision 0.53 
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# serial 31 AC_PROG_LIBTOOL
+
+
+# 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_DISABLE_STATIC - set the default static flag to --disable-static
+
+
+# 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_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_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
+# by C symbol name from nm.
+
+
+# AC_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
+
+
+# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
+#                            with an underscore?
+
+
+
+# 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.
+
+
+
+
+
+
+# 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-static[=PKGS]  build static libraries [default=no]"
+ac_help="$ac_help
+  --enable-shared[=PKGS]  build shared libraries [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  force libtool not to do file locking"
+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
+  --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]"
+
+# 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
+
+
+
+
+
+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 cano
+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:759: 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:780: 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:798: 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:837: 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:890: 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:947: 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
+cat >> confdefs.h <<EOF
+#define PACKAGE "$PACKAGE"
+EOF
+
+cat >> confdefs.h <<EOF
+#define VERSION "$VERSION"
+EOF
+
+
+
+missing_dir=`cd $ac_aux_dir && pwd`
+echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
+echo "configure:993: 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:1006: 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:1019: 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:1032: 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:1045: 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:1067: 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:1091: 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:1121: 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:1172: 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:1204: 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 1215 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:1220: \"$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:1246: 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:1251: 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 configu
+  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:1279: 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:1311: 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 1326 "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:1332: \"$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 1343 "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:1349: \"$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 1360 "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:1366: \"$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:1392: 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:1395: 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 eho configure:1407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+   test -f conftest.o && { (eval echo configure:1408: \"$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:1413: \"$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:1415: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
+	 test -f conftest.o && { (eval echo configure:1416: \"$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:1448: 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:1480: 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 1491 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:1496: \"$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:1522: 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:1527: 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:1536: \"$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:1555: 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:1587: 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 1600 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1605: \"$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:1660: 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:1711: checking for AIX" >&5
+cat > conftest.$ac_ext <<EOF
+#line 1713 "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:1735: 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:1757: 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 1762 "configure"
+#include "confdefs.h"
+#include <minix/config.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1767: \"$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:1805: 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 1810 "configure"
+#include "confdefs.h"
+
+int main() {
+
+#ifndef __CYGWIN__
+#define __CYGWIN__ __CYGWIN32__
+#endif
+return __CYGWIN__;
+; return 0; }
+EOF
+if { (eval echo configure:1821: \"$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:1850: 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:1877: checking
+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:1910: 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:1944: 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 1952 "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:1966: \"$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:1989: 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:2010: 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 2022 "configure"
+#include "confdefs.h"
+`cat $LEX_OUTPUT_OOT.c`
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2029: \"$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:2056: 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:2090: 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:2121: 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
+ 
+
+  
+  
+ 
+ 
+
+          
+ 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*)
+     ;;
+   *tandem*)
+     ;;
+   *unixware*)
+     ;;
+   *vxworks*)
+     ;;
+   *)
+     CXXFLAGS="$CXXFLAGS"
+     ACE_CXXFLAGS="$ACE_CXXFLAGS"
+     DCXXFLAGS="-g"
+     OCXXFLAGS="-O"
+     ;;
+ esac
+
+
+save_CC="$CC"
+CC="$CXX"
+
+# 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
+
+
+# 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
+
+# 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:2341: 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:2380: 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]:/*)
+      # Canonicalize the path of ld
+      re_direlt='/[^/][^/]*/\.\./'
+      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      case "$host_os" in
+      cygwin*)
+	# Convert to a UNC path for cygwin
+	test -z "$LD" && LD=`echo X$ac_prog | sed -e "1s/^X//" -e "$sub_uncdrive"`
+	;;
+      *)
+	test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+    ##
+    ## FIXME:  The code fails later on if we try to use an $LD with
+    ##         '\\' path separators.
+    ##
+    [A-Za-z]:[\\]*)
+      # Canonicalize the path of ld
+      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
+      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
+      sub_uncdir='s%\\%/%g'
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
+      done
+      case "$host_os" in
+      cygwin*)
+	# Convert to a UNC path for cygwin
+	test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
+	;;
+      *)
+	test -z "$LD" && LD="$ac_prog"
+	;;
+      esac
+      ;;
+  "")
+    # 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:2434: checking for GNU ld" >&5
+else
+  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+echo "configure:2437: 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}:"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog"; 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:2473: 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:2489: 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}:"
+  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/nm; 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 command to grab the raw symbol name followe
+echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
+echo "configure:2527: checking command to parse $NM output" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  # These are sane defaults that work on at least a few old systems.
+# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
+
+# Character class describing NM global symbol codes.
+ac_symcode='[BCDEGRST]'
+
+# Regexp to match symbols that can be accessed directly from C.
+ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+
+# Transform the above into a raw symbol and a C symbol.
+ac_symxfrm='\1 \1'
+
+# Define system-specific variables.
+case "$host_os" in
+aix*)
+  ac_symcode='[BCDT]'
+  ;;
+cygwin32* | mingw32*)
+  ac_symcode='[ABCDGISTW]'
+  ;;
+irix*)
+  ac_symcode='[BCDEGRST]'
+  ;;
+solaris*)
+  ac_symcode='[BDT]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+  ac_symcode='[ABCDGISTW]'
+fi
+
+# Try without a prefix undercore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Write the raw and C identifiers.
+  # Unlike in ltconfig.in, we need $ac_symprfx before $ac_symxfrm here,
+  # otherwise AC_SYS_SYMBOL_UNDERSCORE will always be false
+  ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* 	$ac_symcode 	 	*$ac_symprfx$ac_sympat$/$ac_symprfx$ac_symxfrm/p'"
+
+  # Check to see that the pipe works correctly.
+  ac_pipe_works=no
+  rm -f conftest.$ac_ext
+  cat > conftest.$ac_ext <<EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func;return 0;}
+EOF
+
+  if { (eval echo configure:2587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+    # Now try to grab the symbols.
+    ac_nlist=conftest.nm
+  
+    if { (eval echo configure:2591: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+
+      # Try sorting and uniquifying the output.
+      if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
+	mv -f "$ac_nlist"T "$ac_nlist"
+      else
+	rm -f "$ac_nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
+	if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
+	  cat <<EOF > conftest.c
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+EOF
+	  # Now generate the symbol file.
+	  sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+
+	  cat <<EOF >> conftest.c
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{
+EOF
+	sed 's/^\(.*\) \(.*\)$/  {"\1", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
+	cat <<\EOF >> conftest.c
+  {0, (lt_ptr_t) 0}
+};
+
+#ifdef __cplusplus
+}
+#endif
+EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftestm.$ac_objext
+	  ac_save_LIBS="$LIBS"
+	  ac_save_CFLAGS="$CFLAGS"
+	  LIBS="conftestm.$ac_objext"
+	  CFLAGS="$CFLAGS$no_builtin_flag"
+	  if { (eval echo configure:2643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+	    ac_pipe_works=yes
+	  else
+	    echo "configure: failed program was:" >&5
+	    cat conftest.c >&5
+	  fi
+	  LIBS="$ac_save_LIBS"
+	  CFLAGS="$ac_save_CFLAGS"
+	else
+	  echo "cannot find nm_test_func in $ac_nlist" >&5
+	fi
+      else
+	echo "cannot find nm_test_var in $ac_nlist" >&5
+      fi
+    else
+      echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
+    fi
+  else
+    echo "$progname: failed program was:" >&5
+    cat conftest.c >&5
+  fi
+  rm -rf conftest*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test "$ac_pipe_works" = yes; then
+    if test x"$ac_symprfx" = x"_"; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      ac_cv_sys_symbol_underscore=no
+    fi
+    break
+  else
+    ac_cv_sys_global_symbol_pipe=
+  fi
+done
+
+fi
+
+
+ac_result=yes
+if test -z "$ac_cv_sys_global_symbol_pipe"; then
+   ac_result=no
+fi
+echo "$ac_t""$ac_result" 1>&6
+
+echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
+echo "configure:2689: checking for _ prefix in compiled symbols" >&5
+if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_cv_sys_symbol_underscore=no
+cat > conftest.$ac_ext <<EOF
+void nm_test_func(){}
+int main(){nm_test_func;return 0;}
+EOF
+if { (eval echo configure:2698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  # Now try to grab the symbols.
+  ac_nlist=conftest.nm
+  if { (eval echo configure:2701: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
+    # See whether the symbols have a leading underscore.
+    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
+      ac_cv_sys_symbol_underscore=yes
+    else
+      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
+	:
+      else
+	echo "configure: cannot find nm_test_func in $ac_nlist" >&5
+      fi
+    fi
+  else
+    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.c >&5
+fi
+rm -rf conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
+USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
+
+if test $host != $build; then
+  ac_tool_prefix=${host_alias}-
+else
+  ac_tool_prefix=
+fi
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+# Check for any special flags to pass to ltconfig.
+libtool_flags=
+test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+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"
+
+# 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 2748 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:2749: \"$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:2770: 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 2775 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:2782: \"$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
+  ;;
+
+*-*-cygwin32*)
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2805: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IS"; 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_DLLTOOL="${ac_tool_prefix}dlltool"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+DLLTOOL="$ac_cv_prog_DLLTOOL"
+if test -n "$DLLTOOL"; then
+  echo "$ac_t""$DLLTOOL" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_DLLTOOL"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2837: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # 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_DLLTOOL="dlltool"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
+fi
+fi
+DLLTOOL="$ac_cv_prog_DLLTOOL"
+if test -n "$DLLTOOL"; then
+  echo "$ac_t""$DLLTOOL" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  DLLTOOL="false"
+fi
+fi
+
+# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+set dummy ${ac_tool_prefix}as; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2872: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # 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_AS="${ac_tool_prefix}as"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+AS="$ac_cv_prog_AS"
+if test -n "$AS"; then
+  echo "$ac_t""$AS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+if test -z "$ac_cv_prog_AS"; then
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "as", so it can be a program name with args.
+set dummy as; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:2904: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$AS"; then
+  ac_cv_prog_AS="$AS" # 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_AS="as"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
+fi
+fi
+AS="$ac_cv_prog_AS"
+if test -n "$AS"; then
+  echo "$ac_t""$AS" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  AS="false"
+fi
+fi
+
+
+  ;;
+
+esac
+
+# enable the --disable-libtool-lock switch
+
+# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+if test "${enable_libtool_lock+set}" = set; then
+  enableval="$enable_libtool_lock"
+  need_locks=$enableval
+else
+  need_locks=yes
+fi
+
+
+if test x"$need_locks" = xno; then
+  libtool_flags="$libtool_flags --disable-lock"
+fi
+
+
+# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+DLLTOOL="$DLLTOOL" AS="$AS" \
+${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; }
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+
+# 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"
+
+
+
+# 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
+       
+                  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:3241: 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:3303: 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_CXXFLAGS="$ACE_CXXFLAGS -features=rtti"
+                           ;;
+                      *)
+                           ;;
+                    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:3538: 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 3600 "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:3605: \"$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 l
+
+  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 3674 "configure"
+#include "confdefs.h"
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:3681: \"$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:3793: 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 3796 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3803: \"$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 3819 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:3826: \"$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:3858: 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 3866 "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:3880: \"$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:3902: 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 3910 "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:3924: \"$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:3953: 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 3958 "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:3984: \"$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:4005: 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 4013 "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:4027: \"$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:4057: 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 4062 "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:4088: \"$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:4109: 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 4117 "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:4131: \"$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:4155: 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 4160 "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:4186: \"$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:4207: 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 > conf
+#line 4215 "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:4229: \"$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:4253: 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 4258 "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:4284: \"$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:4305: 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 4313 "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:4327: \"$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:4360: 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 4368 "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:4382: \"$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 --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
+  *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:4710: 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 4718 "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:4732: \"$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:4759: 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 4767 "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:4781: \"$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 dlopen""... $ac_c" 1>&6
+echo "configure:4830: checking for dlopen" >&5
+if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4835 "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:4861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_dlopen=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_dlopen=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ace_has_svr4_dynamic_linking=yes
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:4879: checking for dlopen in -ldl" >&5
+ac_lib_var=`echo dl'_'dlopen | 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="-ldl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4887 "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 
+char dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:4901: \"$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_svr4_dynamic_linking=yes
+     LIBS="$LIBS -ldl"
+    
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
+echo "configure:4923: checking for dlopen in -lsvld" >&5
+ac_lib_var=`echo svld'_'dlopen | 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="-lsvld  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 4931 "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 dlopen();
+
+int main() {
+dlopen()
+; return 0; }
+EOF
+if { (eval echo configure:4945: \"$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_svr4_dynamic_linking=yes
+       LIBS="$LIBS -lsvld"
+      
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for shl_get in -ldld""... $ac_c" 1>&6
+echo "configure:4967: 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 4975 "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:4989: \"$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
+
+fi
+
+fi
+
+
+echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:5024: checking for socket" >&5
+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5029 "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 nme is an alias.  */
+#if defined (__stub_socket) || defined (__stub___socket)
+choke me
+#else
+socket();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:5055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_socket=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_socket=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:5073: checking for socket in -lsocket" >&5
+ac_lib_var=`echo socket'_'socket | 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  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5081 "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 socket();
+
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:5095: \"$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 socket | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lsocket $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+echo "configure:5126: 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 5131 "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:5157: \"$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
+  echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:5175: 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 5183 "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:5197: \"$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 nsl | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lnsl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking for getservbyname""... $ac_c" 1>&6
+echo "configure:5228: checking for getservbyname" >&5
+if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5233 "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:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_getservbyname=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_getservbyname=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for getservbyname in -lxnet""... $ac_c" 1>&6
+echo "configure:5277: checking for getservbyname in -lxnet" >&5
+ac_lib_var=`echo xnet'_'getservbyname | 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="-lxnet  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5285 "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 getservbyname();
+
+int main() {
+getservbyname()
+; return 0; }
+EOF
+if { (eval echo configure:5299: \"$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 xnet | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lxnet $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define ACE_LACKS_GETSERVBYNAME 1
+EOF
+
+fi
+
+fi
+
+
+echo $ac_n "checking for compile""... $ac_c" 1>&6
+echo "configure:5334: checking for compile" >&5
+if eval "test \"`echo '$''{'ac_cv_func_compile'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5339 "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:5365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_compile=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_compile=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'compile`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for compile in -lgen""... $ac_c" 1>&6
+echo "configure:5383: checking for compile in -lgen" >&5
+ac_lib_var=`echo gen'_'compile | 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="-lgen  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5391 "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 compile();
+
+int main() {
+compile()
+; return 0; }
+EOF
+if { (eval echo configure:5405: \"$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 gen | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lgen $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking for exc_continue""... $ac_c" 1>&6
+echo "configure:5436: checking for exc_continue" >&5
+if eval "test \"`echo '$''{'ac_cv_func_exc_continue'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5441 "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:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_exc_continue=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_exc_continue=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'exc_continue`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for exc_continue in -lexc""... $ac_c" 1>&6
+echo "configure:5485: checking for exc_continue in -lexc" >&5
+ac_lib_var=`echo exc'_'exc_continue | sed 'y%./+-%__p_%'`
+if eval "te
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lexc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5493 "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 exc_continue();
+
+int main() {
+exc_continue()
+; return 0; }
+EOF
+if { (eval echo configure:5507: \"$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 exc | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lexc $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking for ctime_r""... $ac_c" 1>&6
+echo "configure:5538: 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 5543 "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:5569: \"$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
+  echo $ac_n "checking for ctime_r in -lc_r""... $ac_c" 1>&6
+echo "configure:5587: checking for ctime_r in -lc_r" >&5
+ac_lib_var=`echo c_r'_'ctime_r | 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="-lc_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5595 "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 ctime_r();
+
+int main() {
+ctime_r()
+; return 0; }
+EOF
+if { (eval echo configure:5609: \"$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 c_r | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lc_r $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+ace_has_tli_funcs=yes
+echo $ac_n "checking for t_accept""... $ac_c" 1>&6
+echo "configure:5641: checking or t_accept" >&5
+if eval "test \"`echo '$''{'ac_cv_func_t_accept'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5646 "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:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_t_accept=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_t_accept=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'t_accept`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for t_accept in -lxti""... $ac_c" 1>&6
+echo "configure:5690: checking for t_accept in -lxti" >&5
+ac_lib_var=`echo xti'_'t_accept | 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="-lxti  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5698 "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 t_accept();
+
+int main() {
+t_accept()
+; return 0; }
+EOF
+if { (eval echo configure:5712: \"$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 xti | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lxti $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for t_accept in -ltli_r""... $ac_c" 1>&6
+echo "configure:5738: checking for t_accept in -ltli_r" >&5
+ac_lib_var=`echo tli_r'_'t_accept | 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="-ltli_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5746 "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 t_accept();
+
+int main() {
+t_accept()
+; return 0; }
+EOF
+if { (eval echo configure:5760: \"$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 tli_r | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ltli_r $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for t_accept in -ltli""... $ac_c" 1>&6
+echo "configure:5786: checking for t_accept in -ltli" >&5
+ac_lib_var=`echo tli'_'t_accept | 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="-ltli  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5794 "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 t_accept();
+
+int main() {
+t_accept()
+; return 0; }
+EOF
+if { (eval echo configure:5808: \"$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 tli | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-ltli $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
+echo "configure:5834: checking for t_accept in -lnsl" >&5
+ac_lib_var=`echo nsl'_'t_accept | 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 5842 "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 t_accept();
+
+int main() {
+t_accept()
+; return 0; }
+EOF
+if { (eval echo configure:5856: \"$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 nsl | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lnsl $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+ace_has_tli_funcs=no
+fi
+
+fi
+
+fi
+
+fi
+
+fi
+
+
+ace_has_aio_funcs=yes
+echo $ac_n "checking for aio_read""... $ac_c" 1>&6
+echo "configure:5895: checking for aio_read" >&5
+if eval "test \"`echo '$''{'ac_cv_func_aio_read'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 5900 "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:5926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_aio_read=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_aio_read=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'aio_read`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for aio_read in -laio""... $ac_c" 1>&6
+echo "configure:5944: checking for aio_read in -laio" >&5
+ac_lib_var=`echo aio'_'aio_read | 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="-laio  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 5952 "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 aio_read();
+
+int main() {
+aio_read()
+; return 0; }
+EOF
+if { (eval echo configure:5966: \"$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 aio | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-laio $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for aio_read in -lposix4""... $ac_c" 1>&6
+echo "configure:5992: checking for aio_read in -lposix4" >&5
+ac_lib_var=`echo posix4'_'aio_read | 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="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 6000 "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 aio_read();
+
+int main() {
+aio_read()
+; return 0; }
+EOF
+if { (eval echo configure:6014: \"$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 posix4 | sed -e 's/^a-zA-Z0-9_/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lposix4 $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+ace_has_aio_funcs=no
+fi
+
+fi
+
+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:6052: 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
+  
+    
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6067 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6086: \"$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 6099 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6106: \"$ac
+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 (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
+    ace_real_function="pthread_create"
+  fi 
+cat > conftest.$ac_ext <<EOF
+#line 6139 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6158: \"$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*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+   
+fi
+
+  echo "$ac_t""$ace_cv_feature_may_need_thread_flag" 1>&6
+  if test "$ace_cv_feature_may_need_thread_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+    ace_cv_feature_thread_flag_set=no
+
+    save_CXXFLAGS="$CXXFLAGS"
+    save_CFLAGS="$CFLAGS"
+
+    CXXFLAGS="$CXXFLAGS -mt"
+    CFLAGS="$CFLAGS -mt"
+
+    
+  echo $ac_n "checking if compiler can use -mt flag""... $ac_c" 1>&6
+echo "configure:6201: checking if compiler can use -mt flag" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_has_mt_flag'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+       
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6216 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+          ace_cv_feature_has_mt_flag=yes
+         
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 6248 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6255: \"$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 (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
+    ace_real_function="pthread_create"
+  fi 
+cat > conftest.$ac_ext <<EOF
+#line 6288 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+          ace_cv_feature_has_mt_flag=yes
+         
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+          ace_cv_feature_has_mt_flag=no
+         
+fi
+rm -f conftest*
+
+  
+fi
+rm -f conftest*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+      
+fi
+
+  echo "$ac_t""$ace_cv_feature_has_mt_flag" 1>&6
+  if test "$ace_cv_feature_has_mt_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+       ace_cv_feature_thread_flag_set=yes
+      
+  else
+    ace_just_a_place_holder=fixme
+
+       CXXFLAGS="$save_CXXFLAGS"
+       CFLAGS="$save_CFLAGS"
+      
+  fi
+
+
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+ 
+      CXXFLAGS="$CXXFLAGS -pthread"
+      CFLAGS="$CFLAGS -pthread"
+
+      
+  echo $ac_n "checking if compiler can use -pthread flag""... $ac_c" 1>&6
+echo "configure:6358: checking if compiler can use -pthread flag" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_has_pthread_flag'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+         
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6373 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthread_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 6405 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6412: \"$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 (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
+    ace_real_function="pthread_create"
+  fi 
+cat > conftest.$ac_ext <<EOF
+#line 6445 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthread_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthread_flag=no
+           
+fi
+rm -f conftest*
+
+  
+fi
+rm -f conftest*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+        
+fi
+
+  echo "$ac_t""$ace_cv_feature_has_pthread_flag" 1>&6
+  if test "$ace_cv_feature_has_pthread_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+         ace_cv_feature_thread_flag_set=yes
+        
+  else
+    ace_just_a_place_holder=fixme
+
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        
+  fi
+
+
+    fi 
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -pthreads"
+      CFLAGS="$CFLAGS -pthreads"
+
+      
+  echo $ac_n "checking if compiler can use -pthreads flag""... $ac_c" 1>&6
+echo "configure:6516: checking if compiler can use -pthreads flag" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_has_pthreads_flag'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+         
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6531 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthreads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 6563 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6570: \"$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 (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
+    ace_real_function="pthread_create"
+  fi 
+cat > conftest.$ac_ext <<EOF
+#line 6603 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthreads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+            ace_cv_feature_has_pthreads_flag=no
+           
+fi
+rm -f conftest*
+
+  
+fi
+rm -f conftest*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+        
+fi
+
+  echo "$ac_t""$ace_cv_feature_has_pthreads_flag" 1>&6
+  if test "$ace_cv_feature_has_pthreads_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+         ace_cv_feature_thread_flag_set=yes
+        
+  else
+    ace_just_a_place_holder=fixme
+
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        
+  fi
+
+
+    fi 
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -mthreads"
+      CFLAGS="$CXXFLAGS -mthreads"
+
+      
+  echo $ac_n "checking if compiler can use -mthreads flag""... $ac_c" 1>&6
+echo "configure:6674: checking if compiler can use -mthreads flag" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_has_mthreads_flag'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+         
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6689 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_mthreads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 6721 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6728: \"$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 (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
+    ace_real_function="pthread_create"
+  fi 
+cat > conftest.$ac_ext <<EOF
+#line 6761 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_mthreads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+            ace_cv_feature_has_mthreads_flag=no
+           
+fi
+rm -f conftest*
+
+  
+fi
+rm -f conftest*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+        
+fi
+
+  echo "$ac_t""$ace_cv_feature_has_mthreads_flag" 1>&6
+  if test "$ace_cv_feature_has_mthreads_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+         ace_cv_feature_thread_flag_set=yes
+        
+  else
+    ace_just_a_place_holder=fixme
+
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        
+  fi
+
+
+    fi 
+    if test "$ace_cv_feature_thread_flag_set" = no; then
+
+      CXXFLAGS="$CXXFLAGS -threads"
+      CFLAGS="$CXXFLAGS -threads"
+
+      
+  echo $ac_n "checking if compiler can use -threads flag""... $ac_c" 1>&6
+echo "configure:6832: checking if compiler can use -threads flag" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_has_dash_threads_flag'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+         
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+cat > conftest.$ac_ext <<EOF
+#line 6847 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char thr_create();
+
+int main() {
+
+thr_create();
+
+; return 0; }
+EOF
+if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_dash_threads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 6879 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:6886: \"$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 (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
+    ace_real_function="pthread_create"
+  
+cat > conftest.$ac_ext <<EOF
+#line 6919 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C"
+#endif
+
+#ifndef _REENTRANT
+#error _REENTRANT was not defined
+THROW ME AN ERROR!
+#endif
+
+char $ace_real_function();
+
+int main() {
+
+$ace_real_function();
+
+; return 0; }
+EOF
+if { (eval echo configure:6938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+            ace_cv_feature_has_dash_threads_flag=yes
+           
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+            ace_cv_feature_has_dash_threads_flag=no
+           
+fi
+rm -f conftest*
+
+  
+fi
+rm -f conftest*
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+
+
+        
+fi
+
+  echo "$ac_t""$ace_cv_feature_has_dash_threads_flag" 1>&6
+  if test "$ace_cv_feature_has_dash_threads_flag" = yes; then
+    ace_just_a_place_holder=fixme
+
+         ace_cv_feature_thread_flag_set=yes
+        
+  else
+    ace_just_a_place_holder=fixme
+
+         CXXFLAGS="$save_CXXFLAGS"
+         CFLAGS="$save_CFLAGS"
+        
+  fi
+
+
+    fi    
+  else
+    ace_just_a_place_holder=fixme
+
+       
+  fi
+
+
+
+  ace_has_sthreads=no
+
+  echo $ac_n "checking for thr_create""... $ac_c" 1>&6
+echo "configure:6994: checking for thr_create" >&5
+if eval "test \"`echo '$''{'ac_cv_func_thr_create'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 6999 "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:7025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_thr_create=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_thr_create=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'thr_create`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+     ace_has_sthreads=yes
+     cat >> confdefs.h <<\EOF
+#define ACE_HAS_STHREADS 1
+EOF
+
+    
+else
+  echo "$ac_t""no" 1>&6
+
+     echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6
+echo "configure:7050: checking for thr_create in -lthread" >&5
+ac_lib_var=`echo thread'_'thr_create | 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="-lthread  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7058 "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 thr_create();
+
+int main() {
+thr_create()
+; return 0; }
+EOF
+if { (eval echo configure:7072: \"$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_sthreads=yes
+                   LIBS="$LIBS -lthread"
+                   cat >> confdefs.h <<\EOF
+#define ACE_HAS_STHREADS 1
+EOF
+
+                 
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    
+fi
+
+
+
+                            
+    echo $ac_n "checking for pthreads backward compatibility macros""... $ac_c" 1>&6
+echo "configure:7106: 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 7112 "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
+
+    ace_has_pthreads=no
+
+    
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 7147 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7154: \"$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:7190: 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:7197: 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 7202 "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:7228: \"$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
+echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+echo "configure:7251: checking for pthread_create in -lpthread" >&5
+ac_lib_var=`echo pthread'_'pthread_create | 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 7259 "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 pthread_create();
+
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:7273: \"$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
+fi
+
+
+       if test "$ace_has_pthreads" = no &&
+          test "$ace_cv_lib_pthread_compat_macros" = yes; then
+         
+  
+
+  cat > conftest.$ac_ext <<EOF
+#line 7307 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7314: \"$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:7350: 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:7357: 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 7365 "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:7379: \"$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
+fi
+
+
+       fi 
+       if test "$ace_has_pthreads" = no; then
+         echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
+echo "configure:7409: checking for pthread_create in -lpthreads" >&5
+ac_lib_var=`echo pthreads'_'pthread_create | 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="-lpthreads  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7417 "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 pthread_create();
+
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:7431: \"$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 -lpthreads"
+                       cat >> confdefs.h <<\EOF
+#define ACE_HAS_PTHREADS 1
+EOF
+
+                      
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+       fi 
+       if test "$ace_has_pthreads" = no; then  
+         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:7461: checking for pthread_create in -lc_r" >&5
+ac_lib_var=`echo c_r'_'pthread_create | 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="-lc_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7469 "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 pthread_create();
+
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:7483: \"$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 -lc_r"
+                       cat >> confdefs.h <<\EOF
+#define ACE_HAS_PTHREADS 1
+EOF
+
+                      
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+       fi 
+       if test "$ace_has_pthreads" = no; then  
+         echo $ac_n "checking for pthread_create in -lgthreads""... $ac_c" 1>&6
+echo "configure:7513: checking for pthread_create in -lgthreads" >&5
+ac_lib_var=`echo gthreads'_'pthread_create | 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="-lgthreads  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7521 "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 pthread_create();
+
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:7535: \"$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 confte
+  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 -lgthreads"
+                       cat >> confdefs.h <<\EOF
+#define ACE_HAS_PTHREADS 1
+EOF
+
+                      
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+       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 sched_yield""... $ac_c" 1>&6
+echo "configure:7575: checking for sched_yield" >&5
+if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 7580 "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:7606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_sched_yield=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_sched_yield=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'sched_yield`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ace_has_sched_yield=yes
+else
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:7624: checking for sched_yield in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_yield | 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="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7632 "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 sched_yield();
+
+int main() {
+sched_yield()
+; return 0; }
+EOF
+if { (eval echo configure:7646: \"$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_sched_yield=yes
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+
+
+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:7676: 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 7681 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <$ac_hdr>
+int main() {
+DIR *dirp = 0;
+; return 0; }
+EOF
+if { (eval echo configure:7689: \"$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 -r 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:7714: 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 7722 "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:7736: \"$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:7758: 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 7766 "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:7780: \"$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:7814: 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 7819 "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:7835: \"$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 "$am_cv_cygwin32" = 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:7859: 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 7864 "configure"
+#include "confdefs.h"
+#include <cygwin32/socket.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7869: \"$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:7897: 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 7902 "configure"
+#include "confdefs.h"
+#include <dlfcn.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7907: \"$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:7938: 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 7943 "configure"
+#include "confdefs.h"
+#include <malloc.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7948: \"$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:7976: 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 7981 "configure"
+#include "confdefs.h"
+#include <memory.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:7986: \"$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:8014: 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 8019 "configure"
+#include "confdefs.h"
+#include <bytesex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8024: \"$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:8052: 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 8057 "configure"
+#include "confdefs.h"
+#include <sys/msg.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8062: \"$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:8081: 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 8087 "configure"
+#include "confdefs.h"
+
+#include <sys/msg.h>
+        
+int main() {
+
+         struct msg ace_msg;
+        
+; return 0; }
+EOF
+if { (eval echo configure:8098: \"$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 8109 "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:8123: \"$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" = yes; 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:8168: 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 8173 "confi
+#include "confdefs.h"
+#include <sys/param.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8178: \"$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:8206: 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 8211 "configure"
+#include "confdefs.h"
+#include <sys/priocntl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8216: \"$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/procfs.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/procfs.h""... $ac_c" 1>&6
+echo "configure:8240: 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 8245 "configure"
+#include "confdefs.h"
+#include <sys/procfs.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8250: \"$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_PROC_FS 1
+EOF
+
+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:8277: 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 8282 "configure"
+#include "confdefs.h"
+#include <sys/select.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8287: \"$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:8314: 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 8319 "configure"
+#include "confdefs.h"
+#include <netinet/tcp.h>
+EOF
+ac_try="$ac_cpp conftest.$acext >/dev/null 2>conftest.out"
+{ (eval echo configure:8324: \"$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:8352: 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 8357 "configure"
+#include "confdefs.h"
+#include <sys/sockio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8362: \"$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:8389: 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 8394 "configure"
+#include "confdefs.h"
+#include <sysent.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8399: \"$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:8426: 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 8431 "configure"
+#include "confdefs.h"
+#include <sys/systeminfo.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8436: \"$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:8459: 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 8464 "configure"
+#include "confdefs.h"
+#include <sys/filio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8469: \"$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:8496: 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 8501 "configure"
+#include "confdefs.h"
+#include <sys/uio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8506: \"$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:8529: 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 8534 "configure"
+#include "confdefs.h"
+#include <sys/ioctl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8539: \"$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:8566: 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 8571 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8576: \"$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:8604: 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 8609 "configure"
+#include "confdefs.h"
+#include <sys/termios.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8614: \"$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 8632 "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:8669: 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 8674 "configure"
+#include "confdefs.h"
+#include <xti.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8679: \"$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:8713: 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 8718 "configure"
+#include "confdefs.h"
+#include <sys/xti.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8723: \"$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:8761: 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 8766 "configure"
+#include "confdefs.h"
+#include <sys/timod.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8771: \"$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 
+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:8798: 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 8803 "configure"
+#include "confdefs.h"
+#include <tli/timod.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8808: \"$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:8840: 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 8845 "configure"
+#include "confdefs.h"
+#include <tiuser.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8850: \"$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:8885: 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 8891 "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" = yes; 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:8927: 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 8932 "configure"
+#include "confdefs.h"
+#include <xliuser.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8937: \"$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:8973: 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 8979 "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" = yes; 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:9044: 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 9050 "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" = yes; then
+    ace_just_a_place_holder=fixme
+
+            echo $ac_n "checking for _terrno""... $ac_c" 1>&6
+echo "configure:9110: checking for _terrno" >&5
+if eval "test \"`echo '$''{'ac_cv_func__terrno'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9115 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _terrno(); 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 _terrno();
+
+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__terrno) || defined (__stub____terrno)
+choke me
+#else
+_terrno();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:9141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func__terrno=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__terrno=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_terrno`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+cat >> confdefs.h <<\EOF
+#define ACE_HAS_BROKEN_T_ERRNO 1
+EOF
+
+fi
+
+  
+  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:9179: 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 9184 "configure"
+#include "confdefs.h"
+#include <sys/time.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9189: \"$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 9207 "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:9233: 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 9238 "configure"
+#include "confdefs.h"
+#include <sys/mman.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9243: \"$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 9261 "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:9293: 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 9298 "configure"
+#include "confdefs.h"
+#include <bstring.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9303: \"$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 9321 "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:9345: 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 9350 "configure"
+#include "confdefs.h"
+#include <strings.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9355: \"$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 9373 "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:9397: 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 9402 "configure"
+#include "confdefs.h"
+#include <sys/syscall.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9407: \"$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:9434: 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 9439 "configure"
+#include "confdefs.h"
+#include <poll.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9444: \"$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:9473: 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 9478 "configure"
+#include "confdefs.h"
+#include <$ac_hdr
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9483: \"$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:9511: 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 9516 "configure"
+#include "confdefs.h"
+#include <regexpr.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9521: \"$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:9548: 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 9553 "configure"
+#include "confdefs.h"
+#include <stropts.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9558: \"$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:9585: 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 9590 "configure"
+#include "confdefs.h"
+#include <siginfo.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9595: \"$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:9623: 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 9628 "configure"
+#include "confdefs.h"
+#includ <unistd.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9633: \"$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 "ucontext.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for ucontext.h""... $ac_c" 1>&6
+echo "configure:9661: 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 9666 "configure"
+#include "confdefs.h"
+#include <ucontext.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9671: \"$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 "utime.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for utime.h""... $ac_c" 1>&6
+echo "configure:9699: 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 9704 "configure"
+#include "confdefs.h"
+#include <utime.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9709: \"$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:9737: 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 9742 "configure"
+#include "confdefs.h"
+#include <libc.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9747: \"$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:9774: 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 9779 "configure"
+#include "confdefs.h"
+#include <osfcn.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9784: \"$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:9811: 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 9816 "configure"
+#include "confdefs.h"
+#include <new>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9821: \"$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:9846: 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 9851 "configure"
+#include "confdefs.h"
+#include <new.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9856: \"$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:9886: 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 9891 "configure"
+#include "confdefs.h"
+#include <stdexcept>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9896: \"$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:9921: 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 9926 "configure"
+#include "confdefs.h"
+#include <exception.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9931: \"$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:9961: 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 9966 "configure"
+#include "confdefs.h"
+#include <iomanip>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9971: \"$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:9998: 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 10003 "configure"
+#include "confdefs.h"
+#include <cstring>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10008: \"$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 "auto_ptr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for auto_ptr""... $ac_c" 1>&6
+echo "configure:10035: checking for auto_ptr" >&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 10040 "configure"
+#include "confdefs.h"
+#include <auto_ptr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10045: \"$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:10068: 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 10073 "configure"
+#include "confdefs.h"
+#include <map>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10078: \"$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 conf
+  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:10097: 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 10102 "configure"
+#include "confdefs.h"
+#include <net/if.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10107: \"$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:10126: 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 10132 "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:10147: \"$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" = yes; 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:10188: 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 10193 "configure"
+#include "confdefs.h"
+#include <queue>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10198: \"$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:10217: 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 10222 "configure"
+#include "confdefs.h"
+#include <netinet/in.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10227: \"$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_cvheader_'$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:10246: 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 10252 "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:10267: \"$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" = yes; 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:10310: 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 10315 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10320: \"$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:10353: 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 10358 "configure"
+#include "confdefs.h"
+#include <iostream.h>
+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_safe=`echo "fstream.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for fstream.h""... $ac_c" 1>&6
+echo "configure:10381: 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 10386 "configure"
+#include "confdefs.h"
+#include <fstream.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10391: \"$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 if platform needs sched.h for thread scheduling definitions""... $ac_c" 1>&6
+echo "configure:10427: checking if platform needs 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 10433 "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" = yes; then
+    ace_just_a_place_holder=fixme
+cat >> confdefs.h <<\EOF
+#define ACE_LACKS_SCHED_H 1
+EOF
+
+  else
+    ace_just_a_place_holder=fixme
+  fi
+
+
+
+  echo $ac_n "checking if platform needs regexpr.h for regular expression support""... $ac_c" 1>&6
+echo "configure:10468: checking if platform needs 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 10474 "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 10492 "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" = yes; 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
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if sprintf() returns char*""... $ac_c" 1>&6
+echo "configure:10539: 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 10545 "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:10563: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  echo $ac_n "checking for getopt() prototype""... $ac_c" 1>&6
+echo "configure:10600: 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 10606 "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 10620 "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" = yes; 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
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking for old malloc() prototype""... $ac_c" 1>&6
+echo "configure:10668: 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 10674 "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:10689: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  echo $ac_n "checking for *_timedwait() prototypes""... $ac_c" 1>&6
+echo "configure:10726: 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 10732 "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 10746 "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" = yes; 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:10786: 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 10792 "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
+
+    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:10828: 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 10834 "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" = yes; 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:10869: 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 10875 "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 10884 "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" = yes; 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:10929: 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 10935 "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" = yes; 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:10971: 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 10976 "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 fies""... $ac_c" 1>&6
+echo "configure:11005: 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 11010 "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:11018: \"$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 11035 "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 11053 "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 11074 "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:11088: \"$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:11112: 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 11117 "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:11145: 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 11150 "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:11178: 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 11183 "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:11211: 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 11216 "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:11248: 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 11254 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+       
+int main() {
+
+        idtype_t ace_idtype_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11265: \"$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" = yes; 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:11298: 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 11304 "configure"
+#include "confdefs.h"
+
+#include <semaphore.h>
+       
+int main() {
+
+        sem_t ace_sem_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11315: \"$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" = yes; 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:11345: 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 11351 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+       
+int main() {
+
+        key_t ace_key_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11362: \"$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" = yes; 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:11396: 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 11402 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+       
+int main() {
+
+        ssize_t ace_ssize_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11413: \"$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" = yes; 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:11446: 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 11452 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+       
+int main() {
+
+        u_longlong_t ace_u_longlong_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11463: \"$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" = yes; 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:11497: 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 11503 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+       
+int main() {
+
+        pri_t ace_pri_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11514: \"$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" = yes; 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:11548: 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 11554 "configure"
+#include "confdefs.h"
+
+#include <sys/socket.h>
+       
+int main() {
+
+        socklen_t ace_socklen_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11565: \"$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" = yes; 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 
+echo "configure:11598: 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 11604 "configure"
+#include "confdefs.h"
+
+#include <ucontext.h>
+       
+int main() {
+
+        ucontext_t ace_ucontext_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11615: \"$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" = yes; 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:11648: 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 11654 "configure"
+#include "confdefs.h"
+
+#include <wchar.h>
+       
+int main() {
+
+        wchar_t ace_wchar_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11665: \"$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" = yes; 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:11695: 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 11701 "configure"
+#include "confdefs.h"
+
+#include <sys/types.h>
+       
+int main() {
+
+        wchar_t ace_wchar_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11712: \"$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" = yes; 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:11749: 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 11755 "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:11769: \"$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" = yes; 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:11804: 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 11812 "configure"
+#include "confdefs.h"
+
+#include <fcntl.h>
+       
+int main() {
+
+        struct flock ace_flock;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11823: \"$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 11836 "configure"
+#include "confdefs.h"
+
+#include <fcntl.h>
+          
+int main() {
+
+           flock ace_flock;
+          
+; return 0; }
+EOF
+if { (eval echo configure:11847: \"$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" = yes; 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:11890: 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 11898 "configure"
+#include "confdefs.h"
+
+#include <synch.h>
+       
+int main() {
+
+        struct rwlock_t ace_rwlock_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11909: \"$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 11922 "configure"
+#include "confdefs.h"
+
+#include <synch.h>
+          
+int main() {
+
+           rwlock_t ace_rwlock_t;
+          
+; return 0; }
+EOF
+if { (eval echo configure:11933: \"$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" = yes; 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:11976: 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 11984 "configure"
+#include "confdefs.h"
+
+#include <stropts.h>
+       
+int main() {
+
+        struct strbuf ace_strbuf;
+       
+; return 0; }
+EOF
+if { (eval echo configure:11995: \"$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 12008 "configure"
+#include "confdefs.h"
+
+#include <stropts.h>
+          
+int main() {
+
+           strbuf ace_strbuf;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12019: \"$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" = yes; 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:12061: 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 12069 "configure"
+#include "confdefs.h"
+
+#include <sys/msg.h>
+       
+int main() {
+
+        struct msgbuf ace_msgbuf;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12080: \"$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 12093 "configure"
+#include "confdefs.h"
+
+#include <sys/msg.h>
+          
+int main() {
+
+           msgbuf ace_msgbuf;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12104: \"$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" = yes; 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:12151: 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 12159 "configure"
+#include "confdefs.h"
+
+#include <sys/procfs.h>
+       
+int main() {
+
+        struct prusage_t ace_prusage_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12170: \"$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 12183 "configure"
+#include "confdefs.h"
+
+#include <sys/procfs.h>
+          
+int main() {
+
+           prusage_t ace_prusage_t;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12194: \"$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" = yes; 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:12238: 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 12246 "configure"
+#include "confdefs.h"
+
+#include <stropts.h>
+       
+int main() {
+
+        struct strrecvfd ace_strrecvfd;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12257: \"$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 12270 "configure"
+#include "confdefs.h"
+
+#include <stropts.h>
+          
+int main() {
+
+           strrecvfd ace_strrecvfd;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12281: \"$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" = yes; 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:12324: 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 12332 "configure"
+#include "confdefs.h"
+
+#include <sys/sem.h>
+       
+int main() {
+
+        struct sembuf ace_sembuf;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12343: \"$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 12356 "configure"
+#include "confdefs.h"
+
+#include <sys/sem.h>
+          
+int main() {
+
+           sembuf ace_sembuf;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12367: \"$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" = yes; 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:12410: 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 12418 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+       
+int main() {
+
+        struct sigaction ace_sigaction;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12429: \"$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 12442 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+          
+int main() {
+
+           sigaction ace_sigaction;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12453: \"$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" = yes; then
+    ace_just_a_place_holder=fixme
+:
+  else
+    ace_just_a_place_holder=fixme
+cat
+#define ACE_LACKS_SIGACTION 1
+EOF
+
+  fi
+
+
+
+
+
+  
+  echo $ac_n "checking for struct sigset_t in signal.h""... $ac_c" 1>&6
+echo "configure:12496: 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 12504 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+       
+int main() {
+
+        struct sigset_t ace_sigset_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12515: \"$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 12528 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+          
+int main() {
+
+           sigset_t ace_sigset_t;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12539: \"$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" = yes; 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:12582: 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 12590 "configure"
+#include "confdefs.h"
+
+#include <sys/utsname.h>
+       
+int main() {
+
+        struct utsname ace_utsname;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12601: \"$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 12614 "configure"
+#include "confdefs.h"
+
+#include <sys/utsname.h>
+          
+int main() {
+
+           utsname ace_utsname;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12625: \"$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" = yes; 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:12666: 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 12674 "configure"
+#include "confdefs.h"
+
+#include <siginfo.h>
+       
+int main() {
+
+        struct siginfo_t ace_siginfo_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12685: \"$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 12698 "configure"
+#include "confdefs.h"
+
+#include <siginfo.h>
+          
+int main() {
+
+           siginfo_t ace_siginfo_t;
+          
+; return 0; }
+EOF
+if { (eval eho configure:12709: \"$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 12725 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+       
+int main() {
+
+        struct siginfo_t ace_siginfo_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12736: \"$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 12749 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+          
+int main() {
+
+           siginfo_t ace_siginfo_t;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12760: \"$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" = yes; 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:12809: 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 12815 "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:12829: \"$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" = yes; 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:12860: 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 12866 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+       
+int main() {
+
+        pthread_cond_t ace_pthread_cond_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:12877: \"$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 12888 "configure"
+#include "confdefs.h"
+
+#include <synch.h>
+          
+int main() {
+
+           cond_t ace_cond_t;
+          
+; return 0; }
+EOF
+if { (eval echo configure:12899: \"$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" = yes; 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:12934: 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 12940 "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:12955: \"$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 12966 "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:12981: \"$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:12987: 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 12993 "configure"
+#include "confdefs.h"
+
+#include <sys/timers.h> 
+                  
+int main() {
+
+                   timespec sr;
+                  
+; return 0; }
+EOF
+if { (eval echo configure:13004: \"$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" = yes; 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" = yes; 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:13068: 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 13074 "configure"
+#include "confdefs.h"
+
+#include <sys/timers.h> 
+         
+int main() {
+
+          timespec sr;
+         
+; return 0; }
+EOF
+if { (eval echo configure:13085: \"$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" = yes; 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:13119: 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 13125 "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:13140: \"$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" = yes; 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:13172: 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 13178 "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:13192: \"$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" = yes; 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:13224: 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 13230 "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:13247: \"$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" = yes; 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:13278: 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 13284 "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; }
+EO
+if { (eval echo configure:13303: \"$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" = yes; 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:13335: 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 13341 "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:13356: \"$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" = yes; 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:13388: 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 13394 "configure"
+#include "confdefs.h"
+
+#ifndef ACE_LACKS_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+qQqq#include <netinet/in.h>
+          
+int main() {
+
+           sockaddr_in ace_sin;
+           ace_sin.sin_len = sizeof(ace_sin);
+          
+; return 0; }
+EOF
+if { (eval echo configure:13409: \"$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" = yes; 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:13440: 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 13446 "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:13463: \"$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" = yes; 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:13494: 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 13500 "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:13515: \"$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" = yes; 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:13546: 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 13552 "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:13567: \"$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" = yes; 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:13593: 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 13598 "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:13624: \"$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
+
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+  
+  echo $ac_n "checking if compiler accepts \"pragma once\" directive""... $ac_c" 1>&6
+echo "configure:13662: 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 13668 "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:13679: \"$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" = yes; 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
+    
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+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:13722: 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 13728 "configure"
+#include "confdefs.h"
+
+int main() {
+int a = 0;
+; return 0; }
+EOF
+if { (eval echo configure:13735: \"$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" = yes; 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:13769: 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 13776 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:13783: \"$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:13817: 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 13824 "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:13835: \"$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 13839 "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:13850: \"$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 13870 "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:13886: \"$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:13914: 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 13922 "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:13936: \"$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:13962: 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 13970 "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:13984: \"$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:14010: 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 14018 "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:14032: \"$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:"
+  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:14058: 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 14066 "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:14080: \"$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:14111: 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 14119 "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:14133: \"$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:14159: 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 14167 "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:14181: \"$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:14212: 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 14220 "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:14234: \"$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:14265: 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 14273 "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:14287: \"$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:14325: 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 14333 "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:14347: \"$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 working C++ explicit template destructors""... $ac_c" 1>&6
+echo "configure:14376: 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 14382 "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:14429: \"$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" = yes; 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 C++ \"using\" keyword support""... $ac_c" 1>&6
+echo "configure:14460: 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 14466 "configure"
+#include "confdefs.h"
+
+#include <iostream.h>
+                  
+int main() {
+
+                   using namespace std;
+                  
+; return 0; }
+EOF
+if { (eval echo configure:14477: \"$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" = yes; 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 C++ standard namespace""... $ac_c" 1>&6
+echo "configure:14508: 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 14514 "configure"
+#include "confdefs.h"
+
+#include <vector.h>
+                   
+int main() {
+
+                     std::vector< int > iv;
+                   
+; return 0; }
+EOF
+if { (eval echo configure:14525: \"$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" = yes; 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 new style C++ include file support""... $ac_c" 1>&6
+echo "configure:14556: 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 14564 "configure"
+#include "confdefs.h"
+
+#include <string>
+        
+int main() {
+
+         std::string str;
+        
+; return 0; }
+EOF
+if { (eval echo configure:14575: \"$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 14585 "configure"
+#include "confdefs.h"
+
+#include <string>
+        
+int main() {
+
+         string str;
+        
+; return 0; }
+EOF
+if { (eval echo configure:14596: \"$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" = yes; 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
+
+
+
+  echo $ac_n "checking for ANSI C++ cast support""... $ac_c" 1>&6
+echo "configure:14628: 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
+  
+    cat > conftest.$ac_ext <<EOF
+#line 14634 "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:14659: \"$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 14676 "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:14697: \"$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*
+  
+fi
+
+  echo "$ac_t""$ace_cv_lib_posix_standard_casts" 1>&6
+  if test "$ace_cv_lib_posix_standard_casts" = yes; then
+    ace_just_a_place_holder=fixme
+
+   cat >> confdefs.h <<\EOF
+#define ACE_HAS_ANSI_CASTS 1
+EOF
+
+   if test "$ace_cv_lib_rtti" = no; 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 platform supports explicit template instantiation""... $ac_c" 1>&6
+echo "configure:14745: checking if platform supports explicit template instantiatio
+  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 14751 "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:14770: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; 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" = yes; 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 if platform supports pragma template instantiation""... $ac_c" 1>&6
+echo "configure:14801: checking if platform supports 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 14807 "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:14826: \"$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" = yes; 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 on platform""... $ac_c" 1>&6
+echo "configure:14860: checking if templates require source on platform" >&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.$ac_ext <<EOF
+#line 14866 "configure"
+#include "confdefs.h"
+
+/*
+#include "config/trs.h"
+*/
+                
+int main() {
+
+                  Foo<int> foo(15);
+                
+; return 0; }
+EOF
+if { (eval echo configure:14879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+                 ace_cv_feature_templates_require_source=no
+                
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                 ace_cv_feature_templates_require_source=yes
+                
+fi
+rm -f conftest*
+  
+fi
+
+  echo "$ac_t""$ace_cv_feature_templates_require_source" 1>&6
+  if test "$ace_cv_feature_templates_require_source" = yes; then
+    ace_just_a_place_holder=fixme
+
+   cat >> confdefs.h <<\EOF
+#define ACE_TEMPLATES_REQUIRE_SOURCE 1
+EOF
+
+  
+  else
+    ace_jus_a_place_holder=fixme
+  fi
+
+
+
+if test X$ace_cv_feature_templates_require_source = Xyes; then
+  TEMPLATES_REQUIRE_SOURCE_TRUE=
+  TEMPLATES_REQUIRE_SOURCE_FALSE='#'
+else
+  TEMPLATES_REQUIRE_SOURCE_TRUE='#'
+  TEMPLATES_REQUIRE_SOURCE_FALSE=
+fi
+
+
+  echo $ac_n "checking if platform supports template specialization""... $ac_c" 1>&6
+echo "configure:14921: checking if platform supports template specialization" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_posix_template_specialization'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 14927 "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:14952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    ace_cv_feature_posix_template_specialization=yes
+                   
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    ace_cv_feature_posix_template_specialization=no
+                   
+fi
+rm -f conftest*
+  
+fi
+
+  echo "$ac_t""$ace_cv_feature_posix_template_specialization" 1>&6
+  if test "$ace_cv_feature_posix_template_specialization" = yes; 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 if platform supports typename keyword""... $ac_c" 1>&6
+echo "configure:14983: checking if platform supports 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 14989 "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:15025: \"$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" = yes; 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 if platform supports template typedefs""... $ac_c" 1>&6
+echo "configure:15056: checking if platform supports 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 15062 "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:15105: \"$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" = yes; 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 if platform supports static data member templates""... $ac_c" 1>&6
+echo "configure:15136: checking if platform supports 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 15142 "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:15159: \"$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" = yes; 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
+
+
+if test "$ace_user_enable_exceptions" = yes; then
+  
+  echo $ac_n "checking if platform supports C++ exceptions""... $ac_c" 1>&6
+echo "configure:15192: checking if platform supports 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 15198 "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:15216: \"$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" = yes; 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 
+                          
+if test "$ac_cv_header_new" = yes &&
+   test "$ac_cv_header_iomanip" = yes &&
+   test "$ac_cv_header_auto_ptr" = yes; then
+  cat >> confdefs.h <<\EOF
+#define ACE_HAS_STANDARD_CPP_LIBRARY 1
+EOF
+
+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:15262: 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 15267 "configure"
+#include "confdefs.h"
+#include <alloca.h>
+int main() {
+char *p = alloca(2 * sizeof(int));
+; return 0; }
+EOF
+if { (eval echo configure:15274: \"$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:15295: 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 15300 "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:15328: \"$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:15360: 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 15365 "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 -
+
+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:15390: 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 15395 "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:15421: \"$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:15448: 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 15456 "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:15478: \"$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:15514: 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 15522 "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:15531: \"$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
+EF
+
+fi
+
+
+echo $ac_n "checking for getpwnam""... $ac_c" 1>&6
+echo "configure:15555: 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 15560 "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:15586: \"$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:15605: 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 15610 "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:15636: \"$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:15655: 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 15660 "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:15686: \"$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:15705: 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 15710 "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:15736: \"$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:15766: 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 15771 "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:15797: \"$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:15819: 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 15827 "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:15841: \"$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:15871: 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 15876 "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:15902: \"$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:15926: 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 15931 "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:15957: \"$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:15981: checking for TryEnterCriticalSection" >&5
+if eval "test \"`echo '$''{'ac_cv_func_TryEnterCriticalSection'+set}'`\" = set";
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 15986 "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:16012: \"$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:16040: 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 16045 "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:16071: \"$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:16096: 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 16101 "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:16127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -sconftest${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:16152: 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 16157 "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:16183: \"$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:16210: 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 16215 "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:16241: \"$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:16271: 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 16276 "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:16302: \"$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:16327: 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 16332 "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:16358: \"$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:16383: 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 16388 "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:16414: \"$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:16438: 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 16443 "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:16469: \"$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:16490: 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 16495 "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:16521: \"$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:16546: 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 16551 "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:16577: \"$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
+
+  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:16594: 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 16605 "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:16635: \"$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" = yes; 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:16673: 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 16678 "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:16704: \"$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:16721: 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 16732 "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:16772: \"$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" = yes; 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:16813: 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 16818 "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:16844: \"$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:16863: 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 16869 "configure"
+#include "confdefs.h"
+
+#include <sys/time.h>
+       
+int main() {
+
+        hrtime_t ace_hrtime_t;
+       
+; return 0; }
+EOF
+if { (eval echo configure:16880: \"$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" = yes; 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:16916: 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 16921 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char pread(); beow.  */
+#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:16947: \"$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:16962: 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 16967 "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:16993: \"$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:17021: 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 17026 "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:17052: \"$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:17076: 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 17081 "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:17107: \"$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:17131: 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 17136 "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:17162: \"$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:17185: 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 17190 "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:17216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; the
+  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:17241: 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 17246 "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:17272: \"$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:17297: 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 17302 "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:17328: \"$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:17353: 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 17358 "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:17384: \"$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 syscall""... $ac_c" 1>&6
+echo "configure:17409: 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 17414 "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:17440: \"$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:17465: 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 17470 "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:17496: \"$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:17520: 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 17525 "cnfigure"
+#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:17551: \"$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:17570: 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 17575 "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:17601: \"$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 clock_gettime""... $ac_c" 1>&6
+echo "configure:17629: checking for clock_gettime" >&5
+if eval "test \"`echo '$''{'ac_cv_func_clock_gettime'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17634 "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:17660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_clock_gettime=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_clock_gettime=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'clock_gettime`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    cat >> confdefs.h <<\EOF
+#define ACE_HAS_CLOCK_GETTIME 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+echo $ac_n "checking for fork""... $ac_c" 1>&6
+echo "configure:17684: 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 17689 "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:17715: \"$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:17740: 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 17745 "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:17771: \"$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:17787: 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 17792 "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) || define
+choke me
+#else
+setrlimit();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:17818: \"$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:17854: 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 17859 "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:17885: \"$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:17913: 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 17918 "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:17944: \"$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:17968: 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 17973 "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:17999: \"$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:18024: 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 18029 "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:18055: \"$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 recvmsg""... $ac_c" 1>&6
+echo "configure:18080: 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 18085 "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:18111: \"$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
+  ech "$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:18136: 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 18141 "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:18167: \"$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:18193: 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 18198 "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:18224: \"$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:18249: 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 18254 "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:18280: \"$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:18304: 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 18309 "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:18335: \"$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:18360: 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 18365 "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:18391: \"$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:18419: 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 18424 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char msync(); bel
+#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:18450: \"$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:18475: 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 18480 "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:18506: \"$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:18531: 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 18536 "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:18562: \"$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:18587: 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 18592 "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:18618: \"$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:18643: 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 18648 "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:18674: \"$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:18700: 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 18705 "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:18731: \"$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 if platform defines priocntl as a macro""... $ac_c" 1>&6
+echo "configure:18757: checking if platform defines priocntl as a 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 18763 "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" = yes; 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:18803: 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 18808 "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:18834: \"$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:18859: 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 18864 "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:18890: \"$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:18911: 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 18916 "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:18942: \"$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:18963: 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 18968 "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:18994: \"$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:19015: 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 19020 "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 alia
+#if defined (__stub_semctl) || defined (__stub___semctl)
+choke me
+#else
+semctl();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:19046: \"$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:19067: 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 19072 "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:19098: \"$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:19119: 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 19124 "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:19150: \"$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:19171: 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 19176 "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:19202: \"$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:19223: 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 19228 "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:19254: \"$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:19275: 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 19280 "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:19306: \"$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:19327: 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 19332 "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:19358: \"$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:19379: 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 19384 "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:19410: \"$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:19434: 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 19439 "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:19465: \"$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:19489: 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 19494 "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:19520: \"$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:19545: 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 19550 "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:19576: \"$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:19601: 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 19606 "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___r
+choke me
+#else
+recv_timedwait();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:19632: \"$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:19656: 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 19661 "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:19687: \"$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:19711: 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 19716 "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:19742: \"$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:19766: 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 > contest.$ac_ext <<EOF
+#line 19771 "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:19797: \"$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:19821: 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 19826 "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:19852: \"$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:19876: 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 19881 "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:19907: \"$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:19931: 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 19936 "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:19962: \"$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:19986: 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 19991 "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:20017: \"$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:20041: 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 20046 "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:20072: \"$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:20096: 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 20101 "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:20127: \"$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:20151: 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 20156 "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:20182: \"$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:20201: 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 20206 "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:20232: \"$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:20251: 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 20256 "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:20282: \"$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:20301: 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 20306 "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();
+#endi
+
+; return 0; }
+EOF
+if { (eval echo configure:20332: \"$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:20374: 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 20379 "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:20405: \"$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
+      cat >> confdefs.h <<\EOF
+#define ACE_HAS_PTHREAD_SIGMASK 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  echo $ac_n "checking for pthread_key_create""... $ac_c" 1>&6
+echo "configure:20429: 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 20434 "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:20460: \"$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_setpshared""... $ac_c" 1>&6
+echo "configure:20488: 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 20493 "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:20519: \"$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:20544: 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 20549 "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:20575: \"$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 20603 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:20610: \"$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:20646: 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:20653: 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 20658 "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:20684: \"$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 20713 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:20720: \"$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:20756: 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:20763: checking for
+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 20768 "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:20794: \"$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:20820: 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 20825 "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:20851: \"$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:20876: 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 20881 "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:20907: \"$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:20932: 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 20937 "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:20963: \"$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:20988: 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 20993 "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:21019: \"$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_setschedplicy""... $ac_c" 1>&6
+echo "configure:21037: 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 21042 "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:21068: \"$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:21095: 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 21100 "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:21126: \"$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:21151: 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 21156 "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:21182: \"$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:21207: 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 21212 "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:21238: \"$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:21257: 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 21262 "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:21288: \"$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_p
+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:21307: 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 21312 "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:21338: \"$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:21357: 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 21362 "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:21388: \"$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:21407: 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 21412 "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 agument 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:21438: \"$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:21457: 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 21462 "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:21488: \"$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:21507: 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 21512 "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:21538: \"$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:21557: 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 21562 "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:21588: \"$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:21607: 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 21612 "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:21638: \"$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:21657: 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 21662 "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:21688: \"$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:21707: 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 21712 "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:21738: \"$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:21757: 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 21762 "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:21788: \"$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:21807: 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 21812 "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>
+
+#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:21838: \"$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:21857: 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 21862 "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:21888: \"$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:21907: 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 21912 "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:21938: \"$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:21957: 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 21962 "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:21988: \"$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:22007: 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 22012 "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:22038: \"$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:22057: 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 22062 "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:22088: \"$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:22107: 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 22112 "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:22138: \"$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:22157: 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 22162 "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:22188: \"$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:22207: 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 22212 "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:22238: \"$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 22261 "configure"
+#include "confdefs.h"
+
+#include <pthread.h>
+    
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:22268: \"$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:22304: 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:22311: 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 22316 "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_func
+choke me
+#else
+$ace_real_function();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22342: \"$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:22360: 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 22365 "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:22391: \"$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 if platform defines a minimum thread priority""... $ac_c" 1>&6
+echo "configure:22422: checking if platform defines a 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 22429 "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 22441 "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 if platform defines a maximum thread priority""... $ac_c" 1>&6
+echo "configure:22462: checking if platform defines a 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 22479 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "PTHREA_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 22491 "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:22514: 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 22519 "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:22545: \"$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:22573: 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 22578 "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:22604: \"$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:22628: 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 22633 "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:22659: \"$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:22683: 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 22688 "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:22714: \"$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:22733: 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 22738 "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:22764: \"$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:22794: 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 22799 "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:22825: \"$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:22851: 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 22856 "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:22882: \"$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:22903: 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 22908 "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 f
+    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:22934: \"$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:22955: 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 22960 "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:22986: \"$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:23011: 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 23016 "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:23042: \"$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:23063: 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 23068 "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:23094: \"$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:23115: 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 23120 "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:23146: \"$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:23167: 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 23172 "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:23198: \"$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:23219: 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 23224 "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:23250: \"$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:23271: 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 23276 "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:23302: \"$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:23323: 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 23328 "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:23354: \"$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:23375: 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 23380 "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:23406: \"$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:23427: 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 23432 "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:23458: \"$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:23479: 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 23484 "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 us
+    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:23510: \"$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:23535: 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 23540 "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:23566: \"$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:23591: 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 23596 "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:23622: \"$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
+
+
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -error"
+  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:23659: 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 23665 "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:23678: \"$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 23689 "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:23702: \"$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" = yes; 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 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  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:23751: 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 23757 "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:23773: \"$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" = yes; 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 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+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:23811: 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 23822 "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:23859: \"$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" = yes; 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:23893: 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 23904 "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:23941: \"$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" = yes; 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 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  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:23984: 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 23990 "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:24006: \"$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" = yes; 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 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+ 
+  echo $ac_n "checking if select takes int instead of fd_set""... $ac_c" 1>&6
+echo "configure:24052: 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 24058 "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;
+      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:24085: \"$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 24096 "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;
+         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:24123: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+echo $ac_n "checking if setrlimit() takes an enum as 1st parameter (a)""... $ac_c" 1>&6
+echo "configure:24163: checking if setrlimit() takes an enum as 1st parameter (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 24170 "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:24179: \"$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 parameter (b)""... $ac_c" 1>&6
+echo "configure:24193: checking if setrlimit() takes an enum as 1st parameter (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 24200 "configure"
+#include "confdefs.h"
+#include <sys/resource.h>
+int main() {
+enum __rlimit_resource rsrc;
+       struct rlimit* rlp;
+       setr
+; return 0; }
+EOF
+if { (eval echo configure:24209: \"$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
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+echo $ac_n "checking if setrlimit() takes a const pointer as 2nd parameter (a)""... $ac_c" 1>&6
+echo "configure:24240: checking if setrlimit() takes a const pointer as 2nd parameter (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 24246 "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:24259: \"$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 parameter (b)""... $ac_c" 1>&6
+echo "configure:24279: checking if setrlimit() takes a const pointer as 2nd parameter (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 24286 "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:24295: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+if test "$ac_cv_func_getrusage" = yes; then
+  
+  echo $ac_n "checking if getrusage() takes an enum as 1st parameter""... $ac_c" 1>&6
+echo "configure:24325: checking if getrusage() takes an enum as 1st parameter" >&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 24331 "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:24344: \"$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" = yes; 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
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+   CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if select takes a const fifth parameter""... $ac_c" 1>&6
+echo "configure:24384: checking if select takes a const fifth parameter" >&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 24390 "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;
+       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:24415: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+if test "$ace_cv_struct_msghdr" = yes &&
+   test "$ac_cv_func_sendmsg" = yes; then
+ 
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+   
+ 
+  echo $ac_n "checking if sendmsg omits the const from the second parameter""... $ac_c" 1>&6
+echo "configure:24463: checking if sendmsg omits the const from the second parameter" >&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 24469 "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:24489: \"$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" = yes; 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
+
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ fi 
+if test "$ac_cv_header_sys_uio_h" = yes &&
+   test "$ac_cv_func_writev" = yes; then
+ 
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+   
+ 
+  echo $ac_n "checking if writev omits the const from the iovec parameter""... $ac_c" 1>&6
+echo "configure:24536: checking if writev omits the const from the iovec parameter" >&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 24542 "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:24563: \"$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" = yes; 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
+
+ 
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ fi 
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if socket size is denoted by size_t""... $ac_c" 1>&6
+echo "configure:24609: 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 24615 "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:24632: \"$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 24643 "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:24660: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking for (struct sockaddr *) msg_name field""... $ac_c" 1>&6
+echo "configure:24708: 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 24714 "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:24731: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if setsockopt() takes a char* fourth parameter""... $ac_c" 1>&6
+echo "configure:24777: checking if setsockopt() takes a char* fourth parameter" >&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 24783 "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:24806: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if setsockopt() takes a void* fourth parameter""... $ac_c" 1>&6
+echo "configure:24851: checking if setsockopt() takes a void* fourth parameter" >&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 24857 "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:24880: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if mmap() takes a void* first argument""... $ac_c" 1>&6
+echo "configure:24925: 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 24931 "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:24957: \"$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" = yes; then
+    ace_just_a_
+cat >> confdefs.h <<\EOF
+#define ACE_HAS_VOIDPTR_MMAP 1
+EOF
+
+  else
+    ace_just_a_place_holder=fixme
+  fi
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+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:24995: 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 25001 "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:25025: \"$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 25036 "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:25059: \"$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" = yes; 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 if platform has iostream method ipfx()""... $ac_c" 1>&6
+echo "configure:25093: checking if platform has 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 25099 "configure"
+#include "confdefs.h"
+
+#include <iostream.h>
+      
+int main() {
+
+       cin.ipfx();
+      
+; return 0; }
+EOF
+if { (eval echo configure:25110: \"$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" = yes; 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 if platform has line-buffered streambufs""... $ac_c" 1>&6
+echo "configure:25142: checking if platform has 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 25148 "configure"
+#include "confdefs.h"
+
+#include <iostream.h>
+      
+int main() {
+
+       cin.rdbuf()->linebuffered(1);
+      
+; return 0; }
+EOF
+if { (eval echo configure:25159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+       ace_cv_feature_has_linebuffered_streambuf=yes
+      
+else
+  echo "configure: faile 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" = yes; 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 if platform has unbuffered streambufs""... $ac_c" 1>&6
+echo "configure:25191: checking if platform has 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 25197 "configure"
+#include "confdefs.h"
+
+#include <iostream.h>
+      
+int main() {
+
+       cin.rdbuf()->unbuffered(1);
+      
+; return 0; }
+EOF
+if { (eval echo configure:25208: \"$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" = yes; 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 parameter""... $ac_c" 1>&6
+echo "configure:25239: checking if signal takes a void (*)(int) as second parameter" >&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 25245 "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:25261: \"$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 parameter""... $ac_c" 1>&6
+echo "configure:25281: checking if signal takes a void (*)(void) as second parameter" >&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 25287 "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:25301: \"$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 parameter""... $ac_c" 1>&6
+echo "configure:25321: checking if signal takes a void (*)(int, ...) as second parameter" >&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 25327 "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:25341: \"$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 parameter""... $ac_c" 1>&6
+echo "configure:25361: checking if signal takes a void (*)(...) as second parameter" >&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 25367 "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:25381: \"$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:25401: 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 25407 "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:25422: \"$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:25442: 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 25448 "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:25463: \"$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:25483: 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 25489 "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:25501: \"$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:25521: 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 25527 "configure"
+#include "confdefs.h"
+
+#include <signal.h>
+       typedef void (*SA)(...);
+      
+int main() {
+
+       SA oo = signal(SIGINT, 0);
+      
+; return 0; }
+EOF
+if { (eval echo configure:25539: \"$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:25560: 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 25566 "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:25582: \"$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:25602: 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 25608 "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:25624: \"$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:25644: 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 25650 "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:25666: \"$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:25686: checking if struct sigaction takes a void (*)(...) handler" >&5
+if eval "test
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 25692 "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:25708: \"$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 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if msgsnd() takes a struct msgbuf* second parameter""... $ac_c" 1>&6
+echo "configure:25737: checking if msgsnd() takes a struct msgbuf* second parameter" >&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 25743 "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:25764: \"$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" = yes; 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 parameter""... $ac_c" 1>&6
+echo "configure:25791: checking if msgsnd() takes a const void* second parameter" >&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 25797 "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:25818: \"$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" = yes; 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
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+echo $ac_n "checking if msgrcv() takes a void* second parameter""... $ac_c" 1>&6
+echo "configure:25869: checking if msgrcv() takes a void* second parameter" >&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 25875 "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:25897: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+echo $ac_n "checking if shmat() takes a void* second parameter""... $ac_c" 1>&6
+echo "configure:25931: checking if shmat() takes a void* second parameter" >&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 25937 "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:25954: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+echo $ac_n "checking if sigaction() takes a const* second parameter""... $ac_c" 1>&6
+echo "configure:25988: checking if sigaction() takes a const* second parameter" >&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 25994 "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:26008: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  echo $ac_n "checking if wait() takes a (union wait *) rather than int *""... $ac_c" 1>&6
+echo "configure:26035: 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 26041 "configure"
+#include "confdefs.h"
+
+#include <sys/wait.h>
+       
+int main() {
+
+        int* status;
+        int result;
+        result=wait(status);
+       
+; return 0; }
+EOF
+if { (eval echo configure:26054: \"$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 26065 "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:26078: \"$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" = yes; 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
+
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+echo $ac_n "checking if gettimeofday() takes a void * second argument""... $ac_c" 1>&6
+echo "configure:26121: 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 26127 "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:26144: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+if test "$ace_cv_lib_voidptr_gettimeofday" = no; then
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+  echo $ac_n "checking if gettimeofday() takes a timzeone * second argument""... $ac_c" 1>&6
+echo "configure:26179: 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 26185 "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:26202: \"$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
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 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:26231: 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 26237 "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" = yes; 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 parameters""... $ac_c" 1>&6
+echo "configure:26302: checking if ctime_r() takes two parameters" >&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 26308 "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:26329: \"$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" = yes; 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:26364: 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 26370 "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:26385: \"$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" = yes; 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:26413: 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 26419 "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:26434: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+         ace_cv_lib_posix_st
+        
+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" = yes; 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:26468: 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 26474 "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" = yes; 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:26516: 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 26522 "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 26547 "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:26566: \"$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 26576 "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:26595: \"$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 26606 "configure"
+#include "confdefs.h"
+
+#ifdef 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:26621: \"$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" = yes; 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:26679: 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 26687 "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:26708: \"$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 if platform defines ctime() as a macro""... $ac_c" 1>&6
+echo "configure:26740: checking if platform defines ctime() as a 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 26746 "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" = yes; 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 if platform defines some reentrant functions as macros""... $ac_c" 1>&6
+echo "configure:26791: checking if platform defines some reentrant functions as 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 26797 "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" = yes; 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 if platform defines sig{empty fill add del}set as macros""... $ac_c" 1>&6
+echo "configure:26853: checking if platform defines sig{empty fill add del}set as 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 26859 "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" = yes; 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:26907: 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 26913 "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" = yes; 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:26973: 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 26979 "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" = yes; 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 if platform defines MAP_FAILED as a long constant""... $ac_c" 1>&6
+echo "configure:27024: checking if platform defines MAP_FAILED as 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 27030 "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" = yes; 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
+  fi
+
+
+
+  echo $ac_n "checking if platform supports SO_SNDBUF/SO_RCVBUF socket options""... $ac_c" 1>&6
+echo "configure:27068: checking if platform supports 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 27074 "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" = yes; 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 if platform calls init/fini automatically""... $ac_c" 1>&6
+echo "configure:27122: checking if platform calls init/fini automatically" >&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" = yes; 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:27153: checking for recursive thread exit semantics" >&5
+  if eval "test \"`echo '$''{
+  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" = yes; 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
+
+if test "$ace_has_aio_funcs" = yes; then
+  
+  echo $ac_n "checking for asynchronous IO calls""... $ac_c" 1>&6
+echo "configure:27179: checking for asynchronous IO calls" >&5
+  if eval "test \"`echo '$''{'ace_cv_feature_aio_calls'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 27185 "configure"
+#include "confdefs.h"
+
+#include <aio.h>
+        
+int main() {
+
+         aiocb* aiocb_ptr (void);
+        
+; return 0; }
+EOF
+if { (eval echo configure:27196: \"$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*
+    
+fi
+
+  echo "$ac_t""$ace_cv_feature_aio_calls" 1>&6
+  if test "$ace_cv_feature_aio_calls" = yes; 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
+  fi
+
+fi 
+
+  echo $ac_n "checking for UNIX domain sockets""... $ac_c" 1>&6
+echo "configure:27227: 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 27233 "configure"
+#include "confdefs.h"
+
+#include <sys/un.h>
+      
+int main() {
+
+       sockaddr_un su;
+      
+; return 0; }
+EOF
+if { (eval echo configure:27244: \"$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" = yes; 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:27276: 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" = yes; 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:27305: 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 27311 "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:27325: \"$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 -r conftest*
+  
+       cat > conftest.$ac_ext <<EOF
+#line 27336 "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:27350: \"$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" = yes; 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 platform runs on an Alpha""... $ac_c" 1>&6
+echo "configure:27384: checking if platform runs 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" = yes; 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 platform runs on a Power PC""... $ac_c" 1>&6
+echo "configure:27422: checking if platform runs 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" = yes; 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 platform runs on a Pentium(tm) processor""... $ac_c" 1>&6
+echo "configure:27462: checking if platform runs 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" = yes; 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
+
+
+  TEMPCXXFLAGS=""
+  if test -n "$GXX"; then
+    TEMPCXXFLAGS="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -Werror"
+  fi
+
+  
+
+  echo $ac_n "checking if platform requires _GNU_SOURCE for getpgid definition""... $ac_c" 1>&6
+echo "configure:27511: checking if platform requires _GNU_SOURCE for getpgid definition" >&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 27517 "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:27530: \"$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 27541 "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:27556: \"$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" = yes; then
+    ace_just_a_place_holder=fixme
+cat >> confdefs.h <<\EOF
+#define _GNU_SOURCE 1
+EOF
+
+  else
+    ace_just_a_place_holder=fixme
+  fi
+
+
+
+  if test -n "$TEMPCXXFLAGS"; then
+    CXXFLAGS="$TEMPCXXFLAGS"
+  fi
+
+ 
+
+  echo $ac_n "checking if platform only supports SCHED_OTHER scheduling policy""... $ac_c" 1>&6
+echo "configure:27596: checking if platform only supports SCHED_OTHER 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 27602 "configure"
+#include "confdefs.h"
+
+#ifdef ACE_HAS_PTHREADS
+# include <pthread.h>
+#elif defined (ACE_HAS_STHREADS)
+# include <thread.h>
+#endif
+
+#if defined (ACE_LACKS_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)
+          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*
+  
+       ace_cv_feature_only_have_sched_other=no
+      
+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" = yes; 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
+
+
+
+
+
+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:27727: 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:27795: 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
+
+EOF
+
+  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 >> condefs.h <<\EOF
+#define HPUX_11 1
+EOF
+
+    cat > conftest.$ac_ext <<EOF
+#line 28035 "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 28183 "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 28206 "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 28227 "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 28279 "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 28445 "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"
+CXXCPPFLAGS="$ACE_CXXCPPFLAGS $CXXCPPFLAGS"
+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:28523: 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
+
+ 
+            
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I. -I${srcdir}"
+
+ cat > conftest.$ac_ext <<EOF
+#line 28544 "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:28557: \"$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="$save_CXXFLAGS"
+ CFLAGS="$save_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" = yes; 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:28600: 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
+
+ 
+            
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I. -I${srcdir}"
+
+ cat > conftest.$ac_ext <<EOF
+#line 28621 "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:28634: \"$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*
+                    
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I. -I${srcdir}"
+
+ cat > conftest.$ac_ext <<EOF
+#line 28650 "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:28664: \"$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="$save_CXXFLAGS"
+ CFLAGS="$save_CFLAGS"
+
+
+        
+fi
+rm -f conftest*
+
+  CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_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" = yes; 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
+ech
+  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
+
+ 
+            
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I. -I${srcdir}"
+
+ cat > conftest.$ac_ext <<EOF
+#line 28735 "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:28748: \"$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*
+                    
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -I. -I${srcdir}"
+
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I. -I${srcdir}"
+
+ cat > conftest.$ac_ext <<EOF
+#line 28764 "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:28778: \"$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="$save_CXXFLAGS"
+ CFLAGS="$save_CFLAGS"
+
+
+        
+fi
+rm -f conftest*
+
+  CXXFLAGS="$save_CXXFLAGS"
+ CFLAGS="$save_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" = yes; 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
+
+
+
+
+
+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 ad 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 "
+           ace-config
+           ace-diff-config
+           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%@RANLIB@%$RANLIB%g
+s%@LD@%$LD%g
+s%@NM@%$NM%g
+s%@USE_SYMBOL_UNDERSCORE@%$USE_SYMBOL_UNDERSCORE%g
+s%@LIBTOOL@%$LIBTOOL%g
+s%@DLLTOOL@%$DLLTOOL%g
+s%@AS@%$AS%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%@TEMPLATES_REQUIRE_SOURCE_TRUE@%$TEMPLATES_REQUIRE_SOURCE_TRUE%g
+s%@TEMPLATES_REQUIRE_SOURCE_FALSE@%$TEMPLATES_REQUIRE_SOURCE_FALSE%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-"           ace-config
+           ace-diff-config
+          "}
+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
+
+
+
+echo ""
+echo "Configuration of ACE is now complete."
+echo ""
diff --git a/configure.in b/configure.in
index bdc03b11319..6b58261789e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl
 dnl $Id$
 
-AC_REVISION($Revision 0.60 $)dnl
+AC_REVISION($Revision 0.53 $)dnl
 
 dnl
 dnl An autoconf script to automatically configure ACE.
@@ -41,13 +41,6 @@ AC_INIT(ace/ACE.cpp)
 dnl Require GNU Autoconf 2.13 or better.
 AC_PREREQ(2.13)
 
-dnl If we are configuring in a CVS controlled directory then don't
-dnl continue any further.  The idea is to prevent automatically
-dnl generated files from being checked into the repository.  This
-dnl will prevent accidental overwrites of ACE's current Makefiles by
-dnl the automatically generated ones, for example.
-ACE_CHECK_FOR_CVS_DIR
-
 dnl Check what platform we are running on.
 AC_CANONICAL_SYSTEM
 
@@ -136,11 +129,11 @@ AC_SUBST(ACE_AGE)
 AC_SUBST(ACE_REVISION)
 
 dnl Do the usual install settings; don't forget to include a
-dnl `install-sh' script, in case there is no BSD compatible `install'
+dnl install-sh script, in case the is no BDS compatible install
 dnl installed (no pun intended) in your machine.
 dnl 
-dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AC_PROG_INSTALL.
-dnl       -- Ossama
+dnl We don't need this anymore since AM_INIT_AUTOMAKE calls AM_PROG_INSTALL
+dnl yes "AM_PROG_INSTALL," not "AC_PROG_INSTALL." -- Ossama
 dnl AC_PROG_INSTALL
 
 dnl Special handling for some UNIX variants and Cygwin32
@@ -179,16 +172,29 @@ AC_CHECK_PROG(GPERF, gperf, gperf) dnl
 dnl Check for profiling progam
 AC_CHECK_PROGS(PROF, gprof prof,) dnl
 
+dnl Call ACE_SET_COMPILER_FLAGS before AM_PROG_LIBTOOL
+ACE_SET_COMPILER_FLAGS
+
+dnl Since we are linking ACE with the C++ compiler, and since
+dnl libtool checks linker characteristics using the C compiler,
+dnl temporarily state that the C compiler is the C++ compiler.
+save_CC="$CC"
+CC="$CXX"
+
+dnl Disable building of static libraries by default
+AM_DISABLE_STATIC
+
+dnl Check for libtool and turn on Automake processing for Libtool
+AM_PROG_LIBTOOL
+
+
+dnl Restore the C compiler variable
+CC="$save_CC"
+
 dnl
 dnl SECTION 2: Configure script command line options
 dnl
 
-dnl Added maintainer mode option to the option list
-AM_MAINTAINER_MODE
-
-dnl Determine which subsets to build
-dnl This is done using the autoconf "--enable-foobar" mechanism.
-ACE_CHECK_SUBSETS
 
 AC_ARG_ENABLE(debug,
               [  --enable-debug          enable debugging                [default=yes]],
@@ -274,7 +280,7 @@ AC_ARG_ENABLE(inline,
                esac
               ],
               [
-               AC_DEFINE(__ACE_INLINE__)
+               AC_DEFINE(__ACE_INLINE__) 
               ])
 
 AC_ARG_ENABLE(log-msg-prop,
@@ -515,7 +521,7 @@ AC_ARG_ENABLE(rtti,
                   if test -z "$GXX"; then
                     case "$target" in
                       *solaris*)
-                           ace_user_enable_rtti=yes
+                           ACE_CXXFLAGS="$ACE_CXXFLAGS -features=rtti"
                            ;;
                       *)
                            ;;
@@ -659,7 +665,8 @@ AC_ARG_WITH(gperf,
                  AC_MSG_WARN(existing gperf may be overwritten during installation)
                fi
               ])
-AM_CONDITIONAL(COMPILE_GPERF, test X$ace_user_with_gperf = Xyes)
+AM_CONDITIONAL(COMPILE_GPERF,
+               test X$ace_user_with_gperf = Xyes)
 
 AC_ARG_WITH(orbix,
               [  --with-orbix[=DIR]      compile ACE with Orbix          [default=no]],
@@ -695,10 +702,6 @@ AC_ARG_WITH(tli-device,
                esac
               ],)
 
-dnl Call ACE_SET_COMPILER_FLAGS before AC_PROG_LIBTOOL and after the 
-dnl AC_ARG_ENABLE and AC_ARG_WITH calls.
-ACE_SET_COMPILER_FLAGS
-
 dnl
 dnl SECTION 3: check for programs <--- moved before section 2 (Ossama)
 dnl
@@ -870,39 +873,64 @@ dnl Some platforms do not have a dynamic linking library, however the
 dnl dlopen, dlclose, etc., functions may exist in the C library.
 dnl (e.g. Digital UNIX)
 dnl Check for dynamic linking library
-ACE_SEARCH_LIBS(dlopen, dl svld, ace_has_svr4_dynamic_linking=yes, dnl
-  [
-   ace_has_svr4_dynamic_linking=no
-   AC_CHECK_LIB(dld, shl_get,,)
-  ])
+AC_CHECK_FUNC(dlopen, ace_has_svr4_dynamic_linking=yes, dnl
+  AC_CHECK_LIB(dl, dlopen,
+    [
+     ace_has_svr4_dynamic_linking=yes
+     LIBS="$LIBS -ldl"
+    ],
+    AC_CHECK_LIB(svld, dlopen,
+      [
+       ace_has_svr4_dynamic_linking=yes
+       LIBS="$LIBS -lsvld"
+      ],
+      AC_CHECK_LIB(dld, shl_get,,))))
 
 dnl Check if the socket library is available
-ACE_SEARCH_LIBS(socket, socket,,)dnl
+AC_CHECK_FUNC(socket, , dnl
+  AC_CHECK_LIB(socket, socket,,))
 
 dnl Check for gethostbyname in -lnsl since some platforms (e.g. Solaris)
 dnl put it there.
-ACE_SEARCH_LIBS(gethostbyname, nsl, , )dnl
+AC_CHECK_FUNC(gethostbyname, , dnl
+  AC_CHECK_LIB(nsl, gethostbyname,,))
 
 dnl Check for getservbyname in -lxnet since some platforms (e.g. Solaris)
-dnl may put it there.
-ACE_SEARCH_LIBS(getservbyname, xnet, , AC_DEFINE(ACE_LACKS_GETSERVBYNAME))dnl
-
+dnl may put it there.  Define ACE_LACKS_GETSERVBYNAME in case the getservbyname
+dnl AC_CHECK_FUNC gets skipped due to caching.
+AC_CHECK_FUNC(getservbyname, , dnl
+  AC_CHECK_LIB(xnet, getservbyname,,
+    AC_DEFINE(ACE_LACKS_GETSERVBYNAME)))
 
 dnl Check for compile() regex function in -lgen.  Solaris, for example,
 dnl may put it there.
-ACE_SEARCH_LIBS(compile, gen,,)dnl
+AC_CHECK_FUNC(compile, , dnl
+  AC_CHECK_LIB(gen, compile, ,))
 
 dnl Check for exception handling library (e.g. for Digital UNIX)
-ACE_SEARCH_LIBS(exc_continue, exc,,)dnl
+AC_CHECK_FUNC(exc_continue, , dnl
+  AC_CHECK_LIB(exc, exc_continue, ,))
 
 dnl Check for ctime_r in -lc_r.  Some platforms, such as Digital UNIX,
 dnl put reentrant functions such as asctime_r, ctime_r, gmtime_r, and
 dnl localtime_r in -lc_r.
-ACE_SEARCH_LIBS(ctime_r, c_r,,)dnl
+AC_CHECK_FUNC(ctime_r, , dnl
+  AC_CHECK_LIB(c_r, ctime_r, ,))
 
 dnl TLI library check
-ACE_SEARCH_LIBS(t_accept, xti tli_r tli nsl, dnl
-  ace_has_tli_funcs=yes, ace_has_tli_funcs=no)
+ace_has_tli_funcs=yes
+AC_CHECK_FUNC(t_accept, , dnl
+  AC_CHECK_LIB(xti, t_accept, ,
+    AC_CHECK_LIB(tli_r, t_accept, ,
+      AC_CHECK_LIB(tli, t_accept, ,
+        AC_CHECK_LIB(nsl, t_accept, ,ace_has_tli_funcs=no)))))
+
+dnl Asynchronous IO library check
+dnl Some platforms, such as Solaris puts aio_read in -lposix4, for example.
+ace_has_aio_funcs=yes
+AC_CHECK_FUNC(aio_read, , dnl
+  AC_CHECK_LIB(aio, aio_read, ,
+    AC_CHECK_LIB(posix4, aio_read, , ace_has_aio_funcs=no)))
 
 dnl Check for all of the things we need to compile and link threads
 dnl properly.
@@ -912,40 +940,12 @@ fi dnl test "$ace_user_enable_threads" = yes
 
 dnl Check for sched_yield() in posix4 library.
 dnl Some platforms, such as Solaris, may define sched_yield() there.
-dnl Later we run AC_CHECK_FUNC(sched_yield), which is redundant in this case
+dnl Later we run AC_CHECK_FUNC(sched_yield), which is redundant i this case
 dnl but is needed if sched_yield() is defined in one of the other libraries
 dnl we check for.
-ACE_SEARCH_LIBS(sched_yield, posix4, ace_has_sched_yield=yes,)dnl
-
-dnl Check for asynchronous IO calls
-ACE_CHECK_ASYNCH_IO
-
-dnl Additional `-lposix4' library check since it may not be added by the
-dnl above checks on some platforms that may need it
-ACE_SEARCH_LIBS(clock_gettime, posix4, AC_DEFINE(ACE_HAS_CLOCK_GETTIME),)dnl
-
-dnl Setup Libtool
-dnl
-dnl This should be done in the "programs" section of this file but compiler
-dnl potentially set by the thread checks will have been missed by libtool
-dnl if the libtool setup was done prior to the thread checks.
+AC_CHECK_FUNC(sched_yield, ace_has_sched_yield=yes, dnl
+  AC_CHECK_LIB(posix4, sched_yield, ace_has_sched_yield=yes,))
 
-dnl Disable building of static libraries by default
-AC_DISABLE_STATIC
-
-dnl Enable Libtool module support
-AC_LIBTOOL_DLOPEN
-
-dnl FIXME: Temporary hack to make libtool work with g++.
-dnl        Shared library support will only work with GNU g++ and GNU ld
-dnl        right now.
-save_CC="$CC"
-CC="$CXX"
-
-dnl Check for libtool and turn on Automake processing for Libtool
-AC_PROG_LIBTOOL
-
-CC="$save_CC"
 
 dnl
 dnl SECTION 5: checks for header files
@@ -964,7 +964,7 @@ fi
 dnl Check for sys/wait.h Posix.1 compliance
 AC_HEADER_SYS_WAIT
 
-if test "$ac_cv_cygwin" = yes; then
+if test "$am_cv_cygwin32" = yes; then
   AC_CHECK_HEADER(cygwin32/socket.h, dnl
      AC_DEFINE(ACE_HAS_CYGWIN32_SOCKET_H),)
 fi
@@ -1044,44 +1044,8 @@ AC_CHECK_HEADER(sys/param.h, dnl
 
 AC_CHECK_HEADER(sys/priocntl.h, ,)
 
-dnl Check for <ucontext.h> _before_ <sys/procfs.h>
-AC_CHECK_HEADER(ucontext.h, dnl
-  ,
-  AC_DEFINE(ACE_LACKS_UCONTEXT_H))
-
 AC_CHECK_HEADER(sys/procfs.h, dnl
-  [
-   dnl Check if <sys/procfs.h> conflicts with <ucontext.h>
-   dnl Some (early?) versions of glibc2.1 define the same variables
-   dnl in <sys/procfs.h> and <ucontext.h>.
-   ACE_CACHE_CHECK(if sys/procfs.h conflicts with ucontext.h,
-     ace_has_procfs_conflict,
-     [
-      AC_TRY_COMPILE(
-        [
-#ifndef ACE_LACKS_UCONTEXT_H
-# include <ucontext.h>
-#endif
-
-#include <sys/procfs.h>
-        ],
-        [
-         int a = 0;
-        ],
-        [
-         ace_has_procfs_conflict=no
-        ],
-        [
-         ace_has_procfs_conflict=yes
-        ])
-     ],
-     [
-     ],
-     [
-      dnl If ace_has_procfs_conflict = no then define ACE_HAS_PROC_FS.
-      AC_DEFINE(ACE_HAS_PROC_FS)
-     ])
-  ],)
+  AC_DEFINE(ACE_HAS_PROC_FS))
 
 AC_CHECK_HEADER(sys/select.h, dnl
   AC_DEFINE(ACE_HAS_SELECT_H))
@@ -1279,7 +1243,16 @@ dnl Check for t_errno type in TLI headers
      [
       ace_cv_lib_has_t_errno=no
      ])
-  ], , AC_DEFINE(ACE_LACKS_T_ERRNO))
+  ],
+  [
+   dnl Do not define ACE_HAS_BROKEN_T_ERRNO if t_errno isn't declared in a
+   dnl header since ACE's definition of _terrno needs a previously declared
+   dnl t_errno.
+   AC_CHECK_FUNC(_terrno, , AC_DEFINE(ACE_HAS_BROKEN_T_ERRNO))
+  ],
+  [
+   AC_DEFINE(ACE_LACKS_T_ERRNO)
+  ])
 
 fi dnl test "$ace_has_tli" = yes
 fi dnl test "$ace_has_tli_funcs" = yes
@@ -1349,6 +1322,10 @@ AC_CHECK_HEADER(unistd.h, dnl
   ,
   AC_DEFINE(ACE_LACKS_UNISTD_H))
 
+AC_CHECK_HEADER(ucontext.h, dnl
+  ,
+  AC_DEFINE(ACE_LACKS_UCONTEXT_H))
+
 AC_CHECK_HEADER(utime.h, dnl
   AC_DEFINE(ACE_HAS_UTIME),)
 
@@ -1386,7 +1363,7 @@ dnl TODO: Double check the above comment.
 AC_CHECK_HEADER(cstring, dnl
   AC_DEFINE(ACE_HAS_GNU_CSTRING_H),)
 
-AC_CHECK_HEADER(memory,,) dnl
+AC_CHECK_HEADER(auto_ptr,,) dnl
 
 AC_CHECK_HEADER(map, dnl
 [
@@ -1445,7 +1422,7 @@ AC_CHECK_HEADER(queue, dnl
 ],)
 
 dnl Check for availablity of "new style" C++ stream headers
-AC_CHECK_HEADERS(iomanip ios iostream istream ostream fstream streambuf, dnl
+AC_CHECK_HEADERS(iomanip ios iostream istream ostream fstream streambuf,
   ,
   AC_DEFINE(ACE_USES_OLD_IOSTREAMS))
 
@@ -1455,7 +1432,7 @@ AC_CHECK_HEADER(iostream.h, dnl
 
 dnl Check if platform needs to #include <sched.h> to get thread 
 dnl scheduling defs.
-ACE_CACHE_CHECK(sched.h for thread scheduling definitions,
+ACE_CACHE_CHECK(if platform needs sched.h for thread scheduling definitions,
    ace_cv_needs_sched_h,[
    AC_EGREP_HEADER(sched_yield, sched.h,
      [
@@ -1464,11 +1441,11 @@ ACE_CACHE_CHECK(sched.h for thread scheduling definitions,
      [
       ace_cv_needs_sched_h=no
      ])
-   ], AC_DEFINE(ACE_NEEDS_SCHED_H),)
+   ], AC_DEFINE(ACE_LACKS_SCHED_H),)
 
 dnl Check if platform needs to #include <regexpr.h> for
 dnl regular expression support
-ACE_CACHE_CHECK(regexpr.h for regular expression support,
+ACE_CACHE_CHECK(if platform needs regexpr.h for regular expression support,
    ace_cv_needs_regexpr_h, [
    AC_EGREP_HEADER(compile, regexpr.h,
      [
@@ -1652,7 +1629,7 @@ ACE_CHECK_TYPE(key_t, sys/types.h, ,AC_DEFINE(ACE_LACKS_KEY_T))
 ACE_CHECK_TYPE(ssize_t, sys/types.h, AC_DEFINE(ACE_HAS_SSIZE_T),)
 ACE_CHECK_TYPE(u_longlong_t, sys/types.h, , AC_DEFINE(ACE_LACKS_U_LONGLONG_T))
 ACE_CHECK_TYPE(pri_t, sys/types.h, ,AC_DEFINE(ACE_LACKS_PRI_T))
-ACE_CHECK_TYPE(socklen_t, sys/socket.h, AC_DEFINE(ACE_HAS_SOCKLEN_T),)
+ACE_CHECK_TYPE(socklen_t, sys/socket.h, AC_DEFIE(ACE_HAS_SOCKLEN_T),)
 ACE_CHECK_TYPE(ucontext_t, ucontext.h, AC_DEFINE(ACE_HAS_UCONTEXT_T),)
 ACE_CHECK_TYPE(wchar_t, wchar.h, AC_DEFINE(ACE_HAS_XPG4_MULTIBYTE_CHAR),
   [
@@ -1993,7 +1970,7 @@ ACE_CACHE_CHECK(for sin_len member in struct sockaddr_in,
 #ifndef ACE_LACKS_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#include <netinet/in.h>
+qQqq#include <netinet/in.h>
           ],
           [
            sockaddr_in ace_sin;
@@ -2238,56 +2215,6 @@ fi dnl test "$cross_compiling" != yes
 
 dnl Other checks
 
-
-dnl Check for istream operator>> for char, unsigned char and signed char
-ACE_CACHE_CHECK(for istream operator>> for char types,
-  ace_cv_feature_char_right_shifts,
-  [
-   AC_TRY_COMPILE([
-#include <iostream.h>
-                  ],
-                  [
-unsigned char a = 0;
-cin >> a;
-
-#ifndef ACE_LACKS_SIGNED_CHAR
-signed char b = 0;
-cin >> b;
-#endif
-                  ],
-                  [
-                   ace_cv_feature_char_right_shifts=yes
-                  ],
-                  [
-                   ace_cv_feature_char_right_shifts=no
-                  ])
-  ], , AC_DEFINE(ACE_LACKS_CHAR_RIGHT_SHIFTS))
-
-
-dnl Check for istream operator>> for char *, unsigned char * and signed char *
-ACE_CACHE_CHECK(for istream operator>> for char * types,
-  ace_cv_feature_char_ptr_right_shifts,
-  [
-   AC_TRY_COMPILE([
-#include <iostream.h>
-                  ],
-                  [
-unsigned char * a = 0;
-cin >> a;
-
-#ifndef ACE_LACKS_SIGNED_CHAR
-signed char * b = 0;
-cin >> b;
-#endif
-                  ],
-                  [
-                   ace_cv_feature_char_ptr_right_shifts=yes
-                  ],
-                  [
-                   ace_cv_feature_char_ptr_right_shifts=no
-                  ])
-  ], , AC_DEFINE(ACE_LACKS_CHAR_STAR_RIGHT_SHIFTS))
-
 dnl Check if we have working C++ explicit template destructors
 dnl Thanks to Nanbor Wang <nanbor@cs.wustl.edu> for providing this test.
 ACE_CACHE_CHECK(for working C++ explicit template destructors,
@@ -2343,66 +2270,32 @@ class Derived
                   ])
   ], AC_DEFINE(ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR),)
 
-dnl Check for working C++ conversions
-ACE_CACHE_CHECK(for working C++ conversions,
-  ace_cv_feature_cxx_working_conversions,
-  [
-   AC_TRY_COMPILE([
-                   template <class T>
-                   class Foo
-                   {
-                    public:
-                      Foo (void) { ace_ptr = 0; }
-                      operator T * (void) { return ace_ptr; }
-
-                    private:
-                      T * ace_ptr;
-                   };
-                  ],
-                  [
-                   Foo<char> Bar;
-
-                   Foo<char> * Bar_ptr = &Bar;
-
-                   char * p = Bar_ptr->operator char * ();
-                  ],
-                  [
-                   ace_cv_feature_cxx_working_conversions=yes
-                  ],
-                  [
-                   ace_cv_feature_cxx_working_conversions=no
-                  ])
-  ], , AC_DEFINE(ACE_HAS_BROKEN_CONVERSIONS))
-
-dnl Check for C++ namespace support
-ACE_CACHE_CHECK(for C++ namespace support,
-  ace_cv_feature_cxx_namespaces,
+dnl Checkfor C++ "using" keyword support
+ACE_CACHE_CHECK(for C++ \"using\" keyword support,
+  ace_cv_feature_cxx_using_keyword,
   [
    AC_TRY_COMPILE([
-                   namespace ACE
-                   {
-                     int x;
-                   }
+#include <iostream.h>
                   ],
                   [
-                   ACE::x = 0;
+                   using namespace std;
                   ],
                   [
-                   ace_cv_feature_cxx_namespaces=yes
+                   ace_cv_feature_cxx_using_keyword=yes
                   ],
                   [
-                   ace_cv_feature_cxx_namespaces=no
+                   ace_cv_feature_cxx_using_keyword=no
                   ])
-  ], , AC_DEFINE(ACE_HAS_BROKEN_NAMESPACES))
+  ], AC_DEFINE(ACE_HAS_USING_KEYWORD),)
 
 dnl Check for C++ standard namespace
 ACE_CACHE_CHECK(for C++ standard namespace,
   ace_cv_feature_posix_uses_std_namespace,[
     AC_TRY_COMPILE([
-#include <iostream.h>
+#include <vector.h>
                    ],
                    [
-                    std::cout << "FOO" << endl;
+                     std::vector< int > iv;
                    ],
                    [
                     ace_cv_feature_posix_uses_std_namespace=yes
@@ -2412,44 +2305,6 @@ ACE_CACHE_CHECK(for C++ standard namespace,
                    ])
   ], AC_DEFINE(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB),)
 
-dnl Check for C++ "using" keyword support
-ACE_CACHE_CHECK(for C++ \"using\" keyword support,
-  ace_cv_feature_cxx_using_keyword,
-  [
-   AC_TRY_COMPILE([
-#if defined (ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB)
-# include <iostream.h>
-#elif !defined (ACE_HAS_BROKEN_NAMESPACES)
-  namespace ACE
-  {
-   int x;
-  }
-#endif
-                  ],
-                  [
-#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
-                  ],
-                  [
-                   ace_cv_feature_cxx_using_keyword=yes
-                  ],
-                  [
-                   ace_cv_feature_cxx_using_keyword=no
-                  ])
-  ], AC_DEFINE(ACE_HAS_USING_KEYWORD),)
-
 dnl Check for new style C++ include file support
 ACE_CACHE_CHECK(for new style C++ include file support,
   ace_cv_lib_posix_standard_includes,[
@@ -2479,44 +2334,9 @@ ACE_CACHE_CHECK(for new style C++ include file support,
    AC_DEFINE(ACE_HAS_STRING_CLASS)
   ],)
 
-dnl Check whether platform supports the standard C++ library
-dnl TODO: For now, check whether headers <new>, <iomanip>
-dnl       and <memory> exist; is there a better way?
-if test "$ac_cv_header_new" = yes &&
-   test "$ac_cv_header_iomanip" = yes &&
-   test "$ac_cv_header_memory" = yes; then
-
-  dnl Check for auto_ptr class
-  ACE_CACHE_CHECK(for C++ auto_ptr class,
-    ace_cv_lib_auto_ptr_class,
-    [
-     AC_TRY_COMPILE(
-       [
-#include <memory>
-       ],
-       [
-#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
-        std::auto_ptr<int> Foo;
-#else
-        auto_ptr<int> Foo;
-#endif
-       ],
-       [
-        ace_cv_lib_auto_ptr_class=yes
-       ],
-       [
-        ace_cv_lib_auto_ptr_class=no
-       ])
-    ],
-    [
-     AC_DEFINE(ACE_HAS_STANDARD_CPP_LIBRARY)
-    ],)
-fi
-
 dnl Check for ANSI C++ cast support
 ACE_CACHE_CHECK(for ANSI C++ cast support,
   ace_cv_lib_posix_standard_casts,[
-   ACE_CONVERT_WARNINGS_TO_ERRORS([
     AC_TRY_COMPILE(
       [/* No headers */],
       [
@@ -2568,64 +2388,43 @@ ACE_CACHE_CHECK(for ANSI C++ cast support,
           ace_cv_lib_posix_standard_casts=no
          ])
       ])
-   ])
   ],
   [
    AC_DEFINE(ACE_HAS_ANSI_CASTS)
-   if test "$ace_cv_lib_rtti" != yes; then
+   if test "$ace_cv_lib_rtti" = no; then
      AC_DEFINE(ACE_LACKS_RTTI)
    fi
   ],)
 
-dnl Check if const char * can be rvalue in conditional operator
-ACE_CACHE_CHECK(if const char * can be rvalue in conditional operator,
-  ace_cv_feature_conditional_str_cast,
-  [
-   AC_TRY_COMPILE(,
-                  [
-                   const char * foo = 0;
-                   const char * bar = 0;
-
-                   const char * ace = ((1 < 2) ? foo : bar);
-                  ],
-                  [
-                   ace_cv_feature_conditional_str_cast=yes
-                  ],
-                  [
-                   ace_cv_feature_conditional_str_cast=no
-                  ])
-  ], , AC_DEFINE(ACE_HAS_BROKEN_CONDITIONAL_STRING_CASTS))
-
 dnl Check if platform supports explicit template instantiation
-ACE_CACHE_CHECK(for explicit template instantiation,
+ACE_CACHE_CHECK(if platform supports explicit template instantiation,
   ace_cv_feature_explicit_template_instantiation,[
-    AC_TRY_LINK([
-                 template <class T>
-                 class Foo
-                 {
-                 public:
-                   Foo(T bar) : bar_(bar) {};
-                 private:
-                   T bar_;
-                 };
-
-                 template class Foo<int>;
-                ],
-                [
-                 Foo<int> foo(11);
-                ],
-                [
-                 ace_cv_feature_explicit_template_instantiation=yes
-                ],
-                [
-                 ace_cv_feature_explicit_template_instantiation=no
-                ])
+    AC_TRY_COMPILE([
+                    template <class T>
+                    class Foo
+                    {
+                    public:
+                      Foo(T bar) : bar_(bar) {};
+                    private:
+                      T bar_;
+                    };
+                    template class Foo<int>;
+                   ],
+                   [
+                    Foo<int> foo(11);
+                   ],
+                   [
+                    ace_cv_feature_explicit_template_instantiation=yes
+                   ],
+                   [
+                    ace_cv_feature_explicit_template_instantiation=no
+                   ])
   ],
   [
    AC_DEFINE(ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
   ],
   [
-   ACE_CACHE_CHECK(for pragma template instantiation,
+   ACE_CACHE_CHECK(if platform supports pragma template instantiation,
      ace_cv_feature_pragma_template_instantiation,[
        AC_TRY_COMPILE([
                        template <class T>
@@ -2652,176 +2451,62 @@ ACE_CACHE_CHECK(for explicit template instantiation,
 
 dnl Check if templates require source on platform
 dnl FIXME:  This test may be broken.
-ACE_CACHE_CHECK(if templates require source,
-  ace_cv_feature_templates_require_source,
-  [
-   dnl Create the common header file
-   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
-
-   dnl Create template source test file 1
-   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
-
-   dnl Create the Main test file
-   cat > conftestMain.$ac_ext <<EOF
-#include "conftest.h"
-int main ()
-{
- Foo<int> foo (15);
-
- return 0;
-}
-EOF
-
-   ace_save_ac_link="$ac_link"
-
-   dnl Command to link two C++ files
-   ac_link='${CXX-g++} -o conftest${ac_exeext} conftestMain.$ac_ext 1>&AC_FD_CC'
-
-   dnl Now try to link them
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-     rm -rf conftest*
-     dnl Restore the original link variable NOW not later
-     ac_link="$ace_save_ac_link"
-
-     dnl Template source is not required
-     ace_cv_feature_templates_require_source=no
-   else
-     dnl Now try including the template source
-     cat >> conftestMain.$ac_ext <<EOF
-
-#include "conftest.$ac_ext"
-EOF
-
-     if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-       rm -rf conftest*
-       dnl Restore the original link variable NOW not later
-       ac_link="$ace_save_ac_link"
-
-       dnl Template source is required!
-       ace_cv_feature_templates_require_source=yes
-     else
-       dnl if we get then we have no idea what is needed!
-       echo "configure: failed program was:" >&AC_FD_CC
-       echo "conftest.h:" >&AC_FD_CC
-       cat conftest.h >&AC_FD_CC
-       echo "conftest.$ac_ext:" >&AC_FD_CC
-       cat conftest.$ac_ext >&AC_FD_CC
-       echo "conftestMain.$ac_ext:" >&AC_FD_CC
-       cat conftestMain.$ac_ext >&AC_FD_CC
-       rm -rf conftest*
-       dnl Restore the original link variable NOW not later
-       ac_link="$ace_save_ac_link"
-
-       ace_cv_feature_templates_require_source=no
-     fi
-   fi
-   rm -f conftest*
+ACE_CACHE_CHECK(if templates require source on platform,
+  ace_cv_feature_templates_require_source,[
+    AC_TRY_LINK([
+/*
+#include "config/trs.h"
+*/
+                ],
+                [
+                  Foo<int> foo(15);
+                ],
+                [
+                 ace_cv_feature_templates_require_source=no
+                ],
+                [
+                 ace_cv_feature_templates_require_source=yes
+                ])
   ],
   [
    AC_DEFINE(ACE_TEMPLATES_REQUIRE_SOURCE)
   ],)
+AM_CONDITIONAL(TEMPLATES_REQUIRE_SOURCE,
+               test X$ace_cv_feature_templates_require_source = Xyes)
 
 dnl Check if platform supports template specialization
-ACE_CACHE_CHECK(for template specialization,
-  ace_cv_feature_cxx_template_specialization,[
+ACE_CACHE_CHECK(if platform supports template specialization,
+  ace_cv_feature_posix_template_specialization,[
     AC_TRY_COMPILE([
-// 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;
-};
+                    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_;
+                    };
                    ],
                    [
-Vector<int> vi;
-Vector<void *> vpv;
+                    Foo<int> foo(11);
                    ],
                    [
-                    ace_cv_feature_cxx_template_specialization=yes
+                    ace_cv_feature_posix_template_specialization=yes
                    ],
                    [
-                    dnl Try the "old" test if the "proper" test failed
-                    AC_TRY_COMPILE(
-                      [
-                       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_;
-                       };
-                      ],
-                      [
-                       Foo<int> foo(11);
-                      ],
-                      [
-                       ace_cv_feature_cxx_template_specialization=yes
-                      ],
-                      [
-                       ace_cv_feature_cxx_template_specialization=no
-                      ])
+                    ace_cv_feature_posix_template_specialization=no
                    ])
   ], AC_DEFINE(ACE_HAS_TEMPLATE_SPECIALIZATION),)
 
 dnl Check if platform supports typename keyword
-ACE_CACHE_CHECK(for C++ typename keyword,
+ACE_CACHE_CHECK(if platform supports typename keyword,
   ace_cv_feature_posix_typename_keyword,[
     AC_TRY_COMPILE([
                      class Bar
@@ -2863,7 +2548,7 @@ ACE_CACHE_CHECK(for C++ typename keyword,
   ], AC_DEFINE(ACE_HAS_TYPENAME_KEYWORD),)
 
 dnl Check if platform supports template typedefs
-ACE_CACHE_CHECK(for template typedefs,
+ACE_CACHE_CHECK(if platform supports template typedefs,
   ace_cv_feature_posix_template_typedefs,[
     AC_TRY_COMPILE([
 #if defined (ACE_HAS_TYPENAME_KEYWORD)
@@ -2912,16 +2597,15 @@ ACE_CACHE_CHECK(for template typedefs,
   ], AC_DEFINE(ACE_HAS_TEMPLATE_TYPEDEFS),)
 
 dnl Check if platform supports static data member templates
-ACE_CACHE_CHECK(for static data member templates,
+ACE_CACHE_CHECK(if platform supports static data member templates,
   ace_cv_feature_posix_static_data_member_templates,[
     AC_TRY_COMPILE([
                      template <class T>
                      class Foo
                      {
                      public:
-                       static T* sdm;
+                         static T* sdm;
                      };
-
                      template <class T> T* Foo<T>::sdm = 0;
                    ],
                    [
@@ -2935,75 +2619,9 @@ ACE_CACHE_CHECK(for static data member templates,
                    ])
   ], ,AC_DEFINE(ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES))
 
-dnl Check if compiler needs definitions for hidden functions
-ACE_CACHE_CHECK(if definition is needed for hidden functions,
-  ace_cv_feature_need_func_def,
-  [
-   AC_TRY_LINK(
-     [
-      class Foo
-      {
-       public:
-         Foo (void) { a_ = 0; }
-       private:
-         Foo (const Foo &);
-         void operator= (const Foo &);
-
-         int a_;
-      };
-     ],
-     [
-       Foo Bar;
-     ],
-     [
-      ace_cv_feature_need_func_def=no
-     ],
-     [
-      AC_TRY_LINK(
-        [
-         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;
-         }
-        ],
-        [
-         Foo Bar;
-        ],
-        [
-         ace_cv_feature_need_func_def=yes
-        ],
-        [
-         dnl If we get here then we don't know what is needed!
-         ace_cv_feature_need_func_def=no
-        ])
-     ])
-  ],
-  [
-   AC_DEFINE(ACE_NEEDS_FUNC_DEFINITIONS)
-  ],)
-
-dnl Check if platform supports C++ exceptions
+dnl if platform supports C++ exceptions
 if test "$ace_user_enable_exceptions" = yes; then
-  ACE_CACHE_CHECK(for C++ exceptions,
+  ACE_CACHE_CHECK(if platform supports C++ exceptions,
     ace_cv_feature_posix_exceptions,[
       AC_TRY_COMPILE(,
                      [
@@ -3044,6 +2662,15 @@ dnl   [
    dnl AC_DEFINE(ACE_HAS_NONSTATIC_OBJECT_MANAGER)
 dnl   ],)
 
+dnl Check whether platform supports the standard C++ library
+dnl TODO: For now, check whether headers <new> and <iomanip>
+dnl       and <auto_ptr> exist; is there a better way?
+if test "$ac_cv_header_new" = yes &&
+   test "$ac_cv_header_iomanip" = yes &&
+   test "$ac_cv_header_auto_ptr" = yes; then
+  AC_DEFINE(ACE_HAS_STANDARD_CPP_LIBRARY)
+fi
+
 
 dnl
 dnl SECTION 10: checks for library functions
@@ -3136,6 +2763,11 @@ AC_CHECK_FUNC(getmsg, dnl
 
 AC_CHECK_FUNC(gethostbyaddr,,) dnl
 
+dnl We already check for getservbyname during the library checks.
+dnl AC_CHECK_FUNC(getservbyname, dnl
+dnl   ,
+dnl   AC_DEFINE(ACE_LACKS_GETSERVBYNAME))
+
 AC_CHECK_FUNC(difftime, dnl
   ,
   AC_DEFINE(ACE_LACKS_DIFFTIME))
@@ -3282,6 +2914,9 @@ if test "$ac_cv_func_alarm" != yes &&
   AC_DEFINE(ACE_LACKS_UNIX_SIGNALS)
 fi
 
+AC_CHECK_FUNC(clock_gettime, dnl
+  AC_DEFINE(ACE_HAS_CLOCK_GETTIME),)
+
 AC_CHECK_FUNC(fork, dnl
   ,
   AC_DEFINE(ACE_LACKS_FORK))
@@ -3314,10 +2949,6 @@ AC_CHECK_FUNC(readlink, dnl
   ,
   AC_DEFINE(ACE_LACKS_READLINK))
 
-AC_CHECK_FUNC(rename, dnl
-  ,
-  AC_DEFINE(ACE_LACKS_RENAME))
-
 AC_CHECK_FUNC(recvmsg, dnl
   ,
   AC_DEFINE(ACE_LACKS_RECVMSG))
@@ -3368,7 +2999,7 @@ if test "$ac_cv_header_sys_priocntl_h" = yes; then
 
 dnl Some platforms define priocntl as a macro!
   if test "$ac_cv_func_priocntl" = no; then
-    ACE_CACHE_CHECK(for priocntl macro,
+    ACE_CACHE_CHECK(if platform defines priocntl as a macro,
       ace_cv_lib_has_priocntl_macro,
       [
        AC_EGREP_CPP(ACE_PRIOCNTL_MACRO,
@@ -3536,19 +3167,12 @@ dnl backwards compatibility with Pthread Draft 4 functions of the same
 dnl name.
 
   AC_CHECK_FUNC(pthread_sigmask, dnl
-    ,
-    AC_DEFINE(ACE_LACKS_PTHREAD_SIGMASK))
+    AC_DEFINE(ACE_HAS_PTHREAD_SIGMASK),)
 
   AC_CHECK_FUNC(pthread_key_create, dnl
     AC_DEFINE(ACE_HAS_THREAD_SPECIFIC_STORAGE),
     AC_DEFINE(ACE_HAS_TSS_EMULATION))
 
-  AC_CHECK_FUNC(pthread_condattr_setkind_np, dnl
-    AC_DEFINE(ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP),)
-
-  AC_CHECK_FUNC(pthread_mutexattr_setkind_np, dnl
-    AC_DEFINE(ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP),)
-
   AC_CHECK_FUNC(pthread_condattr_setpshared, dnl
     ,
     AC_DEFINE(ACE_LACKS_CONDATTR_PSHARED))
@@ -3623,39 +3247,17 @@ dnl We already check for this during the library checks
 
 dnl Check if platform has thread_self() rather than pthread_self()
   ACE_CHECK_FUNC(pthread_self, pthread.h, dnl
-                 ,
-                 [
-                  AC_CHECK_FUNC(thread_self,
-                    [
-                     AC_DEFINE(ACE_HAS_THREAD_SELF)
-                    ],)
-                 ])
-
-dnl Check if pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
-dnl PTHREAD_PROCESS_SHARED values
-  ACE_CACHE_CHECK(for PTHREAD_PROCESS_* values in pthread.h,
-                  ace_cv_lib_pthread_process_enum,
-                  [
-                   AC_TRY_COMPILE(
-                     [
-#include <pthread.h>
-                     ],
-                     [
-int foo = PTHREAD_PROCESS_SHARED;
-                     ],
-                     [
-                      ace_cv_lib_pthread_process_enum=yes
-                     ],
-                     [
-                      ace_cv_lib_pthread_process_enum=no
-                     ])
-                  ],
-                  [
-                   AC_DEFINE(ACE_HAS_PTHREAD_PROCESS_ENUM)
-                  ],)
-                  
+                ,
+                [
+                 AC_CHECK_FUNC(thread_self,
+                   [
+                    AC_DEFINE(ACE_HAS_THREAD_SELF)
+                   ],)
+                ])
+
+
 dnl FIXME: These tests look sloppy to me.  -Ossama
-  AC_CACHE_CHECK(for minimum thread priority,
+  AC_CACHE_CHECK(if platform defines a minimum thread priority,
     ace_cv_lib_pthread_pthread_min_priority,[
       ace_cv_lib_pthread_pthread_min_priority=0
       AC_EGREP_HEADER(PTHREAD_MIN_PRIORITY, pthread.h,
@@ -3666,7 +3268,7 @@ dnl FIXME: These tests look sloppy to me.  -Ossama
   AC_DEFINE_UNQUOTED(ACE_THREAD_MIN_PRIORITY,
     $ace_cv_lib_pthread_pthread_min_priority)
 
-  AC_CACHE_CHECK(for maximum thread priority,
+  AC_CACHE_CHECK(if platform defines a maximum thread priority,
     ace_cv_lib_pthread_pthread_max_priority,[
       ace_cv_lib_pthread_pthread_max_priority=99
       case "$target" in
@@ -3985,7 +3587,7 @@ ACE_CONVERT_WARNINGS_TO_ERRORS([
 #endif
      ],
      [
-      int n = 0;
+      int n;
       fd_set* readfds = 0;
       fd_set* writefds = 0;
       fd_set* exceptfds = 0;
@@ -4013,7 +3615,7 @@ dnl Now check if select will actually take int* arguments
 #endif
         ],
         [
-         int n = 0;
+         int n;
          int* readfds = 0;
          int* writefds = 0;
          int* exceptfds = 0;
@@ -4034,8 +3636,8 @@ dnl Now check if select will actually take int* arguments
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
 
-dnl Check if setrlimit() takes an enum as 1st argument (a)
-AC_CACHE_CHECK(if setrlimit() takes an enum as 1st argument (a),
+dnl Check if setrlimit() takes an enum as 1st parameter (a)
+AC_CACHE_CHECK(if setrlimit() takes an enum as 1st parameter (a),
   ace_cv_lib_posix_setrlimit_enum_1_a,[
     ace_cv_lib_posix_setrlimit_enum_1_a=no
     AC_TRY_COMPILE([#include <sys/resource.h>],
@@ -4045,8 +3647,8 @@ AC_CACHE_CHECK(if setrlimit() takes an enum as 1st argument (a),
       ace_cv_lib_posix_setrlimit_enum_1_a=yes)
   ])
 
-dnl Check if setrlimit() takes an enum as 1st argument (b)
-AC_CACHE_CHECK(if setrlimit() takes an enum as 1st argument (b),
+dnl Check if setrlimit() takes an enum as 1st parameter (b)
+AC_CACHE_CHECK(if setrlimit() takes an enum as 1st parameter (b),
   ace_cv_lib_posix_setrlimit_enum_1_b,[
     ace_cv_lib_posix_setrlimit_enum_1_b=no
     AC_TRY_COMPILE([#include <sys/resource.h>],
@@ -4070,8 +3672,8 @@ dnl                                      -Ossama
 
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if setrlimit() takes a const pointer as 2nd argument (a)
-AC_CACHE_CHECK(if setrlimit() takes a const pointer as 2nd argument (a),
+dnl Check if setrlimit() takes a const pointer as 2nd parameter (a)
+AC_CACHE_CHECK(if setrlimit() takes a const pointer as 2nd parameter (a),
   ace_cv_lib_posix_setrlimit_const_2_a,[
     AC_TRY_COMPILE(
       [
@@ -4090,8 +3692,8 @@ AC_CACHE_CHECK(if setrlimit() takes a const pointer as 2nd argument (a),
       ])
   ])
 
-dnl Check if setrlimit() takes a const pointer as 2nd argument (b)
-AC_CACHE_CHECK(if setrlimit() takes a const pointer as 2nd argument (b),
+dnl Check if setrlimit() takes a const pointer as 2nd parameter (b)
+AC_CACHE_CHECK(if setrlimit() takes a const pointer as 2nd parameter (b),
   ace_cv_lib_posix_setrlimit_const_2_b,[
     ace_cv_lib_posix_setrlimit_const_2_b=no
     AC_TRY_COMPILE([#include <sys/resource.h>],
@@ -4107,9 +3709,9 @@ if test "$ace_cv_lib_posix_setrlimit_const_2_a" != yes &&
 fi
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
-dnl Check if getrusage() takes an enum as 1st argument
+dnl Check if getrusage() takes an enum as 1st parameter
 if test "$ac_cv_func_getrusage" = yes; then
-  ACE_CACHE_CHECK(if getrusage() takes an enum as 1st argument,
+  ACE_CACHE_CHECK(if getrusage() takes an enum as 1st parameter,
     ace_cv_lib_posix_getrusage_enum_1,[
       AC_TRY_COMPILE(
         [
@@ -4136,8 +3738,8 @@ dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
 dnl                                 -Ossama
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if select takes a const fifth argument
-ACE_CACHE_CHECK(if select takes a const fifth argument,
+dnl Check if select takes a const fifth parameter
+ACE_CACHE_CHECK(if select takes a const fifth parameter,
   ace_cv_lib_posix_select_const_5,[
     AC_TRY_COMPILE(
       [
@@ -4153,7 +3755,7 @@ ACE_CACHE_CHECK(if select takes a const fifth argument,
 #endif
       ],
       [
-       int n = 0;
+       int  n;
        fd_set *readfds;
        fd_set *writefds;
        fd_set *exceptfds;
@@ -4174,8 +3776,8 @@ if test "$ace_cv_struct_msghdr" = yes &&
    test "$ac_cv_func_sendmsg" = yes; then
  ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
  [
-dnl Check if sendmsg takes a const 2nd argument
- ACE_CACHE_CHECK(if sendmsg omits the const from the second argument,
+dnl Check if sendmsg takes a const 2nd parameter
+ ACE_CACHE_CHECK(if sendmsg omits the const from the second parameter,
   ace_cv_lib_broken_sendmsg,[
     AC_TRY_COMPILE(
       [
@@ -4208,8 +3810,8 @@ if test "$ac_cv_header_sys_uio_h" = yes &&
    test "$ac_cv_func_writev" = yes; then
  ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
  [
-dnl Check if writev omits the const from the iovec argument
- ACE_CACHE_CHECK(if writev omits the const from the iovec argument,
+dnl Check if writev omits the const from the iovec parameter
+ ACE_CACHE_CHECK(if writev omits the const from the iovec parameter,
   ace_cv_lib_broken_writev,[
     AC_TRY_COMPILE(
       [
@@ -4318,7 +3920,7 @@ ACE_CACHE_CHECK(for (struct sockaddr *) msg_name field,
 
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-ACE_CACHE_CHECK(if setsockopt() takes a char* fourth argument,
+ACE_CACHE_CHECK(if setsockopt() takes a char* fourth parameter,
   ace_cv_lib_posix_setsockopt_charp_4,[
     AC_TRY_COMPILE(
       [
@@ -4350,7 +3952,7 @@ ACE_CACHE_CHECK(if setsockopt() takes a char* fourth argument,
 
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-ACE_CACHE_CHECK(if setsockopt() takes a void* fourth argument,
+ACE_CACHE_CHECK(if setsockopt() takes a void* fourth parameter,
   ace_cv_lib_posix_setsockopt_voidp_4,[
     AC_TRY_COMPILE(
       [
@@ -4479,7 +4081,7 @@ ACE_CACHE_CHECK(if msync accepts a third "sync" argument,
 fi  dnl test "$ac_cv_func_msync" = yes
 
 dnl Check if platform has iostream method ipfx()
-ACE_CACHE_CHECK(for iostream method ipfx(),
+ACE_CACHE_CHECK(if platform has iostream method ipfx(),
   ace_cv_feature_has_iostream_ipfx,[
     AC_TRY_COMPILE(
       [
@@ -4497,7 +4099,7 @@ ACE_CACHE_CHECK(for iostream method ipfx(),
   ], , AC_DEFINE(ACE_LACKS_IOSTREAM_FX))
 
 dnl Check if platform has line-buffered streambufs
-ACE_CACHE_CHECK(for line-buffered streambufs,
+ACE_CACHE_CHECK(if platform has line-buffered streambufs,
   ace_cv_feature_has_linebuffered_streambuf,[
     AC_TRY_COMPILE(
       [
@@ -4515,9 +4117,9 @@ ACE_CACHE_CHECK(for line-buffered streambufs,
   ], , AC_DEFINE(ACE_LACKS_LINEBUFFERED_STREAMBUF))
 
 dnl Check if platform has unbuffered streambufs
-ACE_CACHE_CHECK(for unbuffered streambufs,
+ACE_CACHE_CHECK(if platform has unbuffered streambufs,
   ace_cv_feature_has_unbuffered_streambuf,[
-    AC_TRY_COMPILE(
+    A_TRY_COMPILE(
       [
 #include <iostream.h>
       ],
@@ -4532,8 +4134,8 @@ ACE_CACHE_CHECK(for unbuffered streambufs,
       ])
   ], , AC_DEFINE(ACE_LACKS_UNBUFFERED_STREAMBUF))
 
-dnl Check if signal takes a void (*)(int) as second argument
-AC_CACHE_CHECK(if signal takes a void (*)(int) as second argument,
+dnl Check if signal takes a void (*)(int) as second parameter
+AC_CACHE_CHECK(if signal takes a void (*)(int) as second parameter,
   ace_cv_lib_signal_vi1_2,[
     AC_TRY_COMPILE(
       [
@@ -4555,8 +4157,8 @@ AC_CACHE_CHECK(if signal takes a void (*)(int) as second argument,
       ])
   ])
 
-dnl Check if signal takes a void (*)(void) as second argument
-AC_CACHE_CHECK(if signal takes a void (*)(void) as second argument,
+dnl Check if signal takes a void (*)(void) as second parameter
+AC_CACHE_CHECK(if signal takes a void (*)(void) as second parameter,
   ace_cv_lib_signal_vv1_2,[
     AC_TRY_COMPILE(
       [
@@ -4576,8 +4178,8 @@ AC_CACHE_CHECK(if signal takes a void (*)(void) as second argument,
       ])
   ])
 
-dnl Check if signal takes a void (*)(int, ...) as second argument
-AC_CACHE_CHECK(if signal takes a void (*)(int, ...) as second argument,
+dnl Check if signal takes a void (*)(int, ...) as second parameter
+AC_CACHE_CHECK(if signal takes a void (*)(int, ...) as second parameter,
   ace_cv_lib_signal_vi1a2_2,[
     AC_TRY_COMPILE(
       [
@@ -4597,8 +4199,8 @@ AC_CACHE_CHECK(if signal takes a void (*)(int, ...) as second argument,
       ])
   ])
 
-dnl Check if signal takes a void (*)(...) as second argument
-AC_CACHE_CHECK(if signal takes a void (*)(...) as second argument,
+dnl Check if signal takes a void (*)(...) as second parameter
+AC_CACHE_CHECK(if signal takes a void (*)(...) as second parameter,
   ace_cv_lib_signal_va1_2,[
     AC_TRY_COMPILE(
       [
@@ -4802,8 +4404,8 @@ dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
 dnl                                 -Ossama
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if msgsnd() takes a struct msgbuf* second argument
-ACE_CACHE_CHECK(if msgsnd() takes a struct msgbuf* second argument,
+dnl Check if msgsnd() takes a struct msgbuf* second parameter
+ACE_CACHE_CHECK(if msgsnd() takes a struct msgbuf* second parameter,
   ace_cv_lib_posix_msgsnd_msgbufp_2,[
     AC_TRY_COMPILE(
       [
@@ -4833,8 +4435,8 @@ ACE_CACHE_CHECK(if msgsnd() takes a struct msgbuf* second argument,
    dnl "ACTIONS-IF-SUCCESSFUL" handled later in configure.in
   ],
   [
-   dnl Check if msgsnd() takes a const void* second argument
-   ACE_CACHE_CHECK(if msgsnd() takes a const void* second argument,
+   dnl Check if msgsnd() takes a const void* second parameter
+   ACE_CACHE_CHECK(if msgsnd() takes a const void* second parameter,
      ace_cv_lib_posix_msgsnd_cvoidp_2,[
        AC_TRY_COMPILE(
          [
@@ -4861,7 +4463,7 @@ ACE_CACHE_CHECK(if msgsnd() takes a struct msgbuf* second argument,
          ])
      ],
      [
-      dnl Do nothing if msgsnd takes a const void* second argument
+      dnl Do nothing if msgsnd takes a const void* second parameter
      ],
      [
       dnl If we get this far we presumably have a non-const void* second param
@@ -4878,8 +4480,8 @@ dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
 dnl                                 -Ossama
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if msgrcv() takes a void* second argument
-AC_CACHE_CHECK(if msgrcv() takes a void* second argument,
+dnl Check if msgrcv() takes a void* second parameter
+AC_CACHE_CHECK(if msgrcv() takes a void* second parameter,
   ace_cv_lib_posix_msgrcv_voidp_2,[
     AC_TRY_COMPILE(
       [
@@ -4916,8 +4518,8 @@ dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
 dnl                                 -Ossama
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if shmat() takes a void* second argument
-AC_CACHE_CHECK(if shmat() takes a void* second argument,
+dnl Check if shmat() takes a void* second parameter
+AC_CACHE_CHECK(if shmat() takes a void* second parameter,
   ace_cv_lib_posix_shmat_voidp_2,[
     AC_TRY_COMPILE(
       [
@@ -4949,8 +4551,8 @@ dnl FIXED by adding "-Werror" to compiler flags when using GNU C++
 dnl                                 -Ossama
 ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
-dnl Check if sigaction() takes a const* second argument
-AC_CACHE_CHECK(if sigaction() takes a const* second argument,
+dnl Check if sigaction() takes a const* second parameter
+AC_CACHE_CHECK(if sigaction() takes a const* second parameter,
   ace_cv_lib_posix_sigaction_constp_2,[
     AC_TRY_COMPILE(
       [
@@ -5112,9 +4714,9 @@ dnl We don't have a gettimeofday prototype
 fi dnl Check for gettimeofday() protoype
 
 
-dnl Check if ctime_r() takes two arguments
+dnl Check if ctime_r() takes two parameters
 if test "$ac_cv_func_ctime_r" = yes; then
-  ACE_CACHE_CHECK(if ctime_r() takes two arguments,
+  ACE_CACHE_CHECK(if ctime_r() takes two parameters,
     ace_cv_lib_posix_ctime_r_2_params,
     [
      AC_TRY_COMPILE(
@@ -5331,7 +4933,7 @@ if test "$cross_compiling" != yes; then
 fi
 
 dnl Check if platform defines ctime() as a macro
-ACE_CACHE_CHECK(for ctime() macro,
+ACE_CACHE_CHECK(if platform defines ctime() as a macro,
   ace_cv_feature_have_ctime_macro,
   [
    AC_EGREP_CPP(ACE_CTIME_MACRO,
@@ -5356,7 +4958,7 @@ ACE_CACHE_CHECK(for ctime() macro,
 
 dnl Check if platform defines ctime_r, asctime_r, rand_r or getpwnam_r
 dnl as macros.
-ACE_CACHE_CHECK(for reentrant function macros,
+ACE_CACHE_CHECK(if platform defines some reentrant functions as macros,
   ace_cv_feature_has_broken_r_routines,
   [
    AC_EGREP_CPP(ACE_R_MACROS,
@@ -5391,7 +4993,7 @@ ACE_CACHE_CHECK(for reentrant function macros,
   ], AC_DEFINE(ACE_HAS_BROKEN_R_ROUTINES),)
 
 dnl Check if platform defines sig{empty,fill,add,del}set as macros
-ACE_CACHE_CHECK(for sig{empty fill add del}set macros,
+ACE_CACHE_CHECK(if platform defines sig{empty fill add del}set as macros,
   ace_cv_feature_have_sig_macros,
   [
    AC_EGREP_CPP(ACE_SIG_MACROS,
@@ -5477,101 +5079,27 @@ ACE_CACHE_CHECK(for POSIX O_NONBLOCK semantics,
       ])
   ], AC_DEFINE(ACE_HAS_POSIX_NONBLOCK),)
 
-dnl Check for MAP_FAILED constant
-ACE_CACHE_CHECK(for MAP_FAILED constant,
-  ace_cv_lib_have_map_failed,[
-    dnl We need the square brackets around "ACEMAPFAILED.+[0-9]" to
+dnl Check if platform defines MAP_FAILED as a long constant
+ACE_CACHE_CHECK(if platform defines MAP_FAILED as a long constant,
+  ace_cv_feature_long_map_failed,[
+    dnl We need the square brackets around "ACEMAPFAILED.+[0-9]L" to
     dnl prevent the character class "[0-9]" from becoming "0-9" due to
     dnl M4 quoting.
-    AC_EGREP_CPP([ACEMAPFAILED.+[0-9]],
+    AC_EGREP_CPP([ACEMAPFAILED.+[0-9]L],
       [
 #include <sys/mman.h>
        ACEMAPFAILED MAP_FAILED
       ],
       [
-       ace_cv_lib_have_map_failed=yes
-      ],
-      [
-       ace_cv_lib_have_map_failed=no
-      ])
-  ],
-  [
-   dnl Check if platform defines MAP_FAILED as a long constant
-   ACE_CACHE_CHECK(if MAP_FAILED is a long constant,
-     ace_cv_feature_long_map_failed,[
-       dnl We need the square brackets around "ACEMAPFAILED.+[0-9]L" to
-       dnl prevent the character class "[0-9]" from becoming "0-9" due to
-       dnl M4 quoting.
-       AC_EGREP_CPP([ACEMAPFAILED.+[0-9]L],
-         [
-#include <sys/mman.h>
-          ACEMAPFAILED MAP_FAILED
-         ],
-         [
-          ace_cv_feature_long_map_failed=yes
-         ],
-         [
-          ace_cv_feature_long_map_failed=no
-         ])
-     ], AC_DEFINE(ACE_HAS_LONG_MAP_FAILED),
-     [
-      dnl Check if MAP_FAILED is _not_ cast to void *
-      ACE_CACHE_CHECK(if MAP_FAILED is not cast to void *,
-        ace_cv_have_broken_map_failed,[
-          AC_TRY_COMPILE(
-            [
-#include <sys/mman.h>
-            ],
-            [
-             void * foo = MAP_FAILED;
-            ],
-            [
-             ace_cv_have_broken_map_failed=no
-            ],
-            [
-             AC_TRY_COMPILE(
-               [
-#include <sys/mman.h>
-               ],
-               [
-                void * foo = (void *) MAP_FAILED;
-               ],
-               [
-                ace_cv_have_broken_map_failed=yes
-               ],
-               [
-                dnl If we get here then we have no idea what is wrong!
-                ace_cv_have_broken_map_failed=no
-               ])
-            ])
-        ], AC_DEFINE(ACE_HAS_BROKEN_MAP_FAILED),)
-     ])
-  ],)
-
-dnl Check if platform supports TCP_NODELAY support
-ACE_CACHE_CHECK(for TCP_NODELAY support,
-  ace_cv_feature_tcp_nodelay,[
-    AC_EGREP_CPP(ACE_TCPNODELAY,
-      [
-#ifndef ACE_LACKS_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#include <netinet/tcp.h>
-
-#if defined (TCP_NODELAY)
-       ACE_TCPNODELAY
-#endif
-      ],
-      [
-       ace_cv_feature_tcp_nodelay=yes
+       ace_cv_feature_long_map_failed=yes
       ],
       [
-       ace_cv_feature_tcp_nodelay=no
+       ace_cv_feature_long_map_failed=no
       ])
-  ], , AC_DEFINE(ACE_LACKS_TCP_NODELAY))
+  ], AC_DEFINE(ACE_HAS_LONG_MAP_FAILED),)
 
 dnl Check if platform supports SO_SNDBUF/SO_RCVBUF socket options
-ACE_CACHE_CHECK(for SO_SNDBUF/SO_RCVBUF socket options,
+ACE_CACHE_CHECK(if platform supports SO_SNDBUF/SO_RCVBUF socket options,
   ace_cv_feature_so_sndbuf_rcvbuf,[
     AC_EGREP_CPP(ACE_SO_BUF,
       [
@@ -5581,8 +5109,8 @@ ACE_CACHE_CHECK(for SO_SNDBUF/SO_RCVBUF socket options,
 #include <sys/socket.h>
 
 #if defined (SO_SNDBUF) && \
-    defined (SO_RCVBUF)
-       ACE_SO_BUF
+           defined (SO_RCVBUF)
+          ACE_SO_BUF
 #endif
       ],
       [
@@ -5598,7 +5126,7 @@ dnl have SVR4 dynamic linking since ACE doesn't support it otherwise.
 if test "$ac_cv_header_dlfcn_h" = yes &&
    test "$ace_has_svr4_dynamic_linking" = yes; then
 dnl Check if platform calls init/fini automatically
- ACE_CACHE_CHECK(for automatic init/fini calls,
+ ACE_CACHE_CHECK(if platform calls init/fini automatically,
   ace_cv_feature_auto_init_fini,[
     ace_cv_feature_auto_init_fini=yes
     # TODO: We know how to check for this, but we need to:
@@ -5621,6 +5149,26 @@ if test "$ace_user_enable_threads" = yes; then
     ], AC_DEFINE(ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS),)
 fi
 
+dnl Check for asynchronous IO calls
+if test "$ace_has_aio_funcs" = yes; then
+  ACE_CACHE_CHECK(for asynchronous IO calls,
+    ace_cv_feature_aio_calls,[
+      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),)
+fi dnl test "$ace_has_aio_funcs" = yes
+
 dnl Check for UNIX domain sockets
 ACE_CACHE_CHECK(for UNIX domain sockets,
   ace_cv_feature_unix_sockets,
@@ -5693,7 +5241,7 @@ dnl Some platforms define ip_mreq in <sys/netinet/in.h>.
       ])
   ], AC_DEFINE(ACE_HAS_IP_MULTICAST),)
 
-ACE_CACHE_CHECK(if running on an Alpha,
+ACE_CACHE_CHECK(if platform runs on an Alpha,
   ace_cv_feature_alpha,[
     case "$target" in
       alpha*)
@@ -5716,7 +5264,7 @@ ACE_CACHE_CHECK(if running on an Alpha,
    esac
   ],)
 
-ACE_CACHE_CHECK(if running on a Power PC,
+ACE_CACHE_CHECK(if platform runs on a Power PC,
   ace_cv_feature_powerpc,[
     case "$target" in
       powerpc*)
@@ -5742,7 +5290,7 @@ ACE_CACHE_CHECK(if running on a Power PC,
    esac
   ],)
 
-ACE_CACHE_CHECK(if running on a Pentium(tm) processor,
+ACE_CACHE_CHECK(if platform runs on a Pentium(tm) processor,
   ace_cv_feature_pentium,[    
     case "$target" in
       i386-* | i486-* |i586-* | i686-*)
@@ -5766,7 +5314,7 @@ ACE_CONVERT_WARNINGS_TO_ERRORS( dnl
 [
 dnl getpgid() requires _GNU_SOURCE to be defined in some platforms.
 dnl First check to see if getgpid calls fail without _GNU_SOURCE defines
-ACE_CACHE_CHECK(if _GNU_SOURCE is needed,
+ACE_CACHE_CHECK(if platform requires _GNU_SOURCE for getpgid definition,
   ace_cv_feature_gnu_source,[
     AC_TRY_COMPILE(
        [
@@ -5803,6 +5351,36 @@ dnl Now check to make sure that these defines actually fix getpgid
   ], AC_DEFINE(_GNU_SOURCE),)
 ]) dnl ACE_CONVERT_WARNINGS_TO_ERRORS
 
+dnl Check if platform only supports SCHED_OTHER scheduling policy
+ACE_CACHE_CHECK(if platform only supports SCHED_OTHER scheduling policy,
+  ace_cv_feature_only_have_sched_other,[
+    AC_EGREP_CPP(WE_ONLY_HAVE_SCHED_OTHER,
+      [
+#ifdef ACE_HAS_PTHREADS
+# include <pthread.h>
+#elif defined (ACE_HAS_STHREADS)
+# include <thread.h>
+#endif
+
+#if defined (ACE_LACKS_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)
+          WE_ONLY_HAVE_SCHED_OTHER
+#endif
+      ],
+      [
+       ace_cv_feature_only_have_sched_other=yes
+      ],
+      [
+       ace_cv_feature_only_have_sched_other=no
+      ])
+  ], AC_DEFINE(ACE_HAS_ONLY_SCHED_OTHER),)
+
 dnl
 dnl SECTION 14: checks for aggregated features
 dnl TODO: Little by little, get rid of these...
@@ -5842,7 +5420,7 @@ if test "$ace_user_enable_reentrant_funcs" = yes &&
    test "$ac_cv_func_localtime_r" = yes &&
    test "$ac_cv_func_gmtime_r" = yes &&
    test "$ac_cv_func_asctime_r" = yes; then
-  AC_DEFINE(ACE_HAS_REENTRANT_FUNCTIONS)
+  AC_DEFINE(ACE_HAS_REENTRANT_FUNCTIONS
 fi
 
 dnl Don't bother with reentrant functions if they are disabled by the user.
@@ -6007,199 +5585,6 @@ dnl        the UNIX International threads library was detected.
    AC_DEFINE(_POSIX_THREAD_SAFE_FUNCTIONS)
    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
   fi dnl test "$ace_has_pthreads" = yes
-
-  if test "$ace_has_pthreads" = yes; then
-
-    dnl Check if OS requires non-null status pointer for ::pthread_join ()
-    dnl
-    dnl This test must be performed after the POSIX threads implementation
-    dnl that the platform supports has been determined.
-    ACE_CACHE_CHECK(for pthread_join null status pointer support,
-      ace_cv_have_null_status_pthread_join,[
-        AC_EGREP_CPP(WE_HAVE_PTHREADS_D4,
-          [
-#if defined (ACE_HAS_PTHREADS) && defined (ACE_HAS_PTHREADS_DRAFT4)
-/* This test is only valid for Pthreads Draft 4 */
-WE_HAVE_PTHREADS_D4
-#endif
-          ],
-          [
-           AC_TRY_RUN(
-             [
-#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;
-}
-             ],
-             [
-              ace_cv_have_null_status_pthread_join=yes
-             ],
-             [
-              ace_cv_have_null_status_pthread_join=no
-             ],
-             [
-              dnl If we are cross-compiling let's hope that
-              dnl that we have a working null status pointer
-              dnl for pthread_join.
-              ace_cv_have_null_status_pthread_join=yes
-             ])
-          ],
-          [
-           ace_cv_have_null_status_pthread_join=yes
-          ])
-      ], , AC_DEFINE(ACE_LACKS_NULL_PTHREAD_STATUS))
-
-    dnl Check if platform only supports SCHED_OTHER scheduling policy
-    dnl
-    dnl This test must be performed after the POSIX threads implementation
-    dnl that the platform supports has been determined.
-    ACE_CACHE_CHECK(if SCHED_OTHER is only scheduling policy,
-      ace_cv_feature_only_have_sched_other,[
-        AC_EGREP_CPP(WE_ONLY_HAVE_SCHED_OTHER,
-          [
-#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
-          ],
-          [
-           ace_cv_feature_only_have_sched_other=yes      
-          ],
-          [
-           AC_TRY_RUN(
-             [
-#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;
-}
-             ],
-             [
-              ace_cv_feature_only_have_sched_other=no
-             ],
-             [
-              ace_cv_feature_only_have_sched_other=yes
-             ],
-             [
-              dnl We only get here if polices other than SCHED_OTHER
-              dnl were found in the headers and we are cross-compiling.
-              dnl
-              dnl If we are cross-compiling let's hope that the
-              dnl scheduling policies found in the headers
-              dnl besides SCHED_OTHER (e.g. SCHED_FIFO, SCHED_RR)
-              dnl are supported.
-              ace_cv_feature_only_have_sched_other=no
-             ])
-          ])
-      ], AC_DEFINE(ACE_HAS_ONLY_SCHED_OTHER),)
-  fi dnl test "$ace_has_pthreads" = yes
 fi dnl test "$ace_user_enable_threads" = yes
 
 
@@ -6258,8 +5643,243 @@ dnl
 dnl SECTION 15: Final checks
 dnl
 
-dnl Set known platform specific flags
-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 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 Make final substitutions and defines
 if test "$ace_u_long_long_typedef_set" = yes; then
@@ -6292,6 +5912,7 @@ if test "$ace_user_enable_optimize"; then
   CFLAGS="$CFLAGS $OCFLAGS"
 fi
 CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS"
+CXXCPPFLAGS="$ACE_CXXCPPFLAGS $CXXCPPFLAGS"
 CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS"
 CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS"
 LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
@@ -6426,55 +6047,6 @@ ACE_CACHE_CHECK(for ACE_addr::sap_any support,
      ])
   ],, AC_DEFINE(ACE_HAS_BROKEN_SAP_ANY))
 
-dnl Check if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector
-ACE_CACHE_CHECK(if ACE needs conversion to pass ACE_TTY_IO to DEV_Connector,
-  ace_cv_lib_need_dev_io_conv,
-  [
-   dnl We want an empty ace/config.h to prevent multiple defines
-   dnl with Autoconf's confdefs.h
-   ACE_USE_TEMP_FILE(ace/config.h,
-     [
-      dnl Now run the compilation test
-      ACE_TRY_COMPILE([-I. -I${srcdir}],
-        [
-#if defined(ACE_UINT64_TYPEDEF)
-  typedef ACE_UINT64_TYPEDEF ACE_UINT64;
-#endif /* ACE_UINT64_TYPEDEF */
-
-#include "ace/OS.cpp"
-        ],
-        [
-         int a=0; a += 1;
-        ],
-        [
-         ace_cv_lib_need_dev_io_conv=no
-        ],
-        [
-         dnl Now check if ACE_NEEDS_DEV_IO_CONVERSION makes
-         dnl compilation work!
-         ACE_TRY_COMPILE([-I. -I${srcdir}],
-           [
-#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 a=0; a += 1;
-           ],
-           [
-            ace_cv_lib_need_dev_io_conv=yes
-           ],
-           [
-            dnl If we get here, then we have no idea what is wrong!
-            ace_cv_lib_need_dev_io_conv=no
-           ])
-        ])
-     ])
-  ], AC_DEFINE(ACE_NEEDS_DEV_IO_CONVERSION),)
-
 dnl End ACE macro tests!
 
 dnl Substitute whatever X libraries ACE needs, if any.
@@ -6512,35 +6084,37 @@ dnl We can finally create all the files listed here; Makefile is
 dnl created from Makefile.in, etc.  Top-level Makefiles should be
 dnl created first.
 AC_OUTPUT([
-           Makefile
+dnl        Makefile
+dnl        NEWS
            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
+dnl        ace/Makefile
+dnl        apps/Makefile
+dnl        apps/gperf/Makefile
+dnl        apps/gperf/src/Makefile
+dnl        man/Makefile
+dnl        man/man3/Makefile
+dnl        netsvcs/Makefile
+dnl        netsvcs/clients/Makefile
+dnl        netsvcs/clients/Logger/Makefile
+dnl        netsvcs/clients/Naming/Makefile
+dnl        netsvcs/clients/Naming/Client/Makefile
+dnl        netsvcs/clients/Naming/Dump_Restore/Makefile
+dnl        netsvcs/clients/Tokens/Makefile
+dnl        netsvcs/clients/Tokens/collection/Makefile
+dnl        netsvcs/clients/Tokens/deadlock/Makefile
+dnl        netsvcs/clients/Tokens/invariant/Makefile
+dnl        netsvcs/clients/Tokens/manual/Makefile
+dnl        netsvcs/clients/Tokens/mutex/Makefile
+dnl        netsvcs/clients/Tokens/rw_lock/Makefile
+dnl        netsvcs/lib/Makefile
+dnl        netsvcs/servers/Makefile
+dnl        tests/Makefile
+dnl        tests/log/Makefile
           ])
 
 dnl Make sure ace-diff-config is executable
-chmod 755 ace-diff-config
+dnl chmod 755 ace-diff-config
 
 echo ""
 echo "Configuration of ACE is now complete."
diff --git a/docs/ACE-FMM.html b/docs/ACE-FMM.html
index 66bab9a04a9..4202a4ba989 100644
--- a/docs/ACE-FMM.html
+++ b/docs/ACE-FMM.html
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
   <head>
@@ -19,7 +17,7 @@
 	<b>symptom</b>
 </td>
 <td align=left valign=top>
-	ACE_Task::getq() returns the error
+	ACE_Task::getq() returns the error 
 	<b>resource temporarily unavailable</b>
 </td>
 </tr>
@@ -57,7 +55,7 @@
 </td>
 <td align=left valign=top>
 	When you activate()d your Task, you specified
-	THR_DETACHED, which causes wait() to be unable to perform what you
+	THR_DETACHED, which causes wait() to be unable to perform what you 
 	want it to.
 </td>
 </tr>
@@ -88,7 +86,7 @@
 </td>
 <td align=left valign=top>
 	You are not guaranteed to have a valid <b>this</b> pointer
-	until the constructor has exited.  Threads spawned from
+	until the constructor has exited.  Threads spawned from 
 	a constructor are free to run
 	immediately, and may attempt to use an invalid <b>this</b> pointer.
 
@@ -111,7 +109,7 @@
 	<b>symptom</b>
 </td>
 <td align=left valign=top>
-	Compiler issues warnings/erros regarding using too few template
+	Compiler issues warnings/erros regarding using too few template 
 	arguments, such as "'ACE_Svc_Handler' : too few template arguments".
 </td>
 </tr>
@@ -141,8 +139,8 @@
 	<b>symptom</b>
 </td>
 <td align=left valign=top>
-	Unable to compare ACE_thread_t variables (such as ACE_Thread::self())
-        using operator== ().
+	Unable to compare ACE_thread_t variables (such as ACE_Thread::self()) using 
+	operator==().
 </td>
 </tr>
 <tr>
@@ -230,7 +228,7 @@ int MyHandler::handle_close (ACE_HANDLE handle,
                              ACE_Reactor_Mask close_mask)
 {
     ...
-    my_reactor_-&gt;remove_handler( this,
+    my_reactor_->remove_handler( this,
                                 ACE_Event_Handler::READ_MASK |
                                 ACE_Event_Handler::DONT_CALL );
     ...
diff --git a/docs/ACE-bug-process.html b/docs/ACE-bug-process.html
index e4bf1743a3c..ff6815f8aec 100644
--- a/docs/ACE-bug-process.html
+++ b/docs/ACE-bug-process.html
@@ -1,5 +1,3 @@
-<!-- $Id$ -->
-
 <HTML>
     <TITLE>ACE+TAO Bug Fixing Process</TITLE>
   <BODY text = "#000000" link="#000fff" vlink="#ff0f0f" bgcolor="#ffffff">
@@ -32,9 +30,9 @@ are instituting the following policies:
 
 <LI> All bug reports that are submitted using the appropriate bug
 report form in <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/PROBLEM-REPORT-FORM">$ACE_ROOT/PROBLEM-REPORT-FORM</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/BUG-REPORT-FORM">$ACE_ROOT/BUG-REPORT-FORM</A>
 or <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/PROBLEM-REPORT-FORM">$TAO_ROOT/PROBLEM-REPORT-FORM</A>
+HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/BUG-REPORT-FORM">$TAO_ROOT/BUG-REPORT-FORM</A>
 will be given a tracking number and entered into a database (which
 will soon be available for public viewing on the Web, like the rest of
 our documentation and source).  Please use these forms since bug
diff --git a/docs/ACE-guidelines.html b/docs/ACE-guidelines.html
index 62cf5cc69ba..7132e79d18a 100644
--- a/docs/ACE-guidelines.html
+++ b/docs/ACE-guidelines.html
@@ -1,1000 +1,1048 @@
-<!-- $Id$ -->
-
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
-  <head>
-    <title>ACE Software Development Guidelines</title>
-    <link rev=made href="mailto:levine@cs.wustl.edu">
-  </head>
-
-<BODY text = "#000000"
-link="#000fff"
-vlink="#ff0f0f"
-bgcolor="#ffffff">
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.5 [en] (WinNT; I) [Netscape]">
+   <title>ACE Software Development Guidelines</title>
+<!-- $Id$ -->
+<link rev=made href="mailto:levine@cs.wustl.edu">
+</head>
+<body text="#000000" bgcolor="#FFFFFF" link="#000FFF" vlink="#FF0F0F">
 
 <hr>
-  <h3>ACE Software Development Guidelines</h3>
+<h3>
+ACE Software Development Guidelines</h3>
 
 <ul>
-  <li><strong>General</strong><p>
-  <ul>
-    <li>Every text file must end with a newline.<p>
-
-    <li>Use spaces instead of tabs, except in Makefiles.  Emacs users
-        can add this to their <strong>.emacs</strong>:
-
-        <pre>(setq-default indent-tabs-mode nil)</pre></p>
-
-        Microsoft Visual C++ users should do the following:
-
-        <pre>
-        Choose:  Tools -- Options -- Tabs
-        Then Set:  "Tab size" to 8 and "Indent size" to 2, and
-        indent using spaces.
-        </pre><p>
-
-    <li>Try to limit the length of source code lines to less than 80
-        characters.  Users with 14 inch monitors appreciate it when
-        reading code.  And, it avoids mangling problems with email
-        and net news.<p>
-
-    <li>If you add a comment to code that is directed to, or
-        requires the attention of, a particular individual:
-        <strong>SEND EMAIL TO THAT INDIVIDUAL!</strong>.<p>
-
-    <li>Every program should have a ``usage'' message.  It should be
-        printed out if erroneous command line arguments, or a
-        <strong><code>-?</code></strong> command line argument, are
-        provided to the program.<p>
-
-    <li>The program <strong><code>main</code></strong> function must
-        always be declared with arguments, <em>e.g.</em>,
-        <pre>
-        int
-        main (int argc, char *argv[])
-        {
-          [...]
-
-          return 0;
-        }
-        </pre><p>
-
-        If you don't use the <code>argc</code> and/or <code>argv</code>
-        arguments, don't declare them, <em>e.g.</em>,
-        <pre>
-        int
-        main (int, char *[])
-        {
-          [...]
-
-          return 0;
-        }
-        </pre><p>
-
-        Please declare the second argument as <code>char *[]</code>
-        instead of <code>char **</code>.  Ancient versions of MSC
-        complained about <code>char **</code>; I've never seen a
-        C++ compiler complain about <code>char *[]</code>.<p>
-
-        <code>main</code> must also return 0 on successful
-        termination, and non-zero otherwise.<p>
-
-    <li>Avoid use of floating point types (float and double) and operations
-        unless absolutely necessary.  Not all ACE platforms support them.
-        Therefore, wherever they are used, ACE_LACKS_FLOATING_POINT
-        conditional code must be also be used.<p>
-  </ul>
-
-  <li><strong>Code Documentation</strong><p>
-  <ul>
-    <li>Use comments and whitespace (:-) liberally.  Comments
-        should consist of complete sentences, <em>i.e.</em>, start
-        with a capital letter and end with a period.<p>
-
-    <li>Insert a CVS/RCS keyword string at the top of every source file,
-        Makefile, config file, <em>etc</em>.  For C++ files, it is:
-        <pre>
-        // $<!-- -->Id$
-        </pre>
-        It is not necessary to fill in the fields of the keyword string,
-        or modify them when you edit a file that already has one.  CVS
-        does that automatically when you checkout or update the file.<p>
-
-        To insert that string at the top of a file:
-        <pre>
-        perl -pi -e \
-          'if (! $o) {printf "// \$<!-- -->Id\$\n\n";}; $o = 1;' <em>file</em>
-        </pre><p>
-
-    <li>Comments, especially in header files, must follow the
-        <a href=http://www.dscpl.com.au>OSE</a> Tools format requirements.
-        Please see the ``Classinfo Tools'' section of the
-        <a href=http://www.dscpl.com.au>OSE</a> ``Tools Manual''
-        for these requirements.<p>
-
-  </ul>
-
-  <li><strong>Preprocessor</strong><p>
-  <ul>
-    <li>Never #include standard headers directly, except in a few
-        specific ACE files, <em>e.g.</em>, OS.h and stdcpp.h.  Let
-        those files #include the correct headers.  If you do not do
-        this, your code will not compile with the Standard C++ Library.<p>
-
-    <li>Always follow a preprocessor <strong><code>#endif</code></strong>
-        with a <strong><code>/*  */</code></strong> C-style comment.  It
-        should correspond to the condition in the matching
-        <strong><code>#if</code></strong> directive.  For example,
-        <pre>
-        #if defined (ACE_HAS_THREADS)
-        # if defined (ACE_HAS_STHREADS)
-        #   include /**/ &lt;synch.h&gt;
-        #   include /**/ &lt;thread.h&gt;
-        #   define ACE_SCOPE_PROCESS P_PID
-        #   define ACE_SCOPE_LWP P_LWPID
-        #   define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1)
-        # else
-        #   define ACE_SCOPE_PROCESS 0
-        #   define ACE_SCOPE_LWP 1
-        #   define ACE_SCOPE_THREAD 2
-        # endif /* ACE_HAS_STHREADS */
-        #endif /* ACE_HAS_THREADS */
-        </pre><p>
-
-    <li>Be sure to put spaces around comment delimiters, e.g.,
-        <strong><code>char * /* foo */</code></strong> instead of
-        <strong><code>char */*foo*/</code></strong>.  MS VC++
-        complains otherwise.<p>
-
-    <li>Always insert a <strong><code>/**/</code></strong> between an
-        <strong><code>#include</code></strong> and
-        <strong><code>filename</code></strong>, as shown in the above
-        example.  This avoids dependency problems with Visual C++.<p>
-
-    <li>Be very careful with names of macros, enum values, and variables
-        It's always best to prefix them with something like <code>ACE_</code>
-        or <code>TAO_</code>.  There are too many system headers out
-        there that #define <code>OK</code>, <code>SUCCESS</code>,
-        <code>ERROR</code>, <code>index</code>, and so on.<p>
-
-    <li>Try to centralize <code>#ifdefs</code> with <code>typedefs</code>
-        and <code>#defines</code>.  For example, use this:
-        <pre>
-        #if defined(ACE_PSOS)
-          typedef long ACE_NETIF_TYPE;
-        # define ACE_DEFAULT_NETIF 0
-        #else  /* ! ACE_PSOS */
-          typedef const ASYS_TCHAR* ACE_NETIF_TYPE;
-        # define ACE_DEFAULT_NETIF ASYS_TEXT("le0")
-        #endif /* ! ACE_PSOS */
-        </pre><p>
-
-        instead of:
-
-        <pre><p>
-        #if defined (ACE_PSOS)
-          // pSOS supports numbers, not names for network interfaces
-          long net_if,
-        #else  /* ! ACE_PSOS */
-          const ASYS_TCHAR *net_if,
-        #endif /* ! ACE_PSOS */
-        </pre><p>
-
-    <li>Protect header files against multiple inclusion with this
-        construct:
-        <pre>
-        #ifndef FOO_H
-        #define FOO_H
-
-        [contents of header file]
-
-        #endif /* FOO_H */
-        </pre><p>
-
-        This exact construct (note the <code>#ifndef</code>)
-        is optimized by many compilers such they only open the
-        file once per compilation unit.  Thanks to Eric C. Newton
-        &lt;ecn@smart.net&gt; for pointing that out.<p>
-
-        If the header <code>#includes</code> an ACE library header,
-        then it's a good idea to include the <code>#pragma once</code>
-        directive:
-        <pre>
-        #ifndef FOO_H
-        #define FOO_H
-
-        #include "ace/ACE.h"
-        #if !defined (ACE_LACKS_PRAGMA_ONCE)
-        # pragma once
-        #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-        [contents of header file]
-
-        #endif /* FOO_H */
-        </pre><p>
-
-        <code>#pragma once</code> must be protected, because some
-        compilers complain about it.  The protection depends on
-        <code>ACE_LACKS_PRAGMA_ONCE</code>, which is defined in
-        some ACE config headers.  Therefore, the protected
-        <code>#pragma once</code> construct should only be used after
-        an <code>#include</code> of an ACE library header.  Note that
-        many compilers enable the optimization if the <code>#ifndef</code>
-        protection construct is used, so for them, <code>#pragma once</code>
-        is superfluous.<p>
-
-        <strong>No</strong> code can appear after the final
-        <code>#endif</code> for the optimization to be effective and
-        correct.<p>
-
-    <li><P>Files that contain parametric classes should follow this style:
-      <PRE>
-      #ifndef FOO_T_H
-      #define FOO_T_H
-
-      #include "ace/ACE.h"
-      #if !defined (ACE_LACKS_PRAGMA_ONCE)
-      # pragma once
-      #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-      // Put your template declarations here...
-
-      #if defined (__ACE_INLINE__)
-      #include "Foo_T.i"
-      #endif /* __ACE_INLINE__ */
-
-      #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-      #include "Foo_T.cpp"
-      #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-      #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-      #pragma implementation "Foo_T.cpp"
-      #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-      #endif /* FOO_T_H */
-</PRE></P>
-      <P>
-      Notice that some compilers need to see the code of the template,
-      hence the <CODE>.cpp</CODE> file must be included from the
-      header file.
-      </P>
-      <P>
-      To avoid multiple inclusions of the <CODE>.cpp</CODE> file it
-      should also be protected as in:
-      <pre>
-      #ifndef FOO_T_C
-      #define FOO_T_C
-
-      #include "Foo_T.h"
-      #if !defined (ACE_LACKS_PRAGMA_ONCE)
-      # pragma once
-      #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-      #if !defined (__ACE_INLINE__)
-      #include "ace/Active_Map_Manager_T.i"
-      #endif /* __ACE_INLINE__ */
-
-      ACE_RCSID(lib, Foo_T, "$<!-- -->Id$")
-
-      // put your template code here
-
-      #endif /* FOO_T_H */
-</pre></p>
-      <P>
-      Finally you may want to include the template header file from a
-      non-template header file (check
-      <CODE>$ACE_ROOT/ace/Synch.h</CODE>); in such a case the template
-      header should be included <strong>after</strong> the inline
-      function definitions, as in:</P>
-      <P><PRE>
-      #ifndef FOO_H
-      #define FOO_H
-
-      #include "ace/ACE.h"
-      #if !defined (ACE_LACKS_PRAGMA_ONCE)
-      # pragma once
-      #endif /* ACE_LACKS_PRAGMA_ONCE */
-
-      // Put your non-template declarations here...
-
-      #if defined (__ACE_INLINE__)
-      #include "Foo.i"
-      #endif /* __ACE_INLINE__ */
-
-      #include "Foo_T.h"
-
-      #endif /* FOO_H */
-</PRE></P>
-    </li>
-  </ul>
-
-  <li><strong>C++ Syntax and Constructs</strong><p>
-  <ul>
-    <li><strong><code>for</code></strong> loops should look like:
-        <pre>
-        for (size_t i = 0; i &lt; Options::instance ()-&gt;spawn_count (); ++i)
-          spawn ();
-        </pre>
-        Though, I prefer to always wrap the body of the loop in braces,
-        to avoid surprises when other code or debugging statements are
-        added, and to maintain sanity when the body consists of a macro,
-        such as an ACE_ASSERT without a trailing semicolon:
-        <pre>
-        for (size_t i = 0; i &lt; Options::instance ()-&gt;spawn_count (); ++i)
-          {
-            ACE_ASSERT (spawn () == 0;)
-          }
-        </pre><p>
-
-        Similarly, <strong><code>if</code></strong> statements should have
-        a space after the ``<strong>if</strong>'', and no spaces just after
-        the opening parenthesis and just before the closing parenthesis.<p>
-
-    <li>If a loop index is used after the body of the loop, it
-        <strong>must</strong> be declared before the loop.  For example,
-
-        <pre>
-        size_t i = 0;
-        for (size_t j = 0; file_name [j] != '\0'; ++i, ++j)
-          {
-            if (file_name [j] == '\\' && file_name [j + 1] == '\\')
-              ++j;
-
-            file_name [i] = file_name [j];
-          }
-
-        // Terminate this string.
-        file_name [i] = '\0';
-        </pre><p>
-
-   <li>Prefix operators are sometimes more efficient than postfix
-       operators.  Therefore, they are preferred over their postfix
-       counterparts where the expression value is not used.<p>
-
-       Therefore, use this idiom for iterators, with prefix operator
-       on the loop index:
-       <pre>
-       ACE_Ordered_MultiSet&lt;int&gt; set;
-       ACE_Ordered_MultiSet_Iterator&lt;int&gt; iter(set);
-
-       for (i = -10; i &lt; 10; ++i)
-         set.insert (2 * i + 1);
-
-       </pre>
-       rather than the postfix operator:
-       <pre>
-       for (i = -10; i &lt; 10; i++)
-         set.insert (2 * i + 1);
-       </pre><p>
-
-    <li>When a class provides operator==, it must also provide
-        operator!=.  Also, both these operators must be const.
-
-    <li>Avoid unnecessary parenthesis.  We're not writing Lisp :-)<p>
-
-    <li>Put inline member functions in a <strong><code>.i</code></strong>
-        file.  That file is conditionally included by both the
-        <strong><code>.h</code></strong> file, for example:<p>
-
-            <pre>
-            class ACE_Export ACE_High_Res_Timer
-            {
-              [...]
-            };
-
-            #if defined (__ACE_INLINE__)
-            #include "ace/High_Res_Timer.i"
-            #endif /* __ACE_INLINE__ */
-            </pre><p>
-
-        and <strong><code>.cpp</code></strong> file:<p>
-
-            <pre>
-            #define ACE_BUILD_DLL
-            #include "ace/High_Res_Timer.h"
-
-            #if !defined (__ACE_INLINE__)
-            #include "ace/High_Res_Timer.i"
-            #endif /* __ACE_INLINE__ */
-
-            ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
-            </pre><p>
-
-        <strong>NOTE:</strong> It is very important to ensure than an
-        inline function will not be used before its definition is seen.
-        Therefore, the inline functions in the .i file should be arranged
-        properly.  Some compilers, such as <code>g++</code> with the
-        <code>-Wall</code> option, will issue warnings for violations.<p>
-
-    <li><code>ACE_Export</code> must be inserted between the
-        <code>class</code> keyword and class name for all classes that
-        are exported from libraries, as shown in the example above.
-        <strong>However</strong>, do <strong>not</strong> use
-        <code>ACE_Export</code> for template classes!<p>
-
-    <li>Mutators and accessors should be of this form:<p>
-
-        <pre>
-        void object_addr (const ACE_INET_Addr &);
-        // Sets &lt;object_addr_&gt; cache from &lt;host&gt; and &lt;port&gt;.
-
-        ACE_INET_Addr &object_addr (void);
-        // Returns the &lt;ACE_INET_Addr&gt; for this profile.
-        </pre><p>
-
-        instead of the ``set_'' and ``get_'' form.<p>
-
-    <li>Never use <strong><code>delete</code></strong> to deallocate
-        memory that was allocated with <strong><code>malloc</code></strong>.
-        Similarly, never associate <strong><code>free</code></strong> with
-        <strong><code>new</code></strong>.
-        <strong><code>ACE_NEW</code></strong> or
-        <strong><code>ACE_NEW_RETURN</code></strong> should be used to
-        allocate memory, and <strong><code>delete</code></strong> should
-        be used to deallocate it.  And be careful to use the correct form,
-        <strong><code>delete</code></strong> or
-        <strong><code>delete []</code></strong> to correspond to the
-        allocation.<p>
-
-    <li>Don't check for a pointer being 0 before deleting it.  It's
-        always safe to delete a 0 pointer.  If the pointer is visible
-        outside the local scope, it's often a good idea to 0 it
-        _after_ deleting it.  Note, the same argument applies to
-        free().<p>
-
-    <li>Always use <strong><code>ACE_NEW</code></strong> or
-        <strong><code>ACE_NEW_RETURN</code></strong> to allocate memory,
-        because they check for successful allocation and set errno
-        appropriately if it fails.<p>
-
-    <li>Never compare or assign a pointer value with <strong>NULL</strong>;
-        use <strong>0</strong> instead.  The language allows any pointer to
-        be compared or assigned with <strong>0</strong>.  The definition
-        of <strong>NULL</strong> is implementation dependent, so it is
-        difficult to use portably without casting.<p>
-
-    <li>Never use TRUE, true, or anything else other than 1 to indicate
-        true.  Never use FALSE, false, or anything else other than 0 to
-        indicate false.<p>
-
-    <li>Never cast a pointer to or from an <strong><code>int</code></strong>.
-        On all currently supported ACE platforms, it is safe to cast
-        a pointer to or from a <strong><code>long</code></strong>.<p>
-
-    <li>Be very careful when selecting an integer type that must be a
-        certain size, <em>e.g.</em>, 4 bytes.  <strong>long</strong> is
-        not 4 bytes on all platforms; it is 8 bytes on many 64-bit
-        machines.  ACE_UINT32 is always 4 bytes, and ACE_UINT64 is
-        always 8 bytes.<p>
-
-    <li>If a class has any virtual functions, and its destructor is
-        declared explicitly in the class, then the destructor should
-        <strong>always</strong> be virtual as well.  And to support
-        compiler activities such as generation of virtual tables and,
-        in some cases, template instantiation, the virtual destructor
-        should <strong>not be inline</strong>.  (Actually, any non-pure
-        virtual function could be made non-inline for this purpose.  But,
-        for convenience, if its performance is not critical, it is usually
-        easiest just to make the virtual destructor non-inline.)<p>
-
-    <li>Constructor initializers must appear in the same order as
-        the data members are declared in the class header.  This avoids
-        subtle errors, because initialization takes place in the order
-        of member declaration.<p>
-
-    <li>Initialization is usually cleaner than assignment, especially
-        in a conditional.  So, instead of writing code like this:
-
-        <pre>
-        ssize_t n_bytes;
-
-        // Send multicast of one byte, enough to wake up server.
-        if ((n_bytes = multicast.send ((char *) &reply_port,
-          sizeof reply_port)) == -1)
-        </pre>
-
-        Write it like this:
-
-        <pre>
-        ssize_t n_bytes = multicast.send ((char *) &reply_port,
-          sizeof reply_port)
-
-        // Send multicast of one byte, enough to wake up server.
-        if (n_bytes == -1)
-        </pre><p>
-
-        But, beware if the initialization is of a static variable.
-        A static variable is only initialized the first time its
-        declaration is seen.  Of course, we should avoid using
-        static variables at all.<p>
-
-    <li>It is usually clearer to write conditionals that have
-        both branches without a negated condition.  For example,<p>
-
-        <pre>
-        if (test)
-          {
-            // true branch
-          }
-        else
-          {
-            // false branch
-          }
-        </pre><p>
-
-        is preferred over:<p>
-
-        <pre>
-        if (! test)
-          {
-            // false test branch
-          }
-        else
-          {
-            // true test branch
-          }
-        </pre><p>
-
-    <li>If a cast is necessary, avoid use of function-style casts,
-        <em>e.g.</em>, <code>int (foo)</code>.  Instead, use
-        one of the ACE cast macros:
-
-        <pre>
-        return ACE_static_cast(size_t, this-&gt;count_) &gt; that-&gt;size_;
-        </pre><p>
-
-        The general usage guidelines for the four styles of casts are:<p>
-        <ul>
-          <li><strong>ACE_const_cast</strong>: use to cast away
-            constness, or volatile-ness.<p>
-          <li><strong>ACE_static_cast</strong>: use to cast between
-            compatible types, such as downcasting a pointer or narrowing
-            an integer.<p>
-          <li><strong>ACE_reinterpret_cast</strong>: use only when
-            ACE_static_cast is not suitable.<p>
-          <li><strong>ACE_dynamic_cast</strong>: avoid, unless you really
-            want to type check at run-time.<p>
-        </ul>
-
-    <li>In general, if instances of a class should not be copied,
-        then a private copy constructor and assignment operator should
-        be declared for the class, but not implemented.  For example:
-
-        <pre>
-        // Disallow copying by not implementing the following . . .
-        ACE_Object_Manager (const ACE_Object_Manager &);
-        ACE_Object_Manager &operator= (const ACE_Object_Manager &);
-        </pre><p>
-
-        If the class is a template class, then the
-        <code>ACE_UNIMPLEMENTED_FUNC</code> macro should be used:
-
-        <pre>
-        // = Disallow copying...
-        ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS&lt;TYPE&gt; &))
-        ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS&lt;TYPE&gt; &))
-        </pre><p>
-
-        <code>ACE_UNIMPLEMENTED_FUNC</code> can be used with non-template
-        classes as well.  Though for consistency and maximum safety, it
-        should be avoided for non-template classes.<p>
-
-    <li>Never use <code>bool</code>, <code>BOOL</code>, or similar
-        types.   (CORBA::Boolean is acceptable).  Use <code>int</code>
-        or <code>u_int</code> instead for boolean types.<p>
-
-    <li>Functions should always return -1 to indicate failure, and
-        0 or greater to indicate success.<p>
-
-    <li><P>Separate the code of your templates from the code for
-        non-parametric classes: some compilers get confused when
-        template and non-template code is mixed in the same file.
-      </P>
-    </li>
-
-  </ul>
-
-  <li><strong>I/O</strong><p>
-  <ul>
-     <li>Use <strong><code>ACE_DEBUG</code></strong> for printouts,
-         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.
-         Take appropriate action if the open failed.<p>
-  </ul>
-
-  <li><strong>UNICODE conformity</strong><p>
-
-  <ul>
-    <li>Define strings as <strong><code>ASYS_TCHAR</code></strong> if
-        they need to be passed into system API.  It expands to
-        <code>wchar_t</code> only when
-        <code>ACE_HAS_MOSTLY_UNICODE_APIS</code> is defined.<p>
-
-    <li>Use <strong><code>ASYS_TEXT</code></strong> and
-        <strong><code>ASYS_WIDE_STRING</code></strong> for format
-        strings and other string arguments passed to
-        <code>ACE_DEBUG</code> or <code>ACE_ERROR</code>.  For
-        example,<p>
-        <pre>
-          void
-          ACE_FOO::ace_bar (int err, ASYS_TCHAR *astr)
-          {
-            ACE_TRACE ("ACE_FOO::ace_bar");
-
-            ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("From ACE_FOO::ace_bar")));
-
-            if (err)
-              ACE_ERROR ((LM_ERROR,
-                          ASYS_TEXT ("(%P) Printing this string %s\n"),
-                          astr));
-          }
-        </pre>
-        <p>
-        This is because ACE also support platforms which use UNICODE
-        in most of their APIs.  On these platforms, ACE also uses
-        UNICODE as its system string type.<p>
-
-    <li><strong><code>ACE_TRACE</code></strong> handles conversion
-        between char strings and UNICODE strings automatically.<p>
-
-    <li>Other helper macros include
-        <strong><code>ASYS_MULTIBYTE_STRING</code></strong> and
-        <strong><code>ASYS_ONLY_MULTIBYTE_STRING</code></strong>. See
-        the end of <a href="../ace/OS.h">OS.h</a> for more details.<p>
-
-  </ul><p>
-
-  <li><strong>Exceptions</strong><p>
-
-  <ul>
-    <li>There are many ways of throwing and catching exceptions. The
-        code below gives several examples.  Note that each method has
-        different semantics and costs. Whenever possible, use the
-        first approach.<p>
-
-        <pre>
-        #include "iostream.h"
-
-        class exe_foo
-        {
-        public:
-          exe_foo (int data) : data_ (data)
-            { cerr &lt;&lt; "constructor of exception called" &lt;&lt; endl; }
-          ~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; }
-          int data_;
-        };
-
-
-        void
-        good (int a)
-        {
-          throw exe_foo (a);
-        };
-
-        void
-        bad (int a)
-        {
-          exe_foo foo (a);
-          throw foo;
-        };
-
-        int main ()
-        {
-          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;
-            }
-
-          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;
-            }
-
-          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;
-            }
-
-          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;
-            }
-
-          return 0;
-        }
-        </pre>
-
-     Output is: <p>
-
-        <pre>
-        First exception
-
-        constructor of exception called
-        exception caught: 0
-        destructor of exception called
-
-        Second exception
-
-        constructor of exception called
-        copy constructor of exception called
-        exception caught: 0
-        destructor of exception called
-        destructor of exception called
-
-        Third exception
-
-        constructor of exception called
-        copy constructor of exception called
-        destructor of exception called
-        exception caught: 1
-        destructor of exception called
-
-        Fourth exception
-
-        constructor of exception called
-        copy constructor of exception called
-        destructor of exception called
-        copy constructor of exception called
-        exception caught: 1
-        destructor of exception called
-        destructor of exception called
-
-        </pre>
-
-      </ul><p>
+<li>
+<b>General</b></li>
 
+<br>&nbsp;
+<p>&nbsp;
+<ul>
+<li>
+Every text file must end with a newline.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Use spaces instead of tabs, except in Makefiles. Emacs users can add this
+to their <b>.emacs</b>:</li>
+
+<pre>(setq-default indent-tabs-mode nil)</pre>
+Microsoft Visual C++ users should do the following:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Choose:&nbsp; Tools -- Options -- Tabs
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Then Set:&nbsp; "Tab size" to 8 and "Indent size" to 2, and
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; indent using spaces.
+</pre>
+
+<li>
+If you add a comment to code that is directed to, or requires the attention
+of, a particular individual: <b>SEND EMAIL TO THAT INDIVIDUAL!</b>.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Every program should have a ``usage'' message. It should be printed out
+if erroneous command line arguments, or a <b><tt>-?</tt></b> command line
+argument, are provided to the program.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+The program <b><tt>main</tt></b> function must always be declared with
+arguments, <i>e.g.</i>,</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; int
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; main (int argc, char *argv[])
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [...]
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return 0;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+If you don't use the <tt>argc</tt> and/or <tt>argv</tt> arguments, don't
+declare them, <i>e.g.</i>,
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; int
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; main (int, char *[])
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [...]
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return 0;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+Please declare the second argument as <tt>char *[]</tt> instead of <tt>char
+**</tt>. Ancient versions of MSC complained about <tt>char **</tt>; I've
+never seen a C++ compiler complain about <tt>char *[]</tt>.
+<p>&nbsp;<tt>main</tt> must also return 0 on successful termination, and
+non-zero otherwise.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Avoid use of floating point types (float and double) and operations unless
+absolutely necessary. Not all ACE platforms support them. Therefore, wherever
+they are used, ACE_LACKS_FLOATING_POINT conditional code must be also be
+used.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
+
+<li>
+<b>Code Documentation</b></li>
+
+<br>&nbsp;
+<p>&nbsp;
+<ul>
+<li>
+Use comments and whitespace (:-) liberally. Comments should consist of
+complete sentences, <i>i.e.</i>, start with a capital letter and end with
+a period.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Insert a CVS/RCS keyword string at the top of every source file, Makefile,
+config file, <i>etc</i>. For C++ files, it is:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // $<!-- -->Id$
+</pre>
+It is not necessary to fill in the fields of the keyword string, or modify
+them when you edit a file that already has one. CVS does that automatically
+when you checkout or update the file.
+<p>&nbsp;To insert that string at the top of a file:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; perl -pi -e \
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 'if (! $o) {printf "// \$<!-- -->Id\$\n\n";}; $o = 1;' <i>file
+</i></pre>
+
+<li>
+Comments, especially in header files, must follow the <a href="http://www.dscpl.com.au">OSE</a>
+Tools format requirements. Please see the ``Classinfo Tools'' section of
+the <a href="http://www.dscpl.com.au">OSE</a> ``Tools Manual'' for these
+requirements.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
+
+<li>
+<b>Preprocessor</b></li>
+
+<br>&nbsp;
+<p>&nbsp;
+<ul>
+<li>
+Never #include standard headers directly, except in a few specific ACE
+files, <i>e.g.</i>, OS.h and stdcpp.h. Let those files #include the correct
+headers. If you do not do this, your code will not compile with the Standard
+C++ Library.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Always follow a preprocessor <b><tt>#endif</tt></b>with a <b><tt>/* */</tt></b>
+C-style comment. It should correspond to the condition in the matching
+<b><tt>#if</tt></b> directive. For example,</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (ACE_HAS_THREADS)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # if defined (ACE_HAS_STHREADS)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; include /**/ &lt;synch.h>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; include /**/ &lt;thread.h>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_PROCESS P_PID
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_LWP P_LWPID
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_THREAD (ACE_SCOPE_LWP + 1)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # else
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_PROCESS 0
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_LWP 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #&nbsp;&nbsp; define ACE_SCOPE_THREAD 2
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # endif /* ACE_HAS_STHREADS */
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_HAS_THREADS */
+</pre>
+
+<li>
+Always insert a <b><tt>/**/</tt></b> between an <b><tt>#include</tt></b>
+and <b><tt>filename</tt></b>, as shown in the above example. This avoids
+dependency problems with Visual C++.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Be very careful with names of macros and enum values. It's always best
+to prefix them with something like <tt>ACE_</tt> or <tt>TAO_</tt>. There
+are too many system headers out there that #define <tt>OK</tt>, <tt>SUCCESS</tt>,
+<tt>ERROR</tt>, and so on.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Try to centralize <tt>#ifdefs</tt> with <tt>typedefs</tt> and <tt>#defines</tt>.
+For example, use this:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined(ACE_PSOS)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; typedef long ACE_NETIF_TYPE;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # define ACE_DEFAULT_NETIF 0
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #else&nbsp; /* ! ACE_PSOS */
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; typedef const ASYS_TCHAR* ACE_NETIF_TYPE;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # define ACE_DEFAULT_NETIF ASYS_TEXT("le0")
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ! ACE_PSOS */
+</pre>
+instead of:
+<p>#if defined (ACE_PSOS) // pSOS supports numbers, not names for network
+interfaces long net_if, #else /* ! ACE_PSOS */ const ASYS_TCHAR *net_if,
+#endif /* ! ACE_PSOS */
+<li>
+Protect header files against multiple inclusion with this construct:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #ifndef FOO_H
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define FOO_H
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [contents of header file]
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* FOO_H */
+</pre>
+This exact construct (note the <tt>#ifndef</tt>) is optimized by many compilers
+such they only open the file once per compilation unit. Thanks to Eric
+C. Newton &lt;ecn@smart.net> for pointing that out.
+<p>&nbsp;If the header <tt>#includes</tt> an ACE library header, then it's
+a good idea to include the <tt>#pragma once</tt> directive:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #ifndef FOO_H
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define FOO_H
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/ACE.h"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (ACE_LACKS_PRAGMA_ONCE)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # pragma once
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [contents of header file]
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* FOO_H */
+</pre>
+<tt>#pragma once</tt> must be protected, because some compilers complain
+about it. The protection depends on <tt>ACE_LACKS_PRAGMA_ONCE</tt>, which
+is defined in some ACE config headers. Therefore, the protected <tt>#pragma
+once</tt> construct should only be used after an <tt>#include</tt> of an
+ACE library header. Note that many compilers enable the optimization if
+the <tt>#ifndef</tt> protection construct is used, so for them, <tt>#pragma
+once</tt> is superfluous.
+<p>&nbsp;<b>No</b> code can appear after the final <tt>#endif</tt> for
+the optimization to be effective and correct.
+<br>&nbsp;
+<br>&nbsp;
+<p>Files that contain parametric classes should follow this style:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #ifndef FOO_T_H
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define FOO_T_H
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/ACE.h"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (ACE_LACKS_PRAGMA_ONCE)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # pragma once
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Put your template declarations here...
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (__ACE_INLINE__)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "Foo_T.i"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* __ACE_INLINE__ */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "Foo_T.cpp"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #pragma implementation "Foo_T.cpp"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* FOO_T_H */</pre>
+Notice that some compilers need to see the code of the template, hence
+the <tt>.cpp</tt> file must be included from the header file.
+<p>To avoid multiple inclusions of the <tt>.cpp</tt> file it should also
+be protected as in:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #ifndef FOO_T_C
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define FOO_T_C
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "Foo_T.h"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (ACE_LACKS_PRAGMA_ONCE)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # pragma once
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (__ACE_INLINE__)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/Active_Map_Manager_T.i"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* __ACE_INLINE__ */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_RCSID(lib, Foo_T, "$<!-- -->Id$")
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // put your template code here
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* FOO_T_H */</pre>
+Finally you may want to include the template header file from a non-template
+header file (check <tt>$ACE_ROOT/ace/Synch.h</tt>); in such a case the
+template header should be included <b>after</b> the inline function definitions,
+as in:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #ifndef FOO_H
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define FOO_H
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/ACE.h"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (ACE_LACKS_PRAGMA_ONCE)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # pragma once
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* ACE_LACKS_PRAGMA_ONCE */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Put your non-template declarations here...
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (__ACE_INLINE__)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "Foo.i"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* __ACE_INLINE__ */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "Foo_T.h"
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* FOO_H */</pre>
 </ul>
 
+<li>
+<b>C++ Syntax and Constructs</b></li>
 
-<hr>
-<h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a>
-  Usage Guidelines</h3>
+<br>&nbsp;
+<p>&nbsp;
 <ul>
-  <li>Always use <strong><code>ACE_OS</code></strong> (static)
-      member functions instead of bare OS system calls.<p>
-
-  <li>As a general rule, the only functions that should go into the
-      <strong><code>ACE_OS</code></strong> class are ones that have
-      direct equivalents on some OS platform.  Functions that are
-      extensions should go in the <strong><code>ACE</code></strong> class.<p>
-
-  <li>Use the <strong><code>ACE_SYNCH_MUTEX</code></strong> macro,
-      instead of using one of the specific mutexes, such as
-      <strong><code>ACE_Thread_Mutex</code></strong>.  This provides
-      portability between threaded and non-threaded platforms.<p>
-
-  <li>Avoid creating a static instance of user-defined (class) type.
-      Instead, either create it as an
-      <strong><code>ACE_Singleton</code></strong>,
-      <strong><code>ACE_TSS_Singleton</code></strong>, or as an
-      <strong><code>ACE_Cleanup</code></strong> object.  See the
-      <strong>ACE</strong>
-      <a href="../ace/Singleton.h"><code>Singleton.h</code></a>,
-      <a href="../ace/Object_Manager.h"><code>Object_Manager.h</code></a>, and
-      <a href="../ace/Managed_Object.h"><code>Managed_Object.h</code></a>
-      header files for more information.<p>
-
-      Static instances of built-in types, such as
-      <strong><code>int</code></strong> or any pointer type, are fine.<p>
-
-      Construction of static instance of a user-defined type should
-      <em>never</em> spawn threads.  Because order of construction of
-      statics across files is not defined by the language, it is usually
-      assumed that only one thread exists during static construction.
-      This allows statics suchs as locks to be safely created.  We do not
-      want to violate this assumption.<p>
-
-  <li>Do not use run-time type identification (RTTI).  Some platforms
-      do not support it.<p>
-
-  <li>Do not use C++ exception handling directly.  Some platforms do
-      not support it.  And, it can impose an execution speed penalty.
-      Instead use the TAO/ACE try/catch macros.<p>
-
-  <li>Because ACE does not use exception handling, dealing with
-      failures requires a bit of care.  This is especially true
-      in constructors.  Consider the following approach:
-
-      <pre>
-      ACE_NEW_RETURN (this-&gt;name_space_, LOCAL_NAME_SPACE, -1);
-
-      if (ACE_LOG_MSG-&gt;op_status () != 0)
-      ....
-      </pre>
-
-      This snip of code is from
-      <a href="../ace/Naming_Context.cpp"><code>ACE_Naming_Context</code></a>.
-      All failed constructors in ACE (should) call ACE_ERROR.  This sets
-      the thread specific <strong>op_status</strong>, which can be checked
-      by the caller.  This mechanism allows the caller to check for a failed
-      constructor without the requiring the constructor to throw
-      exceptions.<p>
-
-  <li>Avoid using the C++ Standard Template Library (STL) in our
-      applications.  Some platforms do not support it yet.<p>
-
-  <li>Be <em>very</em> careful with <code>ACE_ASSERT</code>.  It
-      must only be used to check values; it may never be used to
-      wrap a function call, or contain any other side effect.  That's
-      because the statement will disappear when ACE_NDEBUG is enabled.
-      For example, this code is BAD:
-      <pre>
-      ACE_ASSERT (this-&gt;next (retv) != 0);  // BAD CODE!
-      </pre>
-
-      Instead, the above should be coded this way:
-
-      <pre>
-      int result = this-&gt;next (retv);
-      ACE_ASSERT (result != 0);
-      ACE_UNUSED_ARG (result);
-      </pre><p>
-
-  <li>Never put side effects in <code>ACE_DEBUG</code> code:
-      <pre>
-      ACE_DEBUG ((LM_DEBUG,
-                 "handling signal: %d iterations left\n",
-                 --this-&gt;iterations_));        // BAD CODE!
-      </pre>
-
-      Note that this won't work correctly if <code>ACE_NDEBUG</code> is
-      defined, for the same reason that having side-effects in
-      <code>ACE_ASSERT</code>s won't work either, <em>i.e.</em>, because
-      the code is removed.<p>
-
-  <li>Immediately after opening a temporary file, unlink it.  For
-      example:
-      <pre><code>
-      ACE_HANDLE h = open the file (filename);
-
-      ACE_OS::unlink (filename);
-      </code></pre><p>
-
-      This avoids leaving the temporary file even if the program crashes.<p>
-
-  <li>Always use <code>$(RM)</code> instead of <code>rm</code> or
-      <code>rm -f</code> in Makefiles.<p>
-</ul>
+<li>
+<b><tt>for</tt></b> loops should look like:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; for (size_t i = 0; i &lt; Options::instance ()->spawn_count (); ++i)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; spawn ();
+</pre>
+Though, I prefer to always wrap the body of the loop in braces, to avoid
+surprises when other code or debugging statements are added, and to maintain
+sanity when the body consists of a macro, such as an ACE_ASSERT without
+a trailing semicolon:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; for (size_t i = 0; i &lt; Options::instance ()->spawn_count (); ++i)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ASSERT (spawn () == 0;)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+Similarly, <b><tt>if</tt></b> statements should have a space after the
+``<b>if</b>'', and no spaces just after the opening parenthesis and just
+before the closing parenthesis.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+If a loop index is used after the body of the loop, it <b>must</b> be declared
+before the loop. For example,</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; size_t i = 0;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; for (size_t j = 0; file_name [j] != '\0'; ++i, ++j)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (file_name [j] == '\\' &amp;&amp; file_name [j + 1] == '\\')
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ++j;
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; file_name [i] = file_name [j];
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Terminate this string.
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; file_name [i] = '\0';
+</pre>
+
+<li>
+Prefix operators are sometimes more efficient than postfix operators. Therefore,
+they are preferred over their postfix counterparts where the expression
+value is not used.</li>
+
+<p><br>&nbsp;Therefore, use this idiom for iterators, with prefix operator
+on the loop index:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_Ordered_MultiSet&lt;int> set;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_Ordered_MultiSet_Iterator&lt;int> iter(set);
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; for (i = -10; i &lt; 10; ++i)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; set.insert (2 * i + 1);
+
+</pre>
+rather than the postfix operator:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; for (i = -10; i &lt; 10; i++)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; set.insert (2 * i + 1);
+</pre>
+
+<li>
+When a class provides operator==, it must also provide operator!=. Also,
+both these operators must be const.</li>
+
+<li>
+Avoid unnecessary parenthesis. We're not writing Lisp :-)</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Put inline member functions in a <b><tt>.i</tt></b> file. That file is
+conditionally included by both the <b><tt>.h</tt></b> file, for example:</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class ACE_Export ACE_High_Res_Timer
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [...]
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; };
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if defined (__ACE_INLINE__)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/High_Res_Timer.i"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* __ACE_INLINE__ */
+</pre>
+and <b><tt>.cpp</tt></b> file:
+<br>&nbsp;
+<br>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #define ACE_BUILD_DLL
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/High_Res_Timer.h"
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #if !defined (__ACE_INLINE__)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "ace/High_Res_Timer.i"
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #endif /* __ACE_INLINE__ */
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ALLOC_HOOK_DEFINE(ACE_High_Res_Timer)
+</pre>
+<b>NOTE:</b> It is very important to ensure than an inline function will
+not be used before its definition is seen. Therefore, the inline functions
+in the .i file should be arranged properly. Some compilers, such as <tt>g++</tt>
+with the <tt>-Wall</tt> option, will issue warnings for violations.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+<tt>ACE_Export</tt> must be inserted between the <tt>class</tt> keyword
+and class name for all classes that are exported from libraries, as shown
+in the example above. <b>However</b>, do <b>not</b> use <tt>ACE_Export</tt>
+for template classes!</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Mutators and accessors should be of this form:</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; void object_addr (const ACE_INET_Addr &amp;);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Sets &lt;object_addr_> cache from &lt;host> and &lt;port>.
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_INET_Addr &amp;object_addr (void);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Returns the &lt;ACE_INET_Addr> for this profile.
+</pre>
+instead of the ``set_'' and ``get_'' form.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Never use <b><tt>delete</tt></b> to deallocate memory that was allocated
+with <b><tt>malloc</tt></b>. Similarly, never associate <b><tt>free</tt></b>
+with <b><tt>new</tt></b>. <b><tt>ACE_NEW</tt></b> or <b><tt>ACE_NEW_RETURN</tt></b>
+should be used to allocate memory, and <b><tt>delete</tt></b> should be
+used to deallocate it. And be careful to use the correct form, <b><tt>delete</tt></b>
+or <b><tt>delete []</tt></b> to correspond to the allocation.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Don't check for a pointer being 0 before deleting it. It's always safe
+to delete a 0 pointer. If the pointer is visible outside the local scope,
+it's often a good idea to 0 it _after_ deleting it. Note, the same argument
+applies to free().</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Always use <b><tt>ACE_NEW</tt></b> or <b><tt>ACE_NEW_RETURN</tt></b> to
+allocate memory, because they check for successful allocation and set errno
+appropriately if it fails.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Never compare or assign a pointer value with <b>NULL</b>; use <b>0</b>
+instead. The language allows any pointer to be compared or assigned with
+<b>0</b>. The definition of <b>NULL</b> is implementation dependent, so
+it is difficult to use portably without casting.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Never cast a pointer to or from an <b><tt>int</tt></b>. On all currently
+supported ACE platforms, it is safe to cast a pointer to or from a <b><tt>long</tt></b>.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Be very careful when selecting an integer type that must be a certain size,
+<i>e.g.</i>, 4 bytes. <b>long</b> is not 4 bytes on all platforms; it is
+8 bytes on many 64-bit machines. ACE_UINT32 is always 4 bytes, and ACE_UINT64
+is always 8 bytes.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+If a class has any virtual functions, and its destructor is declared explicitly
+in the class, then the destructor should <b>always</b> be virtual as well.
+And to support compiler activities such as generation of virtual tables
+and, in some cases, template instantiation, the virtual destructor should
+<b>not be inline</b>. (Actually, any non-pure virtual function could be
+made non-inline for this purpose. But, for convenience, if its performance
+is not critical, it is usually easiest just to make the virtual destructor
+non-inline.)</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Constructor initializers must appear in the same order as the data members
+are declared in the class header. This avoids subtle errors, because initialization
+takes place in the order of member declaration.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Initialization is usually cleaner than assignment, especially in a conditional.
+So, instead of writing code like this:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ssize_t n_bytes;
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Send multicast of one byte, enough to wake up server.
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if ((n_bytes = multicast.send ((char *) &amp;reply_port,
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sizeof reply_port)) == -1)
+</pre>
+Write it like this:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ssize_t n_bytes = multicast.send ((char *) &amp;reply_port,
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sizeof reply_port)
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Send multicast of one byte, enough to wake up server.
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (n_bytes == -1)
+</pre>
+But, beware if the initialization is of a static variable. A static variable
+is only initialized the first time its declaration is seen. Of course,
+we should avoid using static variables at all.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+It is usually clearer to write conditionals that have both branches without
+a negated condition. For example,</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (test)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // true branch
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; else
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // false branch
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+is preferred over:
+<br>&nbsp;
+<br>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (! test)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // false test branch
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; else
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // true test branch
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+
+<li>
+If a cast is necessary, avoid use of function-style casts, <i>e.g.</i>,
+<tt>int (foo)</tt>. Instead, use one of the ACE cast macros:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return ACE_static_cast(size_t, this->count_) > that->size_;
+</pre>
+The general usage guidelines for the four styles of casts are:
+<br>&nbsp;
+<br>&nbsp;
+<ul>
+<li>
+<b>ACE_const_cast</b>: use to cast away constness, or volatile-ness.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>ACE_static_cast</b>: use to cast between compatible types, such as downcasting
+a pointer or narrowing an integer.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>ACE_reinterpret_cast</b>: use only when ACE_static_cast is not suitable.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>ACE_dynamic_cast</b>: avoid, unless you really want to type check at
+run-time.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
+
+<li>
+In general, if instances of a class should not be copied, then a private
+copy constructor and assignment operator should be declared for the class,
+but not implemented. For example:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // Disallow copying by not implementing the following . . .
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_Object_Manager (const ACE_Object_Manager &amp;);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_Object_Manager &amp;operator= (const ACE_Object_Manager &amp;);
+</pre>
+If the class is a template class, then the <tt>ACE_UNIMPLEMENTED_FUNC</tt>
+macro should be used:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // = Disallow copying...
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS&lt;TYPE> &amp;))
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS&lt;TYPE> &amp;))
+</pre>
+<tt>ACE_UNIMPLEMENTED_FUNC</tt> can be used with non-template classes as
+well. Though for consistency and maximum safety, it should be avoided for
+non-template classes.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Never use <tt>bool</tt>, <tt>BOOL</tt>, or similar types. (CORBA::Boolean
+is acceptable). Use <tt>int</tt> or <tt>u_int</tt> instead for boolean
+types.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Functions should always return -1 to indicate failure, and 0 or greater
+to indicate success.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<br>&nbsp;
+<p>Separate the code of your templates from the code for non-parametric
+classes: some compilers get confused when template and non-template code
+is mixed in the same file.</ul>
+
+<li>
+<b>I/O</b></li>
+
+<br>&nbsp;
+<p>&nbsp;
+<ul>
+<li>
+Use <b><tt>ACE_DEBUG</tt></b> for printouts, and <b><tt>ACE_OS::scanf/fprintf
+()</tt></b> for file I/O. Avoid using iostreams because of implementation
+differences across platforms.</li>
 
+<br>&nbsp;
+<p>&nbsp;
+<li>
+After attempting to open an existing file, always check for success. Take
+appropriate action if the open failed.</li>
 
-<hr>
-<h3><a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Other
-  ACE</a> and
-  <a href="http://www.cs.wustl.edu/~schmidt/TAO-overview.html">TAO</a>
-  Guidelines</h3>
-<ul>
-  <li>When enhancing, updating, or fixing ACE or TAO, always:<p>
-  <ol>
-    <li>Test your change on at least one platorm.<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
-      <a href="../apps/gperf">gperf,</a> have their
-      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>If the change is in response to a request by someone else:
-    <ol>
-      <li>Make sure that person is acknowledged in
-        <a href="../README">ACE_wrappers/README</a>, and<p>
-      <li>Respond to that person.<p>
-    </ol>
-  </ol>
-
-  <li>Never add copyrighted, confidential, or otherwise restricted
-      code to the ACE or TAO distributions without written permission
-      from the owner.<p>
-</ul>
+<br>&nbsp;
+<p>&nbsp;</ul>
 
+<li>
+<b>UNICODE conformity</b></li>
 
-<hr>
-<h3><a href="http://www.cs.wustl.edu/~levine/CVS.html">CVS</a>
-  Usage Guidelines</h3>
+<br>&nbsp;
+<p>&nbsp;
+<ul>
+<li>
+Define strings as <b><tt>ASYS_TCHAR</tt></b> if they need to be passed
+into system API. It expands to <tt>wchar_t</tt> only when <tt>ACE_HAS_MOSTLY_UNICODE_APIS</tt>
+is defined.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Use <b><tt>ASYS_TEXT</tt></b> and <b><tt>ASYS_WIDE_STRING</tt></b> for
+format strings and other string arguments passed to <tt>ACE_DEBUG</tt>
+or <tt>ACE_ERROR</tt>. For example,</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; void
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_FOO::ace_bar (int err, ASYS_TCHAR *astr)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_TRACE ("ACE_FOO::ace_bar");
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("From ACE_FOO::ace_bar")));
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (err)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ERROR ((LM_ERROR,
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ASYS_TEXT ("(%P) Printing this string %s\n"),
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; astr));
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+This is because ACE also support platforms which use UNICODE in most of
+their APIs. On these platforms, ACE also uses UNICODE as its system string
+type.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+<b><tt>ACE_TRACE</tt></b> handles conversion between char strings and UNICODE
+strings automatically.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Other helper macros include <b><tt>ASYS_MULTIBYTE_STRING</tt></b> and <b><tt>ASYS_ONLY_MULTIBYTE_STRING</tt></b>.
+See the end of <a href="../ace/OS.h">OS.h</a> for more details.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
+
+<li>
+<b>Exceptions</b></li>
+
+<br>&nbsp;
+<p>&nbsp;
 <ul>
-  <li>Always make sure that a change builds and executes correctly
-      on at least one platform before checking it into the CVS repository.<p>
+<li>
+There are many ways of throwing and catching exceptions. The code below
+gives several examples. Note that each method has different semantics and
+costs. Whenever possible, use the first approach.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #include "iostream.h"
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; class exe_foo
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; public:
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exe_foo (int data) : data_ (data)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; { cerr &lt;&lt; "constructor of exception called" &lt;&lt; endl; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ~exe_foo ()
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; { cerr &lt;&lt; "destructor of exception called" &lt;&lt; endl; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exe_foo (const exe_foo&amp; foo) : data_ (foo.data_)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; { cerr &lt;&lt; "copy constructor of exception called" &lt;&lt; endl; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; int data_;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; };
+
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; void
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; good (int a)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; throw exe_foo (a);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; };
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; void
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; bad (int a)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exe_foo foo (a);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; throw foo;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; };
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; int main ()
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cout &lt;&lt; endl &lt;&lt; "First exception" &lt;&lt; endl &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; try
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; good (0);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; catch (exe_foo &amp;foo)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cout &lt;&lt; endl &lt;&lt; "Second exception" &lt;&lt; endl &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; try
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; good (0);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; catch (exe_foo foo)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cout &lt;&lt; endl &lt;&lt; "Third exception" &lt;&lt; endl &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; try
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; bad (1);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; catch (exe_foo &amp;foo)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cout &lt;&lt; endl &lt;&lt; "Fourth exception" &lt;&lt; endl &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; try
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; bad (1);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; catch (exe_foo foo)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; {
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; cerr &lt;&lt; "exception caught: " &lt;&lt; foo.data_ &lt;&lt; endl;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; return 0;
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }
+</pre>
+Output is:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; First exception
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exception caught: 0
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Second exception
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; copy constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exception caught: 0
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Third exception
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; copy constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exception caught: 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Fourth exception
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; copy constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; copy constructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; exception caught: 1
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; destructor of exception called
+
+</pre>
+</ul>
 </ul>
-
 
 <hr>
-<h3>Script Guidelines</h3>
-<ul>
-  <li>In general, it's best to write scripts in Perl.  It's
-    OK to use Bourne shell.  Never, never, never use csh, ksh,
-    bash, or any other kind of shell.<p>
-
-  <li>Follow the Perl style guide guide as closely as
-    possible.  <code>man perlstyle</code> to view it.
-
-  <li>Don't specify a hard-coded path to Perl itself.  Use
-    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;
-      </pre><p>
-
-  <li>Never, never, never start the first line of a script
-    with ``#'', unless the first line is ``#! /bin/sh''.
-    With just ``#'', t/csh users will spawn a new shell.
-    That will cause their <code>.[t]cshrc</code> to be
-    processed, possibly clobbering a necessary part of
-    their environment.<p>
-
-  <li>If your Perl script relies on features only available
-    in newer versions of Perl, include the a statement similar
-    to the following:<br>
-      <pre>
-        require 5.003;
-      </pre>
-
-  <li>Don't depend on <strong><code>.</code></strong> being
-    in the user's path.  If the script spawns another executable
-    that is supposed to be in the current directory, be sure the
-    prefix its filename with <strong><code>.</code></strong>.<p>
-</ul>
+<h3>
+<a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">ACE</a> Usage
+Guidelines</h3>
 
+<ul>
+<li>
+Always use <b><tt>ACE_OS</tt></b> (static) member functions instead of
+bare OS system calls.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+As a general rule, the only functions that should go into the <b><tt>ACE_OS</tt></b>
+class are ones that have direct equivalents on some OS platform. Functions
+that are extensions should go in the <b><tt>ACE</tt></b> class.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Use the <b><tt>ACE_SYNCH_MUTEX</tt></b> macro, instead of using one of
+the specific mutexes, such as <b><tt>ACE_Thread_Mutex</tt></b>. This provides
+portability between threaded and non-threaded platforms.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Avoid creating a static instance of user-defined (class) type. Instead,
+either create it as an <b><tt>ACE_Singleton</tt></b>, <b><tt>ACE_TSS_Singleton</tt></b>,
+or as an <b><tt>ACE_Cleanup</tt></b> object. See the <b>ACE</b> <tt><a href="../ace/Singleton.h">Singleton.h</a></tt>,
+<tt><a href="../ace/Object_Manager.h">Object_Manager.h</a></tt>, and <tt><a href="../ace/Managed_Object.h">Managed_Object.h</a></tt>
+header files for more information.</li>
+
+<p><br>&nbsp;Static instances of built-in types, such as <b><tt>int</tt></b>
+or any pointer type, are fine.
+<p>&nbsp;Construction of static instance of a user-defined type should
+<i>never</i> spawn threads. Because order of construction of statics across
+files is not defined by the language, it is usually assumed that only one
+thread exists during static construction. This allows statics suchs as
+locks to be safely created. We do not want to violate this assumption.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Do not use run-time type identification (RTTI). Some platforms do not support
+it.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Do not use C++ exception handling directly. Some platforms do not support
+it. And, it can impose an execution speed penalty. Instead use the TAO/ACE
+try/catch macros.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Because ACE does not use exception handling, dealing with failures requires
+a bit of care. This is especially true in constructors. Consider the following
+approach:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_NEW_RETURN (this->name_space_, LOCAL_NAME_SPACE, -1);
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if (ACE_LOG_MSG->op_status () != 0)
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ....
+</pre>
+This snip of code is from <tt><a href="../ace/Naming_Context.cpp">ACE_Naming_Context</a></tt>.
+All failed constructors in ACE (should) call ACE_ERROR. This sets the thread
+specific <b>op_status</b>, which can be checked by the caller. This mechanism
+allows the caller to check for a failed constructor without the requiring
+the constructor to throw exceptions.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Avoid using the C++ Standard Template Library (STL) in our applications.
+Some platforms do not support it yet.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Be <i>very</i> careful with <tt>ACE_ASSERT</tt>. It must only be used to
+check values; it may never be used to wrap a function call, or contain
+any other side effect. That's because the statement will disappear when
+ACE_NDEBUG is enabled. For example, this code is BAD:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ASSERT (this->next (retv) != 0);&nbsp; // BAD CODE!
+</pre>
+Instead, the above should be coded this way:
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; int result = this->next (retv);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_ASSERT (result != 0);
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_UNUSED_ARG (result);
+</pre>
+
+<li>
+Never put side effects in <tt>ACE_DEBUG</tt> code:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_DEBUG ((LM_DEBUG,
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; "handling signal: %d iterations left\n",
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; --this->iterations_));&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; // BAD CODE!
+</pre>
+Note that this won't work correctly if <tt>ACE_NDEBUG</tt> is defined,
+for the same reason that having side-effects in <tt>ACE_ASSERT</tt>s won't
+work either, <i>i.e.</i>, because the code is removed.
+<br>&nbsp;
+<br>&nbsp;
+<li>
+Immediately after opening a temporary file, unlink it. For example:</li>
+
+<pre>
+<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_HANDLE h = open the file (filename);
+
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ACE_OS::unlink (filename);
+</tt></pre>
+This avoids leaving the temporary file even if the program crashes.
+<br>&nbsp;
+<br>&nbsp;</ul>
 
 <hr>
-<h3>Software Engineering Guidelines</h3>
+<h3>
+<a href="http://www.cs.wustl.edu/~schmidt/ACE-overview.html">Other ACE</a>
+and <a href="http://www.cs.wustl.edu/~schmidt/TAO-overview.html">TAO</a>
+Guidelines</h3>
+
 <ul>
-  <li><strong>Advise</strong>:  Keep other developers informed of problems
-      and progress.<p>
+<li>
+Never add copyrighted, confidential, or otherwise restricted code to the
+ACE or TAO distributions without written permission from the owner.</li>
 
-  <li><strong>Authorize</strong>:  We have contractual obligations to not
-      unilaterally change interfaces.  If you need to change or remove an
-      interface, get an OK.<p>
+<li>
+A source code filename should never be a (case-insenstitive) duplicate
+of another, even if it is in a different directory (or project). Some compilers
+will break if this is so.</li>
 
-  <li><strong>Minimize</strong> risk:  Test all changes.  Solicit review of
-      changes.<p>
+<br>&nbsp;
+<p>&nbsp;</ul>
 
-  <li><strong>Revise</strong> only when necessary:  Every change has risk,
-      so avoid making any change unless there is a good reason for it.<p>
+<hr>
+<h3>
+<a href="http://www.cs.wustl.edu/~levine/CVS.html">CVS</a> Usage Guidelines</h3>
 
-  <li><strong>Normalize</strong>:  Factor out commonality.  For example,
-      maintain a data value in only one place.<p>
+<ul>
+<li>
+Always make sure that a change builds and executes correctly on at least
+one platform before checking it into the CVS repository.</li>
 
-  <li><strong>Synthesize</strong>:  Build stubs and scaffolding early to
-      simulate the complete system.  Maintain a checked-in version of the
-      system that cleanly builds and tests at all times.<p>
-</ul>
+<br>&nbsp;
+<p>&nbsp;</ul>
+
+<hr>
+<h3>
+Script Guidelines</h3>
 
+<ul>
+<li>
+In general, it's best to write scripts in Perl. It's OK to use Bourne shell.
+Never, never, never use csh, ksh, bash, or any other kind of shell.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+Follow the Perl style guide guide as closely as possible. <tt>man perlstyle</tt>
+to view it.</li>
+
+<li>
+Don't specify a hard-coded path to Perl itself. Use the following code
+at the top of the script to pick up perl from the users <tt>PATH</tt>:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; eval '(exit $?0)' &amp;&amp; eval 'exec perl -S $0 ${1+"$@"}'
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &amp; eval 'exec perl -S $0 $argv:q'
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; if 0;
+</pre>
+
+<li>
+Never, never, never start the first line of a script with ``#'', unless
+the first line is ``#! /bin/sh''. With just ``#'', t/csh users will spawn
+a new shell. That will cause their <tt>.[t]cshrc</tt> to be processed,
+possibly clobbering a necessary part of their environment.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+If your Perl script relies on features only available in newer versions
+of Perl, include the a statement similar to the following:</li>
+
+<pre>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; require 5.003;
+</pre>
+
+<li>
+Don't depend on <b><tt>.</tt></b> being in the user's path. If the script
+spawns another executable that is supposed to be in the current directory,
+be sure the prefix its filename with <b><tt>.</tt></b>.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
 
 <hr>
-<h3><a href="http://www.cs.wustl.edu/~schmidt/rules.html">ACE
-  Design Rules</a></h3>
+<h3>
+Software Engineering Guidelines</h3>
 
+<ul>
+<li>
+<b>Advise</b>: Keep other developers informed of problems and progress.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>Authorize</b>: We have contractual obligations to not unilaterally change
+interfaces. If you need to change or remove an interface, get an OK.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>Minimize</b> risk: Test all changes. Solicit review of changes.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>Revise</b> only when necessary: Every change has risk, so avoid making
+any change unless there is a good reason for it.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>Normalize</b>: Factor out commonality. For example, maintain a data
+value in only one place.</li>
+
+<br>&nbsp;
+<p>&nbsp;
+<li>
+<b>Synthesize</b>: Build stubs and scaffolding early to simulate the complete
+system. Maintain a checked-in version of the system that cleanly builds
+and tests at all times.</li>
+
+<br>&nbsp;
+<p>&nbsp;</ul>
 
-<hr> <P>
-  <font size=-1>
-    Last modified <!--#echo var="LAST_MODIFIED" -->.<p>
-  </font>
+<hr>
+<h3>
+<a href="http://www.cs.wustl.edu/~schmidt/rules.html">ACE Design Rules</a></h3>
 
+<hr>
+<p><font size=-1>Last modified&nbsp;<!--#echo var="LAST_MODIFIED" -->.</font>
+<br>&nbsp;
+<br>&nbsp;
 </body>
 </html>
diff --git a/docs/ACE-porting.html b/docs/ACE-porting.html
index 47ae7c3b577..fcca8011659 100644
--- a/docs/ACE-porting.html
+++ b/docs/ACE-porting.html
@@ -170,7 +170,7 @@ take advantage of if a compiler supports them:
         of ACE, however). <P>
 
         If you are considering STL, you might consider
-        <A HREF="http://www.stlport.org/">STLport</a>,
+        <A HREF="http://corp.metabyte.com/~fbp/stl/index.html">STLport</a>,
         which is a port of the SGI STL to numerous platforms that ACE
         and TAO also support. <P>
 </UL>
diff --git a/docs/ACE-subsets.html b/docs/ACE-subsets.html
index 3a7515b8a47..c3ef0e99bee 100644
--- a/docs/ACE-subsets.html
+++ b/docs/ACE-subsets.html
@@ -1,61 +1,44 @@
-<!-- $Id$ -->
-
-<html>
-  <head>
-    <title>ACE Subsets</title>
-    <link rev=made href="mailto:ace-users@cs.wustl.edu">
-  </head>
-
-<body text = "#000000"
-      link="#000fff"
-      vlink="#ff0f0f"
-      bgcolor="#ffffff">
-
-<hr><p>
-<font size=+2><strong>Contents</strong></font>
-<ol>
-  <li><a href="#Motivation">Motivation for Splitting ACE into Multiple
-    Libraries</a>
-  <li><a href="#Configuration Management">Configuration Management</a>
-  <li><a href="#Classes">Classes in Each ACE Library Subset</a>
-  <li><a href="#Status">Current ACE Subsetting Status</a>
-  <li><a href="#ACE Library Size Breakdown">ACE Library Size Breakdown</a>
-  <li><a href="#Building ACE Subsets">Building ACE Subsets</a>
-  <li><a href="#ACE_OS Adaptation Layer">ACE_OS Adaptation Layer</a>
-  <li><a href="#minimumTAO">Minimum TAO</a>
-</ol><p>
-
-
-<hr><p>
-<h3><a name="Motivation">Motivation for Splitting ACE into Multiple
-  Libraries</a></h3>
-
-This document describes how we are splitting ACE into multiple
-libraries, each of which will contain a smaller subset of the overall
-ACE functionality.  The primary motivations for subsetting ACE are:
+<HTML>
+
+<HEAD>
+<TITLE>ACE Subsets</TITLE>
+
+<BODY text = "#000000"
+link="#000fff"
+vlink="#ff0f0f"
+bgcolor="#ffffff">
+
+<HR>
+<H3>Proposal for Splitting ACE into Multiple Libraries</H3>
+
+The following is a draft of our proposal for spliting ACE into
+multiple libraries, each of which will contain a smaller subset of the
+overall ACE functionality.  The primary motivations for subsetting ACE
+are:
 
 <UL>
-<LI><EM>Principle of parsimony</EM> -- <EM>i.e.</EM>, developers
-  should incur time/space overhead for components they use, rather
-  than for all the components in the ACE framework. <P>
+<LI> <EM>Principle of parsimony</EM> -- <EM>i.e.</EM>, developers
+    should incur time/space overhead for components they use, rather
+    than for all the components in the ACE framework. <P>
 
-<LI><EM>Simplify the learning curve</EM> -- <EM>i.e.</EM>, developers
-  only need to learn how to program components that they actually
-  use. <P>
+<LI> <EM>Simplify the learning curve</EM> -- <EM>i.e.</EM>, developers
+    only need to learn how to program components that they actually
+    use. <P>
 </UL>
 
-The main design goals of our approach are as follows: <P>
+The main design goals of this proposal are as follows: <P>
 
 <OL>
-<LI>Support the original libACE as before.  Thus, for users who
-want to use the existing ACE library as is, there will be
+<LI> Support the original libACE as before.  Thus, for users who
+want to use the existing ACE library as is, there will be 
 no changes, i.e., just link with <CODE>libACE</CODE> as usual. <P>
 
-<LI>Allow ACE (and TAO) programmers to use smaller subsets of the
+<LI> Allow ACE (and TAO) programmers to use smaller subsets of the
 entire <CODE>libACE</CODE> library.  These subsets will include the
 following libraries: <P>
 
 <DL>
+
 <DT> <img alt="o"
 src="http://www.cs.wustl.edu/~schmidt/gifs/misc/redball.gif">
 <CODE>libACE_OS</CODE> -- This library contains the OS adaptation
@@ -132,37 +115,32 @@ depend on <CODE>libACE_OS</CODE>.<P>
 In addition, we will create <CODE>libACE_TAO</CODE>, which contains
 just the core set of components in ACE that are required to support
 TAO.  This library is targeted at embedded systems developers who want
-to minimize the footprint of ACE+TAO.  We are also planning to support
-the OMG's <A
-HREF="http://www.omg.org/cgi-bin/doc?orbos/98-08-04.pdf">Minimum
-CORBA</A> specification as part of a separate effort.  Preliminary
-results of prototypes for Minimum CORBA we've integrate to TAO have
-been very promising, yielding a 40% reduction in ORB footprint. <P>
+to minimize the footprint of ACE+TAO. <P>
 
 Note that the ACE library subsets described above are intended as a
 guideline, <EM>not</EM> a complete specification.  The actual
 partitioning of files in the final ACE library subsets may differ
-somewhat to improve footprint and simplify common use-cases. <P>
+somewhat in order to improve footprint and simplify common
+use-cases. <P>
 
-<hr><p>
-<h3><a name="Configuration Management">Configuration Management</a></h3>
+<HR><P>
+<H3>Configuration Management</H3>
 
 Configuration management for the ACE library subsets described above
 will be organized as follows:
 
 <OL>
-<LI>A single source tree with a single "version" for the source
-    tree.<P>
+<LI> A single source tree with a single "version" for the source
+    tree. <P>
 
-<LI>Releases of libACE and its "subsets" will be atomic, <EM>i.e.</EM>,
-    all or nothing.<P>
+<LI> Releases of libACE and its "subsets" will be atomic, <EM>i.e.</EM>,
+     all or nothing. <P>
 </OL>
 
+<HR><P>
+<H3>Classes in Each ACE Library Subset</H3>
 
-<hr><p>
-<h3><a name="Classes">Classes in Each ACE Library Subset</a></h3>
-
-Below, we describe the classes in each ACE library subset.
+Below, we describe the classes in each ACE library subset. 
 
 <H4>libACE_OS</H4>
 
@@ -172,11 +150,18 @@ ACE library subsets.  All of the other libraries will depend on this
 library.  The following classes are included in this library.
 
 <PRE><CODE>
+ACE.cpp
+ACE.h
+ACE.i
 config.h
-Basic_Types
-OS
-Sched_Params
-</code></pre>
+Basic_Types.cpp
+Basic_Types.h
+Basic_Types.i
+OS.cpp
+OS.h
+OS.i
+Version.h
+</PRE></CODE>
 
 <H4>libACE_Utils</H4>
 
@@ -184,82 +169,208 @@ This library contains the following ACE container classes and other
 miscellaneous classes.
 
 <PRE><CODE>
-ACE 
-Active_Map_Manager 
-Arg_Shifter 
-ARGV 
-Containers 
-Dirent 
-Dynamic 
-Filecache 
-Functor 
-Get_Opt 
-Hash_Map_Manager 
-High_Res_Timer 
-Method_Request 
-Object_Manager 
-Profile_Timer 
-Registry 
-SString 
-Stats 
-System_Time 
-Time_Request_Reply 
-Timeprobe 
-Timer_Hash 
-Timer_Heap 
-Timer_List 
-Timer_Queue 
-Timer_Wheel
-LOGGING_FILES = 
-Dump 
-Log_Msg 
-Log_Record 
-Trace
-</code></pre>
+ARGV.cpp
+ARGV.h
+ARGV.i
+Auto_Ptr.cpp
+Auto_Ptr.h
+Auto_Ptr.i
+Containers.cpp
+Containers.i
+Containers.h
+Date_Time.cpp
+Date_Time.h
+Date_Time.i
+Dynamic.cpp
+Dynamic.h
+Dynamic.i
+Filecache.cpp
+Filecache.h
+Free_List.cpp
+Free_List.i
+Free_List.h
+Get_Opt.cpp
+Get_Opt.h
+Get_Opt.i
+Hash_Map_Manager.cpp
+Hash_Map_Manager.h
+High_Res_Timer.cpp
+High_Res_Timer.h
+High_Res_Timer.i
+Managed_Object.cpp
+Managed_Object.h
+Managed_Object.i
+Map_Manager.cpp
+Map_Manager.h
+Map_Manager.i
+Object_Manager.cpp
+Object_Manager.i
+Object_Manager.h
+Profile_Timer.cpp
+Profile_Timer.h
+Profile_Timer.i
+Registry.cpp
+Registry.h
+Singleton.cpp
+Singleton.h
+Singleton.i
+SString.cpp
+SString.h
+SString.i
+System_Time.cpp
+System_Time.h
+Time_Request_Reply.cpp
+Time_Request_Reply.h
+# Time_Value.cpp
+# Time_Value.h
+# Time_Value.i
+Timer_Hash.cpp
+Timer_Hash.h
+Timer_Hash_T.cpp
+Timer_Hash_T.h
+Timer_Heap.cpp
+Timer_Heap.h
+Timer_Heap.i
+Timer_Heap_T.cpp
+Timer_Heap_T.h
+Timer_Heap_T.i
+Timer_List.cpp
+Timer_List.h
+Timer_List.i
+Timer_List_T.cpp
+Timer_List_T.h
+Timer_List_T.i
+Timer_Queue.cpp
+Timer_Queue.h
+Timer_Queue.i
+Timer_Queue_Adapters.cpp
+Timer_Queue_Adapters.h
+Timer_Queue_Adapters.i
+Timer_Queue_T.cpp
+Timer_Queue_T.h
+Timer_Queue_T.i
+Timer_Wheel.cpp
+Timer_Wheel.h
+Timer_Wheel.i
+Timer_Wheel_T.cpp
+Timer_Wheel_T.h
+Timer_Wheel_T.i
+</PRE></CODE>
 
 <H4>libACE_Logging</H4>
 
-This library contains the various ACE logging and tracing classes.
+This library contains the various ACE logging and tracing classes. 
 
 <PRE><CODE>
-Dump 
-Log_Msg 
-Log_Record 
-Trace
-</code></pre>
+Dump.cpp
+Dump.h
+Dump_T.cpp
+Dump_T.h
+Log_Msg.cpp
+Log_Msg.h
+Log_Msg.i
+Log_Priority.h
+Log_Record.cpp
+Log_Record.h
+Log_Record.i
+Trace.cpp
+Trace.h
+Trace.i
+</PRE></CODE>
 
 <H4>libACE_Threads</H4>
 
 This library contains the ACE thread/process management and
-synchronization classes.
+synchronization classes. 
 
 <PRE><CODE>
-Activation_Queue 
-Process 
-Process_Manager 
-Synch 
-Synch_Options 
-Thread 
-Thread_Manager 
-Token
-</code></pre>
+Activation_Queue.h
+Activation_Queue.cpp
+Atomic_Op.i
+Future.h
+Future.cpp
+Method_Object.h
+Method_Object.cpp
+Process.cpp
+Process.h
+Process.i
+Process_Manager.cpp
+Process_Manager.h
+Process_Manager.i
+Sched_Params.cpp
+Sched_Params.h
+Sched_Params.i
+Synch.cpp
+Synch.h
+Synch.i
+Synch_Options.cpp
+Synch_Options.h
+Synch_Options.i
+Synch_T.cpp
+Synch_T.h
+Synch_T.i
+Thread.cpp
+Thread.h
+Thread.i
+Thread_Manager.cpp
+Thread_Manager.h
+Thread_Manager.i
+Token.cpp
+Token.h
+Token.i
+Token_Collection.cpp
+Token_Collection.h
+Token_Collection.i
+Token_Invariants.cpp
+Token_Invariants.h
+Token_Invariants.i
+Token_Manager.cpp
+Token_Manager.h
+Token_Manager.i
+Token_Request_Reply.cpp
+Token_Request_Reply.h
+Token_Request_Reply.i
+</PRE></CODE>
 
 <H4>libACE_Demux</H4>
 
 This library contains the ACE Reactor and its associated classes,
-including the ACE Connection components.
+including the ACE Connection components. 
 
 <PRE><CODE>
-Event_Handler 
-Handle_Set 
-POSIX_Proactor 
-Priority_Reactor 
-Proactor 
-Reactor 
-Select_Reactor 
-Select_Reactor_Base 
-WFMO_Reactor
-</code></pre>
+Event_Handler.cpp
+Event_Handler.h
+Event_Handler.i
+Event_Handler_T.cpp
+Event_Handler_T.h
+Event_Handler_T.i
+Handle_Set.cpp
+Handle_Set.h
+Handle_Set.i
+Priority_Reactor.cpp
+Priority_Reactor.i
+Priority_Reactor.h
+Proactor.h
+Proactor.i
+Proactor.cpp
+Reactor.cpp
+Reactor.h
+Reactor.i
+Reactor_Impl.h
+Select_Reactor.cpp
+Select_Reactor.h
+Select_Reactor.i
+Select_Reactor_Base.cpp
+Select_Reactor_Base.h
+Select_Reactor_Base.i
+Select_Reactor.h
+Select_Reactor.i
+WFMO_Reactor.cpp
+WFMO_Reactor.h
+WFMO_Reactor.i
+XtReactor.cpp
+XtReactor.h
+</PRE></CODE>
 
 <H4>libACE_Connection</H4>
 
@@ -267,34 +378,89 @@ This library contains the ACE Connection components, i.e., Acceptor,
 Connector, and Svc_Handler.
 
 <PRE><CODE>
-Asynch_IO 
-Asynch_IO_Impl 
-POSIX_Asynch_IO 
-Strategies
-</code></pre>
+Acceptor.cpp
+Acceptor.h
+Acceptor.i
+Asynch_Acceptor.cpp
+Asynch_Acceptor.h
+Asynch_Acceptor.i
+Asynch_IO.cpp
+Asynch_IO.h
+Asynch_IO.i
+Connector.cpp
+Connector.h
+Connector.i
+Dynamic_Service.cpp
+Dynamic_Service.h
+Dynamic_Service.i
+Strategies.cpp
+Strategies.h
+Strategies.i
+Strategies_T.cpp
+Strategies_T.h
+Strategies_T.i
+Svc_Handler.cpp
+Svc_Handler.h
+Svc_Handler.i
+</PRE></CODE>
 
 <H4>libACE_Sockets</H4>
 
-This library contains the ACE C++ wrappers for sockets.
+This library contains the ACE C++ wrappers for sockets.  
 
 <PRE><CODE>
-IPC_SAP 
-LSOCK 
-LSOCK_Acceptor 
-LSOCK_CODgram 
-LSOCK_Connector 
-LSOCK_Dgram 
-LSOCK_Stream 
-SOCK 
-SOCK_Acceptor 
-SOCK_CODgram 
-SOCK_Connector 
-SOCK_Dgram 
-SOCK_Dgram_Bcast 
-SOCK_Dgram_Mcast 
-SOCK_IO 
-SOCK_Stream
-</code></pre>
+IPC_SAP.cpp
+IPC_SAP.h
+IPC_SAP.i
+LOCK_SOCK_Acceptor.cpp
+LOCK_SOCK_Acceptor.h
+LSOCK.cpp
+LSOCK.h
+LSOCK.i
+LSOCK_Acceptor.cpp
+LSOCK_Acceptor.h
+LSOCK_Acceptor.i
+LSOCK_CODgram.cpp
+LSOCK_CODgram.h
+LSOCK_CODgram.i
+LSOCK_Connector.cpp
+LSOCK_Connector.h
+LSOCK_Connector.i
+LSOCK_Dgram.cpp
+LSOCK_Dgram.h
+LSOCK_Dgram.i
+LSOCK_Stream.cpp
+LSOCK_Stream.h
+LSOCK_Stream.i
+SOCK.cpp
+SOCK.h
+SOCK.i
+SOCK_Acceptor.cpp
+SOCK_Acceptor.h
+SOCK_Acceptor.i
+SOCK_CODgram.cpp
+SOCK_CODgram.h
+SOCK_CODgram.i
+SOCK_Connector.cpp
+SOCK_Connector.h
+SOCK_Connector.i
+SOCK_Dgram.cpp
+SOCK_Dgram.h
+SOCK_Dgram.i
+SOCK_Dgram_Bcast.cpp
+SOCK_Dgram_Bcast.h
+SOCK_Dgram_Bcast.i
+SOCK_Dgram_Mcast.cpp
+SOCK_Dgram_Mcast.h
+SOCK_Dgram_Mcast.i
+SOCK_IO.cpp
+SOCK_IO.h
+SOCK_IO.i
+SOCK_Stream.cpp
+SOCK_Stream.h
+SOCK_Stream.i
+
+</PRE></CODE>
 
 <H4>libACE_IPC</H4>
 
@@ -303,45 +469,130 @@ IPC and FILE I/O other than sockets.  This library will depend on the
 <CODE>libACE_Socket</CODE> library.
 
 <PRE><CODE>
-Addr 
-DEV 
-DEV_Addr 
-DEV_Connector 
-DEV_IO 
-FIFO 
-FIFO_Recv 
-FIFO_Recv_Msg 
-FIFO_Send 
-FIFO_Send_Msg 
-FILE_Addr 
-FILE 
-FILE_Connector 
-FILE_IO 
-INET_Addr 
-IO_SAP 
-IOStream 
-Pipe 
-Signal 
-SPIPE_Addr 
-SPIPE 
-SPIPE_Acceptor 
-SPIPE_Connector 
-SPIPE_Stream 
-SV_Message 
-SV_Message_Queue 
-SV_Semaphore_Complex 
-SV_Semaphore_Simple 
-SV_Shared_Memory 
-TLI 
-TLI_Acceptor 
-TLI_Connector 
-TLI_Stream 
-TTY_IO 
-UNIX_Addr 
-UPIPE_Acceptor 
-UPIPE_Connector 
-UPIPE_Stream
-</code></pre>
+
+Addr.cpp
+Addr.h
+Addr.i
+DEV.cpp
+DEV.h
+DEV.i
+DEV_Addr.cpp
+DEV_Addr.h
+DEV_Addr.i
+DEV_Connector.cpp
+DEV_Connector.h
+DEV_Connector.i
+DEV_IO.cpp
+DEV_IO.h
+DEV_IO.i
+FIFO.cpp
+FIFO.h
+FIFO.i
+FIFO_Recv.cpp
+FIFO_Recv.h
+FIFO_Recv.i
+FIFO_Recv_Msg.cpp
+FIFO_Recv_Msg.h
+FIFO_Recv_Msg.i
+FIFO_Send.cpp
+FIFO_Send.h
+FIFO_Send.i
+FIFO_Send_Msg.cpp
+FIFO_Send_Msg.h
+FIFO_Send_Msg.i
+FILE_Addr.cpp
+FILE_Addr.h
+FILE_Addr.i
+FILE.cpp
+FILE.h
+FILE.i
+FILE_Connector.cpp
+FILE_Connector.h
+FILE_Connector.i
+FILE_IO.cpp
+FILE_IO.h
+FILE_IO.i
+INET_Addr.cpp
+INET_Addr.h
+INET_Addr.i
+IO_SAP.cpp
+IO_SAP.h
+IO_SAP.i
+IOStream.cpp
+IOStream.h
+IOStream_T.cpp
+IOStream_T.h
+IOStream_T.i
+Pipe.cpp
+Pipe.h
+Pipe.i
+Signal.cpp
+Signal.h
+Signal.i
+SPIPE_Addr.cpp
+SPIPE_Addr.h
+SPIPE_Addr.i
+SPIPE.cpp
+SPIPE.h
+SPIPE.i
+SPIPE_Acceptor.cpp
+SPIPE_Acceptor.h
+SPIPE_Acceptor.i
+SPIPE_Connector.cpp
+SPIPE_Connector.h
+SPIPE_Connector.i
+SPIPE_Stream.cpp
+SPIPE_Stream.h
+SPIPE_Stream.i
+SV_Message.cpp
+SV_Message.h
+SV_Message.i
+SV_Message_Queue.cpp
+SV_Message_Queue.h
+SV_Message_Queue.i
+SV_Semaphore_Complex.cpp
+SV_Semaphore_Complex.h
+SV_Semaphore_Complex.i
+SV_Semaphore_Simple.cpp
+SV_Semaphore_Simple.h
+SV_Semaphore_Simple.i
+SV_Shared_Memory.cpp
+SV_Shared_Memory.h
+SV_Shared_Memory.i
+TLI.cpp
+TLI.h
+TLI.i
+TLI_Acceptor.cpp
+TLI_Acceptor.h
+TLI_Acceptor.i
+TLI_Connector.cpp
+TLI_Connector.h
+TLI_Connector.i
+TLI_Stream.cpp
+TLI_Stream.h
+TLI_Stream.i
+TTY_IO.cpp
+TTY_IO.h
+Typed_SV_Message.cpp
+Typed_SV_Message.h
+Typed_SV_Message.i
+Typed_SV_Message_Queue.cpp
+Typed_SV_Message_Queue.h
+Typed_SV_Message_Queue.i
+UNIX_Addr.cpp
+UNIX_Addr.h
+UNIX_Addr.i
+UPIPE_Addr.h
+UPIPE_Acceptor.cpp
+UPIPE_Acceptor.h
+UPIPE_Acceptor.i
+UPIPE_Connector.cpp
+UPIPE_Connector.h
+UPIPE_Connector.i
+UPIPE_Stream.cpp
+UPIPE_Stream.h
+UPIPE_Stream.i
+</PRE></CODE>
 
 <H4>libACE_Svcconf</H4>
 
@@ -349,475 +600,106 @@ This library contains the ACE C++ wrappers for the Service
 Configurator component.
 
 <PRE><CODE>
-DLL 
-Parse_Node 
-Service_Config 
-Service_Manager 
-Service_Object 
-Service_Repository 
-Service_Types 
-Shared_Object 
-Svc_Conf_l 
-Svc_Conf_y
-</code></pre>
+Parse_Node.cpp
+Parse_Node.h
+Parse_Node.i
+Service_Config.cpp
+Service_Config.h
+Service_Config.i
+Service_Manager.cpp
+Service_Manager.h
+Service_Manager.i
+Service_Object.cpp
+Service_Object.h
+Service_Object.i
+Service_Repository.cpp
+Service_Repository.h
+Service_Repository.i
+Service_Types.cpp
+Service_Types.i
+Service_Types.h
+Shared_Object.cpp
+Shared_Object.h
+Shared_Object.i
+Svc_Conf.h
+Svc_Conf_l.cpp
+Svc_Conf_y.cpp
+Svc_Conf_Tokens.h
+</PRE></CODE>
 
 <H4>libACE_Streams</H4>
 
-This library contains the ACE Streams classes.
+This library contains the ACE Streams classes. 
 
 <PRE><CODE>
-CDR_Stream 
-Message_Block 
-Message_Queue 
-Task
-</code></pre>
+IO_Cntl_Msg.cpp
+IO_Cntl_Msg.h
+IO_Cntl_Msg.i
+Message_Block.cpp
+Message_Block.h
+Message_Block.i
+Message_Queue.cpp
+Message_Queue.h
+Message_Queue.i
+Message_Queue_T.cpp
+Message_Queue_T.h
+Message_Queue_T.i
+Module.cpp
+Module.h
+Module.i
+Multiplexor.cpp
+Multiplexor.h
+Multiplexor.i
+Stream.cpp
+Stream.h
+Stream.i
+Stream_Modules.cpp
+Stream_Modules.h
+Stream_Modules.i
+Task.cpp
+Task.h
+Task.i
+Task_T.cpp
+Task_T.h
+Task_T.i
+</PRE></CODE>
 
 <H4>libACE_Memory</H4>
 
 This library contains the ACE C++ wrappers for shared memory and
-memory-mapped files.
+memory-mapped files. 
 
 <PRE><CODE>
-Malloc 
-Mem_Map 
-Memory_Pool 
-Obstack 
-Read_Buffer 
-Shared_Memory 
-Shared_Memory_MM 
-Shared_Memory_SV
-</code></pre>
-
-<H4>libACE_Token</H4>
-
-This componenty contains the ACE C++ wrappers for Token classes.
-
-<pre><code>
-Local_Tokens 
-Remote_Tokens 
-Token_Collection 
-Token_Invariants 
-Token_Manager 
-Token_Request_Reply
-</code></pre>
-
-<H4>libACE_Other</H4>
-
-This component contains miscellaneous ACE C++ wrappers.
-
-<pre><code>
-CORBA_Handler 
-CORBA_Ref 
-Local_Name_Space 
-Msg_WFMO_Reactor 
-Name_Proxy 
-Name_Request_Reply 
-Name_Space 
-Naming_Context 
-Registry_Name_Space 
-Remote_Name_Space 
-TP_Reactor 
-XtReactor
-</code></pre>
-
-<hr><p>
-<h3><a name="Status">Current ACE Subsetting Status</a></h3>
-
-The following are the remaining major subsetting issues: <P>
-
-  <ul>
-    <li>Remove remaining dependencies on higher layers from ACE_OS.
-      (These can be seen by searching for ACE_HAS_MINIMAL_ACE_OS
-       in OS.cpp, and by looking at the conditional #includes
-       near the top of OS.cpp.)
-    <ul>
-      <li>ACE_Thread_Manager
-      <li>ACE_Array
-      <li>ACE_TSS: move all ACE_TSS support into separate .h,.i,cpp files
-    </ul><p>
-
-    <li>Log_Msg cleanup:  We have a good start on this, but it needs work
-      to finish.  It might be easiest to make an abstract
-      base class, then have ACE_Log_Msg derive from it.  That way
-      we could remove the exposure of all the #includes in Log_Msg.cpp
-      to applications that don't need it.<p>
-
-    <li>Higher layer interdependencies:  we haven't been paying much
-      attention to this.  We need to figure out what's there, and
-      if/how to deal with the interdependencies.<p>
-
-    <li>Remove use of multiple inheritance:  its only used in a few
-      places, in one of the SOCK classes and service config.<p>
-  </ul><P>
-
-Please let us know if you're able to contribute to this effort.<p>
-
-
-<hr><p>
-<h3><a name="ACE Library Size Breakdown">ACE Library Size Breakdown</a></h3>
-
-Here is an example size breakdown, by ACE library component.  It is
-for ACE 4.6.25, statically built with these <a
-href="../ACE-INSTALL.html#flags">make flags</a>:
-
-<pre><code>
-    debug=0 optimize=1 static_libs_only=1 DEFFLAGS=-DACE_USE_RCSID=0
-</code></pre><p>
-
-To build an ACE static library, if shared libraries are the default, use
-<code>make static_libs_only=1</code>.<p>
-
-<center><table cellpadding=4 border=4>
-  <tr>
-    <th>Platform
-    <th>Component
-    <th>Total
-    <th>For TAO<br>subset
-    <th>OS
-    <th>Utils
-    <th>Logging
-    <th>Threads
-    <th>Demux
-    <th>Con-<br>nection
-    <th>Sockets
-    <th>IPC
-    <th>Svcconf
-    <th>Streams
-    <th>Memory
-    <th>Token
-    <th>Other
-  <tr>
-    <th rowspan=2>Linux (RedHat 5.2)<br>egcs 1.0.3
-    <th>Size, bytes
-    <td align=center>527445
-    <td align=center>395541
-    <td align=center>10645
-    <td align=center>111542
-    <td align=center>13783
-    <td align=center>54239
-    <td align=center>33880
-    <td align=center>650
-    <td align=center>12565
-    <td align=center>32391
-    <td align=center>91919
-    <td align=center>16773
-    <td align=center>17154
-    <td align=center>69346
-    <td align=center>62558
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>75
-    <td align=center>2
-    <td align=center>21
-    <td align=center>3
-    <td align=center>10
-    <td align=center>6
-    <td align=center>0
-    <td align=center>2
-    <td align=center>6
-    <td align=center>17
-    <td align=center>3
-    <td align=center>3
-    <td align=center>13
-    <td align=center>12
-
-  <tr>
-    <th rowspan=2>LynxOS 3.0.0<br>g++ 2.7-97r1
-    <th>Size, bytes
-    <td align=center>547004
-    <td align=center>429944
-    <td align=center>17056
-    <td align=center>100712
-    <td align=center>11104
-    <td align=center>44548
-    <td align=center>45780
-    <td align=center>52888
-    <td align=center>11468
-    <td align=center>29184
-    <td align=center>84236
-    <td align=center>15664
-    <td align=center>17304
-    <td align=center>62312
-    <td align=center>54748
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>78
-    <td align=center>3
-    <td align=center>18
-    <td align=center>2
-    <td align=center>8
-    <td align=center>8
-    <td align=center>10
-    <td align=center>2
-    <td align=center>5
-    <td align=center>15
-    <td align=center>3
-    <td align=center>3
-    <td align=center>11
-    <td align=center>10
-
-  <tr>
-    <th rowspan=2>SunOS5.7<br>egcs 1.1.1
-    <th>Size, bytes
-    <td align=center>587059
-    <td align=center>446609
-    <td align=center>21651
-    <td align=center>116410
-    <td align=center>14005
-    <td align=center>58063
-    <td align=center>39620
-    <td align=center>770
-    <td align=center>13719
-    <td align=center>40362
-    <td align=center>101543
-    <td align=center>19611
-    <td align=center>20855
-    <td align=center>75806
-    <td align=center>64644
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>76
-    <td align=center>4
-    <td align=center>20
-    <td align=center>2
-    <td align=center>10
-    <td align=center>7
-    <td align=center>0
-    <td align=center>2
-    <td align=center>7
-    <td align=center>17
-    <td align=center>3
-    <td align=center>4
-    <td align=center>13
-    <td align=center>11
-
-  <tr>
-    <th rowspan=2>SunOS 5.5.1<br>GreenHills 1.8.9
-    <th>Size, bytes
-    <td align=center>677237
-    <td align=center>527133
-    <td align=center>15232
-    <td align=center>147857
-    <td align=center>18336
-    <td align=center>64732
-    <td align=center>49220
-    <td align=center>976
-    <td align=center>19084
-    <td align=center>56662
-    <td align=center>109686
-    <td align=center>19652
-    <td align=center>25696
-    <td align=center>78792
-    <td align=center>71312
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>77
-    <td align=center>2
-    <td align=center>22
-    <td align=center>3
-    <td align=center>10
-    <td align=center>7
-    <td align=center>0
-    <td align=center>3
-    <td align=center>8
-    <td align=center>16
-    <td align=center>3
-    <td align=center>4
-    <td align=center>12
-    <td align=center>11
-
-  <tr>
-    <th rowspan=2>SunOS 5.7<br>Sun C++ 4.2
-    <th>Size, bytes
-    <td align=center>512538
-    <td align=center>344815
-    <td align=center>13433
-    <td align=center>63314
-    <td align=center>15570
-    <td align=center>61947
-    <td align=center>58158
-    <td align=center>864
-    <td align=center>16609
-    <td align=center>71484
-    <td align=center>50155
-    <td align=center>17747
-    <td align=center>22279
-    <td align=center>70771
-    <td align=center>96952
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>67
-    <td align=center>3
-    <td align=center>12
-    <td align=center>3
-    <td align=center>12
-    <td align=center>11
-    <td align=center>0
-    <td align=center>3
-    <td align=center>14
-    <td align=center>10
-    <td align=center>3
-    <td align=center>4
-    <td align=center>14
-    <td align=center>19
-
-  <tr>
-    <th rowspan=2>VxWorks 5.3.1<br>GreenHills 1.8.8
-    <th>Size, bytes
-    <td align=center>669176
-    <td align=center>519284
-    <td align=center>26248
-    <td align=center>143632
-    <td align=center>16860
-    <td align=center>60468
-    <td align=center>49964
-    <td align=center>868
-    <td align=center>18660
-    <td align=center>42512
-    <td align=center>120384
-    <td align=center>21444
-    <td align=center>19252
-    <td align=center>79112
-    <td align=center>70780
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>77
-    <td align=center>4
-    <td align=center>21
-    <td align=center>3
-    <td align=center>9
-    <td align=center>7
-    <td align=center>0
-    <td align=center>3
-    <td align=center>6
-    <td align=center>18
-    <td align=center>3
-    <td align=center>3
-    <td align=center>12
-    <td align=center>11
-
-  <tr>
-    <th rowspan=2>VxWorks 5.3.1<br>g++ cygnus-<br>2.7.2-960126<br>
-      (with implicit templates)
-    <th>Size, bytes
-    <td align=center>999608
-    <td align=center>742832
-    <td align=center>21232
-    <td align=center>164948
-    <td align=center>14752
-    <td align=center>66728
-    <td align=center>138008
-    <td align=center>9788
-    <td align=center>13116
-    <td align=center>108128
-    <td align=center>146528
-    <td align=center>39552
-    <td align=center>20052
-    <td align=center>108140
-    <td align=center>148636
-  <tr>
-    <th>Percentage of<br>total size
-    <td align=center>100
-    <td align=center>74
-    <td align=center>2
-    <td align=center>17
-    <td align=center>1
-    <td align=center>7
-    <td align=center>14
-    <td align=center>1
-    <td align=center>1
-    <td align=center>11
-    <td align=center>15
-    <td align=center>4
-    <td align=center>2
-    <td align=center>11
-    <td align=center>15
-</table></center><p>
-
-
-<hr><p>
-<h3><a name="Building ACE Subsets">Building ACE Subsets</a></h3>
-
-By default, the ACE library contains all of the components that ACE
-currently supports.  To reduce build time and library size, you can
-exclude unused components.  To do that, define an
-<code>ACE_COMPONENTS</code> variable using one of these approaches:<p>
-
-<ol>
-  <li>In your <code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>
-    file, <em>e.g.</em>, add:
-    <pre><code>ACE_COMPONENTS = OS</code></pre>or<p>
-
-  <li>On the make command line, <em>e.g.</em>,
-    <pre><code>make ACE_COMPONENTS=OS</code></pre>or<p>
-
-  <li>Set (and export) the <code>ACE_COMPONENTS</code> environment variable
-    to contain the components that you want to build.<p>
-</ol><p>
-
-Please see <code><a href="../ace/Makefile">../ace/Makefile</a></code>
-for the default contents of <code>ACE_COMPONENTS</code>.<p>
-
-A special value of <code>ACE_COMPONENTS</code> can be used to
-build an ACE library that supports
-<a href="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</a>.  The
-special value is <code>FOR_TAO</code>.  So, for example, you can
-add this to your
-<code>$(ACE_ROOT)/include/makeinclude/platform_macros.GNU</code>
-to restrict ACE support to just that which is needed for TAO:
-<pre><code>
-ACE_COMPONENTS = FOR_TAO
-</code></pre><p>
-
-Please note the current limitations:<p>
-
-<ol>
-  <li>We currently don't check for interdependencies between components.
-    For example, if you build any component beside <code>OS</code>, you
-    must explicitly include <code>OS</code> in your
-    <code>ACE_COMPONENTS</code>.<p>
-
-  <li>We currently don't check this macro in other ACE or TAO Makefiles, or
-    in their tests. We'll add those checks as time allows.</li>
-</ol>
-
-
-<hr><p>
-<h3><a name="ACE_OS Adaptation Layer">ACE_OS Adaptation Layer</a></h3>
-
-The lowest-level component, <code>OS</code>, is also called the
-<em>ACE_OS adaption layer</em>.  It provides the ACE interface to
-the underlying operating system, but little else.  It can be used
-standalone.<p>
-
-To create the ACE_OS adaptation layer, build your <code>libACE</code>
-with <code>ACE_COMPONENTS</code> set to <code>OS</code>.  In addition,
-add <code>#include "ace/config-minimal.h"</code> to your
-<code>ACE_wrappers/ace/config.h</code> file.<p>
-
-When using the ACE_OS adaptation layer, you'll be limited to the
-the <code>ACE_OS</code> member functions, ACE's
-<a href="../ace/Basic_Types.h">Basic_Types</a> and
-<a href="../ace/Sched_Params.h">Sched_Params</a>, and macros defined in
-<a href="../ace/OS.h"><code>ace/OS.h</code></a>.  See ACE's
-<a href="../tests/Basic_Types_Test.cpp">Basic_Types_Test.cpp</a>
-for an example of usage.<p>
+Malloc.cpp
+Malloc.h
+Malloc.i
+Malloc_T.cpp
+Malloc_T.h
+Malloc_T.i
+Mem_Map.cpp
+Mem_Map.h
+Mem_Map.i
+Memory_Pool.cpp
+Memory_Pool.h
+Memory_Pool.i
+Obstack.cpp
+Obstack.h
+Read_Buffer.cpp
+Read_Buffer.h
+Read_Buffer.i
+Shared_Memory.cpp
+Shared_Memory.h
+Shared_Memory_MM.cpp
+Shared_Memory_MM.h
+Shared_Memory_MM.i
+Shared_Memory_SV.cpp
+Shared_Memory_SV.h
+Shared_Memory_SV.i
+</PRE></CODE>
 
 <HR><P>
-
-<a name="minimumTAO">
-<!--#include virtual="/~schmidt/ACE_wrappers/TAO/docs/minimumTAO.html" -->
-</a>
-
-Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/ACE.html">ACE</A>
-home page.
+Back to the <A HREF="ACE.html">ACE</A> home page.
 
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
-</BODY>
+</BODY> 
 </HTML>
diff --git a/docs/exceptions.html b/docs/exceptions.html
index 0994d75aff4..73ad2b36ced 100644
--- a/docs/exceptions.html
+++ b/docs/exceptions.html
@@ -4,41 +4,20 @@
 <title>Using ACE try macros for CORBA programming</title>
 </head>
 
-<body text="#000000" link="#0000ff" vlink="#cc0000" bgcolor="#ffffff">
-<h1>Using ACE try macros for CORBA programming</h1>
+  <body>
+    <h1>Using ACE try macros for CORBA programming</h1>
 
-<p>ACE try macros will completely replace TAO try macros soon.  If you
-are still using TAO try macros in your code, you should replace them
-with ACE try macros to avoid possible breakage when we remove TAO try
-macros.<\p>
+    <P>CORBA::Environment provides a way for exception handling when
+      native c++ exception handling is unavailable or undesirable.
+      However, writing portable code for both (with and without) native
+      exception handling capability is very hairy.
+    </P>
+    <P>ACE provides a set of macros to help dealing with the chaos,
+      but please keep in mind that no amount of macros is going to
+      solve the problem perfectly.
+    </P>
 
-<P>It would be useful if the reader can go through the book, "Advanced
-Corba Programming with C++" by Michi & Steve, from pages 307 through
-to 322.
-</P>
-
-<P>CORBA::Environment provides a way to handle exceptions when
-native c++ exception handling is unavailable or undesirable.
-However, writing portable code for both (with and without) native
-exception handling capability is very hairy.
-</P>
-
-<P>ACE provides a set of macros to help dealing with the chaos,
-but please keep in mind that no amount of macros is going to
-solve the problem perfectly.
-</P>
-
-<h3>What's in here?</h3>
-<ul>
-  <li><a href="#nutshell">ACE Try Macros in a Nutshell</a>
-  <li><a href="#examples">Examples</a>
-  <li><a href="#general">General Guidelines for Exception Handling</a>
-  <li><a href="#transition">Transition from TAO try macros to ACE try
-      macros</a>
-  <li><a href="#caveats">Some Caveats</a>
-</ul>
-
-<h3><a name="nutshell">ACE Try Macros in a Nutshell</h3>
+<h3>In a Nutshell</h3>
 
 <P>This section explains some simple rules of writing programs for
 platforms with and without native exception support using ACE's
@@ -46,31 +25,38 @@ try macros.
 </P>
 
 <ol>
-  <li><p>ACE try macros are modelled like C++ language  exceptions and
-      can be used like them, but with a small difference. These macros
-      rely on  the CORBA::Environment variable to handle exceptions
-      on platforms that do not support exception
-      handling. (Please note that native exceptions can be turned on
-      or off at COMPILE time as an option to your make)
-      The exception macros  have been modelled with some extra rules to ensure it works even on
+  <li><p>ACE try macros are modeled and used like native c++
+      exceptions with some extra rules to ensure it works even on
       platforms without native exception support.  See some <a
-      href="#examples">quick examples</a> on  how to use ACE try
+      href="#examples">quick examples</a> about how to use ACE try
       macros.
       </p>
   </li>
 
   <li><P><em>Name of CORBA::Environment variable</em><br>
       A function that may throw a CORBA::Exception needs a
-      CORBA::Environment variable to pass up exceptions (to throw in
-      the C++ sense) and to gather (catch () in the C++ sense)
+      CORBA::Environment variable to pass up exceptions and to gather
       exceptions from functions it called.  By default, ACE try macros
-      assumes that the variable is named <code>ACE_TRY_ENV</code>.
+      assume the variable is named <code>ACE_TRY_ENV</code>.
       <code>ACE_TRY_ENV</code> itself is also a macro which can be
-      redefined.
+      redefined.  If you are using TAO, more likely than not, you
+      don't have to worry about redefining this macro because TAO
+      is written to use ACE try macros.  For example, you should
+      define your functions as,
+      </P>
+      <pre>
+      int AN_OBJ::foobar (int a, int b, CORBA_Environment &ACE_TRY_ENV);
+      </pre>
+      <P>
+      and within the function, call other functions that might throw
+      exceptions like,
+      </P>
+      <pre>
+      another_obj->func_name (x, y, ACE_TRY_ENV);
       </pre>
 
       <P>
-      You can redefine the name of the variable to
+      As mentioned, you can redefine the name of the variable to
       something else to avoid name clashing.  Alternatively, there's
       another macro (<code>ACE_ADOPT_CORBA_ENV</code>) that allow you
       to use another variable name as the default CORBA::Environment
@@ -78,62 +64,22 @@ try macros.
       </P>
   </LI>
 
-  <li><P><em>Definition of the CORBA::Environment variable </em><br>
-      If you are using TAO for writing application programs and you
-      are interested in using exceptions (which is a pretty neat way
-      to go about), the environmnet variable can be brought in to your
-      scope by the adding a statement <code>ACE_DECLARE_NEW_CORBA_ENV;</code>
-      You can then invoke the methods on the servant from the client
-      side as
-      <pre>
-      object_reference->func_name (x, y, ACE_TRY_ENV);
-      </pre>
-
-
-      Even if you are interested in making calls within the client
-      side, you can define your method like this
-      <pre>
-      int AN_OBJ::foobar (int a, int b, CORBA_Environment &ACE_TRY_ENV);
-      </pre>
   <li><P><em>Throwing exceptions:</em><br>
       Use <code>ACE_THROW</code> and <code>ACE_THROW_RETURN</code> to
-      throw exceptions.  They should never be used within a try
+      throw exceptions.  They should never be used withing a try
       block; please use <code>ACE_TRY_THROW</code> instead.
       </P>
   </LI>
 
   <li><P><em>Propagating exceptions:</em><br>
       To simulate native exceptions on platforms without native
-      exception handling, <em>every</em>  function call that may
+      exception handling, <em>every</em> single function call that may
       throw exceptions must be followed by <code>ACE_CHECK</code> or
-      <code>ACE_CHECK_RETURN</code>.</p>
-
-      <p><a name="exc-func">Exception-throwing functions include the
-      following categories:</p>
-
-      <ol>
-        <li><p>Any function that takes a
-            <code>CORBA_Environment</code> argument.</p>
-        </li>
-
-        <li><p><code>ACE_NEW_THROW_EX</code>.  Notice that you
-            <em>should not</em> use <code>ACE_NEW_THROW</code>,
-            <code>ACE_NEW_THROW_RETURN</code>,
-            <code>ACE_NEW_TRY_THROW</code> anymore because they don't
-            work right with ACE try macros.  Instead, use
-            <code>ACE_NEW_THROW</code> with appropriate ACE_CHECK*
-            macros.</p>
-        </li>
-
-        <li><P><code>ACE_GUARD_THROW_EX</code>,
-            <code>ACE_READ_GURAD_THROW_EX</code>, and
-            <code>ACE_WRITE_THROW_EX</code>.
-
-        <li><p><code>ACE_TRY</code> blocks.  Follow every
-            <code>ACE_ENDTRY</code> with appropriate ACE_CHECK*
-            macros.</p>
-        <li>
-      </ol>
+      <code>ACE_CHECK_RETURN</code>.  Notice that you should always
+      follow the outter most <code>ACE_ENDTRY</code> with
+      <code>ACE_CHECK</code> or <code>ACE_CHECK_RETURN</code> because
+      there might be uncaught exception.
+      </p>
 
       <P>You should pass <code>ACE_TRY_ENV</code> to these
       functions.
@@ -153,12 +99,9 @@ try macros.
 
   <li><P><em>Catching exceptions:</em><br>
       Use <code>ACE_TRY</code> to catch exceptions if there's an
-      <code>ACE_TRY_ENV</code> available.  Otherwise, you should use
-      <code>ACE_DECLARE_NEW_CORBA_ENV</code> to create one at
-      <em>proper</em> scope.  The use of
-      <code>ACE_TRY_NEW_ENV</code> is considered depricated because it
-      can't deal with the case when you have multiple <code>TRY</code>
-      blocks in the scope of <code>ACE_TRY_NEW_ENV</code>.  If there are
+      <code>ACE_TRY_ENV</code> available.  Otherwise, use
+      <code>ACE_TRY_NEW_ENV</code> which will defines a new
+      <code>ACE_TRY_ENV</code> within it's scope.  If there are
       more than one try blocks in a function, use <code>ACE_TRY_EX</code>
       for all subsequence try blocks to avoid name clashing of labels.
       </p>
@@ -171,9 +114,7 @@ try macros.
         </LI>
 
         <li><P>Follow <em>every</em> exception throwing function with
-            <code>ACE_TRY_CHECK</code>. If you are using a TRY block
-            within another try block add a <code>ACE_TRY_CHECK</code>
-            at the end of this TRY block ie. after
+            <code>ACE_TRY_CHECK</code>, including inner
             <code>ACE_ENDTRY</code>.
             </p>
         </LI>
@@ -209,22 +150,11 @@ try macros.
 
         <li><P>Throw an exception within a <code>ACE_TRY</code>
             block or <code>ACE_CATCH</code> block using
-            <a href="#ace_try"><code>ACE_TRY_THROW</code></a>.
+            <a href="#try_throw"><code>ACE_TRY_THROW</code></a>.
             </p>
         </LI>
       </ul>
   </li>
-
-  <li><p><em>Printing out exceptions.</em>  Use <code>ACE_PRINT_EXCEPTION
-      (EX,INFO)</code> to print out an exception.  The macro takes two
-      arguments, a reference to an exception (EX) and a <code>char
-      *</code> string (INFO) which provides more information on the
-      exception.  Since there's no portable way to print out
-      exceptions, you can redefine ACE_PRINT_EXCEPTION to fit your
-      need (or define it to null.)  <em>You should always print out
-      the exception itself, not the CORBA_Environment that carries the
-      exception.</em></p>
-  </li>
 </ol>
 
 <h3>Examples</h3><a name="examples">
@@ -236,9 +166,7 @@ macros discussed here.
 <ul>Examples on using ACE try macros:
   <li><p>
       <pre>
-      <a name="try_env">
-      ACE_TRY  // Use ACE_DECLARE_NEW_CORBA_ENV to create ACE_TRY_ENV
-               // if you got undefined symbol warning here.
+      ACE_TRY  // use ACE_TRY_NEW_ENV if there isn't an ACE_TRY_ENV already defined
         {
           some_operation (arg1, arg2, ACE_TRY_ENV);
           ACE_TRY_CHECK;
@@ -251,7 +179,6 @@ macros discussed here.
           some_other_operation (arg1, arg2, arg3, ACE_TRY_ENV);
           ACE_TRY_CHECK;
         }
-      <a name="ace_try">
       ACE_CATCH (CORBA_some_exception, ex)
         {
           // error handling.
@@ -270,10 +197,11 @@ macros discussed here.
       </p>
   </li>
 
-  <li><p><code>ACE_TRY</code> and also declares a label for internal
-      use.  To avoid defining the same label multiple times within a
-      function, use <code>ACE_TRY_EX</code> with different labels for
-      different try blocks instead.  For example,<br>
+  <li><p><code>ACE_TRY</code> and also declares a label (so do
+      <code>ACE_TRY_NEW_ENV</code>.  To avoid defining the
+      same label multiple times within a function, use
+      <code>ACE_TRY_EX</code> with different labels for different try
+      blocks instead.  For example,<br>
 
       <pre>
       ACE_TRY_EX (block_1)
@@ -322,42 +250,6 @@ macros discussed here.
       </pre>
       </p>
 
-  <li><p>You may want to make a different series of calls after you
-      encounter/catch  an exception. Here is what we recommend.
-
-      <pre>
-      ACE_TRY
-        {
-          // Calls that can raise an exception
-          some_call1 (arg1, arg2, ACE_TRY_ENV);
-          ACE_TRY_CHECK;
-          .
-          .
-          .
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA_some_exception, ex)
-        {
-          // Caught an exception, so we need to make some other calls
-          // to continue..
-
-          ACE_TRY_EX (block1) // basically a label
-            {
-              some_other_call1 (arg1,.. , ACE_TRY_ENV);
-              ACE_TRY_CHECK_EX (block1);
-            }
-          ACE_CATCH (CORBA_some_other_exception, ex1)
-            {
-              // Handle the exception here..
-            }
-          ACE_ENDTRY;
-          ACE_CHECK_RETURN (-1); // Needed to catch uncaught exceptions
-        }
-      ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
-      </pre>
-      </p>
-
   <li><p>Be <em>VERY</em> wary of <code>ACE_CATCHALL</code>.  It catches
       exceptions of any type.  If your program depends on it, then,
       more often than not, there're something wrong with it.
@@ -365,13 +257,13 @@ macros discussed here.
   </li>
 
   <li><p>Instead of depending on <code>ACE_CATCHALL</code>, use
-      <code>auto_ptr</code> style mechanism to prevent memory leaks
+      <code>auto_prt</code> style mechanism to prevent memory leaks
       from exceptions.
       </p>
   </li>
 </ul>
 
-<h3><a name="general">General Guidelines for Exception Handling</h3>
+<h3>General Guidelines of Exceptions</h3>
 <ul>
   <li><p>Don't catch an exception just to rethrow it.  Exceptions cost
       you performance.
@@ -417,7 +309,40 @@ macros discussed here.
   </li>
 </ul>
 
-<H3><a name="transition">Transition from TAO try macros to ACE try macros</h3>
+<H3>Caveats</H3>
+
+<P>As we already mentioned no set of macros can cover all cases
+and preserve the semantics between native C++ exceptions and the
+<CODE>CORBA::Environment</CODE> based mapping.
+Some of the problems that our macros are described below:
+<P>
+
+<UL>
+  <LI><P>Using the macros in loops can produce problems with
+      <CODE>break</CODE> and <CODE>continue</CODE> statements, for
+      example:
+      </P>
+      <PRE>
+    for (int i = 0; i < 10; ++i)
+    {
+      ACE_TRY
+        {
+          if (x[i] == 0)
+            continue; // will *not* work
+          if (x[i] == -1)
+            break; // will *not* work either
+        }
+      ACE_CATCH (CORBA::Exception, ex)
+        {
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+    }
+      </PRE>
+  </LI>
+</UL>
+
+<H3>Transition from TAO try macros to ACE try macros</h3>
 
 This list tries to give a comprehensive list of mapping between TAO
 try macros and ACE try macros.  It's sole purpose is to provide hints
@@ -430,8 +355,7 @@ by no mean complete.
   </li>
 
   <li><P>Replace <code>TAO_TRY</code> <code>TAO_TRY_VAR</code> with
-      <code>ACE_TRY</code>.  Added
-      <code>ACE_DECLARE_NEW_CORBA_ENV</code> if necessary.</p>
+      <code>ACE_TRY</code> or <code>ACE_TRY_NEW_ENV</code>.</p>
   </li>
 
   <li><p>Replace <code>TAO_TRY_EX</code> <code>TAO_TRY_VAR_EX</code>
@@ -450,12 +374,6 @@ by no mean complete.
       <code>ACE_THROW_RETURN</code>. </p>
   </li>
 
-  <li><P>Replace <code>ACE_NEW_THROW</code>,
-      <code>ACE_NEW_THROW_RETURN</code>,
-      <code>ACE_TRY_NEW_THROW</code> with
-      <code>ACE_NEW_THROW_EX</code> and appropriate
-      <code>ACE_CHECK*</code> macros. aformention</P>
-
   <li><p>Replace <code>TAO_CHECK_ENV</code> and
       <code>TAO_CHECK_ENV_EX</code> with <code>ACE_TRY_CHECK</code>
       and <code>ACE_TRY_CHECK_EX</code>.</p>
@@ -486,38 +404,5 @@ by no mean complete.
   </li>
 </ol>
 
-<H3><a name="caveats">Caveats</H3>
-
-<P>As we already mentioned no set of macros can cover all cases
-and preserve the semantics between native C++ exceptions and the
-<CODE>CORBA::Environment</CODE> based mapping.
-Some of the problems that our macros are described below:
-<P>
-
-<UL>
-  <LI><P>Using the macros in loops can produce problems with
-      <CODE>break</CODE> and <CODE>continue</CODE> statements, for
-      example:
-      </P>
-      <PRE>
-    for (int i = 0; i < 10; ++i)
-    {
-      ACE_TRY
-        {
-          if (x[i] == 0)
-            continue; // will *not* work
-          if (x[i] == -1)
-            break; // will *not* work either
-        }
-      ACE_CATCH (CORBA::Exception, ex)
-        {
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-      </PRE>
-  </LI>
-</UL>
-
 <!--#include virtual="/~schmidt/cgi-sig.html" -->
 </body></HTML>
diff --git a/docs/tutorials/001/page02.html b/docs/tutorials/001/page02.html
index 560f092dd21..42180451fc3 100644
--- a/docs/tutorials/001/page02.html
+++ b/docs/tutorials/001/page02.html
@@ -71,7 +71,7 @@ to "read" data from an established connection.
 <font color=red>// $Id$</font>
 
 <font color=red>/* Include the header file where our client acceptor is defined.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Reactor.h">ace/Reactor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Reactor.h</font>"
 
 <font color=red>/* For simplicity, we create our reactor in the global address space.
   In later tutorials we will do something more clever and
diff --git a/docs/tutorials/001/page03.html b/docs/tutorials/001/page03.html
index 00a8d4c7646..88add75adc8 100644
--- a/docs/tutorials/001/page03.html
+++ b/docs/tutorials/001/page03.html
@@ -44,16 +44,16 @@ appropriate section (event_handler) which would cater to his needs.
 
 <font color=red>/* A SOCK_Acceptor knows how to accept socket connections.  We'll use
   one of those at the heart of our Logging_Acceptor.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* An Event_Handler is what you register with ACE_Reactor.  When
   events occur, the reactor will callback on the Event_Handler.  More
   on that in a few lines.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Event_Handler.h">ace/Event_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Event_Handler.h</font>"
 
 <font color=red>/* When a client connects, we'll create a Logging_Handler to deal with
   the connection.  Here, we bring in that declaration.  */</font>
diff --git a/docs/tutorials/001/page04.html b/docs/tutorials/001/page04.html
index 58bc6d5848e..aac12e70ba9 100644
--- a/docs/tutorials/001/page04.html
+++ b/docs/tutorials/001/page04.html
@@ -27,17 +27,17 @@ object.
 <font color=red>/* A connection handler will also be derived from ACE_Event_Handler so
   that we can register with a reactor.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Event_Handler.h">ace/Event_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Event_Handler.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 <font color=red>/* Since we're doing TCP/IP, we'll need a SOCK_Stream for the
   connection.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 class Logging_Handler : public ACE_Event_Handler
 {
diff --git a/docs/tutorials/002/page02.html b/docs/tutorials/002/page02.html
index 3670c1851c2..d886ad2a30c 100644
--- a/docs/tutorials/002/page02.html
+++ b/docs/tutorials/002/page02.html
@@ -66,9 +66,9 @@ the various ACE components judiciously.
 
 <font color=red>/* As before, we need a few ACE objects as well as our Logging_Handler
   declaration.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Acceptor.h">ace/Acceptor.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Reactor.h">ace/Reactor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Acceptor.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/Reactor.h</font>"
 <font color=blue>#include</font> "<font color=green>handler.h</font>"
 
 <font color=red>/* We'll still use the global reactor pointer.  There's a snappy way
@@ -85,15 +85,11 @@ typedef ACE_Acceptor &lt;Logging_Handler, ACE_SOCK_ACCEPTOR> Logging_Acceptor;
 <font color=red>/* One of the new things will be a signal handler so that we can exit
   the application somewhat cleanly.  The 'finished' flag is used
   instead of the previous infninite loop and the 'handler' will set
-  that flag in respose to SIGINT (CTRL-C). 
-  The invocation of <font color=#008888>ACE_Reactor::notify</font>() will cause the
-  handle_events() to return so that we can see the new value of 'finished'.
-*/</font>
+  that flag in respose to SIGINT (CTRL-C).  */</font>
 static sig_atomic_t finished = 0;
 extern "<font color=green>C</font>" void handler (int)
 {
   finished = 1;
-  g_reactor->notify();
 }
 
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
diff --git a/docs/tutorials/002/page03.html b/docs/tutorials/002/page03.html
index f06a3e5463f..365e64d0888 100644
--- a/docs/tutorials/002/page03.html
+++ b/docs/tutorials/002/page03.html
@@ -26,14 +26,14 @@
 <font color=blue>#ifndef</font> <font color=purple>LOGGING_HANDLER_H</font>
 <font color=blue>#define</font> <font color=purple>LOGGING_HANDLER_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Reactor.h">ace/Reactor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/Reactor.h</font>"
 
 <font color=red>/* Since we used the template to create the acceptor, we don't know if
   there is a way to get to the reactor it uses.  We'll take the easy
diff --git a/docs/tutorials/003/page01.html b/docs/tutorials/003/page01.html
index abf72ebe40f..c68855784bb 100644
--- a/docs/tutorials/003/page01.html
+++ b/docs/tutorials/003/page01.html
@@ -46,7 +46,7 @@ Kirthika says, "Here's an one paragraph abstract for a one page client app:"
 
 <font color=red>/* To establish a socket connection to a server, we'll need an
   ACE_SOCK_Connector.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Connector.h">ace/SOCK_Connector.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Connector.h</font>"
 
 <font color=red>/* Unlike the previous two tutorials, we're going to allow the user to
   provide command line options this time.  Still, we need defaults in
diff --git a/docs/tutorials/004/page01.html b/docs/tutorials/004/page01.html
index 12dd8716949..13a93255949 100644
--- a/docs/tutorials/004/page01.html
+++ b/docs/tutorials/004/page01.html
@@ -36,8 +36,8 @@ successfully interacts with the server when connection is established.
 
 <font color=red>/* We need the connector object & we also bring in a simple string
   class.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Connector.h">ace/SOCK_Connector.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SString.h">ace/SString.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Connector.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/SString.h</font>"
 
 <font color=red>/* In this tutorial, we extend SOCK_Stream by adding a few wrappers
   around the send_n() method.  */</font>
diff --git a/docs/tutorials/005/client_handler.cpp b/docs/tutorials/005/client_handler.cpp
index 8466992b6a0..3d4ef08dc38 100644
--- a/docs/tutorials/005/client_handler.cpp
+++ b/docs/tutorials/005/client_handler.cpp
@@ -63,7 +63,7 @@ Client_Handler::destroy (void)
    The Client_Acceptor instance pointer is cast to a void* and given
    to us here.  We'll use that to avoid some global data...  */
 int 
-Client_Handler::open (void *_acceptor)
+Client_Handler::open (void *acceptor)
 {
   /* Convert the void* to a Client_Acceptor*.  You should probably use
      those fancy ACE_*_cast macros but I can never remember how/when
@@ -71,7 +71,7 @@ Client_Handler::open (void *_acceptor)
      without compiler warnings be very sure of what you're doing when
      you do this kind of thing.  That's where the new-style cast
      operators can save you.  */
-  Client_Acceptor *acceptor = (Client_Acceptor *) _acceptor;
+  Client_Acceptor *acceptor = (Client_Acceptor *) acceptor;
 
   /* Our reactor reference will be set when we register ourselves but
      I decided to go ahead and set it here.  No good reason really...  */
diff --git a/docs/tutorials/005/page03.html b/docs/tutorials/005/page03.html
index c190dfe9839..cbc91cb4600 100644
--- a/docs/tutorials/005/page03.html
+++ b/docs/tutorials/005/page03.html
@@ -40,15 +40,15 @@ with an object type to instantiate when a new connection arrives.
    ACE objects and the headers where they can be found.  In general,
    the ACE object ACE_Foobar will be found in ace/Foobar.h.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Acceptor.h">ace/Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Acceptor.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* Since we want to work with sockets, we'll need a SOCK_Acceptor to
    allow the clients to connect to us.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
 
 <font color=red>/* The Client_Handler object we develop will be used to handle clients
    once they're connected.  The ACE_Acceptor&lt;> template's first
diff --git a/docs/tutorials/005/page04.html b/docs/tutorials/005/page04.html
index fb670bbe7a3..b455d636917 100644
--- a/docs/tutorials/005/page04.html
+++ b/docs/tutorials/005/page04.html
@@ -44,13 +44,13 @@ the definition where all of the real work of the application takes place.
    a derivative of ACE_Event_Handler) some of those details are
    handled for you.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Svc_Handler.h">ace/Svc_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Svc_Handler.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=red>/* Another feature of ACE_Svc_Handler is it's ability to present the
    ACE_Task&lt;> interface as well.  That's what the ACE_NULL_SYNCH
diff --git a/docs/tutorials/005/page05.html b/docs/tutorials/005/page05.html
index 388a421eff6..0960c9485cb 100644
--- a/docs/tutorials/005/page05.html
+++ b/docs/tutorials/005/page05.html
@@ -88,7 +88,7 @@ void
    The Client_Acceptor instance pointer is cast to a void* and given
    to us here.  We'll use that to avoid some global data...  */</font>
 int 
-<font color=#008888>Client_Handler::open</font> (void *_acceptor)
+<font color=#008888>Client_Handler::open</font> (void *acceptor)
 {
   <font color=red>/* Convert the void* to a Client_Acceptor*.  You should probably use
      those fancy ACE_*_cast macros but I can never remember how/when
@@ -96,7 +96,7 @@ int
      without compiler warnings be very sure of what you're doing when
      you do this kind of thing.  That's where the new-style cast
      operators can save you.  */</font>
-  Client_Acceptor *acceptor = (Client_Acceptor *) _acceptor;
+  Client_Acceptor *acceptor = (Client_Acceptor *) acceptor;
 
   <font color=red>/* Our reactor reference will be set when we register ourselves but
      I decided to go ahead and set it here.  No good reason really...  */</font>
diff --git a/docs/tutorials/005/page06.html b/docs/tutorials/005/page06.html
index 9fbe678e023..e7588a0ec36 100644
--- a/docs/tutorials/005/page06.html
+++ b/docs/tutorials/005/page06.html
@@ -104,7 +104,7 @@ Indent : #
 	# directly into the Makefile.  I prefer my Makefile to stay clean and
 	# uncluttered.  The perl script referenced here pulls the dependency
 	# stuff back out of the Makefile and into a file "<font color=green>.depend</font>" which we then
-	<font color=blue># include</font> just like the makefile components above.
+	# include just like the makefile components above.
 	#
 	# NOTE:  The 'depend' target expects to have GCC available.
 	# You can do the same thing with other compilers  but the ACE 
@@ -128,7 +128,7 @@ UNSHAR : #
 	sh combine.shar
 
 CLEAN : realclean
-	rm -f hdr bodies *.pre *.pst .depend
+	rm -f hdr bodies *.pre *.pst
 
 #----------------------------------------------------------------------------
 #	Dependencies
diff --git a/docs/tutorials/006/client_handler.cpp b/docs/tutorials/006/client_handler.cpp
index 54588dcdafe..2280150ccc4 100644
--- a/docs/tutorials/006/client_handler.cpp
+++ b/docs/tutorials/006/client_handler.cpp
@@ -60,7 +60,7 @@ Client_Handler::destroy (void)
    The Client_Acceptor instance pointer is cast to a void* and given
    to us here.  We'll use that to avoid some global data...  */
 int 
-Client_Handler::open (void *void_acceptor)
+Client_Handler::open (void *acceptor)
 {
   /* We need this to store the address of the client that we are now
      connected to.  We'll use it later to display a debug message.  */
@@ -87,7 +87,7 @@ Client_Handler::open (void *void_acceptor)
     without compiler warnings be very sure of what you're doing when
     you do this kind of thing.  That's where the new-style cast
     operators can save you.  */
-  Client_Acceptor *acceptor = (Client_Acceptor *) void_acceptor;
+  Client_Acceptor *acceptor = (Client_Acceptor *) acceptor;
 
   /* Our Client_Acceptor is constructed with a concurrency strategy.
     Here, we go back to it to find out what that strategy was.  If
diff --git a/docs/tutorials/006/page03.html b/docs/tutorials/006/page03.html
index e5616cb514b..08e5b70c78b 100644
--- a/docs/tutorials/006/page03.html
+++ b/docs/tutorials/006/page03.html
@@ -36,15 +36,15 @@ to the Tutorial 5 version of this file.
    ACE objects and the headers where they can be found.  In general,
    the ACE object ACE_Foobar will be found in ace/Foobar.h.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Acceptor.h">ace/Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Acceptor.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* Since we want to work with sockets, we'll need a SOCK_Acceptor to
    allow the clients to connect to us.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
 
 <font color=red>/* The Client_Handler object we develop will be used to handle clients
    once they're connected.  The ACE_Acceptor&lt;> template's first
diff --git a/docs/tutorials/006/page04.html b/docs/tutorials/006/page04.html
index caa8c2f0bed..0c5ddce2758 100644
--- a/docs/tutorials/006/page04.html
+++ b/docs/tutorials/006/page04.html
@@ -41,13 +41,13 @@ exist.
 
  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Svc_Handler.h">ace/Svc_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Svc_Handler.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=red>/* Another feature of ACE_Svc_Handler is it's ability to present the
    ACE_Task&lt;> interface as well.  That's what the ACE_NULL_SYNCH
diff --git a/docs/tutorials/006/page05.html b/docs/tutorials/006/page05.html
index aa323cdc952..083f6ef0dcb 100644
--- a/docs/tutorials/006/page05.html
+++ b/docs/tutorials/006/page05.html
@@ -84,7 +84,7 @@ void
    The Client_Acceptor instance pointer is cast to a void* and given
    to us here.  We'll use that to avoid some global data...  */</font>
 int 
-<font color=#008888>Client_Handler::open</font> (void *void_acceptor)
+<font color=#008888>Client_Handler::open</font> (void *acceptor)
 {
   <font color=red>/* We need this to store the address of the client that we are now
      connected to.  We'll use it later to display a debug message.  */</font>
@@ -111,7 +111,7 @@ int
     without compiler warnings be very sure of what you're doing when
     you do this kind of thing.  That's where the new-style cast
     operators can save you.  */</font>
-  Client_Acceptor *acceptor = (Client_Acceptor *) void_acceptor;
+  Client_Acceptor *acceptor = (Client_Acceptor *) acceptor;
 
   <font color=red>/* Our Client_Acceptor is constructed with a concurrency strategy.
     Here, we go back to it to find out what that strategy was.  If
diff --git a/docs/tutorials/007/client_acceptor.cpp b/docs/tutorials/007/client_acceptor.cpp
index 14794c2c290..16b707a505f 100644
--- a/docs/tutorials/007/client_acceptor.cpp
+++ b/docs/tutorials/007/client_acceptor.cpp
@@ -13,7 +13,7 @@ Client_Acceptor::Client_Acceptor (int concurrency)
 /* Construct ourselves with a reference to somebody else' Thread_Pool.
    Obvioulsy our concurrency strategy is "thread_pool_" at this point.  */
 Client_Acceptor::Client_Acceptor (Thread_Pool &thread_pool)
-  : concurrency_ (thread_pool_),
+  : concurrency_ (thread_pool),
     the_thread_pool_ (thread_pool)
 {
 }
diff --git a/docs/tutorials/007/page03.html b/docs/tutorials/007/page03.html
index fd94b553c56..2040717c810 100644
--- a/docs/tutorials/007/page03.html
+++ b/docs/tutorials/007/page03.html
@@ -28,15 +28,15 @@
    ACE objects and the headers where they can be found.  In general,
    the ACE object ACE_Foobar will be found in ace/Foobar.h.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Acceptor.h">ace/Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Acceptor.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* Since we want to work with sockets, we'll need a SOCK_Acceptor to
    allow the clients to connect to us.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
 
 <font color=red>/* The Client_Handler object we develop will be used to handle clients
    once they're connected.  The ACE_Acceptor&lt;> template's first
diff --git a/docs/tutorials/007/page04.html b/docs/tutorials/007/page04.html
index dbd16330e07..df7d777c660 100644
--- a/docs/tutorials/007/page04.html
+++ b/docs/tutorials/007/page04.html
@@ -34,7 +34,7 @@ I finally had enough code to move it out of the header.
 <font color=red>/* Construct ourselves with a reference to somebody else' Thread_Pool.
    Obvioulsy our concurrency strategy is "<font color=green>thread_pool_</font>" at this point.  */</font>
 <font color=#008888>Client_Acceptor::Client_Acceptor</font> (Thread_Pool &thread_pool)
-  : concurrency_ (thread_pool_),
+  : concurrency_ (thread_pool),
     the_thread_pool_ (thread_pool)
 {
 }
diff --git a/docs/tutorials/007/page05.html b/docs/tutorials/007/page05.html
index 9c2264e6e7d..2a62b00a0a2 100644
--- a/docs/tutorials/007/page05.html
+++ b/docs/tutorials/007/page05.html
@@ -35,13 +35,13 @@ is next.
    a derivative of ACE_Event_Handler) some of those details are
    handled for you.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Svc_Handler.h">ace/Svc_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Svc_Handler.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 class Client_Acceptor;
 class Thread_Pool;
diff --git a/docs/tutorials/007/page07.html b/docs/tutorials/007/page07.html
index 7b31b7d09e7..0364eccd176 100644
--- a/docs/tutorials/007/page07.html
+++ b/docs/tutorials/007/page07.html
@@ -29,10 +29,10 @@ to make so few changes to the rest of the code.
 <font color=red>/* In order to implement a thread pool, we have to have an object that
    can create a thread.  The ACE_Task&lt;> is the basis for doing just
    such a thing.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* We need a forward reference for ACE_Event_Handler so that our
diff --git a/docs/tutorials/007/page08.html b/docs/tutorials/007/page08.html
index f3b7a1d1b6e..18ee6968ece 100644
--- a/docs/tutorials/007/page08.html
+++ b/docs/tutorials/007/page08.html
@@ -25,7 +25,7 @@ where we have the Thread_Pool object implementation.
 
 <font color=red>/* We need this header so that we can invoke handle_input() on the
    objects we dequeue.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Event_Handler.h">ace/Event_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Event_Handler.h</font>"
 
 <font color=red>/* All we do here is initialize our active thread counter.  */</font>
 <font color=#008888>Thread_Pool::Thread_Pool</font> (void)
diff --git a/docs/tutorials/008/page02.html b/docs/tutorials/008/page02.html
index c501c12bad9..0a95d1a2be7 100644
--- a/docs/tutorials/008/page02.html
+++ b/docs/tutorials/008/page02.html
@@ -29,8 +29,8 @@ it responds to.&nbsp; We'll tackle that issue in the next tutorial though...
 
 <font color=red>/* Our datagram server will, of course, need to create a datagram.
    We'll also need an address object so that we know where to listen.  */</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram.h">ace/SOCK_Dgram.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 <font color=red>/* Use the typical TCP/IP port address for receiving datagrams.  */</font>
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
diff --git a/docs/tutorials/008/page03.html b/docs/tutorials/008/page03.html
index 36c58e4d3c5..e33c396ec63 100644
--- a/docs/tutorials/008/page03.html
+++ b/docs/tutorials/008/page03.html
@@ -27,8 +27,8 @@ could be written this way.
 <PRE>
 <font color=red>// $Id$</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram.h">ace/SOCK_Dgram.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 <font color=red>/* Once again, we use the default server port.  In a "<font color=green>real</font>" system,
    the server's port (or ports) would be published in some way so that
diff --git a/docs/tutorials/008/page04.html b/docs/tutorials/008/page04.html
index faaaed77dce..1d3bd52361d 100644
--- a/docs/tutorials/008/page04.html
+++ b/docs/tutorials/008/page04.html
@@ -27,8 +27,8 @@ subnet you're a part of.
 <PRE>
 <font color=red>// $Id$</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram_Bcast.h">ace/SOCK_Dgram_Bcast.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram_Bcast.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/docs/tutorials/009/page02.html b/docs/tutorials/009/page02.html
index 7dd126f1273..46d7007f2a9 100644
--- a/docs/tutorials/009/page02.html
+++ b/docs/tutorials/009/page02.html
@@ -28,8 +28,8 @@ we add in just a bit of code to examine the datagram contents before responding.
    will prevent this server from responding to just any old datagram.
    I'll limit my comments to those pieces of code.  */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram.h">ace/SOCK_Dgram.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/docs/tutorials/009/page03.html b/docs/tutorials/009/page03.html
index 61591c5c711..d21c0fb2fed 100644
--- a/docs/tutorials/009/page03.html
+++ b/docs/tutorials/009/page03.html
@@ -25,8 +25,8 @@ if the server doesn't like what we have to say.
 <PRE>
 <font color=red>// $Id$</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram.h">ace/SOCK_Dgram.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/docs/tutorials/009/page04.html b/docs/tutorials/009/page04.html
index 0faedf88168..dacc50c0215 100644
--- a/docs/tutorials/009/page04.html
+++ b/docs/tutorials/009/page04.html
@@ -25,8 +25,8 @@ of the timeout variable passed to recv().
 <PRE>
 <font color=red>// $Id$</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Dgram_Bcast.h">ace/SOCK_Dgram_Bcast.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Dgram_Bcast.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
 
 static const u_short PORT = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/docs/tutorials/010/page03.html b/docs/tutorials/010/page03.html
index 84d9b3bb6f0..33c62e6cc28 100644
--- a/docs/tutorials/010/page03.html
+++ b/docs/tutorials/010/page03.html
@@ -25,10 +25,10 @@ that the message blocks to, indeed, get freed when we're done with 'em.
 <font color=blue>#ifndef</font> <font color=purple>BLOCK_H</font>
 <font color=blue>#define</font> <font color=purple>BLOCK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Message_Block.h">ace/Message_Block.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Message_Block.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* This simple ACE_Message_Block derivative will inform us of it's
diff --git a/docs/tutorials/010/page04.html b/docs/tutorials/010/page04.html
index a36a8d8bd29..03c1951ed42 100644
--- a/docs/tutorials/010/page04.html
+++ b/docs/tutorials/010/page04.html
@@ -24,10 +24,10 @@ and reads from the message queue it contains.
 <font color=blue>#ifndef</font> <font color=purple>TASK_H</font>
 <font color=blue>#define</font> <font color=purple>TASK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* Like the thread-pool server tutorial, we'll derive from ACE_Task&lt;>.
diff --git a/docs/tutorials/011/page03.html b/docs/tutorials/011/page03.html
index 78b9c5ebb53..fcee526abbd 100644
--- a/docs/tutorials/011/page03.html
+++ b/docs/tutorials/011/page03.html
@@ -27,10 +27,10 @@ I've only commented the changes.
 <font color=blue>#ifndef</font> <font color=purple>TASK_H</font>
 <font color=blue>#define</font> <font color=purple>TASK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 class Task : public ACE_Task &lt;ACE_MT_SYNCH>
diff --git a/docs/tutorials/012/page02.html b/docs/tutorials/012/page02.html
index 67d93863d18..2742e9954d2 100644
--- a/docs/tutorials/012/page02.html
+++ b/docs/tutorials/012/page02.html
@@ -26,10 +26,10 @@ and it's baseclass Unit_Of_Work
 <font color=blue>#ifndef</font> <font color=purple>WORK_H</font>
 <font color=blue>#define</font> <font color=purple>WORK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Message_Block.h">ace/Message_Block.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Message_Block.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/*
diff --git a/docs/tutorials/012/page05.html b/docs/tutorials/012/page05.html
index dba97f08c41..7e5be17d446 100644
--- a/docs/tutorials/012/page05.html
+++ b/docs/tutorials/012/page05.html
@@ -27,10 +27,10 @@ isn't very large.
 <font color=blue>#ifndef</font> <font color=purple>TASK_H</font>
 <font color=blue>#define</font> <font color=purple>TASK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/*
diff --git a/docs/tutorials/013/page03.html b/docs/tutorials/013/page03.html
index 05264a8b6aa..3bb955c2b29 100644
--- a/docs/tutorials/013/page03.html
+++ b/docs/tutorials/013/page03.html
@@ -50,13 +50,13 @@ Simple, cheap, effective.
 <font color=blue>#ifndef</font> <font color=purple>MLD_H</font>
 <font color=blue>#define</font> <font color=purple>MLD_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Synch.h">ace/Synch.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Synch.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Singleton.h">ace/Singleton.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Singleton.h</font>"
 
 <font color=red>/*
    This is a cheap memory leak detector.  Each class I want to watch over
diff --git a/docs/tutorials/013/page04.html b/docs/tutorials/013/page04.html
index 3e3b8f5d56e..a52dbdba587 100644
--- a/docs/tutorials/013/page04.html
+++ b/docs/tutorials/013/page04.html
@@ -43,13 +43,13 @@ since the actual data is not copied.
 <font color=blue>#ifndef</font> <font color=purple>BLOCK_H</font>
 <font color=blue>#define</font> <font color=purple>BLOCK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Message_Block.h">ace/Message_Block.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Message_Block.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Synch.h">ace/Synch.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Synch.h</font>"
 <font color=blue>#include</font> "<font color=green>mld.h</font>"
 <font color=blue>#include</font> "<font color=green>work.h</font>"
 
diff --git a/docs/tutorials/013/page06.html b/docs/tutorials/013/page06.html
index 4e2ccf5c255..14d1cbb8402 100644
--- a/docs/tutorials/013/page06.html
+++ b/docs/tutorials/013/page06.html
@@ -41,10 +41,10 @@ on this one page.
 <font color=blue>#ifndef</font> <font color=purple>TASK_H</font>
 <font color=blue>#define</font> <font color=purple>TASK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=blue>#include</font> "<font color=green>mld.h</font>"
diff --git a/docs/tutorials/013/page07.html b/docs/tutorials/013/page07.html
index 509e326adf9..983878e676a 100644
--- a/docs/tutorials/013/page07.html
+++ b/docs/tutorials/013/page07.html
@@ -48,13 +48,13 @@ cpp file as with task.
 <font color=blue>#ifndef</font> <font color=purple>WORK_H</font>
 <font color=blue>#define</font> <font color=purple>WORK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Log_Msg.h">ace/Log_Msg.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Log_Msg.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Synch.h">ace/Synch.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Synch.h</font>"
 <font color=blue>#include</font> "<font color=green>mld.h</font>"
 
 <font color=red>/*
@@ -234,7 +234,6 @@ int <font color=#008888>Work::fini</font> (void)
 {
     while (state_.value () &lt; 3)
     {
-        ACE_DEBUG ((LM_DEBUG, "<font color=green>(%P|%t) 0x%x <font color=#008888>Work::fini</font>() state %d\n</font>", (void *) this,state_.value()));
         if (this->process () == -1)
         {
             ACE_ERROR_RETURN ((LM_ERROR, "<font color=green>%p\n</font>", "<font color=green>process</font>"), -1);
diff --git a/docs/tutorials/015/page03.html b/docs/tutorials/015/page03.html
index ca92ec3cbcd..04f091d497d 100644
--- a/docs/tutorials/015/page03.html
+++ b/docs/tutorials/015/page03.html
@@ -24,10 +24,10 @@ The Client object is designed to hide all of the messy connection
 <font color=blue>#ifndef</font> <font color=purple>CLIENT_H</font>
 <font color=blue>#define</font> <font color=purple>CLIENT_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=blue>#include</font> "<font color=green>Protocol_Stream.h</font>"
diff --git a/docs/tutorials/015/page04.html b/docs/tutorials/015/page04.html
index b538dc65bc8..f4c655e4f8f 100644
--- a/docs/tutorials/015/page04.html
+++ b/docs/tutorials/015/page04.html
@@ -21,9 +21,9 @@ The implementation of the Client object.  Only the open() method
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Client_i.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Message_Block.h">ace/Message_Block.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/INET_Addr.h">ace/INET_Addr.h</A>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Connector.h">ace/SOCK_Connector.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Message_Block.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/INET_Addr.h</font>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Connector.h</font>"
 
 <font color=red>// Simple constructor just remembers the endpoint information for use by open.</font>
 <font color=#008888>Client::Client</font>( u_short _port, const char * _server)
diff --git a/docs/tutorials/015/page05.html b/docs/tutorials/015/page05.html
index dbfe16e91d7..eddb65d8579 100644
--- a/docs/tutorials/015/page05.html
+++ b/docs/tutorials/015/page05.html
@@ -24,7 +24,7 @@ simplification.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Server_i.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Select_Reactor.h">ace/Select_Reactor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Select_Reactor.h</font>"
 
 <font color=red>// A signal handler that will close the server object</font>
 extern "<font color=green>C</font>" void handler (int)
diff --git a/docs/tutorials/015/page06.html b/docs/tutorials/015/page06.html
index 8ffa8bdb12e..82b28a3f572 100644
--- a/docs/tutorials/015/page06.html
+++ b/docs/tutorials/015/page06.html
@@ -27,13 +27,13 @@ that's probably a valid assumption!
 <font color=blue>#ifndef</font> <font color=purple>SERVER_H</font>
 <font color=blue>#define</font> <font color=purple>SERVER_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Acceptor.h">ace/Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Acceptor.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Acceptor.h">ace/SOCK_Acceptor.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Acceptor.h</font>"
 <font color=blue>#include</font> "<font color=green>Handler.h</font>"
 
 <font color=red>/* Anytime I have templates I try to remember to create a typedef for
diff --git a/docs/tutorials/015/page08.html b/docs/tutorials/015/page08.html
index 127bab8f00c..ed60a976839 100644
--- a/docs/tutorials/015/page08.html
+++ b/docs/tutorials/015/page08.html
@@ -28,13 +28,13 @@ processing.  Again, keep it simple and delegate authority.
 <font color=blue>#ifndef</font> <font color=purple>HANDLER_H</font>
 <font color=blue>#define</font> <font color=purple>HANDLER_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Svc_Handler.h">ace/Svc_Handler.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Svc_Handler.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 <font color=blue>#include</font> "<font color=green>Protocol_Stream.h</font>"
 
 <font color=red>/* Just your basic event handler.  We use ACE_Svc_Handler&lt;> as a
diff --git a/docs/tutorials/015/page10.html b/docs/tutorials/015/page10.html
index 3d012c0e970..5dc3711f0ba 100644
--- a/docs/tutorials/015/page10.html
+++ b/docs/tutorials/015/page10.html
@@ -40,13 +40,13 @@ going on here.
 <font color=blue>#ifndef</font> <font color=purple>PROTOCOL_STREAM_H</font>
 <font color=blue>#define</font> <font color=purple>PROTOCOL_STREAM_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Stream.h">ace/Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Stream.h</font>"
 
 <font color=red>// Shorthand for the stream.</font>
 typedef ACE_Stream&lt;ACE_MT_SYNCH> Stream;
diff --git a/docs/tutorials/015/page11.html b/docs/tutorials/015/page11.html
index 31eb52bac2d..e03f1a5f7fe 100644
--- a/docs/tutorials/015/page11.html
+++ b/docs/tutorials/015/page11.html
@@ -30,7 +30,7 @@ concern in this file is to get everything in the correct order!
 <font color=blue>#include</font> "<font color=green>Compressor.h</font>"
 <font color=blue>#include</font> "<font color=green>Crypt.h</font>"
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Stream_Modules.h">ace/Stream_Modules.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Stream_Modules.h</font>"
 
 <font color=red>/* You can choose at compile time to include/exclude the protocol
    pieces.
diff --git a/docs/tutorials/015/page12.html b/docs/tutorials/015/page12.html
index 93358494a85..07b36c3c9aa 100644
--- a/docs/tutorials/015/page12.html
+++ b/docs/tutorials/015/page12.html
@@ -20,10 +20,10 @@ A quick look at the Protocol_Task header...
 <font color=blue>#ifndef</font> <font color=purple>PROTOCOL_TASK_H</font>
 <font color=blue>#define</font> <font color=purple>PROTOCOL_TASK_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_PRAGMA_ONCE</font>)
-<font color=blue># pragma</font> <font color=purple>once</font>
+# pragma once
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_PRAGMA_ONCE */</font>
 
 <font color=red>/* A typical ACE_Task&lt;> derivative that adds a few things appropriate
diff --git a/docs/tutorials/015/page15.html b/docs/tutorials/015/page15.html
index 66e4f1bf852..bcc7a7aa207 100644
--- a/docs/tutorials/015/page15.html
+++ b/docs/tutorials/015/page15.html
@@ -33,7 +33,7 @@ streams of data.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Xmit.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=red>/* Construct the object with the peer connection and choose not to
    activate ourselves into a dedicated thread.  You might get some
diff --git a/docs/tutorials/015/page17.html b/docs/tutorials/015/page17.html
index 3a07c2eca89..625bf84110c 100644
--- a/docs/tutorials/015/page17.html
+++ b/docs/tutorials/015/page17.html
@@ -22,7 +22,7 @@ basic stuff.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Recv.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=red>/* Construct the object with the peer reference and other appropriate
    initializations.
diff --git a/docs/tutorials/015/page19.html b/docs/tutorials/015/page19.html
index 2b62ec0bdb3..e8689ebf9d7 100644
--- a/docs/tutorials/015/page19.html
+++ b/docs/tutorials/015/page19.html
@@ -22,7 +22,7 @@ things more difficult if something has to change in their interaction.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Compressor.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=#008888>Compressor::Compressor</font>( void )
         : Protocol_Task()
diff --git a/docs/tutorials/015/page21.html b/docs/tutorials/015/page21.html
index a1aced14565..951064b6922 100644
--- a/docs/tutorials/015/page21.html
+++ b/docs/tutorials/015/page21.html
@@ -21,7 +21,7 @@ favorite library.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Crypt.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/SOCK_Stream.h">ace/SOCK_Stream.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/SOCK_Stream.h</font>"
 
 <font color=red>/* The expected constructor...
  */</font>
diff --git a/docs/tutorials/016/page02.html b/docs/tutorials/016/page02.html
index 21d9b282e4c..bda581108e5 100644
--- a/docs/tutorials/016/page02.html
+++ b/docs/tutorials/016/page02.html
@@ -63,7 +63,7 @@ condition to occur.
 <font color=blue>#ifndef</font> <font color=purple>CONDITION_H</font>
 <font color=blue>#define</font> <font color=purple>CONDITION_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Synch.h">ace/Synch.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Synch.h</font>"
 
 <font color=red>/** A wrapper for ACE_Condition&lt;>.  When you're using an
     ACE_Condition&lt;> you have to have three things: - Some variable
diff --git a/docs/tutorials/016/page04.html b/docs/tutorials/016/page04.html
index c9cc4dc6b4b..654790d6594 100644
--- a/docs/tutorials/016/page04.html
+++ b/docs/tutorials/016/page04.html
@@ -23,7 +23,7 @@ three related member variables.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Condition_i.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=red>/* In order to test our Condition we'll derive from ACE_Task&lt;> so that
    we can have several threads accessing the condition variable
diff --git a/docs/tutorials/017/Barrier_i.cpp b/docs/tutorials/017/Barrier_i.cpp
index 0d9f0c67398..308b44cc397 100644
--- a/docs/tutorials/017/Barrier_i.cpp
+++ b/docs/tutorials/017/Barrier_i.cpp
@@ -10,7 +10,6 @@
 Barrier::Barrier(void)
    : threads_(0)
     ,barrier_(0)
-    ,new_barrier_(0)
 {
     owner_ = ACE_OS::thr_self();
 }
@@ -22,11 +21,6 @@ Barrier::~Barrier(void)
     delete barrier_;
 }
 
-void Barrier::owner( ACE_thread_t _owner )
-{
-    owner_ = _owner;
-}
-
 // Report on the number of threads.
 u_int Barrier::threads(void)
 {
@@ -71,25 +65,6 @@ int Barrier::wait(void)
         return -1;
     }
 
-        // If the threads() mutator has been used, new_barrier_ will
-        // point to a new ACE_Barrier instance.  We'll use a
-        // traditional double-check here to move that new object into
-        // place and cleanup the old one.
-    if( new_barrier_ )
-    {
-            // mutex so that only one thread can do this part.
-        ACE_Guard<ACE_Mutex> mutex(barrier_mutex_);
- 
-            // We only want the first thread to plug in the new barrier...
-        if( new_barrier_ )
-        {
-                // out with the old and in with the new.
-            delete barrier_;
-            barrier_ = new_barrier_;
-            new_barrier_ = 0;
-        }
-    }
-
     return barrier_->wait();
 }
 
@@ -125,36 +100,26 @@ int Barrier::done(void)
  */
 int Barrier::make_barrier( int _wait )
 {
-        // Ensure we have a valid thread count.
-    if( ! threads_.value() )
-    {
-        return -1;
-    }
-
-        // If a barrier already exists, we'll arrange for it to be
-        // replaced through the wait() method above.
+        // Wait for and delete any existing barrier.
     if( barrier_ )
     {
-            // Create the new barrier that wait() will install for us.
-        ACE_NEW_RETURN(new_barrier_,ACE_Barrier(threads_.value()),-1);
-
-            // Wait for our siblings to synch before continuing
         if( _wait )
         {
             barrier_->wait();
         }
+        delete barrier_;
     }
-    else
+
+        // Ensure we have a valid thread count.
+    if( ! threads_.value() )
     {
-            // Create the initial barrier.
-        ACE_NEW_RETURN(barrier_,ACE_Barrier(threads_.value()),-1);
+        return -1;
     }
 
+        // Create the actual barrier.  Note that we initialize it with 
+        // threads_.value() to set its internal thread count.  If the
+        // 'new' fails we will return -1 to the caller.
+    ACE_NEW_RETURN(barrier_,ACE_Barrier(threads_.value()),-1);
+
     return 0;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op <ACE_Mutex, u_int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op <ACE_Mutex, u_int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/docs/tutorials/017/Barrier_i.h b/docs/tutorials/017/Barrier_i.h
index 5d86ce007af..2177bd62576 100644
--- a/docs/tutorials/017/Barrier_i.h
+++ b/docs/tutorials/017/Barrier_i.h
@@ -6,10 +6,10 @@
 #include "ace/Synch.h"
 
 /* Barrier is a simple wrapper for the ACE_Barrier synchronization
-   class.  The ACE_Barrier is already pretty easy to use but I thought
+   class.  The ACE_Barrier is already pretty easy to use but I thought 
    I'd wrap it up to create just a bit more abstraction at the
-   application level.  */
-
+   application level.
+ */
 class Barrier
 {
 public:
@@ -38,23 +38,14 @@ public:
   // done() will invoke wait().  Before returning though, it will
   // delete the barrier_ pointer below to reclaim some memory.
   int done (void);
-
-  // Reset the owning thread of the barrier.
-  void owner( ACE_thread_t _owner );
-
+    
 protected:
   // The number of threads we're synching
-  ACE_Atomic_Op<ACE_Mutex, u_int> threads_;
+  ACE_Atomic_Op<ACE_Mutex,u_int> threads_;
 
   // The ACE_Barrier that does all of the work
   ACE_Barrier *barrier_;
 
-  // If we mutate the number of threads we have to do some black magic 
-  // to make sure there isn't a memory leak.  These two member
-  // variables are a part of that magic.
-  ACE_Barrier *new_barrier_;
-  ACE_Mutex    barrier_mutex_;
-
   // The thread which created the Barrier in the first place.  Only
   // this thread can change the threads_ value.
   ACE_thread_t owner_;
diff --git a/docs/tutorials/017/Makefile b/docs/tutorials/017/Makefile
index 32d54bbfc70..ac6e43168e1 100644
--- a/docs/tutorials/017/Makefile
+++ b/docs/tutorials/017/Makefile
@@ -5,14 +5,14 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-BIN    = barrier barrier2
+BIN    = barrier
 
 FILES  = Barrier_i
 
 BUILD  = $(VBIN)
 
-LSRC = $(addsuffix .cpp,$(BIN))
-SRC  = $(addsuffix .cpp,$(FILES))
+SRC  = $(addsuffix .cpp,$(BIN))
+SRC += $(addsuffix .cpp,$(FILES))
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
@@ -62,7 +62,7 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre
 
 UNSHAR : #
 	sh combine.shar
diff --git a/docs/tutorials/017/barrier.cpp b/docs/tutorials/017/barrier.cpp
index eb9a5c14586..4386ad83ad8 100644
--- a/docs/tutorials/017/barrier.cpp
+++ b/docs/tutorials/017/barrier.cpp
@@ -11,63 +11,30 @@ class Test : public ACE_Task<ACE_NULL_SYNCH>
 {
 public:
 
-        // Construct the object with a desired thread count
-    Test(int _threads);
-
-        // Open/begin the test.  As usual, we have to match the
-        // ACE_Task signature.
-    int open(void * _unused = 0);
-
-        // Change the threads_ value for the next invocation of open()
-    void threads(int _threads);
-
-        // Get the current threads_ value.
-    int threads(void);
+        // Open the object with a few threads
+    int open(int _threads);
 
         // Perform the test
     int svc(void);
 
 protected:
-        // How many threads the barrier will test.
-    int threads_;
-
         // The Barrier object we'll use in our tests below
     Barrier barrier_;
 };
 
-/* Construct the object & initialize the threads value for open() to
-   use.
-*/
-Test::Test(int _threads)
-        : threads_(_threads)
-{
-}
-
 /* As usual, our open() will create one or more threads where we'll do 
    the interesting work.
 */  
-int Test::open(void * _unused)
+int Test::open( int _threads )
 {
-    ACE_UNUSED_ARG(_unused);
-
         // One thing about the barrier:  You have to tell it how many
         // threads it will be synching.  The threads() mutator on my
         // Barrier class lets you do that and hides the implementation 
         // details at the same time.
-    barrier_.threads(threads_);
+    barrier_.threads(_threads);
 
         // Activate the tasks as usual...
-    return this->activate(THR_NEW_LWP, threads_);
-}
-
-void Test::threads(int _threads)
-{
-    threads_ = _threads;
-}
-
-int Test::threads(void)
-{
-    return threads_;
+    return this->activate(THR_NEW_LWP, _threads);
 }
 
 /* svc() will execute in each thread & do a few things with the
@@ -121,7 +88,7 @@ int Test::svc(void)
         // actually invokes wait() but before returning here, it will 
         // clean up a few resources.  The goal is to prevent carrying
         // around objects you don't need.
-    if( barrier_.done() == -1 )
+    if( barrier_.wait() == -1 )
     {
         ACE_DEBUG ((LM_INFO, "(%P|%t|%T)\tbarrier_.done() failed!\n"));
         return 0;
@@ -146,17 +113,16 @@ int Test::svc(void)
  */
 int main(int, char**)
 {
-        // Create the test object with 10 threads
-    Test test(10);
+        // Create the test object
+    Test test;
 
-        // and open it to test the barrier.
-    test.open();
+        // and open it with 10 threads.
+    test.open(10);
         // Now wait for them all to exit.
     test.wait();
 
         // Re-open the Test object with just 5 threads
-    test.threads(5);
-    test.open();
+    test.open(5);
         // and wait for them to complete also.
     test.wait();
     
diff --git a/docs/tutorials/017/barrier2.cpp b/docs/tutorials/017/barrier2.cpp
deleted file mode 100644
index 4fce4e07e42..00000000000
--- a/docs/tutorials/017/barrier2.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-
-// $Id$
-
-#include "Barrier_i.h"
-#include "ace/Task.h"
-
-/* We'll use a simple Task<> derivative to test our new Barrier
-   object.
-*/
-class Test : public ACE_Task<ACE_NULL_SYNCH>
-{
-public:
-
-        // Construct the object with a desired thread count
-    Test(int _threads);
-
-        // Open/begin the test.  As usual, we have to match the
-        // ACE_Task signature.
-    int open(void * _unused = 0);
-
-        // Change the threads_ value for the next invocation of open()
-    void threads(int _threads);
-
-        // Get the current threads_ value.
-    int threads(void);
-
-        // Perform the test
-    int svc(void);
-
-protected:
-        // How many threads the barrier will test.
-    u_int threads_;
-
-        // The Barrier object we'll use in our tests below
-    Barrier barrier_;
-
-        // This lets us pick one (eg -- the first) thread as the
-        // "controller" for our little test...
-    ACE_Atomic_Op<ACE_Mutex,u_int> tcount_;
-};
-
-/* Construct the object & initialize the threads value for open() to
-   use.
-*/
-Test::Test(int _threads)
-        : threads_(_threads), tcount_(0)
-{
-}
-
-/* As usual, our open() will create one or more threads where we'll do 
-   the interesting work.
-*/  
-int Test::open(void * _unused)
-{
-    ACE_UNUSED_ARG(_unused);
-
-        // One thing about the barrier:  You have to tell it how many
-        // threads it will be synching.  The threads() mutator on my
-        // Barrier class lets you do that and hides the implementation 
-        // details at the same time.
-    barrier_.threads(threads_);
-
-        // Activate the tasks as usual...
-    return this->activate(THR_NEW_LWP, threads_, 1);
-}
-
-void Test::threads(int _threads)
-{
-    threads_ = _threads;
-}
-
-int Test::threads(void)
-{
-    return threads_;
-}
-
-/* svc() will execute in each thread & do a few things with the
-   Barrier we have.
- */
-int Test::svc(void)
-{
-        // Say hello to everyone first.
-    ACE_DEBUG(( LM_INFO, "(%P|%t|%T) Created\n" ));
-
-        // Increment and save the "tcount" value.  We'll use it in
-        // just a moment...
-    int me = ++tcount_;
-
-        // Wait for all initial threads to get to this point before we
-        // go any further.  This is standard barrier usage...
-    barrier_.wait();
-
-        // Setup our random number generator.
-    ACE_Time_Value now(ACE_OS::gettimeofday());
-    ACE_RANDR_TYPE seed = now.usec();
-    ACE_OS::srand(seed);
-    int delay;
-
-        // We'll arbitrarily choose the first activated thread to be
-        // the controller.  After it sleeps a few seconds, it will add 
-        // five threads.
-    if( me == 1 )
-    {
-            // Sleep from 1 to 10 seconds so that some of the other
-            // threads will be into their for() loop.
-        delay = ACE_OS::rand_r(seed)%10;
-        ACE_OS::sleep(abs(delay)+1);
-
-            // Make ourselves the barrier owner so that we can change
-            // the number of threads.  This should be done with care...
-        barrier_.owner( ACE_OS::thr_self() );
-
-            // Add 5 threads to the barrier and then activate() to
-            // make them real.  Notice the third parameter to
-            // activate().  Without this parameter, the threads won't
-            // be created.
-        if( barrier_.threads(threads_+5) == 0 )
-        {
-            this->activate(THR_NEW_LWP,5,1);
-        }
-    }
-
-        // This for() loop represents an "infinite" work loop in an
-        // application. The theory is that the threads are dividing up 
-        // some work but need to "recalibrate" if more threads are
-        // added.  I'll just do five iterations so that the test
-        // doesn't run forever.
-    int i;
-    for( i = 0 ; i < 5 ; ++i )
-    {
-            // The sleep() represents time doing work.
-        delay = ACE_OS::rand_r(seed)%7;
-        ACE_OS::sleep(abs(delay)+1);
-
-        ACE_DEBUG(( LM_INFO, "(%P|%t|%T)\tThread %.2d of %.2d iteration %.2d\n", me, threads_, i ));
- 
-            // If the local threads_ variable doesn't match the number 
-            // in the barrier, then the controller must have changed
-            // the thread count.  We'll wait() for everyone and then
-            // recalibrate ourselves before continuing.
-        if( this->threads_ != barrier_.threads() )
-        {
-            ACE_DEBUG(( LM_INFO, "(%P|%t|%T) Waiting for thread count to increase to %d from %d\n",
-                        barrier_.threads(), this->threads_ ));
-
-                // Wait for all our sibling threads...
-            barrier_.wait();
-
-                // Set our local variable so that we don't come here again.
-            this->threads_ = barrier_.threads();
-
-                // Recalibration can be anything you want.  At this
-                // point, we know that all of the threads are synch'd
-                // and ready to go.
-        }
-    }
-
-        // Re-synch all of the threads before they exit.  This isn't
-        // really necessary but I like to do it.
-    barrier_.done();
-
-    return(0);
-}
-
-/* Our test application...
- */
-int main(int, char**)
-{
-        // Create the test object with 5 threads
-    Test test(5);
-
-        // and open it to test the barrier.
-    test.open();
-        // Now wait for them all to exit.
-    test.wait();
-
-    return(0);
-}
diff --git a/docs/tutorials/017/combine.shar b/docs/tutorials/017/combine.shar
index 9595308932d..ff6f7ef7d2d 100644
--- a/docs/tutorials/017/combine.shar
+++ b/docs/tutorials/017/combine.shar
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-02-24 16:56 EST by <jcej@chiroptera.tragus.org>.
+# Made on 1999-02-14 14:25 EST by <jcej@chiroptera.tragus.org>.
 # Source directory was `/var/home/jcej/projects/ACE_wrappers/docs/tutorials/017'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -12,14 +12,12 @@
 # length mode       name
 # ------ ---------- ------------------------------------------
 #    422 -rw-rw-r-- hdr
-#     64 -rw-rw-r-- bodies
+#     45 -rw-rw-r-- bodies
 #   1397 -rw-rw-r-- page01.pre
 #    420 -rw-rw-r-- page02.pre
 #    739 -rw-rw-r-- page03.pre
 #    479 -rw-rw-r-- page04.pre
 #    375 -rw-rw-r-- page05.pre
-#    373 -rw-rw-r-- page06.pre
-#    216 -rw-rw-r-- page05.pst
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -66,7 +64,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh29953; then
+if mkdir _sh32003; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -118,22 +116,20 @@ PAGE=2
 barrier.cpp
 Barrier_i.h
 Barrier_i.cpp
-PAGE=6
-barrier2.cpp
 SHAR_EOF
-  $shar_touch -am 0224165499 'bodies' &&
+  $shar_touch -am 1110144198 'bodies' &&
   chmod 0664 'bodies' ||
   $echo 'restore of' 'bodies' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'bodies:' 'MD5 check failed'
-b6fd04983b241794a9438df2ae77055c  bodies
+4924294a77d6ba78dcf667e92c341b4f  bodies
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'bodies'`"
-    test 64 -eq "$shar_count" ||
-    $echo 'bodies:' 'original size' '64,' 'current size' "$shar_count!"
+    test 45 -eq "$shar_count" ||
+    $echo 'bodies:' 'original size' '45,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page01.pre ==============
@@ -320,61 +316,5 @@ SHAR_EOF
     $echo 'page05.pre:' 'original size' '375,' 'current size' "$shar_count!"
   fi
 fi
-# ============= page06.pre ==============
-if test -f 'page06.pre' && test "$first_param" != -c; then
-  $echo 'x -' SKIPPING 'page06.pre' '(file already exists)'
-else
-  $echo 'x -' extracting 'page06.pre' '(text)'
-  sed 's/^X//' << 'SHAR_EOF' > 'page06.pre' &&
-I could have included this in the first Test object of the tutorial
-but that may have complicated things a bit.  What we're doing here is
-recognizing when the "owner" thread adds more threads to the pool.
-When we notice that, we use the barrier to wait until everything
-stabilizes and then we recalibrate and move on.
-<P>
-The source is <A HREF="barrier2.cpp">here</A>.
-<HR>
-SHAR_EOF
-  $shar_touch -am 0224165499 'page06.pre' &&
-  chmod 0664 'page06.pre' ||
-  $echo 'restore of' 'page06.pre' 'failed'
-  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
-  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
-    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
-    || $echo 'page06.pre:' 'MD5 check failed'
-ad87cd9f57af4c9b2c91cb32b484c0d1  page06.pre
-SHAR_EOF
-  else
-    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page06.pre'`"
-    test 373 -eq "$shar_count" ||
-    $echo 'page06.pre:' 'original size' '373,' 'current size' "$shar_count!"
-  fi
-fi
-# ============= page05.pst ==============
-if test -f 'page05.pst' && test "$first_param" != -c; then
-  $echo 'x -' SKIPPING 'page05.pst' '(file already exists)'
-else
-  $echo 'x -' extracting 'page05.pst' '(text)'
-  sed 's/^X//' << 'SHAR_EOF' > 'page05.pst' &&
-<HR>
-Before we call it a wrap though, there's one more thing I want to show 
-you.  Remember the comments around Barrier::threads()?  On the next
-page, I'll show you how to synch up when the number of threads changes.
-SHAR_EOF
-  $shar_touch -am 0224165199 'page05.pst' &&
-  chmod 0664 'page05.pst' ||
-  $echo 'restore of' 'page05.pst' 'failed'
-  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
-  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
-    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
-    || $echo 'page05.pst:' 'MD5 check failed'
-7ce8bbac0d211a3616b5052236e4983b  page05.pst
-SHAR_EOF
-  else
-    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page05.pst'`"
-    test 216 -eq "$shar_count" ||
-    $echo 'page05.pst:' 'original size' '216,' 'current size' "$shar_count!"
-  fi
-fi
-rm -fr _sh29953
+rm -fr _sh32003
 exit 0
diff --git a/docs/tutorials/017/page02.html b/docs/tutorials/017/page02.html
index fd6b3a1717c..5b7417bc4a9 100644
--- a/docs/tutorials/017/page02.html
+++ b/docs/tutorials/017/page02.html
@@ -26,7 +26,7 @@ application-level details.
 <font color=red>// $Id$</font>
 
 <font color=blue>#include</font> "<font color=green>Barrier_i.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=red>/* We'll use a simple Task&lt;> derivative to test our new Barrier
    object.
@@ -35,63 +35,30 @@ class Test : public ACE_Task&lt;ACE_NULL_SYNCH>
 {
 public:
 
-        <font color=red>// Construct the object with a desired thread count</font>
-    Test(int _threads);
-
-        <font color=red>// Open/begin the test.  As usual, we have to match the</font>
-        <font color=red>// ACE_Task signature.</font>
-    int open(void * _unused = 0);
-
-        <font color=red>// Change the threads_ value for the next invocation of open()</font>
-    void threads(int _threads);
-
-        <font color=red>// Get the current threads_ value.</font>
-    int threads(void);
+        <font color=red>// Open the object with a few threads</font>
+    int open(int _threads);
 
         <font color=red>// Perform the test</font>
     int svc(void);
 
 protected:
-        <font color=red>// How many threads the barrier will test.</font>
-    int threads_;
-
         <font color=red>// The Barrier object we'll use in our tests below</font>
     Barrier barrier_;
 };
 
-<font color=red>/* Construct the object & initialize the threads value for open() to
-   use.
-*/</font>
-<font color=#008888>Test::Test</font>(int _threads)
-        : threads_(_threads)
-{
-}
-
 <font color=red>/* As usual, our open() will create one or more threads where we'll do 
    the interesting work.
 */</font>  
-int <font color=#008888>Test::open</font>(void * _unused)
+int <font color=#008888>Test::open</font>( int _threads )
 {
-    ACE_UNUSED_ARG(_unused);
-
         <font color=red>// One thing about the barrier:  You have to tell it how many</font>
         <font color=red>// threads it will be synching.  The threads() mutator on my</font>
         <font color=red>// Barrier class lets you do that and hides the implementation </font>
         <font color=red>// details at the same time.</font>
-    barrier_.threads(threads_);
+    barrier_.threads(_threads);
 
         <font color=red>// Activate the tasks as usual...</font>
-    return this->activate(THR_NEW_LWP, threads_);
-}
-
-void <font color=#008888>Test::threads</font>(int _threads)
-{
-    threads_ = _threads;
-}
-
-int <font color=#008888>Test::threads</font>(void)
-{
-    return threads_;
+    return this->activate(THR_NEW_LWP, _threads);
 }
 
 <font color=red>/* svc() will execute in each thread & do a few things with the
@@ -145,7 +112,7 @@ int <font color=#008888>Test::svc</font>(void)
         <font color=red>// actually invokes wait() but before returning here, it will </font>
         <font color=red>// clean up a few resources.  The goal is to prevent carrying</font>
         <font color=red>// around objects you don't need.</font>
-    if( barrier_.done() == -1 )
+    if( barrier_.wait() == -1 )
     {
         ACE_DEBUG ((LM_INFO, "<font color=green>(%P|%t|%T)\tbarrier_.done() failed!\n</font>"));
         return 0;
@@ -170,17 +137,16 @@ int <font color=#008888>Test::svc</font>(void)
  */</font>
 int main(int, char**)
 {
-        <font color=red>// Create the test object with 10 threads</font>
-    Test test(10);
+        <font color=red>// Create the test object</font>
+    Test test;
 
-        <font color=red>// and open it to test the barrier.</font>
-    test.open();
+        <font color=red>// and open it with 10 threads.</font>
+    test.open(10);
         <font color=red>// Now wait for them all to exit.</font>
     test.wait();
 
         <font color=red>// Re-open the Test object with just 5 threads</font>
-    test.threads(5);
-    test.open();
+    test.open(5);
         <font color=red>// and wait for them to complete also.</font>
     test.wait();
     
diff --git a/docs/tutorials/017/page03.html b/docs/tutorials/017/page03.html
index 3649337655b..904fc58701f 100644
--- a/docs/tutorials/017/page03.html
+++ b/docs/tutorials/017/page03.html
@@ -31,13 +31,13 @@ the Barrier object almost as a "synchronization guard".
 <font color=blue>#ifndef</font> <font color=purple>BARRIER_H</font>
 <font color=blue>#define</font> <font color=purple>BARRIER_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Synch.h">ace/Synch.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Synch.h</font>"
 
 <font color=red>/* Barrier is a simple wrapper for the ACE_Barrier synchronization
-   class.  The ACE_Barrier is already pretty easy to use but I thought
+   class.  The ACE_Barrier is already pretty easy to use but I thought 
    I'd wrap it up to create just a bit more abstraction at the
-   application level.  */</font>
-
+   application level.
+ */</font>
 class Barrier
 {
 public:
@@ -66,23 +66,14 @@ public:
   <font color=red>// done() will invoke wait().  Before returning though, it will</font>
   <font color=red>// delete the barrier_ pointer below to reclaim some memory.</font>
   int done (void);
-
-  <font color=red>// Reset the owning thread of the barrier.</font>
-  void owner( ACE_thread_t _owner );
-
+    
 protected:
   <font color=red>// The number of threads we're synching</font>
-  ACE_Atomic_Op&lt;ACE_Mutex, u_int> threads_;
+  ACE_Atomic_Op&lt;ACE_Mutex,u_int> threads_;
 
   <font color=red>// The ACE_Barrier that does all of the work</font>
   ACE_Barrier *barrier_;
 
-  <font color=red>// If we mutate the number of threads we have to do some black magic </font>
-  <font color=red>// to make sure there isn't a memory leak.  These two member</font>
-  <font color=red>// variables are a part of that magic.</font>
-  ACE_Barrier *new_barrier_;
-  ACE_Mutex    barrier_mutex_;
-
   <font color=red>// The thread which created the Barrier in the first place.  Only</font>
   <font color=red>// this thread can change the threads_ value.</font>
   ACE_thread_t owner_;
diff --git a/docs/tutorials/017/page04.html b/docs/tutorials/017/page04.html
index 88ff60be565..7032f4c2d3a 100644
--- a/docs/tutorials/017/page04.html
+++ b/docs/tutorials/017/page04.html
@@ -33,7 +33,6 @@ locking that is just a bit more than what I wanted to present here.
 <font color=#008888>Barrier::Barrier</font>(void)
    : threads_(0)
     ,barrier_(0)
-    ,new_barrier_(0)
 {
     owner_ = <font color=#008888>ACE_OS::thr_self</font>();
 }
@@ -45,11 +44,6 @@ locking that is just a bit more than what I wanted to present here.
     delete barrier_;
 }
 
-void <font color=#008888>Barrier::owner</font>( ACE_thread_t _owner )
-{
-    owner_ = _owner;
-}
-
 <font color=red>// Report on the number of threads.</font>
 u_int <font color=#008888>Barrier::threads</font>(void)
 {
@@ -94,25 +88,6 @@ int <font color=#008888>Barrier::wait</font>(void)
         return -1;
     }
 
-        <font color=red>// If the threads() mutator has been used, new_barrier_ will</font>
-        <font color=red>// point to a new ACE_Barrier instance.  We'll use a</font>
-        <font color=red>// traditional double-check here to move that new object into</font>
-        <font color=red>// place and cleanup the old one.</font>
-    if( new_barrier_ )
-    {
-            <font color=red>// mutex so that only one thread can do this part.</font>
-        ACE_Guard&lt;ACE_Mutex> mutex(barrier_mutex_);
- 
-            <font color=red>// We only want the first thread to plug in the new barrier...</font>
-        if( new_barrier_ )
-        {
-                <font color=red>// out with the old and in with the new.</font>
-            delete barrier_;
-            barrier_ = new_barrier_;
-            new_barrier_ = 0;
-        }
-    }
-
     return barrier_->wait();
 }
 
@@ -148,31 +123,27 @@ int <font color=#008888>Barrier::done</font>(void)
  */</font>
 int <font color=#008888>Barrier::make_barrier</font>( int _wait )
 {
-        <font color=red>// Ensure we have a valid thread count.</font>
-    if( ! threads_.value() )
-    {
-        return -1;
-    }
-
-        <font color=red>// If a barrier already exists, we'll arrange for it to be</font>
-        <font color=red>// replaced through the wait() method above.</font>
+        <font color=red>// Wait for and delete any existing barrier.</font>
     if( barrier_ )
     {
-            <font color=red>// Create the new barrier that wait() will install for us.</font>
-        ACE_NEW_RETURN(new_barrier_,ACE_Barrier(threads_.value()),-1);
-
-            <font color=red>// Wait for our siblings to synch before continuing</font>
         if( _wait )
         {
             barrier_->wait();
         }
+        delete barrier_;
     }
-    else
+
+        <font color=red>// Ensure we have a valid thread count.</font>
+    if( ! threads_.value() )
     {
-            <font color=red>// Create the initial barrier.</font>
-        ACE_NEW_RETURN(barrier_,ACE_Barrier(threads_.value()),-1);
+        return -1;
     }
 
+        <font color=red>// Create the actual barrier.  Note that we initialize it with </font>
+        <font color=red>// threads_.value() to set its internal thread count.  If the</font>
+        <font color=red>// 'new' fails we will return -1 to the caller.</font>
+    ACE_NEW_RETURN(barrier_,ACE_Barrier(threads_.value()),-1);
+
     return 0;
 }
 </PRE>
diff --git a/docs/tutorials/017/page05.html b/docs/tutorials/017/page05.html
index f5be1185260..f0fd213c487 100644
--- a/docs/tutorials/017/page05.html
+++ b/docs/tutorials/017/page05.html
@@ -22,9 +22,5 @@ enhancements will gladly be integrated into the Tutorial.
 <LI><A HREF="Barrier_i.h">Barrier_i.h</A>
 <LI><A HREF="Barrier_i.cpp">Barrier_i.cpp</A>
 </UL>
-<HR>
-Before we call it a wrap though, there's one more thing I want to show 
-you.  Remember the comments around Barrier::threads()?  On the next
-page, I'll show you how to synch up when the number of threads changes.
 <P><HR WIDTH="100%">
-<CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page06.html">Continue This Tutorial</A>]</CENTER>
+<CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] </CENTER>
diff --git a/docs/tutorials/017/page06.html b/docs/tutorials/017/page06.html
deleted file mode 100644
index 1bd396d156e..00000000000
--- a/docs/tutorials/017/page06.html
+++ /dev/null
@@ -1,204 +0,0 @@
-<HTML>
-<HEAD>
-   <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
-   <META NAME="Author" CONTENT="James CE Johnson">
-   <TITLE>ACE Tutorial 017</TITLE>
-</HEAD>
-<BODY TEXT="#000000" BGCOLOR="#FFFFFF" LINK="#000FFF" VLINK="#FF0F0F">
-
-<CENTER><B><FONT SIZE=+2>ACE Tutorial 017</FONT></B></CENTER>
-
-<CENTER><B><FONT SIZE=+2>Using the ACE_Barrier synch object</FONT></B></CENTER>
-
-<P>
-<HR WIDTH="100%">
-I could have included this in the first Test object of the tutorial
-but that may have complicated things a bit.  What we're doing here is
-recognizing when the "owner" thread adds more threads to the pool.
-When we notice that, we use the barrier to wait until everything
-stabilizes and then we recalibrate and move on.
-<P>
-The source is <A HREF="barrier2.cpp">here</A>.
-<HR>
-<PRE>
-
-<font color=red>// $Id$</font>
-
-<font color=blue>#include</font> "<font color=green>Barrier_i.h</font>"
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
-
-<font color=red>/* We'll use a simple Task&lt;> derivative to test our new Barrier
-   object.
-*/</font>
-class Test : public ACE_Task&lt;ACE_NULL_SYNCH>
-{
-public:
-
-        <font color=red>// Construct the object with a desired thread count</font>
-    Test(int _threads);
-
-        <font color=red>// Open/begin the test.  As usual, we have to match the</font>
-        <font color=red>// ACE_Task signature.</font>
-    int open(void * _unused = 0);
-
-        <font color=red>// Change the threads_ value for the next invocation of open()</font>
-    void threads(int _threads);
-
-        <font color=red>// Get the current threads_ value.</font>
-    int threads(void);
-
-        <font color=red>// Perform the test</font>
-    int svc(void);
-
-protected:
-        <font color=red>// How many threads the barrier will test.</font>
-    u_int threads_;
-
-        <font color=red>// The Barrier object we'll use in our tests below</font>
-    Barrier barrier_;
-
-        <font color=red>// This lets us pick one (eg -- the first) thread as the</font>
-        <font color=red>// "<font color=green>controller</font>" for our little test...</font>
-    ACE_Atomic_Op&lt;ACE_Mutex,u_int> tcount_;
-};
-
-<font color=red>/* Construct the object & initialize the threads value for open() to
-   use.
-*/</font>
-<font color=#008888>Test::Test</font>(int _threads)
-        : threads_(_threads), tcount_(0)
-{
-}
-
-<font color=red>/* As usual, our open() will create one or more threads where we'll do 
-   the interesting work.
-*/</font>  
-int <font color=#008888>Test::open</font>(void * _unused)
-{
-    ACE_UNUSED_ARG(_unused);
-
-        <font color=red>// One thing about the barrier:  You have to tell it how many</font>
-        <font color=red>// threads it will be synching.  The threads() mutator on my</font>
-        <font color=red>// Barrier class lets you do that and hides the implementation </font>
-        <font color=red>// details at the same time.</font>
-    barrier_.threads(threads_);
-
-        <font color=red>// Activate the tasks as usual...</font>
-    return this->activate(THR_NEW_LWP, threads_, 1);
-}
-
-void <font color=#008888>Test::threads</font>(int _threads)
-{
-    threads_ = _threads;
-}
-
-int <font color=#008888>Test::threads</font>(void)
-{
-    return threads_;
-}
-
-<font color=red>/* svc() will execute in each thread & do a few things with the
-   Barrier we have.
- */</font>
-int <font color=#008888>Test::svc</font>(void)
-{
-        <font color=red>// Say hello to everyone first.</font>
-    ACE_DEBUG(( LM_INFO, "<font color=green>(%P|%t|%T) Created\n</font>" ));
-
-        <font color=red>// Increment and save the "<font color=green>tcount</font>" value.  We'll use it in</font>
-        <font color=red>// just a moment...</font>
-    int me = ++tcount_;
-
-        <font color=red>// Wait for all initial threads to get to this point before we</font>
-        <font color=red>// go any further.  This is standard barrier usage...</font>
-    barrier_.wait();
-
-        <font color=red>// Setup our random number generator.</font>
-    ACE_Time_Value now(<font color=#008888>ACE_OS::gettimeofday</font>());
-    ACE_RANDR_TYPE seed = now.usec();
-    <font color=#008888>ACE_OS::srand</font>(seed);
-    int delay;
-
-        <font color=red>// We'll arbitrarily choose the first activated thread to be</font>
-        <font color=red>// the controller.  After it sleeps a few seconds, it will add </font>
-        <font color=red>// five threads.</font>
-    if( me == 1 )
-    {
-            <font color=red>// Sleep from 1 to 10 seconds so that some of the other</font>
-            <font color=red>// threads will be into their for() loop.</font>
-        delay = <font color=#008888>ACE_OS::rand_r</font>(seed)%10;
-        <font color=#008888>ACE_OS::sleep</font>(abs(delay)+1);
-
-            <font color=red>// Make ourselves the barrier owner so that we can change</font>
-            <font color=red>// the number of threads.  This should be done with care...</font>
-        barrier_.owner( <font color=#008888>ACE_OS::thr_self</font>() );
-
-            <font color=red>// Add 5 threads to the barrier and then activate() to</font>
-            <font color=red>// make them real.  Notice the third parameter to</font>
-            <font color=red>// activate().  Without this parameter, the threads won't</font>
-            <font color=red>// be created.</font>
-        if( barrier_.threads(threads_+5) == 0 )
-        {
-            this->activate(THR_NEW_LWP,5,1);
-        }
-    }
-
-        <font color=red>// This for() loop represents an "<font color=green>infinite</font>" work loop in an</font>
-        <font color=red>// application. The theory is that the threads are dividing up </font>
-        <font color=red>// some work but need to "<font color=green>recalibrate</font>" if more threads are</font>
-        <font color=red>// added.  I'll just do five iterations so that the test</font>
-        <font color=red>// doesn't run forever.</font>
-    int i;
-    for( i = 0 ; i &lt; 5 ; ++i )
-    {
-            <font color=red>// The sleep() represents time doing work.</font>
-        delay = <font color=#008888>ACE_OS::rand_r</font>(seed)%7;
-        <font color=#008888>ACE_OS::sleep</font>(abs(delay)+1);
-
-        ACE_DEBUG(( LM_INFO, "<font color=green>(%P|%t|%T)\tThread %.2d of %.2d iteration %.2d\n</font>", me, threads_, i ));
- 
-            <font color=red>// If the local threads_ variable doesn't match the number </font>
-            <font color=red>// in the barrier, then the controller must have changed</font>
-            <font color=red>// the thread count.  We'll wait() for everyone and then</font>
-            <font color=red>// recalibrate ourselves before continuing.</font>
-        if( this->threads_ != barrier_.threads() )
-        {
-            ACE_DEBUG(( LM_INFO, "<font color=green>(%P|%t|%T) Waiting for thread count to increase to %d from %d\n</font>",
-                        barrier_.threads(), this->threads_ ));
-
-                <font color=red>// Wait for all our sibling threads...</font>
-            barrier_.wait();
-
-                <font color=red>// Set our local variable so that we don't come here again.</font>
-            this->threads_ = barrier_.threads();
-
-                <font color=red>// Recalibration can be anything you want.  At this</font>
-                <font color=red>// point, we know that all of the threads are synch'd</font>
-                <font color=red>// and ready to go.</font>
-        }
-    }
-
-        <font color=red>// Re-synch all of the threads before they exit.  This isn't</font>
-        <font color=red>// really necessary but I like to do it.</font>
-    barrier_.done();
-
-    return(0);
-}
-
-<font color=red>/* Our test application...
- */</font>
-int main(int, char**)
-{
-        <font color=red>// Create the test object with 5 threads</font>
-    Test test(5);
-
-        <font color=red>// and open it to test the barrier.</font>
-    test.open();
-        <font color=red>// Now wait for them all to exit.</font>
-    test.wait();
-
-    return(0);
-}
-</PRE>
-<P><HR WIDTH="100%">
-<CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] </CENTER>
diff --git a/docs/tutorials/018/Test_T.cpp b/docs/tutorials/018/Test_T.cpp
index 73d5549d3ca..178c912082a 100644
--- a/docs/tutorials/018/Test_T.cpp
+++ b/docs/tutorials/018/Test_T.cpp
@@ -104,7 +104,7 @@ Test_T<MUTEX>::send (ACE_Message_Block *message)
 template <class MUTEX> int 
 Test_T<MUTEX>::open (void *arg)
 {
-  ACE_UNUSED_ARG(arg);
+  ACE_UNUSED_ARG(_arg);
   return this->activate (THR_NEW_LWP,
                          TEST_THREAD_COUNT);
 }
diff --git a/docs/tutorials/018/combine.shar b/docs/tutorials/018/combine.shar
index 274d7e39816..5db5d69e58f 100644
--- a/docs/tutorials/018/combine.shar
+++ b/docs/tutorials/018/combine.shar
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-02-24 17:02 EST by <jcej@chiroptera.tragus.org>.
+# Made on 1998-11-15 12:38 EST by <jcej@chiroptera.tragus.org>.
 # Source directory was `/var/home/jcej/projects/ACE_wrappers/docs/tutorials/018'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -13,7 +13,7 @@
 # ------ ---------- ------------------------------------------
 #    416 -rw-rw-r-- hdr
 #     64 -rw-rw-r-- bodies
-#   2603 -rw-rw-r-- page01.pre
+#   1446 -rw-rw-r-- page01.pre
 #    430 -rw-rw-r-- page02.pre
 #   1282 -rw-rw-r-- page03.pre
 #    689 -rw-rw-r-- page04.pre
@@ -66,7 +66,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh30135; then
+if mkdir _sh11947; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -173,41 +173,20 @@ It gets down to a personal decision based on the application's needs.
 Consider your application, examine its behavior & decide for yourself
 if you want to spread the work evenly or if it's OK to let some
 threads work harder than others.
-<P>
-Kirthika's abstract:
-<UL>
-A token is similar to a mutex-lock, with the difference being that 
-the token is given to the waiting threads in a FIFO order. In the case 
-of the mutex-lock,  any thread (depending on the OS) could acquire 
-the lock when its released. It internally implements a recursive mutex, 
-i.e. the thread that owns the mutex can reqacquire it without deadlocking. 
-The token also has two FIFO lists for writers and readers with writer- 
-acquires having a higher priority than reader-acquires. 
-<P>
-This tutorial throws light on the differences on having a shared resource governed by 
-a lock and a token, both derive from  a Task which simply updates a counter with the 
-number-of-threads value. A barrier is used for ensuring that all threads get a equal 
-opportunity of grabbing the token. The message queue with the message containing the 
-thread count moves among the threads to be obtained and read. 
-<P>
-On obtaining the results, we conclude that on using the Token, the job to be completed 
-can be distributed evenly among available threads. This cant be guaranteed 
-in case of simply using the lock for synchronisation. 
-</ul>
 SHAR_EOF
-  $shar_touch -am 0224170199 'page01.pre' &&
+  $shar_touch -am 1114142998 'page01.pre' &&
   chmod 0664 'page01.pre' ||
   $echo 'restore of' 'page01.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page01.pre:' 'MD5 check failed'
-89cd84f46240da6d7d4d50e4d303e17a  page01.pre
+d420fe795c2d1e13cc4a9b4972ba1b47  page01.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page01.pre'`"
-    test 2603 -eq "$shar_count" ||
-    $echo 'page01.pre:' 'original size' '2603,' 'current size' "$shar_count!"
+    test 1446 -eq "$shar_count" ||
+    $echo 'page01.pre:' 'original size' '1446,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page02.pre ==============
@@ -436,5 +415,5 @@ SHAR_EOF
     $echo 'page07.pre:' 'original size' '478,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh30135
+rm -fr _sh11947
 exit 0
diff --git a/docs/tutorials/018/page01.html b/docs/tutorials/018/page01.html
index 871e8070558..03ce2accfd1 100644
--- a/docs/tutorials/018/page01.html
+++ b/docs/tutorials/018/page01.html
@@ -43,26 +43,5 @@ It gets down to a personal decision based on the application's needs.
 Consider your application, examine its behavior & decide for yourself
 if you want to spread the work evenly or if it's OK to let some
 threads work harder than others.
-<P>
-Kirthika's abstract:
-<UL>
-A token is similar to a mutex-lock, with the difference being that 
-the token is given to the waiting threads in a FIFO order. In the case 
-of the mutex-lock,  any thread (depending on the OS) could acquire 
-the lock when its released. It internally implements a recursive mutex, 
-i.e. the thread that owns the mutex can reqacquire it without deadlocking. 
-The token also has two FIFO lists for writers and readers with writer- 
-acquires having a higher priority than reader-acquires. 
-<P>
-This tutorial throws light on the differences on having a shared resource governed by 
-a lock and a token, both derive from  a Task which simply updates a counter with the 
-number-of-threads value. A barrier is used for ensuring that all threads get a equal 
-opportunity of grabbing the token. The message queue with the message containing the 
-thread count moves among the threads to be obtained and read. 
-<P>
-On obtaining the results, we conclude that on using the Token, the job to be completed 
-can be distributed evenly among available threads. This cant be guaranteed 
-in case of simply using the lock for synchronisation. 
-</ul>
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page02.html">Continue This Tutorial</A>]</CENTER>
diff --git a/docs/tutorials/018/page02.html b/docs/tutorials/018/page02.html
index b317db06226..691e8613e5f 100644
--- a/docs/tutorials/018/page02.html
+++ b/docs/tutorials/018/page02.html
@@ -35,7 +35,7 @@ int main(int,char**)
     Token token;
     token.run();
 
-        <font color=red>// And now the ACE_Mutex.</font>
+        <font color=red>// And now and ACE_Mutex.</font>
     Mutex mutex;
     mutex.run();
     
diff --git a/docs/tutorials/018/page03.html b/docs/tutorials/018/page03.html
index 100b332e1fb..5eccee967ae 100644
--- a/docs/tutorials/018/page03.html
+++ b/docs/tutorials/018/page03.html
@@ -43,7 +43,7 @@ yourself a lot of time!
 <font color=blue>#ifndef</font> <font color=purple>TEST_T_H</font>
 <font color=blue>#define</font> <font color=purple>TEST_T_H</font>
 
-<font color=blue>#include</font> "<A HREF="../../../ace/Task.h">ace/Task.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Task.h</font>"
 
 <font color=red>/* We'll create a simple ACE_Task derivative for testing a couple of
    different locking mechanisms.  We've hidden the open() method to
diff --git a/docs/tutorials/018/page04.html b/docs/tutorials/018/page04.html
index b83ab46f653..639732eb7e8 100644
--- a/docs/tutorials/018/page04.html
+++ b/docs/tutorials/018/page04.html
@@ -132,7 +132,7 @@ Test_T&lt;MUTEX>::send (ACE_Message_Block *message)
 template &lt;class MUTEX> int 
 Test_T&lt;MUTEX>::open (void *arg)
 {
-  ACE_UNUSED_ARG(arg);
+  ACE_UNUSED_ARG(_arg);
   return this->activate (THR_NEW_LWP,
                          TEST_THREAD_COUNT);
 }
diff --git a/docs/tutorials/018/page05.html b/docs/tutorials/018/page05.html
index fb846de5e37..8304aa67104 100644
--- a/docs/tutorials/018/page05.html
+++ b/docs/tutorials/018/page05.html
@@ -27,7 +27,7 @@ retyping and certainly much less chance of error!
 <font color=blue>#include</font> "<font color=green>Test_T.h</font>"
 
 <font color=red>// Go get ace/Token.h so that we know what an ACE_Token is.</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Token.h">ace/Token.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Token.h</font>"
 
 <font color=red>/* Create a very simple derivative of our Test template.  All we have
    to do is provide our mutex choice and a name.
diff --git a/docs/tutorials/018/token.cpp b/docs/tutorials/018/token.cpp
index 1323dcaa9b4..995b127014f 100644
--- a/docs/tutorials/018/token.cpp
+++ b/docs/tutorials/018/token.cpp
@@ -11,22 +11,9 @@ int main(int,char**)
     Token token;
     token.run();
 
-        // And now the ACE_Mutex.
+        // And now and ACE_Mutex.
     Mutex mutex;
     mutex.run();
     
     return(0);
 }
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class Test_T <ACE_Mutex>;
-template class Test_T <ACE_Token>;
-template class ACE_Atomic_Op <ACE_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate Test_T <ACE_Mutex>
-#pragma instantiate Test_T <ACE_Token>
-#pragma instantiate ACE_Atomic_Op <ACE_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
-
-
diff --git a/docs/tutorials/019/combine.shar b/docs/tutorials/019/combine.shar
index d05038bee74..1b4fd263723 100644
--- a/docs/tutorials/019/combine.shar
+++ b/docs/tutorials/019/combine.shar
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-04-03 17:08 EST by <jcej@chiroptera.tragus.org>.
+# Made on 1998-12-28 16:29 EST by <jcej@chiroptera.tragus.org>.
 # Source directory was `/var/home/jcej/projects/ACE_wrappers/docs/tutorials/019'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -13,7 +13,7 @@
 # ------ ---------- ------------------------------------------
 #    409 -rw-rw-r-- hdr
 #     71 -rw-rw-r-- bodies
-#   2009 -rw-rw-r-- page01.pre
+#   1161 -rw-rw-r-- page01.pre
 #    563 -rw-rw-r-- page02.pre
 #    219 -rw-rw-r-- page03.pre
 #    676 -rw-rw-r-- page04.pre
@@ -65,7 +65,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh12976; then
+if mkdir _sh06808; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -152,7 +152,7 @@ X      doing this, we can allow our applications to swap data very
 X      efficiently.
 X    <p>
 X      Along the way, we'll have to come up with some sort of
-X      coordination betweent the processes.  That is the most
+X      coordintation betweent the processes.  That is the most
 X      difficult part of a shared memory system.  In the tutorial we're 
 X      just going to take a simplistic approach (eg -- busy loop) but
 X      real-world applications will need to take a serious look at
@@ -163,41 +163,20 @@ X      myself.  This tutorial and the next are very simple-minded and
 X      primitive.  Anyone who wants to provide more realistic
 X      replacements is encouraged to drop me a note
 X      (<A HREF="mailto:jcej@lads.com">jcej@lads.com</A>).
-<P>
-A tutorial wouldn't be complete without Kirthika's abstract:
-<UL>
-This tutorial shows how to use memory as a shared resource between the
-client and server processes. ACE_Shared_Memory_SV has been used for
-creating
-the shared memory segment. Two different approaches have been used. One
-uses the malloc () method to allocate memory while the other uses the
-placement new expression (C++) of allocating a memory chunk in advance
-and using it on demand.
-<P>
-The server has a string of alphabets from a-z which are converted to
-uppercase
-by the client proving that the same memory locations are being shared
-between 
-the two processes. The syncronisation between the server and client is
-done 
-using the ACE_OS::sleep () instead of a semaphore/mutexes with the aim
-of keeping our first dive into shared memory usage simple and easy to
-fathom.
-</UL>
 SHAR_EOF
-  $shar_touch -am 0403170299 'page01.pre' &&
+  $shar_touch -am 1228154598 'page01.pre' &&
   chmod 0664 'page01.pre' ||
   $echo 'restore of' 'page01.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page01.pre:' 'MD5 check failed'
-fae9aec33b3cc43e8c06d608e00adf2f  page01.pre
+aef26c91d7b1ff2212e955be7e2d6ab9  page01.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page01.pre'`"
-    test 2009 -eq "$shar_count" ||
-    $echo 'page01.pre:' 'original size' '2009,' 'current size' "$shar_count!"
+    test 1161 -eq "$shar_count" ||
+    $echo 'page01.pre:' 'original size' '1161,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page02.pre ==============
@@ -206,7 +185,7 @@ if test -f 'page02.pre' && test "$first_param" != -c; then
 else
   $echo 'x -' extracting 'page02.pre' '(text)'
   sed 's/^X//' << 'SHAR_EOF' > 'page02.pre' &&
-We'll first take a look at the server side.  As usual with
+We'll first take a look at the server side.  As ususal with
 co-operating applications, you need the server up and running first.
 In the case of shared memory applications, the server will create the
 shared memory segment.  In this example, it will also remove the
@@ -217,14 +196,14 @@ of persistence between application instances (at least, until the
 machine comes down.)
 <HR>
 SHAR_EOF
-  $shar_touch -am 0403170299 'page02.pre' &&
+  $shar_touch -am 1228154698 'page02.pre' &&
   chmod 0664 'page02.pre' ||
   $echo 'restore of' 'page02.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page02.pre:' 'MD5 check failed'
-e6c9fee2eb20324a2f0504fb1c687ddd  page02.pre
+f651adc7b68da0c21b92c8a665980a18  page02.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page02.pre'`"
@@ -354,5 +333,5 @@ SHAR_EOF
     $echo 'page06.pre:' 'original size' '401,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh12976
+rm -fr _sh06808
 exit 0
diff --git a/docs/tutorials/019/page01.html b/docs/tutorials/019/page01.html
index 1aa30b6aa2e..2d74f78c874 100644
--- a/docs/tutorials/019/page01.html
+++ b/docs/tutorials/019/page01.html
@@ -24,7 +24,7 @@
       efficiently.
     <p>
       Along the way, we'll have to come up with some sort of
-      coordination betweent the processes.  That is the most
+      coordintation betweent the processes.  That is the most
       difficult part of a shared memory system.  In the tutorial we're 
       just going to take a simplistic approach (eg -- busy loop) but
       real-world applications will need to take a serious look at
@@ -35,26 +35,5 @@
       primitive.  Anyone who wants to provide more realistic
       replacements is encouraged to drop me a note
       (<A HREF="mailto:jcej@lads.com">jcej@lads.com</A>).
-<P>
-A tutorial wouldn't be complete without Kirthika's abstract:
-<UL>
-This tutorial shows how to use memory as a shared resource between the
-client and server processes. ACE_Shared_Memory_SV has been used for
-creating
-the shared memory segment. Two different approaches have been used. One
-uses the malloc () method to allocate memory while the other uses the
-placement new expression (C++) of allocating a memory chunk in advance
-and using it on demand.
-<P>
-The server has a string of alphabets from a-z which are converted to
-uppercase
-by the client proving that the same memory locations are being shared
-between 
-the two processes. The syncronisation between the server and client is
-done 
-using the ACE_OS::sleep () instead of a semaphore/mutexes with the aim
-of keeping our first dive into shared memory usage simple and easy to
-fathom.
-</UL>
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page02.html">Continue This Tutorial</A>]</CENTER>
diff --git a/docs/tutorials/019/page02.html b/docs/tutorials/019/page02.html
index c9480da45ac..722797e6ba4 100644
--- a/docs/tutorials/019/page02.html
+++ b/docs/tutorials/019/page02.html
@@ -12,7 +12,7 @@
 
 <P>
 <HR WIDTH="100%">
-We'll first take a look at the server side.  As usual with
+We'll first take a look at the server side.  As ususal with
 co-operating applications, you need the server up and running first.
 In the case of shared memory applications, the server will create the
 shared memory segment.  In this example, it will also remove the
diff --git a/docs/tutorials/019/page05.html b/docs/tutorials/019/page05.html
index 60bc8c938d4..7611341ac98 100644
--- a/docs/tutorials/019/page05.html
+++ b/docs/tutorials/019/page05.html
@@ -24,7 +24,7 @@
 <font color=blue>#define</font> <font color=purple>SHMEM_H</font>
 
 <font color=red>// This is where you'll find the ACE_Shared_Memory_SV object</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Shared_Memory_SV.h">ace/Shared_Memory_SV.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Shared_Memory_SV.h</font>"
 
 <font color=red>// SHMSZ is just enough for the alphabet and a null terminator</font>
 <font color=blue>#define</font> <font color=purple>SHMSZ</font> 27
diff --git a/docs/tutorials/020/combine.shar b/docs/tutorials/020/combine.shar
index fa330caeede..187ff0fadcb 100644
--- a/docs/tutorials/020/combine.shar
+++ b/docs/tutorials/020/combine.shar
@@ -3,7 +3,7 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-04-03 17:08 EST by <jcej@chiroptera.tragus.org>.
+# Made on 1998-12-28 18:00 EST by <jcej@chiroptera.tragus.org>.
 # Source directory was `/var/home/jcej/projects/ACE_wrappers/docs/tutorials/020'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
@@ -13,7 +13,7 @@
 # ------ ---------- ------------------------------------------
 #    426 -rw-rw-r-- hdr
 #     69 -rw-rw-r-- bodies
-#   1395 -rw-rw-r-- page01.pre
+#    509 -rw-rw-r-- page01.pre
 #    524 -rw-rw-r-- page02.pre
 #    115 -rw-rw-r-- page03.pre
 #    411 -rw-rw-r-- page04.pre
@@ -66,7 +66,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh12949; then
+if mkdir _sh07707; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -151,41 +151,20 @@ X    <p>
 X      Like the shared memory tutorial, this one is also very basic and 
 X      primitive.  I'm assuming you've read that one, so I'll just hit
 X      the high points this time through..
-<P>
-Kirthika's abstract:
-<UL>
-Here, the ACE_Shared_Memory_MM class has been used to provide
-persistence of the contents of the shared memory resource used by 
-the server and client. A memory_map which is really a file mapped onto
-memory appears like an array which can be
-easily manipulated  while actually the data is stored in a file thus
-making the contents permanent. In the previous tutorial, this wasnt
-possible as we were dealing with shared memory allocated from the RAM.
-<P>
-Again, here too, the example consists of a server and a client sharing
-memory
-(the mem_map) and the server writing a a-z string to it which will
-be successfully converted to uppercase by the client.
-<P>
-Notice that, similarities in usage abound between the previous and the
-current tutorial which will prove to be a force for templatisation.
-For that we need to go ahead -- to the next tutorial!
-X
-</UL>
 SHAR_EOF
-  $shar_touch -am 0403170599 'page01.pre' &&
+  $shar_touch -am 1228173898 'page01.pre' &&
   chmod 0664 'page01.pre' ||
   $echo 'restore of' 'page01.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page01.pre:' 'MD5 check failed'
-dce708188357c329c4d68d4799f5511b  page01.pre
+333a5e5f8be0a5b8dc66424a50e5b4bd  page01.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page01.pre'`"
-    test 1395 -eq "$shar_count" ||
-    $echo 'page01.pre:' 'original size' '1395,' 'current size' "$shar_count!"
+    test 509 -eq "$shar_count" ||
+    $echo 'page01.pre:' 'original size' '509,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page02.pre ==============
@@ -360,5 +339,5 @@ SHAR_EOF
     $echo 'page02.pst:' 'original size' '132,' 'current size' "$shar_count!"
   fi
 fi
-rm -fr _sh12949
+rm -fr _sh07707
 exit 0
diff --git a/docs/tutorials/020/page01.html b/docs/tutorials/020/page01.html
index 099d0bb3725..9b88f442c08 100644
--- a/docs/tutorials/020/page01.html
+++ b/docs/tutorials/020/page01.html
@@ -22,26 +22,5 @@
       Like the shared memory tutorial, this one is also very basic and 
       primitive.  I'm assuming you've read that one, so I'll just hit
       the high points this time through..
-<P>
-Kirthika's abstract:
-<UL>
-Here, the ACE_Shared_Memory_MM class has been used to provide
-persistence of the contents of the shared memory resource used by 
-the server and client. A memory_map which is really a file mapped onto
-memory appears like an array which can be
-easily manipulated  while actually the data is stored in a file thus
-making the contents permanent. In the previous tutorial, this wasnt
-possible as we were dealing with shared memory allocated from the RAM.
-<P>
-Again, here too, the example consists of a server and a client sharing
-memory
-(the mem_map) and the server writing a a-z string to it which will
-be successfully converted to uppercase by the client.
-<P>
-Notice that, similarities in usage abound between the previous and the
-current tutorial which will prove to be a force for templatisation.
-For that we need to go ahead -- to the next tutorial!
-
-</UL>
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page02.html">Continue This Tutorial</A>]</CENTER>
diff --git a/docs/tutorials/020/page05.html b/docs/tutorials/020/page05.html
index 612a942a061..0d85cc09afa 100644
--- a/docs/tutorials/020/page05.html
+++ b/docs/tutorials/020/page05.html
@@ -23,7 +23,7 @@ The mmap.h where we define stuff that needs to be shared between the
 <font color=blue>#define</font> <font color=purple>MMAP_H</font>
 
 <font color=red>// The expected filename for ACE_Shared_Memory_MM.h</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Shared_Memory_MM.h">ace/Shared_Memory_MM.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Shared_Memory_MM.h</font>"
 
 <font color=red>// Just enough for the alphabet...</font>
 <font color=blue>#define</font> <font color=purple>SHMSZ</font> 27
diff --git a/docs/tutorials/021/Makefile b/docs/tutorials/021/Makefile
index eb4a321345f..c369a70c402 100644
--- a/docs/tutorials/021/Makefile
+++ b/docs/tutorials/021/Makefile
@@ -64,7 +64,7 @@ HTML : #
 
 SHAR : #
 	[ ! -f combine.shar ] || exit 1
-	shar -T hdr bodies *.pre *.pst > combine.shar && rm -f hdr bodies *.pre *.pst
+	shar -T hdr bodies *.pre > combine.shar && rm -f hdr bodies *.pre *.pst
 
 UNSHAR : #
 	sh combine.shar
diff --git a/docs/tutorials/021/combine.shar b/docs/tutorials/021/combine.shar
index 4249db20bc8..5b92de500be 100644
--- a/docs/tutorials/021/combine.shar
+++ b/docs/tutorials/021/combine.shar
@@ -3,8 +3,8 @@
 # To extract the files from this archive, save it to some FILE, remove
 # everything before the `!/bin/sh' line above, then type `sh FILE'.
 #
-# Made on 1999-04-03 17:13 EST by <jcej@chiroptera.tragus.org>.
-# Source directory was `/var/home/jcej/projects/ACE_wrappers/docs/tutorials/021'.
+# Made on 1999-01-06 14:26 EST by <jcej@caldera.lads.com>.
+# Source directory was `/scsiA/home/jcej/projects/ACE_wrappers/docs/tutorials/021'.
 #
 # Existing files will *not* be overwritten unless `-c' is specified.
 #
@@ -13,13 +13,12 @@
 # ------ ---------- ------------------------------------------
 #    409 -rw-rw-r-- hdr
 #     47 -rw-rw-r-- bodies
-#   2302 -rw-rw-r-- page01.pre
-#    282 -rw-rw-r-- page02.pre
-#    202 -rw-rw-r-- page03.pre
-#    288 -rw-rw-r-- page04.pre
-#     61 -rw-rw-r-- page05.pre
+#    562 -rw-rw-r-- page01.pre
+#    281 -rw-rw-r-- page02.pre
+#    201 -rw-rw-r-- page03.pre
+#    287 -rw-rw-r-- page04.pre
+#    287 -rw-rw-r-- page05.pre
 #    604 -rw-rw-r-- page06.pre
-#    786 -rw-rw-r-- page04.pst
 #
 save_IFS="${IFS}"
 IFS="${IFS}:"
@@ -66,7 +65,7 @@ else
 fi
 rm -f 1231235999 $$.touch
 #
-if mkdir _sh14864; then
+if mkdir _sh07125; then
   $echo 'x -' 'creating lock directory'
 else
   $echo 'failed to create lock directory'
@@ -153,56 +152,20 @@ X      In this tutorial, we'll use ACE_Malloc&lt;&gt; to create a
 X      memory pool that is sharable between a client and server.  We'll 
 X      use a memory mapped file to provide the physical storage but
 X      shared memory works just as well.
-<P>
-Kirthika's abstract:
-<UL>
-The ACE_Malloc class is templatised by the type of memory pool
-and the lock for it. The name of the memory pool provided can be used 
-in the "bind" call made by the server. This helps the other party
-wanting to access it do so by a "find" call. The ACE_Malloc will
-allocate
-memory and on a "malloc" will return memory chunks from its reserve.
-When the memory chunk is freed by the user, it will be appended to the
-free list maintained by the class. Unless a "remove" is done explicitly,
-the memory wont be returned to the OS. Various memory pool types can be
-used,
-X ACE_MMap_Memory_Pool,ACE_Sbrk_Memory_Pool to name a few. 
-For further details: <A HREF="../../ace/Memory_Pool.h">ace/Memory_Pool.h</A>.
-<P>
-In this tutorial, a ACE_Malloc class with ACE_MMAP_MEMORY_POOL
-and a semophore for syncronisation has been used. This is locked by
-the server initially and released after it writes into it so that
-the client waiting for it can go ahead and do its job. There is yet
-another semaphore used by the server to exit only after the client
-has finished its task, which is locked by the client at the start
-and released when its done.  
-<P>
-Some more information regarding memory management:
-ACE also provides the ACE_Allocator class which uses
-dynamic binding and is flexible, though at a cost of using 
-virtual pointer tables. Also, there is an ACE_Allocator_Adapter class
-which has an ACE_Allocator interface but ACE_Malloc functionality.  
-<P>
-Bottomline: Memory can be managed either using the ACE_Allocator
-set of classes which uses polymorphism and is thus flexible but not as
-efficient as the templatised version which is the ACE_Malloc set of
-classes which are more efficient but not as felxible.
-X
-</UL>
 SHAR_EOF
-  $shar_touch -am 0403170799 'page01.pre' &&
+  $shar_touch -am 0103180499 'page01.pre' &&
   chmod 0664 'page01.pre' ||
   $echo 'restore of' 'page01.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page01.pre:' 'MD5 check failed'
-45c14d3a6d1c0cf26b68e83f6878a854  page01.pre
+83956a1b05e5f8823afbdb8a84d8ac11  page01.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page01.pre'`"
-    test 2302 -eq "$shar_count" ||
-    $echo 'page01.pre:' 'original size' '2302,' 'current size' "$shar_count!"
+    test 562 -eq "$shar_count" ||
+    $echo 'page01.pre:' 'original size' '562,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page02.pre ==============
@@ -227,12 +190,12 @@ SHAR_EOF
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page02.pre:' 'MD5 check failed'
-6742359e1f990299bdab5992d0629d96  page02.pre
+1bde237d2082c2f88f4802965e0b393d  page02.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page02.pre'`"
-    test 282 -eq "$shar_count" ||
-    $echo 'page02.pre:' 'original size' '282,' 'current size' "$shar_count!"
+    test 281 -eq "$shar_count" ||
+    $echo 'page02.pre:' 'original size' '281,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page03.pre ==============
@@ -256,12 +219,12 @@ SHAR_EOF
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page03.pre:' 'MD5 check failed'
-e47af5a3f933ac9eafbb4aae007aa0e6  page03.pre
+bd3bbfe6dbece827f8259d394d89ff58  page03.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page03.pre'`"
-    test 202 -eq "$shar_count" ||
-    $echo 'page03.pre:' 'original size' '202,' 'current size' "$shar_count!"
+    test 201 -eq "$shar_count" ||
+    $echo 'page03.pre:' 'original size' '201,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page04.pre ==============
@@ -286,12 +249,12 @@ SHAR_EOF
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page04.pre:' 'MD5 check failed'
-2366f1603bd1e71955eb8ee3429ca402  page04.pre
+a95d570fb8b7aca15802d9abdba84b81  page04.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page04.pre'`"
-    test 288 -eq "$shar_count" ||
-    $echo 'page04.pre:' 'original size' '288,' 'current size' "$shar_count!"
+    test 287 -eq "$shar_count" ||
+    $echo 'page04.pre:' 'original size' '287,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page05.pre ==============
@@ -300,22 +263,28 @@ if test -f 'page05.pre' && test "$first_param" != -c; then
 else
   $echo 'x -' extracting 'page05.pre' '(text)'
   sed 's/^X//' << 'SHAR_EOF' > 'page05.pre' &&
-And here we have the implementation of the Allocator...
+X	  Everything common the server & client is kept here.  In
+X	  particular, the Constants class where we keep the names &
+X	  semaphore keys.
+X	<p>
+X	  The Allocator class is just a thin wrapper around
+X	  ACE_Malloc&lt;&gt; that moves some of the details out of the
+X	  application logic.
 <hr>
 SHAR_EOF
-  $shar_touch -am 0403171399 'page05.pre' &&
+  $shar_touch -am 0106140399 'page05.pre' &&
   chmod 0664 'page05.pre' ||
   $echo 'restore of' 'page05.pre' 'failed'
   if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
   && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
     md5sum -c << SHAR_EOF >/dev/null 2>&1 \
     || $echo 'page05.pre:' 'MD5 check failed'
-eef6d56514a448ce6cd962b7d34dd50f  page05.pre
+a95d570fb8b7aca15802d9abdba84b81  page05.pre
 SHAR_EOF
   else
     shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page05.pre'`"
-    test 61 -eq "$shar_count" ||
-    $echo 'page05.pre:' 'original size' '61,' 'current size' "$shar_count!"
+    test 287 -eq "$shar_count" ||
+    $echo 'page05.pre:' 'original size' '287,' 'current size' "$shar_count!"
   fi
 fi
 # ============= page06.pre ==============
@@ -356,43 +325,5 @@ SHAR_EOF
     $echo 'page06.pre:' 'original size' '604,' 'current size' "$shar_count!"
   fi
 fi
-# ============= page04.pst ==============
-if test -f 'page04.pst' && test "$first_param" != -c; then
-  $echo 'x -' SKIPPING 'page04.pst' '(file already exists)'
-else
-  $echo 'x -' extracting 'page04.pst' '(text)'
-  sed 's/^X//' << 'SHAR_EOF' > 'page04.pst' &&
-<HR>
-X    The really hard stuff is done by the ACE_Malloc<> template.  This
-X      template takes two parameters.<sup>*</sup>  The first is a
-X      memory pool class to use.  ACE has several, I've choosen one
-X      that uses a memory-mapped file.  The second parameter is a lock
-X      class of some sort.  This is needed so that the ACE_Malloc<> can 
-X        protect its internal data.  Note that you still have to
-X        provide your own mutex around the data you put into the
-X        malloc'd area.
-X
-<P>
-X          * Actually, some implementations may require a different
-X          number of parameters.
-X        That's why ACE uses those funky macros.  ACE_MMAP_MEMORY_POOL
-X        for instance turns into ACE_MMAP_Memory_Pool on Linux but may
-X        do other things on your platform.
-SHAR_EOF
-  $shar_touch -am 0313161099 'page04.pst' &&
-  chmod 0664 'page04.pst' ||
-  $echo 'restore of' 'page04.pst' 'failed'
-  if ( md5sum --help 2>&1 | grep 'sage: md5sum \[' ) >/dev/null 2>&1 \
-  && ( md5sum --version 2>&1 | grep -v 'textutils 1.12' ) >/dev/null; then
-    md5sum -c << SHAR_EOF >/dev/null 2>&1 \
-    || $echo 'page04.pst:' 'MD5 check failed'
-9e40019f1599341ac0dac0f3eee47341  page04.pst
-SHAR_EOF
-  else
-    shar_count="`LC_ALL= LC_CTYPE= LANG= wc -c < 'page04.pst'`"
-    test 786 -eq "$shar_count" ||
-    $echo 'page04.pst:' 'original size' '786,' 'current size' "$shar_count!"
-  fi
-fi
-rm -fr _sh14864
+rm -fr _sh07125
 exit 0
diff --git a/docs/tutorials/021/mpool.h b/docs/tutorials/021/mpool.h
index 96a238f2ff4..9b785f1fb90 100644
--- a/docs/tutorials/021/mpool.h
+++ b/docs/tutorials/021/mpool.h
@@ -24,7 +24,7 @@ public:
   Allocator (const char * _name = "MemoryPool");
   ~Allocator (void);
 
-  typedef ACE_Malloc<ACE_MMAP_MEMORY_POOL, ACE_SV_Semaphore_Simple> pool_t;
+  typedef ACE_Malloc<ACE_MMAP_Memory_Pool, ACE_SV_Semaphore_Simple> pool_t;
 
   // Provide an accessor to the pool.  This will also allocate the
   // pool when first invoked.
diff --git a/docs/tutorials/021/page01.html b/docs/tutorials/021/page01.html
index e3f13fee257..262bdeac5cc 100644
--- a/docs/tutorials/021/page01.html
+++ b/docs/tutorials/021/page01.html
@@ -24,41 +24,5 @@
       memory pool that is sharable between a client and server.  We'll 
       use a memory mapped file to provide the physical storage but
       shared memory works just as well.
-<P>
-Kirthika's abstract:
-<UL>
-The ACE_Malloc class is templatised by the type of memory pool
-and the lock for it. The name of the memory pool provided can be used 
-in the "bind" call made by the server. This helps the other party
-wanting to access it do so by a "find" call. The ACE_Malloc will
-allocate
-memory and on a "malloc" will return memory chunks from its reserve.
-When the memory chunk is freed by the user, it will be appended to the
-free list maintained by the class. Unless a "remove" is done explicitly,
-the memory wont be returned to the OS. Various memory pool types can be
-used,
- ACE_MMap_Memory_Pool,ACE_Sbrk_Memory_Pool to name a few. 
-For further details: <A HREF="../../ace/Memory_Pool.h">ace/Memory_Pool.h</A>.
-<P>
-In this tutorial, a ACE_Malloc class with ACE_MMAP_MEMORY_POOL
-and a semophore for syncronisation has been used. This is locked by
-the server initially and released after it writes into it so that
-the client waiting for it can go ahead and do its job. There is yet
-another semaphore used by the server to exit only after the client
-has finished its task, which is locked by the client at the start
-and released when its done.  
-<P>
-Some more information regarding memory management:
-ACE also provides the ACE_Allocator class which uses
-dynamic binding and is flexible, though at a cost of using 
-virtual pointer tables. Also, there is an ACE_Allocator_Adapter class
-which has an ACE_Allocator interface but ACE_Malloc functionality.  
-<P>
-Bottomline: Memory can be managed either using the ACE_Allocator
-set of classes which uses polymorphism and is thus flexible but not as
-efficient as the templatised version which is the ACE_Malloc set of
-classes which are more efficient but not as felxible.
-
-</UL>
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page02.html">Continue This Tutorial</A>]</CENTER>
diff --git a/docs/tutorials/021/page04.html b/docs/tutorials/021/page04.html
index 00db7ad203e..a65916da86d 100644
--- a/docs/tutorials/021/page04.html
+++ b/docs/tutorials/021/page04.html
@@ -28,7 +28,7 @@
 <font color=blue>#define</font> <font color=purple>MPOOL_H</font>
 
 <font color=red>// Everything else we need is in this one header</font>
-<font color=blue>#include</font> "<A HREF="../../../ace/Malloc.h">ace/Malloc.h</A>"
+<font color=blue>#include</font> "<font color=green>ace/Malloc.h</font>"
 
 <font color=blue>#if !defined</font> (<font color=purple>ACE_LACKS_SYSV_SHMEM</font>)
 
@@ -47,7 +47,7 @@ public:
   Allocator (const char * _name = "<font color=green>MemoryPool</font>");
   ~Allocator (void);
 
-  typedef ACE_Malloc&lt;ACE_MMAP_MEMORY_POOL, ACE_SV_Semaphore_Simple> pool_t;
+  typedef ACE_Malloc&lt;ACE_MMAP_Memory_Pool, ACE_SV_Semaphore_Simple> pool_t;
 
   <font color=red>// Provide an accessor to the pool.  This will also allocate the</font>
   <font color=red>// pool when first invoked.</font>
@@ -89,21 +89,5 @@ public:
 <font color=blue>#endif</font> <font color=red>/* ACE_LACKS_SYSV_SHMEM */</font>
 <font color=blue>#endif</font> <font color=red>/* MPOOL_H */</font>
 </PRE>
-<HR>
-    The really hard stuff is done by the ACE_Malloc<> template.  This
-      template takes two parameters.<sup>*</sup>  The first is a
-      memory pool class to use.  ACE has several, I've choosen one
-      that uses a memory-mapped file.  The second parameter is a lock
-      class of some sort.  This is needed so that the ACE_Malloc<> can 
-        protect its internal data.  Note that you still have to
-        provide your own mutex around the data you put into the
-        malloc'd area.
-
-<P>
-          * Actually, some implementations may require a different
-          number of parameters.
-        That's why ACE uses those funky macros.  ACE_MMAP_MEMORY_POOL
-        for instance turns into ACE_MMAP_Memory_Pool on Linux but may
-        do other things on your platform.
 <P><HR WIDTH="100%">
 <CENTER>[<A HREF="../online-tutorials.html">Tutorial Index</A>] [<A HREF="page05.html">Continue This Tutorial</A>]</CENTER>
diff --git a/docs/tutorials/021/page05.html b/docs/tutorials/021/page05.html
index 4cac1bc9040..c5fbcdde621 100644
--- a/docs/tutorials/021/page05.html
+++ b/docs/tutorials/021/page05.html
@@ -12,7 +12,13 @@
 
 <P>
 <HR WIDTH="100%">
-And here we have the implementation of the Allocator...
+	  Everything common the server & client is kept here.  In
+	  particular, the Constants class where we keep the names &
+	  semaphore keys.
+	<p>
+	  The Allocator class is just a thin wrapper around
+	  ACE_Malloc&lt;&gt; that moves some of the details out of the
+	  application logic.
 <hr>
 <PRE>
 
diff --git a/docs/tutorials/colorize b/docs/tutorials/colorize
index 60ffaae1348..5b324eac473 100755
--- a/docs/tutorials/colorize
+++ b/docs/tutorials/colorize
@@ -5,8 +5,8 @@ eval '(exit $?0)' && eval 'exec perl -w -S $0 ${1+"$@"}'
 while( <STDIN> )
 {
   s/</\&lt;/g;
-  s,\#(\s*)(e?l?if !?defined|pragma|ifn?def|define)(\W*)([\w\.]+),<font color=blue>\#$1$2</font>$3<font color=purple>$4</font>,;
-  s,\#\s*(include|endif),<font color=blue>$&</font>,;
+  s,\#(e?l?if !?defined|pragma|ifn?def|define)(\W*)([\w\.]+),<font color=blue>\#$1</font>$2<font color=purple>$3</font>,;
+  s,\#(include|endif),<font color=blue>$&</font>,;
   s,"([^"]+)","<font color=green>$1</font>",g;
   s,//.*$,<font color=red>$&</font>,;
   s,/\*,<font color=red>$&,;
diff --git a/docs/tutorials/combine b/docs/tutorials/combine
index c464f389e00..7d29dab60d4 100755
--- a/docs/tutorials/combine
+++ b/docs/tutorials/combine
@@ -143,20 +143,13 @@ sub addFile {
                while( <INPUT> )
                {
                   s/</\&lt;/g;
-                  if( m,include\s+"ace/.*\.h", ) {
-                    s,(ace/.*\.h),<A HREF="../../../$1">$1</A>,;
-                    s,\#\s*include,<font color=blue>$&</font>,;
-                  }
-                  else
-                  {
-                    s,\#(\s*)(e?l?if !?defined|pragma|ifn?def|define)(\W*)([\w\.]+),<font color=blue>\#$1$2</font>$3<font color=purple>$4</font>,;
-                    s,\#\s*(include|endif),<font color=blue>$&</font>,;
-                    s,"([^"]+)","<font color=green>$1</font>",g;
-                    s,//.*$,<font color=red>$&</font>,;
-                    s,/\*,<font color=red>$&,;
-                    s,\*/,$&</font>,;
-                    s,\w+::\~?\w+,<font color=\#008888>$&</font>,;
-                  }
+                  s,\#(e?l?if !?defined|pragma|ifn?def|define)(\W*)([\w\.]+),<font color=blue>\#$1</font>$2<font color=purple>$3</font>,;
+                  s,\#(include|endif),<font color=blue>$&</font>,;
+                  s,"([^"]+)","<font color=green>$1</font>",g;
+                  s,//.*$,<font color=red>$&</font>,;
+                  s,/\*,<font color=red>$&,;
+                  s,\*/,$&</font>,;
+                  s,\w+::\~?\w+,<font color=\#008888>$&</font>,;
                   print FILE $_;
                }
                print FILE "</PRE>\n";
diff --git a/docs/tutorials/tutorials.dsw b/docs/tutorials/tutorials.dsw
index 36cc6183f89..283bc05eb44 100644
--- a/docs/tutorials/tutorials.dsw
+++ b/docs/tutorials/tutorials.dsw
@@ -279,7 +279,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "019 client"=".\019\019_client.dsp" - Package Owner=<4>

+Project: "019 client"=".\019\019 client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -291,7 +291,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "019 client2"=".\019\019_client2.dsp" - Package Owner=<4>

+Project: "019 client2"=".\019\019 client2.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -303,7 +303,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "019 server"=".\019\019_server.dsp" - Package Owner=<4>

+Project: "019 server"=".\019\019 server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -315,7 +315,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "019 server2"=".\019\019_server2.dsp" - Package Owner=<4>

+Project: "019 server2"=".\019\019 server2.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -327,7 +327,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "020 client"=".\020\020_client.dsp" - Package Owner=<4>

+Project: "020 client"=".\020\020 client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -339,7 +339,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "020 client2"=".\020\020_client2.dsp" - Package Owner=<4>

+Project: "020 client2"=".\020\020 client2.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -351,7 +351,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "020 server"=".\020\020_server.dsp" - Package Owner=<4>

+Project: "020 server"=".\020\020 server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -363,7 +363,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "020 server2"=".\020\020_server2.dsp" - Package Owner=<4>

+Project: "020 server2"=".\020\020 server2.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -375,7 +375,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "021 client"=".\021\021_client.dsp" - Package Owner=<4>

+Project: "021 client"=".\021\021 client.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -387,7 +387,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "021 server"=".\021\021_server.dsp" - Package Owner=<4>

+Project: "021 server"=".\021\021 server.dsp" - Package Owner=<4>

 

 Package=<5>

 {{{

diff --git a/etc/xlc_dummy.cpp b/etc/xlc_dummy.cpp
deleted file mode 100644
index 6a89bb5becf..00000000000
--- a/etc/xlc_dummy.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-//
-// This file exists only to help with template instantiation when building
-// shared libraries on AIX using C Set++.  See rules.lib.GNU for usage.
-
-main() {}
diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile
index e8d835ee4d6..d65bd566c54 100644
--- a/examples/ASX/CCM_App/Makefile
+++ b/examples/ASX/CCM_App/Makefile
@@ -49,6 +49,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -136,15 +139,10 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile
index 1d18b763bcd..5ddfe33ccc3 100644
--- a/examples/ASX/Event_Server/Event_Server/Makefile
+++ b/examples/ASX/Event_Server/Event_Server/Makefile
@@ -48,6 +48,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -75,8 +78,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -88,6 +90,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -193,15 +198,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -230,8 +230,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  Peer_Router.h \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- Options.h \
+ $(ACE_ROOT)/ace/Acceptor.cpp Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -240,6 +239,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Event_Analyzer.o .obj/Event_Analyzer.so .shobj/Event_Analyzer.o .shobj/Event_Analyzer.so: Event_Analyzer.cpp Options.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -334,15 +336,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -372,6 +369,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -472,15 +472,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -540,6 +535,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -605,8 +603,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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 \
- Options.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -635,15 +632,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/ASX/Event_Server/Transceiver/Makefile b/examples/ASX/Event_Server/Transceiver/Makefile
index 784b9dc53ed..16f35222956 100644
--- a/examples/ASX/Event_Server/Transceiver/Makefile
+++ b/examples/ASX/Event_Server/Transceiver/Makefile
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#	$Id: Makefile	1.1	10/18/96
 #
 #	Makefile for the transceiver portion of the Event Server test
 #----------------------------------------------------------------------------
@@ -14,8 +14,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD 	= $(VBIN)
 
-SRC=$(addsuffix .cpp,$(BIN))
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -40,155 +38,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/transceiver.o .obj/transceiver.so .shobj/transceiver.o .shobj/transceiver.so: transceiver.cpp \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.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/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/Shared_Object.i \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Connector.h \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp \
- $(ACE_ROOT)/ace/SOCK_Connector.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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- transceiver.h
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 4576c1c0595..9076713c187 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -9,10 +9,57 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/Get_Opt.h"
 
-#include "transceiver.h"
-
 ACE_RCSID(Transceiver, transceiver, "$Id$")
 
+class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+  // = TITLE
+  //     Generate and receives messages from the event server.
+  //
+  // = DESCRIPTION
+  //     This class is both a consumer and supplier of events, i.e.,
+  //     it's a ``transceiver.''
+public:
+  // = Initialization method.
+  Event_Transceiver (int argc, char *argv[]);
+  // Performs the actual initialization.
+
+  Event_Transceiver (void);
+  // No-op constructor (required by the <ACE_Connector>).
+
+  // = Svc_Handler hook called by the <ACE_Connector>.
+  virtual int open (void *);
+  // Initialize the transceiver when we are connected.
+
+  // = Demultplexing hooks from the <ACE_Reactor>.
+  virtual int handle_input (ACE_HANDLE);
+  // Receive data from STDIN or socket.
+
+  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
+  // Close down via SIGINT.
+
+  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
+  // Close down the event loop.
+
+private:
+  int receiver (void);
+  // Reads data from socket and writes to ACE_STDOUT.
+
+  int transmitter (void);
+  // Writes data from ACE_STDIN to socket.
+
+  int parse_args (int argc, char *argv[]);
+  // Parse the command-line arguments.
+
+  u_short port_number_;
+  // Port number of event server.
+
+  char *host_name_;
+  // Name of event server.
+
+  char *role_;
+  // Are we playing the Consumer or Supplier role?
+};
 
 // Handle the command-line arguments.
 
@@ -128,14 +175,9 @@ Event_Transceiver::Event_Transceiver (int argc, char *argv[])
       // Establish the connection to the Event Server.
       if (connector.connect (etp,
                              server_addr) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      this->host_name_));
-	  ACE_Reactor::instance()->remove_handler (sig_set);
-	  ACE_Event_Handler::remove_stdin_handler (ACE_Reactor::instance(),
-						   ACE_Thread_Manager::instance());
-        }
+        ACE_ERROR ((LM_ERROR,
+                    "%p\n",
+                    this->host_name_));
     }
 }
 
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.h b/examples/ASX/Event_Server/Transceiver/transceiver.h
deleted file mode 100644
index 3f89f37b3de..00000000000
--- a/examples/ASX/Event_Server/Transceiver/transceiver.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#ifndef ACE_TRANSCEIVER_H
-#define ACE_TRANSCEIVER_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-class Event_Transceiver : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //     Generate and receives messages from the event server.
-  //
-  // = DESCRIPTION
-  //     This class is both a consumer and supplier of events, i.e.,
-  //     it's a ``transceiver.''
-public:
-  // = Initialization method.
-  Event_Transceiver (int argc, char *argv[]);
-  // Performs the actual initialization.
-
-  Event_Transceiver (void);
-  // No-op constructor (required by the <ACE_Connector>).
-
-  // = Svc_Handler hook called by the <ACE_Connector>.
-  virtual int open (void *);
-  // Initialize the transceiver when we are connected.
-
-  // = Demultplexing hooks from the <ACE_Reactor>.
-  virtual int handle_input (ACE_HANDLE);
-  // Receive data from STDIN or socket.
-
-  virtual int handle_signal (int signum, siginfo_t *, ucontext_t *);
-  // Close down via SIGINT.
-
-  virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
-  // Close down the event loop.
-
-private:
-  int receiver (void);
-  // Reads data from socket and writes to ACE_STDOUT.
-
-  int transmitter (void);
-  // Writes data from ACE_STDIN to socket.
-
-  int parse_args (int argc, char *argv[]);
-  // Parse the command-line arguments.
-
-  u_short port_number_;
-  // Port number of event server.
-
-  char *host_name_;
-  // Name of event server.
-
-  char *role_;
-  // Are we playing the Consumer or Supplier role?
-};
-
-#endif /* ACE_TRANSCEIVER_H */
diff --git a/examples/ASX/Message_Queue/Makefile b/examples/ASX/Message_Queue/Makefile
index 1d028bb3265..7961a617985 100644
--- a/examples/ASX/Message_Queue/Makefile
+++ b/examples/ASX/Message_Queue/Makefile
@@ -1,379 +1,43 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id: Makefile	1.1	10/18/96
 #
-#       Makefile for Message_Queue tests
+#	Makefile for Message_Queue tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 BIN     = buffer_stream \
-          bounded_buffer \
-          priority_buffer
+	  bounded_buffer \
+	  priority_buffer
 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
-PSRC    = $(addsuffix .cpp,$(BIN))
+
+BUILD   = $(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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/buffer_stream.o .obj/buffer_stream.so .shobj/buffer_stream.o .shobj/buffer_stream.so: buffer_stream.cpp \
- $(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 \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/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/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/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/Stream.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Time_Value.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 \
- $(ACE_ROOT)/ace/Message_Queue_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/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.h \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(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/Stream.i \
- $(ACE_ROOT)/ace/Stream.cpp
-.obj/bounded_buffer.o .obj/bounded_buffer.so .shobj/bounded_buffer.o .shobj/bounded_buffer.so: bounded_buffer.cpp \
- $(ACE_ROOT)/ace/Message_Queue.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/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/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/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/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/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 \
- $(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/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
-.obj/priority_buffer.o .obj/priority_buffer.so .shobj/priority_buffer.o .shobj/priority_buffer.so: priority_buffer.cpp \
- $(ACE_ROOT)/ace/Message_Queue.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/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/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/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/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/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 \
- $(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/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/Read_Buffer.h \
- $(ACE_ROOT)/ace/Read_Buffer.i
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/ASX/Message_Queue/buffer_stream.cpp b/examples/ASX/Message_Queue/buffer_stream.cpp
index 02911c02a46..f022f6a9447 100644
--- a/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -261,7 +261,7 @@ main (int, char *argv[])
   MT_Module *fm; 
   MT_Module *cm; 
 
-  ACE_NEW_RETURN (cm,
+  ACE_NEW_RETURN (pm,
                   MT_Module ("Consumer",
                              new Consumer),
                   -1);
@@ -269,15 +269,15 @@ main (int, char *argv[])
                   MT_Module ("Filter",
                              new Filter),
                   -1);
-  ACE_NEW_RETURN (pm,
+  ACE_NEW_RETURN (cm,
                   MT_Module ("Producer",
                              new Producer),
                   -1);
 
-  // Create Consumer, Filter, and Producer Modules and push them onto
-  // the Stream.  All processing is performed in the Stream.
+  // Create Producer and Consumer Modules and push them onto the
+  // Stream.  All processing is performed in the Stream.
 
-  if (stream.push (cm) == -1)
+  if (stream.push (pm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "push"),
@@ -287,7 +287,7 @@ main (int, char *argv[])
                        "%p\n",
                        "push"),
                       1);
-  else if (stream.push (pm) == -1)
+  else if (stream.push (cm) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "push"),
diff --git a/examples/ASX/UPIPE_Event_Server/Makefile b/examples/ASX/UPIPE_Event_Server/Makefile
index d1365f9d361..e0fa1ea8ad7 100644
--- a/examples/ASX/UPIPE_Event_Server/Makefile
+++ b/examples/ASX/UPIPE_Event_Server/Makefile
@@ -48,6 +48,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -75,8 +78,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -86,6 +88,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Supplier_Router.o .obj/Supplier_Router.so .shobj/Supplier_Router.o .shobj/Supplier_Router.so: Supplier_Router.cpp Options.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -187,15 +192,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -249,6 +249,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -336,15 +339,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -372,6 +370,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -460,15 +461,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -521,8 +517,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  Peer_Router.cpp \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Options.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
@@ -533,6 +528,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -624,15 +622,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index 13c58a1c629..370a7a39451 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -21,10 +21,41 @@
 #include "ace/Service_Config.h"
 #include "ace/Thread.h"
 
-#include "Connection_Handler.h"
-
 ACE_RCSID(misc, Connection_Handler, "$Id$")
 
+class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
+{
+public:
+  virtual int open (void *);
+  // Initialize the <Connection_Handler> and make it an Active Object.
+
+  virtual int close (u_long);
+  // Terminate the <Connection_Handler>.
+
+  virtual int svc (void);
+  // Run the <Connection_Handler>'s main event loop.
+
+protected:
+  virtual int handle_close (ACE_HANDLE,
+			    ACE_Reactor_Mask);
+  // Signal the Active Object to stop when called.
+
+  virtual int handle_input (ACE_HANDLE);
+  // Handle input from the client.
+
+  virtual int handle_timeout (const ACE_Time_Value &tv,
+			      const void *arg);
+  // Handle timeouts.
+
+  virtual int handle_signal (int signum,
+			     siginfo_t *,
+			     ucontext_t *);
+  // Handle timeouts.
+
+  sig_atomic_t finished_;
+  // Keeps track of whether we're done.
+};
+
 int
 Connection_Handler::open (void *)
 {
diff --git a/examples/Connection/misc/Connection_Handler.h b/examples/Connection/misc/Connection_Handler.h
deleted file mode 100644
index de243d3ed02..00000000000
--- a/examples/Connection/misc/Connection_Handler.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-#ifndef ACE_CONNECTION_HANDLER_H
-#define ACE_CONNECTION_HANDLER_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-
-class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  virtual int open (void *);
-  // Initialize the <Connection_Handler> and make it an Active Object.
-
-  virtual int close (u_long);
-  // Terminate the <Connection_Handler>.
-
-  virtual int svc (void);
-  // Run the <Connection_Handler>'s main event loop.
-
-protected:
-  virtual int handle_close (ACE_HANDLE,
-			    ACE_Reactor_Mask);
-  // Signal the Active Object to stop when called.
-
-  virtual int handle_input (ACE_HANDLE);
-  // Handle input from the client.
-
-  virtual int handle_timeout (const ACE_Time_Value &tv,
-			      const void *arg);
-  // Handle timeouts.
-
-  virtual int handle_signal (int signum,
-			     siginfo_t *,
-			     ucontext_t *);
-  // Handle timeouts.
-
-  sig_atomic_t finished_;
-  // Keeps track of whether we're done.
-};
-
-#endif /* ACE_CONNECTION_HANDLER_H */
diff --git a/examples/Connection/misc/Makefile b/examples/Connection/misc/Makefile
index 960c9f997f6..4419a56686b 100644
--- a/examples/Connection/misc/Makefile
+++ b/examples/Connection/misc/Makefile
@@ -28,13 +28,6 @@ include		$(ACE_ROOT)/include/makeinclude/rules.nonested.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)
-endif
-
 #----------------------------------------------------------------------------
 #	Local targets
 #----------------------------------------------------------------------------
@@ -53,6 +46,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -138,15 +134,10 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -201,8 +192,7 @@ endif
  $(ACE_ROOT)/ace/SPIPE_Stream.i \
  $(ACE_ROOT)/ace/UPIPE_Acceptor.i \
  $(ACE_ROOT)/ace/UPIPE_Connector.h \
- $(ACE_ROOT)/ace/UPIPE_Connector.i \
- test_upipe.h
+ $(ACE_ROOT)/ace/UPIPE_Connector.i
 .obj/Connection_Handler.o .obj/Connection_Handler.so .shobj/Connection_Handler.o .shobj/Connection_Handler.so: Connection_Handler.cpp \
  $(ACE_ROOT)/ace/Acceptor.h \
  $(ACE_ROOT)/ace/Service_Config.h \
@@ -211,6 +201,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -296,15 +289,10 @@ endif
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -346,7 +334,6 @@ endif
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/SOCK_Stream.i \
  $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i \
- Connection_Handler.h
+ $(ACE_ROOT)/ace/SOCK_Acceptor.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index f6fbc5c1dda..147ea4a8f1e 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -15,7 +15,35 @@ ACE_RCSID(misc, test_upipe, "$Id$")
 
 #if defined (ACE_HAS_THREADS)
 
-#include "test_upipe.h"
+typedef ACE_Svc_Handler <ACE_UPIPE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
+
+class Server_Service : public SVC_HANDLER
+  // = TITLE
+  //     Defines the interface for a service that recvs data from its
+  //     client and writes the data to its stdout.
+{
+public:
+  Server_Service (ACE_Thread_Manager * = 0) {}
+
+  virtual int open (void *)
+    {
+      ACE_TRACE ("Server_Service::open");
+      return 0;
+    }
+
+  virtual int svc (void)
+    {
+      ACE_TRACE ("Server_Service::svc");
+
+      char buf[BUFSIZ];
+      ssize_t n;
+
+      while ((n = this->peer ().recv (buf, sizeof buf)) > 0)
+	::write (1, buf, n);
+
+      return 0;
+    }
+};
 
 class Server : public ACE_Strategy_Acceptor <Server_Service, ACE_UPIPE_ACCEPTOR>
   // = TITLE
@@ -60,6 +88,38 @@ private:
   // Our concurrency strategy.
 };
 
+class Client_Service : public SVC_HANDLER
+  // = TITLE
+  //     Defines the interface for a service that recvs data from its
+  //     stdin and forward the data to its server.
+{
+public:
+  Client_Service (ACE_Thread_Manager *thr_mgr = 0)
+    : SVC_HANDLER (thr_mgr)
+    {
+      ACE_TRACE ("Client_Service::Client_Service");
+    }
+
+  virtual int open (void *)
+    {
+      ACE_TRACE ("Client_Service::open");
+      return this->activate (THR_DETACHED | THR_NEW_LWP);
+    }
+
+  virtual int svc (void)
+    {
+      ACE_TRACE ("Client_Service::svc");
+      char buf[BUFSIZ];
+      ssize_t n;
+
+      while ((n = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0)
+	this->peer ().send (buf, n);
+
+      this->peer ().close ();
+      return 0;
+    }
+};
+
 class Client : public ACE_Connector <Client_Service, ACE_UPIPE_CONNECTOR>
   // = TITLE
   //     Defines the interface for a factory that connects
diff --git a/examples/Connection/misc/test_upipe.h b/examples/Connection/misc/test_upipe.h
deleted file mode 100644
index edc502a7a43..00000000000
--- a/examples/Connection/misc/test_upipe.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- C++ -*- */
-
-// $Id$
-
-#ifndef ACE_TEST_UPIPE_H
-#define ACE_TEST_UPIPE_H
-
-#include "ace/Svc_Handler.h"
-#include "ace/Synch.h"
-#include "ace/UPIPE_Stream.h"
-
-typedef ACE_Svc_Handler <ACE_UPIPE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER;
-
-class Server_Service : public SVC_HANDLER
-  // = TITLE
-  //     Defines the interface for a service that recvs data from its
-  //     client and writes the data to its stdout.
-{
-public:
-  Server_Service (ACE_Thread_Manager * = 0) {}
-
-  virtual int open (void *)
-    {
-      ACE_TRACE ("Server_Service::open");
-      return 0;
-    }
-
-  virtual int svc (void)
-    {
-      ACE_TRACE ("Server_Service::svc");
-
-      char buf[BUFSIZ];
-      ssize_t n;
-
-      while ((n = this->peer ().recv (buf, sizeof buf)) > 0)
-	::write (1, buf, n);
-
-      return 0;
-    }
-};
-
-
-class Client_Service : public SVC_HANDLER
-  // = TITLE
-  //     Defines the interface for a service that recvs data from its
-  //     stdin and forward the data to its server.
-{
-public:
-  Client_Service (ACE_Thread_Manager *thr_mgr = 0)
-    : SVC_HANDLER (thr_mgr)
-    {
-      ACE_TRACE ("Client_Service::Client_Service");
-    }
-
-  virtual int open (void *)
-    {
-      ACE_TRACE ("Client_Service::open");
-      return this->activate (THR_DETACHED | THR_NEW_LWP);
-    }
-
-  virtual int svc (void)
-    {
-      ACE_TRACE ("Client_Service::svc");
-      char buf[BUFSIZ];
-      ssize_t n;
-
-      while ((n = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0)
-	this->peer ().send (buf, n);
-
-      this->peer ().close ();
-      return 0;
-    }
-};
-
-#endif /* ACE_TEST_UPIPE_H */
diff --git a/examples/Connection/non_blocking/Makefile b/examples/Connection/non_blocking/Makefile
index f58eda27196..941a14b633f 100644
--- a/examples/Connection/non_blocking/Makefile
+++ b/examples/Connection/non_blocking/Makefile
@@ -61,6 +61,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -150,15 +153,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -194,6 +192,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -281,15 +282,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -326,6 +322,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -422,15 +421,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -475,6 +469,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -576,15 +573,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -622,6 +614,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -733,15 +728,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -779,6 +769,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -887,15 +880,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -932,6 +920,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1033,15 +1024,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1077,6 +1063,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1177,15 +1166,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1222,6 +1206,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1323,15 +1310,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1368,6 +1350,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1465,15 +1450,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/DLL/Main.dsp b/examples/DLL/Main.dsp
index 884aff00109..c4af5e97305 100644
--- a/examples/DLL/Main.dsp
+++ b/examples/DLL/Main.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Main" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

@@ -36,12 +36,11 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

+# 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 /MD /W3 /GX /O2 /I "..\.." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

+# 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

@@ -49,7 +48,7 @@ BSC32=bscmake.exe
 # 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 /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# 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 /nologo /subsystem:console /machine:I386

 

 !ELSEIF  "$(CFG)" == "Main - Win32 Debug"

 

@@ -60,13 +59,11 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

+# PROP Output_Dir "Debug"

 # 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 "..\.." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /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

@@ -74,7 +71,7 @@ BSC32=bscmake.exe
 # 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"

+# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

@@ -82,9 +79,5 @@ LINK32=link.exe
 

 # Name "Main - Win32 Release"

 # Name "Main - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\test_dll.cpp

-# End Source File

 # End Target

 # End Project

diff --git a/examples/DLL/Newsweek.dsp b/examples/DLL/Newsweek.dsp
index f15255f7dca..b8eb2b30318 100644
--- a/examples/DLL/Newsweek.dsp
+++ b/examples/DLL/Newsweek.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Newsweek" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

@@ -40,10 +40,9 @@ RSC=rc.exe
 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir ""

 # PROP Intermediate_Dir ""

-# PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -53,7 +52,7 @@ BSC32=bscmake.exe
 # 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

+# 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 /nologo /subsystem:windows /dll /machine:I386

 

 !ELSEIF  "$(CFG)" == "Newsweek - Win32 Debug"

 

@@ -69,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /LD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /LD /c

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -79,7 +78,7 @@ BSC32=bscmake.exe
 # 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/examples/Reactor/Proactor/post_completion.dsp b/examples/DLL/Test_dll.dsp
index b736965277c..d0500aa47b4 100644
--- a/examples/Reactor/Proactor/post_completion.dsp
+++ b/examples/DLL/Test_dll.dsp
@@ -1,26 +1,24 @@
-# Microsoft Developer Studio Project File - Name="post_completion" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Project File - Name="DLL" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=post_completion - Win32 Debug

+CFG=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 NMAKE /f "post_completion.mak".

+!MESSAGE NMAKE /f "DLL.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 "post_completion.mak" CFG="post_completion - Win32 Debug"

+!MESSAGE NMAKE /f "DLL.MAK" CFG="DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "post_completion - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "post_completion - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

+!MESSAGE "DLL - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "DLL - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -29,7 +27,7 @@ CFG=post_completion - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "post_completion - Win32 Release"

+!IF  "$(CFG)" == "DLL - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -52,7 +50,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 /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 /nologo /subsystem:console /machine:I386

 

-!ELSEIF  "$(CFG)" == "post_completion - Win32 Debug"

+!ELSEIF  "$(CFG)" == "DLL - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -63,10 +61,9 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "Debug"

 # 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 /MTd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /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

@@ -74,17 +71,13 @@ BSC32=bscmake.exe
 # 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 /out:"post_completion.exe" /pdbtype:sept /libpath:"..\..\..\ace"

+# 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

 # Begin Target

 

-# Name "post_completion - Win32 Release"

-# Name "post_completion - Win32 Debug"

-# Begin Source File

-

-SOURCE=..\post_completions.cpp

-# End Source File

+# Name "DLL - Win32 Release"

+# Name "DLL - Win32 Debug"

 # End Target

 # End Project

diff --git a/examples/DLL/Today.dsp b/examples/DLL/Today.dsp
index 4a5490db331..8ce8ca08a3e 100644
--- a/examples/DLL/Today.dsp
+++ b/examples/DLL/Today.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Today" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

@@ -42,8 +42,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GR /GX /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /GR /GX /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# SUBTRACT CPP /O<none>

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # 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:windows /dll /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386

 

 !ELSEIF  "$(CFG)" == "Today - Win32 Debug"

 

@@ -69,8 +69,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /GR /GX /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /GR /GX /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

+# SUBTRACT CPP /O<none>

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

@@ -80,7 +80,7 @@ BSC32=bscmake.exe
 # 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept

 

 !ENDIF 

 

diff --git a/examples/DLL/test_dll.cpp b/examples/DLL/test_dll.cpp
index 45df35c4f87..fccd8bdb6f3 100644
--- a/examples/DLL/test_dll.cpp
+++ b/examples/DLL/test_dll.cpp
@@ -10,13 +10,10 @@
 ACE_RCSID(DLL, test_dll, "$Id$")
 
 typedef Magazine* (*Magazine_Creator) (void);
-
-int
-main (int argc, char *argv[])
+  
+int 
+main (void)
 {
-  ACE_UNUSED_ARG (argc);
-  ACE_UNUSED_ARG (argv);
-
   ACE_DLL dll;
 
   int retval = dll.open ("./" ACE_DLL_PREFIX "Today" ACE_DLL_SUFFIX);
@@ -36,13 +33,13 @@ main (int argc, char *argv[])
                       dll.error ()),
                       -1);
   {
-    auto_ptr <Magazine> magazine (mc ());
-
+    auto_ptr <Magazine> magazine = mc ();
+  
     magazine->title ();
   }
 
   dll.close ();
-
+  
   // The other library is now loaded on demand.
 
   retval = dll.open ("./" ACE_DLL_PREFIX "Newsweek" ACE_DLL_SUFFIX);
@@ -52,7 +49,7 @@ main (int argc, char *argv[])
                        "%s",
                        dll.error ()),
                       -1);
-
+  
   mc = (Magazine_Creator) dll.symbol ("create_magazine");
 
   if (mc == 0)
@@ -61,14 +58,14 @@ main (int argc, char *argv[])
                        dll.error ()),
                       -1);
   {
-    auto_ptr <Magazine> magazine (mc ());
+    auto_ptr <Magazine> magazine = mc ();
 
     magazine->title ();
   }
 
   dll.close ();
-
-  return 0;
+  
+  return 0;            
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
@@ -76,3 +73,5 @@ template class auto_ptr <Magazine>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate auto_ptr <Magazine>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+                
+  
diff --git a/examples/IOStream/client/Makefile b/examples/IOStream/client/Makefile
index 9b97fc4560b..8e0bc0197cf 100644
--- a/examples/IOStream/client/Makefile
+++ b/examples/IOStream/client/Makefile
@@ -46,6 +46,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IOStream/server/Makefile b/examples/IOStream/server/Makefile
index 00c34c1407f..bcce1f25f15 100644
--- a/examples/IOStream/server/Makefile
+++ b/examples/IOStream/server/Makefile
@@ -46,6 +46,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -131,15 +134,10 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/IPC_SAP/DEV_SAP/reader/Makefile b/examples/IPC_SAP/DEV_SAP/reader/Makefile
index 0e6db30e760..5e463803a70 100644
--- a/examples/IPC_SAP/DEV_SAP/reader/Makefile
+++ b/examples/IPC_SAP/DEV_SAP/reader/Makefile
@@ -46,6 +46,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/reader.o .obj/reader.so .shobj/reader.o .shobj/reader.so: reader.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/DEV_SAP/writer/Makefile b/examples/IPC_SAP/DEV_SAP/writer/Makefile
index 044eb6404da..8171ce4489b 100644
--- a/examples/IPC_SAP/DEV_SAP/writer/Makefile
+++ b/examples/IPC_SAP/DEV_SAP/writer/Makefile
@@ -51,6 +51,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/FIFO_SAP/Makefile b/examples/IPC_SAP/FIFO_SAP/Makefile
index dcf4252d1a9..2e6ebbd5124 100644
--- a/examples/IPC_SAP/FIFO_SAP/Makefile
+++ b/examples/IPC_SAP/FIFO_SAP/Makefile
@@ -50,6 +50,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -75,6 +78,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -99,6 +105,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -122,6 +131,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -145,6 +157,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/FILE_SAP/Makefile b/examples/IPC_SAP/FILE_SAP/Makefile
index 0148e08a7e3..5bdf46f4b89 100644
--- a/examples/IPC_SAP/FILE_SAP/Makefile
+++ b/examples/IPC_SAP/FILE_SAP/Makefile
@@ -40,6 +40,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
index 01c6f090592..fd33983dcf2 100644
--- a/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/C-inserver.cpp
@@ -42,7 +42,7 @@ int main (int argc, char *argv[])
 
   /* Associate address with endpoint */
   if (ACE_OS::bind (s_handle,
-                    ACE_reinterpret_cast(struct sockaddr *, &saddr),
+		    ACE_reinterpret_cast(struct sockaddr *, &saddr),
                     sizeof saddr) == -1)
     ACE_OS::perror ("bind"), ACE_OS::exit (1);
 
@@ -63,10 +63,10 @@ int main (int argc, char *argv[])
       /* Create a new endpoint of communication */
       do
         n_handle =
-          ACE_OS::accept (s_handle,
-                          ACE_reinterpret_cast(struct sockaddr *,
-                                               &cli_addr),
-                          &cli_addr_len);
+	  ACE_OS::accept (s_handle,
+			  ACE_reinterpret_cast(struct sockaddr *,
+					       &cli_addr),
+			  &cli_addr_len);
       while (n_handle == ACE_INVALID_HANDLE && errno == EINTR);
 
       if (n_handle == ACE_INVALID_HANDLE)
@@ -104,6 +104,6 @@ int main (int argc, char *argv[])
         ACE_OS::perror ("close"), ACE_OS::exit (1);
       ACE_OS::exit (0);
     }
-
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
index 7b935dbb983..d14c97aabf5 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp
@@ -105,9 +105,7 @@ private:
   char oneway_;
   // Are we running oneway or twoway?
 
-  // Please leave the ; inside the parenthesis to avoid Green Hills
-  // (and probably other) compiler warning about extra ;.
-  ACE_MT (ACE_Barrier *barrier_;)
+  ACE_MT (ACE_Barrier *barrier_);
   // Barrier used to synchronize the start of all the threads.
 };
 
@@ -121,19 +119,17 @@ Options::Options (void)
     message_buf_ (0),
     io_source_ (ACE_INVALID_HANDLE), // Defaults to using the generator.
     iterations_ (10000),
-    oneway_ (1) // Make oneway calls the default.
-#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
-    , barrier_ (0)
-#endif /* ACE_MT_SAFE */
+    oneway_ (1), // Make oneway calls the default.
+    barrier_ (0)
 {
 }
 
 Options::~Options (void)
 {
-  ACE_MT (delete this->barrier_);
+  delete this->barrier_;
   delete [] this->message_buf_;
 }
-
+  
 // Options Singleton.
 typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
 
@@ -161,9 +157,9 @@ Options::init (void)
                   this->message_len_ - sizeof (ACE_UINT32));
 
   // Allocate the barrier with the correct count.
-  ACE_MT (ACE_NEW_RETURN (this->barrier_,
-                          ACE_Barrier (this->threads_),
-                          -1));
+  ACE_NEW_RETURN (this->barrier_,
+                  ACE_Barrier (this->threads_),
+                  -1);
   return 0;
 }
 
@@ -302,9 +298,9 @@ Options::shared_client_test (u_short port,
 
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) waiting...\n"));
-
+              
   // Wait for all other threads to finish initialization.
-  ACE_MT (this->barrier_->wait ());
+  this->barrier_->wait ();
   return buf;
 }
 // Static function entry point to the oneway client service.
@@ -438,9 +434,9 @@ Options::twoway_client_test (void *)
   double messages_per_sec = iteration * double (ACE_ONE_SECOND_IN_USECS) / real_time;
 
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) messages = %d\n(%t) usec-per-message = %f\n(%t) messages-per-second = %0.00f\n"),
-              iteration,
-              real_time / double (iteration),
+	      ASYS_TEXT ("(%t) messages = %d\n(%t) usec-per-message = %f\n(%t) messages-per-second = %0.00f\n"),
+	      iteration,
+	      real_time / double (iteration),
               messages_per_sec < 0 ? 0 : messages_per_sec));
 
   // Close the connection.
@@ -475,7 +471,7 @@ run_client (void)
   else
     ACE_Thread_Manager::instance ()->wait ();
 #else
-  *(OPTIONS::instance ()->thr_func) ();
+  client (0);
 #endif /* ACE_HAS_THREADS */
   return 0;
 }
diff --git a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 57abb16864e..712fb6372ba 100644
--- a/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -58,10 +58,6 @@ class Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
 {
   // = TITLE
   //   Base class for the oneway and twoway handlers.
-
-  friend class Handler_Factory;
-  // The factory has special permission. (to access svc ()).
-
 public:
   virtual int open (void * = 0);
   // Generic initialization method.
@@ -529,8 +525,7 @@ Handler_Factory::create_handler (ACE_SOCK_Acceptor &acceptor,
   return handler->activate ();
 #else
   handler->svc ();
-  handler->close (0);
-  return 0;
+  handler->close ();
 #endif /* ACE_HAS_THREADS */
 }
 
@@ -594,7 +589,8 @@ Handler_Factory::handle_events (void)
         }
     }
 
-  ACE_NOTREACHED (return 0;)
+  /* NOTREACHED */
+  return 0;
 }
 
 int
diff --git a/examples/IPC_SAP/SOCK_SAP/Makefile b/examples/IPC_SAP/SOCK_SAP/Makefile
index 7747630531b..eb165ce677f 100644
--- a/examples/IPC_SAP/SOCK_SAP/Makefile
+++ b/examples/IPC_SAP/SOCK_SAP/Makefile
@@ -57,6 +57,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -137,6 +140,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -176,6 +182,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -254,6 +263,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -353,15 +365,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -401,6 +408,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -434,6 +444,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -514,6 +527,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -554,6 +570,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -588,6 +607,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/C-inclient.o .obj/C-inclient.so .shobj/C-inclient.o .shobj/C-inclient.so: C-inclient.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -605,6 +627,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/C-inserver.o .obj/C-inserver.so .shobj/C-inserver.o .shobj/C-inserver.so: C-inserver.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/SPIPE_SAP/Makefile b/examples/IPC_SAP/SPIPE_SAP/Makefile
index 0f229d640c4..e554378a789 100644
--- a/examples/IPC_SAP/SPIPE_SAP/Makefile
+++ b/examples/IPC_SAP/SPIPE_SAP/Makefile
@@ -50,6 +50,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -80,6 +83,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -109,6 +115,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -138,6 +147,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -167,6 +179,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -197,6 +212,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -227,6 +245,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -256,6 +277,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
deleted file mode 100644
index a9fe506d555..00000000000
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-client.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-
-#include "ace/TLI_Connector.h"
-#include "ace/ATM_Addr.h"                              
-
-ACE_RCSID(TLI_SAP, CPP_ATM_client, "$Id$")
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-
-/* ACE_XTI/ATM Client */
-
-int main (int argc, char *argv[])                       
-{
-  if (argc < 2)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       "Usage: %s hostname [-s selector] [QoS in KB/sec]\n",
-                       argv[0]),
-                      1);
-
-  const char *host = argv[1];
-  unsigned char selector = ACE_ATM_Addr::DEFAULT_SELECTOR;
-  int selector_specified = 0;
-  int opt;
-  while ((opt = ACE_OS::getopt (argc, argv, "s:?h")) != EOF)
-    {
-    switch(opt)
-      {
-      case 's':
-        selector = ACE_OS::atoi (optarg);
-        selector_specified = 1;
-        break;
-      case '?':
-      case 'h':
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s hostname [-s selector] [QoS in KB/s]\n",
-                           argv[0]),
-                          1);
-      } // switch
-    } // while getopt
-
-  int qos = (argc == 3) ? ACE_OS::atoi (argv[2]) :
-    (argc == 5) ? ACE_OS::atoi (argv[4]) : 0;
-  // The timeout really gets ignored since FORE's drivers don't work when
-  //  ioctl or fcntl calls are made on the transport id/file descriptor
-  int timeout = ACE_DEFAULT_TIMEOUT;
-
-  char buf[BUFSIZ];
-
-  ACE_TLI_Stream cli_stream;
-
-  ACE_ATM_Addr remote_addr (host);
-  if (selector_specified)
-    remote_addr.set_selector(selector);
-  char hostname[MAXNAMELEN];
-  ACE_OS::hostname(hostname, MAXNAMELEN);
-  ACE_ATM_Addr local_addr (hostname);
-
-  // In order to construct connections options the file handle is
-  // needed.  Therefore, we need to open the TLI_Stream before we
-  // construct the options.
-  if (cli_stream.open (ACE_XTI_ATM_DEVICE, O_RDWR, 0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open failed"),
-                      1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              "starting non-blocking connect\n"));
-
-  // Initiate timed, non-blocking connection with server.
-  ACE_TLI_Connector con;
-                                                        
-  // Construct QoS options - currently FORE only supports bandwidth
-  long optlen = 0;
-  char *options = ACE_ATM_Addr::construct_options (cli_stream.get_handle (),
-                                                   qos,
-                                                   ACE_ATM_Addr::OPT_FLAGS_CPID,
-                                                   &optlen);
-  struct netbuf optbuf;
-  optbuf.len = optlen;
-  optbuf.buf = options;
-
-  // Not sure why but reuse_addr set to true/1 causes problems for
-  // FORE/XTI/ATM - this is now handled in ACE_TLI_Connector::connect()
-  if (con.connect (cli_stream,
-                   remote_addr, 
-                   (ACE_Time_Value *) &ACE_Time_Value::zero,
-                   local_addr,
-                   1,
-                   O_RDWR,
-                   0,
-                   ACE_XTI_ATM_DEVICE,
-                   0,
-                   1,
-                   0,
-                   &optbuf) == -1)
-    {
-      if (errno != EWOULDBLOCK)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "connection failed"),
-                          1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "starting timed connect\n"));
-
-      // Check if non-blocking connection is in progress, and wait up
-      // to timeout seconds for it to complete.
-      ACE_Time_Value tv (timeout);
-
-      if (con.complete (cli_stream,
-                        &remote_addr,
-                        &tv) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "connection failed"),
-                          1);
-      else
-	ACE_DEBUG ((LM_DEBUG,
-                    "connected to %s\n", 
-		    remote_addr.addr_to_string ()));
-    }
-
-  // Send data to server (correctly handles "incomplete writes").
-  
-  for (int r_bytes;
-       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0; 
-       )
-    if (cli_stream.send_n (buf,
-                           r_bytes,
-                           0) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_n"),
-                        1);
-
-  // Explicitly close the connection.
-  if (cli_stream.close () == -1) 
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "close"),
-                      -1);
-  return 0;
-}                                                       
-#else
-int main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR, 
-		     "your platform isn't configured to support XTI/ATM\n"),
-                    1);
-}
-#endif /* ACE_HAS_TLI */
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
deleted file mode 100644
index 7bc73e5b702..00000000000
--- a/examples/IPC_SAP/TLI_SAP/CPP-ATM-server.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-
-#include "ace/TLI_Acceptor.h"                             
-#include "ace/ATM_Addr.h"
-
-ACE_RCSID(TLI_SAP, CPP_ATM_server, "$Id$")
-
-#if defined (ACE_HAS_FORE_ATM_XTI)
-// ACE_TLI Server 
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Time_Value timeout (ACE_DEFAULT_TIMEOUT);
-
-  unsigned char selector = ACE_ATM_Addr::DEFAULT_SELECTOR;
-  int selector_specified = 0;
-  int opt;
-  while ((opt = ACE_OS::getopt (argc, argv, "s:?h")) != EOF)
-    {
-    switch(opt)
-      {
-      case 's':
-        selector = ACE_OS::atoi (optarg);
-        selector_specified = 1;
-        break;
-      case '?':
-      case 'h':
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Usage: %s [-s selector]\n", argv[0]),
-                          1);
-      } // switch
-    } // while getopt
-
-  // Create a server address. 
-  ACE_ATM_Addr addr;
-  if (selector_specified)
-    addr.set_selector(selector);
-
-  // Create a server, reuse the addr. 
-  ACE_TLI_Acceptor peer_acceptor;
-
-  // Not sure why but reuse_addr set to true/1 causes problems for
-  // FORE/XTI/ATM - this is now handled in ACE_TLI_Acceptor::open()
-  if (peer_acceptor.open (addr,
-                          1,
-                          O_RDWR,
-                          0,
-                          5,
-                          ACE_XTI_ATM_DEVICE) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
-                      -1);
-
-  ACE_TLI_Stream new_stream;                                   
-
-  ACE_DEBUG ((LM_DEBUG,
-              "starting server at address %s\n", 
-              addr.addr_to_string ()));
-
-
-  // Performs the iterative server activities 
-
-  for (;;) 
-    {
-      char buf[BUFSIZ];                                          
-
-      // Create a new ACE_TLI_Stream endpoint (note automatic restart
-      // if errno == EINTR).
-      if (peer_acceptor.accept (new_stream, 
-				&addr,
-                                &timeout) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "accept"));
-	  continue;
-	}          
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "client %s connected\n",
-                  addr.addr_to_string ()));
-
-      // Read data from client (terminate on error).
-
-      for (int r_bytes; 
-	   (r_bytes = new_stream.recv (buf, sizeof buf, 0)) > 0; )
-        if (ACE_OS::write (ACE_STDOUT,
-                           buf,
-                           r_bytes) != r_bytes)
-	  ACE_ERROR ((LM_ERROR,
-                      "%p\n",
-                      "ACE::send_n"));
-
-	// Close new endpoint (listening endpoint stays open).
-      if (new_stream.close () == -1) 
-	ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "close"));
-
-    }
-  /* NOTREACHED */
-  return 0;
-}
-#else
-int main (int, char *[])
-{
-  ACE_ERROR_RETURN ((LM_ERROR,
-                     "your platform isn't configured to support XTI/ATM\n"),
-                    1);
-}
-#endif /* ACE_HAS_TLI */
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
index c02f576b701..2a0dbc9dc01 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-client.cpp
@@ -1,25 +1,23 @@
 // $Id$
 
 #include "ace/TLI_Connector.h"
-#include "ace/INET_Addr.h"
+#include "ace/INET_Addr.h"                              
 
 ACE_RCSID(TLI_SAP, CPP_client, "$Id$")
 
 #if defined (ACE_HAS_TLI)
 
 /* ACE_TLI Client */
-
+                                                        
 int main (int argc, char *argv[])                       
-{
+{                                                       
   const char *host = argc > 1 ? argv[1] : ACE_DEFAULT_SERVER_HOST;
   u_short r_port = argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_SERVER_PORT;
   int timeout = argc > 3 ? ACE_OS::atoi (argv[3]) : ACE_DEFAULT_TIMEOUT;
   u_short l_port = argc > 4 ? ACE_OS::atoi (argv[4]) : ACE_DEFAULT_LOCAL_PORT;
-
   char buf[BUFSIZ];
 
   ACE_TLI_Stream cli_stream;
-
   ACE_INET_Addr remote_addr (r_port, host);
   ACE_INET_Addr local_addr (l_port);
 
@@ -29,11 +27,9 @@ int main (int argc, char *argv[])
   // Initiate timed, non-blocking connection with server.
   ACE_TLI_Connector con;
                                                         
-  if (con.connect (cli_stream,
-                   remote_addr, 
-                   (ACE_Time_Value *) &ACE_Time_Value::zero, 
-                   local_addr,
-                   1) == -1)
+  if (con.connect (cli_stream, remote_addr, 
+		   (ACE_Time_Value *) &ACE_Time_Value::zero, 
+		   local_addr, 1) == -1)
     {
       if (errno != EWOULDBLOCK)
 	ACE_ERROR_RETURN ((LM_ERROR,
@@ -48,13 +44,10 @@ int main (int argc, char *argv[])
       // to timeout seconds for it to complete.
       ACE_Time_Value tv (timeout);
 
-      if (con.complete (cli_stream,
-                        &remote_addr,
-                        &tv) == -1)
+      if (con.complete (cli_stream, &remote_addr, &tv) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
-                           "connection failed"),
-                          1);
+                           "connection failed"), 1);
       else
 	ACE_DEBUG ((LM_DEBUG,
                     "connected to %s\n", 
@@ -64,22 +57,20 @@ int main (int argc, char *argv[])
   // Send data to server (correctly handles "incomplete writes").
   
   for (int r_bytes;
-       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0; 
-       )
-    if (cli_stream.send_n (buf,
-                           r_bytes,
-                           0) == -1)
+       (r_bytes = ACE_OS::read (ACE_STDIN, buf, sizeof buf)) > 0; )
+    if (cli_stream.send_n (buf, r_bytes) == -1) 
       ACE_ERROR_RETURN ((LM_ERROR,
                          "%p\n",
                          "send_n"),
                         1);
 
-  // Explicitly close the connection.
+  /* Explicitly close the connection */
   if (cli_stream.close () == -1) 
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "close"),
                       -1);
+
   return 0;
 }                                                       
 #else
diff --git a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
index 2cc3204a9a3..e5e0068c676 100644
--- a/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
+++ b/examples/IPC_SAP/TLI_SAP/CPP-server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/TLI_Acceptor.h"                             
+#include "ace/INET_Addr.h"                                       
 
 ACE_RCSID(TLI_SAP, CPP_server, "$Id$")
 
@@ -9,18 +10,16 @@ ACE_RCSID(TLI_SAP, CPP_server, "$Id$")
 
 int 
 main (int argc, char *argv[])
-{
+{                                                                
   u_short port = argc > 1 ? ACE_OS::atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT;
   ACE_Time_Value timeout (argc > 2 ? ACE_OS::atoi (argv[2]) : ACE_DEFAULT_TIMEOUT);
 
   // Create a server address. 
-  ACE_INET_Addr addr (port);
+  ACE_INET_Addr addr (port); 
 
   // Create a server, reuse the addr. 
   ACE_TLI_Acceptor peer_acceptor;
 
-  // Not sure why but reuse_addr set to true/1 causes problems for
-  // FORE/XTI/ATM - this is now handled in ACE_TLI_Acceptor::open()
   if (peer_acceptor.open (addr, 1) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
@@ -30,8 +29,8 @@ main (int argc, char *argv[])
   ACE_TLI_Stream new_stream;                                   
 
   ACE_DEBUG ((LM_DEBUG,
-              "starting server at host %s\n", 
-              addr.get_host_name ()));
+              "starting server at port %d\n", 
+	     addr.get_port_number ()));
 
   // Performs the iterative server activities 
 
@@ -42,8 +41,7 @@ main (int argc, char *argv[])
       // Create a new ACE_TLI_Stream endpoint (note automatic restart
       // if errno == EINTR).
       if (peer_acceptor.accept (new_stream, 
-				&addr,
-                                &timeout) == -1)
+				&addr, &timeout) == -1)
 	{
 	  ACE_ERROR ((LM_ERROR,
                       "%p\n",
@@ -52,16 +50,15 @@ main (int argc, char *argv[])
 	}          
                                                                  
       ACE_DEBUG ((LM_DEBUG,
-                  "client %s connected\n",
-                  addr.get_host_name ()));
+                  "client %s connected from %d\n",
+		 addr.get_host_name (),
+                  addr.get_port_number ()));
 
       // Read data from client (terminate on error).
 
       for (int r_bytes; 
 	   (r_bytes = new_stream.recv (buf, sizeof buf)) > 0; )
-        if (ACE_OS::write (ACE_STDOUT,
-                           buf,
-                           r_bytes) != r_bytes)
+        if (ACE_OS::write (ACE_STDOUT, buf, r_bytes) != r_bytes)
 	  ACE_ERROR ((LM_ERROR,
                       "%p\n",
                       "ACE::send_n"));
diff --git a/examples/IPC_SAP/TLI_SAP/Makefile b/examples/IPC_SAP/TLI_SAP/Makefile
index 58ec52914a3..cd684fa762e 100644
--- a/examples/IPC_SAP/TLI_SAP/Makefile
+++ b/examples/IPC_SAP/TLI_SAP/Makefile
@@ -13,12 +13,12 @@ BIN   = ftp-client \
 	db-client \
 	db-server \
 	CPP-client \
-	CPP-server \
-	CPP-ATM-client \
-	CPP-ATM-server
+	CPP-server
 
 LSRC   = $(addsuffix .cpp,$(BIN))
 
+LDLIBS= 
+ 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD = $(VBIN)
@@ -55,6 +55,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -82,6 +85,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -154,6 +160,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -182,6 +191,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -253,6 +265,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -281,6 +296,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -304,68 +322,5 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/INET_Addr.i \
  $(ACE_ROOT)/ace/TLI_Stream.i \
  $(ACE_ROOT)/ace/TLI_Acceptor.i
-.obj/CPP-ATM-client.o .obj/CPP-ATM-client.so .shobj/CPP-ATM-client.o .shobj/CPP-ATM-client.so: CPP-ATM-client.cpp \
- $(ACE_ROOT)/ace/TLI_Connector.h \
- $(ACE_ROOT)/ace/TLI_Stream.h \
- $(ACE_ROOT)/ace/TLI.h \
- $(ACE_ROOT)/ace/IPC_SAP.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Connector.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i
-.obj/CPP-ATM-server.o .obj/CPP-ATM-server.so .shobj/CPP-ATM-server.o .shobj/CPP-ATM-server.so: CPP-ATM-server.cpp \
- $(ACE_ROOT)/ace/TLI_Acceptor.h \
- $(ACE_ROOT)/ace/TLI.h \
- $(ACE_ROOT)/ace/IPC_SAP.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/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/IPC_SAP.i \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/TLI.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/TLI_Stream.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/TLI_Stream.i \
- $(ACE_ROOT)/ace/TLI_Acceptor.i \
- $(ACE_ROOT)/ace/ATM_Addr.h \
- $(ACE_ROOT)/ace/ATM_Addr.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/IPC_SAP/UPIPE_SAP/Makefile b/examples/IPC_SAP/UPIPE_SAP/Makefile
index 7e8f80affe2..87483d2a88f 100644
--- a/examples/IPC_SAP/UPIPE_SAP/Makefile
+++ b/examples/IPC_SAP/UPIPE_SAP/Makefile
@@ -39,11 +39,13 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/ex1.o .obj/ex1.so .shobj/ex1.o .shobj/ex1.so: ex1.cpp \
- $(ACE_ROOT)/ace/Stream.h \
+.obj/ex1.o .obj/ex1.so .shobj/ex1.o .shobj/ex1.so: ex1.cpp $(ACE_ROOT)/ace/Stream.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -131,15 +133,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -186,6 +183,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -273,15 +273,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -329,6 +324,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -416,15 +414,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp
index cbdb90dcfc4..fab7ed0a85c 100644
--- a/examples/IPC_SAP/UPIPE_SAP/ex2.cpp
+++ b/examples/IPC_SAP/UPIPE_SAP/ex2.cpp
@@ -36,7 +36,7 @@ supplier (void *)
 
   ACE_UPIPE_Addr c_addr ("pattern");
 
-  ACE_Auto_Basic_Array_Ptr<char> mybuf (new char[size]);
+  ACE_Auto_Basic_Array_Ptr <char> mybuf = new char[size];
 
   for (int i = 0; i < size; i++)
     mybuf[i] = 'a';
diff --git a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp
index 7e99e46466b..15b2cd70347 100644
--- a/examples/IPC_SAP/UPIPE_SAP/ex3.cpp
+++ b/examples/IPC_SAP/UPIPE_SAP/ex3.cpp
@@ -46,7 +46,7 @@ supplier (void *)
                 "(%t) %p\n",
                 "ACE_UPIPE_Acceptor.connect failed"));
 
-  ACE_Auto_Basic_Array_Ptr<char> mybuf (new char[size]);
+  ACE_Auto_Basic_Array_Ptr <char> mybuf = new char[size];
 
   for (int i = 0; i < size; i++)
     mybuf[i] = 'a';
@@ -95,7 +95,7 @@ consumer (void *)
                 "ACE_UPIPE_Acceptor.accept failed"));
 
   // Ensure deletion upon exit.
-  ACE_Auto_Basic_Array_Ptr<char> mybuf (new char[size]);
+  ACE_Auto_Basic_Array_Ptr <char> mybuf = new char[size];
   time_t currsec;
 
   ACE_OS::time (&currsec);
diff --git a/examples/Log_Msg/Makefile b/examples/Log_Msg/Makefile
index 157deeb006f..20feb237cc2 100644
--- a/examples/Log_Msg/Makefile
+++ b/examples/Log_Msg/Makefile
@@ -43,40 +43,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/test_log_msg.o .obj/test_log_msg.so .shobj/test_log_msg.o .shobj/test_log_msg.so: test_log_msg.cpp \
  $(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/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/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
-.obj/test_ostream.o .obj/test_ostream.so .shobj/test_ostream.o .shobj/test_ostream.so: test_ostream.cpp \
- $(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/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/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
-.obj/test_callback.o .obj/test_callback.so .shobj/test_callback.o .shobj/test_callback.so: test_callback.cpp \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Log_Msg/test_log_msg.cpp b/examples/Log_Msg/test_log_msg.cpp
index 815afa29cdf..676871b0697 100644
--- a/examples/Log_Msg/test_log_msg.cpp
+++ b/examples/Log_Msg/test_log_msg.cpp
@@ -4,17 +4,17 @@
 //
 // = LIBRARY
 //    examples/Log_Msg
-//
+// 
 // = FILENAME
 //    test_log_msg.cpp
 //
 // = DESCRIPTION
-//     This program tests the Log_Msg abstraction and demontrates
-//     several use cases.
+//     This program tests the Log_Msg abstraction and demontrates 
+//     several use cases.  
 //
 // = AUTHOR
 //    Douglas Schmidt
-//
+// 
 // ============================================================================
 
 
@@ -46,58 +46,58 @@ main (int argc, char *argv[])
   if (argc > 1)
     {
       if (ACE_LOG_MSG->open (argv[0], ACE_Log_Msg::OSTREAM) == -1)
-        ACE_ERROR ((LM_ERROR, "cannot open logger!!!\n"));
+	ACE_ERROR ((LM_ERROR, "cannot open logger!!!\n"));
 
       cause_error ();
       // Check to see what happened.
-      if (ACE_LOG_MSG->op_status () == -1
-          && ACE_LOG_MSG->errnum () == EWOULDBLOCK)
-        ACE_DEBUG ((LM_DEBUG, "op_status and errnum work!\n"));
+      if (ACE_LOG_MSG->op_status () == -1 
+	  && ACE_LOG_MSG->errnum () == EWOULDBLOCK)
+	ACE_DEBUG ((LM_DEBUG, "op_status and errnum work!\n"));
       else
-        ACE_ERROR ((LM_ERROR, "op_status and errnum failed!\n"));
+	ACE_ERROR ((LM_ERROR, "op_status and errnum failed!\n"));
     }
   else
     {
       if (ACE_LOG_MSG->open (argv[0]) == -1)
-        ACE_ERROR ((LM_ERROR, "cannot open logger!!!\n"));
+	ACE_ERROR ((LM_ERROR, "cannot open logger!!!\n"));
 
       cause_error ();
 
       // Check to see what happened.
-      if (ACE_LOG_MSG->op_status () == -1
-          && ACE_LOG_MSG->errnum () == EWOULDBLOCK)
-        ACE_DEBUG ((LM_DEBUG, "op_status and errnum work!\n"));
+      if (ACE_LOG_MSG->op_status () == -1 
+	  && ACE_LOG_MSG->errnum () == EWOULDBLOCK)
+	ACE_DEBUG ((LM_DEBUG, "op_status and errnum work!\n"));
       else
-        ACE_ERROR ((LM_ERROR, "op_status and errnum failed!\n"));
+	ACE_ERROR ((LM_ERROR, "op_status and errnum failed!\n"));
 
       // Exercise many different combinations of STDERR and OSTREAM.
 
-      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n",
-                  3.1416 * counter++, 8, "", "hello", 10000));
+      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n", 
+		  3.1416 * counter++, 8, "", "hello", 10000));
 
       ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
       ACE_LOG_MSG->msg_ostream (&cout);
 
-      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n",
-                  3.1416 * counter, 8, "", "world", 10000 * counter++));
+      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n", 
+		  3.1416 * counter, 8, "", "world", 10000 * counter++));
 
       ACE_LOG_MSG->clr_flags (ACE_Log_Msg::STDERR);
 
-      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n",
-                  3.1416 * counter, 8, "", "world", 10000 * counter++));
+      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n", 
+		  3.1416 * counter, 8, "", "world", 10000 * counter++));
 
       ACE_LOG_MSG->msg_ostream (0);
 
       ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR);
 
-      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n",
-                  3.1416 * counter, 8, "", "world", 10000 * counter++));
+      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n", 
+		  3.1416 * counter, 8, "", "world", 10000 * counter++));
 
       ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM);
       ACE_LOG_MSG->msg_ostream (&cerr);
 
-      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n",
-                  3.1416 * counter, 8, "", "world", 10000 * counter++));
+      ACE_DEBUG ((LM_INFO, "%10f, %*s%s = %d\n", 
+		  3.1416 * counter, 8, "", "world", 10000 * counter++));
 
       static int array[] = {1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048};
 
@@ -112,18 +112,6 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_INFO, "This LM_INFO message should not print!\n"));
       ACE_DEBUG ((LM_DEBUG, "This LM_DEBUG message should not print!\n"));
 
-      ACE_SET_BITS (priority_mask, LM_INFO);
-      ACE_LOG_MSG->priority_mask (priority_mask, ACE_Log_Msg::PROCESS);
-
-      ACE_DEBUG ((LM_INFO, "This LM_INFO message should print!\n"));
-      ACE_DEBUG ((LM_DEBUG, "This LM_DEBUG message should not print!\n"));
-
-      ACE_CLR_BITS (priority_mask, LM_INFO);
-      ACE_LOG_MSG->priority_mask (priority_mask, ACE_Log_Msg::PROCESS);
-
-      ACE_DEBUG ((LM_INFO, "This LM_INFO message should not print!\n"));
-      ACE_DEBUG ((LM_DEBUG, "This LM_DEBUG message should not print!\n"));
-
       char *badname = "badname";
 
       char *l_argv[2];
@@ -131,8 +119,8 @@ main (int argc, char *argv[])
       l_argv[1] = 0;
 
       if (ACE_OS::execv (badname, l_argv) == -1)
-        ACE_ERROR ((LM_ERROR, "%n: (%x), %p%r%a\n",
-                    10000, badname, cleanup, 1));
+	ACE_ERROR ((LM_ERROR, "%n: (%x), %p%r%a\n", 
+		    10000, badname, cleanup, 1));
     }
   return 0;
 }
diff --git a/examples/Logger/Acceptor-server/Makefile b/examples/Logger/Acceptor-server/Makefile
index b5953771990..8bc87f53831 100644
--- a/examples/Logger/Acceptor-server/Makefile
+++ b/examples/Logger/Acceptor-server/Makefile
@@ -1,5 +1,5 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#	$Id: Makefile	1.1	10/18/96
 #
 #	Makefile for the Reactor version of the Server Logging Daemon
 #----------------------------------------------------------------------------
@@ -14,8 +14,6 @@ VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 BUILD	= $(VBIN)
 
-SRC=$(addsuffix .cpp,$(BIN))
-
 #----------------------------------------------------------------------------
 #	Include macros and targets
 #----------------------------------------------------------------------------
@@ -39,151 +37,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/server_loggerd.o .obj/server_loggerd.so .shobj/server_loggerd.o .shobj/server_loggerd.so: server_loggerd.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/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/Get_Opt.i \
- $(ACE_ROOT)/ace/Acceptor.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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(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/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/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Acceptor.i
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Logger/client/Makefile b/examples/Logger/client/Makefile
index 302c7032c0b..0a4ad24eb7f 100644
--- a/examples/Logger/client/Makefile
+++ b/examples/Logger/client/Makefile
@@ -46,6 +46,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Logger/simple-server/Makefile b/examples/Logger/simple-server/Makefile
index e4558e13e79..5e388c9b1ba 100644
--- a/examples/Logger/simple-server/Makefile
+++ b/examples/Logger/simple-server/Makefile
@@ -47,6 +47,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -129,15 +132,10 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -172,6 +170,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Map_Manager/Makefile b/examples/Map_Manager/Makefile
index 67746856d59..4111077b3b2 100644
--- a/examples/Map_Manager/Makefile
+++ b/examples/Map_Manager/Makefile
@@ -40,6 +40,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -54,12 +57,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(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/Synch.h \
@@ -116,6 +113,7 @@ 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
+ $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Mem_Map/IO-tests/Makefile b/examples/Mem_Map/IO-tests/Makefile
index 90956fe9d9c..fe84307d82a 100644
--- a/examples/Mem_Map/IO-tests/Makefile
+++ b/examples/Mem_Map/IO-tests/Makefile
@@ -43,6 +43,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/IO_Test.o .obj/IO_Test.so .shobj/IO_Test.o .shobj/IO_Test.so: IO_Test.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -58,8 +61,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- IO_Test.h \
+ $(ACE_ROOT)/ace/Mem_Map.i IO_Test.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
diff --git a/examples/Mem_Map/file-reverse/Makefile b/examples/Mem_Map/file-reverse/Makefile
index cf78574091b..9980349d679 100644
--- a/examples/Mem_Map/file-reverse/Makefile
+++ b/examples/Mem_Map/file-reverse/Makefile
@@ -47,6 +47,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Misc/Makefile b/examples/Misc/Makefile
index 57f76a2c2f3..a76ee3f6e8c 100644
--- a/examples/Misc/Makefile
+++ b/examples/Misc/Makefile
@@ -56,6 +56,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -89,6 +92,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -108,6 +114,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -132,6 +141,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -202,6 +214,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -258,6 +273,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -275,6 +293,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/NT_Service/README b/examples/NT_Service/README
deleted file mode 100644
index a1d4175e126..00000000000
--- a/examples/NT_Service/README
+++ /dev/null
@@ -1,45 +0,0 @@
-$Id$
-
-How to use the NT_Service example.
-
-The NT_Service program has the following usage:  -in -r -s -k -tn -d
-  -i: Install this program as an NT service, with specified startup
-  -r: Remove this program from the Service Manager
-  -s: Start the service
-  -k: Kill the service
-  -t: Set startup for an existing service
-  -d: Debug; run as a regular application
-
-In order to see different stages of an NT service application,
-you have to run the program several times, with different options.
-Please note: run with only one option at a time.
-
-1. Make executable NT_Service.
-
-2. First, you must initialize the service in the NT SCM database.
-   Run NT_Service with -in, where n is one of the following startup options:
-
-        //
-        // Start Type (from WinNT.h)
-        //
-        #define SERVICE_SYSTEM_START    0x00000001
-        #define SERVICE_AUTO_START      0x00000002
-        #define SERVICE_DEMAND_START    0x00000003
-        #define SERVICE_DISABLED        0x00000004
-
-   If only -i is specified, SERVICE_AUTO_START is default option.
-
-3. Now you are ready to run the actual service. Run NT_Service again,
-   this time with -s option. If the service starts successfully, it will
-   ring the system bell every second or so until the service is stopped.
-
-4. To stop service execution, run NT_Service with the -k option.
-
-5. To remove the service from the Service Control Manager database, run
-   NT_Service with -r.
-
-In addition, once you have initialized this service (by using the -i option)
-you can change its startup type to one of the other values above.  To do
-this, run NT_Service with -tn option. n is as explained above for -i.
-
-In order to debug the service's execution itself, use the -d option.
diff --git a/examples/NT_Service/main.cpp b/examples/NT_Service/main.cpp
index 304758b118b..e9519dc4194 100644
--- a/examples/NT_Service/main.cpp
+++ b/examples/NT_Service/main.cpp
@@ -22,9 +22,6 @@
 #include "ace/Get_Opt.h"
 #include "ntsvc.h"
 
-// Default for the -i (install) option
-#define DEFAULT_SERVICE_INIT_STARTUP     SERVICE_AUTO_START
-
 class Process
 {
 public:
@@ -77,7 +74,7 @@ Process::print_usage_and_die (void)
 {
   ACE_DEBUG ((LM_INFO,
               "Usage: %s"
-              " -in -r -s -k -tn -d\n"
+              " -in -r -s -k -tn -d\n%a"
               "  -i: Install this program as an NT service, with specified startup\n"
               "  -r: Remove this program from the Service Manager\n"
               "  -s: Start the service\n"
@@ -86,7 +83,7 @@ Process::print_usage_and_die (void)
               "  -d: Debug; run as a regular application\n",
               progname,
               0));
-  ACE_OS::exit(1);
+  /* NOTREACHED */
 }
 
 void 
@@ -101,8 +98,6 @@ Process::parse_args (int argc, char* argv[])
     case 'i':
       opt_install = 1;
       opt_startup = ACE_OS::atoi (get_opt.optarg);
-      if (opt_startup <= 0)
-         print_usage_and_die ();
       break;
     case 'r':
       opt_remove = 1;
@@ -116,24 +111,12 @@ Process::parse_args (int argc, char* argv[])
     case 't':
       opt_type = 1;
       opt_startup = ACE_OS::atoi (get_opt.optarg);
-      if (opt_startup <= 0)
-         print_usage_and_die ();
       break;
     case 'd':
       opt_debug = 1;
       break;
     default:
-      // -i can also be given without a value - if so, it defaults
-      // to defined value.
-      if (ACE_OS::strcmp (get_opt.argv_[get_opt.optind-1], "-i") == 0)
-      {
-        opt_install = 1;
-        opt_startup = DEFAULT_SERVICE_INIT_STARTUP;
-      }
-      else
-      {
-        print_usage_and_die ();
-      }
+      print_usage_and_die ();
       break;
   }
 }
@@ -160,7 +143,12 @@ Process::run (int argc, char* argv[])
   parse_args (argc, argv);
 
   if (opt_install && !opt_remove)
-    return SERVICE::instance ()->insert (opt_startup);
+    {
+      if (opt_startup > 0)
+        return SERVICE::instance ()->insert (opt_startup);
+      else
+        return SERVICE::instance ()->insert ();
+    }
 
   if (opt_remove && !opt_install)
     return SERVICE::instance ()->remove ();
diff --git a/examples/Naming/Makefile b/examples/Naming/Makefile
index e6cbd82be6b..c9b9a017905 100644
--- a/examples/Naming/Makefile
+++ b/examples/Naming/Makefile
@@ -1,325 +1,48 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id: Makefile	1.1	10/18/96
 #
-#       Makefile for Naming examples.
+#	Makefile for tests of the Shared_Malloc wrappers
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+BIN     = test_non_existent \
+	  test_writers \
+	  test_multiple_contexts
 
-PSRC    = $(addsuffix .cpp,$(BIN))
+LSRC	= $(addsuffix .cpp,$(FILES))
+LOBJ	= $(addsuffix .o,$(FILES))
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-BIN2 = test_non_existent \
-       test_writers \
-       test_multiple_contexts
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # ! Other
+BUILD   = $(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.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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
-.obj/test_non_existent.o .obj/test_non_existent.so .shobj/test_non_existent.o .shobj/test_non_existent.so: test_non_existent.cpp \
- $(ACE_ROOT)/ace/Naming_Context.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/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/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/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/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/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h
-.obj/test_writers.o .obj/test_writers.so .shobj/test_writers.o .shobj/test_writers.so: test_writers.cpp \
- $(ACE_ROOT)/ace/Naming_Context.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/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/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/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/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/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h
-.obj/test_multiple_contexts.o .obj/test_multiple_contexts.so .shobj/test_multiple_contexts.o .shobj/test_multiple_contexts.so: test_multiple_contexts.cpp \
- $(ACE_ROOT)/ace/Naming_Context.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/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/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/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/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/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h
+
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Reactor/Dgram/Makefile b/examples/Reactor/Dgram/Makefile
index 40d45ca3fa5..ea8f864a5d2 100644
--- a/examples/Reactor/Dgram/Makefile
+++ b/examples/Reactor/Dgram/Makefile
@@ -47,6 +47,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -125,6 +128,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Reactor/FIFO/Makefile b/examples/Reactor/FIFO/Makefile
index 063e7c8cb62..4483243b069 100644
--- a/examples/Reactor/FIFO/Makefile
+++ b/examples/Reactor/FIFO/Makefile
@@ -47,6 +47,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -71,6 +74,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Reactor/Misc/Makefile b/examples/Reactor/Misc/Makefile
index 6217f6639c9..80f3ddec376 100644
--- a/examples/Reactor/Misc/Makefile
+++ b/examples/Reactor/Misc/Makefile
@@ -51,6 +51,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -119,6 +122,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -192,6 +198,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -276,15 +285,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -309,6 +313,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -329,6 +336,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -414,15 +424,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -448,6 +453,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -518,6 +526,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -601,15 +612,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -636,6 +642,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/test_time_value.o .obj/test_time_value.so .shobj/test_time_value.o .shobj/test_time_value.so: test_time_value.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -655,6 +664,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -678,6 +690,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Free_List.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
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/Reactor/Multicast/Makefile b/examples/Reactor/Multicast/Makefile
index 61ab3cafce9..5243aa3ea60 100644
--- a/examples/Reactor/Multicast/Makefile
+++ b/examples/Reactor/Multicast/Makefile
@@ -46,6 +46,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Reactor/Ntalker/Makefile b/examples/Reactor/Ntalker/Makefile
index e76a96bbdee..3f94ec71d26 100644
--- a/examples/Reactor/Ntalker/Makefile
+++ b/examples/Reactor/Ntalker/Makefile
@@ -45,6 +45,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp b/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
deleted file mode 100644
index be720fdef40..00000000000
--- a/examples/Reactor/Proactor/Aio_Platform_Test_C.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//    aio_platform_test_c.cpp
-//
-// =  DESCRITPTION
-//     Testing the platform for POSIX Asynchronous I/O. This is the C
-//     version of the  $ACE_ROOT/tests/Aio_Platform_Test.cpp. Useful
-//     to send bug reports.
-//
-// = AUTHOR
-//    Programming for the Real World. Bill O. GallMeister.
-//    Modified by Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// =====================================================================
-
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <signal.h>
-#include <string.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <limits.h>
-
-#include <aio.h>
-
-int do_sysconf (void);
-int have_asynchio (void);
-
-static int file_handle = -1;
-char mb1 [BUFSIZ + 1];
-char mb2 [BUFSIZ + 1];
-aiocb aiocb1, aiocb2;
-sigset_t completion_signal;
-
-// For testing the <aio> stuff.
-int test_aio_calls (void);
-int issue_aio_calls (void);
-int query_aio_completions (void);
-int setup_signal_delivery (void);
-int do_sysconf (void);
-int have_asynchio (void);
-  
-int
-do_sysconf (void)
-{
-  // Call sysconf to find out runtime values.
-  errno = 0;
-#if defined (_SC_LISTIO_AIO_MAX)
-  printf ("Runtime value of LISTIO_AIO_MAX is %d, errno = %d\n",
-          sysconf(_SC_LISTIO_AIO_MAX),
-          errno);
-#else
-  printf ("Runtime value of AIO_LISTIO_MAX is %d, errno = %d\n",
-          sysconf(_SC_AIO_LISTIO_MAX),
-          errno);
-#endif  
-  
-  errno = 0;
-  printf ("Runtime value of AIO_MAX is %d, errno = %d\n",
-          sysconf (_SC_AIO_MAX),
-          errno);
-
-  errno = 0;
-  printf ("Runtime value of _POSIX_ASYNCHRONOUS_IO is %d, errno = %d\n",
-          sysconf (_SC_ASYNCHRONOUS_IO),
-          errno);
-
-  errno = 0;
-  printf ("Runtime value of _POSIX_REALTIME_SIGNALS is %d, errno = %d\n",
-          sysconf (_SC_REALTIME_SIGNALS),
-          errno);
-
-  errno = 0;
-  printf ("Runtime value of RTSIG_MAX %d, Errno = %d\n",
-          sysconf (_SC_RTSIG_MAX), 
-          errno);
-  
-  errno = 0;
-  printf ("Runtime value of SIGQUEUE_MAX %d, Errno = %d\n",
-          sysconf (_SC_SIGQUEUE_MAX),
-          errno); 
-  return 0;
-}
-
-int
-have_asynchio (void)
-{
-#if defined (_POSIX_ASYNCHRONOUS_IO)
-  // POSIX Asynch IO is present in this system.
-#if defined (_POSIX_ASYNC_IO)
-  // If this is defined and it is not -1, POSIX_ASYNCH is supported
-  // everywhere in the system.
-#if _POSIX_ASYNC_IO == -1
-  printf ("_POSIX_ASYNC_IO = -1.. ASYNCH IO NOT supported at all\n");
-  return -1;
-#else /* Not _POSIX_ASYNC_IO == -1 */
-  printf ("_POSIX_ASYNC_IO = %d\n ASYNCH IO is supported FULLY\n",
-          _POSIX_ASYNC_IO);
-#endif /* _POSIX_ASYNC_IO == -1 */
-  
-#else  /* Not defined  _POSIX_ASYNC_IO */
-  printf ("_POSIX_ASYNC_IO is not defined.\n");
-  printf ("AIO might *not* be supported on some paths\n");
-#endif /* _POSIX_ASYNC_IO */
-  
-  // System defined POSIX Values.
-  printf ("System claims to have  POSIX_ASYNCHRONOUS_IO\n");
-
-  printf ("_POSIX_AIO_LISTIO_MAX = %d\n", _POSIX_AIO_LISTIO_MAX);
-  printf ("_POSIX_AIO_MAX = %d\n", _POSIX_AIO_MAX);
-
-  // Check and print the run time values.
-  do_sysconf ();
-  
-  return 0;
-  
-#else /* Not _POSIX_ASYNCHRONOUS_IO */
-  printf ("No support._POSIX_ASYNCHRONOUS_IO itself is not defined\n");
-  return -1;
-#endif /* _POSIX_ASYNCHRONOUS_IO */  
-}
-
-int
-main (int, char *[])
-{
-  if (have_asynchio () == 0)
-    printf ("Test successful\n");
-  else
-    printf ("Test not successful\n");
-  return 0;
-}
diff --git a/examples/Reactor/Proactor/Makefile b/examples/Reactor/Proactor/Makefile
index c080b297abb..1f91dcd00fd 100644
--- a/examples/Reactor/Proactor/Makefile
+++ b/examples/Reactor/Proactor/Makefile
@@ -8,7 +8,10 @@
 #	Local macros
 #----------------------------------------------------------------------------
 
-BIN   	= simple_test_proactor test_proactor test_aiosig_ace test_aiocb_ace test_timeout test_timeout_st post_completions test_end_event_loop
+BIN   	= test_proactor
+LSRC 	= $(addsuffix .cpp,$(BIN))
+VLDLIBS = $(LDLIBS:%=%$(VAR))
+BUILD 	= $(VBIN)
 
 #----------------------------------------------------------------------------
 #	Include macros and targets
diff --git a/examples/Reactor/Proactor/README b/examples/Reactor/Proactor/README
deleted file mode 100644
index 6509e3efcb4..00000000000
--- a/examples/Reactor/Proactor/README
+++ /dev/null
@@ -1,180 +0,0 @@
-This README file lists all the example applications for the Proactor framework. 
-
-Test/Example Applications for Proactor:
-=========================================
-
-The following tests are available.
-        
-o $ACE_ROOT/tests/Aio_Platform_Test.cpp : Tests basic limits
-        pertaining to the  POSIX features 
-
-o $ACE_ROOT/examples/Reactor/Proactor/test_aiocb.cpp    : 
-        This is a C++ program for testing the AIOCB (AIO Control
-        Blocks) based completion approach which uses <aio_suspend> for
-        completion querying. 
-
-o $ACE_ROOT/examples/Reactor/Proactor/test_aiosig.cpp   : This is a
-        C++ program for testing the Signal based completion approach
-        that uses <sigtimedwait> for completion querying. 
-
-o $ACE_ROOT/examples/Reactor/Proactor/test_aiocb_ace.cpp: Portable
-        version of test_aiocb.cpp. (Same as test_aiocb.cpp, but uses
-        ACE_DEBUGs instead of printf's and ACE_Message_Blocks instead
-        of char*'s. 
-
-o $ACE_ROOT/examples/Reactor/Proactor/test_aiosig_ace.cpp: Portable
-        version of test_aiosig.cpp. (Same as test_aiosig.cpp, but uses
-        ACE_DEBUGs instead of printf's and ACE_Message_Blocks instead
-        of char*'s. 
-
-o test_proactor.cpp (with ACE_POSIX_AIOCB_Proactor)     : Test for
-        ACE_Proactor which uses AIOCB (AIO Control Blocks) based
-        completions strategy Proactor. (#define
-        ACE_POSIX_AIOCB_PROACTOR in the config file, but this is the
-        default option)
-
-o test_proactor.cpp (with ACE_POSIX_SIG_Proactor)     : Test for
-        ACE_Proactor which uses real time signal based completion
-        strategy proactor. (#define ACE_POSIX_SIG_PROACTOR in the
-        config file)
-
-o test_multiple_loops.cpp       : This example application shows how
-        to write programs that combine the Proactor and Reactor event
-        loops. This is possible only on WIN32 platform.
-       
-o test_timeout.cpp      : Multithreaded application testing the Timers
-        mechanism of the Proactor.
-
-o test_timeout_st.cpp   : Sinle threaded version of test_timeout.cpp.
-
-
-
-Behavior of POSIX AIO of various platforms:
-==========================================
-
-
-
-Summary:
-======
-                        Sun     Sun     Lynx
-                        5.6     5.7     
-                        
-test_aiocb_ace          Good    Good    Good    
-(test_aiocb)
-
-test_aiosig_ace         Inconst Inconst Inconst
-
-
-Inconst.: Inconsistent execution.
-
-
-
-Aio_Platform_Test:
-================
-
-                
-Sun5.6 CC:	
----------
-        Status  : OK
-
-	Problems: 1.The constant which indicates the maximum
-                        concurrent asynchronous I/Os is -1 at run
-                        time. This should be atleast 1.
-
-Sun57 CC:
---------        
-        Status  : OK
-        
-        Problems: <Same as in sun56 CC>
-
-Lynx g++:
---------
-        Status  : OK
-        
-        Problems: AIO_LISTIO_MAX, AIO_MAX and SIGQUEUE_MAX are defined
-                        but their values are -1
-
-test_aiocb.cpp
-=============
-
-Sun5.6 CC:	
----------
-        Status  : GOOD
-
-	Problems: NONE
-                
-Sun57 CC:
---------        
-        Status  : GOOD
-        
-        Problems: NONE
-
-Lynx g++:
---------
-
-
-
-test_aiosig.cpp:
-===============
-
-Sun5.6 CC:	
----------
-        Status  : GOOD
-
-	Problems: NONE
-                
-Sun57 CC:
---------        
-        Status  : BAD
-        
-        Problems: 1. If 2 <aio_> calls are issed, only one completion
-                        gets through, second one hangs.
-
-Lynx g++:
---------
-
-
-
-test_aiosig_ace.cpp:
-====================
-
-Sun5.6 CC:	
----------
-        Status  : BAD
-
-	Problems: 1. <aio_read> and <aio_write> calls return 0 but
-                        sets the<errno> to 48 which is <Operation Not
-                        Supported> 
-	
-                  2. I issue <aio_read/write> with a RT signal enabled. It
-                         returns but with the a wrong signal code, -2, which is
-                         SI_QUEUE. But we are supposed to get SI_ASYNCIO
-              
-                  3*.IMPORTANT: If I issue two <aio_read/write> calls,
-                        they get queued and 
-                        they execute correctly. But their completions are not
-                         queued up correctly.
-                              
-                  4. Calling <sigtimedwait> sometimes print the string 
-                	   "err = 22". But <sigtimedwait> doesnt return a error and
-                	   errno is also not set to any error values. (err == 22, may
-                	   be referring to errno 22 which means Invalid Argument) 
-                
-Sun57 CC:
---------        
-        Status  : BAD
-        
-        Problems: <same as in sun56 CC>
-
-Lynx g++:
---------
-        
-        Status  : OK
-
-        Problems: 1. In between my Proactor test application the
-                        <errno> is getting set to <77>. This means
-                        Unsupported POSIX operation. But none of my
-                        <posix> calls return -1.        
-          
-        TO-DO   : 1. Run <gdb> and watch for <errno> and figure when
-                        it is changing over to 77.
diff --git a/examples/Reactor/Proactor/post_completions.cpp b/examples/Reactor/Proactor/post_completions.cpp
deleted file mode 100644
index 3c6eb8b0b56..00000000000
--- a/examples/Reactor/Proactor/post_completions.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//     post_completions.cpp
-//
-// = DESCRITPTION
-//     This program demonstrates how to post fake completions to The
-//     Proactor. It also shows the how to specify the particular
-//     real-time signals to post completions. The Real-time signal
-//     based completion strategy is implemented with
-//     ACE_POSIX_SIG_PROACTOR. 
-//     (So, it can be used only if ACE_HAS_AIO_CALLS is defined and
-//      ACE_POSIX_AIOCB_PROACTOR is not defined)
-//     Since it is faking results, you have to pay by knowing and
-//     using platform-specific implementation objects for Asynchronous
-//     Result classes.
-//     This example shows using an arbitrary result class for faking
-//     completions. You can also use the predefined Result classes for
-//     faking. The factory methods in the Proactor class create the
-//     Result objects.
-//
-// = COMPILATION
-//     make
-//
-// = RUN
-//     ./post_completions
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// =====================================================================
-
-#include "ace/Proactor.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/WIN32_Proactor.h"
-#include "ace/POSIX_Proactor.h"
-
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
-// This only works on Win32 platforms and on Unix platforms supporting
-// POSIX aio calls.
-
-#if defined (ACE_HAS_AIO_CALLS)
-#define RESULT_CLASS ACE_POSIX_Asynch_Result
-#elif defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)
-#define RESULT_CLASS ACE_WIN32_Asynch_Result
-#endif /* ACE_HAS_AIO_CALLS */
-
-class ACE_Export My_Result : public RESULT_CLASS
-{
-  // = TITLE
-  // 
-  //     Result Object that we will post to the Proactor.
-  //
-  // = DESCRIPTION
-  //
-  
-public:
-  My_Result (ACE_Handler &handler,
-             const void *act,
-             int signal_number,
-             size_t sequence_number)
-    : RESULT_CLASS (handler,
-                    act,
-                    ACE_INVALID_HANDLE,
-                    0, // Offset
-                    0, // OffsetHigh
-                    0, // Priority
-                    signal_number),
-      sequence_number_ (sequence_number)
-    {}
-  // Constructor.
-  
-  virtual ~My_Result (void)
-    {}
-  // Destructor.
-  
-  void complete (u_long bytes_transferred,
-                 int success,
-                 const void *completion_key,
-                 u_long error)
-    // This is the method that will be called by the Proactor for
-    // dispatching the completion. This method generally calls one of
-    // the call back hood methods defined in the ACE_Handler
-    // class. But, we will just handle the completions here.
-    {
-      this->success_ = success;
-      this->completion_key_ = completion_key;
-      this->error_ = error;
-
-      // Print the completion details.
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%t) Completion sequence number %d, success : %d, error : %d, signal_number : %d\n", 
-                  this->sequence_number_,
-                  this->success_, this->error_, this->signal_number ()));
-      
-      // Sleep for a while.
-      ACE_OS::sleep (4);
-    }
-
-private:
-  size_t sequence_number_;
-  // Sequence number for the result object.
-};
- 
-class ACE_Export My_Handler : public  ACE_Handler
-{
-  // = TITLE
-  //
-  //     Handler class for faked completions. 
-  //
-  // = DESCRIPTION
-  //
-  
-public:
-  My_Handler (void) {}
-  // Constructor.
-  
-  virtual ~My_Handler (void) {}
-  // Destructor.
-
-  //  ACE_Atomic_Op <ACE_Thread_Mutex, int> completion_count_;
-  // Count for the completion.
-};
-
-class ACE_Export My_Task: public ACE_Task <ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //   
-  //     Contains thread functions which execute event loops. Each 
-  //     thread waits for a different signal.
-  //
-public:
-  My_Task (void) {}
-  // Constructor.
-  
-  virtual ~My_Task (void) {}
-  // Destructor.
-
-  int open (void *proactor)
-    {
-      // Store the proactor.
-      this->proactor_ = (ACE_Proactor *) proactor;
-      
-      // Activate the Task.
-      this->activate (THR_NEW_LWP, 5);
-      
-      return 0;
-    }
-
-  int svc (void)
-    {
-      // Handle events for 13 seconds.
-      ACE_Time_Value run_time (13);
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t):Starting svc routine\n"));
-      
-      if (this->proactor_->handle_events (run_time) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t):%p.\n", "Worker::svc"), -1);
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n"));
-      
-      return 0;
-    }
-
-private:
-  ACE_Proactor *proactor_;
-  // Proactor for this task.
-};
-
-int
-main (int argc, char *argv [])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P | %t):Test starts \n"));
-
-  // = Get two POSIX_SIG_Proactors, one with SIGRTMIN and one with
-  //   SIGRTMAX.  
-  
-  ACE_Proactor  proactor1;
-  // Proactor1. SIGRTMIN Proactor. (default).
-
-  // = Proactor2. SIGRTMAX Proactor.
-#if defined (ACE_HAS_AIO_CALLS) && !defined (ACE_POSIX_AIOCB_PROACTOR)
-
-  ACE_DEBUG ((LM_DEBUG, "Using ACE_POSIX_SIG_Proactor\n"));
-  
-  sigset_t signal_set;
-  // Signal set that we want to mask.
-  
-  // Clear the signal set.
-  if (sigemptyset (&signal_set) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "sigemptyset failed"),
-                      1);
-
-  // Add the SIGRTMAX to the signal set.
-  if (sigaddset (&signal_set, ACE_SIGRTMAX) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p\n",
-                       "sigaddset failed"),
-                      1);
-
-  // Make the POSIX Proactor.
-  ACE_POSIX_SIG_Proactor posix_proactor (signal_set);
-  // Get the Proactor interface out of it.
-  ACE_Proactor proactor2 (&posix_proactor);
-#else /* ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR */
-  ACE_Proactor proactor2;
-#endif /* ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR */
-
-  // = Create Tasks. One pool of threads to handle completions on
-  //   SIGRTMIN and the other one to handle completions on SIGRTMAX.
-  My_Task task1, task2;
-  task1.open (&proactor1);
-  task2.open (&proactor2);
-  
-  // Handler for completions.
-  My_Handler handler;
-  
-  // = Create a few MyResult objects and post them to Proactor.
-  
-  My_Result *result_objects [10];
-  int signal_number = ACE_SIGRTMAX;
-  size_t ri;
-
-  // Creation.
-  for (ri = 0; ri < 10; ri++)
-    {
-      // Use RTMIN and RTMAX proactor alternatively, to post
-      // completions. 
-      if (ri % 2)
-        signal_number = ACE_SIGRTMIN;
-      else
-        signal_number = ACE_SIGRTMAX;
-      
-      // Create the result.
-      ACE_NEW_RETURN (result_objects [ri],
-                      My_Result (handler,
-                                 0,
-                                 signal_number,
-                                 ri),
-                      1);
-    }
-  
-  // Post all the result objects.
-  ACE_Proactor *proactor = &proactor2;
-  for (ri = 0; ri < 10; ri++)
-    {
-      // Use RTMIN and RTMAX Proactor alternatively, to post
-      // completions.
-      if (ri % 2)
-        proactor = &proactor1;
-      else 
-        proactor = &proactor2;
-      
-      if (result_objects [ri]->post_completion (proactor->implementation ())
-          == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Test failed\n"),
-                          1);
-    }
-  
-  ACE_Thread_Manager::instance ()->wait ();
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P | %t):Test ends\n"));
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task <ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Task <ACE_NULL_SYNCH>
-#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
-
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
-
-int 
-main (int, char *[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "This example cannot work with AIOCB_Proactor.\n"));
-  return 1;
-}
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
-
diff --git a/examples/Reactor/Proactor/simple_test_proactor.cpp b/examples/Reactor/Proactor/simple_test_proactor.cpp
deleted file mode 100644
index b18b39a337a..00000000000
--- a/examples/Reactor/Proactor/simple_test_proactor.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    examples
-//
-// = FILENAME
-//    simple_test_proactor.cpp
-//
-// = DESCRIPTION
-//    Very simple version of test_proactor.cpp.
-//
-// = AUTHOR
-//    Alexander Babu Arulanthu (alex@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "ace/Service_Config.h"
-#include "ace/Proactor.h"
-#include "ace/Asynch_IO.h"
-#include "ace/Asynch_IO_Impl.h"
-#include "ace/Message_Block.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Proactor, test_proactor, "$Id$")
-
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-  // This only works on Win32 platforms and on Unix platforms supporting
-  // POSIX aio calls.
-
-static char *file = "simple_test_proactor.cpp";
-static char *dump_file = "simple_output";
-static int initial_read_size = BUFSIZ;
-static int done = 0;
-
-class Simple_Tester : public ACE_Handler
-{
-  // = TITLE
-  //
-  //     Simple_Tester
-  //
-  // = DESCRIPTION
-  //
-  //     The class will be created by main(). This class reads a block
-  // from the file and write that to the dump file.
-
-public:
-  Simple_Tester (void);
-  // Constructor.
-
-  ~Simple_Tester (void);
-
-  int open (void);
-  // Open the operations and initiate read from the file.
-
-protected:
-  // = These methods are called by the freamwork.
-
-  virtual void handle_read_file (const ACE_Asynch_Read_File::Result &result);
-  // This is called when asynchronous reads from the socket complete.
-
-  virtual void handle_write_file (const ACE_Asynch_Write_File::Result &result);
-  // This is called when asynchronous writes from the socket complete.
-
-private:
-  int initiate_read_file (void);
-
-  ACE_Asynch_Read_File rf_;
-  // rf (read file): for writing from the file.
-  
-  ACE_Asynch_Write_File wf_;
-  // ws (write File): for writing to the file.
-
-  ACE_HANDLE input_file_;
-  // File to read from.
-
-  ACE_HANDLE dump_file_;
-  // File for dumping data.
-
-  // u_long file_offset_;
-  // Current file offset
-
-  // u_long file_size_;
-  // File size
-};
-
-
-Simple_Tester::Simple_Tester (void)
-  : input_file_ (ACE_INVALID_HANDLE),
-    dump_file_ (ACE_INVALID_HANDLE)
-{
-}
-
-Simple_Tester::~Simple_Tester (void)
-{
-}
-
-
-int
-Simple_Tester::open (void)
-{
-  // Initialize stuff
-
-  // Open input file (in OVERLAPPED mode)
-  this->input_file_ = ACE_OS::open (file,
-                                    GENERIC_READ | FILE_FLAG_OVERLAPPED);
-  if (this->input_file_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::open"), -1);
-
-  // Open dump file (in OVERLAPPED mode)
-  this->dump_file_ = ACE_OS::open (dump_file,
-                                   O_CREAT | O_RDWR | O_TRUNC | FILE_FLAG_OVERLAPPED,
-                                   0644);
-  if (this->dump_file_ == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::open"), -1);
-  
-  // Open ACE_Asynch_Read_File
-  if (this->rf_.open (*this, this->input_file_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Read_File::open"), -1);
-
-  // Open ACE_Asynch_Write_File
-  if (this->wf_.open (*this, this->dump_file_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Write_File::open"), -1);
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "Simple_Tester::open: Files and Asynch Operations opened sucessfully\n"));
-
-  
-  // Start an asynchronous read file
-  if (this->initiate_read_file () == -1)
-    return -1;
-
-  return 0;
-}
-
-
-int
-Simple_Tester::initiate_read_file (void)
-{
-  // Create Message_Block
-  ACE_Message_Block *mb = 0;
-  ACE_NEW_RETURN (mb, ACE_Message_Block (BUFSIZ + 1), -1);
-
-  // Inititiate an asynchronous read from the file
-  if (this->rf_.read (*mb,
-		      mb->size () - 1) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Read_File::read"), -1);
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "Simple_Tester:initiate_read_file: Asynch Read File issued sucessfully\n"));
-
-  return 0;
-}
-
-void
-Simple_Tester::handle_read_file (const ACE_Asynch_Read_File::Result &result)
-{
-  ACE_DEBUG ((LM_DEBUG, "handle_read_file called\n"));
-
-  result.message_block ().rd_ptr ()[result.bytes_transferred ()] = '\0';
-
-  ACE_DEBUG ((LM_DEBUG, "********************\n"));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "bytes_to_read", result.bytes_to_read ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "handle", result.handle ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "bytes_transfered", result.bytes_transferred ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "act", (u_long) result.act ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "success", result.success ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "completion_key", (u_long) result.completion_key ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "error", result.error ()));
-  ACE_DEBUG ((LM_DEBUG, "********************\n"));
-  ACE_DEBUG ((LM_DEBUG, "%s = %s\n", "message_block", result.message_block ().rd_ptr ()));
-
-  if (result.success ())
-    {
-      // Read successful: write this to the file.
-      if (this->wf_.write (result.message_block (),
-			   result.bytes_transferred ()) == -1)
-	{
-	  ACE_ERROR ((LM_ERROR, "%p\n", "ACE_Asynch_Write_File::write"));
-	  return;
-	}
-    }
-}
-
-void
-Simple_Tester::handle_write_file (const ACE_Asynch_Write_File::Result &result)
-{
-  ACE_DEBUG ((LM_DEBUG, "handle_write_File called\n"));
-  
-  // Reset pointers
-  result.message_block ().rd_ptr (result.message_block ().rd_ptr () - result.bytes_transferred ());
-
-  result.message_block ().rd_ptr ()[result.bytes_transferred ()] = '\0';
-  
-  ACE_DEBUG ((LM_DEBUG, "********************\n"));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "bytes_to_write", result.bytes_to_write ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "handle", result.handle ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "bytes_transfered", result.bytes_transferred ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "act", (u_long) result.act ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "success", result.success ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "completion_key", (u_long) result.completion_key ()));
-  ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "error", result.error ()));
-  ACE_DEBUG ((LM_DEBUG, "********************\n"));
-  ACE_DEBUG ((LM_DEBUG, "%s = %s\n", "message_block", result.message_block ().rd_ptr ()));
-
-  done = 1;
-}
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, "f:d:");
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    switch (c)
-      {
-      case 'f':
-	file = get_opt.optarg;
-	break;
-      case 'd':
-	dump_file = get_opt.optarg;
-	break;
-      default:
-	ACE_ERROR ((LM_ERROR, "%p.\n",
-		    "usage :\n"
-                    "-d <dumpfile>\n"
-		    "-f <file>\n"));
-	return -1;
-      }
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc, argv) == -1)
-    return -1;
-
-  Simple_Tester Simple_Tester;
-
-  if (Simple_Tester.open () == -1)
-    return -1;
-  
-  int success = 1;
-
-  while (success != -1  && !done)
-    {
-      // dispatch events
-      success = ACE_Proactor::instance ()->handle_events ();
-      
-      if (success == 0)
-        sleep (5);
-    }
-  return 0;
-}
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
diff --git a/examples/Reactor/Proactor/test_aiocb.cpp b/examples/Reactor/Proactor/test_aiocb.cpp
deleted file mode 100644
index 008121b744a..00000000000
--- a/examples/Reactor/Proactor/test_aiocb.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    proactor
-//
-// = FILENAME
-//    test_aiocb.cpp
-//
-// = DESCRIPTION
-//    Checkout $ACE_ROOT/examples/Reactor/Proactor/test_aiocb_ace.cpp,
-//    which is the ACE'ified version of this program. 
-// 
-// = COMPILE and RUN
-//    % CC -g -o test_aiocb -lrt test_aiocb.cpp
-//    % ./test_aiocb
-// 
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#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_)];
-}
-
-// 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;
-}
diff --git a/examples/Reactor/Proactor/test_aiocb_ace.cpp b/examples/Reactor/Proactor/test_aiocb_ace.cpp
deleted file mode 100644
index c642a1db2aa..00000000000
--- a/examples/Reactor/Proactor/test_aiocb_ace.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    proactor
-//
-// = FILENAME
-//    test_aiocb_ace.cpp
-//
-// = DESCRIPTION
-//    This program helps you to test the <aio_*> calls on a
-//    platform.
-//
-//    Before running this test, make sure the platform can 
-//    support POSIX <aio_> calls, using
-//    ACE_ROOT/tests/Aio_Platform_Test.
-// 
-//    This program tests the AIOCB (AIO Control Blocks) based
-//    completion approach which uses <aio_suspend> for completion
-//    querying. 
-// 
-//    If this test is successful, ACE_POSIX_AIOCB_PROACTOR
-//    can be used on this platform.
-// 
-// = COMPILE and RUN
-//    % make
-//    % ./test_aiocb_ace
-// 
-// = AUTHOR
-//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/ACE.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_ (0),
-    aiocb_read_ (0),
-    buffer_write_ (0),
-    buffer_read_ (0)
-{
-  ACE_NEW (this->aiocb_write_,
-           struct aiocb);
-  ACE_NEW (this->aiocb_read_,
-           struct aiocb);
-}
-
-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_ = ACE_OS::open ("test_aio.log",
-                                O_RDWR | O_CREAT | O_TRUNC,
-                                0666); 
-  if (this->out_fd_ == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error: Opening file\n"),
-                      -1);
-
-  // Init the buffers.
-  this->buffer_write_ = ACE::strnew ("Welcome to the world of AIO... AIO Rules !!!");
-  ACE_DEBUG ((LM_DEBUG,
-              "The buffer : %s\n",
-              this->buffer_write_));
-  
-  // Allocate memory for the read buffer.
-  ACE_NEW_RETURN (this->buffer_read_,
-                  char [strlen (this->buffer_write_)],
-                  -1);
-
-  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)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "aio_write"),
-                      -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)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "aio_read"),
-                      -1);
-  
-  // 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);
-      ACE_DEBUG ((LM_DEBUG,
-                  "Result of <aio_suspend> : %d\n",
-                  return_val));
-
-      // Analyze return and error values.
-      if (aio_error (list_aiocb [0]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [0]) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%p\n",
-                               "aio_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
-        ACE_DEBUG ((LM_DEBUG, 
-                    "aio_error says aio is in progress\n"));
-      
-      if (aio_error (list_aiocb [1]) != EINPROGRESS)
-        {
-          if (aio_return (list_aiocb [1]) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%p\n",
-                               "aio_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
-        ACE_DEBUG ((LM_DEBUG, 
-                    "aio_error says aio is in progress\n"));
-      
-      // Is it done?
-      if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0))
-        done = 1;
-    }
-
-  ACE_DEBUG ((LM_DEBUG, 
-              "Both the AIO operations done.\n"
-              "The buffer is : %s\n",
-              this->buffer_read_));
-  
-  return 0;
-}
-
-int
-main (int argc, char **argv)
-{
-  Test_Aio test_aio;
-
-  if (test_aio.init () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "AIOCB test failed:\n"
-                       "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"),
-                      -1);
-  
-  if (test_aio.do_aio () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "AIOCB test failed:\n"
-                       "ACE_POSIX_AIOCB_PROACTOR may not work in this platform\n"),
-                      -1);
-  
-  ACE_DEBUG ((LM_DEBUG,
-              "AIOCB test successful:\n"
-              "ACE_POSIX_AIOCB_PROACTOR should work in this platform\n"));
-  
-  return 0;
-}
diff --git a/examples/Reactor/Proactor/test_aiosig.cpp b/examples/Reactor/Proactor/test_aiosig.cpp
deleted file mode 100644
index 1746a10a49c..00000000000
--- a/examples/Reactor/Proactor/test_aiosig.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//     test_aiosig.cpp
-//
-// = DESCRITPTION
-//     Check out test_aiosig_ace.cpp, the ACE'ified version of this
-//     program. This program may not be uptodate.
-//
-// = COMPILATION
-//     CC -g -o test_aiosig -lrt test_aiosig.cpp   
-//
-// = RUN
-//     ./test_aiosig
-//
-// = AUTHOR
-//     Programming for the Real World. Bill O. GallMeister.
-//     Modified by Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// =====================================================================
-
-
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#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;
-}
diff --git a/examples/Reactor/Proactor/test_aiosig_ace.cpp b/examples/Reactor/Proactor/test_aiosig_ace.cpp
deleted file mode 100644
index bfb36d78b46..00000000000
--- a/examples/Reactor/Proactor/test_aiosig_ace.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//     test_aiosig_sig.cpp
-//
-// = DESCRITPTION
-//     This program helps you to test the <aio_*> calls on a
-//     platform. 
-//     Before running this test, make sure the platform can
-//     support POSIX <aio_> calls, using ACE_ROOT/tests/Aio_Plaform_Test.cpp
-// 
-//     This  program tests the Signal based completion approach which 
-//     uses <sigtimedwait> for completion querying. 
-//     If this test is successful, ACE_POSIX_SIG_PROACTOR
-//     can be used on this platform.
-// 
-//     This program is a ACE version of the 
-//     $ACE_ROOT/examples/Reactor/Proactor/test_aiosig.cpp, with
-//     ACE_DEBUGs and Message_Blocks.
-//
-//     This test does the following:
-//     Issue two <aio_read>s.
-//     Assign SIGRTMIN as the notification signal.
-//     Mask these signals from delivery.
-//     Receive this signal by doing <sigtimedwait>.
-//     Wait for two completions (two signals)
-// 
-// = COMPILATION
-//     make 
-//
-// = RUN
-//     ./test_aiosig_ace
-//
-// = AUTHOR
-//     Programming for the Real World. Bill O. GallMeister.
-//     Modified by Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// =====================================================================
-
-#include "ace/Message_Block.h"
-
-static ACE_HANDLE file_handle = ACE_INVALID_HANDLE;
-static ACE_Message_Block mb1 (BUFSIZ + 1);
-static ACE_Message_Block mb2 (BUFSIZ + 1);
-static aiocb aiocb1;
-static aiocb aiocb2;
-static sigset_t completion_signal;
-
-// Function prototypes.
-static int setup_signal_delivery (void);
-static int issue_aio_calls (void);
-static int query_aio_completions (void);
-static int test_aio_calls (void);
-static void null_handler (int signal_number, siginfo_t *info, void *context);
-static int setup_signal_handler (int signal_number);
-
-static int
-setup_signal_delivery (void)
-{
-  // = Mask all the signals.
-  
-  sigset_t full_set;
-  
-  // Get full set.
-  if (sigfillset (&full_set) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "sigfillset failed"),
-                      -1);
-  
-  // Mask them.
-  if (ACE_OS::pthread_sigmask (SIG_SETMASK, &full_set, 0) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:(%P | %t):%p\n",
-                       "pthread_sigmask failed"),
-                      -1);
-  
-  // = Make a mask with SIGRTMIN only. We use only that signal to
-  //   issue <aio_>'s.
-  
-  if (sigemptyset (&completion_signal) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p:Couldnt init the RT completion signal set\n"),
-                      -1);
-
-  if (sigaddset (&completion_signal,
-                 SIGRTMIN) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p:Couldnt init the RT completion signal set\n"),
-                      -1);
-
-  // Set up signal handler for this signal.
-  return setup_signal_handler (SIGRTMIN);
-}
-
-static 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)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Error:%p:Proactor couldnt do sigaction for the RT SIGNAL"),
-                      -1);
-  return 0;
-}
-
-
-static int
-issue_aio_calls (void)
-{
-  // Setup AIOCB.
-  aiocb1.aio_fildes = file_handle;
-  aiocb1.aio_offset = 0;
-  aiocb1.aio_buf = mb1.wr_ptr ();
-  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.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Erro:%p:Asynch_Read_Stream: aio_read queueing failed\n"),
-                      -1);
-
-  // Setup AIOCB.
-  aiocb2.aio_fildes = file_handle;
-  aiocb2.aio_offset = BUFSIZ + 1;
-  aiocb2.aio_buf = mb2.wr_ptr ();
-  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.
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Erro:%p:Asynch_Read_Stream: aio_read queueing failed\n"),
-                      -1);
-
-  return 0;
-}
-
-static int
-query_aio_completions (void)
-{
-  for (size_t 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 = ACE_INFINITE;
-      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)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error:%p:Error waiting for RT completion signals\n"),
-                          -1);
-
-      // RT completion signals returned.
-      if (sig_return != SIGRTMIN)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
-                           sig_return),
-                          -1);
-
-      // @@ Debugging.
-      ACE_DEBUG ((LM_DEBUG,
-                  "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)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Inconsistent signal number (%d) in the signal info block\n",
-                           sig_info.si_signo),
-                          -1);
-
-      // @@ Debugging.
-      ACE_DEBUG ((LM_DEBUG,
-                  "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))
-        ACE_ERROR_RETURN ((LM_DEBUG,
-                           "Unexpected signal code (%d) returned on completion querying\n",
-                           sig_info.si_code),
-                          -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)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p:Invalid control block was sent to <aio_error> for compleion querying\n"),
-                          -1);
-
-      if (error_code != 0)
-        // Error occurred in the <aio_>call. Return the errno
-        // corresponding to that <aio_> call.
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p:An AIO call has failed\n"),
-                          error_code);
-
-      // No error occured in the AIO operation.
-      int nbytes = aio_return (aiocb_ptr);
-      if (nbytes == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p:Invalid control block was send to <aio_return>\n"),
-                          -1);
-      if (number_of_compleions == 0)
-        // Print the buffer.
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n Number of bytes transferred : %d\n The buffer : %s \n",
-                    nbytes,
-                    mb1.rd_ptr ()));
-      else
-        // Print the buffer.
-        ACE_DEBUG ((LM_DEBUG,
-                    "\n Number of bytes transferred : %d\n The buffer : %s \n",
-                    nbytes,
-                    mb2.rd_ptr ()));
-    }
-
-  return 0;
-}
-
-static int
-test_aio_calls (void)
-{
-  // Set up the input file.
-  // Open file (in SEQUENTIAL_SCAN mode)
-  file_handle = ACE_OS::open ("test_aiosig_ace.cpp",
-                              O_RDONLY);
-
-  if (file_handle == ACE_INVALID_HANDLE)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "ACE_OS::open"),
-                      -1);
-
-  if (setup_signal_delivery () == -1)
-    return -1;
-
-  if (issue_aio_calls () == -1)
-    return -1;
-
-  if (query_aio_completions () == -1)
-    return -1;
-
-  return 0;
-}
-
-static void
-null_handler (int signal_number,
-              siginfo_t */* info */,
-              void * /* context */)
-{
-  ACE_ERROR ((LM_ERROR,
-              "Error:%s:Signal number %d\n"
-              "Mask all the RT signals for this thread",
-              "ACE_POSIX_SIG_Proactor::null_handler called",
-              signal_number));
-}
-
-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;
-}
diff --git a/examples/Reactor/Proactor/test_end_event_loop.cpp b/examples/Reactor/Proactor/test_end_event_loop.cpp
deleted file mode 100644
index 70eff0e5a1c..00000000000
--- a/examples/Reactor/Proactor/test_end_event_loop.cpp
+++ /dev/null
@@ -1,170 +0,0 @@
-// $Id$
-// ============================================================================
-//
-// = FILENAME
-//     test_end_event_loop.cpp
-//
-// = DESCRITPTION
-//     This program tests the event loop mechanism of the
-//     Proactor. To end the event loop, threads that are blocked in
-//     waiting for completions are  woken up and the event loop comes
-//     to the end. This is tested in this program.
-// 
-//     Threads are doing <run_event_loop> with/without time_out
-//     values and the main thread calls <end_event_loop>.
-//
-// = COMPILATION
-//     make
-//
-// = RUN
-//     ./test_end_event_loop
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// =====================================================================
-
-#include "ace/Proactor.h"
-#include "ace/Synch.h"
-#include "ace/Task.h"
-#include "ace/WIN32_Proactor.h"
-#include "ace/POSIX_Proactor.h"
-
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
-// This only works on Win32 platforms and on Unix platforms supporting
-// POSIX aio calls.
-
-class ACE_Export My_Task: public ACE_Task <ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //   
-  //     Contains thread functions which execute event loops. Each 
-  //     thread waits for a different signal.
-  //
-public:
-  // Constructor.
-  My_Task (void)
-    : time_flag_ (0)
-    {}
-
-  
-  virtual ~My_Task (void) {}
-  // Destructor.
-
-  // If time_flag is zero do the eventloop indefinitely, otherwise do
-  // it for finite amount of time (13secs!!!).
-  int open (void *timed_event_loop)
-    {
-      // Set the local variable.
-      if (timed_event_loop == 0)
-        this->time_flag_ = 0;
-      else
-        this->time_flag_ = 1;
-      
-      // Spawn the threads.
-      if (this->activate (THR_NEW_LWP, 5) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%N:%l:%p\n",
-                           "My_Task:open: <activate> failed"),
-                          -1);
-      
-      return 0;
-    }
-  
-  // Thread function.
-  int svc (void)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t):Starting svc routine\n"));
-      
-      if (this->time_flag_)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t):Going to do *timed* <run_event_loop> \n"));
-
-          ACE_Time_Value run_time (13);
-          
-          if (ACE_Proactor::instance ()->run_event_loop (run_time) == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t):%p.\n",
-                               "<Proactor::run_event_loop> failed"),
-                              -1);
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t):Going to do *indefinite* <run_event_loop> \n"));
-          
-          if (ACE_Proactor::instance ()->run_event_loop () == -1)
-            ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t):%p.\n",
-                               "<Proactor::run_event_loop> failed"),
-                              -1);
-        }
-      return 0;
-    };
-  
-private:
-  int time_flag_;
-  // If zero, indefinite event loop, otherwise timed event loop. 
-};
-
-int
-main (int argc, char *argv [])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P | %t):Test starts \n"));
-
-  // Let us get the singleton proactor created here. This is very
-  // important. This will mask the signal used in the Proactor masked
-  // for the main thread (and all the threads).
-  ACE_Proactor *proactor = ACE_Proactor::instance ();
-  ACE_UNUSED_ARG (proactor);
-
-  My_Task task1, task2;
-
-  // Test the indefinite run event loop.
-  if (task1.open (0) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):Failed to <open> the task\n"),
-                      1);
-
-  // Test the indefinite run event loop. Just pass a non-zero.
-  if (task2.open ((void *)&task2) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):Failed to <open> the task\n"),
-                      1);
-  
-  // Give a gap.
-  ACE_OS::sleep (3);
-
-  // End the event loop.
-  if (ACE_Proactor::instance ()->end_event_loop () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:(%P | %t):Failed to <end_event_loop>\n"),
-                      1);
-  
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P | %t):Test ends\n"));
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Task <ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Task <ACE_NULL_SYNCH>
-#endif /* ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA */
-
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
-
-int 
-main (int, char *[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "This example cannot work with AIOCB_Proactor.\n"));
-  return 1;
-}
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
-
diff --git a/examples/Reactor/Proactor/test_end_event_loop.dsp b/examples/Reactor/Proactor/test_end_event_loop.dsp
deleted file mode 100644
index cd1ae741ffd..00000000000
--- a/examples/Reactor/Proactor/test_end_event_loop.dsp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Microsoft Developer Studio Project File - Name="test_end_event_loop" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=test_end_event_loop - 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 "test_end_event_loop.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 "test_end_event_loop.mak"\

- CFG="test_end_event_loop - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "test_end_event_loop - Win32 Release" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE "test_end_event_loop - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "test_end_event_loop - 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 /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 /nologo /subsystem:console /machine:I386

-

-!ELSEIF  "$(CFG)" == "test_end_event_loop - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "test_end"

-# PROP BASE Intermediate_Dir "test_end"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir "test_end"

-# PROP Intermediate_Dir "test_end"

-# 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 "..\..\..\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "test_end_event_loop - Win32 Release"

-# Name "test_end_event_loop - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\test_end_event_loop.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp
index ca6cd9ea43e..cd262b39fef 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: test_timeout.cpp
 
 // ============================================================================
 //
@@ -11,38 +11,32 @@
 // = DESCRIPTION
 //
 //    This example application shows how to write programs that
-//    combine the Proactor and Reactor event loops. This is possible
-//    only on WIN32 platform.
+//    combine the Proactor and Reactor event loops
 //
 // = AUTHOR
 //    Irfan Pyarali
 // 
 // ============================================================================
 
+#include "ace/Proactor.h"
 #include "ace/Synch.h"
 #include "ace/Task.h"
-#include "ace/Proactor.h"
-#include "ace/WIn32_Proactor.h"
 
 ACE_RCSID(Proactor, test_multiple_loops, "$Id$")
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE))
-
 class Timeout_Handler : public ACE_Handler, public ACE_Event_Handler
-{
   // = TITLE
   //     Generic timeout handler.
-  
+{
 public:
   Timeout_Handler (void) 
     { 
     }
-  
-  // This is called by the Proactor. This is declared in ACE_Handler.
+
   virtual void handle_time_out (const ACE_Time_Value &tv,
-                                const void *arg)
+			       const void *arg)
+    // Print out when timeouts occur.
     {
-      // Print out when timeouts occur.
       ACE_DEBUG ((LM_DEBUG, "(%t) %d timeout occurred for %s @ %d.\n", 
 		  ++count_,
 		  (char *) arg,
@@ -55,8 +49,6 @@ public:
 	// Sleep for a while
 	ACE_OS::sleep (1);
     }
-
-  // This method is declared in ACE_Event_Handler.
   virtual int handle_timeout (const ACE_Time_Value &tv,
 			      const void *arg)
     {
@@ -71,35 +63,32 @@ private:
 class Worker : public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
-  
-  // Thread fuction.
   int svc (void)
-    {
-      ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n"));
-      
-      // Handle events for 13 seconds.
-      ACE_Time_Value run_time (13);
-      
-      // Try to become the owner
-      ACE_Reactor::instance ()->owner (ACE_Thread::self ());
-      
-      if (ACE_Reactor::run_event_loop (run_time) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1);
-      else
-        ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n"));
-      
-      return 0;
-    }
+  {
+    ACE_DEBUG ((LM_DEBUG, "(%t) Worker started\n"));
+
+    // Handle events for 13 seconds.
+    ACE_Time_Value run_time (13);
+
+    // Try to become the owner
+    ACE_Reactor::instance ()->owner (ACE_Thread::self ());
+
+    if (ACE_Reactor::run_event_loop (run_time) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1);
+    else
+      ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n"));
+
+    return 0;
+  }
 };
 
 int
 main (int, char *[])
 {
   Timeout_Handler handler;
-  ACE_WIN32_Proactor win32_proactor (0, 1);
-  ACE_Proactor proactor (&win32_proactor, 0, 0);
-  
-  ACE_Reactor::instance ()->register_handler (proactor.implementation ());
+  ACE_Proactor proactor (0, 0, 1);
+
+  ACE_Reactor::instance ()->register_handler (&proactor);
   
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
@@ -130,5 +119,3 @@ main (int, char *[])
 
   return 0;
 }
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE */
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 89fe5e67ef2..c4f8145fd20 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -21,7 +21,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Proactor.h"
 #include "ace/Asynch_IO.h"
-#include "ace/Asynch_IO_Impl.h"
 #include "ace/Asynch_Acceptor.h"
 #include "ace/INET_Addr.h"
 #include "ace/SOCK_Connector.h"
@@ -33,10 +32,6 @@
 
 ACE_RCSID(Proactor, test_proactor, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-  // This only works on Win32 platforms and on Unix platforms supporting
-  // POSIX aio calls.
-
 static char *host = 0;
 static u_short port = ACE_DEFAULT_SERVER_PORT;
 static char *file = "test_proactor.cpp";
@@ -93,8 +88,8 @@ private:
 };
 
 Receiver::Receiver (void)
-  : dump_file_ (ACE_INVALID_HANDLE),
-    handle_ (ACE_INVALID_HANDLE)
+  : handle_ (ACE_INVALID_HANDLE),
+    dump_file_ (ACE_INVALID_HANDLE)
 {
 }
 
@@ -151,15 +146,12 @@ Receiver::open (ACE_HANDLE handle,
   if (message_block.length () != 0)
     {
       // Fake the result so that we will get called back.
-      ACE_Asynch_Read_Stream_Result_Impl *fake_result =
-        ACE_Proactor::instance ()->create_asynch_read_stream_result (*this,
-                                                                     this->handle_,
-                                                                     duplicate,
-                                                                     initial_read_size,
-                                                                     0,
-                                                                     ACE_INVALID_HANDLE,
-                                                                     0,
-                                                                     0);
+      ACE_Asynch_Read_Stream::Result fake_result (*this,
+                                                  this->handle_,
+                                                  duplicate,
+                                                  initial_read_size,
+                                                  0,
+                                                  ACE_INVALID_HANDLE);
       
       size_t bytes_transferred = message_block.length ();
       
@@ -167,9 +159,8 @@ Receiver::open (ACE_HANDLE handle,
       // forward. Update it to the beginning position.
       duplicate.wr_ptr (duplicate.wr_ptr () - bytes_transferred);
 
-
       // This will call the callback.
-      fake_result->complete (message_block.length (), 1, 0);
+      fake_result.complete (bytes_transferred, 1, 0);
     }
   else 
     // Otherwise, make sure we proceed. Initiate reading the
@@ -303,9 +294,6 @@ private:
   ACE_Asynch_Read_File rf_;
   // rf (read file): for writing from the file
 
-  ACE_Asynch_Transmit_File tf_;
-  // Transmit file. 
-
   ACE_HANDLE input_file_;
   // File to read from
 
@@ -400,20 +388,23 @@ Sender::transmit_file (void)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_OS::open"), -1);
 
   // Open ACE_Asynch_Transmit_File
-  if (this->tf_.open (*this) == -1)
+  ACE_Asynch_Transmit_File tf;
+  if (tf.open (*this) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Transmit_File::open"), -1);
 
-  // Header and trailer data for the file.
-  // @@ What happens if header and trailer are the same?
+  // Header and trailer data for the file
   this->header_and_trailer_.header_and_trailer (&this->welcome_message_,
 						this->welcome_message_.length (),
 						this->welcome_message_.duplicate (),
 						this->welcome_message_.length ());
-  
+
+  // Starting position
+  cerr << "Staring position: " << ACE_OS::lseek (file_handle, 0L, SEEK_CUR) << endl;
+
   // Send it
-  if (this->tf_.transmit_file (file_handle,
+  if (tf.transmit_file (file_handle,
 			&this->header_and_trailer_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Transmit_File::transmit_file"), -1); 
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "ACE_Asynch_Transmit_File::transmit_file"), -1);
 
   return 0;
 }
@@ -436,9 +427,12 @@ Sender::handle_transmit_file (const ACE_Asynch_Transmit_File::Result &result)
   ACE_DEBUG ((LM_DEBUG, "%s = %d\n", "error", result.error ()));
   ACE_DEBUG ((LM_DEBUG, "********************\n"));
 
+  // Ending position
+  cerr << "Ending position: " << ACE_OS::lseek (result.file (), 0L, SEEK_CUR) << endl;
+
   // Done with file
   ACE_OS::close (result.file ());
-  
+
   this->transmit_file_done_ = 1;
   if (this->stream_write_done_)
     done = 1;
@@ -582,6 +576,7 @@ parse_args (int argc, char *argv[])
 int
 main (int argc, char *argv[])
 {
+  
   if (parse_args (argc, argv) == -1)
     return -1;
 
@@ -602,12 +597,12 @@ main (int argc, char *argv[])
   else if (sender.open (host, port) == -1)
     return -1;
 
-  int success = 1;
+  int error = 0;
 
-  while (success > 0  && !done)
+  while (!error && !done)
     // dispatch events
-    success = ACE_Proactor::instance ()->handle_events ();
-  
+    error = ACE_Proactor::instance ()->handle_events ();
+
   return 0;
 }
 
@@ -616,5 +611,3 @@ template class ACE_Asynch_Acceptor<Receiver>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Asynch_Acceptor<Receiver>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
diff --git a/examples/Reactor/Proactor/test_proactor.dsw b/examples/Reactor/Proactor/test_proactor.dsw
index 2d9c24fe896..3983844f0d6 100644
--- a/examples/Reactor/Proactor/test_proactor.dsw
+++ b/examples/Reactor/Proactor/test_proactor.dsw
@@ -3,18 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "test_end_event_loop"=.\test_end_event_loop.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "test_multiple_loops"=.\test_multiple_loops.dsp - Package Owner=<4>

 

 Package=<5>

@@ -27,18 +15,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "test_post_completion"=.\test_post_completion.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "test_proactor"=.\test_proactor.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 18884b294e0..bc1ab9c5e5e 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -12,12 +12,10 @@
 //
 //    This example application shows how to write event loops that
 //    handle events for some fixed amount of time. Note that any
-//    thread in the Proactor thread pool can call back the handler. On
-//    POSIX4 systems, this test works only with POSIX_SIG_Proactor,
-//    which can work with multiple threads.
+//    thread in the Proactor thread pool can call back the handler
 //
 // = AUTHOR
-//    Irfan Pyarali and Alexander Babu Arulanthu
+//    Irfan Pyarali
 // 
 // ============================================================================
 
@@ -27,59 +25,46 @@
 
 ACE_RCSID(Proactor, test_timeout, "$Id$")
 
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || \
-     (defined (ACE_HAS_AIO_CALLS)) && !defined (ACE_POSIX_AIOCB_PROACTOR))
-  // This only works on Win32 platforms and on Unix platforms supporting
-  // POSIX aio calls.
-
 class Timeout_Handler : public ACE_Handler
-{
   // = TITLE
   //     Generic timeout handler.
+{
 public:
-  Timeout_Handler (void)
-    : start_time_ (ACE_OS::gettimeofday ())
-    {
+  Timeout_Handler (void) 
+    { 
     }
 
   virtual void handle_time_out (const ACE_Time_Value &tv,
 				const void *arg)
+    // Print out when timeouts occur.
     {
-      // Print out when timeouts occur.
       ACE_DEBUG ((LM_DEBUG, "(%t) %d timeout occurred for %s @ %d.\n", 
 		  ++count_,
 		  (char *) arg,
-		  (tv - this->start_time_).sec ()));
-      
+		  tv.sec ()));
       // Sleep for a while
       ACE_OS::sleep (4);
     }
   
 private:
   ACE_Atomic_Op <ACE_Thread_Mutex, int> count_;
-  // Number of the timer event.
-  
-  ACE_Time_Value start_time_;
-  // Starting time of the test.
 };
 
 class Worker : public ACE_Task <ACE_NULL_SYNCH>
 {
 public:
-  int svc (void) 
-    {
-      // Handle events for 13 seconds.
-      ACE_Time_Value run_time (13);
-      
-      ACE_DEBUG ((LM_DEBUG, "(%t):Starting svc routine\n"));
-      
-      if (ACE_Proactor::run_event_loop(run_time) == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, "(%t):%p.\n", "Worker::svc"), -1);
-      
+  int svc (void)
+  {
+    // Handle events for 13 seconds.
+    ACE_Time_Value run_time (13);
+
+    if (ACE_Proactor::run_event_loop(run_time) == -1)
+      ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1);
+    else
       ACE_DEBUG ((LM_DEBUG, "(%t) work complete\n"));
-      
-      return 0;
-    }
+
+    return 0;
+  }
 };
 
 int
@@ -90,44 +75,24 @@ main (int, char *[])
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
   if (ACE_Proactor::instance ()->schedule_timer (handler,
-                                                 (void *) "Foo",
-                                                 ACE_Time_Value::zero,
-                                                 foo_tv) == -1)
+						       (void *) "Foo",
+						       ACE_Time_Value::zero,
+						       foo_tv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
 
   // Register a 3 second timer.
   ACE_Time_Value bar_tv (3);
   if (ACE_Proactor::instance ()->schedule_timer (handler,
-                                                 (void *) "Bar",
-                                                 ACE_Time_Value::zero,
-                                                 bar_tv) == -1)
+						       (void *) "Bar",
+						       ACE_Time_Value::zero,
+						       bar_tv) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
 
   Worker worker;
-  
+
   if (worker.activate (THR_NEW_LWP, 10) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "main"), -1);
 
   ACE_Thread_Manager::instance ()->wait ();
-  
   return 0;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Atomic_Op<ACE_Thread_Mutex, int>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Atomic_Op<ACE_Thread_Mutex, int>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#else /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
-
-int 
-main (int, char *[])
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "This example is multithreaded version of test_timeout_st.cpp\n"
-              "This doesnt work on this platform !!!\n"));
-  return 1;
-}
-
-#endif /*  ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS && !ACE_POSIX_AIOCB_PROACTOR*/
diff --git a/examples/Reactor/Proactor/test_timeout_st.cpp b/examples/Reactor/Proactor/test_timeout_st.cpp
deleted file mode 100644
index cf8372b6c37..00000000000
--- a/examples/Reactor/Proactor/test_timeout_st.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    examples
-// 
-// = FILENAME
-//    test_timeout_st.cpp
-//
-// = DESCRIPTION
-//
-//    This example application shows how to write event loops that
-//    handle events for some fixed amount of time. This is the single
-//    threaded version of the test_timeout.cpp application.
-//
-// = AUTHOR
-//    Irfan Pyarali and Alexander Babu Arulanthu
-// 
-// ============================================================================
-
-#include "ace/Proactor.h"
-
-ACE_RCSID(Proactor, test_timeout, "$Id$")
-
-#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
-// This only works on Win32 platforms and on Unix platforms supporting
-// POSIX aio calls.
-
-class Timeout_Handler : public ACE_Handler
-{
-  // = TITLE
-  //     Generic timeout handler.
-  
-public:
-  Timeout_Handler (void)
-    : count_ (0), 
-      start_time_ (ACE_OS::gettimeofday ())
-    { 
-    }
-
-  virtual void handle_time_out (const ACE_Time_Value &tv,
-				const void *arg)
-    {
-      // Print out when timeouts occur.
-      ACE_DEBUG ((LM_DEBUG, "(%t) %d timeout occurred for %s @ %d.\n", 
-		  ++count_,
-		  (char *) arg,
-		  (tv - this->start_time_).sec ()));
-    }
-  
-private:
-  int count_;
-  // Sequence number for the timeouts.
-  
-  ACE_Time_Value start_time_;
-  // Starting time of the test.
-};
-
-
-int
-main (int, char *[])
-{
-  Timeout_Handler handler;
-  
-  // Register a 2 second timer.
-  ACE_Time_Value foo_tv (2);
-  if (ACE_Proactor::instance ()->schedule_timer (handler,
-                                                 (void *) "Foo",
-                                                 ACE_Time_Value::zero,
-                                                 foo_tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
-  
-  // Register a 3 second timer.
-  ACE_Time_Value bar_tv (3);
-  if (ACE_Proactor::instance ()->schedule_timer (handler,
-                                                 (void *) "Bar",
-                                                 ACE_Time_Value::zero,
-                                                 bar_tv) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
-
-  // Handle events for 13 seconds.
-  ACE_Time_Value run_time (13);
-  
-  ACE_DEBUG ((LM_DEBUG, "Starting event loop\n"));
-  
-  // Run the event loop.
-  if (ACE_Proactor::run_event_loop(run_time) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "(%t):%p.\n", "Worker::svc"),
-                      1);
-  
-  ACE_DEBUG ((LM_DEBUG, "Ending event loop\n"));
-  
-  return 0;
-}
-
-#endif /* ACE_WIN32 && !ACE_HAS_WINCE || ACE_HAS_AIO_CALLS*/
diff --git a/examples/Reactor/WFMO_Reactor/APC.DSP b/examples/Reactor/WFMO_Reactor/APC.DSP
index 29b2fcce4f9..a225676e17c 100644
--- a/examples/Reactor/WFMO_Reactor/APC.DSP
+++ b/examples/Reactor/WFMO_Reactor/APC.DSP
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="APC" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# Microsoft Developer Studio Generated Build File, Format Version 5.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
diff --git a/examples/Reactor/WFMO_Reactor/Abondoned.dsp b/examples/Reactor/WFMO_Reactor/Abondoned.dsp
index d113db90ba6..7e91e07a8c1 100644
--- a/examples/Reactor/WFMO_Reactor/Abondoned.dsp
+++ b/examples/Reactor/WFMO_Reactor/Abondoned.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Abondoned" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Console_Input.dsp b/examples/Reactor/WFMO_Reactor/Console_Input.dsp
index b5f5b870dde..dee20eef64b 100644
--- a/examples/Reactor/WFMO_Reactor/Console_Input.dsp
+++ b/examples/Reactor/WFMO_Reactor/Console_Input.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Console_Input" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Directory_Changes.dsp b/examples/Reactor/WFMO_Reactor/Directory_Changes.dsp
index cea930eac62..db31714291a 100644
--- a/examples/Reactor/WFMO_Reactor/Directory_Changes.dsp
+++ b/examples/Reactor/WFMO_Reactor/Directory_Changes.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Directory_Changes" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Exceptions.dsp b/examples/Reactor/WFMO_Reactor/Exceptions.dsp
index 51a8324d72f..5a854c2e609 100644
--- a/examples/Reactor/WFMO_Reactor/Exceptions.dsp
+++ b/examples/Reactor/WFMO_Reactor/Exceptions.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Exceptions" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Handle_Close.dsp b/examples/Reactor/WFMO_Reactor/Handle_Close.dsp
index 4045f734c40..852fe3c339b 100644
--- a/examples/Reactor/WFMO_Reactor/Handle_Close.dsp
+++ b/examples/Reactor/WFMO_Reactor/Handle_Close.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Handle_Close" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Multithreading.dsp b/examples/Reactor/WFMO_Reactor/Multithreading.dsp
index 378d7483ca7..d6960735080 100644
--- a/examples/Reactor/WFMO_Reactor/Multithreading.dsp
+++ b/examples/Reactor/WFMO_Reactor/Multithreading.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Multithreading" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Network_Events.dsp b/examples/Reactor/WFMO_Reactor/Network_Events.dsp
index be0d021963e..f9e9f82bce4 100644
--- a/examples/Reactor/WFMO_Reactor/Network_Events.dsp
+++ b/examples/Reactor/WFMO_Reactor/Network_Events.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Network_Events" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.dsp b/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.dsp
index c8d344a9966..802e4a10b71 100644
--- a/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.dsp
+++ b/examples/Reactor/WFMO_Reactor/Prerun_State_Changes.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Prerun_State_Changes" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Registration.dsp b/examples/Reactor/WFMO_Reactor/Registration.dsp
index c716a2a552c..6ec245c5e29 100644
--- a/examples/Reactor/WFMO_Reactor/Registration.dsp
+++ b/examples/Reactor/WFMO_Reactor/Registration.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Registration" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Registry_Changes.dsp b/examples/Reactor/WFMO_Reactor/Registry_Changes.dsp
index 6effdcc5759..818d20bc4b5 100644
--- a/examples/Reactor/WFMO_Reactor/Registry_Changes.dsp
+++ b/examples/Reactor/WFMO_Reactor/Registry_Changes.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Registry_Changes" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Removals.dsp b/examples/Reactor/WFMO_Reactor/Removals.dsp
index f888c8dc336..ec134a8b5b2 100644
--- a/examples/Reactor/WFMO_Reactor/Removals.dsp
+++ b/examples/Reactor/WFMO_Reactor/Removals.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Removals" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Talker.dsp b/examples/Reactor/WFMO_Reactor/Talker.dsp
index 500af90cee6..2762406823b 100644
--- a/examples/Reactor/WFMO_Reactor/Talker.dsp
+++ b/examples/Reactor/WFMO_Reactor/Talker.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Talker" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Timeouts.dsp b/examples/Reactor/WFMO_Reactor/Timeouts.dsp
index 764458116ab..1cbe5204645 100644
--- a/examples/Reactor/WFMO_Reactor/Timeouts.dsp
+++ b/examples/Reactor/WFMO_Reactor/Timeouts.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Timeouts" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/Window_Messages.dsp b/examples/Reactor/WFMO_Reactor/Window_Messages.dsp
index 5be34bd2132..6cc17adad04 100644
--- a/examples/Reactor/WFMO_Reactor/Window_Messages.dsp
+++ b/examples/Reactor/WFMO_Reactor/Window_Messages.dsp
@@ -1,5 +1,5 @@
 # Microsoft Developer Studio Project File - Name="Window_Messages" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

diff --git a/examples/Reactor/WFMO_Reactor/test_handle_close.cpp b/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
index 71f57d2c63e..7159c9ae96b 100644
--- a/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_handle_close.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    examples
-//
+// 
 // = FILENAME
 //    test_handle_close.cpp
 //
@@ -17,7 +17,7 @@
 //
 // = AUTHOR
 //    Irfan Pyarali
-//
+// 
 // ============================================================================
 
 #include "ace/Get_Opt.h"
@@ -38,9 +38,6 @@ static int opt_select_reactor = 0;
 // Make pipe readable in main()
 static int write_to_pipe_in_main = 0;
 
-// Cancel reads
-static int cancel_reads = 0;
-
 // Write some data to the pipe.  This will cause handle_input to get
 // called.
 void
@@ -48,9 +45,9 @@ write_to_pipe (ACE_Pipe &pipe)
 {
   char *data = "hello";
   int len = ACE_OS::strlen (data);
-
+  
   int result = ACE::send (pipe.write_handle (),
-                          data,
+                          data, 
                           len);
   ACE_ASSERT (result == len);
 }
@@ -72,32 +69,20 @@ public:
   int handle_close (ACE_HANDLE handle,
                     ACE_Reactor_Mask close_mask)
   {
-    ACE_DEBUG ((LM_DEBUG,
-                "Handler::handle_close called with mask = %d\n",
+    ACE_DEBUG ((LM_DEBUG, 
+                "Handle closed called with mask = %d\n",
                 close_mask));
     return 0;
   }
 
   int handle_input (ACE_HANDLE handle)
   {
-    ACE_DEBUG ((LM_DEBUG, "Handler::handle_input\n"));
-
     // Remove for reading
     return -1;
   }
 
   int handle_output (ACE_HANDLE handle)
   {
-    ACE_DEBUG ((LM_DEBUG, "Handler::handle_output\n"));
-
-    // Optionally cancel reads
-    if (cancel_reads)
-      {
-        int result = ACE_Reactor::instance ()->cancel_wakeup (this,
-                                                              ACE_Event_Handler::READ_MASK);
-        ACE_ASSERT (result != -1);
-      }
-
     // Write to the pipe; this causes handle_input to get called.
     if (!write_to_pipe_in_main)
       write_to_pipe (this->pipe_);
@@ -110,33 +95,17 @@ protected:
   ACE_Pipe &pipe_;
 };
 
-class Different_Handler : public ACE_Event_Handler
+class Different_Handler : public Handler
 {
 public:
 
   Different_Handler (ACE_Pipe &pipe)
-    : pipe_ (pipe)
-  {
-  }
-
-  ACE_HANDLE get_handle (void) const
-  {
-    return this->pipe_.read_handle ();
-  }
-
-  int handle_close (ACE_HANDLE handle,
-                    ACE_Reactor_Mask close_mask)
-  {
-    ACE_DEBUG ((LM_DEBUG,
-                "Different_Handler::handle_close called with mask = %d\n",
-                close_mask));
-    return 0;
+    : Handler (pipe)
+  {    
   }
 
   int handle_input (ACE_HANDLE handle)
   {
-    ACE_DEBUG ((LM_DEBUG, "Different_Handler::handle_input\n"));
-
     // Remove for reading
     int result = ACE_Reactor::instance ()->remove_handler (this,
                                                            ACE_Event_Handler::READ_MASK);
@@ -147,33 +116,10 @@ public:
 
   int handle_output (ACE_HANDLE handle)
   {
-    ACE_DEBUG ((LM_DEBUG, "Different_Handler::handle_output\n"));
-
-    // Add for reading
-    int result = ACE_Reactor::instance ()->mask_ops (this,
-                                                     ACE_Event_Handler::READ_MASK,
-                                                     ACE_Reactor::ADD_MASK);
-    ACE_Reactor_Mask old_masks =
-      ACE_Event_Handler::WRITE_MASK |
-      ACE_Event_Handler::EXCEPT_MASK;
-
-    ACE_ASSERT (result == old_masks);
-
-    // Get new masks
-    result = ACE_Reactor::instance ()->mask_ops (this,
-                                                 ACE_Event_Handler::NULL_MASK,
-                                                 ACE_Reactor::GET_MASK);
-    ACE_Reactor_Mask current_masks =
-      ACE_Event_Handler::READ_MASK |
-      ACE_Event_Handler::WRITE_MASK |
-      ACE_Event_Handler::EXCEPT_MASK;
-
-    ACE_ASSERT (result == current_masks);
-
     // Remove for writing
     ACE_Reactor_Mask mask = ACE_Event_Handler::WRITE_MASK | ACE_Event_Handler::DONT_CALL;
-    result = ACE_Reactor::instance ()->remove_handler (this,
-                                                       mask);
+    int result = ACE_Reactor::instance ()->remove_handler (this,
+                                                           mask);
     ACE_ASSERT (result == 0);
 
     // Write to the pipe; this causes handle_input to get called.
@@ -182,9 +128,6 @@ public:
 
     return 0;
   }
-
-protected:
-  ACE_Pipe &pipe_;
 };
 
 
@@ -219,7 +162,7 @@ main (int argc, char *argv[])
   int result = 0;
 
   // Parse args
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("swmc"), 1);
+  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("swm"), 1);
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
@@ -232,9 +175,6 @@ main (int argc, char *argv[])
       case 'm':
         write_to_pipe_in_main = 1;
         break;
-      case 'c':
-        cancel_reads = 1;
-        break;
       }
 
   // Create pipes
@@ -261,31 +201,27 @@ main (int argc, char *argv[])
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor)
     impl = auto_ptr<ACE_Reactor_Impl> (ACE_Reactor::instance ()->implementation ());
-
+  
   // Register handlers
-  ACE_Reactor_Mask handler_mask =
-    ACE_Event_Handler::READ_MASK |
-    ACE_Event_Handler::WRITE_MASK |
-    ACE_Event_Handler::EXCEPT_MASK;
-
-  ACE_Reactor_Mask different_handler_mask =
+  ACE_Reactor_Mask mask = 
+    ACE_Event_Handler::READ_MASK | 
     ACE_Event_Handler::WRITE_MASK |
     ACE_Event_Handler::EXCEPT_MASK;
-
+    
   result = ACE_Reactor::instance ()->register_handler (&handler,
-                                                       handler_mask);
+                                                       mask);
   ACE_ASSERT (result == 0);
 
   result = ACE_Reactor::instance ()->register_handler (&different_handler,
-                                                       different_handler_mask);
+                                                       mask);
   ACE_ASSERT (result == 0);
-
-  // Write to the pipe; this causes handle_input to get called.
+  
+  // Write to the pipe; this causes handle_input to get called.  
   if (write_to_pipe_in_main)
     {
       write_to_pipe (pipe1);
       write_to_pipe (pipe2);
-    }
+    }      
 
   // Note that handle_output will get called automatically since the
   // pipe is writable!
@@ -294,7 +230,5 @@ main (int argc, char *argv[])
   ACE_Time_Value time (3);
   ACE_Reactor::instance ()->run_event_loop (time);
 
-  ACE_DEBUG ((LM_DEBUG, "\nClosing down the application\n\n"));
-
   return 0;
 }
diff --git a/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp b/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
index ddd54e682f0..182ed6d3e2c 100644
--- a/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_prerun_state_changes.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    examples
-//
+// 
 // = FILENAME
 //    test_prerun_state_changes.cpp
 //
@@ -12,11 +12,11 @@
 //
 //    Tests the Reactor's ability to handle state changes before
 //    getting a chance to run.
-//
+//    
 // = AUTHOR
-//
+//    
 //    Irfan Pyarali
-//
+// 
 // ============================================================================
 
 #include "ace/Reactor.h"
@@ -31,8 +31,8 @@ class Event_Handler : public ACE_Event_Handler
 public:
   virtual int handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "event handler %d closed.\n",
+      ACE_DEBUG ((LM_DEBUG, 
+                  "event handler %d closed.\n", 
                   (int) handle));
       delete this;
       return 0;
@@ -45,17 +45,17 @@ main (int argc, char *argv[])
   ACE_HANDLE handle = (ACE_HANDLE) ::socket (PF_INET, SOCK_STREAM, 0);
 
   Event_Handler *event_handler = new Event_Handler;
-
-  ACE_ASSERT (ACE_Reactor::instance ()->register_handler (handle,
-                                                          event_handler,
+  
+  ACE_ASSERT (ACE_Reactor::instance ()->register_handler (handle, 
+                                                          event_handler, 
                                                           ACE_Event_Handler::READ_MASK) == 0);
-
-  ACE_ASSERT (ACE_Reactor::instance ()->register_handler (handle,
-                                                          event_handler,
+  
+  ACE_ASSERT (ACE_Reactor::instance ()->register_handler (handle, 
+                                                          event_handler, 
                                                           ACE_Event_Handler::WRITE_MASK | ACE_Event_Handler::QOS_MASK) == 0);
-
-  ACE_ASSERT (ACE_Reactor::instance ()->remove_handler (handle,
-                                                        ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL) == 0);
+  
+  ACE_ASSERT (ACE_Reactor::instance ()->remove_handler (handle, 
+                                                        ACE_Event_Handler::READ_MASK) == 0);
 
   return 0;
 }
diff --git a/examples/Reactor/WFMO_Reactor/test_removals.cpp b/examples/Reactor/WFMO_Reactor/test_removals.cpp
index 2a826fb7d3f..9613b6748de 100644
--- a/examples/Reactor/WFMO_Reactor/test_removals.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_removals.cpp
@@ -4,7 +4,7 @@
 //
 // = LIBRARY
 //    examples
-//
+// 
 // = FILENAME
 //    test_removals.cpp
 //
@@ -13,11 +13,11 @@
 //    Tests the Reactor's ability to handle simultaneous events.  If
 //    you pass anything on the command-line, then each handler
 //    requests to be removed from the Reactor after each event.
-//
+//    
 // = AUTHOR
 //    Tim Harrison
 //    Irfan Pyarali
-//
+// 
 // ============================================================================
 
 #include "ace/Reactor.h"
@@ -36,7 +36,7 @@ class Event_Handler : public ACE_Event_Handler
 //    created with -close_down- it returns -1 from handle signal.
 {
 public:
-  Event_Handler (int event_number,
+  Event_Handler (int event_number, 
 		 int close_down)
     : event_number_ (event_number),
     close_down_ (close_down)
@@ -97,7 +97,7 @@ main (int argc, char *argv[])
 	  break;
 	}
       if (result == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "main"), -1);
-    }
+	ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "main"), -1);	
+    }	
   return 0;
 }
diff --git a/examples/Reactor/WFMO_Reactor/test_talker.cpp b/examples/Reactor/WFMO_Reactor/test_talker.cpp
index f8bba275af5..f9a0c2b8a4e 100644
--- a/examples/Reactor/WFMO_Reactor/test_talker.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_talker.cpp
@@ -133,7 +133,6 @@
 // ============================================================================
 
 #include "ace/Reactor.h"
-#include "ace/WIN32_Proactor.h"
 #include "ace/Proactor.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
@@ -513,11 +512,7 @@ int
 main (int argc, char *argv[])
 {
   // Let the proactor know that it will be used with Reactor
-  // Create specific proactor
-  ACE_WIN32_Proactor win32_proactor (0, 0, 1);
-  // Get the interface proactor
-  ACE_Proactor proactor (&win32_proactor);
-  // Put it as the instance.
+  ACE_Proactor proactor (0, 0, 1);
   ACE_Proactor::instance (&proactor);
 
   // Open handler for remote peer communications this will run from
@@ -541,7 +536,7 @@ main (int argc, char *argv[])
   // Register proactor with Reactor so that we can demultiplex
   // "waitable" events and I/O operations from a single thread.
   if (ACE_Reactor::instance ()->register_handler 
-      (ACE_Proactor::instance ()->implementation ()) != 0)
+      (ACE_Proactor::instance ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR, "%p failed to register Proactor.\n",
 		       argv[0]), -1);
 
diff --git a/examples/Service_Configurator/IPC-tests/client/Makefile b/examples/Service_Configurator/IPC-tests/client/Makefile
index 8937050e2b7..6f374cdf446 100644
--- a/examples/Service_Configurator/IPC-tests/client/Makefile
+++ b/examples/Service_Configurator/IPC-tests/client/Makefile
@@ -57,6 +57,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -98,6 +101,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -140,6 +146,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -178,6 +187,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -216,6 +228,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -249,6 +264,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -280,6 +298,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -309,6 +330,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -340,6 +364,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -376,6 +403,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Service_Configurator/IPC-tests/server/Makefile b/examples/Service_Configurator/IPC-tests/server/Makefile
index ad9b434c583..ab0fae310e4 100644
--- a/examples/Service_Configurator/IPC-tests/server/Makefile
+++ b/examples/Service_Configurator/IPC-tests/server/Makefile
@@ -60,6 +60,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -150,6 +153,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -242,6 +248,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -326,6 +335,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -425,6 +437,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -524,6 +539,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -610,6 +628,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -712,15 +733,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -735,6 +751,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -811,6 +830,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -897,6 +919,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -982,6 +1007,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1086,15 +1114,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1130,6 +1153,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Service_Configurator/Misc/Makefile b/examples/Service_Configurator/Misc/Makefile
index 26a5e9f2116..55a75220c04 100644
--- a/examples/Service_Configurator/Misc/Makefile
+++ b/examples/Service_Configurator/Misc/Makefile
@@ -53,6 +53,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -124,6 +127,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Shared_Malloc/Makefile b/examples/Shared_Malloc/Makefile
index 6bb757c1f6e..fe066a2f2b9 100644
--- a/examples/Shared_Malloc/Makefile
+++ b/examples/Shared_Malloc/Makefile
@@ -46,6 +46,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/Malloc.o .obj/Malloc.so .shobj/Malloc.o .shobj/Malloc.so: Malloc.cpp Options.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -59,8 +62,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.h \
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- Malloc.h \
+ $(ACE_ROOT)/ace/Log_Record.i Malloc.h \
  $(ACE_ROOT)/ace/Malloc.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
@@ -104,6 +106,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -117,7 +122,6 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Options.h
+ $(ACE_ROOT)/ace/Get_Opt.i Options.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Shared_Memory/Makefile b/examples/Shared_Memory/Makefile
index 95a988f0157..dadbd715d08 100644
--- a/examples/Shared_Memory/Makefile
+++ b/examples/Shared_Memory/Makefile
@@ -50,6 +50,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -72,6 +75,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/System_V_IPC/SV_Message_Queues/Makefile b/examples/System_V_IPC/SV_Message_Queues/Makefile
index 3ca2483ca1d..f1d354c1d4d 100644
--- a/examples/System_V_IPC/SV_Message_Queues/Makefile
+++ b/examples/System_V_IPC/SV_Message_Queues/Makefile
@@ -49,6 +49,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -108,6 +111,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -131,6 +137,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -197,6 +206,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/System_V_IPC/SV_Semaphores/Makefile b/examples/System_V_IPC/SV_Semaphores/Makefile
index 101e99a227a..edeac70c474 100644
--- a/examples/System_V_IPC/SV_Semaphores/Makefile
+++ b/examples/System_V_IPC/SV_Semaphores/Makefile
@@ -44,6 +44,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -101,6 +104,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
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/System_V_IPC/SV_Shared_Memory/Makefile b/examples/System_V_IPC/SV_Shared_Memory/Makefile
index 74678710cbd..82a0d950097 100644
--- a/examples/System_V_IPC/SV_Shared_Memory/Makefile
+++ b/examples/System_V_IPC/SV_Shared_Memory/Makefile
@@ -47,6 +47,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/examples/Threads/Makefile b/examples/Threads/Makefile
index 8a2e578e96b..7fd5092e963 100644
--- a/examples/Threads/Makefile
+++ b/examples/Threads/Makefile
@@ -72,6 +72,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -146,6 +149,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -221,6 +227,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -305,15 +314,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -336,6 +340,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -423,15 +430,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -462,6 +464,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -549,15 +554,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -591,6 +591,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -664,6 +667,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -741,6 +747,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -796,6 +805,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -851,6 +863,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -912,6 +927,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -987,6 +1005,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1071,15 +1092,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1105,6 +1121,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1189,15 +1208,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1222,6 +1236,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1307,15 +1324,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1341,6 +1353,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1425,15 +1440,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1459,6 +1469,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1543,15 +1556,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1577,6 +1585,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1650,6 +1661,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1734,15 +1748,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1768,6 +1777,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1842,6 +1854,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1926,15 +1941,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1959,6 +1969,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1972,8 +1985,7 @@ endif
  $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/Thread.i \
- TSS_Data.h \
+ $(ACE_ROOT)/ace/Thread.i TSS_Data.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -2003,6 +2015,9 @@ endif
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -2090,15 +2105,10 @@ endif
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/Threads/task_five.cpp b/examples/Threads/task_five.cpp
index b8d4847d9f1..27a17253eda 100644
--- a/examples/Threads/task_five.cpp
+++ b/examples/Threads/task_five.cpp
@@ -22,7 +22,7 @@ static size_t default_stack_size =      // Default stack size
   u_int loop_count = 0;
   u_int error_count = 0;
 
-class Test_Task : public ACE_Task<ACE_SYNCH>
+class Test_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   Test_Task (ACE_Thread_Manager *thrmgr = ACE_Service_Config::thr_mgr ());
@@ -36,7 +36,7 @@ public:
 };
 
 Test_Task::Test_Task (ACE_Thread_Manager *thrmgr)
-  : ACE_Task<ACE_SYNCH> (thrmgr)
+  : ACE_Task<ACE_MT_SYNCH> (thrmgr)
 {
 }
 
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/examples/Timer_Queue/Makefile b/examples/Timer_Queue/Makefile
index 2799e798b7f..84248064ff1 100644
--- a/examples/Timer_Queue/Makefile
+++ b/examples/Timer_Queue/Makefile
@@ -57,6 +57,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -146,15 +149,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -185,6 +183,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -259,8 +260,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Heap_T.cpp \
  $(ACE_ROOT)/ace/Select_Reactor_T.i \
  $(ACE_ROOT)/ace/Select_Reactor.i \
- Driver.h \
- $(ACE_ROOT)/ace/Task.h \
+ Driver.h $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.i \
@@ -285,15 +285,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -315,8 +310,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Timer_Queue_Adapters.h \
  $(ACE_ROOT)/ace/Timer_Queue_Adapters.i \
  $(ACE_ROOT)/ace/Timer_Queue_Adapters.cpp \
- Driver.cpp \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
+ Driver.cpp $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp \
  Reactor_Timer_Queue_Test.h
@@ -327,6 +321,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -411,15 +408,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -452,6 +444,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -466,8 +461,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Driver.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -542,15 +536,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -580,6 +569,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -594,8 +586,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Driver.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -670,15 +661,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -709,6 +695,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -723,8 +712,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Driver.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -799,15 +787,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -838,6 +821,9 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -852,8 +838,7 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- Driver.h \
+ $(ACE_ROOT)/ace/Auto_Ptr.cpp Driver.h \
  $(ACE_ROOT)/ace/Task.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -928,15 +913,10 @@ include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/examples/Web_Crawler/Cached_Connect_Strategy_T.cpp b/examples/Web_Crawler/Cached_Connect_Strategy_T.cpp
deleted file mode 100644
index bdb7047736e..00000000000
--- a/examples/Web_Crawler/Cached_Connect_Strategy_T.cpp
+++ /dev/null
@@ -1,643 +0,0 @@
-//$Id:
-
-#ifndef CACHED_CONNECT_STRATEGY_T_C
-#define CACHED_CONNECT_STRATEGY_T_C
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/ACE.h"
-#include "Cached_Connect_Strategy_T.h"
-#include "ace/Service_Repository.h"
-#include "ace/Synch.h"
-#include "ace/Service_Types.h"
-#include "ace/Thread_Manager.h"
-#include "ace/WFMO_Reactor.h"
-#include "ace/Pair_T.h"
-#include "Options.h"
-
-#if defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "Cached_Connect_Strategy_T.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
-
-ACE_RCSID(Web_Crawler, Cached_Connect_Strategy_T, "$Id$")
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX>
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::ACE_Cached_Connect_Strategy_Ex
-  (ACE_Creation_Strategy<SVC_HANDLER> *cre_s,
-   ACE_Concurrency_Strategy<SVC_HANDLER> *con_s,
-   ACE_Recycling_Strategy<SVC_HANDLER> *rec_s)
-    : creation_strategy_ (0),
-      delete_creation_strategy_ (0),
-      concurrency_strategy_ (0),
-      delete_concurrency_strategy_ (0),
-      recycling_strategy_ (0),
-      delete_recycling_strategy_ (0)
-{
-
-  ACE_DEBUG ((LM_DEBUG, "ACE_Cached_Connect_Strategy_Ex::ACE_Cached_Connect_Strategy_Ex\n"));
-
-  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_Cached_Connect_Strategy_Ex")));
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX>
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::~ACE_Cached_Connect_Strategy_Ex (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "ACE_Cached_Connect_Strategy_Ex::~ACE_Cached_Connect_Strategy_Ex\n"));
-  if (this->delete_creation_strategy_)
-    delete this->creation_strategy_;
-  this->delete_creation_strategy_ = 0;
-  this->creation_strategy_ = 0;
-
-  if (this->delete_concurrency_strategy_)
-    delete this->concurrency_strategy_;
-  this->delete_concurrency_strategy_ = 0;
-  this->concurrency_strategy_ = 0;
-
-  if (this->delete_recycling_strategy_)
-    delete this->recycling_strategy_;
-  this->delete_recycling_strategy_ = 0;
-  this->recycling_strategy_ = 0;
-
-  // Close down all cached service handlers.
-  for (CONNECTION_CACHE_ITERATOR iter = this->connection_cache_.begin ();
-       iter != this->connection_cache_.end ();
-       ++iter)
-    {
-      if ((*iter).second () != 0)
-       {
-         (*iter).second ()->recycler (0, 0);
-         (*iter).second ()->close ();
-       }
-    }
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::open
-  (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.
-  // First we decide if we need to clean up.
-  if (this->creation_strategy_ != 0 &&
-      this->delete_creation_strategy_ != 0 &&
-      cre_s != 0)
-    {
-      delete this->creation_strategy_;
-      this->creation_strategy_ = 0;
-      this->delete_creation_strategy_ = 0;
-    }
-
-  if (cre_s != 0)
-    this->creation_strategy_ = cre_s;
-  else if (this->creation_strategy_ == 0)
-    {
-      ACE_NEW_RETURN (this->creation_strategy_,
-                      CREATION_STRATEGY, -1);
-      this->delete_creation_strategy_ = 1;
-    }
-
-  // Initialize the concurrency strategy.
-
-  if (this->concurrency_strategy_ != 0 &&
-      this->delete_concurrency_strategy_ != 0 &&
-      con_s != 0)
-    {
-      delete this->concurrency_strategy_;
-      this->concurrency_strategy_ = 0;
-      this->delete_concurrency_strategy_ = 0;
-    }
-
-  if (con_s != 0)
-    this->concurrency_strategy_ = con_s;
-  else if (this->concurrency_strategy_ == 0)
-    {
-      ACE_NEW_RETURN (this->concurrency_strategy_,
-                      CONCURRENCY_STRATEGY, -1);
-      this->delete_concurrency_strategy_ = 1;
-    }
-
-  // Initialize the recycling strategy.
-
-  if (this->recycling_strategy_ != 0 &&
-      this->delete_recycling_strategy_ != 0 &&
-      rec_s != 0)
-    {
-      delete this->recycling_strategy_;
-      this->recycling_strategy_ = 0;
-      this->delete_recycling_strategy_ = 0;
-    }
-
-  if (rec_s != 0)
-    this->recycling_strategy_ = rec_s;
-  else if (this->recycling_strategy_ == 0)
-    {
-      ACE_NEW_RETURN (this->recycling_strategy_,
-                      RECYCLING_STRATEGY, -1);
-      this->delete_recycling_strategy_ = 1;
-    }
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
-   int &found)
-{
-  ACE_UNUSED_ARG (remote_addr);
-  ACE_UNUSED_ARG (timeout);
-  ACE_UNUSED_ARG (local_addr);
-  ACE_UNUSED_ARG (reuse_addr);
-  ACE_UNUSED_ARG (flags);
-  ACE_UNUSED_ARG (perms);
-
-  found = 0;
-
-  // Get the recycling act for the svc_handler
-  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_.state () == ACE_Recyclable::CLOSED)
-    {
-      // If close, decrement refcount
-      if (possible_entry->ext_id_.decrement () == 0)
-        {
-          // If refcount goes to zero, close down the svc_handler
-          possible_entry->int_id_.first ()->recycler (0, 0);
-          possible_entry->int_id_.first ()->close ();
-          this->purge_i (possible_entry);
-        }
-
-      // Hint not successful
-      found = 0;
-
-      // Reset hint
-      sh = 0;
-    }
-
-  // If hint is not closed, see if it is connected to the correct
-  // address and is recyclable
-  else if (possible_entry->ext_id_ == remote_addr)
-    {
-      // Hint successful
-      found = 1;
-
-      // Tell the <svc_handler> that it should prepare itself for
-      // being recycled.
-      this->prepare_for_recycling (sh);
-    }
-  else
-    {
-      // This hint will not be used.
-      possible_entry->ext_id_.decrement ();
-
-      // Hint not successful
-      found = 0;
-
-      // If <sh> is not connected to the correct address or is busy,
-      // we will not use it.
-      sh = 0;
-    }
-
-  if (found)
-    entry = possible_entry;
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
-   int &found)
-{
-
-  ACE::set_handle_limit (OPTIONS::instance ()->handle_limit ());
-  //ACE_DEBUG ((LM_DEBUG, "MAX handles %d \n", ACE::max_handles ()));
-  // 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->connection_cache_.find (search_addr, entry) == -1)
-    {
-      // Set the flag
-      found = 0;
-
-      // Create a new svc_handler
-      if (this->make_svc_handler (sh) == -1)
-        return -1;
-
-      if (this->connect (...) == -1)
-        {
-          return -1;
-        }
-      else
-        {
-          // Insert the new SVC_HANDLER instance into the cache.
-          if (this->connection_cache_.bind (search_addr,
-                                            sh,
-                                            entry) == -1)
-            return -1;
-
-          // Set the recycler and the recycling act
-          this->assign_recycler (sh, this, entry);
-        }
-    }
-  else // We found a cached svc_handler.
-    {
-      // Set the flag
-      found = 1;
-
-      // Get the cached <svc_handler>
-      sh = entry->int_id_.first ();
-
-      // Tell the <svc_handler> that it should prepare itself for
-      // being recycled.
-      this->prepare_for_recycling (sh);
-    }
-
-  return 0;
-
-}
-
-connect ()
-{
-  // Actively establish the connection.  This is a timed blocking
-  // connect.
-  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
-      // there is no way for the non-blocking connects to complete and
-      // for the <Connector> to notify the cache of the completion of
-      // connect().
-      if (errno == EWOULDBLOCK)
-        errno = ENOTSUP;
-      else if (errno == EMFILE)
-        {
-          // @@purge here...
-
-          // Try connecting again.
-          if (this->CONNECT_STRATEGY::connect_svc_handler (sh,
-                                                           remote_addr,
-                                                           timeout,
-                                                           local_addr,
-                                                           reuse_addr,
-                                                           flags,
-                                                           perms) == -1)
-            {
-              if (errno == EWOULDBLOCK)
-                errno = ENOTSUP;
-              return -1;
-            }
-        }
-      else
-        {
-          return -1;
-        }
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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)
-{
-
-  ACE_DEBUG ((LM_DEBUG, "ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::connect_svc_handler\n"));
-  int found = 0;
-
-  // This artificial scope is required since we need to let go of the
-  // lock *before* registering the newly created handler with the
-  // Reactor.
-  {
-    // Synchronization is required here as the setting of the
-    // recyclable state must be done atomically with the finding and
-    // binding of the service handler in the cache.
-    ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-    int result = this->connect_svc_handler_i (sh,
-                                              remote_addr,
-                                              timeout,
-                                              local_addr,
-                                              reuse_addr,
-                                              flags,
-                                              perms,
-                                              found);
-    if (result != 0)
-      return result;
-
-  }
-
-  // If it is a new connection, activate it.
-  //
-  // Note: This activation is outside the scope of the lock of the
-  // cached connector.  This is necessary to avoid subtle deadlock
-  // conditions with this lock and the Reactor lock.
-  //
-  // @@ If an error occurs on activation, we should try to remove this
-  // entry from the internal table.
-
-  if (!found)
-    if (this->activate_svc_handler (sh))
-      return -1;
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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)
-{
-  int found = 0;
-
-  // This artificial scope is required since we need to let go of the
-  // lock *before* registering the newly created handler with the
-  // Reactor.
-  {
-    // Synchronization is required here as the setting of the
-    // recyclable state must be done atomically with the finding and
-    // binding of the service handler in the cache.
-    ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-    int result = this->connect_svc_handler_i (sh,
-                                              remote_addr,
-                                              timeout,
-                                              local_addr,
-                                              reuse_addr,
-                                              flags,
-                                              perms,
-                                              found);
-    sh_copy = sh;
-
-    ACE_DEBUG ((LM_DEBUG,"after connect_svc_handler_i ACE_Cached_Connect_Strategy_Ex::connect_svc_handler sh_Copy result =%d\n", result));
-    if (result != 0)
-      return result;
-
-  }
-
-  // If it is a new connection, activate it.
-  //
-  // Note: This activation is outside the scope of the lock of the
-  // cached connector.  This is necessary to avoid subtle deadlock
-  // conditions with this lock and the Reactor lock.
-  //
-  // @@ If an error occurs on activation, we should try to remove this
-  // entry from the internal table.
-
-  if (!found)
-    if (this->activate_svc_handler (sh))
-      return -1;
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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)
-{
-  CONNECTION_CACHE_ENTRY *entry = 0;
-
-  // Check if the user passed a hint svc_handler
-  if (sh != 0)
-    {
-
-      int result = this->check_hint_i (sh,
-                                       remote_addr,
-                                       timeout,
-                                       local_addr,
-                                       reuse_addr,
-                                       flags,
-                                       perms,
-                                       entry,
-                                       found);
-      // @@ Remove debugging
-      ACE_DEBUG ((LM_DEBUG, "ACE_Cached_Connect_Strategy_Ex::connect_svc_handler_i CHECK_HINT_I result = %d\n", result));
-
-      if (result != 0)
-        return result;
-    }
-
-  // If not found
-  if (!found)
-    {
-      int result = this->find_or_create_svc_handler_i (sh,
-                                                       remote_addr,
-                                                       timeout,
-                                                       local_addr,
-                                                       reuse_addr,
-                                                       flags,
-                                                       perms,
-                                                       entry,
-                                                       found);
-
-      // @@ Purging here is not correct...
-
-      if (result != 0)
-        {
-          // 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 (errno == EMFILE)
-            {
-              int result = this->connection_cache_.purge ();
-              if (result == -1)
-                return result;
-
-              if (this->find_or_create_svc_handler_i (sh,
-                                                      remote_addr,
-                                                      timeout,
-                                                      local_addr,
-                                                      reuse_addr,
-                                                      flags,
-                                                      perms,
-                                                      entry,
-                                                      found) == -1)
-                return -1;
-            }
-          else
-            return result;
-        }
-    }
-
-  // For all successful cases: mark the <svc_handler> in the cache
-  // as being <in_use>.  Therefore recyclable is BUSY.
-  entry->ext_id_.state (ACE_Recyclable::BUSY);
-
-  // And increment the refcount
-  entry->ext_id_.increment ();
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::cache (const void *recycling_act)
-{
-  // 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);
-
-  ACE_DEBUG ((LM_DEBUG, "ACE_Cached_Connect_Strategy_Ex::cache\n"));
-  return this->cache_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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_.state (ACE_Recyclable::IDLE);
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::purge (const void *recycling_act)
-{
-  // Excluded other threads from changing cache while we take this
-  // entry out.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-  return this->purge_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::purge_i (const void *recycling_act)
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  return this->connection_cache_.unbind (entry);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::mark_as_closed (const void *recycling_act)
-{
-  // Excluded other threads from changing cache while we take this
-  // entry out.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-  return this->mark_as_closed_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, 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_.state (ACE_Recyclable::CLOSED);
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::cleanup_hint (const void *recycling_act)
-{
-  // Excluded other threads from changing cache while we take this
-  // entry out.
-  ACE_GUARD_RETURN (MUTEX, ace_mon, this->lock_, -1);
-
-  return this->cleanup_hint_i (recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::cleanup_hint_i (const void *recycling_act)
-{
-  // The wonders and perils of ACT
-  CONNECTION_CACHE_ENTRY *entry = (CONNECTION_CACHE_ENTRY *) recycling_act;
-
-  // Decrement the refcount on the <svc_handler>.
-  int refcount = entry->ext_id_.decrement ();
-
-  // If the svc_handler state is closed and the refcount == 0, call
-  // close() on svc_handler.
-  if (entry->ext_id_.state () == ACE_Recyclable::CLOSED &&
-      refcount == 0)
-    {
-      entry->int_id_.first ()->recycler (0, 0);
-      entry->int_id_.first ()->close ();
-      this->purge_i (entry);
-    }
-
-  return 0;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_Creation_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::creation_strategy (void) const
-{
-  return this->creation_strategy_;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_Recycling_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::recycling_strategy (void) const
-{
-  return this->recycling_strategy_;
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_Concurrency_Strategy<SVC_HANDLER> *
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::concurrency_strategy (void) const
-{
-  return this->concurrency_strategy_;
-}
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Cached_Connect_Strategy_Ex)
-
-#endif /* CACHED_CONNECT_STRATEGY_T_C */
diff --git a/examples/Web_Crawler/Cached_Connect_Strategy_T.h b/examples/Web_Crawler/Cached_Connect_Strategy_T.h
deleted file mode 100644
index 2f81d41a33b..00000000000
--- a/examples/Web_Crawler/Cached_Connect_Strategy_T.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/* -*- C++ -*- */
-// $Id$ 
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Cached_Connect_Strategy_T.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran
-//
-// ============================================================================
-
-#ifndef CACHED_CONNECT_STRATEGY_T_H
-#define CACHED_CONNECT_STRATEGY_T_H
-
-#include "ace/Strategies_T.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "Optimal_Cache_Map_Manager_T.h"
-#include "Caching_Strategies_T.h"
-#include "ace/Functor_T.h"
-#include "ace/Pair_T.h"
-#include "ace/Synch.h"
-
-template <class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX>
-class ACE_Cached_Connect_Strategy_Ex : public ACE_Connection_Recycling_Strategy, public ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
-{
-  // = TITLE
-  //     A connection strategy which caches connections to peers
-  //     (represented by <SVC_HANDLER> instances), thereby allowing
-  //     subsequent re-use of unused, but available, connections.
-  //
-  // = DESCRIPTION
-  //     <Mem_Cached_Connect_Strategy> is intended to be used as a
-  //     plug-in connection strategy for <ACE_Strategy_Connector>.
-  //     It's added value is re-use of established connections.
-  //
-  // = USAGE
-  //     In order to use this appropriately, the user must provide
-  //     a template specialization for <ACE_Hash_Addr::compare_i()> and
-  //     <ACE_Hash_Addr::hash_i()> based on the address type and the
-  //     service handler type.  For example, a specialization using
-  //     <ACE_INET_Addr> and <My_Service_Handler> might be:
-  //     = BEGIN<NOFILL>
-  //     = BEGIN<CODE>
-  //     size_t
-  //     ACE_Hash_Addr<ACE_INET_Addr, My_Service_Handler>::hash_i(const ACE_INET_Addr &a)
-  //     {
-  //       return ...;
-  //     }
-  //     = END<CODE>
-  //     = END<NOFILL>
-  //
-  // = SEE ALSO
-  //     <ACE_Hash_Addr>.
-public:
-
-  ACE_Cached_Connect_Strategy_Ex (ACE_Creation_Strategy<SVC_HANDLER> *cre_s = 0,
-                                  ACE_Concurrency_Strategy<SVC_HANDLER> *con_s = 0,
-                                  ACE_Recycling_Strategy<SVC_HANDLER> *rec_s = 0);
-  // Constructor
-
-  virtual ~ACE_Cached_Connect_Strategy_Ex (void);
-  // Destructor
-
-  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 make_svc_handler (SVC_HANDLER *&sh);
-  // Template method for making a new <svc_handler>
-
-  virtual int activate_svc_handler (SVC_HANDLER *svc_handler);
-  // Template method for activating a new <svc_handler>
-
-  virtual int assign_recycler (SVC_HANDLER *svc_handler,
-                               ACE_Connection_Recycling_Strategy *recycler,
-                               const void *recycling_act);
-  // Template method for setting the recycler information of the
-  // svc_handler.
-
-  virtual int prepare_for_recycling (SVC_HANDLER *svc_handler);
-  // Template method for preparing the svc_handler for recycling.
-
-  virtual int 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);
-  
-  virtual int 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);
-  // Checks to see if there is already a <SVC_HANDLER> in the cache
-  // connected to the <remote_addr>.  If so, we return this pointer.
-  // Otherwise we establish the connection, put it into the cache, and
-  // return the <SVC_HANDLER> pointer.  <[NOTE]>: the <{reuse_addr}>
-  // argument does NOT control re-use of addresses in the cache.
-  // Rather, if the underlying protocol requires a "dead time" prior
-  // to re-use of its addresses (TCP is a classic example of this),
-  // <{and}> the protocol provides a means by which to defeat the dead
-  // time, setting this argument to non-zero will defeat the dead-time
-  // requirement.  <{Dev. Note: We might want to consider enhancing
-  // the interface at some point so that this also controls re-use of
-  // the cache.}>
-
-  virtual int purge (const void *recycling_act);
-  // Remove from cache.
-
-  virtual int cache (const void *recycling_act);
-  // Add to cache.
-
-  virtual int mark_as_closed (const void *recycling_act);
-  // Mark as closed.
-
-  virtual int cleanup_hint (const void *recycling_act);
-  // Cleanup hint.
-
-  // = Define some useful typedefs.
-  typedef ACE_Creation_Strategy<SVC_HANDLER>
-          CREATION_STRATEGY;
-  typedef ACE_Concurrency_Strategy<SVC_HANDLER>
-          CONCURRENCY_STRATEGY;
-  typedef ACE_Recycling_Strategy<SVC_HANDLER>
-          RECYCLING_STRATEGY;
-
-  // = Super class
-  typedef ACE_Connect_Strategy<SVC_HANDLER, ACE_PEER_CONNECTOR_2>
-          CONNECT_STRATEGY;
-
-  // = Typedefs for managing the map
-  typedef ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>
-          REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-
-  typedef ACE_Optimal_Cache_Map_Manager<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY>
-          CONNECTION_CACHE;
-  typedef ACE_Optimal_Cache_Map_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY>
-          CONNECTION_CACHE_ITERATOR;
-  typedef ACE_Optimal_Cache_Map_Reverse_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS, SVC_HANDLER *, ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, CACHING_STRATEGY>
-          CONNECTION_CACHE_REVERSE_ITERATOR;
-  
-  typedef ACE_TYPENAME CONNECTION_CACHE::CACHE_ENTRY 
-          CONNECTION_CACHE_ENTRY;
-  // = Strategy accessors
-  virtual ACE_Creation_Strategy<SVC_HANDLER> *creation_strategy (void) const;
-  virtual ACE_Recycling_Strategy<SVC_HANDLER> *recycling_strategy (void) const;
-  virtual ACE_Concurrency_Strategy<SVC_HANDLER> *concurrency_strategy (void) const;
-
-protected:
-
-  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 mark_as_closed_i (const void *recycling_act);
-  // Mark as closed (non-locking version).
-
-  virtual int cleanup_hint_i (const void *recycling_act);
-  // Cleanup hint.
-
-  // = Helpers
-  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,
-                    int reuse_addr,
-                    int flags,
-                    int perms,
-                    ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
-                    int &found);
-
-  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,
-                                    const ACE_PEER_CONNECTOR_ADDR &local_addr,
-                                    int reuse_addr,
-                                    int flags,
-                                    int perms,
-                                    ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::CONNECTION_CACHE_ENTRY *&entry,
-                                    int &found);
-
-  CONNECTION_CACHE connection_cache_;
-  // Table that maintains the cache of connected <SVC_HANDLER>s.
-
-  MUTEX lock_;
-  // Mutual exclusion for this object.
-
-  // = Strategy objects.
-
-  CREATION_STRATEGY *creation_strategy_;
-  // Creation strategy for an <Connector>.
-
-  int delete_creation_strategy_;
-  // 1 if <Connector> created the creation strategy and thus should
-  // delete it, else 0.
-
-  CONCURRENCY_STRATEGY *concurrency_strategy_;
-  // Concurrency strategy for an <Connector>.
-
-  int delete_concurrency_strategy_;
-  // 1 if <Connector> created the concurrency strategy and thus should
-  // delete it, else 0.
-
-  RECYCLING_STRATEGY *recycling_strategy_;
-  // Recycling strategy for an <Connector>.
-
-  int delete_recycling_strategy_;
-  // 1 if <Connector> created the recycling strategy and thus should
-  // delete it, else 0.
-};
-
-
-
-#if !defined (ACE_LACKS_INLINE_FUNCTIONS)
-#include "Cached_Connect_Strategy_T.i"
-#endif /* ACE_LACKS_INLINE_FUNCTIONS */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Cached_Connect_Strategy_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Cached_Connect_Strategy_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* CACHED_CONNECT_STRATEGY_T_H */
diff --git a/examples/Web_Crawler/Cached_Connect_Strategy_T.i b/examples/Web_Crawler/Cached_Connect_Strategy_T.i
deleted file mode 100644
index 59fa304deeb..00000000000
--- a/examples/Web_Crawler/Cached_Connect_Strategy_T.i
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_INLINE int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::make_svc_handler
-  (SVC_HANDLER *&sh)
-{
-  return this->creation_strategy_->make_svc_handler (sh);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_INLINE int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::activate_svc_handler
-  (SVC_HANDLER *svc_handler)
-{
-  return this->concurrency_strategy_->activate_svc_handler (svc_handler);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_INLINE int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::assign_recycler
-  (SVC_HANDLER *svc_handler,
-   ACE_Connection_Recycling_Strategy *recycler,
-   const void *recycling_act)
-{
-  return this->recycling_strategy_->assign_recycler (svc_handler,
-                                                     recycler,
-                                                     recycling_act);
-}
-
-template<class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class MUTEX> ACE_INLINE int
-ACE_Cached_Connect_Strategy_Ex<SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, MUTEX>::prepare_for_recycling
-  (SVC_HANDLER *svc_handler)
-{
-  return this->recycling_strategy_->prepare_for_recycling (svc_handler);
-}
diff --git a/examples/Web_Crawler/Caching_Strategies_T.cpp b/examples/Web_Crawler/Caching_Strategies_T.cpp
deleted file mode 100644
index 8bb86f1f730..00000000000
--- a/examples/Web_Crawler/Caching_Strategies_T.cpp
+++ /dev/null
@@ -1,259 +0,0 @@
-//$Id$
-
-#ifndef CACHING_STRATEGIES_T_C
-#define CACHING_STRATEGIES_T_C
-
-#include "Caching_Strategies_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if !defined (__ACE_INLINE__)
-#include "Caching_Strategies_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Web_Crawler, Caching_Strategies_T, "$Id$")
-
-template<class CONTAINER> int
-ACE_LRU_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
-{
-  // Check that the purge_percent is non-zero.
-  if (this->purge_percent_ == 0)
-    return 0;
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then thers no way out but exiting. So return an error.
-  if (this->entries_ == 1)
-    return -1;
-
-  KEY key_to_remove;
-  VALUE value_to_remove;
-
-  ITEM *item = 0;
-
-  ATTRIBUTES min = 0;
-
-   // Return value.
-   int result = 0;
-
-   // Calculate the no of entries to remove form the cache depending
-   // upon the <purge_percent>.
-   int no_of_entries = (this->purge_percent_ / 100) * this->entries_;
-
-   // @@ Don't do this stuff below. Simply take the ceiling of the
-   // above <no_of_entries>.
-
-   // If the number of entries is less than 10 with the default percent
-   // being 10, the calculated no_pf_entries equals 0. So increment it
-   // so that atleast one entry gets purged.
-   if (no_of_entries == 0)
-     {
-       if (container.current_size () >= 1)
-         no_of_entries = 1;
-     }
-
-   for (int i = 0; i < no_of_entries ; ++i)
-     {
-       ITERATOR iter (container);
-
-       // The iterator moves thru the container searching for the entry with the
-       // lowest ATTRIBUTES.
-
-       for (min = (*iter).int_id_.second (), key_to_remove = (*iter).ext_id_, value_to_remove = (*iter).int_id_;
-            iter.next (item) != 0;
-            ++iter)
-         {
-           // Ah! an item 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_;
-             }
-         }
-
-       // @@ Remove this
-       ACE_DEBUG ((LM_DEBUG, "AUTO_PURGE\nLRU: before unbind: current_size %d\n", container.current_size ()));
-
-       // @@ Remove this svc_handler specific code!!
-
-       // Delete the dynamically allocated value object.
-       if (value_to_remove.first () != 0)
-         {
-           (value_to_remove.first ())->recycler (0, 0);
-
-           result = (value_to_remove.first ())->close();
-           if (result == -1)
-             return result;
-         }
-       // Remove the item from cache.
-
-       // @@ What happens to this result? You should stop on failure.
-       result = container.unbind (key_to_remove);
-       --this->entries_;
-
-       // @@ Remove this
-       ACE_DEBUG ((LM_DEBUG, "LRU:after unbind: result %d current_size %d\n", result, container.current_size ()));
-     }
-   return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-template<class CONTAINER> int
-ACE_LFU_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
-{
-   // Check that the purge_percent is non-zero.
-   if (purge_percent_ == 0)
-    return 0;
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then thers no way out but exiting. So return an error.
-  if (this->entries_ == 1)
-    return -1;
-
-   KEY key_to_remove;
-   VALUE value_to_remove;
-
-   ITEM *item = 0;
-
-   ATTRIBUTES min = 0;
-
-   // Return value.
-   int result = 0;
-
-   // Calculate the no of entries to remove form the cache depending upon the <purge_percent>.
-   int no_of_entries = (this->purge_percent_/100) * this->entries_;
-   // If the number of entries is less than 10 with the default percent
-   // being 10, the calculated no_pf_entries equals 0. So increment it
-   // so that atleast one entry gets purged.
-   if (no_of_entries == 0)
-     {
-       if (container.current_size () >= 1)
-         no_of_entries = 1;
-     }
-
-   for (int i = 0; i < no_of_entries ; ++i)
-     {
-       ITERATOR iter (container);
-       // The iterator moves thru the container searching for the entry with the
-       // lowest ATTRIBUTES.
-
-       for (min = (*iter).int_id_.second (), key_to_remove = (*iter).ext_id_, value_to_remove = (*iter).int_id_;
-            iter.next (item) != 0 ;
-            ++iter)
-         {
-           // Ah! an item 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_;
-             }
-         }
-       ACE_DEBUG ((LM_DEBUG, "AUTO_PURGE\nLFU: before unbind: current_size %d\n", container.current_size ()));
-
-       // Delete the dynamically allocated value object.
-       if (value_to_remove.first () != 0)
-         {
-           (value_to_remove.first ())->recycler (0, 0);
-
-           result = (value_to_remove.first ())->close();
-           if (result == -1)
-             return result;
-         }
-       // Remove the item from cache.
-       result = container.unbind (key_to_remove);
-       --this->entries_;
-       ACE_DEBUG ((LM_DEBUG, "LFU:after unbind: result %d current_size %d\n", result, container.current_size ()));
-     }
-   return result;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-template<class CONTAINER> int
-ACE_FIFO_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &container)
-{
-   // Check that the purge_percent is non-zero.
-   if (this->purge_percent_ == 0)
-    return 0;
-
-  // Also whether the number of entries in the cache is just one!
-  // Oops! then thers no way out but exiting. So return an error.
-  if (this->entries_ == 1)
-    return -1;
-
-   KEY key_to_remove;
-   VALUE value_to_remove;
-
-   ITEM *item = 0;
-
-   ATTRIBUTES min = 0;
-
-   // Return value.
-   int result = 0;
-
-   // Calculate the no of entries to remove form the cache depending upon the <purge_percent>.
-   int no_of_entries = (this->purge_percent_/100) * this->entries_;
-   // If the number of entries is less than 10 with the default percent
-   // being 10, the calculated no_pf_entries equals 0. So increment it
-   // so that atleast one entry gets purged.
-   if (no_of_entries == 0)
-     {
-       if (container.current_size () >= 1)
-         no_of_entries = 1;
-     }
-
-   for (int i = 0; i < no_of_entries ; ++i)
-     {
-       ITERATOR iter (container);
-       // The iterator moves thru the container searching for the entry with the
-       // lowest ATTRIBUTES.
-       for (min = (*iter).int_id_.second (), key_to_remove = (*iter).ext_id_, value_to_remove = (*iter).int_id_;
-            iter.next (item) != 0 ;
-            ++iter)
-         {
-           // Ah! an item 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_;
-             }
-         }
-       ACE_DEBUG ((LM_DEBUG, "AUTO_PURGE\nFIFO: before unbind: current_size %d\n", container.current_size ()));
-
-       // Delete the dynamically allocated value object.
-       if (value_to_remove.first () != 0)
-         {
-           (value_to_remove.first ())->recycler (0, 0);
-
-           result = (value_to_remove.first ())->close();
-           if (result == -1)
-             return result;
-         }
-       // Remove the item from cache.
-       result = container.unbind (key_to_remove);
-       --this->entries_;
-       ACE_DEBUG ((LM_DEBUG, "FIFO:after unbind: result %d current_size %d\n", result, container.current_size ()));
-     }
-   return result;
-
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-template<class CONTAINER> int
-ACE_Null_Caching_Strategy<CONTAINER>::clear_cache (CONTAINER &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)
-ACE_ALLOC_HOOK_DEFINE(ACE_Null_Caching_Strategy)
-#endif /* CACHING_STRATEGIES_T_C */
diff --git a/examples/Web_Crawler/Caching_Strategies_T.h b/examples/Web_Crawler/Caching_Strategies_T.h
deleted file mode 100644
index f62aee5da02..00000000000
--- a/examples/Web_Crawler/Caching_Strategies_T.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Caching_Strategies_T.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef CACHING_STRATEGIES_H
-#define CACHING_STRATEGIES_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define  ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-template <class CONTAINER>
-class ACE_LRU_Caching_Strategy
-{
-  // = TITLE
-  //    Defines a Least Recently Used strategy which will decide on
-  //    the item to be removed from the cache.
-  //
-  // = DESCRIPTION
-  //     This is a strategy which makes use of a virtual timer which
-  //     is updated whenever an item is inserted or looked up in the
-  //     container. When the need of purging entries arises, the items
-  //     with the lowest timer values are removed.
-
-public:
-
-  // Traits.
-  typedef int ATTRIBUTES;
-
-  // @@ Should these be here?
-  typedef ACE_TYPENAME CONTAINER::KEY KEY;
-  typedef ACE_TYPENAME CONTAINER::VALUE VALUE;
-  typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR;
-  typedef ACE_TYPENAME CONTAINER::ENTRY ITEM;
-
-  // = Initialisation and termination.
-
-  ACE_LRU_Caching_Strategy (CONTAINER &container,
-                            ATTRIBUTES timer = 0,
-                            int purge_percent = 10);
-  // The <container> is the map in which the entries reside.
-  // The timer attribute could be initialsed as per need.
-  // The <purge_percent> field denotes the percentage of the entries
-  // in the cache which can be purged automagically.
-
-  ~ACE_LRU_Caching_Strategy (void);
-
-  // = Operations of the startegy.
-
-  ATTRIBUTES attributes (void);
-  // Accessor method for the timer attributes.
-
-  // = Accessor methods for the percentage of entries to purge.
-  int purge_percent (void);
-  void purge_percent (int percentage);
-
-  // =  Strategy related Operations
-
-  int notify_bind (int result,
-                   const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs bind
-  // method call.
-
-  int notify_find (int result,
-                   ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs find
-  // method call
-
-  int notify_unbind (int result,
-                     const ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  int notify_trybind (int result,
-                      ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  int notify_rebind (int result,
-                     const ATTRIBUTES &attr);
-  //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.
-
-  void dump (void) const;
-  // Dumps the state of the object.
-
- private:
-
-  ATTRIBUTES timer_;
-  // This element is the one which is the deciding factor for purging
-  // of an ITEM.
-
-  CONTAINER &container_;
-  // The container over which the purging will occur according to the
-  // strategy.
-
-  int purge_percent_;
-  // The level about which the purging will happen automagically.
-
-  int entries_;
-  // The no of entries bound in the cache.
-};
-
-//////////////////////////////////////////////////////////////////////////
-
-template <class CONTAINER>
-class ACE_LFU_Caching_Strategy
-{
-  // = TITLE
-  //     Defines a Least Frequently Used strategy for which will decide on
-  //   the item to be removed from the cache.
-  //
-  // = DESCRIPTION
-  //     A attribute is tagged to each item which increments whenever
-  //   the item is bound or looked up in the cache. Thus it denotes
-  //   the frequency of use. According to the value of the attribute
-  //   the item is removed from the CONTAINER i.e cache.
-public:
-
-  // Traits.
-  typedef int ATTRIBUTES;
-
-  typedef ACE_TYPENAME CONTAINER::KEY KEY;
-
-  typedef ACE_TYPENAME CONTAINER::VALUE VALUE;
-
-  typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR;
-
-  typedef ACE_TYPENAME CONTAINER::ENTRY ITEM;
-
-  // = Initialisation and termination methods.
-
-  ACE_LFU_Caching_Strategy (void);
-
-  ~ACE_LFU_Caching_Strategy (void);
-
-  // = Startegy methods. Most of the methods are used from the base
-  //   class itself.
-
-  ATTRIBUTES attributes (void);
-  // Access the attributes.
-
-  int notify_bind (int result,
-                   const ATTRIBUTES &attr);
-  // This method acts as a notification about the CONTAINERs bind
-  // method call.
-
-  int notify_find (int result,
-                   ATTRIBUTES &attr);
-  // Lookup notification.
-
-  int notify_unbind (int result,
-                     const ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  int notify_trybind (int result,
-                      ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  int notify_rebind (int result,
-                     const ATTRIBUTES &attr);
-  //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.
-
-  void dump (void) const;
-  // Dumps the state of the object.
-};
-
-/////////////////////////////////////////////////////////////
-
-template<class CONTAINER>
-class ACE_FIFO_Caching_Strategy
-{
-  // = TITLE
-  //    The First In First Out startegy is implemented wherein each
-  //    item is ordered.
-  //
-  // = DESCRIPTION
-  //    The order tag of each item is used to decide the item to be
-  //    removed from the cache. The items with least order are removed.
- public:
-
-  typedef int ATTRIBUTES;
-
-  // Traits.
-  typedef ACE_TYPENAME CONTAINER::KEY  KEY;
-
-  typedef ACE_TYPENAME CONTAINER::VALUE  VALUE;
-
-  typedef ACE_TYPENAME CONTAINER::ITERATOR ITERATOR;
-
-  typedef ACE_TYPENAME CONTAINER::ENTRY ITEM;
-
-  // = Initialisation and termination.
-
-  ACE_FIFO_Caching_Strategy (ATTRIBUTES order = 0);
-
-  ~ACE_FIFO_Caching_Strategy (void);
-
-  // = Startegy methods.
-
-  ATTRIBUTES attributes (void);
-  // Accessor method.
-
-  int notify_bind (int result,
-                   const ATTRIBUTES &attr);
-  // Notification for an item getting bound into the cache.
-
-  int notify_find (int result,
-                   ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs find
-  // method call
-
-  int notify_unbind (int result,
-                     const ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  int notify_trybind (int result,
-                      ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  int notify_rebind (int result,
-                     const ATTRIBUTES &attr);
-  // Notification for an item getting bound again into 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:
-
-  ATTRIBUTES order_;
-  // The order is the deciding factor for the item to be removed from
-  // the cache.
-};
-
-template<class CONTAINER>
-class ACE_Null_Caching_Strategy
-{
-  // = TITLE
-  //    The is a special caching strategy which doesnt have the purging
-  //    feature.
-  //
-  // = DESCRIPTION
-  //    No purging provided. To be used when purging might be too expensive
-  //    an operation.
-
- public:
-
-  typedef int ATTRIBUTES;
-
-  // = Initialisation and termination.
-
-  ACE_Null_Caching_Strategy (void);
-
-  ~ACE_Null_Caching_Strategy (void);
-
-  // = Startegy methods. All are NO_OP methods!!!
-
-  ATTRIBUTES attributes (void);
-  // Accessor method.
-
-  int notify_bind (int result,
-                   const ATTRIBUTES &attr);
-  // Notification for an item getting bound into the cache.
-
-  int notify_find (int result,
-                   ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs find
-  // method call
-
-  int notify_unbind (int result,
-                     const ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs unbind
-  // method call
-
-  int notify_trybind (int result,
-                      ATTRIBUTES &attr);
-  //This method acts as a notification about the CONTAINERs trybind
-  // method call
-
-  int notify_rebind (int result,
-                     const ATTRIBUTES &attr);
-  // Notification for an item getting bound again into 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:
-
-  // @@ Remove this
-  ATTRIBUTES dummy_;
-  // Just a dummy member to be able to keep up with the common interface.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Caching_Strategies_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Caching_Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Caching_Strategies_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* CACHING_STRATEGIES_H */
diff --git a/examples/Web_Crawler/Caching_Strategies_T.i b/examples/Web_Crawler/Caching_Strategies_T.i
deleted file mode 100644
index 4465a7ebff6..00000000000
--- a/examples/Web_Crawler/Caching_Strategies_T.i
+++ /dev/null
@@ -1,287 +0,0 @@
-/* -*-C++-*- */
-//$Id$
-
-template<class CONTAINER> ACE_INLINE
-ACE_LRU_Caching_Strategy<CONTAINER>::ACE_LRU_Caching_Strategy (CONTAINER &container, ATTRIBUTES timer, int purge_percent)
-  : timer_ (timer),
-    container_ (container),
-    purge_percent_ (purge_percent),
-    entries_ (0)
-{
-}
-
-template<class CONTAINER> ACE_INLINE
-ACE_LRU_Caching_Strategy<CONTAINER>::~ACE_LRU_Caching_Strategy (void)
-{
-}
-
-template<class CONTAINER> ACE_INLINE ACE_LRU_Caching_Strategy<CONTAINER>::ATTRIBUTES
-ACE_LRU_Caching_Strategy<CONTAINER>::attributes (void)
-{
-  return this->timer_;
-}   
-
-template<class CONTAINER> ACE_INLINE int
-ACE_LRU_Caching_Strategy<CONTAINER>::purge_percent (void)
-{
-  return this->purge_percent_;
-}
-
-template<class CONTAINER> ACE_INLINE void
-ACE_LRU_Caching_Strategy<CONTAINER>::purge_percent (int percentage)
-{
-  this->purge_percent_ = percentage;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LRU_Caching_Strategy<CONTAINER>::notify_bind (int result, 
-                                                  const ATTRIBUTES &attributes)
-{
-  if (result == 0)
-    {
-      ++this->timer_;
-      ++ this->entries_;
-    }
-  
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LRU_Caching_Strategy<CONTAINER>::notify_find (int result, 
-                                                  ATTRIBUTES &attr)
-{
-  if (result == 0)
-    {
-      attr = this->timer_;
-      ++this->timer_;
-    }
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LRU_Caching_Strategy<CONTAINER>::notify_unbind (int result, 
-                                                          const ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LRU_Caching_Strategy<CONTAINER>::notify_trybind (int result, 
-                                                           ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LRU_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
-                                                          const ATTRIBUTES &attr)
-{ 
-  if (result == 0)
-    ++this->timer_;
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE void
-ACE_LRU_Caching_Strategy<CONTAINER>::dump (void) const 
-{
-  ACE_TRACE ("ACE_LRU_Caching_Strategy::dump");
-      
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("timer_ = %d "), this->timer_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-
-template<class CONTAINER> ACE_INLINE 
-ACE_LFU_Caching_Strategy<CONTAINER>::ACE_LFU_Caching_Strategy (void)
-{
-}
-
-template<class CONTAINER> ACE_INLINE 
-ACE_LFU_Caching_Strategy<CONTAINER>::~ACE_LFU_Caching_Strategy (void)
-{
-}
-
-template<class CONTAINER> ACE_INLINE ACE_LFU_Caching_Strategy<CONTAINER>::ATTRIBUTES
-ACE_LFU_Caching_Strategy<CONTAINER>::attributes (void)
-{
-  return 0;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LFU_Caching_Strategy<CONTAINER>::notify_bind (int result, 
-                                                  const ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int
-ACE_LFU_Caching_Strategy<CONTAINER>::notify_find (int result, 
-                                                  ATTRIBUTES &attr)
-{
-  if (result == 0)
-    attr += 1; 
-  return result;    
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LFU_Caching_Strategy<CONTAINER>::notify_trybind (int result, 
-                                                     ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_LFU_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
-                                                    const ATTRIBUTES &attr)
-{ 
-  return result;
-}
-template<class CONTAINER> ACE_INLINE int 
-ACE_LFU_Caching_Strategy<CONTAINER>::notify_unbind (int result, 
-                                                    const ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE void
-ACE_LFU_Caching_Strategy<CONTAINER>::dump (void) const
-{
-  ACE_TRACE ("ACE_LFU_Caching_Strategy::dump");
-      
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//////////////////////////////////////////////////////////////////////////////////////
-
-template<class CONTAINER> ACE_INLINE 
-ACE_FIFO_Caching_Strategy<CONTAINER>::ACE_FIFO_Caching_Strategy (ATTRIBUTES order)
-  : order_ (order)
-{
-}
-
-template<class CONTAINER> ACE_INLINE 
-ACE_FIFO_Caching_Strategy<CONTAINER>::~ACE_FIFO_Caching_Strategy (void)
-{
-}
-
-template<class CONTAINER> ACE_INLINE ACE_FIFO_Caching_Strategy<CONTAINER>::ATTRIBUTES
-ACE_FIFO_Caching_Strategy<CONTAINER>::attributes (void)
-{
-  return this->order_;
-}
-
-template<class CONTAINER> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<CONTAINER>::notify_bind (int result, 
-                                                   const ATTRIBUTES &attr)
-{
-  if (result == 0)
-    ++this->order_;
-  return result;
-}
-template<class CONTAINER> ACE_INLINE int 
-ACE_FIFO_Caching_Strategy<CONTAINER>::notify_find (int result, 
-                                                   ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_FIFO_Caching_Strategy<CONTAINER>::notify_unbind (int result, 
-                                                     const ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_FIFO_Caching_Strategy<CONTAINER>::notify_trybind (int result, 
-                                                      ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int
-ACE_FIFO_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
-                                                     const ATTRIBUTES &attr)  
-{
-  if (result == 0)
-    ++this->order_;
-  return result;
-}    
-
-
-template<class CONTAINER> ACE_INLINE void
-ACE_FIFO_Caching_Strategy<CONTAINER>::dump (void) const
-{
-  ACE_TRACE ("ACE_FIFO_Caching_Strategy::dump");
-      
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ASYS_TEXT ("order_ = %d "), this->order_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//////////////////////////////////////////////////////////////////////////////////
-template<class CONTAINER> ACE_INLINE 
-ACE_Null_Caching_Strategy<CONTAINER>::ACE_Null_Caching_Strategy (void)
-  : dummy_ (0)
-{
-}
-
-template<class CONTAINER> ACE_INLINE 
-ACE_Null_Caching_Strategy<CONTAINER>::~ACE_Null_Caching_Strategy (void)
-{
-}
-
-template<class CONTAINER> ACE_INLINE ACE_Null_Caching_Strategy<CONTAINER>::ATTRIBUTES
-ACE_Null_Caching_Strategy<CONTAINER>::attributes (void)
-{
-  return this->dummy_;
-}
-
-template<class CONTAINER> ACE_INLINE int
-ACE_Null_Caching_Strategy<CONTAINER>::notify_bind (int result, 
-                                                   const ATTRIBUTES &attr)
-{
-  return result;
-}
-template<class CONTAINER> ACE_INLINE int 
-ACE_Null_Caching_Strategy<CONTAINER>::notify_find (int result, 
-                                                   ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_Null_Caching_Strategy<CONTAINER>::notify_unbind (int result, 
-                                                     const ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int 
-ACE_Null_Caching_Strategy<CONTAINER>::notify_trybind (int result, 
-                                                      ATTRIBUTES &attr)
-{
-  return result;
-}
-
-template<class CONTAINER> ACE_INLINE int
-ACE_Null_Caching_Strategy<CONTAINER>::notify_rebind (int result, 
-                                                     const ATTRIBUTES &attr)  
-{
-  return result;
-}    
-
-
-template<class CONTAINER> ACE_INLINE void
-ACE_Null_Caching_Strategy<CONTAINER>::dump (void) const
-{
-  ACE_TRACE ("ACE_Null_Caching_Strategy::dump");
-      
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-//////////////////////////////////////////////////////////////////////////////////
diff --git a/examples/Web_Crawler/Command_Processor.cpp b/examples/Web_Crawler/Command_Processor.cpp
deleted file mode 100644
index 83d2804b221..00000000000
--- a/examples/Web_Crawler/Command_Processor.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
- // $Id$
-
-#include "URL.h"
-#include "HTTP_URL.h"
-#include "Options.h"
-#include "Command_Processor.h"
-#include "URL_Visitor.h"
-
-ACE_RCSID(Web_Crawler, Command_Processor, "$Id$")
-
-Command::~Command (void)
-{
-}
-
-URL_Command::URL_Command (URL *url)
-  : url_ (url)
-{
-}
-
-int
-URL_Command::execute (void)
-{
-
-  ACE_CString check_string (this->url_->url_addr ().get_path_name ());
-  if (check_string.find ("news:") >= 0)
-    return 0;
-
-  if (check_string.find (".cgi") >= 0)
-     return 0;
-
-  if (check_string.find ("mailto") >= 0)
-    return 0;
-
-  if (check_string.find (".gif") >= 0)
-    return 0;
-  
-  if (check_string.find (".pdf") >= 0)
-    return 0;
-
-  if (check_string.find (".map") >= 0)
-    return 0;
-
-  if (check_string.find (".bmp") >= 0)
-    return 0;
-  
-  if (check_string.find (".jpg") >= 0)
-    return 0;
-  
-  if (this->url_->accept (OPTIONS::instance ()->visitor ()) !=0)
-    {
-      ACE_DEBUG ((LM_DEBUG, 
-                "Coudnt accept url\n"));
-      return -1;
-    }
-  return 0;
-}
-
-int
-URL_Command::destroy (void)
-{
-  delete this;
-  return 0;
-}
-Command_Processor::Command_Processor (void)
-{
-}
-
-Command_Processor::~Command_Processor (void)
-{
-}
-
-int
-Command_Processor::destroy (void)
-{
-  delete this;
-  return 0;
-return 0;
-}
-
-int
-Command_Processor::execute (void)
-{
-  Command *command;
-  while (this->url_queue_.is_empty () != 1)
-    {
-      if (this->url_queue_.dequeue_head (command) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n", "dequeue_head"),
-                          -1);
-      URL_Command *url_command = ACE_dynamic_cast (URL_Command *,
-                                                   command);
-      Auto_Destroyer<URL_Command> url_command_ptr (url_command);
-      if (url_command_ptr->execute () != 0)
-        {
-        ACE_DEBUG ((LM_DEBUG,
-                    "Couldnt execute command"));
-        return -1;
-        }
-    }
-  return 0;
-}
-
-int
-Command_Processor::insert (Command *command)
-{
-  // According to the order specified the commands are removed from the queue. 
-  if (this->url_queue_.is_full() != 1)
-    {
-      if (ACE_OS::strcmp (OPTIONS::instance ()->order (),"FIFO") == 0)
-        {
-          if (this->url_queue_.enqueue_tail (command) !=0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%p\n", "enqueue_tail"),
-                              - 1);
-        } 
-      if (ACE_OS::strcmp (OPTIONS::instance ()->order (),"LIFO") == 0)
-        {
-          if (this->url_queue_.enqueue_head (command) !=0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "%p\n", "enqueue_head"),
-                              - 1);
-        } 
-    }
-  return 0; 
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_Null_Mutex>;
-template class ACE_Unbounded_Queue<Command *>;
-template class ACE_Node<Command *>;
-template class ACE_Unbounded_Queue_Iterator<Command *>;
-template class ACE_Unbounded_Queue<Command *>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_Null_Mutex>
-#pragma instantiate ACE_Unbounded_Queue<Command *>
-#pragma instantiate ACE_Node<Command *> 
-#pragma instantiate ACE_Unbounded_Queue_Iterator<Command *>
-#pragma instantiate ACE_Unbounded_Queue<Command *>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Web_Crawler/Command_Processor.h b/examples/Web_Crawler/Command_Processor.h
deleted file mode 100644
index 20ef1b61142..00000000000
--- a/examples/Web_Crawler/Command_Processor.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- C++ -*- */
-// $Id $
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    Command_Processor.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _COMMAND_PROCESSOR_H
-#define _COMMAND_PROCESSOR_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define  ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Containers.h"
-#include "Options.h"
-
-// Forward decl.
-class URL;
-
-class Command
-{
-  // = TITLE
-  //     Abstract base class for a command.
-  //
-  // = DESCRIPTION
-  //     Each command is executed by a <Command_Processor>.
-public:
-  virtual ~Command (void);
-  // Virtual destructor.
-
-  virtual int execute (void) = 0;
-  // This is the entry point to execute the command.
-  virtual int destroy (void) = 0;
-};
-
-class URL_Command : public Command
-{
-  // = TITLE
-  //     Defines an API for executing a command on a URL.
-  //
-  // = DESCRIPTION
-  //     Each command is executed by a <Command_Processor>.
-public:
-  URL_Command (URL *);
-  // Constructor.
-  
-  virtual int execute (void);
-  // Execute the URL command.
-
-  int destroy (void);
-  // Commit suicide.
-private:
-  URL *url_;
-  // Pointer to the URL.
-};
-
-class Command_Processor
-{
-  // = TITLE
-  //     Execute commands that are passed to it.
-  //
-  // = DESCRIPTION
-  //     This class implements the Command Processor pattern.
-public:
-  Command_Processor (void);
-
-  int insert (Command *);
-  // Insert a new <Command> into the <Command_Processor>'s queue.
-
-  int execute (void);
-  // Execute all the <Commands> in the queue.
-
-  int destroy (void);
-  // Destroy the <Command_Processor>.
-
-private:
-  friend class ACE_Shutup_GPlusPlus;
-  // Turn off g++ warning
-
-  ~Command_Processor (void);
-  // Ensure dynamic allocation.
-
-  // @@ You fill in here...
-  ACE_Unbounded_Queue<Command *> url_queue_;
-};
-
-
-#endif /* _COMMAND_PROCESSOR_H */
diff --git a/examples/Web_Crawler/HTTP_URL.cpp b/examples/Web_Crawler/HTTP_URL.cpp
deleted file mode 100644
index 45369386756..00000000000
--- a/examples/Web_Crawler/HTTP_URL.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// $Id$
-
-#include "ace/Auto_Ptr.h"
-#include "URL_Visitor.h"
-#include "Options.h"
-#include "HTTP_URL.h"
-
-ACE_RCSID(Web_Crawler, HTTP_URL, "$Id$")
-
-const ACE_URL_Addr &
-HTTP_URL::url_addr (void) const
-{
-  return this->url_addr_;
-}
-
-HTTP_URL::HTTP_URL (const ACE_URL_Addr &url_addr,
-                    HTTP_URL *cp)
-  : url_addr_ (url_addr),
-    containing_page_ (cp == 0 ? this : cp)
-{
-  ACE_DEBUG ((LM_DEBUG, "HTTP_URL %s\n", url_addr.addr_to_string ()));
-}
-
-int
-HTTP_URL::send_request (void)
-{
-  /*
-  // Since this is HTTP 1.1 we'll need to establish a connection
-  // only once. Trying for relative paths.
-  // if (this->url_addr ().get_hostname () != url_hostname)
-  // {
-  if (this->stream ().open (this->url_addr ()) == -1)
-    return -1;
-    // }*/
-  int commandsize = 
-    ACE_OS::strlen (this->url_addr ().get_path_name ())
-    + ACE_OS::strlen (this->url_addr ().get_host_name ())
-    + 20 // Extra
-    + 1 // NUL byte
-    + 16; // Protocol filler...
-
-
-  char *command;
-  ACE_NEW_RETURN (command,
-                  char[commandsize],
-                  -1);
-
-  // Ensure that the <command> memory is deallocated.
-  ACE_Auto_Basic_Array_Ptr<char> cmd_ptr (command);
-
-  ACE_OS::sprintf (cmd_ptr.get (),
-                   "GET /%s HTTP/1.1\r\n",
-                   this->url_addr ().get_path_name ());
-  
-  ACE_DEBUG ((LM_DEBUG, "Command:%s length %d", 
-              cmd_ptr.get (),
-              ACE_OS::strlen (cmd_ptr.get ())));
-
-  // Send the GET command to the connected server.
-  if (this->stream ().send_n (cmd_ptr.get (),
-                              ACE_OS::strlen (cmd_ptr.get ()),
-                              ACE_const_cast (ACE_Time_Value *,
-                                              OPTIONS::instance ()->timeout ()))  > 0)
-    {
-      ACE_OS::sprintf (cmd_ptr.get (),
-                       "Host: %s\r\n\r\n",
-                       this->url_addr ().get_host_name ());
-  
-     ACE_DEBUG ((LM_DEBUG, "Command:%s length %d", 
-              cmd_ptr.get (),
-              ACE_OS::strlen (cmd_ptr.get ())));
-
-     // IMP: The length of teh command has to be sent!
-      int retval = this->stream ().send_n (cmd_ptr.get (),
-                                           ACE_OS::strlen (cmd_ptr.get ()),
-                                           ACE_const_cast (ACE_Time_Value *,
-                                                           OPTIONS::instance ()->timeout ()));
-      this->stream ().svc_handler ()->idle (0); //KIRTHIKA 
-      if (retval <= 0)
-        return -1;
-      else
-        return retval;
-    }
-  else
-    return -1;  
-}
-
-int
-HTTP_URL::accept (URL_Visitor *visitor)
-{
-  // This is part of the visitor pattern.
-  return visitor->visit (*this);
-}
-
-int 
-HTTP_URL::destroy (void)
-{
-  delete this;
-  return 0;
-  // Commit suicide!
-}
diff --git a/examples/Web_Crawler/HTTP_URL.h b/examples/Web_Crawler/HTTP_URL.h
deleted file mode 100644
index b571b1043f8..00000000000
--- a/examples/Web_Crawler/HTTP_URL.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    HTTP_URL.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _HTTP_URL_H
-#define _HTTP_URL_H
-
-#include "URL_Status.h"
-#include "URL.h"
-#include "Options.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class HTTP_URL : public URL
-{
-  // = TITLE
-  //    An ADT for an HTTP URL.
-  // 
-  // = DESCRIPTION
-  //    This class plays the "element" role in the Visitor pattern.
-public:
-  HTTP_URL (const ACE_URL_Addr &url_addr,
-            HTTP_URL *containing_page = 0);
-  // The <url_addr> is the URL that we're going to be visiting.  We
-  // also keep track of the containing page, if any, which is used to
-  // print out more meaningful messages.
-
-  virtual int accept (URL_Visitor *visitor);
-  // Accept the visitor, which will then perform a particular
-  // visitation strategy on the URL.  This method is part of the
-  // Visitor pattern.
-
-  virtual int send_request (void);
-  // Send a <GET> command to fetch the contents in the URI from the
-  // server.
-  
-  virtual const ACE_URL_Addr &url_addr (void) const;
-  // Returns the URL that we represent.
-
-  int destroy (void);
-  // Commit suicide
-private:
-  ACE_URL_Addr url_addr_;
-  // Address of the URL we're connected to.
-
-  HTTP_URL *containing_page_;
-  // Page that contained us.
-};
-
-#endif /* _HTTP_URL_H */
diff --git a/examples/Web_Crawler/Iterators.cpp b/examples/Web_Crawler/Iterators.cpp
deleted file mode 100644
index 199f427f0c7..00000000000
--- a/examples/Web_Crawler/Iterators.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#include "Options.h"
-#include "Iterators.h"
-
-ACE_RCSID(Web_Crawler, Iterators, "$Id$")
-
-URL_Iterator::~URL_Iterator (void)
-{
-}
-
-int
-URL_Iterator::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-HTML_Body_Iterator::HTML_Body_Iterator (URL &url)
-  : url_ (url)
-{
-}
-
-int
-HTML_Body_Iterator::next (ACE_CString &url)
-{
-  size_t len = BUFSIZ;
-  const char *buf;
-  ACE_CString buffer; 
-  int href_index = 0;
-
-  for (buf = this->url_.stream ().recv (len);
-       buf > 0;
-       buf = this->url_.stream ().recv (len))
-    {
-
-      buffer.set (buf, BUFSIZ, 1);
-
-      href_index = buffer.find ("HREF");
-
-      if (href_index < 0)
-        href_index = buffer.find ("href");
-
-      // Grep fpr " and grab the string until end-"
-      if ( href_index > 0)
-        {
-          // Get back to buffer start location.
-          this->url_.stream ().seek (-1 * len, SEEK_CUR);
-
-          int start_index = buffer.find ('\"',
-                                         href_index);
-          if (start_index <= 0)
-            break;
-
-          start_index += href_index;
-
-          int end_index = buffer.find ('\"',
-                                       start_index + 1);
-          if (end_index <= 0)
-            break;
-
-          end_index += start_index + 1;
-
-          ssize_t url_len = end_index - (start_index + 1);
-
-          ACE_CString temp = buffer.substring (start_index + 1, 
-                                               url_len);
-          url.set (temp.c_str (), len, 1);
-
-          this->url_.stream ().seek (end_index + 1);
-
-          return url_len;
-        }
-    }
-  return 0;
-
-}
-
-HTTP_Header_Iterator::HTTP_Header_Iterator (URL &url)
-  : url_ (url),
-    end_of_header_ (0)
-{
-}
-
-int
-HTTP_Header_Iterator::next (ACE_CString &line)
-{
-  if (this->end_of_header_)
-    return 0;
-  else
-    {
-      for (char c;
-           (c = this->url_.stream ().get_char ()) != EOF;
-           )
-        {
-          // Check to see if we're at the end of the header line.
-          if (c == '\r' && this->url_.stream ().peek_char (0) == '\n')
-            {
-              line.set (this->url_.stream ().recv (),
-                        this->url_.stream ().recv_len () - 1,
-                        1);
-
-              // Check to see if we're at the end of the header.
-              if (this->url_.stream ().peek_char (1) == '\r'
-                  && this->url_.stream ().peek_char (2) == '\n')
-                {
-                  this->end_of_header_ = 1;
-                  // We're at the end of the header section.
-                  this->url_.stream ().seek (3);
-                }
-              else
-                // We're at the end of the line.
-                this->url_.stream ().seek (1);
-
-              return 1;
-            }
-          // Handle broken Web servers that use '\n' instead of
-          // '\r\n'.
-          else if (c == '\n')
-            {
-              line.set (this->url_.stream ().recv (),
-                        (this->url_.stream ().recv_len ()),
-                        1);
-
-              // Check to see if we're at the end of the header.
-              if (this->url_.stream ().peek_char (0) == '\n')
-                {
-                  // We're at the end of the header section.
-                  this->url_.stream ().seek (1);
-                  this->end_of_header_ = 1;
-                }
-
-              return 1;
-            }
-        }
-     
-    }
-  return 0;
-}
-
-URL_Download_Iterator::URL_Download_Iterator (URL &url)
-  : url_ (url)
-{
-}
-
-int
-URL_Download_Iterator::next (ACE_CString &buffer)
-{
-  size_t len = BUFSIZ;
-
-  const char *buf = this->url_.stream ().recv (len);
-
-
-  if (buf == 0)
-    return 0;
-  else
-    {
-      buffer.set (buf, len, 1);
-      return 1;
-    }
-}
diff --git a/examples/Web_Crawler/Iterators.h b/examples/Web_Crawler/Iterators.h
deleted file mode 100644
index b171b0c2aeb..00000000000
--- a/examples/Web_Crawler/Iterators.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    Iterators.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _ITERATORS_H
-#define _ITERATORS_H
-
-#include "URL.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class URL_Iterator
-{
-  // = TITLE
-  //    An abstract base class that defines an iterator.
-  // 
-  // = DESCRIPTION
-  //    Subclasses of this base class can define what strings
-  //    to return from <next>.  This class decouples higher-level
-  //    software from the details of whatever type of URL header or
-  //    body we're iterating over.
-public:
-  // = Initialization and termination methods.
-  virtual int destroy (void);
-  // "virtual" destructor.
-
-  // = Iterator methods.
-  virtual int next (ACE_CString &string) = 0;
-  // Pass back the next <string> that hasn't been seen yet.  Returns 0
-  // when all items have been seen, else 1.
-
-protected:
-  virtual ~URL_Iterator (void);
-  // C++ destructor.
-};
-
-class HTML_Body_Iterator : public URL_Iterator
-{
-  // = TITLE
-  //    An iterator that returns URLs embedded in HTML files.
-public:
-  // = Initialization and termination methods.
-  HTML_Body_Iterator (URL &url);
-  // Constructor.
-
-  // = Iterator methods.
-  virtual int next (ACE_CString &url);
-  // Pass back the next <url> that hasn't been seen in the
-  // memory-mapped file.  Returns 0 when all items have been seen,
-  // else 1.
-
-private:
-  URL &url_;
-  // HTTP URL that we're iterating over.
-};
-
-class HTTP_Header_Iterator : public URL_Iterator
-{
-  // = TITLE
-  //    An iterator that iterates over the HTTP header.
-public:
-  // = Initialization and termination methods.
-  HTTP_Header_Iterator (URL &url);
-  // Constructor.
-
-  // = Iterator methods.
-  virtual int next (ACE_CString &line);
-  // Pass back the next <line> that hasn't been seen in the
-  // memory-mapped file header.  Returns 0 when we've reached the end
-  // of the header.  seen, else 1.
-
-private:
-  URL &url_;
-  // HTTP URL that we're iterating over.
-
-  int end_of_header_;
-  // We've found the end of the header, which means this iterator is
-  // finished.
-};
-
-class URL_Download_Iterator : public URL_Iterator
-{
-  // = TITLE
-  //    An iterator that iterates over the contents of an entire URL,
-  //    i.e., both header and body, and returns it in <BUFSIZ>
-  //    <buffer>s. 
-public:
-  // = Initialization and termination methods.
-  URL_Download_Iterator (URL &url);
-  // Constructor.
-
-  // = Iterator methods.
-  virtual int next (ACE_CString &buffer);
-  // Pass back the next <buffer> data from the stream, where
-  // <buffer.size> <= <BUFSIZ> .  Returns 0 when we've reached the end
-  // of the header, else 1.
-
-private:
-  URL &url_;
-  // HTTP URL that we're iterating over.
-};
-
-#endif /* _ITERATORS_H */
diff --git a/examples/Web_Crawler/Makefile b/examples/Web_Crawler/Makefile
deleted file mode 100644
index 0e821049f83..00000000000
--- a/examples/Web_Crawler/Makefile
+++ /dev/null
@@ -1,1669 +0,0 @@
-#----------------------------------------------------------------------------
-#	$Id$
-#
-#	Makefile for the Web Crawler application.
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#	Local macros
-#----------------------------------------------------------------------------
-
-BIN   	= main
-
-FILES  	= Command_Processor \
-	  HTTP_URL \
-	  Iterators \
-	  Mem_Map_Stream \
-	  Options \
-	  URL \
-	  URL_Addr \
-	  URL_Status \
-	  URL_Visitor \
-	  URL_Visitor_Factory \
-    	  Web_Crawler \
-          Optimal_Cache_Map_Manager_T \
-	  Caching_Strategies_T \
-	  Cached_Connect_Strategy_T 
-
-
-SRC	= $(addsuffix .cpp,$(FILES))
-OBJ	= $(addsuffix .o,$(FILES))
-
-BUILD 	= $(VBIN)
-
-#----------------------------------------------------------------------------
-#	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.bin.GNU
-include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
-
-#----------------------------------------------------------------------------
-#	Local targets
-#----------------------------------------------------------------------------
- 
-#----------------------------------------------------------------------------
-#	Dependencies
-#----------------------------------------------------------------------------
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/Command_Processor.o .obj/Command_Processor.so .shobj/Command_Processor.o .shobj/Command_Processor.so: Command_Processor.cpp URL.h Mem_Map_Stream.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- URL_Status.h HTTP_URL.h Options.h Command_Processor.h URL_Visitor.h \
- Iterators.h Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.h \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Cached_Connect_Strategy_T.i Cached_Connect_Strategy_T.cpp
-.obj/HTTP_URL.o .obj/HTTP_URL.so .shobj/HTTP_URL.o .shobj/HTTP_URL.so: HTTP_URL.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.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp URL_Visitor.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(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/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/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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 HTTP_URL.h \
- URL_Status.h URL.h Mem_Map_Stream.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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(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/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- Options.h Iterators.h Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.h \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Cached_Connect_Strategy_T.i Cached_Connect_Strategy_T.cpp
-.obj/Iterators.o .obj/Iterators.so .shobj/Iterators.o .shobj/Iterators.so: Iterators.cpp Options.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/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- Iterators.h URL.h Mem_Map_Stream.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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.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/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/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/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.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/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- URL_Status.h
-.obj/Mem_Map_Stream.o .obj/Mem_Map_Stream.so .shobj/Mem_Map_Stream.o .shobj/Mem_Map_Stream.so: Mem_Map_Stream.cpp \
- $(ACE_ROOT)/ace/FILE_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Addr.i \
- $(ACE_ROOT)/ace/FILE_Addr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp Options.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/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 \
- Mem_Map_Stream.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.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/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/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/Memory_Pool.i \
- $(ACE_ROOT)/ace/Signal.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/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp
-.obj/Options.o .obj/Options.so .shobj/Options.o .shobj/Options.so: Options.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.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Get_Opt.i URL_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i Options.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/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
-.obj/URL.o .obj/URL.so .shobj/URL.o .shobj/URL.so: URL.cpp URL.h Mem_Map_Stream.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(ACE_ROOT)/ace/SOCK_IO.h \
- $(ACE_ROOT)/ace/SOCK.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Connector.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/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Signal.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_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/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/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/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/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.cpp \
- $(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/Thread_Manager.h \
- $(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/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/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- URL_Status.h
-.obj/URL_Addr.o .obj/URL_Addr.so .shobj/URL_Addr.o .shobj/URL_Addr.so: URL_Addr.cpp URL_Addr.h \
- $(ACE_ROOT)/ace/INET_Addr.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Addr.h \
- $(ACE_ROOT)/ace/Addr.i \
- $(ACE_ROOT)/ace/INET_Addr.i
-.obj/URL_Status.o .obj/URL_Status.so .shobj/URL_Status.o .shobj/URL_Status.so: URL_Status.cpp URL_Status.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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
-.obj/URL_Visitor.o .obj/URL_Visitor.so .shobj/URL_Visitor.o .shobj/URL_Visitor.so: URL_Visitor.cpp URL_Visitor.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(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/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/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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 HTTP_URL.h \
- URL_Status.h URL.h Mem_Map_Stream.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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(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/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- Options.h Iterators.h Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.h \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Cached_Connect_Strategy_T.i Cached_Connect_Strategy_T.cpp \
- Command_Processor.h
-.obj/URL_Visitor_Factory.o .obj/URL_Visitor_Factory.so .shobj/URL_Visitor_Factory.o .shobj/URL_Visitor_Factory.so: URL_Visitor_Factory.cpp URL_Visitor_Factory.h \
- URL_Visitor.h $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/Event_Handler.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(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/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/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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 HTTP_URL.h \
- URL_Status.h URL.h Mem_Map_Stream.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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(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/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(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/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- Options.h Iterators.h Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.h \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Cached_Connect_Strategy_T.i Cached_Connect_Strategy_T.cpp \
- Command_Processor.h
-.obj/Web_Crawler.o .obj/Web_Crawler.so .shobj/Web_Crawler.o .shobj/Web_Crawler.so: Web_Crawler.cpp Options.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/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- URL_Visitor_Factory.h URL_Visitor.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies.i \
- $(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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 HTTP_URL.h \
- URL_Status.h URL.h Mem_Map_Stream.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/SOCK_Connector.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(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/Svc_Handler.h \
- $(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/Svc_Handler.i \
- $(ACE_ROOT)/ace/Svc_Handler.cpp \
- $(ACE_ROOT)/ace/Dynamic.h \
- $(ACE_ROOT)/ace/Dynamic.i \
- $(ACE_ROOT)/ace/Connector.i \
- $(ACE_ROOT)/ace/Connector.cpp URL_Addr.h \
- Iterators.h Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.h \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Cached_Connect_Strategy_T.i Cached_Connect_Strategy_T.cpp \
- Command_Processor.h Web_Crawler.h
-.obj/Optimal_Cache_Map_Manager_T.o .obj/Optimal_Cache_Map_Manager_T.so .shobj/Optimal_Cache_Map_Manager_T.o .shobj/Optimal_Cache_Map_Manager_T.so: Optimal_Cache_Map_Manager_T.cpp \
- Optimal_Cache_Map_Manager_T.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/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/Hash_Map_Manager_T.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_T.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/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_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/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/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/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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp
-.obj/Caching_Strategies_T.o .obj/Caching_Strategies_T.so .shobj/Caching_Strategies_T.o .shobj/Caching_Strategies_T.so: Caching_Strategies_T.cpp \
- Caching_Strategies_T.h $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- Caching_Strategies_T.i Caching_Strategies_T.cpp
-.obj/Cached_Connect_Strategy_T.o .obj/Cached_Connect_Strategy_T.so .shobj/Cached_Connect_Strategy_T.o .shobj/Cached_Connect_Strategy_T.so: Cached_Connect_Strategy_T.cpp \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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 \
- Cached_Connect_Strategy_T.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(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/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/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/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/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/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/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 \
- Optimal_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 \
- Optimal_Cache_Map_Manager_T.i Optimal_Cache_Map_Manager_T.cpp \
- Caching_Strategies_T.h Caching_Strategies_T.i \
- Caching_Strategies_T.cpp Cached_Connect_Strategy_T.i \
- Cached_Connect_Strategy_T.cpp
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/examples/Web_Crawler/Mem_Map_Stream.cpp b/examples/Web_Crawler/Mem_Map_Stream.cpp
deleted file mode 100644
index 8baad661129..00000000000
--- a/examples/Web_Crawler/Mem_Map_Stream.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// $Id$
-
-#include "ace/FILE_Addr.h"
-#include "ace/Auto_Ptr.h"
-#include "Options.h"
-#include "Mem_Map_Stream.h"
-
-ACE_RCSID(Web_Crawler, Mem_Map_Stream, "$Id$")
-
-ACE_SOCK_Stream &
-Mem_Map_Stream::stream (void)
-{
-  return svc_handler_->peer ();
-  // return this->stream_;
-}
-
-ssize_t
-Mem_Map_Stream::send_n (const void *buf, size_t size, ACE_Time_Value *tv)
-{
-  return svc_handler_->peer ().send_n (buf, size, 0, tv);
-  //return this->stream_.send_n (buf, size, 0, tv);
-   // Needed for persistent connections.
-  //  svc_handler_->idle ();
-}
-
-int
-Mem_Map_Stream::eof (void) const
-{
-  return this->get_pos_ >= this->end_of_mapping_plus1_;
-}
-
-int
-Mem_Map_Stream::get_char (void)
-{
-  if (this->eof () && this->grow_file_and_remap () == -1)
-    return EOF;
-
-  return *this->get_pos_++;
-}
-
-int
-Mem_Map_Stream::rewind (void)
-{
-  //this->mem_map_.map ();// KIRTHIKA
- 
-  this->recv_pos_ =
-    ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ());
-  this->get_pos_ = this->recv_pos_;
-  this->end_of_mapping_plus1_ =
-    this->recv_pos_ + this->mem_map_.size ();
-  return 0;
-}
-
-int
-Mem_Map_Stream::peek_char (size_t offset)
-{
-  // We may need to iterate if the size of <n> is large.
-  while (this->get_pos_ + offset >= this->end_of_mapping_plus1_)
-    if (this->grow_file_and_remap () == -1)
-      return EOF;
-
-  return this->get_pos_[offset];
-}
-
-const char *
-Mem_Map_Stream::recv (void) const
-{
-  return this->recv_pos_;
-}
-
-const char *
-Mem_Map_Stream::recv (size_t &len)
-{
-  if (this->eof () && this->grow_file_and_remap () == -1)
-    return 0;
-
-  
-  const char *s = this->recv_pos_;
-  this->seek (len, SEEK_CUR);
-  len = this->get_pos_ - s;
-  return s;
-}
-
-size_t
-Mem_Map_Stream::recv_len (void) const
-{
-  return this->get_pos_ - this->recv_pos_;
-}
-
-const char *
-Mem_Map_Stream::peek_str (size_t offset, 
-                          size_t size)
-{
-  // We will iterate if the size of <offset> is large.
-  while (this->get_pos_ + (offset + size) > this->end_of_mapping_plus1_)
-    if (this->grow_file_and_remap () == -1)
-      return 0;
-
-  return &this->get_pos_[offset];
-}
-
-off_t
-Mem_Map_Stream::seek (off_t offset, int whence)
-{
-  switch (whence)
-    {
-    case SEEK_SET:
-      this->get_pos_ =
-        ACE_reinterpret_cast (char *,
-                              this->mem_map_.addr ())
-        + offset;
-      break;
-
-    case SEEK_CUR:
-      this->get_pos_ += offset;
-      break;
-
-    case SEEK_END:
-      this->get_pos_ =
-        this->end_of_mapping_plus1_ + offset;
-      // @@ Not sure how to implement this (yet).
-      ACE_NOTSUP_RETURN (-1);
-      break;
-    }
-
-  // Make sure that the backing store will cover this.
-  while (this->get_pos_ > this->end_of_mapping_plus1_)
-    if (this->grow_file_and_remap () == -1)
-      return (off_t) -1;
-
-  this->recv_pos_ = this->get_pos_;
-  return this->recv_pos_ - ACE_reinterpret_cast (char *,
-                                                 this->mem_map_.addr ());
-}
-
-Mem_Map_Stream::Svc_Handler * 
-Mem_Map_Stream::svc_handler (void)
-{
-  return this->svc_handler_;
-}
-
-
-int
-Mem_Map_Stream::open (STRAT_CONNECTOR *connector,
-                      const ACE_INET_Addr &addr)
-{
-  svc_handler_ = 0; // Check whether this stopping me form checking autopurging!
-  //Kirthika Apr22 1615
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Mem_Map_Stream :: open ()\n"));
-  // Connect to the server at <addr>. If the handler has to be 
-  // connected to the server again, the Cachind strategy takes care
-  // and uses the same connection.
-  if (connector->connect (svc_handler_,
-                               addr) == -1)
-    {
-      cout <<"CONNECT ERROR"<<errno<<endl;
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p %s %d\n",
-                         "Connect failed",
-                         addr.get_host_name (),
-                         addr.get_port_number ()),
-                        -1);
-    }
-  // Create a temporary filename.
-  ACE_FILE_Addr file (ACE_sap_any_cast (ACE_FILE_Addr &));
-
-  // Create the temporary file via the <ACE_Mem_Map> class API.
-  if (this->mem_map_.open (file.get_path_name (),
-                          O_RDWR | O_CREAT | O_APPEND,
-                          ACE_DEFAULT_FILE_PERMS) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
-                      -1);
-  // Make sure to unlink this right away so that if this process
-  // crashes these files will be removed automatically.
-#if 0
-  else if (ACE_OS::unlink (file.get_path_name ()) == -1)
-  ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "unlink"),
-                      -1);
-  else
-#endif
-    // Initialize all the position pointers to 0.
-    this->rewind ();
- 
-  return 0;
-}
-
-int
-Mem_Map_Stream::grow_file_and_remap (void)
-{
-  char buf[BUFSIZ + 1];
-
-  // Copy the next chunk of bytes from the socket into the temporary
-  // file.
-  ACE_Time_Value tv (*OPTIONS::instance ()->timeout ());
-  /*ssize_t n = this->stream_.recv (buf,
-                                  sizeof buf,
-                                  &tv);*/
-  
-  ssize_t n = this->svc_handler_->peer ().recv_n (buf,
-                                                  sizeof buf,
-                                                  0,
-                                                  &tv);
-  /*ACE_DEBUG ((LM_DEBUG,
-              "Recv: %d \n %s\n",
-              n, buf));
-  */
-  if (n == -1)
-    {
-      if (OPTIONS::instance ()->debug ())
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "recv"));
-      return -1;
-    }
-  else if (n == 0)
-    return -1;
-  else if (ACE::write_n (this->mem_map_.handle (), buf, n) != n)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "write_n"),
-                      -1);
-
-  // Grow the memory-mapping to encompass the entire temporary file.
-  if (this->mem_map_.map (-1,
-                          PROT_RDWR,
-                          ACE_MAP_PRIVATE | ACE_MAP_FIXED,
-                          ACE_DEFAULT_BASE_ADDR) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "map"),
-                      -1);
-  // MAP_FAILED is used as a "first time in" flag.
-  if (this->recv_pos_ == MAP_FAILED)
-    {
-      this->recv_pos_ = ACE_reinterpret_cast (char *,
-                                              this->mem_map_.addr ());
-      this->get_pos_ = this->recv_pos_;
-    }
-
-  this->end_of_mapping_plus1_ =
-    ACE_reinterpret_cast (char *,
-                          this->mem_map_.addr ())
-    + this->mem_map_.size ();
-
-  // this->svc_handler_->idle ();//KIRTHIKA
-
-  return 0;
-}
-
-Mem_Map_Stream::~Mem_Map_Stream (void)
-{
-
-  ACE_DEBUG ((LM_DEBUG, "~MEM_MAP:\n"));
-
-  // Remove the mapping and the file.
-  this->mem_map_.remove ();
-}
-
diff --git a/examples/Web_Crawler/Mem_Map_Stream.h b/examples/Web_Crawler/Mem_Map_Stream.h
deleted file mode 100644
index 091fdf7da67..00000000000
--- a/examples/Web_Crawler/Mem_Map_Stream.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    Mem_Map_Stream.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _MEM_MAP_STREAM_H
-#define _MEM_MAP_STREAM_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Mem_Map.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Strategies_T.h"
-#include "ace/Synch_T.h"
-
-class Mem_Map_Stream
-{
-  // = TITLE
-  //   Provides a memory-mapped stream abstraction to simplify parsing
-  //   of tokens.  
-  //
-  // = DESCRIPTION
-  //   This class makes it possible to treat an connection as a stream
-  //   of bytes, similar to the C library stdio streams.  The contents
-  //   of the connection are buffered incrementally in a memory-mapped
-  //   file.  This class maintains pointers to two positions in the
-  //   stream:
-  //   
-  //   1. The <recv> position, which keeps track of the beginning of a
-  //      token that is in the stream.
-  //  
-  //   2. The <get> position, which moves along character-by-character
-  //      until the end of the token is reached.
-  // 
-  //   Once a token has been located, it can be extracted from the
-  //   stream by calling the <recv>.  The length of the token, i.e.,
-  //   the <recv_len>, is the length in bytes between the <get>
-  //   position and the <recv> position.  Once the token has been
-  //   extracted, the <recv> and <get> positions can be updated by the
-  //   <seek> method.
-
-public:
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler;
-  
-  typedef ACE_Strategy_Connector<Svc_Handler,
-                               ACE_SOCK_CONNECTOR>
-        STRAT_CONNECTOR;
-
-  // Mem_Map_Stream (void);
-  // constructor added:KIRTHIKA
-  virtual int open (STRAT_CONNECTOR *connector, 
-                    const ACE_INET_Addr &);
-  // Initialize this object.
-
-  virtual ~Mem_Map_Stream (void);
-  // Destructor.
-
-  // = Accessor.
-  ACE_SOCK_Stream &stream (void);
-  // Returns the underlying <ACE_SOCK_Stream>.
-
-  // = I/O methods.
-
-  virtual ssize_t send_n (const void *buf,
-                          size_t size,
-                          ACE_Time_Value *tv = 0);
-  // Send <size> bytes in <buf> to the connected peer.  This is a
-  // completely unbuffered call.
-
-  virtual int get_char (void);
-  // Return the next character in the stream and advance the <get>
-  // position.  Returns EOF when the <get> position reaches the end of
-  // the HTTP stream.
-  
-  virtual const char *recv (size_t &len);
-  // Returns a pointer to array of at most <len> characters starting
-  // at the <recv> position.  If the <recv> position + <len> extends
-  // past the EOF then <len> is set to the number of characters
-  // between the <recv> position and the EOF and both the <get> and
-  // <recv> positions are advanced by <len>.  Returns 0 if the <recv>
-  // position is at the EOF.
-
-  virtual const char *recv (void) const;
-  // Returns a pointer to array of characters starting at the <recv>
-  // position.
-
-  virtual size_t recv_len (void) const;
-  // Returns the length in bytes between the <get> position and the
-  // <recv> position.
-
-  virtual int rewind (void);
-  // Resets the <get> and <recv> positions to the beginning of the
-  // stream.  This works since all the data has been cached in the
-  // memory-mapped backing store.
-
-  virtual int peek_char (size_t offset);
-  // Returns the nth character <offset> from the <get> position in the
-  // stream without advancing the <get> position.  Automatically
-  // extends the backing store if necessary.  Returns EOF if <offset>
-  // is past the end of the stream.
-
-  virtual const char *peek_str (size_t offset, size_t size);
-  // Return a pointer to an array of <size> characters starting at
-  // <offset> characters from the <get> position in the stream without
-  // advancing the <get> position.  Automatically extends the backing
-  // store if necessary.  Returns 0 if <offset> or <offset + size> is
-  // past the end of the stream.
-
-  virtual off_t seek (off_t offset, int whence = SEEK_CUR);
-  // Sets the <get> and <recv> positions as follows:
-  //    o If <whence> is <SEEK_SET>, the positions are set to <offset>
-  //      bytes from the start of the stream.
-  // 
-  //    o  If <whence> is <SEEK_CUR>, the positions are set to the
-  //       current <get> position plus <offset>.
-  //
-  //    o  If <whence> is <SEEK_END>, the positions are set to the size
-  //       of the stream plus <offset>.
-
-  virtual int eof (void) const;
-  // Returns 1 if we're at the end of the HTTP stream, else 0.
-
-  
-  /*
-  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<Svc_Handler,
-                                    ACE_SOCK_CONNECTOR,
-                                    ACE_SYNCH_NULL_MUTEX>
-                                    CACHED_CONNECT_STRATEGY;*/
-  
-  Svc_Handler *svc_handler (void);
-
-private:
-  int grow_file_and_remap (void);
-  // Grow the file by reading another chunk from the HTTP socket and
-  // extend the mapping to cover this chunk.  Returns -1 on failure or
-  // EOF, else 0.
-
-  //ACE_SOCK_Stream stream_;
-  
-  Svc_Handler *svc_handler_;
-  // Connection to peer. The granularity is at the Svc_Handler level.
-  // The Svc_Handler has an SOCK_Stream.
-  /*
-  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_;
-
-  STRAT_CONNECTOR *strat_connector_;  */
- 
-  ACE_Mem_Map mem_map_;
-  // Memory-mapped file that we're iterating over.
-
-  char *recv_pos_;
-  // Pointer to the address where the next <recv> method will start.
-
-  char *get_pos_;
-  // Pointer to the address where the next <get_char> method will
-  // start.
-
-  char *end_of_mapping_plus1_;
-  // Address at the end of the file mapping.
-
-};
-
-#endif /* _MEM_MAP_STREAM_H */
- 
diff --git a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.cpp b/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.cpp
deleted file mode 100644
index e0ca775f066..00000000000
--- a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-// $Id$
-
-#ifndef ACE_OPTIMAL_CACHE_MAP_MANAGER_T_C
-#define ACE_OPTIMAL_CACHE_MAP_MANAGER_T_C
-
-#define ACE_BUILD_DLL
-
-#include "Optimal_Cache_Map_Manager_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Malloc.h"
-
-#if !defined (__ACE_INLINE__)
-#include "Optimal_Cache_Map_Manager_T.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Web_Crawler, Optimal_Cache_Map_Manager_T, "$Id$")
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Optimal_Cache_Map_Manager)
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Optimal_Cache_Map_Iterator)
-
-ACE_ALLOC_HOOK_DEFINE(ACE_Optimal_Cache_Map_Reverse_Iterator)
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::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
-  // caching strategy.
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int bind_result = this->map_.bind (key,
-                                     cache_value);
-  if (bind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_bind (bind_result,
-                                                        cache_value.second ());
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the bind operation is
-          // not complete.
-          bind_result = -1;
-        }
-    }
-  return bind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>:: bind (const KEY &key,
-                                                                                            const VALUE &value,
-                                                                                            ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::CACHE_ENTRY *&entry)
-{
-  // Insert a entry which has the <key> and the <cache_value> which is
-  // the combination of the <value> and the attributes of the caching
-  // strategy.
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int bind_result = this->map_.bind (key,
-                                     cache_value,
-                                     entry);
-  if (bind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_bind (bind_result,
-                                                        cache_value.second ());
-
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the bind operation is
-          // not complete.
-          bind_result = -1;
-        }
-    }
-  return bind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rebind (const KEY &key,
-                                                                                             const VALUE &value)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int rebind_result = this->map_.rebind (key,
-                                         cache_value);
-  if (rebind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the rebind operation is
-          // not complete.
-          rebind_result = -1;
-        }
-    }
-
-  return rebind_result;
-}
-
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rebind (const KEY &key,
-                                                                                             const VALUE &value,
-                                                                                             VALUE &old_value)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  CACHE_VALUE old_cache_value (old_value,
-                               this->caching_strategy_.attributes ());
-
-  int rebind_result = this->map_.rebind (key,
-                                         cache_value,
-                                         old_cache_value);
-  if (rebind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
-
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the rebind operation is
-          // not complete.
-          rebind_result = -1;
-        }
-      else
-        {
-          old_value = old_cache_value.first ();
-        }
-    }
-  return rebind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rebind (const KEY &key,
-                                                                                             const VALUE &value,
-                                                                                             KEY &old_key,
-                                                                                             VALUE &old_value)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  CACHE_VALUE old_cache_value (old_value,
-                               this->caching_strategy_.attributes ());
-
-  int rebind_result = this->map_.rebind (key,
-                                         cache_value,
-                                         old_key,
-                                         old_cache_value);
-  if (rebind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
-
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the rebind operation is
-          // not complete.
-          rebind_result = -1;
-        }
-      else
-        {
-          old_value = old_cache_value.first ();
-        }
-    }
-  return rebind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rebind (const KEY &key,
-                                                                                             const VALUE &value,
-                                                                                             ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::CACHE_ENTRY *&entry)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int rebind_result = this->map_.rebind (key,
-                                         cache_value,
-                                         entry);
-  if (rebind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_rebind (rebind_result,
-                                                          cache_value.second ());
-      if (result == -1)
-        {
-          this->map_.unbind (key);
-
-          // Unless the notification goes thru the rebind operation is
-          // not complete.
-          rebind_result = -1;
-        }
-    }
-  return rebind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::trybind (const KEY &key,
-                                                                                              VALUE &value)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int trybind_result = this->map_.trybind (key,
-                                           cache_value);
-
-  if (trybind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_trybind (trybind_result,
-                                                           cache_value.second ());
-      if (result == -1)
-        {
-          // If the entry has got inserted into the map, it is removed
-          // due to failure.
-          if (trybind_result == 0)
-            this->map_.unbind (key);
-
-          trybind_result = -1;
-        }
-      else
-        {
-          // If an attempt is made to bind an existing entry the value
-          // is overwritten with the value from the map.
-          if (trybind_result == 1)
-            value = cache_value.first ();
-        }
-    }
-
-  return trybind_result;
-}
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::trybind (const KEY &key,
-                                                                                              VALUE &value,
-                                                                                              ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::CACHE_ENTRY *&entry)
-{
-  CACHE_VALUE cache_value (value,
-                           this->caching_strategy_.attributes ());
-
-  int trybind_result = this->map_.trybind (key,
-                                           cache_value,
-                                           entry);
-
-  if (trybind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_trybind (trybind_result,
-                                                           cache_value.second ());
-      if (result == -1)
-        {
-          // If the entry has got inserted into the map, it is removed
-          // due to failure.
-          if (trybind_result == 0)
-            this->map_.unbind (key);
-
-          trybind_result = -1;
-        }
-      else
-        {
-          // If an attempt is made to bind an existing entry the value
-          // is overwritten with the value from the map.
-          if (trybind_result == 1)
-            value = cache_value.first ();
-        }
-    }
-
-  return trybind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::find (const KEY& key,
-                                                                                           VALUE &value)
-{
-  // Lookup the key and populate the <value>.
-  CACHE_VALUE cache_value;
-
-  int find_result = this->map_.find (key,
-                                     cache_value);
-
-  if (find_result != -1)
-    {
-      int result = this->caching_strategy_.notify_find (find_result,
-                                                        cache_value.second ());
-      // Unless the find and notification operations go thru, this
-      // method is not successful.
-
-      if (result == -1)
-        find_result = -1;
-      else
-        {
-          // Since the <cache_value> has now changed after the
-          // notification, we need to bind to the map again.
-          int rebind_result = this->map_.rebind (key,
-                                                 cache_value);
-          if (rebind_result == -1)
-            find_result = -1;
-          else
-            value = cache_value.first ();
-        }
-    }
-
-  return find_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::find (const KEY &key)
-{
-  // Lookup the key and populate the <value>.
-  CACHE_VALUE cache_value;
-
-  int find_result = this->map_.find (key,
-                                     cache_value);
-  if (find_result != -1)
-  {
-    int result = this->caching_strategy_.notify_find (find_result,
-                                                      cache_value.second ());
-    // Unless the find and notification operations go thru, this
-    // method is not successful.
-    if (result == -1)
-      find_result = -1;
-    else
-      {
-        // Since the <cache_value> has now changed after the
-        // notification, we need to bind to the map again.
-        int rebind_result = this->map_.rebind (key,
-                                               cache_value);
-        if (rebind_result == -1)
-          find_result = -1;
-      }
-  }
-  return find_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::find (const KEY &key,
-                                                                                           ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::CACHE_ENTRY *&entry)
-{
-  // @@ No rebind in this case!
-
-  // Lookup the key and populate the <value>.
-  int find_result = this->map_.find (key,
-                                     entry);
-  if (find_result != -1)
-    {
-      int result = this->caching_strategy_.notify_find (find_result,
-                                                        entry->int_id_.second ());
-      // Unless the find and notification operations go thru, this
-      // method is not successful.
-      if (result == -1)
-        find_result = -1;
-      else
-        {
-          // Since the <cache_value> has now changed after the
-          // notification, we need to bind to the map again.
-          int rebind_result = this->map_.rebind (key,
-                                                 entry->int_id_);
-          if (rebind_result == -1)
-            find_result = -1;
-        }
-    }
-  return find_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::unbind (const KEY &key)
-{
-  // Remove the entry from the cache.
-  CACHE_VALUE cache_value;
-
-  int unbind_result = this->map_.unbind (key,
-                                         cache_value);
-
-  if (unbind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          cache_value.second ());
-
-      if (result == -1)
-        unbind_result = -1;
-    }
-
-  return unbind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::unbind (const KEY &key,
-                                                                                             VALUE &value)
-{
-  // Remove the entry from the cache.
-  CACHE_VALUE cache_value;
-
-  int unbind_result = this->map_.unbind (key,
-                                         cache_value);
-
-  if (unbind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          cache_value.second ());
-      if (result == -1)
-        unbind_result = -1;
-      else
-        value = cache_value.first ();
-    }
-
-  return unbind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::unbind (ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::CACHE_ENTRY *entry)
-{
-  // Remove the entry from the cache.
-  int unbind_result = this->map_.unbind (entry);
-
-  if (unbind_result != -1)
-    {
-      int result = this->caching_strategy_.notify_unbind (unbind_result,
-                                                          entry->int_id_.second ());
-      if (result == -1)
-        unbind_result = -1;
-    }
-
-  return unbind_result;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> void
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::dump (void) const
-{
-  this->map_.dump ();
-  this->caching_strategy_.dump ();
-}
-
-#endif /* ACE_OPTIMAL_CACHE_MAP_MANAGER_T_C */
diff --git a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.h b/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.h
deleted file mode 100644
index 31a707638e1..00000000000
--- a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    Optimal_Cache_Map_Manager.h
-//
-// = AUTHOR
-//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef OPTIMAL_CACHE_MAP_MANAGER_T_H
-#define OPTIMAL_CACHE_MAP_MANAGER_T_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define  ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Pair_T.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-// Forward declaration.
-class ACE_Allocator;
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY>
-class ACE_Optimal_Cache_Map_Iterator;
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY>
-class ACE_Optimal_Cache_Map_Reverse_Iterator;
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY>
-class ACE_Optimal_Cache_Map_Manager
-{
-  // = TITLE
-  //     Defines a abstraction which will purge entries from a map.
-  //     The map considered is the ACE_Hash_Map_Manager.
-  //
-  // = DESCRIPTION
-
-  //     The Optimal_Cache_Map_Manager will manage the map it contains
-  //     and provide purging on demand from the map. The strategy for
-  //     caching is decided by the user and provided to the Cache
-  //     Manager.  The Cache Manager acts as a agent and communicates
-  //     between the Map and the Strategy for purging entries from the
-  //     map.  To tap the optimal methods like find(key,value,entry)
-  //     present in the ACE_Hash_Map_Manager,
-  //     Optimal_Cache_Map_Manager provides extra functionality on top
-  //     of the Cache_Map_Manager.
-  //
-  //     No locking mechanism provided since locking at this level
-  //     isnt efficient.  Locking has to be provided by the
-  //     application.
-public:
-
-  // = Traits.
-  typedef KEY key_type;
-  typedef VALUE mapped_type;
-
-  typedef ACE_TYPENAME CACHING_STRATEGY::ATTRIBUTES ATTRIBUTES;
-  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.
-
-  typedef ACE_Hash_Map_Manager_Ex<KEY, CACHE_VALUE, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> MAP;
-  typedef ACE_Hash_Map_Entry<KEY, CACHE_VALUE> CACHE_ENTRY;
-
-  friend class ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>;
-  friend class ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>;
-
-  // = ACE-style iterator typedefs.
-  typedef ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> ITERATOR;
-  typedef ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> REVERSE_ITERATOR;
-
-   // = STL-style iterator typedefs.
-  typedef ITERATOR iterator;
-  typedef REVERSE_ITERATOR reverse_iterator;
-
-  // = Initialization and termination methods.
-  ACE_Optimal_Cache_Map_Manager (ACE_Allocator *alloc = 0,
-                                 ATTRIBUTES attributes = 0,
-                                 int purge_percent = 10);
-  // Initialize a <Optimal_Cache_Map_Manager> with the <ACE_DEFAULT_MAP_SIZE>.
-
-  ACE_Optimal_Cache_Map_Manager (size_t size,
-                                 ACE_Allocator *alloc = 0,
-                                 ATTRIBUTES attributes = 0,
-                                 int purge_percent = 10 );
-  // Initialize a <Optimal_Cache_Map_Manager> with <size> entries.
-
-  ~ACE_Optimal_Cache_Map_Manager (void);
-  // Close down a <Optimal_Cache_Map_Manager> and release dynamically allocated
-  // resources.
-
-  int open (size_t length = ACE_DEFAULT_MAP_SIZE,
-            ACE_Allocator *alloc = 0);
-  // Initialise a cache with size <length>.
-
-  int close (void);
-  // Close down a cache and release dynamically allocated resources.
-
-  int bind (const KEY &key,
-            const VALUE &value);
-  // Associate <key> with <value>.  If <key> is already in the
-  // MAP then the ENTRY is not changed.  Returns 0 if a new entry is
-  // bound successfully, returns 1 if an attempt is made to bind an
-  // existing entry, and returns -1 if failures occur.
-
-  int bind (const KEY &key,
-            const VALUE &value,
-            ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry);
-  // Same as a normal bind, except the cache entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-  int find (const KEY &key,
-            VALUE &value);
-  // Loopkup entry<key,value> in the cache.
-
-  int find (const KEY &key);
-  // Is <key> in the cache?
-
-  int find (const KEY &key,
-            ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry);
-  // Obtain the entry when the find succeeds.
-
-  int rebind (const KEY &key,
-              const VALUE &value);
-  // Reassociate the <key> with <value>. If the <key> already exists
-  // in the cache then returns 1, on a new bind returns 0 and returns
-  // -1 in case of any failures.
-
-  int rebind (const KEY &key,
-              const VALUE &value,
-              VALUE &old_value);
-  // Reassociate <key> with <value>, storing the old value into the
-  // "out" parameter <old_value>.  The function fails if <key> is not
-  // in the cache for caches that do not allow user specified keys.
-  // However, for caches that allow user specified keys, if the key is
-  // not in the cache, a new <key>/<value> association is created.
-
-  int rebind (const KEY &key,
-              const VALUE &value,
-              KEY &old_key,
-              VALUE &old_value);
-  // Reassociate <key> with <value>, storing the old key and value
-  // into the "out" parameters <old_key> and <old_value>.  The
-  // function fails if <key> is not in the cache for caches that do not
-  // allow user specified keys.  However, for caches that allow user
-  // specified keys, if the key is not in the cache, a new <key>/<value>
-  // association is created.
-
-  int rebind (const KEY &key,
-              const VALUE &value,
-              ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry);
-  // Same as a normal rebind, except the cache entry is also passed back
-  // to the caller.  The entry in this case will either be the newly
-  // created entry, or the existing one.
-
-  int trybind (const KEY &key,
-               VALUE &value);
-  // Associate <key> with <value> if and only if <key> is not in the
-  // cache.  If <key> is already in the cache, then the <value> parameter
-  // is overwritten with the existing value in the cache. Returns 0 if a
-  // new <key>/<value> association is created.  Returns 1 if an
-  // attempt is made to bind an existing entry.  This function fails
-  // for maps that do not allow user specified keys.
-
-  int trybind (const KEY &key,
-               VALUE &value,
-               ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *&entry);
-  // Same as a normal trybind, except the cache entry is also passed
-  // back to the caller.  The entry in this case will either be the
-  // newly created entry, or the existing one.
-
-  int unbind (const KEY &key);
-  // Remove <key> from the cache.
-
-  int unbind (const KEY &key,
-              VALUE &value);
-  // Remove <key> from the cache, and return the <value> associated with
-  // <key>.
-
-  int unbind (ACE_Hash_Map_Entry<KEY, ACE_Pair<VALUE, ATTRIBUTES> > *entry);
-  // Remove entry from map.
-
-  int purge (void);
-  // Remove entries from the cache depending upon the strategy.
-
-  size_t current_size (void);
-  // Return the current size of the cache.
-
-  size_t total_size (void);
-  // Return the total size of the cache.
-
-  void dump (void) const;
-  // Dumps the state of the object.
-
-  // = STL styled iterator factory functions.
-
-  ITERATOR begin (void);
-  ITERATOR end (void);
-  // Return forward iterator.
-
-  REVERSE_ITERATOR rbegin (void);
-  REVERSE_ITERATOR rend (void);
-  // Return reverse iterator.
-
-protected:
-
-  ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>  &map (void);
-  // The map managed by the Optimal_Cache_Map_Manager.
-
-  CACHING_STRATEGY &caching_strategy (void);
-  // The caching strategy used on the cache.
-
-  ACE_Hash_Map_Manager_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex>  map_;
-  // The underlying map which needs to be cached.
-
-  CACHING_STRATEGY caching_strategy_;
-  // The strategy to be followed for caching entries in the map.
-};
-////////////////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY>
-class ACE_Optimal_Cache_Map_Iterator
-{
-  // = TITLE
-  //     Defines a iterator for the Optimal_Cache_Map_Manager.
-  //
-  // = DESCRIPTION
-  //     Implementation to be provided by the iterator of the map
-  //     managed by the ACE_Optimal_Cache_Map_Manager.
-
-public:
-
-  // = Traits.
-  typedef ACE_TYPENAME CACHING_STRATEGY::ATTRIBUTES ATTRIBUTES;
-  typedef ACE_Pair <VALUE, ATTRIBUTES> CACHE_VALUE;
-  // The actual value mapped to the key in the cache. The <attributes>
-  // are used by the strategy and is transperant to the cache user.
-
-  typedef ACE_Reference_Pair<KEY, VALUE> value_type;
-  typedef ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> IMPLEMENTATION;
-  // = Initialisation and termination methods.
-
-  ACE_Optimal_Cache_Map_Iterator (const ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> &iterator_impl);
-
-  ACE_Optimal_Cache_Map_Iterator (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // Copy constructor.
-
-  ~ACE_Optimal_Cache_Map_Iterator (void);
-
-  // = Iteration methods.
-
-  ACE_Optimal_Cache_Map_Iterator &operator= (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // assignment operator.
-
-  int operator== (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  int operator!= (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // Comparision operators.
-
-  ACE_Reference_Pair<KEY, VALUE> operator* (void) const;
-  // Returns a reference to the internal element <this> is pointing to.
-
-  // = STL styled iteration, compare, and reference functions.
-
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &operator++ (void);
-  // Prefix advance
-
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> operator++ (int);
-  // Postfix advance.
-
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &operator-- (void);
-  // Prefix reverse.
-
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> operator-- (int);
-  // Postfix reverse.
-
-  ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> iterator_implementation (void) const;
-  // Returns the iterator of the internal map in the custody of the Optimal_Cache_Map_Manager.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-  ACE_Hash_Map_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> iterator_implementation_;
-  // The actual iterator which iterates internally on the map
-  // belonging to the Optimal_Cache_Map_Manager.
-};
-
-////////////////////////////////////////////////////////////////////////////////
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY>
-class ACE_Optimal_Cache_Map_Reverse_Iterator
-{
-  // = TITLE
-  //     Defines a reverse iterator for the Optimal_Cache_Map_Manager.
-  //
-  // = DESCRIPTION
-  //     Implementation to be provided by the reverse iterator of the map
-  //     managed by thr Optimal_Cache_Map_manager.
-
-public:
-
-  // = Traits.
-  typedef ACE_TYPENAME CACHING_STRATEGY::ATTRIBUTES ATTRIBUTES;
-  typedef ACE_Pair <VALUE, ATTRIBUTES> CACHE_VALUE;
-  // The actual value mapped to the key in the cache. The <attributes>
-  // are used by the strategy and is transperant to the cache user.
-
-  typedef ACE_Reference_Pair<KEY, VALUE> value_type;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> REVERSE_IMPLEMENTATION;
-  // = Initialisation and termination methods.
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator (const REVERSE_IMPLEMENTATION &iterator_impl);
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // Copy constructor.
-
-  ~ACE_Optimal_Cache_Map_Reverse_Iterator (void);
-
-  // = Iteration methods.
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator &operator= (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // Assignment operator.
-
-  int operator== (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  int operator!= (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs);
-  // Comparision operators.
-
-  ACE_Reference_Pair<KEY, VALUE> operator* (void) const;
-  // Returns a reference to the internal element <this> is pointing to.
-
-  // = STL styled iteration, compare, and reference functions.
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &operator++ (void);
-  // Prefix advance
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> operator++ (int);
-  // Postfix advance.
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &operator-- (void);
-  // Prefix reverse.
-
-  ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> operator-- (int);
-  // Postfix reverse.
-
-  ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> iterator_implementation (void) const;
-  // Returns the iterator of the internal map in the custody of the Optimal_Cache_Map_Manager.
-
-  void dump (void) const;
-  // Dump the state of an object.
-
-  ACE_ALLOC_HOOK_DECLARE;
-  // Declare the dynamic allocation hooks.
-
-protected:
-  ACE_Hash_Map_Reverse_Iterator_Ex<KEY, ACE_Pair<VALUE, ATTRIBUTES>, HASH_KEY, COMPARE_KEYS, ACE_Null_Mutex> reverse_iterator_implementation_;
-  // The actual iterator which iterates internally on the map
-  // belonging to the Optimal_Cache_Map_Manager.
-};
-
-#if defined (__ACE_INLINE__)
-#include "Optimal_Cache_Map_Manager_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "Optimal_Cache_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation "Optimal_Cache_Map_Manager_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#endif /* OPTIMAL_CACHE_MAP_MANAGER_T_H */
diff --git a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.i b/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.i
deleted file mode 100644
index 99c13e20c28..00000000000
--- a/examples/Web_Crawler/Optimal_Cache_Map_Manager_T.i
+++ /dev/null
@@ -1,289 +0,0 @@
-/* -*- C++ -*- */
-//$Id$
-
-// @@ don't inline this
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Manager (ACE_Allocator *alloc,
-                                                                                                                    ATTRIBUTES attributes,
-                                                                                                                    int purge_percent)
-  :map_ (alloc),
-   // @@ Remove attributes and purge_percent from the constructor of the caching strategy
-   caching_strategy_ (map_, attributes, purge_percent)
-
-  // @@ Add the ability for the user to pass in a caching strategy.
-{
-}
-
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Manager (size_t size,
-                                                                                                                     ACE_Allocator *alloc,
-                                                                                                                     ATTRIBUTES attributes,
-                                                                                                                     int purge_percent)
-  :map_ (size,
-         alloc),
-   caching_strategy_ (map_, attributes, purge_percent)
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::~ACE_Optimal_Cache_Map_Manager (void)
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::open (size_t length,
-                                                                                            ACE_Allocator *alloc)
-{
-  return this->map_.open (length,
-                          alloc);
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::purge (void)
-{
-  // @@ Remove debugging statements.
-  ACE_DEBUG ((LM_DEBUG, "ACE_Optimal_Cache_Map_Manager::PURGE\n"));
-
-  // @@ Why does this need the map again?  Didn't we pass this in the
-  // constructor?
-  return this->caching_strategy ().clear_cache (this->map ());
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE size_t
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::current_size (void)
-{
-  return this->map_.current_size ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE size_t
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::total_size (void)
-{
-  return this->map_.total_size ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::close (void)
-{
-  return this->map_.close ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::MAP &
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::map (void)
-{
-  return this->map_;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE CACHING_STRATEGY &
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::caching_strategy (void)
-{
-  return this->caching_strategy_;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ITERATOR
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::begin (void)
-{
-  return ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ITERATOR (this->map_.begin ());
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE  ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ITERATOR
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::end (void)
-{
-  return ACE_Optimal_Cache_Map_Manager<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ITERATOR (this->map_.end ());
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE  ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_ITERATOR
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rbegin (void)
-{
-  return ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_ITERATOR (this->map_.rbegin ());
-}
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_ITERATOR
-ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::rend (void)
-{
-  return ACE_Optimal_Cache_Map_Manager<KEY, VALUE,  HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_ITERATOR (this->map_.rend ());
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Iterator (const ACE_Optimal_Cache_Map_Iterator <KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
- : iterator_implementation_ (rhs.iterator_implementation ())
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::~ACE_Optimal_Cache_Map_Iterator (void)
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator= (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  this->iterator_implementation_ = rhs.iterator_implementation ();
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator== (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  return this->iterator_implementation_ == rhs.iterator_implementation ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator!= (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  return this->iterator_implementation_ != rhs.iterator_implementation ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator* (void) const
-{
-  value_type retv ((*this->iterator_implementation_).ext_id_, (*this->iterator_implementation_).int_id_.first ());
-  return retv;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator++ (void)
-{
-  ++this->iterator_implementation_;
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator++ (int)
-{
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> retn = *this;
-  ++this->iterator_implementation_;
-  return retn;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator-- (void)
-{
-  --this->iterator_implementation_;
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator-- (int)
-{
-  ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> retn = *this;
-  --this->iterator_implementation_;
-  return *this;
-}
-
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE void
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::dump (void) const
-{
-  return this->iterator_implementation_.dump ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Iterator (const ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::IMPLEMENTATION &iterator_impl)
- : iterator_implementation_ (iterator_impl)
-{
-}
-
-// @@ Don't pass this return value by value. Pass it back via reference.
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::IMPLEMENTATION
-ACE_Optimal_Cache_Map_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::iterator_implementation (void) const
-{
-  return this->iterator_implementation_;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// @@ Fix reverse iterator similar to the regular iterator
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Reverse_Iterator (const ACE_Optimal_Cache_Map_Reverse_Iterator <KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
- : reverse_iterator_implementation_ (rhs.iterator_implementation ())
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::~ACE_Optimal_Cache_Map_Reverse_Iterator (void)
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator= (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  this->reverse_iterator_implementation_ = rhs.iterator_implementation ();
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator== (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  return this->reverse_iterator_implementation_ == rhs.iterator_implementation ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE int
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator!= (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &rhs)
-{
-  return this->reverse_iterator_implementation_ != rhs.iterator_implementation ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Reference_Pair<KEY, VALUE>
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator* (void) const
-{
-  value_type retv ((*this->reverse_iterator_implementation_).ext_id_, (*this->reverse_iterator_implementation_).int_id_.first ());
-  return retv;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator++ (void)
-{
-  this->reverse_iterator_implementation_.operator++ ();
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator++ (int)
-{
-  this->reverse_iterator_implementation_.operator++ (1);
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY> &
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator-- (void)
-{
-  this->reverse_iterator_implementation_.operator-- ();
-  return *this;
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::operator-- (int)
-{
-  this->reverse_iterator_implementation_.operator-- (1);
-  return *this;
-}
-
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE void
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::dump (void) const
-{
-  return this->reverse_iterator_implementation_.dump ();
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::ACE_Optimal_Cache_Map_Reverse_Iterator (const ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_IMPLEMENTATION &iterator_impl)
- : reverse_iterator_implementation_(iterator_impl)
-{
-}
-
-template <class KEY, class VALUE, class HASH_KEY, class COMPARE_KEYS, class CACHING_STRATEGY> ACE_INLINE ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::REVERSE_IMPLEMENTATION
-ACE_Optimal_Cache_Map_Reverse_Iterator<KEY, VALUE, HASH_KEY, COMPARE_KEYS, CACHING_STRATEGY>::iterator_implementation (void) const
-{
-  return this->reverse_iterator_implementation_;
-}
diff --git a/examples/Web_Crawler/Options.cpp b/examples/Web_Crawler/Options.cpp
deleted file mode 100644
index 14d862dd5c4..00000000000
--- a/examples/Web_Crawler/Options.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "URL_Addr.h"
-#include "Options.h"
-
-ACE_RCSID(Web_Crawler, Options, "$Id$")
-
-int 
-Options::parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("df:h:i:l:rt:u:vo:p:"));
-
-  ACE_LOG_MSG->open (argv[0]);
-
-  this->hostname_ = "www.cs.wustl.edu";
-  this->uri_ = "index.html";
-  this->recurse_ = 0;
-  this->debug_ = 0;
-  this->timeout_.sec (ACE_DEFAULT_TIMEOUT);
-  this->url_filter_ = 0;
-  this->verbose_ = 0;
-  this->order_ = "FIFO";
-  this->port_no_ = ACE_DEFAULT_HTTP_PORT;
-  
-  // The default is to make this limit as large as possible.
-  this->handle_limit_ = -1;
-
-  for (int c;
-       (c = getopt ()) != EOF;
-       )
-    switch (c)
-      {
-      case 'd':
-        this->debug_ = 1;
-        break;
-      case 'f':
-        this->url_filter_ = getopt.optarg;
-        break;
-      case 'h':
-        this->hostname_ = getopt.optarg;
-        break;
-      case 'i':
-        this->uri_ = getopt.optarg;
-        break;
-      case 'l':
-        this->handle_limit_ = ACE_OS::atoi (getopt.optarg);
-        break;
-      case 'r':
-        this->recurse_ = 1;
-        break;
-      case 't':
-        this->timeout_.sec (ACE_OS::atoi (getopt.optarg));
-        break;
-      case 'u':
-        {
-          this->hostname_ = getopt.optarg;
-          char *s = ACE_OS::strchr (getopt.optarg, '/');
-          if (s != 0)
-            {
-              this->uri_ = s + 1;
-              *s = '\0';
-            }
-          else
-            ACE_ERROR ((LM_ERROR,
-                        "invalid URL %s\n",
-                        getopt.optarg));
-        }
-        break;
-      case 'v':
-        this->verbose_ = 1;
-        break;
-      case 'o':
-        {
-        this->order_ = getopt.optarg;
-        }
-        break;
-      case 'p':
-        this->port_no_ = ACE_OS::atoi (getopt.optarg);
-        break;
-      default:
-        ACE_ERROR ((LM_ERROR,
-                    "usage: %n [-d] [-f filter] [-h hostname]"
-                    " [-l handle-limit] [-r] [-t timeout] [-u URI]"
-                    " [-v]\n%a",
-                    1));
-
-        /* NOTREACHED */
-      }
-
-  return 0;
-}
-
-int 
-Options::port_no (void) const
-{
-  return this->port_no_;
-}
-
-int
-Options::recurse (void) const
-{
-  return this->recurse_;
-}
-
-const ACE_Time_Value *
-Options::timeout (void) const
-{
-  return &this->timeout_;
-}
-
-int
-Options::debug (void) const
-{
-  return this->debug_;
-}
-
-int
-Options::verbose (void) const
-{
-  return this->verbose_;
-}
-
-LPCTSTR 
-Options::order (void) const
-{
-  return this->order_;
-}
-LPCTSTR
-Options::hostname (void) const
-{
-  return this->hostname_;
-}
-
-LPCTSTR
-Options::path_name (void) const
-{
-  return this->uri_;
-}
-
-LPCTSTR
-Options::url_filter (void) const
-{
-  return this->url_filter_;
-}
-
-Command_Processor *
-Options::command_processor (void) const
-{
-  return this->command_processor_;
-}
-
-void
-Options::command_processor (Command_Processor *cp)
-{
-  this->command_processor_ = cp;
-}
-
-URL_Visitor *
-Options::visitor (void) const
-{
-  return this->visitor_;
-}
-
-void
-Options::visitor (URL_Visitor *v)
-{
-  this->visitor_ = v;
-}
-
-int 
-Options::handle_limit (void)
-{
-  return this->handle_limit_;
-}
diff --git a/examples/Web_Crawler/Options.h b/examples/Web_Crawler/Options.h
deleted file mode 100644
index e7f38b74d71..00000000000
--- a/examples/Web_Crawler/Options.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    Options.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _OPTIONS_H
-#define _OPTIONS_H
-
-#include "ace/Singleton.h"
-#include "ace/Synch.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward decls.
-class Command_Processor;
-class URL_Visitor;
-
-class Options
-{
-  // = TITLE
-  //   Maintains the global options.
-  //
-  // = DESCRIPTION
-  //   This class is converted into a Singleton by the 
-  //   <ACE_Singleton> template.
-public:
-  int parse_args (int argc, char *argv[]);
-  // Parse the command-line arguments and initialize the options.
-
-  int recurse (void) const;
-  // If non-0 and the link is an HTML file then recursively check all
-  // links that are embedded in the body of file.
-
-  LPCTSTR hostname (void) const;
-  // Return the hostname of the initial Web server.
-
-  LPCTSTR path_name (void) const;
-  // Return the initial URI.
-
-  LPCTSTR url_filter (void) const;
-  // String used to filter out which URLs to validate.
-
-  int debug (void) const;
-  // Are we debugging?
-
-  int verbose (void) const;
-  // Are we being verbose?
-
-  LPCTSTR order (void) const;
-  // Which order? LIFO|FIFO??
-
-  int port_no (void) const;
-  // Port #
-
-  const ACE_Time_Value *timeout (void) const;
-  // Return the timeout used to prevent hanging on <recv> and
-  // <connect> calls to broken servers.
-
-  // = Get/set the <Command_Processor>.
-  Command_Processor *command_processor (void) const;
-  void command_processor (Command_Processor *);
-
-  // = Get/set the <URL_Visitor>.
-  URL_Visitor *visitor (void) const;
-  void visitor (URL_Visitor *);
-
-  // Get the handle_limit.
-  int handle_limit (void);
-private:  
-  int recurse_;
-  // Are we recursving.
-
-  LPCTSTR hostname_;
-  // Initial Web server name.
-
-  LPCTSTR uri_;
-  // Initial URI name.
-
-  int debug_;
-  // Are we debugging?
-
-  int verbose_;
-  // Are we being verbose?
-
-  LPCTSTR order_;
-  // Whether the URLs are traversed in FIFO or LIFO order.
-
-  ACE_Time_Value timeout_;
-  // Timeout on <recv> and <connect> to broken Web servers.
-
-  LPCTSTR url_filter_;
-  // String used to filter out which URLs to validate.
-
-  Command_Processor *command_processor_;
-  // Pointer to the Command_Processor.
-
-  URL_Visitor *visitor_;
-  // Pointer to the <URL_Visitor>.
-
-  int port_no_;
-  // Port no.
-  
-  int handle_limit_;
-  // The limit of the number of descriptors to be given for this process.
-};
-
-// Typedef an Options Singleton. 
-typedef ACE_Singleton <Options, ACE_Null_Mutex> OPTIONS;
-
-#endif /* _OPTIONS_H */
diff --git a/examples/Web_Crawler/README b/examples/Web_Crawler/README
deleted file mode 100644
index 4f81809173d..00000000000
--- a/examples/Web_Crawler/README
+++ /dev/null
@@ -1,25 +0,0 @@
-Web Crawler                                     Kirthika Parameswaran
------------
-
-The Web Crawler follows the  HTTP_1.1 protocol.
- 
-This Crawler crawls in  either FIFO or LIFO order over the URLs
-now stored in a ACE_Unbounded_Queue. The Command Processor pattern is 
-used in this example. 
-
-Also the auto-purging feature where connections are removed from the cache
-when the process runs out of file descriptors, is added to this example.
-
-[Use the -l option to set the handle limit].
-
-Run:
----
-
-
-> make 
-
-> main -r -u www.cs.wustl.edu/~kirthika/test.html -o LIFO
-
-or
-
-> main -r -u www.cs.wustl.edu/~kirthika/test.html -o FIFO
diff --git a/examples/Web_Crawler/URL.cpp b/examples/Web_Crawler/URL.cpp
deleted file mode 100644
index ce52ed892ad..00000000000
--- a/examples/Web_Crawler/URL.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-#include "URL.h"
-
-ACE_RCSID(Web_Crawler, URL, "$Id$")
-
-Mem_Map_Stream &
-URL::stream (void)
-{
-  return this->stream_;
-}
-
-URL::~URL (void)
-{
-}
-
-const URL_Status &
-URL::reply_status (void)
-{
-  return this->reply_status_;
-}
-
-void 
-URL::reply_status (const URL_Status &rs)
-{
-  this->reply_status_ = rs;
-}
-
-const ACE_CString &
-URL::content_type (void)
-{
-  return this->content_type_;
-}
-
-void 
-URL::content_type (const ACE_CString &ct)
-{
-  this->content_type_ = ct;
-}
diff --git a/examples/Web_Crawler/URL.h b/examples/Web_Crawler/URL.h
deleted file mode 100644
index 5b1df98be71..00000000000
--- a/examples/Web_Crawler/URL.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    URL.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _URL_H
-#define _URL_H
-
-#include "Mem_Map_Stream.h"
-#include "URL_Addr.h"
-#include "URL_Status.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declaration.
-class URL_Visitor;
-
-class URL
-{
-  // = TITLE
-  //    Base class for a URL.
-  // 
-  // = DESCRIPTION
-  //    This class plays a role in the Visitor pattern.
-public:
-  virtual ~URL (void);
-  // Destructor.
-
-  virtual int accept (URL_Visitor *visitor) = 0;
-  // Accept the visitor, which will then perform a particular
-  // visitation strategy on the URL.  This method is part of the
-  // Visitor pattern.
-
-  virtual int send_request (void) = 0;
-  // Send a <GET> command to fetch the contents in the URI from the
-  // server.
-  
-  virtual const ACE_URL_Addr &url_addr (void) const = 0;
-  // Returns the URL that we represent.
-
-  virtual Mem_Map_Stream &stream (void);
-  // Returns the <Mem_Map_Stream>.
-
-  // = Get/set the reply status.
-  virtual const URL_Status &reply_status (void);
-  virtual void reply_status (const URL_Status &);
-
-  // = Get/set the reply status.
-  virtual const ACE_CString &content_type (void);
-  virtual void content_type (const ACE_CString &);
-
-  
-
-private:
-  URL_Status reply_status_;
-  // Reply status of the URL.
-
-  ACE_CString content_type_;
-  // Content-type of the URL.
-
-  Mem_Map_Stream stream_;
-  // Contents of the stream.
-};
-
-#endif /* _URL_H */
diff --git a/examples/Web_Crawler/URL_Addr.cpp b/examples/Web_Crawler/URL_Addr.cpp
deleted file mode 100644
index b60a2c54e06..00000000000
--- a/examples/Web_Crawler/URL_Addr.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-#include "URL_Addr.h"
-
-ACE_RCSID(Web_Crawler, URL_Addr, "$Id$")
-
-ACE_URL_Addr::ACE_URL_Addr (void)
-  : path_name_ (0),
-    addr_string_ (0),
-    addr_string_len_ (0)
-{
-}
-
-int
-ACE_URL_Addr::addr_to_string (LPTSTR s,
-                              size_t size,
-                              int ipaddr_format) const
-{
-  size_t total_len =
-    ACE_OS::strlen (ipaddr_format == 0 ?
-                    this->get_host_name () :
-                    this->get_host_addr ())
-    + ACE_OS::strlen ("65536") // Assume the max port number.
-    + ACE_OS::strlen (this->get_path_name ())
-    + sizeof (':')
-    + sizeof ('/')
-    + sizeof ('\0'); // For trailing '\0'.
-
-  if (size < total_len)
-    return -1;
-  else
-    {
-      ACE_OS::sprintf (s, ASYS_TEXT ("%s:%d/%s"),
-                       ASYS_WIDE_STRING (ipaddr_format == 0 
-                                         ? this->get_host_name ()
-                                         : this->get_host_addr ()),
-                       this->get_port_number (),
-                       this->get_path_name ());
-      return 0;
-    }
-}
-
-LPCTSTR 
-ACE_URL_Addr::addr_to_string (int ipaddr_format) const
-{
-  ACE_URL_Addr *this_ptr = ACE_const_cast (ACE_URL_Addr *,
-                                           this);
-
-  size_t size =
-    ACE_OS::strlen (ipaddr_format == 0 ?
-                    this->get_host_name () :
-                    this->get_host_addr ())
-    + ACE_OS::strlen ("65536") // Assume the max port number.
-    + ACE_OS::strlen (this->get_path_name ())
-    + sizeof (':')
-    + sizeof ('/')
-    + sizeof ('\0'); // For trailing '\0'.
-
-  if (size > this->addr_string_len_)
-    {
-      ACE_ALLOCATOR_RETURN (this_ptr->addr_string_,
-                            (LPTSTR) ACE_OS::realloc ((void *) this->addr_string_,
-                                                      size),
-                            0);
-      this_ptr->addr_string_len_ = size;
-    }
-  ACE_OS::sprintf (this->addr_string_,
-                   ASYS_TEXT ("%s:%d/%s"),
-                   ASYS_WIDE_STRING (ipaddr_format == 0 
-                                     ? this->get_host_name ()
-                                     : this->get_host_addr ()),
-                   this->get_port_number (),
-                   this->get_path_name ());
-  return this->addr_string_;
-}
-
-int 
-ACE_URL_Addr::string_to_addr (LPCTSTR s)
-{
-  int result;
-  LPTSTR t;
-
-  // Need to make a duplicate since we'll be overwriting the string.
-  ACE_ALLOCATOR_RETURN (t,
-                        ACE_OS::strdup (s),
-                        -1);
-
-
-  // First split off the path_name.
-
-  LPTSTR path_name = ACE_OS::strchr (t, '/');
-  LPCTSTR name = "index.html";
-  if (path_name != 0)
-    {
-      if (ACE_OS::strlen (path_name + 1) > 0)
-        name = path_name + 1;
-
-      *path_name = '\0';
-    }
-
-  ACE_ALLOCATOR_RETURN (this->path_name_,
-                        // Skip over '/'
-                        ACE_OS::strdup (name),
-                        -1);
-
-  // Now handle the host address and port number.
-  LPTSTR port_number = ACE_OS::strchr (t, ':');
-
-  if (port_number == 0) 
-    {
-      // Assume it's an ip-address or ip-number.
-      result = this->ACE_INET_Addr::set (ACE_DEFAULT_HTTP_PORT,
-                                         t);
-    }
-  else
-    {
-      *port_number = '\0';
-      u_short port = (u_short) ACE_OS::atoi (port_number + 1); // Skip over ':'
-      result = this->ACE_INET_Addr::set (port, t);
-    }
-
-  ACE_OS::free (ACE_MALLOC_T (t));
-  return result;
-}
-
-ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr &addr)
-  : path_name_ (0),
-    addr_string_ (0),
-    addr_string_len_ (0)
-{
-  if (this->set (addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_URL_Addr::ACE_URL_Addr")));
-}
-
-int 
-ACE_URL_Addr::set (const ACE_URL_Addr &addr)
-{
-  ACE_OS::free (ACE_reinterpret_cast (void *, 
-                                      ACE_const_cast (char *,
-                                                      this->path_name_)));
-  ACE_OS::free (ACE_reinterpret_cast (void *, 
-                                      ACE_const_cast (char *,
-                                                      this->addr_string_)));
-  if (this->ACE_INET_Addr::set (addr) == -1)
-    return -1;
-  else
-    {
-      if (addr.path_name_)
-        ACE_ALLOCATOR_RETURN (this->path_name_,
-                              ACE_OS::strdup (addr.path_name_),
-                              -1);
-      if (addr.addr_string_)
-        ACE_ALLOCATOR_RETURN (this->addr_string_,
-                              ACE_OS::strdup (addr.addr_string_),
-                              -1);
-      this->addr_string_len_ =
-        addr.addr_string_len_;
-      return 0;
-    }
-}
-
-void
-ACE_URL_Addr::operator= (const ACE_URL_Addr &addr)
-{
-  if (this->set (addr) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("ACE_URL_Addr::ACE_URL_Addr")));
-}
-
-u_long
-ACE_URL_Addr::hash (void) const
-{
-  u_long result = this->ACE_INET_Addr::hash ()
-    + ACE::hash_pjw (this->get_path_name ());
-
-  return result;
-}
-
-int
-ACE_URL_Addr::operator== (const ACE_URL_Addr &addr) const
-{
-  return ACE_OS::strcmp (addr.get_path_name (), 
-                         this->get_path_name ()) == 0
-    && addr.get_port_number () == this->get_port_number ()
-    && addr.get_ip_address () == this->get_ip_address ();
-}
-
-int
-ACE_URL_Addr::operator!= (const ACE_URL_Addr &addr) const
-{
-  return !(*this == addr);
-}
-
-ACE_URL_Addr::ACE_URL_Addr (LPCTSTR host_name,
-                            LPCTSTR path_name,
-                            u_short port)
-  : ACE_INET_Addr (port, host_name),
-    path_name_ (ACE_OS::strdup (path_name)),
-    addr_string_ (0),
-    addr_string_len_ (0)
-{
-}
-
-LPCTSTR 
-ACE_URL_Addr::get_path_name (void) const
-{
-  return this->path_name_;
-}
-
-ACE_URL_Addr::~ACE_URL_Addr (void)
-{
-  ACE_OS::free (ACE_reinterpret_cast (void *, 
-                                      ACE_const_cast (LPTSTR,
-                                                      this->path_name_)));
-  ACE_OS::free (ACE_reinterpret_cast (void *, 
-                                      ACE_const_cast (LPTSTR,
-                                                      this->addr_string_)));
-  this->path_name_ = 0;
-}
-
-int 
-ACE_URL_Addr::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
diff --git a/examples/Web_Crawler/URL_Addr.h b/examples/Web_Crawler/URL_Addr.h
deleted file mode 100644
index 823d95f1cc8..00000000000
--- a/examples/Web_Crawler/URL_Addr.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    ace
-//
-// = FILENAME
-//    URL_Addr.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef ACE_URL_ADDR_H
-#define ACE_URL_ADDR_H
-
-#include "ace/INET_Addr.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_URL_Addr : public ACE_INET_Addr
-{
-  // = TITLE
-  //    Defines a URL address family address format.
-public:
-  // = Initialization and termination methods.
-  ACE_URL_Addr (void);
-  // Constructor.
-
-  ACE_URL_Addr (LPCTSTR host_name,
-                LPCTSTR path_name,
-                u_short port = ACE_DEFAULT_HTTP_PORT);
-
-  ACE_URL_Addr (const ACE_URL_Addr &addr);
-  // Copy constructor.
-
-  int set (const ACE_URL_Addr &addr);
-  // Essentially the copy constructor.
-
-  virtual int string_to_addr (LPCTSTR address);
-  // Initializes an <ACE_URL_Addr> from the <address>, which can be
-  // "ip-number:port-number/path-name" (e.g.,
-  // "www.cs.wustl.edu:1234/~schmidt/" "ip-number:port-number/path-name"
-  // (e.g., "128.252.166.57:1234/~schmidt").  If there is no ':' in
-  // the <address> it is assumed to be an ip-number or ip-address
-  // number, with the port number <ACE_DEFAULT_HTTP_PORT>.
-
-  virtual int addr_to_string (LPTSTR s,
-                              size_t size,
-                              int ipaddr_format = 1) const;
-  // Transform the current <ACE_INET_Addr> address into string format.
-  // If <ipaddr_format> is non-0 this produces
-  // "ip-number:port-number/path-name" (e.g.,
-  // "128.252.166.57:80/~schmidt/"), whereas if <ipaddr_format> is 0
-  // this produces "ip-name:port-number" (e.g.,
-  // "www.cs.wustl.edu:80/~schmidt/").  Returns -1 if the <size> of
-  // the <buffer> is too small, else 0.
-
-  virtual LPCTSTR addr_to_string (int ipaddr_format = 1) const;
-  // Transform the current <ACE_INET_Addr> address into string format.
-  // If <ipaddr_format> is non-0 this produces
-  // "ip-number:port-number/path-name" (e.g.,
-  // "128.252.166.57:80/~schmidt/"), whereas if <ipaddr_format> is 0
-  // this produces "ip-name:port-number" (e.g.,
-  // "www.cs.wustl.edu:80/~schmidt/").  Uses dynamic memory, which
-  // is allocated on demand and deallocated when the object is
-  // destroyed.  Returns -1 if dynamic memory fails, else 0.
-
-  void operator= (const ACE_URL_Addr &addr);
-  // Assignment operator.
-
-  ~ACE_URL_Addr (void);
-  // Destructor.
-
-  int operator == (const ACE_URL_Addr &SAP) const;
-  // Compare two addresses for equality.  The addresses are considered
-  // equal if they contain the same IP address, port number, and path
-  // name.
-
-  int operator != (const ACE_URL_Addr &SAP) const;
-  // Compare two addresses for inequality.
-
-  virtual u_long hash (void) const;
-  // Computes and returns hash value.
-
-  LPCTSTR get_path_name (void) const;
-  // Return the path name.
-
-  int destroy (void);
-  // Commit suicide.
-private:
-  LPTSTR path_name_;
-  // Our path name.
-
-  LPTSTR addr_string_;
-  // The dynamically address string that's used for the
-  // <addr_to_string> method.
-
-  size_t addr_string_len_;
-  // Current length of the <addr_string_>
-};
-
-#endif /* ACE_URL_ADDR_H */
diff --git a/examples/Web_Crawler/URL_Status.cpp b/examples/Web_Crawler/URL_Status.cpp
deleted file mode 100644
index 35a57420593..00000000000
--- a/examples/Web_Crawler/URL_Status.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "URL_Status.h"
-
-ACE_RCSID(Web_Crawler, URL_Status, "$Id$")
-
-URL_Status::URL_Status (STATUS_CODE code)
-  : status_ (code)
-{
-}
-
-URL_Status::URL_Status (const URL_Status &s)
-  : status_ (s.status_)
-{
-}
-
-URL_Status::STATUS_CODE
-URL_Status::status (void) const
-{
-  return this->status_;
-}
-
-void
-URL_Status::status (int s)
-{
-  this->status_ = URL_Status::STATUS_CODE (s);
-}
-
-void
-URL_Status::status (URL_Status::STATUS_CODE s)
-{
-  this->status_ = s;
-}
-
-int URL_Status::destroy (void)
-{
-  delete this;
-  return 0;
-}
diff --git a/examples/Web_Crawler/URL_Status.h b/examples/Web_Crawler/URL_Status.h
deleted file mode 100644
index fa8186d6e9a..00000000000
--- a/examples/Web_Crawler/URL_Status.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    URL_Status.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _URL_STATUS_H
-#define _URL_STATUS_H
-
-#include "ace/OS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class URL_Status
-{
-  // = TITLE
-public:
-  enum STATUS_CODE
-  {
-    STATUS_OK = 200,
-    STATUS_CREATED = 201,
-    STATUS_ACCEPTED = 202,
-    STATUS_NO_CONTENT = 204,
-    STATUS_MOVED_PERMANENTLY = 301,
-    STATUS_MOVED_TEMPORARILY = 302,
-    STATUS_NOT_MODIFIED = 304,
-    STATUS_BAD_REQUEST = 400,
-    STATUS_UNAUTHORIZED = 401,
-    STATUS_FORBIDDEN = 403,
-    STATUS_NOT_FOUND = 404,
-    STATUS_INTERNAL_SERVER_ERROR = 500,
-    STATUS_NOT_IMPLEMENTED = 501,
-    STATUS_BAD_GATEWAY = 502,
-    STATUS_SERVICE_UNAVAILABLE = 503,
-    STATUS_INSUFFICIENT_DATA = 399
-  };
-
-  URL_Status (STATUS_CODE = STATUS_INSUFFICIENT_DATA);
-  URL_Status (const URL_Status &);
-
-  STATUS_CODE status (void) const;
-  void status (int);
-  void status (STATUS_CODE);
-  int destroy (void);
-private:
-  STATUS_CODE status_;  
-};
-
-#endif /* _URL_STATUS_H */
diff --git a/examples/Web_Crawler/URL_Visitor.cpp b/examples/Web_Crawler/URL_Visitor.cpp
deleted file mode 100644
index c2a3f9b0701..00000000000
--- a/examples/Web_Crawler/URL_Visitor.cpp
+++ /dev/null
@@ -1,604 +0,0 @@
-// $Id$
-
-#include "URL_Visitor.h"
-#include "Command_Processor.h"
-
-ACE_RCSID(Web_Crawler, URL_Visitor, "$Id$")
-
-URL_Processing_Strategy::URL_Processing_Strategy (URL &url,
-                                                  URL_Iterator &iterator)
-  : url_ (url),
-    iterator_ (iterator)
-{
-}
-
-int
-URL_Processing_Strategy::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-URL_Download_Strategy::URL_Download_Strategy (URL &url,
-                                              URL_Iterator &iterator)
-  : URL_Processing_Strategy (url, iterator)
-{
-}
-
-int
-URL_Download_Strategy::execute (void)
-{
-  ACE_CString buffer;
-
-  // Extract all the contents of the Stream and print them to the
-  // file.
-  while (this->iterator_.next (buffer) != 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "%s",
-                buffer.c_str ()));
-
-  return 0;
-}
-
-HTTP_Header_Processing_Strategy::HTTP_Header_Processing_Strategy (URL &url,
-                                                                  URL_Iterator &iterator)
-  : URL_Processing_Strategy (url, iterator)
-{
-}
-
-int
-HTTP_Header_Processing_Strategy::execute (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "HEADER\n"));
-  // Set the get() position.Necessary since later a peek is done.
-  if (this->url_.stream ().get_char () == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n","Header Not Found"),
-                      -1);
-  char line_buf[BUFSIZ + 1];
-  ACE_CString line (line_buf);
-  // Get the lines in the header iteratively and check for status info.
-  int result = 1, i = 0;
-  for (i = 0, result = this->iterator_.next (line);
-       result > 0;
-       ++i, result = this->iterator_.next (line))
-    {
-      if (i == 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "LINE:%s", line.c_str ()));
-          // Assuming that the status-no is a space away.
-          int status_index = line.find ("HTTP", 0);
-          ACE_CString status = line.substring (status_index + 9, //HTTP/1.1 200
-                                               3);
-          // DONE ONLY FOR TEMP USE AS OF NOW THE HTTP_SERVER DOESNT SEND AN HEADER.
-          // ACE_CString status_buf ("200");
-          // status.set (status_buf.c_str (), 1);
-
-          ACE_DEBUG ((LM_DEBUG, "STATUS %s\n", status.c_str ()));
-          URL_Status *url_status = 0;
-          ACE_NEW_RETURN (url_status,
-                          URL_Status,
-                          0);
-          Auto_Destroyer<URL_Status> url_status_ptr (url_status);
-          url_status_ptr->status (ACE_OS::atoi (status.c_str ()));
-          this->url_.reply_status (**url_status_ptr);
-          // Invalid url.
-          if (url_status_ptr->status () != 200)
-            return -1;
-        }
-      else
-        {
-
-          if (line.find ("text/html") >= 0)
-            {
-              ACE_CString url_content_type("text/html");
-              this->url_.content_type (url_content_type);
-            }
-        }
-    }
-  return 0;
-  
-}
-
-HTML_Body_Validation_Strategy::HTML_Body_Validation_Strategy (URL &url,
-                                                              URL_Iterator &iterator,
-                                                              URL_Validation_Visitor &context)
-  : URL_Processing_Strategy (url, iterator),
-    visitor_context_ (context)
-{
-}
-
-int
-HTML_Body_Validation_Strategy::execute (void)
-{
-  char host_name_buf[BUFSIZ + 1];
-  ACE_CString host_name (host_name_buf);
-  host_name.set (url_.url_addr ().get_host_name (),1);
-                          
-  // All to facilitate relative paths
-  char temp[BUFSIZ + 1];
-  ACE_CString prev_location (temp);
-
-  prev_location.set (this->url_.url_addr ().get_path_name (),
-                     ACE_OS::strlen (this->url_.url_addr ().get_path_name ()),
-                     1);
-  int index = prev_location.rfind ('/', prev_location.length ()); 
-  ACE_CString str = prev_location.substring (0, index + 1);
-  prev_location.set (str.c_str (), 1);
-  
-  // Note: prev_location always ends with '/'
-  if (prev_location[0] != '/')
-    prev_location = "/" + prev_location; 
-
-  // Build the url portion which can be attached to teh relative paths.
-  prev_location = host_name + prev_location;
-  
-  char url_string[BUFSIZ + 1];
-  ACE_CString url (url_string); 
-
-  while (this->iterator_.next (url) > 0)
-    {
-      // Check for relative urls.Strip out "http://" if its there.
-      if (url.find ("http") < 0)
-        {
-          if (url[0] == '.' && url[1] == '.')
-           {
-             url.set (&url[3], 1);
-             int i = prev_location.rfind ('/', prev_location.length () - 1);
-             prev_location = prev_location.substring (0, i+1);
-           }
-          if (url[0] == '.' && url[1] == '/')
-            url.set (&url[2], 1);
-          
-          url = prev_location + url;
-        }
-      else 
-        url.set (&url[7], 1);
-      // Double slash at the end works!e.g www.cs.wustl.edu/~kirthika//
-      if (url.find (".html") < 0) 
-        url = url + "/";          
-      
-      // Create the new URL address.
-      ACE_URL_Addr *url_addr;
-      ACE_NEW_RETURN (url_addr,
-                      ACE_URL_Addr,
-                      0);
-      Auto_Destroyer<ACE_URL_Addr> url_addr_ptr (url_addr);
-      if (url_addr_ptr->string_to_addr (url.c_str ()) == 0)
-        {
-          HTTP_URL *http_url;
-          ACE_NEW_RETURN (http_url,
-                          HTTP_URL (**url_addr_ptr,
-                                    ACE_dynamic_cast (HTTP_URL *,
-                                                      &this->url_)),
-                          0);
-          URL_Command *url_command;
-          ACE_NEW_RETURN (url_command,
-                          URL_Command (http_url),
-                          0);
-          
-          OPTIONS::instance ()->command_processor ()->insert (url_command);
-        }
-    }
-  return 0;
-}
-
-URL_Iterator *
-URL_Validation_Visitation_Strategy_Factory::make_header_iterator (void)
-{
-  URL_Iterator *i;
-  ACE_NEW_RETURN (i,
-                  HTTP_Header_Iterator (*this->url_),
-                  0);
-  return i;
-}
-
-URL_Iterator *
-URL_Validation_Visitation_Strategy_Factory::make_body_iterator (void)
-{
-  URL_Iterator *i;
-  ACE_NEW_RETURN (i,
-                  HTML_Body_Iterator (*this->url_),
-                  0);
-  return i;
-}
-
-URL_Processing_Strategy *
-URL_Validation_Visitation_Strategy_Factory::make_header_strategy (URL_Iterator &iterator)
-{
-  URL_Processing_Strategy *ps;
-  ACE_NEW_RETURN (ps,
-                  HTTP_Header_Processing_Strategy (*this->url_, 
-                                                   iterator),
-                  0);
-  return ps;
-}
-
-URL_Processing_Strategy *
-URL_Validation_Visitation_Strategy_Factory::make_body_strategy (URL_Iterator &iterator)
-{
-  URL_Processing_Strategy *ps;
-  ACE_NEW_RETURN (ps,
-                  HTML_Body_Validation_Strategy (*this->url_,
-                                                 iterator,
-                                                 this->visitor_context_),
-                  0);
-  return ps;
-}
-
-int
-URL_Validation_Visitation_Strategy_Factory::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-URL_Validation_Visitor::URL_Validation_Visitor (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "URL_Validation_Visitor_Factory::Strategy Con created\n"));
-  ACE_NEW (this->strat_connector_,
-           STRAT_CONNECTOR(0,
-                           &creation_strategy_,
-                           &caching_connect_strategy_,
-                           &activation_strategy_));
-  if (strat_connector_ == 0)
-    ACE_ERROR ((LM_ERROR,
-                "%p %s\n"
-                "strategy connector creation failed"));
-
-  
-}
-
-URL_Validation_Visitor::~URL_Validation_Visitor (void)
-{
-}
-
-URL_Validation_Visitor::URL_CACHE &
-URL_Validation_Visitor::url_cache (void)
-{
-  return this->url_cache_;
-}
-
-int
-URL_Validation_Visitor::in_cache (const ACE_URL_Addr &url_addr)
-{
-  URL_Status reply_status (URL_Status::STATUS_CODE (1));
-
-  if (this->url_cache_.find (url_addr, reply_status) == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "status %d for URL %s (cached)\n",
-                  reply_status.status (),
-                  url_addr.addr_to_string (0)));
-      
-      // Invalid status.
-      if (reply_status.status () != 200)
-        return -1;
-
-      return 1;
-    }
-  else
-    return 0;
-}
-
-URL_Visitation_Strategy_Factory *
-URL_Validation_Visitor::make_visitation_strategy_factory (URL &url)
-{ 
-  // Since this is HTTP 1.1 we'll need to establish a connection
-  // only once. Trying for relative paths.
-  // if (this->url_addr ().get_hostname () != url_hostname)
-  // {
-  if (url.stream ().open (this->strat_connector_, 
-                          url.url_addr ()) == -1)
-    return 0;
-      // }
-  // See if we can get connected and send the GET request via the
-  // <HTTP_URL>.
-  int result = url.send_request ();
-  if (result == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "%p\n",
-                  "send_request"));
-      if (this->url_cache_.bind (url.url_addr (),
-                                 URL_Status (URL_Status::STATUS_SERVICE_UNAVAILABLE)) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    "%p\n",
-                    "bind"));
-      return 0;
-    }
-  // @@ Here's where we could check to see if the <url> was HTTP or
-  // FTP, etc.  But for now we'll just assume that everything is an
-  // HTTP URL.
-  else
-    {
-
-      URL_Visitation_Strategy_Factory *vs;
-      ACE_NEW_RETURN (vs,
-                      URL_Validation_Visitation_Strategy_Factory (&url,
-                                                                  *this),
-                      0);
-      return vs;
-    }
-}
-
-int
-URL_Validation_Visitor::destroy (void)
-{
-  delete this->strat_connector_;
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-int
-URL_Validation_Visitor::visit (HTTP_URL &http_url)
-{
-  int result = this->in_cache (http_url.url_addr ());
-  /*  if (result == -1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid URL:%s (cached)\n",
-                  http_url.url_addr().addr_to_string (0))); 
-      return 0;
-      }*/
-  if (result == 0)
-    {
-      Auto_Destroyer <URL_Visitation_Strategy_Factory> vs (this->make_visitation_strategy_factory (http_url));
-       
-      if (*vs == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "make_visitation_strategy_factory"),
-                          -1);
-  
-      Auto_Destroyer <URL_Iterator> ihs (vs->make_header_iterator ());
-      if (*ihs == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "make_header_iterator"),
-                          -1);
-      Auto_Destroyer <URL_Processing_Strategy> phs (vs->make_header_strategy (**ihs));
-      if (*phs == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "make_header_strategy"),
-                          -1);
-      int phs_result = phs->execute ();
-      if (phs_result == -1)
-        ACE_DEBUG ((LM_DEBUG,
-                    "Invalid "));
-  
-      ACE_DEBUG ((LM_DEBUG,
-                  "URL with status %d %s\n",
-                  http_url.reply_status ().status (),
-                  http_url.url_addr().addr_to_string (0)));
-  
-      // Store the http url in the cache.
-      if (this->url_cache ().bind (http_url.url_addr (),
-                                   http_url.reply_status ()) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n","url_cache.bind"),
-                          -1);
-
-      // ACE_DEBUG ((LM_DEBUG, "header_processing result %d\n", phs_result));
-      // Since it is invalid dont go further.
-      if (phs_result == -1)
-        return 0;
-      
-      // Get back if the recurse option isnt set.
-      if (OPTIONS::instance ()->recurse () != 1)
-        return 0;
-  
-      Auto_Destroyer <URL_Iterator> is (vs->make_body_iterator ());
-      if (*is == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "make_body_iterator"),
-                          -1);
-  
-      Auto_Destroyer <URL_Processing_Strategy> ps (vs->make_body_strategy (**is));
-      if (*ps == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "make_body_strategy"),
-                          -1);
-  
-      if (ps->execute () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "body execute"),
-                          -1);
-      // http_url.stream().svc_handler ()->idle ();//KIRTHIKA
-    }
-  return 0;
-}
-
-int
-URL_Download_Visitation_Strategy_Factory::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-URL_Iterator *
-URL_Download_Visitation_Strategy_Factory::make_header_iterator (void)
-{
-  return 0;
-}
-
-URL_Iterator *
-URL_Download_Visitation_Strategy_Factory::make_body_iterator (void)
-{
-  URL_Iterator *i;
-  ACE_NEW_RETURN (i,
-                  URL_Download_Iterator (*this->url_),
-                  0);
-  return i;
-}
-
-URL_Processing_Strategy *
-URL_Download_Visitation_Strategy_Factory::make_header_strategy (URL_Iterator &iterator)
-{
-  // You fill in here.
-  return 0;
-}
-
-URL_Processing_Strategy *
-URL_Download_Visitation_Strategy_Factory::make_body_strategy (URL_Iterator &iterator)
-{
-  URL_Processing_Strategy *ps;
-  ACE_NEW_RETURN (ps,
-                  URL_Download_Strategy (*this->url_,
-                                         iterator),
-                  0);
-  return ps;
-}
-
-URL_Visitation_Strategy_Factory::URL_Visitation_Strategy_Factory (URL *url)
-  : url_ (url)
-{
-}
-
-URL_Download_Visitation_Strategy_Factory::URL_Download_Visitation_Strategy_Factory (URL *url)
-  : URL_Visitation_Strategy_Factory (url)
-{
-}
-
-URL_Validation_Visitation_Strategy_Factory::URL_Validation_Visitation_Strategy_Factory (URL *url,
-                                                                                        URL_Validation_Visitor &visitor_context)
-  : URL_Visitation_Strategy_Factory (url),
-    visitor_context_ (visitor_context)
-{
-}
-
-URL_Visitation_Strategy_Factory *
-URL_Download_Visitor::make_visitation_strategy_factory (URL &url)
-{
-  // See if we can get connected and send the GET request via the
-  // <HTTP_URL>.
-  while (1) //KIRTHIKA
-    {
-      int retval = url.send_request ();
-      if (retval != -1)
-        break;
-
-      /*  ACE_ERROR_RETURN ((LM_ERROR,
-                         "%p\n",
-                         "send_request"),
-                         0);*/
-    }
-  // @@ Here's where we could check to see if the <url> was HTTP or
-  // FTP, etc.  But for now we'll just assume that everything is an
-  // HTTP URL.
-  // else
-  // {
-      URL_Visitation_Strategy_Factory *vs;
-      ACE_NEW_RETURN (vs,
-                      URL_Download_Visitation_Strategy_Factory (&url),
-                      0);
-      return vs;
-      // }
-}
-
-int
-URL_Download_Visitor::destroy (void)
-{
-  // Commit suicide.
-  delete this;
-  return 0;
-}
-
-int
-URL_Download_Visitor::visit (HTTP_URL &http_url)
-{
-  Auto_Destroyer <URL_Visitation_Strategy_Factory> vs (this->make_visitation_strategy_factory (http_url));
-
-  if (*vs == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "make_visitation_strategy_factory"),
-                      -1);
-
-  Auto_Destroyer <URL_Iterator> is (vs->make_body_iterator ());
-  if (*is == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "make_body_iterator"),
-                      -1);
-
-  Auto_Destroyer <URL_Processing_Strategy> ps (vs->make_body_strategy (**is));
-  if (*ps == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "make_body_strategy"),
-                      -1);
-
-  if (ps->execute () == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "body execute"),
-                      -1);
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Hash_Map_Manager<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-template class ACE_Strategy_Connector<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>;
-template class ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>;
-template class ACE_NOOP_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
-template class ACE_NOOP_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >;
-template class ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-template class ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >;
-template class ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >, ACE_SYNCH_NULL_MUTEX >;
-template class ACE_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
-template class ACE_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
-template class ACE_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int> >;
-template class ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-template class ACE_Optimal_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  >;
-template class ACE_Optimal_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  >;
-template class ACE_Optimal_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  >;
-template class ACE_Hash_Map_Entry<ACE_URL_Addr, URL_Status>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-template class ACE_Recycling_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > ;
-template class ACE_Connector<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>;
-template class ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Hash_Map_Manager<ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#pragma instantiate ACE_Strategy_Connector<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>, ACE_SOCK_CONNECTOR>
-#pragma instantiate ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-#pragma instantiate ACE_NOOP_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
-#pragma instantiate ACE_NOOP_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> >
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *,int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>
-#pragma instantiate ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >
-#pragma instantiate ACE_Cached_Connect_Strategy_Ex<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>,ACE_SOCK_CONNECTOR, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >, ACE_SYNCH_NULL_MUTEX >
-#pragma instantiate ACE_Creation_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
-#pragma instantiate ACE_Concurrency_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >;
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>;
-#pragma instantiate ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int> >;
-#pragma instantiate ACE_Connect_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>;
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>;
-#pragma instantiate ACE_Optimal_Cache_Map_Manager<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  > 
-#pragma instantiate ACE_Optimal_Cache_Map_Reverse_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  > 
-#pragma instantiate ACE_Optimal_Cache_Map_Iterator<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_LRU_Caching_Strategy<ACE_Hash_Map_Manager_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>,ACE_Pair<ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex> >  > 
-#pragma instantiate ACE_Hash_Map_Entry<ACE_URL_Addr, URL_Status>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>, ACE_Pair<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> *, int>, ACE_Hash<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Equal_To<ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr> >, ACE_Null_Mutex>
-#pragma instantiate ACE_Recycling_Strategy<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > 
-#pragma instantiate ACE_Connector<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH>, ACE_SOCK_Connector>
-#pragma instantiate ACE_Map_Manager<int, ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> > *, ACE_RW_Thread_Mutex>
-#pragma instantiate ACE_Svc_Tuple<ACE_Svc_Handler<ACE_SOCK_Stream, ACE_NULL_SYNCH> >
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_URL_Addr, URL_Status, ACE_Hash<ACE_URL_Addr>, ACE_Equal_To<ACE_URL_Addr>, ACE_Null_Mutex>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/examples/Web_Crawler/URL_Visitor.h b/examples/Web_Crawler/URL_Visitor.h
deleted file mode 100644
index 2ce1d6ec78c..00000000000
--- a/examples/Web_Crawler/URL_Visitor.h
+++ /dev/null
@@ -1,372 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    URL_Visitor.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _URL_VISITOR_H
-#define _URL_VISITOR_H
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Strategies_T.h"
-#include "ace/Synch.h"
-#include "ace/Hash_Map_Manager.h"
-#include "HTTP_URL.h"
-#include "Iterators.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "Caching_Strategies_T.h"
-#include "Cached_Connect_Strategy_T.h"
-#include "Options.h"
-
-// Forward declarations.
-class URL_Validation_Visitor;
-
-class URL_Processing_Strategy
-{
-  // = TITLE
-  //   Abstract base class for the URL processing strategy.
-  //
-  // = DESCRIPTION
-public:
-  URL_Processing_Strategy (URL &,
-                           URL_Iterator &);
-  // Constructor.
-
-  virtual int execute (void) = 0;
-  // Perform the strategy.
-
-  virtual int destroy (void);
-  // Close down the resources.
-
-protected:
-  URL &url_;
-  // A reference to the URL "context" that we're processing.
-
-  URL_Iterator &iterator_;
-  // Iterator for the URL that we're processing.
-};
-
-class HTTP_Header_Processing_Strategy : public URL_Processing_Strategy
-{
-  // = TITLE
-  //   Defines the HTTP header processing strategy.
-  //
-  // = DESCRIPTION
-public:
-  HTTP_Header_Processing_Strategy (URL &,
-                                   URL_Iterator &);
-  // Constructor.
-
-  virtual int execute (void);
-  // Perform the strategy for processing an HTTP header.
-};
-
-class HTML_Body_Validation_Strategy : public URL_Processing_Strategy
-{
-  // = TITLE
-  //   Defines the HTML body processing strategy.
-  //
-  // = DESCRIPTION
-  //   This class iterates through the body of an HTML file and
-  //   recursively visits embedded links.
-public:
-  HTML_Body_Validation_Strategy (URL &,
-                                 URL_Iterator &,
-                                 URL_Validation_Visitor &);
-  // Constructor.
-
-  virtual int execute (void);
-  // Perform the strategy for processing an HTML file.  This strategy
-  // iterates over the HTML file and recursively visits embedded links
-  // to process them, as well.
-
-private:
-  URL_Validation_Visitor &visitor_context_;
-  // This is the context of the visit.
-};
-
-class URL_Download_Strategy : public URL_Processing_Strategy
-{
-  // = TITLE
-  //   Defines a URL downloading strategy.
-  //
-  // = DESCRIPTION
-  //   This class downloads a URL's contents into a temporary file.
-public:
-  URL_Download_Strategy (URL &,
-                         URL_Iterator &);
-  // Constructor.
-
-  virtual int execute (void);
-  // Perform the strategy for downloading a URL to a temporary file.
-};
-
-class URL_Visitation_Strategy_Factory
-{
-  // = TITLE
-  //   Abstract Factory for the URL visitation strategy.
-  //
-  // = DESCRIPTION
-public:
-  URL_Visitation_Strategy_Factory (URL *);
-
-  // = Factory Methods.
-  virtual URL_Iterator *make_header_iterator (void) = 0;
-  // Factory Method that makes the header iterator.
-
-  virtual URL_Iterator *make_body_iterator (void) = 0;
-  // Factory Method that makes the body iterator.
-
-  virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &) = 0;
-  // Factory Method that makes the header processing strategy.
-
-  virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &) = 0;
-  // Factory Method that makes the body processing strategy .
-
-  virtual int destroy (void) = 0;
-  // Close down the resources.
-
-protected:
-  URL *url_;
-  // Stash the URL so we don't have to pass it around.
-};
-
-class URL_Download_Visitation_Strategy_Factory : public URL_Visitation_Strategy_Factory
-{
-  // = TITLE
-  //   Concrete Factory for the URL validation visitation strategy.
-  //
-  // = DESCRIPTION
-public:
-  URL_Download_Visitation_Strategy_Factory (URL *);
-  // Constructor.
-
-  // = Factory Methods.
-  virtual URL_Iterator *make_header_iterator (void);
-  // Factory Method that makes an <HTTP_Header_Iterator>.
-
-  virtual URL_Iterator *make_body_iterator (void);
-  // Factory Method that makes an <HTML_Body_Iterator>.
-
-  virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &);
-  // Factory Method that makes the header processing strategy.
-
-  virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &);
-  // Factory Method that makes the body processing strategy .
-
-  virtual int destroy (void);
-  // Close down the resources.
-};
-
-class URL_Validation_Visitation_Strategy_Factory : public URL_Visitation_Strategy_Factory
-{
-  // = TITLE
-  //   Concrete Factory for the URL validation visitation strategy.
-  //
-  // = DESCRIPTION
-public:
-  URL_Validation_Visitation_Strategy_Factory (URL *,
-                                              URL_Validation_Visitor &);
-  // Constructor.
-
-  // = Factory Methods.
-  virtual URL_Iterator *make_header_iterator (void);
-  // Factory Method that makes an <HTTP_Header_Iterator>.
-
-  virtual URL_Iterator *make_body_iterator (void);
-  // Factory Method that makes an <HTML_Body_Iterator>.
-
-  virtual URL_Processing_Strategy *make_header_strategy (URL_Iterator &);
-  // Factory Method that makes the header processing strategy.
-
-  virtual URL_Processing_Strategy *make_body_strategy (URL_Iterator &);
-  // Factory Method that makes the body processing strategy .
-
-  virtual int destroy (void);
-  // Close down the resources.
-
-private:
-  URL_Validation_Visitor &visitor_context_;
-  // Context of the visitor.
-};
-
-class URL_Visitor
-{
-  // = TITLE
-  //   Base class for the URL Visitor.
-  //
-  // = DESCRIPTION
-  //   This class plays the "visitor" role in the Visitor pattern.
-public:
-  virtual int visit (HTTP_URL &http_url) = 0;
-  // Visit an <HTTP_URL>.
-
-  // @@
-  // virtual int visit (FTP_URL &http_url) = 0;
-  
-  virtual int destroy (void) = 0;
-  // Cleanup the resources.
-
-protected:
-  virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &) = 0;
-  // Make the appropriate <URL_Visitation_Strategy_Factory>.
-};
-
-class URL_Validation_Visitor : public URL_Visitor
-{
-  // = TITLE
-  //   Subclass that defines the URL validation visitor.
-  //
-  // = DESCRIPTION
-  //   This class checks to make sure that the <HTTP_URL> is valid.
-  //   If the <HTTP_URL> is an <HTML> file, it can also be used to
-  //   recursively check that all embedded links in this file are
-  //   valid. 
-public:
-  typedef ACE_Hash_Map_Manager <ACE_URL_Addr, URL_Status, ACE_Null_Mutex>
-          URL_CACHE;
-
-  virtual int visit (HTTP_URL &http_url);
-  // Visit an <HTTP_URL> to make sure that it's valid.  If the content
-  // type of the <HTTP_URL> is "text/html" and the <recursion> option
-  // is enabled then <visit> recursively checks each link embedded in
-  // the HTML page.
-
-  // @@
-  // virtual int visit (FTP_URL &http_url);
-
-  URL_Validation_Visitor (void);
-  virtual int destroy (void);
-  // Cleanup the resources.
-  
-  URL_CACHE &url_cache (void);
-  // Returns a reference to the URL cache.
-
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> Svc_Handler;
-  
-  typedef ACE_Strategy_Connector<Svc_Handler,
-                               ACE_SOCK_CONNECTOR>
-        STRAT_CONNECTOR;
-  typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-          REFCOUNTED_HASH_RECYCLABLE_ADDRESS;
-  typedef ACE_NOOP_Creation_Strategy<Svc_Handler>
-  NULL_CREATION_STRATEGY;
-  typedef ACE_NOOP_Concurrency_Strategy<Svc_Handler>
-  NULL_ACTIVATION_STRATEGY;
-
-  typedef ACE_Hash_Map_Manager_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
-                                  ACE_Pair<Svc_Handler *, int>,\
-                                  ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
-                                  ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                 ACE_Null_Mutex> 
-    CONNECTION_HASH_MAP;
-  typedef ACE_Hash_Map_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
-                                  ACE_Pair<Svc_Handler *, int>,\
-                                  ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
-                                  ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                 ACE_Null_Mutex> 
-    CONNECTION_HASH_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,\
-                                  ACE_Pair<Svc_Handler *, int>,\
-                                  ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>, \
-                                  ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,\
-                                 ACE_Null_Mutex> 
-    CONNECTION_HASH_MAP_REVERSE_ITERATOR;
-  typedef  ACE_LRU_Caching_Strategy<CONNECTION_HASH_MAP>
-          LRU;
-  typedef ACE_Cached_Connect_Strategy_Ex<Svc_Handler,ACE_SOCK_CONNECTOR, LRU, ACE_SYNCH_NULL_MUTEX>
-         CACHED_CONNECT_STRATEGY;
-
-protected:
-  virtual ~URL_Validation_Visitor (void);
-  virtual URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &);
-  // Factory Method that makes a
-  // <URL_Validation_Visitation_Strategy_Factory>.
-
-  URL_CACHE url_cache_;
-  // Cache the status of URLs we've already validated.
-
-  int in_cache (const ACE_URL_Addr &url_addr);
-  // Check to see if the reply status of this <url_addr> is in the
-  // cache.  Returns 1 if so, 0 if not.
-
-  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_;
-
-  STRAT_CONNECTOR *strat_connector_;  
-};
-
-class URL_Download_Visitor : public URL_Visitor
-{
-  // = TITLE
-  //   Subclass for the URL validtion visitor.
-  //
-  // = DESCRIPTION
-  //   This class checks to make sure that the <HTTP_URL> is valid.
-public:
-  virtual int visit (HTTP_URL &http_url);
-  // Visit an <HTTP_URL> to make sure that it's valid.  If the content
-  // type of the <HTTP_URL> is "text/html" and the <recursion> option
-  // is enabled then <visit> recursively checks each link embedded in
-  // the HTML page.
-
-  // @@
-  // virtual int visit (FTP_URL &http_url);
-
-  virtual int destroy (void);
-  // Cleanup the resources.
-  
-protected:
-  URL_Visitation_Strategy_Factory *make_visitation_strategy_factory (URL &);
-  // Factory Method that makes a <URL_Download_Visitation_Strategy_Factory>.
-};
-
-template <class T>
-class Auto_Destroyer
-{
-  // = TITLE
-  //   Simple class that ensures the <destroy> method is called on our
-  //   <URL_*> objects when they go out of scope.
-  //
-  // = DESCRIPTION
-  //   This class is similar to an auto_ptr<> and should be used to
-  //   simplify blocks of code that must create/destroy pointers to
-  //   various <URL_*> related strategies and iterators.
-public:
-  Auto_Destroyer (T *t): t_ (t) {}
-  T *operator-> (void) { return this->t_; }
-  T *operator *(void) { return this->t_; }
-  void operator= (T *t) 
-  {
-    if (this->t_ != 0)
-      this->t_->destroy ();
-    this->t_ = t;
-  }
-  ~Auto_Destroyer (void) 
-  {
-    if (this->t_ != 0)
-      t_->destroy (); 
-  }
-private:
-  T *t_;
-};
-
-
-#endif /* _URL_VISITOR_H */
diff --git a/examples/Web_Crawler/URL_Visitor_Factory.cpp b/examples/Web_Crawler/URL_Visitor_Factory.cpp
deleted file mode 100644
index aaf30db0460..00000000000
--- a/examples/Web_Crawler/URL_Visitor_Factory.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "URL_Visitor_Factory.h"
-
-ACE_RCSID(Web_Crawler, URL_Visitor_Factory, "$Id$")
-
-URL_Visitor *
-URL_Validation_Visitor_Factory::make_visitor (void)
-{
-  URL_Visitor *v;
-  
-  ACE_NEW_RETURN (v,
-                  URL_Validation_Visitor,
-                  0);
-
-  return v;
-}
-
-Command_Processor *
-URL_Validation_Visitor_Factory::make_command_processor (void)
-{
-  Command_Processor *cp;
-  
-  ACE_NEW_RETURN (cp,
-                  Command_Processor,
-                  0);
-  return cp;
-}
-
-URL_Visitor *
-URL_Download_Visitor_Factory::make_visitor (void)
-{
-  URL_Visitor *v;
-  
-  ACE_NEW_RETURN (v,
-                  URL_Download_Visitor,
-                  0);
-  return v;
-}
-
-Command_Processor *
-URL_Download_Visitor_Factory::make_command_processor (void)
-{
-  return 0;
-}
diff --git a/examples/Web_Crawler/URL_Visitor_Factory.h b/examples/Web_Crawler/URL_Visitor_Factory.h
deleted file mode 100644
index f1fc27d5bd4..00000000000
--- a/examples/Web_Crawler/URL_Visitor_Factory.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    URL_Visitor_Factory.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _URL_VISITOR_FACTORY_H
-#define _URL_VISITOR_FACTORY_H
-
-#include "URL_Visitor.h"
-#include "Command_Processor.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class URL_Visitor_Factory
-{
-  // = TITLE
-  //   Abstract base class that creates URL visitors.
-  //
-  // = DESCRIPTION
-  //   Subclasses define each of the Factory Methods to
-  //   make the right objects, which all "vary" together.
-public:
-  virtual URL_Visitor *make_visitor (void) = 0;
-  // Factory Method that makes the appropriate type of <URL_Visitor>.
-  
-  virtual Command_Processor *make_command_processor (void) = 0;
-  // Factory Method that makes the appropriate type of
-  // <Command_Processor>.
-};
-
-class URL_Validation_Visitor_Factory : public URL_Visitor_Factory
-{
-  // = TITLE
-  //   Create a URL visitor that validates URL links.
-public:
-  virtual URL_Visitor *make_visitor (void);
-  // Factory Method that makes a <URL_Validation_Visitor>.
-  
-  virtual Command_Processor *make_command_processor (void);
-  // Factory Method that makes a <FIFO_Command_Processor>.
-
- 
-};
-
-class URL_Download_Visitor_Factory : public URL_Visitor_Factory
-{
-  // = TITLE
-  //   Create a URL visitor that downloads URL links.
-public:
-  virtual URL_Visitor *make_visitor (void);
-  // Factory Method that makes a <URL_Download_Visitor>.
-  
-  virtual Command_Processor *make_command_processor (void);
-  // Factory Method that makes a <FIFO_Command_Processor>.
-};
-
-#endif /* _URL_VISITOR_FACTORY_H */
diff --git a/examples/Web_Crawler/Web_Crawler.cpp b/examples/Web_Crawler/Web_Crawler.cpp
deleted file mode 100644
index 2fae698be26..00000000000
--- a/examples/Web_Crawler/Web_Crawler.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-
-#include "Options.h"
-#include "URL_Visitor_Factory.h"
-#include "Web_Crawler.h"
-
-ACE_RCSID(Web_Crawler, Web_Crawler, "$Id$")
-
-Web_Crawler::~Web_Crawler (void)
-{
-  delete this->url_visitor_factory_;
-}
-
-Web_Crawler::Web_Crawler (void)
-  : url_visitor_factory_ (0)
-{
-}
-
-int
-Web_Crawler::open (int argc, char *argv[])
-{
-  if (OPTIONS::instance ()->parse_args (argc, argv) == -1)
-    return -1;
-  // @@ Put the ACE_Service_Config::open() stuff here somewhere...
-  else
-    {
-      // For now just hardcode this to create "validation" visitors.
-      ACE_NEW_RETURN (this->url_visitor_factory_,
-                      URL_Validation_Visitor_Factory,
-                      -1);
-      return 0;
-    }
-}
-
-int
-Web_Crawler::run (void)
-{ 
-  // Make the appropriate <URL_Visitor>.
-  Auto_Destroyer<URL_Visitor> visitor (this->url_visitor_factory_->make_visitor ());
-
-  if (*visitor == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "make_visitor"),
-                      -1);
-
-  // Make the appropriate <Command_Processor>.
-  Auto_Destroyer<Command_Processor> cp (this->url_visitor_factory_->make_command_processor ());
-
-  if (*cp == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "make_command_processor"),
-                      -1);
-
-  // Set the <Command_Processor> in the <Options> to make it visible.
-  OPTIONS::instance ()->command_processor (*cp);
-
-  // Set the <URL_Visitor> in the <Options> to make it visible.
-  OPTIONS::instance ()->visitor (*visitor);
-
-  // @@ You fill in here...
-  ACE_URL_Addr *url_addr;
-  ACE_NEW_RETURN (url_addr,
-                  ACE_URL_Addr (OPTIONS::instance()->hostname (),
-                                OPTIONS::instance()->path_name (),
-                                OPTIONS::instance()->port_no ()), //KIRTHIKA
-                  0);
-  Auto_Destroyer<ACE_URL_Addr> url_addr_ptr (url_addr);
-                                                      
-  HTTP_URL *http_url;
-  ACE_NEW_RETURN (http_url,
-                  HTTP_URL (**url_addr_ptr),
-                  0);
-
-  Auto_Destroyer<HTTP_URL> http_url_ptr (http_url);
-     
-  URL_Command *url_command;
-  ACE_NEW_RETURN (url_command,
-                  URL_Command (*http_url_ptr),
-                  0);
-  // Auto_Destroyer<URL_Command> url_command_ptr (url_command);
-  
-  if (cp->insert (url_command) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n", "insert"),
-                      -1);
-  
- if (cp->execute () != 0)
-   ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n", "execute"),
-                      -1);
-  return 0;
-}
-
diff --git a/examples/Web_Crawler/Web_Crawler.dsp b/examples/Web_Crawler/Web_Crawler.dsp
deleted file mode 100644
index a85ee9099e9..00000000000
--- a/examples/Web_Crawler/Web_Crawler.dsp
+++ /dev/null
@@ -1,216 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Web_Crawler" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Web_Crawler - 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 "Web_Crawler.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 "Web_Crawler.mak" CFG="Web_Crawler - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Web_Crawler - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Web_Crawler - 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)" == "Web_Crawler - 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 /MD /W3 /GX /O2 /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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\\"

-

-!ELSEIF  "$(CFG)" == "Web_Crawler - Win32 Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Web_Craw"

-# PROP BASE Intermediate_Dir "Web_Craw"

-# 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 "..\..\\" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\ace"

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Web_Crawler - Win32 Release"

-# Name "Web_Crawler - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter ".cpp"

-# Begin Source File

-

-SOURCE=.\Command_Processor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\HTTP_URL.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Iterators.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\main.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Mem_Map_Stream.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Addr.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Status.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Visitor.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Visitor_Factory.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Web_Crawler.cpp

-# End Source File

-# End Group

-# Begin Group "Include Files"

-

-# PROP Default_Filter ".h"

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Command_Processor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\HTTP_URL.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Iterators.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Mem_Map_Stream.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Optimal_Cache_Map_Manager_T.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Options.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Addr.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Status.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Visitor.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\URL_Visitor_Factory.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\Web_Crawler.h

-# End Source File

-# End Group

-# Begin Group "Template Files"

-

-# PROP Default_Filter ""

-# Begin Source File

-

-SOURCE=.\Cached_Connect_Strategy_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Caching_Strategies_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# Begin Source File

-

-SOURCE=.\Optimal_Cache_Map_Manager_T.cpp

-# PROP Exclude_From_Build 1

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/examples/Web_Crawler/Web_Crawler.dsw b/examples/Web_Crawler/Web_Crawler.dsw
deleted file mode 100644
index 44f83f42c1c..00000000000
--- a/examples/Web_Crawler/Web_Crawler.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: "Web_Crawler"=.\Web_Crawler.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Global:

-

-Package=<5>

-{{{

-}}}

-

-Package=<3>

-{{{

-}}}

-

-###############################################################################

-

diff --git a/examples/Web_Crawler/Web_Crawler.h b/examples/Web_Crawler/Web_Crawler.h
deleted file mode 100644
index e2590f986ca..00000000000
--- a/examples/Web_Crawler/Web_Crawler.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    Web_Crawler.h
-//
-// = AUTHOR
-//    Douglas C. Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef _WEB_CRAWLER_H
-#define _WEB_CRAWLER_H
-
-#include "URL_Addr.h"
-#include "HTTP_URL.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#define ACE_LACKS_PRAGMA_ONCE 
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// Forward declaration.
-class URL_Visitor_Factory;
-
-class Web_Crawler
-{
-  // = TITLE
-  //    An abstraction for a Web Crawler.
-  //
-  // = DESCRIPTION
-  //    This class is a Facade that organizes the other classes in the
-  //    solution, which include a factory that creates a visitor,
-  //    which in turn embodies the appropriate visitation strategy.
-public:
-  // = Initialization and termination methods.
-  Web_Crawler (void);
-  // Constructor.
-
-  ~Web_Crawler (void);
-  // Destructor.
-
-  int open (int argc, char *argv[]);
-  // Parses the command-line options and initializes the
-  // <URL_Visitor_Factory>.
-
-  int run (void);
-  // Run the Web Crawler and carries out whatever visitation strategy
-  // is configured.  Returns -1 on failure and 0 on success.
-
-private:
-  URL_Visitor_Factory *url_visitor_factory_;
-  // Pointer to a factory that creates visitors that explore URLs and
-  // perform various tasks.  Subclasses of <URL_Visitor_Factory>
-  // determine what happens during a visitation.
-};
-
-#endif /* _WEB_CRAWLER_H */
diff --git a/examples/Web_Crawler/main.cpp b/examples/Web_Crawler/main.cpp
deleted file mode 100644
index f16b407f007..00000000000
--- a/examples/Web_Crawler/main.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    apps/Web
-//
-// = FILENAME
-//    main.cpp
-//
-// = DESCRIPTION
-//     This program implements a Web crawler that can be configured to
-//     apply various strategies to URLs that it visits.
-//
-// = AUTHOR
-//    Doug Schmidt <schmidt@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "Web_Crawler.h"
-#include "Options.h"
-#include "ace/Signal.h"
-
-ACE_RCSID(Web_Crawler, main, "$Id$")
-
-void sig_handler (int)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "aborting!\n"));
-  ACE_OS::abort ();
-}
-
-int 
-main (int argc, char *argv[])
-{
-  ACE_Sig_Action sa ((ACE_SignalHandler) sig_handler, SIGFPE);
-
-  Web_Crawler crawler;
-  
-  if (crawler.open (argc, argv) == -1)
-    return 1;
-  else if (crawler.run () == -1)
-    return 1;
-  else
-    return 0;
-}
-
-
-
diff --git a/include/makeinclude/platform_aix.GNU b/include/makeinclude/platform_aix.GNU
index 675b1af991b..e2a7274f791 100644
--- a/include/makeinclude/platform_aix.GNU
+++ b/include/makeinclude/platform_aix.GNU
@@ -1,3 +1,42 @@
 # $Id$
 
-include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
+# AIX 4.1.3
+# *not* using Orbix
+# This file assumes that the user has installed the AIX patch
+# containing the dl*() APIs.  To use these APIs, IBM has created a
+# separate product (free to AIX licensees) called shared library
+# hookable symbols (or slhs/6000).  If they don't have this patch, the
+# sv* commands for compiling and linking will not be present on the
+# system.
+
+debug = 1
+# xlC builds the shared lib from the static lib, so need to build both.
+shared_libs_only = 0
+static_libs = 1
+
+CC	    = xlC
+CXX	    = xlC_r
+CCFLAGS     += $(CFLAGS)
+DCFLAGS     += -g
+DLD	    = makeC++SharedLib_r
+LD	    = $(CXX)
+CPPFLAGS    += -qxcall -qtempinc
+SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
+ifdef SHLIB
+ACELIB      = -lACEshr
+endif
+LLIBS	    = -lsvld -ltli_r $(ACELIB)
+LIBS	    += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
+ARFLAGS	    = ruv
+AR	    = ar
+LDFLAGS	    += -bI:/lib/pse.exp
+# Should be set to optimize for your particular computer.  This
+# is set to be optimized for RS/6000 43P.
+# OCCFLAGS is not used by default.  To used it, set optimize=1
+# either in this file or on the command line.
+OCCFLAGS    += -qarch=ppc -qtune=604
+RANLIB	    = ranlib
+SOFLAGS	    = -p 0
+STATLIB     = $(VLIB)
+TEMPINCDIR  = tempinc
+SOBUILD	    =
diff --git a/include/makeinclude/platform_aix4.2.GNU b/include/makeinclude/platform_aix4.2.GNU
index 395f30adbcb..7376bc4e67b 100644
--- a/include/makeinclude/platform_aix4.2.GNU
+++ b/include/makeinclude/platform_aix4.2.GNU
@@ -1,3 +1,45 @@
 # $Id$
 
-include $(ACE_ROOT)/include/makeinclude/platform_aix4_cset++.GNU
\ No newline at end of file
+# AIX 4.2.0
+# *not* using Orbix
+# The AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 in order to
+# build libACEshr.a, and at 4.2.0.4 for dl*() routines to work properly. Best
+# apply the update available at:
+# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
+
+debug = 1
+# xlC builds the shared lib from the static lib, so need to build both.
+shared_libs_only = 0
+static_libs = 1
+
+CC	    = xlC
+CXX	    = xlC_r
+CCFLAGS     += $(CFLAGS)
+# -qinitauto seems useful, but when built with -qinitauto=5F, the
+# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
+DCFLAGS     += -g -qcheck=nobounds:div:null
+DLD	    = makeC++SharedLib_r
+LD          = $(CXX)
+# -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.
+CPPFLAGS    += -qtempinc -qlanglvl=ansi -qflag=w:w -qinfo
+SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
+ifdef SHLIB
+ACELIB      = -lACEshr
+endif
+LIBS	    += -ltli_r -ldl
+ARFLAGS	    = ruv
+AR	    = ar
+LDFLAGS	    += -bI:/lib/pse.exp 
+# Default OCCFLAGS builds common code for all RS/6000 architectures but
+# this can be set to optimize for your particular computer. The commented
+# out example optimizes for RS/6000 43P.
+# OCCFLAGS is not used by default.  To used it, set optimize=1
+# either in this file or on the command line.
+#OCCFLAGS    += -qarch=ppc -qtune=604
+OCCFLAGS    += -qarch=com 
+RANLIB	    = ranlib
+SOFLAGS	    = -p 0
+STATLIB     = $(VLIB)
+TEMPINCDIR  = tempinc
+SOBUILD = 
diff --git a/include/makeinclude/platform_aix4_cset++.GNU b/include/makeinclude/platform_aix4_cset++.GNU
deleted file mode 100644
index 7adbbfb284e..00000000000
--- a/include/makeinclude/platform_aix4_cset++.GNU
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id$
-
-# AIX 4.x using the C Set++ compiler.
-# *not* using Orbix
-#
-# On 4.1, this file assumes that the user has installed the AIX patch
-# containing the dl*() APIs.  To use these APIs, IBM has created a
-# separate product (free to AIX licensees) called shared library
-# hookable symbols (or slhs/6000).  If they don't have this patch, the
-# sv* commands for compiling and linking will not be present on the
-# system.
-#
-# On 4.2, the AIX fileset bos.rte.bind_cmds must be at version 4.2.0.2 or
-# higher in order to build libACEshr.a, and at 4.2.0.4 or higher for dl*()
-# routines to work properly. Best to apply the update available at:
-# ftp://service.boulder.ibm.com/aix/fixes/v4/os/bos.rte.bind_cmds.4.2.0.4.bff
-# or a successor.
-
-debug = 1
-# xlC builds the shared lib from the static lib, so need to build both.
-shared_libs_only = 0
-static_libs = 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.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-CC	    = xlC
-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 -qflag=w:w -qinfo
-CPPFLAGS    += -qlanglvl=ansi -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-
-# -qinitauto seems useful, but when built with -qinitauto=5F, the
-# Process_Strategy_Test went CPU bound in ostream, so I removed it (S. Huston)
-DCFLAGS     += -g -qcheck=nobounds:div:null
-
-DLD	    = makeC++SharedLib_r
-LD          = $(CXX)
-SHLIBA      = $(SHLIB:lib%.so=lib%shr.a)
-ifdef SHLIB
-ACELIB      = -lACEshr
-endif
-
-ifeq ($(AIX_MINOR_VERS),1)
-LLIBS	    = -lsvld -ltli_r $(ACELIB)
-LIBS	    += $(filter-out $(SHLIBA:lib%.a=-l%), $(LLIBS))
-else
-LIBS	    += -ltli_r -ldl
-endif
-
-ARFLAGS	    = ruv
-AR	    = ar
-LDFLAGS	    += -bI:/lib/pse.exp 
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default.  To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS    += -qarch=ppc -qtune=604
-OCCFLAGS    += -qarch=com 
-RANLIB	    = ranlib
-SOFLAGS	    = -p 0
-STATLIB     = $(VLIB)
-TEMPINCDIR  = tempinc
-SOBUILD = 
diff --git a/include/makeinclude/platform_chorus.GNU b/include/makeinclude/platform_chorus.GNU
index d0c2a428fa2..aa78c7ace5f 100644
--- a/include/makeinclude/platform_chorus.GNU
+++ b/include/makeinclude/platform_chorus.GNU
@@ -39,6 +39,11 @@ CCFLAGS         += $(CFLAGS) -fno-implicit-templates    \
                    -D_POSIX_THREADS                     \
                    -D_POSIX_THREAD_SAFE_FUNCTIONS
 
+ifeq ($(exceptions),1)
+else  # ! exceptions
+  CCFLAGS += -fno-exceptions
+endif # ! exceptions
+
 #DCFLAGS         += -gstabs+
 INCLDIRS        += -I$(INC_DIR)/posix                   \
                    -I$(INC_DIR)/stdc                    \
@@ -48,21 +53,21 @@ INCLDIRS        += -I$(INC_DIR)/posix                   \
 DLD             =
 LD              = $(XDIR)/bin/ld
 LDFLAGS         += -r $(CLASSIXDIR)/lib/CC/libC.a $(CLASSIXDIR)/lib/classix/libcx.u.a
-MATHLIB         = -L$(CLASSIXDIR)/lib/libm -lm
+MATHLIB		= -L$(CLASSIXDIR)/lib/libm -lm
 
-LINK.cc.override        =       $(LD) -u _main -u _premain
+LINK.cc.override	=	$(LD) -u _main -u _premain
 LINK.cc=override
 
 CHORUSLINK=true
 
-#       $(CLASSIXDIR)/dtool/mkctors helloCxx_u.xp.o > helloCxx_u.ct.s
-#       $(CXX) -c helloCxx_u.ct.s
-#       $(RM) helloCxx_u.ct.s
-#       $(LD) $(LDOPTIONS) -e _start -o helloCxx_u \
-#       $(CLASSIXDIR)/lib/crt/crth.u.o $(CLASSIXDIR)/lib/crt/crt0.o $(CLASSIXDIR)/lib/crt/crti.o helloCxx_u.xp.o helloCxx_u.ct.o $(CLASSIXDIR)/lib/crt/crtn.o \
-#       -dn -T $(CLASSIXDIR)/src/act/slots/act_u.ld
-#       $(RM) helloCxx_u.xp.o
-#       $(RM) helloCxx_u.ct.o
+#	$(CLASSIXDIR)/dtool/mkctors helloCxx_u.xp.o > helloCxx_u.ct.s
+#	$(CXX) -c helloCxx_u.ct.s
+#	$(RM) helloCxx_u.ct.s
+#	$(LD) $(LDOPTIONS) -e _start -o helloCxx_u \
+#	$(CLASSIXDIR)/lib/crt/crth.u.o $(CLASSIXDIR)/lib/crt/crt0.o $(CLASSIXDIR)/lib/crt/crti.o helloCxx_u.xp.o helloCxx_u.ct.o $(CLASSIXDIR)/lib/crt/crtn.o \
+#	-dn -T $(CLASSIXDIR)/src/act/slots/act_u.ld
+#	$(RM) helloCxx_u.xp.o
+#	$(RM) helloCxx_u.ct.o
 
 
 OCFLAGS         += -O
diff --git a/include/makeinclude/platform_chorus_ghs.GNU b/include/makeinclude/platform_chorus_ghs.GNU
index 44651bee879..0c2a78541e6 100644
--- a/include/makeinclude/platform_chorus_ghs.GNU
+++ b/include/makeinclude/platform_chorus_ghs.GNU
@@ -28,9 +28,6 @@ CHORUS = 1
 CROSS-COMPILE = 1
 
 debug = 1
-ifndef exceptions
-  exceptions =
-endif # exceptions
 optimize = 1
 shared_libs =
 static_libs = 1
@@ -64,10 +61,6 @@ else
   CRTH = $(MVME_DIR)/lib/crt/crth_d.s.o
 endif # debug
 
-ifdef exceptions
-  CCFLAGS += --exceptions
-endif # exceptions
-
 POSTLINK = ; $(CC) -groot=$(MVME_DIR)/ -alttools=$(GHS_DIR)/gnuch68 -68040 \
            -nostartfiles -nostdlib -e __start -o $@.final \
            $(CRTH) $(MVME_DIR)/lib/crt/crt0.o \
diff --git a/include/makeinclude/platform_freebsd_pthread.GNU b/include/makeinclude/platform_freebsd_pthread.GNU
index 34b000e20b9..6e997d4efee 100644
--- a/include/makeinclude/platform_freebsd_pthread.GNU
+++ b/include/makeinclude/platform_freebsd_pthread.GNU
@@ -2,31 +2,20 @@
 
 # platform_freebsd_pthread.GNU
 
-#####################################################
-# Replace 3 with 2 if you are running FreeBSD 2.x.x
-#  ** How do we detect os version here?
-#####################################################
-VERSION = 3
-
-ifneq ($(VERSION),3)
-versioned_so = 1
-endif
-
 optimize = 1
 
+# For pthreads support on FreeBSD, you need
+
 debug = 1
+versioned_so = 1
 
 CC              = gcc
 CXX		= g++
 CFLAGS          += -Wall -Wpointer-arith -pipe -D_THREAD_SAFE
 CCFLAGS         += $(CFLAGS) -fno-implicit-templates
 DCFLAGS         += -g
-LDFLAGS		= -pthread
-ifeq ($(VERSION),3)
-  LDFLAGS		+= -Wl,-rpath $(ACE_ROOT)/ace
-endif
 DLD             = $(CXX)
-LD		= $(CXX)
+LD		= $(CXX) -pthread
 LIBS            += -lstdc++ -lcompat
 OCFLAGS         += -O
 PIC             = -fpic
diff --git a/include/makeinclude/platform_hpux.GNU b/include/makeinclude/platform_hpux.GNU
index 2388aaf5be9..ac463221732 100644
--- a/include/makeinclude/platform_hpux.GNU
+++ b/include/makeinclude/platform_hpux.GNU
@@ -10,7 +10,7 @@ HPUX_VERS       := $(join $(word 2,$(HPVERS_WORDS)),$(word 3,$(HPVERS_WORDS)))
 CC              = /bin/cc
 CXX             = /usr/bin/CC -pta -ti,/bin/true -tr,/bin/true
 CFLAGS          = -Aa -z +a1
-CCFLAGS         = $(CFLAGS) -D_REENTRANT -DACE_LACKS_PRAGMA_ONCE -DHPUX_VERS=$(HPUX_VERS)
+CCFLAGS         = $(CFLAGS) -D_REENTRANT -DHPUX_VERS=$(HPUX_VERS)
 DCFLAGS         += -g
 DLD             = /usr/bin/CC
 LD              = /usr/bin/CC
diff --git a/include/makeinclude/platform_hpux_aCC.GNU b/include/makeinclude/platform_hpux_aCC.GNU
index 4f935dc6558..2817a7a0f9f 100644
--- a/include/makeinclude/platform_hpux_aCC.GNU
+++ b/include/makeinclude/platform_hpux_aCC.GNU
@@ -3,21 +3,19 @@
 # This is for the HP-UX 10.x and 11.x using the aC++ compiler.
 #
 # For 10.x, most of the difference for threaded vs. non-threaded is
-# contained in ace/config-hpux-10.x.h.  However, to build without threads,
-# you should run the make with "threads=0" since the default is to build
-# with threads.
+# contained in ace/config-hpux-10.x.h.  However, there is a line to verify
+# in this file - if you are using DCE threads, "-lcma" needs to be on the
+# 10.x version of the LIBS line, below.  If you are not using DCE threads,
+# then use the LIBS without -lcma.
 #
 # HP-UX 11 supports both 32-bit and 64-bit builds, regardless of which
 # architecture the build is done on.  This file is set up to build native
 # to the machine it's running on.  To cross-build for another platform, add
-# "buildbits=32" to make a 32-bit build, and "buildbits=64" to do a 64-bit
-# build.  Note that if you explicitly specify a 64-bit build, the option
-#  -Wl,+vnocompatwarnings is added to shut up the "At least one PA 2.0 object
-# file detected..." messages.
+# the appropriate +DA switch to CCFLAGS.  Note that if you do this, and want to
+# shut up the "At least one PA 2.0 object file detected..." messages, you
+# should also add -Wl,+vnocompatwarnings.
 
-buildbits = 0
 debug = 1
-distrib = 0
 threads = 1
 
 # First, extract the OS version number.
@@ -51,7 +49,6 @@ endif
 DCFLAGS		+= -g
 DLD		= $(CXX) $(CCFLAGS)
 LD		= $(CXX)
-OCCFLAGS	= -O
 PIC		= +Z
 
 AR		= $(COMPILE.cc) +inst_close $^; /bin/ar
@@ -59,32 +56,7 @@ ARFLAGS		= ruv
 RANLIB		= echo
 LDFLAGS		= -Wl,+s
 SOFLAGS		= -b
-
-ifeq ($(distrib),1)
-
-ifeq ($(word 2,$(HPVERS_WORDS)), 10)
-SOFLAGS		+= -Wl,-x -Wl,+h/usr/lib/$(@F)
-else
-ifeq ($(buildbits),32)
-SOFLAGS		+= -Wl,-x -Wl,+h/usr/lib/$(@F)
-endif
-ifeq ($(buildbits),64)
-SOFLAGS		+= -Wl,-x -Wl,+h/usr/lib/pa20_64/$(@F)
-endif
-endif
-
-endif
-
 SOEXT		= sl
-
-ifeq ($(buildbits),32)
-CCFLAGS		+= +DA1.1 +DS1.1
-endif
-ifeq ($(buildbits),64)
-CCFLAGS		+= +DA2.0 +DS2.0
-LDFLAGS		+= -Wl,+vnocompatwarnings
-endif
-
 #
 # Grab the appropriate libraries based on the version of HP-UX we're building
 # on and whether or not thread support is being used.
diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU
index 0b9c912e3b9..4f4289ce269 100644
--- a/include/makeinclude/platform_linux_kcc.GNU
+++ b/include/makeinclude/platform_linux_kcc.GNU
@@ -2,32 +2,19 @@
 
 # According to Ben Eng <ben@jetpen.com>, this file
 # should allow ACE to be built on Linux using KAI C++ 3.3a.
-#
-# NOTE:  evaluation copies of KCC might include libraries that
-# were compiled with exception handling enabled.  To enable link
-# compatibility with those libraries, you must build ACE with
-# exception handling enabled, as well.  To do that, either set
-# the exceptions macro below to 1, or build with:
-# make exceptions=1
 
 debug = 0
-exceptions =
 optimize = 1
 
 CC      = /opt/KCC/KCC_BASE/bin/KCC
 CXX     = $(CC)
-CFLAGS  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT \
-           -D_GNU_SOURCE
+CFLAGS  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
 CCFLAGS += $(CFLAGS) -DNULL=0
 DCFLAGS += +K0 -g
 DLD     = $(CC)
 LD      = $(CC)
 LIBS    += -ldl -lpthread -lm
-
-ifndef exceptions
-  EXCEPTION = --no_exceptions
-endif # ! exceptions
-
+EXCEPTION = --no_exceptions
 OCFLAGS += +K3 -O --one_instantiation_per_object $(EXCEPTION)
 PIC     = -fPIC
 AR      = $(CC)
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 606a4a04f16..0c76c5d298c 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -10,25 +10,6 @@
 
 debug = 1
 optimize = 1
-xt_reactor = 0
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-fl_reactor = 0
-
-PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
-PLATFORM_FL_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-
-PLATFORM_GL_CPPFLAGS=
-PLATFORM_GL_LIBS=-lMesaGL
-PLATFORM_GL_LDFLAGS=
 
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 606a4a04f16..0c76c5d298c 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -10,25 +10,6 @@
 
 debug = 1
 optimize = 1
-xt_reactor = 0
-
-PLATFORM_XT_CPPFLAGS=
-PLATFORM_XT_LIBS=-lXt
-PLATFORM_XT_LDFLAGS=
-
-fl_reactor = 0
-
-PLATFORM_FL_CPPFLAGS=
-PLATFORM_FL_LIBS=-lfltk
-PLATFORM_FL_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS=-lX11
-PLATFORM_X11_LDFLAGS=-L/usr/X11R6/lib
-
-PLATFORM_GL_CPPFLAGS=
-PLATFORM_GL_LIBS=-lMesaGL
-PLATFORM_GL_LDFLAGS=
 
 ifeq ($(NO_IMPLICIT_TEMPLATES),)
       NO_IMPLICIT_TEMPLATES = -fno-implicit-templates
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index b42e8f96499..967417aec59 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -13,51 +13,24 @@ CXX             = $(CC)
 ####       instead, change "-pthread" to "-threads".
 CFLAGS          += -pthread
 
-ifndef CXX_VERSION
-  CXX_VERSION := $(shell $(CXX) -V)
-endif # CXX_VERSION
-
-CXX_1016 =
-CXX_1136 =
-
-ifneq (,$(optimize))
-  CXX_1016 = ,1016
-endif # optimize
-
-#### 6.1-029 and later support msg 1136.  We disable it by default.
-ifneq (6.0-,$(findstring 6.0-,$(CXX_VERSION)))
-ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION)))
-  ifeq (6.1-029,$(findstring 6.1-029,$(CXX_VERSION)))
-    CXX_1136 = ,1136
-  endif # 6.1-029
-else  # 6.2 or later
-  CXX_1136 = ,1136
-endif # 6.2 or later
-endif # ! 6.0
-
 #### These flags can only be used with cxx Version 6.0 and later.
 #### They are enabled by default; they can be disabled by settting
 #### CXX_VER to CXX_5 either on the make command line, or by
 #### or by setting the CXX_VER environment variable to CXX_5.
 # WARNING_FLAGS +=
+#    9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
+#  174: expr_has_no_effect
 #  193: zero used for undefined preprocessing identifier
 #  236: controlling expression is constant
 #  401: base_class_with_nonvirtual_dtor
+#  610: nonoverriding_function_decl
 #  835: unreferenced_function_param
 #  839: no_corresponding_delete (until this is fixed in libTAO)
-# 1016: expected type is incompatible with declared type of int (in bzero ())
 # 1136: conversion to integral type of smaller size could lose data
 ifneq ($(CXX_VER),CXX_5)
-  WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag
-  WARNING_FLAGS += \
-    -msg_disable 193,236,401,835,839$(CXX_1016)$(CXX_1136)
-
-  ifndef ACE_DU_VERSION
-    # In case this file wasn't included by platform_osf1_cxx.GNU:
-    # 9: nested comment not allowed.  But there's one in /usr/include/pdsc.h!
-    WARNING_FLAGS += -msg_disable 9
-  endif # ACE_DU_VERSION
-endif # 6.0 or later
+  WARNING_FLAGS += -w0 -msg_display_number \
+                   -msg_disable 9,174,193,236,401,610,835,839,1136
+endif
 
 CCFLAGS         += $(CFLAGS) -ptr ptrepository $(WARNING_FLAGS)
 ifeq ($(rtti),)
@@ -86,7 +59,10 @@ ifndef exceptions
   #### Disable the default exception handling of cxx >= 6.0.
   #### This is untested.  exceptions=1 is the default, so it's not used
   #### by default.
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
+  CXX_HAS_EXCEPTIONS := \
+    $(shell if cxx -V | egrep -v 'C\+\+ [a-zA-Z][6-9]' > /dev/null; then \
+               echo 1; fi)
+  ifdef CXX_HAS_EXCEPTIONS
     CCFLAGS += -nocleanup
-  endif # 6.x
+  endif # CXX_HAS_EXCEPTIONS
 endif # ! exceptions
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
deleted file mode 100644
index 3b1c6fc7fd3..00000000000
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ /dev/null
@@ -1,35 +0,0 @@
-# $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
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
-endif # 5.x
-endif # ! 4.x
-endif # ! 3.x
diff --git a/include/makeinclude/platform_psos_diab_ppc.GNU b/include/makeinclude/platform_psos_diab_ppc.GNU
deleted file mode 100644
index 5bfe2b61993..00000000000
--- a/include/makeinclude/platform_psos_diab_ppc.GNU
+++ /dev/null
@@ -1,200 +0,0 @@
-# $Id$
-# pSOS with Diab Data C++ 4.1a Compiler
-
-# ================================================================
-# pSOS sTUFF
-# ================================================================
-
-PSS_LIBC_DIR	= $(PSS_ROOT)/sys/libc
-PSS_SYS_DIR	= $(PSS_ROOT)/sys/os
-
-# PSOS_LIBS = -L $(PSS_LIBC_DIR) -lprepcH -lcxxsp \
-#             -L $(PSS_SYS_DIR) -lsysxx -lsys
-
-PSOS_LIBS = -L $(PSS_LIBC_DIR) -lprepcH -lcxxsp \
-            -L $(PSS_SYS_DIR) -lsys
-
-PSS_BSP_LIB	= -L $(PSS_BSP) -lbsp
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS/psos -lpsos
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -li -lchar -lg -limpl -lram -ld \
-#            -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios \
-#            -L $(DIABLIB)/MC60FS/psos -lpsos \
-#            -L $(PSS_ROOT)/sys/libc -lprepc
-
-# DIAB_LIBS = -L $(DIABLIB)/MC60FS -limpfp \
-#            -L $(DIABLIB)/MC60F -limpl \
-#            -L $(DIABLIB)/MC60F/psos -lpsos
-
-
-#DIAB_LIBS = -L $(DIABLIB)/MC60F/psos -lc \
-#            -L $(PSS_ROOT)/sys/libc -lprepc
-#            -L $(DIABLIB)/MC60F -lchar -lg -limpl -lram -ld \
-#            -L $(DIABLIB)/MC60FS -lcfp -lm -limpfp -lcomplex -lios -li
-
-PSOSINCL = -I$(PSS_ROOT)/include -I$(PSS_BSP)
-# PSOSINCL = -Y I,$(PSS_ROOT)/include -I$(PSS_BSP)
-
-# hacks to resolve incompatibilities between the compiler and OS headers
-DIAB_PSOS_HACKS = -D__Itypes -D_WCHAR_T_DEFINED -D__wchar_t  
-
-# ================================================================
-# Compilation Settings and Flags
-# ================================================================
-
-# turn on debugging
-debug = 1
-
-# turn on optimization
-optimize = 1
-
-# turn off shared libraries
-shared_libs =
-
-# turn on static libraries
-static_libs = 1
-
-
-# C Compiler
-CC              = dcc -tPPC860ES:psos
-# -WDCDCONFIG=psos.conf
-
-# C Debug Compiler Flags
-# -D<name>[=<value>] defines symbol to preprocessor
-# -U<name> undefine preprocessor symbol
-# -I<path> adds a directory path to the include file search path
-# -V[V] display the current version number of D-C++ (this could be
-#       useful for crafting a single pSOS config.h file)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-#    to change which tool is used, etc
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-#    -Xlint turns on a bunch of useful warning messages
-#    -Xno-old-style disables the use of old style C function declarations
-#                   and narrows the compiler error messages
-#    -Xmnem-emb accepts only Motorola Embedded Mnemonics (assembler directive)
-#    -Xkeywords=0x04 defines the inline keyword to be valid
-#    -Xkill-opt=0x400 turns off the split optimization.  Per Jim Terman
-#                     at DDI, this fixes a known problem
-# -Y changes the default search path for include files and libraries
-# -t<CPU><object format><floating point support>[:<environment>] is used to
-#     describe the target board. The object format is F for ELF, E for COFF,
-#     or N for GNU/VxWorks. The floating point support is H for hardware
-#     support, S for software support, or N for no floating point support
-CFLAGS += -D__DIAB -D__DIAB_42a -Xkill-opt=0x400 -Xno-old-style -Xlint $(PSOSINCL)
-
-# C Compiler Debug Flags (passed iff debug == 1)
-# -# prints subprograms with arguments as they are executed
-# -## prints subprograms with arguments without executing them
-# -### prints subprograms with arguments (in quotes) without executing them
-# -g embeds debug info but turns off a bunch of optimizations, 
-#    including inlining.  It may also trigger a known bug in the Diab 4.2b
-#    and earlier compilers that results in an internal compiler error
-#    about ctmpl_copystm () when compiling certain ACE tests.
-# -g1 embeds debug info but not line numbers, and preserves inlining.  It may
-#    also trigger the same compiler bugs that -g triggers.
-# -v runs the compiler in verbose mode
-# -w suppresses warnings
-# -H prints path names of all include files to stderr
-# -E stops compilation after preprocessing and sends
-#    results to stdout
-# -P same as -E except it sends it to the source file specified by the -o flag
-#    (IMPORTANT: for ACE, some *other* file name must be specified, as the
-#     default behavior for -P without the -o option will overwrite *our*
-#     .i (inline) file)
-# -X<name | number>[=<value>]gives detailed control of the compiler
-#    -Xlint turns on a bunch of useful warning messages
-#    -Xstop-on-warning treats warnings like errors and stops compilation
-#    -Xinit-locals[=<mask>] initializes memory pattern for local variables
-#    -Xno-optimized-debug turns off optimizations for debugging
-DCFLAGS         += -g -w -Ws 
-
-# These cause internal compiler errors for some ACE tests, because of the
-# debug information embedded by the -g and -g1 switches (see above).
-#DCFLAGS         += -g1 -w -Ws 
-#DCFLAGS         += -g -w -Ws 
-#DCFLAGS         += -g -w -Ws -P -o precomp.out
-#DCFLAGS         += -g -w -Ws -H
-
-# C Compiler Optimization Flags (passed iff optimize == 1)
-# -O
-# -XO
-# OCFLAGS         += -XO
-
-# C++ Compiler
-CXX             = dplus -tPPC860ES:psos
-### This (without the above -t option cannot resolve DOBJECT, etc.)
-# CXX             = dplus
-
-# C++ Compiler Flags
-# -o renames the output (we need to do this to avoid colliding with .i files)
-# -W is used to pass arguments to specific tools (compiler, linker, etc),
-#    to change which tool is used, etc
-# -X<name | number>[=<value>]gives detailed control of the compiler
-#    -Xexception enables exception handling
-#    -Xno-implicit-templates produces smaller code, but requires explicit
-#                            template instantiation (see pp 91 of D-C++ user guide)
-# -Xcomdat (per Jim Terman) is the "preferred" way of instantiating templates as of 4.1a (but, there are problems there with Synch_T.cpp and Synch_T.h)
-
-#CCFLAGS         += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates
-#CCFLAGS         += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=3
-#CCFLAGS         += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xno-implicit-templates=2
-#CCFLAGS         += $(CFLAGS) $(DIAB_PSOS_HACKS) -Xcomdat
-CCFLAGS         += $(CFLAGS) $(DIAB_PSOS_HACKS)
-
-# C++ Compiler Debug Flags  (passed iff debug == 1)
-DCCFLAGS         +=  $(DCFLAGS)
-
-# Dynamic Linker
-# DLD             = dld
-DLD             = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
-
-# Static Linker
-# LD              = dld
-LD              = dplus -tPPC860ES:psos -Wm $(PSS_BSP)/ram.dld $(PSS_BSP)/anchor.dld
-
-# Static Linker Flags
-# -L<path> adds a directory path to the linker search path
-# -l<name> adds a library name to the list the linker uses
-# -f<val> fills in holes in an output section with the given 16 bit pattern
-# -m generates a link map of the input and output sections on stdout
-# -m2 generates a more detailed link map of the input and output sections on stdout
-# -r performs incremental link
-# -r2 add relocation tables, treat unresolved symbols as errors
-# -r3 add relocation tables, treat unresolved symbols as warnings
-# -Xcheck-overlap checks for overlap of output sections and sections that wrap around
-#     32 bit address boundary
-# -Xdont-die forces the linker to continue after errors
-# -Xexpl-instantiations causes linker to write source lines of explicit template
-#    instantiations to stdout
-#LDFLAGS         += -Xdont-die -Xexpl-instantiations
-#LDFLAGS         += -Xdont-die
-#LDFLAGS         += -Xdont-die
-#LDFLAGS         += -Xdont-die -Xexpl-instantiations
-
-# Additional libraries used by the linker
-LIBS            +=  $(PSOS_LIBS) $(PSS_BSP_LIB)
-#LIBS            +=  $(PSOS_LIBS) $(PSS_BSP_LIB) $(DIAB_LIBS)
-
-# position independent code flag (do we need this ?)
-# PIC             = -fpic
-
-# Archive Utility
-AR              = dar
-
-# Archive Utility Flags
-# -d[lv] delete the named files from the archive
-# -m[abiv] move the named files
-# -r[abciluv] replace the named files in the archive
-ARFLAGS         = -r
-
-RANLIB          = echo
-
-# Shared Object Library Stuff (do we need this ?)
-# SOFLAGS         = -G $(CPPFLAGS)
-# SOBUILD - compile into .so directly
-# SOBUILD         = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
-
-# Unidentified Stuff
-# PRELIB          = @true
diff --git a/include/makeinclude/platform_sunos5_g++.GNU b/include/makeinclude/platform_sunos5_g++.GNU
index 9056fdddf8b..d9a547d447b 100644
--- a/include/makeinclude/platform_sunos5_g++.GNU
+++ b/include/makeinclude/platform_sunos5_g++.GNU
@@ -18,7 +18,7 @@ ifeq ($(threads),0)
   CFLAGS += -DACE_MT_SAFE=0
 endif # threads
 
-ifeq ($(shell /bin/uname -m),i86pc)
+ifeq ($(shell /bin/uname -i),i86pc)
   #### gcc on Solaris86 doesn't use -g
   DCFLAGS         += -gstabs+
 else  # ! i86pc
diff --git a/include/makeinclude/platform_sunos5_ghs.GNU b/include/makeinclude/platform_sunos5_ghs.GNU
index b0143f3162a..9a09566ad36 100644
--- a/include/makeinclude/platform_sunos5_ghs.GNU
+++ b/include/makeinclude/platform_sunos5_ghs.GNU
@@ -4,10 +4,12 @@
 
 debug = 1
 optimize = 1
+threads = 1
 exceptions =
 
-#### Green Hills 1.8.9 isn't compatible with the SunOS threads libraries.
-threads =
+ifeq ($(threads),0)
+  CFLAGS += -DACE_MT_SAFE=0
+endif # threads
 
 CC       = gcx
 CXX      = $(CC)
@@ -16,21 +18,15 @@ DCFLAGS  += -g
 DLD      = $(CXX)
 LD       = $(CXX)
 LDFLAGS  = --no_auto_instantiation
-LIBS     += -lsocket -ldl -lgen -lnsl -lposix4
+LIBS     += -lsocket -ldl -lgen -lnsl -lposix4 -lthread
 OCFLAGS  += -OL -OM
 PIC      = -PIC
 RANLIB   = @true
-AR       = $(CC) $(LDFLAGS)
-ARFLAGS  = -archive -o
+AR       = ax
+ARFLAGS  = ruv
 RANLIB   = @true
 SOFLAGS  = -shared
 
-ifeq ($(threads),1)
-  LIBS += -lthread
-else  # ! threads
-  CFLAGS += -DACE_MT_SAFE=0
-endif # ! threads
-
 ifdef exceptions
   CCFLAGS += --exceptions
 else  # ! exceptions
diff --git a/include/makeinclude/platform_sunos5_kcc.GNU b/include/makeinclude/platform_sunos5_kcc.GNU
deleted file mode 100644
index 65c66bfd88f..00000000000
--- a/include/makeinclude/platform_sunos5_kcc.GNU
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id$  -*- Makefile -*-
-
-# SunOS 5.x (Solaris 2.x) with KAI C++ 3.3e, *not* using Orbix.
-#
-
-debug = 1
-distrib = 0
-threads = 1
-
-ifeq ($(threads),1)
-  CFLAGS += --thread_safe
-  LDFLAGS += --thread_safe
-endif # threads
-
-CC              = KCC
-CXX             = KCC
-
-DCFLAGS         += -g
-DLD             = $(CXX)
-
-ifneq ($exceptions,0)
-  CCFLAGS += --exceptions
-endif # ! exceptions
-
-LD              = $(CXX)
-
-LIBS          += -lsocket -ldl -lnsl -lgen -lposix4
-
-CPPFLAGS	+= $(CFLAGS)
-OCFLAGS         += -K2
-PIC             = -KPIC
-AR              = ar
-ARFLAGS         = -xar -o
-RANLIB          = echo
-SOFLAGS         = -G $(CPPFLAGS)
-
-#### Create template repository to avoid compiler warning.
-TEMPLATE_REPOSITORY = Templates.DB
-
-ifdef BIN
-  #### Builds .shobj/$*.o file, then .shobj/$*.so file.  The .o files
-  #### are used for building libraries and executables.  But, it seems
-  #### to be necessary to build the .so files (with -G) in order to get
-  #### all template instantiations.
-  SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
-            $(SOLINK.cc) -o $@ -h $@ $(LDFLAGS) $(VSHDIR)$*.o
-else
-  #### Optimize builds when no executables are built in the current
-  #### directory.  Only a library is being created, and -G is used
-  #### in that step.  Therefore, all templates instantations are
-  #### included in the library.  This optimization saves almost 11 Mb
-  #### (2.6 percent) and 27 minutes (22 percent) on the entire ACE
-  #### build on a 168 MHz Sun Ultra2.
-  ####
-  #### Sun C++ won't allow the output from a compile to be named with
-  #### a .so extension.  Rather than muck with the ACE build rules and
-  #### risk upsetting builds on other platforms, just ln the output
-  #### after building it.
-  SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \
-                      /bin/ln $(VSHDIR)$*.o $@
-endif # BIN
-
-#### The following macro overrides enable creation of fast executables.
-#### They _don't_ support fast compilation :-)
-#### To use, add fast=1 to your "make" invocation.
-####
-#### -g is incompatible with -fast.  If you need -g, you can
-#### use "-fast -O3".
-####
-ifdef fast
-  CFLAGS += -fast +K3
-  DCFLAGS =
-  LDFLAGS += -fast +K3
-endif # fast
diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU
index 1fda9c3cd58..df0841bb73c 100644
--- a/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -25,22 +25,10 @@
 # necessary with automatic template instantiation.
 
 debug = 1
-distrib = 0
 threads = 1
 
-tk_reactor = 0
-ace_with_x11 = 0
-
-PLATFORM_TK_CPPFLAGS=
-PLATFORM_TK_LIBS=-ltk -ltcl
-PLATFORM_TK_LDFLAGS=
-
-PLATFORM_X11_CPPFLAGS=
-PLATFORM_X11_LIBS =-lX11
-PLATFORM_X11_LDFLAGS=
-
 ifeq ($(threads),1)
-  CFLAGS += -mt
+  CFLAGS += -mt 
   LDFLAGS += -mt
 endif # threads
 
@@ -71,8 +59,8 @@ ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION)))
   inline = 0
   #### Support RTTI by default.  And, use explicit template instantiation
   #### because automatic instantiation appears to be broken, at least
-  #### with early releases of CC 5.0.  And, use old iostreams.
-  CCFLAGS += $(CFLAGS) -library=iostream,no%Cstd -instances=explicit
+  #### with early releases of CC 5.0.
+  CCFLAGS         += $(CFLAGS) -instances=explicit
 endif # CC 5.0 or later
 endif # ! 4.2
 
@@ -96,18 +84,11 @@ LD              = $(CXX)
 ifdef orbix
   LDFLAGS       += $(PIC) -L$(ORBIX_ROOT)/corba2/lib \
                    -R $(ACE_ROOT)/ace -R./ -R $(ORBIX_ROOT)/corba2/lib
-ifeq ($(mt_orbix),1)
-  LIBS          += -lITinimt -liiopmt -lorbixmt -lthread
-else
-  LIBS          += -lITini -liiop -lorbix
-endif
-
-  LIBS          += -lsocket -ldl -lnsl -lgen -lposix4
+  LIBS          += -lITinimt -liiopmt -lorbixmt -lsocket -ldl -lnsl \
+                   -lthread -lgen -lposix4
   CPPFLAGS      += -I$(ORBIX_ROOT)/corba2/include
 else
-ifeq ($(distrib),0)
   LDFLAGS       += -R $(ACE_ROOT)/ace -R./
-endif
   LIBS          += -lsocket -ldl -lnsl -lgen -lposix4
 endif # orbix
 
diff --git a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
index 001576f06f1..2fa129d576d 100644
--- a/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
+++ b/include/makeinclude/platform_sunos5_sunc++_orbix.GNU
@@ -1,7 +1,6 @@
 # $Id$
 
 orbix=1
-mt_orbix=1
 exceptions=1
 
 include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
deleted file mode 100644
index 3b1c6fc7fd3..00000000000
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ /dev/null
@@ -1,35 +0,0 @@
-# $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
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
-  SOFLAGS = -shared -use_ld_input $(ACELIB)
-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 cd871eebf20..acaf8cb4197 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -17,22 +17,21 @@ CROSS-COMPILE = 1
 
 debug = 1
 optimize = 1
-rtti =
 shared_libs =
 static_libs = 1
 
 
 ifeq (,$(WIND_BASE))
   default:
-	@ERROR: you must set your WIND_BASE environment variable
+        @ERROR: you must set your WIND_BASE environment variable
 endif # WIND_BASE
 
 ifeq (,$(WIND_HOST_TYPE))
   default:
-	@ERROR: you must set your WIND_HOST_TYPE environment variable
+        @ERROR: you must set your WIND_HOST_TYPE environment variable
 endif # WIND_HOST_TYPE
 
-HOST_DIR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
+HOST_DIR        = $(WIND_BASE)/host/$(WIND_HOST_TYPE)
 
 ifeq (,$(findstring $(HOST_DIR)/bin,$PATH))
   #### Use := instead of += because += inserts a space.
@@ -42,19 +41,17 @@ endif # PATH
 PERL_PATH = perl
 
 ifeq (win32,$(findstring win32,$(WIND_HOST_TYPE)))
-  #### GNU make on WIN32 needs quoted double quotes.
-  ACE_QUOTE ='"'
+  #### GNU make on WIN32 needs double double quotes.
+  ACE_QUOTE =""
 else  # ! win32 host
   ACE_QUOTE ="
 endif # ! win32 host
 
-
 #### BEGIN target CPU-specific settings
 
-
-#### This is kind of messy so that it can support multiple targets.
-#### You'll need to set CPU to a supported CPU using one of these
-#### methods (unless your CPU is a PowerPC 604):
+#### This is kind of messy so that it can support multiple
+#### targets.  You'll need to set CPU to a supported CPU
+#### using one of these methods (unless your CPU is a PowerPC 604):
 #### 1) create a $ACE_ROOT/include/makeinclude/platform_macros.GNU
 ####    that contains something like:
 ####
@@ -71,40 +68,16 @@ ifeq ($(CPU),)
 endif # default CPU
 
 ifeq ($(CPU),PPC604)
-  BINXSYM_NAME = xsym
   CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC604
-  CCFLAGS += -fno-implicit-templates
-  GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
-  TOOLENV = ppc
-else
-ifeq ($(CPU),PPC860)
-  BINXSYM_NAME = xsym
-  CFLAGS += -B$(GCCLIB_DIR)/ -DCPU=PPC860 -mcpu=860
-  CCFLAGS += -fno-implicit-templates
   GCCLIB_DIR = $(HOST_DIR)/lib/gcc-lib/powerpc-wrs-vxworks/cygnus-2.7.2-960126
   TOOLENV = ppc
 else
 ifeq ($(CPU),I80486)
-  #### Note: -fno-implicit-templates doesn't seem to work well with g++
-  #### cygnus-2.7.2-960126 for pc486 target.  Some member functions don't
-  #### get instantiated.  Wind River knows about this problem (SPR 8483).
-  BINXSYM_NAME = xsymDec
   CFLAGS += -DCPU=I80486 -m486
   TOOLENV = 386
-else
-ifeq ($(CPU),I80386)
-  BINXSYM_NAME = xsymDec
-  CFLAGS += -DCPU=I80386
-  TOOLENV = 386
-else
-  BINXSYM_NAME = xsym
-  CCFLAGS += -fno-implicit-templates
-endif # I80386
 endif # I80486
-endif # PPC860
 endif # PPC604
 
-
 #### END target CPU-specific settings
 
 
@@ -116,38 +89,16 @@ else  # ! x86-win32
   PIPE_OPT = -pipe
 endif # ! x86-win32
 
-ifeq ($(shared_libs),1)
-  SHARED_LIBS = 1
-endif
-ifeq ($(shared_libs_only),1)
-  SHARED_LIBS = 1
-endif
-
-ifeq ($(SHARED_LIBS),1)
-  ACELIB = -L./
-  #### There's no difference between non-shared and shared object code.
-  VSHDIR = .obj/
-endif # shared_libs
-
-ifeq ($(static_libs),1)
-  AR              = ar$(TOOLENV)
-  ARFLAGS         = rv
-else  # ! static_libs
-  AR              = echo
-  ARFLAGS         = "build shared lib only"
-endif # ! static_libs
 
 CC              = cc$(TOOLENV)
 CFLAGS          += -D_REENTRANT -ansi -fno-builtin -fno-defer-pop \
                    -fvolatile -nostdinc -nostdlib $(PIPE_OPT) -Wall
-CCFLAGS         += $(CFLAGS)
-ifeq (,$(rtti))
-  #### Don't use RTTI even with egcs, because Tornado 1.0.x libraries
-  #### don't support it.
-  CCFLAGS += -fno-rtti -DACE_LACKS_RTTI
-endif # rtti
+#### Note: -f-no-implicit-templates doesn't seem to work well with
+####       g++ cygnus-2.7.2-960126 for pc486 target.  Some
+####       member functions don't get instantiated.  Wind River knows
+####       about this problem (SPR 8483).
+CCFLAGS         += $(CFLAGS) #### -fno-implicit-templates
 DCFLAGS         += -g
-DLD             = $(LD)
 INCLDIRS        += -I$(WIND_BASE)/target/h
 LD              = $(PERL_PATH) $(ACE_ROOT)/bin/ace_ld -c \
                   $(ACE_QUOTE)$(COMPILE.c) -traditional$(ACE_QUOTE) \
@@ -157,6 +108,9 @@ LDFLAGS         += -X -r
 #### the i386 family.  And -O2 causes some compilation failures.
 OCFLAGS         += -O
 PIC             =
+AR              = ar$(TOOLENV)
+ARFLAGS         = rv
+RANLIB          = /bin/true
 
 
 #### ld can't handle INCLDIRS, so override LINK definitions.
@@ -167,6 +121,17 @@ LINK.cc          = override
 LINK.cc.override = $(LD)
 
 
+#### The symbol table extractor is target-dependent.
+ifeq ($(CPU),I80486)
+  BINXSYM_NAME = xsymDec
+else
+ifeq ($(CPU),I80386)
+  BINXSYM_NAME = xsymDec
+else
+  BINXSYM_NAME = xsym
+endif # I80486
+endif # I80386
+
 #### To extract the symbol table from each executable, uncomment the POSTLINK
 #### definition below.
 ## POSTLINK         = ; VX_CPU_FAMILY=$(TOOLENV) $(BINXSYM_NAME) < $@ > $@.sym
diff --git a/include/makeinclude/platform_vxworks5.x_ghs.GNU b/include/makeinclude/platform_vxworks5.x_ghs.GNU
index 8628c58480c..04b96cab5d0 100644
--- a/include/makeinclude/platform_vxworks5.x_ghs.GNU
+++ b/include/makeinclude/platform_vxworks5.x_ghs.GNU
@@ -1,6 +1,6 @@
 # $Id$
 #
-# VxWorks 5.2-5.3.1 with Green Hills 1.8.8 and 1.8.9
+# VxWorks 5.2-5.3.1 with Green Hills 1.8.8
 
 #### Notes:
 #### 1) This file requires that your PATH be set to include the location
@@ -58,12 +58,7 @@ ifeq ($(CPU),86)
   endif # GHS
   AR = $(WIND_BASE)/host/$(WIND_HOST_TYPE)/bin/ar386
   ARFLAGS  = rsu
-
-  #### 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
+  LIBS += $(GHS)/libedgnoe.a
 else
 ifeq ($(CPU),ppc)
   ifndef GHS
@@ -85,3 +80,4 @@ LD       = $(CXX)
 LDFLAGS  = --no_auto_instantiation
 OCFLAGS  += -OL -OM
 PIC      =
+RANLIB   = @true
diff --git a/include/makeinclude/rules.lib.GNU b/include/makeinclude/rules.lib.GNU
index 14b8ea5e2e2..73af29f84fe 100644
--- a/include/makeinclude/rules.lib.GNU
+++ b/include/makeinclude/rules.lib.GNU
@@ -11,33 +11,32 @@
 #----------------------------------------------------------------------------
 
 ifndef OBJEXT
-  OBJEXT=o
+OBJEXT=o
 endif
 
 ifndef SOEXT
-  SOEXT=so
+SOEXT=so
 endif
 
 VSHLIB  = $(SHLIB:%.$(SOEXT)=%$(VAR).$(SOEXT))
 VLOBJS   = $(subst .cpp,.$(OBJEXT),$(foreach file,$(LSRC),$(VDIR)$(notdir $(file))))
 
 ifdef TEMPINCDIR
-  VSHOBJS1 =
-else  # ! TEMPINCDIR
-  LSRC    += $(LSRC2)
+VSHOBJS1 =
+else
+LSRC    += $(LSRC2)
 ifdef PRELIB
 ifdef PRELIB_USES_OBJ_ONLY
-  VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-else  # ! PRELIB_USES_OBJ_ONLY
-  VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-endif # ! PRELIB_USES_OBJ_ONLY
-  VSHOBJS1 = $(VSHOBJS)
-else  # ! PRELIB
-  VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-  VSHOBJS1 = \
-    $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
-endif # ! PRELIB
-endif # ! TEMPINCDIR
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+else
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+endif
+VSHOBJS1 = $(VSHOBJS)
+else
+VSHOBJS = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+VSHOBJS1 = $(subst .cpp,.o,$(foreach file,$(LSRC),$(VSHDIR)$(notdir $(file))))
+endif
+endif
 
 # Comment out for now...
 # $(DEFS:%=$(INSINC)/%) \
@@ -83,19 +82,46 @@ ifdef PRELIB
 endif
 	$(AR) $(ARFLAGS) $@ $?
 ifdef TEMPINCDIR
-# This is required to get AIX xlC to instantiate and compile the needed
-# templates.
-	if test -s ./$(TEMPINCDIR)/*.C; \
-	then \
-		$(LINK.cc) -o dummy $(LDFLAGS) $(ACE_ROOT)/etc/xlc_dummy.cpp $@ $(LIBS); \
-		$(RM) dummy; \
-		$(AR) $(ARFLAGS) $@ tempinc/*.o; \
+# This is required for AIX!!!
+	if test -e xxx; \
+	then  \
+		rm xxx; \
 	fi
+	(if test -s ./$(TEMPINCDIR)/*.C; \
+	then  \
+		while ! test -e xxx; \
+		do  \
+			touch xxx; \
+			cd ./$(TEMPINCDIR); \
+			for temp in *.C; \
+	 		do  \
+				if ! test -d ./$(TEMPINCDIR); \
+				then  \
+					cd ..; \
+				fi; \
+				if $(COMPILE.cc) -o $(VDIR)$$temp.o ./$(TEMPINCDIR)/$$temp; \
+				then  \
+					$(AR) $(ARFLAGS) $@ $(VDIR)$$temp.o;\
+				else  \
+					rm $@; \
+					rm xxx; \
+					exit; \
+				fi \
+	 		done;  \
+			for temp in ./$(TEMPINCDIR)/*.C; \
+	 		do  \
+				if test $$temp -nt xxx; \
+				then \
+					rm xxx; \
+					break; \
+				fi \
+	 		done  \
+	 	done;  \
+	fi)
+	rm xxx
 endif
 	-chmod a+r $@
-ifneq (,$(RANLIB))
 	-$(RANLIB) $@
-endif # RANLIB
 
 # Note that if you don't want to build shared libraries, just remove the $(VSHOBJS)
 ifdef SHLIBBUILD
@@ -117,7 +143,5 @@ ifdef SHLIBA
 $(SHLIBA): $(VSHLIB)
 	$(AR) $(ARFLAGS) $@ $?
 	-chmod a+rx $@
-ifneq (,$(RANLIB))
 	-$(RANLIB) $@
-endif # RANLIB
 endif
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index 80a9aa29aee..ae3649c944a 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -1,9 +1,9 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Local targets
-#       GNU version
-#       Requires GNU make
+#	Local targets
+#	GNU version
+#	Requires GNU make
 #----------------------------------------------------------------------------
 
 ifndef OBJDIRS
@@ -11,14 +11,14 @@ ifndef OBJDIRS
 endif # OBJDIRS
 
 #### TEMPLATE_REPOSITORY can be set in individual platform files
-#### to create template repository directories.  See
+#### to create template repository directories.	 See
 #### platform_sunos5_sunc++.GNU for an example.
 OBJDIRS += $(TEMPLATE_REPOSITORY)
 
 all.local: build.objdirs build.local install.local
 
 #----------------------------------------------------------------------------
-#       C/C++ compilation targets
+#	C/C++ compilation targets
 #----------------------------------------------------------------------------
 
 build.local: $(BUILD)
@@ -27,41 +27,36 @@ build.local: $(BUILD)
 .SUFFIXES:
 .SUFFIXES: .cpp .cc .C .idl $(SUFFIXES)
 
-ifndef TAO_ROOT
 # and here's how to compile C++ files from the IDL file.
 # 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. 
-
 %S.cpp: %.idl
-	$(IDL) --version $(IDLFLAGS) $<
+	$(IDL) $(IDLFLAGS) $<
 
 %C.cpp: %.idl
-	$(IDL) --version $(IDLFLAGS) $<
+	$(IDL) $(IDLFLAGS) $<
 
 %.hh: %.idl
-	$(IDL) --version $(IDLFLAGS) $<
-endif # TAO_ROOT
+	$(IDL) $(IDLFLAGS) $<
 
 # C++ related targets
 
-$(VDIR)%.o: %.c
+$(VDIR)%.o:	%.c
 	$(COMPILE.c) -o $@ $<
 	${MVCMD}
 
-$(VDIR)%.o: %.cpp
+$(VDIR)%.o:	%.cpp
 	$(COMPILE.cc) -o $@ $<
 	${MVCMD}
 
-#$(VDIR)%.o: %.C
+#$(VDIR)%.o:	%.C
 #	$(COMPILE.cc) -o $@ $<
 
-#$(VDIR)%.o: %.cc
+#$(VDIR)%.o:	%.cc
 #	$(COMPILE.cc) -o $@ $<
 
 # If SOLINK is defined, then the .so file is built from the .o file via
-# separate rules in the same directory.  Otherwise, the .so and .o are
+# separate rules in the same directory.	 Otherwise, the .so and .o are
 # built via the same rule.  SOLINK is required for the repository under
 # gcc.
 ifndef SOLINK
@@ -76,19 +71,19 @@ else
 $(VSHDIR)%.$(SOEXT): %.cpp
 	$(SOBUILD)
 endif
-$(VSHDIR)%.o: %.cpp
+$(VSHDIR)%.o:	%.cpp
 	$(COMPILE.cc) $(PIC) -o $@ $<
-$(VSHDIR)%.o: %.cc
+$(VSHDIR)%.o:	%.cc
 	$(COMPILE.cc) $(PIC) -o $@ $<
-$(VSHDIR)%.$(SOEXT): $(VSHDIR)%.o
+$(VSHDIR)%.$(SOEXT):	$(VSHDIR)%.o
 	$(SOLINK)
 endif
 
 #----------------------------------------------------------------------------
-#       Library generation targets
+#	Library generation targets
 #----------------------------------------------------------------------------
 
-.PRECIOUS: $(VLIB)
+.PRECIOUS:	$(VLIB)
 
 #### show_statics shows static objects in locally-created object files.
 #### It assumes that the object files were built using g++.
@@ -105,10 +100,10 @@ show_uninit:
 	-@$(TOOLDIR)nm$(TOOLENV) -Co $(VSHDIR)*o | egrep ' b '
 
 #----------------------------------------------------------------------------
-#       Installation targets
+#	Installation targets
 #----------------------------------------------------------------------------
 
-install.local: $(INSTALL)
+install.local:	$(INSTALL)
 
 deinstall.local:
 	$(RM) $(INSTALL) $(LIB:%.a=$(INSLIB)/%*.a) $(SHLIB:%.$(SOEXT)=$(INSLIB)/%*.$(SOEXT))
@@ -116,10 +111,6 @@ deinstall.local:
 
 #### To disable installs, just add "INSTALL=" to your "make" invocation.
 
-ifeq (,$(LN_S))
-  LN_S = ln -s
-endif # ! LN_S
-
 $(INSBIN)/%$(VAR) \
 $(INSINC)/ace% \
 $(INSLIB)/%$(VAR).a \
@@ -139,7 +130,7 @@ $(INSMAN)/mann/% :
 			echo "$(@F) already installed" ; \
 		else \
 			echo "Installing $(@F) -> $(@D)" ; \
-			$(RM) $(@); $(LN_S) $(shell pwd)/$(@F:%.$(SOEXT)$(ACE_LDSO_Version_Number)=%.$(SOEXT)) $(@) ; \
+			ln -s $(shell pwd)/$(@F:%.$(SOEXT)$(ACE_LDSO_Version_Number)=%.$(SOEXT)) $(@) ; \
 		fi ; \
 	fi
 ifdef MVSLIB
@@ -149,25 +140,25 @@ ifdef MVSLIB
 			echo "$(@F:.$(SOEXT)=.x) already installed" ; \
 		else \
 			echo "Installing $(@F:.$(SOEXT)=.x) -> $(@D)" ; \
-			$(RM) $(@); $(LN_S) $(shell pwd)/$(@F:.$(SOEXT)=.x) $(@:.$(SOEXT)=.x) ; \
+			ln -s $(shell pwd)/$(@F:.$(SOEXT)=.x) $(@:.$(SOEXT)=.x) ; \
 		fi \
 	fi
 endif
 
 #----------------------------------------------------------------------------
-#       Cleanup targets
+#	Cleanup targets
 #----------------------------------------------------------------------------
 
 clean.local:
-	-$(RM) *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-$(RM) -r $(OBJDIRS) $(TEMPINCDIR) ptrepository Templates.DB \
-	  gcctemp.c gcctemp so_locations
+	-$(RM) -f *.o *~ *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
+	-$(RM) -rf $(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:%=%)
+	-$(RM) -f $(BIN:%=%) $(BIN:%=%_debug) $(BIN:%=%_profile) $(BIN:%=%_optimize) $(LIB:%=%) $(LIB:%=%_debug) $(LIB:%=%_profile) $(LIB:%=%_optimize) $(SHLIB:%=%) $(SHLIB:%=%_debug) $(SHLIB:%=%_profile) $(SHLIB:%=%_optimize) $(SHLIBA:%=%)
 
 #----------------------------------------------------------------------------
-#       Dependency generation target
+#	Dependency generation target
 #----------------------------------------------------------------------------
 
 ifndef MAKEFILE
@@ -185,34 +176,32 @@ ifndef SOEXT
 endif # SOEXT
 
 depend.local: $(MAKEFILE)
-	@$(RM) $(MAKEFILE).old
+	@$(RM) -f $(MAKEFILE).old
 	@cp $(MAKEFILE) $(MAKEFILE).old
 	$(ACE_ROOT)/bin/g++dep -f $(MAKEFILE) $(CPPFLAGS) -DMAKEDEPEND $(LSRC) $(SRC) $(PSRC)
 	@cat $(MAKEFILE) | \
 	sed -e "s;$(TAO_ROOT);\$$(TAO_ROOT);g" \
 	    -e "s;$(ACE_ROOT);\$$(ACE_ROOT);g" \
-	    -e '/$$(ACE_ROOT)\/ace\/config[^\.]*\.h/d' \
 	    -e "s; /[-a-zA-Z0-9_./]*\.h;;g" \
 	    -e "s;\([-a-zA-Z0-9._]*\)\.o:;.obj/\1.o .obj/\1.$(SOEXT) $(VSHDIR)\1.o $(VSHDIR)\1.$(SOEXT):;" \
 	> $(MAKEFILE).new
-	@cat $(MAKEFILE).new >$(MAKEFILE)
-	@$(RM) $(MAKEFILE).new
+	@mv $(MAKEFILE).new $(MAKEFILE)
 	@if	cmp -s $(MAKEFILE) $(MAKEFILE).old ;\
 	then	echo "Makefile dependencies unchanged." ;\
 	else \
 		echo "Makefile dependencies updated." ;\
 	fi ;\
-	$(RM) $(MAKEFILE).old ;
+	$(RM) -f $(MAKEFILE).old ;
 
 #----------------------------------------------------------------------------
-#       RCS info target
+#	RCS info target
 #----------------------------------------------------------------------------
 
 rcs_info.local:
 	@rcs info
 
 #----------------------------------------------------------------------------
-#       Variant targets and conditional macros
+#	Variant targets and conditional macros
 #----------------------------------------------------------------------------
 
 build.objdirs: $(OBJDIRS)
diff --git a/include/makeinclude/rules.nested.GNU b/include/makeinclude/rules.nested.GNU
index 16636a25a25..a9f3a6a4509 100644
--- a/include/makeinclude/rules.nested.GNU
+++ b/include/makeinclude/rules.nested.GNU
@@ -1,14 +1,11 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Nested directory targets makefile definitions
+#	Nested directory targets makefile definitions
 #----------------------------------------------------------------------------
 
 $(TARGETS_NESTED):
-ifneq ($(DIRS),)
-ifeq (Windows,$(findstring Windows,$(OS)))
-	@cmd /c "FOR /D %i IN ($(DIRS)) DO $(MAKE) -C %i $(@:.nested=)"
-else  # ! Windows
-	@for dir in $(DIRS); do $(MAKE) -C $$dir $(@:.nested=); done
-endif # ! Windows
-endif # DIRS
+	@for dir in $(DIRS) ;\
+	do \
+		 $(MAKE) -C $$dir $(@:.nested=); \
+	done
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index a36f854f89a..9d3e23f33e6 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -18,7 +18,6 @@
 #  ----             -----------
 #  debug            Enable debugging; see DCFLAGS and DCCFLAGS.
 #  exceptions       Enable exception handling (not supported by all platforms).
-#  minimum_corba    Enable minimumCORBA support.
 #  fast             Enable -fast option, e.g., with Sun C++.
 #  inline           Enable ACE inlining.  Some platforms enable inlining by
 #                     default, others do not.
@@ -39,8 +38,6 @@
 #  static_libs_only Only build static libraries.
 #  threads          Build with thread support.
 #  xt_reactor       Build the XtReactor.
-#  fl_reactor       Build the FlReactor.
-#  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
@@ -195,15 +192,10 @@ ifeq ($(findstring g++,$(CXX)),g++)
         $(shell \
           if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
           echo 1; else echo 0; fi)
-    else
-    ifeq ($(CXX),eg++)
-      # Assume that eg++ is egcs.
-      ACE_HAS_GNUG_PRE_2_8 := 0
-    else  # ! plain g++ or eg++
+    else  # ! plain g++
       # CXX is something like g++386.  Assume, for now, that it's an old g++.
-      ACE_HAS_GNUG_PRE_2_8 := 1
-    endif # eg++
-    endif # ! plain g++ or eg++
+      ACE_HAS_GNUG_PRE_2_8 = 1
+    endif # ! plain g++
   endif # ! ACE_HAS_GNUG_PRE_2_8
 else
   ACE_HAS_GNUG_PRE_2_8 =
@@ -246,66 +238,13 @@ ifeq ($(xt_reactor),0)
 endif # xt_reactor
 
 ifneq ($(xt_reactor),)
-  override ace_with_x11=1
   CPPFLAGS += -DACE_HAS_XT $(PLATFORM_XT_CPPFLAGS)
   LIBS += $(PLATFORM_XT_LIBS)
   LDFLAGS += $(PLATFORM_XT_LDFLAGS)
 endif # xt_reactor
 
-ifeq ($(fl_reactor),0)
-  override fl_reactor =
-endif # fl_reactor
-
-ifneq ($(fl_reactor),)
-  override ace_with_x11=1
-  override ace_with_gl=1
-  CPPFLAGS += -DACE_HAS_FL $(PLATFORM_FL_CPPFLAGS)
-  LIBS += $(PLATFORM_FL_LIBS)
-  LDFLAGS += $(PLATFORM_FL_LDFLAGS)
-endif # fl_reactor
-
-ifeq ($(tk_reactor),0)
-  override tk_reactor =
-endif # tk_reactor
-
-ifneq ($(tk_reactor),)
-  override ace_with_tk=1
-  CPPFLAGS += -DACE_HAS_TK $(PLATFORM_TK_CPPFLAGS)
-  LIBS += $(PLATFORM_TK_LIBS)
-  LDFLAGS += $(PLATFORM_TK_LDFLAGS)
-endif # tk_reactor
-
-ifeq ($(ace_with_gl),0)
-  override ace_with_gl =
-endif # ace_with_gl
-
-ifneq ($(ace_with_gl),)
-  override ace_with_x11 = 1
-  CPPFLAGS += $(PLATFORM_GL_CPPFLAGS)
-  LIBS += $(PLATFORM_GL_LIBS)
-  LDFLAGS += $(PLATFORM_GL_LDFLAGS)
-endif # ace_with_gl
-
-ifeq ($(ace_with_x11),0)
-  override ace_with_x11 =
-endif # ace_with_x11
-
-ifneq ($(ace_with_x11),)
-  CPPFLAGS += $(PLATFORM_X11_CPPFLAGS)
-  LIBS += $(PLATFORM_X11_LIBS)
-  LDFLAGS += $(PLATFORM_X11_LDFLAGS)
-endif # ace_with_x11
-
-
 ifdef exceptions
   CPPFLAGS += -DACE_HAS_EXCEPTIONS
-  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.
@@ -313,10 +252,6 @@ else  # ! exceptions
   endif # ! ACE_HAS_GNUG_PRE_2_8
 endif # ! exceptions
 
-ifeq ($(minimum_corba),1)
-  CPPFLAGS += -DTAO_HAS_MINIMUM_CORBA
-endif # minimum_corba
-
 ifeq ($(profile),0)
   override profile =
 endif # profile
@@ -375,9 +310,7 @@ ifdef shared_libs
       BUILD         = $(VSHLIB) $(SHLIBA) $(VBIN)
       LIB           =
       OBJEXT        = so
-      ifndef VXWORKS
-        VDIR        = .shobj/
-      endif # ! VXWORKS
+      VDIR          = .shobj/
       ifeq ($(BIN),)
         #### No executables are being built, so don't create .obj/.
         OBJDIRS     = .shobj
diff --git a/libtool b/libtool
new file mode 100755
index 00000000000..bf9429554f7
--- /dev/null
+++ b/libtool
@@ -0,0 +1,3694 @@
+#! /bin/sh
+
+# libtool - Provide generalized library-building support services.
+# Generated automatically by ltconfig (GNU libtool 1.2e (1.259 1999/02/04 15:09:03))
+# NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+#
+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
+
+### BEGIN LIBTOOL CONFIG
+# Libtool was configured as follows, on host bambuca:
+#
+# CC="c++" CFLAGS="-g -O2" CPPFLAGS="" \
+# LD="/usr/bin/ld" NM="/usr/bin/nm -B" RANLIB="ranlib" LN_S="ln -s" \
+# DLLTOOL="""" AS="""" \
+#   ./ltconfig --disable-static --with-gcc --with-gnu-ld --no-verify ./ltmain.sh i686-pc-linux-gnu
+#
+# Compiler and other test output produced by ltconfig, useful for
+# debugging ltconfig, is in ./config.log if it exists.
+
+# The version of ltconfig that generated this script.
+LTCONFIG_VERSION="1.2e"
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=no
+
+# The host system.
+host_alias=i686-pc-linux-gnu
+host=i686-pc-linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+
+# The default C compiler.
+CC="c++"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC"
+
+# Does compiler simultaneously support -c and -o options
+compiler_c_o="yes"
+
+# Can we write directly to a .lo ?
+compiler_o_lo="yes"
+
+# Must we lock files when doing compilation ?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions"
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names.  First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}.so\$versuffix \${libname}\${release}.so\$major \$libname.so"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}.so\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR cru \$oldlib\$oldobjs~\$RANLIB \$oldlib"
+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \${wl}-soname \$wl\$soname -o \$lib \$libobjs \$deplibs \$linkopts"
+archive_sym_cmds="\$CC -shared \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib \$libobjs \$deplibs \$linkopts"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )"
+
+# Command to use when deplibs_check_method == file_magic
+file_magic_command="file"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ 	][ABCDGISTW][ 	][ 	]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\1/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# System search path for libraries
+sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+### END LIBTOOL CONFIG
+
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun ltconfig.
+#
+# Copyright (C) 1996-1999 Free Software Foundation, Inc.
+# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+  # Discard the --no-reexec flag, and continue.
+  shift
+elif test "X$1" = X--fallback-echo; then
+  # used as fallback echo
+  shift
+  cat <<EOF
+$*
+EOF
+  exit 0
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+  # Yippee, $echo works!
+  :
+else
+  # Restart under the correct shell, and then maybe $echo will work.
+  exec $SHELL "$0" --no-reexec ${1+"$@"}
+fi
+
+# The name of this program.
+progname=`$echo "$0" | sed 's%^.*/%%'`
+modename="$progname"
+
+# Constants.
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.2e
+TIMESTAMP=" (1.259 1999/02/04 15:09:03)"
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+SP2NL='tr \040 \012'
+NL2SP='tr \012 \040'
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+  save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+if test "$LTCONFIG_VERSION" != "$VERSION"; then
+  echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+  echo "$modename: not configured to build any kind of library" 1>&2
+  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+  exit 1
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+
+# Parse our command line options once, thoroughly.
+while test $# -gt 0
+do
+  arg="$1"
+  shift
+
+  case "$arg" in
+  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  # If the previous option needs an argument, assign it.
+  if test -n "$prev"; then
+    case "$prev" in
+    execute_dlfiles)
+      eval "$prev=\"\$$prev \$arg\""
+      ;;
+    *)
+      eval "$prev=\$arg"
+      ;;
+    esac
+
+    prev=
+    prevopt=
+    continue
+  fi
+
+  # Have we seen a non-optional argument yet?
+  case "$arg" in
+  --help)
+    show_help=yes
+    ;;
+
+  --version)
+    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+    exit 0
+    ;;
+
+  --config)
+    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
+    exit 0
+    ;;
+
+  --debug)
+    echo "$progname: enabling shell trace mode"
+    set -x
+    ;;
+
+  --dry-run | -n)
+    run=:
+    ;;
+
+  --features)
+    echo "host: $host"
+    if test "$build_libtool_libs" = yes; then
+      echo "enable shared libraries"
+    else
+      echo "disable shared libraries"
+    fi
+    if test "$build_old_libs" = yes; then
+      echo "enable static libraries"
+    else
+      echo "disable static libraries"
+    fi
+    exit 0
+    ;;
+
+  --finish) mode="finish" ;;
+
+  --mode) prevopt="--mode" prev=mode ;;
+  --mode=*) mode="$optarg" ;;
+
+  --quiet | --silent)
+    show=:
+    ;;
+
+  -dlopen)
+    prevopt="-dlopen"
+    prev=execute_dlfiles
+    ;;
+
+  -*)
+    $echo "$modename: unrecognized option \`$arg'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+    ;;
+
+  *)
+    nonopt="$arg"
+    break
+    ;;
+  esac
+done
+
+if test -n "$prevopt"; then
+  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+fi
+
+if test -z "$show_help"; then
+
+  # Infer the operation mode.
+  if test -z "$mode"; then
+    case "$nonopt" in
+    *cc | *++ | gcc* | *-gcc*)
+      mode=link
+      for arg
+      do
+	case "$arg" in
+	-c)
+	   mode=compile
+	   break
+	   ;;
+	esac
+      done
+      ;;
+    *db | *dbx | *strace | *truss)
+      mode=execute
+      ;;
+    *install*|cp|mv)
+      mode=install
+      ;;
+    *rm)
+      mode=uninstall
+      ;;
+    *)
+      # If we have no mode, but dlfiles were specified, then do execute mode.
+      test -n "$execute_dlfiles" && mode=execute
+
+      # Just use the default operation mode.
+      if test -z "$mode"; then
+	if test -n "$nonopt"; then
+	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+	else
+	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+	fi
+      fi
+      ;;
+    esac
+  fi
+
+  # Only execute mode is allowed to have -dlopen flags.
+  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+    $echo "$help" 1>&2
+    exit 1
+  fi
+
+  # Change the help message to a mode-specific one.
+  generic_help="$help"
+  help="Try \`$modename --help --mode=$mode' for more information."
+
+  # These modes are in order of execution frequency so that they run quickly.
+  case "$mode" in
+  # libtool compile mode
+  compile)
+    modename="$modename: compile"
+    # Get the compilation command and the source file.
+    base_compile=
+    lastarg=
+    srcfile="$nonopt"
+    suppress_output=
+
+    user_target=no
+    for arg
+    do
+      # Accept any command-line options.
+      case "$arg" in
+      -o)
+	if test "$user_target" != "no"; then
+	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+	  exit 1
+	fi
+	user_target=next
+	;;
+
+      -static)
+	build_old_libs=yes
+	continue
+	;;
+      esac
+
+      case "$user_target" in
+      next)
+	# The next one is the -o target name
+	user_target=yes
+	continue
+	;;
+      yes)
+	# We got the output file
+	user_target=set
+	libobj="$arg"
+	continue
+	;;
+      esac
+
+      # Accept the current argument as the source file.
+      lastarg="$srcfile"
+      srcfile="$arg"
+
+      # Aesthetically quote the previous argument.
+
+      # Backslashify any backslashes, double quotes, and dollar signs.
+      # These are the only characters that are still specially
+      # interpreted inside of double-quoted scrings.
+      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+      # Double-quote args containing other shell metacharacters.
+      # Many Bourne shells cannot handle close brackets correctly in scan
+      # sets, so we specify it separately.
+      case "$lastarg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	lastarg="\"$lastarg\""
+	;;
+      esac
+
+      # Add the previous argument to base_compile.
+      if test -z "$base_compile"; then
+	base_compile="$lastarg"
+      else
+	base_compile="$base_compile $lastarg"
+      fi
+    done
+
+    case "$user_target" in
+    set)
+      ;;
+    no)
+      # Get the name of the library object.
+      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+      ;;
+    *)
+      $echo "$modename: you must specify a target with \`-o'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    # Recognize several different file suffixes.
+    # If the user specifies -o file.o, it is replaced with file.lo
+    xform='[cCFSfmso]'
+    case "$libobj" in
+    *.ada) xform=ada ;;
+    *.adb) xform=adb ;;
+    *.ads) xform=ads ;;
+    *.asm) xform=asm ;;
+    *.c++) xform=c++ ;;
+    *.cc) xform=cc ;;
+    *.cpp) xform=cpp ;;
+    *.cxx) xform=cxx ;;
+    *.f90) xform=f90 ;;
+    *.for) xform=for ;;
+    esac
+
+    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+    case "$libobj" in
+    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+    *)
+      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+      exit 1
+      ;;
+    esac
+
+    if test -z "$base_compile"; then
+      $echo "$modename: you must specify a compilation command" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Delete any leftover library objects.
+    if test "$build_old_libs" = yes; then
+      removelist="$obj $libobj"
+    else
+      removelist="$libobj"
+    fi
+
+    $run $rm $removelist
+    trap "$run $rm $removelist; exit 1" 1 2 15
+
+    # Calculate the filename of the output object if compiler does
+    # not support -o with -c
+    if test "$compiler_c_o" = no; then
+      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
+      lockfile="$output_obj.lock"
+      removelist="$removelist $output_obj $lockfile"
+      trap "$run $rm $removelist; exit 1" 1 2 15
+    else
+      need_locks=no
+      lockfile=
+    fi
+
+    # Lock this critical section if it is needed
+    # We use this script file to make the link, it avoids creating a new file
+    if test "$need_locks" = yes; then
+      until ln "$0" "$lockfile" 2>/dev/null; do
+	$show "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    elif test "$need_locks" = warn; then
+      if test -f "$lockfile"; then
+	echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+      echo $srcfile > "$lockfile"
+    fi
+
+    if test -n "$fix_srcfile_path"; then
+      eval srcfile=\"$fix_srcfile_path\"
+    fi
+
+    # Only build a PIC object if we are building libtool libraries.
+    if test "$build_libtool_libs" = yes; then
+      # Without this assignment, base_compile gets emptied.
+      fbsd_hideous_sh_bug=$base_compile
+
+      # All platforms use -DPIC, to notify preprocessed assembler code.
+      command="$base_compile $pic_flag -DPIC $srcfile"
+      if test "$build_old_libs" = yes; then
+        lo_libobj="$libobj"
+	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+	if test "X$dir" = "X$libobj"; then
+	  dir="$objdir"
+	else
+	  dir="$dir/$objdir"
+	fi
+        libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+
+	if test -d "$dir"; then
+	  $show "$rm $libobj"
+	  $run $rm $libobj
+	else
+	  $show "$mkdir $dir"
+	  $run $mkdir $dir
+	  status=$?
+	  if test $status -ne 0 && test ! -d $dir; then
+	    exit $status
+	  fi
+	fi
+      fi
+      if test "$compiler_o_lo" = yes; then
+	output_obj="$libobj"
+	command="$command -o $output_obj"
+      elif test "$compiler_c_o" = yes; then
+	output_obj="$obj"
+	command="$command -o $output_obj"
+      fi
+
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	test -n "$output_obj" && $run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed, then go on to compile the next one
+      if test x"$output_obj" != x"$libobj"; then
+	$show "$mv $output_obj $libobj"
+	if $run $mv $output_obj $libobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # If we have no pic_flag, then copy the object into place and finish.
+      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
+	# Rename the .lo from within objdir to obj
+        if test -f $obj; then
+	  $show $rm $obj
+	  $run $rm $obj
+	fi
+
+	$show "$mv $libobj $obj"
+	if $run $mv $libobj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+
+	# Now arrange that obj and lo_libobj become the same file
+	$show "$LN_S $obj $lo_libobj"
+	if $run $LN_S $obj $lo_libobj; then
+	  exit 0
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Allow error messages only from the first compilation.
+      suppress_output=' >/dev/null 2>&1'
+    fi
+
+    # Only build a position-dependent object if we build old libraries.
+    if test "$build_old_libs" = yes; then
+      command="$base_compile $srcfile"
+      if test "$compiler_c_o" = yes; then
+	command="$command -o $obj"
+	output_obj="$obj"
+      fi
+
+      # Suppress compiler output if we already did a PIC compilation.
+      command="$command$suppress_output"
+      $show "$command"
+      if $run eval "$command"; then :
+      else
+	$run $rm $removelist
+	exit 1
+      fi
+
+      if test "$need_locks" = warn &&
+	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+	echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together.  If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+	$run $rm $removelist
+	exit 1
+      fi
+
+      # Just move the object if needed
+      if test x"$output_obj" != x"$obj"; then
+	$show "$mv $output_obj $obj"
+	if $run $mv $output_obj $obj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+
+      # Create an invalid libtool object if no PIC, so that we do not
+      # accidentally link it into a program.
+      if test "$build_libtool_libs" != yes; then
+        $show "echo timestamp > $libobj"
+        $run eval "echo timestamp > \$libobj" || exit $?
+      else
+	# Move the .lo from within objdir
+	$show "$mv $libobj $lo_libobj"
+	if $run $mv $libobj $lo_libobj; then :
+	else
+	  error=$?
+	  $run $rm $removelist
+	  exit $error
+	fi
+      fi
+    fi
+
+    # Unlock the critical section if it was locked
+    if test "$need_locks" != no; then
+      $rm "$lockfile"
+    fi
+
+    exit 0
+    ;;
+
+  # libtool link mode
+  link)
+    modename="$modename: link"
+    C_compiler="$CC" # save it, to compile generated C sources
+    CC="$nonopt"
+    case "$host" in
+    *-*-cygwin* | *-*-mingw* | *-*-os2*)
+      # It is impossible to link a dll without this setting, and
+      # we shouldn't force the makefile maintainer to figure out
+      # which system we are compiling for in order to pass an extra
+      # flag for every libtool invokation.
+      # allow_undefined=no
+
+      # FIXME: Unfortunately, there are problems with the above when trying
+      # to make a dll which has undefined symbols, in which case not
+      # even a static library is built.  For now, we need to specify
+      # -no-undefined on the libtool link line when we can be certain
+      # that all symbols are satisfied, otherwise we get a static library.
+      allow_undefined=yes
+
+      # This is a source program that is used to create dlls on Windows
+      # Don't remove nor modify the starting and closing comments
+# /* ltdll.c starts here */
+# #define WIN32_LEAN_AND_MEAN
+# #include <windows.h>
+# #undef WIN32_LEAN_AND_MEAN
+# #include <stdio.h>
+#
+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+#
+# #include <cygwin/cygwin_dll.h>
+# DECLARE_CYGWIN_DLL( DllMain );
+# HINSTANCE __hDllInstance_base;
+#
+# BOOL APIENTRY
+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+# {
+#   __hDllInstance_base = hInst;
+#   return TRUE;
+# }
+# /* ltdll.c ends here */
+      ;;
+    *)
+      allow_undefined=yes
+      ;;
+    esac
+    compile_command="$CC"
+    finalize_command="$CC"
+
+    compile_shlibpath=
+    finalize_shlibpath=
+    convenience=
+    old_convenience=
+    deplibs=
+    linkopts=
+
+    if test -n "$shlibpath_var"; then
+      # get the directories listed in $shlibpath_var
+      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+    else
+      libsearch_path=
+    fi
+    # now prepend the system-specific ones
+    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
+    
+    avoid_version=no
+    dlfiles=
+    dlprefiles=
+    export_dynamic=no
+    export_symbols=
+    gen
+    hardcode_libdirs=
+    finalize_hardcode_libdirs=
+    libobjs=
+    link_against_libtool_libs=
+    ltlibs=
+    module=no
+    objs=
+    preload=no
+    prev=
+    prevarg=
+    release=
+    rpath=
+    xrpath=
+    perm_rpath=
+    temp_rpath=
+    finalize_rpath=
+    thread_safe=no
+    vinfo=
+
+    # We need to know -static, to get the right output filenames.
+    for arg
+    do
+      case "$arg" in
+      -all-static | -static)
+	if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+	fi
+	build_libtool_libs=no
+	build_old_libs=yes
+	break
+	;;
+      esac
+    done
+
+    # See if our shared archives depend on static archives.
+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+    # Go through the arguments, transforming them on the way.
+    while test $# -gt 0; do
+      arg="$1"
+      shift
+
+      # If the previous option needs an argument, assign it.
+      if test -n "$prev"; then
+	case "$prev" in
+	output)
+	  compile_command="$compile_command @OUTPUT@"
+	  finalize_command="$finalize_command @OUTPUT@"
+	  ;;
+	esac
+
+	case "$prev" in
+	dlfiles|dlprefiles)
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	  case "$arg" in
+	  *.la | *.lo) ;;  # We handle these cases below.
+	  *)
+	    dlprefiles="$dlprefiles $arg"
+	    test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
+	    prev=
+	    ;;
+	  esac
+	  ;;
+	exportsyms)
+	  export_symbols="$arg"
+	  if test ! -f "$arg"; then
+	    $echo "$modename: symbol file \`$arg' does not exist"
+	    exit 1
+	  fi
+	  prev=
+	  ;;
+	release)
+	  release="-$arg"
+	  prev=
+	  continue
+	  ;;
+	rpath)
+	  rpath="$rpath $arg"
+	  prev=
+	  continue
+	  ;;
+	xrpath)
+	  xrpath="$xrpath $arg"
+	  prev=
+	  continue
+	  ;;
+	*)
+	  eval "$prev=\"\$arg\""
+	  prev=
+	  continue
+	  ;;
+	esac
+      fi
+
+      prevarg="$arg"
+
+      case "$arg" in
+      -all-static)
+	if test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -allow-undefined)
+	# FIXME: remove this flag sometime in the future.
+	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+	continue
+	;;
+
+      -avoid-version)
+	avoid_version=yes
+	continue
+	;;
+
+      -dlopen)
+	prev=dlfiles
+	continue
+	;;
+
+      -dlpreopen)
+	prev=dlprefiles
+	continue
+	;;
+
+      -export-dynamic)
+	if test "$export_dynamic" != yes; then
+	  export_dynamic=yes
+	  if test -n "$export_dynamic_flag_spec"; then
+	    eval arg=\"$export_dynamic_flag_spec\"
+	  else
+	    arg=
+	  fi
+	  if test "$preload" = no; then
+	    # Add the symbol object into the linking commands.
+	    compile_command="$compile_command @SYMFILE@"
+	    finalize_command="$finalize_command @SYMFILE@"
+	    preload=yes
+	  fi
+	fi
+	;;
+
+      -export-symbols)
+	if test -n "$export_symbols"; then
+	  $echo "$modename: cannot have more than one -exported-symbols"
+	  exit 1
+	fi
+	prev=exportsyms
+	continue
+	;;
+
+      -L*)
+	dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
+	case "$dir" in
+	/* | [A-Za-z]:[/\\]*)
+	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
+	  ;;
+	*)
+	  $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
+	  exit 1
+	  ;;
+	esac
+	deplibs="$deplibs $arg"
+	lib_search_path="$lib_search_path `expr $arg : '-L\(.*\)'`"
+	case "$host" in
+	*-*-cygwin* | *-*-mingw* | *-*-os2*)
+	  dllsearchdir="`expr $arg : '-L\(.*\)'`"
+	  dllsearchdir=`cd "$dllsearchdir" && pwd || echo "$dllsearchdir"`
+	  if test -n "$dllsearchpath"; then
+	    dllsearchpath="$dllsearchpath:$dllsearchdir"
+	  else
+	    dllsearchpath="$dllsearchdir"
+	  fi
+	  ;;
+	esac
+	;;
+
+      -l*)
+	deplibs="$deplibs $arg"
+	;;
+
+      -module)
+	if test "$module" != yes; then
+	  module=yes
+	  if test -n "$export_dynamic_flag_spec"; then
+	    eval arg=\"$export_dynamic_flag_spec\"
+	  else
+	   arg=
+	  fi
+	fi
+	;;
+	
+      -no-undefined)
+	allow_undefined=no
+	continue
+	;;
+
+      -o) prev=output ;;
+
+      -release)
+	prev=release
+	continue
+	;;
+
+      -rpath)
+	prev=rpath
+	continue
+	;;
+
+      -R)
+	prev=xrpath
+	continue
+	;;
+
+      -R*)
+	xrpath="$xrpath "`echo "X$arg" | $Xsed -e 's/^-R//'`
+	continue
+	;;
+
+      -static)
+	# If we have no pic_flag, then this is the same as -all-static.
+	if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	  compile_command="$compile_command $link_static_flag"
+	  finalize_command="$finalize_command $link_static_flag"
+	fi
+	continue
+	;;
+
+      -thread-safe)
+	thread_safe=yes
+	continue
+	;;
+
+      -version-info)
+	prev=vinfo
+	continue
+	;;
+
+      # Some other compiler flag.
+      -* | +*)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case "$arg" in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+
+      *.o | *.obj | *.a | *.lib)
+	# A standard object.
+	objs="$objs $arg"
+	;;
+
+      *.lo)
+	# A library object.
+	if test "$prev" = dlfiles; then
+	  dlfiles="$dlfiles $arg"
+	  if test "$build_libtool_libs" = yes; then
+	    prev=
+	    continue
+	  else
+	    # If libtool objects are unsupported, then we need to preload.
+	    prev=dlprefiles
+	  fi
+	fi
+
+	if test "$prev" = dlprefiles; then
+	  # Preload the old-style object.
+	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+	  prev=
+	fi
+	libobjs="$libobjs $arg"
+	;;
+
+      *.la)
+	# A libtool-controlled library.
+
+	dlname=
+	libdir=
+	library_names=
+	old_library=
+
+	# Check to see that this really is a libtool archive.
+	if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
+	  exit 1
+	fi
+
+	# If the library was installed with an old release of libtool,
+	# it will not redefine variable installed.
+	installed=yes
+
+	# If there is no directory component, then add one.
+	case "$arg" in
+	*/* | *\\*) . $arg ;;
+	*) . ./$arg ;;
+	esac
+
+	# Get the name of the library we link against.
+	linklib=
+	for l in $old_library $library_names; do
+	  linklib="$l"
+	done
+
+	if test -z "$linklib"; then
+	  $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
+	  exit 1
+	fi
+
+	# Find the relevant object directory and library name.
+	name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
+
+	if test "X$installed" = Xyes; then
+	  dir="$libdir"
+	else
+	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+	  if test "X$dir" = "X$arg"; then
+	    dir="$objdir"
+	  else
+	    dir="$dir/$objdir"
+	  fi
+	fi
+
+	if test -n "$dependency_libs"; then
+	  # Extract -R from dependency_libs
+	  temp_deplibs=
+	  for deplib in $dependency_libs; do
+	    case "$deplib" in
+	    -R*) xrpath="$xrpath "`echo "X$deplib" | $Xsed -e 's/^-R//'`;;
+	    *) temp_deplibs="$temp_deplibs $deplib";;
+	    esac
+	  done
+	  dependency_libs="$temp_deplibs"
+	fi
+
+	if test -z "$libdir"; then
+	  # It is a libtool convenience library, so add in its objects.
+	  convenience="$convenience $dir/$old_library"
+	  old_convenience="$old_convenience $dir/$old_library"
+	  deplibs="$deplibs$dependency_libs"
+	  compile_command="$compile_command $dir/$old_library$dependency_libs"
+	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
+	  continue
+	fi
+
+	# This library was specified with -dlopen.
+	if test "$prev" = dlfiles; then
+	  dlfiles="$dlfiles $arg"
+	  if test -z "$dlname" || test "$build_libtool_libs" = no; then
+	    # If there is no dlname or we're linking statically,
+	    # we need to preload.
+	    prev=dlprefiles
+	  else
+	    # We should not create a dependency on this library, but we
+	    # may need any libraries it requires.
+	    compile_command="$compile_command$dependency_libs"
+	    finalize_command="$finalize_command$dependency_libs"
+	    prev=
+	    continue
+	  fi
+	fi
+
+	# The library was specified with -dlpreopen.
+	if test "$prev" = dlprefiles; then
+	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+	  # are required to link).
+	  if test -n "$old_library"; then
+	    dlprefiles="$dlprefiles $dir/$old_library"
+	  else
+	    dlprefiles="$dlprefiles $dir/$linklib"
+	  fi
+	  prev=
+	fi
+
+	if test "$build_libtool_libs" = yes && test -n "$library_names"; then
+	  link_against_libtool_libs="$link_against_libtool_libs $arg"
+	  if test -n "$shlibpath_var"; then
+	    # Make sure the rpath contains only unique directories.
+	    case "$temp_rpath " in
+	    *" $dir "*) ;;
+	    *) temp_rpath="$temp_rpath $dir" ;;
+	    esac
+	  fi
+
+	  # This is the magic to use -rpath.
+	  if test -n "$hardcode_libdir_flag_spec"; then
+	    saved_libdir="$libdir"
+	    libdir="$dir"
+
+	    # We need an absolute path.
+	    case "$libdir" in
+	    /* | [A-Za-z]:[/\\]*) ;;
+	    *)
+	      absdir=`cd "$libdir" && pwd`
+	      if test -z "$absdir"; then
+		$echo "$modename: cannot determine absolute directory name of \`$libdir'" 1>&2
+	      else
+		libdir="$absdir"
+	      fi
+	      ;;
+	    esac
+	    if test -n "$hardcode_libdir_separator"; then
+	      if test -z "$hardcode_libdirs"; then
+		# Put the magic libdir with the hardcode flag.
+		hardcode_libdirs="$libdir"
+		libdir="@HARDCODE_LIBDIRS@"
+	      else
+		# Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+		libdir=
+	      fi
+	    fi
+
+	    if test -n "$libdir"; then
+	      eval flag=\"$hardcode_libdir_flag_spec\"
+
+	      compile_command="$compile_command $flag"
+	    fi
+
+	    libdir="$saved_libdir"
+	    if test -n "$hardcode_libdir_separator"; then
+	      if test -z "$finalize_hardcode_libdirs"; then
+		# Put the magic libdir with the hardcode flag.
+		finalize_hardcode_libdirs="$libdir"
+		libdir="@HARDCODE_LIBDIRS@"
+	      else
+		# Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$finalize_hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  finalize_hardcode_libdirs="$finalize_hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+		libdir=
+	      fi
+	    fi
+
+	    if test -n "$libdir"; then
+	      eval flag=\"$hardcode_libdir_flag_spec\"
+
+	      finalize_command="$finalize_command $flag"
+	    fi
+	    # libdir is also use after "$hardcode_action" case
+	    libdir="$saved_libdir"
+	  elif test -n "$runpath_var"; then
+	    # Do the same for the permanent run path.
+	    case "$dir" in
+	    /* | [A-Za-z]:[/\\]*) absdir="$dir";;
+	    *)
+	      absdir=`cd "$dir" && pwd`
+	      if test -z "$absdir"; then
+		$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+		absdir="$dir"
+	      fi
+	      ;;
+	    esac
+	    case "$perm_rpath " in
+	    *" $absdir "*) ;;
+	    *) perm_rpath="$perm_rpath $absdir" ;;
+	    esac
+	    case "$finalize_perm_rpath " in
+	    *" $libdir "*) ;;
+	    *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	    esac
+	  fi
+
+
+	  lib_linked=yes
+	  case "$hardcode_action" in
+	  immediate | unsupported)
+	    if test "$hardcode_direct" = no; then
+	      compile_command="$compile_command $dir/$linklib"
+	      deplibs="$deplibs $dir/$linklib"
+	      case "$host" in
+	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
+		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
+		if test -n "$dllsearchpath"; then
+		  dllsearchpath="$dllsearchpath:$dllsearchdir"
+		else
+		  dllsearchpath="$dllsearchdir"
+		fi
+		;;
+	      esac
+	    elif test "$hardcode_minus_L" = no; then
+	      case "$host" in
+	      *-*-sunos*)
+		compile_shlibpath="$compile_shlibpath$dir:"
+		;;
+	      esac
+	      compile_command="$compile_command -L$dir -l$name"
+	      deplibs="$deplibs -L$dir -l$name"
+	    elif test "$hardcode_shlibpath_var" = no; then
+	      compile_shlibpath="$compile_shlibpath$dir:"
+	      compile_command="$compile_command -l$name"
+	      deplibs="$deplibs -l$name"
+	    else
+	      lib_linked=no
+	    fi
+	    ;;
+
+	  relink)
+	    # We need an absolute path.
+	    case "$dir" in
+	    /* | [A-Za-z]:[/\\]*) ;;
+	    *)
+	      absdir=`cd "$dir" && pwd`
+	      if test -z "$absdir"; then
+		$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+		exit 1
+	      fi
+	      dir="$absdir"
+	      ;;
+	    esac
+
+	    if test "$hardcode_direct" = yes; then
+	      compile_command="$compile_command $dir/$linklib"
+	      deplibs="$deplibs $dir/$linklib"
+	    elif test "$hardcode_minus_L" = yes; then
+	      compile_command="$compile_command -L$dir -l$name"
+	      deplibs="$deplibs -L$dir -l$name"
+	    elif test "$hardcode_shlibpath_var" = yes; then
+	      compile_shlibpath="$compile_shlibpath$dir:"
+	      compile_command="$compile_command -l$name"
+	      deplibs="$deplibs -l$name"
+	    else
+	      lib_linked=no
+	    fi
+	    ;;
+
+	  *)
+	    lib_linked=no
+	    ;;
+	  esac
+
+	  if test "$lib_linked" != yes; then
+	    $echo "$modename: configuration error: unsupported hardcode properties"
+	    exit 1
+	  fi
+
+	  # Finalize command for both is simple: just hardcode it.
+	  if test "$hardcode_direct" = yes; then
+	    finalize_command="$finalize_command $libdir/$linklib"
+	  elif test "$hardcode_minus_L" = yes; then
+	    finalize_command="$finalize_command -L$libdir -l$name"
+	  elif test "$hardcode_shlibpath_var" = yes; then
+	    finalize_shlibpath="$finalize_shlibpath$libdir:"
+	    finalize_command="$finalize_command -l$name"
+	  else
+	    # We cannot seem to hardcode it, guess we'll fake it.
+	    finalize_command="$finalize_command -L$libdir -l$name"
+	  fi
+	else
+	  # Transform directly to old archives if we don't build new libraries.
+	  if test -n "$pic_flag" && test -z "$old_library"; then
+	    $echo "$modename: cannot find static library for \`$arg'" 1>&2
+	    exit 1
+	  fi
+
+	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+	  # is not unsupported.  This is valid on all known static and
+	  # shared platforms.
+	  if test "$hardcode_direct" != unsupported; then
+	    test -n "$old_library" && linklib="$old_library"
+	    compile_command="$compile_command $dir/$linklib"
+	    finalize_command="$finalize_command $dir/$linklib"
+	  else
+	    compile_command="$compile_command -L$dir -l$name"
+	    finalize_command="$finalize_command -L$dir -l$name"
+	  fi
+	fi
+
+	# Add in any libraries that this one depends upon.
+	compile_command="$compile_command$dependency_libs"
+	finalize_command="$finalize_command$dependency_libs"
+	continue
+	;;
+
+      # Some other compiler argument.
+      *)
+	# Unknown arguments in both finalize_command and compile_command need
+	# to be aesthetically quoted because they are evaled later.
+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+	case "$arg" in
+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	  arg="\"$arg\""
+	  ;;
+	esac
+	;;
+      esac
+
+      # Now actually substitute the argument into the commands.
+      if test -n "$arg"; then
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
+      fi
+    done
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$export_symbols" && test "$module" = yes; then
+      $echo "$modename: \`-export-symbols' is not supported for modules"
+      exit 1
+    fi
+    
+    oldlibs=
+    # calculate the name of the file, without its directory
+    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+    libobjs_save="$libobjs"
+
+    case "$output" in
+    "")
+      $echo "$modename: you must specify an output file" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+      ;;
+
+    *.a | *.lib)
+      if test -n "$link_against_libtool_libs"; then
+	$echo "$modename: error: cannot link libtool libraries into archives" 1>&2
+	exit 1
+      fi
+
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: 
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+      fi
+
+      if test -n "$export_symbols"; then
+	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+      fi
+
+      # Now set the variables for building old libraries.
+      build_libtool_libs=no
+      oldlibs="$output"
+      ;;
+
+    *.la)
+      # Make sure we only generate libraries of the form `libNAME.la'.
+      case "$outputname" in
+      lib*)
+	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+	eval libname=\"$libname_spec\"
+	;;
+      *)
+	if test "$module" = no; then
+	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+	if test "$need_lib_prefix" != no; then
+	  # Add the "lib" prefix for modules if required
+	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	  eval libname=\"$libname_spec\"
+	else
+	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+	fi
+	;;
+      esac
+
+      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$output_objdir" = "X$output"; then
+	output_objdir="$objdir"
+      else
+	output_objdir="$output_objdir/$objdir"
+      fi
+
+      # All the library-specific variables (install_libdir is set above).
+      library_names=
+      old_library=
+      dlname=
+
+      if test -n "$objs"; then
+	$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+	exit 1
+      fi
+
+      # How the heck are we supposed to write a wrapper for a shared library?
+      if test -n "$link_against_libtool_libs"; then
+      	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
+      	 exit 1
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
+      fi
+
+      set dummy $rpath
+      if test $# -gt 2; then
+	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+      fi
+      install_libdir="$2"
+
+      oldlibs=
+      if test -z "$rpath"; then
+	if test "$build_libtool_libs" = yes; then
+	  # Building a libtool convenience library.
+	  libext=al
+	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+	  build_libtool_libs=convenience
+	  build_old_libs=yes
+	fi
+	dependency_libs="$deplibs"
+
+	if test -n "$vinfo"; then
+	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
+	fi
+
+	if test -n "$release"; then
+	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+	fi
+      else
+
+	# Parse the version information argument.
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
+	set dummy $vinfo 0 0 0
+	IFS="$save_ifs"
+
+	if test -n "$8"; then
+	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	current="$2"
+	revision="$3"
+	age="$4"
+
+	# Check that each of the things are valid numbers.
+	case "$current" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case "$revision" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	case "$age" in
+	0 | [1-9] | [1-9][0-9]*) ;;
+	*)
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	if test $age -gt $current; then
+	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+	  exit 1
+	fi
+
+	# Calculate the version variables.
+	major=
+	versuffix=
+	verstring=
+	case "$version_type" in
+	none) ;;
+
+	linux)
+	  major=.`expr $current - $age`
+	 versuffix="$major.$age.$revision"
+	  ;;
+
+	osf)
+	  major=`expr $current - $age`
+	  versuffix=".$current.$age.$revision"
+	  verstring="$current.$age.$revision"
+
+	  # Add in all the interfaces that we are compatible with.
+	  loop=$age
+	  while test $loop != 0; do
+	    iface=`expr $current - $loop`
+	    loop=`expr $loop - 1`
+	    verstring="$verstring:${iface}.0"
+	  done
+
+	  # Make executables depend on our current version.
+	  verstring="$verstring:${current}.0"
+	  ;;
+
+	sunos)
+	  major=".$current"
+	  versuffix=".$current.$revision"
+	  ;;
+
+	freebsd-aout)
+	  major=".$current"
+	  versuffix=".$current.$revision";
+	  ;;
+
+	freebsd-elf)
+	  major=".$current"
+	  versuffix=".$current";
+	  ;;
+
+	windows)
+	  # Like Linux, but with '-' rather than '.', since we only
+	  # want one extension on Windows 95.
+	  major=`expr $current - $age`
+	  versuffix="-$major-$age-$revision"
+	  ;;
+
+	*)
+	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Clear the version info if we defaulted, and they specified a release.
+	if test -z "$vinfo" && test -n "$release"; then
+	  major=
+	  verstring="0.0"
+	  if test "$need_version" = no; then
+	    versuffix=
+	  else
+	    versuffix=".0.0"
+	  fi
+	fi
+
+	# Remove version info from name if versioning should be avoided
+	if test "$avoid_version" = yes && test "$need_version" = no; then
+	  major=
+	  versuffix=
+	  verstring=""
+	fi
+	
+	# Check to see if the archive will have undefined symbols.
+	if test "$allow_undefined" = yes; then
+	  if test "$allow_undefined_flag" = unsupported; then
+	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+	    build_libtool_libs=no
+	    build_old_libs=yes
+	  fi
+	else
+	  # Don't allow undefined symbols.
+	  allow_undefined_flag="$no_undefined_flag"
+	fi
+
+	dependency_libs="$deplibs"
+	case "$host" in
+	*-*-cygwin* | *-*-mingw* | *-*-os2*)
+	  # these systems don't actually have a c library (as such)!
+	  ;;
+	*)
+	  # Add libc to deplibs on all other systems.
+	  deplibs="$deplibs -lc"
+	  ;;
+	esac
+      fi
+
+      # Create the output directory, or remove our outputs if we need to.
+      if test -d $output_objdir; then
+	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+      else
+	$show "$mkdir $output_objdir"
+	$run $mkdir $output_objdir
+	status=$?
+	if test $status -ne 0 && test ! -d $output_objdir; then
+	  exit $status
+	fi
+      fi
+
+      # Now set the variables for building old libraries.
+      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+	# Transform .lo files to .o files.
+	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+      fi
+
+      if test "$build_libtool_libs" = yes; then
+	# Transform deplibs into only deplibs that can be linked in shared.
+	name_save=$name
+	libname_save=$libname
+	release_save=$release
+	versuffix_save=$versuffix
+	major_save=$major
+	# I'm not sure if I'm treating the release correctly.  I think
+	# release should show up in the -l (ie -lgmp5) so we don't want to
+	# add it in twice.  Is that correct?
+	release=""
+	versuffix=""
+	major=""
+	newdeplibs=
+	droppeddeps=no
+	case "$deplibs_check_method" in
+	pass_all)
+	  newdeplibs=$deplibs
+		    ;; # Don't check for shared/static.  Everything works.
+		       # This might be a little naive.  We might want to check
+		       # whether the library exists or not.  But this is on
+		       # osf3 & osf4 and I'm not really sure... Just
+		       # implementing what was already the behaviour.
+	test_compile)
+	  # This code stresses the "libraries are programs" paradigm to its
+	  # limits. Maybe even breaks it.  We compile a program, linking it
+	  # against the deplibs as a proxy for the library.  Then we can check
+	  # whether they linked in statically or dynamically with ldd.
+	  $rm conftest.c
+	  cat > conftest.c <<EOF
+	  int main() { return 0; }
+EOF
+	  $rm conftest
+	  $C_compiler -o conftest conftest.c $deplibs
+	  if test $? -eq 0 ; then
+	    ldd_output=`ldd conftest`
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	      # If $name is empty we are operating on a -L argument.
+	      if test "$name" != "" ; then
+		libname=`eval \\$echo \"$libname_spec\"`
+		deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		set dummy $deplib_matches
+		deplib_match=$2
+		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		  newdeplibs="$newdeplibs $i"
+		else
+		  droppeddeps=yes
+		  echo
+		  echo "*** Warning: This library needs some functionality provided by $i."
+		  echo "*** I have the capability to make that library automatically link in when"
+		  echo "*** you link to this library.  But I can only do this if you have a"
+		  echo "*** shared version of the library, which you do not appear to have."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  else
+	    # Error occured in the first compile.  Let's try to salvage the situation:
+	    # Compile a seperate program for each library.
+	    for i in $deplibs; do
+	      name="`expr $i : '-l\(.*\)'`"
+	     # If $name is empty we are operating on a -L argument.
+	      if test "$name" != "" ; then
+		$rm conftest
+		$C_compiler -o conftest conftest.c $i
+		# Did it work?
+		if test $? -eq 0 ; then
+		  ldd_output=`ldd conftest`
+		    libname=`eval \\$echo \"$libname_spec\"`
+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
+		    set dummy $deplib_matches
+		    deplib_match=$2
+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+		      newdeplibs="$newdeplibs $i"
+		    else
+		      droppeddeps=yes
+		      echo
+		      echo "*** Warning: This library needs some functionality provided by $i."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have."
+		    fi
+		else
+		  droppeddeps=yes
+		  echo
+		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
+		  echo "***  make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
+		fi
+	      else
+		newdeplibs="$newdeplibs $i"
+	      fi
+	    done
+	  fi
+	  deplibs=$newdeplibs
+	  ;;
+	file_magic*)
+	  set dummy $deplibs_check_method
+	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
+	  for a_deplib in $deplibs; do
+	    name="`expr $a_deplib : '-l\(.*\)'`"
+	    # If $name is empty we are operating on a -L argument.
+	    if test "$name" != "" ; then
+	      libname=`eval \\$echo \"$libname_spec\"`
+	      for i in $lib_search_path; do
+		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		    for potent_lib in $potential_libs; do
+		      # Follow soft links.
+		      if ls -lLd "$potlib" 2>/dev/null \
+			 | grep " -> " >/dev/null; then
+			continue 
+		      fi
+		      # The statement above tries to avoid entering an
+		      # endless loop below, in case of cyclic links.
+		      # We might still enter an endless loop, since a link
+		      # loop can be closed while we follow links,
+		      # but so what?
+		      potlib="$potent_lib"
+		      while test -h "$potlib" 2>/dev/null; do
+		        potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+			case "$potliblink" in
+			/*) potlib="$potliblink";;
+			*) potlib=`$echo "X$potlib" \
+				   | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			esac
+		      done
+		      if eval $file_magic_command \"\$potlib\" \
+			 | sed '11,$d' \
+			 | egrep "$file_magic_regex" > /dev/null; then
+			newdeplibs="$newdeplibs $a_deplib"
+			a_deplib=""
+			break 2
+		      fi
+		    done
+	      done
+	      if test -n "$a_deplib" ; then
+		droppeddeps=yes
+		echo
+		echo "*** Warning: This library needs some functionality provided by $a_deplib."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have."
+	      fi
+	    else
+	      # Add a -L argument.
+	      newdeplibs="$newdeplibs $a_deplib"
+	    fi
+	  done # Gone through all deplibs.
+	  ;;
+	none | unknown | *) newdeplibs=""
+	  if $echo "X$deplibs" | $Xsed -e 's/ -lc$//' -e 's/[ 	]//g' \
+	     | grep . >/dev/null; then
+	    echo
+	    if test "X$deplibs_check_method" = "Xnone"; then
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
+	    else
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
+	    fi
+	    echo "*** All declared inter-library dependencies are being dropped."
+	    droppeddeps=yes
+	  fi
+	  ;;
+	esac
+	versuffix=$versuffix_save
+	major=$major_save
+	release=$release_save
+	libname=$libname_save
+	name=$name_save
+
+	if test "$droppeddeps" = yes; then
+	  if test "$module" = yes; then
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
+	    if test -z "$global_symbol_pipe"; then
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
+	    fi
+	    if test "$build_old_libs" = no; then
+	      oldlibs="$output_objdir/$libname.$libext"
+	      build_libtool_libs=module
+	      build_old_libs=yes
+	    else
+	      build_libtool_libs=no
+	    fi
+	    dlname=
+	    library_names=
+	  else
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
+	  fi
+	fi
+      fi
+
+      # test again, we may have decided not to build it any more
+      if test "$build_libtool_libs" = yes; then
+	deplibs=$newdeplibs
+	# Done checking deplibs!
+ 
+	# Get the real and link names of the library.
+	eval library_names=\"$library_names_spec\"
+	set dummy $library_names
+	realname="$2"
+	shift; shift
+
+	if test -n "$soname_spec"; then
+	  eval soname=\"$soname_spec\"
+	else
+	  soname="$realname"
+	fi
+
+	lib="$output_objdir/$realname"
+	for link
+	do
+	  linknames="$linknames $link"
+	done
+
+	# Ensure that we have .o objects for linkers which dislike .lo
+	# (e.g. aix) incase we are running --disable-static
+        for obj in $libobjs; do
+          oldobj=`echo $obj | $Xsed -e "$lo2o"`
+          test -f $oldobj || ${LN_S} $obj $oldobj
+        done
+
+	# Use standard objects if they are pic
+        test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+	if test -n "$whole_archive_flag_spec"; then
+	  if test -n "$convenience"; then
+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+	  fi
+	else
+	  for xlib in $convenience; do
+	    # Extract the objects.
+	    xdir="$xlib"x
+	    generated="$generated $xdir"
+	    xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+	    $show "${rm}r $xdir"
+	    $run ${rm}r "$xdir"
+	    $show "mkdir $xdir"
+	    $run mkdir "$xdir"
+	    status=$?
+	    if test $status -ne 0 && test ! -d "$xdir"; then
+	      exit $status
+	    fi
+	    $show "(cd $xdir && $AR x ../$xlib)"
+	    $run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
+
+	    libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+	  done
+	fi
+
+	# Do each of the archive commands.
+	if test -n "$export_symbols" && test -n "$archive_sym_cmds"; then
+	  eval cmds=\"$archive_sym_cmds\"
+	else
+	  eval cmds=\"$archive_cmds\"
+	fi
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $
+	done
+	IFS="$save_ifs"
+
+	# Create links to the real library.
+	for linkname in $linknames; do
+	  if test "$realname" != "$linkname"; then
+	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+	  fi
+	done
+
+	# If -module or -export-dynamic was specified, set the dlname.
+	if test "$module" = yes || test "$export_dynamic" = yes; then
+	  # On all known operating systems, these are identical.
+	  dlname="$soname"
+	fi
+      fi
+      ;;
+
+    *.lo | *.o | *.obj)
+      if test -n "$link_against_libtool_libs"; then
+	$echo "$modename: error: cannot link libtool libraries into objects" 1>&2
+	exit 1
+      fi
+
+      if test -n "$deplibs"; then
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+      fi
+
+      if test -n "$dlfiles$dlprefiles"; then
+	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$rpath"; then
+	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$xrpath"; then
+	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+      fi
+
+      case "$output" in
+      *.lo)
+	if test -n "$objs"; then
+	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+	  exit 1
+	fi
+	libobj="$output"
+	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+	;;
+      *)
+	libobj=
+	obj="$output"
+	;;
+      esac
+
+      # Delete the old objects.
+      $run $rm $obj $libobj
+
+      # Create the old-style object.
+      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+
+      output="$obj"
+      eval cmds=\"$reload_cmds\"
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+
+      # Exit if we aren't doing a library object file.
+      test -z "$libobj" && exit 0
+
+      if test "$build_libtool_libs" != yes; then
+	# Create an invalid libtool object if no PIC, so that we don't
+	# accidentally link it into a program.
+	$show "echo timestamp > $libobj"
+	$run eval "echo timestamp > $libobj" || exit $?
+	exit 0
+      fi
+
+      if test -n "$pic_flag"; then
+	# Only do commands if we really have different PIC objects.
+	reload_objs="$libobjs"
+	output="$libobj"
+	eval cmds=\"$reload_cmds\"
+	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	for cmd in $cmds; do
+	  IFS="$save_ifs"
+	  $show "$cmd"
+	  $run eval "$cmd" || exit $?
+	done
+	IFS="$save_ifs"
+      else
+	# Just create a symlink.
+	$show $rm $libobj
+	$run $rm $libobj
+	$show "$LN_S $obj $libobj"
+	$run $LN_S $obj $libobj || exit $?
+      fi
+
+      exit 0
+      ;;
+
+    # Anything else should be a program.
+    *)
+      if test -n "$vinfo"; then
+	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$release"; then
+	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+      fi
+
+      if test -n "$rpath$xrpath"; then
+	# If the user specified any rpath flags, then add them.
+	for libdir in $rpath $xrpath; do
+	  if test -n "$hardcode_libdir_flag_spec"; then
+	    saved_libdir="$libdir"
+	    if test -n "$hardcode_libdir_separator"; then
+	      if test -z "$hardcode_libdirs"; then
+		# Put the magic libdir with the hardcode flag.
+		hardcode_libdirs="$libdir"
+		libdir="@HARDCODE_LIBDIRS@"
+	      else
+		# Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+		libdir=
+	      fi
+	    fi
+
+	    if test -n "$libdir"; then
+	      eval flag=\"$hardcode_libdir_flag_spec\"
+
+	      compile_command="$comile_command $flag"
+	    fi
+
+	    libdir="$saved_libdir"
+	    if test -n "$hardcode_libdir_separator"; then
+	      if test -z "$finalize_hardcode_libdirs"; then
+		# Put the magic libdir with the hardcode flag.
+		finalize_hardcode_libdirs="$libdir"
+		libdir="@HARDCODE_LIBDIRS@"
+	      else
+		# Just accumulate the unique libdirs.
+		case "$hardcode_libdir_separator$finalize_hardcode_libdirs$hardcode_libdir_separator" in
+		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+		  ;;
+		*)
+		  finalize_hardcode_libdirs="$finalize_hardcode_libdirs$hardcode_libdir_separator$libdir"
+		  ;;
+		esac
+		libdir=
+	      fi
+	    fi
+
+	    if test -n "$libdir"; then
+	      eval flag=\"$hardcode_libdir_flag_spec\"
+
+	      finalize_command="$finalize_command $flag"
+	    fi
+	  elif test -n "$runpath_var"; then
+	    case "$perm_rpath " in
+	    *" $libdir "*) ;;
+	    *) perm_rpath="$perm_rpath $libdir" ;;
+	    esac
+	    case "$finalize_perm_rpath " in
+	    *" $libdir "*) ;;
+	    *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	    esac
+	  fi
+	done
+      fi
+
+      # Substitute the hardcoded libdirs into the compile commands.
+      if test -n "$hardcode_libdir_separator"; then
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$finalize_hardcode_libdirs%g"`
+      fi
+
+      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+      if test "X$output_objdir" = "X$output"; then
+	output_objdir="$objdir"
+      else
+	output_objdir="$output_objdir/$objdir"
+      fi
+
+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
+	# Transform all the library objects into standard objects.
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+      fi
+
+      if test "$export_dynamic" = yes || test -n "$dlfiles$dlprefiles" && test -n "$NM" && test -n "$global_symbol_pipe"; then
+	dlsyms="${outputname}S.c"
+      else
+	dlsyms=
+      fi
+
+      if test -n "$dlsyms"; then
+	case "$dlsyms" in
+	"") ;;
+	*.c)
+	  if test "$export_dynamic" = yes && test -z "$export_symbols"; then
+	    # Add our own program objects to the preloaded list.
+	    dlprefiles=`$echo "X$objs $dlprefiles" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  fi
+
+	  # Discover the nlist of each of the dlfiles.
+	  nlist="$objdir/${output}.nm"
+
+	  if test -d $objdir; then
+	    $show "$rm $nlist ${nlist}T"
+	    $run $rm "$nlist" "${nlist}T"
+	  else
+	    $show "$mkdir $objdir"
+	    $run $mkdir $objdir
+	    status=$?
+	    if test $status -ne 0 && test ! -d $objdir; then
+	      exit $status
+	    fi
+	  fi
+
+	  # Parse the name list into a source file.
+	  $show "creating $objdir/$dlsyms"
+
+	  $echo > "$objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+	  if test "$export_dynamic" = yes && test -n "$export_symbols"; then
+	    sed -e 's/^\(.*\)/\1 \1/' < "$export_symbols" > "$nlist"
+	  fi
+
+	  for arg in $dlprefiles; do
+	    $show "extracting global C symbols from \`$arg'"
+	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+	  done
+
+	  if test -z "$run"; then
+	    # Make sure we have at least an empty file.
+	    test -f "$nlist" || : > "$nlist"
+
+	    # Try sorting and uniquifying the output.
+	    if sort "$nlist" | uniq > "$nlist"T; then
+	      mv -f "$nlist"T "$nlist"
+	    else
+	      $rm "$nlist"T
+	    fi
+
+	    if test -f "$nlist"; then
+	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$output_objdir/$dlsyms"
+	    else
+	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	    fi
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr_t void *
+#else
+# define lt_ptr_t char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+  const char *name;
+  lt_ptr_t address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+	    if test "$export_dynamic" = yes && test -n "$export_symbols"; then
+	      echo >> "$output_objdir/$dlsyms" "\
+  {\"${output}\", (lt_ptr_t) 0},"
+	      sed 's/^\(.*\)/  {"\1", (lt_ptr_t) \&\1},/' < "$export_symbols" >> "$output_objdir/$dlsyms"
+	    fi
+
+	    for arg in $dlprefiles; do
+	      name=`echo "$arg" | sed -e 's%^.*/%%'`
+	      echo >> "$output_objdir/$dlsyms" "\
+  {\"$name\", (lt_ptr_t) 0},"
+	      eval "$NM $arg | $global_symbol_pipe > '$nlist'"
+
+	      if test -f "$nlist"; then
+		sed 's/^\(.*\) \(.*\)$/  {"\1", (lt_ptr_t) \&\2},/' < "$nlist" >> "$output_objdir/$dlsyms"
+	      else
+		echo '/* NONE */' >> "$output_objdir/$dlsyms"
+	      fi
+	    done
+
+	    $echo >> "$output_objdir/$dlsyms" "\
+  {0, (lt_ptr_t) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+static const void *lt_preloaded_setup() {
+  return lt_preloaded_symbols;
+}
+
+#ifdef __cplusplus
+}
+#endif\
+"
+	  fi
+
+	  # Now compile the dynamic symbol file.
+	  # pic_flag works around a bug in FreeBSD linker
+	  $show "(cd $objdir && $C_compiler -c$no_builtin_flag $pic_flag -DPIC \"$dlsyms\")"
+	  $run eval '(cd $objdir && $C_compiler -c$no_builtin_flag $pic_flag -DPIC "$dlsyms")' || exit $?
+
+	  # Transform the symbol file into the correct name.
+	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
+	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.${objext}%"`
+	  ;;
+	*)
+	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+	  exit 1
+	  ;;
+	esac
+      else
+	# We keep going just in case the user didn't refer to
+	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+	# really was required.
+	if test -n "$dlfiles$dlprefiles"; then
+	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+	fi
+
+	# Nullify the symbol file.
+	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      fi
+
+      if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
+	# Replace the output file specification.
+	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+
+	# We have no uninstalled library dependencies, so finalize right now.
+	$show "$compile_command"
+	$run eval "$compile_command"
+	exit $?
+      fi
+
+      # Replace the output file specification.
+      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'T%g'`
+
+      # Create the binary in the object directory, then wrap it.
+      if test ! -d $output_objdir; then
+	$show "$mkdir $output_objdir"
+	$run $mkdir $output_objdir
+	status=$?
+	if test $status -ne 0 && test ! -d $objdir; then
+	  exit $status
+	fi
+      fi
+
+      if test -n "$shlibpath_var"; then
+	# We should set the shlibpath_var
+	rpath=
+	for dir in $temp_rpath; do
+	  case "$dir" in
+	  /* | [A-Za-z]:[/\\]*)
+	    # Absolute path.
+	    rpath="$rpath$dir:"
+	    ;;
+	  *)
+	    # Relative path: add a thisdir entry.
+	    rpath="$rpath\$thisdir/$dir:"
+	    ;;
+	  esac
+	done
+	temp_rpath="$rpath"
+      fi
+
+      # Delete the old output file.
+      $run $rm $output
+
+      if test -n "$compile_shlibpath"; then
+	compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
+      fi
+      if test -n "$finalize_shlibpath"; then
+	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+      fi
+
+      if test -n "$runpath_var"; then
+        if test -n "$perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
+	fi
+        if test -n "$finalize_perm_rpath"; then
+	  # We should set the runpath_var.
+	  rpath=
+	  for dir in $finalize_perm_rpath; do
+	    rpath="$rpath$dir:"
+	  done
+	  finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
+	fi
+      fi
+
+      if test "$hardcode_action" = relink; then
+	# AGH! Flame the AIX and HP-UX people for me, will ya?
+	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+	$echo "$modename: \`$output' will be relinked during installation" 1>&2
+      fi
+
+      $show "$compile_command"
+      $run eval "$compile_command" || exit $?
+
+      # Now create the wrapper script.
+      $show "creating $output"
+
+      # Quote the finalize command for shipping.
+      finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"`
+
+      # Quote $echo for shipping.
+      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+	case "$0" in
+	/* | [A-Za-z]:[/\\]*) qecho="$SHELL $0 --fallback-echo";;
+	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
+	esac
+	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+      else
+	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+      fi
+
+      # Only actually do things if our run command is non-null.
+      if test -z "$run"; then
+	# win32 will think the script is a binary if it has
+	# a .exe suffix, so we strip it off here.
+	case $output in
+	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+	esac
+	$rm $output
+	trap "$rm $output; exit 1" 1 2 15
+
+	$echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+  # install mode needs the following variables:
+  link_against_libtool_libs='$link_against_libtool_libs'
+  finalize_command=\"cd `pwd | sed -e $sed_quote_subst`; $finalize_command\"
+else
+  # When we are sourced in execute mode, \$file and \$echo are already set.
+  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+    echo=\"$qecho\"
+    file=\"\$0\"
+    # Make sure echo works.
+    if test \"X\$1\" = X--no-reexec; then
+      # Discard the --no-reexec flag, and continue.
+      shift
+    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+      # Yippee, \$echo works!
+      :
+    else
+      # Restart under the correct shell, and then maybe \$echo will work.
+      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+    fi
+  fi\
+"
+	$echo >> $output "\
+
+  # Find the directory that this script lives in.
+  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+  # Follow symbolic links until we get to the real thisdir.
+  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+  while test -n \"\$file\"; do
+    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+    # If there was a directory component, then change thisdir.
+    if test \"x\$destdir\" != \"x\$file\"; then
+      case \"\$destdir\" in
+      /* | [A-Za-z]:[/\\]*) thisdir=\"\$destdir\" ;;
+      *) thisdir=\"\$thisdir/\$destdir\" ;;
+      esac
+    fi
+
+    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+  done
+
+  # Try to get the absolute directory name.
+  absdir=\`cd \"\$thisdir\" && pwd\`
+  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+
+  progdir=\"\$thisdir/$objdir\"
+  program='$outputname'
+
+  if test -f \"\$
+
+	# Export our shlibpath_var if we have one.
+	if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+	  $echo >> $output "\
+    # Add our own library path to $shlibpath_var
+    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+    # Some systems cannot cope with colon-terminated $shlibpath_var
+    # The second colon is a workaround for a bug in BeOS R4 sed
+    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+    export $shlibpath_var
+"
+	fi
+
+	# fixup the dll searchpath if we need to.
+	if test -n "$dllsearchpath"; then
+	  $echo >> $output "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
+	$echo >> $output "\
+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
+      # Run the actual program with our arguments.
+"
+	case $host in
+	*-*-cygwin* | *-*-mingw | *-*-os2*)
+	  # win32 systems need to use the prog path for dll
+	  # lookup to work
+	  $echo >> $output "\
+      exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+	  ;;
+	*)
+	  $echo >> $output "\
+      # Export the path to the program.
+      PATH=\"\$progdir:\$PATH\"
+      export PATH
+
+      exec \$program \${1+\"\$@\"}
+"
+	  ;;
+	esac
+	$echo >> $output "\
+      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      exit 1
+    fi
+  else
+    # The program doesn't exist.
+    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+    \$echo \"This script is just a wrapper for \$program.\" 1>&2
+    echo \"See the $PACKAGE documentation for more information.\" 1>&2
+    exit 1
+  fi
+fi\
+"
+	chmod +x $output
+      fi
+      exit 0
+      ;;
+    esac
+
+    # See if we need to build an old-fashioned archive.
+    for oldlib in $oldlibs; do
+
+      if test "$build_libtool_libs" = convenience; then
+	oldobjs="$libobjs_save"
+	addlibs="$convenience"
+	build_libtool_libs=no
+      else
+	if test "$build_libtool_libs" = module; then
+	  oldobjs="$libobjs_save"
+	  build_libtool_libs=no
+	else
+	  oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
+	fi
+	addlibs="$old_convenience"
+      fi
+
+      # Add in members from convenience archives.
+      for xlib in $addlibs; do
+	# Extract the objects.
+	xdir="$xlib"x
+	generated="$generated $xdir"
+	xlib=`echo "$xlib" | $Xsed -e 's%^.*/%%'`
+
+	$show "${rm}r $xdir"
+	$run ${rm}r "$xdir"
+	$show "mkdir $xdir"
+	$run mkdir "$xdir"
+	status=$?
+	if test $status -ne 0 && test ! -d "$xdir"; then
+	  exit $status
+	fi
+	$show "(cd $xdir && $AR x ../$xlib)"
+	$run eval "(cd \$xdir && $AR x ../\$xlib)" || exit $?
+
+	oldobjs="$oldobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+      done
+
+      # Do each command in the archive commands.
+      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+	eval cmds=\"$old_archive_from_new_cmds\"
+      else
+	eval cmds=\"$old_archive_cmds\"
+      fi
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$generated"; then
+      $show "${rm}r$generated"
+      $run ${rm}r$generated
+    fi
+
+    # Now create the libtool archive.
+    case "$output" in
+    *.la)
+      old_library=
+      test "$build_old_libs" = yes && old_library="$libname.$libext"
+      $show "creating $output"
+
+      if test -n "$xrpath"; then
+	temp_xrpath=
+	for libdir in $xrpath; do
+	  temp_xrpath="$temp_xrpath -R$libdir"
+	done
+	dependency_libs="$temp_xrpath $dependency_libs"
+      fi
+
+      # Only create the output if not a dry run.
+      if test -z "$run"; then
+	$echo > $output "\
+# $output - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+# The name that we can dlopen(3).
+dlname='$dlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already istalled library?
+installed=no
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'\
+"
+      fi
+
+      # Do a symbolic link so that the libtool archive can be found in
+      # LD_LIBRARY_PATH before the program is installed.
+      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+      $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
+      ;;
+    esac
+    exit 0
+    ;;
+
+  # libtool install mode
+  install)
+    modename="$modename: install"
+
+    # There may be an optional sh(1) argument at the beginning of
+    # install_prog (especially on Windows NT).
+    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
+      # Aesthetically quote it.
+      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+      case "$arg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$arg "
+      arg="$1"
+      shift
+    else
+      install_prog=
+      arg="$nonopt"
+    fi
+
+    # The real first argument should be the name of the installation program.
+    # Aesthetically quote it.
+    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+    case "$arg" in
+    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+      arg="\"$arg\""
+      ;;
+    esac
+    install_prog="$install_prog$arg"
+
+    # We need to accept at least all the BSD install flags.
+    dest=
+    files=
+    opts=
+    prev=
+    install_type=
+    isdir=no
+    stripme=
+    for arg
+    do
+      if test -n "$dest"; then
+	files="$files $dest"
+	dest="$arg"
+	continue
+      fi
+
+      case "$arg" in
+      -d) isdir=yes ;;
+      -f) prev="-f" ;;
+      -g) prev="-g" ;;
+      -m) prev="-m" ;;
+      -o) prev="-o" ;;
+      -s)
+	stripme=" -s"
+	continue
+	;;
+      -*) ;;
+
+      *)
+	# If the previous option needed an argument, then skip it.
+	if test -n "$prev"; then
+	  prev=
+	else
+	  dest="$arg"
+	  continue
+	fi
+	;;
+      esac
+
+      # Aesthetically quote the argument.
+      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+      case "$arg" in
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
+	arg="\"$arg\""
+	;;
+      esac
+      install_prog="$install_prog $arg"
+    done
+
+    if test -z "$install_prog"; then
+      $echo "$modename: you must specify an install program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -n "$prev"; then
+      $echo "$modename: the \`$prev' option requires an argument" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    if test -z "$files"; then
+      if test -z "$dest"; then
+	$echo "$modename: no file or destination specified" 1>&2
+      else
+	$echo "$modename: you must specify a destination" 1>&2
+      fi
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    # Strip any trailing slash from the destination.
+    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+    # Check to see that the destination is a directory.
+    test -d "$dest" && isdir=yes
+    if test "$isdir" = yes; then
+      destdir="$dest"
+      destname=
+    else
+      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$destdir" = "X$dest" && destdir=.
+      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+      # Not a directory, so check to see that there is only one file specified.
+      set dummy $files
+      if test $# -gt 2; then
+	$echo "$modename: \`$dest' is not a directory" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+    fi
+    case "$destdir" in
+    /* | [A-Za-z]:[/\\]*) ;;
+    *)
+      for file in $files; do
+	case "$file" in
+	*.lo) ;;
+	*)
+	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+      done
+      ;;
+    esac
+
+    # This variable tells wrapper scripts just to set variables rather
+    # than running their programs.
+    libtool_install_magic="$magic"
+
+    staticlibs=
+    future_libdirs=
+    current_libdirs=
+    for file in $files; do
+
+      # Do each installation.
+      case "$file" in
+      *.a | *.lib)
+	# Do the static libraries later.
+	staticlibs="$staticlibs $file"
+	;;
+
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	library_names=
+	old_library=
+	# If there is no directory component, then add one.
+	case "$file" in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Add the libdir to current_libdirs if it is the destination.
+	if test "X$destdir" = "X$libdir"; then
+	  case "$current_libdirs " in
+	  *" $libdir "*) ;;
+	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  esac
+	else
+	  # Note the libdir as a future libdir.
+	  case "$future_libdirs " in
+	  *" $libdir "*) ;;
+	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  esac
+	fi
+
+	dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
+	test "X$dir" = "X$file/" && dir=
+	dir="$dir$objdir"
+
+	# See the names of the shared library.
+	set dummy $library_names
+	if test -n "$2"; then
+	  realname="$2"
+	  shift
+	  shift
+
+	  # Install the shared library and build the symlinks.
+	  $show "$install_prog $dir/$realname $destdir/$realname"
+	  $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
+	  test "X$dlname" = "X$realname" && dlname=
+
+	  if test $# -gt 0; then
+	    # Delete the old symlinks, and create new ones.
+	    for linkname
+	    do
+	      test "X$dlname" = "X$linkname" && dlname=
+	      if test "$linkname" != "$realname"; then
+		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+	      fi
+	    done
+	  fi
+
+	  if test -n "$dlname"; then
+	    # Install the dynamically-loadable library.
+	    $show "$install_prog $dir/$dlname $destdir/$dlname"
+	    $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
+	  fi
+
+	  # Do each command in the postinstall commands.
+	  lib="$destdir/$realname"
+	  eval cmds=\"$postinstall_cmds\"
+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || exit $?
+	  done
+	  IFS="$save_ifs"
+	fi
+
+	# Install the pseudo-library for information purposes.
+	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	instname="$dir/$name"i
+	$show "Creating $instname"
+	$rm "$instname"
+	sed 's/^installed=no$/installed=yes/' "$file" > "$instname"
+	$show "$install_prog $instname $destdir/$name"
+	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	$show "$rm $instname"
+	$rm "$instname"
+
+	# Maybe install the static library, too.
+	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	;;
+
+      *.lo)
+	# Install (i.e. copy) a libtool object.
+
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Deduce the name of the destination old-style object file.
+	case "$destfile" in
+	*.lo)
+	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+	  ;;
+	*.o | *.obj)
+	  staticdest="$destfile"
+	  destfile=
+	  ;;
+	*)
+	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	  ;;
+	esac
+
+	# Install the libtool object if requested.
+	if test -n "$destfile"; then
+	  $show "$install_prog $file $destfile"
+	  $run eval "$install_prog $file $destfile" || exit $?
+	fi
+
+	# Install the old object if enabled.
+	if test "$build_old_libs" = yes; then
+	  # Deduce the name of the old-style object file.
+	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+	  $show "$install_prog $staticobj $staticdest"
+	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	fi
+	exit 0
+	;;
+
+      *)
+	# Figure out destination file name, if it wasn't already specified.
+	if test -n "$destname"; then
+	  destfile="$destdir/$destname"
+	else
+	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+	  destfile="$destdir/$destfile"
+	fi
+
+	# Do a test to see if this is really a libtool program.
+	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  link_against_libtool_libs=
+	  finalize_command=
+
+	  # If there is no directory component, then add one.
+	  case "$file" in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Check the variables that should have been set.
+	  if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
+	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+	    exit 1
+	  fi
+
+	  finalize=yes
+	  for lib in $link_against_libtool_libs; do
+	    # Check to see that each library is installed.
+	    libdir=
+	    if test -f "$lib"; then
+	      # If there is no directory component, then add one.
+	      case "$lib" in
+	      */* | *\\*) . $lib ;;
+	      *) . ./$lib ;;
+	      esac
+	    fi
+	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
+	    if test -n "$libdir" && test ! -f "$libfile"; then
+	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+	      finalize=no
+	    fi
+	  done
+
+	  if test "$hardcode_action" = relink; then
+	    if test "$finalize" = yes; then
+	      $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+	      $show "$finalize_command"
+	      if $run eval "$finalize_command"; then :
+	      else
+		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+		continue
+	      fi
+	      file="$objdir/$file"T
+	    else
+	      $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+	    fi
+	  else
+	    # Install the binary that we compiled earlier.
+	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	  fi
+	fi
+
+	$show "$install_prog$stripme $file $destfile"
+	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+	;;
+      esac
+    done
+
+    for file in $staticlibs; do
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      # Set up the ranlib parameters.
+      oldlib="$destdir/$name"
+
+      $show "$install_prog $file $oldlib"
+      $run eval "$install_prog \$file \$oldlib" || exit $?
+
+      # Do each command in the postinstall commands.
+      eval cmds=\"$old_postinstall_cmds\"
+      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+      for cmd in $cmds; do
+	IFS="$save_ifs"
+	$show "$cmd"
+	$run eval "$cmd" || exit $?
+      done
+      IFS="$save_ifs"
+    done
+
+    if test -n "$future_libdirs"; then
+      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+    fi
+
+    if test -n "$current_libdirs"; then
+      # Maybe just do a dry run.
+      test -n "$run" && current_libdirs=" -n$current_libdirs"
+      exec $SHELL $0 --finish$current_libdirs
+      exit 1
+    fi
+
+    exit 0
+    ;;
+
+  # libtool finish mode
+  finish)
+    modename="$modename: finish"
+    libdirs="$nonopt"
+    admincmds=
+
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      for dir
+      do
+	libdirs="$libdirs $dir"
+      done
+
+      for libdir in $libdirs; do
+	if test -n "$finish_cmds"; then
+	  # Do each command in the finish commands.
+	  eval cmds=\"$finish_cmds\"
+	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	  for cmd in $cmds; do
+	    IFS="$save_ifs"
+	    $show "$cmd"
+	    $run eval "$cmd" || admincmds="$admincmds
+       $cmd"
+	  done
+	  IFS="$save_ifs"
+	fi
+	if test -n "$finish_eval"; then
+	  # Do the single finish_eval.
+	  eval cmds=\"$finish_eval\"
+	  $run eval "$cmds" || admincmds="$admincmds
+       $cmds"
+	fi
+      done
+    fi
+
+    # Exit here if they wanted silent mode.
+    test "$show" = : && exit 0
+
+    echo "----------------------------------------------------------------------"
+    echo "Libraries have been installed in:"
+    for libdir in $libdirs; do
+      echo "   $libdir"
+    done
+    echo
+    echo "If you ever happen to want to link against installed libraries"
+    echo "in a given directory, LIBDIR, you must either use libtool, and"
+    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+    echo "flag during linking and do at least one of the following:"
+    if test -n "$shlibpath_var"; then
+      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+      echo "     during execution"
+    fi
+    if test -n "$runpath_var"; then
+      echo "   - add 
+      echo "     during linking"
+    fi
+    if test -n "$hardcode_libdir_flag_spec"; then
+      libdir=LIBDIR
+      eval flag=\"$hardcode_libdir_flag_spec\"
+
+      echo "   - use the \`$flag' linker flag"
+    fi
+    if test -n "$admincmds"; then
+      echo "   - have your system administrator run these commands:$admincmds"
+    fi
+    if test -f /etc/ld.so.conf; then
+      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+    fi
+    echo
+    echo "See any operating system documentation about shared libraries for"
+    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+    echo "----------------------------------------------------------------------"
+    exit 0
+    ;;
+
+  # libtool execute mode
+  execute)
+    modename="$modename: execute"
+
+    # The first argument is the command name.
+    cmd="$nonopt"
+    if test -z "$cmd"; then
+      $echo "$modename: you must specify a COMMAND" 1>&2
+      $echo "$help"
+      exit 1
+    fi
+
+    # Handle -dlopen flags immediately.
+    for file in $execute_dlfiles; do
+      if test ! -f "$file"; then
+	$echo "$modename: \`$file' is not a file" 1>&2
+	$echo "$help" 1>&2
+	exit 1
+      fi
+
+      dir=
+      case "$file" in
+      *.la)
+	# Check to see that this really is a libtool archive.
+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+	else
+	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+	  $echo "$help" 1>&2
+	  exit 1
+	fi
+
+	# Read the libtool library.
+	dlname=
+	library_names=
+
+	# If there is no directory component, then add one.
+	case "$file" in
+	*/* | *\\*) . $file ;;
+	*) . ./$file ;;
+	esac
+
+	# Skip this library if it cannot be dlopened.
+	if test -z "$dlname"; then
+	  # Warn if it was a shared library.
+	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+	  continue
+	fi
+
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+
+	if test -f "$dir/$objdir/$dlname"; then
+	  dir="$dir/$objdir"
+	else
+	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	  exit 1
+	fi
+	;;
+
+      *.lo)
+	# Just add the directory containing the .lo file.
+	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+	test "X$dir" = "X$file" && dir=.
+	;;
+
+      *)
+	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+	continue
+	;;
+      esac
+
+      # Get the absolute pathname.
+      absdir=`cd "$dir" && pwd`
+      test -n "$absdir" && dir="$absdir"
+
+      # Now add the directory to shlibpath_var.
+      if eval "test -z \"\$$shlibpath_var\""; then
+	eval "$shlibpath_var=\"\$dir\""
+      else
+	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+      fi
+    done
+
+    # This variable tells wrapper scripts just to set shlibpath_var
+    # rather than running their programs.
+    libtool_execute_magic="$magic"
+
+    # Check if any of the arguments is a wrapper script.
+    args=
+    for file
+    do
+      case "$file" in
+      -*) ;;
+      *)
+	# Do a test to see if this is really a libtool program.
+	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  # If there is no directory component, then add one.
+	  case "$file" in
+	  */* | *\\*) . $file ;;
+	  *) . ./$file ;;
+	  esac
+
+	  # Transform arg to wrapped name.
+	  file="$progdir/$program"
+	fi
+	;;
+      esac
+      # Quote arguments (to preserve shell metacharacters).
+      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+      args="$args \"$file\""
+    done
+
+    if test -z "$run"; then
+      # Export the shlibpath_var.
+      eval "export $shlibpath_var"
+
+      # Restore saved enviroment variables
+      if test "${save_LC_ALL+set}" = set; then
+	LC_ALL="$save_LC_ALL"; export LC_ALL
+      fi
+      if test "${save_LANG+set}" = set; then
+	LANG="$save_LANG"; export LANG
+      fi
+
+      # Now actually exec the command.
+      eval "exec \$cmd$args"
+
+      $echo "$modename: cannot exec \$cmd$args"
+      exit 1
+    else
+      # Display what would be done.
+      eval "\$echo \"\$shlibpath_ar=\$$shlibpath_var\""
+      $echo "export $shlibpath_var"
+      $echo "$cmd$args"
+      exit 0
+    fi
+    ;;
+
+  # libtool uninstall mode
+  uninstall)
+    modename="$modename: uninstall"
+    rm="$nonopt"
+    files=
+
+    for arg
+    do
+      case "$arg" in
+      -*) rm="$rm $arg" ;;
+      *) files="$files $arg" ;;
+      esac
+    done
+
+    if test -z "$rm"; then
+      $echo "$modename: you must specify an RM program" 1>&2
+      $echo "$help" 1>&2
+      exit 1
+    fi
+
+    for file in $files; do
+      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+      test "X$dir" = "X$file" && dir=.
+      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+      rmfiles="$file"
+
+      case "$name" in
+      *.la)
+	# Possibly a libtool archive, so verify it.
+	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+	  . $dir/$name
+
+	  # Delete the libtool libraries and symlinks.
+	  for n in $library_names; do
+	    rmfiles="$rmfiles $dir/$n"
+	    test "X$n" = "X$dlname" && dlname=
+	  done
+	  test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
+	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
+
+	  $show "$rm $rmfiles"
+	  $run $rm $rmfiles
+
+	  if test -n "$library_names"; then
+	    # Do each command in the postuninstall commands.
+	    eval cmds=\"$postuninstall_cmds\"
+	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      $show "$cmd"
+	      $run eval "$cmd"
+	    done
+	    IFS="$save_ifs"
+	  fi
+
+	  if test -n "$old_library"; then
+	    # Do each command in the old_postuninstall commands.
+	    eval cmds=\"$old_postuninstall_cmds\"
+	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+	    for cmd in $cmds; do
+	      IFS="$save_ifs"
+	      $show "$cmd"
+	      $run eval "$cmd"
+	    done
+	    IFS="$save_ifs"
+	  fi
+
+	  # FIXME: should reinstall the best remaining shared library.
+	fi
+	;;
+
+      *.lo)
+	if test "$build_old_libs" = yes; then
+	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+	  rmfiles="$rmfiles $dir/$oldobj"
+	fi
+	$show "$rm $rmfiles"
+	$run $rm $rmfiles
+	;;
+
+      *)
+	$show "$rm $rmfiles"
+	$run $rm $rmfiles
+	;;
+      esac
+    done
+    exit 0
+    ;;
+
+  "")
+    $echo "$modename: you must specify a MODE" 1>&2
+    $echo "$generic_help" 1>&2
+    exit 1
+    ;;
+  esac
+
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$generic_help" 1>&2
+  exit 1
+fi # test -z "$show_help"
+
+# We need to display help for each of the modes.
+case "$mode" in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+    --config          show all configuration variables
+    --debug           enable verbose shell tracing
+-n, --dry-run         display commands without modifying any files
+    --features        display basic configuration information and exit
+    --finish          same as \`--mode=finish'
+    --help            display this help message and exit
+    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+    --quiet           same as \`--silent'
+    --silent          don't print informational messages
+    --version         print version information
+
+MODE must be one of the following:
+
+      compile         compile a source file into a libtool object
+      execute         automatically set library path, then run a program
+      finish          complete the installation of libtool libraries
+      install         install libraries or executables
+      link            create a library or an executable
+      uninstall       remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE."
+  exit 0
+  ;;
+
+compile)
+  $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
+  -static           always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+  ;;
+
+execute)
+  $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+  -dlopen FILE      add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+  ;;
+
+finish)
+  $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges.  Use
+the \`--dry-run' option if you just want to see what would be executed."
+  ;;
+
+install)
+  $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command.  The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+  ;;
+
+link)
+  $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+  -all-static       do not do any dynamic linking at all
+  -avoid-version    do not add a version suffix if possible
+  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+  -export-symbols SYMFILE
+		    try to export only the symbols listed in SYMFILE
+  -LLIBDIR          search LIBDIR for required installed libraries
+  -lNAME            OUTPUT-FILE requires the installed library libNAME
+  -module           build a library that can dlopened
+  -no-undefined     declare that a library does not refer to external symbols
+  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+  -release RELEASE  specify package release information
+  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+  -static           do not do any dynamic linking of libtool libraries
+  -version-info CURRENT[:REVISION[:AGE]]
+		    specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename.  Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+  ;;
+
+uninstall)
+  $echo
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+  ;;
+
+*)
+  $echo "$modename: invalid operation mode \`$mode'" 1>&2
+  $echo "$help" 1>&2
+  exit 1
+  ;;
+esac
+
+echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit 0
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
deleted file mode 100644
index a0c87046af8..00000000000
--- a/m4/acinclude.m4
+++ /dev/null
@@ -1,502 +0,0 @@
-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])
-])
diff --git a/m4/compiler.m4 b/m4/compiler.m4
deleted file mode 100644
index 1b8adc3f68a..00000000000
--- a/m4/compiler.m4
+++ /dev/null
@@ -1,198 +0,0 @@
-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
-])
diff --git a/m4/features.m4 b/m4/features.m4
deleted file mode 100644
index 7e81c3b25e1..00000000000
--- a/m4/features.m4
+++ /dev/null
@@ -1,549 +0,0 @@
-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 <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 ("conftest.log", O_RDWR | O_CREAT | O_TRUNC, 0666);
-  if (this->out_fd_ == 0)
-    {
-      return -1;
-    }
-
-  // Init the buffers.
-  this->buffer_write_ = strdup ("Welcome to the world of AIO... AIO Rules !!!");
-  this->buffer_read_ = new char [strlen (this->buffer_write_)];
-}
-
-// 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);
-
-      // 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;
-            }
-        }
-
-      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;
-            }
-        }
-
-      // Is it done?
-      if ((list_aiocb [0] == 0) && (list_aiocb [1] == 0))
-        done = 1;
-    }
-  
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  Test_Aio test_aio;
-
-  if (test_aio.init () != 0)
-    {
-      return -1;
-    }
-  
-  if (test_aio.do_aio () != 0)
-    {
-      return -1;
-    }
-
-  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_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 (sigprocmask (SIG_BLOCK, &completion_signal, 0) == -1)
-    {
-      perror ("Error:Couldnt maks the RT completion signals\n");
-      return -1;
-    }
-  
-  /* 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 = 0;         /* No 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;
-}
-
-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
-main (int, char *[])
-{
-  if (test_aio_calls () != 0)
-    return -1;
-  else
-  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
-])
diff --git a/m4/platform.m4 b/m4/platform.m4
deleted file mode 100644
index 7ec5daaca00..00000000000
--- a/m4/platform.m4
+++ /dev/null
@@ -1,271 +0,0 @@
-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/m4/subsets.m4 b/m4/subsets.m4
deleted file mode 100644
index 34739908c42..00000000000
--- a/m4/subsets.m4
+++ /dev/null
@@ -1,591 +0,0 @@
-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
-])
diff --git a/m4/threads.m4 b/m4/threads.m4
deleted file mode 100644
index 9074e84f748..00000000000
--- a/m4/threads.m4
+++ /dev/null
@@ -1,265 +0,0 @@
-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
-   ])
-])
diff --git a/netsvcs/ACE-netsvcs.html b/netsvcs/ACE-netsvcs.html
index f0dccb6b2b6..b3854dc0811 100644
--- a/netsvcs/ACE-netsvcs.html
+++ b/netsvcs/ACE-netsvcs.html
@@ -39,13 +39,10 @@ These services play two roles in ACE:<P>
 <LI> They provide reusable components for common distributed system
      tasks such as logging, naming, locking, and time synchronization.<P>
 <LI> They illustrate how to utilize ACE features such as the <A
-     HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#ipc">IPC
-wrappers</A>, <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#reactor">Reactor</A>,
-     <A HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config">Service Configurator</A>, <A
-     HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#initialize">Service
-Initialization</A>, and <A
-HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#concurrency">Concurrency</A>
-components. <P> </UL>
+     HREF="ACE-papers.html#ipc">IPC wrappers</A>, <A HREF="ACE-papers.html#reactor">Reactor</A>,
+     <A HREF="ACE-papers.html#config">Service Configurator</A>, <A
+     HREF="ACE-papers.html#initialize">Service Initialization</A>, and <A HREF="ACE-papers.html#concurrency">Concurrency</A> components. <P>
+</UL>
 
 The heart of the ACE network services is the <A
 HREF="http://www.cs.wustl.edu/~schmidt/ACE-papers.html#config">Service
@@ -261,22 +258,21 @@ dynamic Naming_Service_Client Service_Object *
 </OL>
 
 Note:<P>
-
 <UL>
+<LI> These files would vary if the services are run on NT. For
+example, instead of using *.so, we would have to use *.dll.<P>
 <LI> Values for parameters can also be passed in using environment
 variables. For example, instead of specifying absolute hostname or
 port numbers in the config file, we can use $HOST and $PORT,
 respectively, in the file (assuming that these environment variables
 have been set). <P>
-
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the name of the
-shared object or dll would suffice. That is, the Service Configurator
-makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32) to look for
-the shared object files or dlls.
-
+of specifying an absolute path to the shared object or dll, only the
+name of the shared object or dll would suffice. That is, the Service
+Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
+to look for the shared object files or dlls.
 </UL>
 
 </UL>
@@ -421,7 +417,7 @@ have been set). <P>
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the
+of specifying an absolute path to the shared object or dll, only the
 name of the shared object or dll would suffice. That is, the Service
 Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
 to look for the shared object files or dlls.
@@ -542,7 +538,7 @@ The following describes how to configure the Token Server:<P>
 
  <LI> <B>Examples </B><P>
 
-      Here is an example svc.conf entry that dynamically loads the
+      Here is an example NT svc.conf entry that dynamically loads the
       Token Server specifying port number to listen on for client
       connections:<P> 
 
@@ -553,6 +549,16 @@ The following describes how to configure the Token Server:<P>
        </code></pre>
        <P>
 
+      Here is an example UNIX svc.conf entry that dynamically loads the
+      Token Server specifying port number to listen on for client
+      connections.  Notice that only the name of the library file
+      changed:<P>
+
+       <code><pre>
+          dynamic Token_Service Service_Object * 
+            ../lib/netsvcs:_make_ACE_Token_Acceptor() 
+            "-p 10202"
+      </code></pre>
 </UL>
 Note:<P>
 <UL>
@@ -566,7 +572,7 @@ have been set). <P>
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the
+of specifying an absolute path to the shared object or dll, only the
 name of the shared object or dll would suffice. That is, the Service
 Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
 to look for the shared object files or dlls.
@@ -612,7 +618,7 @@ The following describes how to configure the Logging Server:<P>
 
  <LI> <B>Examples </B><P>
 
-      Here is an example svc.conf entry that dynamically loads the
+      Here is an example NT svc.conf entry that dynamically loads the
       Logging Server specifying port number to listen on for client
       connections:<P> 
 
@@ -622,6 +628,17 @@ The following describes how to configure the Logging Server:<P>
         "-p 10202"
       </PRE></CODE>
       <P>
+
+      Here is an example UNIX svc.conf entry that dynamically loads the
+      Logging Server specifying port number to listen on for client
+      connections.  Notice that only the name of the library file
+      changed:<P>
+
+      <PRE> <CODE>
+      dynamic Server_Logging_Service Service_Object * 
+        ../lib/netsvcs:_make_ACE_Server_Logging_Acceptor() 
+        "-p 10202"
+      </PRE></CODE>
 </UL>
 Note:<P>
 <UL>
@@ -635,7 +652,7 @@ have been set). <P>
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the
+of specifying an absolute path to the shared object or dll, only the
 name of the shared object or dll would suffice. That is, the Service
 Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
 to look for the shared object files or dlls.
@@ -720,7 +737,7 @@ ACE_DEFAULT_RENDEZVOUS
 
  <LI> <B>Examples </B><P>
 
-      Here is an example svc.conf entry that dynamically loads the
+      Here is an example NT svc.conf entry that dynamically loads the
       Logging Client specifying host name and port number of the
       Logging Server: <P>
 
@@ -730,6 +747,17 @@ ACE_DEFAULT_RENDEZVOUS
         "-h tango.cs.wustl.edu -p 10202"
       </PRE></CODE>
       <P>
+
+      Here is an example UNIX svc.conf entry that dynamically loads the
+      Logging Client specifying host name and port number of the
+      Logging Server. Notice that only the name of the library file
+      changed:<P>
+
+      <PRE> <CODE>
+      dynamic Client_Logging_Service Service_Object * 
+        ../lib/netsvcs:_make_ACE_Client_Logging_Connector() 
+        "-h tango.cs.wustl.edu -p 10202"
+      </PRE></CODE>
 </UL>
 Note:<P>
 <UL>
@@ -743,7 +771,7 @@ have been set). <P>
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the
+of specifying an absolute path to the shared object or dll, only the
 name of the shared object or dll would suffice. That is, the Service
 Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
 to look for the shared object files or dlls.
@@ -855,7 +883,7 @@ have been set). <P>
 <LI> If the environment variable LD_LIBRARY_PATH (in the case of UNIX)
 or PATH (in the case of Win32) contains the path to the shared object
 files or dll, then the config file can be further simplified. Instead
-of specifying a path to the shared object or dll, only the
+of specifying an absolute path to the shared object or dll, only the
 name of the shared object or dll would suffice. That is, the Service
 Configurator makes use of LD_LIBRARY_PATH (on UNIX) or PATH (on Win32)
 to look for the shared object files or dlls.
diff --git a/netsvcs/Makefile b/netsvcs/Makefile
index 47f87672c9f..0cbdb67da2d 100644
--- a/netsvcs/Makefile
+++ b/netsvcs/Makefile
@@ -1,26 +1,27 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id: Makefile	1.1	10/18/96
 #
-#       Makefile for the ACE network services
+#	Makefile for the ACE network services
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 INFO  = README
 
 # lib must come first!
 DIRS  = lib \
-        clients \
+	clients \
 	servers
 
 #----------------------------------------------------------------------------
-#       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.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.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.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+
diff --git a/netsvcs/Makefile.am b/netsvcs/Makefile.am
deleted file mode 100644
index d631bb6b7bc..00000000000
--- a/netsvcs/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the ACE network services
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 
-
-SUBDIRS = lib \
-          clients \
-          servers
-
-EXTRA_DIST = ACE-netsvcs.html
-
diff --git a/netsvcs/clients/Logger/Makefile b/netsvcs/clients/Logger/Makefile
index 0b01959e8b6..bf42e57ccd0 100644
--- a/netsvcs/clients/Logger/Makefile
+++ b/netsvcs/clients/Logger/Makefile
@@ -1,47 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for client logging applications
+#	Makefile for client logging applications
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-LSRC    = $(addsuffix .cpp,$(BIN))
+BIN   	= direct_logging \
+          indirect_logging
 
-VLDLIBS = $(LDLIBS:%=%$(VAR))
+LSRC 	= $(addsuffix .cpp,$(BIN))
 
-BIN2    = direct_logging \
-          indirect_logging
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Other
+BUILD 	= $(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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
-
+ 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -53,6 +47,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -80,6 +77,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/indirect_logging.o .obj/indirect_logging.so .shobj/indirect_logging.o .shobj/indirect_logging.so: indirect_logging.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Logger/Makefile.am b/netsvcs/clients/Logger/Makefile.am
deleted file mode 100644
index f8099722c3e..00000000000
--- a/netsvcs/clients/Logger/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for client logging applications
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-## LDFLAGS = 
-## Libtool will automatically link against the "proper" library.
-## Do not change the "libACE.la."  It is not a typographical error!
-LDADD = $(top_builddir)/ace/libACE.la
-
-noinst_PROGRAMS = \
-         direct_logging \
-         indirect_logging
-
-
-direct_logging_SOURCES = direct_logging.cpp
-
-indirect_logging_SOURCES = indirect_logging.cpp
diff --git a/netsvcs/clients/Makefile b/netsvcs/clients/Makefile
index 00ad80fb15b..43f23ea97b8 100644
--- a/netsvcs/clients/Makefile
+++ b/netsvcs/clients/Makefile
@@ -1,19 +1,24 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id: Makefile	1.1	10/18/96
 #
-#       Makefile for the client programs that test the ACE network services
+#	Makefile for the client programs that test the ACE network services 
+#----------------------------------------------------------------------------
+
+#----------------------------------------------------------------------------
+#	Local macros
 #----------------------------------------------------------------------------
 
 DIRS  = Logger \
-        Naming \
-        Tokens
+	Naming \
+	Tokens
 
 #----------------------------------------------------------------------------
-#       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.nested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nolocal.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.nested.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.nolocal.GNU
+
diff --git a/netsvcs/clients/Makefile.am b/netsvcs/clients/Makefile.am
deleted file mode 100644
index dcce3830dc8..00000000000
--- a/netsvcs/clients/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the client programs that test the ACE network services
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-        Logger \
-        Naming \
-        Tokens
diff --git a/netsvcs/clients/Naming/Client/Client_Test.cpp b/netsvcs/clients/Naming/Client/Client_Test.cpp
index c7f14ea7afd..593ca2b55a4 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.cpp
+++ b/netsvcs/clients/Naming/Client/Client_Test.cpp
@@ -104,8 +104,7 @@ NAMING_CONTEXT (void)
 
 Client_Test::Client_Test (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Client_Test::Client_Test\n"));
+  ACE_DEBUG ((LM_DEBUG, "Client_Test::Client_Test\n"));
 }
 
 int
@@ -126,10 +125,7 @@ Client_Test::open (void)
   if (ACE_Event_Handler::register_stdin_handler (this,
 						 ACE_Reactor::instance (),
 						 ACE_Thread_Manager::instance ()) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "register_stdin_handler"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_stdin_handler"), -1);
   return 0;
 }
 
@@ -146,8 +142,7 @@ Client_Test::close (void)
 int
 Client_Test::fini (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Client_Test::fini\n"));
+  ACE_DEBUG ((LM_DEBUG, "Client_Test::fini\n"));
   return this->close ();
 }
 
@@ -163,10 +158,10 @@ Client_Test::handle_input (ACE_HANDLE)
   char input[1024];
 
   if (::scanf ("%s", option) <= 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Try again!\n",
-                       "Client_Test::handle_input"),
-                      0);
+    {
+      ACE_ERROR_RETURN ((LM_ERROR, "%p Try again!\n",
+                         "Client_Test::handle_input"), 0);
+    }
 
   int result = -1;
 
@@ -192,17 +187,13 @@ Client_Test::handle_input (ACE_HANDLE)
         {
           ACE_OS::strcpy (buf1, temp_buf);
 
-          temp_buf = ACE_OS::strtok (0, " ");
-
           // get the value
-          if (temp_buf)
+          if ((temp_buf = ACE_OS::strtok (0, " ")))
             {
               ACE_OS::strcpy (buf2, temp_buf);
 
-              temp_buf = ACE_OS::strtok (0, " ");
-
-              // get the type (if entered).
-              if (temp_buf)
+              // get the type (if entered)
+              if ((temp_buf = ACE_OS::strtok (0, " ")))
                 {
                   ACE_OS::strcpy (buf3, temp_buf);
                   result = this->bind (buf1, buf2, buf3);
@@ -211,12 +202,10 @@ Client_Test::handle_input (ACE_HANDLE)
                 result = this->bind (buf1, buf2);
             }
           else
-            ACE_ERROR ((LM_ERROR,
-                        "Bind Failed! Value not entered.\n"));
+            ACE_ERROR ((LM_ERROR, "Bind Failed! Value not entered.\n"));
         }
       else
-        ACE_ERROR ((LM_ERROR,
-                    "Bind Failed! Key and Value not entered.\n"));
+        ACE_ERROR ((LM_ERROR, "Bind Failed! Key and Value not entered.\n"));
       break;
     case 'u' :
       if (::scanf ("%s", buf1) <= 0)
@@ -227,22 +216,18 @@ Client_Test::handle_input (ACE_HANDLE)
       // get the input from stdin
       ACE_OS::fgets (input, sizeof input, stdin);
 
-      temp_buf = ACE_OS::strtok (input, " ");
       // get the key
-      if (temp_buf)
+      if ((temp_buf = ACE_OS::strtok (input, " ")))
         {
           ACE_OS::strcpy (buf1, temp_buf);
 
-          temp_buf = ACE_OS::strtok (0, " ");
-
           // get the value
-          if (temp_buf)
+          if ((temp_buf = ACE_OS::strtok (0, " ")))
             {
               ACE_OS::strcpy (buf2, temp_buf);
 
-              temp_buf = ACE_OS::strtok (0, " ");
               // get the type (if entered)
-              if (temp_buf)
+              if ((temp_buf = ACE_OS::strtok (0, " ")))
                 {
                   ACE_OS::strcpy (buf3, temp_buf);
                   result = this->rebind (buf1, buf2, buf3);
@@ -251,12 +236,10 @@ Client_Test::handle_input (ACE_HANDLE)
                 result = this->rebind (buf1, buf2);
             }
           else
-            ACE_ERROR ((LM_ERROR,
-                        "Rebind Failed! Value not entered.\n"));
+            ACE_ERROR ((LM_ERROR, "Rebind Failed! Value not entered.\n"));
         }
       else
-        ACE_ERROR ((LM_ERROR,
-                    "Reind Failed! Key and value not entered.\n"));
+        ACE_ERROR ((LM_ERROR, "Reind Failed! Key and value not entered.\n"));
       break;
     case 'f' :
       if (::scanf ("%s", buf1) <= 0)
@@ -303,8 +286,7 @@ Client_Test::handle_input (ACE_HANDLE)
       result = this->quit ();
       break;
     default :
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unrecognized command.\n"));
+      ACE_DEBUG ((LM_DEBUG, "Unrecognized command.\n"));
     }
 
   this->display_menu ();
@@ -338,30 +320,27 @@ Client_Test::display_menu (void)
 void
 Client_Test::list_options (void)
 {
+//  ACE_DEBUG ((LM_DEBUG, "  *** Process Name is %s ***\n",
+//            this->name_options_->process_name ()));
   switch (this->name_options_->context ())
     {
     case ACE_Naming_Context::PROC_LOCAL:
-      ACE_DEBUG ((LM_DEBUG,
-                  "  *** Using Process Local Database\n"));
+      ACE_DEBUG ((LM_DEBUG, "  *** Using Process Local Database\n"));
       break;
     case ACE_Naming_Context::NODE_LOCAL:
-      ACE_DEBUG ((LM_DEBUG,
-                  "  *** Using Node Local Database\n"));
+      ACE_DEBUG ((LM_DEBUG, "  *** Using Node Local Database\n"));
       break;
     case ACE_Naming_Context::NET_LOCAL:
-      ACE_DEBUG ((LM_DEBUG,
-                  "  *** Hostname: %s\n",
+      ACE_DEBUG ((LM_DEBUG, "  *** Hostname: %s\n",
                   this->name_options_->nameserver_host ()));
-      ACE_DEBUG ((LM_DEBUG,
-                  "  *** Port Number: %d\n",
+      ACE_DEBUG ((LM_DEBUG, "  *** Port Number: %d\n",
                   this->name_options_->nameserver_port ()));
       break;
     default:
       assert (!"shouldn't occur!\n");
       /* NOTREACHED */
     }
-  ACE_DEBUG ((LM_DEBUG,
-              "  *** Namespace directory is %s ***\n",
+  ACE_DEBUG ((LM_DEBUG, "  *** Namespace directory is %s ***\n",
               this->name_options_->namespace_dir ()));
 }
 
@@ -410,11 +389,8 @@ int
 Client_Test::bind (char* key, char* value, char* type)
 {
   if (NAMING_CONTEXT ()->bind (key, value, type) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Bind failed! Key %s exists\n",
-                       "Client_Test::bind",
-                       key),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Bind failed! Key %s exists\n",
+                       "Client_Test::bind", key), 0);
   return 0;
 }
 
@@ -422,11 +398,8 @@ int
 Client_Test::unbind (char* key)
 {
   if (NAMING_CONTEXT ()->unbind (key) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Unbind failed! Key %s not found\n",
-                       "Client_Test::unbind",
-                       key),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Unbind failed! Key %s not found\n",
+                       "Client_Test::unbind", key), 0);
   return 0;
 }
 
@@ -443,10 +416,8 @@ Client_Test::list_names (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_names (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_names"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_names"), 0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -454,9 +425,7 @@ Client_Test::list_names (char *pattern)
       for (ACE_WString *name = 0;
            set_iterator.next (name) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG,
-                    "%s\n",
-                    name->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG, "%s\n", name->char_rep ()));
     }
   return 0;
 }
@@ -467,10 +436,8 @@ Client_Test::list_values (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_values (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_values"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_values"), 0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -478,9 +445,7 @@ Client_Test::list_values (char *pattern)
       for (ACE_WString *value = 0;
            set_iterator.next (value) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG,
-                    "%s\n",
-                    value->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG, "%s\n", value->char_rep ()));
     }
   return 0;
 }
@@ -491,10 +456,8 @@ Client_Test::list_types (char *pattern)
   ACE_PWSTRING_SET set;
 
   if (NAMING_CONTEXT ()->list_types (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_types"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_types"), 0);
   else
     {
       ACE_PWSTRING_ITERATOR set_iterator (set);
@@ -502,9 +465,7 @@ Client_Test::list_types (char *pattern)
       for (ACE_WString *type = 0;
            set_iterator.next (type) !=0;
            set_iterator.advance())
-        ACE_DEBUG ((LM_DEBUG,
-                    "%s\n",
-                    type->char_rep ()));
+        ACE_DEBUG ((LM_DEBUG, "%s\n", type->char_rep ()));
     }
   return 0;
 }
@@ -515,10 +476,8 @@ Client_Test::list_name_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_name_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_names"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_names"), 0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -527,16 +486,10 @@ Client_Test::list_name_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
           if (entry->type_)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s\n",
-                        entry->type_));
+            ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
         }
     }
   return 0;
@@ -548,10 +501,8 @@ Client_Test::list_value_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_value_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_values"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_values"), 0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -559,16 +510,10 @@ Client_Test::list_value_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
           if (entry->type_)
-            ACE_DEBUG ((LM_DEBUG,
-                        "%s\n",
-                        entry->type_));
+            ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
         }
     }
   return 0;
@@ -580,10 +525,8 @@ Client_Test::list_type_entries (char *pattern)
   ACE_BINDING_SET set;
 
   if (NAMING_CONTEXT ()->list_type_entries (set, pattern) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Pattern matching failed!\n",
-                       "Client_Test::list_types"),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Pattern matching failed!\n",
+                       "Client_Test::list_types"), 0);
   else
     {
       ACE_BINDING_ITERATOR set_iterator (set);
@@ -592,20 +535,15 @@ Client_Test::list_type_entries (char *pattern)
            set_iterator.next (entry) !=0;
            set_iterator.advance())
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->name_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\t",
-                      entry->value_.char_rep ()));
-          ACE_DEBUG ((LM_DEBUG,
-                      "%s\n",
-                      entry->type_));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->name_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\t", entry->value_.char_rep ()));
+          ACE_DEBUG ((LM_DEBUG, "%s\n", entry->type_));
         }
     }
   return 0;
 }
 
+
 int
 Client_Test::find (char *key)
 {
@@ -613,24 +551,20 @@ Client_Test::find (char *key)
   char *type = 0;
 
   if (NAMING_CONTEXT ()->resolve (key, value, type) != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p Find failed! Key %s not found\n",
-                       "Client_Test::list_find",
-                       key),
-                      0);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p Find failed! Key %s not found\n",
+                       "Client_Test::list_find", key), 0);
   else
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Binding for %s : value = %s\ttype = %s\n",
-                  key,
-                  value,
-                  type));
+                  key, value, type));
       if (type)
         delete [] type;
       return 0;
     }
 }
 
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Dynamic_Service<ACE_Naming_Context>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
diff --git a/netsvcs/clients/Naming/Client/Client_Test.h b/netsvcs/clients/Naming/Client/Client_Test.h
index 36ac6a097ea..d0b3a1dba9d 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.h
+++ b/netsvcs/clients/Naming/Client/Client_Test.h
@@ -1,6 +1,7 @@
 /* -*- C++ -*- */
 // $Id$
 
+
 #include "ace/OS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/netsvcs/clients/Naming/Client/Makefile b/netsvcs/clients/Naming/Client/Makefile
index bde751437cd..48faeb33332 100644
--- a/netsvcs/clients/Naming/Client/Makefile
+++ b/netsvcs/clients/Naming/Client/Makefile
@@ -8,45 +8,38 @@
 #       Local macros
 #----------------------------------------------------------------------------
 
+BIN   	= main
+LIB   	= libClient_Test.a
+SHLIB   = libClient_Test.$(SOEXT)
+
 FILES   = Client_Test
 
-PSRC    = $(addsuffix .cpp,$(BIN))
+PSRC   	= $(addsuffix .cpp,$(BIN))
 OBJ     = $(SRC:%.cpp=$(VDIR)%.o)
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
 SHOBJ   = $(addsuffix .so,$(FILES))
 
 LIBS    += $(ACELIB)
 
-LDLIBS  = -lClient_Test
-
+LDLIBS 	= -lClient_Test
+ 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2    = main
-LIB2    = libClient_Test.a
-SHLIB2  = libClient_Test.$(SOEXT)
-
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-endif # Other
+BUILD   = $(VLIB) $(VSHLIB) $(SHLIBA) $(VBIN)
 
 #----------------------------------------------------------------------------
 #       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
 
 #----------------------------------------------------------------------------
 #       Local targets
@@ -55,8 +48,6 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 #----------------------------------------------------------------------------
 #       Dependencies
 #----------------------------------------------------------------------------
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -67,6 +58,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -168,6 +162,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Naming/Client/Makefile.am b/netsvcs/clients/Naming/Client/Makefile.am
deleted file mode 100644
index b4a397b58d8..00000000000
--- a/netsvcs/clients/Naming/Client/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the client programs that test the ACE network services
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LIBRARIES = libClient_Test.a
-
-libClient_Test_a_SOURCES = Client_Test.cpp Client_Test.h
-
-
-noinst_PROGRAMS = \
-         main
-
-main_SOURCES = main.cpp
-main_LDADD = $(top_builddir)/netsvcs/clients/Naming/Client/libClient_Test.a \
-             $(top_builddir)/ace/libACE.la
-
-noinst_DATA = svc.conf svc2.conf
-
-EXTRA_DIST = $(noinst_DATA)
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/netsvcs/clients/Naming/Client/main.cpp b/netsvcs/clients/Naming/Client/main.cpp
index 7dedde59b5f..67cd68c24f2 100644
--- a/netsvcs/clients/Naming/Client/main.cpp
+++ b/netsvcs/clients/Naming/Client/main.cpp
@@ -8,7 +8,7 @@
 
 ACE_RCSID(Client, main, "$Id$")
 
-int
+int 
 main (int argc, char *argv[])
 {
   ACE_Service_Config daemon;
@@ -16,10 +16,7 @@ main (int argc, char *argv[])
   if (daemon.open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR ((LM_ERROR,
-                    "%p\n%a",
-                    "open",
-                    1));
+	ACE_ERROR ((LM_ERROR, "%p\n%a", "open", 1));
       else // Use static binding.
 	{
 	  char *l_argv[3];
@@ -29,18 +26,12 @@ main (int argc, char *argv[])
 	  ACE_Service_Object *so = ACE_SVC_INVOKE (ACE_Naming_Context);
 
 	  if (so->init (2, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
-                        "%p\n%a",
-                        "ACE_Naming_Context",
-                        1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "ACE_Naming_Context", 1));
 
 	  so = ACE_SVC_INVOKE (Client_Test);
 
 	  if (so->init (0, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
-                        "%p\n%a",
-                        "Client_Test",
-                        1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Client_Test", 1));
 	}
     }
 
diff --git a/netsvcs/clients/Naming/Client/svc.conf b/netsvcs/clients/Naming/Client/svc.conf
index 12a12ccc390..4e789d4eaf0 100644
--- a/netsvcs/clients/Naming/Client/svc.conf
+++ b/netsvcs/clients/Naming/Client/svc.conf
@@ -1,7 +1,6 @@
 # Note that $DB and $PORT are environment variables that are
 # automatically interpreted and substituted by ACE!
-# static ACE_Naming_Context "main -p $PORT -h tango"
-dynamic ACE_Naming_Context Service_Object * ACE:_make_ACE_Naming_Context () "main -p $PORT -h tango"
-dynamic Name_Server_test Service_Object * Client_Test:_make_Client_Test ()
+static ACE_Naming_Context "main -p $PORT -h tango"
+dynamic Name_Server_test Service_Object * ./Client_Test:_make_Client_Test ()
 # Note: Client_Test must come after ACE_Naming_Context since it relies
 # on the ACE_Naming_Context having been linked...
diff --git a/netsvcs/clients/Naming/Client/svc2.conf b/netsvcs/clients/Naming/Client/svc2.conf
index 44a276a4a44..41075e1bf29 100644
--- a/netsvcs/clients/Naming/Client/svc2.conf
+++ b/netsvcs/clients/Naming/Client/svc2.conf
@@ -1,9 +1,9 @@
-# Note that $DB and $PORT are environment variables that are
-# automatically interpreted and substituted by ACE!  In addition, note
+# Note that $DB and $PORT are environment variables that are 
+# automatically interpreted and substituted by ACE!  In addition, note 
 # how you can give a relative name for the libACE_svcs.so and ACE will
 # locate this for you automatically by reading your LD search path!
-dynamic ACE_Naming_Context Service_Object * ACE:_make_ACE_Naming_Context () "main -s $DB"
-dynamic ACE_Naming_Context2 Service_Object * ACE:_make_ACE_Naming_Context () "main -s $DB"
-dynamic Name_Server_test Service_Object * Client_Test:_make_Client_Test ()
+dynamic ACE_Naming_Context Service_Object * libACE.so:_make_ACE_Naming_Context () "main -s $DB"
+dynamic ACE_Naming_Context2 Service_Object * libACE.so:_make_ACE_Naming_Context () "main -s $DB"
+dynamic Name_Server_test Service_Object * .shobj/Client_Test.so:_make_Client_Test ()
 # Note: Client_Test must come after ACE_Naming_Context since it relies
 # on the ACE_Naming_Context having been dynamically linked.
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile b/netsvcs/clients/Naming/Dump_Restore/Makefile
index 721cc72dc54..c168b892a6f 100644
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile
+++ b/netsvcs/clients/Naming/Dump_Restore/Makefile
@@ -1,62 +1,53 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for the ACE Dump-Restore Name_Server utility
+#	Makefile for the ACE Dump-Restore Name_Server utility
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = Dump_Restore
+BIN   	= main 
+LIB   	= libDump_Restore.a
+SHLIB 	= libDump_Restore.$(SOEXT)
 
-PSRC    = $(addsuffix .cpp,$(BIN))
-OBJ     = $(SRC:%.cpp=$(VDIR)%.o)
+FILES	= Dump_Restore
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+PSRC   	= $(addsuffix .cpp,$(BIN))
+OBJ   	= $(SRC:%.cpp=$(VDIR)%.o)
 
-LIBS    += $(ACELIB)
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-LDLIBS  = -lDump_Restore
+LIBS    += $(ACELIB)
 
+LDLIBS 	= -lDump_Restore
+ 
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-BIN2    = main
-LIB2    = libDump_Restore.a
-SHLIB2  = libDump_Restore.$(SOEXT)
-
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-  LIB = $(LIB2)
-  SHLIB = $(SHLIB2)
-endif # Other
+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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -67,6 +58,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -164,6 +158,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Naming/Dump_Restore/Makefile.am b/netsvcs/clients/Naming/Dump_Restore/Makefile.am
deleted file mode 100644
index 85703366ece..00000000000
--- a/netsvcs/clients/Naming/Dump_Restore/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the ACE Dump-Restore Name_Server utility
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_LIBRARIES = \
-         libDump_Restore.a
-
-libDump_Restore_a_SOURCES = Dump_Restore.cpp Dump_Restore.h
-
-
-noinst_PROGRAMS = \
-         main
-
-main_SOURCES = main.cpp
-main_LDADD = \
-      $(top_builddir)/netsvcs/clients/Naming/Dump_Restore/libDump_Restore.a \
-      $(top_builddir)/ace/libACE.la
-
-## ACE currently doesn't build this so we don't build it with automake either.
-EXTRA_DIST = createfile.cpp
-
diff --git a/netsvcs/clients/Naming/Dump_Restore/README b/netsvcs/clients/Naming/Dump_Restore/README
index 25b1243d03f..3bb13935d87 100644
--- a/netsvcs/clients/Naming/Dump_Restore/README
+++ b/netsvcs/clients/Naming/Dump_Restore/README
@@ -1,8 +1,9 @@
 This file describes the usage of the Dump-Restore utility for the ACE
 Name Server.
 
-Similar to the test application provided in the ../Client/ directory,
-a simple ASCII menu-driven interface is provided to the user:
+Similar to the test application provided in the Client-Server
+directory, a simple ASCII menu-driven interface is provided to the
+user:
 
          Name Service Main Menu
          ----------------------
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/clients/Naming/Makefile.am b/netsvcs/clients/Naming/Makefile.am
deleted file mode 100644
index 09924790da5..00000000000
--- a/netsvcs/clients/Naming/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the Name Server test applications
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 
-
-SUBDIRS = \
-         Client \
-         Dump_Restore
-
diff --git a/netsvcs/clients/Naming/Client/README b/netsvcs/clients/Naming/README
index 68e69b6b3bf..7e461560cb6 100644
--- a/netsvcs/clients/Naming/Client/README
+++ b/netsvcs/clients/Naming/README
@@ -1,7 +1,9 @@
-This directory contains a test for the ACE_Name_Server library.  This
-test program also illustrates how to use the ACE Service_Config
-mechanism, which enables the client code to be dynamically linked into
-the process at installation-time or run-time.
+This directory contains a set of tests for the ACE_Name_Server
+library.  There are two directories -- client and server, which test
+the client and server, respectively.  In addition, these tests
+illustrate how to use the ACE Service_Config mechanism, which enables
+the client and server code to be dynamically linked into the process
+at installation-time or run-time!
 
 The client test is an application that allows the user to vary the
 test parameters through the following menu driven interface:
@@ -70,9 +72,10 @@ types. Note that pattern matching is supported using regular expressions.
 -------------------------
 Running the tests:
 
-The test program uses a DLL supported by the svc.conf file, which
-allows them to configure the client-side dynamically.  The client test
-program accomplishes this by making use of a Singleton proxy object
+Both the client and the server test programs use DLL supported by
+svc.conf which allows them to configure the client-side and the
+server-side (respectively) dynamically. The client test program
+accomplishes this by making use of a Singleton proxy object
 (Name_Service) to provide an interface to the client-side.
 
 The test programs rely on svc.conf to provide the necessary parameters
@@ -116,8 +119,6 @@ database needs to be accessed.  The server test needs to run on the
 machine that contains the net local database.  To execute the server
 test, the user has to specify the port number at which the server will
 be listening in the svc.conf file.  An implementation of a name
-service for ACE is available in the $ACE_ROOT/netsvcs/{lib,servers}
-directories.  Please see the README files there for an explanation of
-how to run the server.
-
-
+service for ACE is available in the $ACE_ROOT/netsvcs/bin
+directory.  Please see the README file there for an explanation of how
+to run the server.
diff --git a/netsvcs/clients/Tokens/Makefile.am b/netsvcs/clients/Tokens/Makefile.am
deleted file mode 100644
index 0dc39ce47bd..00000000000
--- a/netsvcs/clients/Tokens/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the Token tests
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-SUBDIRS = \
-         collection  \
-         deadlock  \
-         invariant  \
-         manual  \
-         mutex  \
-         rw_lock
-
diff --git a/netsvcs/clients/Tokens/collection/Makefile b/netsvcs/clients/Tokens/collection/Makefile
index 214c6347ae2..900399eeb86 100644
--- a/netsvcs/clients/Tokens/collection/Makefile
+++ b/netsvcs/clients/Tokens/collection/Makefile
@@ -1,46 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = collection
+BIN   	= collection
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+FILES 	= collection
 
-BIN2    = collection
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
@@ -50,6 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/collection.o .obj/collection.so .shobj/collection.o .shobj/collection.so: collection.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Tokens/collection/Makefile.am b/netsvcs/clients/Tokens/collection/Makefile.am
deleted file mode 100644
index 99f4fba0ba7..00000000000
--- a/netsvcs/clients/Tokens/collection/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         collection
-
-collection_SOURCES = collection.cpp
-collection_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                   $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile b/netsvcs/clients/Tokens/deadlock/Makefile
index 680e9aa918b..83c980eddfb 100644
--- a/netsvcs/clients/Tokens/deadlock/Makefile
+++ b/netsvcs/clients/Tokens/deadlock/Makefile
@@ -1,46 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = deadlock_detection_test
+BIN   	= deadlock_detection_test
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+FILES 	= deadlock_detection_test
 
-BIN2    = deadlock_detection_test
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
@@ -50,6 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/deadlock_detection_test.o .obj/deadlock_detection_test.so .shobj/deadlock_detection_test.o .shobj/deadlock_detection_test.so: deadlock_detection_test.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Tokens/deadlock/Makefile.am b/netsvcs/clients/Tokens/deadlock/Makefile.am
deleted file mode 100644
index 0b50b13195d..00000000000
--- a/netsvcs/clients/Tokens/deadlock/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         deadlock_detection_test
-
-deadlock_detection_test_SOURCES = deadlock_detection_test.cpp
-deadlock_detection_test_LDADD = \
-                   $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                   $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/clients/Tokens/invariant/Makefile b/netsvcs/clients/Tokens/invariant/Makefile
index 48085803036..1cd034671fb 100644
--- a/netsvcs/clients/Tokens/invariant/Makefile
+++ b/netsvcs/clients/Tokens/invariant/Makefile
@@ -1,46 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = invariant
+BIN   	= invariant
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+FILES 	= invariant
 
-BIN2    = invariant
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
@@ -50,6 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/invariant.o .obj/invariant.so .shobj/invariant.o .shobj/invariant.so: invariant.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Tokens/invariant/Makefile.am b/netsvcs/clients/Tokens/invariant/Makefile.am
deleted file mode 100644
index 7e137109fa2..00000000000
--- a/netsvcs/clients/Tokens/invariant/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         invariant
-
-invariant_SOURCES = invariant.cpp
-invariant_LDADD = \
-                 $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                 $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/clients/Tokens/manual/Makefile b/netsvcs/clients/Tokens/manual/Makefile
index ad7c54f1ac4..480195f332d 100644
--- a/netsvcs/clients/Tokens/manual/Makefile
+++ b/netsvcs/clients/Tokens/manual/Makefile
@@ -1,41 +1,36 @@
 #----------------------------------------------------------------------------
-#	$Id$
+#	$Id: Makefile	1.1	10/18/96
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = manual
+BIN   	= manual
 
-BIN2    = manual
+FILES 	= manual
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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.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.bin.GNU
+include		$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/netsvcs/clients/Tokens/manual/Makefile.am b/netsvcs/clients/Tokens/manual/Makefile.am
deleted file mode 100644
index 7f2b227464e..00000000000
--- a/netsvcs/clients/Tokens/manual/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         manual
-
-manual_SOURCES = manual.cpp
-manual_LDADD = \
-              $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-              $(top_builddir)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
diff --git a/netsvcs/clients/Tokens/mutex/Makefile b/netsvcs/clients/Tokens/mutex/Makefile
index 28473118278..87386343cf0 100644
--- a/netsvcs/clients/Tokens/mutex/Makefile
+++ b/netsvcs/clients/Tokens/mutex/Makefile
@@ -1,46 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = test_mutex
+BIN   	= test_mutex
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+FILES 	= test_mutex
 
-BIN2    = test_mutex
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
@@ -50,6 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/test_mutex.o .obj/test_mutex.so .shobj/test_mutex.o .shobj/test_mutex.so: test_mutex.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Tokens/mutex/Makefile.am b/netsvcs/clients/Tokens/mutex/Makefile.am
deleted file mode 100644
index a62805fafb4..00000000000
--- a/netsvcs/clients/Tokens/mutex/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         test_mutex
-
-test_mutex_SOURCES = test_mutex.cpp
-test_mutex_LDADD = \
-                 $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                 $(top_builddir)/ace/libACE.la
-
-
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile b/netsvcs/clients/Tokens/rw_lock/Makefile
index 3859d16f9ed..fc58afbd9af 100644
--- a/netsvcs/clients/Tokens/rw_lock/Makefile
+++ b/netsvcs/clients/Tokens/rw_lock/Makefile
@@ -1,46 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for repeating token client application
+#	Makefile for repeating token client application
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-FILES   = rw_locks
+BIN   	= rw_locks
 
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(LSRC:%.cpp=$(VDIR)%.o)
-SHOBJ   = $(addsuffix .so,$(FILES))
+FILES 	= rw_locks
 
-BIN2    = rw_locks
+LSRC   	= $(addsuffix .cpp,$(FILES))
+LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
+SHOBJ	= $(addsuffix .so,$(FILES))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN = $(BIN2)
-endif # Token
+BUILD 	= $(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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
@@ -50,6 +45,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
 .obj/rw_locks.o .obj/rw_locks.so .shobj/rw_locks.o .shobj/rw_locks.so: rw_locks.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/clients/Tokens/rw_lock/Makefile.am b/netsvcs/clients/Tokens/rw_lock/Makefile.am
deleted file mode 100644
index f95e991bb24..00000000000
--- a/netsvcs/clients/Tokens/rw_lock/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for repeating token client application
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-noinst_PROGRAMS = \
-         rw_locks
-
-rw_locks_SOURCES = rw_locks.cpp
-rw_locks_LDADD = \
-                $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-                $(top_builddir)/ace/libACE.la
-
diff --git a/netsvcs/lib/Client_Logging_Handler.cpp b/netsvcs/lib/Client_Logging_Handler.cpp
index 5cc31341df3..2376619aaf2 100644
--- a/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/netsvcs/lib/Client_Logging_Handler.cpp
@@ -17,10 +17,8 @@ ACE_Client_Logging_Handler::ACE_Client_Logging_Handler (ACE_HANDLE output_handle
   // Register ourselves to receive SIGPIPE so we can attempt
   // reconnections.
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-  if (ACE_Reactor::instance ()->register_handler (SIGPIPE,
-                                                  this) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "%n: %p\n",
+  if (ACE_Reactor::instance ()->register_handler (SIGPIPE, this) == -1)
+    ACE_ERROR ((LM_ERROR, "%n: %p\n",
 		"register_handler (SIGPIPE)"));
 #endif /* !ACE_LACKS_UNIX_SIGNALS */
 }
@@ -28,9 +26,7 @@ ACE_Client_Logging_Handler::ACE_Client_Logging_Handler (ACE_HANDLE output_handle
 // This is called when a <send> to the logging server fails...
 
 int
-ACE_Client_Logging_Handler::handle_signal (int, 
-                                           siginfo_t *,
-                                           ucontext_t *)
+ACE_Client_Logging_Handler::handle_signal (int, siginfo_t *, ucontext_t *)
 {
   return -1;
 }
@@ -51,16 +47,12 @@ ACE_Client_Logging_Handler::open (void *)
        this,
        ACE_Event_Handler::READ_MASK
        | ACE_Event_Handler::EXCEPT_MASK) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%n: %p\n",
-		       "register_handler)"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n",
+		       "register_handler)"), -1);
+
   // Figure out what remote port we're really bound to.
   if (this->peer ().get_remote_addr (server_addr) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "get_remote_addr"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
 
   ACE_DEBUG ((LM_DEBUG,
 	      "connected to client on handle %u\n",
@@ -72,10 +64,8 @@ ACE_Client_Logging_Handler::open (void *)
 ACE_Client_Logging_Handler::get_handle (void) const
 {
   ACE_TRACE ("ACE_Client_Logging_Handler::get_handle");
-
   ACE_ERROR ((LM_ERROR,
 	      "get_handle() shouldn't be called\n"));
-
   return ACE_INVALID_HANDLE;
 }
 
@@ -84,15 +74,12 @@ ACE_Client_Logging_Handler::get_handle (void) const
 int
 ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "in handle_input, handle = %u\n",
-              handle));
+  ACE_DEBUG ((LM_DEBUG, "in handle_input, handle = %u\n", handle));
 
   if (handle == this->logging_output_)
     // We're getting a message from the logging server!
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "received data from server!\n"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "received data from server!\n"), -1);
+
   ACE_Log_Record log_record;
 #if defined (ACE_HAS_STREAM_PIPES)
   // We're getting a logging message from a local application.
@@ -105,9 +92,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
   spipe.set_handle (handle);
   int flags = 0;
 
-  int result = spipe.recv ((ACE_Str_Buf *) 0,
-                           &msg,
-                           &flags);
+  int result = spipe.recv ((ACE_Str_Buf *) 0, &msg, &flags);
 
   // We've got a framed IPC mechanism, so we can just to a recv().
   if (result < 0 || msg.len == 0)
@@ -117,13 +102,10 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 	   ACE_Event_Handler::READ_MASK
 	   | ACE_Event_Handler::EXCEPT_MASK
 	   | ACE_Event_Handler::DONT_CALL) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%n: %p\n",
-			   "remove_handler"),
-                          -1);
+	ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n",
+			   "remove_handler"), -1);
       spipe.close ();
-      ACE_DEBUG ((LM_DEBUG,
-                  "client closing down\n"));
+      ACE_DEBUG ((LM_DEBUG, "client closing down\n"));
       return 0;
     }
 #else
@@ -149,13 +131,10 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
 	   ACE_Event_Handler::READ_MASK
 	   | ACE_Event_Handler::EXCEPT_MASK
 	   | ACE_Event_Handler::DONT_CALL) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%n: %p\n",
-			   "remove_handler"), 
-                          0);
+	ACE_ERROR_RETURN ((LM_ERROR, "%n: %p\n",
+			   "remove_handler"), 0);
       ACE_OS::closesocket (handle);
-      ACE_DEBUG ((LM_DEBUG,
-                  "client closing down\n"));
+      ACE_DEBUG ((LM_DEBUG, "client closing down\n"));
       return 0;
       /* NOTREACHED */
 
@@ -164,10 +143,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle)
       if (ACE_OS::recv (handle,
 			(char *) &log_record,
 			(int) length) != length)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "recv"),
-                          0);
+	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "recv"), 0);
     }
 #endif /* ACE_HAS_STREAM_PIPES */
 
@@ -193,10 +169,9 @@ ACE_Client_Logging_Handler::handle_exception (ACE_HANDLE handle)
 int
 ACE_Client_Logging_Handler::close (u_long)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "shutting down!!!\n"));
+  ACE_DEBUG ((LM_DEBUG, "shutting down!!!\n"));
 
-  if (this->logging_output_ != ACE_STDERR)
+  if (this->logging_output_ != ACE_STDOUT)
     ACE_OS::closesocket (this->logging_output_);
 
   this->destroy ();
@@ -215,8 +190,12 @@ ACE_Client_Logging_Handler::handle_output (ACE_HANDLE)
 int
 ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
 {
-  if (this->logging_output_ == ACE_STDERR)
-    log_record.print ("<localhost>", 0, stderr);
+  if (this->logging_output_ == ACE_STDOUT)
+    {
+      log_record.print ("<localhost>", 0, stderr);
+      ostream *orig_ostream = ACE_Log_Msg::instance ()->msg_ostream ();
+      log_record.print ("<localhost>", 0, (*orig_ostream) );
+    }
   else
     {
       long len = log_record.length ();
@@ -225,24 +204,17 @@ ACE_Client_Logging_Handler::send (ACE_Log_Record &log_record)
       if (ACE::send (this->logging_output_,
 		     (char *) &log_record,
 		     len) == -1)
-	// Switch over to logging to stderr for now.  Eventually,
+	// Switch over to logging to stdout for now.  Eventually,
 	// we'll try to queue up the message, try to reestablish a
 	// connection, and then send the queued data once we've
 	// reconnect to the logging server.
-	this->logging_output_ = ACE_STDERR;
+	this->logging_output_ = ACE_STDOUT;
     }
 
-  ostream *orig_ostream = ACE_Log_Msg::instance ()->msg_ostream ();
-
-  if (orig_ostream)
-    log_record.print ("<localhost>",
-                      0,
-                      *orig_ostream);
   return 0;
 }
 
 class ACE_Client_Logging_Acceptor : public ACE_Acceptor<ACE_Client_Logging_Handler, LOGGING_ACCEPTOR>
-{
   // = TITLE
   //     This factory creates connections with the
   //     <Server_Logging_Acceptor>.
@@ -250,6 +222,7 @@ class ACE_Client_Logging_Acceptor : public ACE_Acceptor<ACE_Client_Logging_Handl
   // = DESCRIPTION
   //     This class contains the service-specific methods that can't
   //     easily be factored into the <ACE_Acceptor>.
+{
 public:
   // = Initialization method.
   ACE_Client_Logging_Acceptor (void);
@@ -302,11 +275,6 @@ ACE_Client_Logging_Acceptor::fini (void)
 
   if (this->handler_ != 0)
     this->handler_->close (0);
-
-  // Try to unlink the logger key so weird things don't happen if
-  // we're using STREAM pipes.
-  ACE_OS::unlink (this->logger_key_);
-
   return 0;
 }
 
@@ -352,30 +320,21 @@ ACE_Client_Logging_Acceptor::init (int argc, char *argv[])
   // options.
   this->parse_args (argc, argv);
 
-  // Try to unlink the logger key so weird things don't happen if
-  // we're using STREAM pipes.
-  ACE_OS::unlink (this->logger_key_);
-
   // Initialize the acceptor endpoint.
   if (this->open (LOGGING_ADDR (this->logger_key_)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       this->logger_key_),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", this->logger_key_), -1);
 
   // Establish connection with the server.
   ACE_SOCK_Connector con;
   ACE_SOCK_Stream stream;
 
-  if (con.connect (stream,
-                   this->server_addr_) == -1)
+  if (con.connect (stream, this->server_addr_) == -1)
     {
-      ACE_ERROR ((LM_ERROR,
-                  "%p, using stderr\n",
+      ACE_ERROR ((LM_ERROR, "%p, using stdout\n",
 		  "can't connect to logging server"));
       // If we can't connect to the server then we'll send the logging
-      // messages to stderr.
-      stream.set_handle (ACE_STDERR);
+      // messages to stdout.
+      stream.set_handle (ACE_STDOUT);
     }
   else
     {
@@ -383,10 +342,8 @@ ACE_Client_Logging_Acceptor::init (int argc, char *argv[])
 
       // Figure out what remote port we're really bound to.
       if (stream.get_remote_addr (server_addr) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "get_remote_addr"),
-                          -1);
+	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "get_remote_addr"), -1);
+
       ACE_DEBUG ((LM_DEBUG,
 		  "starting up Client Logging Daemon, "
 		  "connected to port %d on handle %u\n",
@@ -428,10 +385,8 @@ ACE_Client_Logging_Acceptor::parse_args (int argc, char *argv[])
 
   if (this->server_addr_.set (this->server_port_,
 			      this->server_host_) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "set"),
-                      -1);
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set"), -1);
+
   return 0;
 }
 
diff --git a/netsvcs/lib/Client_Logging_Handler.h b/netsvcs/lib/Client_Logging_Handler.h
index 5cf6b2573c3..efe2ef0ed33 100644
--- a/netsvcs/lib/Client_Logging_Handler.h
+++ b/netsvcs/lib/Client_Logging_Handler.h
@@ -53,7 +53,7 @@ class ACE_Svc_Export ACE_Client_Logging_Handler : public ACE_Svc_Handler<LOGGING
 public:
   // = Initialization and termination.
 
-  ACE_Client_Logging_Handler (ACE_HANDLE handle = ACE_STDERR);
+  ACE_Client_Logging_Handler (ACE_HANDLE handle = ACE_STDOUT);
   // Default constructor.  <handle> is where the output is sent.
 
   virtual int open (void * = 0);
@@ -89,7 +89,7 @@ private:
 
   ACE_HANDLE logging_output_;
   // This is either a SOCKET (if we're connected to a logging server)
-  // or ACE_STDERR.
+  // or ACE_STDOUT.
 };
 
 ACE_SVC_FACTORY_DECLARE (ACE_Client_Logging_Acceptor)
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 e9e6cf4812e..e6e5c9ab3a5 100644
--- a/netsvcs/lib/Log_Message_Receiver.cpp
+++ b/netsvcs/lib/Log_Message_Receiver.cpp
@@ -16,7 +16,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (char const *hostname,
 {
 #if defined (ACE_HAS_THREADS)
     static ACE_SYNCH_MUTEX_T lock_;
-    ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_);
+    ACE_Guard<ACE_SYNCH_MUTEX_T> guard (lock_);
 #endif /* ACE_HAS_THREADS */
 
   record.print (hostname, 0, stderr);
@@ -31,7 +31,7 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_output (char const *hostname,
     {
 #if defined (ACE_HAS_THREADS)
       static ACE_SYNCH_MUTEX_T lock_;
-      ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_);
+      ACE_Guard<ACE_SYNCH_MUTEX_T> guard (lock_);
 #endif /* ACE_HAS_THREADS */
       record.print (hostname, 0, *outputfile);
     }
@@ -97,7 +97,7 @@ template<ACE_SYNCH_DECL> void
 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_));
+  ACE_MT (Guard guard (print_lock_));
   record.print (hostname, 0, stderr);
 }
 
@@ -108,7 +108,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_));
+      ACE_MT (Guard guard (print_lock_));
       record.print (hostname, 0, *outputfile);
     }
 }
diff --git a/netsvcs/lib/Makefile b/netsvcs/lib/Makefile
index d1f213e99b4..ae6de25ae3c 100644
--- a/netsvcs/lib/Makefile
+++ b/netsvcs/lib/Makefile
@@ -57,6 +57,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -148,15 +151,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -205,6 +203,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -299,15 +300,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -356,6 +352,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -446,15 +445,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -511,6 +505,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Containers.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -606,15 +603,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -663,6 +655,9 @@ endif # SUPPRESS_DASH_G
 .obj/Server_Logging_Handler_T.o .obj/Server_Logging_Handler_T.so .shobj/Server_Logging_Handler_T.o .shobj/Server_Logging_Handler_T.so: Server_Logging_Handler_T.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -777,15 +772,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -819,6 +809,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -851,6 +844,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -962,15 +958,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1006,6 +997,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1097,15 +1091,10 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1162,6 +1151,9 @@ endif # SUPPRESS_DASH_G
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -1186,6 +1178,9 @@ endif # SUPPRESS_DASH_G
 .obj/Base_Optimizer.o .obj/Base_Optimizer.so .shobj/Base_Optimizer.o .shobj/Base_Optimizer.so: Base_Optimizer.cpp Base_Optimizer.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/netsvcs/lib/Makefile.am b/netsvcs/lib/Makefile.am
deleted file mode 100644
index 7e52a99fdfe..00000000000
--- a/netsvcs/lib/Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-##---------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile for the server-side ACE network services
-##
-##---------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4 
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-lib_LTLIBRARIES = libnetsvcs.la
-
-libnetsvcs_la_SOURCES = \
-         Base_Optimizer.cpp  \
-         Client_Logging_Handler.cpp  \
-         Log_Message_Receiver.cpp  \
-         Logging_Strategy.cpp  \
-         Name_Handler.cpp  \
-         Server_Logging_Handler.cpp  \
-         Server_Logging_Handler_T.cpp  \
-         TS_Clerk_Handler.cpp  \
-         TS_Server_Handler.cpp  \
-         Token_Handler.cpp
-
-libnetsvcs_la_LDFLAGS = \
-         -version-info @ACE_CURRENT@:@ACE_REVISION@:@ACE_AGE@
-
-noinst_HEADERS = \
-         Base_Optimizer.h  \
-         Client_Logging_Handler.h  \
-         Log_Message_Receiver.h  \
-         Logging_Strategy.h  \
-         Name_Handler.h  \
-         Server_Logging_Handler.h  \
-         Server_Logging_Handler_T.h  \
-         TS_Clerk_Handler.h  \
-         TS_Server_Handler.h  \
-         Token_Handler.h
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
-
-## What do we about the below?  It was in the original libnetsvcs Makefile.
-##  ifeq ($(SUPPRESS_DASH_G),1)
-##  #### Build this target without -g on some platforms.
-##  $(VDIR)Server_Logging_Handler.o $(VSHDIR)Server_Logging_Handler.$(SOEXT):
-##          $(COMPILE-NO_DASH_G.cc) -o $@ $<
-##  endif # SUPPRESS_DASH_G
-
diff --git a/netsvcs/lib/Name_Handler.cpp b/netsvcs/lib/Name_Handler.cpp
index 14bdf13a173..80a1eecc65b 100644
--- a/netsvcs/lib/Name_Handler.cpp
+++ b/netsvcs/lib/Name_Handler.cpp
@@ -5,7 +5,6 @@
 #include "ace/Containers.h"
 #include "ace/Get_Opt.h"
 #include "ace/Singleton.h"
-#include "ace/Auto_Ptr.h"
 #include "Name_Handler.h"
 
 ACE_RCSID(lib, Name_Handler, "$Id$")
@@ -401,10 +400,9 @@ ACE_Name_Handler::resolve (void)
       ACE_Name_Request nrq (ACE_Name_Request::RESOLVE,
                             0,
                             0,
-                            avalue.fast_rep (),
+                            avalue.rep (),
                             avalue.length () * sizeof (ACE_USHORT16),
                             atype, ACE_OS::strlen (atype));
-      delete[] atype;
       return this->send_request (nrq);
     }
 
@@ -432,7 +430,7 @@ ACE_Name_Handler::name_request (ACE_WString *one_name)
 {
   ACE_TRACE ("ACE_Name_Handler::name_request");
   return ACE_Name_Request (ACE_Name_Request::LIST_NAMES,
-                           one_name->fast_rep (),
+                           one_name->rep (),
                            one_name->length () * sizeof (ACE_USHORT16),
                            0, 0,
                            0, 0);
@@ -444,7 +442,7 @@ ACE_Name_Handler::value_request (ACE_WString *one_value)
   ACE_TRACE ("ACE_Name_Handler::value_request");
   return ACE_Name_Request (ACE_Name_Request::LIST_VALUES,
                            0, 0,
-                           one_value->fast_rep (),
+                           one_value->rep (),
                            one_value->length () * sizeof (ACE_USHORT16),
                            0, 0);
 }
@@ -456,7 +454,7 @@ ACE_Name_Handler::type_request (ACE_WString *one_type)
   return ACE_Name_Request (ACE_Name_Request::LIST_TYPES,
                            0, 0,
                            0, 0,
-                           ACE_Auto_Basic_Array_Ptr<char> (one_type->char_rep ()).get (),
+                           one_type->char_rep (),
                            one_type->length ());
 }
 
@@ -562,9 +560,9 @@ ACE_Name_Handler::lists_entries (void)
            set_iterator.advance())
         {
           ACE_Name_Request mynrq (this->name_request_.msg_type (),
-                                  one_entry->name_.fast_rep (),
+                                  one_entry->name_.rep (),
                                   one_entry->name_.length () * sizeof (ACE_USHORT16),
-                                  one_entry->value_.fast_rep (),
+                                  one_entry->value_.rep (),
                                   one_entry->value_.length () * sizeof (ACE_USHORT16),
                                   one_entry->type_,
                                   ACE_OS::strlen (one_entry->type_));
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/lib/Server_Logging_Handler_T.cpp b/netsvcs/lib/Server_Logging_Handler_T.cpp
index ab22c4c7094..cec1338b050 100644
--- a/netsvcs/lib/Server_Logging_Handler_T.cpp
+++ b/netsvcs/lib/Server_Logging_Handler_T.cpp
@@ -90,8 +90,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
       {
         ACE_Log_Record lp;
 
-        // Use ACE_NTOHL to get around bug in egcs 2.91.6x.
-        length = ACE_NTOHL (length);
+        length = ntohl (length);
 
 #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES)
         u_long count = ++this->request_count_;
@@ -112,6 +111,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
                              "server logger",
                              this->host_name ()),
                             -1);
+        /* NOTREACHED */
 
         lp.decode ();
 
@@ -135,7 +135,8 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha
       }
     }
 
-  ACE_NOTREACHED (return -1;)
+  /* NOTREACHED */
+  return -1;
 }
 
 // Hook called by Server_Logging_Acceptor when connection is
diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile
index ad3c0c9e143..e94a35325f1 100644
--- a/netsvcs/servers/Makefile
+++ b/netsvcs/servers/Makefile
@@ -1,47 +1,41 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile
+#	Makefile 
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-LDLIBS  = -lnetsvcs
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-LSRC = $(addsuffix .cpp,$(BIN))
+BIN   	= main 
+LSRC   	= $(addsuffix .cpp,$(BIN))
 
-BIN2 = main
+LDLIBS 	= -lnetsvcs
+ 
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-    BIN = $(BIN2)
-  endif # ! Token
-endif # ! Other
+BUILD 	= $(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.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.bin.GNU
+include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
 CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
 
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -53,6 +47,9 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -143,15 +140,10 @@ CPPFLAGS += -I$(ACE_ROOT)/netsvcs/lib
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
diff --git a/netsvcs/servers/Makefile.am b/netsvcs/servers/Makefile.am
deleted file mode 100644
index 5a9dc555fed..00000000000
--- a/netsvcs/servers/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for the netsvcs server example
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir) -I$(top_srcdir)/netsvcs/lib
-
-noinst_PROGRAMS = main
-
-main_SOURCES = main.cpp
-main_LDADD = $(top_builddir)/netsvcs/lib/libnetsvcs.la \
-             $(top_builddir)/ace/libACE.la
-
-noinst_DATA = svc.conf
-
-EXTRA_DIST = $(noinst_DATA)
-
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 dd21ed1cf58..d8ea477d343 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -23,26 +23,20 @@ main (int argc, char *argv[])
 
   // Register ourselves to receive signals so we can shut down
   // gracefully.
-  if (ACE_Reactor::instance ()->register_handler (sig_set,
-                                                  &sa) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n"),
-                      -1);
+  if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1)
+    ACE_ERROR_RETURN ((LM_ERROR, "%p\n"), -1);
 
   // Try to link in the svc.conf entries dynamically.
   if (ACE_Service_Config::open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "open"),
-                          1);
+	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 1);
       else // Use static linking.
 	{
 	  char *l_argv[3];
 
           // Calling ACE_SVC_INVOKE to create a new Service_Object.
-          // Stash the newly created Service_Object into an
+          // Stash the newly created Service_Object into an 
           // ACE_Service_Object_Ptr which is an <auto_ptr> specialized
           // for ACE_Service_Object.
 
@@ -51,19 +45,14 @@ main (int argc, char *argv[])
 	  ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
 
 	  if (sp_1->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
-                        "%p\n%a",
-                        "Name Service",
-                        1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Name Service", 1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR;
 	  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,
-                        "%p\n%a",
-                        "TS Server Acceptor", 1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "TS Server Acceptor", 1));
 
 	  l_argv[0] = argv[0];
 	  l_argv[1] = "-p 10011";
@@ -78,53 +67,41 @@ main (int argc, char *argv[])
 	  ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
 
 	  if (sp_4->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
-                        "%p\n%a",
-                        "Token Service",
-                        1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Token Service", 1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
 	  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,
-                        "%p\n%a",
-                        "Threaded Logging Server",
-                        1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Threaded Logging Server", 1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
 	  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,
-                        "%p\n%a",
-                        "Logging Server", 1));
+	    ACE_ERROR ((LM_ERROR, "%p\n%a", "Logging Server", 1));
 
 	  l_argv[0] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
 	  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,
-                        "%p\n%a",
-                        "Logging Client",
-                        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 ();
 
-	  // Destructors of ACE_Service_Object_Ptr's automagically
-	  // call fini().
+	  // Destructors of ACE_Service_Object_Ptr's automagically call fini().
 	}
     }
   else // Use dynamic linking.
 
-    // 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 ();
 
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/netsvcs/servers/svc.conf b/netsvcs/servers/svc.conf
index 66dafa4e0e3..78b59eab3a9 100644
--- a/netsvcs/servers/svc.conf
+++ b/netsvcs/servers/svc.conf
@@ -1,17 +1,17 @@
 # These are the services that can be linked into ACE.
-# Note that you can append the "netsvcs" with
-# a relative path if you idn't set your LD search path correctly --
+# Note that you can replace the hardcoded "../lib/netsvcs" 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.  
+# Moreover, ACE will automatically insert the correct suffix (e.g., 
+# ".dll", ".so", etc.).  In addition, you can replace the hardcoded 
+# "-p 20xxx" with "-p $PORTxxx" if you set your environment variables 
+# correctly.
 
-# ACE will locate this for you automatically by reading your LD search
-# path.  Moreover, ACE will automatically insert the correct suffix
-# (e.g., ".dll", ".so", etc.).  In addition, you can replace the
-# hardcoded "-p 20xxx" with "-p $PORTxxx" if you set your environment
-# variables correctly.
+dynamic Logger Service_Object * ../lib/netsvcs:_make_ACE_Logging_Strategy() "-s foobar -f STDERR|OSTREAM"
+dynamic Time_Service Service_Object * ../lib/netsvcs:_make_ACE_TS_Server_Acceptor() "-p 20222"
+dynamic Name_Server Service_Object * ../lib/netsvcs:_make_ACE_Name_Acceptor() "-p 20012"
+dynamic Token_Service Service_Object * ../lib/netsvcs:_make_ACE_Token_Acceptor() "-p 20202"
+dynamic Server_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
+dynamic Thr_Server_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020"
+dynamic Client_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Client_Logging_Acceptor() active "-p 20009"
 
-dynamic Logger Service_Object * netsvcs:_make_ACE_Logging_Strategy() "-s foobar -f STDERR|OSTREAM"
-dynamic Time_Service Service_Object * netsvcs:_make_ACE_TS_Server_Acceptor() "-p 20222"
-dynamic Name_Server Service_Object * netsvcs:_make_ACE_Name_Acceptor() "-p 20012"
-dynamic Token_Service Service_Object * netsvcs:_make_ACE_Token_Acceptor() "-p 20202"
-dynamic Server_Logging_Service Service_Object * netsvcs:_make_ACE_Server_Logging_Acceptor() active "-p 20009"
-dynamic Thr_Server_Logging_Service Service_Object * netsvcs:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 20020"
-dynamic Client_Logging_Service Service_Object * netsvcs:_make_ACE_Client_Logging_Acceptor() active "-p 20009"
diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile
index b912d3226f7..cefe3bf589f 100644
--- a/performance-tests/Misc/Makefile
+++ b/performance-tests/Misc/Makefile
@@ -1,62 +1,53 @@
 #----------------------------------------------------------------------------
-#       $Id$
+#	$Id$
 #
-#       Makefile for tests of the miscellaneous ACE performance tests
+#	Makefile for tests of the miscellaneous ACE performance tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
-BIN = basic_perf \
-      childbirth_time \
-      context_switch_time \
-      preempt \
-      test_mutex \
-      test_singleton
-#### See below for test_naming.
+BIN     = basic_perf \
+	  childbirth_time \
+	  context_switch_time \
+	  preempt \
+	  test_mutex \
+	  test_singleton \
+	  test_naming
 
 # Only build static library for optimum run-time speed.
-LIB     = libPerf.a
+LIB	= libPerf.a
 FILES   = basic_func
-LSRC    = $(addsuffix .cpp,$(FILES))
-LOBJ    = $(addsuffix .o,$(FILES))
-LDLIBS  = -lPerf
+LSRC	= $(addsuffix .cpp,$(FILES)) 
+LOBJ	= $(addsuffix .o,$(FILES))
+LDLIBS 	= -lPerf
 VLDLIBS = $(LDLIBS:%=%$(VAR))
 
 # See comment above about only building libPerf.a for max performance.
 BUILD = $(VLIB) $(VBIN)
 
-BIN2 = test_naming
-
-#### If the ACE library wasn't built with sufficient components, don't
-#### try to build here.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN += $(BIN2)
-endif # ! Other
+# For make depend.
+PSRC = $(addsuffix .cpp, $(BIN))
 
 #----------------------------------------------------------------------------
-#       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
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
-# For make depend.
-PSRC = $(addsuffix .cpp, $(BIN))
-
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 
 # DO NOT DELETE THIS LINE -- g++dep uses it.
@@ -66,6 +57,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -83,6 +77,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -103,6 +100,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
 .obj/childbirth_time.o .obj/childbirth_time.so .shobj/childbirth_time.o .shobj/childbirth_time.so: childbirth_time.cpp \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -173,6 +173,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -257,15 +260,10 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -299,6 +297,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -383,15 +384,10 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -420,6 +416,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -441,6 +440,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
@@ -485,6 +487,9 @@ PSRC = $(addsuffix .cpp, $(BIN))
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/performance-tests/Misc/basic_perf.dsp b/performance-tests/Misc/basic_perf.dsp
index 2d5c55f56c5..71f17253cde 100644
--- a/performance-tests/Misc/basic_perf.dsp
+++ b/performance-tests/Misc/basic_perf.dsp
@@ -93,7 +93,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "basic_perf"

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/performance-tests/Misc/context_switch_time.dsp b/performance-tests/Misc/context_switch_time.dsp
index 4f98a04c458..58e70092d5b 100644
--- a/performance-tests/Misc/context_switch_time.dsp
+++ b/performance-tests/Misc/context_switch_time.dsp
@@ -93,7 +93,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "context_switch_time"

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/performance-tests/Misc/preempt.cpp b/performance-tests/Misc/preempt.cpp
index f824ab17027..e9aa3123512 100644
--- a/performance-tests/Misc/preempt.cpp
+++ b/performance-tests/Misc/preempt.cpp
@@ -76,7 +76,7 @@ ACE_hrtime_t starttime;
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-class High_Priority_Task : public ACE_Task<ACE_SYNCH>
+class High_Priority_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   High_Priority_Task (void);
@@ -94,7 +94,7 @@ private:
 };
 
 High_Priority_Task::High_Priority_Task (void)
-  : ACE_Task<ACE_SYNCH> (ACE_Thread_Manager::instance ()),
+  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
     priority_ (ACE_Sched_Params::next_priority (
                  ACE_SCHED_FIFO,
                  ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
@@ -189,7 +189,7 @@ High_Priority_Task::print_times () const
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-class Low_Priority_Task : public ACE_Task<ACE_SYNCH>
+class Low_Priority_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   Low_Priority_Task (const High_Priority_Task &);
@@ -204,7 +204,7 @@ private:
 
 Low_Priority_Task::Low_Priority_Task (
   const High_Priority_Task &high_priority_task)
-  : ACE_Task<ACE_SYNCH> (ACE_Thread_Manager::instance ()),
+  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ()),
     priority_ (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO,
                                                ACE_SCOPE_THREAD)),
     high_priority_task_ (high_priority_task)
diff --git a/performance-tests/Misc/test_guard.cpp b/performance-tests/Misc/test_guard.cpp
deleted file mode 100644
index 78024742e5f..00000000000
--- a/performance-tests/Misc/test_guard.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-
-// This test program illustrates the performance of ACE_Guard and
-// ACE_Thread_Mutex_Guard.
-
-#include "ace/Log_Msg.h"
-#include "ace/Get_Opt.h"
-#include "ace/Profile_Timer.h"
-#include "ace/Synch.h"
-
-#if !defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-#error You must compile ACE and this program with ACE_USES_OBSOLETE_GUARD_CLASSES defined!
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-
-ACE_RCSID(Misc, test_guard, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-
-# define ACE_THREAD_GUARD(OBJ,LOCK) \
-  ACE_Thread_Mutex_Guard OBJ (LOCK); \
-    if (OBJ.locked () == 0) return;
-
-static const int DEFAULT_ITERATIONS = 100000000;
-
-enum
-{
-  TEST_GUARD,
-  TEST_THR_GUARD,
-  TEST_END
-};
-
-ACE_Thread_Mutex lock_;
-typedef void (*guard_func)(void);
-int test_type = TEST_GUARD;
-int dummy = 0;
-
-void guard (void)
-{
-  ACE_GUARD (ACE_Thread_Mutex, _ace_mon, lock_);
-  dummy++;
-}
-
-void thr_guard (void)
-{
-  ACE_THREAD_GUARD (_ace_mon, lock_);
-  dummy++;
-}
-
-char *test_name[TEST_END] = { "ACE_Guard", "ACE_Thread_Mutex_Guard" };
-
-guard_func test_function=guard;
-
-int
-main (int argc, char *argv[])
-{
-  ACE_Profile_Timer timer;
-  ACE_Get_Opt getopt (argc, argv, "gtn:");
-  int iterations = DEFAULT_ITERATIONS;
-  int c, i;
-
-  while ((c = getopt()) != -1)
-    switch (c)
-      {
-#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-      case 't':
-        test_type = TEST_THR_GUARD;
-        test_function = thr_guard;
-        break;
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-      case 'g':
-        test_type = TEST_GUARD;
-        test_function = guard;
-        break;
-      case 'n':
-        iterations = ACE_OS::atoi (getopt.optarg);
-        break;
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Invalid option\n"), -1);
-      }
-
-  ACE_DEBUG ((LM_DEBUG, "%s for iterations = %d\n", test_name[test_type], iterations));
-
-  timer.start ();
-
-  // Test the thread mutex (which doesn't use inheritance or dynamic
-  // binding).
-
-  for (i = 0; i < iterations; i++)
-    test_function ();
-
-  timer.stop ();
-
-  ACE_Profile_Timer::ACE_Elapsed_Time et;
-
-  timer.elapsed_time (et);
-
-  ACE_DEBUG ((LM_DEBUG, "Thread_Mutex\n"));
-  ACE_DEBUG ((LM_DEBUG, "real time = %f secs, user time = %f secs, system time = %f secs\n",
-              et.real_time, et.user_time, et.system_time));
-
-  ACE_DEBUG ((LM_DEBUG, "time per call = %f usecs\n",
-              (et.real_time / double (iterations)) * 1000000));
-
-  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/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp b/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp
index 0fb037dfd7e..7e5e1c77b49 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Base_Test.dsp
@@ -92,10 +92,6 @@ LINK32=link.exe
 # PROP Default_Filter ".cpp"

 # Begin Source File

 

-SOURCE=.\base_test.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\Baseline_Test.cpp

 # End Source File

 # Begin Source File

diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index be6e1eaf72f..ecdc3fe12ac 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -20,8 +20,8 @@ Baseline_Test_Options baseline_options;
 Baseline_Test_Base::Baseline_Test_Base (void)
   : Benchmark_Base (Benchmark_Base::BASELINE),
     yield_method_ (Baseline_Test_Options::USE_SLEEP_ZERO),
-    iteration_ (DEFAULT_ITERATIONS),
-    what_(TEST_LOCK)
+    multiply_factor_ (100),
+    iteration_ (10000)
 {
 }
 
@@ -34,13 +34,25 @@ Baseline_Test_Base::init (int argc, char *argv[])
 int
 Baseline_Test_Base::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, "i:ylrw", 0);
+  ACE_Get_Opt getopt (argc, argv, "m:i:y", 0);
   int c;
 
   while ((c = getopt ()) != -1)
     switch (c)
       {
-      case 'i':                 // Total iterations
+      case 'm':
+        {
+          int tmp = ACE_OS::atoi (getopt.optarg);
+          if (tmp <= 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "%d is not a valid value for multiply_factor\n",
+                               tmp), -1);
+          else
+            this->multiply_factor_ = ACE_static_cast (size_t, tmp);
+        }
+        break;
+
+      case 'i':
         {
           int tmp = ACE_OS::atoi (getopt.optarg);
           if (tmp <= 0)
@@ -56,18 +68,6 @@ Baseline_Test_Base::parse_args (int argc, char *argv[])
         this->yield_method_ = Baseline_Test_Options::USE_THR_YIELD;
         break;
 
-      case 'l':
-        this->what_ = TEST_LOCK;
-        break;
-
-      case 'r':
-        this->what_ = TEST_READLOCK;
-        break;
-
-      case 'w':
-        this->what_ = TEST_WRITELOCK;
-        break;
-
       default:
         ACE_ERROR ((LM_ERROR, "Invalid argument %c used\n", c));
         break;
@@ -88,8 +88,9 @@ Baseline_Test_Options::Baseline_Test_Options (void)
   : test_try_lock_ (0),
     verbose_ (0),
     current_yield_method_ (0),
+    current_multiply_factor_ (10),
     current_iteration_ (0),
-    total_iteration_ (DEFAULT_ITERATIONS)
+    total_iteration_ (10000)
 {
 }
 
@@ -118,13 +119,16 @@ Baseline_Test_Options::parse_args (int argc, char *argv[])
 }
 
 int
-Baseline_Test_Options::reset_params (size_t iteration,
+Baseline_Test_Options::reset_params (size_t multiply,
+                                     size_t iteration,
                                      int yield)
 {
   this->current_iteration_ = 0;
   this->timer.reset ();
+  // Start a new test, reset statistic info.
 
   this->current_yield_method_ = yield;
+  this->current_multiply_factor_ = multiply;
   this->total_iteration_ = iteration;
   return 0;
 }
@@ -139,11 +143,12 @@ Baseline_Test_Options::print_result (void)
   this->timer.elapsed_time_incr (nsec);
   ACE_DEBUG ((LM_DEBUG,
               "Total Time: %d sec %d usec for a "
-              "total of %d iterations\n"
+              "total of %d iterations (%d iterations before yield)\n"
               "Average time: %d nanoseconds.\n",
               tv.sec (), tv.usec (),
               this->current_iteration_,
-              (int) (nsec / this->current_iteration_)));
+              this->current_multiply_factor_,
+              nsec / this->current_iteration_));
 }
 
 Baseline_Test::Baseline_Test (void)
@@ -165,7 +170,8 @@ int
 Baseline_Test::pre_run_test (Benchmark_Base *bb)
 {
   this->current_test_ = (Baseline_Test_Base *) bb;
-  baseline_options.reset_params (this->current_test_->iteration (),
+  baseline_options.reset_params (this->current_test_->multiply_factor (),
+                                 this->current_test_->iteration (),
                                  this->current_test_->yield_method ());
   if (baseline_options.test_try_lock ())
     {
@@ -177,6 +183,11 @@ Baseline_Test::pre_run_test (Benchmark_Base *bb)
       // Wait until the lock is held by the spawning thread.
     }
 
+  this->run_test ();
+  baseline_options.reset_params (this->current_test_->multiply_factor (),
+                                 this->current_test_->iteration (),
+                                 this->current_test_->yield_method ());
+
   return 0;
 }
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
index 31ea8a25ffa..2206db2dbca 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.h
@@ -8,19 +8,11 @@
 
 #include "Synch_Lib/Benchmark_Base.h"
 
-const unsigned long DEFAULT_ITERATIONS = 1000000;
-
 class ACE_Svc_Export Baseline_Test_Base : public Benchmark_Base
 {
   // = TITLE
   //     This class identifies itself as Benmarking Performance Test class.
 public:
-  enum {
-    TEST_LOCK,
-    TEST_READLOCK,
-    TEST_WRITELOCK
-  };
-
   virtual int init (int argc, char *argv[]);
   // Standard initializing method for Baseline Test.
 
@@ -41,6 +33,7 @@ public:
   virtual void yield ();
   // Yield to other thread.
 
+  size_t multiply_factor (void);
   size_t iteration (void);
   // Access methods.
 
@@ -50,11 +43,11 @@ protected:
   int yield_method_;
   // Should we your thr_yield or sleep (0).
 
-  size_t iteration_;
-  // Total number of operations.  <iterations_>
+  size_t multiply_factor_;
+  // Number of operations before yielding to other threads.
 
-  int what_;
-  // What test should be performed?
+  size_t iteration_;
+  // Total number of operations.  <iterations_> <= <multiply_factor_> * n
 };
 
 class ACE_Svc_Export Baseline_Test_Options
@@ -76,7 +69,7 @@ public:
   int parse_args (int argc, char *argv[]);
   // Parse and set the Baseline_Test options and flags.
 
-  int reset_params (size_t iteration, int yield);
+  int reset_params (size_t mulply_factor, size_t iteration, int yield);
   // Reset test parameters for next round.
 
   int test_try_lock (void);
@@ -87,8 +80,12 @@ public:
   // Start/stop measuring time.
 
   int inc_loop_counter (void);
+  // Added multiply_factor_ to total_iteration_.
   // Returns
 
+  size_t current_multiply_factor (void);
+  // Return <multiply_factor_>.
+
   size_t current_iteration (void);
   // Return <iteration_>.
 
@@ -106,6 +103,9 @@ private:
   int current_yield_method_;
   // yield or sleep.
 
+  size_t current_multiply_factor_;
+  // Number loop before performing thread yield.
+
   size_t current_iteration_;
   // Number of iteration.
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i
index 05aa007478d..9516fce1aa5 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.i
@@ -1,6 +1,12 @@
 // $Id$
 
 ACE_INLINE size_t
+Baseline_Test_Base::multiply_factor (void)
+{
+  return this->multiply_factor_;
+}
+
+ACE_INLINE size_t
 Baseline_Test_Base::iteration (void)
 {
   return this->iteration_;
@@ -19,6 +25,12 @@ Baseline_Test_Options::test_try_lock (void)
 }
 
 ACE_INLINE size_t
+Baseline_Test_Options::current_multiply_factor (void)
+{
+  return this->current_multiply_factor_;
+}
+
+ACE_INLINE size_t
 Baseline_Test_Options::current_iteration (void)
 {
   return this->current_iteration_;
@@ -39,5 +51,6 @@ Baseline_Test_Options::stop_inc_timer (void)
 ACE_INLINE int
 Baseline_Test_Options::inc_loop_counter (void)
 {
-  return (++this->current_iteration_ < this->total_iteration_);
+  this->current_iteration_ += this->current_multiply_factor_;
+  return (this->current_iteration_ < this->total_iteration_);
 }
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/Makefile b/performance-tests/Synch-Benchmarks/Base_Test/Makefile
index f7d3982d86d..43a3f3a4928 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/Makefile
+++ b/performance-tests/Synch-Benchmarks/Base_Test/Makefile
@@ -13,8 +13,7 @@ LIB	= libBase_Test.a
 SHLIB	= libBase_Test.$(SOEXT)
 
 FILES	= Baseline_Test \
-	  mutex_test \
-	  base_test
+	  mutex_test
 
 LSRC	= $(addsuffix .cpp,$(FILES))
 LOBJ   	= $(LSRC:%.cpp=$(VDIR)%.o)
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
index 2f82c87f56f..57a4c4170ac 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/base_test.cpp
@@ -32,24 +32,32 @@ Baseline_Base_Test::release ()
 int
 Baseline_Base_Test::test_acquire_release ()
 {
-  baseline_options.start_inc_timer ();
-
   for (; baseline_options.inc_loop_counter () ; )
-    ;
+    {
+      this->yield ();
+      baseline_options.start_inc_timer ();
+
+      for (size_t i=0; i < baseline_options.current_multiply_factor (); i++)
+        ;
 
-  baseline_options.stop_inc_timer ();
+      baseline_options.stop_inc_timer ();
+    }
   return 0;
 }
 
 int
 Baseline_Base_Test::test_try_lock ()
 {
-  baseline_options.start_inc_timer ();
-
   for (; baseline_options.inc_loop_counter () ; )
-    ;
+    {
+      this->yield ();
+      baseline_options.start_inc_timer ();
+
+      for (size_t i=0; i < baseline_options.current_multiply_factor (); i++)
+        ;
 
-  baseline_options.stop_inc_timer ();
+      baseline_options.stop_inc_timer ();
+    }
   return 0;
 }
 
diff --git a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
index b8c5c581270..ff96eb43134 100644
--- a/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
+++ b/performance-tests/Synch-Benchmarks/Base_Test/mutex_test.cpp
@@ -3,7 +3,6 @@
 #define ACE_BUILD_SVC_DLL
 
 #include "ace/Synch.h"
-#include "ace/Token.h"
 #include "Baseline_Test.h"
 
 template<class LOCK>
@@ -26,22 +25,7 @@ private:
 template<class LOCK> int
 Baseline_Lock_Test<LOCK>::acquire ()
 {
-  int retv = 0;
-  switch (this->what_)
-    {
-    case TEST_READLOCK:
-      retv = this->lock_.acquire_read ();
-      break;
-    case TEST_WRITELOCK:
-      retv = this->lock_.acquire_write ();
-      break;
-    case TEST_LOCK:
-    default:
-      retv = this->lock_.acquire ();
-      break;
-    }
-
-  return retv;
+  return this->lock_.acquire ();
 }
 
 template<class LOCK> int
@@ -53,64 +37,35 @@ Baseline_Lock_Test<LOCK>::release ()
 template<class LOCK> int
 Baseline_Lock_Test<LOCK>::test_acquire_release ()
 {
-  baseline_options.start_inc_timer ();
-
-  switch (this->what_)
+  for (; baseline_options.inc_loop_counter () ; )
     {
-    case TEST_READLOCK:
-      for (; baseline_options.inc_loop_counter () ; )
-        {
-          this->lock_.acquire_read ();
-          this->lock_.release ();
-        }
-      break;
-    case TEST_WRITELOCK:
-      for (; baseline_options.inc_loop_counter () ; )
-        {
-          this->lock_.acquire_write ();
-          this->lock_.release ();
-        }
-      break;
-    case TEST_LOCK:
-    default:
-      for (; baseline_options.inc_loop_counter () ; )
+      this->yield ();
+      baseline_options.start_inc_timer ();
+
+      for (size_t i=0; i < baseline_options.current_multiply_factor (); i++)
         {
           this->lock_.acquire ();
           this->lock_.release ();
         }
-      break;
-    }
-
-  baseline_options.stop_inc_timer ();
 
+      baseline_options.stop_inc_timer ();
+    }
   return 0;
 }
 
 template<class LOCK> int
 Baseline_Lock_Test<LOCK>::test_try_lock ()
 {
-  baseline_options.start_inc_timer ();
-  switch (this->what_)
+  for (; baseline_options.inc_loop_counter () ; )
     {
-    case TEST_READLOCK:
-      for (; baseline_options.inc_loop_counter () ; )
-        this->lock_.tryacquire_read (); // This should always fail.
-      break;
-    case TEST_WRITELOCK:
-      for (; baseline_options.inc_loop_counter () ; )
-        this->lock_.tryacquire_write (); // This should always fail.
-      break;
-    case TEST_LOCK:
-    default:
-      for (; baseline_options.inc_loop_counter () ; )
-        this->lock_.tryacquire (); // This should always fail.
-      break;
-    }
+      this->yield ();
+      baseline_options.start_inc_timer ();
 
-  for (; baseline_options.inc_loop_counter () ; )
-    this->lock_.tryacquire (); // This should always fail.
+      for (size_t i=0; i < baseline_options.current_multiply_factor (); i++)
+          this->lock_.tryacquire (); // This should always fail.
 
-  baseline_options.stop_inc_timer ();
+      baseline_options.stop_inc_timer ();
+    }
   return 0;
 }
 
@@ -119,36 +74,6 @@ typedef Baseline_Lock_Test<ACE_Thread_Mutex> Baseline_Mutex_Test;
 ACE_SVC_FACTORY_DECLARE (Baseline_Mutex_Test)
 ACE_SVC_FACTORY_DEFINE (Baseline_Mutex_Test)
 
-typedef Baseline_Lock_Test<ACE_RW_Thread_Mutex> Baseline_RW_Thread_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_RW_Thread_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_RW_Thread_Mutex_Test)
-
-typedef Baseline_Lock_Test<ACE_RW_Mutex> Baseline_RW_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_RW_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_RW_Mutex_Test)
-
-typedef Baseline_Lock_Test<ACE_Process_Mutex> Baseline_Process_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Process_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Process_Mutex_Test)
-
-typedef Baseline_Lock_Test<ACE_RW_Process_Mutex> Baseline_RW_Process_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_RW_Process_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_RW_Process_Mutex_Test)
-
-typedef Baseline_Lock_Test<ACE_Null_Mutex> Baseline_Null_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Null_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Null_Mutex_Test)
-
-typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> > Baseline_Adaptive_Null_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Null_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Null_Mutex_Test)
-
 typedef Baseline_Lock_Test<ACE_Recursive_Thread_Mutex> Baseline_Recursive_Mutex_Test;
 
 ACE_SVC_FACTORY_DECLARE (Baseline_Recursive_Mutex_Test)
@@ -159,74 +84,10 @@ typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> > Baseline_Adapti
 ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Mutex_Test)
 ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Mutex_Test)
 
-typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> > Baseline_Adaptive_RW_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_RW_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_RW_Mutex_Test)
-
-typedef Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> > Baseline_Adaptive_Recursive_Mutex_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Adaptive_Recursive_Mutex_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Adaptive_Recursive_Mutex_Test)
-
-typedef Baseline_Lock_Test<ACE_Semaphore> Baseline_Semaphore_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Semaphore_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Semaphore_Test)
-
-typedef Baseline_Lock_Test<ACE_Semaphore> Baseline_Process_Semaphore_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Process_Semaphore_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Process_Semaphore_Test)
-
-typedef Baseline_Lock_Test<ACE_Null_Semaphore> Baseline_Null_Semaphore_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Null_Semaphore_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Null_Semaphore_Test)
-
-typedef Baseline_Lock_Test<ACE_Token> Baseline_Token_Test;
-
-ACE_SVC_FACTORY_DECLARE (Baseline_Token_Test)
-ACE_SVC_FACTORY_DEFINE (Baseline_Token_Test)
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class Baseline_Lock_Test<ACE_Thread_Mutex>;
-template class Baseline_Lock_Test<ACE_Process_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Process_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Mutex>;
-template class Baseline_Lock_Test<ACE_RW_Thread_Mutex>;
-template class Baseline_Lock_Test<ACE_Null_Mutex>;
-template class ACE_Lock_Adapter<ACE_Null_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> >;
 template class Baseline_Lock_Test<ACE_Recursive_Thread_Mutex>;
-template class ACE_Lock_Adapter<ACE_Thread_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> >;
-template class ACE_Lock_Adapter<ACE_RW_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> >;
-template class ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>;
-template class Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> >;
-template class Baseline_Lock_Test<ACE_Semaphore>;
-template class Baseline_Lock_Test<ACE_Process_Semaphore>;
-template class Baseline_Lock_Test<ACE_Null_Semaphore>;
-template class Baseline_Lock_Test<ACE_Token>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate Baseline_Lock_Test<ACE_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_Process_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Process_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_RW_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test<ACE_Null_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Null_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Null_Mutex> >
 #pragma instantiate Baseline_Lock_Test<ACE_Recursive_Thread_Mutex>
-#pragma instantiate ACE_Lock_Adapter<ACE_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Thread_Mutex> >
-#pragma instantiate ACE_Lock_Adapter<ACE_RW_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_RW_Mutex> >
-#pragma instantiate ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex>
-#pragma instantiate Baseline_Lock_Test< ACE_Lock_Adapter<ACE_Recursive_Thread_Mutex> >
-#pragma instantiate Baseline_Lock_Test<ACE_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Process_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Null_Semaphore>
-#pragma instantiate Baseline_Lock_Test<ACE_Token>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Makefile b/performance-tests/Synch-Benchmarks/Perf_Test/Makefile
index ee9a1bc0762..c11d89a8075 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Makefile
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Makefile
@@ -16,7 +16,6 @@ FILES	= Benchmark_Performance \
 	  Performance_Test_Options \
 	  Performance_Test \
 	  mutex_test \
-	  guard_test \
 	  recursive_lock_test \
 	  sema_test \
 	  sysvsema_test \
@@ -75,7 +74,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -147,11 +147,11 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
 .obj/Performance_Test_Options.o .obj/Performance_Test_Options.so .shobj/Performance_Test_Options.o .shobj/Performance_Test_Options.so: Performance_Test_Options.cpp \
- Performance_Test_Options.h \
- $(ACE_ROOT)/ace/OS.h \
+ Performance_Test_Options.h $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -212,8 +212,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/Performance_Test.o .obj/Performance_Test.so .shobj/Performance_Test.o .shobj/Performance_Test.so: Performance_Test.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -224,7 +223,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -289,10 +289,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
@@ -306,104 +305,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
  ../Synch_Lib/export_mac.h Performance_Test.h
-.obj/mutex_test.o .obj/mutex_test.so .shobj/mutex_test.o .shobj/mutex_test.so: mutex_test.cpp \
- $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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 \
- Performance_Test_Options.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.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/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/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- ../Synch_Lib/export_mac.h
-.obj/guard_test.o .obj/guard_test.so .shobj/guard_test.o .shobj/guard_test.so: guard_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/mutex_test.o .obj/mutex_test.so .shobj/mutex_test.o .shobj/mutex_test.so: mutex_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -430,8 +338,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -463,10 +370,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -494,7 +400,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -521,8 +428,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -554,10 +460,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -579,13 +484,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/sema_test.o .obj/sema_test.so .shobj/sema_test.o .shobj/sema_test.so: sema_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/sema_test.o .obj/sema_test.so .shobj/sema_test.o .shobj/sema_test.so: sema_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -612,8 +517,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -645,10 +549,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -676,7 +579,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -736,10 +640,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -761,13 +664,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/rwrd_test.o .obj/rwrd_test.so .shobj/rwrd_test.o .shobj/rwrd_test.so: rwrd_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/rwrd_test.o .obj/rwrd_test.so .shobj/rwrd_test.o .shobj/rwrd_test.so: rwrd_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -794,8 +697,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -827,10 +729,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -852,13 +753,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/rwwr_test.o .obj/rwwr_test.so .shobj/rwwr_test.o .shobj/rwwr_test.so: rwwr_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/rwwr_test.o .obj/rwwr_test.so .shobj/rwwr_test.o .shobj/rwwr_test.so: rwwr_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -885,8 +786,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -918,10 +818,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -943,13 +842,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/context_test.o .obj/context_test.so .shobj/context_test.o .shobj/context_test.so: context_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/context_test.o .obj/context_test.so .shobj/context_test.o .shobj/context_test.so: context_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -976,8 +875,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1009,10 +907,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1034,13 +931,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/condb_test.o .obj/condb_test.so .shobj/condb_test.o .shobj/condb_test.so: condb_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/condb_test.o .obj/condb_test.so .shobj/condb_test.o .shobj/condb_test.so: condb_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1067,8 +964,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1100,10 +996,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1125,13 +1020,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/conds_test.o .obj/conds_test.so .shobj/conds_test.o .shobj/conds_test.so: conds_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/conds_test.o .obj/conds_test.so .shobj/conds_test.o .shobj/conds_test.so: conds_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1158,8 +1053,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1191,10 +1085,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1216,13 +1109,13 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/memory_test.o .obj/memory_test.so .shobj/memory_test.o .shobj/memory_test.so: memory_test.cpp \
- $(ACE_ROOT)/ace/Synch.h \
+.obj/memory_test.o .obj/memory_test.so .shobj/memory_test.o .shobj/memory_test.so: memory_test.cpp $(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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1249,8 +1142,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1282,10 +1174,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1314,7 +1205,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1373,10 +1265,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1402,7 +1293,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1463,10 +1355,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i Benchmark_Performance.h \
+ ../Synch_Lib/Benchmark_Base.h \
  $(ACE_ROOT)/ace/Service_Config.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
@@ -1495,7 +1386,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1522,8 +1414,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- Performance_Test_Options.h \
+ $(ACE_ROOT)/ace/Synch_T.cpp Performance_Test_Options.h \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1555,8 +1446,7 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
+ Performance_Test_Options.i $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i \
  Adaptive_Lock_Performance_Test_Base.h Benchmark_Performance.h \
  ../Synch_Lib/Benchmark_Base.h \
@@ -1587,7 +1477,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1668,7 +1559,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1749,7 +1641,8 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
+ $(ACE_ROOT)/ace/config-linux-common.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
@@ -1824,98 +1717,5 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/Service_Types.i \
  $(ACE_ROOT)/ace/Service_Repository.i \
  ../Synch_Lib/export_mac.h
-.obj/token_test.o .obj/token_test.so .shobj/token_test.o .shobj/token_test.so: token_test.cpp \
- $(ACE_ROOT)/ace/Token.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.h \
- $(ACE_ROOT)/ace/config-sunos5.5.h \
- $(ACE_ROOT)/ace/config-g++-common.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.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/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/Token.i \
- Performance_Test_Options.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i \
- $(ACE_ROOT)/ace/Thread_Manager.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/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 \
- Performance_Test_Options.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- Benchmark_Performance.h ../Synch_Lib/Benchmark_Base.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/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/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- ../Synch_Lib/export_mac.h
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
index d87fcc3655d..b0a2b92162f 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/Performance_Test_Options.cpp
@@ -79,16 +79,16 @@ Performance_Test_Options::parse_args (int argc, char *argv[])
   while ((c = get_opt ()) != -1)
     switch (c)
       {
-      case 'a':                 // Not used. (do_ack ???)
+      case 'a':
         this->_ack = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'A':                 // Not used. (set rendezvous point.)
+      case 'A':
         this->pipe_addr (get_opt.optarg);
         break;
-      case 'B':                 // Create thread with THR_BOUND.
+      case 'B':
         this->t_flags (THR_BOUND);
         break;
-      case 'c':                 // Not used. (# of connections.)
+      case 'c':
         {
           long connections = ACE_OS::atoi (get_opt.optarg);
 
@@ -101,79 +101,79 @@ Performance_Test_Options::parse_args (int argc, char *argv[])
 
           break;
         }
-      case 'C':                 // Not used.  (Toggle calculate checksum.)
+      case 'C':
         this->_checksum = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'd':                 // Not used.  (Enable debugging.)
+      case 'd':
         this->_debugging = 1;
         break;
-      case 'D':                 // Create thread with THR_DETACHED.
+      case 'D':
         this->t_flags (THR_DETACHED);
         break;
-      case 'e':                 // Perform eager exit (without cleaning up.)
+      case 'e':
         this->_eager_exit = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'F':                 // Not used.
+      case 'F':
         this->_free_memory = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'g':                 // Not used.  (generate data ??)
+      case 'g':
         this->_generate = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'H':                 // Not used.  (set high water mark)
+      case 'H':
         this->high_water_mark (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'i':                 // Not used.  (# of iterations)
+      case 'i':
         this->iterations (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'L':                 // Not used.  (set low water mark)
+      case 'L':
         this->low_water_mark (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'l':                 // Not used.  (set initial queue length)
+      case 'l':
         this->initial_queue_length (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'M':                 // Set message size in pipe_[proc|thr]_test.
+      case 'M':
         this->msg_size (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'm':                 // Not used.  (set mapped file name)
+      case 'm':
         this->mapped_file (get_opt.optarg);
         break;
-      case 'N':                 // Create thread with flag THR_NEW_LWP.
+      case 'N':
         this->t_flags (THR_NEW_LWP);
         break;
-      case 'n':                 // Set # of lwp's
+      case 'n':
         this->n_lwps (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'p':                 // Toggle whether summary is printed.
+      case 'p':
         this->_print_summary = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'P':                 // Not used.
+      case 'P':
         this->consecutive_ports (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'S':                 // Not used  (set service_entry ???)
+      case 'S':
         this->service_entry (get_opt.optarg);
         break;
-      case 's':                 // Set testing duration.
+      case 's':
         this->sleep_time (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'T':                 // Enable/disable tracing.
+      case 'T':
         if (ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0)
           ACE_Trace::start_tracing ();
         else if (ACE_OS::strcasecmp (get_opt.optarg, "OFF") == 0)
           ACE_Trace::stop_tracing ();
         break;
-      case 't':                 // Set # of threads contending the lock.
+      case 't':
         this->thr_count (ACE_OS::atoi (get_opt.optarg));
         break;
-      case 'u':                 // Not used.  (use udp.)
+      case 'u':
         this->_udp = 1;
         break;
-      case 'v':                 // Not used.  (set display verbosely)
+      case 'v':
         this->_verbosity = 1;
         break;
-      case 'X':                 // Not used.  (Use xdr conversion.)
+      case 'X':
         this->_xdr = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
-      case 'Z':                 // Not used.  (Do zero copy.)
+      case 'Z':
         this->_zero_copy = ACE_OS::strcasecmp (get_opt.optarg, "ON") == 0;
         break;
       default:
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/README b/performance-tests/Synch-Benchmarks/Perf_Test/README
index 28f1f160e8a..af425adcffe 100644
--- a/performance-tests/Synch-Benchmarks/Perf_Test/README
+++ b/performance-tests/Synch-Benchmarks/Perf_Test/README
@@ -30,47 +30,3 @@ Solaris, you should always make sure that you have more than 1 LWP (by
 using either the -B or the -n options) since otherwise the program may
 get into an infinite loop due to the semantics of SunOS unbound
 threads... (This may no longer be the case.)
-
-
-Available Options in Performance_Test module:
-=============================================
-
-Thread Creation:
-----------------
-      -B:    Create thread with THR_BOUND
-      -D:    Create thread with THR_DETACHED
-      -N:    Create thread with flag THR_NEW_LWP
-      -n:    Set # of lwp's (default is 0)
-      -t:    Set # of threads contending the lock (default is 4)
-
-Run Test:
----------
-      -s:    Set testing duration (in seconds, default is 100)
-      -T:    Enable/disable tracing.
-
-Misc:
------
-      -p:    Toggle whether summary is printed
-      -e:    Perform eager exit (without cleaning up)
-      -M:    Set message size in pipe_[proc|thr]_test
-
-Reserved Flags:
----------------
-      -a:    Not used.  (do_ack ???)
-      -A:    Not used.  (set rendezvous point)
-      -c:    Not used.  (# of connections)
-      -C:    Not used.  (Toggle calculate checksum)
-      -d:    Not used.  (Enable debugging)
-      -F:    Not used.  (Free memory)
-      -g:    Not used.  (generate data ??)
-      -H:    Not used.  (set high water mark)
-      -i:    Not used.  (# of iterations)
-      -L:    Not used.  (set low water mark)
-      -l:    Not used.  (set initial queue length)
-      -m:    Not used.  (set mapped file name)
-      -P:    Not used.  (set consecutive ports)
-      -S:    Not used.  (set service_entry ???)
-      -u:    Not used.  (use udp)
-      -v:    Not used.  (set display verbosely)
-      -X:    Not used.  (Use xdr conversion)
-      -Z:    Not used.  (Do zero copy)
diff --git a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
deleted file mode 100644
index 8db023236a1..00000000000
--- a/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// $Id$
-
-#define  ACE_BUILD_SVC_DLL
-#include "ace/Synch.h"
-#include "Performance_Test_Options.h"
-#include "Benchmark_Performance.h"
-
-ACE_RCSID(Synch_Benchmarks, mutex_test, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-
-class ACE_Svc_Export Guard_Test : public Benchmark_Performance
-{
-public:
-  enum
-  {                             // svc.conf options
-    TEST_ACE_GUARD,             // -g
-    TEST_ACE_THREAD_MUTEX_GUARD // -t
-  };
-
-  virtual int svc (void);
-  virtual int init (int, char *[]);
-
-  void test_guard (int);
-#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-  void test_thread_guard (int);
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-private:
-  static int guard_type_;
-  static ACE_Thread_Mutex mutex_;
-};
-
-int Guard_Test::guard_type_ = Guard_Test::TEST_ACE_GUARD;
-ACE_Thread_Mutex Guard_Test::mutex_;
-
-int
-Guard_Test::init (int argc, char *argv[])
-{
-  ACE_Get_Opt getopt (argc, argv, "gt");
-  int c;
-
-  while ((c = getopt()) != -1)
-    {
-      switch (c)
-        {
-#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-        case 't':
-          Guard_Test::guard_type_ = Guard_Test::TEST_ACE_THREAD_MUTEX_GUARD;
-          break;
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-        case 'g':
-          Guard_Test::guard_type_ = Guard_Test::TEST_ACE_GUARD;
-          break;
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Invalid option\n"), -1);
-        }
-    }
-  return 0;
-}
-
-int
-Guard_Test::svc (void)
-{
-  // Extract out the unique thread-specific value to be used as an
-  // index...
-  int ni = this->thr_id ();
-  synch_count = 2;
-
-  switch (Guard_Test::guard_type_)
-    {
-    case Guard_Test::TEST_ACE_GUARD:
-      this->test_guard (ni);
-      break;
-#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-    case Guard_Test::TEST_ACE_THREAD_MUTEX_GUARD:
-      this->test_thread_guard (ni);
-      break;
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-    default:
-      return -1;
-    }
-  return 0;
-}
-
-void
-Guard_Test::test_guard (int ni)
-{
-  while (!this->done ())
-    {
-      {
-        ACE_GUARD (ACE_Thread_Mutex, _ace_mon, Guard_Test::mutex_);
-
-        performance_test_options.thr_work_count[ni]++;
-        buffer++;
-      }
-    }
-}
-
-#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
-# define ACE_THREAD_GUARD(OBJ,LOCK) \
-  ACE_Thread_Mutex_Guard OBJ (LOCK); \
-    if (OBJ.locked () == 0) return;
-
-void
-Guard_Test::test_thread_guard (int ni)
-{
-  while (!this->done ())
-    {
-      {
-        ACE_THREAD_GUARD (_ace_mon, Guard_Test::mutex_);
-
-        performance_test_options.thr_work_count[ni]++;
-        buffer++;
-      }
-    }
-}
-#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */
-ACE_SVC_FACTORY_DECLARE (Guard_Test)
-ACE_SVC_FACTORY_DEFINE  (Guard_Test)
-
-// ACE_Service_Object_Type mut (&mutex_test, "Guard_Test");
-#endif /* ACE_HAS_THREADS */
diff --git a/performance-tests/Synch-Benchmarks/Synch_Tests.dsw b/performance-tests/Synch-Benchmarks/Synch_Tests.dsw
index b2f8c58d70f..ed10093302a 100644
--- a/performance-tests/Synch-Benchmarks/Synch_Tests.dsw
+++ b/performance-tests/Synch-Benchmarks/Synch_Tests.dsw
@@ -11,9 +11,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name Synch_Lib

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -26,9 +23,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name Synch_Lib

-    End Project Dependency

 }}}

 

 ###############################################################################

@@ -53,12 +47,6 @@ Package=<5>
 

 Package=<4>

 {{{

-    Begin Project Dependency

-    Project_Dep_Name Base_Test

-    End Project Dependency

-    Begin Project Dependency

-    Project_Dep_Name Perf_Test

-    End Project Dependency

 }}}

 

 ###############################################################################

diff --git a/performance-tests/Synch-Benchmarks/results/.no_prune b/performance-tests/Synch-Benchmarks/results/.no_prune
deleted file mode 100644
index b5bcdc481b9..00000000000
--- a/performance-tests/Synch-Benchmarks/results/.no_prune
+++ /dev/null
@@ -1 +0,0 @@
-"Do not prune me."
diff --git a/performance-tests/Synch-Benchmarks/run_tests.pl b/performance-tests/Synch-Benchmarks/run_tests.pl
deleted file mode 100755
index 1ef43e69298..00000000000
--- a/performance-tests/Synch-Benchmarks/run_tests.pl
+++ /dev/null
@@ -1,131 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-
-$EXE = "synch_driver";
-$Win32 = 0;
-if ($^O eq "MSWin32")
-{
-    $Win32 = 1;
-}
-
-$debug = 0;
-$name = "release";
-$result_dir = "results";
-$svcconf_dir = "svcconf";
-$conf_ext = ".conf";
-
-@Null_List = ();
-
-# This is called "baseline"
-@Baseline_List = ("base_acquire",
-                  "base_tryacquire",
-                  "base_acquire_read",
-                  "base_tryacquire_read",
-                  "base_acquire_write",
-                  "base_tryacquire_write");
-
-# this is called "perf_thrno"
-@Perf_Thr_Number_List = ("perf_t1",
-                         "perf_t2",
-                         "perf_t4",
-                         "perf_t8",
-                         "perf_t16",
-                         "perf_t32",
-                         "perf_t64");
-
-@Target = @Null_List;
-
-while ( $#ARGV >= 0  &&  $ARGV[0] =~ /^-/ )
-{
-    if ($ARGV[0] eq '-d')       # Run debug mode
-    {
-        $name = "debug";
-    }
-    elsif ($ARGV[0] eq '-p')    # Debug perl script
-    {
-        $debug = 1;
-        print "debug perl scirpt\n";
-    }
-    elsif ($ARGV[0] eq '-D')    # Subdir name to put the result
-    {
-        shift;
-        $result_dir = $ARGV[0];
-    }
-    elsif ($ARGV[0] eq '-S')    # Subdir to svc.conf files.
-    {
-        shift;
-        $svcconf_dir = $ARGV[0];
-    }
-    elsif ($ARGV[0] eq '-N')    # Specify test name.
-    {
-        shift;
-        if ($ARGV[0] eq "baseline")
-        {
-            @Target = @Baseline_List;
-        }
-        elsif ($ARGV[0] eq "perf_thrno")
-        {
-            @Target = @Perf_Thr_Number_List;
-        }
-        else
-        {
-            die "Unknown test \"$ARGV[0]\"\n";
-        }
-    }
-    else
-    {
-        warn "$0:  unknown option $ARGV[0]\n";
-        die $usage;
-    }
-    shift;
-}
-
-die "You must specify a test to run\n" if (scalar (@Target) == 0);
-
-if ($Win32 != 0)
-{
-    $execname = "$name\\$EXE";
-    $DIR_SEPARATOR = '\\';
-}
-else
-{
-    $execname = "./$EXE";       # Notice that on UNIX, you much build
-                                # Debug/Release program explicitly
-                                # before running the script.
-    $DIR_SEPARATOR = '/';
-}
-
-for ($Cntr = 0; $Cntr < scalar (@Target); $Cntr++)
-{
-    $Redirect_Output = "$result_dir$DIR_SEPARATOR$Target[$Cntr].$name";
-    if ($debug != 0)             # Only redirect output in actual run
-    {
-        print "Redirectling output to $Redirect_Output\n";
-    }
-    else
-    {
-        open STDOUT, "> $Redirect_Output";
-        open STDERR, ">&STDOUT";
-    }
-
-    @args = ("$execname",
-             "-f",
-             "$svcconf_dir$DIR_SEPARATOR$Target[$Cntr]$conf_ext");
-
-    if ($debug != 0)
-    {
-        print "Debug mode: Executing -- ";
-        for ($args_c = 0; $args_c < scalar (@args); $args_c ++)
-        {
-            print "$args[$args_c] ";
-        }
-        print "\n";
-    }
-    else
-    {
-        system (@args);
-    }
-}
diff --git a/performance-tests/Synch-Benchmarks/svc.conf b/performance-tests/Synch-Benchmarks/svc.conf
new file mode 100644
index 00000000000..ed597347f4c
--- /dev/null
+++ b/performance-tests/Synch-Benchmarks/svc.conf
@@ -0,0 +1,27 @@
+# Dynamically configure all the tests
+
+dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() ""
+dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-m 1 -i 30000"
+dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-m 30000 -i 30000000"
+dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-m 30000 -i 30000000"
+#dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-m 3000 -i 30000000"
+
+
+#dynamic Performance_Test Service_Object * Perf_Test/Perf_Test:_make_Performance_Test() "-s 3"
+#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Test:_make_SYSVSema_Test()
+#dynamic Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_Mutex_Test()
+#dynamic Adaptive_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
+#dynamic Recursive_Lock_Test Service_Object * Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
+#dynamic Adaptive_Recursive_Lock_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
+#dynamic Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Sema_Test()
+#dynamic Adaptive_Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
+#dynamic RWRD_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWRD_Test()
+#dynamic RWWR_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWWR_Test()
+#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Test:_make_SYSVSema_Test()
+#dynamic Context_Test Service_Object * Perf_Test/Perf_Test:_make_Context_Test()
+# dynamic Memory_Test Service_Object  * Perf_Test/Perf_Test:_make_Memory_Test()
+# dynamic Pipe_Thr_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Thr_Test()
+# dynamic Pipe_Proc_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Proc_Test()
+# The following two tests don't work correctly yet...
+# dynamic Condition_Broadcast_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Brdcast_Test()
+# dynamic Condition_Signal_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Signal_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_acquire.conf b/performance-tests/Synch-Benchmarks/svcconf/base_acquire.conf
deleted file mode 100644
index 2727bac4e73..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_acquire.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline acquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() ""
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_acquire_read.conf b/performance-tests/Synch-Benchmarks/svcconf/base_acquire_read.conf
deleted file mode 100644
index 9e25160b8d8..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_acquire_read.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline acquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() ""
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000 -r"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000 -r"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_acquire_write.conf b/performance-tests/Synch-Benchmarks/svcconf/base_acquire_write.conf
deleted file mode 100644
index 147e04574ca..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_acquire_write.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline acquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() ""
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000 -w"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000 -w"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire.conf b/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire.conf
deleted file mode 100644
index 91f78275ffa..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline tryacquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() "-t -v"
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_read.conf b/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_read.conf
deleted file mode 100644
index d300b3b462f..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_read.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline tryacquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() "-t -v"
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000 -r"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000 -r"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000 -r"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000 -r"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_write.conf b/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_write.conf
deleted file mode 100644
index d220d4ecbd5..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/base_tryacquire_write.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id$
-# Benchmark baseline tryacquire operation.
-
-dynamic Baseline_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Test() "-t -v"
-dynamic Baseline_Base_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Base_Test() "-i 10000000 -w"
-dynamic Baseline_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Null_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Null_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Thread_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Thread_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_RW_Process_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_RW_Process_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_RW_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_RW_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Recursive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Adaptive_Recursive_Mutex_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Adaptive_Recursive_Mutex_Test() "-i 10000000 -w"
-dynamic Baseline_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Process_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Process_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Null_Semaphore_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Null_Semaphore_Test() "-i 10000000 -w"
-dynamic Baseline_Token_Test Service_Object * Base_Test/Base_Test:_make_Baseline_Token_Test() "-i 10000000 -w"
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf
deleted file mode 100644
index 1c4c2ad2f01..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t1.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 1"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf
deleted file mode 100644
index f50ae6f4544..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t16.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 16"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf
deleted file mode 100644
index cc08f483a73..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t2.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 2"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf
deleted file mode 100644
index c12d3dc752b..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t32.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 32"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf
deleted file mode 100644
index 2d6661d36e1..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t4.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 4"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf
deleted file mode 100644
index 0bf358d0191..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t64.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 64"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf b/performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf
deleted file mode 100644
index cbfe7062fa8..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/perf_t8.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Performance_Test() "-s 60 -N -B -t 8"
-dynamic Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-dynamic Adaptive_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-dynamic Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-dynamic Adaptive_Recursive_Lock_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-dynamic Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Sema_Test()
-dynamic Adaptive_Semaphore_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-dynamic RWRD_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWRD_Test()
-dynamic RWWR_Mutex_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_RWWR_Test()
-dynamic Token_Test
-        Service_Object *
-        Perf_Test/Perf_Test:_make_Token_Test()
diff --git a/performance-tests/Synch-Benchmarks/svcconf/svc.conf b/performance-tests/Synch-Benchmarks/svcconf/svc.conf
deleted file mode 100644
index ec2d85fbcbf..00000000000
--- a/performance-tests/Synch-Benchmarks/svcconf/svc.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Dynamically configure all the tests
-
-dynamic Performance_Test
-        Service_Object
-        *
-        Perf_Test/Perf_Test:_make_Performance_Test()
-        "-s 3 -t 4"
-dynamic Mutex_Test Service_Object
-        *
-        Perf_Test/Perf_Test:_make_Mutex_Test()
-#dynamic Guard_Test Service_Object * Perf_Test/Perf_Test:_make_Guard_Test() "-g"
-#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Test:_make_SYSVSema_Test()
-#dynamic Adaptive_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Mutex_Test()
-#dynamic Recursive_Lock_Test Service_Object * Perf_Test/Perf_Test:_make_Recursive_Lock_Test()
-#dynamic Adaptive_Recursive_Lock_Test Service_Object *
-#   Perf_Test/Perf_Test:_make_Adaptive_Recursive_Lock_Test()
-#dynamic Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Sema_Test()
-#dynamic Adaptive_Semaphore_Test Service_Object * Perf_Test/Perf_Test:_make_Adaptive_Sema_Test()
-#dynamic RWRD_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWRD_Test()
-#dynamic RWWR_Mutex_Test Service_Object * Perf_Test/Perf_Test:_make_RWWR_Test()
-#dynamic Token_Test Service_Object * Perf_Test/Perf_Test:_make_Token_Test()
-#dynamic SYSVSema_Test Service_Object * Perf_Test/Perf_Test:_make_SYSVSema_Test()
-#dynamic Context_Test Service_Object * Perf_Test/Perf_Test:_make_Context_Test()
-# dynamic Memory_Test Service_Object  * Perf_Test/Perf_Test:_make_Memory_Test()
-#dynamic Pipe_Thr_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Thr_Test()
-# dynamic Pipe_Proc_Test Service_Object * Perf_Test/Perf_Test:_make_Pipe_Proc_Test()
-# The following two tests don't work correctly yet...
-#dynamic Condition_Broadcast_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Brdcast_Test()
-#dynamic Condition_Signal_Test Service_Object * Perf_Test/Perf_Test:_make_Cond_Signal_Test()
diff --git a/performance-tests/Synch-Benchmarks/synch_driver.dsp b/performance-tests/Synch-Benchmarks/synch_driver.dsp
index df1ff0803ec..4300bfaaf4e 100644
--- a/performance-tests/Synch-Benchmarks/synch_driver.dsp
+++ b/performance-tests/Synch-Benchmarks/synch_driver.dsp
@@ -24,8 +24,7 @@ CFG=synch_driver - Win32 Release
 # Begin Project

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

-# PROP Scc_LocalPath "Desktop"

-# PROP WCE_FormatVersion ""

+# PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

 

@@ -38,8 +37,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ".\synch_driver"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "Release"

-# PROP Intermediate_Dir "Release"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\synch_driver"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

@@ -62,8 +61,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ".\synch_driver"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "Debug"

-# PROP Intermediate_Dir "Debug"

+# PROP Output_Dir "."

+# PROP Intermediate_Dir ".\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\synch_driver"

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c

diff --git a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
index 11f6d16bad5..189748a2cbe 100644
--- a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
+++ b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp
@@ -82,7 +82,6 @@ ACE_INET_Addr address;
 #define bzero(b1,n)             memset(b1,0,n)
 #include <sys/times.h>
 #include <sys/param.h>
-
 struct rusage
   {
     struct timeval ru_utime, ru_stime;
@@ -194,10 +193,8 @@ int mread (int fd, register char *bufp, unsigned n);
 int Nread (ACE_SOCK_Stream &s, void *buf, int count);
 int Nwrite (ACE_SOCK_Stream &s, void *buf, int count);
 
-#if !defined (__cplusplus) 
+#if !defined (__cplusplus)
 typedef void (*SIG_TYP)(); 
-#else
-typedef void (*SIG_TYP)(int);
 #endif 
 
 #ifdef SVR4
@@ -210,11 +207,6 @@ sigpipe ()
 {
 }
 
-void sigpipe(int foo)
-{
-   printf("Caught signal %d\n", foo);
-}
-
 char *title = 0;
 int new_line = 0;
 
@@ -225,7 +217,6 @@ main (int argc, char *argv[])
   unsigned long addr_tmp;
   int c;
 
-  printf("HZ = %d\n", HZ);
   if (argc < 2)
     goto usage;
 
@@ -378,6 +369,12 @@ main (int argc, char *argv[])
       /* the transmitter will set options and connect to receiver */
       if (trans)
 	{
+	  if (connector_factory.connect (connection_stream, address) == -1)
+	    perror ("connection failed"), exit (1);
+	  fprintf (stdout,
+		   "ttcp-t: data_buf_len=%d, nbuf=%d, align=%d/%d, port=%d",
+		   data_buf_len, nbuf, bufalign, bufoffset, port);
+
 	  // turn off weird ack things
 	  if (nodelay)
 	    {
@@ -390,12 +387,6 @@ main (int argc, char *argv[])
 		err ("setsockopt: nodelay");
 	      mes ("nodelay");
 	    }
-	  if (connector_factory.connect (connection_stream, address) == -1)
-	    perror ("connection failed"), exit (1);
-	  fprintf (stdout,
-		   "ttcp-t: data_buf_len=%d, nbuf=%d, align=%d/%d, port=%d",
-		   data_buf_len, nbuf, bufalign, bufoffset, port);
-
 	  if (sockbufsize)
 	    {
 	      if (connection_stream.set_option (SOL_SOCKET,
@@ -413,6 +404,13 @@ main (int argc, char *argv[])
 	  if (acceptor_factory.open (address, 1) == -1)
 	    perror ("acceptor open"), exit (1);
 
+	  ACE_INET_Addr remote_address;
+
+	  if (acceptor_factory.accept (connection_stream, 
+				       (ACE_Addr *) &remote_address) == -1)
+	    perror ("acceptor accept"), exit (1);
+
+	  // set the window size
 	  if (sockbufsize)
 		{
 		  if (connection_stream.set_option (SOL_SOCKET,
@@ -423,14 +421,6 @@ main (int argc, char *argv[])
 		  mes ("rcvbuf");
 		}
 
-	  ACE_INET_Addr remote_address;
-
-	  if (acceptor_factory.accept (connection_stream, 
-				       (ACE_Addr *) &remote_address) == -1)
-	    perror ("acceptor accept"), exit (1);
-
-	  // set the window size
-
 	  fprintf (stderr, "ttcp-r: accept from %s\n", remote_address.get_host_name());
 	}
     }
@@ -473,7 +463,6 @@ main (int argc, char *argv[])
 	  if (ack != data_buf_len)
 	    ACE_DEBUG ((LM_DEBUG, "%received ack for only %d bytes\n", ack));
 	}
-        printf("Client finished. \n");
     }
   else
     {
@@ -513,12 +502,11 @@ main (int argc, char *argv[])
 	    ACE_ERROR_RETURN ((LM_ERROR, "%p send ack failed\n",
 			       "ttcp"), -1);
 	}
-        printf("Server finished. \n");
     }
 
-  /*  if (errno)
+  if (errno)
     err ("IO");
-    */
+
   //
   // stop the timer
   //
@@ -676,15 +664,11 @@ prep_timer ()
 {
   itime0.it_interval.tv_sec = 0;
   itime0.it_interval.tv_usec = 0;
-  //  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
-  itime0.it_value.tv_sec = 3600;
+  itime0.it_value.tv_sec = LONG_MAX / 22;	/* greatest possible value , itimer() count backwards */
   itime0.it_value.tv_usec = 0;
 
 
   getrusage (RUSAGE_SELF, &ru0);
-  fprintf(stdout, "\n");
-  fprintf(stdout, "beginning user time = %d sec and %d usec\n", ru0.ru_utime.tv_sec, ru0.ru_utime.tv_usec);
-  fprintf(stdout, "beginning sys time = %d sec and %d usec\n", ru0.ru_stime.tv_sec, ru0.ru_stime.tv_usec);
 
   /* Init REAL Timer */
   if (setitimer (ITIMER_REAL, &itime0, NULL))
@@ -692,7 +676,7 @@ prep_timer ()
       perror ("Setting 'itimer' REAL failed");
       return;
     }
-  fprintf(stdout, "Beginning transaction time = %d sec and %d usec\n", itime0.it_value.tv_sec, itime0.it_value.tv_usec); 
+
 }
 
 /*
@@ -709,16 +693,13 @@ read_timer (char *str, int len)
   char line[132];
 
   getrusage (RUSAGE_SELF, &ru1);
-  fprintf(stdout, "final user time = %d sec and %d usec\n", ru1.ru_utime.tv_sec, ru1.ru_utime.tv_usec);
-  fprintf(stdout, "final sys time = %d sec and %d usec\n", ru1.ru_stime.tv_sec, ru1.ru_stime.tv_usec);
 
   if (getitimer (ITIMER_REAL, &itimedol))
     {
       perror ("Getting 'itimer' REAL failed");
       return (0.0);
-
     }
-  fprintf(stdout, "End transaction time = %d sec and %d usec\n", itimedol.it_value.tv_sec, itimedol.it_value.tv_usec);
+
   prusage (&ru0, &ru1, &itime0.it_value, &itimedol.it_value, line);
   (void) strncpy (str, line, len);
 
@@ -738,7 +719,7 @@ read_timer (char *str, int len)
 
 static void
 prusage (register struct rusage *r0, struct rusage *r1, 
-	 struct timeval *b, struct timeval *e,  char *outp)
+	 struct timeval *e, struct timeval *b, char *outp)
 {
   struct timeval tdiff;
   register time_t t;
@@ -746,11 +727,11 @@ prusage (register struct rusage *r0, struct rusage *r1,
   register int i;
   int ms;
 
-  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 1000 +
-    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 100000 +
-    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 1000 +
-    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 100000;
-  ms = -((e->tv_sec - b->tv_sec) * 1000 + (e->tv_usec - b->tv_usec) / 1000);/* in milliseconds */
+  t = (r1->ru_utime.tv_sec - r0->ru_utime.tv_sec) * 100 +
+    (r1->ru_utime.tv_usec - r0->ru_utime.tv_usec) / 10000 +
+    (r1->ru_stime.tv_sec - r0->ru_stime.tv_sec) * 100 +
+    (r1->ru_stime.tv_usec - r0->ru_stime.tv_usec) / 10000;
+  ms = (e->tv_sec - b->tv_sec) * 100 + (e->tv_usec - b->tv_usec) / 10000;
 
 #define END(x)  {while(*x) x++;}
 #if defined(SYSV)
@@ -759,8 +740,7 @@ prusage (register struct rusage *r0, struct rusage *r1,
 #if defined(sgi)		/* IRIX 3.3 will show 0 for %M,%F,%R,%C */
   cp = "%Uuser %Ssys %Ereal %P %Mmaxrss %F+%Rpf %Ccsw";
 #else
-  cp = "%Uutime %Sstime %Edtime %P cpu occupancy";
-  /*  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";*/
+  cp = "%Uuser %Ssys %Ereal %P %Xi+%Dd %Mmaxrss %F+%Rpf %Ccsw";
 #endif
 #endif
   for (; *cp; cp++)
@@ -773,25 +753,23 @@ prusage (register struct rusage *r0, struct rusage *r1,
 
 	  case 'U':
 	    tvsub (&tdiff, &r1->ru_utime, &r0->ru_utime);
-	    /*	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec);*/
-            sprintf (outp, "%f", (tdiff.tv_sec + tdiff.tv_usec/1000000.0));
+	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
 	    END (outp);
 	    break;
 
 	  case 'S':
 	    tvsub (&tdiff, &r1->ru_stime, &r0->ru_stime);
-	    /*	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec);*/
-            sprintf (outp, "%f", (tdiff.tv_sec + tdiff.tv_usec/1000000.0));
+	    sprintf (outp, "%d.%01d", tdiff.tv_sec, tdiff.tv_usec / 100000);
 	    END (outp);
 	    break;
 
 	  case 'E':
-	    psecs (ms / 1000, outp);
+	    psecs (ms / 100, outp);
 	    END (outp);
 	    break;
 
 	  case 'P':
-	    sprintf (outp, "%f%%",  (t * 100.0 / ((ms ? ms : 1))));
+	    sprintf (outp, "%d%%", (int) (t * 100 / ((ms ? ms : 1))));
 	    END (outp);
 	    break;
 
@@ -883,22 +861,21 @@ psecs (long l, register char *cp)
   i = l / 3600;
   if (i)
     {
-      sprintf (cp, "%d hours", i);
+      sprintf (cp, "%d:", i);
       END (cp);
       i = l % 3600;
-      sprintf (cp, "%d minutes ", (i / 60));
-      sprintf (cp, "%d seconds ", (i % 60));
+      sprintf (cp, "%d%d", (i / 60) / 10, (i / 60) % 10);
       END (cp);
     }
   else
     {
       i = l;
-      sprintf (cp, "%d minutes ", i / 60);
+      sprintf (cp, "%d", i / 60);
       END (cp);
     }
   i %= 60;
   *cp++ = ':';
-  sprintf (cp, "%d seconds ", i);
+  sprintf (cp, "%d%d", i / 10, i % 10);
 }
 
 /*
@@ -964,4 +941,3 @@ mread (int fd, register char *bufp, unsigned n)
 
   return ((int) count);
 }
-
diff --git a/performance-tests/UDP/Makefile b/performance-tests/UDP/Makefile
index adcc785006d..8d2d1bd17e8 100644
--- a/performance-tests/UDP/Makefile
+++ b/performance-tests/UDP/Makefile
@@ -45,6 +45,9 @@ include	$(ACE_ROOT)/include/makeinclude/rules.local.GNU
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
diff --git a/tests/ACE_Init_Test.cpp b/tests/ACE_Init_Test.cpp
deleted file mode 100644
index ddce650bdc7..00000000000
--- a/tests/ACE_Init_Test.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// $Id$
-//
-// ACE_Init_Test
-//
-// This is a Win32-only test for verifying that the ACE dll initializes itself
-// without having a nonstatic object manager present by way of a console app's
-// main function.  It's a MFC dialog app - it pops up a dialog and spawns a
-// thread - the thread will wait 2 seconds and programatically dismiss the
-// dialog box.  The main thread waits for the other one to exit, and that's
-// the test.  If the ACE DLL doesn't initialize correctly, it will go boom!
-//
-// This test program was initially generated from MSVC AppWizard, then some
-// files were renamed and moved around to fit in with the ACE test directory
-// structure.
-//
-// ACE_Init_Test.cpp : Defines the class behaviors for the application.
-//
-
-#include "ace/Thread_Manager.h"
-#include "ACE_Init_Test_StdAfx.h"
-#include "ACE_Init_Test.h"
-#include "ACE_Init_TestDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-static void * wait_and_kill_dialog (void *pBox);
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestApp
-
-BEGIN_MESSAGE_MAP(CACE_Init_TestApp, CWinApp)
-        //{{AFX_MSG_MAP(CACE_Init_TestApp)
-                // NOTE - the ClassWizard will add and remove mapping macros here.
-                //    DO NOT EDIT what you see in these blocks of generated code!
-        //}}AFX_MSG
-        ON_COMMAND(ID_HELP, CWinApp::OnHelp)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestApp construction
-
-CACE_Init_TestApp::CACE_Init_TestApp()
-{
-        // TODO: add construction code here,
-        // Place all significant initialization in InitInstance
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only CACE_Init_TestApp object
-
-CACE_Init_TestApp theApp;
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestApp initialization
-
-BOOL CACE_Init_TestApp::InitInstance()
-{
-
-  // This is needed because there's no overridden main(int, char *[])
-  // which would normally handle the initialization.  Also see the
-  // corresponding ACE::fini, below.
-  ACE::init();
-
-  CACE_Init_TestDlg dlg;
-  m_pMainWnd = &dlg;
-  ACE_Thread_Manager::instance()->spawn (wait_and_kill_dialog,
-					 m_pMainWnd);
-  int nResponse = dlg.DoModal();
-  if (nResponse == IDOK)
-    {
-      // TODO: Place code here to handle when the dialog is
-      //  dismissed with OK
-    }
-  else if (nResponse == IDCANCEL)
-    {
-      // TODO: Place code here to handle when the dialog is
-      //  dismissed with Cancel
-    }
-
-  ACE_Thread_Manager::instance()->wait();
-
-  // Since the dialog has been closed, return FALSE so that we exit the
-  //  application, rather than start the application's message pump.
-  ACE::fini();
-
-  return FALSE;
-}
-
-
-// This function runs in a separate thread - it will wait a couple of seconds
-// and then programatically dismiss the dialog box.  If ACE is not properly
-// initialized, we will have crashed before getting here.
-static void *
-wait_and_kill_dialog (void *pBox)
-{
-
-    CACE_Init_TestDlg *pDialog = ACE_reinterpret_cast (CACE_Init_TestDlg *,
-                                                       pBox);
-    ACE_OS::sleep(2);
-    pDialog->EndDialog (IDOK);
-    return 0;
-
-}
diff --git a/tests/ACE_Init_Test.dsp b/tests/ACE_Init_Test.dsp
deleted file mode 100644
index 0605eb36ec3..00000000000
--- a/tests/ACE_Init_Test.dsp
+++ /dev/null
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ACE_Init_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Application" 0x0101

-

-CFG=ACE_Init_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 "ACE_Init_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 "ACE_Init_Test.mak" CFG="ACE_Init_Test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "ACE_Init_Test - Win32 Debug" (based on "Win32 (x86) Application")

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-MTL=midl.exe

-RSC=rc.exe

-# PROP BASE Use_MFC 6

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Debug"

-# PROP BASE Intermediate_Dir "Debug"

-# PROP BASE Target_Dir ""

-# PROP Use_MFC 6

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL\Debug"

-# PROP Intermediate_Dir ".\DLL\Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_AFXDLL" /D ACE_HAS_MFC=1 /FD /c

-# SUBTRACT CPP /YX /Yc /Yu

-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32

-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-# ADD RSC /l 0x409 /fo"./ACE_Init_Test.res" /d "_DEBUG" /d "_AFXDLL"

-BSC32=bscmake.exe

-# ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo /o"./ACE_Init_Test.bsc"

-LINK32=link.exe

-# ADD BASE LINK32 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:windows /pdb:"./ACE_Init_Test.pdb" /debug /machine:I386 /out:"./ACE_Init_Test.exe" /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT LINK32 /pdb:none

-# Begin Target

-

-# Name "ACE_Init_Test - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test.rc

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_TestDlg.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test_Resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test_StdAfx.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_TestDlg.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"

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test.ico

-# End Source File

-# Begin Source File

-

-SOURCE=.\ACE_Init_Test.rc2

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/tests/ACE_Init_Test.h b/tests/ACE_Init_Test.h
deleted file mode 100644
index bfe7f784a81..00000000000
--- a/tests/ACE_Init_Test.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-//
-// ACE_Init_Test.h : main header file for the ACE_INIT_TEST application
-//
-
-#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
-#pragma once
-#endif // _MSC_VER >= 1000
-
-#ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
-#endif
-
-#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
-{
-public:
-	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()
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
-
-//{{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_)
diff --git a/tests/ACE_Init_Test.ico b/tests/ACE_Init_Test.ico
deleted file mode 100644
index 7eef0bcbe65..00000000000
--- a/tests/ACE_Init_Test.ico
+++ /dev/null
diff --git a/tests/ACE_Init_Test.rc b/tests/ACE_Init_Test.rc
deleted file mode 100644
index c6ab2e54233..00000000000
--- a/tests/ACE_Init_Test.rc
+++ /dev/null
@@ -1,174 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "ACE_Init_Test_Resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif\r\n"
-    "#include ""res\\ACE_Init_Test.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "ACE_Init_Test.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ACE_INIT_TEST_DIALOG DIALOGEX 0, 0, 185, 92
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_APPWINDOW
-CAPTION "ACE_Init_Test"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,128,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,128,23,50,14
-    LTEXT           "This box will auto-dismiss.",IDC_STATIC,13,7,113,
-                    8
-END
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "ACE_Init_Test MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "ACE_Init_Test\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ACE_Init_Test.EXE\0"
-            VALUE "ProductName", "ACE_Init_Test Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_ACE_INIT_TEST_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 178
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 85
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif
-#include "ACE_Init_Test.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/tests/ACE_Init_Test.rc2 b/tests/ACE_Init_Test.rc2
deleted file mode 100644
index 91f5498d5c9..00000000000
--- a/tests/ACE_Init_Test.rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// ACE_INIT_TEST.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-	#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/tests/ACE_Init_Test.res b/tests/ACE_Init_Test.res
deleted file mode 100644
index 7bfbac8465d..00000000000
--- a/tests/ACE_Init_Test.res
+++ /dev/null
diff --git a/tests/ACE_Init_TestDlg.cpp b/tests/ACE_Init_TestDlg.cpp
deleted file mode 100644
index 7251c5dedcc..00000000000
--- a/tests/ACE_Init_TestDlg.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-// ACE_Init_TestDlg.cpp : implementation file
-//
-
-#include "ACE_Init_Test_StdAfx.h"
-#include "ACE_Init_Test.h"
-#include "ACE_Init_TestDlg.h"
-
-#ifdef _DEBUG
-#define new DEBUG_NEW
-#undef THIS_FILE
-static char THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestDlg dialog
-
-CACE_Init_TestDlg::CACE_Init_TestDlg(CWnd* pParent /*=NULL*/)
-	: CDialog(CACE_Init_TestDlg::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CACE_Init_TestDlg)
-		// NOTE: the ClassWizard will add member initialization here
-	//}}AFX_DATA_INIT
-	// Note that LoadIcon does not require a subsequent DestroyIcon in Win32
-	m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME);
-}
-
-void CACE_Init_TestDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CACE_Init_TestDlg)
-		// NOTE: the ClassWizard will add DDX and DDV calls here
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CACE_Init_TestDlg, CDialog)
-	//{{AFX_MSG_MAP(CACE_Init_TestDlg)
-	ON_WM_PAINT()
-	ON_WM_QUERYDRAGICON()
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestDlg message handlers
-
-BOOL CACE_Init_TestDlg::OnInitDialog()
-{
-	CDialog::OnInitDialog();
-
-	// Set the icon for this dialog.  The framework does this automatically
-	//  when the application's main window is not a dialog
-	SetIcon(m_hIcon, TRUE);			// Set big icon
-	SetIcon(m_hIcon, FALSE);		// Set small icon
-
-	// TODO: Add extra initialization here
-
-	return TRUE;  // return TRUE  unless you set the focus to a control
-}
-
-// If you add a minimize button to your dialog, you will need the code below
-//  to draw the icon.  For MFC applications using the document/view model,
-//  this is automatically done for you by the framework.
-
-void CACE_Init_TestDlg::OnPaint()
-{
-	if (IsIconic())
-	{
-		CPaintDC dc(this); // device context for painting
-
-		SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
-
-		// Center icon in client rectangle
-		int cxIcon = GetSystemMetrics(SM_CXICON);
-		int cyIcon = GetSystemMetrics(SM_CYICON);
-		CRect rect;
-		GetClientRect(&rect);
-		int x = (rect.Width() - cxIcon + 1) / 2;
-		int y = (rect.Height() - cyIcon + 1) / 2;
-
-		// Draw the icon
-		dc.DrawIcon(x, y, m_hIcon);
-	}
-	else
-	{
-		CDialog::OnPaint();
-	}
-}
-
-// The system calls this to obtain the cursor to display while the user drags
-//  the minimized window.
-HCURSOR CACE_Init_TestDlg::OnQueryDragIcon()
-{
-	return (HCURSOR) m_hIcon;
-}
diff --git a/tests/ACE_Init_TestDlg.h b/tests/ACE_Init_TestDlg.h
deleted file mode 100644
index af5ae31319d..00000000000
--- a/tests/ACE_Init_TestDlg.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-// ACE_Init_TestDlg.h : header file
-//
-
-#if !defined(AFX_ACE_INIT_TESTDLG_H__64FDCA00_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
-#define AFX_ACE_INIT_TESTDLG_H__64FDCA00_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_
-
-#if _MSC_VER >= 1000
-#pragma once
-#endif // _MSC_VER >= 1000
-
-/////////////////////////////////////////////////////////////////////////////
-// CACE_Init_TestDlg dialog
-
-class CACE_Init_TestDlg : public CDialog
-{
-// Construction
-public:
-	CACE_Init_TestDlg(CWnd* pParent = NULL);	// standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(CACE_Init_TestDlg)
-	enum { IDD = IDD_ACE_INIT_TEST_DIALOG };
-		// NOTE: the ClassWizard will add data members here
-	//}}AFX_DATA
-
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CACE_Init_TestDlg)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);	// DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-	HICON m_hIcon;
-
-	// Generated message map functions
-	//{{AFX_MSG(CACE_Init_TestDlg)
-	virtual BOOL OnInitDialog();
-	afx_msg void OnPaint();
-	afx_msg HCURSOR OnQueryDragIcon();
-	//}}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_TESTDLG_H__64FDCA00_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
diff --git a/tests/ACE_Init_Test_Resource.h b/tests/ACE_Init_Test_Resource.h
deleted file mode 100644
index e32f29d5a6b..00000000000
--- a/tests/ACE_Init_Test_Resource.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ACE_INIT_TEST.RC
-//
-#define IDR_MAINFRAME					128
-#define IDD_ACE_INIT_TEST_DIALOG				102
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-
-#define _APS_NEXT_RESOURCE_VALUE        129
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1000
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/tests/ACE_Init_Test_StdAfx.h b/tests/ACE_Init_Test_StdAfx.h
deleted file mode 100644
index d11f7c7efce..00000000000
--- a/tests/ACE_Init_Test_StdAfx.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-// stdafx.h : include file for standard system include files,
-//  or project specific include files that are used frequently, but
-//      are changed infrequently
-//
-
-#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
-
-#define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-
-#include <afxwin.h>         // MFC core and standard components
-#include <afxext.h>         // MFC extensions
-#ifndef _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.
-
-#endif // !defined(AFX_STDAFX_H__64FDCA02_F7F9_11D2_89B6_00A024CC68DB__INCLUDED_)
diff --git a/tests/Aio_Platform_Test.cpp b/tests/Aio_Platform_Test.cpp
index 5b839234953..3dc5b153417 100644
--- a/tests/Aio_Platform_Test.cpp
+++ b/tests/Aio_Platform_Test.cpp
@@ -5,11 +5,10 @@
 //    aio_platform_test.cpp
 //
 // =  DESCRITPTION
-//     Testing the platform for POSIX Asynchronous I/O. Basically
-//     prints the predefined constants and also checks for their run
-//     time values. If this test succeeds further tests at
-//     $ACE_ROOT/examples/Reactor/Proactor can be used to test the
-//     features further.
+//     Testing the platform for POSIX Asynchronous I/O. If
+//     ACE_HAS_AIO_CALLS is defined, we also test the POSIX <aio_>
+//     calls with real time signals on. We dont test the things with
+//     aio_suspend.  
 //
 // = AUTHOR
 //    Programming for the Real World. Bill O. GallMeister.
@@ -18,7 +17,7 @@
 // =====================================================================
 
 #include "test_config.h"
-#include "ace/Log_Msg.h"
+#include "ace/OS.h"
 
 ACE_RCSID(tests, Aio_Platform_Test, "$Id$")
 
@@ -27,22 +26,38 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
+#include "ace/Message_Block.h"
+
+#if defined (ACE_HAS_AIO_CALLS)
+static ACE_HANDLE file_handle = ACE_INVALID_HANDLE;
+static ACE_Message_Block mb1 (BUFSIZ + 1);
+static ACE_Message_Block mb2 (BUFSIZ + 1);
+static aiocb aiocb1;
+static aiocb aiocb2;
+static sigset_t completion_signal;
+
+// Function prototypes.
+static int have_asynchio (void);
+static int query_aio_completions (void);
+static int issue_aio_calls (void);
+static int setup_signal_delivery (void);
+static int test_aio_calls (void);
+#endif /* ACE_HAS_AIO_CALLS */
+
 #if defined (_POSIX_ASYNCHRONOUS_IO)
 static int do_sysconf (void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "Doing <sysconf> calls to know the run-time values of POSIX feature limits\n"));
-  
   // Call sysconf to find out runtime values.
+  
   errno = 0;
 #if defined (_SC_LISTIO_AIO_MAX)
   ACE_DEBUG ((LM_DEBUG,
-              "Runtime value of LISTIO_AIO_MAX is %d, errno = %d, Minimum is 2\n",
+              "Runtime value of LISTIO_AIO_MAX is %d, errno = %d\n",
               ACE_OS::sysconf (_SC_LISTIO_AIO_MAX),
               errno));
 #elif defined (_SC_AIO_LISTIO_MAX)
   ACE_DEBUG ((LM_DEBUG,
-              "Runtime value of AIO_LISTIO_MAX is %d, errno = %d, Minimum is 2\n",
+              "Runtime value of AIO_LISTIO_MAX is %d, errno = %d\n",
               ACE_OS::sysconf (_SC_AIO_LISTIO_MAX),
               errno));
 #else
@@ -54,7 +69,7 @@ static int do_sysconf (void)
 #if defined (_SC_AIO_MAX)
   errno = 0;
   ACE_DEBUG ((LM_DEBUG,
-              "Runtime value of AIO_MAX is %d, errno = %d, Minimum is 1\n",
+              "Runtime value of AIO_MAX is %d, errno = %d\n",
               ACE_OS::sysconf (_SC_AIO_MAX),
               errno));
 #else
@@ -88,7 +103,7 @@ static int do_sysconf (void)
 #if defined (_SC_RTSIG_MAX)
   errno = 0;
   ACE_DEBUG ((LM_DEBUG,
-              "Runtime value of RTSIG_MAX %d, Errno = %d, Minimum is 8\n",
+              "Runtime value of RTSIG_MAX %d, Errno = %d\n",
               ACE_OS::sysconf (_SC_RTSIG_MAX),
               errno));
 #else /* Not _SC_RTSIG_MAX */
@@ -99,7 +114,7 @@ static int do_sysconf (void)
 #if defined (_SC_SIGQUEUE_MAX)
   errno = 0;
   ACE_DEBUG ((LM_DEBUG,
-              "Runtime value of SIGQUEUE_MAX %d, Errno = %d, Minimum is 32\n",
+              "Runtime value of SIGQUEUE_MAX %d, Errno = %d\n",
               ACE_OS::sysconf (_SC_SIGQUEUE_MAX),
               errno));
 #else /* Not _SC_SIGQUEUE_MAX */
@@ -110,6 +125,221 @@ static int do_sysconf (void)
 }
 #endif /* _POSIX_ASYNCHRONOUS_IO */
 
+#if defined (ACE_HAS_AIO_CALLS)
+static int
+test_aio_calls (void)
+{
+  ACE_DEBUG ((LM_DEBUG,
+              "test_aio_calls: Errno : %d\n",
+              errno));
+  // Set up the input file.
+  // Open file (in SEQUENTIAL_SCAN mode)
+  file_handle = ACE_OS::open ("Aio_Platform_Test.cpp",
+                              O_RDONLY);
+
+  if (file_handle == ACE_INVALID_HANDLE)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "ACE_OS::open"),
+                      -1);
+
+  if (setup_signal_delivery () < 0)
+    return -1;
+
+  if (issue_aio_calls () < 0)
+    return -1;
+
+  if (query_aio_completions () < 0)
+    return -1;
+
+  return 0;
+}
+
+static int
+setup_signal_delivery (void)
+{
+  // Make the sigset_t consisting of the completion signal.
+  if (sigemptyset (&completion_signal) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p:Couldnt init the RT completion signal set\n"),
+                      -1);
+
+  if (sigaddset (&completion_signal,
+                 SIGRTMIN) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p:Couldnt init the RT completion signal set\n"),
+                      -1);
+
+  // Mask them.
+  if (sigprocmask (SIG_BLOCK, &completion_signal, 0) < 0)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p:Couldnt maks the RT completion signals\n"),
+                      -1);
+
+  // 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 = 0;         // No handler.
+  int sigaction_return = sigaction (SIGRTMIN,
+                                    &reaction,
+                                    0);
+  if (sigaction_return == -1)
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Error:%p:Proactor couldnt do sigaction for the RT SIGNAL"),
+                      -1);
+  return 0;
+}
+
+static int
+issue_aio_calls (void)
+{
+  // Setup AIOCB.
+  aiocb1.aio_fildes = file_handle;
+  aiocb1.aio_offset = 0;
+  aiocb1.aio_buf = mb1.wr_ptr ();
+  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.
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Erro:%p:Asynch_Read_Stream: aio_read queueing failed\n"),
+                      -1);
+
+  // Setup AIOCB.
+  aiocb2.aio_fildes = file_handle;
+  aiocb2.aio_offset = BUFSIZ + 1;
+  aiocb2.aio_buf = mb2.wr_ptr ();
+  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.
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "Erro:%p:Asynch_Read_Stream: aio_read queueing failed\n"),
+                      -1);
+
+  return 0;
+}
+
+static int
+query_aio_completions (void)
+{
+  for (size_t 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 = ACE_INFINITE;
+      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)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Error:%p:Error waiting for RT completion signals\n"),
+                          0);
+
+      // RT completion signals returned.
+      if (sig_return != SIGRTMIN)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unexpected signal (%d) has been received while waiting for RT Completion Signals\n",
+                           sig_return),
+                          -1);
+
+      // @@ Debugging.
+      ACE_DEBUG ((LM_DEBUG,
+                  "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)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Inconsistent signal number (%d) in the signal info block\n",
+                           sig_info.si_signo),
+                          -1);
+
+      // @@ Debugging.
+      ACE_DEBUG ((LM_DEBUG,
+                  "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))
+        ACE_ERROR_RETURN ((LM_DEBUG,
+                           "Unexpected signal code (%d) returned on completion querying\n",
+                           sig_info.si_code),
+                          0);
+
+      // 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)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p:Invalid control block was sent to <aio_error> for compleion querying\n"),
+                          -1);
+
+      if (error_code != 0)
+        // Error occurred in the <aio_>call. Return the errno
+        // corresponding to that <aio_> call.
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p:An AIO call has failed\n"),
+                          error_code);
+
+      // No error occured in the AIO operation.
+      int nbytes = aio_return (aiocb_ptr);
+      if (nbytes == -1)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p:Invalid control block was send to <aio_return>\n"),
+                          -1);
+      if (number_of_compleions == 0)
+        // Print the buffer.
+        ACE_DEBUG ((LM_DEBUG,
+                    "\n Number of bytes transferred : %d\n The buffer : %s \n",
+                    nbytes,
+                    mb1.rd_ptr ()));
+      else
+        // Print the buffer.
+        ACE_DEBUG ((LM_DEBUG,
+                    "\n Number of bytes transferred : %d\n The buffer : %s \n",
+                    nbytes,
+                    mb2.rd_ptr ()));
+    }
+
+  return 0;
+}
+#endif /* ACE_HAS_AIO_CALLS */
+
 static int
 have_asynchio (void)
 {
@@ -129,20 +359,16 @@ have_asynchio (void)
   ACE_ERROR ((LM_DEBUG,
               "_POSIX_ASYNC_IO is not defined.\n"));
   ACE_DEBUG ((LM_DEBUG,
-              "AIO might *not* be supported on all the paths\n"));
+              "AIO might *not* be supported on some paths\n"));
 #endif /* _POSIX_ASYNC_IO */
 
   // System defined POSIX Values.
   ACE_DEBUG ((LM_DEBUG,
               "System claims to have  POSIX_ASYNCHRONOUS_IO\n"));
   ACE_DEBUG ((LM_DEBUG,
-              "Number of operations in one listio: "
-              "Minimum value is 2: "
               "_POSIX_AIO_LISTIO_MAX = %d\n",
               _POSIX_AIO_LISTIO_MAX));
   ACE_DEBUG ((LM_DEBUG,
-              "Number of simultaneous asynchronous I/Os: "
-              "Minimum is 1: "
               "_POSIX_AIO_MAX = %d\n",
               _POSIX_AIO_MAX));
 
@@ -157,7 +383,14 @@ have_asynchio (void)
   // @@ Debugging.
   ACE_DEBUG ((LM_DEBUG,
               "After do_sysconf: Errno : %d\n", errno));
-  
+
+#if defined (ACE_HAS_AIO_CALLS)
+  // Test the aio calls. Issue two <aio_read>s. Assing SIGRTMIN as the
+  // notification signal. Mask these signal from delivery. Receive
+  // this signal by doing <sigtimedwait>.
+  test_aio_calls ();
+#endif /* ACE_HAS_AIO_CALLS */
+
   return 0;
 
 #else /* Not _POSIX_ASYNCHRONOUS_IO */
@@ -167,27 +400,13 @@ have_asynchio (void)
 #endif /* _POSIX_ASYNCHRONOUS_IO */
 }
 
-
-
 int
 main (int, char *[])
 {
   ACE_START_TEST ("Aio_Platform_Test");
-  
-  // Test the #defined and constants and runtime values.
-  errno = 0;
-  if (have_asynchio () == 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Basic test successful"
-                "Check the run time values of the predefined constants\n"
-                "ACE_HAS_AIO_CALLS can be defined for this platform\n"
-                "Further tests at $ACE_ROOT/examples/Reactor/Proactor\n"));
-  else
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "AIO not found.Test failed\n"),
-                      -1);
-  
-  ACE_END_TEST;
 
+  have_asynchio ();
+
+  ACE_END_TEST;
   return 0;
 }
diff --git a/tests/Basic_Types_Test.cpp b/tests/Basic_Types_Test.cpp
index de8bf8d898c..f5c03d68e4c 100644
--- a/tests/Basic_Types_Test.cpp
+++ b/tests/Basic_Types_Test.cpp
@@ -16,24 +16,9 @@
 //
 // ============================================================================
 
-#include "ace/OS.h"
-// Don't use the ACE version accessors in class ACE, so that we can
-// support this test cleanly with the OS component, only.
-#include "ace/Version.h"
-
-#if defined (ACE_HAS_MINIMAL_ACE_OS)
-  // Redefine these macros to allow the test to print out useful info.
-# undef ACE_DEBUG
-# define ACE_DEBUG(x) ACE_OS::fprintf x
-# define LM_DEBUG stdout
-# undef ACE_ERROR
-# define ACE_ERROR(x) ACE_OS::fprintf x
-# define LM_ERROR stderr
-# define ACE_START_TEST(x) ACE_OS::printf (x ASYS_TEXT ("\n"))
-# define ACE_END_TEST
-#else  /* ! ACE_HAS_MINIMAL_ACE_OS */
-# include "test_config.h"
-#endif /* ! ACE_HAS_MINIMAL_ACE_OS */
+#include "test_config.h"
+#include "ace/Log_Msg.h"
+#include "ace/Basic_Types.h"
 
 ACE_RCSID(tests, Basic_Types_Test, "$Id$")
 
@@ -42,9 +27,6 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
-
-typedef void* (*a_function_pointer) (void*);
-
 static
 u_int
 check (const ASYS_TCHAR *message, u_int i, u_int j)
@@ -69,9 +51,9 @@ main (int, ASYS_TCHAR *[])
   ACE_START_TEST (ASYS_TEXT ("Basic_Types_Test"));
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("This is ACE Version %u.%u.%u\n\n"),
-              ACE_MAJOR_VERSION,
-              ACE_MINOR_VERSION,
-              ACE_BETA_VERSION));
+              ACE::major_version (),
+              ACE::minor_version(),
+              ACE::beta_version()));
 
   u_int errors = 0;
 
@@ -99,9 +81,6 @@ main (int, ASYS_TCHAR *[])
                    sizeof (long long),
 #endif /* ! ACE_WIN32 && ! ACE_LACKS_LONGLONG_T */
                    ACE_SIZEOF_LONG_LONG);
-  errors += check (ASYS_TEXT ("sizeof 64-bit literal: %u%s"),
-                   sizeof ACE_UINT64_LITERAL (1),
-                   8);
   errors += check (ASYS_TEXT ("ACE_SIZEOF_VOID_P: %u%s"),
                    sizeof (void *), ACE_SIZEOF_VOID_P);
   errors += check (ASYS_TEXT ("ACE_SIZEOF_FLOAT: %u%s"),
@@ -147,17 +126,6 @@ main (int, ASYS_TCHAR *[])
   errors += check (ASYS_TEXT ("sizeof (ACE_UINT64) is %u%s"),
                    sizeof (ACE_UINT64), 8);
 
-  // ACE assumes sizeof (long) == sizeof (void*)
-  if (sizeof (long) == sizeof (void *))
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("sizeof (long) == sizeof (void*)\n")));
-  else
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("sizeof (long) != sizeof (void*)\n")));
-
-  // ACE assumes sizeof (long) >= sizeof (a_function_pointer)
-  if (sizeof (long) >= sizeof (a_function_pointer))
-    ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("sizeof (long) >= sizeof (a_function_pointer)\n")));
-  else
-    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("sizeof (long) < sizeof (a_function_pointer)\n")));
 
 #if defined (ACE_LITTLE_ENDIAN)
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("little endian\n")));
@@ -174,11 +142,11 @@ main (int, ASYS_TCHAR *[])
 
 #if defined (_SC_PAGESIZE)
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("sysconf page size: %d\n"),
-              (int) ACE_OS::sysconf (_SC_PAGESIZE)));
+              (int) sysconf (_SC_PAGESIZE)));
 #endif /* _SC_PAGESIZE */
 #if defined (_SC_CLK_TCK)
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("clock ticks/sec = %d\n"),
-              (int) ACE_OS::sysconf (_SC_CLK_TCK)));
+              (int) sysconf (_SC_CLK_TCK)));
 #endif /* _SC_CLK_TCK */
 
 
diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp
index 493cab39c42..03bd223e5b8 100644
--- a/tests/Basic_Types_Test.dsp
+++ b/tests/Basic_Types_Test.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # 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 "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

diff --git a/tests/CDR_Test.cpp b/tests/CDR_Test.cpp
index daf453aaa3c..1f427b57d0d 100644
--- a/tests/CDR_Test.cpp
+++ b/tests/CDR_Test.cpp
@@ -35,21 +35,18 @@ struct CDR_Test_Types
 {
   CDR_Test_Types (void);
 
-  ACE_CDR::Octet o;
-  ACE_CDR::Short s;
-  ACE_CDR::Long l;
-  const ACE_CDR::Char *str;
-  ACE_CDR::Double d;
-
-  int test_put (ACE_OutputCDR& cdr);
-  int test_get (ACE_InputCDR& cdr) const;
+  CDR::Octet o;
+  CDR::Short s;
+  CDR::Long l;
+  const CDR::Char *str;
+  CDR::Double d;
 
   enum
   {
     ARRAY_SIZE = 10
   };
 
-  ACE_CDR::Short a[ARRAY_SIZE];
+  CDR::Short a[ARRAY_SIZE];
 };
 
 CDR_Test_Types::CDR_Test_Types (void)
@@ -66,6 +63,124 @@ CDR_Test_Types::CDR_Test_Types (void)
 }
 
 static int
+test_put (ACE_OutputCDR &cdr,
+          CDR_Test_Types &test_types)
+{
+  for (int i = 0; i < n; ++i)
+    {
+      if (cdr.write_octet (test_types.o) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_octet[%d] failed\n",
+                           i),
+                          1);
+      if (cdr.write_short (test_types.s) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_short[%d] failed\n",
+                           i),
+                          1);
+      if (cdr.write_octet (test_types.o) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_octet-2[%d] failed\n",
+                           i),
+                          1);
+      if (cdr.write_long (test_types.l) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_long[%d] failed\n",
+                           i),
+                          1);
+      if (cdr.write_long (test_types.l) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_long-2[%d] failed\n",
+                           i),
+                          1);
+
+      if (cdr.write_string (test_types.str) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "write_string[%d] failed\n",
+                           i),
+                          1);
+
+    }
+
+  return 0;
+}
+
+static int
+test_get (ACE_InputCDR &cdr, const CDR_Test_Types &test_types)
+{
+  CDR::Octet xo;
+  CDR::Short xs;
+  CDR::Long xl;
+
+  for (int i = 0; i < n; ++i)
+    {
+      if (cdr.read_octet (xo) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_octet[%d] failed\n",
+                           i),
+                          1);
+      if (xo != test_types.o)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "octet[%d] differs\n",
+                           i),
+                          1);
+      if (cdr.read_short (xs) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_short[%d] failed\n",
+                           i), 1);
+      if (xs != test_types.s)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "short[%d] differs\n",
+                           i),
+                          1);
+      if (cdr.read_octet (xo) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_octet-2[%d] failed\n",
+                           i),
+                          1);
+      if (xo != test_types.o)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "octet-2[%d] differs\n",
+                           i),
+                          1);
+      if (cdr.read_long (xl) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_long[%d] failed\n",
+                           i),
+                          1);
+      if (xl != test_types.l)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "long[%d] differs\n",
+                           i),
+                          1);
+      if (cdr.read_long (xl) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_long-2[%d] failed\n",
+                           i),
+                          1);
+      if (xl != test_types.l)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "long-2[%d] differs\n",
+                           i),
+                          1);
+
+      CDR::Char *xstr;
+      if (cdr.read_string (xstr) == 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "read_string2[%d] failed\n",
+                           i),
+                          1);
+      ACE_Auto_Basic_Array_Ptr<CDR::Char> auto_xstr (xstr);
+      if (ACE_OS::strcmp (auto_xstr.get (), test_types.str) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "string[%d] differs\n",
+                           i),
+                          1);
+    }
+  return 0;
+}
+
+static int
 short_stream (void)
 {
   // counter
@@ -75,20 +190,20 @@ short_stream (void)
   ACE_OutputCDR os;
 
   // Basic types for output
-  ACE_CDR::Char ch = 'A';
+  CDR::Char ch = 'A';
   ACE_CString str ("Test String");
-  ACE_CDR::Short s = -123;
-  ACE_CDR::UShort us =  123;
-  ACE_CDR::Long l = -65800L;
-  ACE_CDR::ULong ul =  65800UL;
-  ACE_CDR::Float f =  1.23f;
-  ACE_CDR::Double d =  123.456789;
+  CDR::Short s = -123;
+  CDR::UShort us =  123;
+  CDR::Long l = -65800L;
+  CDR::ULong ul =  65800UL;
+  CDR::Float f =  1.23f;
+  CDR::Double d =  123.456789;
 
   // Arrays for output
-  ACE_CDR::Short s_array[3] = { -1, 0, 1 };
-  ACE_CDR::Long l_array[3] = { -345678, 0, 345678 };
-  ACE_CDR::Float f_array[3] = { -1.23f, 0.0f, 1.23f };
-  ACE_CDR::Double d_array[3] = { -123.456789, 0.0, 123.456789 };
+  CDR::Short s_array[3] = { -1, 0, 1 };
+  CDR::Long l_array[3] = { -345678, 0, 345678 };
+  CDR::Float f_array[3] = { -1.23f, 0.0f, 1.23f };
+  CDR::Double d_array[3] = { -123.456789, 0.0, 123.456789 };
 
   ACE_OutputCDR::from_char fc (ch);
   os << fc;
@@ -131,20 +246,20 @@ short_stream (void)
     }
 
   // Basic types for input
-  ACE_CDR::Char ch1 = '\0';
+  CDR::Char ch1 = '\0';
   ACE_CString str1;
-  ACE_CDR::Short s1 = 0;
-  ACE_CDR::UShort us1 = 0;
-  ACE_CDR::Long l1 = 0L;
-  ACE_CDR::ULong ul1 = 0UL;
-  ACE_CDR::Float f1 = 0.0f;
-  ACE_CDR::Double d1 = 0.0;
+  CDR::Short s1 = 0;
+  CDR::UShort us1 = 0;
+  CDR::Long l1 = 0L;
+  CDR::ULong ul1 = 0UL;
+  CDR::Float f1 = 0.0f;
+  CDR::Double d1 = 0.0;
 
   // Arrays for input
-  ACE_CDR::Short s_array1[3];
-  ACE_CDR::Long l_array1[3];
-  ACE_CDR::Float f_array1[3];
-  ACE_CDR::Double d_array1[3];
+  CDR::Short s_array1[3];
+  CDR::Long l_array1[3];
+  CDR::Float f_array1[3];
+  CDR::Double d_array1[3];
 
   ACE_DEBUG ((LM_DEBUG,
               "Checking operators and arrays\n\n"));
@@ -242,6 +357,14 @@ short_stream (void)
   return 0;
 }
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+// Not necessary here, because it's instantiated in ace/Memory_Pool.cpp.
+// template class ACE_Auto_Basic_Array_Ptr<CDR::Char>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+// Not necessary here, because it's instantiated in ace/Memory_Pool.cpp.
+// #pragma instantiate ACE_Auto_Basic_Array_Ptr<CDR::Char>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 int
 main (int argc, ASYS_TCHAR *argv[])
 {
@@ -296,7 +419,7 @@ main (int argc, ASYS_TCHAR *argv[])
       ACE_OutputCDR output;
       CDR_Test_Types test_types;
 
-      if (test_types.test_put (output) != 0)
+      if (test_put (output, test_types) != 0)
         return 1;
 
       ACE_InputCDR input (output);
@@ -314,178 +437,14 @@ main (int argc, ASYS_TCHAR *argv[])
                          64));
         }
 
-      if (test_types.test_get (input) != 0)
-        return 1;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Long stream - no errors\n\n"
-              "Testing basic types - long stream[2]\n\n"));
-
-  for (int j = 0; j < nloops; ++j)
-    {
-      ACE_OutputCDR output;
-      CDR_Test_Types test_types;
-
-      if (test_types.test_put (output) != 0)
-        return 1;
-
-      ACE_InputCDR input (output.begin ());
-      if (debug > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Output CDR: \n"));
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         input.rd_ptr(),
-                         64));
-          ACE_DEBUG ((LM_DEBUG,
-                      "Input CDR: \n"));
-          ACE_HEX_DUMP ((LM_DEBUG,
-                         input.rd_ptr(),
-                         64));
-        }
-
-      if (test_types.test_get (input) != 0)
+      if (test_get (input, test_types) != 0)
         return 1;
     }
 
   ACE_DEBUG ((LM_DEBUG,
-              "Long stream[2] - no errors\n\n"));
+              "Long stream - no errors\n\n"));
 
   ACE_END_TEST;
 
   return 0;
 }
-
-// ****************************************************************
-
-int
-CDR_Test_Types::test_put (ACE_OutputCDR &cdr)
-{
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.write_octet (this->o) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_octet[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_short (this->s) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_short[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_octet (this->o) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_octet-2[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_long (this->l) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_long[%d] failed\n",
-                           i),
-                          1);
-      if (cdr.write_long (this->l) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_long-2[%d] failed\n",
-                           i),
-                          1);
-
-      if (cdr.write_string (this->str) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "write_string[%d] failed\n",
-                           i),
-                          1);
-
-    }
-
-  return 0;
-}
-
-int
-CDR_Test_Types::test_get (ACE_InputCDR &cdr) const
-{
-  ACE_CDR::Octet xo;
-  ACE_CDR::Short xs;
-  ACE_CDR::Long xl;
-
-  for (int i = 0; i < n; ++i)
-    {
-      if (cdr.read_octet (xo) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_octet[%d] failed\n",
-                           i),
-                          1);
-      if (xo != this->o)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "octet[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_short (xs) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_short[%d] failed\n",
-                           i), 1);
-      if (xs != this->s)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "short[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_octet (xo) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_octet-2[%d] failed\n",
-                           i),
-                          1);
-      if (xo != this->o)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "octet-2[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_long (xl) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_long[%d] failed\n",
-                           i),
-                          1);
-      if (xl != this->l)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "long[%d] differs\n",
-                           i),
-                          1);
-      if (cdr.read_long (xl) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_long-2[%d] failed\n",
-                           i),
-                          1);
-      if (xl != this->l)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "long-2[%d] differs\n",
-                           i),
-                          1);
-
-      ACE_CDR::Char *xstr;
-      if (cdr.read_string (xstr) == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "read_string2[%d] failed\n",
-                           i),
-                          1);
-      ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char> auto_xstr (xstr);
-      if (ACE_OS::strcmp (auto_xstr.get (), this->str) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "string[%d] differs\n",
-                           i),
-                          1);
-    }
-  return 0;
-}
-
-// ****************************************************************
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-// Not necessary here, because it's instantiated in ace/Memory_Pool.cpp.
-// template class ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-// Not necessary here, because it's instantiated in ace/Memory_Pool.cpp.
-// #pragma instantiate ACE_Auto_Basic_Array_Ptr<ACE_CDR::Char>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
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_Manager_Test.cpp b/tests/Cache_Manager_Test.cpp
deleted file mode 100644
index a3bbdf12730..00000000000
--- a/tests/Cache_Manager_Test.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Cache_Manager_Test.cpp
-//
-// = DESCRIPTION
-//     This is a simple test of the <ACE_Cache_Manager> and illustrates how
-//     to use it to cache objects keyed from strings.
-//
-// = AUTHOR
-//    James Hu
-//
-// ============================================================================
-
-#include "ace/OS.h"
-#include "ace/ACE.h"
-#include "ace/Synch.h"
-
-#include "ace/Cache_Manager.h"
-
-
-typedef ACE_String_Referenced_Cache_Manager
-        String_Table_Manager;
-
-typedef ACE_Cache_Proxy<const char *, const char, String_Table_Manager>
-        String_Table_Proxy;
-
-static String_Table_Manager *JXH_String_Table_Manager;
-
-static void put1 (void)
-{
-  String_Table_Proxy a((const char *) "hello",
-                       (const char *) "guten Tag", sizeof ( "guten Tag"));
-
-  String_Table_Proxy b((const char *) "good",
-                       (const char *) "gut", sizeof ( "gut"));
-
-  String_Table_Proxy c((const char *) "bad",
-                       (const char *) "schlecht", sizeof ( "schlecht"));
-
-  String_Table_Proxy d((const char *) "ugly",
-                       (const char *) "unsehenlich", sizeof ( "unsehenlich"));
-
-  String_Table_Proxy e((const char *) "bye bye",
-                       (const char *) "tschuess", sizeof ( "tschuess"));
-}
-
-static void put2 (void)
-{
-  String_Table_Proxy a((const char *) "hello",
-                       (const char *) "guten Nacht", sizeof ( "guten Nacht"));
-
-  String_Table_Proxy b((const char *) "good",
-                       (const char *) "vielen glueck", sizeof ( "vielen glueck"));
-
-  String_Table_Proxy c((const char *) "bad",
-                       (const char *) "sehr schlecht", sizeof ( "sehr schlecht"));
-
-  String_Table_Proxy d((const char *) "ugly",
-                       (const char *) "unsehenlicher", sizeof ( "unsehenlicher"));
-
-  String_Table_Proxy e((const char *) "bye bye",
-                       (const char *) "aufwiedersehen", sizeof ( "aufwiedersehen"));
-}
-
-static void get1 (void)
-{
-  {
-    String_Table_Proxy a((const char *) "hello");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "good");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bad");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "ugly");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bye bye");
-    cerr << a.data() << endl;
-  }
-}
-
-static void get2 (void)
-{
-  {
-    String_Table_Proxy a((const char *) "bye bye");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "ugly");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "bad");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "good");
-    cerr << a.data() << endl;
-  }
-
-  {
-    String_Table_Proxy a((const char *) "hello");
-    cerr << a.data() << endl;
-  }
-}
-
-int main (void)
-{
-  ACE_START_TEST (ASYS_TEXT ("Cache_Manager_Test"));
-
-  JXH_String_Table_Manager
-  = String_Table_Proxy::Cache_Manager_Singleton::instance ();
-  JXH_String_Table_Manager->open (0, 0, 2, 5, 1, 0, 1, 0);
-
-  put1 ();
-
-  get1 ();
-  get2 ();
-
-  put2 ();
-
-  get1 ();
-  get2 ();
-
-  put1 ();
-
-  get1 ();
-  get2 ();
-
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Cache_Proxy<const char *, const char, String_Table_Manager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Cache_Proxy<const char *, const char, String_Table_Manager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Collection_Test.cpp b/tests/Collection_Test.cpp
index bdbd04c5ede..bc1dc94f3b5 100644
--- a/tests/Collection_Test.cpp
+++ b/tests/Collection_Test.cpp
@@ -30,94 +30,35 @@ USELIB("..\ace\aced.lib");
 
 typedef int DATA;
 
+typedef ACE_Unbounded_Set<DATA> COLLECTION;
+typedef ACE_Unbounded_Set_Iterator<DATA> ITERATOR;
+
 int main (int, char *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Collection_Test"));
 
-  typedef ACE_Unbounded_Set<DATA> UNBOUNDED_SET;
-  typedef ACE_Unbounded_Set_Iterator<DATA> UNBOUNDED_SET_ITERATOR;
-
-  {
-    UNBOUNDED_SET unbounded_set;
-
-    unbounded_set.insert (1);
-    unbounded_set.insert (2);
-
-    {
-      for (UNBOUNDED_SET::iterator iterator = unbounded_set.begin ();
-           iterator != unbounded_set.end ();
-           ++iterator)
-        {
-          ACE_DEBUG ((LM_DEBUG, "%d\n",
-                      (*iterator)));
-        }
-    }
-
-    {
-      UNBOUNDED_SET_ITERATOR iterator (unbounded_set);
-      while (!iterator.done ())
-        {
-          DATA *data = 0;
-          iterator.next (data);
-          ACE_DEBUG ((LM_DEBUG, "%d\n",
-                      (*data)));
-          iterator.advance ();
-        }
-    }
-  }
-
-  typedef ACE_Array<DATA> ARRAY;
-  typedef ACE_Array_Iterator<DATA> ARRAY_ITERATOR;
+  COLLECTION collection;
 
-  {
-    ARRAY array;
-  }
-
-  {
-    ARRAY array (0);
-  }
-
-  {
-    ARRAY array1;
-    array1.size (2);
-    array1[0] = 4;
-    array1[1] = 4;
-
-    ARRAY array2 (2, 4);
-
-    ARRAY array3 (array2);
-
-    ARRAY array4;
-    array4 = array2;
-
-    ACE_ASSERT (array1 == array2);
-    ACE_ASSERT (array1 == array3);
-    ACE_ASSERT (array1 == array4);
+  collection.insert (1);
+  collection.insert (2);
 
+  for (COLLECTION::iterator iterator1 = collection.begin ();
+       iterator1 != collection.end ();
+       iterator1++)
     {
-      for (size_t i = 0;
-           i != array1.size ();
-           ++i)
-        {
-          ACE_DEBUG ((LM_DEBUG, "%d\n",
-                      array1[i]));
-          ACE_ASSERT (array1[i] == 4);
-        }
+      ACE_DEBUG ((LM_DEBUG, "%d\n",
+                  (*iterator1)));
     }
 
+  ITERATOR iterator2 (collection);
+  while (!iterator2.done ())
     {
-      ARRAY_ITERATOR iterator (array1);
-      while (!iterator.done ())
-        {
-          DATA *data = 0;
-          iterator.next (data);
-          ACE_DEBUG ((LM_DEBUG, "%d\n",
-                      (*data)));
-          ACE_ASSERT (*data == 4);
-          iterator.advance ();
-        }
+      int *data = 0;
+      iterator2.next (data);
+      ACE_DEBUG ((LM_DEBUG, "%d\n",
+                  (*data)));
+      iterator2.advance ();
     }
-  }
 
   ACE_END_TEST;
 
@@ -126,17 +67,11 @@ int main (int, char *[])
 
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<DATA>;
 template class ACE_Unbounded_Set_Iterator<DATA>;
+template class ACE_Unbounded_Set<DATA>;
 template class ACE_Node<DATA>;
-template class ACE_Array<DATA>;
-template class ACE_Array_Base<DATA>;
-template class ACE_Array_Iterator<DATA>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set<DATA>
 #pragma instantiate ACE_Unbounded_Set_Iterator<DATA>
+#pragma instantiate ACE_Unbounded_Set<DATA>
 #pragma instantiate ACE_Node<DATA>
-#pragma instantiate ACE_Array<DATA>
-#pragma instantiate ACE_Array_Base<DATA>
-#pragma instantiate ACE_Array_Iterator<DATA>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp
index f5370014d6c..8e2e199a2a5 100644
--- a/tests/Collection_Test.dsp
+++ b/tests/Collection_Test.dsp
@@ -7,19 +7,19 @@
 CFG=Collection_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

 !MESSAGE NMAKE /f "Collection_Test.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 "Collection_Test.mak" CFG="Collection_Test - Win32 Debug"

-!MESSAGE 

+!MESSAGE

 !MESSAGE Possible choices for configuration are:

-!MESSAGE 

+!MESSAGE

 !MESSAGE "Collection_Test - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE 

+!MESSAGE

 

 # Begin Project

 # PROP Scc_ProjName ""

@@ -38,8 +38,7 @@ RSC=rc.exe
 # 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 "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /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

diff --git a/tests/Conn_Test.cpp b/tests/Conn_Test.cpp
index 1d38280f55a..0757f8294eb 100644
--- a/tests/Conn_Test.cpp
+++ b/tests/Conn_Test.cpp
@@ -458,20 +458,10 @@ server (void *arg)
       if (result == -1)
         {
           svc_handler->close ();
-
-          if (errno == ETIMEDOUT)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("accept timed out\n")));
-              return 0;
-            }
-          else
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ASYS_TEXT ("(%P|%t) %p\n"),
-                                 ASYS_TEXT ("accept failed, shutting down")),
-                                0);
-            }
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ASYS_TEXT ("(%P|%t) %p\n"),
+                             ASYS_TEXT ("accept failed, shutting down")),
+                            0);
         }
       ACE_DEBUG ((LM_DEBUG,
                   ASYS_TEXT ("(%P|%t) client %s connected from %d\n"),
@@ -486,10 +476,10 @@ server (void *arg)
 
 #if !defined (ACE_LACKS_FORK)
 static void
-handler (int /* signum */)
+handler (int signum)
 {
-  // No printout here, to be safe.  Signal handlers must not acquire
-  // locks, etc.  It's not even safe to call ACE_OS::exit ()!
+  // Print the signal number and exit.
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%P|%t) %S\n"), signum));
   ACE_OS::exit (0);
 }
 
@@ -563,34 +553,36 @@ spawn_processes (ACCEPTOR *acceptor,
 #if defined (ACE_LACKS_FORK) && defined (ACE_HAS_THREADS)
 // Spawn threads and run the client and server.
 
-static
-int
+static void
 spawn_threads (ACCEPTOR *acceptor,
                ACE_INET_Addr *server_addr)
 {
-  int status = 0;
-
 #if defined (VXWORKS)
   // Assign thread (VxWorks task) names to test that feature.
   ACE_thread_t *server_name;
-  ACE_NEW_RETURN (server_name, ACE_thread_t[n_servers], -1);
+  ACE_NEW (server_name,
+           ACE_thread_t[n_servers]);
 
   // And test ability to provide stacks.
   size_t *stack_size;
-  ACE_NEW_RETURN (stack_size, size_t[n_servers], -1);
+  ACE_NEW (stack_size,
+           size_t[n_servers]);
   char **stack;
-  ACE_NEW_RETURN (stack, char *[n_servers], -1);
+  ACE_NEW (stack,
+           char *[n_servers]);
 
   int i;
 
   for (i = 0; i < n_servers; ++i)
     {
-      ACE_NEW_RETURN (server_name[i], ASYS_TCHAR[32], -1);
+      ACE_NEW (server_name[i],
+               ASYS_TCHAR[32]);
       ACE_OS::sprintf (server_name[i],
                        ASYS_TEXT ("server%u"),
                        i);
       stack_size[i] = 40000;
-      ACE_NEW_RETURN (stack[i], char[stack_size[i]], -1);
+      ACE_NEW (stack[i],
+               char[stack_size[i]]);
 
       // Initialize the stack for checkStack.
       ACE_OS::memset (stack[i], 0xEE, stack_size[i]);
@@ -636,20 +628,7 @@ spawn_threads (ACCEPTOR *acceptor,
                 ASYS_TEXT ("client thread create failed")));
 
   // Wait for the threads to exit.
-  // But, wait for a limited time because sometimes the test hangs on Irix.
-  const ACE_Time_Value max_wait (200 /* seconds */);
-  const ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait);
-  if (ACE_Thread_Manager::instance ()->wait (&wait_time) == -1)
-    {
-      if (errno == ETIME)
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("maximum wait time of %d msec exceeded\n"),
-                               max_wait.msec ()));
-      else
-        ACE_OS::perror ("wait");
-
-      status = -1;
-    }
+  ACE_Thread_Manager::instance ()->wait ();
 
 #if defined (VXWORKS)
   for (i = 0; i < n_servers; ++i)
@@ -661,8 +640,6 @@ spawn_threads (ACCEPTOR *acceptor,
   delete [] stack;
   delete [] stack_size;
 #endif /* VXWORKS */
-
-  return status;
 }
 #endif /* ! ACE_LACKS_FORK && ACE_HAS_THREADS */
 
@@ -670,7 +647,6 @@ int
 main (int argc, ASYS_TCHAR *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("Conn_Test"));
-  int status = 0;
 
   ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("c:i:s:"));
   for (int c; (c = getopt ()) != -1; )
@@ -710,7 +686,7 @@ main (int argc, ASYS_TCHAR *argv[])
                            ASYS_TEXT ("spawn_processes")),
                           1);
 #elif defined (ACE_HAS_THREADS)
-      status = spawn_threads (&acceptor, &server_addr);
+      spawn_threads (&acceptor, &server_addr);
 #else  /* ACE_LACKS_FORK && ! ACE_HAS_THREADS */
       ACE_ERROR ((LM_ERROR,
                   ASYS_TEXT ("(%P|%t) only one thread may be run in a process on this platform\n%a"), 1));
@@ -718,7 +694,7 @@ main (int argc, ASYS_TCHAR *argv[])
     }
 
   ACE_END_TEST;
-  return status;
+  return 0;
 }
 
 #define CACHED_CONNECT_STRATEGY ACE_Cached_Connect_Strategy<Svc_Handler, ACE_SOCK_CONNECTOR, ACE_SYNCH_MUTEX>
diff --git a/tests/DLL_Test.cpp b/tests/DLL_Test.cpp
index a6cd1f1775d..96b01cd6b08 100644
--- a/tests/DLL_Test.cpp
+++ b/tests/DLL_Test.cpp
@@ -18,8 +18,7 @@
 
 #define ACE_BUILD_SVC_DLL
 
-#include "test_config.h"
-#include "DLL_Test.h"
+#include "test_config.h" 
 #include "ace/DLL.h"
 #include "ace/Auto_Ptr.h"
 
@@ -29,7 +28,6 @@ ACE_RCSID(tests, DLL_Test, "$Id$")
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
 #if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
 USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
@@ -42,12 +40,33 @@ USELIB("..\ace\aced.lib");
 
 #if defined (ACE_WIN32)
 #  define OBJ_SUFFIX ".exe"
-#  define OBJ_PREFIX ""
 #else
-#  define OBJ_SUFFIX ACE_DLL_SUFFIX
-#  define OBJ_PREFIX "./" ACE_DLL_PREFIX
+#  define OBJ_SUFFIX ".o"
 #endif /*ACE_WIN32*/
 
+class Hello
+{
+  // = TITLE
+  //    The Hello class in the dynamically linkable library.
+  //
+  // = DESCRIPTION
+  //    This class is used in this example to show how a library can
+  //    be loaded on demand and its methods called on getting the
+  //    symbols from the library.
+public:
+
+  void say_hello (void)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "Hello\n"));
+    }
+
+  void say_next (void)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "How are you?\n"));
+    }
+};
 
 // This function returns the Hello object pointer.
 
@@ -74,43 +93,31 @@ main (int argc, char *argv[])
 
   ACE_START_TEST ("DLL_Test");
 
-// Protection against this test being run on platforms not supporting Dlls.
-#if defined (ACE_WIN32) || defined (ACE_HAS_SVR4_DYNAMIC_LINKING) || \
-    defined (__hpux) 
-      
-      ACE_DLL dll;
-    
-    int retval = dll.open (OBJ_PREFIX "DLL_Test" OBJ_SUFFIX);
+  ACE_DLL dll;
+
+  int retval = dll.open ("DLL_Test" OBJ_SUFFIX);
   if (retval != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-		       dll.error ()),
+                       dll.error ()),
                       -1);
-  
+
   TC f = (TC) dll.symbol ("get_hello");
-  
+
   if (f == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-		       dll.error ()),
+                       dll.error ()),
                       -1);
-  
+
   auto_ptr<Hello> my_hello (f ());
-  
+
   // Make the method calls, as the object pointer is available.
   my_hello->say_hello ();
   my_hello->say_next ();
-  
-#else
-  ACE_ERROR ((LM_INFO,
-              ASYS_TEXT ("Dynamically Linkable Libraries not supported on this platform\n")));
-#endif /* ACE_WIN32 || ACE_HAS_SVR4_DYNAMIC_LINKING || __hpux */
-  
+
   ACE_END_TEST;
   return 0;
 }
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class auto_ptr <Hello>;
 template class ACE_Auto_Basic_Ptr <Hello>;
diff --git a/tests/DLL_Test.h b/tests/DLL_Test.h
deleted file mode 100644
index c319f0fdc57..00000000000
--- a/tests/DLL_Test.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// $Id$
-
-// 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
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Log_Msg.h"
-
-class Hello
-{
-  // = TITLE
-  //    The Hello class in the dynamically linkable library.
-  //
-  // = DESCRIPTION
-  //    This class is used in this example to show how a library can
-  //    be loaded on demand and its methods called on getting the
-  //    symbols from the library.
-public:
-
-  void say_hello (void)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Hello\n"));
-    }
-
-  void say_next (void)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "How are you?\n"));
-    }
-};
-
-#endif /* ACE_MAP_TEST_H */
diff --git a/tests/Env_Value_Test.cpp b/tests/Env_Value_Test.cpp
index 9147e71d335..3d41b57d103 100644
--- a/tests/Env_Value_Test.cpp
+++ b/tests/Env_Value_Test.cpp
@@ -60,8 +60,8 @@ main (int argc, LPTSTR [], LPTSTR envp[])
       status = options.setenv (envp);
       ACE_ASSERT (status == 0);
 
-      options.command_line (ACE_TEXT (".") ACE_DIRECTORY_SEPARATOR_STR
-                            ACE_TEXT ("Env_Value_Test run_as_test"));
+      options.command_line (ACE_TEXT ("." ACE_DIRECTORY_SEPARATOR_STR
+                                      "Env_Value_Test run_as_test"));
 
       status = options.setenv (ACE_TEXT ("TEST_VALUE_POSITIVE"),
                                ACE_TEXT ("%s"),
diff --git a/tests/FlReactor_Test.cpp b/tests/FlReactor_Test.cpp
deleted file mode 100644
index 0c20c5a81b9..00000000000
--- a/tests/FlReactor_Test.cpp
+++ /dev/null
@@ -1,294 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   tests
-//
-// = FILENAME
-//   FlReactor_Test.cpp
-//
-// = DESCRIPTION
-//   A simple test that ilustrates the integration of the fast-light
-//   toolkit (http://fltk.easysw.org/) with ACE, it uses FL to create
-//   an OpenGL window and display a polygon, it uses ACE to open an
-//   acceptor. Every time there is a connection the number of polygons 
-//   is increased, a little widget can be used to change the number of 
-//   polygons too.
-//
-// ============================================================================
-
-#include "test_config.h"
-
-ACE_RCSID(tests, FlReactor_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-#if !defined (ACE_HAS_FL)
-
-int main (int, char*[])
-{
-  ACE_START_TEST (ASYS_TEXT ("FlReactor_Test"));
-
-  ACE_ERROR ((LM_INFO,
-              "FL not supported on this platform\n"));
-  ACE_END_TEST;
-
-  return 0;
-}
-
-#else
-
-#include "ace/FlReactor.h"
-#include "ace/Event_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-
-#include <FL/Fl.h>
-#include <FL/Fl_Window.h>
-#include <FL/Fl_Hor_Slider.h>
-#include <FL/Fl_Box.h>
-#include <FL/math.h>
-#include <FL/gl.h>
-#include <FL/Fl_Gl_Window.h>
-
-class Test_Window : public Fl_Gl_Window
-{
-public:
-  Test_Window (int x, int y, int w, int h,
-             const char * l = 0);
-  // Constructor
-
-  int sides (void) const;
-  void sides (int s);
-  void incr_sides (void);
-
-private:
-  virtual void draw (void);
-  // from the Fl_Gl_Window...
-
-  int sides_;
-};
-
-Test_Window::Test_Window (int x, int y,
-                      int w, int h,
-                      const char* l)
-  :  Fl_Gl_Window (x, y, w, h, l),
-     sides_ (3)
-{
-}
-
-int
-Test_Window::sides (void) const
-{
-  return this->sides_;
-}
-
-void
-Test_Window::sides (int s)
-{
-  this->sides_ = s;
-  this->redraw ();
-}
-
-void
-Test_Window::incr_sides (void)
-{
-  this->sides_++;
-  if (this->sides_ > 10)
-    this->sides_ = 3;
-  this->redraw ();
-}
-
-void
-Test_Window::draw (void)
-{
-  // the valid() property may be used to avoid reinitializing your
-  // GL transformation for each redraw:
-  if (!this->valid())
-    {
-      this->valid(1);
-      glLoadIdentity();
-      glViewport(0, 0, this->w(), this->h());
-    }
-  // draw an amazing but slow graphic:
-  glClear(GL_COLOR_BUFFER_BIT);
-
-  glBegin(GL_POLYGON);
-  int s = this->sides_;
-  for (int i=0; i != s; ++i)
-    {
-      double ang = i * 2 * M_PI / s;
-      glColor3f (float(i) / s,
-                 float(i) / s,
-                 float(i) / s);
-      glVertex3f(cos(ang), sin(ang), 0);
-    }
-  glEnd();
-}
-
-// when you change the data, as in this callback, you must call redraw():
-void sides_cb (Fl_Widget *o, void *p)
-{
-  Test_Window *tw = ACE_reinterpret_cast(Test_Window *,p);
-  Fl_Slider *slider = ACE_dynamic_cast (Fl_Slider*,o);
-  tw->sides (ACE_static_cast (int, slider->value ()));
-}
-
-class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  Connection_Handler (Test_Window *w = 0,
-                      Fl_Box* box = 0);
-
-  virtual int open (void *);
-  virtual int handle_input (ACE_HANDLE);
-
-private:
-  Test_Window* w_;
-  Fl_Box *box_;
-};
-
-class Acceptor : public ACE_Acceptor<Connection_Handler,ACE_SOCK_ACCEPTOR>
-{
-public:
-  Acceptor (Test_Window *w = 0,
-            Fl_Box *box = 0);
-
-  virtual int make_svc_handler (Connection_Handler *&sh);
-
-private:
-  Test_Window* w_;
-  Fl_Box *box_;
-};
-
-Connection_Handler::Connection_Handler (Test_Window *w,
-                                        Fl_Box *box)
-  :  w_ (w),
-     box_ (box)
-{
-}
-
-int
-Connection_Handler::open (void*)
-{
-  if (this->box_ != 0)
-    {
-      ACE_INET_Addr from;
-
-      this->peer ().get_remote_addr (from);
-      const int bufsiz = 128;
-      char buf[bufsiz];
-
-      from.addr_to_string (buf, bufsiz, 0);
-
-      static char msg[256];
-      ACE_OS::sprintf (msg, "connection from <%s>\n", buf);
-
-      this->box_->label (msg);
-      this->box_->redraw ();
-    }
-
-  if (this->w_ != 0)
-    {
-      this->w_->incr_sides ();
-    }
-
-  return this->peer ().enable (ACE_NONBLOCK);
-}
-
-int
-Connection_Handler::handle_input (ACE_HANDLE)
-{
-  char buf[BUFSIZ];
-  if (this->peer ().recv (buf, BUFSIZ) <= 0)
-    return -1;
-  return 0;
-}
-
-Acceptor::Acceptor (Test_Window *w, Fl_Box *box)
-  :  w_ (w),
-     box_ (box)
-{
-}
-
-int
-Acceptor::make_svc_handler (Connection_Handler *&sh)
-{
-  if (sh == 0)
-    ACE_NEW_RETURN (sh, Connection_Handler (this->w_, this->box_), -1);
-  return 0;
-}
-
-int main (int argc, char *argv[])
-{
-  ACE_START_TEST (ASYS_TEXT ("FlReactor_Test"));
-
-  Fl_Window window(300, 370);
-
-  Test_Window tw(10, 75, window.w() - 20, window.h()-90);
-  window.resizable(&tw);
-
-  Fl_Hor_Slider slider(60, 5, window.w() - 70, 30, "Sides:");
-  slider.align(FL_ALIGN_LEFT);
-  slider.callback(sides_cb, &tw);
-  slider.value(tw.sides ());
-  slider.step(1);
-  slider.bounds(3, 10);
-
-  ACE_FlReactor reactor;
-  ACE_Reactor r (&reactor);
-
-  Fl_Box *box = new Fl_Box (FL_UP_BOX, 10, 40,
-                            window.w () - 20, 30,
-                            "Setting up");
-  box->labelfont (FL_BOLD);
-
-  Acceptor acceptor (&tw, box);
-
-  ACE_INET_Addr address;
-  if (acceptor.open (address, &r) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open acceptor"), -1);
-
-  acceptor.acceptor ().get_local_addr (address);
-
-  const int bufsiz = 128;
-  char buf[bufsiz];
-
-  address.addr_to_string (buf, bufsiz, 0);
-
-  char msg[2*bufsiz];
-  ACE_OS::sprintf (msg, "Listening on <%s>\n", buf);
-
-  box->label (msg);
-  box->redraw ();
-
-  window.end();
-  window.show(argc,argv);
-  tw.show();
-
-  return Fl::run();
-
-  ACE_END_TEST;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* ACE_HAS_FL */
diff --git a/tests/Handle_Set_Test.cpp b/tests/Handle_Set_Test.cpp
index 0fbf86f8da0..cb8a58942af 100644
--- a/tests/Handle_Set_Test.cpp
+++ b/tests/Handle_Set_Test.cpp
@@ -99,14 +99,7 @@ test_boundaries (void)
 
   while ((handle = i1 ()) != ACE_INVALID_HANDLE)
     {
-#if defined (ACE_PSOS_DIAB)
-      // workaround for some compiler confusion with strings in assertions
-      const int SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS = 1;
-      ACE_ASSERT (0 == SET_IS_EMPTY_SO_SHOULD_NOT_SEE_THIS);
-#else /* ! defined (ACE_PSOS_DIAB) */
-      ACE_ASSERT (0 == ASYS_TEXT ("this shouldn't get called since "
-                                  "the set is empty!\n"));
-#endif /* defined (ACE_PSOS_DIAB) */
+      ACE_ASSERT (ASYS_TEXT ("this shouldn't get called since the set is empty!\n") == 0);
     }
 
   // Insert the vector of HANDLEs into the set.
@@ -125,7 +118,7 @@ test_boundaries (void)
   while ((handle = i2 ()) != ACE_INVALID_HANDLE)
     {
       int done = set.remove(handle);
-      ACE_ASSERT (done == 0);
+      ACE_ASSERT(done == 0);
       count++;
     }
 
@@ -218,3 +211,4 @@ template class ACE_Unbounded_Set_Iterator<ACE_HANDLE>;
 #pragma instantiate ACE_Node<ACE_HANDLE>
 # endif
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/tests/High_Res_Timer_Test.cpp b/tests/High_Res_Timer_Test.cpp
index 804d7da0ba4..b7899277249 100644
--- a/tests/High_Res_Timer_Test.cpp
+++ b/tests/High_Res_Timer_Test.cpp
@@ -20,7 +20,6 @@
 #include "ace/Log_Msg.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
-#include "ace/Get_Opt.h"
 
 ACE_RCSID(tests, High_Res_Timer_Test, "$Id$")
 
@@ -71,10 +70,10 @@ time_interval (const ACE_Time_Value &interval)
 
 static
 u_int
-intervals [] = {0, 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000}; /* usec */
+intervals [] = {1, 10, 100, 1000, 10000, 100000, 1000000, 10000000}; /* usec */
 
 int
-main (int argc, ASYS_TCHAR *argv[])
+main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("High_Res_Timer_Test"));
 
@@ -84,39 +83,21 @@ main (int argc, ASYS_TCHAR *argv[])
 
   u_int errors = 0;
 
-  u_int iterations = 1;
-
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("i:"));
-  for (int c; (c = getopt ()) != -1; )
-    switch (c)
-      {
-      case 'i':
-        iterations = ACE_OS::atoi (getopt.optarg);
-        break;
-      }
-
-  // We don't check for errors if the interval is shorter than this
-  // value because the OS has a finite resolution anyway.
-  const u_int TIMER_RESOLUTION = 10000;
-
   for (u_int i = 0; i < sizeof intervals / sizeof (u_int); ++i)
     {
-      for (u_int j = 0; j < iterations; ++j)
+      const ACE_Time_Value interval (0, intervals[i]);
+      const ACE_Time_Value measured = time_interval (interval);
+      ACE_DEBUG ((LM_DEBUG, "interval: %u usec, measured: %u usec%s\n",
+                  interval.sec () * 1000000 + interval.usec (),
+                  measured.sec () * 1000000 + measured.usec (),
+                  intervals[i] <= 10000  ?
+                    " (interval and measured may differ)"  :  ""));
+
+      if (intervals[i] > 10000)
         {
-          const ACE_Time_Value interval (0, intervals[i]);
-          const ACE_Time_Value measured = time_interval (interval);
-          ACE_DEBUG ((LM_DEBUG, "interval: %u usec, measured: %u usec%s\n",
-                      interval.sec () * 1000000 + interval.usec (),
-                      measured.sec () * 1000000 + measured.usec (),
-                      intervals[i] <= TIMER_RESOLUTION  ?
-                      " (interval and measured may differ)"  :  ""));
-
-          if (intervals[i] > TIMER_RESOLUTION)
-            {
-              errors += check (interval.sec () * 1000000 + interval.usec (),
-                               measured.sec () * 1000000 + measured.usec ());
-              // Don't check for error for intervals below 10 msec.
-            }
+          errors += check (interval.sec () * 1000000 + interval.usec (),
+                           measured.sec () * 1000000 + measured.usec ());
+          // Don't check for error for intervals below 10 msec.
         }
     }
 
diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp
index 398a863645e..4edbbb5d7d1 100644
--- a/tests/MT_Reactor_Timer_Test.cpp
+++ b/tests/MT_Reactor_Timer_Test.cpp
@@ -29,6 +29,7 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
+
 #if defined (ACE_HAS_THREADS)
 
 // This test exercises the setting and cancelling of timers from a
diff --git a/tests/Makefile b/tests/Makefile
index 8f3f0dd0713..11dd094cb28 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,118 +2,96 @@
 #
 # $Id$
 #
-#       Makefile for all the ACE ``one-button' tests
+#	Makefile for all the ACE ``one-button' tests
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
-#       Local macros
+#	Local macros
 #----------------------------------------------------------------------------
 
 BIN =   Aio_Platform_Test \
-        Atomic_Op_Test \
-        Barrier_Test \
-        Basic_Types_Test \
-        Buffer_Stream_Test \
+	Atomic_Op_Test \
+	Barrier_Test \
+	Basic_Types_Test \
+	Buffer_Stream_Test \
         CDR_Test \
-        Collection_Test \
-        Conn_Test \
-        DLList_Test \
-        DLL_Test\
-        Enum_Interfaces_Test \
-        Env_Value_Test \
-        Future_Test \
-        Handle_Set_Test \
-        High_Res_Timer_Test \
-        OrdMultiSet_Test \
-        Hash_Map_Manager_Test \
-        IOStream_Test \
-        Map_Test \
-        Map_Manager_Test \
-        Mem_Map_Test \
-        MM_Shared_Memory_Test \
-        MT_Reactor_Timer_Test \
-        MT_SOCK_Test \
-        Message_Block_Test \
-        Message_Queue_Test \
-        Message_Queue_Notifications_Test \
-        New_Fail_Test \
-        Notify_Performance_Test \
-        Process_Mutex_Test \
-        Process_Strategy_Test \
-        Priority_Buffer_Test \
-        Dynamic_Priority_Test \
-        Priority_Task_Test \
-        Priority_Reactor_Test \
-        Pipe_Test \
-        RB_Tree_Test \
-        Reactors_Test \
-        Reactor_Exceptions_Test \
-        Reactor_Notify_Test \
-        Reactor_Performance_Test \
-        Reactor_Timer_Test \
-        Reader_Writer_Test \
-        Recursive_Mutex_Test \
-        Reverse_Lock_Test \
-        Semaphore_Test \
-        Service_Config_Test \
-        Sigset_Ops_Test \
-        Simple_Message_Block_Test \
-        SOCK_Test \
-        SOCK_Connector_Test \
-        SPIPE_Test \
-        SString_Test \
-        SV_Shared_Memory_Test \
-        Task_Test \
-        Thread_Manager_Test \
-        Thread_Mutex_Test \
-        Thread_Pool_Test \
-        Timeprobe_Test \
-        Time_Service_Test \
-        Time_Value_Test \
-        Timer_Queue_Test \
-        TSS_Test \
-        UPIPE_SAP_Test \
-        Upgradable_RW_Test
+	Collection_Test \
+	Conn_Test \
+	DLList_Test \
+	DLL_Test\
+	Enum_Interfaces_Test \
+	Env_Value_Test \
+	Future_Test \
+	Handle_Set_Test \
+	High_Res_Timer_Test \
+	OrdMultiSet_Test \
+	Hash_Map_Manager_Test \
+	IOStream_Test \
+	Map_Test \
+	Map_Manager_Test \
+	Mem_Map_Test \
+	MM_Shared_Memory_Test \
+	MT_Reactor_Timer_Test \
+	MT_SOCK_Test \
+	Message_Block_Test \
+	Message_Queue_Test \
+	Message_Queue_Notifications_Test \
+	Naming_Test \
+	Notify_Performance_Test \
+	Process_Mutex_Test \
+	Process_Strategy_Test \
+	Priority_Buffer_Test \
+	Dynamic_Priority_Test \
+	Priority_Task_Test \
+	Priority_Reactor_Test \
+	Pipe_Test \
+	RB_Tree_Test \
+	Reactors_Test \
+	Reactor_Exceptions_Test \
+	Reactor_Notify_Test \
+	Reactor_Performance_Test \
+	Reactor_Timer_Test \
+	Reader_Writer_Test \
+	Recursive_Mutex_Test \
+	Semaphore_Test \
+	Service_Config_Test \
+	Sigset_Ops_Test \
+	Simple_Message_Block_Test \
+	SOCK_Test \
+	SOCK_Connector_Test \
+	SPIPE_Test \
+	SString_Test \
+	SV_Shared_Memory_Test \
+	Task_Test \
+	Thread_Manager_Test \
+	Thread_Mutex_Test \
+	Thread_Pool_Reactor_Test \
+	Thread_Pool_Test \
+	Timeprobe_Test \
+	Time_Service_Test \
+	Time_Value_Test \
+	Timer_Queue_Test \
+	Tokens_Test \
+	TSS_Test \
+	UPIPE_SAP_Test \
+	Upgradable_RW_Test \
+	XtReactor_Test 
 
-BIN2 = Naming_Test \
-       Thread_Pool_Reactor_Test \
-       XtReactor_Test \
-       FlReactor_Test \
-	TkReactor_Test	
+LSRC   = $(addsuffix .cpp,$(BIN))
+VLDLIBS = $(LDLIBS:%=%$(VAR))
 
-#### If the ACE library wasn't built with all components, don't
-#### try to build certain tests.
-ACE_BUILD_COMPONENTS := $(shell $(ACE_ROOT)/bin/ace_components --ace)
-ifeq (Other,$(findstring Other,$(ACE_BUILD_COMPONENTS)))
-  BIN += $(BIN2)
-endif # ! Other
-ifeq (Token,$(findstring Token,$(ACE_BUILD_COMPONENTS)))
-  BIN += Tokens_Test
-else
-  #### Ensure that Tokens_Test gets cleaned up, even if the ace
-  #### directory was realcleaned first (and ACE_BUILD_COMPONENTS
-  #### is empty).
-  BIN2 += Tokens_Test
-endif # ! Token
-
-PSRC=$(addsuffix .cpp,$(BIN))
+BUILD = $(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.bin.GNU
-
-ifndef SOEXT
-  SOEXT=so
-endif
-BUILD += libDLL_Test.$(SOEXT)
-
-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.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.
@@ -123,20 +101,11 @@ COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc)
 endif
 
 #----------------------------------------------------------------------------
-#       Local targets
+#	Local targets
 #----------------------------------------------------------------------------
 
-libDLL_Test.$(SOEXT): DLL_Test.cpp
-ifdef TEMPINCDIR
-	$(RM) .obj/DLL_Test.o
-endif
-	@$(MAKE) -f Makefile.DLL
-
-realclean: clean
-	-$(RM) libDLL_Test.$(SOEXT)
-
 #----------------------------------------------------------------------------
-#       Dependencies
+#	Dependencies
 #----------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- g++dep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
@@ -144,18 +113,22 @@ realclean: clean
 .obj/Aio_Platform_Test.o .obj/Aio_Platform_Test.so .shobj/Aio_Platform_Test.o .shobj/Aio_Platform_Test.so: Aio_Platform_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -178,23 +151,51 @@ realclean: clean
  $(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/Managed_Object.cpp \
+ $(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/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 \
+ $(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
 .obj/Atomic_Op_Test.o .obj/Atomic_Op_Test.so .shobj/Atomic_Op_Test.o .shobj/Atomic_Op_Test.so: Atomic_Op_Test.cpp \
  $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -221,18 +222,22 @@ realclean: clean
 .obj/Barrier_Test.o .obj/Barrier_Test.so .shobj/Barrier_Test.o .shobj/Barrier_Test.so: Barrier_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -258,7 +263,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -278,23 +282,26 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/Basic_Types_Test.o .obj/Basic_Types_Test.so .shobj/Basic_Types_Test.o .shobj/Basic_Types_Test.so: Basic_Types_Test.cpp \
- $(ACE_ROOT)/ace/OS.h \
+.obj/Basic_Types_Test.o .obj/Basic_Types_Test.so .shobj/Basic_Types_Test.o .shobj/Basic_Types_Test.so: Basic_Types_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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/Version.h test_config.h \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
@@ -320,18 +327,22 @@ realclean: clean
 .obj/Buffer_Stream_Test.o .obj/Buffer_Stream_Test.so .shobj/Buffer_Stream_Test.o .shobj/Buffer_Stream_Test.so: Buffer_Stream_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -359,7 +370,6 @@ realclean: clean
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Free_List.h \
@@ -396,8 +406,6 @@ realclean: clean
  $(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 \
@@ -414,15 +422,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -444,93 +447,25 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.cpp \
  $(ACE_ROOT)/ace/Stream.i \
  $(ACE_ROOT)/ace/Stream.cpp
-.obj/CDR_Test.o .obj/CDR_Test.so .shobj/CDR_Test.o .shobj/CDR_Test.so: CDR_Test.cpp test_config.h \
+.obj/Collection_Test.o .obj/Collection_Test.so .shobj/Collection_Test.o .shobj/Collection_Test.so: Collection_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp \
- $(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/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 \
- $(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
-.obj/Collection_Test.o .obj/Collection_Test.so .shobj/Collection_Test.o .shobj/Collection_Test.so: Collection_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -555,7 +490,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -577,18 +511,22 @@ realclean: clean
 .obj/Conn_Test.o .obj/Conn_Test.so .shobj/Conn_Test.o .shobj/Conn_Test.so: Conn_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -639,7 +577,6 @@ realclean: clean
  $(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 \
@@ -657,8 +594,6 @@ realclean: clean
  $(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 \
@@ -691,15 +626,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -738,18 +668,22 @@ realclean: clean
 .obj/DLList_Test.o .obj/DLList_Test.so .shobj/DLList_Test.o .shobj/DLList_Test.so: DLList_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -774,7 +708,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -792,24 +725,26 @@ realclean: clean
  $(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/SString.h \
- $(ACE_ROOT)/ace/SString.i
+ $(ACE_ROOT)/ace/Memory_Pool.i
 .obj/DLL_Test.o .obj/DLL_Test.so .shobj/DLL_Test.o .shobj/DLL_Test.so: DLL_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -833,25 +768,29 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- DLL_Test.h $(ACE_ROOT)/ace/DLL.h \
+ $(ACE_ROOT)/ace/DLL.h \
  $(ACE_ROOT)/ace/Auto_Ptr.h \
  $(ACE_ROOT)/ace/Auto_Ptr.i \
  $(ACE_ROOT)/ace/Auto_Ptr.cpp
 .obj/Enum_Interfaces_Test.o .obj/Enum_Interfaces_Test.so .shobj/Enum_Interfaces_Test.o .shobj/Enum_Interfaces_Test.so: Enum_Interfaces_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -882,18 +821,22 @@ realclean: clean
 .obj/Env_Value_Test.o .obj/Env_Value_Test.so .shobj/Env_Value_Test.o .shobj/Env_Value_Test.so: Env_Value_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -918,9 +861,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Env_Value_T.h \
  $(ACE_ROOT)/ace/Env_Value_T.i \
@@ -928,18 +868,22 @@ realclean: clean
 .obj/Future_Test.o .obj/Future_Test.so .shobj/Future_Test.o .shobj/Future_Test.so: Future_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -970,7 +914,6 @@ realclean: clean
  $(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 \
@@ -1005,8 +948,6 @@ realclean: clean
  $(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 \
@@ -1021,15 +962,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1059,18 +995,22 @@ realclean: clean
 .obj/Handle_Set_Test.o .obj/Handle_Set_Test.so .shobj/Handle_Set_Test.o .shobj/Handle_Set_Test.so: Handle_Set_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1102,7 +1042,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Handle_Set.h \
  $(ACE_ROOT)/ace/Handle_Set.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 \
@@ -1124,18 +1063,22 @@ realclean: clean
 .obj/High_Res_Timer_Test.o .obj/High_Res_Timer_Test.so .shobj/High_Res_Timer_Test.o .shobj/High_Res_Timer_Test.so: High_Res_Timer_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1162,24 +1105,26 @@ 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 \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i
+ $(ACE_ROOT)/ace/Sched_Params.i
 .obj/OrdMultiSet_Test.o .obj/OrdMultiSet_Test.so .shobj/OrdMultiSet_Test.o .shobj/OrdMultiSet_Test.so: OrdMultiSet_Test.cpp \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  test_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/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/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 \
@@ -1204,7 +1149,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -1226,18 +1170,22 @@ realclean: clean
 .obj/Hash_Map_Manager_Test.o .obj/Hash_Map_Manager_Test.so .shobj/Hash_Map_Manager_Test.o .shobj/Hash_Map_Manager_Test.so: Hash_Map_Manager_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1262,12 +1210,6 @@ realclean: clean
  $(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 \
@@ -1278,7 +1220,6 @@ realclean: clean
  $(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 \
@@ -1296,8 +1237,6 @@ realclean: clean
  $(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 \
@@ -1308,22 +1247,27 @@ realclean: clean
  $(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/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Hash_Map_Manager.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/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1355,7 +1299,6 @@ realclean: clean
  $(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 \
@@ -1373,8 +1316,6 @@ realclean: clean
  $(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 \
@@ -1407,15 +1348,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1461,131 +1397,25 @@ realclean: clean
  $(ACE_ROOT)/ace/IOStream_T.h \
  $(ACE_ROOT)/ace/IOStream_T.i \
  $(ACE_ROOT)/ace/IOStream_T.cpp
-.obj/Map_Test.o .obj/Map_Test.so .shobj/Map_Test.o .shobj/Map_Test.so: Map_Test.cpp test_config.h \
+.obj/Map_Manager_Test.o .obj/Map_Manager_Test.so .shobj/Map_Manager_Test.o .shobj/Map_Manager_Test.so: Map_Manager_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
- Map_Test.h \
- $(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/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 \
- $(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 \
- $(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 \
- $(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/Active_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.h \
- $(ACE_ROOT)/ace/Map.h \
- $(ACE_ROOT)/ace/Map.i \
- $(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/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/Map_T.i \
- $(ACE_ROOT)/ace/Map_T.cpp \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Map_Manager_Test.o .obj/Map_Manager_Test.so .shobj/Map_Manager_Test.o .shobj/Map_Manager_Test.so: Map_Manager_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -1613,7 +1443,6 @@ realclean: clean
  $(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 \
@@ -1637,8 +1466,6 @@ realclean: clean
  $(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 \
@@ -1651,20 +1478,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Profile_Timer.h \
  $(ACE_ROOT)/ace/Time_Value.h \
  $(ACE_ROOT)/ace/High_Res_Timer.h \
@@ -1673,18 +1490,22 @@ realclean: clean
 .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 \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1713,18 +1534,22 @@ realclean: clean
 .obj/MM_Shared_Memory_Test.o .obj/MM_Shared_Memory_Test.so .shobj/MM_Shared_Memory_Test.o .shobj/MM_Shared_Memory_Test.so: MM_Shared_Memory_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1755,7 +1580,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Shared_Memory_MM.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 \
@@ -1776,18 +1600,22 @@ realclean: clean
 .obj/MT_Reactor_Timer_Test.o .obj/MT_Reactor_Timer_Test.so .shobj/MT_Reactor_Timer_Test.o .shobj/MT_Reactor_Timer_Test.so: MT_Reactor_Timer_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1824,7 +1652,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -1863,22 +1690,15 @@ realclean: clean
  $(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/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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -1902,18 +1722,22 @@ realclean: clean
 .obj/MT_SOCK_Test.o .obj/MT_SOCK_Test.so .shobj/MT_SOCK_Test.o .shobj/MT_SOCK_Test.so: MT_SOCK_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -1939,7 +1763,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -1981,18 +1804,22 @@ realclean: clean
 .obj/Message_Block_Test.o .obj/Message_Block_Test.so .shobj/Message_Block_Test.o .shobj/Message_Block_Test.so: Message_Block_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2023,7 +1850,6 @@ realclean: clean
  $(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 \
@@ -2058,8 +1884,6 @@ realclean: clean
  $(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 \
@@ -2074,15 +1898,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2109,18 +1928,22 @@ realclean: clean
 .obj/Message_Queue_Test.o .obj/Message_Queue_Test.so .shobj/Message_Queue_Test.o .shobj/Message_Queue_Test.so: Message_Queue_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2146,7 +1969,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -2183,8 +2005,6 @@ realclean: clean
  $(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 \
@@ -2199,15 +2019,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2224,18 +2039,22 @@ realclean: clean
  Message_Queue_Notifications_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2271,7 +2090,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -2295,8 +2113,6 @@ realclean: clean
  $(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/Svc_Conf_Tokens.h \
  $(ACE_ROOT)/ace/Synch_Options.h \
@@ -2304,15 +2120,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2344,21 +2155,25 @@ realclean: clean
  $(ACE_ROOT)/ace/Stream_Modules.h \
  $(ACE_ROOT)/ace/Stream_Modules.i \
  $(ACE_ROOT)/ace/Stream_Modules.cpp
-.obj/New_Fail_Test.o .obj/New_Fail_Test.so .shobj/New_Fail_Test.o .shobj/New_Fail_Test.so: New_Fail_Test.cpp test_config.h \
+.obj/Naming_Test.o .obj/Naming_Test.so .shobj/Naming_Test.o .shobj/Naming_Test.so: Naming_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2382,22 +2197,85 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/CORBA_macros.h
+ $(ACE_ROOT)/ace/Naming_Context.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/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/Service_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.h \
+ $(ACE_ROOT)/ace/Shared_Object.i \
+ $(ACE_ROOT)/ace/Service_Object.i \
+ $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Service_Config.h \
+ $(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/Name_Request_Reply.h \
+ $(ACE_ROOT)/ace/Name_Space.h \
+ $(ACE_ROOT)/ace/Profile_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.h \
+ $(ACE_ROOT)/ace/High_Res_Timer.i \
+ $(ACE_ROOT)/ace/Profile_Timer.i
 .obj/Notify_Performance_Test.o .obj/Notify_Performance_Test.so .shobj/Notify_Performance_Test.o .shobj/Notify_Performance_Test.so: Notify_Performance_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2430,7 +2308,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Get_Opt.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 \
@@ -2477,22 +2354,15 @@ realclean: clean
  $(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/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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2522,18 +2392,22 @@ realclean: clean
 .obj/Process_Mutex_Test.o .obj/Process_Mutex_Test.so .shobj/Process_Mutex_Test.o .shobj/Process_Mutex_Test.so: Process_Mutex_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2558,27 +2432,28 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/Process_Strategy_Test.o .obj/Process_Strategy_Test.so .shobj/Process_Strategy_Test.o .shobj/Process_Strategy_Test.so: Process_Strategy_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2610,7 +2485,6 @@ realclean: clean
  $(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 \
@@ -2628,8 +2502,6 @@ realclean: clean
  $(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 \
@@ -2662,15 +2534,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2718,18 +2585,22 @@ realclean: clean
 .obj/Priority_Buffer_Test.o .obj/Priority_Buffer_Test.so .shobj/Priority_Buffer_Test.o .shobj/Priority_Buffer_Test.so: Priority_Buffer_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2756,7 +2627,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue.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/Free_List.h \
@@ -2790,8 +2660,6 @@ realclean: clean
  $(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 \
@@ -2808,15 +2676,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2830,18 +2693,22 @@ realclean: clean
 .obj/Dynamic_Priority_Test.o .obj/Dynamic_Priority_Test.so .shobj/Dynamic_Priority_Test.o .shobj/Dynamic_Priority_Test.so: Dynamic_Priority_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2868,7 +2735,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Message_Queue.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/Free_List.h \
@@ -2902,8 +2768,6 @@ realclean: clean
  $(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 \
@@ -2920,15 +2784,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -2946,18 +2805,22 @@ realclean: clean
 .obj/Priority_Task_Test.o .obj/Priority_Task_Test.so .shobj/Priority_Task_Test.o .shobj/Priority_Task_Test.so: Priority_Task_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -2988,7 +2851,6 @@ realclean: clean
  $(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 \
@@ -3023,8 +2885,6 @@ realclean: clean
  $(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 \
@@ -3039,15 +2899,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3071,18 +2926,22 @@ realclean: clean
 .obj/Priority_Reactor_Test.o .obj/Priority_Reactor_Test.so .shobj/Priority_Reactor_Test.o .shobj/Priority_Reactor_Test.so: Priority_Reactor_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3133,7 +2992,6 @@ realclean: clean
  $(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 \
@@ -3151,8 +3009,6 @@ realclean: clean
  $(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 \
@@ -3185,15 +3041,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3247,18 +3098,22 @@ realclean: clean
 .obj/Pipe_Test.o .obj/Pipe_Test.so .shobj/Pipe_Test.o .shobj/Pipe_Test.so: Pipe_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3285,27 +3140,28 @@ realclean: clean
  $(ACE_ROOT)/ace/Pipe.h \
  $(ACE_ROOT)/ace/Pipe.i \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Process.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
  $(ACE_ROOT)/ace/Get_Opt.i
 .obj/RB_Tree_Test.o .obj/RB_Tree_Test.so .shobj/RB_Tree_Test.o .shobj/RB_Tree_Test.so: RB_Tree_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3336,42 +3192,26 @@ realclean: clean
  $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
  $(ACE_ROOT)/ace/RB_Tree.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/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 \
  $(ACE_ROOT)/ace/RB_Tree.cpp
 .obj/Reactors_Test.o .obj/Reactors_Test.so .shobj/Reactors_Test.o .shobj/Reactors_Test.so: Reactors_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3402,7 +3242,6 @@ realclean: clean
  $(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 \
@@ -3437,8 +3276,6 @@ realclean: clean
  $(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 \
@@ -3453,15 +3290,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3487,16 +3319,20 @@ realclean: clean
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
@@ -3522,7 +3358,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -3563,18 +3398,22 @@ realclean: clean
 .obj/Reactor_Notify_Test.o .obj/Reactor_Notify_Test.so .shobj/Reactor_Notify_Test.o .shobj/Reactor_Notify_Test.so: Reactor_Notify_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3605,7 +3444,6 @@ realclean: clean
  $(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 \
@@ -3640,8 +3478,6 @@ realclean: clean
  $(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 \
@@ -3656,15 +3492,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3700,18 +3531,22 @@ realclean: clean
 .obj/Reactor_Performance_Test.o .obj/Reactor_Performance_Test.so .shobj/Reactor_Performance_Test.o .shobj/Reactor_Performance_Test.so: Reactor_Performance_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3758,7 +3593,6 @@ realclean: clean
  $(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 \
@@ -3793,8 +3627,6 @@ realclean: clean
  $(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 \
@@ -3807,15 +3639,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -3878,18 +3705,22 @@ realclean: clean
 .obj/Reactor_Timer_Test.o .obj/Reactor_Timer_Test.so .shobj/Reactor_Timer_Test.o .shobj/Reactor_Timer_Test.so: Reactor_Timer_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3922,7 +3753,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -3945,18 +3775,22 @@ realclean: clean
 .obj/Reader_Writer_Test.o .obj/Reader_Writer_Test.so .shobj/Reader_Writer_Test.o .shobj/Reader_Writer_Test.so: Reader_Writer_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -3982,7 +3816,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4007,18 +3840,22 @@ realclean: clean
 .obj/Recursive_Mutex_Test.o .obj/Recursive_Mutex_Test.so .shobj/Recursive_Mutex_Test.o .shobj/Recursive_Mutex_Test.so: Recursive_Mutex_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4046,7 +3883,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Get_Opt.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 \
@@ -4066,59 +3902,25 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/Reverse_Lock_Test.o .obj/Reverse_Lock_Test.so .shobj/Reverse_Lock_Test.o .shobj/Reverse_Lock_Test.so: Reverse_Lock_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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
 .obj/Semaphore_Test.o .obj/Semaphore_Test.so .shobj/Semaphore_Test.o .shobj/Semaphore_Test.so: Semaphore_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4144,7 +3946,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4169,18 +3970,22 @@ realclean: clean
 .obj/Service_Config_Test.o .obj/Service_Config_Test.so .shobj/Service_Config_Test.o .shobj/Service_Config_Test.so: Service_Config_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4211,7 +4016,6 @@ realclean: clean
  $(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 \
@@ -4229,8 +4033,6 @@ realclean: clean
  $(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 \
@@ -4245,18 +4047,22 @@ realclean: clean
 .obj/Sigset_Ops_Test.o .obj/Sigset_Ops_Test.so .shobj/Sigset_Ops_Test.o .shobj/Sigset_Ops_Test.so: Sigset_Ops_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4284,18 +4090,22 @@ realclean: clean
  test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4321,7 +4131,6 @@ realclean: clean
  $(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_T.h \
  $(ACE_ROOT)/ace/Free_List.h \
@@ -4347,18 +4156,22 @@ realclean: clean
 .obj/SOCK_Test.o .obj/SOCK_Test.so .shobj/SOCK_Test.o .shobj/SOCK_Test.so: SOCK_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4384,7 +4197,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4426,18 +4238,22 @@ realclean: clean
 .obj/SOCK_Connector_Test.o .obj/SOCK_Connector_Test.so .shobj/SOCK_Connector_Test.o .shobj/SOCK_Connector_Test.so: SOCK_Connector_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4479,18 +4295,22 @@ realclean: clean
 .obj/SPIPE_Test.o .obj/SPIPE_Test.so .shobj/SPIPE_Test.o .shobj/SPIPE_Test.so: SPIPE_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4516,7 +4336,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4540,8 +4359,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Addr.h \
  $(ACE_ROOT)/ace/Addr.i \
  $(ACE_ROOT)/ace/SPIPE_Addr.i \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/SPIPE_Connector.h \
  $(ACE_ROOT)/ace/SPIPE_Stream.h \
  $(ACE_ROOT)/ace/SPIPE.h \
@@ -4554,18 +4371,22 @@ realclean: clean
 .obj/SString_Test.o .obj/SString_Test.so .shobj/SString_Test.o .shobj/SString_Test.so: SString_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4588,25 +4409,26 @@ realclean: clean
  $(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/Malloc_Base.h
+ $(ACE_ROOT)/ace/Managed_Object.cpp
 .obj/SV_Shared_Memory_Test.o .obj/SV_Shared_Memory_Test.so .shobj/SV_Shared_Memory_Test.o .shobj/SV_Shared_Memory_Test.so: SV_Shared_Memory_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4631,7 +4453,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.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 \
@@ -4653,18 +4474,22 @@ realclean: clean
 .obj/Task_Test.o .obj/Task_Test.so .shobj/Task_Test.o .shobj/Task_Test.so: Task_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4695,7 +4520,6 @@ realclean: clean
  $(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 \
@@ -4730,8 +4554,6 @@ realclean: clean
  $(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 \
@@ -4746,15 +4568,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -4776,18 +4593,22 @@ realclean: clean
 .obj/Thread_Manager_Test.o .obj/Thread_Manager_Test.so .shobj/Thread_Manager_Test.o .shobj/Thread_Manager_Test.so: Thread_Manager_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4813,7 +4634,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4832,22 +4652,27 @@ 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/Thread_Manager.i \
+ Thread_Manager_Test.h
 .obj/Thread_Mutex_Test.o .obj/Thread_Mutex_Test.so .shobj/Thread_Mutex_Test.o .shobj/Thread_Mutex_Test.so: Thread_Mutex_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4873,7 +4698,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -4893,21 +4717,189 @@ realclean: clean
  $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/Memory_Pool.i \
  $(ACE_ROOT)/ace/Thread_Manager.i
-.obj/Thread_Pool_Test.o .obj/Thread_Pool_Test.so .shobj/Thread_Pool_Test.o .shobj/Thread_Pool_Test.so: Thread_Pool_Test.cpp test_config.h \
+.obj/Thread_Pool_Reactor_Test.o .obj/Thread_Pool_Reactor_Test.so .shobj/Thread_Pool_Reactor_Test.o .shobj/Thread_Pool_Reactor_Test.so: Thread_Pool_Reactor_Test.cpp \
+ $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
+ $(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/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/SOCK_Connector.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/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/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/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/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/Svc_Handler.h \
+ $(ACE_ROOT)/ace/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Task.h \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(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/Hash_Map_Manager.h \
+ $(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/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/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/Acceptor.i \
+ $(ACE_ROOT)/ace/Acceptor.cpp \
+ $(ACE_ROOT)/ace/TP_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor.h \
+ $(ACE_ROOT)/ace/Select_Reactor_T.h \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.h \
+ $(ACE_ROOT)/ace/Token.h \
+ $(ACE_ROOT)/ace/Token.i \
+ $(ACE_ROOT)/ace/Pipe.h \
+ $(ACE_ROOT)/ace/Pipe.i \
+ $(ACE_ROOT)/ace/Select_Reactor_Base.i \
+ $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
+ $(ACE_ROOT)/ace/Select_Reactor.i \
+ $(ACE_ROOT)/ace/TP_Reactor.i \
+ $(ACE_ROOT)/tests/Thread_Pool_Reactor_Test.h
+.obj/Thread_Pool_Test.o .obj/Thread_Pool_Test.so .shobj/Thread_Pool_Test.o .shobj/Thread_Pool_Test.so: Thread_Pool_Test.cpp test_config.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -4938,7 +4930,6 @@ realclean: clean
  $(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 \
@@ -4973,8 +4964,6 @@ realclean: clean
  $(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 \
@@ -4989,15 +4978,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5020,18 +5004,22 @@ realclean: clean
  $(ACE_ROOT)/tests/test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5059,18 +5047,22 @@ realclean: clean
 .obj/Time_Service_Test.o .obj/Time_Service_Test.so .shobj/Time_Service_Test.o .shobj/Time_Service_Test.so: Time_Service_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5095,25 +5087,26 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(ACE_ROOT)/ace/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Process.i
 .obj/Time_Value_Test.o .obj/Time_Value_Test.so .shobj/Time_Value_Test.o .shobj/Time_Value_Test.so: Time_Value_Test.cpp \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.h \
  test_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/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/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 \
@@ -5140,18 +5133,22 @@ realclean: clean
 .obj/Timer_Queue_Test.o .obj/Timer_Queue_Test.so .shobj/Timer_Queue_Test.o .shobj/Timer_Queue_Test.so: Timer_Queue_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5189,7 +5186,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(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 \
@@ -5216,21 +5212,138 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Hash.h \
  $(ACE_ROOT)/ace/Timer_Hash_T.h \
  $(ACE_ROOT)/ace/Timer_Hash_T.cpp
-.obj/TSS_Test.o .obj/TSS_Test.so .shobj/TSS_Test.o .shobj/TSS_Test.so: TSS_Test.cpp test_config.h \
+.obj/Tokens_Test.o .obj/Tokens_Test.so .shobj/Tokens_Test.o .shobj/Tokens_Test.so: Tokens_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
+ $(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/Process.h \
+ $(ACE_ROOT)/ace/Process.i \
+ $(ACE_ROOT)/ace/Get_Opt.h \
+ $(ACE_ROOT)/ace/Get_Opt.i \
+ $(ACE_ROOT)/ace/Local_Tokens.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/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/Synch_Options.h \
+ $(ACE_ROOT)/ace/Synch_Options.i \
+ $(ACE_ROOT)/ace/Map_Manager.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
+ $(ACE_ROOT)/ace/Map_Manager.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 \
+ $(ACE_ROOT)/ace/Local_Tokens.i \
+ $(ACE_ROOT)/ace/Token_Collection.h \
+ $(ACE_ROOT)/ace/Token_Collection.i \
+ $(ACE_ROOT)/ace/Remote_Tokens.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_Connector.h \
+ $(ACE_ROOT)/ace/SOCK_Stream.h \
+ $(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/SOCK_IO.i \
+ $(ACE_ROOT)/ace/SOCK_Stream.i \
+ $(ACE_ROOT)/ace/Time_Value.h \
+ $(ACE_ROOT)/ace/SOCK_Connector.i \
+ $(ACE_ROOT)/ace/Token_Request_Reply.h \
+ $(ACE_ROOT)/ace/Token_Request_Reply.i \
+ $(ACE_ROOT)/ace/Remote_Tokens.i \
+ $(ACE_ROOT)/ace/Thread_Manager.h \
+ $(ACE_ROOT)/ace/Thread_Manager.i \
+ $(ACE_ROOT)/ace/Token_Invariants.h \
+ $(ACE_ROOT)/ace/Token_Invariants.i
+.obj/TSS_Test.o .obj/TSS_Test.so .shobj/TSS_Test.o .shobj/TSS_Test.so: TSS_Test.cpp test_config.h \
+ $(ACE_ROOT)/ace/inc_user_config.h \
+ $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
+ $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5256,7 +5369,6 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.cpp \
  $(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 \
@@ -5280,18 +5392,22 @@ realclean: clean
 .obj/UPIPE_SAP_Test.o .obj/UPIPE_SAP_Test.so .shobj/UPIPE_SAP_Test.o .shobj/UPIPE_SAP_Test.so: UPIPE_SAP_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5319,7 +5435,6 @@ realclean: clean
  $(ACE_ROOT)/ace/IO_Cntl_Msg.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/Free_List.h \
@@ -5356,8 +5471,6 @@ realclean: clean
  $(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 \
@@ -5374,15 +5487,10 @@ realclean: clean
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5426,18 +5534,22 @@ realclean: clean
  test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/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/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 \
@@ -5468,7 +5580,6 @@ realclean: clean
  $(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 \
@@ -5503,8 +5614,6 @@ realclean: clean
  $(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 \
@@ -5519,15 +5628,10 @@ realclean: clean
  $(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/Hash_Map_Manager.i \
  $(ACE_ROOT)/ace/Strategies_T.i \
  $(ACE_ROOT)/ace/Strategies_T.cpp \
  $(ACE_ROOT)/ace/Service_Repository.h \
@@ -5553,366 +5657,25 @@ realclean: clean
  $(ACE_ROOT)/ace/High_Res_Timer.h \
  $(ACE_ROOT)/ace/High_Res_Timer.i \
  $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Naming_Test.o .obj/Naming_Test.so .shobj/Naming_Test.o .shobj/Naming_Test.so: Naming_Test.cpp test_config.h \
+.obj/XtReactor_Test.o .obj/XtReactor_Test.so .shobj/XtReactor_Test.o .shobj/XtReactor_Test.so: XtReactor_Test.cpp test_config.h \
  $(ACE_ROOT)/ace/inc_user_config.h \
  $(ACE_ROOT)/ace/config.h \
+ $(ACE_ROOT)/ace/config-sunos5.5.h \
  $(ACE_ROOT)/ace/config-g++-common.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/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Naming_Context.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/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/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Name_Proxy.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(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/Name_Request_Reply.h \
- $(ACE_ROOT)/ace/Name_Space.h \
- $(ACE_ROOT)/ace/Profile_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Profile_Timer.i
-.obj/Thread_Pool_Reactor_Test.o .obj/Thread_Pool_Reactor_Test.so .shobj/Thread_Pool_Reactor_Test.o .shobj/Thread_Pool_Reactor_Test.so: Thread_Pool_Reactor_Test.cpp \
- $(ACE_ROOT)/tests/test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/SOCK_Connector.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/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/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/Svc_Handler.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(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/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/Acceptor.i \
- $(ACE_ROOT)/ace/Acceptor.cpp \
- $(ACE_ROOT)/ace/TP_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor.h \
- $(ACE_ROOT)/ace/Select_Reactor_T.h \
- $(ACE_ROOT)/ace/Select_Reactor_Base.h \
- $(ACE_ROOT)/ace/Token.h \
- $(ACE_ROOT)/ace/Token.i \
- $(ACE_ROOT)/ace/Pipe.h \
- $(ACE_ROOT)/ace/Pipe.i \
- $(ACE_ROOT)/ace/Select_Reactor_Base.i \
- $(ACE_ROOT)/ace/Select_Reactor_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/Select_Reactor_T.i \
- $(ACE_ROOT)/ace/Select_Reactor.i \
- $(ACE_ROOT)/ace/TP_Reactor.i \
- $(ACE_ROOT)/tests/Thread_Pool_Reactor_Test.h
-.obj/XtReactor_Test.o .obj/XtReactor_Test.so .shobj/XtReactor_Test.o .shobj/XtReactor_Test.so: XtReactor_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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
-.obj/FlReactor_Test.o .obj/FlReactor_Test.so .shobj/FlReactor_Test.o .shobj/FlReactor_Test.so: FlReactor_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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
-.obj/TkReactor_Test.o .obj/TkReactor_Test.so .shobj/TkReactor_Test.o .shobj/TkReactor_Test.so: TkReactor_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Singleton.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -5936,117 +5699,5 @@ realclean: clean
  $(ACE_ROOT)/ace/Managed_Object.h \
  $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp
-.obj/Tokens_Test.o .obj/Tokens_Test.so .shobj/Tokens_Test.o .shobj/Tokens_Test.so: Tokens_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-g++-common.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/Process.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Process.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Local_Tokens.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/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/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
- $(ACE_ROOT)/ace/Map_Manager.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 \
- $(ACE_ROOT)/ace/Local_Tokens.i \
- $(ACE_ROOT)/ace/Token_Collection.h \
- $(ACE_ROOT)/ace/Token_Collection.i \
- $(ACE_ROOT)/ace/Remote_Tokens.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_Connector.h \
- $(ACE_ROOT)/ace/SOCK_Stream.h \
- $(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/SOCK_IO.i \
- $(ACE_ROOT)/ace/SOCK_Stream.i \
- $(ACE_ROOT)/ace/Time_Value.h \
- $(ACE_ROOT)/ace/SOCK_Connector.i \
- $(ACE_ROOT)/ace/Token_Request_Reply.h \
- $(ACE_ROOT)/ace/Token_Request_Reply.i \
- $(ACE_ROOT)/ace/Remote_Tokens.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Token_Invariants.h \
- $(ACE_ROOT)/ace/Token_Invariants.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/tests/Makefile.DLL b/tests/Makefile.DLL
deleted file mode 100644
index 2ed3909f987..00000000000
--- a/tests/Makefile.DLL
+++ /dev/null
@@ -1,96 +0,0 @@
-#----------------------------------------------------------------------------
-#       $Id$
-#
-#       Makefile for the DLL library in the DLL_Test example
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-LIB     = libDLL_Test.a
-SHLIB   = libDLL_Test.$(SOEXT)
-FILES   = DLL_Test
-LSRC    = $(addsuffix .cpp,$(FILES))
-
-LIBS   += $(ACELIB)
-
-BUILD   = $(VLIB) $(VSHLIB)
-
-#----------------------------------------------------------------------------
-#       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.local.GNU
-
-# To remake the DLL_Test source with xlC 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)
-endif
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Dependencies
-#----------------------------------------------------------------------------
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-.obj/DLL_Test.o .obj/DLL_Test.so .shobj/DLL_Test.o .shobj/DLL_Test.so: DLL_Test.cpp test_config.h \
- $(ACE_ROOT)/ace/inc_user_config.h \
- $(ACE_ROOT)/ace/config.h \
- $(ACE_ROOT)/ace/config-linux-lxpthreads.h \
- $(ACE_ROOT)/ace/config-linux-common.h \
- $(ACE_ROOT)/ace/config-g++-common.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/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/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/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 \
- $(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/DLL.h \
- $(ACE_ROOT)/ace/Auto_Ptr.h \
- $(ACE_ROOT)/ace/Auto_Ptr.i \
- $(ACE_ROOT)/ace/Auto_Ptr.cpp
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index fcc11f677b0..00000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,318 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for all the ACE ``one-button'' tests
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## We can't add "CLASSIX" to the SUBDIRS list as this point since "CLASSIX"
-## would be built before the "test" directory.  How do we get around this
-## without moving directories around?
-##                         -Ossama
-## SUBDIRS = CLASSIX \
-##           WinCE \
-##           version_tests
-
-INCLUDES = -I$(top_builddir) -I$(top_srcdir)
-
-## LDFLAGS = 
-## Libtool will automatically link against the "proper" library.
-## Do not change the "libACE.la."  It is not a typographical error!
-##
-## We override the "LIBS" variable provided by the configure script since
-## we should only need to link against the ACE library for these tests.
-LDADD = $(top_builddir)/ace/libACE.la
-##LIBS = $(top_builddir)/ace/libACE.la
-
-noinst_SCRIPTS = run_tests.sh \
-                 run_tests.psosim \
-                 run_tests.check \
-                 run_tests.vxworks \
-                 run_tests.bat
-
-if COMPILE_XTREACTOR_TEST
-XTREACTOR_TEST = XtReactor_Test
-else
-XTREACTOR_TEST = 
-endif
-
-## Build the shared library needed for the DLL_Test
-noinst_LTLIBRARIES = libDLL_Test.la
-libDLL_Test_la_LDFLAGS = -module
-libDLL_Test_la_SOURCES = $(DLL_Test_SOURCES)
-
-## Build the following test programs when a `make check' is
-## issued by the user.
-check_PROGRAMS = \
-        Aio_Platform_Test \
-        Atomic_Op_Test \
-        Barrier_Test \
-        Basic_Types_Test \
-        Buffer_Stream_Test \
-        CDR_Test \
-        Collection_Test \
-        Conn_Test \
-        DLL_Test \
-        DLList_Test \
-        Dynamic_Priority_Test \
-        Enum_Interfaces_Test \
-        Env_Value_Test \
-        Future_Test \
-        Handle_Set_Test \
-        Hash_Map_Manager_Test \
-        High_Res_Timer_Test \
-        IOStream_Test \
-        MM_Shared_Memory_Test \
-        MT_Reactor_Timer_Test \
-        MT_SOCK_Test \
-        Map_Manager_Test \
-        Map_Test \
-        Mem_Map_Test \
-        Message_Block_Test \
-        Message_Queue_Notifications_Test \
-        Message_Queue_Test \
-        Naming_Test \
-        New_Fail_Test \
-        Notify_Performance_Test \
-        OrdMultiSet_Test \
-        Pipe_Test \
-        Priority_Buffer_Test \
-        Priority_Reactor_Test \
-        Priority_Task_Test \
-        Process_Mutex_Test \
-        Process_Strategy_Test \
-        RB_Tree_Test \
-        Reactor_Exceptions_Test \
-        Reactor_Notify_Test \
-        Reactor_Performance_Test \
-        Reactor_Timer_Test \
-        Reactors_Test \
-        Reader_Writer_Test \
-        Recursive_Mutex_Test \
-        Reverse_Lock_Test \
-        SOCK_Connector_Test \
-        SOCK_Test \
-        SPIPE_Test \
-        SString_Test \
-        SV_Shared_Memory_Test \
-        Semaphore_Test \
-        Service_Config_Test \
-        Sigset_Ops_Test \
-        Simple_Message_Block_Test \
-        TSS_Test \
-        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 $(XTREACTOR_TEST)
-
-Aio_Platform_Test_SOURCES = Aio_Platform_Test.cpp
-
-Atomic_Op_Test_SOURCES = Atomic_Op_Test.cpp
-
-Barrier_Test_SOURCES = Barrier_Test.cpp
-
-Basic_Types_Test_SOURCES = Basic_Types_Test.cpp
-
-Buffer_Stream_Test_SOURCES = Buffer_Stream_Test.cpp
-
-CDR_Test_SOURCES = CDR_Test.cpp
-
-# Cache_Manager_Test_SOURCES = Cache_Manager_Test.cpp
-
-Collection_Test_SOURCES = Collection_Test.cpp
-
-Conn_Test_SOURCES = Conn_Test.cpp Conn_Test.h
-
-DLL_Test_SOURCES = DLL_Test.cpp DLL_Test.h
-
-DLList_Test_SOURCES = DLList_Test.cpp
-
-Dynamic_Priority_Test_SOURCES = Dynamic_Priority_Test.cpp
-
-Enum_Interfaces_Test_SOURCES = Enum_Interfaces_Test.cpp
-
-Env_Value_Test_SOURCES = Env_Value_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
-
-MM_Shared_Memory_Test_SOURCES = MM_Shared_Memory_Test.cpp
-
-MT_Reactor_Timer_Test_SOURCES = MT_Reactor_Timer_Test.cpp \
-                                MT_Reactor_Timer_Test.h
-
-MT_SOCK_Test_SOURCES = MT_SOCK_Test.cpp
-
-Map_Manager_Test_SOURCES = Map_Manager_Test.cpp
-
-Map_Test_SOURCES = Map_Test.cpp Map_Test.h
-
-Mem_Map_Test_SOURCES = Mem_Map_Test.cpp
-
-Message_Block_Test_SOURCES = Message_Block_Test.cpp
-
-Message_Queue_Notifications_Test_SOURCES = Message_Queue_Notifications_Test.cpp
-
-Message_Queue_Test_SOURCES = Message_Queue_Test.cpp
-
-Naming_Test_SOURCES = Naming_Test.cpp
-
-New_Fail_Test_SOURCES = New_Fail_Test.cpp
-
-Notify_Performance_Test_SOURCES = Notify_Performance_Test.cpp
-
-OrdMultiSet_Test_SOURCES = OrdMultiSet_Test.cpp
-
-Pipe_Test_SOURCES = Pipe_Test.cpp
-
-Priority_Buffer_Test_SOURCES = Priority_Buffer_Test.cpp
-
-Priority_Reactor_Test_SOURCES = Priority_Reactor_Test.cpp \
-                                Priority_Reactor_Test.h
-
-Priority_Task_Test_SOURCES = Priority_Task_Test.cpp
-
-Process_Mutex_Test_SOURCES = Process_Mutex_Test.cpp
-
-Process_Strategy_Test_SOURCES = Process_Strategy_Test.cpp \
-                                Process_Strategy_Test.h
-
-# Purgable_Map_Manager_Test_SOURCES = Purgable_Map_Manager_Test.cpp
-
-RB_Tree_Test_SOURCES = RB_Tree_Test.cpp
-
-Reactor_Exceptions_Test_SOURCES = Reactor_Exceptions_Test.cpp
-
-Reactor_Notify_Test_SOURCES = Reactor_Notify_Test.cpp
-
-Reactor_Performance_Test_SOURCES = Reactor_Performance_Test.cpp \
-                                   Reactor_Performance_Test.h
-
-Reactor_Timer_Test_SOURCES = Reactor_Timer_Test.cpp
-
-Reactors_Test_SOURCES = Reactors_Test.cpp
-
-Reader_Writer_Test_SOURCES = Reader_Writer_Test.cpp
-
-Recursive_Mutex_Test_SOURCES = Recursive_Mutex_Test.cpp
-
-Reverse_Lock_Test_SOURCES = Reverse_Lock_Test.cpp
-
-SOCK_Connector_Test_SOURCES = SOCK_Connector_Test.cpp
-
-SOCK_Test_SOURCES = SOCK_Test.cpp
-
-SPIPE_Test_SOURCES = SPIPE_Test.cpp
-
-SString_Test_SOURCES = SString_Test.cpp
-
-SV_Shared_Memory_Test_SOURCES = SV_Shared_Memory_Test.cpp
-
-Semaphore_Test_SOURCES = Semaphore_Test.cpp
-
-Service_Config_Test_SOURCES = Service_Config_Test.cpp
-
-Sigset_Ops_Test_SOURCES = Sigset_Ops_Test.cpp
-
-Simple_Message_Block_Test_SOURCES = Simple_Message_Block_Test.cpp
-
-TSS_Test_SOURCES = TSS_Test.cpp \
-                   TSS_Test_Errno.h
-
-Task_Test_SOURCES = Task_Test.cpp
-
-Thread_Manager_Test_SOURCES = Thread_Manager_Test.cpp \
-                              Thread_Manager_Test.h
-
-Thread_Mutex_Test_SOURCES = Thread_Mutex_Test.cpp
-
-Thread_Pool_Reactor_Test_SOURCES = Thread_Pool_Reactor_Test.cpp \
-                                   Thread_Pool_Reactor_Test.h
-
-Thread_Pool_Test_SOURCES = Thread_Pool_Test.cpp
-
-Time_Service_Test_SOURCES = Time_Service_Test.cpp
-
-Time_Value_Test_SOURCES = Time_Value_Test.cpp
-
-Timeprobe_Test_SOURCES = Timeprobe_Test.cpp
-
-Timer_Queue_Test_SOURCES = Timer_Queue_Test.cpp
-
-Tokens_Test_SOURCES = Tokens_Test.cpp
-
-UPIPE_SAP_Test_SOURCES = UPIPE_SAP_Test.cpp
-
-Upgradable_RW_Test_SOURCES = Upgradable_RW_Test.cpp \
-                             Upgradable_RW_Test.h
-
-XtReactor_Test_SOURCES = XtReactor_Test.cpp
-XtReactor_Test_LDADD = $(top_builddir)/ace/libACE.la @XTREACTOR_TEST_XLIBS@
-
-## Additional test header files
-noinst_HEADERS = test_config.h
-
-## Architecture independent data files
-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.
-## Do not run them if they are cross-compiled.
-if ACE_CROSS_COMPILED
-TESTS =
-else
-TESTS = $(noinst_PROGRAMS)
-endif
-
-## Set up the test environment
-##TESTS_ENVIRONMENT = 
-
-EXTRA_DIST = $(noinst_SCRIPTS) $(noinst_DATA)
-
-##DISTCLEANFILES = ace_pipe_name pattern \
-##                 $(tmp)/ace_temp_file* \
-##                 $(tmp)/ace_test_file \
-##                 $(tmp)/Naming_Test*
-
-## Run local targets
-## all-local: log_dir
-
-## Create tests `log' directory
-## log_dir:
-## 	if test -d log; then : else mkdir log; fi
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *.bak *.rpo *.sym lib*.*_pure_* Makefile.old core
-	-rm -rf ptrepository Templates.DB gcctemp.c gcctemp so_locations
-
-## Clean up `log' directory , etc.
-distclean-local:
-	-rm -rf log
diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp
index a40acf9e419..d92f2cd83aa 100644
--- a/tests/Map_Manager_Test.cpp
+++ b/tests/Map_Manager_Test.cpp
@@ -49,7 +49,7 @@ typedef ACE_Hash_Map_Entry <TYPE, TYPE> HASH_ENTRY;
 typedef ACE_Active_Map_Manager <TYPE> ACTIVE_MAP_MANAGER;
 
 static void
-test_active_map_manager (size_t table_size,
+test_active_map_manager (size_t table_size, 
                          size_t iterations,
                          int test_iterators)
 {
@@ -58,7 +58,7 @@ test_active_map_manager (size_t table_size,
   TYPE j;
   ssize_t k;
 
-  ACTIVE_MAP_MANAGER::key_type *active_keys
+  ACTIVE_MAP_MANAGER::key_type *active_keys 
     = new ACTIVE_MAP_MANAGER::key_type[iterations];
 
   for (i = 0; i < iterations; i++)
@@ -78,8 +78,8 @@ test_active_map_manager (size_t table_size,
             ACE_DEBUG ((LM_DEBUG,
                         ASYS_TEXT ("(%d|%d-%d|%d)"),
                         i,
-                        entry.ext_id_.slot_index (),
-                        entry.ext_id_.slot_generation (),
+                        entry.ext_id_.index (),
+                        entry.ext_id_.generation (),
                         entry.int_id_));
             ++i;
           }
@@ -103,8 +103,8 @@ test_active_map_manager (size_t table_size,
             ACE_DEBUG ((LM_DEBUG,
                         ASYS_TEXT ("(%d|%d-%d|%d)"),
                         k,
-                        entry.ext_id_.slot_index (),
-                        entry.ext_id_.slot_generation (),
+                        entry.ext_id_.index (),
+                        entry.ext_id_.generation (),
                         entry.int_id_));
             k--;
           }
@@ -133,7 +133,7 @@ test_active_map_manager (size_t table_size,
 }
 
 static void
-test_hash_map_manager (size_t table_size,
+test_hash_map_manager (size_t table_size, 
                        size_t iterations,
                        int test_iterators)
 {
@@ -339,7 +339,7 @@ test_hash_map_manager (size_t table_size,
 }
 
 static void
-test_map_manager (size_t table_size,
+test_map_manager (size_t table_size, 
                   size_t iterations,
                   int test_iterators)
 {
@@ -658,3 +658,4 @@ template class ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>;
 #pragma instantiate ACE_Map_Reverse_Iterator<ACE_Active_Map_Manager_Key, TYPE, MUTEX>
 #pragma instantiate ACE_Map_Entry<ACE_Active_Map_Manager_Key, TYPE>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp
index f59178295ee..8de0bee3a87 100644
--- a/tests/Map_Test.cpp
+++ b/tests/Map_Test.cpp
@@ -18,7 +18,7 @@
 // ============================================================================
 
 #include "test_config.h"
-#include "Map_Test.h"
+#include "ace/Containers.h"
 #include "ace/Map_T.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Synch.h"
@@ -30,6 +30,129 @@ USELIB("..\ace\aced.lib");
 //---------------------------------------------------------------------------
 #endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
 
+// Key data type.
+typedef ACE_Array<char> KEY;
+
+////////////////////////////////////////////////////////////////////////////////
+
+class Key_Generator
+{
+  // = TITLE  
+  //     Defines a key generator.
+  //
+  // = DESCRIPTION
+  //     This class is used in adapters of maps that do not produce keys.
+public:
+  
+  Key_Generator (void)
+    : counter_ (0)
+    {
+    }
+
+  int operator() (KEY &key)
+    {
+      // Keep original information in the key intact.
+      size_t original_size = key.size ();
+
+      // Size of this counter key.
+      size_t counter_key_size = sizeof this->counter_;
+
+      // Resize to accommodate both the original data and the new key.
+      key.size (counter_key_size + original_size);
+
+      // Add new key data.
+      ACE_OS::memcpy (&key[original_size],
+                      &++this->counter_,
+                      sizeof this->counter_);
+      
+      // Success.
+      return 0;
+    }
+
+private:  
+  u_long counter_;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+class Hash_Key
+{
+public:
+  u_long operator () (const KEY &key) const
+    {
+      // Recover system generated part of key.
+      u_long value;            
+      size_t counter_key_size = sizeof (u_long);
+
+      // Copy system key from user key.
+      ACE_OS::memcpy (&value,
+                      &key[key.size () - counter_key_size],
+                      sizeof value);      
+      
+      // Return the system key value as the hash value.
+      return value;
+    } 
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+class Key_Adapter
+{
+public:
+
+  int encode (const KEY &original_key,
+              const ACE_Active_Map_Manager_Key &active_key,
+              KEY &modified_key)
+    {
+      // Keep original information in the key intact.
+      modified_key = original_key;
+      size_t original_size = modified_key.size ();
+
+      // Size of active key.
+      size_t active_key_size = active_key.size ();
+
+      // Resize to accommodate both the original data and the new active key.
+      modified_key.size (active_key_size + original_size);
+
+      // Copy active key data into user key.
+      active_key.encode (&modified_key[original_size]);
+
+      // Success.
+      return 0;
+    }
+
+  int decode (const KEY &modified_key,
+              ACE_Active_Map_Manager_Key &active_key)
+    {
+      // Read the active key data from the back of the key.
+      size_t active_key_size = active_key.size ();      
+      size_t original_size = modified_key.size () - active_key_size;
+
+      // Read off value of index and generation.
+      active_key.decode (&modified_key[original_size]);
+
+      // Success.
+      return 0;
+    }
+
+  int decode (const KEY &modified_key,
+              KEY &original_key)
+    {
+      // Read the original user key data from the front of the
+      // modified key.
+      size_t active_key_size = ACE_Active_Map_Manager_Key::size ();      
+
+      // Copy all the data.
+      original_key = modified_key;
+
+      // Resize to ignore active key data.
+      original_key.size (original_key.size () - active_key_size);
+
+      // Success.
+      return 0;
+    }
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 // Value type.
diff --git a/tests/Map_Test.h b/tests/Map_Test.h
deleted file mode 100644
index 432ae1a4d57..00000000000
--- a/tests/Map_Test.h
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-// 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
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/OS.h"
-#include "ace/Active_Map_Manager.h"
-#include "ace/Containers.h"
-
-
-// Key data type.
-typedef ACE_Array<char> KEY;
-
-////////////////////////////////////////////////////////////////////////////////
-
-class Key_Generator
-{
-  // = TITLE  
-  //     Defines a key generator.
-  //
-  // = DESCRIPTION
-  //     This class is used in adapters of maps that do not produce keys.
-public:
-  
-  Key_Generator (void)
-    : counter_ (0)
-    {
-    }
-
-  int operator() (KEY &key)
-    {
-      // Keep original information in the key intact.
-      size_t original_size = key.size ();
-
-      // Size of this counter key.
-      size_t counter_key_size = sizeof this->counter_;
-
-      // Resize to accommodate both the original data and the new key.
-      key.size (counter_key_size + original_size);
-
-      // Add new key data.
-      ACE_OS::memcpy (&key[original_size],
-                      &++this->counter_,
-                      sizeof this->counter_);
-      
-      // Success.
-      return 0;
-    }
-
-private:  
-  u_long counter_;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class Hash_Key
-{
-public:
-  u_long operator () (const KEY &key) const
-    {
-      // Recover system generated part of key.
-      u_long value;            
-      size_t counter_key_size = sizeof (u_long);
-
-      // Copy system key from user key.
-      ACE_OS::memcpy (&value,
-                      &key[key.size () - counter_key_size],
-                      sizeof value);      
-      
-      // Return the system key value as the hash value.
-      return value;
-    } 
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class Key_Adapter
-{
-public:
-
-  int encode (const KEY &original_key,
-              const ACE_Active_Map_Manager_Key &active_key,
-              KEY &modified_key)
-    {
-      // Keep original information in the key intact.
-      modified_key = original_key;
-      size_t original_size = modified_key.size ();
-
-      // Size of active key.
-      size_t active_key_size = active_key.size ();
-
-      // Resize to accommodate both the original data and the new active key.
-      modified_key.size (active_key_size + original_size);
-
-      // Copy active key data into user key.
-      active_key.encode (&modified_key[original_size]);
-
-      // Success.
-      return 0;
-    }
-
-  int decode (const KEY &modified_key,
-              ACE_Active_Map_Manager_Key &active_key)
-    {
-      // Read the active key data from the back of the key.
-      size_t active_key_size = active_key.size ();      
-      size_t original_size = modified_key.size () - active_key_size;
-
-      // Read off value of index and generation.
-      active_key.decode (&modified_key[original_size]);
-
-      // Success.
-      return 0;
-    }
-
-  int decode (const KEY &modified_key,
-              KEY &original_key)
-    {
-      // Read the original user key data from the front of the
-      // modified key.
-      size_t active_key_size = ACE_Active_Map_Manager_Key::size ();      
-
-      // Copy all the data.
-      original_key = modified_key;
-
-      // Resize to ignore active key data.
-      original_key.size (original_key.size () - active_key_size);
-
-      // Success.
-      return 0;
-    }
-};
-
-#endif /* ACE_MAP_TEST_H */
diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp
index 4ebc1724591..70161c33c94 100644
--- a/tests/Message_Block_Test.cpp
+++ b/tests/Message_Block_Test.cpp
@@ -91,8 +91,7 @@ Worker_Task::svc (void)
   // The <ACE_Task::svc_run()> method automatically adds us to the
   // process-wide <ACE_Thread_Manager> when the thread begins.
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) starting svc() method\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) starting svc() method\n")));
 
   // Keep looping, reading a message out of the queue, until we get a
   // message with a length == 0, which signals us to quit.
@@ -122,8 +121,7 @@ Worker_Task::svc (void)
 
           ACE_ASSERT (count == current_count);
 
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%t) enqueueing %d duplicates\n"),
+          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) enqueueing %d duplicates\n"),
                       current_count));
 
           ACE_Message_Block *dup;
@@ -131,9 +129,7 @@ Worker_Task::svc (void)
           // Enqueue <current_count> duplicates with msg_priority == 1.
           for (i = current_count; i > 0; i--)
             {
-              ACE_ALLOCATOR_RETURN (dup,
-                                    mb->duplicate (),
-                                    -1);
+              ACE_ALLOCATOR_RETURN (dup, mb->duplicate (), -1);
               // Set the priority to be greater than "normal"
               // messages.  Therefore, all of these messages should go
               // to the "front" of the queue, i.e., ahead of all the
@@ -147,8 +143,7 @@ Worker_Task::svc (void)
                            (ACE_Time_Value *) &ACE_Time_Value::zero) != -1);
             }
 
-          ACE_DEBUG ((LM_DEBUG,
-                      ASYS_TEXT ("(%t) dequeueing %d duplicates\n"),
+          ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) dequeueing %d duplicates\n"),
                       current_count));
 
           // Dequeue the same <current_count> duplicates.
@@ -191,9 +186,7 @@ Worker_Task::Worker_Task (void)
 {
   // Make us an Active Object.
   if (this->activate (THR_NEW_LWP) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT ("%p\n"),
-                ASYS_TEXT ("activate failed")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("activate failed")));
 }
 
 static int
@@ -228,9 +221,7 @@ produce (Worker_Task &worker_task,
       if (worker_task.put (mb,
                            // Don't block indefinitely if we flow control...
                            (ACE_Time_Value *) &ACE_Time_Value::zero) == -1)
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT (" (%t) %p\n"),
-                    ASYS_TEXT ("put")));
+        ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put")));
     }
 
   // Send a shutdown message to the waiting threads and exit.
@@ -238,21 +229,15 @@ produce (Worker_Task &worker_task,
               ASYS_TEXT ("\n(%t) sending shutdown message\n")));
 
   ACE_NEW_RETURN (mb,
-                  ACE_Message_Block (0,
-                                     ACE_Message_Block::MB_DATA,
-                                     0,
-                                     0,
-                                     alloc_strategy,
-                                     &lock_adapter_),
+                  ACE_Message_Block (0, ACE_Message_Block::MB_DATA,
+                                     0, 0, alloc_strategy, &lock_adapter_),
                   -1);
 
   if (worker_task.put (mb) == -1)
-    ACE_ERROR ((LM_ERROR,
-                ASYS_TEXT (" (%t) %p\n"),
-                ASYS_TEXT ("put")));
+    ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put")));
+
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n(%t) end producer\n")));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("\n(%t) end producer\n")));
   return 0;
 }
 
@@ -261,6 +246,7 @@ typedef ASYS_TCHAR MEMORY_CHUNK[ACE_MALLOC_ALIGN * ACE_ALLOC_SIZE];
 ACE_Cached_Allocator<MEMORY_CHUNK,
                      ACE_SYNCH_MUTEX>
                      mem_allocator (ACE_ALLOC_AMOUNT);
+
 struct
 {
   ACE_Allocator *strategy_;
@@ -339,11 +325,9 @@ main (int, ASYS_TCHAR *[])
   for (i = 0; i < ACE_ALLOC_STRATEGY_NO; i++)
     ACE_DEBUG ((LM_DEBUG,
                 ASYS_TEXT ("Elapsed time using %s allocation strategy: %f sec\n"),
-                alloc_struct[i].name_,
-                alloc_struct[i].et_.real_time));
+                alloc_struct[i].name_, alloc_struct[i].et_.real_time));
 
-  ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%t) Exiting...\n")));
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) Exiting...\n")));
 #else
   ACE_ERROR ((LM_INFO,
               ASYS_TEXT ("threads not supported on this platform\n")));
diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp
index 60966b6ec6c..699263a3138 100644
--- a/tests/Message_Queue_Notifications_Test.cpp
+++ b/tests/Message_Queue_Notifications_Test.cpp
@@ -216,7 +216,7 @@ Watermark_Test::producer (void)
       i--;
     }
   ACE_DEBUG ((LM_DEBUG,
-              ASYS_TEXT ("(%P|%t) Producer: High water mark hit ---- \n")));
+              "(%P|%t) Producer: High water mark hit ---- \n"));
 
   ACE_MT (this->mq_full_.wait ());
 
@@ -304,8 +304,8 @@ Watermark_Test::print_producer_debug_message (void)
 int
 Watermark_Test::svc (void)
 {
-  // this->role_ is an Atomic_Op object.
-  int role = this->role_++;
+  int role = this->role_.value ();
+  this->role_++;
 
   switch (role)
     {
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 410c5d73a7b..0944657ff28 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -235,12 +235,13 @@ single_thread_performance_test (int queue_type = 0)
   // heap in case messages is large relative to the amount of
   // stack space available.
   ACE_Message_Block *receive_block;
-  ACE_NEW_RETURN (receive_block,
-                  ACE_Message_Block[messages],
-                  -1);
+  ACE_NEW_RETURN (receive_block, ACE_Message_Block[messages], -1);
 
   for (i = 0; i < messages; ++i)
     {
+      // There's got to be a better way to do this.  <init> doesn't
+      // delete any existing data block, so we do it explicitly.
+      delete receive_block[i].data_block ();
       receive_block[i].init (MAX_MESSAGE_SIZE);
 
       // For VxWorks Message Queues, the receive block pointer must be
@@ -316,6 +317,9 @@ receiver (void *arg)
 
   for (i = 0; i < messages; ++i)
     {
+      // There's got to be a better way to do this.  <init> doesn't
+      // delete any existing data block, so we do it explicitly.
+      delete receive_block[i].data_block ();
       receive_block[i].init (MAX_MESSAGE_SIZE);
 
       // For VxWorks Message Queues, the receive block pointer must be
@@ -405,7 +409,7 @@ performance_test (int queue_type = 0)
       ACE_NEW_RETURN (queue_wrapper.q_,
                       ACE_Message_Queue_NT,
                       -1);
-      message = ASYS_TEXT ("ACE_Message_Queue_NT");
+      message = "ACE_Message_Queue_NT";
     }
 #endif /* VXWORKS */
 
@@ -429,7 +433,7 @@ performance_test (int queue_type = 0)
   ACE_Time_Value tv;
   timer->elapsed_time (tv);
   ACE_DEBUG ((LM_INFO, ASYS_TEXT ("%s: %u messages took %u msec (%f msec/message)\n"),
-              message,
+              ASYS_WIDE_STRING (message),
               messages,
               tv.msec (),
               (double) tv.msec () / messages));
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
deleted file mode 100644
index bec580eda47..00000000000
--- a/tests/New_Fail_Test.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    New_Fail_Test.cpp
-//
-// = DESCRIPTION
-//    Checks to be sure that a failed ACE_NEW[_RETURN] doesn't end up throwing
-//    an exception up to the caller.
-//
-//    Note that this test doesn't get a real attempt on platforms which:
-//      1. Are known to throw exceptions when 'new' runs out of resources,
-//      2. Are built with exceptions disabled.
-//    In these cases, the test puts a message in the log noting that a failed
-//    new will throw an exception, and trust that the user accepts that risk.
-//
-// = AUTHOR
-//    Steve Huston
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS.h"
-#include "ace/CORBA_macros.h"
-
-ACE_RCSID(tests, New_Fail_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-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.
-//
-// 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
-
-
-static void try_ace_new (char **p)
-{
-  ACE_NEW (*p, char[BIG_BLOCK]);
-  return;
-}
-
-
-static char * try_ace_new_return (void)
-{
-  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.
-#if (defined (__SUNPRO_CC) || defined (__GNUG__)) && \
-    !defined (ACE_HAS_EXCEPTIONS)
-  ACE_DEBUG ((LM_NOTICE, "Out-of-memory will throw an unhandled exception\n"));
-  ACE_DEBUG ((LM_NOTICE, "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 */;
-#else
-
-  char *blocks[MAX_ALLOCS_IN_TEST];
-  int i;
-
-#if defined (ACE_HAS_EXCEPTIONS)
-  try
-    {
-#endif /* ACE_HAS_EXCEPTIONS */
-      // First part: test ACE_NEW
-      for (i = 0; i < MAX_ALLOCS_IN_TEST; i++)
-        {
-          try_ace_new (&blocks[i]);
-          if (blocks[i] == 0)
-            break;
-        }
-      if (i == MAX_ALLOCS_IN_TEST)
-        {
-          ACE_ERROR((LM_WARNING,
-                     "Test didn't exhaust all available memory\n"));
-          --i;    // Back up to valid pointer for deleting
-        }
-      else
-        {
-          ACE_ASSERT (blocks[i] == 0);
-          ACE_ASSERT (errno == ENOMEM);
-          ACE_DEBUG((LM_DEBUG, "ACE_NEW failed properly at block %d\n", i));
-        }
-
-      // Free the memory to try ACE_NEW_RETURN
-      while (i >= 0)
-        delete [] blocks[i--];
-
-      // Second part: test ACE_NEW_RETURN
-      for (i = 0; i < MAX_ALLOCS_IN_TEST; i++)
-        {
-          blocks[i] = try_ace_new_return ();
-          if (blocks[i] == 0)
-            break;
-        }
-      if (i == MAX_ALLOCS_IN_TEST)
-        {
-          ACE_ERROR((LM_WARNING,
-                     "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, "ACE_NEW_RETURN failed properly at block %d\n",
-                      i));
-        }
-      while (i >= 0)
-        delete [] blocks[i--];
-
-#if defined (ACE_HAS_EXCEPTIONS)
-    }
-
-  catch (...)
-    {
-      ACE_ERROR ((LM_ERROR,
-        "Caught exception during test; "
-        "ACE_bad_alloc not defined correctly, or\n"));
-      ACE_ERROR ((LM_ERROR,
-        "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 */
-
-  ACE_END_TEST;
-  return status;
-}
diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp
deleted file mode 100644
index d7b105d4684..00000000000
--- a/tests/New_Fail_Test.dsp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Microsoft Developer Studio Project File - Name="New_Fail_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=New_Fail_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 "New_Fail_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 "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 Debug"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "New_Fail_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE 

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-# 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 ""

-# 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" /D "_MBCS" /FD /c

-# SUBTRACT CPP /YX

-# 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"

-# Begin Target

-

-# Name "New_Fail_Test - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\New_Fail_Test.cpp

-# End Source File

-# End Target

-# End Project

diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp
index 6083846ee76..f96947337a9 100644
--- a/tests/Notify_Performance_Test.cpp
+++ b/tests/Notify_Performance_Test.cpp
@@ -178,10 +178,7 @@ main (int argc, ASYS_TCHAR *argv[])
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor)
-    {
-      auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
-      impl = auto_impl;
-    }
+    impl = auto_ptr <ACE_Reactor_Impl> (ACE_Reactor::instance ()->implementation ());
 
   // Callback object
   Handler handler;
diff --git a/tests/OrdMultiSet_Test.cpp b/tests/OrdMultiSet_Test.cpp
index 1b375be84b7..86bc85a3090 100644
--- a/tests/OrdMultiSet_Test.cpp
+++ b/tests/OrdMultiSet_Test.cpp
@@ -9,9 +9,9 @@
 //    OrdMultiSet_Test.cpp
 //
 // = DESCRIPTION
-//    This is a simple test of the ACE_Ordered_MultiSet and
+//    This is a simple test of the ACE_Ordered_MultiSet and 
 //    ACE_Ordered_MultiSet_Iterator class templates, instantiating them with
-//    type int.  No command line arguments are needed to run the test.
+//    type int.  No command line arguments are needed to run the test.  
 //
 // = AUTHOR
 //    Chris Gill
@@ -72,7 +72,7 @@ main (int, ASYS_TCHAR *[])
       iter.next (ptr);
       ACE_ASSERT (ptr != 0);
       ACE_ASSERT (*ptr == i);
-
+    
       // move to the next element in the set
       iter.advance ();
     }
@@ -93,7 +93,7 @@ main (int, ASYS_TCHAR *[])
       iter.next (ptr);
       ACE_ASSERT (ptr != 0);
       ACE_ASSERT (*ptr == i);
-
+    
       // Move to the previous element in the set.
       iter.retreat ();
     }
@@ -139,7 +139,7 @@ main (int, ASYS_TCHAR *[])
   while (set.remove (202) == 0);
   while (set.remove (203) == 0);
 
-  // Put the iterator out of range and make sure it stays
+  // Put the iterator out of range and make sure it stays 
   // that way for finds on the missing elements.
   iter.last ();
   iter.advance ();
@@ -152,15 +152,15 @@ main (int, ASYS_TCHAR *[])
 
   // Make sure the other elements can be found.
   set.find (205, iter);
-  ACE_ASSERT (iter.done () == 0);
+  ACE_ASSERT (iter.done () == 0);  
   iter.next (ptr);
-  ACE_ASSERT (ptr != 0);
-  ACE_ASSERT (*ptr == 205);
+  ACE_ASSERT (ptr != 0);  
+  ACE_ASSERT (*ptr == 205);  
   set.find (201, iter);
-  ACE_ASSERT (iter.done () == 0);
+  ACE_ASSERT (iter.done () == 0);  
   iter.next (ptr);
-  ACE_ASSERT (ptr != 0);
-  ACE_ASSERT (*ptr == 201);
+  ACE_ASSERT (ptr != 0);  
+  ACE_ASSERT (*ptr == 201);  
 
   // Finally, iterate through the set and make sure its contents are
   // correct (one 201 and five 205s).
@@ -168,7 +168,7 @@ main (int, ASYS_TCHAR *[])
   ACE_ASSERT (iter.done () == 0);
   iter.next (ptr);
   ACE_ASSERT (ptr != 0);
-  ACE_ASSERT (*ptr == 201);
+  ACE_ASSERT (*ptr == 201);  
   iter.advance ();
 
   for (i = 1; i <= 5; ++i)
@@ -178,7 +178,7 @@ main (int, ASYS_TCHAR *[])
       ACE_ASSERT (iter.done () == 0);
       iter.next (ptr);
       ACE_ASSERT (ptr != 0);
-      ACE_ASSERT (*ptr == 205);
+      ACE_ASSERT (*ptr == 205);  
 
       // Move to the next element in the set.
       iter.advance ();
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 59b5f132e8b..ff6c3f5a83d 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -45,12 +45,7 @@ USELIB("..\ace\aced.lib");
 
 // The number of children to run, it can be changed using the -c
 // option.
-static int opt_nchildren =
-#if defined (__Lynx__)
-  5;
-#else  /* ! __Lynx__ */
- 10;
-#endif /* ! __Lynx__ */
+static int opt_nchildren = 10;
 
 // The number of loops per children, it can be changed using the -l
 // option.
@@ -186,7 +181,7 @@ Write_Handler::svc (void)
 static void *
 client (void *arg)
 {
-  ACE_INET_Addr *connection_addr =
+  ACE_INET_Addr *connection_addr = 
     ACE_reinterpret_cast (ACE_INET_Addr *, arg);
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) running client\n"));
@@ -283,13 +278,10 @@ main (int argc, char *argv[])
     {
       ACE_Select_Reactor *impl_ptr;
       ACE_NEW_RETURN (impl_ptr, ACE_Priority_Reactor, -1);
-      auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr);
-      impl = auto_impl;
-
+      impl = auto_ptr<ACE_Select_Reactor> (impl_ptr);
       ACE_Reactor *reactor_ptr;
       ACE_NEW_RETURN (reactor_ptr, ACE_Reactor (impl_ptr), -1);
-      auto_ptr<ACE_Reactor> auto_reactor (reactor_ptr);
-      reactor = auto_reactor;
+      reactor = auto_ptr<ACE_Reactor> (reactor_ptr);
       ACE_Reactor::instance (reactor_ptr);
     }
 
diff --git a/tests/Process_Strategy_Test.cpp b/tests/Process_Strategy_Test.cpp
index 11ec1c318c5..ca939ea2fec 100644
--- a/tests/Process_Strategy_Test.cpp
+++ b/tests/Process_Strategy_Test.cpp
@@ -236,13 +236,7 @@ Options::parse_args (int argc, char *argv[])
                       -1);
       break;
 #else
-#  if defined (ACE_PSOS_DIAB)
-      // Workaround for compiler confusion with strings in assertions.
-      const int PROCESS_INVALID_ON_THIS_PLATFORM = 1;
-      ACE_ASSERT (PROCESS_INVALID_ON_THIS_PLATFORM == 0);
-#  else /* ! defined (ACE_PSOS_DIAB) */
       ACE_ASSERT ("PROCESS invalid on this platform" == 0);
-#  endif /* defined (ACE_PSOS_DIAB) */
 #endif /* !defined (ACE_LACKS_FORK) */
     case Options::THREAD:
 #if defined (ACE_HAS_THREADS)
@@ -624,7 +618,7 @@ main (int argc, char *argv[])
 
 #if !defined (ACE_LACKS_FORK)
       // We're running the client and serve as separate processes.
-      pid_t pid = ACE::fork ("child",
+      pid_t pid = ACE::fork ("child", 
                              1); // Avoid zombies.
 
       switch (pid)
diff --git a/tests/RB_Tree_Test.cpp b/tests/RB_Tree_Test.cpp
index ef89caf7205..32245ca19d7 100644
--- a/tests/RB_Tree_Test.cpp
+++ b/tests/RB_Tree_Test.cpp
@@ -10,13 +10,13 @@
 //
 // = DESCRIPTION
 //    This is a test to verify and illustrate the use of the ACE_RB_Tree
-//    and ACE_RB_Tree_Iterator classes.  Two different key and item types are
-//    used in order to demonstrate specialization of the ACE_Less_Than
-//    comparison function object template: int (for which the native <
+//    and ACE_RB_Tree_Iterator classes.  Two different key and item types are 
+//    used in order to demonstrate specialization of the ACE_Less_Than 
+//    comparison function object template: int (for which the native < 
 //    operator is sufficient), and char * (for which < operator semantics must
-//    be replaced by strcmp semantics).  An RB tree for each of the four
+//    be replaced by strcmp semantics).  An RB tree for each of the four 
 //    possible type parameter permutations over int and char * is constructed
-//    and filled in, and the resulting order is checked via an iterator over
+//    and filled in, and the resulting order is checked via an iterator over 
 //    each.
 //
 // = AUTHOR
@@ -38,10 +38,10 @@ USELIB("..\ace\aced.lib");
 
 // These arrays of numbers as ints and character strings
 // are used to instantiate key and item nodes in the tree.
-static char *number_strings [] = {"10", "20", "30", "40",
+static char *number_strings [] = {"10", "20", "30", "40", 
                                   "50", "60", "70", "80"};
 
-static int number_integers [] = {10, 20, 30, 40,
+static int number_integers [] = {10, 20, 30, 40, 
                                  50, 60, 70, 80};
 
 // These arrays of ints are used to shuffle the order of insertion
@@ -49,7 +49,7 @@ static int number_integers [] = {10, 20, 30, 40,
 static int int_int_index [] = {0, 1, 2, 3, 4, 5, 6, 7}; // LR inorder
 static int int_str_index [] = {7, 6, 5, 4, 3, 2, 1, 0}; // RL inorder
 static int str_int_index [] = {4, 6, 2, 7, 5, 3, 1, 0}; // RL BFS
-static int str_str_index [] = {4, 2, 1, 0, 3, 6, 5, 7}; // LR preorder
+static int str_str_index [] = {4, 2, 1, 0, 3, 6, 5, 7}; // LR preorder 
 
 // Number of entries placed in each tree.
 static int RB_TREE_TEST_ENTRIES = 8;
@@ -62,334 +62,141 @@ main (int, ASYS_TCHAR *[])
   // Local variables used to index arrays.
   int i, k;
 
-  // Construct eight RB_Trees.  Specialization of the ACE_Less_Than template
+  // Construct four RB_Trees.  Specialization of the ACE_Less_Than template
   // for character strings performs strcmp style string comparisons rather
   // than < operator comparison of the pointers themselves.
-  ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_tree1, int_int_tree2;
-  ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_tree1, int_str_tree2;
-  ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_tree1, str_int_tree2;
-  ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_tree1, str_str_tree2;
+  ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_tree;
+  ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_tree;
+  ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_tree;
+  ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_tree;
 
-  // First, test the new ACE_Hash_Map_Manager_Ex compliant interface.
   // Fill in each tree with the key and item from the appropriate arrays,
   // using the shuffle indexes to create different insertion orders.
   for (i = 0; i < RB_TREE_TEST_ENTRIES; ++i)
     {
-      char *str_item;
-      int int_item;
-
       k = int_int_index [i];
       ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      int_item = -1;
-      int_int_tree1.insert (number_integers [k], number_integers [k]);
-      ACE_ASSERT ((int_int_tree1.find (number_integers [k], int_item) == 0) &&
-                  (int_item == number_integers [k]));
-
-      k = int_str_index [i];
-      ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      str_item = 0;
-      int_str_tree1.insert (number_integers [k], number_strings [k]);
-      ACE_ASSERT ((int_str_tree1.find (number_integers [k], str_item) == 0) &&
-                  (str_item == number_strings [k]));
-
-      k = str_int_index [i];
-      ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      int_item = -1;
-      str_int_tree1.insert (number_strings [k], number_integers [k]);
-      ACE_ASSERT ((str_int_tree1.find (number_strings [k], int_item) == 0) &&
-                  (int_item == number_integers [k]));
-
-      k = str_str_index [i];
-      ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      str_item = 0;
-      str_str_tree1.insert (number_strings [k], number_strings [k]);
-      ACE_ASSERT ((str_str_tree1.find (number_strings [k], str_item) == 0) &&
-                  (str_item == number_strings [k]));
-    }
-
-
-  // Second, test the deprecated interface.  This portion of the test will
-  // go away when the deprecated interface is removed
-  // Fill in each tree with the key and item from the appropriate arrays,
-  // using the shuffle indexes to create different insertion orders.
-  for (i = 0; i < RB_TREE_TEST_ENTRIES; ++i)
-    {
-      k = int_int_index [i];
-      ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      int_int_tree2.insert (number_integers [k], number_integers [k]);
-      ACE_ASSERT ((int_int_tree2.find (number_integers [k]) != 0) &&
-                  (*int_int_tree2.find (number_integers [k]) ==
+      int_int_tree.insert (number_integers [k], number_integers [k]);
+      ACE_ASSERT ((int_int_tree.find (number_integers [k]) != 0) && 
+                  (*int_int_tree.find (number_integers [k]) == 
                    number_integers [k]));
 
       k = int_str_index [i];
       ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      int_str_tree2.insert (number_integers [k], number_strings [k]);
-      ACE_ASSERT ((int_str_tree2.find (number_integers [k]) != 0) &&
-                  (*int_str_tree2.find (number_integers [k]) ==
+      int_str_tree.insert (number_integers [k], number_strings [k]);
+      ACE_ASSERT ((int_str_tree.find (number_integers [k]) != 0) && 
+                  (*int_str_tree.find (number_integers [k]) == 
                    number_strings [k]));
 
       k = str_int_index [i];
       ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      str_int_tree2.insert (number_strings [k], number_integers [k]);
-      ACE_ASSERT ((str_int_tree2.find (number_strings [k]) != 0) &&
-                  (*str_int_tree2.find (number_strings [k]) ==
+      str_int_tree.insert (number_strings [k], number_integers [k]);
+      ACE_ASSERT ((str_int_tree.find (number_strings [k]) != 0) && 
+                  (*str_int_tree.find (number_strings [k]) == 
                    number_integers [k]));
 
       k = str_str_index [i];
       ACE_ASSERT ((k >= 0) && (k < RB_TREE_TEST_ENTRIES));
-      str_str_tree2.insert (number_strings [k], number_strings [k]);
-      ACE_ASSERT ((str_str_tree2.find (number_strings [k]) != 0) &&
-                  (*str_str_tree2.find (number_strings [k]) ==
+      str_str_tree.insert (number_strings [k], number_strings [k]);
+      ACE_ASSERT ((str_str_tree.find (number_strings [k]) != 0) && 
+                  (*str_str_tree.find (number_strings [k]) == 
                    number_strings [k]));
     }
 
-
-  // Construct a forward and reverse iterator for each of the trees.
-
-  ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_iter1 (int_int_tree1);
-  ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_iter1 (int_str_tree1);
-  ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_iter1 (str_int_tree1);
-  ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_iter1 (str_str_tree1);
-
-  ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_rev_iter1 (int_int_tree1);
-  ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_rev_iter1 (int_str_tree1);
-  ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_rev_iter1 (str_int_tree1);
-  ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_rev_iter1 (str_str_tree1);
-
-  ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_iter2 (int_int_tree2);
-  ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_iter2 (int_str_tree2);
-  ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_iter2 (str_int_tree2);
-  ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_iter2 (str_str_tree2);
-
-  ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_rev_iter2 (int_int_tree2);
-  ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_rev_iter2 (int_str_tree2);
-  ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_rev_iter2 (str_int_tree2);
-  ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_rev_iter2 (str_str_tree2);
+  // Construct an iterator for each of the trees.
+  ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex> int_int_iter (int_int_tree);
+  ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex> int_str_iter (int_str_tree);
+  ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex> str_int_iter (str_int_tree);
+  ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex> str_str_iter (str_str_tree);
 
   // Iterate over each of the trees, making sure their entries
   // are in the same relative order (i.e., the integers and strings
   // represent the same values at each respective position in the tree).
   for (i = 0; i < RB_TREE_TEST_ENTRIES; ++i)
     {
-      char *str_item;
-      int int_item;
-
-      int_item = (*int_int_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*int_int_rev_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      int_item = (*str_int_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*str_int_rev_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      str_item = (*int_str_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*int_str_rev_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      str_item = (*str_str_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
+      char **str_item;
+      int *int_item;
+ 
+      int_item = int_int_iter.item ();
+      ACE_ASSERT (int_item != 0);
+      ACE_ASSERT (*int_item == number_integers [i]);
 
-      str_item = (*str_str_rev_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
+      int_item = str_int_iter.item ();
+      ACE_ASSERT (int_item != 0);
+      ACE_ASSERT (*int_item == number_integers [i]);
 
-      int_item = (*int_int_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*int_int_rev_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      int_item = (*str_int_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*str_int_rev_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      str_item = (*int_str_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*int_str_rev_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
-
-      str_item = (*str_str_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*str_str_rev_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i - 1]);
+      str_item = int_str_iter.item ();
+      ACE_ASSERT (str_item != 0);
+      ACE_ASSERT (*str_item == number_strings [i]);
 
+      str_item = str_str_iter.item ();
+      ACE_ASSERT (str_item != 0);
+      ACE_ASSERT (*str_item == number_strings [i]);
 
       // Advance each iterator.
-      ++int_int_iter1;
-      ++int_str_iter1;
-      ++str_int_iter1;
-      ++str_str_iter1;
-      ++int_int_rev_iter1;
-      ++int_str_rev_iter1;
-      ++str_int_rev_iter1;
-      ++str_str_rev_iter1;
-      ++int_int_iter2;
-      ++int_str_iter2;
-      ++str_int_iter2;
-      ++str_str_iter2;
-      ++int_int_rev_iter2;
-      ++int_str_rev_iter2;
-      ++str_int_rev_iter2;
-      ++str_str_rev_iter2;
+      int_int_iter.next ();
+      int_str_iter.next ();
+      str_int_iter.next ();
+      str_str_iter.next ();
     }
 
   // Make sure each item in each tree has been visited
-  ACE_ASSERT (int_int_iter1.done () == 1);
-  ACE_ASSERT (int_str_iter1.done () == 1);
-  ACE_ASSERT (str_int_iter1.done () == 1);
-  ACE_ASSERT (str_str_iter1.done () == 1);
-  ACE_ASSERT (int_int_rev_iter1.done () == 1);
-  ACE_ASSERT (int_str_rev_iter1.done () == 1);
-  ACE_ASSERT (str_int_rev_iter1.done () == 1);
-  ACE_ASSERT (str_str_rev_iter1.done () == 1);
-  ACE_ASSERT (int_int_iter2.done () == 1);
-  ACE_ASSERT (int_str_iter2.done () == 1);
-  ACE_ASSERT (str_int_iter2.done () == 1);
-  ACE_ASSERT (str_str_iter2.done () == 1);
-  ACE_ASSERT (int_int_rev_iter2.done () == 1);
-  ACE_ASSERT (int_str_rev_iter2.done () == 1);
-  ACE_ASSERT (str_int_rev_iter2.done () == 1);
-  ACE_ASSERT (str_str_rev_iter2.done () == 1);
-
-  // Remove the even numbered entries from each of the trees.  New interface.
-  for (i = 0; i < RB_TREE_TEST_ENTRIES; i += 2)
-    {
-      ACE_ASSERT (int_int_tree1.unbind (number_integers [i]) == 0);
-      ACE_ASSERT (int_str_tree1.unbind (number_integers [i]) == 0);
-      ACE_ASSERT (str_int_tree1.unbind (number_strings [i]) == 0);
-      ACE_ASSERT (str_str_tree1.unbind (number_strings [i]) == 0);
-    }
+  ACE_ASSERT (int_int_iter.is_done () == 1);
+  ACE_ASSERT (int_str_iter.is_done () == 1);
+  ACE_ASSERT (str_int_iter.is_done () == 1);
+  ACE_ASSERT (str_str_iter.is_done () == 1);
 
-  // Remove the even numbered entries from each of the trees.  Deprecated interface.
+  // Remove the even numbered entries from each of the trees.
   for (i = 0; i < RB_TREE_TEST_ENTRIES; i += 2)
     {
-      ACE_ASSERT (int_int_tree2.remove (number_integers [i]) == 1);
-      ACE_ASSERT (int_str_tree2.remove (number_integers [i]) == 1);
-      ACE_ASSERT (str_int_tree2.remove (number_strings [i]) == 1);
-      ACE_ASSERT (str_str_tree2.remove (number_strings [i]) == 1);
+      ACE_ASSERT (int_int_tree.remove (number_integers [i]) == 1);
+      ACE_ASSERT (int_str_tree.remove (number_integers [i]) == 1);
+      ACE_ASSERT (str_int_tree.remove (number_strings [i]) == 1);
+      ACE_ASSERT (str_str_tree.remove (number_strings [i]) == 1);
     }
 
   // Reset iterators
-
-  int_int_iter1 = int_int_tree1.begin ();
-  int_str_iter1 = int_str_tree1.begin ();
-  str_int_iter1 = str_int_tree1.begin ();
-  str_str_iter1 = str_str_tree1.begin ();
-  int_int_rev_iter1 = int_int_tree1.rbegin ();
-  int_str_rev_iter1 = int_str_tree1.rbegin ();
-  str_int_rev_iter1 = str_int_tree1.rbegin ();
-  str_str_rev_iter1 = str_str_tree1.rbegin ();
-  int_int_iter2 = int_int_tree2.begin ();
-  int_str_iter2 = int_str_tree2.begin ();
-  str_int_iter2 = str_int_tree2.begin ();
-  str_str_iter2 = str_str_tree2.begin ();
-  int_int_rev_iter2 = int_int_tree2.rbegin ();
-  int_str_rev_iter2 = int_str_tree2.rbegin ();
-  str_int_rev_iter2 = str_int_tree2.rbegin ();
-  str_str_rev_iter2 = str_str_tree2.rbegin ();
-
+  int_int_iter.first ();
+  int_str_iter.first ();
+  str_int_iter.first ();
+  str_str_iter.first ();
 
   // Iterate over each of the trees, making sure their entries are
   // still in the same relative order (i.e., the integers and strings
   // represent the same values at each respective position in the tree).
   for (i = 1; i < RB_TREE_TEST_ENTRIES; i += 2)
-    {
-      char *str_item;
-      int int_item;
-
-      int_item = (*int_int_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*int_int_rev_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
-
-      int_item = (*str_int_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
+    {      
+      char **str_item;
+      int *int_item;
+ 
+      int_item = int_int_iter.item ();
+      ACE_ASSERT (int_item != 0);
+      ACE_ASSERT (*int_item == number_integers [i]);
+
+      int_item = str_int_iter.item ();
+      ACE_ASSERT (int_item != 0);
+      ACE_ASSERT (*int_item == number_integers [i]);
+
+      str_item = int_str_iter.item ();
+      ACE_ASSERT (str_item != 0);
+      ACE_ASSERT (*str_item == number_strings [i]);
+
+      str_item = str_str_iter.item ();
+      ACE_ASSERT (str_item != 0);
+      ACE_ASSERT (*str_item == number_strings [i]);
 
-      int_item = (*str_int_rev_iter1).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
-
-      str_item = (*int_str_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*int_str_rev_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
-
-      str_item = (*str_str_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*str_str_rev_iter1).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
-
-      int_item = (*int_int_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*int_int_rev_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
-
-      int_item = (*str_int_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [i]);
-
-      int_item = (*str_int_rev_iter2).item ();
-      ACE_ASSERT (int_item == number_integers [RB_TREE_TEST_ENTRIES - i]);
-
-      str_item = (*int_str_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*int_str_rev_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
-
-      str_item = (*str_str_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [i]);
-
-      str_item = (*str_str_rev_iter2).item ();
-      ACE_ASSERT (str_item == number_strings [RB_TREE_TEST_ENTRIES - i]);
-
-      // Advance each iterator via postfix increment.
-      int_int_iter1++;
-      int_str_iter1++;
-      str_int_iter1++;
-      str_str_iter1++;
-      int_int_rev_iter1++;
-      int_str_rev_iter1++;
-      str_int_rev_iter1++;
-      str_str_rev_iter1++;
-      int_int_iter2++;
-      int_str_iter2++;
-      str_int_iter2++;
-      str_str_iter2++;
-      int_int_rev_iter2++;
-      int_str_rev_iter2++;
-      str_int_rev_iter2++;
-      str_str_rev_iter2++;
+      // Advance each iterator.
+      int_int_iter.next ();
+      int_str_iter.next ();
+      str_int_iter.next ();
+      str_str_iter.next ();
     }
 
   // Make sure each item in each tree has been visited a second time.
-  ACE_ASSERT (int_int_rev_iter1.done () == 1);
-  ACE_ASSERT (int_str_rev_iter1.done () == 1);
-  ACE_ASSERT (str_int_rev_iter1.done () == 1);
-  ACE_ASSERT (str_str_rev_iter1.done () == 1);
-  ACE_ASSERT (int_int_rev_iter2.done () == 1);
-  ACE_ASSERT (int_str_rev_iter2.done () == 1);
-  ACE_ASSERT (str_int_rev_iter2.done () == 1);
-  ACE_ASSERT (str_str_rev_iter2.done () == 1);
-  ACE_ASSERT (int_int_iter1.done () == 1);
-  ACE_ASSERT (int_str_iter1.done () == 1);
-  ACE_ASSERT (str_int_iter1.done () == 1);
-  ACE_ASSERT (str_str_iter1.done () == 1);
-  ACE_ASSERT (int_int_iter2.done () == 1);
-  ACE_ASSERT (int_str_iter2.done () == 1);
-  ACE_ASSERT (str_int_iter2.done () == 1);
-  ACE_ASSERT (str_str_iter2.done () == 1);
+  ACE_ASSERT (int_int_iter.is_done () == 1);
+  ACE_ASSERT (int_str_iter.is_done () == 1);
+  ACE_ASSERT (str_int_iter.is_done () == 1);
+  ACE_ASSERT (str_str_iter.is_done () == 1);
 
   ACE_END_TEST;
   return 0;
@@ -398,48 +205,33 @@ main (int, ASYS_TCHAR *[])
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<int, int>;
-template class ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<int, char *>;
-template class ACE_RB_Tree_Iterator_Base<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>;
 template class ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<char *, int>;
-template class ACE_RB_Tree_Iterator_Base<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Node<char *, char *>;
-template class ACE_RB_Tree_Iterator_Base<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
-template class ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>;
 template class ACE_Less_Than<int>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 #pragma instantiate ACE_RB_Tree<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<int, int>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, int, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<int, char *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<int, char *, ACE_Less_Than<int>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<char *, int>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<char *, int, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Node<char *, char *>
-#pragma instantiate ACE_RB_Tree_Iterator_Base<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_RB_Tree_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
-#pragma instantiate ACE_RB_Tree_Reverse_Iterator<char *, char *, ACE_Less_Than<char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Less_Than<int>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
diff --git a/tests/README b/tests/README
index 68652fb21a5..bfda47cbd1a 100644
--- a/tests/README
+++ b/tests/README
@@ -1,5 +1,3 @@
-$Id$
-
 This directory contains a battery of tests that exercise all the
 functionality of ACE on Win32 and UNIX.  These tests can be executed
 in a single pass via a shell script run_tests.sh (on UNIX) or a batch
@@ -19,18 +17,24 @@ $ACE_ROOT/tests:
 1.  Use appropriate ACE_START_TEST and ACE_END_TEST macros in main ()
 2.  Add test to Makefile
 3.  Add test to MS project files (tests.dsp and version_tests/version_tests.dsp)
-4.  Add test to all or most of these:
+    (... and tests.mdp and version_tests/version_tests.mdp (for MSVC 4.2))
+4.  Add test to all or most of these: 
 
     run_tests.bat, run_tests.psosim, run_tests.sh, and run_tests.vxworks.
 ________________________________________
 
+We had problems running the batch file on Windows 95 and Windows NT
+using the native DOS prompt. However we were able to get around this
+problem by using a program called "4DOS for Windows NT" which also
+displays a DOS prompt but allows us to run batch files through it.
+
 The tests have been run on UNIX, pSOS, Windows NT, and Windows 95 and they
 all work with the following exceptions:
 
 1. Name_Server_Test on Windows 95: this does not work on Windows 95
    since Windows 95 has a different model for shared memory and does
    not support explicitly selecting shared memory addresses.
-
+ 
 2. UPIPE_Test and SPIPE_Test on Windows 95: these do not work on
    Windows 95 since Windows 95 does not support the server side
    functionality of accepting connections from clients using named pipes.
@@ -39,7 +43,7 @@ all work with the following exceptions:
    Windows 95 since Windows 95 does not support I/O completion ports.
 
 4. Of the tests (believed) relevant to the single threaded port to pSOSim,
-   Sigset_Ops_Test, Sock_Connector_Test, Priority_Reactor_Test,
+   Sigset_Ops_Test, Sock_Connector_Test, Priority_Reactor_Test, 
    Process_Strategy_Test, and Service_Config_Test are still failing.
    These are being debugged and will either be corrected or, if there
    are unsupported features in these tests, removed from the test suite for
@@ -63,20 +67,18 @@ Notes:
    any of the tests require any variable parameters these are
    specified in test_config.h.
 
-4. Time_Service_Test executes the Time Server and Clerk components as
-   two processes and so the executable "main" need to be present in
-   the netsvcs/servers directory.  Be sure you build
-   $ACE_ROOT/netsvcs/lib/ and $ACE_ROOT/netsvcs/servers before running
-   this test.  These components rely on config files. Two sample
-   config files are also present in the test-suite, namely
-   UNIXserver.conf and UNIXclerk.conf (and for Win32, Win32server.conf
-   and Win32clerk.conf).
+4. Time_Service_Test executes the Time Server and Clerk components
+   as two processes and so the executable "main" need to be present in the
+   netsvcs/bin directory. These components rely on config files. Two
+   sample config files are also present in the test-suite, namely
+   UNIXserver.conf and UNIXclerk.conf (and for Win32, Win32server.conf 
+   and Win32clerk.conf). 
 
 Please see run_tests.vxworks for information on the status of
 tests on VxWorks.
 
 Please see run_tests.psosim for information on the status of tests on pSOSim.
-Run_tests.psosim is an executable shell script that runs all tests that are
+Run_tests.psosim is an executable shell script that runs all tests that are 
 (believed) relevant to the single threaded port to pSOSim.
 
 
diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp
index 5b66c4ba70c..ee33e3132b6 100644
--- a/tests/Reactor_Performance_Test.cpp
+++ b/tests/Reactor_Performance_Test.cpp
@@ -42,7 +42,11 @@ USELIB("..\ace\aced.lib");
 #if defined (ACE_HAS_THREADS)
 
 // Number of client (user) threads
+#if (!defined (ACE_WIN32) || (defined (ACE_HAS_WINNT4) && ACE_HAS_WINNT4 != 0))
+static int opt_nconnections = 20;
+#else /* ACE_WIN32 || (ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0) */
 static int opt_nconnections = 5;
+#endif /* ACE_WIN32 || (ACE_HAS_WINNT4 && ACE_HAS_WINNT4 != 0) */
 
 // Number of data exchanges
 static int opt_nloops = 200;
@@ -53,9 +57,6 @@ static int opt_wfmo_reactor = 0;
 // Use the Select_Reactor
 static int opt_select_reactor = 0;
 
-// Extra debug messages
-static int opt_debug = 0;
-
 int Read_Handler::waiting_ = 0;
 
 void
@@ -89,38 +90,25 @@ int
 Read_Handler::handle_input (ACE_HANDLE handle)
 {
   ACE_UNUSED_ARG (handle);
+
   char buf[BUFSIZ];
 
-  while (1)
+  ssize_t result = this->peer ().recv (buf, sizeof (buf));
+
+  if (result <= 0)
     {
-      ssize_t result = this->peer ().recv (buf, sizeof (buf) - 1);
-
-      if (result > 0)
-        {
-          if (opt_debug)
-            {
-              buf[result] = 0;
-              ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("(%t) Read_Handler::handle_input: %s\n"),
-                          buf));
-            }
-        }
-      else if (result < 0)
-        {
-          if (errno == EWOULDBLOCK)
-            return 0;
-          else
-            // This will cause handle_close to get called.
-            return -1;
-        }
-      else // result == 0
-        {
-          // This will cause handle_close to get called.
-          return -1;
-        }
+      if (result < 0 && errno == EWOULDBLOCK)
+        return 0;
+
+      if (result != 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    ASYS_TEXT ("(%t) %p\n"),
+                    ASYS_TEXT ("Read_Handler::handle_input")));
+      // This will cause handle_close to get called.
+      return -1;
     }
 
-  ACE_NOTREACHED (return 0);
+  return 0;
 }
 
 // Handle connection shutdown.
@@ -185,24 +173,27 @@ client (void *arg)
   int i;
 
   // Automagic memory cleanup.
+  ACE_Auto_Basic_Array_Ptr <Write_Handler *> writers;
   Write_Handler **temp_writers;
   ACE_NEW_RETURN (temp_writers,
                   Write_Handler *[opt_nconnections],
                   0);
-  ACE_Auto_Basic_Array_Ptr <Write_Handler *> writers (temp_writers);
+  writers = temp_writers;
 
+  ACE_Auto_Basic_Array_Ptr <ASYS_TCHAR> failed_svc_handlers;
   ASYS_TCHAR *temp_failed;
   ACE_NEW_RETURN (temp_failed,
                   ASYS_TCHAR[opt_nconnections],
                   0);
-  ACE_Auto_Basic_Array_Ptr <ASYS_TCHAR> failed_svc_handlers (temp_failed);
+  failed_svc_handlers = temp_failed;
 
   // Automagic memory cleanup.
+  ACE_Auto_Array_Ptr <ACE_INET_Addr> addresses;
   ACE_INET_Addr *temp_addresses;
   ACE_NEW_RETURN (temp_addresses,
                   ACE_INET_Addr [opt_nconnections],
                   0);
-  ACE_Auto_Array_Ptr <ACE_INET_Addr> addresses (temp_addresses);
+  addresses = temp_addresses;
 
   // Initialize array.
   for (i = 0; i < opt_nconnections; i++)
@@ -314,7 +305,7 @@ main (int argc, ASYS_TCHAR *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("Reactor_Performance_Test"));
 
-  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("dswc:l:"), 1);
+  ACE_Get_Opt getopt (argc, argv, ASYS_TEXT ("swc:l:"), 1);
   for (int c; (c = getopt ()) != -1; )
     switch (c)
       {
@@ -330,9 +321,6 @@ main (int argc, ASYS_TCHAR *argv[])
       case 'l':
         opt_nloops = ACE_OS::atoi (getopt.optarg);
         break;
-      case 'd':
-        opt_debug = 1;
-        break;
       }
 
   // Sets up the correct reactor (based on platform and options).
@@ -345,10 +333,7 @@ main (int argc, ASYS_TCHAR *argv[])
   // If we are using other that the default implementation, we must
   // clean up.
   if (opt_select_reactor || opt_wfmo_reactor)
-    {
-      auto_ptr<ACE_Reactor_Impl> auto_impl (ACE_Reactor::instance ()->implementation ());
-      impl = auto_impl;
-    }
+    impl = auto_ptr<ACE_Reactor_Impl> (ACE_Reactor::instance ()->implementation ());
 
   Read_Handler::set_countdown (opt_nconnections);
 
@@ -379,11 +364,9 @@ main (int argc, ASYS_TCHAR *argv[])
                 ASYS_TEXT ("(%t) %p\n"),
                 ASYS_TEXT ("thread create failed")));
 
-  ACE_Time_Value run_limit (10);
-
   ACE_Profile_Timer timer;
   timer.start ();
-  ACE_Reactor::instance()->run_event_loop (run_limit);
+  ACE_Reactor::instance()->run_event_loop ();
   timer.stop ();
 
   ACE_Profile_Timer::ACE_Elapsed_Time et;
diff --git a/tests/Reverse_Lock_Test.cpp b/tests/Reverse_Lock_Test.cpp
deleted file mode 100644
index 2577447a73a..00000000000
--- a/tests/Reverse_Lock_Test.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Reverse_Lock_Test.cpp
-//
-// = DESCRIPTION
-//    This is a simple test to illustrate the functionality of
-//    ACE_Reverse_Lock. The test acquires and releases mutexes. No
-//    command line arguments are needed to run the test.
-//
-// = AUTHOR
-//    Irfan Pyarali
-//
-// ============================================================================
-
-#include "test_config.h"
-
-ACE_RCSID(tests, Reverse_Lock_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-typedef ACE_Reverse_Lock<ACE_SYNCH_MUTEX> REVERSE_MUTEX;
-
-int
-main (int, ASYS_TCHAR *[])
-{
-  ACE_START_TEST (ASYS_TEXT ("Reverse_Lock_Test"));
-
-  ACE_SYNCH_MUTEX mutex;
-  REVERSE_MUTEX reverse_mutex (mutex);
-
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, monitor, mutex, -1);
-
-    ACE_GUARD_RETURN (REVERSE_MUTEX, reverse_monitor, reverse_mutex, -1);
-  }
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Reverse_Lock<ACE_SYNCH_MUTEX>;
-template class ACE_Guard<REVERSE_MUTEX>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Reverse_Lock<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Guard<REVERSE_MUTEX>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp
deleted file mode 100644
index 2d179e58411..00000000000
--- a/tests/Reverse_Lock_Test.dsp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Reverse_Lock_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Reverse_Lock_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 "Reverse_Lock_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 "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 Debug"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on\

- "Win32 (x86) Console Application")

-!MESSAGE

-

-# Begin Project

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

-CPP=cl.exe

-RSC=rc.exe

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_M"

-# PROP BASE Intermediate_Dir "Thread_M"

-# 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 ""

-# 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" /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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# Begin Target

-

-# Name "Reverse_Lock_Test - Win32 Debug"

-# Begin Source File

-

-SOURCE=.\Reverse_Lock_Test.cpp

-# End Source File

-# End Target

-# End Project

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.cpp b/tests/TSS_Test.cpp
index 2d044bed8a4..48b1a446488 100644
--- a/tests/TSS_Test.cpp
+++ b/tests/TSS_Test.cpp
@@ -56,10 +56,9 @@ static u_int errors = 0;
 int Errno::flags_;
 ACE_Thread_Mutex *Errno::lock_ = 0;
 
-// This is our thread-specific error handler . . .
+// This is our thread-specific error handler...
 // See comment below about why it's dynamically allocated.
 static ACE_TSS<Errno> *tss_error;
-
 // This is for testing/demonstrating ACE_TSS_Type_Adapter.  It's
 // dynamically allocated to avoid static objects, also.
 static ACE_TSS<ACE_TSS_Type_Adapter<u_int> > *u;
@@ -184,10 +183,8 @@ worker (void *c)
           // Use the guard to serialize access to errors.
           ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, output_lock,
                                     0));
-          ACE_DEBUG ((LM_ERROR,
-                      ASYS_TEXT ("use of ACE_TSS_Type_Adapter failed, value ")
-                      ASYS_TEXT ("is %u, it should be 37!\n"),
-                      (*u)->operator u_int ()));
+          ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("use of ACE_TSS_Type_Adapter failed, value ")
+                      ASYS_TEXT ("is %u, it should be 37!\n"), (*u)->operator u_int ()));
           ++errors;
         }
 #endif /* !defined (ACE_HAS_BROKEN_EXPLICIT_TYPECAST_OPERATOR_INVOCATION) */
@@ -234,6 +231,13 @@ worker (void *c)
   return 0;
 }
 
+extern "C" void
+handler (int signum)
+{
+  ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("signal = %S\n"), signum));
+  ACE_Thread_Manager::instance ()->exit (0);
+}
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_TSS<Errno>;
 template class ACE_TSS_Type_Adapter<u_int>;
@@ -268,13 +272,16 @@ main (int, ASYS_TCHAR *[])
   // Similarly, dynamically allocate u.
   ACE_NEW_RETURN (u, ACE_TSS<ACE_TSS_Type_Adapter<u_int> >, 1);
 
+  // Register a signal handler.
+  ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
+  ACE_UNUSED_ARG (sa);
+
   if (ACE_Thread_Manager::instance ()->spawn_n
       (threads,
        ACE_THR_FUNC (worker),
        (void *) ITERATIONS,
        THR_BOUND) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn_n")), 1);
+    ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn_n")), 1);
 
   ACE_Thread_Manager::instance ()->wait ();
 
diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp
index a739a8aa180..366d72a2900 100644
--- a/tests/Thread_Manager_Test.cpp
+++ b/tests/Thread_Manager_Test.cpp
@@ -32,56 +32,28 @@ USELIB("..\ace\aced.lib");
 
 #if defined (ACE_HAS_THREADS)
 
-// Each thread keeps track of whether it has been signalled by using a
-// global array.  It must be dynamically allocated to allow sizing at
-// runtime, based on the number of threads.
-static ACE_thread_t *signalled = 0;
-static u_int n_threads = ACE_MAX_THREADS;
-
-// Helper function that looks for an existing entry in the signalled
-// array.  Also finds the position of the first unused entry in the
-// array, and updates if requested with the t_id.
-extern "C"
-int
-been_signalled (const ACE_thread_t t_id, const u_int update = 0)
-{
-  u_int unused_slot = n_threads;
-  for (u_int i = 0; i < n_threads; ++i)
-    {
-      if (ACE_OS::thr_equal (signalled[i], t_id))
-        // Already signalled.
-        return 1;
-
-      if (update  &&
-          unused_slot == n_threads  &&
-          ACE_OS::thr_equal (signalled[i], ACE_OS::NULL_thread))
-        unused_slot = i;
-    }
+#include "Thread_Manager_Test.h"
 
-  if (update  &&  unused_slot < n_threads)
-    // Update the array using the first unused_slot.
-    signalled[unused_slot] = t_id;
-
-  return 0;
-}
+// Each thread keeps track of whether it has been signaled within a
+// separate TSS entry.  See comment below about why it's allocated
+// dynamically.
+static ACE_TSS<Signal_Catcher> *signal_catcher = 0;
 
 // Synchronize starts of threads, so that they all start before the
-// main thread cancels them.  To avoid creating a static object, it is
-// dynamically allocated, before spawning any threads.
-static ACE_Barrier *thread_start = 0;
+// main thread cancels them.  To avoid creating a static object, it
+// is dynamically allocated, before spawning any threads.
+static ACE_Barrier *thread_start;
 
-extern "C"
-void
-handler (int /* signum */)
+extern "C" void
+handler (int signum)
 {
-  if (signalled)
+  if (signal_catcher)
     {
-      // No printout here, to be safe.  Signal handlers must not
-      // acquire locks, etc.
-      const ACE_thread_t t_id = ACE_OS::thr_self ();
-
-      // Update the signalled indication.
-      (void) been_signalled (t_id, 1u /* update */);
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%t) received signal %d, signaled = %d\n"),
+                  signum,
+                  (*signal_catcher)->signaled ()));
+      (*signal_catcher)->signaled (1);
     }
 }
 
@@ -94,8 +66,25 @@ worker (int iterations)
 #endif /* VXWORKS */
 
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-  // Cache this thread's ID.
-  const ACE_thread_t t_id = ACE_OS::thr_self ();
+  // Cache a pointer to this thread's Signal_Catcher.  That way, we
+  // try to avoid dereferencing signal_catcher below in a thread that
+  // hasn't terminated when main exits.  That shouldn't happen, but it
+  // seems to on Linux and LynxOS.
+  if (!signal_catcher)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%t) (worker): signal catcher is 0!!!!\n")));
+      return (void *) -1;
+    }
+
+  Signal_Catcher *my_signal_catcher = *signal_catcher;
+
+  if (my_signal_catcher == 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  ASYS_TEXT ("(%t) (worker): *signal catcher is 0!!!!\n")));
+      return (void *) -1;
+    }
 
   ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
 #endif /* ! ACE_LACKS_UNIX_SIGNAL */
@@ -111,21 +100,15 @@ worker (int iterations)
       if ((i % 1000) == 0)
         {
 #if !defined (ACE_LACKS_UNIX_SIGNALS)
-          if (been_signalled (t_id))
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ASYS_TEXT ("(%t) had received signal\n")));
-
+          if (my_signal_catcher->signaled () > 0  &&
               // Only test for cancellation after we've been signaled,
               // to avoid race conditions for suspend() and resume().
-              if (thr_mgr->testcancel (ACE_Thread::self ()) != 0)
-                {
-                  ACE_DEBUG ((LM_DEBUG,
-                              ASYS_TEXT ("(%t) has been cancelled "
-                                         "before iteration %d!\n"),
-                              i));
-                  break;
-                }
+              thr_mgr->testcancel (ACE_Thread::self ()) != 0)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          ASYS_TEXT ("(%t) has been cancelled before iteration %d!\n"),
+                          i));
+              break;
             }
 #endif /* ! ACE_LACKS_UNIX_SIGNAL */
           ACE_OS::sleep (1);
@@ -136,28 +119,30 @@ worker (int iterations)
   return 0;
 }
 
+static const int DEFAULT_THREADS = ACE_MAX_THREADS;
 static const int DEFAULT_ITERATIONS = 10000;
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+template class ACE_TSS<Signal_Catcher>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_TSS<Signal_Catcher>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
 #endif /* ACE_HAS_THREADS */
 
 int
 main (int, ASYS_TCHAR *[])
 {
   ACE_START_TEST (ASYS_TEXT ("Thread_Manager_Test"));
-  int status = 0;
 
 #if defined (ACE_HAS_THREADS)
+  int n_threads = DEFAULT_THREADS;
   int n_iterations = DEFAULT_ITERATIONS;
 
-  u_int i;
-
-  // Dynamically allocate signalled so that we can control when it
-  // gets deleted.  Specifically, we need to delete it before the main
-  // thread's TSS is cleaned up.
-  ACE_NEW_RETURN (signalled, ACE_thread_t[n_threads], 1);
-  // Initialize each ACE_thread_t to avoid Purify UMR's.
-  for (i = 0; i < n_threads; ++i)
-    signalled[i] = ACE_OS::NULL_thread;
+  // Dynamically allocate signal_catcher so that we can control when
+  // it gets deleted.  Specifically, we need to delete it before the
+  // main thread's TSS is cleaned up.
+  ACE_NEW_RETURN (signal_catcher, ACE_TSS<Signal_Catcher>, 1);
 
   // And similarly, dynamically allocate the thread_start barrier.
   ACE_NEW_RETURN (thread_start, ACE_Barrier (n_threads + 1), -1);
@@ -177,6 +162,8 @@ main (int, ASYS_TCHAR *[])
   size_t *stack_size;
   ACE_NEW_RETURN (stack_size, size_t[n_threads], -1);
 
+  int i;
+
   for (i = 0; i < n_threads; ++i)
     {
       if (i < n_threads - 1)
@@ -251,7 +238,7 @@ main (int, ASYS_TCHAR *[])
     ACE_ASSERT (errno == ENOTSUP);
 #endif /* ACE_HAS_WTHREADS */
 
-  // Wait and then cancel all the threads.
+  // Wait for 1 more second and then cancel all the threads.
   ACE_OS::sleep (ACE_Time_Value (1));
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) cancelling group\n")));
@@ -259,21 +246,7 @@ main (int, ASYS_TCHAR *[])
   ACE_ASSERT (thr_mgr->cancel_grp (grp_id) != -1);
 
   // Perform a barrier wait until all the threads have shut down.
-  // But, wait for a limited time because sometimes the test hangs
-  // on SunOS 5.5.1 and 5.7.
-  const ACE_Time_Value max_wait (60);
-  const ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait);
-  if (thr_mgr->wait (&wait_time) == -1)
-    {
-      if (errno == ETIME)
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("maximum wait time of %d msec exceeded\n"),
-                               max_wait.msec ()));
-      else
-        ACE_OS::perror ("wait");
-
-      status = -1;
-    }
+  ACE_ASSERT (thr_mgr->wait () != -1);
 
   ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) main thread finished\n")));
 
@@ -290,8 +263,8 @@ main (int, ASYS_TCHAR *[])
 
   delete thread_start;
   thread_start = 0;
-  delete [] signalled;
-  signalled = 0;
+  delete signal_catcher;
+  signal_catcher = 0;
 
 #else
   ACE_ERROR ((LM_INFO,
@@ -299,5 +272,5 @@ main (int, ASYS_TCHAR *[])
 #endif /* ACE_HAS_THREADS */
 
   ACE_END_TEST;
-  return status;
+  return 0;
 }
diff --git a/tests/Thread_Manager_Test.h b/tests/Thread_Manager_Test.h
new file mode 100644
index 00000000000..c9885c33ea7
--- /dev/null
+++ b/tests/Thread_Manager_Test.h
@@ -0,0 +1,45 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Thread_Manager_Test.h
+//
+// = DESCRIPTION
+//      This file contains class definitions needed for template
+//      instnatiation in the Thread_Manager_Test.cpp file.
+//
+// = AUTHOR
+//    Prashant Jain and Doug C. Schmidt
+//
+// ============================================================================
+
+#ifndef __THREAD_MANAGER_TEST_H
+#define __THREAD_MANAGER_TEST_H
+
+
+class Signal_Catcher
+  // = TITLE
+  //     Keeps track of whether a thread has been signaled.
+{
+public:
+  Signal_Catcher (void): signaled_ (0) {}
+
+  sig_atomic_t signaled (void)
+  {
+    return this->signaled_;
+  }
+
+  void signaled (sig_atomic_t s)
+  {
+    this->signaled_ = s;
+  }
+
+private:
+  sig_atomic_t signaled_;
+};
+
+#endif /* __THREAD_MANAGER_TEST_H */
diff --git a/tests/Time_Service_Test.cpp b/tests/Time_Service_Test.cpp
index ecb5436bb28..cb8a909fe5e 100644
--- a/tests/Time_Service_Test.cpp
+++ b/tests/Time_Service_Test.cpp
@@ -50,27 +50,25 @@ main (int, char *[])
   // no garbage data from a possible aborted run
   ACE_OS::unlink (ACE_DEFAULT_BACKING_STORE);
 
-  LPCTSTR server_cl = APPLICATION ACE_TEXT ("server.conf");
   ACE_Process_Options server_options;
-  server_options.command_line (server_cl);
+  server_options.command_line (APPLICATION ACE_TEXT ("server.conf"));
   ACE_Process server;
 
   if (server.spawn (server_options) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p (%s).\n",
-                       "Server fork failed", server_cl), -1);
+                       "Server fork failed", APPLICATION), -1);
   else
     ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", server.getpid ()));
 
   ACE_OS::sleep (3);
 
-  LPCTSTR clerk_cl = APPLICATION ACE_TEXT ("clerk.conf");
   ACE_Process_Options clerk_options;
-  clerk_options.command_line (clerk_cl);
+  clerk_options.command_line (APPLICATION ACE_TEXT ("clerk.conf"));
   ACE_Process clerk;
 
   if (clerk.spawn (clerk_options) == -1)
     ACE_ERROR_RETURN ((LM_DEBUG, "%n; %p: (%s).\n",
-                       "Clerk fork failed", clerk_cl), -1);
+                       "Clerk fork failed", APPLICATION), -1);
   else
     ACE_DEBUG ((LM_DEBUG, "Clerk forked with pid = %d.\n", clerk.getpid ()));
 
diff --git a/tests/Timeprobe_Test.cpp b/tests/Timeprobe_Test.cpp
index 4b229d2e54e..d9638a9cae9 100644
--- a/tests/Timeprobe_Test.cpp
+++ b/tests/Timeprobe_Test.cpp
@@ -84,22 +84,6 @@ work (int time)
   ACE_OS::sleep (time);
 }
 
-#if !defined (ACE_HAS_PURIFY)
-// Test creation of ACE_Singletons during static object construction.
-// Timeprobes can do that, when they're enabled.  Purify would notice
-// the memory in use at program termination.
-static int
-create_singleton ()
-{
-  int *i = ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>::instance ();
-  *i = 3;
-
-  return *i;
-}
-
-int static_singleton_creator = create_singleton ();
-#endif /* ! ACE_HAS_PURIFY */
-
 int
 main (int, ASYS_TCHAR *[])
 {
@@ -121,11 +105,3 @@ main (int, ASYS_TCHAR *[])
 
   return 0;
 }
-
-#if !defined (ACE_HAS_PURIFY)
-# if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-    template class ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>;
-# elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#   pragma instantiate ACE_Singleton <int, ACE_SYNCH_RECURSIVE_MUTEX>
-# endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-#endif /* ! ACE_HAS_PURIFY */
diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp
deleted file mode 100644
index 82ec6f23b51..00000000000
--- a/tests/TkReactor_Test.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    TkReactor_Test.cpp
-//
-// = DESCRIPTION
-//      This is a simple test that illustrates the possibility to integrate
-//      ACE to the Tk Main Loop. This program uses ACE_TkReactor class to
-//      schedule three additional event sources:
-//      1. Events from button "Stop Test" (registed with Tk_CreateEventHandler)
-//      2. Events from button "Press Me" (registed with Tk_CreateEventHandler)
-//      3. Events from X timer (registed with Tk_CreateTimerHandler)
-//      4. Events from ACE timer (registed with ACE_TkReactor::schedule_timer)
-//      5. Events from the TCP/IP channel using ACE_Acceptor
-//      No command line arguments are needed to run the test.
-//
-// = AUTHOR
-//    Nagarajan Surendran (naga@cs.wustl.edu)
-//
-// ============================================================================
-
-#include "test_config.h"
-
-ACE_RCSID(tests, TkReactor_Test, "$Id$")
-
-#if defined(__BORLANDC__) && __BORLANDC__ >= 0x0530
-USELIB("..\ace\aced.lib");
-//---------------------------------------------------------------------------
-#endif /* defined(__BORLANDC__) && __BORLANDC__ >= 0x0530 */
-
-#if !defined (ACE_HAS_TK)
-
-int main (int, char*[])
-{
-  ACE_START_TEST (ASYS_TEXT ("TkReactor_Test"));
-
-  ACE_ERROR ((LM_ERROR,
-              "Tk not supported on this platform\n"));
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#else
-
-#include "ace/Event_Handler.h"
-#include "ace/Acceptor.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Service_Config.h"
-#include "ace/Thread_Manager.h"
-#include "ace/TkReactor.h"
-
-#include <tcl.h>
-#include <tk.h>
-
-Tcl_Interp* tcl_interp;
-void eval (const char *s)
-{
-  char buf[BUFSIZ];
-  strcpy (buf,s);
-  int st = Tcl_GlobalEval(tcl_interp,buf);
-  if (st != TCL_OK)
-    {
-      int n =  strlen(s);
-      char* wrk = new char[n + 80];
-      sprintf(wrk, "tkerror \"%s\"", s);
-      Tcl_GlobalEval(tcl_interp, wrk);
-      delete wrk;
-      //exit(1);
-    }
-}
-
-// Port we listen on.
-static const u_short SERV_TCP_PORT = 6670;
-
-// counter for events from "Press Me" button.
-static int count1 = 0;
-
-// counter for events from Tk Timer.
-static int count2 = 0;
-
-// counter for events from ACE Timer.
-static int count3 = 0;
-
-static int quit = 0;
-// Callback for "Stop Test" buton - quit the program.
-void
-Quit (ClientData, XEvent *)
-{
-  cerr << "quit called";
-  ACE_DEBUG ((LM_DEBUG,"Quit called\n"));
-  quit = 1;
-}
-
-static void *
-client (void *)
-{
-  char buf[100];
-  size_t mes_len;
-  ACE_OS::sleep (1);
-
-  ACE_DEBUG ((LM_DEBUG,
-              " (%P) Client: Starting...\n"));
-
-  ACE_SOCK_Stream stream;
-  ACE_SOCK_Connector connector;
-  sprintf (buf, "Client: the life was good!");
-
-  mes_len = (int) htonl (ACE_OS::strlen (buf) + 1);
-
-  if (connector.connect (stream,
-                         ACE_INET_Addr (SERV_TCP_PORT,
-                                        ACE_DEFAULT_SERVER_HOST)) == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket open"));
-
-  if (stream.send (4,
-                   (void *) &mes_len,
-                   sizeof (size_t),
-                   (void *)buf,
-                   ACE_OS::strlen (buf) + 1) == -1)
-
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket send"));
-
-  if (stream.close () == -1)
-    ACE_ERROR ((LM_ERROR,
-                "(%P) %p\n",
-                "Socket close"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P) Client: Message has been sent, about to exit...\n"));
-  return 0;
-}
-
-static void
-sock_callback (ClientData, int)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "Socket callback called\n"));
-}
-
-// Callback for "Press Me" button.
-
-static int
-inc_count (ClientData client_data, Tcl_Interp *interp,int, char **)
-{
-  ACE_DEBUG ((LM_DEBUG,"inc_count "));
-  char new_string[80];
-
-  sprintf (new_string,
-           "Events: [%d] [%d] [%d]",
-           count1++,
-           count2,
-           count3);
-  char command [BUFSIZ];
-  //  sprintf (command,"set %s %s",(char *)client_data,new_string);
-  // eval (command);
-  char *varValue = Tcl_SetVar (interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
-    return TCL_ERROR;
-  return TCL_OK;
-}
-
-// Callback for X Timer.
-
-static void
-inc_tmo (ClientData client_data)
-{
-  char new_string[80];
-
-  if (count2 > 10)
-    ACE_OS::exit (0);
-  sprintf (new_string,
-           "Events: [%d] [%d] [%d]",
-           count1,
-           count2++,
-           count3);
-
-  char command [BUFSIZ];
-  //  sprintf (command,"set %s %s",(char *)client_data,new_string);
-  //  eval (command);
-  char *varValue = Tcl_SetVar (tcl_interp,(char *)client_data,new_string,TCL_LEAVE_ERR_MSG);
-  if (varValue == NULL)
-    ACE_ERROR ((LM_ERROR,"Tcl_SetVar failed in inc_tmo\n"));
-
-  (void) Tk_CreateTimerHandler (1000,
-                                inc_tmo,
-                                client_data);
-}
-
-class EV_handler : public ACE_Event_Handler
-{
-public:
-  virtual int handle_timeout (const ACE_Time_Value &,
-                              const void *arg)
-  {
-    char new_string[80];
-    sprintf (new_string,
-             "Events: [%d] [%d] [%d]",
-             count1,
-             count2,
-             count3++);
-    char command [BUFSIZ];
-    //    sprintf (command,"set %s %s",(char *)arg,new_string);
-    //    eval (command);
-    char *varValue = Tcl_SetVar (tcl_interp,(char *)arg,new_string,TCL_LEAVE_ERR_MSG);
-    if (varValue == NULL)
-      ACE_ERROR_RETURN ((LM_ERROR,"Tcl_SetVar failed in handle_timeout\n"),-1);
-
-    return 0;
-  }
-};
-
-class Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  virtual int open (void *)
-  {
-    char buf[100];
-    int head;
-    ssize_t ret = this->peer ().recv_n ((char *) &head,
-                                        sizeof (int));
-    if (ret != sizeof (int))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P) %p\n",
-                         "read header"),
-                        -1);
-
-    ret = this->peer ().recv_n (buf,
-                                (int) ntohl (head));
-
-    if (ret != (int) ntohl (head))
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%P) %p\n",
-                         "read message"),
-                        -1);
-    ACE_DEBUG ((LM_DEBUG,
-                " (%P)Server (ACE_SOCKET channel message): [%s]\n",
-                buf));
-    return 0;
-  }
-};
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Acceptor<Connection_Handler, ACE_SOCK_ACCEPTOR>
-#pragma instantiate ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-int
-init (Tcl_Interp *interp)
-{
-  if (Tcl_Init (interp) == TCL_ERROR)
-    return TCL_ERROR;
-  if (Tk_Init (interp) == TCL_ERROR)
-    return TCL_ERROR;
-  return TCL_OK;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_START_TEST (ASYS_TEXT ("TkReactor_Test"));
-
-  tcl_interp   = Tcl_CreateInterp ();
-
-  if (init (tcl_interp) != TCL_OK) {
-    cerr << "error: " << tcl_interp->result << "\n";
-    exit (1);
-  }
-
-  Tk_Window tk = 0;
-  tk = Tk_MainWindow(tcl_interp);
-  if (tk == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "Tk_Reactor_Test: %s\n", tcl_interp->result),1);
-    }
-
-  if (Tcl_Eval (tcl_interp, "source TkReactor_Test.tcl") != TCL_OK) {
-    cerr << "error: " << tcl_interp->result << "\n";
-    exit (1);
-  }
-  // set up callback
-  Tcl_CreateCommand (tcl_interp, "pressme", inc_count, "label_var", 0);
-
-  // Register callback for X Timer
-  (void) Tk_CreateTimerHandler (1000,
-                                inc_tmo,
-                                "label_var");
-
-  // It will perform Tk Main Loop
-  ACE_TkReactor reactor;
-  ACE_Reactor r (&reactor);
-
-  //Event Handler for ACE Timer.
-  EV_handler evh;
-
-  ACE_Acceptor <Connection_Handler, ACE_SOCK_ACCEPTOR> acceptor;
-
-  if (acceptor.open (ACE_INET_Addr ((u_short) SERV_TCP_PORT),
-                     &r) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
-                       "open"),
-                      -1);
-
-  if (reactor.schedule_timer (&evh,
-                              (const void *) "label_var",
-                              ACE_Time_Value (2),
-                              ACE_Time_Value (2))==-1)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       " (%P|%t) can't register with reactor\n"),
-                      -1);
-
-  ACE_Thread_Manager::instance ()->spawn ((ACE_THR_FUNC) client,
-                                          NULL,
-                                          THR_NEW_LWP | THR_DETACHED);
-
-  while (!quit)
-    {
-      int result = reactor.handle_events ();
-      switch (result)
-        {
-        case 0:
-          //          ACE_DEBUG ((LM_DEBUG,"handle_events timed out\n"));
-          break;
-        case -1:
-          ACE_DEBUG ((LM_DEBUG,"handle_events returned -1\n"));
-          quit = 1;
-          break;
-        }
-    }
-
-  ACE_END_TEST;
-  return 0;
-}
-
-#endif /* ACE_HAS_TK */
diff --git a/tests/TkReactor_Test.tcl b/tests/TkReactor_Test.tcl
deleted file mode 100644
index 2d9207dc126..00000000000
--- a/tests/TkReactor_Test.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file works in conjunction with the C++ source code in TkReactor_Test.cpp
-
-
-# Create a frame.
-set label_var "label for all events"
-
-# Add the new dude button.
-button .pressme -text "Press me" -command pressme
-
-# Add a quit button.
-button .goodbye -text "Quit" -command exit
-
-label .label_for_event_one -textvariable label_var
-
-pack .label_for_event_one .goodbye .pressme -side top -anchor w
diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp
index e9b194241eb..0433b3f9250 100644
--- a/tests/Upgradable_RW_Test.cpp
+++ b/tests/Upgradable_RW_Test.cpp
@@ -49,20 +49,17 @@ static size_t n_writers = 0;
 static u_int n_entries = 10;
 
 // Try to upgrade to a write lock, by default don't try.
-static u_int use_try_upgrade = 0;
+static u_long use_try_upgrade = 0;
 
 // number of readers, which were able to upgrade
-static u_int upgraded = 0;
+static u_long upgraded = 0;
 
 // count the number of find calls
-static u_int find_called = 0;
+static u_long find_called = 0;
 
 // number of readers, failing or not allowed to upgrade
 static u_int not_upgraded = 0;
 
-// Thread creation flags.
-static long thr_flags = THR_NEW_LWP;
-
 // Lock for shared_data (upgraded, not_upgraded, hash_Map)
 #if defined (RW_MUTEX)
 static ACE_RW_Thread_Mutex rw_mutex;
@@ -111,15 +108,14 @@ print_usage_and_die (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               ASYS_TEXT ("usage: %n [-r n_readers] [-w n_writers]\n"
-                         "   [-e max_entries] [-u try update] "
-                         "[-n iteration_count] [-f for FIFO threads]\n")));
+                         "   [-e max_entries] [-u try update] [-n iteration_count]\n")));
   ACE_OS::exit (1);
 }
 
 static void
 parse_args (int argc, ASYS_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("e:fr:w:n:u"));
+  ACE_Get_Opt get_opt (argc, argv, ASYS_TEXT ("e:r:w:n:u"));
 
   int c;
 
@@ -129,9 +125,6 @@ parse_args (int argc, ASYS_TCHAR *argv[])
       case 'e':
         n_entries = ACE_OS::atoi (get_opt.optarg);
         break;
-      case 'f':
-        thr_flags = THR_BOUND | THR_SCHED_FIFO;
-        break;
       case 'r':
         n_readers = ACE_OS::atoi (get_opt.optarg);
         break;
@@ -325,7 +318,7 @@ init (void)
                   Linked_List,
                   -1);
 
-  for (u_int i = 0; i < n_entries; i++)
+  for (u_long i = 0; i < n_entries; i++)
     {
       ACE_OS::sprintf (entry, "%d", i);
       ACE_NEW_RETURN (cString_ptr,
@@ -359,7 +352,6 @@ int
 main (int argc, ASYS_TCHAR *argv[])
 {
   ACE_START_TEST (ASYS_TEXT ("Upgradable_RW_Test"));
-  int status = 0;
 
 #if defined (ACE_HAS_THREADS)
   parse_args (argc, argv);
@@ -398,8 +390,7 @@ main (int argc, ASYS_TCHAR *argv[])
                       Reader_Task (time_Calculation,
                                   barrier),
                       -1);
-
-      reader_tasks[i]->activate (thr_flags,
+      reader_tasks[i]->activate (THR_BOUND | ACE_SCHED_FIFO,
                                  1,
                                  0,
                                  ACE_DEFAULT_THREAD_PRIORITY);
@@ -420,27 +411,13 @@ main (int argc, ASYS_TCHAR *argv[])
                       Writer_Task (time_Calculation,
                                   barrier),
                       -1);
-
-      writer_tasks[i]->activate (thr_flags,
+      writer_tasks[i]->activate (THR_BOUND | ACE_SCHED_FIFO,
                                  1,
                                  0,
                                  ACE_DEFAULT_THREAD_PRIORITY);
     }
 
-  // Wait a maximum of 1 second per iteration.
-  const ACE_Time_Value max_wait (n_iterations * 1);
-  const ACE_Time_Value wait_time (ACE_OS::gettimeofday () + max_wait);
-  if (ACE_Thread_Manager::instance ()->wait (&wait_time) == -1)
-    {
-      if (errno == ETIME)
-        ACE_ERROR ((LM_ERROR,
-                    ASYS_TEXT ("maximum wait time of %d msec exceeded\n"),
-                               max_wait.msec ()));
-      else
-        ACE_OS::perror ("wait");
-
-      status = -1;
-    }
+  ACE_Thread_Manager::instance ()->wait ();
 
   // compute average time.
   time_Calculation.print_stats ();
@@ -497,7 +474,7 @@ main (int argc, ASYS_TCHAR *argv[])
 #endif /* ACE_HAS_THREADS */
 
   ACE_END_TEST;
-  return status;
+  return 0;
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/tests/WinCE/Message_Queue_Notifications_Test.dsp b/tests/WinCE/MsgQueue_Notifications_Test.dsp
index 4ad95f20660..8f5ea460ec3 100644
--- a/tests/WinCE/Message_Queue_Notifications_Test.dsp
+++ b/tests/WinCE/MsgQueue_Notifications_Test.dsp
@@ -1,4 +1,4 @@
-# Microsoft Developer Studio Project File - Name="Message_Queue_Notifications_Test" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="MsgQueue_Notifications_Test" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

@@ -6,25 +6,25 @@
 # TARGTYPE "Win32 (WCE MIPS) Application" 0x0a01

 # TARGTYPE "Win32 (WCE SH) Application" 0x0901

 

-CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug

+CFG=MsgQueue_Notifications_Test - Win32 (WCE x86em) 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 "Message_Queue_Notifications_Test.mak".

+!MESSAGE NMAKE /f "MsgQueue_Notifications_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 "Message_Queue_Notifications_Test.mak"\

- CFG="Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!MESSAGE NMAKE /f "MsgQueue_Notifications_Test.mak"\

+ CFG="MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug" (based on\

+!MESSAGE "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug" (based on\

  "Win32 (WCE x86em) Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug" (based on\

+!MESSAGE "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug" (based on\

  "Win32 (WCE MIPS) Application")

-!MESSAGE "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug" (based on\

+!MESSAGE "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug" (based on\

  "Win32 (WCE SH) Application")

 !MESSAGE 

 

@@ -33,7 +33,7 @@ CFG=Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug
 # PROP Scc_LocalPath ""

 # PROP WCE_Configuration "H/PC Ver. 2.00"

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -66,7 +66,8 @@ EMPFILE=empfile.exe
 # ADD BASE EMPFILE -COPY

 # ADD EMPFILE -COPY

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -101,7 +102,7 @@ PFILE=pfile.exe
 # ADD BASE PFILE COPY

 # ADD PFILE COPY

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -140,14 +141,14 @@ PFILE=pfile.exe
 

 # Begin Target

 

-# Name "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

-# Name "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

-# Name "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+# Name "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

+# Name "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

+# Name "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 # Begin Source File

 

 SOURCE=..\..\WindozeCE\ACEApp.cpp

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -215,7 +216,8 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -283,7 +285,7 @@ DEP_CPP_ACEAP=\
 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 DEP_CPP_ACEAP=\

 	"..\..\ace\ACE.h"\

@@ -356,11 +358,11 @@ DEP_CPP_ACEAP=\
 # End Source File

 # Begin Source File

 

-SOURCE=..\Message_Queue_Notifications_Test.cpp

+SOURCE=..\MsgQueue_Notifications_Test.cpp

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -381,7 +383,12 @@ DEP_CPP_ATOMI=\
 	"..\..\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\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\ace\iosfwd.h"\

 	"..\..\ace\Log_Msg.h"\

 	"..\..\ace\Log_Priority.h"\

@@ -399,35 +406,81 @@ DEP_CPP_ATOMI=\
 	"..\..\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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

 	"..\..\ace\Signal.h"\

 	"..\..\ace\Signal.i"\

 	"..\..\ace\SString.h"\

 	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

 	"..\..\ace\streams.h"\

 	"..\..\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_Options.h"\

+	"..\..\ace\Synch_Options.i"\

 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

 	"..\..\ace\sys_conf.h"\

+	"..\..\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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -448,7 +501,12 @@ DEP_CPP_ATOMI=\
 	"..\..\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\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\ace\iosfwd.h"\

 	"..\..\ace\Log_Msg.h"\

 	"..\..\ace\Log_Priority.h"\

@@ -466,35 +524,80 @@ DEP_CPP_ATOMI=\
 	"..\..\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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

 	"..\..\ace\Signal.h"\

 	"..\..\ace\Signal.i"\

 	"..\..\ace\SString.h"\

 	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

 	"..\..\ace\streams.h"\

 	"..\..\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_Options.h"\

+	"..\..\ace\Synch_Options.i"\

 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

 	"..\..\ace\sys_conf.h"\

+	"..\..\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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

-DEP_CPP_ATOMI=\

+DEP_CPP_MESSA=\

 	"..\..\ace\ACE.h"\

 	"..\..\ace\ACE.i"\

 	"..\..\ace\Atomic_Op.i"\

@@ -515,7 +618,12 @@ DEP_CPP_ATOMI=\
 	"..\..\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\inc_user_config.h"\

+	"..\..\ace\IO_Cntl_Msg.h"\

 	"..\..\ace\iosfwd.h"\

 	"..\..\ace\Log_Msg.h"\

 	"..\..\ace\Log_Priority.h"\

@@ -533,28 +641,73 @@ DEP_CPP_ATOMI=\
 	"..\..\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_Repository.h"\

+	"..\..\ace\Service_Repository.i"\

+	"..\..\ace\Service_Types.h"\

+	"..\..\ace\Service_Types.i"\

+	"..\..\ace\Shared_Object.h"\

+	"..\..\ace\Shared_Object.i"\

 	"..\..\ace\Signal.h"\

 	"..\..\ace\Signal.i"\

 	"..\..\ace\SString.h"\

 	"..\..\ace\SString.i"\

+	"..\..\ace\Strategies.h"\

+	"..\..\ace\Strategies.i"\

+	"..\..\ace\Strategies_T.cpp"\

+	"..\..\ace\Strategies_T.h"\

+	"..\..\ace\Strategies_T.i"\

+	"..\..\ace\Stream_Modules.cpp"\

+	"..\..\ace\Stream_Modules.h"\

+	"..\..\ace\Stream_Modules.i"\

 	"..\..\ace\streams.h"\

 	"..\..\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_Options.h"\

+	"..\..\ace\Synch_Options.i"\

 	"..\..\ace\Synch_T.cpp"\

 	"..\..\ace\Synch_T.h"\

 	"..\..\ace\Synch_T.i"\

 	"..\..\ace\sys_conf.h"\

+	"..\..\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\Timer_Queue.h"\

+	"..\..\ace\Timer_Queue_T.cpp"\

+	"..\..\ace\Timer_Queue_T.h"\

+	"..\..\ace\Timer_Queue_T.i"\

 	"..\..\ace\Trace.h"\

+	"..\..\ace\WFMO_Reactor.h"\

+	"..\..\ace\WFMO_Reactor.i"\

 	"..\..\ace\ws2tcpip.h"\

 	"..\test_config.h"\

 	

@@ -566,19 +719,20 @@ DEP_CPP_ATOMI=\
 

 SOURCE=..\..\WindozeCE\StdAfx.cpp

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 DEP_CPP_STDAF=\

 	"..\..\WindozeCE\stdafx.h"\

@@ -591,7 +745,7 @@ DEP_CPP_STDAF=\
 

 SOURCE=..\..\WindozeCE\WindozeCE.cpp

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -661,7 +815,8 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -731,7 +886,7 @@ DEP_CPP_WINDO=\
 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 DEP_CPP_WINDO=\

 	"..\..\ace\ACE.h"\

@@ -808,11 +963,12 @@ DEP_CPP_WINDO=\
 

 SOURCE=..\..\WindozeCE\WindozeCE.rc

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 !ENDIF 

 

@@ -821,7 +977,7 @@ SOURCE=..\..\WindozeCE\WindozeCE.rc
 

 SOURCE=..\..\WindozeCE\WindozeCEDlg.cpp

 

-!IF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE x86em) Debug"

+!IF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE x86em) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -894,7 +1050,8 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE MIPS) Debug"

+!ELSEIF  "$(CFG)" ==\

+ "MsgQueue_Notifications_Test - Win32 (WCE MIPS) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

@@ -967,7 +1124,7 @@ DEP_CPP_WINDOZ=\
 	"..\..\WindozeCE\WindozeCEDlg.h"\

 	

 

-!ELSEIF  "$(CFG)" == "Message_Queue_Notifications_Test - Win32 (WCE SH) Debug"

+!ELSEIF  "$(CFG)" == "MsgQueue_Notifications_Test - Win32 (WCE SH) Debug"

 

 DEP_CPP_WINDOZ=\

 	"..\..\ace\ACE.h"\

diff --git a/tests/WinCE/ce_tests.dsw b/tests/WinCE/ce_tests.dsw
index 2ea75d3ba1f..2492d182a4c 100644
--- a/tests/WinCE/ce_tests.dsw
+++ b/tests/WinCE/ce_tests.dsw
@@ -171,7 +171,7 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Message_Queue_Notifications_Test"=.\Message_Queue_Notifications_Test.dsp - Package Owner=<4>

+Project: "MsgQueue_Notifications_Test"=.\MsgQueue_Notifications_Test.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -470,3 +470,4 @@ Package=<3>
 }}}

 

 ###############################################################################

+

diff --git a/tests/log/Makefile.am b/tests/log/Makefile.am
deleted file mode 100644
index 916ed556f55..00000000000
--- a/tests/log/Makefile.am
+++ /dev/null
@@ -1,81 +0,0 @@
-##----------------------------------------------------------------------------
-##       $Id$
-##
-##       Makefile.am for all the ACE ``one-button'' tests log directory
-##----------------------------------------------------------------------------
-
-##
-##  Process this file with automake to create Makefile.in
-##
-
-## The number in AUTOMAKE_OPTIONS is the minimum required version automake
-## needed to process this file.
-AUTOMAKE_OPTIONS = 1.4
-
-## This file is just here so that this directory gets added to the
-## distribution
-
-DISTCLEANFILES = \
-         ACE_DLList_Test.log \
-         Aio_Platform_Test.log \
-         Atomic_Op_Test.log  \
-         Barrier_Test.log  \
-         Basic_Types_Test.log  \
-         Buffer_Stream_Test.log  \
-         Conn_Test.log  \
-         Dynamic_Priority_Test.log  \
-         Enum_Interfaces_Test.log  \
-         Env_Value_Test.log  \
-         Future_Test.log  \
-         Handle_Set_Test.log  \
-         Hash_Map_Manager_Test.log \
-         High_Res_Timer_Test.log \
-         IOStream_Test.log  \
-         MM_Shared_Memory_Test.log  \
-         MT_Reactor_Timer_Test.log \
-         MT_SOCK_Test.log  \
-         Map_Manager_Test.log  \
-         Mem_Map_Test.log  \
-         Message_Block_Test.log  \
-         Message_Queue_Notifications_Test.log  \
-         Message_Queue_Test.log  \
-         Naming_Test.log  \
-         Notify_Performance_Test.log  \
-         OrdMultiSet_Test.log  \
-         Pipe_Test.log  \
-         Pipe_Test-children.log \
-         Priority_Buffer_Test.log  \
-         Priority_Reactor_Test.log  \
-         Priority_Task_Test.log  \
-         Process_Mutex_Test.log  \
-         Process_Mutex_Test-children.log \
-         Process_Strategy_Test.log  \
-         Reactor_Exceptions_Test.log  \
-         Reactor_Notify_Test.log  \
-         Reactor_Performance_Test.log  \
-         Reactor_Timer_Test.log  \
-         Reactors_Test.log  \
-         Reader_Writer_Test.log  \
-         Recursive_Mutex_Test.log  \
-         SOCK_Connector_Test.log  \
-         SOCK_Test.log  \
-         SPIPE_Test.log  \
-         SString_Test.log  \
-         SV_Shared_Memory_Test.log  \
-         Semaphore_Test.log  \
-         Service_Config_Test.log  \
-         Sigset_Ops_Test.log  \
-         Simple_Message_Block_Test.log  \
-         TSS_Test.log  \
-         Task_Test.log  \
-         Thread_Manager_Test.log  \
-         Thread_Mutex_Test.log  \
-         Thread_Pool_Test.log  \
-         Time_Service_Test.log  \
-         Time_Value_Test.log  \
-         Timeprobe_Test.log  \
-         Timer_Queue_Test.log  \
-         Tokens_Test.log  \
-         UPIPE_SAP_Test.log  \
-         Upgradable_RW_Test.log \
-         XtReactor_Test.log
diff --git a/tests/run_tests.bat b/tests/run_tests.bat
index 05e9d4c3adf..9cc16a75501 100644
--- a/tests/run_tests.bat
+++ b/tests/run_tests.bat
@@ -1,6 +1,6 @@
-@echo off
 rem $Id$
 
+@echo off
 rem    To use this either give it no arguments to run all the tests or
 rem    pass it the test name (without the extention) to run only one
 rem    test
@@ -22,7 +22,6 @@ if not "%arg%" == "" goto runtest
 
 :runall
 
-call %0 %dopure% ACE_Init_Test
 call %0 %dopure% Atomic_Op_Test
 call %0 %dopure% Barrier_Test
 call %0 %dopure% Basic_Types_Test
@@ -30,7 +29,7 @@ call %0 %dopure% Buffer_Stream_Test
 call %0 %dopure% CDR_Test
 call %0 %dopure% Collection_Test
 call %0 %dopure% Conn_Test
-call %0 %dopure% DLL_Test
+rem call %0 %dopure% DLL_Test
 call %0 %dopure% DLList_Test
 call %0 %dopure% Enum_Interfaces_Test
 call %0 %dopure% Env_Value_Test
@@ -49,7 +48,6 @@ call %0 %dopure% MT_Reactor_Timer_Test
 call %0 %dopure% MM_Shared_Memory_Test
 call %0 %dopure% MT_SOCK_Test
 call %0 %dopure% Naming_Test
-call %0 %dopure% New_Fail_Test
 call %0 %dopure% Notify_Performance_Test
 call %0 %dopure% OrdMultiSet_Test
 call %0 %dopure% Pipe_Test
@@ -68,7 +66,6 @@ call %0 %dopure% Reactor_Timer_Test
 call %0 %dopure% Reader_Writer_Test
 call %0 %dopure% Thread_Pool_Reactor_Test
 call %0 %dopure% Recursive_Mutex_Test
-call %0 %dopure% Reverse_Lock_Test
 call %0 %dopure% Semaphore_Test
 call %0 %dopure% Service_Config_Test
 call %0 %dopure% Sigset_Ops_Test
@@ -84,7 +81,7 @@ call %0 %dopure% Thread_Mutex_Test
 call %0 %dopure% Thread_Pool_Test
 call %0 %dopure% Timer_Queue_Test
 call %0 %dopure% Timeprobe_Test
-if exist ..\netsvcs\servers\main.exe call %0 %dopure% Time_Service_Test
+call %0 %dopure% Time_Service_Test
 call %0 %dopure% Time_Value_Test
 call %0 %dopure% Tokens_Test
 call %0 %dopure% TSS_Test
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 49f311b55dc..04487464cfe 100755
--- a/tests/run_tests.psosim
+++ b/tests/run_tests.psosim
@@ -125,8 +125,6 @@ run MT_SOCK_Test                        # uses Thread_Manager, Acceptor/Connecto
 
 run Recursive_Mutex_Test                # uses Service_Config, Recursive_Thread_Mutex
 
-run Reverse_Lock_Test                   # uses ACE_Reverse_Lock
-
 #Time_Service_Test: uses fork
 #run Time_Service_Test                   # uses libnetsvcs
 
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 894592b5d95..d6aed202fb4 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -25,11 +25,6 @@ if [ -x /bin/uname -a `uname -s` = 'HP-UX' ]; then
   export SHLIB_PATH
 fi
 
-if [ -x /bin/uname -a `uname -s` = 'AIX' ]; then
-  LIBPATH=$ACE_ROOT/ace:${LIBPATH:-/usr/lib:/lib}
-  export LIBPATH
-fi
-
 ####
 #### Process command line arguments.
 ####
@@ -81,7 +76,7 @@ run()
   fi
 
   if [ -f log/$1.log ]; then
-    sh ./run_tests.check log/$1.log
+    ./run_tests.check log/$1.log
   else
     echo "No log file (log/$1.log) is present"
   fi
@@ -107,10 +102,6 @@ if [ ! "$chorus" ]; then
   start_test_resources=`ipcs | egrep $user`
 fi # ! chorus
 
-ACE_BUILD_COMPONENTS=`$ACE_ROOT/bin/ace_components --ace`
-OTHER=`echo $ACE_BUILD_COMPONENTS | egrep ' Other '`
-TOKEN=`echo $ACE_BUILD_COMPONENTS | egrep ' Token '`
-
 echo "Starting ACE version $ace_version tests . . ."
 
 mv -f "$compilation_log" "$compilation_log.bak" > /dev/null 2>&1
@@ -126,10 +117,8 @@ 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 $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
+test $chorus || test $LynxOS || test $Unicos || run Naming_Test # tests ACE_Naming_Context, ACE_WString
 
 run Handle_Set_Test                     # tests ACE_Handle_Set
 run OrdMultiSet_Test                    # tests ACE_Ordered_MultiSet
@@ -158,11 +147,11 @@ run Reactors_Test                       # tests ACE_Task, ACE_Mutex, ACE_Reactor
 run Reactor_Exceptions_Test             # tests ACE_Reactor and C++ exceptions
 run Reactor_Notify_Test                 # tests ACE_Reactor's notify() method, ACE_Task
 run Reactor_Timer_Test                  # tests ACE_Event_Handler, ACE_Reactor
-# test $OTHER && run Thread_Pool_Reactor_Test            # tests ACE_TP_Reactor, ACE_Select_Reactor, ACE_Acceptor...
-test $chorus || run Reactor_Performance_Test # tests ACE_Event_Handler, ACE_Reactor
+# run Thread_Pool_Reactor_Test            # tests ACE_TP_Reactor, ACE_Select_Reactor, ACE_Acceptor...
+test $chorus || test $LynxOS || run Reactor_Performance_Test # tests ACE_Event_Handler, ACE_Reactor
 run Notify_Performance_Test             # tests ACE_Event_Handler, ACE_Reactor
 run Reader_Writer_Test                  # tests ACE_Thread_Manager, ACE_Mutex
-test $chorus || run Priority_Reactor_Test # tests ACE_Priority_Reactor, ACE_Acceptor/ACE_Connector...
+test $chorus || test $LynxOS || run Priority_Reactor_Test # tests ACE_Priority_Reactor, ACE_Acceptor/ACE_Connector...
 test $chorus || run SOCK_Test           # tests ACE_Thread_Manager, ACE_SOCK_SAP
 test $chorus || run MT_SOCK_Test        # tests ACE_Thread_Manager, ACE_Acceptor/ACE_Connector
 
@@ -175,14 +164,13 @@ run Buffer_Stream_Test                  # tests ACE_Service_Config, ACE_Stream (
 run Priority_Buffer_Test                # tests ACE_Service_Config, ACE_Message_Queue
 run Dynamic_Priority_Test               # tests ACE_ACE_Message_Queue, ACE_Dynamic_Message_Queue
 run Recursive_Mutex_Test                # tests ACE_Service_Config, ACE_Recursive_Thread_Mutex
-run Reverse_Lock_Test                   # tests ACE_Reverse_Lock
 
 # Time_Service_Test: UNICOS fails dlopen() - no shared libs on UNICOS
 if [ -f ../netsvcs/servers/main ]; then
-  test $TOKEN && (test $chorus || test $Unicos || run Time_Service_Test) # tests libnetsvcs
+  test $chorus || test $LynxOS || test $Unicos || run Time_Service_Test # tests libnetsvcs
 fi
 # Tokens_Test: UNICOS fails dlopen() - no shared libs on UNICOS
-test $TOKEN && (test $chorus || test $Unicos || run Tokens_Test) # tests ACE_Token
+test $chorus || test $LynxOS || test $Unicos || run Tokens_Test # tests ACE_Token
 
 run Map_Manager_Test                    # tests ACE_Map Manager and ACE_Hash_Map_Manager + Forward and Reverse Map Iterators.
 run Map_Test                            # tests ACE_Map + Forward and Reverse Map Iterators.
@@ -201,7 +189,6 @@ run IOStream_Test                       # tests ACE_IOStream and ACE_SOCK_Stream
 run Enum_Interfaces_Test                # tests ACE_ACE::get_ip_interfaces()
 test $chorus || run Upgradable_RW_Test  # tests ACE_RW locks
 test $chorus || run Conn_Test           # tests ACE_Thread_Manager, ACE_Acceptor/ACE_Connector, ACE_SOCK_SAP
-run New_Fail_Test                       # tests correct ACE_NEW[_RETURN]
 
 echo "Finished ACE version $ace_version tests."
 
diff --git a/tests/run_tests.vxworks b/tests/run_tests.vxworks
index 3f191d7ec97..ff99d1ad6ee 100644
--- a/tests/run_tests.vxworks
+++ b/tests/run_tests.vxworks
@@ -2,12 +2,6 @@
 #
 # ACE one-button test for VxWorks 5.2/3.x.
 # To use:  -> < run_tests.vxworks > run_tests.log
-#
-# NOTE: if you build with a shared ACE library, be sure to load
-# that first:
-#  -> ld < ../ace/libACE.so
-# and unld it after running the tests.
-#
 # The output logs can be checked from a Unix host:
 #    % ./run_tests.check log/*.log
 #
@@ -188,10 +182,6 @@ ld < Recursive_Mutex_Test
 write 2, "Recursive_Mutex_Test ", 21
 ace_main; unld "Recursive_Mutex_Test"
 
-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"
diff --git a/tests/tests.dsw b/tests/tests.dsw
index 3c00aee6195..14b9aa7c3fb 100644
--- a/tests/tests.dsw
+++ b/tests/tests.dsw
@@ -3,18 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "ACE_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -339,18 +327,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -543,18 +519,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/tests/version_tests/ACE_Init_Test.dsp b/tests/version_tests/ACE_Init_Test.dsp
deleted file mode 100644
index 97b550a6ff8..00000000000
--- a/tests/version_tests/ACE_Init_Test.dsp
+++ /dev/null
@@ -1,298 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Ace_Init_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Ace_Init_Test - Win32 DLL Release

-!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 "ACE_Init_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 "ACE_Init_Test.mak" CFG="Ace_Init_Test - Win32 DLL Release"

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

-!MESSAGE "Ace_Init_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ace_Init_Test - Win32 static Unicode 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)" == "Ace_Init_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Release"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "_WINDOWS" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-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 /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-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 /machine:I386

-# ADD LINK32 aceu.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Ace_Init_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "ACE_USES_STATIC_MFC" /D "UNICODE" /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-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 /machine:I386

-# ADD LINK32 acesu.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Ace_Init_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Release"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "NDEBUG"

-# ADD RSC /l 0x409 /d "NDEBUG" /d "_AFXDLL"

-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 /machine:I386

-# ADD LINK32 aces.lib /nologo /subsystem:windows /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-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:windows /debug /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Ace_Init_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "_AFXDLL" /D "WIN32" /D ACE_HAS_MFC=1 /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-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 aceud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Ace_Init_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Debug"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-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 acesd.lib /nologo /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ELSEIF  "$(CFG)" == "Ace_Init_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Ace_Init_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Ace_Init_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Ace_Init_Test"

-# PROP Use_MFC 2

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Ace_Init_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D ACE_HAS_MFC=1 /D "_AFXDLL" /FD /c

-# SUBTRACT CPP /YX

-# ADD BASE RSC /l 0x409 /d "_DEBUG"

-# ADD RSC /l 0x409 /d "_DEBUG" /d "_AFXDLL"

-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 acesud.lib /nologo /entry:"wWinMainCRTStartup" /subsystem:windows /debug /machine:I386 /libpath:"..\..\ace"

-# SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

-# Begin Target

-

-# Name "Ace_Init_Test - Win32 DLL Release"

-# Name "Ace_Init_Test - Win32 DLL Unicode Release"

-# Name "Ace_Init_Test - Win32 static Unicode Release"

-# Name "Ace_Init_Test - Win32 static Release"

-# Name "Ace_Init_Test - Win32 DLL Debug"

-# Name "Ace_Init_Test - Win32 DLL Unicode Debug"

-# Name "Ace_Init_Test - Win32 static Debug"

-# Name "Ace_Init_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\ACE_Init_Test.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\ACE_Init_TestDlg.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# Begin Source File

-

-SOURCE=..\ACE_Init_Test_Resource.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\ACE_Init_Test_StdAfx.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\ACE_Init_TestDlg.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"

-# Begin Source File

-

-SOURCE=..\ACE_Init_Test.rc

-# End Source File

-# End Group

-# End Target

-# End Project

diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp
index c12c8565f4e..06cb48aca42 100644
--- a/tests/version_tests/Barrier_Test.dsp
+++ b/tests/version_tests/Barrier_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Barrier_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Barrier_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Barrier_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Barrier_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp
index deecf1ff221..5a0383393fb 100644
--- a/tests/version_tests/Basic_Types_Test.dsp
+++ b/tests/version_tests/Basic_Types_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # 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 "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -123,7 +123,7 @@ LINK32=link.exe
 # 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 "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -198,7 +198,7 @@ LINK32=link.exe
 # 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 "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -223,7 +223,7 @@ LINK32=link.exe
 # 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 "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D "_MBCS" /D "WIN32" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /YX /FD /c

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

 BSC32=bscmake.exe

diff --git a/tests/version_tests/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp
index 38f64f659b1..ace58e13502 100644
--- a/tests/version_tests/Buffer_Stream_Test.dsp
+++ b/tests/version_tests/Buffer_Stream_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Buffer_Stream_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Buffer_Stream_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Buffer_Stream_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Buffer_Stream_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/CDR_Test.dsp b/tests/version_tests/CDR_Test.dsp
index cc46a8cc178..4fabdc5c6b1 100644
--- a/tests/version_tests/CDR_Test.dsp
+++ b/tests/version_tests/CDR_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\CDR_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\CDR_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\CDR_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\CDR_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Collection_Test.dsp b/tests/version_tests/Collection_Test.dsp
deleted file mode 100644
index be477c4559a..00000000000
--- a/tests/version_tests/Collection_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Collection_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Collection_Test - Win32 DLL Release

-!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 "Collection_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 "Collection_Test.mak" CFG="Collection_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Collection_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Collection_Test - Win32 static Unicode 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)" == "Collection_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Collection_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Release"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Collection_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Collection_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Collection_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Collection_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Collection_Test\static Release"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Collection_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "Collection_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Collection_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Collection_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Collection_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Collection_Test\static Debug"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Collection_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Collection_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Collection_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Collection_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Collection_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Collection_Test - Win32 DLL Release"

-# Name "Collection_Test - Win32 DLL Unicode Release"

-# Name "Collection_Test - Win32 static Unicode Release"

-# Name "Collection_Test - Win32 static Release"

-# Name "Collection_Test - Win32 DLL Debug"

-# Name "Collection_Test - Win32 DLL Unicode Debug"

-# Name "Collection_Test - Win32 static Debug"

-# Name "Collection_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Collection_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/Conn_Test.dsp b/tests/version_tests/Conn_Test.dsp
index fcb89507a38..69260c791d9 100644
--- a/tests/version_tests/Conn_Test.dsp
+++ b/tests/version_tests/Conn_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Conn_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Conn_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Conn_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Conn_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/DLL_Test.dsp b/tests/version_tests/DLL_Test.dsp
deleted file mode 100644
index 919f5b69ab4..00000000000
--- a/tests/version_tests/DLL_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="DLL_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=DLL_Test - Win32 DLL Release

-!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 "DLL_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 "DLL_Test.mak" CFG="DLL_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "DLL_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "DLL_Test - Win32 static Unicode 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)" == "DLL_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\DLL_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Release"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\DLL_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\DLL_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\DLL_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\DLL_Test\static Release"

-# PROP BASE Intermediate_Dir ".\DLL_Test\static Release"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\DLL_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Debug"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "DLL_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\DLL_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\DLL_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\DLL_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\DLL_Test\static Debug"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "DLL_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\DLL_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\DLL_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\DLL_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\DLL_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "DLL_Test - Win32 DLL Release"

-# Name "DLL_Test - Win32 DLL Unicode Release"

-# Name "DLL_Test - Win32 static Unicode Release"

-# Name "DLL_Test - Win32 static Release"

-# Name "DLL_Test - Win32 DLL Debug"

-# Name "DLL_Test - Win32 DLL Unicode Debug"

-# Name "DLL_Test - Win32 static Debug"

-# Name "DLL_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\DLL_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/DLList_Test.dsp b/tests/version_tests/DLList_Test.dsp
index 4a8c69e5fd6..e1672f2db46 100644
--- a/tests/version_tests/DLList_Test.dsp
+++ b/tests/version_tests/DLList_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\DLList_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\DLList_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\DLList_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\DLList_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Dynamic_Priority_Test.dsp b/tests/version_tests/Dynamic_Priority_Test.dsp
index 9b830d4ff85..954563bee41 100644
--- a/tests/version_tests/Dynamic_Priority_Test.dsp
+++ b/tests/version_tests/Dynamic_Priority_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Dynamic_Priority_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Dynamic_Priority_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Dynamic_Priority_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Dynamic_Priority_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp
index 741c257768f..78fc57d449b 100644
--- a/tests/version_tests/Enum_Interfaces_Test.dsp
+++ b/tests/version_tests/Enum_Interfaces_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Enum_Interfaces_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Enum_Interfaces_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Enum_Interfaces_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Enum_Interfaces_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp
index c469802dcd0..ae8b9c8f07d 100644
--- a/tests/version_tests/Env_Value_Test.dsp
+++ b/tests/version_tests/Env_Value_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Env_Value_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Env_Value_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Env_Value_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Env_Value_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Future_Test.dsp b/tests/version_tests/Future_Test.dsp
index 7f2c42f8c9e..ba88fe1742a 100644
--- a/tests/version_tests/Future_Test.dsp
+++ b/tests/version_tests/Future_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Future_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Future_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -202,9 +202,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\static Unicode Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Future_Test"

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /FD /c

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -229,9 +229,9 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\static Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir "Future_Test"

-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /FD /c

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp
index 9dec855222c..f6d95c95469 100644
--- a/tests/version_tests/Handle_Set_Test.dsp
+++ b/tests/version_tests/Handle_Set_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Handle_Set_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Handle_Set_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Handle_Set_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Handle_Set_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp
index 152c260d1a2..4dfcf982879 100644
--- a/tests/version_tests/Hash_Map_Manager_Test.dsp
+++ b/tests/version_tests/Hash_Map_Manager_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Hash_Map_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Hash_Map_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Hash_Map_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Hash_Map_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/High_Res_Timer_Test.dsp b/tests/version_tests/High_Res_Timer_Test.dsp
index 2f591c7eb66..820883ba4fc 100644
--- a/tests/version_tests/High_Res_Timer_Test.dsp
+++ b/tests/version_tests/High_Res_Timer_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\High_Res_Timer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\High_Res_Timer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\High_Res_Timer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\High_Res_Timer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp
index 938464de834..1ee70c3658d 100644
--- a/tests/version_tests/IOStream_Test.dsp
+++ b/tests/version_tests/IOStream_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\IOStream_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\IOStream_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\IOStream_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\IOStream_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp
index 6fa31f97fb8..69a317ee37c 100644
--- a/tests/version_tests/MM_Shared_Memory_Test.dsp
+++ b/tests/version_tests/MM_Shared_Memory_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MM_Shared_Memory_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MM_Shared_Memory_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MM_Shared_Memory_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MM_Shared_Memory_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/MT_Reactor_Timer_Test.dsp b/tests/version_tests/MT_Reactor_Timer_Test.dsp
deleted file mode 100644
index ff28b6599bb..00000000000
--- a/tests/version_tests/MT_Reactor_Timer_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Mt_Reactor_Timer_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Mt_Reactor_Timer_Test - Win32 DLL Release

-!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 "Mt_Reactor_Timer_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 "Mt_Reactor_Timer_Test.mak" CFG="Mt_Reactor_Timer_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Mt_Reactor_Timer_Test - Win32 static Unicode 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)" == "Mt_Reactor_Timer_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Release"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Release"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Debug"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Mt_Reactor_Timer_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Mt_Reactor_Timer_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Mt_Reactor_Timer_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Mt_Reactor_Timer_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Mt_Reactor_Timer_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Mt_Reactor_Timer_Test - Win32 DLL Release"

-# Name "Mt_Reactor_Timer_Test - Win32 DLL Unicode Release"

-# Name "Mt_Reactor_Timer_Test - Win32 static Unicode Release"

-# Name "Mt_Reactor_Timer_Test - Win32 static Release"

-# Name "Mt_Reactor_Timer_Test - Win32 DLL Debug"

-# Name "Mt_Reactor_Timer_Test - Win32 DLL Unicode Debug"

-# Name "Mt_Reactor_Timer_Test - Win32 static Debug"

-# Name "Mt_Reactor_Timer_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Mt_Reactor_Timer_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/MT_SOCK_Test.dsp b/tests/version_tests/MT_SOCK_Test.dsp
index 82c0dca5176..f04c172df7f 100644
--- a/tests/version_tests/MT_SOCK_Test.dsp
+++ b/tests/version_tests/MT_SOCK_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MT_SOCK_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MT_SOCK_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MT_SOCK_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\MT_SOCK_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp
index a4d0d8edea3..a92f1a53c97 100644
--- a/tests/version_tests/Map_Manager_Test.dsp
+++ b/tests/version_tests/Map_Manager_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Map_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Map_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Map_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Map_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Map_Test.dsp b/tests/version_tests/Map_Test.dsp
deleted file mode 100644
index 729448b3a14..00000000000
--- a/tests/version_tests/Map_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Map_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Map_Test - Win32 DLL Release

-!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 "Map_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 "Map_Test.mak" CFG="Map_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Map_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Map_Test - Win32 static Unicode 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)" == "Map_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Map_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Release"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Map_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Map_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Map_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Map_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Map_Test\static Release"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Map_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "Map_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Map_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Map_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Map_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Map_Test\static Debug"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Map_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Map_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Map_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Map_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Map_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Map_Test - Win32 DLL Release"

-# Name "Map_Test - Win32 DLL Unicode Release"

-# Name "Map_Test - Win32 static Unicode Release"

-# Name "Map_Test - Win32 static Release"

-# Name "Map_Test - Win32 DLL Debug"

-# Name "Map_Test - Win32 DLL Unicode Debug"

-# Name "Map_Test - Win32 static Debug"

-# Name "Map_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Map_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/Mem_Map_Test.dsp b/tests/version_tests/Mem_Map_Test.dsp
index 183da55607b..7412e482d5c 100644
--- a/tests/version_tests/Mem_Map_Test.dsp
+++ b/tests/version_tests/Mem_Map_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Mem_Map_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Mem_Map_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Mem_Map_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Mem_Map_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp
index 099f460b37a..78e412f6c3b 100644
--- a/tests/version_tests/Message_Block_Test.dsp
+++ b/tests/version_tests/Message_Block_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Block_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Block_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Block_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Block_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Message_Queue_Notifications_Test.dsp b/tests/version_tests/Message_Queue_Notifications_Test.dsp
index a51140c8a69..d32167c7962 100644
--- a/tests/version_tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/version_tests/Message_Queue_Notifications_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Notifications_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Notifications_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Notifications_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Notifications_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp
index 1111a9f2acb..168acfb35bd 100644
--- a/tests/version_tests/Message_Queue_Test.dsp
+++ b/tests/version_tests/Message_Queue_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Message_Queue_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp
index 45056bb309b..548f5912713 100644
--- a/tests/version_tests/Naming_Test.dsp
+++ b/tests/version_tests/Naming_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Naming_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Naming_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Naming_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Naming_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/New_Fail_Test.dsp b/tests/version_tests/New_Fail_Test.dsp
deleted file mode 100644
index ecc9f598c68..00000000000
--- a/tests/version_tests/New_Fail_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="New_Fail_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=New_Fail_Test - Win32 DLL Release

-!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 "New_Fail_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 "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "New_Fail_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "New_Fail_Test - Win32 static Unicode 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)" == "New_Fail_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Release"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\New_Fail_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\New_Fail_Test\static Release"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Release"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Debug"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "New_Fail_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\New_Fail_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\New_Fail_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Debug"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\New_Fail_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\New_Fail_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\New_Fail_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\New_Fail_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "New_Fail_Test - Win32 DLL Release"

-# Name "New_Fail_Test - Win32 DLL Unicode Release"

-# Name "New_Fail_Test - Win32 static Unicode Release"

-# Name "New_Fail_Test - Win32 static Release"

-# Name "New_Fail_Test - Win32 DLL Debug"

-# Name "New_Fail_Test - Win32 DLL Unicode Debug"

-# Name "New_Fail_Test - Win32 static Debug"

-# Name "New_Fail_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\New_Fail_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/Notify_Performance_Test.dsp b/tests/version_tests/Notify_Performance_Test.dsp
index eed0ca4e2cc..037a957109c 100644
--- a/tests/version_tests/Notify_Performance_Test.dsp
+++ b/tests/version_tests/Notify_Performance_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Notify_Performance_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Notify_Performance_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Notify_Performance_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Notify_Performance_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/OrdMultiSet_Test.dsp b/tests/version_tests/OrdMultiSet_Test.dsp
index 7b9e52e222e..9a0e9fc1a51 100644
--- a/tests/version_tests/OrdMultiSet_Test.dsp
+++ b/tests/version_tests/OrdMultiSet_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\OrdMultiSet_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\OrdMultiSet_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\OrdMultiSet_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\OrdMultiSet_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp
index 1395a298968..84b74a2a735 100644
--- a/tests/version_tests/Pipe_Test.dsp
+++ b/tests/version_tests/Pipe_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Pipe_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Pipe_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Pipe_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Pipe_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp
index e3fd7e6d26c..b92dfd6e178 100644
--- a/tests/version_tests/Priority_Buffer_Test.dsp
+++ b/tests/version_tests/Priority_Buffer_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Buffer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Buffer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Buffer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Buffer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp
index f08e35b4181..27061e17746 100644
--- a/tests/version_tests/Priority_Reactor_Test.dsp
+++ b/tests/version_tests/Priority_Reactor_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Reactor_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Reactor_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Reactor_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Reactor_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp
index 26e7fadde37..c6e1379b040 100644
--- a/tests/version_tests/Priority_Task_Test.dsp
+++ b/tests/version_tests/Priority_Task_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Task_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Task_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Task_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Priority_Task_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp
index c58b44aa951..de5ab4b46d2 100644
--- a/tests/version_tests/Process_Mutex_Test.dsp
+++ b/tests/version_tests/Process_Mutex_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp
index 80b9da92724..d125cf651c9 100644
--- a/tests/version_tests/Process_Strategy_Test.dsp
+++ b/tests/version_tests/Process_Strategy_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Strategy_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Strategy_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Strategy_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Process_Strategy_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/RB_Tree_Test.dsp b/tests/version_tests/RB_Tree_Test.dsp
index 91189e4908a..fd03d8dc6e8 100644
--- a/tests/version_tests/RB_Tree_Test.dsp
+++ b/tests/version_tests/RB_Tree_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\RB_Tree_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\RB_Tree_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\RB_Tree_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\RB_Tree_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Reactor_Exception_Test.dsp b/tests/version_tests/Reactor_Exception_Test.dsp
index d384898fbb0..bb12a038fea 100644
--- a/tests/version_tests/Reactor_Exception_Test.dsp
+++ b/tests/version_tests/Reactor_Exception_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Exception_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Exception_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Exception_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Exception_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp
index 3fc93dccd4a..be46898ac16 100644
--- a/tests/version_tests/Reactor_Notify_Test.dsp
+++ b/tests/version_tests/Reactor_Notify_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Notify_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Notify_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Notify_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Notify_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp
index 4ed6040e2fe..ae3d3ca11a6 100644
--- a/tests/version_tests/Reactor_Performance_Test.dsp
+++ b/tests/version_tests/Reactor_Performance_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Performance_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Performance_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Performance_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Performance_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp
index 3d0acd8a827..9b7aec29b98 100644
--- a/tests/version_tests/Reactor_Timer_Test.dsp
+++ b/tests/version_tests/Reactor_Timer_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Timer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Timer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Timer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactor_Timer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp
index 3f68edcf8bb..d2e15d932fd 100644
--- a/tests/version_tests/Reactors_Test.dsp
+++ b/tests/version_tests/Reactors_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactors_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactors_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactors_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reactors_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp
index 379336fa9ee..b4dc4a90a55 100644
--- a/tests/version_tests/Reader_Writer_Test.dsp
+++ b/tests/version_tests/Reader_Writer_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reader_Writer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reader_Writer_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reader_Writer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Reader_Writer_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp
index 35cfae84e05..0559680ddb0 100644
--- a/tests/version_tests/Recursive_Mutex_Test.dsp
+++ b/tests/version_tests/Recursive_Mutex_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Recursive_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Recursive_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Recursive_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Recursive_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Reverse_Lock_Test.dsp b/tests/version_tests/Reverse_Lock_Test.dsp
deleted file mode 100644
index b5ac92117e2..00000000000
--- a/tests/version_tests/Reverse_Lock_Test.dsp
+++ /dev/null
@@ -1,270 +0,0 @@
-# Microsoft Developer Studio Project File - Name="Reverse_Lock_Test" - Package Owner=<4>

-# Microsoft Developer Studio Generated Build File, Format Version 6.00

-# ** DO NOT EDIT **

-

-# TARGTYPE "Win32 (x86) Console Application" 0x0103

-

-CFG=Reverse_Lock_Test - Win32 DLL Release

-!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 "Reverse_Lock_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 "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 DLL Release"

-!MESSAGE

-!MESSAGE Possible choices for configuration are:

-!MESSAGE

-!MESSAGE "Reverse_Lock_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 static Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 static Debug" (based on "Win32 (x86) Console Application")

-!MESSAGE "Reverse_Lock_Test - Win32 static Unicode 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)" == "Reverse_Lock_Test - Win32 DLL Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Release"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Release"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Release"

-# PROP Intermediate_Dir ".\DLL Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Unicode Release"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Unicode Release"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\DLL Unicode Release"

-# PROP Intermediate_Dir ".\DLL Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 static Unicode Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Unicode Release"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Unicode Release"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Unicode Release"

-# PROP Intermediate_Dir ".\static Unicode Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 static Release"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 0

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Release"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Release"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 0

-# PROP Output_Dir ".\static Release"

-# PROP Intermediate_Dir ".\static Release"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 DLL Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Debug"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Debug"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Debug"

-# PROP Intermediate_Dir ".\DLL Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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)" == "Reverse_Lock_Test - Win32 DLL Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\DLL Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\DLL Unicode Debug"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\DLL Unicode Debug"

-# PROP Intermediate_Dir ".\DLL Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 static Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Debug"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Debug"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Debug"

-# PROP Intermediate_Dir ".\static Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 static Unicode Debug"

-

-# PROP BASE Use_MFC 0

-# PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir ".\Reverse_Lock_Test\static Unicode Debug"

-# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\static Unicode Debug"

-# PROP BASE Target_Dir ".\Reverse_Lock_Test"

-# PROP Use_MFC 0

-# PROP Use_Debug_Libraries 1

-# PROP Output_Dir ".\static Unicode Debug"

-# PROP Intermediate_Dir ".\static Unicode Debug"

-# PROP Ignore_Export_Lib 0

-# PROP Target_Dir ".\Reverse_Lock_Test"

-# 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

-# SUBTRACT CPP /YX

-# 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 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

-

-!ENDIF

-

-# Begin Target

-

-# Name "Reverse_Lock_Test - Win32 DLL Release"

-# Name "Reverse_Lock_Test - Win32 DLL Unicode Release"

-# Name "Reverse_Lock_Test - Win32 static Unicode Release"

-# Name "Reverse_Lock_Test - Win32 static Release"

-# Name "Reverse_Lock_Test - Win32 DLL Debug"

-# Name "Reverse_Lock_Test - Win32 DLL Unicode Debug"

-# Name "Reverse_Lock_Test - Win32 static Debug"

-# Name "Reverse_Lock_Test - Win32 static Unicode Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

-# Begin Source File

-

-SOURCE=..\Reverse_Lock_Test.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

-# 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/version_tests/SOCK_Connector_Test.dsp b/tests/version_tests/SOCK_Connector_Test.dsp
index 941695c7d88..785e9549f23 100644
--- a/tests/version_tests/SOCK_Connector_Test.dsp
+++ b/tests/version_tests/SOCK_Connector_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Connector_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Connector_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Connector_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Connector_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/SOCK_Test.dsp b/tests/version_tests/SOCK_Test.dsp
index d854e8fddb2..0a576cdf834 100644
--- a/tests/version_tests/SOCK_Test.dsp
+++ b/tests/version_tests/SOCK_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SOCK_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp
index 01991da3145..e138d6abc2f 100644
--- a/tests/version_tests/SPIPE_Test.dsp
+++ b/tests/version_tests/SPIPE_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SPIPE_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SPIPE_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SPIPE_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SPIPE_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/SString_Test.dsp b/tests/version_tests/SString_Test.dsp
index aa3142339ca..a9f85860d56 100644
--- a/tests/version_tests/SString_Test.dsp
+++ b/tests/version_tests/SString_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SString_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SString_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SString_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SString_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp
index 731393fbe31..9317ae4f2f3 100644
--- a/tests/version_tests/SV_Shared_Memory_Test.dsp
+++ b/tests/version_tests/SV_Shared_Memory_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SV_Shared_Memory_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SV_Shared_Memory_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SV_Shared_Memory_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\SV_Shared_Memory_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp
index 0985eb10d04..8eb937d0cfc 100644
--- a/tests/version_tests/Semaphore_Test.dsp
+++ b/tests/version_tests/Semaphore_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Semaphore_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Semaphore_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Semaphore_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Semaphore_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp
index 6feea5eee4d..0172eb2af0c 100644
--- a/tests/version_tests/Service_Config_Test.dsp
+++ b/tests/version_tests/Service_Config_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Service_Config_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Service_Config_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Service_Config_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Service_Config_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Sigset_Op_Test.dsp b/tests/version_tests/Sigset_Op_Test.dsp
index 12a7a2b533e..7c41f45ecaa 100644
--- a/tests/version_tests/Sigset_Op_Test.dsp
+++ b/tests/version_tests/Sigset_Op_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Sigset_Op_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Sigset_Op_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Sigset_Op_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Sigset_Op_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp
index 7d5d86ae01a..0825a137533 100644
--- a/tests/version_tests/Simple_Message_Block_Test.dsp
+++ b/tests/version_tests/Simple_Message_Block_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Simple_Message_Block_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Simple_Message_Block_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Simple_Message_Block_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Simple_Message_Block_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp
index ad051cb0c3b..a26e33d0a4f 100644
--- a/tests/version_tests/TSS_Test.dsp
+++ b/tests/version_tests/TSS_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\TSS_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\TSS_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\TSS_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\TSS_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Task_Test.dsp b/tests/version_tests/Task_Test.dsp
index 038c6523af7..aba3a87420c 100644
--- a/tests/version_tests/Task_Test.dsp
+++ b/tests/version_tests/Task_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Task_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Task_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Task_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Task_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp
index 09e6091ad4f..d19f6bd3a5f 100644
--- a/tests/version_tests/Thread_Manager_Test.dsp
+++ b/tests/version_tests/Thread_Manager_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Manager_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Manager_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp
index fe3ea709a23..8c8912f70cb 100644
--- a/tests/version_tests/Thread_Mutex_Test.dsp
+++ b/tests/version_tests/Thread_Mutex_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Mutex_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Mutex_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Thread_Pool_Reactor_Test.dsp b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
index 7b30dbd22e1..fc5b07bea75 100644
--- a/tests/version_tests/Thread_Pool_Reactor_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp
index b6d724e5eca..e9b7f9aeccf 100644
--- a/tests/version_tests/Thread_Pool_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Thread_Pool_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp
index a92523decaa..2c5bf0ae189 100644
--- a/tests/version_tests/Time_Service_Test.dsp
+++ b/tests/version_tests/Time_Service_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Service_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Service_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Service_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Service_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp
index c22abafcaec..b00b7b007c6 100644
--- a/tests/version_tests/Time_Value_Test.dsp
+++ b/tests/version_tests/Time_Value_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Value_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Value_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Value_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Time_Value_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Timeprobe_Test.dsp b/tests/version_tests/Timeprobe_Test.dsp
index d62183a8384..7edc1d6cd23 100644
--- a/tests/version_tests/Timeprobe_Test.dsp
+++ b/tests/version_tests/Timeprobe_Test.dsp
@@ -73,7 +73,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timeprobe_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timeprobe_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timeprobe_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timeprobe_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp
index 5cb5fe07a59..b440b6e79fc 100644
--- a/tests/version_tests/Timer_Queue_Test.dsp
+++ b/tests/version_tests/Timer_Queue_Test.dsp
@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timer_Queue_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timer_Queue_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timer_Queue_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Timer_Queue_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp
index 0334faa1f49..f80477d09cd 100644
--- a/tests/version_tests/Tokens_Test.dsp
+++ b/tests/version_tests/Tokens_Test.dsp
@@ -48,7 +48,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Tokens_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Tokens_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Tokens_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Tokens_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp
index 0dc7793bdd3..bc1a759a8e5 100644
--- a/tests/version_tests/UPIPE_SAP_Test.dsp
+++ b/tests/version_tests/UPIPE_SAP_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\UPIPE_SAP_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\UPIPE_SAP_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\UPIPE_SAP_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\UPIPE_SAP_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/tests/version_tests/Upgradable_RW_Test.dsp b/tests/version_tests/Upgradable_RW_Test.dsp
index 811b5a46aab..c8d04713fd5 100644
--- a/tests/version_tests/Upgradable_RW_Test.dsp
+++ b/tests/version_tests/Upgradable_RW_Test.dsp
@@ -98,7 +98,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Upgradable_RW_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Upgradable_RW_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Upgradable_RW_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -223,7 +223,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Upgradable_RW_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

diff --git a/tests/version_tests/Atomic_Op_Test.dsp b/tests/version_tests/version_tests.dsp
index 644dd7ecf46..a8bd24978b1 100644
--- a/tests/version_tests/Atomic_Op_Test.dsp
+++ b/tests/version_tests/version_tests.dsp
@@ -7,16 +7,16 @@
 CFG=Atomic_Op_Test - Win32 DLL 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 "atomic_op_test.mak".

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "version_tests.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 "atomic_op_test.mak" CFG="Atomic_Op_Test - Win32 DLL Debug"

-!MESSAGE

+!MESSAGE 

+!MESSAGE NMAKE /f "version_tests.mak" CFG="Atomic_Op_Test - Win32 DLL Debug"

+!MESSAGE 

 !MESSAGE Possible choices for configuration are:

-!MESSAGE

+!MESSAGE 

 !MESSAGE "Atomic_Op_Test - Win32 DLL Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE "Atomic_Op_Test - Win32 DLL Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Atomic_Op_Test - Win32 DLL Unicode Debug" (based on "Win32 (x86) Console Application")

@@ -25,7 +25,7 @@ CFG=Atomic_Op_Test - Win32 DLL Debug
 !MESSAGE "Atomic_Op_Test - Win32 static Unicode Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE "Atomic_Op_Test - Win32 static Unicode Release" (based on "Win32 (x86) Console Application")

 !MESSAGE "Atomic_Op_Test - Win32 DLL Unicode Release" (based on "Win32 (x86) Console Application")

-!MESSAGE

+!MESSAGE 

 

 # Begin Project

 # PROP AllowPerConfigDependencies 0

@@ -123,7 +123,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Atomic_Op_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -148,7 +148,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Atomic_Op_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -173,7 +173,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Atomic_Op_Test"

 # 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 "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -198,7 +198,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\Atomic_Op_Test"

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_NO_INLINE /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -234,7 +234,7 @@ LINK32=link.exe
 # ADD BASE LINK32 ace.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 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

-!ENDIF

+!ENDIF 

 

 # Begin Target

 

diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw
index 06acfcfd681..3b9512c8623 100644
--- a/tests/version_tests/version_tests.dsw
+++ b/tests/version_tests/version_tests.dsw
@@ -3,19 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

-Project: "Ace_Init_Test"=.\ACE_Init_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Atomic_Op_Test"=.\Atomic_Op_Test.dsp - Package Owner=<4>

+Project: "Atomic_Op_Test"=.\version_tests.dsp - Package Owner=<4>

 

 Package=<5>

 {{{

@@ -63,30 +51,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "CDR_Test"=.\CDR_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

-Project: "Collection_Test"=.\Collection_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Conn_Test"=.\Conn_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -99,18 +63,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "DLL_Test"=.\DLL_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "DLList_Test"=.\DLList_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -255,18 +207,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Map_Test"=.\Map_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Mem_Map_Test"=.\Mem_Map_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -315,18 +255,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Mt_Reactor_Timer_Test"=.\MT_Reactor_Timer_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Naming_Test"=.\Naming_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -339,18 +267,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "New_Fail_Test"=.\New_Fail_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "Notify_Performance_Test"=.\Notify_Performance_Test.dsp - Package Owner=<4>

 

 Package=<5>

@@ -543,18 +459,6 @@ Package=<4>
 

 ###############################################################################

 

-Project: "Reverse_Lock_Test"=.\Reverse_Lock_Test.dsp - Package Owner=<4>

-

-Package=<5>

-{{{

-}}}

-

-Package=<4>

-{{{

-}}}

-

-###############################################################################

-

 Project: "SOCK_Connector_Test"=.\SOCK_Connector_Test.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/websvcs/lib/URL_Addr.cpp b/websvcs/lib/URL_Addr.cpp
index 23de49c704b..a842a7d1059 100644
--- a/websvcs/lib/URL_Addr.cpp
+++ b/websvcs/lib/URL_Addr.cpp
@@ -360,7 +360,7 @@ ACE_HTTP_Addr::create_relative_address (LPCTSTR url) const
   if (url[0] == '/')
     {
       ACE_NEW_RETURN (addr, ACE_HTTP_Addr (this->get_hostname (),
-                                           url + 1,
+                                           url,
                                            0,
                                            this->get_port_number ()),
                       0);
diff --git a/websvcs/lib/URL_Addr.h b/websvcs/lib/URL_Addr.h
index 5dc89033da3..8013475e939 100644
--- a/websvcs/lib/URL_Addr.h
+++ b/websvcs/lib/URL_Addr.h
@@ -77,9 +77,6 @@ public:
   static int known_scheme (LPCTSTR url);
   // Returns 1 if the URL scheme is recognized, 0 otherwise.
 
-  u_long hash (void) const;
-  // Hash function
-
 protected:
   void set_url (LPTSTR url);
   // Allows the derived classes to store the compact representation of
diff --git a/websvcs/lib/URL_Addr.i b/websvcs/lib/URL_Addr.i
index 6d4d03d300c..f725ebe047f 100644
--- a/websvcs/lib/URL_Addr.i
+++ b/websvcs/lib/URL_Addr.i
@@ -4,7 +4,7 @@
 
 ACE_INLINE
 ACE_URL_Addr::ACE_URL_Addr (const ACE_URL_Addr& address)
-  :  url_ (address.url_ == 0 ? 0 : ACE_OS::strdup (address.url_))
+  :  url_ (ACE_OS::strdup (address.url_))
 {
 }
 
@@ -30,12 +30,6 @@ ACE_URL_Addr::set_url (LPTSTR url)
   this->url_ = url;
 }
 
-ACE_INLINE u_long 
-ACE_URL_Addr::hash (void) const
-{
-  return ACE::hash_pjw (this->url_);
-}
-
 // ****************************************************************
 
 ACE_INLINE ACE_HTTP_Addr&